From 1fe2804714887c0a43077901d5446daeb2c75ab1 Mon Sep 17 00:00:00 2001
From: Manik Magar <manik.magar@gmail.com>
Date: Sun, 17 Mar 2019 11:54:11 -0400
Subject: [PATCH 0001/4969] Add JDBC custom credential support for postgres
 (#1293)

---
 .../testcontainers/jdbc/JDBCDriverTest.java   | 23 +++++++++++++-----
 .../JdbcDatabaseContainerProvider.java        | 22 +++++++++++++++++
 .../containers/MariaDBContainerProvider.java  | 24 ++++---------------
 .../containers/MySQLContainerProvider.java    | 18 +-------------
 .../containers/PostgisContainerProvider.java  | 12 ++++++++++
 .../PostgreSQLContainerProvider.java          | 14 +++++++++++
 6 files changed, 70 insertions(+), 43 deletions(-)

diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index f61f6276c5a..a94f0b0897b 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -50,9 +50,9 @@ public static Iterable<Object[]> data() {
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename", EnumSet.noneOf(Options.class)},
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:postgresql:9.6.8://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:postgis://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:postgis:9.6://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:postgresql:9.6.8://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+                {"jdbc:tc:postgis://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+                {"jdbc:tc:postgis:9.6://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
                 {"jdbc:tc:mysql:5.6://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", EnumSet.of(Options.CustomIniFile)},
                 {"jdbc:tc:mariadb://hostname/databasename", EnumSet.noneOf(Options.class)},
                 {"jdbc:tc:mariadb://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
@@ -135,16 +135,27 @@ private void performTestForScriptedSchema(String jdbcUrl) throws SQLException {
 
     private void performTestForJDBCParamUsage(String jdbcUrl) throws SQLException {
         try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
-            boolean result = new QueryRunner(dataSource).query("select CURRENT_USER()", rs -> {
+            boolean result = new QueryRunner(dataSource).query("select CURRENT_USER", rs -> {
                 rs.next();
                 String resultUser = rs.getString(1);
-                assertEquals("User from query param is created.", "someuser@%", resultUser);
+                // Not all databases (eg. Postgres) return @% at the end of user name. We just need to make sure the user name matches.
+                if (resultUser.endsWith("@%")) {
+                    resultUser = resultUser.substring(0, resultUser.length() - 2);
+                }
+                assertEquals("User from query param is created.", "someuser", resultUser);
                 return true;
             });
 
             assertTrue("The database returned a record as expected", result);
 
-            result = new QueryRunner(dataSource).query("SELECT DATABASE()", rs -> {
+            String databaseQuery = "SELECT DATABASE()";
+            // Postgres does not have Database() as a function
+            String databaseType = ConnectionUrl.newInstance(jdbcUrl).getDatabaseType();
+            if (databaseType.equalsIgnoreCase("postgresql") || databaseType.equalsIgnoreCase("postgis")) {
+                databaseQuery = "SELECT CURRENT_DATABASE()";
+            }
+
+            result = new QueryRunner(dataSource).query(databaseQuery, rs -> {
                 rs.next();
                 String resultDB = rs.getString(1);
                 assertEquals("Database name from URL String is used.", "databasename", resultDB);
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
index 2a73879a572..f2ebde857c5 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
@@ -4,6 +4,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Objects;
+
 /**
  * Base class for classes that can provide a JDBC container.
  */
@@ -49,4 +51,24 @@ public JdbcDatabaseContainer newInstance(ConnectionUrl url) {
             return newInstance();
         }
     }
+
+    protected JdbcDatabaseContainer newInstanceFromConnectionUrl(ConnectionUrl connectionUrl, final String userParamName, final String pwdParamName) {
+        Objects.requireNonNull(connectionUrl, "Connection URL cannot be null");
+
+        final String databaseName = connectionUrl.getDatabaseName().orElse("test");
+        final String user = connectionUrl.getQueryParameters().getOrDefault(userParamName, "test");
+        final String password = connectionUrl.getQueryParameters().getOrDefault(pwdParamName, "test");
+
+        final JdbcDatabaseContainer instance;
+        if (connectionUrl.getImageTag().isPresent()) {
+            instance = newInstance(connectionUrl.getImageTag().get());
+        } else {
+            instance = newInstance();
+        }
+
+        return instance
+            .withDatabaseName(databaseName)
+            .withUsername(user)
+            .withPassword(password);
+    }
 }
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
index deb1b2c5c5e..86f30ee59e5 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
@@ -8,7 +8,7 @@
  * Factory for MariaDB org.testcontainers.containers.
  */
 public class MariaDBContainerProvider extends JdbcDatabaseContainerProvider {
-    
+
     private static final String USER_PARAM = "user";
 
     private static final String PASSWORD_PARAM = "password";
@@ -27,26 +27,10 @@ public JdbcDatabaseContainer newInstance() {
     public JdbcDatabaseContainer newInstance(String tag) {
         return new MariaDBContainer(MariaDBContainer.IMAGE + ":" + tag);
     }
-    
+
     @Override
     public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
-        Objects.requireNonNull(connectionUrl, "Connection URL cannot be null");
-
-        final String databaseName = connectionUrl.getDatabaseName().orElse("test");
-        final String user = connectionUrl.getQueryParameters().getOrDefault(USER_PARAM, "test");
-        final String password = connectionUrl.getQueryParameters().getOrDefault(PASSWORD_PARAM, "test");
-
-        final JdbcDatabaseContainer instance;
-        if (connectionUrl.getImageTag().isPresent()) {
-            instance = newInstance(connectionUrl.getImageTag().get());
-        } else {
-            instance = newInstance();
-        }
-
-        return instance
-            .withDatabaseName(databaseName)
-            .withUsername(user)
-            .withPassword(password);
+       return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
     }
-    
+
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
index cfc072707da..7d4919f4b26 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
@@ -34,23 +34,7 @@ public JdbcDatabaseContainer newInstance(String tag) {
 
     @Override
     public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
-        Objects.requireNonNull(connectionUrl, "Connection URL cannot be null");
-
-        final String databaseName = connectionUrl.getDatabaseName().orElse("test");
-        final String user = connectionUrl.getQueryParameters().getOrDefault(USER_PARAM, "test");
-        final String password = connectionUrl.getQueryParameters().getOrDefault(PASSWORD_PARAM, "test");
-
-        final JdbcDatabaseContainer instance;
-        if (connectionUrl.getImageTag().isPresent()) {
-            instance = newInstance(connectionUrl.getImageTag().get());
-        } else {
-            instance = newInstance();
-        }
-
-        return instance
-            .withDatabaseName(databaseName)
-            .withUsername(user)
-            .withPassword(password);
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
     }
 
 }
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
index 644a5ef8c84..83f15e3fd6f 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
@@ -1,5 +1,9 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.jdbc.ConnectionUrl;
+
+import java.util.Objects;
+
 /**
  * Factory for PostGIS containers, which are a special flavour of PostgreSQL.
  */
@@ -8,6 +12,9 @@ public class PostgisContainerProvider extends JdbcDatabaseContainerProvider {
     private static final String NAME = "postgis";
     private static final String DEFAULT_TAG = "10";
     private static final String DEFAULT_IMAGE = "mdillon/postgis";
+    public static final String USER_PARAM = "user";
+    public static final String PASSWORD_PARAM = "password";
+
 
     @Override
     public boolean supports(String databaseType) {
@@ -23,4 +30,9 @@ public JdbcDatabaseContainer newInstance() {
     public JdbcDatabaseContainer newInstance(String tag) {
         return new PostgreSQLContainer(DEFAULT_IMAGE + ":" + tag);
     }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+    }
 }
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
index 394fd5d49b8..77a0329c22c 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
@@ -1,9 +1,17 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.jdbc.ConnectionUrl;
+
+import java.util.Objects;
+
 /**
  * Factory for PostgreSQL containers.
  */
 public class PostgreSQLContainerProvider extends JdbcDatabaseContainerProvider {
+
+    public static final String USER_PARAM = "user";
+    public static final String PASSWORD_PARAM = "password";
+
     @Override
     public boolean supports(String databaseType) {
         return databaseType.equals(PostgreSQLContainer.NAME);
@@ -18,4 +26,10 @@ public JdbcDatabaseContainer newInstance() {
     public JdbcDatabaseContainer newInstance(String tag) {
         return new PostgreSQLContainer(PostgreSQLContainer.IMAGE + ":" + tag);
     }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+    }
+
 }

From e326e3ec42052bb6424cb0193c178b85fd1d1457 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 17 Mar 2019 15:55:54 +0000
Subject: [PATCH 0002/4969] Bump mockito-core from 2.24.5 to 2.25.0 in /core
 (#1294)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.24.5 to 2.25.0.
<details>
<summary>Release notes</summary>

*Sourced from [mockito-core's releases](https://github.com/mockito/mockito/releases).*

> ## v2.25.0
> <sup><sup>*Release notes were automatically generated by [Shipkit](http://shipkit.org/)*</sup></sup>
>
> #### 2.25.0
>  - 2019-03-05 - [11 commits](https://github.com/mockito/mockito/compare/v2.24.10...v2.25.0) by [Szczepan Faber](https://github.com/mockitoguy) (10), Garfield Tan (1) - published to [![Bintray](https://img.shields.io/badge/Bintray-2.25.0-green.svg)](https://bintray.com/mockito/maven/mockito/2.25.0)
>  - New API to clean up all inline mocks after test [([#1619](https://github-redirect.dependabot.com/mockito/mockito/issues/1619))](https://github-redirect.dependabot.com/mockito/mockito/pull/1619)
>  - Memory leak in mockito-inline calling method on mock with at least a mock as parameter [([#1614](https://github-redirect.dependabot.com/mockito/mockito/issues/1614))](https://github-redirect.dependabot.com/mockito/mockito/issues/1614)
>  - Cross-references and a single spy cause memory leak [([#1533](https://github-redirect.dependabot.com/mockito/mockito/issues/1533))](https://github-redirect.dependabot.com/mockito/mockito/issues/1533)
>  - Nested spies cause memory leaks  [([#1532](https://github-redirect.dependabot.com/mockito/mockito/issues/1532))](https://github-redirect.dependabot.com/mockito/mockito/issues/1532)
>
> ## v2.24.10
> <sup><sup>*Release notes were automatically generated by [Shipkit](http://shipkit.org/)*</sup></sup>
>
> #### 2.24.10
>  - 2019-03-05 - [4 commits](https://github.com/mockito/mockito/compare/v2.24.9...v2.24.10) by [Tim van der Lippe](https://github.com/TimvdLippe) - published to [![Bintray](https://img.shields.io/badge/Bintray-2.24.10-green.svg)](https://bintray.com/mockito/maven/mockito-development/2.24.10)
>  - Prevent NPE in findTypeFromGenericInArguments [([#1648](https://github-redirect.dependabot.com/mockito/mockito/issues/1648))](https://github-redirect.dependabot.com/mockito/mockito/pull/1648)
>
> ## v2.24.9
> <sup><sup>*Release notes were automatically generated by [Shipkit](http://shipkit.org/)*</sup></sup>
>
> #### 2.24.9
>  - 2019-03-04 - [12 commits](https://github.com/mockito/mockito/compare/v2.24.7...v2.24.9) by 6 authors - published to [![Bintray](https://img.shields.io/badge/Bintray-2.24.9-green.svg)](https://bintray.com/mockito/maven/mockito-development/2.24.9)
>  - Commits: [Brice Dutheil](https://github.com/bric3) (5), [Tim van der Lippe](https://github.com/TimvdLippe) (3), [epeee](https://github.com/epeee) (1), [Fr Jeremy Krieg](https://github.com/kriegfrj) (1), [PaweB PamuBa](https://github.com/PawelPamula) (1), shipkit-org (1)
>  - [Java 9 support] ClassCastExceptions with JDK9 javac [([#357](https://github-redirect.dependabot.com/mockito/mockito/issues/357))](https://github-redirect.dependabot.com/mockito/mockito/issues/357)
>  - [Bugfixes] RETURNS_DEEP_STUBS causes "Raw extraction not supported for : 'null'" in some cases [([#1621](https://github-redirect.dependabot.com/mockito/mockito/issues/1621))](https://github-redirect.dependabot.com/mockito/mockito/issues/1621)
>  - Update shipkit plugin (v2.1.6) [([#1647](https://github-redirect.dependabot.com/mockito/mockito/issues/1647))](https://github-redirect.dependabot.com/mockito/mockito/pull/1647)
>  - VerificationCollector to handle non-matching args and other assertions [([#1644](https://github-redirect.dependabot.com/mockito/mockito/issues/1644))](https://github-redirect.dependabot.com/mockito/mockito/pull/1644)
>  - VerificationCollector doesn't work for invocations with non-matching args [([#1642](https://github-redirect.dependabot.com/mockito/mockito/issues/1642))](https://github-redirect.dependabot.com/mockito/mockito/issues/1642)
>  - Fix returns mocks for final classes [([#1641](https://github-redirect.dependabot.com/mockito/mockito/issues/1641))](https://github-redirect.dependabot.com/mockito/mockito/pull/1641)
>  - Removes inaccessible links from javadocs in Mockito.java [([#1639](https://github-redirect.dependabot.com/mockito/mockito/issues/1639))](https://github-redirect.dependabot.com/mockito/mockito/pull/1639)
>  - Mockito.java contains inaccessible links to articles. [([#1638](https://github-redirect.dependabot.com/mockito/mockito/issues/1638))](https://github-redirect.dependabot.com/mockito/mockito/issues/1638)
>  - Handle terminal type var with bounds [([#1624](https://github-redirect.dependabot.com/mockito/mockito/issues/1624))](https://github-redirect.dependabot.com/mockito/mockito/pull/1624)
>  - Return null instead of causing a CCE [([#1612](https://github-redirect.dependabot.com/mockito/mockito/issues/1612))](https://github-redirect.dependabot.com/mockito/mockito/pull/1612)
>
> ## v2.24.8
> <sup><sup>*Release notes were automatically generated by [Shipkit](http://shipkit.org/)*</sup></sup>
>
> #### 2.24.8
>  - 2019-03-01 - [2 commits](https://github.com/mockito/mockito/compare/v2.24.7...v2.24.8) by [PaweB PamuBa](https://github.com/PawelPamula) (1), [shipkit-org](https://github.com/shipkit-org) (1) - published to [![Bintray](https://img.shields.io/badge/Bintray-2.24.8-green.svg)](https://bintray.com/mockito/maven/mockito-development/2.24.8)
>  - Removes inaccessible links from javadocs in Mockito.java [([#1639](https://github-redirect.dependabot.com/mockito/mockito/issues/1639))](https://github-redirect.dependabot.com/mockito/mockito/pull/1639)
>  - Mockito.java contains inaccessible links to articles. [([#1638](https://github-redirect.dependabot.com/mockito/mockito/issues/1638))](https://github-redirect.dependabot.com/mockito/mockito/issues/1638)
>
> ## v2.24.7
> <sup><sup>*Release notes were automatically generated by [Shipkit](http://shipkit.org/)*</sup></sup>
>
> #### 2.24.7
>  - 2019-02-28 - [2 commits](https://github.com/mockito/mockito/compare/v2.24.6...v2.24.7) by [shipkit-org](https://github.com/shipkit-org) (1), [Tim van der Lippe](https://github.com/TimvdLippe) (1) - published to [![Bintray](https://img.shields.io/badge/Bintray-2.24.7-green.svg)](https://bintray.com/mockito/maven/mockito-development/2.24.7)
>  - Fix handling of generics in ReturnsMocks [([#1635](https://github-redirect.dependabot.com/mockito/mockito/issues/1635))](https://github-redirect.dependabot.com/mockito/mockito/pull/1635)
>
> ## v2.24.6
></tr></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>

- [`70c6fa4`](https://github.com/mockito/mockito/commit/70c6fa4a056e5bf6ce1c464d5e4c5bd6431a2828) 2.25.0 release (previous 2.24.10) + release notes updated by CI build 3956
- [`a7ee084`](https://github.com/mockito/mockito/commit/a7ee084e8501b29d74466213c869f9acbd26635c) Merge pull request [#1619](https://github-redirect.dependabot.com/mockito/mockito/issues/1619) from ttanxu/release/2.x
- [`959cba4`](https://github.com/mockito/mockito/commit/959cba41910f7bf215fe66d2932bf3b348d83014) Merge branch 'release/2.x' into release/2.x
- [`1641868`](https://github.com/mockito/mockito/commit/1641868a4651bf5c020f7afeb50fc728c3e38d27) Javadoc
- [`d61a8be`](https://github.com/mockito/mockito/commit/d61a8beb9a4bb8234e3685c9c55dff05de8d2673) Added missing coverage
- [`af2d33b`](https://github.com/mockito/mockito/commit/af2d33be7fbfecad172cef4da2127b8d9a6fbe31) 2.24.10 release (previous 2.24.9) + release notes updated by CI build 3953
- [`1183d1f`](https://github.com/mockito/mockito/commit/1183d1fa72311ef82998cd91ee5f4bb5182c96d5) Merge pull request [#1648](https://github-redirect.dependabot.com/mockito/mockito/issues/1648) from mockito/TimvdLippe-patch-1
- [`2894895`](https://github.com/mockito/mockito/commit/2894895746950be644af81055bf7543ff4e9f832) Fix checkstyle warnings
- [`2d21a5a`](https://github.com/mockito/mockito/commit/2d21a5abc744084646d9939d5ed9d1825695af9a) Add regression test
- [`b5e9400`](https://github.com/mockito/mockito/commit/b5e9400b01f8bfbda436c79ce5f857b3dc613657) Prevent NPE in findTypeFromGenericInArguments
- Additional commits viewable in [compare view](https://github.com/mockito/mockito/compare/v2.24.5...v2.25.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.mockito:mockito-core&package-manager=gradle&previous-version=2.24.5&new-version=2.25.0)](https://dependabot.com/compatibility-score.html?dependency-name=org.mockito:mockito-core&package-manager=gradle&previous-version=2.24.5&new-version=2.25.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index bea5b94da63..19edabfb813 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -120,7 +120,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.6.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.1'
-    testCompile ('org.mockito:mockito-core:2.24.5') {
+    testCompile ('org.mockito:mockito-core:2.25.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From b1b8cf354a0fc15af23d1bd082f817039b89bfab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 17 Mar 2019 15:56:08 +0000
Subject: [PATCH 0003/4969] Bump transport from 6.6.1 to 6.6.2 in
 /modules/elasticsearch (#1302)

Bumps [transport](https://github.com/elastic/elasticsearch) from 6.6.1 to 6.6.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v6.6.1...v6.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a41455f76aa..7d8f0f5eb1a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.6.1"
-    testCompile "org.elasticsearch.client:transport:6.6.1"
+    testCompile "org.elasticsearch.client:transport:6.6.2"
 }

From 5a3c9f395043ef2c5d3ff123dfaeb7771b0234fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 17 Mar 2019 15:56:43 +0000
Subject: [PATCH 0004/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#1301)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 6.6.1 to 6.6.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v6.6.1...v6.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 7d8f0f5eb1a..78d8c96a4be 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.6.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.6.2"
     testCompile "org.elasticsearch.client:transport:6.6.2"
 }

From 604fd0ee0e8aba424c8ea63e887b4b941bb533d5 Mon Sep 17 00:00:00 2001
From: Gerasimov Gennady <gennady.g.gerasimov@gmail.com>
Date: Sun, 17 Mar 2019 23:14:51 +0300
Subject: [PATCH 0005/4969] #1256 Added fsync=off option by default (#1280)

---
 .../org/testcontainers/containers/PostgreSQLContainer.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 232daa89284..13c5b49efc7 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -22,6 +22,8 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
     private String username = "test";
     private String password = "test";
 
+    private static final String FSYNC_OFF_OPTION = "fsync=off";
+
     public PostgreSQLContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
@@ -47,7 +49,7 @@ protected void configure() {
         addEnv("POSTGRES_DB", databaseName);
         addEnv("POSTGRES_USER", username);
         addEnv("POSTGRES_PASSWORD", password);
-        setCommand("postgres");
+        setCommand("postgres", "-c", FSYNC_OFF_OPTION);
     }
 
     @Override

From 43e971f43a87f25a75c4410d3199cf576d157c92 Mon Sep 17 00:00:00 2001
From: Dan Markhasin <minimizer@gmail.com>
Date: Mon, 18 Mar 2019 17:53:47 +0200
Subject: [PATCH 0006/4969] get exitcode from inspectExecCmd (#1318)

* get exitcode from inspectExecCmd

* Update core/src/main/java/org/testcontainers/containers/Container.java

Co-Authored-By: dmarkhas <minimizer@gmail.com>

* Update core/src/main/java/org/testcontainers/containers/Container.java

Co-Authored-By: dmarkhas <minimizer@gmail.com>

* Update core/src/main/java/org/testcontainers/containers/Container.java

Co-Authored-By: dmarkhas <minimizer@gmail.com>

* Use Lombok's `@Value` in `ExecResult`

* Update Container.java
---
 .../testcontainers/containers/Container.java  | 30 +++++++++----------
 .../containers/ExecInContainerPattern.java    |  2 ++
 .../InternalCommandPortListeningCheck.java    | 10 +++----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index 6c5e547f7fa..ca327149ab5 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -3,7 +3,10 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Info;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.NonNull;
+import lombok.Value;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
@@ -36,24 +39,21 @@ default SELF self() {
     }
 
     /**
-     * Class to hold results from a "docker exec" command. Note that, due to the limitations of the
-     * docker API, there's no easy way to get the result code from the process we ran.
+     * Class to hold results from a "docker exec" command
      */
+    @Value
+    @AllArgsConstructor(access = AccessLevel.MODULE)
     class ExecResult {
-        private final String stdout;
-        private final String stderr;
-
+        int exitCode;
+        String stdout;
+        String stderr;
+
+        /**
+         * @deprecated should not be instantiated outside of the library, please migrate
+         */
+        @Deprecated
         public ExecResult(String stdout, String stderr) {
-            this.stdout = stdout;
-            this.stderr = stderr;
-        }
-
-        public String getStdout() {
-            return stdout;
-        }
-
-        public String getStderr() {
-            return stderr;
+            this(-1, stdout, stderr);
         }
     }
 
diff --git a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
index af1e7e8d503..3d0f4c2c360 100644
--- a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
+++ b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
@@ -82,8 +82,10 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
         callback.addConsumer(OutputFrame.OutputType.STDERR, stderrConsumer);
 
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(callback).awaitCompletion();
+        Integer exitCode = dockerClient.inspectExecCmd(execCreateCmdResponse.getId()).exec().getExitCode();
 
         final Container.ExecResult result = new Container.ExecResult(
+            exitCode,
             stdoutConsumer.toString(outputCharset),
             stderrConsumer.toString(outputCharset));
 
diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index a4ba013b9d7..bad30fef653 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -14,8 +14,6 @@
 @RequiredArgsConstructor
 public class InternalCommandPortListeningCheck implements java.util.concurrent.Callable<Boolean> {
 
-    private static final String SUCCESS_MARKER = "TESTCONTAINERS_SUCCESS";
-
     private final WaitStrategyTarget waitStrategyTarget;
     private final Set<Integer> internalPorts;
 
@@ -30,14 +28,14 @@ public Boolean call() {
 
     private void tryPort(Integer internalPort) {
         String[][] commands = {
-                {"/bin/sh", "-c", format("cat /proc/net/tcp{,6} | awk '{print $2}' | grep -i :%x && echo %s", internalPort, SUCCESS_MARKER)},
-                {"/bin/sh", "-c", format("nc -vz -w 1 localhost %d && echo %s", internalPort, SUCCESS_MARKER)},
-                {"/bin/bash", "-c", format("</dev/tcp/localhost/%d && echo %s", internalPort, SUCCESS_MARKER)}
+                {"/bin/sh", "-c", format("cat /proc/net/tcp{,6} | awk '{print $2}' | grep -i :%x", internalPort)},
+                {"/bin/sh", "-c", format("nc -vz -w 1 localhost %d", internalPort)},
+                {"/bin/bash", "-c", format("</dev/tcp/localhost/%d", internalPort)}
         };
 
         for (String[] command : commands) {
             try {
-                if (ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), command).getStdout().contains(SUCCESS_MARKER)) {
+                if (ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), command).getExitCode() == 0) {
                     return;
                 }
             } catch (Exception e) {

From c03a22b548c972a80e8cafeaef20fe70fe7872ee Mon Sep 17 00:00:00 2001
From: Nikita Zhevnitskiy <nikita.zhevnitskiy@gmail.com>
Date: Mon, 18 Mar 2019 21:18:21 +0100
Subject: [PATCH 0007/4969] CredsStore validation for RegistryAuthLocator
 (#1303)

 ## Fixes
`RegistryAuthLocator` : Add additional validation for existing key `credsStore` but empty value

## Purpose
Define behaviour for RegistryAuthLocator on empty values in config

Offer:
 - fail on empty value
 - ignore field with empty value & log -> return null;

## Background Context
Currently experienced problems using testcontainers, I found existing issue for my problem and decided to help.
Potentially, put checks for all existing `keys` with empty strings

## References
ref: #921
---
 .../testcontainers/utility/RegistryAuthLocator.java    |  4 ++++
 .../utility/RegistryAuthLocatorTest.java               | 10 ++++++++++
 .../resources/auth-config/config-with-store-empty.json |  9 +++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 core/src/test/resources/auth-config/config-with-store-empty.json

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index efe7303d581..402a15d58b4 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -183,6 +183,10 @@ private AuthConfig authConfigUsingStore(final JsonNode config, final String repo
         final JsonNode credsStoreNode = config.get("credsStore");
         if (credsStoreNode != null && !credsStoreNode.isMissingNode() && credsStoreNode.isTextual()) {
             final String credsStore = credsStoreNode.asText();
+            if (isBlank(credsStore)) {
+                log.warn("Docker auth config credsStore field will be ignored, because value is blank");
+                return null;
+            }
             return runCredentialProvider(reposName, credsStore);
         }
         return null;
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index fa1770df4f1..938505c0212 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -101,6 +101,16 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException
             discoveredMessage);
     }
 
+    @Test
+    public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store-empty.json");
+
+        DockerImageName dockerImageName = new DockerImageName("registry2.example.com/org/repo");
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(dockerImageName, new AuthConfig());
+
+        assertNull("CredStore field will be ignored, because value is blank", authConfig.getAuth());
+    }
+
     @NotNull
     private RegistryAuthLocator createTestAuthLocator(String configName) throws URISyntaxException {
         return createTestAuthLocator(configName, new HashMap<>());
diff --git a/core/src/test/resources/auth-config/config-with-store-empty.json b/core/src/test/resources/auth-config/config-with-store-empty.json
new file mode 100644
index 00000000000..4106187ff1e
--- /dev/null
+++ b/core/src/test/resources/auth-config/config-with-store-empty.json
@@ -0,0 +1,9 @@
+{
+    "auths": {
+        "registry.example.com": {}
+    },
+    "HttpHeaders": {
+        "User-Agent": "Docker-Client/18.03.0-ce (darwin)"
+    },
+    "credsStore": ""
+}

From 21f64ea8accd77f669711d09d0cfc8798cd366b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:19:24 +0000
Subject: [PATCH 0008/4969] Bump junit-jupiter-api from 5.4.0 to 5.4.1 in
 /modules/junit-jupiter (#1311)

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.0...r5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 fff8099606d..17f8fbc419b 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.4.0'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.4.1'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From 42a25cba65aa09045dbbe6ae47d80ea2678cc1c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:28:22 +0000
Subject: [PATCH 0009/4969] Bump assertj-core from 3.12.1 to 3.12.2 in
 /modules/pulsar (#1312)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.12.1 to 3.12.2.
<details>
<summary>Commits</summary>

- [`5dd7fac`](https://github.com/joel-costigliola/assertj-core/commit/5dd7facdfb3e3a17e5dbbc213ab9ac6656987186) [maven-release-plugin] prepare release assertj-core-3.12.2
- [`d427863`](https://github.com/joel-costigliola/assertj-core/commit/d42786341730e51ee9203d5eacfddb2ea59f5592) Update Guava test dependency to version 27.1-jre.
- [`cb5b285`](https://github.com/joel-costigliola/assertj-core/commit/cb5b285ac7e0e74fc6059cf8606fc0a82a8deb12) anySatisfy (Maps): do not continue evaluating elements once we found a match ...
- [`8d83c41`](https://github.com/joel-costigliola/assertj-core/commit/8d83c419f34f7dab982cd84d438480cf74e3b17a) Ignore static methods when finding property accessors. Fixes [#1458](https://github-redirect.dependabot.com/joel-costigliola/assertj-core/issues/1458)
- [`b600f5b`](https://github.com/joel-costigliola/assertj-core/commit/b600f5be7e49efff47199bc02e2bca3d02466354) Use URI#create (which does not throw a checked Exception) in tests.
- [`91af5c9`](https://github.com/joel-costigliola/assertj-core/commit/91af5c9838a05b8b3d7dc7c2e0fdaf0d25712533) [maven-release-plugin] prepare for next development iteration
- See full diff in [compare view](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.12.1...assertj-core-3.12.2)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.assertj:assertj-core&package-manager=gradle&previous-version=3.12.1&new-version=3.12.2)](https://dependabot.com/compatibility-score.html?dependency-name=org.assertj:assertj-core&package-manager=gradle&previous-version=3.12.1&new-version=3.12.2)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index eaddd4a3862..a67c83cc923 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.0'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.1'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
 }

From 4c6518fa8c974996d2801aec45d01c591d0f10eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:28:37 +0000
Subject: [PATCH 0010/4969] Bump mockito-core from 2.25.0 to 2.25.1 in /core
 (#1313)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.25.0...v2.25.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 19edabfb813..be95690bc1e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -120,7 +120,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.6.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.1'
-    testCompile ('org.mockito:mockito-core:2.25.0') {
+    testCompile ('org.mockito:mockito-core:2.25.1') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 5a7924ac3093d31452b1a84e28375fe7d7bcc0c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:28:49 +0000
Subject: [PATCH 0011/4969] Bump junit-jupiter-engine from 5.4.0 to 5.4.1 in
 /modules/junit-jupiter (#1310)

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.0...r5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 17f8fbc419b..9ab71fe7c43 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.15'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.1'
 }
 
 test {

From a69662d1cb7667cc001e6a6704cb8e44509b4387 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:29:01 +0000
Subject: [PATCH 0012/4969] Bump assertj-core from 3.12.1 to 3.12.2 in
 /modules/kafka (#1316)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.12.1 to 3.12.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.12.1...assertj-core-3.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index ad781298deb..6985f7a89a6 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.1.1'
-    testCompile 'org.assertj:assertj-core:3.12.1'
+    testCompile 'org.assertj:assertj-core:3.12.2'
     testCompile 'com.google.guava:guava:23.0'
 }

From f23dbdf37493a77f80c09dddd57007ee31897845 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:29:34 +0000
Subject: [PATCH 0013/4969] Bump assertj-core from 3.12.1 to 3.12.2 in /core
 (#1314)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[//]: # (dependabot-start)
⚠️  **Dependabot is rebasing this PR** ⚠️

If you make any changes to it yourself then they will take precedence over the rebase.

---

[//]: # (dependabot-end)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.12.1 to 3.12.2.
<details>
<summary>Commits</summary>

- [`5dd7fac`](https://github.com/joel-costigliola/assertj-core/commit/5dd7facdfb3e3a17e5dbbc213ab9ac6656987186) [maven-release-plugin] prepare release assertj-core-3.12.2
- [`d427863`](https://github.com/joel-costigliola/assertj-core/commit/d42786341730e51ee9203d5eacfddb2ea59f5592) Update Guava test dependency to version 27.1-jre.
- [`cb5b285`](https://github.com/joel-costigliola/assertj-core/commit/cb5b285ac7e0e74fc6059cf8606fc0a82a8deb12) anySatisfy (Maps): do not continue evaluating elements once we found a match ...
- [`8d83c41`](https://github.com/joel-costigliola/assertj-core/commit/8d83c419f34f7dab982cd84d438480cf74e3b17a) Ignore static methods when finding property accessors. Fixes [#1458](https://github-redirect.dependabot.com/joel-costigliola/assertj-core/issues/1458)
- [`b600f5b`](https://github.com/joel-costigliola/assertj-core/commit/b600f5be7e49efff47199bc02e2bca3d02466354) Use URI#create (which does not throw a checked Exception) in tests.
- [`91af5c9`](https://github.com/joel-costigliola/assertj-core/commit/91af5c9838a05b8b3d7dc7c2e0fdaf0d25712533) [maven-release-plugin] prepare for next development iteration
- See full diff in [compare view](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.12.1...assertj-core-3.12.2)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.assertj:assertj-core&package-manager=gradle&previous-version=3.12.1&new-version=3.12.2)](https://dependabot.com/compatibility-score.html?dependency-name=org.assertj:assertj-core&package-manager=gradle&previous-version=3.12.1&new-version=3.12.2)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index be95690bc1e..4f0a0a7392d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -129,6 +129,6 @@ dependencies {
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
-    jarFileTestCompile 'org.assertj:assertj-core:3.12.1'
+    jarFileTestCompile 'org.assertj:assertj-core:3.12.2'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
 }

From b12c9470b18beca6c072a7afa38fd9c59f0f983f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:29:46 +0000
Subject: [PATCH 0014/4969] Bump assertj-core from 3.12.1 to 3.12.2 in
 /modules/neo4j (#1315)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.12.1 to 3.12.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.12.1...assertj-core-3.12.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index abdd5044cdc..092cb3a6889 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -30,5 +30,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.3"
-    testCompile 'org.assertj:assertj-core:3.12.1'
+    testCompile 'org.assertj:assertj-core:3.12.2'
 }

From 34a2347055f232a98cce15dc7cd148690e699106 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:29:58 +0000
Subject: [PATCH 0015/4969] Bump mariadb-java-client from 2.4.0 to 2.4.1 in
 /modules/mariadb (#1317)

Bumps [mariadb-java-client](https://github.com/MariaDB/mariadb-connector-j) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/MariaDB/mariadb-connector-j/releases)
- [Commits](https://github.com/MariaDB/mariadb-connector-j/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 3cebd55943d..110e63f2444 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.0'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.1'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.16'

From 9c651fe3052cb2f68d6faca887d1efe9e5e5e7b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2019 09:28:33 +0000
Subject: [PATCH 0016/4969] Bump tomcat-jdbc from 9.0.16 to 9.0.17 in
 /modules/mysql (#1321)

Bumps tomcat-jdbc from 9.0.16 to 9.0.17.

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.apache.tomcat:tomcat-jdbc&package-manager=gradle&previous-version=9.0.16&new-version=9.0.17)](https://dependabot.com/compatibility-score.html?dependency-name=org.apache.tomcat:tomcat-jdbc&package-manager=gradle&previous-version=9.0.16&new-version=9.0.17)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 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 deaf441f633..0703b29ad3a 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.14'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.16'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.17'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 50db30a9d36a21d83b81314216cc2419325140ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2019 09:28:52 +0000
Subject: [PATCH 0017/4969] Bump tomcat-jdbc from 9.0.16 to 9.0.17 in
 /modules/mariadb (#1322)

Bumps tomcat-jdbc from 9.0.16 to 9.0.17.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 110e63f2444..1f679b7a592 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.1'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.16'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.17'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 5109f4c1f4f04460fe5f1b965d974125ec4c0b57 Mon Sep 17 00:00:00 2001
From: Dan Markhasin <minimizer@gmail.com>
Date: Tue, 19 Mar 2019 11:53:19 +0200
Subject: [PATCH 0018/4969] updated docs with exitCode (#1319)

---
 docs/examples/src/test/java/generic/ExecTest.java | 2 ++
 docs/features/commands.md                         | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/src/test/java/generic/ExecTest.java b/docs/examples/src/test/java/generic/ExecTest.java
index 3ff67956d39..e160390c293 100644
--- a/docs/examples/src/test/java/generic/ExecTest.java
+++ b/docs/examples/src/test/java/generic/ExecTest.java
@@ -24,7 +24,9 @@ public void testSimpleExec() throws IOException, InterruptedException {
         // execReadingStdout {
         Container.ExecResult lsResult = container.execInContainer("ls", "-al", "/");
         String stdout = lsResult.getStdout();
+        int exitCode = lsResult.getExitCode();
         assertTrue(stdout.contains("somefile.txt"));
+        assertTrue(exitCode == 0);
         // }
     }
 }
diff --git a/docs/features/commands.md b/docs/features/commands.md
index 238c140765e..197871ebe02 100644
--- a/docs/features/commands.md
+++ b/docs/features/commands.md
@@ -16,14 +16,12 @@ Your test can execute a command inside a running container, similar to a `docker
 [Executing a command inside a running container](../examples/src/test/java/generic/ExecTest.java) inside_block:standaloneExec
 <!--/codeinclude-->
 
-This can be useful for software that has a command line administration tool. You can also get the output (stdout/stderr) from the command - for example:
+This can be useful for software that has a command line administration tool. You can also get the output (stdout/stderr) and exit code from the command - for example:
 
 <!--codeinclude-->
 [Executing a command inside a running container and reading the result](../examples/src/test/java/generic/ExecTest.java) inside_block:execReadingStdout
 <!--/codeinclude-->
 
-Note that there is no way to get the return code of the executed command, only stdout/stderr.
-
 ## Environment variables
 
 To add environment variables to the container, use `withEnv`:

From 99e2c1ce00b00c4758cfa4247fc7104475ecae26 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 19 Mar 2019 11:00:07 +0100
Subject: [PATCH 0019/4969] Remove netty transport, rework shading (#1307)

* Remove Netty transport from docker-java

* Remove Netty transport from docker-java, rework the shading config

* exclude public API dependencies from the shaded ones

* encode filter's key, remove `okhttp` stage

* fix the jupiter tests

* fix the spock tests
---
 build.gradle                                  |  33 +-
 core/build.gradle                             |  46 +--
 .../testcontainers/JarFileShadingTest.java    |   8 +-
 .../dockerjava/core/util/FiltersEncoder.java  |  27 ++
 .../DockerClientProviderStrategy.java         |   4 -
 .../TestcontainersDockerCmdExecFactory.java   | 317 ------------------
 .../utility/ResourceReaper.java               |  19 +-
 .../core/util/FiltersEncoderTest.java         |  28 ++
 modules/junit-jupiter/build.gradle            |   1 +
 modules/spock/build.gradle                    |   3 +-
 10 files changed, 94 insertions(+), 392 deletions(-)
 create mode 100644 core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/transport/TestcontainersDockerCmdExecFactory.java
 create mode 100644 core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java

diff --git a/build.gradle b/build.gradle
index 318562a8936..75977bd540f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,32 +56,17 @@ subprojects {
         configurations = []
         classifier = null
 
-        relocate('META-INF/native/libnetty', 'META-INF/native/liborg-testcontainers-shaded-netty')
-
-        [
-            "org.apache.http",
-            "org.apache.commons.lang",
-            "org.apache.commons.io",
-            "org.apache.commons.codec",
-            "org.glassfish",
-            "org.aopalliance",
-            "org.jvnet",
-            "javax.annotation",
-            "javax.inject",
-            "javax.ws.rs",
-            "com.fasterxml.jackson",
-            "jersey.repackaged",
-            "com.google",
-            "io.netty",
-            "org.bouncycastle",
-            "org.zeroturnaround",
-            "okhttp3",
-            "okio",
-            "org.scalasbt.ipcsocket",
-            "com.trilead.ssh2",
-        ].each { relocate(it, "org.testcontainers.shaded.$it") }
+        // Keep docker-java's package inside the final jar
+        relocate("com.github.dockerjava", "com.github.dockerjava")
     }
 
+    task relocateShadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation) {
+        target = tasks.shadowJar
+        prefix = "org.testcontainers.shaded"
+    }
+
+    tasks.shadowJar.dependsOn tasks.relocateShadowJar
+
     publishing {
         publications {
             mavenJava(MavenPublication) { publication ->
diff --git a/core/build.gradle b/core/build.gradle
index 4f0a0a7392d..1e3083c4542 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -21,7 +21,6 @@ shadowJar {
     exclude 'org/newsclub/**'
 
     [
-        'META-INF/io.netty.versions.properties',
         'META-INF/NOTICE',
         'META-INF/NOTICE.txt',
         'META-INF/LICENSE',
@@ -33,31 +32,16 @@ shadowJar {
         'META-INF/services/com.fasterxml.jackson.core.*',
         'META-INF/services/com.github.dockerjava.api.command.*',
         'META-INF/services/javax.ws.rs.ext.*',
-        'META-INF/services/org.glassfish.hk2.extension.*',
-        'META-INF/services/org.jvnet.hk2.external.generator.*',
-        'META-INF/services/org.glassfish.jersey.internal.spi.*',
         'META-INF/services/java.security.Provider',
         'mozilla/public-suffix-list.txt',
     ].each { exclude(it) }
 
-    dependencies {
-        include(dependency('org.apache.httpcomponents:.*'))
-        include(dependency('org.glassfish.*:.*'))
-        include(dependency('org.aopalliance.*:.*'))
-        include(dependency('javax.ws.rs:.*'))
-        include(dependency('com.fasterxml.*:.*'))
-        include(dependency('com.github.docker-java:.*'))
-        include(dependency('com.google.guava:.*'))
-        include(dependency('io.netty:.*'))
-        include(dependency('org.bouncycastle:.*'))
-        include(dependency('org.zeroturnaround:zt-exec'))
-        include(dependency('commons-lang:commons-lang'))
-        include(dependency('commons-io:commons-io'))
-        include(dependency('commons-codec:commons-codec'))
-        include(dependency('com.squareup.okhttp3:.*'))
-        include(dependency('com.squareup.okio:.*'))
-        include(dependency('org.scala-sbt.ipcsocket:ipcsocket'))
-        include(dependency('org.glassfish.main.external:trilead-ssh2-repackaged'))
+    project.afterEvaluate {
+        dependencies {
+            for (id in project.configurations.compile.resolvedConfiguration.resolvedArtifacts*.moduleVersion*.id) {
+                exclude(dependency("${id.group}:${id.name}"))
+            }
+        }
     }
 }
 
@@ -98,25 +82,25 @@ dependencies {
     shaded ('com.github.docker-java:docker-java:3.1.0-rc-4') {
         exclude(group: 'org.glassfish.jersey.core')
         exclude(group: 'org.glassfish.jersey.connectors')
+        exclude(group: 'org.glassfish.jersey.inject')
         exclude(group: 'log4j')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'com.kohlschutter.junixsocket')
+        exclude(group: 'io.netty')
+        exclude(group: 'org.apache.httpcomponents')
+        exclude(group: 'org.slf4j')
+        exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
+
     shaded 'com.squareup.okhttp3:okhttp:3.12.1'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
-    shaded 'javax.ws.rs:javax.ws.rs-api:2.0.1'
-    shaded 'org.zeroturnaround:zt-exec:1.10'
-    shaded 'commons-lang:commons-lang:2.6'
-    shaded 'commons-io:commons-io:2.6'
-    shaded 'commons-codec:commons-codec:1.12'
-    // docker-java uses SslConfigurator from jersey-common for TLS
-    shaded ('org.glassfish.jersey.core:jersey-common:2.27') {
-        // SslConfigurator doesn't use classes from dependencies
-        exclude(module: '*')
+    shaded 'org.zeroturnaround:zt-exec:1.10', {
+        exclude(group: 'org.slf4j')
     }
 
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.7'
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.6.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.1'
diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index ee950f4698c..cf807087d55 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -37,13 +37,7 @@ public void testPackages() throws Exception {
     public void testMetaInf() throws Exception {
         assertThatFileList(root.resolve("META-INF")).containsOnly(
                 "MANIFEST.MF",
-                "services",
-                "native"
-        );
-
-        assertThatFileList(root.resolve("META-INF").resolve("native")).containsOnly(
-                "liborg-testcontainers-shaded-netty_transport_native_epoll_x86_64.so",
-                "liborg-testcontainers-shaded-netty_transport_native_kqueue_x86_64.jnilib"
+                "services"
         );
     }
 
diff --git a/core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
new file mode 100644
index 00000000000..2a6f185462e
--- /dev/null
+++ b/core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.core.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Monkey patched {@link FiltersEncoder} to avoid a use of jaxrs.
+ * See https://github.com/docker-java/docker-java/issues/1176
+ */
+public class FiltersEncoder {
+
+    private FiltersEncoder() {
+    }
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    public static String jsonEncode(Map<String, List<String>> filters) {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(filters);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 186fd194131..a9321276fd6 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -13,7 +13,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.dockerclient.auth.AuthDelegatingDockerClientConfig;
-import org.testcontainers.dockerclient.transport.TestcontainersDockerCmdExecFactory;
 import org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
@@ -173,9 +172,6 @@ protected DockerClient getClientForConfig(DockerClientConfig config) {
         if ("okhttp".equals(transportType)) {
             clientBuilder
                 .withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory());
-        } else if ("netty".equals(transportType)) {
-            clientBuilder
-                .withDockerCmdExecFactory(new TestcontainersDockerCmdExecFactory());
         } else {
             throw new IllegalArgumentException("Unknown transport type: " + transportType);
         }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/TestcontainersDockerCmdExecFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/TestcontainersDockerCmdExecFactory.java
deleted file mode 100644
index 1ec43e2b251..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/TestcontainersDockerCmdExecFactory.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package org.testcontainers.dockerclient.transport;
-
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.SSLConfig;
-import com.github.dockerjava.core.WebTarget;
-import com.github.dockerjava.netty.NettyWebTarget;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.*;
-import io.netty.channel.epoll.EpollDomainSocketChannel;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.kqueue.KQueueDomainSocketChannel;
-import io.netty.channel.kqueue.KQueueEventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.DuplexChannel;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.channel.unix.DomainSocketAddress;
-import io.netty.channel.unix.UnixChannel;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.codec.http.HttpContentDecompressor;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
-import io.netty.handler.timeout.IdleStateHandler;
-import io.netty.util.concurrent.DefaultThreadFactory;
-import org.apache.commons.lang.SystemUtils;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.testcontainers.DockerClientFactory;
-
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-import java.io.IOException;
-import java.net.SocketTimeoutException;
-import java.security.Security;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-/**
- * This class is a modified version of docker-java's NettyDockerCmdExecFactory v3.1.0-rc-2
- * Changes:
- * - daemonized thread factory
- * - thread group
- * - the logging handler removed
- * -
- */
-public class TestcontainersDockerCmdExecFactory extends AbstractDockerCmdExecFactory implements DockerCmdExecFactory {
-
-    private static final String THREAD_PREFIX = "testcontainers-netty";
-
-    /*
-     * useful links:
-     *
-     * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-socket-failed
-     * http://netty.io/wiki/native-transports.html
-     * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClient.java
-     * https://github.com/slandelle/netty-request-chunking/blob/master/src/test/java/slandelle/ChunkingTest.java
-     */
-
-    private Bootstrap bootstrap;
-
-    private EventLoopGroup eventLoopGroup;
-
-    private NettyInitializer nettyInitializer;
-
-    private WebTarget baseResource;
-
-    private Integer connectTimeout = null;
-
-    private Integer readTimeout = null;
-
-    @Override
-    public void init(DockerClientConfig dockerClientConfig) {
-        super.init(dockerClientConfig);
-
-        bootstrap = new Bootstrap();
-
-        String scheme = dockerClientConfig.getDockerHost().getScheme();
-        String host = "";
-
-        if ("unix".equals(scheme)) {
-            nettyInitializer = new UnixDomainSocketInitializer();
-            host = "DUMMY";
-        } else if ("tcp".equals(scheme)) {
-            nettyInitializer = new InetSocketInitializer();
-            host = dockerClientConfig.getDockerHost().getHost() + ":"
-                + Integer.toString(dockerClientConfig.getDockerHost().getPort());
-        }
-
-        eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
-
-        baseResource = new NettyWebTarget(this::connect, host)
-            .path(dockerClientConfig.getApiVersion().asWebPathPart());
-    }
-
-    private DuplexChannel connect() {
-        checkState(!eventLoopGroup.isShuttingDown(), "EventLoop is shutting down");
-
-        try {
-            return connect(bootstrap);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException {
-        return nettyInitializer.connect(bootstrap);
-    }
-
-    private interface NettyInitializer {
-        EventLoopGroup init(final Bootstrap bootstrap, DockerClientConfig dockerClientConfig);
-
-        DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException;
-    }
-
-    private ThreadFactory createThreadFactory() {
-        return new DefaultThreadFactory(THREAD_PREFIX, true, Thread.NORM_PRIORITY, DockerClientFactory.TESTCONTAINERS_THREAD_GROUP);
-    }
-
-    private class UnixDomainSocketInitializer implements NettyInitializer {
-        @Override
-        public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
-            if (SystemUtils.IS_OS_LINUX) {
-                return epollGroup();
-            } else if (SystemUtils.IS_OS_MAC_OSX) {
-                return kqueueGroup();
-            }
-            throw new RuntimeException("Unsupported OS");
-        }
-
-        public EventLoopGroup epollGroup() {
-            EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, createThreadFactory());
-
-            ChannelFactory<EpollDomainSocketChannel> factory = () -> configure(new EpollDomainSocketChannel());
-
-            bootstrap.group(epollEventLoopGroup).channelFactory(factory).handler(new ChannelInitializer<UnixChannel>() {
-                @Override
-                protected void initChannel(final UnixChannel channel) throws Exception {
-                    channel.pipeline().addLast(new HttpClientCodec());
-                    channel.pipeline().addLast(new HttpContentDecompressor());
-                }
-            });
-            return epollEventLoopGroup;
-        }
-
-        public EventLoopGroup kqueueGroup() {
-            EventLoopGroup nioEventLoopGroup = new KQueueEventLoopGroup(0, createThreadFactory());
-
-            bootstrap.group(nioEventLoopGroup).channel(KQueueDomainSocketChannel.class)
-                    .handler(new ChannelInitializer<KQueueDomainSocketChannel>() {
-                        @Override
-                        protected void initChannel(final KQueueDomainSocketChannel channel) throws Exception {
-                            channel.pipeline().addLast(new HttpClientCodec());
-                            channel.pipeline().addLast(new HttpContentDecompressor());
-                        }
-                    });
-
-            return nioEventLoopGroup;
-        }
-
-        @Override
-        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
-            String socketPath = getDockerClientConfig().getDockerHost().getPath();
-            return (DuplexChannel) bootstrap.connect(new DomainSocketAddress(socketPath)).sync().channel();
-        }
-    }
-
-    private class InetSocketInitializer implements NettyInitializer {
-        @Override
-        public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerClientConfig) {
-            EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(0, createThreadFactory());
-
-            // TODO do we really need BouncyCastle?
-            Security.addProvider(new BouncyCastleProvider());
-
-            ChannelFactory<NioSocketChannel> factory = () -> configure(new NioSocketChannel());
-
-            bootstrap.group(nioEventLoopGroup).channelFactory(factory)
-                    .handler(new ChannelInitializer<SocketChannel>() {
-                        @Override
-                        protected void initChannel(final SocketChannel channel) throws Exception {
-                            channel.pipeline().addLast(new HttpClientCodec());
-                            channel.pipeline().addLast(new HttpContentDecompressor());
-                        }
-                    });
-
-            return nioEventLoopGroup;
-        }
-
-        @Override
-        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
-            DockerClientConfig dockerClientConfig = getDockerClientConfig();
-            String host = dockerClientConfig.getDockerHost().getHost();
-            int port = dockerClientConfig.getDockerHost().getPort();
-
-            if (port == -1) {
-                throw new RuntimeException("no port configured for " + host);
-            }
-
-            DuplexChannel channel = (DuplexChannel) bootstrap.connect(host, port).sync().channel();
-
-            final SslHandler ssl = initSsl(dockerClientConfig);
-
-            if (ssl != null) {
-                channel.pipeline().addFirst(ssl);
-            }
-
-            return channel;
-        }
-
-        private SslHandler initSsl(DockerClientConfig dockerClientConfig) {
-            SslHandler ssl = null;
-
-            try {
-                String host = dockerClientConfig.getDockerHost().getHost();
-                int port = dockerClientConfig.getDockerHost().getPort();
-
-                final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
-
-                if (sslConfig != null && sslConfig.getSSLContext() != null) {
-
-                    SSLEngine engine = sslConfig.getSSLContext().createSSLEngine(host, port);
-                    engine.setUseClientMode(true);
-                    engine.setSSLParameters(enableHostNameVerification(engine.getSSLParameters()));
-
-                    // in the future we may use HostnameVerifier like here:
-                    // https://github.com/AsyncHttpClient/async-http-client/blob/1.8.x/src/main/java/com/ning/http/client/providers/netty/NettyConnectListener.java#L76
-
-                    ssl = new SslHandler(engine);
-                }
-
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-
-            return ssl;
-        }
-    }
-
-    public SSLParameters enableHostNameVerification(SSLParameters sslParameters) {
-        sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
-        return sslParameters;
-    }
-
-    @Override
-    public void close() throws IOException {
-        checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
-
-        eventLoopGroup.shutdownGracefully();
-    }
-
-    /**
-     * Configure connection timeout in milliseconds
-     */
-    public TestcontainersDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
-        this.connectTimeout = connectTimeout;
-        return this;
-    }
-
-    /**
-     * Configure read timeout in milliseconds
-     */
-    public TestcontainersDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
-        this.readTimeout = readTimeout;
-        return this;
-    }
-
-    private <T extends Channel> T configure(T channel) {
-        ChannelConfig channelConfig = channel.config();
-
-        if (connectTimeout != null) {
-            channelConfig.setConnectTimeoutMillis(connectTimeout);
-        }
-        if (readTimeout != null) {
-            channel.pipeline().addLast("readTimeoutHandler", new ReadTimeoutHandler());
-        }
-
-        return channel;
-    }
-
-    private final class ReadTimeoutHandler extends IdleStateHandler {
-        private boolean alreadyTimedOut;
-
-        ReadTimeoutHandler() {
-            super(readTimeout, 0, 0, TimeUnit.MILLISECONDS);
-        }
-
-        /**
-         * Called when a read timeout was detected.
-         */
-        @Override
-        protected synchronized void channelIdle(ChannelHandlerContext ctx, IdleStateEvent evt) throws Exception {
-            assert evt.state() == IdleState.READER_IDLE;
-            final Channel channel = ctx.channel();
-            if (channel == null || !channel.isActive() || alreadyTimedOut) {
-                return;
-            }
-            DockerClientConfig dockerClientConfig = getDockerClientConfig();
-            final Object dockerAPIEndpoint = dockerClientConfig.getDockerHost();
-            final String msg = "Read timed out: No data received within " + readTimeout
-                    + "ms.  Perhaps the docker API (" + dockerAPIEndpoint
-                    + ") is not responding normally, or perhaps you need to increase the readTimeout value.";
-            final Exception ex = new SocketTimeoutException(msg);
-            ctx.fireExceptionCaught(ex);
-            alreadyTimedOut = true;
-        }
-    }
-
-    protected WebTarget getBaseResource() {
-        checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
-        return baseResource;
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 717ba2635a8..46550dc0af7 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -14,8 +14,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.message.BasicNameValuePair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
@@ -25,7 +23,9 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.Socket;
+import java.net.URLEncoder;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -365,12 +365,15 @@ static class FilterRegistry {
          * @throws IOException if communication with Ryuk fails
          */
         protected boolean register(List<Map.Entry<String, String>> filters) throws IOException {
-            String query = URLEncodedUtils.format(
-                filters.stream()
-                    .map(it -> new BasicNameValuePair(it.getKey(), it.getValue()))
-                    .collect(Collectors.toList()),
-                (String) null
-            );
+            String query = filters.stream()
+                .map(it -> {
+                    try {
+                        return URLEncoder.encode(it.getKey(), "UTF-8") + "=" + URLEncoder.encode(it.getValue(), "UTF-8");
+                    } catch (UnsupportedEncodingException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .collect(Collectors.joining("&"));
 
             log.debug("Sending '{}' to Ryuk", query);
             out.write(query.getBytes());
diff --git a/core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java b/core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java
new file mode 100644
index 00000000000..353133ae148
--- /dev/null
+++ b/core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.core.util;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Image;
+import org.junit.Test;
+import org.rnorth.visibleassertions.VisibleAssertions;
+import org.testcontainers.DockerClientFactory;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * This test checks that our custom monkey-patched version works
+ * and does not throw {@link ClassNotFoundException}.
+ */
+public class FiltersEncoderTest {
+
+    @Test
+    public void filtersShouldWork() throws Exception {
+        DockerClient client = DockerClientFactory.instance().client();
+
+        List<Image> images = client.listImagesCmd()
+            .withLabelFilter("com.example=" + UUID.randomUUID().toString())
+            .exec();
+
+        VisibleAssertions.assertTrue("List is empty", images.isEmpty());
+    }
+}
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index 9ab71fe7c43..ba9a2db096e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,6 +8,7 @@ dependencies {
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'redis.clients:jedis:3.0.1'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.7'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.15'
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index d891e179a94..1280fb4a818 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -11,7 +11,8 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.7'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.15'
-}
\ No newline at end of file
+}

From 541dbf4dbb885af866bcb729d8a599c095b114cb Mon Sep 17 00:00:00 2001
From: Alexander Sparkowsky <info@roamingthings.de>
Date: Tue, 19 Mar 2019 14:07:59 +0100
Subject: [PATCH 0020/4969] Update BrowserWebDriverContainer to honor existing
 no_proxy setting (#929)

Fixes #928
---
 .../containers/BrowserWebDriverContainer.java |  8 +++-
 .../junit/BrowserWebDriverContainerTest.java  | 42 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 94374235cbb..b92a4877cd2 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -48,6 +48,8 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private static final int SELENIUM_PORT = 4444;
     private static final int VNC_PORT = 5900;
 
+    private static final String NO_PROXY_KEY = "no_proxy";
+
     @Nullable
     private Capabilities capabilities;
     private boolean customImageNameIsSet = false;
@@ -156,7 +158,11 @@ protected void configure() {
 
         addExposedPorts(SELENIUM_PORT, VNC_PORT);
         addEnv("TZ", timeZone);
-        addEnv("no_proxy", "localhost");
+
+        if (!getEnvMap().containsKey(NO_PROXY_KEY)) {
+            addEnv(NO_PROXY_KEY, "localhost");
+        }
+
         setCommand("/opt/bin/entry_point.sh");
 
         /*
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
new file mode 100644
index 00000000000..036262a6bd1
--- /dev/null
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -0,0 +1,42 @@
+package org.testcontainers.junit;
+
+import org.junit.Test;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.testcontainers.containers.BrowserWebDriverContainer;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class BrowserWebDriverContainerTest {
+
+    private static final String NO_PROXY_KEY = "no_proxy";
+
+    private static final String NO_PROXY_VALUE = "localhost,.noproxy-domain.com";
+
+    @Test
+    public void honorPresetNoProxyEnvironment() {
+        try (
+            BrowserWebDriverContainer chromeWithNoProxySet = (BrowserWebDriverContainer) new BrowserWebDriverContainer()
+                .withCapabilities(new ChromeOptions())
+                .withEnv(NO_PROXY_KEY, NO_PROXY_VALUE)
+        ) {
+            chromeWithNoProxySet.start();
+
+            Object noProxy = chromeWithNoProxySet.getEnvMap().get(NO_PROXY_KEY);
+            assertEquals("no_proxy should be preserved by the container rule", NO_PROXY_VALUE, noProxy);
+        }
+    }
+
+    @Test
+    public void provideDefaultNoProxyEnvironmentIfNotSet() {
+        try (
+            BrowserWebDriverContainer chromeWithoutNoProxySet = new BrowserWebDriverContainer()
+                .withCapabilities(new ChromeOptions())
+
+        ) {
+            chromeWithoutNoProxySet.start();
+
+            Object noProxy = chromeWithoutNoProxySet.getEnvMap().get(NO_PROXY_KEY);
+            assertEquals("no_proxy should be set to default if not already present", "localhost", noProxy);
+        }
+    }
+}

From 2a4c91e404000d89ca3fc2dca24e1f09ed44e093 Mon Sep 17 00:00:00 2001
From: Mattias Svala <thebrasse@brasse.org>
Date: Tue, 19 Mar 2019 22:08:07 +0100
Subject: [PATCH 0021/4969] Cassandra: Add support for creating Cluster objects
 without JMX reporting (#1199)

---
 .../containers/CassandraContainer.java        | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index dbb3316158f..a78d23e4b4b 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -32,6 +32,7 @@ public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends G
 
     private String configLocation;
     private String initScriptPath;
+    private boolean enableJmxReporting;
 
     public CassandraContainer() {
         this(IMAGE + ":3.11.2");
@@ -41,6 +42,7 @@ public CassandraContainer(String dockerImageName) {
         super(dockerImageName);
         addExposedPort(CQL_PORT);
         setStartupAttempts(3);
+        this.enableJmxReporting = false;
     }
 
     @Override
@@ -116,6 +118,14 @@ public SELF withInitScript(String initScriptPath) {
         return self();
     }
 
+    /**
+     * Initialize Cassandra client with JMX reporting enabled or disabled
+     */
+    public SELF withJmxReporting(boolean enableJmxReporting) {
+        this.enableJmxReporting = enableJmxReporting;
+        return self();
+    }
+
     /**
      * Get username
      *
@@ -146,14 +156,21 @@ public String getPassword() {
      * Can be used to obtain connections to Cassandra in the container
      */
     public Cluster getCluster() {
-        return getCluster(this);
+        return getCluster(this, enableJmxReporting);
     }
 
-    public static Cluster getCluster(ContainerState containerState) {
-        return Cluster.builder()
+    public static Cluster getCluster(ContainerState containerState, boolean enableJmxReporting) {
+        final Cluster.Builder builder = Cluster.builder()
             .addContactPoint(containerState.getContainerIpAddress())
-            .withPort(containerState.getMappedPort(CQL_PORT))
-            .build();
+            .withPort(containerState.getMappedPort(CQL_PORT));
+        if (!enableJmxReporting) {
+            builder.withoutJMXReporting();
+        }
+        return builder.build();
+    }
+
+    public static Cluster getCluster(ContainerState containerState) {
+        return getCluster(containerState, false);
     }
 
     private DatabaseDelegate getDatabaseDelegate() {

From f3ae35ef8379bdc248e71768956b73048216e456 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 20 Mar 2019 22:00:47 +0000
Subject: [PATCH 0022/4969] Allow TC_INITSCRIPT to support absolute/relative
 path via file: URI (#1329)

* TC_INITSCRIPT support absolute/relative path

* TC_INITSCRIPT remove absolute path,relative project path use file: prefix

* into a constant and use FILE_PATH_PREFIX

* Simplify implementation by using URL directly

* Update docs

* Update modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java

Co-Authored-By: rnorth <rich.north@gmail.com>
---
 docs/modules/databases/index.md                       |  8 +++++++-
 modules/jdbc-test/sql/init_mysql.sql                  |  5 +++++
 .../java/org/testcontainers/jdbc/JDBCDriverTest.java  |  1 +
 .../testcontainers/jdbc/ContainerDatabaseDriver.java  | 11 +++++++++--
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 modules/jdbc-test/sql/init_mysql.sql

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index 4fd498b7248..aaef47a44ef 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -64,7 +64,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:postgis:9.6://hostname/databasename`
 
-## Using an init script
+## Using a classpath init script
 
 Testcontainers can run an initscript after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
 
@@ -72,6 +72,12 @@ Testcontainers can run an initscript after the database container is started, bu
 
 This is useful if you have a fixed script for setting up database schema, etc.
 
+## Using an init script from a file
+
+If the init script path is prefixed `file:`, it will be loaded from a file (relative to the working directory, which will usually be the project root).
+
+`jdbc:tc:mysql:5.7.22://hostname/databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
+
 #### Using an init function
 
 Instead of running a fixed script for DB setup, it may be useful to call a Java function that you define. This is intended to allow you to trigger database schema migration tools. To do this, add TC_INITFUNCTION to the URL as follows, passing a full path to the class name and method:
diff --git a/modules/jdbc-test/sql/init_mysql.sql b/modules/jdbc-test/sql/init_mysql.sql
new file mode 100644
index 00000000000..2b00ee968b0
--- /dev/null
+++ b/modules/jdbc-test/sql/init_mysql.sql
@@ -0,0 +1,5 @@
+CREATE TABLE bar (
+  foo VARCHAR(255)
+);
+
+INSERT INTO bar (foo) VALUES ('hello world');
\ No newline at end of file
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index a94f0b0897b..4eb55b38e24 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -46,6 +46,7 @@ public static Iterable<Object[]> data() {
                 {"jdbc:tc:mysql://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
                 {"jdbc:tc:mysql:5.5.43://hostname/databasename", EnumSet.noneOf(Options.class)},
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index 163c67f486d..0f470e36979 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -41,6 +41,7 @@ public class ContainerDatabaseDriver implements Driver {
     private static final Map<String, Set<Connection>> containerConnections = new HashMap<>();
     private static final Map<String, JdbcDatabaseContainer> jdbcUrlContainerCache = new HashMap<>();
     private static final Set<String> initializedContainers = new HashSet<>();
+    private static final String FILE_PATH_PREFIX = "file:";
 
     static {
         load();
@@ -177,8 +178,14 @@ private void runInitScriptIfRequired(final ConnectionUrl connectionUrl, Database
         if (connectionUrl.getInitScriptPath().isPresent()) {
             String initScriptPath = connectionUrl.getInitScriptPath().get();
             try {
-                URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
-
+                URL resource;
+                if (initScriptPath.startsWith(FILE_PATH_PREFIX)) {
+                    //relative workdir path
+                    resource = new URL(initScriptPath);
+                } else {
+                    //classpath resource
+                    resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
+                }
                 if (resource == null) {
                     LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
                     throw new SQLException("Could not load classpath init script: " + initScriptPath + ". Resource not found.");

From 2fc7c21772b57ee9afcf92a028a20c35baca2062 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 20 Mar 2019 22:14:13 +0000
Subject: [PATCH 0023/4969] Update latest version number

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 0aad56f0314..aee5d80e340 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -76,4 +76,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.10.6
+    latest_version: 1.10.7

From 31b361084257e8c751bbeef3bded0ffe41fe7e00 Mon Sep 17 00:00:00 2001
From: Frederic Tardif <frederic.tardif@gmail.com>
Date: Thu, 21 Mar 2019 13:32:20 -0400
Subject: [PATCH 0024/4969] start ambassador only if mapping configured (#1328)

---
 .../org/testcontainers/containers/DockerComposeContainer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index d2958129e90..ae10c3096fa 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -239,7 +239,9 @@ private List<Container> listChildContainers() {
     }
 
     private void startAmbassadorContainers() {
-        ambassadorContainer.start();
+        if (!ambassadorPortMappings.isEmpty()) {
+            ambassadorContainer.start();
+        }
     }
 
     private Logger logger() {

From 41987efdc1c465c79b075e77ff79501c709ad5a7 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 22 Mar 2019 20:25:30 +0000
Subject: [PATCH 0025/4969] Add Toxiproxy module (#1330)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on https://gist.github.com/rnorth/4c3666d62fa93bf0daa813b282e4ebff, in turn based on [hotels.com’s blog post](https://medium.com/hotels-com-technology/i-dont-know-about-resilience-testing-and-so-can-you-b3c59d80012d) where they show use of Testcontainers with Toxiproxy.

Having seen Toxiproxy and experimented with it, I'm inclined to go with this and suggest that we not move forward with #283 (which is a great PR, but we've unfortunately failed to land after quite a long time). While Pumba may be nice and transparent, there are a lot of moving parts and complexity under the covers, vs Toxiproxy, which is a bit less magical but easier to understand.
---
 .travis.yml                                   |   4 -
 docs/modules/toxiproxy.md                     |  76 ++++++++++
 mkdocs.yml                                    |   1 +
 modules/toxiproxy/build.gradle                |   9 ++
 .../containers/ToxiproxyContainer.java        | 130 ++++++++++++++++++
 .../containers/ToxiproxyTest.java             | 102 ++++++++++++++
 6 files changed, 318 insertions(+), 4 deletions(-)
 create mode 100644 docs/modules/toxiproxy.md
 create mode 100644 modules/toxiproxy/build.gradle
 create mode 100644 modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
 create mode 100644 modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java

diff --git a/.travis.yml b/.travis.yml
index 924b31b4f8d..571c078730d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,6 @@ language: java
 jdk:
   - oraclejdk8
 
-branches:
-  only:
-  - master
-
 sudo: required
 services:
   - docker
diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
new file mode 100644
index 00000000000..5df65e232ff
--- /dev/null
+++ b/docs/modules/toxiproxy.md
@@ -0,0 +1,76 @@
+# Toxiproxy Module
+
+Testcontainers module for Shopify's [Toxiproxy](https://github.com/Shopify/toxiproxy). 
+This TCP proxy can be used to simulate network failure conditions in between tests and containers.
+ 
+[toxiproxy-java](https://github.com/trekawek/toxiproxy-java) is used as a client.
+
+## Usage example
+
+A Toxiproxy container can be placed in between test code and a container, or in between containers.
+In either scenario, it is necessary to create a `ToxiproxyContainer` instance on the same Docker network, as follows:
+
+<!--codeinclude-->
+[Creating a Toxiproxy container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:creatingProxy
+<!--/codeinclude-->
+
+Next, it is necessary to instruct Toxiproxy to start proxying connections. 
+Each `ToxiproxyContainer` can proxy to many target containers if necessary.
+
+We do this as follows:
+
+<!--codeinclude-->
+[Starting proxying connections to a target container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxyObject
+<!--/codeinclude-->
+
+Then, to establish a connection via Toxiproxy, we obtain **Toxiproxy's** proxy host IP and port:
+
+<!--codeinclude-->
+[Obtaining proxied host and port](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPort
+<!--/codeinclude-->
+
+Code under test, or other containers, should connect to this proxied host IP and port.
+
+Having done this, it is possible to trigger failure conditions ('Toxics') through the `proxy.toxics()` object:
+
+* `bandwidth` - Limit a connection to a maximum number of kilobytes per second.
+* `latency` - Add a delay to all data going through the proxy. The delay is equal to `latency +/- jitter`.
+* `slicer` - Slices TCP data up into small bits, optionally adding a delay between each sliced "packet".
+* `slowClose` - Delay the TCP socket from closing until `delay` milliseconds has elapsed.
+* `timeout` - Stops all data from getting through, and closes the connection after `timeout`. If `timeout` is `0`, the connection won't close, and data will be delayed until the toxic is removed.
+* `limitData` - Closes connection when transmitted data exceeded limit.
+
+Please see the [Toxiproxy documentation](https://github.com/Shopify/toxiproxy#toxics) for full details on the available Toxics.
+
+As one example, we can introduce latency and random jitter to proxied connections as follows:
+
+<!--codeinclude-->
+[Adding latency to a connection](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:addingLatency
+<!--/codeinclude-->
+
+Additionally we can disable the proxy to simulate a complete interruption to the network connection:
+
+<!--codeinclude-->
+[Cutting a connection](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:disableProxy
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:toxiproxy:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>toxiproxy</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+## Acknowledgements
+
+This module was inspired by a [hotels.com blog post](https://medium.com/hotels-com-technology/i-dont-know-about-resilience-testing-and-so-can-you-b3c59d80012d).
diff --git a/mkdocs.yml b/mkdocs.yml
index aee5d80e340..1b7d3f1852e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -56,6 +56,7 @@ nav:
           - modules/pulsar.md
           - modules/localstack.md
           - modules/mockserver.md
+          - modules/toxiproxy.md
           - modules/nginx.md
           - modules/vault.md
     - Test framework integration:
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
new file mode 100644
index 00000000000..0d004fd32bf
--- /dev/null
+++ b/modules/toxiproxy/build.gradle
@@ -0,0 +1,9 @@
+description = "Testcontainers :: Toxiproxy"
+
+dependencies {
+    compile project(':testcontainers')
+    compile 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.3'
+
+    testCompile 'redis.clients:jedis:3.0.1'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+}
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
new file mode 100644
index 00000000000..cce6a0dca22
--- /dev/null
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -0,0 +1,130 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import eu.rekawek.toxiproxy.Proxy;
+import eu.rekawek.toxiproxy.ToxiproxyClient;
+import eu.rekawek.toxiproxy.model.ToxicDirection;
+import eu.rekawek.toxiproxy.model.ToxicList;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Container for resiliency testing using <a href="https://github.com/Shopify/toxiproxy">Toxiproxy</a>.
+ */
+public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
+
+    private static final String IMAGE_NAME = "shopify/toxiproxy:2.1.0";
+    private static final int TOXIPROXY_CONTROL_PORT = 8474;
+    private static final int FIRST_PROXIED_PORT = 8666;
+    private static final int LAST_PROXIED_PORT = 8666 + 31;
+
+    private ToxiproxyClient client;
+    private final Map<String, ContainerProxy> proxies = new HashMap<>();
+    private final AtomicInteger nextPort = new AtomicInteger(FIRST_PROXIED_PORT);
+
+    public ToxiproxyContainer() {
+        this(IMAGE_NAME);
+    }
+
+    public ToxiproxyContainer(String imageName) {
+        super(imageName);
+        addExposedPorts(TOXIPROXY_CONTROL_PORT);
+        setWaitStrategy(new HttpWaitStrategy().forPath("/version").forPort(TOXIPROXY_CONTROL_PORT));
+
+        // allow up to 32 ports to be proxied (arbitrary value). Here we make the ports exposed; whether or not
+        //  Toxiproxy will listen is controlled at runtime using getProxy(...)
+        for (int i = FIRST_PROXIED_PORT; i <= LAST_PROXIED_PORT; i++) {
+            addExposedPort(i);
+        }
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        client = new ToxiproxyClient(getContainerIpAddress(), getMappedPort(TOXIPROXY_CONTROL_PORT));
+    }
+
+    /**
+     * Obtain a {@link ContainerProxy} instance for target container that is managed by Testcontainers. The target
+     * container should be routable from this <b>from this {@link ToxiproxyContainer} instance</b> (e.g. on the same
+     * Docker {@link Network}).
+     *
+     * @param container target container
+     * @param port port number on the target service that should be proxied
+     * @return a {@link ContainerProxy} instance
+     */
+    public ContainerProxy getProxy(GenericContainer<?> container, int port) {
+        return this.getProxy(container.getNetworkAliases().get(0), port);
+    }
+
+    /**
+     * Obtain a {@link ContainerProxy} instance for a specific hostname and port, which can be for any host
+     * that is routable <b>from this {@link ToxiproxyContainer} instance</b> (e.g. on the same
+     * Docker {@link Network} or on routable from the Docker host).
+     *
+     * <p><em>It is expected that {@link ToxiproxyContainer#getProxy(GenericContainer, int)} will be more
+     * useful in most scenarios, but this method is present to allow use of Toxiproxy in front of containers
+     * or external servers that are not managed by Testcontainers.</em></p>
+     *
+     * @param hostname hostname of target server to be proxied
+     * @param port port number on the target server that should be proxied
+     * @return a {@link ContainerProxy} instance
+     */
+    public ContainerProxy getProxy(String hostname, int port) {
+        String upstream = hostname + ":" + port;
+
+        return proxies.computeIfAbsent(upstream, __ -> {
+            try {
+                final int toxiPort = nextPort.getAndIncrement();
+                if (toxiPort > LAST_PROXIED_PORT) {
+                    throw new IllegalStateException("Maximum number of proxies exceeded");
+                }
+
+                final Proxy proxy = client.createProxy("name", "0.0.0.0:" + toxiPort, upstream);
+                return new ContainerProxy(proxy, getContainerIpAddress(), getMappedPort(toxiPort));
+            } catch (IOException e) {
+                throw new RuntimeException("Proxy could not be created", e);
+            }
+        });
+    }
+
+    @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+    public static class ContainerProxy {
+        private static final String CUT_CONNECTION_DOWNSTREAM = "CUT_CONNECTION_DOWNSTREAM";
+        private static final String CUT_CONNECTION_UPSTREAM = "CUT_CONNECTION_UPSTREAM";
+        private final Proxy toxi;
+        @Getter private final String containerIpAddress;
+        @Getter private final int proxyPort;
+        private boolean isCurrentlyCut;
+
+        public ToxicList toxics() {
+            return toxi.toxics();
+        }
+
+        /**
+         * Cuts the connection by setting bandwidth in both directions to zero.
+         * @param shouldCutConnection true if the connection should be cut, or false if it should be re-enabled
+         */
+        public void setConnectionCut(boolean shouldCutConnection) {
+            try {
+                if (shouldCutConnection) {
+                    toxics().bandwidth(CUT_CONNECTION_DOWNSTREAM, ToxicDirection.DOWNSTREAM, 0);
+                    toxics().bandwidth(CUT_CONNECTION_UPSTREAM, ToxicDirection.UPSTREAM, 0);
+                    isCurrentlyCut = true;
+                } else if (isCurrentlyCut) {
+                    toxics().get(CUT_CONNECTION_DOWNSTREAM).remove();
+                    toxics().get(CUT_CONNECTION_UPSTREAM).remove();
+                    isCurrentlyCut = false;
+                }
+            } catch (IOException e) {
+                throw new RuntimeException("Could not control proxy", e);
+            }
+        }
+    }
+}
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
new file mode 100644
index 00000000000..fbcfa124f80
--- /dev/null
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -0,0 +1,102 @@
+package org.testcontainers.containers;
+
+import eu.rekawek.toxiproxy.model.ToxicDirection;
+import org.junit.Rule;
+import org.junit.Test;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+
+import java.io.IOException;
+
+import static java.lang.String.format;
+import static org.rnorth.visibleassertions.VisibleAssertions.*;
+
+public class ToxiproxyTest {
+
+    // creatingProxy {
+    // Create a common docker network so that containers can communicate
+    @Rule
+    public Network network = Network.newNetwork();
+
+    // the target container - this could be anything
+    @Rule
+    public GenericContainer redis = new GenericContainer("redis:5.0.4")
+        .withExposedPorts(6379)
+        .withNetwork(network);
+
+    // Toxiproxy container, which will be used as a TCP proxy
+    @Rule
+    public ToxiproxyContainer toxiproxy = new ToxiproxyContainer()
+        .withNetwork(network);
+    // }
+
+    @Test
+    public void testDirect() {
+        final Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getFirstMappedPort());
+        jedis.set("somekey", "somevalue");
+
+        final String s = jedis.get("somekey");
+        assertEquals("direct access to the container works OK", "somevalue", s);
+    }
+
+    @Test
+    public void testLatencyViaProxy() throws IOException {
+        // obtainProxyObject {
+        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
+        // }
+
+        // obtainProxiedHostAndPort {
+        final String ipAddressViaToxiproxy = proxy.getContainerIpAddress();
+        final int portViaToxiproxy = proxy.getProxyPort();
+        // }
+
+        final Jedis jedis = new Jedis(ipAddressViaToxiproxy, portViaToxiproxy);
+        jedis.set("somekey", "somevalue");
+
+        checkCallWithLatency(jedis, "without interference", 0, 250);
+
+        // addingLatency {
+        proxy.toxics()
+            .latency("latency", ToxicDirection.DOWNSTREAM, 1_100)
+            .setJitter(100);
+        // from now on the connection latency should be from 1000-1200 ms.
+        // }
+
+        checkCallWithLatency(jedis, "with interference", 1_000, 1_500);
+    }
+
+    @Test
+    public void testConnectionCut() {
+        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
+        final Jedis jedis = new Jedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
+        jedis.set("somekey", "somevalue");
+
+        assertEquals("access to the container works OK before cutting the connection", "somevalue", jedis.get("somekey"));
+
+        // disableProxy {
+        proxy.setConnectionCut(true);
+
+        // for example, expect failure when the connection is cut
+        assertThrows("calls fail when the connection is cut",
+            JedisConnectionException.class, () -> {
+                jedis.get("somekey");
+            });
+
+        proxy.setConnectionCut(false);
+
+        // and with the connection re-established, expect success
+        assertEquals("access to the container works OK after re-establishing the connection", "somevalue", jedis.get("somekey"));
+        // }
+    }
+
+    private void checkCallWithLatency(Jedis jedis, final String description, int expectedMinLatency, long expectedMaxLatency) {
+        final long start = System.currentTimeMillis();
+        String s = jedis.get("somekey");
+        final long end = System.currentTimeMillis();
+        final long duration = end - start;
+
+        assertEquals(format("access to the container %s works OK", description), "somevalue", s);
+        assertTrue(format("%s there is at least %dms latency", description, expectedMinLatency), duration >= expectedMinLatency);
+        assertTrue(format("%s there is no more than %dms latency", description, expectedMaxLatency), duration < expectedMaxLatency);
+    }
+}

From cb27c41d535f2550bb94cba98b83495fee67f948 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 23 Mar 2019 08:44:31 +0000
Subject: [PATCH 0026/4969] Update latest version number

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 1b7d3f1852e..31938bb99f7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -77,4 +77,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.10.7
+    latest_version: 1.11.0

From bb5c6fc2fe926228b1dae33f7e2457f9b5c9a753 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 23 Mar 2019 09:12:19 +0000
Subject: [PATCH 0027/4969] Add extra background to toxiproxy module docs

---
 docs/modules/toxiproxy.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
index 5df65e232ff..9e09d8b387b 100644
--- a/docs/modules/toxiproxy.md
+++ b/docs/modules/toxiproxy.md
@@ -1,10 +1,16 @@
 # Toxiproxy Module
 
 Testcontainers module for Shopify's [Toxiproxy](https://github.com/Shopify/toxiproxy). 
-This TCP proxy can be used to simulate network failure conditions in between tests and containers.
- 
-[toxiproxy-java](https://github.com/trekawek/toxiproxy-java) is used as a client.
+This TCP proxy can be used to simulate network failure conditions.
+
+You can simulate network failures:
+
+* between Java code and containers, ideal for testing resilience features of client code
+* between containers, for testing resilience and emergent behaviour of multi-container systems
+* if desired, between Java code/containers and external resources (non-Dockerized!), for scenarios where not all dependencies can be/have been dockerized
 
+Testcontainers Toxiproxy support allows resilience features to be easily verified as part of isolated dev/CI testing. This allows earlier testing of resilience features, and broader sets of failure conditions to be covered.
+ 
 ## Usage example
 
 A Toxiproxy container can be placed in between test code and a container, or in between containers.
@@ -74,3 +80,6 @@ testCompile "org.testcontainers:toxiproxy:{{latest_version}}"
 ## Acknowledgements
 
 This module was inspired by a [hotels.com blog post](https://medium.com/hotels-com-technology/i-dont-know-about-resilience-testing-and-so-can-you-b3c59d80012d).
+
+[toxiproxy-java](https://github.com/trekawek/toxiproxy-java) is used to help control failure conditions.
+

From f2fc02c49afc4c183bd22a09f340c0a23fb3cf03 Mon Sep 17 00:00:00 2001
From: worldtiki <worldtiki@gmail.com>
Date: Sun, 24 Mar 2019 08:19:53 +0000
Subject: [PATCH 0028/4969] Toxiproxy: Fix multi-proxy use case (remove static
 "name" argument) (#1335)

* Use hostname instead of hardcoded string to allow for multiple proxies to be created

* Update modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java

Co-Authored-By: worldtiki <worldtiki@gmail.com>

* Add a test covering creation of multiple proxies
---
 .../containers/ToxiproxyContainer.java        |  2 +-
 .../containers/ToxiproxyTest.java             | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index cce6a0dca22..df4bf6e688d 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -86,7 +86,7 @@ public ContainerProxy getProxy(String hostname, int port) {
                     throw new IllegalStateException("Maximum number of proxies exceeded");
                 }
 
-                final Proxy proxy = client.createProxy("name", "0.0.0.0:" + toxiPort, upstream);
+                final Proxy proxy = client.createProxy(upstream, "0.0.0.0:" + toxiPort, upstream);
                 return new ContainerProxy(proxy, getContainerIpAddress(), getMappedPort(toxiPort));
             } catch (IOException e) {
                 throw new RuntimeException("Proxy could not be created", e);
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index fbcfa124f80..34861f68f7a 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -89,6 +89,34 @@ public void testConnectionCut() {
         // }
     }
 
+    @Test
+    public void testMultipleProxiesCanBeCreated() {
+        try (GenericContainer secondRedis = new GenericContainer("redis:5.0.4")
+            .withExposedPorts(6379)
+            .withNetwork(network)) {
+
+            secondRedis.start();
+
+            final ToxiproxyContainer.ContainerProxy firstProxy = toxiproxy.getProxy(redis, 6379);
+            final ToxiproxyContainer.ContainerProxy secondProxy = toxiproxy.getProxy(secondRedis, 6379);
+
+            final Jedis firstJedis = new Jedis(firstProxy.getContainerIpAddress(), firstProxy.getProxyPort());
+            final Jedis secondJedis = new Jedis(secondProxy.getContainerIpAddress(), secondProxy.getProxyPort());
+
+            firstJedis.set("somekey", "somevalue");
+            secondJedis.set("somekey", "somevalue");
+
+            firstProxy.setConnectionCut(true);
+
+            assertThrows("calls fail when the connection is cut, for only the relevant proxy",
+                JedisConnectionException.class, () -> {
+                    firstJedis.get("somekey");
+                });
+
+            assertEquals("access via a different proxy is OK", "somevalue", secondJedis.get("somekey"));
+        }
+    }
+
     private void checkCallWithLatency(Jedis jedis, final String description, int expectedMinLatency, long expectedMaxLatency) {
         final long start = System.currentTimeMillis();
         String s = jedis.get("somekey");

From 672523057bd2f2a7ad716e9648dde7a526dd64ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 24 Mar 2019 09:21:28 +0100
Subject: [PATCH 0029/4969] Bump spock-core from 1.0-groovy-2.4 to
 1.3-groovy-2.5 in /modules/spock (#1291)

Bumps spock-core from 1.0-groovy-2.4 to 1.3-groovy-2.5.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 1280fb4a818..2e8b175e303 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -6,7 +6,7 @@ description = "Testcontainers :: Spock-Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.spockframework:spock-core:1.0-groovy-2.4'
+    compile 'org.spockframework:spock-core:1.3-groovy-2.5'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From 2c5f274d73317257efa99d359357856c076c24b7 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 24 Mar 2019 21:16:19 +0000
Subject: [PATCH 0030/4969] Add getLogs() to GenericContainer, allowing all
 logs to be retrieved (#1206)

Fixes #1205
---
 .travis.yml                                   |  2 +-
 .../containers/ContainerState.java            | 18 +++++
 .../containers/GenericContainer.java          | 29 +++----
 .../containers/output/WaitingConsumer.java    |  9 ++-
 .../org/testcontainers/utility/LogUtils.java  | 81 ++++++++++++++++---
 .../containers/output/ContainerLogsTest.java  | 72 +++++++++++++++++
 .../junit/WorkingDirectoryTest.java           | 14 +---
 .../utility/DirectoryTarResourceTest.java     | 43 +++-------
 docs/features/container_logs.md               | 34 ++++++--
 9 files changed, 216 insertions(+), 86 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java

diff --git a/.travis.yml b/.travis.yml
index 571c078730d..575aa50b208 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ jobs:
 
     - stage: test
       env: [ NAME=core ]
-      jdk: openjdk-ea
+      jdk: openjdk12
       script: ./gradlew testcontainers:check --scan --no-daemon
 
     - env: [ NAME=selenium ]
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 26eec8c4ebe..2066fe72157 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -7,6 +7,8 @@
 import com.github.dockerjava.api.model.Ports;
 import com.google.common.base.Preconditions;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.utility.LogUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -149,6 +151,22 @@ default List<Integer> getBoundPortNumbers() {
             .collect(Collectors.toList());
     }
 
+
+    /**
+     * @return all log output from the container from start until the current instant (both stdout and stderr)
+     */
+    default String getLogs() {
+        return LogUtils.getOutput(DockerClientFactory.instance().client(), getContainerId());
+    }
+
+    /**
+     * @param types log types to return
+     * @return all log output from the container from start until the current instant
+     */
+    default String getLogs(OutputFrame.OutputType... types) {
+        return LogUtils.getOutput(DockerClientFactory.instance().client(), getContainerId(), types);
+    }
+
     /**
      * @return the id of the container
      */
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index b00061b3d97..936d880d1a8 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -20,9 +20,7 @@
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
@@ -50,8 +48,6 @@
 import java.util.stream.Stream;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 import static org.testcontainers.utility.CommandLine.runShellCommand;
 
 /**
@@ -242,24 +238,24 @@ private void tryStart() {
             logger().info("Starting container with ID: {}", containerId);
             dockerClient.startContainerCmd(containerId).exec();
 
+            logger().info("Container {} is starting: {}", dockerImageName, containerId);
+
             // For all registered output consumers, start following as close to container startup as possible
             this.logConsumers.forEach(this::followOutput);
 
-            logger().info("Container {} is starting: {}", dockerImageName, containerId);
-
             // Tell subclasses that we're starting
             containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
             containerName = containerInfo.getName();
             containerIsStarting(containerInfo);
 
-            // Wait until the container is running (may not be fully started)
-
+            // Wait until the container has reached the desired running state
             if (!this.startupCheckStrategy.waitUntilStartupSuccessful(dockerClient, containerId)) {
                 // Bail out, don't wait for the port to start listening.
                 // (Exception thrown here will be caught below and wrapped)
                 throw new IllegalStateException("Container did not start correctly.");
             }
 
+            // Wait until the process within the container has become ready for use (e.g. listening on network, log message emitted, etc).
             waitUntilContainerStarted();
 
             logger().info("Container {} started", dockerImageName);
@@ -269,17 +265,12 @@ private void tryStart() {
 
             if (containerId != null) {
                 // Log output if startup failed, either due to a container failure or exception (including timeout)
-                logger().error("Container log output (if any) will follow:");
-                FrameConsumerResultCallback resultCallback = new FrameConsumerResultCallback();
-                resultCallback.addConsumer(STDOUT, new Slf4jLogConsumer(logger()));
-                resultCallback.addConsumer(STDERR, new Slf4jLogConsumer(logger()));
-                dockerClient.logContainerCmd(containerId).withStdOut(true).withStdErr(true).exec(resultCallback);
-
-                // Try to ensure that container log output is shown before proceeding
-                try {
-                    resultCallback.getCompletionLatch().await(1, TimeUnit.MINUTES);
-                } catch (InterruptedException ignored) {
-                    // Cannot do anything at this point
+                final String containerLogs = getLogs();
+
+                if (containerLogs.length() > 0) {
+                    logger().error("Log output from the failed container:\n{}", getLogs());
+                } else {
+                    logger().error("There are no stdout/stderr logs available for the failed container");
                 }
             }
 
diff --git a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
index 367581528c2..858f5a4b487 100644
--- a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
@@ -113,8 +113,13 @@ private void waitUntil(Predicate<OutputFrame> predicate, long expiry, int times)
     /**
      * Wait until Docker closes the stream of output.
      */
-    public void waitUntilEnd() throws TimeoutException {
-        waitUntilEnd(Long.MAX_VALUE);
+    public void waitUntilEnd() {
+        try {
+            waitUntilEnd(Long.MAX_VALUE);
+        } catch (TimeoutException e) {
+            // timeout condition can never occur in a realistic timeframe
+            throw new IllegalStateException(e);
+        }
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/utility/LogUtils.java b/core/src/main/java/org/testcontainers/utility/LogUtils.java
index 100a79a8395..b51325cdda7 100644
--- a/core/src/main/java/org/testcontainers/utility/LogUtils.java
+++ b/core/src/main/java/org/testcontainers/utility/LogUtils.java
@@ -2,15 +2,14 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.google.common.base.MoreObjects;
 import lombok.experimental.UtilityClass;
 import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.ToStringConsumer;
+import org.testcontainers.containers.output.WaitingConsumer;
 
 import java.util.function.Consumer;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
@@ -19,15 +18,76 @@
  */
 @UtilityClass
 public class LogUtils {
+
+    /**
+     * Attach a log consumer to a container's log outputs in follow mode. The consumer will receive all previous
+     * and all future log frames of the specified type(s).
+     *
+     * @param dockerClient a Docker client
+     * @param containerId  container ID to attach to
+     * @param consumer     a consumer of {@link OutputFrame}s
+     * @param types        types of {@link OutputFrame} to receive
+     */
+    public void followOutput(DockerClient dockerClient,
+                             String containerId,
+                             Consumer<OutputFrame> consumer,
+                             OutputFrame.OutputType... types) {
+
+        attachConsumer(dockerClient, containerId, consumer, true, types);
+    }
+
+    /**
+     * Attach a log consumer to a container's log outputs in follow mode. The consumer will receive all previous
+     * and all future log frames (both stdout and stderr).
+     *
+     * @param dockerClient a Docker client
+     * @param containerId  container ID to attach to
+     * @param consumer     a consumer of {@link OutputFrame}s
+     */
+    public void followOutput(DockerClient dockerClient,
+                             String containerId,
+                             Consumer<OutputFrame> consumer) {
+
+        followOutput(dockerClient, containerId, consumer, STDOUT, STDERR);
+    }
+
     /**
-     * {@inheritDoc}
+     * Retrieve all previous log outputs for a container of the specified type(s).
+     *
+     * @param dockerClient a Docker client
+     * @param containerId  container ID to attach to
+     * @param types        types of {@link OutputFrame} to receive
+     * @return all previous output frames (stdout/stderr being separated by newline characters)
      */
-    public void followOutput(DockerClient dockerClient, String containerId,
-                             Consumer<OutputFrame> consumer, OutputFrame.OutputType... types) {
+    public String getOutput(DockerClient dockerClient,
+                            String containerId,
+                            OutputFrame.OutputType... types) {
+
+        if (containerId == null) {
+            return "";
+        }
+
+        if (types.length == 0) {
+            types = new OutputFrame.OutputType[] { STDOUT, STDERR };
+        }
+
+        final ToStringConsumer consumer = new ToStringConsumer();
+        final WaitingConsumer wait = new WaitingConsumer();
+        attachConsumer(dockerClient, containerId, consumer.andThen(wait), false, types);
+
+        wait.waitUntilEnd();
+        return consumer.toUtf8String();
+    }
+
+    private static void attachConsumer(DockerClient dockerClient,
+                                       String containerId,
+                                       Consumer<OutputFrame> consumer,
+                                       boolean followStream,
+                                       OutputFrame.OutputType... types) {
 
         final LogContainerCmd cmd = dockerClient.logContainerCmd(containerId)
-                .withFollowStream(true)
-                .withSince(0);
+            .withFollowStream(followStream)
+            .withSince(0);
 
         final FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         for (OutputFrame.OutputType type : types) {
@@ -38,9 +98,4 @@ public void followOutput(DockerClient dockerClient, String containerId,
 
         cmd.exec(callback);
     }
-
-    public void followOutput(DockerClient dockerClient, String containerId, Consumer<OutputFrame> consumer) {
-        followOutput(dockerClient, containerId, consumer, STDOUT, STDERR);
-    }
-
 }
diff --git a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
new file mode 100644
index 00000000000..f95d5a06850
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
@@ -0,0 +1,72 @@
+package org.testcontainers.containers.output;
+
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
+import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
+
+public class ContainerLogsTest {
+
+    @Test
+    public void getLogsReturnsAllLogsToDate() {
+        try (GenericContainer container = shortLivedContainer()) {
+            container.start();
+
+            // docsGetAllLogs {
+            final String logs = container.getLogs();
+            // }
+            assertEquals("stdout and stderr are reflected in the returned logs", "stdout\nstderr", logs);
+        }
+    }
+
+    @Test
+    public void getLogsReturnsStdOutToDate() {
+        try (GenericContainer container = shortLivedContainer()) {
+            container.start();
+
+            // docsGetStdOut {
+            final String logs = container.getLogs(STDOUT);
+            // }
+            assertEquals("stdout and stderr are reflected in the returned logs", "stdout", logs);
+        }
+    }
+
+    @Test
+    public void getLogsReturnsStdErrToDate() {
+        try (GenericContainer container = shortLivedContainer()) {
+            container.start();
+
+            // docsGetStdErr {
+            final String logs = container.getLogs(STDERR);
+            // }
+            assertEquals("stdout and stderr are reflected in the returned logs", "stderr", logs);
+        }
+    }
+
+    @Test
+    public void getLogsForLongRunningContainer() throws InterruptedException {
+        try (GenericContainer container = longRunningContainer()) {
+            container.start();
+
+            Thread.sleep(1000L);
+
+            final String logs = container.getLogs(STDOUT);
+            assertTrue("stdout is reflected in the returned logs for a running container", logs.contains("seq=0"));
+        }
+    }
+
+    private static GenericContainer shortLivedContainer() {
+        return new GenericContainer("alpine:3.3")
+            .withCommand("/bin/sh", "-c", "echo -n 'stdout' && echo -n 'stderr' 1>&2")
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+    }
+
+    private static GenericContainer longRunningContainer() {
+        return new GenericContainer("alpine:3.3")
+            .withCommand("ping -c 100 127.0.0.1");
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
index 1118302f701..30230cc12ff 100644
--- a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
+++ b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
@@ -3,13 +3,8 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.ToStringConsumer;
-import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
-import java.util.function.Consumer;
-
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
@@ -17,20 +12,15 @@
  */
 public class WorkingDirectoryTest {
 
-    private static WaitingConsumer waitingConsumer = new WaitingConsumer();
-    private static ToStringConsumer toStringConsumer = new ToStringConsumer();
-    private static Consumer<OutputFrame> compositeConsumer = waitingConsumer.andThen(toStringConsumer);
-
     @ClassRule
     public static GenericContainer container = new GenericContainer("alpine:3.2")
             .withWorkingDirectory("/etc")
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-            .withCommand("ls", "-al")
-            .withLogConsumer(compositeConsumer);
+            .withCommand("ls", "-al");
 
     @Test
     public void checkOutput() {
-        String listing = toStringConsumer.toUtf8String();
+        String listing = container.getLogs();
 
         assertTrue("Directory listing contains expected /etc content", listing.contains("hostname"));
         assertTrue("Directory listing contains expected /etc content", listing.contains("init.d"));
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
index b73bfeed46e..3789a654c20 100644
--- a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -5,15 +5,11 @@
 import org.hamcrest.core.IsCollectionContaining;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.ToStringConsumer;
-import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.File;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -23,12 +19,7 @@
 public class DirectoryTarResourceTest {
 
     @Test
-    public void simpleRecursiveFileTest() throws TimeoutException {
-
-        WaitingConsumer wait = new WaitingConsumer();
-
-        final ToStringConsumer toString = new ToStringConsumer();
-
+    public void simpleRecursiveFileTest() {
         // 'src' is expected to be the project base directory, so all source code/resources should be copied in
         File directory = new File("src");
 
@@ -40,24 +31,17 @@ public void simpleRecursiveFileTest() throws TimeoutException {
                                         .cmd("cat /foo/test/resources/test-recursive-file.txt")
                                         .build()
                         ).withFileFromFile("/tmp/foo", directory))
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-                .withLogConsumer(wait.andThen(toString));
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
 
         container.start();
-        wait.waitUntilEnd(60, TimeUnit.SECONDS);
 
-        final String results = toString.toUtf8String();
+        final String results = container.getLogs();
 
         assertTrue("The container has a file that was copied in via a recursive copy", results.contains("Used for DirectoryTarResourceTest"));
     }
 
     @Test
-    public void simpleRecursiveFileWithPermissionTest() throws TimeoutException {
-
-        WaitingConsumer wait = new WaitingConsumer();
-
-        final ToStringConsumer toString = new ToStringConsumer();
-
+    public void simpleRecursiveFileWithPermissionTest() {
         GenericContainer container = new GenericContainer(
                 new ImageFromDockerfile()
                         .withDockerfileFromBuilder(builder ->
@@ -67,13 +51,10 @@ public void simpleRecursiveFileWithPermissionTest() throws TimeoutException {
                                         .build()
                         ).withFileFromFile("/tmp/foo", new File("/mappable-resource/test-resource.txt"),
                         0754))
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-                .withLogConsumer(wait.andThen(toString));
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
 
         container.start();
-        wait.waitUntilEnd(60, TimeUnit.SECONDS);
-
-        String listing = toString.toUtf8String();
+        String listing = container.getLogs();
 
         assertThat("Listing shows that file is copied with mode requested.",
                 Arrays.asList(listing.split("\\n")),
@@ -81,13 +62,9 @@ public void simpleRecursiveFileWithPermissionTest() throws TimeoutException {
     }
 
     @Test
-    public void simpleRecursiveClasspathResourceTest() throws TimeoutException {
+    public void simpleRecursiveClasspathResourceTest() {
         // This test combines the copying of classpath resources from JAR files with the recursive TAR approach, to allow JARed classpath resources to be copied in to an image
 
-        WaitingConsumer wait = new WaitingConsumer();
-
-        final ToStringConsumer toString = new ToStringConsumer();
-
         GenericContainer container = new GenericContainer(
                 new ImageFromDockerfile()
                         .withDockerfileFromBuilder(builder ->
@@ -96,13 +73,11 @@ public void simpleRecursiveClasspathResourceTest() throws TimeoutException {
                                         .cmd("ls -lRt /foo")
                                         .build()
                         ).withFileFromClasspath("/tmp/foo", "/recursive/dir"))          // here we use /org/junit as a directory that really should exist on the classpath
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-                .withLogConsumer(wait.andThen(toString));
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
 
         container.start();
-        wait.waitUntilEnd(60, TimeUnit.SECONDS);
 
-        final String results = toString.toUtf8String();
+        final String results = container.getLogs();
 
         // ExternalResource.class is known to exist in a subdirectory of /org/junit so should be successfully copied in
         assertTrue("The container has a file that was copied in via a recursive copy from a JAR resource", results.contains("content.txt"));
diff --git a/docs/features/container_logs.md b/docs/features/container_logs.md
index 389dc57c631..a9e2832eb70 100644
--- a/docs/features/container_logs.md
+++ b/docs/features/container_logs.md
@@ -1,13 +1,34 @@
 # Accessing container logs
 
-It is possible to capture container output using the `followOutput()` method. This method accepts a Consumer and (optionally)
+It is possible to capture container output using:
+ 
+ * the `getLogs()` method, which simply returns a `String` snapshot of a container's entire log output
+ * the `followOutput()` method. This method accepts a Consumer and (optionally)
 a varargs list stating which of STDOUT, STDERR, or both, should be followed. If not specified, both will be followed.
 
 At present, container output will always begin from the time of container creation.
 
-Testcontainers includes some out-of-the-box Consumer implementations that can be used; examples follow.
+## Reading all logs (from startup time to present)
 
-## Streaming container output to an SLF4J logger
+`getLogs()` is the simplest mechanism for accessing container logs, and can be used as follows:
+
+<!--codeinclude--> 
+[Accessing all output (stdout and stderr)](../../core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java) inside_block:docsGetAllLogs
+<!--/codeinclude-->
+
+<!--codeinclude--> 
+[Accessing just stdout](../../core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java) inside_block:docsGetStdOut
+<!--/codeinclude-->
+
+<!--codeinclude--> 
+[Accessing just stderr](../../core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java) inside_block:docsGetStdErr
+<!--/codeinclude-->
+
+## Streaming logs
+
+Testcontainers includes some out-of-the-box Consumer implementations that can be used with the streaming `followOutput()` model; examples follow.
+
+### Streaming container output to an SLF4J logger
 
 Given an existing SLF4J logger instance named LOGGER:
 ```java
@@ -15,7 +36,10 @@ Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
 container.followOutput(logConsumer);
 ```
 
-## Capturing container output as a String
+### Capturing container output as a String
+
+To stream logs live or customize the decoding, `ToStringConsumer` may be used:
+
 ```java
 ToStringConsumer toStringConsumer = new ToStringConsumer();
 container.followOutput(toStringConsumer, OutputType.STDOUT);
@@ -26,7 +50,7 @@ String utf8String = toStringConsumer.toUtf8String();
 String otherString = toStringConsumer.toString(CharSet.forName("ISO-8859-1"));
 ```
 
-## Waiting for container output to contain expected content
+### Waiting for container output to contain expected content
 
 `WaitingConsumer` will block until a frame of container output (usually a line) matches a provided predicate.
 

From 1021e0e5c232b0f1a3392cffacf074d9ccfdeb36 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 25 Mar 2019 15:23:46 +0000
Subject: [PATCH 0031/4969] Update latest version number

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 31938bb99f7..fc37c0be80a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -77,4 +77,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.11.0
+    latest_version: 1.11.1

From d6e0e8c7b46a7a88d1b399db3e0109ce85172e0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2019 17:37:55 +0000
Subject: [PATCH 0032/4969] Bump transport from 6.6.2 to 6.7.0 in
 /modules/elasticsearch (#1344)

Bumps [transport](https://github.com/elastic/elasticsearch) from 6.6.2 to 6.7.0.
<details>
<summary>Commits</summary>

- [`8453f77`](https://github.com/elastic/elasticsearch/commit/8453f7701de25c467ce08088ddddac185cb8028c) SQL: Preserve original source for cast/convert function ([#40271](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40271))
- [`8b9fd09`](https://github.com/elastic/elasticsearch/commit/8b9fd0937d1e1a4ef95dc0db6b111ff80955104a) Reduce retention lease sync intervals ([#40302](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40302))
- [`c1999c7`](https://github.com/elastic/elasticsearch/commit/c1999c7b604793bc808b3685f11610def576a154) SQL: fix LIKE function equality by considering its pattern as well ([#40260](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40260))
- [`3522b00`](https://github.com/elastic/elasticsearch/commit/3522b00ae6c46cb3154fb660d998ee4ddd7ceb4c) Moving tests in locale-aware test file ([#40254](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40254))
- [`145e10b`](https://github.com/elastic/elasticsearch/commit/145e10b52e45818a84b7afaa6c627faba9e82769) Fix so non super users can also create API keys ([#40028](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40028)) ([#40288](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40288))
- [`e9ab087`](https://github.com/elastic/elasticsearch/commit/e9ab0879077df9f07c783005a4da0b37cd8a1d90) SQL: Fix issue with getting DATE type in JDBC ([#40207](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40207))
- [`3c00866`](https://github.com/elastic/elasticsearch/commit/3c008663a2749ff38804700bf0163814369b703f) SQL: Fix issue with optimization on queries with ORDER BY/LIMIT ([#40256](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40256))
- [`6998ea7`](https://github.com/elastic/elasticsearch/commit/6998ea7280772816b503d72ce9a5621328848c82) SQL: Fix issue with date columns returned always in UTC ([#40163](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40163))
- [`df1883d`](https://github.com/elastic/elasticsearch/commit/df1883d745f074d4d0c3de41726bddbf80c16243) Fix snapshot restore logging on fresh restore ([#40252](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40252))
- [`d5b26a4`](https://github.com/elastic/elasticsearch/commit/d5b26a46cd2e2b6d75442385b59427ad102c0419) Cascading primary failure lead to MSU too low ([#40249](https://github-redirect.dependabot.com/elastic/elasticsearch/issues/40249))
- Additional commits viewable in [compare view](https://github.com/elastic/elasticsearch/compare/v6.6.2...v6.7.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.elasticsearch.client:transport&package-manager=gradle&previous-version=6.6.2&new-version=6.7.0)](https://dependabot.com/compatibility-score.html?dependency-name=org.elasticsearch.client:transport&package-manager=gradle&previous-version=6.6.2&new-version=6.7.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 78d8c96a4be..f7119b02ef6 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.6.2"
-    testCompile "org.elasticsearch.client:transport:6.6.2"
+    testCompile "org.elasticsearch.client:transport:6.7.0"
 }

From bf1e5b22dbb090d2e49e6232dbf885b5a941a69e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2019 17:38:29 +0000
Subject: [PATCH 0033/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#1343)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 6.6.2 to 6.7.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v6.6.2...v6.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index f7119b02ef6..af6efc2a436 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.6.2"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.7.0"
     testCompile "org.elasticsearch.client:transport:6.7.0"
 }

From 94b1a3c9b85311143aa60dd210af6c6ccb05ca91 Mon Sep 17 00:00:00 2001
From: bopi- <bopi@users.sourceforge.net>
Date: Fri, 29 Mar 2019 17:47:09 +0100
Subject: [PATCH 0034/4969] hostPort != containerPort (#1334)

* hostPort != containerPort

* hostPort != containerPort

* hostPort != containerPort

* hostPort != containerPort

* hostPort != containerPort

* hostPort != containerPort

* hostPort != containerPort

* Update ExposedHostTest.java

* Do not use the two-keys Map because of the key conflicts
---
 .../org/testcontainers/Testcontainers.java     | 10 ++++++++++
 .../containers/PortForwardingContainer.java    | 13 ++++++++++---
 .../containers/ExposedHostTest.java            | 18 ++++++++++++++----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/Testcontainers.java b/core/src/main/java/org/testcontainers/Testcontainers.java
index 4d7f5af4753..0f83725c55b 100644
--- a/core/src/main/java/org/testcontainers/Testcontainers.java
+++ b/core/src/main/java/org/testcontainers/Testcontainers.java
@@ -1,6 +1,10 @@
 package org.testcontainers;
 
+import java.util.Map;
+import java.util.Map.Entry;
+
 import lombok.experimental.UtilityClass;
+
 import org.testcontainers.containers.PortForwardingContainer;
 
 @UtilityClass
@@ -11,4 +15,10 @@ public void exposeHostPorts(int... ports) {
             PortForwardingContainer.INSTANCE.exposeHostPort(port);
         }
     }
+    
+    public void exposeHostPorts(Map<Integer, Integer> ports) {
+    	for(Entry<Integer, Integer> entry : ports.entrySet()) {
+    		PortForwardingContainer.INSTANCE.exposeHostPort(entry.getKey(), entry.getValue());
+    	}
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index 576ac33d148..852a986b58f 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -8,10 +8,12 @@
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.time.Duration;
+import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 public enum PortForwardingContainer {
@@ -19,7 +21,7 @@ public enum PortForwardingContainer {
 
     private GenericContainer container;
 
-    private final Set<Integer> exposedPorts = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final Set<Entry<Integer, Integer>> exposedPorts = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
     @Getter(value = AccessLevel.PRIVATE, lazy = true)
     private final Connection sshConnection = createSSHSession();
@@ -56,8 +58,13 @@ private Connection createSSHSession() {
 
     @SneakyThrows
     public void exposeHostPort(int port) {
-        if (exposedPorts.add(port)) {
-            getSshConnection().requestRemotePortForwarding("", port, "localhost", port);
+        exposeHostPort(port, port);
+    }
+    
+    @SneakyThrows
+    public void exposeHostPort(int hostPort, int containerPort) {
+    	if (exposedPorts.add(new AbstractMap.SimpleEntry<>(hostPort, containerPort))) {
+            getSshConnection().requestRemotePortForwarding("", containerPort, "localhost", hostPort);
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 30bb6573533..8c98b0730b0 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import com.google.common.collect.ImmutableMap;
 import com.sun.net.httpserver.HttpServer;
 import lombok.SneakyThrows;
 import org.junit.AfterClass;
@@ -30,6 +31,9 @@ public static void setUpClass() throws Exception {
 
         server.start();
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
+        
+        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 80));
+        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));           
     }
 
     @AfterClass
@@ -39,22 +43,28 @@ public static void tearDownClass() throws Exception {
 
     @Test
     public void testExposedHost() throws Exception {
-        assertResponse(new GenericContainer().withCommand("top"));
+        assertResponse(new GenericContainer().withCommand("top"), server.getAddress().getPort());
     }
 
     @Test
     public void testExposedHostWithNetwork() throws Exception {
         try (Network network = Network.newNetwork()) {
-            assertResponse(new GenericContainer().withNetwork(network).withCommand("top"));
+            assertResponse(new GenericContainer().withNetwork(network).withCommand("top"), server.getAddress().getPort());
         }
     }
+    
+    @Test
+    public void testExposedHostPortOnFixedInternalPorts() throws Exception {
+        assertResponse(new GenericContainer().withCommand("top"), 80);
+        assertResponse(new GenericContainer().withCommand("top"), 81);
+    }    
 
     @SneakyThrows
-    protected void assertResponse(GenericContainer container) {
+    protected void assertResponse(GenericContainer container, int port) {
         try {
             container.start();
 
-            String response = container.execInContainer("wget", "-O", "-", "http://host.testcontainers.internal:" + server.getAddress().getPort()).getStdout();
+            String response = container.execInContainer("wget", "-O", "-", "http://host.testcontainers.internal:" + port).getStdout();
 
             assertEquals("received response", "Hello World!", response);
         } finally {

From bb7c9bd1a665432d1fbb139ee7d6d60f1eb7aba2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:50:45 +0100
Subject: [PATCH 0035/4969] Bump neo4j from 3.5.3 to 3.5.4 in /modules/neo4j
 (#1368)

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.3 to 3.5.4.
<details>
<summary>Release notes</summary>

*Sourced from [neo4j's releases](https://github.com/neo4j/neo4j/releases).*

> ## Neo4j 1.9.0 stable release
> The 1.9 release of Neo4j builds upon the previous 1.8 releases and brings extensive improvements in stability and performance. In addition, _Neo4j 1.9 Enterprise_ introduces auto-clustering support, with dramatically simplified configuration and deployment for high demand production use.
> - Support for [auto-clustering in _Neo4j Enterprise_](http://docs.neo4j.org/chunked/1.9/ha.html), which replaces the previous Zookeeper based HA clustering, provides a streamlined deployment process and is much safer and more resilient in failure scenarios.
> - New [neo4j-arbiter](http://docs.neo4j.org/chunked/1.9/arbiter-instances.html) tool, which acts as a voting instance in a Neo4j cluster but does not keep a data store or handle transactions.
> - Addition of [string manipulation, timestamp and other functions](http://docs.neo4j.org/chunked/1.9/query-function.html) to the Cypher query language.
> - Improvements to memory utilization, which reduces working memory requirements and improves overall performance.
> - New [REST endpoints for inspecting cluster status information](http://docs.neo4j.org/chunked/1.9/ha-rest-info.html) (master, slave, etc).
> - Correction of several concurrency and performance issues.
> - Improvements to [Online Backup](http://docs.neo4j.org/chunked/1.9/operations-backup.html) in _Neo4j Enterprise_, including auto-detection of full vs incremental backup based on existing content at the backup location.
> - Updates to Neo4j server webadmin, including welcome pages for new users.
>
> **It is recommended to upgrade all previous Neo4j installations to this release.** Neo4j 1.9 does not require any explicit upgrade to persistent stores created using Neo4j 1.7 and 1.8 installations, however _current users of Neo4j Enterprise must consult the documentation and update the cluster configuration_. Please see the [deployment](http://docs.neo4j.org/chunked/1.9/deployment.html) and [cluster upgrade](http://docs.neo4j.org/chunked/1.9/upgrade-guide.html) sections of the Neo4j manual for more detail. Also note that Neo4j 1.9 is tested and supported with [Oracle JRE 7](http://www.oracle.com/technetwork/java/javase/downloads/index.html). _Users of previous Java versions should upgrade to [Oracle JRE 7](http://www.oracle.com/technetwork/java/javase/downloads/index.html) when deploying Neo4j 1.9._
>
> As part of the Neo4j 1.9 release, multiple behaviours and features of Neo4j have been declared as deprecated, in order to help users prepare for the removal of these in the next major Neo4j release. A [list of deprecations](http://docs.neo4j.org/chunked/1.9.3/deprecations.html) can be found in the Neo4j manual.
>
> For a full summary of changes in this release, please review the CHANGES.TXT file contained within the distribution.
>
> ## Neo4j 1.8.0 stable release
> The 1.8 release of Neo4j provides extensive improvements in stability and performance. As an incremental service release, Neo4j 1.8 builds upon the previous 1.6 and 1.7 releases and provides full backward compatibility.
>
> This release includes the following corrections and improvements:
> - Correction of several concurrency issues affecting performance in multi-
>   threaded configurations.
> - Correction of several concurrency issues that infrequently affect consistency of persisted data.
> - Optimization of high-availability (HA) protocols to increase write performance.
> - Support for zero-downtime rolling upgrades in HA clusters.
> - Improvements to transaction distribution in HA clusters, providing greater resistance to branching.
> - Configurable rotation of logical logs.
> - Support for streamed responses to REST API requests.
> - Support for bi-directional traversals, branch state and path expanders in the traversal framework.
> - Performance improvements to several graph algorithms.</li>
> - Support in the Cypher language for writing graph data and updating auto-indexes (manual indexes are not supported).
> - Extensions to the Cypher language to allow the use of patterns as expressions and predicates.
> - Correction of several issues in the Cypher parser when using collections and when aggregating.
> - Improved error reporting in Cypher and more reliable statement parsing.
> - Support for explicit transactions in neo4j-shell.
>
> **It is recommended to upgrade all previous Neo4j installations to this release.** Neo4j 1.8 does not require any explicit upgrade to persistent stores created using Neo4j 1.6 and 1.7 installations. Please see the [deployment section of the Neo4j manual](http://docs.neo4j.org/chunked/1.8/deployment.html) for more detail.
>
> For a full summary of changes in this release, please review the CHANGES.TXT file contained within the distribution.
</details>
<details>
<summary>Commits</summary>

- [`a41a4c3`](https://github.com/neo4j/neo4j/commit/a41a4c33edcacd51f2ad1305895d47db588d83bb) Ignored revapi for default method and made guard installer thread safe
- [`58a2d96`](https://github.com/neo4j/neo4j/commit/58a2d9695d17a1f936dbae65231e9c689b008a23) Address reviewer feedback for 1603
- [`1515a6b`](https://github.com/neo4j/neo4j/commit/1515a6bbed4b21c4a2e5da21990d92dcb5c766a7) Test fixes
- [`214c116`](https://github.com/neo4j/neo4j/commit/214c116f659b11c6eb8b11429d602586ad7bf128) Added AvailabilityGuardInstaller to LifecycleManagingDatabase
- [`8d133d5`](https://github.com/neo4j/neo4j/commit/8d133d590b7cb54d2b949acd67243ebe2f43d685) Merge branch '3.4' into 3.5
- [`c60c090`](https://github.com/neo4j/neo4j/commit/c60c090b64ee00b6c8c2598e42cd5fa92b4849a4) Merge branch '3.3' into 3.4
- [`dadb6a9`](https://github.com/neo4j/neo4j/commit/dadb6a992e7e02c3f16a71ef0f93152f393bcf0a) Backport a data-race fix that could prevent profiles from being captured.
- [`e4db673`](https://github.com/neo4j/neo4j/commit/e4db673dcf926f7c779bf62d5d1feadf1abc611b) Merge remote-tracking branch 'origin/3.4' into 3.5
- [`2041c79`](https://github.com/neo4j/neo4j/commit/2041c79183c8ab1f136ea0eb70b920e0a949d1d5) Merge remote-tracking branch 'origin/3.3' into 3.4
- [`f9c012a`](https://github.com/neo4j/neo4j/commit/f9c012ad1e0501865a0f7940f3e3e8e472f36eb7) Fix possible NPE in dbms.setTXMetaData
- Additional commits viewable in [compare view](https://github.com/neo4j/neo4j/compare/3.5.3...3.5.4)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.neo4j:neo4j&package-manager=gradle&previous-version=3.5.3&new-version=3.5.4)](https://dependabot.com/compatibility-score.html?dependency-name=org.neo4j:neo4j&package-manager=gradle&previous-version=3.5.3&new-version=3.5.4)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 092cb3a6889..9b0f3a48c3b 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -25,7 +25,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.3"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.4"
 
     compile project(":testcontainers")
 

From 81ca4f196436c56c423cea0c663312e049635ab6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:51:12 +0100
Subject: [PATCH 0036/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#1369)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 6.7.0 to 6.7.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v6.7.0...v6.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index af6efc2a436..68e9028c43b 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.7.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.7.1"
     testCompile "org.elasticsearch.client:transport:6.7.0"
 }

From dc61742b47c1a20edf8b1057c2db0fc079bf7a89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:51:27 +0100
Subject: [PATCH 0037/4969] Bump junit-jupiter-engine from 5.4.1 to 5.4.2 in
 /modules/junit-jupiter (#1364)

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.4.1 to 5.4.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.1...r5.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 ba9a2db096e..bd2f38e5737 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.15'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.1'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
 }
 
 test {

From 12c1fd4a39ad5f371bca2f896bcd2bcefb8fc205 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:56:51 +0100
Subject: [PATCH 0038/4969] Bump httpclient from 4.5.7 to 4.5.8 in
 /modules/spock (#1353)

Bumps httpclient from 4.5.7 to 4.5.8.

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.apache.httpcomponents:httpclient&package-manager=gradle&previous-version=4.5.7&new-version=4.5.8)](https://dependabot.com/compatibility-score.html?dependency-name=org.apache.httpcomponents:httpclient&package-manager=gradle&previous-version=4.5.7&new-version=4.5.8)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 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 2e8b175e303..d9c482b0c7b 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.7'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.15'

From 9f23e022fca06e1903ebb811b194ca8fd0c75ada Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:57:16 +0100
Subject: [PATCH 0039/4969] Bump httpclient from 4.5.7 to 4.5.8 in
 /modules/junit-jupiter (#1352)

Bumps httpclient from 4.5.7 to 4.5.8.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 bd2f38e5737..36b0f217cb4 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'redis.clients:jedis:3.0.1'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.7'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.15'

From 738c90a8f08b45ed7f7cb3bb49a9ad18cafacab5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:57:31 +0100
Subject: [PATCH 0040/4969] Bump httpclient from 4.5.7 to 4.5.8 in /core
 (#1351)

Bumps httpclient from 4.5.7 to 4.5.8.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1e3083c4542..57984f513f6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -100,7 +100,7 @@ dependencies {
         exclude(group: 'org.slf4j')
     }
 
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.7'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.6.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.1'

From 935b12f3798265c588f28212877719721b4f39cf Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 9 Apr 2019 15:54:04 +0100
Subject: [PATCH 0041/4969] Update mssqlserver docs to link to EULA description

---
 docs/modules/databases/mssqlserver.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index 9d63cee9494..9e0bec25dad 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -20,7 +20,9 @@ public class SomeTest {
 ```
 
 !!! warning "EULA Acceptance"
-    Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the MS SQL Server image EULA, Please place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `mcr.microsoft.com/mssql/server:latest`
+    Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the MS SQL Server image EULA, Please place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `mcr.microsoft.com/mssql/server:2017-CU12` (or, if you are overriding the docker image name/tag, update accordingly).
+    
+    Please see the [`microsoft-mssql-server` image documentation](https://hub.docker.com/_/microsoft-mssql-server#environment-variables) for a link to the EULA document.
 
 ## Adding this module to your project dependencies
 

From 1938b32868751af6b28304292bf5b6fa9a4bf18e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 9 Apr 2019 20:18:55 +0100
Subject: [PATCH 0042/4969] Add build args and Dockerfile path override to
 ImageFromDockerfile (#1372)

---
 .../images/builder/ImageFromDockerfile.java   | 20 ++++++
 .../images/builder/DockerfileBuildTest.java   | 67 +++++++++++++++++++
 .../dockerfile-build-test/Dockerfile          |  2 +
 .../dockerfile-build-test/Dockerfile-alt      |  2 +
 .../dockerfile-build-test/Dockerfile-buildarg |  3 +
 .../dockerfile-build-test/localfile.txt       |  1 +
 docs/features/creating_images.md              | 33 +++++++--
 7 files changed, 122 insertions(+), 6 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
 create mode 100644 core/src/test/resources/dockerfile-build-test/Dockerfile
 create mode 100644 core/src/test/resources/dockerfile-build-test/Dockerfile-alt
 create mode 100644 core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
 create mode 100644 core/src/test/resources/dockerfile-build-test/localfile.txt

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index ed109acc4c3..c7d409c0660 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -23,6 +23,7 @@
 import java.io.PipedOutputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.zip.GZIPOutputStream;
 
@@ -60,6 +61,8 @@ public class ImageFromDockerfile extends LazyFuture<String> implements
     private boolean deleteOnExit = true;
 
     private final Map<String, Transferable> transferables = new HashMap<>();
+    private final Map<String, String> buildArgs = new HashMap<>();
+    private Optional<String> dockerFilePath = Optional.empty();
 
     public ImageFromDockerfile() {
         this("testcontainers/" + Base58.randomString(16).toLowerCase());
@@ -139,5 +142,22 @@ public void onNext(BuildResponseItem item) {
 
     protected void configure(BuildImageCmd buildImageCmd) {
         buildImageCmd.withTag(this.getDockerImageName());
+        this.dockerFilePath.ifPresent(buildImageCmd::withDockerfilePath);
+        this.buildArgs.forEach(buildImageCmd::withBuildArg);
+    }
+
+    public ImageFromDockerfile withBuildArg(final String key, final String value) {
+        this.buildArgs.put(key, value);
+        return this;
+    }
+
+    public ImageFromDockerfile withBuildArgs(final Map<String, String> args) {
+        this.buildArgs.putAll(args);
+        return this;
+    }
+
+    public ImageFromDockerfile withDockerfilePath(String relativePathFromBuildRoot) {
+        this.dockerFilePath = Optional.of(relativePathFromBuildRoot);
+        return this;
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
new file mode 100644
index 00000000000..4c33fe9118b
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
@@ -0,0 +1,67 @@
+package org.testcontainers.images.builder;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+
+@RunWith(Parameterized.class)
+public class DockerfileBuildTest {
+
+    private static final Path RESOURCE_PATH = Paths.get("src/test/resources/dockerfile-build-test");
+
+    public String expectedFileContent;
+    public ImageFromDockerfile image;
+
+    @Parameterized.Parameters
+    public static Object[][] parameters() {
+        return new Object[][]{
+            // Dockerfile build without explicit per-file inclusion
+            new Object[]{"test1234",
+                // docsShowRecursiveFileInclusion {
+                new ImageFromDockerfile()
+                    .withFileFromPath(".", RESOURCE_PATH)
+                // }
+            },
+
+            // Dockerfile build using a non-standard Dockerfile
+            new Object[]{"test4567",
+                new ImageFromDockerfile()
+                    .withFileFromPath(".", RESOURCE_PATH)
+                    .withDockerfilePath("./Dockerfile-alt")
+            },
+
+            // Dockerfile build using build args
+            new Object[]{"test7890",
+                new ImageFromDockerfile()
+                    .withFileFromPath(".", RESOURCE_PATH)
+                    .withDockerfilePath("./Dockerfile-buildarg")
+                    .withBuildArg("CUSTOM_ARG", "test7890")
+            },
+        };
+    }
+
+    public DockerfileBuildTest(String expectedFileContent, ImageFromDockerfile image) {
+        this.expectedFileContent = expectedFileContent;
+        this.image = image;
+    }
+
+    @Test
+    public void performTest() {
+        try (final GenericContainer container = new GenericContainer(image)
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+            .withCommand("cat", "/test.txt")) {
+
+            container.start();
+
+            final String logs = container.getLogs();
+            assertTrue("expected file content indicates that dockerfile build steps have been run", logs.contains(expectedFileContent));
+        }
+    }
+}
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile b/core/src/test/resources/dockerfile-build-test/Dockerfile
new file mode 100644
index 00000000000..eee182f21c1
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile
@@ -0,0 +1,2 @@
+FROM alpine:3.2
+COPY localfile.txt /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-alt b/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
new file mode 100644
index 00000000000..f6938e5fc8d
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
@@ -0,0 +1,2 @@
+FROM alpine:3.2
+RUN echo "test4567" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg b/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
new file mode 100644
index 00000000000..4ae26f50f77
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
@@ -0,0 +1,3 @@
+FROM alpine:3.2
+ARG CUSTOM_ARG
+RUN echo "${CUSTOM_ARG}" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/localfile.txt b/core/src/test/resources/dockerfile-build-test/localfile.txt
new file mode 100644
index 00000000000..5586d4f8333
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/localfile.txt
@@ -0,0 +1 @@
+test1234
diff --git a/docs/features/creating_images.md b/docs/features/creating_images.md
index 0437e6d8a8e..0539642e159 100644
--- a/docs/features/creating_images.md
+++ b/docs/features/creating_images.md
@@ -9,10 +9,7 @@ image needs to be customized for specific test(s).
 Simply pass a configured instance of `ImageFromDockerfile` as a constructor parameter to `GenericContainer`.
 Testcontainers will `docker build` a temporary container image, and will use it when creating the container.
 
-
-## Examples
-
-### Dockerfile from String, file or classpath resource
+## Dockerfile from String, file or classpath resource
 
 `ImageFromDockerfile` accepts arbitrary files, strings or classpath resources to be used as files in the build context.
 At least one of these needs to be a `Dockerfile`.
@@ -25,14 +22,27 @@ public GenericContainer dslContainer = new GenericContainer(
             .withFileFromClasspath("Dockerfile", "mappable-dockerfile/Dockerfile"))
 ```
 
-The following methods may be used to provide the `Dockerfile` and any other required files:
+The following methods may be used to provide the `Dockerfile` and any other required build context files:
 
 * `withFileFromString(buildContextPath, content)`
 * `withFileFromClasspath(buildContextPath, classpathPath)`
 * `withFileFromPath(buildContextPath, filesystemPath)`
 * `withFileFromFile(buildContextPath, filesystemFile)`
 
-### Dockerfile DSL
+!!! info
+    In older versions of Testcontainers (before 1.3.0) it was necessary to explicitly declare each file that needed to 
+    be present in the Docker build context.
+    This can be replaced with the following syntax:
+    <!--codeinclude--> 
+    [Passing an entire directory of files to the Dockerfile build context](../../core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java) inside_block:docsShowRecursiveFileInclusion
+    <!--/codeinclude-->
+    
+    Where `RESOURCE_PATH` is the path to a directory containing a `Dockerfile` and any files that it needs to refer to.
+    Doing this is equivalent to `docker build RESOURCE_PATH` on the command line.
+    
+    To mimic `docker build .`, `RESOURCE_PATH` would simply be set to `.` as well.
+
+## Dockerfile DSL
 
 If a static Dockerfile is not sufficient (e.g. your test needs to cover many variations that are best generated
 programmatically), there is a DSL available to allow Dockerfiles to be defined in code. e.g.:
@@ -64,3 +74,14 @@ By default the no-args constructor will use an image name of the form `testconta
 * `public ImageFromDockerfile()`
 * `public ImageFromDockerfile(String dockerImageName)`
 * `public ImageFromDockerfile(String dockerImageName, boolean deleteOnExit)`
+
+## Alternative Dockerfiles
+
+Normally Docker will automatically build an image from any `/Dockerfile` that it finds in the root of the build context.
+To override this behaviour, use `.withDockerfilePath("./Name-Of-Other-Dockerfile")`.
+
+## Build Args
+
+[Build Args](https://docs.docker.com/engine/reference/builder/#arg) may be used to allow lightweight parameterization.
+
+To specify build args, use `.withBuildArg("varname", "value")` or provide a `Map` of args using `.withBuildArgs(map)`.

From 30d5f8518f86dc2861213fb6f59432defcffcb82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2019 20:21:15 +0100
Subject: [PATCH 0043/4969] Bump transport from 6.7.0 to 6.7.1 in
 /modules/elasticsearch (#1370)

Bumps [transport](https://github.com/elastic/elasticsearch) from 6.7.0 to 6.7.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v6.7.0...v6.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 68e9028c43b..699bc54bd9e 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.7.1"
-    testCompile "org.elasticsearch.client:transport:6.7.0"
+    testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 2da17b9855f855b3ae6ea5b9f07f8cb6080dc2fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2019 20:21:33 +0100
Subject: [PATCH 0044/4969] Bump mockito-core from 2.25.1 to 2.26.0 in /core
 (#1366)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.25.1 to 2.26.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.25.1...v2.26.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 57984f513f6..cbac38e88ff 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.6.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.1'
-    testCompile ('org.mockito:mockito-core:2.25.1') {
+    testCompile ('org.mockito:mockito-core:2.26.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 3fff9741183013666a0e5672fc1359e03f431681 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Wed, 10 Apr 2019 12:37:21 +0200
Subject: [PATCH 0045/4969] Improve WaitAllStrategy (#1272)

---
 .../containers/DockerComposeContainer.java    |   2 +-
 .../wait/strategy/WaitAllStrategy.java        |  73 +++++-
 .../containers/wait/WaitAllStrategyTest.java  |  69 ------
 .../wait/strategy/WaitAllStrategyTest.java    | 224 ++++++++++++++++++
 4 files changed, 290 insertions(+), 78 deletions(-)
 delete mode 100644 core/src/test/java/org/testcontainers/containers/wait/WaitAllStrategyTest.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index ae10c3096fa..0b6db19ca28 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -335,7 +335,7 @@ private String getServiceInstanceName(String serviceName) {
      */
     private void addWaitStrategy(String serviceInstanceName, @NonNull WaitStrategy waitStrategy) {
         final WaitAllStrategy waitAllStrategy = waitStrategyMap.computeIfAbsent(serviceInstanceName, __ ->
-            (WaitAllStrategy) new WaitAllStrategy().withStartupTimeout(Duration.ofMinutes(30)));
+            new WaitAllStrategy(WaitAllStrategy.Mode.WITH_MAXIMUM_OUTER_TIMEOUT).withStartupTimeout(Duration.ofMinutes(30)));
         waitAllStrategy.withStrategy(waitStrategy);
     }
 
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java
index 1cc76c0747c..cebacb375b6 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java
@@ -1,34 +1,91 @@
 package org.testcontainers.containers.wait.strategy;
 
-import org.rnorth.ducttape.timeouts.Timeouts;
-
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.rnorth.ducttape.timeouts.Timeouts;
+
 public class WaitAllStrategy implements WaitStrategy {
 
+    public enum Mode {
+
+        /**
+         * This is the default mode: The timeout of the {@link WaitAllStrategy strategy} is applied to each individual
+         * strategy, so that the container waits maximum for
+         * {@link org.testcontainers.containers.wait.strategy.WaitAllStrategy#timeout}.
+         */
+        WITH_OUTER_TIMEOUT,
+
+        /**
+         * Using this mode triggers the following behaviour: The outer timeout is disabled and the outer enclosing
+         * strategy waits for all inner strategies according to their timeout. Once set, it disables
+         * {@link org.testcontainers.containers.wait.strategy.WaitAllStrategy#withStartupTimeout(java.time.Duration)} method,
+         * as it would overwrite inner timeouts.
+         */
+        WITH_INDIVIDUAL_TIMEOUTS_ONLY,
+
+        /**
+         * This is the original mode of this strategy: The inner strategies wait with their preconfigured timeout
+         * individually and the wait all strategy kills them, if the outer limit is reached.
+         */
+        WITH_MAXIMUM_OUTER_TIMEOUT
+    }
+
+    private final Mode mode;
     private final List<WaitStrategy> strategies = new ArrayList<>();
     private Duration timeout = Duration.ofSeconds(30);
 
+    public WaitAllStrategy() {
+        this(Mode.WITH_OUTER_TIMEOUT);
+    }
+
+    public WaitAllStrategy(Mode mode) {
+        this.mode = mode;
+    }
+
     @Override
     public void waitUntilReady(WaitStrategyTarget waitStrategyTarget) {
-        Timeouts.doWithTimeout((int) timeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
-            for (WaitStrategy strategy : strategies) {
-                strategy.waitUntilReady(waitStrategyTarget);
-            }
-        });
+        if (mode == Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY) {
+            waitUntilNestedStrategiesAreReady(waitStrategyTarget);
+        } else {
+            Timeouts.doWithTimeout((int) timeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
+                waitUntilNestedStrategiesAreReady(waitStrategyTarget);
+            });
+        }
+    }
+
+    private void waitUntilNestedStrategiesAreReady(WaitStrategyTarget waitStrategyTarget) {
+        for (WaitStrategy strategy : strategies) {
+            strategy.waitUntilReady(waitStrategyTarget);
+        }
     }
 
     public WaitAllStrategy withStrategy(WaitStrategy strategy) {
+
+        if (mode == Mode.WITH_OUTER_TIMEOUT) {
+            applyStartupTimeout(strategy);
+        }
+
         this.strategies.add(strategy);
         return this;
     }
 
     @Override
-    public WaitStrategy withStartupTimeout(Duration startupTimeout) {
+    public WaitAllStrategy withStartupTimeout(Duration startupTimeout) {
+
+        if (mode == Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY) {
+            throw new IllegalStateException(String.format(
+                "Changing startup timeout is not supported with mode %s", Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY));
+        }
+
         this.timeout = startupTimeout;
+        strategies.forEach(this::applyStartupTimeout);
         return this;
     }
+
+    private void applyStartupTimeout(WaitStrategy childStrategy) {
+        childStrategy.withStartupTimeout(this.timeout);
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/wait/WaitAllStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/WaitAllStrategyTest.java
deleted file mode 100644
index f47a7212a5c..00000000000
--- a/core/src/test/java/org/testcontainers/containers/wait/WaitAllStrategyTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.testcontainers.containers.wait;
-
-import com.google.common.util.concurrent.Uninterruptibles;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.rnorth.ducttape.TimeoutException;
-import org.testcontainers.containers.GenericContainer;
-
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.inOrder;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-
-public class WaitAllStrategyTest {
-
-    @Mock
-    private GenericContainer container;
-    @Mock
-    private WaitStrategy strategy1;
-    @Mock
-    private WaitStrategy strategy2;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void simpleTest() {
-
-        final WaitStrategy underTest = new WaitAllStrategy()
-                .withStrategy(strategy1)
-                .withStrategy(strategy2);
-
-        doNothing().when(strategy1).waitUntilReady(eq(container));
-        doNothing().when(strategy2).waitUntilReady(eq(container));
-
-        underTest.waitUntilReady(container);
-
-        InOrder inOrder = inOrder(strategy1, strategy2);
-        inOrder.verify(strategy1).waitUntilReady(any());
-        inOrder.verify(strategy2).waitUntilReady(any());
-    }
-
-    @Test
-    public void appliesOuterTimeout() {
-
-        final WaitStrategy underTest = new WaitAllStrategy()
-                .withStrategy(strategy1)
-                .withStartupTimeout(Duration.ofMillis(10));
-
-        doAnswer(invocation -> {
-            Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
-            return null;
-        }).when(strategy1).waitUntilReady(eq(container));
-
-        assertThrows("The outer strategy timeout applies", TimeoutException.class, () -> {
-            underTest.waitUntilReady(container);
-        });
-    }
-}
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
new file mode 100644
index 00000000000..3b2172d5bcf
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
@@ -0,0 +1,224 @@
+package org.testcontainers.containers.wait.strategy;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.*;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.rnorth.ducttape.TimeoutException;
+import org.testcontainers.containers.GenericContainer;
+
+import com.google.common.util.concurrent.Uninterruptibles;
+
+public class WaitAllStrategyTest {
+
+    @Mock
+    private GenericContainer container;
+    @Mock
+    private WaitStrategy strategy1;
+    @Mock
+    private WaitStrategy strategy2;
+    @Mock
+    private WaitStrategy strategy3;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void simpleTest() {
+
+        final WaitStrategy underTest = new WaitAllStrategy()
+                .withStrategy(strategy1)
+                .withStrategy(strategy2);
+
+        doNothing().when(strategy1).waitUntilReady(eq(container));
+        doNothing().when(strategy2).waitUntilReady(eq(container));
+
+        underTest.waitUntilReady(container);
+
+        InOrder inOrder = inOrder(strategy1, strategy2);
+        inOrder.verify(strategy1).waitUntilReady(any());
+        inOrder.verify(strategy2).waitUntilReady(any());
+    }
+
+    @Test
+    public void maxTimeOutApplies() {
+
+        WaitStrategy child1 = new SleepingStrategy(Duration.ofMinutes(30))
+            .withStartupTimeout(Duration.ofHours(1));
+
+        final WaitStrategy underTest = new WaitAllStrategy()
+            .withStrategy(child1)
+            .withStartupTimeout(Duration.ofMillis(10));
+
+        assertThrows("The outer strategy timeout applies", TimeoutException.class, () -> {
+            underTest.waitUntilReady(container);
+        });
+    }
+
+    @Test
+    public void appliesOuterTimeoutTooLittleTime() {
+
+        Duration defaultInnerWait = Duration.ofMillis(2);
+        Duration outerWait = Duration.ofMillis(6);
+
+        WaitStrategy child1 = new SleepingStrategy(defaultInnerWait);
+        WaitStrategy child2 = new SleepingStrategy(defaultInnerWait);
+
+        final WaitStrategy underTest = new WaitAllStrategy()
+            .withStrategy(child1)
+            .withStrategy(child2)
+            .withStartupTimeout(outerWait);
+
+        assertThrows("The outer strategy timeout applies", TimeoutException.class, () -> {
+            underTest.waitUntilReady(container);
+        });
+    }
+
+    @Test
+    public void appliesOuterTimeoutEnoughTime() {
+
+        Duration defaultInnerWait = Duration.ofMillis(2);
+        Duration outerWait = Duration.ofMillis(20);
+
+        WaitStrategy child1 = new SleepingStrategy(defaultInnerWait);
+        WaitStrategy child2 = new SleepingStrategy(defaultInnerWait);
+
+        final WaitStrategy underTest = new WaitAllStrategy()
+            .withStrategy(child1)
+            .withStrategy(child2)
+            .withStartupTimeout(outerWait);
+
+        try {
+            underTest.waitUntilReady(container);
+        } catch (Exception e) {
+            if (e.getCause() instanceof CaughtTimeoutException)
+                fail("The timeout wasn't applied to inner strategies.");
+            else {
+                fail(e.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
+
+        final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
+            .withStrategy(strategy1)
+            .withStrategy(strategy2)
+            .withStrategy(strategy3);
+
+        doNothing().when(strategy1).waitUntilReady(eq(container));
+        doThrow(TimeoutException.class).when(strategy2).waitUntilReady(eq(container));
+
+        assertThrows("The outer strategy timeout applies", TimeoutException.class, () -> {
+            underTest.waitUntilReady(container);
+        });
+
+        InOrder inOrder = inOrder(strategy1, strategy2, strategy3);
+        inOrder.verify(strategy1).waitUntilReady(any());
+        inOrder.verify(strategy2).waitUntilReady(any());
+        inOrder.verify(strategy3, never()).waitUntilReady(any());
+    }
+
+    @Test
+    public void timeoutChangeShouldNotBePossibleWithIndividualTimeoutMode() {
+
+        final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY);
+
+        assertThrows("Cannot change timeout for individual timeouts", IllegalStateException.class, () -> {
+            underTest.withStartupTimeout(Duration.ofSeconds(42));
+        });
+    }
+
+    @Test
+    public void shouldNotMessWithIndividualTimeouts() {
+
+        final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
+            .withStrategy(strategy1)
+            .withStrategy(strategy2);
+
+        verify(strategy1, never()).withStartupTimeout(any());
+        verify(strategy1, never()).withStartupTimeout(any());
+    }
+
+    @Test
+    public void shouldOverwriteIndividualTimeouts() {
+
+        Duration someSeconds = Duration.ofSeconds(23);
+        final WaitStrategy underTest = new WaitAllStrategy()
+            .withStartupTimeout(someSeconds)
+            .withStrategy(strategy1)
+            .withStrategy(strategy2);
+
+        verify(strategy1).withStartupTimeout(someSeconds);
+        verify(strategy1).withStartupTimeout(someSeconds);
+    }
+
+    @Test
+    public void appliesOuterTimeoutOnAdditionalChildren() {
+
+        Duration defaultInnerWait = Duration.ofMillis(2);
+        Duration outerWait = Duration.ofMillis(20);
+
+        WaitStrategy child1 = new SleepingStrategy(defaultInnerWait);
+        WaitStrategy child2 = new SleepingStrategy(defaultInnerWait);
+
+        final WaitStrategy underTest = new WaitAllStrategy()
+            .withStrategy(child1)
+            .withStartupTimeout(outerWait)
+            .withStrategy(child2);
+
+        try {
+            underTest.waitUntilReady(container);
+        } catch (Exception e) {
+            if (e.getCause() instanceof CaughtTimeoutException)
+                fail("The timeout wasn't applied to inner strategies.");
+            else {
+                fail(e.getMessage());
+            }
+        }
+    }
+
+    static class CaughtTimeoutException extends RuntimeException {
+
+        CaughtTimeoutException(String message) {
+            super(message);
+        }
+    }
+
+    static class SleepingStrategy extends AbstractWaitStrategy {
+
+        private final long sleepingDuration;
+
+        SleepingStrategy(Duration defaultInnerWait) {
+            super.startupTimeout = defaultInnerWait;
+            // Always oversleep by default
+            this.sleepingDuration = defaultInnerWait.multipliedBy(2).toMillis();
+        }
+
+        @Override
+        protected void waitUntilReady() {
+            try {
+                // Don't use ducttape, make sure we don't catch the wrong TimeoutException later on.
+                CompletableFuture.runAsync(
+                    () -> Uninterruptibles.sleepUninterruptibly(this.sleepingDuration, TimeUnit.MILLISECONDS)
+                ).get((int) startupTimeout.toMillis(), TimeUnit.MILLISECONDS);
+            } catch (InterruptedException | ExecutionException e) {
+            } catch (java.util.concurrent.TimeoutException e) {
+                throw new CaughtTimeoutException("Inner wait timed out, outer strategy didn't apply.");
+            }
+        }
+    }
+}

From 1628b659cf991576902457845319602ea2c8fc23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2019 17:58:43 +0100
Subject: [PATCH 0046/4969] Bump amqp-client from 5.6.0 to 5.7.0 in /core
 (#1367)

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.6.0 to 5.7.0.
<details>
<summary>Release notes</summary>

*Sourced from [amqp-client's releases](https://github.com/rabbitmq/rabbitmq-java-client/releases).*

> ## 5.7.0
> # Changes between 5.6.0 and 5.7.0
>
> This is a minor release with usability improvements and dependency upgrades. All users of the 5.x.x series are encouraged to upgrade to this version.
>
> ## Improve logging for TLS connections
>
> GitHub issue: [#441](https://github-redirect.dependabot.com/rabbitmq/rabbitmq-java-client/issues/441)
>
> ## Don't panic when cancelling an unknown consumer
>
> GitHub issue: [#525](https://github-redirect.dependabot.com/rabbitmq/rabbitmq-java-client/issues/525)
>
> ## Bump dependencies
>
> GitHub issue: [#607](https://github-redirect.dependabot.com/rabbitmq/rabbitmq-java-client/issues/607)
>
> ## 5.7.0.RC1
> # Changes between 5.6.0 and 5.7.0.RC1
>
> This is a pre-release for 5.7.0, a maintenance release with usability improvements and dependency upgrades. All users of the 5.x.x series are encouraged to test this version.
>
> ## Improve logging for TLS connections
>
> GitHub issue: [#441](https://github-redirect.dependabot.com/rabbitmq/rabbitmq-java-client/issues/441)
>
> ## Don't panic when cancelling an unknown consumer
>
> GitHub issue: [#525](https://github-redirect.dependabot.com/rabbitmq/rabbitmq-java-client/issues/525)
>
> ## Bump dependencies
>
> GitHub issue: [#607](https://github-redirect.dependabot.com/rabbitmq/rabbitmq-java-client/issues/607)
</details>
<details>
<summary>Changelog</summary>

*Sourced from [amqp-client's changelog](https://github.com/rabbitmq/rabbitmq-java-client/blob/v5.7.0/release-versions.txt).*

> RELEASE_VERSION="5.7.0"
> DEVELOPMENT_VERSION="5.8.0-SNAPSHOT"
</details>
<details>
<summary>Commits</summary>

- [`57aa724`](https://github.com/rabbitmq/rabbitmq-java-client/commit/57aa724ddd15ac376576894bd869d04b49e62451) [maven-release-plugin] prepare release v5.7.0
- [`1928ce8`](https://github.com/rabbitmq/rabbitmq-java-client/commit/1928ce86a7c7da761003af4ee8fed89237b18938) Set release version to 5.7.0
- [`9f2dffe`](https://github.com/rabbitmq/rabbitmq-java-client/commit/9f2dffec12bcebcc41dc0d2a6d996df04661143a) [maven-release-plugin] prepare for next development iteration
- [`e79ed4d`](https://github.com/rabbitmq/rabbitmq-java-client/commit/e79ed4d7491bc541e15c3e548ed77181778ff0b8) [maven-release-plugin] prepare release v5.7.0.RC1
- [`bb8f6ed`](https://github.com/rabbitmq/rabbitmq-java-client/commit/bb8f6edf2f4c7fc3d9c805b91c32e59a58782e0a) Bump test dependencies
- [`953d255`](https://github.com/rabbitmq/rabbitmq-java-client/commit/953d255e4728b222e3f3fbc88b8db8a541d82933) Bump dependencies
- [`e49f66d`](https://github.com/rabbitmq/rabbitmq-java-client/commit/e49f66d6f0fad816feb33012a95d059cfdab2c20) Add comment to explain decision tree
- [`365dd22`](https://github.com/rabbitmq/rabbitmq-java-client/commit/365dd22a51a79ed40e7f45742a4eb71ecbfd44e5) Add test for Channel#basicCancel with unknown consumer tag
- [`6081628`](https://github.com/rabbitmq/rabbitmq-java-client/commit/6081628163669bac39456c9fcf1dbc3c6692786d) Log warning when receiving basic.cancel for unknown consumer
- [`be57b26`](https://github.com/rabbitmq/rabbitmq-java-client/commit/be57b2620a5d148af3a0857fe798bd1f1bbb26a6) Merge pull request [#548](https://github-redirect.dependabot.com/rabbitmq/rabbitmq-java-client/issues/548) from spring-operator/polish-urls-apache-license-5.x.x...
- Additional commits viewable in [compare view](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.6.0...v5.7.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=com.rabbitmq:amqp-client&package-manager=gradle&previous-version=5.6.0&new-version=5.7.0)](https://dependabot.com/compatibility-score.html?dependency-name=com.rabbitmq:amqp-client&package-manager=gradle&previous-version=5.6.0&new-version=5.7.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index cbac38e88ff..112bd096193 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -102,7 +102,7 @@ dependencies {
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
     testCompile 'redis.clients:jedis:3.0.1'
-    testCompile 'com.rabbitmq:amqp-client:5.6.0'
+    testCompile 'com.rabbitmq:amqp-client:5.7.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.1'
     testCompile ('org.mockito:mockito-core:2.26.0') {
         exclude(module: 'hamcrest-core')

From a6c676bc43541100f036ac368d242b25c5a16069 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2019 17:58:56 +0100
Subject: [PATCH 0047/4969] Bump kafka-clients from 2.1.1 to 2.2.0 in
 /modules/kafka (#1338)

Bumps kafka-clients from 2.1.1 to 2.2.0.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 6985f7a89a6..cefb6368445 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.1.1'
+    testCompile 'org.apache.kafka:kafka-clients:2.2.0'
     testCompile 'org.assertj:assertj-core:3.12.2'
     testCompile 'com.google.guava:guava:23.0'
 }

From 8a8548affca2dab87478677215283817ce3bbd46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2019 18:00:14 +0100
Subject: [PATCH 0048/4969] Bump mongo-java-driver from 3.10.1 to 3.10.2 in
 /core (#1374)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.10.1...r3.10.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 112bd096193..1f08c0159b2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -103,7 +103,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.7.0'
-    testCompile 'org.mongodb:mongo-java-driver:3.10.1'
+    testCompile 'org.mongodb:mongo-java-driver:3.10.2'
     testCompile ('org.mockito:mockito-core:2.26.0') {
         exclude(module: 'hamcrest-core')
     }

From 3b9e61e2b69db264db4e3f18dce8194d4debd2cf Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 11 Apr 2019 17:51:28 +0200
Subject: [PATCH 0049/4969] Fix shading of modules (#1342, #1390)

---
 build.gradle | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 75977bd540f..27f1d8859f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,16 +56,34 @@ subprojects {
         configurations = []
         classifier = null
 
-        // Keep docker-java's package inside the final jar
-        relocate("com.github.dockerjava", "com.github.dockerjava")
-    }
+        doFirst {
+            // See https://github.com/johnrengelman/shadow/blob/5.0.0/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ConfigureShadowRelocation.groovy
+            Set<String> packages = []
+            // Always read from core's configurations
+            for (configuration in tasks.getByPath(":testcontainers:shadowJar").configurations) {
+                for (jar in configuration.files) {
+                    def jf = new java.util.jar.JarFile(jar)
+                    for (entry in jf.entries()) {
+                        def name = entry.name
+                        if (name.endsWith(".class")) {
+                            packages.add(name.substring(0, name.lastIndexOf('/')))
+                        }
+                    }
+                    jf.close()
+                }
+            }
+            for (pkg in packages) {
+                pkg = pkg.replaceAll('/', '.')
 
-    task relocateShadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation) {
-        target = tasks.shadowJar
-        prefix = "org.testcontainers.shaded"
-    }
+                if (pkg.startsWith("com.github.dockerjava.")) {
+                    // Keep docker-java's package inside the final jar
+                    continue;
+                }
 
-    tasks.shadowJar.dependsOn tasks.relocateShadowJar
+                tasks.shadowJar.relocate(pkg, "org.testcontainers.shaded.${pkg}")
+            }
+        }
+    }
 
     publishing {
         publications {

From 7501244d0ee19038b5e9c3c10d8c6844b0ce0d89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Apr 2019 21:47:45 +0100
Subject: [PATCH 0050/4969] Bump cucumber-java from 2.3.1 to 4.3.0 in /examples
 (#1394)

* Bump cucumber-java from 2.3.1 to 4.3.0 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 2.3.1 to 4.3.0.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v2.3.1...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump cucumber libs together for compatibility
---
 examples/cucumber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index f8744b9d0e8..e9b052050d5 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:2.3.1'
-    testImplementation 'io.cucumber:cucumber-junit:2.3.1'
+    implementation 'io.cucumber:cucumber-java:4.3.0'
+    testImplementation 'io.cucumber:cucumber-junit:4.3.0'
     testImplementation 'org.testcontainers:selenium'
 }

From e5b629eb668c103701b3fc4751b929c9b211f250 Mon Sep 17 00:00:00 2001
From: Gerasimov Gennady <gennady.g.gerasimov@gmail.com>
Date: Sat, 13 Apr 2019 23:50:05 +0300
Subject: [PATCH 0051/4969] Remove repeated call to toLowerCase() in
 ScriptUtils (#1397)

Fixes #1396
---
 .../java/org/testcontainers/ext/ScriptUtils.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index 0f917a1561f..f27b3610f15 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -124,6 +124,7 @@ public static void splitSqlScript(String resource, String script, String separat
 		Character currentLiteralDelimiter = null;
 
 		int compoundStatementDepth = 0;
+		final String lowerCaseScriptContent = script.toLowerCase();
 		char[] content = script.toCharArray();
 		for (int i = 0; i < script.length(); i++) {
 			char c = content[i];
@@ -148,24 +149,24 @@ public static void splitSqlScript(String resource, String script, String separat
 			}
 			final boolean inLiteral = currentLiteralDelimiter != null;
 
-			if (!inLiteral && containsSubstringAtOffset(script, commentPrefix, i)) {
+			if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, commentPrefix, i)) {
 				inLineComment = true;
 			}
  			if (inLineComment && c == '\n') {
 				inLineComment = false;
 			}
-			if (!inLiteral && containsSubstringAtOffset(script, blockCommentStartDelimiter, i)) {
+			if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, blockCommentStartDelimiter, i)) {
 				inBlockComment = true;
 			}
-			if (!inLiteral && inBlockComment && containsSubstringAtOffset(script, blockCommentEndDelimiter, i)) {
+			if (!inLiteral && inBlockComment && containsSubstringAtOffset(lowerCaseScriptContent, blockCommentEndDelimiter, i)) {
 				inBlockComment = false;
 			}
 			final boolean inComment = inLineComment || inBlockComment;
 
-			if (!inLiteral && !inComment && containsSubstringAtOffset(script, "BEGIN", i)) {
+			if (!inLiteral && !inComment && containsSubstringAtOffset(lowerCaseScriptContent, "BEGIN", i)) {
 				compoundStatementDepth++;
 			}
-			if (!inLiteral && !inComment && containsSubstringAtOffset(script, "END", i)) {
+			if (!inLiteral && !inComment && containsSubstringAtOffset(lowerCaseScriptContent, "END", i)) {
 				compoundStatementDepth--;
 			}
 			final boolean inCompoundStatement = compoundStatementDepth != 0;
@@ -222,8 +223,7 @@ else if (c == ' ' || c == '\n' || c == '\t') {
 		}
 	}
 
-	private static boolean containsSubstringAtOffset(String string, String substring, int offset) {
-		String lowercaseString = string.toLowerCase();
+	private static boolean containsSubstringAtOffset(String lowercaseString, String substring, int offset) {
 		String lowercaseSubstring = substring.toLowerCase();
 
 		return lowercaseString.startsWith(lowercaseSubstring, offset);

From 92fc7fa78fc8eee94badd2d0df3e8a45809b9dfa Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Sun, 14 Apr 2019 06:46:00 -0400
Subject: [PATCH 0052/4969] Postgresql 9.6.8 -> 9.6.12 (#1350)

---
 .../java/org/testcontainers/containers/PostgreSQLContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 13c5b49efc7..eb7b78b1864 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -15,7 +15,7 @@
 public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
     public static final String NAME = "postgresql";
     public static final String IMAGE = "postgres";
-    public static final String DEFAULT_TAG = "9.6.8";
+    public static final String DEFAULT_TAG = "9.6.12";
 
     public static final Integer POSTGRESQL_PORT = 5432;
     private String databaseName = "test";

From 6f6fb8299aaa6e01b93a2d4ba89e50e1a16927d5 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 15 Apr 2019 10:55:07 +0100
Subject: [PATCH 0053/4969] Attempt to make WaitAllStrategyTests more stable
 (#1400)

@kiview WDYT?

I was finding that these tests were failing randomly ~30% of the time, which is likely to be caused by the specific timing-sensitive aspects of the code.

To be honest I also found the existing tests (the ones which exercised the timeouts behaviour) to be hard to follow, and therefore very hard to be sure that it would be both correct and stable.

So, instead, I've updated the test:
* to keep the existing mock-based tests to check _what the strategy does_ (agnostic of timeout durations).
* to replace the timing-sensitive tests with some simpler tests that just check that the `startupTimeout`s get propagated properly. These tests _don't_ fire the `WaitAllStrategy`, i.e. don't actually wait at all.

My thinking is that the combination of these two types of tests really should be enough. 'Integration testing' this would be nice, but is complicated and error prone, so testing the execution flow and the data flow, essentially, is a compromise that I'm happier with.
---
 .../wait/strategy/WaitAllStrategyTest.java    | 161 ++++++------------
 1 file changed, 55 insertions(+), 106 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
index 3b2172d5bcf..897293282bd 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
@@ -1,14 +1,5 @@
 package org.testcontainers.containers.wait.strategy;
 
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
-
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
@@ -17,7 +8,12 @@
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.GenericContainer;
 
-import com.google.common.util.concurrent.Uninterruptibles;
+import java.time.Duration;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 public class WaitAllStrategyTest {
 
@@ -35,80 +31,78 @@ public void setUp() {
         MockitoAnnotations.initMocks(this);
     }
 
+    /*
+     * Dummy-based tests, to check that timeout values are propagated correctly, without involving actual timing-sensitive code
+     */
     @Test
-    public void simpleTest() {
-
-        final WaitStrategy underTest = new WaitAllStrategy()
-                .withStrategy(strategy1)
-                .withStrategy(strategy2);
-
-        doNothing().when(strategy1).waitUntilReady(eq(container));
-        doNothing().when(strategy2).waitUntilReady(eq(container));
-
-        underTest.waitUntilReady(container);
-
-        InOrder inOrder = inOrder(strategy1, strategy2);
-        inOrder.verify(strategy1).waitUntilReady(any());
-        inOrder.verify(strategy2).waitUntilReady(any());
-    }
+    public void parentTimeoutApplies() {
 
-    @Test
-    public void maxTimeOutApplies() {
+        DummyStrategy child1 = new DummyStrategy(Duration.ofMillis(10));
+        child1.withStartupTimeout(Duration.ofMillis(20));
 
-        WaitStrategy child1 = new SleepingStrategy(Duration.ofMinutes(30))
-            .withStartupTimeout(Duration.ofHours(1));
+        assertEquals("withStartupTimeout directly sets the timeout", 20L, child1.startupTimeout.toMillis());
 
-        final WaitStrategy underTest = new WaitAllStrategy()
+        new WaitAllStrategy()
             .withStrategy(child1)
-            .withStartupTimeout(Duration.ofMillis(10));
+            .withStartupTimeout(Duration.ofMillis(30));
 
-        assertThrows("The outer strategy timeout applies", TimeoutException.class, () -> {
-            underTest.waitUntilReady(container);
-        });
+        assertEquals("WaitAllStrategy overrides a child's timeout", 30L, child1.startupTimeout.toMillis());
     }
 
     @Test
-    public void appliesOuterTimeoutTooLittleTime() {
+    public void parentTimeoutAppliesToMultipleChildren() {
 
         Duration defaultInnerWait = Duration.ofMillis(2);
         Duration outerWait = Duration.ofMillis(6);
 
-        WaitStrategy child1 = new SleepingStrategy(defaultInnerWait);
-        WaitStrategy child2 = new SleepingStrategy(defaultInnerWait);
+        DummyStrategy child1 = new DummyStrategy(defaultInnerWait);
+        DummyStrategy child2 = new DummyStrategy(defaultInnerWait);
 
-        final WaitStrategy underTest = new WaitAllStrategy()
+        new WaitAllStrategy()
             .withStrategy(child1)
             .withStrategy(child2)
             .withStartupTimeout(outerWait);
 
-        assertThrows("The outer strategy timeout applies", TimeoutException.class, () -> {
-            underTest.waitUntilReady(container);
-        });
+        assertEquals("WaitAllStrategy overrides a child's timeout (1st)", 6L, child1.startupTimeout.toMillis());
+        assertEquals("WaitAllStrategy overrides a child's timeout (2nd)", 6L, child2.startupTimeout.toMillis());
     }
 
     @Test
-    public void appliesOuterTimeoutEnoughTime() {
+    public void parentTimeoutAppliesToAdditionalChildren() {
 
         Duration defaultInnerWait = Duration.ofMillis(2);
         Duration outerWait = Duration.ofMillis(20);
 
-        WaitStrategy child1 = new SleepingStrategy(defaultInnerWait);
-        WaitStrategy child2 = new SleepingStrategy(defaultInnerWait);
+        DummyStrategy child1 = new DummyStrategy(defaultInnerWait);
+        DummyStrategy child2 = new DummyStrategy(defaultInnerWait);
 
-        final WaitStrategy underTest = new WaitAllStrategy()
+        new WaitAllStrategy()
             .withStrategy(child1)
-            .withStrategy(child2)
-            .withStartupTimeout(outerWait);
+            .withStartupTimeout(outerWait)
+            .withStrategy(child2);
 
-        try {
-            underTest.waitUntilReady(container);
-        } catch (Exception e) {
-            if (e.getCause() instanceof CaughtTimeoutException)
-                fail("The timeout wasn't applied to inner strategies.");
-            else {
-                fail(e.getMessage());
-            }
-        }
+        assertEquals("WaitAllStrategy overrides a child's timeout (1st)", 20L, child1.startupTimeout.toMillis());
+        assertEquals("WaitAllStrategy overrides a child's timeout (2nd, additional)", 20L, child2.startupTimeout.toMillis());
+    }
+
+    /*
+     * Mock-based tests to check overall behaviour, without involving timing-sensitive code
+     */
+    @Test
+    public void childExecutionTest() {
+
+        final WaitStrategy underTest = new WaitAllStrategy()
+            .withStrategy(strategy1)
+            .withStrategy(strategy2);
+
+        doNothing().when(strategy1).waitUntilReady(eq(container));
+        doNothing().when(strategy2).waitUntilReady(eq(container));
+
+        underTest.waitUntilReady(container);
+
+        InOrder inOrder = inOrder(strategy1, strategy2);
+        inOrder.verify(strategy1).waitUntilReady(any());
+        inOrder.verify(strategy2).waitUntilReady(any());
     }
 
     @Test
@@ -145,7 +139,7 @@ public void timeoutChangeShouldNotBePossibleWithIndividualTimeoutMode() {
     @Test
     public void shouldNotMessWithIndividualTimeouts() {
 
-        final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
+        new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
             .withStrategy(strategy1)
             .withStrategy(strategy2);
 
@@ -157,7 +151,7 @@ public void shouldNotMessWithIndividualTimeouts() {
     public void shouldOverwriteIndividualTimeouts() {
 
         Duration someSeconds = Duration.ofSeconds(23);
-        final WaitStrategy underTest = new WaitAllStrategy()
+        new WaitAllStrategy()
             .withStartupTimeout(someSeconds)
             .withStrategy(strategy1)
             .withStrategy(strategy2);
@@ -166,59 +160,14 @@ public void shouldOverwriteIndividualTimeouts() {
         verify(strategy1).withStartupTimeout(someSeconds);
     }
 
-    @Test
-    public void appliesOuterTimeoutOnAdditionalChildren() {
-
-        Duration defaultInnerWait = Duration.ofMillis(2);
-        Duration outerWait = Duration.ofMillis(20);
-
-        WaitStrategy child1 = new SleepingStrategy(defaultInnerWait);
-        WaitStrategy child2 = new SleepingStrategy(defaultInnerWait);
-
-        final WaitStrategy underTest = new WaitAllStrategy()
-            .withStrategy(child1)
-            .withStartupTimeout(outerWait)
-            .withStrategy(child2);
-
-        try {
-            underTest.waitUntilReady(container);
-        } catch (Exception e) {
-            if (e.getCause() instanceof CaughtTimeoutException)
-                fail("The timeout wasn't applied to inner strategies.");
-            else {
-                fail(e.getMessage());
-            }
-        }
-    }
-
-    static class CaughtTimeoutException extends RuntimeException {
-
-        CaughtTimeoutException(String message) {
-            super(message);
-        }
-    }
-
-    static class SleepingStrategy extends AbstractWaitStrategy {
-
-        private final long sleepingDuration;
-
-        SleepingStrategy(Duration defaultInnerWait) {
+    static class DummyStrategy extends AbstractWaitStrategy {
+        DummyStrategy(Duration defaultInnerWait) {
             super.startupTimeout = defaultInnerWait;
-            // Always oversleep by default
-            this.sleepingDuration = defaultInnerWait.multipliedBy(2).toMillis();
         }
 
         @Override
         protected void waitUntilReady() {
-            try {
-                // Don't use ducttape, make sure we don't catch the wrong TimeoutException later on.
-                CompletableFuture.runAsync(
-                    () -> Uninterruptibles.sleepUninterruptibly(this.sleepingDuration, TimeUnit.MILLISECONDS)
-                ).get((int) startupTimeout.toMillis(), TimeUnit.MILLISECONDS);
-            } catch (InterruptedException | ExecutionException e) {
-            } catch (java.util.concurrent.TimeoutException e) {
-                throw new CaughtTimeoutException("Inner wait timed out, outer strategy didn't apply.");
-            }
+            // no-op
         }
     }
 }

From 978d374ceb38e6fa1ea677db27b4ac0e976463ce Mon Sep 17 00:00:00 2001
From: Gerasimov Gennady <gennady.g.gerasimov@gmail.com>
Date: Mon, 15 Apr 2019 13:17:06 +0300
Subject: [PATCH 0054/4969] #1389 Override close method without throws
 statement (#1392)

---
 core/src/main/java/org/testcontainers/containers/Network.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
index b71a74a455c..411459b62eb 100644
--- a/core/src/main/java/org/testcontainers/containers/Network.java
+++ b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -28,6 +28,9 @@ public void close() {
 
     String getId();
 
+    @Override
+    void close();
+
     static Network newNetwork() {
         return builder().build();
     }

From ed0db162c445169431373989ff3bd0cf62f9f02f Mon Sep 17 00:00:00 2001
From: Jeremy Comte <jeremy.comte@gmail.com>
Date: Mon, 15 Apr 2019 13:29:29 +0200
Subject: [PATCH 0055/4969] Make StartupCheckStrategy timeout value
 configurable (#1308)

in case of big docker images (Elasticsearch 6.6.0 is 808MB for example) the hardcoded 30s timeout makes a lot of our builds fail the first time they run.
We fixed this locally, but it would be nice to have it as a parameter on the parent class.
---
 .../containers/startupcheck/StartupCheckStrategy.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java b/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
index f592411b4fb..1425123473b 100644
--- a/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
@@ -6,6 +6,7 @@
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import static org.testcontainers.containers.GenericContainer.CONTAINER_RUNNING_TIMEOUT_SEC;
@@ -21,9 +22,17 @@ public abstract class StartupCheckStrategy {
             .withConstantThroughput()
             .build();
 
+    private Duration timeout = Duration.ofSeconds(CONTAINER_RUNNING_TIMEOUT_SEC);
+
+    @SuppressWarnings("unchecked")
+    public <SELF extends StartupCheckStrategy> SELF withTimeout(Duration timeout) {
+        this.timeout = timeout;
+        return (SELF) this;
+    }
+
     public boolean waitUntilStartupSuccessful(DockerClient dockerClient, String containerId) {
         final Boolean[] startedOK = {null};
-        Unreliables.retryUntilTrue(CONTAINER_RUNNING_TIMEOUT_SEC, TimeUnit.SECONDS, () -> {
+        Unreliables.retryUntilTrue((int) timeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
             //noinspection CodeBlock2Expr
             return DOCKER_CLIENT_RATE_LIMITER.getWhenReady(() -> {
                 StartupStatus state = checkStartupState(dockerClient, containerId);

From 999d4f7d5ea56f05d132178ba9a989dcd9965a8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2019 12:49:34 +0100
Subject: [PATCH 0056/4969] Bump tomcat-jdbc from 9.0.17 to 9.0.19 in
 /modules/mysql (#1401)

Bumps tomcat-jdbc from 9.0.17 to 9.0.19.

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.apache.tomcat:tomcat-jdbc&package-manager=gradle&previous-version=9.0.17&new-version=9.0.19)](https://dependabot.com/compatibility-score.html?dependency-name=org.apache.tomcat:tomcat-jdbc&package-manager=gradle&previous-version=9.0.17&new-version=9.0.19)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
If all status checks pass Dependabot will automatically merge this pull request.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
---
 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 0703b29ad3a..00217f4ff41 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.14'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.17'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.19'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From cc09697878dd11e21148972a54c8c287a99d2045 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2019 12:49:58 +0100
Subject: [PATCH 0057/4969] Bump tomcat-jdbc from 9.0.17 to 9.0.19 in
 /modules/mariadb (#1403)

Bumps tomcat-jdbc from 9.0.17 to 9.0.19.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 1f679b7a592..84c5ce667d4 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.1'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.17'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.19'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 40724a0abbaa04b60e0231c7fa2616564f058430 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 15 Apr 2019 21:00:07 +0100
Subject: [PATCH 0058/4969] Fix #1391 by using a tagged version of `sshd`
 (#1407)

Workaround for #1406
---
 .../org/testcontainers/utility/TestcontainersConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 2d478b4cc0a..f87b02a17d3 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -55,7 +55,7 @@ public String getRyukImage() {
     }
 
     public String getSSHdImage() {
-        return (String) properties.getOrDefault("sshd.container.image", "quay.io/testcontainers/sshd@sha256:18aa929c653284189fc9cefa45b731021857b6047a0a1757e909f958f258f088");
+        return (String) properties.getOrDefault("sshd.container.image", "quay.io/testcontainers/sshd:1.0.0");
     }
 
     public Integer getRyukTimeout() {

From 57a154b46ac3a2804341272ed06e89aebfce8f2e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 16 Apr 2019 07:01:45 +0100
Subject: [PATCH 0059/4969] Update latest version in docs

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index fc37c0be80a..3bdf1466e47 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -77,4 +77,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.11.1
+    latest_version: 1.11.2

From 2c3b36ad43f20a1e43015ac270b5318f2d45ca41 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 16 Apr 2019 07:34:17 +0100
Subject: [PATCH 0060/4969] Configure boomper probot (#1409)

Configure [boomper](https://github.com/toolmantim/boomper) probot to keep latest version number in docs in sync with releases
---
 .github/boomper.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/boomper.yml

diff --git a/.github/boomper.yml b/.github/boomper.yml
new file mode 100644
index 00000000000..bb9bca7d29a
--- /dev/null
+++ b/.github/boomper.yml
@@ -0,0 +1,3 @@
+updates:
+- path: mkdocs.yml
+  pattern: 'latest_version: (.*)'

From d9362fcbfdbf302fb41454132b65d54fc288c36a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2019 09:28:40 +0200
Subject: [PATCH 0061/4969] Bump mysql-connector-java from 8.0.15 to 8.0.16 in
 /modules/spock (#1429)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.15 to 8.0.16.
- [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.15...8.0.16)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 d9c482b0c7b..6076788dbc4 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
-    testRuntime 'mysql:mysql-connector-java:8.0.15'
+    testRuntime 'mysql:mysql-connector-java:8.0.16'
 }

From f604a2f9c97b3fb28dda109c7a9493150faceba2 Mon Sep 17 00:00:00 2001
From: Gerasimov Gennady <gennady.g.gerasimov@gmail.com>
Date: Sat, 27 Apr 2019 23:09:58 +0300
Subject: [PATCH 0062/4969] Support SELF typing for OracleContainer (#1425)

* PR #1292 Added waitUntilContainerStarted and adjusted OracleContainer class declaration

* PR #1292 Do not override waitUntilContainerStarted method. Changed class declaration according.
---
 .../java/org/testcontainers/containers/OracleContainer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index d7410373fd9..ea0eee1a2ff 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -7,7 +7,7 @@
 /**
  * @author gusohal
  */
-public class OracleContainer extends JdbcDatabaseContainer {
+public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     public static final String NAME = "oracle";
 
@@ -81,13 +81,13 @@ public String getPassword() {
     @Override
     public OracleContainer withUsername(String username) {
         this.username = username;
-        return this;
+        return self();
     }
 
     @Override
     public OracleContainer withPassword(String password) {
         this.password = password;
-        return this;
+        return self();
     }
 
     @SuppressWarnings("SameReturnValue")

From c02ec79e9ad077bd03ec85f108e625531ac2ef40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 21:37:34 +0100
Subject: [PATCH 0063/4969] Bump mysql-connector-java from 8.0.15 to 8.0.16 in
 /modules/junit-jupiter (#1428)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.15 to 8.0.16.
- [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.15...8.0.16)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 36b0f217cb4..5d3ff61d46d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
-    testRuntime 'mysql:mysql-connector-java:8.0.15'
+    testRuntime 'mysql:mysql-connector-java:8.0.16'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
 }
 

From 3d2a7ed936cf467fc07189753746fd0ea7bcf31e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 21:37:56 +0100
Subject: [PATCH 0064/4969] Bump mysql-connector-java from 8.0.14 to 8.0.16 in
 /modules/mysql (#1427)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.14 to 8.0.16.
- [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.14...8.0.16)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 00217f4ff41..4bc4640b0fc 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MySQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'mysql:mysql-connector-java:8.0.14'
+    testCompile 'mysql:mysql-connector-java:8.0.16'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.19'
     testCompile 'commons-dbutils:commons-dbutils:1.7'

From a727b0bfb98472418bc251d76ddc532095427c1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 21:38:37 +0100
Subject: [PATCH 0065/4969] Bump neo4j from 3.5.4 to 3.5.5 in /modules/neo4j
 (#1426)

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.4 to 3.5.5.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 9b0f3a48c3b..2a6f5ea1e1e 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -25,7 +25,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.4"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.5"
 
     compile project(":testcontainers")
 

From e83136f53ea0835e462ed60b21a10e9aec0c5b89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 21:38:51 +0100
Subject: [PATCH 0066/4969] Bump mockito-core from 2.26.0 to 2.27.0 in /core
 (#1382)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.26.0 to 2.27.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.26.0...v2.27.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1f08c0159b2..d9dee98ee6b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.7.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.2'
-    testCompile ('org.mockito:mockito-core:2.26.0') {
+    testCompile ('org.mockito:mockito-core:2.27.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 7d299acd0087ba8f756d56c44e53aad1e3db3722 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 21:39:15 +0100
Subject: [PATCH 0067/4969] Bump pulsar-client from 2.3.0 to 2.3.1 in
 /modules/pulsar (#1402)

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index a67c83cc923..c3505dedf65 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.1'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
 }

From ff9f0c443e8cb5c6bd37319cc5e5142549eb2355 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 21:39:59 +0100
Subject: [PATCH 0068/4969] Bump junit-jupiter-api from 5.4.1 to 5.4.2 in
 /modules/junit-jupiter (#1365)

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.4.1 to 5.4.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.1...r5.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 5d3ff61d46d..591347ca699 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.4.1'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.4.2'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From ea2c25c4c407582f4a0553a3f46bbcfb36cbc929 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 May 2019 10:50:51 +0200
Subject: [PATCH 0069/4969] Bump org.springframework.boot in /examples (#1443)

Bumps org.springframework.boot from 2.1.2.RELEASE to 2.1.4.RELEASE.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 884657194cb..c978a96082d 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.1.2.RELEASE'
+    id 'org.springframework.boot' version '2.1.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 5a5ad6d893a..926d1cd8eb6 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.1.2.RELEASE'
+    id 'org.springframework.boot' version '2.1.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 51333a64b596260845c230e15ef038a367833cd2 Mon Sep 17 00:00:00 2001
From: mschnitzler <schnitzler.michael+github@gmail.com>
Date: Tue, 7 May 2019 14:24:09 +0200
Subject: [PATCH 0070/4969] Add documentation for Bitbucket Pipelines (#1439)

---
 .../bitbucket_pipelines.md                    | 26 +++++++++++++++++++
 mkdocs.yml                                    |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 docs/supported_docker_environment/continuous_integration/bitbucket_pipelines.md

diff --git a/docs/supported_docker_environment/continuous_integration/bitbucket_pipelines.md b/docs/supported_docker_environment/continuous_integration/bitbucket_pipelines.md
new file mode 100644
index 00000000000..0fd76448ffc
--- /dev/null
+++ b/docs/supported_docker_environment/continuous_integration/bitbucket_pipelines.md
@@ -0,0 +1,26 @@
+# Bitbucket Pipelines
+
+To enable access to Docker in Bitbucket Pipelines, you need to add `docker` as a service on the step.
+
+Furthermore, Ryuk needs to be turned off since Bitbucket Pipelines does not allow starting privileged containers (see [Disabling Ryuk](../../features/configuration.md#disabling-ryuk)). This can either be done by setting a repository variable in Bitbucket's project settings or by explicitly exporting the variable on a step.
+
+In some cases the memory available to Docker needs to be increased.
+
+Here is a sample Bitbucket Pipeline configuration that does a checkout of a project and runs maven:
+
+```yml
+image: maven:3.6.1
+
+pipelines:
+  default:
+    - step:
+        script:
+          - export TESTCONTAINERS_RYUK_DISABLED=true
+          - mvn clean install
+        services:
+          - docker
+definitions:
+  services:
+    docker:
+      memory: 2048
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 3bdf1466e47..2238c7573a8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -70,6 +70,7 @@ nav:
                 - supported_docker_environment/continuous_integration/dind_patterns.md
                 - supported_docker_environment/continuous_integration/circle_ci.md
                 - supported_docker_environment/continuous_integration/gitlab_ci.md
+                - supported_docker_environment/continuous_integration/bitbucket_pipelines.md
           - supported_docker_environment/windows.md
           - supported_docker_environment/logging_config.md
     - Getting help: getting_help.md

From 55f10a704802b1fe8288d911d85ef272d44580e9 Mon Sep 17 00:00:00 2001
From: Enno <458526+ennru@users.noreply.github.com>
Date: Tue, 14 May 2019 12:04:09 +0200
Subject: [PATCH 0071/4969] Add Lightbend to the Who is using list (#1464)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index dc038d374be..cbee344e637 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -70,6 +70,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [eBay Marketing](https://www.ebay.com) - Testing for MySQL, Cassandra, Redis, Couchbase, Kafka, etc.
 * [Skyscanner](https://www.skyscanner.net/) - Integration testing against HTTP service mocks and various data stores
 * [Neo4j-OGM](https://neo4j.com/developer/neo4j-ogm/) - Testing new, reactive client implementations
+* [Lightbend](https://www.lightbend.com/) - Testing [Alpakka Kafka](https://doc.akka.io/docs/alpakka-kafka/current/) and support in [Alpakka Kafka Testkit](https://doc.akka.io/docs/alpakka-kafka/current/testing.html#testing-with-kafka-in-docker)
 
 ## License
 

From 4947ec4a9b12daf3709cb9dc4d1447fe3be3caa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 09:34:10 +0100
Subject: [PATCH 0072/4969] Bump cucumber-java from 4.3.0 to 4.3.1 in /examples
 (#1463)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v4.3.0...v4.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.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 e9b052050d5..97d56deeb05 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.3.0'
+    implementation 'io.cucumber:cucumber-java:4.3.1'
     testImplementation 'io.cucumber:cucumber-junit:4.3.0'
     testImplementation 'org.testcontainers:selenium'
 }

From e930b59a2ac28caa6a82890781a2487eea6e9beb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 09:34:26 +0100
Subject: [PATCH 0073/4969] Bump lombok from 1.18.6 to 1.18.8 in /examples
 (#1462)

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.6 to 1.18.8.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.6...v1.18.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 examples/disque-job-queue/build.gradle | 2 +-
 examples/spring-boot/build.gradle      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 77b6022a968..78a38d2ba08 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.6'
+    compileOnly 'org.projectlombok:lombok:1.18.8'
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 926d1cd8eb6..ee2b0d032d6 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.6'
+    compileOnly 'org.projectlombok:lombok:1.18.8'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-web'

From b7bbbfdf504f74e0c43b296ec4beb9e45e79ac97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 09:34:56 +0100
Subject: [PATCH 0074/4969] Bump rest-assured from 3.3.0 to 4.0.0 in
 /modules/vault (#1460)

Bumps [rest-assured](https://github.com/jayway/rest-assured) from 3.3.0 to 4.0.0.
- [Release notes](https://github.com/jayway/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/jayway/rest-assured/compare/rest-assured-3.3.0...rest-assured-4.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index d5c791acd32..3dd346ab559 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Vault"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'io.rest-assured:rest-assured:3.3.0'
+    testCompile 'io.rest-assured:rest-assured:4.0.0'
 }

From 5acb599797d809d72836499140fe79214958cf99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 10:35:27 +0100
Subject: [PATCH 0075/4969] Bump neo4j-java-driver from 1.7.3 to 1.7.4 in
 /modules/neo4j (#1451)

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 1.7.3 to 1.7.4.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/1.7.3...1.7.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 2a6f5ea1e1e..c467cc7381f 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,6 +29,6 @@ dependencies {
 
     compile project(":testcontainers")
 
-    testCompile "org.neo4j.driver:neo4j-java-driver:1.7.3"
+    testCompile "org.neo4j.driver:neo4j-java-driver:1.7.4"
     testCompile 'org.assertj:assertj-core:3.12.2'
 }

From 2f1bce93926cc7827a3bb811167cfc4a7eade699 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 10:35:49 +0100
Subject: [PATCH 0076/4969] Bump tomcat-jdbc from 9.0.19 to 9.0.20 in
 /modules/mysql (#1468)

Bumps tomcat-jdbc from 9.0.19 to 9.0.20.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 4bc4640b0fc..e48c71734ae 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.16'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.19'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.20'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 88014b3d46fd65c13ca366635f62fb6fb679cb0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 21:21:36 +0100
Subject: [PATCH 0077/4969] Bump cucumber-junit from 4.3.0 to 4.3.1 in
 /examples (#1461)

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v4.3.0...v4.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.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 97d56deeb05..bab77700eff 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.3.1'
-    testImplementation 'io.cucumber:cucumber-junit:4.3.0'
+    testImplementation 'io.cucumber:cucumber-junit:4.3.1'
     testImplementation 'org.testcontainers:selenium'
 }

From 0a66f3cde6aaea232f9ece858caca2e89f5581fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 May 2019 09:05:39 +0200
Subject: [PATCH 0078/4969] Bump org.springframework.boot in /examples (#1471)

Bumps org.springframework.boot from 2.1.4.RELEASE to 2.1.5.RELEASE.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 c978a96082d..0aa55093dca 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.1.4.RELEASE'
+    id 'org.springframework.boot' version '2.1.5.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index ee2b0d032d6..f45b0e51c11 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.1.4.RELEASE'
+    id 'org.springframework.boot' version '2.1.5.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 03f8caa3a9dabc6dedd7caa4541a235b1f73a0a3 Mon Sep 17 00:00:00 2001
From: Stefan Ludwig <github@slu-it.de>
Date: Thu, 16 May 2019 10:01:59 +0200
Subject: [PATCH 0079/4969] Add example for MongoDB containers (#1288)

---
 examples/mongodb-container/build.gradle       | 12 +++++
 .../containers/MongoDbContainer.java          | 53 +++++++++++++++++++
 .../containers/MongoDbContainerTest.java      | 27 ++++++++++
 examples/settings.gradle                      |  1 +
 4 files changed, 93 insertions(+)
 create mode 100644 examples/mongodb-container/build.gradle
 create mode 100644 examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
 create mode 100644 examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
new file mode 100644
index 00000000000..11c5f2bbe24
--- /dev/null
+++ b/examples/mongodb-container/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'junit:junit:4.12'
+}
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
new file mode 100644
index 00000000000..00fd9c05b52
--- /dev/null
+++ b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
@@ -0,0 +1,53 @@
+package org.testcontainers.containers;
+
+import org.jetbrains.annotations.NotNull;
+
+
+/**
+ * This {@link Container} is based on the official MongoDb ({@code mongo}) image from
+ * <a href="https://hub.docker.com/r/_/mongo/">DockerHub</a>. If you need to use a custom MongoDB
+ * image, you can provide the full image name as well.
+ *
+ * @author Stefan Ludwig
+ */
+public class MongoDbContainer extends GenericContainer<MongoDbContainer> {
+
+    /**
+     * This is the internal port on which MongoDB is running inside the container.
+     * <p>
+     * You can use this constant in case you want to map an explicit public port to it
+     * instead of the default random port. This can be done using methods like
+     * {@link #setPortBindings(java.util.List)}.
+     */
+    public static final int MONGODB_PORT = 27017;
+    public static final String DEFAULT_IMAGE_AND_TAG = "mongo:4.0";
+
+    /**
+     * Creates a new {@link MongoDbContainer} with the {@value DEFAULT_IMAGE_AND_TAG} image.
+     */
+    public MongoDbContainer() {
+        this(DEFAULT_IMAGE_AND_TAG);
+    }
+
+    /**
+     * Creates a new {@link MongoDbContainer} with the given {@code 'image'}.
+     *
+     * @param image the image (e.g. {@value DEFAULT_IMAGE_AND_TAG}) to use
+     */
+    public MongoDbContainer(@NotNull String image) {
+        super(image);
+        addExposedPort(MONGODB_PORT);
+    }
+
+    /**
+     * Returns the actual public port of the internal MongoDB port ({@value MONGODB_PORT}).
+     *
+     * @return the public port of this container
+     * @see #getMappedPort(int)
+     */
+    @NotNull
+    public Integer getPort() {
+        return getMappedPort(MONGODB_PORT);
+    }
+
+}
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
new file mode 100644
index 00000000000..96096d51c1a
--- /dev/null
+++ b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
@@ -0,0 +1,27 @@
+package org.testcontainers.containers;
+
+import java.io.IOException;
+import java.net.Socket;
+
+import org.junit.Test;
+
+
+public class MongoDbContainerTest {
+
+    @Test
+    public void containerStartsAndPublicPortIsAvailable() {
+        try (MongoDbContainer container = new MongoDbContainer()) {
+            container.start();
+            assertThatPortIsAvailable(container);
+        }
+    }
+
+    private void assertThatPortIsAvailable(MongoDbContainer container) {
+        try {
+            new Socket(container.getContainerIpAddress(), container.getPort());
+        } catch (IOException e) {
+            throw new AssertionError("The expected port " + container.getPort() + " is not available!");
+        }
+    }
+
+}
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 671646b76d6..06252afa580 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -5,6 +5,7 @@ includeBuild '..'
 // explicit include to allow Dependabot to autodiscover subprojects
 include 'disque-job-queue'
 include 'linked-container'
+include 'mongodb-container'
 include 'redis-backed-cache'
 include 'redis-backed-cache-testng'
 include 'selenium-container'

From e4ce8f578d09a29c3dbddc9be47a92ee6f06d9cd Mon Sep 17 00:00:00 2001
From: Patrick Pfeiler <pfeiler.patrick@live.de>
Date: Sat, 18 May 2019 23:07:47 +0200
Subject: [PATCH 0080/4969] Fix ScriptUtils splitting with Windows EOF (#1467,
 #1465)

---
 .../org/testcontainers/ext/ScriptUtils.java     |  2 +-
 .../org/testcontainers/ext/ScriptUtilsTest.java | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index f27b3610f15..eb041708fb6 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -206,7 +206,7 @@ else if (script.startsWith(blockCommentStartDelimiter, i)) {
 							blockCommentEndDelimiter), resource);
 					}
 				}
-				else if (c == ' ' || c == '\n' || c == '\t') {
+				else if (c == ' ' || c == '\n' || c == '\t' || c == '\r') {
 					// avoid multiple adjacent whitespace characters
 					if (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' ') {
 						c = ' ';
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java
index 7a50026cd93..c9b1218321b 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java
@@ -28,4 +28,21 @@ public void testSplit() throws IOException {
         assertEquals("SELECT * from `bar`", statements.get(4));
         assertEquals("INSERT INTO bar (foo) VALUES ('hello world')", statements.get(6));
     }
+
+    /*
+     * Test ScriptUtils script splitting with some ugly/hard-to-split cases and linux line endings
+     */
+    @Test
+    public void testSplitWithWidnwosLineEnding() throws IOException {
+        final String script = Resources.toString(Resources.getResource("splittable.sql"), Charsets.UTF_8);
+        final String scriptWithWindowsLineEndings = script.replaceAll("\n", "\r\n");
+        final List<String> statements = new ArrayList<>();
+        ScriptUtils.splitSqlScript("resourcename", scriptWithWindowsLineEndings, ";", "--", "/*", "*/", statements);
+
+        assertEquals(7, statements.size());
+        assertEquals("SELECT \"a /* string literal containing comment characters like -- here\"", statements.get(2));
+        assertEquals("SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\"", statements.get(3));
+        assertEquals("SELECT * from `bar`", statements.get(4));
+        assertEquals("INSERT INTO bar (foo) VALUES ('hello world')", statements.get(6));
+    }
 }

From 2dffb2648e2d9fbfcb7892e60cf6dbe8f1151d46 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Tue, 21 May 2019 17:00:23 +0900
Subject: [PATCH 0081/4969] Fix NB in the "Database containers" docs (#1484)

---
 docs/modules/databases/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index aaef47a44ef..c7253cdddd7 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -43,6 +43,7 @@ Examples/Tests:
 As long as you have Testcontainers and the appropriate JDBC driver on your classpath, you can simply modify regular JDBC connection URLs to get a fresh containerized instance of the database each time your application starts up.
 
 _N.B:_
+
 * _TC needs to be on your application's classpath at runtime for this to work_
 * _For Spring Boot you need to specify the driver manually `spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver`_
 

From 24e6f1154f371ebe1623e9621726ce2d019b23d5 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 21 May 2019 17:53:44 +0200
Subject: [PATCH 0082/4969] Redirect Docker-Compose stderr to INFO logger
 (#1485)

Docker-Compose logs pull information to stderr, but we don't want those
logs in our ERROR logger.
---
 .../org/testcontainers/containers/DockerComposeContainer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 0b6db19ca28..67674796cdd 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -638,7 +638,7 @@ public void invoke() {
         try {
             new ProcessExecutor().command(command)
                     .redirectOutput(Slf4jStream.of(logger()).asInfo())
-                    .redirectError(Slf4jStream.of(logger()).asError())
+                    .redirectError(Slf4jStream.of(logger()).asInfo()) // docker-compose will log pull information to stderr
                     .environment(environment)
                     .directory(pwd)
                     .exitValueNormal()

From b75f52c2412b39cc166358622d1fe4c330c26812 Mon Sep 17 00:00:00 2001
From: Anand <anand.javapro@gmail.com>
Date: Tue, 21 May 2019 21:10:09 +0100
Subject: [PATCH 0083/4969] Adding field name to
 ExtensionConfigurationException message (#1488)

---
 CONTRIBUTING.md                                           | 8 ++++++--
 .../junit/jupiter/TestcontainersExtension.java            | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cd3822df3a2..2914c874e1a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,5 +8,9 @@
 	* discuss with the authors on an issue ticket prior to doing anything big
 	* follow the style, naming and structure conventions of the rest of the project
 	* make commits atomic and easy to merge
-	* verify all tests are passing. Build the project with `./gradlew check` to do this.
-	**N.B.** Gradle's Build Cache is enabled by default, but you can add `--no-build-cache` flag to disable it.
\ No newline at end of file
+	* verify all tests are passing. Build the project with `./gradlew check` to do this
+	
+	**PS:** Make sure Docker is running locally and you have the lombok plugin installed in your IDE
+	
+	**N.B.** Gradle's Build Cache is enabled by default, but you can add `--no-build-cache` flag to disable it.
+	
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 7c5f8b205ef..7f6183cc74d 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -95,7 +95,7 @@ private static Predicate<Field> isContainer() {
                 boolean isStartable = Startable.class.isAssignableFrom(field.getType());
 
                 if (!isStartable) {
-                    throw new ExtensionConfigurationException("Annotation is only supported for Startable types");
+                    throw new ExtensionConfigurationException(String.format("FieldName: %s does not implement Startable", field.getName()));
                 }
                 return true;
             }

From 581b80b184e2d0a0f65e4f12f8493565adb2f60a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 27 May 2019 20:55:43 +0100
Subject: [PATCH 0084/4969] Support MySQL 8 (#1470)

Amend default MySQL connection parameters for MySQL 5 - 8 compatibility
Fixes #736
---
 modules/jdbc-test/build.gradle                |  2 +-
 .../testcontainers/jdbc/JDBCDriverTest.java   |  4 +-
 .../junit/AbstractContainerDatabaseTest.java  | 32 +++++++++++
 .../junit/MultiVersionMySQLTest.java          | 37 ++++++++++++
 .../junit/SimpleClickhouseTest.java           | 15 +----
 .../junit/SimpleMSSQLServerTest.java          | 23 ++------
 .../junit/SimpleMariaDBTest.java              | 25 +-------
 .../testcontainers/junit/SimpleMySQLTest.java | 57 +++----------------
 .../junit/SimpleOracleTest.java               | 16 +-----
 .../junit/SimplePostgreSQLTest.java           | 20 +------
 .../containers/MySQLContainer.java            | 10 +++-
 11 files changed, 99 insertions(+), 142 deletions(-)
 create mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
 create mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/MultiVersionMySQLTest.java

diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index e631d2fa1a3..4c7ab8b0974 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testCompile 'com.google.guava:guava:18.0'
     testCompile 'org.postgresql:postgresql:42.0.0'
-    testCompile 'mysql:mysql-connector-java:5.1.45'
+    testCompile 'mysql:mysql-connector-java:8.0.14'
     testCompile 'org.mariadb.jdbc:mariadb-java-client:1.4.6'
     testCompile 'com.oracle:ojdbc6:12.1.0.1-atlassian-hosted'
     testCompile 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8'
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index 4eb55b38e24..40cb707a2d0 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -198,8 +198,8 @@ private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException
         HikariDataSource dataSource = getDataSource(jdbcUrl, 1);
         boolean result = new QueryRunner(dataSource).query("SHOW VARIABLES LIKE 'character\\_set\\_connection'", rs -> {
             rs.next();
-            String resultSetInt = rs.getString(2);
-            assertEquals("Passing query parameters to set DB connection encoding is successful", "utf8", resultSetInt);
+            String resultSetString = rs.getString(2);
+            assertTrue("Passing query parameters to set DB connection encoding is successful", resultSetString.startsWith("utf8"));
             return true;
         });
 
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
new file mode 100644
index 00000000000..a01146fe7a3
--- /dev/null
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
@@ -0,0 +1,32 @@
+package org.testcontainers.junit;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+abstract class AbstractContainerDatabaseTest {
+
+    ResultSet performQuery(JdbcDatabaseContainer container, String sql) throws SQLException {
+        DataSource ds = getDataSource(container);
+        Statement statement = ds.getConnection().createStatement();
+        statement.execute(sql);
+        ResultSet resultSet = statement.getResultSet();
+
+        resultSet.next();
+        return resultSet;
+    }
+
+    DataSource getDataSource(JdbcDatabaseContainer container) {
+        HikariConfig hikariConfig = new HikariConfig();
+        hikariConfig.setJdbcUrl(container.getJdbcUrl());
+        hikariConfig.setUsername(container.getUsername());
+        hikariConfig.setPassword(container.getPassword());
+
+        return new HikariDataSource(hikariConfig);
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/MultiVersionMySQLTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/MultiVersionMySQLTest.java
new file mode 100644
index 00000000000..b685d6dad80
--- /dev/null
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/MultiVersionMySQLTest.java
@@ -0,0 +1,37 @@
+package org.testcontainers.junit;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.containers.MySQLContainer;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+@RunWith(Parameterized.class)
+public class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[]{"5.5.62", "5.6.42", "5.7.26", "8.0.16"};
+    }
+
+    private final String version;
+
+    public MultiVersionMySQLTest(String version) {
+        this.version = version;
+    }
+
+    @Test
+    public void versionCheckTest() throws SQLException {
+        try (final MySQLContainer container = new MySQLContainer<>("mysql:" + version)) {
+            container.start();
+            final ResultSet resultSet = performQuery(container, "SELECT VERSION()");
+            final String resultSetString = resultSet.getString(1);
+
+            assertEquals("The database version can be set using a container rule parameter", version, resultSetString);
+        }
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java
index 4e123617b8d..b765208e212 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java
@@ -1,33 +1,22 @@
 package org.testcontainers.junit;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.ClickHouseContainer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
-public class SimpleClickhouseTest {
+public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
 
     @Rule
     public ClickHouseContainer clickhouse = new ClickHouseContainer();
 
     @Test
     public void testSimple() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(clickhouse.getJdbcUrl());
-        hikariConfig.setUsername(clickhouse.getUsername());
-        hikariConfig.setPassword(clickhouse.getPassword());
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute("SELECT 1");
-        ResultSet resultSet = statement.getResultSet();
+        ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
 
         resultSet.next();
         int resultSetInt = resultSet.getInt(1);
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java
index 93904cfb94a..2791efa0780 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java
@@ -1,11 +1,10 @@
 package org.testcontainers.junit;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
 
+import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -15,36 +14,22 @@
 /**
  * @author Stefan Hufschmidt
  */
-public class SimpleMSSQLServerTest {
+public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     @Rule
     public MSSQLServerContainer mssqlServer = new MSSQLServerContainer();
 
     @Test
     public void testSimple() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(mssqlServer.getJdbcUrl());
-        hikariConfig.setUsername(mssqlServer.getUsername());
-        hikariConfig.setPassword(mssqlServer.getPassword());
+        ResultSet resultSet = performQuery(mssqlServer, "SELECT 1");
 
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute("SELECT 1");
-        ResultSet resultSet = statement.getResultSet();
-
-        resultSet.next();
         int resultSetInt = resultSet.getInt(1);
         assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
     }
 
     @Test
     public void testSetupDatabase() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(mssqlServer.getJdbcUrl());
-        hikariConfig.setUsername(mssqlServer.getUsername());
-        hikariConfig.setPassword(mssqlServer.getPassword());
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
+        DataSource ds = getDataSource(mssqlServer);
         Statement statement = ds.getConnection().createStatement();
         statement.executeUpdate("CREATE DATABASE [test];");
         statement = ds.getConnection().createStatement();
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java
index 042582ed890..21badefb9fb 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java
@@ -1,26 +1,21 @@
 package org.testcontainers.junit;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import lombok.NonNull;
-
 import org.apache.commons.lang.SystemUtils;
 import org.junit.Test;
 import org.testcontainers.containers.MariaDBContainer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 
+import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.junit.Assume.assumeFalse;
 
 
 /**
  * @author Miguel Gonzalez Sanchez
  */
-public class SimpleMariaDBTest {
+public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
@@ -85,20 +80,4 @@ public void testMariaDBWithCommandOverride() throws SQLException {
             mariadbCustomConfig.stop();
         }
     }
-
-    @NonNull
-    protected ResultSet performQuery(MariaDBContainer containerRule, String sql) throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(containerRule.getJdbcUrl());
-        hikariConfig.setUsername(containerRule.getUsername());
-        hikariConfig.setPassword(containerRule.getPassword());
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute(sql);
-        ResultSet resultSet = statement.getResultSet();
-
-        resultSet.next();
-        return resultSet;
-    }
 }
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java
index 5c8e4133a22..9570659c4dc 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java
@@ -1,17 +1,5 @@
 package org.testcontainers.junit;
 
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
 import org.apache.commons.lang.SystemUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -20,13 +8,19 @@
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
-import lombok.NonNull;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 
 /**
  * @author richardnorth
  */
-public class SimpleMySQLTest {
+public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(SimpleMySQLTest.class);
 
@@ -114,24 +108,6 @@ public void testCommandOverride() throws SQLException {
 
     }
 
-    @Test
-    public void testMySQL8() throws SQLException {
-        assumeFalse(SystemUtils.IS_OS_WINDOWS);
-        MySQLContainer container = new MySQLContainer<>("mysql:8.0.11")
-            .withCommand("mysqld --default-authentication-plugin=mysql_native_password");
-        container.start();
-
-        try {
-            ResultSet resultSet = performQuery(container, "SELECT VERSION()");
-            String resultSetString = resultSet.getString(1);
-
-            assertTrue("The database version can be set using a container rule parameter", "8.0.11".equals(resultSetString));
-        }
-        finally {
-            container.stop();
-        }
-    }
-
     @Test
     public void testExplicitInitScript() throws SQLException {
         try (MySQLContainer container = (MySQLContainer) new MySQLContainer()
@@ -160,21 +136,4 @@ public void testEmptyPasswordWithNonRootUser() {
             container.stop();
         }
     }
-
-    @NonNull
-    protected ResultSet performQuery(MySQLContainer containerRule, String sql) throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setDriverClassName(containerRule.getDriverClassName());
-        hikariConfig.setJdbcUrl(containerRule.getJdbcUrl());
-        hikariConfig.setUsername(containerRule.getUsername());
-        hikariConfig.setPassword(containerRule.getPassword());
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute(sql);
-        ResultSet resultSet = statement.getResultSet();
-
-        resultSet.next();
-        return resultSet;
-    }
 }
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleOracleTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleOracleTest.java
index 2fedcaf08e1..0855fd4860e 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleOracleTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleOracleTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.junit;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -9,7 +7,6 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
@@ -17,25 +14,18 @@
  * @author gusohal
  */
 @Ignore
-public class SimpleOracleTest {
+public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
     @Rule
     public OracleContainer oracle = new OracleContainer();
 
     @Test
     public void testSimple() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(oracle.getJdbcUrl());
-        hikariConfig.setUsername(oracle.getUsername());
-        hikariConfig.setPassword(oracle.getPassword());
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute("SELECT 1 FROM dual");
-        ResultSet resultSet = statement.getResultSet();
+        ResultSet resultSet = performQuery(oracle, "SELECT 1 FROM dual");
 
         resultSet.next();
         int resultSetInt = resultSet.getInt(1);
+
         assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
     }
 }
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
index 2581240cd84..c6685343c29 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
@@ -1,21 +1,17 @@
 package org.testcontainers.junit;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
 import org.junit.Test;
-import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 /**
  * @author richardnorth
  */
-public class SimplePostgreSQLTest {
+public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
@@ -41,18 +37,4 @@ public void testExplicitInitScript() throws SQLException {
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
     }
-
-    private ResultSet performQuery(JdbcDatabaseContainer container, String sql) throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(container.getJdbcUrl());
-        hikariConfig.setUsername(container.getUsername());
-        hikariConfig.setPassword(container.getPassword());
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute(sql);
-        ResultSet resultSet = statement.getResultSet();
-        resultSet.next();
-        return resultSet;
-    }
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 6d9139fa971..172ead4856a 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -70,10 +70,14 @@ protected String constructUrlForConnection(String queryString) {
 
         if (! url.contains("useSSL=")) {
             String separator = url.contains("?") ? "&" : "?";
-            return url + separator + "useSSL=false";
-        } else {
-            return url;
+            url = url + separator + "useSSL=false";
+        }
+
+        if (! url.contains("allowPublicKeyRetrieval=")) {
+            url = url + "&allowPublicKeyRetrieval=true";
         }
+
+        return url;
     }
 
     @Override

From 9fd199d39183798c046ae0f8de2d8340cc5f8584 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Tue, 28 May 2019 06:20:12 +0900
Subject: [PATCH 0085/4969] Fix initscript typo in documentation (#1491)

---
 docs/modules/databases/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index c7253cdddd7..71d65af7e20 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -67,7 +67,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 ## Using a classpath init script
 
-Testcontainers can run an initscript after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
+Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
 
 `jdbc:tc:mysql:5.7.22://hostname/databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
 

From b0b3f9a1205037906838f6643594f27a79c8a734 Mon Sep 17 00:00:00 2001
From: Frederik Hahne <atomfrede@users.noreply.github.com>
Date: Mon, 27 May 2019 23:30:08 +0200
Subject: [PATCH 0086/4969] Fix docker registry auth parsing of GCR json key
 format credentials (#1492)

closes #1466
---
 .../utility/RegistryAuthLocator.java               |  2 +-
 .../utility/RegistryAuthLocatorTest.java           | 14 ++++++++++++--
 .../auth-config/config-with-json-key.json          |  7 +++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 core/src/test/resources/auth-config/config-with-json-key.json

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index 402a15d58b4..a1be23eb82e 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -154,7 +154,7 @@ private AuthConfig findExistingAuthConfig(final JsonNode config, final String re
                 !isBlank(deserializedAuth.getAuth())) {
 
                 final String rawAuth = new String(Base64.getDecoder().decode(deserializedAuth.getAuth()));
-                final String[] splitRawAuth = rawAuth.split(":");
+                final String[] splitRawAuth = rawAuth.split(":", 2);
 
                 if (splitRawAuth.length == 2) {
                     deserializedAuth.withUsername(splitRawAuth[0]);
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index 938505c0212..fe930cf78b7 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -11,8 +11,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNull;
+import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 public class RegistryAuthLocatorTest {
     @Test
@@ -37,6 +36,17 @@ public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException
         assertEquals("Password is set", "pass", authConfig.getPassword());
     }
 
+    @Test
+    public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registry.example.com/org/repo"), new AuthConfig());
+
+        assertEquals("Default docker registry URL is set on auth config", "https://registry.example.com", authConfig.getRegistryAddress());
+        assertEquals("Username is set", "_json_key", authConfig.getUsername());
+        assertNotNull("Password is set", authConfig.getPassword());
+    }
+
     @Test
     public void lookupAuthConfigUsingStore() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json");
diff --git a/core/src/test/resources/auth-config/config-with-json-key.json b/core/src/test/resources/auth-config/config-with-json-key.json
new file mode 100644
index 00000000000..3584963d645
--- /dev/null
+++ b/core/src/test/resources/auth-config/config-with-json-key.json
@@ -0,0 +1,7 @@
+{
+    "auths": {
+        "https://registry.example.com": {
+            "auth": "X2pzb25fa2V5OnsKInR5cGUiOiAic2VydmljZV9hY2NvdW50IiwKInByb2plY3RfaWQiOiAiZXhhbXBsZS1wcm9qZWN0IiwKInByaXZhdGVfa2V5X2lkIjogImV4YW1wbGUta2V5LWlkIiwKInByaXZhdGVfa2V5IjogImV4YW1wbGUtcHJpdmF0ZS1rZXkiLAoiY2xpZW50X2VtYWlsIjogInVzZXJAZXhhbXBsZS5jb20iLAoiY2xpZW50X2lkIjogInVzZXJAZXhhbXBsZS5jb20iLAoiYXV0aF91cmkiOiAiaHR0cHM6Ly9yZWdpc3RyeS5leGFtcGxlLmNvbS9vL29hdXRoMi9hdXRoIiwKInRva2VuX3VyaSI6ICJodHRwczovL3JlZ2lzdHJ5LmV4YW1wbGUuY29tL3Rva2VuIiwKImF1dGhfcHJvdmlkZXJfeDUwOV9jZXJ0X3VybCI6ICJodHRwczovL3JlZ2lzdHJ5LmV4YW1wbGUuY29tIiwKImNsaWVudF94NTA5X2NlcnRfdXJsIjogImh0dHBzOi8vcmVnaXN0cnkuZXhhbXBsZS5jb20iCn0="
+        }
+    }
+}

From d54e119eaf31ec13a3d2bcfbf6d44f7e46c604e8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 May 2019 22:31:18 +0100
Subject: [PATCH 0087/4969] Bump neo4j-java-driver from 1.7.4 to 1.7.5 in
 /modules/neo4j (#1477)

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/1.7.4...1.7.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index c467cc7381f..cc0e246396f 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,6 +29,6 @@ dependencies {
 
     compile project(":testcontainers")
 
-    testCompile "org.neo4j.driver:neo4j-java-driver:1.7.4"
+    testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
     testCompile 'org.assertj:assertj-core:3.12.2'
 }

From 6feb6c9e0fc5c4e5ef2ff94e538ee173b5eca2e0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 May 2019 22:32:02 +0100
Subject: [PATCH 0088/4969] Bump java-client from 2.7.4 to 2.7.6 in
 /modules/couchbase (#1493)

Bumps [java-client](https://github.com/couchbase/couchbase-java-client) from 2.7.4 to 2.7.6.
- [Release notes](https://github.com/couchbase/couchbase-java-client/releases)
- [Commits](https://github.com/couchbase/couchbase-java-client/compare/2.7.4...2.7.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 2bf1055038b..8cf0f879215 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,5 +2,5 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.4'
+    compile 'com.couchbase.client:java-client:2.7.6'
 }

From e5de96aa39bee8e774f46912cd47eb115204c38c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 May 2019 09:03:23 +0100
Subject: [PATCH 0089/4969] Bump neo4j from 3.5.5 to 3.5.6 in /modules/neo4j
 (#1498)

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.5 to 3.5.6.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/compare/3.5.5...3.5.6)
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index cc0e246396f..68a52d115cd 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -25,7 +25,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.5"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.6"
 
     compile project(":testcontainers")
 

From 31f33aa96a7345e1e5eb22fc54f4422a4cfa2475 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 May 2019 09:03:34 +0100
Subject: [PATCH 0090/4969] Bump jna-platform from 5.2.0 to 5.3.1 in /core
 (#1437)

Bumps [jna-platform](https://github.com/java-native-access/jna) from 5.2.0 to 5.3.1.
- [Release notes](https://github.com/java-native-access/jna/releases)
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.2.0...5.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d9dee98ee6b..9786e51a774 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -73,7 +73,7 @@ dependencies {
         exclude(group: "log4j", module: "log4j")
     }
 
-    compile "net.java.dev.jna:jna-platform:5.2.0"
+    compile "net.java.dev.jna:jna-platform:5.3.1"
 
     shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.0') {
         exclude(group: "net.java.dev.jna")

From 1b3a3bd45211ad2b4a5c1b24d89cd1e092d64647 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 May 2019 09:03:59 +0100
Subject: [PATCH 0091/4969] Bump amqp-client from 5.7.0 to 5.7.1 in /core
 (#1501)

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.7.0...v5.7.1)
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9786e51a774..853d3a199b9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -102,7 +102,7 @@ dependencies {
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
     testCompile 'redis.clients:jedis:3.0.1'
-    testCompile 'com.rabbitmq:amqp-client:5.7.0'
+    testCompile 'com.rabbitmq:amqp-client:5.7.1'
     testCompile 'org.mongodb:mongo-java-driver:3.10.2'
     testCompile ('org.mockito:mockito-core:2.27.0') {
         exclude(module: 'hamcrest-core')

From 6f6942ef68236eb57a792a6b387c9efdb2fa7396 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 May 2019 09:04:21 +0100
Subject: [PATCH 0092/4969] Bump tomcat-jdbc from 9.0.19 to 9.0.20 in
 /modules/mariadb (#1469)

Bumps tomcat-jdbc from 9.0.19 to 9.0.20.

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 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 84c5ce667d4..371ec52641d 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.1'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.19'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.20'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 4325c2ad7da78a3057710a2af0950bc80140af57 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Tue, 28 May 2019 17:07:54 +0900
Subject: [PATCH 0093/4969] Fix typo in docs (describe use of stop() method
 rather than close()) (#1479)

---
 docs/test_framework_integration/junit_4.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/test_framework_integration/junit_4.md b/docs/test_framework_integration/junit_4.md
index f2f46636442..8ab753e611f 100644
--- a/docs/test_framework_integration/junit_4.md
+++ b/docs/test_framework_integration/junit_4.md
@@ -18,7 +18,7 @@ public class SimpleMySQLTest {
 
 ## Manually controlling container lifecycle
 
-As an alternative, you can manually start the container in a `@BeforeClass`/`@Before` annotated method in your tests. Tear down will be done automatically on JVM exit, but you can of course also use an `@AfterClass`/`@After` annotated method to manually call the `close()` method on your container.
+As an alternative, you can manually start the container in a `@BeforeClass`/`@Before` annotated method in your tests. Tear down will be done automatically on JVM exit, but you can of course also use an `@AfterClass`/`@After` annotated method to manually call the `stop()` method on your container.
 
 *Example of starting a container in a `@Before` annotated method:*
 

From 83a7accfebae7671294bd0193caba7c5fff4563a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 28 May 2019 13:02:12 +0100
Subject: [PATCH 0094/4969] Remove internet connectivity dependency from test
 (#1502)

* Remove internet connectivity dependency from test

* Add test timeout

* Remove redundant throw
---
 .../org/testcontainers/junit/OutputStreamTest.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
index a14e1e32237..83ba05be86e 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
@@ -24,11 +24,11 @@ public class OutputStreamTest {
 
     @Rule
     public GenericContainer container = new GenericContainer("alpine:3.2")
-            .withCommand("ping -c 5 www.google.com");
+            .withCommand("ping -c 5 127.0.0.1");
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OutputStreamTest.class);
 
-    @Test
+    @Test(timeout = 60_000L)
     public void testFetchStdout() throws TimeoutException {
 
         WaitingConsumer consumer = new WaitingConsumer();
@@ -39,8 +39,8 @@ public void testFetchStdout() throws TimeoutException {
                 30, TimeUnit.SECONDS);
     }
 
-    @Test
-    public void testFetchStdoutWithTimeout() throws TimeoutException {
+    @Test(timeout = 60_000L)
+    public void testFetchStdoutWithTimeout() {
 
         WaitingConsumer consumer = new WaitingConsumer();
 
@@ -53,7 +53,7 @@ public void testFetchStdoutWithTimeout() throws TimeoutException {
         });
     }
 
-    @Test
+    @Test(timeout = 60_000L)
     public void testFetchStdoutWithNoLimit() throws TimeoutException {
 
         WaitingConsumer consumer = new WaitingConsumer();
@@ -63,7 +63,7 @@ public void testFetchStdoutWithNoLimit() throws TimeoutException {
         consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("seq=2"));
     }
 
-    @Test
+    @Test(timeout = 60_000L)
     public void testLogConsumer() throws TimeoutException {
 
         WaitingConsumer waitingConsumer = new WaitingConsumer();
@@ -75,7 +75,7 @@ public void testLogConsumer() throws TimeoutException {
         waitingConsumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("seq=2"));
     }
 
-    @Test
+    @Test(timeout = 60_000L)
     public void testToStringConsumer() throws TimeoutException {
 
         WaitingConsumer waitingConsumer = new WaitingConsumer();

From 3b0a7e652b5913cae2e560c748ba75e2535e9ca3 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Wed, 29 May 2019 04:38:54 +0900
Subject: [PATCH 0095/4969] Replace deprecated RestClient.performRequest()
 (#1494)

---
 docs/modules/elasticsearch.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 3f683e570f9..02eeb61dfbe 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -22,7 +22,7 @@ credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredential
 RestClient restClient = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
         .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
         .build();
-Response response = restClient.performRequest("GET", "/");
+Response response = restClient.performRequest(new Request("GET", "/"));
 
 // ... or the transport client
 TransportAddress transportAddress = new TransportAddress(container.getTcpHost());

From 833f4170fb862ab5b0976926986ec9508bd55798 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 29 May 2019 16:25:45 +0100
Subject: [PATCH 0096/4969] Rename boomper bot configuration file to match
 correct name

---
 .github/{boomper.yml => bumper.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/{boomper.yml => bumper.yml} (100%)

diff --git a/.github/boomper.yml b/.github/bumper.yml
similarity index 100%
rename from .github/boomper.yml
rename to .github/bumper.yml

From 94a14f0bbb8f4b57a19f6ff69aa0298d81a8132c Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 29 May 2019 16:27:16 +0100
Subject: [PATCH 0097/4969] Fix latest version (manual, due to misconfigured
 boomper bot)

---
 mkdocs.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 2238c7573a8..9539df4fad8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
-site_name: Testcontainers
+'site_name: Testcontainers
 plugins:
     - search
     - codeinclude
@@ -78,4 +78,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.11.2
+    latest_version: 1.11.3

From 261982768ceecd9aec26dff9457c8ec7953d791b Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 29 May 2019 17:16:45 +0100
Subject: [PATCH 0098/4969] Fix broken mkdocs.yml

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 9539df4fad8..762116a062c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
-'site_name: Testcontainers
+site_name: Testcontainers
 plugins:
     - search
     - codeinclude

From 16ed2379ff6e8622adddfd271032a28477cdcd0c Mon Sep 17 00:00:00 2001
From: Stuart Davidson <github@spedge.com>
Date: Thu, 30 May 2019 13:54:19 +0100
Subject: [PATCH 0099/4969] Remove broken link to roadmap (#1511)

The docs/ROADMAP.md link doesn't work and I don't see a replacement, so either remove the link or update it.
---
 CONTRIBUTING.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2914c874e1a..9a9f1e43b55 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,6 @@
 
 * Star the project on [Github](https://github.com/testcontainers/testcontainers-java) and help spread the word :)
 * Join our Slack: http://slack.testcontainers.org
-* See [ROADMAP](docs/ROADMAP.md) to understand the approach behind the project and what may/may not be in store for the future.
 * [Post an issue](https://github.com/testcontainers/testcontainers-java/issues) if you find any bugs
 * Contribute improvements or fixes using a [Pull Request](https://github.com/testcontainers/testcontainers-java/pulls). If you're going to contribute, thank you! Please just be sure to:
 	* discuss with the authors on an issue ticket prior to doing anything big

From 5c5bfe83308791c578351e99bff13c9b3eaeede4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 30 May 2019 13:55:02 +0100
Subject: [PATCH 0100/4969] Bump mockito-core from 2.27.0 to 2.28.2 in /core
 (#1512)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.27.0 to 2.28.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.27.0...v2.28.2)
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 853d3a199b9..a0c35863328 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.7.1'
     testCompile 'org.mongodb:mongo-java-driver:3.10.2'
-    testCompile ('org.mockito:mockito-core:2.27.0') {
+    testCompile ('org.mockito:mockito-core:2.28.2') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 1e49e7dcaaaa54ce6e5c27b18aed63a5ed3545b0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 31 May 2019 01:31:23 +0000
Subject: [PATCH 0101/4969] Bump okhttp from 3.12.1 to 3.14.2 in /core (#1475)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index a0c35863328..a77720d66df 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -92,7 +92,7 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded 'com.squareup.okhttp3:okhttp:3.12.1'
+    shaded 'com.squareup.okhttp3:okhttp:3.14.2'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 3a9a7a2ac36b0a0fe808c032300906fe45c2381e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 31 May 2019 02:08:45 +0000
Subject: [PATCH 0102/4969] Bump okhttp from 3.13.1 to 3.14.2 in /examples
 (#1478)

---
 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 565ed7c5353..8522878f5ec 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.26'
-    implementation 'com.squareup.okhttp3:okhttp:3.13.1'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.2'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.5'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From bded5611667a0a9c6b779927643db9fea8405d79 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 31 May 2019 07:58:29 +0000
Subject: [PATCH 0103/4969] Bump pulsar-client from 2.3.1 to 2.3.2 in
 /modules/pulsar (#1517)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index c3505dedf65..301d6f81da2 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.2'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
 }

From 481ff4873f6a80138c9ce84bf5eb1a87749f1e8d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 31 May 2019 12:03:42 +0100
Subject: [PATCH 0104/4969] Disable dependabot automerge for core module
 (#1518)

Disabling for core only, due to higher risk of accidental changes if automerge is used for this library
---
 .dependabot/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index 7acddda566c..7fe8921a36b 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -4,9 +4,6 @@ update_configs:
   - package_manager: "java:gradle"
     directory: "/core"
     update_schedule: "daily"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
 
 # Explicit entry for each module
   - package_manager: "java:gradle"

From 3d57220a0a557def6bf717ca26604f59293bcfab Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2019 08:36:54 +0000
Subject: [PATCH 0105/4969] Bump kafka-clients from 2.2.0 to 2.2.1 in
 /modules/kafka (#1522)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index cefb6368445..29cef0b4713 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.2.0'
+    testCompile 'org.apache.kafka:kafka-clients:2.2.1'
     testCompile 'org.assertj:assertj-core:3.12.2'
     testCompile 'com.google.guava:guava:23.0'
 }

From 369cfe1cac3d4ab3bf1c8590199cd4786c11f4d6 Mon Sep 17 00:00:00 2001
From: RSchlenker <robin.schlenker10.10@gmail.com>
Date: Mon, 3 Jun 2019 11:08:15 +0200
Subject: [PATCH 0106/4969] Add spock quickstart documentation (#1499)

---
 docs/quickstart/spock_quickstart.md           | 87 +++++++++++++++++++
 examples/settings.gradle                      |  2 +-
 examples/spock/build.gradle                   | 15 ++++
 .../java/quickstart/RedisBackedCache.java     | 22 +++++
 .../quickstart/RedisBackedCacheIntTest.groovy | 36 ++++++++
 .../RedisBackedCacheIntTestStep0.groovy       | 25 ++++++
 .../spock/src/test/resources/logback-test.xml | 27 ++++++
 mkdocs.yml                                    |  1 +
 8 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 docs/quickstart/spock_quickstart.md
 create mode 100644 examples/spock/build.gradle
 create mode 100644 examples/spock/src/main/java/quickstart/RedisBackedCache.java
 create mode 100644 examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
 create mode 100644 examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
 create mode 100644 examples/spock/src/test/resources/logback-test.xml

diff --git a/docs/quickstart/spock_quickstart.md b/docs/quickstart/spock_quickstart.md
new file mode 100644
index 00000000000..921956c875a
--- /dev/null
+++ b/docs/quickstart/spock_quickstart.md
@@ -0,0 +1,87 @@
+# Spock Quickstart
+
+It's easy to add Testcontainers to your project - let's walk through a quick example to see how.
+
+Let's imagine we have a simple program that has a dependency on Redis, and we want to add some tests for it.
+In our imaginary program, there is a `RedisBackedCache` class which stores data in Redis.
+ 
+You can see an example test that could have been written for it (without using Testcontainers):
+
+<!--codeinclude-->
+[Pre-Testcontainers test code](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy) block:RedisBackedCacheIntTestStep0
+<!--/codeinclude-->
+
+Notice that the existing test has a problem - it's relying on a local installation of Redis, which is a red flag for test reliability.
+This may work if we were sure that every developer and CI machine had Redis installed, but would fail otherwise.
+We might also have problems if we attempted to run tests in parallel, such as state bleeding between tests, or port clashes.
+
+Let's start from here, and see how to improve the test with Testcontainers:  
+
+## 1. Add Testcontainers as a test-scoped dependency
+
+First, add Testcontainers as a dependency as follows:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:spock:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>spock</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+## 2. Get Testcontainers to run a Redis container during our tests
+
+Annotate the Spock specification class with the Testcontainers extension:
+
+```groovy tab='Spock Testcontainers annotation'
+@org.testcontainers.spock.Testcontainers
+class RedisBackedCacheIntTest extends Specification {
+```
+
+And add the following field to the body of our test class:
+
+<!--codeinclude-->
+[Spock Testcontainers init](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) inside_block:init
+<!--/codeinclude-->
+
+This tells Spock to start a Testcontainers `GenericContainer`, configured to use a specific Redis image from Docker Hub, and configured to expose a port.
+
+If we run our test as-is, then regardless of the actual test outcome, we'll see logs showing us that Testcontainers:
+
+* was activated before our test method ran
+* discovered and quickly tested our local Docker setup
+* pulled the image if necessary
+* started a new container and waited for it to be ready
+* shut down and deleted the container after the test
+
+## 3. Make sure our code can talk to the container
+
+Before Testcontainers, we might have hardcoded an address like `localhost:6379` into our tests.
+
+Testcontainers uses *randomized ports* for each container it starts, but makes it easy to obtain the actual port at runtime.
+We can do this in our test `setup` method, to set up our component under test:
+
+<!--codeinclude-->
+[Obtaining a mapped port](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) inside_block:setup
+<!--/codeinclude-->
+
+!!! tip
+    Notice that we also ask Testcontainers for the container's actual address with `redis.containerIpAddress`, 
+    rather than hard-coding `localhost`. `localhost` may work in some environments but not others - for example it may
+    not work on your current or future CI environment. As such, **avoid hard-coding** the address, and use 
+    `containerIpAddress` instead.
+
+## 4. Run the tests!
+
+That's it!
+
+Let's look at our complete test class to see how little we had to add to get up and running with Testcontainers:
+
+<!--codeinclude-->
+[RedisBackedCacheIntTest](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) block:complete
+<!--/codeinclude-->
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 06252afa580..3d57c2a18df 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -12,4 +12,4 @@ include 'selenium-container'
 include 'singleton-container'
 include 'spring-boot'
 include 'cucumber'
-
+include 'spock'
diff --git a/examples/spock/build.gradle b/examples/spock/build.gradle
new file mode 100644
index 00000000000..0b727fbd18a
--- /dev/null
+++ b/examples/spock/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id 'java'
+    id 'groovy'
+}
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
+    testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
+    testImplementation 'org.testcontainers:spock'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+}
diff --git a/examples/spock/src/main/java/quickstart/RedisBackedCache.java b/examples/spock/src/main/java/quickstart/RedisBackedCache.java
new file mode 100644
index 00000000000..1123858ca17
--- /dev/null
+++ b/examples/spock/src/main/java/quickstart/RedisBackedCache.java
@@ -0,0 +1,22 @@
+package quickstart;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+
+public class RedisBackedCache {
+
+    private final StatefulRedisConnection<String, String> connection;
+
+    public RedisBackedCache(String hostname, Integer port) {
+        RedisClient client = RedisClient.create(String.format("redis://%s:%d/0", hostname, port));
+        connection = client.connect();
+    }
+
+    public String get(String key) {
+        return connection.sync().get(key);
+    }
+
+    public void put(String key, String value) {
+        connection.sync().set(key, value);
+    }
+}
diff --git a/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy b/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
new file mode 100644
index 00000000000..d8c056b5070
--- /dev/null
+++ b/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
@@ -0,0 +1,36 @@
+package quickstart
+
+import org.testcontainers.containers.GenericContainer
+import spock.lang.Specification
+
+// complete {
+@org.testcontainers.spock.Testcontainers
+class RedisBackedCacheIntTest extends Specification {
+
+    private RedisBackedCache underTest
+
+    // init {
+    public GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
+        .withExposedPorts(6379)
+    // }
+
+    void setup() {
+        String address = redis.containerIpAddress
+        Integer port = redis.firstMappedPort
+
+        // Now we have an address and port for Redis, no matter where it is running
+        underTest = new RedisBackedCache(address, port)
+    }
+
+    void testSimplePutAndGet() {
+        setup:
+        underTest.put("test", "example")
+
+        when:
+        String retrieved = underTest.get("test")
+
+        then:
+        retrieved == "example"
+    }
+}
+// }
diff --git a/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy b/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
new file mode 100644
index 00000000000..52897c30097
--- /dev/null
+++ b/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
@@ -0,0 +1,25 @@
+package quickstart
+
+import spock.lang.Ignore
+import spock.lang.Specification
+
+@Ignore("This test class is deliberately invalid, as it relies on a non-existent local Redis")
+class RedisBackedCacheIntTestStep0 extends Specification {
+    private RedisBackedCache underTest
+
+    void setup() {
+        // Assume that we have Redis running locally?
+        underTest = new RedisBackedCache("localhost", 6379)
+    }
+
+    void testSimplePutAndGet() {
+        setup:
+        underTest.put("test", "example")
+
+        when:
+        String retrieved = underTest.get("test")
+
+        then:
+        retrieved == "example"
+    }
+}
diff --git a/examples/spock/src/test/resources/logback-test.xml b/examples/spock/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..6e7cfd092de
--- /dev/null
+++ b/examples/spock/src/test/resources/logback-test.xml
@@ -0,0 +1,27 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+
+    <logger name="org.apache.http" level="WARN"/>
+    <logger name="com.github.dockerjava" level="WARN"/>
+    <logger name="org.zeroturnaround.exec" level="WARN"/>
+    <logger name="io.netty" level="WARN"/>
+    <logger name="org.testcontainers.shaded" level="WARN"/>
+
+    <turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
+        <Marker>PROFILER</Marker>
+        <OnMatch>DENY</OnMatch>
+    </turboFilter>
+</configuration>
diff --git a/mkdocs.yml b/mkdocs.yml
index 762116a062c..869d0d4b551 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,6 +25,7 @@ nav:
     - Home: index.md
     - Quickstart:
           - quickstart/junit_4_quickstart.md
+          - quickstart/spock_quickstart.md
     - Features:
           - features/creating_container.md
           - features/networking.md

From 4bb2dea90c61759c75745c99052c33175f8a2a53 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2019 08:28:09 +0000
Subject: [PATCH 0107/4969] Bump lettuce-core from 5.1.1.RELEASE to
 5.1.6.RELEASE in /examples (#1526)

---
 examples/spock/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spock/build.gradle b/examples/spock/build.gradle
index 0b727fbd18a..9ac238b54f4 100644
--- a/examples/spock/build.gradle
+++ b/examples/spock/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
+    compile "io.lettuce:lettuce-core:5.1.6.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
     testImplementation 'org.testcontainers:spock'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From a44f357956e116bcbc0062d22096671150fdf376 Mon Sep 17 00:00:00 2001
From: Sandra Parsick <sparsick@users.noreply.github.com>
Date: Tue, 4 Jun 2019 13:00:16 +0200
Subject: [PATCH 0108/4969] Add support for tmpfs to ContainerDatabaseDriver
 (#1500)

---
 docs/modules/databases/index.md               | 15 ++++-
 .../jdbc/DatabaseDriverTmpfsTest.java         | 35 +++++++++++
 .../testcontainers/jdbc/ConnectionUrl.java    | 59 ++++++++++++++-----
 .../jdbc/ContainerDatabaseDriver.java         |  1 +
 .../jdbc/ConnectionUrlTest.java               | 15 +++++
 5 files changed, 110 insertions(+), 15 deletions(-)
 create mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index 71d65af7e20..22292875307 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -7,7 +7,7 @@ You might want to use Testcontainers' database support:
  * **Instead of H2 database for DAO unit tests that depend on database features that H2 doesn't emulate.** Testcontainers is not as performant as H2, but does give you the benefit of 100% database compatibility (since it runs a real DB inside of a container).
  * **Instead of a database running on the local machine or in a VM** for DAO unit tests or end-to-end integration tests that need a database to be present. In this context, the benefit of Testcontainers is that the database always starts in a known state, without any contamination between test runs or on developers' local machines.
 
-!!! note 
+!!! note
     Of course, it's still important to have as few tests that hit the database as possible, and make good use of mocks for components higher up the stack.
 
 You can obtain a temporary database in one of two ways:
@@ -101,3 +101,16 @@ By default database container is being stopped as soon as last connection is clo
  `jdbc:tc:mysql:5.7.22://hostname/databasename?TC_DAEMON=true`
 
 With this parameter database container will keep running even when there're no open connections.
+
+
+#### Running container with tmpfs options
+
+Container can have `tmpfs` mounts for storing data in host memory. This is useful if you want to speed up your database tests. Be aware that the data will be lost when the container stops.
+
+To pass this option to the container, add `TC_TMPFS` paramater to the URL as follows:
+
+  `jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw`
+
+If you need more than one option, seperate them by comma (e.g. `TC_TMPFS=key:value,key1:value1&other_parameters=foo`).
+
+For more information about `tmpfs` mount, see [the official Docker documentation](https://docs.docker.com/storage/tmpfs/).
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
new file mode 100644
index 00000000000..07b70020733
--- /dev/null
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -0,0 +1,35 @@
+package org.testcontainers.jdbc;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import org.junit.Test;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class DatabaseDriverTmpfsTest {
+
+    @Test
+    public void tmpfs() throws IOException, InterruptedException, SQLException {
+        final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
+        try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
+
+            JdbcDatabaseContainer<?> container = ContainerDatabaseDriver.getContainer(jdbcUrl);
+            // check file doesn't exist
+            String path = "/testtmpfs/test.file";
+            Container.ExecResult execResult = container.execInContainer("ls", path);
+            assertEquals("tmpfs inside container works fine", execResult.getStderr(),
+                "ls: cannot access '/testtmpfs/test.file': No such file or directory\n");
+            // touch && check file does exist
+            container.execInContainer("touch", path);
+            execResult = container.execInContainer("ls", path);
+            assertEquals("tmpfs inside container works fine", execResult.getStdout(), path + "\n");
+        }
+
+    }
+
+
+}
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index 7c5a53ede65..36206b89d82 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -1,13 +1,20 @@
 package org.testcontainers.jdbc;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import static java.util.stream.Collectors.toMap;
 
 /**
  * This is an Immutable class holding JDBC Connection Url and its parsed components, used by {@link ContainerDatabaseDriver}.
@@ -16,7 +23,8 @@
  *
  * @author manikmagar
  */
-@EqualsAndHashCode(of = "url") @Getter
+@EqualsAndHashCode(of = "url")
+@Getter
 public class ConnectionUrl {
 
     private String url;
@@ -48,8 +56,9 @@ public class ConnectionUrl {
     private Map<String, String> containerParameters;
 
     private Map<String, String> queryParameters;
+    private Map<String, String> tmpfsOptions = new HashMap<>();
 
-    public static ConnectionUrl newInstance(final String url){
+    public static ConnectionUrl newInstance(final String url) {
         ConnectionUrl connectionUrl = new ConnectionUrl(url);
         connectionUrl.parseUrl();
         return connectionUrl;
@@ -65,7 +74,8 @@ public static boolean accepts(final String url) {
 
     /**
      * This method applies various REGEX Patterns to parse the URL associated with this instance.
-     * This is called from a @{@link ConnectionUrl#newInstance(String)} static factory method to create immutable instance of {@link ConnectionUrl}.
+     * This is called from a @{@link ConnectionUrl#newInstance(String)} static factory method to create immutable instance of
+     * {@link ConnectionUrl}.
      * To avoid mutation after class is instantiated, this method should not be publicly accessible.
      */
     private void parseUrl() {
@@ -100,14 +110,14 @@ private void parseUrl() {
         }
 
         queryParameters = Collections.unmodifiableMap(
-                                            parseQueryParameters(
-                                                Optional.ofNullable(urlMatcher.group(5)).orElse("")));
+            parseQueryParameters(
+                Optional.ofNullable(urlMatcher.group(5)).orElse("")));
 
         String query = queryParameters
-                            .entrySet()
-                                .stream()
-                                .map(e -> e.getKey() + "=" + e.getValue())
-                                .collect(Collectors.joining("&"));
+            .entrySet()
+            .stream()
+            .map(e -> e.getKey() + "=" + e.getValue())
+            .collect(Collectors.joining("&"));
 
         if (query == null || query.trim().length() == 0) {
             queryString = Optional.empty();
@@ -117,6 +127,9 @@ private void parseUrl() {
 
         containerParameters = Collections.unmodifiableMap(parseContainerParameters());
 
+        tmpfsOptions = parseTmpfsOptions(containerParameters);
+
+
         initScriptPath = Optional.ofNullable(containerParameters.get("TC_INITSCRIPT"));
 
         Matcher funcMatcher = Patterns.INITFUNCTION_MATCHING_PATTERN.matcher(this.getUrl());
@@ -129,6 +142,19 @@ private void parseUrl() {
 
     }
 
+    private Map<String, String> parseTmpfsOptions(Map<String, String> containerParameters) {
+        if(!containerParameters.containsKey("TC_TMPFS")){
+            return Collections.emptyMap();
+        }
+
+        String tmpfsOptions = containerParameters.get("TC_TMPFS");
+
+        return Stream.of(tmpfsOptions.split(","))
+            .collect(toMap(
+                string -> string.split(":")[0],
+                string -> string.split(":")[1]));
+    }
+
     /**
      * Get the TestContainers Parameters such as Init Function, Init Script path etc.
      *
@@ -160,12 +186,17 @@ private Map<String, String> parseQueryParameters(final String queryString) {
         while (matcher.find()) {
             String key = matcher.group(1);
             String value = matcher.group(2);
-            if(!key.matches(Patterns.TC_PARAM_NAME_PATTERN)) results.put(key, value);
+            if (!key.matches(Patterns.TC_PARAM_NAME_PATTERN))
+                results.put(key, value);
         }
 
         return results;
     }
 
+    public Map<String, String> getTmpfsOptions() {
+        return Collections.unmodifiableMap(tmpfsOptions);
+    }
+
     /**
      * This interface defines the Regex Patterns used by {@link ConnectionUrl}.
      *
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index 0f470e36979..6d3df6c7cc5 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -93,6 +93,7 @@ public synchronized Connection connect(String url, final Properties info) throws
                 for (JdbcDatabaseContainerProvider candidateContainerType : databaseContainers) {
                     if (candidateContainerType.supports(connectionUrl.getDatabaseType())) {
                         container = candidateContainerType.newInstance(connectionUrl);
+                        container.withTmpFs(connectionUrl.getTmpfsOptions());
                         delegate = container.getJdbcDriverInstance();
                     }
                 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index a5c36d8f065..53524eb32b2 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -49,6 +49,21 @@ public void testConnectionUrl2() {
 
     }
 
+    @Test
+    public void testTmpfsOption() {
+        String urlString = "jdbc:tc:mysql://somehostname/databasename?TC_TMPFS=key:value,key1:value1";
+        ConnectionUrl url = ConnectionUrl.newInstance(urlString);
+
+        assertTrue("Connection Parameters set is empty", url.getQueryParameters().isEmpty());
+        assertFalse("Container Parameters set is not empty", url.getContainerParameters().isEmpty());
+        assertEquals("Container Parameter TC_TMPFS is true", "key:value,key1:value1", url.getContainerParameters().get("TC_TMPFS"));
+        assertTrue("tmpfs option key exists", url.getTmpfsOptions().containsKey("key"));
+        assertEquals("tmpfs option key has correct value", "value" , url.getTmpfsOptions().get("key"));
+        assertTrue("tmpfs option key1 exists", url.getTmpfsOptions().containsKey("key1"));
+        assertEquals("tmpfs option key1 has correct value", "value1" , url.getTmpfsOptions().get("key1"));
+    }
+
+
     @Test
     public void testInitScriptPathCapture() {
         String urlString = "jdbc:tc:mysql:5.6.23://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";

From e6693bc9f0f88f1ad5ae5b0368b42daf8a22972a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2019 07:58:41 +0000
Subject: [PATCH 0109/4969] Bump java-client from 2.7.6 to 2.7.7 in
 /modules/couchbase (#1536)

---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 8cf0f879215..6635462818f 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,5 +2,5 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.6'
+    compile 'com.couchbase.client:java-client:2.7.7'
 }

From cdf3501c2be5c5c6b891e30c6642719bb22ba4ba Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2019 08:20:49 +0000
Subject: [PATCH 0110/4969] Bump tomcat-jdbc from 9.0.20 to 9.0.21 in
 /modules/mariadb (#1538)

---
 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 371ec52641d..e1b21c58d04 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.1'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.20'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.21'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 287f7512113dfe1531cc54fd674ef9a3ec331ef9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2019 08:58:20 +0000
Subject: [PATCH 0111/4969] Bump tomcat-jdbc from 9.0.20 to 9.0.21 in
 /modules/mysql (#1539)

---
 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 e48c71734ae..e2b1b416400 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.16'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.20'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.21'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 7de41161a3e3b0dfb737ff8964f44dc70db04b16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2019 08:02:12 +0000
Subject: [PATCH 0112/4969] Bump httpclient from 4.5.8 to 4.5.9 in
 /modules/junit-jupiter (#1543)

---
 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 591347ca699..59d72d82a21 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'redis.clients:jedis:3.0.1'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.16'

From 57ed84a58a0b0a9b93b3175321e89eec0d922a0d Mon Sep 17 00:00:00 2001
From: Dmitry Yakubovsky <icubedm@gmail.com>
Date: Wed, 12 Jun 2019 15:14:07 +0200
Subject: [PATCH 0113/4969] Add Zalando SE as one of the users (#1542)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index cbee344e637..d202ef67cbb 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -71,6 +71,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Skyscanner](https://www.skyscanner.net/) - Integration testing against HTTP service mocks and various data stores
 * [Neo4j-OGM](https://neo4j.com/developer/neo4j-ogm/) - Testing new, reactive client implementations
 * [Lightbend](https://www.lightbend.com/) - Testing [Alpakka Kafka](https://doc.akka.io/docs/alpakka-kafka/current/) and support in [Alpakka Kafka Testkit](https://doc.akka.io/docs/alpakka-kafka/current/testing.html#testing-with-kafka-in-docker)
+* [Zalando SE](https://corporate.zalando.com/en) - Testing core business services
 
 ## License
 

From 8d242a385ea472655b77b4ada498cc67f6666aec Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 12 Jun 2019 20:17:05 +0100
Subject: [PATCH 0114/4969] Add minimal docs describing Drone CI usage (#1505)

---
 .../continuous_integration/dind_patterns.md                | 7 +++++++
 .../continuous_integration/drone.md                        | 5 ++++-
 mkdocs.yml                                                 | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/dind_patterns.md b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
index 38bcd82c752..1534949e1bd 100644
--- a/docs/supported_docker_environment/continuous_integration/dind_patterns.md
+++ b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
@@ -47,3 +47,10 @@ tests:
     - ~/.m2:/root/.m2
   command: mvn test
 ```
+
+## Docker-in-Docker
+
+While Docker-in-Docker (DinD) is generally considered an instrument of last resort, it is necessary for some CI environments.
+
+[Drone CI](./drone.md) is one such example. Testcontainers has a Docker-in-Docker plugin (build image) for use with Drone,
+which could be used as inspiration for setting up other similar testing using DinD.
diff --git a/docs/supported_docker_environment/continuous_integration/drone.md b/docs/supported_docker_environment/continuous_integration/drone.md
index 2549bdf4f48..f4a1dd2bc6a 100644
--- a/docs/supported_docker_environment/continuous_integration/drone.md
+++ b/docs/supported_docker_environment/continuous_integration/drone.md
@@ -1,3 +1,6 @@
 # Drone CI
 
-> TODO
+Drone CI 0.8 is supported via the use of a general purpose Docker-in-Docker plugin.
+
+Please see [testcontainers/dind-drone-plugin](https://github.com/testcontainers/dind-drone-plugin) for further details and usage instructions.
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 869d0d4b551..6b38d82eff4 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -70,6 +70,7 @@ nav:
           - Continuous Integration:
                 - supported_docker_environment/continuous_integration/dind_patterns.md
                 - supported_docker_environment/continuous_integration/circle_ci.md
+                - supported_docker_environment/continuous_integration/drone.md
                 - supported_docker_environment/continuous_integration/gitlab_ci.md
                 - supported_docker_environment/continuous_integration/bitbucket_pipelines.md
           - supported_docker_environment/windows.md

From 271835edd0f0afa875ad79146faa9f207d4c0a3c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2019 08:07:52 +0000
Subject: [PATCH 0115/4969] Bump mariadb-java-client from 2.4.1 to 2.4.2 in
 /modules/mariadb (#1551)

---
 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 e1b21c58d04..0068368b8a3 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.1'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.2'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.21'

From 4f56c79a9175b24934eb759f51742baa3925ed7f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2019 08:58:56 +0000
Subject: [PATCH 0116/4969] Bump httpclient from 4.5.8 to 4.5.9 in
 /modules/spock (#1545)

---
 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 6076788dbc4..c11850eacc6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
 
     testRuntime 'org.postgresql:postgresql:42.2.5'
     testRuntime 'mysql:mysql-connector-java:8.0.16'

From b6f42a343960ba0542e7b48c0148ef8557db6e9a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2019 06:01:29 +0000
Subject: [PATCH 0117/4969] Bump lettuce-core from 5.1.6.RELEASE to
 5.1.7.RELEASE in /examples (#1554)

---
 examples/spock/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spock/build.gradle b/examples/spock/build.gradle
index 9ac238b54f4..cc04f74c90d 100644
--- a/examples/spock/build.gradle
+++ b/examples/spock/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.1.6.RELEASE"
+    compile "io.lettuce:lettuce-core:5.1.7.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
     testImplementation 'org.testcontainers:spock'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From b8126ac70345c1d6eda32a7375e1ebf11081911c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2019 06:35:58 +0000
Subject: [PATCH 0118/4969] Bump org.springframework.boot in /examples (#1556)

---
 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 0aa55093dca..d4f3c132896 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.1.5.RELEASE'
+    id 'org.springframework.boot' version '2.1.6.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index f45b0e51c11..52767c7a9ca 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.1.5.RELEASE'
+    id 'org.springframework.boot' version '2.1.6.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 1862873051d0ea12d6acc80e3ac98f40c7253ee1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2019 07:22:38 +0000
Subject: [PATCH 0119/4969] Bump cucumber-junit from 4.3.1 to 4.4.0 in
 /examples (#1555)

---
 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 bab77700eff..3381ecab567 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.3.1'
-    testImplementation 'io.cucumber:cucumber-junit:4.3.1'
+    testImplementation 'io.cucumber:cucumber-junit:4.4.0'
     testImplementation 'org.testcontainers:selenium'
 }

From d44c83289ede050b1f0a87bb0d765047e5fd7d6f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2019 08:19:01 +0000
Subject: [PATCH 0120/4969] Bump cucumber-java from 4.3.1 to 4.4.0 in /examples
 (#1553)

---
 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 3381ecab567..6d6e6385a60 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.3.1'
+    implementation 'io.cucumber:cucumber-java:4.4.0'
     testImplementation 'io.cucumber:cucumber-junit:4.4.0'
     testImplementation 'org.testcontainers:selenium'
 }

From ef91a5c126bfa989ee5a962fc87904b548d3a7f8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2019 06:11:00 +0000
Subject: [PATCH 0121/4969] Bump postgresql from 42.2.5 to 42.2.6 in
 /modules/spock (#1558)

---
 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 c11850eacc6..74c6b6fd5db 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
 
-    testRuntime 'org.postgresql:postgresql:42.2.5'
+    testRuntime 'org.postgresql:postgresql:42.2.6'
     testRuntime 'mysql:mysql-connector-java:8.0.16'
 }

From b880ef0c4ce7d94136edd1dacd82bebc88367aa9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2019 07:10:46 +0000
Subject: [PATCH 0122/4969] Bump postgresql from 42.2.5 to 42.2.6 in
 /modules/postgresql (#1560)

---
 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 0ef6df998e3..1a5980dee55 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: PostgreSQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.postgresql:postgresql:42.2.5'
+    testCompile 'org.postgresql:postgresql:42.2.6'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
 }

From 10c71d8188d1fc95416745d6f0469ee2b3452d75 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2019 07:45:47 +0000
Subject: [PATCH 0123/4969] Bump postgresql from 42.2.5 to 42.2.6 in /examples
 (#1561)

---
 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 8522878f5ec..ce0eff58a28 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.26'
     implementation 'com.squareup.okhttp3:okhttp:3.14.2'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.5'
+    testImplementation 'org.postgresql:postgresql:42.2.6'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From e690b938f4180782a5003f83840e90d642b91569 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2019 09:47:57 +0200
Subject: [PATCH 0124/4969] Bump mockserver-client-java from 5.5.1 to 5.5.4 in
 /modules/mockserver (#1438)

Also increase the used image tag accordingly.
---
 modules/mockserver/build.gradle                               | 2 +-
 .../org/testcontainers/containers/MockServerContainer.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 8855121360c..b463997fed5 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MockServer"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.mock-server:mockserver-client-java:5.5.1'
+    testCompile 'org.mock-server:mockserver-client-java:5.5.4'
 }
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index f191adea06d..f1f9dc42d19 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -5,7 +5,7 @@
 @Slf4j
 public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
-    public static final String VERSION = "5.5.1";
+    public static final String VERSION = "5.5.4";
 
     public static final int PORT = 1080;
 
@@ -15,7 +15,7 @@ public MockServerContainer() {
 
     public MockServerContainer(String version) {
         super("jamesdbloom/mockserver:mockserver-" + version);
-        withCommand("/opt/mockserver/run_mockserver.sh -logLevel INFO -serverPort " + PORT);
+        withCommand("-logLevel INFO -serverPort " + PORT);
         addExposedPorts(PORT);
     }
 

From c5e4e643382022543244d988cff89a9d5656bdb6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2019 08:27:41 +0000
Subject: [PATCH 0125/4969] Bump postgresql from 42.2.5 to 42.2.6 in
 /modules/junit-jupiter (#1559)

---
 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 59d72d82a21..9860686eed7 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
 
-    testRuntime 'org.postgresql:postgresql:42.2.5'
+    testRuntime 'org.postgresql:postgresql:42.2.6'
     testRuntime 'mysql:mysql-connector-java:8.0.16'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
 }

From 61595018f232278cf8aa95ad2363e3a2bdf974ab Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2019 05:54:46 +0000
Subject: [PATCH 0126/4969] Bump kafka-clients from 2.2.1 to 2.3.0 in
 /modules/kafka (#1565)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 29cef0b4713..10013a6e11e 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.2.1'
+    testCompile 'org.apache.kafka:kafka-clients:2.3.0'
     testCompile 'org.assertj:assertj-core:3.12.2'
     testCompile 'com.google.guava:guava:23.0'
 }

From 67ca611a4a3509130663b0ccd54195b8d1014117 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2019 06:26:01 +0000
Subject: [PATCH 0127/4969] Bump junit-jupiter-engine from 5.4.2 to 5.5.0 in
 /modules/junit-jupiter (#1577)

---
 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 9860686eed7..56a11f60ffe 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.6'
     testRuntime 'mysql:mysql-connector-java:8.0.16'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.0'
 }
 
 test {

From 909f0092bb01781579b04a37d5fadcebabb9c9ec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2019 07:38:46 +0000
Subject: [PATCH 0128/4969] Bump junit-jupiter-api from 5.4.2 to 5.5.0 in
 /modules/junit-jupiter (#1578)

---
 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 56a11f60ffe..baab3b68bb8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.4.2'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.5.0'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From d5c0dcae4083038bb02c7248d09c672c3b5814b3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2019 08:29:27 +0000
Subject: [PATCH 0129/4969] Bump cucumber-junit from 4.4.0 to 4.5.0 in
 /examples (#1579)

---
 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 6d6e6385a60..8e6c52f451e 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.4.0'
-    testImplementation 'io.cucumber:cucumber-junit:4.4.0'
+    testImplementation 'io.cucumber:cucumber-junit:4.5.0'
     testImplementation 'org.testcontainers:selenium'
 }

From a1f1d242b196a086f8660b260c4e3c969228de4c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2019 09:50:47 +0000
Subject: [PATCH 0130/4969] Bump cucumber-java from 4.4.0 to 4.5.0 in /examples
 (#1580)

---
 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 8e6c52f451e..c590d68875b 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.4.0'
+    implementation 'io.cucumber:cucumber-java:4.5.0'
     testImplementation 'io.cucumber:cucumber-junit:4.5.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 67ca5e717cc2ea88d1fda79286bfef619aca4e25 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2019 05:50:48 +0000
Subject: [PATCH 0131/4969] Bump cucumber-java from 4.5.0 to 4.5.1 in /examples
 (#1583)

---
 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 c590d68875b..48a016a30c8 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.5.0'
+    implementation 'io.cucumber:cucumber-java:4.5.1'
     testImplementation 'io.cucumber:cucumber-junit:4.5.0'
     testImplementation 'org.testcontainers:selenium'
 }

From d5efe5be77e8f868faaf2cc8e044d740b9c65b9a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2019 07:08:13 +0000
Subject: [PATCH 0132/4969] Bump cucumber-junit from 4.5.0 to 4.5.1 in
 /examples (#1584)

---
 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 48a016a30c8..505aad82ae4 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.5.1'
-    testImplementation 'io.cucumber:cucumber-junit:4.5.0'
+    testImplementation 'io.cucumber:cucumber-junit:4.5.1'
     testImplementation 'org.testcontainers:selenium'
 }

From ace97aaa4ede14bc559c786552651acd4c553a48 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2019 05:44:27 +0000
Subject: [PATCH 0133/4969] Bump neo4j from 3.5.6 to 3.5.7 in /modules/neo4j
 (#1586)

---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 68a52d115cd..9c5410aa179 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -25,7 +25,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.6"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.7"
 
     compile project(":testcontainers")
 

From efabf3d1300da7b735453e916df40da6d5fc9337 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2019 06:16:51 +0000
Subject: [PATCH 0134/4969] Bump pulsar-client from 2.3.2 to 2.4.0 in
 /modules/pulsar (#1587)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 301d6f81da2..e8e589cda72 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.2'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.4.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
 }

From 52f090acd9d6c97fb534071456164f76868b749d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 6 Jul 2019 17:23:19 +0100
Subject: [PATCH 0135/4969] =?UTF-8?q?Revert=20"Bump=20pulsar-client=20from?=
 =?UTF-8?q?=202.3.2=20to=202.4.0=20in=20/modules/puls=E2=80=A6=20(#1589)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit efabf3d1300da7b735453e916df40da6d5fc9337.
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index e8e589cda72..301d6f81da2 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.4.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.2'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
 }

From 06ea95be1e288622aedb3a35ea585575654e5a9a Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 6 Jul 2019 23:18:18 +0200
Subject: [PATCH 0136/4969] Deprecate fields that are derived from
 `containerInfo` (#1585)

---
 .../containers/DockerComposeContainer.java       |  2 +-
 .../containers/GenericContainer.java             | 16 +++++++++++++++-
 .../containers/VncRecordingContainer.java        |  6 +++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 67674796cdd..ff92289431e 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -559,7 +559,7 @@ public void invoke() {
 
         AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
 
-        final Integer exitCode = this.dockerClient.inspectContainerCmd(containerId)
+        final Integer exitCode = this.dockerClient.inspectContainerCmd(getContainerId())
                 .exec()
                 .getState()
                 .getExitCode();
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 936d880d1a8..8045d47c720 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -143,13 +143,23 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Setter(AccessLevel.NONE)
     protected Info dockerDaemonInfo = null;
 
-    /*
+    /**
      * Set during container startup
+     * // TODO make it private
+     *
+     * @deprecated use {@link ContainerState#getContainerId()}
      */
     @Setter(AccessLevel.NONE)
+    @Deprecated
     protected String containerId;
 
+    /**
+     * Set during container startup
+     *
+     * @deprecated use {@link GenericContainer#getContainerInfo()}
+     */
     @Setter(AccessLevel.NONE)
+    @Deprecated
     protected String containerName;
 
     @Setter(AccessLevel.NONE)
@@ -188,6 +198,10 @@ public GenericContainer(@NonNull final Future<String> image) {
         this.image = image;
     }
 
+    public String getContainerId() {
+        return containerId;
+    }
+
     /**
      * Starts the container using docker, pulling an image if necessary.
      */
diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index b8a26bfe65b..1b06215b706 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -78,7 +78,7 @@ public void onNext(Frame frame) {
                         };
 
                         try (
-                                Closeable __ = dockerClient.logContainerCmd(containerId)
+                                Closeable __ = dockerClient.logContainerCmd(getContainerId())
                                         .withFollowStream(true)
                                         .withSince(0)
                                         .withStdErr(true)
@@ -122,7 +122,7 @@ protected void configure() {
     @SneakyThrows
     public InputStream streamRecording() {
         TarArchiveInputStream archiveInputStream = new TarArchiveInputStream(
-                dockerClient.copyArchiveFromContainerCmd(containerId, RECORDING_FILE_NAME).exec()
+                dockerClient.copyArchiveFromContainerCmd(getContainerId(), RECORDING_FILE_NAME).exec()
         );
         archiveInputStream.getNextEntry();
         return archiveInputStream;
@@ -134,4 +134,4 @@ public void saveRecordingToFile(File file) {
             Files.copy(inputStream, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
         }
     }
-}
\ No newline at end of file
+}

From 7fae384751da6101a451aa7d0a753ebd6dbf13ce Mon Sep 17 00:00:00 2001
From: HaMatthias <38075918+HaMatthias@users.noreply.github.com>
Date: Sat, 6 Jul 2019 23:19:45 +0200
Subject: [PATCH 0137/4969] Docker Compose: allow specific services to be
 started (#1528)

---
 .../containers/DockerComposeContainer.java    | 12 ++++++-
 .../junit/DockerComposeServiceTest.java       | 33 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index ff92289431e..46f4c561e5d 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -75,6 +75,8 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
 
     private static final Object MUTEX = new Object();
 
+    private List<String> services = new ArrayList<>();
+
     /**
      * Properties that should be passed through to all Compose and ambassador containers (not
      * necessarily to containers that are spawned by Compose itself)
@@ -159,10 +161,18 @@ private void pullImages() {
         runWithCompose("pull");
     }
 
+    public SELF withServices(@NonNull String... services) {
+        this.services = Arrays.asList(services);
+        return self();
+    }
 
     private void createServices() {
         // Run the docker-compose container, which starts up the services
-        runWithCompose("up -d");
+        if(services.isEmpty()) {
+            runWithCompose("up -d");
+        } else {
+            runWithCompose("up -d " + String.join(" ", services));
+        }
     }
 
     private void waitUntilServiceStarted() {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
new file mode 100644
index 00000000000..c0360050d27
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
@@ -0,0 +1,33 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+
+import java.io.File;
+
+public class DockerComposeServiceTest extends BaseDockerComposeTest {
+
+    @Rule
+    public DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+            .withServices("redis")
+            .withExposedService("redis_1", REDIS_PORT);
+
+
+    @Override
+    protected DockerComposeContainer getEnvironment() {
+        return environment;
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testDbIsNotStarting() {
+        environment.getServicePort("db_1", 10001);
+    }
+
+    @Test
+    public void testRedisIsStarting() {
+        assertNotNull("Redis server started", environment.getServicePort("redis_1", REDIS_PORT));
+    }
+}

From c7945503d99bb573dc05e769a924aebcf8d0a5ee Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jul 2019 22:32:24 +0100
Subject: [PATCH 0138/4969] Bump httpclient from 4.5.8 to 4.5.9 in /core
 (#1544)

Bumps httpclient from 4.5.8 to 4.5.9.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index a77720d66df..30fd4d6167e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -100,7 +100,7 @@ dependencies {
         exclude(group: 'org.slf4j')
     }
 
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.8'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.7.1'
     testCompile 'org.mongodb:mongo-java-driver:3.10.2'

From 64f3906080961fb11e2023a4fe31adb2a5090a22 Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Mon, 8 Jul 2019 14:00:59 +0200
Subject: [PATCH 0139/4969] Add Europace AG as user (#1591)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index d202ef67cbb..89e70611f37 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -72,6 +72,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Neo4j-OGM](https://neo4j.com/developer/neo4j-ogm/) - Testing new, reactive client implementations
 * [Lightbend](https://www.lightbend.com/) - Testing [Alpakka Kafka](https://doc.akka.io/docs/alpakka-kafka/current/) and support in [Alpakka Kafka Testkit](https://doc.akka.io/docs/alpakka-kafka/current/testing.html#testing-with-kafka-in-docker)
 * [Zalando SE](https://corporate.zalando.com/en) - Testing core business services
+* [Europace AG](https://tech.europace.de/) - Integration testing for databases and micro services
 
 ## License
 

From ed0143333b386d551ae0fbdf00e11e707e2cf0a1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 8 Jul 2019 16:51:53 +0200
Subject: [PATCH 0140/4969] Azure pipelines (#1363)

---
 azure-pipelines.yml                           |  21 +++
 build.gradle                                  |   1 +
 .../junit/DockerNetworkModeTest.java          |  85 ++++------
 .../testcontainers/jdbc/JDBCDriverTest.java   | 156 ++++++++----------
 .../jdbc/JDBCDriverWithPoolTest.java          |   3 +-
 5 files changed, 127 insertions(+), 139 deletions(-)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 00000000000..abcd155010d
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,21 @@
+steps:
+- task: Gradle@2
+  displayName: Build core
+  inputs:
+    gradleWrapperFile: 'gradlew'
+    jdkVersionOption: '1.11'
+    options: '--no-daemon --continue'
+    tasks: 'testcontainers:check'
+    publishJUnitResults: true
+    testResultsFiles: '**/TEST-*.xml'
+- task: Gradle@2
+  displayName: Build modules
+  inputs:
+    gradleWrapperFile: 'gradlew'
+    jdkVersionOption: '1.11'
+    options: '--no-daemon --continue -x testcontainers:check'
+    tasks: 'check'
+    publishJUnitResults: true
+    testResultsFiles: '**/TEST-*.xml'
+
+
diff --git a/build.gradle b/build.gradle
index 27f1d8859f1..235c1ae22f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,7 @@ subprojects {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
     compileJava.options.encoding = 'UTF-8'
+    compileTestJava.options.encoding = 'UTF-8'
 
     lombok {
         version = '1.18.6'
diff --git a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
index 24215094e08..873160bdbc9 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
@@ -1,73 +1,50 @@
 package org.testcontainers.junit;
 
+import com.github.dockerjava.api.model.NetworkSettings;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.*;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.ToStringConsumer;
-import org.testcontainers.containers.output.WaitingConsumer;
-import org.testcontainers.utility.TestEnvironment;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Consumer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
  * Simple tests of named network modes - more may be possible, but may not be reproducible
  * without other setup steps.
  */
+@Slf4j
 public class DockerNetworkModeTest {
 
-    @BeforeClass
-    public static void checkVersion() {
-        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
-    }
-
-    @ClassRule
-    public static GenericContainer noNetwork = new GenericContainer("alpine:3.2")
-            .withNetworkMode("none")
-            .withCommand("ping -c 5 www.google.com");
-
-    @ClassRule
-    public static GenericContainer hostNetwork = new GenericContainer("alpine:3.2")
-            .withNetworkMode("host")
-            .withCommand("ping -c 5 www.google.com");
-
-    @ClassRule
-    public static GenericContainer bridgedNetwork = new GenericContainer("alpine:3.2")
-            .withNetworkMode("bridge")
-            .withCommand("ping -c 5 www.google.com");
-
-    @Test
-    public void testNoNetworkContainer() throws TimeoutException {
-        String output = getContainerOutput(noNetwork);
-
-        assertTrue("'none' network causes a network access error", output.contains("bad address"));
-    }
-
     @Test
-    public void testHostNetworkContainer() throws TimeoutException {
-        String output = getContainerOutput(hostNetwork);
-
-        assertTrue("'host' network can access the internet", output.contains("seq=1"));
+    public void testNoNetworkContainer() {
+        try (
+            GenericContainer container = new GenericContainer()
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withCommand("true")
+                .withNetworkMode("none")
+        ) {
+            container.start();
+            NetworkSettings networkSettings = container.getContainerInfo().getNetworkSettings();
+
+            assertEquals("only one network is set", 1, networkSettings.getNetworks().size());
+            assertTrue("network is 'none'", networkSettings.getNetworks().containsKey("none"));
+        }
     }
 
     @Test
-    public void testBridgedNetworkContainer() throws TimeoutException {
-        String output = getContainerOutput(bridgedNetwork);
-
-        assertTrue("'bridge' network can access the internet", output.contains("seq=1"));
-    }
-
-    private String getContainerOutput(GenericContainer container) throws TimeoutException {
-        WaitingConsumer waitingConsumer = new WaitingConsumer();
-        ToStringConsumer toStringConsumer = new ToStringConsumer();
-        Consumer<OutputFrame> composedConsumer = waitingConsumer.andThen(toStringConsumer);
-
-        container.followOutput(composedConsumer);
-        waitingConsumer.waitUntilEnd(10, TimeUnit.SECONDS);
-
-        return toStringConsumer.toUtf8String();
+    public void testHostNetworkContainer() {
+        try (
+            GenericContainer container = new GenericContainer()
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withCommand("true")
+                .withNetworkMode("host")
+        ) {
+            container.start();
+            NetworkSettings networkSettings = container.getContainerInfo().getNetworkSettings();
+
+            assertEquals("only one network is set", 1, networkSettings.getNetworks().size());
+            assertTrue("network is 'host'", networkSettings.getNetworks().containsKey("host"));
+        }
     }
 }
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index 40cb707a2d0..30b224ab6a6 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.jdbc;
 
-import com.googlecode.junittoolbox.ParallelParameterized;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbutils.QueryRunner;
@@ -22,7 +21,7 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
 public class JDBCDriverTest {
 
     private enum Options {
@@ -86,98 +85,91 @@ public static void testCleanup() {
 
     @Test
     public void test() throws SQLException {
-        performSimpleTest(jdbcUrl);
+        try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
+            performSimpleTest(dataSource);
 
-        if (options.contains(Options.ScriptedSchema)) {
-            performTestForScriptedSchema(jdbcUrl);
-        }
+            if (options.contains(Options.ScriptedSchema)) {
+                performTestForScriptedSchema(dataSource);
+            }
 
-        if (options.contains(Options.JDBCParams)) {
-            performTestForJDBCParamUsage(jdbcUrl);
-        }
+            if (options.contains(Options.JDBCParams)) {
+                performTestForJDBCParamUsage(dataSource);
+            }
 
-        if (options.contains(Options.CharacterSet)) {
-            //Called twice to ensure that the query string parameters are used when
-            //connections are created from cached containers.
-            performSimpleTestWithCharacterSet(jdbcUrl);
-            performSimpleTestWithCharacterSet(jdbcUrl);
+            if (options.contains(Options.CharacterSet)) {
+                performSimpleTestWithCharacterSet(jdbcUrl);
 
-            performTestForCharacterEncodingForInitialScriptConnection(jdbcUrl);
-        }
+                performTestForCharacterEncodingForInitialScriptConnection(dataSource);
+            }
 
-        if (options.contains(Options.CustomIniFile)) {
-            performTestForCustomIniFile(jdbcUrl);
+            if (options.contains(Options.CustomIniFile)) {
+                performTestForCustomIniFile(dataSource);
+            }
         }
     }
 
-    private void performSimpleTest(String jdbcUrl) throws SQLException {
-        try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
-            boolean result = new QueryRunner(dataSource, options.contains(Options.PmdKnownBroken)).query("SELECT 1", rs -> {
-                rs.next();
-                int resultSetInt = rs.getInt(1);
-                assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-                return true;
-            });
-
-            assertTrue("The database returned a record as expected", result);
-        }
-    }
+    private void performSimpleTest(HikariDataSource dataSource) throws SQLException {
+        boolean result = new QueryRunner(dataSource, options.contains(Options.PmdKnownBroken)).query("SELECT 1", rs -> {
+            rs.next();
+            int resultSetInt = rs.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            return true;
+        });
 
-    private void performTestForScriptedSchema(String jdbcUrl) throws SQLException {
-        try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
-            boolean result = new QueryRunner(dataSource).query("SELECT foo FROM bar WHERE foo LIKE '%world'", rs -> {
-                rs.next();
-                String resultSetString = rs.getString(1);
-                assertEquals("A basic SELECT query succeeds where the schema has been applied from a script", "hello world", resultSetString);
-                return true;
-            });
-        }
+        assertTrue("The database returned a record as expected", result);
     }
 
-    private void performTestForJDBCParamUsage(String jdbcUrl) throws SQLException {
-        try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
-            boolean result = new QueryRunner(dataSource).query("select CURRENT_USER", rs -> {
-                rs.next();
-                String resultUser = rs.getString(1);
-                // Not all databases (eg. Postgres) return @% at the end of user name. We just need to make sure the user name matches.
-                if (resultUser.endsWith("@%")) {
-                    resultUser = resultUser.substring(0, resultUser.length() - 2);
-                }
-                assertEquals("User from query param is created.", "someuser", resultUser);
-                return true;
-            });
+    private void performTestForScriptedSchema(HikariDataSource dataSource) throws SQLException {
+        boolean result = new QueryRunner(dataSource).query("SELECT foo FROM bar WHERE foo LIKE '%world'", rs -> {
+            rs.next();
+            String resultSetString = rs.getString(1);
+            assertEquals("A basic SELECT query succeeds where the schema has been applied from a script", "hello world", resultSetString);
+            return true;
+        });
 
-            assertTrue("The database returned a record as expected", result);
+        assertTrue("The database returned a record as expected", result);
+    }
 
-            String databaseQuery = "SELECT DATABASE()";
-            // Postgres does not have Database() as a function
-            String databaseType = ConnectionUrl.newInstance(jdbcUrl).getDatabaseType();
-            if (databaseType.equalsIgnoreCase("postgresql") || databaseType.equalsIgnoreCase("postgis")) {
-                databaseQuery = "SELECT CURRENT_DATABASE()";
+    private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQLException {
+        boolean result = new QueryRunner(dataSource).query("select CURRENT_USER", rs -> {
+            rs.next();
+            String resultUser = rs.getString(1);
+            // Not all databases (eg. Postgres) return @% at the end of user name. We just need to make sure the user name matches.
+            if (resultUser.endsWith("@%")) {
+                resultUser = resultUser.substring(0, resultUser.length() - 2);
             }
+            assertEquals("User from query param is created.", "someuser", resultUser);
+            return true;
+        });
 
-            result = new QueryRunner(dataSource).query(databaseQuery, rs -> {
-                rs.next();
-                String resultDB = rs.getString(1);
-                assertEquals("Database name from URL String is used.", "databasename", resultDB);
-                return true;
-            });
+        assertTrue("The database returned a record as expected", result);
 
-            assertTrue("The database returned a record as expected", result);
+        String databaseQuery = "SELECT DATABASE()";
+        // Postgres does not have Database() as a function
+        String databaseType = ConnectionUrl.newInstance(jdbcUrl).getDatabaseType();
+        if (databaseType.equalsIgnoreCase("postgresql") || databaseType.equalsIgnoreCase("postgis")) {
+            databaseQuery = "SELECT CURRENT_DATABASE()";
         }
+
+        result = new QueryRunner(dataSource).query(databaseQuery, rs -> {
+            rs.next();
+            String resultDB = rs.getString(1);
+            assertEquals("Database name from URL String is used.", "databasename", resultDB);
+            return true;
+        });
+
+        assertTrue("The database returned a record as expected", result);
     }
 
-    private void performTestForCharacterEncodingForInitialScriptConnection(String jdbcUrl) throws SQLException {
-        try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
-            boolean result = new QueryRunner(dataSource).query("SELECT foo FROM bar WHERE foo LIKE '%мир'", rs -> {
-                rs.next();
-                String resultSetString = rs.getString(1);
-                assertEquals("A SELECT query succeed and the correct charset has been applied for the init script", "привет мир", resultSetString);
-                return true;
-            });
+    private void performTestForCharacterEncodingForInitialScriptConnection(HikariDataSource dataSource) throws SQLException {
+        boolean result = new QueryRunner(dataSource).query("SELECT foo FROM bar WHERE foo LIKE '%мир'", rs -> {
+            rs.next();
+            String resultSetString = rs.getString(1);
+            assertEquals("A SELECT query succeed and the correct charset has been applied for the init script", "привет мир", resultSetString);
+            return true;
+        });
 
-            assertTrue("The database returned a record as expected", result);
-        }
+        assertTrue("The database returned a record as expected", result);
     }
 
     /**
@@ -207,18 +199,16 @@ private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException
         return dataSource;
     }
 
-    private void performTestForCustomIniFile(final String jdbcUrl) throws SQLException {
+    private void performTestForCustomIniFile(HikariDataSource dataSource) throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
-        try (HikariDataSource ds = getDataSource(jdbcUrl, 1)) {
-            Statement statement = ds.getConnection().createStatement();
-            statement.execute("SELECT @@GLOBAL.innodb_file_format");
-            ResultSet resultSet = statement.getResultSet();
+        Statement statement = dataSource.getConnection().createStatement();
+        statement.execute("SELECT @@GLOBAL.innodb_file_format");
+        ResultSet resultSet = statement.getResultSet();
 
-            assertTrue("The query returns a result", resultSet.next());
-            String result = resultSet.getString(1);
+        assertTrue("The query returns a result", resultSet.next());
+        String result = resultSet.getString(1);
 
-            assertEquals("The InnoDB file format has been set by the ini file content", "Barracuda", result);
-        }
+        assertEquals("The InnoDB file format has been set by the ini file content", "Barracuda", result);
     }
 
     private HikariDataSource getDataSource(String jdbcUrl, int poolSize) {
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java
index c40721223b0..53daa1316f5 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.jdbc;
 
-import com.googlecode.junittoolbox.ParallelParameterized;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbutils.QueryRunner;
@@ -25,7 +24,7 @@
 /**
  *
  */
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
 public class JDBCDriverWithPoolTest {
 
     public static final String URL = "jdbc:tc:mysql:5://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverWithPoolTest::sampleInitFunction";

From 68d538937ff9d329cb55ca8f7ea2d6390ae80abf Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 9 Jul 2019 10:39:13 +0200
Subject: [PATCH 0141/4969] Allocate lower shared memory in tests (#1597)

---
 .../testcontainers/junit/GenericContainerRuleTest.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index a991ebcf60a..6bbd71961a6 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -403,15 +403,13 @@ public void addExposedPortAfterWithExposedPortsTest() {
 
     @Test
     public void sharedMemorySetTest() {
-        try (GenericContainer containerWithSharedMemory = new GenericContainer("busybox:1.29")
-            .withSharedMemorySize(1024L * FileUtils.ONE_MB)) {
+        try (GenericContainer containerWithSharedMemory = new GenericContainer()
+            .withSharedMemorySize(42L * FileUtils.ONE_MB)) {
 
             containerWithSharedMemory.start();
 
-            HostConfig hostConfig =
-                containerWithSharedMemory.getDockerClient().inspectContainerCmd(containerWithSharedMemory.getContainerId())
-                    .exec().getHostConfig();
-            assertEquals("Shared memory not set on container", hostConfig.getShmSize(), 1024 * FileUtils.ONE_MB);
+            HostConfig hostConfig = containerWithSharedMemory.getContainerInfo().getHostConfig();
+            assertEquals("Shared memory not set on container", hostConfig.getShmSize(), 42L * FileUtils.ONE_MB);
         }
     }
 }

From 30574ef7a0aec19223c63d52702c4d5b0a478dfc Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 9 Jul 2019 10:44:33 +0100
Subject: [PATCH 0142/4969] Module contribution policy (#1576)

---
 CONTRIBUTING.md      | 16 ++-------
 docs/contributing.md | 80 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9a9f1e43b55..ffa95a477db 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,5 @@
 # Contributing
 
-* Star the project on [Github](https://github.com/testcontainers/testcontainers-java) and help spread the word :)
-* Join our Slack: http://slack.testcontainers.org
-* [Post an issue](https://github.com/testcontainers/testcontainers-java/issues) if you find any bugs
-* Contribute improvements or fixes using a [Pull Request](https://github.com/testcontainers/testcontainers-java/pulls). If you're going to contribute, thank you! Please just be sure to:
-	* discuss with the authors on an issue ticket prior to doing anything big
-	* follow the style, naming and structure conventions of the rest of the project
-	* make commits atomic and easy to merge
-	* verify all tests are passing. Build the project with `./gradlew check` to do this
-	
-	**PS:** Make sure Docker is running locally and you have the lombok plugin installed in your IDE
-	
-	**N.B.** Gradle's Build Cache is enabled by default, but you can add `--no-build-cache` flag to disable it.
-	
+Please see the [main contributing guidelines](./docs/contributing.md).
+
+There are additional docs describing [contributing documentation changes](./docs/contributing_docs.md).
diff --git a/docs/contributing.md b/docs/contributing.md
index 96ba5975aeb..9d2c63b030c 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -10,3 +10,83 @@
     * when updating documentation, please see [our guidance for documentation contributions](contributing_docs.md).
     * verify all tests are passing. Build the project with `./gradlew check` to do this.
     **N.B.** Gradle's Build Cache is enabled by default, but you can add `--no-build-cache` flag to disable it.
+
+## Contributing new modules
+
+We often receive proposals (or fully formed PRs) for new modules.
+We're very happy to have contributions, but new modules require specific extra care. We want to balance:
+
+* Usefulness of the module.
+* Our ability to support the module in the future, potentially after contributors have moved on.
+* Contributors time, so that nobody puts in wasted effort.
+
+### Does it need to be a module?
+
+*N.B. this is not a perfect list - please always reach out to us before starting on a module contribution!*
+
+* Does the module enable use of Testcontainers with a popular or rapidly growing technology?
+* Does the module 'add value' beyond a `GenericContainer` code snippet/example? e.g.
+    * does it neatly encapsulate a difficult problem of running the program in a container?
+    * does it add technology-specific [wait strategies](features/startup_and_waits.md)?
+    * does it enable straightforward usage of client libraries?
+
+If the answers to the above are all yes, then a new module may be a good approach.
+
+Otherwise, it is entirely possible for you to:
+
+* publish a code snippet
+* contribute an [example](../examples/README.md) to the Testcontainers repo
+* publish your own third party library
+
+In any case, please contact us to help validate your proposal!
+
+### Checklist
+
+*Suggestion: copy and paste this list into PRs for new modules.*
+
+Every item on this list will require judgement by the Testcontainers core maintainers. Exceptions will sometimes be possible; items with `should` are more likely to be negotiable than those items with `must`.
+
+#### Default docker image
+
+- [ ] Should be a Docker Hub official image, or published by a reputable source (ideally the company or organisation that officially supports the technology)
+- [ ] Should have a verifiable open source Dockerfile and a way to view the history of changes
+- [ ] MUST show general good practices regarding container image tagging - e.g. we do not use `latest` tags, and we do not use tags that may be mutated in the future
+- [ ] MUST be legal for Testcontainers developers and Testcontainers users to pull and use. Mechanisms exist to allow EULA acceptance to be signalled, but images that can be used without a licence are greatly preferred.
+
+#### Module dependencies
+
+- [ ] The module should use as few dependencies as possible, 
+- [ ] Regarding libraries, either:
+    - they should be `compileOnly` if they are likely to already be on the classpath for users' tests (e.g. client libraries or drivers) 
+    - they can be `implementation` (and thus transitive dependencies) if they are very unlikely to conflict with users' dependencies.
+- [ ] If client libraries are used to test or use the module, these MUST be legal for Testcontainers developers and Testcontainers users to download and use.
+
+#### API (e.g. `MyModuleContainer` class)
+
+- [ ] Favour doing the right thing, and least surprising thing, by default
+- [ ] Ensure that method and parameter names are easy to understand. Many users will ignore documentation, so IDE-based substitutes (autocompletion and Javadocs) should be intuitive. 
+- [ ] The module's public API should only handle standard JDK data types and MUST not expose data types that come from `compileOnly` dependencies. This is to reduce the risk of compatibility problems with future versions of third party libraries.
+ 
+#### Documentation
+
+- [ ] Every module MUST have a dedicated documentation page containing:
+    - [ ] A high level overview
+    - [ ] A usage example
+    - [ ] If appropriate, basic API documentation or further usage guidelines
+    - [ ] Dependency information
+    - [ ] Acknowledgements, if appropriate
+- [ ] Consider that many users will not read the documentation pages - even if the first person to add it to a project does, people reading/updating the code in the future may not. Try and avoid the need for critical knowledge that is only present in documentation.
+
+
+
+### Incubating modules
+
+We have a policy of marking new modules as 'incubating' so that we can evaluate its maintainability and usability traits over a longer period of time.
+We currently believe 3 months is a fair period of time, but may change this.
+
+New modules should have the following warning at the top of their documentation pages:
+
+!!! warning
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future.
+
+We will evaluate incubating modules periodically, and remove the label when appropriate.

From 3a0618511293a9e781a2eeb2bb42255a27f8295c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 06:28:12 +0000
Subject: [PATCH 0143/4969] Bump tomcat-jdbc from 9.0.21 to 9.0.22 in
 /modules/mariadb (#1600)

---
 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 0068368b8a3..a501b44f04d 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.2'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.21'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.22'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From d681aeef6f0d2987b6126dbc7382d6eb83fb7f3b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 07:29:15 +0000
Subject: [PATCH 0144/4969] Bump tomcat-jdbc from 9.0.21 to 9.0.22 in
 /modules/mysql (#1599)

---
 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 e2b1b416400..2540df73c3f 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.16'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.21'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.22'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 8f1421ad5310f75f371804c3a3a1402b0eaab6d4 Mon Sep 17 00:00:00 2001
From: "Roman S.A" <eaxdev@ya.ru>
Date: Mon, 15 Jul 2019 11:38:23 +0300
Subject: [PATCH 0145/4969] Kotlin example (#1521)

* add example using spring-boot + kotlin + kafka

* add project to settings.gradle

* using Gradle DSL instead Kotlin DSL

* using redis container instead kafka

* cleanups
---
 examples/settings.gradle                      |  3 +-
 .../spring-boot-kotlin-redis/build.gradle     | 28 ++++++++++++++
 .../com/example/redis/ExampleController.kt    | 27 ++++++++++++++
 .../com/example/redis/RedisApplication.kt     | 11 ++++++
 .../example/redis/AbstractIntegrationTest.kt  | 37 +++++++++++++++++++
 .../example/redis/RedisApplicationTests.kt    | 11 ++++++
 .../kotlin/com/example/redis/RedisTest.kt     | 29 +++++++++++++++
 7 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 examples/spring-boot-kotlin-redis/build.gradle
 create mode 100644 examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt
 create mode 100644 examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/RedisApplication.kt
 create mode 100644 examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
 create mode 100644 examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt
 create mode 100644 examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 3d57c2a18df..9efbf097344 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -12,4 +12,5 @@ include 'selenium-container'
 include 'singleton-container'
 include 'spring-boot'
 include 'cucumber'
-include 'spock'
+include 'spring-boot-kotlin-redis'
+include 'spock'
\ No newline at end of file
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
new file mode 100644
index 00000000000..f2d9d8d97ec
--- /dev/null
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -0,0 +1,28 @@
+plugins {
+    id("org.springframework.boot") version "2.1.5.RELEASE"
+    id("org.jetbrains.kotlin.jvm") version "1.3.31"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.3.31"
+}
+
+apply plugin: 'io.spring.dependency-management'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.springframework.boot:spring-boot-starter-data-redis")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.testcontainers:testcontainers")
+}
+
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = ["-Xjsr305=strict"]
+    }
+}
\ No newline at end of file
diff --git a/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt b/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt
new file mode 100644
index 00000000000..bbe3083935e
--- /dev/null
+++ b/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt
@@ -0,0 +1,27 @@
+package com.example.redis
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.data.redis.core.RedisTemplate
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class ExampleController {
+
+    private val key = "testcontainers"
+
+    @Autowired
+    private lateinit var redisTemplate: RedisTemplate<String, String>
+
+    @PostMapping("/set-foo")
+    fun setFoo(@RequestBody value: String) {
+        redisTemplate.opsForValue().set(key, value)
+    }
+
+    @GetMapping("/get-foo")
+    fun getFoo(): String? {
+        return redisTemplate.opsForValue().get(key)
+    }
+}
diff --git a/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/RedisApplication.kt b/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/RedisApplication.kt
new file mode 100644
index 00000000000..dc06c8004bf
--- /dev/null
+++ b/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/RedisApplication.kt
@@ -0,0 +1,11 @@
+package com.example.redis
+
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.runApplication
+
+@SpringBootApplication
+class RedisApplication
+
+fun main(args: Array<String>) {
+    runApplication<RedisApplication>(*args)
+}
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
new file mode 100644
index 00000000000..dc8b0bf9e68
--- /dev/null
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
@@ -0,0 +1,37 @@
+package com.example.redis
+
+import org.junit.runner.RunWith
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.util.TestPropertyValues
+import org.springframework.context.ApplicationContextInitializer
+import org.springframework.context.ConfigurableApplicationContext
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.junit4.SpringRunner
+import org.testcontainers.containers.GenericContainer
+
+@RunWith(SpringRunner::class)
+@SpringBootTest
+@ContextConfiguration(initializers = [AbstractIntegrationTest.Initializer::class])
+@AutoConfigureMockMvc
+abstract class AbstractIntegrationTest {
+
+    companion object {
+        val redisContainer = object : GenericContainer<Nothing>("redis:3-alpine") {
+            init {
+                withExposedPorts(6379)
+            }
+        }
+    }
+
+    internal class Initializer : ApplicationContextInitializer<ConfigurableApplicationContext> {
+        override fun initialize(configurableApplicationContext: ConfigurableApplicationContext) {
+            redisContainer.start()
+
+            TestPropertyValues.of(
+                "spring.redis.host=${redisContainer.containerIpAddress}",
+                "spring.redis.port=${redisContainer.firstMappedPort}"
+            ).applyTo(configurableApplicationContext.environment)
+        }
+    }
+}
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt
new file mode 100644
index 00000000000..aec5a486120
--- /dev/null
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt
@@ -0,0 +1,11 @@
+package com.example.redis
+
+import org.junit.Test
+
+class RedisApplicationTests : AbstractIntegrationTest() {
+
+    @Test
+    fun contextLoads() {
+    }
+
+}
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
new file mode 100644
index 00000000000..317916bd3e6
--- /dev/null
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
@@ -0,0 +1,29 @@
+package com.example.redis
+
+import org.hamcrest.CoreMatchers.containsString
+import org.junit.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
+
+
+class RedisTest : AbstractIntegrationTest() {
+
+    @Autowired
+    private lateinit var mockMvc: MockMvc
+
+    @Test
+    fun testRedisFunctionality() {
+        val greeting = "Hello Testcontainers with Kotlin"
+        mockMvc.perform(post("/set-foo").content(greeting))
+            .andExpect(status().isOk)
+
+        mockMvc.perform(get("/get-foo"))
+            .andExpect(status().isOk)
+            .andExpect(content().string(containsString(greeting)))
+    }
+}

From 0ccadb75402b6f4e994c90293ced152331bcd46c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2019 06:30:38 +0000
Subject: [PATCH 0146/4969] Bump cucumber-junit from 4.5.1 to 4.5.4 in
 /examples (#1614)

---
 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 505aad82ae4..733a2e6a8b7 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.5.1'
-    testImplementation 'io.cucumber:cucumber-junit:4.5.1'
+    testImplementation 'io.cucumber:cucumber-junit:4.5.4'
     testImplementation 'org.testcontainers:selenium'
 }

From fb1e91c71d44d6ffbd0f395b3eac0547e39eb581 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2019 07:58:06 +0000
Subject: [PATCH 0147/4969] Bump cucumber-java from 4.5.1 to 4.5.4 in /examples
 (#1615)

---
 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 733a2e6a8b7..fb3a1ae875c 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.5.1'
+    implementation 'io.cucumber:cucumber-java:4.5.4'
     testImplementation 'io.cucumber:cucumber-junit:4.5.4'
     testImplementation 'org.testcontainers:selenium'
 }

From 3dc9d9dc3a1d03b87707d6bff6a95e0fbf0a4510 Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Tue, 16 Jul 2019 04:48:56 -0500
Subject: [PATCH 0148/4969] Add DB2 module (#1611)

* Add db2 jdbc module

* Update Db2Container to use ibmcom/db2 image

* Add doc page on DB2 module

* Resolve review comments
---
 docs/modules/databases/db2.md                 |  47 +++++++
 modules/db2/build.gradle                      |   5 +
 .../containers/Db2Container.java              | 129 ++++++++++++++++++
 .../containers/Db2ContainerProvider.java      |  18 +++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 modules/jdbc-test/build.gradle                |   2 +
 .../testcontainers/jdbc/JDBCDriverTest.java   |   8 +-
 .../testcontainers/junit/SimpleDb2Test.java   |  39 ++++++
 .../container-license-acceptance.txt          |   1 +
 .../testcontainers/jdbc/ConnectionUrl.java    |   2 +-
 10 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 docs/modules/databases/db2.md
 create mode 100644 modules/db2/build.gradle
 create mode 100644 modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
 create mode 100644 modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
 create mode 100644 modules/db2/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java

diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
new file mode 100644
index 00000000000..b7871e636d0
--- /dev/null
+++ b/docs/modules/databases/db2.md
@@ -0,0 +1,47 @@
+# DB2 Module
+
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
+## Usage example
+
+Running DB2 as a stand-in for in a test:
+
+```java
+public class SomeTest {
+
+    @ClassRule
+    public Db2Container db2 = new Db2Container()
+        .acceptLicense();
+    
+    @Test
+    public void someTestMethod() {
+        String url = db2.getJdbcUrl();
+
+        ... create a connection and run test as normal
+    }
+```
+
+!!! warning "EULA Acceptance"
+    Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the DB2 image EULA, call the `acceptLicense()` method, or place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `ibmcom/db2:11.5.0.0a` (or, if you are overriding the docker image name/tag, update accordingly).
+    
+    Please see the [`ibmcom/db2` image documentation](https://hub.docker.com/r/ibmcom/db2) for a link to the EULA document.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:db2:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>db2</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
new file mode 100644
index 00000000000..a92631df264
--- /dev/null
+++ b/modules/db2/build.gradle
@@ -0,0 +1,5 @@
+description = "Testcontainers :: JDBC :: DB2"
+
+dependencies {
+    compile project(':jdbc')
+}
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
new file mode 100644
index 00000000000..6e45b0f7f12
--- /dev/null
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -0,0 +1,129 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.WaitingConsumer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.LicenseAcceptance;
+import org.testcontainers.utility.LogUtils;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
+
+public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
+
+    public static final String NAME = "db2";
+    public static final String DEFAULT_DB2_IMAGE_NAME = "ibmcom/db2";
+    public static final String DEFAULT_TAG = "11.5.0.0a";
+    public static final int DB2_PORT = 50000;
+
+    private String databaseName = "test";
+    private String username = "db2inst1";
+    private String password = "foobar1234";
+
+    public Db2Container() {
+        this(DEFAULT_DB2_IMAGE_NAME + ":" + DEFAULT_TAG);
+    }
+
+    public Db2Container(String imageName) {
+        super(imageName);
+        withPrivilegedMode(true);
+        this.waitStrategy = new LogMessageWaitStrategy()
+                .withRegEx(".*Setup has completed\\..*")
+                .withStartupTimeout(Duration.of(3, ChronoUnit.MINUTES));
+    }
+    
+    @Override
+    protected Set<Integer> getLivenessCheckPorts() {
+        return new HashSet<>(getMappedPort(DB2_PORT));
+    }
+    
+    @Override
+    protected void configure() {
+        // If license was not accepted programatically, check if it was accepted via resource file
+        if (!getEnvMap().containsKey("LICENSE")) {
+            LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+            acceptLicense();
+        }
+
+        addExposedPort(DB2_PORT);
+        
+        addEnv("DBNAME", databaseName);
+        addEnv("DB2INSTANCE", username);
+        addEnv("DB2INST1_PASSWORD", password);
+        
+        // These settings help the DB2 container start faster
+        if (!getEnvMap().containsKey("AUTOCONFIG"))
+            addEnv("AUTOCONFIG", "false");
+        if (!getEnvMap().containsKey("ARCHIVE_LOGS"))
+            addEnv("ARCHIVE_LOGS", "false");
+    }
+
+    /**
+     * Accepts the license for the DB2 container by setting the LICENSE=accept
+     * variable as described at <a href="https://hub.docker.com/r/ibmcom/db2">https://hub.docker.com/r/ibmcom/db2</a>
+     */
+    public Db2Container acceptLicense() {
+        addEnv("LICENSE", "accept");
+        return this;
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "com.ibm.db2.jcc.DB2Driver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return "jdbc:db2://" + getContainerIpAddress() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+    
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+    
+    @Override
+    public Db2Container withUsername(String username) {
+        this.username = username;
+        return this;
+    }
+    
+    @Override
+    public Db2Container withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+    
+    @Override
+    public Db2Container withDatabaseName(String dbName) {
+        this.databaseName = dbName;
+        return this;
+    }
+    
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+
+    @Override
+    protected String getTestQueryString() {
+        return "SELECT 1 FROM SYSIBM.SYSDUMMY1";
+    }
+}
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
new file mode 100644
index 00000000000..5c78fdc0505
--- /dev/null
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
@@ -0,0 +1,18 @@
+package org.testcontainers.containers;
+
+public class Db2ContainerProvider extends JdbcDatabaseContainerProvider {
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(Db2Container.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(Db2Container.DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new Db2Container(Db2Container.DEFAULT_DB2_IMAGE_NAME + ":" + tag);
+    }
+}
diff --git a/modules/db2/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/db2/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..d433ae9fc82
--- /dev/null
+++ b/modules/db2/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.Db2ContainerProvider
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 4c7ab8b0974..5874787e9eb 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -11,6 +11,7 @@ dependencies {
     compile project(':oracle-xe')
     compile project(':mssqlserver')
     compile project(':clickhouse')
+    compile project(':db2')
 
     testCompile 'com.google.guava:guava:18.0'
     testCompile 'org.postgresql:postgresql:42.0.0'
@@ -19,6 +20,7 @@ dependencies {
     testCompile 'com.oracle:ojdbc6:12.1.0.1-atlassian-hosted'
     testCompile 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8'
     testCompile 'ru.yandex.clickhouse:clickhouse-jdbc:0.1.41'
+    testCompile 'com.ibm.db2:jcc:11.1.4.4'
 
     testCompile 'com.zaxxer:HikariCP-java6:2.3.8'
     testCompile 'org.apache.tomcat:tomcat-jdbc:8.5.4'
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index 30b224ab6a6..0508a54e13d 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -65,6 +65,7 @@ public static Iterable<Object[]> data() {
                 {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override", EnumSet.of(Options.CustomIniFile)},
                 {"jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken)},
                 {"jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)},
             });
     }
 
@@ -109,7 +110,12 @@ public void test() throws SQLException {
     }
 
     private void performSimpleTest(HikariDataSource dataSource) throws SQLException {
-        boolean result = new QueryRunner(dataSource, options.contains(Options.PmdKnownBroken)).query("SELECT 1", rs -> {
+        String query = "SELECT 1";
+        if (jdbcUrl.startsWith("jdbc:tc:db2:")) {
+            query = "SELECT 1 FROM SYSIBM.SYSDUMMY1";
+        }
+
+        boolean result = new QueryRunner(dataSource, options.contains(Options.PmdKnownBroken)).query(query, rs -> {
             rs.next();
             int resultSetInt = rs.getInt(1);
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
new file mode 100644
index 00000000000..c686f979b79
--- /dev/null
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
@@ -0,0 +1,39 @@
+package org.testcontainers.junit;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.Db2Container;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+
+public class SimpleDb2Test {
+
+    @Rule
+    public Db2Container db2 = new Db2Container()
+        .acceptLicense();
+
+    @Test
+    public void testSimple() throws SQLException {
+        HikariConfig hikariConfig = new HikariConfig();
+        hikariConfig.setJdbcUrl(db2.getJdbcUrl());
+        hikariConfig.setUsername(db2.getUsername());
+        hikariConfig.setPassword(db2.getPassword());
+
+        HikariDataSource ds = new HikariDataSource(hikariConfig);
+        Statement statement = ds.getConnection().createStatement();
+        statement.execute("SELECT 1 FROM SYSIBM.SYSDUMMY1");
+        ResultSet resultSet = statement.getResultSet();
+
+        resultSet.next();
+        int resultSetInt = resultSet.getInt(1);
+        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+    }
+
+}
diff --git a/modules/jdbc-test/src/test/resources/container-license-acceptance.txt b/modules/jdbc-test/src/test/resources/container-license-acceptance.txt
index 8a704b9c066..4af979f0f18 100644
--- a/modules/jdbc-test/src/test/resources/container-license-acceptance.txt
+++ b/modules/jdbc-test/src/test/resources/container-license-acceptance.txt
@@ -1 +1,2 @@
 mcr.microsoft.com/mssql/server:2017-CU12
+ibmcom/db2:11.5.0.0a
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index 36206b89d82..e236d723c82 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -203,7 +203,7 @@ public Map<String, String> getTmpfsOptions() {
      * @author manikmagar
      */
     public interface Patterns {
-        Pattern URL_MATCHING_PATTERN = Pattern.compile("jdbc:tc:([a-z]+)(:([^:]+))?://([^\\?]+)(\\?.*)?");
+        Pattern URL_MATCHING_PATTERN = Pattern.compile("jdbc:tc:([a-z0-9]+)(:([^:]+))?://([^\\?]+)(\\?.*)?");
 
         Pattern ORACLE_URL_MATCHING_PATTERN = Pattern.compile("jdbc:tc:([a-z]+)(:([^(thin:)]+))?:thin:@([^\\?]+)(\\?.*)?");
 

From 371b32566ddb76e8779c802ae1ffa9afafdf5b59 Mon Sep 17 00:00:00 2001
From: Chung Nguyen <mr.mvagusta@gmail.com>
Date: Tue, 16 Jul 2019 17:13:44 +0700
Subject: [PATCH 0149/4969] catch exception when try to kill dead container
 (#1420)

Fixes #1379
---
 .../java/org/testcontainers/utility/ResourceReaper.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 46550dc0af7..086cac83206 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -231,6 +232,12 @@ private void stopContainer(String containerId, String imageName) {
                 LOGGER.trace("Stopping container: {}", containerId);
                 dockerClient.killContainerCmd(containerId).exec();
                 LOGGER.trace("Stopped container: {}", imageName);
+            } catch (ConflictException e) {
+                if ( e.getMessage().startsWith("Cannot kill container: ") && e.getMessage().endsWith(containerId + " is not running")) {
+                    LOGGER.trace("Was going to kill the container but it apparently already dead : {}", e.getMessage());
+                } else {
+                    throw e;
+                }
             } catch (DockerException e) {
                 LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped: {}", containerId, e.getMessage());
             }

From 041d5084c407d859f8740e052e1e9a36b080d2ea Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 16 Jul 2019 12:10:21 +0100
Subject: [PATCH 0150/4969] Upgrade localstack and enable new services (#1504)

* Add new services to the enum

Note: Some services need a newer Localstack version

* Upgrade Localstack and alter endpoint URL generation to be IP-only

Also extend basic tests to cover SQS

* Describe rationale for adding new Localstack tests (or not) (#1509)

* Update localstack to 0.9.4
---
 modules/localstack/build.gradle               |  1 +
 .../localstack/LocalStackContainer.java       | 49 +++++-----
 .../localstack/SimpleLocalstackS3Test.java    | 52 -----------
 .../localstack/SimpleLocalstackTest.java      | 93 +++++++++++++++++++
 4 files changed, 117 insertions(+), 78 deletions(-)
 delete mode 100644 modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackS3Test.java
 create mode 100644 modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 18a410ef1a8..e5e3efb5de3 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.479'
 }
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 319581e9f31..1bf0e18627d 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -28,7 +28,7 @@
  */
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
-    public static final String VERSION = "0.8.6";
+    public static final String VERSION = "0.9.4";
 
     private final List<Service> services = new ArrayList<>();
 
@@ -82,20 +82,11 @@ public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service s
         final String address = getContainerIpAddress();
         String ipAddress = address;
         try {
+            // resolve IP address and use that as the endpoint so that path-style access is automatically used for S3
             ipAddress = InetAddress.getByName(address).getHostAddress();
         } catch (UnknownHostException ignored) {
 
         }
-        ipAddress = ipAddress + ".nip.io";
-        while (true) {
-            try {
-                //noinspection ResultOfMethodCallIgnored
-                InetAddress.getAllByName(ipAddress);
-                break;
-            } catch (UnknownHostException ignored) {
-
-            }
-        }
 
         return new AwsClientBuilder.EndpointConfiguration(
                 "http://" +
@@ -123,23 +114,29 @@ public AWSCredentialsProvider getDefaultCredentialsProvider() {
     @Getter
     @FieldDefaults(makeFinal = true)
     public enum Service {
-        API_GATEWAY("apigateway",             4567),
-        KINESIS("kinesis",                 4568),
-        DYNAMODB("dynamodb",        4569),
-        DYNAMODB_STREAMS("dynamodbstreams",        4570),
+        API_GATEWAY("apigateway", 4567),
+        KINESIS("kinesis", 4568),
+        DYNAMODB("dynamodb", 4569),
+        DYNAMODB_STREAMS("dynamodbstreams", 4570),
         // TODO: Clarify usage for ELASTICSEARCH and ELASTICSEARCH_SERVICE
 //        ELASTICSEARCH("es",           4571),
-        S3("s3",                    4572),
-        FIREHOSE("firehose",                4573),
-        LAMBDA("lambda",                  4574),
-        SNS("sns",                     4575),
-        SQS("sqs",                     4576),
-        REDSHIFT("redshift",                4577),
-//        ELASTICSEARCH_SERVICE("",   4578),
-        SES("ses",                     4579),
-        ROUTE53("route53",                 4580),
-        CLOUDFORMATION("cloudformation",          4581),
-        CLOUDWATCH("cloudwatch",              4582);
+        S3("s3", 4572),
+        FIREHOSE("firehose", 4573),
+        LAMBDA("lambda", 4574),
+        SNS("sns", 4575),
+        SQS("sqs", 4576),
+        REDSHIFT("redshift", 4577),
+        //        ELASTICSEARCH_SERVICE("",   4578),
+        SES("ses", 4579),
+        ROUTE53("route53", 4580),
+        CLOUDFORMATION("cloudformation", 4581),
+        CLOUDWATCH("cloudwatch", 4582),
+        SSM("ssm", 4583),
+        SECRETSMANAGER("secretsmanager", 4584),
+        STEPFUNCTIONS("stepsfunctions", 4585),
+        CLOUDWATCHLOGS("cloudwatchlogs", 4586),
+        STS("sts", 4592),
+        IAM("iam", 4593);
 
         String localStackName;
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackS3Test.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackS3Test.java
deleted file mode 100644
index f00423d31b7..00000000000
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackS3Test.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.testcontainers.containers.localstack;
-
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.Bucket;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3Object;
-import org.apache.commons.io.IOUtils;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
-
-public class SimpleLocalstackS3Test {
-
-    @Rule
-    public LocalStackContainer localstack = new LocalStackContainer()
-            .withServices(S3);
-
-    @Test
-    public void s3Test() throws IOException {
-        AmazonS3 s3 = AmazonS3ClientBuilder
-                .standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
-                .withCredentials(localstack.getDefaultCredentialsProvider())
-                .build();
-
-        s3.createBucket("foo");
-        s3.putObject("foo", "bar", "baz");
-
-        final List<Bucket> buckets = s3.listBuckets();
-        assertEquals("The created bucket is present", 1, buckets.size());
-        final Bucket bucket = buckets.get(0);
-
-        assertEquals("The created bucket has the right name", "foo", bucket.getName());
-        assertEquals("The created bucket has the right name", "foo", bucket.getName());
-
-        final ObjectListing objectListing = s3.listObjects("foo");
-        assertEquals("The created bucket has 1 item in it", 1, objectListing.getObjectSummaries().size());
-
-        final S3Object object = s3.getObject("foo", "bar");
-        final String content = IOUtils.toString(object.getObjectContent(), Charset.forName("UTF-8"));
-        assertEquals("The object can be retrieved", "baz", content);
-
-    }
-}
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java
new file mode 100644
index 00000000000..f3495d2d8b6
--- /dev/null
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java
@@ -0,0 +1,93 @@
+package org.testcontainers.containers.localstack;
+
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.sqs.AmazonSQS;
+import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
+import com.amazonaws.services.sqs.model.CreateQueueResult;
+import com.amazonaws.services.sqs.model.Message;
+import org.apache.commons.io.IOUtils;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Set;
+
+import static java.util.stream.Collectors.toSet;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
+
+/**
+ * The only tests that should go here are for those Localstack services that require special testcontainers code to work with them.
+ * For example, S3 needs a test to ensure special HTTP routing to the S3 container works.
+ */
+public class SimpleLocalstackTest {
+
+    private static final String BUCKET_1 = "bucket1";
+    private static final String BUCKET_2 = "bucket2";
+    private static final String ITEM_KEY = "bar";
+    private static final String DUMMY_CONTENT = "baz";
+
+    @ClassRule
+    public static LocalStackContainer localstack = new LocalStackContainer()
+        .withServices(S3, SQS);
+
+    @Test
+    public void simpleS3Test() throws IOException {
+        AmazonS3 s3 = AmazonS3ClientBuilder
+            .standard()
+            .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
+            .withCredentials(localstack.getDefaultCredentialsProvider())
+            .build();
+
+        s3.createBucket(BUCKET_1);
+        s3.putObject(BUCKET_1, ITEM_KEY, DUMMY_CONTENT);
+
+        s3.createBucket(BUCKET_2);
+        s3.putObject(BUCKET_2, ITEM_KEY, DUMMY_CONTENT);
+
+        final Set<String> bucketNames = s3.listBuckets().stream()
+            .map(Bucket::getName)
+            .collect(toSet());
+        assertTrue("The created buckets have the right name",
+            bucketNames.contains(BUCKET_1) && bucketNames.contains(BUCKET_2));
+
+        assertBucketContentsCorrect(s3, BUCKET_1);
+        assertBucketContentsCorrect(s3, BUCKET_2);
+    }
+
+    private void assertBucketContentsCorrect(AmazonS3 s3, String bucketName) throws IOException {
+        final ObjectListing objectListing1 = s3.listObjects(bucketName);
+        assertEquals("The created bucket has 1 item in it", 1, objectListing1.getObjectSummaries().size());
+
+        final S3Object object = s3.getObject(bucketName, ITEM_KEY);
+        final String content = IOUtils.toString(object.getObjectContent(), StandardCharsets.UTF_8);
+        assertEquals("The object can be retrieved", DUMMY_CONTENT, content);
+    }
+
+    @Test
+    public void simpleSQSTest() {
+        AmazonSQS sqs = AmazonSQSClientBuilder.standard()
+            .withEndpointConfiguration(localstack.getEndpointConfiguration(SQS))
+            .withCredentials(localstack.getDefaultCredentialsProvider())
+            .build();
+
+        CreateQueueResult queueResult = sqs.createQueue("baz");
+        String queueUrl = queueResult.getQueueUrl();
+
+        sqs.sendMessage(queueUrl, "ping");
+
+        final List<Message> messages = sqs.receiveMessage(queueUrl).getMessages();
+
+        assertTrue("the message queue contains a message", messages.size() > 0);
+        assertEquals("the first message is the one we sent", "ping", messages.get(0).getBody());
+    }
+}

From 60b91b0b5b9331c5adfaddcf030d984033131c40 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 16 Jul 2019 13:12:45 +0200
Subject: [PATCH 0151/4969] Split AZP config into jobs rather than steps
 (#1613)

* Split AZP config into jobs rather than steps

* fix the modules task
---
 azure-pipelines.yml | 53 +++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index abcd155010d..d6efa593dcb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,21 +1,36 @@
-steps:
-- task: Gradle@2
-  displayName: Build core
-  inputs:
-    gradleWrapperFile: 'gradlew'
-    jdkVersionOption: '1.11'
-    options: '--no-daemon --continue'
-    tasks: 'testcontainers:check'
-    publishJUnitResults: true
-    testResultsFiles: '**/TEST-*.xml'
-- task: Gradle@2
-  displayName: Build modules
-  inputs:
-    gradleWrapperFile: 'gradlew'
-    jdkVersionOption: '1.11'
-    options: '--no-daemon --continue -x testcontainers:check'
-    tasks: 'check'
-    publishJUnitResults: true
-    testResultsFiles: '**/TEST-*.xml'
+jobs:
+- job: core
+  steps:
+  - task: Gradle@2
+    displayName: Build & test
+    inputs:
+        gradleWrapperFile: 'gradlew'
+        jdkVersionOption: '1.11'
+        options: '--no-daemon --continue'
+        tasks: 'testcontainers:check'
+        publishJUnitResults: true
+        testResultsFiles: '**/TEST-*.xml'
+- job: jdbc
+  steps:
+  - task: Gradle@2
+    displayName: Build & test
+    inputs:
+        gradleWrapperFile: 'gradlew'
+        jdkVersionOption: '1.11'
+        options: '--no-daemon --continue'
+        tasks: 'jdbc-test:check'
+        publishJUnitResults: true
+        testResultsFiles: '**/TEST-*.xml'
+- job: modules
+  steps:
+  - task: Gradle@2
+    displayName: Build & test
+    inputs:
+        gradleWrapperFile: 'gradlew'
+        jdkVersionOption: '1.11'
+        options: '--continue -x testcontainers:check -x jdbc-test:check'
+        tasks: 'check'
+        publishJUnitResults: true
+        testResultsFiles: '**/TEST-*.xml'
 
 

From d7852496526c0043a2a5e2c247d2da771bce0313 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 16 Jul 2019 12:56:59 +0100
Subject: [PATCH 0152/4969] Upgrade duct-tape library (#1433)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 30fd4d6167e..ee876f595c1 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -63,7 +63,7 @@ dependencies {
     compile 'org.apache.commons:commons-compress:1.18'
     // Added for JDK9 compatibility since it's missing this package
     compile 'javax.xml.bind:jaxb-api:2.3.1'
-    compile ('org.rnorth.duct-tape:duct-tape:1.0.7') {
+    compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 

From 1d6ab93f5881f34c5e9cec75954410fe2ac38e18 Mon Sep 17 00:00:00 2001
From: Wladimir Schmidt <wlsc@users.noreply.github.com>
Date: Tue, 16 Jul 2019 14:00:41 +0200
Subject: [PATCH 0153/4969] Bumped up default version of Confluent Platform to
 the current 5.2.1 (Kafka container) (#1446)

* Bumped up default version of Confluent Platform to the current 5.2.1

* Update KafkaContainerTest.java
---
 .../main/java/org/testcontainers/containers/KafkaContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 6396d6bcd7f..b1be94f1e67 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -20,7 +20,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
     protected SocatContainer proxy;
 
     public KafkaContainer() {
-        this("4.0.0");
+        this("5.2.1");
     }
 
     public KafkaContainer(String confluentPlatformVersion) {

From 03ba4c8f1efbb9308c11ee4340dc5681a9d1fa30 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 16 Jul 2019 13:52:29 +0100
Subject: [PATCH 0154/4969] Make test resilient to timing issues (#1375)

* Make test resilient to timing issues

* Update ContainerLogsTest.java

* Update ContainerLogsTest.java

* ignore the failing test

* Update ContainerLogsTest.java
---
 .../containers/output/ContainerLogsTest.java  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
index f95d5a06850..ad0e4c76ae2 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers.output;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -12,14 +13,26 @@
 public class ContainerLogsTest {
 
     @Test
+    @Ignore("fails due to the timing of the shell's decision to flush")
     public void getLogsReturnsAllLogsToDate() {
+        try (GenericContainer container = shortLivedContainer()) {
+            container.start();
+
+            final String logs = container.getLogs();
+            assertEquals("stdout and stderr are reflected in the returned logs", "stdout\nstderr", logs);
+        }
+    }
+
+    @Test
+    public void getLogsContainsBothOutputTypes() {
         try (GenericContainer container = shortLivedContainer()) {
             container.start();
 
             // docsGetAllLogs {
             final String logs = container.getLogs();
             // }
-            assertEquals("stdout and stderr are reflected in the returned logs", "stdout\nstderr", logs);
+            assertTrue("stdout is reflected in the returned logs", logs.contains("stdout"));
+            assertTrue("stderr is reflected in the returned logs", logs.contains("stderr"));
         }
     }
 
@@ -31,7 +44,7 @@ public void getLogsReturnsStdOutToDate() {
             // docsGetStdOut {
             final String logs = container.getLogs(STDOUT);
             // }
-            assertEquals("stdout and stderr are reflected in the returned logs", "stdout", logs);
+            assertTrue("stdout is reflected in the returned logs", logs.contains("stdout"));
         }
     }
 
@@ -43,7 +56,7 @@ public void getLogsReturnsStdErrToDate() {
             // docsGetStdErr {
             final String logs = container.getLogs(STDERR);
             // }
-            assertEquals("stdout and stderr are reflected in the returned logs", "stderr", logs);
+            assertTrue("stderr is reflected in the returned logs", logs.contains("stderr"));
         }
     }
 

From 30af86b8293d8200a50e9a7f1b7ecd873cfdbd45 Mon Sep 17 00:00:00 2001
From: martingreber <31406507+martingreber@users.noreply.github.com>
Date: Tue, 16 Jul 2019 23:04:48 +1000
Subject: [PATCH 0155/4969] Add rabbitmq (#1449)

* Added RabbitMQ module

Added RabbitMQ SSL option

* Added SSL option for RabbitMQ

* Update modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java

Co-Authored-By: martingreber <31406507+martingreber@users.noreply.github.com>

* Update modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java

Co-Authored-By: martingreber <31406507+martingreber@users.noreply.github.com>

* Fixed bug in enabling RabbitMQ plugin

* Changed builder methods to return RabbitMQContainer

* Replaced org.json with jackson

* Removed option to disable plugins. It shouldn't be needed

* Removed unused code

* Simplified wait condition

* Removed unused exception class

* Use try with resources for tests

* Fixed copy-paste comment bug from the Neo4JContainer. Cheers to the Neo4JContainer author, Michael J. Simons :)

* Removed getLivenessCheckPortNumbers() as the super implementation is sufficient

* Removed unnecessary wait from test

* Refactored methods returning URLs and json string generation

* Fixed bug with missing verify_peer option

* Restructured code for readability

* Add Lightbend to the Who is using list (#1464)

* accept image, not tag

* Update RabbitMQContainerTest.java
---
 modules/rabbitmq/build.gradle                 |   7 +
 .../containers/RabbitMQContainer.java         | 367 ++++++++++++++++++
 ...RabbitMQContainerJUnitIntegrationTest.java |  22 ++
 .../containers/RabbitMQContainerTest.java     | 233 +++++++++++
 .../test/resources/certs/ca_certificate.pem   |  20 +
 .../src/test/resources/certs/ca_key.pem       |  28 ++
 .../resources/certs/client_certificate.pem    |  19 +
 .../src/test/resources/certs/client_key.p12   | Bin 0 -> 2413 bytes
 .../src/test/resources/certs/client_key.pem   |  27 ++
 .../resources/certs/server_certificate.pem    |  21 +
 .../src/test/resources/certs/server_key.p12   | Bin 0 -> 2477 bytes
 .../src/test/resources/certs/server_key.pem   |  27 ++
 .../src/test/resources/certs/truststore.jks   | Bin 0 -> 1130 bytes
 .../src/test/resources/rabbitmq-custom.conf   |   2 +
 14 files changed, 773 insertions(+)
 create mode 100644 modules/rabbitmq/build.gradle
 create mode 100644 modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
 create mode 100644 modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
 create mode 100644 modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
 create mode 100644 modules/rabbitmq/src/test/resources/certs/ca_certificate.pem
 create mode 100644 modules/rabbitmq/src/test/resources/certs/ca_key.pem
 create mode 100644 modules/rabbitmq/src/test/resources/certs/client_certificate.pem
 create mode 100644 modules/rabbitmq/src/test/resources/certs/client_key.p12
 create mode 100644 modules/rabbitmq/src/test/resources/certs/client_key.pem
 create mode 100644 modules/rabbitmq/src/test/resources/certs/server_certificate.pem
 create mode 100644 modules/rabbitmq/src/test/resources/certs/server_key.p12
 create mode 100644 modules/rabbitmq/src/test/resources/certs/server_key.pem
 create mode 100644 modules/rabbitmq/src/test/resources/certs/truststore.jks
 create mode 100644 modules/rabbitmq/src/test/resources/rabbitmq-custom.conf

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
new file mode 100644
index 00000000000..7b9a5274a7e
--- /dev/null
+++ b/modules/rabbitmq/build.gradle
@@ -0,0 +1,7 @@
+description = "TestContainers :: RabbitMQ"
+
+dependencies {
+    compile project(":testcontainers")
+    testCompile "com.rabbitmq:amqp-client:5.7.0"
+    testCompile 'org.assertj:assertj-core:3.12.2'
+}
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
new file mode 100644
index 00000000000..98c2497c2dc
--- /dev/null
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -0,0 +1,367 @@
+package org.testcontainers.containers;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.lang.String.join;
+import static java.util.Arrays.asList;
+
+/**
+ * Testcontainer for RabbitMQ.
+ *
+ * @author Martin Greber
+ */
+public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
+
+    /**
+     * The image defaults to the official RabbitmQ image: <a href="https://hub.docker.com/_/rabbitmq/">RabbitMQ</a>.
+     */
+    private static final String DEFAULT_IMAGE_NAME = "rabbitmq";
+    private static final String DEFAULT_TAG = "3.7-management-alpine";
+
+    private static final int DEFAULT_AMQP_PORT = 5672;
+    private static final int DEFAULT_AMQPS_PORT = 5671;
+    private static final int DEFAULT_HTTPS_PORT = 15671;
+    private static final int DEFAULT_HTTP_PORT = 15672;
+
+    private String adminPassword = "guest";
+    private String adminUsername = "guest";
+    private final List<List<String>> values = new ArrayList<>();
+
+    /**
+     * Creates a Testcontainer using the official RabbitMQ docker image.
+     */
+    public RabbitMQContainer() {
+        this(DEFAULT_IMAGE_NAME + ":" + DEFAULT_TAG);
+    }
+
+    /**
+     * Creates a Testcontainer using a specific docker image.
+     *
+     * @param tag The docker image to use.
+     */
+    public RabbitMQContainer(String image) {
+        super(image);
+
+        addExposedPorts(DEFAULT_AMQP_PORT, DEFAULT_AMQPS_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
+
+        this.waitStrategy = Wait.
+                forLogMessage(".*Server startup complete.*", 1)
+                .withStartupTimeout(Duration.ofSeconds(60));
+    }
+
+    @Override
+    protected void configure() {
+        if (adminPassword != null) {
+            addEnv("RABBITMQ_DEFAULT_PASS", adminPassword);
+        }
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+
+        values.forEach(command -> {
+            try {
+                ExecResult execResult = execInContainer(command.toArray(new String[0]));
+                if (execResult.getExitCode() != 0) {
+                    logger().error("Could not execute command {}: {}", command, execResult.getStderr());
+                }
+            } catch (IOException | InterruptedException e) {
+                logger().error("Could not execute command {}: {}", command, e.getMessage());
+            }
+        });
+    }
+
+    /**
+     * @return The admin password for the <code>admin</code> account
+     */
+    public String getAdminPassword() {
+        return adminPassword;
+    }
+
+    public String getAdminUsername() {
+        return adminUsername;
+    }
+
+    public Integer getAmqpPort() {
+        return getMappedPort(DEFAULT_AMQP_PORT);
+    }
+
+    public Integer getAmqpsPort() {
+        return getMappedPort(DEFAULT_AMQPS_PORT);
+    }
+
+    public Integer getHttpsPort() {
+        return getMappedPort(DEFAULT_HTTPS_PORT);
+    }
+
+    public Integer getHttpPort() {
+        return getMappedPort(DEFAULT_HTTP_PORT);
+    }
+
+    /**
+     * @return AMQP URL for use with AMQP clients.
+     */
+    public String getAmqpUrl() {
+        return "amqp://" + getContainerIpAddress() + ":" + getAmqpPort();
+    }
+
+    /**
+     * @return AMQPS URL for use with AMQPS clients.
+     */
+    public String getAmqpsUrl() {
+        return "amqps://" + getContainerIpAddress() + ":" + getAmqpsPort();
+    }
+
+    /**
+     * @return URL of the HTTP management endpoint.
+     */
+    public String getHttpUrl() {
+        return "http://" + getContainerIpAddress() + ":" + getHttpPort();
+    }
+
+    /**
+     * @return URL of the HTTPS management endpoint.
+     */
+    public String getHttpsUrl() {
+        return "https://" + getContainerIpAddress() + ":" + getHttpsPort();
+    }
+
+    /**
+     * Sets the password for the admin (default is <pre>guest</pre>)
+     *
+     * @param adminPassword The admin password.
+     * @return This container.
+     */
+    public RabbitMQContainer withAdminPassword(final String adminPassword) {
+        this.adminPassword = adminPassword;
+        return this;
+    }
+
+    public enum SslVerification {
+        VERIFY_NONE("verify_none"), VERIFY_PEER("verify_peer");
+
+        SslVerification(String value) {
+            this.value = value;
+        }
+        private final String value;
+
+    }
+
+    public RabbitMQContainer withSSL(
+            final MountableFile keyFile,
+            final MountableFile certFile,
+            final MountableFile caFile,
+            final SslVerification verify,
+            boolean failIfNoCert,
+            int verificationDepth) {
+
+        return withSSL(keyFile, certFile, caFile, verify, failIfNoCert)
+                .withEnv("RABBITMQ_SSL_DEPTH", String.valueOf(verificationDepth));
+    }
+
+    public RabbitMQContainer withSSL(
+            final MountableFile keyFile,
+            final MountableFile certFile,
+            final MountableFile caFile,
+            final SslVerification verify,
+            boolean failIfNoCert) {
+
+        return withSSL(keyFile, certFile, caFile, verify)
+                .withEnv("RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT", String.valueOf(failIfNoCert));
+    }
+
+    public RabbitMQContainer withSSL(
+            final MountableFile keyFile,
+            final MountableFile certFile,
+            final MountableFile caFile,
+            final SslVerification verify) {
+
+        return withEnv("RABBITMQ_SSL_CACERTFILE", "/etc/rabbitmq/ca_cert.pem")
+                .withEnv("RABBITMQ_SSL_CERTFILE", "/etc/rabbitmq/rabbitmq_cert.pem")
+                .withEnv("RABBITMQ_SSL_KEYFILE", "/etc/rabbitmq/rabbitmq_key.pem")
+                .withEnv("RABBITMQ_SSL_VERIFY", verify.value)
+                .withCopyFileToContainer(certFile, "/etc/rabbitmq/rabbitmq_cert.pem")
+                .withCopyFileToContainer(caFile, "/etc/rabbitmq/ca_cert.pem")
+                .withCopyFileToContainer(keyFile, "/etc/rabbitmq/rabbitmq_key.pem");
+    }
+
+    public RabbitMQContainer withPluginsEnabled(String... pluginNames) {
+        List<String> command = new ArrayList<>(asList("rabbitmq-plugins", "enable"));
+        command.addAll(asList(pluginNames));
+        values.add(command);
+        return self();
+    }
+
+    public RabbitMQContainer withBinding(String source, String destination) {
+        values.add(asList("rabbitmqadmin", "declare", "binding",
+                "source=" + source,
+                "destination=" + destination));
+        return self();
+    }
+
+    public RabbitMQContainer withBinding(String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
+        values.add(asList("rabbitmqadmin", "declare", "binding",
+                "source=" + source,
+                "destination=" + destination,
+                "routing-key=" + routingKey,
+                "destination-type=" + destinationType,
+                "arguments=" + toJson(arguments)));
+        return self();
+    }
+
+    public RabbitMQContainer withParameter(String component, String name, String value) {
+        values.add(asList("rabbitmqadmin", "declare", "parameter",
+                "component=" + component,
+                "name=" + name,
+                "value=" + value));
+        return self();
+    }
+
+    public RabbitMQContainer withPermission(String vhost, String user, String configure, String write, String read) {
+        values.add(asList("rabbitmqadmin", "declare", "permission",
+                "vhost=" + vhost,
+                "user=" + user,
+                "configure=" + configure,
+                "write=" + write,
+                "read=" + read));
+        return self();
+    }
+
+    public RabbitMQContainer withUser(String name, String password) {
+        values.add(asList("rabbitmqadmin", "declare", "user",
+                "name=" + name,
+                "password=" + password,
+                "tags="));
+        return self();
+    }
+
+    public RabbitMQContainer withUser(String name, String password, Set<String> tags) {
+        values.add(asList("rabbitmqadmin", "declare", "user",
+                "name=" + name,
+                "password=" + password,
+                "tags=" + join(",", tags)));
+        return self();
+    }
+
+    public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Object> definition) {
+        values.add(asList("rabbitmqadmin", "declare", "policy",
+                "name=" + name,
+                "pattern=" + pattern,
+                "definition=" + toJson(definition)));
+        return self();
+    }
+
+    public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Object> definition, int priority, String applyTo) {
+        values.add(asList("rabbitmqadmin", "declare", "policy",
+                "name=" + name,
+                "pattern=" + pattern,
+                "priority=" + priority,
+                "apply-to=" + applyTo,
+                "definition=" + toJson(definition)));
+        return self();
+    }
+
+    public RabbitMQContainer withOperatorPolicy(String name, String pattern, Map<String, Object> definition) {
+        values.add(new ArrayList<>(asList("rabbitmqadmin", "declare", "operator_policy",
+                "name=" + name,
+                "pattern=" + pattern,
+                "definition=" + toJson(definition))));
+        return self();
+    }
+
+    public RabbitMQContainer withOperatorPolicy(String name, String pattern, Map<String, Object> definition, int priority, String applyTo) {
+        values.add(asList("rabbitmqadmin", "declare", "operator_policy",
+                "name=" + name,
+                "pattern=" + pattern,
+                "priority=" + priority,
+                "apply-to=" + applyTo,
+                "definition=" + toJson(definition)));
+        return self();
+    }
+
+    public RabbitMQContainer withVhost(String name) {
+        values.add(asList("rabbitmqadmin", "declare", "vhost",
+                "name=" + name));
+        return self();
+    }
+
+    public RabbitMQContainer withVhost(String name, boolean tracing) {
+        values.add(asList("rabbitmqadmin", "declare", "vhost",
+                "name=" + name,
+                "tracing=" + tracing));
+        return self();
+    }
+
+    public RabbitMQContainer withVhostLimit(String vhost, String name, int value) {
+        values.add(asList("rabbitmqadmin", "declare", "vhost_limit",
+                "vhost=" + vhost,
+                "name=" + name,
+                "value=" + value));
+        return self();
+    }
+
+    public RabbitMQContainer withQueue(String name) {
+        values.add(asList("rabbitmqadmin", "declare", "queue",
+                "name=" + name));
+        return self();
+    }
+
+    public RabbitMQContainer withQueue(String name, boolean autoDelete, boolean durable, Map<String, Object> arguments) {
+        values.add(asList("rabbitmqadmin", "declare", "queue",
+                "name=" + name,
+                "auto_delete=" + autoDelete,
+                "durable=" + durable,
+                "arguments=" + toJson(arguments)));
+        return self();
+    }
+
+    public RabbitMQContainer withExchange(String name, String type) {
+        values.add(asList("rabbitmqadmin", "declare", "exchange",
+                "name=" + name,
+                "type=" + type));
+        return self();
+    }
+
+    public RabbitMQContainer withExchange(String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
+        values.add(asList("rabbitmqadmin", "declare", "exchange",
+                "name=" + name,
+                "type=" + type,
+                "auto_delete=" + autoDelete,
+                "internal=" + internal,
+                "durable=" + durable,
+                "arguments=" + toJson(arguments)));
+        return self();
+    }
+
+    /**
+     * Overwrites the default RabbitMQ configuration file with the supplied one
+     *
+     * @param rabbitMQConf The rabbitmq.conf file to use
+     * @return This container.
+     */
+    public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
+        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.conf");
+        return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.conf");
+    }
+
+    @NotNull
+    private String toJson(Map<String, Object> arguments) {
+        try {
+            return new ObjectMapper().writeValueAsString(arguments);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("Failed to convert arguments into json: " + e.getMessage(), e);
+        }
+    }
+}
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
new file mode 100644
index 00000000000..ff71db44348
--- /dev/null
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
@@ -0,0 +1,22 @@
+package org.testcontainers.containers;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for basic functionality when used as a <code>@ClassRule</code>.
+ *
+ * @author Mrtin Greber
+ */
+public class RabbitMQContainerJUnitIntegrationTest {
+
+    @ClassRule
+    public static RabbitMQContainer rabbitMQContainer = new RabbitMQContainer();
+
+    @Test
+    public void shouldStart() {
+        assertThat(rabbitMQContainer.isRunning()).isTrue();
+    }
+}
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
new file mode 100644
index 00000000000..4f549a6f5ed
--- /dev/null
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -0,0 +1,233 @@
+package org.testcontainers.containers;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import org.junit.Test;
+import org.testcontainers.utility.MountableFile;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.*;
+import java.security.cert.CertificateException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.testcontainers.containers.RabbitMQContainer.SslVerification.VERIFY_PEER;
+import static org.testcontainers.utility.MountableFile.forClasspathResource;
+
+/**
+ * @author Martin Greber
+ */
+public class RabbitMQContainerTest {
+
+    public static final String DEFAULT_IMAGE = "rabbitmq:3.7-management-alpine";
+    public static final int DEFAULT_AMQPS_PORT = 5671;
+    public static final int DEFAULT_AMQP_PORT = 5672;
+    public static final int DEFAULT_HTTPS_PORT = 15671;
+    public static final int DEFAULT_HTTP_PORT = 15672;
+
+    @Test
+    public void shouldCreateRabbitMQContainer() {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+
+            assertThat(container.getDockerImageName()).isEqualTo(DEFAULT_IMAGE);
+            assertThat(container.getAdminPassword()).isEqualTo("guest");
+            assertThat(container.getAdminUsername()).isEqualTo("guest");
+
+            container.start();
+
+            assertThat(container.getAmqpsUrl()).isEqualTo(
+                    String.format("amqps://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQPS_PORT)));
+            assertThat(container.getAmqpUrl()).isEqualTo(
+                    String.format("amqp://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQP_PORT)));
+            assertThat(container.getHttpsUrl()).isEqualTo(
+                    String.format("https://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTPS_PORT)));
+            assertThat(container.getHttpUrl()).isEqualTo(
+                    String.format("http://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTP_PORT)));
+
+            assertThat(container.getHttpsPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTPS_PORT));
+            assertThat(container.getHttpPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTP_PORT));
+            assertThat(container.getAmqpsPort()).isEqualTo(container.getMappedPort(DEFAULT_AMQPS_PORT));
+            assertThat(container.getAmqpPort()).isEqualTo(container.getMappedPort(DEFAULT_AMQP_PORT));
+
+            assertThat(container.getLivenessCheckPortNumbers()).containsExactlyInAnyOrder(
+                    container.getMappedPort(DEFAULT_AMQP_PORT),
+                    container.getMappedPort(DEFAULT_AMQPS_PORT),
+                    container.getMappedPort(DEFAULT_HTTP_PORT),
+                    container.getMappedPort(DEFAULT_HTTPS_PORT)
+            );
+        }
+    }
+
+    @Test
+    public void shouldCreateRabbitMQContainerWithTag() {
+        try (RabbitMQContainer container = new RabbitMQContainer(DEFAULT_IMAGE)) {
+            assertThat(container.getDockerImageName()).isEqualTo(DEFAULT_IMAGE);
+        }
+    }
+
+    @Test
+    public void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+            container.withExchange("test-exchange", "direct");
+
+            container.start();
+
+            assertThat(container.execInContainer("rabbitmqctl", "list_exchanges").getStdout())
+                    .containsPattern("test-exchange\\s+direct");
+        }
+    }
+
+    @Test
+    public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+
+            container.withQueue("queue-one")
+                    .withQueue("queue-two", false, true, ImmutableMap.of("x-message-ttl", 1000));
+
+            container.start();
+
+            assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
+                    .containsPattern("queue-one");
+            assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
+                    .containsPattern("queue-two\\s.*x-message-ttl");
+        }
+    }
+
+    @Test
+    public void shouldMountConfigurationFile() {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+
+            container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
+            container.start();
+
+            assertThat(container.getLogs().contains("/etc/rabbitmq/rabbitmq-custom.conf")).isTrue();
+        }
+    }
+
+    @Test
+    public void shouldStartTheWholeEnchilada() throws IOException, InterruptedException {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+            container
+                    .withVhost("vhost1")
+                    .withVhostLimit("vhost1", "max-connections", 1)
+                    .withVhost("vhost2", true)
+                    .withExchange("direct-exchange", "direct")
+                    .withExchange("topic-exchange", "topic")
+                    .withQueue("queue1")
+                    .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                    .withBinding("direct-exchange", "queue1")
+                    .withUser("user1", "password1")
+                    .withUser("user2", "password2", ImmutableSet.of("administrator"))
+                    .withPermission("vhost1", "user1", ".*", ".*", ".*")
+                    .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
+                    .withPolicy("alternate exchange policy", "^direct-exchange", ImmutableMap.of("alternate-exchange", "amq.direct"))
+                    .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
+                    .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
+
+            container.start();
+
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "queues")
+                    .getStdout())
+                    .contains("queue1", "queue2");
+
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "exchanges")
+                    .getStdout())
+                    .contains("direct-exchange", "topic-exchange");
+
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "bindings")
+                    .getStdout())
+                    .contains("direct-exchange");
+
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "users")
+                    .getStdout())
+                    .contains("user1", "user2");
+
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies")
+                    .getStdout())
+                    .contains("max length policy", "alternate exchange policy");
+
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "operator_policies")
+                    .getStdout())
+                    .contains("operator policy 1");
+
+            assertThat(container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_shovel", "--quiet")
+                    .getStdout())
+                    .contains("rabbitmq_shovel is enabled");
+
+            assertThat(container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_random_exchange", "--quiet")
+                    .getStdout())
+                    .contains("rabbitmq_random_exchange is enabled");
+        }
+    }
+
+    @Test
+    public void shouldThrowExceptionForDodgyJson() {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+
+            assertThatCode(() ->
+                    container.withQueue(
+                            "queue2",
+                            true,
+                            false,
+                            ImmutableMap.of("x-message-ttl", container))
+            ).hasMessageStartingWith("Failed to convert arguments into json");
+
+        }
+    }
+
+    @Test
+    public void shouldWorkWithSSL() {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+            container.withSSL(
+                    forClasspathResource("/certs/server_key.pem", 0644),
+                    forClasspathResource("/certs/server_certificate.pem", 0644),
+                    forClasspathResource("/certs/ca_certificate.pem", 0644),
+                    VERIFY_PEER,
+                    true
+            );
+
+            container.start();
+
+            assertThatCode(() -> {
+                ConnectionFactory connectionFactory = new ConnectionFactory();
+                connectionFactory.useSslProtocol(createSslContext(
+                        "certs/client_key.p12", "password",
+                        "certs/truststore.jks", "password"));
+                connectionFactory.enableHostnameVerification();
+                connectionFactory.setUri(container.getAmqpsUrl());
+                connectionFactory.setPassword(container.getAdminPassword());
+                Connection connection = connectionFactory.newConnection();
+                Channel channel = connection.openChannel().orElseThrow(() -> new RuntimeException("Failed to Open channel"));
+                channel.close();
+                connection.close();
+            }).doesNotThrowAnyException();
+        }
+    }
+
+    private SSLContext createSslContext(String keystoreFile, String keystorePassword, String truststoreFile, String truststorePassword)
+            throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, KeyManagementException {
+        ClassLoader classLoader = getClass().getClassLoader();
+
+        KeyStore ks = KeyStore.getInstance("PKCS12");
+        ks.load(new FileInputStream(new File(classLoader.getResource(keystoreFile).getFile())), keystorePassword.toCharArray());
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+        kmf.init(ks, "password".toCharArray());
+
+        KeyStore trustStore = KeyStore.getInstance("PKCS12");
+        trustStore.load(new FileInputStream(new File(classLoader.getResource(truststoreFile).getFile())), truststorePassword.toCharArray());
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+        tmf.init(trustStore);
+
+        SSLContext c = SSLContext.getInstance("TLSv1.2");
+        c.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+        return c;
+    }
+}
diff --git a/modules/rabbitmq/src/test/resources/certs/ca_certificate.pem b/modules/rabbitmq/src/test/resources/certs/ca_certificate.pem
new file mode 100644
index 00000000000..f22df829095
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/certs/ca_certificate.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDRzCCAi+gAwIBAgIJAJJIMzvZuRzlMA0GCSqGSIb3DQEBCwUAMDExIDAeBgNV
+BAMMF1RMU0dlblNlbGZTaWduZWR0Um9vdENBMQ0wCwYDVQQHDAQkJCQkMCAXDTE5
+MDUwMjA3MjI0OVoYDzIxMTkwNDA4MDcyMjQ5WjAxMSAwHgYDVQQDDBdUTFNHZW5T
+ZWxmU2lnbmVkdFJvb3RDQTENMAsGA1UEBwwEJCQkJDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKko8FmfzrLHyZckvdR1oiSZf80m0t66TMqtLat1Oxjh
+CjsxvswwJ/m2I5dM48hwZ+0b2ufkvaudLPq/8jDGyONVfjMGlbe1YlmQMDC7YWdI
+XM1nCWAZIKaOHwIkfswuVBAdBVYV4Polu6wjVt5edEpl/IWEpPicXjLOY1Fw3q67
+5tP2Mmo6TJg5YqgB4fH4SmajtP3j+H4puQ8ZPIs26mInEgfCyrMWey/oQX8qqMph
+pKMEJYE7DHawriFraOooJadJYojbY5H27nmJe8yXURb3wSQSaKnFZL25cmVm2kue
+/lw+n+a2wLdHdU4cmghCURalhcXUNZe7UbdRZ9e9r2cCAwEAAaNgMF4wCwYDVR0P
+BAQDAgEGMB0GA1UdDgQWBBSZiNur/XHsqSfdWnB1NPi/ql5+tzAfBgNVHSMEGDAW
+gBSZiNur/XHsqSfdWnB1NPi/ql5+tzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQAar/db/T7izD4pyh2titl7Dkgp2iTditfgqRlU0yVGiiB6rLmY
+sYE2QAuFhgqyRLPcjVV8F39iRJHQ17SGT8e2iAaUTnbQj0AiskKjonF9+quKuVbr
+TpYHk+guS0Jn2rU6HK8WQeYZOh3WdLTu4ArXkxywgwVssQQ9JmpTd9YEYePWfs7i
+WZB6AQyL9CD3z1j4i1G4ft6pB1Ps5XjznqMZ2//7AUpoRTrettWqorPWwudQ9yna
+B4S6KtvpnxUQSeHJW6Q4NvTrOsvHEOCa6OtwYbWmLf+qbpPb8oHt9UF3ze2PJopB
+QzsQop1+gPudG0DX0SgyuQT+SsFjYlDazZdZ
+-----END CERTIFICATE-----
diff --git a/modules/rabbitmq/src/test/resources/certs/ca_key.pem b/modules/rabbitmq/src/test/resources/certs/ca_key.pem
new file mode 100644
index 00000000000..29ed148fb01
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/certs/ca_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCpKPBZn86yx8mX
+JL3UdaIkmX/NJtLeukzKrS2rdTsY4Qo7Mb7MMCf5tiOXTOPIcGftG9rn5L2rnSz6
+v/IwxsjjVX4zBpW3tWJZkDAwu2FnSFzNZwlgGSCmjh8CJH7MLlQQHQVWFeD6Jbus
+I1beXnRKZfyFhKT4nF4yzmNRcN6uu+bT9jJqOkyYOWKoAeHx+Epmo7T94/h+KbkP
+GTyLNupiJxIHwsqzFnsv6EF/KqjKYaSjBCWBOwx2sK4ha2jqKCWnSWKI22OR9u55
+iXvMl1EW98EkEmipxWS9uXJlZtpLnv5cPp/mtsC3R3VOHJoIQlEWpYXF1DWXu1G3
+UWfXva9nAgMBAAECggEAVHUVM5o/aDGp6+WzRa2Jy/47ueEFbaDUkGjQoYeBfxV0
+t0NKAMaWXu3abUM9gyjkKpU6wYcKT/HEsFk/gazuRdq8jJtgCv3r4c3E0b/sjNWr
+R/6Gxs0k6SOSRc6U5DrJS9ZBgM6hqiNGxVZLm/DK3Q54eu1UNLBVs8Yp/lJ9S/3C
+oM6lhex6SoCTiZyFb3ZvVTmBAZe/ROFXZAtmVac1KORBFN8FpkXQcB3EPTkvZmNJ
+sSp8dVPBLABm6gAbdJRLVqqndkHDPsopFGHLGzo4LtR7AlEklfxBdC/XlYmudZeY
+peWba+ZdLH3sCybE55Xcm7nTfRRSQSLDv++r73GCCQKBgQDe/7ltr8N+gWpb1fDC
+nEyBU4WHoTRp09sD+MZe3B06PX3WNRrf+3wHj9oB9UkhZ1baCq84mRzBiUKpAYrw
+GrC4iL4kqbWeIZzcJqLZ7zk1zzHzW0+zzNJSjzE8dq3W26+SnuLqKDFpkxtAyIMQ
+Rp9AZJIW8q9ay6ZCsZk/NNBoKwKBgQDCMYh53dXKiYtr6tAXXManWWpQ24af6WKl
+3faXCw5eXG7ic5bNZD7ql+DWJzRylkI4yeLDvWAsHprtyIBYmkRki3lBAnpLeHY8
+7XWjZeOVeIpiSbG+1Fo7LrOuWi3wYGOZ61QUTjqJhvZJpzZBMEgo7cx+WQhlrioI
+9BbXqPabtQKBgAZJv7jQE/slOxKL3dYfAilDaaiBazDwwGRER5O1MT3LLhk0NiXK
+uZyc+dDEUeOXPmO3mWlHKABtFmwdlwVeO014zaPLBUwINpwemsj6beqOhSIPmRfA
+1s1tLD5AOnasiy7fPBbOO1Z2x3X0MX3r/+GY9GWhQkCVLYMD7wZRPu8xAoGBAJMr
+PNW2s+ZJtPq1Orzp17dOAU+D/xPDqLoxbEbt3xbOEE7X8Mp5lWDudzt0/L92dntZ
+LNzQ8UiebSWVlQcQ6pIUTXFiMlJt2ZW1FDkf54kIkD+KwATyI+vEKfIRb81DD1i/
+yrmUy7IcMRyCd5CRya4TAa4jRUTh6ANfEMyhxTsdAoGBAIFub7nikxPQ8J4ItWq8
+EKOptyziJ38KnL2nZnFyVDu6uZDtSk9Tf1dHqWy8D4yP9K3OLshipEp7rnNG25dr
+e7fkB58K77eSoaEpCZmwzPZstwkXbeBl+DHerDyC2UBXwIUWWFq+FuCdRQqCoYmU
+OGiaT92l+UInN7VchZjJS7Oj
+-----END PRIVATE KEY-----
diff --git a/modules/rabbitmq/src/test/resources/certs/client_certificate.pem b/modules/rabbitmq/src/test/resources/certs/client_certificate.pem
new file mode 100644
index 00000000000..f6d75c8c272
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/certs/client_certificate.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDKDCCAhCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAxMSAwHgYDVQQDDBdUTFNH
+ZW5TZWxmU2lnbmVkdFJvb3RDQTENMAsGA1UEBwwEJCQkJDAgFw0xOTA1MDIwNzIy
+NDlaGA8yMTE5MDQwODA3MjI0OVowIzEQMA4GA1UEAwwHQzY1U1RUMjEPMA0GA1UE
+CgwGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtcAse1RO
+mRngQ4NNFFgyPgbq2eZc3c/ERKdg2xKi2XESMIbOreVkoBRq1IXoxkJHgQZJvPP8
+JbH7hmY+DFZcreszlEk5FI7bvxFNQM3CKsy2LeEcN9BTchSEsWgmSbwiZJ31kEB8
+u/i+/GpgTTxtwPWi/zTep+7fKM4dyzYX9WcMu8wif3jKIzqXVUqHpWopFUK9zLQf
+JRnyfiD2uYbfcZYopsIG+wdL2Ebgfr8fpc+YsWn0aA0zBiEFAKYh9bewPqDIZKyg
+qd4FKzeUaqGHynttNxKDJ9z0oD84PKFEOuryf7V8ODU8+kI1+y/+3C5Hlq6n92y6
+eSPn81W44+WZeQIDAQABo1cwVTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNV
+HSUEDDAKBggrBgEFBQcDAjAmBgNVHREEHzAdggdDNjVTVFQyggdDNjVTVFQyggls
+b2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggEBAH3oqsmr+hIfMEpZUolPNuAl43TF
+KUu14SeFyS+P8fEIQVGkHdpEpHzC0G+fvREAy4YSw0WE8upOq6tkbbjen222SP0J
+C2vj0B9cCPLZUQ4kW6Z7JJD/1qryML0XB9uMPHqDeV/yBETJZW80TV0f7p8GWKXe
++spu1W13rJ0jvQQd9anNEx3VhcKTwBIcTAhTHothxFLLhX1zb/oVZcl1riBopBFm
+WtrZRTCHs31o5GBnIs540uH0f2iCk7wUf8M/evxv5F1hms+NV7kfOz7fyCEXc9La
+P9pDjuxTNOUeOZH815BR9Lj71txY9AdjXqEXj7JdecACLsjHc+LMEP36cls=
+-----END CERTIFICATE-----
diff --git a/modules/rabbitmq/src/test/resources/certs/client_key.p12 b/modules/rabbitmq/src/test/resources/certs/client_key.p12
new file mode 100644
index 0000000000000000000000000000000000000000..15ce61136e2e1239cbaa457929f35f112bcbe72f
GIT binary patch
literal 2413
zcmV-z36l0Of(dB?0Ru3C2`>f-Duzgg_YDCD0ic2jAOwO5958|j7%+kZ&jtx9hDe6@
z4FLxRpn?OyFoFZT0s#Opf&;Y%2`Yw2hW8Bt2LUh~1_~;MNQU<f0So~KFb)I=KH!HT
zIv-N^0s;sCfPw>v%Bh-(W9{l+IbG`yBvCN|&Ak!+QiFM+MruD04P^_Gz6WoO9_YMv
zfhtMs>Cta|Oe%f|pT6Kxr*G&E|1LBYmPZ?OlRVtzRNk>8Lb~%7*n-Ozyza9qx^s2Y
znJ#))Xe8T-T{AZ_mVw4?*(K$r<}H%eH5)m%{Ym>NB`fj5M5nQ?h`}I5siUkL_DWbz
zg)881NNk^L^km2)2ynIk{sipBHhK`ge@Z}{S#y^kd+0r5>Dna95}gY6{Fr$yt1<TI
zSZI4vz0nPxSHh^o4J-0V%s=p$<@nhZU@lIcjXeD)cNe*Bt7uE?Zdz)8xBiEj3jT2t
z1H!iyB~Lodq0b3yDqsbYCmcD@Ln7gB6Mx(^ELf!C=IJjLgU<CwJ13NzVtM?{^%I>n
zY2|Q^Yjf)&9O5E2vpg1G$l#b8;UY!LQRu9p9RRPl#+&spgYAWK%*dq6Rs5sp6G*wD
zcKK?=1<(4AAvqTBVl;USq&*e|?#?Y!TMBMIAcH@Z_><sQcbdfk=iO)09wT02%~DTU
zHGN9Qzc07@@ZxoF;mb;WjvqSL_HjfxpVKP8F>K^zx5K`&t6@~=s2tjl)gsY>z4k7d
zsW80W!!V(v;t(-oRGj2~%atwd+ByOtVbBOMFWlp=Fnd6gOaYnw|5wcg^(={E>l}~Q
z#upC;6Xg?{R-9drEx`w9>ns0<f!u_p?*98D1Cb*0%@|HCt^|HK?vwjQMF_p}^7wn8
z-g^=Kw#*!-a?dCeStc*ux;c<)%nF}yJ&R8A#H7-U&0}uj$=I+=$}D#xXvP@A8fK1o
zVavn1jS=a97JT)9z3Ext*b?FjS;5i}vZ+X}SFQPy<3;9Mc%R^iQR05)vFHDXK_eW3
zGC=o!`#e1%5KG`m=IUgVFwzTwnp-eo5wsl!X7gv2z+!(OBB=Wp3>Af!v}H^Um=0AA
zfXv4U8#Y*PaKj|M%VZ2kucoB<d8jJP-niGP1t`xXt1hdrs%mSl-n4L*wU)HuSwz==
z)EOuPh}8}$2(n-$(~EMx<j4e-Wt4u0-9{-bY2~%ns;B2+)83cBdou_~2Zb3LlCmLP
z)2fBsv5Een^Wuiihq(5&(4)hrSgW{TzW$q)e}xe5JZ27E=AM*)s`z$5`wz#3zo>ff
z=FC5F(7Eu7hfS2V-*fb-^ZY&H>l1r`eiKJqyFc07FoFd^1_>&LNQU<f0S5t~f(0@J
zf(0%xf(0rtf(0f93o3?4hW8Bt3<?1Ppn?SMFoFc?FdPO7Duzgg_YDCI0Ru1&1PI=-
zRi!FnK+^&O2ml0v1jwEZL2p#o#6CFhxc{EV+FTb!lf$n7Je!+6n_0Z1jy2Cs*t7Ps
z@<V<S-)Tlbo2;VK^&xwe3`#E|cybw3>q@zV>Dk5PUP@L3N-O@u-*8OD*B}h`b=II0
zD9RUNvqqgbb1v#|gm)~e5eHp2ZmMd=F;}qx!#mBv<pICAA)JIK=d-Q9uzl+xef)jA
zKq*{^cI4s`xnu1TB%@zWDH+e#R2JV(Pydf6@+)KDaPg|TKLdycOIJA&-_HDUTIRQ%
z9{J}Wq@(GJanXMYC<U>_X1B;B0>pD@J5IIFzl4!Y5tg!X-6&8*CI?6eYv!V=q;KRL
zg4705KDI=zmqKs$mcLu<QU*CR+NH!?RiGi!X=bz9ea0END<+>Dn+T@Yj1G<a*xY<9
zyh;VGyJ7y9;-*WOP}#^lXvnO+dpN1=d$ytOiOq~g#d)~}(zuHgn=0-V6(eBQR<yf?
zqE76br{{&-9t>fYYO;cQ(NJB6;(`~$zwVoJk*&e!?d4Jlja&QiGr_YMjDIH_gw;ys
z^xqC-Ao6!4K;+c4Uq(LykDfKyga$Z;GAd{T0(`^*a&77(5mob^t?GM62C>}J5|l(d
zh5>N54N!e9zuNudN+Iu#wvI|7280n5Blw<n%4GO+amb|p-8Umq<-?#vr_`|88U616
z?0W&|>KUyDvKojKWV;p=FEMWq3cYVaMVlhQJ1hgnryW$iw_o@>TaZKgtoab+mXbTX
z4|}c$iik1v<_Ftzx$xxOG4zi8p$>QGcx`?|L5i+LWIc*_*!NsUw(nO;&|ees&<Iby
zql^g6w)0o4_M)P+Z!2L#>oF<;8hBf2_kED6UcjXjNpUWs#fDZg;@q0L#v-w`K+Z1m
zhZedEQYH-P1lb_=yrq8u8TTvW-y2V+i2*XlNLcP2CSKjTik&PoOKXz)nEJ^~GkbZ-
z49*#=#kw=h0AZR`;5>v=4p4VCht|dF#_<1orA7OtjhuwXIlGZ;b_%)~HK{_&CE>&~
zI6d+^58awkWf<WhJP$kLJ@HyWo`Cm$DT{Wc%r5KhXK9D|7K2IeD*3$CB8Ni@vTl3@
zp5A<-43Gkq+QLc&zmO<T7S4Y_*VeE#^&dNblB3mhXZeqTgF9o*SamW3&6VKg7n^9!
z7-Xkxf0+I2M_dwg{`x{=_>I9VseyOok3Tzkc`1q`kbgPI<=_YW)u#86voE;N_qoYk
zT%yW;_SKzW!fY>ggQ|*HecL$>!kn8IegsU`;CBfy%(M>vVY`WHT?$&kpj(&IoHr7v
z-gF)u%NvDNa(yt2H1?6-*}sB1g8RKB{5fyMmiU^<&bw#|(YeUt%!Qsj^B*+AsSqnp
zQ!-PW@(xNl+n<rGHejyCoLd++#pQ3kTt^dMZ`#xi%X`w0H_@EY%RFF67HmOvTDJRq
z1FsI*f?pIqWS%^9CP;XwA83VX2zBp1PP^I!-N+SLFZ`p$wlZi;jjhNron^Gvk`fzh
z)nH|Zfn7jWYE6f36Sj4s<hioGwsN2iIk+l>29YDEAAjbr^<b|*P5Vf?ZD8n{`|sCG
zoJrhZO0ZarVJNhHVXUlfYv8t8zzFy#HqF~!rc}-lybyxRv?M5?`C>68Fe3&DDuzgg
z_YDCF6)_eB6kegeOg%QrJPxk^Fin5M<7Dh2MldljAutIB1uG5%0vZJX1Qd=N$aJWC
fIBp#V<a?z|TpxrhJ0k=LJGc{+?5WmC0s;sCY8r#_

literal 0
HcmV?d00001

diff --git a/modules/rabbitmq/src/test/resources/certs/client_key.pem b/modules/rabbitmq/src/test/resources/certs/client_key.pem
new file mode 100644
index 00000000000..f05f935588d
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/certs/client_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAtcAse1ROmRngQ4NNFFgyPgbq2eZc3c/ERKdg2xKi2XESMIbO
+reVkoBRq1IXoxkJHgQZJvPP8JbH7hmY+DFZcreszlEk5FI7bvxFNQM3CKsy2LeEc
+N9BTchSEsWgmSbwiZJ31kEB8u/i+/GpgTTxtwPWi/zTep+7fKM4dyzYX9WcMu8wi
+f3jKIzqXVUqHpWopFUK9zLQfJRnyfiD2uYbfcZYopsIG+wdL2Ebgfr8fpc+YsWn0
+aA0zBiEFAKYh9bewPqDIZKygqd4FKzeUaqGHynttNxKDJ9z0oD84PKFEOuryf7V8
+ODU8+kI1+y/+3C5Hlq6n92y6eSPn81W44+WZeQIDAQABAoIBAQCooWMkEnbSakW/
+niV4CNSk5DombiwfyVOq9zlQSZw670QXLhy5D6srM4ZjJNNyj7BUMAdef2mld9uN
+OXO8cqyO2TkEDmQdhOayAlWRGNdcao9lRgWua2Xg5NSw3ZcYtquae0yJyKtypDpf
+bDtprfWPINlYvC8R1PnMnGDcWJYmIyQyQuB2OJVCJ4ayhS4miBk91fR0T0yMhmlZ
+RKZWbECvQirwA1podKvVSpwhAEUlLkVWRqVVYkiadWoXc8u6Dg2NrI9KNCgk2/3W
+m8sVC9VgjkXw5L8cToTBmTrjRS831O0JR1iDuZIzbwliJhGtVcHtiTUvybu3boYL
+R4F9Z4fhAoGBAN0h+7yBIr7TvCXyURfemWrcWBYWmMwlr6GdcE0WACnUUiFL7aQs
+0Mo5DWnwUG74hk1E8TG6oRU9oJs+69295cXe1m6wUwZySh4qlqfFEwnB2PzZwGrS
+FnRrCnJGiyLfY5v5hFlzWl/APtuxXGMa3S+ehbtFBhvLfN6vmSPpBTzNAoGBANJo
+iM6AK+ldkbi9SCES8zMWPLNWrEh7SiA+bItyoKOY275TUUxVLz0MP2S1B2yGo9Og
+fe6fWGeXfMgcL7+1q2cwMuieIaG5Qcs4u+3qJNVmerf5PlMJUkN7D3Prw1C73SLq
+cQVaRXs4LBpmMC5ajOODrZt/GdrRrn2D13kQKI9dAoGAaqTW+MP2c709Qbeo8DAE
+IQr+2DgxnFKYbwK0hBiWH5Yrva8WflS2pK/7Dho9UCc+7cjP4UG2Kb481GH18kyA
+oXqkQ2F5yOQZZo73dRWP5ua7tMV3DI0hEygEM7RdqYW+Thx5fYIqFX9rURwqCAmO
+nkZ/DB9voLv0Dpj06+KXCgkCgYAmigck680fPYhHckQX6sSpAtWzc5iy3gJBza1M
+DX7m+ESno9MsTB4O7INgCtiFRFQVmzv1zTIAJ3svnBoS30+54tYwTWaTnL80Xfvu
+JAkDHXY05G5J/1cWDSBTd0ebLg3fK1nwRQyc+Tj6zOTeWK+drKzL4of10JpJWzDI
+d/E18QKBgQC9IIZ5oc30NL5Ie5ypcHG4xrim6OR0akeDDeZfV6BrhOnpdi8l4aIC
+Jswilj/PQF657s5trujxN3YxUeCunCtuOqcrE0O5AAL4CTQGy3LIq4IGYWGV/19I
+ZTyM0Bf5iPEpVYLTflf9wW2UElPw4Uz2+ky0mKBhtRBYMAYAR0NvfA==
+-----END RSA PRIVATE KEY-----
diff --git a/modules/rabbitmq/src/test/resources/certs/server_certificate.pem b/modules/rabbitmq/src/test/resources/certs/server_certificate.pem
new file mode 100644
index 00000000000..8a783183380
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/certs/server_certificate.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDajCCAlKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAxMSAwHgYDVQQDDBdUTFNH
+ZW5TZWxmU2lnbmVkdFJvb3RDQTENMAsGA1UEBwwEJCQkJDAgFw0xOTA1MDIwNzIy
+NDlaGA8yMTE5MDQwODA3MjI0OVowIzEQMA4GA1UEAwwHQzY1U1RUMjEPMA0GA1UE
+CgwGc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqR0QXKtb
+KVeEuCmZGcZAlAlTBC8E/G3UuX6qKwTR1xEOvUWeBH1n0WeXXGd/p/y6P4lRBeWN
+BZ9KcvIlNDeDMy05NfxnO1vnJk9E8/0xwMiY1LJdMHzIzhmrrqXo0u3DT8MmoNR6
+7CTcnG21gi1GrjW8a747yFF0xfukEc6FkyVqLsjtCkHPwrc/sBHVS3aivNWGkJzA
+eBXBdWJAg3ZC6T9U+Y8cndWQrpYMJvek1IewlyDSspHZDFmM1OwVwypnMt4fGgaX
+5IlUMnNgKmisOSuI529rxLF+mvYIQLRl5bP+1/c9JD5MZ5krA3SrjdwRFS3sQXC3
+nuHqJofFXNkbXQIDAQABo4GYMIGVMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMBMG
+A1UdJQQMMAoGCCsGAQUFBwMBMCYGA1UdEQQfMB2CB0M2NVNUVDKCB0M2NVNUVDKC
+CWxvY2FsaG9zdDAdBgNVHQ4EFgQURq22sa46tA0SGHhEm9jxGP9aDrswHwYDVR0j
+BBgwFoAUmYjbq/1x7Kkn3VpwdTT4v6pefrcwDQYJKoZIhvcNAQELBQADggEBAKUP
+7RgmJyMVoHxg46F1fjWVhlF4BbQuEtB8mC+4G4e68lDU/TPAbmB3aj91oQDgBiTd
+R2O7U6tyitxxrU2r7rFAHGhFHeyCQ3yZMwydO2V3Nm2Ywzdyk8er4yghjg9FS8tH
+egDGDDod3l1yrAbHHuXmzDjnAFwHwRkm5cYUz00/IuZ3sQZ70XofL3KXNj1tAtfK
+PSpdSAxSTO99ofjVKjlyywQSZKNbXfqD5DGz8e0rmqPfZ+3zi75E5nEuJ3UI2wXg
+LuI4j6FIzNQyei/FdSynktcIm+hefQEyex4cho4C8RYB2S5S8RWrnP9jOzsaQFHn
+bHXf7dKwRfA6/u8JmtQ=
+-----END CERTIFICATE-----
diff --git a/modules/rabbitmq/src/test/resources/certs/server_key.p12 b/modules/rabbitmq/src/test/resources/certs/server_key.p12
new file mode 100644
index 0000000000000000000000000000000000000000..8d97d92e2b2ac9828aa022883e9b08eb0e4482a4
GIT binary patch
literal 2477
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

literal 0
HcmV?d00001

diff --git a/modules/rabbitmq/src/test/resources/certs/server_key.pem b/modules/rabbitmq/src/test/resources/certs/server_key.pem
new file mode 100644
index 00000000000..dfbfb6db7e3
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/certs/server_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAqR0QXKtbKVeEuCmZGcZAlAlTBC8E/G3UuX6qKwTR1xEOvUWe
+BH1n0WeXXGd/p/y6P4lRBeWNBZ9KcvIlNDeDMy05NfxnO1vnJk9E8/0xwMiY1LJd
+MHzIzhmrrqXo0u3DT8MmoNR67CTcnG21gi1GrjW8a747yFF0xfukEc6FkyVqLsjt
+CkHPwrc/sBHVS3aivNWGkJzAeBXBdWJAg3ZC6T9U+Y8cndWQrpYMJvek1IewlyDS
+spHZDFmM1OwVwypnMt4fGgaX5IlUMnNgKmisOSuI529rxLF+mvYIQLRl5bP+1/c9
+JD5MZ5krA3SrjdwRFS3sQXC3nuHqJofFXNkbXQIDAQABAoIBAA0dxvYZCEIFmrKZ
+71jzanDQ5FJvvyhA8H3OmC4r+oZ+uTDu5FmezF2OdkvhbyI9VMi2wsT9T9m+yAxw
+QXhyUce3WzeXsv4Em8H55fQykBhOtqPQja/EDeMGVK2ACrXJYRufnDBfKoWEOmQb
+kjddgZzjaBDHOWXJA5CTet8ysGOAJBTxyzU69k5Vj9B5abG9CofNzGOFF+Uleff5
+ip3sz7JpDXCex3oEs98veco6+8i/MZNo3BnwB5J+P+2MFFKONfPwuNyKAWBza2/X
+66Lk3xXBjLJJ+Ww16jkqueTXEq6GCFXavNfdL9aonth5V5YYR/cj+2u2LM1oj9cJ
+bp0xbvUCgYEA2Svq1DyR9cfTwrbc/0J2JfrjavClzDYU2oeO2fSU85WEEjJguaja
+17Vdo/UsJtiUiSq4UhI1n0haaIpTBCeF2tHGXVEYZ7ZBi1zzdWbWlDxFmi+rcE57
+ytx5w+iLE366tQEMa/Jn3bly54pG5JZAr9TXkpg9sMbzWZri2ocyU/cCgYEAx1l/
+9X9C/OruDp/MhhmVwKfw/X2+RhZRuv0pPcpJu7/gIoLgaxNj41XSeLqLYMlisaRk
+GFU17GFXtfRGE1a3z+jj8UPTP2sHk3w8m0yI+pgWgsvG0TJ0B+XsRfpVxFiIoaEs
+3AsBaGR+hrRY1dpaJ9Cu3J9mEeToTpbCzPzVDksCgYEAzwSvWNvYY4u2UFHSvz2S
+tMfBzCpUUiNno50/ToN5De4ENPhy/eh5nNDVz7qh+PHSPiNMC2gyV4E4NZlOY5Jt
+Zdc8ma35brvtJTVZGxwKBsqhqsYwTeFy3kFnjZn6IX5X6r1yIuCzpEfowdEtnS+h
+wDtLuAGKJR6x0UP1Zk0ka6cCgYBGE6I1rJzhx7wTi/0bjtbjuKWwlolSnfnxH5ll
+zTyKMXMa7qLxQQm2Gq84HWtthJ2bEMzW+O1RwQ5SOiKAHdXT0mx+nXcfLgKlx+CO
+PyNP5DLVm8iyNWgwdpTOLKgFs5GkL8JTP9Mo3VrVA4TO+EkFAgjWKXp6A9vd9IVa
+Be7nbQKBgAVtFKuf9nbCMfN+W1gN0vlW2lwxCTa4w0KHgIlGIIvnYVuixSgu9fGt
+uylQcQirEjqrdzdVF9L2BQ37ZcLaGh1LoCmx8XVCX/HhbwW2RP798P3Z1P7htm16
+ha5OfuPjHvoZklbYJo6EORJZQehS2VP63pjdnmUeMHPFzrPUevI5
+-----END RSA PRIVATE KEY-----
diff --git a/modules/rabbitmq/src/test/resources/certs/truststore.jks b/modules/rabbitmq/src/test/resources/certs/truststore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..84fce84266ba154fc2278b4ef033811f2b292af7
GIT binary patch
literal 1130
zcmV-w1eN<Rf&^v)0Ru3C1Rn+oDuzgg_YDCD0ic2e5Cnn*3^0NO2rz;K1O^EzhDe6@
z4FLxRpn?PSFoFZ|0s#Opf&=OX2`Yw2hW8Bt2LUiC1_~;MNQU<f0So~KFdGCE&3fP0
z3KPMHP3HP4joQYKE<T7S0s{cUP=JC1uz!!S*M-`1spL^!u8q_#=Z>Wumexf~g<eJM
zA?q3mMmvX)u0i6MKQAs+3fNXbtMhr_eXph;khuW1UwiNHLlN?CGp6iq+~YzIJyD4j
zltXyjh=}OEsIV%*N(#drzp``+SsD8*WJhV$aliS3v+<;oj;E6!Uy5)SgBJhdR;jJP
zNj*PPsOB}*r118P6)nsX-hC{6WWd_iB5sFrM@1<=oBvM8?H{!*j~7P!Zb&T|Y_p3p
zy*|w3402U=>MGVwZ001T`xi))j-ZQ$EOubqh*D$*)ZW)X?JjRo#e&H>7ZbPkK?aM3
zxgT?kuIy=K6Pi=M$2Ru7E->F5Tv$NkFFj+L|3XLVnctX2*VbI^To?RrMJtBfAG_UN
zX8pY${t+sgfs-Rh=LR7d6O391Xce>OClLOoi60u)%NqM*1)S=b@V)Oi1wU*3PWAL1
z_tO_teeLE0uWZe^vilB$a~iOfEt@x9WQbK3b1RCl;!4S~>L{`x{lKB*3RVVO@I9ca
zWLnX10d34+24&<jB*ML<C>a)|`Ubk62WhcJcL=P8kSCH?h0pM3Fs>et!_yv&^^&Fr
zsjc>(rm0!s2<72ij@Xa9=d-`Wd7DqCeor6h1`2%a8VljL66Vx=eL^>EZ!&HVH`aGO
zr!D6UPjx1DpyL~flTF1TkY8!L;Ba*pCts5Q2C0e*QuY?~Ooqc_h1_ru`&_W}9a!3V
zC^gOmiYX9vxc92-yWL875hvPW&E$#42@d@%ga0X8N0mBMiN?{L2OlPLkIugriPF*7
zO2?`!76&`E+Q@eoO~)2fP64ks9cD6#LGv;5*Jx{0aT?xYG6VbP*mm_{Zh*disBhjT
zq+iL4)tSQ%Qwtolmqa{^qALv+#|PM@+v2^v#l*zWhk5SkH*52{@{Xx=ykh(x#qaU4
zj|~vV$2S0}9i{iYMRP_xMq2?m{o4R5#9lP)TUO%GfAR1g@7G000kvzD`j~BTjUD<z
ziKhH-J>Jr`nDNcD5{Lhyi*Pe62;2`fjeDhD^wXmsPnQ>EZCOF*0B<h6KS&SYqo!Ql
z?wk!R0wynAf?|PifgB~}JWjg=AR%I7v(_yy)VrnJ44dU$LBSQ~u4w^jHz^LkF3V|J
z9F)6sw?1aMC$<eaqjk*bz2XHbsVp)eO6e#~FQ(c!@5d7A$#+19n|XGuoZdp)9fZeV
z+~9&*V(Ukp7icQ_zV2mTz!4aP6OD&1%v8~W4n3jfM=(AxAutIB1uG5%0vZJX1QhGJ
w^kDV=!~_!%w5H(Z(~QxVoEZcZb7IL0bC#Y%tAsg+#w8Qj7$Mor0s{etpvpWAp8x;=

literal 0
HcmV?d00001

diff --git a/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
new file mode 100644
index 00000000000..2e93b89bb13
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
@@ -0,0 +1,2 @@
+loopback_users.guest = false
+listeners.tcp.default = 5555
\ No newline at end of file

From 831d24498fd5e324a6f605cd1b37dc501f69e8dd Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 16 Jul 2019 16:32:12 +0200
Subject: [PATCH 0156/4969] increase db2 timeout (#1617)

---
 .../containers/Db2Container.java              | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 6e45b0f7f12..429cc060094 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -36,14 +36,14 @@ public Db2Container(String imageName) {
         withPrivilegedMode(true);
         this.waitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*Setup has completed\\..*")
-                .withStartupTimeout(Duration.of(3, ChronoUnit.MINUTES));
+                .withStartupTimeout(Duration.of(10, ChronoUnit.MINUTES));
     }
-    
+
     @Override
     protected Set<Integer> getLivenessCheckPorts() {
         return new HashSet<>(getMappedPort(DB2_PORT));
     }
-    
+
     @Override
     protected void configure() {
         // If license was not accepted programatically, check if it was accepted via resource file
@@ -53,11 +53,11 @@ protected void configure() {
         }
 
         addExposedPort(DB2_PORT);
-        
+
         addEnv("DBNAME", databaseName);
         addEnv("DB2INSTANCE", username);
         addEnv("DB2INST1_PASSWORD", password);
-        
+
         // These settings help the DB2 container start faster
         if (!getEnvMap().containsKey("AUTOCONFIG"))
             addEnv("AUTOCONFIG", "false");
@@ -93,30 +93,30 @@ public String getUsername() {
     public String getPassword() {
         return password;
     }
-    
+
     @Override
     public String getDatabaseName() {
         return databaseName;
     }
-    
+
     @Override
     public Db2Container withUsername(String username) {
         this.username = username;
         return this;
     }
-    
+
     @Override
     public Db2Container withPassword(String password) {
         this.password = password;
         return this;
     }
-    
+
     @Override
     public Db2Container withDatabaseName(String dbName) {
         this.databaseName = dbName;
         return this;
     }
-    
+
     @Override
     protected void waitUntilContainerStarted() {
         getWaitStrategy().waitUntilReady(this);

From fbb4d8af1489d9e2c5a463e44ab25ed4dfde7eb1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 17 Jul 2019 07:42:13 +0200
Subject: [PATCH 0157/4969] fix RabbitMQ's Javadoc

---
 .../java/org/testcontainers/containers/RabbitMQContainer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 98c2497c2dc..f16f005df5e 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -49,7 +49,7 @@ public RabbitMQContainer() {
     /**
      * Creates a Testcontainer using a specific docker image.
      *
-     * @param tag The docker image to use.
+     * @param image The docker image to use.
      */
     public RabbitMQContainer(String image) {
         super(image);

From b840912d9df616e551a77f4b58502166df32c8cb Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 17 Jul 2019 15:19:48 +0200
Subject: [PATCH 0158/4969] Simplify Kafka container by deferring the Kafka
 command (#1458, Fixes #1450)

* Simplify Kafka container by deferring the Kafka command

* extract `startZookeeper` method, add `PORT_NOT_ASSIGNED` constant

* keep network&alias for backward compatibility
---
 .../containers/KafkaContainer.java            | 78 +++++++++++++------
 1 file changed, 53 insertions(+), 25 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index b1be94f1e67..b08d6611e6d 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -1,9 +1,13 @@
 package org.testcontainers.containers;
 
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.core.command.ExecStartResultCallback;
+import lombok.SneakyThrows;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
-import java.util.stream.Stream;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This container wraps Confluent Kafka and Zookeeper (optionally)
@@ -15,9 +19,11 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     public static final int ZOOKEEPER_PORT = 2181;
 
+    private static final int PORT_NOT_ASSIGNED = -1;
+
     protected String externalZookeeperConnect = null;
 
-    protected SocatContainer proxy;
+    private int port = PORT_NOT_ASSIGNED;
 
     public KafkaContainer() {
         this("5.2.1");
@@ -26,6 +32,7 @@ public KafkaContainer() {
     public KafkaContainer(String confluentPlatformVersion) {
         super(TestcontainersConfiguration.getInstance().getKafkaImage() + ":" + confluentPlatformVersion);
 
+        // TODO Only for backward compatibility
         withNetwork(Network.newNetwork());
         withNetworkAliases("kafka-" + Base58.randomString(6));
         withExposedPorts(KAFKA_PORT);
@@ -54,40 +61,61 @@ public KafkaContainer withExternalZookeeper(String connectString) {
     }
 
     public String getBootstrapServers() {
-        return String.format("PLAINTEXT://%s:%s", proxy.getContainerIpAddress(), proxy.getFirstMappedPort());
+        if (port == PORT_NOT_ASSIGNED) {
+            throw new IllegalStateException("You should start Kafka container first");
+        }
+        return String.format("PLAINTEXT://%s:%s", getContainerIpAddress(), port);
     }
 
     @Override
     protected void doStart() {
-        String networkAlias = getNetworkAliases().get(0);
-        proxy = new SocatContainer()
-                .withNetwork(getNetwork())
-                .withTarget(KAFKA_PORT, networkAlias)
-                .withTarget(ZOOKEEPER_PORT, networkAlias);
-
-        proxy.start();
-        withEnv("KAFKA_ADVERTISED_LISTENERS", "BROKER://" + networkAlias + ":9092" + "," + getBootstrapServers());
+        withCommand("sleep infinity");
 
-        if (externalZookeeperConnect != null) {
-            withEnv("KAFKA_ZOOKEEPER_CONNECT", externalZookeeperConnect);
-        } else {
+        if (externalZookeeperConnect == null) {
             addExposedPort(ZOOKEEPER_PORT);
-            withEnv("KAFKA_ZOOKEEPER_CONNECT", "localhost:2181");
-            withCommand(
-                "sh",
-                "-c",
-                // Use command to create the file to avoid file mounting (useful when you run your tests against a remote Docker daemon)
-                "printf 'clientPort=2181\ndataDir=/var/lib/zookeeper/data\ndataLogDir=/var/lib/zookeeper/log' > /zookeeper.properties" +
-                    " && zookeeper-server-start /zookeeper.properties" +
-                    " & /etc/confluent/docker/run"
-            );
         }
 
         super.doStart();
     }
 
     @Override
-    public void stop() {
-        Stream.<Runnable>of(super::stop, proxy::stop).parallel().forEach(Runnable::run);
+    @SneakyThrows
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        super.containerIsStarting(containerInfo);
+
+        port = getMappedPort(KAFKA_PORT);
+
+        final String zookeeperConnect;
+        if (externalZookeeperConnect != null) {
+            zookeeperConnect = externalZookeeperConnect;
+        } else {
+            zookeeperConnect = startZookeeper();
+        }
+
+        String internalIp = containerInfo.getNetworkSettings().getIpAddress();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(getContainerId())
+            .withCmd("sh", "-c", "" +
+                "export KAFKA_ZOOKEEPER_CONNECT=" + zookeeperConnect + "\n" +
+                "export KAFKA_ADVERTISED_LISTENERS=" + getBootstrapServers() + "," + String.format("BROKER://%s:9092", internalIp) + "\n" +
+                "/etc/confluent/docker/run"
+            )
+            .exec();
+
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(new ExecStartResultCallback()).awaitStarted(10, TimeUnit.SECONDS);
+    }
+
+    @SneakyThrows(InterruptedException.class)
+    private String startZookeeper() {
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(getContainerId())
+            .withCmd("sh", "-c", "" +
+                "printf 'clientPort=" + ZOOKEEPER_PORT + "\ndataDir=/var/lib/zookeeper/data\ndataLogDir=/var/lib/zookeeper/log' > /zookeeper.properties\n" +
+                "zookeeper-server-start /zookeeper.properties\n"
+            )
+            .exec();
+
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(new ExecStartResultCallback()).awaitStarted(10, TimeUnit.SECONDS);
+
+        return "localhost:" + ZOOKEEPER_PORT;
     }
 }

From 7ca3f9f47bee462be2481b0601a491d156f8108a Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Wed, 17 Jul 2019 14:42:49 -0500
Subject: [PATCH 0159/4969] Add new withDockerfile methods to
 ImageFromDockerfile (#1535)

* Add new withDockerfile methods to ImageFromDockerfile

These methods are preferable to the existing withDockerfilePath
methods because the docker-java API will honor .dockerignore files
if withDockerfile(File) is used.

* Review comments for .dockerignore support PR

* Update core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java

Co-Authored-By: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../images/builder/ImageFromDockerfile.java   | 30 ++++++++++
 .../images/builder/DockerfileBuildTest.java   | 12 +++-
 .../images/builder/DockerignoreTest.java      | 56 +++++++++++++++++++
 .../dockerfile-build-invalid/.dockerignore    |  3 +
 .../dockerfile-build-invalid/Dockerfile       |  1 +
 .../dockerfile-build-test/.dockerignore       |  1 +
 .../Dockerfile-currentdir                     |  2 +
 .../should_be_ignored.txt                     |  1 +
 .../should_not_be_ignored.txt                 |  1 +
 9 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
 create mode 100644 core/src/test/resources/dockerfile-build-invalid/.dockerignore
 create mode 100644 core/src/test/resources/dockerfile-build-invalid/Dockerfile
 create mode 100644 core/src/test/resources/dockerfile-build-test/.dockerignore
 create mode 100644 core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
 create mode 100644 core/src/test/resources/dockerfile-build-test/should_be_ignored.txt
 create mode 100644 core/src/test/resources/dockerfile-build-test/should_not_be_ignored.txt

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index c7d409c0660..f4968c11ff0 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -10,6 +10,7 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
@@ -18,9 +19,11 @@
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.LazyFuture;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -63,6 +66,7 @@ public class ImageFromDockerfile extends LazyFuture<String> implements
     private final Map<String, Transferable> transferables = new HashMap<>();
     private final Map<String, String> buildArgs = new HashMap<>();
     private Optional<String> dockerFilePath = Optional.empty();
+    private Optional<Path> dockerfile = Optional.empty();
 
     public ImageFromDockerfile() {
         this("testcontainers/" + Base58.randomString(16).toLowerCase());
@@ -119,6 +123,8 @@ public void onNext(BuildResponseItem item) {
             configure(buildImageCmd);
 
             BuildImageResultCallback exec = buildImageCmd.exec(resultCallback);
+            
+            long bytesToDockerDaemon = 0;
 
             // To build an image, we have to send the context to Docker in TAR archive format
             try (TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(new GZIPOutputStream(out))) {
@@ -128,9 +134,15 @@ public void onNext(BuildResponseItem item) {
                     Transferable transferable = entry.getValue();
                     final String destination = entry.getKey();
                     transferable.transferTo(tarArchive, destination);
+                    bytesToDockerDaemon += transferable.getSize();
                 }
                 tarArchive.finish();
             }
+            
+            log.info("Transferred {} KB to Docker daemon", FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
+            if (bytesToDockerDaemon > FileUtils.ONE_MB * 50) // warn if >50MB sent to docker daemon
+                log.warn("A large amount of data was sent to the Docker daemon ({}). Consider using a .dockerignore file for better performance.", 
+                        FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
 
             exec.awaitImageId();
 
@@ -143,6 +155,7 @@ public void onNext(BuildResponseItem item) {
     protected void configure(BuildImageCmd buildImageCmd) {
         buildImageCmd.withTag(this.getDockerImageName());
         this.dockerFilePath.ifPresent(buildImageCmd::withDockerfilePath);
+        this.dockerfile.ifPresent(p -> buildImageCmd.withDockerfile(p.toFile()));
         this.buildArgs.forEach(buildImageCmd::withBuildArg);
     }
 
@@ -156,8 +169,25 @@ public ImageFromDockerfile withBuildArgs(final Map<String, String> args) {
         return this;
     }
 
+    /**
+     * Sets the Dockerfile to be used for this image. 
+     * @deprecated It is recommended to use {@link #withDockerfile} instead because it honors 
+     * .dockerignore files and therefore will be more efficient
+     * @param relativePathFromBuildRoot
+     */
+    @Deprecated
     public ImageFromDockerfile withDockerfilePath(String relativePathFromBuildRoot) {
         this.dockerFilePath = Optional.of(relativePathFromBuildRoot);
         return this;
     }
+    
+    /**
+     * Sets the Dockerfile to be used for this image. 
+     * @param dockerfile
+     */
+    public ImageFromDockerfile withDockerfile(Path dockerfile) {
+        this.dockerfile = Optional.of(dockerfile);
+        return this;
+    }
+    
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
index 4c33fe9118b..9a9d647d71b 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
@@ -6,6 +6,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -14,7 +15,7 @@
 @RunWith(Parameterized.class)
 public class DockerfileBuildTest {
 
-    private static final Path RESOURCE_PATH = Paths.get("src/test/resources/dockerfile-build-test");
+    static final Path RESOURCE_PATH = Paths.get("src/test/resources/dockerfile-build-test");
 
     public String expectedFileContent;
     public ImageFromDockerfile image;
@@ -44,6 +45,13 @@ public static Object[][] parameters() {
                     .withDockerfilePath("./Dockerfile-buildarg")
                     .withBuildArg("CUSTOM_ARG", "test7890")
             },
+            
+           // Dockerfile build using withDockerfile(File)
+            new Object[]{"test4567",
+                new ImageFromDockerfile()
+                    .withFileFromPath(".", RESOURCE_PATH)
+                    .withDockerfile(RESOURCE_PATH.resolve("Dockerfile-alt"))
+            },
         };
     }
 
@@ -57,11 +65,11 @@ public void performTest() {
         try (final GenericContainer container = new GenericContainer(image)
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
             .withCommand("cat", "/test.txt")) {
-
             container.start();
 
             final String logs = container.getLogs();
             assertTrue("expected file content indicates that dockerfile build steps have been run", logs.contains(expectedFileContent));
         }
     }
+    
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
new file mode 100644
index 00000000000..faf5fb950b8
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
@@ -0,0 +1,56 @@
+package org.testcontainers.images.builder;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.rnorth.visibleassertions.VisibleAssertions.fail;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+
+import com.github.dockerjava.api.exception.DockerClientException;
+
+public class DockerignoreTest {
+    
+    private static final Path INVALID_DOCKERIGNORE_PATH = Paths.get("src/test/resources/dockerfile-build-invalid");
+    
+    @Test
+    public void testInvalidDockerignore() throws Exception {
+        try {
+            new ImageFromDockerfile()
+                .withFileFromPath(".", INVALID_DOCKERIGNORE_PATH)
+                .withDockerfile(INVALID_DOCKERIGNORE_PATH.resolve("Dockerfile"))
+                .get();
+            fail("Should not be able to build an image with an invalid .dockerignore file");
+        } 
+        catch (DockerClientException e) {
+            if (!e.getMessage().contains("Invalid pattern"))
+                throw e;
+        }
+    }
+    
+    @SuppressWarnings("resource")
+    @Test
+    public void testValidDockerignore() throws Exception {
+        ImageFromDockerfile img = new ImageFromDockerfile()
+                .withFileFromPath(".", DockerfileBuildTest.RESOURCE_PATH)
+                .withDockerfile(DockerfileBuildTest.RESOURCE_PATH.resolve("Dockerfile-currentdir"));
+        try(
+            final GenericContainer<?> container = new GenericContainer<>(img.get())
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+            .withCommand("ls", "/")
+        ) {
+
+            container.start();
+
+            final String logs = container.getLogs();
+            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs, 
+                    logs.contains("should_not_be_ignored.txt"));
+            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs, 
+                    !logs.contains("should_be_ignored.txt"));
+        }
+    }
+    
+}
diff --git a/core/src/test/resources/dockerfile-build-invalid/.dockerignore b/core/src/test/resources/dockerfile-build-invalid/.dockerignore
new file mode 100644
index 00000000000..5f06037fe04
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-invalid/.dockerignore
@@ -0,0 +1,3 @@
+# This is an invalid dockerignore file
+*~
+[a-b-c]
\ No newline at end of file
diff --git a/core/src/test/resources/dockerfile-build-invalid/Dockerfile b/core/src/test/resources/dockerfile-build-invalid/Dockerfile
new file mode 100644
index 00000000000..6140f575ef7
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-invalid/Dockerfile
@@ -0,0 +1 @@
+FROM alpine:3.2
diff --git a/core/src/test/resources/dockerfile-build-test/.dockerignore b/core/src/test/resources/dockerfile-build-test/.dockerignore
new file mode 100644
index 00000000000..a6bd49d7d81
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/.dockerignore
@@ -0,0 +1 @@
+should_be_ignored.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir b/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
new file mode 100644
index 00000000000..97f80bdfa65
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
@@ -0,0 +1,2 @@
+FROM alpine:3.2
+COPY . /
diff --git a/core/src/test/resources/dockerfile-build-test/should_be_ignored.txt b/core/src/test/resources/dockerfile-build-test/should_be_ignored.txt
new file mode 100644
index 00000000000..6b04bcc9cec
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/should_be_ignored.txt
@@ -0,0 +1 @@
+this file should be ignored by a .dockerignore file
\ No newline at end of file
diff --git a/core/src/test/resources/dockerfile-build-test/should_not_be_ignored.txt b/core/src/test/resources/dockerfile-build-test/should_not_be_ignored.txt
new file mode 100644
index 00000000000..675ce985900
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/should_not_be_ignored.txt
@@ -0,0 +1 @@
+this file should not be ignored by a .dockerignore file
\ No newline at end of file

From 60269891bce2c32a51c8deee1356a5437fb45add Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2019 05:59:46 +0000
Subject: [PATCH 0160/4969] Bump aws-java-sdk-sqs from 1.11.479 to 1.11.594 in
 /modules/localstack (#1626)

---
 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 e5e3efb5de3..3bcfcb91714 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.479'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.594'
 }

From a0e479ad7b26f73025e4e7926908dd39b369c619 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2019 07:38:30 +0000
Subject: [PATCH 0161/4969] Bump cucumber-java from 4.5.4 to 4.6.0 in /examples
 (#1620)

---
 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 fb3a1ae875c..792968df7c4 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.5.4'
+    implementation 'io.cucumber:cucumber-java:4.6.0'
     testImplementation 'io.cucumber:cucumber-junit:4.5.4'
     testImplementation 'org.testcontainers:selenium'
 }

From bf764260b8d74e59f9e19bd8d42df02916a4a048 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2019 09:37:48 +0000
Subject: [PATCH 0162/4969] Bump cucumber-junit from 4.5.4 to 4.6.0 in
 /examples (#1619)

---
 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 792968df7c4..9907da86262 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:4.5.4'
+    testImplementation 'io.cucumber:cucumber-junit:4.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 6dd9c44140ed19fd3f46dd3aace0fd6799c37b9a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2019 15:21:59 +0200
Subject: [PATCH 0163/4969] Bump amqp-client from 5.7.1 to 5.7.2 in /core
 (#1588)

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.7.1...v5.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ee876f595c1..77620f6e98e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -102,7 +102,7 @@ dependencies {
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.0.1'
-    testCompile 'com.rabbitmq:amqp-client:5.7.1'
+    testCompile 'com.rabbitmq:amqp-client:5.7.2'
     testCompile 'org.mongodb:mongo-java-driver:3.10.2'
     testCompile ('org.mockito:mockito-core:2.28.2') {
         exclude(module: 'hamcrest-core')

From 4373d1fb3540aea5be684daf32ab4b0eec7cb0cb Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 19 Jul 2019 15:22:33 +0200
Subject: [PATCH 0164/4969] Fail fast if `container_name` is set in Docker
 Compose file (#1581)

* Fail fast if `container_name` is set in Docker Compose file

* Update DockerComposeContainer.java
---
 core/build.gradle                             |  4 +
 .../containers/DockerComposeContainer.java    | 86 +++++++++++++++----
 .../DockerComposeFileValidationTest.java      | 70 +++++++++++++++
 .../docker-compose-container-name-v1.yml      |  3 +
 4 files changed, 147 insertions(+), 16 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
 create mode 100644 core/src/test/resources/docker-compose-container-name-v1.yml

diff --git a/core/build.gradle b/core/build.gradle
index 77620f6e98e..f400b5e3c1c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -92,6 +92,8 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
+    shaded "org.yaml:snakeyaml:1.21"
+
     shaded 'com.squareup.okhttp3:okhttp:3.14.2'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
@@ -110,6 +112,8 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
+    testCompile 'org.assertj:assertj-core:3.12.2'
+
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 46f4c561e5d..06a8bd9d597 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -2,17 +2,19 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Container;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.Uninterruptibles;
 import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -22,11 +24,14 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.utility.*;
+import org.yaml.snakeyaml.Yaml;
 import org.zeroturnaround.exec.InvalidExitValueException;
 import org.zeroturnaround.exec.ProcessExecutor;
 import org.zeroturnaround.exec.stream.slf4j.Slf4jStream;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -49,6 +54,7 @@
 /**
  * Container which launches Docker Compose, for the purposes of launching a defined set of containers.
  */
+@Slf4j
 public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> extends FailureDetectingExternalResource implements Startable {
 
     /**
@@ -147,7 +153,7 @@ public void start() {
                 try {
                     pullImages();
                 } catch (ContainerLaunchException e) {
-                    logger().warn("Exception while pulling images, using local images if available", e);
+                    log.warn("Exception while pulling images, using local images if available", e);
                 }
             }
             applyScaling(); // scale before up, so that all scaled instances are available first for linking
@@ -187,7 +193,7 @@ private void createServiceInstance(Container container) {
 
         String containerId = containerInstance.getContainerId();
         if (tailChildContainers) {
-            followLogs(containerId, new Slf4jLogConsumer(logger()).withPrefix(container.getNames()[0]));
+            followLogs(containerId, new Slf4jLogConsumer(log).withPrefix(container.getNames()[0]));
         }
         //follow logs using registered consumers for this service
         logConsumers.getOrDefault(serviceName, Collections.emptyList()).forEach(consumer -> followLogs(containerId, consumer));
@@ -208,6 +214,13 @@ private String getServiceNameFromContainer(Container container) {
     }
 
     private void runWithCompose(String cmd) {
+        checkNotNull(composeFiles);
+        checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
+
+        for (File composeFile : composeFiles) {
+            validate(composeFile);
+        }
+
         final DockerCompose dockerCompose;
         if (localCompose) {
             dockerCompose = new LocalDockerCompose(composeFiles, project);
@@ -221,6 +234,60 @@ private void runWithCompose(String cmd) {
                 .invoke();
     }
 
+    @SuppressWarnings("unchecked")
+    private static void validate(File composeFile) {
+        Yaml yaml = new Yaml();
+        try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) {
+            Object template = yaml.load(fileInputStream);
+            validate(template, composeFile.getAbsolutePath());
+        } catch (IOException e) {
+            log.warn("Failed to read YAML from {}", composeFile.getAbsolutePath(), e);
+        }
+    }
+
+    @VisibleForTesting
+    static void validate(Object template, String identifier) {
+        if (!(template instanceof Map)) {
+            return;
+        }
+
+        Map<String, ?> map = (Map<String, ?>) template;
+
+        final Map<String, ?> servicesMap;
+        if (map.containsKey("version")) {
+            if (!map.containsKey("services")) {
+                log.debug("Compose file {} has an unknown format: 'version' is set but 'services' is not defined", identifier);
+                return;
+            }
+            Object services = map.get("services");
+            if (!(services instanceof Map)) {
+                log.debug("Compose file {} has an unknown format: 'services' is not Map", identifier);
+                return;
+            }
+
+            servicesMap = (Map<String, ?>) services;
+        } else {
+            servicesMap = map;
+        }
+
+        for (Map.Entry<String, ?> entry : servicesMap.entrySet()) {
+            String serviceName = entry.getKey();
+            Object serviceDefinition = entry.getValue();
+            if (!(serviceDefinition instanceof Map)) {
+                log.debug("Compose file {} has an unknown format: service '{}' is not Map", identifier, serviceName);
+                break;
+            }
+
+            if (((Map) serviceDefinition).containsKey("container_name")) {
+                throw new IllegalStateException(String.format(
+                    "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it",
+                    identifier,
+                    serviceName
+                ));
+            }
+        }
+    }
+
     private void applyScaling() {
         // Apply scaling
         if (!scalingPreferences.isEmpty()) {
@@ -254,10 +321,6 @@ private void startAmbassadorContainers() {
         }
     }
 
-    private Logger logger() {
-        return LoggerFactory.getLogger(DockerComposeContainer.class);
-    }
-
     @Override
     public void stop() {
         synchronized (MUTEX) {
@@ -476,11 +539,6 @@ interface DockerCompose {
     DockerCompose withEnv(Map<String, String> env);
 
     void invoke();
-
-    default void validateFileList(List<File> composeFiles) {
-        checkNotNull(composeFiles);
-        checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
-    }
 }
 
 /**
@@ -497,8 +555,6 @@ class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCom
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
 
         super(TestcontainersConfiguration.getInstance().getDockerComposeContainerImage());
-        validateFileList(composeFiles);
-
         addEnv(ENV_PROJECT_NAME, identifier);
 
         // Map the docker compose file into the container
@@ -599,8 +655,6 @@ class LocalDockerCompose implements DockerCompose {
     private Map<String, String> env = new HashMap<>();
 
     public LocalDockerCompose(List<File> composeFiles, String identifier) {
-        validateFileList(composeFiles);
-
         this.composeFiles = composeFiles;
         this.identifier = identifier;
     }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
new file mode 100644
index 00000000000..7a3121dcd32
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
@@ -0,0 +1,70 @@
+package org.testcontainers.containers;
+
+import com.google.common.collect.ImmutableMap;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import java.io.File;
+
+import static java.util.Collections.emptyList;
+
+public class DockerComposeFileValidationTest {
+
+    @Test
+    public void shouldValidate() {
+        File file = new File("src/test/resources/docker-compose-container-name-v1.yml");
+        try (DockerComposeContainer container = new DockerComposeContainer<>(file)) {
+            Assertions.assertThatThrownBy(container::start)
+                .hasMessageContaining(file.getAbsolutePath())
+                .hasMessageContaining("'container_name' property set for service 'redis'");
+        }
+    }
+
+    @Test
+    public void shouldRejectContainerNameV1() {
+        Assertions
+            .assertThatThrownBy(() -> {
+                DockerComposeContainer.validate(ImmutableMap.of(
+                    "redis", ImmutableMap.of("container_name", "redis")
+                ), "");
+            })
+            .hasMessageContaining("'container_name' property set for service 'redis'");
+    }
+
+    @Test
+    public void shouldRejectContainerNameV2() {
+        Assertions
+            .assertThatThrownBy(() -> {
+                DockerComposeContainer.validate(ImmutableMap.of(
+                    "version", "2",
+                    "services", ImmutableMap.of(
+                        "redis", ImmutableMap.of("container_name", "redis")
+                    )
+                ), "");
+            })
+            .hasMessageContaining("'container_name' property set for service 'redis'");
+    }
+
+    @Test
+    public void shouldIgnoreUnknownStructure() {
+        // Everything is a list
+        DockerComposeContainer.validate(emptyList(), "");
+
+        // services is not a map but List
+        DockerComposeContainer.validate(ImmutableMap.of(
+            "version", "2",
+            "services", emptyList()
+        ), "");
+
+        // services is not a collection
+        DockerComposeContainer.validate(ImmutableMap.of(
+            "version", "2",
+            "services", true
+        ), "");
+
+        // no services while version is defined
+        DockerComposeContainer.validate(ImmutableMap.of(
+            "version", "9000"
+        ), "");
+    }
+}
diff --git a/core/src/test/resources/docker-compose-container-name-v1.yml b/core/src/test/resources/docker-compose-container-name-v1.yml
new file mode 100644
index 00000000000..96af67248a0
--- /dev/null
+++ b/core/src/test/resources/docker-compose-container-name-v1.yml
@@ -0,0 +1,3 @@
+redis:
+    image: redis
+    container_name: redis

From 151b93ac065a420d0a803d2ebb8ba6d152c783a4 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 21 Jul 2019 08:38:12 +0100
Subject: [PATCH 0165/4969] Allow tests to be disabled when Docker is
 unavailable (#1530)

This commit introduces a new attribute, disabledWithoutDocker, on
@Testcontainers that defaults to false. When set to true the class's
tests are disabled when Docker in unavailable.
---
 modules/junit-jupiter/build.gradle            |  3 +
 .../junit/jupiter/Testcontainers.java         |  5 ++
 .../jupiter/TestcontainersExtension.java      | 41 ++++++++++-
 .../jupiter/TestcontainersExtensionTests.java | 72 +++++++++++++++++++
 4 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java

diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index baab3b68bb8..08bdedc6620 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,6 +9,9 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
+    testCompile ('org.mockito:mockito-core:2.28.2') {
+        exclude(module: 'hamcrest-core')
+    }
 
     testRuntime 'org.postgresql:postgresql:42.2.6'
     testRuntime 'mysql:mysql-connector-java:8.0.16'
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
index ecf59ff1399..6a364cd19e6 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
@@ -53,4 +53,9 @@
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(TestcontainersExtension.class)
 public @interface Testcontainers {
+
+    /**
+     * Whether tests should be disabled (rather than failing) when Docker is not available.
+     */
+    boolean disabledWithoutDocker() default false;
 }
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 7f6183cc74d..e6ce10f8541 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -5,8 +5,10 @@
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
 import org.junit.platform.commons.support.AnnotationSupport;
+import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.lifecycle.Startable;
 
 import java.lang.reflect.Field;
@@ -16,7 +18,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, TestInstancePostProcessor {
+class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, ExecutionCondition, TestInstancePostProcessor {
 
     private static final Namespace NAMESPACE = Namespace.create(TestcontainersExtension.class);
 
@@ -48,6 +50,43 @@ public void beforeEach(final ExtensionContext context) {
                 .getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()));
     }
 
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+        return findTestcontainers(context).map(this::evaluate)
+            .orElseThrow(() -> new ExtensionConfigurationException("@Testcontainers not found"));
+    }
+
+    private Optional<Testcontainers> findTestcontainers(ExtensionContext context) {
+        Optional<ExtensionContext> current = Optional.of(context);
+        while (current.isPresent()) {
+            Optional<Testcontainers> testcontainers = AnnotationUtils.findAnnotation(current.get().getRequiredTestClass(), Testcontainers.class);
+            if (testcontainers.isPresent()) {
+                return testcontainers;
+            }
+            current = current.get().getParent();
+        }
+        return Optional.empty();
+    }
+
+    private ConditionEvaluationResult evaluate(Testcontainers testcontainers) {
+        if (testcontainers.disabledWithoutDocker()) {
+            if (isDockerAvailable()) {
+                return ConditionEvaluationResult.enabled("Docker is available");
+            }
+            return ConditionEvaluationResult.disabled("disabledWithoutDocker is true and Docker is not available");
+        }
+        return ConditionEvaluationResult.enabled("disabledWithoutDocker is false");
+    }
+
+    boolean isDockerAvailable() {
+        try {
+            DockerClientFactory.instance().client();
+            return true;
+        } catch (Throwable ex) {
+            return false;
+        }
+    }
+
     private Set<Object> collectParentTestInstances(final ExtensionContext context) {
         Set<Object> testInstances = new LinkedHashSet<>();
         Optional<ExtensionContext> current = Optional.of(context);
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
new file mode 100644
index 00000000000..f3aea9bb850
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
@@ -0,0 +1,72 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class TestcontainersExtensionTests {
+
+    @Test
+    void whenDisabledWithoutDockerAndDockerIsAvailableTestsAreEnabled() {
+        ConditionEvaluationResult result = new TestTestcontainersExtension(true)
+            .evaluateExecutionCondition(extensionContext(DisabledWithoutDocker.class));
+        assertFalse(result.isDisabled());
+    }
+
+    @Test
+    void whenDisabledWithoutDockerAndDockerIsUnavailableTestsAreDisabled() {
+        ConditionEvaluationResult result = new TestTestcontainersExtension(false)
+            .evaluateExecutionCondition(extensionContext(DisabledWithoutDocker.class));
+        assertTrue(result.isDisabled());
+    }
+
+    @Test
+    void whenEnabledWithoutDockerAndDockerIsAvailableTestsAreEnabled() {
+        ConditionEvaluationResult result = new TestTestcontainersExtension(true)
+            .evaluateExecutionCondition(extensionContext(EnabledWithoutDocker.class));
+        assertFalse(result.isDisabled());
+    }
+
+    @Test
+    void whenEnabledWithoutDockerAndDockerIsUnavailableTestsAreEnabled() {
+        ConditionEvaluationResult result = new TestTestcontainersExtension(false)
+            .evaluateExecutionCondition(extensionContext(EnabledWithoutDocker.class));
+        assertFalse(result.isDisabled());
+    }
+
+    private ExtensionContext extensionContext(Class clazz) {
+        ExtensionContext extensionContext = mock(ExtensionContext.class);
+        when(extensionContext.getRequiredTestClass()).thenReturn(clazz);
+        return extensionContext;
+    }
+
+    @Testcontainers(disabledWithoutDocker = true)
+    static final class DisabledWithoutDocker {
+
+    }
+
+    @Testcontainers
+    static final class EnabledWithoutDocker {
+
+    }
+
+    static final class TestTestcontainersExtension extends TestcontainersExtension {
+
+        private final boolean dockerAvailable;
+
+        private TestTestcontainersExtension(boolean dockerAvailable) {
+            this.dockerAvailable = dockerAvailable;
+        }
+
+        boolean isDockerAvailable() {
+            return dockerAvailable;
+        }
+
+    }
+
+}

From f1565f1ba842ccfa9d8ed9ee00276f38b7a2546f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 21 Jul 2019 10:01:38 +0100
Subject: [PATCH 0166/4969] Fail gracefully if no JDBC driver found (#1434)

* WIP

* Simplify code

* Ensure that HikariCP uses the correct driver
(Auto-selected driver on classpath seems to be MariaDB; seemingly not compatible with 8.0.16 of MySQL)

* Cleanup old Hikari pools after use
to avoid reconnection attempts to dead containers after test has already completed

* Update following review comments
---
 .../containers/ContainerLaunchException.java  |  4 +-
 core/src/test/resources/logback-test.xml      |  2 -
 .../src/test/resources/logback-test.xml       | 14 ---
 .../src/test/resources/logback-test.xml       | 10 +--
 .../src/test/resources/logback-test.xml       | 14 ++-
 .../src/test/resources/logback-test.xml       | 10 +--
 .../src/test/resources/logback-test.xml       | 10 +--
 .../src/test/resources/logback-test.xml       | 10 +--
 .../spock/src/test/resources/logback-test.xml | 13 +--
 .../src/test/resources/logback-test.xml       |  7 +-
 .../src/test/resources/logback-test.xml       |  3 +-
 .../src/test/resources/logback-test.xml       | 13 +--
 .../src/test/resources/logback-test.xml       | 14 +--
 .../src/test/resources/logback-test.xml       |  5 +-
 .../src/test/resources/logback-test.xml       | 12 +--
 .../junit/AbstractContainerDatabaseTest.java  | 16 +++-
 .../src/test/resources/logback-test.xml       | 13 +--
 .../containers/JdbcDatabaseContainer.java     | 89 ++++++++++++-------
 .../jdbc/MissingJdbcDriverTest.java           | 86 ++++++++++++++++++
 .../jdbc/src/test/resources/logback-test.xml  | 16 ++++
 .../src/test/resources/logback-test.xml       |  5 +-
 .../kafka/src/test/resources/logback-test.xml |  4 +-
 .../src/test/resources/logback-test.xml       | 17 +---
 .../neo4j/src/test/resources/logback-test.xml |  4 +-
 .../nginx/src/test/resources/logback-test.xml | 13 +--
 .../src/test/resources/logback-test.xml       | 13 +--
 .../containers/PostgreSQLContainer.java       |  3 +-
 .../src/test/resources/logback-test.xml       |  4 +-
 .../src/test/resources/logback-test.xml       | 13 +--
 .../spock/src/test/resources/logback-test.xml |  5 +-
 .../vault/src/test/resources/logback-test.xml | 14 +--
 31 files changed, 229 insertions(+), 227 deletions(-)
 create mode 100644 modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
 create mode 100644 modules/jdbc/src/test/resources/logback-test.xml

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerLaunchException.java b/core/src/main/java/org/testcontainers/containers/ContainerLaunchException.java
index 9943d9f612b..bf407c16808 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerLaunchException.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerLaunchException.java
@@ -9,7 +9,7 @@ public ContainerLaunchException(String message) {
         super(message);
     }
 
-    public ContainerLaunchException(String message, Exception exception) {
-        super(message, exception);
+    public ContainerLaunchException(String message, Throwable cause) {
+        super(message, cause);
     }
 }
diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
index 57a53cdd3aa..5e96a70b244 100644
--- a/core/src/test/resources/logback-test.xml
+++ b/core/src/test/resources/logback-test.xml
@@ -14,10 +14,8 @@
 
     <logger name="org.testcontainers" level="DEBUG"/>
 
-    <logger name="org.apache.http" level="WARN"/>
     <logger name="com.github.dockerjava" level="WARN"/>
     <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="io.netty" level="WARN" />
     <logger name="org.testcontainers.shaded" level="WARN"/>
 
 </configuration>
diff --git a/docs/examples/src/test/resources/logback-test.xml b/docs/examples/src/test/resources/logback-test.xml
index 49da0be9709..62bc2c43d3a 100644
--- a/docs/examples/src/test/resources/logback-test.xml
+++ b/docs/examples/src/test/resources/logback-test.xml
@@ -1,5 +1,4 @@
 <configuration>
-
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <!-- encoders are assigned the type
              ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
@@ -11,17 +10,4 @@
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
-
-    <logger name="org.testcontainers" level="INFO"/>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-
-    <turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
-        <Marker>PROFILER</Marker>
-        <OnMatch>DENY</OnMatch>
-    </turboFilter>
 </configuration>
diff --git a/examples/disque-job-queue/src/test/resources/logback-test.xml b/examples/disque-job-queue/src/test/resources/logback-test.xml
index c53f381fca5..be4ebaed2c8 100644
--- a/examples/disque-job-queue/src/test/resources/logback-test.xml
+++ b/examples/disque-job-queue/src/test/resources/logback-test.xml
@@ -4,15 +4,11 @@
         <!-- encoders are assigned the type
              ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/examples/linked-container/src/test/resources/logback-test.xml b/examples/linked-container/src/test/resources/logback-test.xml
index 23f40bbec32..be4ebaed2c8 100644
--- a/examples/linked-container/src/test/resources/logback-test.xml
+++ b/examples/linked-container/src/test/resources/logback-test.xml
@@ -1,16 +1,14 @@
 <configuration>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
-
-    <logger name="org.testcontainers" level="INFO"/>
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml b/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml
index c53f381fca5..be4ebaed2c8 100644
--- a/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml
+++ b/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml
@@ -4,15 +4,11 @@
         <!-- encoders are assigned the type
              ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/examples/redis-backed-cache/src/test/resources/logback-test.xml b/examples/redis-backed-cache/src/test/resources/logback-test.xml
index c53f381fca5..be4ebaed2c8 100644
--- a/examples/redis-backed-cache/src/test/resources/logback-test.xml
+++ b/examples/redis-backed-cache/src/test/resources/logback-test.xml
@@ -4,15 +4,11 @@
         <!-- encoders are assigned the type
              ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/examples/selenium-container/src/test/resources/logback-test.xml b/examples/selenium-container/src/test/resources/logback-test.xml
index c53f381fca5..be4ebaed2c8 100644
--- a/examples/selenium-container/src/test/resources/logback-test.xml
+++ b/examples/selenium-container/src/test/resources/logback-test.xml
@@ -4,15 +4,11 @@
         <!-- encoders are assigned the type
              ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/examples/spock/src/test/resources/logback-test.xml b/examples/spock/src/test/resources/logback-test.xml
index 6e7cfd092de..535e406fc13 100644
--- a/examples/spock/src/test/resources/logback-test.xml
+++ b/examples/spock/src/test/resources/logback-test.xml
@@ -12,16 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="INFO"/>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="io.netty" level="WARN"/>
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-
-    <turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
-        <Marker>PROFILER</Marker>
-        <OnMatch>DENY</OnMatch>
-    </turboFilter>
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/examples/spring-boot/src/test/resources/logback-test.xml b/examples/spring-boot/src/test/resources/logback-test.xml
index 86c4c861a78..5431cb6200b 100644
--- a/examples/spring-boot/src/test/resources/logback-test.xml
+++ b/examples/spring-boot/src/test/resources/logback-test.xml
@@ -1,8 +1,3 @@
 <configuration>
-
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/modules/cassandra/src/test/resources/logback-test.xml b/modules/cassandra/src/test/resources/logback-test.xml
index fc48b14c7de..535e406fc13 100644
--- a/modules/cassandra/src/test/resources/logback-test.xml
+++ b/modules/cassandra/src/test/resources/logback-test.xml
@@ -13,5 +13,4 @@
     </root>
 
     <logger name="org.testcontainers" level="DEBUG"/>
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/modules/couchbase/src/test/resources/logback-test.xml b/modules/couchbase/src/test/resources/logback-test.xml
index d163f3ececb..535e406fc13 100644
--- a/modules/couchbase/src/test/resources/logback-test.xml
+++ b/modules/couchbase/src/test/resources/logback-test.xml
@@ -8,18 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="com.couchbase" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/modules/dynalite/src/test/resources/logback-test.xml b/modules/dynalite/src/test/resources/logback-test.xml
index 5d27573a3cb..535e406fc13 100644
--- a/modules/dynalite/src/test/resources/logback-test.xml
+++ b/modules/dynalite/src/test/resources/logback-test.xml
@@ -8,17 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.mongodb" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-</configuration>
\ No newline at end of file
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/elasticsearch/src/test/resources/logback-test.xml b/modules/elasticsearch/src/test/resources/logback-test.xml
index 6d3eb183989..535e406fc13 100644
--- a/modules/elasticsearch/src/test/resources/logback-test.xml
+++ b/modules/elasticsearch/src/test/resources/logback-test.xml
@@ -8,10 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/modules/influxdb/src/test/resources/logback-test.xml b/modules/influxdb/src/test/resources/logback-test.xml
index e8f35ff1c79..535e406fc13 100644
--- a/modules/influxdb/src/test/resources/logback-test.xml
+++ b/modules/influxdb/src/test/resources/logback-test.xml
@@ -8,17 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO"/>
-    <logger name="io.netty" level="WARN"/>
-    <logger name="org.mongodb" level="INFO"/>
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
index a01146fe7a3..7230759382d 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
@@ -2,15 +2,20 @@
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import org.junit.After;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.HashSet;
+import java.util.Set;
 
 abstract class AbstractContainerDatabaseTest {
 
+    private final Set<HikariDataSource> datasourcesForCleanup = new HashSet<>();
+
     ResultSet performQuery(JdbcDatabaseContainer container, String sql) throws SQLException {
         DataSource ds = getDataSource(container);
         Statement statement = ds.getConnection().createStatement();
@@ -26,7 +31,16 @@ DataSource getDataSource(JdbcDatabaseContainer container) {
         hikariConfig.setJdbcUrl(container.getJdbcUrl());
         hikariConfig.setUsername(container.getUsername());
         hikariConfig.setPassword(container.getPassword());
+        hikariConfig.setDriverClassName(container.getDriverClassName());
+
+        final HikariDataSource dataSource = new HikariDataSource(hikariConfig);
+        datasourcesForCleanup.add(dataSource);
+
+        return dataSource;
+    }
 
-        return new HikariDataSource(hikariConfig);
+    @After
+    public void teardown() {
+        datasourcesForCleanup.forEach(HikariDataSource::close);
     }
 }
diff --git a/modules/jdbc-test/src/test/resources/logback-test.xml b/modules/jdbc-test/src/test/resources/logback-test.xml
index b0f6b00e3e0..535e406fc13 100644
--- a/modules/jdbc-test/src/test/resources/logback-test.xml
+++ b/modules/jdbc-test/src/test/resources/logback-test.xml
@@ -8,18 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.mongodb" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index e480070168f..36a6461aa74 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -1,11 +1,8 @@
 package org.testcontainers.containers;
 
-import lombok.NonNull;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.NonNull;
 import org.jetbrains.annotations.NotNull;
-import org.rnorth.ducttape.ratelimits.RateLimiter;
-import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
-import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.delegate.DatabaseDelegate;
 import org.testcontainers.ext.ScriptUtils;
@@ -19,7 +16,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Base class for containers that expose a JDBC connection
@@ -33,11 +29,6 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
     private String initScriptPath;
     protected Map<String, String> parameters = new HashMap<>();
 
-    private static final RateLimiter DB_CONNECT_RATE_LIMIT = RateLimiterBuilder.newBuilder()
-        .withRate(10, TimeUnit.SECONDS)
-        .withConstantThroughput()
-        .build();
-
     private int startupTimeoutSeconds = 120;
     private int connectTimeoutSeconds = 120;
 
@@ -123,26 +114,39 @@ public SELF withInitScript(String initScriptPath) {
 
     @Override
     protected void waitUntilContainerStarted() {
-        // Repeatedly try and open a connection to the DB and execute a test query
-
         logger().info("Waiting for database connection to become available at {} using query '{}'", getJdbcUrl(), getTestQueryString());
-        Unreliables.retryUntilSuccess(getStartupTimeoutSeconds(), TimeUnit.SECONDS, () -> {
 
-            if (!isRunning()) {
-                throw new ContainerLaunchException("Container failed to start");
-            }
-
-            try (Connection connection = createConnection("")) {
-                boolean success = connection.createStatement().execute(JdbcDatabaseContainer.this.getTestQueryString());
-
-                if (success) {
-                    logger().info("Obtained a connection to container ({})", JdbcDatabaseContainer.this.getJdbcUrl());
-                    return null;
-                } else {
-                    throw new SQLException("Failed to execute test query");
+        // Repeatedly try and open a connection to the DB and execute a test query
+        long start = System.currentTimeMillis();
+        try {
+            while (System.currentTimeMillis() < start + (1000 * startupTimeoutSeconds)) {
+                try {
+                    if (!isRunning()) {
+                        Thread.sleep(100L);
+                        continue; // Don't attempt to connect yet
+                    }
+
+                    try (Connection connection = createConnection("")) {
+                        boolean testQuerySucceeded = connection.createStatement().execute(this.getTestQueryString());
+                        if (testQuerySucceeded) {
+                            break;
+                        }
+                    }
+                } catch (NoDriverFoundException e) {
+                    // we explicitly want this exception to fail fast without retries
+                    throw e;
+                } catch (Exception e) {
+                    // ignore so that we can try again
+                    logger().debug("Failure when trying test query", e);
+                    Thread.sleep(100L);
                 }
             }
-        });
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ContainerLaunchException("Container startup wait was interrupted", e);
+        }
+
+        logger().info("Container is started (JDBC URL: {})", JdbcDatabaseContainer.this.getJdbcUrl());
     }
 
     @Override
@@ -155,14 +159,14 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
      *
      * @return a JDBC Driver
      */
-    public Driver getJdbcDriverInstance() {
+    public Driver getJdbcDriverInstance() throws NoDriverFoundException {
 
         synchronized (DRIVER_LOAD_MUTEX) {
             if (driver == null) {
                 try {
                     driver = (Driver) Class.forName(this.getDriverClassName()).newInstance();
                 } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
-                    throw new RuntimeException("Could not get Driver", e);
+                    throw new NoDriverFoundException("Could not get Driver", e);
                 }
             }
         }
@@ -178,7 +182,7 @@ public Driver getJdbcDriverInstance() {
      * @return a Connection
      * @throws SQLException if there is a repeated failure to create the connection
      */
-    public Connection createConnection(String queryString) throws SQLException {
+    public Connection createConnection(String queryString) throws SQLException, NoDriverFoundException {
         final Properties info = new Properties();
         info.put("user", this.getUsername());
         info.put("password", this.getPassword());
@@ -186,13 +190,24 @@ public Connection createConnection(String queryString) throws SQLException {
 
         final Driver jdbcDriverInstance = getJdbcDriverInstance();
 
+        SQLException lastException = null;
         try {
-            return Unreliables.retryUntilSuccess(getConnectTimeoutSeconds(), TimeUnit.SECONDS, () ->
-                DB_CONNECT_RATE_LIMIT.getWhenReady(() ->
-                    jdbcDriverInstance.connect(url, info)));
-        } catch (Exception e) {
-            throw new SQLException("Could not create new connection", e);
+            long start = System.currentTimeMillis();
+            // give up if we hit the time limit or the container stops running for some reason
+            while (System.currentTimeMillis() < start + (1000 * connectTimeoutSeconds) && isRunning()) {
+                try {
+                    logger().debug("Trying to create JDBC connection using {} to {} with properties: {}", driver.getClass().getName(), url, info);
+
+                    return jdbcDriverInstance.connect(url, info);
+                } catch (SQLException e) {
+                    lastException = e;
+                    Thread.sleep(100L);
+                }
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         }
+        throw new SQLException("Could not create new connection", lastException);
     }
 
     /**
@@ -256,4 +271,10 @@ protected int getConnectTimeoutSeconds() {
     protected DatabaseDelegate getDatabaseDelegate() {
         return new JdbcDatabaseDelegate(this, "");
     }
+
+    public static class NoDriverFoundException extends RuntimeException {
+        public NoDriverFoundException(String message, Throwable e) {
+            super(message, e);
+        }
+    }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
new file mode 100644
index 00000000000..38ae38095eb
--- /dev/null
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -0,0 +1,86 @@
+package org.testcontainers.jdbc;
+
+import com.google.common.base.Throwables;
+import org.junit.Test;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.rnorth.visibleassertions.VisibleAssertions.fail;
+
+public class MissingJdbcDriverTest {
+
+    @Test
+    public void shouldFailFastIfNoDriverFound() {
+
+        final MissingDriverContainer container = new MissingDriverContainer();
+
+        try {
+            container.start();
+            fail("The container is expected to fail to start");
+        } catch (Exception e) {
+            final Throwable rootCause = Throwables.getRootCause(e);
+            assertTrue("ClassNotFoundException is the root cause", rootCause instanceof ClassNotFoundException);
+        } finally {
+            container.stop();
+        }
+
+        assertEquals("only one connection attempt should have been made", 1, container.getConnectionAttempts());
+    }
+
+    /**
+     * Container class for the purposes of testing, with a known non-existent driver
+     */
+    static class MissingDriverContainer extends JdbcDatabaseContainer {
+        private final AtomicInteger connectionAttempts = new AtomicInteger();
+
+        MissingDriverContainer() {
+            super("mysql:5.7.22");
+            withEnv("MYSQL_ROOT_PASSWORD", "test");
+            withExposedPorts(3306);
+        }
+
+        @Override
+        public String getDriverClassName() {
+            return "nonexistent.ClassName";
+        }
+
+        @Override
+        public String getJdbcUrl() {
+            return "";
+        }
+
+        @Override
+        public String getUsername() {
+            return "root";
+        }
+
+        @Override
+        public String getPassword() {
+            return "test";
+        }
+
+        @Override
+        protected String getTestQueryString() {
+            return "";
+        }
+
+        @Override
+        public Connection createConnection(String queryString) throws SQLException, NoDriverFoundException {
+            connectionAttempts.incrementAndGet(); //
+            return super.createConnection(queryString);
+        }
+
+        /**
+         * test window
+         * @return how many times a connection was attempted
+         */
+        int getConnectionAttempts() {
+            return connectionAttempts.get();
+        }
+    }
+}
diff --git a/modules/jdbc/src/test/resources/logback-test.xml b/modules/jdbc/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/jdbc/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/junit-jupiter/src/test/resources/logback-test.xml b/modules/junit-jupiter/src/test/resources/logback-test.xml
index 1d1a7695915..535e406fc13 100644
--- a/modules/junit-jupiter/src/test/resources/logback-test.xml
+++ b/modules/junit-jupiter/src/test/resources/logback-test.xml
@@ -8,8 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-</configuration>
\ No newline at end of file
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/kafka/src/test/resources/logback-test.xml b/modules/kafka/src/test/resources/logback-test.xml
index 7bd6a94d827..535e406fc13 100644
--- a/modules/kafka/src/test/resources/logback-test.xml
+++ b/modules/kafka/src/test/resources/logback-test.xml
@@ -13,6 +13,4 @@
     </root>
 
     <logger name="org.testcontainers" level="DEBUG"/>
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/modules/localstack/src/test/resources/logback-test.xml b/modules/localstack/src/test/resources/logback-test.xml
index cc69fdf0ce0..535e406fc13 100644
--- a/modules/localstack/src/test/resources/logback-test.xml
+++ b/modules/localstack/src/test/resources/logback-test.xml
@@ -8,20 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.mongodb" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-
-    <!-- Prevent noisy logs - any errors thrown will be logged when caught if they need to be -->
-    <logger name="com.github.dockerjava.core.async.ResultCallbackTemplate" level="OFF"/>
-</configuration>
\ No newline at end of file
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/neo4j/src/test/resources/logback-test.xml b/modules/neo4j/src/test/resources/logback-test.xml
index 7bd6a94d827..535e406fc13 100644
--- a/modules/neo4j/src/test/resources/logback-test.xml
+++ b/modules/neo4j/src/test/resources/logback-test.xml
@@ -13,6 +13,4 @@
     </root>
 
     <logger name="org.testcontainers" level="DEBUG"/>
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/modules/nginx/src/test/resources/logback-test.xml b/modules/nginx/src/test/resources/logback-test.xml
index b0f6b00e3e0..535e406fc13 100644
--- a/modules/nginx/src/test/resources/logback-test.xml
+++ b/modules/nginx/src/test/resources/logback-test.xml
@@ -8,18 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.mongodb" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/modules/oracle-xe/src/test/resources/logback-test.xml b/modules/oracle-xe/src/test/resources/logback-test.xml
index b0f6b00e3e0..535e406fc13 100644
--- a/modules/oracle-xe/src/test/resources/logback-test.xml
+++ b/modules/oracle-xe/src/test/resources/logback-test.xml
@@ -8,18 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.mongodb" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index eb7b78b1864..a9429210261 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -59,7 +59,8 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:postgresql://" + getContainerIpAddress() + ":" + getMappedPort(POSTGRESQL_PORT) + "/" + databaseName;
+        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
+        return "jdbc:postgresql://" + getContainerIpAddress() + ":" + getMappedPort(POSTGRESQL_PORT) + "/" + databaseName + "?loggerLevel=OFF";
     }
 
     @Override
diff --git a/modules/pulsar/src/test/resources/logback-test.xml b/modules/pulsar/src/test/resources/logback-test.xml
index 7bd6a94d827..535e406fc13 100644
--- a/modules/pulsar/src/test/resources/logback-test.xml
+++ b/modules/pulsar/src/test/resources/logback-test.xml
@@ -13,6 +13,4 @@
     </root>
 
     <logger name="org.testcontainers" level="DEBUG"/>
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/modules/selenium/src/test/resources/logback-test.xml b/modules/selenium/src/test/resources/logback-test.xml
index b0f6b00e3e0..535e406fc13 100644
--- a/modules/selenium/src/test/resources/logback-test.xml
+++ b/modules/selenium/src/test/resources/logback-test.xml
@@ -8,18 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.mongodb" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-
+    <logger name="org.testcontainers" level="DEBUG"/>
 </configuration>
diff --git a/modules/spock/src/test/resources/logback-test.xml b/modules/spock/src/test/resources/logback-test.xml
index 1d1a7695915..535e406fc13 100644
--- a/modules/spock/src/test/resources/logback-test.xml
+++ b/modules/spock/src/test/resources/logback-test.xml
@@ -8,8 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-</configuration>
\ No newline at end of file
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/vault/src/test/resources/logback-test.xml b/modules/vault/src/test/resources/logback-test.xml
index 5d27573a3cb..535e406fc13 100644
--- a/modules/vault/src/test/resources/logback-test.xml
+++ b/modules/vault/src/test/resources/logback-test.xml
@@ -8,17 +8,9 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.apache.http" level="WARN"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.zeroturnaround.exec" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-    <logger name="org.rnorth.tcpunixsocketproxy" level="INFO" />
-    <logger name="io.netty" level="WARN" />
-    <logger name="org.mongodb" level="INFO" />
-    <logger name="org.testcontainers.shaded" level="WARN"/>
-    <logger name="com.zaxxer.hikari" level="INFO"/>
-</configuration>
\ No newline at end of file
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>

From 67501e83ffb759256d4f1752683e77e17d1fbf70 Mon Sep 17 00:00:00 2001
From: Jameel Al-Aziz <247849+jalaziz@users.noreply.github.com>
Date: Sun, 21 Jul 2019 02:42:35 -0700
Subject: [PATCH 0167/4969] Add container stopping and stopped hooks (#1610)

Add pre-stop and post-stop hooks to the GenericContainer. This provides
symmetry to the equavilent starting/started hooks and allows custom
behaviour to be defined in sub-classes.
---
 .../containers/GenericContainer.java          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 8045d47c720..7e37839979b 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -333,7 +333,9 @@ public void stop() {
                 imageName = "<unknown>";
             }
 
+            containerIsStopping(containerInfo);
             ResourceReaper.instance().stopAndRemoveContainer(containerId, imageName);
+            containerIsStopped(containerInfo);
         } finally {
             containerId = null;
             containerInfo = null;
@@ -382,6 +384,24 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
     }
 
+    /**
+     * A hook that is executed before the container is stopped with {@link #stop()}.
+     * Warning! This hook won't be executed if the container is terminated during
+     * the JVM's shutdown hook or by Ryuk.
+     */
+    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
+    protected void containerIsStopping(InspectContainerResponse containerInfo) {
+    }
+
+    /**
+     * A hook that is executed after the container is stopped with {@link #stop()}.
+     * Warning! This hook won't be executed if the container is terminated during
+     * the JVM's shutdown hook or by Ryuk.
+     */
+    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
+    protected void containerIsStopped(InspectContainerResponse containerInfo) {
+    }
+
     /**
      * @return the port on which to check if the container is ready
      * @deprecated see {@link GenericContainer#getLivenessCheckPorts()} for replacement

From 908a4ecebddf7cc2b053f64f7bf0550192c041a4 Mon Sep 17 00:00:00 2001
From: kellen <kellen@users.noreply.github.com>
Date: Mon, 22 Jul 2019 05:06:53 -0400
Subject: [PATCH 0168/4969] Enable command override for PostgreSQLContainer
 (#938)

---
 .../junit/SimplePostgreSQLTest.java           | 30 +++++++++++++++----
 .../containers/PostgreSQLContainer.java       |  3 +-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
index c6685343c29..4624268cb2b 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
@@ -7,10 +7,8 @@
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 
-/**
- * @author richardnorth
- */
 public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     @Test
@@ -19,16 +17,36 @@ public void testSimple() throws SQLException {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
-
             int resultSetInt = resultSet.getInt(1);
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
 
+    @Test
+    public void testCommandOverride() throws SQLException {
+        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42")) {
+            postgres.start();
+
+            ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
+            String result = resultSet.getString(1);
+            assertEquals("max_connections should be overriden", "42", result);
+        }
+    }
+
+    @Test
+    public void testUnsetCommand() throws SQLException {
+        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42").withCommand()) {
+            postgres.start();
+
+            ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
+            String result = resultSet.getString(1);
+            assertNotEquals("max_connections should not be overriden", "42", result);
+        }
+    }
+
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()
-                .withInitScript("somepath/init_postgresql.sql")) {
+        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>().withInitScript("somepath/init_postgresql.sql")) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index a9429210261..85ad910aa17 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -34,6 +34,7 @@ public PostgreSQLContainer(final String dockerImageName) {
                 .withRegEx(".*database system is ready to accept connections.*\\s")
                 .withTimes(2)
                 .withStartupTimeout(Duration.of(60, SECONDS));
+        this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
     }
 
     @NotNull
@@ -44,12 +45,10 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-
         addExposedPort(POSTGRESQL_PORT);
         addEnv("POSTGRES_DB", databaseName);
         addEnv("POSTGRES_USER", username);
         addEnv("POSTGRES_PASSWORD", password);
-        setCommand("postgres", "-c", FSYNC_OFF_OPTION);
     }
 
     @Override

From 4df20c2d1d090d8f2d3129ec24b0988faecbe896 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 22 Jul 2019 17:47:59 +0100
Subject: [PATCH 0169/4969] Improve image pull handling, with better logging
 and timeout behaviour (#1320)

---
 .../testcontainers/DockerClientFactory.java   |  15 ++-
 .../containers/DockerComposeContainer.java    |   8 +-
 .../containers/GenericContainer.java          |  46 ++++++-
 .../images/LoggedPullImageResultCallback.java | 121 ++++++++++++++++++
 .../images/RemoteDockerImage.java             |  98 +++++++-------
 ...eLimitedLoggedPullImageResultCallback.java | 117 +++++++++++++++++
 .../images/builder/ImageFromDockerfile.java   |  23 ++--
 .../utility/RegistryAuthLocator.java          |   8 +-
 .../utility/TestcontainersConfiguration.java  |   4 +
 .../dockerclient/ImagePullTest.java           |   1 +
 docs/features/configuration.md                |   4 +
 11 files changed, 362 insertions(+), 83 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
 create mode 100644 core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 72cff0217cd..928b4cad291 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -4,12 +4,17 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.Version;
+import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
-import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import lombok.Getter;
+import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.hamcrest.BaseMatcher;
@@ -17,6 +22,7 @@
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 import org.testcontainers.dockerclient.DockerMachineClientProviderStrategy;
+import org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.ResourceReaper;
@@ -125,7 +131,7 @@ public DockerClient client() {
                 ryukContainerId = ResourceReaper.start(hostIpAddress, client);
                 log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
             }
-           
+
             boolean checksEnabled = !TestcontainersConfiguration.getInstance().isDisableChecks();
             if (checksEnabled) {
                 VisibleAssertions.info("Checking the system...");
@@ -215,10 +221,11 @@ private boolean checkMountableFile() {
     /**
    * Check whether the image is available locally and pull it otherwise
    */
+    @SneakyThrows
     public void checkAndPullImage(DockerClient client, String image) {
         List<Image> images = client.listImagesCmd().withImageNameFilter(image).exec();
         if (images.isEmpty()) {
-            client.pullImageCmd(image).exec(new PullImageResultCallback()).awaitSuccess();
+            client.pullImageCmd(image).exec(new TimeLimitedLoggedPullImageResultCallback(log)).awaitCompletion();
         }
     }
 
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 06a8bd9d597..b21e160d892 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -19,9 +19,7 @@
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.startupcheck.IndefiniteWaitOneShotStartupCheckStrategy;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
-import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.containers.wait.strategy.*;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.utility.*;
 import org.yaml.snakeyaml.Yaml;
@@ -32,9 +30,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
 import java.time.Duration;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.*;
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 7e37839979b..c2701c2f87e 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -3,9 +3,22 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.ContainerNetwork;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumesFrom;
 import com.google.common.base.Strings;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
+import lombok.Setter;
+import lombok.SneakyThrows;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
@@ -33,13 +46,34 @@
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
-import org.testcontainers.utility.*;
-
-import java.io.*;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerLoggerFactory;
+import org.testcontainers.utility.DockerMachineClient;
+import org.testcontainers.utility.MountableFile;
+import org.testcontainers.utility.PathUtils;
+import org.testcontainers.utility.ResourceReaper;
+import org.testcontainers.utility.TestcontainersConfiguration;
+import org.testcontainers.utility.ThrowingFunction;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.time.Duration;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
new file mode 100644
index 00000000000..71b797298aa
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
@@ -0,0 +1,121 @@
+package org.testcontainers.images;
+
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import org.slf4j.Logger;
+
+import java.io.Closeable;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.*;
+
+import static java.lang.String.format;
+import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
+
+/**
+ * {@link PullImageResultCallback} with improved logging of pull progress.
+ */
+class LoggedPullImageResultCallback extends PullImageResultCallback {
+    private final Logger logger;
+
+    private final Set<String> allLayers = new HashSet<>();
+    private final Set<String> downloadedLayers = new HashSet<>();
+    private final Set<String> pulledLayers = new HashSet<>();
+    private final Map<String, Long> totalSizes = new HashMap<>();
+    private final Map<String, Long> currentSizes = new HashMap<>();
+    private boolean completed;
+    private Instant start;
+
+    LoggedPullImageResultCallback(final Logger logger) {
+        this.logger = logger;
+    }
+
+    @Override
+    public void onStart(final Closeable stream) {
+        super.onStart(stream);
+        start = Instant.now();
+
+        logger.info("Starting to pull image");
+    }
+
+    @Override
+    public void onNext(final PullResponseItem item) {
+        super.onNext(item);
+
+        final String statusLowercase = item.getStatus() != null ? item.getStatus().toLowerCase() : "";
+        final String id = item.getId();
+
+        if (item.getProgressDetail() != null) {
+            allLayers.add(id);
+        }
+
+        if (statusLowercase.equalsIgnoreCase("download complete")) {
+            downloadedLayers.add(id);
+        }
+
+        if (statusLowercase.equalsIgnoreCase("pull complete")) {
+            pulledLayers.add(id);
+        }
+
+        if (item.getProgressDetail() != null) {
+            Long total = item.getProgressDetail().getTotal();
+            Long current = item.getProgressDetail().getCurrent();
+
+            if (total != null && total > totalSizes.getOrDefault(id, 0L)) {
+                totalSizes.put(id, total);
+            }
+            if (current != null && current > currentSizes.getOrDefault(id, 0L)) {
+                currentSizes.put(id, current);
+            }
+        }
+
+        if (statusLowercase.startsWith("pulling from" ) || statusLowercase.contains("complete" )) {
+
+            long totalSize = totalLayerSize();
+            long currentSize = downloadedLayerSize();
+
+            int pendingCount = allLayers.size() - downloadedLayers.size();
+            String friendlyTotalSize;
+            if (pendingCount > 0) {
+                friendlyTotalSize = "? MB";
+            } else {
+                friendlyTotalSize = byteCountToDisplaySize(totalSize);
+            }
+
+            logger.info("Pulling image layers: {} pending, {} downloaded, {} extracted, ({}/{})",
+                format("%2d", pendingCount),
+                format("%2d", downloadedLayers.size()),
+                format("%2d", pulledLayers.size()),
+                byteCountToDisplaySize(currentSize),
+                friendlyTotalSize);
+        }
+
+        if (statusLowercase.contains("complete")) {
+            completed = true;
+        }
+    }
+
+    @Override
+    public void onComplete() {
+        super.onComplete();
+
+        final long downloadedLayerSize = downloadedLayerSize();
+        final long duration = Duration.between(start, Instant.now()).getSeconds();
+
+        if (completed) {
+            logger.info("Pull complete. {} layers, pulled in {}s (downloaded {} at {}/s)",
+                allLayers.size(),
+                duration,
+                byteCountToDisplaySize(downloadedLayerSize),
+                byteCountToDisplaySize(downloadedLayerSize / duration));
+        }
+    }
+
+    private long downloadedLayerSize() {
+        return currentSizes.values().stream().filter(Objects::nonNull).mapToLong(it -> it).sum();
+    }
+
+    private long totalLayerSize() {
+        return totalSizes.values().stream().filter(Objects::nonNull).mapToLong(it -> it).sum();
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index d0bc47d6b12..7aff7918f6d 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -24,6 +24,10 @@
 @ToString
 public class RemoteDockerImage extends LazyFuture<String> {
 
+    /**
+     * @deprecated this field will become private in a later release
+     */
+    @Deprecated
     public static final Set<DockerImageName> AVAILABLE_IMAGE_NAME_CACHE = new HashSet<>();
 
     private DockerImageName imageName;
@@ -42,59 +46,47 @@ protected final String resolve() {
 
         DockerClient dockerClient = DockerClientFactory.instance().client();
         try {
-            int attempts = 0;
-            Exception lastException = null;
-            while (true) {
-                // Does our cache already know the image?
-                if (AVAILABLE_IMAGE_NAME_CACHE.contains(imageName)) {
-                    logger.trace("{} is already in image name cache", imageName);
-                    break;
-                }
-
-                // Update the cache
-                ListImagesCmd listImagesCmd = dockerClient.listImagesCmd();
-
-                if (Boolean.parseBoolean(System.getProperty("useFilter"))) {
-                    listImagesCmd = listImagesCmd.withImageNameFilter(imageName.toString());
-                }
-
-                List<Image> updatedImages = listImagesCmd.exec();
-                updatedImages.stream()
-                    .map(Image::getRepoTags)
-                    .filter(Objects::nonNull)
-                    .flatMap(Stream::of)
-                    .map(DockerImageName::new)
-                    .collect(Collectors.toCollection(() -> AVAILABLE_IMAGE_NAME_CACHE));
-
-                // And now?
-                if (AVAILABLE_IMAGE_NAME_CACHE.contains(imageName)) {
-                    logger.trace("{} is in image name cache following listing of images", imageName);
-                    break;
-                }
-
-                // Log only on first attempt
-                if (attempts == 0) {
-                    logger.info("Pulling docker image: {}. Please be patient; this may take some time but only needs to be done once.", imageName);
-                }
-
-                if (attempts++ >= 3) {
-                    logger.error("Retry limit reached while trying to pull image: {}. Please check output of `docker pull {}`", imageName, imageName);
-                    throw new ContainerFetchException("Retry limit reached while trying to pull image: " + imageName, lastException);
-                }
-
-                // The image is not available locally - pull it
-                try {
-                    final PullImageResultCallback callback = new PullImageResultCallback();
-                    dockerClient
-                        .pullImageCmd(imageName.getUnversionedPart())
-                        .withTag(imageName.getVersionPart())
-                        .exec(callback);
-                    callback.awaitCompletion();
-                    AVAILABLE_IMAGE_NAME_CACHE.add(imageName);
-                    break;
-                } catch (Exception e) {
-                    lastException = e;
-                }
+            // Does our cache already know the image?
+            if (AVAILABLE_IMAGE_NAME_CACHE.contains(imageName)) {
+                logger.trace("{} is already in image name cache", imageName);
+                return imageName.toString();
+            }
+
+            // Update the cache
+            ListImagesCmd listImagesCmd = dockerClient.listImagesCmd();
+
+            if (Boolean.parseBoolean(System.getProperty("useFilter"))) {
+                listImagesCmd = listImagesCmd.withImageNameFilter(imageName.toString());
+            }
+
+            List<Image> updatedImages = listImagesCmd.exec();
+            updatedImages.stream()
+                .map(Image::getRepoTags)
+                .filter(Objects::nonNull)
+                .flatMap(Stream::of)
+                .map(DockerImageName::new)
+                .collect(Collectors.toCollection(() -> AVAILABLE_IMAGE_NAME_CACHE));
+
+            // And now?
+            if (AVAILABLE_IMAGE_NAME_CACHE.contains(imageName)) {
+                logger.trace("{} is in image name cache following listing of images", imageName);
+                return imageName.toString();
+            }
+
+            logger.info("Pulling docker image: {}. Please be patient; this may take some time but only needs to be done once.", imageName);
+
+            // The image is not available locally - pull it
+            try {
+                final PullImageResultCallback callback = new TimeLimitedLoggedPullImageResultCallback(logger);
+                dockerClient
+                    .pullImageCmd(imageName.getUnversionedPart())
+                    .withTag(imageName.getVersionPart())
+                    .exec(callback);
+                callback.awaitCompletion();
+                AVAILABLE_IMAGE_NAME_CACHE.add(imageName);
+            } catch (Exception e) {
+                logger.error("Failed to pull image: {}. Please check output of `docker pull {}`", imageName, imageName);
+                throw new ContainerFetchException("Failed to pull image: " + imageName, e);
             }
 
             return imageName.toString();
diff --git a/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
new file mode 100644
index 00000000000..20b7de6c666
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
@@ -0,0 +1,117 @@
+package org.testcontainers.images;
+
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import org.slf4j.Logger;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.testcontainers.DockerClientFactory.TESTCONTAINERS_THREAD_GROUP;
+
+/**
+ * {@link PullImageResultCallback} with improved logging of pull progress and a 'watchdog' which will abort the pull
+ * if progress is not being made, to prevent a hanging test
+ */
+public class TimeLimitedLoggedPullImageResultCallback extends LoggedPullImageResultCallback {
+
+    private static final AtomicInteger THREAD_ID = new AtomicInteger(0);
+    private static final ScheduledExecutorService PROGRESS_WATCHDOG_EXECUTOR =
+        Executors.newScheduledThreadPool(0, runnable -> {
+            Thread t = new Thread(TESTCONTAINERS_THREAD_GROUP, runnable);
+            t.setDaemon(true);
+            t.setName("testcontainers-pull-watchdog-" + THREAD_ID.incrementAndGet());
+            return t;
+        });
+    private static final Duration PULL_PAUSE_TOLERANCE = Duration.ofSeconds(TestcontainersConfiguration.getInstance().getImagePullPauseTimeout());
+    private final Logger logger;
+
+    // A future which, if it ever fires, will kill the pull
+    private ScheduledFuture<?> nextCheckForProgress;
+
+    // All threads that are 'awaiting' this pull
+    private final Set<Thread> waitingThreads = new HashSet<>();
+
+    public TimeLimitedLoggedPullImageResultCallback(Logger logger) {
+        super(logger);
+        this.logger = logger;
+    }
+
+    @Override
+    public PullImageResultCallback awaitCompletion() throws InterruptedException {
+        waitingThreads.add(Thread.currentThread());
+        return super.awaitCompletion();
+    }
+
+    @Override
+    public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
+        waitingThreads.add(Thread.currentThread());
+        return super.awaitCompletion(timeout, timeUnit);
+    }
+
+    @Override
+    public void onNext(PullResponseItem item) {
+        if (item.getProgressDetail() != null) {
+            resetProgressWatchdog(false);
+        }
+        super.onNext(item);
+    }
+
+    @Override
+    public void onStart(Closeable stream) {
+        resetProgressWatchdog(false);
+        super.onStart(stream);
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+        resetProgressWatchdog(true);
+        super.onError(throwable);
+    }
+
+    @Override
+    public void onComplete() {
+        resetProgressWatchdog(true);
+        super.onComplete();
+    }
+
+
+    /*
+     * This method schedules a future task which will interrupt the waiting waiting threads if ever fired.
+     * Every time this method is called (from onStart or onNext), the task is cancelled and recreated 30s in the future,
+     * ensuring that it will only fire if the method stops being called regularly (e.g. if the pull has hung).
+     */
+    private void resetProgressWatchdog(boolean isFinished) {
+        if (nextCheckForProgress != null && ! nextCheckForProgress.isCancelled()) {
+            nextCheckForProgress.cancel(false);
+        }
+        if (!isFinished) {
+            nextCheckForProgress = PROGRESS_WATCHDOG_EXECUTOR.schedule(
+                this::abortPull,
+                PULL_PAUSE_TOLERANCE.getSeconds(),
+                TimeUnit.SECONDS
+            );
+        }
+    }
+
+    private void abortPull() {
+        logger.error("Docker image pull has not made progress in {}s - aborting pull", PULL_PAUSE_TOLERANCE.getSeconds());
+        // Interrupt any threads that are waiting, before closing streams, because the stream can take
+        //  an indeterminate amount of time to close
+        waitingThreads.forEach(Thread::interrupt);
+        try {
+            close();
+        } catch (IOException ignored) {
+            // no action
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index f4968c11ff0..8c653718a69 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -14,12 +14,15 @@
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
-import org.testcontainers.images.builder.traits.*;
+import org.testcontainers.images.builder.traits.BuildContextBuilderTrait;
+import org.testcontainers.images.builder.traits.ClasspathTrait;
+import org.testcontainers.images.builder.traits.DockerfileTrait;
+import org.testcontainers.images.builder.traits.FilesTrait;
+import org.testcontainers.images.builder.traits.StringsTrait;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.LazyFuture;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
@@ -123,7 +126,7 @@ public void onNext(BuildResponseItem item) {
             configure(buildImageCmd);
 
             BuildImageResultCallback exec = buildImageCmd.exec(resultCallback);
-            
+
             long bytesToDockerDaemon = 0;
 
             // To build an image, we have to send the context to Docker in TAR archive format
@@ -138,10 +141,10 @@ public void onNext(BuildResponseItem item) {
                 }
                 tarArchive.finish();
             }
-            
+
             log.info("Transferred {} KB to Docker daemon", FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
             if (bytesToDockerDaemon > FileUtils.ONE_MB * 50) // warn if >50MB sent to docker daemon
-                log.warn("A large amount of data was sent to the Docker daemon ({}). Consider using a .dockerignore file for better performance.", 
+                log.warn("A large amount of data was sent to the Docker daemon ({}). Consider using a .dockerignore file for better performance.",
                         FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
 
             exec.awaitImageId();
@@ -170,8 +173,8 @@ public ImageFromDockerfile withBuildArgs(final Map<String, String> args) {
     }
 
     /**
-     * Sets the Dockerfile to be used for this image. 
-     * @deprecated It is recommended to use {@link #withDockerfile} instead because it honors 
+     * Sets the Dockerfile to be used for this image.
+     * @deprecated It is recommended to use {@link #withDockerfile} instead because it honors
      * .dockerignore files and therefore will be more efficient
      * @param relativePathFromBuildRoot
      */
@@ -180,14 +183,14 @@ public ImageFromDockerfile withDockerfilePath(String relativePathFromBuildRoot)
         this.dockerFilePath = Optional.of(relativePathFromBuildRoot);
         return this;
     }
-    
+
     /**
-     * Sets the Dockerfile to be used for this image. 
+     * Sets the Dockerfile to be used for this image.
      * @param dockerfile
      */
     public ImageFromDockerfile withDockerfile(Path dockerfile) {
         this.dockerfile = Optional.of(dockerfile);
         return this;
     }
-    
+
 }
diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index a1be23eb82e..5b248aea04e 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -209,7 +209,7 @@ private Map.Entry<String, JsonNode> findAuthNode(final JsonNode config, final St
     private AuthConfig runCredentialProvider(String hostName, String helperOrStoreName) throws Exception {
 
         if (isBlank(hostName)) {
-            log.debug("There is no point to locate AuthConfig for blank hostName. Return NULL to allow fallback");
+            log.debug("There is no point in locating AuthConfig for blank hostName. Returning NULL to allow fallback");
             return null;
         }
 
@@ -228,9 +228,9 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
             if (!isBlank(responseErrorMsg)) {
                 String credentialsNotFoundMsg = getGenericCredentialsNotFoundMsg(credentialProgramName);
                 if (credentialsNotFoundMsg != null && credentialsNotFoundMsg.equals(responseErrorMsg)) {
-                    log.info("Credentials not found for host ({}) when using credential helper/store ({})",
-                        hostName,
-                        credentialProgramName);
+                    log.info("Credential helper/store ({}) does not have credentials for {}",
+                        credentialProgramName,
+                        hostName);
 
                     return null;
                 }
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index f87b02a17d3..608d02716d0 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -82,6 +82,10 @@ public String getTransportType() {
         return properties.getProperty("transport.type", "okhttp");
     }
 
+    public Integer getImagePullPauseTimeout() {
+        return Integer.parseInt((String) properties.getOrDefault("pull.pause.timeout", "30"));
+    }
+
     @Synchronized
     public boolean updateGlobalConfig(@NonNull String prop, @NonNull String value) {
         try {
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index 47ad456dc26..6e319838888 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -24,6 +24,7 @@ public static String[] parameters() {
             "quay.io/testcontainers/ryuk:latest",
             "quay.io/testcontainers/ryuk:0.2.3",
             "quay.io/testcontainers/ryuk@sha256:bb5a635cac4bd96c93cc476969ce11dc56436238ec7cd028d0524462f4739dd9",
+//            "ibmcom/db2express-c", // Big image for testing with slow networks
         };
     }
 
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 72b5cac65f7..2ef7e4997a3 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -59,3 +59,7 @@ but does not allow starting privileged containers, you can turn off the Ryuk con
 !!!tip
     Note that Testcontainers will continue doing the cleanup at JVM's shutdown, unless you `kill -9` your JVM process.
 
+## Customizing image pull behaviour
+
+> **pull.pause.timeout = 30**
+> By default Testcontainers will abort the pull of an image if the pull appears stalled (no data transferred) for longer than this duration (in seconds).

From 1d686a1d99050a213572891702e531cacb372ad6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 23 Jul 2019 10:15:36 +0200
Subject: [PATCH 0170/4969] Implement `dependsOn` for cross-container
 dependencies (#1404)

* Implement `dependsOn` for cross-container dependencies

* Add transitive test case

* fix the compilation on JDK 11

* avoid a recursive update in `computeIfAbsent`

* javadocs, add a test case for the diamond graph
---
 .../containers/GenericContainer.java          |  37 ++++-
 .../testcontainers/lifecycle/Startable.java   |   7 +
 .../testcontainers/lifecycle/Startables.java  |  76 ++++++++++
 .../junit/DependenciesTest.java               | 142 ++++++++++++++++++
 4 files changed, 261 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/java/org/testcontainers/lifecycle/Startables.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/DependenciesTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index c2701c2f87e..14ce129c9a5 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -44,6 +44,7 @@
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.lifecycle.Startables;
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
 import org.testcontainers.utility.Base58;
@@ -74,6 +75,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -88,7 +90,6 @@
  * Base class for that allows a container to be launched and controlled.
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 public class GenericContainer<SELF extends GenericContainer<SELF>>
         extends FailureDetectingExternalResource
         implements Container<SELF>, AutoCloseable, WaitStrategyTarget, Startable {
@@ -165,6 +166,8 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     private Map<MountableFile, String> copyToFileContainerPathMap = new HashMap<>();
 
+    protected final Set<Startable> dependencies = new HashSet<>();
+
     /*
      * Unique instance of DockerClient for use by this container object.
      */
@@ -232,6 +235,26 @@ public GenericContainer(@NonNull final Future<String> image) {
         this.image = image;
     }
 
+    /**
+     * @see #dependsOn(List)
+     */
+    public SELF dependsOn(Startable... startables) {
+        Collections.addAll(dependencies, startables);
+        return self();
+    }
+
+    /**
+     * Delays this container's creation and start until provided {@link Startable}s start first.
+     * Note that the circular dependencies are not supported.
+     *
+     * @param startables a list of {@link Startable} to depend on
+     * @see Startables#deepStart(Collection)
+     */
+    public SELF dependsOn(List<Startable> startables) {
+        dependencies.addAll(startables);
+        return self();
+    }
+
     public String getContainerId() {
         return containerId;
     }
@@ -240,10 +263,12 @@ public String getContainerId() {
      * Starts the container using docker, pulling an image if necessary.
      */
     @Override
+    @SneakyThrows({InterruptedException.class, ExecutionException.class})
     public void start() {
         if (containerId != null) {
             return;
         }
+        Startables.deepStart(dependencies).get();
         doStart();
     }
 
@@ -1221,6 +1246,16 @@ public SELF withTmpFs(Map<String, String> mapping) {
         return self();
     }
 
+    @Override
+    public boolean equals(Object o) {
+        return this == o;
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
     /**
      * Convenience class with access to non-public members of GenericContainer.
      *
diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startable.java b/core/src/main/java/org/testcontainers/lifecycle/Startable.java
index fa2bfd9dfc5..3e73968d06e 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startable.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startable.java
@@ -1,7 +1,14 @@
 package org.testcontainers.lifecycle;
 
+import java.util.Collections;
+import java.util.Set;
+
 public interface Startable extends AutoCloseable {
 
+    default Set<Startable> getDependencies() {
+        return Collections.emptySet();
+    }
+
     void start();
 
     void stop();
diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
new file mode 100644
index 00000000000..0e6452c1914
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -0,0 +1,76 @@
+package org.testcontainers.lifecycle;
+
+import lombok.experimental.UtilityClass;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
+
+@UtilityClass
+public class Startables {
+
+    private static final Executor EXECUTOR = Executors.newCachedThreadPool(new ThreadFactory() {
+
+        private final AtomicLong COUNTER = new AtomicLong(0);
+
+        @Override
+        public Thread newThread(Runnable r) {
+            Thread thread = new Thread(r, "testcontainers-lifecycle-" + COUNTER.getAndIncrement());
+            thread.setDaemon(true);
+            return thread;
+        }
+    });
+
+    /**
+     * @see #deepStart(Stream)
+     */
+    public CompletableFuture<Void> deepStart(Collection<Startable> startables) {
+        return deepStart(startables.stream());
+    }
+
+    /**
+     * Start every {@link Startable} recursively and asynchronously and join on the result.
+     *
+     * Performance note:
+     * The method uses and returns {@link CompletableFuture}s to resolve as many {@link Startable}s at once as possible.
+     * This way, for the following graph:
+     *   / b \
+     * a      e
+     *     c /
+     *     d /
+     * "a", "c" and "d" will resolve in parallel, then "b".
+     *
+     * If we would call blocking {@link Startable#start()}, "e" would wait for "b", "b" for "a", and only then "c", and then "d".
+     * But, since "c" and "d" are independent from "a", there is no point in waiting for "a" to be resolved first.
+     *
+     * @param startables a {@link Stream} of {@link Startable}s to start and scan for transitive dependencies.
+     * @return a {@link CompletableFuture} that resolves once all {@link Startable}s have started.
+     */
+    public CompletableFuture<Void> deepStart(Stream<Startable> startables) {
+        return deepStart(new HashMap<>(), startables);
+    }
+
+    /**
+     *
+     * @param started an intermediate storage for already started {@link Startable}s to prevent multiple starts.
+     * @param startables a {@link Stream} of {@link Startable}s to start and scan for transitive dependencies.
+     */
+    private CompletableFuture<Void> deepStart(Map<Startable, CompletableFuture<Void>> started, Stream<Startable> startables) {
+        CompletableFuture[] futures = startables
+            .map(it -> {
+                // avoid a recursive update in `computeIfAbsent`
+                Map<Startable, CompletableFuture<Void>> subStarted = new HashMap<>(started);
+                CompletableFuture<Void> future = started.computeIfAbsent(it, startable -> {
+                    return deepStart(subStarted, startable.getDependencies().stream()).thenRunAsync(startable::start, EXECUTOR);
+                });
+                started.putAll(subStarted);
+                return future;
+            })
+            .toArray(CompletableFuture[]::new);
+
+        return CompletableFuture.allOf(futures);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
new file mode 100644
index 00000000000..df7e85a31f8
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
@@ -0,0 +1,142 @@
+package org.testcontainers.junit;
+
+import lombok.Getter;
+import org.junit.Test;
+import org.rnorth.visibleassertions.VisibleAssertions;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.lifecycle.Startables;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
+
+public class DependenciesTest {
+
+    @Test
+    public void shouldWorkWithSimpleDependency() {
+        InvocationCountingStartable startable = new InvocationCountingStartable();
+
+        try (
+            GenericContainer container = new GenericContainer()
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .dependsOn(startable)
+        ) {
+            container.start();
+        }
+
+        VisibleAssertions.assertEquals("Started once", 1, startable.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("Does not trigger .stop()", 0, startable.getStopInvocationCount().intValue());
+    }
+
+    @Test
+    public void shouldWorkWithMutlipleDependencies() {
+        InvocationCountingStartable startable1 = new InvocationCountingStartable();
+        InvocationCountingStartable startable2 = new InvocationCountingStartable();
+
+        try (
+            GenericContainer container = new GenericContainer()
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .dependsOn(startable1, startable2)
+        ) {
+            container.start();
+        }
+
+        VisibleAssertions.assertEquals("Startable1 started once", 1, startable1.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("Startable2 started once", 1, startable2.getStartInvocationCount().intValue());
+    }
+
+    @Test
+    public void shouldStartEveryTime() {
+        InvocationCountingStartable startable = new InvocationCountingStartable();
+
+        try (
+            GenericContainer container = new GenericContainer()
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .dependsOn(startable)
+        ) {
+            container.start();
+            container.stop();
+
+            container.start();
+            container.stop();
+
+            container.start();
+        }
+
+        VisibleAssertions.assertEquals("Started multiple times", 3, startable.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("Does not trigger .stop()", 0, startable.getStopInvocationCount().intValue());
+    }
+
+    @Test
+    public void shouldStartTransitiveDependencies() {
+        InvocationCountingStartable transitiveOfTransitiveStartable = new InvocationCountingStartable();
+        InvocationCountingStartable transitiveStartable = new InvocationCountingStartable();
+        transitiveStartable.getDependencies().add(transitiveOfTransitiveStartable);
+
+        InvocationCountingStartable startable = new InvocationCountingStartable();
+        startable.getDependencies().add(transitiveStartable);
+
+        try (
+            GenericContainer container = new GenericContainer()
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .dependsOn(startable)
+        ) {
+            container.start();
+            container.stop();
+        }
+
+        VisibleAssertions.assertEquals("Root started", 1, startable.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("Transitive started", 1, transitiveStartable.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("Transitive of transitive started", 1, transitiveOfTransitiveStartable.getStartInvocationCount().intValue());
+    }
+
+    @Test
+    public void shouldHandleDiamondDependencies() throws Exception {
+        InvocationCountingStartable a = new InvocationCountingStartable();
+        InvocationCountingStartable b = new InvocationCountingStartable();
+        InvocationCountingStartable c = new InvocationCountingStartable();
+        InvocationCountingStartable d = new InvocationCountingStartable();
+        //  / b \
+        // a     d
+        //  \ c /
+        b.getDependencies().add(a);
+        c.getDependencies().add(a);
+
+        d.getDependencies().add(b);
+        d.getDependencies().add(c);
+
+        Startables.deepStart(Stream.of(d)).get(1, TimeUnit.SECONDS);
+
+        VisibleAssertions.assertEquals("A started", 1, a.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("B started", 1, b.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("C started", 1, c.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals("D started", 1, d.getStartInvocationCount().intValue());
+    }
+
+    private static class InvocationCountingStartable implements Startable {
+
+        @Getter
+        Set<Startable> dependencies = new HashSet<>();
+
+        @Getter
+        AtomicLong startInvocationCount = new AtomicLong(0);
+
+        @Getter
+        AtomicLong stopInvocationCount = new AtomicLong(0);
+
+        @Override
+        public void start() {
+            startInvocationCount.getAndIncrement();
+
+        }
+
+        @Override
+        public void stop() {
+            stopInvocationCount.getAndIncrement();
+        }
+    }
+}

From 64dcf7aa632b388cc5d20da2286b3eea99b003a1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 23 Jul 2019 10:56:04 +0200
Subject: [PATCH 0171/4969] use DigitalOcean for the build cache

---
 settings.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index e68987a50b9..272daa5699d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.4.1"
+    classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.9.0"
   }
 }
 
@@ -19,8 +19,10 @@ buildCache {
     }
 
     remote(ch.myniva.gradle.caching.s3.AwsS3BuildCache) {
-        region = 'us-east-1'
-        bucket = 'testcontainers-build-cache'
+        endpoint = 'fra1.digitaloceanspaces.com'
+        region = 'fra1'
+        bucket = 'testcontainers'
+        path = 'cache'
         push = isMasterBuild
     }
 }
@@ -38,4 +40,4 @@ file('modules').eachDir { dir ->
 }
 
 include "docs-examples"
-project(":docs-examples").projectDir = file("docs/examples")
\ No newline at end of file
+project(":docs-examples").projectDir = file("docs/examples")

From fcfff1a675d3e211b969584e842ba07f603b12ea Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 23 Jul 2019 11:53:35 +0100
Subject: [PATCH 0172/4969] Improve splitting of SQL scripts into statements
 (#1627)

Fixes #1547
---
 modules/database-commons/build.gradle         |   2 +
 .../org/testcontainers/ext/ScriptUtils.java   |  51 ++-
 .../ext/ScriptSplittingTest.java              | 294 ++++++++++++++++++
 .../testcontainers/ext/ScriptUtilsTest.java   |  48 ---
 .../src/test/resources/splittable.sql         |  45 ---
 5 files changed, 337 insertions(+), 103 deletions(-)
 create mode 100644 modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
 delete mode 100644 modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java
 delete mode 100644 modules/database-commons/src/test/resources/splittable.sql

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 8b9c288b9d4..27d1aeeb5e6 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -2,4 +2,6 @@ description = "Testcontainers :: Database-Commons"
 
 dependencies {
     compile project(':testcontainers')
+
+    testCompile 'org.assertj:assertj-core:3.12.2'
 }
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index eb041708fb6..d30064af28e 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -163,10 +163,10 @@ public static void splitSqlScript(String resource, String script, String separat
 			}
 			final boolean inComment = inLineComment || inBlockComment;
 
-			if (!inLiteral && !inComment && containsSubstringAtOffset(lowerCaseScriptContent, "BEGIN", i)) {
+			if (!inLiteral && !inComment && containsKeywordsAtOffset(lowerCaseScriptContent, "BEGIN", i, separator, commentPrefix, blockCommentStartDelimiter)) {
 				compoundStatementDepth++;
 			}
-			if (!inLiteral && !inComment && containsSubstringAtOffset(lowerCaseScriptContent, "END", i)) {
+			if (!inLiteral && !inComment && containsKeywordsAtOffset(lowerCaseScriptContent, "END", i, separator, commentPrefix, blockCommentStartDelimiter)) {
 				compoundStatementDepth--;
 			}
 			final boolean inCompoundStatement = compoundStatementDepth != 0;
@@ -174,10 +174,7 @@ public static void splitSqlScript(String resource, String script, String separat
 			if (!inLiteral && !inCompoundStatement) {
 				if (script.startsWith(separator, i)) {
 					// we've reached the end of the current statement
-					if (sb.length() > 0) {
-						statements.add(sb.toString());
-						sb = new StringBuilder();
-					}
+					sb = flushStringBuilder(sb, statements);
 					i += separator.length() - 1;
 					continue;
 				}
@@ -199,6 +196,7 @@ else if (script.startsWith(blockCommentStartDelimiter, i)) {
 					int indexOfCommentEnd = script.indexOf(blockCommentEndDelimiter, i);
 					if (indexOfCommentEnd > i) {
 						i = indexOfCommentEnd + blockCommentEndDelimiter.length() - 1;
+                        inBlockComment = false;
 						continue;
 					}
 					else {
@@ -218,24 +216,57 @@ else if (c == ' ' || c == '\n' || c == '\t' || c == '\r') {
 			}
 			sb.append(c);
 		}
-		if (StringUtils.isNotEmpty(sb.toString())) {
-			statements.add(sb.toString());
+		flushStringBuilder(sb, statements);
+	}
+
+	private static StringBuilder flushStringBuilder(StringBuilder sb, List<String> statements) {
+		if (sb.length() == 0) {
+			return sb;
 		}
+
+		final String s = sb.toString().trim();
+		if (StringUtils.isNotEmpty(s)) {
+			statements.add(s);
+		}
+
+		return new StringBuilder();
 	}
 
+	private static boolean isSeperator(char c, String separator, String commentPrefix,
+                                       String blockCommentStartDelimiter) {
+	    return c == ' ' || c == '\r' || c == '\n' || c == '\t' ||
+            c == separator.charAt(0) || c == separator.charAt(separator.length() - 1) ||
+            c == commentPrefix.charAt(0) || c == blockCommentStartDelimiter.charAt(0) ||
+            c == blockCommentStartDelimiter.charAt(blockCommentStartDelimiter.length() - 1);
+    }
+
 	private static boolean containsSubstringAtOffset(String lowercaseString, String substring, int offset) {
 		String lowercaseSubstring = substring.toLowerCase();
 
 		return lowercaseString.startsWith(lowercaseSubstring, offset);
 	}
 
+    private static boolean containsKeywordsAtOffset(String lowercaseString, String keywords, int offset,
+                                                    String separator, String commentPrefix,
+                                                    String blockCommentStartDelimiter) {
+        String lowercaseKeywords = keywords.toLowerCase();
+
+        boolean backSeperated = (offset == 0) || isSeperator(lowercaseString.charAt(offset - 1),
+            separator, commentPrefix, blockCommentStartDelimiter);
+        boolean frontSeperated = (offset >= (lowercaseString.length() - keywords.length())) ||
+            isSeperator(lowercaseString.charAt(offset + keywords.length()),
+                separator, commentPrefix, blockCommentStartDelimiter);
+
+        return backSeperated && frontSeperated && lowercaseString.startsWith(lowercaseKeywords, offset);
+    }
+
 	private static void checkArgument(boolean expression, String errorMessage) {
 		if (!expression) {
 			throw new IllegalArgumentException(errorMessage);
 		}
 	}
 
-    /**
+	/**
 	 * Does the provided SQL script contain the specified delimiter?
 	 * @param script the SQL script
 	 * @param delim String delimiting each statement - typically a ';' character
@@ -356,7 +387,7 @@ public ScriptLoadException(String message, Throwable cause) {
 		}
 	}
 
-	private static class ScriptParseException extends RuntimeException {
+	public static class ScriptParseException extends RuntimeException {
 		public ScriptParseException(String format, String scriptPath) {
 			super(String.format(format, scriptPath));
 		}
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
new file mode 100644
index 00000000000..0836592b91e
--- /dev/null
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -0,0 +1,294 @@
+package org.testcontainers.ext;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.fail;
+import static org.testcontainers.ext.ScriptUtils.*;
+
+public class ScriptSplittingTest {
+
+    @Test
+    public void testStringDemarcation() {
+        String script = "SELECT 'foo `bar`'; SELECT 'foo -- `bar`'; SELECT 'foo /* `bar`';";
+
+        List<String> expected = asList(
+            "SELECT 'foo `bar`'",
+            "SELECT 'foo -- `bar`'",
+            "SELECT 'foo /* `bar`'"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testIssue1547Case1() {
+        String script = "create database if not exists ttt;\n" +
+            "\n" +
+            "use ttt;\n" +
+            "\n" +
+            "create table aaa\n" +
+            "(\n" +
+            "    id                  bigint auto_increment   primary key,\n" +
+            "    end_time            datetime     null       COMMENT 'end_time',\n" +
+            "    data_status         varchar(16)  not null\n" +
+            ") comment 'aaa';\n" +
+            "\n" +
+            "create table bbb\n" +
+            "(\n" +
+            "    id                  bigint auto_increment   primary key\n" +
+            ") comment 'bbb';";
+
+        List<String> expected = asList(
+            "create database if not exists ttt",
+            "use ttt",
+            "create table aaa ( id bigint auto_increment primary key, end_time datetime null COMMENT 'end_time', data_status varchar(16) not null ) comment 'aaa'",
+            "create table bbb ( id bigint auto_increment primary key ) comment 'bbb'"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testIssue1547Case2() {
+        String script = "CREATE TABLE bar (\n" +
+            "  end_time VARCHAR(255)\n" +
+            ");\n" +
+            "CREATE TABLE bar (\n" +
+            "  end_time VARCHAR(255)\n" +
+            ");";
+
+        List<String> expected = asList(
+            "CREATE TABLE bar ( end_time VARCHAR(255) )",
+            "CREATE TABLE bar ( end_time VARCHAR(255) )"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testUnusualSemicolonPlacement() {
+        String script = "SELECT 1;;;;;SELECT 2;\n;SELECT 3\n; SELECT 4;\n SELECT 5";
+
+        List<String> expected = asList(
+            "SELECT 1",
+            "SELECT 2",
+            "SELECT 3",
+            "SELECT 4",
+            "SELECT 5"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testCommentedSemicolon() {
+        String script = "CREATE TABLE bar (\n" +
+            "  foo VARCHAR(255)\n" +
+            "); \nDROP PROCEDURE IF EXISTS -- ;\n" +
+            "    count_foo";
+
+        List<String> expected = asList(
+            "CREATE TABLE bar ( foo VARCHAR(255) )",
+            "DROP PROCEDURE IF EXISTS count_foo"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testStringEscaping() {
+        String script = "SELECT \"a /* string literal containing comment characters like -- here\";\n" +
+            "SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\";\n" +
+            "SELECT * from `bar`;";
+
+        List<String> expected = asList(
+            "SELECT \"a /* string literal containing comment characters like -- here\"",
+            "SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\"",
+            "SELECT * from `bar`"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testBlockCommentExclusion() {
+        String script = "INSERT INTO bar (foo) /* ; */ VALUES ('hello world');";
+
+        List<String> expected = asList(
+            "INSERT INTO bar (foo) VALUES ('hello world')"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testBeginEndKeywordCorrectDetection() {
+        String script = "INSERT INTO something_end (begin_with_the_token, another_field) /*end*/ VALUES /* end */ (' begin ', `end`)-- begin\n;";
+
+        List<String> expected = asList(
+            "INSERT INTO something_end (begin_with_the_token, another_field) VALUES (' begin ', `end`)"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testCommentInStrings() {
+        String script = "CREATE TABLE bar (foo VARCHAR(255));\n" +
+            "\n" +
+            "/* Insert Values */\n" +
+            "INSERT INTO bar (foo) values ('--1');\n" +
+            "INSERT INTO bar (foo) values ('--2');\n" +
+            "INSERT INTO bar (foo) values ('/* something */');\n" +
+            "/* INSERT INTO bar (foo) values (' */'); -- '*/;\n" +      // purposefully broken, to see if it breaks our splitting
+            "INSERT INTO bar (foo) values ('foo');";
+
+        List<String> expected = asList(
+            "CREATE TABLE bar (foo VARCHAR(255))",
+            "INSERT INTO bar (foo) values ('--1')",
+            "INSERT INTO bar (foo) values ('--2')",
+            "INSERT INTO bar (foo) values ('/* something */')",
+            "'); -- '*/",
+            "INSERT INTO bar (foo) values ('foo')"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testMultipleBeginEndDetection() {
+        String script = "CREATE TABLE bar (foo VARCHAR(255));\n" +
+            "\n" +
+            "CREATE TABLE gender (gender VARCHAR(255));\n" +
+            "CREATE TABLE ending (ending VARCHAR(255));\n" +
+            "CREATE TABLE end2 (end2 VARCHAR(255));\n" +
+            "CREATE TABLE end_2 (end2 VARCHAR(255));\n" +
+            "\n" +
+            "BEGIN\n" +
+            "  INSERT INTO ending values ('ending');\n" +
+            "END;\n" +
+            "\n" +
+            "BEGIN\n" +
+            "  INSERT INTO ending values ('ending');\n" +
+            "END/*hello*/;\n" +
+            "\n" +
+            "BEGIN--Hello\n" +
+            "  INSERT INTO ending values ('ending');\n" +
+            "END;\n" +
+            "\n" +
+            "/*Hello*/BEGIN\n" +
+            "  INSERT INTO ending values ('ending');\n" +
+            "END;\n" +
+            "\n" +
+            "CREATE TABLE foo (bar VARCHAR(255));";
+
+        List<String> expected = asList(
+            "CREATE TABLE bar (foo VARCHAR(255))",
+            "CREATE TABLE gender (gender VARCHAR(255))",
+            "CREATE TABLE ending (ending VARCHAR(255))",
+            "CREATE TABLE end2 (end2 VARCHAR(255))",
+            "CREATE TABLE end_2 (end2 VARCHAR(255))",
+            "BEGIN\n" +
+                "  INSERT INTO ending values ('ending');\n" +
+                "END",
+            "BEGIN\n" +
+                "  INSERT INTO ending values ('ending');\n" +
+                "END",
+            "BEGIN--Hello\n" +
+                "  INSERT INTO ending values ('ending');\n" +
+                "END",
+            "BEGIN\n" +
+                "  INSERT INTO ending values ('ending');\n" +
+                "END",
+            "CREATE TABLE foo (bar VARCHAR(255))"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testProcedureBlock() {
+        String script = "CREATE PROCEDURE count_foo()\n" +
+            "  BEGIN\n" +
+            "\n" +
+            "    BEGIN\n" +
+            "      SELECT *\n" +
+            "      FROM bar;\n" +
+            "      SELECT 1\n" +
+            "      FROM dual;\n" +
+            "    END;\n" +
+            "\n" +
+            "    BEGIN\n" +
+            "      select * from bar;\n" +
+            "    END;\n" +
+            "\n" +
+            "    -- we can do comments\n" +
+            "\n" +
+            "    /* including block\n" +
+            "       comments\n" +
+            "     */\n" +
+            "\n" +
+            "    /* what if BEGIN appears inside a comment? */\n" +
+            "\n" +
+            "    select \"or what if BEGIN appears inside a literal?\";\n" +
+            "\n" +
+            "  END /*; */;";
+
+        List<String> expected = asList(
+            "CREATE PROCEDURE count_foo() BEGIN\n" +
+                "\n" +
+                "    BEGIN\n" +
+                "      SELECT *\n" +
+                "      FROM bar;\n" +
+                "      SELECT 1\n" +
+                "      FROM dual;\n" +
+                "    END;\n" +
+                "\n" +
+                "    BEGIN\n" +
+                "      select * from bar;\n" +
+                "    END;\n" +
+                "\n" +
+                "    -- we can do comments\n" +
+                "\n" +
+                "    /* including block\n" +
+                "       comments\n" +
+                "     */\n" +
+                "\n" +
+                "    /* what if BEGIN appears inside a comment? */\n" +
+                "\n" +
+                "    select \"or what if BEGIN appears inside a literal?\";\n" +
+                "\n" +
+                "  END"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testUnclosedBlockComment() {
+        String script = "SELECT 'foo `bar`'; /*";
+
+        try {
+            doSplit(script);
+            fail("Should have thrown!");
+        } catch (ScriptUtils.ScriptParseException expected) {
+            // ignore expected exception
+        }
+    }
+
+    private void splitAndCompare(String script, List<String> expected) {
+        final List<String> statements = doSplit(script);
+        Assertions.assertThat(statements).isEqualTo(expected);
+    }
+
+    private List<String> doSplit(String script) {
+        final List<String> statements = new ArrayList<>();
+        ScriptUtils.splitSqlScript("ignored", script, DEFAULT_STATEMENT_SEPARATOR, DEFAULT_COMMENT_PREFIX, DEFAULT_BLOCK_COMMENT_START_DELIMITER, DEFAULT_BLOCK_COMMENT_END_DELIMITER, statements);
+        return statements;
+    }
+}
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java
deleted file mode 100644
index c9b1218321b..00000000000
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.testcontainers.ext;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
-public class ScriptUtilsTest {
-
-    /*
-     * Test ScriptUtils script splitting with some ugly/hard-to-split cases
-     */
-    @Test
-    public void testSplit() throws IOException {
-        final String script = Resources.toString(Resources.getResource("splittable.sql"), Charsets.UTF_8);
-
-        final List<String> statements = new ArrayList<>();
-        ScriptUtils.splitSqlScript("resourcename", script, ";", "--", "/*", "*/", statements);
-
-        assertEquals(7, statements.size());
-        assertEquals("SELECT \"a /* string literal containing comment characters like -- here\"", statements.get(2));
-        assertEquals("SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\"", statements.get(3));
-        assertEquals("SELECT * from `bar`", statements.get(4));
-        assertEquals("INSERT INTO bar (foo) VALUES ('hello world')", statements.get(6));
-    }
-
-    /*
-     * Test ScriptUtils script splitting with some ugly/hard-to-split cases and linux line endings
-     */
-    @Test
-    public void testSplitWithWidnwosLineEnding() throws IOException {
-        final String script = Resources.toString(Resources.getResource("splittable.sql"), Charsets.UTF_8);
-        final String scriptWithWindowsLineEndings = script.replaceAll("\n", "\r\n");
-        final List<String> statements = new ArrayList<>();
-        ScriptUtils.splitSqlScript("resourcename", scriptWithWindowsLineEndings, ";", "--", "/*", "*/", statements);
-
-        assertEquals(7, statements.size());
-        assertEquals("SELECT \"a /* string literal containing comment characters like -- here\"", statements.get(2));
-        assertEquals("SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\"", statements.get(3));
-        assertEquals("SELECT * from `bar`", statements.get(4));
-        assertEquals("INSERT INTO bar (foo) VALUES ('hello world')", statements.get(6));
-    }
-}
diff --git a/modules/database-commons/src/test/resources/splittable.sql b/modules/database-commons/src/test/resources/splittable.sql
deleted file mode 100644
index addede19dd7..00000000000
--- a/modules/database-commons/src/test/resources/splittable.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-CREATE TABLE bar (
-  foo VARCHAR(255)
-);
-
-DROP PROCEDURE IF EXISTS -- ;
-    count_foo;
-
-SELECT "a /* string literal containing comment characters like -- here";
-SELECT "a 'quoting' \"scenario ` involving BEGIN keyword\" here";
-SELECT * from `bar`;
-
--- What about a line comment containing imbalanced string delimiters? "
-
-CREATE PROCEDURE count_foo()
-  BEGIN
-
-    BEGIN
-      SELECT *
-      FROM bar;
-      SELECT 1
-      FROM dual;
-    END;
-
-    BEGIN
-      select * from bar;
-    END;
-
-    -- we can do comments
-
-    /* including block
-       comments
-     */
-
-    /* what if BEGIN appears inside a comment? */
-
-    select "or what if BEGIN appears inside a literal?";
-
-  END /*; */;
-
-/* or a block comment
-    containing imbalanced string delimiters?
-    ' "
-    */
-
-INSERT INTO bar (foo) /* ; */ VALUES ('hello world');

From 195339b127abd8036b3a995ff21c18a0b388fecf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2019 21:39:36 +0200
Subject: [PATCH 0173/4969] Bump docker-java from 3.1.0-rc-4 to 3.1.5 (#1649)

* Bump docker-java from 3.1.0-rc-4 to 3.1.5 in /core

Bumps [docker-java](https://github.com/docker-java/docker-java) from 3.1.0-rc-4 to 3.1.5.
- [Release notes](https://github.com/docker-java/docker-java/releases)
- [Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/docker-java/docker-java/compare/3.1.0-rc-4...3.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* remove `FiltersEncoder` (backported to docker-java)

* run jdbc checks separately on Travis

* fix jdbc -> jdbc-test

fixes #1548
---
 .travis.yml                                   |  5 +++-
 core/build.gradle                             |  2 +-
 .../dockerjava/core/util/FiltersEncoder.java  | 27 ------------------
 .../core/util/FiltersEncoderTest.java         | 28 -------------------
 4 files changed, 5 insertions(+), 57 deletions(-)
 delete mode 100644 core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
 delete mode 100644 core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java

diff --git a/.travis.yml b/.travis.yml
index 575aa50b208..0c03c4931bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,10 @@ jobs:
       script: ./gradlew selenium:check --scan --no-daemon
 
     - env: [ NAME=modules ]
-      script: ./gradlew check -x testcontainers:check -x selenium:check --scan --no-daemon
+      script: ./gradlew check -x testcontainers:check -x selenium:check -x jdbc-test:check --scan --no-daemon
+
+    - env: [ NAME=jdbc ]
+      script: ./gradlew jdbc-test:check --scan --no-daemon
 
     - env: [ NAME=examples ]
       script: cd examples && ../gradlew check --no-daemon
diff --git a/core/build.gradle b/core/build.gradle
index f400b5e3c1c..545780c0bc7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -79,7 +79,7 @@ dependencies {
         exclude(group: "net.java.dev.jna")
     }
 
-    shaded ('com.github.docker-java:docker-java:3.1.0-rc-4') {
+    shaded ('com.github.docker-java:docker-java:3.1.5') {
         exclude(group: 'org.glassfish.jersey.core')
         exclude(group: 'org.glassfish.jersey.connectors')
         exclude(group: 'org.glassfish.jersey.inject')
diff --git a/core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
deleted file mode 100644
index 2a6f185462e..00000000000
--- a/core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.github.dockerjava.core.util;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Monkey patched {@link FiltersEncoder} to avoid a use of jaxrs.
- * See https://github.com/docker-java/docker-java/issues/1176
- */
-public class FiltersEncoder {
-
-    private FiltersEncoder() {
-    }
-
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-    public static String jsonEncode(Map<String, List<String>> filters) {
-        try {
-            return OBJECT_MAPPER.writeValueAsString(filters);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java b/core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java
deleted file mode 100644
index 353133ae148..00000000000
--- a/core/src/test/java/com/github/dockerjava/core/util/FiltersEncoderTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.github.dockerjava.core.util;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.model.Image;
-import org.junit.Test;
-import org.rnorth.visibleassertions.VisibleAssertions;
-import org.testcontainers.DockerClientFactory;
-
-import java.util.List;
-import java.util.UUID;
-
-/**
- * This test checks that our custom monkey-patched version works
- * and does not throw {@link ClassNotFoundException}.
- */
-public class FiltersEncoderTest {
-
-    @Test
-    public void filtersShouldWork() throws Exception {
-        DockerClient client = DockerClientFactory.instance().client();
-
-        List<Image> images = client.listImagesCmd()
-            .withLabelFilter("com.example=" + UUID.randomUUID().toString())
-            .exec();
-
-        VisibleAssertions.assertTrue("List is empty", images.isEmpty());
-    }
-}

From 365856d2b23f6ca2529ec557329719e3276c3166 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2019 22:25:15 +0000
Subject: [PATCH 0174/4969] Bump neo4j from 3.5.7 to 3.5.8 in /modules/neo4j
 (#1640)

---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 9c5410aa179..1ea0ab3fb23 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -25,7 +25,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.7"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.8"
 
     compile project(":testcontainers")
 

From 1d0f022aa367c91ab0ce6217964805445bd814cd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2019 00:57:58 +0000
Subject: [PATCH 0175/4969] Bump junit-jupiter-engine from 5.5.0 to 5.5.1 in
 /modules/junit-jupiter (#1642)

---
 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 08bdedc6620..53eec4bece1 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.6'
     testRuntime 'mysql:mysql-connector-java:8.0.16'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.0'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
 }
 
 test {

From 505731a854e3c2df583416e3acc7012ea08ab1bc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2019 03:35:08 +0000
Subject: [PATCH 0176/4969] Bump junit-jupiter-api from 5.5.0 to 5.5.1 in
 /modules/junit-jupiter (#1638)

---
 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 53eec4bece1..198d67764c7 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.5.0'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From 65f4ee7ea65ca5039943675131075a6c95facd8e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2019 05:08:34 +0000
Subject: [PATCH 0177/4969] Bump aws-java-sdk-sqs from 1.11.594 to 1.11.597 in
 /modules/localstack (#1654)

---
 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 3bcfcb91714..fd51e51a9c8 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.594'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.597'
 }

From eb7d96b6c78afb463c746dddfe7775cbc16842e5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2019 06:37:37 +0000
Subject: [PATCH 0178/4969] Bump mysql-connector-java from 8.0.16 to 8.0.17 in
 /modules/mysql (#1633)

---
 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 2540df73c3f..3647fe11cc6 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MySQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'mysql:mysql-connector-java:8.0.16'
+    testCompile 'mysql:mysql-connector-java:8.0.17'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.22'
     testCompile 'commons-dbutils:commons-dbutils:1.7'

From 1010b8955f36a31c2c5d05e7a650d5ba1cbf9ba8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 24 Jul 2019 10:19:38 +0200
Subject: [PATCH 0179/4969] Add "housekeeping" category to the release drafter
 config (#1652)

---
 .github/release-drafter.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 1bfa59ca589..ed8939a3117 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -11,5 +11,9 @@ categories:
     label: type/bug
   - title: 📖 Documentation
     label: type/docs
+  - title: 🧹 Housekeeping
+    labels:
+      - type/housekeeping
+      - type/test-improvement
   - title: 📦 Dependency updates
     label: dependencies

From 46041742b048cd93da5e94e13807053e70466a67 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 24 Jul 2019 10:20:13 +0100
Subject: [PATCH 0180/4969] Add link to DB2 module docs, and add incubating
 note to page (#1660)

---
 docs/contributing.md          |  4 ++--
 docs/modules/databases/db2.md |  3 +++
 mkdocs.yml                    | 13 +++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/contributing.md b/docs/contributing.md
index 9d2c63b030c..70cd452b143 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -86,7 +86,7 @@ We currently believe 3 months is a fair period of time, but may change this.
 
 New modules should have the following warning at the top of their documentation pages:
 
-!!! warning
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future.
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
 
 We will evaluate incubating modules periodically, and remove the label when appropriate.
diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
index b7871e636d0..bc25b343072 100644
--- a/docs/modules/databases/db2.md
+++ b/docs/modules/databases/db2.md
@@ -1,5 +1,8 @@
 # DB2 Module
 
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Usage example
diff --git a/mkdocs.yml b/mkdocs.yml
index 6b38d82eff4..de9819f102f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -39,17 +39,18 @@ nav:
     - Modules:
           - Databases:
                 - modules/databases/index.md
-                - modules/databases/mysql.md
-                - modules/databases/mariadb.md
-                - modules/databases/postgres.md
-                - modules/databases/oraclexe.md
-                - modules/databases/mssqlserver.md
                 - modules/databases/cassandra.md
                 - modules/databases/couchbase.md
                 - modules/databases/clickhouse.md
-                - modules/databases/influxdb.md
+                - modules/databases/db2.md
                 - modules/databases/dynalite.md
+                - modules/databases/influxdb.md
+                - modules/databases/mariadb.md
+                - modules/databases/mssqlserver.md
+                - modules/databases/mysql.md
                 - modules/databases/neo4j.md
+                - modules/databases/oraclexe.md
+                - modules/databases/postgres.md
           - modules/webdriver_containers.md
           - modules/docker_compose.md
           - modules/elasticsearch.md

From e95bdd5a3e503b2120ecc4a01ea4501ca72c3fc7 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 24 Jul 2019 17:51:10 +0100
Subject: [PATCH 0181/4969] Add a basic documentation page for RabbitMQ module
 (#1661)

---
 docs/modules/rabbitmq.md | 21 +++++++++++++++++++++
 mkdocs.yml               |  7 ++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 docs/modules/rabbitmq.md

diff --git a/docs/modules/rabbitmq.md b/docs/modules/rabbitmq.md
new file mode 100644
index 00000000000..92275ad765b
--- /dev/null
+++ b/docs/modules/rabbitmq.md
@@ -0,0 +1,21 @@
+# RabbitMQ Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:rabbitmq:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>rabbitmq</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index de9819f102f..044489d1e50 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -51,16 +51,17 @@ nav:
                 - modules/databases/neo4j.md
                 - modules/databases/oraclexe.md
                 - modules/databases/postgres.md
-          - modules/webdriver_containers.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/kafka.md
-          - modules/pulsar.md
           - modules/localstack.md
           - modules/mockserver.md
-          - modules/toxiproxy.md
           - modules/nginx.md
+          - modules/pulsar.md
+          - modules/rabbitmq.md
+          - modules/toxiproxy.md
           - modules/vault.md
+          - modules/webdriver_containers.md
     - Test framework integration:
           - test_framework_integration/junit_4.md
           - test_framework_integration/junit_5.md

From bf84ace9e4841bba56555e26c7d4b041080ff994 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2019 05:59:58 +0000
Subject: [PATCH 0182/4969] Bump aws-java-sdk-sqs from 1.11.597 to 1.11.598 in
 /modules/localstack (#1664)

---
 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 fd51e51a9c8..46b9b059a6a 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.597'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.598'
 }

From cde3d464a63845868d43ea20c9e5448432437524 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2019 05:59:26 +0000
Subject: [PATCH 0183/4969] Bump aws-java-sdk-sqs from 1.11.598 to 1.11.599 in
 /modules/localstack (#1667)

---
 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 46b9b059a6a..5481ea1696c 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.598'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.599'
 }

From f9453ddee1a5b15c43f3290e9136eee4a1a251fc Mon Sep 17 00:00:00 2001
From: Michael Irwin <mikesir87@gmail.com>
Date: Fri, 26 Jul 2019 05:43:17 -0400
Subject: [PATCH 0184/4969] Add networking documentation (#1651)

* Add networking documentation

Resolves #1159

* Use code snippet from NetworkTest in networking documentation

Issue #1159

* Removed example no longer being used

Issue #1159
---
 .../org/testcontainers/containers/NetworkTest.java   |  5 ++++-
 docs/features/networking.md                          | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/containers/NetworkTest.java b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
index 04edf42c6d1..b717b8dc81a 100644
--- a/core/src/test/java/org/testcontainers/containers/NetworkTest.java
+++ b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
@@ -5,6 +5,7 @@
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.Network;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.*;
 import static org.testcontainers.containers.Network.newNetwork;
@@ -39,8 +40,9 @@ public static class WithoutRules {
 
         @Test
         public void testNetworkSupport() throws Exception {
+            // useCustomNetwork {
             try (
-                    Network network = newNetwork();
+                    Network network = Network.newNetwork();
 
                     GenericContainer foo = new GenericContainer()
                             .withNetwork(network)
@@ -57,6 +59,7 @@ public void testNetworkSupport() throws Exception {
                 String response = bar.execInContainer("wget", "-O", "-", "http://foo:8080").getStdout();
                 assertEquals("received response", "yay", response);
             }
+            // }
         }
 
         @Test
diff --git a/docs/features/networking.md b/docs/features/networking.md
index d0007df878b..75dd924d6bc 100644
--- a/docs/features/networking.md
+++ b/docs/features/networking.md
@@ -75,3 +75,15 @@ For example, here we construct an HTTP URL for our local web application and tel
 <!--codeinclude-->
 [Accessing the exposed host port from a container](../examples/src/test/java/generic/HostPortExposedTest.java) inside_block:useHostExposedPort
 <!--/codeinclude-->
+
+
+## Advanced networking
+
+Docker provides the ability for you to create custom networks and place containers on one or more networks. Then, communication can occur between networked containers without the need of exposing ports through the host. With Testcontainers, you can do this as well. 
+
+!!! warning
+    Note that Testcontainers currently only allows a container to be on a single network.
+
+<!--codeinclude-->
+[Creating custom networks](../../core/src/test/java/org/testcontainers/containers/NetworkTest.java) inside_block:useCustomNetwork
+<!--/codeinclude-->
\ No newline at end of file

From c094a034f733215bfd88d41538089699caab1616 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 07:02:56 +0000
Subject: [PATCH 0185/4969] Bump cucumber-java from 4.6.0 to 4.7.1 in /examples
 (#1677)

---
 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 9907da86262..08626f9e257 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.6.0'
+    implementation 'io.cucumber:cucumber-java:4.7.1'
     testImplementation 'io.cucumber:cucumber-junit:4.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From b12f6526fef4b05bbcc3ff8e267b9ceda437b820 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 09:30:40 +0000
Subject: [PATCH 0186/4969] Bump mysql-connector-java from 8.0.16 to 8.0.17 in
 /modules/spock (#1634)

---
 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 74c6b6fd5db..f9353314c1b 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
 
     testRuntime 'org.postgresql:postgresql:42.2.6'
-    testRuntime 'mysql:mysql-connector-java:8.0.16'
+    testRuntime 'mysql:mysql-connector-java:8.0.17'
 }

From 2d11d80034c47f6d6538e036e77f50c0ede98018 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 10:56:46 +0000
Subject: [PATCH 0187/4969] Bump mysql-connector-java in /modules/junit-jupiter
 (#1658)

---
 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 198d67764c7..9c668a208a1 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     }
 
     testRuntime 'org.postgresql:postgresql:42.2.6'
-    testRuntime 'mysql:mysql-connector-java:8.0.16'
+    testRuntime 'mysql:mysql-connector-java:8.0.17'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
 }
 

From 5cbf6d556166b56ef9c59c859f748444023b236a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 06:05:06 +0000
Subject: [PATCH 0188/4969] Bump assertj-core from 3.12.2 to 3.13.1 in
 /modules/kafka (#1683)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 10013a6e11e..f9b94304b98 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.3.0'
-    testCompile 'org.assertj:assertj-core:3.12.2'
+    testCompile 'org.assertj:assertj-core:3.13.1'
     testCompile 'com.google.guava:guava:23.0'
 }

From 56499c7291ca7dcdc3d7f4e64bfd77463f570747 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 07:57:40 +0000
Subject: [PATCH 0189/4969] Bump aws-java-sdk-sqs from 1.11.599 to 1.11.601 in
 /modules/localstack (#1682)

---
 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 5481ea1696c..ecb7ecd4345 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.599'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.601'
 }

From aeb1ebf4e37dc519890279c53739695801cad8e5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 10:37:48 +0000
Subject: [PATCH 0190/4969] Bump assertj-core from 3.12.2 to 3.13.1 in
 /modules/neo4j (#1681)

---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 1ea0ab3fb23..5eaae90325f 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -30,5 +30,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.12.2'
+    testCompile 'org.assertj:assertj-core:3.13.1'
 }

From fa324f5072485e899f9eff7cf2d241aea8465976 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 11:47:25 +0000
Subject: [PATCH 0191/4969] Bump cucumber-junit from 4.6.0 to 4.7.1 in
 /examples (#1676)

---
 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 08626f9e257..069e0a8881a 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.7.1'
-    testImplementation 'io.cucumber:cucumber-junit:4.6.0'
+    testImplementation 'io.cucumber:cucumber-junit:4.7.1'
     testImplementation 'org.testcontainers:selenium'
 }

From 0605014353a680f1efed7f6d663feab2cf65ad6d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 12:36:33 +0000
Subject: [PATCH 0192/4969] Bump assertj-core from 3.12.2 to 3.13.1 in
 /modules/pulsar (#1684)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 301d6f81da2..b493976c9d6 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.2'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.1'
 }

From ba96952e1a53cdfbf58e9781463adbbccf951f30 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 13:22:19 +0000
Subject: [PATCH 0193/4969] Bump jedis from 3.0.1 to 3.1.0 in
 /modules/junit-jupiter (#1657)

---
 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 9c668a208a1..5710b48fd15 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
-    testCompile 'redis.clients:jedis:3.0.1'
+    testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile ('org.mockito:mockito-core:2.28.2') {
         exclude(module: 'hamcrest-core')

From ec00eaf93ac63cd574ab69331d1621470624f8b8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 15:20:04 +0000
Subject: [PATCH 0194/4969] Bump assertj-core from 3.12.2 to 3.13.1 in
 /modules/database-commons (#1685)

---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 27d1aeeb5e6..a7ccab63fa9 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.12.2'
+    testCompile 'org.assertj:assertj-core:3.13.1'
 }

From f7e0eedd64843ada2afe61c67117b3557c190fd9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 16:55:09 +0000
Subject: [PATCH 0195/4969] Bump jedis from 3.0.1 to 3.1.0 in /examples (#1686)

---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 5075c10e7df..6446bc43497 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.26'
-    implementation 'redis.clients:jedis:3.0.1'
+    implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 692841ae7d7..f9239984a9a 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.26'
-    implementation 'redis.clients:jedis:3.0.1'
+    implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 0a1789c944a..3c73816f578 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.0.1'
+    implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.26'

From cf7a0499dec246c854387694da8c74e3e81e1855 Mon Sep 17 00:00:00 2001
From: William Delanoue <william.delanoue@gmail.com>
Date: Fri, 2 Aug 2019 21:22:50 +0200
Subject: [PATCH 0196/4969] Update copyright dates (#1691)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8f18b9edd6d..317bc0c749d 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,10 @@ See [LICENSE](LICENSE).
 
 ## Copyright
 
-Copyright (c) 2015 - 2018 Richard North and other authors.
+Copyright (c) 2015 - 2019 Richard North and other authors.
 
-MS SQL Server module is (c) 2017 - 2018 G DATA Software AG and other authors.
+MS SQL Server module is (c) 2017 - 2019 G DATA Software AG and other authors.
 
-Hashicorp Vault module is (c) 2017 Capital One Services, LLC and other authors.
+Hashicorp Vault module is (c) 2017 - 2019 Capital One Services, LLC and other authors.
 
 See [contributors](https://github.com/testcontainers/testcontainers-java/graphs/contributors) for all contributors.

From 9ce2d4a94397fe4ec1940073dd5721deca644713 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2019 06:03:01 +0000
Subject: [PATCH 0197/4969] Bump aws-java-sdk-sqs from 1.11.601 to 1.11.604 in
 /modules/localstack (#1709)

---
 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 ecb7ecd4345..8d91198c27b 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.601'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.604'
 }

From 42fd8c7edcf80a8ce7284b5876994967739aa996 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2019 08:42:23 +0000
Subject: [PATCH 0198/4969] Bump assertj-core from 3.13.1 to 3.13.2 in
 /modules/pulsar (#1703)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index b493976c9d6..d0d89d3666c 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.2'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.1'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
 }

From 8042f9c40b89b66bce2b50f50386d6cf60d015d8 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 6 Aug 2019 11:22:46 +0100
Subject: [PATCH 0199/4969] Add Maven Central as a fallback for dependency
 download (#1710)

To reduce flaky CI builds when JCenter is experiencing a blip
---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 235c1ae22f1..988844f4c90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,6 +51,7 @@ subprojects {
 
     repositories {
         jcenter()
+        mavenCentral()
     }
 
     shadowJar {

From bdb82b76a86b57a9789731430cddf3858f41388a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 6 Aug 2019 12:38:37 +0100
Subject: [PATCH 0200/4969] JUnit rule for flaky test retry (#1680)

---
 build.gradle                                  |  40 ++--
 core/build.gradle                             |   2 +-
 .../junit/GenericContainerRuleTest.java       |  27 +--
 modules/couchbase/build.gradle                |   2 +
 .../couchbase/BaseCouchbaseContainerTest.java |   9 +
 modules/jdbc-test/build.gradle                |   1 +
 .../jdbc/DatabaseDriverTmpfsTest.java         |  14 +-
 settings.gradle                               |   2 +
 test-support/build.gradle                     |   4 +
 .../org/testcontainers/testsupport/Flaky.java |  34 ++++
 .../testsupport/FlakyTestJUnit4RetryRule.java |  99 +++++++++
 .../testsupport/FlakyRuleTest.java            | 190 ++++++++++++++++++
 .../src/test/resources/logback-test.xml       |  16 ++
 13 files changed, 394 insertions(+), 46 deletions(-)
 create mode 100644 test-support/build.gradle
 create mode 100644 test-support/src/main/java/org/testcontainers/testsupport/Flaky.java
 create mode 100644 test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java
 create mode 100644 test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
 create mode 100644 test-support/src/test/resources/logback-test.xml

diff --git a/build.gradle b/build.gradle
index 988844f4c90..b3e96b265b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,6 @@ subprojects {
     apply plugin: 'idea'
     apply plugin: 'io.franzbecker.gradle-lombok'
     apply plugin: 'com.github.johnrengelman.shadow'
-    apply from: "$rootDir/gradle/publishing.gradle"
-    apply from: "$rootDir/gradle/bintray.gradle"
 
     group = "org.testcontainers"
 
@@ -35,9 +33,29 @@ subprojects {
         }
     }
 
-    project.tasks.sourceJar.from(delombok)
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+
+    // specific modules should be excluded from publication
+    if ( ! ["test-support", "jdbc-test", "docs-examples"].contains(it.name) ) {
+        apply from: "$rootDir/gradle/publishing.gradle"
+        apply from: "$rootDir/gradle/bintray.gradle"
+
+        project.tasks.sourceJar.from(delombok)
+
+        publishing {
+            publications {
+                mavenJava(MavenPublication) { publication ->
+                    artifacts.removeAll { it.classifier == null }
+                    artifact project.tasks.shadowJar
+                }
+            }
+        }
 
-    task release(dependsOn: bintrayUpload)
+        task release(dependsOn: bintrayUpload)
+    }
 
     test {
         defaultCharacterEncoding = "UTF-8"
@@ -49,11 +67,6 @@ subprojects {
         }
     }
 
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
-
     shadowJar {
         configurations = []
         classifier = null
@@ -87,15 +100,6 @@ subprojects {
         }
     }
 
-    publishing {
-        publications {
-            mavenJava(MavenPublication) { publication ->
-                artifacts.removeAll { it.classifier == null }
-                artifact project.tasks.shadowJar
-            }
-        }
-    }
-
     dependencies {
         testCompile 'ch.qos.logback:logback-classic:1.2.3'
     }
diff --git a/core/build.gradle b/core/build.gradle
index 545780c0bc7..42c2dcc5794 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -113,7 +113,7 @@ dependencies {
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testCompile 'org.assertj:assertj-core:3.12.2'
-
+    testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index 6bbd71961a6..6c51713b6b1 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -14,6 +14,7 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.TestEnvironment;
 
@@ -128,29 +129,6 @@ public static void setupContent() throws FileNotFoundException {
             .withExtraHost("somehost", "192.168.1.10")
             .withCommand("/bin/sh", "-c", "while true; do cat /etc/hosts | nc -l -p 80; done");
 
-//    @Test
-//    public void simpleRedisTest() {
-//        String ipAddress = redis.getContainerIpAddress();
-//        Integer port = redis.getMappedPort(REDIS_PORT);
-//
-//        // Use Redisson to obtain a List that is backed by Redis
-//        Config redisConfig = new Config();
-//        redisConfig.useSingleServer().setAddress(ipAddress + ":" + port);
-//
-//        Redisson redisson = Redisson.create(redisConfig);
-//
-//        List<String> testList = redisson.getList("test");
-//        testList.add("foo");
-//        testList.add("bar");
-//        testList.add("baz");
-//
-//        List<String> testList2 = redisson.getList("test");
-//        assertEquals("The list contains the expected number of items (redis is working!)", 3, testList2.size());
-//        assertTrue("The list contains an item that was put in (redis is working!)", testList2.contains("foo"));
-//        assertTrue("The list contains an item that was put in (redis is working!)", testList2.contains("bar"));
-//        assertTrue("The list contains an item that was put in (redis is working!)", testList2.contains("baz"));
-//    }
-
     @Test
     public void testIsRunning() {
         try (GenericContainer container = new GenericContainer().withCommand("top")) {
@@ -404,7 +382,8 @@ public void addExposedPortAfterWithExposedPortsTest() {
     @Test
     public void sharedMemorySetTest() {
         try (GenericContainer containerWithSharedMemory = new GenericContainer()
-            .withSharedMemorySize(42L * FileUtils.ONE_MB)) {
+            .withSharedMemorySize(42L * FileUtils.ONE_MB)
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())) {
 
             containerWithSharedMemory.start();
 
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 6635462818f..753e93adb75 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,4 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     compile project(':testcontainers')
     compile 'com.couchbase.client:java-client:2.7.7'
+
+    testCompile project(':test-support')
 }
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
index 845d9bfaf5e..1c5e702727a 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
@@ -9,7 +9,10 @@
 import com.couchbase.client.java.view.View;
 import com.google.common.collect.Lists;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.testcontainers.testsupport.Flaky;
+import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
 
 import java.util.List;
 
@@ -25,7 +28,11 @@ public abstract class BaseCouchbaseContainerTest extends AbstractCouchbaseTest {
 
     private static final String DOCUMENT = "{\"name\":\"toto\"}";
 
+    @Rule
+    public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
+
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-10-01")
     public void shouldInsertDocument() {
         RawJsonDocument expected = RawJsonDocument.create(ID, DOCUMENT);
         getBucket().upsert(expected);
@@ -34,6 +41,7 @@ public void shouldInsertDocument() {
     }
 
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-10-01")
     public void shouldExecuteN1ql() {
         getBucket().query(N1qlQuery.simple("INSERT INTO " + TEST_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
 
@@ -46,6 +54,7 @@ public void shouldExecuteN1ql() {
     }
 
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-10-01")
     public void shouldCreateView() {
         View view = DefaultView.create(VIEW_NAME, VIEW_FUNCTION);
         DesignDocument document = DesignDocument.create(VIEW_NAME, Lists.newArrayList(view));
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 5874787e9eb..9300ba49a4d 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -28,4 +28,5 @@ dependencies {
     testCompile 'commons-dbutils:commons-dbutils:1.6'
 
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
+    testCompile project(':test-support')
 }
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index 07b70020733..38c97686679 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -1,18 +1,26 @@
 package org.testcontainers.jdbc;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.testsupport.Flaky;
+import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
+
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import org.junit.Test;
-import org.testcontainers.containers.Container;
-import org.testcontainers.containers.JdbcDatabaseContainer;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class DatabaseDriverTmpfsTest {
 
+    @Rule
+    public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
+
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1687", reviewDate = "2019-10-01")
     public void tmpfs() throws IOException, InterruptedException, SQLException {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
         try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
diff --git a/settings.gradle b/settings.gradle
index 272daa5699d..72e7d312555 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -41,3 +41,5 @@ file('modules').eachDir { dir ->
 
 include "docs-examples"
 project(":docs-examples").projectDir = file("docs/examples")
+include 'test-support'
+
diff --git a/test-support/build.gradle b/test-support/build.gradle
new file mode 100644
index 00000000000..7cc1bb6d1d4
--- /dev/null
+++ b/test-support/build.gradle
@@ -0,0 +1,4 @@
+dependencies {
+    implementation 'junit:junit:4.12'
+    implementation 'org.slf4j:slf4j-api:1.7.26'
+}
diff --git a/test-support/src/main/java/org/testcontainers/testsupport/Flaky.java b/test-support/src/main/java/org/testcontainers/testsupport/Flaky.java
new file mode 100644
index 00000000000..cc5f6f947fa
--- /dev/null
+++ b/test-support/src/main/java/org/testcontainers/testsupport/Flaky.java
@@ -0,0 +1,34 @@
+package org.testcontainers.testsupport;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Annotation for test methods that should be retried in the event of failure. See {@link FlakyTestJUnit4RetryRule} for
+ * more details.
+ */
+@Retention(RUNTIME)
+@Target({METHOD})
+public @interface Flaky {
+
+    /**
+     * @return a URL for a GitHub issue where this flaky test can be discussed, and where actions to resolve it can be
+     * coordinated.
+     */
+    String githubIssueUrl();
+
+    /**
+     * @return a date at which this should be reviewed, in {@link java.time.format.DateTimeFormatter#ISO_LOCAL_DATE}
+     * format (e.g. {@code 2020-12-03}). Now + 3 months is suggested. Once this date has passed, retries will no longer
+     * be applied.
+     */
+    String reviewDate();
+
+    /**
+     * @return the total number of times to try running this test (default 3)
+     */
+    int maxTries() default 3;
+}
diff --git a/test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java b/test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java
new file mode 100644
index 00000000000..aa1a3ed3c5f
--- /dev/null
+++ b/test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java
@@ -0,0 +1,99 @@
+package org.testcontainers.testsupport;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.MultipleFailureException;
+import org.junit.runners.model.Statement;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *     JUnit 4 @Rule that implements retry for flaky tests (tests that suffer from sporadic random failures).
+ * </p>
+ * <p>
+ *     This rule should be used in conjunction with the @{@link Flaky} annotation. When this Rule is applied to a test
+ *     class, any test method with this annotation will be invoked up to 3 times or until it succeeds.
+ * </p>
+ * <p>
+ *     Tests should <em>not</em> be marked @{@link Flaky} for a long period of time. Every usage should be
+ *     accompanied by a GitHub issue URL, and should be subject to review at a suitable point in the (near) future.
+ *     Should the review date pass without the test's instability being fixed, the retry behaviour will cease to have an
+ *     effect and the test will be allowed to sporadically fail again.
+ * </p>
+ */
+@Slf4j
+public class FlakyTestJUnit4RetryRule implements TestRule {
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+
+        final Flaky annotation = description.getAnnotation(Flaky.class);
+
+        if (annotation == null) {
+            // leave the statement as-is
+            return base;
+        }
+
+        if (annotation.githubIssueUrl().trim().length() == 0) {
+            throw new IllegalArgumentException("A GitHub issue URL must be set for usages of the @Flaky annotation");
+        }
+
+        final int maxTries = annotation.maxTries();
+
+        if (maxTries < 1) {
+            throw new IllegalArgumentException("@Flaky annotation maxTries must be at least one");
+        }
+
+        final LocalDate reviewDate;
+        try {
+            reviewDate = LocalDate.parse(annotation.reviewDate());
+        } catch (DateTimeParseException e) {
+            throw new IllegalArgumentException("@Flaky reviewDate could not be parsed. Please provide a date in yyyy-mm-dd format");
+        }
+
+        // the annotation should only have an effect before the review date, to encourage review and resolution
+        if ( LocalDate.now().isBefore(reviewDate) ) {
+            return new RetryingStatement(base, description, maxTries);
+        } else {
+            return base;
+        }
+    }
+
+    private static class RetryingStatement extends Statement {
+        private final Statement base;
+        private final Description description;
+        private final int maxTries;
+
+        RetryingStatement(Statement base, Description description, int maxTries) {
+            this.base = base;
+            this.description = description;
+            this.maxTries = maxTries;
+        }
+
+        @Override
+        public void evaluate() {
+
+            int attempts = 0;
+            final List<Throwable> causes = new ArrayList<>();
+
+            while (++attempts <= maxTries) {
+                try {
+                    base.evaluate();
+                    return;
+                } catch (Throwable throwable) {
+                    log.warn("Retrying @Flaky-annotated test: {}", description.getDisplayName());
+                    causes.add(throwable);
+                }
+            }
+
+            throw new IllegalStateException(
+                "@Flaky-annotated test failed despite retries.",
+                new MultipleFailureException(causes));
+        }
+    }
+}
diff --git a/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java b/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
new file mode 100644
index 00000000000..07b0ffe1fa8
--- /dev/null
+++ b/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
@@ -0,0 +1,190 @@
+package org.testcontainers.testsupport;
+
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import java.lang.annotation.Annotation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class FlakyRuleTest {
+
+    private static final String VALID_URL = "http://some.url/here";
+    private static final String INVALID_URL = "";
+
+    private static final String VALID_DATE_IN_FAR_FUTURE = "2063-04-05";
+    private static final String VALID_DATE_IN_PAST = "1991-08-16";
+    private static final String INVALID_DATE = "91-01-45";
+    private static final int DEFAULT_TRIES = 3;
+
+    private FlakyTestJUnit4RetryRule rule = new FlakyTestJUnit4RetryRule();
+
+    @Test
+    public void testIgnoresMethodWithoutAnnotation() throws Throwable {
+        final Description description = newDescriptionWithoutAnnotation();
+        final DummyStatement statement = newStatement(3);
+        try {
+            rule.apply(statement, description).evaluate();
+            fail("Should not reach here");
+        } catch (Exception ignored) {
+
+        }
+        assertEquals("The statement should only be invoked once, even if it throws", 1, statement.invocationCount);
+    }
+
+    @Test
+    public void testRetriesMethodWithAnnotationUntilFailure() throws Throwable {
+        final Description description = newDescriptionWithAnnotation();
+
+        final DummyStatement statement = newStatement(3);
+        try {
+            rule.apply(statement, description).evaluate();
+            fail("Should not reach here");
+        } catch (Exception ignored) {
+
+        }
+        assertEquals("The statement should be invoked three times", 3, statement.invocationCount);
+    }
+
+    @Test
+    public void testCustomRetryCount() throws Throwable {
+        final Description description = newDescriptionWithAnnotationAndCustomTries(10);
+
+        final DummyStatement statement = newStatement(10);
+        try {
+            rule.apply(statement, description).evaluate();
+            fail("Should not reach here");
+        } catch (Exception ignored) {
+
+        }
+        assertEquals("The statement should be invoked ten times", 10, statement.invocationCount);
+    }
+
+    @Test
+    public void testRetriesMethodWithAnnotationUntilSuccess() throws Throwable {
+        final Description description = newDescriptionWithAnnotation();
+
+        final DummyStatement statement = newStatement(2);
+
+        rule.apply(statement, description).evaluate();
+
+        assertEquals("The statement should be invoked three times, and succeed the third time", 3, statement.invocationCount);
+    }
+
+    @Test
+    public void testDoesNotRetryMethodWithAnnotationIfNotThrowing() throws Throwable {
+        final Description description = newDescriptionWithAnnotation();
+
+        final DummyStatement statement = newStatement(0);
+
+        rule.apply(statement, description).evaluate();
+
+        assertEquals("The statement should be invoked once", 1, statement.invocationCount);
+    }
+
+    @Test
+    public void testTreatsExpiredAnnotationAsNoAnnotation() throws Throwable {
+        final Description description = newDescriptionWithExpiredAnnotation();
+        final DummyStatement statement = newStatement(3);
+        try {
+            rule.apply(statement, description).evaluate();
+            fail("Should not reach here");
+        } catch (Exception ignored) {
+
+        }
+        assertEquals("The statement should only be invoked once, even if it throws", 1, statement.invocationCount);
+    }
+
+    @Test
+    public void testThrowsOnInvalidDateFormat() throws Throwable {
+        final Description description = newDescriptionWithAnnotation(INVALID_DATE, VALID_URL);
+        final DummyStatement statement = newStatement(3);
+        try {
+            rule.apply(statement, description).evaluate();
+            fail("Should not reach here");
+        } catch (IllegalArgumentException ignored) {
+
+        }
+        assertEquals("The statement should not be invoked if the annotation is invalid", 0, statement.invocationCount);
+    }
+
+    @Test
+    public void testThrowsOnInvalidGitHubUrl() throws Throwable {
+        final Description description = newDescriptionWithAnnotation(VALID_DATE_IN_FAR_FUTURE, INVALID_URL);
+        final DummyStatement statement = newStatement(3);
+        try {
+            rule.apply(statement, description).evaluate();
+            fail("Should not reach here");
+        } catch (IllegalArgumentException ignored) {
+
+        }
+        assertEquals("The statement should not be invoked if the annotation is invalid", 0, statement.invocationCount);
+    }
+
+    private Description newDescriptionWithAnnotation(String reviewDate, String gitHubUrl) {
+        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(reviewDate, gitHubUrl, DEFAULT_TRIES));
+    }
+
+    private Description newDescriptionWithoutAnnotation() {
+        return Description.createTestDescription("SomeTestClass", "someMethod");
+    }
+
+    private Description newDescriptionWithAnnotation() {
+        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(VALID_DATE_IN_FAR_FUTURE, VALID_URL, DEFAULT_TRIES));
+    }
+
+    private Description newDescriptionWithAnnotationAndCustomTries(int maxTries) {
+        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(VALID_DATE_IN_FAR_FUTURE, VALID_URL, maxTries));
+    }
+
+    private Description newDescriptionWithExpiredAnnotation() {
+        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(VALID_DATE_IN_PAST, VALID_URL, DEFAULT_TRIES));
+    }
+
+    private Flaky newAnnotation(final String reviewDate, String gitHubUrl, int tries) {
+        return new Flaky() {
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Flaky.class;
+            }
+
+            @Override
+            public String githubIssueUrl() {
+                return gitHubUrl;
+            }
+
+            @Override
+            public String reviewDate() {
+                return reviewDate;
+            }
+
+            @Override
+            public int maxTries() {
+                return tries;
+            }
+        };
+    }
+
+    private DummyStatement newStatement(int timesToThrow) {
+        final DummyStatement statement = new DummyStatement();
+        statement.shouldThrowTimes = timesToThrow;
+        return statement;
+    }
+
+    private static class DummyStatement extends Statement {
+        int shouldThrowTimes = -1;
+        int invocationCount = 0;
+
+        @Override
+        public void evaluate() {
+            invocationCount++;
+
+            if (shouldThrowTimes > 0) {
+                shouldThrowTimes--;
+                throw new RuntimeException();
+            }
+        }
+    }
+}
diff --git a/test-support/src/test/resources/logback-test.xml b/test-support/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/test-support/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>

From fbf50922adf98716835b6bb5c8ad9804788c2394 Mon Sep 17 00:00:00 2001
From: Michael Irwin <mikesir87@gmail.com>
Date: Tue, 6 Aug 2019 11:08:13 -0400
Subject: [PATCH 0201/4969] Add docker-compose.yml to simplify local doc
 development (#1653)

Co-Authored-By: Richard North <rich.north@gmail.com>
---
 docker-compose.yml        | 11 +++++++++++
 docs/contributing_docs.md |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000000..822956457f7
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: "3.7"
+
+services:
+  docs:
+    image: python:3.6
+    command: sh -c "pip install -r requirements.txt && mkdocs serve -a 0.0.0.0:8000"
+    working_dir: /docs
+    volumes:
+      - ./:/docs
+    ports:
+      - 8000:8000
diff --git a/docs/contributing_docs.md b/docs/contributing_docs.md
index 294ae54e0de..9ed4b08169c 100644
--- a/docs/contributing_docs.md
+++ b/docs/contributing_docs.md
@@ -9,7 +9,11 @@ We publish our documentation using Netlify.
 
 ## Previewing rendered content
 
-### Previewing docs locally
+### Using Docker locally
+
+The root of the project contains a `docker-compose.yml` file. Simply run `docker-compose up` and then access the docs at [http://localhost:8000](http://localhost:8000).
+
+### Using Python locally
 
 * Ensure that you have Python 3.6.0 or higher.
 * Set up a virtualenv and run `pip install -r requirements.txt` in the `testcontainers-java` root directory.

From 28b2032afa97c9e8e2787d3d771a4342574c97a0 Mon Sep 17 00:00:00 2001
From: Graeme Rocher <graeme.rocher@gmail.com>
Date: Wed, 7 Aug 2019 22:02:20 +0200
Subject: [PATCH 0202/4969] Add Micronaut Data to who is using (#1717)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 89e70611f37..657c2446a55 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -73,6 +73,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Lightbend](https://www.lightbend.com/) - Testing [Alpakka Kafka](https://doc.akka.io/docs/alpakka-kafka/current/) and support in [Alpakka Kafka Testkit](https://doc.akka.io/docs/alpakka-kafka/current/testing.html#testing-with-kafka-in-docker)
 * [Zalando SE](https://corporate.zalando.com/en) - Testing core business services
 * [Europace AG](https://tech.europace.de/) - Integration testing for databases and micro services
+* [Micronaut Data](https://github.com/micronaut-projects/micronaut-data/) - Testing of Micronaut Data JDBC, a database access toolkit
 
 ## License
 

From 4d1ba9e7095483c0636138aff7831935a8b8e5d9 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 10 Aug 2019 20:33:33 +0100
Subject: [PATCH 0203/4969] =?UTF-8?q?Amend=20container=20shutdown=20to=20c?=
 =?UTF-8?q?atch=20and=20log=20for=20all=20Exception=20cla=E2=80=A6=20(#166?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Amend container shutdown to catch and log for all Exception classes
Replacement for #1420 to fix incomplete error handling
Refs #1379

* Log root cause exception message rather than immediate exception's message
---
 .../utility/ResourceReaper.java               | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 086cac83206..53f7693149b 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -2,9 +2,6 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.ConflictException;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -13,6 +10,7 @@
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Throwables;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
@@ -218,12 +216,14 @@ private void stopContainer(String containerId, String imageName) {
         boolean running;
         try {
             InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
-            running = containerInfo.getState().getRunning();
+            running = containerInfo.getState() != null && Boolean.TRUE.equals(containerInfo.getState().getRunning());
         } catch (NotFoundException e) {
             LOGGER.trace("Was going to stop container but it apparently no longer exists: {}", containerId);
             return;
-        } catch (DockerException e) {
-            LOGGER.trace("Error encountered when checking container for shutdown (ID: {}) - it may not have been stopped, or may already be stopped: {}", containerId, e.getMessage());
+        } catch (Exception e) {
+            LOGGER.trace("Error encountered when checking container for shutdown (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
+                containerId,
+                Throwables.getRootCause(e).getMessage());
             return;
         }
 
@@ -232,34 +232,28 @@ private void stopContainer(String containerId, String imageName) {
                 LOGGER.trace("Stopping container: {}", containerId);
                 dockerClient.killContainerCmd(containerId).exec();
                 LOGGER.trace("Stopped container: {}", imageName);
-            } catch (ConflictException e) {
-                if ( e.getMessage().startsWith("Cannot kill container: ") && e.getMessage().endsWith(containerId + " is not running")) {
-                    LOGGER.trace("Was going to kill the container but it apparently already dead : {}", e.getMessage());
-                } else {
-                    throw e;
-                }
-            } catch (DockerException e) {
-                LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped: {}", containerId, e.getMessage());
+            } catch (Exception e) {
+                LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
+                    containerId,
+                    Throwables.getRootCause(e).getMessage());
             }
         }
 
         try {
             dockerClient.inspectContainerCmd(containerId).exec();
-        } catch (NotFoundException e) {
+        } catch (Exception e) {
             LOGGER.trace("Was going to remove container but it apparently no longer exists: {}", containerId);
             return;
         }
 
         try {
             LOGGER.trace("Removing container: {}", containerId);
-            try {
-                dockerClient.removeContainerCmd(containerId).withRemoveVolumes(true).withForce(true).exec();
-                LOGGER.debug("Removed container and associated volume(s): {}", imageName);
-            } catch (InternalServerErrorException e) {
-                LOGGER.trace("Exception when removing container with associated volume(s): {} (due to {})", imageName, e.getMessage());
-            }
-        } catch (DockerException e) {
-            LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped: {}", containerId, e.getMessage());
+            dockerClient.removeContainerCmd(containerId).withRemoveVolumes(true).withForce(true).exec();
+            LOGGER.debug("Removed container and associated volume(s): {}", imageName);
+        } catch (Exception e) {
+            LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
+                containerId,
+                Throwables.getRootCause(e).getMessage());
         }
     }
 

From e3dffc2a88adceb3a954978b3e6b61db5b9cd103 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 06:42:25 +0000
Subject: [PATCH 0204/4969] Bump aws-java-sdk-sqs from 1.11.604 to 1.11.608 in
 /modules/localstack (#1728)

---
 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 8d91198c27b..a943a47d4d0 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.604'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.608'
 }

From 032495ad49ff55d1b1b0546f420e2909e4fd26d5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 08:56:02 +0000
Subject: [PATCH 0205/4969] Bump assertj-core from 3.13.1 to 3.13.2 in
 /modules/database-commons (#1705)

---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index a7ccab63fa9..7c820909d61 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.13.1'
+    testCompile 'org.assertj:assertj-core:3.13.2'
 }

From 6a90c2f8bfef66585eca0240bcd6f6bb67c666a6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 10:25:15 +0000
Subject: [PATCH 0206/4969] Bump assertj-core from 3.13.1 to 3.13.2 in
 /modules/neo4j (#1708)

---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 5eaae90325f..c7227a2d9ac 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -30,5 +30,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.13.1'
+    testCompile 'org.assertj:assertj-core:3.13.2'
 }

From 7534938bdb0bb5e9d314c0da6aa64a692b7709fc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 12:30:17 +0000
Subject: [PATCH 0207/4969] Bump pulsar-client from 2.3.2 to 2.4.0 in
 /modules/pulsar (#1729)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index d0d89d3666c..34cde96a33e 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.3.2'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.4.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
 }

From 5f154008ad80f3f109241b3232d511ec69b5c5a5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 14:52:55 +0000
Subject: [PATCH 0208/4969] Bump slf4j-api from 1.7.26 to 1.7.28 in /examples
 (#1730)

---
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index ce0eff58a28..6bf099030ec 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ repositories {
     jcenter()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.26'
+    compileOnly 'org.slf4j:slf4j-api:1.7.28'
     implementation 'com.squareup.okhttp3:okhttp:3.14.2'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.6'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 6446bc43497..777ca2d9511 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.26'
+    compileOnly 'org.slf4j:slf4j-api:1.7.28'
     implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f9239984a9a..8b1a5638243 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.26'
+    compileOnly 'org.slf4j:slf4j-api:1.7.28'
     implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 3c73816f578..26a437909fe 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.26'
+    compileOnly 'org.slf4j:slf4j-api:1.7.28'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:testcontainers'

From 67672a1b1144beae0254040ea49cb045bc6c77ed Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 16:30:24 +0000
Subject: [PATCH 0209/4969] Bump mariadb-java-client from 2.4.2 to 2.4.3 in
 /modules/mariadb (#1704)

---
 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 a501b44f04d..aa85a5d1f5e 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.2'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.3'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.22'

From 1693d796fa8976b9112bc775873d542152909e73 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 17:41:52 +0000
Subject: [PATCH 0210/4969] Bump assertj-core from 3.13.1 to 3.13.2 in
 /modules/kafka (#1707)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index f9b94304b98..9d86482cf2f 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.3.0'
-    testCompile 'org.assertj:assertj-core:3.13.1'
+    testCompile 'org.assertj:assertj-core:3.13.2'
     testCompile 'com.google.guava:guava:23.0'
 }

From 7a7c2fcd64a4a241241594870c378630465b3158 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2019 06:03:22 +0000
Subject: [PATCH 0211/4969] Bump aws-java-sdk-sqs from 1.11.608 to 1.11.609 in
 /modules/localstack (#1735)

---
 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 a943a47d4d0..fd5ef14c600 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.608'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.609'
 }

From e9e45bcb4cc8dca1e93a63b112e5c9588feddde3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2019 06:06:21 +0000
Subject: [PATCH 0212/4969] Bump aws-java-sdk-sqs from 1.11.609 to 1.11.610 in
 /modules/localstack (#1741)

---
 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 fd5ef14c600..46b805f2f69 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.609'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.610'
 }

From 983d7eba8ba46b7d9c692d2d28fed17790d0c00a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2019 07:21:09 +0000
Subject: [PATCH 0213/4969] Bump lettuce-core from 5.1.7.RELEASE to
 5.1.8.RELEASE in /examples (#1696)

---
 examples/spock/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spock/build.gradle b/examples/spock/build.gradle
index cc04f74c90d..147e1eaf079 100644
--- a/examples/spock/build.gradle
+++ b/examples/spock/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.1.7.RELEASE"
+    compile "io.lettuce:lettuce-core:5.1.8.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
     testImplementation 'org.testcontainers:spock'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From d9ca8ef90e6c98f912ab4a099a208b939dcc2497 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2019 09:34:25 +0000
Subject: [PATCH 0214/4969] Bump java-client from 2.7.7 to 2.7.9 in
 /modules/couchbase (#1714)

---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 753e93adb75..063b12c9d8e 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.7'
+    compile 'com.couchbase.client:java-client:2.7.9'
 
     testCompile project(':test-support')
 }

From 49b526cfd172d43a8c7164cfa3d882d0e5aa4a01 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2019 11:10:41 +0000
Subject: [PATCH 0215/4969] Bump org.springframework.boot in /examples (#1736)

---
 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 d4f3c132896..22198984e33 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.1.6.RELEASE'
+    id 'org.springframework.boot' version '2.1.7.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 52767c7a9ca..7af6b9d26da 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.1.6.RELEASE'
+    id 'org.springframework.boot' version '2.1.7.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 9a9684106dafe06af47c85bd076d62f9074ae38e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2019 06:03:53 +0000
Subject: [PATCH 0216/4969] Bump aws-java-sdk-sqs from 1.11.610 to 1.11.611 in
 /modules/localstack (#1747)

---
 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 46b805f2f69..2acbdff6541 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.610'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.611'
 }

From 828a14b77aef6fcaa05dc6bd5abed07404363205 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2019 06:00:18 +0000
Subject: [PATCH 0217/4969] Bump aws-java-sdk-sqs from 1.11.611 to 1.11.612 in
 /modules/localstack (#1750)

---
 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 2acbdff6541..3e9eadf36e5 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.611'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.612'
 }

From f65a5902b2d3a123caef497faf7f09867e436d0c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2019 07:17:08 +0000
Subject: [PATCH 0218/4969] Bump tomcat-jdbc from 9.0.22 to 9.0.24 in
 /modules/mariadb (#1753)

---
 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 aa85a5d1f5e..eb778c6c827 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.3'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.22'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.24'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 07154353019f88eee81fa67864bd141ba4956d3b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2019 09:06:53 +0000
Subject: [PATCH 0219/4969] Bump aws-java-sdk-sqs from 1.11.612 to 1.11.613 in
 /modules/localstack (#1754)

---
 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 3e9eadf36e5..6384d7e4d50 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.612'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.613'
 }

From 8689f849209e4808681955488763419e4346f804 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2019 10:53:35 +0000
Subject: [PATCH 0220/4969] Bump tomcat-jdbc from 9.0.22 to 9.0.24 in
 /modules/mysql (#1755)

---
 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 3647fe11cc6..d5a366825b9 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.17'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.22'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.24'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 22030eace3f4bafc735ccb0e402c1202329a95d1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2019 06:18:59 +0000
Subject: [PATCH 0221/4969] Bump aws-java-sdk-sqs from 1.11.613 to 1.11.615 in
 /modules/localstack (#1762)

---
 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 6384d7e4d50..9e7824ef7ce 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.613'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.615'
 }

From 246332d347475fa1f1d3665f9c267e7bb4dd4524 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2019 06:06:34 +0000
Subject: [PATCH 0222/4969] Bump aws-java-sdk-sqs from 1.11.615 to 1.11.616 in
 /modules/localstack (#1768)

---
 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 9e7824ef7ce..d950467e502 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.615'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.616'
 }

From 62d646afbd3aa28da11ce572146b2ebafe71d942 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 22 Aug 2019 14:59:49 +0100
Subject: [PATCH 0223/4969] Reinstate retries for image pulls (#1712)

* Reinstate retries for image pulls

* Adopt time limit for retries instead of a fixed number of retries

* Only retry image pull failures that could potentially succeed next time

* Qualify usages of `Instant` and `Duration`
---
 .../images/RemoteDockerImage.java             | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 7aff7918f6d..257bacc9961 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import lombok.NonNull;
@@ -14,6 +15,8 @@
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.LazyFuture;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -29,6 +32,7 @@ public class RemoteDockerImage extends LazyFuture<String> {
      */
     @Deprecated
     public static final Set<DockerImageName> AVAILABLE_IMAGE_NAME_CACHE = new HashSet<>();
+    private static final Duration PULL_RETRY_TIME_LIMIT = Duration.ofMinutes(2);
 
     private DockerImageName imageName;
 
@@ -73,23 +77,34 @@ protected final String resolve() {
                 return imageName.toString();
             }
 
+            // The image is not available locally - pull it
             logger.info("Pulling docker image: {}. Please be patient; this may take some time but only needs to be done once.", imageName);
 
-            // The image is not available locally - pull it
-            try {
-                final PullImageResultCallback callback = new TimeLimitedLoggedPullImageResultCallback(logger);
-                dockerClient
-                    .pullImageCmd(imageName.getUnversionedPart())
-                    .withTag(imageName.getVersionPart())
-                    .exec(callback);
-                callback.awaitCompletion();
-                AVAILABLE_IMAGE_NAME_CACHE.add(imageName);
-            } catch (Exception e) {
-                logger.error("Failed to pull image: {}. Please check output of `docker pull {}`", imageName, imageName);
-                throw new ContainerFetchException("Failed to pull image: " + imageName, e);
+            Exception lastFailure = null;
+            final Instant lastRetryAllowed = Instant.now().plus(PULL_RETRY_TIME_LIMIT);
+
+            while (Instant.now().isBefore(lastRetryAllowed)) {
+                try {
+                    final PullImageResultCallback callback = new TimeLimitedLoggedPullImageResultCallback(logger);
+                    dockerClient
+                        .pullImageCmd(imageName.getUnversionedPart())
+                        .withTag(imageName.getVersionPart())
+                        .exec(callback);
+                    callback.awaitCompletion();
+                    AVAILABLE_IMAGE_NAME_CACHE.add(imageName);
+
+                    return imageName.toString();
+                } catch (InterruptedException | InternalServerErrorException e) {
+                    // these classes of exception often relate to timeout/connection errors so should be retried
+                    lastFailure = e;
+                    logger.warn("Retrying pull for image: {} ({}s remaining)",
+                        imageName,
+                        Duration.between(Instant.now(), lastRetryAllowed).getSeconds());
+                }
             }
+            logger.error("Failed to pull image: {}. Please check output of `docker pull {}`", imageName, imageName, lastFailure);
 
-            return imageName.toString();
+            throw new ContainerFetchException("Failed to pull image: " + imageName, lastFailure);
         } catch (DockerClientException e) {
             throw new ContainerFetchException("Failed to get Docker client for " + imageName, e);
         }

From 2d1df1648c41c7dcb3508fae130bbbdf5faf47dd Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 23 Aug 2019 08:43:33 +0100
Subject: [PATCH 0224/4969] Refs #1769: mark toxiproxy tests as flaky pending
 further analysis (#1772)

---
 modules/toxiproxy/build.gradle                            | 2 ++
 .../java/org/testcontainers/containers/ToxiproxyTest.java | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 0d004fd32bf..293b8f8f190 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -6,4 +6,6 @@ dependencies {
 
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+
+    testCompile project(':test-support')
 }
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 34861f68f7a..8fa28431ab5 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -3,6 +3,8 @@
 import eu.rekawek.toxiproxy.model.ToxicDirection;
 import org.junit.Rule;
 import org.junit.Test;
+import org.testcontainers.testsupport.Flaky;
+import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
@@ -30,6 +32,9 @@ public class ToxiproxyTest {
         .withNetwork(network);
     // }
 
+    @Rule
+    public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
+
     @Test
     public void testDirect() {
         final Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getFirstMappedPort());
@@ -40,6 +45,7 @@ public void testDirect() {
     }
 
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
     public void testLatencyViaProxy() throws IOException {
         // obtainProxyObject {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
@@ -66,6 +72,7 @@ public void testLatencyViaProxy() throws IOException {
     }
 
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
     public void testConnectionCut() {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
         final Jedis jedis = new Jedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
@@ -90,6 +97,7 @@ public void testConnectionCut() {
     }
 
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
     public void testMultipleProxiesCanBeCreated() {
         try (GenericContainer secondRedis = new GenericContainer("redis:5.0.4")
             .withExposedPorts(6379)

From ad5f1f63719c19b01c78746a4efd07eab7ca01c0 Mon Sep 17 00:00:00 2001
From: Evan Gilbert <eggilbert@users.noreply.github.com>
Date: Sun, 25 Aug 2019 10:30:12 -0500
Subject: [PATCH 0225/4969] Exclude jna transitive dependency from
 visible-assertions to reconcile versions (#1744)

---
 core/build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 42c2dcc5794..c39bb183e82 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -67,7 +67,10 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    compile ('org.rnorth.visible-assertions:visible-assertions:2.1.2') {
+        // Excluded in favor of jna-platform below
+        exclude(group: "net.java.dev.jna", module: "jna")
+    }
 
     compile ('org.rnorth:tcp-unix-socket-proxy:1.0.2') {
         exclude(group: "log4j", module: "log4j")

From d5f15774187eac4e83346cb59fb00197f07ac5c4 Mon Sep 17 00:00:00 2001
From: Rob Szewczyk <rob.szew@gmail.com>
Date: Sun, 25 Aug 2019 11:33:15 -0400
Subject: [PATCH 0226/4969] :bug: Fix credentials when using a helper that
 returns a token (#1734)

---
 .../utility/RegistryAuthLocator.java          | 14 +++++++----
 .../utility/RegistryAuthLocatorTest.java      |  9 ++++++++
 .../config-with-helper-using-token.json       | 11 +++++++++
 .../auth-config/docker-credential-fake        | 23 +++++++++++++++----
 .../win/docker-credential-fake.bat            | 23 +++++++++++++++----
 5 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 core/src/test/resources/auth-config/config-with-helper-using-token.json

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index 5b248aea04e..e8651167221 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -251,10 +251,16 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
         final JsonNode helperResponse = OBJECT_MAPPER.readTree(data);
         log.debug("Credential helper/store provided auth config for: {}", hostName);
 
-        return new AuthConfig()
-            .withRegistryAddress(helperResponse.at("/ServerURL").asText())
-            .withUsername(helperResponse.at("/Username").asText())
-            .withPassword(helperResponse.at("/Secret").asText());
+        final String username = helperResponse.at("/Username").asText();
+        final String password = helperResponse.at("/Secret").asText();
+        if ("<token>".equals(username)) {
+            return new AuthConfig().withIdentityToken(password);
+        } else {
+            return new AuthConfig()
+                .withRegistryAddress(helperResponse.at("/ServerURL").asText())
+                .withUsername(username)
+                .withPassword(password);
+        }
     }
 
     private String getCredentialProgramName(String credHelper) {
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index fe930cf78b7..e1cb595e903 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -69,6 +69,15 @@ public void lookupAuthConfigUsingHelper() throws URISyntaxException {
         assertEquals("Correct secret is obtained from a credential store", "secret", authConfig.getPassword());
     }
 
+    @Test
+    public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper-using-token.json");
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registrytoken.example.com/org/repo"), new AuthConfig());
+
+        assertEquals("Correct identitytoken is obtained from a credential store", "secret", authConfig.getIdentitytoken());
+    }
+
     @Test
     public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty-auth-with-helper.json");
diff --git a/core/src/test/resources/auth-config/config-with-helper-using-token.json b/core/src/test/resources/auth-config/config-with-helper-using-token.json
new file mode 100644
index 00000000000..63b10a1ef5e
--- /dev/null
+++ b/core/src/test/resources/auth-config/config-with-helper-using-token.json
@@ -0,0 +1,11 @@
+{
+    "auths": {
+        "registrytoken.example.com": {}
+    },
+    "HttpHeaders": {
+        "User-Agent": "Docker-Client/18.03.0-ce (darwin)"
+    },
+    "credHelpers": {
+        "registrytoken.example.com": "fake"
+    }
+}
diff --git a/core/src/test/resources/auth-config/docker-credential-fake b/core/src/test/resources/auth-config/docker-credential-fake
index 0fc0d44621e..880009f2c2a 100755
--- a/core/src/test/resources/auth-config/docker-credential-fake
+++ b/core/src/test/resources/auth-config/docker-credential-fake
@@ -15,8 +15,21 @@ if [[ $inputLine == "https://not.a.real.registry/url" ]]; then
     exit 1
 fi
 
-echo '{' \
-     '  "ServerURL": "url",' \
-     '  "Username": "username",' \
-     '  "Secret": "secret"' \
-     '}'
+if [[ $inputLine == "registry.example.com" ]]; then
+    echo '{' \
+        '  "ServerURL": "url",' \
+        '  "Username": "username",' \
+        '  "Secret": "secret"' \
+        '}'
+    exit 0
+fi
+if [[ $inputLine == "registrytoken.example.com" ]]; then
+    echo '{' \
+        '  "ServerURL": "url",' \
+        '  "Username": "<token>",' \
+        '  "Secret": "secret"' \
+        '}'
+    exit 0
+fi
+
+exit 1
diff --git a/core/src/test/resources/auth-config/win/docker-credential-fake.bat b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
index 7b6b27df5a6..4b248973b48 100644
--- a/core/src/test/resources/auth-config/win/docker-credential-fake.bat
+++ b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
@@ -14,8 +14,21 @@ if "%inputLine%" == "https://not.a.real.registry/url" (
      exit 1
 )
 
-echo {
-echo   "ServerURL": "url",
-echo   "Username": "username",
-echo   "Secret": "secret"
-echo }
+if "%inputLine%" == "registry.example.com" (
+     echo {
+     echo   "ServerURL": "url",
+     echo   "Username": "username",
+     echo   "Secret": "secret"
+     echo }
+     exit 0
+)
+if "%inputLine%" == "registrytoken.example.com" (
+     echo {
+     echo   "ServerURL": "url",
+     echo   "Username": "<token>",
+     echo   "Secret": "secret"
+     echo }
+     exit 0
+)
+
+exit 1

From da97377ff459247156cc39814f6a4a6e9009ce65 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2019 18:41:56 +0200
Subject: [PATCH 0227/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#1779)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 6.7.1 to 7.3.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v6.7.1...v7.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 699bc54bd9e..6ae9ab00dab 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.7.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.3.1"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From aab9aa06a8cfa2f04d87f08c2098d7bd5b6f0435 Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Sun, 25 Aug 2019 14:14:57 -0500
Subject: [PATCH 0228/4969] Coordinate image removals after stopping containers
 (#1745)

---
 .../images/builder/ImageFromDockerfile.java   | 23 ++-----------------
 .../utility/ResourceReaper.java               | 20 +++++++++++++++-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 8c653718a69..98d0dda5e5c 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -22,6 +22,7 @@
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.LazyFuture;
+import org.testcontainers.utility.ResourceReaper;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
@@ -42,26 +43,6 @@ public class ImageFromDockerfile extends LazyFuture<String> implements
         StringsTrait<ImageFromDockerfile>,
         DockerfileTrait<ImageFromDockerfile> {
 
-    private static final Set<String> imagesToDelete = Sets.newConcurrentHashSet();
-
-    static {
-        Runtime.getRuntime().addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, () -> {
-            DockerClient dockerClientForCleaning = DockerClientFactory.instance().client();
-            try {
-                for (String dockerImageName : imagesToDelete) {
-                    log.info("Removing image tagged {}", dockerImageName);
-                    try {
-                        dockerClientForCleaning.removeImageCmd(dockerImageName).withForce(true).exec();
-                    } catch (Throwable e) {
-                        log.warn("Unable to delete image " + dockerImageName, e);
-                    }
-                }
-            } catch (DockerClientException e) {
-                throw new RuntimeException(e);
-            }
-        }));
-    }
-
     private final String dockerImageName;
 
     private boolean deleteOnExit = true;
@@ -102,7 +83,7 @@ protected final String resolve() {
         DockerClient dockerClient = DockerClientFactory.instance().client();
         try {
             if (deleteOnExit) {
-                imagesToDelete.add(dockerImageName);
+                ResourceReaper.instance().registerImageForCleanup(dockerImageName);
             }
 
             BuildImageResultCallback resultCallback = new BuildImageResultCallback() {
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 53f7693149b..f46db952c37 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -11,6 +11,8 @@
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
+import com.google.common.collect.Sets;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
@@ -51,7 +53,8 @@ public final class ResourceReaper {
     private static ResourceReaper instance;
     private final DockerClient dockerClient;
     private Map<String, String> registeredContainers = new ConcurrentHashMap<>();
-    private Set<String> registeredNetworks = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private Set<String> registeredNetworks = Sets.newConcurrentHashSet();
+    private Set<String> registeredImages = Sets.newConcurrentHashSet();
     private AtomicBoolean hookIsSet = new AtomicBoolean(false);
 
     private ResourceReaper() {
@@ -164,6 +167,7 @@ public synchronized static ResourceReaper instance() {
     public synchronized void performCleanup() {
         registeredContainers.forEach(this::stopContainer);
         registeredNetworks.forEach(this::removeNetwork);
+        registeredImages.forEach(this::removeImage);
     }
 
     /**
@@ -337,6 +341,20 @@ public void unregisterNetwork(String identifier) {
     public void unregisterContainer(String identifier) {
         registeredContainers.remove(identifier);
     }
+    
+    public void registerImageForCleanup(String dockerImageName) {
+        setHook();
+        registeredImages.add(dockerImageName);
+    }
+    
+    private void removeImage(String dockerImageName) {
+        LOGGER.trace("Removing image tagged {}", dockerImageName);
+        try {
+            dockerClient.removeImageCmd(dockerImageName).withForce(true).exec();
+        } catch (Throwable e) {
+            LOGGER.warn("Unable to delete image " + dockerImageName, e);
+        }
+    }
 
     private void setHook() {
         if (hookIsSet.compareAndSet(false, true)) {

From a4b70413e71b7ea65675de0475e296a2ce102184 Mon Sep 17 00:00:00 2001
From: glebsts <gleb.stsenov@gmail.com>
Date: Sun, 25 Aug 2019 22:16:28 +0300
Subject: [PATCH 0229/4969] Fix fixed host port test (#1355)

* 'fix fixed host port test' - rewrote test using simple echo http container, followed path of original test;

* 'fix fixed host port test' - rewrote assertions to hamcrest, failure in response getting now fails test directly with io exc

* 'fix fixed host port test' - as suggested by reviewer, rewrote tests to alpine, also copied some routines from generic container tests

* 'fix fixed host port test' - no assertions on basic container start, code style updates based on PR
---
 .../junit/FixedHostPortContainerTest.java     | 93 +++++++++++++++----
 1 file changed, 74 insertions(+), 19 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index 516fcb8516a..dba48da4db1 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -1,10 +1,19 @@
 package org.testcontainers.junit;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import com.google.common.util.concurrent.Uninterruptibles;
 import org.junit.Test;
+import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.GenericContainer;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Socket;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Test of {@link FixedHostPortGenericContainer}. Note that this is not an example of typical use (usually, a container
@@ -14,28 +23,74 @@
  */
 public class FixedHostPortContainerTest {
 
-    private static final int REDIS_PORT = 6379;
+    private static final String TEST_IMAGE = "alpine:3.2";
+
+    /**
+     * Default http server port (just something different from default)
+     */
+    private static final int TEST_PORT = 5678;
+
+    /**
+     * test response
+     */
+    private static final String TEST_RESPONSE = "test-response";
+
+    /**
+     * *nix pipe to fire test response on test port
+     */
+    private static final String HTTP_ECHO_CMD =
+        String.format("while true; do echo \"%s\" | nc -l -p %d; done", TEST_RESPONSE, TEST_PORT);
 
     @Test
     public void testFixedHostPortMapping() throws IOException {
         // first find a free port on the docker host that will work for testing
-        GenericContainer portDiscoveryRedis = new GenericContainer("redis:3.0.2").withExposedPorts(REDIS_PORT);
-        portDiscoveryRedis.start();
-        Integer freePort = portDiscoveryRedis.getMappedPort(REDIS_PORT);
-        portDiscoveryRedis.stop();
-
-
-        // Set up a FixedHostPortGenericContainer as if this were a @Rule
-        FixedHostPortGenericContainer redis = new FixedHostPortGenericContainer("redis:3.0.2").withFixedExposedPort(freePort, REDIS_PORT);
-        redis.start();
-
-//        Config redisConfig = new Config();
-//        redisConfig.useSingleServer().setAddress(redis.getContainerIpAddress() + ":" + freePort);
-//        Redisson redisson = Redisson.create(redisConfig);
-//
-//        redisson.getBucket("test").set("foo");
-//
-//        assertEquals("The bucket content was successfully set", "foo", redisson.getBucket("test").get());
-//        assertEquals("The container returns the fixed port from getMappedPort(...)", freePort, redis.getMappedPort(REDIS_PORT));
+        final Integer unusedHostPort;
+        try (
+            final GenericContainer echoServer = new GenericContainer<>(TEST_IMAGE)
+                .withExposedPorts(TEST_PORT)
+                .withCommand("/bin/sh", "-c", HTTP_ECHO_CMD)
+        ) {
+            echoServer.start();
+            unusedHostPort = echoServer.getMappedPort(TEST_PORT);
+        }
+
+        // now starting echo server container mapped to known-as-free host port
+        try (
+            final GenericContainer echoServer = new FixedHostPortGenericContainer(TEST_IMAGE)
+            // using workaround for port bind+expose
+            .withFixedExposedPort(unusedHostPort, TEST_PORT)
+            .withExposedPorts(TEST_PORT)
+            .withCommand("/bin/sh", "-c", HTTP_ECHO_CMD)
+        ) {
+            echoServer.start();
+
+            assertThat("Port mapping does not seem to match given fixed port",
+                echoServer.getMappedPort(TEST_PORT), equalTo(unusedHostPort));
+
+            final String content = this.readResponse(echoServer, unusedHostPort);
+            assertThat("Returned echo from fixed port does not match expected", content, equalTo(TEST_RESPONSE));
+        }
+    }
+
+    /**
+     * Simple socket content reader from given container:port
+     *
+     * @param container to query
+     * @param port      to send request to
+     * @return socket reader content
+     * @throws IOException if any
+     */
+    private String readResponse(GenericContainer container, Integer port) throws IOException {
+        try (
+            final BufferedReader reader = Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS,
+                () -> {
+                    Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+                    final Socket socket = new Socket(container.getContainerIpAddress(), port);
+                    return new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                }
+            )
+        ) {
+            return reader.readLine();
+        }
     }
 }

From 79adf4e5f7f2c511a7ce3f0583326ace4448cd1e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 25 Aug 2019 20:17:01 +0100
Subject: [PATCH 0230/4969] Disable Travis for all but master branch builds
 (#1720)

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0c03c4931bb..f07d50123e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+if: branch = master
+
 language: java
 jdk:
   - oraclejdk8

From 8894daec097aa1e91e434475d4d7edb2f81fdfcd Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Sun, 25 Aug 2019 21:34:14 +0200
Subject: [PATCH 0231/4969] add check for compatible Docker OS type (#1780)

* add container OSType check for Windows strategies

as Windows containers are not supported at the moment

* fix typo

* generic check for OS Type, as we currently only support Linux containers

* use debug logging when checking OS type

* words
---
 .../dockerclient/DockerClientProviderStrategy.java  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index a9321276fd6..57cccc8b540 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.google.common.base.Throwables;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
@@ -111,6 +112,7 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                     try {
                         strategy.test();
                         LOGGER.info("Found Docker environment with {}", strategy.getDescription());
+                        strategy.checkOSType();
 
                         if (strategy.isPersistable()) {
                             TestcontainersConfiguration.getInstance().updateGlobalConfig("docker.client.strategy", strategy.getClass().getName());
@@ -199,4 +201,15 @@ protected void ping(DockerClient client, int timeoutInSeconds) {
     public String getDockerHostIpAddress() {
         return DockerClientConfigUtils.getDockerHostIpAddress(this.config);
     }
+
+    protected void checkOSType() {
+        LOGGER.debug("Checking Docker OS type for {}", this.getDescription());
+        String osType = client.infoCmd().exec().getOsType();
+        if (StringUtils.isBlank(osType)) {
+            LOGGER.warn("Could not determine Docker OS type");
+        } else if (!osType.equals("linux")) {
+            LOGGER.warn("{} is currently not supported", osType);
+            throw new InvalidConfigurationException(osType + " containers are currently not supported");
+        }
+    }
 }

From 43e1f6af777046f650b8c2ed277235c9668f2062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tura=C3=A7=20Kangal?= <kangal.turac@gmail.com>
Date: Sun, 25 Aug 2019 22:51:24 +0300
Subject: [PATCH 0232/4969] Fix Deprecated MySQL Class Name (#1760)

* Fix #1655

* MySQL driver discovery in MySQLContainer instead of JdbcDatabaseContainer
---
 .../java/org/testcontainers/containers/MySQLContainer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 172ead4856a..fa2e8626b0d 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -56,7 +56,12 @@ protected void configure() {
 
     @Override
     public String getDriverClassName() {
-        return "com.mysql.jdbc.Driver";
+        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            return "com.mysql.cj.jdbc.Driver";
+        } catch (ClassNotFoundException e) {
+            return "com.mysql.jdbc.Driver";
+        }
     }
 
     @Override

From 764ab17217b2fdb67898f9ea00bdfdc7e6b4798b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2019 22:40:53 +0200
Subject: [PATCH 0233/4969] Bump mockito-core from 2.28.2 to 3.0.0 in /core
 (#1635)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.28.2 to 3.0.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.28.2...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index c39bb183e82..9698160c033 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.7.2'
     testCompile 'org.mongodb:mongo-java-driver:3.10.2'
-    testCompile ('org.mockito:mockito-core:2.28.2') {
+    testCompile ('org.mockito:mockito-core:3.0.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 7228a2df3cd7a02ad644c072525d3276fd8a25fb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2019 22:34:24 +0000
Subject: [PATCH 0234/4969] Bump aws-java-sdk-sqs from 1.11.616 to 1.11.618 in
 /modules/localstack (#1785)

---
 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 d950467e502..897e337ddb5 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.616'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.618'
 }

From e6cd4f51523a1b4e4c5f5821a6fe9bd1081702c3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2019 23:53:33 +0000
Subject: [PATCH 0235/4969] Bump selenium-firefox-driver from 3.14.0 to
 3.141.59 in /examples (#1748)

---
 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 069e0a8881a..5467783ef92 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
-    implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.14.0'
+    implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
     implementation 'io.cucumber:cucumber-java:4.7.1'
     testImplementation 'io.cucumber:cucumber-junit:4.7.1'

From 6fda0556732087659b24ffa81710bcef3726867f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2019 06:33:51 +0000
Subject: [PATCH 0236/4969] Bump assertj-core from 3.12.2 to 3.13.2 in /core
 (#1789)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9698160c033..2b4c76ee4b1 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -115,7 +115,7 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.12.2'
+    testCompile 'org.assertj:assertj-core:3.13.2'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"

From f9fc67147ea68cbaab4c9fcd128c6b2c57588626 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2019 08:36:43 +0100
Subject: [PATCH 0237/4969] Bump snakeyaml from 1.21 to 1.25 in /core (#1742)

Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.21 to 1.25.
- [Commits](https://bitbucket.org/asomov/snakeyaml/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2b4c76ee4b1..78b60a41de0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -95,7 +95,7 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded "org.yaml:snakeyaml:1.21"
+    shaded "org.yaml:snakeyaml:1.25"
 
     shaded 'com.squareup.okhttp3:okhttp:3.14.2'
 

From 7d93069b1f427ed530a2cd465fca58554af81051 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2019 08:37:03 +0100
Subject: [PATCH 0238/4969] Bump jedis from 3.0.1 to 3.1.0 in /core (#1656)

Bumps [jedis](https://github.com/xetorthio/jedis) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/xetorthio/jedis/releases)
- [Commits](https://github.com/xetorthio/jedis/compare/jedis-3.0.1...jedis-3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 78b60a41de0..2235b53742e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -106,7 +106,7 @@ dependencies {
     }
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.0.1'
+    testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'com.rabbitmq:amqp-client:5.7.2'
     testCompile 'org.mongodb:mongo-java-driver:3.10.2'
     testCompile ('org.mockito:mockito-core:3.0.0') {

From 827c4c567a30a1c43483a85c326883d051ea539d Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 26 Aug 2019 10:45:12 +0200
Subject: [PATCH 0239/4969] Separate "environment" and "classpath" properties
 (for global things) (#1784)

* Separate "environment" and "classpath" properties (for global things)

* Update TestcontainersConfiguration.java
---
 .../DockerClientProviderStrategy.java         | 18 +---
 .../utility/TestcontainersConfiguration.java  | 97 ++++++++++---------
 .../TestcontainersConfigurationTest.java      | 43 ++++++++
 3 files changed, 99 insertions(+), 59 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 57cccc8b540..7101b23b21a 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -167,20 +167,10 @@ public DockerClient getClient() {
     }
 
     protected DockerClient getClientForConfig(DockerClientConfig config) {
-        DockerClientBuilder clientBuilder = DockerClientBuilder
-            .getInstance(new AuthDelegatingDockerClientConfig(config));
-
-        String transportType = TestcontainersConfiguration.getInstance().getTransportType();
-        if ("okhttp".equals(transportType)) {
-            clientBuilder
-                .withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory());
-        } else {
-            throw new IllegalArgumentException("Unknown transport type: " + transportType);
-        }
-
-        LOGGER.info("Will use '{}' transport", transportType);
-
-        return clientBuilder.build();
+        return DockerClientBuilder
+            .getInstance(new AuthDelegatingDockerClientConfig(config))
+            .withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory())
+            .build();
     }
 
     protected void ping(DockerClient client, int timeoutInSeconds) {
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 608d02716d0..b7ef772fcf5 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -5,6 +5,7 @@
 
 import java.io.*;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Stream;
@@ -19,12 +20,22 @@ public class TestcontainersConfiguration {
 
     private static String PROPERTIES_FILE_NAME = "testcontainers.properties";
 
-    private static File GLOBAL_CONFIG_FILE = new File(System.getProperty("user.home"), "." + PROPERTIES_FILE_NAME);
+    private static File ENVIRONMENT_CONFIG_FILE = new File(System.getProperty("user.home"), "." + PROPERTIES_FILE_NAME);
 
     @Getter(lazy = true)
     private static final TestcontainersConfiguration instance = loadConfiguration();
 
-    private final Properties properties;
+    @Getter(AccessLevel.NONE)
+    private final Properties environmentProperties;
+
+    private final Properties properties = new Properties();
+
+    TestcontainersConfiguration(Properties environmentProperties, Properties classpathProperties) {
+        this.environmentProperties = environmentProperties;
+
+        this.properties.putAll(classpathProperties);
+        this.properties.putAll(environmentProperties);
+    }
 
     public String getAmbassadorContainerImage() {
         return (String) properties.getOrDefault("ambassador.container.image", "richnorth/ambassador:latest");
@@ -71,13 +82,18 @@ public String getPulsarImage() {
     }
 
     public boolean isDisableChecks() {
-        return Boolean.parseBoolean((String) properties.getOrDefault("checks.disable", "false"));
+        return Boolean.parseBoolean((String) environmentProperties.getOrDefault("checks.disable", "false"));
     }
 
     public String getDockerClientStrategyClassName() {
-        return (String) properties.get("docker.client.strategy");
+        return (String) environmentProperties.get("docker.client.strategy");
     }
 
+    /**
+     * 
+     * @deprecated we no longer have different transport types
+     */
+    @Deprecated
     public String getTransportType() {
         return properties.getProperty("transport.type", "okhttp");
     }
@@ -89,64 +105,55 @@ public Integer getImagePullPauseTimeout() {
     @Synchronized
     public boolean updateGlobalConfig(@NonNull String prop, @NonNull String value) {
         try {
-            Properties globalProperties = new Properties();
-            GLOBAL_CONFIG_FILE.createNewFile();
-            try (InputStream inputStream = new FileInputStream(GLOBAL_CONFIG_FILE)) {
-                globalProperties.load(inputStream);
-            }
-
-            if (value.equals(globalProperties.get(prop))) {
+            if (value.equals(environmentProperties.get(prop))) {
                 return false;
             }
 
-            globalProperties.setProperty(prop, value);
+            environmentProperties.setProperty(prop, value);
 
-            try (OutputStream outputStream = new FileOutputStream(GLOBAL_CONFIG_FILE)) {
-                globalProperties.store(outputStream, "Modified by Testcontainers");
+            ENVIRONMENT_CONFIG_FILE.createNewFile();
+            try (OutputStream outputStream = new FileOutputStream(ENVIRONMENT_CONFIG_FILE)) {
+                environmentProperties.store(outputStream, "Modified by Testcontainers");
             }
 
-            // Update internal state only if global config was successfully updated
+            // Update internal state only if environment config was successfully updated
             properties.setProperty(prop, value);
             return true;
         } catch (Exception e) {
-            log.debug("Can't store global property {} in {}", prop, GLOBAL_CONFIG_FILE);
+            log.debug("Can't store environment property {} in {}", prop, ENVIRONMENT_CONFIG_FILE);
             return false;
         }
     }
 
     @SneakyThrows(MalformedURLException.class)
     private static TestcontainersConfiguration loadConfiguration() {
-        final TestcontainersConfiguration config = new TestcontainersConfiguration(
-                Stream
-                        .of(
-                                TestcontainersConfiguration.class.getClassLoader().getResource(PROPERTIES_FILE_NAME),
-                                Thread.currentThread().getContextClassLoader().getResource(PROPERTIES_FILE_NAME),
-                                GLOBAL_CONFIG_FILE.toURI().toURL()
-                        )
-                        .filter(Objects::nonNull)
-                        .map(it -> {
-                            log.debug("Testcontainers configuration overrides will be loaded from {}", it);
-
-                            final Properties subProperties = new Properties();
-                            try (final InputStream inputStream = it.openStream()) {
-                                subProperties.load(inputStream);
-                            } catch (FileNotFoundException e) {
-                                log.trace("Testcontainers config override was found on " + it + " but the file was not found", e);
-                            } catch (IOException e) {
-                                log.warn("Testcontainers config override was found on " + it + " but could not be loaded", e);
-                            }
-                            return subProperties;
-                        })
-                        .reduce(new Properties(), (a, b) -> {
-                            a.putAll(b);
-                            return a;
-                        })
+        return new TestcontainersConfiguration(
+            readProperties(ENVIRONMENT_CONFIG_FILE.toURI().toURL()),
+            Stream
+                .of(
+                    TestcontainersConfiguration.class.getClassLoader(),
+                    Thread.currentThread().getContextClassLoader()
+                )
+                .map(it -> it.getResource(PROPERTIES_FILE_NAME))
+                .filter(Objects::nonNull)
+                .map(TestcontainersConfiguration::readProperties)
+                .reduce(new Properties(), (a, b) -> {
+                    a.putAll(b);
+                    return a;
+                })
         );
+    }
 
-        if (!config.getProperties().isEmpty()) {
-            log.debug("Testcontainers configuration overrides loaded from {}", config);
+    private static Properties readProperties(URL url) {
+        log.debug("Testcontainers configuration overrides will be loaded from {}", url);
+        Properties properties = new Properties();
+        try (InputStream inputStream = url.openStream()) {
+            properties.load(inputStream);
+        } catch (FileNotFoundException e) {
+            log.trace("Testcontainers config override was found on {} but the file was not found", url, e);
+        } catch (IOException e) {
+            log.warn("Testcontainers config override was found on {} but could not be loaded", url, e);
         }
-
-        return config;
+        return properties;
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
new file mode 100644
index 00000000000..ad2a0be6cd3
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -0,0 +1,43 @@
+package org.testcontainers.utility;
+
+import org.junit.Test;
+
+import java.util.Properties;
+import java.util.UUID;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+
+public class TestcontainersConfigurationTest {
+
+    final Properties environmentProperties = new Properties();
+
+    final Properties classpathProperties = new Properties();
+
+    @Test
+    public void shouldReadChecksFromEnvironmentOnly() {
+        assertFalse("checks enabled by default", newConfig().isDisableChecks());
+
+        classpathProperties.setProperty("checks.disable", "true");
+        assertFalse("checks are not affected by classpath properties", newConfig().isDisableChecks());
+
+        environmentProperties.setProperty("checks.disable", "true");
+        assertTrue("checks disabled", newConfig().isDisableChecks());
+    }
+
+    @Test
+    public void shouldReadDockerClientStrategyFromEnvironmentOnly() {
+        String currentValue = newConfig().getDockerClientStrategyClassName();
+
+        classpathProperties.setProperty("docker.client.strategy", UUID.randomUUID().toString());
+        assertEquals("Docker client strategy is not affected by classpath properties", currentValue, newConfig().getDockerClientStrategyClassName());
+
+        environmentProperties.setProperty("docker.client.strategy", "foo");
+        assertEquals("Docker client strategy is changed", "foo", newConfig().getDockerClientStrategyClassName());
+    }
+
+    private TestcontainersConfiguration newConfig() {
+        return new TestcontainersConfiguration(environmentProperties, classpathProperties);
+    }
+}

From 137c510f96e89fdf359c5a7e36af3f82e06e6430 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 26 Aug 2019 10:47:13 +0200
Subject: [PATCH 0240/4969] speed up port detection by running the checks as a
 single command (#1782)

---
 .../internal/ExternalPortListeningCheck.java  |  4 +-
 .../InternalCommandPortListeningCheck.java    | 45 ++++++++++---------
 .../wait/strategy/HostPortWaitStrategy.java   |  4 +-
 ...InternalCommandPortListeningCheckTest.java | 10 ++---
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
index 3283880b569..2aae12bab8d 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
@@ -20,13 +20,13 @@ public class ExternalPortListeningCheck implements Callable<Boolean> {
     public Boolean call() {
         String address = containerState.getContainerIpAddress();
 
-        for (Integer externalPort : externalLivenessCheckPorts) {
+        externalLivenessCheckPorts.parallelStream().forEach(externalPort -> {
             try {
                 new Socket(address, externalPort).close();
             } catch (IOException e) {
                 throw new IllegalStateException("Socket not listening yet: " + externalPort);
             }
-        }
+        });
         return true;
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index bad30fef653..43ed94bc84d 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -1,9 +1,13 @@
 package org.testcontainers.containers.wait.internal;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.ExecInContainerPattern;
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.Set;
 
 import static java.lang.String.format;
@@ -12,6 +16,7 @@
  * Mechanism for testing that a socket is listening when run from the container being checked.
  */
 @RequiredArgsConstructor
+@Slf4j
 public class InternalCommandPortListeningCheck implements java.util.concurrent.Callable<Boolean> {
 
     private final WaitStrategyTarget waitStrategyTarget;
@@ -19,30 +24,26 @@ public class InternalCommandPortListeningCheck implements java.util.concurrent.C
 
     @Override
     public Boolean call() {
-        for (Integer internalPort : internalPorts) {
-            tryPort(internalPort);
+        String command = "true";
+
+        for (int internalPort : internalPorts) {
+            command += " && ";
+            command += " (";
+            command += format("cat /proc/net/tcp{,6} | awk '{print $2}' | grep -i :%x", internalPort);
+            command += " || ";
+            command += format("nc -vz -w 1 localhost %d", internalPort);
+            command += " || ";
+            command += format("/bin/bash -c '</dev/tcp/localhost/%d'", internalPort);
+            command += ")";
         }
 
-        return true;
-    }
-
-    private void tryPort(Integer internalPort) {
-        String[][] commands = {
-                {"/bin/sh", "-c", format("cat /proc/net/tcp{,6} | awk '{print $2}' | grep -i :%x", internalPort)},
-                {"/bin/sh", "-c", format("nc -vz -w 1 localhost %d", internalPort)},
-                {"/bin/bash", "-c", format("</dev/tcp/localhost/%d", internalPort)}
-        };
-
-        for (String[] command : commands) {
-            try {
-                if (ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), command).getExitCode() == 0) {
-                    return;
-                }
-            } catch (Exception e) {
-                throw new IllegalStateException(e);
-            }
+        Instant before = Instant.now();
+        try {
+            ExecResult result = ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), "/bin/sh", "-c", command);
+            log.trace("Check for {} took {}", internalPorts, Duration.between(before, Instant.now()));
+            return result.getExitCode() == 0;
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
         }
-
-        throw new IllegalStateException("Socket not listening yet: " + internalPort);
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index ac506b4ed3b..91f4e91fadf 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -25,7 +25,9 @@ public class HostPortWaitStrategy extends AbstractWaitStrategy {
     protected void waitUntilReady() {
         final Set<Integer> externalLivenessCheckPorts = getLivenessCheckPorts();
         if (externalLivenessCheckPorts.isEmpty()) {
-            log.debug("Liveness check ports of {} is empty. Not waiting.", waitStrategyTarget.getContainerInfo().getName());
+            if (log.isDebugEnabled()) {
+                log.debug("Liveness check ports of {} is empty. Not waiting.", waitStrategyTarget.getContainerInfo().getName());
+            }
             return;
         }
 
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
index c1cd341943e..71a14c3c79e 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
@@ -6,7 +6,7 @@
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class InternalCommandPortListeningCheckTest {
@@ -30,8 +30,8 @@ public void singleListening() {
     public void nonListening() {
         final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(nginx, ImmutableSet.of(8080, 1234));
 
-        assertThrows("InternalCommandPortListeningCheck detects a non-listening port among many",
-                IllegalStateException.class,
-                (Runnable) check::call);
+        final Boolean result = check.call();
+
+        assertFalse("InternalCommandPortListeningCheck detects a non-listening port among many", result);
     }
-}
\ No newline at end of file
+}

From a0f5d0008f5a89929dba388557a49718a3e0af20 Mon Sep 17 00:00:00 2001
From: William Delanoue <william.delanoue@deveryware.net>
Date: Mon, 26 Aug 2019 20:58:50 +0200
Subject: [PATCH 0241/4969] Support legacy RabbitMQ configuration format
 (#1692)

see https://github.com/testcontainers/testcontainers-java/issues/1690
---
 .../containers/RabbitMQContainer.java         |  32 ++-
 .../containers/RabbitMQContainerTest.java     | 195 +++++++++++-------
 .../src/test/resources/rabbitmq-custom.conf   |   2 +-
 .../src/test/resources/rabbitmq-custom.config |  13 ++
 4 files changed, 161 insertions(+), 81 deletions(-)
 create mode 100644 modules/rabbitmq/src/test/resources/rabbitmq-custom.config

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index f16f005df5e..4faaf3a5dea 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -346,16 +346,42 @@ public RabbitMQContainer withExchange(String name, String type, boolean autoDele
     }
 
     /**
-     * Overwrites the default RabbitMQ configuration file with the supplied one
+     * Overwrites the default RabbitMQ configuration file with the supplied one.
      *
-     * @param rabbitMQConf The rabbitmq.conf file to use
+     * @param rabbitMQConf The rabbitmq.conf file to use (in sysctl format, don't forget empty line in the end of file)
      * @return This container.
      */
     public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
-        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.conf");
+
+        return withRabbitMQConfigSysctl(rabbitMQConf);
+    }
+
+    /**
+     * Overwrites the default RabbitMQ configuration file with the supplied one.
+     *
+     * This function doesn't work with RabbitMQ < 3.7.
+     *
+     * This function and the Sysctl format is recommended for RabbitMQ >= 3.7
+     *
+     * @param rabbitMQConf The rabbitmq.config file to use (in sysctl format, don't forget empty line in the end of file)
+     * @return This container.
+     */
+    public RabbitMQContainer withRabbitMQConfigSysctl(MountableFile rabbitMQConf) {
+        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom");
         return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.conf");
     }
 
+    /**
+     * Overwrites the default RabbitMQ configuration file with the supplied one.
+     *
+     * @param rabbitMQConf The rabbitmq.config file to use (in erlang format)
+     * @return This container.
+     */
+    public RabbitMQContainer withRabbitMQConfigErlang(MountableFile rabbitMQConf) {
+        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.config");
+        return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.config");
+    }
+
     @NotNull
     private String toJson(Map<String, Object> arguments) {
         try {
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 4f549a6f5ed..bdda594818f 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -1,26 +1,29 @@
 package org.testcontainers.containers;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.testcontainers.containers.RabbitMQContainer.SslVerification.VERIFY_PEER;
+import static org.testcontainers.utility.MountableFile.forClasspathResource;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
-import org.junit.Test;
-import org.testcontainers.utility.MountableFile;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.security.*;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.testcontainers.containers.RabbitMQContainer.SslVerification.VERIFY_PEER;
-import static org.testcontainers.utility.MountableFile.forClasspathResource;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import org.junit.Test;
+import org.testcontainers.utility.MountableFile;
 
 /**
  * @author Martin Greber
@@ -34,7 +37,8 @@ public class RabbitMQContainerTest {
     public static final int DEFAULT_HTTP_PORT = 15672;
 
     @Test
-    public void shouldCreateRabbitMQContainer() {
+    public void shouldCreateRabbitMQContainer()
+    {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
 
             assertThat(container.getDockerImageName()).isEqualTo(DEFAULT_IMAGE);
@@ -44,13 +48,13 @@ public void shouldCreateRabbitMQContainer() {
             container.start();
 
             assertThat(container.getAmqpsUrl()).isEqualTo(
-                    String.format("amqps://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQPS_PORT)));
+                String.format("amqps://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQPS_PORT)));
             assertThat(container.getAmqpUrl()).isEqualTo(
-                    String.format("amqp://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQP_PORT)));
+                String.format("amqp://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQP_PORT)));
             assertThat(container.getHttpsUrl()).isEqualTo(
-                    String.format("https://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTPS_PORT)));
+                String.format("https://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTPS_PORT)));
             assertThat(container.getHttpUrl()).isEqualTo(
-                    String.format("http://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTP_PORT)));
+                String.format("http://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTP_PORT)));
 
             assertThat(container.getHttpsPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTPS_PORT));
             assertThat(container.getHttpPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTP_PORT));
@@ -58,140 +62,176 @@ public void shouldCreateRabbitMQContainer() {
             assertThat(container.getAmqpPort()).isEqualTo(container.getMappedPort(DEFAULT_AMQP_PORT));
 
             assertThat(container.getLivenessCheckPortNumbers()).containsExactlyInAnyOrder(
-                    container.getMappedPort(DEFAULT_AMQP_PORT),
-                    container.getMappedPort(DEFAULT_AMQPS_PORT),
-                    container.getMappedPort(DEFAULT_HTTP_PORT),
-                    container.getMappedPort(DEFAULT_HTTPS_PORT)
+                container.getMappedPort(DEFAULT_AMQP_PORT),
+                container.getMappedPort(DEFAULT_AMQPS_PORT),
+                container.getMappedPort(DEFAULT_HTTP_PORT),
+                container.getMappedPort(DEFAULT_HTTPS_PORT)
             );
         }
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithTag() {
+    public void shouldCreateRabbitMQContainerWithTag()
+    {
         try (RabbitMQContainer container = new RabbitMQContainer(DEFAULT_IMAGE)) {
             assertThat(container.getDockerImageName()).isEqualTo(DEFAULT_IMAGE);
         }
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException {
+    public void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException
+    {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
             container.withExchange("test-exchange", "direct");
 
             container.start();
 
             assertThat(container.execInContainer("rabbitmqctl", "list_exchanges").getStdout())
-                    .containsPattern("test-exchange\\s+direct");
+                .containsPattern("test-exchange\\s+direct");
         }
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException {
+    public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException
+    {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
 
             container.withQueue("queue-one")
-                    .withQueue("queue-two", false, true, ImmutableMap.of("x-message-ttl", 1000));
+                .withQueue("queue-two", false, true, ImmutableMap.of("x-message-ttl", 1000));
 
             container.start();
 
             assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
-                    .containsPattern("queue-one");
+                .containsPattern("queue-one");
             assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
-                    .containsPattern("queue-two\\s.*x-message-ttl");
+                .containsPattern("queue-two\\s.*x-message-ttl");
+        }
+    }
+
+    @Test
+    public void shouldMountConfigurationFile()
+    {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+
+            container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
+            container.start();
+
+            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
+            assertThat(container.getLogs()).doesNotContain(" (not found)");
         }
     }
 
+
+    @Test
+    public void shouldMountConfigurationFileErlang()
+    {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+
+            container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
+            container.start();
+
+            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.config");
+            assertThat(container.getLogs()).doesNotContain(" (not found)");
+        }
+    }
+
+
     @Test
-    public void shouldMountConfigurationFile() {
+    public void shouldMountConfigurationFileSysctl()
+    {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
 
             container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
 
-            assertThat(container.getLogs().contains("/etc/rabbitmq/rabbitmq-custom.conf")).isTrue();
+            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
+            assertThat(container.getLogs()).doesNotContain(" (not found)");
         }
     }
 
     @Test
-    public void shouldStartTheWholeEnchilada() throws IOException, InterruptedException {
+    public void shouldStartTheWholeEnchilada() throws IOException, InterruptedException
+    {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
             container
-                    .withVhost("vhost1")
-                    .withVhostLimit("vhost1", "max-connections", 1)
-                    .withVhost("vhost2", true)
-                    .withExchange("direct-exchange", "direct")
-                    .withExchange("topic-exchange", "topic")
-                    .withQueue("queue1")
-                    .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
-                    .withBinding("direct-exchange", "queue1")
-                    .withUser("user1", "password1")
-                    .withUser("user2", "password2", ImmutableSet.of("administrator"))
-                    .withPermission("vhost1", "user1", ".*", ".*", ".*")
-                    .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
-                    .withPolicy("alternate exchange policy", "^direct-exchange", ImmutableMap.of("alternate-exchange", "amq.direct"))
-                    .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
-                    .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
+                .withVhost("vhost1")
+                .withVhostLimit("vhost1", "max-connections", 1)
+                .withVhost("vhost2", true)
+                .withExchange("direct-exchange", "direct")
+                .withExchange("topic-exchange", "topic")
+                .withQueue("queue1")
+                .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                .withBinding("direct-exchange", "queue1")
+                .withUser("user1", "password1")
+                .withUser("user2", "password2", ImmutableSet.of("administrator"))
+                .withPermission("vhost1", "user1", ".*", ".*", ".*")
+                .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
+                .withPolicy("alternate exchange policy", "^direct-exchange", ImmutableMap.of("alternate-exchange", "amq.direct"))
+                .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
+                .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
 
             container.start();
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "queues")
-                    .getStdout())
-                    .contains("queue1", "queue2");
+                .getStdout())
+                .contains("queue1", "queue2");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "exchanges")
-                    .getStdout())
-                    .contains("direct-exchange", "topic-exchange");
+                .getStdout())
+                .contains("direct-exchange", "topic-exchange");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "bindings")
-                    .getStdout())
-                    .contains("direct-exchange");
+                .getStdout())
+                .contains("direct-exchange");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "users")
-                    .getStdout())
-                    .contains("user1", "user2");
+                .getStdout())
+                .contains("user1", "user2");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "policies")
-                    .getStdout())
-                    .contains("max length policy", "alternate exchange policy");
+                .getStdout())
+                .contains("max length policy", "alternate exchange policy");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "operator_policies")
-                    .getStdout())
-                    .contains("operator policy 1");
+                .getStdout())
+                .contains("operator policy 1");
 
             assertThat(container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_shovel", "--quiet")
-                    .getStdout())
-                    .contains("rabbitmq_shovel is enabled");
+                .getStdout())
+                .contains("rabbitmq_shovel is enabled");
 
             assertThat(container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_random_exchange", "--quiet")
-                    .getStdout())
-                    .contains("rabbitmq_random_exchange is enabled");
+                .getStdout())
+                .contains("rabbitmq_random_exchange is enabled");
         }
     }
 
     @Test
-    public void shouldThrowExceptionForDodgyJson() {
+    public void shouldThrowExceptionForDodgyJson()
+    {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
 
             assertThatCode(() ->
-                    container.withQueue(
-                            "queue2",
-                            true,
-                            false,
-                            ImmutableMap.of("x-message-ttl", container))
+                container.withQueue(
+                    "queue2",
+                    true,
+                    false,
+                    ImmutableMap.of("x-message-ttl", container))
             ).hasMessageStartingWith("Failed to convert arguments into json");
 
         }
     }
 
     @Test
-    public void shouldWorkWithSSL() {
+    public void shouldWorkWithSSL()
+    {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
             container.withSSL(
-                    forClasspathResource("/certs/server_key.pem", 0644),
-                    forClasspathResource("/certs/server_certificate.pem", 0644),
-                    forClasspathResource("/certs/ca_certificate.pem", 0644),
-                    VERIFY_PEER,
-                    true
+                forClasspathResource("/certs/server_key.pem", 0644),
+                forClasspathResource("/certs/server_certificate.pem", 0644),
+                forClasspathResource("/certs/ca_certificate.pem", 0644),
+                VERIFY_PEER,
+                true
             );
 
             container.start();
@@ -199,8 +239,8 @@ public void shouldWorkWithSSL() {
             assertThatCode(() -> {
                 ConnectionFactory connectionFactory = new ConnectionFactory();
                 connectionFactory.useSslProtocol(createSslContext(
-                        "certs/client_key.p12", "password",
-                        "certs/truststore.jks", "password"));
+                    "certs/client_key.p12", "password",
+                    "certs/truststore.jks", "password"));
                 connectionFactory.enableHostnameVerification();
                 connectionFactory.setUri(container.getAmqpsUrl());
                 connectionFactory.setPassword(container.getAdminPassword());
@@ -213,7 +253,8 @@ public void shouldWorkWithSSL() {
     }
 
     private SSLContext createSslContext(String keystoreFile, String keystorePassword, String truststoreFile, String truststorePassword)
-            throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, KeyManagementException {
+        throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, KeyManagementException
+    {
         ClassLoader classLoader = getClass().getClassLoader();
 
         KeyStore ks = KeyStore.getInstance("PKCS12");
diff --git a/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
index 2e93b89bb13..293829a353b 100644
--- a/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
+++ b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
@@ -1,2 +1,2 @@
 loopback_users.guest = false
-listeners.tcp.default = 5555
\ No newline at end of file
+listeners.tcp.default = 5555
diff --git a/modules/rabbitmq/src/test/resources/rabbitmq-custom.config b/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
new file mode 100644
index 00000000000..a1c581542ce
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
@@ -0,0 +1,13 @@
+[
+{ rabbit, [
+{ loopback_users, [ ] },
+		{ tcp_listeners, [ 5555 ] },
+		{ ssl_listeners, [ ] },
+		{ default_vhost, <<"vhost">> },
+		{ hipe_compile, false }
+	] },
+	{ rabbitmq_management, [ { listener, [
+		{ port, 15672 },
+		{ ssl, false }
+	] } ] }
+].

From b5fda2acf41d67f800b92a86285ee9e60ebd3078 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2019 19:59:34 +0100
Subject: [PATCH 0242/4969] Bump mockito-core from 2.28.2 to 3.0.0 in
 /modules/junit-jupiter (#1636)

Bumps [mockito-core](https://github.com/mockito/mockito) from 2.28.2 to 3.0.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.28.2...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 5710b48fd15..2a0937a85d7 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile ('org.mockito:mockito-core:2.28.2') {
+    testCompile ('org.mockito:mockito-core:3.0.0') {
         exclude(module: 'hamcrest-core')
     }
 

From 2c21181520086a966714de4bd57bde360d6133f7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2019 05:57:08 +0000
Subject: [PATCH 0243/4969] Bump aws-java-sdk-sqs from 1.11.618 to 1.11.619 in
 /modules/localstack (#1793)

---
 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 897e337ddb5..24474e5b697 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.618'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.619'
 }

From 91acbb4f4934eae5b2b3c8a0c2f9355c8f489675 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2019 16:12:00 +0100
Subject: [PATCH 0244/4969] Bump mongo-java-driver from 3.10.2 to 3.11.0 in
 /core (#1795)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.10.2...r3.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2235b53742e..dee1acb4d69 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'com.rabbitmq:amqp-client:5.7.2'
-    testCompile 'org.mongodb:mongo-java-driver:3.10.2'
+    testCompile 'org.mongodb:mongo-java-driver:3.11.0'
     testCompile ('org.mockito:mockito-core:3.0.0') {
         exclude(module: 'hamcrest-core')
     }

From 0044218c722c174d1968c5a5e933edb5efb5ceca Mon Sep 17 00:00:00 2001
From: Yoonyoul Yoo <ryukato79@gmail.com>
Date: Wed, 28 Aug 2019 00:14:20 +0900
Subject: [PATCH 0245/4969] update latest version with 1.12.0 (#1800)

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 044489d1e50..f0d953ecd8a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,4 +82,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.11.3
+    latest_version: 1.12.0

From 8405607b9da8fc324adf1b5b3162f8fb3c2e257d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2019 09:31:09 +0000
Subject: [PATCH 0246/4969] Bump aws-java-sdk-sqs from 1.11.619 to 1.11.620 in
 /modules/localstack (#1803)

---
 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 24474e5b697..d808e44d594 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.619'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.620'
 }

From 2c72803f3dc4acea93ab31988d2ad3d4890a269a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2019 06:03:39 +0000
Subject: [PATCH 0247/4969] Bump aws-java-sdk-sqs from 1.11.620 to 1.11.621 in
 /modules/localstack (#1808)

---
 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 d808e44d594..bfb94e0a16b 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.620'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.621'
 }

From 040b35dd2b7163b1687ca9f5d39f7de7e67f1df9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2019 07:37:08 +0000
Subject: [PATCH 0248/4969] Bump cucumber-junit from 4.7.1 to 4.7.2 in
 /examples (#1809)

---
 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 5467783ef92..062fbf84612 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.14.0'
     implementation 'io.cucumber:cucumber-java:4.7.1'
-    testImplementation 'io.cucumber:cucumber-junit:4.7.1'
+    testImplementation 'io.cucumber:cucumber-junit:4.7.2'
     testImplementation 'org.testcontainers:selenium'
 }

From 6e7546ac3bf923f1f00fe4178be5ff2655403400 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2019 05:55:27 +0000
Subject: [PATCH 0249/4969] Bump aws-java-sdk-sqs from 1.11.621 to 1.11.622 in
 /modules/localstack (#1811)

---
 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 bfb94e0a16b..371891ce27a 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.621'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.622'
 }

From a3190044dd940c8ec61bfc5b5441fb07d5f161bf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2019 06:44:56 +0000
Subject: [PATCH 0250/4969] Bump cucumber-java from 4.7.1 to 4.7.2 in /examples
 (#1812)

---
 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 062fbf84612..7e73852ca1d 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.7.1'
+    implementation 'io.cucumber:cucumber-java:4.7.2'
     testImplementation 'io.cucumber:cucumber-junit:4.7.2'
     testImplementation 'org.testcontainers:selenium'
 }

From d9f0d73307c27de6883602ca13257bb914da03b5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 30 Aug 2019 09:57:08 +0200
Subject: [PATCH 0251/4969] Add more labels to the Stale bot's config (#1810)

---
 .github/stale.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/stale.yml b/.github/stale.yml
index a071ce18a5f..5f903fb0189 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -7,6 +7,8 @@ exemptLabels:
   - pinned
   - security
   - "resolution/acknowledged"
+  - "help wanted"
+  - "good first issue"
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

From b97254c3bfa208011d484ac3073674aa6dd11954 Mon Sep 17 00:00:00 2001
From: Guillaume Le Floch <glfloch@gmail.com>
Date: Sun, 1 Sep 2019 22:52:08 +0200
Subject: [PATCH 0252/4969] RabbitMQ: fix typo in binding command (#1792)

---
 .../java/org/testcontainers/containers/RabbitMQContainer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 4faaf3a5dea..8f0ef0ebcc1 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -215,8 +215,8 @@ public RabbitMQContainer withBinding(String source, String destination, Map<Stri
         values.add(asList("rabbitmqadmin", "declare", "binding",
                 "source=" + source,
                 "destination=" + destination,
-                "routing-key=" + routingKey,
-                "destination-type=" + destinationType,
+                "routing_key=" + routingKey,
+                "destination_type=" + destinationType,
                 "arguments=" + toJson(arguments)));
         return self();
     }

From 14e8a0ed80920bab5b8a6659739978aca43a7cba Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2019 21:59:59 +0100
Subject: [PATCH 0253/4969] Bump commons-compress from 1.18 to 1.19 in /core
 (#1804)

Bumps commons-compress from 1.18 to 1.19.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index dee1acb4d69..51f61fcb976 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -60,7 +60,7 @@ dependencies {
     compile 'org.slf4j:slf4j-api:1.7.26'
     compile 'org.jetbrains:annotations:17.0.0'
     compile 'javax.annotation:javax.annotation-api:1.3.2'
-    compile 'org.apache.commons:commons-compress:1.18'
+    compile 'org.apache.commons:commons-compress:1.19'
     // Added for JDK9 compatibility since it's missing this package
     compile 'javax.xml.bind:jaxb-api:2.3.1'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {

From 3509316dda8b1cefbc5201ea3248dab611bc2f08 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 06:06:14 +0000
Subject: [PATCH 0254/4969] Bump rest-assured from 4.0.0 to 4.1.0 in
 /modules/vault (#1820)

---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 3dd346ab559..a05c77f8158 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Vault"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'io.rest-assured:rest-assured:4.0.0'
+    testCompile 'io.rest-assured:rest-assured:4.1.0'
 }

From 2c6315270bd388138181d529719230e2261ea34e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 08:35:09 +0100
Subject: [PATCH 0255/4969] Bump slf4j-api from 1.7.26 to 1.7.28 in /core
 (#1805)

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.26 to 1.7.28.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.26...v_1.7.28)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 51f61fcb976..6b6ad2a6c28 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -57,7 +57,7 @@ project.tasks.check.dependsOn(jarFileTest)
 
 dependencies {
     compile 'junit:junit:4.12'
-    compile 'org.slf4j:slf4j-api:1.7.26'
+    compile 'org.slf4j:slf4j-api:1.7.28'
     compile 'org.jetbrains:annotations:17.0.0'
     compile 'javax.annotation:javax.annotation-api:1.3.2'
     compile 'org.apache.commons:commons-compress:1.19'

From 7122b33750ebce829959622a58b5f760b6e8cfb2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 08:36:52 +0000
Subject: [PATCH 0256/4969] Bump aws-java-sdk-sqs from 1.11.622 to 1.11.623 in
 /modules/localstack (#1819)

---
 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 371891ce27a..15eac5ebb44 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.622'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.623'
 }

From 88a4eaf6f0353af172b2b952fc8d02c2bbea026e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2019 11:27:06 +0100
Subject: [PATCH 0257/4969] Bump amqp-client from 5.7.2 to 5.7.3 in /core
 (#1818)

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.7.2 to 5.7.3.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.7.2...v5.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 6b6ad2a6c28..f08e7763b18 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -107,7 +107,7 @@ dependencies {
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.1.0'
-    testCompile 'com.rabbitmq:amqp-client:5.7.2'
+    testCompile 'com.rabbitmq:amqp-client:5.7.3'
     testCompile 'org.mongodb:mongo-java-driver:3.11.0'
     testCompile ('org.mockito:mockito-core:3.0.0') {
         exclude(module: 'hamcrest-core')

From c9b66eb3e610bfb76024000ae062bec889cdab34 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 3 Sep 2019 06:56:39 +0200
Subject: [PATCH 0258/4969] Use "copy" strategy in
 `withClasspathResourceMapping` where appropriate (#1814)

---
 .../containers/GenericContainer.java          |  6 ++-
 .../junit/CopyFileToContainerTest.java        | 49 ++++++++++++++++---
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 14ce129c9a5..baf79474aaa 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -967,7 +967,11 @@ public SELF withClasspathResourceMapping(final String resourcePath, final String
     public SELF withClasspathResourceMapping(final String resourcePath, final String containerPath, final BindMode mode, final SelinuxContext selinuxContext) {
         final MountableFile mountableFile = MountableFile.forClasspathResource(resourcePath);
 
-        this.addFileSystemBind(mountableFile.getResolvedPath(), containerPath, mode, selinuxContext);
+        if (mode == BindMode.READ_ONLY && selinuxContext == SelinuxContext.NONE) {
+            withCopyFileToContainer(mountableFile, containerPath);
+        } else {
+            addFileSystemBind(mountableFile.getResolvedPath(), containerPath, mode, selinuxContext);
+        }
 
         return self();
     }
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index 5164ea6c6e1..0641bc7d50d 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -1,10 +1,16 @@
 package org.testcontainers.junit;
 
-import org.junit.Assert;
 import org.junit.Test;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.utility.MountableFile;
+
 import java.io.IOException;
+import java.util.Map;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class CopyFileToContainerTest {
     private static String containerPath = "/tmp/mappable-resource/";
@@ -12,14 +18,45 @@ public class CopyFileToContainerTest {
 
     @Test
     public void checkFileCopied() throws IOException, InterruptedException {
-        try(
-            GenericContainer container = new GenericContainer("alpine:latest")
-                .withCommand("sleep","3000")
+        try (
+            GenericContainer container = new GenericContainer()
+                .withCommand("sleep", "3000")
                 .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
         ) {
             container.start();
-            String filesList = container.execInContainer("ls","/tmp/mappable-resource").getStdout();
-            Assert.assertTrue(filesList.contains(fileName));
+            String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
+            assertTrue("file list contains the file", filesList.contains(fileName));
+        }
+    }
+
+    @Test
+    public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
+        try (
+            GenericContainer container = new GenericContainer()
+                .withCommand("sleep", "3000")
+                .withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
+        ) {
+            container.start();
+            String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
+            assertTrue("file list contains the file", filesList.contains(fileName));
         }
     }
+
+    @Test
+    public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
+        String resource = "/test_copy_to_container.txt";
+        GenericContainer<?> container = new GenericContainer<>()
+            .withClasspathResourceMapping(resource, "/readOnly", BindMode.READ_ONLY)
+            .withClasspathResourceMapping(resource, "/readOnlyNoSelinux", BindMode.READ_ONLY)
+
+            .withClasspathResourceMapping(resource, "/readOnlyShared", BindMode.READ_ONLY, SelinuxContext.SHARED)
+            .withClasspathResourceMapping(resource, "/readWrite", BindMode.READ_WRITE);
+
+        Map<MountableFile, String> copyMap = container.getCopyToFileContainerPathMap();
+        assertTrue("uses copy for read-only", copyMap.containsValue("/readOnly"));
+        assertTrue("uses copy for read-only and no Selinux", copyMap.containsValue("/readOnlyNoSelinux"));
+
+        assertFalse("uses mount for read-only with Selinux", copyMap.containsValue("/readOnlyShared"));
+        assertFalse("uses mount for read-write", copyMap.containsValue("/readWrite"));
+    }
 }

From 0ce63054628fa1ed1a1a3fa5f58d3931f6e23df3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2019 05:55:49 +0000
Subject: [PATCH 0259/4969] Bump neo4j from 3.5.8 to 3.5.9 in /modules/neo4j
 (#1823)

---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index c7227a2d9ac..4889196ccef 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -25,7 +25,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.8"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.9"
 
     compile project(":testcontainers")
 

From 33beb8d4bd97dd1f106d77124ddd2a1eb95ecf97 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2019 05:55:25 +0000
Subject: [PATCH 0260/4969] Bump aws-java-sdk-sqs from 1.11.623 to 1.11.624 in
 /modules/localstack (#1826)

---
 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 15eac5ebb44..ce2982204b7 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.623'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.624'
 }

From 0d8b42b47fcfd5f7cf41c9c7324dca32f73f1d8d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2019 06:44:24 +0000
Subject: [PATCH 0261/4969] Bump pulsar-client from 2.4.0 to 2.4.1 in
 /modules/pulsar (#1825)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 34cde96a33e..05d9a711420 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.4.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.4.1'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
 }

From acd8bdc782dfd2e8456427bb0677e94d0d5a0c8b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2019 05:56:26 +0000
Subject: [PATCH 0262/4969] Bump aws-java-sdk-sqs from 1.11.624 to 1.11.625 in
 /modules/localstack (#1829)

---
 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 ce2982204b7..9bc7d4fe545 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.624'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.625'
 }

From 1e6ac9b9510f2227c6e54694ae048e47de469d12 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Sep 2019 08:47:16 +0100
Subject: [PATCH 0263/4969] Fix error in Javadocs and run javadoc generation
 during 'check' (#1813)

* Fix Javadoc error
* Ensure that Javadoc generation is tested for all `check` builds
* Generate Javadocs from delomboked sources
---
 build.gradle                                              | 8 ++++++++
 .../org/testcontainers/containers/RabbitMQContainer.java  | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b3e96b265b5..c1c031f2757 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,6 +67,14 @@ subprojects {
         }
     }
 
+    // Ensure that Javadoc generation is always tested
+    check.dependsOn(javadoc)
+
+    javadoc {
+        dependsOn delombok
+        source = delombok.outputs
+    }
+
     shadowJar {
         configurations = []
         classifier = null
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 8f0ef0ebcc1..ea25bf629e6 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -359,9 +359,9 @@ public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
     /**
      * Overwrites the default RabbitMQ configuration file with the supplied one.
      *
-     * This function doesn't work with RabbitMQ < 3.7.
+     * This function doesn't work with RabbitMQ &lt; 3.7.
      *
-     * This function and the Sysctl format is recommended for RabbitMQ >= 3.7
+     * This function and the Sysctl format is recommended for RabbitMQ &gt;= 3.7
      *
      * @param rabbitMQConf The rabbitmq.config file to use (in sysctl format, don't forget empty line in the end of file)
      * @return This container.

From 1161b1b843928706dcb4223d0ff87497249306c7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2019 05:58:27 +0000
Subject: [PATCH 0264/4969] Bump aws-java-sdk-sqs from 1.11.625 to 1.11.626 in
 /modules/localstack (#1830)

---
 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 9bc7d4fe545..4bc50a6a1f1 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.625'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.626'
 }

From 386c545b01751447890139aaf6475e9fb73e0529 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2019 07:00:32 +0000
Subject: [PATCH 0265/4969] Bump org.springframework.boot in /examples (#1831)

---
 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 22198984e33..cf3b6567982 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.1.7.RELEASE'
+    id 'org.springframework.boot' version '2.1.8.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 7af6b9d26da..46e587bc39a 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.1.7.RELEASE'
+    id 'org.springframework.boot' version '2.1.8.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 4fbef4b66b2af7658792402db4523c4eba398fd9 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 7 Sep 2019 19:36:24 +0100
Subject: [PATCH 0266/4969] Fix javadoc error (#1832)

* Update Lombok for fix to [JDK12 delombok issue](https://github.com/rzwitserloot/lombok/issues/2082)
Also upgrade Gradle Lombok plugin
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index c1c031f2757..ecdf48cd3f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.gradle.build-scan' version '1.16'
-    id 'io.franzbecker.gradle-lombok' version '1.14'
+    id 'io.franzbecker.gradle-lombok' version '3.1.0'
     id 'nebula.provided-base' version '3.0.3'
     id 'com.github.johnrengelman.shadow' version '2.0.2'
     id "com.jfrog.bintray" version "1.8.4" apply false
@@ -21,7 +21,7 @@ subprojects {
     compileTestJava.options.encoding = 'UTF-8'
 
     lombok {
-        version = '1.18.6'
+        version = '1.18.8'
     }
 
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {

From b1cb06d7524ce44c56c7050f06e4aafb222c17fd Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 7 Sep 2019 19:36:50 +0100
Subject: [PATCH 0267/4969] =?UTF-8?q?Add=20test=20to=20demonstrate=20fix?=
 =?UTF-8?q?=20for=20#1452=20(loss=20of=20whitespace=20in=20sp=E2=80=A6=20(?=
 =?UTF-8?q?#1702)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(probably fixed by #1627)
---
 .../testcontainers/ext/ScriptSplittingTest.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index 0836592b91e..202a3b995db 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -281,6 +281,21 @@ public void testUnclosedBlockComment() {
         }
     }
 
+    @Test
+    public void testIssue1452Case() {
+        String script = "create table test (text VARCHAR(255));\n" +
+            "\n" +
+            "/* some comment */\n" +
+            "insert into `test` (`text`) values ('a     b');";
+
+        List<String> expected = asList(
+            "create table test (text VARCHAR(255))",
+            "insert into `test` (`text`) values ('a     b')"
+        );
+
+        splitAndCompare(script, expected);
+    }
+
     private void splitAndCompare(String script, List<String> expected) {
         final List<String> statements = doSplit(script);
         Assertions.assertThat(statements).isEqualTo(expected);

From b35f2ca12ce1a30c4dd932b9f5f6299ac8917c50 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 8 Sep 2019 09:00:20 +0100
Subject: [PATCH 0268/4969] Update .travis.yml to ensure that tag builds are
 performed

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f07d50123e2..d7d5f94270d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-if: branch = master
+if: branch = master OR tag is present
 
 language: java
 jdk:

From 271cb1a37356f322bd4f34b73e91d29d02e71283 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 8 Sep 2019 13:29:50 +0100
Subject: [PATCH 0269/4969] Update latest version in docs

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index f0d953ecd8a..39d2c8d8164 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,4 +82,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.12.0
+    latest_version: 1.12.1

From 5a2257454d46adc9404886f48fb4bac45c708457 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 8 Sep 2019 17:33:55 +0200
Subject: [PATCH 0270/4969] Bump testng from 6.14.3 to 7.0.0 in /examples
 (#1756)

Bumps testng from 6.14.3 to 7.0.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 777ca2d9511..e68ccfea24f 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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:6.14.3'
+    testImplementation 'org.testng:testng:7.0.0'
 }
 
 test {

From 097d1572851334dea84c54c053d6065c7f8f1db4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2019 06:07:07 +0000
Subject: [PATCH 0271/4969] Bump rest-assured from 4.1.0 to 4.1.1 in
 /modules/vault (#1839)

---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index a05c77f8158..41807d2573b 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Vault"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'io.rest-assured:rest-assured:4.1.0'
+    testCompile 'io.rest-assured:rest-assured:4.1.1'
 }

From fc5f971711ef74f14434c0115664d26bd0299c1c Mon Sep 17 00:00:00 2001
From: Frederik Hahne <atomfrede@users.noreply.github.com>
Date: Mon, 9 Sep 2019 08:36:02 +0200
Subject: [PATCH 0272/4969] add jhipster as user (#1838)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 657c2446a55..f62cba3af45 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -74,6 +74,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Zalando SE](https://corporate.zalando.com/en) - Testing core business services
 * [Europace AG](https://tech.europace.de/) - Integration testing for databases and micro services
 * [Micronaut Data](https://github.com/micronaut-projects/micronaut-data/) - Testing of Micronaut Data JDBC, a database access toolkit
+* [JHipster](https://www.jhipster.tech/) - Couchbase and Cassandra integration testing
 
 ## License
 

From 21e397be4e9e3a7c36863c352785e86a6ea0e2e2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2019 05:59:32 +0000
Subject: [PATCH 0273/4969] Bump httpclient from 4.5.9 to 4.5.10 in
 /modules/spock (#1850)

---
 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 f9353314c1b..69058b53a92 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
     testRuntime 'org.postgresql:postgresql:42.2.6'
     testRuntime 'mysql:mysql-connector-java:8.0.17'

From 896e30634df1dc1b27ec8e80c8612f2f87c3b96c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2019 06:41:00 +0000
Subject: [PATCH 0274/4969] Bump junit-jupiter-api from 5.5.1 to 5.5.2 in
 /modules/junit-jupiter (#1842)

---
 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 2a0937a85d7..3aa2abd08ba 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.5.1'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From d1a41d44a9a90438775c39d4d937ba86467a3897 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2019 07:32:17 +0000
Subject: [PATCH 0275/4969] Bump httpclient from 4.5.9 to 4.5.10 in
 /modules/junit-jupiter (#1851)

---
 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 3aa2abd08ba..6997c270052 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'redis.clients:jedis:3.1.0'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
     testCompile ('org.mockito:mockito-core:3.0.0') {
         exclude(module: 'hamcrest-core')
     }

From 09d70c4b9d942c1c71b8bc01d406245966ed8649 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2019 08:11:30 +0000
Subject: [PATCH 0276/4969] Bump aws-java-sdk-sqs from 1.11.626 to 1.11.628 in
 /modules/localstack (#1852)

---
 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 4bc50a6a1f1..3e065497bf2 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.626'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.628'
 }

From aa4a99f795fb21cb9b790dc088be95fdcca3ae96 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2019 08:50:54 +0000
Subject: [PATCH 0277/4969] Bump junit-jupiter-engine from 5.5.1 to 5.5.2 in
 /modules/junit-jupiter (#1840)

---
 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 6997c270052..74cb75cec0c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.6'
     testRuntime 'mysql:mysql-connector-java:8.0.17'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 }
 
 test {

From c370fe19546671bb349222b95213315353d6ee6c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2019 05:57:00 +0000
Subject: [PATCH 0278/4969] Bump postgresql from 42.2.6 to 42.2.7 in
 /modules/junit-jupiter (#1856)

---
 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 74cb75cec0c..83559949614 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntime 'org.postgresql:postgresql:42.2.6'
+    testRuntime 'org.postgresql:postgresql:42.2.7'
     testRuntime 'mysql:mysql-connector-java:8.0.17'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 }

From 33ace195c63bc52baec050f1cf3a31de1f215d10 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2019 06:34:54 +0000
Subject: [PATCH 0279/4969] Bump aws-java-sdk-sqs from 1.11.628 to 1.11.629 in
 /modules/localstack (#1858)

---
 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 3e065497bf2..0b4faf4aabe 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.628'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.629'
 }

From 185498dfa209b05ba02c01227dfd66d5970d8658 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2019 07:40:29 +0000
Subject: [PATCH 0280/4969] Bump postgresql from 42.2.6 to 42.2.7 in
 /modules/spock (#1860)

---
 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 69058b53a92..a51b7edaf32 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
-    testRuntime 'org.postgresql:postgresql:42.2.6'
+    testRuntime 'org.postgresql:postgresql:42.2.7'
     testRuntime 'mysql:mysql-connector-java:8.0.17'
 }

From 4bb2cc231f23b62a67471e5c8408a30aa89325fd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2019 08:56:07 +0000
Subject: [PATCH 0281/4969] Bump postgresql from 42.2.6 to 42.2.7 in /examples
 (#1862)

---
 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 6bf099030ec..bc531b1b2c5 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.28'
     implementation 'com.squareup.okhttp3:okhttp:3.14.2'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.6'
+    testImplementation 'org.postgresql:postgresql:42.2.7'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From 5705b0db5a61ad4150a60880036827830f8bda8f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2019 10:03:53 +0000
Subject: [PATCH 0282/4969] Bump okhttp from 3.14.2 to 3.14.3 in /examples
 (#1861)

---
 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 bc531b1b2c5..b0247f837cf 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.28'
-    implementation 'com.squareup.okhttp3:okhttp:3.14.2'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.3'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.7'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From ea54415727bf819f01fff3ce539b0d21771f4be9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2019 10:55:43 +0000
Subject: [PATCH 0283/4969] Bump postgresql from 42.2.6 to 42.2.7 in
 /modules/postgresql (#1857)

---
 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 1a5980dee55..df75d333ca1 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: PostgreSQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.postgresql:postgresql:42.2.6'
+    testCompile 'org.postgresql:postgresql:42.2.7'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
 }

From ee51a486f643feba25932f7158376de46af97f24 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2019 05:57:35 +0000
Subject: [PATCH 0284/4969] Bump aws-java-sdk-sqs from 1.11.629 to 1.11.630 in
 /modules/localstack (#1866)

---
 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 0b4faf4aabe..d19da1299da 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.629'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.630'
 }

From 520f86cf767b5f4ebd3aac7e510aa61a85aa30d7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2019 07:01:45 +0000
Subject: [PATCH 0285/4969] Bump lombok from 1.18.8 to 1.18.10 in /examples
 (#1867)

---
 examples/disque-job-queue/build.gradle | 2 +-
 examples/spring-boot/build.gradle      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 78a38d2ba08..bb4aa6edaaa 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.8'
+    compileOnly 'org.projectlombok:lombok:1.18.10'
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 46e587bc39a..487c60e51dd 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.8'
+    compileOnly 'org.projectlombok:lombok:1.18.10'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-web'

From 5ecf798b5dbf8d95f48be1b5633f53f8db18676f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2019 05:59:07 +0000
Subject: [PATCH 0286/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#1870)

---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 6ae9ab00dab..e8431190e8b 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.3.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.3.2"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 34ba4f763cfb4f6a70fcd4de6ed191e9d9fac07d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2019 06:37:45 +0000
Subject: [PATCH 0287/4969] Bump aws-java-sdk-sqs from 1.11.630 to 1.11.631 in
 /modules/localstack (#1869)

---
 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 d19da1299da..f8ff744ed47 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.630'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.631'
 }

From e5ab9ecfa047efdfd1db5805ea4e488956c1154c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2019 05:59:14 +0000
Subject: [PATCH 0288/4969] Bump postgresql from 42.2.7 to 42.2.8 in
 /modules/junit-jupiter (#1877)

---
 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 83559949614..41e011c07b9 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntime 'org.postgresql:postgresql:42.2.7'
+    testRuntime 'org.postgresql:postgresql:42.2.8'
     testRuntime 'mysql:mysql-connector-java:8.0.17'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 }

From 901724719be11d52e3777a5e21eddf5d7d993429 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2019 06:36:59 +0000
Subject: [PATCH 0289/4969] Bump mariadb-java-client from 2.4.3 to 2.4.4 in
 /modules/mariadb (#1875)

---
 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 eb778c6c827..692a1636e15 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.3'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.24'

From 2b3a49f7c38b729ea594551d20455d8d047f58a5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2019 07:16:44 +0000
Subject: [PATCH 0290/4969] Bump postgresql from 42.2.7 to 42.2.8 in /examples
 (#1879)

---
 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 b0247f837cf..3a721e4702b 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.28'
     implementation 'com.squareup.okhttp3:okhttp:3.14.3'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.7'
+    testImplementation 'org.postgresql:postgresql:42.2.8'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From d62a9a10377d9a7a81525657b774e7208bd40b5a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2019 08:21:06 +0000
Subject: [PATCH 0291/4969] Bump postgresql from 42.2.7 to 42.2.8 in
 /modules/spock (#1878)

---
 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 a51b7edaf32..df61a9fefa2 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.3.1'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
-    testRuntime 'org.postgresql:postgresql:42.2.7'
+    testRuntime 'org.postgresql:postgresql:42.2.8'
     testRuntime 'mysql:mysql-connector-java:8.0.17'
 }

From 3ad6adefefe025e267ec5ec15318f87ebe5d5bad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2019 09:23:29 +0000
Subject: [PATCH 0292/4969] Bump postgresql from 42.2.7 to 42.2.8 in
 /modules/postgresql (#1876)

---
 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 df75d333ca1..c070ce9ba13 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: PostgreSQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.postgresql:postgresql:42.2.7'
+    testCompile 'org.postgresql:postgresql:42.2.8'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
 }

From 158e42f3d4d493fd7ab16c268e88fc6002e12c28 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2019 06:00:45 +0000
Subject: [PATCH 0293/4969] Bump HikariCP from 3.3.1 to 3.4.0 in /modules/spock
 (#1882)

---
 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 df61a9fefa2..285618ab116 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.3.1'
+    testCompile 'com.zaxxer:HikariCP:3.4.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
     testRuntime 'org.postgresql:postgresql:42.2.8'

From 7bd756d2a279eabecf55e54ca0454a9b975ff184 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2019 07:07:43 +0000
Subject: [PATCH 0294/4969] Bump aws-java-sdk-sqs from 1.11.631 to 1.11.632 in
 /modules/localstack (#1884)

---
 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 f8ff744ed47..b96f4ad0048 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.631'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.632'
 }

From 8ce740d2b7b73e56e5855c8ff6208c9c10687fe1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2019 08:12:14 +0000
Subject: [PATCH 0295/4969] Bump HikariCP from 3.3.1 to 3.4.0 in
 /modules/junit-jupiter (#1883)

---
 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 41e011c07b9..291bc27152c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.3.1'
+    testCompile 'com.zaxxer:HikariCP:3.4.0'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
     testCompile ('org.mockito:mockito-core:3.0.0') {

From b84b1b04d27ffd379452740d655381040622c88c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2019 05:57:56 +0000
Subject: [PATCH 0296/4969] Bump aws-java-sdk-sqs from 1.11.632 to 1.11.633 in
 /modules/localstack (#1885)

---
 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 b96f4ad0048..c5f09772048 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.632'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.633'
 }

From 0fcaca7cd3ebc8b3e168617257c26b4e1c842cb7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2019 05:58:22 +0000
Subject: [PATCH 0297/4969] Bump HikariCP from 3.4.0 to 3.4.1 in
 /modules/junit-jupiter (#1889)

---
 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 291bc27152c..75367d57720 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.0'
+    testCompile 'com.zaxxer:HikariCP:3.4.1'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
     testCompile ('org.mockito:mockito-core:3.0.0') {

From 78e78fcd08b873e2ffbd0b9fa46bba364335c298 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 19 Sep 2019 21:46:54 +0100
Subject: [PATCH 0298/4969] Create _headers for docs, to allow cross-origin
 search

---
 docs/_headers | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 docs/_headers

diff --git a/docs/_headers b/docs/_headers
new file mode 100644
index 00000000000..e59f34a29e2
--- /dev/null
+++ b/docs/_headers
@@ -0,0 +1,2 @@
+/search/search_index.json
+  Access-Control-Allow-Origin: *

From 826b9583cf26fc1ef06fc6003cda554b463b1374 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2019 05:57:39 +0000
Subject: [PATCH 0299/4969] Bump tomcat-jdbc from 9.0.24 to 9.0.26 in
 /modules/mariadb (#1895)

---
 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 692a1636e15..9393f6c65c7 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.24'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 7c07bf989f7f2b3d18c0632b1be63f152807d42a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2019 06:39:51 +0000
Subject: [PATCH 0300/4969] Bump HikariCP from 3.4.0 to 3.4.1 in /modules/spock
 (#1888)

---
 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 285618ab116..552fd3883cd 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.0'
+    testCompile 'com.zaxxer:HikariCP:3.4.1'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
     testRuntime 'org.postgresql:postgresql:42.2.8'

From 1b9ab1a0975f8b88360e6177f913dccfd6e66389 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2019 07:45:10 +0000
Subject: [PATCH 0301/4969] Bump tomcat-jdbc from 9.0.24 to 9.0.26 in
 /modules/mysql (#1894)

---
 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 d5a366825b9..dbb6747e80f 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.17'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.24'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 2e0cdb0381c1d348c3edae9ca120a2ac2563806a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2019 08:47:31 +0000
Subject: [PATCH 0302/4969] Bump aws-java-sdk-sqs from 1.11.633 to 1.11.635 in
 /modules/localstack (#1896)

---
 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 c5f09772048..662e754976e 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.633'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.635'
 }

From 8e871d03c0082474b3a7e304362e97aca4de0740 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2019 06:12:17 +0000
Subject: [PATCH 0303/4969] Bump aws-java-sdk-sqs from 1.11.635 to 1.11.636 in
 /modules/localstack (#1901)

---
 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 662e754976e..eacbc7bb5ae 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.479'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.635'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
 }

From b063082db75918b81158b26a70b34f09c9591182 Mon Sep 17 00:00:00 2001
From: Kai Winter <kaiwinter@gmx.de>
Date: Mon, 23 Sep 2019 22:18:23 +0200
Subject: [PATCH 0304/4969] Obtain official Oracle JDBC driver (#73) (#1899)

Also removed two unnecessary dependencies.
---
 modules/oracle-xe/build.gradle | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 6b4ab1af763..de1160fa84d 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -1,17 +1,9 @@
 description = "Testcontainers :: JDBC :: Oracle XE"
 
-repositories {
-    maven {
-        url "https://maven.atlassian.com/3rdparty/"
-    }
-}
-
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'com.oracle:ojdbc6:12.1.0.1-atlassian-hosted'
+    testCompile 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.8'
     testCompile 'commons-dbutils:commons-dbutils:1.6'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:8.5.4'
-    testCompile 'org.vibur:vibur-dbcp:9.0'
 }

From 41a009dde90941c587920f3fec685660e948649b Mon Sep 17 00:00:00 2001
From: aosagie <osagie@gmail.com>
Date: Mon, 23 Sep 2019 16:24:19 -0400
Subject: [PATCH 0305/4969] Make LocalStack image configurable (#1873)

---
 .../testcontainers/utility/TestcontainersConfiguration.java   | 4 ++++
 docs/features/configuration.md                                | 3 +++
 .../containers/localstack/LocalStackContainer.java            | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index b7ef772fcf5..21f9bdfb333 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -81,6 +81,10 @@ public String getPulsarImage() {
         return (String) properties.getOrDefault("pulsar.container.image", "apachepulsar/pulsar");
     }
 
+    public String getLocalStackImage() {
+        return (String) properties.getOrDefault("localstack.container.image", "localstack/localstack");
+    }
+
     public boolean isDisableChecks() {
         return Boolean.parseBoolean((String) environmentProperties.getOrDefault("checks.disable", "false"));
     }
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 2ef7e4997a3..61500cb9cb5 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -42,6 +42,9 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **kafka.container.image = confluentinc/cp-kafka**  
 > Used by KafkaContainer 
 
+> **localstack.container.image = localstack/localstack**  
+> Used by LocalStack
+
 ## Customizing Ryuk resource reaper
 
 > **ryuk.container.image = quay.io/testcontainers/ryuk:0.2.3**
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 1bf0e18627d..d16babb51e8 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -10,6 +10,7 @@
 import org.rnorth.ducttape.Preconditions;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -37,7 +38,7 @@ public LocalStackContainer() {
     }
 
     public LocalStackContainer(String version) {
-        super("localstack/localstack:" + version);
+        super(TestcontainersConfiguration.getInstance().getLocalStackImage() + ":" + version);
 
         withFileSystemBind("//var/run/docker.sock", "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));

From b6a5248365acb240cd6f6c7d3c1ae38c6c5b3ed7 Mon Sep 17 00:00:00 2001
From: Frederik Hahne <atomfrede@users.noreply.github.com>
Date: Mon, 23 Sep 2019 22:26:43 +0200
Subject: [PATCH 0306/4969] add wescale as happy user (#1887)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index f62cba3af45..ba99eb6e555 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -75,6 +75,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Europace AG](https://tech.europace.de/) - Integration testing for databases and micro services
 * [Micronaut Data](https://github.com/micronaut-projects/micronaut-data/) - Testing of Micronaut Data JDBC, a database access toolkit
 * [JHipster](https://www.jhipster.tech/) - Couchbase and Cassandra integration testing
+* [wescale](https://www.wescale.com) - Integration testing against HTTP service mocks and various data stores
 
 ## License
 

From ec0ab6f1e0c2a826ee21bb06a88508081484892d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2019 06:04:35 +0000
Subject: [PATCH 0307/4969] Bump commons-dbutils from 1.6 to 1.7 in
 /modules/oracle-xe (#1905)

---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index de1160fa84d..1ab61e997af 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testCompile 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.8'
-    testCompile 'commons-dbutils:commons-dbutils:1.6'
+    testCompile 'commons-dbutils:commons-dbutils:1.7'
 }

From d3ba8428d7494a522b49792bc04d528fb70fea4f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 26 Sep 2019 08:06:31 +0100
Subject: [PATCH 0308/4969] =?UTF-8?q?Reduce=20logs=20in=20EnvironmentAndSy?=
 =?UTF-8?q?stemPropertyClientProviderStrate=E2=80=A6=20(#1913)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #1912
---
 ...dSystemPropertyClientProviderStrategy.java | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
index 195a07a4024..4b02eded72b 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
@@ -1,7 +1,6 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.SystemUtils;
 
@@ -50,21 +49,7 @@ public void test() throws InvalidConfigurationException {
 
     @Override
     public String getDescription() {
-        return "Environment variables, system properties and defaults. Resolved: \n" + stringRepresentation(config);
-    }
-
-    private String stringRepresentation(DockerClientConfig config) {
-
-        if (config == null) {
-            return "";
-        }
-
-        return  "    dockerHost=" + config.getDockerHost() + "\n" +
-                "    apiVersion='" + config.getApiVersion() + "'\n" +
-                "    registryUrl='" + config.getRegistryUrl() + "'\n" +
-                "    registryUsername='" + config.getRegistryUsername() + "'\n" +
-                "    registryPassword='" + config.getRegistryPassword() + "'\n" +
-                "    registryEmail='" + config.getRegistryEmail() + "'\n" +
-                "    dockerConfig='" + config.toString() + "'\n";
+        return "Environment variables, system properties and defaults. Resolved dockerHost=" +
+            (config != null ? config.getDockerHost() : "");
     }
 }

From e717e8375c13fe416fa5860fe06a0caef48d8590 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2019 05:58:17 +0000
Subject: [PATCH 0309/4969] Bump lettuce-core from 5.1.8.RELEASE to
 5.2.0.RELEASE in /examples (#1919)

---
 examples/spock/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spock/build.gradle b/examples/spock/build.gradle
index 147e1eaf079..486107f9b21 100644
--- a/examples/spock/build.gradle
+++ b/examples/spock/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.1.8.RELEASE"
+    compile "io.lettuce:lettuce-core:5.2.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
     testImplementation 'org.testcontainers:spock'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From a90b120bdd8e4133e10aea862e30f02a22dfca40 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2019 06:25:16 +0000
Subject: [PATCH 0310/4969] Bump okhttp from 3.14.3 to 3.14.4 in /examples
 (#1925)

---
 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 3a721e4702b..1680aa3b963 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.28'
-    implementation 'com.squareup.okhttp3:okhttp:3.14.3'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.4'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.8'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From 9ab6909eda47ad65f6155737b1b869d88ad15850 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 1 Oct 2019 21:57:58 +0200
Subject: [PATCH 0311/4969] =?UTF-8?q?Remove=20`hostname`=20and=20`port`=20?=
 =?UTF-8?q?from=20JDBC=20examples=20to=20avoid=20confus=E2=80=A6=20(#1786)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove `hostname` and `port` from JDBC examples to avoid confusion

* restore original URL

* Explain the host-less URIs
---
 docs/modules/databases/index.md | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index 22292875307..b0e5335b7e8 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -47,29 +47,33 @@ _N.B:_
 * _TC needs to be on your application's classpath at runtime for this to work_
 * _For Spring Boot you need to specify the driver manually `spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver`_
 
-**Original URL**: `jdbc:mysql:5.7.22://somehostname:someport/databasename`
+**Original URL**: `jdbc:mysql:5.7.22://localhost:3306/databasename`
 
-Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database name will be ignored; you can leave these as-is or set them to any value.
+Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database name will be ignored; you can leave these as-is or set them to any value. 
+
+!!! note
+    We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
+    From Testcontainers' perspective, `jdbc:mysql:5.7.22://localhost:3306/databasename` and `jdbc:mysql:5.7.22:///databasename` is the same URI.
 
 ### JDBC URL examples
 
 #### Using Testcontainers with a fixed version
 
-`jdbc:tc:mysql:5.6.23://somehostname:someport/databasename`
+`jdbc:tc:mysql:5.6.23:///databasename`
 
 #### Using PostgreSQL
 
-`jdbc:tc:postgresql:9.6.8://hostname/databasename`
+`jdbc:tc:postgresql:9.6.8:///databasename`
 
 ### Using PostGIS
 
-`jdbc:tc:postgis:9.6://hostname/databasename`
+`jdbc:tc:postgis:9.6:///databasename`
 
 ## Using a classpath init script
 
 Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
 
-`jdbc:tc:mysql:5.7.22://hostname/databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
+`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
 
 This is useful if you have a fixed script for setting up database schema, etc.
 
@@ -77,13 +81,13 @@ This is useful if you have a fixed script for setting up database schema, etc.
 
 If the init script path is prefixed `file:`, it will be loaded from a file (relative to the working directory, which will usually be the project root).
 
-`jdbc:tc:mysql:5.7.22://hostname/databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
+`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
 
 #### Using an init function
 
 Instead of running a fixed script for DB setup, it may be useful to call a Java function that you define. This is intended to allow you to trigger database schema migration tools. To do this, add TC_INITFUNCTION to the URL as follows, passing a full path to the class name and method:
 
- `jdbc:tc:mysql:5.7.22://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
+ `jdbc:tc:mysql:5.7.22:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
 
 The init function must be a public static method which takes a `java.sql.Connection` as its only parameter, e.g.
 ```java
@@ -98,7 +102,7 @@ public class JDBCDriverTest {
 
 By default database container is being stopped as soon as last connection is closed. There are cases when you might need to start container and keep it running till you stop it explicitly or JVM is shutdown. To do this, add `TC_DAEMON` parameter to the URL as follows:
 
- `jdbc:tc:mysql:5.7.22://hostname/databasename?TC_DAEMON=true`
+ `jdbc:tc:mysql:5.7.22:///databasename?TC_DAEMON=true`
 
 With this parameter database container will keep running even when there're no open connections.
 
@@ -109,7 +113,7 @@ Container can have `tmpfs` mounts for storing data in host memory. This is usefu
 
 To pass this option to the container, add `TC_TMPFS` paramater to the URL as follows:
 
-  `jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw`
+  `jdbc:tc:postgresql:9.6.8:///databasename?TC_TMPFS=/testtmpfs:rw`
 
 If you need more than one option, seperate them by comma (e.g. `TC_TMPFS=key:value,key1:value1&other_parameters=foo`).
 

From 9f8a73e18bcf3e648a6c1af4b126051cdd60b837 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 1 Oct 2019 20:58:30 +0100
Subject: [PATCH 0312/4969] Update to latest version in docs

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 39d2c8d8164..9d857ad21a9 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,4 +82,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.12.1
+    latest_version: 1.12.2

From dbb8472a334bdd76009db95632989a18c78794c0 Mon Sep 17 00:00:00 2001
From: Mitchell Just <mitch.just@gmail.com>
Date: Wed, 2 Oct 2019 06:25:37 +1000
Subject: [PATCH 0313/4969] Add support for DockerClient event streaming
 (#1886)

Probably fixes #1473


Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../okhttp/OkHttpInvocationBuilder.java       | 24 ++++++-
 .../transport/okhttp/UnixSocketFactory.java   |  8 +++
 .../dockerclient/EventStreamTest.java         | 64 +++++++++++++++++++
 3 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java

diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
index a03914d5f07..c7f679eb22b 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
@@ -42,6 +42,8 @@
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 class OkHttpInvocationBuilder implements InvocationBuilder {
 
+    static final ThreadLocal<Boolean> CLOSING = ThreadLocal.withInitial(() -> false);
+
     ObjectMapper objectMapper;
 
     OkHttpClient okHttpClient;
@@ -101,8 +103,15 @@ public <T> T get(TypeReference<T> typeReference) {
 
     @Override
     public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        // FIXME
-        throw new IllegalStateException("doesn't seem to be used in docker-java");
+        Request request = requestBuilder
+            .get()
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new JsonSink<>(objectMapper, typeReference, resultCallback)
+        );
     }
 
     @Override
@@ -292,7 +301,16 @@ protected <T> void executeAndStream(OkHttpClient okHttpClient, Request request,
                 Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build());
                 BufferedSource source = response.body().source();
             ) {
-                callback.onStart(response);
+                callback.onStart(() -> {
+                    boolean previous = CLOSING.get();
+                    CLOSING.set(true);
+                    try {
+                        response.close();
+                    } finally {
+                        CLOSING.set(previous);
+                    }
+                });
+
                 sourceConsumer.accept(source);
                 callback.onComplete();
             } catch (Exception e) {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
index a9eb9f30086..2fbdb936447 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
@@ -37,6 +37,14 @@ public InputStream getInputStream() {
                     public void close() throws IOException {
                         shutdownInput();
                     }
+
+                    @Override
+                    public int read(byte[] b, int off, int len) throws IOException {
+                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            return 0;
+                        }
+                        return super.read(b, off, len);
+                    }
                 };
             }
 
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
new file mode 100644
index 00000000000..4d7a4e21133
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
@@ -0,0 +1,64 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.core.command.EventsResultCallback;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Timeout;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test that event streaming from the {@link DockerClient} works correctly
+ */
+public class EventStreamTest {
+
+    @Rule
+    public Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
+
+    /**
+     * Test that docker events can be streamed from the client.
+     */
+    @Test
+    public void test() throws IOException, InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        try (
+            GenericContainer container = new GenericContainer<>()
+                .withCommand("true")
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+            String createdAt = container.getContainerInfo().getCreated();
+
+            // Request all events between startTime and endTime for the container
+            try (
+                EventsResultCallback response = DockerClientFactory.instance().client().eventsCmd()
+                    .withContainerFilter(container.getContainerId())
+                    .withEventFilter("create")
+                    .withSince(Instant.parse(createdAt).getEpochSecond() + "")
+                    .exec(new EventsResultCallback() {
+                        @Override
+                        public void onNext(@NotNull Event event) {
+                            // Check that a create event for the container is received
+                            if (event.getId().equals(container.getContainerId()) && event.getStatus().equals("create")) {
+                                latch.countDown();
+                            }
+                        }
+                    })
+            ) {
+                response.awaitStarted(5, TimeUnit.SECONDS);
+                latch.await(5, TimeUnit.SECONDS);
+            }
+        }
+    }
+
+}

From 232e9b03f199299f8e01cc60e8fa3e5ca0c549ed Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2019 07:03:58 +0000
Subject: [PATCH 0314/4969] Bump mockito-core from 3.0.0 to 3.1.0 in
 /modules/junit-jupiter (#1931)

---
 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 75367d57720..e286af1e149 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.1'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
-    testCompile ('org.mockito:mockito-core:3.0.0') {
+    testCompile ('org.mockito:mockito-core:3.1.0') {
         exclude(module: 'hamcrest-core')
     }
 

From ca8a35dc5ccf31142919c5fb5635c664d4f89302 Mon Sep 17 00:00:00 2001
From: MariuszCwikla <47976407+MariuszCwikla@users.noreply.github.com>
Date: Thu, 3 Oct 2019 08:16:06 +0200
Subject: [PATCH 0315/4969] ConnectionWrapper#rollback(Savepoint) delegates to
 wrong method #1909 (#1937)

* ConnectionWrapper#rollback(Savepoint) delegates to wrong method #1909

* fix whitespaces and use @AllArgsConstructor

* Update ConnectionDelegate.java
---
 .../jdbc/ConnectionDelegate.java              |  13 +
 .../jdbc/ConnectionWrapper.java               | 290 +-----------------
 2 files changed, 23 insertions(+), 280 deletions(-)
 create mode 100644 modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java

diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java
new file mode 100644
index 00000000000..e7f59b2df4f
--- /dev/null
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java
@@ -0,0 +1,13 @@
+package org.testcontainers.jdbc;
+
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
+import lombok.experimental.Delegate;
+
+import java.sql.Connection;
+
+@RequiredArgsConstructor
+class ConnectionDelegate implements Connection {
+    @Delegate
+    private final Connection delegate;
+}
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java
index 5a783c96947..3e1f67c5b86 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java
@@ -1,294 +1,24 @@
 package org.testcontainers.jdbc;
 
-import java.sql.*;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.Executor;
+import java.sql.Connection;
+import java.sql.SQLException;
 
-/**
- * @author richardnorth
- */
-class ConnectionWrapper implements Connection {
-    private final Connection delegate;
-    private final Runnable closeCallback;
-
-    public ConnectionWrapper(Connection delegate, Runnable closeCallback) {
-        this.delegate = delegate;
-        this.closeCallback = closeCallback;
-    }
-
-    @Override
-    public Statement createStatement() throws SQLException {
-        return delegate.createStatement();
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) throws SQLException {
-        return delegate.prepareStatement(sql);
-    }
-
-    @Override
-    public CallableStatement prepareCall(String sql) throws SQLException {
-        return delegate.prepareCall(sql);
-    }
-
-    @Override
-    public String nativeSQL(String sql) throws SQLException {
-        return delegate.nativeSQL(sql);
-    }
-
-    @Override
-    public void setAutoCommit(boolean autoCommit) throws SQLException {
-        delegate.setAutoCommit(autoCommit);
-    }
-
-    @Override
-    public boolean getAutoCommit() throws SQLException {
-        return delegate.getAutoCommit();
-    }
+public class ConnectionWrapper extends ConnectionDelegate {
 
-    @Override
-    public void commit() throws SQLException {
-        delegate.commit();
-    }
+    private final Runnable closeCallback;
 
-    @Override
-    public void rollback() throws SQLException {
-        delegate.rollback();
+    public ConnectionWrapper(Connection connection, Runnable runnable) {
+        super(connection);
+        this.closeCallback = runnable;
     }
 
     @Override
     public void close() throws SQLException {
-        delegate.close();
+        super.close();
         try {
-            this.closeCallback.run();
-        } catch (Exception e) {
+            closeCallback.run();
+        } catch(Exception e) {
             e.printStackTrace();
         }
     }
-
-    @Override
-    public boolean isClosed() throws SQLException {
-        return delegate.isClosed();
-    }
-
-    @Override
-    public DatabaseMetaData getMetaData() throws SQLException {
-        return delegate.getMetaData();
-    }
-
-    @Override
-    public void setReadOnly(boolean readOnly) throws SQLException {
-        delegate.setReadOnly(readOnly);
-    }
-
-    @Override
-    public boolean isReadOnly() throws SQLException {
-        return delegate.isReadOnly();
-    }
-
-    @Override
-    public void setCatalog(String catalog) throws SQLException {
-        delegate.setCatalog(catalog);
-    }
-
-    @Override
-    public String getCatalog() throws SQLException {
-        return delegate.getCatalog();
-    }
-
-    @Override
-    public void setTransactionIsolation(int level) throws SQLException {
-        delegate.setTransactionIsolation(level);
-    }
-
-    @Override
-    public int getTransactionIsolation() throws SQLException {
-        return delegate.getTransactionIsolation();
-    }
-
-    @Override
-    public SQLWarning getWarnings() throws SQLException {
-        return delegate.getWarnings();
-    }
-
-    @Override
-    public void clearWarnings() throws SQLException {
-        delegate.clearWarnings();
-    }
-
-    @Override
-    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
-        return delegate.createStatement(resultSetType, resultSetConcurrency);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
-        return delegate.prepareStatement(sql, resultSetType, resultSetConcurrency);
-    }
-
-    @Override
-    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
-        return delegate.prepareCall(sql, resultSetType, resultSetConcurrency);
-    }
-
-    @Override
-    public Map<String, Class<?>> getTypeMap() throws SQLException {
-        return delegate.getTypeMap();
-    }
-
-    @Override
-    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
-        delegate.setTypeMap(map);
-    }
-
-    @Override
-    public void setHoldability(int holdability) throws SQLException {
-        delegate.setHoldability(holdability);
-    }
-
-    @Override
-    public int getHoldability() throws SQLException {
-        return delegate.getHoldability();
-    }
-
-    @Override
-    public Savepoint setSavepoint() throws SQLException {
-        return delegate.setSavepoint();
-    }
-
-    @Override
-    public Savepoint setSavepoint(String name) throws SQLException {
-        return delegate.setSavepoint(name);
-    }
-
-    @Override
-    public void rollback(Savepoint savepoint) throws SQLException {
-        delegate.rollback();
-    }
-
-    @Override
-    public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-        delegate.releaseSavepoint(savepoint);
-    }
-
-    @Override
-    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        return delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        return delegate.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
-    }
-
-    @Override
-    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        return delegate.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
-        return delegate.prepareStatement(sql, autoGeneratedKeys);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
-        return delegate.prepareStatement(sql, columnIndexes);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
-        return delegate.prepareStatement(sql, columnNames);
-    }
-
-    @Override
-    public Clob createClob() throws SQLException {
-        return delegate.createClob();
-    }
-
-    @Override
-    public Blob createBlob() throws SQLException {
-        return delegate.createBlob();
-    }
-
-    @Override
-    public NClob createNClob() throws SQLException {
-        return delegate.createNClob();
-    }
-
-    @Override
-    public SQLXML createSQLXML() throws SQLException {
-        return delegate.createSQLXML();
-    }
-
-    @Override
-    public boolean isValid(int timeout) throws SQLException {
-        return delegate.isValid(timeout);
-    }
-
-    @Override
-    public void setClientInfo(String name, String value) throws SQLClientInfoException {
-        delegate.setClientInfo(name, value);
-    }
-
-    @Override
-    public void setClientInfo(Properties properties) throws SQLClientInfoException {
-        delegate.setClientInfo(properties);
-    }
-
-    @Override
-    public String getClientInfo(String name) throws SQLException {
-        return delegate.getClientInfo(name);
-    }
-
-    @Override
-    public Properties getClientInfo() throws SQLException {
-        return delegate.getClientInfo();
-    }
-
-    @Override
-    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
-        return delegate.createArrayOf(typeName, elements);
-    }
-
-    @Override
-    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
-        return delegate.createStruct(typeName, attributes);
-    }
-
-    @Override
-    public void setSchema(String schema) throws SQLException {
-        delegate.setSchema(schema);
-    }
-
-    @Override
-    public String getSchema() throws SQLException {
-        return delegate.getSchema();
-    }
-
-    @Override
-    public void abort(Executor executor) throws SQLException {
-        delegate.abort(executor);
-    }
-
-    @Override
-    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-        delegate.setNetworkTimeout(executor, milliseconds);
-    }
-
-    @Override
-    public int getNetworkTimeout() throws SQLException {
-        return delegate.getNetworkTimeout();
-    }
-
-    @Override
-    public <T> T unwrap(Class<T> iface) throws SQLException {
-        return delegate.unwrap(iface);
-    }
-
-    @Override
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
-        return delegate.isWrapperFor(iface);
-    }
 }

From 1beff7ca8c19f7d62e68fecc0019aacddd90d8fe Mon Sep 17 00:00:00 2001
From: Guillaume Le Floch <glfloch@gmail.com>
Date: Thu, 3 Oct 2019 15:17:44 +0200
Subject: [PATCH 0316/4969] Localstack: fix typo in stepfunctions service name
 (#1930)

---
 .../containers/localstack/LocalStackContainer.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index d16babb51e8..a5005abe239 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -134,7 +134,7 @@ public enum Service {
         CLOUDWATCH("cloudwatch", 4582),
         SSM("ssm", 4583),
         SECRETSMANAGER("secretsmanager", 4584),
-        STEPFUNCTIONS("stepsfunctions", 4585),
+        STEPFUNCTIONS("stepfunctions", 4585),
         CLOUDWATCHLOGS("cloudwatchlogs", 4586),
         STS("sts", 4592),
         IAM("iam", 4593);

From 15140c5320ba726447c303aa51bbda467e9f9bb9 Mon Sep 17 00:00:00 2001
From: Pavel Popov <tolkonepiu@users.noreply.github.com>
Date: Thu, 3 Oct 2019 18:57:41 +0300
Subject: [PATCH 0317/4969] Add cockroach db support (#499)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/databases/cockroachdb.md         | 26 +++++++
 mkdocs.yml                                    |  1 +
 modules/cockroachdb/build.gradle              |  5 ++
 .../containers/CockroachContainer.java        | 78 +++++++++++++++++++
 .../CockroachContainerProvider.java           | 18 +++++
 ...s.containers.JdbcDatabaseContainerProvider |  1 +
 modules/jdbc-test/build.gradle                |  1 +
 .../testcontainers/jdbc/JDBCDriverTest.java   |  3 +-
 .../junit/SimpleCockroachDBTest.java          | 44 +++++++++++
 .../junit/SimplePostgreSQLTest.java           |  7 ++
 10 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 docs/modules/databases/cockroachdb.md
 create mode 100644 modules/cockroachdb/build.gradle
 create mode 100644 modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
 create mode 100644 modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
 create mode 100644 modules/cockroachdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java

diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
new file mode 100644
index 00000000000..d9e6def4e48
--- /dev/null
+++ b/docs/modules/databases/cockroachdb.md
@@ -0,0 +1,26 @@
+# CockroachDB Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:cockroachdb:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>cockroachdb</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/mkdocs.yml b/mkdocs.yml
index 9d857ad21a9..976c1b7c95f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,7 @@ nav:
           - Databases:
                 - modules/databases/index.md
                 - modules/databases/cassandra.md
+                - modules/databases/cockroachdb.md
                 - modules/databases/couchbase.md
                 - modules/databases/clickhouse.md
                 - modules/databases/db2.md
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
new file mode 100644
index 00000000000..e52f9f3729c
--- /dev/null
+++ b/modules/cockroachdb/build.gradle
@@ -0,0 +1,5 @@
+description = "Testcontainers :: JDBC :: CockroachDB"
+
+dependencies {
+    compile project(':jdbc')
+}
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
new file mode 100644
index 00000000000..fb13ced60d7
--- /dev/null
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -0,0 +1,78 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+
+import java.time.Duration;
+
+public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer> {
+    public static final String NAME = "cockroach";
+    public static final String IMAGE = "cockroachdb/cockroach";
+    public static final String IMAGE_TAG = "v19.1.1";
+    private static final String JDBC_DRIVER_CLASS_NAME = "org.postgresql.Driver";
+    private static final String JDBC_URL_PREFIX = "jdbc:postgresql";
+    private static final String TEST_QUERY_STRING = "SELECT 1";
+    private static final int REST_API_PORT = 8080;
+    private static final int DB_PORT = 26257;
+
+    private String databaseName = "postgres";
+    private String username = "root";
+    private String password = "";
+
+    public CockroachContainer() {
+        this(IMAGE + ":" + IMAGE_TAG);
+    }
+
+    public CockroachContainer(final String dockerImageName) {
+        super(dockerImageName);
+
+        withExposedPorts(REST_API_PORT, DB_PORT);
+        waitingFor(
+            new HttpWaitStrategy()
+                .forPath("/health")
+                .forPort(REST_API_PORT)
+                .forStatusCode(200)
+                .withStartupTimeout(Duration.ofMinutes(1))
+        );
+        withCommand("start --insecure");
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return JDBC_DRIVER_CLASS_NAME;
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return JDBC_URL_PREFIX + "://" + getContainerIpAddress() + ":" + getMappedPort(DB_PORT) + "/" + databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return TEST_QUERY_STRING;
+    }
+
+    @Override
+    public CockroachContainer withUsername(String username) {
+        throw new UnsupportedOperationException("The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826");
+    }
+
+    @Override
+    public CockroachContainer withPassword(String password) {
+        throw new UnsupportedOperationException("The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826");
+    }
+
+    @Override
+    public CockroachContainer withDatabaseName(final String databaseName) {
+        throw new UnsupportedOperationException("The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826");
+    }
+}
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
new file mode 100644
index 00000000000..96cafd54f31
--- /dev/null
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
@@ -0,0 +1,18 @@
+package org.testcontainers.containers;
+
+public class CockroachContainerProvider extends JdbcDatabaseContainerProvider {
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(CockroachContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(CockroachContainer.IMAGE_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new CockroachContainer(CockroachContainer.IMAGE + ":" + tag);
+    }
+}
diff --git a/modules/cockroachdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/cockroachdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..3b58b4c6799
--- /dev/null
+++ b/modules/cockroachdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.CockroachContainerProvider
\ No newline at end of file
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 9300ba49a4d..842f2a761eb 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -7,6 +7,7 @@ repositories {
 dependencies {
     compile project(':mysql')
     compile project(':postgresql')
+    compile project(':cockroachdb')
     compile project(':mariadb')
     compile project(':oracle-xe')
     compile project(':mssqlserver')
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index 0508a54e13d..2089513df06 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -65,7 +65,8 @@ public static Iterable<Object[]> data() {
                 {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override", EnumSet.of(Options.CustomIniFile)},
                 {"jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken)},
                 {"jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)}
             });
     }
 
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java
new file mode 100644
index 00000000000..c21a5ddfaf1
--- /dev/null
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java
@@ -0,0 +1,44 @@
+package org.testcontainers.junit;
+
+import org.junit.Test;
+import org.testcontainers.containers.CockroachContainer;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
+
+    static {
+        // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
+        LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
+    }
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (CockroachContainer cockroach = new CockroachContainer()) {
+            cockroach.start();
+
+            ResultSet resultSet = performQuery(cockroach, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+
+    @Test
+    public void testExplicitInitScript() throws SQLException {
+        try (CockroachContainer cockroach = new CockroachContainer()
+                .withInitScript("somepath/init_postgresql.sql")) { // CockroachDB is expected to be compatible with Postgres
+            cockroach.start();
+
+            ResultSet resultSet = performQuery(cockroach, "SELECT foo FROM bar");
+
+            String firstColumnValue = resultSet.getString(1);
+            assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+        }
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
index 4624268cb2b..7189e05fb16 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
@@ -5,12 +5,19 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 
 public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
+    static {
+        // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
+        LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
+    }
+
     @Test
     public void testSimple() throws SQLException {
         try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()) {

From cc1b86d72482d2f3122f86427eacd10d805e409f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2019 06:03:09 +0000
Subject: [PATCH 0318/4969] Bump mariadb-java-client from 2.4.4 to 2.5.0 in
 /modules/mariadb (#1942)

---
 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 9393f6c65c7..89449edc9ec 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'

From 58e62a26c58fb5d93674de30726d4b4cd8ef547c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2019 07:05:34 +0000
Subject: [PATCH 0319/4969] Bump rest-assured from 4.1.1 to 4.1.2 in
 /modules/vault (#1943)

---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 41807d2573b..b37a74602ff 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Vault"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'io.rest-assured:rest-assured:4.1.1'
+    testCompile 'io.rest-assured:rest-assured:4.1.2'
 }

From cd0b7cb4e1014ea89d6eb5479ba95102c2b9e30a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2019 08:14:17 +0000
Subject: [PATCH 0320/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#1934)

---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index e8431190e8b..11c8b57f07a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.3.2"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.4.0"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 43aa38af157126fac47185fec5262a361fcea863 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2019 09:18:14 +0000
Subject: [PATCH 0321/4969] Bump org.springframework.boot in /examples (#1944)

---
 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 cf3b6567982..9f3aed047b3 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.1.8.RELEASE'
+    id 'org.springframework.boot' version '2.1.9.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 487c60e51dd..f6ef68f9866 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.1.8.RELEASE'
+    id 'org.springframework.boot' version '2.1.9.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From bc082a84f24ec9fdb0dc06eed7204d61ea45c2db Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 4 Oct 2019 15:20:04 +0100
Subject: [PATCH 0322/4969] =?UTF-8?q?Fix=20for=20streaming=20readBytes=20t?=
 =?UTF-8?q?imeout=20on=20Windows=20with=20npipe=20strat=E2=80=A6=20(#1947)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transport/okhttp/NamedPipeSocketFactory.java         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
index ce272d6e1a6..d150eedb6a5 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
@@ -55,16 +55,25 @@ public void connect(SocketAddress endpoint, int timeout) {
                 is = new InputStream() {
                     @Override
                     public int read(byte[] bytes, int off, int len) throws IOException {
+                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            return 0;
+                        }
                         return file.read(bytes, off, len);
                     }
 
                     @Override
                     public int read() throws IOException {
+                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            return 0;
+                        }
                         return file.read();
                     }
 
                     @Override
                     public int read(byte[] bytes) throws IOException {
+                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            return 0;
+                        }
                         return file.read(bytes);
                     }
                 };

From 5aa389af939102f767d3a8f58f3d451239915549 Mon Sep 17 00:00:00 2001
From: Guillaume Le Floch <glfloch@gmail.com>
Date: Fri, 4 Oct 2019 16:21:14 +0200
Subject: [PATCH 0323/4969] Automatically set SHM for selenium container, and
 allow SHM size to be configured (#1751)

---
 .../containers/BrowserWebDriverContainer.java |  4 ++
 .../junit/BrowserWebDriverContainerTest.java  | 42 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index b92a4877cd2..32245dee3b0 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -165,6 +165,10 @@ protected void configure() {
 
         setCommand("/opt/bin/entry_point.sh");
 
+        if (getShmSize() == null) {
+            addFileSystemBind("/dev/shm", "/dev/shm", BindMode.READ_WRITE);
+        }
+
         /*
          * Some unreliability of the selenium browser containers has been observed, so allow multiple attempts to start.
          */
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
index 036262a6bd1..74f2d430383 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -1,10 +1,16 @@
 package org.testcontainers.junit;
 
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class BrowserWebDriverContainerTest {
 
@@ -39,4 +45,40 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
             assertEquals("no_proxy should be set to default if not already present", "localhost", noProxy);
         }
     }
+
+
+    @Test
+    public void createContainerWithShmVolume() {
+        try (
+            BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer()
+        ) {
+            webDriverContainer.start();
+
+            final List<InspectContainerResponse.Mount> mounts = webDriverContainer.getContainerInfo().getMounts();
+            assertEquals("Shm mounts present", mounts.size(), 1);
+
+            final InspectContainerResponse.Mount shmMount = mounts.get(0);
+            assertEquals("Shm mount source is correct", "/dev/shm", shmMount.getSource());
+            assertEquals("Shm mount destination is correct", "/dev/shm", shmMount.getDestination().getPath());
+            assertEquals("Shm mount mode is correct", shmMount.getMode(), "rw");
+        }
+    }
+
+    @Test
+    public void createContainerWithoutShmVolume() {
+        try (
+            BrowserWebDriverContainer webDriverContainer =  new BrowserWebDriverContainer<>()
+             .withSharedMemorySize(512 * FileUtils.ONE_MB)
+        ) {
+            webDriverContainer.start();
+            assertEquals("Shared memory size is configured", 512 * FileUtils.ONE_MB, webDriverContainer.getShmSize());
+
+            final long shmMountCount = webDriverContainer.getContainerInfo().getMounts()
+                .stream()
+                .filter(m -> "/dev/shm".equals(m.getSource()))
+                .count();
+            assertEquals("No shm mounts present", shmMountCount, 0L);
+        }
+    }
+
 }

From a9aa07cde52c80d37328d0e01eb2da4cd7db8d6c Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 4 Oct 2019 16:22:03 +0200
Subject: [PATCH 0324/4969] Update Gradle to 5.6.2 (#1510)

Co-authored-by: Kevin Wittek <kevin.wittek@groovy-coder.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 build.gradle                             |   7 +++++--
 core/build.gradle                        |   1 +
 examples/disque-job-queue/build.gradle   |   3 ++-
 examples/spring-boot/build.gradle        |   3 ++-
 gradle/wrapper/gradle-wrapper.jar        | Bin 56177 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 +--
 gradlew                                  |  22 +++++++++++++++++++---
 gradlew.bat                              |  18 +++++++++++++++++-
 8 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index ecdf48cd3f7..7bbf71af9f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'com.gradle.build-scan' version '1.16'
+    id 'com.gradle.build-scan' version '2.4.2'
     id 'io.franzbecker.gradle-lombok' version '3.1.0'
     id 'nebula.provided-base' version '3.0.3'
-    id 'com.github.johnrengelman.shadow' version '2.0.2'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
     id "com.jfrog.bintray" version "1.8.4" apply false
 }
 
@@ -32,6 +32,9 @@ subprojects {
             args(srcDir, "-d", outputDir)
         }
     }
+    delombok.onlyIf {
+        project.sourceSets.main.java.srcDirs.find { it.exists() }
+    }
 
     repositories {
         jcenter()
diff --git a/core/build.gradle b/core/build.gradle
index f08e7763b18..f7c4f727069 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -119,6 +119,7 @@ dependencies {
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
+    jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
     jarFileTestCompile 'org.assertj:assertj-core:3.12.2'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index bb4aa6edaaa..fbebb1d8e9f 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,7 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.10'
+    compileOnly "org.projectlombok:lombok:1.18.10"
+    annotationProcessor "org.projectlombok:lombok:1.18.10"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index f6ef68f9866..9d2d2db76ad 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -9,7 +9,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.10'
+    compileOnly "org.projectlombok:lombok:1.18.10"
+    annotationProcessor "org.projectlombok:lombok:1.18.10"
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-web'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 29953ea141f55e3b8fc691d31b5ca8816d89fa87..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644
GIT binary patch
delta 47360
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%0DJLBj1VCKrB+2
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

delta 47987
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
P{tQ5B1&<&s7});<Y<b_6

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d6e4e61c358..ca9d62814a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Jan 16 08:01:33 GMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d517f..83f2acfdc31 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a2c..24467a141f7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

From 365b750dca06abbe8292364071b1b0a315f7069e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 5 Oct 2019 09:03:22 +0100
Subject: [PATCH 0325/4969] Bump mockito-core from 3.0.0 to 3.1.0 in /core
 (#1932)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.0.0...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 f7c4f727069..0bd3a019931 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'com.rabbitmq:amqp-client:5.7.3'
     testCompile 'org.mongodb:mongo-java-driver:3.11.0'
-    testCompile ('org.mockito:mockito-core:3.0.0') {
+    testCompile ('org.mockito:mockito-core:3.1.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 52420d872c1a2832ab1785719b856e67faed7b5a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 5 Oct 2019 09:18:22 +0100
Subject: [PATCH 0326/4969] Bump flaky test review dates (#1952)

as we've not had time to look at these properly
---
 .../couchbase/BaseCouchbaseContainerTest.java               | 6 +++---
 .../org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java    | 2 +-
 .../java/org/testcontainers/containers/ToxiproxyTest.java   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
index 1c5e702727a..19eead1b23a 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
@@ -32,7 +32,7 @@ public abstract class BaseCouchbaseContainerTest extends AbstractCouchbaseTest {
     public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-10-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldInsertDocument() {
         RawJsonDocument expected = RawJsonDocument.create(ID, DOCUMENT);
         getBucket().upsert(expected);
@@ -41,7 +41,7 @@ public void shouldInsertDocument() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-10-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldExecuteN1ql() {
         getBucket().query(N1qlQuery.simple("INSERT INTO " + TEST_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
 
@@ -54,7 +54,7 @@ public void shouldExecuteN1ql() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-10-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldCreateView() {
         View view = DefaultView.create(VIEW_NAME, VIEW_FUNCTION);
         DesignDocument document = DesignDocument.create(VIEW_NAME, Lists.newArrayList(view));
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index 38c97686679..fb9794e29a8 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -20,7 +20,7 @@ public class DatabaseDriverTmpfsTest {
     public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1687", reviewDate = "2019-10-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1687", reviewDate = "2019-12-01")
     public void tmpfs() throws IOException, InterruptedException, SQLException {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
         try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 8fa28431ab5..840165fb8ee 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -45,7 +45,7 @@ public void testDirect() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-12-01")
     public void testLatencyViaProxy() throws IOException {
         // obtainProxyObject {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
@@ -72,7 +72,7 @@ public void testLatencyViaProxy() throws IOException {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-12-01")
     public void testConnectionCut() {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
         final Jedis jedis = new Jedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
@@ -97,7 +97,7 @@ public void testConnectionCut() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-12-01")
     public void testMultipleProxiesCanBeCreated() {
         try (GenericContainer secondRedis = new GenericContainer("redis:5.0.4")
             .withExposedPorts(6379)

From 94c903d755c89340aecb7eeb8f77834c6c88e095 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 6 Oct 2019 08:16:36 +0100
Subject: [PATCH 0327/4969] Fix use of SHM for Selenium containers on Windows
 (#1948)

* Change assertion used for SHM testing to support Windows

* Make test resilient to future changes in default mounts
by only checking counts of SHM volumes

* WIP - experimental

* Tweak assertion to cope with /dev/shm/

* Switch to directly adding SHM bind rather than using addFileSystemBind

* Simplify assertion code
---
 .../testcontainers/utility/MountableFile.java |  2 +
 .../containers/BrowserWebDriverContainer.java |  5 ++-
 .../junit/BrowserWebDriverContainerTest.java  | 39 +++++++++++--------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index cd83a81781f..56d5bda3ffa 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -167,7 +167,9 @@ private static String unencodeResourceURIToFilePath(@NotNull final String resour
     private String resolvePath() {
         String result = getResourcePath();
 
+        // Special case for Windows
         if (SystemUtils.IS_OS_WINDOWS && result.startsWith("/")) {
+            // Remove leading /
             result = result.substring(1);
         }
 
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 32245dee3b0..9e1a2733a2e 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -1,5 +1,8 @@
 package org.testcontainers.containers;
 
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Volume;
 import com.google.common.collect.ImmutableSet;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
@@ -166,7 +169,7 @@ protected void configure() {
         setCommand("/opt/bin/entry_point.sh");
 
         if (getShmSize() == null) {
-            addFileSystemBind("/dev/shm", "/dev/shm", BindMode.READ_WRITE);
+            this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));
         }
 
         /*
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
index 74f2d430383..7b7d3a46733 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -4,13 +4,14 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.firefox.FirefoxOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class BrowserWebDriverContainerTest {
 
@@ -51,34 +52,40 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
     public void createContainerWithShmVolume() {
         try (
             BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer()
+                .withCapabilities(new FirefoxOptions())
         ) {
             webDriverContainer.start();
 
-            final List<InspectContainerResponse.Mount> mounts = webDriverContainer.getContainerInfo().getMounts();
-            assertEquals("Shm mounts present", mounts.size(), 1);
+            final List<InspectContainerResponse.Mount> shmVolumes = shmVolumes(webDriverContainer);
 
-            final InspectContainerResponse.Mount shmMount = mounts.get(0);
-            assertEquals("Shm mount source is correct", "/dev/shm", shmMount.getSource());
-            assertEquals("Shm mount destination is correct", "/dev/shm", shmMount.getDestination().getPath());
-            assertEquals("Shm mount mode is correct", shmMount.getMode(), "rw");
+            assertEquals("Only one shm mount present", 1, shmVolumes.size());
+            assertEquals("Shm mount source is correct", "/dev/shm", shmVolumes.get(0).getSource());
+            assertEquals("Shm mount mode is correct", "rw", shmVolumes.get(0).getMode());
         }
     }
 
     @Test
     public void createContainerWithoutShmVolume() {
         try (
-            BrowserWebDriverContainer webDriverContainer =  new BrowserWebDriverContainer<>()
-             .withSharedMemorySize(512 * FileUtils.ONE_MB)
+            BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer<>()
+                .withSharedMemorySize(512 * FileUtils.ONE_MB)
+                .withCapabilities(new FirefoxOptions())
         ) {
             webDriverContainer.start();
-            assertEquals("Shared memory size is configured", 512 * FileUtils.ONE_MB, webDriverContainer.getShmSize());
 
-            final long shmMountCount = webDriverContainer.getContainerInfo().getMounts()
-                .stream()
-                .filter(m -> "/dev/shm".equals(m.getSource()))
-                .count();
-            assertEquals("No shm mounts present", shmMountCount, 0L);
+            assertEquals("Shared memory size is configured",
+                512 * FileUtils.ONE_MB,
+                webDriverContainer.getShmSize());
+
+            assertEquals("No shm mounts present", emptyList(), shmVolumes(webDriverContainer));
         }
     }
 
+    private List<InspectContainerResponse.Mount> shmVolumes(final BrowserWebDriverContainer container) {
+        return container.getContainerInfo().getMounts()
+            .stream()
+            // destination path is always /dev/shm
+            .filter(m -> m.getDestination().getPath().equals("/dev/shm"))
+            .collect(toList());
+    }
 }

From 343bcd2f554b31b5ba04acd0212675192eb3fbef Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 6 Oct 2019 17:06:25 +0200
Subject: [PATCH 0328/4969] Lock the version of AWS S3 SDK in the build script.
 (#1955)

see https://github.com/myniva/gradle-s3-build-cache/issues/20
---
 settings.gradle | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 72e7d312555..e8fb1efe910 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,12 +1,18 @@
 buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.9.0"
+    }
+
+    configurations.classpath {
+        resolutionStrategy {
+            force 'com.amazonaws:aws-java-sdk-s3:1.11.582'
+        }
     }
-  }
-  dependencies {
-    classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.9.0"
-  }
 }
 
 apply plugin: 'ch.myniva.s3-build-cache'

From 9a50a771894fe8e966fd4b95eb3ba8b9a781473b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 06:38:59 +0000
Subject: [PATCH 0329/4969] Bump cucumber-java from 4.7.2 to 4.7.4 in /examples
 (#1958)

---
 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 7e73852ca1d..61dfe948d4c 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.7.2'
+    implementation 'io.cucumber:cucumber-java:4.7.4'
     testImplementation 'io.cucumber:cucumber-junit:4.7.2'
     testImplementation 'org.testcontainers:selenium'
 }

From a46f3021135cb5a69bcd3948141d10bfe4b56f5d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 07:30:50 +0000
Subject: [PATCH 0330/4969] Bump cucumber-junit from 4.7.2 to 4.7.4 in
 /examples (#1957)

---
 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 61dfe948d4c..7e536842bf0 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.14.0'
     implementation 'io.cucumber:cucumber-java:4.7.4'
-    testImplementation 'io.cucumber:cucumber-junit:4.7.2'
+    testImplementation 'io.cucumber:cucumber-junit:4.7.4'
     testImplementation 'org.testcontainers:selenium'
 }

From b08308f46f5d0403d779f785cef5a84e1569658b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 8 Oct 2019 14:57:34 -0500
Subject: [PATCH 0331/4969] Always copy to "/" (root). Fixes #1954 (#1956)

---
 .../containers/GenericContainer.java               |  7 ++-----
 .../junit/CopyFileToContainerTest.java             | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index baf79474aaa..e3a16c2dacb 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1154,16 +1154,13 @@ public void copyFileToContainer(Transferable transferable, String containerPath)
         ) {
             tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
 
-            int lastSlashIndex = StringUtils.removeEnd(containerPath, "/").lastIndexOf("/");
-            String extractArchiveTo = containerPath.substring(0, lastSlashIndex + 1);
-            String pathInArchive = containerPath.substring(lastSlashIndex + 1);
-            transferable.transferTo(tarArchive, pathInArchive);
+            transferable.transferTo(tarArchive, containerPath);
             tarArchive.finish();
 
             dockerClient
                 .copyArchiveToContainerCmd(containerId)
                 .withTarInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()))
-                .withRemotePath(extractArchiveTo)
+                .withRemotePath("/")
                 .exec();
         }
     }
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index 0641bc7d50d..ed6ee561505 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -59,4 +59,18 @@ public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
         assertFalse("uses mount for read-only with Selinux", copyMap.containsValue("/readOnlyShared"));
         assertFalse("uses mount for read-write", copyMap.containsValue("/readWrite"));
     }
+
+    @Test
+    public void shouldCreateFoldersStructureWithCopy() throws Exception {
+        String resource = "/test_copy_to_container.txt";
+        try (
+            GenericContainer container = new GenericContainer<>()
+                .withCommand("sleep", "3000")
+                .withClasspathResourceMapping(resource, "/a/b/c/file", BindMode.READ_ONLY)
+        ) {
+            container.start();
+            String filesList = container.execInContainer("ls", "/a/b/c/").getStdout();
+            assertTrue("file list contains the file", filesList.contains("file"));
+        }
+    }
 }

From e2272021b6ffaf329211349f0daa2b6b3c4cd584 Mon Sep 17 00:00:00 2001
From: worldtiki <dmartinsalbuqu@expedia.com>
Date: Tue, 8 Oct 2019 20:59:12 +0100
Subject: [PATCH 0332/4969] Add a simple example with how to use the mock
 server container (#1950)

* Add a simple example with how to use the mock server container

* Move examples for mockserver to unit tests
---
 docs/modules/mockserver.md                    | 17 +++++
 .../containers/MockServerContainerTest.java   | 63 +++++++++++--------
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md
index b6c0cd92457..051cecf076e 100644
--- a/docs/modules/mockserver.md
+++ b/docs/modules/mockserver.md
@@ -1,5 +1,21 @@
 # Mockserver Module
 
+Mock Server can be used to mock HTTP services by matching requests against user-defined expectations.
+
+## Usage example
+
+The following example shows how to start Mockserver.
+
+<!--codeinclude-->
+[Creating a MockServer container](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java) inside_block:creatingProxy
+<!--/codeinclude-->
+
+And how to set a simple expectation using the Java MockServerClient.
+
+<!--codeinclude-->
+[Setting a simple expectation](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java) inside_block:testSimpleExpectation
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
@@ -16,3 +32,4 @@ testCompile "org.testcontainers:mockserver:{{latest_version}}"
     <scope>test</scope>
 </dependency>
 ```
+
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index 8cb8ac88448..be1495a04c7 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import lombok.Cleanup;
+import org.junit.Rule;
 import org.junit.Test;
 import org.mockserver.client.MockServerClient;
 
@@ -11,12 +12,43 @@
 import java.net.URLConnection;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 
 public class MockServerContainerTest {
 
+    // creatingProxy {
+    @Rule
+    public MockServerContainer mockServer = new MockServerContainer();
+    // }
+
+    private static String responseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
+        URLConnection urlConnection = new URL(mockServer.getEndpoint() + path).openConnection();
+        @Cleanup BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+        return reader.readLine();
+    }
+
+    @Test
+    public void shouldReturnExpectation() throws Exception {
+        // testSimpleExpectation {
+        new MockServerClient(mockServer.getContainerIpAddress(), mockServer.getServerPort())
+            .when(request()
+                .withPath("/person")
+                .withQueryStringParameter("name", "peter"))
+            .respond(response()
+                .withBody("Peter the person!"));
+
+        // ...a GET request to '/person?name=peter' returns "Peter the person!"
+        // }
+
+        assertThat("Expectation returns expected response body",
+            responseFromMockserver(mockServer, "/person?name=peter"),
+            containsString("Peter the person")
+        );
+    }
+
     @Test
     public void shouldCallActualMockserverVersion() throws Exception {
         String actualVersion = MockServerClient.class.getPackage().getImplementationVersion();
@@ -25,33 +57,14 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
             String expectedBody = "Hello World!";
 
-            assertThat("MockServer returns correct result",
-                responseFromMockserver(mockServer, expectedBody, "/hello"),
-                containsString(expectedBody)
-            );
-        }
-    }
+            new MockServerClient(mockServer.getContainerIpAddress(), mockServer.getServerPort())
+                .when(request().withPath("/hello"))
+                .respond(response().withBody(expectedBody));
 
-    @Test
-    public void shouldCallDefaultMockserverVersion() throws Exception {
-        try (MockServerContainer mockServerDefault = new MockServerContainer()) {
-            mockServerDefault.start();
-            String expectedBody = "Hello Default World!";
-
-            assertThat("MockServer returns correct result for default constructor",
-                responseFromMockserver(mockServerDefault, expectedBody, "/hellodefault"),
-                containsString(expectedBody)
+            assertThat("MockServer returns correct result",
+                responseFromMockserver(mockServer, "/hello"),
+                equalTo(expectedBody)
             );
         }
     }
-
-    private static String responseFromMockserver(MockServerContainer mockServer, String expectedBody, String path) throws IOException {
-        new MockServerClient(mockServer.getContainerIpAddress(), mockServer.getServerPort())
-            .when(request(path))
-            .respond(response(expectedBody));
-
-        URLConnection urlConnection = new URL(mockServer.getEndpoint() + path).openConnection();
-        @Cleanup BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
-        return reader.readLine();
-    }
 }

From ce759bd869de75e53e6db61b4d0a36cf881aab9e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 8 Oct 2019 21:18:17 +0100
Subject: [PATCH 0333/4969] Switch travis build JDK to openjdk8

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d7d5f94270d..85bef8cff9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ if: branch = master OR tag is present
 
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 sudo: required
 services:

From 11fa0f9d8907811aa62847274f5fc1ad472e0a8e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 08:26:19 +0100
Subject: [PATCH 0334/4969] Bump gson from 2.8.5 to 2.8.6 in /examples (#1960)

Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.5...gson-parent-2.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index fbebb1d8e9f..1f4e257cad1 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.10"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
     implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.mockito:mockito-all:1.10.19'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index e68ccfea24f..e339878813c 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.28'
     implementation 'redis.clients:jedis:3.1.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 8b1a5638243..727c1649b07 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.28'
     implementation 'redis.clients:jedis:3.1.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.12'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 26a437909fe..250eb755632 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:3.1.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.28'
 

From 8104c0c5c92d4f24003fc6a7f8dcc18835488c6e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 10 Oct 2019 21:54:22 +0100
Subject: [PATCH 0335/4969] Update .travis.yml

Add info level logging
---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 85bef8cff9c..810b5827757 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,29 +15,29 @@ jobs:
   include:
     - stage: test
       env: [ NAME=core ]
-      script: ./gradlew testcontainers:check javadoc --scan --no-daemon
+      script: ./gradlew testcontainers:check javadoc --scan --no-daemon -i
 
     - stage: test
       env: [ NAME=core ]
       jdk: openjdk11
-      script: ./gradlew testcontainers:check --scan --no-daemon
+      script: ./gradlew testcontainers:check --scan --no-daemon -i
 
     - stage: test
       env: [ NAME=core ]
       jdk: openjdk12
-      script: ./gradlew testcontainers:check --scan --no-daemon
+      script: ./gradlew testcontainers:check --scan --no-daemon -i
 
     - env: [ NAME=selenium ]
-      script: ./gradlew selenium:check --scan --no-daemon
+      script: ./gradlew selenium:check --scan --no-daemon -i
 
     - env: [ NAME=modules ]
-      script: ./gradlew check -x testcontainers:check -x selenium:check -x jdbc-test:check --scan --no-daemon
+      script: ./gradlew check -x testcontainers:check -x selenium:check -x jdbc-test:check --scan --no-daemon -i
 
     - env: [ NAME=jdbc ]
-      script: ./gradlew jdbc-test:check --scan --no-daemon
+      script: ./gradlew jdbc-test:check --scan --no-daemon -i
 
     - env: [ NAME=examples ]
-      script: cd examples && ../gradlew check --no-daemon
+      script: cd examples && ../gradlew check --no-daemon -i
 
     # Run Docker-in-Docker tests inside Alpine
     - env: [ NAME="docker-in-alpine-docker" ]
@@ -49,7 +49,7 @@ jobs:
                 -v "$(pwd)":"$(pwd)" \
                 -w "$(pwd)" \
                 openjdk:8-jdk-alpine \
-                ./gradlew --no-daemon testcontainers:test --tests '*GenericContainerRuleTest' --scan
+                ./gradlew --no-daemon testcontainers:test --tests '*GenericContainerRuleTest' --scan -i
 
     - stage: deploy
       sudo: false
@@ -58,7 +58,7 @@ jobs:
       script: skip
       deploy:
         provider: script
-        script: ./gradlew -Pversion=$TRAVIS_TAG release --scan --no-daemon
+        script: ./gradlew -Pversion=$TRAVIS_TAG release --scan --no-daemon -i
         on:
           tags: true
           branch: master

From 32e8c53cf0d8bebf6d0056d5e6c12dbce499e599 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 12 Oct 2019 16:07:05 +0100
Subject: [PATCH 0336/4969] Fix docker-compose issue in Travis build

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 810b5827757..02196e895fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,16 @@ jdk:
 sudo: required
 services:
   - docker
+  
+env:
+  - DOCKER_COMPOSE_VERSION=1.24.1
+
+# Fix for https://travis-ci.community/t/problematic-docker-compose-version-1-23-1/5362/3
+before_install:
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
 
 install:
   - ./gradlew build -x check --scan --no-daemon

From 92b751d11e40a8ca7f54ec92ebcc8831dff79d04 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 12 Oct 2019 16:38:17 +0100
Subject: [PATCH 0337/4969] Update .travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02196e895fe..e069ed68bc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,12 @@ services:
   - docker
   
 env:
-  - DOCKER_COMPOSE_VERSION=1.24.1
+  - DOCKER_COMPOSE_VERSION=
 
 # Fix for https://travis-ci.community/t/problematic-docker-compose-version-1-23-1/5362/3
 before_install:
   - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-Linux-x86_64 > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
 

From 1a5cd16421c9747bc303ccbfcb704420b78a5d47 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 12 Oct 2019 16:38:28 +0100
Subject: [PATCH 0338/4969] Update .travis.yml

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e069ed68bc6..d21033b942a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,6 @@ jdk:
 sudo: required
 services:
   - docker
-  
-env:
-  - DOCKER_COMPOSE_VERSION=
 
 # Fix for https://travis-ci.community/t/problematic-docker-compose-version-1-23-1/5362/3
 before_install:

From a502c8c3b21769c3dfa483bd7967339cd083eb6f Mon Sep 17 00:00:00 2001
From: Steve Hill <sghill.dev@gmail.com>
Date: Sat, 12 Oct 2019 09:53:32 -0700
Subject: [PATCH 0339/4969] Update example dependency specified in junit_5.md
 (#1817)

`testCompile` is deprecated and has been superseded by `testImplementation`
---
 docs/test_framework_integration/junit_5.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/test_framework_integration/junit_5.md b/docs/test_framework_integration/junit_5.md
index 442fb485185..371240a8d54 100644
--- a/docs/test_framework_integration/junit_5.md
+++ b/docs/test_framework_integration/junit_5.md
@@ -126,7 +126,7 @@ This extension has only be tested with sequential test execution. Using it with
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:junit-jupiter:{{latest_version}}"
+testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
 ```
 
 ```xml tab='Maven'

From fcf3b0f642d0a80cf752ce2d4ac624baf449bc64 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 12 Oct 2019 17:59:19 +0100
Subject: [PATCH 0340/4969] Bump jna-platform from 5.3.1 to 5.4.0 in /core
 (#1796)

Bumps [jna-platform](https://github.com/java-native-access/jna) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/java-native-access/jna/releases)
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.3.1...5.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0bd3a019931..45fdf5d1b0b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -76,7 +76,7 @@ dependencies {
         exclude(group: "log4j", module: "log4j")
     }
 
-    compile "net.java.dev.jna:jna-platform:5.3.1"
+    compile "net.java.dev.jna:jna-platform:5.4.0"
 
     shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.0') {
         exclude(group: "net.java.dev.jna")

From ce7a57200f1f889c18d384ab1dad438edfa14efc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 13 Oct 2019 18:12:03 +0100
Subject: [PATCH 0341/4969] Bump okhttp from 3.14.2 to 3.14.4 in /core (#1924)

Bumps [okhttp](https://github.com/square/okhttp) from 3.14.2 to 3.14.4.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/docs/changelog_3x.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.2...parent-3.14.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 45fdf5d1b0b..1d3ca56f89f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -97,7 +97,7 @@ dependencies {
 
     shaded "org.yaml:snakeyaml:1.25"
 
-    shaded 'com.squareup.okhttp3:okhttp:3.14.2'
+    shaded 'com.squareup.okhttp3:okhttp:3.14.4'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From fbdfeddeed79d818ab9dd2d0b1ba18ba0453bbb0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 18:55:42 +0000
Subject: [PATCH 0342/4969] Bump mongo-java-driver from 3.11.0 to 3.11.1 in
 /core (#1970)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1d3ca56f89f..2b631f46bce 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'com.rabbitmq:amqp-client:5.7.3'
-    testCompile 'org.mongodb:mongo-java-driver:3.11.0'
+    testCompile 'org.mongodb:mongo-java-driver:3.11.1'
     testCompile ('org.mockito:mockito-core:3.1.0') {
         exclude(module: 'hamcrest-core')
     }

From cea37a8219176db8d568d2049d9cb27e38451ebb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 19:55:54 +0100
Subject: [PATCH 0343/4969] Bump tomcat-jdbc from 9.0.26 to 9.0.27 in
 /modules/mariadb (#1967)

Bumps tomcat-jdbc from 9.0.26 to 9.0.27.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 89449edc9ec..9c2150a51cd 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.27'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 69cd9ebc9780925f2fc2124a925faddb6ccc015c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:16:48 +0100
Subject: [PATCH 0344/4969] Bump mariadb-java-client from 2.5.0 to 2.5.1 in
 /modules/mariadb (#1983)

Bumps [mariadb-java-client](https://github.com/MariaDB/mariadb-connector-j) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/MariaDB/mariadb-connector-j/releases)
- [Commits](https://github.com/MariaDB/mariadb-connector-j/compare/2.5.0...2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 9c2150a51cd..f6d65f4a5f0 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.0'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.1'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.27'

From c6e76b4e00b895a7ecaeee08efd9b4365178132e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:17:11 +0100
Subject: [PATCH 0345/4969] Bump cucumber-junit from 4.7.4 to 4.8.0 in
 /examples (#1973)

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 4.7.4 to 4.8.0.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v4.7.4...v4.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 7e536842bf0..7b489671506 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.14.0'
     implementation 'io.cucumber:cucumber-java:4.7.4'
-    testImplementation 'io.cucumber:cucumber-junit:4.7.4'
+    testImplementation 'io.cucumber:cucumber-junit:4.8.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 33e26deb6c524cff82078e2f21ba11540cd4f51d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:17:28 +0100
Subject: [PATCH 0346/4969] =?UTF-8?q?Bump=20mysql-connector-java=20from=20?=
 =?UTF-8?q?8.0.17=20to=208.0.18=20in=20/modules/mys=E2=80=A6=20(#1968)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.17 to 8.0.18.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 dbb6747e80f..3c856aca872 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MySQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'mysql:mysql-connector-java:8.0.17'
+    testCompile 'mysql:mysql-connector-java:8.0.18'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'
     testCompile 'commons-dbutils:commons-dbutils:1.7'

From 0f55de13309ad25266dd981d37e5bcda19d010fe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:17:36 +0100
Subject: [PATCH 0347/4969] Bump tomcat-jdbc from 9.0.26 to 9.0.27 in
 /modules/mysql (#1969)

Bumps tomcat-jdbc from 9.0.26 to 9.0.27.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 3c856aca872..7704f56c54f 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.18'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.26'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.27'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 3bff1d0b614b23b8a56292aa5de77637f5860198 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:18:11 +0100
Subject: [PATCH 0348/4969] =?UTF-8?q?Bump=20mysql-connector-java=20from=20?=
 =?UTF-8?q?8.0.17=20to=208.0.18=20in=20/modules/spo=E2=80=A6=20(#1972)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.17 to 8.0.18.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 552fd3883cd..d84e8776af3 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
     testRuntime 'org.postgresql:postgresql:42.2.8'
-    testRuntime 'mysql:mysql-connector-java:8.0.17'
+    testRuntime 'mysql:mysql-connector-java:8.0.18'
 }

From e36ec2ba8dfc5b7b786dafa81b3d419498923bef Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:18:22 +0100
Subject: [PATCH 0349/4969] Bump cucumber-java from 4.7.4 to 4.8.0 in /examples
 (#1974)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 4.7.4 to 4.8.0.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v4.7.4...v4.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 7b489671506..5d2caed8c2a 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.7.4'
+    implementation 'io.cucumber:cucumber-java:4.8.0'
     testImplementation 'io.cucumber:cucumber-junit:4.8.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 8cf76c09f065d6fb8fdb03a236cc270412b9afa0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:18:34 +0100
Subject: [PATCH 0350/4969] =?UTF-8?q?Bump=20mysql-connector-java=20from=20?=
 =?UTF-8?q?8.0.17=20to=208.0.18=20in=20/modules/jun=E2=80=A6=20(#1971)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.17 to 8.0.18.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 e286af1e149..f6f23aa8959 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     }
 
     testRuntime 'org.postgresql:postgresql:42.2.8'
-    testRuntime 'mysql:mysql-connector-java:8.0.17'
+    testRuntime 'mysql:mysql-connector-java:8.0.18'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 }
 

From c27f4016c791d811dfe1cf392606ae0f65d4e6e7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 20 Oct 2019 13:05:28 +0000
Subject: [PATCH 0351/4969] Bump org.springframework.boot in /examples (#1985)

---
 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 9f3aed047b3..2c15c3038ba 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.1.9.RELEASE'
+    id 'org.springframework.boot' version '2.2.0.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 9d2d2db76ad..df18e6a5f03 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.1.9.RELEASE'
+    id 'org.springframework.boot' version '2.2.0.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 38062356bf955b177f8890155da5e182c7caf151 Mon Sep 17 00:00:00 2001
From: Jonathan Vila <jonathan.vila@gmail.com>
Date: Sun, 20 Oct 2019 15:16:39 +0200
Subject: [PATCH 0352/4969] Added documentation example of using local Docker
 Compose (#1987)

Co-authored-by: Jonathan Vila <jvilalop@redhat.com>
---
 docs/modules/docker_compose.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/modules/docker_compose.md b/docs/modules/docker_compose.md
index 965b6c7084a..fa584d7f631 100644
--- a/docs/modules/docker_compose.md
+++ b/docs/modules/docker_compose.md
@@ -112,7 +112,13 @@ public static DockerComposeContainer environment =
 
 You can override Testcontainers' default behaviour and make it use a `docker-compose` binary installed on the local machine. 
 This will generally yield an experience that is closer to running docker-compose locally, with the caveat that Docker Compose needs to be present on dev and CI machines.
-
+```java
+public static DockerComposeContainer environment =
+    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+            .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort())
+            .waitingFor("db_1", Wait.forLogMessage("started", 1))
+            .withLocalCompose(true);
+```
 ## Using private repositories in Docker compose
 When Docker Compose is used in container mode (not local), it's needs to be made aware of Docker settings for private repositories. 
 By default, those setting are located in `$HOME/.docker/config.json`. 

From 43a76abb5d27f322a6a7a30ffc148beb31cd5736 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 26 Oct 2019 11:34:22 +0300
Subject: [PATCH 0353/4969] Reusable containers (stage1, alpha) (#1781)

* Simplify Kafka container by deferring the Kafka command

* WIP: reusable containers based on labels

* do not call `newInstance` from `newInstanceFromConnectionUrl`

* disable the port forwarding in `ReusabilityUnitTests`

* Simplify the startup sequence

* speed up port detection by running the checks as a single command

* Separate "environment" and "classpath" properties (for global things)

* Update TestcontainersConfiguration.java

* Add test for the reuse env property

* Add `@UnstableAPI` annotation

* Add `VisibleForTesting` on `findContainerForReuse`
---
 .../java/org/testcontainers/UnstableAPI.java  |  21 ++
 .../containers/GenericContainer.java          | 126 +++++++++--
 .../containers/LazyDockerClient.java          |  15 ++
 .../utility/TestcontainersConfiguration.java  |   8 +-
 .../containers/ReusabilityUnitTests.java      | 200 ++++++++++++++++++
 .../TestcontainersConfigurationTest.java      |  11 +
 .../JdbcDatabaseContainerProvider.java        |  10 +-
 .../testcontainers/jdbc/ConnectionUrl.java    |   6 +
 .../jdbc/ContainerDatabaseDriver.java         |   2 +-
 9 files changed, 380 insertions(+), 19 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/UnstableAPI.java
 create mode 100644 core/src/main/java/org/testcontainers/containers/LazyDockerClient.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java

diff --git a/core/src/main/java/org/testcontainers/UnstableAPI.java b/core/src/main/java/org/testcontainers/UnstableAPI.java
new file mode 100644
index 00000000000..21fd2c3176c
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/UnstableAPI.java
@@ -0,0 +1,21 @@
+package org.testcontainers;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks that the annotated API is a subject to change and SHOULD NOT be considered
+ * a stable API.
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target({
+    ElementType.TYPE,
+    ElementType.METHOD,
+    ElementType.FIELD,
+})
+@Documented
+public @interface UnstableAPI {
+}
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index e3a16c2dacb..f17e8dfd0b2 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1,5 +1,9 @@
 package org.testcontainers.containers;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
@@ -12,13 +16,15 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
 import lombok.AccessLevel;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.SneakyThrows;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
@@ -33,6 +39,7 @@
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.UnstableAPI;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
@@ -62,11 +69,14 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -100,6 +110,8 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     public static final String INTERNAL_HOST_HOSTNAME = "host.testcontainers.internal";
 
+    static final String HASH_LABEL = "org.testcontainers.hash";
+
     /*
      * Default settings
      */
@@ -168,11 +180,12 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     protected final Set<Startable> dependencies = new HashSet<>();
 
-    /*
+    /**
      * Unique instance of DockerClient for use by this container object.
+     * We use {@link LazyDockerClient} here to avoid eager client creation
      */
     @Setter(AccessLevel.NONE)
-    protected DockerClient dockerClient = DockerClientFactory.instance().client();
+    protected DockerClient dockerClient = LazyDockerClient.INSTANCE;
 
     /*
      * Info about the Docker server; lazily fetched.
@@ -222,6 +235,8 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Nullable
     private Map<String, String> tmpFsMapping;
 
+    @Setter(AccessLevel.NONE)
+    private boolean shouldBeReused = false;
 
     public GenericContainer() {
         this(TestcontainersConfiguration.getInstance().getTinyImage());
@@ -276,13 +291,15 @@ protected void doStart() {
         try {
             configure();
 
+            Instant startedAt = Instant.now();
+
             logger().debug("Starting container: {}", getDockerImageName());
             logger().debug("Trying to start container: {}", image.get());
 
             AtomicInteger attempt = new AtomicInteger(0);
             Unreliables.retryUntilSuccess(startupAttempts, () -> {
                 logger().debug("Trying to start container: {} (attempt {}/{})", image.get(), attempt.incrementAndGet(), startupAttempts);
-                tryStart();
+                tryStart(startedAt);
                 return true;
             });
 
@@ -291,7 +308,25 @@ protected void doStart() {
         }
     }
 
-    private void tryStart() {
+    @UnstableAPI
+    @SneakyThrows
+    protected boolean canBeReused() {
+        for (Class<?> type = getClass(); type != GenericContainer.class; type = type.getSuperclass()) {
+            try {
+                Method method = type.getDeclaredMethod("containerIsCreated", String.class);
+                if (method.getDeclaringClass() != GenericContainer.class) {
+                    logger().warn("{} can't be reused because it overrides {}", getClass(), method.getName());
+                    return false;
+                }
+            } catch (NoSuchMethodException e) {
+                // ignore
+            }
+        }
+
+        return true;
+    }
+
+    private void tryStart(Instant startedAt) {
         try {
             String dockerImageName = image.get();
             logger().debug("Starting container: {}", dockerImageName);
@@ -300,16 +335,49 @@ private void tryStart() {
             CreateContainerCmd createCommand = dockerClient.createContainerCmd(dockerImageName);
             applyConfiguration(createCommand);
 
-            containerId = createCommand.exec().getId();
+            createCommand.getLabels().put(DockerClientFactory.TESTCONTAINERS_LABEL, "true");
 
-            connectToPortForwardingNetwork(createCommand.getNetworkMode());
+            boolean reused = false;
+            if (shouldBeReused) {
+                if (!canBeReused()) {
+                    throw new IllegalStateException("This container does not support reuse");
+                }
 
-            copyToFileContainerPathMap.forEach(this::copyFileToContainer);
+                if (TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
+                    String hash = hash(createCommand);
 
-            containerIsCreated(containerId);
+                    containerId = findContainerForReuse(hash).orElse(null);
 
-            logger().info("Starting container with ID: {}", containerId);
-            dockerClient.startContainerCmd(containerId).exec();
+                    if (containerId != null) {
+                        logger().info("Reusing container with ID: {} and hash: {}", containerId, hash);
+                        reused = true;
+                    } else {
+                        logger().debug("Can't find a reusable running container with hash: {}", hash);
+
+                        createCommand.getLabels().put(HASH_LABEL, hash);
+                    }
+                } else {
+                    logger().info("Reuse was requested but the environment does not support the reuse of containers");
+                }
+            } else {
+                createCommand.getLabels().put(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL, DockerClientFactory.SESSION_ID);
+            }
+
+            if (!reused) {
+                containerId = createCommand.exec().getId();
+
+                // TODO add to the hash
+                copyToFileContainerPathMap.forEach(this::copyFileToContainer);
+            }
+
+            connectToPortForwardingNetwork(createCommand.getNetworkMode());
+
+            if (!reused) {
+                containerIsCreated(containerId);
+
+                logger().info("Starting container with ID: {}", containerId);
+                dockerClient.startContainerCmd(containerId).exec();
+            }
 
             logger().info("Container {} is starting: {}", dockerImageName, containerId);
 
@@ -331,7 +399,7 @@ private void tryStart() {
             // Wait until the process within the container has become ready for use (e.g. listening on network, log message emitted, etc).
             waitUntilContainerStarted();
 
-            logger().info("Container {} started", dockerImageName);
+            logger().info("Container {} started in {}", dockerImageName, Duration.between(startedAt, Instant.now()));
             containerIsStarted(containerInfo);
         } catch (Exception e) {
             logger().error("Could not start container", e);
@@ -351,6 +419,31 @@ private void tryStart() {
         }
     }
 
+    @UnstableAPI
+    @SneakyThrows(JsonProcessingException.class)
+    final String hash(CreateContainerCmd createCommand) {
+        // TODO add Testcontainers' version to the hash
+        String commandJson = new ObjectMapper()
+            .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+            .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
+            .writeValueAsString(createCommand);
+
+        return DigestUtils.sha1Hex(commandJson);
+    }
+
+    @VisibleForTesting
+    Optional<String> findContainerForReuse(String hash) {
+        // TODO locking
+        return dockerClient.listContainersCmd()
+            .withLabelFilter(ImmutableMap.of(HASH_LABEL, hash))
+            .withLimit(1)
+            .withStatusFilter(Arrays.asList("running"))
+            .exec()
+            .stream()
+            .findAny()
+            .map(it -> it.getId());
+    }
+
     /**
      * Set any custom settings for the create command such as shared memory size.
      */
@@ -613,7 +706,6 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
         if (createCommand.getLabels() != null) {
             combinedLabels.putAll(createCommand.getLabels());
         }
-        combinedLabels.putAll(DockerClientFactory.DEFAULT_LABELS);
 
         createCommand.withLabels(combinedLabels);
     }
@@ -1215,7 +1307,7 @@ public SELF withStartupAttempts(int attempts) {
     }
 
     /**
-     * Allow low level modifications of {@link CreateContainerCmd} after it was pre-configured in {@link #tryStart()}.
+     * Allow low level modifications of {@link CreateContainerCmd} after it was pre-configured in {@link #tryStart(Instant)}.
      * Invocation happens eagerly on a moment when container is created.
      * Warning: this does expose the underlying docker-java API so might change outside of our control.
      *
@@ -1247,6 +1339,12 @@ public SELF withTmpFs(Map<String, String> mapping) {
         return self();
     }
 
+    @UnstableAPI
+    public SELF withReuse(boolean reusable) {
+        this.shouldBeReused = reusable;
+        return self();
+    }
+
     @Override
     public boolean equals(Object o) {
         return this == o;
diff --git a/core/src/main/java/org/testcontainers/containers/LazyDockerClient.java b/core/src/main/java/org/testcontainers/containers/LazyDockerClient.java
new file mode 100644
index 00000000000..b1341b52755
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/LazyDockerClient.java
@@ -0,0 +1,15 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.DockerClient;
+import lombok.experimental.Delegate;
+import org.testcontainers.DockerClientFactory;
+
+enum LazyDockerClient implements DockerClient {
+
+    INSTANCE;
+
+    @Delegate
+    final DockerClient getDockerClient() {
+        return DockerClientFactory.instance().client();
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 21f9bdfb333..e5a45a05b64 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -2,6 +2,7 @@
 
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.UnstableAPI;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -89,12 +90,17 @@ public boolean isDisableChecks() {
         return Boolean.parseBoolean((String) environmentProperties.getOrDefault("checks.disable", "false"));
     }
 
+    @UnstableAPI
+    public boolean environmentSupportsReuse() {
+        return Boolean.parseBoolean((String) environmentProperties.getOrDefault("testcontainers.reuse.enable", "false"));
+    }
+
     public String getDockerClientStrategyClassName() {
         return (String) environmentProperties.get("docker.client.strategy");
     }
 
     /**
-     * 
+     *
      * @deprecated we no longer have different transport types
      */
     @Deprecated
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
new file mode 100644
index 00000000000..b05db5b5077
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -0,0 +1,200 @@
+package org.testcontainers.containers;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.core.command.CreateContainerCmdImpl;
+import com.github.dockerjava.core.command.InspectContainerCmdImpl;
+import com.github.dockerjava.core.command.ListContainersCmdImpl;
+import com.github.dockerjava.core.command.StartContainerCmdImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import org.junit.Assume;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+import org.rnorth.visibleassertions.VisibleAssertions;
+import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
+import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+@RunWith(Enclosed.class)
+public class ReusabilityUnitTests {
+
+    static final CompletableFuture<String> IMAGE_FUTURE = CompletableFuture.completedFuture(
+        TestcontainersConfiguration.getInstance().getTinyImage()
+    );
+
+    @RunWith(Parameterized.class)
+    @RequiredArgsConstructor
+    @FieldDefaults(makeFinal = true)
+    public static class CanBeReusedTest {
+
+        @Parameterized.Parameters(name = "{0}")
+        public static Object[][] data() {
+            return new Object[][] {
+                { "generic", new GenericContainer(IMAGE_FUTURE), true },
+                { "anonymous generic", new GenericContainer(IMAGE_FUTURE) {}, true },
+                { "custom", new CustomContainer(), true },
+                { "anonymous custom", new CustomContainer() {}, true },
+                { "custom with containerIsCreated", new CustomContainerWithContainerIsCreated(), false },
+            };
+        }
+
+        String name;
+
+        GenericContainer container;
+
+        boolean reusable;
+
+        @Test
+        public void shouldBeReusable() {
+            if (reusable) {
+                VisibleAssertions.assertTrue("Is reusable", container.canBeReused());
+            } else {
+                VisibleAssertions.assertFalse("Is not reusable", container.canBeReused());
+            }
+        }
+
+        static class CustomContainer extends GenericContainer {
+            CustomContainer() {
+                super(IMAGE_FUTURE);
+            }
+        }
+
+        static class CustomContainerWithContainerIsCreated extends GenericContainer {
+
+            CustomContainerWithContainerIsCreated() {
+                super(IMAGE_FUTURE);
+            }
+
+            @Override
+            protected void containerIsCreated(String containerId) {
+                super.containerIsCreated(containerId);
+            }
+        }
+    }
+
+    @RunWith(BlockJUnit4ClassRunner.class)
+    @FieldDefaults(makeFinal = true)
+    public static class HashTest {
+
+        StartupCheckStrategy startupCheckStrategy = new StartupCheckStrategy() {
+            @Override
+            public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
+                return StartupStatus.SUCCESSFUL;
+            }
+        };
+
+        WaitStrategy waitStrategy = new AbstractWaitStrategy() {
+            @Override
+            protected void waitUntilReady() {
+
+            }
+        };
+
+        DockerClient client = Mockito.mock(DockerClient.class);
+
+        GenericContainer container = new GenericContainer(IMAGE_FUTURE)
+            .withNetworkMode("none") // to disable the port forwarding
+            .withStartupCheckStrategy(startupCheckStrategy)
+            .waitingFor(waitStrategy)
+            .withReuse(true);
+
+        {
+            container.dockerClient = client;
+        }
+
+        @Test
+        public void shouldStartIfListReturnsEmpty() {
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
+            when(client.listContainersCmd()).then(listContainersAnswer());
+            when(client.startContainerCmd(containerId)).then(startContainerAnswer());
+            when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
+
+            container.start();
+
+            Mockito.verify(client, Mockito.atLeastOnce()).startContainerCmd(containerId);
+        }
+
+        @Test
+        public void shouldReuseIfListReturnsID() {
+            // TODO mock TestcontainersConfiguration
+            Assume.assumeTrue("supports reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
+            when(client.createContainerCmd(any())).then(createContainerAnswer(randomContainerId()));
+            String existingContainerId = randomContainerId();
+            when(client.listContainersCmd()).then(listContainersAnswer(existingContainerId));
+            when(client.inspectContainerCmd(existingContainerId)).then(inspectContainerAnswer());
+
+            container.start();
+
+            Mockito.verify(client, Mockito.never()).startContainerCmd(existingContainerId);
+        }
+
+        private String randomContainerId() {
+            return UUID.randomUUID().toString();
+        }
+
+        private Answer<ListContainersCmd> listContainersAnswer(String... ids) {
+            return invocation -> {
+                ListContainersCmd.Exec exec = command -> {
+                    return new ObjectMapper().convertValue(
+                        Stream.of(ids)
+                            .map(id -> Collections.singletonMap("Id", id))
+                            .collect(Collectors.toList()),
+                        new TypeReference<List<Container>>() {}
+                    );
+                };
+                return new ListContainersCmdImpl(exec);
+            };
+        }
+
+        private Answer<CreateContainerCmd> createContainerAnswer(String containerId) {
+            return invocation -> {
+                CreateContainerCmd.Exec exec = command -> {
+                    CreateContainerResponse response = new CreateContainerResponse();
+                    response.setId(containerId);
+                    return response;
+                };
+                return new CreateContainerCmdImpl(exec, null, "image:latest");
+            };
+        }
+
+        private Answer<StartContainerCmd> startContainerAnswer() {
+            return invocation -> {
+                StartContainerCmd.Exec exec = command -> {
+                    return null;
+                };
+                return new StartContainerCmdImpl(exec, invocation.getArgument(0));
+            };
+        }
+
+        private Answer<InspectContainerCmd> inspectContainerAnswer() {
+            return invocation -> {
+                InspectContainerCmd.Exec exec = command -> {
+                    return new InspectContainerResponse();
+                };
+                return new InspectContainerCmdImpl(exec, invocation.getArgument(0));
+            };
+        }
+
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index ad2a0be6cd3..49a378554f1 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -37,6 +37,17 @@ public void shouldReadDockerClientStrategyFromEnvironmentOnly() {
         assertEquals("Docker client strategy is changed", "foo", newConfig().getDockerClientStrategyClassName());
     }
 
+    @Test
+    public void shouldReadReuseFromEnvironmentOnly() {
+        assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
+
+        classpathProperties.setProperty("testcontainers.reuse.enable", "true");
+        assertFalse("reuse is not affected by classpath properties", newConfig().environmentSupportsReuse());
+
+        environmentProperties.setProperty("testcontainers.reuse.enable", "true");
+        assertTrue("reuse enabled", newConfig().environmentSupportsReuse());
+    }
+
     private TestcontainersConfiguration newConfig() {
         return new TestcontainersConfiguration(environmentProperties, classpathProperties);
     }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
index f2ebde857c5..f8694306384 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
@@ -45,11 +45,14 @@ public JdbcDatabaseContainer newInstance() {
      * @return Instance of {@link JdbcDatabaseContainer}
      */
     public JdbcDatabaseContainer newInstance(ConnectionUrl url) {
+        final JdbcDatabaseContainer result;
         if (url.getImageTag().isPresent()) {
-            return newInstance(url.getImageTag().get());
+            result = newInstance(url.getImageTag().get());
         } else {
-            return newInstance();
+            result = newInstance();
         }
+        result.withReuse(url.isReusable());
+        return result;
     }
 
     protected JdbcDatabaseContainer newInstanceFromConnectionUrl(ConnectionUrl connectionUrl, final String userParamName, final String pwdParamName) {
@@ -59,7 +62,7 @@ protected JdbcDatabaseContainer newInstanceFromConnectionUrl(ConnectionUrl conne
         final String user = connectionUrl.getQueryParameters().getOrDefault(userParamName, "test");
         final String password = connectionUrl.getQueryParameters().getOrDefault(pwdParamName, "test");
 
-        final JdbcDatabaseContainer instance;
+        final JdbcDatabaseContainer<?> instance;
         if (connectionUrl.getImageTag().isPresent()) {
             instance = newInstance(connectionUrl.getImageTag().get());
         } else {
@@ -67,6 +70,7 @@ protected JdbcDatabaseContainer newInstanceFromConnectionUrl(ConnectionUrl conne
         }
 
         return instance
+            .withReuse(connectionUrl.isReusable())
             .withDatabaseName(databaseName)
             .withUsername(user)
             .withPassword(password);
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index e236d723c82..4c590474bf7 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -13,6 +13,7 @@
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import org.testcontainers.UnstableAPI;
 
 import static java.util.stream.Collectors.toMap;
 
@@ -49,6 +50,9 @@ public class ConnectionUrl {
 
     private Optional<String> initScriptPath = Optional.empty();
 
+    @UnstableAPI
+    private boolean reusable = false;
+
     private Optional<InitFunctionDef> initFunction = Optional.empty();
 
     private Optional<String> queryString;
@@ -132,6 +136,8 @@ private void parseUrl() {
 
         initScriptPath = Optional.ofNullable(containerParameters.get("TC_INITSCRIPT"));
 
+        reusable = Boolean.parseBoolean(containerParameters.get("TC_REUSABLE"));
+
         Matcher funcMatcher = Patterns.INITFUNCTION_MATCHING_PATTERN.matcher(this.getUrl());
         if (funcMatcher.matches()) {
             initFunction = Optional.of(new InitFunctionDef(funcMatcher.group(2), funcMatcher.group(4)));
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index 6d3df6c7cc5..c5413fe7efb 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -151,7 +151,7 @@ public synchronized Connection connect(String url, final Properties info) throws
      */
     private Connection wrapConnection(final Connection connection, final JdbcDatabaseContainer container, final ConnectionUrl connectionUrl) {
 
-        final boolean isDaemon = connectionUrl.isInDaemonMode();
+        final boolean isDaemon = connectionUrl.isInDaemonMode() || connectionUrl.isReusable();
 
         Set<Connection> connections = containerConnections.computeIfAbsent(container.getContainerId(), k -> new HashSet<>());
 

From 92f0a4f7ffb9d46023ec77e6588e74831ee8e29f Mon Sep 17 00:00:00 2001
From: Benjamin Muskalla <b.muskalla@gmail.com>
Date: Sat, 26 Oct 2019 10:35:38 +0200
Subject: [PATCH 0354/4969] Allow @Testcontainers to be inherited from
 superclass (#1843) (#2001)

* Updated existing test with now expected behaviour
* @Testcontainers is now @Inherited
---
 .../org/testcontainers/junit/jupiter/Testcontainers.java    | 6 ++++++
 .../junit/jupiter/inheritance/AbstractTestBase.java         | 2 --
 .../junit/jupiter/inheritance/InheritedTests.java           | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
index 6a364cd19e6..8e05dfdc576 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -18,6 +19,10 @@
  * last test method has executed. Containers declared as instance fields will
  * be started and stopped for every test method.</p>
  *
+ * <p>The annotation {@code @Testcontainers} can be used on a superclass in
+ * the test hierarchy as well. All subclasses will automatically inherit
+ * support for the extension.</p>
+ *
  * <p><strong>Note:</strong> This extension has only be tested with sequential
  * test execution. Using it with parallel test execution is unsupported and
  * may have unintended side effects.</p>
@@ -52,6 +57,7 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(TestcontainersExtension.class)
+@Inherited
 public @interface Testcontainers {
 
     /**
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java
index 930f16f035d..3766c3f7a60 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java
@@ -3,8 +3,6 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 @Testcontainers
 abstract class AbstractTestBase {
 
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
index 37e535d25e7..f050e428692 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
@@ -6,7 +6,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Testcontainers
 class InheritedTests extends AbstractTestBase {
 
     @Container

From 12cb54baa4f702c8d5dd9f05a0194114e061c6ed Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 26 Oct 2019 12:44:40 +0300
Subject: [PATCH 0355/4969] Update mkdocs.yml to 1.12.3

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 976c1b7c95f..5c78e884662 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -83,4 +83,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.12.2
+    latest_version: 1.12.3

From 71e3d75d4897399c788c276f9f86d0023bbeb862 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 09:28:17 +0000
Subject: [PATCH 0356/4969] Bump influxdb-java from 2.15 to 2.16 in
 /modules/influxdb (#2010)

---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index d122f786591..186174c242f 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.15'
+    compileOnly 'org.influxdb:influxdb-java:2.16'
     testCompile 'org.influxdb:influxdb-java:2.15'
 }

From 8fbd1f8a9c0966781db939718141daa50e8e1bb3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 09:40:24 +0000
Subject: [PATCH 0357/4969] Bump assertj-core from 3.13.2 to 3.14.0 in
 /modules/pulsar (#2009)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.13.2 to 3.14.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.13.2...assertj-core-3.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 05d9a711420..046debc2b9b 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.4.1'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.14.0'
 }

From 63099ca0c8e2f44ff62558307a1398a3b9cbb074 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 09:40:37 +0000
Subject: [PATCH 0358/4969] Bump assertj-core from 3.13.2 to 3.14.0 in
 /modules/neo4j (#2006)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.13.2 to 3.14.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.13.2...assertj-core-3.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 4889196ccef..00e1e36f8b7 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -30,5 +30,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.13.2'
+    testCompile 'org.assertj:assertj-core:3.14.0'
 }

From eb69320384a8c2988f17907b297760a0d4cf0167 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 09:48:44 +0000
Subject: [PATCH 0359/4969] =?UTF-8?q?Bump=20assertj-core=20from=203.13.2?=
 =?UTF-8?q?=20to=203.14.0=20in=20/modules/database-co=E2=80=A6=20(#2007)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.13.2 to 3.14.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.13.2...assertj-core-3.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 7c820909d61..ea3e0b07360 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.13.2'
+    testCompile 'org.assertj:assertj-core:3.14.0'
 }

From 0940e0caa58a44e902c2d0345fc72eb99ba4f997 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 09:49:13 +0000
Subject: [PATCH 0360/4969] Bump kafka-clients from 2.3.0 to 2.3.1 in
 /modules/kafka (#2002)

Bumps kafka-clients from 2.3.0 to 2.3.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 9d86482cf2f..f53c428886f 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.3.0'
+    testCompile 'org.apache.kafka:kafka-clients:2.3.1'
     testCompile 'org.assertj:assertj-core:3.13.2'
     testCompile 'com.google.guava:guava:23.0'
 }

From 5b24a298fad5cc3f432c7a7627d1c3d43a0c01c6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 09:49:40 +0000
Subject: [PATCH 0361/4969] Bump assertj-core from 3.13.2 to 3.14.0 in /core
 (#2005)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.13.2 to 3.14.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.13.2...assertj-core-3.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2b631f46bce..a580d73c340 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -115,12 +115,12 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.13.2'
+    testCompile 'org.assertj:assertj-core:3.14.0'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
-    jarFileTestCompile 'org.assertj:assertj-core:3.12.2'
+    jarFileTestCompile 'org.assertj:assertj-core:3.14.0'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
 }

From 3725b791d11d0251e3e3b900b94a5a2b4003c2be Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 11:12:47 +0000
Subject: [PATCH 0362/4969] Bump assertj-core from 3.13.2 to 3.14.0 in
 /modules/kafka (#2008)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index f53c428886f..d9d7c20ca4a 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.3.1'
-    testCompile 'org.assertj:assertj-core:3.13.2'
+    testCompile 'org.assertj:assertj-core:3.14.0'
     testCompile 'com.google.guava:guava:23.0'
 }

From c5c24a55e62e4610c23adbd7a30138b0ee4045b9 Mon Sep 17 00:00:00 2001
From: David Harris <toadzky@gmail.com>
Date: Wed, 30 Oct 2019 08:44:58 -0600
Subject: [PATCH 0363/4969] Slf4jLogConsumer improvements (#1986)

* Adds support for MDC in Slf4jLogConsumer

* Uses SLF4J levels instead of including the level as part of the message

* make separation of output streams to different log levels configurable

* use `with` prefix on method
---
 .../containers/output/Slf4jLogConsumer.java   | 65 ++++++++++++++++---
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
index 26b017d4a36..a274cd63004 100644
--- a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
@@ -1,16 +1,27 @@
 package org.testcontainers.containers.output;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.slf4j.Logger;
+import org.slf4j.MDC;
 
 /**
  * A consumer for container output that logs output to an SLF4J logger.
  */
 public class Slf4jLogConsumer extends BaseConsumer<Slf4jLogConsumer> {
     private final Logger logger;
+    private final Map<String, String> mdc = new HashMap<>();
+    private boolean separateOutputStreams;
     private String prefix = "";
 
     public Slf4jLogConsumer(Logger logger) {
+        this(logger, false);
+    }
+
+    public Slf4jLogConsumer(Logger logger, boolean separateOutputStreams) {
         this.logger = logger;
+        this.separateOutputStreams = separateOutputStreams;
     }
 
     public Slf4jLogConsumer withPrefix(String prefix) {
@@ -18,21 +29,57 @@ public Slf4jLogConsumer withPrefix(String prefix) {
         return this;
     }
 
+    public Slf4jLogConsumer withMdc(String key, String value) {
+        mdc.put(key, value);
+        return this;
+    }
+
+    public Slf4jLogConsumer withMdc(Map<String, String> mdc) {
+        this.mdc.putAll(mdc);
+        return this;
+    }
+
+    public Slf4jLogConsumer withSeparateOutputStreams() {
+        this.separateOutputStreams = true;
+        return this;
+    }
+
     @Override
     public void accept(OutputFrame outputFrame) {
         OutputFrame.OutputType outputType = outputFrame.getType();
 
         String utf8String = outputFrame.getUtf8String();
         utf8String = utf8String.replaceAll(FrameConsumerResultCallback.LINE_BREAK_AT_END_REGEX, "");
-        switch (outputType) {
-            case END:
-                break;
-            case STDOUT:
-            case STDERR:
-                logger.info("{}{}: {}", prefix, outputType, utf8String);
-                break;
-            default:
-                throw new IllegalArgumentException("Unexpected outputType " + outputType);
+
+        Map<String, String> originalMdc = MDC.getCopyOfContextMap();
+        MDC.setContextMap(mdc);
+        try {
+            switch (outputType) {
+                case END:
+                    break;
+                case STDOUT:
+                    if (separateOutputStreams) {
+                        logger.info("{}{}", prefix.isEmpty() ? "" : (prefix + ": "), utf8String);
+                    } else {
+                        logger.info("{}{}: {}", prefix, outputType, utf8String);
+                    }
+                    break;
+                case STDERR:
+                    if (separateOutputStreams) {
+                        logger.error("{}{}", prefix.isEmpty() ? "" : (prefix + ": "), utf8String);
+                    } else {
+                        logger.info("{}{}: {}", prefix, outputType, utf8String);
+                    }
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unexpected outputType " + outputType);
+            }
+        } finally {
+            if (originalMdc == null) {
+                MDC.clear();
+            } else {
+                MDC.setContextMap(originalMdc);
+            }
         }
     }
 }

From a2ecd4b813aba905eaa56159a17e2ec0820d93d9 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 30 Oct 2019 14:47:04 +0000
Subject: [PATCH 0364/4969] Slf4j log consumer improvements - add docs (#2016)

---
 docs/features/container_logs.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/features/container_logs.md b/docs/features/container_logs.md
index a9e2832eb70..d603981059a 100644
--- a/docs/features/container_logs.md
+++ b/docs/features/container_logs.md
@@ -36,6 +36,25 @@ Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
 container.followOutput(logConsumer);
 ```
 
+By default both standard out and standard error will both be emitted at INFO level. 
+Standard error may be emitted at ERROR level, if desired:
+
+```java
+Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log).withSeparateOutputStreams()
+```
+
+The [Mapped Diagnostic Context (MDC)](http://logback.qos.ch/manual/mdc.html) for emitted messages may be configured using the `withMdc(...)` option:
+
+```java
+Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log).withMdc("key", "value")
+```
+
+or using an existing map of key-value pairs:
+
+```java
+Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log).withMdc(map)
+```
+
 ### Capturing container output as a String
 
 To stream logs live or customize the decoding, `ToStringConsumer` may be used:

From a753bb1bd1aa132ac89463393a1b9c037197ec77 Mon Sep 17 00:00:00 2001
From: Yuri Orlov <yuri.n.orlov@gmail.com>
Date: Wed, 30 Oct 2019 17:47:37 +0300
Subject: [PATCH 0365/4969] Small code style fix (#2004)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../java/org/testcontainers/utility/CommandLine.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/CommandLine.java b/core/src/main/java/org/testcontainers/utility/CommandLine.java
index 65788357898..a217823c40f 100644
--- a/core/src/main/java/org/testcontainers/utility/CommandLine.java
+++ b/core/src/main/java/org/testcontainers/utility/CommandLine.java
@@ -35,12 +35,11 @@ public static String runShellCommand(String... command) {
         LOGGER.debug("Executing shell command: `{}`", joinedCommand);
 
         try {
-            ProcessResult result;
-            result = new ProcessExecutor()
-                    .command(command)
-                    .readOutput(true)
-                    .exitValueNormal()
-                    .execute();
+            ProcessResult result = new ProcessExecutor()
+                .command(command)
+                .readOutput(true)
+                .exitValueNormal()
+                .execute();
 
             return result.outputUTF8().trim();
         } catch (IOException | InterruptedException | TimeoutException | InvalidExitValueException e) {

From 9a31ab351b3697dd29369f82b504c3fc43339de8 Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Wed, 30 Oct 2019 15:50:22 +0100
Subject: [PATCH 0366/4969] Fix vault module, add new test with java client v2
 (#1791)

* fix vault module, add new test with java client

(cherry picked from commit 8931f8643bdda8edc5318b76ea5f27f9cf98d271)

* adds test for try with resource

adds tests for default constructor

sets default image to vault:latest

* Update VaultContainer.java

* Update VaultContainer.java

* Update VaultClientTest.java

* Update VaultContainer.java

* Update VaultContainerTest.java

* fix vault cli test

* Update modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java

Co-Authored-By: Richard North <rich.north@gmail.com>

* * Use health endpoint for discovering vault readiness
* Move customizations to constructor to allow overrides
* Use a single startup attempt, as 1 should be sufficient


Co-authored-by: Roberto Franchini <ro.franchini@gmail.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/vault/build.gradle                    |  3 +
 .../testcontainers/vault/VaultContainer.java  | 66 ++++++++-----------
 .../testcontainers/vault/VaultClientTest.java | 58 ++++++++++++++++
 .../vault/VaultContainerTest.java             | 63 +++++++++---------
 4 files changed, 118 insertions(+), 72 deletions(-)
 create mode 100644 modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index b37a74602ff..052446bef6f 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,5 +3,8 @@ description = "Testcontainers :: Vault"
 dependencies {
     compile project(':testcontainers')
 
+    testCompile 'com.bettercloud:vault-java-driver:4.0.0'
     testCompile 'io.rest-assured:rest-assured:4.1.2'
+    testCompile 'org.assertj:assertj-core:3.12.0'
+
 }
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 3f0f7684e82..ac4e730adb3 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -2,11 +2,10 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.traits.LinkableContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,33 +17,30 @@
  * GenericContainer subclass for Vault specific configuration and features. The main feature is the
  * withSecretInVault method, where users can specify which secrets to be pre-loaded into Vault for
  * their specific test scenario.
- *
+ * <p>
  * Other helpful features include the withVaultPort, and withVaultToken methods for convenience.
  */
-public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericContainer<SELF>
-        implements LinkableContainer {
+public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericContainer<SELF> {
 
-    private static final String VAULT_PORT = "8200";
-
-    private boolean vaultPortRequested = false;
+    private static final int VAULT_PORT = 8200;
 
     private Map<String, List<String>> secretsMap = new HashMap<>();
 
+    private int port = VAULT_PORT;
+
     public VaultContainer() {
-        this("vault:0.7.0");
+        this("vault:1.1.3");
     }
 
     public VaultContainer(String dockerImageName) {
         super(dockerImageName);
-    }
 
-    @Override
-    protected void configure() {
-        setStartupAttempts(3);
+        // Use the vault healthcheck endpoint to check for readiness, per https://www.vaultproject.io/api/system/health.html
+        setWaitStrategy(Wait.forHttp("/v1/sys/health").forStatusCode(200));
+
         withCreateContainerCmdModifier(cmd -> cmd.withCapAdd(IPC_LOCK));
-        if(!isVaultPortRequested()){
-            withEnv("VAULT_ADDR", "http://0.0.0.0:" + VAULT_PORT);
-        }
+        withEnv("VAULT_ADDR", "http://0.0.0.0:" + port);
+        withExposedPorts(port);
     }
 
     @Override
@@ -53,11 +49,10 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
     }
 
     private void addSecrets() {
-        if(!secretsMap.isEmpty()){
+        if (!secretsMap.isEmpty()) {
             try {
                 this.execInContainer(buildExecCommand(secretsMap)).getStdout().contains("Success");
-            }
-            catch (IOException | InterruptedException e) {
+            } catch (IOException | InterruptedException e) {
                 logger().error("Failed to add these secrets {} into Vault via exec command. Exception message: {}", secretsMap, e.getMessage());
             }
         }
@@ -66,10 +61,10 @@ private void addSecrets() {
     private String[] buildExecCommand(Map<String, List<String>> map) {
         StringBuilder stringBuilder = new StringBuilder();
         map.forEach((path, secrets) -> {
-            stringBuilder.append(" && vault write " + path);
+            stringBuilder.append(" && vault kv put " + path);
             secrets.forEach(item -> stringBuilder.append(" " + item));
         });
-        return new String[] { "/bin/sh", "-c", stringBuilder.toString().substring(4)};
+        return new String[]{"/bin/sh", "-c", stringBuilder.toString().substring(4)};
     }
 
     /**
@@ -89,45 +84,36 @@ public SELF withVaultToken(String token) {
      *
      * @param port the port number you want to have the Vault container listen on for tests.
      * @return this
+     * @deprecated the exposed port will be randomized automatically. As calling this method provides no additional value, you are recommended to remove the call. getFirstMappedPort() may be used to obtain the listening vault port.
      */
-    public SELF withVaultPort(int port){
-        setVaultPortRequested(true);
-        String vaultPort = String.valueOf(port);
-        withEnv("VAULT_ADDR", "http://0.0.0.0:" + VAULT_PORT);
-        setPortBindings(Arrays.asList(vaultPort + ":" + VAULT_PORT));
+    @Deprecated
+    public SELF withVaultPort(int port) {
+        this.port = port;
         return self();
     }
 
     /**
      * Pre-loads secrets into Vault container. User may specify one or more secrets and all will be added to each path
      * that is specified. Thus this can be called more than once for multiple paths to be added to Vault.
-     *
+     * <p>
      * The secrets are added to vault directly after the container is up via the
      * {@link #addSecrets() addSecrets}, called from {@link #containerIsStarted(InspectContainerResponse) containerIsStarted}
      *
-     * @param path specific Vault path to store specified secrets
-     * @param firstSecret first secret to add to specifed path
+     * @param path             specific Vault path to store specified secrets
+     * @param firstSecret      first secret to add to specifed path
      * @param remainingSecrets var args list of secrets to add to specified path
      * @return this
      */
     public SELF withSecretInVault(String path, String firstSecret, String... remainingSecrets) {
         List<String> list = new ArrayList<>();
         list.add(firstSecret);
-        for(String secret : remainingSecrets) {
+        for (String secret : remainingSecrets) {
             list.add(secret);
         }
         if (secretsMap.containsKey(path)) {
             list.addAll(list);
         }
-        secretsMap.putIfAbsent(path,list);
+        secretsMap.putIfAbsent(path, list);
         return self();
     }
-
-    private void setVaultPortRequested(boolean vaultPortRequested) {
-        this.vaultPortRequested = vaultPortRequested;
-    }
-
-    private boolean isVaultPortRequested() {
-        return vaultPortRequested;
-    }
-}
\ No newline at end of file
+}
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
new file mode 100644
index 00000000000..8091980d234
--- /dev/null
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
@@ -0,0 +1,58 @@
+package org.testcontainers.vault;
+
+import com.bettercloud.vault.Vault;
+import com.bettercloud.vault.VaultConfig;
+import com.bettercloud.vault.VaultException;
+import com.bettercloud.vault.response.LogicalResponse;
+import org.junit.Test;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class VaultClientTest {
+
+    private static final String VAULT_TOKEN = "my-root-token";
+
+    @Test
+    public void writeAndReadMultipleValues() throws VaultException {
+        try (
+            VaultContainer vaultContainer = new VaultContainer<>()
+                    .withVaultToken(VAULT_TOKEN)
+        ) {
+
+            vaultContainer.start();
+
+            final VaultConfig config = new VaultConfig()
+                .address("http://" + vaultContainer.getContainerIpAddress() + ":" + vaultContainer.getFirstMappedPort())
+                .token(VAULT_TOKEN)
+                .build();
+
+            final Vault vault = new Vault(config);
+
+            final Map<String, Object> secrets = new HashMap<>();
+            secrets.put("value", "world");
+            secrets.put("other_value", "another world");
+
+            // Write operation
+            final LogicalResponse writeResponse = vault.logical()
+                .write("secret/hello", secrets);
+
+            assertThat(writeResponse.getRestResponse().getStatus()).isEqualTo(200);
+
+            // Read operation
+            final Map<String, String> value = vault.logical()
+                .read("secret/hello")
+                .getData();
+
+
+            assertThat(value)
+                .containsEntry("value", "world")
+                .containsEntry("other_value", "another world");
+
+        }
+
+    }
+}
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index 5e1c55b33ac..fae9209c8e7 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -3,13 +3,11 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.Wait;
 
 import java.io.IOException;
 
 import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -18,32 +16,31 @@
  */
 public class VaultContainerTest {
 
-    private static final int VAULT_PORT = 8201; //using non-default port to show other ports can be passed besides 8200
-
     private static final String VAULT_TOKEN = "my-root-token";
 
     @ClassRule
     public static VaultContainer vaultContainer = new VaultContainer<>()
-            .withVaultToken(VAULT_TOKEN)
-            .withVaultPort(VAULT_PORT)
-            .withSecretInVault("secret/testing1", "top_secret=password123")
-            .withSecretInVault("secret/testing2", "secret_one=password1",
-                    "secret_two=password2", "secret_three=password3", "secret_three=password3",
-                    "secret_four=password4")
-            .waitingFor(Wait.forHttp("/v1/secret/testing1").forStatusCode(400));
+        .withVaultToken(VAULT_TOKEN)
+        .withSecretInVault("secret/testing1", "top_secret=password123")
+        .withSecretInVault("secret/testing2",
+            "secret_one=password1",
+            "secret_two=password2",
+            "secret_three=password3",
+            "secret_three=password3",
+            "secret_four=password4");
 
     @Test
     public void readFirstSecretPathWithCli() throws IOException, InterruptedException {
-        GenericContainer.ExecResult result = vaultContainer.execInContainer("vault",
-                "read", "-field=top_secret", "secret/testing1");
-        assertThat(result.getStdout(), containsString("password123"));
+        GenericContainer.ExecResult result = vaultContainer.execInContainer("vault", "kv", "get", "-format=json", "secret/testing1");
+        final String output = result.getStdout().replaceAll("\\r?\\n", "");
+        assertThat(output, containsString("password123"));
     }
 
     @Test
     public void readSecondSecretPathWithCli() throws IOException, InterruptedException {
-        GenericContainer.ExecResult result = vaultContainer.execInContainer("vault",
-                "read", "secret/testing2");
-        String output = result.getStdout();
+        GenericContainer.ExecResult result = vaultContainer.execInContainer("vault", "kv", "get", "-format=json", "secret/testing2");
+        final String output = result.getStdout().replaceAll("\\r?\\n", "");
+        System.out.println("output = " + output);
         assertThat(output, containsString("password1"));
         assertThat(output, containsString("password2"));
         assertThat(output, containsString("password3"));
@@ -54,26 +51,28 @@ public void readSecondSecretPathWithCli() throws IOException, InterruptedExcepti
     public void readFirstSecretPathOverHttpApi() throws InterruptedException {
         given().
             header("X-Vault-Token", VAULT_TOKEN).
-        when().
-            get("http://"+getHostAndPort()+"/v1/secret/testing1").
-        then().
-            assertThat().body("data.top_secret", equalTo("password123"));
+            when().
+            get("http://" + getHostAndPort() + "/v1/secret/data/testing1").
+            then().
+            assertThat().body("data.data.top_secret", equalTo("password123"));
     }
 
     @Test
-    public void readSecondecretPathOverHttpApi() throws InterruptedException {
+    public void readSecondSecretPathOverHttpApi() throws InterruptedException {
         given().
             header("X-Vault-Token", VAULT_TOKEN).
-        when().
-            get("http://"+getHostAndPort()+"/v1/secret/testing2").
-        then().
-            assertThat().body("data.secret_one", containsString("password1")).
-            assertThat().body("data.secret_two", containsString("password2")).
-            assertThat().body("data.secret_three", containsString("password3")).
-            assertThat().body("data.secret_four", containsString("password4"));
+            when().
+            get("http://" + getHostAndPort() + "/v1/secret/data/testing2").
+            then().
+            assertThat().body("data.data.secret_one", containsString("password1")).
+            assertThat().body("data.data.secret_two", containsString("password2")).
+            assertThat().body("data.data.secret_three", hasItem("password3")).
+            assertThat().body("data.data.secret_four", containsString("password4"));
     }
 
-    private String getHostAndPort(){
-        return vaultContainer.getContainerIpAddress()+":"+vaultContainer.getMappedPort(8200);
+    private String getHostAndPort() {
+        return vaultContainer.getContainerIpAddress() + ":" + vaultContainer.getMappedPort(8200);
     }
+
+
 }

From 6568a5a47d9de9c3480b0e5455045b7fa8af7091 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2019 09:16:07 +0000
Subject: [PATCH 0367/4969] Bump assertj-core from 3.12.0 to 3.14.0 in
 /modules/vault (#2018)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.12.0 to 3.14.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.12.0...assertj-core-3.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 052446bef6f..145cb86bdf2 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:4.0.0'
     testCompile 'io.rest-assured:rest-assured:4.1.2'
-    testCompile 'org.assertj:assertj-core:3.12.0'
+    testCompile 'org.assertj:assertj-core:3.14.0'
 
 }

From 6d99da8f87c12cf455af9a1f7cad399f71268b21 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2019 09:16:24 +0000
Subject: [PATCH 0368/4969] Bump vault-java-driver from 4.0.0 to 5.0.0 in
 /modules/vault (#2019)

Bumps [vault-java-driver](https://github.com/BetterCloud/vault-java-driver) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/BetterCloud/vault-java-driver/releases)
- [Commits](https://github.com/BetterCloud/vault-java-driver/compare/v4.0.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 145cb86bdf2..55249f74fb0 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Vault"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'com.bettercloud:vault-java-driver:4.0.0'
+    testCompile 'com.bettercloud:vault-java-driver:5.0.0'
     testCompile 'io.rest-assured:rest-assured:4.1.2'
     testCompile 'org.assertj:assertj-core:3.14.0'
 

From 7ab24309e6821c22f90e3516ad4bcd8dd5c1a187 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2019 11:28:57 +0000
Subject: [PATCH 0369/4969] Bump jna-platform from 5.4.0 to 5.5.0 in /core
 (#2017)

Bumps [jna-platform](https://github.com/java-native-access/jna) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/java-native-access/jna/releases)
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.4.0...5.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 a580d73c340..d6b862852e3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -76,7 +76,7 @@ dependencies {
         exclude(group: "log4j", module: "log4j")
     }
 
-    compile "net.java.dev.jna:jna-platform:5.4.0"
+    compile "net.java.dev.jna:jna-platform:5.5.0"
 
     shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.0') {
         exclude(group: "net.java.dev.jna")

From 87bae54f236971f89b05a16e0e7d747eff0aa28d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 2 Nov 2019 19:35:06 +0000
Subject: [PATCH 0370/4969] Fix docker image name parsing bugs (#2022)

* Fix DockerImageName secondary constructor

It was cutting down last char of registry name

* Add comprehensive unit tests for parsing of image names

* Fix bug

* Reduce assumptions repeated in test

* Switch to using parameterized tests
---
 .../utility/DockerImageName.java              |   4 +-
 .../utility/DockerImageNameTest.java          | 133 ++++++++++++++----
 2 files changed, 105 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
index bd1c713e26a..d57f1044e80 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
@@ -61,13 +61,13 @@ public DockerImageName(String name, String tag) {
             registry = "";
             remoteName = name;
         } else {
-            registry = name.substring(0, slashIndex - 1);
+            registry = name.substring(0, slashIndex);
             remoteName = name.substring(slashIndex + 1);
         }
 
         if (tag.startsWith("sha256:")) {
             repo = remoteName;
-            versioning = new Sha256Versioning(tag);
+            versioning = new Sha256Versioning(tag.replace("sha256:", ""));
         } else {
             repo = remoteName;
             versioning = new TagVersioning(tag);
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index caef1bcf9ec..37d2472949f 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -1,46 +1,119 @@
 package org.testcontainers.utility;
 
 import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.rnorth.visibleassertions.VisibleAssertions;
 
-import static org.junit.Assert.fail;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
+@RunWith(Enclosed.class)
 public class DockerImageNameTest {
 
-    @Test
-    public void validNames() {
-        testValid("myname:latest");
-        testValid("myname:latest");
-        testValid("repo/my-name:1.0");
-        testValid("repo.foo.com:1234/my-name:1.0");
-        testValid("repo.foo.com/my-name:1.0");
-        testValid("repo.foo.com:1234/repo_here/my-name:1.0");
-        testValid("repo.foo.com:1234/repo-here/my-name@sha256:1234abcd1234abcd1234abcd1234abcd");
-        testValid("repo.foo.com:1234/my-name@sha256:1234abcd1234abcd1234abcd1234abcd");
-        testValid("1.2.3.4/my-name:1.0");
-        testValid("1.2.3.4:1234/my-name:1.0");
-        testValid("1.2.3.4/repo-here/my-name:1.0");
-        testValid("1.2.3.4:1234/repo-here/my-name:1.0");
-    }
+    @RunWith(Parameterized.class)
+    public static class ValidNames {
+
+        @Parameterized.Parameters(name = "{0}")
+        public static String[] getNames() {
+            return new String[]{"myname:latest",
+                "myname:latest",
+                "repo/my-name:1.0",
+                "registry.foo.com:1234/my-name:1.0",
+                "registry.foo.com/my-name:1.0",
+                "registry.foo.com:1234/repo_here/my-name:1.0",
+                "registry.foo.com:1234/repo-here/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
+                "registry.foo.com:1234/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
+                "1.2.3.4/my-name:1.0",
+                "1.2.3.4:1234/my-name:1.0",
+                "1.2.3.4/repo-here/my-name:1.0",
+                "1.2.3.4:1234/repo-here/my-name:1.0"};
+        }
 
-    @Test
-    public void invalidNames() {
-        testInvalid(":latest");
-        testInvalid("/myname:latest");
-        testInvalid("/myname@sha256:latest");
-        testInvalid("/myname@sha256:gggggggggggggggggggggggggggggggg");
-        testInvalid("repo:notaport/myname:latest");
+        @Parameterized.Parameter
+        public String imageName;
+
+        @Test
+        public void testValidNameAccepted() {
+            new DockerImageName(imageName).assertValid();
+        }
     }
 
-    private void testValid(String s) {
-        new DockerImageName(s).assertValid();
+    @RunWith(Parameterized.class)
+    public static class InvalidNames {
+
+        @Parameterized.Parameters(name = "{0}")
+        public static String[] getNames() {
+            return new String[]{":latest",
+                "/myname:latest",
+                "/myname@sha256:latest",
+                "/myname@sha256:gggggggggggggggggggggggggggggggg",
+                "repo:notaport/myname:latest"};
+        }
+
+        @Parameterized.Parameter
+        public String imageName;
+
+        @Test(expected = IllegalArgumentException.class)
+        public void testInvalidNameRejected() {
+            new DockerImageName(imageName).assertValid();
+        }
     }
 
-    private void testInvalid(String myname) {
-        try {
-            new DockerImageName(myname).assertValid();
-            fail();
-        } catch (IllegalArgumentException expected) {
+    @RunWith(Parameterized.class)
+    public static class Parsing {
+
+        @Parameterized.Parameters(name = "{0}{1}{2}{3}{4}")
+        public static String[][] getNames() {
+            return new String[][]{
+                {"", "", "myname", ":", "latest"},
+                {"", "", "repo/myname", ":", "latest"},
+                {"registry.foo.com:1234", "/", "my-name", ":", "1.0"},
+                {"registry.foo.com", "/", "my-name", ":", "1.0"},
+                {"registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"},
+                {"1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"},
+                {"1.2.3.4:1234", "/", "my-name", ":", "1.0"},
+                {"", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
+                {"", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
+                {"registry.foo.com:1234", "/", "repo-here/my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
+                {"registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
+                {"1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
+                {"1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
+                {"1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
+                {"1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"}
+            };
+        }
+
+        @Parameterized.Parameter(0)
+        public String registry;
+        @Parameterized.Parameter(1)
+        public String registrySeparator;
+        @Parameterized.Parameter(2)
+        public String repo;
+        @Parameterized.Parameter(3)
+        public String versionSeparator;
+        @Parameterized.Parameter(4)
+        public String version;
+
+        @Test
+        public void testParsing() {
+            final String unversionedPart = registry + registrySeparator + repo;
+            final String combined = unversionedPart + versionSeparator + version;
+
+            VisibleAssertions.context("For " + combined);
+            VisibleAssertions.context("Using single-arg constructor:", 2);
+
+            final DockerImageName imageName = new DockerImageName(combined);
+            assertEquals(combined + " has registry address: " + registry, registry, imageName.getRegistry());
+            assertEquals(combined + " has unversioned part: " + unversionedPart, unversionedPart, imageName.getUnversionedPart());
+            assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
+
+            VisibleAssertions.context("Using two-arg constructor:", 2);
 
+            final DockerImageName imageNameFromSecondaryConstructor = new DockerImageName(unversionedPart, version);
+            assertEquals(combined + " has registry address: " + registry, registry, imageNameFromSecondaryConstructor.getRegistry());
+            assertEquals(combined + " has unversioned part: " + unversionedPart, unversionedPart, imageNameFromSecondaryConstructor.getUnversionedPart());
+            assertEquals(combined + " has version part: " + version, version, imageNameFromSecondaryConstructor.getVersionPart());
         }
     }
 }

From 033f51d531dcb2410d3f560b1430ad01cd4c93b0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2019 19:32:39 +0100
Subject: [PATCH 0371/4969] Bump slf4j-api from 1.7.28 to 1.7.29 in /examples
 (#2031)

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.28 to 1.7.29.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 1680aa3b963..eb10aed7159 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ repositories {
     jcenter()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.28'
+    compileOnly 'org.slf4j:slf4j-api:1.7.29'
     implementation 'com.squareup.okhttp3:okhttp:3.14.4'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.8'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index e339878813c..8b133f0cc1b 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.28'
+    compileOnly 'org.slf4j:slf4j-api:1.7.29'
     implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 727c1649b07..a95000e8d71 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.28'
+    compileOnly 'org.slf4j:slf4j-api:1.7.29'
     implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 250eb755632..6cb2e6d77c5 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.28'
+    compileOnly 'org.slf4j:slf4j-api:1.7.29'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:testcontainers'

From 9b1077bb86ee6bad919915aeb8e70504101c77ab Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Wed, 6 Nov 2019 12:56:29 +0100
Subject: [PATCH 0372/4969] Compare to `0` instead of expecting `1` in
 `TestEnvironmentTest` (#2036)

Future-proofing `TestEnvironmentTest` by making sure we rely
on `Comparable#compareTo` contract and not on
`ComparableVersion`'s implementation details.
---
 .../java/org/testcontainers/utility/TestEnvironmentTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java b/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
index f34df95137c..de97d100a39 100644
--- a/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
@@ -11,7 +11,7 @@ public class TestEnvironmentTest {
 
     @Test
     public void testCompareVersionGreaterThanSameMajor() {
-        assertTrue("1.22 > 1.20", new ComparableVersion("1.22").compareTo(new ComparableVersion("1.20")) == 1);
+        assertTrue("1.22 > 1.20", new ComparableVersion("1.22").compareTo(new ComparableVersion("1.20")) > 0);
     }
 
     @Test
@@ -21,7 +21,7 @@ public void testCompareVersionEqual() {
 
     @Test
     public void testCompareVersionGreaterThan() {
-        assertTrue("2.10 > 1.20", new ComparableVersion("2.10").compareTo(new ComparableVersion("1.20")) == 1);
+        assertTrue("2.10 > 1.20", new ComparableVersion("2.10").compareTo(new ComparableVersion("1.20")) > 0);
     }
 
     @Test

From 3b308b862fde3afafb6a78b51106e96011ae541d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 9 Nov 2019 08:26:16 +0000
Subject: [PATCH 0373/4969] Localstack support for HOSTNAME_EXTERNAL (#1891)

* Infer sensible default for HOSTNAME_EXTERNAL

Co-authored-by: CauchyPeano <431522+CauchyPeano@users.noreply.github.com>

* Restore import style

* Update modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java

Co-Authored-By: Sergei Egorov <bsideup@gmail.com>

* Use nested containers for Localstack tests
---
 .editorconfig                                 |   8 +
 .../containers/GenericContainer.java          |   1 +
 docs/modules/localstack.md                    |  49 ++++--
 modules/localstack/build.gradle               |   4 +-
 .../localstack/LocalStackContainer.java       |  19 +++
 .../localstack/LocalstackContainerTest.java   | 152 ++++++++++++++++++
 .../localstack/SimpleLocalstackTest.java      |  93 -----------
 7 files changed, 217 insertions(+), 109 deletions(-)
 create mode 100644 modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
 delete mode 100644 modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java

diff --git a/.editorconfig b/.editorconfig
index ce20a2be466..4d023ed18d5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,3 +14,11 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.java]
+indent_style = space
+indent_size = 4
+# Never use star imports
+ij_java_names_count_to_use_import_on_demand = 99
+ij_java_class_count_to_use_import_on_demand = 99
+ij_java_layout_static_imports_separately = true
\ No newline at end of file
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index f17e8dfd0b2..c5df0d4fea1 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -616,6 +616,7 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
         }
 
         String[] envArray = env.entrySet().stream()
+                .filter(it -> it.getValue() != null)
                 .map(it -> it.getKey() + "=" + it.getValue())
                 .toArray(String[]::new);
         createCommand.withEnv(envArray);
diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 7062b684931..bf520b1fac6 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -7,24 +7,45 @@ Testcontainers module for the Atlassian's [LocalStack](https://github.com/locals
 Running LocalStack as a stand-in for AWS S3 during a test:
 
 ```java
-public class SomeTest {
+@Rule
+public LocalStackContainer localstack = new LocalStackContainer()
+        .withServices(S3);
 
-    @Rule
-    public LocalStackContainer localstack = new LocalStackContainer()
-            .withServices(S3);
+@Test
+public void someTestMethod() {
+    AmazonS3 s3 = AmazonS3ClientBuilder
+                    .standard()
+                    .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
+                    .withCredentials(localstack.getDefaultCredentialsProvider())
+                    .build();
     
-    @Test
-    public void someTestMethod() {
-        AmazonS3 s3 = AmazonS3ClientBuilder
-                        .standard()
-                        .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
-                        .withCredentials(localstack.getDefaultCredentialsProvider())
-                        .build();
-        
-                s3.createBucket("foo");
-                s3.putObject("foo", "bar", "baz");
+            s3.createBucket("foo");
+            s3.putObject("foo", "bar", "baz");
 ```
 
+Environment variables listed in [Localstack's README](https://github.com/localstack/localstack#configurations) may be used to customize Localstack's configuration. 
+Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
+
+## `HOSTNAME_EXTERNAL` and hostname-sensitive services
+
+Some Localstack APIs, such as SQS, require the container to be aware of the hostname that it is accessible on - for example, for construction of queue URLs in responses.
+
+Testcontainers will inform Localstack of the best hostname automatically, using the `HOSTNAME_EXTERNAL` environment variable:
+
+* when running the Localstack container directly without a custom network defined, it is expected that all calls to the container will be from the test host. As such, the container address will be used (typically localhost or the address where the Docker daemon is running).
+
+    <!--codeinclude-->
+    [Localstack container running without a custom network](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:without_network
+    <!--/codeinclude-->
+
+* when running the Localstack container [with a custom network defined](/features/networking/#advanced-networking), it is expected that all calls to the container will be **from other containers on that network**. `HOSTNAME_EXTERNAL` will be set to the *last* network alias that has been configured for the Localstack container.
+
+    <!--codeinclude-->
+    [Localstack container running without a custom network](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_network
+    <!--/codeinclude-->
+
+* Other usage scenarios, such as where the Localstack container is used from both the test host and containers on a custom network are not automatically supported. If you have this use case, you should set `HOSTNAME_EXTERNAL` manually.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index eacbc7bb5ae..1ee679abf98 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.479'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.479'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.636'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.636'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
 }
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index a5005abe239..36eaacba89b 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -30,6 +30,7 @@
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     public static final String VERSION = "0.9.4";
+    private static final String HOSTNAME_EXTERNAL_ENV_VAR = "HOSTNAME_EXTERNAL";
 
     private final List<Service> services = new ArrayList<>();
 
@@ -52,6 +53,19 @@ protected void configure() {
 
         withEnv("SERVICES", services.stream().map(Service::getLocalStackName).collect(Collectors.joining(",")));
 
+        String hostnameExternalReason;
+        if (getEnvMap().containsKey(HOSTNAME_EXTERNAL_ENV_VAR)) {
+            // do nothing
+            hostnameExternalReason = "explicitly as environment variable";
+        } else if (getNetwork() != null && getNetworkAliases() != null && getNetworkAliases().size() >= 1) {
+            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getNetworkAliases().get(getNetworkAliases().size() - 1));  // use the last network alias set
+            hostnameExternalReason = "to match last network alias on container with non-default network";
+        } else {
+            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getContainerIpAddress());
+            hostnameExternalReason = "to match host-routable address for container";
+        }
+        logger().info("{} environment variable set to {} ({})", HOSTNAME_EXTERNAL_ENV_VAR, getEnvMap().get(HOSTNAME_EXTERNAL_ENV_VAR), hostnameExternalReason);
+
         for (Service service : services) {
             addExposedPort(service.getPort());
         }
@@ -76,6 +90,11 @@ public LocalStackContainer withServices(Service... services) {
             .withCredentials(localstack.getDefaultCredentialsProvider())
             .build();
      </code></pre>
+     *
+     * <p><strong>Please note that this method is only intended to be used for configuring AWS SDK clients
+     * that are running on the test host. If other containers need to call this one, they should be configured
+     * specifically to do so using a Docker network and appropriate addressing.</strong></p>
+     *
      * @param service the service that is to be accessed
      * @return an {@link AwsClientBuilder.EndpointConfiguration}
      */
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
new file mode 100644
index 00000000000..1b222c0fbc7
--- /dev/null
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -0,0 +1,152 @@
+package org.testcontainers.containers.localstack;
+
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.sqs.AmazonSQS;
+import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
+import com.amazonaws.services.sqs.model.CreateQueueResult;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
+
+/**
+ * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
+ * <p>
+ * These tests attempt simple interactions with the container to verify behaviour. The bridge network tests use the
+ * Java AWS SDK, whereas the docker network tests use an AWS CLI container within the network, to simulate usage of
+ * Localstack from within a Docker network.
+ */
+@Slf4j
+@RunWith(Enclosed.class)
+public class LocalstackContainerTest {
+
+    public static class WithoutNetwork {
+
+        // without_network {
+        @ClassRule
+        public static LocalStackContainer localstack = new LocalStackContainer()
+            .withServices(S3, SQS);
+        // }
+
+        @Test
+        public void s3TestOverBridgeNetwork() throws IOException {
+            AmazonS3 s3 = AmazonS3ClientBuilder
+                .standard()
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
+                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .build();
+
+            s3.createBucket("foo");
+            s3.putObject("foo", "bar", "baz");
+
+            final List<Bucket> buckets = s3.listBuckets();
+            assertEquals("The created bucket is present", 1, buckets.size());
+            final Bucket bucket = buckets.get(0);
+
+            assertEquals("The created bucket has the right name", "foo", bucket.getName());
+            assertEquals("The created bucket has the right name", "foo", bucket.getName());
+
+            final ObjectListing objectListing = s3.listObjects("foo");
+            assertEquals("The created bucket has 1 item in it", 1, objectListing.getObjectSummaries().size());
+
+            final S3Object object = s3.getObject("foo", "bar");
+            final String content = IOUtils.toString(object.getObjectContent(), Charset.forName("UTF-8"));
+            assertEquals("The object can be retrieved", "baz", content);
+        }
+
+        @Test
+        public void sqsTestOverBridgeNetwork() {
+            AmazonSQS sqs = AmazonSQSClientBuilder.standard()
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(SQS))
+                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .build();
+
+            CreateQueueResult queueResult = sqs.createQueue("baz");
+            String fooQueueUrl = queueResult.getQueueUrl();
+            assertThat("Created queue has external hostname URL", fooQueueUrl,
+                containsString("http://" + DockerClientFactory.instance().dockerHostIpAddress() + ":" + localstack.getMappedPort(SQS.getPort())));
+
+            sqs.sendMessage(fooQueueUrl, "test");
+            final long messageCount = sqs.receiveMessage(fooQueueUrl).getMessages().stream()
+                .filter(message -> message.getBody().equals("test"))
+                .count();
+            assertEquals("the sent message can be received", 1L, messageCount);
+        }
+    }
+
+    public static class WithNetwork {
+        // with_network {
+        private static Network network = Network.newNetwork();
+
+        @ClassRule
+        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer()
+            .withNetwork(network)
+            .withNetworkAliases("notthis", "localstack")    // the last alias is used for HOSTNAME_EXTERNAL
+            .withServices(S3, SQS);
+        // }
+
+        @ClassRule
+        public static GenericContainer awsCliInDockerNetwork = new GenericContainer<>("atlassian/pipelines-awscli")
+            .withNetwork(network)
+            .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("top"))
+            .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
+            .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
+            .withEnv("AWS_REGION", "eu-west-1");
+
+
+        @Test
+        public void s3TestOverDockerNetwork() throws Exception {
+            runAwsCliAgainstDockerNetworkContainer("s3api create-bucket --bucket foo", S3.getPort());
+            runAwsCliAgainstDockerNetworkContainer("s3api list-buckets", S3.getPort());
+            runAwsCliAgainstDockerNetworkContainer("s3 ls s3://foo", S3.getPort());
+        }
+
+        @Test
+        public void sqsTestOverDockerNetwork() throws Exception {
+            final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer("sqs create-queue --queue-name baz", SQS.getPort());
+
+            assertThat("Created queue has external hostname URL", queueCreationResponse,
+                containsString("http://localstack:" + SQS.getPort()));
+
+            runAwsCliAgainstDockerNetworkContainer(
+                String.format("sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test", SQS.getPort(), SQS.getPort()), SQS.getPort());
+            final String message = runAwsCliAgainstDockerNetworkContainer(
+                String.format("sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz", SQS.getPort(), SQS.getPort()), SQS.getPort());
+
+            assertTrue("the sent message can be received", message.contains("\"Body\": \"test\""));
+        }
+
+        private String runAwsCliAgainstDockerNetworkContainer(String command, final int port) throws Exception {
+            final String[] commandParts = String.format("/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl", command, port).split(" ");
+            final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);
+            Assert.assertEquals(0, execResult.getExitCode());
+
+            final String logs = execResult.getStdout() + execResult.getStderr();
+            log.info(logs);
+            return logs;
+        }
+    }
+}
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java
deleted file mode 100644
index f3495d2d8b6..00000000000
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.testcontainers.containers.localstack;
-
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.Bucket;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
-import com.amazonaws.services.sqs.model.CreateQueueResult;
-import com.amazonaws.services.sqs.model.Message;
-import org.apache.commons.io.IOUtils;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Set;
-
-import static java.util.stream.Collectors.toSet;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
-
-/**
- * The only tests that should go here are for those Localstack services that require special testcontainers code to work with them.
- * For example, S3 needs a test to ensure special HTTP routing to the S3 container works.
- */
-public class SimpleLocalstackTest {
-
-    private static final String BUCKET_1 = "bucket1";
-    private static final String BUCKET_2 = "bucket2";
-    private static final String ITEM_KEY = "bar";
-    private static final String DUMMY_CONTENT = "baz";
-
-    @ClassRule
-    public static LocalStackContainer localstack = new LocalStackContainer()
-        .withServices(S3, SQS);
-
-    @Test
-    public void simpleS3Test() throws IOException {
-        AmazonS3 s3 = AmazonS3ClientBuilder
-            .standard()
-            .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
-            .withCredentials(localstack.getDefaultCredentialsProvider())
-            .build();
-
-        s3.createBucket(BUCKET_1);
-        s3.putObject(BUCKET_1, ITEM_KEY, DUMMY_CONTENT);
-
-        s3.createBucket(BUCKET_2);
-        s3.putObject(BUCKET_2, ITEM_KEY, DUMMY_CONTENT);
-
-        final Set<String> bucketNames = s3.listBuckets().stream()
-            .map(Bucket::getName)
-            .collect(toSet());
-        assertTrue("The created buckets have the right name",
-            bucketNames.contains(BUCKET_1) && bucketNames.contains(BUCKET_2));
-
-        assertBucketContentsCorrect(s3, BUCKET_1);
-        assertBucketContentsCorrect(s3, BUCKET_2);
-    }
-
-    private void assertBucketContentsCorrect(AmazonS3 s3, String bucketName) throws IOException {
-        final ObjectListing objectListing1 = s3.listObjects(bucketName);
-        assertEquals("The created bucket has 1 item in it", 1, objectListing1.getObjectSummaries().size());
-
-        final S3Object object = s3.getObject(bucketName, ITEM_KEY);
-        final String content = IOUtils.toString(object.getObjectContent(), StandardCharsets.UTF_8);
-        assertEquals("The object can be retrieved", DUMMY_CONTENT, content);
-    }
-
-    @Test
-    public void simpleSQSTest() {
-        AmazonSQS sqs = AmazonSQSClientBuilder.standard()
-            .withEndpointConfiguration(localstack.getEndpointConfiguration(SQS))
-            .withCredentials(localstack.getDefaultCredentialsProvider())
-            .build();
-
-        CreateQueueResult queueResult = sqs.createQueue("baz");
-        String queueUrl = queueResult.getQueueUrl();
-
-        sqs.sendMessage(queueUrl, "ping");
-
-        final List<Message> messages = sqs.receiveMessage(queueUrl).getMessages();
-
-        assertTrue("the message queue contains a message", messages.size() > 0);
-        assertEquals("the first message is the one we sent", "ping", messages.get(0).getBody());
-    }
-}

From d62705a898d95d71c36d61f371fb8120f326323c Mon Sep 17 00:00:00 2001
From: Florian LOPES <florian.lopes@outlook.com>
Date: Sat, 9 Nov 2019 09:27:04 +0100
Subject: [PATCH 0374/4969] Fix typo in index.md (#2043)

---
 docs/modules/databases/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index b0e5335b7e8..2511502f650 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -111,10 +111,10 @@ With this parameter database container will keep running even when there're no o
 
 Container can have `tmpfs` mounts for storing data in host memory. This is useful if you want to speed up your database tests. Be aware that the data will be lost when the container stops.
 
-To pass this option to the container, add `TC_TMPFS` paramater to the URL as follows:
+To pass this option to the container, add `TC_TMPFS` parameter to the URL as follows:
 
   `jdbc:tc:postgresql:9.6.8:///databasename?TC_TMPFS=/testtmpfs:rw`
 
-If you need more than one option, seperate them by comma (e.g. `TC_TMPFS=key:value,key1:value1&other_parameters=foo`).
+If you need more than one option, separate them by comma (e.g. `TC_TMPFS=key:value,key1:value1&other_parameters=foo`).
 
 For more information about `tmpfs` mount, see [the official Docker documentation](https://docs.docker.com/storage/tmpfs/).

From 055f78323f584a9f8b3248196d5ca99fd3cc454f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 9 Nov 2019 08:28:03 +0000
Subject: [PATCH 0375/4969] Add docker compose support for --build and --rmi
 options (#1625)

* 924: Add docker compose support for --build and --rmi options

* Fix bug with merge

* Use standard enum style

* Refactor test to verify removal of images

* Fix param name

* Switch to using parameterized tests


Co-authored-by: Soner Dastan <son.dastan@gmail.com>
---
 .../containers/DockerComposeContainer.java    | 64 ++++++++++++-
 .../DockerComposeContainerWithBuildTest.java  | 92 +++++++++++++++++++
 .../resources/compose-build-test/Dockerfile   |  3 +
 .../compose-build-test/docker-compose.yml     |  6 ++
 4 files changed, 160 insertions(+), 5 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
 create mode 100644 core/src/test/resources/compose-build-test/Dockerfile
 create mode 100644 core/src/test/resources/compose-build-test/docker-compose.yml

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index b21e160d892..73628a19ad7 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -64,6 +64,7 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
     private DockerClient dockerClient;
     private boolean localCompose;
     private boolean pull = true;
+    private boolean build = false;
     private boolean tailChildContainers;
 
     private String project;
@@ -84,6 +85,7 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
      * necessarily to containers that are spawned by Compose itself)
      */
     private Map<String, String> env = new HashMap<>();
+    private RemoveImages removeImages;
 
     @Deprecated
     public DockerComposeContainer(File composeFile, String identifier) {
@@ -170,11 +172,17 @@ public SELF withServices(@NonNull String... services) {
 
     private void createServices() {
         // Run the docker-compose container, which starts up the services
-        if(services.isEmpty()) {
-            runWithCompose("up -d");
-        } else {
-            runWithCompose("up -d " + String.join(" ", services));
+        String command = "up -d";
+
+        if (build) {
+            command += " --build";
+        }
+
+        if (!services.isEmpty()) {
+            command += " " + String.join(" ", services);
         }
+
+        runWithCompose(command);
     }
 
     private void waitUntilServiceStarted() {
@@ -326,7 +334,11 @@ public void stop() {
 
                 // Kill the services using docker-compose
                 try {
-                    runWithCompose("down -v");
+                    String cmd = "down -v";
+                    if (removeImages != null) {
+                        cmd += " --rmi " + removeImages.dockerRemoveImagesType();
+                    }
+                    runWithCompose(cmd);
 
                     // If we reach here then docker-compose down has cleared networks and containers;
                     //  we can unregister from ResourceReaper
@@ -513,6 +525,26 @@ public SELF withLogConsumer(String serviceName, Consumer<OutputFrame> consumer)
         return self();
     }
 
+    /**
+     * Whether to always build images before starting containers.
+     *
+     * @return this instance, for chaining
+     */
+    public SELF withBuild(boolean build) {
+        this.build = build;
+        return self();
+    }
+
+    /**
+     * Remove images after containers shutdown.
+     *
+     * @return this instance, for chaining
+     */
+    public SELF withRemoveImages(RemoveImages removeImages) {
+        this.removeImages = removeImages;
+        return self();
+    }
+
     private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
         LogUtils.followOutput(DockerClientFactory.instance().client(), containerId, consumer);
     }
@@ -524,6 +556,28 @@ private SELF self() {
     private String randomProjectId() {
         return identifier + Base58.randomString(6).toLowerCase();
     }
+
+    public enum RemoveImages {
+        /**
+         * Remove all images used by any service.
+         */
+        ALL("all"),
+
+        /**
+         * Remove only images that don't have a custom tag set by the `image` field.
+         */
+        LOCAL("local");
+
+        private final String dockerRemoveImagesType;
+
+        RemoveImages(final String dockerRemoveImagesType) {
+            this.dockerRemoveImagesType = dockerRemoveImagesType;
+        }
+
+        public String dockerRemoveImagesType() {
+            return dockerRemoveImagesType;
+        }
+    }
 }
 
 interface DockerCompose {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
new file mode 100644
index 00000000000..1b1efc878af
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
@@ -0,0 +1,92 @@
+package org.testcontainers.junit;
+
+import com.github.dockerjava.api.model.Container;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.containers.DockerComposeContainer.RemoveImages.ALL;
+import static org.testcontainers.containers.DockerComposeContainer.RemoveImages.LOCAL;
+
+@RunWith(Parameterized.class)
+public class DockerComposeContainerWithBuildTest {
+
+    public DockerComposeContainerWithBuildTest(final DockerComposeContainer.RemoveImages removeMode,
+                                               final boolean shouldBuiltImageBePresentAfterRunning,
+                                               final boolean shouldPulledImageBePresentAfterRunning) {
+        this.removeMode = removeMode;
+        this.shouldBuiltImageBePresentAfterRunning = shouldBuiltImageBePresentAfterRunning;
+        this.shouldPulledImageBePresentAfterRunning = shouldPulledImageBePresentAfterRunning;
+    }
+
+    public final DockerComposeContainer.RemoveImages removeMode;
+    public final boolean shouldBuiltImageBePresentAfterRunning;
+    public final boolean shouldPulledImageBePresentAfterRunning;
+
+    @Parameterized.Parameters(name = "removeMode = {0}")
+    public static Object[][] params() {
+        return new Object[][]{
+            {null, true, true},
+            {LOCAL, false, true},
+            {ALL, false, false},
+        };
+    }
+
+    @Test
+    public void performTest() {
+        final File composeFile = new File("src/test/resources/compose-build-test/docker-compose.yml");
+
+        final AtomicReference<String> builtImageName = new AtomicReference<>("");
+        final AtomicReference<String> pulledImageName = new AtomicReference<>("");
+        try (DockerComposeContainer environment = new DockerComposeContainer<>(composeFile)
+            .withExposedService("customredis", 6379)
+            .withBuild(true)
+            .withRemoveImages(removeMode)) {
+
+            environment.start();
+
+            builtImageName.set(imageNameForRunningContainer("_customredis_1"));
+            final boolean isBuiltImagePresentWhileRunning = isImagePresent(builtImageName.get());
+            assertEquals("the built image is present while running", true, isBuiltImagePresentWhileRunning);
+
+            pulledImageName.set(imageNameForRunningContainer("_normalredis_1"));
+            final boolean isPulledImagePresentWhileRunning = isImagePresent(pulledImageName.get());
+            assertEquals("the pulled image is present while running", true, isPulledImagePresentWhileRunning);
+        }
+
+        Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
+            final boolean isBuiltImagePresentAfterRunning = isImagePresent(builtImageName.get());
+            assertEquals("the built image is not present after running", shouldBuiltImageBePresentAfterRunning, isBuiltImagePresentAfterRunning);
+            return null;
+        });
+
+        Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
+            final boolean isPulledImagePresentAfterRunning = isImagePresent(pulledImageName.get());
+            assertEquals("the pulled image is present after running", shouldPulledImageBePresentAfterRunning, isPulledImagePresentAfterRunning);
+            return null;
+        });
+    }
+
+    private String imageNameForRunningContainer(final String containerNameSuffix) {
+        return DockerClientFactory.instance().client().listContainersCmd().exec().stream()
+            .filter(it -> Stream.of(it.getNames()).anyMatch(name -> name.endsWith(containerNameSuffix)))
+            .findFirst()
+            .map(Container::getImage)
+            .orElseThrow(IllegalStateException::new);
+    }
+
+    private boolean isImagePresent(final String imageName) {
+        return DockerClientFactory.instance().client().listImagesCmd().withImageNameFilter(imageName).exec().stream()
+            .findFirst()
+            .isPresent();
+    }
+}
diff --git a/core/src/test/resources/compose-build-test/Dockerfile b/core/src/test/resources/compose-build-test/Dockerfile
new file mode 100644
index 00000000000..521e2d23b80
--- /dev/null
+++ b/core/src/test/resources/compose-build-test/Dockerfile
@@ -0,0 +1,3 @@
+FROM redis
+
+CMD ["redis-server"]
diff --git a/core/src/test/resources/compose-build-test/docker-compose.yml b/core/src/test/resources/compose-build-test/docker-compose.yml
new file mode 100644
index 00000000000..333b2fa46f1
--- /dev/null
+++ b/core/src/test/resources/compose-build-test/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '2.0'
+services:
+  customredis:
+      build: .
+  normalredis:
+      image: redis:latest

From fb9e7ef1c9aefd18a334708e33c2771760ab8c24 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2019 08:28:24 +0000
Subject: [PATCH 0376/4969] =?UTF-8?q?Bump=20org.springframework.boot=20fro?=
 =?UTF-8?q?m=202.2.0.RELEASE=20to=202.2.1.RELEA=E2=80=A6=20(#2042)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.2.0.RELEASE to 2.2.1.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.2.0.RELEASE...v2.2.1.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 2c15c3038ba..5386234dccb 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.2.0.RELEASE'
+    id 'org.springframework.boot' version '2.2.1.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index df18e6a5f03..2a67123fa03 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.2.0.RELEASE'
+    id 'org.springframework.boot' version '2.2.1.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From e86fb093d80e7c9576f8063415861eb2dc30fa91 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2019 08:28:35 +0000
Subject: [PATCH 0377/4969] Bump mongo-java-driver from 3.11.1 to 3.11.2 in
 /core (#2035)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.11.1...r3.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 d6b862852e3..1b037390956 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'com.rabbitmq:amqp-client:5.7.3'
-    testCompile 'org.mongodb:mongo-java-driver:3.11.1'
+    testCompile 'org.mongodb:mongo-java-driver:3.11.2'
     testCompile ('org.mockito:mockito-core:3.1.0') {
         exclude(module: 'hamcrest-core')
     }

From 84b86aff56efe8b1ff20dc29ad455b4116cd1092 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2019 08:28:44 +0000
Subject: [PATCH 0378/4969] Bump slf4j-api from 1.7.28 to 1.7.29 in /core
 (#2030)

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.28 to 1.7.29.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Kevin Wittek <kiview@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 1b037390956..9da3288d0c3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -57,7 +57,7 @@ project.tasks.check.dependsOn(jarFileTest)
 
 dependencies {
     compile 'junit:junit:4.12'
-    compile 'org.slf4j:slf4j-api:1.7.28'
+    compile 'org.slf4j:slf4j-api:1.7.29'
     compile 'org.jetbrains:annotations:17.0.0'
     compile 'javax.annotation:javax.annotation-api:1.3.2'
     compile 'org.apache.commons:commons-compress:1.19'

From f3011b6cfaf058fef26583d259bad00f9103a2ea Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 9 Nov 2019 11:09:54 +0100
Subject: [PATCH 0379/4969] Check container's status if `WaitStrategy` fails.
 (#1837)

* Check container's status if `WaitStrategy` fails. Fixes #1834

* Try "128Gb"

* Update core/src/main/java/org/testcontainers/containers/GenericContainer.java

Co-Authored-By: Richard North <rich.north@gmail.com>

* Use `/dev/null` as dd's target, ignore startup check strategy

* Achieve OOMKill in a way that works reliably on CI

On CircleCI there were two problems:
* `dd: /dev/urandom: Bad address` when `/dev/urandom` was used, which
  would cause exit code 1, not the desired OOMKill
* Once worked-around, `dd` was only processing a partial block:

```
0+1 records in

0+1 records out
```

I suspect that `dd` might internally be respecting, or suffering limited
buffers due to the cgroup memory limit, though I'm not clear why this
behaviour only appeared on CircleCI and Azure pipelines.

* Limit loop

* Allocate more memory to trigger the OOM killer

* increase the memory even more
---
 .../containers/GenericContainer.java          | 45 ++++++++++-
 .../containers/GenericContainerTest.java      | 75 +++++++++++++++++++
 2 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/GenericContainerTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index c5df0d4fea1..18c53f8b80f 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -7,6 +7,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -69,7 +70,9 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -397,11 +400,51 @@ private void tryStart(Instant startedAt) {
             }
 
             // Wait until the process within the container has become ready for use (e.g. listening on network, log message emitted, etc).
-            waitUntilContainerStarted();
+            try {
+                waitUntilContainerStarted();
+            } catch (Exception e) {
+                logger().debug("Wait strategy threw an exception", e);
+                InspectContainerResponse inspectContainerResponse = null;
+                try {
+                    inspectContainerResponse = dockerClient.inspectContainerCmd(containerId).exec();
+                } catch (NotFoundException notFoundException) {
+                    logger().debug("Container {} not found", containerId, notFoundException);
+                }
+
+                if (inspectContainerResponse == null) {
+                    throw new IllegalStateException("Container is removed");
+                }
+
+                InspectContainerResponse.ContainerState state = inspectContainerResponse.getState();
+                if (Boolean.TRUE.equals(state.getDead())) {
+                    throw new IllegalStateException("Container is dead");
+                }
+
+                if (Boolean.TRUE.equals(state.getOOMKilled())) {
+                    throw new IllegalStateException("Container crashed with out-of-memory (OOMKilled)");
+                }
+
+                String error = state.getError();
+                if (!StringUtils.isBlank(error)) {
+                    throw new IllegalStateException("Container crashed: " + error);
+                }
+
+                if (!Boolean.TRUE.equals(state.getRunning())) {
+                    throw new IllegalStateException("Container exited with code " + state.getExitCode());
+                }
+
+                throw e;
+            }
 
             logger().info("Container {} started in {}", dockerImageName, Duration.between(startedAt, Instant.now()));
             containerIsStarted(containerInfo);
         } catch (Exception e) {
+            if (e instanceof UndeclaredThrowableException && e.getCause() instanceof Exception) {
+                e = (Exception) e.getCause();
+            }
+            if (e instanceof InvocationTargetException && e.getCause() instanceof Exception) {
+                e = (Exception) e.getCause();
+            }
             logger().error("Could not start container", e);
 
             if (containerId != null) {
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
new file mode 100644
index 00000000000..c69a3b69594
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -0,0 +1,75 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.InspectContainerResponse.ContainerState;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
+import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class GenericContainerTest {
+
+    @Test
+    public void shouldReportOOMAfterWait() {
+        try (
+            GenericContainer container = new GenericContainer<>()
+                .withStartupCheckStrategy(new NoopStartupCheckStrategy())
+                .waitingFor(new WaitForState(ContainerState::getOOMKilled))
+                .withCreateContainerCmdModifier(it -> {
+                    it.getHostConfig().withMemory(4 * FileUtils.ONE_MB);
+                })
+                .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; done")
+        ) {
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Container crashed with out-of-memory");
+        }
+    }
+
+    @Test
+    public void shouldReportErrorAfterWait() {
+        try (
+            GenericContainer container = new GenericContainer<>()
+                .withStartupCheckStrategy(new NoopStartupCheckStrategy())
+                .waitingFor(new WaitForState(state -> state.getExitCode() > 0))
+                .withCommand("sh", "-c", "usleep 100; exit 123")
+        ) {
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Container exited with code 123");
+        }
+    }
+
+    static class NoopStartupCheckStrategy extends StartupCheckStrategy {
+
+        @Override
+        public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
+            return StartupStatus.SUCCESSFUL;
+        }
+    }
+
+    @RequiredArgsConstructor
+    @FieldDefaults(makeFinal = true)
+    static class WaitForState extends AbstractWaitStrategy {
+
+        Predicate<ContainerState> predicate;
+
+        @Override
+        @SneakyThrows
+        protected void waitUntilReady() {
+            Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, () -> {
+                ContainerState state = waitStrategyTarget.getCurrentContainerInfo().getState();
+                return predicate.test(state);
+            });
+
+            throw new IllegalStateException("Nope!");
+        }
+    }
+}

From 6aced9f4954053b57d6f72623711099bb643a1e4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 10 Nov 2019 09:33:54 +0100
Subject: [PATCH 0380/4969] debug `GenericContainerTest`

---
 .../containers/GenericContainerTest.java           | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index c69a3b69594..a5fbd9541e8 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
@@ -23,7 +24,7 @@ public void shouldReportOOMAfterWait() {
         try (
             GenericContainer container = new GenericContainer<>()
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
-                .waitingFor(new WaitForState(ContainerState::getOOMKilled))
+                .waitingFor(new WaitForExitedState(ContainerState::getOOMKilled))
                 .withCreateContainerCmdModifier(it -> {
                     it.getHostConfig().withMemory(4 * FileUtils.ONE_MB);
                 })
@@ -39,7 +40,7 @@ public void shouldReportErrorAfterWait() {
         try (
             GenericContainer container = new GenericContainer<>()
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
-                .waitingFor(new WaitForState(state -> state.getExitCode() > 0))
+                .waitingFor(new WaitForExitedState(state -> state.getExitCode() > 0))
                 .withCommand("sh", "-c", "usleep 100; exit 123")
         ) {
             assertThatThrownBy(container::start)
@@ -57,7 +58,8 @@ public StartupStatus checkStartupState(DockerClient dockerClient, String contain
 
     @RequiredArgsConstructor
     @FieldDefaults(makeFinal = true)
-    static class WaitForState extends AbstractWaitStrategy {
+    @Slf4j
+    static class WaitForExitedState extends AbstractWaitStrategy {
 
         Predicate<ContainerState> predicate;
 
@@ -66,6 +68,12 @@ static class WaitForState extends AbstractWaitStrategy {
         protected void waitUntilReady() {
             Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, () -> {
                 ContainerState state = waitStrategyTarget.getCurrentContainerInfo().getState();
+
+                log.debug("Current state: {}", state);
+                if (!"exited".equalsIgnoreCase(state.getStatus())) {
+                    Thread.sleep(100);
+                    return false;
+                }
                 return predicate.test(state);
             });
 

From 7562e05b9771b48113b7602deebb2c9971594566 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 10 Nov 2019 10:45:19 +0100
Subject: [PATCH 0381/4969] Add sleep to GenericContainerTest

---
 .../org/testcontainers/containers/GenericContainerTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index a5fbd9541e8..f805ee1aa9f 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -28,7 +28,7 @@ public void shouldReportOOMAfterWait() {
                 .withCreateContainerCmdModifier(it -> {
                     it.getHostConfig().withMemory(4 * FileUtils.ONE_MB);
                 })
-                .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; done")
+                .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; sleep 0.01; done; sleep 10m")
         ) {
             assertThatThrownBy(container::start)
                 .hasStackTraceContaining("Container crashed with out-of-memory");

From 2fe206c4cc337e1ab38c401c89ceca56c672cf1f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 10 Nov 2019 20:43:55 +0100
Subject: [PATCH 0382/4969] Fix session label when reuse is not supported but
 requested (#2051)

---
 .../containers/GenericContainer.java          |  7 +++++
 .../containers/ReusabilityUnitTests.java      | 29 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 18c53f8b80f..6ce8a2f5b09 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -341,6 +341,7 @@ private void tryStart(Instant startedAt) {
             createCommand.getLabels().put(DockerClientFactory.TESTCONTAINERS_LABEL, "true");
 
             boolean reused = false;
+            final boolean reusable;
             if (shouldBeReused) {
                 if (!canBeReused()) {
                     throw new IllegalStateException("This container does not support reuse");
@@ -359,10 +360,16 @@ private void tryStart(Instant startedAt) {
 
                         createCommand.getLabels().put(HASH_LABEL, hash);
                     }
+                    reusable = true;
                 } else {
                     logger().info("Reuse was requested but the environment does not support the reuse of containers");
+                    reusable = false;
                 }
             } else {
+                reusable = false;
+            }
+
+            if (!reusable) {
                 createCommand.getLabels().put(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL, DockerClientFactory.SESSION_ID);
             }
 
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index b05db5b5077..32adbaa837f 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -20,6 +20,7 @@
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.rnorth.visibleassertions.VisibleAssertions;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
@@ -29,9 +30,12 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
@@ -149,6 +153,26 @@ public void shouldReuseIfListReturnsID() {
             Mockito.verify(client, Mockito.never()).startContainerCmd(existingContainerId);
         }
 
+        @Test
+        public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
+            // TODO mock TestcontainersConfiguration
+            Assume.assumeFalse("does not support reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
+            AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId, commandRef::set));
+            when(client.startContainerCmd(containerId)).then(startContainerAnswer());
+            when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
+
+            container.start();
+
+            assertThat(commandRef)
+                .isNotNull()
+                .satisfies(command -> {
+                    assertThat(command.get().getLabels())
+                        .containsKeys(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL);
+                });
+        }
+
         private String randomContainerId() {
             return UUID.randomUUID().toString();
         }
@@ -168,8 +192,13 @@ private Answer<ListContainersCmd> listContainersAnswer(String... ids) {
         }
 
         private Answer<CreateContainerCmd> createContainerAnswer(String containerId) {
+            return createContainerAnswer(containerId, command -> {});
+        }
+
+        private Answer<CreateContainerCmd> createContainerAnswer(String containerId, Consumer<CreateContainerCmd> cmdConsumer) {
             return invocation -> {
                 CreateContainerCmd.Exec exec = command -> {
+                    cmdConsumer.accept(command);
                     CreateContainerResponse response = new CreateContainerResponse();
                     response.setId(containerId);
                     return response;

From f59b123f7ee116776b9ae38e7eb030d2be5bbfd4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 10 Nov 2019 21:02:33 +0100
Subject: [PATCH 0383/4969] Try increasing the limit

---
 .../org/testcontainers/containers/GenericContainerTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index f805ee1aa9f..dfc4a955713 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -26,9 +26,9 @@ public void shouldReportOOMAfterWait() {
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
                 .waitingFor(new WaitForExitedState(ContainerState::getOOMKilled))
                 .withCreateContainerCmdModifier(it -> {
-                    it.getHostConfig().withMemory(4 * FileUtils.ONE_MB);
+                    it.getHostConfig().withMemory(32 * FileUtils.ONE_MB);
                 })
-                .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; sleep 0.01; done; sleep 10m")
+                .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; done; sleep 10m")
         ) {
             assertThatThrownBy(container::start)
                 .hasStackTraceContaining("Container crashed with out-of-memory");

From 86bfd78e86cd84207e086921f1d2f3bd2d2bb6b1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 10 Nov 2019 21:23:27 +0100
Subject: [PATCH 0384/4969] tune some memory params

---
 .../testcontainers/containers/GenericContainerTest.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index dfc4a955713..c29f6f37c36 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse.ContainerState;
+import com.github.dockerjava.api.model.HostConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
@@ -26,7 +27,12 @@ public void shouldReportOOMAfterWait() {
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
                 .waitingFor(new WaitForExitedState(ContainerState::getOOMKilled))
                 .withCreateContainerCmdModifier(it -> {
-                    it.getHostConfig().withMemory(32 * FileUtils.ONE_MB);
+                    it.getHostConfig()
+                        .withMemory(20 * FileUtils.ONE_MB)
+                        .withMemorySwappiness(0L)
+                        .withMemorySwap(0L)
+                        .withMemoryReservation(0L)
+                        .withKernelMemory(16 * FileUtils.ONE_MB);
                 })
                 .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; done; sleep 10m")
         ) {

From c0277514327097abadaed58dadaa375c32fcdb5c Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Mon, 11 Nov 2019 16:09:25 +0100
Subject: [PATCH 0385/4969] Make `Startables#deepStart` always iterate
 sequentially (#2053)

* Reproduce the issue with passing parallel Stream into Startables#deepStart

* Fix the issue by sanitizing the input stream
---
 .../org/testcontainers/lifecycle/Startables.java |  1 +
 .../testcontainers/junit/DependenciesTest.java   | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
index 0e6452c1914..6cf57cc6f6e 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startables.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -60,6 +60,7 @@ public CompletableFuture<Void> deepStart(Stream<Startable> startables) {
      */
     private CompletableFuture<Void> deepStart(Map<Startable, CompletableFuture<Void>> started, Stream<Startable> startables) {
         CompletableFuture[] futures = startables
+            .sequential()
             .map(it -> {
                 // avoid a recursive update in `computeIfAbsent`
                 Map<Startable, CompletableFuture<Void>> subStarted = new HashMap<>(started);
diff --git a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
index df7e85a31f8..4f2ee01bc6d 100644
--- a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
@@ -9,9 +9,11 @@
 import org.testcontainers.lifecycle.Startables;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class DependenciesTest {
@@ -117,6 +119,19 @@ public void shouldHandleDiamondDependencies() throws Exception {
         VisibleAssertions.assertEquals("D started", 1, d.getStartInvocationCount().intValue());
     }
 
+    @Test
+    public void shouldHandleParallelStream() throws Exception {
+        List<Startable> startables = Stream.generate(InvocationCountingStartable::new)
+            .limit(10)
+            .collect(Collectors.toList());
+
+        for (int i = 1; i < startables.size(); i++) {
+            startables.get(0).getDependencies().add(startables.get(i));
+        }
+
+        Startables.deepStart(startables.parallelStream()).get(1, TimeUnit.SECONDS);
+    }
+
     private static class InvocationCountingStartable implements Startable {
 
         @Getter
@@ -131,7 +146,6 @@ private static class InvocationCountingStartable implements Startable {
         @Override
         public void start() {
             startInvocationCount.getAndIncrement();
-
         }
 
         @Override

From 7e5adade117e94ac0ed4e825b35ac0bdaf45c8fa Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 11 Nov 2019 18:11:11 +0100
Subject: [PATCH 0386/4969] Add `reused` parameter to the hooks (#2052)

* Add `containerIsReused` hook

* Add `reused` parameter to `containerIs{Starting,Started}`

* post-merge fixes
---
 .../containers/GenericContainer.java          |  16 ++-
 .../containers/ReusabilityUnitTests.java      | 134 ++++++++++++++----
 .../containers/KafkaContainer.java            |   8 +-
 3 files changed, 130 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 6ce8a2f5b09..47d08b57528 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -397,7 +397,7 @@ private void tryStart(Instant startedAt) {
             // Tell subclasses that we're starting
             containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
             containerName = containerInfo.getName();
-            containerIsStarting(containerInfo);
+            containerIsStarting(containerInfo, reused);
 
             // Wait until the container has reached the desired running state
             if (!this.startupCheckStrategy.waitUntilStartupSuccessful(dockerClient, containerId)) {
@@ -444,7 +444,7 @@ private void tryStart(Instant startedAt) {
             }
 
             logger().info("Container {} started in {}", dockerImageName, Duration.between(startedAt, Instant.now()));
-            containerIsStarted(containerInfo);
+            containerIsStarted(containerInfo, reused);
         } catch (Exception e) {
             if (e instanceof UndeclaredThrowableException && e.getCause() instanceof Exception) {
                 e = (Exception) e.getCause();
@@ -582,10 +582,22 @@ protected void containerIsCreated(String containerId) {
     protected void containerIsStarting(InspectContainerResponse containerInfo) {
     }
 
+    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
+    @UnstableAPI
+    protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
+        containerIsStarting(containerInfo);
+    }
+
     @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
     }
 
+    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
+    @UnstableAPI
+    protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+        containerIsStarted(containerInfo);
+    }
+
     /**
      * A hook that is executed before the container is stopped with {@link #stop()}.
      * Warning! This hook won't be executed if the container is terminated during
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 32adbaa837f..2d0f7a8133a 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -23,9 +23,9 @@
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
-import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -98,34 +98,93 @@ protected void containerIsCreated(String containerId) {
 
     @RunWith(BlockJUnit4ClassRunner.class)
     @FieldDefaults(makeFinal = true)
-    public static class HashTest {
+    public static class HooksTest extends AbstractReusabilityTest {
+
+        List<String> script = new ArrayList<>();
+
+        GenericContainer<?> container = makeReusable(new GenericContainer(IMAGE_FUTURE) {
 
-        StartupCheckStrategy startupCheckStrategy = new StartupCheckStrategy() {
             @Override
-            public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
-                return StartupStatus.SUCCESSFUL;
+            protected boolean canBeReused() {
+                // Because we override "containerIsCreated"
+                return true;
             }
-        };
 
-        WaitStrategy waitStrategy = new AbstractWaitStrategy() {
             @Override
-            protected void waitUntilReady() {
+            protected void containerIsCreated(String containerId) {
+                script.add("containerIsCreated");
+            }
 
+            @Override
+            protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
+                script.add("containerIsStarting(reused=" + reused + ")");
             }
-        };
 
-        DockerClient client = Mockito.mock(DockerClient.class);
+            @Override
+            protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+                script.add("containerIsStarted(reused=" + reused + ")");
+            }
+        });
 
-        GenericContainer container = new GenericContainer(IMAGE_FUTURE)
-            .withNetworkMode("none") // to disable the port forwarding
-            .withStartupCheckStrategy(startupCheckStrategy)
-            .waitingFor(waitStrategy)
-            .withReuse(true);
+        @Test
+        public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
+            // TODO mock TestcontainersConfiguration
+            Assume.assumeFalse("does not support reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
+            AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
+            when(client.listContainersCmd()).then(listContainersAnswer());
+            when(client.startContainerCmd(containerId)).then(startContainerAnswer());
+            when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
 
-        {
-            container.dockerClient = client;
+            container.start();
+            assertThat(script).containsExactly(
+                "containerIsCreated",
+                "containerIsStarting(reused=false)",
+                "containerIsStarted(reused=false)"
+            );
+        }
+
+        @Test
+        public void shouldCallHookIfReused() {
+            // TODO mock TestcontainersConfiguration
+            Assume.assumeTrue("supports reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
+            String existingContainerId = randomContainerId();
+            when(client.listContainersCmd()).then(listContainersAnswer(existingContainerId));
+            when(client.inspectContainerCmd(existingContainerId)).then(inspectContainerAnswer());
+
+            container.start();
+            assertThat(script).containsExactly(
+                "containerIsStarting(reused=true)",
+                "containerIsStarted(reused=true)"
+            );
         }
 
+        @Test
+        public void shouldNotCallHookIfNotReused() {
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
+            when(client.listContainersCmd()).then(listContainersAnswer());
+            when(client.startContainerCmd(containerId)).then(startContainerAnswer());
+            when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
+
+            container.start();
+            assertThat(script).containsExactly(
+                "containerIsCreated",
+                "containerIsStarting(reused=false)",
+                "containerIsStarted(reused=false)"
+            );
+        }
+    }
+
+    @RunWith(BlockJUnit4ClassRunner.class)
+    @FieldDefaults(makeFinal = true)
+    public static class HashTest extends AbstractReusabilityTest {
+
+        protected GenericContainer<?> container = makeReusable(new GenericContainer<>(IMAGE_FUTURE));
+
         @Test
         public void shouldStartIfListReturnsEmpty() {
             String containerId = randomContainerId();
@@ -143,13 +202,15 @@ public void shouldStartIfListReturnsEmpty() {
         public void shouldReuseIfListReturnsID() {
             // TODO mock TestcontainersConfiguration
             Assume.assumeTrue("supports reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
-            when(client.createContainerCmd(any())).then(createContainerAnswer(randomContainerId()));
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
             String existingContainerId = randomContainerId();
             when(client.listContainersCmd()).then(listContainersAnswer(existingContainerId));
             when(client.inspectContainerCmd(existingContainerId)).then(inspectContainerAnswer());
 
             container.start();
 
+            Mockito.verify(client, Mockito.never()).startContainerCmd(containerId);
             Mockito.verify(client, Mockito.never()).startContainerCmd(existingContainerId);
         }
 
@@ -172,12 +233,37 @@ public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
                         .containsKeys(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL);
                 });
         }
+    }
+
+    @FieldDefaults(makeFinal = true)
+    static abstract class AbstractReusabilityTest {
+
+        protected DockerClient client = Mockito.mock(DockerClient.class);
+
+        protected <T extends GenericContainer<?>> T makeReusable(T container) {
+            container.dockerClient = client;
+            container.withNetworkMode("none"); // to disable the port forwarding
+            container.withStartupCheckStrategy(new StartupCheckStrategy() {
+                    @Override
+                    public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
+                        return StartupStatus.SUCCESSFUL;
+                    }
+                });
+            container.waitingFor(new AbstractWaitStrategy() {
+                    @Override
+                    protected void waitUntilReady() {
+
+                    }
+                });
+            container.withReuse(true);
+            return container;
+        }
 
-        private String randomContainerId() {
+        protected String randomContainerId() {
             return UUID.randomUUID().toString();
         }
 
-        private Answer<ListContainersCmd> listContainersAnswer(String... ids) {
+        protected Answer<ListContainersCmd> listContainersAnswer(String... ids) {
             return invocation -> {
                 ListContainersCmd.Exec exec = command -> {
                     return new ObjectMapper().convertValue(
@@ -191,11 +277,11 @@ private Answer<ListContainersCmd> listContainersAnswer(String... ids) {
             };
         }
 
-        private Answer<CreateContainerCmd> createContainerAnswer(String containerId) {
+        protected Answer<CreateContainerCmd> createContainerAnswer(String containerId) {
             return createContainerAnswer(containerId, command -> {});
         }
 
-        private Answer<CreateContainerCmd> createContainerAnswer(String containerId, Consumer<CreateContainerCmd> cmdConsumer) {
+        protected Answer<CreateContainerCmd> createContainerAnswer(String containerId, Consumer<CreateContainerCmd> cmdConsumer) {
             return invocation -> {
                 CreateContainerCmd.Exec exec = command -> {
                     cmdConsumer.accept(command);
@@ -207,7 +293,7 @@ private Answer<CreateContainerCmd> createContainerAnswer(String containerId, Con
             };
         }
 
-        private Answer<StartContainerCmd> startContainerAnswer() {
+        protected Answer<StartContainerCmd> startContainerAnswer() {
             return invocation -> {
                 StartContainerCmd.Exec exec = command -> {
                     return null;
@@ -216,7 +302,7 @@ private Answer<StartContainerCmd> startContainerAnswer() {
             };
         }
 
-        private Answer<InspectContainerCmd> inspectContainerAnswer() {
+        protected Answer<InspectContainerCmd> inspectContainerAnswer() {
             return invocation -> {
                 InspectContainerCmd.Exec exec = command -> {
                     return new InspectContainerResponse();
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index b08d6611e6d..ede8cb5d086 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -80,8 +80,12 @@ protected void doStart() {
 
     @Override
     @SneakyThrows
-    protected void containerIsStarting(InspectContainerResponse containerInfo) {
-        super.containerIsStarting(containerInfo);
+    protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
+        super.containerIsStarting(containerInfo, reused);
+
+        if (reused) {
+            return;
+        }
 
         port = getMappedPort(KAFKA_PORT);
 

From 3142e58b9d38205d94aabc9fefef7651c502b95f Mon Sep 17 00:00:00 2001
From: Dominik Weidenfeld <dominik@weidenfeld.info>
Date: Mon, 11 Nov 2019 23:57:10 +0100
Subject: [PATCH 0387/4969] added read timeout to http wait strategy (#2058)

This commit adds the possibility to add a read timeout to the HTTP call
for the HTTP wait strategy.
This is necessary, because with the default Docker settings for Mac
can lead to a blocking call to `HttpURLConnection.connect()`. The follow
up issue is, that the container will never get healthy and due to
automated integration tests the tests are not able to run.
The main cause of the problem is the lazy connection establishment
during setting up the container. So the time between starting the
container and starting the wait strategy checks.

The read timeout lets the HTTP call fail, so the `retryUntilSuccess()`
is able to send another HTTP call in order to reestablish the connection
and not block the whole thread.
---
 .../wait/strategy/HttpWaitStrategy.java       | 19 ++++++++++++++++++-
 .../wait/strategy/HttpWaitStrategyTest.java   | 19 +++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index 6096e745e36..a44fc46e4b0 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -2,7 +2,6 @@
 
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
-import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.ContainerLaunchException;
@@ -13,7 +12,9 @@
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
+import java.time.Duration;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
@@ -41,6 +42,7 @@ public class HttpWaitStrategy extends AbstractWaitStrategy {
     private Predicate<String> responsePredicate;
     private Predicate<Integer> statusCodePredicate = null;
     private Optional<Integer> livenessPort = Optional.empty();
+    private Duration readTimeout = Duration.ofSeconds(1);
 
     /**
      * Waits for the given status code.
@@ -108,6 +110,20 @@ public HttpWaitStrategy withBasicCredentials(String username, String password) {
         return this;
     }
 
+    /**
+     * Set the HTTP connections read timeout.
+     *
+     * @param timeout the timeout (minimum 1 millisecond)
+     * @return this
+     */
+    public HttpWaitStrategy withReadTimeout(Duration timeout) {
+        if (timeout.toMillis() < 1) {
+            throw new IllegalArgumentException("you cannot specify a value smaller than 1 ms");
+        }
+        this.readTimeout = timeout;
+        return this;
+    }
+
     /**
      * Waits for the response to pass the given predicate
      * @param responsePredicate The predicate to test the response against
@@ -143,6 +159,7 @@ protected void waitUntilReady() {
                 getRateLimiter().doWhenReady(() -> {
                     try {
                         final HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection();
+                        connection.setReadTimeout(Math.toIntExact(readTimeout.toMillis()));
 
                         // authenticate
                         if (!Strings.isNullOrEmpty(username)) {
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index 5820333245a..e048f4bccb8 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -5,6 +5,7 @@
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
 
@@ -131,6 +132,15 @@ public void testWaitUntilReadyWithSpecificPort() {
         ));
     }
 
+    @Test
+    public void testWaitUntilReadyWithTimoutCausedByReadTimeout() {
+        waitUntilReadyAndTimeout(
+            startContainerWithCommand(createShellCommand("0 Connection Refused", GOOD_RESPONSE_BODY, 9090),
+                createHttpWaitStrategy(ready).forPort(9090).withReadTimeout(Duration.ofMillis(1)),
+                9090
+            ));
+    }
+
     /**
      * @param ready the AtomicBoolean on which to indicate success
      * @return the WaitStrategy under test
@@ -143,6 +153,7 @@ protected HttpWaitStrategy buildWaitStrategy(final AtomicBoolean ready) {
 
     /**
      * Create a HttpWaitStrategy instance with a waitUntilReady implementation
+     *
      * @param ready Indicates that the WaitStrategy has completed waiting successfully.
      * @return the HttpWaitStrategy instance
      */
@@ -163,9 +174,9 @@ private String createShellCommand(String header, String responseBody) {
 
     private String createShellCommand(String header, String responseBody, int port) {
         int length = responseBody.getBytes().length;
-        return "while true; do { echo -e \"HTTP/1.1 "+header+NEWLINE+
-                "Content-Type: text/html"+NEWLINE+
-                "Content-Length: "+length +NEWLINE+ "\";"
-                +" echo \""+responseBody+"\";} | nc -lp " + port + "; done";
+        return "while true; do { echo -e \"HTTP/1.1 " + header + NEWLINE +
+            "Content-Type: text/html" + NEWLINE +
+            "Content-Length: " + length + NEWLINE + "\";"
+            + " echo \"" + responseBody + "\";} | nc -lp " + port + "; done";
     }
 }

From e26788a0af57ee23151b8594375049bcf7e8968f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 12 Nov 2019 08:08:17 +0100
Subject: [PATCH 0388/4969] [hotfix] always obtain port in Kafka

---
 .../java/org/testcontainers/containers/KafkaContainer.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index ede8cb5d086..25cfba9d322 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -83,12 +83,12 @@ protected void doStart() {
     protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
         super.containerIsStarting(containerInfo, reused);
 
+        port = getMappedPort(KAFKA_PORT);
+
         if (reused) {
             return;
         }
 
-        port = getMappedPort(KAFKA_PORT);
-
         final String zookeeperConnect;
         if (externalZookeeperConnect != null) {
             zookeeperConnect = externalZookeeperConnect;

From 92cbc2f9af019461cdc0431b318944ce72a704a1 Mon Sep 17 00:00:00 2001
From: Willy Lulciuc <willy.lulciuc@wework.com>
Date: Tue, 12 Nov 2019 11:05:03 -0800
Subject: [PATCH 0389/4969] Add Marquez as user (#2060)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add Marquez as user

This PR adds [Marquez](https://marquezproject.github.io/marquez/) to the list of users. Keep up the great work 💯

* Link to website
---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index ba99eb6e555..8f95ad5399a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -76,6 +76,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Micronaut Data](https://github.com/micronaut-projects/micronaut-data/) - Testing of Micronaut Data JDBC, a database access toolkit
 * [JHipster](https://www.jhipster.tech/) - Couchbase and Cassandra integration testing
 * [wescale](https://www.wescale.com) - Integration testing against HTTP service mocks and various data stores
+* [Marquez](https://marquezproject.github.io/marquez) - PostgreSQL integration testing
 
 ## License
 

From 8dee638fc4c5ad3c11f0156abf97cb148b58db27 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 18 Nov 2019 14:16:42 +0100
Subject: [PATCH 0390/4969] Stabilize CouchbaseContainer by merging the Socat
 command (#2081)

Fixes #1453
---
 .../couchbase/CouchbaseContainer.java         | 38 ++++++++++++-------
 .../couchbase/BaseCouchbaseContainerTest.java |  9 -----
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index ad6fe3d18a9..9e7ace2af04 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -37,7 +37,6 @@
 import org.testcontainers.containers.SocatContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.images.builder.Transferable;
-import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.ThrowingFunction;
 
 import java.io.DataOutputStream;
@@ -47,6 +46,7 @@
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -107,11 +107,10 @@ public CouchbaseContainer() {
         this(DOCKER_IMAGE_NAME + VERSION);
     }
 
-    public CouchbaseContainer(String containerName) {
-        super(containerName);
+    public CouchbaseContainer(String imageName) {
+        super(imageName);
 
         withNetwork(Network.SHARED);
-        withNetworkAliases("couchbase-" + Base58.randomString(6));
         setWaitStrategy(new HttpWaitStrategy().forPath("/ui/index.html"));
     }
 
@@ -131,15 +130,16 @@ protected void configure() {
     @Override
     @SneakyThrows
     protected void doStart() {
-        String networkAlias = getNetworkAliases().get(0);
-        startProxy(networkAlias);
-
-        for (CouchbasePort port : CouchbasePort.values()) {
-            exposePortThroughProxy(networkAlias, port.getOriginalPort(), getMappedPort(port));
+        startProxy(getNetworkAliases().get(0));
+        try {
+            super.doStart();
+        } catch (Throwable e) {
+            proxy.stop();
+            throw e;
         }
-        super.doStart();
     }
 
+    @SneakyThrows
     private void startProxy(String networkAlias) {
         proxy = new SocatContainer().withNetwork(getNetwork());
 
@@ -150,18 +150,28 @@ private void startProxy(String networkAlias) {
                 proxy.addExposedPort(port.getOriginalPort());
             }
         }
+
         proxy.setWaitStrategy(null);
         proxy.start();
-    }
 
-    private void exposePortThroughProxy(String networkAlias, int originalPort, int mappedPort) {
         ExecCreateCmdResponse createCmdResponse = dockerClient
             .execCreateCmd(proxy.getContainerId())
-            .withCmd("/usr/bin/socat", "TCP-LISTEN:" + originalPort + ",fork,reuseaddr", "TCP:" + networkAlias + ":" + mappedPort)
+            .withCmd(
+                "sh",
+                "-c",
+                Stream.of(CouchbasePort.values())
+                    .map(port -> {
+                        return "/usr/bin/socat " +
+                            "TCP-LISTEN:" + port.getOriginalPort() + ",fork,reuseaddr " +
+                            "TCP:" + networkAlias + ":" + getMappedPort(port);
+                    })
+                    .collect(Collectors.joining(" & ", "true", ""))
+            )
             .exec();
 
         dockerClient.execStartCmd(createCmdResponse.getId())
-            .exec(new ExecStartResultCallback());
+            .exec(new ExecStartResultCallback())
+            .awaitCompletion(10, TimeUnit.SECONDS);
     }
 
     @Override
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
index 19eead1b23a..845d9bfaf5e 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
@@ -9,10 +9,7 @@
 import com.couchbase.client.java.view.View;
 import com.google.common.collect.Lists;
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
-import org.testcontainers.testsupport.Flaky;
-import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
 
 import java.util.List;
 
@@ -28,11 +25,7 @@ public abstract class BaseCouchbaseContainerTest extends AbstractCouchbaseTest {
 
     private static final String DOCUMENT = "{\"name\":\"toto\"}";
 
-    @Rule
-    public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
-
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldInsertDocument() {
         RawJsonDocument expected = RawJsonDocument.create(ID, DOCUMENT);
         getBucket().upsert(expected);
@@ -41,7 +34,6 @@ public void shouldInsertDocument() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldExecuteN1ql() {
         getBucket().query(N1qlQuery.simple("INSERT INTO " + TEST_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
 
@@ -54,7 +46,6 @@ public void shouldExecuteN1ql() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldCreateView() {
         View view = DefaultView.create(VIEW_NAME, VIEW_FUNCTION);
         DesignDocument document = DesignDocument.create(VIEW_NAME, Lists.newArrayList(view));

From 839ce65fde0367ccb3eb80d2b24df9c9e3fc9390 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 22 Nov 2019 13:23:39 +0100
Subject: [PATCH 0391/4969] Lazily create/set Network in KafkaContainer (#2079)

To make KafkaContainer work with #1781 without having to nullify the network, we should start removed the old, deprecated behaviour where the network was implicitly created in the constructor.
---
 .../containers/KafkaContainer.java            | 36 ++++++++-
 .../containers/KafkaContainerTest.java        | 74 ++++++++++---------
 2 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 25cfba9d322..4b5e66a7bf5 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
 import lombok.SneakyThrows;
-import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.util.concurrent.TimeUnit;
@@ -25,6 +24,8 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private int port = PORT_NOT_ASSIGNED;
 
+    private boolean useImplicitNetwork = true;
+
     public KafkaContainer() {
         this("5.2.1");
     }
@@ -32,9 +33,6 @@ public KafkaContainer() {
     public KafkaContainer(String confluentPlatformVersion) {
         super(TestcontainersConfiguration.getInstance().getKafkaImage() + ":" + confluentPlatformVersion);
 
-        // TODO Only for backward compatibility
-        withNetwork(Network.newNetwork());
-        withNetworkAliases("kafka-" + Base58.randomString(6));
         withExposedPorts(KAFKA_PORT);
 
         // Use two listeners with different names, it will force Kafka to communicate with itself via internal
@@ -50,6 +48,36 @@ public KafkaContainer(String confluentPlatformVersion) {
         withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
     }
 
+    @Override
+    public KafkaContainer withNetwork(Network network) {
+        useImplicitNetwork = false;
+        return super.withNetwork(network);
+    }
+
+    @Override
+    public Network getNetwork() {
+        if (useImplicitNetwork) {
+            // TODO Only for backward compatibility, to be removed soon
+            logger().warn(
+                "Deprecation warning! " +
+                    "KafkaContainer#getNetwork without an explicitly set network. " +
+                    "Consider using KafkaContainer#withNetwork",
+                new Exception("Deprecated method")
+            );
+            Network network = Network.SHARED;
+            super.withNetwork(network);
+
+            if (getContainerId() != null) {
+                dockerClient.connectToNetworkCmd()
+                    .withContainerId(getContainerId())
+                    .withNetworkId(network.getId())
+                    .exec();
+            }
+            return network;
+        }
+        return super.getNetwork();
+    }
+
     public KafkaContainer withEmbeddedZookeeper() {
         externalZookeeperConnect = null;
         return self();
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index fc36a3f4356..0b29ee0e6ef 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -31,16 +31,20 @@ public void testUsage() throws Exception {
         }
     }
 
+    /**
+     * @deprecated the {@link Network} should be set explicitly with {@link KafkaContainer#withNetwork(Network)}.
+     */
     @Test
+    @Deprecated
     public void testExternalZookeeperWithKafkaNetwork() throws Exception {
         try (
-                KafkaContainer kafka = new KafkaContainer()
-                        .withExternalZookeeper("zookeeper:2181");
+            KafkaContainer kafka = new KafkaContainer()
+                .withExternalZookeeper("zookeeper:2181");
 
-                GenericContainer zookeeper = new GenericContainer("confluentinc/cp-zookeeper:4.0.0")
-                        .withNetwork(kafka.getNetwork())
-                        .withNetworkAliases("zookeeper")
-                        .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
+            GenericContainer zookeeper = new GenericContainer("confluentinc/cp-zookeeper:4.0.0")
+                .withNetwork(kafka.getNetwork())
+                .withNetworkAliases("zookeeper")
+                .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
         ) {
             Stream.of(kafka, zookeeper).parallel().forEach(GenericContainer::start);
 
@@ -51,16 +55,16 @@ public void testExternalZookeeperWithKafkaNetwork() throws Exception {
     @Test
     public void testExternalZookeeperWithExternalNetwork() throws Exception {
         try (
-                Network network = Network.newNetwork();
+            Network network = Network.newNetwork();
 
-                KafkaContainer kafka = new KafkaContainer()
-                        .withNetwork(network)
-                        .withExternalZookeeper("zookeeper:2181");
+            KafkaContainer kafka = new KafkaContainer()
+                .withNetwork(network)
+                .withExternalZookeeper("zookeeper:2181");
 
-                GenericContainer zookeeper = new GenericContainer("confluentinc/cp-zookeeper:4.0.0")
-                        .withNetwork(network)
-                        .withNetworkAliases("zookeeper")
-                        .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
+            GenericContainer zookeeper = new GenericContainer("confluentinc/cp-zookeeper:4.0.0")
+                .withNetwork(network)
+                .withNetworkAliases("zookeeper")
+                .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
         ) {
             Stream.of(kafka, zookeeper).parallel().forEach(GenericContainer::start);
 
@@ -70,24 +74,24 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
 
     protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
         try (
-                KafkaProducer<String, String> producer = new KafkaProducer<>(
-                        ImmutableMap.of(
-                                ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
-                                ProducerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()
-                        ),
-                        new StringSerializer(),
-                        new StringSerializer()
-                );
-
-                KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
-                        ImmutableMap.of(
-                                ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
-                                ConsumerConfig.GROUP_ID_CONFIG, "tc-" + UUID.randomUUID(),
-                                ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"
-                        ),
-                        new StringDeserializer(),
-                        new StringDeserializer()
-                );
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                ImmutableMap.of(
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()
+                ),
+                new StringSerializer(),
+                new StringSerializer()
+            );
+
+            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
+                ImmutableMap.of(
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG, "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"
+                ),
+                new StringDeserializer(),
+                new StringDeserializer()
+            );
         ) {
             String topicName = "messages";
             consumer.subscribe(Arrays.asList(topicName));
@@ -102,9 +106,9 @@ protected void testKafkaFunctionality(String bootstrapServers) throws Exception
                 }
 
                 assertThat(records)
-                        .hasSize(1)
-                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
-                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+                    .hasSize(1)
+                    .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                    .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
 
                 return true;
             });

From 154e9339aba4a7f9e53f942ecb1b02362f479776 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 22 Nov 2019 14:48:35 +0100
Subject: [PATCH 0392/4969] Add Gradle wrapper to examples/ that points to the
 parent's wrapper (#2077)

* Add Gradle wrapper to examples/ that points to the parent's wrapper

* Update CI scripts
---
 .circleci/config.yml |   2 +-
 .travis.yml          |   2 +-
 examples/gradlew     | 188 +++++++++++++++++++++++++++++++++++++++++++
 examples/gradlew.bat | 100 +++++++++++++++++++++++
 4 files changed, 290 insertions(+), 2 deletions(-)
 create mode 100755 examples/gradlew
 create mode 100644 examples/gradlew.bat

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08c0f4aabab..5ee4097934a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,7 +81,7 @@ jobs:
     steps:
     - checkout
     - run:
-        command: cd examples && ../gradlew check
+        command: cd examples && ./gradlew check
     - run:
         name: Save test results
         command: |
diff --git a/.travis.yml b/.travis.yml
index d21033b942a..eda26dc69af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ jobs:
       script: ./gradlew jdbc-test:check --scan --no-daemon -i
 
     - env: [ NAME=examples ]
-      script: cd examples && ../gradlew check --no-daemon -i
+      script: cd examples && ./gradlew check --no-daemon -i
 
     # Run Docker-in-Docker tests inside Alpine
     - env: [ NAME="docker-in-alpine-docker" ]
diff --git a/examples/gradlew b/examples/gradlew
new file mode 100755
index 00000000000..56f7b0fc7bf
--- /dev/null
+++ b/examples/gradlew
@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/../gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
new file mode 100644
index 00000000000..f3a074d99d4
--- /dev/null
+++ b/examples/gradlew.bat
@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\..\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From 003ef139a9bdfa07a1fc57c90694f61fcfc61dd8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2019 20:56:42 +0000
Subject: [PATCH 0393/4969] Bump tomcat-jdbc from 9.0.27 to 9.0.29 in
 /modules/mariadb (#2096)

Bumps tomcat-jdbc from 9.0.27 to 9.0.29.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 f6d65f4a5f0..87462ce158d 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.1'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.27'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From 69c54aac43b8e4eed3e35d34424867a3e2c65b60 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2019 20:57:44 +0000
Subject: [PATCH 0394/4969] =?UTF-8?q?Bump=20aws-java-sdk-s3=20from=201.11.?=
 =?UTF-8?q?636=20to=201.11.680=20in=20/modules/loca=E2=80=A6=20(#2094)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.636 to 1.11.680.
- [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.636...1.11.680)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 1ee679abf98..770294621aa 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.636'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.680'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.636'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
 }

From 53e16333477e261460f170eddae78662c140774b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2019 20:57:56 +0000
Subject: [PATCH 0395/4969] Bump tomcat-jdbc from 9.0.27 to 9.0.29 in
 /modules/mysql (#2095)

Bumps tomcat-jdbc from 9.0.27 to 9.0.29.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 7704f56c54f..2a71e8f9d04 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.18'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.27'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:22.2'
 }

From f1e9883bcf50fdeebcbd93cbc0f55f721b2e4330 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 23 Nov 2019 15:22:00 +0000
Subject: [PATCH 0396/4969] Bump java-client from 2.7.9 to 2.7.10 in
 /modules/couchbase (#2057)

Bumps [java-client](https://github.com/couchbase/couchbase-java-client) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/couchbase/couchbase-java-client/releases)
- [Commits](https://github.com/couchbase/couchbase-java-client/compare/2.7.9...2.7.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 063b12c9d8e..7642bb2fc5b 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.9'
+    compile 'com.couchbase.client:java-client:2.7.10'
 
     testCompile project(':test-support')
 }

From b7565275eba1009b0db1d1cde0979420459555b6 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 23 Nov 2019 16:40:15 +0000
Subject: [PATCH 0397/4969] =?UTF-8?q?Upgrade=20docker-compose=20image=20to?=
 =?UTF-8?q?=20latest=20version=20and=20perform=20dire=E2=80=A6=20(#1847)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Upgrade docker-compose image to latest version and perform direct image pull

Together with using Compose file 2.1 syntax, this is a solution to network cleanup issue described in:
 * #1767
 * #739
 * https://github.com/testcontainers/moby-ryuk/issues/2
 * https://github.com/docker/compose/issues/6636

Solution to general credential helper authenticated pull issues in:
 * https://github.com/docker/compose/issues/5854

Tangentially should add support for v3 syntax (not yet tested) re #531
---
 .../containers/DockerComposeContainer.java    | 170 ++++--------------
 .../containers/ParsedDockerComposeFile.java   |  95 ++++++++++
 .../utility/TestcontainersConfiguration.java  |   2 +-
 .../DockerComposeFileValidationTest.java      |  70 --------
 ...ParsedDockerComposeFileValidationTest.java |  88 +++++++++
 .../junit/DockerComposeErrorHandlingTest.java |  15 +-
 core/src/test/resources/compose-test.yml      |   2 +-
 .../test/resources/docker-compose-base.yml    |   4 +-
 .../docker-compose-imagename-parsing-v1.yml   |   6 +
 .../docker-compose-imagename-parsing-v2.yml   |  10 ++
 .../docker-compose-non-default-override.yml   |   4 +-
 .../src/test/resources/local-compose-test.yml |   2 +-
 .../resources/v2-compose-test-passthrough.yml |   2 +-
 .../v2-compose-test-with-network.yml          |   2 +-
 core/src/test/resources/v2-compose-test.yml   |   2 +-
 .../src/test/resources/docker-compose.yml     |   2 +-
 .../src/test/resources/docker-compose.yml     |   2 +-
 17 files changed, 250 insertions(+), 228 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
 delete mode 100644 core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
 create mode 100644 core/src/test/resources/docker-compose-imagename-parsing-v1.yml
 create mode 100644 core/src/test/resources/docker-compose-imagename-parsing-v2.yml

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 73628a19ad7..31d84284584 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -2,14 +2,13 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Container;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.Uninterruptibles;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.junit.runner.Description;
@@ -19,18 +18,16 @@
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.startupcheck.IndefiniteWaitOneShotStartupCheckStrategy;
-import org.testcontainers.containers.wait.strategy.*;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.utility.*;
-import org.yaml.snakeyaml.Yaml;
 import org.zeroturnaround.exec.InvalidExitValueException;
 import org.zeroturnaround.exec.ProcessExecutor;
 import org.zeroturnaround.exec.stream.slf4j.Slf4jStream;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.*;
 import java.time.Duration;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.*;
@@ -38,6 +35,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -58,8 +56,7 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
      */
     private final String identifier;
     private final List<File> composeFiles;
-    private final Set<String> spawnedContainerIds = new HashSet<>();
-    private final Set<String> spawnedNetworkIds = new HashSet<>();
+    private Set<ParsedDockerComposeFile> parsedComposeFiles;
     private final Map<String, Integer> scalingPreferences = new HashMap<>();
     private DockerClient dockerClient;
     private boolean localCompose;
@@ -107,10 +104,11 @@ public DockerComposeContainer(String identifier, File... composeFiles) {
     public DockerComposeContainer(String identifier, List<File> composeFiles) {
 
         this.composeFiles = composeFiles;
+        this.parsedComposeFiles = composeFiles.stream().map(ParsedDockerComposeFile::new).collect(Collectors.toSet());
 
         // Use a unique identifier so that containers created for this compose environment can be identified
         this.identifier = identifier;
-        project = randomProjectId();
+        this.project = randomProjectId();
 
         this.dockerClient = DockerClientFactory.instance().client();
     }
@@ -154,7 +152,6 @@ public void start() {
                     log.warn("Exception while pulling images, using local images if available", e);
                 }
             }
-            applyScaling(); // scale before up, so that all scaled instances are available first for linking
             createServices();
             startAmbassadorContainers();
             waitUntilServiceStarted();
@@ -162,7 +159,18 @@ public void start() {
     }
 
     private void pullImages() {
-        runWithCompose("pull");
+        // Pull images using our docker client rather than compose itself,
+        // (a) as a workaround for https://github.com/docker/compose/issues/5854, which prevents authenticated image pulls being possible when credential helpers are in use
+        // (b) so that credential helper-based auth still works when compose is running from within a container
+        parsedComposeFiles.stream()
+            .flatMap(it -> it.getServiceImageNames().stream())
+            .forEach(imageName -> {
+                try {
+                    DockerClientFactory.instance().checkAndPullImage(dockerClient, imageName);
+                } catch (Exception e) {
+                    log.warn("Failed to pull image '{}'. Exception message was {}", imageName, e.getMessage());
+                }
+            });
     }
 
     public SELF withServices(@NonNull String... services) {
@@ -171,18 +179,23 @@ public SELF withServices(@NonNull String... services) {
     }
 
     private void createServices() {
-        // Run the docker-compose container, which starts up the services
-        String command = "up -d";
+        // Apply scaling
+        final String servicesWithScalingSettings = Stream.concat(services.stream(), scalingPreferences.keySet().stream())
+            .map(service -> "--scale " + service + "=" + scalingPreferences.getOrDefault(service, 1))
+            .collect(joining(" "));
+
+        String flags = "-d";
 
         if (build) {
-            command += " --build";
+            flags += " --build";
         }
 
-        if (!services.isEmpty()) {
-            command += " " + String.join(" ", services);
+        // Run the docker-compose container, which starts up the services
+        if(Strings.isNullOrEmpty(servicesWithScalingSettings)) {
+            runWithCompose("up " + flags);
+        } else {
+            runWithCompose("up " + flags + " " + servicesWithScalingSettings);
         }
-
-        runWithCompose(command);
     }
 
     private void waitUntilServiceStarted() {
@@ -221,10 +234,6 @@ private void runWithCompose(String cmd) {
         checkNotNull(composeFiles);
         checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
 
-        for (File composeFile : composeFiles) {
-            validate(composeFile);
-        }
-
         final DockerCompose dockerCompose;
         if (localCompose) {
             dockerCompose = new LocalDockerCompose(composeFiles, project);
@@ -238,72 +247,6 @@ private void runWithCompose(String cmd) {
                 .invoke();
     }
 
-    @SuppressWarnings("unchecked")
-    private static void validate(File composeFile) {
-        Yaml yaml = new Yaml();
-        try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) {
-            Object template = yaml.load(fileInputStream);
-            validate(template, composeFile.getAbsolutePath());
-        } catch (IOException e) {
-            log.warn("Failed to read YAML from {}", composeFile.getAbsolutePath(), e);
-        }
-    }
-
-    @VisibleForTesting
-    static void validate(Object template, String identifier) {
-        if (!(template instanceof Map)) {
-            return;
-        }
-
-        Map<String, ?> map = (Map<String, ?>) template;
-
-        final Map<String, ?> servicesMap;
-        if (map.containsKey("version")) {
-            if (!map.containsKey("services")) {
-                log.debug("Compose file {} has an unknown format: 'version' is set but 'services' is not defined", identifier);
-                return;
-            }
-            Object services = map.get("services");
-            if (!(services instanceof Map)) {
-                log.debug("Compose file {} has an unknown format: 'services' is not Map", identifier);
-                return;
-            }
-
-            servicesMap = (Map<String, ?>) services;
-        } else {
-            servicesMap = map;
-        }
-
-        for (Map.Entry<String, ?> entry : servicesMap.entrySet()) {
-            String serviceName = entry.getKey();
-            Object serviceDefinition = entry.getValue();
-            if (!(serviceDefinition instanceof Map)) {
-                log.debug("Compose file {} has an unknown format: service '{}' is not Map", identifier, serviceName);
-                break;
-            }
-
-            if (((Map) serviceDefinition).containsKey("container_name")) {
-                throw new IllegalStateException(String.format(
-                    "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it",
-                    identifier,
-                    serviceName
-                ));
-            }
-        }
-    }
-
-    private void applyScaling() {
-        // Apply scaling
-        if (!scalingPreferences.isEmpty()) {
-            StringBuilder sb = new StringBuilder("scale");
-            for (Map.Entry<String, Integer> scale : scalingPreferences.entrySet()) {
-                sb.append(" ").append(scale.getKey()).append("=").append(scale.getValue());
-            }
-
-            runWithCompose(sb.toString());
-        }
-    }
-
     private void registerContainersForShutdown() {
         ResourceReaper.instance().registerFilterForCleanup(Arrays.asList(
                 new SimpleEntry<>("label", "com.docker.compose.project=" + project)
@@ -333,29 +276,12 @@ public void stop() {
                 ambassadorContainer.stop();
 
                 // Kill the services using docker-compose
-                try {
-                    String cmd = "down -v";
-                    if (removeImages != null) {
-                        cmd += " --rmi " + removeImages.dockerRemoveImagesType();
-                    }
-                    runWithCompose(cmd);
-
-                    // If we reach here then docker-compose down has cleared networks and containers;
-                    //  we can unregister from ResourceReaper
-                    spawnedContainerIds.forEach(ResourceReaper.instance()::unregisterContainer);
-                    spawnedNetworkIds.forEach(ResourceReaper.instance()::unregisterNetwork);
-                } catch (Exception e) {
-                    // docker-compose down failed; use ResourceReaper to ensure cleanup
-
-                    // kill the spawned service containers
-                    spawnedContainerIds.forEach(ResourceReaper.instance()::stopAndRemoveContainer);
-
-                    // remove the networks after removing the containers
-                    spawnedNetworkIds.forEach(ResourceReaper.instance()::removeNetworkById);
+                String cmd = "down -v";
+                if (removeImages != null) {
+                    cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
+                runWithCompose(cmd);
 
-                spawnedContainerIds.clear();
-                spawnedNetworkIds.clear();
             } finally {
                 project = randomProjectId();
             }
@@ -597,9 +523,6 @@ interface DockerCompose {
 class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
 
     private static final String DOCKER_SOCKET_PATH = "/var/run/docker.sock";
-    private static final String DOCKER_CONFIG_FILE = "/root/.docker/config.json";
-    private static final String DOCKER_CONFIG_ENV = "DOCKER_CONFIG_FILE";
-    private static final String DOCKER_CONFIG_PROPERTY = "dockerConfigFile";
     public static final char UNIX_PATH_SEPERATOR = ':';
 
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
@@ -630,27 +553,6 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
         addEnv("DOCKER_HOST", "unix:///docker.sock");
         setStartupCheckStrategy(new IndefiniteWaitOneShotStartupCheckStrategy());
         setWorkingDirectory(containerPwd);
-
-        String dockerConfigPath = determineDockerConfigPath();
-        if (dockerConfigPath != null && !dockerConfigPath.isEmpty()) {
-            addFileSystemBind(dockerConfigPath, DOCKER_CONFIG_FILE, READ_ONLY);
-        }
-    }
-
-    private String determineDockerConfigPath() {
-        String dockerConfigEnv = System.getenv(DOCKER_CONFIG_ENV);
-        String dockerConfigProperty = System.getProperty(DOCKER_CONFIG_PROPERTY);
-        Path dockerConfig = Paths.get(System.getProperty("user.home"), ".docker", "config.json");
-
-        if (dockerConfigEnv != null && !dockerConfigEnv.trim().isEmpty() && Files.exists(Paths.get(dockerConfigEnv))) {
-            return dockerConfigEnv;
-        } else if (dockerConfigProperty != null && !dockerConfigProperty.trim().isEmpty() && Files.exists(Paths.get(dockerConfigProperty))) {
-            return dockerConfigProperty;
-        } else if (Files.exists(dockerConfig)) {
-            return dockerConfig.toString();
-        } else {
-            return null;
-        }
     }
 
     private String getDockerSocketHostPath() {
diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
new file mode 100644
index 00000000000..838607d8337
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -0,0 +1,95 @@
+package org.testcontainers.containers;
+
+import com.google.common.annotations.VisibleForTesting;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Representation of a docker-compose file, with partial parsing for validation and extraction of a minimal set of
+ * data.
+ */
+@Slf4j
+@EqualsAndHashCode
+class ParsedDockerComposeFile {
+
+    private final Map<String, Object> composeFileContent;
+    private final String composeFileName;
+
+    @Getter
+    private Set<String> serviceImageNames = new HashSet<>();
+
+    ParsedDockerComposeFile(File composeFile) {
+        Yaml yaml = new Yaml();
+        try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) {
+            composeFileContent = yaml.load(fileInputStream);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Unable to parse YAML file from " + composeFile.getAbsolutePath(), e);
+        }
+        this.composeFileName = composeFile.getAbsolutePath();
+
+        parseAndValidate();
+    }
+
+    @VisibleForTesting
+    ParsedDockerComposeFile(Map<String, Object> testContent) {
+        this.composeFileContent = testContent;
+        this.composeFileName = "";
+
+        parseAndValidate();
+    }
+
+    private void parseAndValidate() {
+        final Map<String, ?> servicesMap;
+        if (composeFileContent.containsKey("version")) {
+            if ("2.0".equals(composeFileContent.get("version"))) {
+                log.warn("Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " +
+                    "Please see https://github.com/testcontainers/moby-ryuk/issues/2, and specify 'version: \"2.1\"' or " +
+                    "higher in {}", composeFileName);
+            }
+
+            final Object servicesElement = composeFileContent.get("services");
+            if (servicesElement == null) {
+                log.debug("Compose file {} has an unknown format: 'version' is set but 'services' is not defined", composeFileName);
+                return;
+            }
+            if (!(servicesElement instanceof Map)) {
+                log.debug("Compose file {} has an unknown format: 'services' is not Map", composeFileName);
+                return;
+            }
+
+            servicesMap = (Map<String, ?>) servicesElement;
+        } else {
+            servicesMap = composeFileContent;
+        }
+
+        for (Map.Entry<String, ?> entry : servicesMap.entrySet()) {
+            String serviceName = entry.getKey();
+            Object serviceDefinition = entry.getValue();
+            if (!(serviceDefinition instanceof Map)) {
+                log.debug("Compose file {} has an unknown format: service '{}' is not Map", composeFileName, serviceName);
+                break;
+            }
+
+            final Map serviceDefinitionMap = (Map) serviceDefinition;
+            if (serviceDefinitionMap.containsKey("container_name")) {
+                throw new IllegalStateException(String.format(
+                    "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it",
+                    composeFileName,
+                    serviceName
+                ));
+            }
+            if (serviceDefinitionMap.containsKey("image") && serviceDefinitionMap.get("image") instanceof String) {
+                serviceImageNames.add((String) serviceDefinitionMap.get("image"));
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index e5a45a05b64..1387dc6b9cd 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -51,7 +51,7 @@ public String getVncRecordedContainerImage() {
     }
 
     public String getDockerComposeContainerImage() {
-        return (String) properties.getOrDefault("compose.container.image", "docker/compose:1.8.0");
+        return (String) properties.getOrDefault("compose.container.image", "docker/compose:1.24.1");
     }
 
     public String getTinyImage() {
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
deleted file mode 100644
index 7a3121dcd32..00000000000
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.testcontainers.containers;
-
-import com.google.common.collect.ImmutableMap;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-import java.io.File;
-
-import static java.util.Collections.emptyList;
-
-public class DockerComposeFileValidationTest {
-
-    @Test
-    public void shouldValidate() {
-        File file = new File("src/test/resources/docker-compose-container-name-v1.yml");
-        try (DockerComposeContainer container = new DockerComposeContainer<>(file)) {
-            Assertions.assertThatThrownBy(container::start)
-                .hasMessageContaining(file.getAbsolutePath())
-                .hasMessageContaining("'container_name' property set for service 'redis'");
-        }
-    }
-
-    @Test
-    public void shouldRejectContainerNameV1() {
-        Assertions
-            .assertThatThrownBy(() -> {
-                DockerComposeContainer.validate(ImmutableMap.of(
-                    "redis", ImmutableMap.of("container_name", "redis")
-                ), "");
-            })
-            .hasMessageContaining("'container_name' property set for service 'redis'");
-    }
-
-    @Test
-    public void shouldRejectContainerNameV2() {
-        Assertions
-            .assertThatThrownBy(() -> {
-                DockerComposeContainer.validate(ImmutableMap.of(
-                    "version", "2",
-                    "services", ImmutableMap.of(
-                        "redis", ImmutableMap.of("container_name", "redis")
-                    )
-                ), "");
-            })
-            .hasMessageContaining("'container_name' property set for service 'redis'");
-    }
-
-    @Test
-    public void shouldIgnoreUnknownStructure() {
-        // Everything is a list
-        DockerComposeContainer.validate(emptyList(), "");
-
-        // services is not a map but List
-        DockerComposeContainer.validate(ImmutableMap.of(
-            "version", "2",
-            "services", emptyList()
-        ), "");
-
-        // services is not a collection
-        DockerComposeContainer.validate(ImmutableMap.of(
-            "version", "2",
-            "services", true
-        ), "");
-
-        // no services while version is defined
-        DockerComposeContainer.validate(ImmutableMap.of(
-            "version", "9000"
-        ), "");
-    }
-}
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
new file mode 100644
index 00000000000..c553d250ec9
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -0,0 +1,88 @@
+package org.testcontainers.containers;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import java.io.File;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class ParsedDockerComposeFileValidationTest {
+
+    @Test
+    public void shouldValidate() {
+        File file = new File("src/test/resources/docker-compose-container-name-v1.yml");
+        Assertions
+            .assertThatThrownBy(() -> {
+                new ParsedDockerComposeFile(file);
+            })
+            .hasMessageContaining(file.getAbsolutePath())
+            .hasMessageContaining("'container_name' property set for service 'redis'");
+    }
+
+    @Test
+    public void shouldRejectContainerNameV1() {
+        Assertions
+            .assertThatThrownBy(() -> {
+                new ParsedDockerComposeFile(ImmutableMap.of(
+                    "redis", ImmutableMap.of("container_name", "redis")
+                ));
+            })
+            .hasMessageContaining("'container_name' property set for service 'redis'");
+    }
+
+    @Test
+    public void shouldRejectContainerNameV2() {
+        Assertions
+            .assertThatThrownBy(() -> {
+                new ParsedDockerComposeFile(ImmutableMap.of(
+                    "version", "2",
+                    "services", ImmutableMap.of(
+                        "redis", ImmutableMap.of("container_name", "redis")
+                    )
+                ));
+            })
+            .hasMessageContaining("'container_name' property set for service 'redis'");
+    }
+
+    @Test
+    public void shouldIgnoreUnknownStructure() {
+        // Everything is a list
+        new ParsedDockerComposeFile(emptyMap());
+
+        // services is not a map but List
+        new ParsedDockerComposeFile(ImmutableMap.of(
+            "version", "2",
+            "services", emptyList()
+        ));
+
+        // services is not a collection
+        new ParsedDockerComposeFile(ImmutableMap.of(
+            "version", "2",
+            "services", true
+        ));
+
+        // no services while version is defined
+        new ParsedDockerComposeFile(ImmutableMap.of(
+            "version", "9000"
+        ));
+    }
+
+    @Test
+    public void shouldObtainImageNamesV1() {
+        File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml");
+        ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
+        assertEquals("all defined service names are found", Sets.newHashSet("redis", "mysql"), parsedFile.getServiceImageNames());
+    }
+
+    @Test
+    public void shouldObtainImageNamesV2() {
+        File file = new File("src/test/resources/docker-compose-imagename-parsing-v2.yml");
+        ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
+        assertEquals("all defined service names are found", Sets.newHashSet("redis", "mysql"), parsedFile.getServiceImageNames());
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
index c48cff1ff14..b8e26ffd3f1 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
@@ -1,29 +1,20 @@
 package org.testcontainers.junit;
 
 import org.junit.Test;
-import org.junit.runner.Description;
 import org.rnorth.visibleassertions.VisibleAssertions;
-import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
 
-/**
- * Created by rnorth on 08/08/2015.
- */
 public class DockerComposeErrorHandlingTest {
 
-
     @Test
     public void simpleTest() {
-
-        DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/invalid-compose.yml"))
-                    .withExposedService("something", 123);
-
         VisibleAssertions.assertThrows("starting with an invalid docker-compose file throws an exception",
-                ContainerLaunchException.class,
+            IllegalArgumentException.class,
                 () -> {
-                    environment.starting(Description.createTestDescription(Object.class, "name"));
+                    DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/invalid-compose.yml"))
+                        .withExposedService("something", 123);
                 });
     }
 }
diff --git a/core/src/test/resources/compose-test.yml b/core/src/test/resources/compose-test.yml
index 2e54e9f30b1..7436db7d211 100644
--- a/core/src/test/resources/compose-test.yml
+++ b/core/src/test/resources/compose-test.yml
@@ -3,4 +3,4 @@ redis:
 db:
   image: orchardup/mysql
   environment:
-    MYSQL_DATABASE: wordpress
\ No newline at end of file
+    MYSQL_DATABASE: wordpress
diff --git a/core/src/test/resources/docker-compose-base.yml b/core/src/test/resources/docker-compose-base.yml
index c2dda256277..585d3dead39 100644
--- a/core/src/test/resources/docker-compose-base.yml
+++ b/core/src/test/resources/docker-compose-base.yml
@@ -1,6 +1,6 @@
-version: '2'
+version: '2.1'
 services:
   alpine:
     build: compose-dockerfile
     environment:
-      bar: base
\ No newline at end of file
+      bar: base
diff --git a/core/src/test/resources/docker-compose-imagename-parsing-v1.yml b/core/src/test/resources/docker-compose-imagename-parsing-v1.yml
new file mode 100644
index 00000000000..c3ae53fa3a8
--- /dev/null
+++ b/core/src/test/resources/docker-compose-imagename-parsing-v1.yml
@@ -0,0 +1,6 @@
+redis:
+    image: redis
+mysql:
+    image: mysql
+custom:
+    build: .
diff --git a/core/src/test/resources/docker-compose-imagename-parsing-v2.yml b/core/src/test/resources/docker-compose-imagename-parsing-v2.yml
new file mode 100644
index 00000000000..71ca8409f27
--- /dev/null
+++ b/core/src/test/resources/docker-compose-imagename-parsing-v2.yml
@@ -0,0 +1,10 @@
+version: "2.1"
+services:
+    redis:
+        image: redis
+    mysql:
+        image: mysql
+    custom:
+        build: .
+networks:
+    custom_network: {}
diff --git a/core/src/test/resources/docker-compose-non-default-override.yml b/core/src/test/resources/docker-compose-non-default-override.yml
index fa7acb70dfd..19f80a31c83 100644
--- a/core/src/test/resources/docker-compose-non-default-override.yml
+++ b/core/src/test/resources/docker-compose-non-default-override.yml
@@ -1,5 +1,5 @@
-version: '2'
+version: '2.1'
 services:
   alpine:
     environment:
-      bar: overwritten
\ No newline at end of file
+      bar: overwritten
diff --git a/core/src/test/resources/local-compose-test.yml b/core/src/test/resources/local-compose-test.yml
index 8d4f20e6924..b5f61be041b 100644
--- a/core/src/test/resources/local-compose-test.yml
+++ b/core/src/test/resources/local-compose-test.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   redis:
     image: redis-local:latest
diff --git a/core/src/test/resources/v2-compose-test-passthrough.yml b/core/src/test/resources/v2-compose-test-passthrough.yml
index b52f2d28b0e..f96aff26f75 100644
--- a/core/src/test/resources/v2-compose-test-passthrough.yml
+++ b/core/src/test/resources/v2-compose-test-passthrough.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   alpine:
     build: compose-dockerfile
diff --git a/core/src/test/resources/v2-compose-test-with-network.yml b/core/src/test/resources/v2-compose-test-with-network.yml
index 82b54a85823..89301c7918a 100644
--- a/core/src/test/resources/v2-compose-test-with-network.yml
+++ b/core/src/test/resources/v2-compose-test-with-network.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   redis:
     image: redis
diff --git a/core/src/test/resources/v2-compose-test.yml b/core/src/test/resources/v2-compose-test.yml
index d439945d236..a9090c55671 100644
--- a/core/src/test/resources/v2-compose-test.yml
+++ b/core/src/test/resources/v2-compose-test.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   redis:
     image: redis
diff --git a/modules/junit-jupiter/src/test/resources/docker-compose.yml b/modules/junit-jupiter/src/test/resources/docker-compose.yml
index ec1015f106a..810c7c178b5 100644
--- a/modules/junit-jupiter/src/test/resources/docker-compose.yml
+++ b/modules/junit-jupiter/src/test/resources/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   whoami:
     image: emilevauge/whoami
diff --git a/modules/spock/src/test/resources/docker-compose.yml b/modules/spock/src/test/resources/docker-compose.yml
index ec1015f106a..810c7c178b5 100644
--- a/modules/spock/src/test/resources/docker-compose.yml
+++ b/modules/spock/src/test/resources/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   whoami:
     image: emilevauge/whoami

From 8fb199ff32386f5f83961a60471ef10e7a379a72 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 27 Nov 2019 09:38:05 +0100
Subject: [PATCH 0398/4969] Mock TestcontainersConfiguration in
 ReusabilityUnitTests (#2080)

---
 .../utility/TestcontainersConfiguration.java  | 11 +++++-
 .../containers/ReusabilityUnitTests.java      | 39 +++++++++++--------
 .../MockTestcontainersConfigurationRule.java  | 36 +++++++++++++++++
 3 files changed, 69 insertions(+), 17 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 1387dc6b9cd..64ee03efb06 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -1,5 +1,6 @@
 package org.testcontainers.utility;
 
+import com.google.common.annotations.VisibleForTesting;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.UnstableAPI;
@@ -9,6 +10,7 @@
 import java.net.URL;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
 /**
@@ -24,7 +26,14 @@ public class TestcontainersConfiguration {
     private static File ENVIRONMENT_CONFIG_FILE = new File(System.getProperty("user.home"), "." + PROPERTIES_FILE_NAME);
 
     @Getter(lazy = true)
-    private static final TestcontainersConfiguration instance = loadConfiguration();
+    private static final TestcontainersConfiguration instance = loadConfiguration();;
+
+    @SuppressWarnings({"ConstantConditions", "unchecked", "rawtypes"})
+    @VisibleForTesting
+    static AtomicReference<TestcontainersConfiguration> getInstanceField() {
+        // Lazy Getter from Lombok changes the field's type to AtomicReference
+        return (AtomicReference) (Object) instance;
+    }
 
     @Getter(AccessLevel.NONE)
     private final Properties environmentProperties;
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 2d0f7a8133a..3f7c7d75b45 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -11,7 +11,7 @@
 import com.github.dockerjava.core.command.StartContainerCmdImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
-import org.junit.Assume;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
@@ -23,6 +23,7 @@
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.util.ArrayList;
@@ -128,9 +129,8 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
 
         @Test
         public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
-            // TODO mock TestcontainersConfiguration
-            Assume.assumeFalse("does not support reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
-            AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
+            Mockito.doReturn(false).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
+
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
             when(client.listContainersCmd()).then(listContainersAnswer());
@@ -147,8 +147,7 @@ public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
 
         @Test
         public void shouldCallHookIfReused() {
-            // TODO mock TestcontainersConfiguration
-            Assume.assumeTrue("supports reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
+            Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
             String existingContainerId = randomContainerId();
@@ -200,8 +199,7 @@ public void shouldStartIfListReturnsEmpty() {
 
         @Test
         public void shouldReuseIfListReturnsID() {
-            // TODO mock TestcontainersConfiguration
-            Assume.assumeTrue("supports reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
+            Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
             String existingContainerId = randomContainerId();
@@ -216,8 +214,7 @@ public void shouldReuseIfListReturnsID() {
 
         @Test
         public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
-            // TODO mock TestcontainersConfiguration
-            Assume.assumeFalse("does not support reuse", TestcontainersConfiguration.getInstance().environmentSupportsReuse());
+            Mockito.doReturn(false).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId, commandRef::set));
@@ -236,7 +233,10 @@ public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
     }
 
     @FieldDefaults(makeFinal = true)
-    static abstract class AbstractReusabilityTest {
+    public static abstract class AbstractReusabilityTest {
+
+        @Rule
+        public MockTestcontainersConfigurationRule configurationMock = new MockTestcontainersConfigurationRule();
 
         protected DockerClient client = Mockito.mock(DockerClient.class);
 
@@ -244,11 +244,18 @@ protected <T extends GenericContainer<?>> T makeReusable(T container) {
             container.dockerClient = client;
             container.withNetworkMode("none"); // to disable the port forwarding
             container.withStartupCheckStrategy(new StartupCheckStrategy() {
-                    @Override
-                    public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
-                        return StartupStatus.SUCCESSFUL;
-                    }
-                });
+
+                @Override
+                public boolean waitUntilStartupSuccessful(DockerClient dockerClient, String containerId) {
+                    // Skip DockerClient rate limiter
+                    return true;
+                }
+
+                @Override
+                public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
+                    return StartupStatus.SUCCESSFUL;
+                }
+            });
             container.waitingFor(new AbstractWaitStrategy() {
                     @Override
                     protected void waitUntilReady() {
diff --git a/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java b/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java
new file mode 100644
index 00000000000..4d156fd752e
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java
@@ -0,0 +1,36 @@
+package org.testcontainers.utility;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+import org.mockito.Mockito;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * This {@link TestRule} applies a spy on {@link TestcontainersConfiguration}
+ * for testing features that depend on the global configuration.
+ */
+public class MockTestcontainersConfigurationRule implements TestRule {
+
+    static AtomicReference<TestcontainersConfiguration> REF = TestcontainersConfiguration.getInstanceField();
+
+    @NotNull
+    @Override
+    public Statement apply(@NotNull Statement base, @NotNull Description description) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                TestcontainersConfiguration previous = REF.get();
+                REF.set(Mockito.spy(previous));
+
+                try {
+                    base.evaluate();
+                } finally {
+                    REF.set(previous);
+                }
+            }
+        };
+    }
+}

From 17d86c94dae3ac21c4c8c1949b72fe7a770eb3a9 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 27 Nov 2019 16:56:15 +0100
Subject: [PATCH 0399/4969] Image pull policy (#2024)

See #1345 by @dmarkhas

Fixes #1324
---
 .../testcontainers/DockerClientFactory.java   |   4 +
 .../{containers => }/LazyDockerClient.java    |   5 +-
 .../testcontainers/containers/Container.java  |   7 +
 .../containers/GenericContainer.java          |  31 +--
 .../AuditLoggingDockerClient.java             |   4 +
 .../images/AbstractImagePullPolicy.java       |  49 +++++
 .../images/AgeBasedPullPolicy.java            |  28 +++
 .../images/AlwaysPullPolicy.java              |  20 ++
 .../images/DefaultPullPolicy.java             |  18 ++
 .../org/testcontainers/images/ImageData.java  |  29 +++
 .../images/ImagePullPolicy.java               |   9 +
 .../images/LocalImagesCache.java              |  89 +++++++++
 .../org/testcontainers/images/PullPolicy.java |  38 ++++
 .../images/RemoteDockerImage.java             |  80 ++++----
 .../images/AgeBasedPullPolicyTest.java        |  30 +++
 .../images/ImagePullPolicyTest.java           | 178 ++++++++++++++++++
 .../junit/NonExistentImagePullTest.java       |   2 +-
 docs/features/advanced_options.md             |  16 ++
 18 files changed, 575 insertions(+), 62 deletions(-)
 rename core/src/main/java/org/testcontainers/{containers => }/LazyDockerClient.java (75%)
 create mode 100644 core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
 create mode 100644 core/src/main/java/org/testcontainers/images/AgeBasedPullPolicy.java
 create mode 100644 core/src/main/java/org/testcontainers/images/AlwaysPullPolicy.java
 create mode 100644 core/src/main/java/org/testcontainers/images/DefaultPullPolicy.java
 create mode 100644 core/src/main/java/org/testcontainers/images/ImageData.java
 create mode 100644 core/src/main/java/org/testcontainers/images/ImagePullPolicy.java
 create mode 100644 core/src/main/java/org/testcontainers/images/LocalImagesCache.java
 create mode 100644 core/src/main/java/org/testcontainers/images/PullPolicy.java
 create mode 100644 core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
 create mode 100644 core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 928b4cad291..54f44dbed3c 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -81,6 +81,10 @@ private DockerClientFactory() {
 
     }
 
+    public static DockerClient lazyClient() {
+        return LazyDockerClient.INSTANCE;
+    }
+
     /**
      * Obtain an instance of the DockerClientFactory.
      *
diff --git a/core/src/main/java/org/testcontainers/containers/LazyDockerClient.java b/core/src/main/java/org/testcontainers/LazyDockerClient.java
similarity index 75%
rename from core/src/main/java/org/testcontainers/containers/LazyDockerClient.java
rename to core/src/main/java/org/testcontainers/LazyDockerClient.java
index b1341b52755..49ebf9330a7 100644
--- a/core/src/main/java/org/testcontainers/containers/LazyDockerClient.java
+++ b/core/src/main/java/org/testcontainers/LazyDockerClient.java
@@ -1,9 +1,10 @@
-package org.testcontainers.containers;
+package org.testcontainers;
 
 import com.github.dockerjava.api.DockerClient;
+import lombok.ToString;
 import lombok.experimental.Delegate;
-import org.testcontainers.DockerClientFactory;
 
+@ToString
 enum LazyDockerClient implements DockerClient {
 
     INSTANCE;
diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index ca327149ab5..ef27a95a463 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -8,6 +8,7 @@
 import lombok.NonNull;
 import lombok.Value;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.traits.LinkableContainer;
@@ -283,6 +284,12 @@ default SELF withEnv(String key, Function<Optional<String>, String> mapper) {
      */
     SELF withNetworkAliases(String... aliases);
 
+    /**
+     * Set the image pull policy of the container
+     * @return
+     */
+    SELF withImagePullPolicy(ImagePullPolicy policy);
+
     /**
      * Map a resource (file or directory) on the classpath to a path inside the container.
      * This will only work if you are running your tests outside a Docker container.
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 47d08b57528..94ce6f64518 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -41,6 +41,7 @@
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.UnstableAPI;
+import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
@@ -139,7 +140,7 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     ));
 
     @NonNull
-    private Future<String> image;
+    private RemoteDockerImage image;
 
     @NonNull
     private Map<String, String> env = new HashMap<>();
@@ -185,10 +186,10 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     /**
      * Unique instance of DockerClient for use by this container object.
-     * We use {@link LazyDockerClient} here to avoid eager client creation
+     * We use {@link DockerClientFactory#lazyClient()} here to avoid eager client creation
      */
     @Setter(AccessLevel.NONE)
-    protected DockerClient dockerClient = LazyDockerClient.INSTANCE;
+    protected DockerClient dockerClient = DockerClientFactory.lazyClient();
 
     /*
      * Info about the Docker server; lazily fetched.
@@ -250,7 +251,11 @@ public GenericContainer(@NonNull final String dockerImageName) {
     }
 
     public GenericContainer(@NonNull final Future<String> image) {
-        this.image = image;
+        setImage(image);
+    }
+
+    public void setImage(Future<String> image) {
+        this.image = new RemoteDockerImage(image);
     }
 
     /**
@@ -297,11 +302,11 @@ protected void doStart() {
             Instant startedAt = Instant.now();
 
             logger().debug("Starting container: {}", getDockerImageName());
-            logger().debug("Trying to start container: {}", image.get());
+            logger().debug("Trying to start container: {}", getDockerImageName());
 
             AtomicInteger attempt = new AtomicInteger(0);
             Unreliables.retryUntilSuccess(startupAttempts, () -> {
-                logger().debug("Trying to start container: {} (attempt {}/{})", image.get(), attempt.incrementAndGet(), startupAttempts);
+                logger().debug("Trying to start container: {} (attempt {}/{})", getDockerImageName(), attempt.incrementAndGet(), startupAttempts);
                 tryStart(startedAt);
                 return true;
             });
@@ -331,7 +336,7 @@ protected boolean canBeReused() {
 
     private void tryStart(Instant startedAt) {
         try {
-            String dockerImageName = image.get();
+            String dockerImageName = getDockerImageName();
             logger().debug("Starting container: {}", dockerImageName);
 
             logger().info("Creating container for image: {}", dockerImageName);
@@ -530,7 +535,7 @@ public void stop() {
             String imageName;
 
             try {
-                imageName = image.get();
+                imageName = getDockerImageName();
             } catch (Exception e) {
                 imageName = "<unknown>";
             }
@@ -571,7 +576,6 @@ protected Path createVolumeDirectory(boolean temporary) {
     }
 
     protected void configure() {
-
     }
 
     @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
@@ -1107,6 +1111,12 @@ public SELF withNetworkAliases(String... aliases) {
         return self();
     }
 
+    @Override
+    public SELF withImagePullPolicy(ImagePullPolicy imagePullPolicy) {
+        this.image = this.image.withImagePullPolicy(imagePullPolicy);
+        return self();
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -1199,9 +1209,6 @@ public String getIpAddress() {
     @Override
     public void setDockerImageName(@NonNull String dockerImageName) {
         this.image = new RemoteDockerImage(dockerImageName);
-
-        // Mimic old behavior where we resolve image once it's set
-        getDockerImageName();
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
index 4250b884a74..f982945f9d4 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
@@ -6,6 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 import java.util.function.BiConsumer;
 
@@ -99,6 +100,9 @@ private <T extends SyncDockerCmd<R>, R> T wrappedCommand(Class<T> clazz,
                             successConsumer.accept(cmd, r);
                             return r;
                         } catch (Exception e) {
+                            if (e instanceof InvocationTargetException && e.getCause() instanceof Exception) {
+                                e = (Exception) e.getCause();
+                            }
                             failureConsumer.accept(cmd, e);
                             throw e;
                         }
diff --git a/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java b/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
new file mode 100644
index 00000000000..11c621eb08b
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
@@ -0,0 +1,49 @@
+package org.testcontainers.images;
+
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.DockerLoggerFactory;
+
+@Slf4j
+public abstract class AbstractImagePullPolicy implements ImagePullPolicy {
+
+    private static final LocalImagesCache LOCAL_IMAGES_CACHE = LocalImagesCache.INSTANCE;
+
+    @Override
+    public boolean shouldPull(DockerImageName imageName) {
+        Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
+
+        // Does our cache already know the image?
+        ImageData cachedImageData = LOCAL_IMAGES_CACHE.get(imageName);
+        if (cachedImageData != null) {
+            logger.trace("{} is already in image name cache", imageName);
+        } else {
+            logger.debug("{} is not in image name cache, updating...", imageName);
+            // Was not in cache, inspecting...
+            cachedImageData = LOCAL_IMAGES_CACHE.refreshCache(imageName).orElse(null);
+
+            if (cachedImageData == null) {
+                log.debug("Not available locally, should pull image: {}", imageName);
+                return true;
+            }
+        }
+
+        if (shouldPullCached(imageName, cachedImageData)) {
+            log.debug("Should pull locally available image: {}", imageName);
+            return true;
+        } else {
+            log.debug("Using locally available and not pulling image: {}", imageName);
+            return false;
+        }
+
+    }
+
+    /**
+     * Implement this method to decide whether a locally available image should be pulled
+     * (e.g. to always pull images, or to pull them after some duration of time)
+     *
+     * @return {@code true} to update the locally available image, {@code false} to use local instead
+     */
+    abstract protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData);
+}
diff --git a/core/src/main/java/org/testcontainers/images/AgeBasedPullPolicy.java b/core/src/main/java/org/testcontainers/images/AgeBasedPullPolicy.java
new file mode 100644
index 00000000000..39028d6c52b
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/AgeBasedPullPolicy.java
@@ -0,0 +1,28 @@
+package org.testcontainers.images;
+
+import lombok.Value;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.time.Instant;
+
+/**
+ * An ImagePullPolicy which pulls the image from a remote repository only if its created date is older than maxAge
+ */
+@Slf4j
+@Value
+class AgeBasedPullPolicy extends AbstractImagePullPolicy {
+
+    Duration maxAge;
+
+    @Override
+    protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+        Duration imageAge = Duration.between(localImageData.getCreatedAt(), Instant.now());
+        boolean result = imageAge.compareTo(maxAge) > 0;
+        if (result) {
+            log.trace("Should pull image: {}", imageName);
+        }
+        return result;
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/AlwaysPullPolicy.java b/core/src/main/java/org/testcontainers/images/AlwaysPullPolicy.java
new file mode 100644
index 00000000000..92f94f67124
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/AlwaysPullPolicy.java
@@ -0,0 +1,20 @@
+package org.testcontainers.images;
+
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.utility.DockerImageName;
+
+/***
+ * An ImagePullPolicy which pulls the image even if it exists locally.
+ * Useful for obtaining the latest version of an image with a static tag, i.e. 'latest'
+ */
+@Slf4j
+@ToString
+class AlwaysPullPolicy implements ImagePullPolicy {
+
+    @Override
+    public boolean shouldPull(DockerImageName imageName) {
+        log.trace("Unconditionally pulling an image: {}", imageName);
+        return true;
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/DefaultPullPolicy.java b/core/src/main/java/org/testcontainers/images/DefaultPullPolicy.java
new file mode 100644
index 00000000000..40984b2940e
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/DefaultPullPolicy.java
@@ -0,0 +1,18 @@
+package org.testcontainers.images;
+
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * The default imagePullPolicy, which pulls the image from a remote repository only if it does not exist locally
+ */
+@Slf4j
+@ToString
+class DefaultPullPolicy extends AbstractImagePullPolicy {
+
+    @Override
+    protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+        return false;
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/ImageData.java b/core/src/main/java/org/testcontainers/images/ImageData.java
new file mode 100644
index 00000000000..bef0c56c245
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/ImageData.java
@@ -0,0 +1,29 @@
+package org.testcontainers.images;
+
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.model.Image;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+
+import java.time.Instant;
+
+@Value
+@Builder
+class ImageData {
+
+    @NonNull
+    Instant createdAt;
+
+    static ImageData from(InspectImageResponse inspectImageResponse) {
+        return ImageData.builder()
+            .createdAt(Instant.parse(inspectImageResponse.getCreated()))
+            .build();
+    }
+
+    static ImageData from(Image image) {
+        return ImageData.builder()
+            .createdAt(Instant.ofEpochMilli(image.getCreated()))
+            .build();
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/ImagePullPolicy.java b/core/src/main/java/org/testcontainers/images/ImagePullPolicy.java
new file mode 100644
index 00000000000..e821e511795
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/ImagePullPolicy.java
@@ -0,0 +1,9 @@
+package org.testcontainers.images;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface ImagePullPolicy {
+
+    boolean shouldPull(DockerImageName imageName);
+
+}
diff --git a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
new file mode 100644
index 00000000000..29bc8ef1408
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
@@ -0,0 +1,89 @@
+package org.testcontainers.images;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Image;
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Slf4j
+enum LocalImagesCache {
+    INSTANCE;
+
+    private final AtomicBoolean initialized = new AtomicBoolean(false);
+
+    @VisibleForTesting
+    final Map<DockerImageName, ImageData> cache = new ConcurrentHashMap<>();
+
+    DockerClient dockerClient = DockerClientFactory.lazyClient();
+
+    public ImageData get(DockerImageName imageName) {
+        maybeInitCache();
+        return cache.get(imageName);
+    }
+
+    public Optional<ImageData> refreshCache(DockerImageName imageName) {
+        if (!maybeInitCache()) {
+            // Cache may be stale, trying inspectImageCmd...
+
+            InspectImageResponse response = null;
+            try {
+                response = dockerClient.inspectImageCmd(imageName.toString()).exec();
+            } catch (NotFoundException e) {
+                log.trace("Image {} not found", imageName, e);
+            }
+            if (response != null) {
+                ImageData imageData = ImageData.from(response);
+                cache.put(imageName, imageData);
+                return Optional.of(imageData);
+            } else {
+                cache.remove(imageName);
+                return Optional.empty();
+            }
+        }
+
+        return Optional.ofNullable(cache.get(imageName));
+    }
+
+    private synchronized boolean maybeInitCache() {
+        if (!initialized.compareAndSet(false, true)) {
+            return false;
+        }
+
+        if (Boolean.parseBoolean(System.getProperty("useFilter"))) {
+            return false;
+        }
+
+        populateFromList(dockerClient.listImagesCmd().exec());
+
+        return true;
+    }
+
+    private void populateFromList(List<Image> images) {
+        for (Image image : images) {
+            String[] repoTags = image.getRepoTags();
+            if (repoTags == null) {
+                log.debug("repoTags is null, skipping image: {}", image);
+                continue;
+            }
+
+            cache.putAll(
+                Stream.of(repoTags).collect(Collectors.toMap(
+                    DockerImageName::new,
+                    it -> ImageData.from(image)
+                ))
+            );
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/PullPolicy.java b/core/src/main/java/org/testcontainers/images/PullPolicy.java
new file mode 100644
index 00000000000..3dc2e452b8d
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/PullPolicy.java
@@ -0,0 +1,38 @@
+package org.testcontainers.images;
+
+import java.time.Duration;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * Convenience class with logic for building common {@link ImagePullPolicy} instances.
+ *
+ */
+@UtilityClass
+public class PullPolicy {
+
+    /**
+     * Convenience method for returning the {@link DefaultPullPolicy} default image pull policy
+     * @return {@link ImagePullPolicy}
+     */
+    public static ImagePullPolicy defaultPolicy() {
+        return new DefaultPullPolicy();
+    }
+
+    /**
+     * Convenience method for returning the {@link AlwaysPullPolicy} alwaysPull image pull policy
+     * @return {@link ImagePullPolicy}
+     */
+    public static ImagePullPolicy alwaysPull() {
+        return new AlwaysPullPolicy();
+    }
+
+    /**
+     * Convenience method for returning an {@link AgeBasedPullPolicy} Age based image pull policy,
+     * @return {@link ImagePullPolicy}
+     */
+    public static ImagePullPolicy ageBased(Duration maxAge) {
+        return new AgeBasedPullPolicy(maxAge);
+    }
+
+}
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 257bacc9961..4975f536384 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -1,13 +1,14 @@
 package org.testcontainers.images;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.core.command.PullImageResultCallback;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.NonNull;
+import lombok.SneakyThrows;
 import lombok.ToString;
+import lombok.experimental.Wither;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ContainerFetchException;
@@ -17,63 +18,48 @@
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 @ToString
+@AllArgsConstructor(access = AccessLevel.PACKAGE)
 public class RemoteDockerImage extends LazyFuture<String> {
 
-    /**
-     * @deprecated this field will become private in a later release
-     */
-    @Deprecated
-    public static final Set<DockerImageName> AVAILABLE_IMAGE_NAME_CACHE = new HashSet<>();
     private static final Duration PULL_RETRY_TIME_LIMIT = Duration.ofMinutes(2);
 
-    private DockerImageName imageName;
+    private Future<DockerImageName> imageNameFuture;
+
+    @Wither
+    private ImagePullPolicy imagePullPolicy = PullPolicy.defaultPolicy();
+
+    private DockerClient dockerClient = DockerClientFactory.lazyClient();
 
     public RemoteDockerImage(String dockerImageName) {
-        imageName = new DockerImageName(dockerImageName);
+        this.imageNameFuture = CompletableFuture.completedFuture(new DockerImageName(dockerImageName));
     }
 
     public RemoteDockerImage(@NonNull String repository, @NonNull String tag) {
-        imageName = new DockerImageName(repository, tag);
+        this.imageNameFuture = CompletableFuture.completedFuture(new DockerImageName(repository, tag));
+    }
+
+    public RemoteDockerImage(@NonNull Future<String> imageFuture) {
+        this.imageNameFuture = new LazyFuture<DockerImageName>() {
+            @Override
+            @SneakyThrows({InterruptedException.class, ExecutionException.class})
+            protected DockerImageName resolve() {
+                return new DockerImageName(imageFuture.get());
+            }
+        };
     }
 
     @Override
+    @SneakyThrows({InterruptedException.class, ExecutionException.class})
     protected final String resolve() {
+        final DockerImageName imageName = imageNameFuture.get();
         Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
-
-        DockerClient dockerClient = DockerClientFactory.instance().client();
         try {
-            // Does our cache already know the image?
-            if (AVAILABLE_IMAGE_NAME_CACHE.contains(imageName)) {
-                logger.trace("{} is already in image name cache", imageName);
-                return imageName.toString();
-            }
-
-            // Update the cache
-            ListImagesCmd listImagesCmd = dockerClient.listImagesCmd();
-
-            if (Boolean.parseBoolean(System.getProperty("useFilter"))) {
-                listImagesCmd = listImagesCmd.withImageNameFilter(imageName.toString());
-            }
-
-            List<Image> updatedImages = listImagesCmd.exec();
-            updatedImages.stream()
-                .map(Image::getRepoTags)
-                .filter(Objects::nonNull)
-                .flatMap(Stream::of)
-                .map(DockerImageName::new)
-                .collect(Collectors.toCollection(() -> AVAILABLE_IMAGE_NAME_CACHE));
-
-            // And now?
-            if (AVAILABLE_IMAGE_NAME_CACHE.contains(imageName)) {
-                logger.trace("{} is in image name cache following listing of images", imageName);
+            if (!imagePullPolicy.shouldPull(imageName)) {
                 return imageName.toString();
             }
 
@@ -85,13 +71,13 @@ protected final String resolve() {
 
             while (Instant.now().isBefore(lastRetryAllowed)) {
                 try {
-                    final PullImageResultCallback callback = new TimeLimitedLoggedPullImageResultCallback(logger);
                     dockerClient
                         .pullImageCmd(imageName.getUnversionedPart())
                         .withTag(imageName.getVersionPart())
-                        .exec(callback);
-                    callback.awaitCompletion();
-                    AVAILABLE_IMAGE_NAME_CACHE.add(imageName);
+                        .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
+                        .awaitCompletion();
+
+                    LocalImagesCache.INSTANCE.refreshCache(imageName);
 
                     return imageName.toString();
                 } catch (InterruptedException | InternalServerErrorException e) {
diff --git a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
new file mode 100644
index 00000000000..20b52798d40
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
@@ -0,0 +1,30 @@
+package org.testcontainers.images;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.UUID;
+
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+public class AgeBasedPullPolicyTest {
+
+    final DockerImageName imageName = new DockerImageName(UUID.randomUUID().toString());
+
+    @Test
+    public void shouldPull() {
+        ImageData imageData = ImageData.builder()
+            .createdAt(Instant.now().minus(2, ChronoUnit.HOURS))
+            .build();
+
+        AgeBasedPullPolicy oneHour = new AgeBasedPullPolicy(Duration.of(1L, ChronoUnit.HOURS));
+        assertTrue(oneHour.shouldPullCached(imageName, imageData));
+
+        AgeBasedPullPolicy fiveHours = new AgeBasedPullPolicy(Duration.of(5L, ChronoUnit.HOURS));
+        assertFalse(fiveHours.shouldPullCached(imageName, imageData));
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
new file mode 100644
index 00000000000..59b7486c75e
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -0,0 +1,178 @@
+package org.testcontainers.images;
+
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.core.command.PushImageResultCallback;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.rnorth.visibleassertions.VisibleAssertions;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+public class ImagePullPolicyTest {
+
+    @ClassRule
+    public static GenericContainer<?> registry = new GenericContainer<>("registry:2")
+        .withExposedPorts(5000);
+
+    private static String imageName;
+
+    @BeforeClass
+    public static void beforeClass() throws Exception {
+        String testRegistryAddress = registry.getContainerIpAddress() + ":" + registry.getFirstMappedPort();
+        String testImageName = testRegistryAddress + "/image-pull-policy-test";
+        String tag = UUID.randomUUID().toString();
+        imageName = testImageName + ":" + tag;
+
+        DockerClient client = DockerClientFactory.instance().client();
+        String dummySourceImage = "hello-world:latest";
+        client.pullImageCmd(dummySourceImage).exec(new PullImageResultCallback()).awaitCompletion();
+
+        String dummyImageId = client.inspectImageCmd(dummySourceImage).exec().getId();
+
+        // push the image to the registry
+        client.tagImageCmd(dummyImageId, testImageName, tag).exec();
+
+        client.pushImageCmd(imageName)
+            .exec(new PushImageResultCallback())
+            .awaitCompletion(1, TimeUnit.MINUTES);
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            DockerClientFactory.instance().client().removeImageCmd(imageName).withForce(true).exec();
+        } catch (NotFoundException ignored) {
+        }
+    }
+
+    @Before
+    public void setUp() {
+        // Clean up local cache
+        try {
+            DockerClientFactory.instance().client().removeImageCmd(imageName).withForce(true).exec();
+        } catch (NotFoundException ignored) {
+        }
+
+        LocalImagesCache.INSTANCE.cache.remove(new DockerImageName(imageName));
+    }
+
+    @Test
+    public void pullsByDefault() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(imageName)
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+        }
+    }
+
+    @Test
+    public void shouldAlwaysPull() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(imageName)
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+        }
+
+        DockerClientFactory.instance().client().removeImageCmd(imageName).withForce(true).exec();
+
+        try (
+            GenericContainer<?> container = new GenericContainer<>(imageName)
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            expectToFailWithNotFoundException(container);
+        }
+
+        try (
+            // built_in_image_pull_policy {
+            GenericContainer<?> container = new GenericContainer<>(imageName)
+                .withImagePullPolicy(PullPolicy.alwaysPull())
+            // }
+        ) {
+            container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.start();
+        }
+    }
+
+    @Test
+    public void shouldSupportCustomPolicies() {
+        try (
+            // custom_image_pull_policy {
+            GenericContainer<?> container = new GenericContainer<>(imageName)
+                .withImagePullPolicy(new AbstractImagePullPolicy() {
+                    @Override
+                    protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+                        return System.getenv("ALWAYS_PULL_IMAGE") != null;
+                    }
+                })
+            // }
+        ) {
+            container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.start();
+        }
+    }
+
+    @Test
+    public void shouldCheckPolicy() {
+        ImagePullPolicy policy = Mockito.spy(new AbstractImagePullPolicy() {
+            @Override
+            protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+                return false;
+            }
+        });
+        try (
+            GenericContainer<?> container = new GenericContainer<>(imageName)
+                .withImagePullPolicy(policy)
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+
+            Mockito.verify(policy).shouldPull(any());
+        }
+    }
+
+    @Test
+    public void shouldNotForcePulling() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(imageName)
+                .withImagePullPolicy(__ -> false)
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            expectToFailWithNotFoundException(container);
+        }
+    }
+
+    private void expectToFailWithNotFoundException(GenericContainer<?> container) {
+        try {
+            container.start();
+            fail("Should fail");
+        } catch (ContainerLaunchException e) {
+            Throwable throwable = e;
+            while (throwable.getCause() != null) {
+                throwable = throwable.getCause();
+                if (throwable.getCause() instanceof NotFoundException) {
+                    VisibleAssertions.pass("Caused by NotFoundException");
+                    return;
+                }
+            }
+            VisibleAssertions.fail("Caused by NotFoundException");
+        }
+    }
+
+}
diff --git a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
index 22c7b4e9d9c..d842829b4b6 100644
--- a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
@@ -16,7 +16,7 @@ public void pullingNonExistentImageFailsGracefully() {
 
         assertThrows("Pulling a nonexistent container will cause an exception to be thrown",
                 ContainerFetchException.class, () -> {
-                    return new GenericContainer("richnorth/nonexistent:latest");
+                    new GenericContainer("richnorth/nonexistent:latest").getDockerImageName();
                 });
     }
 }
diff --git a/docs/features/advanced_options.md b/docs/features/advanced_options.md
index 385cdc3a4c8..bedb7aee6b8 100644
--- a/docs/features/advanced_options.md
+++ b/docs/features/advanced_options.md
@@ -14,6 +14,22 @@ Additionally, multiple labels may be applied together from a map:
 [Adding multiple labels](../examples/src/test/java/generic/ContainerLabelTest.java) inside_block:multiple_labels
 <!--/codeinclude-->
 
+## Image Pull Policy
+
+By default, the container image is retrieved from the local Docker images cache.
+This works well when running against a specific version, but for images with a static tag (i.e. 'latest') this may lead to a newer version not being pulled.
+
+It is possible to specify an Image Pull Policy to determine at runtime whether an image should be pulled or not:
+
+<!--codeinclude-->
+[Setting image pull policy](../../core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java) inside_block:built_in_image_pull_policy
+<!--/codeinclude-->
+
+... or providing a function:
+
+<!--codeinclude-->
+[Custom image pull policy](../../core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java) inside_block:custom_image_pull_policy
+<!--/codeinclude-->
 
 ## Customizing the container
 

From 22a5e92fc26d27023bcbde8da3750451250bef58 Mon Sep 17 00:00:00 2001
From: Erhun Baycelik <baycelik_erhun@hotmail.com>
Date: Wed, 27 Nov 2019 17:59:42 +0100
Subject: [PATCH 0400/4969] Update Who Is Using Testcontainers (#2105)

As a Transferwise engineer I want to list our company in this list.
---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 8f95ad5399a..c26ed164067 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -77,6 +77,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [JHipster](https://www.jhipster.tech/) - Couchbase and Cassandra integration testing
 * [wescale](https://www.wescale.com) - Integration testing against HTTP service mocks and various data stores
 * [Marquez](https://marquezproject.github.io/marquez) - PostgreSQL integration testing
+* [Transferwise](https://transferwise.com/) - Integration testing for different RDBMS, kafka and micro services
 
 ## License
 

From 4f6f2c7cdf65f16952806ac91758ba0e3cf7e8d8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 27 Nov 2019 19:08:04 +0100
Subject: [PATCH 0401/4969] Restore Flaky on couchbase tests (#2106)

* Restore `@Flaky` in Couchbase tests (partially revert #2081)

* Manually start/stop container, do not reuse environment/cluster
---
 .../couchbase/AbstractCouchbaseTest.java      | 21 ++++++++++------
 .../couchbase/CouchbaseContainer.java         | 11 +++++++--
 .../couchbase/BaseCouchbaseContainerTest.java | 24 +++++++++++++++++++
 .../couchbase/Couchbase4_6Test.java           |  7 +++---
 .../couchbase/Couchbase5_1Test.java           |  7 +++---
 .../couchbase/Couchbase5_5Test.java           |  7 +++---
 .../couchbase/CouchbaseCommunity5_1Test.java  |  7 +++---
 7 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java
index e1aec0ba424..7fd99ca9fbc 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java
@@ -10,6 +10,8 @@
 import com.couchbase.client.java.query.consistency.ScanConsistency;
 import org.junit.After;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Basic class that can be used for couchbase tests. It will clear the database after every test.
  */
@@ -19,16 +21,21 @@ public abstract class AbstractCouchbaseTest {
 
     public static final String DEFAULT_PASSWORD = "password";
 
-    private Bucket bucket;
+    Bucket bucket;
 
     @After
     public void clear() {
-        if (getCouchbaseContainer().isIndex() && getCouchbaseContainer().isQuery() && getCouchbaseContainer().isPrimaryIndex()) {
-            getBucket().query(
-                N1qlQuery.simple(String.format("DELETE FROM `%s`", getBucket().name()),
-                    N1qlParams.build().consistency(ScanConsistency.STATEMENT_PLUS)));
-        } else {
-            getBucket().bucketManager().flush();
+        try {
+            if (getCouchbaseContainer().isIndex() && getCouchbaseContainer().isQuery() && getCouchbaseContainer().isPrimaryIndex()) {
+                getBucket().query(
+                    N1qlQuery.simple(String.format("DELETE FROM `%s`", getBucket().name()),
+                        N1qlParams.build().consistency(ScanConsistency.STATEMENT_PLUS)));
+            } else {
+                getBucket().bucketManager().flush();
+            }
+        } finally {
+            bucket.close(60, TimeUnit.SECONDS);
+            bucket = null;
         }
     }
 
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 9e7ace2af04..19583d5a0e4 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -47,6 +47,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -199,9 +200,15 @@ public List<Integer> getBoundPortNumbers() {
     }
 
     @Override
+    @SuppressWarnings({"unchecked", "ConstantConditions"})
     public void stop() {
-        stopCluster();
-        Stream.<Runnable>of(super::stop, proxy::stop).parallel().forEach(Runnable::run);
+        try {
+            stopCluster();
+            ((AtomicReference<Object>) (Object) couchbaseEnvironment).set(null);
+            ((AtomicReference<Object>) (Object) couchbaseCluster).set(null);
+        } finally {
+            Stream.<Runnable>of(super::stop, proxy::stop).parallel().forEach(Runnable::run);
+        }
     }
 
     private void stopCluster() {
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
index 845d9bfaf5e..6deba2c4c5e 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
@@ -9,7 +9,13 @@
 import com.couchbase.client.java.view.View;
 import com.google.common.collect.Lists;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.runner.Description;
+import org.testcontainers.containers.FailureDetectingExternalResource;
+import org.testcontainers.testsupport.Flaky;
+import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
 
 import java.util.List;
 
@@ -25,7 +31,23 @@ public abstract class BaseCouchbaseContainerTest extends AbstractCouchbaseTest {
 
     private static final String DOCUMENT = "{\"name\":\"toto\"}";
 
+    @Rule
+    public RuleChain ruleChain = RuleChain.emptyRuleChain()
+        .around(new FlakyTestJUnit4RetryRule())
+        .around(new FailureDetectingExternalResource() {
+            @Override
+            protected void starting(Description description) {
+                getCouchbaseContainer().start();
+            }
+
+            @Override
+            protected void failed(Throwable e, Description description) {
+                getCouchbaseContainer().stop();
+            }
+        });
+
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldInsertDocument() {
         RawJsonDocument expected = RawJsonDocument.create(ID, DOCUMENT);
         getBucket().upsert(expected);
@@ -34,6 +56,7 @@ public void shouldInsertDocument() {
     }
 
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldExecuteN1ql() {
         getBucket().query(N1qlQuery.simple("INSERT INTO " + TEST_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
 
@@ -46,6 +69,7 @@ public void shouldExecuteN1ql() {
     }
 
     @Test
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
     public void shouldCreateView() {
         View view = DefaultView.create(VIEW_NAME, VIEW_FUNCTION);
         DesignDocument document = DesignDocument.create(VIEW_NAME, Lists.newArrayList(view));
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java
index 7781d705d41..c43d3c981ba 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java
@@ -1,10 +1,11 @@
 package org.testcontainers.couchbase;
 
-import org.junit.ClassRule;
+import org.junit.Rule;
 
 public class Couchbase4_6Test extends BaseCouchbaseContainerTest {
-    @ClassRule
-    public static CouchbaseContainer container = initCouchbaseContainer("couchbase/server:4.6.5");
+
+    @Rule
+    public CouchbaseContainer container = initCouchbaseContainer("couchbase/server:4.6.5");
 
     @Override
     public CouchbaseContainer getCouchbaseContainer() {
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java
index 8334088fdb3..2c3dbf3c901 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java
@@ -1,10 +1,11 @@
 package org.testcontainers.couchbase;
 
-import org.junit.ClassRule;
+import org.junit.Rule;
 
 public class Couchbase5_1Test extends BaseCouchbaseContainerTest {
-    @ClassRule
-    public static CouchbaseContainer container = initCouchbaseContainer("couchbase/server:5.1.1");
+
+    @Rule
+    public CouchbaseContainer container = initCouchbaseContainer("couchbase/server:5.1.1");
 
     @Override
     public CouchbaseContainer getCouchbaseContainer() {
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java
index 40a44235f20..47bc020ef03 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java
@@ -1,10 +1,11 @@
 package org.testcontainers.couchbase;
 
-import org.junit.ClassRule;
+import org.junit.Rule;
 
 public class Couchbase5_5Test extends BaseCouchbaseContainerTest {
-    @ClassRule
-    public static CouchbaseContainer container = initCouchbaseContainer("couchbase/server:5.5.1");
+
+    @Rule
+    public CouchbaseContainer container = initCouchbaseContainer("couchbase/server:5.5.1");
 
     @Override
     public CouchbaseContainer getCouchbaseContainer() {
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java
index 74298c990cf..30be62bc2bd 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java
@@ -6,10 +6,12 @@
 
 import com.couchbase.client.java.cluster.UserRole;
 import com.couchbase.client.java.cluster.UserSettings;
+import org.junit.Rule;
 
 public class CouchbaseCommunity5_1Test extends BaseCouchbaseContainerTest {
-    @ClassRule
-    public static CouchbaseContainer container = initCouchbaseContainer();
+
+    @Rule
+    public CouchbaseContainer container = initCouchbaseContainer();
 
     private static CouchbaseContainer initCouchbaseContainer() {
         CouchbaseContainer couchbaseContainer = new CouchbaseContainer("couchbase/server:community-5.1.1");
@@ -20,7 +22,6 @@ private static CouchbaseContainer initCouchbaseContainer() {
                 .roles(Collections.singletonList(new UserRole("admin")));
 
         couchbaseContainer.withNewBucket(getDefaultBucketSettings(), communityAdminUserSettings);
-        couchbaseContainer.start();
         return couchbaseContainer;
     }
 

From 23235833edfb1ae6c6c1147309aad4c067394728 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 27 Nov 2019 20:07:03 +0000
Subject: [PATCH 0402/4969] =?UTF-8?q?Break=20up=20quickstart=20example=20p?=
 =?UTF-8?q?rojects=20and=20introduce=20JUnit=205=20refe=E2=80=A6=20(#2097)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Break up quickstart example projects and introduce JUnit 5 refe… (#1416)

* Break up quickstart example projects and introduce JUnit 5 reference

* Use for dependency declarations

Dependabot needs to be able to discover those and propose a change.

* Relocate Spock example code


Co-authored-by: Benjamin Muschko <benjamin.muschko@gmail.com>
---
 .../{ => junit4/generic}/build.gradle         |   2 -
 .../test/java/generic/CmdModifierTest.java    |   0
 .../src/test/java/generic/CommandsTest.java   |   0
 .../java/generic/ContainerCreationTest.java   |   0
 .../test/java/generic/ContainerLabelTest.java |   0
 .../src/test/java/generic/ExecTest.java       |   0
 .../java/generic/HostPortExposedTest.java     |   0
 .../generic/MultiplePortsExposedTest.java     |   0
 .../test/java/generic/WaitStrategiesTest.java |   0
 docs/examples/junit4/redis/build.gradle       |   8 ++
 .../java/quickstart/RedisBackedCache.java     |   0
 .../quickstart/RedisBackedCacheIntTest.java   |   0
 .../RedisBackedCacheIntTestStep0.java         |   0
 .../src/test/resources/logback-test.xml       |   0
 docs/examples/junit5/redis/build.gradle       |  11 ++
 .../java/quickstart/RedisBackedCache.java     |   0
 .../quickstart/RedisBackedCacheIntTest.java   |  42 +++++++
 .../RedisBackedCacheIntTestStep0.java         |  27 +++++
 .../redis/src/test/resources/logback-test.xml |  27 +++++
 .../examples/spock/redis}/build.gradle        |   6 +-
 .../java/quickstart/RedisBackedCache.java     |  22 ++++
 .../quickstart/RedisBackedCacheIntTest.groovy |   0
 .../RedisBackedCacheIntTestStep0.groovy       |   0
 .../src/test/resources/logback-test.xml       |   0
 docs/features/advanced_options.md             |   8 +-
 docs/features/commands.md                     |   6 +-
 docs/features/creating_container.md           |   4 +-
 docs/features/networking.md                   |  14 +--
 docs/features/startup_and_waits.md            |  14 +--
 docs/quickstart/junit_4_quickstart.md         |   8 +-
 docs/quickstart/junit_5_quickstart.md         | 110 ++++++++++++++++++
 docs/quickstart/spock_quickstart.md           |   8 +-
 mkdocs.yml                                    |   1 +
 settings.gradle                               |   7 +-
 34 files changed, 285 insertions(+), 40 deletions(-)
 rename docs/examples/{ => junit4/generic}/build.gradle (81%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/CmdModifierTest.java (100%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/CommandsTest.java (100%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/ContainerCreationTest.java (100%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/ContainerLabelTest.java (100%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/ExecTest.java (100%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/HostPortExposedTest.java (100%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/MultiplePortsExposedTest.java (100%)
 rename docs/examples/{ => junit4/generic}/src/test/java/generic/WaitStrategiesTest.java (100%)
 create mode 100644 docs/examples/junit4/redis/build.gradle
 rename docs/examples/{ => junit4/redis}/src/main/java/quickstart/RedisBackedCache.java (100%)
 rename docs/examples/{ => junit4/redis}/src/test/java/quickstart/RedisBackedCacheIntTest.java (100%)
 rename docs/examples/{ => junit4/redis}/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java (100%)
 rename docs/examples/{ => junit4/redis}/src/test/resources/logback-test.xml (100%)
 create mode 100644 docs/examples/junit5/redis/build.gradle
 rename {examples/spock => docs/examples/junit5/redis}/src/main/java/quickstart/RedisBackedCache.java (100%)
 create mode 100644 docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
 create mode 100644 docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
 create mode 100644 docs/examples/junit5/redis/src/test/resources/logback-test.xml
 rename {examples/spock => docs/examples/spock/redis}/build.gradle (74%)
 create mode 100644 docs/examples/spock/redis/src/main/java/quickstart/RedisBackedCache.java
 rename {examples/spock => docs/examples/spock/redis}/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy (100%)
 rename {examples/spock => docs/examples/spock/redis}/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy (100%)
 rename {examples/spock => docs/examples/spock/redis}/src/test/resources/logback-test.xml (100%)
 create mode 100644 docs/quickstart/junit_5_quickstart.md

diff --git a/docs/examples/build.gradle b/docs/examples/junit4/generic/build.gradle
similarity index 81%
rename from docs/examples/build.gradle
rename to docs/examples/junit4/generic/build.gradle
index e5247a6e9d8..97902d5d9ca 100644
--- a/docs/examples/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -1,8 +1,6 @@
 description = "Examples for docs"
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
-
     testCompile "junit:junit:4.12"
     testCompile project(":testcontainers")
     testCompile project(":selenium")
diff --git a/docs/examples/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/CmdModifierTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
diff --git a/docs/examples/src/test/java/generic/CommandsTest.java b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/CommandsTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
diff --git a/docs/examples/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/ContainerCreationTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
diff --git a/docs/examples/src/test/java/generic/ContainerLabelTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/ContainerLabelTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
diff --git a/docs/examples/src/test/java/generic/ExecTest.java b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/ExecTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
diff --git a/docs/examples/src/test/java/generic/HostPortExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/HostPortExposedTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
diff --git a/docs/examples/src/test/java/generic/MultiplePortsExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/MultiplePortsExposedTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
diff --git a/docs/examples/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
similarity index 100%
rename from docs/examples/src/test/java/generic/WaitStrategiesTest.java
rename to docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
new file mode 100644
index 00000000000..76d32e5b4d0
--- /dev/null
+++ b/docs/examples/junit4/redis/build.gradle
@@ -0,0 +1,8 @@
+description = "Examples for docs"
+
+dependencies {
+    compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
+
+    testCompile "junit:junit:4.12"
+    testCompile project(":testcontainers")
+}
diff --git a/docs/examples/src/main/java/quickstart/RedisBackedCache.java b/docs/examples/junit4/redis/src/main/java/quickstart/RedisBackedCache.java
similarity index 100%
rename from docs/examples/src/main/java/quickstart/RedisBackedCache.java
rename to docs/examples/junit4/redis/src/main/java/quickstart/RedisBackedCache.java
diff --git a/docs/examples/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
similarity index 100%
rename from docs/examples/src/test/java/quickstart/RedisBackedCacheIntTest.java
rename to docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
diff --git a/docs/examples/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
similarity index 100%
rename from docs/examples/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
rename to docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
diff --git a/docs/examples/src/test/resources/logback-test.xml b/docs/examples/junit4/redis/src/test/resources/logback-test.xml
similarity index 100%
rename from docs/examples/src/test/resources/logback-test.xml
rename to docs/examples/junit4/redis/src/test/resources/logback-test.xml
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
new file mode 100644
index 00000000000..56442b66af3
--- /dev/null
+++ b/docs/examples/junit5/redis/build.gradle
@@ -0,0 +1,11 @@
+description = "Examples for docs"
+
+dependencies {
+    compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
+
+    testCompile "org.junit.jupiter:junit-jupiter-api:5.4.2"
+    testCompile "org.junit.jupiter:junit-jupiter-params:5.4.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
+    testCompile project(":testcontainers")
+    testCompile project(":junit-jupiter")
+}
diff --git a/examples/spock/src/main/java/quickstart/RedisBackedCache.java b/docs/examples/junit5/redis/src/main/java/quickstart/RedisBackedCache.java
similarity index 100%
rename from examples/spock/src/main/java/quickstart/RedisBackedCache.java
rename to docs/examples/junit5/redis/src/main/java/quickstart/RedisBackedCache.java
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
new file mode 100644
index 00000000000..7c3968a724e
--- /dev/null
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -0,0 +1,42 @@
+package quickstart;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// class {
+@Testcontainers
+public class RedisBackedCacheIntTest {
+
+    private RedisBackedCache underTest;
+
+    // container {
+    @Container
+    public GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
+                                            .withExposedPorts(6379);
+    // }
+
+
+    @BeforeEach
+    public void setUp() {
+        String address = redis.getContainerIpAddress();
+        Integer port = redis.getFirstMappedPort();
+
+        // Now we have an address and port for Redis, no matter where it is running
+        underTest = new RedisBackedCache(address, port);
+    }
+
+    @Test
+    public void testSimplePutAndGet() {
+        underTest.put("test", "example");
+
+        String retrieved = underTest.get("test");
+        assertEquals("example", retrieved);
+    }
+}
+// }
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
new file mode 100644
index 00000000000..c81a185a188
--- /dev/null
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
@@ -0,0 +1,27 @@
+package quickstart;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("This test class is deliberately invalid, as it relies on a non-existent local Redis")
+public class RedisBackedCacheIntTestStep0 {
+    private RedisBackedCache underTest;
+
+    @BeforeEach
+    public void setUp() {
+        // Assume that we have Redis running locally?
+        underTest = new RedisBackedCache("localhost", 6379);
+    }
+
+    @Test
+    public void testSimplePutAndGet() {
+        underTest.put("test", "example");
+
+        String retrieved = underTest.get("test");
+        assertEquals("example", retrieved);
+    }
+}
diff --git a/docs/examples/junit5/redis/src/test/resources/logback-test.xml b/docs/examples/junit5/redis/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..49da0be9709
--- /dev/null
+++ b/docs/examples/junit5/redis/src/test/resources/logback-test.xml
@@ -0,0 +1,27 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+
+    <logger name="org.apache.http" level="WARN"/>
+    <logger name="com.github.dockerjava" level="WARN"/>
+    <logger name="org.zeroturnaround.exec" level="WARN"/>
+    <logger name="io.netty" level="WARN" />
+    <logger name="org.testcontainers.shaded" level="WARN"/>
+
+    <turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
+        <Marker>PROFILER</Marker>
+        <OnMatch>DENY</OnMatch>
+    </turboFilter>
+</configuration>
diff --git a/examples/spock/build.gradle b/docs/examples/spock/redis/build.gradle
similarity index 74%
rename from examples/spock/build.gradle
rename to docs/examples/spock/redis/build.gradle
index 486107f9b21..398a6d3fa1c 100644
--- a/examples/spock/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -3,13 +3,9 @@ plugins {
     id 'groovy'
 }
 
-repositories {
-    jcenter()
-}
-
 dependencies {
     compile "io.lettuce:lettuce-core:5.2.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
-    testImplementation 'org.testcontainers:spock'
+    testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
diff --git a/docs/examples/spock/redis/src/main/java/quickstart/RedisBackedCache.java b/docs/examples/spock/redis/src/main/java/quickstart/RedisBackedCache.java
new file mode 100644
index 00000000000..1123858ca17
--- /dev/null
+++ b/docs/examples/spock/redis/src/main/java/quickstart/RedisBackedCache.java
@@ -0,0 +1,22 @@
+package quickstart;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+
+public class RedisBackedCache {
+
+    private final StatefulRedisConnection<String, String> connection;
+
+    public RedisBackedCache(String hostname, Integer port) {
+        RedisClient client = RedisClient.create(String.format("redis://%s:%d/0", hostname, port));
+        connection = client.connect();
+    }
+
+    public String get(String key) {
+        return connection.sync().get(key);
+    }
+
+    public void put(String key, String value) {
+        connection.sync().set(key, value);
+    }
+}
diff --git a/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
similarity index 100%
rename from examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
rename to docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
diff --git a/examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
similarity index 100%
rename from examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
rename to docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
diff --git a/examples/spock/src/test/resources/logback-test.xml b/docs/examples/spock/redis/src/test/resources/logback-test.xml
similarity index 100%
rename from examples/spock/src/test/resources/logback-test.xml
rename to docs/examples/spock/redis/src/test/resources/logback-test.xml
diff --git a/docs/features/advanced_options.md b/docs/features/advanced_options.md
index bedb7aee6b8..a774dbddc06 100644
--- a/docs/features/advanced_options.md
+++ b/docs/features/advanced_options.md
@@ -5,13 +5,13 @@
 To add a custom label to the container, use `withLabel`:
 
 <!--codeinclude-->
-[Adding a single label](../examples/src/test/java/generic/ContainerLabelTest.java) inside_block:single_label
+[Adding a single label](../examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java) inside_block:single_label
 <!--/codeinclude-->
 
 Additionally, multiple labels may be applied together from a map:
 
 <!--codeinclude-->
-[Adding multiple labels](../examples/src/test/java/generic/ContainerLabelTest.java) inside_block:multiple_labels
+[Adding multiple labels](../examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java) inside_block:multiple_labels
 <!--/codeinclude-->
 
 ## Image Pull Policy
@@ -38,13 +38,13 @@ It is possible to use the [`docker-java`](https://github.com/docker-java/docker-
 For example, this can be used to change the container hostname:
 
 <!--codeinclude-->
-[Using modifier to change hostname](../examples/src/test/java/generic/CmdModifierTest.java) inside_block:hostname
+[Using modifier to change hostname](../examples/junit4/generic/src/test/java/generic/CmdModifierTest.java) inside_block:hostname
 <!--/codeinclude-->
 
 ... or modify container memory (see [this](https://fabiokung.com/2014/03/13/memory-inside-linux-containers/) if it does not appear to work):
 
 <!--codeinclude-->
-[Using modifier to change memory limits](../examples/src/test/java/generic/CmdModifierTest.java) inside_block:memory
+[Using modifier to change memory limits](../examples/junit4/generic/src/test/java/generic/CmdModifierTest.java) inside_block:memory
 <!--/codeinclude-->
 
 !!! note
diff --git a/docs/features/commands.md b/docs/features/commands.md
index 197871ebe02..40bcce5d1ab 100644
--- a/docs/features/commands.md
+++ b/docs/features/commands.md
@@ -5,7 +5,7 @@
 By default the container will execute whatever command is specified in the image's Dockerfile. To override this, and specify a different command, use `withCommand`. For example:
 
 <!--codeinclude-->
-[Specifying a startup command](../examples/src/test/java/generic/CommandsTest.java) inside_block:startupCommand
+[Specifying a startup command](../examples/junit4/generic/src/test/java/generic/CommandsTest.java) inside_block:startupCommand
 <!--/codeinclude-->
 
 ## Executing a command
@@ -13,13 +13,13 @@ By default the container will execute whatever command is specified in the image
 Your test can execute a command inside a running container, similar to a `docker exec` call:
 
 <!--codeinclude-->
-[Executing a command inside a running container](../examples/src/test/java/generic/ExecTest.java) inside_block:standaloneExec
+[Executing a command inside a running container](../examples/junit4/generic/src/test/java/generic/ExecTest.java) inside_block:standaloneExec
 <!--/codeinclude-->
 
 This can be useful for software that has a command line administration tool. You can also get the output (stdout/stderr) and exit code from the command - for example:
 
 <!--codeinclude-->
-[Executing a command inside a running container and reading the result](../examples/src/test/java/generic/ExecTest.java) inside_block:execReadingStdout
+[Executing a command inside a running container and reading the result](../examples/junit4/generic/src/test/java/generic/ExecTest.java) inside_block:execReadingStdout
 <!--/codeinclude-->
 
 ## Environment variables
diff --git a/docs/features/creating_container.md b/docs/features/creating_container.md
index 16413924197..e92f20e71cd 100644
--- a/docs/features/creating_container.md
+++ b/docs/features/creating_container.md
@@ -20,13 +20,13 @@ new GenericContainer("jboss/wildfly:9.0.1.Final")
 A generic container rule can be used with any public docker image; for example:
 
 <!--codeinclude--> 
-[Creating a Redis container (JUnit 4)](../examples/src/test/java/generic/ContainerCreationTest.java) inside_block:simple
+[Creating a Redis container (JUnit 4)](../examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java) inside_block:simple
 <!--/codeinclude-->
 
 Further options may be specified:
 
 <!--codeinclude--> 
-[Creating a container with more options (JUnit 4)](../examples/src/test/java/generic/ContainerCreationTest.java) inside_block:withOptions
+[Creating a container with more options (JUnit 4)](../examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java) inside_block:withOptions
 <!--/codeinclude-->
 
 These containers, as `@ClassRule`s, will be started before any tests in the class run, and will be destroyed after all
diff --git a/docs/features/networking.md b/docs/features/networking.md
index 75dd924d6bc..5de0c9dfa96 100644
--- a/docs/features/networking.md
+++ b/docs/features/networking.md
@@ -8,7 +8,7 @@ For example, you may be testing a class that needs to connect to a backend or da
 Generally, each required port needs to be explicitly exposed. For example, we can specify one or more ports as follows:
 
 <!--codeinclude-->
-[Exposing ports](../examples/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:rule
+[Exposing ports](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:rule
 <!--/codeinclude-->
 
 Note that this exposed port number is from the *perspective of the container*. 
@@ -20,7 +20,7 @@ Because there is this layer of indirection, it is necessary to ask Testcontainer
 This can be done using the `getMappedPort` method, which takes the original (container) port as an argument:
 
 <!--codeinclude-->
-[Retrieving actual ports at runtime](../examples/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:fetchPortsByNumber
+[Retrieving actual ports at runtime](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:fetchPortsByNumber
 <!--/codeinclude-->
 
 !!! warning
@@ -30,7 +30,7 @@ This can be done using the `getMappedPort` method, which takes the original (con
 There is also a `getFirstMappedPort` method for convenience, for the fairly common scenario of a container that only exposes one port:
 
 <!--codeinclude-->
-[Retrieving the first mapped port](../examples/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:fetchFirstMappedPort
+[Retrieving the first mapped port](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:fetchFirstMappedPort
 <!--/codeinclude-->
 
 ## Getting the container IP address
@@ -41,13 +41,13 @@ However, in some CI environments they may instead be reachable on a different ho
 As such, Testcontainers provides a convenience method to obtain an IP address on which the container should be reachable from the host machine.
 
 <!--codeinclude-->
-[Getting the container IP address](../examples/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getContainerIpAddressOnly
+[Getting the container IP address](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getContainerIpAddressOnly
 <!--/codeinclude-->
 
 It is normally advisable to use `getContainerIpAddress` and `getMappedPort` together when constructing addresses - for example:
 
 <!--codeinclude-->
-[Getting the container IP address and mapped port](../examples/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getContainerIpAddressAndMappedPort
+[Getting the container IP address and mapped port](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getContainerIpAddressAndMappedPort
 <!--/codeinclude-->
 
 ## Exposing host ports to the container
@@ -61,7 +61,7 @@ In this example, assume that `localServerPort` is a port on our test host machin
 We need to tell Testcontainers to prepare to expose this port to containers:
 
 <!--codeinclude-->
-[Exposing the host port](../examples/src/test/java/generic/HostPortExposedTest.java) inside_block:exposePort
+[Exposing the host port](../examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java) inside_block:exposePort
 <!--/codeinclude-->
 
 !!! warning
@@ -73,7 +73,7 @@ From a container's perspective, the hostname will be `host.testcontainers.intern
 For example, here we construct an HTTP URL for our local web application and tell a Selenium container to get a page from it:
 
 <!--codeinclude-->
-[Accessing the exposed host port from a container](../examples/src/test/java/generic/HostPortExposedTest.java) inside_block:useHostExposedPort
+[Accessing the exposed host port from a container](../examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java) inside_block:useHostExposedPort
 <!--/codeinclude-->
 
 
diff --git a/docs/features/startup_and_waits.md b/docs/features/startup_and_waits.md
index a7e277b9892..e1d30457e5c 100644
--- a/docs/features/startup_and_waits.md
+++ b/docs/features/startup_and_waits.md
@@ -14,7 +14,7 @@ Ordinarily Testcontainers will wait for up to 60 seconds for the container's fir
 This simple measure provides a basic check whether a container is ready for use.
 
 <!--codeinclude--> 
-[Waiting for the first exposed port to start listening](../examples/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForNetworkListening
+[Waiting for the first exposed port to start listening](../examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForNetworkListening
 <!--/codeinclude-->
 
 If the default 60s timeout is not sufficient, it can be altered with the `withStartupTimeout()` method.
@@ -28,24 +28,24 @@ You can choose to wait for an HTTP(S) endpoint to return a particular status cod
 
 #### Waiting for 200 OK
 <!--codeinclude--> 
-[](../examples/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForSimpleHttp
+[](../examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForSimpleHttp
 <!--/codeinclude-->
 
 Variations on the HTTP wait strategy are supported, including:
 
 #### Waiting for multiple possible status codes
 <!--codeinclude--> 
-[](../examples/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForHttpWithMultipleStatusCodes
+[](../examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForHttpWithMultipleStatusCodes
 <!--/codeinclude-->
 
 #### Waiting for a status code that matches a predicate
 <!--codeinclude--> 
-[Waiting for a status code that matches a predicate](../examples/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForHttpWithStatusCodePredicate
+[Waiting for a status code that matches a predicate](../examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForHttpWithStatusCodePredicate
 <!--/codeinclude-->
 
 #### Using TLS
 <!--codeinclude--> 
-[](../examples/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForHttpWithTls
+[](../examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java) inside_block:waitForHttpWithTls
 <!--/codeinclude-->
 
 ### Healthcheck Wait strategy examples
@@ -53,7 +53,7 @@ Variations on the HTTP wait strategy are supported, including:
 If the used image supports Docker's [Healthcheck](https://docs.docker.com/engine/reference/builder/#healthcheck) feature, you can directly leverage the `healthy` state of the container as your wait condition:
 
 <!--codeinclude-->
-[](../examples/src/test/java/generic/WaitStrategiesTest.java) inside_block:healthcheckWait
+[](../examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java) inside_block:healthcheckWait
 <!--/codeinclude-->
 
 ### Log output Wait Strategy
@@ -62,7 +62,7 @@ In some situations a container's log output is a simple way to determine if it i
 For example, we can wait for a `Ready' message in the container's logs as follows:
 
 <!--codeinclude-->
-[](../examples/src/test/java/generic/WaitStrategiesTest.java) inside_block:logMessageWait
+[](../examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java) inside_block:logMessageWait
 <!--/codeinclude-->
 
 ### Other Wait Strategies
diff --git a/docs/quickstart/junit_4_quickstart.md b/docs/quickstart/junit_4_quickstart.md
index 93ca7e9a024..86cd720942b 100644
--- a/docs/quickstart/junit_4_quickstart.md
+++ b/docs/quickstart/junit_4_quickstart.md
@@ -8,7 +8,7 @@ In our imaginary program, there is a `RedisBackedCache` class which stores data
 You can see an example test that could have been written for it (without using Testcontainers):
 
 <!--codeinclude-->
-[Pre-Testcontainers test code](../examples/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java) block:RedisBackedCacheIntTestStep0
+[Pre-Testcontainers test code](../examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java) block:RedisBackedCacheIntTestStep0
 <!--/codeinclude-->
 
 Notice that the existing test has a problem - it's relying on a local installation of Redis, which is a red flag for test reliability.
@@ -39,7 +39,7 @@ testCompile "org.testcontainers:testcontainers:{{latest_version}}"
 Simply add the following to the body of our test class:
 
 <!--codeinclude-->
-[JUnit 4 Rule](../examples/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:rule
+[JUnit 4 Rule](../examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:rule
 <!--/codeinclude-->
 
 The `@Rule` annotation tells JUnit to notify this field about various events in the test lifecycle.
@@ -61,7 +61,7 @@ Testcontainers uses *randomized ports* for each container it starts, but makes i
 We can do this in our test `setUp` method, to set up our component under test:
 
 <!--codeinclude-->
-[Obtaining a mapped port](../examples/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:setUp
+[Obtaining a mapped port](../examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:setUp
 <!--/codeinclude-->
 
 !!! tip
@@ -77,6 +77,6 @@ That's it!
 Let's look at our complete test class to see how little we had to add to get up and running with Testcontainers:
 
 <!--codeinclude-->
-[RedisBackedCacheIntTest](../examples/src/test/java/quickstart/RedisBackedCacheIntTest.java) block:RedisBackedCacheIntTest
+[RedisBackedCacheIntTest](../examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java) block:RedisBackedCacheIntTest
 <!--/codeinclude-->
 
diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
new file mode 100644
index 00000000000..5a07af24731
--- /dev/null
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -0,0 +1,110 @@
+# JUnit 5 Quickstart
+
+It's easy to add Testcontainers to your project - let's walk through a quick example to see how.
+
+Let's imagine we have a simple program that has a dependency on Redis, and we want to add some tests for it.
+In our imaginary program, there is a `RedisBackedCache` class which stores data in Redis.
+ 
+You can see an example test that could have been written for it (without using Testcontainers):
+
+<!--codeinclude-->
+[Pre-Testcontainers test code](../examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java) block:RedisBackedCacheIntTestStep0
+<!--/codeinclude-->
+
+Notice that the existing test has a problem - it's relying on a local installation of Redis, which is a red flag for test reliability.
+This may work if we were sure that every developer and CI machine had Redis installed, but would fail otherwise.
+We might also have problems if we attempted to run tests in parallel, such as state bleeding between tests, or port clashes.
+
+Let's start from here, and see how to improve the test with Testcontainers:  
+
+## 1. Add Testcontainers as a test-scoped dependency
+
+First, add Testcontainers as a dependency as follows:
+
+```groovy tab='Gradle'
+def junitJupiterVersion = '5.4.2'
+testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
+testCompile "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
+testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+testCompile "org.testcontainers:testcontainers:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.junit.jupiter</groupId>
+    <artifactId>junit-jupiter-api</artifactId>
+    <version>5.4.2</version>
+    <scope>test</scope>
+</dependency>
+<dependency>
+    <groupId>org.junit.jupiter</groupId>
+    <artifactId>junit-jupiter-params</artifactId>
+    <version>5.4.2</version>
+    <scope>test</scope>
+</dependency>
+<dependency>
+    <groupId>org.junit.jupiter</groupId>
+    <artifactId>junit-jupiter-engine</artifactId>
+    <version>5.4.2</version>
+    <scope>test</scope>
+</dependency>
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>testcontainers</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>junit-jupiter</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+## 2. Get Testcontainers to run a Redis container during our tests
+
+First, you'll need to annotate the test class with `@Testcontainers`. Furthermore, add the following to the body of our test class:
+
+<!--codeinclude-->
+[JUnit 5 Rule](../examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:container
+<!--/codeinclude-->
+
+The `@Container` annotation tells JUnit to notify this field about various events in the test lifecycle.
+In this case, our rule object is a Testcontainers `GenericContainer`, configured to use a specific Redis image from Docker Hub, and configured to expose a port.
+
+If we run our test as-is, then regardless of the actual test outcome, we'll see logs showing us that Testcontainers:
+
+* was activated before our test method ran
+* discovered and quickly tested our local Docker setup
+* pulled the image if necessary
+* started a new container and waited for it to be ready
+* shut down and deleted the container after the test
+
+## 3. Make sure our code can talk to the container
+
+Before Testcontainers, we might have hardcoded an address like `localhost:6379` into our tests.
+
+Testcontainers uses *randomized ports* for each container it starts, but makes it easy to obtain the actual port at runtime.
+We can do this in our test `setUp` method, to set up our component under test:
+
+<!--codeinclude-->
+[Obtaining a mapped port](../examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:setUp
+<!--/codeinclude-->
+
+!!! tip
+    Notice that we also ask Testcontainers for the container's actual address with `redis.getContainerIpAddress();`, 
+    rather than hard-coding `localhost`. `localhost` may work in some environments but not others - for example it may
+    not work on your current or future CI environment. As such, **avoid hard-coding** the address, and use 
+    `getContainerIpAddress()` instead.
+
+## 4. Run the tests!
+
+That's it!
+
+Let's look at our complete test class to see how little we had to add to get up and running with Testcontainers:
+
+<!--codeinclude-->
+[RedisBackedCacheIntTest](../examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:class
+<!--/codeinclude-->
+
diff --git a/docs/quickstart/spock_quickstart.md b/docs/quickstart/spock_quickstart.md
index 921956c875a..902f1a78c09 100644
--- a/docs/quickstart/spock_quickstart.md
+++ b/docs/quickstart/spock_quickstart.md
@@ -8,7 +8,7 @@ In our imaginary program, there is a `RedisBackedCache` class which stores data
 You can see an example test that could have been written for it (without using Testcontainers):
 
 <!--codeinclude-->
-[Pre-Testcontainers test code](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy) block:RedisBackedCacheIntTestStep0
+[Pre-Testcontainers test code](../examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy) block:RedisBackedCacheIntTestStep0
 <!--/codeinclude-->
 
 Notice that the existing test has a problem - it's relying on a local installation of Redis, which is a red flag for test reliability.
@@ -46,7 +46,7 @@ class RedisBackedCacheIntTest extends Specification {
 And add the following field to the body of our test class:
 
 <!--codeinclude-->
-[Spock Testcontainers init](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) inside_block:init
+[Spock Testcontainers init](../examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) inside_block:init
 <!--/codeinclude-->
 
 This tells Spock to start a Testcontainers `GenericContainer`, configured to use a specific Redis image from Docker Hub, and configured to expose a port.
@@ -67,7 +67,7 @@ Testcontainers uses *randomized ports* for each container it starts, but makes i
 We can do this in our test `setup` method, to set up our component under test:
 
 <!--codeinclude-->
-[Obtaining a mapped port](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) inside_block:setup
+[Obtaining a mapped port](../examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) inside_block:setup
 <!--/codeinclude-->
 
 !!! tip
@@ -83,5 +83,5 @@ That's it!
 Let's look at our complete test class to see how little we had to add to get up and running with Testcontainers:
 
 <!--codeinclude-->
-[RedisBackedCacheIntTest](../../examples/spock/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) block:complete
+[RedisBackedCacheIntTest](../examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy) block:complete
 <!--/codeinclude-->
diff --git a/mkdocs.yml b/mkdocs.yml
index 5c78e884662..eaec3ae13a1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,6 +25,7 @@ nav:
     - Home: index.md
     - Quickstart:
           - quickstart/junit_4_quickstart.md
+          - quickstart/junit_5_quickstart.md
           - quickstart/spock_quickstart.md
     - Features:
           - features/creating_container.md
diff --git a/settings.gradle b/settings.gradle
index e8fb1efe910..7e01821a058 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -45,7 +45,10 @@ file('modules').eachDir { dir ->
     project(":${dir.name}").projectDir = dir
 }
 
-include "docs-examples"
-project(":docs-examples").projectDir = file("docs/examples")
+include ':docs:examples:junit4:generic'
+include ':docs:examples:junit4:redis'
+include ':docs:examples:junit5:redis'
+include ':docs:examples:spock:redis'
+
 include 'test-support'
 

From 6b158463141e70ce7b9cf05c0998401fd6660adb Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 27 Nov 2019 20:08:23 +0000
Subject: [PATCH 0403/4969] Switch to publishing non-delomboked sources (#1788)

* Fixes #762, #1966: Switch to publishing non-delomboked sources
Delomboked sources are available under the 'sources-delomboked' classifier

* Remove publication of delomboked sources JAR
---
 build.gradle             | 12 +++++-------
 gradle/publishing.gradle |  1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7bbf71af9f9..67b3a3a6635 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,11 @@ subprojects {
     compileJava.options.encoding = 'UTF-8'
     compileTestJava.options.encoding = 'UTF-8'
 
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+
     lombok {
         version = '1.18.8'
     }
@@ -36,18 +41,11 @@ subprojects {
         project.sourceSets.main.java.srcDirs.find { it.exists() }
     }
 
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
-
     // specific modules should be excluded from publication
     if ( ! ["test-support", "jdbc-test", "docs-examples"].contains(it.name) ) {
         apply from: "$rootDir/gradle/publishing.gradle"
         apply from: "$rootDir/gradle/bintray.gradle"
 
-        project.tasks.sourceJar.from(delombok)
-
         publishing {
             publications {
                 mavenJava(MavenPublication) { publication ->
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 14c385144ba..3acdeb10c88 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -2,6 +2,7 @@ apply plugin: 'maven-publish'
 
 task sourceJar(type: Jar) {
     classifier = 'sources'
+    from sourceSets.main.allJava
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {

From 7b38847bc2de5ab7bc112ac1a89d63dff135af45 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 20:10:49 +0000
Subject: [PATCH 0404/4969] =?UTF-8?q?Bump=20aws-java-sdk-s3=20from=201.11.?=
 =?UTF-8?q?680=20to=201.11.683=20in=20/modules/loca=E2=80=A6=20(#2103)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.680 to 1.11.683.
- [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.680...1.11.683)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 770294621aa..819419c57ee 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.680'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.636'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
 }

From 96c8e051ba5630603cb772d4e5774e811b3ec936 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 20:11:09 +0000
Subject: [PATCH 0405/4969] Bump mariadb-java-client from 2.5.1 to 2.5.2 in
 /modules/mariadb (#2098)

Bumps [mariadb-java-client](https://github.com/MariaDB/mariadb-connector-j) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/MariaDB/mariadb-connector-j/releases)
- [Changelog](https://github.com/MariaDB/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MariaDB/mariadb-connector-j/compare/2.5.1...2.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 87462ce158d..541d3967680 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.1'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.2'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'

From 3880dd4a0c0c347cd47aaf612597893f2ca9f6c6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 27 Nov 2019 21:11:27 +0100
Subject: [PATCH 0406/4969] Rework KafkaContainer (do not run a sub-process)
 (#2078)

* Rework KafkaContainer (do not run a sub-process)

* revert unrelated change

* Escape environment variables

* Start ZK before Kafka
---
 .../containers/KafkaContainer.java            | 33 +++++++++++++------
 .../containers/KafkaContainerTest.java        |  7 ++--
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 4b5e66a7bf5..60037acfd45 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -4,9 +4,13 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
 import lombok.SneakyThrows;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * This container wraps Confluent Kafka and Zookeeper (optionally)
@@ -14,6 +18,8 @@
  */
 public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
     public static final int KAFKA_PORT = 9093;
 
     public static final int ZOOKEEPER_PORT = 2181;
@@ -97,7 +103,7 @@ public String getBootstrapServers() {
 
     @Override
     protected void doStart() {
-        withCommand("sleep infinity");
+        withCommand("sh", "-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
 
         if (externalZookeeperConnect == null) {
             addExposedPort(ZOOKEEPER_PORT);
@@ -124,17 +130,24 @@ protected void containerIsStarting(InspectContainerResponse containerInfo, boole
             zookeeperConnect = startZookeeper();
         }
 
-        String internalIp = containerInfo.getNetworkSettings().getIpAddress();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(getContainerId())
-            .withCmd("sh", "-c", "" +
-                "export KAFKA_ZOOKEEPER_CONNECT=" + zookeeperConnect + "\n" +
-                "export KAFKA_ADVERTISED_LISTENERS=" + getBootstrapServers() + "," + String.format("BROKER://%s:9092", internalIp) + "\n" +
-                "/etc/confluent/docker/run"
+        String command = "#!/bin/bash \n";
+        command += "export KAFKA_ZOOKEEPER_CONNECT='" + zookeeperConnect + "'\n";
+        command += "export KAFKA_ADVERTISED_LISTENERS='" + Stream
+            .concat(
+                Stream.of(getBootstrapServers()),
+                containerInfo.getNetworkSettings().getNetworks().values().stream()
+                    .map(it -> "BROKER://" + it.getIpAddress() + ":9092")
             )
-            .exec();
+            .collect(Collectors.joining(",")) + "'\n";
 
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(new ExecStartResultCallback()).awaitStarted(10, TimeUnit.SECONDS);
+        command += ". /etc/confluent/docker/bash-config \n";
+        command += "/etc/confluent/docker/configure \n";
+        command += "/etc/confluent/docker/launch \n";
+
+        copyFileToContainer(
+            Transferable.of(command.getBytes(StandardCharsets.UTF_8), 700),
+            STARTER_SCRIPT
+        );
     }
 
     @SneakyThrows(InterruptedException.class)
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 0b29ee0e6ef..add8b2b171d 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -16,7 +16,6 @@
 import java.util.Arrays;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
@@ -46,7 +45,8 @@ public void testExternalZookeeperWithKafkaNetwork() throws Exception {
                 .withNetworkAliases("zookeeper")
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
         ) {
-            Stream.of(kafka, zookeeper).parallel().forEach(GenericContainer::start);
+            zookeeper.start();
+            kafka.start();
 
             testKafkaFunctionality(kafka.getBootstrapServers());
         }
@@ -66,7 +66,8 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
                 .withNetworkAliases("zookeeper")
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
         ) {
-            Stream.of(kafka, zookeeper).parallel().forEach(GenericContainer::start);
+            zookeeper.start();
+            kafka.start();
 
             testKafkaFunctionality(kafka.getBootstrapServers());
         }

From 3cb33792328e49b5ab8d78f747a256d65593dd64 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 27 Nov 2019 21:48:04 +0100
Subject: [PATCH 0407/4969] Hash copied files (#2055)

* Fix session label when reuse is not supported but requested

* Hash copied files

* restore import

* add file mode to the checksum

* Mock TestcontainersConfiguration

* checksum folders too
---
 .../containers/GenericContainer.java          |  46 +++-
 .../testcontainers/utility/MountableFile.java |   7 +-
 .../containers/ReusabilityUnitTests.java      | 228 +++++++++++++++++-
 3 files changed, 272 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 94ce6f64518..0062612c10d 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -29,6 +29,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -75,6 +76,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.time.Instant;
@@ -87,6 +89,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -96,6 +99,8 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.zip.Adler32;
+import java.util.zip.Checksum;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.testcontainers.utility.CommandLine.runShellCommand;
@@ -116,6 +121,8 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     static final String HASH_LABEL = "org.testcontainers.hash";
 
+    static final String COPIED_FILES_HASH_LABEL = "org.testcontainers.copied_files.hash";
+
     /*
      * Default settings
      */
@@ -353,6 +360,11 @@ private void tryStart(Instant startedAt) {
                 }
 
                 if (TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
+                    createCommand.getLabels().put(
+                        COPIED_FILES_HASH_LABEL,
+                        Long.toHexString(hashCopiedFiles().getValue())
+                    );
+
                     String hash = hash(createCommand);
 
                     containerId = findContainerForReuse(hash).orElse(null);
@@ -381,7 +393,7 @@ private void tryStart(Instant startedAt) {
             if (!reused) {
                 containerId = createCommand.exec().getId();
 
-                // TODO add to the hash
+                // TODO use single "copy" invocation (and calculate an hash of the resulting tar archive)
                 copyToFileContainerPathMap.forEach(this::copyFileToContainer);
             }
 
@@ -474,6 +486,36 @@ private void tryStart(Instant startedAt) {
         }
     }
 
+    @VisibleForTesting
+    Checksum hashCopiedFiles() {
+        Checksum checksum = new Adler32();
+        copyToFileContainerPathMap.entrySet().stream().sorted(Entry.comparingByValue()).forEach(entry -> {
+            byte[] pathBytes = entry.getValue().getBytes();
+            // Add path to the hash
+            checksum.update(pathBytes, 0, pathBytes.length);
+
+            File file = new File(entry.getKey().getResolvedPath());
+            checksumFile(file, checksum);
+        });
+        return checksum;
+    }
+
+    @VisibleForTesting
+    @SneakyThrows(IOException.class)
+    void checksumFile(File file, Checksum checksum) {
+        Path path = file.toPath();
+        checksum.update(MountableFile.getUnixFileMode(path));
+        if (file.isDirectory()) {
+            try (Stream<Path> stream = Files.walk(path)) {
+                stream.filter(it -> it != path).forEach(it -> {
+                    checksumFile(it.toFile(), checksum);
+                });
+            }
+        } else {
+            FileUtils.checksum(file, checksum);
+        }
+    }
+
     @UnstableAPI
     @SneakyThrows(JsonProcessingException.class)
     final String hash(CreateContainerCmd createCommand) {
@@ -708,7 +750,7 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
 
         Set<Link> allLinks = new HashSet<>();
         Set<String> allLinkedContainerNetworks = new HashSet<>();
-        for (Map.Entry<String, LinkableContainer> linkEntries : linkedContainers.entrySet()) {
+        for (Entry<String, LinkableContainer> linkEntries : linkedContainers.entrySet()) {
 
             String alias = linkEntries.getKey();
             LinkableContainer linkableContainer = linkEntries.getValue();
diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 56d5bda3ffa..37312116734 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -9,6 +9,7 @@
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.UnstableAPI;
 import org.testcontainers.images.builder.Transferable;
 
 import java.io.File;
@@ -361,9 +362,13 @@ private int getUnixFileMode(final String pathAsString) {
         if (this.forcedFileMode != null) {
             return this.getModeValue(path);
         }
+        return getUnixFileMode(path);
+    }
 
+    @UnstableAPI
+    public static int getUnixFileMode(final Path path) {
         try {
-            return (int) Files.getAttribute(path, "unix:mode");
+            return (int) Files.readAttributes(path, "unix:mode").get("mode");
         } catch (IOException | UnsupportedOperationException e) {
             // fallback for non-posix environments
             int mode = DEFAULT_FILE_MODE;
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 3f7c7d75b45..096f202b3d7 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -9,6 +9,7 @@
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.StartContainerCmdImpl;
+import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import org.junit.Rule;
@@ -24,11 +25,20 @@
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
@@ -182,7 +192,12 @@ public void shouldNotCallHookIfNotReused() {
     @FieldDefaults(makeFinal = true)
     public static class HashTest extends AbstractReusabilityTest {
 
-        protected GenericContainer<?> container = makeReusable(new GenericContainer<>(IMAGE_FUTURE));
+        protected GenericContainer<?> container = makeReusable(new GenericContainer(IMAGE_FUTURE) {
+            @Override
+            public void copyFileToContainer(MountableFile mountableFile, String containerPath) {
+                // NOOP
+            }
+        });
 
         @Test
         public void shouldStartIfListReturnsEmpty() {
@@ -230,6 +245,208 @@ public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
                         .containsKeys(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL);
                 });
         }
+
+        @Test
+        public void shouldSetCopiedFilesHashLabel() {
+            Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
+            AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId, commandRef::set));
+            when(client.listContainersCmd()).then(listContainersAnswer());
+            when(client.startContainerCmd(containerId)).then(startContainerAnswer());
+            when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
+
+            container.start();
+
+            assertThat(commandRef).isNotNull();
+            assertThat(commandRef.get().getLabels())
+                .containsKeys(GenericContainer.COPIED_FILES_HASH_LABEL);
+        }
+
+        @Test
+        public void shouldHashCopiedFiles() {
+            Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
+            AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
+            String containerId = randomContainerId();
+            when(client.createContainerCmd(any())).then(createContainerAnswer(containerId, commandRef::set));
+            when(client.listContainersCmd()).then(listContainersAnswer());
+            when(client.startContainerCmd(containerId)).then(startContainerAnswer());
+            when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
+
+            container.start();
+
+            assertThat(commandRef).isNotNull();
+
+            Map<String, String> labels = commandRef.get().getLabels();
+            assertThat(labels).containsKeys(GenericContainer.COPIED_FILES_HASH_LABEL);
+
+            String oldHash = labels.get(GenericContainer.COPIED_FILES_HASH_LABEL);
+
+            // Simulate stop
+            container.containerId = null;
+
+            container.withCopyFileToContainer(
+                MountableFile.forClasspathResource("test_copy_to_container.txt"),
+                "/foo/bar"
+            );
+            container.start();
+
+            assertThat(commandRef.get().getLabels()).hasEntrySatisfying(GenericContainer.COPIED_FILES_HASH_LABEL, newHash -> {
+                assertThat(newHash).as("new hash").isNotEqualTo(oldHash);
+            });
+        }
+    }
+
+    @RunWith(BlockJUnit4ClassRunner.class)
+    @FieldDefaults(makeFinal = true)
+    public static class CopyFilesHashTest {
+        GenericContainer<?> container = new GenericContainer(IMAGE_FUTURE);
+
+        @Test
+        public void empty() {
+            assertThat(container.hashCopiedFiles()).isNotNull();
+        }
+
+        @Test
+        public void oneFile() {
+            long emptyHash = container.hashCopiedFiles().getValue();
+
+            container.withCopyFileToContainer(
+                MountableFile.forClasspathResource("test_copy_to_container.txt"),
+                "/foo/bar"
+            );
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(emptyHash);
+        }
+
+        @Test
+        public void differentPath() {
+            MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
+            container.withCopyFileToContainer(mountableFile, "/foo/bar");
+
+            long hash1 = container.hashCopiedFiles().getValue();
+
+            container.getCopyToFileContainerPathMap().clear();
+
+            container.withCopyFileToContainer(mountableFile, "/foo/baz");
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
+        }
+
+        @Test
+        public void detectsChangesInFile() throws Exception {
+            Path path = File.createTempFile("reusable_test", ".txt").toPath();
+            MountableFile mountableFile = MountableFile.forHostPath(path);
+            container.withCopyFileToContainer(mountableFile, "/foo/bar");
+
+            long hash1 = container.hashCopiedFiles().getValue();
+
+            Files.write(path, UUID.randomUUID().toString().getBytes());
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
+        }
+
+        @Test
+        public void multipleFiles() {
+            container.withCopyFileToContainer(
+                MountableFile.forClasspathResource("test_copy_to_container.txt"),
+                "/foo/bar"
+            );
+            long hash1 = container.hashCopiedFiles().getValue();
+
+            container.withCopyFileToContainer(
+                MountableFile.forClasspathResource("mappable-resource/test-resource.txt"),
+                "/foo/baz"
+            );
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
+        }
+
+        @Test
+        public void folder() throws Exception {
+            long emptyHash = container.hashCopiedFiles().getValue();
+
+            Path tempDirectory = Files.createTempDirectory("reusable_test");
+            MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
+            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(emptyHash);
+        }
+
+        @Test
+        public void changesInFolder() throws Exception {
+            Path tempDirectory = Files.createTempDirectory("reusable_test");
+            MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
+            assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
+            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+
+            long hash1 = container.hashCopiedFiles().getValue();
+
+            Path fileInFolder = Files.createFile(
+                // Create file in the sub-folder
+                Files.createDirectory(tempDirectory.resolve("sub")).resolve("test.txt")
+            );
+            assertThat(fileInFolder).exists();
+            Files.write(fileInFolder, UUID.randomUUID().toString().getBytes());
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
+        }
+
+        @Test
+        public void folderAndFile() throws Exception {
+            Path tempDirectory = Files.createTempDirectory("reusable_test");
+            MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
+            assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
+            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+
+            long hash1 = container.hashCopiedFiles().getValue();
+
+            container.withCopyFileToContainer(
+                MountableFile.forClasspathResource("test_copy_to_container.txt"),
+                "/foo/baz"
+            );
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
+        }
+
+        @Test
+        public void filePermissions() throws Exception {
+            Path path = File.createTempFile("reusable_test", ".txt").toPath();
+            MountableFile mountableFile = MountableFile.forHostPath(path);
+            container.withCopyFileToContainer(mountableFile, "/foo/bar");
+
+            long hash1 = container.hashCopiedFiles().getValue();
+
+            Set<PosixFilePermission> filePermissions = new HashSet<>(Files.getPosixFilePermissions(path));
+            assertThat(filePermissions).doesNotContain(PosixFilePermission.OWNER_EXECUTE);
+            filePermissions.add(PosixFilePermission.OWNER_EXECUTE);
+            Files.setPosixFilePermissions(path, filePermissions);
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
+        }
+
+        @Test
+        public void folderPermissions() throws Exception {
+            Path tempDirectory = Files.createTempDirectory("reusable_test");
+            MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
+            assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
+            Path subDir = Files.createDirectory(
+                tempDirectory.resolve("sub"),
+                PosixFilePermissions.asFileAttribute(
+                    Sets.newHashSet(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE)
+                )
+            );
+            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+
+            long hash1 = container.hashCopiedFiles().getValue();
+
+            Set<PosixFilePermission> permissions = new HashSet<>(Files.getPosixFilePermissions(subDir));
+            assertThat(permissions).doesNotContain(PosixFilePermission.OWNER_EXECUTE);
+            permissions.add(PosixFilePermission.OWNER_EXECUTE);
+            Files.setPosixFilePermissions(subDir, permissions);
+
+            assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
+        }
     }
 
     @FieldDefaults(makeFinal = true)
@@ -257,11 +474,11 @@ public StartupStatus checkStartupState(DockerClient dockerClient, String contain
                 }
             });
             container.waitingFor(new AbstractWaitStrategy() {
-                    @Override
-                    protected void waitUntilReady() {
+                @Override
+                protected void waitUntilReady() {
 
-                    }
-                });
+                }
+            });
             container.withReuse(true);
             return container;
         }
@@ -317,6 +534,5 @@ protected Answer<InspectContainerCmd> inspectContainerAnswer() {
                 return new InspectContainerCmdImpl(exec, invocation.getArgument(0));
             };
         }
-
     }
 }

From af0a6803666cfbeb15fd1db0b50243c658969860 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 28 Nov 2019 09:14:13 +0100
Subject: [PATCH 0408/4969] Use `File#setExecutable`

---
 .../containers/ReusabilityUnitTests.java      | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 096f202b3d7..5ecee409ead 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -9,7 +9,6 @@
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.StartContainerCmdImpl;
-import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import org.junit.Rule;
@@ -31,14 +30,10 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
@@ -417,10 +412,8 @@ public void filePermissions() throws Exception {
 
             long hash1 = container.hashCopiedFiles().getValue();
 
-            Set<PosixFilePermission> filePermissions = new HashSet<>(Files.getPosixFilePermissions(path));
-            assertThat(filePermissions).doesNotContain(PosixFilePermission.OWNER_EXECUTE);
-            filePermissions.add(PosixFilePermission.OWNER_EXECUTE);
-            Files.setPosixFilePermissions(path, filePermissions);
+            assertThat(path.toFile().canExecute()).isFalse();
+            path.toFile().setExecutable(true);
 
             assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
         }
@@ -430,20 +423,13 @@ public void folderPermissions() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
             assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
-            Path subDir = Files.createDirectory(
-                tempDirectory.resolve("sub"),
-                PosixFilePermissions.asFileAttribute(
-                    Sets.newHashSet(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE)
-                )
-            );
+            Path subDir = Files.createDirectory(tempDirectory.resolve("sub"));
+            subDir.toFile().setExecutable(false);
             container.withCopyFileToContainer(mountableFile, "/foo/bar/");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
-            Set<PosixFilePermission> permissions = new HashSet<>(Files.getPosixFilePermissions(subDir));
-            assertThat(permissions).doesNotContain(PosixFilePermission.OWNER_EXECUTE);
-            permissions.add(PosixFilePermission.OWNER_EXECUTE);
-            Files.setPosixFilePermissions(subDir, permissions);
+            subDir.toFile().setExecutable(true);
 
             assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
         }

From f9ed1416a279ad2aa3c119f682621e2f931785bb Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 28 Nov 2019 09:29:36 +0100
Subject: [PATCH 0409/4969] Use `setWritable` for folder,
 `setExecutable(false)` in `filePermissions`

---
 .../org/testcontainers/containers/ReusabilityUnitTests.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 5ecee409ead..3414ae1a412 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -407,6 +407,7 @@ public void folderAndFile() throws Exception {
         @Test
         public void filePermissions() throws Exception {
             Path path = File.createTempFile("reusable_test", ".txt").toPath();
+            path.toFile().setExecutable(false);
             MountableFile mountableFile = MountableFile.forHostPath(path);
             container.withCopyFileToContainer(mountableFile, "/foo/bar");
 
@@ -424,12 +425,12 @@ public void folderPermissions() throws Exception {
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
             assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
             Path subDir = Files.createDirectory(tempDirectory.resolve("sub"));
-            subDir.toFile().setExecutable(false);
+            subDir.toFile().setWritable(false);
             container.withCopyFileToContainer(mountableFile, "/foo/bar/");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
-            subDir.toFile().setExecutable(true);
+            subDir.toFile().setWritable(true);
 
             assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
         }

From 3826190f2ac57117bd6b36d807f7006076de5f5a Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 28 Nov 2019 09:41:17 +0100
Subject: [PATCH 0410/4969] assume file permissions

---
 .../org/testcontainers/containers/ReusabilityUnitTests.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 3414ae1a412..35c4a88e68a 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -42,6 +42,7 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
@@ -413,7 +414,7 @@ public void filePermissions() throws Exception {
 
             long hash1 = container.hashCopiedFiles().getValue();
 
-            assertThat(path.toFile().canExecute()).isFalse();
+            assumeThat(path.toFile().canExecute()).isFalse();
             path.toFile().setExecutable(true);
 
             assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
@@ -423,7 +424,7 @@ public void filePermissions() throws Exception {
         public void folderPermissions() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
-            assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
+            assumeThat(new File(mountableFile.getResolvedPath())).isDirectory();
             Path subDir = Files.createDirectory(tempDirectory.resolve("sub"));
             subDir.toFile().setWritable(false);
             container.withCopyFileToContainer(mountableFile, "/foo/bar/");

From d44debdaf173571be35928b2d5d22c713a68925e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 28 Nov 2019 10:46:44 +0100
Subject: [PATCH 0411/4969] fix the assumptions

---
 .../org/testcontainers/containers/ReusabilityUnitTests.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 35c4a88e68a..b2d4d327ba2 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -424,14 +424,16 @@ public void filePermissions() throws Exception {
         public void folderPermissions() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
-            assumeThat(new File(mountableFile.getResolvedPath())).isDirectory();
+            assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
             Path subDir = Files.createDirectory(tempDirectory.resolve("sub"));
             subDir.toFile().setWritable(false);
+            assumeThat(subDir.toFile().canWrite()).isFalse();
             container.withCopyFileToContainer(mountableFile, "/foo/bar/");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
             subDir.toFile().setWritable(true);
+            assumeThat(subDir.toFile()).canWrite();
 
             assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
         }

From cd7fce7e85b06d75eb675f9cbb8f5ffb615e043e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 28 Nov 2019 13:30:42 +0100
Subject: [PATCH 0412/4969] Add GHA for Release Drafter (#2109)

Currently we have Release Drafter integrated as a GitHub App.

If we change it to GHA (GitHub Actions), we will be able to re-trigger it
and overall have better control of it (e.g. version)
---
 .github/workflows/release-drafter.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/release-drafter.yml

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 00000000000..6f4e849bd5b
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,14 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5.2.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 50ff2c514e460290af4ac5c5da89f97f001d9e80 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 28 Nov 2019 18:04:41 +0000
Subject: [PATCH 0413/4969] Basic GitHub Action for release (#1991)

* Basic GitHub Action for release

* Update following review

* Update .github/workflows/gradle.yml

Co-Authored-By: Sergei Egorov <bsideup@gmail.com>

* Remove explicit check stage
(release runs without testing - should be manually verified that master branch is stable)

* Add simple shell check for whether master branch is passing CI checks

* Strip quotes

* Update .github/workflows/gradle-release.yml

Co-Authored-By: Sergei Egorov <bsideup@gmail.com>
---
 .github/workflows/gradle-release.yml | 22 ++++++++++++++++++++++
 .travis.yml                          | 11 -----------
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/gradle-release.yml

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
new file mode 100644
index 00000000000..ca823536fcb
--- /dev/null
+++ b/.github/workflows/gradle-release.yml
@@ -0,0 +1,22 @@
+name: Gradle Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Verify CI check status
+      run: [ $(curl -s https://api.github.com/repos/testcontainers/testcontainers-java/commits/$GITHUB_SHA/status | jq -r '.state') == 'success' ]
+    - name: Release with Gradle
+      run: ./gradlew -Pversion=$GITHUB_REF release --scan --no-daemon -i
+      env:
+        BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+        BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
diff --git a/.travis.yml b/.travis.yml
index eda26dc69af..6e07925db3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,14 +58,3 @@ jobs:
                 openjdk:8-jdk-alpine \
                 ./gradlew --no-daemon testcontainers:test --tests '*GenericContainerRuleTest' --scan -i
 
-    - stage: deploy
-      sudo: false
-      services: []
-      install: skip
-      script: skip
-      deploy:
-        provider: script
-        script: ./gradlew -Pversion=$TRAVIS_TAG release --scan --no-daemon -i
-        on:
-          tags: true
-          branch: master

From 8ed2cfadf1fa0ddc3f806f701c1c5e747e3a2356 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 28 Nov 2019 20:51:14 +0000
Subject: [PATCH 0414/4969] Escape verify command

---
 .github/workflows/gradle-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
index ca823536fcb..f8feb0cccde 100644
--- a/.github/workflows/gradle-release.yml
+++ b/.github/workflows/gradle-release.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Verify CI check status
-      run: [ $(curl -s https://api.github.com/repos/testcontainers/testcontainers-java/commits/$GITHUB_SHA/status | jq -r '.state') == 'success' ]
+      run: "[ $(curl -s https://api.github.com/repos/testcontainers/testcontainers-java/commits/$GITHUB_SHA/status | jq -r '.state') == 'success' ]"
     - name: Release with Gradle
       run: ./gradlew -Pversion=$GITHUB_REF release --scan --no-daemon -i
       env:

From 7336e4a3b44c4def9967da775e739d52374e9e40 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 29 Nov 2019 09:48:20 +0100
Subject: [PATCH 0415/4969] Extract the CI status check into a script (#2113)

---
 .github/workflows/gradle-release.yml         | 2 +-
 .github/workflows/scripts/check_ci_status.sh | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100755 .github/workflows/scripts/check_ci_status.sh

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
index f8feb0cccde..a1bce2d9278 100644
--- a/.github/workflows/gradle-release.yml
+++ b/.github/workflows/gradle-release.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Verify CI check status
-      run: "[ $(curl -s https://api.github.com/repos/testcontainers/testcontainers-java/commits/$GITHUB_SHA/status | jq -r '.state') == 'success' ]"
+      run: .github/workflows/scripts/check_ci_status.sh
     - name: Release with Gradle
       run: ./gradlew -Pversion=$GITHUB_REF release --scan --no-daemon -i
       env:
diff --git a/.github/workflows/scripts/check_ci_status.sh b/.github/workflows/scripts/check_ci_status.sh
new file mode 100755
index 00000000000..ee2719cbb49
--- /dev/null
+++ b/.github/workflows/scripts/check_ci_status.sh
@@ -0,0 +1,3 @@
+#/bin/bash
+
+[ $(curl -s https://api.github.com/repos/testcontainers/testcontainers-java/commits/$1/status | jq -r '.state') == 'success' ]

From ad58df04eea922d0e3e4126fb2a45483c5d9ebba Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 29 Nov 2019 10:30:57 +0100
Subject: [PATCH 0416/4969] add missing argument

---
 .github/workflows/gradle-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
index a1bce2d9278..8c261064d33 100644
--- a/.github/workflows/gradle-release.yml
+++ b/.github/workflows/gradle-release.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Verify CI check status
-      run: .github/workflows/scripts/check_ci_status.sh
+      run: .github/workflows/scripts/check_ci_status.sh $GITHUB_SHA
     - name: Release with Gradle
       run: ./gradlew -Pversion=$GITHUB_REF release --scan --no-daemon -i
       env:

From 7f9ff7951d89c8a2ac50fdef867f6d3f345a53b7 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 29 Nov 2019 10:40:26 +0100
Subject: [PATCH 0417/4969] future proof check_ci_status.sh

---
 .github/workflows/scripts/check_ci_status.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check_ci_status.sh b/.github/workflows/scripts/check_ci_status.sh
index ee2719cbb49..bc5c0b138a2 100755
--- a/.github/workflows/scripts/check_ci_status.sh
+++ b/.github/workflows/scripts/check_ci_status.sh
@@ -1,3 +1,13 @@
 #/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
 
-[ $(curl -s https://api.github.com/repos/testcontainers/testcontainers-java/commits/$1/status | jq -r '.state') == 'success' ]
+if [ -z $1 ] ; then
+  echo "First parameter (commit SHA) is required!" && exit 1;
+fi
+
+STATUS=$(curl -s https://api.github.com/repos/testcontainers/testcontainers-java/commits/$1/status | jq -r '.state')
+
+[ "$STATUS" == 'success' ]

From 5c4ccedb03589a8fd6484440d75695d7e765b5b1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 29 Nov 2019 11:42:09 +0100
Subject: [PATCH 0418/4969] Update gradle-release.yml

strip `/ref/tags/` from `$GITHUB_REF`
temporary remove the master check
---
 .github/workflows/gradle-release.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
index 8c261064d33..1391561284e 100644
--- a/.github/workflows/gradle-release.yml
+++ b/.github/workflows/gradle-release.yml
@@ -13,10 +13,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Verify CI check status
-      run: .github/workflows/scripts/check_ci_status.sh $GITHUB_SHA
     - name: Release with Gradle
-      run: ./gradlew -Pversion=$GITHUB_REF release --scan --no-daemon -i
+      run: ./gradlew -Pversion=${GITHUB_REF##*/} release --scan --no-daemon -i
       env:
         BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
         BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}

From 31519e3c1f1a65f6e47eebb27f0b97521535a5ea Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 29 Nov 2019 11:59:47 +0100
Subject: [PATCH 0419/4969] Exclude `:docs:` from publication and BOM

---
 bom/build.gradle | 2 +-
 build.gradle     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bom/build.gradle b/bom/build.gradle
index 32805571109..1a1b3c2d9f5 100644
--- a/bom/build.gradle
+++ b/bom/build.gradle
@@ -9,7 +9,7 @@ publishing {
             pom.withXml {
                 def dependencyManagementNode = asNode().appendNode('dependencyManagement').appendNode('dependencies')
 
-                rootProject.subprojects.findAll { it != project }.each { subProject ->
+                rootProject.subprojects.findAll { it != project && !it.path.startsWith(":docs:") && it != project(":docs") }.each { subProject ->
                     dependencyManagementNode.appendNode('dependency').with {
                         appendNode('groupId', subProject.group)
                         appendNode('artifactId',subProject.name)
diff --git a/build.gradle b/build.gradle
index 67b3a3a6635..bac06d64052 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ subprojects {
     }
 
     // specific modules should be excluded from publication
-    if ( ! ["test-support", "jdbc-test", "docs-examples"].contains(it.name) ) {
+    if ( ! ["test-support", "jdbc-test"].contains(it.name) && !it.path.startsWith(":docs:") && it != project(":docs") ) {
         apply from: "$rootDir/gradle/publishing.gradle"
         apply from: "$rootDir/gradle/bintray.gradle"
 

From d23e2d58f2db7b8ffee15fa741b181f63e4a44ad Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 29 Nov 2019 14:05:23 +0100
Subject: [PATCH 0420/4969] Update gradle-release.yml

restore the CI check
---
 .github/workflows/gradle-release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
index 1391561284e..3034ce9cdfb 100644
--- a/.github/workflows/gradle-release.yml
+++ b/.github/workflows/gradle-release.yml
@@ -13,6 +13,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+    - name: Verify CI check status		
+      run: .github/workflows/scripts/check_ci_status.sh $GITHUB_SHA
     - name: Release with Gradle
       run: ./gradlew -Pversion=${GITHUB_REF##*/} release --scan --no-daemon -i
       env:

From d3650665ebfd9a6db11231d217f6b5898a13d382 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Fri, 29 Nov 2019 17:47:23 +0100
Subject: [PATCH 0421/4969] Add XWiki to "Who is using Testcontainers" (#2117)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index c26ed164067..9caecd2261e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -78,6 +78,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [wescale](https://www.wescale.com) - Integration testing against HTTP service mocks and various data stores
 * [Marquez](https://marquezproject.github.io/marquez) - PostgreSQL integration testing
 * [Transferwise](https://transferwise.com/) - Integration testing for different RDBMS, kafka and micro services
+* [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
 
 ## License
 

From 9c320eeb221a036ef3779f2e2a9bffd13c1cf8e9 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 1 Dec 2019 16:11:04 +0100
Subject: [PATCH 0422/4969] Add `x-amz-acl` header to allow public reads of the
 cache files

---
 settings.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/settings.gradle b/settings.gradle
index 7e01821a058..e2ddf080972 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -30,6 +30,9 @@ buildCache {
         bucket = 'testcontainers'
         path = 'cache'
         push = isMasterBuild
+        headers = [
+            'x-amz-acl': 'public-read'
+        ]
     }
 }
 

From bfb44a0067cf4ac7ea21b2ae3fb569fb790b831d Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 1 Dec 2019 22:45:46 +0100
Subject: [PATCH 0423/4969] include only published projects into BOM (#2118)

---
 bom/build.gradle | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bom/build.gradle b/bom/build.gradle
index 1a1b3c2d9f5..6826879ce18 100644
--- a/bom/build.gradle
+++ b/bom/build.gradle
@@ -9,11 +9,14 @@ publishing {
             pom.withXml {
                 def dependencyManagementNode = asNode().appendNode('dependencyManagement').appendNode('dependencies')
 
-                rootProject.subprojects.findAll { it != project && !it.path.startsWith(":docs:") && it != project(":docs") }.each { subProject ->
-                    dependencyManagementNode.appendNode('dependency').with {
-                        appendNode('groupId', subProject.group)
-                        appendNode('artifactId',subProject.name)
-                        appendNode('version', subProject.version)
+                def bomProject = project
+                rootProject.subprojects.each { subProject ->
+                    if (subProject != bomProject && subProject.plugins.findPlugin("maven-publish")) {
+                        dependencyManagementNode.appendNode('dependency').with {
+                            appendNode('groupId', subProject.group)
+                            appendNode('artifactId',subProject.name)
+                            appendNode('version', subProject.version)
+                        }
                     }
                 }
             }

From 650e5b0a854d400982d0df1a187d4bbec4850caf Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 1 Dec 2019 22:59:43 +0100
Subject: [PATCH 0424/4969] Push to the build cache from AZP too

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index e2ddf080972..e5432e08061 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'ch.myniva.s3-build-cache'
 
-ext.isMasterBuild = System.getenv("CIRCLE_BRANCH") == "master"
+ext.isMasterBuild = (System.getenv("CIRCLE_BRANCH") ?: System.getenv("BUILD_SOURCEBRANCHNAME")) == "master"
 
 buildCache {
     local {

From ef96100721f32b8e435cdbde444cb0454acda4f5 Mon Sep 17 00:00:00 2001
From: Tristan Tarrant <tristan.tarrant@gmail.com>
Date: Mon, 2 Dec 2019 14:12:02 +0100
Subject: [PATCH 0425/4969] Add Infinispan to "Who is  (#2136)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 9caecd2261e..1ab42e286c7 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -66,6 +66,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Streamlio](https://streaml.io/) - Integration and Chaos Testing of our fast data platform based on Apache Puslar, Apache Bookeeper and Apache Heron.
 * [Spring Session](https://projects.spring.io/spring-session/) - Redis, PostgreSQL, MySQL and MariaDB integration testing
 * [Apache Camel](https://camel.apache.org) - Testing Camel against native services such as Consul, Etcd and so on
+* [Infinispan](https://infinispan.org) - Testing the Infinispan Server as well as integration tests with databases, LDAP and KeyCloak
 * [Instana](https://www.instana.com) - Testing agents and stream processing backends
 * [eBay Marketing](https://www.ebay.com) - Testing for MySQL, Cassandra, Redis, Couchbase, Kafka, etc.
 * [Skyscanner](https://www.skyscanner.net/) - Integration testing against HTTP service mocks and various data stores

From 18c2e2244e675b97362cffa1d1e11e10f9d3792e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 3 Dec 2019 09:11:08 +0100
Subject: [PATCH 0426/4969] GHA-based in-docker testing (#2121)

* GHA-based in-docker testing

* Add missing triggers

* Damn it, YAML!

* simplify

* use `:test` instead of `:check`

* fix volume mappings

* set workdir

* Force run's working directory

* *correctly* force run's working directory :D

* use `cd`

* try to mount `/home/runner/`

* try `working-directory` again

* try `cd` again

* try `github.repository`

* debug

* try another volume mounting

* debug

* use `docker run`

* remove TTY

* add regular tests

* fix syntax

* temporary remove `include`

* remove "normal" tests for now

* test on `push` only when pushed to `master`

* auto-format with IDEA
---
 .editorconfig            |  6 +++-
 .github/workflows/ci.yml | 21 ++++++++++++++
 .travis.yml              | 60 ----------------------------------------
 3 files changed, 26 insertions(+), 61 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.editorconfig b/.editorconfig
index 4d023ed18d5..b4910e47661 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,4 +21,8 @@ indent_size = 4
 # Never use star imports
 ij_java_names_count_to_use_import_on_demand = 99
 ij_java_class_count_to_use_import_on_demand = 99
-ij_java_layout_static_imports_separately = true
\ No newline at end of file
+ij_java_layout_static_imports_separately = true
+
+[*.{yml, yaml}]
+indent_size = 2
+ij_yaml_keep_indents_on_empty_lines = false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000000..7013e66bea6
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,21 @@
+name: CI
+
+on:
+  pull_request: {}
+  push: { branches: [ master ] }
+
+jobs:
+  in-docker_test:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build with Gradle
+        run: |
+          docker run -i --rm \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            -v "$HOME:$HOME" \
+            -v "$PWD:$PWD" \
+            -w "$PWD" \
+            openjdk:8-jdk-alpine \
+            ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
+
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6e07925db3f..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-if: branch = master OR tag is present
-
-language: java
-jdk:
-  - openjdk8
-
-sudo: required
-services:
-  - docker
-
-# Fix for https://travis-ci.community/t/problematic-docker-compose-version-1-23-1/5362/3
-before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-Linux-x86_64 > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
-
-install:
-  - ./gradlew build -x check --scan --no-daemon
-
-jobs:
-  include:
-    - stage: test
-      env: [ NAME=core ]
-      script: ./gradlew testcontainers:check javadoc --scan --no-daemon -i
-
-    - stage: test
-      env: [ NAME=core ]
-      jdk: openjdk11
-      script: ./gradlew testcontainers:check --scan --no-daemon -i
-
-    - stage: test
-      env: [ NAME=core ]
-      jdk: openjdk12
-      script: ./gradlew testcontainers:check --scan --no-daemon -i
-
-    - env: [ NAME=selenium ]
-      script: ./gradlew selenium:check --scan --no-daemon -i
-
-    - env: [ NAME=modules ]
-      script: ./gradlew check -x testcontainers:check -x selenium:check -x jdbc-test:check --scan --no-daemon -i
-
-    - env: [ NAME=jdbc ]
-      script: ./gradlew jdbc-test:check --scan --no-daemon -i
-
-    - env: [ NAME=examples ]
-      script: cd examples && ./gradlew check --no-daemon -i
-
-    # Run Docker-in-Docker tests inside Alpine
-    - env: [ NAME="docker-in-alpine-docker" ]
-      script:
-        - |
-                DOCKER_HOST=unix:///var/run/docker.sock DOCKER_TLS_VERIFY= docker run -t --rm \
-                -v "$HOME/.gradle":/root/.gradle/ \
-                -v /var/run/docker.sock:/var/run/docker.sock \
-                -v "$(pwd)":"$(pwd)" \
-                -w "$(pwd)" \
-                openjdk:8-jdk-alpine \
-                ./gradlew --no-daemon testcontainers:test --tests '*GenericContainerRuleTest' --scan -i
-

From 796c08a8c6f421adec2c91e9a2fa93b4d448aeb3 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 3 Dec 2019 11:22:43 +0100
Subject: [PATCH 0427/4969] fix `DockerClientFactory#dockerHostIpAddress`
 (#2119)

* fix `DockerClientFactory#dockerHostIpAddress`

* Remove conflicting `DockerClientFactoryTest#dockerClient` test
---
 .../testcontainers/DockerClientFactory.java   | 134 +++++++++---------
 .../DockerClientFactoryTest.java              |  11 +-
 .../DockerClientConfigUtilsTest.java          |  10 +-
 3 files changed, 86 insertions(+), 69 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 54f44dbed3c..0ca7d41a209 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -62,8 +62,12 @@ public class DockerClientFactory {
     private static DockerClientFactory instance;
 
     // Cached client configuration
-    private DockerClientProviderStrategy strategy;
-    private boolean initialized = false;
+    @VisibleForTesting
+    DockerClientProviderStrategy strategy;
+
+    @VisibleForTesting
+    DockerClient dockerClient;
+
     private String activeApiVersion;
     private String activeExecutionDriver;
 
@@ -74,10 +78,8 @@ public class DockerClientFactory {
         System.setProperty("org.testcontainers.shaded.io.netty.packagePrefix", "org.testcontainers.shaded.");
     }
 
-    /**
-     * Private constructor
-     */
-    private DockerClientFactory() {
+    @VisibleForTesting
+    DockerClientFactory() {
 
     }
 
@@ -98,6 +100,19 @@ public synchronized static DockerClientFactory instance() {
         return instance;
     }
 
+    @Synchronized
+    private DockerClientProviderStrategy getOrInitializeStrategy() {
+        if (strategy != null) {
+            return strategy;
+        }
+
+        List<DockerClientProviderStrategy> configurationStrategies = new ArrayList<>();
+        ServiceLoader.load(DockerClientProviderStrategy.class).forEach(configurationStrategies::add);
+
+        strategy = DockerClientProviderStrategy.getFirstValidStrategy(configurationStrategies);
+        return strategy;
+    }
+
     /**
      *
      * @return a new initialized Docker client
@@ -105,63 +120,57 @@ public synchronized static DockerClientFactory instance() {
     @Synchronized
     public DockerClient client() {
 
-        if (strategy != null) {
-            return strategy.getClient();
+        if (dockerClient != null) {
+            return dockerClient;
         }
 
-        List<DockerClientProviderStrategy> configurationStrategies = new ArrayList<DockerClientProviderStrategy>();
-        ServiceLoader.load(DockerClientProviderStrategy.class).forEach( cs -> configurationStrategies.add( cs ) );
-
-        strategy = DockerClientProviderStrategy.getFirstValidStrategy(configurationStrategies);
+        final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
         String hostIpAddress = strategy.getDockerHostIpAddress();
         log.info("Docker host IP address is {}", hostIpAddress);
-        DockerClient client = strategy.getClient();
-
-        if (!initialized) {
-            Info dockerInfo = client.infoCmd().exec();
-            Version version = client.versionCmd().exec();
-            activeApiVersion = version.getApiVersion();
-            activeExecutionDriver = dockerInfo.getExecutionDriver();
-            log.info("Connected to docker: \n" +
-                    "  Server Version: " + dockerInfo.getServerVersion() + "\n" +
-                    "  API Version: " + activeApiVersion + "\n" +
-                    "  Operating System: " + dockerInfo.getOperatingSystem() + "\n" +
-                    "  Total Memory: " + dockerInfo.getMemTotal() / (1024 * 1024) + " MB");
-
-            String ryukContainerId = null;
-            boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
-            if (useRyuk) {
-                ryukContainerId = ResourceReaper.start(hostIpAddress, client);
-                log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
-            }
+        final DockerClient client = strategy.getClient();
+
+        Info dockerInfo = client.infoCmd().exec();
+        Version version = client.versionCmd().exec();
+        activeApiVersion = version.getApiVersion();
+        activeExecutionDriver = dockerInfo.getExecutionDriver();
+        log.info("Connected to docker: \n" +
+                "  Server Version: " + dockerInfo.getServerVersion() + "\n" +
+                "  API Version: " + activeApiVersion + "\n" +
+                "  Operating System: " + dockerInfo.getOperatingSystem() + "\n" +
+                "  Total Memory: " + dockerInfo.getMemTotal() / (1024 * 1024) + " MB");
+
+        String ryukContainerId = null;
+        boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
+        if (useRyuk) {
+            ryukContainerId = ResourceReaper.start(hostIpAddress, client);
+            log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
+        }
 
-            boolean checksEnabled = !TestcontainersConfiguration.getInstance().isDisableChecks();
-            if (checksEnabled) {
-                VisibleAssertions.info("Checking the system...");
-                checkDockerVersion(version.getVersion());
-                if (ryukContainerId != null) {
-                    checkDiskSpace(client, ryukContainerId);
-                } else {
-                    runInsideDocker(
-                        client,
-                        createContainerCmd -> {
-                            createContainerCmd.withName("testcontainers-checks-" + SESSION_ID);
-                            createContainerCmd.getHostConfig().withAutoRemove(true);
-                            createContainerCmd.withCmd("tail", "-f", "/dev/null");
-                        },
-                        (__, containerId) -> {
-                            checkDiskSpace(client, containerId);
-                            return "";
-                        }
-                    );
-                }
+        boolean checksEnabled = !TestcontainersConfiguration.getInstance().isDisableChecks();
+        if (checksEnabled) {
+            VisibleAssertions.info("Checking the system...");
+            checkDockerVersion(version.getVersion());
+            if (ryukContainerId != null) {
+                checkDiskSpace(client, ryukContainerId);
+            } else {
+                runInsideDocker(
+                    client,
+                    createContainerCmd -> {
+                        createContainerCmd.withName("testcontainers-checks-" + SESSION_ID);
+                        createContainerCmd.getHostConfig().withAutoRemove(true);
+                        createContainerCmd.withCmd("tail", "-f", "/dev/null");
+                    },
+                    (__, containerId) -> {
+                        checkDiskSpace(client, containerId);
+                        return "";
+                    }
+                );
             }
-
-            initialized = true;
         }
 
-        return client;
+        dockerClient = client;
+        return dockerClient;
     }
 
     private void checkDockerVersion(String dockerVersion) {
@@ -237,15 +246,12 @@ public void checkAndPullImage(DockerClient client, String image) {
      * @return the IP address of the host running Docker
      */
     public String dockerHostIpAddress() {
-        return strategy.getDockerHostIpAddress();
+        return getOrInitializeStrategy().getDockerHostIpAddress();
     }
 
     public <T> T runInsideDocker(Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
-        if (strategy == null) {
-            client();
-        }
         // We can't use client() here because it might create an infinite loop
-        return runInsideDocker(strategy.getClient(), createContainerCmdConsumer, block);
+        return runInsideDocker(getOrInitializeStrategy().getClient(), createContainerCmdConsumer, block);
     }
 
     private <T> T runInsideDocker(DockerClient client, Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
@@ -293,9 +299,7 @@ DiskSpaceUsage parseAvailableDiskSpace(String dfOutput) {
      * @return the docker API version of the daemon that we have connected to
      */
     public String getActiveApiVersion() {
-        if (!initialized) {
-            client();
-        }
+        client();
         return activeApiVersion;
     }
 
@@ -303,9 +307,7 @@ public String getActiveApiVersion() {
      * @return the docker execution driver of the daemon that we have connected to
      */
     public String getActiveExecutionDriver() {
-        if (!initialized) {
-            client();
-        }
+        client();
         return activeExecutionDriver;
     }
 
@@ -314,7 +316,7 @@ public String getActiveExecutionDriver() {
      * @return whether or not the currently active strategy is of the provided type
      */
     public boolean isUsing(Class<? extends DockerClientProviderStrategy> providerStrategyClass) {
-        return providerStrategyClass.isAssignableFrom(this.strategy.getClass());
+        return strategy != null && providerStrategyClass.isAssignableFrom(this.strategy.getClass());
     }
 
     private static class NotEnoughDiskSpaceException extends RuntimeException {
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index e13c3875f31..19a591be919 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -7,6 +7,8 @@
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Test for {@link DockerClientFactory}.
  */
@@ -43,4 +45,11 @@ public void shouldHandleBigDiskSize() throws Exception {
         VisibleAssertions.assertEquals("Available MB is correct", 2982480572L / 1024L, usage.availableMB.orElse(0L));
         VisibleAssertions.assertEquals("Available percentage is correct", 31, usage.usedPercent.orElse(0));
     }
-}
\ No newline at end of file
+
+    @Test
+    public void dockerHostIpAddress() {
+        DockerClientFactory instance = new DockerClientFactory();
+        instance.strategy = null;
+        assertThat(instance.dockerHostIpAddress()).isNotNull();
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
index e4e29550b9c..2e88982a7a8 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -6,6 +6,7 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 public class DockerClientConfigUtilsTest {
@@ -33,7 +34,7 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
         String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
         assertEquals("12.23.34.45", actual);
     }
-    
+
     @Test
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
         DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder()
@@ -43,11 +44,16 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
         String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
         assertEquals("12.23.34.45", actual);
     }
-    
+
     @Test @Ignore
     public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
         DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("gopher://12.23.34.45").build();
         String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
         assertNull(actual);
     }
+
+    @Test(timeout = 5_000)
+    public void getDefaultGateway() {
+        assertNotNull(DockerClientConfigUtils.getDefaultGateway());
+    }
 }

From 82876e489f19796229d96bb116ab7d2415c96cdb Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 3 Dec 2019 13:24:38 +0000
Subject: [PATCH 0428/4969] Use Python 3.7 for netlify doc generation (#2143)

---
 .envrc      | 2 +-
 runtime.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.envrc b/.envrc
index 3e6a147e52b..dad2eb2cfc6 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1 @@
-use python 3.6.0
+use python 3.7.5
diff --git a/runtime.txt b/runtime.txt
index d70c8f8d89f..475ba515c04 100644
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-3.6
+3.7

From 77189eff82a5a033ae116c38a6e29a43cea985bf Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 5 Dec 2019 18:33:26 +0200
Subject: [PATCH 0429/4969] Set AWS credentials for the build cache in AZP
 (#2138)

---
 azure-pipelines.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d6efa593dcb..4b060c5fcea 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,6 +3,9 @@ jobs:
   steps:
   - task: Gradle@2
     displayName: Build & test
+    env:
+      AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
+      AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
@@ -14,6 +17,9 @@ jobs:
   steps:
   - task: Gradle@2
     displayName: Build & test
+    env:
+      AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
+      AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
@@ -25,6 +31,9 @@ jobs:
   steps:
   - task: Gradle@2
     displayName: Build & test
+    env:
+      AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
+      AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'

From 3f6c38be0c3b2a228be69db61607d9991a03b998 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2019 20:49:39 +0000
Subject: [PATCH 0430/4969] Bump java-client from 2.7.10 to 2.7.11 in
 /modules/couchbase (#2150)

Bumps [java-client](https://github.com/couchbase/couchbase-java-client) from 2.7.10 to 2.7.11.
- [Release notes](https://github.com/couchbase/couchbase-java-client/releases)
- [Commits](https://github.com/couchbase/couchbase-java-client/compare/2.7.10...2.7.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 7642bb2fc5b..27074f1bff7 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.10'
+    compile 'com.couchbase.client:java-client:2.7.11'
 
     testCompile project(':test-support')
 }

From 3f6d62601961cf400fa6bc597fc99ea25be5356a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2019 21:25:16 +0000
Subject: [PATCH 0431/4969] Bump mockito-core from 3.1.0 to 3.2.0 in
 /modules/junit-jupiter (#2131)

---
 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 f6f23aa8959..b5c974ecd89 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.1'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
-    testCompile ('org.mockito:mockito-core:3.1.0') {
+    testCompile ('org.mockito:mockito-core:3.2.0') {
         exclude(module: 'hamcrest-core')
     }
 

From 0adacdef409e76f79e3e3dc2ee988b44541bf33f Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Thu, 5 Dec 2019 15:31:17 -0600
Subject: [PATCH 0432/4969] Truncate mode bits for z/OS file permissions
 (#2023)

---
 .../org/testcontainers/utility/MountableFile.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 37312116734..22939b0e1fd 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -6,6 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.compress.archivers.tar.TarConstants;
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.DockerClientFactory;
@@ -368,7 +369,15 @@ private int getUnixFileMode(final String pathAsString) {
     @UnstableAPI
     public static int getUnixFileMode(final Path path) {
         try {
-            return (int) Files.readAttributes(path, "unix:mode").get("mode");
+            int unixMode = (int) Files.readAttributes(path, "unix:mode").get("mode");
+            // Truncate mode bits for z/OS
+            if ("OS/390".equals(SystemUtils.OS_NAME) || 
+                "z/OS".equals(SystemUtils.OS_NAME) || 
+                "zOS".equals(SystemUtils.OS_NAME) ) {
+                unixMode &= TarConstants.MAXID;
+                unixMode |= Files.isDirectory(path) ? 040000 : 0100000;
+            }
+            return unixMode;
         } catch (IOException | UnsupportedOperationException e) {
             // fallback for non-posix environments
             int mode = DEFAULT_FILE_MODE;

From bb0554b626dd29031ee01efc14f21972a0015fba Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 6 Dec 2019 11:35:33 +0200
Subject: [PATCH 0433/4969] do not implicitly connect to Kafka network (#2139)

Apparently, there is a bug(?) in Docker that sometimes(!)
re-assigns random ports when container is connect to network.
It means that we cannot lazily connect KafkaContainer to
network in case it wasn't set.
---
 .../org/testcontainers/containers/KafkaContainer.java | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 60037acfd45..b0ce047f5d4 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -39,6 +39,7 @@ public KafkaContainer() {
     public KafkaContainer(String confluentPlatformVersion) {
         super(TestcontainersConfiguration.getInstance().getKafkaImage() + ":" + confluentPlatformVersion);
 
+        super.withNetwork(Network.SHARED);
         withExposedPorts(KAFKA_PORT);
 
         // Use two listeners with different names, it will force Kafka to communicate with itself via internal
@@ -70,16 +71,6 @@ public Network getNetwork() {
                     "Consider using KafkaContainer#withNetwork",
                 new Exception("Deprecated method")
             );
-            Network network = Network.SHARED;
-            super.withNetwork(network);
-
-            if (getContainerId() != null) {
-                dockerClient.connectToNetworkCmd()
-                    .withContainerId(getContainerId())
-                    .withNetworkId(network.getId())
-                    .exec();
-            }
-            return network;
         }
         return super.getNetwork();
     }

From 500fd7404c07712c1f8af2d5f6ba51a048b9f6da Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 6 Dec 2019 12:07:41 +0000
Subject: [PATCH 0434/4969] Improve Docker Compose error messaging (#2154)

Co-Authored-By: Richard North <rich.north@gmail.com>
Co-authored-by: Matthias Hahn <mhahn@etracker.com>
Co-authored-by: null <38075918+HaMatthias@users.noreply.github.com>
---
 .../containers/DockerComposeContainer.java             | 10 +++++++++-
 .../testcontainers/junit/DockerComposeServiceTest.java |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 31d84284584..7dec6399b8f 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -385,7 +385,15 @@ public String getServiceHost(String serviceName, Integer servicePort) {
      * @return a port that can be used for accessing the service container.
      */
     public Integer getServicePort(String serviceName, Integer servicePort) {
-        return ambassadorContainer.getMappedPort(ambassadorPortMappings.get(getServiceInstanceName(serviceName)).get(servicePort));
+        Map<Integer, Integer> portMap = ambassadorPortMappings.get(getServiceInstanceName(serviceName));
+
+        if (portMap == null) {
+            throw new IllegalArgumentException("Could not get a port for '" + serviceName + "'. " +
+                "Testcontainers does not have an exposed port configured for '" + serviceName + "'. "+
+                "To fix, please ensure that the service '" + serviceName + "' has ports exposed using .withExposedService(...)");
+        } else {
+            return ambassadorContainer.getMappedPort(portMap.get(servicePort));
+        }
     }
 
     public SELF withScaledService(String serviceBaseName, int numInstances) {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
index c0360050d27..ec8c50d42ab 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
@@ -21,7 +21,7 @@ protected DockerComposeContainer getEnvironment() {
         return environment;
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testDbIsNotStarting() {
         environment.getServicePort("db_1", 10001);
     }

From b51789896d404bee9f439099e5cbb4d79f62ef99 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2019 12:48:08 +0000
Subject: [PATCH 0435/4969] Bump vibur-dbcp from 22.2 to 25.0 in
 /modules/mariadb (#2128)

---
 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 541d3967680..a881b63cb99 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
-    testCompile 'org.vibur:vibur-dbcp:22.2'
+    testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From 968a56e45e2700700926cf4fe4128be6cab933e7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2019 13:07:42 +0000
Subject: [PATCH 0436/4969] Bump mockito-core from 3.1.0 to 3.2.0 in /core
 (#2129)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9da3288d0c3..461c5696347 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'com.rabbitmq:amqp-client:5.7.3'
     testCompile 'org.mongodb:mongo-java-driver:3.11.2'
-    testCompile ('org.mockito:mockito-core:3.1.0') {
+    testCompile ('org.mockito:mockito-core:3.2.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From b03d77fb4a4f75b95b674b53b41725e09cd61fda Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2019 13:36:08 +0000
Subject: [PATCH 0437/4969] Bump vibur-dbcp from 22.2 to 25.0 in /modules/mysql
 (#2130)

---
 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 2a71e8f9d04..d9961293d86 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.vibur:vibur-dbcp:22.2'
+    testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From 35fd71d57b6b0ea862f19e7eb43001f1fb219098 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2019 14:02:47 +0000
Subject: [PATCH 0438/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#2142)

---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 11c8b57f07a..9e7ac832916 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.4.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.0"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 9a45baa2f8d9e7fedb17fb2378b5da012bfb7103 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Sat, 7 Dec 2019 21:32:10 +0700
Subject: [PATCH 0439/4969] Refactor deprecated Mockito API usages (#2039)

---
 .../containers/FailureDetectingExternalResourceTest.java      | 2 +-
 .../testcontainers/utility/AuthenticatedImagePullTest.java    | 4 ++--
 .../org/testcontainers/dynamodb/DynaliteContainerTest.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
index 47d594c4c02..15a9eba7d17 100644
--- a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
+++ b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 19b933d174c..78b54798cd1 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -16,8 +16,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
index 2d414aecb3b..524d3f6c34c 100644
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
@@ -37,7 +37,7 @@ private void runTest(AmazonDynamoDB client) {
                         "Name", ScalarAttributeType.S))
                 .withKeySchema(new KeySchemaElement("Name", KeyType.HASH))
                 .withProvisionedThroughput(new ProvisionedThroughput(
-                        new Long(10), new Long(10)))
+                    10L, 10L))
                 .withTableName("foo");
 
 
@@ -49,4 +49,4 @@ private void runTest(AmazonDynamoDB client) {
         assertEquals("the table has the right name", "foo", tableDescription.getTableName());
         assertEquals("the name has the right primary key", "Name", tableDescription.getKeySchema().get(0).getAttributeName());
     }
-}
\ No newline at end of file
+}

From 2af09196b55cd36d18cf64970c8a2504dd629f84 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 15:55:56 +0100
Subject: [PATCH 0440/4969] Bump amqp-client from 5.7.3 to 5.8.0 in /core
 (#2173)

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.7.3 to 5.8.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.7.3...v5.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 461c5696347..dcb4165d08d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -107,7 +107,7 @@ dependencies {
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.1.0'
-    testCompile 'com.rabbitmq:amqp-client:5.7.3'
+    testCompile 'com.rabbitmq:amqp-client:5.8.0'
     testCompile 'org.mongodb:mongo-java-driver:3.11.2'
     testCompile ('org.mockito:mockito-core:3.2.0') {
         exclude(module: 'hamcrest-core')

From 309aad0662c748819f82101087f78082fd2806eb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 15:56:41 +0100
Subject: [PATCH 0441/4969] Bump tomcat-jdbc from 9.0.29 to 9.0.30 in
 /modules/mysql (#2174)

Bumps tomcat-jdbc from 9.0.29 to 9.0.30.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 d9961293d86..0b70ea3af6a 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.18'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From 666781cef6ea70de7eff236fe5e9ef9ce2a4e4d9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 15:57:14 +0100
Subject: [PATCH 0442/4969] Bump tomcat-jdbc from 9.0.29 to 9.0.30 in
 /modules/mariadb (#2172)

Bumps tomcat-jdbc from 9.0.29 to 9.0.30.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 a881b63cb99..041b0a146da 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.2'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From b4fe1eddc48b23488eb5d1c6c65071169913424a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 15:57:51 +0100
Subject: [PATCH 0443/4969] Bump mongo-java-driver from 3.11.2 to 3.12.0 in
 /core (#2168)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.11.2 to 3.12.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.11.2...r3.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index dcb4165d08d..618c31c7176 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.1.0'
     testCompile 'com.rabbitmq:amqp-client:5.8.0'
-    testCompile 'org.mongodb:mongo-java-driver:3.11.2'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.0'
     testCompile ('org.mockito:mockito-core:3.2.0') {
         exclude(module: 'hamcrest-core')
     }

From ae6d150eaf95cec56cb94fe7d1cdc33b9c9f111e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 15:58:48 +0100
Subject: [PATCH 0444/4969] Bump postgresql from 42.2.8 to 42.2.9 in
 /modules/junit-jupiter (#2160)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.8 to 42.2.9.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.8...REL42.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 b5c974ecd89..8ff335251a3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntime 'org.postgresql:postgresql:42.2.8'
+    testRuntime 'org.postgresql:postgresql:42.2.9'
     testRuntime 'mysql:mysql-connector-java:8.0.18'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 }

From 98a201aa91344484d2c8cb4290361cc9b9c512a2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 16:00:30 +0100
Subject: [PATCH 0445/4969] Bump postgresql from 42.2.8 to 42.2.9 in
 /modules/postgresql (#2159)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.8 to 42.2.9.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.8...REL42.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 c070ce9ba13..a4bf697a3ad 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: PostgreSQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.postgresql:postgresql:42.2.8'
+    testCompile 'org.postgresql:postgresql:42.2.9'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
 }

From 0ba7a0e5644f7a23fc90f5988fde46ad5d6748ec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 16:42:21 +0100
Subject: [PATCH 0446/4969] Bump postgresql from 42.2.8 to 42.2.9 in /examples
 (#2162)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.8 to 42.2.9.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.8...REL42.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 eb10aed7159..dc9f7158e29 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.29'
     implementation 'com.squareup.okhttp3:okhttp:3.14.4'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.8'
+    testImplementation 'org.postgresql:postgresql:42.2.9'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From 9a8ada41c564cff615df98031ab7c0ccfa40101d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 16:43:11 +0100
Subject: [PATCH 0447/4969] Bump postgresql from 42.2.8 to 42.2.9 in
 /modules/spock (#2158)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.8 to 42.2.9.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.8...REL42.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 d84e8776af3..2974784d466 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.1'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
-    testRuntime 'org.postgresql:postgresql:42.2.8'
+    testRuntime 'org.postgresql:postgresql:42.2.9'
     testRuntime 'mysql:mysql-connector-java:8.0.18'
 }

From 9bd7a61f5b847596c595ea75e69fe9faea486b2f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 16:51:25 +0100
Subject: [PATCH 0448/4969] Bump org.springframework.boot in /examples (#2161)

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.2.1.RELEASE to 2.2.2.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.2.1.RELEASE...v2.2.2.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 5386234dccb..5b6d71934b9 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.2.1.RELEASE'
+    id 'org.springframework.boot' version '2.2.2.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 2a67123fa03..bea11bf0909 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.2.1.RELEASE'
+    id 'org.springframework.boot' version '2.2.2.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From e0cfea8f5848508b3e108259865942b9719142bb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 14 Dec 2019 13:20:49 +0100
Subject: [PATCH 0449/4969] Bump influxdb-java from 2.16 to 2.17 in
 /modules/influxdb (#2157)

Bumps [influxdb-java](https://github.com/influxdata/influxdb-java) from 2.16 to 2.17.
- [Release notes](https://github.com/influxdata/influxdb-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-java/compare/influxdb-java-2.16...influxdb-java-2.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/influxdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 186174c242f..d349e06da12 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.16'
-    testCompile 'org.influxdb:influxdb-java:2.15'
+    compileOnly 'org.influxdb:influxdb-java:2.17'
+    testCompile 'org.influxdb:influxdb-java:2.17'
 }

From dbffb52b426a2021484ff2abc765080288c29e8c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 14 Dec 2019 12:37:23 +0000
Subject: [PATCH 0450/4969] Bump testng from 7.0.0 to 7.1.0 in /examples
 (#2164)

---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 8b133f0cc1b..98d0f4e06aa 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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.0.0'
+    testImplementation 'org.testng:testng:7.1.0'
 }
 
 test {

From d6889e289bad8a3d7bdfd59c1fe4ac02111e7516 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 14 Dec 2019 13:39:28 +0100
Subject: [PATCH 0451/4969] Add GitHub action to automatically update docs
 version (#2122)

* Add GitHub action to automatically update docs version

* Fix syntax error

* Update update-docs-version.yml

* Update update-docs-version.yml

* Use ad-m/github-push-action

* Updates following review
---
 .github/workflows/update-docs-version.yml | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/update-docs-version.yml

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
new file mode 100644
index 00000000000..ad8773db2db
--- /dev/null
+++ b/.github/workflows/update-docs-version.yml
@@ -0,0 +1,27 @@
+name: Update docs version
+
+on:
+    release:
+        types: [published]
+
+jobs:
+    build:
+        runs-on: ubuntu-18.04
+        steps:
+            -   uses: actions/checkout@v1
+            -   name: Checkout master
+                run: git checkout master
+            -   name: Update latest_version property in mkdocs.yml
+                run: |
+                    sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
+                    git diff
+            -   name: Commit changes
+                run: |
+                    git config user.email "nobody@testcontainers.org"
+                    git config user.name "GitHub Action - Update docs version"
+                    git add mkdocs.yml
+                    git commit -m "Update documentation version to ${GITHUB_REF##*/}" -m "skip-checks: true" || echo "not changed"
+            -   name: Push changes
+                uses: ad-m/github-push-action@68af9897f2b021035ca3952bf354bbb4675c1762 # v0.5.0
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}

From 6e1d211f9be44e564d47fddedad809215813d7e0 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sat, 14 Dec 2019 14:52:59 +0100
Subject: [PATCH 0452/4969] Fix framing in OkHttp transport (#2155)

we were skipping first 8 bytes in case of a RAW stream
---
 .../okhttp/OkHttpInvocationBuilder.java       | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
index c7f679eb22b..cada10328ec 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
@@ -35,6 +35,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.Consumer;
 
@@ -362,23 +364,34 @@ public void accept(BufferedSource source) {
             try {
                 while (!source.exhausted()) {
                     // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
-                    if(!source.request(HEADER_SIZE)) {
+                    // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}
+
+                    if (!source.request(HEADER_SIZE)) {
                         return;
                     }
-                    StreamType streamType = streamType(source.readByte());
-                    source.skip(3);
-                    int payloadSize = source.readInt();
+                    byte[] bytes = source.readByteArray(HEADER_SIZE);
+
+                    StreamType streamType = streamType(bytes[0]);
 
-                    if (streamType != StreamType.RAW) {
-                        if (!source.request(payloadSize)) {
-                            return;
+                    if (streamType == StreamType.RAW) {
+                        resultCallback.onNext(new Frame(StreamType.RAW, bytes));
+                        byte[] buffer = new byte[1024];
+                        while (!source.exhausted()) {
+                            int readBytes = source.read(buffer);
+                            if (readBytes != -1) {
+                                resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes)));
+                            }
                         }
-                        byte[] payload = source.readByteArray(payloadSize);
+                        return;
+                    }
 
-                        resultCallback.onNext(new Frame(streamType, payload));
-                    } else {
-                        resultCallback.onNext(new Frame(streamType, source.readByteArray()));
+                    int payloadSize = ByteBuffer.wrap(bytes, 4, 4).getInt();
+                    if (!source.request(payloadSize)) {
+                        return;
                     }
+                    byte[] payload = source.readByteArray(payloadSize);
+
+                    resultCallback.onNext(new Frame(streamType, payload));
                 }
             } catch (Exception e) {
                 resultCallback.onError(e);

From 464cba86b6aa0e17dceec13f7bee3fcd5baaf7f1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:29:58 +0000
Subject: [PATCH 0453/4969] Bump jedis from 3.1.0 to 3.2.0 in /examples (#2184)

---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 98d0f4e06aa..12e78729a28 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.29'
-    implementation 'redis.clients:jedis:3.1.0'
+    implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index a95000e8d71..664a0fac876 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.29'
-    implementation 'redis.clients:jedis:3.1.0'
+    implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 6cb2e6d77c5..3b4af328379 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.1.0'
+    implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.29'

From e6f92c695025e9f243f8f94572143f33eceebf5d Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Mon, 16 Dec 2019 18:31:26 +0100
Subject: [PATCH 0454/4969] Remove duplicated DockerImageNameTest test case
 (#2040)

---
 .../java/org/testcontainers/utility/DockerImageNameTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index 37d2472949f..54488773652 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -16,7 +16,7 @@ public static class ValidNames {
 
         @Parameterized.Parameters(name = "{0}")
         public static String[] getNames() {
-            return new String[]{"myname:latest",
+            return new String[]{
                 "myname:latest",
                 "repo/my-name:1.0",
                 "registry.foo.com:1234/my-name:1.0",

From 95ae65170d11461b5dbd75aee202ce2c70b9a930 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 08:58:38 +0000
Subject: [PATCH 0455/4969] Bump kafka-clients from 2.3.1 to 2.4.0 in
 /modules/kafka (#2182)

Bumps kafka-clients from 2.3.1 to 2.4.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index d9d7c20ca4a..d064e46c1dc 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.3.1'
+    testCompile 'org.apache.kafka:kafka-clients:2.4.0'
     testCompile 'org.assertj:assertj-core:3.14.0'
     testCompile 'com.google.guava:guava:23.0'
 }

From 4170e72e3e2d32064a71af117026356cb92a3139 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 08:58:47 +0000
Subject: [PATCH 0456/4969] Bump jedis from 3.1.0 to 3.2.0 in
 /modules/junit-jupiter (#2181)

Bumps [jedis](https://github.com/xetorthio/jedis) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/xetorthio/jedis/releases)
- [Commits](https://github.com/xetorthio/jedis/compare/jedis-3.1.0...jedis-3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 8ff335251a3..6cae8d48a67 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.1'
-    testCompile 'redis.clients:jedis:3.1.0'
+    testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
     testCompile ('org.mockito:mockito-core:3.2.0') {
         exclude(module: 'hamcrest-core')

From 6958fb2c9af5ab953787086d5ddc110e326d4a00 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 08:58:58 +0000
Subject: [PATCH 0457/4969] Bump jedis from 3.1.0 to 3.2.0 in /core (#2183)

Bumps [jedis](https://github.com/xetorthio/jedis) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/xetorthio/jedis/releases)
- [Commits](https://github.com/xetorthio/jedis/compare/jedis-3.1.0...jedis-3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 618c31c7176..8517033e51b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -106,7 +106,7 @@ dependencies {
     }
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.1.0'
+    testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'com.rabbitmq:amqp-client:5.8.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.0'
     testCompile ('org.mockito:mockito-core:3.2.0') {

From 639cacde7e0bb825da1ace99c7b70ca0d8233802 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 09:29:52 +0000
Subject: [PATCH 0458/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#2197)

---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 9e7ac832916..2201efff48a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.1"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From b0d1c9be21ee0bd9255920ef7b7299807053df7c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 19 Dec 2019 10:48:33 +0100
Subject: [PATCH 0459/4969] Use `inspectNetworkCmd` to get the gateway's IP
 (#2151)

---
 .../dockerclient/DockerClientConfigUtils.java |  6 ++-
 .../DockerClientProviderStrategy.java         | 39 ++++++++++++++++++-
 .../DockerClientConfigUtilsTest.java          | 38 ++++++------------
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
index bfeabc63f8a..d88dc76331f 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
@@ -43,8 +43,10 @@ public class DockerClientConfigUtils {
             .map(StringUtils::trimToEmpty)
             .filter(StringUtils::isNotBlank);
 
-
-
+    /**
+     * Use {@link DockerClientFactory#dockerHostIpAddress()}
+     */
+    @Deprecated
     public static String getDockerHostIpAddress(DockerClientConfig config) {
         switch (config.getDockerHost().getScheme()) {
             case "http":
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 7101b23b21a..aa607964ae5 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -1,8 +1,10 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -17,6 +19,7 @@
 import org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -33,6 +36,8 @@ public abstract class DockerClientProviderStrategy {
     protected DockerClient client;
     protected DockerClientConfig config;
 
+    private String dockerHostIpAddress;
+
     private static final RateLimiter PING_RATE_LIMITER = RateLimiterBuilder.newBuilder()
             .withRate(2, TimeUnit.SECONDS)
             .withConstantThroughput()
@@ -188,8 +193,38 @@ protected void ping(DockerClient client, int timeoutInSeconds) {
         }
     }
 
-    public String getDockerHostIpAddress() {
-        return DockerClientConfigUtils.getDockerHostIpAddress(this.config);
+    public synchronized String getDockerHostIpAddress() {
+        if (dockerHostIpAddress == null) {
+            dockerHostIpAddress = resolveDockerHostIpAddress(client, config.getDockerHost());
+        }
+        return dockerHostIpAddress;
+    }
+
+    @VisibleForTesting
+    static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost) {
+        switch (dockerHost.getScheme()) {
+            case "http":
+            case "https":
+            case "tcp":
+                return dockerHost.getHost();
+            case "unix":
+            case "npipe":
+                if (DockerClientConfigUtils.IN_A_CONTAINER) {
+                    return client.inspectNetworkCmd()
+                        .withNetworkId("bridge")
+                        .exec()
+                        .getIpam()
+                        .getConfig()
+                        .stream()
+                        .filter(it -> it.getGateway() != null)
+                        .findAny()
+                        .map(Network.Ipam.Config::getGateway)
+                        .orElse("localhost");
+                }
+                return "localhost";
+            default:
+                return null;
+        }
     }
 
     protected void checkOSType() {
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
index 2e88982a7a8..353d6ea94e7 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -1,9 +1,10 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.junit.Ignore;
+import com.github.dockerjava.api.DockerClient;
 import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+
+import java.net.URI;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -11,44 +12,29 @@
 
 public class DockerClientConfigUtilsTest {
 
+    DockerClient client = DockerClientFactory.lazyClient();
+
     @Test
     public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("unix:///var/run/docker.sock")
-                .withDockerTlsVerify(false) // TODO - check wrt. https://github.com/docker-java/docker-java/issues/588
-                .build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("unix:///var/run/docker.sock"));
         assertEquals("localhost", actual);
     }
 
-    @Test @Ignore
-    public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpUri() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("http://12.23.34.45").build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
-        assertEquals("12.23.34.45", actual);
-    }
-
-    @Test @Ignore
+    @Test
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("https://12.23.34.45").build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("http://12.23.34.45"));
         assertEquals("12.23.34.45", actual);
     }
 
     @Test
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("tcp://12.23.34.45")
-                .withDockerTlsVerify(false) // TODO - check wrt. https://github.com/docker-java/docker-java/issues/588
-                .build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("tcp://12.23.34.45"));
         assertEquals("12.23.34.45", actual);
     }
 
-    @Test @Ignore
+    @Test
     public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("gopher://12.23.34.45").build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("gopher://12.23.34.45"));
         assertNull(actual);
     }
 

From e9b2783a3fcbd6e73f168a4d55c1b7acd229511b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 10:25:37 +0000
Subject: [PATCH 0460/4969] Bump mockito-core from 3.2.0 to 3.2.4 in
 /modules/junit-jupiter (#2189)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.0 to 3.2.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.2.0...v3.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 6cae8d48a67..18cc5ddfe96 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.1'
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
-    testCompile ('org.mockito:mockito-core:3.2.0') {
+    testCompile ('org.mockito:mockito-core:3.2.4') {
         exclude(module: 'hamcrest-core')
     }
 

From 76d4668a40e2b2105fcc877158e520e93ca96137 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 10:47:47 +0000
Subject: [PATCH 0461/4969] Bump vault-java-driver from 5.0.0 to 5.1.0 in
 /modules/vault (#2187)

Bumps [vault-java-driver](https://github.com/BetterCloud/vault-java-driver) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/BetterCloud/vault-java-driver/releases)
- [Commits](https://github.com/BetterCloud/vault-java-driver/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 55249f74fb0..0a68c9310e0 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Vault"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'com.bettercloud:vault-java-driver:5.0.0'
+    testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.1.2'
     testCompile 'org.assertj:assertj-core:3.14.0'
 

From 2065330f6690c02931f69e1f6ab7717e466e4e55 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 10:47:57 +0000
Subject: [PATCH 0462/4969] Bump slf4j-api from 1.7.29 to 1.7.30 in /core
 (#2188)

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.29 to 1.7.30.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.29...v_1.7.30)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 8517033e51b..585faedfaa2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -57,7 +57,7 @@ project.tasks.check.dependsOn(jarFileTest)
 
 dependencies {
     compile 'junit:junit:4.12'
-    compile 'org.slf4j:slf4j-api:1.7.29'
+    compile 'org.slf4j:slf4j-api:1.7.30'
     compile 'org.jetbrains:annotations:17.0.0'
     compile 'javax.annotation:javax.annotation-api:1.3.2'
     compile 'org.apache.commons:commons-compress:1.19'

From 10114683dfe212c48f1301c96af929363b65dbd8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 10:48:24 +0000
Subject: [PATCH 0463/4969] Bump mockito-core from 3.2.0 to 3.2.4 in /core
 (#2186)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.0 to 3.2.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.2.0...v3.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[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 585faedfaa2..2d76c38c0de 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'com.rabbitmq:amqp-client:5.8.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.0'
-    testCompile ('org.mockito:mockito-core:3.2.0') {
+    testCompile ('org.mockito:mockito-core:3.2.4') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From e7e05d29a3b733315a2b0e620741e942f3c56fc4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 10:48:54 +0000
Subject: [PATCH 0464/4969] Bump slf4j-api from 1.7.29 to 1.7.30 in /examples
 (#2190)

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.29 to 1.7.30.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.29...v_1.7.30)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index dc9f7158e29..dea159a89b5 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ repositories {
     jcenter()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:3.14.4'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.9'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 12e78729a28..cf22e89c528 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 664a0fac876..b665b9a24a4 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 3b4af328379..b06d4e7cb30 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:testcontainers'

From 08234f88a3c3f460db4684da683378d8bf4d026c Mon Sep 17 00:00:00 2001
From: William Delanoue <william.delanoue@deveryware.net>
Date: Mon, 23 Dec 2019 03:39:08 +0100
Subject: [PATCH 0465/4969] closes #1697: add vhost parameter for policies
 (#1701)

---
 .../containers/RabbitMQContainer.java         |  9 +++++
 .../containers/RabbitMQContainerTest.java     | 35 +++++++++++--------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index ea25bf629e6..ede111ed2d8 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -263,6 +263,15 @@ public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Obj
         return self();
     }
 
+    public RabbitMQContainer withPolicy(String vhost, String name, String pattern, Map<String, Object> definition) {
+        values.add(asList("rabbitmqadmin", "declare", "policy",
+                "--vhost=" + vhost,
+                "name=" + name,
+                "pattern=" + pattern,
+                "definition=" + toJson(definition)));
+        return self();
+    }
+
     public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Object> definition, int priority, String applyTo) {
         values.add(asList("rabbitmqadmin", "declare", "policy",
                 "name=" + name,
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index bdda594818f..5822e213a82 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -154,21 +154,22 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
     {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
             container
-                .withVhost("vhost1")
-                .withVhostLimit("vhost1", "max-connections", 1)
-                .withVhost("vhost2", true)
-                .withExchange("direct-exchange", "direct")
-                .withExchange("topic-exchange", "topic")
-                .withQueue("queue1")
-                .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
-                .withBinding("direct-exchange", "queue1")
-                .withUser("user1", "password1")
-                .withUser("user2", "password2", ImmutableSet.of("administrator"))
-                .withPermission("vhost1", "user1", ".*", ".*", ".*")
-                .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
-                .withPolicy("alternate exchange policy", "^direct-exchange", ImmutableMap.of("alternate-exchange", "amq.direct"))
-                .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
-                .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
+                    .withVhost("vhost1")
+                    .withVhostLimit("vhost1", "max-connections", 1)
+                    .withVhost("vhost2", true)
+                    .withExchange("direct-exchange", "direct")
+                    .withExchange("topic-exchange", "topic")
+                    .withQueue("queue1")
+                    .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                    .withBinding("direct-exchange", "queue1")
+                    .withUser("user1", "password1")
+                    .withUser("user2", "password2", ImmutableSet.of("administrator"))
+                    .withPermission("vhost1", "user1", ".*", ".*", ".*")
+                    .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
+                    .withPolicy("alternate exchange policy", "^direct-exchange", ImmutableMap.of("alternate-exchange", "amq.direct"))
+                    .withPolicy("vhost2", "ha-all", ".*", ImmutableMap.of("ha-mode", "all", "ha-sync-mode", "automatic"))
+                    .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
+                    .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
 
             container.start();
 
@@ -192,6 +193,10 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
                 .getStdout())
                 .contains("max length policy", "alternate exchange policy");
 
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies", "--vhost=vhost2")
+                    .getStdout())
+                    .contains("ha-all", "ha-sync-mode");
+
             assertThat(container.execInContainer("rabbitmqadmin", "list", "operator_policies")
                 .getStdout())
                 .contains("operator policy 1");

From 938c09a766f56fb09918abd7e352b9bdbedf1a4f Mon Sep 17 00:00:00 2001
From: Billy Yuan <billy112487983@gmail.com>
Date: Thu, 26 Dec 2019 21:08:59 +0800
Subject: [PATCH 0466/4969] Add Vert.x SQL Client to Userlist (#2211)

Signed-off-by: Billy Yuan <billy112487983@gmail.com>
---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 1ab42e286c7..f214bf0f73f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -75,6 +75,7 @@ You can also [check the latest version available on Maven Central](https://searc
 * [Zalando SE](https://corporate.zalando.com/en) - Testing core business services
 * [Europace AG](https://tech.europace.de/) - Integration testing for databases and micro services
 * [Micronaut Data](https://github.com/micronaut-projects/micronaut-data/) - Testing of Micronaut Data JDBC, a database access toolkit
+* [Vert.x SQL Client](https://github.com/eclipse-vertx/vertx-sql-client) - Testing with PostgreSQL, MySQL, MariaDB, SQL Server, etc.
 * [JHipster](https://www.jhipster.tech/) - Couchbase and Cassandra integration testing
 * [wescale](https://www.wescale.com) - Integration testing against HTTP service mocks and various data stores
 * [Marquez](https://marquezproject.github.io/marquez) - PostgreSQL integration testing

From 2cfd34935b07480750a879362ab10e04c210365e Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Thu, 26 Dec 2019 05:27:09 -0800
Subject: [PATCH 0467/4969] GitHub Actions checkout v2 (#2212)

---
 .github/workflows/ci.yml                  | 3 +--
 .github/workflows/gradle-release.yml      | 4 ++--
 .github/workflows/update-docs-version.yml | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7013e66bea6..5618be1230d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
   in-docker_test:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Build with Gradle
         run: |
           docker run -i --rm \
@@ -18,4 +18,3 @@ jobs:
             -w "$PWD" \
             openjdk:8-jdk-alpine \
             ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
-
diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
index 3034ce9cdfb..d35c0aa73f8 100644
--- a/.github/workflows/gradle-release.yml
+++ b/.github/workflows/gradle-release.yml
@@ -8,12 +8,12 @@ jobs:
   build:
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Verify CI check status		
+    - name: Verify CI check status
       run: .github/workflows/scripts/check_ci_status.sh $GITHUB_SHA
     - name: Release with Gradle
       run: ./gradlew -Pversion=${GITHUB_REF##*/} release --scan --no-daemon -i
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index ad8773db2db..7268f72f961 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -8,7 +8,7 @@ jobs:
     build:
         runs-on: ubuntu-18.04
         steps:
-            -   uses: actions/checkout@v1
+            -   uses: actions/checkout@v2
             -   name: Checkout master
                 run: git checkout master
             -   name: Update latest_version property in mkdocs.yml

From 13b3e6bc4294c7fa6dc2c897f59b2672dd6cfcdc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 26 Dec 2019 22:33:21 +0900
Subject: [PATCH 0468/4969] Bump testng from 7.1.0 to 7.1.1 in /examples
 (#2200)

Bumps [testng](https://github.com/cbeust/testng) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/commits/7.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index cf22e89c528..efe713d5c0e 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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.1.0'
+    testImplementation 'org.testng:testng:7.1.1'
 }
 
 test {

From 4266fda1f35be31ca0a4a6101a2afae8fba09195 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Fri, 27 Dec 2019 10:49:40 +0100
Subject: [PATCH 0469/4969] JDBC: Fix parsing empty connection parameters
 (#2207)

---
 .../main/java/org/testcontainers/jdbc/ConnectionUrl.java    | 2 +-
 .../java/org/testcontainers/jdbc/ConnectionUrlTest.java     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index 4c590474bf7..4f339b43fe5 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -228,7 +228,7 @@ public interface Patterns {
 
         Pattern TC_PARAM_MATCHING_PATTERN = Pattern.compile(TC_PARAM_NAME_PATTERN + "=([^\\?&]+)");
 
-        Pattern QUERY_PARAM_MATCHING_PATTERN = Pattern.compile("([^\\?&=]+)=([^\\?&]+)");
+        Pattern QUERY_PARAM_MATCHING_PATTERN = Pattern.compile("([^\\?&=]+)=([^\\?&]*)");
 
     }
 
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index 53524eb32b2..312d5cf5146 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -49,6 +49,12 @@ public void testConnectionUrl2() {
 
     }
 
+    @Test
+    public void testEmptyQueryParameter() {
+        ConnectionUrl url = ConnectionUrl.newInstance("jdbc:tc:mysql://somehostname/databasename?key=");
+        assertEquals("'key' property value", "", url.getQueryParameters().get("key"));
+    }
+
     @Test
     public void testTmpfsOption() {
         String urlString = "jdbc:tc:mysql://somehostname/databasename?TC_TMPFS=key:value,key1:value1";

From f8cd923403a0b7e9cfa9e021b5b0ea6b1ec8a687 Mon Sep 17 00:00:00 2001
From: "Roman S.A" <eaxdev@ya.ru>
Date: Fri, 27 Dec 2019 12:54:21 +0300
Subject: [PATCH 0470/4969] =?UTF-8?q?Mention=20`testcontainers-bom`=20in?=
 =?UTF-8?q?=20"Maven=20dependencies"=20section=20of=E2=80=A6=20(#2178)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Mention testcontainers-bom in the Maven dependencies section of the docs #2134

* Update docs/index.md

Co-Authored-By: Richard North <rich.north@gmail.com>

* Update docs/index.md

Co-Authored-By: Richard North <rich.north@gmail.com>

* Update docs/index.md

Co-Authored-By: Richard North <rich.north@gmail.com>

* Update docs/index.md

Co-Authored-By: Richard North <rich.north@gmail.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/index.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index f214bf0f73f..af2bf79f0c9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -46,6 +46,43 @@ testCompile "org.testcontainers:testcontainers:{{latest_version}}"
 
 You can also [check the latest version available on Maven Central](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.testcontainers%22).
 
+### Managing versions for multiple Testcontainers dependencies
+
+To avoid specifying the version of each dependency, you can use a `BOM` or `Bill Of Materials`.
+
+Using Maven you can add the following to `dependencyManagement` section in your `pom.xml`:
+
+```xml tab='Maven'
+<dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers-bom</artifactId>
+            <version>{{latest_version}}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+```
+and then use dependencies without specifying a version:
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>mysql</artifactId>
+    <scope>test</scope>
+</dependency>
+```
+
+Using Gradle 5.0 or higher, you can add the following to the `dependencies` section in your `build.gradle`:
+
+```groovy tab='Gradle'
+implementation platform('org.testcontainers:testcontainers-bom:{{latest_version}}') //import bom
+testImplementation('org.testcontainers:mysql') //no version specified
+```
+
+
 [JitPack](jitpack_dependencies.md) builds are available for pre-release versions.
 
 !!! warning "Shaded dependencies"

From 3d79c03aa793a89bb124b92982c54469ad384978 Mon Sep 17 00:00:00 2001
From: worldtiki <dmartinsalbuqu@expediagroup.com>
Date: Fri, 27 Dec 2019 10:13:43 +0000
Subject: [PATCH 0471/4969] Add example for nginx module (#2027)

---
 docs/modules/nginx.md                         | 22 +++++++++
 .../testcontainers/junit/SimpleNginxTest.java | 48 +++++++++++--------
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/docs/modules/nginx.md b/docs/modules/nginx.md
index 32d668e150a..d195b5451a2 100644
--- a/docs/modules/nginx.md
+++ b/docs/modules/nginx.md
@@ -1,5 +1,27 @@
 # Nginx Module
 
+Nginx is a web server, reverse proxy and mail proxy and http cache.
+
+## Usage example
+
+The following example shows how to start Nginx.
+
+<!--codeinclude-->
+[Creating a Nginx container](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:creatingContainer
+<!--/codeinclude-->
+
+How to add custom content to the Nginx server.
+
+<!--codeinclude-->
+[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:addCustomContent
+<!--/codeinclude-->
+
+And how to query the Nginx server for the custom content added.
+
+<!--codeinclude-->
+[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:getFromNginxServer
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index ad9026b6e4c..b41a0d8361e 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -8,52 +8,58 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 
 import java.io.*;
+import java.net.URL;
 import java.net.URLConnection;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.rnorth.visibleassertions.VisibleAssertions.info;
-
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 /**
  * @author richardnorth
  */
 public class SimpleNginxTest {
 
-    private static File contentFolder = new File(System.getProperty("user.home") + "/.tmp-test-container");
+    private static String tmpDirectory = System.getProperty("user.home") + "/.tmp-test-container";
 
+    // creatingContainer {
     @Rule
     public NginxContainer nginx = new NginxContainer<>()
-        .withCustomContent(contentFolder.toString())
+        .withCustomContent(tmpDirectory)
         .waitingFor(new HttpWaitStrategy());
+    // }
 
     @SuppressWarnings({"Duplicates", "ResultOfMethodCallIgnored"})
     @BeforeClass
-    public static void setupContent() throws FileNotFoundException {
+    public static void setupContent() throws Exception {
+        // addCustomContent {
+        // Create a temporary dir
+        File contentFolder = new File(tmpDirectory);
         contentFolder.mkdir();
-        contentFolder.setReadable(true, false);
-        contentFolder.setWritable(true, false);
-        contentFolder.setExecutable(true, false);
-
+        contentFolder.deleteOnExit();
 
+        // And "hello world" HTTP file
         File indexFile = new File(contentFolder, "index.html");
-        indexFile.setReadable(true, false);
-        indexFile.setWritable(true, false);
-        indexFile.setExecutable(true, false);
-
+        indexFile.deleteOnExit();
         @Cleanup PrintStream printStream = new PrintStream(new FileOutputStream(indexFile));
-        printStream.println("<html><body>This worked</body></html>");
+        printStream.println("<html><body>Hello World!</body></html>");
+        // }
     }
 
     @Test
     public void testSimple() throws Exception {
+        // getFromNginxServer {
+        URL baseUrl = nginx.getBaseUrl("http", 80);
 
-        info("Base URL is " + nginx.getBaseUrl("http", 80));
+        assertThat("An HTTP GET from the Nginx server returns the index.html from the custom content directory",
+            responseFromNginx(baseUrl),
+            containsString("Hello World!")
+        );
+        // }
+    }
 
-        URLConnection urlConnection = nginx.getBaseUrl("http", 80).openConnection();
+    private static String responseFromNginx(URL baseUrl) throws IOException {
+        URLConnection urlConnection = baseUrl.openConnection();
         @Cleanup BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
-        String line = reader.readLine();
-        System.out.println(line);
-
-        assertTrue("Using URLConnection, an HTTP GET from the nginx server returns the index.html from the custom content directory", line.contains("This worked"));
+        return reader.readLine();
     }
 }

From aa1c65b6efcc6d052fe71043d9985d69df70771f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 2 Jan 2020 13:26:28 +0000
Subject: [PATCH 0472/4969] =?UTF-8?q?Remove=20stray=20'KB'=20suffix=20from?=
 =?UTF-8?q?=20docker=20build=20context=20size=20log=20mes=E2=80=A6=20(#221?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/testcontainers/images/builder/ImageFromDockerfile.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 98d0dda5e5c..ded64439a64 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -123,7 +123,7 @@ public void onNext(BuildResponseItem item) {
                 tarArchive.finish();
             }
 
-            log.info("Transferred {} KB to Docker daemon", FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
+            log.info("Transferred {} to Docker daemon", FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
             if (bytesToDockerDaemon > FileUtils.ONE_MB * 50) // warn if >50MB sent to docker daemon
                 log.warn("A large amount of data was sent to the Docker daemon ({}). Consider using a .dockerignore file for better performance.",
                         FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));

From f9646ec48f99327a48e27a89d51c13fef5f9343d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 11 Jan 2020 15:54:07 +0000
Subject: [PATCH 0473/4969] Bump HikariCP from 3.4.1 to 3.4.2 in /modules/spock
 (#2236)

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.1...HikariCP-3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 2974784d466..465547f1d6e 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.1'
+    testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
     testRuntime 'org.postgresql:postgresql:42.2.9'

From 46e95756e603df7054f0aec74e81c652a3c6a97e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 11 Jan 2020 15:54:29 +0000
Subject: [PATCH 0474/4969] Bump HikariCP from 3.4.1 to 3.4.2 in
 /modules/junit-jupiter (#2235)

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.1...HikariCP-3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 18cc5ddfe96..0ea792ec8b3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.1'
+    testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
     testCompile ('org.mockito:mockito-core:3.2.4') {

From 62ce00d167924cca453a8d989a224b2eca339d35 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 11 Jan 2020 15:54:39 +0000
Subject: [PATCH 0475/4969] Bump mariadb-java-client from 2.5.2 to 2.5.3 in
 /modules/mariadb (#2233)

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.5.2 to 2.5.3.
- [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.5.2...2.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 041b0a146da..fac747aa68e 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.2'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.3'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'

From dab1a9481ec9ca43c298abd9de060e5ecad3e9ba Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 11 Jan 2020 15:54:51 +0000
Subject: [PATCH 0476/4969] Bump okhttp from 3.14.4 to 3.14.5 in /examples
 (#2230)

Bumps [okhttp](https://github.com/square/okhttp) from 3.14.4 to 3.14.5.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/docs/changelog_3x.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.4...parent-3.14.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 dea159a89b5..3e603dec908 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:3.14.4'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.5'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.9'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From 6622578bed5e66bfb979b9bfeeb0e22321e21266 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 12 Jan 2020 13:01:42 -0800
Subject: [PATCH 0477/4969] Move `execInContainer` and `copy*` to
 `ContainerState` (#2176)

* Move `execInContainer` and `copy*` to `ContainerState`

* fix backward compatibility

* Fix javadoc
---
 .../testcontainers/containers/Container.java  |  55 --------
 .../containers/ContainerState.java            | 129 +++++++++++++++++-
 .../containers/GenericContainer.java          |  82 +----------
 3 files changed, 130 insertions(+), 136 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index ef27a95a463..631e2653ceb 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -420,61 +420,6 @@ default void followOutput(Consumer<OutputFrame> consumer, OutputFrame.OutputType
     @Deprecated
     Info fetchDockerDaemonInfo() throws IOException;
 
-    /**
-     * Run a command inside a running container, as though using "docker exec", and interpreting
-     * the output as UTF8.
-     * <p>
-     * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, String...)
-     */
-    ExecResult execInContainer(String... command)
-            throws UnsupportedOperationException, IOException, InterruptedException;
-
-    /**
-     * Run a command inside a running container, as though using "docker exec".
-     * <p>
-     * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, Charset, String...)
-     */
-    ExecResult execInContainer(Charset outputCharset, String... command)
-                    throws UnsupportedOperationException, IOException, InterruptedException;
-
-    /**
-     *
-     * Copies a file or directory to the container.
-     *
-     * @param mountableFile file or directory which is copied into the container
-     * @param containerPath destination path inside the container
-     * @throws IOException if there's an issue communicating with Docker
-     * @throws InterruptedException if the thread waiting for the response is interrupted
-     */
-    void copyFileToContainer(MountableFile mountableFile, String containerPath) throws IOException, InterruptedException;
-
-    /**
-     *
-     * Copies a file to the container.
-     *
-     * @param transferable file which is copied into the container
-     * @param containerPath destination path inside the container
-     */
-    void copyFileToContainer(Transferable transferable, String containerPath);
-
-    /**
-     * Copies a file which resides inside the container to user defined directory
-     *
-     * @param containerPath path to file which is copied from container
-     * @param destinationPath destination path to which file is copied with file name
-     * @throws IOException if there's an issue communicating with Docker or receiving entry from TarArchiveInputStream
-     * @throws InterruptedException if the thread waiting for the response is interrupted
-     */
-    void copyFileFromContainer(String containerPath, String destinationPath) throws IOException, InterruptedException;
-
-    /**
-     * Streams a file which resides inside the container
-     *
-     * @param containerPath path to file which is copied from container
-     * @param function function that takes InputStream of the copied file
-     */
-    <T> T copyFileFromContainer(String containerPath, ThrowingFunction<InputStream, T> function);
-
     List<String> getPortBindings();
 
     List<String> getExtraHosts();
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 2066fe72157..043bae1d52f 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -1,15 +1,33 @@
 package org.testcontainers.containers;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.google.common.base.Preconditions;
+import lombok.SneakyThrows;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.compress.utils.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.LogUtils;
+import org.testcontainers.utility.MountableFile;
+import org.testcontainers.utility.ThrowingFunction;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -170,10 +188,119 @@ default String getLogs(OutputFrame.OutputType... types) {
     /**
      * @return the id of the container
      */
-    String getContainerId();
+    default String getContainerId() {
+        return getContainerInfo().getId();
+    }
 
     /**
      * @return the container info
      */
     InspectContainerResponse getContainerInfo();
+
+    /**
+     * Run a command inside a running container, as though using "docker exec", and interpreting
+     * the output as UTF8.
+     * <p>
+     * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, String...)
+     */
+    default Container.ExecResult execInContainer(String... command) throws UnsupportedOperationException, IOException, InterruptedException {
+        return execInContainer(StandardCharsets.UTF_8, command);
+    }
+
+    /**
+     * Run a command inside a running container, as though using "docker exec".
+     * <p>
+     * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, Charset, String...)
+     */
+    default Container.ExecResult execInContainer(Charset outputCharset, String... command) throws UnsupportedOperationException, IOException, InterruptedException {
+        return ExecInContainerPattern.execInContainer(getContainerInfo(), outputCharset, command);
+    }
+
+    /**
+     *
+     * Copies a file or directory to the container.
+     *
+     * @param mountableFile file or directory which is copied into the container
+     * @param containerPath destination path inside the container
+     */
+    default void copyFileToContainer(MountableFile mountableFile, String containerPath) {
+        File sourceFile = new File(mountableFile.getResolvedPath());
+
+        if (containerPath.endsWith("/") && sourceFile.isFile()) {
+            final Logger logger = LoggerFactory.getLogger(GenericContainer.class);
+            logger.warn("folder-like containerPath in copyFileToContainer is deprecated, please explicitly specify a file path");
+            copyFileToContainer((Transferable) mountableFile, containerPath + sourceFile.getName());
+        } else {
+            copyFileToContainer((Transferable) mountableFile, containerPath);
+        }
+    }
+
+    /**
+     *
+     * Copies a file to the container.
+     *
+     * @param transferable file which is copied into the container
+     * @param containerPath destination path inside the container
+     */
+    @SneakyThrows(IOException.class)
+    default void copyFileToContainer(Transferable transferable, String containerPath) {
+        if (!isCreated()) {
+            throw new IllegalStateException("copyFileToContainer can only be used with created / running container");
+        }
+
+        try (
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(byteArrayOutputStream)
+        ) {
+            tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+
+            transferable.transferTo(tarArchive, containerPath);
+            tarArchive.finish();
+
+            DockerClientFactory.instance().client()
+                .copyArchiveToContainerCmd(getContainerId())
+                .withTarInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()))
+                .withRemotePath("/")
+                .exec();
+        }
+    }
+
+    /**
+     * Copies a file which resides inside the container to user defined directory
+     *
+     * @param containerPath path to file which is copied from container
+     * @param destinationPath destination path to which file is copied with file name
+     * @throws IOException if there's an issue communicating with Docker or receiving entry from TarArchiveInputStream
+     * @throws InterruptedException if the thread waiting for the response is interrupted
+     */
+    default void copyFileFromContainer(String containerPath, String destinationPath) throws IOException, InterruptedException {
+        copyFileFromContainer(containerPath, inputStream -> {
+            try(FileOutputStream output = new FileOutputStream(destinationPath)) {
+                IOUtils.copy(inputStream, output);
+                return null;
+            }
+        });
+    }
+
+    /**
+     * Streams a file which resides inside the container
+     *
+     * @param containerPath path to file which is copied from container
+     * @param function function that takes InputStream of the copied file
+     */
+    @SneakyThrows
+    default  <T> T copyFileFromContainer(String containerPath, ThrowingFunction<InputStream, T> function) {
+        if (!isCreated()) {
+            throw new IllegalStateException("copyFileFromContainer can only be used when the Container is created.");
+        }
+
+        try (
+            DockerClient dockerClient = DockerClientFactory.instance().client();
+            InputStream inputStream = dockerClient.copyArchiveFromContainerCmd(getContainerId(), containerPath).exec();
+            TarArchiveInputStream tarInputStream = new TarArchiveInputStream(inputStream)
+        ) {
+            tarInputStream.getNextTarEntry();
+            return function.apply(tarInputStream);
+        }
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 0062612c10d..ee458339d0a 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1324,87 +1324,9 @@ public synchronized Info fetchDockerDaemonInfo() throws IOException {
      * {@inheritDoc}
      */
     @Override
-    public ExecResult execInContainer(String... command)
-            throws UnsupportedOperationException, IOException, InterruptedException {
-
-        return execInContainer(UTF8, command);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void copyFileToContainer(MountableFile mountableFile, String containerPath) {
-        File sourceFile = new File(mountableFile.getResolvedPath());
-
-        if (containerPath.endsWith("/") && sourceFile.isFile()) {
-            logger().warn("folder-like containerPath in copyFileToContainer is deprecated, please explicitly specify a file path");
-            copyFileToContainer((Transferable) mountableFile, containerPath + sourceFile.getName());
-        } else {
-            copyFileToContainer((Transferable) mountableFile, containerPath);
-        }
-    }
-
-    @Override
-    @SneakyThrows(IOException.class)
-    public void copyFileToContainer(Transferable transferable, String containerPath) {
-        if (!isCreated()) {
-            throw new IllegalStateException("copyFileToContainer can only be used with created / running container");
-        }
-
-        try (
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(byteArrayOutputStream)
-        ) {
-            tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
-
-            transferable.transferTo(tarArchive, containerPath);
-            tarArchive.finish();
-
-            dockerClient
-                .copyArchiveToContainerCmd(containerId)
-                .withTarInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()))
-                .withRemotePath("/")
-                .exec();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
+    @SneakyThrows
     public void copyFileFromContainer(String containerPath, String destinationPath) {
-        copyFileFromContainer(containerPath, inputStream -> {
-            try(FileOutputStream output = new FileOutputStream(destinationPath)) {
-                IOUtils.copy(inputStream, output);
-                return null;
-            }
-        });
-    }
-
-    @Override
-    @SneakyThrows(Exception.class)
-    public <T> T copyFileFromContainer(String containerPath, ThrowingFunction<InputStream, T> consumer) {
-        if (!isCreated()) {
-            throw new IllegalStateException("copyFileFromContainer can only be used when the Container is created.");
-        }
-
-        try (
-            InputStream inputStream = dockerClient.copyArchiveFromContainerCmd(containerId, containerPath).exec();
-            TarArchiveInputStream tarInputStream = new TarArchiveInputStream(inputStream)
-        ) {
-            tarInputStream.getNextTarEntry();
-            return consumer.apply(tarInputStream);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public ExecResult execInContainer(Charset outputCharset, String... command)
-            throws UnsupportedOperationException, IOException, InterruptedException {
-        return ExecInContainerPattern.execInContainer(getContainerInfo(), outputCharset, command);
+        Container.super.copyFileFromContainer(containerPath, destinationPath);
     }
 
     /**

From 728261c7c9cdb5c02d736f31461d11717f97618a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 13 Jan 2020 20:02:12 +0000
Subject: [PATCH 0478/4969] Bump flaky annotation review dates (#2248)

---
 .../couchbase/BaseCouchbaseContainerTest.java               | 6 +++---
 .../org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java    | 2 +-
 .../java/org/testcontainers/containers/ToxiproxyTest.java   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
index 6deba2c4c5e..ef2f0925c48 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
@@ -47,7 +47,7 @@ protected void failed(Throwable e, Description description) {
         });
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2020-03-01")
     public void shouldInsertDocument() {
         RawJsonDocument expected = RawJsonDocument.create(ID, DOCUMENT);
         getBucket().upsert(expected);
@@ -56,7 +56,7 @@ public void shouldInsertDocument() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2020-03-01")
     public void shouldExecuteN1ql() {
         getBucket().query(N1qlQuery.simple("INSERT INTO " + TEST_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
 
@@ -69,7 +69,7 @@ public void shouldExecuteN1ql() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2019-12-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2020-03-01")
     public void shouldCreateView() {
         View view = DefaultView.create(VIEW_NAME, VIEW_FUNCTION);
         DesignDocument document = DesignDocument.create(VIEW_NAME, Lists.newArrayList(view));
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index fb9794e29a8..07a17f68ade 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -20,7 +20,7 @@ public class DatabaseDriverTmpfsTest {
     public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1687", reviewDate = "2019-12-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1687", reviewDate = "2020-03-01")
     public void tmpfs() throws IOException, InterruptedException, SQLException {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
         try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 840165fb8ee..c96e2efd19e 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -45,7 +45,7 @@ public void testDirect() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-12-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2020-03-01")
     public void testLatencyViaProxy() throws IOException {
         // obtainProxyObject {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
@@ -72,7 +72,7 @@ public void testLatencyViaProxy() throws IOException {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-12-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2020-03-01")
     public void testConnectionCut() {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
         final Jedis jedis = new Jedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
@@ -97,7 +97,7 @@ public void testConnectionCut() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-12-01")
+    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2020-03-01")
     public void testMultipleProxiesCanBeCreated() {
         try (GenericContainer secondRedis = new GenericContainer("redis:5.0.4")
             .withExposedPorts(6379)

From d4f6d13b4b730cbb24a82939cd6d3472e818e6d2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:15:54 +0000
Subject: [PATCH 0479/4969] Bump pulsar-client from 2.4.1 to 2.5.0 in
 /modules/pulsar (#2252)

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 046debc2b9b..81be68579d7 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.4.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.14.0'
 }

From 5b48d4dbb3092a4919bcea9aa2aa034b08dbfa91 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:16:04 +0000
Subject: [PATCH 0480/4969] Bump mysql-connector-java from 8.0.18 to 8.0.19 in
 /modules/spock (#2242)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.18 to 8.0.19.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 465547f1d6e..d964e67c5cf 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
 
     testRuntime 'org.postgresql:postgresql:42.2.9'
-    testRuntime 'mysql:mysql-connector-java:8.0.18'
+    testRuntime 'mysql:mysql-connector-java:8.0.19'
 }

From 2be3b44a348646d34f0e8737e825b7f32bac9220 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:16:22 +0000
Subject: [PATCH 0481/4969] Bump mysql-connector-java from 8.0.18 to 8.0.19 in
 /modules/mysql (#2241)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.18 to 8.0.19.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0b70ea3af6a..43867df521a 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MySQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'mysql:mysql-connector-java:8.0.18'
+    testCompile 'mysql:mysql-connector-java:8.0.19'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'
     testCompile 'commons-dbutils:commons-dbutils:1.7'

From dd5fe11e6bdae0657cc6a2551e3890f64973ce3c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:17:28 +0000
Subject: [PATCH 0482/4969] Bump junit from 4.12 to 4.13 in /examples (#2220)

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 examples/mongodb-container/build.gradle  | 2 +-
 examples/redis-backed-cache/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 11c5f2bbe24..d3b85856b8a 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -8,5 +8,5 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index b665b9a24a4..9dea8531b5e 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }

From 9f748ab1fd1a63e5ad1509e0681be6cfe2210e2c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:17:44 +0000
Subject: [PATCH 0483/4969] =?UTF-8?q?Bump=20mysql-connector-java=20from=20?=
 =?UTF-8?q?8.0.18=20to=208.0.19=20in=20/modules/jun=E2=80=A6=20(#2244)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.18 to 8.0.19.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 0ea792ec8b3..a2698da90d9 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     }
 
     testRuntime 'org.postgresql:postgresql:42.2.9'
-    testRuntime 'mysql:mysql-connector-java:8.0.18'
+    testRuntime 'mysql:mysql-connector-java:8.0.19'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 }
 

From 4671f3a007ab38e16fa1c3b0dd80ad899fafc2aa Mon Sep 17 00:00:00 2001
From: Michael DePouw <mdepouw@ceiamerica.com>
Date: Sat, 18 Jan 2020 05:23:35 -0500
Subject: [PATCH 0484/4969] fix anchor link for link to feature description
 (#2257)

---
 docs/supported_docker_environment/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/windows.md b/docs/supported_docker_environment/windows.md
index 122965ef133..b35ee1aa2ee 100644
--- a/docs/supported_docker_environment/windows.md
+++ b/docs/supported_docker_environment/windows.md
@@ -17,7 +17,7 @@ If you wish to use Testcontainers on Windows, please confirm that it works corre
 effort.
 
 ### MySQL containers
-* MySQL server prevents custom configuration file (ini-script) from being loaded due to security measures ([link to feature description](../modules/databases/index.md#using-an-init-script))
+* MySQL server prevents custom configuration file (ini-script) from being loaded due to security measures ([link to feature description](../modules/databases/index.md#using-an-init-script-from-a-file))
 
 ### Windows Container on Windows (WCOW)
 

From 23e9718a56eeac3ca2ec87c8a2525fa8e4bf76df Mon Sep 17 00:00:00 2001
From: Per Lundberg <perlun@gmail.com>
Date: Sat, 18 Jan 2020 12:24:44 +0200
Subject: [PATCH 0485/4969] =?UTF-8?q?Fix=20/proc/net/tcp*=20check=20in=20I?=
 =?UTF-8?q?nternalCommandPortListeningCheck=20t=E2=80=A6=20(#2195)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wait/internal/InternalCommandPortListeningCheck.java      | 2 +-
 .../wait/internal/InternalCommandPortListeningCheckTest.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index 43ed94bc84d..2013ddc4d9c 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -29,7 +29,7 @@ public Boolean call() {
         for (int internalPort : internalPorts) {
             command += " && ";
             command += " (";
-            command += format("cat /proc/net/tcp{,6} | awk '{print $2}' | grep -i :%x", internalPort);
+            command += format("cat /proc/net/tcp* | awk '{print $2}' | grep -i :%x", internalPort);
             command += " || ";
             command += format("nc -vz -w 1 localhost %d", internalPort);
             command += " || ";
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
index 71a14c3c79e..bee4f0a231a 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
@@ -11,8 +11,8 @@
 
 public class InternalCommandPortListeningCheckTest {
 
-    // Linking a custom configuration into the container so that nginx is listening on port 8080. This is necessary to proof
-    // that the command formatting uses the correct casing for hexadecimal numberd (i.e. 1F90 and not 1f90).
+    // Linking a custom configuration into the container so that nginx is listening on port 8080. This is necessary to prove
+    // that the command formatting uses the correct casing for hexadecimal numbers (i.e. 1F90 and not 1f90).
     @Rule
     public GenericContainer nginx = new GenericContainer<>("nginx:1.9.4")
             .withClasspathResourceMapping("nginx_on_8080.conf", "/etc/nginx/conf.d/default.conf", BindMode.READ_ONLY);

From 7143939ed97df0d14b0d44e99bdfa7561a2dd1cb Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Sat, 18 Jan 2020 11:33:05 +0100
Subject: [PATCH 0486/4969] Accept List<GenericContainer> in deepStart (#2221)

---
 .../main/java/org/testcontainers/lifecycle/Startables.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
index 6cf57cc6f6e..b20c5c91b54 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startables.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -27,7 +27,7 @@ public Thread newThread(Runnable r) {
     /**
      * @see #deepStart(Stream)
      */
-    public CompletableFuture<Void> deepStart(Collection<Startable> startables) {
+    public CompletableFuture<Void> deepStart(Collection<? extends Startable> startables) {
         return deepStart(startables.stream());
     }
 
@@ -49,7 +49,7 @@ public CompletableFuture<Void> deepStart(Collection<Startable> startables) {
      * @param startables a {@link Stream} of {@link Startable}s to start and scan for transitive dependencies.
      * @return a {@link CompletableFuture} that resolves once all {@link Startable}s have started.
      */
-    public CompletableFuture<Void> deepStart(Stream<Startable> startables) {
+    public CompletableFuture<Void> deepStart(Stream<? extends Startable> startables) {
         return deepStart(new HashMap<>(), startables);
     }
 
@@ -58,7 +58,7 @@ public CompletableFuture<Void> deepStart(Stream<Startable> startables) {
      * @param started an intermediate storage for already started {@link Startable}s to prevent multiple starts.
      * @param startables a {@link Stream} of {@link Startable}s to start and scan for transitive dependencies.
      */
-    private CompletableFuture<Void> deepStart(Map<Startable, CompletableFuture<Void>> started, Stream<Startable> startables) {
+    private CompletableFuture<Void> deepStart(Map<Startable, CompletableFuture<Void>> started, Stream<? extends Startable> startables) {
         CompletableFuture[] futures = startables
             .sequential()
             .map(it -> {

From fb869c06db062abc86b4bd88400d9b2ccfb2bb18 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 19 Jan 2020 13:04:13 +0000
Subject: [PATCH 0487/4969] Prevent duplicate attempts to start Ryuk container
 (#2245)

Prevent duplicate attempts to start Ryuk container
If for example, checks fail once but the Docker client is otherwise initialized, an error would occur due to an attempt to start a Ryuk container twice with the same name.
This changed is aimed at avoiding that situation.

Additionally, if checks fail once they should fail on every subsequent attempt to start a client. Therefore, we cache the failure and rethrow it.


Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../testcontainers/DockerClientFactory.java   | 99 +++++++++++--------
 .../DockerClientFactoryTest.java              | 36 +++++++
 .../MockTestcontainersConfigurationRule.java  |  3 +
 3 files changed, 96 insertions(+), 42 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 0ca7d41a209..2edcdf38e24 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -17,9 +17,6 @@
 import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 import org.testcontainers.dockerclient.DockerMachineClientProviderStrategy;
 import org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback;
@@ -68,12 +65,16 @@ public class DockerClientFactory {
     @VisibleForTesting
     DockerClient dockerClient;
 
+    @VisibleForTesting
+    RuntimeException cachedChecksFailure;
+
     private String activeApiVersion;
     private String activeExecutionDriver;
 
     @Getter(lazy = true)
     private final boolean fileMountingSupported = checkMountableFile();
 
+
     static {
         System.setProperty("org.testcontainers.shaded.io.netty.packagePrefix", "org.testcontainers.shaded.");
     }
@@ -124,6 +125,12 @@ public DockerClient client() {
             return dockerClient;
         }
 
+        // fail-fast if checks have failed previously
+        if (cachedChecksFailure != null) {
+            log.debug("There is a cached checks failure - throwing", cachedChecksFailure);
+            throw cachedChecksFailure;
+        }
+
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
         String hostIpAddress = strategy.getDockerHostIpAddress();
@@ -140,33 +147,47 @@ public DockerClient client() {
                 "  Operating System: " + dockerInfo.getOperatingSystem() + "\n" +
                 "  Total Memory: " + dockerInfo.getMemTotal() / (1024 * 1024) + " MB");
 
-        String ryukContainerId = null;
+        final String ryukContainerId;
+
         boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
         if (useRyuk) {
+            log.debug("Ryuk is enabled");
             ryukContainerId = ResourceReaper.start(hostIpAddress, client);
             log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
+        } else {
+            log.debug("Ryuk is disabled");
+            ryukContainerId = null;
         }
 
         boolean checksEnabled = !TestcontainersConfiguration.getInstance().isDisableChecks();
         if (checksEnabled) {
-            VisibleAssertions.info("Checking the system...");
-            checkDockerVersion(version.getVersion());
-            if (ryukContainerId != null) {
-                checkDiskSpace(client, ryukContainerId);
-            } else {
-                runInsideDocker(
-                    client,
-                    createContainerCmd -> {
-                        createContainerCmd.withName("testcontainers-checks-" + SESSION_ID);
-                        createContainerCmd.getHostConfig().withAutoRemove(true);
-                        createContainerCmd.withCmd("tail", "-f", "/dev/null");
-                    },
-                    (__, containerId) -> {
-                        checkDiskSpace(client, containerId);
-                        return "";
-                    }
-                );
+            log.debug("Checks are enabled");
+
+            try {
+                log.info("Checking the system...");
+                checkDockerVersion(version.getVersion());
+                if (ryukContainerId != null) {
+                    checkDiskSpace(client, ryukContainerId);
+                } else {
+                    runInsideDocker(
+                        client,
+                        createContainerCmd -> {
+                            createContainerCmd.withName("testcontainers-checks-" + SESSION_ID);
+                            createContainerCmd.getHostConfig().withAutoRemove(true);
+                            createContainerCmd.withCmd("tail", "-f", "/dev/null");
+                        },
+                        (__, containerId) -> {
+                            checkDiskSpace(client, containerId);
+                            return "";
+                        }
+                    );
+                }
+            } catch (RuntimeException e) {
+                cachedChecksFailure = e;
+                throw e;
             }
+        } else {
+            log.debug("Checks are disabled");
         }
 
         dockerClient = client;
@@ -174,17 +195,8 @@ public DockerClient client() {
     }
 
     private void checkDockerVersion(String dockerVersion) {
-        VisibleAssertions.assertThat("Docker version", dockerVersion, new BaseMatcher<String>() {
-            @Override
-            public boolean matches(Object o) {
-                return new ComparableVersion(o.toString()).compareTo(new ComparableVersion("1.6.0")) >= 0;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("should be at least 1.6.0");
-            }
-        });
+        boolean versionIsSufficient = new ComparableVersion(dockerVersion).compareTo(new ComparableVersion("1.6.0")) >= 0;
+        check("Docker server version should be at least 1.6.0", versionIsSufficient);
     }
 
     private void checkDiskSpace(DockerClient dockerClient, String id) {
@@ -201,12 +213,21 @@ private void checkDiskSpace(DockerClient dockerClient, String id) {
 
         DiskSpaceUsage df = parseAvailableDiskSpace(outputStream.toString());
 
-        VisibleAssertions.assertTrue(
+        check(
                 "Docker environment should have more than 2GB free disk space",
                 df.availableMB.map(it -> it >= 2048).orElse(true)
         );
     }
 
+    private void check(String message, boolean isSuccessful) {
+        if (isSuccessful) {
+            log.info("✔︎ {}", message);
+        } else {
+            log.error("❌ {}", message);
+            throw new IllegalStateException("Check failed: " + message);
+        }
+    }
+
     private boolean checkMountableFile() {
         DockerClient dockerClient = client();
 
@@ -267,8 +288,8 @@ private <T> T runInsideDocker(DockerClient client, Consumer<CreateContainerCmd>
         } finally {
             try {
                 client.removeContainerCmd(id).withRemoveVolumes(true).withForce(true).exec();
-            } catch (NotFoundException | InternalServerErrorException ignored) {
-                log.debug("", ignored);
+            } catch (NotFoundException | InternalServerErrorException e) {
+                log.debug("Swallowed exception while removing container", e);
             }
         }
     }
@@ -286,7 +307,7 @@ DiskSpaceUsage parseAvailableDiskSpace(String dfOutput) {
         for (String line : lines) {
             String[] fields = line.split("\\s+");
             if (fields.length > 5 && fields[5].equals("/")) {
-                long availableKB = Long.valueOf(fields[3]);
+                long availableKB = Long.parseLong(fields[3]);
                 df.availableMB = Optional.of(availableKB / 1024L);
                 df.usedPercent = Optional.of(Integer.valueOf(fields[4].replace("%", "")));
                 break;
@@ -318,10 +339,4 @@ public String getActiveExecutionDriver() {
     public boolean isUsing(Class<? extends DockerClientProviderStrategy> providerStrategyClass) {
         return strategy != null && providerStrategyClass.isAssignableFrom(this.strategy.getClass());
     }
-
-    private static class NotEnoughDiskSpaceException extends RuntimeException {
-        NotEnoughDiskSpaceException(String message) {
-            super(message);
-        }
-    }
 }
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 19a591be919..60fd69e9fd3 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -1,19 +1,28 @@
 package org.testcontainers;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory.DiskSpaceUsage;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
+import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * Test for {@link DockerClientFactory}.
  */
 public class DockerClientFactoryTest {
 
+    @Rule
+    public MockTestcontainersConfigurationRule configurationMock = new MockTestcontainersConfigurationRule();
+
     @Test
     public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
 
@@ -52,4 +61,31 @@ public void dockerHostIpAddress() {
         instance.strategy = null;
         assertThat(instance.dockerHostIpAddress()).isNotNull();
     }
+
+    @Test
+    public void failedChecksFailFast() {
+        Mockito.doReturn(false).when(TestcontainersConfiguration.getInstance()).isDisableChecks();
+
+        // Make sure that Ryuk is started
+        assertThat(DockerClientFactory.instance().client()).isNotNull();
+
+        DockerClientFactory instance = new DockerClientFactory();
+        DockerClient dockerClient = instance.dockerClient;
+        assertThat(instance.cachedChecksFailure).isNull();
+        try {
+            // Remove cached client to force the initialization logic
+            instance.dockerClient = null;
+
+            // Ryuk should fail to start twice due to the name conflict (equal to the session id)
+            assertThatThrownBy(instance::client).isInstanceOf(DockerException.class);
+
+            RuntimeException failure = new IllegalStateException("Boom!");
+            instance.cachedChecksFailure = failure;
+            // Fail fast
+            assertThatThrownBy(instance::client).isEqualTo(failure);
+        } finally {
+            instance.dockerClient = dockerClient;
+            instance.cachedChecksFailure = null;
+        }
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java b/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java
index 4d156fd752e..ba467f13897 100644
--- a/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java
+++ b/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java
@@ -23,6 +23,9 @@ public Statement apply(@NotNull Statement base, @NotNull Description description
             @Override
             public void evaluate() throws Throwable {
                 TestcontainersConfiguration previous = REF.get();
+                if (previous == null) {
+                    previous = TestcontainersConfiguration.getInstance();
+                }
                 REF.set(Mockito.spy(previous));
 
                 try {

From a1dac13a4a0a2ae9f4acd97a7e9a246093ead5f3 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 19 Jan 2020 14:25:37 +0000
Subject: [PATCH 0488/4969] =?UTF-8?q?Replace=20unicode=20characters=20in?=
 =?UTF-8?q?=20strings=20with=20unicode=20escape=20seque=E2=80=A6=20(#2261)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/testcontainers/DockerClientFactory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 2edcdf38e24..8d9da8825d2 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -221,9 +221,9 @@ private void checkDiskSpace(DockerClient dockerClient, String id) {
 
     private void check(String message, boolean isSuccessful) {
         if (isSuccessful) {
-            log.info("✔︎ {}", message);
+            log.info("\u2714︎ {}", message);
         } else {
-            log.error("❌ {}", message);
+            log.error("\u274c {}", message);
             throw new IllegalStateException("Check failed: " + message);
         }
     }

From ad703f0503634fa6a53a915b875e145fbb1757e3 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 19 Jan 2020 20:32:00 +0000
Subject: [PATCH 0489/4969] Allow bintray upload to overwrite existing
 publications So that a re-run of a partially failed publication is permitted

---
 gradle/bintray.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
index 6990393401e..5ddfefd8e49 100644
--- a/gradle/bintray.gradle
+++ b/gradle/bintray.gradle
@@ -12,6 +12,7 @@ bintray {
         name = 'testcontainers'
 
         publish = true
+        override = true
 
         version {
             name = project.version

From 92a0d8c2248e96fa589e40fbb26847744bf37ca5 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 22 Jan 2020 21:22:48 +0000
Subject: [PATCH 0490/4969] Restore Travis Release automation (#2279)

* Restore Travis Release automation
Temporary, for duration of [this apparent issue](https://github.community/t5/GitHub-Actions/Read-timeout-issues-uploading-large-number-of-files-to-Bintray/m-p/42760#M5104)

* Remove gradle release script temporarily

* Empty commit to trigger build (Travis webhook was reinstated)
---
 .github/workflows/gradle-release.yml | 22 ----------------------
 .travis.yml                          | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/gradle-release.yml
 create mode 100644 .travis.yml

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
deleted file mode 100644
index d35c0aa73f8..00000000000
--- a/.github/workflows/gradle-release.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Gradle Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Verify CI check status
-      run: .github/workflows/scripts/check_ci_status.sh $GITHUB_SHA
-    - name: Release with Gradle
-      run: ./gradlew -Pversion=${GITHUB_REF##*/} release --scan --no-daemon -i
-      env:
-        BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-        BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000000..daf52bf1aa5
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+if: branch = master AND tag is present
+
+language: java
+jdk:
+  - openjdk8
+
+sudo: required
+services:
+  - docker
+
+jobs:
+  include:
+    - stage: before_deploy
+      script: .github/workflows/scripts/check_ci_status.sh $TRAVIS_COMMIT
+
+    - stage: deploy
+      sudo: false
+      services: []
+      install: skip
+      script: skip
+      deploy:
+        provider: script
+        script: ./gradlew -Pversion=$TRAVIS_TAG release --scan --no-daemon -i
+        on:
+          tags: true
+          branch: master

From 97d2bf1a305a9b2ae701cfe645254327be2657b0 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 22 Jan 2020 21:55:08 +0000
Subject: [PATCH 0491/4969] Simplify conditional travis execution

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index daf52bf1aa5..d05af36ac15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-if: branch = master AND tag is present
+if: tag is present
 
 language: java
 jdk:

From 2a56996fe688bdd191299847a9286a5faa66830e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 22 Jan 2020 22:02:44 +0000
Subject: [PATCH 0492/4969] Remove CI status check

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d05af36ac15..ec7a5d343d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ services:
 
 jobs:
   include:
-    - stage: before_deploy
-      script: .github/workflows/scripts/check_ci_status.sh $TRAVIS_COMMIT
 
     - stage: deploy
       sudo: false

From 63f60423fa31fbd3b1d7f17221f17f5d2b6daf33 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 19:22:51 +0000
Subject: [PATCH 0493/4969] Bump mongo-java-driver from 3.12.0 to 3.12.1 in
 /core (#2264)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.0...r3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2d76c38c0de..d7d9c581c1f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'com.rabbitmq:amqp-client:5.8.0'
-    testCompile 'org.mongodb:mongo-java-driver:3.12.0'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.1'
     testCompile ('org.mockito:mockito-core:3.2.4') {
         exclude(module: 'hamcrest-core')
     }

From 1e645e129d17eed31d1989aee4099f7b8b8f82af Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 19:23:37 +0000
Subject: [PATCH 0494/4969] Bump org.springframework.boot in /examples (#2273)

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.2.2.RELEASE to 2.2.4.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.2.2.RELEASE...v2.2.4.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 5b6d71934b9..db570bf67ac 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.2.2.RELEASE'
+    id 'org.springframework.boot' version '2.2.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index bea11bf0909..e74e04a95e5 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.2.2.RELEASE'
+    id 'org.springframework.boot' version '2.2.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 8a2b77cf5d7e6e7fdf6073eb93aadf2c06c1e9ce Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 19:23:51 +0000
Subject: [PATCH 0495/4969] Bump okhttp from 3.14.5 to 3.14.6 in /examples
 (#2268)

Bumps [okhttp](https://github.com/square/okhttp) from 3.14.5 to 3.14.6.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/docs/changelog_3x.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.5...parent-3.14.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 3e603dec908..f1977ea2c0b 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:3.14.5'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.6'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.9'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From 9b27f6bb52ed55a5a14552dfa04f71ed41c7a5fc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 19:24:08 +0000
Subject: [PATCH 0496/4969] Bump rest-assured from 4.1.2 to 4.2.0 in
 /modules/vault (#2266)

Bumps [rest-assured](https://github.com/jayway/rest-assured) from 4.1.2 to 4.2.0.
- [Release notes](https://github.com/jayway/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/jayway/rest-assured/compare/rest-assured-4.1.2...rest-assured-4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 0a68c9310e0..ac72d306a5c 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
-    testCompile 'io.rest-assured:rest-assured:4.1.2'
+    testCompile 'io.rest-assured:rest-assured:4.2.0'
     testCompile 'org.assertj:assertj-core:3.14.0'
 
 }

From a9006ae80e61f78bcadd970cdba9117727536b2d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 19:24:19 +0000
Subject: [PATCH 0497/4969] Bump httpclient from 4.5.10 to 4.5.11 in
 /modules/junit-jupiter (#2265)

Bumps httpclient from 4.5.10 to 4.5.11.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 a2698da90d9..7b29e36b4dd 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'redis.clients:jedis:3.2.0'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
     testCompile ('org.mockito:mockito-core:3.2.4') {
         exclude(module: 'hamcrest-core')
     }

From fa1f8ce05365ac0c6cd4893dc476c5b43279b607 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 19:24:28 +0000
Subject: [PATCH 0498/4969] Bump httpclient from 4.5.10 to 4.5.11 in
 /modules/spock (#2263)

Bumps httpclient from 4.5.10 to 4.5.11.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 d964e67c5cf..f26858947ce 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.2'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
 
     testRuntime 'org.postgresql:postgresql:42.2.9'
     testRuntime 'mysql:mysql-connector-java:8.0.19'

From bd148a9291e9e840fe5ed2c3f8ae8de2490eff8f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 19:24:36 +0000
Subject: [PATCH 0499/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch (#2277)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.5.1 to 7.5.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.5.1...v7.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 2201efff48a..41d5b0f27ab 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.2"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 3b83ce9017e58255fb3087e5f6fde31db0bb9ba8 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 24 Jan 2020 09:57:53 +0000
Subject: [PATCH 0500/4969] Fix CI Docker Compose test failure (#2284)

```
org.testcontainers.junit.DockerComposeContainerWithBuildTest > performTest[removeMode = ALL] FAILED
    java.lang.RuntimeException: java.lang.AssertionError: the pulled image is present after running: 'true' does not equal expected 'false'
        at org.rnorth.ducttape.timeouts.Timeouts.callFuture(Timeouts.java:68)
        at org.rnorth.ducttape.timeouts.Timeouts.getWithTimeout(Timeouts.java:43)
        at org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess(Unreliables.java:40)
        at org.testcontainers.junit.DockerComposeContainerWithBuildTest.performTest(DockerComposeContainerWithBuildTest.java:72)

        Caused by:
        java.lang.AssertionError: the pulled image is present after running: 'true' does not equal expected 'false'
            at org.rnorth.visibleassertions.VisibleAssertions.fail(VisibleAssertions.java:440)
            at org.rnorth.visibleassertions.VisibleAssertions.assertEquals(VisibleAssertions.java:174)
            at org.testcontainers.junit.DockerComposeContainerWithBuildTest.lambda$performTest$1(DockerComposeContainerWithBuildTest.java:74)
```

Hypothesis: docker-compose cannot remove the `redis` (latest) image because there is some other running container that relies on that image. This may be a CI-specific problem depending on the Azure Pipelines Docker setup.

To work around (without publishing our own single-use image): use an old version of the Redis image that is unlikely to be in use by concurrent builds.
---
 core/src/test/resources/compose-build-test/Dockerfile         | 2 +-
 core/src/test/resources/compose-build-test/docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/resources/compose-build-test/Dockerfile b/core/src/test/resources/compose-build-test/Dockerfile
index 521e2d23b80..f5df49b0152 100644
--- a/core/src/test/resources/compose-build-test/Dockerfile
+++ b/core/src/test/resources/compose-build-test/Dockerfile
@@ -1,3 +1,3 @@
-FROM redis
+FROM redis:2.6.17
 
 CMD ["redis-server"]
diff --git a/core/src/test/resources/compose-build-test/docker-compose.yml b/core/src/test/resources/compose-build-test/docker-compose.yml
index 333b2fa46f1..5b9f3e2c21b 100644
--- a/core/src/test/resources/compose-build-test/docker-compose.yml
+++ b/core/src/test/resources/compose-build-test/docker-compose.yml
@@ -3,4 +3,4 @@ services:
   customredis:
       build: .
   normalredis:
-      image: redis:latest
+      image: redis:2.6.17

From 32bd7a449732dee460787d1a7b92aab3e5a26167 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 24 Jan 2020 19:31:53 +0000
Subject: [PATCH 0501/4969] Update docs version to match latest release

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index eaec3ae13a1..189bc3b6788 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -84,4 +84,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.12.3
+    latest_version: 1.12.5

From 142e585b567f7bac6b9dc97418634362e7ff9d70 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 24 Jan 2020 20:36:51 +0100
Subject: [PATCH 0502/4969] Mention JDBC URL change in Spring Boot 2.3.0
 (#2286)

See https://github.com/spring-projects/spring-boot/pull/19044
---
 docs/modules/databases/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index 2511502f650..32026953802 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -45,7 +45,7 @@ As long as you have Testcontainers and the appropriate JDBC driver on your class
 _N.B:_
 
 * _TC needs to be on your application's classpath at runtime for this to work_
-* _For Spring Boot you need to specify the driver manually `spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver`_
+* _For Spring Boot (Before version `2.3.0`) you need to specify the driver manually `spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver`_
 
 **Original URL**: `jdbc:mysql:5.7.22://localhost:3306/databasename`
 

From a1b6641d6de0b1542421e79f2de6c42d08f26870 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:34:35 +0000
Subject: [PATCH 0503/4969] Bump assertj-core from 3.14.0 to 3.15.0 in
 /modules/database-commons (#2307)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index ea3e0b07360..d8738a6cb69 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.14.0'
+    testCompile 'org.assertj:assertj-core:3.15.0'
 }

From 3854933cfe94eca9976a0e7086fb8bc066b39c0a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:34:57 +0000
Subject: [PATCH 0504/4969] Bump assertj-core from 3.14.0 to 3.15.0 in
 /modules/neo4j (#2306)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 00e1e36f8b7..9361824fdd6 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -30,5 +30,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.14.0'
+    testCompile 'org.assertj:assertj-core:3.15.0'
 }

From 110d700950a7ac7f651d3ae2c4c3bed2d40ab5fa Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:35:38 +0000
Subject: [PATCH 0505/4969] Bump assertj-core from 3.14.0 to 3.15.0 in
 /modules/pulsar (#2305)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 81be68579d7..88d783fc221 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.0'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.14.0'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.15.0'
 }

From 3dbc728ac1ae757b497e338fdefa4633e6546ce8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:36:18 +0000
Subject: [PATCH 0506/4969] Bump assertj-core from 3.14.0 to 3.15.0 in
 /modules/vault (#2304)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index ac72d306a5c..1c8a4083b9c 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.2.0'
-    testCompile 'org.assertj:assertj-core:3.14.0'
+    testCompile 'org.assertj:assertj-core:3.15.0'
 
 }

From bbc82dd14a9032909e7c1c4a4aaf3c3e499611c3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:36:43 +0000
Subject: [PATCH 0507/4969] Bump assertj-core from 3.14.0 to 3.15.0 in
 /modules/kafka (#2303)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index d064e46c1dc..3960cd96b69 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.4.0'
-    testCompile 'org.assertj:assertj-core:3.14.0'
+    testCompile 'org.assertj:assertj-core:3.15.0'
     testCompile 'com.google.guava:guava:23.0'
 }

From 8f3f4af5b1219d22b4b3367e020d41984b2bf3f1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:36:51 +0000
Subject: [PATCH 0508/4969] Bump assertj-core from 3.14.0 to 3.15.0 in /core
 (#2308)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d7d9c581c1f..25aaa396a60 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -115,7 +115,7 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.14.0'
+    testCompile 'org.assertj:assertj-core:3.15.0'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"

From 7a4d4c668ffefa642e80750b7e53eba069e99af8 Mon Sep 17 00:00:00 2001
From: dark <ekdxhrl0096@gmail.com>
Date: Thu, 30 Jan 2020 02:37:42 +0900
Subject: [PATCH 0509/4969] Add junit-jupiter dependency in junit 5 quickstart
 docs (#2301)

Co-authored-by: dark <dark@woowahan.com>
---
 docs/quickstart/junit_5_quickstart.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
index 5a07af24731..179a87a5448 100644
--- a/docs/quickstart/junit_5_quickstart.md
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -27,6 +27,7 @@ testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
 testCompile "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
 testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
 testCompile "org.testcontainers:testcontainers:{{latest_version}}"
+testCompile "org.testcontainers:junit-jupiter:{{latest_version}}"
 ```
 
 ```xml tab='Maven'

From 85f1b5978803283d723247ed025c3118bbaa4352 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:38:00 +0000
Subject: [PATCH 0510/4969] Bump mariadb-java-client from 2.5.3 to 2.5.4 in
 /modules/mariadb (#2298)

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.5.3 to 2.5.4.
- [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.5.3...2.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 fac747aa68e..c7d1dc96676 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.3'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.4'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'

From ae3cbc4620aeda338a853efaa8f9590f4f06e31f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:38:50 +0000
Subject: [PATCH 0511/4969] =?UTF-8?q?Bump=20junit-jupiter-api=20from=205.5?=
 =?UTF-8?q?.2=20to=205.6.0=20in=20/modules/junit-ju=E2=80=A6=20(#2271)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump junit-jupiter-api from 5.5.2 to 5.6.0 in /modules/junit-jupiter

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.5.2 to 5.6.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.5.2...r5.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Match engine and API versions to fix compile error

Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/junit-jupiter/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index 7b29e36b4dd..7bb6393a586 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.6.0'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
@@ -15,7 +15,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.9'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }
 
 test {

From 797c39c81bc125489ccc728d0c4f576002016919 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 08:30:47 +0000
Subject: [PATCH 0512/4969] Bump java-client from 2.7.11 to 2.7.12 in
 /modules/couchbase (#2323)

Bumps [java-client](https://github.com/couchbase/couchbase-java-client) from 2.7.11 to 2.7.12.
- [Release notes](https://github.com/couchbase/couchbase-java-client/releases)
- [Commits](https://github.com/couchbase/couchbase-java-client/compare/2.7.11...2.7.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 27074f1bff7..d6a7e51681e 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.11'
+    compile 'com.couchbase.client:java-client:2.7.12'
 
     testCompile project(':test-support')
 }

From a2995478699597d6a61fc2b475ff6f8ff8937275 Mon Sep 17 00:00:00 2001
From: worldtiki <dmartinsalbuqu@expediagroup.com>
Date: Wed, 5 Feb 2020 08:38:40 +0000
Subject: [PATCH 0513/4969] =?UTF-8?q?Add=20small=20delay=20in=20while=20lo?=
 =?UTF-8?q?op=20to=20avoid=20spamming=20logs=20(ResourceR=E2=80=A6=20(#228?=
 =?UTF-8?q?7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add small delay in while loop to avoid spamming logs (ResourceReaper)

* Add small delay in while loop to avoid spamming logs (ResourceReaper) - Replaced Thread.sleep with RateLimiter
---
 .../utility/ResourceReaper.java               | 62 +++++++++++--------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index f46db952c37..f74905e60ef 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -15,10 +15,11 @@
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.rnorth.ducttape.ratelimits.RateLimiter;
+import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -49,6 +50,11 @@ public final class ResourceReaper {
     private static final Logger LOGGER = LoggerFactory.getLogger(ResourceReaper.class);
 
     private static final List<List<Map.Entry<String, String>>> DEATH_NOTE = new ArrayList<>();
+    private static final RateLimiter RYUK_ACK_RATE_LIMITER = RateLimiterBuilder
+        .newBuilder()
+        .withRate(4, TimeUnit.SECONDS)
+        .withConstantThroughput()
+        .build();
 
     private static ResourceReaper instance;
     private final DockerClient dockerClient;
@@ -110,34 +116,36 @@ public static String start(String hostIpAddress, DockerClient client) {
                 DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
                 () -> {
                     while (true) {
-                        int index = 0;
-                        try(Socket clientSocket = new Socket(hostIpAddress, ryukPort)) {
-                            FilterRegistry registry = new FilterRegistry(clientSocket.getInputStream(), clientSocket.getOutputStream());
-
-                            synchronized (DEATH_NOTE) {
-                                while (true) {
-                                    if (DEATH_NOTE.size() <= index) {
-                                        try {
-                                            DEATH_NOTE.wait(1_000);
-                                            continue;
-                                        } catch (InterruptedException e) {
-                                            throw new RuntimeException(e);
+                        RYUK_ACK_RATE_LIMITER.doWhenReady(() -> {
+                            int index = 0;
+                            try(Socket clientSocket = new Socket(hostIpAddress, ryukPort)) {
+                                FilterRegistry registry = new FilterRegistry(clientSocket.getInputStream(), clientSocket.getOutputStream());
+
+                                synchronized (DEATH_NOTE) {
+                                    while (true) {
+                                        if (DEATH_NOTE.size() <= index) {
+                                            try {
+                                                DEATH_NOTE.wait(1_000);
+                                                continue;
+                                            } catch (InterruptedException e) {
+                                                throw new RuntimeException(e);
+                                            }
+                                        }
+                                        List<Map.Entry<String, String>> filters = DEATH_NOTE.get(index);
+                                        boolean isAcknowledged = registry.register(filters);
+                                        if (isAcknowledged) {
+                                            log.debug("Received 'ACK' from Ryuk");
+                                            ryukScheduledLatch.countDown();
+                                            index++;
+                                        } else {
+                                            log.debug("Didn't receive 'ACK' from Ryuk. Will retry to send filters.");
                                         }
-                                    }
-                                    List<Map.Entry<String, String>> filters = DEATH_NOTE.get(index);
-                                    boolean isAcknowledged = registry.register(filters);
-                                    if (isAcknowledged) {
-                                        log.debug("Received 'ACK' from Ryuk");
-                                        ryukScheduledLatch.countDown();
-                                        index++;
-                                    } else {
-                                        log.debug("Didn't receive 'ACK' from Ryuk. Will retry to send filters.");
                                     }
                                 }
+                            } catch (IOException e) {
+                                log.warn("Can not connect to Ryuk at {}:{}", hostIpAddress, ryukPort, e);
                             }
-                        } catch (IOException e) {
-                            log.warn("Can not connect to Ryuk at {}:{}", hostIpAddress, ryukPort, e);
-                        }
+                        });
                     }
                 },
                 "testcontainers-ryuk"
@@ -341,12 +349,12 @@ public void unregisterNetwork(String identifier) {
     public void unregisterContainer(String identifier) {
         registeredContainers.remove(identifier);
     }
-    
+
     public void registerImageForCleanup(String dockerImageName) {
         setHook();
         registeredImages.add(dockerImageName);
     }
-    
+
     private void removeImage(String dockerImageName) {
         LOGGER.trace("Removing image tagged {}", dockerImageName);
         try {

From d4d9bea7c80fadf2e70cb90b54d2bea8dd8d6d48 Mon Sep 17 00:00:00 2001
From: MariuszCwikla <47976407+MariuszCwikla@users.noreply.github.com>
Date: Wed, 5 Feb 2020 09:43:31 +0100
Subject: [PATCH 0514/4969] Fix localstack cloudwatchlogs service (#2316)

---
 modules/localstack/build.gradle               |  1 +
 .../localstack/LocalStackContainer.java       |  2 +-
 .../localstack/LocalstackContainerTest.java   | 31 +++++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 819419c57ee..6d87d282d90 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,4 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.636'
 }
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 36eaacba89b..e21cc735447 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -154,7 +154,7 @@ public enum Service {
         SSM("ssm", 4583),
         SECRETSMANAGER("secretsmanager", 4584),
         STEPFUNCTIONS("stepfunctions", 4585),
-        CLOUDWATCHLOGS("cloudwatchlogs", 4586),
+        CLOUDWATCHLOGS("logs", 4586),
         STS("sts", 4592),
         IAM("iam", 4593);
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 1b222c0fbc7..7ad31f6340f 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,6 +1,12 @@
 package org.testcontainers.containers.localstack;
 
 
+import com.amazonaws.services.logs.AWSLogs;
+import com.amazonaws.services.logs.AWSLogsClientBuilder;
+import com.amazonaws.services.logs.model.CreateLogGroupRequest;
+import com.amazonaws.services.logs.model.CreateLogGroupResult;
+import com.amazonaws.services.logs.model.DescribeLogGroupsRequest;
+import com.amazonaws.services.logs.model.LogGroup;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.Bucket;
@@ -13,6 +19,7 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
@@ -31,6 +38,7 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCHLOGS;
 
 /**
  * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
@@ -48,7 +56,7 @@ public static class WithoutNetwork {
         // without_network {
         @ClassRule
         public static LocalStackContainer localstack = new LocalStackContainer()
-            .withServices(S3, SQS);
+            .withServices(S3, SQS, CLOUDWATCHLOGS);
         // }
 
         @Test
@@ -95,6 +103,20 @@ public void sqsTestOverBridgeNetwork() {
                 .count();
             assertEquals("the sent message can be received", 1L, messageCount);
         }
+
+        @Test
+        @Ignore("Fails due to https://github.com/localstack/localstack/issues/1434")
+        public void cloudWatchLogsTestOverBridgeNetwork() {
+            AWSLogs logs = AWSLogsClientBuilder.standard()
+                    .withEndpointConfiguration(localstack.getEndpointConfiguration(CLOUDWATCHLOGS))
+                    .withCredentials(localstack.getDefaultCredentialsProvider()).build();
+
+            logs.createLogGroup(new CreateLogGroupRequest("foo"));
+
+            List<LogGroup> groups = logs.describeLogGroups().getLogGroups();
+            assertEquals("One log group should be created", 1, groups.size());
+            assertEquals("Name of created log group is [foo]", "foo", groups.get(0).getLogGroupName());
+        }
     }
 
     public static class WithNetwork {
@@ -105,7 +127,7 @@ public static class WithNetwork {
         public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer()
             .withNetwork(network)
             .withNetworkAliases("notthis", "localstack")    // the last alias is used for HOSTNAME_EXTERNAL
-            .withServices(S3, SQS);
+            .withServices(S3, SQS, CLOUDWATCHLOGS);
         // }
 
         @ClassRule
@@ -139,6 +161,11 @@ public void sqsTestOverDockerNetwork() throws Exception {
             assertTrue("the sent message can be received", message.contains("\"Body\": \"test\""));
         }
 
+        @Test
+        public void cloudWatchLogsTestOverDockerNetwork() throws Exception {
+            runAwsCliAgainstDockerNetworkContainer("logs create-log-group --log-group-name foo", CLOUDWATCHLOGS.getPort());
+        }
+
         private String runAwsCliAgainstDockerNetworkContainer(String command, final int port) throws Exception {
             final String[] commandParts = String.format("/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl", command, port).split(" ");
             final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);

From 7cb8ef5850533717b78d78381d40fd7af0b8bf1a Mon Sep 17 00:00:00 2001
From: Roberto Franchini <roberto.franchini@alfresco.com>
Date: Wed, 5 Feb 2020 10:18:02 +0100
Subject: [PATCH 0515/4969] adds OrientDB 3.0.x module (#1414)

Co-authored-by: Richard North <rich.north@gmail.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 docs/modules/databases/orientdb.md            |  78 +++++++++
 modules/orientdb/build.gradle                 |  11 ++
 .../containers/OrientDBContainer.java         | 153 ++++++++++++++++++
 .../containers/OrientDBContainerTest.java     |  73 +++++++++
 .../src/test/resources/initscript.osql        |   6 +
 .../src/test/resources/logback-test.xml       |  18 +++
 6 files changed, 339 insertions(+)
 create mode 100644 docs/modules/databases/orientdb.md
 create mode 100644 modules/orientdb/build.gradle
 create mode 100644 modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
 create mode 100644 modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
 create mode 100644 modules/orientdb/src/test/resources/initscript.osql
 create mode 100644 modules/orientdb/src/test/resources/logback-test.xml

diff --git a/docs/modules/databases/orientdb.md b/docs/modules/databases/orientdb.md
new file mode 100644
index 00000000000..80ed96f9548
--- /dev/null
+++ b/docs/modules/databases/orientdb.md
@@ -0,0 +1,78 @@
+# OrientDB Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+
+This module helps running [OrientDB](https://orientdb.org/download) using Testcontainers.
+
+Note that it's based on the [official Docker image](https://hub.docker.com/_/orientdb/) provided by OrientDB.
+
+## Usage example
+
+Declare your Testcontainer as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
+You can call `getDbUrl()` OrientDB container and build the `ODatabaseSession` by your own, but a more useful `getSession()` method is provided.
+On the JVM you would most likely use the [Java driver](https://github.com/).
+
+The following example uses the JUnit 5 extension `@Testcontainers` and demonstrates both the usage of the Java Client:
+
+```java tab="JUnit 5 example"
+@Testcontainers
+public class ExampleTest {
+
+    @Container
+    private static OrientDBContainer container = new OrientDBContainer();
+
+    @Test
+    void testDbCreation() {
+
+        final ODatabaseSession session = container.getSession();
+
+        session.command("CREATE CLASS Person EXTENDS V");
+        session.command("INSERT INTO Person set name='john'");
+        session.command("INSERT INTO Person set name='jane'");
+
+        assertThat(session.query("SELECT FROM Person").stream()).hasSize(2);
+    }
+
+}
+```
+
+You are not limited to Unit tests and can of course use an instance of the OrientDB Testcontainer in vanilla Java code as well.
+
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:orientdb:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>orientdb</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+!!! hint
+    Add the OrientDB Java client if you plan to access the Testcontainer:
+    
+    ```groovy tab='Gradle'
+    compile "com.orientechnologies:orientdb-client:3.0.24"
+    ```
+    
+    ```xml tab='Maven'
+    <dependency>
+        <groupId>com.orientechnologies</groupId>
+        <artifactId>orientdb-client</artifactId>
+        <version>3.0.24</version>
+    </dependency>
+    ```
+    
+
+
+
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
new file mode 100644
index 00000000000..ffa1350172a
--- /dev/null
+++ b/modules/orientdb/build.gradle
@@ -0,0 +1,11 @@
+description = "TestContainers :: Orientdb"
+
+dependencies {
+    compile project(":testcontainers")
+
+    compile "com.orientechnologies:orientdb-client:3.0.24"
+
+    testCompile 'org.assertj:assertj-core:3.12.0'
+    testCompile 'org.apache.tinkerpop:gremlin-driver:3.3.4'
+    testCompile "com.orientechnologies:orientdb-gremlin:3.0.18"
+}
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
new file mode 100644
index 00000000000..b368d96bf8c
--- /dev/null
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -0,0 +1,153 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.orientechnologies.orient.core.db.ODatabaseSession;
+import com.orientechnologies.orient.core.db.ODatabaseType;
+import com.orientechnologies.orient.core.db.OrientDB;
+import com.orientechnologies.orient.core.db.OrientDBConfig;
+import lombok.NonNull;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Optional;
+
+import static java.net.HttpURLConnection.HTTP_OK;
+
+/**
+ * @author robfrank
+ */
+public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrientDBContainer.class);
+
+    private static final String DEFAULT_IMAGE_NAME = "orientdb";
+    private static final String DEFAULT_TAG = "3.0.24-tp3";
+    private static final String DOCKER_IMAGE_NAME = DEFAULT_IMAGE_NAME + ":" + DEFAULT_TAG;
+
+    private static final String DEFAULT_USERNAME = "admin";
+    private static final String DEFAULT_PASSWORD = "admin";
+    private static final String DEFAULT_SERVER_PASSWORD = "root";
+
+    private static final String DEFAULT_DATABASE_NAME = "testcontainers";
+
+    private static final int DEFAULT_BINARY_PORT = 2424;
+    private static final int DEFAULT_HTTP_PORT = 2480;
+
+    private String databaseName;
+    private String serverPassword;
+    private Optional<String> scriptPath = Optional.empty();
+
+    private OrientDB orientDB;
+    private ODatabaseSession session;
+
+    public OrientDBContainer() {
+        this(DOCKER_IMAGE_NAME);
+    }
+
+    public OrientDBContainer(@NonNull String dockerImageName) {
+        super(dockerImageName);
+
+        serverPassword = DEFAULT_SERVER_PASSWORD;
+        databaseName = DEFAULT_DATABASE_NAME;
+
+        WaitStrategy waitForHttp = new HttpWaitStrategy()
+            .forPort(DEFAULT_HTTP_PORT)
+            .forStatusCodeMatching(response -> response == HTTP_OK);
+
+        waitStrategy = new WaitAllStrategy()
+            .withStrategy(Wait.forListeningPort())
+            .withStrategy(waitForHttp)
+            .withStartupTimeout(Duration.ofMinutes(2));
+    }
+
+    @Override
+    protected void configure() {
+        addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
+        addEnv("ORIENTDB_ROOT_PASSWORD", serverPassword);
+    }
+
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    public String getTestQueryString() {
+        return "SELECT FROM V";
+    }
+
+    public OrientDBContainer withDatabaseName(final String databaseName) {
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    public OrientDBContainer withServerPassword(final String serverPassword) {
+        this.serverPassword = serverPassword;
+        return self();
+    }
+
+    public OrientDBContainer withScriptPath(String scriptPath) {
+        this.scriptPath = Optional.of(scriptPath);
+        return self();
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        orientDB = new OrientDB(getServerUrl(), "root", serverPassword, OrientDBConfig.defaultConfig());
+    }
+
+    public OrientDB getOrientDB() {
+        return orientDB;
+    }
+
+    public String getServerUrl() {
+        return "remote:" + getContainerIpAddress() + ":" + getMappedPort(2424);
+    }
+
+    public String getDbUrl() {
+        return getServerUrl() + "/" + databaseName;
+    }
+
+    public ODatabaseSession getSession() {
+        return getSession(DEFAULT_USERNAME, DEFAULT_PASSWORD);
+    }
+
+    public synchronized ODatabaseSession getSession(String username, String password) {
+        orientDB.createIfNotExists(databaseName, ODatabaseType.PLOCAL);
+
+        if (session == null) {
+            session = orientDB.open(databaseName, username, password);
+
+            scriptPath.ifPresent(path -> loadScript(path, session));
+        }
+        return session;
+    }
+
+    private void loadScript(String path, ODatabaseSession session) {
+        try {
+            URL resource = getClass().getClassLoader().getResource(path);
+
+            if (resource == null) {
+                LOGGER.warn("Could not load classpath init script: {}", scriptPath);
+                throw new RuntimeException("Could not load classpath init script: " + scriptPath + ". Resource not found.");
+            }
+
+            String script = IOUtils.toString(resource, StandardCharsets.UTF_8);
+
+            session.execute("sql", script);
+        } catch (IOException e) {
+            LOGGER.warn("Could not load classpath init script: {}", scriptPath);
+            throw new RuntimeException("Could not load classpath init script: " + scriptPath, e);
+        } catch (UnsupportedOperationException e) {
+            LOGGER.error("Error while executing init script: {}", scriptPath, e);
+            throw new RuntimeException("Error while executing init script: " + scriptPath, e);
+        }
+    }
+
+}
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
new file mode 100644
index 00000000000..0a067b375b6
--- /dev/null
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -0,0 +1,73 @@
+package org.testcontainers.containers;
+
+import com.orientechnologies.orient.core.db.ODatabaseSession;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.*;
+
+/**
+ * @author robfrank
+ */
+public class OrientDBContainerTest {
+
+    @Test
+    public void shouldReturnTheSameSession() {
+        try (OrientDBContainer container = new OrientDBContainer()) {
+            container.start();
+
+            final ODatabaseSession session = container.getSession();
+            final ODatabaseSession session2 = container.getSession();
+
+            assertThat(session).isSameAs(session2);
+        }
+    }
+
+    @Test
+    public void shouldInitializeWithCommands() {
+        try (OrientDBContainer container = new OrientDBContainer()) {
+            container.start();
+
+            final ODatabaseSession session = container.getSession();
+
+            session.command("CREATE CLASS Person EXTENDS V");
+            session.command("INSERT INTO Person set name='john'");
+            session.command("INSERT INTO Person set name='jane'");
+
+            assertThat(session.query("SELECT FROM Person").stream()).hasSize(2);
+        }
+    }
+
+    @Test
+    public void shouldQueryWithGremlin() {
+
+        try (OrientDBContainer container = new OrientDBContainer()) {
+            container.start();
+
+            final ODatabaseSession session = container.getSession("admin", "admin");
+
+            session.command("CREATE CLASS Person EXTENDS V");
+            session.command("INSERT INTO Person set name='john'");
+            session.command("INSERT INTO Person set name='jane'");
+
+            assertThat(session.execute("gremlin",
+                "g.V().hasLabel('Person')").stream()).hasSize(2);
+        }
+    }
+
+    @Test
+    public void shouldInitializeDatabaseFromScript() {
+        try (OrientDBContainer container = new OrientDBContainer()
+            .withScriptPath("initscript.osql")
+            .withDatabaseName("persons")) {
+
+            container.start();
+
+            assertThat(container.getDbUrl())
+                .isEqualTo("remote:" + container.getContainerIpAddress() + ":" + container.getMappedPort(2424) + "/persons");
+
+            final ODatabaseSession session = container.getSession();
+
+            assertThat(session.query("SELECT FROM Person").stream()).hasSize(4);
+        }
+    }
+}
diff --git a/modules/orientdb/src/test/resources/initscript.osql b/modules/orientdb/src/test/resources/initscript.osql
new file mode 100644
index 00000000000..e1ba22bbb3e
--- /dev/null
+++ b/modules/orientdb/src/test/resources/initscript.osql
@@ -0,0 +1,6 @@
+CREATE CLASS Person EXTENDS V;
+
+INSERT INTO Person set name="john";
+INSERT INTO Person set name="paul";
+INSERT INTO Person set name="luke";
+INSERT INTO Person set name="albert";
diff --git a/modules/orientdb/src/test/resources/logback-test.xml b/modules/orientdb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..7bd6a94d827
--- /dev/null
+++ b/modules/orientdb/src/test/resources/logback-test.xml
@@ -0,0 +1,18 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers.shaded" level="WARN"/>
+
+</configuration>
\ No newline at end of file

From 142558426edcc8c993612b1a9e229259106b22bf Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 7 Feb 2020 20:56:15 +0000
Subject: [PATCH 0516/4969] Pin mkdocs dependencies to avoid version
 incompatibility (#2335)

See https://github.com/squidfunk/mkdocs-material/issues/1450 for more background
---
 requirements.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a936d8a0a95..dd80510a4b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
-mkdocs
+mkdocs==1.0.4
 -e git+https://github.com/rnorth/mkdocs-codeinclude-plugin#egg=mkdocs_codeinclude_plugin
-mkdocs-material
-mkdocs-markdownextradata-plugin
+mkdocs-material==4.6.0
+mkdocs-markdownextradata-plugin==0.1.1
+markdown>=3.1,<3.2

From 61ce025d2affb602384af6312235f895bb104983 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Sat, 8 Feb 2020 21:07:45 +0100
Subject: [PATCH 0517/4969] Add Presto container (#2196)

* Add Presto container

* Add incubating note to module docs

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/databases/index.md               |   4 +
 docs/modules/databases/presto.md              |  88 +++++++++++++
 mkdocs.yml                                    |   1 +
 modules/jdbc-test/build.gradle                |   2 +
 .../testcontainers/jdbc/JDBCDriverTest.java   |   1 +
 modules/presto/build.gradle                   |   8 ++
 .../containers/PrestoContainer.java           | 104 +++++++++++++++
 .../containers/PrestoContainerProvider.java   |  35 +++++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 .../containers/PrestoContainerTest.java       | 121 ++++++++++++++++++
 modules/presto/src/test/resources/initial.sql |   2 +
 11 files changed, 367 insertions(+)
 create mode 100644 docs/modules/databases/presto.md
 create mode 100644 modules/presto/build.gradle
 create mode 100644 modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
 create mode 100644 modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
 create mode 100644 modules/presto/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
 create mode 100644 modules/presto/src/test/resources/initial.sql

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index 32026953802..d7654cc6a33 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -69,6 +69,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:postgis:9.6:///databasename`
 
+### Using Presto
+
+`jdbc:tc:presto:329://localhost/memory/default`
+
 ## Using a classpath init script
 
 Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
diff --git a/docs/modules/databases/presto.md b/docs/modules/databases/presto.md
new file mode 100644
index 00000000000..52776d06daf
--- /dev/null
+++ b/docs/modules/databases/presto.md
@@ -0,0 +1,88 @@
+# Presto Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+See [Database containers](./index.md) for documentation and usage that is common to all database container types.
+
+## Usage example
+
+Running Presto as a stand-in for in a test:
+
+```java
+public class SomeTest {
+
+    @Rule
+    public PrestoContainer presto = new PrestoContainer();
+    
+    @Test
+    public void someTestMethod() {
+        String url = presto.getJdbcUrl();
+
+        ... create a connection and run test as normal
+```
+
+Presto comes with several catalogs preconfigured. Most useful ones for testing are
+
+* `tpch` catalog using the [Presto TPCH Connector](https://prestosql.io/docs/current/connector/tpch.html).
+  This is a read-only catalog that defines standard TPCH schema, so is available for querying without a need
+  to create any tables.
+* `memory` catalog using the [Presto Memory Connector](https://prestosql.io/docs/current/connector/memory.html).
+  This catalog can be used for creating schemas and tables and does not require any storage, as everything
+  is stored fully in-memory.
+
+Example test using the `tpch` and `memory` catalogs:
+
+```java
+public class SomeTest {
+    @Rule
+    public PrestoContainer prestoSql = new PrestoContainer();
+
+    @Test
+    public void queryMemoryAndTpchConnectors() throws SQLException {
+        try (Connection connection = prestoSql.createConnection();
+             Statement statement = connection.createStatement()) {
+            // Prepare data
+            statement.execute("CREATE TABLE memory.default.table_with_array AS SELECT 1 id, ARRAY[1, 42, 2, 42, 4, 42] my_array");
+
+            // Query Presto using newly created table and a builtin connector
+            try (ResultSet resultSet = statement.executeQuery("" +
+                "SELECT nationkey, element " +
+                "FROM tpch.tiny.nation " +
+                "JOIN memory.default.table_with_array twa ON nationkey = twa.id " +
+                "LEFT JOIN UNNEST(my_array) a(element) ON true " +
+                "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES ")) {
+                List<Integer> actualElements = new ArrayList<>();
+                while (resultSet.next()) {
+                    actualElements.add(resultSet.getInt("element"));
+                }
+                Assert.assertEquals(Arrays.asList(2, 4, 42, 42, 42), actualElements);
+            }
+        }
+    }
+}
+```
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:presto:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>presto</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add the Presto JDBC driver JAR to your project.
+    You should ensure that your project has the Presto JDBC driver as a dependency, if you plan on using it.
+    Refer to [Presto project download page](https://prestosql.io/download.html) for instructions.
+
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 189bc3b6788..f66f382ccb0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -53,6 +53,7 @@ nav:
                 - modules/databases/neo4j.md
                 - modules/databases/oraclexe.md
                 - modules/databases/postgres.md
+                - modules/databases/presto.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/kafka.md
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 842f2a761eb..c7c909782bb 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -7,6 +7,7 @@ repositories {
 dependencies {
     compile project(':mysql')
     compile project(':postgresql')
+    compile project(':presto')
     compile project(':cockroachdb')
     compile project(':mariadb')
     compile project(':oracle-xe')
@@ -16,6 +17,7 @@ dependencies {
 
     testCompile 'com.google.guava:guava:18.0'
     testCompile 'org.postgresql:postgresql:42.0.0'
+    testCompile 'io.prestosql:presto-jdbc:329'
     testCompile 'mysql:mysql-connector-java:8.0.14'
     testCompile 'org.mariadb.jdbc:mariadb-java-client:1.4.6'
     testCompile 'com.oracle:ojdbc6:12.1.0.1-atlassian-hosted'
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index 2089513df06..ca55a1d1841 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -53,6 +53,7 @@ public static Iterable<Object[]> data() {
                 {"jdbc:tc:postgresql:9.6.8://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
                 {"jdbc:tc:postgis://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
                 {"jdbc:tc:postgis:9.6://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+                {"jdbc:tc:presto:329://hostname/", EnumSet.of(Options.PmdKnownBroken)},
                 {"jdbc:tc:mysql:5.6://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", EnumSet.of(Options.CustomIniFile)},
                 {"jdbc:tc:mariadb://hostname/databasename", EnumSet.noneOf(Options.class)},
                 {"jdbc:tc:mariadb://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
new file mode 100644
index 00000000000..07aad11168e
--- /dev/null
+++ b/modules/presto/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: JDBC :: Presto"
+
+dependencies {
+    compile project(':jdbc')
+
+    testCompile 'io.prestosql:presto-jdbc:329'
+    testCompile 'commons-dbutils:commons-dbutils:1.7'
+}
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
new file mode 100644
index 00000000000..186acb18af6
--- /dev/null
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -0,0 +1,104 @@
+package org.testcontainers.containers;
+
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.google.common.base.Strings.nullToEmpty;
+import static java.lang.String.format;
+import static java.time.temporal.ChronoUnit.SECONDS;
+
+public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
+    public static final String NAME = "presto";
+    public static final String IMAGE = "prestosql/presto";
+    public static final String DEFAULT_TAG = "329";
+
+    public static final Integer PRESTO_PORT = 8080;
+
+    private String username = "test";
+    private String catalog = null;
+
+    public PrestoContainer() {
+        this(IMAGE + ":" + DEFAULT_TAG);
+    }
+
+    public PrestoContainer(final String dockerImageName) {
+        super(dockerImageName);
+        this.waitStrategy = new LogMessageWaitStrategy()
+            .withRegEx(".*io.prestosql.server.PrestoServer\\s+======== SERVER STARTED ========.*")
+            .withStartupTimeout(Duration.of(60, SECONDS));
+    }
+
+    @NotNull
+    @Override
+    protected Set<Integer> getLivenessCheckPorts() {
+        return new HashSet<>(getMappedPort(PRESTO_PORT));
+    }
+
+    @Override
+    protected void configure() {
+        addExposedPort(PRESTO_PORT);
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "io.prestosql.jdbc.PrestoDriver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return format("jdbc:presto://%s:%s/%s", getContainerIpAddress(), getMappedPort(PRESTO_PORT), nullToEmpty(catalog));
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return "";
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return catalog;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT count(*) FROM tpch.tiny.nation";
+    }
+
+    @Override
+    public SELF withUsername(final String username) {
+        this.username = username;
+        return self();
+    }
+
+    /**
+     * @deprecated This operation is not supported.
+     */
+    @Override
+    @Deprecated
+    public SELF withPassword(final String password) {
+        // ignored, Presto does not support password authentication without TLS
+        // TODO: make JDBCDriverTest not pass a password unconditionally and remove this method
+        return self();
+    }
+
+    @Override
+    public SELF withDatabaseName(String dbName) {
+        this.catalog = dbName;
+        return self();
+    }
+
+    public Connection createConnection() throws SQLException, NoDriverFoundException {
+        return createConnection("");
+    }
+}
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
new file mode 100644
index 00000000000..663cf9be4a9
--- /dev/null
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
@@ -0,0 +1,35 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.jdbc.ConnectionUrl;
+
+import java.util.Objects;
+
+/**
+ * Factory for Presto containers.
+ */
+public class PrestoContainerProvider extends JdbcDatabaseContainerProvider {
+
+    public static final String USER_PARAM = "user";
+    public static final String PASSWORD_PARAM = "password";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(PrestoContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(PrestoContainer.DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new PrestoContainer(PrestoContainer.IMAGE + ":" + tag);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+    }
+
+}
diff --git a/modules/presto/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/presto/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..ad36a36a117
--- /dev/null
+++ b/modules/presto/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.PrestoContainerProvider
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
new file mode 100644
index 00000000000..07fb6fa30ed
--- /dev/null
+++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -0,0 +1,121 @@
+package org.testcontainers.containers;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.lang.Integer.parseInt;
+import static java.lang.String.format;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author findepi
+ */
+public class PrestoContainerTest {
+    @Test
+    public void testSimple() throws Exception {
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>()) {
+            prestoSql.start();
+            try (Connection connection = prestoSql.createConnection();
+                 Statement statement = connection.createStatement();
+                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+                assertTrue("No result", resultSet.next());
+                assertEquals("Presto version", PrestoContainer.DEFAULT_TAG, resultSet.getString("node_version"));
+            }
+        }
+    }
+
+    @Test
+    public void testSpecificVersion() throws Exception {
+        String prestoVersion = Integer.toString(parseInt(PrestoContainer.DEFAULT_TAG) - 1);
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>("prestosql/presto:" + prestoVersion)) {
+            prestoSql.start();
+            try (Connection connection = prestoSql.createConnection();
+                 Statement statement = connection.createStatement();
+                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+                assertTrue("No result", resultSet.next());
+                assertEquals("Presto version", prestoVersion, resultSet.getString("node_version"));
+            }
+        }
+    }
+
+    @Test
+    public void testQueryMemoryAndTpch() throws SQLException {
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>()) {
+            prestoSql.start();
+            try (Connection connection = prestoSql.createConnection();
+                 Statement statement = connection.createStatement()) {
+                // Prepare data
+                statement.execute("CREATE TABLE memory.default.table_with_array AS SELECT 1 id, ARRAY[1, 42, 2, 42, 4, 42] my_array");
+
+                // Query Presto using newly created table and a builtin connector
+                try (ResultSet resultSet = statement.executeQuery("" +
+                    "SELECT nationkey, element " +
+                    "FROM tpch.tiny.nation " +
+                    "JOIN memory.default.table_with_array twa ON nationkey = twa.id " +
+                    "LEFT JOIN UNNEST(my_array) a(element) ON true " +
+                    "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES ")) {
+                    List<Integer> actualElements = new ArrayList<>();
+                    while (resultSet.next()) {
+                        actualElements.add(resultSet.getInt("element"));
+                    }
+                    Assert.assertEquals(Arrays.asList(2, 4, 42, 42, 42), actualElements);
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testInitScript() throws Exception {
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>()) {
+            prestoSql.withInitScript("initial.sql");
+            prestoSql.start();
+            try (Connection connection = prestoSql.createConnection();
+                 Statement statement = connection.createStatement();
+                 ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")) {
+                assertTrue("No result", resultSet.next());
+                assertEquals("Value", 12345678909324L, resultSet.getObject("a"));
+                assertFalse("Too many result", resultSet.next());
+            }
+        }
+    }
+
+    @Test
+    public void testTcJdbcUri() throws Exception {
+        try (Connection connection = DriverManager.getConnection(format("jdbc:tc:presto:%s://hostname/", PrestoContainer.DEFAULT_TAG))) {
+            // Verify metadata with tc: JDBC connection URI
+            assertEquals(connection.getMetaData().getDatabaseMajorVersion(), parseInt(PrestoContainer.DEFAULT_TAG));
+
+            // Verify transactions with tc: JDBC connection URI
+            assertTrue("Is autocommit", connection.getAutoCommit());
+            connection.setAutoCommit(false);
+            assertFalse("Is autocommit", connection.getAutoCommit());
+            assertEquals("Transaction isolation", Connection.TRANSACTION_READ_UNCOMMITTED, connection.getTransactionIsolation());
+
+            try (Statement statement = connection.createStatement()) {
+                assertEquals("Update result", 0, statement.executeUpdate("CREATE TABLE memory.default.test_tc(a bigint)"));
+                try (ResultSet resultSet = statement.executeQuery("SELECT sum(cast(node_version AS bigint)) AS v FROM system.runtime.nodes")) {
+                    assertTrue(resultSet.next());
+                    assertEquals(PrestoContainer.DEFAULT_TAG, resultSet.getString("v"));
+                    assertFalse(resultSet.next());
+                }
+                connection.commit();
+            } finally {
+                connection.rollback();
+            }
+            connection.setAutoCommit(true);
+            assertTrue("Is autocommit", connection.getAutoCommit());
+            assertEquals("Transaction isolation should be retained", Connection.TRANSACTION_READ_UNCOMMITTED, connection.getTransactionIsolation());
+        }
+    }
+}
diff --git a/modules/presto/src/test/resources/initial.sql b/modules/presto/src/test/resources/initial.sql
new file mode 100644
index 00000000000..1a3ecdab4f9
--- /dev/null
+++ b/modules/presto/src/test/resources/initial.sql
@@ -0,0 +1,2 @@
+CREATE TABLE memory.default.test_table(a bigint);
+INSERT INTO memory.default.test_table(a) VALUES (12345678909324);

From 0e13f273a96e59432ac0f0244e61accfe2467e27 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:08:35 +0000
Subject: [PATCH 0518/4969] =?UTF-8?q?Bump=20aws-java-sdk-logs=20from=201.1?=
 =?UTF-8?q?1.636=20to=201.11.717=20in=20/modules/lo=E2=80=A6=20(#2327)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.636 to 1.11.717.
- [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.636...1.11.717)

Signed-off-by: dependabot-preview[bot] <support@dependabot.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 6d87d282d90..81490d2daef 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.636'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.717'
 }

From d4b2369e30a55ebe34d79062bf018d2576223904 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:08:53 +0000
Subject: [PATCH 0519/4969] Bump lombok from 1.18.10 to 1.18.12 in /examples
 (#2333)

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.10 to 1.18.12.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.10...v1.18.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 examples/disque-job-queue/build.gradle | 2 +-
 examples/spring-boot/build.gradle      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 1f4e257cad1..fb8413bdec8 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok:1.18.12"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.6'
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index e74e04a95e5..49052847de1 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok:1.18.12"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'

From 3ba7a7936b5f9e44ef2624edc9e275a39d25add4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:09:08 +0000
Subject: [PATCH 0520/4969] Bump postgresql from 42.2.9 to 42.2.10 in
 /modules/spock (#2329)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.9 to 42.2.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.9...REL42.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 f26858947ce..c7b51cc9c5f 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
 
-    testRuntime 'org.postgresql:postgresql:42.2.9'
+    testRuntime 'org.postgresql:postgresql:42.2.10'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
 }

From 0d25192210d18ee77b34ad80496d169b9b159512 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:09:19 +0000
Subject: [PATCH 0521/4969] Bump postgresql from 42.2.9 to 42.2.10 in
 /modules/postgresql (#2328)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.9 to 42.2.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.9...REL42.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 a4bf697a3ad..9acf9ead2aa 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: PostgreSQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.postgresql:postgresql:42.2.9'
+    testCompile 'org.postgresql:postgresql:42.2.10'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
 }

From 39f1267a5733c27b57477fe7f11321f8d3cde95a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:09:30 +0000
Subject: [PATCH 0522/4969] Bump postgresql from 42.2.9 to 42.2.10 in
 /modules/junit-jupiter (#2330)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.9 to 42.2.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.9...REL42.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 7bb6393a586..b01333b5ec9 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntime 'org.postgresql:postgresql:42.2.9'
+    testRuntime 'org.postgresql:postgresql:42.2.10'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }

From b1117888694f21dfa2f31a30af7acda6cb34fa2c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:23:14 +0000
Subject: [PATCH 0523/4969] =?UTF-8?q?Bump=20aws-java-sdk-logs=20from=201.1?=
 =?UTF-8?q?1.636=20to=201.11.718=20in=20/modules/lo=E2=80=A6=20(#2336)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.636 to 1.11.718.
- [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.636...1.11.718)

Signed-off-by: dependabot-preview[bot] <support@dependabot.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 81490d2daef..c1c12257baa 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.717'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.718'
 }

From d4cf9d78314e5a6edbb4c0c2601a16304a865e85 Mon Sep 17 00:00:00 2001
From: Artjom Kalita <artjom.kalita@gmail.com>
Date: Sun, 9 Feb 2020 17:34:44 +0200
Subject: [PATCH 0524/4969] Add functionality to retrieve container by its name
 (#2314)

Since `DockerComposeContainer#project` is private, there is currently no way of accessing containers started by Docker Compose.

This change adds a new API to the DockerComposeContainer to obtain a `ContainerState` reference by the service's name.

Fixes #2302.
---
 .../containers/DockerComposeContainer.java    | 23 ++++++++++++++--
 .../junit/DockerComposeContainerTest.java     | 26 ++++++++++++++++---
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 7dec6399b8f..839db7c89db 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -22,7 +22,14 @@
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.lifecycle.Startable;
-import org.testcontainers.utility.*;
+import org.testcontainers.utility.AuditLogger;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerLoggerFactory;
+import org.testcontainers.utility.LogUtils;
+import org.testcontainers.utility.MountableFile;
+import org.testcontainers.utility.ResourceReaper;
+import org.testcontainers.utility.TestcontainersConfiguration;
 import org.zeroturnaround.exec.InvalidExitValueException;
 import org.zeroturnaround.exec.ProcessExecutor;
 import org.zeroturnaround.exec.stream.slf4j.Slf4jStream;
@@ -30,7 +37,15 @@
 import java.io.File;
 import java.time.Duration;
 import java.util.AbstractMap.SimpleEntry;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -479,6 +494,10 @@ public SELF withRemoveImages(RemoveImages removeImages) {
         return self();
     }
 
+    public Optional<ContainerState> getContainerByServiceName(String serviceName) {
+        return Optional.ofNullable(serviceInstanceMap.get(serviceName));
+    }
+
     private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
         LogUtils.followOutput(DockerClientFactory.instance().client(), containerId, consumer);
     }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
index bf69656ac04..53d90872332 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
@@ -2,12 +2,18 @@
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
+import java.util.Optional;
 
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
  * Created by rnorth on 08/08/2015.
@@ -16,9 +22,8 @@ public class DockerComposeContainerTest extends BaseDockerComposeTest {
 
     @Rule
     public DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("redis_1", REDIS_PORT)
-            .withExposedService("db_1", 3306)
-            ;
+        .withExposedService("redis_1", REDIS_PORT)
+        .withExposedService("db_1", 3306);
 
     @Override
     protected DockerComposeContainer getEnvironment() {
@@ -33,4 +38,19 @@ public void testGetServicePort() {
         assertNotNull("Port is set for service with instance number", serviceWithoutInstancePort);
         assertEquals("Service ports are the same", serviceWithInstancePort, serviceWithoutInstancePort);
     }
+
+    @Test
+    public void shouldRetrieveContainerByServiceName() {
+        String existingServiceName = "db_1";
+        Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
+        assertTrue(format("Container should be found by service name %s", existingServiceName), result.isPresent());
+        assertEquals("Mapped port for result container was wrong, probably wrong container found", result.get().getExposedPorts(), singletonList(3306));
+    }
+
+    @Test
+    public void shouldReturnEmptyResultOnNoneExistingService() {
+        String notExistingServiceName = "db_256";
+        Optional<ContainerState> result = environment.getContainerByServiceName(notExistingServiceName);
+        assertFalse(format("No container should be found under service name %s", notExistingServiceName), result.isPresent());
+    }
 }

From 2e9adb94ec09c074c43984e14e710daf9d1d6c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20=C5=A0m=C3=ADd?= <bedla.czech@gmail.com>
Date: Sun, 9 Feb 2020 20:34:02 +0100
Subject: [PATCH 0525/4969] checkMountableFile on Windows (#2296)

---
 .../java/org/testcontainers/utility/MountableFile.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 22939b0e1fd..7b7367b9290 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -242,7 +242,11 @@ private String extractClassPathResourceToTempLocation(final String hostPath) {
         // Mark temporary files/dirs for deletion at JVM shutdown
         deleteOnExit(tmpLocation.toPath());
 
-        return tmpLocation.getAbsolutePath();
+        try {
+            return tmpLocation.getCanonicalPath();
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     private File createTempDirectory() {
@@ -371,8 +375,8 @@ public static int getUnixFileMode(final Path path) {
         try {
             int unixMode = (int) Files.readAttributes(path, "unix:mode").get("mode");
             // Truncate mode bits for z/OS
-            if ("OS/390".equals(SystemUtils.OS_NAME) || 
-                "z/OS".equals(SystemUtils.OS_NAME) || 
+            if ("OS/390".equals(SystemUtils.OS_NAME) ||
+                "z/OS".equals(SystemUtils.OS_NAME) ||
                 "zOS".equals(SystemUtils.OS_NAME) ) {
                 unixMode &= TarConstants.MAXID;
                 unixMode |= Files.isDirectory(path) ? 040000 : 0100000;

From f99de58845c77e8ca1982ef555b598215c24e217 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:20:29 +0000
Subject: [PATCH 0526/4969] =?UTF-8?q?Bump=20aws-java-sdk-logs=20from=201.1?=
 =?UTF-8?q?1.718=20to=201.11.722=20in=20/modules/lo=E2=80=A6=20(#2353)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.718 to 1.11.722.
- [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.718...1.11.722)

Signed-off-by: dependabot-preview[bot] <support@dependabot.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 c1c12257baa..2bdf076a68c 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.718'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.722'
 }

From 4d28d29ffddccc72aa939e6780358832f32bc1bf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:20:34 +0000
Subject: [PATCH 0527/4969] Bump tomcat-jdbc from 9.0.30 to 9.0.31 in
 /modules/mysql (#2344)

Bumps tomcat-jdbc from 9.0.30 to 9.0.31.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 43867df521a..11c522197b7 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.19'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.31'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From 5364d699adedcfdf98668319a51affa6aa677c1d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:20:42 +0000
Subject: [PATCH 0528/4969] Bump tomcat-jdbc from 9.0.30 to 9.0.31 in
 /modules/mariadb (#2343)

Bumps tomcat-jdbc from 9.0.30 to 9.0.31.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 c7d1dc96676..c479824ae47 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.4'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.31'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From f242e290b65ced9ef67dc056540fa55077e3bd24 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:20:47 +0000
Subject: [PATCH 0529/4969] Bump postgresql from 42.2.9 to 42.2.10 in /examples
 (#2338)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.9 to 42.2.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.9...REL42.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 f1977ea2c0b..081b2ac04fa 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:3.14.6'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.9'
+    testImplementation 'org.postgresql:postgresql:42.2.10'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From 7c8e0ea62ce648b7b75dbdf05263c251284e800b Mon Sep 17 00:00:00 2001
From: nshipyakov <58605486+nshipyakov@users.noreply.github.com>
Date: Sun, 16 Feb 2020 23:48:23 +0300
Subject: [PATCH 0530/4969] Kafka: replace deprecated poll method millis param
 with Duration (#2318)

---
 .../java/org/testcontainers/containers/KafkaContainerTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index add8b2b171d..1490caa3328 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -13,6 +13,7 @@
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -100,7 +101,7 @@ protected void testKafkaFunctionality(String bootstrapServers) throws Exception
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
 
             Unreliables.retryUntilTrue(10, TimeUnit.SECONDS, () -> {
-                ConsumerRecords<String, String> records = consumer.poll(100);
+                ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
 
                 if (records.isEmpty()) {
                     return false;

From c7642e581f449fb5bf466a3a74e030be6f57c666 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 16 Feb 2020 20:49:06 +0000
Subject: [PATCH 0531/4969] =?UTF-8?q?Bump=20elasticsearch-rest-client=20fr?=
 =?UTF-8?q?om=207.5.2=20to=207.6.0=20in=20/modules/=E2=80=A6=20(#2347)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.5.2 to 7.6.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.5.2...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 41d5b0f27ab..17c34818a82 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.2"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.0"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From edb54a6bd9fa85fbba748dfe11837ab9c7e31ccb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 16 Feb 2020 20:49:39 +0000
Subject: [PATCH 0532/4969] Bump commons-compress from 1.19 to 1.20 in /core
 (#2337)

Bumps commons-compress from 1.19 to 1.20.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 25aaa396a60..ab9b92115e9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -60,7 +60,7 @@ dependencies {
     compile 'org.slf4j:slf4j-api:1.7.30'
     compile 'org.jetbrains:annotations:17.0.0'
     compile 'javax.annotation:javax.annotation-api:1.3.2'
-    compile 'org.apache.commons:commons-compress:1.19'
+    compile 'org.apache.commons:commons-compress:1.20'
     // Added for JDK9 compatibility since it's missing this package
     compile 'javax.xml.bind:jaxb-api:2.3.1'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {

From 573a6222d4a82b24c2d18883a21631d2108d9252 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 16 Feb 2020 20:51:17 +0000
Subject: [PATCH 0533/4969] Bump okhttp from 3.14.4 to 3.14.6 in /core (#2243)

Bumps [okhttp](https://github.com/square/okhttp) from 3.14.4 to 3.14.6.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/docs/changelog_3x.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.4...parent-3.14.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ab9b92115e9..1f76589a64f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -97,7 +97,7 @@ dependencies {
 
     shaded "org.yaml:snakeyaml:1.25"
 
-    shaded 'com.squareup.okhttp3:okhttp:3.14.4'
+    shaded 'com.squareup.okhttp3:okhttp:3.14.6'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 6f7b17a9717bb600eccd839b2d84566392e7d999 Mon Sep 17 00:00:00 2001
From: pertu <pertuleha@gmail.com>
Date: Sun, 16 Feb 2020 20:53:09 +0000
Subject: [PATCH 0534/4969] Set sourceJar.from=allSource for modules/spock
 (#2281)

Fixes issue #2280
By default, sourceJar.from = allJava (see gradle/publishing.gradle)
But Spock module is in Groovy
  => sourceJar.from should be allGroovy/allSource

Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/spock/build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index c7b51cc9c5f..074711d8bda 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,3 +16,9 @@ dependencies {
     testRuntime 'org.postgresql:postgresql:42.2.10'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
 }
+
+sourceJar {
+    /* allJava is default (see gradle/publishing.gradle:sourceJar)
+       allSource contains both .java and .groovy files */
+    from sourceSets.main.allSource
+}

From 6ec63f863f760e4e4b31965695834622dbcde505 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Mon, 24 Feb 2020 14:19:35 +0100
Subject: [PATCH 0535/4969] Prune images between module checks (#2376)

---
 azure-pipelines.yml |  4 +---
 build.gradle        | 11 +++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4b060c5fcea..68330550ee1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,9 +37,7 @@ jobs:
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
-        options: '--continue -x testcontainers:check -x jdbc-test:check'
+        options: '--continue -x testcontainers:check -x jdbc-test:check -PpostCheckCommand="docker image prune -af"'
         tasks: 'check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
-
-
diff --git a/build.gradle b/build.gradle
index bac06d64052..c8b2267a049 100644
--- a/build.gradle
+++ b/build.gradle
@@ -71,6 +71,17 @@ subprojects {
     // Ensure that Javadoc generation is always tested
     check.dependsOn(javadoc)
 
+    def postCheckCommand = properties["postCheckCommand"]
+    if (postCheckCommand) {
+        check.finalizedBy(tasks.create("postCheckExec", Exec) {
+            if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+                commandLine('cmd', '/c', postCheckCommand)
+            } else {
+                commandLine('sh', '-c', postCheckCommand)
+            }
+        })
+    }
+
     javadoc {
         dependsOn delombok
         source = delombok.outputs

From b262a20c5c71ec56d8f05f0269bbfec054754606 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 28 Feb 2020 09:53:31 +0000
Subject: [PATCH 0536/4969] =?UTF-8?q?Adding=20Windows=20Subsystem=20for=20?=
 =?UTF-8?q?Linux=20section=20to=20the=20windows=20docum=E2=80=A6=20(#2282)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Luis Miguel Mejía Suárez <luis.miguel.mejia@hotmail.com>
Co-authored-by: Richard North <rich.north@gmail.com>

Co-authored-by: Luis Miguel Mejía Suárez <BalmungSan@users.noreply.github.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/contributing.md                         |  6 +++---
 docs/supported_docker_environment/index.md   |  1 +
 docs/supported_docker_environment/windows.md | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/docs/contributing.md b/docs/contributing.md
index 70cd452b143..7d87945c704 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -4,9 +4,9 @@
 * Join our [Slack group](http://slack.testcontainers.org)
 * [Post an issue](https://github.com/testcontainers/testcontainers-java/issues) if you find any bugs
 * Contribute improvements or fixes using a [Pull Request](https://github.com/testcontainers/testcontainers-java/pulls). If you're going to contribute, thank you! Please just be sure to:
-    * discuss with the authors on an issue ticket prior to doing anything big
-    * follow the style, naming and structure conventions of the rest of the project
-    * make commits atomic and easy to merge
+    * discuss with the authors on an issue ticket prior to doing anything big.
+    * follow the style, naming and structure conventions of the rest of the project.
+    * make commits atomic and easy to merge.
     * when updating documentation, please see [our guidance for documentation contributions](contributing_docs.md).
     * verify all tests are passing. Build the project with `./gradlew check` to do this.
     **N.B.** Gradle's Build Cache is enabled by default, but you can add `--no-build-cache` flag to disable it.
diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 3477275c2f2..7622a5051cd 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -12,6 +12,7 @@
 | Mac OS X - Docker for Mac      | 1.12.0          | *Support is best-efforts at present*. `getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
 | Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                                                                                                                                                                               |
 | Windows - Docker for Windows   |                             | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md)                                                                                                                                                                                                                                                                                                                                        |
+| Windows - Windows Subsystem for Linux (WSL) | Docker v17.06                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md). |
 
 ## Docker environment discovery
 
diff --git a/docs/supported_docker_environment/windows.md b/docs/supported_docker_environment/windows.md
index b35ee1aa2ee..6365456b095 100644
--- a/docs/supported_docker_environment/windows.md
+++ b/docs/supported_docker_environment/windows.md
@@ -23,6 +23,25 @@ effort.
 
 * WCOW is currently not supported, since Testcontainers uses auxiliary Linux containers for certain tasks and Docker for Windows does not support hybrid engine mode at the time of writing.
 
+## Windows Subsystem for Linux
+
+Testcontainers supports communicating with Docker for Windows within the Windows Subsystem for Linux *([**WSL**](https://docs.microsoft.com/en-us/windows/wsl/about))*.
+The following additional configurations steps are required:
+
++ Expose the Docker for Windows daemon on tcp port `2375` without **TLS**.
+  *(Right-click the Docker for Windows icon on the task bar, click setting and go to `General`)*.
+
++ Set the `DOCKER_HOST` environment variable inside the **WSL** shell to `tcp://localhost:2375`.
+  It is recommended to add this to your `~/.bashrc` file, so it’s available every time you open your terminal.
+
++ **Optional** - Only if volumes are required:  
+  Inside the **WSL** shell, modify the `/ect/wsl.conf` file to mount the Windows drives on `/` instead of on `/mnt/`.
+  *(Reboot required after this step)*.  
+  Remember to share the drives, on which you will store your volumes, with Docker for Windows.
+  *(Right-click the Docker for Windows icon on the task bar, click setting and go to `Shared Drives`)*.
+
+More information about running Docker within the **WSL** can be found [here](https://nickjanetakis.com/blog/setting-up-docker-for-windows-and-wsl-to-work-flawlessly).
+
 ## Reporting issues
 
 Please report any issues with the Windows build of Testcontainers [here](https://github.com/testcontainers/testcontainers-java/issues)

From df48901ed2783ff582ddabd6eb94279e21fd74ab Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 4 Mar 2020 22:24:55 +0100
Subject: [PATCH 0537/4969] Idiomatize testcontainer object creation in kotlin
 example (#1964)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../kotlin/com/example/redis/AbstractIntegrationTest.kt    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
index dc8b0bf9e68..6350ace9bd9 100644
--- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
@@ -17,11 +17,8 @@ import org.testcontainers.containers.GenericContainer
 abstract class AbstractIntegrationTest {
 
     companion object {
-        val redisContainer = object : GenericContainer<Nothing>("redis:3-alpine") {
-            init {
-                withExposedPorts(6379)
-            }
-        }
+        val redisContainer = GenericContainer<Nothing>("redis:3-alpine")
+                .apply { withExposedPorts(6379) }
     }
 
     internal class Initializer : ApplicationContextInitializer<ConfigurableApplicationContext> {

From 0981d275c10769f237aa0a5f75386851ee971bf4 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 15:07:39 +0000
Subject: [PATCH 0538/4969] Bump mockito-core from 3.2.4 to 3.3.0 in
 /modules/junit-jupiter (#2372)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.4 to 3.3.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.2.4...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 b01333b5ec9..7f6d4533509 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
-    testCompile ('org.mockito:mockito-core:3.2.4') {
+    testCompile ('org.mockito:mockito-core:3.3.0') {
         exclude(module: 'hamcrest-core')
     }
 

From 7b4f3810d0e5b80123fa2c81fe79b64161232be5 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 15:08:13 +0000
Subject: [PATCH 0539/4969] =?UTF-8?q?Bump=20org.springframework.boot=20fro?=
 =?UTF-8?q?m=202.2.4.RELEASE=20to=202.2.5.RELEA=E2=80=A6=20(#2387)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.2.4.RELEASE to 2.2.5.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.2.4.RELEASE...v2.2.5.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 db570bf67ac..c9bed8d1467 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.2.4.RELEASE'
+    id 'org.springframework.boot' version '2.2.5.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 49052847de1..bd9cc9e95f2 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.2.4.RELEASE'
+    id 'org.springframework.boot' version '2.2.5.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From f8a6fa0c818987e4ab2656417eeac4c9982f773c Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 15:08:22 +0000
Subject: [PATCH 0540/4969] Bump java-client from 2.7.12 to 2.7.13 in
 /modules/couchbase (#2397)

Bumps [java-client](https://github.com/couchbase/couchbase-java-client) from 2.7.12 to 2.7.13.
- [Release notes](https://github.com/couchbase/couchbase-java-client/releases)
- [Commits](https://github.com/couchbase/couchbase-java-client/compare/2.7.12...2.7.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index d6a7e51681e..66f29fc4718 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.12'
+    compile 'com.couchbase.client:java-client:2.7.13'
 
     testCompile project(':test-support')
 }

From e6ee290f39f552c91edbc5c4cdc28c1bb44a18c4 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 15:08:38 +0000
Subject: [PATCH 0541/4969] =?UTF-8?q?Bump=20aws-java-sdk-logs=20from=201.1?=
 =?UTF-8?q?1.722=20to=201.11.737=20in=20/modules/lo=E2=80=A6=20(#2399)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.722 to 1.11.737.
- [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.722...1.11.737)

Signed-off-by: dependabot-preview[bot] <support@dependabot.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 2bdf076a68c..49e586b19f7 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.722'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.737'
 }

From 832c6e0ecf861d22a87bdd1760d22e9c74f64993 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 15:08:51 +0000
Subject: [PATCH 0542/4969] =?UTF-8?q?Bump=20elasticsearch-rest-client=20fr?=
 =?UTF-8?q?om=207.6.0=20to=207.6.1=20in=20/modules/=E2=80=A6=20(#2401)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.6.0 to 7.6.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.6.0...v7.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 17c34818a82..75697344874 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.1"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From f43e799cea8d6ae4aa22927f773b8d0ae5926fc8 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 15:09:56 +0000
Subject: [PATCH 0543/4969] Bump mockito-core from 3.2.4 to 3.3.0 in /core
 (#2370)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.4 to 3.3.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.2.4...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1f76589a64f..5040a487f50 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'com.rabbitmq:amqp-client:5.8.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.1'
-    testCompile ('org.mockito:mockito-core:3.2.4') {
+    testCompile ('org.mockito:mockito-core:3.3.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 16e9be99861da40edaab78f45b524102af6049f2 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 21:04:30 +0000
Subject: [PATCH 0544/4969] #1975: add example for Cassandra module (#2210)

---
 docs/modules/databases/cassandra.md | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index 0d9a52a0166..d15304afa81 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -1,5 +1,38 @@
 # Cassandra Module
 
+## Usage example
+
+This example connects to the Cassandra Cluster, creates a keyspaces and asserts that is has been created.
+
+```java tab="JUnit 4 example"
+public class SomeTest {
+
+    @Rule
+    public CassandraContainer cassandra = new CassandraContainer();
+
+
+    @Test
+    public void test(){
+        Cluster cluster = cassandra.getCluster();
+
+        try(Session session = cluster.connect()) {
+
+            session.execute("CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                    "{'class':'SimpleStrategy','replication_factor':'1'};");
+
+            List<KeyspaceMetadata> keyspaces = session.getCluster().getMetadata().getKeyspaces();
+            List<KeyspaceMetadata> filteredKeyspaces = keyspaces
+                    .stream()
+                    .filter(km -> km.getName().equals("test"))
+                    .collect(Collectors.toList());
+
+            assertEquals(1, filteredKeyspaces.size());
+        }
+    }
+
+}
+```
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:

From bf187bb83cb76df9c65f66bc335080d18d5256fe Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Mar 2020 22:58:18 +0000
Subject: [PATCH 0545/4969] Fix missing link to OrientDB in docs and update
 version

---
 mkdocs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index f66f382ccb0..49876885dfd 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -52,6 +52,7 @@ nav:
                 - modules/databases/mysql.md
                 - modules/databases/neo4j.md
                 - modules/databases/oraclexe.md
+                - modules/databases/orientdb.md
                 - modules/databases/postgres.md
                 - modules/databases/presto.md
           - modules/docker_compose.md
@@ -85,4 +86,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.12.5
+    latest_version: 1.13.0

From b437227a065e0bc1ff5f58e6bd88fbaef9b58343 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 10 Mar 2020 07:32:17 +0100
Subject: [PATCH 0546/4969] Fix internal port check when other ports are opened
 as well on the target container (#2363)

* Remove redundant execCreateCmd call

This one is never used and probably causes some garbage on the docker side.

* Allow leading zeros in /proc/net/tcp* when doing internal port listen check

When at least one process is listening for a port that is significantly
higher then the port we're checking, this check will fail as the checked
port will contain leading zeros in the output of "cat /proc/net/tcp".

This commit fixes this by changing the grep to ":0*XXX".

* Surround grep parameter with '

Otherwise unnecessary shell expansion is tried

* Refactor/Rewrite InternalCommandPortListeningCheckTest to test all possible checks

This commit refactors InternalCommandPortListeningCheckTest to work with
3 different nginx based containers, each being able to only succeed one of
the 3 tests performed in InternalCommandPortListeningCheck. Each test is
now executed agains all 3 containers to ensure that all tests work as
expected.

* Add test for low+high ports

This test should fail without the leading zeros fix found a few commits
before this one.

* Check for bash existence instead of only mentioning it in a comment

* Rename nginx_on_8080.conf to nginx.conf

It's not only port 8080 anymore, so better not have it in the name.

* Make container a @Rule again by moving initialization into contructor

* Wait a few seconds for InternalCommandPortListeningCheck to pass
---
 .../containers/ExecInContainerPattern.java    |  4 --
 .../InternalCommandPortListeningCheck.java    |  2 +-
 ...InternalCommandPortListeningCheckTest.java | 55 ++++++++++++++++---
 .../Dockerfile-bash                           | 11 ++++
 .../Dockerfile-nc                             |  9 +++
 .../Dockerfile-tcp                            |  9 +++
 .../internal-port-check-dockerfile/nginx.conf |  8 +++
 core/src/test/resources/nginx_on_8080.conf    |  5 --
 8 files changed, 86 insertions(+), 17 deletions(-)
 create mode 100644 core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash
 create mode 100644 core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc
 create mode 100644 core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp
 create mode 100644 core/src/test/resources/internal-port-check-dockerfile/nginx.conf
 delete mode 100644 core/src/test/resources/nginx_on_8080.conf

diff --git a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
index 3d0f4c2c360..359065d732b 100644
--- a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
+++ b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
@@ -66,10 +66,6 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
 
         DockerClient dockerClient = DockerClientFactory.instance().client();
 
-        dockerClient
-            .execCreateCmd(containerId)
-            .withCmd(command);
-
         log.debug("{}: Running \"exec\" command: {}", containerName, String.join(" ", command));
         final ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(containerId)
             .withAttachStdout(true).withAttachStderr(true).withCmd(command).exec();
diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index 2013ddc4d9c..9b4be81b4c4 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -29,7 +29,7 @@ public Boolean call() {
         for (int internalPort : internalPorts) {
             command += " && ";
             command += " (";
-            command += format("cat /proc/net/tcp* | awk '{print $2}' | grep -i :%x", internalPort);
+            command += format("cat /proc/net/tcp* | awk '{print $2}' | grep -i ':0*%x'", internalPort);
             command += " || ";
             command += format("nc -vz -w 1 localhost %d", internalPort);
             command += " || ";
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
index bee4f0a231a..00c0bc9d1ef 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
@@ -3,23 +3,47 @@
 import com.google.common.collect.ImmutableSet;
 import org.junit.Rule;
 import org.junit.Test;
-import org.testcontainers.containers.BindMode;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.rnorth.ducttape.TimeoutException;
+import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
 
+import java.util.concurrent.TimeUnit;
+
+import static java.util.Arrays.asList;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
+@RunWith(Parameterized.class)
 public class InternalCommandPortListeningCheckTest {
 
-    // Linking a custom configuration into the container so that nginx is listening on port 8080. This is necessary to prove
-    // that the command formatting uses the correct casing for hexadecimal numbers (i.e. 1F90 and not 1f90).
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"internal-port-check-dockerfile/Dockerfile-tcp"},
+                {"internal-port-check-dockerfile/Dockerfile-nc"},
+                {"internal-port-check-dockerfile/Dockerfile-bash"},
+            });
+    }
+
     @Rule
-    public GenericContainer nginx = new GenericContainer<>("nginx:1.9.4")
-            .withClasspathResourceMapping("nginx_on_8080.conf", "/etc/nginx/conf.d/default.conf", BindMode.READ_ONLY);
+    public GenericContainer container;
+
+    public InternalCommandPortListeningCheckTest(String dockerfile) {
+        container = new GenericContainer(new ImageFromDockerfile()
+            .withFileFromClasspath("Dockerfile", dockerfile)
+            .withFileFromClasspath("nginx.conf", "internal-port-check-dockerfile/nginx.conf")
+        );
+    }
 
     @Test
     public void singleListening() {
-        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(nginx, ImmutableSet.of(8080));
+        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(container, ImmutableSet.of(8080));
+
+        Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
 
         final Boolean result = check.call();
 
@@ -28,10 +52,27 @@ public void singleListening() {
 
     @Test
     public void nonListening() {
-        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(nginx, ImmutableSet.of(8080, 1234));
+        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(container, ImmutableSet.of(8080, 1234));
+
+        try {
+            Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
+        } catch (TimeoutException e) {
+            // we expect it to timeout
+        }
 
         final Boolean result = check.call();
 
         assertFalse("InternalCommandPortListeningCheck detects a non-listening port among many", result);
     }
+
+    @Test
+    public void lowAndHighPortListening() {
+        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(container, ImmutableSet.of(100, 8080));
+
+        Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
+
+        final Boolean result = check.call();
+
+        assertTrue("InternalCommandPortListeningCheck identifies a low and a high port", result);
+    }
 }
diff --git a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash
new file mode 100644
index 00000000000..02373da980e
--- /dev/null
+++ b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash
@@ -0,0 +1,11 @@
+FROM nginx:1.17-alpine
+
+RUN apk add bash
+
+# Make sure the /proc/net/tcp* check fails in this container
+RUN rm /usr/bin/awk
+
+# Make sure the nc check fails in this container
+RUN rm /usr/bin/nc
+
+ADD nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc
new file mode 100644
index 00000000000..f69b74a8754
--- /dev/null
+++ b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc
@@ -0,0 +1,9 @@
+FROM nginx:1.17-alpine
+
+# If this fails, you ended up using a base image with bash installed. Consider removing /bin/bash in this case
+RUN if bash -c true &> /dev/null; then exit 1; fi
+
+# Make sure the /proc/net/tcp* check fails in this container
+RUN rm /usr/bin/awk
+
+ADD nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp
new file mode 100644
index 00000000000..8699db537aa
--- /dev/null
+++ b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp
@@ -0,0 +1,9 @@
+FROM nginx:1.17-alpine
+
+# If this fails, you ended up using a base image with bash installed. Consider removing /bin/bash in this case
+RUN if bash -c true &> /dev/null; then exit 1; fi
+
+# Make sure the nc check fails in this container
+RUN rm /usr/bin/nc
+
+ADD nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/core/src/test/resources/internal-port-check-dockerfile/nginx.conf b/core/src/test/resources/internal-port-check-dockerfile/nginx.conf
new file mode 100644
index 00000000000..f69ddf345cf
--- /dev/null
+++ b/core/src/test/resources/internal-port-check-dockerfile/nginx.conf
@@ -0,0 +1,8 @@
+# This configuration makes Nginx listen on port port 8080
+
+server {
+    # Port 8080 is necessary to prove that the command formatting in the /proc/net/tcp* check uses the correct casing for hexadecimal numbers (i.e. 1F90 and not 1f90)
+    listen       8080;
+    # Port 100 is necessary to ensure that the /proc/net/tcp* check also succeeds with trailing zeros in the hexadecimal port
+    listen       100;
+}
diff --git a/core/src/test/resources/nginx_on_8080.conf b/core/src/test/resources/nginx_on_8080.conf
deleted file mode 100644
index c7927d46265..00000000000
--- a/core/src/test/resources/nginx_on_8080.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This configuration makes Nginx listen on port port 8080
-
-server {
-    listen       8080;
-}
\ No newline at end of file

From 16fda4216018d94f2bf9c20379d3a3573050a06c Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Tue, 10 Mar 2020 07:35:28 +0100
Subject: [PATCH 0547/4969] Fix invalid connection URLs returned by
 PostgreSQLContainer (fixes #1976) (#2049)

* Reproduce #1976 in tests

* Override constructUrlForConnection for PostgreSQLContainer

* Lighten PostgreSQLConnectionURLTest

* Lighten PostgreSQLConnectionURLTest

* Cater for base URLs without query strings
---
 .../containers/PostgreSQLContainer.java       | 22 +++++-
 .../PostgreSQLConnectionURLTest.java          | 68 +++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 85ad910aa17..cef66d0c492 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -7,6 +7,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import static java.lang.String.format;
 import static java.time.temporal.ChronoUnit.SECONDS;
 
 /**
@@ -24,6 +25,8 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
 
     private static final String FSYNC_OFF_OPTION = "fsync=off";
 
+    private static final String QUERY_PARAM_SEPARATOR = "&";
+
     public PostgreSQLContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
@@ -59,7 +62,24 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         // Disable Postgres driver use of java.util.logging to reduce noise at startup time
-        return "jdbc:postgresql://" + getContainerIpAddress() + ":" + getMappedPort(POSTGRESQL_PORT) + "/" + databaseName + "?loggerLevel=OFF";
+        return format("jdbc:postgresql://%s:%d/%s?loggerLevel=OFF", getContainerIpAddress(), getMappedPort(POSTGRESQL_PORT), databaseName);
+    }
+
+    @Override
+    protected String constructUrlForConnection(String queryString) {
+        String baseUrl = getJdbcUrl();
+
+        if ("".equals(queryString)) {
+            return baseUrl;
+        }
+
+        if (!queryString.startsWith("?")) {
+            throw new IllegalArgumentException("The '?' character must be included");
+        }
+
+        return baseUrl.contains("?")
+            ? baseUrl + QUERY_PARAM_SEPARATOR + queryString.substring(1)
+            : baseUrl + queryString;
     }
 
     @Override
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
new file mode 100644
index 00000000000..ec6a8756cab
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -0,0 +1,68 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+
+public class PostgreSQLConnectionURLTest {
+
+    @Test
+    public void shouldCorrectlyAppendQueryString() {
+        PostgreSQLContainer postgres = new FixedJdbcUrlPostgreSQLContainer();
+        String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
+        String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
+
+        assertTrue("Query String contains expected params", queryString.contains("&stringtype=unspecified&stringtype=unspecified"));
+        assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
+        assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
+    }
+
+    @Test
+    public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
+        PostgreSQLContainer postgres = new NoParamsUrlPostgreSQLContainer();
+        String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
+        String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
+
+        assertTrue("Query String contains expected params", queryString.contains("?stringtype=unspecified&stringtype=unspecified"));
+        assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
+        assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
+    }
+
+    @Test
+    public void shouldReturnOriginalURLWhenEmptyQueryString() {
+        PostgreSQLContainer postgres = new FixedJdbcUrlPostgreSQLContainer();
+        String connectionUrl = postgres.constructUrlForConnection("");
+
+        assertTrue("Query String remains unchanged", postgres.getJdbcUrl().equals(connectionUrl));
+    }
+
+    @Test
+    public void shouldRejectInvalidQueryString() {
+        assertThrows("Fails when invalid query string provided", IllegalArgumentException.class,
+            () -> new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified"));
+    }
+
+    static class FixedJdbcUrlPostgreSQLContainer extends PostgreSQLContainer {
+
+        @Override
+        public String getContainerIpAddress() {
+            return "localhost";
+        }
+
+        @Override
+        public Integer getMappedPort(int originalPort) {
+            return 34532;
+        }
+    }
+
+    static class NoParamsUrlPostgreSQLContainer extends PostgreSQLContainer {
+
+        @Override
+        public String getJdbcUrl() {
+            return "jdbc:postgresql://host:port/database";
+        }
+    }
+}

From 7d5f4c9e35b5d671f24125395aed3f741f6c3d9e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 12 Mar 2020 21:14:19 +0100
Subject: [PATCH 0548/4969] Update to docker-java 3.2.0 (#2297)

* Test new `docker-java` module

* global Jitpack repo

* update to the current master of docker-java

* try docker-java-core

* use 3.2.0-rc1

* update to docker-java 3.2.0-rc2

* remove unnecessary dependency

* Update to docker-java 3.2.0-rc3, use their okhttp cmd factory

* post-merge fixes

* Update to docker-java 3.2.0-rc4

* fix JarFileShadingTest

* Add japicmp task

* Update to 3.2.0-rc5

* postpone shading changes

* reduce the changeset

* do not run japicmp on Windows

* try running modules' tests without the checks

* split module runs

* fix the tasks list

* fix the tasks list (2)

* do not disable the checks

* try `postCheckCommand`

* make `postCheckCommand` optional

* Update azure-pipelines.yml

* Update to docker-java 3.2.0

* restore `postCheckCommand`
---
 core/build.gradle                             | 66 ++++++++++++++++---
 .../testcontainers/JarFileShadingTest.java    |  1 -
 .../testcontainers/PublicBinaryAPITest.java   | 12 ++++
 .../containers/GenericContainer.java          |  8 +--
 .../containers/VncRecordingContainer.java     |  5 +-
 .../AuditLoggingDockerClient.java             |  3 +
 .../dockerclient/DockerClientConfigUtils.java |  9 ++-
 .../DockerClientProviderStrategy.java         |  9 ++-
 .../NpipeSocketClientProviderStrategy.java    | 13 +---
 .../AuthDelegatingDockerClientConfig.java     |  3 +
 .../okhttp/NamedPipeSocketFactory.java        |  4 ++
 .../okhttp/OkHttpDockerCmdExecFactory.java    | 12 +++-
 .../transport/okhttp/OkHttpWebTarget.java     |  8 +--
 .../transport/okhttp/UnixSocketFactory.java   |  4 ++
 ...eLimitedLoggedPullImageResultCallback.java |  5 +-
 .../couchbase/CouchbaseContainer.java         |  3 +-
 .../containers/KafkaContainer.java            |  3 +-
 17 files changed, 123 insertions(+), 45 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 5040a487f50..0d452f5cc1d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,3 +1,18 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        // https://github.com/melix/japicmp-gradle-plugin/issues/36
+        classpath 'com.google.guava:guava:28.2-jre'
+    }
+}
+
+plugins {
+    id 'me.champeau.gradle.japicmp' version '0.2.8'
+}
+
 apply plugin: 'com.github.johnrengelman.shadow'
 
 description = "Testcontainers Core"
@@ -9,6 +24,7 @@ sourceSets {
 idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs
 
 configurations {
+    baseline
     shaded
     [runtime, compileOnly, testCompile]*.extendsFrom shaded
 }
@@ -55,7 +71,47 @@ task jarFileTest(type: Test) {
 }
 project.tasks.check.dependsOn(jarFileTest)
 
+task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
+    dependsOn(tasks.shadowJar)
+
+    oldClasspath = configurations.baseline
+    newClasspath = shadowJar.outputs.files
+    ignoreMissingClasses = true
+
+    accessModifier = "protected"
+    failOnModification = true
+    failOnSourceIncompatibility = true
+
+    // TODO cleanup excludes after we release the version based on docker-java 3.2.0
+
+    packageExcludes = [
+        "com.github.dockerjava.*",
+        "org.testcontainers.shaded.*",
+    ]
+
+    classExcludes = [
+        // 'METHOD_REMOVED_IN_SUPERCLASS'
+        "org.testcontainers.containers.output.FrameConsumerResultCallback",
+        "org.testcontainers.dockerclient.LogToStringContainerCallback",
+
+        // 'METHOD_RETURN_TYPE_CHANGED', exposed `com.github.dockerjava.core.command.PullImageResultCallback` to the public API
+        "org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback",
+    ]
+
+    onlyBinaryIncompatibleModified = true
+    htmlOutputFile = file("$buildDir/reports/japi.html")
+}
+// do not run on Windows by default
+// TODO investigate zip issue on Windows
+if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+    project.tasks.check.dependsOn(japicmp)
+}
+
 dependencies {
+    baseline 'org.testcontainers:testcontainers:1.12.5', {
+        exclude group: "*", module: "*"
+    }
+
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
     compile 'org.jetbrains:annotations:17.0.0'
@@ -82,15 +138,9 @@ dependencies {
         exclude(group: "net.java.dev.jna")
     }
 
-    shaded ('com.github.docker-java:docker-java:3.1.5') {
-        exclude(group: 'org.glassfish.jersey.core')
-        exclude(group: 'org.glassfish.jersey.connectors')
-        exclude(group: 'org.glassfish.jersey.inject')
-        exclude(group: 'log4j')
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.0') {
+        exclude(group: 'net.java.dev.jna')
         exclude(group: 'com.google.code.findbug')
-        exclude(group: 'com.kohlschutter.junixsocket')
-        exclude(group: 'io.netty')
-        exclude(group: 'org.apache.httpcomponents')
         exclude(group: 'org.slf4j')
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index cf807087d55..587ab6277f6 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -14,7 +14,6 @@ public class JarFileShadingTest extends AbstractJarFileTest {
     @Test
     public void testPackages() throws Exception {
         assertThatFileList(root).containsOnly(
-                "docker-java.properties",
                 "org",
                 "META-INF",
                 "com"
diff --git a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
index 6d995e7e0be..93d1a759096 100644
--- a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
@@ -2,6 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import org.assertj.core.api.Assertions;
+import org.junit.Assume;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -84,6 +86,16 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IO
 
     private final ClassNode classNode;
 
+    @Before
+    public void setUp() {
+        Assume.assumeFalse(classNode.name.startsWith("com.github.dockerjava."));
+        switch (classNode.name) {
+            // TODO should go to docker-java project
+            case "org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig":
+                Assume.assumeTrue(false);
+        }
+    }
+
     @Test
     public void testSuperClass() {
         assertThat(classNode.superName)
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index ee458339d0a..03d03759506 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -20,12 +20,12 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.hash.Hashing;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.SneakyThrows;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
@@ -520,12 +520,12 @@ void checksumFile(File file, Checksum checksum) {
     @SneakyThrows(JsonProcessingException.class)
     final String hash(CreateContainerCmd createCommand) {
         // TODO add Testcontainers' version to the hash
-        String commandJson = new ObjectMapper()
+        byte[] commandJson = new ObjectMapper()
             .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
             .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
-            .writeValueAsString(createCommand);
+            .writeValueAsBytes(createCommand);
 
-        return DigestUtils.sha1Hex(commandJson);
+        return Hashing.sha1().hashBytes(commandJson).toString();
     }
 
     @VisibleForTesting
diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index 1b06215b706..298593a116b 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -5,7 +5,6 @@
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import lombok.ToString;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.unreliables.Unreliables;
@@ -17,6 +16,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.util.Base64;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -112,9 +112,10 @@ public VncRecordingContainer withFrameRate(int frameRate) {
     @Override
     protected void configure() {
         withCreateContainerCmdModifier(it -> it.withEntrypoint("/bin/sh"));
+        String encodedPassword = Base64.getEncoder().encodeToString(vncPassword.getBytes());
         setCommand(
                 "-c",
-                "echo '" + Base64.encodeBase64String(vncPassword.getBytes()) + "' | base64 -d > /vnc_password && " +
+                "echo '" + encodedPassword + "' | base64 -d > /vnc_password && " +
                         "flvrec.py -o " + RECORDING_FILE_NAME + " -d -r " + frameRate + " -P /vnc_password " + targetNetworkAlias + " " + vncPort
         );
     }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
index f982945f9d4..891709e3a0c 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
@@ -15,9 +15,12 @@
 /**
  * Wrapper for {@link DockerClient} to facilitate 'audit logging' of potentially destruction actions using
  * {@link org.testcontainers.utility.AuditLogger}.
+ *
+ * @deprecated should not be used publicly
  */
 @Slf4j
 @SuppressWarnings("unchecked")
+@Deprecated
 public class AuditLoggingDockerClient implements DockerClient {
 
     @Delegate(excludes = InterceptedMethods.class)
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
index d88dc76331f..1060d663d65 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
@@ -7,6 +7,7 @@
 import org.testcontainers.DockerClientFactory;
 
 import java.io.File;
+import java.net.URI;
 import java.util.Optional;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -48,11 +49,15 @@ public class DockerClientConfigUtils {
      */
     @Deprecated
     public static String getDockerHostIpAddress(DockerClientConfig config) {
-        switch (config.getDockerHost().getScheme()) {
+        return getDockerHostIpAddress(config.getDockerHost());
+    }
+
+    public static String getDockerHostIpAddress(URI dockerHost) {
+        switch (dockerHost.getScheme()) {
             case "http":
             case "https":
             case "tcp":
-                return config.getDockerHost().getHost();
+                return dockerHost.getHost();
             case "unix":
             case "npipe":
                 if (IN_A_CONTAINER) {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index aa607964ae5..1c5aea87723 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -2,8 +2,9 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import org.apache.commons.io.IOUtils;
@@ -16,7 +17,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.dockerclient.auth.AuthDelegatingDockerClientConfig;
-import org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.URI;
@@ -172,10 +172,9 @@ public DockerClient getClient() {
     }
 
     protected DockerClient getClientForConfig(DockerClientConfig config) {
-        return DockerClientBuilder
+        return DockerClientImpl
             .getInstance(new AuthDelegatingDockerClientConfig(config))
-            .withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory())
-            .build();
+            .withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory());
     }
 
     protected void ping(DockerClient client, int timeoutInSeconds) {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
index b8d85f11623..329bde36433 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
@@ -8,8 +8,6 @@
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.net.URI;
-
 @Slf4j
 public class NpipeSocketClientProviderStrategy extends DockerClientProviderStrategy {
 
@@ -38,19 +36,12 @@ public void test() throws InvalidConfigurationException {
 
     @NotNull
     private DockerClientConfig tryConfiguration() {
-        URI dockerHost = URI.create(SOCKET_LOCATION);
-
         config = new DelegatingDockerClientConfig(
             DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("tcp://localhost:0")
+                .withDockerHost(SOCKET_LOCATION)
                 .withDockerTlsVerify(false)
                 .build()
-        ) {
-            @Override
-            public URI getDockerHost() {
-                return dockerHost;
-            }
-        };
+        );
         client = getClientForConfig(config);
 
         final int timeout = Integer.parseInt(System.getProperty(PING_TIMEOUT_PROPERTY_NAME, PING_TIMEOUT_DEFAULT));
diff --git a/core/src/main/java/org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig.java b/core/src/main/java/org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig.java
index d75f3ce6bc1..a68605fdfda 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig.java
@@ -14,8 +14,11 @@
  * configuration is obtained. A delegate {@link DockerClientConfig} will be called first
  * to try and obtain auth credentials, but after that {@link RegistryAuthLocator} will be
  * used to try and improve the auth resolution (e.g. using credential helpers).
+ *
+ * @deprecated should not be used publicly, to be moved to docker-java
  */
 @Slf4j
+@Deprecated
 public class AuthDelegatingDockerClientConfig implements DockerClientConfig {
 
     @Delegate(excludes = DelegateExclusions.class)
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
index d150eedb6a5..d26e2977318 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
@@ -13,6 +13,10 @@
 import java.net.SocketAddress;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * @deprecated use com.github.docker-java:docker-java-transport-okhttp
+ */
+@Deprecated
 @Value
 @EqualsAndHashCode(callSuper = false)
 public class NamedPipeSocketFactory extends SocketFactory {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java
index 841d012e2b3..4da568834d5 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java
@@ -1,5 +1,6 @@
 package org.testcontainers.dockerclient.transport.okhttp;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -25,11 +26,17 @@
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * @deprecated use com.github.docker-java:docker-java-transport-okhttp
+ */
+@Deprecated
 @Slf4j
 public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
 
     private static final String SOCKET_SUFFIX = ".socket";
 
+    private ObjectMapper objectMapper;
+
     private OkHttpClient okHttpClient;
 
     private HttpUrl baseUrl;
@@ -100,11 +107,14 @@ public void init(DockerClientConfig dockerClientConfig) {
                 baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
         }
         baseUrl = baseUrlBuilder.build();
+
+        objectMapper = dockerClientConfig.getObjectMapper();
     }
 
     @Override
-    protected WebTarget getBaseResource() {
+    protected OkHttpWebTarget getBaseResource() {
         return new OkHttpWebTarget(
+            objectMapper,
             okHttpClient,
             baseUrl,
             ImmutableList.of(),
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java
index 7e12b0b4541..9c360522d20 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.WebTarget;
 import com.google.common.collect.HashMultimap;
@@ -25,8 +24,7 @@
 @Value
 class OkHttpWebTarget implements WebTarget {
 
-    private static final ObjectMapper MAPPER = new ObjectMapper()
-        .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+    ObjectMapper objectMapper;
 
     OkHttpClient okHttpClient;
 
@@ -56,7 +54,7 @@ public InvocationBuilder request() {
         }
 
         return new OkHttpInvocationBuilder(
-            MAPPER,
+            objectMapper,
             okHttpClient,
             baseUrlBuilder.build()
         );
@@ -110,6 +108,6 @@ public OkHttpWebTarget queryParamsJsonMap(String name, Map<String, String> value
         }
 
         // when param value is JSON string
-        return queryParam(name, MAPPER.writeValueAsString(values));
+        return queryParam(name, objectMapper.writeValueAsString(values));
     }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
index 2fbdb936447..d1e55f3e647 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
@@ -15,6 +15,10 @@
 import java.net.Socket;
 import java.net.SocketAddress;
 
+/**
+ * @deprecated use com.github.docker-java:docker-java-transport-okhttp
+ */
+@Deprecated
 @Value
 @EqualsAndHashCode(callSuper = false)
 public class UnixSocketFactory extends SocketFactory {
diff --git a/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
index 20b7de6c666..274eedefded 100644
--- a/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
+++ b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
@@ -47,9 +47,10 @@ public TimeLimitedLoggedPullImageResultCallback(Logger logger) {
     }
 
     @Override
-    public PullImageResultCallback awaitCompletion() throws InterruptedException {
+    public TimeLimitedLoggedPullImageResultCallback awaitCompletion() throws InterruptedException {
         waitingThreads.add(Thread.currentThread());
-        return super.awaitCompletion();
+        super.awaitCompletion();
+        return this;
     }
 
     @Override
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 19583d5a0e4..e43cf8f652d 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -26,7 +26,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.core.command.ExecStartResultCallback;
 import com.google.common.collect.Lists;
 import lombok.*;
 import org.apache.commons.compress.utils.Sets;
@@ -171,7 +170,7 @@ private void startProxy(String networkAlias) {
             .exec();
 
         dockerClient.execStartCmd(createCmdResponse.getId())
-            .exec(new ExecStartResultCallback())
+            .start()
             .awaitCompletion(10, TimeUnit.SECONDS);
     }
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index b0ce047f5d4..5aab0f52ffa 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.core.command.ExecStartResultCallback;
 import lombok.SneakyThrows;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.TestcontainersConfiguration;
@@ -150,7 +149,7 @@ private String startZookeeper() {
             )
             .exec();
 
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(new ExecStartResultCallback()).awaitStarted(10, TimeUnit.SECONDS);
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).start().awaitStarted(10, TimeUnit.SECONDS);
 
         return "localhost:" + ZOOKEEPER_PORT;
     }

From 3f9216ebda2087b3311de979a96918e3ccaefc2d Mon Sep 17 00:00:00 2001
From: MariuszCwikla <47976407+MariuszCwikla@users.noreply.github.com>
Date: Fri, 13 Mar 2020 10:53:36 +0100
Subject: [PATCH 0549/4969] Upgrade localstack to 0.10.8 (#2413)

---
 .../containers/localstack/LocalStackContainer.java              | 2 +-
 .../containers/localstack/LocalstackContainerTest.java          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index e21cc735447..0d8c3627f6c 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -29,7 +29,7 @@
  */
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
-    public static final String VERSION = "0.9.4";
+    public static final String VERSION = "0.10.8";
     private static final String HOSTNAME_EXTERNAL_ENV_VAR = "HOSTNAME_EXTERNAL";
 
     private final List<Service> services = new ArrayList<>();
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 7ad31f6340f..034ff2f0914 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -105,7 +105,6 @@ public void sqsTestOverBridgeNetwork() {
         }
 
         @Test
-        @Ignore("Fails due to https://github.com/localstack/localstack/issues/1434")
         public void cloudWatchLogsTestOverBridgeNetwork() {
             AWSLogs logs = AWSLogsClientBuilder.standard()
                     .withEndpointConfiguration(localstack.getEndpointConfiguration(CLOUDWATCHLOGS))

From 4f8f8b143d6d462257500959be9fa0eb37f2fa12 Mon Sep 17 00:00:00 2001
From: Sandra Parsick <sparsick@users.noreply.github.com>
Date: Wed, 18 Mar 2020 14:02:57 +0100
Subject: [PATCH 0550/4969] Extend docs with registry mirror as workaround for
 custom images (#2452)

Add a link to registry mirror documentation in docker as a possibility when direct usage of docker hub is not allowed

Co-Authored-By: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/features/configuration.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 61500cb9cb5..cd01b99b1c7 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -45,6 +45,9 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **localstack.container.image = localstack/localstack**  
 > Used by LocalStack
 
+Another possibility is to set up a registry mirror in your environment so that all images are pulled from there and not directly from Docker Hub.
+For more information, see the [official Docker documentation about "Registry as a pull through cache"](https://docs.docker.com/registry/recipes/mirror/).
+
 ## Customizing Ryuk resource reaper
 
 > **ryuk.container.image = quay.io/testcontainers/ryuk:0.2.3**

From d4f894f081838de96f0053312b08dc2f9a365a64 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 25 Mar 2020 11:44:09 +0100
Subject: [PATCH 0551/4969] Fallback to `getDefaultGateway()` if "bridge" is
 unavailable. (#2429)

Fixes #2239
---
 .../dockerclient/DockerClientProviderStrategy.java            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 1c5aea87723..c305d56389c 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -218,7 +218,9 @@ static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost) {
                         .filter(it -> it.getGateway() != null)
                         .findAny()
                         .map(Network.Ipam.Config::getGateway)
-                        .orElse("localhost");
+                        .orElseGet(() -> {
+                            return DockerClientConfigUtils.getDefaultGateway().orElse("localhost");
+                        });
                 }
                 return "localhost";
             default:

From 7acb08d6c5c99f94a40998e00fb1db18cc66c061 Mon Sep 17 00:00:00 2001
From: Anton Deriabin <ander.2142@gmail.com>
Date: Wed, 25 Mar 2020 14:00:27 +0300
Subject: [PATCH 0552/4969] Bump Cucucmber example version to 5.5.0 (#2476)

* Bump Cucucmber example version to 5.5.0

* Fixed wrong imports
---
 examples/cucumber/build.gradle                       |  4 ++--
 .../org/testcontainsers/examples/CucumberTest.java   |  4 ++--
 .../java/org/testcontainsers/examples/Stepdefs.java  | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 5d2caed8c2a..52c59229350 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    implementation 'io.cucumber:cucumber-java:4.8.0'
-    testImplementation 'io.cucumber:cucumber-junit:4.8.0'
+    testImplementation 'io.cucumber:cucumber-junit:5.5.0'
+    testImplementation 'io.cucumber:cucumber-java:5.5.0'
     testImplementation 'org.testcontainers:selenium'
 }
diff --git a/examples/cucumber/src/test/java/org/testcontainsers/examples/CucumberTest.java b/examples/cucumber/src/test/java/org/testcontainsers/examples/CucumberTest.java
index df1a449f1a9..0551b4dbf2e 100644
--- a/examples/cucumber/src/test/java/org/testcontainsers/examples/CucumberTest.java
+++ b/examples/cucumber/src/test/java/org/testcontainsers/examples/CucumberTest.java
@@ -1,7 +1,7 @@
 package org.testcontainsers.examples;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
diff --git a/examples/cucumber/src/test/java/org/testcontainsers/examples/Stepdefs.java b/examples/cucumber/src/test/java/org/testcontainsers/examples/Stepdefs.java
index ee3c05d4457..ca70173ae92 100644
--- a/examples/cucumber/src/test/java/org/testcontainsers/examples/Stepdefs.java
+++ b/examples/cucumber/src/test/java/org/testcontainsers/examples/Stepdefs.java
@@ -1,11 +1,11 @@
 package org.testcontainsers.examples;
 
-import cucumber.api.Scenario;
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import io.cucumber.java.Scenario;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;

From a51b1e0d457f652dcd236320b3e089bc2ee0228c Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Thu, 26 Mar 2020 17:36:24 +0100
Subject: [PATCH 0553/4969] Add custom exception message when HealthState not
 present in  response (#2206)

See ##2205
---
 .../org/testcontainers/containers/ContainerState.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 043bae1d52f..ad006aa3b43 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.HealthState;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -89,9 +90,12 @@ default boolean isHealthy() {
 
         try {
             InspectContainerResponse inspectContainerResponse = getCurrentContainerInfo();
-            String healthStatus = inspectContainerResponse.getState().getHealth().getStatus();
+            HealthState health = inspectContainerResponse.getState().getHealth();
+            if (health == null) {
+                throw new RuntimeException("This container's image does not have a healthcheck declared, so health cannot be determined. Either amend the image or use another approach to determine whether containers are healthy.");
+            }
 
-            return healthStatus.equals(STATE_HEALTHY);
+            return STATE_HEALTHY.equals(health.getStatus());
         } catch (DockerException e) {
             return false;
         }

From 682bfac4e45b5a900f9ce9d6ca687af692ed6e8c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 31 Mar 2020 14:41:08 +0200
Subject: [PATCH 0554/4969] Use `@DynamicPropertySource` in the Spring Boot
 example (#2495)

---
 examples/spring-boot/build.gradle                |  2 +-
 .../com/example/AbstractIntegrationTest.java     | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index bd9cc9e95f2..6cd1db0172a 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.2.5.RELEASE'
+    id 'org.springframework.boot' version '2.2.6.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
index 3b092a05ca0..29a1f51ffcc 100644
--- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
@@ -4,6 +4,8 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.testcontainers.containers.GenericContainer;
 
@@ -15,13 +17,13 @@
 @ActiveProfiles("test")
 public abstract class AbstractIntegrationTest {
 
-    static {
-        GenericContainer redis = new GenericContainer("redis:3-alpine")
-            .withExposedPorts(6379);
-        redis.start();
-
-        System.setProperty("spring.redis.host", redis.getContainerIpAddress());
-        System.setProperty("spring.redis.port", redis.getFirstMappedPort() + "");
+    static GenericContainer redis = new GenericContainer("redis:3-alpine")
+        .withExposedPorts(6379);
 
+    @DynamicPropertySource
+    static void redisProperties(DynamicPropertyRegistry registry) {
+        redis.start();
+        registry.add("spring.redis.host", redis::getContainerIpAddress);
+        registry.add("spring.redis.port", redis::getFirstMappedPort);
     }
 }

From 7c635e0c86adf3c88bad081d124ea651736c0738 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:02:26 +0100
Subject: [PATCH 0555/4969] Bump mockito-core from 3.3.0 to 3.3.3 in /core
 (#2439)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.0 to 3.3.3.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.3.0...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 0d452f5cc1d..6b9a1994ebd 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -159,7 +159,7 @@ dependencies {
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'com.rabbitmq:amqp-client:5.8.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.1'
-    testCompile ('org.mockito:mockito-core:3.3.0') {
+    testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 0c02e71a507cdeb106aaf692ccc33bccd5729a6c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:02:35 +0100
Subject: [PATCH 0556/4969] Bump httpclient from 4.5.11 to 4.5.12 in
 /modules/spock (#2411)

Bumps httpclient from 4.5.11 to 4.5.12.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 074711d8bda..19a2a78f1d5 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.2'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
     testRuntime 'org.postgresql:postgresql:42.2.10'
     testRuntime 'mysql:mysql-connector-java:8.0.19'

From ab72e1b07759a292bdd256aa53f274f083aa3339 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:02:44 +0100
Subject: [PATCH 0557/4969] Bump postgresql from 42.2.10 to 42.2.12 in
 /modules/spock (#2502)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.10 to 42.2.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.10...REL42.2.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 19a2a78f1d5..2bcf7431808 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
-    testRuntime 'org.postgresql:postgresql:42.2.10'
+    testRuntime 'org.postgresql:postgresql:42.2.12'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
 }
 

From 7025e3fbdb934962454070b00b6444936c1f9ecd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:03:01 +0100
Subject: [PATCH 0558/4969] =?UTF-8?q?Bump=20elasticsearch-rest-client=20fr?=
 =?UTF-8?q?om=207.6.1=20to=207.6.2=20in=20/modules/=E2=80=A6=20(#2501)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.6.1 to 7.6.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.6.1...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 75697344874..6deaf802112 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.2"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From b3ec8a38a6da5c88b1989ba0d9b3765dcdb44675 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:03:09 +0100
Subject: [PATCH 0559/4969] Bump postgresql from 42.2.10 to 42.2.12 in
 /examples (#2500)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.10 to 42.2.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.10...REL42.2.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 081b2ac04fa..4f9a699504d 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:3.14.6'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.10'
+    testImplementation 'org.postgresql:postgresql:42.2.12'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From b96c84bc2ae71adea293a50015ccd26f520ddb81 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:03:24 +0100
Subject: [PATCH 0560/4969] =?UTF-8?q?Bump=20postgresql=20from=2042.2.10=20?=
 =?UTF-8?q?to=2042.2.12=20in=20/modules/junit-jupit=E2=80=A6=20(#2498)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.10 to 42.2.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.10...REL42.2.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 7f6d4533509..445bdb3586d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntime 'org.postgresql:postgresql:42.2.10'
+    testRuntime 'org.postgresql:postgresql:42.2.12'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }

From 2ef0ef28d39d327d351ad96623191fbcc921b238 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:03:39 +0100
Subject: [PATCH 0561/4969] Bump tomcat-jdbc from 9.0.31 to 9.0.33 in
 /modules/mysql (#2445)

Bumps tomcat-jdbc from 9.0.31 to 9.0.33.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 11c522197b7..da609a1b535 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.19'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.31'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From e4633d827d057e260d2324d7e9103cd1bcc894cd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:03:51 +0100
Subject: [PATCH 0562/4969] Bump mariadb-java-client from 2.5.4 to 2.6.0 in
 /modules/mariadb (#2461)

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.5.4 to 2.6.0.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 c479824ae47..505b67ba9e6 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.4'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.31'

From d64e5790b51e1fdccba86f5c13a8c40b9f3af2a0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:03:57 +0100
Subject: [PATCH 0563/4969] Bump kafka-clients from 2.4.0 to 2.4.1 in
 /modules/kafka (#2424)

Bumps kafka-clients from 2.4.0 to 2.4.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 3960cd96b69..cd6745e1eae 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.4.0'
+    testCompile 'org.apache.kafka:kafka-clients:2.4.1'
     testCompile 'org.assertj:assertj-core:3.15.0'
     testCompile 'com.google.guava:guava:23.0'
 }

From 19d954c2ce08f9e762a52e55491bb4108e5a7c17 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:04:09 +0100
Subject: [PATCH 0564/4969] Bump testng from 7.1.1 to 7.2.0 in /examples
 (#2441)

Bumps [testng](https://github.com/cbeust/testng) from 7.1.1 to 7.2.0.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index efe713d5c0e..1779966c692 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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.1.1'
+    testImplementation 'org.testng:testng:7.2.0'
 }
 
 test {

From b6866be6c29795c9499e73c91b3a8b40b5c9966e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:04:23 +0100
Subject: [PATCH 0565/4969] Bump postgresql from 42.2.10 to 42.2.12 in
 /modules/postgresql (#2499)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.10 to 42.2.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.10...REL42.2.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 9acf9ead2aa..89d40fe6923 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: PostgreSQL"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'org.postgresql:postgresql:42.2.10'
+    testCompile 'org.postgresql:postgresql:42.2.12'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
 }

From 5c2714f55c665bcd9f266b7039d39613f448ae65 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:04:45 +0100
Subject: [PATCH 0566/4969] Bump tomcat-jdbc from 9.0.31 to 9.0.33 in
 /modules/mariadb (#2444)

Bumps tomcat-jdbc from 9.0.31 to 9.0.33.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 505b67ba9e6..be42121f3d8 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.31'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }

From a65789df7b77582f10e5255cc4002f6e5ce4c82e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:04:55 +0100
Subject: [PATCH 0567/4969] Bump okhttp from 3.14.6 to 3.14.7 in /examples
 (#2481)

Bumps [okhttp](https://github.com/square/okhttp) from 3.14.6 to 3.14.7.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/docs/changelog_3x.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.6...parent-3.14.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 4f9a699504d..e7bed23509d 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:3.14.6'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.7'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.12'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From fad1667d53c1832cac79fe9f94a688a05d98a933 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2020 20:05:15 +0100
Subject: [PATCH 0568/4969] Bump rest-assured from 4.2.0 to 4.3.0 in
 /modules/vault (#2440)

Bumps [rest-assured](https://github.com/jayway/rest-assured) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/jayway/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/jayway/rest-assured/compare/rest-assured-4.2.0...rest-assured-4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 1c8a4083b9c..bf85047ddd7 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
-    testCompile 'io.rest-assured:rest-assured:4.2.0'
+    testCompile 'io.rest-assured:rest-assured:4.3.0'
     testCompile 'org.assertj:assertj-core:3.15.0'
 
 }

From 08e13bf2273ef6e2da004644ae7de6051e39ccda Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Sat, 4 Apr 2020 21:37:14 +0200
Subject: [PATCH 0569/4969] Bump Copyrights to 2020 (#2488)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 317bc0c749d..ec5ab97ca12 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,10 @@ See [LICENSE](LICENSE).
 
 ## Copyright
 
-Copyright (c) 2015 - 2019 Richard North and other authors.
+Copyright (c) 2015 - 2020 Richard North and other authors.
 
-MS SQL Server module is (c) 2017 - 2019 G DATA Software AG and other authors.
+MS SQL Server module is (c) 2017 - 2020 G DATA Software AG and other authors.
 
-Hashicorp Vault module is (c) 2017 - 2019 Capital One Services, LLC and other authors.
+Hashicorp Vault module is (c) 2017 - 2020 Capital One Services, LLC and other authors.
 
 See [contributors](https://github.com/testcontainers/testcontainers-java/graphs/contributors) for all contributors.

From 7eced8b44de8bda25c6312e4a08461d9514d9686 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 4 Apr 2020 20:45:58 +0100
Subject: [PATCH 0570/4969] Cache results of auth lookups (#2213)

---
 .../utility/RegistryAuthLocator.java          | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index e8651167221..32b49bd8172 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -16,6 +16,8 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -38,6 +40,8 @@ public class RegistryAuthLocator {
     private final String commandExtension;
     private final File configFile;
 
+    private final Map<String, Optional<AuthConfig>> cache = new ConcurrentHashMap<>();
+
     /**
      * key - credential helper's name
      * value - helper's response for "credentials not found" use case
@@ -97,9 +101,22 @@ static void setInstance(RegistryAuthLocator overrideInstance) {
      * @return an AuthConfig that is applicable to this specific image OR the defaultAuthConfig.
      */
     public AuthConfig lookupAuthConfig(DockerImageName dockerImageName, AuthConfig defaultAuthConfig) {
+        final String registryName = effectiveRegistryName(dockerImageName);
+        log.debug("Looking up auth config for image: {} at registry: {}", dockerImageName, registryName);
+
+        final Optional<AuthConfig> cachedAuth = cache.computeIfAbsent(registryName, __ -> lookupUncachedAuthConfig(registryName, dockerImageName));
 
-        log.debug("Looking up auth config for image: {}", dockerImageName);
+        if (cachedAuth.isPresent()) {
+            log.debug("Cached auth found: [{}]", toSafeString(cachedAuth.get()));
+            return cachedAuth.get();
+        } else {
+            log.debug("No matching Auth Configs - falling back to defaultAuthConfig [{}]", toSafeString(defaultAuthConfig));
+            // otherwise, defaultAuthConfig should already contain any credentials available
+            return defaultAuthConfig;
+        }
+    }
 
+    private Optional<AuthConfig> lookupUncachedAuthConfig(String registryName, DockerImageName dockerImageName) {
         log.debug("RegistryAuthLocator has configFile: {} ({}) and commandPathPrefix: {}",
             configFile,
             configFile.exists() ? "exists" : "does not exist",
@@ -107,37 +124,33 @@ public AuthConfig lookupAuthConfig(DockerImageName dockerImageName, AuthConfig d
 
         try {
             final JsonNode config = OBJECT_MAPPER.readTree(configFile);
-            final String registryName = effectiveRegistryName(dockerImageName);
             log.debug("registryName [{}] for dockerImageName [{}]", registryName, dockerImageName);
 
             // use helper preferentially (per https://docs.docker.com/engine/reference/commandline/cli/)
             final AuthConfig helperAuthConfig = authConfigUsingHelper(config, registryName);
             if (helperAuthConfig != null) {
                 log.debug("found helper auth config [{}]", toSafeString(helperAuthConfig));
-                return helperAuthConfig;
+                return Optional.of(helperAuthConfig);
             }
             // no credsHelper to use, using credsStore:
             final AuthConfig storeAuthConfig = authConfigUsingStore(config, registryName);
             if (storeAuthConfig != null) {
                 log.debug("found creds store auth config [{}]", toSafeString(storeAuthConfig));
-                return storeAuthConfig;
+                return Optional.of(storeAuthConfig);
             }
             // fall back to base64 encoded auth hardcoded in config file
             final AuthConfig existingAuthConfig = findExistingAuthConfig(config, registryName);
             if (existingAuthConfig != null) {
                 log.debug("found existing auth config [{}]", toSafeString(existingAuthConfig));
-                return existingAuthConfig;
+                return Optional.of(existingAuthConfig);
             }
-
-            log.debug("no matching Auth Configs - falling back to defaultAuthConfig [{}]", toSafeString(defaultAuthConfig));
-            // otherwise, defaultAuthConfig should already contain any credentials available
         } catch (Exception e) {
             log.warn("Failure when attempting to lookup auth config (dockerImageName: {}, configFile: {}. Falling back to docker-java default behaviour. Exception message: {}",
                 dockerImageName,
                 configFile,
                 e.getMessage());
         }
-        return defaultAuthConfig;
+        return Optional.empty();
     }
 
     private AuthConfig findExistingAuthConfig(final JsonNode config, final String reposName) throws Exception {

From 4c3bbd6c721ac45d36c73e77a232044de26badc3 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 5 Apr 2020 07:11:41 +0100
Subject: [PATCH 0571/4969] Pre-pull images required for Dockerfile/Compose
 image builds (#2201)

* Pre-pull images required for Dockerfile/Compose image builds
So that ImageFromDockerfile and Docker Compose can use images from authenticated registries when building temporary images

Fixes #1799

* Restore wider test scope
---
 .../containers/DockerComposeContainer.java    |  5 +-
 .../containers/ParsedDockerComposeFile.java   | 71 ++++++++++++++++---
 .../images/ParsedDockerfile.java              | 67 +++++++++++++++++
 .../images/builder/ImageFromDockerfile.java   | 22 +++++-
 ...ParsedDockerComposeFileValidationTest.java | 18 ++++-
 .../images/ParsedDockerfileTest.java          | 54 ++++++++++++++
 core/src/test/resources/Dockerfile            |  1 +
 ...gename-parsing-dockerfile-with-context.yml | 12 ++++
 ...r-compose-imagename-parsing-dockerfile.yml | 10 +++
 9 files changed, 243 insertions(+), 17 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
 create mode 100644 core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
 create mode 100644 core/src/test/resources/Dockerfile
 create mode 100644 core/src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml
 create mode 100644 core/src/test/resources/docker-compose-imagename-parsing-dockerfile.yml

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 839db7c89db..61036f690cd 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -178,12 +178,13 @@ private void pullImages() {
         // (a) as a workaround for https://github.com/docker/compose/issues/5854, which prevents authenticated image pulls being possible when credential helpers are in use
         // (b) so that credential helper-based auth still works when compose is running from within a container
         parsedComposeFiles.stream()
-            .flatMap(it -> it.getServiceImageNames().stream())
+            .flatMap(it -> it.getDependencyImageNames().stream())
             .forEach(imageName -> {
                 try {
+                    log.info("Preemptively checking local images for '{}', referenced via a compose file or transitive Dockerfile. If not available, it will be pulled.", imageName);
                     DockerClientFactory.instance().checkAndPullImage(dockerClient, imageName);
                 } catch (Exception e) {
-                    log.warn("Failed to pull image '{}'. Exception message was {}", imageName, e.getMessage());
+                    log.warn("Unable to pre-fetch an image ({}) depended upon by Docker Compose build - startup will continue but may fail. Exception message was: {}", imageName, e.getMessage());
                 }
             });
     }
diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index 838607d8337..8f88724647f 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -5,10 +5,13 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
+import org.testcontainers.images.ParsedDockerfile;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -23,9 +26,10 @@ class ParsedDockerComposeFile {
 
     private final Map<String, Object> composeFileContent;
     private final String composeFileName;
+    private final File composeFile;
 
     @Getter
-    private Set<String> serviceImageNames = new HashSet<>();
+    private Set<String> dependencyImageNames = new HashSet<>();
 
     ParsedDockerComposeFile(File composeFile) {
         Yaml yaml = new Yaml();
@@ -35,7 +39,7 @@ class ParsedDockerComposeFile {
             throw new IllegalArgumentException("Unable to parse YAML file from " + composeFile.getAbsolutePath(), e);
         }
         this.composeFileName = composeFile.getAbsolutePath();
-
+        this.composeFile = composeFile;
         parseAndValidate();
     }
 
@@ -43,6 +47,7 @@ class ParsedDockerComposeFile {
     ParsedDockerComposeFile(Map<String, Object> testContent) {
         this.composeFileContent = testContent;
         this.composeFileName = "";
+        this.composeFile = new File(".");
 
         parseAndValidate();
     }
@@ -80,15 +85,61 @@ private void parseAndValidate() {
             }
 
             final Map serviceDefinitionMap = (Map) serviceDefinition;
-            if (serviceDefinitionMap.containsKey("container_name")) {
-                throw new IllegalStateException(String.format(
-                    "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it",
-                    composeFileName,
-                    serviceName
-                ));
+
+            validateNoContainerNameSpecified(serviceName, serviceDefinitionMap);
+            findServiceImageName(serviceDefinitionMap);
+            findImageNamesInDockerfile(serviceDefinitionMap);
+        }
+    }
+
+    private void validateNoContainerNameSpecified(String serviceName, Map serviceDefinitionMap) {
+        if (serviceDefinitionMap.containsKey("container_name")) {
+            throw new IllegalStateException(String.format(
+                "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it",
+                composeFileName,
+                serviceName
+            ));
+        }
+    }
+
+    private void findServiceImageName(Map serviceDefinitionMap) {
+        if (serviceDefinitionMap.containsKey("image") && serviceDefinitionMap.get("image") instanceof String) {
+            final String imageName = (String) serviceDefinitionMap.get("image");
+            log.debug("Resolved dependency image for Docker Compose in {}: {}", composeFileName, imageName);
+            dependencyImageNames.add(imageName);
+        }
+    }
+
+    private void findImageNamesInDockerfile(Map serviceDefinitionMap) {
+        final Object buildNode = serviceDefinitionMap.get("build");
+        Path dockerfilePath = null;
+
+        if (buildNode instanceof Map) {
+            final Map buildElement = (Map) buildNode;
+            final Object dockerfileRelativePath = buildElement.get("dockerfile");
+            final Object contextRelativePath = buildElement.get("context");
+            if (dockerfileRelativePath instanceof String && contextRelativePath instanceof String) {
+                dockerfilePath = composeFile
+                    .getParentFile()
+                    .toPath()
+                    .resolve((String) contextRelativePath)
+                    .resolve((String) dockerfileRelativePath)
+                    .normalize();
             }
-            if (serviceDefinitionMap.containsKey("image") && serviceDefinitionMap.get("image") instanceof String) {
-                serviceImageNames.add((String) serviceDefinitionMap.get("image"));
+        } else if (buildNode instanceof String) {
+            dockerfilePath = composeFile
+                .getParentFile()
+                .toPath()
+                .resolve((String) buildNode)
+                .resolve("./Dockerfile")
+                .normalize();
+        }
+
+        if (dockerfilePath != null && Files.exists(dockerfilePath)) {
+            Set<String> resolvedImageNames = new ParsedDockerfile(dockerfilePath).getDependencyImageNames();
+            if (!resolvedImageNames.isEmpty()) {
+                log.debug("Resolved Dockerfile dependency images for Docker Compose in {} -> {}: {}", composeFileName, dockerfilePath, resolvedImageNames);
+                this.dependencyImageNames.addAll(resolvedImageNames);
             }
         }
     }
diff --git a/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
new file mode 100644
index 00000000000..1ad43813757
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
@@ -0,0 +1,67 @@
+package org.testcontainers.images;
+
+import com.google.common.annotations.VisibleForTesting;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Representation of a Dockerfile, with partial parsing for extraction of a minimal set of data.
+ */
+@Slf4j
+public class ParsedDockerfile {
+
+    private static final Pattern FROM_LINE_PATTERN = Pattern.compile("FROM ([^\\s]+).*");
+
+    private final Path dockerFilePath;
+
+    @Getter
+    private Set<String> dependencyImageNames = Collections.emptySet();
+
+    public ParsedDockerfile(Path dockerFilePath) {
+        this.dockerFilePath = dockerFilePath;
+        parse(read());
+    }
+
+    @VisibleForTesting
+    ParsedDockerfile(List<String> lines) {
+        this.dockerFilePath = Paths.get("dummy.Dockerfile");
+        parse(lines);
+    }
+
+    private List<String> read() {
+        if (!Files.exists(dockerFilePath)) {
+            log.warn("Tried to parse Dockerfile at path {} but none was found", dockerFilePath);
+            return Collections.emptyList();
+        }
+
+        try {
+            return Files.readAllLines(dockerFilePath);
+        } catch (IOException e) {
+            log.warn("Unable to read Dockerfile at path {}", dockerFilePath, e);
+            return Collections.emptyList();
+        }
+    }
+
+    private void parse(List<String> lines) {
+        dependencyImageNames = lines.stream()
+            .map(FROM_LINE_PATTERN::matcher)
+            .filter(Matcher::matches)
+            .map(matcher -> matcher.group(1))
+            .collect(Collectors.toSet());
+
+        if (!dependencyImageNames.isEmpty()) {
+            log.debug("Found dependency images in Dockerfile {}: {}", dockerFilePath, dependencyImageNames);
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index ded64439a64..1140247960a 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -2,10 +2,8 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
-import com.google.common.collect.Sets;
 import lombok.Cleanup;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +12,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.images.ParsedDockerfile;
 import org.testcontainers.images.builder.traits.BuildContextBuilderTrait;
 import org.testcontainers.images.builder.traits.ClasspathTrait;
 import org.testcontainers.images.builder.traits.DockerfileTrait;
@@ -28,6 +27,7 @@
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -51,6 +51,7 @@ public class ImageFromDockerfile extends LazyFuture<String> implements
     private final Map<String, String> buildArgs = new HashMap<>();
     private Optional<String> dockerFilePath = Optional.empty();
     private Optional<Path> dockerfile = Optional.empty();
+    private Set<String> dependencyImageNames = Collections.emptySet();
 
     public ImageFromDockerfile() {
         this("testcontainers/" + Base58.randomString(16).toLowerCase());
@@ -81,6 +82,17 @@ protected final String resolve() {
         Logger logger = DockerLoggerFactory.getLogger(dockerImageName);
 
         DockerClient dockerClient = DockerClientFactory.instance().client();
+
+        dependencyImageNames.forEach(imageName -> {
+            try {
+                log.info("Pre-emptively checking local images for '{}', referenced via a Dockerfile. If not available, it will be pulled.", imageName);
+                DockerClientFactory.instance().checkAndPullImage(dockerClient, imageName);
+            } catch (Exception e) {
+                log.warn("Unable to pre-fetch an image ({}) depended upon by Dockerfile - image build will continue but may fail. Exception message was: {}", imageName, e.getMessage());
+            }
+        });
+
+
         try {
             if (deleteOnExit) {
                 ResourceReaper.instance().registerImageForCleanup(dockerImageName);
@@ -139,7 +151,11 @@ public void onNext(BuildResponseItem item) {
     protected void configure(BuildImageCmd buildImageCmd) {
         buildImageCmd.withTag(this.getDockerImageName());
         this.dockerFilePath.ifPresent(buildImageCmd::withDockerfilePath);
-        this.dockerfile.ifPresent(p -> buildImageCmd.withDockerfile(p.toFile()));
+        this.dockerfile.ifPresent(p -> {
+            buildImageCmd.withDockerfile(p.toFile());
+            dependencyImageNames = new ParsedDockerfile(p).getDependencyImageNames();
+        });
+
         this.buildArgs.forEach(buildImageCmd::withBuildArg);
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index c553d250ec9..9a8421086f1 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -76,13 +76,27 @@ public void shouldIgnoreUnknownStructure() {
     public void shouldObtainImageNamesV1() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        assertEquals("all defined service names are found", Sets.newHashSet("redis", "mysql"), parsedFile.getServiceImageNames());
+        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "postgres"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, postgres from Dockerfile build
     }
 
     @Test
     public void shouldObtainImageNamesV2() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v2.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        assertEquals("all defined service names are found", Sets.newHashSet("redis", "mysql"), parsedFile.getServiceImageNames());
+        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "postgres"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, postgres from Dockerfile build
+    }
+
+    @Test
+    public void shouldObtainImageFromDockerfileBuild() {
+        File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile.yml");
+        ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
+        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "alpine:3.2"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, alpine:3.2 from Dockerfile build
+    }
+
+    @Test
+    public void shouldObtainImageFromDockerfileBuildWithContext() {
+        File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml");
+        ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
+        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "alpine:3.2"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, alpine:3.2 from Dockerfile build
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
new file mode 100644
index 00000000000..e2b97f9fab7
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
@@ -0,0 +1,54 @@
+package org.testcontainers.images;
+
+import com.google.common.collect.Sets;
+import org.junit.Test;
+
+import java.nio.file.Paths;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+
+public class ParsedDockerfileTest {
+
+    @Test
+    public void doesSimpleParsing() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage", "RUN something"));
+        assertEquals("extracts a single image name", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void handlesTags() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage:tag", "RUN something"));
+        assertEquals("retains tags in image names", Sets.newHashSet("someimage:tag"), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void handlesDigests() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage@sha256:abc123", "RUN something"));
+        assertEquals("retains digests in image names", Sets.newHashSet("someimage@sha256:abc123"), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void ignoringCommentedFromLines() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage", "#FROM somethingelse"));
+        assertEquals("ignores commented from lines", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void ignoringBuildStageNames() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage --as=base", "RUN something", "FROM nextimage", "RUN something"));
+        assertEquals("ignores build stage names and allows multiple images to be extracted", Sets.newHashSet("someimage", "nextimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void handlesGracefullyIfNoFromLine() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("RUN something", "# is this even a valid Dockerfile?"));
+        assertEquals("handles invalid Dockerfiles gracefully", Sets.newHashSet(), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void handlesGracefullyIfDockerfileNotFound() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(Paths.get("nonexistent.Dockerfile"));
+        assertEquals("handles missing Dockerfiles gracefully", Sets.newHashSet(), parsedDockerfile.getDependencyImageNames());
+    }
+}
diff --git a/core/src/test/resources/Dockerfile b/core/src/test/resources/Dockerfile
new file mode 100644
index 00000000000..d3f2fcb60f7
--- /dev/null
+++ b/core/src/test/resources/Dockerfile
@@ -0,0 +1 @@
+FROM postgres
diff --git a/core/src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml b/core/src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml
new file mode 100644
index 00000000000..4e86b83720b
--- /dev/null
+++ b/core/src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml
@@ -0,0 +1,12 @@
+version: "2.1"
+services:
+    redis:
+        image: redis
+    mysql:
+        image: mysql
+    custom:
+        build:
+            context: compose-dockerfile
+            dockerfile: Dockerfile
+networks:
+    custom_network: {}
diff --git a/core/src/test/resources/docker-compose-imagename-parsing-dockerfile.yml b/core/src/test/resources/docker-compose-imagename-parsing-dockerfile.yml
new file mode 100644
index 00000000000..46d3da26f4c
--- /dev/null
+++ b/core/src/test/resources/docker-compose-imagename-parsing-dockerfile.yml
@@ -0,0 +1,10 @@
+version: "2.1"
+services:
+    redis:
+        image: redis
+    mysql:
+        image: mysql
+    custom:
+        build: compose-dockerfile
+networks:
+    custom_network: {}

From 5b4cda1b5d5bc0316237d802c4c4b745121fe9ea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 5 Apr 2020 07:12:31 +0100
Subject: [PATCH 0572/4969] Bump mockito-core from 3.3.0 to 3.3.3 in
 /modules/junit-jupiter (#2437)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.0 to 3.3.3.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.3.0...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 445bdb3586d..d0a573adcc8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
-    testCompile ('org.mockito:mockito-core:3.3.0') {
+    testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
 

From 92fb4e2be425f43685569754f2a572c822e050d9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 5 Apr 2020 07:12:40 +0100
Subject: [PATCH 0573/4969] =?UTF-8?q?Bump=20aws-java-sdk-logs=20from=201.1?=
 =?UTF-8?q?1.737=20to=201.11.759=20in=20/modules/lo=E2=80=A6=20(#2518)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.737 to 1.11.759.
- [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.737...1.11.759)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 49e586b19f7..1e9e3cd9121 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.737'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.759'
 }

From 08bafcfdae0caab213de28b8b3adedb7b4e35924 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 5 Apr 2020 18:58:30 +0100
Subject: [PATCH 0574/4969] Fix `update-docs-version.yml` script (#2519)

Using checkout action to check out master branch
---
 .github/workflows/update-docs-version.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 7268f72f961..cce6e5b9bf1 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on: ubuntu-18.04
         steps:
             -   uses: actions/checkout@v2
-            -   name: Checkout master
-                run: git checkout master
+                with:
+                  ref: master
             -   name: Update latest_version property in mkdocs.yml
                 run: |
                     sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml

From a09f4d50487bf9b9e9807af0dbf59b802f7490ee Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 5 Apr 2020 18:59:39 +0100
Subject: [PATCH 0575/4969] Expand Container `dependsOn` parameters to accept
 `Iterable` (#2259)

* Expand `dependsOn` parameters to accept `Iterable`
* Reinstate a `dependsOn(List)` method, for binary backwards compatibility
* Reinstate `deepStart(Collection<? extends Startable>)` method
---
 .../containers/GenericContainer.java          | 27 +++++++++----------
 .../testcontainers/lifecycle/Startables.java  | 15 +++++++++--
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 03d03759506..945d1e1aff2 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -26,9 +26,6 @@
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.SneakyThrows;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -42,7 +39,6 @@
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.UnstableAPI;
-import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
@@ -51,8 +47,8 @@
 import org.testcontainers.containers.wait.Wait;
 import org.testcontainers.containers.wait.WaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
+import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.images.RemoteDockerImage;
-import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.lifecycle.Startables;
 import org.testcontainers.lifecycle.TestDescription;
@@ -64,14 +60,9 @@
 import org.testcontainers.utility.PathUtils;
 import org.testcontainers.utility.ResourceReaper;
 import org.testcontainers.utility.TestcontainersConfiguration;
-import org.testcontainers.utility.ThrowingFunction;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.UndeclaredThrowableException;
@@ -82,7 +73,6 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -266,22 +256,29 @@ public void setImage(Future<String> image) {
     }
 
     /**
-     * @see #dependsOn(List)
+     * @see #dependsOn(Iterable)
      */
     public SELF dependsOn(Startable... startables) {
         Collections.addAll(dependencies, startables);
         return self();
     }
 
+    /**
+     * @see #dependsOn(Iterable)
+     */
+    public SELF dependsOn(List<? extends Startable> startables) {
+        return this.dependsOn((Iterable<? extends Startable>) startables);
+    }
+
     /**
      * Delays this container's creation and start until provided {@link Startable}s start first.
      * Note that the circular dependencies are not supported.
      *
      * @param startables a list of {@link Startable} to depend on
-     * @see Startables#deepStart(Collection)
+     * @see Startables#deepStart(Iterable)
      */
-    public SELF dependsOn(List<Startable> startables) {
-        dependencies.addAll(startables);
+    public SELF dependsOn(Iterable<? extends Startable> startables) {
+        startables.forEach(dependencies::add);
         return self();
     }
 
diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
index b20c5c91b54..292e1ab17b3 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startables.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -5,9 +5,13 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 @UtilityClass
 public class Startables {
@@ -28,7 +32,14 @@ public Thread newThread(Runnable r) {
      * @see #deepStart(Stream)
      */
     public CompletableFuture<Void> deepStart(Collection<? extends Startable> startables) {
-        return deepStart(startables.stream());
+        return deepStart((Iterable<? extends Startable>) startables);
+    }
+
+    /**
+     * @see #deepStart(Stream)
+     */
+    public CompletableFuture<Void> deepStart(Iterable<? extends Startable> startables) {
+        return deepStart(StreamSupport.stream(startables.spliterator(), false));
     }
 
     /**

From f5948a9085a75e875472c7b6be8a55f4861271a2 Mon Sep 17 00:00:00 2001
From: Michael Kutz <mkutz@users.noreply.github.com>
Date: Sat, 11 Apr 2020 13:33:16 +0200
Subject: [PATCH 0576/4969] Remove unidiomatic public modifier in Groovy
 example code (#2238)

The `public` access modifier is quite unidiomatic in Groovy code.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
index d8c056b5070..c2537a948d5 100644
--- a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
+++ b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
@@ -10,7 +10,7 @@ class RedisBackedCacheIntTest extends Specification {
     private RedisBackedCache underTest
 
     // init {
-    public GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
+    GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
         .withExposedPorts(6379)
     // }
 

From 17b9ffc092629b86b301580fa3a8fba18271daa2 Mon Sep 17 00:00:00 2001
From: Mitchell Just <mitch.just@finocomp.com>
Date: Sat, 11 Apr 2020 21:40:14 +1000
Subject: [PATCH 0577/4969] Move static config from `configure()` to
 constructors (#2473)

---
 .../containers/ClickHouseContainer.java           |  3 ---
 .../testcontainers/containers/Db2Container.java   |  4 ++--
 .../containers/InfluxDBContainer.java             |  4 ++--
 .../containers/MariaDBContainer.java              |  4 ++--
 .../containers/MSSQLServerContainer.java          |  4 +---
 .../testcontainers/containers/MySQLContainer.java |  2 +-
 .../testcontainers/containers/Neo4jContainer.java |  4 ++--
 .../testcontainers/containers/NginxContainer.java | 15 ++++++++-------
 .../containers/OracleContainer.java               |  6 +-----
 .../containers/OrientDBContainer.java             |  3 ++-
 .../containers/PostgreSQLContainer.java           |  3 ++-
 .../containers/PrestoContainer.java               |  7 ++-----
 12 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 0fd6174bf3b..9364ecc4d14 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -26,10 +26,7 @@ public ClickHouseContainer() {
 
     public ClickHouseContainer(String dockerImageName) {
         super(dockerImageName);
-    }
 
-    @Override
-    protected void configure() {
         withExposedPorts(HTTP_PORT, NATIVE_PORT);
         waitingFor(
             new HttpWaitStrategy()
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 429cc060094..13ef72c328e 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -37,6 +37,8 @@ public Db2Container(String imageName) {
         this.waitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*Setup has completed\\..*")
                 .withStartupTimeout(Duration.of(10, ChronoUnit.MINUTES));
+
+        addExposedPort(DB2_PORT);
     }
 
     @Override
@@ -52,8 +54,6 @@ protected void configure() {
             acceptLicense();
         }
 
-        addExposedPort(DB2_PORT);
-
         addEnv("DBNAME", databaseName);
         addEnv("DB2INSTANCE", username);
         addEnv("DB2INST1_PASSWORD", password);
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index ee5b449f961..c3ac909f2d4 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -36,12 +36,12 @@ public InfluxDBContainer(final String version) {
         waitStrategy = new WaitAllStrategy()
             .withStrategy(Wait.forHttp("/ping").withBasicCredentials(username, password).forStatusCode(204))
             .withStrategy(Wait.forListeningPort());
+
+        addExposedPort(INFLUXDB_PORT);
     }
 
     @Override
     protected void configure() {
-        addExposedPort(INFLUXDB_PORT);
-
         addEnv("INFLUXDB_ADMIN_USER", admin);
         addEnv("INFLUXDB_ADMIN_PASSWORD", adminPassword);
 
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index c41136c0bf2..be1b3d3d44d 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -24,6 +24,7 @@ public MariaDBContainer() {
 
     public MariaDBContainer(String dockerImageName) {
         super(dockerImageName);
+        addExposedPort(MARIADB_PORT);
     }
 
     @Override
@@ -35,7 +36,6 @@ protected Integer getLivenessCheckPort() {
     protected void configure() {
         optionallyMapResourceParameterAsVolume(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, "/etc/mysql/conf.d", "mariadb-default-conf");
 
-        addExposedPort(MARIADB_PORT);
         addEnv("MYSQL_DATABASE", databaseName);
         addEnv("MYSQL_USER", username);
         if (password != null && !password.isEmpty()) {
@@ -83,7 +83,7 @@ public SELF withConfigurationOverride(String s) {
         parameters.put(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, s);
         return self();
     }
-    
+
     @Override
     public SELF withDatabaseName(final String databaseName) {
         this.databaseName = databaseName;
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index ad1a7d19090..afe3f5b8651 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -36,6 +36,7 @@ public MSSQLServerContainer(final String dockerImageName) {
         super(dockerImageName);
         withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
+        addExposedPort(MS_SQL_SERVER_PORT);
     }
 
     @Override
@@ -45,11 +46,8 @@ protected Integer getLivenessCheckPort() {
 
     @Override
     protected void configure() {
-        addExposedPort(MS_SQL_SERVER_PORT);
-
         LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
         addEnv("ACCEPT_EULA", "Y");
-
         addEnv("SA_PASSWORD", password);
     }
 
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index fa2e8626b0d..a8549672ff3 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -27,6 +27,7 @@ public MySQLContainer() {
 
     public MySQLContainer(String dockerImageName) {
         super(dockerImageName);
+        addExposedPort(MYSQL_PORT);
     }
 
     @NotNull
@@ -40,7 +41,6 @@ protected void configure() {
         optionallyMapResourceParameterAsVolume(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, "/etc/mysql/conf.d",
                 "mysql-default-conf");
 
-        addExposedPort(MYSQL_PORT);
         addEnv("MYSQL_DATABASE", databaseName);
         addEnv("MYSQL_USER", username);
         if (password != null && !password.isEmpty()) {
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index fc545122219..0c16927dba8 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -87,6 +87,8 @@ public Neo4jContainer(String dockerImageName) {
             .withStrategy(waitForBolt)
             .withStrategy(waitForHttp)
             .withStartupTimeout(Duration.ofMinutes(2));
+
+        addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
     }
 
     @Override
@@ -100,8 +102,6 @@ public Set<Integer> getLivenessCheckPortNumbers() {
     @Override
     protected void configure() {
 
-        addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
-
         boolean emptyAdminPassword = this.adminPassword == null || this.adminPassword.isEmpty();
         String neo4jAuth = emptyAdminPassword ? "none" : String.format(AUTH_FORMAT, this.adminPassword);
         addEnv("NEO4J_AUTH", neo4jAuth);
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 1badffa1cee..bedf040869f 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -16,7 +16,14 @@ public class NginxContainer<SELF extends NginxContainer<SELF>> extends GenericCo
     private static final int NGINX_DEFAULT_PORT = 80;
 
     public NginxContainer() {
-        super("nginx:1.9.4");
+        this("nginx:1.9.4");
+    }
+
+    public NginxContainer(String dockerImageName) {
+        super(dockerImageName);
+
+        addExposedPort(NGINX_DEFAULT_PORT);
+        setCommand("nginx", "-g", "daemon off;");
     }
 
     @NotNull
@@ -25,12 +32,6 @@ protected Set<Integer> getLivenessCheckPorts() {
         return Collections.singleton(getMappedPort(80));
     }
 
-    @Override
-    protected void configure() {
-        addExposedPort(NGINX_DEFAULT_PORT);
-        setCommand("nginx", "-g", "daemon off;");
-    }
-
     public URL getBaseUrl(String scheme, int port) throws MalformedURLException {
         return new URL(scheme + "://" + getContainerIpAddress() + ":" + getMappedPort(port));
     }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index ea0eee1a2ff..bad22af2511 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -46,6 +46,7 @@ public OracleContainer(Future<String> dockerImageName) {
         super(dockerImageName);
         withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
+        addExposedPorts(ORACLE_PORT, APEX_HTTP_PORT);
     }
 
     @Override
@@ -53,11 +54,6 @@ protected Integer getLivenessCheckPort() {
         return getMappedPort(ORACLE_PORT);
     }
 
-    @Override
-    protected void configure() {
-        addExposedPorts(ORACLE_PORT, APEX_HTTP_PORT);
-    }
-
     @Override
     public String getDriverClassName() {
         return "oracle.jdbc.OracleDriver";
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index b368d96bf8c..ca0180640ce 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -66,11 +66,12 @@ public OrientDBContainer(@NonNull String dockerImageName) {
             .withStrategy(Wait.forListeningPort())
             .withStrategy(waitForHttp)
             .withStartupTimeout(Duration.ofMinutes(2));
+
+        addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
     }
 
     @Override
     protected void configure() {
-        addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
         addEnv("ORIENTDB_ROOT_PASSWORD", serverPassword);
     }
 
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index cef66d0c492..0fae3a16f4a 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -38,6 +38,8 @@ public PostgreSQLContainer(final String dockerImageName) {
                 .withTimes(2)
                 .withStartupTimeout(Duration.of(60, SECONDS));
         this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
+
+        addExposedPort(POSTGRESQL_PORT);
     }
 
     @NotNull
@@ -48,7 +50,6 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-        addExposedPort(POSTGRESQL_PORT);
         addEnv("POSTGRES_DB", databaseName);
         addEnv("POSTGRES_USER", username);
         addEnv("POSTGRES_PASSWORD", password);
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 186acb18af6..0f2a82b9b9d 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -32,6 +32,8 @@ public PrestoContainer(final String dockerImageName) {
         this.waitStrategy = new LogMessageWaitStrategy()
             .withRegEx(".*io.prestosql.server.PrestoServer\\s+======== SERVER STARTED ========.*")
             .withStartupTimeout(Duration.of(60, SECONDS));
+
+        addExposedPort(PRESTO_PORT);
     }
 
     @NotNull
@@ -40,11 +42,6 @@ protected Set<Integer> getLivenessCheckPorts() {
         return new HashSet<>(getMappedPort(PRESTO_PORT));
     }
 
-    @Override
-    protected void configure() {
-        addExposedPort(PRESTO_PORT);
-    }
-
     @Override
     public String getDriverClassName() {
         return "io.prestosql.jdbc.PrestoDriver";

From ecdbc11c2d637d3dec50b32655958a9a8ef1e807 Mon Sep 17 00:00:00 2001
From: Sandra Parsick <sparsick@users.noreply.github.com>
Date: Sat, 11 Apr 2020 13:41:55 +0200
Subject: [PATCH 0578/4969] add more information for using registry mirror
 (#2477)

---
 docs/features/configuration.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index cd01b99b1c7..ad039528b5d 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -48,6 +48,11 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 Another possibility is to set up a registry mirror in your environment so that all images are pulled from there and not directly from Docker Hub.
 For more information, see the [official Docker documentation about "Registry as a pull through cache"](https://docs.docker.com/registry/recipes/mirror/).
 
+!!!tip
+    Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/testcontainers/ryuk:0.2.3`, not).
+    Workaround is to to configure the affected Docker image in `.testcontainers.properties`.
+    For example: `ryuk.container.image = testcontainers/ryuk:0.2.3` or `ryuk.container.image = <your.docker.registry>/testcontainers/ryuk:0.2.3`
+
 ## Customizing Ryuk resource reaper
 
 > **ryuk.container.image = quay.io/testcontainers/ryuk:0.2.3**

From 21ba44813164aff012993be643ee3ed12ffac107 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sat, 11 Apr 2020 13:49:35 +0200
Subject: [PATCH 0579/4969] Add ciMate (#2550)

---
 .circleci/config.yml     | 11 +++++++++++
 .github/workflows/ci.yml |  8 ++++++++
 azure-pipelines.yml      |  6 ++++++
 3 files changed, 25 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ee4097934a..c4302911f40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,6 +9,13 @@ jobs:
         command: ./gradlew testcontainers:build -x test -x check
     - run:
         command: ./gradlew testcontainers:check --scan
+    - run: &ciMate
+        name: aggregate test reports with ciMate
+        when: always
+        command: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
     - run:
         name: Save test results
         command: |
@@ -29,6 +36,7 @@ jobs:
           --scan
         environment:
           TZ: /usr/share/zoneinfo/ETC/UTC
+    - run: *ciMate
     - run:
         name: Save test results
         command: |
@@ -48,6 +56,7 @@ jobs:
         command: ./gradlew jdbc-test:check --scan
         environment:
           TZ: /usr/share/zoneinfo/ETC/UTC
+    - run: *ciMate
     - run:
         name: Save test results
         command: |
@@ -65,6 +74,7 @@ jobs:
     - checkout
     - run:
         command: ./gradlew selenium:check --scan
+    - run: *ciMate
     - run:
         name: Save test results
         command: |
@@ -82,6 +92,7 @@ jobs:
     - checkout
     - run:
         command: cd examples && ./gradlew check
+    - run: *ciMate
     - run:
         name: Save test results
         command: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5618be1230d..1a0a97d05f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,3 +18,11 @@ jobs:
             -w "$PWD" \
             openjdk:8-jdk-alpine \
             ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
+      - name: aggregate test reports with ciMate
+        if: always()
+        env:
+          CIMATE_PROJECT_ID: 2348n4vl
+        run: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 68330550ee1..8ab7bc98db5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,6 +13,8 @@ jobs:
         tasks: 'testcontainers:check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
+  - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
+    condition: succeededOrFailed()
 - job: jdbc
   steps:
   - task: Gradle@2
@@ -27,6 +29,8 @@ jobs:
         tasks: 'jdbc-test:check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
+  - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
+    condition: succeededOrFailed()
 - job: modules
   steps:
   - task: Gradle@2
@@ -41,3 +45,5 @@ jobs:
         tasks: 'check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
+  - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
+    condition: succeededOrFailed()

From 7f3c4d2e0b24105a39e9b9c00117a9cf1de4838b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 11 Apr 2020 20:06:11 +0200
Subject: [PATCH 0580/4969] set `outputPerTestCase`

---
 build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle b/build.gradle
index c8b2267a049..a55753aa7f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,6 +68,12 @@ subprojects {
         }
     }
 
+    tasks.withType(Test).all {
+        reports {
+            junitXml.outputPerTestCase = true
+        }
+    }
+
     // Ensure that Javadoc generation is always tested
     check.dependsOn(javadoc)
 

From 09cc191c137f91c22b55796ab1067898286bde52 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sat, 11 Apr 2020 20:46:15 +0200
Subject: [PATCH 0581/4969] disable ciMate on non-Linux AZP builds

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8ab7bc98db5..5572a4096a3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,7 +14,7 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(),eq(variables.os, 'Linux'))
 - job: jdbc
   steps:
   - task: Gradle@2
@@ -30,7 +30,7 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(), eq(variables.os, 'Linux'))
 - job: modules
   steps:
   - task: Gradle@2
@@ -46,4 +46,4 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(), eq(variables.os, 'Linux'))

From dd662ce494c9600c210a7e85006f90729d4163fe Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 12 Apr 2020 13:26:08 +0200
Subject: [PATCH 0582/4969] fix the OS variable in AZP

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5572a4096a3..c56ae9fde36 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,7 +14,7 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: and(succeededOrFailed(),eq(variables.os, 'Linux'))
+    condition: and(succeededOrFailed(),eq(variables['Agent.OS'], 'Linux'))
 - job: jdbc
   steps:
   - task: Gradle@2
@@ -30,7 +30,7 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: and(succeededOrFailed(), eq(variables.os, 'Linux'))
+    condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Linux'))
 - job: modules
   steps:
   - task: Gradle@2
@@ -46,4 +46,4 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: and(succeededOrFailed(), eq(variables.os, 'Linux'))
+    condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Linux'))

From c90a9f996bafbb7f6f26cd875fc936dd84f08a55 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Sun, 12 Apr 2020 15:18:20 +0200
Subject: [PATCH 0583/4969] Temporarily ignore DB2 test - unrelated CI disk
 space issues (#2557)

* Temporary ignore DB2 test in JDBCDriverTest.data

We have some problems with file space running out on CI, so the jdbc-test module, pulling a lot of database images, can potentially break the build.

* Also ignore SimpleDb2Test
---
 .../src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java   | 2 +-
 .../src/test/java/org/testcontainers/junit/SimpleDb2Test.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
index ca55a1d1841..c96ce251a63 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
@@ -67,7 +67,7 @@ public static Iterable<Object[]> data() {
                 {"jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken)},
                 {"jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename", EnumSet.noneOf(Options.class)},
                 {"jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)}
+//                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)}
             });
     }
 
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
index c686f979b79..60ad9a23a27 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
@@ -2,6 +2,7 @@
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.Db2Container;
@@ -13,6 +14,7 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 
+@Ignore("Disabled since we had problems with CI disk space filling up from images in jdbc-test module")
 public class SimpleDb2Test {
 
     @Rule

From ee05f4ab6780a7490112d26de5f375d70f4949e6 Mon Sep 17 00:00:00 2001
From: Alex Stockinger <mail@alexstockinger.de>
Date: Sun, 12 Apr 2020 15:24:23 +0200
Subject: [PATCH 0584/4969] Remove unused JEE deps (#2505)

Two compile dependencies referencing JEE artifacts don't seem to be required for compilation. This PR removes them from the build.
---
 core/build.gradle | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 6b9a1994ebd..f2d7efcc1a9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -115,10 +115,7 @@ dependencies {
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
     compile 'org.jetbrains:annotations:17.0.0'
-    compile 'javax.annotation:javax.annotation-api:1.3.2'
     compile 'org.apache.commons:commons-compress:1.20'
-    // Added for JDK9 compatibility since it's missing this package
-    compile 'javax.xml.bind:jaxb-api:2.3.1'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From 0b7e72feeade14168cc52e8c8ac3100f9b1f4066 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 12 Apr 2020 16:01:20 +0200
Subject: [PATCH 0585/4969] Update to docker-java 3.2.1 (#2435)

---
 build.gradle      | 5 ++++-
 core/build.gradle | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a55753aa7f5..4fbaf42c160 100644
--- a/build.gradle
+++ b/build.gradle
@@ -107,7 +107,10 @@ subprojects {
                     for (entry in jf.entries()) {
                         def name = entry.name
                         if (name.endsWith(".class")) {
-                            packages.add(name.substring(0, name.lastIndexOf('/')))
+                            def index = name.lastIndexOf('/')
+                            if (index != -1) {
+                                packages.add(name.substring(0, index))
+                            }
                         }
                     }
                     jf.close()
diff --git a/core/build.gradle b/core/build.gradle
index f2d7efcc1a9..01575f0d351 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -135,7 +135,7 @@ dependencies {
         exclude(group: "net.java.dev.jna")
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.0') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.1') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'org.slf4j')

From 3833ce483aad18ccb1809453da638b22f04c5ad8 Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Sun, 12 Apr 2020 09:01:57 -0500
Subject: [PATCH 0586/4969] Add more clear warning message instructing users
 how to enable reusable containers (#2422)

* Add more clear warning message instructing users how to enable reusable containers

* Update GenericContainer.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../org/testcontainers/containers/GenericContainer.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 945d1e1aff2..211ad2f59cb 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -69,6 +69,7 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -376,7 +377,12 @@ private void tryStart(Instant startedAt) {
                     }
                     reusable = true;
                 } else {
-                    logger().info("Reuse was requested but the environment does not support the reuse of containers");
+                    logger().warn(
+                        "" +
+                            "Reuse was requested but the environment does not support the reuse of containers\n" +
+                            "To enable reuse of containers, you must set 'testcontainers.reuse.enable=true' in a file located at {}",
+                        Paths.get(System.getProperty("user.home"), ".testcontainers.properties")
+                    );
                     reusable = false;
                 }
             } else {

From cbd3220c555e7ece09163f245cd4114b7860c150 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Sun, 12 Apr 2020 16:02:39 +0200
Subject: [PATCH 0587/4969] Protect `NetworkImpl#close` from concurrency issues
 (#2203)

* Increase thread safety of NetworkImpl

* un-volatile `id`

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 core/src/main/java/org/testcontainers/containers/Network.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
index 411459b62eb..1c00fa00fac 100644
--- a/core/src/main/java/org/testcontainers/containers/Network.java
+++ b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -97,7 +97,7 @@ protected void after() {
         }
 
         @Override
-        public void close() {
+        public synchronized void close() {
             if (initialized.getAndSet(false)) {
                 ResourceReaper.instance().removeNetworkById(id);
             }

From 84c8d1e290b6f2c5be00477cc67d85dc5ac3b26c Mon Sep 17 00:00:00 2001
From: Alexander Sparkowsky <info@roamingthings.de>
Date: Sun, 12 Apr 2020 16:07:22 +0200
Subject: [PATCH 0588/4969] Support TestLifecycleAware-ness of containers
 started by the JUnit Jupiter integration (#1326)

* Update BrowserWebDriverContainer to honor existing no_proxy setting

* Update test to only start one container per test

* Use constant for no_proxy key

* Cleanup test implementation (#929)

* Add signalling of TestLifecycleAware containers.

Allow containers like WebBrowserContainers to initialize and/or finalize
before/after tests.

* #1326 Add early draft to test signalling of TestLifecycleAware containers

* Add test for post condition when signalling lifecycleaware containers

This kind of test is a bit tricky since the post condition occurs
after the original test has been finished. Also it's not nice to
pass data between two tests.

* Update test for lifecycle aware containers to cover shared case (#1326)

In order to check that the afterAll callback has signalled
lifecycleaware containers correctly a second extension is used. The
order of the extension annotation ensures that the assertion is run
after the extension under test.

* Update test for lifecycle aware containers to cover shared case (#1326)

To test the beforeAll() case the assertion has to be called from
within the test class since it's called after all extensions.

* Fix formatting (#1326)

* Use lighter container for testing (#1326)

* Separate store and collect of shared lifecycle-aware-containers (#1326)

* Add tests for ordering and capturing test exceptions (#1326)

* Make lifecycle tests independent of timing (#1326)

Calls to the lifecycle methods are now recorded in an ordered
list that is then used to test the correct number and order
of calls. This makes the test independent of timing.
Unfortunately it's still required to execute tests in
a deterministic order.

For a better separation of test concerns
tests for the lifecycle methods and exception
capturing have been moved into separate
test classes.

* Make mock now implements Startable (#1326)

There is no need to start a container since only
the TestLifecycleAware is important.

* Add AssertJ dependency (#1326)

We want to use AssertJ for some tests.

* Migrate assertions of TestLifecycleAwareMethodTest to AssertJ (#1326)

* Update generation of filesystem friendly description (#1326)

* Separated tests for filesystem friendly filename (#1326)

* Use lombok to improve readability (#1326)

* Generate filesystem friendly name from display name (#1326)

Generating a filesystem friendly name in a Junit Jupiter test is a bit tricky.
Since tests can be generated dynamically class and/or test method may not be available.
The display name provided by the ExtensionContext on the other hand may use characters
that are not filesystem safe.
This approach removes all characters from the display name that are not in a restricted
set of allowed characters. However this may lead to name clashes if two tests have a
display name that only differs in characters that are removed from the display name.

* Generate filesystem friendly name from URLEncoded unique id (#1326)

Co-authored-by: Richard North <rich.north@gmail.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 modules/junit-jupiter/build.gradle            |  2 +
 .../FilesystemFriendlyNameGenerator.java      | 24 +++++
 .../jupiter/TestcontainerTestDescription.java | 10 ++
 .../jupiter/TestcontainersExtension.java      | 93 ++++++++++++++++---
 .../FilesystemFriendlyNameGeneratorTest.java  | 45 +++++++++
 .../TestLifecycleAwareContainerMock.java      | 54 +++++++++++
 ...tLifecycleAwareExceptionCapturingTest.java | 37 ++++++++
 .../jupiter/TestLifecycleAwareMethodTest.java | 73 +++++++++++++++
 8 files changed, 326 insertions(+), 12 deletions(-)
 create mode 100644 modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
 create mode 100644 modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainerTestDescription.java
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java

diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index d0a573adcc8..bf52b25913c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,6 +12,8 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.0'
+    testCompile 'org.assertj:assertj-core:3.14.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
new file mode 100644
index 00000000000..ef8560b3f19
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
@@ -0,0 +1,24 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.platform.commons.util.StringUtils.isBlank;
+
+class FilesystemFriendlyNameGenerator {
+    private static final String UNKNOWN_NAME = "unknown";
+
+    static String filesystemFriendlyNameOf(ExtensionContext context) {
+        String contextId = context.getUniqueId();
+        try {
+            return (isBlank(contextId))
+                ? UNKNOWN_NAME
+                : URLEncoder.encode(contextId, UTF_8.toString());
+        } catch (UnsupportedEncodingException e) {
+            return UNKNOWN_NAME;
+        }
+    }
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainerTestDescription.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainerTestDescription.java
new file mode 100644
index 00000000000..568d228e08c
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainerTestDescription.java
@@ -0,0 +1,10 @@
+package org.testcontainers.junit.jupiter;
+
+import lombok.Value;
+import org.testcontainers.lifecycle.TestDescription;
+
+@Value
+class TestcontainersTestDescription implements TestDescription {
+    String testId;
+    String filesystemFriendlyName;
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index e6ce10f8541..1ed5e954e44 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -1,32 +1,50 @@
 package org.testcontainers.junit.jupiter;
 
 import lombok.Getter;
-import org.junit.jupiter.api.extension.*;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.lifecycle.TestDescription;
+import org.testcontainers.lifecycle.TestLifecycleAware;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, ExecutionCondition, TestInstancePostProcessor {
+import static java.util.stream.Collectors.toList;
+import static org.testcontainers.junit.jupiter.FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf;
+
+class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition, TestInstancePostProcessor {
 
     private static final Namespace NAMESPACE = Namespace.create(TestcontainersExtension.class);
 
     private static final String TEST_INSTANCE = "testInstance";
+    private static final String SHARED_LIFECYCLE_AWARE_CONTAINERS = "sharedLifecycleAwareContainers";
+    private static final String LOCAL_LIFECYCLE_AWARE_CONTAINERS = "localLifecycleAwareContainers";
 
     @Override
     public void postProcessTestInstance(final Object testInstance, final ExtensionContext context) {
-        ExtensionContext.Store store = context.getStore(NAMESPACE);
+        Store store = context.getStore(NAMESPACE);
         store.put(TEST_INSTANCE, testInstance);
     }
 
@@ -35,19 +53,69 @@ public void beforeAll(ExtensionContext context) {
         Class<?> testClass = context.getTestClass()
             .orElseThrow(() -> new ExtensionConfigurationException("TestcontainersExtension is only supported for classes."));
 
-        ExtensionContext.Store store = context.getStore(NAMESPACE);
+        Store store = context.getStore(NAMESPACE);
+        List<StoreAdapter> sharedContainersStoreAdapters = findSharedContainers(testClass);
+
+        sharedContainersStoreAdapters.forEach(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()));
+
+        List<TestLifecycleAware> lifecycleAwareContainers = sharedContainersStoreAdapters
+            .stream()
+            .filter(this::isTestLifecycleAware)
+            .map(lifecycleAwareAdapter -> (TestLifecycleAware) lifecycleAwareAdapter.container)
+            .collect(toList());
 
-        findSharedContainers(testClass)
-            .forEach(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()));
+        store.put(SHARED_LIFECYCLE_AWARE_CONTAINERS, lifecycleAwareContainers);
+        signalBeforeTestToContainers(lifecycleAwareContainers, testDescriptionFrom(context));
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) {
+        signalAfterTestToContainersFor(SHARED_LIFECYCLE_AWARE_CONTAINERS, context);
     }
 
     @Override
     public void beforeEach(final ExtensionContext context) {
-        collectParentTestInstances(context)
-            .parallelStream()
+        Store store = context.getStore(NAMESPACE);
+
+        List<TestLifecycleAware> lifecycleAwareContainers = collectParentTestInstances(context).parallelStream()
             .flatMap(this::findRestartContainers)
-            .forEach(adapter -> context.getStore(NAMESPACE)
-                .getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()));
+            .peek(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()))
+            .filter(this::isTestLifecycleAware)
+            .map(lifecycleAwareAdapter -> (TestLifecycleAware) lifecycleAwareAdapter.container)
+            .collect(toList());
+
+        store.put(LOCAL_LIFECYCLE_AWARE_CONTAINERS, lifecycleAwareContainers);
+        signalBeforeTestToContainers(lifecycleAwareContainers, testDescriptionFrom(context));
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) {
+        signalAfterTestToContainersFor(LOCAL_LIFECYCLE_AWARE_CONTAINERS, context);
+    }
+
+    private void signalBeforeTestToContainers(List<TestLifecycleAware> lifecycleAwareContainers, TestDescription testDescription) {
+        lifecycleAwareContainers.forEach(container -> container.beforeTest(testDescription));
+    }
+
+    private void signalAfterTestToContainersFor(String storeKey, ExtensionContext context) {
+        List<TestLifecycleAware> lifecycleAwareContainers =
+            (List<TestLifecycleAware>) context.getStore(NAMESPACE).get(storeKey);
+        if (lifecycleAwareContainers != null) {
+            TestDescription description = testDescriptionFrom(context);
+            Optional<Throwable> throwable = context.getExecutionException();
+            lifecycleAwareContainers.forEach(container -> container.afterTest(description, throwable));
+        }
+    }
+
+    private TestDescription testDescriptionFrom(ExtensionContext context) {
+        return new TestcontainersTestDescription(
+            context.getUniqueId(),
+            filesystemFriendlyNameOf(context)
+        );
+    }
+
+    private boolean isTestLifecycleAware(StoreAdapter adapter) {
+        return adapter.container instanceof TestLifecycleAware;
     }
 
     @Override
@@ -101,13 +169,14 @@ private Set<Object> collectParentTestInstances(final ExtensionContext context) {
         return testInstances;
     }
 
-    private Stream<StoreAdapter> findSharedContainers(Class<?> testClass) {
+    private List<StoreAdapter> findSharedContainers(Class<?> testClass) {
         return ReflectionUtils.findFields(
                 testClass,
                 isSharedContainer(),
                 ReflectionUtils.HierarchyTraversalMode.TOP_DOWN)
             .stream()
-            .map(f -> getContainerInstance(null, f));
+            .map(f -> getContainerInstance(null, f))
+            .collect(toList());
     }
 
     private Predicate<Field> isSharedContainer() {
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java
new file mode 100644
index 00000000000..96617b0e063
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java
@@ -0,0 +1,45 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.testcontainers.junit.jupiter.FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf;
+
+class FilesystemFriendlyNameGeneratorTest {
+
+    @ParameterizedTest
+    @MethodSource("provideDisplayNamesAndFilesystemFriendlyNames")
+    void should_generate_filesystem_friendly_name(String displayName, String expectedName) {
+        ExtensionContext context = mock(ExtensionContext.class);
+        doReturn(displayName)
+            .when(context).getUniqueId();
+
+        String filesystemFriendlyName = filesystemFriendlyNameOf(context);
+
+        assertThat(filesystemFriendlyName).isEqualTo(expectedName);
+    }
+
+    private static Stream<Arguments> provideDisplayNamesAndFilesystemFriendlyNames() {
+        return Stream.of(
+            Arguments.of("", "unknown"),
+            Arguments.of("  ", "unknown"),
+            Arguments.of("not blank", "not+blank"),
+            Arguments.of("abc ABC 1234567890", "abc+ABC+1234567890"),
+            Arguments.of(
+                "no_umlauts_äöüÄÖÜéáíó",
+                "no_umlauts_%C3%A4%C3%B6%C3%BC%C3%84%C3%96%C3%9C%C3%A9%C3%A1%C3%AD%C3%B3"
+            ),
+            Arguments.of(
+                "[engine:junit-jupiter]/[class:com.example.MyTest]/[test-factory:parameterizedTest()]/[dynamic-test:#3]",
+                "%5Bengine%3Ajunit-jupiter%5D%2F%5Bclass%3Acom.example.MyTest%5D%2F%5Btest-factory%3AparameterizedTest%28%29%5D%2F%5Bdynamic-test%3A%233%5D"
+            )
+        );
+    }
+}
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java
new file mode 100644
index 00000000000..38751c8789a
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java
@@ -0,0 +1,54 @@
+package org.testcontainers.junit.jupiter;
+
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.lifecycle.TestDescription;
+import org.testcontainers.lifecycle.TestLifecycleAware;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class TestLifecycleAwareContainerMock implements Startable, TestLifecycleAware {
+
+    static final String BEFORE_TEST = "beforeTest";
+    static final String AFTER_TEST = "afterTest";
+
+    private final List<String> lifecycleMethodCalls = new ArrayList<>();
+    private final List<String> lifecycleFilesystemFriendlyNames = new ArrayList<>();
+
+    private Throwable capturedThrowable;
+
+    @Override
+    public void beforeTest(TestDescription description) {
+        lifecycleMethodCalls.add(BEFORE_TEST);
+        lifecycleFilesystemFriendlyNames.add(description.getFilesystemFriendlyName());
+    }
+
+    @Override
+    public void afterTest(TestDescription description, Optional<Throwable> throwable) {
+        lifecycleMethodCalls.add(AFTER_TEST);
+        throwable.ifPresent(capturedThrowable -> this.capturedThrowable = capturedThrowable);
+    }
+
+    List<String> getLifecycleMethodCalls() {
+        return lifecycleMethodCalls;
+    }
+
+    Throwable getCapturedThrowable() {
+        return capturedThrowable;
+    }
+
+    public List<String> getLifecycleFilesystemFriendlyNames() {
+        return lifecycleFilesystemFriendlyNames;
+    }
+
+    @Override
+    public void start() {
+
+    }
+
+    @Override
+    public void stop() {
+
+    }
+}
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
new file mode 100644
index 00000000000..85d837a7880
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
@@ -0,0 +1,37 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.AssumptionViolatedException;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+// The order of @ExtendsWith and @Testcontainers is crucial in order for the tests
+@Testcontainers
+@TestMethodOrder(OrderAnnotation.class)
+class TestLifecycleAwareExceptionCapturingTest {
+    @Container
+    private final TestLifecycleAwareContainerMock testContainer = new TestLifecycleAwareContainerMock();
+
+    private static TestLifecycleAwareContainerMock startedTestContainer;
+
+    @Test
+    @Order(1)
+    void failing_test_should_pass_throwable_to_testContainer() {
+        startedTestContainer = testContainer;
+        // Force an exception that is captured by the test container without failing the test itself
+        assumeTrue(false);
+    }
+
+    @Test
+    @Order(2)
+    void should_have_captured_thrownException() {
+        Throwable capturedThrowable = startedTestContainer.getCapturedThrowable();
+        assertTrue(capturedThrowable instanceof AssumptionViolatedException);
+        assertEquals("got: <false>, expected: is <true>", capturedThrowable.getMessage());
+    }
+}
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java
new file mode 100644
index 00000000000..cecdff490ef
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java
@@ -0,0 +1,73 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testcontainers.junit.jupiter.TestLifecycleAwareContainerMock.AFTER_TEST;
+import static org.testcontainers.junit.jupiter.TestLifecycleAwareContainerMock.BEFORE_TEST;
+
+// The order of @ExtendsWith and @Testcontainers is crucial for the tests
+@ExtendWith({TestLifecycleAwareMethodTest.SharedContainerAfterAllTestExtension.class})
+@Testcontainers
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+class TestLifecycleAwareMethodTest {
+    @Container
+    private final TestLifecycleAwareContainerMock testContainer = new TestLifecycleAwareContainerMock();
+
+    @Container
+    private static final TestLifecycleAwareContainerMock SHARED_CONTAINER = new TestLifecycleAwareContainerMock();
+
+    private static TestLifecycleAwareContainerMock startedTestContainer;
+
+    @BeforeAll
+    static void beforeAll() {
+        assertThat(SHARED_CONTAINER.getLifecycleMethodCalls()).containsExactly(BEFORE_TEST);
+
+    }
+
+    @Test
+    @Order(1)
+    void should_prepare_before_and_after_test() {
+        // we can only test for a call to afterTest() after this test has been finished.
+        startedTestContainer = testContainer;
+    }
+
+    @Test
+    @Order(2)
+    void should_call_beforeTest_first_afterTest_later_with_filesystem_friendly_name() {
+        assertThat(startedTestContainer.getLifecycleMethodCalls())
+            .containsExactly(BEFORE_TEST, AFTER_TEST);
+    }
+
+    @Test
+    void should_have_a_filesystem_friendly_name_container_has_started() {
+        assertThat(startedTestContainer.getLifecycleFilesystemFriendlyNames())
+            .containsExactly(
+                "%5Bengine%3Ajunit-jupiter%5D%2F%5Bclass%3Aorg.testcontainers.junit.jupiter.TestLifecycleAwareMethodTest%5D%2F%5Bmethod%3Ashould_prepare_before_and_after_test%28%29%5D"
+            );
+    }
+
+    @Test
+    void static_container_should_have_a_filesystem_friendly_name_after_container_has_started() {
+        assertThat(SHARED_CONTAINER.getLifecycleFilesystemFriendlyNames())
+            .containsExactly(
+                "%5Bengine%3Ajunit-jupiter%5D%2F%5Bclass%3Aorg.testcontainers.junit.jupiter.TestLifecycleAwareMethodTest%5D"
+            );
+    }
+
+    static class SharedContainerAfterAllTestExtension implements AfterAllCallback {
+        // Unfortunately it's not possible to write a @Test that is run after all tests
+        @Override
+        public void afterAll(ExtensionContext context) {
+            assertThat(SHARED_CONTAINER.getLifecycleMethodCalls())
+                .containsExactly(BEFORE_TEST, AFTER_TEST);
+        }
+    }
+}

From 6c45a20892d837ac736dd293abfe458f96be74fc Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 12 Apr 2020 19:27:49 +0200
Subject: [PATCH 0589/4969] Add R2DBC support (#2545)

This PR adds support for [R2DBC](https://r2dbc.io).

## URL support

The URL support is similar to the JDBC's, but:

1. Does not reuse containers by URL - it is unclear yet how to "hash" `ConnectionFactoryOptions`
1. The image tag must be explicitly provided via `TC_IMAGE_TAG` r2dbc option
1. TODO: daemon mode
1. TODO: alias support (see #4)

## Example usage

The user **must add the `org.testcontainers:r2dbc` module** - unlike JDBC, we use `compileOnly` dependency on R2DBC, since it is a 3rd party dependency.

Once both the `r2dbc` and database's module are added, one can use:
```java
String url = "r2dbc:tc:postgresql:///db?TC_IMAGE_TAG=10-alpine";
ConnectionFactory connectionFactory = ConnectionFactories.get(url);
```

## Programmatic access

For those who start containers manually and want to obtain `ConnectionFactoryOptions` for already started containers, we provide a helper static method:
```java
try (PostgreSQLContainer<?> container = new PostgreSQLContainer<>()) {
    container.start();

    ConnectionFactory connectionFactory = ConnectionFactories.get(
        PostgreSQLR2DBCDatabaseContainer.getOptions(container)
    );
}
```
---
 docs/modules/databases/index.md               | 113 +-----------
 docs/modules/databases/jdbc.md                | 119 +++++++++++++
 docs/modules/databases/r2dbc.md               |  57 +++++++
 mkdocs.yml                                    |   2 +
 modules/mariadb/build.gradle                  |   9 +
 .../containers/MariaDBContainer.java          |   2 +-
 .../MariaDBR2DBCDatabaseContainer.java        |  33 ++++
 ...MariaDBR2DBCDatabaseContainerProvider.java |  30 ++++
 .../MariaDBR2DBCDatabaseContainerTest.java    |  23 +++
 .../src/test/resources/logback-test.xml       |  16 ++
 modules/mssqlserver/build.gradle              |  13 ++
 .../MSSQLR2DBCDatabaseContainer.java          |  34 ++++
 .../MSSQLR2DBCDatabaseContainerProvider.java  |  29 ++++
 .../MSSQLR2DBCDatabaseContainerTest.java      |  22 +++
 .../container-license-acceptance.txt          |   1 +
 .../src/test/resources/logback-test.xml       |  16 ++
 modules/mysql/build.gradle                    |   9 +
 .../MySQLR2DBCDatabaseContainer.java          |  33 ++++
 .../MySQLR2DBCDatabaseContainerProvider.java  |  30 ++++
 .../MySQLR2DBCDatabaseContainerTest.java      |  23 +++
 .../mysql/src/test/resources/logback-test.xml |  16 ++
 modules/postgresql/build.gradle               |   8 +
 .../PostgreSQLR2DBCDatabaseContainer.java     |  33 ++++
 ...tgreSQLR2DBCDatabaseContainerProvider.java |  30 ++++
 .../PostgreSQLR2DBCDatabaseContainerTest.java |  27 +++
 .../src/test/resources/logback-test.xml       |  16 ++
 modules/r2dbc/build.gradle                    |  20 +++
 .../r2dbc/CancellableSubscription.java        |  23 +++
 .../r2dbc/ConnectionPublisher.java            | 161 ++++++++++++++++++
 .../r2dbc/EmptySubscription.java              |  17 ++
 .../java/org/testcontainers/r2dbc/Hidden.java |  73 ++++++++
 .../r2dbc/R2DBCDatabaseContainer.java         |   9 +
 .../r2dbc/R2DBCDatabaseContainerProvider.java |  15 ++
 .../TestcontainersR2DBCConnectionFactory.java | 104 +++++++++++
 ...tcontainersR2DBCConnectionFactoryTest.java |  79 +++++++++
 .../r2dbc/src/test/resources/logback-test.xml |  16 ++
 .../AbstractR2DBCDatabaseContainerTest.java   |  64 +++++++
 37 files changed, 1212 insertions(+), 113 deletions(-)
 create mode 100644 docs/modules/databases/jdbc.md
 create mode 100644 docs/modules/databases/r2dbc.md
 create mode 100644 modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
 create mode 100644 modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
 create mode 100644 modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
 create mode 100644 modules/mariadb/src/test/resources/logback-test.xml
 create mode 100644 modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
 create mode 100644 modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
 create mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
 create mode 100644 modules/mssqlserver/src/test/resources/container-license-acceptance.txt
 create mode 100644 modules/mssqlserver/src/test/resources/logback-test.xml
 create mode 100644 modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
 create mode 100644 modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
 create mode 100644 modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
 create mode 100644 modules/mysql/src/test/resources/logback-test.xml
 create mode 100644 modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
 create mode 100644 modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
 create mode 100644 modules/postgresql/src/test/resources/logback-test.xml
 create mode 100644 modules/r2dbc/build.gradle
 create mode 100644 modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java
 create mode 100644 modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java
 create mode 100644 modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java
 create mode 100644 modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
 create mode 100644 modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java
 create mode 100644 modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
 create mode 100644 modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
 create mode 100644 modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
 create mode 100644 modules/r2dbc/src/test/resources/logback-test.xml
 create mode 100644 modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java

diff --git a/docs/modules/databases/index.md b/docs/modules/databases/index.md
index d7654cc6a33..6685ade55c8 100644
--- a/docs/modules/databases/index.md
+++ b/docs/modules/databases/index.md
@@ -10,115 +10,4 @@ You might want to use Testcontainers' database support:
 !!! note
     Of course, it's still important to have as few tests that hit the database as possible, and make good use of mocks for components higher up the stack.
 
-You can obtain a temporary database in one of two ways:
-
- * **JUnit @Rule/@ClassRule**: this mode starts a database inside a container before your tests and tears it down afterwards.
- * **Using a specially modified JDBC URL**: after making a very simple modification to your system's JDBC URL string, Testcontainers will provide a disposable stand-in database that can be used without requiring modification to your application code.
-
-## Database container objects
-
-Add a @Rule or @ClassRule to your test class, e.g.:
-
-```java
-public class SimpleMySQLTest {
-    @Rule
-    public MySQLContainer mysql = new MySQLContainer();
-```
-
-Now, in your test code (or a suitable setup method), you can obtain details necessary to connect to this database:
-
- * `mysql.getJdbcUrl()` provides a JDBC URL your code can connect to
- * `mysql.getUsername()` provides the username your code should pass to the driver
- * `mysql.getPassword()` provides the password your code should pass to the driver
-
-Note that if you use `@Rule`, you will be given an isolated container for each test method. If you use `@ClassRule`, you will get on isolated container for all the methods in the test class.
-
-Examples/Tests:
-
- * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java)
- * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java)
-
-## Database containers launched via JDBC URL scheme
-
-As long as you have Testcontainers and the appropriate JDBC driver on your classpath, you can simply modify regular JDBC connection URLs to get a fresh containerized instance of the database each time your application starts up.
-
-_N.B:_
-
-* _TC needs to be on your application's classpath at runtime for this to work_
-* _For Spring Boot (Before version `2.3.0`) you need to specify the driver manually `spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver`_
-
-**Original URL**: `jdbc:mysql:5.7.22://localhost:3306/databasename`
-
-Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database name will be ignored; you can leave these as-is or set them to any value. 
-
-!!! note
-    We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
-    From Testcontainers' perspective, `jdbc:mysql:5.7.22://localhost:3306/databasename` and `jdbc:mysql:5.7.22:///databasename` is the same URI.
-
-### JDBC URL examples
-
-#### Using Testcontainers with a fixed version
-
-`jdbc:tc:mysql:5.6.23:///databasename`
-
-#### Using PostgreSQL
-
-`jdbc:tc:postgresql:9.6.8:///databasename`
-
-### Using PostGIS
-
-`jdbc:tc:postgis:9.6:///databasename`
-
-### Using Presto
-
-`jdbc:tc:presto:329://localhost/memory/default`
-
-## Using a classpath init script
-
-Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
-
-`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
-
-This is useful if you have a fixed script for setting up database schema, etc.
-
-## Using an init script from a file
-
-If the init script path is prefixed `file:`, it will be loaded from a file (relative to the working directory, which will usually be the project root).
-
-`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
-
-#### Using an init function
-
-Instead of running a fixed script for DB setup, it may be useful to call a Java function that you define. This is intended to allow you to trigger database schema migration tools. To do this, add TC_INITFUNCTION to the URL as follows, passing a full path to the class name and method:
-
- `jdbc:tc:mysql:5.7.22:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
-
-The init function must be a public static method which takes a `java.sql.Connection` as its only parameter, e.g.
-```java
-public class JDBCDriverTest {
-    public static void sampleInitFunction(Connection connection) throws SQLException {
-        // e.g. run schema setup or Flyway/liquibase/etc DB migrations here...
-    }
-    ...
-```
-
-#### Running container in daemon mode
-
-By default database container is being stopped as soon as last connection is closed. There are cases when you might need to start container and keep it running till you stop it explicitly or JVM is shutdown. To do this, add `TC_DAEMON` parameter to the URL as follows:
-
- `jdbc:tc:mysql:5.7.22:///databasename?TC_DAEMON=true`
-
-With this parameter database container will keep running even when there're no open connections.
-
-
-#### Running container with tmpfs options
-
-Container can have `tmpfs` mounts for storing data in host memory. This is useful if you want to speed up your database tests. Be aware that the data will be lost when the container stops.
-
-To pass this option to the container, add `TC_TMPFS` parameter to the URL as follows:
-
-  `jdbc:tc:postgresql:9.6.8:///databasename?TC_TMPFS=/testtmpfs:rw`
-
-If you need more than one option, separate them by comma (e.g. `TC_TMPFS=key:value,key1:value1&other_parameters=foo`).
-
-For more information about `tmpfs` mount, see [the official Docker documentation](https://docs.docker.com/storage/tmpfs/).
+See [JDBC](./jdbc.md) and [R2DBC](./r2dbc.md) for information on how to use Testcontainers with SQL-like databases.
\ No newline at end of file
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
new file mode 100644
index 00000000000..5f83d7fcdeb
--- /dev/null
+++ b/docs/modules/databases/jdbc.md
@@ -0,0 +1,119 @@
+# JDBC support
+
+You can obtain a temporary database in one of two ways:
+
+ * **Using a specially modified JDBC URL**: after making a very simple modification to your system's JDBC URL string, Testcontainers will provide a disposable stand-in database that can be used without requiring modification to your application code.
+ * **JUnit @Rule/@ClassRule**: this mode starts a database inside a container before your tests and tears it down afterwards.
+
+## Database containers launched via JDBC URL scheme
+
+As long as you have Testcontainers and the appropriate JDBC driver on your classpath, you can simply modify regular JDBC connection URLs to get a fresh containerized instance of the database each time your application starts up.
+
+_N.B:_
+
+* _TC needs to be on your application's classpath at runtime for this to work_
+* _For Spring Boot (Before version `2.3.0`) you need to specify the driver manually `spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver`_
+
+**Original URL**: `jdbc:mysql://localhost:3306/databasename`
+
+Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database name will be ignored; you can leave these as-is or set them to any value.
+
+!!! note
+    We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
+    From Testcontainers' perspective, `jdbc:mysql:5.7.22://localhost:3306/databasename` and `jdbc:mysql:5.7.22:///databasename` is the same URI.
+
+!!! warning
+    If you're using the JDBC URL support, there is no need to instantiate an instance of the container - Testcontainers will do it automagically.
+
+### JDBC URL examples
+
+#### Using Testcontainers with a fixed version
+
+`jdbc:tc:mysql:5.6.23:///databasename`
+
+#### Using PostgreSQL
+
+`jdbc:tc:postgresql:9.6.8:///databasename`
+
+#### Using PostGIS
+
+`jdbc:tc:postgis:9.6:///databasename`
+
+#### Using Presto
+
+`jdbc:tc:presto:329://localhost/memory/default`
+
+### Using a classpath init script
+
+Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
+
+`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
+
+This is useful if you have a fixed script for setting up database schema, etc.
+
+### Using an init script from a file
+
+If the init script path is prefixed `file:`, it will be loaded from a file (relative to the working directory, which will usually be the project root).
+
+`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
+
+### Using an init function
+
+Instead of running a fixed script for DB setup, it may be useful to call a Java function that you define. This is intended to allow you to trigger database schema migration tools. To do this, add TC_INITFUNCTION to the URL as follows, passing a full path to the class name and method:
+
+ `jdbc:tc:mysql:5.7.22:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
+
+The init function must be a public static method which takes a `java.sql.Connection` as its only parameter, e.g.
+```java
+public class JDBCDriverTest {
+    public static void sampleInitFunction(Connection connection) throws SQLException {
+        // e.g. run schema setup or Flyway/liquibase/etc DB migrations here...
+    }
+    ...
+```
+
+### Running container in daemon mode
+
+By default database container is being stopped as soon as last connection is closed. There are cases when you might need to start container and keep it running till you stop it explicitly or JVM is shutdown. To do this, add `TC_DAEMON` parameter to the URL as follows:
+
+ `jdbc:tc:mysql:5.7.22:///databasename?TC_DAEMON=true`
+
+With this parameter database container will keep running even when there're no open connections.
+
+
+### Running container with tmpfs options
+
+Container can have `tmpfs` mounts for storing data in host memory. This is useful if you want to speed up your database tests. Be aware that the data will be lost when the container stops.
+
+To pass this option to the container, add `TC_TMPFS` parameter to the URL as follows:
+
+  `jdbc:tc:postgresql:9.6.8:///databasename?TC_TMPFS=/testtmpfs:rw`
+
+If you need more than one option, separate them by comma (e.g. `TC_TMPFS=key:value,key1:value1&other_parameters=foo`).
+
+For more information about `tmpfs` mount, see [the official Docker documentation](https://docs.docker.com/storage/tmpfs/).
+
+## Database container objects
+
+In case you can't use the URL support, or need to fine-tune the container, you can instantiate it yourself.
+
+Add a @Rule or @ClassRule to your test class, e.g.:
+
+```java
+public class SimpleMySQLTest {
+    @Rule
+    public MySQLContainer mysql = new MySQLContainer();
+```
+
+Now, in your test code (or a suitable setup method), you can obtain details necessary to connect to this database:
+
+ * `mysql.getJdbcUrl()` provides a JDBC URL your code can connect to
+ * `mysql.getUsername()` provides the username your code should pass to the driver
+ * `mysql.getPassword()` provides the password your code should pass to the driver
+
+Note that if you use `@Rule`, you will be given an isolated container for each test method. If you use `@ClassRule`, you will get on isolated container for all the methods in the test class.
+
+Examples/Tests:
+
+ * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java)
+ * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java)
\ No newline at end of file
diff --git a/docs/modules/databases/r2dbc.md b/docs/modules/databases/r2dbc.md
new file mode 100644
index 00000000000..6ba3f401a08
--- /dev/null
+++ b/docs/modules/databases/r2dbc.md
@@ -0,0 +1,57 @@
+# R2DBC support
+
+You can obtain a temporary database in one of two ways:
+
+ * **Using a specially modified R2DBC URL**: after making a very simple modification to your system's R2DBC URL string, Testcontainers will provide a disposable stand-in database that can be used without requiring modification to your application code.
+ * **JUnit @Rule/@ClassRule**: this mode starts a database inside a container before your tests and tears it down afterwards.
+
+## Database containers launched via R2DBC URL scheme
+
+As long as you have Testcontainers and the appropriate R2DBC driver on your classpath, you can simply modify regular R2DBC connection URLs to get a fresh containerized instance of the database each time your application starts up.
+
+The started container will be terminated when the `ConnectionFactory` is closed.
+
+!!! warning
+    Both the database module (e.g. `org.testcontainers:mysql`) **and** `org.testcontainers:r2dbc` need to be on your application's classpath at runtime.
+
+**Original URL**: `r2dbc:mysql://localhost:3306/databasename`
+
+1. Insert `tc:` after `r2dbc:` as follows. Note that the hostname, port and database name will be ignored; you can leave these as-is or set them to any value.
+1. Specify the mandatory Docker tag of the database's official image that you want using a `TC_IMAGE_TAG` query parameter.
+
+**Note that, unlike Testcontainers' JDBC URL support, it is not possible to specify an image tag in the 'scheme' part of the URL, and it is always necessary to specify a tag using `TC_IMAGE_TAG`.**
+
+So that the URL becomes:  
+`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.7.22`
+
+!!! note
+    We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
+    From Testcontainers' perspective, `r2dbc:mysql://localhost:3306/databasename` and `r2dbc:mysql:///databasename` is the same URI.
+
+!!! warning
+    If you're using the R2DBC URL support, there is no need to instantiate an instance of the container - Testcontainers will do it automagically.
+
+### R2DBC URL examples
+
+#### Using MySQL
+
+`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.6.23`
+
+#### Using MariaDB
+
+`r2dbc:tc:mariadb:///databasename?TC_IMAGE_TAG=10.3.6`
+
+#### Using PostgreSQL
+
+`r2dbc:tc:postgresql:///databasename?TC_IMAGE_TAG=9.6.8`
+
+#### Using MSSQL:
+
+`r2dbc:tc:sqlserver:///?TC_IMAGE_TAG=2017-CU12`
+
+## Obtaining `ConnectionFactoryOptions` from database container objects
+
+If you already have an instance of the database container, you can get an instance of `ConnectionFactoryOptions` from it:
+<!--codeinclude--> 
+[Creating `ConnectionFactoryOptions` from an instance)](../../../modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java) inside_block:get_options
+<!--/codeinclude-->
diff --git a/mkdocs.yml b/mkdocs.yml
index 49876885dfd..c2d39bc9d2c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,8 @@ nav:
     - Modules:
           - Databases:
                 - modules/databases/index.md
+                - modules/databases/jdbc.md
+                - modules/databases/r2dbc.md
                 - modules/databases/cassandra.md
                 - modules/databases/cockroachdb.md
                 - modules/databases/couchbase.md
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index be42121f3d8..93b2de2a716 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -1,11 +1,20 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+
     compile project(':jdbc')
 
+    compileOnly project(':r2dbc')
+    compileOnly 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1'
+
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
     testCompile 'org.vibur:vibur-dbcp:25.0'
+
+    testCompile testFixtures(project(':r2dbc'))
+    testCompile 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1'
 }
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index be1b3d3d44d..e402bc24e0e 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -11,7 +11,7 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
     public static final String IMAGE = "mariadb";
     public static final String DEFAULT_TAG = "10.3.6";
 
-    private static final Integer MARIADB_PORT = 3306;
+    static final Integer MARIADB_PORT = 3306;
     private String databaseName = "test";
     private String username = "test";
     private String password = "test";
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..4ddbed997d4
--- /dev/null
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
@@ -0,0 +1,33 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+@RequiredArgsConstructor
+public class MariaDBR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    @Delegate(types = Startable.class)
+    private final MariaDBContainer<?> container;
+
+    public static ConnectionFactoryOptions getOptions(MariaDBContainer<?> container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+            .option(ConnectionFactoryOptions.DRIVER, MariaDBR2DBCDatabaseContainerProvider.DRIVER)
+            .build();
+
+        return new MariaDBR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options.mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MariaDBContainer.MARIADB_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+}
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..79cb627f8a9
--- /dev/null
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
@@ -0,0 +1,30 @@
+package org.testcontainers.containers;
+
+import com.google.auto.service.AutoService;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.mariadb.r2dbc.MariadbConnectionFactoryProvider;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
+
+@AutoService(R2DBCDatabaseContainerProvider.class)
+public class MariaDBR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+
+    static final String DRIVER = MariadbConnectionFactoryProvider.MARIADB_DRIVER;
+
+    @Override
+    public boolean supports(ConnectionFactoryOptions options) {
+        return DRIVER.equals(options.getRequiredValue(ConnectionFactoryOptions.DRIVER));
+    }
+
+    @Override
+    public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        String image = MariaDBContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        MariaDBContainer<?> container = new MariaDBContainer<>(image)
+            .withDatabaseName(options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+
+        if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
+            container.withReuse(true);
+        }
+        return new MariaDBR2DBCDatabaseContainer(container);
+    }
+}
diff --git a/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..30e8cad9c32
--- /dev/null
+++ b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
@@ -0,0 +1,23 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class MariaDBR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MariaDBContainer<?>> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(MariaDBContainer<?> container) {
+        return MariaDBR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:mariadb:///db?TC_IMAGE_TAG=10.3.6";
+    }
+
+    @Override
+    protected MariaDBContainer<?> createContainer() {
+        return new MariaDBContainer<>();
+    }
+
+}
diff --git a/modules/mariadb/src/test/resources/logback-test.xml b/modules/mariadb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/mariadb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 62434722d63..3c44df64eda 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -1,5 +1,18 @@
 description = "Testcontainers :: MS SQL Server"
 
 dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+
     compile project(':jdbc')
+
+    compileOnly project(':r2dbc')
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.1.RELEASE'
+
+    testCompile project(':r2dbc')
+    testCompile 'io.r2dbc:r2dbc-mssql:0.8.1.RELEASE'
+
+    // MSSQL's wait strategy requires the JDBC driver
+    testCompile testFixtures(project(':r2dbc'))
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8'
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..27c486c218c
--- /dev/null
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
@@ -0,0 +1,34 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+@RequiredArgsConstructor
+public class MSSQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    @Delegate(types = Startable.class)
+    private final MSSQLServerContainer<?> container;
+
+    public static ConnectionFactoryOptions getOptions(MSSQLServerContainer<?> container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+            .option(ConnectionFactoryOptions.DRIVER, MSSQLR2DBCDatabaseContainerProvider.DRIVER)
+            .build();
+
+        return new MSSQLR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options.mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT))
+            // TODO enable if/when MSSQLServerContainer adds support for customizing the DB name
+            // .option(ConnectionFactoryOptions.DATABASE, container.getDatabasseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+}
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..1638901226c
--- /dev/null
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
@@ -0,0 +1,29 @@
+package org.testcontainers.containers;
+
+import com.google.auto.service.AutoService;
+import io.r2dbc.mssql.MssqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
+
+@AutoService(R2DBCDatabaseContainerProvider.class)
+public class MSSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+
+    static final String DRIVER = MssqlConnectionFactoryProvider.MSSQL_DRIVER;
+
+    @Override
+    public boolean supports(ConnectionFactoryOptions options) {
+        return DRIVER.equals(options.getRequiredValue(ConnectionFactoryOptions.DRIVER));
+    }
+
+    @Override
+    public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        String image = MSSQLServerContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        MSSQLServerContainer<?> container = new MSSQLServerContainer<>(image);
+
+        if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
+            container.withReuse(true);
+        }
+        return new MSSQLR2DBCDatabaseContainer(container);
+    }
+}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..1fcf2dd293b
--- /dev/null
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
@@ -0,0 +1,22 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class MSSQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MSSQLServerContainer<?>> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(MSSQLServerContainer<?> container) {
+        return MSSQLR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:sqlserver:///?TC_IMAGE_TAG=2017-CU12";
+    }
+
+    @Override
+    protected MSSQLServerContainer<?> createContainer() {
+        return new MSSQLServerContainer<>();
+    }
+}
diff --git a/modules/mssqlserver/src/test/resources/container-license-acceptance.txt b/modules/mssqlserver/src/test/resources/container-license-acceptance.txt
new file mode 100644
index 00000000000..8a704b9c066
--- /dev/null
+++ b/modules/mssqlserver/src/test/resources/container-license-acceptance.txt
@@ -0,0 +1 @@
+mcr.microsoft.com/mssql/server:2017-CU12
diff --git a/modules/mssqlserver/src/test/resources/logback-test.xml b/modules/mssqlserver/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/mssqlserver/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index da609a1b535..10fd90b3c38 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -1,11 +1,20 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+
     compile project(':jdbc')
 
+    compileOnly project(':r2dbc')
+    compileOnly 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
+
     testCompile 'mysql:mysql-connector-java:8.0.19'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
+
+    testCompile testFixtures(project(':r2dbc'))
+    testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..c43ffcca1b2
--- /dev/null
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
@@ -0,0 +1,33 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+@RequiredArgsConstructor
+public class MySQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    @Delegate(types = Startable.class)
+    private final MySQLContainer<?> container;
+
+    public static ConnectionFactoryOptions getOptions(MySQLContainer<?> container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+            .option(ConnectionFactoryOptions.DRIVER, MySQLR2DBCDatabaseContainerProvider.DRIVER)
+            .build();
+
+        return new MySQLR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options.mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MySQLContainer.MYSQL_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+}
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..3a01616caba
--- /dev/null
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
@@ -0,0 +1,30 @@
+package org.testcontainers.containers;
+
+import com.google.auto.service.AutoService;
+import dev.miku.r2dbc.mysql.MySqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
+
+@AutoService(R2DBCDatabaseContainerProvider.class)
+public class MySQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+
+    static final String DRIVER = MySqlConnectionFactoryProvider.MYSQL_DRIVER;
+
+    @Override
+    public boolean supports(ConnectionFactoryOptions options) {
+        return DRIVER.equals(options.getRequiredValue(ConnectionFactoryOptions.DRIVER));
+    }
+
+    @Override
+    public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        String image = MySQLContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        MySQLContainer<?> container = new MySQLContainer<>(image)
+            .withDatabaseName(options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+
+        if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
+            container.withReuse(true);
+        }
+        return new MySQLR2DBCDatabaseContainer(container);
+    }
+}
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..19edc3dbca4
--- /dev/null
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
@@ -0,0 +1,23 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class MySQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MySQLContainer<?>> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(MySQLContainer<?> container) {
+        return MySQLR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:mysql:///db?TC_IMAGE_TAG=5.7.22";
+    }
+
+    @Override
+    protected MySQLContainer<?> createContainer() {
+        return new MySQLContainer<>();
+    }
+
+}
diff --git a/modules/mysql/src/test/resources/logback-test.xml b/modules/mysql/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/mysql/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 89d40fe6923..c629c1c5a13 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -1,9 +1,17 @@
 description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+
     compile project(':jdbc')
+    compileOnly project(':r2dbc')
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
 
     testCompile 'org.postgresql:postgresql:42.2.12'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
+
+    testCompile testFixtures(project(':r2dbc'))
+    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
 }
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..9bfb9fdee05
--- /dev/null
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
@@ -0,0 +1,33 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+@RequiredArgsConstructor
+public final class PostgreSQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    @Delegate(types = Startable.class)
+    private final PostgreSQLContainer<?> container;
+
+    public static ConnectionFactoryOptions getOptions(PostgreSQLContainer<?> container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+            .option(ConnectionFactoryOptions.DRIVER, PostgreSQLR2DBCDatabaseContainerProvider.DRIVER)
+            .build();
+
+        return new PostgreSQLR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options.mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+}
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..5e9da980b8e
--- /dev/null
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
@@ -0,0 +1,30 @@
+package org.testcontainers.containers;
+
+import com.google.auto.service.AutoService;
+import io.r2dbc.postgresql.PostgresqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
+
+@AutoService(R2DBCDatabaseContainerProvider.class)
+public final class PostgreSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+
+    static final String DRIVER = PostgresqlConnectionFactoryProvider.POSTGRESQL_DRIVER;
+
+    @Override
+    public boolean supports(ConnectionFactoryOptions options) {
+        return DRIVER.equals(options.getRequiredValue(ConnectionFactoryOptions.DRIVER));
+    }
+
+    @Override
+    public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        String image = PostgreSQLContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        PostgreSQLContainer<?> container = new PostgreSQLContainer<>(image)
+            .withDatabaseName(options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+
+        if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
+            container.withReuse(true);
+        }
+        return new PostgreSQLR2DBCDatabaseContainer(container);
+    }
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..505b37859ba
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
@@ -0,0 +1,27 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class PostgreSQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<PostgreSQLContainer<?>> {
+
+    @Override
+    protected PostgreSQLContainer<?> createContainer() {
+        return new PostgreSQLContainer<>();
+    }
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(PostgreSQLContainer<?> container) {
+        // get_options {
+        ConnectionFactoryOptions options = PostgreSQLR2DBCDatabaseContainer.getOptions(
+            container
+        );
+        // }
+
+        return options;
+    }
+
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:postgresql:///db?TC_IMAGE_TAG=10-alpine";
+    }
+}
diff --git a/modules/postgresql/src/test/resources/logback-test.xml b/modules/postgresql/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/postgresql/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
new file mode 100644
index 00000000000..a7388ebc6d2
--- /dev/null
+++ b/modules/r2dbc/build.gradle
@@ -0,0 +1,20 @@
+plugins {
+    id "java-test-fixtures"
+}
+
+description = "Testcontainers :: R2DBC"
+
+dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+
+    compile project(':testcontainers')
+    compile 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
+
+    testCompile 'org.assertj:assertj-core:3.14.0'
+    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
+    testCompile project(':postgresql')
+
+    testFixturesCompile 'io.projectreactor:reactor-core:3.3.4.RELEASE'
+    testFixturesCompile 'org.assertj:assertj-core:3.14.0'
+}
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java
new file mode 100644
index 00000000000..e64d19a9f49
--- /dev/null
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java
@@ -0,0 +1,23 @@
+package org.testcontainers.r2dbc;
+
+import org.reactivestreams.Subscription;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+class CancellableSubscription implements Subscription {
+
+    private final AtomicBoolean cancelled = new AtomicBoolean();
+
+    @Override
+    public void request(long n) {
+    }
+
+    @Override
+    public void cancel() {
+        cancelled.set(true);
+    }
+
+    public boolean isCancelled() {
+        return cancelled.get();
+    }
+}
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java
new file mode 100644
index 00000000000..489d545429d
--- /dev/null
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java
@@ -0,0 +1,161 @@
+package org.testcontainers.r2dbc;
+
+import io.r2dbc.spi.Connection;
+import io.r2dbc.spi.ConnectionFactory;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
+
+/**
+ * Design notes:
+ * - ConnectionPublisher is Mono-like (0..1), the request amount is ignored
+ * - given the testing nature, the performance requirements are less strict
+ * - "synchronized" is used to avoid races
+ * - Reactive Streams spec violations are not checked (e.g. non-positive request)
+ */
+class ConnectionPublisher implements Publisher<Connection> {
+
+    private final Supplier<CompletableFuture<ConnectionFactory>> futureSupplier;
+
+    ConnectionPublisher(Supplier<CompletableFuture<ConnectionFactory>> futureSupplier) {
+        this.futureSupplier = futureSupplier;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super Connection> actual) {
+        actual.onSubscribe(new StateMachineSubscription(actual));
+    }
+
+    private class StateMachineSubscription implements Subscription {
+
+        private final Subscriber<? super Connection> actual;
+
+        Subscription subscriptionState;
+
+        StateMachineSubscription(Subscriber<? super Connection> actual) {
+            this.actual = actual;
+            subscriptionState = new WaitRequestSubscriptionState();
+        }
+
+        @Override
+        public synchronized void request(long n) {
+            subscriptionState.request(n);
+        }
+
+        @Override
+        public synchronized void cancel() {
+            subscriptionState.cancel();
+        }
+
+        synchronized void transitionTo(SubscriptionState newState) {
+            subscriptionState = newState;
+            newState.enter();
+        }
+
+        abstract class SubscriptionState implements Subscription {
+            void enter() {
+            }
+        }
+
+        class WaitRequestSubscriptionState extends SubscriptionState {
+
+            @Override
+            public void request(long n) {
+                transitionTo(new WaitFutureCompletionSubscriptionState());
+            }
+
+            @Override
+            public void cancel() {
+            }
+        }
+
+        class WaitFutureCompletionSubscriptionState extends SubscriptionState {
+
+            private CompletableFuture<ConnectionFactory> future;
+
+            @Override
+            void enter() {
+                this.future = futureSupplier.get();
+
+                future.whenComplete((connectionFactory, e) -> {
+                    if (e != null) {
+                        actual.onSubscribe(EmptySubscription.INSTANCE);
+                        actual.onError(e);
+                        return;
+                    }
+
+                    Publisher<? extends Connection> publisher = connectionFactory.create();
+                    transitionTo(new ProxySubscriptionState(publisher));
+                });
+            }
+
+            @Override
+            public void request(long n) {
+            }
+
+            @Override
+            public void cancel() {
+                future.cancel(true);
+            }
+        }
+
+        class ProxySubscriptionState extends SubscriptionState implements Subscriber<Connection> {
+
+            private final Publisher<? extends Connection> publisher;
+
+            private Subscription s;
+
+            private boolean cancelled = false;
+
+            ProxySubscriptionState(Publisher<? extends Connection> publisher) {
+                this.publisher = publisher;
+            }
+
+            @Override
+            void enter() {
+                publisher.subscribe(this);
+            }
+
+            @Override
+            public void request(long n) {
+                // Ignore
+            }
+
+            @Override
+            public synchronized void cancel() {
+                cancelled = true;
+                if (s != null) {
+                    s.cancel();
+                }
+            }
+
+            @Override
+            public synchronized void onSubscribe(Subscription s) {
+                this.s = s;
+                if (!cancelled) {
+                    s.request(1);
+                } else {
+                    s.cancel();
+                }
+            }
+
+            @Override
+            public void onNext(Connection connection) {
+                actual.onNext(connection);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                actual.onError(t);
+            }
+
+            @Override
+            public void onComplete() {
+                actual.onComplete();
+            }
+        }
+    }
+}
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java
new file mode 100644
index 00000000000..7828d121c6f
--- /dev/null
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java
@@ -0,0 +1,17 @@
+package org.testcontainers.r2dbc;
+
+import org.reactivestreams.Subscription;
+
+enum EmptySubscription implements Subscription {
+    INSTANCE;
+
+    @Override
+    public void request(long n) {
+
+    }
+
+    @Override
+    public void cancel() {
+
+    }
+}
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
new file mode 100644
index 00000000000..f642a60d67c
--- /dev/null
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
@@ -0,0 +1,73 @@
+package org.testcontainers.r2dbc;
+
+import com.google.auto.service.AutoService;
+import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import io.r2dbc.spi.ConnectionFactoryProvider;
+
+/**
+ * Hide inner classes that must be public due to the way {@link java.util.ServiceLoader} works
+ */
+class Hidden {
+
+    @AutoService(ConnectionFactoryProvider.class)
+    public static final class TestcontainersR2DBCConnectionFactoryProvider implements ConnectionFactoryProvider {
+
+        public static final String DRIVER = "tc";
+
+        @Override
+        public ConnectionFactory create(ConnectionFactoryOptions options) {
+            options = sanitize(options);
+            options = removeProxying(options);
+
+            return new TestcontainersR2DBCConnectionFactory(options);
+        }
+
+        private ConnectionFactoryOptions sanitize(ConnectionFactoryOptions options) {
+            ConnectionFactoryOptions.Builder builder = options.mutate();
+
+            Object reusable = options.getValue(R2DBCDatabaseContainerProvider.REUSABLE_OPTION);
+            if (reusable instanceof String) {
+                builder.option(R2DBCDatabaseContainerProvider.REUSABLE_OPTION, Boolean.valueOf((String) reusable));
+            }
+            return builder.build();
+        }
+
+        private ConnectionFactoryOptions removeProxying(ConnectionFactoryOptions options) {
+            // To delegate to the next factory provider, inspect the PROTOCOL and convert it to the next DRIVER and PROTOCOL values.
+            //
+            // example:
+            //   | Property | Input           | Output       |
+            //   |----------|-----------------|--------------|
+            //   | DRIVER   | tc              | postgres     |
+            //   | PROTOCOL | postgres        | <empty>      |
+
+            String protocol = options.getRequiredValue(ConnectionFactoryOptions.PROTOCOL);
+            if (protocol.trim().length() == 0) {
+                throw new IllegalArgumentException("Invalid protocol: " + protocol);
+            }
+            String[] protocols = protocol.split(":", 2);
+            String driverDelegate = protocols[0];
+
+            // when protocol does NOT contain COLON, the length becomes 1
+            String protocolDelegate = protocols.length == 2 ? protocols[1] : "";
+
+            return ConnectionFactoryOptions.builder()
+                .from(options)
+                .option(ConnectionFactoryOptions.DRIVER, driverDelegate)
+                .option(ConnectionFactoryOptions.PROTOCOL, protocolDelegate)
+                .build();
+        }
+
+        @Override
+        public boolean supports(ConnectionFactoryOptions options) {
+            return DRIVER.equals(options.getValue(ConnectionFactoryOptions.DRIVER));
+        }
+
+        @Override
+        public String getDriver() {
+            return DRIVER;
+        }
+
+    }
+}
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..a303cbafff8
--- /dev/null
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java
@@ -0,0 +1,9 @@
+package org.testcontainers.r2dbc;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.lifecycle.Startable;
+
+public interface R2DBCDatabaseContainer extends Startable {
+
+    ConnectionFactoryOptions configure(ConnectionFactoryOptions options);
+}
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..2eabc0d521b
--- /dev/null
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
@@ -0,0 +1,15 @@
+package org.testcontainers.r2dbc;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import io.r2dbc.spi.Option;
+
+public interface R2DBCDatabaseContainerProvider {
+
+    Option<Boolean> REUSABLE_OPTION = Option.valueOf("TC_REUSABLE");
+
+    Option<String> IMAGE_TAG_OPTION = Option.valueOf("TC_IMAGE_TAG");
+
+    boolean supports(ConnectionFactoryOptions options);
+
+    R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options);
+}
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
new file mode 100644
index 00000000000..1a0fc57ad8c
--- /dev/null
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
@@ -0,0 +1,104 @@
+package org.testcontainers.r2dbc;
+
+import io.r2dbc.spi.Closeable;
+import io.r2dbc.spi.Connection;
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.reactivestreams.Publisher;
+import org.testcontainers.lifecycle.Startable;
+
+import java.util.ServiceLoader;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.StreamSupport;
+
+class TestcontainersR2DBCConnectionFactory implements ConnectionFactory, Closeable {
+
+    private static final AtomicLong THREAD_COUNT = new AtomicLong();
+
+    private static final Executor EXECUTOR = Executors.newCachedThreadPool(r -> {
+        Thread thread = new Thread(r);
+        thread.setName("testcontainers-r2dbc-" + THREAD_COUNT.getAndIncrement());
+        thread.setDaemon(true);
+        return thread;
+    });
+
+    private final ConnectionFactoryOptions options;
+
+    private final R2DBCDatabaseContainerProvider containerProvider;
+
+    private CompletableFuture<R2DBCDatabaseContainer> future;
+
+    TestcontainersR2DBCConnectionFactory(ConnectionFactoryOptions options) {
+        this.options = options;
+
+        containerProvider = StreamSupport.stream(ServiceLoader.load(R2DBCDatabaseContainerProvider.class).spliterator(), false)
+            .filter(it -> it.supports(options))
+            .findAny()
+            .orElseThrow(() -> new IllegalArgumentException("Missing provider for " + options));
+    }
+
+    @Override
+    public Publisher<? extends Connection> create() {
+        return new ConnectionPublisher(
+            () -> {
+                if (future == null) {
+                    synchronized (this) {
+                        if (future == null) {
+                            future = CompletableFuture.supplyAsync(() -> {
+                                R2DBCDatabaseContainer container = containerProvider.createContainer(options);
+                                container.start();
+                                return container;
+                            }, EXECUTOR);
+                        }
+                    }
+                }
+                return future.thenApply(it -> {
+                    return ConnectionFactories.find(
+                        it.configure(options)
+                    );
+                });
+            }
+        );
+    }
+
+    @Override
+    public ConnectionFactoryMetadata getMetadata() {
+        // TODO check whether it is fine to call it without setting the host/port and other values
+        return ConnectionFactories.find(options).getMetadata();
+    }
+
+    @Override
+    public Publisher<Void> close() {
+        return s -> {
+            CompletableFuture<R2DBCDatabaseContainer> futureRef;
+            synchronized (this) {
+                futureRef = this.future;
+                this.future = null;
+            }
+
+            CancellableSubscription subscription = new CancellableSubscription();
+            s.onSubscribe(subscription);
+
+            if (futureRef == null) {
+                if (!subscription.isCancelled()) {
+                    s.onComplete();
+                }
+            } else {
+                futureRef.thenAcceptAsync(Startable::stop, EXECUTOR);
+
+                EXECUTOR.execute(() -> {
+                    futureRef.cancel(true);
+                    if (!subscription.isCancelled()) {
+                        s.onComplete();
+                    }
+                });
+            }
+        };
+    }
+
+}
diff --git a/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
new file mode 100644
index 00000000000..6fad93f0e2a
--- /dev/null
+++ b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
@@ -0,0 +1,79 @@
+package org.testcontainers.r2dbc;
+
+import io.r2dbc.postgresql.api.PostgresqlException;
+import io.r2dbc.spi.Closeable;
+import io.r2dbc.spi.Connection;
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.Result;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestcontainersR2DBCConnectionFactoryTest {
+
+    @Test
+    public void failsOnUnknownProvider() {
+        String nonExistingProvider = UUID.randomUUID().toString();
+        Assertions
+            .assertThatThrownBy(() -> {
+                ConnectionFactories.get(String.format("r2dbc:tc:%s:///db", nonExistingProvider));
+            })
+            .hasMessageContaining("Missing provider")
+            .hasMessageContaining(nonExistingProvider);
+    }
+
+    @Test
+    public void reusesUntilConnectionFactoryIsClosed() {
+        String url = "r2dbc:tc:postgresql:///db?TC_IMAGE_TAG=10-alpine";
+        ConnectionFactory connectionFactory = ConnectionFactories.get(url);
+
+        Integer updated = Flux
+            .usingWhen(
+                connectionFactory.create(),
+                connection -> {
+                    return Mono
+                        .from(connection.createStatement("CREATE TABLE test(id integer PRIMARY KEY)").execute())
+                        .thenMany(connection.createStatement("INSERT INTO test(id) VALUES(123)").execute())
+                        .flatMap(Result::getRowsUpdated);
+                },
+                Connection::close
+            )
+            .blockFirst();
+
+        assertThat(updated).isEqualTo(1);
+
+        Flux<Long> select = Flux
+            .usingWhen(
+                Flux.defer(connectionFactory::create),
+                connection -> {
+                    return Flux
+                        .from(connection.createStatement("SELECT COUNT(*) FROM test").execute())
+                        .flatMap(it -> it.map((row, meta) -> (Long) row.get(0)));
+                },
+                Connection::close
+            );
+
+        Long rows = select.blockFirst();
+
+        assertThat(rows).isEqualTo(1);
+
+        close(connectionFactory);
+
+        Assertions
+            .assertThatThrownBy(select::blockFirst)
+            .isInstanceOf(PostgresqlException.class)
+            // relation "X" does not exists
+            // https://github.com/postgres/postgres/blob/REL_10_0/src/backend/utils/errcodes.txt#L349
+            .returns("42P01", e -> ((PostgresqlException) e).getErrorDetails().getCode());
+    }
+
+    private static void close(ConnectionFactory connectionFactory) {
+        Mono.from(((Closeable) connectionFactory).close()).block();
+    }
+}
diff --git a/modules/r2dbc/src/test/resources/logback-test.xml b/modules/r2dbc/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/r2dbc/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..7f14ecca2a7
--- /dev/null
+++ b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
@@ -0,0 +1,64 @@
+package org.testcontainers.r2dbc;
+
+import io.r2dbc.spi.Closeable;
+import io.r2dbc.spi.Connection;
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class AbstractR2DBCDatabaseContainerTest<T extends GenericContainer<?>> {
+
+    protected abstract ConnectionFactoryOptions getOptions(T container);
+
+    protected abstract String createR2DBCUrl();
+
+    protected String createTestQuery(int result) {
+        return String.format("SELECT %d", result);
+    }
+
+    @Test
+    public final void testGetOptions() {
+        try (T container = createContainer()) {
+            container.start();
+
+            ConnectionFactory connectionFactory = ConnectionFactories.get(getOptions(container));
+            runTestQuery(connectionFactory);
+        }
+    }
+
+    @Test
+    public final void testUrlSupport() {
+        ConnectionFactory connectionFactory = ConnectionFactories.get(createR2DBCUrl());
+        runTestQuery(connectionFactory);
+    }
+
+    protected abstract T createContainer();
+
+    protected void runTestQuery(ConnectionFactory connectionFactory) {
+        try {
+            int expected = 42;
+            Number result = Flux
+                .usingWhen(
+                    connectionFactory.create(),
+                    connection -> connection.createStatement(createTestQuery(expected)).execute(),
+                    Connection::close
+                )
+                .flatMap(it -> it.map((row, meta) -> (Number) row.get(0)))
+                .blockFirst();
+
+            assertThat(result)
+                .isNotNull()
+                .returns(expected, Number::intValue);
+        } finally {
+            if (connectionFactory instanceof Closeable) {
+                Mono.from(((Closeable) connectionFactory).close()).block();
+            }
+        }
+    }
+}

From 8dede0455827f89c03e753ee75dc70326303de68 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 12 Apr 2020 19:58:19 +0200
Subject: [PATCH 0590/4969] fix the shading exclusion list

---
 core/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/build.gradle b/core/build.gradle
index 01575f0d351..84a20425cc5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -50,6 +50,7 @@ shadowJar {
         'META-INF/services/javax.ws.rs.ext.*',
         'META-INF/services/java.security.Provider',
         'mozilla/public-suffix-list.txt',
+        'module-info.class',
     ].each { exclude(it) }
 
     project.afterEvaluate {

From 631a3f46971156e65f3f9843624acd4188768b71 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Sun, 12 Apr 2020 20:08:18 +0200
Subject: [PATCH 0591/4969] Support VNC recording with
 BrowserWebdriverContainer in Spock-Extension (#2548)

Initially done as part of the Hackergarten at Gr8ConfEU 2018.
Thanks to Tamer Shahin, Marcin Erdmann and Dawid Kublik for working on this!

Fixes #631.
---
 modules/spock/build.gradle                    |  2 +
 .../spock/SpockTestDescription.groovy         | 36 ++++++++
 .../spock/TestcontainersExtension.groovy      | 17 +++-
 .../TestcontainersMethodInterceptor.groovy    | 25 +++++-
 .../spock/BrowserVncRecordingIT.groovy        | 88 +++++++++++++++++++
 5 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
 create mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 2bcf7431808..d091ce068dc 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -8,8 +8,10 @@ dependencies {
     compile project(':testcontainers')
     compile 'org.spockframework:spock-core:1.3-groovy-2.5'
 
+    testCompile project(':selenium')
     testCompile project(':mysql')
     testCompile project(':postgresql')
+
     testCompile 'com.zaxxer:HikariCP:3.4.2'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
new file mode 100644
index 00000000000..85b58724000
--- /dev/null
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
@@ -0,0 +1,36 @@
+package org.testcontainers.spock
+
+import groovy.transform.PackageScope
+import org.spockframework.runtime.extension.IMethodInvocation
+import org.testcontainers.lifecycle.TestDescription
+
+/**
+ * Spock specific implementation of a Testcontainers TestDescription.
+ *
+ * Filesystem friendly name is based on Specification and Feature.
+ */
+@PackageScope
+class SpockTestDescription implements TestDescription {
+
+    String specName
+    String featureName
+
+    static SpockTestDescription fromTestDescription(IMethodInvocation invocation) {
+        return new SpockTestDescription([
+            specName: invocation.spec.name,
+            featureName: invocation.feature.name
+        ])
+    }
+
+    @Override
+    String getTestId() {
+        return getFilesystemFriendlyName()
+    }
+
+    @Override
+    String getFilesystemFriendlyName() {
+        return [specName, featureName].collect {
+            URLEncoder.encode(it, 'UTF-8')
+        }.join('-')
+    }
+}
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
index 9f26cf95451..1f66fd8f596 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
@@ -1,17 +1,32 @@
 package org.testcontainers.spock
 
+import org.spockframework.runtime.AbstractRunListener
 import org.spockframework.runtime.extension.AbstractAnnotationDrivenExtension
+import org.spockframework.runtime.model.ErrorInfo
 import org.spockframework.runtime.model.SpecInfo
 
 class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcontainers> {
 
     @Override
     void visitSpecAnnotation(Testcontainers annotation, SpecInfo spec) {
-        def interceptor = new TestcontainersMethodInterceptor(spec)
+        def listener = new ErrorListener()
+        def interceptor = new TestcontainersMethodInterceptor(spec, listener)
         spec.addSetupSpecInterceptor(interceptor)
         spec.addCleanupSpecInterceptor(interceptor)
         spec.addSetupInterceptor(interceptor)
         spec.addCleanupInterceptor(interceptor)
+
+        spec.addListener(listener)
+
+    }
+
+    private class ErrorListener extends AbstractRunListener {
+        List<ErrorInfo> errors = []
+
+        @Override
+        void error(ErrorInfo error) {
+            errors.add(error)
+        }
     }
 
 }
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
index d4b6f3ccc9d..a70ec0d6e53 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
@@ -6,13 +6,17 @@ import org.spockframework.runtime.model.FieldInfo
 import org.spockframework.runtime.model.SpecInfo
 import org.testcontainers.containers.DockerComposeContainer
 import org.testcontainers.containers.GenericContainer
+import org.testcontainers.lifecycle.TestLifecycleAware
+import org.testcontainers.spock.TestcontainersExtension.ErrorListener
 
 class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 
     private final SpecInfo spec
+    private final ErrorListener errorListener
 
-    TestcontainersMethodInterceptor(SpecInfo spec) {
+    TestcontainersMethodInterceptor(SpecInfo spec, ErrorListener errorListener) {
         this.spec = spec
+        this.errorListener = errorListener
     }
 
     @Override
@@ -50,6 +54,13 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 
     @Override
     void interceptCleanupMethod(IMethodInvocation invocation) throws Throwable {
+        findAllTestLifecycleAwareContainers(invocation).each {
+            // we assume first error is the one we want
+            def maybeException = Optional.ofNullable(errorListener.errors[0]?.exception)
+            def testDescription = SpockTestDescription.fromTestDescription(invocation)
+            it.afterTest(testDescription, maybeException)
+        }
+
         def containers = findAllContainers(false)
         stopContainers(containers, invocation)
 
@@ -65,6 +76,14 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
         }
     }
 
+    private List<TestLifecycleAware> findAllTestLifecycleAwareContainers(IMethodInvocation invocation) {
+        spec.allFields.findAll { FieldInfo f ->
+            TestLifecycleAware.isAssignableFrom(f.type)
+        }.collect {
+            it.readValue(invocation.instance) as TestLifecycleAware
+        }
+    }
+
     private List<FieldInfo> findAllComposeContainers(boolean shared) {
         spec.allFields.findAll { FieldInfo f ->
             DockerComposeContainer.isAssignableFrom(f.type) && f.shared == shared
@@ -90,14 +109,14 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
     private static void startComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
         compose.each { FieldInfo f ->
             DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
-            c.starting(null)
+            c.start()
         }
     }
 
     private static void stopComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
         compose.each { FieldInfo f ->
             DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
-            c.finished(null)
+            c.stop()
         }
     }
 
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy
new file mode 100644
index 00000000000..794032a58c4
--- /dev/null
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy
@@ -0,0 +1,88 @@
+package org.testcontainers.spock
+
+import org.intellij.lang.annotations.Language
+import org.junit.Rule
+import org.junit.rules.TemporaryFolder
+import spock.lang.Specification
+import spock.lang.Unroll
+import spock.util.EmbeddedSpecRunner
+
+import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL
+import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_FAILING
+
+class BrowserVncRecordingIT extends Specification {
+
+    @Rule
+    TemporaryFolder temp
+
+    String recordingDir
+
+    def setup() {
+        recordingDir = temp.getRoot().getAbsolutePath()
+    }
+
+    @Unroll("For recording mode #recordingMode and failing test is #fails records video file named '#videoFileName'")
+    def "retains all recordings for RECORD_ALL if successful"() {
+        given:
+
+        //noinspection GrPackage
+        @Language("groovy")
+        String myTest = """
+package org.testcontainers.spock
+
+import org.openqa.selenium.chrome.ChromeOptions
+import org.openqa.selenium.remote.RemoteWebDriver
+import org.testcontainers.containers.BrowserWebDriverContainer
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode
+
+@Testcontainers
+class BrowserWebdriverContainerIT extends Specification {
+
+    BrowserWebDriverContainer browserContainer = new BrowserWebDriverContainer()
+        .withCapabilities(new ChromeOptions())
+        .withRecordingMode("$recordingMode" as VncRecordingMode, new File("$recordingDir"))
+
+    RemoteWebDriver driver
+
+    def setup() {
+        driver = browserContainer.getWebDriver()
+        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS)
+    }
+
+    def "should record"() {
+        when:
+        driver.get("http://en.wikipedia.org/wiki/Randomness")
+
+        then:
+        driver.findElementByPartialLinkText("pattern").isDisplayed() == !$fails
+    }
+
+}
+
+
+"""
+
+        when:
+        EmbeddedSpecRunner runner = new EmbeddedSpecRunner(throwFailure: false)
+        runner.run(myTest)
+
+        then:
+        def videoDir = temp.getRoot().list()
+        if (videoFileName.isEmpty()) {
+            videoDir.length == 0
+        } else {
+            videoDir.find { it.contains(videoFileName) }
+        }
+
+        where:
+        recordingMode  | fails | videoFileName
+        RECORD_ALL     | false | 'BrowserWebdriverContainerIT-should+record'
+        RECORD_FAILING | false | ''
+        RECORD_FAILING | true  | 'BrowserWebdriverContainerIT-should+record'
+    }
+
+}

From c6e0cd9faf83a160bf1cb4b3f0b6b7b9535daad2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 12 Apr 2020 20:23:51 +0200
Subject: [PATCH 0592/4969] Rewrite Couchbase module. closes #2447 (#2491)

* Rewrite couchbase module. closes #2447

This changeset completely reworks the couchbase module and hopefully
greatly improve the out-of-the-box experience. Note that this is a
breaking change over the previous code because by intention it does
NOT depend on SDK 2 so you can test SDK 2 and 3 with it at the same
time.

Highlights:

 - Removed the need for a SDK, so both 2 and 3 can be used with it.
 - Updated to 6.5.0 baseline and using alternate addresses for
   "proper" port exposure without having to rely on the socat
   proxy container like the previous version had to.
 - Allows to define which services should be exposed and handles
   states automatically (i.e. will not try to create the primary
   index if the query service is not enabled).

Note that a bunch of tests have been removed since they are not
adequate anymore. A side effect of the alternate address change
is that older servers cannot be used. 6.5.0 is available in both
CE and EE, and Couchbase in general allows EE versions to be used
in development and testing so we should use it if we can.

* Wait until query respsonds with 200

* fixes

* add `getBootstrap*DirectPort()` methods, review fixes

* Restore `getConnectionString()`

* Apply suggestions from code review

Co-Authored-By: Kevin Wittek <kiview@users.noreply.github.com>

* Update docs

* Update docs (2)

Co-authored-by: Michael Nitschinger <michael@nitschinger.at>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/modules/databases/couchbase.md           |  78 +-
 modules/couchbase/build.gradle                |   3 +-
 .../couchbase/AbstractCouchbaseTest.java      |  72 --
 .../couchbase/BucketDefinition.java           |  69 ++
 .../couchbase/CouchbaseContainer.java         | 683 +++++++++---------
 .../CouchbaseQueryServiceWaitStrategy.java    |  55 --
 .../couchbase/CouchbaseService.java           |  44 ++
 .../couchbase/BaseCouchbaseContainerTest.java |  82 ---
 .../couchbase/Couchbase4_6Test.java           |  14 -
 .../couchbase/Couchbase5_1Test.java           |  14 -
 .../couchbase/Couchbase5_5Test.java           |  14 -
 .../couchbase/CouchbaseCommunity5_1Test.java  |  32 -
 .../couchbase/CouchbaseContainerTest.java     |  78 +-
 13 files changed, 530 insertions(+), 708 deletions(-)
 delete mode 100644 modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java
 create mode 100644 modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
 delete mode 100644 modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseQueryServiceWaitStrategy.java
 create mode 100644 modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
 delete mode 100644 modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
 delete mode 100644 modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java
 delete mode 100644 modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java
 delete mode 100644 modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java
 delete mode 100644 modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java

diff --git a/docs/modules/databases/couchbase.md b/docs/modules/databases/couchbase.md
index f6d014a42d4..b71ee5de327 100644
--- a/docs/modules/databases/couchbase.md
+++ b/docs/modules/databases/couchbase.md
@@ -8,65 +8,25 @@ Testcontainers module for Couchbase. [Couchbase](https://www.couchbase.com/) is
 
 Running Couchbase as a stand-in in a test:
 
-### Create your own bucket
-
-```java
-public class SomeTest {
-
-    @Rule
-    public CouchbaseContainer couchbase = new CouchbaseContainer()
-             .withClusterAdmin("admin", "secret")
-             .withNewBucket(DefaultBucketSettings.builder()
-                        .enableFlush(true)
-                        .name("bucket-name")
-                        .password("secret")
-                        .quota(100)
-                        .type(BucketType.COUCHBASE)
-                        .build());
-    
-    @Test
-    public void someTestMethod() {
-        Bucket bucket = couchbase.getCouchbaseCluster().openBucket("bucket-name");
-        
-        // ... interact with client as if using Couchbase normally
-    }
-}
-```
-
-### Use preconfigured default bucket
-
-Bucket is cleared after each test
-
-```java
-public class SomeTest extends AbstractCouchbaseTest {
-
-    @Test
-    public void someTestMethod() {
-        Bucket bucket = getBucket();
-        
-        // ... interact with client as if using Couchbase normally
-    }
-}
-```
-
-### Special consideration
-
-Couchbase container is configured to use random available [ports](https://developer.couchbase.com/documentation/server/current/install/install-ports.html) for some ports only, as [Couchbase Java SDK](https://developer.couchbase.com/documentation/server/current/sdk/java/start-using-sdk.html) permit to configure only some ports: 
-
-- **8091** : REST/HTTP traffic ([bootstrapHttpDirectPort](http://docs.couchbase.com/sdk-api/couchbase-java-client-2.4.6/com/couchbase/client/java/env/DefaultCouchbaseEnvironment.Builder.html#bootstrapCarrierDirectPort-int-))
-- **18091** : REST/HTTP traffic with SSL ([bootstrapHttpSslPort](http://docs.couchbase.com/sdk-api/couchbase-java-client-2.4.6/com/couchbase/client/java/env/DefaultCouchbaseEnvironment.Builder.html#bootstrapCarrierSslPort-int-))
-- **11210** : memcached ([bootstrapCarrierDirectPort](http://docs.couchbase.com/sdk-api/couchbase-java-client-2.4.6/com/couchbase/client/java/env/DefaultCouchbaseEnvironment.Builder.html#bootstrapCarrierDirectPort-int-))
-- **11207** : memcached SSL ([bootstrapCarrierSslPort](http://docs.couchbase.com/sdk-api/couchbase-java-client-2.4.6/com/couchbase/client/java/env/DefaultCouchbaseEnvironment.Builder.html#bootstrapCarrierSslPort-int-))
-
-All other ports cannot be changed by Java SDK, there are sadly fixed:
-
-- **8092** : Queries, views, XDCR
-- **8093** : REST/HTTP Query service
-- **8094** : REST/HTTP Search Service
-- **8095** : REST/HTTP Analytic service
-
-So if you disable Query, Search and Analytic service, you can run multiple instance of this container, otherwise, you're stuck with one instance, for now.
-
+1. Define a bucket:
+    <!--codeinclude-->
+    [Bucket Definition](../../../modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java) inside_block:bucket_definition
+    <!--/codeinclude-->
+
+2. define a container:
+    <!--codeinclude-->
+    [Container definition](../../../modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java) inside_block:container_definition
+    <!--/codeinclude-->
+
+3. create an environment & cluster:
+    <!--codeinclude-->
+    [Cluster creation](../../../modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java) inside_block:cluster_creation
+    <!--/codeinclude-->
+
+4. authenticate:
+    <!--codeinclude-->
+    [Authentication](../../../modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java) inside_block:auth
+    <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
 
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 66f29fc4718..095f8828aac 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,7 +2,6 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'com.couchbase.client:java-client:2.7.13'
 
-    testCompile project(':test-support')
+    testCompile 'com.couchbase.client:java-client:2.7.13'
 }
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java
deleted file mode 100644
index 7fd99ca9fbc..00000000000
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.testcontainers.couchbase;
-
-import com.couchbase.client.java.Bucket;
-import com.couchbase.client.java.CouchbaseCluster;
-import com.couchbase.client.java.bucket.BucketType;
-import com.couchbase.client.java.cluster.BucketSettings;
-import com.couchbase.client.java.cluster.DefaultBucketSettings;
-import com.couchbase.client.java.query.N1qlParams;
-import com.couchbase.client.java.query.N1qlQuery;
-import com.couchbase.client.java.query.consistency.ScanConsistency;
-import org.junit.After;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Basic class that can be used for couchbase tests. It will clear the database after every test.
- */
-public abstract class AbstractCouchbaseTest {
-
-    public static final String TEST_BUCKET = "test";
-
-    public static final String DEFAULT_PASSWORD = "password";
-
-    Bucket bucket;
-
-    @After
-    public void clear() {
-        try {
-            if (getCouchbaseContainer().isIndex() && getCouchbaseContainer().isQuery() && getCouchbaseContainer().isPrimaryIndex()) {
-                getBucket().query(
-                    N1qlQuery.simple(String.format("DELETE FROM `%s`", getBucket().name()),
-                        N1qlParams.build().consistency(ScanConsistency.STATEMENT_PLUS)));
-            } else {
-                getBucket().bucketManager().flush();
-            }
-        } finally {
-            bucket.close(60, TimeUnit.SECONDS);
-            bucket = null;
-        }
-    }
-
-    protected abstract CouchbaseContainer getCouchbaseContainer();
-
-    protected static CouchbaseContainer initCouchbaseContainer(String imageName) {
-        CouchbaseContainer couchbaseContainer = (imageName == null) ? new CouchbaseContainer() : new CouchbaseContainer(imageName);
-        couchbaseContainer.withNewBucket(getDefaultBucketSettings());
-        return couchbaseContainer;
-    }
-
-    protected static BucketSettings getDefaultBucketSettings() {
-        return DefaultBucketSettings.builder()
-            .enableFlush(true)
-            .name(TEST_BUCKET)
-            .password(DEFAULT_PASSWORD)
-            .quota(100)
-            .replicas(0)
-            .type(BucketType.COUCHBASE)
-            .build();
-    }
-
-    protected synchronized Bucket getBucket() {
-        if (bucket == null) {
-            bucket = openBucket(TEST_BUCKET, DEFAULT_PASSWORD);
-        }
-        return bucket;
-    }
-
-    private Bucket openBucket(String bucketName, String password) {
-        CouchbaseCluster cluster = getCouchbaseContainer().getCouchbaseCluster();
-        return cluster.openBucket(bucketName, password);
-    }
-}
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
new file mode 100644
index 00000000000..8c2b11403ad
--- /dev/null
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.testcontainers.couchbase;
+
+/**
+ * Allows to configure the properties of a bucket that should be created.
+ */
+public class BucketDefinition {
+
+    private final String name;
+    private boolean queryPrimaryIndex = true;
+    private int quota = 100;
+
+    public BucketDefinition(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * Sets a custom bucket quota (100MB by default).
+     *
+     * @param quota the quota to set for the bucket.
+     * @return this {@link BucketDefinition} for chaining purposes.
+     */
+    public BucketDefinition withQuota(final int quota) {
+        if (quota < 100) {
+          throw new IllegalArgumentException("Bucket quota cannot be less than 100MB!");
+        }
+        this.quota = quota;
+        return this;
+    }
+
+    /**
+     * Allows to disable creating a primary index for this bucket (enabled by default).
+     *
+     * @param create if false, a primary index will not be created.
+     * @return this {@link BucketDefinition} for chaining purposes.
+     */
+    public BucketDefinition withPrimaryIndex(final boolean create) {
+        this.queryPrimaryIndex = create;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean hasPrimaryIndex() {
+        return queryPrimaryIndex;
+    }
+
+    public int getQuota() {
+        return quota;
+    }
+
+}
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index e43cf8f652d..14e5744bb6d 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Couchbase, Inc.
+ * Copyright (c) 2020 Couchbase, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,447 +15,424 @@
  */
 package org.testcontainers.couchbase;
 
-import com.couchbase.client.core.utils.Base64;
-import com.couchbase.client.java.Bucket;
-import com.couchbase.client.java.CouchbaseCluster;
-import com.couchbase.client.java.cluster.*;
-import com.couchbase.client.java.env.CouchbaseEnvironment;
-import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
-import com.couchbase.client.java.query.Index;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.google.common.collect.Lists;
-import lombok.*;
-import org.apache.commons.compress.utils.Sets;
-import org.apache.commons.io.IOUtils;
-import org.jetbrains.annotations.NotNull;
+import com.github.dockerjava.api.model.ContainerNetwork;
+import okhttp3.Credentials;
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
-import org.testcontainers.containers.SocatContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
-import org.testcontainers.images.builder.Transferable;
-import org.testcontainers.utility.ThrowingFunction;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.net.HttpURLConnection.HTTP_OK;
-import static org.testcontainers.couchbase.CouchbaseContainer.CouchbasePort.*;
 
 /**
- * Based on Laurent Doguin version,
+ * The couchbase container initializes and configures a Couchbase Server single node cluster.
  * <p>
- * optimized by Tayeb Chlyah
+ * Note that it does not depend on a specific couchbase SDK, so it can be used with both the Java SDK 2 and 3 as well
+ * as the Scala SDK 1 or newer. We recommend using the latest and greatest SDKs for the best experience.
  */
-@AllArgsConstructor
 public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
-    public static final String VERSION = "5.5.1";
-    public static final String DOCKER_IMAGE_NAME = "couchbase/server:";
-    public static final ObjectMapper MAPPER = new ObjectMapper();
-    public static final String STATIC_CONFIG = "/opt/couchbase/etc/couchbase/static_config";
-    public static final String CAPI_CONFIG = "/opt/couchbase/etc/couchdb/default.d/capi.ini";
+    private static final int MGMT_PORT = 8091;
+
+    private static final int MGMT_SSL_PORT = 18091;
+
+    private static final int VIEW_PORT = 8092;
 
-    private static final int REQUIRED_DEFAULT_PASSWORD_LENGTH = 6;
+    private static final int VIEW_SSL_PORT = 18092;
 
-    private String memoryQuota = "300";
+    private static final int QUERY_PORT = 8093;
 
-    private String indexMemoryQuota = "300";
+    private static final int QUERY_SSL_PORT = 18093;
 
-    private String clusterUsername = "Administrator";
+    private static final int SEARCH_PORT = 8094;
 
-    private String clusterPassword = "password";
+    private static final int SEARCH_SSL_PORT = 18094;
 
-    private boolean keyValue = true;
+    private static final int KV_PORT = 11210;
 
-    @Getter
-    private boolean query = true;
+    private static final int KV_SSL_PORT = 11207;
 
-    @Getter
-    private boolean index = true;
+    private static final String DOCKER_IMAGE_NAME = "couchbase/server";
 
-    @Getter
-    private boolean primaryIndex = true;
+    private static final String VERSION = "6.5.0";
 
-    @Getter
-    private boolean fts = false;
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
-    @Getter(lazy = true)
-    private final CouchbaseEnvironment couchbaseEnvironment = createCouchbaseEnvironment();
+    private static final OkHttpClient HTTP_CLIENT = new OkHttpClient();
 
-    @Getter(lazy = true)
-    private final CouchbaseCluster couchbaseCluster = createCouchbaseCluster();
+    private String username = "Administrator";
 
-    private List<BucketAndUserSettings> newBuckets = new ArrayList<>();
+    private String password = "password";
 
-    private String urlBase;
+    private Set<CouchbaseService> enabledServices = EnumSet.allOf(CouchbaseService.class);
 
-    private SocatContainer proxy;
+    private final List<BucketDefinition> buckets = new ArrayList<>();
 
+    /**
+     * Creates a new couchbase container with the default image and version.
+     */
     public CouchbaseContainer() {
-        this(DOCKER_IMAGE_NAME + VERSION);
+        this(DOCKER_IMAGE_NAME + ":" + VERSION);
     }
 
-    public CouchbaseContainer(String imageName) {
+    /**
+     * Creates a new couchbase container with a custom image name.
+     *
+     * @param imageName the image name that should be used.
+     */
+    public CouchbaseContainer(final String imageName) {
         super(imageName);
-
-        withNetwork(Network.SHARED);
-        setWaitStrategy(new HttpWaitStrategy().forPath("/ui/index.html"));
     }
 
-    @Override
-    public Set<Integer> getLivenessCheckPortNumbers() {
-        return Sets.newHashSet(getMappedPort(REST));
+    /**
+     * Set custom username and password for the admin user.
+     *
+     * @param username the admin username to use.
+     * @param password the password for the admin user.
+     * @return this {@link CouchbaseContainer} for chaining purposes.
+     */
+    public CouchbaseContainer withCredentials(final String username, final String password) {
+        checkNotRunning();
+        this.username = username;
+        this.password = password;
+        return this;
     }
 
-    @Override
-    protected void configure() {
-        if (clusterPassword.length() < REQUIRED_DEFAULT_PASSWORD_LENGTH) {
-            logger().warn("The provided cluster admin password length is less then the default password policy length. " +
-                "Cluster start will fail if configured password requirements are not met.");
-        }
+    public CouchbaseContainer withBucket(final BucketDefinition bucketDefinition) {
+        checkNotRunning();
+        this.buckets.add(bucketDefinition);
+        return this;
     }
 
-    @Override
-    @SneakyThrows
-    protected void doStart() {
-        startProxy(getNetworkAliases().get(0));
-        try {
-            super.doStart();
-        } catch (Throwable e) {
-            proxy.stop();
-            throw e;
-        }
+    public CouchbaseContainer withEnabledServices(final CouchbaseService... enabled) {
+        checkNotRunning();
+        this.enabledServices = EnumSet.copyOf(Arrays.asList(enabled));
+        return this;
     }
 
-    @SneakyThrows
-    private void startProxy(String networkAlias) {
-        proxy = new SocatContainer().withNetwork(getNetwork());
-
-        for (CouchbasePort port : CouchbasePort.values()) {
-            if (port.isDynamic()) {
-                proxy.withTarget(port.getOriginalPort(), networkAlias);
-            } else {
-                proxy.addExposedPort(port.getOriginalPort());
-            }
-        }
-
-        proxy.setWaitStrategy(null);
-        proxy.start();
-
-        ExecCreateCmdResponse createCmdResponse = dockerClient
-            .execCreateCmd(proxy.getContainerId())
-            .withCmd(
-                "sh",
-                "-c",
-                Stream.of(CouchbasePort.values())
-                    .map(port -> {
-                        return "/usr/bin/socat " +
-                            "TCP-LISTEN:" + port.getOriginalPort() + ",fork,reuseaddr " +
-                            "TCP:" + networkAlias + ":" + getMappedPort(port);
-                    })
-                    .collect(Collectors.joining(" & ", "true", ""))
-            )
-            .exec();
-
-        dockerClient.execStartCmd(createCmdResponse.getId())
-            .start()
-            .awaitCompletion(10, TimeUnit.SECONDS);
+    public final String getUsername() {
+        return username;
     }
 
-    @Override
-    public List<Integer> getExposedPorts() {
-        return proxy.getExposedPorts();
+    public final String getPassword() {
+        return password;
     }
 
-    @Override
-    public String getContainerIpAddress() {
-        return proxy.getContainerIpAddress();
+    public int getBootstrapCarrierDirectPort() {
+        return getMappedPort(KV_PORT);
     }
 
-    @Override
-    public Integer getMappedPort(int originalPort) {
-        return proxy.getMappedPort(originalPort);
+    public int getBootstrapHttpDirectPort() {
+        return getMappedPort(MGMT_PORT);
     }
 
-    protected Integer getMappedPort(CouchbasePort port) {
-        return getMappedPort(port.getOriginalPort());
+    public String getConnectionString() {
+        return String.format("couchbase://%s:%d", getContainerIpAddress(), getBootstrapCarrierDirectPort());
     }
 
     @Override
-    public List<Integer> getBoundPortNumbers() {
-        return proxy.getBoundPortNumbers();
-    }
-
-    @Override
-    @SuppressWarnings({"unchecked", "ConstantConditions"})
-    public void stop() {
-        try {
-            stopCluster();
-            ((AtomicReference<Object>) (Object) couchbaseEnvironment).set(null);
-            ((AtomicReference<Object>) (Object) couchbaseCluster).set(null);
-        } finally {
-            Stream.<Runnable>of(super::stop, proxy::stop).parallel().forEach(Runnable::run);
+    protected void configure() {
+        super.configure();
+
+        WaitAllStrategy waitStrategy = new WaitAllStrategy();
+
+        // Makes sure that all nodes in the cluster are healthy.
+        waitStrategy = waitStrategy.withStrategy(
+            new HttpWaitStrategy()
+                .forPath("/pools/default")
+                .forPort(MGMT_PORT)
+                .withBasicCredentials(username, password)
+                .forStatusCode(200)
+                .forResponsePredicate(response -> {
+                    try {
+                        return Optional.of(MAPPER.readTree(response))
+                            .map(n -> n.at("/nodes/0/status"))
+                            .map(JsonNode::asText)
+                            .map("healthy"::equals)
+                            .orElse(false);
+                    } catch (IOException e) {
+                        logger().error("Unable to parse response {}", response);
+                        return false;
+                    }
+                })
+        );
+
+        if (enabledServices.contains(CouchbaseService.QUERY)) {
+            waitStrategy = waitStrategy.withStrategy(
+                new HttpWaitStrategy()
+                    .forPath("/admin/ping")
+                    .forPort(QUERY_PORT)
+                    .withBasicCredentials(username, password)
+                    .forStatusCode(200)
+            );
         }
-    }
-
-    private void stopCluster() {
-        getCouchbaseCluster().disconnect();
-        getCouchbaseEnvironment().shutdown();
-    }
-
-    public CouchbaseContainer withNewBucket(BucketSettings bucketSettings) {
-        newBuckets.add(new BucketAndUserSettings(bucketSettings));
-        return self();
-    }
 
-    public CouchbaseContainer withNewBucket(BucketSettings bucketSettings, UserSettings userSettings) {
-        newBuckets.add(new BucketAndUserSettings(bucketSettings, userSettings));
-        return self();
+        waitingFor(waitStrategy);
     }
 
-    @SneakyThrows
-    public void initCluster() {
-        urlBase = String.format("http://%s:%s", getContainerIpAddress(), getMappedPort(REST));
-        String poolURL = "/pools/default";
-        String poolPayload = "memoryQuota=" + URLEncoder.encode(memoryQuota, "UTF-8") + "&indexMemoryQuota=" + URLEncoder.encode(indexMemoryQuota, "UTF-8");
-
-        String setupServicesURL = "/node/controller/setupServices";
-        StringBuilder servicePayloadBuilder = new StringBuilder();
-        if (keyValue) {
-            servicePayloadBuilder.append("kv,");
-        }
-        if (query) {
-            servicePayloadBuilder.append("n1ql,");
-        }
-        if (index) {
-            servicePayloadBuilder.append("index,");
-        }
-        if (fts) {
-            servicePayloadBuilder.append("fts,");
+    @Override
+    protected void containerIsStarting(final InspectContainerResponse containerInfo) {
+        logger().debug("Couchbase container is starting, performing configuration.");
+
+        waitUntilNodeIsOnline();
+        renameNode();
+        initializeServices();
+        configureAdminUser();
+        configureExternalPorts();
+        if (enabledServices.contains(CouchbaseService.INDEX)) {
+            configureIndexer();
         }
-        String setupServiceContent = "services=" + URLEncoder.encode(servicePayloadBuilder.toString(), "UTF-8");
-
-        String webSettingsURL = "/settings/web";
-        String webSettingsContent = "username=" + URLEncoder.encode(clusterUsername, "UTF-8") + "&password=" + URLEncoder.encode(clusterPassword, "UTF-8") + "&port=8091";
-
-        callCouchbaseRestAPI(poolURL, poolPayload);
-        callCouchbaseRestAPI(setupServicesURL, setupServiceContent);
-        callCouchbaseRestAPI(webSettingsURL, webSettingsContent);
-
-        createNodeWaitStrategy().waitUntilReady(this);
-        callCouchbaseRestAPI("/settings/indexes", "indexerThreads=0&logLevel=info&maxRollbackPoints=5&storageMode=memory_optimized");
     }
 
-    @NotNull
-    private HttpWaitStrategy createNodeWaitStrategy() {
-        return new HttpWaitStrategy()
-            .forPath("/pools/default/")
-            .withBasicCredentials(clusterUsername, clusterPassword)
-            .forStatusCode(HTTP_OK)
-            .forResponsePredicate(response -> {
-                try {
-                    return Optional.of(MAPPER.readTree(response))
-                        .map(n -> n.at("/nodes/0/status"))
-                        .map(JsonNode::asText)
-                        .map("healthy"::equals)
-                        .orElse(false);
-                } catch (IOException e) {
-                    logger().error("Unable to parse response {}", response);
-                    return false;
-                }
-            });
-    }
-
-    public void createBucket(BucketSettings bucketSetting, UserSettings userSettings, boolean primaryIndex) {
-        ClusterManager clusterManager = getCouchbaseCluster().clusterManager(clusterUsername, clusterPassword);
-        // Insert Bucket
-        BucketSettings bucketSettings = clusterManager.insertBucket(bucketSetting);
-        try {
-            // Insert Bucket user
-            clusterManager.upsertUser(AuthDomain.LOCAL, bucketSetting.name(), userSettings);
-        } catch (Exception e) {
-            logger().warn("Unable to insert user '" + bucketSetting.name() + "', maybe you are using older version");
-        }
-        if (index) {
-            Bucket bucket = getCouchbaseCluster().openBucket(bucketSettings.name(), bucketSettings.password());
-            new CouchbaseQueryServiceWaitStrategy(bucket).waitUntilReady(this);
-            if (primaryIndex) {
-                bucket.query(Index.createPrimaryIndex().on(bucketSetting.name()));
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        createBuckets();
+        logger().info("Couchbase container is ready! UI available at http://{}:{}", getContainerIpAddress(), getMappedPort(MGMT_PORT));
+    }
+
+    /**
+     * Before we can start configuring the host, we need to wait until the cluster manager is listening.
+     */
+    private void waitUntilNodeIsOnline() {
+        new HttpWaitStrategy()
+            .forPort(MGMT_PORT)
+            .forPath("/pools")
+            .forStatusCode(200)
+            .waitUntilReady(this);
+    }
+
+    /**
+     * Rebinds/renames the internal hostname.
+     * <p>
+     * To make sure the internal hostname is different from the external (alternate) address and the SDK can pick it
+     * up automatically, we bind the internal hostname to the internal IP address.
+     */
+    private void renameNode() {
+        logger().debug("Renaming Couchbase Node from localhost to {}", getContainerIpAddress());
+
+        Response response = doHttpRequest(MGMT_PORT, "/node/controller/rename", "POST", new FormBody.Builder()
+            .add("hostname", getInternalIpAddress())
+            .build(), false
+        );
+
+        checkSuccessfulResponse(response, "Could not rename couchbase node");
+    }
+
+    /**
+     * Initializes services based on the configured enabled services.
+     */
+    private void initializeServices() {
+        logger().debug("Initializing couchbase services on host: {}", enabledServices);
+
+        final String services = enabledServices.stream().map(s -> {
+            switch (s) {
+                case KV: return "kv";
+                case QUERY: return "n1ql";
+                case INDEX: return "index";
+                case SEARCH: return "fts";
+                default: throw new IllegalStateException("Unknown service!");
             }
+        }).collect(Collectors.joining(","));
+
+        Response response = doHttpRequest(MGMT_PORT, "/node/controller/setupServices", "POST", new FormBody.Builder()
+            .add("services", services)
+            .build(), false
+        );
+
+        checkSuccessfulResponse(response, "Could not enable couchbase services");
+    }
+
+    /**
+     * Configures the admin user on the couchbase node.
+     * <p>
+     * After this stage, all subsequent API calls need to have the basic auth header set.
+     */
+    private void configureAdminUser() {
+        logger().debug("Configuring couchbase admin user with username: \"{}\"", username);
+
+        Response response = doHttpRequest(MGMT_PORT, "/settings/web", "POST", new FormBody.Builder()
+            .add("username", username)
+            .add("password", password)
+            .add("port", Integer.toString(MGMT_PORT))
+            .build(), false);
+
+        checkSuccessfulResponse(response, "Could not configure couchbase admin user");
+    }
+
+    /**
+     * Configures the external ports for SDK access.
+     * <p>
+     * Since the internal ports are not accessible from outside the container, this code configures the "external"
+     * hostname and services to align with the mapped ports. The SDK will pick it up and then automatically connect
+     * to those ports. Note that for all services non-ssl and ssl ports are configured.
+     */
+    private void configureExternalPorts() {
+        logger().debug("Mapping external ports to the alternate address configuration");
+
+        final FormBody.Builder builder = new FormBody.Builder();
+        builder.add("hostname", getContainerIpAddress());
+        builder.add("mgmt", Integer.toString(getMappedPort(MGMT_PORT)));
+        builder.add("mgmtSSL", Integer.toString(getMappedPort(MGMT_SSL_PORT)));
+
+        if (enabledServices.contains(CouchbaseService.KV)) {
+            builder.add("kv", Integer.toString(getMappedPort(KV_PORT)));
+            builder.add("kvSSL", Integer.toString(getMappedPort(KV_SSL_PORT)));
+            builder.add("capi", Integer.toString(getMappedPort(VIEW_PORT)));
+            builder.add("capiSSL", Integer.toString(getMappedPort(VIEW_SSL_PORT)));
         }
-    }
 
-    public void callCouchbaseRestAPI(String url, String payload) throws IOException {
-        String fullUrl = urlBase + url;
-        @Cleanup("disconnect")
-        HttpURLConnection httpConnection = (HttpURLConnection) ((new URL(fullUrl).openConnection()));
-        httpConnection.setDoOutput(true);
-        httpConnection.setRequestMethod("POST");
-        httpConnection.setRequestProperty("Content-Type",
-            "application/x-www-form-urlencoded");
-        String encoded = Base64.encode((clusterUsername + ":" + clusterPassword).getBytes("UTF-8"));
-        httpConnection.setRequestProperty("Authorization", "Basic " + encoded);
-        @Cleanup
-        DataOutputStream out = new DataOutputStream(httpConnection.getOutputStream());
-        out.writeBytes(payload);
-        out.flush();
-        httpConnection.getResponseCode();
-    }
+        if (enabledServices.contains(CouchbaseService.QUERY)) {
+            builder.add("n1ql", Integer.toString(getMappedPort(QUERY_PORT)));
+            builder.add("n1qlSSL", Integer.toString(getMappedPort(QUERY_SSL_PORT)));
+        }
 
-    @Override
-    protected void containerIsCreated(String containerId) {
-        patchConfig(STATIC_CONFIG, this::addMappedPorts);
-        // capi needs a special configuration, see https://developer.couchbase.com/documentation/server/current/install/install-ports.html
-        patchConfig(CAPI_CONFIG, this::replaceCapiPort);
-    }
+        if (enabledServices.contains(CouchbaseService.SEARCH)) {
+            builder.add("fts", Integer.toString(getMappedPort(SEARCH_PORT)));
+            builder.add("ftsSSL", Integer.toString(getMappedPort(SEARCH_SSL_PORT)));
+        }
 
-    private void patchConfig(String configLocation, ThrowingFunction<String, String> patchFunction) {
-        String patchedConfig = copyFileFromContainer(configLocation,
-            inputStream -> patchFunction.apply(IOUtils.toString(inputStream, StandardCharsets.UTF_8)));
-        copyFileToContainer(Transferable.of(patchedConfig.getBytes(StandardCharsets.UTF_8)), configLocation);
-    }
+        final Response response = doHttpRequest(
+            MGMT_PORT,
+            "/node/controller/setupAlternateAddresses/external",
+            "PUT",
+            builder.build(),
+            true
+        );
 
-    private String addMappedPorts(String originalConfig) {
-        String portConfig = Stream.of(CouchbasePort.values())
-            .filter(port -> !port.isDynamic())
-            .map(port -> String.format("{%s, %d}.", port.name, getMappedPort(port)))
-            .collect(Collectors.joining("\n"));
-        return String.format("%s\n%s", originalConfig, portConfig);
+        checkSuccessfulResponse(response, "Could not configure external ports");
     }
 
-    private String replaceCapiPort(String originalConfig) {
-        return Arrays.stream(originalConfig.split("\n"))
-            .map(s -> (s.matches("port\\s*=\\s*" + CAPI.getOriginalPort())) ? "port = " + getMappedPort(CAPI) : s)
-            .collect(Collectors.joining("\n"));
-    }
+    /**
+     * Configures the indexer service so that indexes can be created later on the bucket.
+     */
+    private void configureIndexer() {
+        logger().debug("Configuring the indexer service");
 
-    @Override
-    protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        if (!newBuckets.isEmpty()) {
-            for (BucketAndUserSettings bucket : newBuckets) {
-                createBucket(bucket.getBucketSettings(), bucket.getUserSettings(), primaryIndex);
-            }
-        }
-    }
+        Response response = doHttpRequest(MGMT_PORT, "/settings/indexes", "POST", new FormBody.Builder()
+            .add("storageMode", "memory_optimized")
+            .build(), true
+        );
 
-    private CouchbaseCluster createCouchbaseCluster() {
-        return CouchbaseCluster.create(getCouchbaseEnvironment(), getContainerIpAddress());
+        checkSuccessfulResponse(response, "Could not configure the indexing service");
     }
 
-    private DefaultCouchbaseEnvironment createCouchbaseEnvironment() {
-        initCluster();
-        return DefaultCouchbaseEnvironment.builder()
-            .kvTimeout(10000)
-            .bootstrapCarrierDirectPort(getMappedPort(MEMCACHED))
-            .bootstrapCarrierSslPort(getMappedPort(MEMCACHED_SSL))
-            .bootstrapHttpDirectPort(getMappedPort(REST))
-            .bootstrapHttpSslPort(getMappedPort(REST_SSL))
-            .build();
-    }
+    /**
+     * Based on the user-configured bucket definitions, creating buckets and corresponding indexes if needed.
+     */
+    private void createBuckets() {
+        logger().debug("Creating " + buckets.size() + " buckets (and corresponding indexes).");
 
-    public CouchbaseContainer withMemoryQuota(String memoryQuota) {
-        this.memoryQuota = memoryQuota;
-        return self();
-    }
+        for (BucketDefinition bucket : buckets) {
+            logger().debug("Creating bucket \"" + bucket.getName() + "\"");
 
-    public CouchbaseContainer withIndexMemoryQuota(String indexMemoryQuota) {
-        this.indexMemoryQuota = indexMemoryQuota;
-        return self();
-    }
+            Response response = doHttpRequest(MGMT_PORT, "/pools/default/buckets", "POST", new FormBody.Builder()
+                .add("name", bucket.getName())
+                .add("ramQuotaMB", Integer.toString(bucket.getQuota()))
+                .build(), true);
 
-    public CouchbaseContainer withClusterAdmin(String username, String password) {
-        this.clusterUsername = username;
-        this.clusterPassword = password;
-        return self();
-    }
+            checkSuccessfulResponse(response, "Could not create bucket " + bucket.getName());
 
-    public CouchbaseContainer withKeyValue(boolean keyValue) {
-        this.keyValue = keyValue;
-        return self();
-    }
+            new HttpWaitStrategy()
+                .forPath("/pools/default/buckets/" + bucket.getName())
+                .forPort(MGMT_PORT)
+                .withBasicCredentials(username, password)
+                .forStatusCode(200)
+                .waitUntilReady(this);
 
-    public CouchbaseContainer withQuery(boolean query) {
-        this.query = query;
-        return self();
-    }
+            if (bucket.hasPrimaryIndex()) {
+                if (enabledServices.contains(CouchbaseService.QUERY)) {
+                    Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
+                        .add("statement", "CREATE PRIMARY INDEX on `" + bucket.getName() + "`")
+                        .build(), true);
 
-    public CouchbaseContainer withIndex(boolean index) {
-        this.index = index;
-        return self();
+                    checkSuccessfulResponse(queryResponse, "Could not create primary index for bucket " + bucket.getName());
+                } else {
+                    logger().info("Primary index creation for bucket " + bucket.getName() + " ignored, since QUERY service is not present.");
+                }
+            }
+        }
     }
 
-    public CouchbaseContainer withPrimaryIndex(boolean primaryIndex) {
-        this.primaryIndex = primaryIndex;
-        return self();
+    /**
+     * Helper method to extract the internal IP address based on the network configuration.
+     */
+    private String getInternalIpAddress() {
+        return getContainerInfo().getNetworkSettings().getNetworks().values().stream()
+            .findFirst()
+            .map(ContainerNetwork::getIpAddress)
+            .orElseThrow(() -> new IllegalStateException("No network available to extract the internal IP from!"));
     }
 
-    public CouchbaseContainer withFts(boolean fts) {
-        this.fts = fts;
-        return self();
+    /**
+     * Helper method to check if the response is successful and release the body if needed.
+     *
+     * @param response the response to check.
+     * @param message the message that should be part of the exception of not successful.
+     */
+    private void checkSuccessfulResponse(final Response response, final String message) {
+        try {
+            if (!response.isSuccessful()) {
+                throw new IllegalStateException(message + ": " + response.toString());
+            }
+        } finally {
+            if (response.body() != null) {
+                response.body().close();
+            }
+        }
     }
 
-    @Getter
-    @RequiredArgsConstructor
-    protected enum CouchbasePort {
-        REST("rest_port", 8091, true),
-        CAPI("capi_port", 8092, false),
-        QUERY("query_port", 8093, false),
-        FTS("fts_http_port", 8094, false),
-        CBAS("cbas_http_port", 8095, false),
-        EVENTING("eventing_http_port", 8096, false),
-        MEMCACHED_SSL("memcached_ssl_port", 11207, false),
-        MEMCACHED("memcached_port", 11210, false),
-        REST_SSL("ssl_rest_port", 18091, true),
-        CAPI_SSL("ssl_capi_port", 18092, false),
-        QUERY_SSL("ssl_query_port", 18093, false),
-        FTS_SSL("fts_ssl_port", 18094, false),
-        CBAS_SSL("cbas_ssl_port", 18095, false),
-        EVENTING_SSL("eventing_ssl_port", 18096, false);
-
-        final String name;
-
-        final int originalPort;
-
-        final boolean dynamic;
+    /**
+     * Checks if already running and if so raises an exception to prevent too-late setters.
+     */
+    private void checkNotRunning() {
+        if (isRunning()) {
+            throw new IllegalStateException("Setter can only be called before the container is running");
+        }
     }
 
-    @Value
-    @AllArgsConstructor
-    private class BucketAndUserSettings {
+    /**
+     * Helper method to perform a request against a couchbase server HTTP endpoint.
+     *
+     * @param port the (unmapped) original port that should be used.
+     * @param path the relative http path.
+     * @param method the http method to use.
+     * @param body if present, will be part of the payload.
+     * @param auth if authentication with the admin user and password should be used.
+     * @return the response of the request.
+     */
+    private Response doHttpRequest(final int port, final String path, final String method, final RequestBody body,
+                                   final boolean auth) {
+        try {
+            Request.Builder requestBuilder = new Request.Builder()
+                .url("http://" + getContainerIpAddress() + ":" + getMappedPort(port) + path);
 
-        private final BucketSettings bucketSettings;
-        private final UserSettings userSettings;
+            if (auth) {
+                requestBuilder = requestBuilder.header("Authorization", Credentials.basic(username, password));
+            }
 
-        public BucketAndUserSettings(final BucketSettings bucketSettings) {
-            this.bucketSettings = bucketSettings;
-            this.userSettings = UserSettings.build()
-                .password(bucketSettings.password())
-                .roles(getDefaultAdminRoles(bucketSettings.name()));
-        }
+            if (body == null) {
+                requestBuilder = requestBuilder.get();
+            } else {
+                requestBuilder = requestBuilder.method(method, body);
+            }
 
-        private List<UserRole> getDefaultAdminRoles(String bucketName) {
-            return Lists.newArrayList(
-                new UserRole("bucket_admin", bucketName),
-                new UserRole("views_admin", bucketName),
-                new UserRole("query_manage_index", bucketName),
-                new UserRole("query_update", bucketName),
-                new UserRole("query_select", bucketName),
-                new UserRole("query_insert", bucketName),
-                new UserRole("query_delete", bucketName)
-            );
+            return HTTP_CLIENT.newCall(requestBuilder.build()).execute();
+        } catch (Exception ex) {
+            throw new RuntimeException("Could not perform request against couchbase HTTP endpoint ", ex);
         }
-
     }
 }
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseQueryServiceWaitStrategy.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseQueryServiceWaitStrategy.java
deleted file mode 100644
index 853dd7d8eb7..00000000000
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseQueryServiceWaitStrategy.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.testcontainers.couchbase;
-
-import com.couchbase.client.core.message.cluster.GetClusterConfigRequest;
-import com.couchbase.client.core.message.cluster.GetClusterConfigResponse;
-import com.couchbase.client.core.service.ServiceType;
-import com.couchbase.client.java.Bucket;
-import lombok.extern.slf4j.Slf4j;
-import org.rnorth.ducttape.TimeoutException;
-import org.testcontainers.containers.ContainerLaunchException;
-import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
-
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-
-import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;
-
-/**
- * @author ctayeb
- * Created on 06/06/2017
- */
-@Slf4j
-public class CouchbaseQueryServiceWaitStrategy extends AbstractWaitStrategy {
-
-    private final Bucket bucket;
-
-    public CouchbaseQueryServiceWaitStrategy(Bucket bucket) {
-        this.bucket = bucket;
-        startupTimeout = Duration.ofSeconds(120);
-    }
-
-    @Override
-    protected void waitUntilReady() {
-        log.info("Waiting for {} seconds for QUERY service", startupTimeout.getSeconds());
-
-        // try to connect to the URL
-        try {
-            retryUntilSuccess((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, () -> {
-                getRateLimiter().doWhenReady(() -> {
-                    GetClusterConfigResponse clusterConfig = bucket.core()
-                        .<GetClusterConfigResponse>send(new GetClusterConfigRequest())
-                        .toBlocking().single();
-                    boolean queryServiceEnabled = clusterConfig.config()
-                        .bucketConfig(bucket.name())
-                        .serviceEnabled(ServiceType.QUERY);
-                    if (!queryServiceEnabled) {
-                        throw new ContainerLaunchException("Query service not ready yet");
-                    }
-                });
-                return true;
-            });
-        } catch (TimeoutException e) {
-            throw new ContainerLaunchException("Timed out waiting for QUERY service");
-        }
-    }
-}
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
new file mode 100644
index 00000000000..d284c660709
--- /dev/null
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.testcontainers.couchbase;
+
+/**
+ * Describes the different services that should be exposed on the container.
+ */
+public enum CouchbaseService {
+
+  /**
+   * Key-Value service.
+   */
+  KV,
+
+  /**
+   * Query (N1QL) service.
+   */
+  QUERY,
+
+  /**
+   * Search (FTS) service.
+   */
+  SEARCH,
+
+  /**
+   * Indexing service (needed if QUERY is also used!).
+   */
+  INDEX
+
+}
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
deleted file mode 100644
index ef2f0925c48..00000000000
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.testcontainers.couchbase;
-
-import com.couchbase.client.java.document.RawJsonDocument;
-import com.couchbase.client.java.query.N1qlQuery;
-import com.couchbase.client.java.query.N1qlQueryResult;
-import com.couchbase.client.java.query.N1qlQueryRow;
-import com.couchbase.client.java.view.DefaultView;
-import com.couchbase.client.java.view.DesignDocument;
-import com.couchbase.client.java.view.View;
-import com.google.common.collect.Lists;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.Description;
-import org.testcontainers.containers.FailureDetectingExternalResource;
-import org.testcontainers.testsupport.Flaky;
-import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
-
-import java.util.List;
-
-public abstract class BaseCouchbaseContainerTest extends AbstractCouchbaseTest {
-
-    private static final String VIEW_NAME = "testview";
-    private static final String VIEW_FUNCTION = "function (doc, meta) {\n" +
-        "  emit(meta.id, null);\n" +
-        "}";
-
-
-    private static final String ID = "toto";
-
-    private static final String DOCUMENT = "{\"name\":\"toto\"}";
-
-    @Rule
-    public RuleChain ruleChain = RuleChain.emptyRuleChain()
-        .around(new FlakyTestJUnit4RetryRule())
-        .around(new FailureDetectingExternalResource() {
-            @Override
-            protected void starting(Description description) {
-                getCouchbaseContainer().start();
-            }
-
-            @Override
-            protected void failed(Throwable e, Description description) {
-                getCouchbaseContainer().stop();
-            }
-        });
-
-    @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2020-03-01")
-    public void shouldInsertDocument() {
-        RawJsonDocument expected = RawJsonDocument.create(ID, DOCUMENT);
-        getBucket().upsert(expected);
-        RawJsonDocument result = getBucket().get(ID, RawJsonDocument.class);
-        Assert.assertEquals(expected.content(), result.content());
-    }
-
-    @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2020-03-01")
-    public void shouldExecuteN1ql() {
-        getBucket().query(N1qlQuery.simple("INSERT INTO " + TEST_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
-
-        N1qlQueryResult query = getBucket().query(N1qlQuery.simple("SELECT * FROM " + TEST_BUCKET + " USE KEYS '" + ID + "'"));
-        Assert.assertTrue(query.parseSuccess());
-        Assert.assertTrue(query.finalSuccess());
-        List<N1qlQueryRow> n1qlQueryRows = query.allRows();
-        Assert.assertEquals(1, n1qlQueryRows.size());
-        Assert.assertEquals(DOCUMENT, n1qlQueryRows.get(0).value().get(TEST_BUCKET).toString());
-    }
-
-    @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1453", reviewDate = "2020-03-01")
-    public void shouldCreateView() {
-        View view = DefaultView.create(VIEW_NAME, VIEW_FUNCTION);
-        DesignDocument document = DesignDocument.create(VIEW_NAME, Lists.newArrayList(view));
-        getBucket().bucketManager().insertDesignDocument(document);
-        DesignDocument result = getBucket().bucketManager().getDesignDocument(VIEW_NAME);
-        Assert.assertEquals(1, result.views().size());
-        View resultView = result.views().get(0);
-        Assert.assertEquals(VIEW_NAME, resultView.name());
-    }
-}
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java
deleted file mode 100644
index c43d3c981ba..00000000000
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase4_6Test.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.testcontainers.couchbase;
-
-import org.junit.Rule;
-
-public class Couchbase4_6Test extends BaseCouchbaseContainerTest {
-
-    @Rule
-    public CouchbaseContainer container = initCouchbaseContainer("couchbase/server:4.6.5");
-
-    @Override
-    public CouchbaseContainer getCouchbaseContainer() {
-        return container;
-    }
-}
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java
deleted file mode 100644
index 2c3dbf3c901..00000000000
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_1Test.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.testcontainers.couchbase;
-
-import org.junit.Rule;
-
-public class Couchbase5_1Test extends BaseCouchbaseContainerTest {
-
-    @Rule
-    public CouchbaseContainer container = initCouchbaseContainer("couchbase/server:5.1.1");
-
-    @Override
-    public CouchbaseContainer getCouchbaseContainer() {
-        return container;
-    }
-}
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java
deleted file mode 100644
index 47bc020ef03..00000000000
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase5_5Test.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.testcontainers.couchbase;
-
-import org.junit.Rule;
-
-public class Couchbase5_5Test extends BaseCouchbaseContainerTest {
-
-    @Rule
-    public CouchbaseContainer container = initCouchbaseContainer("couchbase/server:5.5.1");
-
-    @Override
-    public CouchbaseContainer getCouchbaseContainer() {
-        return container;
-    }
-}
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java
deleted file mode 100644
index 30be62bc2bd..00000000000
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseCommunity5_1Test.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.testcontainers.couchbase;
-
-import java.util.Collections;
-
-import org.junit.ClassRule;
-
-import com.couchbase.client.java.cluster.UserRole;
-import com.couchbase.client.java.cluster.UserSettings;
-import org.junit.Rule;
-
-public class CouchbaseCommunity5_1Test extends BaseCouchbaseContainerTest {
-
-    @Rule
-    public CouchbaseContainer container = initCouchbaseContainer();
-
-    private static CouchbaseContainer initCouchbaseContainer() {
-        CouchbaseContainer couchbaseContainer = new CouchbaseContainer("couchbase/server:community-5.1.1");
-
-        final UserSettings communityAdminUserSettings =
-            UserSettings.build()
-                .password(getDefaultBucketSettings().password())
-                .roles(Collections.singletonList(new UserRole("admin")));
-
-        couchbaseContainer.withNewBucket(getDefaultBucketSettings(), communityAdminUserSettings);
-        return couchbaseContainer;
-    }
-
-    @Override
-    public CouchbaseContainer getCouchbaseContainer() {
-        return container;
-    }
-}
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 6e9afe96865..27ad0f6265a 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -1,22 +1,78 @@
+/*
+ * Copyright (c) 2020 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.testcontainers.couchbase;
 
-import org.junit.Assert;
+import com.couchbase.client.java.Bucket;
+import com.couchbase.client.java.Cluster;
+import com.couchbase.client.java.CouchbaseCluster;
+import com.couchbase.client.java.document.JsonDocument;
+import com.couchbase.client.java.document.json.JsonObject;
+import com.couchbase.client.java.env.CouchbaseEnvironment;
+import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 public class CouchbaseContainerTest {
 
     @Test
-    public void shouldUseCorrectDockerImage() {
-        CouchbaseContainer couchbaseContainer = new CouchbaseContainer().withClusterAdmin("admin", "foobar");
+    public void testBasicContainerUsage() {
+        // bucket_definition {
+        BucketDefinition bucketDefinition = new BucketDefinition("mybucket");
+        // }
 
-        Assert.assertEquals(CouchbaseContainer.DOCKER_IMAGE_NAME + CouchbaseContainer.VERSION,
-            couchbaseContainer.getDockerImageName());
-    }
+        try (
+            // container_definition {
+            CouchbaseContainer container = new CouchbaseContainer()
+                .withBucket(bucketDefinition)
+            // }
+        ) {
+            container.start();
 
-    @Test
-    public void shouldStopWithoutThrowingException() {
-        CouchbaseContainer couchbaseContainer = new CouchbaseContainer();
-        couchbaseContainer.start();
-        couchbaseContainer.stop();
+            // cluster_creation {
+            CouchbaseEnvironment environment = DefaultCouchbaseEnvironment
+                .builder()
+                .bootstrapCarrierDirectPort(container.getBootstrapCarrierDirectPort())
+                .bootstrapHttpDirectPort(container.getBootstrapHttpDirectPort())
+                .build();
+
+            Cluster cluster = CouchbaseCluster.create(
+                environment,
+                container.getContainerIpAddress()
+            );
+            // }
+
+            try {
+                // auth {
+                cluster.authenticate(container.getUsername(), container.getPassword());
+                // }
+
+                Bucket bucket = cluster.openBucket(bucketDefinition.getName());
+
+                bucket.upsert(JsonDocument.create("foo", JsonObject.empty()));
+
+                assertTrue(bucket.exists("foo"));
+                assertNotNull(cluster.clusterManager().getBucket(bucketDefinition.getName()));
+            } finally {
+                cluster.disconnect();
+                environment.shutdown();
+            }
+        }
     }
+
 }

From 34b8d7e03de1fafb50a4c3b37388ae4d40059736 Mon Sep 17 00:00:00 2001
From: Stefan Rempfer <rempfer@gmail.com>
Date: Sun, 12 Apr 2020 20:32:41 +0200
Subject: [PATCH 0593/4969] Using LogMessageWaitStrategy for
 VncRecordingContainer (#2063) (#2547)

Co-authored-by: Stefan Rempfer <srempfer@rt.ipnt.de>
Co-authored-by: Richard North <rich.north@gmail.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../containers/VncRecordingContainer.java     | 47 +++----------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index 298593a116b..fd48dd01f92 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -1,24 +1,21 @@
 package org.testcontainers.containers;
 
-import com.github.dockerjava.api.model.Frame;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import lombok.ToString;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.rnorth.ducttape.TimeoutException;
-import org.rnorth.ducttape.unreliables.Unreliables;
-import org.testcontainers.containers.output.FrameConsumerResultCallback;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
-import java.io.Closeable;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.time.Duration;
 import java.util.Base64;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+
+import static java.time.temporal.ChronoUnit.SECONDS;
 
 /**
  * 'Sidekick container' with the sole purpose of recording the VNC screen output from another container.
@@ -59,39 +56,9 @@ public VncRecordingContainer(@NonNull Network network, @NonNull String targetNet
 
         this.targetNetworkAlias = targetNetworkAlias;
         withNetwork(network);
-
-        waitingFor(new AbstractWaitStrategy() {
-
-            @Override
-            protected void waitUntilReady() {
-                try {
-                    Unreliables.retryUntilTrue((int) startupTimeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
-                        CountDownLatch latch = new CountDownLatch(1);
-
-                        FrameConsumerResultCallback callback = new FrameConsumerResultCallback() {
-                            @Override
-                            public void onNext(Frame frame) {
-                                if (frame != null && new String(frame.getPayload()).contains("Connected")) {
-                                    latch.countDown();
-                                }
-                            }
-                        };
-
-                        try (
-                                Closeable __ = dockerClient.logContainerCmd(getContainerId())
-                                        .withFollowStream(true)
-                                        .withSince(0)
-                                        .withStdErr(true)
-                                        .exec(callback)
-                        ) {
-                            return latch.await(1, TimeUnit.SECONDS);
-                        }
-                    });
-                } catch (TimeoutException e) {
-                    throw new ContainerLaunchException("Timed out waiting for log output", e);
-                }
-            }
-        });
+        waitingFor(new LogMessageWaitStrategy()
+            .withRegEx(".*Connected.*")
+            .withStartupTimeout(Duration.of(15, SECONDS)));
     }
 
     public VncRecordingContainer withVncPassword(@NonNull String vncPassword) {

From 95c828d01eaa8532a4878a89587d0116e413ebd4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 12 Apr 2020 20:41:30 +0200
Subject: [PATCH 0594/4969] Include image name in RemoteDockerImage#toString
 (#2558)

* clean up imports in GenericContainer

* include image name in RemoteDockerImage.toString() to fix #2443

* test RemoteDockerImage directly

* handle failures getting the image name

* use completeExceptionally instead of mocking

* tweak assertions

* more assertion tweaks

* add isDone check to RemoteDockerImage.toString -- still figuring out why test fails

* go back to using lombok @ToString, exclude dockerClient while we're at it

* use `Futures.lazyTransform` that also proxies `isDone`

* `imageNameToString` should not be public

* Include the message on error

Co-authored-by: Byron David <david.byron@avast.com>
Co-authored-by: David Byron <dbyron@dbyron.com>
---
 .../images/RemoteDockerImage.java             | 30 ++++++++----
 .../containers/GenericContainerTest.java      |  1 -
 .../images/RemoteDockerImageTest.java         | 47 +++++++++++++++++++
 3 files changed, 69 insertions(+), 9 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java

diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 4975f536384..d0e1313edf6 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.google.common.util.concurrent.Futures;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
@@ -28,11 +29,13 @@ public class RemoteDockerImage extends LazyFuture<String> {
 
     private static final Duration PULL_RETRY_TIME_LIMIT = Duration.ofMinutes(2);
 
+    @ToString.Exclude
     private Future<DockerImageName> imageNameFuture;
 
     @Wither
     private ImagePullPolicy imagePullPolicy = PullPolicy.defaultPolicy();
 
+    @ToString.Exclude
     private DockerClient dockerClient = DockerClientFactory.lazyClient();
 
     public RemoteDockerImage(String dockerImageName) {
@@ -44,19 +47,13 @@ public RemoteDockerImage(@NonNull String repository, @NonNull String tag) {
     }
 
     public RemoteDockerImage(@NonNull Future<String> imageFuture) {
-        this.imageNameFuture = new LazyFuture<DockerImageName>() {
-            @Override
-            @SneakyThrows({InterruptedException.class, ExecutionException.class})
-            protected DockerImageName resolve() {
-                return new DockerImageName(imageFuture.get());
-            }
-        };
+        this.imageNameFuture = Futures.lazyTransform(imageFuture, DockerImageName::new);
     }
 
     @Override
     @SneakyThrows({InterruptedException.class, ExecutionException.class})
     protected final String resolve() {
-        final DockerImageName imageName = imageNameFuture.get();
+        final DockerImageName imageName = getImageName();
         Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
         try {
             if (!imagePullPolicy.shouldPull(imageName)) {
@@ -95,4 +92,21 @@ protected final String resolve() {
             throw new ContainerFetchException("Failed to get Docker client for " + imageName, e);
         }
     }
+
+    private DockerImageName getImageName() throws InterruptedException, ExecutionException {
+        return imageNameFuture.get();
+    }
+
+    @ToString.Include(name = "imageName", rank = 1)
+    private String imageNameToString() {
+        if (!imageNameFuture.isDone()) {
+            return "<resolving>";
+        }
+
+        try {
+            return getImageName().toString();
+        } catch (InterruptedException | ExecutionException e) {
+            return e.getMessage();
+        }
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index c29f6f37c36..78a7a3b1bef 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse.ContainerState;
-import com.github.dockerjava.api.model.HostConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
diff --git a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
new file mode 100644
index 00000000000..c62f15653b3
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
@@ -0,0 +1,47 @@
+package org.testcontainers.images;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+import org.testcontainers.utility.Base58;
+
+import java.util.concurrent.CompletableFuture;
+
+public class RemoteDockerImageTest {
+
+    @Test
+    public void toStringContainsOnlyImageName() {
+        String imageName = Base58.randomString(8).toLowerCase();
+        RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageName);
+        assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
+    }
+
+    @Test
+    public void toStringWithExceptionContainsOnlyImageNameFuture()  {
+        CompletableFuture<String> imageNameFuture = new CompletableFuture<>();
+        imageNameFuture.completeExceptionally(new RuntimeException("arbitrary"));
+
+        RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageNameFuture);
+        assertThat(remoteDockerImage.toString(), containsString("imageName=java.lang.RuntimeException: arbitrary"));
+    }
+
+    @Test(timeout=5000L)
+    public void toStringDoesntResolveImageNameFuture()  {
+        CompletableFuture<String> imageNameFuture = new CompletableFuture<>();
+
+        // verify that we've set up the test properly
+        assertFalse(imageNameFuture.isDone());
+
+        RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageNameFuture);
+        assertThat(remoteDockerImage.toString(), containsString("imageName=<resolving>"));
+
+        // Make sure the act of calling toString doesn't resolve the imageNameFuture
+        assertFalse(imageNameFuture.isDone());
+
+        String imageName = Base58.randomString(8).toLowerCase();
+        imageNameFuture.complete(imageName);
+        assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
+    }
+}

From 6adb23b5ab860280fc6d3ffbc3186709d4c848cc Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 13 Apr 2020 16:54:30 +0200
Subject: [PATCH 0595/4969] Fix Spock's `TestLifecycleAware` integration
 (#2563)

* Fix Spock's `TestLifecycleAware` integration

* Small cleanups

Co-authored-by: Kevin Wittek <kevin@wittek.dev>
---
 .../TestcontainersMethodInterceptor.groovy    | 31 ++++---
 .../spock/BrowserVncRecordingIT.groovy        | 88 -------------------
 .../TestLifecycleAwareContainerMock.java      | 42 +++++++++
 .../spock/TestLifecycleAwareIT.groovy         | 55 ++++++++++++
 4 files changed, 112 insertions(+), 104 deletions(-)
 delete mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy
 create mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
 create mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy

diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
index a70ec0d6e53..16be002aeb1 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
@@ -30,6 +30,7 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
         invocation.proceed()
     }
 
+    @Override
     void interceptCleanupSpecMethod(IMethodInvocation invocation) throws Throwable {
         def containers = findAllContainers(true)
         stopContainers(containers, invocation)
@@ -54,13 +55,6 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 
     @Override
     void interceptCleanupMethod(IMethodInvocation invocation) throws Throwable {
-        findAllTestLifecycleAwareContainers(invocation).each {
-            // we assume first error is the one we want
-            def maybeException = Optional.ofNullable(errorListener.errors[0]?.exception)
-            def testDescription = SpockTestDescription.fromTestDescription(invocation)
-            it.afterTest(testDescription, maybeException)
-        }
-
         def containers = findAllContainers(false)
         stopContainers(containers, invocation)
 
@@ -76,14 +70,6 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
         }
     }
 
-    private List<TestLifecycleAware> findAllTestLifecycleAwareContainers(IMethodInvocation invocation) {
-        spec.allFields.findAll { FieldInfo f ->
-            TestLifecycleAware.isAssignableFrom(f.type)
-        }.collect {
-            it.readValue(invocation.instance) as TestLifecycleAware
-        }
-    }
-
     private List<FieldInfo> findAllComposeContainers(boolean shared) {
         spec.allFields.findAll { FieldInfo f ->
             DockerComposeContainer.isAssignableFrom(f.type) && f.shared == shared
@@ -96,12 +82,25 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
             if(!container.isRunning()){
                 container.start()
             }
+
+            if (container instanceof TestLifecycleAware) {
+                def testDescription = SpockTestDescription.fromTestDescription(invocation)
+                (container as TestLifecycleAware).beforeTest(testDescription)
+            }
         }
     }
 
-    private static void stopContainers(List<FieldInfo> containers, IMethodInvocation invocation) {
+    private void stopContainers(List<FieldInfo> containers, IMethodInvocation invocation) {
         containers.each { FieldInfo f ->
             GenericContainer container = readContainerFromField(f, invocation)
+
+            if (container instanceof TestLifecycleAware) {
+                // we assume first error is the one we want
+                def maybeException = Optional.ofNullable(errorListener.errors[0]?.exception)
+                def testDescription = SpockTestDescription.fromTestDescription(invocation)
+                (container as TestLifecycleAware).afterTest(testDescription, maybeException)
+            }
+
             container.stop()
         }
     }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy
deleted file mode 100644
index 794032a58c4..00000000000
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.testcontainers.spock
-
-import org.intellij.lang.annotations.Language
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
-import spock.lang.Specification
-import spock.lang.Unroll
-import spock.util.EmbeddedSpecRunner
-
-import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL
-import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_FAILING
-
-class BrowserVncRecordingIT extends Specification {
-
-    @Rule
-    TemporaryFolder temp
-
-    String recordingDir
-
-    def setup() {
-        recordingDir = temp.getRoot().getAbsolutePath()
-    }
-
-    @Unroll("For recording mode #recordingMode and failing test is #fails records video file named '#videoFileName'")
-    def "retains all recordings for RECORD_ALL if successful"() {
-        given:
-
-        //noinspection GrPackage
-        @Language("groovy")
-        String myTest = """
-package org.testcontainers.spock
-
-import org.openqa.selenium.chrome.ChromeOptions
-import org.openqa.selenium.remote.RemoteWebDriver
-import org.testcontainers.containers.BrowserWebDriverContainer
-import spock.lang.Specification
-
-import java.util.concurrent.TimeUnit
-
-import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode
-
-@Testcontainers
-class BrowserWebdriverContainerIT extends Specification {
-
-    BrowserWebDriverContainer browserContainer = new BrowserWebDriverContainer()
-        .withCapabilities(new ChromeOptions())
-        .withRecordingMode("$recordingMode" as VncRecordingMode, new File("$recordingDir"))
-
-    RemoteWebDriver driver
-
-    def setup() {
-        driver = browserContainer.getWebDriver()
-        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS)
-    }
-
-    def "should record"() {
-        when:
-        driver.get("http://en.wikipedia.org/wiki/Randomness")
-
-        then:
-        driver.findElementByPartialLinkText("pattern").isDisplayed() == !$fails
-    }
-
-}
-
-
-"""
-
-        when:
-        EmbeddedSpecRunner runner = new EmbeddedSpecRunner(throwFailure: false)
-        runner.run(myTest)
-
-        then:
-        def videoDir = temp.getRoot().list()
-        if (videoFileName.isEmpty()) {
-            videoDir.length == 0
-        } else {
-            videoDir.find { it.contains(videoFileName) }
-        }
-
-        where:
-        recordingMode  | fails | videoFileName
-        RECORD_ALL     | false | 'BrowserWebdriverContainerIT-should+record'
-        RECORD_FAILING | false | ''
-        RECORD_FAILING | true  | 'BrowserWebdriverContainerIT-should+record'
-    }
-
-}
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
new file mode 100644
index 00000000000..43be6d32ca4
--- /dev/null
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
@@ -0,0 +1,42 @@
+package org.testcontainers.spock;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.lifecycle.TestDescription;
+import org.testcontainers.lifecycle.TestLifecycleAware;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class TestLifecycleAwareContainerMock extends GenericContainer<TestLifecycleAwareContainerMock> implements TestLifecycleAware {
+
+    static final String BEFORE_TEST = "beforeTest";
+    static final String AFTER_TEST = "afterTest";
+
+    final List<String> lifecycleMethodCalls = new ArrayList<>();
+    final List<String> lifecycleFilesystemFriendlyNames = new ArrayList<>();
+
+    Throwable capturedThrowable;
+
+    @Override
+    public void beforeTest(TestDescription description) {
+        lifecycleMethodCalls.add(BEFORE_TEST);
+        lifecycleFilesystemFriendlyNames.add(description.getFilesystemFriendlyName());
+    }
+
+    @Override
+    public void afterTest(TestDescription description, Optional<Throwable> throwable) {
+        lifecycleMethodCalls.add(AFTER_TEST);
+        throwable.ifPresent(capturedThrowable -> this.capturedThrowable = capturedThrowable);
+    }
+
+    @Override
+    public void start() {
+        // Do nothing
+    }
+
+    @Override
+    public void stop() {
+        // Do nothing
+    }
+}
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy
new file mode 100644
index 00000000000..18f7517ea3f
--- /dev/null
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy
@@ -0,0 +1,55 @@
+package org.testcontainers.spock
+
+import org.intellij.lang.annotations.Language
+import spock.lang.Specification
+import spock.lang.Unroll
+import spock.util.EmbeddedSpecRunner
+
+class TestLifecycleAwareIT extends Specification {
+
+    @Unroll("When failing test is #fails, afterTest receives '#filesystemFriendlyNames' and throwable starting with message '#errorMessageStartsWith'")
+    def "lifecycle awareness"() {
+        given:
+
+        @Language("groovy")
+        String myTest = """
+import org.testcontainers.spock.Testcontainers
+import org.testcontainers.containers.GenericContainer
+import spock.lang.Specification
+
+@Testcontainers
+class TestLifecycleAwareIT extends Specification {
+
+    GenericContainer container = System.properties["org.testcontainers.container"] as GenericContainer
+
+    def "perform test"() {
+        expect:
+        !System.properties["org.testcontainers.shouldFail"]
+    }
+}
+"""
+        and:
+        def container = new TestLifecycleAwareContainerMock()
+        System.properties["org.testcontainers.container"] = container
+        System.properties["org.testcontainers.shouldFail"] = fails
+
+        when: "executing the test"
+        def runner = new EmbeddedSpecRunner(throwFailure: false)
+        runner.run(myTest)
+
+        then: "mock container received lifecycle calls as expected"
+        container.lifecycleMethodCalls == ["beforeTest", "afterTest"]
+        container.lifecycleFilesystemFriendlyNames.join(",") == filesystemFriendlyNames
+        if (errorMessageStartsWith) {
+            assert container.capturedThrowable.message.startsWith(errorMessageStartsWith)
+        } else {
+            assert container.capturedThrowable == null
+        }
+
+        where:
+        fails | filesystemFriendlyNames             | errorMessageStartsWith
+        false | 'TestLifecycleAwareIT-perform+test' | null
+        true  | 'TestLifecycleAwareIT-perform+test' | "Condition not satisfied:"
+    }
+
+}

From d33f6475a9792b62c772d8f38a8c7a78ff1edf69 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 13 Apr 2020 17:39:01 +0200
Subject: [PATCH 0596/4969] Make default file recording directory of
 BrowserWebDriverContainer platform independent (#2562)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../containers/BrowserWebDriverContainer.java | 13 +++++++++++-
 ...ChromeRecordingWebDriverContainerTest.java | 20 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 9e1a2733a2e..22a4b9d47a5 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -28,8 +28,10 @@
 import org.testcontainers.lifecycle.TestLifecycleAware;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.Set;
@@ -52,6 +54,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private static final int VNC_PORT = 5900;
 
     private static final String NO_PROXY_KEY = "no_proxy";
+    private static final String TC_TEMP_DIR_PREFIX = "tc";
 
     @Nullable
     private Capabilities capabilities;
@@ -61,7 +64,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private RemoteWebDriver driver;
     private VncRecordingMode recordingMode = VncRecordingMode.RECORD_FAILING;
     private RecordingFileFactory recordingFileFactory;
-    private File vncRecordingDirectory = new File("/tmp");
+    private File vncRecordingDirectory;
 
     private VncRecordingContainer vncRecordingContainer = null;
 
@@ -140,6 +143,14 @@ protected void configure() {
         }
 
         if (recordingMode != VncRecordingMode.SKIP) {
+            try {
+                vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
+            } catch (IOException e) {
+                // should never happen as per javadoc, since we use valid prefix
+                logger().error("Exception while trying to create temp directory " + vncRecordingDirectory.getAbsolutePath(), e);
+                throw new ContainerLaunchException("Exception while trying to create temp directory", e);
+            }
+
             if (getNetwork() == null) {
                 withNetwork(Network.SHARED);
             }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index 6601242efa7..7e77f63a051 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -7,8 +7,10 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.DefaultRecordingFileFactory;
+import org.testcontainers.lifecycle.TestDescription;
 
 import java.io.File;
+import java.util.Optional;
 
 import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
 
@@ -36,8 +38,24 @@ public static class ChromeThatRecordsFailingTests {
                 .withCapabilities(new ChromeOptions());
 
         @Test
-        public void recordingTestThatShouldBeRecordedButDeleted() {
+        public void recordingTestThatShouldBeRecordedButNotPersisted() {
             doSimpleExplore(chrome);
         }
+
+        @Test
+        public void recordingTestThatShouldBeRecordedAndRetained() {
+            doSimpleExplore(chrome);
+            chrome.afterTest(new TestDescription() {
+                @Override
+                public String getTestId() {
+                    return getFilesystemFriendlyName();
+                }
+
+                @Override
+                public String getFilesystemFriendlyName() {
+                    return "ChromeThatRecordsFailingTests-recordingTestThatShouldBeRecordedAndRetained";
+                }
+            }, Optional.of(new RuntimeException("Force writing of video file.")));
+        }
     }
 }

From 8854fd9b1e32282f13ee8f24b3986b67da46c75d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:51:04 +0100
Subject: [PATCH 0597/4969] Bump tomcat-jdbc from 9.0.33 to 9.0.34 in
 /modules/mysql (#2542)

Bumps tomcat-jdbc from 9.0.33 to 9.0.34.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 10fd90b3c38..606aeefe813 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.19'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.34'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 

From fbda419042d5de2b223b33a018269c714eefa78e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:51:20 +0100
Subject: [PATCH 0598/4969] =?UTF-8?q?Bump=20junit-jupiter-engine=20from=20?=
 =?UTF-8?q?5.6.0=20to=205.6.2=20in=20/modules/junit=E2=80=A6=20(#2553)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.6.0 to 5.6.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.6.0...r5.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 bf52b25913c..f7cbb476260 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.12'
     testRuntime 'mysql:mysql-connector-java:8.0.19'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }
 
 test {

From f18775801e71f32f1c962dab0e2435ca4727f9fc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:51:31 +0100
Subject: [PATCH 0599/4969] =?UTF-8?q?Bump=20aws-java-sdk-logs=20from=201.1?=
 =?UTF-8?q?1.759=20to=201.11.762=20in=20/modules/lo=E2=80=A6=20(#2541)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.759 to 1.11.762.
- [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.759...1.11.762)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 1e9e3cd9121..c8bf561b6d1 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.759'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.762'
 }

From f822865e5738535f9ce6ed502dac679337a141ca Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:51:38 +0100
Subject: [PATCH 0600/4969] =?UTF-8?q?Bump=20r2dbc-postgresql=20from=200.8.?=
 =?UTF-8?q?1.RELEASE=20to=200.8.2.RELEASE=20in=20/m=E2=80=A6=20(#2561)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.1.RELEASE to 0.8.2.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-postgresql/blob/v0.8.2.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.1.RELEASE...v0.8.2.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 c629c1c5a13..9893ec28bd1 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     compile project(':jdbc')
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.2.RELEASE'
 
     testCompile 'org.postgresql:postgresql:42.2.12'
     testCompile 'commons-dbutils:commons-dbutils:1.7'

From a988cf8400408273d617c9c3bf259ff18b5746d4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:51:49 +0100
Subject: [PATCH 0601/4969] Bump tomcat-jdbc from 9.0.33 to 9.0.34 in
 /modules/mariadb (#2543)

Bumps tomcat-jdbc from 9.0.33 to 9.0.34.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 93b2de2a716..730dae7c794 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.34'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 
     testCompile testFixtures(project(':r2dbc'))

From 3bf78155ce7006dce40123df2d610016e34d0c2a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:51:54 +0100
Subject: [PATCH 0602/4969] Bump cucumber-java from 5.5.0 to 5.6.0 in /examples
 (#2527)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 5.5.0 to 5.6.0.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v5.5.0...v5.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 52c59229350..6827bb7c683 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.14.0'
     testImplementation 'io.cucumber:cucumber-junit:5.5.0'
-    testImplementation 'io.cucumber:cucumber-java:5.5.0'
+    testImplementation 'io.cucumber:cucumber-java:5.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From ba21115757507d6347548065afa52226f8eb9c0e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:52:25 +0100
Subject: [PATCH 0603/4969] =?UTF-8?q?Bump=20junit-jupiter-api=20from=205.6?=
 =?UTF-8?q?.0=20to=205.6.2=20in=20/modules/junit-ju=E2=80=A6=20(#2554)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.6.0 to 5.6.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.6.0...r5.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 f7cbb476260..950302715b5 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.6.0'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.6.2'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From 83da2e25a9348a1ed7b321ac82d931bafdf90b8a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:52:42 +0100
Subject: [PATCH 0604/4969] =?UTF-8?q?Bump=20r2dbc-mssql=20from=200.8.1.REL?=
 =?UTF-8?q?EASE=20to=200.8.2.RELEASE=20in=20/module=E2=80=A6=20(#2559)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 0.8.1.RELEASE to 0.8.2.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v0.8.2.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v0.8.1.RELEASE...v0.8.2.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 3c44df64eda..4a496e9eb35 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.1.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.2.RELEASE'
 
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.1.RELEASE'

From 558988c1cf86976795cd28eacc9c6417bba6ea99 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:52:54 +0100
Subject: [PATCH 0605/4969] Bump java-client from 2.7.13 to 2.7.14 in
 /modules/couchbase (#2540)

Bumps [java-client](https://github.com/couchbase/couchbase-java-client) from 2.7.13 to 2.7.14.
- [Release notes](https://github.com/couchbase/couchbase-java-client/releases)
- [Commits](https://github.com/couchbase/couchbase-java-client/compare/2.7.13...2.7.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 095f8828aac..9dd0856fd51 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'com.couchbase.client:java-client:2.7.13'
+    testCompile 'com.couchbase.client:java-client:2.7.14'
 }

From 3645252cf7de3021abdf7bc1c7e86d22fad69551 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:53:13 +0100
Subject: [PATCH 0606/4969] =?UTF-8?q?Bump=20org.springframework.boot=20fro?=
 =?UTF-8?q?m=202.2.5.RELEASE=20to=202.2.6.RELEA=E2=80=A6=20(#2530)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.2.5.RELEASE to 2.2.6.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.2.5.RELEASE...v2.2.6.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 examples/selenium-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index c9bed8d1467..edbe7d1fb68 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.2.5.RELEASE'
+    id 'org.springframework.boot' version '2.2.6.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 780359762c05c7b4153337686a3a6805bef3c864 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:53:45 +0100
Subject: [PATCH 0607/4969] Bump cucumber-junit from 5.5.0 to 5.6.0 in
 /examples (#2529)

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 5.5.0 to 5.6.0.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v5.5.0...v5.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 6827bb7c683..53a50c374f5 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    testImplementation 'io.cucumber:cucumber-junit:5.5.0'
+    testImplementation 'io.cucumber:cucumber-junit:5.6.0'
     testImplementation 'io.cucumber:cucumber-java:5.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From b5da9140f3c910e38c474b8614d23ea9308afb32 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 14 Apr 2020 11:00:53 +0100
Subject: [PATCH 0608/4969] Upgrade Gradle to 6.3 (#2551)

For compatibility with recent JDKs
---
 build.gradle                             |  6 -----
 gradle/wrapper/gradle-wrapper.properties |  5 ++--
 gradlew                                  | 29 ++++++++++--------------
 settings.gradle                          |  8 +++++++
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4fbaf42c160..d9d374cb511 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id 'com.gradle.build-scan' version '2.4.2'
     id 'io.franzbecker.gradle-lombok' version '3.1.0'
     id 'nebula.provided-base' version '3.0.3'
     id 'com.github.johnrengelman.shadow' version '5.1.0'
@@ -133,8 +132,3 @@ subprojects {
         testCompile 'ch.qos.logback:logback-classic:1.2.3'
     }
 }
-
-buildScan {
-    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-    termsOfServiceAgree = 'yes'
-}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ca9d62814a2..6fd47cc3de5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Apr 05 19:28:23 BST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 83f2acfdc31..2fe81a7d95e 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/settings.gradle b/settings.gradle
index e5432e08061..5ec35718ef6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,6 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.9.0"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.2.1"
     }
 
     configurations.classpath {
@@ -16,6 +17,7 @@ buildscript {
 }
 
 apply plugin: 'ch.myniva.s3-build-cache'
+apply plugin: 'com.gradle.enterprise'
 
 ext.isMasterBuild = (System.getenv("CIRCLE_BRANCH") ?: System.getenv("BUILD_SOURCEBRANCHNAME")) == "master"
 
@@ -55,3 +57,9 @@ include ':docs:examples:spock:redis'
 
 include 'test-support'
 
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+        termsOfServiceAgree = 'yes'
+    }
+}

From 34c7aef429d0debf9c5b7268c210536089c71a53 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2020 11:01:46 +0100
Subject: [PATCH 0609/4969] =?UTF-8?q?Bump=20junit-jupiter-params=20from=20?=
 =?UTF-8?q?5.6.0=20to=205.6.2=20in=20/modules/junit=E2=80=A6=20(#2571)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.6.0 to 5.6.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.6.0...r5.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 950302715b5..c1b713cdd86 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.0'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
     testCompile 'org.assertj:assertj-core:3.14.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'

From c9a0b1f0b1d7f389bacdf8b89407968f45a73b65 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2020 11:02:27 +0100
Subject: [PATCH 0610/4969] =?UTF-8?q?Bump=20assertj-core=20from=203.14.0?=
 =?UTF-8?q?=20to=203.15.0=20in=20/modules/junit-jupit=E2=80=A6=20(#2570)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 c1b713cdd86..86d9b30930e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,8 +12,8 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
+    testCompile 'org.assertj:assertj-core:3.15.0'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
-    testCompile 'org.assertj:assertj-core:3.14.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'
     testRuntime 'mysql:mysql-connector-java:8.0.19'

From 207d62df010109b93f632408c7b6b0f7fb5057fa Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 15 Apr 2020 15:03:55 +0200
Subject: [PATCH 0611/4969] Explicitly set ciMate's projectId in CircleCI
 (#2572)

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c4302911f40..67e6546e220 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,6 +12,8 @@ jobs:
     - run: &ciMate
         name: aggregate test reports with ciMate
         when: always
+        environment:
+          CIMATE_PROJECT_ID: 2348n4vl
         command: |
           wget -q https://get.cimate.io/release/linux/cimate
           chmod +x cimate

From c3d37e4195470b7bace41d1556df7a50a6c56ea8 Mon Sep 17 00:00:00 2001
From: Stefan Rempfer <rempfer@gmail.com>
Date: Thu, 16 Apr 2020 15:04:21 +0200
Subject: [PATCH 0612/4969] Regard specified VNC recording directory for
 BrowserWebDriverContainer again (#2574)

Co-authored-by: Stefan Rempfer <srempfer@rt.ipnt.de>
---
 .../containers/BrowserWebDriverContainer.java | 15 ++++----
 ...ChromeRecordingWebDriverContainerTest.java | 36 +++++++++++++++----
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 22a4b9d47a5..49218dfb990 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -143,12 +143,15 @@ protected void configure() {
         }
 
         if (recordingMode != VncRecordingMode.SKIP) {
-            try {
-                vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
-            } catch (IOException e) {
-                // should never happen as per javadoc, since we use valid prefix
-                logger().error("Exception while trying to create temp directory " + vncRecordingDirectory.getAbsolutePath(), e);
-                throw new ContainerLaunchException("Exception while trying to create temp directory", e);
+
+            if (vncRecordingDirectory == null) {
+                try {
+                    vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
+                } catch (IOException e) {
+                    // should never happen as per javadoc, since we use valid prefix
+                    logger().error("Exception while trying to create temp directory " + vncRecordingDirectory.getAbsolutePath(), e);
+                    throw new ContainerLaunchException("Exception while trying to create temp directory", e);
+                }
             }
 
             if (getNetwork() == null) {
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index 7e77f63a051..3872e3d8dd2 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -1,17 +1,19 @@
 package org.testcontainers.junit;
 
+
+import com.google.common.io.PatternFilenameFilter;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.DefaultRecordingFileFactory;
 import org.testcontainers.lifecycle.TestDescription;
 
-import java.io.File;
 import java.util.Optional;
-
+import static org.junit.Assert.assertTrue;
 import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
 
 @RunWith(Enclosed.class)
@@ -20,14 +22,34 @@ public class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContaine
     public static class ChromeThatRecordsAllTests {
 
         @Rule
-        public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
-                .withCapabilities(new ChromeOptions())
-                .withRecordingMode(RECORD_ALL, new File("./build/"))
-                .withRecordingFileFactory(new DefaultRecordingFileFactory());
+        public TemporaryFolder vncRecordingDirectory = new TemporaryFolder();
 
         @Test
         public void recordingTestThatShouldBeRecordedAndRetained() {
-            doSimpleExplore(chrome);
+            try (
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
+                    .withCapabilities(new ChromeOptions())
+                    .withRecordingMode(RECORD_ALL, vncRecordingDirectory.getRoot())
+                    .withRecordingFileFactory(new DefaultRecordingFileFactory())
+            ) {
+                chrome.start();
+
+                doSimpleExplore(chrome);
+                chrome.afterTest(new TestDescription() {
+                    @Override
+                    public String getTestId() {
+                        return getFilesystemFriendlyName();
+                    }
+
+                    @Override
+                    public String getFilesystemFriendlyName() {
+                        return "ChromeThatRecordsAllTests-recordingTestThatShouldBeRecordedAndRetained";
+                    }
+                }, Optional.empty());
+
+                String[] files = vncRecordingDirectory.getRoot().list(new PatternFilenameFilter("PASSED-.*\\.flv"));
+                assertTrue("Recorded file not found", files.length == 1);
+            }
         }
     }
 

From a6e6079bbd61383e68bcf464ba49eccb1262e844 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 16 Apr 2020 22:02:15 +0200
Subject: [PATCH 0613/4969] Add `type/enhancement` to the Release Drafter
 (#2580)

---
 .github/release-drafter.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index ed8939a3117..af82504717a 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -5,8 +5,10 @@ template: |
 
     $CHANGES
 categories:
-  - title: 🚀 Features
-    label: type/feature
+  - title: 🚀 Features & Enhancements
+    labels:
+      - type/feature
+      - type/enhancement
   - title: 🐛 Bug Fixes
     label: type/bug
   - title: 📖 Documentation

From 4b5bfaef9345f9e4e9f4607e5c7fd185124e7915 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 17 Apr 2020 14:25:16 +0200
Subject: [PATCH 0614/4969] Update Gradle Shadow Plugin to 5.2.0 (#2582)

Gradle Shadow Plugin supports Gradle Caching from 5.2.0 and should
help avoiding this heavyweight task when not necessarily.
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d9d374cb511..78958851963 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'io.franzbecker.gradle-lombok' version '3.1.0'
     id 'nebula.provided-base' version '3.0.3'
-    id 'com.github.johnrengelman.shadow' version '5.1.0'
+    id 'com.github.johnrengelman.shadow' version '5.2.0'
     id "com.jfrog.bintray" version "1.8.4" apply false
 }
 

From b7cda9d81479c66f957435bccde72a4e66ae648e Mon Sep 17 00:00:00 2001
From: Lokesh Pant <7022317+KraTos5589@users.noreply.github.com>
Date: Fri, 17 Apr 2020 18:17:36 +0530
Subject: [PATCH 0615/4969] Update CreateContainerCmd link to the latest
 release (#2583)

* CreateContainerCmd Link was outdated.

Replaced working link

* Replaced with version 3.0.0 link

* Updated to 3.2.1
---
 docs/features/advanced_options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/advanced_options.md b/docs/features/advanced_options.md
index a774dbddc06..8689ce46021 100644
--- a/docs/features/advanced_options.md
+++ b/docs/features/advanced_options.md
@@ -51,4 +51,4 @@ For example, this can be used to change the container hostname:
     It is recommended to use this sparingly, and follow changes to the `docker-java` API if you choose to use this. 
     It is typically quite stable, though.
 
-For what is possible, consult the [`docker-java CreateContainerCmd` source code](https://github.com/docker-java/docker-java/blob/master/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java).
+For what is possible, consult the [`docker-java CreateContainerCmd` source code](https://github.com/docker-java/docker-java/blob/3.2.1/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java).

From e354a7f51c62c40e26aa761be93eafcc2cd82bfe Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 18 Apr 2020 10:13:09 +0100
Subject: [PATCH 0616/4969] Reduce CircleCI build to a minimal subset of core
 (#2586)

---
 .circleci/config.yml | 89 ++------------------------------------------
 1 file changed, 3 insertions(+), 86 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67e6546e220..8f700dba2b5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,15 +1,13 @@
 version: 2
 jobs:
-  core:
+  minimal_core:
     machine:
       enabled: true
     steps:
     - checkout
     - run:
-        command: ./gradlew testcontainers:build -x test -x check
+        command: ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
     - run:
-        command: ./gradlew testcontainers:check --scan
-    - run: &ciMate
         name: aggregate test reports with ciMate
         when: always
         environment:
@@ -28,89 +26,8 @@ jobs:
         path: ~/junit
     - store_artifacts:
         path: ~/junit
-  modules-no-jdbc-test-no-selenium:
-    machine:
-      enabled: true
-    steps:
-    - checkout
-    - run:
-        command: ./gradlew check -x testcontainers:check -x selenium:check -x jdbc-test:check
-          --scan
-        environment:
-          TZ: /usr/share/zoneinfo/ETC/UTC
-    - run: *ciMate
-    - run:
-        name: Save test results
-        command: |
-          mkdir -p ~/junit/
-          find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
-        when: always
-    - store_test_results:
-        path: ~/junit
-    - store_artifacts:
-        path: ~/junit
-  modules-jdbc-test:
-    machine:
-      enabled: true
-    steps:
-    - checkout
-    - run:
-        command: ./gradlew jdbc-test:check --scan
-        environment:
-          TZ: /usr/share/zoneinfo/ETC/UTC
-    - run: *ciMate
-    - run:
-        name: Save test results
-        command: |
-          mkdir -p ~/junit/
-          find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
-        when: always
-    - store_test_results:
-        path: ~/junit
-    - store_artifacts:
-        path: ~/junit
-  selenium:
-    machine:
-      enabled: true
-    steps:
-    - checkout
-    - run:
-        command: ./gradlew selenium:check --scan
-    - run: *ciMate
-    - run:
-        name: Save test results
-        command: |
-          mkdir -p ~/junit/
-          find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
-        when: always
-    - store_test_results:
-        path: ~/junit
-    - store_artifacts:
-        path: ~/junit
-  examples:
-    machine:
-      enabled: true
-    steps:
-    - checkout
-    - run:
-        command: cd examples && ./gradlew check
-    - run: *ciMate
-    - run:
-        name: Save test results
-        command: |
-          mkdir -p ~/junit/
-          find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
-        when: always
-    - store_test_results:
-        path: ~/junit
-    - store_artifacts:
-        path: ~/junit
 workflows:
   version: 2
   test_all:
     jobs:
-    - core
-    - modules-no-jdbc-test-no-selenium
-    - modules-jdbc-test
-    - selenium
-    - examples
+    - minimal_core

From 1ef6fac59c11c2898466c53f6ed63d5095b67f5a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 18 Apr 2020 10:31:15 +0100
Subject: [PATCH 0617/4969] Generate GitHub Actions CI Jobs automatically
 (#2520)

Co-Authored-By: Sergei Egorov <bsideup@gmail.com>
Co-Authored-By: Richard North <rich.north@gmail.com>
---
 .github/workflows/ci-dind.yml                | 28 ++++++++
 .github/workflows/ci.yml                     | 68 +++++++++++++++++---
 .github/workflows/scripts/check_ci_status.sh |  2 +-
 build.gradle                                 |  6 +-
 gradle/ci-support.gradle                     | 37 +++++++++++
 5 files changed, 129 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/ci-dind.yml
 create mode 100644 gradle/ci-support.gradle

diff --git a/.github/workflows/ci-dind.yml b/.github/workflows/ci-dind.yml
new file mode 100644
index 00000000000..15bd5ec76ee
--- /dev/null
+++ b/.github/workflows/ci-dind.yml
@@ -0,0 +1,28 @@
+name: in-container
+
+on:
+  pull_request: {}
+  push: { branches: [ master ] }
+
+jobs:
+  in-docker_test:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build with Gradle
+        run: |
+          docker run -i --rm \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            -v "$HOME:$HOME" \
+            -v "$PWD:$PWD" \
+            -w "$PWD" \
+            openjdk:8-jdk-alpine \
+            ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
+      - name: aggregate test reports with ciMate
+        if: always()
+        env:
+          CIMATE_PROJECT_ID: 2348n4vl
+        run: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a0a97d05f7..5f7dfb2c3dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,20 +5,68 @@ on:
   push: { branches: [ master ] }
 
 jobs:
-  in-docker_test:
+  find_gradle_jobs:
     runs-on: ubuntu-18.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - name: Build with Gradle
+      - id: set-matrix
         run: |
-          docker run -i --rm \
-            -v /var/run/docker.sock:/var/run/docker.sock \
-            -v "$HOME:$HOME" \
-            -v "$PWD:$PWD" \
-            -w "$PWD" \
-            openjdk:8-jdk-alpine \
-            ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
-      - name: aggregate test reports with ciMate
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
+          echo $TASKS
+          echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
+  check:
+    needs: find_gradle_jobs
+    strategy:
+      matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '1.8'
+      - name: Cache Gradle Home files
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
+            ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
+            ${{ runner.os }}-gradle-home-
+      - name: Clear existing docker image cache
+        run: docker image prune -af
+      - name: Build and test with Gradle (${{matrix.gradle_args}})
+        run: |
+          ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+      - name: Aggregate test reports with ciMate
+        if: always()
+        env:
+          CIMATE_PROJECT_ID: 2348n4vl
+        run: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
+  examples:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '1.8'
+      - name: Cache Gradle Home files
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-home-examples-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-home-examples-
+      - name: Build and test Examples with Gradle
+        working-directory: ./examples/
+        run: |
+          ./gradlew --no-daemon --scan --info check
+      - name: Aggregate test reports with ciMate
         if: always()
         env:
           CIMATE_PROJECT_ID: 2348n4vl
diff --git a/.github/workflows/scripts/check_ci_status.sh b/.github/workflows/scripts/check_ci_status.sh
index bc5c0b138a2..29ef1d939a8 100755
--- a/.github/workflows/scripts/check_ci_status.sh
+++ b/.github/workflows/scripts/check_ci_status.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 set -o errexit
 set -o nounset
 set -o pipefail
diff --git a/build.gradle b/build.gradle
index 78958851963..382ecdf161e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,8 @@ plugins {
     id "com.jfrog.bintray" version "1.8.4" apply false
 }
 
+apply from: "$rootDir/gradle/ci-support.gradle"
+
 subprojects {
     apply plugin: 'nebula.provided-base'
     apply plugin: 'java'
@@ -45,10 +47,12 @@ subprojects {
         apply from: "$rootDir/gradle/publishing.gradle"
         apply from: "$rootDir/gradle/bintray.gradle"
 
+        jar.archiveClassifier.set("original")
+
         publishing {
             publications {
                 mavenJava(MavenPublication) { publication ->
-                    artifacts.removeAll { it.classifier == null }
+                    artifacts.removeAll { it.classifier == jar.archiveClassifier.get() }
                     artifact project.tasks.shadowJar
                 }
             }
diff --git a/gradle/ci-support.gradle b/gradle/ci-support.gradle
new file mode 100644
index 00000000000..7c3408068b3
--- /dev/null
+++ b/gradle/ci-support.gradle
@@ -0,0 +1,37 @@
+import groovy.json.JsonOutput
+
+// Emit a JSON-formatted list of check tasks to be run in CI
+task testMatrix {
+    project.afterEvaluate {
+        def checkTasks = subprojects.collect {
+            it.tasks.findByName("check")
+        }.findAll { it != null }
+
+        dependsOn(checkTasks)
+        doLast {
+            // Obtain a list of check tasks that are not up-to-date, i.e.
+            //  the ones which Gradle cannot find a cached output for.
+            def checkTaskPaths = checkTasks
+                .findAll { !it.state.upToDate }
+                .collect { it.path }
+
+            println(JsonOutput.toJson(checkTaskPaths))
+        }
+    }
+}
+
+// If we're executing the `taskMatrix` task, disable tests and other slow tasks
+//  so that we can get a result quickly.
+gradle.taskGraph.whenReady {
+    if (it.hasTask(tasks.testMatrix)) {
+        for (subproject in subprojects) {
+            subproject.tasks.withType(Test).all {
+                testExecuter([execute: { spec, processor -> }, stopNow:{}] as org.gradle.api.internal.tasks.testing.TestExecuter)
+            }
+            subproject.tasks.findByName("shadowJar").enabled = false
+            subproject.tasks.findByName("javadoc").enabled = false
+            subproject.tasks.findByName("delombok").enabled = false
+            subproject.tasks.findByName("japicmp")?.enabled = false
+        }
+    }
+}

From e7230c282e76ac54ea1d0d941e71876ba6e45d49 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 18 Apr 2020 14:22:57 +0100
Subject: [PATCH 0618/4969] Exclude multi-module `module-info.class` from
 shaded JAR (#2588)

---
 core/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/build.gradle b/core/build.gradle
index 84a20425cc5..b116a1f85f2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -44,6 +44,7 @@ shadowJar {
         'META-INF/DEPENDENCIES',
         'META-INF/maven/',
         'META-INF/proguard/',
+        'META-INF/versions/*/module-info.class',
         'META-INF/services/README.md',
         'META-INF/services/com.fasterxml.jackson.core.*',
         'META-INF/services/com.github.dockerjava.api.command.*',

From 374c559d9bca054f06fdd69cd0f95b024af425bc Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 18 Apr 2020 16:07:28 +0100
Subject: [PATCH 0619/4969] Add gradle caching to find_gradle_jobs build
 (#2589)

---
 .github/workflows/ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5f7dfb2c3dc..84b3d9a5197 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,17 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '1.8'
+      - name: Cache Gradle Home files
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-home-testmatrix-
+            ${{ runner.os }}-gradle-home-
       - id: set-matrix
         run: |
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)

From f6728616872ec7011ef3b3c75fab9c4bc1982fe5 Mon Sep 17 00:00:00 2001
From: Sudharaka Palamakumbura <sudharakap@mun.ca>
Date: Sat, 18 Apr 2020 08:17:35 -0700
Subject: [PATCH 0620/4969] Update Copyright for 2020 in Documentation (#2566)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index af2bf79f0c9..8b3ffda05d2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -131,6 +131,6 @@ This project was initially inspired by a [gist](https://gist.github.com/mosheesh
 
 ## Copyright
 
-Copyright (c) 2015-2019 Richard North and other authors.
+Copyright (c) 2015-2020 Richard North and other authors.
 
 See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/AUTHORS) for contributors.

From d2fe97bc47c65cd87a28cd11576bee944c07a848 Mon Sep 17 00:00:00 2001
From: Sudharaka Palamakumbura <sudharakap@mun.ca>
Date: Sat, 18 Apr 2020 08:18:24 -0700
Subject: [PATCH 0621/4969] Update latest _version tag in Documentation Code
 Samples (#2568)

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index c2d39bc9d2c..e3cae4c5da8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -88,4 +88,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.13.0
+    latest_version: 1.14.0

From 3530e63d1d33801b4851acbe606d1282ebbd4298 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 19 Apr 2020 11:11:35 +0200
Subject: [PATCH 0622/4969] delegate `getMetadata()` to
 `R2DBCDatabaseContainerProvider` (#2577)

Apparently, R2DBC ConnectionFactories perform early validation of options, and it fails because the original options (when specified as `r2dbc://mysql:///db`) miss some required options like host/port/username/password.

After talking to Mark from R2DBC, it seems that the checks will stay, so we need to workaround it somehow. I ended up with the delegation to `R2DBCDatabaseContainerProvider`, because these provides should know which options they add and which are required.
---
 .../containers/MariaDBContainer.java          |  8 ++++++--
 ...MariaDBR2DBCDatabaseContainerProvider.java | 16 ++++++++++++++++
 .../MSSQLR2DBCDatabaseContainerProvider.java  | 16 ++++++++++++++++
 .../containers/MSSQLServerContainer.java      | 10 +++++++---
 .../containers/MySQLContainer.java            |  8 ++++++--
 .../MySQLR2DBCDatabaseContainerProvider.java  | 16 ++++++++++++++++
 .../containers/PostgreSQLContainer.java       |  5 +++++
 ...tgreSQLR2DBCDatabaseContainerProvider.java | 16 ++++++++++++++++
 .../r2dbc/R2DBCDatabaseContainerProvider.java | 19 +++++++++++++++++++
 .../TestcontainersR2DBCConnectionFactory.java |  3 +--
 .../AbstractR2DBCDatabaseContainerTest.java   |  8 ++++++++
 11 files changed, 116 insertions(+), 9 deletions(-)

diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index e402bc24e0e..fc876713dda 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -11,10 +11,14 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
     public static final String IMAGE = "mariadb";
     public static final String DEFAULT_TAG = "10.3.6";
 
+    static final String DEFAULT_USER = "test";
+
+    static final String DEFAULT_PASSWORD = "test";
+
     static final Integer MARIADB_PORT = 3306;
     private String databaseName = "test";
-    private String username = "test";
-    private String password = "test";
+    private String username = DEFAULT_USER;
+    private String password = DEFAULT_PASSWORD;
     private static final String MARIADB_ROOT_USER = "root";
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
 
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
index 79cb627f8a9..36a201f85bb 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
@@ -1,11 +1,14 @@
 package org.testcontainers.containers;
 
 import com.google.auto.service.AutoService;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.mariadb.r2dbc.MariadbConnectionFactoryProvider;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
 
+import javax.annotation.Nullable;
+
 @AutoService(R2DBCDatabaseContainerProvider.class)
 public class MariaDBR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
@@ -27,4 +30,17 @@ public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options)
         }
         return new MariaDBR2DBCDatabaseContainer(container);
     }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, MariaDBContainer.DEFAULT_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, MariaDBContainer.DEFAULT_PASSWORD);
+        }
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
index 1638901226c..d72ab8e8419 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
@@ -2,10 +2,13 @@
 
 import com.google.auto.service.AutoService;
 import io.r2dbc.mssql.MssqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
 
+import javax.annotation.Nullable;
+
 @AutoService(R2DBCDatabaseContainerProvider.class)
 public class MSSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
@@ -26,4 +29,17 @@ public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options)
         }
         return new MSSQLR2DBCDatabaseContainer(container);
     }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, MSSQLServerContainer.DEFAULT_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, MSSQLServerContainer.DEFAULT_PASSWORD);
+        }
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index afe3f5b8651..2219a5aaf61 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -15,8 +15,12 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
     public static final String DEFAULT_TAG = "2017-CU12";
 
     public static final Integer MS_SQL_SERVER_PORT = 1433;
-    private String username = "SA";
-    private String password = "A_Str0ng_Required_Password";
+
+    static final String DEFAULT_USER = "SA";
+
+    static final String DEFAULT_PASSWORD = "A_Str0ng_Required_Password";
+
+    private String password = DEFAULT_PASSWORD;
 
     private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
     private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 240;
@@ -63,7 +67,7 @@ public String getJdbcUrl() {
 
     @Override
     public String getUsername() {
-        return username;
+        return DEFAULT_USER;
     }
 
     @Override
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index a8549672ff3..54f3ab08524 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -14,11 +14,15 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
     public static final String IMAGE = "mysql";
     public static final String DEFAULT_TAG = "5.7.22";
 
+    static final String DEFAULT_USER = "test";
+
+    static final String DEFAULT_PASSWORD = "test";
+
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
     public static final Integer MYSQL_PORT = 3306;
     private String databaseName = "test";
-    private String username = "test";
-    private String password = "test";
+    private String username = DEFAULT_USER;
+    private String password = DEFAULT_PASSWORD;
     private static final String MYSQL_ROOT_USER = "root";
 
     public MySQLContainer() {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
index 3a01616caba..ec3b6a4e41f 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
@@ -2,10 +2,13 @@
 
 import com.google.auto.service.AutoService;
 import dev.miku.r2dbc.mysql.MySqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
 
+import javax.annotation.Nullable;
+
 @AutoService(R2DBCDatabaseContainerProvider.class)
 public class MySQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
@@ -27,4 +30,17 @@ public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options)
         }
         return new MySQLR2DBCDatabaseContainer(container);
     }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, MySQLContainer.DEFAULT_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, MySQLContainer.DEFAULT_PASSWORD);
+        }
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
 }
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 0fae3a16f4a..06cdd7ebc8d 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -19,6 +19,11 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
     public static final String DEFAULT_TAG = "9.6.12";
 
     public static final Integer POSTGRESQL_PORT = 5432;
+
+    static final String DEFAULT_USER = "test";
+
+    static final String DEFAULT_PASSWORD = "test";
+
     private String databaseName = "test";
     private String username = "test";
     private String password = "test";
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
index 5e9da980b8e..971b4cd3758 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
@@ -2,10 +2,13 @@
 
 import com.google.auto.service.AutoService;
 import io.r2dbc.postgresql.PostgresqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
 
+import javax.annotation.Nullable;
+
 @AutoService(R2DBCDatabaseContainerProvider.class)
 public final class PostgreSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
@@ -27,4 +30,17 @@ public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options)
         }
         return new PostgreSQLR2DBCDatabaseContainer(container);
     }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, PostgreSQLContainer.DEFAULT_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, PostgreSQLContainer.DEFAULT_PASSWORD);
+        }
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
 }
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
index 2eabc0d521b..287407dc15e 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
@@ -1,8 +1,13 @@
 package org.testcontainers.r2dbc;
 
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import io.r2dbc.spi.Option;
 
+import javax.annotation.Nullable;
+
 public interface R2DBCDatabaseContainerProvider {
 
     Option<Boolean> REUSABLE_OPTION = Option.valueOf("TC_REUSABLE");
@@ -12,4 +17,18 @@ public interface R2DBCDatabaseContainerProvider {
     boolean supports(ConnectionFactoryOptions options);
 
     R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options);
+
+    @Nullable
+    default ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.HOST)) {
+            builder.option(ConnectionFactoryOptions.HOST, "localhost");
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PORT)) {
+            builder.option(ConnectionFactoryOptions.PORT, 65535);
+        }
+
+        ConnectionFactory connectionFactory = ConnectionFactories.find(builder.build());
+        return connectionFactory != null ? connectionFactory.getMetadata() : null;
+    }
 }
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
index 1a0fc57ad8c..691775a94f8 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
@@ -68,8 +68,7 @@ public Publisher<? extends Connection> create() {
 
     @Override
     public ConnectionFactoryMetadata getMetadata() {
-        // TODO check whether it is fine to call it without setting the host/port and other values
-        return ConnectionFactories.find(options).getMetadata();
+        return containerProvider.getMetadata(options);
     }
 
     @Override
diff --git a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
index 7f14ecca2a7..c21c7078410 100644
--- a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
+++ b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
@@ -4,6 +4,7 @@
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
@@ -38,6 +39,13 @@ public final void testUrlSupport() {
         runTestQuery(connectionFactory);
     }
 
+    @Test
+    public final void testGetMetadata() {
+        ConnectionFactory connectionFactory = ConnectionFactories.get(createR2DBCUrl());
+        ConnectionFactoryMetadata metadata = connectionFactory.getMetadata();
+        assertThat(metadata).isNotNull();
+    }
+
     protected abstract T createContainer();
 
     protected void runTestQuery(ConnectionFactory connectionFactory) {

From add6eb431525c3fd51c8709441c502f1657529ad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 19 Apr 2020 11:12:12 +0200
Subject: [PATCH 0623/4969] Bump testcontainers from 1.12.5 to 1.14.0 in /core
 (#2569)

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.12.5 to 1.14.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.12.5...1.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 b116a1f85f2..09a6c590242 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.12.5', {
+    baseline 'org.testcontainers:testcontainers:1.14.0', {
         exclude group: "*", module: "*"
     }
 

From 84f422b5c6e23c39698b32ff3cbc3a5d64f70177 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 19 Apr 2020 16:19:40 +0200
Subject: [PATCH 0624/4969] GHA: disable fail-fast matrix strategy (#2591)

See https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 84b3d9a5197..3dbcc4c41fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,6 +30,7 @@ jobs:
   check:
     needs: find_gradle_jobs
     strategy:
+      fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
     runs-on: ubuntu-18.04
     steps:

From b6cd9c80eddca65c9e2718b66c91b6b76f181371 Mon Sep 17 00:00:00 2001
From: Chason Choate <cha55son@gmail.com>
Date: Sun, 19 Apr 2020 09:20:17 -0500
Subject: [PATCH 0625/4969] Make ImageData class public for custom image pull
 policies (#2585)

* Making imagedata public so it can be used to create custom image pull
policies. Adding test to ensure it works as expected.

* Ensuring we don't do unnecessary pulls and using the default generic
container image for the out of package pull policy test.

Co-authored-by: Chason Choate <chason.choate@digitalreasoning.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../org/testcontainers/images/ImageData.java  |  2 +-
 .../test/java/alt/testcontainers/README.md    |  1 +
 .../OutOfPackageImagePullPolicyTest.java      | 27 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/alt/testcontainers/README.md
 create mode 100644 core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java

diff --git a/core/src/main/java/org/testcontainers/images/ImageData.java b/core/src/main/java/org/testcontainers/images/ImageData.java
index bef0c56c245..54b07d5acf2 100644
--- a/core/src/main/java/org/testcontainers/images/ImageData.java
+++ b/core/src/main/java/org/testcontainers/images/ImageData.java
@@ -10,7 +10,7 @@
 
 @Value
 @Builder
-class ImageData {
+public class ImageData {
 
     @NonNull
     Instant createdAt;
diff --git a/core/src/test/java/alt/testcontainers/README.md b/core/src/test/java/alt/testcontainers/README.md
new file mode 100644
index 00000000000..0a08ff91ba5
--- /dev/null
+++ b/core/src/test/java/alt/testcontainers/README.md
@@ -0,0 +1 @@
+Useful place for running tests that need to be outside of the `org.testcontainers` package.
diff --git a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
new file mode 100644
index 00000000000..2da41a8344e
--- /dev/null
+++ b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
@@ -0,0 +1,27 @@
+package alt.testcontainers.images;
+
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.images.AbstractImagePullPolicy;
+import org.testcontainers.images.ImageData;
+import org.testcontainers.utility.DockerImageName;
+
+public class OutOfPackageImagePullPolicyTest {
+    @Test
+    public void shouldSupportCustomPoliciesOutOfTestContainersPackage() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>()
+                .withImagePullPolicy(new AbstractImagePullPolicy() {
+                    @Override
+                    protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+                        return false;
+                    }
+                })
+        ) {
+            container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.start();
+        }
+    }
+
+}

From c9692006f1e774eda0981e9820f7331cab662196 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 19 Apr 2020 15:22:17 +0100
Subject: [PATCH 0626/4969] Reduce AZP build to a minimal subset of core,
 except when running on Windows (#2587)

---
 azure-pipelines.yml | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c56ae9fde36..5780a01bb83 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,24 +1,29 @@
 jobs:
-- job: core
+
+- job: azure_pipeline_tests
   steps:
+
+  # Run a minimal set of tests in normal Linux pipeline builds
   - task: Gradle@2
-    displayName: Build & test
+    condition: eq(variables['Agent.OS'], 'Linux')
+    displayName: Build & test (Linux - minimal core)
     env:
       AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
       AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
-        options: '--no-daemon --continue'
-        tasks: 'testcontainers:check'
+        options: "--no-daemon --continue"
+        tasks: "testcontainers:test --tests GenericContainerRuleTest"
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
     condition: and(succeededOrFailed(),eq(variables['Agent.OS'], 'Linux'))
-- job: jdbc
-  steps:
+
+  # Run all tests when running the Windows CI tests
   - task: Gradle@2
-    displayName: Build & test
+    condition: eq(variables['Agent.OS'], 'Windows_NT')
+    displayName: Build & test (Windows - all modules)
     env:
       AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
       AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
@@ -26,24 +31,6 @@ jobs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
         options: '--no-daemon --continue'
-        tasks: 'jdbc-test:check'
-        publishJUnitResults: true
-        testResultsFiles: '**/TEST-*.xml'
-  - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Linux'))
-- job: modules
-  steps:
-  - task: Gradle@2
-    displayName: Build & test
-    env:
-      AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
-      AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
-    inputs:
-        gradleWrapperFile: 'gradlew'
-        jdkVersionOption: '1.11'
-        options: '--continue -x testcontainers:check -x jdbc-test:check -PpostCheckCommand="docker image prune -af"'
         tasks: 'check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
-  - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Linux'))

From f631023576288234e7aacdce867520200b2dcfda Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 19 Apr 2020 19:57:42 +0100
Subject: [PATCH 0627/4969] Support ImageFromDockerfile authenticated image
 pulls (#2573)

Co-Authored-By: David Byron <dbyron@dbyron.com>
---
 .../images/builder/ImageFromDockerfile.java   |  49 ++++++---
 .../utility/AuthenticatedImagePullTest.java   | 103 ++++++++++++++----
 2 files changed, 112 insertions(+), 40 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 1140247960a..11a7e2f4cb6 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -83,16 +83,6 @@ protected final String resolve() {
 
         DockerClient dockerClient = DockerClientFactory.instance().client();
 
-        dependencyImageNames.forEach(imageName -> {
-            try {
-                log.info("Pre-emptively checking local images for '{}', referenced via a Dockerfile. If not available, it will be pulled.", imageName);
-                DockerClientFactory.instance().checkAndPullImage(dockerClient, imageName);
-            } catch (Exception e) {
-                log.warn("Unable to pre-fetch an image ({}) depended upon by Dockerfile - image build will continue but may fail. Exception message was: {}", imageName, e.getMessage());
-            }
-        });
-
-
         try {
             if (deleteOnExit) {
                 ResourceReaper.instance().registerImageForCleanup(dockerImageName);
@@ -118,6 +108,8 @@ public void onNext(BuildResponseItem item) {
             BuildImageCmd buildImageCmd = dockerClient.buildImageCmd(in);
             configure(buildImageCmd);
 
+            prePullDependencyImages(dependencyImageNames);
+
             BuildImageResultCallback exec = buildImageCmd.exec(resultCallback);
 
             long bytesToDockerDaemon = 0;
@@ -154,11 +146,30 @@ protected void configure(BuildImageCmd buildImageCmd) {
         this.dockerfile.ifPresent(p -> {
             buildImageCmd.withDockerfile(p.toFile());
             dependencyImageNames = new ParsedDockerfile(p).getDependencyImageNames();
+
+            if (dependencyImageNames.size() > 0) {
+                // if we'll be pre-pulling images, disable the built-in pull as it is not necessary and will fail for
+                // authenticated registries
+                buildImageCmd.withPull(false);
+            }
         });
 
         this.buildArgs.forEach(buildImageCmd::withBuildArg);
     }
 
+    private void prePullDependencyImages(Set<String> imagesToPull) {
+        final DockerClient dockerClient = DockerClientFactory.instance().client();
+
+        imagesToPull.forEach(imageName -> {
+            try {
+                log.info("Pre-emptively checking local images for '{}', referenced via a Dockerfile. If not available, it will be pulled.", imageName);
+                DockerClientFactory.instance().checkAndPullImage(dockerClient, imageName);
+            } catch (Exception e) {
+                log.warn("Unable to pre-fetch an image ({}) depended upon by Dockerfile - image build will continue but may fail. Exception message was: {}", imageName, e.getMessage());
+            }
+        });
+    }
+
     public ImageFromDockerfile withBuildArg(final String key, final String value) {
         this.buildArgs.put(key, value);
         return this;
@@ -171,19 +182,23 @@ public ImageFromDockerfile withBuildArgs(final Map<String, String> args) {
 
     /**
      * Sets the Dockerfile to be used for this image.
-     * @deprecated It is recommended to use {@link #withDockerfile} instead because it honors
-     * .dockerignore files and therefore will be more efficient
-     * @param relativePathFromBuildRoot
+     *
+     * @param relativePathFromBuildContextDirectory relative path to the Dockerfile, relative to the image build context directory
+     * @deprecated It is recommended to use {@link #withDockerfile} instead because it honors .dockerignore files and
+     * will therefore be more efficient. Additionally, using {@link #withDockerfile} supports Dockerfiles that depend
+     * upon images from authenticated private registries.
      */
     @Deprecated
-    public ImageFromDockerfile withDockerfilePath(String relativePathFromBuildRoot) {
-        this.dockerFilePath = Optional.of(relativePathFromBuildRoot);
+    public ImageFromDockerfile withDockerfilePath(String relativePathFromBuildContextDirectory) {
+        this.dockerFilePath = Optional.of(relativePathFromBuildContextDirectory);
         return this;
     }
 
     /**
-     * Sets the Dockerfile to be used for this image.
-     * @param dockerfile
+     * Sets the Dockerfile to be used for this image. Honors .dockerignore files for efficiency.
+     * Additionally, supports Dockerfiles that depend upon images from authenticated private registries.
+     *
+     * @param dockerfile path to Dockerfile on the test host.
      */
     public ImageFromDockerfile withDockerfile(Path dockerfile) {
         this.dockerfile = Optional.of(dockerfile);
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 78b54798cd1..56945643a88 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -1,19 +1,27 @@
 package org.testcontainers.utility;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.core.command.PushImageResultCallback;
+import org.intellij.lang.annotations.Language;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -25,14 +33,17 @@
  * This test checks the integration between Testcontainers and an authenticated registry, but uses
  * a mock instance of {@link RegistryAuthLocator} - the purpose of the test is solely to ensure that
  * the auth locator is utilised, and that the credentials it provides flow through to the registry.
- *
+ * <p>
  * {@link RegistryAuthLocatorTest} covers actual credential scenarios at a lower level, which are
  * impractical to test end-to-end.
  */
 public class AuthenticatedImagePullTest {
 
+    /**
+     * Containerised docker image registry, with simple hardcoded credentials
+     */
     @ClassRule
-    public static GenericContainer authenticatedRegistry = new GenericContainer(new ImageFromDockerfile()
+    public static GenericContainer<?> authenticatedRegistry = new GenericContainer<>(new ImageFromDockerfile()
         .withDockerfileFromBuilder(builder -> {
             builder.from("registry:2")
                 .run("htpasswd -Bbn testuser notasecret > /htpasswd")
@@ -46,28 +57,17 @@ public class AuthenticatedImagePullTest {
     private static RegistryAuthLocator originalAuthLocatorSingleton;
     private static DockerClient client;
 
-    private static String testRegistryAddress;
     private static String testImageName;
     private static String testImageNameWithTag;
 
     @BeforeClass
-    public static void setUp() {
+    public static void setUp() throws InterruptedException {
         originalAuthLocatorSingleton = RegistryAuthLocator.instance();
         client = DockerClientFactory.instance().client();
 
-        testRegistryAddress = authenticatedRegistry.getContainerIpAddress() + ":" + authenticatedRegistry.getFirstMappedPort();
+        String testRegistryAddress = authenticatedRegistry.getContainerIpAddress() + ":" + authenticatedRegistry.getFirstMappedPort();
         testImageName = testRegistryAddress + "/alpine";
         testImageNameWithTag = testImageName + ":latest";
-    }
-
-    @AfterClass
-    public static void tearDown() {
-        RegistryAuthLocator.setInstance(originalAuthLocatorSingleton);
-        client.removeImageCmd(testImageNameWithTag).withForce(true).exec();
-    }
-
-    @Test
-    public void testThatAuthLocatorIsUsed() throws Exception {
 
         final DockerImageName expectedName = new DockerImageName(testImageNameWithTag);
         final AuthConfig authConfig = new AuthConfig()
@@ -83,9 +83,23 @@ public void testThatAuthLocatorIsUsed() throws Exception {
 
         // a push will use the auth locator for authentication, although that isn't the goal of this test
         putImageInRegistry();
+    }
+
+    @Before
+    public void removeImageFromLocalDocker() {
+        // remove the image tag from local docker so that it must be pulled before use
+        client.removeImageCmd(testImageNameWithTag).withForce(true).exec();
+    }
 
+    @AfterClass
+    public static void tearDown() {
+        RegistryAuthLocator.setInstance(originalAuthLocatorSingleton);
+    }
+
+    @Test
+    public void testThatAuthLocatorIsUsedForContainerCreation() {
         // actually start a container, which will require an authenticated pull
-        try (final GenericContainer container = new GenericContainer<>(testImageNameWithTag)
+        try (final GenericContainer<?> container = new GenericContainer<>(testImageNameWithTag)
             .withCommand("/bin/sh", "-c", "sleep 10")) {
             container.start();
 
@@ -93,7 +107,53 @@ public void testThatAuthLocatorIsUsed() throws Exception {
         }
     }
 
-    private void putImageInRegistry() throws InterruptedException {
+    @Test
+    public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
+        // Prepare a simple temporary Dockerfile which requires our custom private image
+        Path tempContext = Files.createTempDirectory(Paths.get("."), this.getClass().getSimpleName() + "-test-");
+        Path tempFile = Files.createTempFile(tempContext, "test", ".Dockerfile");
+        String dockerFileContent = "FROM " + testImageNameWithTag;
+        Files.write(tempFile, dockerFileContent.getBytes());
+
+        // Start a container built from a derived image, which will require an authenticated pull
+        try (final GenericContainer<?> container = new GenericContainer<>(
+            new ImageFromDockerfile()
+                .withDockerfile(tempFile)
+        )
+            .withCommand("/bin/sh", "-c", "sleep 10")) {
+            container.start();
+
+            assertTrue("container started following an authenticated pull", container.isRunning());
+        }
+    }
+
+    @Test
+    public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
+        // Prepare a simple temporary Docker Compose manifest which requires our custom private image
+        Path tempContext = Files.createTempDirectory(Paths.get("."), this.getClass().getSimpleName() + "-test-");
+        Path tempFile = Files.createTempFile(tempContext, "test", ".docker-compose.yml");
+        @Language("yaml") String composeFileContent =
+            "version: '2.0'\n" +
+                "services:\n" +
+                "  privateservice:\n" +
+                "      command: /bin/sh -c 'sleep 60'\n" +
+                "      image: " + testImageNameWithTag;
+        Files.write(tempFile, composeFileContent.getBytes());
+
+        // Start the docker compose project, which will require an authenticated pull
+        try (final DockerComposeContainer<?> compose = new DockerComposeContainer<>(tempFile.toFile())) {
+            compose.start();
+
+            assertTrue("container started following an authenticated pull",
+                compose
+                    .getContainerByServiceName("privateservice_1")
+                    .map(ContainerState::isRunning)
+                    .orElse(false)
+            );
+        }
+    }
+
+    private static void putImageInRegistry() throws InterruptedException {
         // It doesn't matter which image we use for this test, but use one that's likely to have been pulled already
         final String dummySourceImage = TestcontainersConfiguration.getInstance().getRyukImage();
 
@@ -109,10 +169,7 @@ private void putImageInRegistry() throws InterruptedException {
         client.tagImageCmd(id, testImageName, "latest").exec();
 
         client.pushImageCmd(testImageNameWithTag)
-            .exec(new PushImageResultCallback())
+            .exec(new ResultCallback.Adapter<>())
             .awaitCompletion(1, TimeUnit.MINUTES);
-
-        // remove the image tag from local docker so that it must be pulled before use
-        client.removeImageCmd(testImageNameWithTag).withForce(true).exec();
     }
 }

From d604f3ec45c9c61574b1728b801b70dba35eaa18 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 20 Apr 2020 10:18:14 +0200
Subject: [PATCH 0628/4969] Fix regression introduced in #2473 (missing `this`
 constructor call) (#2596)

---
 .../java/org/testcontainers/containers/MariaDBContainer.java    | 2 +-
 .../main/java/org/testcontainers/containers/MySQLContainer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index fc876713dda..fb21dd9a1a9 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -23,7 +23,7 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
 
     public MariaDBContainer() {
-        super(IMAGE + ":" + DEFAULT_TAG);
+        this(IMAGE + ":" + DEFAULT_TAG);
     }
 
     public MariaDBContainer(String dockerImageName) {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 54f3ab08524..b8bbe225617 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -26,7 +26,7 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
     private static final String MYSQL_ROOT_USER = "root";
 
     public MySQLContainer() {
-        super(IMAGE + ":" + DEFAULT_TAG);
+        this(IMAGE + ":" + DEFAULT_TAG);
     }
 
     public MySQLContainer(String dockerImageName) {

From 9c4756f73dde77b3df1e4b77aeccaa3de818e935 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 21 Apr 2020 10:52:14 +0200
Subject: [PATCH 0629/4969] Push Gradle Cache from GHA (#2597)

* Push Gradle Cache from GHA

* Update ci.yml
---
 .github/workflows/ci.yml |  4 ++++
 settings.gradle          | 14 +++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3dbcc4c41fd..d488542d8a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,10 @@ jobs:
             ${{ runner.os }}-gradle-home-testmatrix-
             ${{ runner.os }}-gradle-home-
       - id: set-matrix
+        env:
+          # Since we override the tests executor,
+          # we should not push empty results to the cache
+          READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
           echo $TASKS
diff --git a/settings.gradle b/settings.gradle
index 5ec35718ef6..4321c4ac4a4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,21 +5,17 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.9.0"
+        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.2.1"
     }
-
-    configurations.classpath {
-        resolutionStrategy {
-            force 'com.amazonaws:aws-java-sdk-s3:1.11.582'
-        }
-    }
 }
 
 apply plugin: 'ch.myniva.s3-build-cache'
 apply plugin: 'com.gradle.enterprise'
 
-ext.isMasterBuild = (System.getenv("CIRCLE_BRANCH") ?: System.getenv("BUILD_SOURCEBRANCHNAME")) == "master"
+ext.isMasterBuild = false ||
+    (System.getenv("GITHUB_REF") == "refs/heads/master") ||
+    (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
 
 buildCache {
     local {
@@ -31,7 +27,7 @@ buildCache {
         region = 'fra1'
         bucket = 'testcontainers'
         path = 'cache'
-        push = isMasterBuild
+        push = !(System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") || !isMasterBuild)
         headers = [
             'x-amz-acl': 'public-read'
         ]

From 3f3f4b25381713ccd76459ab329d3c28b740dd5e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 22 Apr 2020 17:17:54 +0200
Subject: [PATCH 0630/4969] Set custom ciMate key (#2601)

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d488542d8a2..df6fc96ea44 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,6 +60,7 @@ jobs:
         if: always()
         env:
           CIMATE_PROJECT_ID: 2348n4vl
+          CIMATE_CI_KEY: "CI / ${{ runner.os }} / ${{matrix.gradle_args}}"
         run: |
           wget -q https://get.cimate.io/release/linux/cimate
           chmod +x cimate
@@ -86,6 +87,7 @@ jobs:
         if: always()
         env:
           CIMATE_PROJECT_ID: 2348n4vl
+          CIMATE_CI_KEY: examples
         run: |
           wget -q https://get.cimate.io/release/linux/cimate
           chmod +x cimate

From 4d17308fda95947eaac1449551e47b619df0396b Mon Sep 17 00:00:00 2001
From: Fernando Mouco <fernandomouco@gmail.com>
Date: Thu, 23 Apr 2020 13:02:27 +0100
Subject: [PATCH 0631/4969] CircleCI docs: fix invalid executor key (#2607)

executorType is no longer a valid executor definition. The simplest form to designate using machine executor is `machine: true`
---
 .../continuous_integration/circle_ci.md                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/circle_ci.md b/docs/supported_docker_environment/continuous_integration/circle_ci.md
index 1ec2a32b4cd..64e7ea131f2 100644
--- a/docs/supported_docker_environment/continuous_integration/circle_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/circle_ci.md
@@ -9,7 +9,7 @@ Here is a sample CircleCI configuration that does a checkout of a project and ru
 # Check https://circleci.com/docs/2.0/language-java/ for more details
 #
 version: 2
-executorType: machine
+machine: true
 jobs:
   build:
     steps:

From 2c20417ac07b11e3255d7ce13dd5d83f3908df10 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Apr 2020 13:03:06 +0100
Subject: [PATCH 0632/4969] Bump mongo-java-driver from 3.12.1 to 3.12.3 in
 /core (#2594)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.1 to 3.12.3.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.1...r3.12.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 09a6c590242..d99ca8c3676 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -157,7 +157,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'com.rabbitmq:amqp-client:5.8.0'
-    testCompile 'org.mongodb:mongo-java-driver:3.12.1'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.3'
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }

From 12de2b407238835bdc06169a6ac4b7bdcc98e028 Mon Sep 17 00:00:00 2001
From: Vladimir Orany <vladimir@orany.cz>
Date: Thu, 23 Apr 2020 14:43:45 +0200
Subject: [PATCH 0633/4969] Allow using LocalStackContainer with AWS SDK v2
 #1442 (#2579)

Closes #1442
---
 docs/modules/localstack.md                    |  14 +++
 modules/localstack/build.gradle               |   1 +
 .../localstack/LocalStackContainer.java       | 118 ++++++++++++++++--
 .../localstack/LocalstackContainerTest.java   |  41 ++++--
 4 files changed, 152 insertions(+), 22 deletions(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index bf520b1fac6..4ff46233b05 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -13,6 +13,7 @@ public LocalStackContainer localstack = new LocalStackContainer()
 
 @Test
 public void someTestMethod() {
+    // AWS SDK v1
     AmazonS3 s3 = AmazonS3ClientBuilder
                     .standard()
                     .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
@@ -21,6 +22,19 @@ public void someTestMethod() {
     
             s3.createBucket("foo");
             s3.putObject("foo", "bar", "baz");
+
+    // AWS SDK v2
+    S3Client s3 = S3Client
+                .builder()
+                .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+                    localstack.getAccessKey(), localstack.getSecretKey()
+                )))
+                .region(Region.of(localstack.getRegion()))
+                .build();
+
+            s3.createBucket(b -> b.bucket("foo"));
+            s3.putObject(b -> b.bucket("foo").key("bar"), RequestBody.fromBytes("baz".getBytes()));
 ```
 
 Environment variables listed in [Localstack's README](https://github.com/localstack/localstack#configurations) may be used to customize Localstack's configuration. 
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index c8bf561b6d1..cd6f3d9f86c 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,4 +7,5 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.762'
+    testCompile 'software.amazon.awssdk:s3:2.11.10'
 }
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 0d8c3627f6c..c649d322ead 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -13,6 +13,8 @@
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -90,7 +92,16 @@ public LocalStackContainer withServices(Service... services) {
             .withCredentials(localstack.getDefaultCredentialsProvider())
             .build();
      </code></pre>
-     *
+     * or for AWS SDK v2
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+                localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
      * <p><strong>Please note that this method is only intended to be used for configuring AWS SDK clients
      * that are running on the test host. If other containers need to call this one, they should be configured
      * specifically to do so using a Docker network and appropriate addressing.</strong></p>
@@ -99,20 +110,41 @@ public LocalStackContainer withServices(Service... services) {
      * @return an {@link AwsClientBuilder.EndpointConfiguration}
      */
     public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service service) {
-        final String address = getContainerIpAddress();
-        String ipAddress = address;
+        return new AwsClientBuilder.EndpointConfiguration(getEndpointOverride(service).toString(), getRegion());
+    }
+
+    /**
+     * Provides an endpoint override that is preconfigured to communicate with a given simulated service.
+     * The provided endpoint override should be set in the AWS Java SDK v2 when building a client, e.g.:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+             </code></pre>
+     * <p><strong>Please note that this method is only intended to be used for configuring AWS SDK clients
+     * that are running on the test host. If other containers need to call this one, they should be configured
+     * specifically to do so using a Docker network and appropriate addressing.</strong></p>
+     *
+     * @param service the service that is to be accessed
+     * @return an {@link URI} endpoint override
+     */
+    public URI getEndpointOverride(Service service) {
         try {
+            final String address = getContainerIpAddress();
+            String ipAddress = address;
             // resolve IP address and use that as the endpoint so that path-style access is automatically used for S3
             ipAddress = InetAddress.getByName(address).getHostAddress();
-        } catch (UnknownHostException ignored) {
-
-        }
-
-        return new AwsClientBuilder.EndpointConfiguration(
-                "http://" +
+            return new URI("http://" +
                 ipAddress +
                 ":" +
-                getMappedPort(service.getPort()), "us-east-1");
+                getMappedPort(service.getPort()));
+        } catch (UnknownHostException | URISyntaxException e) {
+            throw new IllegalStateException("Cannot obtain endpoint URL", e);
+        }
     }
 
     /**
@@ -124,10 +156,74 @@ public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service s
             .withCredentials(localstack.getDefaultCredentialsProvider())
             .build();
      </code></pre>
+     * or for AWS SDK v2 you can use {@link #getAccessKey()}, {@link #getSecretKey()} directly:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
      * @return an {@link AWSCredentialsProvider}
      */
     public AWSCredentialsProvider getDefaultCredentialsProvider() {
-        return new AWSStaticCredentialsProvider(new BasicAWSCredentials("accesskey", "secretkey"));
+        return new AWSStaticCredentialsProvider(new BasicAWSCredentials(getAccessKey(), getSecretKey()));
+    }
+
+    /**
+     * Provides a default access key that is preconfigured to communicate with a given simulated service.
+     * The access key can be used to construct AWS SDK v2 clients:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
+     * @return a default access key
+     */
+    public String getAccessKey() {
+        return "accesskey";
+    }
+
+    /**
+     * Provides a default secret key that is preconfigured to communicate with a given simulated service.
+     * The secret key can be used to construct AWS SDK v2 clients:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
+     * @return a default secret key
+     */
+    public String getSecretKey() {
+        return "secretkey";
+    }
+
+    /**
+     * Provides a default region that is preconfigured to communicate with a given simulated service.
+     * The region can be used to construct AWS SDK v2 clients:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
+     * @return a default region
+     */
+    public String getRegion() {
+        return "us-east-1";
     }
 
     @RequiredArgsConstructor
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 034ff2f0914..ee5945d0aff 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -4,8 +4,6 @@
 import com.amazonaws.services.logs.AWSLogs;
 import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.model.CreateLogGroupRequest;
-import com.amazonaws.services.logs.model.CreateLogGroupResult;
-import com.amazonaws.services.logs.model.DescribeLogGroupsRequest;
 import com.amazonaws.services.logs.model.LogGroup;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
@@ -19,7 +17,6 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
@@ -27,10 +24,15 @@
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
+import java.util.Optional;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
@@ -67,24 +69,41 @@ public void s3TestOverBridgeNetwork() throws IOException {
                 .withCredentials(localstack.getDefaultCredentialsProvider())
                 .build();
 
-            s3.createBucket("foo");
-            s3.putObject("foo", "bar", "baz");
+            final String bucketName = "foo";
+            s3.createBucket(bucketName);
+            s3.putObject(bucketName, "bar", "baz");
 
             final List<Bucket> buckets = s3.listBuckets();
-            assertEquals("The created bucket is present", 1, buckets.size());
-            final Bucket bucket = buckets.get(0);
+            final Optional<Bucket> maybeBucket = buckets.stream().filter(b -> b.getName().equals(bucketName)).findFirst();
+            assertTrue("The created bucket is present", maybeBucket.isPresent());
+            final Bucket bucket = maybeBucket.get();
 
-            assertEquals("The created bucket has the right name", "foo", bucket.getName());
-            assertEquals("The created bucket has the right name", "foo", bucket.getName());
+            assertEquals("The created bucket has the right name", bucketName, bucket.getName());
 
-            final ObjectListing objectListing = s3.listObjects("foo");
+            final ObjectListing objectListing = s3.listObjects(bucketName);
             assertEquals("The created bucket has 1 item in it", 1, objectListing.getObjectSummaries().size());
 
-            final S3Object object = s3.getObject("foo", "bar");
+            final S3Object object = s3.getObject(bucketName, "bar");
             final String content = IOUtils.toString(object.getObjectContent(), Charset.forName("UTF-8"));
             assertEquals("The object can be retrieved", "baz", content);
         }
 
+        @Test
+        public void s3TestUsingAwsSdkV2() {
+            S3Client s3 = S3Client
+                .builder()
+                .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+                    localstack.getAccessKey(), localstack.getSecretKey()
+                )))
+                .region(Region.of(localstack.getRegion()))
+                .build();
+
+            final String bucketName = "foov2";
+            s3.createBucket(b -> b.bucket(bucketName));
+            assertTrue("New bucket was created", s3.listBuckets().buckets().stream().anyMatch(b -> b.name().equals(bucketName)));
+        }
+
         @Test
         public void sqsTestOverBridgeNetwork() {
             AmazonSQS sqs = AmazonSQSClientBuilder.standard()

From 1e803b8f96272f463715f8560736cc4596b23a52 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 23 Apr 2020 13:45:07 +0100
Subject: [PATCH 0634/4969] Use relative path for temp dirs in test (#2604)

---
 .../utility/AuthenticatedImagePullTest.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 56945643a88..5f4417f218b 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -110,8 +110,7 @@ public void testThatAuthLocatorIsUsedForContainerCreation() {
     @Test
     public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
         // Prepare a simple temporary Dockerfile which requires our custom private image
-        Path tempContext = Files.createTempDirectory(Paths.get("."), this.getClass().getSimpleName() + "-test-");
-        Path tempFile = Files.createTempFile(tempContext, "test", ".Dockerfile");
+        Path tempFile = getLocalTempFile(".Dockerfile");
         String dockerFileContent = "FROM " + testImageNameWithTag;
         Files.write(tempFile, dockerFileContent.getBytes());
 
@@ -130,8 +129,7 @@ public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
     @Test
     public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
         // Prepare a simple temporary Docker Compose manifest which requires our custom private image
-        Path tempContext = Files.createTempDirectory(Paths.get("."), this.getClass().getSimpleName() + "-test-");
-        Path tempFile = Files.createTempFile(tempContext, "test", ".docker-compose.yml");
+        Path tempFile = getLocalTempFile(".docker-compose.yml");
         @Language("yaml") String composeFileContent =
             "version: '2.0'\n" +
                 "services:\n" +
@@ -153,6 +151,18 @@ public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
         }
     }
 
+    private Path getLocalTempFile(String s) throws IOException {
+        Path projectRoot = Paths.get(".");
+        Path tempDirectory = Files.createTempDirectory(projectRoot, this.getClass().getSimpleName() + "-test-");
+        Path relativeTempDirectory = projectRoot.relativize(tempDirectory);
+        Path tempFile = Files.createTempFile(relativeTempDirectory, "test", s);
+
+        tempDirectory.toFile().deleteOnExit();
+        tempFile.toFile().deleteOnExit();
+
+        return tempFile;
+    }
+
     private static void putImageInRegistry() throws InterruptedException {
         // It doesn't matter which image we use for this test, but use one that's likely to have been pulled already
         final String dummySourceImage = TestcontainersConfiguration.getInstance().getRyukImage();

From 5fbf102a6532cb9e14c87cb15d4577c30fac026f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 23 Apr 2020 16:19:52 +0100
Subject: [PATCH 0635/4969] Update version

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index e3cae4c5da8..708fbe06883 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -88,4 +88,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.14.0
+    latest_version: 1.14.1

From 2281f8ff697b8e74f558412f814b5247d13d6759 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 24 Apr 2020 05:23:36 +0000
Subject: [PATCH 0636/4969] Bump influxdb-java from 2.17 to 2.18 in
 /modules/influxdb (#2592)

---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index d349e06da12..02af2e924a9 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.17'
+    compileOnly 'org.influxdb:influxdb-java:2.18'
     testCompile 'org.influxdb:influxdb-java:2.17'
 }

From fdad5ce673bfd11a35f627bbd08fbc9af08e090c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 25 Apr 2020 01:31:52 +0000
Subject: [PATCH 0637/4969] Bump s3 from 2.11.10 to 2.13.2 in
 /modules/localstack (#2610)

---
 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 cd6f3d9f86c..4e882514e81 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.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.762'
-    testCompile 'software.amazon.awssdk:s3:2.11.10'
+    testCompile 'software.amazon.awssdk:s3:2.13.2'
 }

From d5a79f6f777ebc134559046b5f16dbf500ab6884 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2020 14:58:35 +0100
Subject: [PATCH 0638/4969] Bump ipcsocket from 1.0.0 to 1.0.1 in /core (#2525)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d99ca8c3676..78e7b553606 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -133,7 +133,7 @@ dependencies {
 
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
-    shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.0') {
+    shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.1') {
         exclude(group: "net.java.dev.jna")
     }
 

From 4740cbe4b32667cec9b8d3028bb10319c718b062 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2020 15:07:39 +0100
Subject: [PATCH 0639/4969] Bump pulsar-client from 2.5.0 to 2.5.1 in
 /modules/pulsar (#2609)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 88d783fc221..4f459d9a97e 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.1'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.15.0'
 }

From be41d15f5b9bcd133be58bd8ddd6a9a2b99e8a66 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2020 15:08:17 +0100
Subject: [PATCH 0640/4969] Bump aws-java-sdk-logs from 1.11.762 to 1.11.768 in
 /modules/localstack (#2611)

---
 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 4e882514e81..cd7678ccbf5 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.762'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.768'
     testCompile 'software.amazon.awssdk:s3:2.13.2'
 }

From 8e096cc0d27cdab6f1b07c6a2488a26fea559a35 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 26 Apr 2020 15:08:32 +0100
Subject: [PATCH 0641/4969] Replace legacy orchardup/mysql with mysql:5.7.22 in
 docker compose test (#2602)

---
 core/src/test/resources/compose-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/resources/compose-test.yml b/core/src/test/resources/compose-test.yml
index 7436db7d211..a79a4c0b25b 100644
--- a/core/src/test/resources/compose-test.yml
+++ b/core/src/test/resources/compose-test.yml
@@ -1,6 +1,6 @@
 redis:
   image: redis
 db:
-  image: orchardup/mysql
+  image: mysql:5.7.22
   environment:
-    MYSQL_DATABASE: wordpress
+    MYSQL_RANDOM_ROOT_PASSWORD: "true"

From dbe4b0f3d56bebbb09089633b65772a4aa54842b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2020 15:10:20 +0100
Subject: [PATCH 0642/4969] Bump amqp-client from 5.8.0 to 5.9.0 in /core
 (#2593)

---
 core/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 78e7b553606..9df3a024192 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -156,8 +156,9 @@ dependencies {
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.2.0'
-    testCompile 'com.rabbitmq:amqp-client:5.8.0'
+    testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.3'
+
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }

From b54f162a6578fa01c44c04381787b7b9103e64c1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 05:23:31 +0000
Subject: [PATCH 0643/4969] Bump kafka-clients from 2.4.1 to 2.5.0 in
 /modules/kafka (#2576)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index cd6745e1eae..355c44eab1a 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.4.1'
+    testCompile 'org.apache.kafka:kafka-clients:2.5.0'
     testCompile 'org.assertj:assertj-core:3.15.0'
     testCompile 'com.google.guava:guava:23.0'
 }

From bc3a26680886410bc0c59186092406439ab9c4c3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 15:56:43 +0200
Subject: [PATCH 0644/4969] Bump mysql-connector-java from 8.0.19 to 8.0.20 in
 /modules/spock (#2624)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.19 to 8.0.20.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 d091ce068dc..40f765f255c 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.12'
-    testRuntime 'mysql:mysql-connector-java:8.0.19'
+    testRuntime 'mysql:mysql-connector-java:8.0.20'
 }
 
 sourceJar {

From aefb82281dca4802d9aaedb48535a313938ec373 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 16:02:15 +0200
Subject: [PATCH 0645/4969] Bump HikariCP from 3.4.2 to 3.4.3 in /modules/spock
 (#2625)

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.2...HikariCP-3.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 40f765f255c..7b1780391b5 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
 
-    testCompile 'com.zaxxer:HikariCP:3.4.2'
+    testCompile 'com.zaxxer:HikariCP:3.4.3'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'

From 746ee1bc4a8a92bb1e66d9d819c69ef567ca97f0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 16:03:50 +0200
Subject: [PATCH 0646/4969] Bump HikariCP from 3.4.2 to 3.4.3 in
 /modules/junit-jupiter (#2622)

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.2...HikariCP-3.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 86d9b30930e..efc65cf57db 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.2'
+    testCompile 'com.zaxxer:HikariCP:3.4.3'
     testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
     testCompile ('org.mockito:mockito-core:3.3.3') {

From 89d77fb58bd90ab1879a24a268e0feac31b86c3d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Apr 2020 09:39:48 +0200
Subject: [PATCH 0647/4969] Bump s3 from 2.13.2 to 2.13.4 in
 /modules/localstack (#2630)

Bumps s3 from 2.13.2 to 2.13.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 cd7678ccbf5..343895fee53 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.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.768'
-    testCompile 'software.amazon.awssdk:s3:2.13.2'
+    testCompile 'software.amazon.awssdk:s3:2.13.4'
 }

From 8c3a9c932f46c292ee5995a03fb6f9c9fee82c2d Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Thu, 30 Apr 2020 09:53:33 +0200
Subject: [PATCH 0648/4969] Fix typo in jupiter docs (#2636)

---
 docs/test_framework_integration/junit_5.md                      | 2 +-
 .../java/org/testcontainers/junit/jupiter/Testcontainers.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/test_framework_integration/junit_5.md b/docs/test_framework_integration/junit_5.md
index 371240a8d54..11798484b0f 100644
--- a/docs/test_framework_integration/junit_5.md
+++ b/docs/test_framework_integration/junit_5.md
@@ -19,7 +19,7 @@ methods (methods on the `Startable` interface). Containers declared as static fi
 methods. They will be started only once before any test method is executed and stopped after the last test method has 
 executed. Containers declared as instance fields will be started and stopped for every test method.
   
-**Note:** This extension has only be tested with sequential test execution. Using it with parallel test execution is 
+**Note:** This extension has only been tested with sequential test execution. Using it with parallel test execution is 
 unsupported and may have unintended side effects.
   
 *Example:*
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
index 8e05dfdc576..db8273563a7 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
@@ -23,7 +23,7 @@
  * the test hierarchy as well. All subclasses will automatically inherit
  * support for the extension.</p>
  *
- * <p><strong>Note:</strong> This extension has only be tested with sequential
+ * <p><strong>Note:</strong> This extension has only been tested with sequential
  * test execution. Using it with parallel test execution is unsupported and
  * may have unintended side effects.</p>
  *

From 2dac7ba4bba73b7c44d71856b20c9b1476f344ce Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 18:52:44 +0100
Subject: [PATCH 0649/4969] Bump aws-java-sdk-logs from 1.11.768 to 1.11.773 in
 /modules/localstack (#2641)

---
 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 343895fee53..82cf5c1f841 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.768'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.773'
     testCompile 'software.amazon.awssdk:s3:2.13.4'
 }

From afa89ecf0888504673fa7c29dec80b3fd6096f23 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 18:52:56 +0100
Subject: [PATCH 0650/4969] Bump mysql-connector-java from 8.0.19 to 8.0.20 in
 /modules/junit-jupiter (#2620)

---
 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 efc65cf57db..5046008c7fa 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.12'
-    testRuntime 'mysql:mysql-connector-java:8.0.19'
+    testRuntime 'mysql:mysql-connector-java:8.0.20'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }
 

From f0e6e55b7550665402d0b7afeb656e80910be1a9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 18:58:29 +0100
Subject: [PATCH 0651/4969] Bump okhttp from 3.14.7 to 3.14.8 in /examples
 (#2645)

---
 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 e7bed23509d..96dd03c602b 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:3.14.7'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.8'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.12'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From 4b385cde15aaeb0a4c74065cd424ddebf1791c55 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 18:58:47 +0100
Subject: [PATCH 0652/4969] Bump testcontainers from 1.14.0 to 1.14.1 in /core
 (#2623)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9df3a024192..bbf57a34a70 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.14.0', {
+    baseline 'org.testcontainers:testcontainers:1.14.1', {
         exclude group: "*", module: "*"
     }
 

From 6fb689f8938518a144640e4c690ef56cbe767870 Mon Sep 17 00:00:00 2001
From: Konstantin Lutovich <lutovich@gmail.com>
Date: Fri, 1 May 2020 20:22:30 +0200
Subject: [PATCH 0653/4969] Add a getter for Toxiproxy exposed port (#2513)

---
 docs/modules/toxiproxy.md                     | 15 +++--
 .../containers/ToxiproxyContainer.java        | 16 +++++-
 .../containers/ToxiproxyTest.java             | 55 +++++++++++++------
 3 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
index 9e09d8b387b..8ffb910d6c1 100644
--- a/docs/modules/toxiproxy.md
+++ b/docs/modules/toxiproxy.md
@@ -29,13 +29,21 @@ We do this as follows:
 [Starting proxying connections to a target container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxyObject
 <!--/codeinclude-->
 
-Then, to establish a connection via Toxiproxy, we obtain **Toxiproxy's** proxy host IP and port:
+To establish a connection from the test code (on the host machine) to the target container via Toxiproxy, we obtain **Toxiproxy's** proxy host IP and port:
 
 <!--codeinclude-->
-[Obtaining proxied host and port](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPort
+[Obtaining proxied host and port for connections from the host machine](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForHostMachine
 <!--/codeinclude-->
 
-Code under test, or other containers, should connect to this proxied host IP and port.
+Code under test should connect to this proxied host IP and port.
+
+To establish a connection from a different container on the same network to the target container via Toxiproxy, we use **Toxiproxy's** network alias and original port:
+
+<!--codeinclude-->
+[Obtaining proxied host and port for connections from a different container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForDifferentContainer
+<!--/codeinclude-->
+
+Other containers should connect to this proxied host and port.
 
 Having done this, it is possible to trigger failure conditions ('Toxics') through the `proxy.toxics()` object:
 
@@ -82,4 +90,3 @@ testCompile "org.testcontainers:toxiproxy:{{latest_version}}"
 This module was inspired by a [hotels.com blog post](https://medium.com/hotels-com-technology/i-dont-know-about-resilience-testing-and-so-can-you-b3c59d80012d).
 
 [toxiproxy-java](https://github.com/trekawek/toxiproxy-java) is used to help control failure conditions.
-
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index df4bf6e688d..1b631fa9d6d 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -87,7 +87,8 @@ public ContainerProxy getProxy(String hostname, int port) {
                 }
 
                 final Proxy proxy = client.createProxy(upstream, "0.0.0.0:" + toxiPort, upstream);
-                return new ContainerProxy(proxy, getContainerIpAddress(), getMappedPort(toxiPort));
+                final int mappedPort = getMappedPort(toxiPort);
+                return new ContainerProxy(proxy, getContainerIpAddress(), mappedPort, toxiPort);
             } catch (IOException e) {
                 throw new RuntimeException("Proxy could not be created", e);
             }
@@ -99,8 +100,21 @@ public static class ContainerProxy {
         private static final String CUT_CONNECTION_DOWNSTREAM = "CUT_CONNECTION_DOWNSTREAM";
         private static final String CUT_CONNECTION_UPSTREAM = "CUT_CONNECTION_UPSTREAM";
         private final Proxy toxi;
+        /**
+         * The IP address that this proxy container may be reached on from the host machine.
+         */
         @Getter private final String containerIpAddress;
+        /**
+         * The mapped port of this proxy. This is a port of the host machine. It can be used to
+         * access the Toxiproxy container from the host machine.
+         */
         @Getter private final int proxyPort;
+        /**
+         * The original (exposed) port of this proxy. This is a port of the Toxiproxy Docker
+         * container. It can be used to access this container from a different Docker container
+         * on the same network.
+         */
+        @Getter private final int originalProxyPort;
         private boolean isCurrentlyCut;
 
         public ToxicList toxics() {
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index c96e2efd19e..366f425b5b5 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -1,10 +1,9 @@
 package org.testcontainers.containers;
 
 import eu.rekawek.toxiproxy.model.ToxicDirection;
+import java.time.Duration;
 import org.junit.Rule;
 import org.junit.Test;
-import org.testcontainers.testsupport.Flaky;
-import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
@@ -15,12 +14,18 @@
 
 public class ToxiproxyTest {
 
+    private static final Duration JEDIS_TIMEOUT = Duration.ofSeconds(10);
+
     // creatingProxy {
+    // An alias that can be used to resolve the Toxiproxy container by name in the network it is connected to.
+    // It can be used as a hostname of the Toxiproxy container by other containers in the same network.
+    private static final String TOXIPROXY_NETWORK_ALIAS = "toxiproxy";
+
     // Create a common docker network so that containers can communicate
     @Rule
     public Network network = Network.newNetwork();
 
-    // the target container - this could be anything
+    // The target container - this could be anything
     @Rule
     public GenericContainer redis = new GenericContainer("redis:5.0.4")
         .withExposedPorts(6379)
@@ -29,15 +34,13 @@ public class ToxiproxyTest {
     // Toxiproxy container, which will be used as a TCP proxy
     @Rule
     public ToxiproxyContainer toxiproxy = new ToxiproxyContainer()
-        .withNetwork(network);
+        .withNetwork(network)
+        .withNetworkAliases(TOXIPROXY_NETWORK_ALIAS);
     // }
 
-    @Rule
-    public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
-
     @Test
     public void testDirect() {
-        final Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getFirstMappedPort());
+        final Jedis jedis = createJedis(redis.getContainerIpAddress(), redis.getFirstMappedPort());
         jedis.set("somekey", "somevalue");
 
         final String s = jedis.get("somekey");
@@ -45,18 +48,17 @@ public void testDirect() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2020-03-01")
     public void testLatencyViaProxy() throws IOException {
         // obtainProxyObject {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
         // }
 
-        // obtainProxiedHostAndPort {
+        // obtainProxiedHostAndPortForHostMachine {
         final String ipAddressViaToxiproxy = proxy.getContainerIpAddress();
         final int portViaToxiproxy = proxy.getProxyPort();
         // }
 
-        final Jedis jedis = new Jedis(ipAddressViaToxiproxy, portViaToxiproxy);
+        final Jedis jedis = createJedis(ipAddressViaToxiproxy, portViaToxiproxy);
         jedis.set("somekey", "somevalue");
 
         checkCallWithLatency(jedis, "without interference", 0, 250);
@@ -72,10 +74,9 @@ public void testLatencyViaProxy() throws IOException {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2020-03-01")
     public void testConnectionCut() {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
-        final Jedis jedis = new Jedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
+        final Jedis jedis = createJedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
         jedis.set("somekey", "somevalue");
 
         assertEquals("access to the container works OK before cutting the connection", "somevalue", jedis.get("somekey"));
@@ -97,7 +98,6 @@ public void testConnectionCut() {
     }
 
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2020-03-01")
     public void testMultipleProxiesCanBeCreated() {
         try (GenericContainer secondRedis = new GenericContainer("redis:5.0.4")
             .withExposedPorts(6379)
@@ -108,8 +108,8 @@ public void testMultipleProxiesCanBeCreated() {
             final ToxiproxyContainer.ContainerProxy firstProxy = toxiproxy.getProxy(redis, 6379);
             final ToxiproxyContainer.ContainerProxy secondProxy = toxiproxy.getProxy(secondRedis, 6379);
 
-            final Jedis firstJedis = new Jedis(firstProxy.getContainerIpAddress(), firstProxy.getProxyPort());
-            final Jedis secondJedis = new Jedis(secondProxy.getContainerIpAddress(), secondProxy.getProxyPort());
+            final Jedis firstJedis = createJedis(firstProxy.getContainerIpAddress(), firstProxy.getProxyPort());
+            final Jedis secondJedis = createJedis(secondProxy.getContainerIpAddress(), secondProxy.getProxyPort());
 
             firstJedis.set("somekey", "somevalue");
             secondJedis.set("somekey", "somevalue");
@@ -125,6 +125,25 @@ public void testMultipleProxiesCanBeCreated() {
         }
     }
 
+    @Test
+    public void testOriginalAndMappedPorts() {
+        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy("hostname", 7070);
+        // obtainProxiedHostAndPortForDifferentContainer {
+        final String hostViaToxiproxy = TOXIPROXY_NETWORK_ALIAS;
+        final int portViaToxiproxy = proxy.getOriginalProxyPort();
+        // }
+        assertEquals("host is correct", TOXIPROXY_NETWORK_ALIAS, hostViaToxiproxy);
+        assertEquals("original port is correct", 8666, portViaToxiproxy);
+
+        final ToxiproxyContainer.ContainerProxy proxy1 = toxiproxy.getProxy("hostname1", 8080);
+        assertEquals("original port is correct", 8667, proxy1.getOriginalProxyPort());
+        assertEquals("mapped port is correct", toxiproxy.getMappedPort(proxy1.getOriginalProxyPort()), proxy1.getProxyPort());
+
+        final ToxiproxyContainer.ContainerProxy proxy2 = toxiproxy.getProxy("hostname2", 9090);
+        assertEquals("original port is correct", 8668, proxy2.getOriginalProxyPort());
+        assertEquals("mapped port is correct", toxiproxy.getMappedPort(proxy2.getOriginalProxyPort()), proxy2.getProxyPort());
+    }
+
     private void checkCallWithLatency(Jedis jedis, final String description, int expectedMinLatency, long expectedMaxLatency) {
         final long start = System.currentTimeMillis();
         String s = jedis.get("somekey");
@@ -135,4 +154,8 @@ private void checkCallWithLatency(Jedis jedis, final String description, int exp
         assertTrue(format("%s there is at least %dms latency", description, expectedMinLatency), duration >= expectedMinLatency);
         assertTrue(format("%s there is no more than %dms latency", description, expectedMaxLatency), duration < expectedMaxLatency);
     }
+
+    private static Jedis createJedis(String host, int port) {
+        return new Jedis(host, port, Math.toIntExact(JEDIS_TIMEOUT.toMillis()));
+    }
 }

From 88849acbec0d2d6511c8e112f053253eb384f4fd Mon Sep 17 00:00:00 2001
From: sumitanvekar <2293969+sumitanvekar@users.noreply.github.com>
Date: Sat, 2 May 2020 00:13:32 +0530
Subject: [PATCH 0654/4969] Example and docs for ability to copy to and from
 container for #1164 (#1989)

---
 .../junit/CopyFileToContainerTest.java        | 30 ++++++++++++++++---
 docs/features/files.md                        | 16 ++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index ed6ee561505..1e230ec605b 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -1,32 +1,54 @@
 package org.testcontainers.junit;
 
+import com.google.common.io.Files;
+import com.google.common.io.Resources;
 import org.junit.Test;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.utility.MountableFile;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class CopyFileToContainerTest {
-    private static String containerPath = "/tmp/mappable-resource/";
+    public static final String destinationOnHost = "/tmp/test-resource-in-host.txt";
+    private static String directoryInContainer = "/tmp/mappable-resource/";
     private static String fileName = "test-resource.txt";
 
     @Test
     public void checkFileCopied() throws IOException, InterruptedException {
         try (
+            // copyToContainer {
             GenericContainer container = new GenericContainer()
                 .withCommand("sleep", "3000")
-                .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
+                // withCopyFileToContainer ensure that a file or directory will be copied to the container
+                // before starting. In this case, we map a classpath directory to a directory inside the container
+                .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), directoryInContainer)
+            // }
         ) {
             container.start();
-            String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
+
+            // at this point directoryInContainer should exist, and should contain copies of file(s)
+            String filesList = container.execInContainer("ls", directoryInContainer).getStdout();
             assertTrue("file list contains the file", filesList.contains(fileName));
+
+            // ...
+
+            // copyFromContainer {
+            container.copyFileFromContainer(directoryInContainer + fileName, destinationOnHost);
+            // }
         }
+
+        assertArrayEquals(
+            Files.toByteArray(new File(destinationOnHost)),
+            Resources.toByteArray(CopyFileToContainerTest.class.getResource("/mappable-resource/" + fileName))
+        );
     }
 
     @Test
@@ -34,7 +56,7 @@ public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
         try (
             GenericContainer container = new GenericContainer()
                 .withCommand("sleep", "3000")
-                .withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
+                .withClasspathResourceMapping("/mappable-resource/", directoryInContainer, BindMode.READ_ONLY)
         ) {
             container.start();
             String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
diff --git a/docs/features/files.md b/docs/features/files.md
index a74b1add134..47240f82cd2 100644
--- a/docs/features/files.md
+++ b/docs/features/files.md
@@ -9,3 +9,19 @@ new GenericContainer(...)
                                       "/etc/redis.conf",
                                       BindMode.READ_ONLY)
 ```
+
+## Copying files to and from containers
+
+Files can be copied into the container before startup, or can be copied from the container after the container has started.
+
+### Copying to a container before startup
+
+<!--codeinclude-->
+[Copying files to a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyToContainer
+<!--/codeinclude-->
+
+### Copying a file from a running container
+
+<!--codeinclude-->
+[Copying files from a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyFromContainer
+<!--/codeinclude-->

From cae51cd6fc97aeab8be8f645fbcc26dda9513823 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 2 May 2020 10:07:30 +0100
Subject: [PATCH 0655/4969] Tweak GHA CI configuration to enable Gradle remote
 cache push

---
 .github/workflows/ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df6fc96ea44..b9c94223eb3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,8 @@ jobs:
           # Since we override the tests executor,
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
           echo $TASKS
@@ -56,6 +58,9 @@ jobs:
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Aggregate test reports with ciMate
         if: always()
         env:
@@ -83,6 +88,9 @@ jobs:
         working-directory: ./examples/
         run: |
           ./gradlew --no-daemon --scan --info check
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Aggregate test reports with ciMate
         if: always()
         env:

From 3d407196be6865fef0daaf3e4077b565e0aa0a19 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 2 May 2020 10:07:59 +0100
Subject: [PATCH 0656/4969] Simplify remote build cache boolean expression

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 4321c4ac4a4..150d79f89fe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,7 +27,7 @@ buildCache {
         region = 'fra1'
         bucket = 'testcontainers'
         path = 'cache'
-        push = !(System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") || !isMasterBuild)
+        push = isMasterBuild && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
         headers = [
             'x-amz-acl': 'public-read'
         ]

From e10c7eab23d84827c4e09e1e92312a2295626d71 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 2 May 2020 10:22:45 +0100
Subject: [PATCH 0657/4969] Pull up `env` to top level to be available to all
 jobs/steps

---
 .github/workflows/ci.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9c94223eb3..a6baaf7e92d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,10 @@ on:
   pull_request: {}
   push: { branches: [ master ] }
 
+env:
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
 jobs:
   find_gradle_jobs:
     runs-on: ubuntu-18.04
@@ -27,8 +31,6 @@ jobs:
           # Since we override the tests executor,
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
           echo $TASKS
@@ -58,9 +60,6 @@ jobs:
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Aggregate test reports with ciMate
         if: always()
         env:
@@ -88,9 +87,6 @@ jobs:
         working-directory: ./examples/
         run: |
           ./gradlew --no-daemon --scan --info check
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Aggregate test reports with ciMate
         if: always()
         env:

From fd28fcf42bde161ab42a2f8157e205de5bb0446e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 2 May 2020 12:23:44 +0100
Subject: [PATCH 0658/4969] Fix flaky JDBC tmpfs test (#2646)

---
 .../jdbc/DatabaseDriverTmpfsTest.java         | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index 07a17f68ade..6f337a586b6 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -1,27 +1,19 @@
 package org.testcontainers.jdbc;
 
-import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.JdbcDatabaseContainer;
-import org.testcontainers.testsupport.Flaky;
-import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
 
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 
 public class DatabaseDriverTmpfsTest {
 
-    @Rule
-    public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();
-
     @Test
-    @Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1687", reviewDate = "2020-03-01")
-    public void tmpfs() throws IOException, InterruptedException, SQLException {
+    public void testDatabaseHasTmpFsViaConnectionString() throws Exception {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
         try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
 
@@ -29,15 +21,11 @@ public void tmpfs() throws IOException, InterruptedException, SQLException {
             // check file doesn't exist
             String path = "/testtmpfs/test.file";
             Container.ExecResult execResult = container.execInContainer("ls", path);
-            assertEquals("tmpfs inside container works fine", execResult.getStderr(),
-                "ls: cannot access '/testtmpfs/test.file': No such file or directory\n");
+            assertNotEquals("tmpfs inside container doesn't have file that doesn't exist", 0, execResult.getExitCode());
             // touch && check file does exist
             container.execInContainer("touch", path);
             execResult = container.execInContainer("ls", path);
-            assertEquals("tmpfs inside container works fine", execResult.getStdout(), path + "\n");
+            assertEquals("tmpfs inside container has file that does exist", 0, execResult.getExitCode());
         }
-
     }
-
-
 }

From 12fef372c278f6b2d07700161dec5ff92da6576d Mon Sep 17 00:00:00 2001
From: mans2singh <mans2singh@users.noreply.github.com>
Date: Sat, 2 May 2020 10:25:24 -0400
Subject: [PATCH 0659/4969] Doc update for elasticsearch and kafka (#2615)

---
 docs/modules/elasticsearch.md | 2 +-
 docs/modules/kafka.md         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 02eeb61dfbe..c7efa872df6 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -36,7 +36,7 @@ container.stop();
 ```
 
 Note that if you are still using the [TransportClient](https://www.elastic.co/guide/en/elasticsearch/client/java-api/6.3/transport-client.html)
-(not recommended as deprecated), the default cluster name is set to `docker-cluster` so you need to change `cluster.name` setting
+(not recommended as it is deprecated), the default cluster name is set to `docker-cluster` so you need to change `cluster.name` setting
 or set `client.transport.ignore_cluster_name` to `true`.
 
 ## Choose your Elasticsearch license
diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index c0b85b67a62..a96a0a0b43a 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -42,7 +42,7 @@ new KafkaContainer().withExternalZookeeper("localhost:2181")
 
 If your test needs to run some other Docker container which needs access to the Kafka, do the following:
 
-* Run you other container on the same network as Kafka container. E.g. as following:
+* Run your other container on the same network as Kafka container, e.g.:
 ```java
 new GenericContainer("myImage").withNetwork(kafka.getNetwork())
 ```

From 3e4e5f27988809a5897bc1cf0e2407002153dfec Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 2 May 2020 17:51:39 +0200
Subject: [PATCH 0660/4969] Fix a regression in OracleContainer introduced in
 #2473 (#2612)

---
 .../org/testcontainers/containers/OracleContainer.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index bad22af2511..e86768bc383 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -38,12 +38,15 @@ public OracleContainer() {
 
     public OracleContainer(String dockerImageName) {
         super(dockerImageName);
-        withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
-        withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
+        preconfigure();
     }
 
     public OracleContainer(Future<String> dockerImageName) {
         super(dockerImageName);
+        preconfigure();
+    }
+
+    private void preconfigure() {
         withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
         addExposedPorts(ORACLE_PORT, APEX_HTTP_PORT);

From 2bb9613731a0a662f63323f7bb99a399cc1e1c92 Mon Sep 17 00:00:00 2001
From: Janusz <wisniaaa@gmail.com>
Date: Sat, 2 May 2020 17:56:10 +0200
Subject: [PATCH 0661/4969] Docker Compose: Verify that all services that have
 a wait condition defined also have a corresponding service instance (#2637)

---
 .../containers/DockerComposeContainer.java    | 15 +++++
 .../junit/DockerComposeWaitStrategyTest.java  | 55 ++++++++++++++++---
 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 61036f690cd..7bf8d3c916b 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -6,6 +6,7 @@
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Uninterruptibles;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -216,6 +217,20 @@ private void createServices() {
 
     private void waitUntilServiceStarted() {
         listChildContainers().forEach(this::createServiceInstance);
+
+        Set<String> servicesToWaitFor = waitStrategyMap.keySet();
+        Set<String> instantiatedServices = serviceInstanceMap.keySet();
+        Sets.SetView<String> missingServiceInstances =
+            Sets.difference(servicesToWaitFor, instantiatedServices);
+
+        if (!missingServiceInstances.isEmpty()) {
+            throw new IllegalStateException(
+                "Services named " + missingServiceInstances + " " +
+                    "do not exist, but wait conditions have been defined " +
+                    "for them. This might mean that you misspelled " +
+                    "the service name when defining the wait condition.");
+        }
+
         serviceInstanceMap.forEach(this::waitUntilServiceStarted);
     }
 
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
index 7724b048b69..32465010700 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
@@ -1,21 +1,40 @@
 package org.testcontainers.junit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+import java.io.File;
+import java.time.Duration;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.Description;
+import org.mockito.Mockito;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
-
-import java.io.File;
-import java.time.Duration;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
 public class DockerComposeWaitStrategyTest {
 
     private static final int REDIS_PORT = 6379;
 
+    private DockerComposeContainer<?> environment;
+
+    @Before
+    public final void setUp() {
+        environment = new DockerComposeContainer<>(
+            new File("src/test/resources/compose-test.yml"));
+    }
+
+    @After
+    public final void cleanUp() {
+        environment.stop();
+    }
+
     @Test
     public void testWaitOnListeningPort() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort());
 
         try {
@@ -28,7 +47,7 @@ public void testWaitOnListeningPort() {
 
     @Test
     public void testWaitOnMultipleStrategiesPassing() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort())
             .withExposedService("db_1", 3306, Wait.forLogMessage(".*ready for connections.*\\s", 1))
             .withTailChildContainers(true);
@@ -43,7 +62,7 @@ public void testWaitOnMultipleStrategiesPassing() {
 
     @Test
     public void testWaitingFails() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10)));
         VisibleAssertions.assertThrows("waiting on an invalid http path times out",
             RuntimeException.class,
@@ -52,7 +71,7 @@ public void testWaitingFails() {
 
     @Test
     public void testWaitOnOneOfMultipleStrategiesFailing() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)))
             .waitingFor("db_1", Wait.forLogMessage(".*test test test.*\\s", 1).withStartupTimeout(Duration.ofSeconds(10)))
             .withTailChildContainers(true);
@@ -62,4 +81,26 @@ public void testWaitOnOneOfMultipleStrategiesFailing() {
             () -> environment.starting(Description.createTestDescription(Object.class, "name")));
     }
 
+    @Test
+    public void testWaitingForNonexistentServices() {
+        String existentServiceName = "db_1";
+        String nonexistentServiceName1 = "some_nonexistent_service_1";
+        String nonexistentServiceName2 = "some_nonexistent_service_2";
+        WaitStrategy someWaitStrategy = Mockito.mock(WaitStrategy.class);
+
+        environment
+            .waitingFor(existentServiceName, someWaitStrategy)
+            .waitingFor(nonexistentServiceName1, someWaitStrategy)
+            .waitingFor(nonexistentServiceName2, someWaitStrategy);
+
+        Throwable thrownWhenRequestedToWaitForNonexistentService =
+            catchThrowable(environment::start);
+
+        assertThat(thrownWhenRequestedToWaitForNonexistentService)
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining(
+                nonexistentServiceName1,
+                nonexistentServiceName2)
+            .hasMessageNotContaining(existentServiceName);
+    }
 }

From eada48eadcbc5ab1cb97d833b9de6b2350efa172 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 2 May 2020 19:50:26 +0100
Subject: [PATCH 0662/4969] Remove .envrc file

---
 .envrc | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .envrc

diff --git a/.envrc b/.envrc
deleted file mode 100644
index dad2eb2cfc6..00000000000
--- a/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-use python 3.7.5

From a3b200b12d6f93d07c1c1864c2197b6a358dd7b1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 2 May 2020 20:05:47 +0100
Subject: [PATCH 0663/4969] Bump mysql-connector-java from 8.0.19 to 8.0.20 in
 /modules/mysql (#2618)

---
 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 606aeefe813..2ee2d62ce59 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly project(':r2dbc')
     compileOnly 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
 
-    testCompile 'mysql:mysql-connector-java:8.0.19'
+    testCompile 'mysql:mysql-connector-java:8.0.20'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.34'
     testCompile 'commons-dbutils:commons-dbutils:1.7'

From f30ac94f8aa0b67e8795845b7357ae70c33ec4a0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 2 May 2020 20:05:59 +0100
Subject: [PATCH 0664/4969] Bump s3 from 2.13.4 to 2.13.7 in
 /modules/localstack (#2642)

---
 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 82cf5c1f841..0f905597e26 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.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.773'
-    testCompile 'software.amazon.awssdk:s3:2.13.4'
+    testCompile 'software.amazon.awssdk:s3:2.13.7'
 }

From 7c761a9e3571609ab6aacbaecdae67f79c3526b4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 2 May 2020 20:07:08 +0100
Subject: [PATCH 0665/4969] Bump guava from 28.2-jre to 29.0-jre in /core
 (#2643)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index bbf57a34a70..9b317074909 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:28.2-jre'
+        classpath 'com.google.guava:guava:29.0-jre'
     }
 }
 

From 0050e70e24b1cd6540bd08eb960467aa11544398 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 3 May 2020 10:43:38 +0100
Subject: [PATCH 0666/4969] Revert "Example and docs for ability to copy to and
 from container for #1164" (#2651)

---
 .../junit/CopyFileToContainerTest.java        | 30 +++----------------
 docs/features/files.md                        | 16 ----------
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index 1e230ec605b..ed6ee561505 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -1,54 +1,32 @@
 package org.testcontainers.junit;
 
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
 import org.junit.Test;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.utility.MountableFile;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class CopyFileToContainerTest {
-    public static final String destinationOnHost = "/tmp/test-resource-in-host.txt";
-    private static String directoryInContainer = "/tmp/mappable-resource/";
+    private static String containerPath = "/tmp/mappable-resource/";
     private static String fileName = "test-resource.txt";
 
     @Test
     public void checkFileCopied() throws IOException, InterruptedException {
         try (
-            // copyToContainer {
             GenericContainer container = new GenericContainer()
                 .withCommand("sleep", "3000")
-                // withCopyFileToContainer ensure that a file or directory will be copied to the container
-                // before starting. In this case, we map a classpath directory to a directory inside the container
-                .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), directoryInContainer)
-            // }
+                .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
         ) {
             container.start();
-
-            // at this point directoryInContainer should exist, and should contain copies of file(s)
-            String filesList = container.execInContainer("ls", directoryInContainer).getStdout();
+            String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
             assertTrue("file list contains the file", filesList.contains(fileName));
-
-            // ...
-
-            // copyFromContainer {
-            container.copyFileFromContainer(directoryInContainer + fileName, destinationOnHost);
-            // }
         }
-
-        assertArrayEquals(
-            Files.toByteArray(new File(destinationOnHost)),
-            Resources.toByteArray(CopyFileToContainerTest.class.getResource("/mappable-resource/" + fileName))
-        );
     }
 
     @Test
@@ -56,7 +34,7 @@ public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
         try (
             GenericContainer container = new GenericContainer()
                 .withCommand("sleep", "3000")
-                .withClasspathResourceMapping("/mappable-resource/", directoryInContainer, BindMode.READ_ONLY)
+                .withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
         ) {
             container.start();
             String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
diff --git a/docs/features/files.md b/docs/features/files.md
index 47240f82cd2..a74b1add134 100644
--- a/docs/features/files.md
+++ b/docs/features/files.md
@@ -9,19 +9,3 @@ new GenericContainer(...)
                                       "/etc/redis.conf",
                                       BindMode.READ_ONLY)
 ```
-
-## Copying files to and from containers
-
-Files can be copied into the container before startup, or can be copied from the container after the container has started.
-
-### Copying to a container before startup
-
-<!--codeinclude-->
-[Copying files to a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyToContainer
-<!--/codeinclude-->
-
-### Copying a file from a running container
-
-<!--codeinclude-->
-[Copying files from a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyFromContainer
-<!--/codeinclude-->

From 8fd4c2081d3975473d430b81b08fa25c30d74199 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 5 May 2020 20:58:50 +0100
Subject: [PATCH 0667/4969] Make neo4j module support Gradle caching (#2649)

---
 modules/neo4j/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 9361824fdd6..1f119ff83bd 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -20,6 +20,10 @@ task customNeo4jPluginJar(type: Jar) {
     from sourceSets.customNeo4jPlugin.output
     archiveName = "hello-world.jar"
     destinationDir = customNeo4jPluginDestinationDir
+
+    inputs.files(sourceSets.customNeo4jPlugin.java.srcDirs)
+    outputs.cacheIf { true }
+    outputs.dir(customNeo4jPluginDestinationDir)
 }
 
 test.dependsOn customNeo4jPluginJar

From 2ea0524494075709babd3b470cadb99bf19a0e0a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 May 2020 20:59:58 +0100
Subject: [PATCH 0668/4969] Bump jedis from 3.2.0 to 3.3.0 in /core (#2653)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9b317074909..fc4a36ea0b9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -155,7 +155,7 @@ dependencies {
     }
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.2.0'
+    testCompile 'redis.clients:jedis:3.3.0'
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.3'
 

From 6f4f808357d47907decfd650b211ac6cae9e182b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 May 2020 21:00:11 +0100
Subject: [PATCH 0669/4969] Bump jedis from 3.2.0 to 3.3.0 in
 /modules/junit-jupiter (#2652)

---
 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 5046008c7fa..7acc7fcbf11 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.3'
-    testCompile 'redis.clients:jedis:3.2.0'
+    testCompile 'redis.clients:jedis:3.3.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')

From 6b522dbc6c39d68ae1c046bbcaf2acd110a91f86 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 May 2020 21:00:27 +0100
Subject: [PATCH 0670/4969] Bump jedis from 3.2.0 to 3.3.0 in /examples (#2656)

---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 1779966c692..62f7de6dcf8 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.2.0'
+    implementation 'redis.clients:jedis:3.3.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 9dea8531b5e..258c98fb107 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.2.0'
+    implementation 'redis.clients:jedis:3.3.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index b06d4e7cb30..11e6cb2a31b 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.2.0'
+    implementation 'redis.clients:jedis:3.3.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.30'

From 71d0c0c48c445fe77450a44fa27f756f58bf36f4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 May 2020 21:01:07 +0100
Subject: [PATCH 0671/4969] Bump cucumber-junit from 5.6.0 to 5.7.0 in
 /examples (#2657)

---
 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 53a50c374f5..92724e358db 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
-    testImplementation 'io.cucumber:cucumber-junit:5.6.0'
+    testImplementation 'io.cucumber:cucumber-junit:5.7.0'
     testImplementation 'io.cucumber:cucumber-java:5.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 7e92eea2f0650ed0ff19a702451cbf60ef27395f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 May 2020 21:14:06 +0100
Subject: [PATCH 0672/4969] Bump cucumber-java from 5.6.0 to 5.7.0 in /examples
 (#2658)

---
 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 92724e358db..011b2bddecd 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.14.0'
+    testImplementation 'io.cucumber:cucumber-java:5.7.0'
     testImplementation 'io.cucumber:cucumber-junit:5.7.0'
-    testImplementation 'io.cucumber:cucumber-java:5.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 5cd771e6294e25fa186452fcd3f699246950b89d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 May 2020 21:15:13 +0100
Subject: [PATCH 0673/4969] Bump s3 from 2.13.7 to 2.13.9 in
 /modules/localstack (#2659)

---
 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 0f905597e26..98f01ea3b38 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.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.773'
-    testCompile 'software.amazon.awssdk:s3:2.13.7'
+    testCompile 'software.amazon.awssdk:s3:2.13.9'
 }

From 0adeb114b957721ff457b83e3dbd26a5be0eae36 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 May 2020 21:25:05 +0100
Subject: [PATCH 0674/4969] Bump aws-java-sdk-logs from 1.11.773 to 1.11.775 in
 /modules/localstack (#2660)

---
 modules/localstack/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 98f01ea3b38..89e204515c5 100644
--- 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.683'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.773'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.775'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.775'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.775'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
     testCompile 'software.amazon.awssdk:s3:2.13.9'
 }

From edde70525af03a2a8fdde95a9e5f6a3d6a27bf5f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 6 May 2020 09:01:01 +0200
Subject: [PATCH 0675/4969] Bump assertj-core from 3.15.0 to 3.16.0 in /core
 (#2671)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.15.0...assertj-core-3.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index fc4a36ea0b9..f74744255f8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -165,12 +165,12 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testCompile 'org.assertj:assertj-core:3.16.0'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
-    jarFileTestCompile 'org.assertj:assertj-core:3.14.0'
+    jarFileTestCompile 'org.assertj:assertj-core:3.16.0'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
 }

From eb58a9a023d1d52980f578af8083421216416352 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 6 May 2020 09:02:28 +0200
Subject: [PATCH 0676/4969] Bump assertj-core from 3.15.0 to 3.16.0 in
 /modules/vault (#2670)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.15.0...assertj-core-3.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index bf85047ddd7..b8681be150d 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.0'
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testCompile 'org.assertj:assertj-core:3.16.0'
 
 }

From ef3ac663b4bc1f43520407aa971537506a1c5dfb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 6 May 2020 09:02:52 +0200
Subject: [PATCH 0677/4969] Bump assertj-core from 3.15.0 to 3.16.0 in
 /modules/junit-jupiter (#2669)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.15.0...assertj-core-3.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 7acc7fcbf11..b80f9263e9c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testCompile 'org.assertj:assertj-core:3.16.0'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'

From 1f535b72bd4a2ff02f9b58d5c588acd0ff8eb395 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 6 May 2020 09:03:17 +0200
Subject: [PATCH 0678/4969] Bump assertj-core from 3.15.0 to 3.16.0 in
 /modules/database-commons (#2672)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.15.0...assertj-core-3.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index d8738a6cb69..14dffc649ac 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testCompile 'org.assertj:assertj-core:3.16.0'
 }

From 5b2590c2eae76aeccd29a49c347591674cffead7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 11:49:38 +0100
Subject: [PATCH 0679/4969] Bump aws-java-sdk-sqs from 1.11.775 to 1.11.777 in
 /modules/localstack (#2675)

---
 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 89e204515c5..d2e3a1ff2cf 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.775'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.775'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.775'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
     testCompile 'software.amazon.awssdk:s3:2.13.9'
 }

From 76ff1118f8caf4dbd0a7c9210d44d0702ce021c0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 14:30:02 +0100
Subject: [PATCH 0680/4969] Bump assertj-core from 3.15.0 to 3.16.0 in
 /modules/pulsar (#2668)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 4f459d9a97e..ecfa7c5f26a 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.1'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.15.0'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.0'
 }

From 402823c43ce2e2aa576fef11a9803add317c54fd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 14:30:22 +0100
Subject: [PATCH 0681/4969] Bump assertj-core from 3.15.0 to 3.16.0 in
 /modules/neo4j (#2665)

---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 1f119ff83bd..77ac94a5e8d 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testCompile 'org.assertj:assertj-core:3.16.0'
 }

From 81483cfc85d8b805b20ca9017394c92ab7d25fed Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 14:30:30 +0100
Subject: [PATCH 0682/4969] Bump assertj-core from 3.15.0 to 3.16.0 in
 /modules/kafka (#2664)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 355c44eab1a..17d6f4b652d 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.5.0'
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testCompile 'org.assertj:assertj-core:3.16.0'
     testCompile 'com.google.guava:guava:23.0'
 }

From 89ef00389218a5b89682e2ed01db3cabaca85a16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 14:31:18 +0100
Subject: [PATCH 0683/4969] Bump aws-java-sdk-logs from 1.11.775 to 1.11.777 in
 /modules/localstack (#2674)

---
 modules/localstack/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index d2e3a1ff2cf..2aa9150b32b 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,6 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.775'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.775'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.777'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
     testCompile 'software.amazon.awssdk:s3:2.13.9'
 }

From bc67cb5d55fbf4595e1d9bd644280e30310a33be Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 14:31:31 +0100
Subject: [PATCH 0684/4969] Bump s3 from 2.13.9 to 2.13.11 in
 /modules/localstack (#2673)

---
 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 2aa9150b32b..9270eb9a3ca 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
-    testCompile 'software.amazon.awssdk:s3:2.13.9'
+    testCompile 'software.amazon.awssdk:s3:2.13.11'
 }

From 342f6aef60a0421495f28ce36dd42268d5553796 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 14:31:43 +0100
Subject: [PATCH 0685/4969] Bump mongo-java-driver from 3.12.3 to 3.12.4 in
 /core (#2676)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index f74744255f8..e7176938b43 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -157,7 +157,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.3'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.4'
 
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')

From 886e4c3239da7b73625cd4b965a0ff5b6b74d6aa Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 15:21:58 +0100
Subject: [PATCH 0686/4969] Bump annotations from 17.0.0 to 19.0.0 in /core
 (#2358)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index e7176938b43..3f4faf0c709 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -116,7 +116,7 @@ dependencies {
 
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
-    compile 'org.jetbrains:annotations:17.0.0'
+    compile 'org.jetbrains:annotations:19.0.0'
     compile 'org.apache.commons:commons-compress:1.20'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From 83a3c941ce948b5339529dd1b2b9928bee1dee19 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 19:55:23 +0100
Subject: [PATCH 0687/4969] Bump httpclient from 4.5.11 to 4.5.12 in
 /modules/junit-jupiter (#2409)

---
 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 b80f9263e9c..fb5548c320d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.3'
     testCompile 'redis.clients:jedis:3.3.0'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.11'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }

From e5489d2dd4136d6bc39ed98e0a7db7c66d0cfcb2 Mon Sep 17 00:00:00 2001
From: Danny George <dangets@gmail.com>
Date: Thu, 7 May 2020 13:22:32 -0600
Subject: [PATCH 0688/4969] RabbitMQ: Support declaring an exchange within a
 vhost (#2362)

---
 .../containers/RabbitMQContainer.java             | 11 +++++++++++
 .../containers/RabbitMQContainerTest.java         | 15 +++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index ede111ed2d8..aba71e25a7e 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -345,6 +345,17 @@ public RabbitMQContainer withExchange(String name, String type) {
 
     public RabbitMQContainer withExchange(String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
         values.add(asList("rabbitmqadmin", "declare", "exchange",
+            "name=" + name,
+            "type=" + type,
+            "auto_delete=" + autoDelete,
+            "internal=" + internal,
+            "durable=" + durable,
+            "arguments=" + toJson(arguments)));
+        return self();
+    }
+
+    public RabbitMQContainer withExchange(String vhost, String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "exchange",
                 "name=" + name,
                 "type=" + type,
                 "auto_delete=" + autoDelete,
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 5822e213a82..6f283c7451f 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -19,6 +19,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
+import java.util.Collections;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
@@ -91,6 +92,20 @@ public void shouldCreateRabbitMQContainerWithExchange() throws IOException, Inte
         }
     }
 
+    @Test
+    public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOException, InterruptedException
+    {
+        try (RabbitMQContainer container = new RabbitMQContainer()) {
+            container.withVhost("test-vhost");
+            container.withExchange("test-vhost", "test-exchange", "direct", false, false, false, Collections.emptyMap());
+
+            container.start();
+
+            assertThat(container.execInContainer("rabbitmqctl", "list_exchanges", "-p", "test-vhost").getStdout())
+                .containsPattern("test-exchange\\s+direct");
+        }
+    }
+
     @Test
     public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException
     {

From c88d25705942024677533f333a84734557044088 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 20:23:42 +0100
Subject: [PATCH 0689/4969] Bump okhttp from 3.14.6 to 3.14.8 in /core (#2644)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 3f4faf0c709..312298bf77d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -146,7 +146,7 @@ dependencies {
 
     shaded "org.yaml:snakeyaml:1.25"
 
-    shaded 'com.squareup.okhttp3:okhttp:3.14.6'
+    shaded 'com.squareup.okhttp3:okhttp:3.14.8'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 6263cad11a6e8e466ebf12f11173238ac2915052 Mon Sep 17 00:00:00 2001
From: streppel <streppels@gmail.com>
Date: Thu, 7 May 2020 16:32:06 -0300
Subject: [PATCH 0690/4969] Remove duplicate debug log message at container
 start (#2522)

---
 .../java/org/testcontainers/containers/GenericContainer.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 211ad2f59cb..23e5f9bf173 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -307,7 +307,6 @@ protected void doStart() {
             Instant startedAt = Instant.now();
 
             logger().debug("Starting container: {}", getDockerImageName());
-            logger().debug("Trying to start container: {}", getDockerImageName());
 
             AtomicInteger attempt = new AtomicInteger(0);
             Unreliables.retryUntilSuccess(startupAttempts, () -> {

From 0df9f87b9af0ec58dbe04930416799ac58f562af Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 08:41:41 +0100
Subject: [PATCH 0691/4969] Bump aws-java-sdk-s3 from 1.11.775 to 1.11.778 in
 /modules/localstack (#2682)

---
 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 9270eb9a3ca..31ce7af53b7 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.775'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.778'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.775'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'

From 05da884d1beef61fa8b743b798ea988f3cb0dc5d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 08:41:51 +0100
Subject: [PATCH 0692/4969] Bump HikariCP from 3.4.3 to 3.4.4 in /modules/spock
 (#2678)

---
 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 7b1780391b5..8ea7a940212 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
 
-    testCompile 'com.zaxxer:HikariCP:3.4.3'
+    testCompile 'com.zaxxer:HikariCP:3.4.4'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'

From 8f5863b4b8245af3e9dddb3d70c1ff7e1dace152 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 08:41:58 +0100
Subject: [PATCH 0693/4969] Bump org.springframework.boot from 2.2.6.RELEASE to
 2.2.7.RELEASE in /examples (#2683)

---
 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 edbe7d1fb68..04888a55c65 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.2.6.RELEASE'
+    id 'org.springframework.boot' version '2.2.7.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 6cd1db0172a..c7b0c63d7ba 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.2.6.RELEASE'
+    id 'org.springframework.boot' version '2.2.7.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From d1ae700f18cf37e9954c2b9c75e30072b55ce2d5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 08:42:05 +0100
Subject: [PATCH 0694/4969] Bump s3 from 2.13.11 to 2.13.12 in
 /modules/localstack (#2681)

---
 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 31ce7af53b7..25365a3f8a3 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
-    testCompile 'software.amazon.awssdk:s3:2.13.11'
+    testCompile 'software.amazon.awssdk:s3:2.13.12'
 }

From d3d168a3885947f58c13d6e0f9a4cf5500b96794 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 08:42:12 +0100
Subject: [PATCH 0695/4969] Bump aws-java-sdk-sqs from 1.11.777 to 1.11.778 in
 /modules/localstack (#2680)

---
 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 25365a3f8a3..874e5fe54df 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.778'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.775'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.777'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.778'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
     testCompile 'software.amazon.awssdk:s3:2.13.12'

From 69b3bc2359dd01e025ec618a4e4ba1ec5b8fb1c2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 08:42:19 +0100
Subject: [PATCH 0696/4969] Bump HikariCP from 3.4.3 to 3.4.4 in
 /modules/junit-jupiter (#2679)

---
 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 fb5548c320d..93b9b1dc23e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.3'
+    testCompile 'com.zaxxer:HikariCP:3.4.4'
     testCompile 'redis.clients:jedis:3.3.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
     testCompile ('org.mockito:mockito-core:3.3.3') {

From a2cfd4502d272d1116d42e5c7339a5320a401a43 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 8 May 2020 12:51:53 +0100
Subject: [PATCH 0697/4969] Revert "Bump HikariCP from 3.4.3 to 3.4.4 in
 /modules/spock" (#2686)

---
 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 8ea7a940212..7b1780391b5 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
 
-    testCompile 'com.zaxxer:HikariCP:3.4.4'
+    testCompile 'com.zaxxer:HikariCP:3.4.3'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'

From 9b12c6403eecf6ebeaa412d85c8a8aaa7ad7de49 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 8 May 2020 12:52:05 +0100
Subject: [PATCH 0698/4969] Revert "Bump HikariCP from 3.4.3 to 3.4.4 in
 /modules/junit-jupiter" (#2685)

---
 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 93b9b1dc23e..fb5548c320d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.4'
+    testCompile 'com.zaxxer:HikariCP:3.4.3'
     testCompile 'redis.clients:jedis:3.3.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
     testCompile ('org.mockito:mockito-core:3.3.3') {

From 8377288a10a892d8ed830b59b860eb3e40a72491 Mon Sep 17 00:00:00 2001
From: silaev <silaev.ka@gmail.com>
Date: Fri, 8 May 2020 17:02:29 +0500
Subject: [PATCH 0699/4969] Add MongoDB module (#1961)

---
 docs/modules/databases/mongodb.md             |  60 +++++++++
 mkdocs.yml                                    |   1 +
 modules/mongodb/build.gradle                  |   7 +
 .../containers/MongoDBContainer.java          | 120 ++++++++++++++++++
 .../containers/MongoDBContainerTest.java      |  74 +++++++++++
 .../src/test/resources/logback-test.xml       |  16 +++
 6 files changed, 278 insertions(+)
 create mode 100644 docs/modules/databases/mongodb.md
 create mode 100644 modules/mongodb/build.gradle
 create mode 100644 modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
 create mode 100644 modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
 create mode 100644 modules/mongodb/src/test/resources/logback-test.xml

diff --git a/docs/modules/databases/mongodb.md b/docs/modules/databases/mongodb.md
new file mode 100644
index 00000000000..fc2cb873f59
--- /dev/null
+++ b/docs/modules/databases/mongodb.md
@@ -0,0 +1,60 @@
+# MongoDB Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+## Usage example
+
+The following example shows how to create a MongoDBContainer:
+
+<!--codeinclude-->
+[Creating a MongoDB container](../../../modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java) inside_block:creatingMongoDBContainer
+<!--/codeinclude-->
+
+And how to start it:
+
+<!--codeinclude-->
+[Starting a MongoDB container](../../../modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java) inside_block:startingMongoDBContainer
+<!--/codeinclude-->
+
+!!! note
+    To construct a multi-node MongoDB cluster, consider the [mongodb-replica-set project](https://github.com/silaev/mongodb-replica-set/)     
+
+#### Motivation
+Implement a reusable, cross-platform, simple to install solution that doesn't depend on 
+fixed ports to test MongoDB transactions.  
+  
+#### General info
+MongoDB starting from version 4 supports multi-document transactions only for a replica set.
+For instance, to initialize a single node replica set on fixed ports via Docker, one has to do the following:
+
+* Run a MongoDB container of version 4 and up specifying --replSet command
+* Initialize a single replica set via executing a proper command
+* Wait for the initialization to complete
+* Provide a special url for a user to employ with a MongoDB driver without specifying replicaSet
+
+As we can see, there is a lot of operations to execute and we even haven't touched a non-fixed port approach.
+That's where the MongoDBContainer might come in handy. 
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:mongodb:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>mongodb</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+!!! hint
+Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency
+    
+#### Copyright
+Copyright (c) 2019 Konstantin Silaev <silaev256@gmail.com>
diff --git a/mkdocs.yml b/mkdocs.yml
index 708fbe06883..e1b21d80811 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -50,6 +50,7 @@ nav:
                 - modules/databases/dynalite.md
                 - modules/databases/influxdb.md
                 - modules/databases/mariadb.md
+                - modules/databases/mongodb.md
                 - modules/databases/mssqlserver.md
                 - modules/databases/mysql.md
                 - modules/databases/neo4j.md
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
new file mode 100644
index 00000000000..57db1be21de
--- /dev/null
+++ b/modules/mongodb/build.gradle
@@ -0,0 +1,7 @@
+description = "Testcontainers :: MongoDB"
+
+dependencies {
+    compile project(':testcontainers')
+
+    testCompile("org.mongodb:mongodb-driver-sync:4.0.2")
+}
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
new file mode 100644
index 00000000000..a7f57d310f2
--- /dev/null
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -0,0 +1,120 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import java.io.IOException;
+
+/**
+ * Constructs a single node MongoDB replica set for testing transactions.
+ * <p>To construct a multi-node MongoDB cluster, consider the <a href="https://github.com/silaev/mongodb-replica-set/">mongodb-replica-set project on GitHub</a>
+ * <p>Tested on a MongoDB version 4.0.10+ (that is the default version if not specified).
+ */
+@Slf4j
+public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
+    private static final int CONTAINER_EXIT_CODE_OK = 0;
+    private static final int MONGODB_INTERNAL_PORT = 27017;
+    private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
+    private static final String MONGODB_VERSION_DEFAULT = "4.0.10";
+    private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
+
+    public MongoDBContainer() {
+        this("mongo:" + MONGODB_VERSION_DEFAULT);
+    }
+
+    public MongoDBContainer(@NonNull final String dockerImageName) {
+        super(dockerImageName);
+        withExposedPorts(MONGODB_INTERNAL_PORT);
+        withCommand("--replSet", "docker-rs");
+        waitingFor(
+            Wait.forLogMessage(".*waiting for connections on port.*", 1)
+        );
+    }
+
+    public String getReplicaSetUrl() {
+        if (!isRunning()) {
+            throw new IllegalStateException("MongoDBContainer should be started first");
+        }
+        return String.format(
+            "mongodb://%s:%d/%s",
+            getContainerIpAddress(),
+            getMappedPort(MONGODB_INTERNAL_PORT),
+            MONGODB_DATABASE_NAME_DEFAULT
+        );
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        initReplicaSet();
+    }
+
+    private String[] buildMongoEvalCommand(final String command) {
+        return new String[]{"mongo", "--eval", command};
+    }
+
+    private void checkMongoNodeExitCode(final Container.ExecResult execResult) {
+        if (execResult.getExitCode() != CONTAINER_EXIT_CODE_OK) {
+            final String errorMessage = String.format("An error occurred: %s", execResult.getStdout());
+            log.error(errorMessage);
+            throw new ReplicaSetInitializationException(errorMessage);
+        }
+    }
+
+    private String buildMongoWaitCommand() {
+        return String.format(
+            "var attempt = 0; " +
+                "while" +
+                "(%s) " +
+                "{ " +
+                "if (attempt > %d) {quit(1);} " +
+                "print('%s ' + attempt); sleep(100);  attempt++; " +
+                " }",
+            "db.runCommand( { isMaster: 1 } ).ismaster==false",
+            AWAIT_INIT_REPLICA_SET_ATTEMPTS,
+            "An attempt to await for a single node replica set initialization:"
+        );
+    }
+
+    private void checkMongoNodeExitCodeAfterWaiting(
+        final Container.ExecResult execResultWaitForMaster
+    ) {
+        if (execResultWaitForMaster.getExitCode() != CONTAINER_EXIT_CODE_OK) {
+            final String errorMessage = String.format(
+                "A single node replica set was not initialized in a set timeout: %d attempts",
+                AWAIT_INIT_REPLICA_SET_ATTEMPTS
+            );
+            log.error(errorMessage);
+            throw new ReplicaSetInitializationException(errorMessage);
+        }
+    }
+
+    @SneakyThrows(value = {IOException.class, InterruptedException.class})
+    private void initReplicaSet() {
+        log.debug("Initializing a single node node replica set...");
+        final ExecResult execResultInitRs = execInContainer(
+            buildMongoEvalCommand("rs.initiate();")
+        );
+        log.debug(execResultInitRs.getStdout());
+        checkMongoNodeExitCode(execResultInitRs);
+
+        log.debug(
+            "Awaiting for a single node replica set initialization up to {} attempts",
+            AWAIT_INIT_REPLICA_SET_ATTEMPTS
+        );
+        final ExecResult execResultWaitForMaster = execInContainer(
+            buildMongoEvalCommand(buildMongoWaitCommand())
+        );
+        log.debug(execResultWaitForMaster.getStdout());
+
+        checkMongoNodeExitCodeAfterWaiting(execResultWaitForMaster);
+    }
+
+    public static class ReplicaSetInitializationException extends RuntimeException {
+        ReplicaSetInitializationException(final String errorMessage) {
+            super(errorMessage);
+        }
+    }
+}
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
new file mode 100644
index 00000000000..7c4f4c12408
--- /dev/null
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -0,0 +1,74 @@
+package org.testcontainers.containers;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.TransactionBody;
+import org.bson.Document;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+
+public class MongoDBContainerTest {
+    /**
+     * Taken from <a href="https://docs.mongodb.com/manual/core/transactions/">https://docs.mongodb.com</a>
+     */
+    @Test
+    public void shouldExecuteTransactions() {
+        try (
+            // creatingMongoDBContainer {
+            final MongoDBContainer mongoDBContainer = new MongoDBContainer()
+            // }
+        ) {
+
+            // startingMongoDBContainer {
+            mongoDBContainer.start();
+            // }
+
+            final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
+            assertNotNull(mongoRsUrl);
+            final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
+            mongoSyncClient.getDatabase("mydb1").getCollection("foo")
+                .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("abc", 0));
+            mongoSyncClient.getDatabase("mydb2").getCollection("bar")
+                .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("xyz", 0));
+
+            final ClientSession clientSession = mongoSyncClient.startSession();
+            final TransactionOptions txnOptions = TransactionOptions.builder()
+                .readPreference(ReadPreference.primary())
+                .readConcern(ReadConcern.LOCAL)
+                .writeConcern(WriteConcern.MAJORITY)
+                .build();
+
+            final String trxResult = "Inserted into collections in different databases";
+
+            TransactionBody<String> txnBody = () -> {
+                final MongoCollection<Document> coll1 =
+                    mongoSyncClient.getDatabase("mydb1").getCollection("foo");
+                final MongoCollection<Document> coll2 =
+                    mongoSyncClient.getDatabase("mydb2").getCollection("bar");
+
+                coll1.insertOne(clientSession, new Document("abc", 1));
+                coll2.insertOne(clientSession, new Document("xyz", 999));
+                return trxResult;
+            };
+
+            try {
+                final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
+                assertEquals(trxResult, trxResultActual);
+            } catch (RuntimeException re) {
+                throw new IllegalStateException(re.getMessage(), re);
+            } finally {
+                clientSession.close();
+                mongoSyncClient.close();
+            }
+        }
+    }
+}
diff --git a/modules/mongodb/src/test/resources/logback-test.xml b/modules/mongodb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/mongodb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>

From e6930d6ac986db1373e29b61263f61aecbfc5155 Mon Sep 17 00:00:00 2001
From: Vivek Jaiswal <vivekjaiswal@live.in>
Date: Wed, 13 May 2020 22:50:49 +0530
Subject: [PATCH 0700/4969] Fix typo in DinD docs (#2725)

---
 .../continuous_integration/dind_patterns.md                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/dind_patterns.md b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
index 1534949e1bd..e742c047afa 100644
--- a/docs/supported_docker_environment/continuous_integration/dind_patterns.md
+++ b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
@@ -32,7 +32,7 @@ Where:
 * `-v /var/run/docker.sock:/var/run/docker.sock` will map the Docker socket
 
 ### Docker Compose example
-The same can be achived with Docker Compose:
+The same can be achieved with Docker Compose:
 ```yaml
 tests:
   image: maven:3

From 123f13aeec72b9c7998b8b5fa32aa1de57c3b31e Mon Sep 17 00:00:00 2001
From: Perennes <choob4k4@gmail.Com>
Date: Wed, 13 May 2020 21:34:26 +0200
Subject: [PATCH 0701/4969] Do not fail on duplicated local image tags. Fixes
 #2431 (#2692)

* #2431 Correction for an edge case in local image repos (duplicates repo tags) crashing the image pulling

* Indentation correction

* Indentation correction
---
 .../org/testcontainers/images/LocalImagesCache.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
index 29bc8ef1408..e6b330d4c90 100644
--- a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
+++ b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
@@ -79,10 +79,14 @@ private void populateFromList(List<Image> images) {
             }
 
             cache.putAll(
-                Stream.of(repoTags).collect(Collectors.toMap(
-                    DockerImageName::new,
-                    it -> ImageData.from(image)
-                ))
+                Stream.of(repoTags)
+                    // Protection against some edge case where local image repository tags end up with duplicates
+                    // making toMap crash at merge time.
+                    .distinct()
+                    .collect(Collectors.toMap(
+                        DockerImageName::new,
+                        it -> ImageData.from(image)
+                    ))
             );
         }
     }

From 284c272cbf5095fd586ffebfd7d7ec6e7f634f84 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:25:00 +0100
Subject: [PATCH 0702/4969] Bump HikariCP from 3.4.3 to 3.4.5 in
 /modules/junit-jupiter (#2697)

---
 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 fb5548c320d..5e143b3b706 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.3'
+    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') {

From d2b677856aa41940a106f2a9da9c15370cfb8077 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:25:19 +0100
Subject: [PATCH 0703/4969] Bump tomcat-jdbc from 9.0.34 to 9.0.35 in
 /modules/mariadb (#2712)

---
 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 730dae7c794..226e34aae90 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.34'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 
     testCompile testFixtures(project(':r2dbc'))

From df6816940a2970a0577933e6b9bd88719984ea30 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:25:36 +0100
Subject: [PATCH 0704/4969] Bump assertj-core from 3.16.0 to 3.16.1 in
 /modules/neo4j (#2698)

---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 77ac94a5e8d..4bc92e49cda 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.16.0'
+    testCompile 'org.assertj:assertj-core:3.16.1'
 }

From 1a754757ebc0d580e04a2ffdc504ed53a2a1e953 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:25:41 +0100
Subject: [PATCH 0705/4969] Bump assertj-core from 3.16.0 to 3.16.1 in
 /modules/junit-jupiter (#2700)

---
 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 5e143b3b706..485e02f6089 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.16.0'
+    testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'

From f60160993117e83eae612d3614a4bdb7fc5fda37 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:25:56 +0100
Subject: [PATCH 0706/4969] Bump assertj-core from 3.16.0 to 3.16.1 in
 /modules/kafka (#2709)

---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 17d6f4b652d..06090c5b35e 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.5.0'
-    testCompile 'org.assertj:assertj-core:3.16.0'
+    testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile 'com.google.guava:guava:23.0'
 }

From 948e58dca8ab80e60251f2e7065fc2e3d05a4513 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:26:11 +0100
Subject: [PATCH 0707/4969] Bump HikariCP from 3.4.3 to 3.4.5 in /modules/spock
 (#2699)

---
 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 7b1780391b5..fea1c8baa2d 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
 
-    testCompile 'com.zaxxer:HikariCP:3.4.3'
+    testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
     testRuntime 'org.postgresql:postgresql:42.2.12'

From 7b3a45d1b2f607ba921f3523a9a0e1745768509d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 14 May 2020 10:24:13 +0100
Subject: [PATCH 0708/4969] Reduce dependabot bump frequency

---
 .dependabot/config.yml | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index 7fe8921a36b..bf80d72ab92 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -3,150 +3,150 @@ version: 1
 update_configs:
   - package_manager: "java:gradle"
     directory: "/core"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
 # Explicit entry for each module
   - package_manager: "java:gradle"
     directory: "/modules/cassandra"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/clickhouse"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/couchbase"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/database-commons"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/dynalite"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/elasticsearch"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/influxdb"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/jdbc"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/jdbc-test"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/junit-jupiter"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/kafka"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/localstack"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/mariadb"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/mockserver"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/mssqlserver"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/mysql"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/neo4j"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/nginx"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/oracle-xe"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/postgresql"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/pulsar"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/selenium"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/spock"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
   - package_manager: "java:gradle"
     directory: "/modules/vault"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }
@@ -154,7 +154,7 @@ update_configs:
 # Examples
   - package_manager: "java:gradle"
     directory: "/examples"
-    update_schedule: "daily"
+    update_schedule: "weekly"
     automerged_updates:
       - match: { dependency_type: "development", update_type: "semver:minor" }
       - match: { dependency_type: "production", update_type: "semver:minor" }

From 64fc34a10e0bab2b1675b3878e52be72d6c65451 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:26:39 +0100
Subject: [PATCH 0709/4969] Bump assertj-core from 3.16.0 to 3.16.1 in
 /modules/pulsar (#2696)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index ecfa7c5f26a..74626006ba0 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.1'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.0'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.1'
 }

From 279b5b25438e07856d437d4650cc0ec37b8b72de Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:26:45 +0100
Subject: [PATCH 0710/4969] Bump assertj-core from 3.16.0 to 3.16.1 in
 /modules/vault (#2695)

---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index b8681be150d..2b9f702f9d9 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.0'
-    testCompile 'org.assertj:assertj-core:3.16.0'
+    testCompile 'org.assertj:assertj-core:3.16.1'
 
 }

From 82be21d7272f4e25adbd14db281f5a63e5c35489 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:27:12 +0100
Subject: [PATCH 0711/4969] Bump assertj-core from 3.16.0 to 3.16.1 in
 /modules/database-commons (#2703)

---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 14dffc649ac..82e318e5017 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.16.0'
+    testCompile 'org.assertj:assertj-core:3.16.1'
 }

From 024d33261ed4c4337b4b6319a991d59e2401140f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:27:25 +0100
Subject: [PATCH 0712/4969] Bump s3 from 2.13.12 to 2.13.16 in
 /modules/localstack (#2729)

---
 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 874e5fe54df..566eb403468 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.778'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
-    testCompile 'software.amazon.awssdk:s3:2.13.12'
+    testCompile 'software.amazon.awssdk:s3:2.13.16'
 }

From 1cefa4b9255d13a0ef20c1cec96d127e3b8d7dcd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:27:37 +0100
Subject: [PATCH 0713/4969] Bump aws-java-sdk-sqs from 1.11.778 to 1.11.782 in
 /modules/localstack (#2732)

---
 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 566eb403468..44b732d4c60 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.778'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.775'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.778'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.782'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
     testCompile 'software.amazon.awssdk:s3:2.13.16'

From 1a9e55457ab0f9b8ec5b5b3f8b27428d307118ac Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:29:43 +0100
Subject: [PATCH 0714/4969] Bump auto-service from 1.0-rc6 to 1.0-rc7 in
 /modules/mssqlserver (#2734)

---
 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 4a496e9eb35..055548d4182 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: MS SQL Server"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
     compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
 
     compile project(':jdbc')

From 4ef332644a08ee57b3e01c57d275da3a33cec31b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:30:07 +0100
Subject: [PATCH 0715/4969] Bump auto-service from 1.0-rc6 to 1.0-rc7 in
 /modules/postgresql (#2735)

---
 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 9893ec28bd1..8c07465d424 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
     compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
 
     compile project(':jdbc')

From c40d56e4d44cfe4f5d0e0487a2f4b4627d9f6454 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:30:16 +0100
Subject: [PATCH 0716/4969] Bump auto-service from 1.0-rc6 to 1.0-rc7 in
 /modules/mysql (#2736)

---
 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 2ee2d62ce59..d41609ac6aa 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
     compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
 
     compile project(':jdbc')

From 44ab8134b286febe8a40f979372b550fd40dd9d1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:30:31 +0100
Subject: [PATCH 0717/4969] Bump auto-service from 1.0-rc6 to 1.0-rc7 in
 /modules/mariadb (#2739)

---
 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 226e34aae90..fe8788cb06b 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
     compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
 
     compile project(':jdbc')

From 3f7c0ed2916cc103051fdcb713d1dabf96da3a16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:32:40 +0100
Subject: [PATCH 0718/4969] Bump java-client from 2.7.14 to 2.7.15 in
 /modules/couchbase (#2701)

---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 9dd0856fd51..9cb778fd479 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'com.couchbase.client:java-client:2.7.14'
+    testCompile 'com.couchbase.client:java-client:2.7.15'
 }

From c4e2e3184afdef0b265e16498b83c520a1cfb31a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:33:06 +0100
Subject: [PATCH 0719/4969] Bump tomcat-jdbc from 9.0.34 to 9.0.35 in
 /modules/mysql (#2713)

---
 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 d41609ac6aa..04648e35f94 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.20'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.34'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 

From e508b542f6d54adad17bf104ac0e34afd8ccc7f3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 10:33:40 +0100
Subject: [PATCH 0720/4969] Bump transport from 6.7.1 to 7.7.0 in
 /modules/elasticsearch (#2737)

---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 6deaf802112..959d17e3d02 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.2"
-    testCompile "org.elasticsearch.client:transport:6.7.1"
+    testCompile "org.elasticsearch.client:transport:7.7.0"
 }

From 79d89ce75c300d26904a75f84430a118ab36d69b Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 14 May 2020 10:42:33 +0100
Subject: [PATCH 0721/4969] Revert "Bump transport from 6.7.1 to 7.7.0 in
 /modules/elasticsearch" (#2740)

---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 959d17e3d02..6deaf802112 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.2"
-    testCompile "org.elasticsearch.client:transport:7.7.0"
+    testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 2f8bbdd57287bcf0409b02cf85f0343a05f52e68 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 11:05:41 +0100
Subject: [PATCH 0722/4969] Bump assertj-core from 3.16.0 to 3.16.1 in /core
 (#2706)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 312298bf77d..4c62a2416ef 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -165,7 +165,7 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.16.0'
+    testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"

From c18a203e3bf06872c0f73a2743bb2c4da0a72023 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 14 May 2020 11:37:08 +0100
Subject: [PATCH 0723/4969] Split JDBC tests (#2556)

---
 modules/clickhouse/build.gradle               |  3 +
 .../clickhouse/ClickhouseJDBCDriverTest.java  | 21 ++++
 .../clickhouse/SimpleClickhouseTest.java      | 25 +++++
 modules/cockroachdb/build.gradle              |  3 +
 .../CockroachDBJDBCDriverTest.java            | 21 ++++
 .../cockroachdb}/SimpleCockroachDBTest.java   |  3 +-
 .../resources/somepath/init_postgresql.sql    |  0
 modules/db2/build.gradle                      |  3 +
 .../jdbc/db2/DB2JDBCDriverTest.java           | 21 ++++
 .../junit/db2/SimpleDb2Test.java              | 27 ++++++
 .../container-license-acceptance.txt          |  1 +
 modules/jdbc-test/build.gradle                | 46 ++++-----
 .../db}/AbstractContainerDatabaseTest.java    | 23 +----
 .../jdbc/AbstractJDBCDriverTest.java}         | 42 +-------
 .../{test => main}/resources/logback-test.xml |  0
 .../junit/CustomizableMSSQLServerTest.java    | 44 ---------
 .../junit/CustomizableMysqlTest.java          | 47 ---------
 .../junit/CustomizablePostgreSQLTest.java     | 48 ----------
 .../junit/EmptyPasswordMysqlTest.java         | 46 ---------
 .../junit/SimpleClickhouseTest.java           | 25 -----
 .../testcontainers/junit/SimpleDb2Test.java   | 41 --------
 .../junit/SimpleMSSQLServerTest.java          | 47 ---------
 .../container-license-acceptance.txt          |  2 -
 modules/jdbc/build.gradle                     |  7 ++
 .../jupiter/inheritance/InheritedTests.java   |  1 -
 modules/mariadb/build.gradle                  |  5 +-
 .../jdbc/mariadb/MariaDBJDBCDriverTest.java   | 29 ++++++
 .../junit/mariadb}/SimpleMariaDBTest.java     | 42 +++-----
 .../test/resources/somepath/init_mariadb.sql  |  0
 .../somepath/init_unicode_mariadb.sql}        |  0
 .../somepath/mariadb_conf_override/my.cnf     |  0
 modules/mssqlserver/build.gradle              |  3 +
 .../MSSQLServerJDBCDriverTest.java            | 21 ++++
 .../CustomPasswordMSSQLServerTest.java        |  4 +-
 .../CustomizableMSSQLServerTest.java          | 28 ++++++
 .../mssqlserver/SimpleMSSQLServerTest.java    | 47 +++++++++
 modules/mysql/build.gradle                    |  5 +-
 modules/mysql/sql/init_mysql.sql              |  5 +
 .../jdbc/mysql}/JDBCDriverWithPoolTest.java   | 36 ++++---
 .../jdbc/mysql/MySQLJDBCDriverTest.java       | 30 ++++++
 .../junit/mysql/CustomizableMysqlTest.java    | 34 +++++++
 .../junit/mysql}/MultiVersionMySQLTest.java   |  9 +-
 .../junit/mysql}/SimpleMySQLTest.java         | 96 ++++++++++---------
 .../test/resources/somepath/init_mysql.sql    |  0
 .../resources/somepath/init_unicode_mysql.sql |  5 +
 .../somepath/mysql_conf_override/my.cnf       |  0
 modules/oracle-xe/build.gradle                |  3 +-
 .../{ => jdbc}/OracleJDBCDriverTest.java      |  2 +-
 .../junit/oracle}/SimpleOracleTest.java       | 19 ++--
 modules/postgresql/build.gradle               |  5 +-
 .../PostgreSQLConnectionURLTest.java          | 10 +-
 .../jdbc/DatabaseDriverShutdownTest.java      |  5 +-
 .../jdbc/DatabaseDriverTmpfsTest.java         |  6 ++
 .../jdbc/postgis/PostgisJDBCDriverTest.java   | 22 +++++
 .../postgresql/PostgreSQLJDBCDriverTest.java  | 21 ++++
 .../CustomizablePostgreSQLTest.java           | 35 +++++++
 .../postgresql}/SimplePostgreSQLTest.java     | 11 ++-
 .../resources/somepath/init_postgresql.sql    |  5 +
 modules/presto/build.gradle                   |  4 +-
 .../jdbc/presto/PrestoJDBCDriverTest.java     | 21 ++++
 test-support/build.gradle                     |  2 +-
 61 files changed, 596 insertions(+), 521 deletions(-)
 create mode 100644 modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
 create mode 100644 modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
 create mode 100644 modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
 rename modules/{jdbc-test/src/test/java/org/testcontainers/junit => cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb}/SimpleCockroachDBTest.java (93%)
 rename modules/{jdbc-test => cockroachdb}/src/test/resources/somepath/init_postgresql.sql (100%)
 create mode 100644 modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
 create mode 100644 modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
 create mode 100644 modules/db2/src/test/resources/container-license-acceptance.txt
 rename modules/jdbc-test/src/{test/java/org/testcontainers/junit => main/java/org/testcontainers/db}/AbstractContainerDatabaseTest.java (55%)
 rename modules/jdbc-test/src/{test/java/org/testcontainers/jdbc/JDBCDriverTest.java => main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java} (63%)
 rename modules/jdbc-test/src/{test => main}/resources/logback-test.xml (100%)
 delete mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMSSQLServerTest.java
 delete mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMysqlTest.java
 delete mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizablePostgreSQLTest.java
 delete mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/EmptyPasswordMysqlTest.java
 delete mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java
 delete mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
 delete mode 100644 modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java
 delete mode 100644 modules/jdbc-test/src/test/resources/container-license-acceptance.txt
 create mode 100644 modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
 rename modules/{jdbc-test/src/test/java/org/testcontainers/junit => mariadb/src/test/java/org/testcontainers/junit/mariadb}/SimpleMariaDBTest.java (70%)
 rename modules/{jdbc-test => mariadb}/src/test/resources/somepath/init_mariadb.sql (100%)
 rename modules/{jdbc-test/src/test/resources/somepath/init_unicode_mysql.sql => mariadb/src/test/resources/somepath/init_unicode_mariadb.sql} (100%)
 rename modules/{jdbc-test => mariadb}/src/test/resources/somepath/mariadb_conf_override/my.cnf (100%)
 create mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
 rename modules/{jdbc-test/src/test/java/org/testcontainers/junit => mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver}/CustomPasswordMSSQLServerTest.java (95%)
 create mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
 create mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
 create mode 100644 modules/mysql/sql/init_mysql.sql
 rename modules/{jdbc-test/src/test/java/org/testcontainers/jdbc => mysql/src/test/java/org/testcontainers/jdbc/mysql}/JDBCDriverWithPoolTest.java (78%)
 create mode 100644 modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
 create mode 100644 modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
 rename modules/{jdbc-test/src/test/java/org/testcontainers/junit => mysql/src/test/java/org/testcontainers/junit/mysql}/MultiVersionMySQLTest.java (76%)
 rename modules/{jdbc-test/src/test/java/org/testcontainers/junit => mysql/src/test/java/org/testcontainers/junit/mysql}/SimpleMySQLTest.java (58%)
 rename modules/{jdbc-test => mysql}/src/test/resources/somepath/init_mysql.sql (100%)
 create mode 100644 modules/mysql/src/test/resources/somepath/init_unicode_mysql.sql
 rename modules/{jdbc-test => mysql}/src/test/resources/somepath/mysql_conf_override/my.cnf (100%)
 rename modules/oracle-xe/src/test/java/org/testcontainers/containers/{ => jdbc}/OracleJDBCDriverTest.java (97%)
 rename modules/{jdbc-test/src/test/java/org/testcontainers/junit => oracle-xe/src/test/java/org/testcontainers/junit/oracle}/SimpleOracleTest.java (50%)
 rename modules/{jdbc-test => postgresql}/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java (76%)
 rename modules/{jdbc-test => postgresql}/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java (71%)
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
 rename modules/{jdbc-test/src/test/java/org/testcontainers/junit => postgresql/src/test/java/org/testcontainers/junit/postgresql}/SimplePostgreSQLTest.java (78%)
 create mode 100644 modules/postgresql/src/test/resources/somepath/init_postgresql.sql
 create mode 100644 modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 4f0e1a1fd90..323475b1d1c 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -3,4 +3,7 @@ description = "Testcontainers :: JDBC :: ClickHouse"
 dependencies {
     compile project(':testcontainers')
     compile project(':jdbc')
+
+    testCompile project(':jdbc-test')
+    testCompile 'ru.yandex.clickhouse:clickhouse-jdbc:0.2.4'
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java b/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
new file mode 100644
index 00000000000..f3946c8a317
--- /dev/null
+++ b/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.clickhouse;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class ClickhouseJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken)},
+            });
+    }
+}
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
new file mode 100644
index 00000000000..2dbce0b3593
--- /dev/null
+++ b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -0,0 +1,25 @@
+package org.testcontainers.junit.clickhouse;
+
+import org.junit.Test;
+import org.testcontainers.containers.ClickHouseContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer()) {
+            clickhouse.start();
+
+            ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+}
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index e52f9f3729c..a3927258679 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -2,4 +2,7 @@ description = "Testcontainers :: JDBC :: CockroachDB"
 
 dependencies {
     compile project(':jdbc')
+
+    testCompile project(':jdbc-test')
+    testCompile 'org.postgresql:postgresql:42.2.12'
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
new file mode 100644
index 00000000000..75b1fadb47e
--- /dev/null
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.cockroachdb;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class)},
+            });
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
similarity index 93%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java
rename to modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index c21a5ddfaf1..7c62b2f6bcf 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -1,7 +1,8 @@
-package org.testcontainers.junit;
+package org.testcontainers.junit.cockroachdb;
 
 import org.junit.Test;
 import org.testcontainers.containers.CockroachContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/modules/jdbc-test/src/test/resources/somepath/init_postgresql.sql b/modules/cockroachdb/src/test/resources/somepath/init_postgresql.sql
similarity index 100%
rename from modules/jdbc-test/src/test/resources/somepath/init_postgresql.sql
rename to modules/cockroachdb/src/test/resources/somepath/init_postgresql.sql
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index a92631df264..feaf5f790c5 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -2,4 +2,7 @@ description = "Testcontainers :: JDBC :: DB2"
 
 dependencies {
     compile project(':jdbc')
+
+    testCompile project(':jdbc-test')
+    testCompile 'com.ibm.db2:jcc:11.5.0.0'
 }
diff --git a/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
new file mode 100644
index 00000000000..2c87a4a1a65
--- /dev/null
+++ b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.db2;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class DB2JDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)}
+            });
+    }
+}
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
new file mode 100644
index 00000000000..08f427cf12b
--- /dev/null
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -0,0 +1,27 @@
+package org.testcontainers.junit.db2;
+
+import org.junit.Test;
+import org.testcontainers.containers.Db2Container;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class SimpleDb2Test extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (Db2Container db2 = new Db2Container()
+            .acceptLicense()) {
+
+            db2.start();
+
+            ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+}
diff --git a/modules/db2/src/test/resources/container-license-acceptance.txt b/modules/db2/src/test/resources/container-license-acceptance.txt
new file mode 100644
index 00000000000..c4ad0a38410
--- /dev/null
+++ b/modules/db2/src/test/resources/container-license-acceptance.txt
@@ -0,0 +1 @@
+ibmcom/db2:11.5.0.0a
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index c7c909782bb..8b36f126b86 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,35 +1,21 @@
-repositories {
-    maven {
-        url "https://maven.atlassian.com/3rdparty/"
-    }
-}
-
 dependencies {
-    compile project(':mysql')
-    compile project(':postgresql')
-    compile project(':presto')
-    compile project(':cockroachdb')
-    compile project(':mariadb')
-    compile project(':oracle-xe')
-    compile project(':mssqlserver')
-    compile project(':clickhouse')
-    compile project(':db2')
+    compile project(':jdbc')
+    compile project(':test-support')
 
-    testCompile 'com.google.guava:guava:18.0'
-    testCompile 'org.postgresql:postgresql:42.0.0'
-    testCompile 'io.prestosql:presto-jdbc:329'
-    testCompile 'mysql:mysql-connector-java:8.0.14'
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:1.4.6'
-    testCompile 'com.oracle:ojdbc6:12.1.0.1-atlassian-hosted'
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8'
-    testCompile 'ru.yandex.clickhouse:clickhouse-jdbc:0.1.41'
-    testCompile 'com.ibm.db2:jcc:11.1.4.4'
+    compile 'com.google.guava:guava:28.2-jre'
+    compile 'org.apache.commons:commons-lang3:3.10'
+    compile 'com.zaxxer:HikariCP-java6:2.3.13'
+    compile 'commons-dbutils:commons-dbutils:1.7'
 
-    testCompile 'com.zaxxer:HikariCP-java6:2.3.8'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:8.5.4'
-    testCompile 'org.vibur:vibur-dbcp:9.0'
-    testCompile 'commons-dbutils:commons-dbutils:1.6'
+    compile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
+
+    compile('org.rnorth.visible-assertions:visible-assertions:2.1.2') {
+        // Excluded in favor of jna-platform
+        exclude(group: "net.java.dev.jna", module: "jna")
+    }
 
-    testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
-    testCompile project(':test-support')
+    compile 'commons-dbutils:commons-dbutils:1.7'
+    compile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
+    compile 'org.vibur:vibur-dbcp:25.0'
+    compile 'mysql:mysql-connector-java:8.0.19'
 }
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
similarity index 55%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
rename to modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
index 7230759382d..8881ed963d8 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/AbstractContainerDatabaseTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
@@ -1,22 +1,17 @@
-package org.testcontainers.junit;
+package org.testcontainers.db;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
-import org.junit.After;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.HashSet;
-import java.util.Set;
 
-abstract class AbstractContainerDatabaseTest {
+public abstract class AbstractContainerDatabaseTest {
 
-    private final Set<HikariDataSource> datasourcesForCleanup = new HashSet<>();
-
-    ResultSet performQuery(JdbcDatabaseContainer container, String sql) throws SQLException {
+    protected ResultSet performQuery(JdbcDatabaseContainer<?> container, String sql) throws SQLException {
         DataSource ds = getDataSource(container);
         Statement statement = ds.getConnection().createStatement();
         statement.execute(sql);
@@ -26,21 +21,13 @@ ResultSet performQuery(JdbcDatabaseContainer container, String sql) throws SQLEx
         return resultSet;
     }
 
-    DataSource getDataSource(JdbcDatabaseContainer container) {
+    protected DataSource getDataSource(JdbcDatabaseContainer<?> container) {
         HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setJdbcUrl(container.getJdbcUrl());
         hikariConfig.setUsername(container.getUsername());
         hikariConfig.setPassword(container.getPassword());
         hikariConfig.setDriverClassName(container.getDriverClassName());
 
-        final HikariDataSource dataSource = new HikariDataSource(hikariConfig);
-        datasourcesForCleanup.add(dataSource);
-
-        return dataSource;
-    }
-
-    @After
-    public void teardown() {
-        datasourcesForCleanup.forEach(HikariDataSource::close);
+        return new HikariDataSource(hikariConfig);
     }
 }
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
similarity index 63%
rename from modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
rename to modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index c96ce251a63..38ca2237567 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -6,8 +6,6 @@
 import org.apache.commons.lang.SystemUtils;
 import org.junit.AfterClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 
 import java.sql.Connection;
@@ -16,15 +14,13 @@
 import java.sql.Statement;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
-@RunWith(Parameterized.class)
-public class JDBCDriverTest {
+public class AbstractJDBCDriverTest {
 
-    private enum Options {
+    protected enum Options {
         ScriptedSchema,
         CharacterSet,
         CustomIniFile,
@@ -37,40 +33,6 @@ private enum Options {
     @Parameter(1)
     public EnumSet<Options> options;
 
-    @Parameterized.Parameters(name = "{index} - {0}")
-    public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:mysql://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mysql://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:postgresql:9.6.8://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-                {"jdbc:tc:postgis://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-                {"jdbc:tc:postgis:9.6://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-                {"jdbc:tc:presto:329://hostname/", EnumSet.of(Options.PmdKnownBroken)},
-                {"jdbc:tc:mysql:5.6://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", EnumSet.of(Options.CustomIniFile)},
-                {"jdbc:tc:mariadb://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mariadb://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override", EnumSet.of(Options.CustomIniFile)},
-                {"jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken)},
-                {"jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class)},
-//                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)}
-            });
-    }
-
     public static void sampleInitFunction(Connection connection) throws SQLException {
         connection.createStatement().execute("CREATE TABLE bar (\n" +
             "  foo VARCHAR(255)\n" +
diff --git a/modules/jdbc-test/src/test/resources/logback-test.xml b/modules/jdbc-test/src/main/resources/logback-test.xml
similarity index 100%
rename from modules/jdbc-test/src/test/resources/logback-test.xml
rename to modules/jdbc-test/src/main/resources/logback-test.xml
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMSSQLServerTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMSSQLServerTest.java
deleted file mode 100644
index 2f6e43a771f..00000000000
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMSSQLServerTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.testcontainers.junit;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.MSSQLServerContainer;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.fail;
-
-public class CustomizableMSSQLServerTest {
-
-    private static final String STRONG_PASSWORD = "myStrong(!)Password";
-
-    @Rule
-    public MSSQLServerContainer mssqlServerContainer = new MSSQLServerContainer()
-        .withPassword(STRONG_PASSWORD);
-
-    @Test
-    public void testSqlServerConnection() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl("jdbc:sqlserver://localhost:" +
-            mssqlServerContainer.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT));
-        hikariConfig.setUsername("SA");
-        hikariConfig.setPassword(STRONG_PASSWORD);
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute(mssqlServerContainer.getTestQueryString());
-        ResultSet resultSet = statement.getResultSet();
-        if (resultSet.next()) {
-            int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-        } else {
-            fail("No results returned from query");
-        }
-
-    }
-}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMysqlTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMysqlTest.java
deleted file mode 100644
index 11ad8f111ee..00000000000
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizableMysqlTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.testcontainers.junit;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.MySQLContainer;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-public class CustomizableMysqlTest {
-    private static final String DB_NAME = "foo";
-    private static final String USER = "bar";
-    private static final String PWD = "baz";
-
-    // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-    @Rule
-    public MySQLContainer mysql = (MySQLContainer) new MySQLContainer("mysql:5.5")
-            .withDatabaseName(DB_NAME)
-            .withUsername(USER)
-            .withPassword(PWD)
-            .withEnv("MYSQL_ROOT_HOST", "%");
-
-    @Test
-    public void testSimple() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl("jdbc:mysql://"
-                + mysql.getContainerIpAddress()
-                + ":" + mysql.getMappedPort(MySQLContainer.MYSQL_PORT)
-                + "/" + DB_NAME);
-        hikariConfig.setUsername(USER);
-        hikariConfig.setPassword(PWD);
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute("SELECT 1");
-        ResultSet resultSet = statement.getResultSet();
-
-        assertEquals("There is a result", resultSet.next(), true);
-        int resultSetInt = resultSet.getInt(1);
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-    }
-}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizablePostgreSQLTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizablePostgreSQLTest.java
deleted file mode 100644
index ef1c7b212db..00000000000
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomizablePostgreSQLTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.testcontainers.junit;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.PostgreSQLContainer;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-/**
- * @author richardnorth
- */
-public class CustomizablePostgreSQLTest {
-    private static final String DB_NAME = "foo";
-    private static final String USER = "bar";
-    private static final String PWD = "baz";
-
-    @Rule
-    public PostgreSQLContainer postgres = new PostgreSQLContainer("postgres:9.6.8")
-        .withDatabaseName(DB_NAME)
-        .withUsername(USER)
-        .withPassword(PWD);
-
-    @Test
-    public void testSimple() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl("jdbc:postgresql://"
-            + postgres.getContainerIpAddress()
-            + ":" + postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT)
-            + "/" + DB_NAME);
-        hikariConfig.setUsername(USER);
-        hikariConfig.setPassword(PWD);
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute("SELECT 1");
-        ResultSet resultSet = statement.getResultSet();
-
-        resultSet.next();
-        int resultSetInt = resultSet.getInt(1);
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-    }
-}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/EmptyPasswordMysqlTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/EmptyPasswordMysqlTest.java
deleted file mode 100644
index 0dfc3149ef5..00000000000
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/EmptyPasswordMysqlTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.testcontainers.junit;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.MySQLContainer;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-public class EmptyPasswordMysqlTest {
-    private static final String DB_NAME = "foo";
-    private static final String USER = "root"; // MySQL allows empty password with root only
-
-    // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-    @Rule
-    public MySQLContainer mysql = (MySQLContainer) new MySQLContainer("mysql:5.5")
-            .withDatabaseName(DB_NAME)
-            .withUsername(USER)
-            .withPassword("")
-            .withEnv("MYSQL_ROOT_HOST", "%");
-
-    @Test
-    public void testSimple() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl("jdbc:mysql://"
-                + mysql.getContainerIpAddress()
-                + ":" + mysql.getMappedPort(MySQLContainer.MYSQL_PORT)
-                + "/" + DB_NAME);
-        hikariConfig.setUsername(USER);
-        hikariConfig.setPassword("");
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute("SELECT 1");
-        ResultSet resultSet = statement.getResultSet();
-
-        assertEquals("There is a result", resultSet.next(), true);
-        int resultSetInt = resultSet.getInt(1);
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-    }
-}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java
deleted file mode 100644
index b765208e212..00000000000
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleClickhouseTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.testcontainers.junit;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.ClickHouseContainer;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
-
-    @Rule
-    public ClickHouseContainer clickhouse = new ClickHouseContainer();
-
-    @Test
-    public void testSimple() throws SQLException {
-        ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
-
-        resultSet.next();
-        int resultSetInt = resultSet.getInt(1);
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-    }
-}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
deleted file mode 100644
index 60ad9a23a27..00000000000
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleDb2Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.testcontainers.junit;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.Db2Container;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-
-@Ignore("Disabled since we had problems with CI disk space filling up from images in jdbc-test module")
-public class SimpleDb2Test {
-
-    @Rule
-    public Db2Container db2 = new Db2Container()
-        .acceptLicense();
-
-    @Test
-    public void testSimple() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(db2.getJdbcUrl());
-        hikariConfig.setUsername(db2.getUsername());
-        hikariConfig.setPassword(db2.getPassword());
-
-        HikariDataSource ds = new HikariDataSource(hikariConfig);
-        Statement statement = ds.getConnection().createStatement();
-        statement.execute("SELECT 1 FROM SYSIBM.SYSDUMMY1");
-        ResultSet resultSet = statement.getResultSet();
-
-        resultSet.next();
-        int resultSetInt = resultSet.getInt(1);
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-    }
-
-}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java
deleted file mode 100644
index 2791efa0780..00000000000
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.testcontainers.junit;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.MSSQLServerContainer;
-
-import javax.sql.DataSource;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-/**
- * @author Stefan Hufschmidt
- */
-public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
-
-    @Rule
-    public MSSQLServerContainer mssqlServer = new MSSQLServerContainer();
-
-    @Test
-    public void testSimple() throws SQLException {
-        ResultSet resultSet = performQuery(mssqlServer, "SELECT 1");
-
-        int resultSetInt = resultSet.getInt(1);
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-    }
-
-    @Test
-    public void testSetupDatabase() throws SQLException {
-        DataSource ds = getDataSource(mssqlServer);
-        Statement statement = ds.getConnection().createStatement();
-        statement.executeUpdate("CREATE DATABASE [test];");
-        statement = ds.getConnection().createStatement();
-        statement.executeUpdate("CREATE TABLE [test].[dbo].[Foo](ID INT PRIMARY KEY);");
-        statement = ds.getConnection().createStatement();
-        statement.executeUpdate("INSERT INTO [test].[dbo].[Foo] (ID) VALUES (3);");
-        statement = ds.getConnection().createStatement();
-        statement.execute("SELECT * FROM [test].[dbo].[Foo];");
-        ResultSet resultSet = statement.getResultSet();
-
-        resultSet.next();
-        int resultSetInt = resultSet.getInt("ID");
-        assertEquals("A basic SELECT query succeeds", 3, resultSetInt);
-    }
-}
diff --git a/modules/jdbc-test/src/test/resources/container-license-acceptance.txt b/modules/jdbc-test/src/test/resources/container-license-acceptance.txt
deleted file mode 100644
index 4af979f0f18..00000000000
--- a/modules/jdbc-test/src/test/resources/container-license-acceptance.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-mcr.microsoft.com/mssql/server:2017-CU12
-ibmcom/db2:11.5.0.0a
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2278b14006d..aa21939c769 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -2,4 +2,11 @@ description = "Testcontainers :: JDBC"
 
 dependencies {
     compile project(':database-commons')
+    testCompile project(':test-support')
+
+    testCompile 'commons-dbutils:commons-dbutils:1.7'
+    testCompile 'org.vibur:vibur-dbcp:25.0'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
+    testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
+    testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
index f050e428692..720c31cf794 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index fe8788cb06b..71f2417f2ad 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -9,11 +9,8 @@ dependencies {
     compileOnly project(':r2dbc')
     compileOnly 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1'
 
+    testCompile project(':jdbc-test')
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'
-    testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
-    testCompile 'org.vibur:vibur-dbcp:25.0'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1'
diff --git a/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
new file mode 100644
index 00000000000..ef1dfef2703
--- /dev/null
+++ b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
@@ -0,0 +1,29 @@
+package org.testcontainers.jdbc.mariadb;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class MariaDBJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:mariadb://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:mariadb://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mariadb:10.2.14://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mariadb.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
+                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override", EnumSet.of(Options.CustomIniFile)},
+            });
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
similarity index 70%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java
rename to modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 21badefb9fb..646fbb40947 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -1,8 +1,9 @@
-package org.testcontainers.junit;
+package org.testcontainers.junit.mariadb;
 
 import org.apache.commons.lang.SystemUtils;
 import org.junit.Test;
 import org.testcontainers.containers.MariaDBContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -12,72 +13,59 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 
-/**
- * @author Miguel Gonzalez Sanchez
- */
 public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        MariaDBContainer mariadb = new MariaDBContainer();
-        mariadb.start();
+        try (MariaDBContainer<?> mariadb = new MariaDBContainer<>()) {
+
+            mariadb.start();
 
-        try {
             ResultSet resultSet = performQuery(mariadb, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
 
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-        } finally {
-            mariadb.stop();
         }
     }
 
     @Test
     public void testSpecificVersion() throws SQLException {
-        MariaDBContainer mariadbOldVersion = new MariaDBContainer("mariadb:5.5.51");
-        mariadbOldVersion.start();
+        try (MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>("mariadb:5.5.51")) {
+
+            mariadbOldVersion.start();
 
-        try {
             ResultSet resultSet = performQuery(mariadbOldVersion, "SELECT VERSION()");
             String resultSetString = resultSet.getString(1);
 
             assertTrue("The database version can be set using a container rule parameter", resultSetString.startsWith("5.5.51"));
-        } finally {
-            mariadbOldVersion.stop();
         }
     }
 
     @Test
     public void testMariaDBWithCustomIniFile() throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
-        MariaDBContainer mariadbCustomConfig = new MariaDBContainer("mariadb:10.1.16")
-            .withConfigurationOverride("somepath/mariadb_conf_override");
-        mariadbCustomConfig.start();
 
-        try {
+        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>("mariadb:10.1.16")
+            .withConfigurationOverride("somepath/mariadb_conf_override")) {
+            mariadbCustomConfig.start();
+
             ResultSet resultSet = performQuery(mariadbCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
             String result = resultSet.getString(1);
 
             assertEquals("The InnoDB file format has been set by the ini file content", "Barracuda", result);
-        } finally {
-            mariadbCustomConfig.stop();
         }
     }
 
     @Test
     public void testMariaDBWithCommandOverride() throws SQLException {
 
-        MariaDBContainer mariadbCustomConfig = (MariaDBContainer) new MariaDBContainer("mariadb:10.1.16")
-            .withCommand("mysqld --auto_increment_increment=10");
-        mariadbCustomConfig.start();
-
-        try {
+        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>("mariadb:10.1.16")
+            .withCommand("mysqld --auto_increment_increment=10")) {
+            mariadbCustomConfig.start();
             ResultSet resultSet = performQuery(mariadbCustomConfig, "show variables like 'auto_increment_increment'");
             String result = resultSet.getString("Value");
 
             assertEquals("Auto increment increment should be overriden by command line", "10", result);
-        } finally {
-            mariadbCustomConfig.stop();
         }
     }
 }
diff --git a/modules/jdbc-test/src/test/resources/somepath/init_mariadb.sql b/modules/mariadb/src/test/resources/somepath/init_mariadb.sql
similarity index 100%
rename from modules/jdbc-test/src/test/resources/somepath/init_mariadb.sql
rename to modules/mariadb/src/test/resources/somepath/init_mariadb.sql
diff --git a/modules/jdbc-test/src/test/resources/somepath/init_unicode_mysql.sql b/modules/mariadb/src/test/resources/somepath/init_unicode_mariadb.sql
similarity index 100%
rename from modules/jdbc-test/src/test/resources/somepath/init_unicode_mysql.sql
rename to modules/mariadb/src/test/resources/somepath/init_unicode_mariadb.sql
diff --git a/modules/jdbc-test/src/test/resources/somepath/mariadb_conf_override/my.cnf b/modules/mariadb/src/test/resources/somepath/mariadb_conf_override/my.cnf
similarity index 100%
rename from modules/jdbc-test/src/test/resources/somepath/mariadb_conf_override/my.cnf
rename to modules/mariadb/src/test/resources/somepath/mariadb_conf_override/my.cnf
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 055548d4182..c21bc43c869 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -9,6 +9,9 @@ dependencies {
     compileOnly project(':r2dbc')
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.2.RELEASE'
 
+    testCompile project(':jdbc-test')
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8'
+
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.1.RELEASE'
 
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
new file mode 100644
index 00000000000..00e22199b46
--- /dev/null
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.mssqlserver;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class MSSQLServerJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename", EnumSet.noneOf(Options.class)},
+            });
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
similarity index 95%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomPasswordMSSQLServerTest.java
rename to modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
index 2f77dad44fc..0e1ea05b31d 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.junit;
+package org.testcontainers.junit.mssqlserver;
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Test;
@@ -66,7 +66,7 @@ public static Collection<Object[]> data() {
     @Test
     public void runPasswordTests() {
         try {
-            new MSSQLServerContainer().withPassword(this.password);
+            new MSSQLServerContainer<>().withPassword(this.password);
             if (!valid)
                 fail("Password " + this.password + " is not valid. Expected exception");
         } catch (IllegalArgumentException e) {
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
new file mode 100644
index 00000000000..ecbc4e31714
--- /dev/null
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
@@ -0,0 +1,28 @@
+package org.testcontainers.junit.mssqlserver;
+
+import org.junit.Test;
+import org.testcontainers.containers.MSSQLServerContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
+
+    private static final String STRONG_PASSWORD = "myStrong(!)Password";
+
+    @Test
+    public void testSqlServerConnection() throws SQLException {
+        try (MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>()
+            .withPassword(STRONG_PASSWORD)) {
+
+            mssqlServerContainer.start();
+
+            ResultSet resultSet = performQuery(mssqlServerContainer, mssqlServerContainer.getTestQueryString());
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
new file mode 100644
index 00000000000..c1699d2473a
--- /dev/null
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -0,0 +1,47 @@
+package org.testcontainers.junit.mssqlserver;
+
+import org.junit.Test;
+import org.testcontainers.containers.MSSQLServerContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()) {
+            mssqlServer.start();
+            ResultSet resultSet = performQuery(mssqlServer, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+
+    @Test
+    public void testSetupDatabase() throws SQLException {
+        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()) {
+            mssqlServer.start();
+            DataSource ds = getDataSource(mssqlServer);
+            Statement statement = ds.getConnection().createStatement();
+            statement.executeUpdate("CREATE DATABASE [test];");
+            statement = ds.getConnection().createStatement();
+            statement.executeUpdate("CREATE TABLE [test].[dbo].[Foo](ID INT PRIMARY KEY);");
+            statement = ds.getConnection().createStatement();
+            statement.executeUpdate("INSERT INTO [test].[dbo].[Foo] (ID) VALUES (3);");
+            statement = ds.getConnection().createStatement();
+            statement.execute("SELECT * FROM [test].[dbo].[Foo];");
+            ResultSet resultSet = statement.getResultSet();
+
+            resultSet.next();
+            int resultSetInt = resultSet.getInt("ID");
+            assertEquals("A basic SELECT query succeeds", 3, resultSetInt);
+        }
+    }
+}
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 04648e35f94..c9c165cc874 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -9,11 +9,8 @@ dependencies {
     compileOnly project(':r2dbc')
     compileOnly 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
 
+    testCompile project(':jdbc-test')
     testCompile 'mysql:mysql-connector-java:8.0.20'
-    testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
-    testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.vibur:vibur-dbcp:25.0'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
diff --git a/modules/mysql/sql/init_mysql.sql b/modules/mysql/sql/init_mysql.sql
new file mode 100644
index 00000000000..2b00ee968b0
--- /dev/null
+++ b/modules/mysql/sql/init_mysql.sql
@@ -0,0 +1,5 @@
+CREATE TABLE bar (
+  foo VARCHAR(255)
+);
+
+INSERT INTO bar (foo) VALUES ('hello world');
\ No newline at end of file
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
similarity index 78%
rename from modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java
rename to modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
index 53daa1316f5..1ad77264c62 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.jdbc;
+package org.testcontainers.jdbc.mysql;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
@@ -8,6 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.ContainerDatabaseDriver;
 import org.vibur.dbcp.ViburDBCPDataSource;
 
 import javax.sql.DataSource;
@@ -22,23 +23,26 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 /**
- *
+ * This test belongs in the jdbc module, as it is focused on testing the behaviour of {@link org.testcontainers.containers.JdbcDatabaseContainer}.
+ * However, the need to use the {@link org.testcontainers.containers.MySQLContainerProvider} (due to the jdbc:tc:mysql) URL forces it to live here in
+ * the mysql module, to avoid circular dependencies.
+ * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
 @RunWith(Parameterized.class)
 public class JDBCDriverWithPoolTest {
 
-    public static final String URL = "jdbc:tc:mysql:5://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverWithPoolTest::sampleInitFunction";
+    public static final String URL = "jdbc:tc:mysql:5://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.mysql.JDBCDriverWithPoolTest::sampleInitFunction";
     private final DataSource dataSource;
 
     @Parameterized.Parameters
     public static Iterable<Supplier<DataSource>> dataSourceSuppliers() {
         return asList(
-                JDBCDriverWithPoolTest::getTomcatDataSourceWithDriverClassName,
-                JDBCDriverWithPoolTest::getTomcatDataSource,
-                JDBCDriverWithPoolTest::getHikariDataSourceWithDriverClassName,
-                JDBCDriverWithPoolTest::getHikariDataSource,
-                JDBCDriverWithPoolTest::getViburDataSourceWithDriverClassName,
-                JDBCDriverWithPoolTest::getViburDataSource
+            JDBCDriverWithPoolTest::getTomcatDataSourceWithDriverClassName,
+            JDBCDriverWithPoolTest::getTomcatDataSource,
+            JDBCDriverWithPoolTest::getHikariDataSourceWithDriverClassName,
+            JDBCDriverWithPoolTest::getHikariDataSource,
+            JDBCDriverWithPoolTest::getViburDataSourceWithDriverClassName,
+            JDBCDriverWithPoolTest::getViburDataSource
         );
     }
 
@@ -56,7 +60,7 @@ public void testMySQLWithConnectionPoolUsingSameContainer() throws SQLException,
             executorService.submit(() -> {
                 try {
                     new QueryRunner(dataSource).insert("INSERT INTO my_counter (n) VALUES (5)",
-                            (ResultSetHandler<Object>) rs -> true);
+                        (ResultSetHandler<Object>) rs -> true);
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
@@ -130,6 +134,8 @@ private static DataSource getViburDataSourceWithDriverClassName() {
         ViburDBCPDataSource ds = new ViburDBCPDataSource();
 
         ds.setJdbcUrl(URL + ";TEST=VIBUR_WITH_CLASSNAME");
+        ds.setUsername("any");  // Recent versions of Vibur require a username, even though it will not be used
+        ds.setPassword("");
         ds.setPoolInitialSize(3);
         ds.setPoolMaxSize(10);
         ds.setTestConnectionQuery("SELECT 1");
@@ -143,6 +149,8 @@ private static DataSource getViburDataSourceWithDriverClassName() {
     private static DataSource getViburDataSource() {
         ViburDBCPDataSource ds = new ViburDBCPDataSource();
         ds.setJdbcUrl(URL + ";TEST=VIBUR");
+        ds.setUsername("any");  // Recent versions of Vibur require a username, even though it will not be used
+        ds.setPassword("");
         ds.setPoolInitialSize(3);
         ds.setPoolMaxSize(10);
         ds.setTestConnectionQuery("SELECT 1");
@@ -155,11 +163,11 @@ private static DataSource getViburDataSource() {
     @SuppressWarnings("SqlNoDataSourceInspection")
     public static void sampleInitFunction(Connection connection) throws SQLException {
         connection.createStatement().execute("CREATE TABLE bar (\n" +
-                "  foo VARCHAR(255)\n" +
-                ");");
+            "  foo VARCHAR(255)\n" +
+            ");");
         connection.createStatement().execute("INSERT INTO bar (foo) VALUES ('hello world');");
         connection.createStatement().execute("CREATE TABLE my_counter (\n" +
-                "  n INT\n" +
-                ");");
+            "  n INT\n" +
+            ");");
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
new file mode 100644
index 00000000000..d4b37b291d5
--- /dev/null
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
@@ -0,0 +1,30 @@
+package org.testcontainers.jdbc.mysql;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class MySQLJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:mysql://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:mysql://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:mysql:5.5.43://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:mysql:5.6://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", EnumSet.of(Options.CustomIniFile)},
+            });
+    }
+}
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
new file mode 100644
index 00000000000..590d288e3fe
--- /dev/null
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
@@ -0,0 +1,34 @@
+package org.testcontainers.junit.mysql;
+
+import org.junit.Test;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
+    private static final String DB_NAME = "foo";
+    private static final String USER = "bar";
+    private static final String PWD = "baz";
+
+    @Test
+    public void testSimple() throws SQLException {
+        // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
+        try (MySQLContainer<?> mysql = new MySQLContainer<>("mysql:5.5")
+            .withDatabaseName(DB_NAME)
+            .withUsername(USER)
+            .withPassword(PWD)
+            .withEnv("MYSQL_ROOT_HOST", "%")) {
+
+            mysql.start();
+
+            ResultSet resultSet = performQuery(mysql, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
similarity index 76%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/MultiVersionMySQLTest.java
rename to modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index b685d6dad80..3c0c86ffafa 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -1,9 +1,10 @@
-package org.testcontainers.junit;
+package org.testcontainers.junit.mysql;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -26,9 +27,9 @@ public MultiVersionMySQLTest(String version) {
 
     @Test
     public void versionCheckTest() throws SQLException {
-        try (final MySQLContainer container = new MySQLContainer<>("mysql:" + version)) {
-            container.start();
-            final ResultSet resultSet = performQuery(container, "SELECT VERSION()");
+        try (MySQLContainer<?> mysql = new MySQLContainer<>("mysql:" + version)) {
+            mysql.start();
+            final ResultSet resultSet = performQuery(mysql, "SELECT VERSION()");
             final String resultSetString = resultSet.getString(1);
 
             assertEquals("The database version can be set using a container rule parameter", version, resultSetString);
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
similarity index 58%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java
rename to modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 9570659c4dc..ee6c3ab6993 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.junit;
+package org.testcontainers.junit.mysql;
 
 import org.apache.commons.lang.SystemUtils;
 import org.junit.Test;
@@ -7,6 +7,7 @@
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -17,9 +18,6 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 
-/**
- * @author richardnorth
- */
 public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(SimpleMySQLTest.class);
@@ -31,86 +29,79 @@ public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
      */
     /*
     @ClassRule
-    public static MySQLContainer mysql = new MySQLContainer();
+    public static MySQLContainer<?> mysql = new MySQLContainer<>();
 
     @ClassRule
-    public static MySQLContainer mysqlOldVersion = new MySQLContainer("mysql:5.5");
+    public static MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>("mysql:5.5");
 
     @ClassRule
-    public static MySQLContainer mysqlCustomConfig = new MySQLContainer("mysql:5.6")
+    public static MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>("mysql:5.6")
                                                             .withConfigurationOverride("somepath/mysql_conf_override");
     */
 
     @Test
     public void testSimple() throws SQLException {
-        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
-                .withConfigurationOverride("somepath/mysql_conf_override")
-                .withLogConsumer(new Slf4jLogConsumer(logger));
-        mysql.start();
+        try (MySQLContainer<?> mysql = new MySQLContainer<>()
+            .withConfigurationOverride("somepath/mysql_conf_override")
+            .withLogConsumer(new Slf4jLogConsumer(logger))) {
+
+            mysql.start();
 
-        try {
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
 
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-        } finally {
-            mysql.stop();
         }
     }
 
     @Test
     public void testSpecificVersion() throws SQLException {
-        MySQLContainer mysqlOldVersion = (MySQLContainer) new MySQLContainer("mysql:5.5")
-                .withConfigurationOverride("somepath/mysql_conf_override")
-                .withLogConsumer(new Slf4jLogConsumer(logger));
-        mysqlOldVersion.start();
+        try (MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>("mysql:5.5")
+            .withConfigurationOverride("somepath/mysql_conf_override")
+            .withLogConsumer(new Slf4jLogConsumer(logger))) {
+
+            mysqlOldVersion.start();
 
-        try {
             ResultSet resultSet = performQuery(mysqlOldVersion, "SELECT VERSION()");
             String resultSetString = resultSet.getString(1);
 
             assertTrue("The database version can be set using a container rule parameter", resultSetString.startsWith("5.5"));
-        } finally {
-            mysqlOldVersion.stop();
         }
     }
 
     @Test
     public void testMySQLWithCustomIniFile() throws SQLException {
-    	assumeFalse(SystemUtils.IS_OS_WINDOWS);
-        MySQLContainer mysqlCustomConfig = new MySQLContainer("mysql:5.6")
-                                                .withConfigurationOverride("somepath/mysql_conf_override");
-        mysqlCustomConfig.start();
+        assumeFalse(SystemUtils.IS_OS_WINDOWS);
+
+        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>("mysql:5.6")
+            .withConfigurationOverride("somepath/mysql_conf_override")) {
+
+            mysqlCustomConfig.start();
 
-        try {
             ResultSet resultSet = performQuery(mysqlCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
             String result = resultSet.getString(1);
 
             assertEquals("The InnoDB file format has been set by the ini file content", "Barracuda", result);
-        } finally {
-            mysqlCustomConfig.stop();
         }
     }
 
     @Test
     public void testCommandOverride() throws SQLException {
-        MySQLContainer mysqlCustomConfig = (MySQLContainer) new MySQLContainer().withCommand("mysqld --auto_increment_increment=42");
-        mysqlCustomConfig.start();
+        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>()
+            .withCommand("mysqld --auto_increment_increment=42")) {
+
+            mysqlCustomConfig.start();
 
-        try {
             ResultSet resultSet = performQuery(mysqlCustomConfig, "show variables like 'auto_increment_increment'");
             String result = resultSet.getString("Value");
 
             assertEquals("Auto increment increment should be overriden by command line", "42", result);
-        } finally {
-            mysqlCustomConfig.stop();
         }
-
     }
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (MySQLContainer container = (MySQLContainer) new MySQLContainer()
+        try (MySQLContainer<?> container = new MySQLContainer<>()
             .withInitScript("somepath/init_mysql.sql")
             .withLogConsumer(new Slf4jLogConsumer(logger))) {
             container.start();
@@ -120,20 +111,35 @@ public void testExplicitInitScript() throws SQLException {
 
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
-     }
+    }
 
-    @Test
+    @Test(expected = ContainerLaunchException.class)
     public void testEmptyPasswordWithNonRootUser() {
-
-        MySQLContainer container = (MySQLContainer) new MySQLContainer("mysql:5.5").withDatabaseName("TEST")
-                .withUsername("test").withPassword("").withEnv("MYSQL_ROOT_HOST", "%");
-
-        try {
+        try (MySQLContainer<?> container = new MySQLContainer<>("mysql:5.5")
+                    .withDatabaseName("TEST")
+                    .withUsername("test")
+                    .withPassword("")
+                    .withEnv("MYSQL_ROOT_HOST", "%")){
             container.start();
             fail("ContainerLaunchException expected to be thrown");
-        } catch (ContainerLaunchException e) {
-        } finally {
-            container.stop();
+        }
+    }
+
+    @Test
+    public void testEmptyPasswordWithRootUser() throws SQLException {
+        // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
+        try (MySQLContainer<?> mysql = new MySQLContainer<>("mysql:5.5")
+            .withDatabaseName("foo")
+            .withUsername("root")
+            .withPassword("")
+            .withEnv("MYSQL_ROOT_HOST", "%")) {
+
+            mysql.start();
+
+            ResultSet resultSet = performQuery(mysql, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
 }
diff --git a/modules/jdbc-test/src/test/resources/somepath/init_mysql.sql b/modules/mysql/src/test/resources/somepath/init_mysql.sql
similarity index 100%
rename from modules/jdbc-test/src/test/resources/somepath/init_mysql.sql
rename to modules/mysql/src/test/resources/somepath/init_mysql.sql
diff --git a/modules/mysql/src/test/resources/somepath/init_unicode_mysql.sql b/modules/mysql/src/test/resources/somepath/init_unicode_mysql.sql
new file mode 100644
index 00000000000..f88969b0f30
--- /dev/null
+++ b/modules/mysql/src/test/resources/somepath/init_unicode_mysql.sql
@@ -0,0 +1,5 @@
+CREATE TABLE bar (
+  foo varchar(255) character set utf8
+);
+
+INSERT INTO bar (foo) VALUES ('привет мир');
diff --git a/modules/jdbc-test/src/test/resources/somepath/mysql_conf_override/my.cnf b/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
similarity index 100%
rename from modules/jdbc-test/src/test/resources/somepath/mysql_conf_override/my.cnf
rename to modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 1ab61e997af..026521e9a0c 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -3,7 +3,6 @@ description = "Testcontainers :: JDBC :: Oracle XE"
 dependencies {
     compile project(':jdbc')
 
+    testCompile project(':jdbc-test')
     testCompile 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
-    testCompile 'com.zaxxer:HikariCP-java6:2.3.8'
-    testCompile 'commons-dbutils:commons-dbutils:1.7'
 }
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/containers/OracleJDBCDriverTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
similarity index 97%
rename from modules/oracle-xe/src/test/java/org/testcontainers/containers/OracleJDBCDriverTest.java
rename to modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
index fcc09ab69a4..fbe5ce95a05 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/containers/OracleJDBCDriverTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.containers.jdbc;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
similarity index 50%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleOracleTest.java
rename to modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 0855fd4860e..2415fed11f4 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -1,31 +1,26 @@
-package org.testcontainers.junit;
+package org.testcontainers.junit.oracle;
 
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.OracleContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
-/**
- * @author gusohal
- */
 @Ignore
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
-    @Rule
-    public OracleContainer oracle = new OracleContainer();
-
     @Test
     public void testSimple() throws SQLException {
-        ResultSet resultSet = performQuery(oracle, "SELECT 1 FROM dual");
+        try (OracleContainer oracle = new OracleContainer()) {
+            ResultSet resultSet = performQuery(oracle, "SELECT 1 FROM dual");
 
-        resultSet.next();
-        int resultSetInt = resultSet.getInt(1);
+            int resultSetInt = resultSet.getInt(1);
 
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
     }
 }
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 8c07465d424..380a3f86a80 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -5,12 +5,13 @@ dependencies {
     compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
 
     compile project(':jdbc')
+
     compileOnly project(':r2dbc')
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.2.RELEASE'
 
+    testCompile project(':jdbc-test')
+    testCompile project(':test-support')
     testCompile 'org.postgresql:postgresql:42.2.12'
-    testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index ec6a8756cab..3b887cedbec 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -11,7 +11,7 @@ public class PostgreSQLConnectionURLTest {
 
     @Test
     public void shouldCorrectlyAppendQueryString() {
-        PostgreSQLContainer postgres = new FixedJdbcUrlPostgreSQLContainer();
+        PostgreSQLContainer<?> postgres = new FixedJdbcUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
@@ -22,7 +22,7 @@ public void shouldCorrectlyAppendQueryString() {
 
     @Test
     public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
-        PostgreSQLContainer postgres = new NoParamsUrlPostgreSQLContainer();
+        PostgreSQLContainer<?> postgres = new NoParamsUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
@@ -33,7 +33,7 @@ public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
 
     @Test
     public void shouldReturnOriginalURLWhenEmptyQueryString() {
-        PostgreSQLContainer postgres = new FixedJdbcUrlPostgreSQLContainer();
+        PostgreSQLContainer<?> postgres = new FixedJdbcUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("");
 
         assertTrue("Query String remains unchanged", postgres.getJdbcUrl().equals(connectionUrl));
@@ -45,7 +45,7 @@ public void shouldRejectInvalidQueryString() {
             () -> new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified"));
     }
 
-    static class FixedJdbcUrlPostgreSQLContainer extends PostgreSQLContainer {
+    static class FixedJdbcUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
 
         @Override
         public String getContainerIpAddress() {
@@ -58,7 +58,7 @@ public Integer getMappedPort(int originalPort) {
         }
     }
 
-    static class NoParamsUrlPostgreSQLContainer extends PostgreSQLContainer {
+    static class NoParamsUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
 
         @Override
         public String getJdbcUrl() {
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
similarity index 76%
rename from modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
rename to modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
index 855658ada56..9e3e0b03413 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
@@ -13,7 +13,10 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
- * Created by inikolaev on 08/06/2017.
+ * This test belongs in the jdbc module, as it is focused on testing the behaviour of {@link org.testcontainers.containers.JdbcDatabaseContainer}.
+ * However, the need to use the {@link org.testcontainers.containers.PostgreSQLContainerProvider} (due to the jdbc:tc:postgresql) URL forces it to live here in
+ * the mysql module, to avoid circular dependencies.
+ * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
 public class DatabaseDriverShutdownTest {
     @AfterClass
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
similarity index 71%
rename from modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
rename to modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index 6f337a586b6..a2b1fd5da8b 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -10,6 +10,12 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 
+/**
+ * This test belongs in the jdbc module, as it is focused on testing the behaviour of {@link org.testcontainers.containers.JdbcDatabaseContainer}.
+ * However, the need to use the {@link org.testcontainers.containers.PostgreSQLContainerProvider} (due to the jdbc:tc:postgresql) URL forces it to live here in
+ * the mysql module, to avoid circular dependencies.
+ * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
+ */
 public class DatabaseDriverTmpfsTest {
 
     @Test
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
new file mode 100644
index 00000000000..551ba86e185
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
@@ -0,0 +1,22 @@
+package org.testcontainers.jdbc.postgis;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class PostgisJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:postgis://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+                {"jdbc:tc:postgis:9.6://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+            });
+    }
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
new file mode 100644
index 00000000000..c63eb9ffb9d
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.postgresql;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class PostgreSQLJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:postgresql:9.6.8://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+            });
+    }
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
new file mode 100644
index 00000000000..8446440059e
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
@@ -0,0 +1,35 @@
+package org.testcontainers.junit.postgresql;
+
+import org.junit.Test;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+/**
+ * @author richardnorth
+ */
+public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
+    private static final String DB_NAME = "foo";
+    private static final String USER = "bar";
+    private static final String PWD = "baz";
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:9.6.8")
+                .withDatabaseName(DB_NAME)
+                .withUsername(USER)
+                .withPassword(PWD)) {
+
+            postgres.start();
+
+            ResultSet resultSet = performQuery(postgres, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+}
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
similarity index 78%
rename from modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
rename to modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 7189e05fb16..9c97f51e64e 100644
--- a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -1,7 +1,8 @@
-package org.testcontainers.junit;
+package org.testcontainers.junit.postgresql;
 
 import org.junit.Test;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -20,7 +21,7 @@ public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>()) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
@@ -31,7 +32,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testCommandOverride() throws SQLException {
-        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42")) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42")) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
@@ -42,7 +43,7 @@ public void testCommandOverride() throws SQLException {
 
     @Test
     public void testUnsetCommand() throws SQLException {
-        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42").withCommand()) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42").withCommand()) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
@@ -53,7 +54,7 @@ public void testUnsetCommand() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>().withInitScript("somepath/init_postgresql.sql")) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>().withInitScript("somepath/init_postgresql.sql")) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
diff --git a/modules/postgresql/src/test/resources/somepath/init_postgresql.sql b/modules/postgresql/src/test/resources/somepath/init_postgresql.sql
new file mode 100644
index 00000000000..2b00ee968b0
--- /dev/null
+++ b/modules/postgresql/src/test/resources/somepath/init_postgresql.sql
@@ -0,0 +1,5 @@
+CREATE TABLE bar (
+  foo VARCHAR(255)
+);
+
+INSERT INTO bar (foo) VALUES ('hello world');
\ No newline at end of file
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 07aad11168e..51c5bf4345e 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: JDBC :: Presto"
 dependencies {
     compile project(':jdbc')
 
-    testCompile 'io.prestosql:presto-jdbc:329'
-    testCompile 'commons-dbutils:commons-dbutils:1.7'
+    testCompile project(':jdbc-test')
+    testCompile 'io.prestosql:presto-jdbc:331'
 }
diff --git a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
new file mode 100644
index 00000000000..88939c62939
--- /dev/null
+++ b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.presto;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class PrestoJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:presto:329://hostname/", EnumSet.of(Options.PmdKnownBroken)},
+            });
+    }
+}
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 7cc1bb6d1d4..4c6fdd2bed1 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
     implementation 'junit:junit:4.12'
-    implementation 'org.slf4j:slf4j-api:1.7.26'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
 }

From fbda093796fec3eb6aed369b3699e426faf19ad7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 11:49:11 +0100
Subject: [PATCH 0724/4969] Bump r2dbc-mariadb from 0.8.1-alpha1 to
 0.8.2-alpha2 in /modules/mariadb (#2702)

---
 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 71f2417f2ad..38862c7f03c 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1'
+    compileOnly 'org.mariadb:r2dbc-mariadb:0.8.2-alpha2'
 
     testCompile project(':jdbc-test')
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.0'

From d1bf6b836d0e3e78845b9650076a8a3388a540f3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 11:54:40 +0100
Subject: [PATCH 0725/4969] Bump aws-java-sdk-logs from 1.11.777 to 1.11.782 in
 /modules/localstack (#2730)

---
 modules/localstack/build.gradle | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 44b732d4c60..3f88f41c176 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,10 +3,9 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.778'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.775'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.782'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.782'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.777'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.775'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.782'
     testCompile 'software.amazon.awssdk:s3:2.13.16'
 }

From 1ed8d81d5eaf8293b1fe6659060e790cbe88e6ce Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 11:56:40 +0100
Subject: [PATCH 0726/4969] Bump mssql-jdbc from 6.1.0.jre8 to
 8.3.0.jre8-preview in /modules/mssqlserver (#2733)

---
 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 c21bc43c869..5d72209b27e 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -17,5 +17,5 @@ dependencies {
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.0.jre8-preview'
 }

From f84bcd6136a33a336ecf6139b2f85b8bf19512d5 Mon Sep 17 00:00:00 2001
From: Simon Schneider <10846939+raynigon@users.noreply.github.com>
Date: Thu, 14 May 2020 14:25:00 +0200
Subject: [PATCH 0727/4969] Add Apache Solr Module (#2123)

---
 docs/modules/solr.md                          |  34 +++++
 examples/settings.gradle                      |   3 +-
 examples/solr-container/build.gradle          |  18 +++
 .../main/java/com/example/SearchEngine.java   |   6 +
 .../main/java/com/example/SearchResult.java   |  20 +++
 .../java/com/example/SolrSearchEngine.java    |  39 +++++
 .../test/java/com/example/SolrQueryTest.java  |  88 ++++++++++++
 mkdocs.yml                                    |   1 +
 modules/solr/build.gradle                     |   7 +
 .../containers/SolrClientUtils.java           | 133 +++++++++++++++++
 .../containers/SolrClientUtilsException.java  |   7 +
 .../containers/SolrContainer.java             | 135 ++++++++++++++++++
 .../SolrContainerConfiguration.java           |  18 +++
 .../containers/SolrContainerTest.java         |  76 ++++++++++
 14 files changed, 584 insertions(+), 1 deletion(-)
 create mode 100644 docs/modules/solr.md
 create mode 100644 examples/solr-container/build.gradle
 create mode 100644 examples/solr-container/src/main/java/com/example/SearchEngine.java
 create mode 100644 examples/solr-container/src/main/java/com/example/SearchResult.java
 create mode 100644 examples/solr-container/src/main/java/com/example/SolrSearchEngine.java
 create mode 100644 examples/solr-container/src/test/java/com/example/SolrQueryTest.java
 create mode 100644 modules/solr/build.gradle
 create mode 100644 modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
 create mode 100644 modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java
 create mode 100644 modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
 create mode 100644 modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
 create mode 100644 modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java

diff --git a/docs/modules/solr.md b/docs/modules/solr.md
new file mode 100644
index 00000000000..4776ffa608b
--- /dev/null
+++ b/docs/modules/solr.md
@@ -0,0 +1,34 @@
+# Solr Container
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+
+This module helps running [solr](https://lucene.apache.org/solr/) using Testcontainers.
+
+Note that it's based on the [official Docker image](https://hub.docker.com/_/solr/).
+
+## Usage example
+
+You can start a solr container instance from any Java application by using:
+
+<!--codeinclude-->
+[Using a Solr container](../../modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java) inside_block:solrContainerUsage
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:solr:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>solr</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 9efbf097344..ef47a61f807 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -10,7 +10,8 @@ include 'redis-backed-cache'
 include 'redis-backed-cache-testng'
 include 'selenium-container'
 include 'singleton-container'
+include 'solr-container'
 include 'spring-boot'
 include 'cucumber'
 include 'spring-boot-kotlin-redis'
-include 'spock'
\ No newline at end of file
+include 'spock'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
new file mode 100644
index 00000000000..62ed7d1153a
--- /dev/null
+++ b/examples/solr-container/build.gradle
@@ -0,0 +1,18 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    compileOnly "org.projectlombok:lombok:1.18.10"
+    annotationProcessor "org.projectlombok:lombok:1.18.10"
+
+    implementation 'org.apache.solr:solr-solrj:8.3.0'
+
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.testcontainers:solr'
+
+}
diff --git a/examples/solr-container/src/main/java/com/example/SearchEngine.java b/examples/solr-container/src/main/java/com/example/SearchEngine.java
new file mode 100644
index 00000000000..c05bc23aad2
--- /dev/null
+++ b/examples/solr-container/src/main/java/com/example/SearchEngine.java
@@ -0,0 +1,6 @@
+package com.example;
+
+public interface SearchEngine {
+
+    public SearchResult search(String term);
+}
diff --git a/examples/solr-container/src/main/java/com/example/SearchResult.java b/examples/solr-container/src/main/java/com/example/SearchResult.java
new file mode 100644
index 00000000000..06544f0ba34
--- /dev/null
+++ b/examples/solr-container/src/main/java/com/example/SearchResult.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SearchResult {
+
+    private long totalHits;
+
+    private List<Map<String, Object>> results;
+}
diff --git a/examples/solr-container/src/main/java/com/example/SolrSearchEngine.java b/examples/solr-container/src/main/java/com/example/SolrSearchEngine.java
new file mode 100644
index 00000000000..8a7f38e455d
--- /dev/null
+++ b/examples/solr-container/src/main/java/com/example/SolrSearchEngine.java
@@ -0,0 +1,39 @@
+package com.example;
+
+import java.util.stream.Collectors;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.client.solrj.util.ClientUtils;
+import org.apache.solr.common.SolrDocument;
+
+@RequiredArgsConstructor
+public class SolrSearchEngine implements SearchEngine {
+
+    public static final String COLLECTION_NAME = "products";
+
+    private final SolrClient client;
+
+    @SneakyThrows
+    public SearchResult search(String term) {
+
+        SolrQuery query = new SolrQuery();
+        query.setQuery("title:" + ClientUtils.escapeQueryChars(term));
+        QueryResponse response = client.query(COLLECTION_NAME, query);
+        return createResult(response);
+    }
+
+    private SearchResult createResult(QueryResponse response) {
+        return SearchResult.builder()
+            .totalHits(response.getResults().getNumFound())
+            .results(response.getResults()
+                .stream()
+                .map(SolrDocument::getFieldValueMap)
+                .collect(Collectors.toList()))
+            .build();
+    }
+}
diff --git a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
new file mode 100644
index 00000000000..413d7937853
--- /dev/null
+++ b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
@@ -0,0 +1,88 @@
+package com.example;
+
+import static com.example.SolrSearchEngine.COLLECTION_NAME;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.SolrInputField;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.testcontainers.containers.SolrContainer;
+
+public class SolrQueryTest {
+
+    public static final SolrContainer solrContainer = new SolrContainer()
+        .withCollection(COLLECTION_NAME);
+
+    private static SolrClient solrClient;
+
+    @BeforeClass
+    public static void setUp() throws IOException, SolrServerException {
+        solrContainer.start();
+        solrClient = new Http2SolrClient.Builder("http://" + solrContainer.getContainerIpAddress() + ":" + solrContainer.getSolrPort() + "/solr").build();
+
+        // Add Sample Data
+        solrClient.add(COLLECTION_NAME, Collections.singletonList(
+            new SolrInputDocument(createMap(
+                "id", createInputField("id", "1"),
+                "title", createInputField("title", "old skool - trainers - shoes")
+            ))
+        ));
+
+        solrClient.add(COLLECTION_NAME, Collections.singletonList(
+            new SolrInputDocument(createMap(
+                "id", createInputField("id", "2"),
+                "title", createInputField("title", "print t-shirt")
+            ))
+        ));
+
+        solrClient.commit(COLLECTION_NAME);
+    }
+
+    @Test
+    public void testQueryForShoes() {
+        SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
+
+        SearchResult result = searchEngine.search("shoes");
+        assertEquals("When searching for shoes we expect one result", 1L, result.getTotalHits());
+        assertEquals("The result should have the id 1", "1", result.getResults().get(0).get("id"));
+    }
+
+    @Test
+    public void testQueryForTShirt() {
+        SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
+
+        SearchResult result = searchEngine.search("t-shirt");
+        assertEquals("When searching for t-shirt we expect one result", 1L, result.getTotalHits());
+        assertEquals("The result should have the id 2", "2", result.getResults().get(0).get("id"));
+    }
+
+    @Test
+    public void testQueryForAsterisk() {
+        SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
+
+        SearchResult result = searchEngine.search("*");
+        assertEquals("When searching for * we expect no results", 0L, result.getTotalHits());
+    }
+
+    private static SolrInputField createInputField(String key, String value) {
+        SolrInputField inputField = new SolrInputField(key);
+        inputField.setValue(value);
+        return inputField;
+    }
+
+    private static Map<String, SolrInputField> createMap(String k0, SolrInputField v0, String k1, SolrInputField v1) {
+        Map<String, SolrInputField> result = new HashMap<>();
+        result.put(k0, v0);
+        result.put(k1, v1);
+        return result;
+    }
+}
diff --git a/mkdocs.yml b/mkdocs.yml
index e1b21d80811..48b63c59631 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -66,6 +66,7 @@ nav:
           - modules/nginx.md
           - modules/pulsar.md
           - modules/rabbitmq.md
+          - modules/solr.md
           - modules/toxiproxy.md
           - modules/vault.md
           - modules/webdriver_containers.md
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
new file mode 100644
index 00000000000..af3193be52a
--- /dev/null
+++ b/modules/solr/build.gradle
@@ -0,0 +1,7 @@
+description = "Testcontainers :: Solr"
+
+dependencies {
+    compile project(':testcontainers')
+    testCompile 'org.apache.solr:solr-solrj:8.3.0'
+
+}
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
new file mode 100644
index 00000000000..4492ca0befe
--- /dev/null
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
@@ -0,0 +1,133 @@
+package org.testcontainers.containers;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.commons.io.IOUtils;
+
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+/**
+ * Utils class which can create collections and configurations.
+ *
+ * @author Simon Schneider
+ */
+public class SolrClientUtils {
+
+    private static OkHttpClient httpClient = new OkHttpClient();
+
+    /**
+     * Creates a new configuration and uploads the solrconfig.xml and schema.xml
+     *
+     * @param hostname          the Hostname under which solr is reachable
+     * @param port              the Port on which solr is running
+     * @param configurationName the name of the configuration which should be created
+     * @param solrConfig        the url under which the solrconfig.xml can be found
+     * @param solrSchema        the url under which the schema.xml can be found or null if the default schema should be used
+     */
+    public static void uploadConfiguration(String hostname, int port, String configurationName, URL solrConfig, URL solrSchema) throws URISyntaxException, IOException {
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("action", "UPLOAD");
+        parameters.put("name", configurationName);
+        HttpUrl url = generateSolrURL(hostname, port, Arrays.asList("admin", "configs"), parameters);
+
+        byte[] configurationZipFile = generateConfigZipFile(solrConfig, solrSchema);
+        executePost(url, configurationZipFile);
+
+    }
+
+    /**
+     * Creates a new collection
+     *
+     * @param hostname          the Hostname under which solr is reachable
+     * @param port              The Port on which solr is running
+     * @param collectionName    the name of the collection which should be created
+     * @param configurationName the name of the configuration which should used to create the collection
+     *                          or null if the default configuration should be used
+     */
+    public static void createCollection(String hostname, int port, String collectionName, String configurationName) throws URISyntaxException, IOException {
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("action", "CREATE");
+        parameters.put("name", collectionName);
+        parameters.put("numShards", "1");
+        parameters.put("replicationFactor", "1");
+        parameters.put("wt", "json");
+        if (configurationName != null) {
+            parameters.put("collection.configName", configurationName);
+        }
+        HttpUrl url = generateSolrURL(hostname, port, Arrays.asList("admin", "collections"), parameters);
+        executePost(url, null);
+    }
+
+    private static void executePost(HttpUrl url, byte[] data) throws IOException {
+
+        RequestBody requestBody = data == null ?
+            RequestBody.create(MediaType.parse("text/plain"), "") :
+            RequestBody.create(MediaType.parse("application/octet-stream"), data);
+        ;
+
+        Request request = new Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .build();
+        Response response = httpClient.newCall(request).execute();
+        if (!response.isSuccessful()) {
+            String responseBody = "";
+            if (response.body() != null) {
+                responseBody = response.body().string();
+                response.close();
+            }
+            throw new SolrClientUtilsException(response.code(), "Unable to upload binary\n" + responseBody);
+        }
+        if (response.body() != null) {
+            response.close();
+        }
+    }
+
+    private static HttpUrl generateSolrURL(String hostname, int port, List<String> pathSegments, Map<String, String> parameters) throws URISyntaxException {
+        HttpUrl.Builder builder = new HttpUrl.Builder();
+        builder.scheme("http");
+        builder.host(hostname);
+        builder.port(port);
+        // Path
+        builder.addPathSegment("solr");
+        if (pathSegments != null) {
+            pathSegments.forEach(builder::addPathSegment);
+        }
+        // Query Parameters
+        parameters.forEach(builder::addQueryParameter);
+        return builder.build();
+    }
+
+    private static byte[] generateConfigZipFile(URL solrConfiguration, URL solrSchema) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ZipOutputStream zipOutputStream = new ZipOutputStream(bos);
+        // SolrConfig
+        zipOutputStream.putNextEntry(new ZipEntry("solrconfig.xml"));
+        IOUtils.copy(solrConfiguration.openStream(), zipOutputStream);
+        zipOutputStream.closeEntry();
+
+        // Solr Schema
+        if (solrSchema != null) {
+            zipOutputStream.putNextEntry(new ZipEntry("schema.xml"));
+            IOUtils.copy(solrSchema.openStream(), zipOutputStream);
+            zipOutputStream.closeEntry();
+        }
+
+        zipOutputStream.close();
+        return bos.toByteArray();
+    }
+}
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java
new file mode 100644
index 00000000000..5ba0865502c
--- /dev/null
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java
@@ -0,0 +1,7 @@
+package org.testcontainers.containers;
+
+public class SolrClientUtilsException extends RuntimeException {
+    public SolrClientUtilsException(int statusCode, String msg) {
+        super("Http Call Status: " + statusCode + "\n" + msg);
+    }
+}
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
new file mode 100644
index 00000000000..90fd674dfda
--- /dev/null
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -0,0 +1,135 @@
+package org.testcontainers.containers;
+
+import static java.time.temporal.ChronoUnit.SECONDS;
+
+import java.net.URL;
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+
+import lombok.SneakyThrows;
+
+import org.apache.commons.lang.StringUtils;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+
+/**
+ * SolrContainer allows a solr container to be launched and controlled.
+ */
+public class SolrContainer extends GenericContainer<SolrContainer> {
+
+    public static final String IMAGE = "solr";
+    public static final String DEFAULT_TAG = "8.3.0";
+
+    public static final Integer ZOOKEEPER_PORT = 9983;
+    public static final Integer SOLR_PORT = 8983;
+
+    private SolrContainerConfiguration configuration;
+
+    public SolrContainer() {
+        this(IMAGE + ":" + DEFAULT_TAG);
+    }
+
+    public SolrContainer(final String dockerImageName) {
+        super(dockerImageName);
+        this.waitStrategy = new LogMessageWaitStrategy()
+            .withRegEx(".*o\\.e\\.j\\.s\\.Server Started.*")
+            .withStartupTimeout(Duration.of(60, SECONDS));
+        this.configuration = new SolrContainerConfiguration();
+    }
+
+    public SolrContainer withZookeeper(boolean zookeeper) {
+        configuration.setZookeeper(zookeeper);
+        return self();
+    }
+
+    public SolrContainer withCollection(String collection) {
+        if (StringUtils.isEmpty(collection)) {
+            throw new IllegalArgumentException("Collection name must not be empty");
+        }
+        configuration.setCollectionName(collection);
+        return self();
+    }
+
+    public SolrContainer withConfiguration(String name, URL solrConfig) {
+        if (StringUtils.isEmpty(name) || solrConfig == null) {
+            throw new IllegalArgumentException();
+        }
+        configuration.setConfigurationName(name);
+        configuration.setSolrConfiguration(solrConfig);
+        return self();
+    }
+
+    public SolrContainer withSchema(URL schema) {
+        configuration.setSolrSchema(schema);
+        return self();
+    }
+
+    public int getSolrPort() {
+        return getMappedPort(SOLR_PORT);
+    }
+
+    public int getZookeeperPort() {
+        return getMappedPort(ZOOKEEPER_PORT);
+    }
+
+    @Override
+    @SneakyThrows
+    protected void configure() {
+        if (configuration.getSolrSchema() != null && configuration.getSolrConfiguration() == null) {
+            throw new IllegalStateException("Solr needs to have a configuration is you want to use a schema");
+        }
+        // Generate Command Builder
+        String command = "solr -f";
+        // Add Default Ports
+        this.addExposedPort(SOLR_PORT);
+
+        // Configure Zookeeper
+        if (configuration.isZookeeper()) {
+            this.addExposedPort(ZOOKEEPER_PORT);
+            command = "-DzkRun -h localhost";
+        }
+
+        // Apply generated Command
+        this.setCommand(command);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return new HashSet<>(getSolrPort());
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+
+    @Override
+    @SneakyThrows
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        if (!configuration.isZookeeper()) {
+            ExecResult result = execInContainer("solr", "create_core", "-c", configuration.getCollectionName());
+            if (result.getExitCode() != 0) {
+                throw new IllegalStateException("Unable to create solr core:\nStdout: " + result.getStdout() + "\nStderr:" + result.getStderr());
+            }
+            return;
+        }
+
+        if (StringUtils.isNotEmpty(configuration.getConfigurationName())) {
+            SolrClientUtils.uploadConfiguration(
+                getContainerIpAddress(),
+                getSolrPort(),
+                configuration.getConfigurationName(),
+                configuration.getSolrConfiguration(),
+                configuration.getSolrSchema());
+        }
+
+        SolrClientUtils.createCollection(
+            getContainerIpAddress(),
+            getSolrPort(),
+            configuration.getCollectionName(),
+            configuration.getConfigurationName());
+    }
+}
+
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
new file mode 100644
index 00000000000..1f35ce2a810
--- /dev/null
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
@@ -0,0 +1,18 @@
+package org.testcontainers.containers;
+
+import java.net.URL;
+
+import lombok.Data;
+
+/**
+ * @author Simon Schneider
+ */
+@Data
+public class SolrContainerConfiguration {
+
+    private boolean zookeeper = true;
+    private String collectionName = "dummy";
+    private String configurationName;
+    private URL solrConfiguration;
+    private URL solrSchema;
+}
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
new file mode 100644
index 00000000000..48cb04b7053
--- /dev/null
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -0,0 +1,76 @@
+package org.testcontainers.containers;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.response.SolrPingResponse;
+import org.junit.After;
+import org.junit.Test;
+
+/**
+ * @author Simon Schneider
+ */
+public class SolrContainerTest {
+
+    private SolrClient client = null;
+
+    @After
+    public void stopRestClient() throws IOException {
+        if (client != null) {
+            client.close();
+            client = null;
+        }
+    }
+
+    @Test
+    public void solrCloudTest() throws IOException, SolrServerException {
+        try (SolrContainer container = new SolrContainer()) {
+            container.start();
+            SolrPingResponse response = getClient(container).ping("dummy");
+            assertThat(response.getStatus(), is(0));
+            assertThat(response.jsonStr(), containsString("zkConnected\":true"));
+        }
+    }
+
+    @Test
+    public void solrStandaloneTest() throws IOException, SolrServerException {
+        try (SolrContainer container = new SolrContainer().withZookeeper(false)) {
+            container.start();
+            SolrPingResponse response = getClient(container).ping("dummy");
+            assertThat(response.getStatus(), is(0));
+            assertThat(response.jsonStr(), containsString("zkConnected\":null"));
+        }
+    }
+
+    @Test
+    public void solrCloudPingTest() throws IOException, SolrServerException {
+        // solrContainerUsage {
+        // Create the solr container.
+        SolrContainer container = new SolrContainer();
+
+        // Start the container. This step might take some time...
+        container.start();
+
+        // Do whatever you want with the client ...
+        SolrClient client = new Http2SolrClient.Builder("http://" + container.getContainerIpAddress() + ":" + container.getSolrPort() + "/solr").build();
+        SolrPingResponse response = client.ping("dummy");
+
+        // Stop the container.
+        container.stop();
+        // }
+    }
+
+    private SolrClient getClient(SolrContainer container) {
+        if (client == null) {
+            client = new Http2SolrClient.Builder("http://" + container.getContainerIpAddress() + ":" + container.getSolrPort() + "/solr").build();
+        }
+        return client;
+    }
+
+}

From a2a59bcf9592f1a6d8a1efbaea443ac5e2714f62 Mon Sep 17 00:00:00 2001
From: Martin Vysny <martin@vysny.me>
Date: Thu, 14 May 2020 18:34:41 +0300
Subject: [PATCH 0728/4969] Implement DockerClientFactory.isDockerAvailable()
 (#2605)

---
 .../org/testcontainers/DockerClientFactory.java     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 8d9da8825d2..4e16a7edf9d 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -101,6 +101,19 @@ public synchronized static DockerClientFactory instance() {
         return instance;
     }
 
+    /**
+     * Checks whether Docker is accessible and {@link #client()} is able to produce a client.
+     * @return true if Docker is available, false if not.
+     */
+    public synchronized boolean isDockerAvailable() {
+        try {
+            client();
+            return true;
+        } catch (IllegalStateException ex) {
+            return false;
+        }
+    }
+
     @Synchronized
     private DockerClientProviderStrategy getOrInitializeStrategy() {
         if (strategy != null) {

From ede19c8a4efd48ed20f32105d81fb71249e386af Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 15 May 2020 15:10:36 +0200
Subject: [PATCH 0729/4969] Update example to Spring Boot 2.3.0 (#2743)

---
 examples/spring-boot/build.gradle                           | 6 +++---
 .../src/test/java/com/example/AbstractIntegrationTest.java  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index c7b0c63d7ba..ad8d8252fb6 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.2.7.RELEASE'
+    id 'org.springframework.boot' version '2.3.0.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
@@ -9,8 +9,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.12"
-    annotationProcessor "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok"
+    annotationProcessor "org.projectlombok:lombok"
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-web'
diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
index 29a1f51ffcc..79828923d7d 100644
--- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
@@ -12,7 +12,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = DemoApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
     "spring.datasource.url=jdbc:tc:postgresql:11-alpine:///databasename",
-    "spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver"
 })
 @ActiveProfiles("test")
 public abstract class AbstractIntegrationTest {

From 672cbeebcac6310caab90383bce11a0b753b1106 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 15 May 2020 15:11:57 +0200
Subject: [PATCH 0730/4969] Add `ContainerState#getHost` replacing
 `getContainerIpAddress` (#2742)

* Add `ContainerState#getHost` replacing `getContainerIpAddress`

* post-merge fixes

* Ignore `METHOD_NEW_DEFAULT` in japicmp

* Update docs/features/networking.md

Co-authored-by: Richard North <rich.north@gmail.com>

* Add a tip about `getContainerIpAddress()`

* Fix the codeincludes

Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/build.gradle                                | 12 +++---------
 .../ComposeServiceWaitStrategyTarget.java        |  4 ++--
 .../containers/ContainerState.java               | 12 ++++++++++++
 .../containers/DockerComposeContainer.java       |  2 +-
 .../containers/GenericContainer.java             |  2 +-
 .../containers/PortForwardingContainer.java      |  4 ++--
 .../internal/ExternalPortListeningCheck.java     |  2 +-
 .../wait/strategy/HostPortWaitStrategy.java      |  2 +-
 .../wait/strategy/HttpWaitStrategy.java          |  2 +-
 .../internal/ExternalPortListeningCheckTest.java |  2 +-
 .../images/ImagePullPolicyTest.java              |  2 +-
 .../junit/DockerfileContainerTest.java           |  2 +-
 .../junit/FixedHostPortContainerTest.java        |  2 +-
 .../junit/GenericContainerRuleTest.java          |  6 +++---
 .../utility/AuthenticatedImagePullTest.java      |  2 +-
 .../java/generic/MultiplePortsExposedTest.java   |  8 ++++----
 .../java/quickstart/RedisBackedCacheIntTest.java |  2 +-
 .../java/quickstart/RedisBackedCacheIntTest.java |  2 +-
 .../quickstart/RedisBackedCacheIntTest.groovy    |  2 +-
 docs/features/networking.md                      | 16 ++++++++++------
 docs/modules/vault.md                            |  2 +-
 docs/quickstart/junit_4_quickstart.md            |  4 ++--
 docs/quickstart/junit_5_quickstart.md            |  4 ++--
 .../containers/CassandraContainer.java           |  2 +-
 .../containers/CassandraContainerTest.java       |  2 +-
 .../containers/ClickHouseContainer.java          |  2 +-
 .../containers/CockroachContainer.java           |  2 +-
 .../couchbase/CouchbaseContainer.java            | 10 +++++-----
 .../couchbase/CouchbaseContainerTest.java        |  2 +-
 .../testcontainers/containers/Db2Container.java  | 10 +---------
 .../dynamodb/DynaliteContainer.java              |  2 +-
 .../elasticsearch/ElasticsearchContainer.java    |  4 ++--
 .../containers/InfluxDBContainer.java            |  2 +-
 .../jupiter/inheritance/RedisContainer.java      |  2 +-
 .../containers/KafkaContainer.java               |  2 +-
 .../localstack/LocalStackContainer.java          |  4 ++--
 .../containers/MariaDBContainer.java             |  2 +-
 .../MariaDBR2DBCDatabaseContainer.java           |  2 +-
 .../containers/MockServerContainer.java          |  2 +-
 .../containers/MockServerContainerTest.java      |  4 ++--
 .../containers/MSSQLR2DBCDatabaseContainer.java  |  2 +-
 .../containers/MSSQLServerContainer.java         |  2 +-
 .../containers/MySQLContainer.java               |  2 +-
 .../containers/MySQLR2DBCDatabaseContainer.java  |  2 +-
 .../containers/Neo4jContainer.java               |  6 +++---
 .../containers/NginxContainer.java               |  2 +-
 .../containers/OracleContainer.java              |  2 +-
 .../containers/OrientDBContainer.java            |  2 +-
 .../containers/OrientDBContainerTest.java        |  2 +-
 .../containers/PostgreSQLContainer.java          |  2 +-
 .../PostgreSQLR2DBCDatabaseContainer.java        |  2 +-
 .../containers/PostgreSQLConnectionURLTest.java  |  2 +-
 .../containers/PrestoContainer.java              |  2 +-
 .../containers/PulsarContainer.java              |  4 ++--
 .../containers/RabbitMQContainer.java            |  8 ++++----
 .../containers/RabbitMQContainerTest.java        |  8 ++++----
 .../containers/BrowserWebDriverContainer.java    |  4 ++--
 .../spock/TestcontainersSharedContainerIT.groovy |  2 +-
 .../containers/ToxiproxyContainer.java           |  4 ++--
 .../testcontainers/containers/ToxiproxyTest.java |  2 +-
 .../testcontainers/vault/VaultClientTest.java    |  3 +--
 .../testcontainers/vault/VaultContainerTest.java |  2 +-
 62 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 4c62a2416ef..39495e59dce 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -84,20 +84,14 @@ task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
     failOnModification = true
     failOnSourceIncompatibility = true
 
-    // TODO cleanup excludes after we release the version based on docker-java 3.2.0
-
     packageExcludes = [
         "com.github.dockerjava.*",
         "org.testcontainers.shaded.*",
     ]
 
-    classExcludes = [
-        // 'METHOD_REMOVED_IN_SUPERCLASS'
-        "org.testcontainers.containers.output.FrameConsumerResultCallback",
-        "org.testcontainers.dockerclient.LogToStringContainerCallback",
-
-        // 'METHOD_RETURN_TYPE_CHANGED', exposed `com.github.dockerjava.core.command.PullImageResultCallback` to the public API
-        "org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback",
+    methodExcludes = [
+        // METHOD_NEW_DEFAULT
+        "org.testcontainers.containers.ContainerState#getHost()"
     ]
 
     onlyBinaryIncompatibleModified = true
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java b/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
index d4ad51dc1da..2fb953b4aee 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
@@ -54,8 +54,8 @@ public Integer getMappedPort(int originalPort) {
      * {@inheritDoc}
      */
     @Override
-    public String getContainerIpAddress() {
-        return proxyContainer.getContainerIpAddress();
+    public String getHost() {
+        return proxyContainer.getHost();
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index ad006aa3b43..1565b4e7e3e 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -43,8 +43,18 @@ public interface ContainerState {
      * Get the IP address that this container may be reached on (may not be the local machine).
      *
      * @return an IP address
+     * @see #getHost()
      */
     default String getContainerIpAddress() {
+        return getHost();
+    }
+
+    /**
+     * Get the host that this container may be reached on (may not be the local machine).
+     *
+     * @return a host
+     */
+    default String getHost() {
         return DockerClientFactory.instance().dockerHostIpAddress();
     }
 
@@ -107,6 +117,7 @@ default InspectContainerResponse getCurrentContainerInfo() {
 
     /**
      * Get the actual mapped port for a first port exposed by the container.
+     * Should be used in conjunction with {@link #getHost()}.
      *
      * @return the port that the exposed port is mapped to
      * @throws IllegalStateException if there are no exposed ports
@@ -121,6 +132,7 @@ default Integer getFirstMappedPort() {
 
     /**
      * Get the actual mapped port for a given port exposed by the container.
+     * Should be used in conjunction with {@link #getHost()}.
      *
      * @param originalPort the original TCP port that is exposed
      * @return the port that the exposed port is mapped to, or null if it is not exposed
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 7bf8d3c916b..651bd9c8526 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -402,7 +402,7 @@ public SELF waitingFor(String serviceName, @NonNull WaitStrategy waitStrategy) {
      * @return a host IP address or hostname that can be used for accessing the service container.
      */
     public String getServiceHost(String serviceName, Integer servicePort) {
-        return ambassadorContainer.getContainerIpAddress();
+        return ambassadorContainer.getHost();
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 23e5f9bf173..89938cdfe56 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1244,7 +1244,7 @@ public SELF withCopyFileToContainer(MountableFile mountableFile, String containe
      */
     @Deprecated
     public String getIpAddress() {
-        return getContainerIpAddress();
+        return getHost();
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index 852a986b58f..09f1d98bd2d 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -40,7 +40,7 @@ private Connection createSSHSession() {
             );
         container.start();
 
-        Connection connection = new Connection(container.getContainerIpAddress(), container.getMappedPort(22));
+        Connection connection = new Connection(container.getHost(), container.getMappedPort(22));
 
         connection.setTCPNoDelay(true);
         connection.connect(
@@ -60,7 +60,7 @@ private Connection createSSHSession() {
     public void exposeHostPort(int port) {
         exposeHostPort(port, port);
     }
-    
+
     @SneakyThrows
     public void exposeHostPort(int hostPort, int containerPort) {
     	if (exposedPorts.add(new AbstractMap.SimpleEntry<>(hostPort, containerPort))) {
diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
index 2aae12bab8d..b9b63eeee5c 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
@@ -18,7 +18,7 @@ public class ExternalPortListeningCheck implements Callable<Boolean> {
 
     @Override
     public Boolean call() {
-        String address = containerState.getContainerIpAddress();
+        String address = containerState.getHost();
 
         externalLivenessCheckPorts.parallelStream().forEach(externalPort -> {
             try {
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index 91f4e91fadf..a0ba1e9950c 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -46,7 +46,7 @@ protected void waitUntilReady() {
 
         } catch (TimeoutException e) {
             throw new ContainerLaunchException("Timed out waiting for container port to open (" +
-                    waitStrategyTarget.getContainerIpAddress() +
+                    waitStrategyTarget.getHost() +
                     " ports: " +
                     externalLivenessCheckPorts +
                     " should be listening)");
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index a44fc46e4b0..5fd7834b12d 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -225,7 +225,7 @@ protected void waitUntilReady() {
      */
     private URI buildLivenessUri(int livenessCheckPort) {
         final String scheme = (tlsEnabled ? "https" : "http") + "://";
-        final String host = waitStrategyTarget.getContainerIpAddress();
+        final String host = waitStrategyTarget.getHost();
 
         final String portSuffix;
         if ((tlsEnabled && 443 == livenessCheckPort) || (!tlsEnabled && 80 == livenessCheckPort)) {
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
index 69bf9d06ce7..19f3a772d41 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
@@ -29,7 +29,7 @@ public void setUp() throws Exception {
         nonListeningSocket.close();
 
         mockContainer = mock(WaitStrategyTarget.class);
-        when(mockContainer.getContainerIpAddress()).thenReturn("127.0.0.1");
+        when(mockContainer.getHost()).thenReturn("127.0.0.1");
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
index 59b7486c75e..69e68f7f225 100644
--- a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -33,7 +33,7 @@ public class ImagePullPolicyTest {
 
     @BeforeClass
     public static void beforeClass() throws Exception {
-        String testRegistryAddress = registry.getContainerIpAddress() + ":" + registry.getFirstMappedPort();
+        String testRegistryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
         String testImageName = testRegistryAddress + "/image-pull-policy-test";
         String tag = UUID.randomUUID().toString();
         imageName = testImageName + ":" + tag;
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
index 8f601b2e737..6ad7c3ea26e 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
@@ -31,7 +31,7 @@ public class DockerfileContainerTest {
 
     @Test
     public void simpleDslTest() throws IOException {
-        String address = String.format("http://%s:%s", dslContainer.getContainerIpAddress(), dslContainer.getMappedPort(80));
+        String address = String.format("http://%s:%s", dslContainer.getHost(), dslContainer.getMappedPort(80));
 
         CloseableHttpClient httpClient = HttpClientBuilder.create().build();
         HttpGet get = new HttpGet(address);
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index dba48da4db1..5fe49756ba1 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -85,7 +85,7 @@ private String readResponse(GenericContainer container, Integer port) throws IOE
             final BufferedReader reader = Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS,
                 () -> {
                     Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
-                    final Socket socket = new Socket(container.getContainerIpAddress(), port);
+                    final Socket socket = new Socket(container.getHost(), port);
                     return new BufferedReader(new InputStreamReader(socket.getInputStream()));
                 }
             )
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index 6c51713b6b1..1f4a3ff121d 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -162,7 +162,7 @@ public void withTmpFsTest() throws Exception {
     @Test
     public void simpleRabbitMqTest() throws IOException, TimeoutException {
         ConnectionFactory factory = new ConnectionFactory();
-        factory.setHost(rabbitMq.getContainerIpAddress());
+        factory.setHost(rabbitMq.getHost());
         factory.setPort(rabbitMq.getMappedPort(RABBITMQ_PORT));
         Connection connection = factory.newConnection();
 
@@ -194,7 +194,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
 
     @Test
     public void simpleMongoDbTest() {
-        MongoClient mongoClient = new MongoClient(mongo.getContainerIpAddress(), mongo.getMappedPort(MONGO_PORT));
+        MongoClient mongoClient = new MongoClient(mongo.getHost(), mongo.getMappedPort(MONGO_PORT));
         MongoDatabase database = mongoClient.getDatabase("test");
         MongoCollection<Document> collection = database.getCollection("testCollection");
 
@@ -366,7 +366,7 @@ private BufferedReader getReaderForContainerPort80(GenericContainer container) {
         return Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
             Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
 
-            Socket socket = new Socket(container.getContainerIpAddress(), container.getFirstMappedPort());
+            Socket socket = new Socket(container.getHost(), container.getFirstMappedPort());
             return new BufferedReader(new InputStreamReader(socket.getInputStream()));
         });
     }
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 5f4417f218b..31f098bab16 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -65,7 +65,7 @@ public static void setUp() throws InterruptedException {
         originalAuthLocatorSingleton = RegistryAuthLocator.instance();
         client = DockerClientFactory.instance().client();
 
-        String testRegistryAddress = authenticatedRegistry.getContainerIpAddress() + ":" + authenticatedRegistry.getFirstMappedPort();
+        String testRegistryAddress = authenticatedRegistry.getHost() + ":" + authenticatedRegistry.getFirstMappedPort();
         testImageName = testRegistryAddress + "/alpine";
         testImageNameWithTag = testImageName + ":latest";
 
diff --git a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
index f22bc55defd..f5a92423b6c 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
@@ -31,13 +31,13 @@ public void fetchFirstMappedPort() {
     }
 
     @Test
-    public void getContainerIpAddressOnly() {
-        String ipAddress = container.getContainerIpAddress();
+    public void getHostOnly() {
+        String ipAddress = container.getHost();
     }
 
     @Test
-    public void getContainerIpAddressAndMappedPort() {
+    public void getHostAndMappedPort() {
         String address =
-            container.getContainerIpAddress() + ":" + container.getMappedPort(2424);
+            container.getHost() + ":" + container.getMappedPort(2424);
     }
 }
diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index ac3ae7746b4..f2ef1ab0220 100644
--- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -21,7 +21,7 @@ public class RedisBackedCacheIntTest {
 
     @Before
     public void setUp() {
-        String address = redis.getContainerIpAddress();
+        String address = redis.getHost();
         Integer port = redis.getFirstMappedPort();
 
         // Now we have an address and port for Redis, no matter where it is running
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index 7c3968a724e..0f4f98fb669 100644
--- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -24,7 +24,7 @@ public class RedisBackedCacheIntTest {
 
     @BeforeEach
     public void setUp() {
-        String address = redis.getContainerIpAddress();
+        String address = redis.getHost();
         Integer port = redis.getFirstMappedPort();
 
         // Now we have an address and port for Redis, no matter where it is running
diff --git a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
index c2537a948d5..068c8079a7d 100644
--- a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
+++ b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
@@ -15,7 +15,7 @@ class RedisBackedCacheIntTest extends Specification {
     // }
 
     void setup() {
-        String address = redis.containerIpAddress
+        String address = redis.host
         Integer port = redis.firstMappedPort
 
         // Now we have an address and port for Redis, no matter where it is running
diff --git a/docs/features/networking.md b/docs/features/networking.md
index 5de0c9dfa96..2fe039b74ef 100644
--- a/docs/features/networking.md
+++ b/docs/features/networking.md
@@ -33,23 +33,27 @@ There is also a `getFirstMappedPort` method for convenience, for the fairly comm
 [Retrieving the first mapped port](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:fetchFirstMappedPort
 <!--/codeinclude-->
 
-## Getting the container IP address
+## Getting the container host
 
 When running with a local Docker daemon, exposed ports will usually be reachable on `localhost`.
 However, in some CI environments they may instead be reachable on a different host.
 
-As such, Testcontainers provides a convenience method to obtain an IP address on which the container should be reachable from the host machine.
+As such, Testcontainers provides a convenience method to obtain an address on which the container should be reachable from the host machine.
 
 <!--codeinclude-->
-[Getting the container IP address](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getContainerIpAddressOnly
+[Getting the container host](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getHostOnly
 <!--/codeinclude-->
 
-It is normally advisable to use `getContainerIpAddress` and `getMappedPort` together when constructing addresses - for example:
+It is normally advisable to use `getHost` and `getMappedPort` together when constructing addresses - for example:
 
 <!--codeinclude-->
-[Getting the container IP address and mapped port](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getContainerIpAddressAndMappedPort
+[Getting the container host and mapped port](../examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java) inside_block:getHostAndMappedPort
 <!--/codeinclude-->
 
+!!! tip
+    `getHost()` is a replacement for `getContainerIpAddress()` and returns the same result.
+    `getContainerIpAddress()` is believed to be confusingly named, and will eventually be deprecated.
+
 ## Exposing host ports to the container
 
 In some cases it is necessary to make a network connection from a container to a socket that is listening on the host machine.
@@ -86,4 +90,4 @@ Docker provides the ability for you to create custom networks and place containe
 
 <!--codeinclude-->
 [Creating custom networks](../../core/src/test/java/org/testcontainers/containers/NetworkTest.java) inside_block:useCustomNetwork
-<!--/codeinclude-->
\ No newline at end of file
+<!--/codeinclude-->
diff --git a/docs/modules/vault.md b/docs/modules/vault.md
index 43d8ff57468..1f58c0ab836 100644
--- a/docs/modules/vault.md
+++ b/docs/modules/vault.md
@@ -21,7 +21,7 @@ public class SomeTest {
        
        //There are many integration clients for Vault so let's just define a general one here:
        VaultClient client = new VaultClient(
-               vaultContainer.getContainerIpAddress(),
+               vaultContainer.getHost(),
                vaultContainer.getMappedPort(8200),
                "my-root-token");
        
diff --git a/docs/quickstart/junit_4_quickstart.md b/docs/quickstart/junit_4_quickstart.md
index 86cd720942b..a3fecb1a14d 100644
--- a/docs/quickstart/junit_4_quickstart.md
+++ b/docs/quickstart/junit_4_quickstart.md
@@ -65,10 +65,10 @@ We can do this in our test `setUp` method, to set up our component under test:
 <!--/codeinclude-->
 
 !!! tip
-    Notice that we also ask Testcontainers for the container's actual address with `redis.getContainerIpAddress();`, 
+    Notice that we also ask Testcontainers for the container's actual address with `redis.getHost();`, 
     rather than hard-coding `localhost`. `localhost` may work in some environments but not others - for example it may
     not work on your current or future CI environment. As such, **avoid hard-coding** the address, and use 
-    `getContainerIpAddress()` instead.
+    `getHost()` instead.
 
 ## 4. Run the tests!
 
diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
index 179a87a5448..efd52b6c523 100644
--- a/docs/quickstart/junit_5_quickstart.md
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -94,10 +94,10 @@ We can do this in our test `setUp` method, to set up our component under test:
 <!--/codeinclude-->
 
 !!! tip
-    Notice that we also ask Testcontainers for the container's actual address with `redis.getContainerIpAddress();`, 
+    Notice that we also ask Testcontainers for the container's actual address with `redis.getHost();`, 
     rather than hard-coding `localhost`. `localhost` may work in some environments but not others - for example it may
     not work on your current or future CI environment. As such, **avoid hard-coding** the address, and use 
-    `getContainerIpAddress()` instead.
+    `getHost()` instead.
 
 ## 4. Run the tests!
 
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index a78d23e4b4b..27c2f182e9e 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -161,7 +161,7 @@ public Cluster getCluster() {
 
     public static Cluster getCluster(ContainerState containerState, boolean enableJmxReporting) {
         final Cluster.Builder builder = Cluster.builder()
-            .addContactPoint(containerState.getContainerIpAddress())
+            .addContactPoint(containerState.getHost())
             .withPort(containerState.getMappedPort(CQL_PORT));
         if (!enableJmxReporting) {
             builder.withoutJMXReporting();
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
index 6105aa275c9..5bc68aa9972 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -116,7 +116,7 @@ private void testInitScript(CassandraContainer cassandraContainer) {
 
     private ResultSet performQuery(CassandraContainer cassandraContainer, String cql) {
         Cluster explicitCluster = Cluster.builder()
-            .addContactPoint(cassandraContainer.getContainerIpAddress())
+            .addContactPoint(cassandraContainer.getHost())
             .withPort(cassandraContainer.getMappedPort(CassandraContainer.CQL_PORT))
             .build();
         return performQuery(explicitCluster, cql);
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 9364ecc4d14..4d4ea2d11a9 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -48,7 +48,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return JDBC_URL_PREFIX + getContainerIpAddress() + ":" + getMappedPort(HTTP_PORT) + "/" + databaseName;
+        return JDBC_URL_PREFIX + getHost() + ":" + getMappedPort(HTTP_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index fb13ced60d7..3768ca7a008 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -43,7 +43,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return JDBC_URL_PREFIX + "://" + getContainerIpAddress() + ":" + getMappedPort(DB_PORT) + "/" + databaseName;
+        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 14e5744bb6d..33f87359a92 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -141,7 +141,7 @@ public int getBootstrapHttpDirectPort() {
     }
 
     public String getConnectionString() {
-        return String.format("couchbase://%s:%d", getContainerIpAddress(), getBootstrapCarrierDirectPort());
+        return String.format("couchbase://%s:%d", getHost(), getBootstrapCarrierDirectPort());
     }
 
     @Override
@@ -201,7 +201,7 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo)
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         createBuckets();
-        logger().info("Couchbase container is ready! UI available at http://{}:{}", getContainerIpAddress(), getMappedPort(MGMT_PORT));
+        logger().info("Couchbase container is ready! UI available at http://{}:{}", getHost(), getMappedPort(MGMT_PORT));
     }
 
     /**
@@ -222,7 +222,7 @@ private void waitUntilNodeIsOnline() {
      * up automatically, we bind the internal hostname to the internal IP address.
      */
     private void renameNode() {
-        logger().debug("Renaming Couchbase Node from localhost to {}", getContainerIpAddress());
+        logger().debug("Renaming Couchbase Node from localhost to {}", getHost());
 
         Response response = doHttpRequest(MGMT_PORT, "/node/controller/rename", "POST", new FormBody.Builder()
             .add("hostname", getInternalIpAddress())
@@ -284,7 +284,7 @@ private void configureExternalPorts() {
         logger().debug("Mapping external ports to the alternate address configuration");
 
         final FormBody.Builder builder = new FormBody.Builder();
-        builder.add("hostname", getContainerIpAddress());
+        builder.add("hostname", getHost());
         builder.add("mgmt", Integer.toString(getMappedPort(MGMT_PORT)));
         builder.add("mgmtSSL", Integer.toString(getMappedPort(MGMT_SSL_PORT)));
 
@@ -418,7 +418,7 @@ private Response doHttpRequest(final int port, final String path, final String m
                                    final boolean auth) {
         try {
             Request.Builder requestBuilder = new Request.Builder()
-                .url("http://" + getContainerIpAddress() + ":" + getMappedPort(port) + path);
+                .url("http://" + getHost() + ":" + getMappedPort(port) + path);
 
             if (auth) {
                 requestBuilder = requestBuilder.header("Authorization", Credentials.basic(username, password));
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 27ad0f6265a..c5c9f18a58b 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -53,7 +53,7 @@ public void testBasicContainerUsage() {
 
             Cluster cluster = CouchbaseCluster.create(
                 environment,
-                container.getContainerIpAddress()
+                container.getHost()
             );
             // }
 
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 13ef72c328e..b1472b21c6c 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -1,20 +1,12 @@
 package org.testcontainers.containers;
 
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.LicenseAcceptance;
-import org.testcontainers.utility.LogUtils;
 
-import java.io.IOException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Predicate;
 
 public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
@@ -81,7 +73,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:db2://" + getContainerIpAddress() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName;
+        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
index 66397452921..6280ddb9421 100644
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
@@ -46,7 +46,7 @@ public AmazonDynamoDB getClient() {
      */
     public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration() {
         return new AwsClientBuilder.EndpointConfiguration("http://" +
-                this.getContainerIpAddress() + ":" +
+                this.getHost() + ":" +
                 this.getMappedPort(MAPPED_PORT), null);
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 3eb12969bed..e9a0b95d7ed 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -57,10 +57,10 @@ public ElasticsearchContainer(String dockerImageName) {
     }
 
     public String getHttpHostAddress() {
-        return getContainerIpAddress() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
+        return getHost() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
     }
 
     public InetSocketAddress getTcpHost() {
-        return new InetSocketAddress(getContainerIpAddress(), getMappedPort(ELASTICSEARCH_DEFAULT_TCP_PORT));
+        return new InetSocketAddress(getHost(), getMappedPort(ELASTICSEARCH_DEFAULT_TCP_PORT));
     }
 }
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index c3ac909f2d4..68efc516504 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -131,7 +131,7 @@ public SELF withPassword(final String password) {
      * @return a url to influxDb
      */
     public String getUrl() {
-        return "http://" + getContainerIpAddress() + ":" + getLivenessCheckPort();
+        return "http://" + getHost() + ":" + getLivenessCheckPort();
     }
 
     /**
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
index bae3885527d..177a48bb9d0 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
@@ -15,6 +15,6 @@ public RedisContainer(String dockerImageName) {
     }
 
     public Jedis getJedis() {
-        return new Jedis(getContainerIpAddress(), getMappedPort(6379));
+        return new Jedis(getHost(), getMappedPort(6379));
     }
 }
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 5aab0f52ffa..bb92f85b03c 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -88,7 +88,7 @@ public String getBootstrapServers() {
         if (port == PORT_NOT_ASSIGNED) {
             throw new IllegalStateException("You should start Kafka container first");
         }
-        return String.format("PLAINTEXT://%s:%s", getContainerIpAddress(), port);
+        return String.format("PLAINTEXT://%s:%s", getHost(), port);
     }
 
     @Override
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index c649d322ead..96cedb37726 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -63,7 +63,7 @@ protected void configure() {
             withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getNetworkAliases().get(getNetworkAliases().size() - 1));  // use the last network alias set
             hostnameExternalReason = "to match last network alias on container with non-default network";
         } else {
-            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getContainerIpAddress());
+            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getHost());
             hostnameExternalReason = "to match host-routable address for container";
         }
         logger().info("{} environment variable set to {} ({})", HOSTNAME_EXTERNAL_ENV_VAR, getEnvMap().get(HOSTNAME_EXTERNAL_ENV_VAR), hostnameExternalReason);
@@ -134,7 +134,7 @@ public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service s
      */
     public URI getEndpointOverride(Service service) {
         try {
-            final String address = getContainerIpAddress();
+            final String address = getHost();
             String ipAddress = address;
             // resolve IP address and use that as the endpoint so that path-style access is automatically used for S3
             ipAddress = InetAddress.getByName(address).getHostAddress();
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index fb21dd9a1a9..1b4cb3344e4 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -60,7 +60,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:mariadb://" + getContainerIpAddress() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName;
+        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
index 4ddbed997d4..e37e9b0b6bf 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
@@ -23,7 +23,7 @@ public static ConnectionFactoryOptions getOptions(MariaDBContainer<?> container)
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
         return options.mutate()
-            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MariaDBContainer.MARIADB_PORT))
             .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
             .option(ConnectionFactoryOptions.USER, container.getUsername())
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index f1f9dc42d19..e35370f4b27 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -20,7 +20,7 @@ public MockServerContainer(String version) {
     }
 
     public String getEndpoint() {
-        return String.format("http://%s:%d", getContainerIpAddress(), getMappedPort(PORT));
+        return String.format("http://%s:%d", getHost(), getMappedPort(PORT));
     }
 
     public Integer getServerPort() {
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index be1495a04c7..91f740b4bd8 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -33,7 +33,7 @@ private static String responseFromMockserver(MockServerContainer mockServer, Str
     @Test
     public void shouldReturnExpectation() throws Exception {
         // testSimpleExpectation {
-        new MockServerClient(mockServer.getContainerIpAddress(), mockServer.getServerPort())
+        new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
             .when(request()
                 .withPath("/person")
                 .withQueryStringParameter("name", "peter"))
@@ -57,7 +57,7 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
             String expectedBody = "Hello World!";
 
-            new MockServerClient(mockServer.getContainerIpAddress(), mockServer.getServerPort())
+            new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
                 .when(request().withPath("/hello"))
                 .respond(response().withBody(expectedBody));
 
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
index 27c486c218c..59c3ed0de68 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
@@ -23,7 +23,7 @@ public static ConnectionFactoryOptions getOptions(MSSQLServerContainer<?> contai
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
         return options.mutate()
-            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT))
             // TODO enable if/when MSSQLServerContainer adds support for customizing the DB name
             // .option(ConnectionFactoryOptions.DATABASE, container.getDatabasseName())
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 2219a5aaf61..631228aeef2 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -62,7 +62,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:sqlserver://" + getContainerIpAddress() + ":" + getMappedPort(MS_SQL_SERVER_PORT);
+        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT);
     }
 
     @Override
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index b8bbe225617..79d29234b99 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -70,7 +70,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:mysql://" + getContainerIpAddress() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName;
+        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
index c43ffcca1b2..274224352a8 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
@@ -23,7 +23,7 @@ public static ConnectionFactoryOptions getOptions(MySQLContainer<?> container) {
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
         return options.mutate()
-            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MySQLContainer.MYSQL_PORT))
             .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
             .option(ConnectionFactoryOptions.USER, container.getUsername())
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 0c16927dba8..10545da43d6 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -111,21 +111,21 @@ protected void configure() {
      * @return Bolt URL for use with Neo4j's Java-Driver.
      */
     public String getBoltUrl() {
-        return String.format("bolt://" + getContainerIpAddress() + ":" + getMappedPort(DEFAULT_BOLT_PORT));
+        return String.format("bolt://" + getHost() + ":" + getMappedPort(DEFAULT_BOLT_PORT));
     }
 
     /**
      * @return URL of the transactional HTTP endpoint.
      */
     public String getHttpUrl() {
-        return String.format("http://" + getContainerIpAddress() + ":" + getMappedPort(DEFAULT_HTTP_PORT));
+        return String.format("http://" + getHost() + ":" + getMappedPort(DEFAULT_HTTP_PORT));
     }
 
     /**
      * @return URL of the transactional HTTPS endpoint.
      */
     public String getHttpsUrl() {
-        return String.format("https://" + getContainerIpAddress() + ":" + getMappedPort(DEFAULT_HTTPS_PORT));
+        return String.format("https://" + getHost() + ":" + getMappedPort(DEFAULT_HTTPS_PORT));
     }
 
     /**
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index bedf040869f..fb931bce409 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -33,7 +33,7 @@ protected Set<Integer> getLivenessCheckPorts() {
     }
 
     public URL getBaseUrl(String scheme, int port) throws MalformedURLException {
-        return new URL(scheme + "://" + getContainerIpAddress() + ":" + getMappedPort(port));
+        return new URL(scheme + "://" + getHost() + ":" + getMappedPort(port));
     }
 
     public void setCustomContent(String htmlContentPath) {
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index e86768bc383..60603a7e222 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -64,7 +64,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:oracle:thin:" + getUsername() + "/" + getPassword() + "@" + getContainerIpAddress() + ":" + getOraclePort() + ":" + getSid();
+        return "jdbc:oracle:thin:" + getUsername() + "/" + getPassword() + "@" + getHost() + ":" + getOraclePort() + ":" + getSid();
     }
 
     @Override
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index ca0180640ce..b7fcc85573a 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -108,7 +108,7 @@ public OrientDB getOrientDB() {
     }
 
     public String getServerUrl() {
-        return "remote:" + getContainerIpAddress() + ":" + getMappedPort(2424);
+        return "remote:" + getHost() + ":" + getMappedPort(2424);
     }
 
     public String getDbUrl() {
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index 0a067b375b6..54b0661cae2 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -63,7 +63,7 @@ public void shouldInitializeDatabaseFromScript() {
             container.start();
 
             assertThat(container.getDbUrl())
-                .isEqualTo("remote:" + container.getContainerIpAddress() + ":" + container.getMappedPort(2424) + "/persons");
+                .isEqualTo("remote:" + container.getHost() + ":" + container.getMappedPort(2424) + "/persons");
 
             final ODatabaseSession session = container.getSession();
 
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 06cdd7ebc8d..8634f9d70fa 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -68,7 +68,7 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         // Disable Postgres driver use of java.util.logging to reduce noise at startup time
-        return format("jdbc:postgresql://%s:%d/%s?loggerLevel=OFF", getContainerIpAddress(), getMappedPort(POSTGRESQL_PORT), databaseName);
+        return format("jdbc:postgresql://%s:%d/%s?loggerLevel=OFF", getHost(), getMappedPort(POSTGRESQL_PORT), databaseName);
     }
 
     @Override
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
index 9bfb9fdee05..88b5497f5d3 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
@@ -23,7 +23,7 @@ public static ConnectionFactoryOptions getOptions(PostgreSQLContainer<?> contain
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
         return options.mutate()
-            .option(ConnectionFactoryOptions.HOST, container.getContainerIpAddress())
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT))
             .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
             .option(ConnectionFactoryOptions.USER, container.getUsername())
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index 3b887cedbec..05f6ea204a8 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -48,7 +48,7 @@ public void shouldRejectInvalidQueryString() {
     static class FixedJdbcUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
 
         @Override
-        public String getContainerIpAddress() {
+        public String getHost() {
             return "localhost";
         }
 
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 0f2a82b9b9d..56488525734 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -49,7 +49,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return format("jdbc:presto://%s:%s/%s", getContainerIpAddress(), getMappedPort(PRESTO_PORT), nullToEmpty(catalog));
+        return format("jdbc:presto://%s:%s/%s", getHost(), getMappedPort(PRESTO_PORT), nullToEmpty(catalog));
     }
 
     @Override
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 49f0437f95a..c9532979057 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -26,11 +26,11 @@ public PulsarContainer(String pulsarVersion) {
     }
 
     public String getPulsarBrokerUrl() {
-        return String.format("pulsar://%s:%s", getContainerIpAddress(), getMappedPort(BROKER_PORT));
+        return String.format("pulsar://%s:%s", getHost(), getMappedPort(BROKER_PORT));
     }
 
     public String getHttpServiceUrl() {
-        return String.format("http://%s:%s", getContainerIpAddress(), getMappedPort(BROKER_HTTP_PORT));
+        return String.format("http://%s:%s", getHost(), getMappedPort(BROKER_HTTP_PORT));
     }
 }
 
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index aba71e25a7e..49423201d14 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -114,28 +114,28 @@ public Integer getHttpPort() {
      * @return AMQP URL for use with AMQP clients.
      */
     public String getAmqpUrl() {
-        return "amqp://" + getContainerIpAddress() + ":" + getAmqpPort();
+        return "amqp://" + getHost() + ":" + getAmqpPort();
     }
 
     /**
      * @return AMQPS URL for use with AMQPS clients.
      */
     public String getAmqpsUrl() {
-        return "amqps://" + getContainerIpAddress() + ":" + getAmqpsPort();
+        return "amqps://" + getHost() + ":" + getAmqpsPort();
     }
 
     /**
      * @return URL of the HTTP management endpoint.
      */
     public String getHttpUrl() {
-        return "http://" + getContainerIpAddress() + ":" + getHttpPort();
+        return "http://" + getHost() + ":" + getHttpPort();
     }
 
     /**
      * @return URL of the HTTPS management endpoint.
      */
     public String getHttpsUrl() {
-        return "https://" + getContainerIpAddress() + ":" + getHttpsPort();
+        return "https://" + getHost() + ":" + getHttpsPort();
     }
 
     /**
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 6f283c7451f..27ac38f55ce 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -49,13 +49,13 @@ public void shouldCreateRabbitMQContainer()
             container.start();
 
             assertThat(container.getAmqpsUrl()).isEqualTo(
-                String.format("amqps://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQPS_PORT)));
+                String.format("amqps://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQPS_PORT)));
             assertThat(container.getAmqpUrl()).isEqualTo(
-                String.format("amqp://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_AMQP_PORT)));
+                String.format("amqp://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQP_PORT)));
             assertThat(container.getHttpsUrl()).isEqualTo(
-                String.format("https://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTPS_PORT)));
+                String.format("https://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTPS_PORT)));
             assertThat(container.getHttpUrl()).isEqualTo(
-                String.format("http://%s:%d", container.getContainerIpAddress(), container.getMappedPort(DEFAULT_HTTP_PORT)));
+                String.format("http://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTP_PORT)));
 
             assertThat(container.getHttpsPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTPS_PORT));
             assertThat(container.getHttpPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTP_PORT));
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 49218dfb990..397f6c4a2cf 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -207,7 +207,7 @@ public static String getImageForCapabilities(Capabilities capabilities, String s
 
     public URL getSeleniumAddress() {
         try {
-            return new URL("http", getContainerIpAddress(), getMappedPort(SELENIUM_PORT), "/wd/hub");
+            return new URL("http", getHost(), getMappedPort(SELENIUM_PORT), "/wd/hub");
         } catch (MalformedURLException e) {
             e.printStackTrace();// TODO
             return null;
@@ -216,7 +216,7 @@ public URL getSeleniumAddress() {
 
     @Override
     public String getVncAddress() {
-        return "vnc://vnc:secret@" + getContainerIpAddress() + ":" + getMappedPort(VNC_PORT);
+        return "vnc://vnc:secret@" + getHost() + ":" + getMappedPort(VNC_PORT);
     }
 
     @Override
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
index 014b25eac1f..5a12ce25b71 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
@@ -38,7 +38,7 @@ class TestcontainersSharedContainerIT extends Specification {
     }
 
     private CloseableHttpResponse performHttpRequest(CloseableHttpClient client) {
-        String ip = genericContainer.containerIpAddress
+        String ip = genericContainer.host
         String port = genericContainer.getMappedPort(80)
         def response = client.execute(new HttpGet("http://$ip:$port"))
         response
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index 1b631fa9d6d..f2915b5af11 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -47,7 +47,7 @@ public ToxiproxyContainer(String imageName) {
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        client = new ToxiproxyClient(getContainerIpAddress(), getMappedPort(TOXIPROXY_CONTROL_PORT));
+        client = new ToxiproxyClient(getHost(), getMappedPort(TOXIPROXY_CONTROL_PORT));
     }
 
     /**
@@ -88,7 +88,7 @@ public ContainerProxy getProxy(String hostname, int port) {
 
                 final Proxy proxy = client.createProxy(upstream, "0.0.0.0:" + toxiPort, upstream);
                 final int mappedPort = getMappedPort(toxiPort);
-                return new ContainerProxy(proxy, getContainerIpAddress(), mappedPort, toxiPort);
+                return new ContainerProxy(proxy, getHost(), mappedPort, toxiPort);
             } catch (IOException e) {
                 throw new RuntimeException("Proxy could not be created", e);
             }
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 366f425b5b5..d76851f57b5 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -40,7 +40,7 @@ public class ToxiproxyTest {
 
     @Test
     public void testDirect() {
-        final Jedis jedis = createJedis(redis.getContainerIpAddress(), redis.getFirstMappedPort());
+        final Jedis jedis = createJedis(redis.getHost(), redis.getFirstMappedPort());
         jedis.set("somekey", "somevalue");
 
         final String s = jedis.get("somekey");
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
index 8091980d234..dfe73cae4b9 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
@@ -5,7 +5,6 @@
 import com.bettercloud.vault.VaultException;
 import com.bettercloud.vault.response.LogicalResponse;
 import org.junit.Test;
-import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,7 +25,7 @@ public void writeAndReadMultipleValues() throws VaultException {
             vaultContainer.start();
 
             final VaultConfig config = new VaultConfig()
-                .address("http://" + vaultContainer.getContainerIpAddress() + ":" + vaultContainer.getFirstMappedPort())
+                .address("http://" + vaultContainer.getHost() + ":" + vaultContainer.getFirstMappedPort())
                 .token(VAULT_TOKEN)
                 .build();
 
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index fae9209c8e7..d7ac5ca8686 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -71,7 +71,7 @@ public void readSecondSecretPathOverHttpApi() throws InterruptedException {
     }
 
     private String getHostAndPort() {
-        return vaultContainer.getContainerIpAddress() + ":" + vaultContainer.getMappedPort(8200);
+        return vaultContainer.getHost() + ":" + vaultContainer.getMappedPort(8200);
     }
 
 

From 1eef935529564c0f2df1384bd5d55999f849bf5c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 15 May 2020 15:14:28 +0200
Subject: [PATCH 0731/4969] Store `GenericContainer#exposedPorts` as an
 order-preserving `Set` (#2613)

* Store `GenericContainer#exposedPorts` as an order-preserving `Set`

* Update core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

Co-authored-by: Richard North <rich.north@gmail.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../containers/GenericContainer.java           | 18 +++++++++++++++---
 .../junit/GenericContainerRuleTest.java        |  9 +++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 89938cdfe56..d906c320bd5 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -77,6 +77,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -118,7 +119,7 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
      * Default settings
      */
     @NonNull
-    private List<Integer> exposedPorts = new ArrayList<>();
+    private LinkedHashSet<Integer> exposedPorts = new LinkedHashSet<>();
 
     @NonNull
     private List<String> portBindings = new ArrayList<>();
@@ -256,6 +257,16 @@ public void setImage(Future<String> image) {
         this.image = new RemoteDockerImage(image);
     }
 
+    @Override
+    public List<Integer> getExposedPorts() {
+        return new ArrayList<>(exposedPorts);
+    }
+
+    @Override
+    public void setExposedPorts(List<Integer> exposedPorts) {
+        this.exposedPorts = new LinkedHashSet<>(exposedPorts);
+    }
+
     /**
      * @see #dependsOn(Iterable)
      */
@@ -671,8 +682,9 @@ protected void containerIsStopped(InspectContainerResponse containerInfo) {
     @Deprecated
     protected Integer getLivenessCheckPort() {
         // legacy implementation for backwards compatibility
-        if (exposedPorts.size() > 0) {
-            return getMappedPort(exposedPorts.get(0));
+        Iterator<Integer> exposedPortsIterator = exposedPorts.iterator();
+        if (exposedPortsIterator.hasNext()) {
+            return getMappedPort(exposedPortsIterator.next());
         } else if (portBindings.size() > 0) {
             return Integer.valueOf(PortBinding.parse(portBindings.get(0)).getBinding().getHostPortSpec());
         } else {
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index 1f4a3ff121d..b450244a84d 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -379,6 +379,15 @@ public void addExposedPortAfterWithExposedPortsTest() {
         assertTrue("addExposedPort should be exposed", redis.getExposedPorts().contains(8987));
     }
 
+    @Test
+    public void addingExposedPortTwiceShouldNotFail() {
+        redis.addExposedPort(8987);
+        redis.addExposedPort(8987);
+        assertThat("Both ports should be exposed", redis.getExposedPorts().size(), equalTo(2)); // 2 ports = de-duplicated port 8897 and original port 6379
+        assertTrue("withExposedPort should be exposed", redis.getExposedPorts().contains(REDIS_PORT));
+        assertTrue("addExposedPort should be exposed", redis.getExposedPorts().contains(8987));
+    }
+
     @Test
     public void sharedMemorySetTest() {
         try (GenericContainer containerWithSharedMemory = new GenericContainer()

From 8c7c769cdfd3848457e0a70de8518f08ad7053b4 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 16 May 2020 20:43:00 +0100
Subject: [PATCH 0732/4969] Dynamic CI jobs for examples (#2677)

---
 .../{ci-dind.yml => ci-docker-wormhole.yml}   |  2 +-
 .github/workflows/ci-examples.yml             | 73 +++++++++++++++++++
 .github/workflows/ci.yml                      | 27 -------
 examples/build.gradle                         |  5 ++
 examples/settings.gradle                      | 36 +++++++++
 gradle/ci-support.gradle                      |  6 +-
 settings.gradle                               | 38 +++++-----
 7 files changed, 137 insertions(+), 50 deletions(-)
 rename .github/workflows/{ci-dind.yml => ci-docker-wormhole.yml} (96%)
 create mode 100644 .github/workflows/ci-examples.yml

diff --git a/.github/workflows/ci-dind.yml b/.github/workflows/ci-docker-wormhole.yml
similarity index 96%
rename from .github/workflows/ci-dind.yml
rename to .github/workflows/ci-docker-wormhole.yml
index 15bd5ec76ee..3c6da54dc1f 100644
--- a/.github/workflows/ci-dind.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -1,4 +1,4 @@
-name: in-container
+name: CI-Docker-Wormhole
 
 on:
   pull_request: {}
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
new file mode 100644
index 00000000000..bec794dc167
--- /dev/null
+++ b/.github/workflows/ci-examples.yml
@@ -0,0 +1,73 @@
+name: CI-Examples
+
+on:
+  pull_request: {}
+  push: { branches: [ master ] }
+
+env:
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+  find_gradle_jobs:
+    runs-on: ubuntu-18.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '1.8'
+      - name: Cache Gradle Home files
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-home-testmatrix-examples-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-home-testmatrix-examples-
+            ${{ runner.os }}-gradle-home-
+      - id: set-matrix
+        working-directory: ./examples/
+        env:
+          # Since we override the tests executor,
+          # we should not push empty results to the cache
+          READ_ONLY_REMOTE_GRADLE_CACHE: true
+        run: |
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
+          echo $TASKS
+          echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
+  check:
+    needs: find_gradle_jobs
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '1.8'
+      - name: Cache Gradle Home files
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
+            ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
+            ${{ runner.os }}-gradle-home-examples-
+      - name: Clear existing docker image cache
+        run: docker image prune -af
+      - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
+        working-directory: ./examples/
+        run: |
+          ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+      - name: Aggregate Examples test reports with ciMate
+        if: always()
+        env:
+          CIMATE_PROJECT_ID: 2348n4vl
+          CIMATE_CI_KEY: "Examples / ${{ runner.os }} / ${{matrix.gradle_args}}"
+        run: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6baaf7e92d..90e64dde133 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,30 +69,3 @@ jobs:
           wget -q https://get.cimate.io/release/linux/cimate
           chmod +x cimate
           ./cimate "**/TEST-*.xml"
-  examples:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '1.8'
-      - name: Cache Gradle Home files
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-home-examples-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-examples-
-      - name: Build and test Examples with Gradle
-        working-directory: ./examples/
-        run: |
-          ./gradlew --no-daemon --scan --info check
-      - name: Aggregate test reports with ciMate
-        if: always()
-        env:
-          CIMATE_PROJECT_ID: 2348n4vl
-          CIMATE_CI_KEY: examples
-        run: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
diff --git a/examples/build.gradle b/examples/build.gradle
index b2ecf1b0be3..25b7c1fcf29 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1 +1,6 @@
 // empty build.gradle for dependabot
+apply from: "$rootDir/../gradle/ci-support.gradle"
+
+subprojects {
+    apply plugin:"java"
+}
diff --git a/examples/settings.gradle b/examples/settings.gradle
index ef47a61f807..25da14a0931 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -1,3 +1,18 @@
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.2.1"
+    }
+}
+
+apply plugin: 'ch.myniva.s3-build-cache'
+apply plugin: 'com.gradle.enterprise'
+
 rootProject.name = 'testcontainers-examples'
 
 includeBuild '..'
@@ -15,3 +30,24 @@ include 'spring-boot'
 include 'cucumber'
 include 'spring-boot-kotlin-redis'
 include 'spock'
+
+ext.isMasterBuild = false ||
+    (System.getenv("GITHUB_REF") == "refs/heads/master") ||
+    (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
+
+buildCache {
+    local {
+        enabled = !isMasterBuild
+    }
+
+    remote(ch.myniva.gradle.caching.s3.AwsS3BuildCache) {
+        endpoint = 'fra1.digitaloceanspaces.com'
+        region = 'fra1'
+        bucket = 'testcontainers'
+        path = 'cache'
+        push = isMasterBuild && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
+        headers = [
+            'x-amz-acl': 'public-read'
+        ]
+    }
+}
diff --git a/gradle/ci-support.gradle b/gradle/ci-support.gradle
index 7c3408068b3..e83c936f2f3 100644
--- a/gradle/ci-support.gradle
+++ b/gradle/ci-support.gradle
@@ -28,9 +28,9 @@ gradle.taskGraph.whenReady {
             subproject.tasks.withType(Test).all {
                 testExecuter([execute: { spec, processor -> }, stopNow:{}] as org.gradle.api.internal.tasks.testing.TestExecuter)
             }
-            subproject.tasks.findByName("shadowJar").enabled = false
-            subproject.tasks.findByName("javadoc").enabled = false
-            subproject.tasks.findByName("delombok").enabled = false
+            subproject.tasks.findByName("shadowJar")?.enabled = false
+            subproject.tasks.findByName("javadoc")?.enabled = false
+            subproject.tasks.findByName("delombok")?.enabled = false
             subproject.tasks.findByName("japicmp")?.enabled = false
         }
     }
diff --git a/settings.gradle b/settings.gradle
index 150d79f89fe..2ea21599ceb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,25 @@ buildscript {
 apply plugin: 'ch.myniva.s3-build-cache'
 apply plugin: 'com.gradle.enterprise'
 
+rootProject.name = 'testcontainers-java'
+
+include "bom"
+
+include "testcontainers"
+project(':testcontainers').projectDir = "$rootDir/core" as File
+
+file('modules').eachDir { dir ->
+    include dir.name
+    project(":${dir.name}").projectDir = dir
+}
+
+include ':docs:examples:junit4:generic'
+include ':docs:examples:junit4:redis'
+include ':docs:examples:junit5:redis'
+include ':docs:examples:spock:redis'
+
+include 'test-support'
+
 ext.isMasterBuild = false ||
     (System.getenv("GITHUB_REF") == "refs/heads/master") ||
     (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
@@ -34,25 +53,6 @@ buildCache {
     }
 }
 
-rootProject.name = 'testcontainers-java'
-
-include "bom"
-
-include "testcontainers"
-project(':testcontainers').projectDir = "$rootDir/core" as File
-
-file('modules').eachDir { dir ->
-    include dir.name
-    project(":${dir.name}").projectDir = dir
-}
-
-include ':docs:examples:junit4:generic'
-include ':docs:examples:junit4:redis'
-include ':docs:examples:junit5:redis'
-include ':docs:examples:spock:redis'
-
-include 'test-support'
-
 gradleEnterprise {
     buildScan {
         termsOfServiceUrl = 'https://gradle.com/terms-of-service'

From bf233cd62b610491f9007c7aa94e087298f0109b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 May 2020 21:49:03 +0100
Subject: [PATCH 0733/4969] Bump testcontainers from 1.14.1 to 1.14.2 in /core
 (#2751)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 39495e59dce..48bbf57d7e9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,7 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.14.1', {
+    baseline 'org.testcontainers:testcontainers:1.14.2', {
         exclude group: "*", module: "*"
     }
 

From 1e0625cea385f8c1e1864a365a471ac7dcdd86a2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 May 2020 21:49:27 +0100
Subject: [PATCH 0734/4969] Bump guava from 28.2-jre to 29.0-jre in
 /modules/jdbc-test (#2754)

---
 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 8b36f126b86..df9c26fcd72 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     compile project(':jdbc')
     compile project(':test-support')
 
-    compile 'com.google.guava:guava:28.2-jre'
+    compile 'com.google.guava:guava:29.0-jre'
     compile 'org.apache.commons:commons-lang3:3.10'
     compile 'com.zaxxer:HikariCP-java6:2.3.13'
     compile 'commons-dbutils:commons-dbutils:1.7'

From e465f5d836922a1b3f5853a65a57d349574f62e3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 May 2020 21:49:45 +0100
Subject: [PATCH 0735/4969] Bump mssql-jdbc from 8.2.2.jre8 to
 8.3.0.jre8-preview in /modules/mssqlserver (#2755)

---
 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 5d72209b27e..8cdfa35dee1 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.2.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.0.jre8-preview'
 
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.1.RELEASE'

From 421f67bff6b5d814ec4b92c7c9b6086e00e4c886 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 May 2020 21:50:25 +0100
Subject: [PATCH 0736/4969] Bump tomcat-jdbc from 9.0.33 to 9.0.35 in
 /modules/jdbc (#2744)

---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index aa21939c769..1cfdeab73b2 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 }

From 6b6feeb39baf0328628925821bbb40a90e7dafbd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 May 2020 21:51:05 +0100
Subject: [PATCH 0737/4969] Bump tomcat-jdbc from 9.0.33 to 9.0.35 in
 /modules/jdbc-test (#2752)

---
 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 df9c26fcd72..eb3e4ed222d 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     }
 
     compile 'commons-dbutils:commons-dbutils:1.7'
-    compile 'org.apache.tomcat:tomcat-jdbc:9.0.33'
+    compile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
     compile 'org.vibur:vibur-dbcp:25.0'
     compile 'mysql:mysql-connector-java:8.0.19'
 }

From 2a9b875fcad74251abad8c7b874714ad17e9082e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 May 2020 21:51:19 +0100
Subject: [PATCH 0738/4969] Bump mysql-connector-java from 8.0.19 to 8.0.20 in
 /modules/jdbc-test (#2750)

---
 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 eb3e4ed222d..23564279332 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.35'
     compile 'org.vibur:vibur-dbcp:25.0'
-    compile 'mysql:mysql-connector-java:8.0.19'
+    compile 'mysql:mysql-connector-java:8.0.20'
 }

From 3bdd665048b3a7f13d6c2acf75f687a4f076f50a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 17 May 2020 06:45:03 +0100
Subject: [PATCH 0739/4969] Add gradle.properties to examples to enable caching

---
 examples/gradle.properties | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 examples/gradle.properties

diff --git a/examples/gradle.properties b/examples/gradle.properties
new file mode 100644
index 00000000000..dad41a4425a
--- /dev/null
+++ b/examples/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.parallel=false
+org.gradle.caching=true

From 4450294c6cd2a01233f1baa2ba9723c5c1c2ef54 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 17 May 2020 07:17:43 +0100
Subject: [PATCH 0740/4969] Bump aws-java-sdk-s3 from 1.11.782 to 1.11.784 in
 /modules/localstack (#2747)

---
 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 3f88f41c176..67b9d6e79f8 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.782'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.784'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.782'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.782'

From a1a8c4c212587692fcf64dd9cd0b8336a7aff4ea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 17 May 2020 07:35:37 +0100
Subject: [PATCH 0741/4969] Bump aws-java-sdk-sqs from 1.11.782 to 1.11.784 in
 /modules/localstack (#2746)

---
 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 67b9d6e79f8..9b4133c6d4d 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.784'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.782'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.784'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.782'
     testCompile 'software.amazon.awssdk:s3:2.13.16'
 }

From 0fafaa909e5b2f434b5846dfc8719d0460cac779 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 17 May 2020 07:35:45 +0100
Subject: [PATCH 0742/4969] Bump solr-solrj from 8.3.0 to 8.5.1 in /examples
 (#2749)

---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 62ed7d1153a..7e9b7a8c71f 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.10"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
-    implementation 'org.apache.solr:solr-solrj:8.3.0'
+    implementation 'org.apache.solr:solr-solrj:8.5.1'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From f88eb3f4f28b5b74bdb725e143a9db89c72afbfb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 17 May 2020 07:35:56 +0100
Subject: [PATCH 0743/4969] Bump org.springframework.boot from 2.2.7.RELEASE to
 2.3.0.RELEASE in /examples (#2753)

---
 examples/selenium-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 04888a55c65..49e015f1af3 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.2.7.RELEASE'
+    id 'org.springframework.boot' version '2.3.0.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From eb30647d19ceb87c0303e40341a4dd6dd28f9c81 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 17 May 2020 07:36:08 +0100
Subject: [PATCH 0744/4969] Bump s3 from 2.13.16 to 2.13.18 in
 /modules/localstack (#2748)

---
 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 9b4133c6d4d..482b977792d 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.782'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.784'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.782'
-    testCompile 'software.amazon.awssdk:s3:2.13.16'
+    testCompile 'software.amazon.awssdk:s3:2.13.18'
 }

From 206c5f65482475e14e9fc1eba5edd7d20ae25aea Mon Sep 17 00:00:00 2001
From: "Roman S.A" <eaxdev@ya.ru>
Date: Thu, 21 May 2020 18:36:24 +0300
Subject: [PATCH 0745/4969] Added additional url params in
 JdbcDatabaseContainer (#1802) (#1874)

---
 .../containers/ClickHouseContainer.java       |  4 +
 .../containers/CockroachContainer.java        |  4 +-
 .../cockroachdb/SimpleCockroachDBTest.java    | 20 +++++
 .../containers/Db2Container.java              |  4 +-
 .../junit/db2/SimpleDb2Test.java              | 15 ++++
 .../containers/JdbcDatabaseContainer.java     | 23 +++++
 .../containers/MariaDBContainer.java          |  4 +-
 .../junit/mariadb/SimpleMariaDBTest.java      | 20 +++++
 .../containers/MSSQLServerContainer.java      |  3 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    | 16 ++++
 .../containers/MySQLContainer.java            |  6 +-
 .../junit/mysql/SimpleMySQLTest.java          | 83 ++++++++++++++++++-
 .../containers/OracleContainer.java           |  5 ++
 .../containers/PostgreSQLContainer.java       | 24 ++----
 .../PostgreSQLConnectionURLTest.java          |  2 +-
 .../postgresql/SimplePostgreSQLTest.java      | 15 ++++
 16 files changed, 222 insertions(+), 26 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 4d4ea2d11a9..10c0e1835c2 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -66,4 +66,8 @@ public String getTestQueryString() {
         return TEST_QUERY;
     }
 
+    @Override
+    public ClickHouseContainer withUrlParam(String paramName, String paramValue) {
+        throw new UnsupportedOperationException("The ClickHouse does not support this");
+    }
 }
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 3768ca7a008..de64902c88a 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -43,7 +43,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 7c62b2f6bcf..14fe20222a3 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -9,6 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
@@ -42,4 +44,22 @@ public void testExplicitInitScript() throws SQLException {
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        CockroachContainer cockroach = new CockroachContainer()
+            .withUrlParam("sslmode", "disable")
+            .withUrlParam("application_name", "cockroach");
+
+        try {
+            cockroach.start();
+            String jdbcUrl = cockroach.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("sslmode=disable"));
+            assertThat(jdbcUrl, containsString("application_name=cockroach"));
+        } finally {
+            cockroach.stop();
+        }
+    }
 }
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index b1472b21c6c..05edcb2c3ed 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -73,7 +73,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters(":", ";", ";");
+        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 08f427cf12b..6cc7535f785 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -7,6 +7,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleDb2Test extends AbstractContainerDatabaseTest {
@@ -24,4 +26,17 @@ public void testSimple() throws SQLException {
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (Db2Container db2 = new Db2Container()
+            .withUrlParam("sslConnection", "false")
+            .acceptLicense()) {
+
+            db2.start();
+
+            String jdbcUrl = db2.getJdbcUrl();
+            assertThat(jdbcUrl, containsString(":sslConnection=false;"));
+        }
+    }
 }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 36a6461aa74..6c265bc6943 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.NonNull;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.delegate.DatabaseDelegate;
@@ -17,6 +18,8 @@
 import java.util.Properties;
 import java.util.concurrent.Future;
 
+import static java.util.stream.Collectors.joining;
+
 /**
  * Base class for containers that expose a JDBC connection
  *
@@ -28,6 +31,7 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
     private Driver driver;
     private String initScriptPath;
     protected Map<String, String> parameters = new HashMap<>();
+    protected Map<String, String> urlParameters = new HashMap<>();
 
     private int startupTimeoutSeconds = 120;
     private int connectTimeoutSeconds = 120;
@@ -82,7 +86,11 @@ public SELF withPassword(String password) {
 
     public SELF withDatabaseName(String dbName) {
         throw new UnsupportedOperationException();
+    }
 
+    public SELF withUrlParam(String paramName, String paramValue) {
+        urlParameters.put(paramName, paramValue);
+        return self();
     }
 
     /**
@@ -223,6 +231,21 @@ protected String constructUrlForConnection(String queryString) {
         return getJdbcUrl() + queryString;
     }
 
+    protected String constructUrlParameters(String startCharacter, String delimiter) {
+        return constructUrlParameters(startCharacter, delimiter, StringUtils.EMPTY);
+    }
+
+    protected String constructUrlParameters(String startCharacter, String delimiter, String endCharacter) {
+        String urlParameters = "";
+        if (!this.urlParameters.isEmpty()) {
+            String additionalParameters = this.urlParameters.entrySet().stream()
+                .map(Object::toString)
+                .collect(joining(delimiter));
+            urlParameters = startCharacter + additionalParameters + endCharacter;
+        }
+        return urlParameters;
+    }
+
     protected void optionallyMapResourceParameterAsVolume(@NotNull String paramName, @NotNull String pathNameInContainer, @NotNull String defaultResource) {
         String resourceName = parameters.getOrDefault(paramName, defaultResource);
 
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 1b4cb3344e4..04d745a9efe 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -60,7 +60,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 646fbb40947..af503ce424b 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -8,6 +8,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
@@ -68,4 +70,22 @@ public void testMariaDBWithCommandOverride() throws SQLException {
             assertEquals("Auto increment increment should be overriden by command line", "10", result);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        MariaDBContainer mariaDBContainer = (MariaDBContainer) new MariaDBContainer()
+            .withUrlParam("connectTimeout", "40000")
+            .withUrlParam("rewriteBatchedStatements", "true");
+
+        try {
+            mariaDBContainer.start();
+            String jdbcUrl = mariaDBContainer.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
+            assertThat(jdbcUrl, containsString("connectTimeout=40000"));
+        } finally {
+            mariaDBContainer.stop();
+        }
+    }
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 631228aeef2..b500e6fddf0 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -62,7 +62,8 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT);
+        String additionalUrlParams = constructUrlParameters(";", ";");
+        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT) + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index c1699d2473a..71e12a6d864 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -9,6 +9,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
@@ -24,6 +26,20 @@ public void testSimple() throws SQLException {
         }
     }
 
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()
+            .withUrlParam("integratedSecurity", "false")
+            .withUrlParam("applicationName", "MyApp")) {
+
+            mssqlServer.start();
+
+            String jdbcUrl = mssqlServer.getJdbcUrl();
+            assertThat(jdbcUrl, containsString(";integratedSecurity=false;applicationName=MyApp"));
+        }
+    }
+
+
     @Test
     public void testSetupDatabase() throws SQLException {
         try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()) {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 79d29234b99..1ef574cbd5e 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -5,6 +5,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import static java.util.stream.Collectors.joining;
+
 /**
  * @author richardnorth
  */
@@ -70,7 +72,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index ee6c3ab6993..6d6f8d26453 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -9,9 +9,17 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
+import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
+import java.sql.Statement;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
@@ -142,4 +150,77 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamTimeZone() throws SQLException {
+        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+            .withUrlParam("serverTimezone", "Europe/Zurich")
+            .withEnv("TZ", "Europe/Zurich")
+            .withLogConsumer(new Slf4jLogConsumer(logger));
+        mysql.start();
+
+        try(Connection connection = mysql.createConnection("")) {
+            Statement statement = connection.createStatement();
+            statement.execute("SELECT NOW();");
+            try (ResultSet resultSet = statement.getResultSet()) {
+                resultSet.next();
+
+                // checking that the time_zone MySQL is Europe/Zurich
+                LocalDateTime localDateTime = resultSet.getObject(1, LocalDateTime.class);
+                ZonedDateTime actualDateTime = localDateTime.atZone(ZoneId.of("Europe/Zurich"))
+                    .truncatedTo(ChronoUnit.MINUTES);
+                ZonedDateTime expectedDateTime = ZonedDateTime.now(ZoneId.of("Europe/Zurich"))
+                    .truncatedTo(ChronoUnit.MINUTES);
+
+                String message = String.format("MySQL time zone is not Europe/Zurich. MySQL date:%s, current date:%s",
+                    actualDateTime, expectedDateTime);
+                assertTrue(message, actualDateTime.equals(expectedDateTime));
+            }
+        } finally {
+            mysql.stop();
+        }
+    }
+
+    @Test
+    public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
+        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+            .withUrlParam("allowMultiQueries", "true")
+            .withLogConsumer(new Slf4jLogConsumer(logger));
+        mysql.start();
+
+        try(Connection connection = mysql.createConnection("")) {
+            Statement statement = connection.createStatement();
+            String multiQuery = "DROP TABLE IF EXISTS bar; " +
+                "CREATE TABLE bar (foo VARCHAR(20)); " +
+                "INSERT INTO bar (foo) VALUES ('hello world');";
+            statement.execute(multiQuery);
+            statement.execute("SELECT foo FROM bar;");
+            try(ResultSet resultSet = statement.getResultSet()) {
+                resultSet.next();
+                String firstColumnValue = resultSet.getString(1);
+                assertEquals("Value from bar should equal real value", "hello world", firstColumnValue);
+            }
+        } finally {
+            mysql.stop();
+        }
+    }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+            .withUrlParam("allowMultiQueries", "true")
+            .withUrlParam("rewriteBatchedStatements", "true")
+            .withLogConsumer(new Slf4jLogConsumer(logger));
+
+        try {
+            mysql.start();
+            String jdbcUrl = mysql.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
+            assertThat(jdbcUrl, containsString("allowMultiQueries=true"));
+        } finally {
+            mysql.stop();
+        }
+    }
 }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 60603a7e222..d263a141d4f 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -89,6 +89,11 @@ public OracleContainer withPassword(String password) {
         return self();
     }
 
+    @Override
+    public OracleContainer withUrlParam(String paramName, String paramValue) {
+        throw new UnsupportedOperationException("The OracleDb does not support this");
+    }
+
     @SuppressWarnings("SameReturnValue")
     public String getSid() {
         return "xe";
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 8634f9d70fa..6ba7390878e 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -55,6 +55,8 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
+        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
+        withUrlParam("loggerLevel", "OFF");
         addEnv("POSTGRES_DB", databaseName);
         addEnv("POSTGRES_USER", username);
         addEnv("POSTGRES_PASSWORD", password);
@@ -67,25 +69,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
-        return format("jdbc:postgresql://%s:%d/%s?loggerLevel=OFF", getHost(), getMappedPort(POSTGRESQL_PORT), databaseName);
-    }
-
-    @Override
-    protected String constructUrlForConnection(String queryString) {
-        String baseUrl = getJdbcUrl();
-
-        if ("".equals(queryString)) {
-            return baseUrl;
-        }
-
-        if (!queryString.startsWith("?")) {
-            throw new IllegalArgumentException("The '?' character must be included");
-        }
-
-        return baseUrl.contains("?")
-            ? baseUrl + QUERY_PARAM_SEPARATOR + queryString.substring(1)
-            : baseUrl + queryString;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:postgresql://" + getContainerIpAddress() + ":" + getMappedPort(POSTGRESQL_PORT)
+            + "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index 05f6ea204a8..c0ba7e40d44 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -15,7 +15,7 @@ public void shouldCorrectlyAppendQueryString() {
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
-        assertTrue("Query String contains expected params", queryString.contains("&stringtype=unspecified&stringtype=unspecified"));
+        assertTrue("Query String contains expected params", queryString.contains("?stringtype=unspecified&stringtype=unspecified"));
         assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
         assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
     }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 9c97f51e64e..36ece03b604 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -9,6 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 
@@ -63,4 +65,17 @@ public void testExplicitInitScript() throws SQLException {
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()
+            .withUrlParam("charSet", "UNICODE")) {
+
+            postgres.start();
+            String jdbcUrl = postgres.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("charSet=UNICODE"));
+        }
+    }
 }

From c0fc42ff60bdf639ce28ab6dc3d97117548f1e0a Mon Sep 17 00:00:00 2001
From: vcvitaly <vcvitaly@yahoo.com>
Date: Thu, 21 May 2020 20:02:23 +0300
Subject: [PATCH 0746/4969] Add docs for startup strategy information/examples
 (#1157) (#2565)

* Add startup strategy information/examples to mkdocs #1157

* Update docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java

Co-authored-by: Sergei Egorov <segorov@pivotal.io>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/examples/junit4/generic/build.gradle     |  1 +
 .../StartupCheckStrategyTest.java             | 90 +++++++++++++++++++
 docs/features/startup_and_waits.md            | 49 ++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 97902d5d9ca..5ce878c7ba2 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -5,4 +5,5 @@ dependencies {
     testCompile project(":testcontainers")
     testCompile project(":selenium")
     testCompile "org.seleniumhq.selenium:selenium-api:3.141.59"
+    testCompile 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
new file mode 100644
index 00000000000..5ab32919bb2
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
@@ -0,0 +1,90 @@
+package org.testcontainers.containers.startupcheck;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import lombok.SneakyThrows;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.WaitingConsumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
+import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.IndefiniteOneShotStrategyTest;
+import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.MinimumDurationStrategyTest;
+import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.OneShotStrategyTest;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({OneShotStrategyTest.class, IndefiniteOneShotStrategyTest.class, MinimumDurationStrategyTest.class})
+public class StartupCheckStrategyTest {
+
+    private static final String HELLO_TESTCONTAINERS = "Hello Testcontainers!";
+
+    private static void waitForHello(GenericContainer container) throws TimeoutException {
+        WaitingConsumer consumer = new WaitingConsumer();
+        container.followOutput(consumer, STDOUT);
+
+        consumer.waitUntil(frame ->
+            frame.getUtf8String().contains(HELLO_TESTCONTAINERS), 30, TimeUnit.SECONDS);
+    }
+
+    public static class OneShotStrategyTest {
+        @Rule
+        // withOneShotStrategy {
+        public GenericContainer bboxWithOneShot = new GenericContainer("busybox:1.31.1")
+            .withCommand(String.format("echo %s", HELLO_TESTCONTAINERS))
+            .withStartupCheckStrategy(
+                new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3))
+            );
+        // }
+
+        @SneakyThrows
+        @Test
+        public void testCommandIsExecuted() {
+            waitForHello(bboxWithOneShot);
+
+            assertThat(bboxWithOneShot.isRunning()).isFalse();
+        }
+    }
+
+    public static class IndefiniteOneShotStrategyTest {
+        @Rule
+        // withIndefiniteOneShotStrategy {
+        public GenericContainer bboxWithIndefiniteOneShot = new GenericContainer("busybox:1.31.1")
+            .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
+            .withStartupCheckStrategy(
+                new IndefiniteWaitOneShotStartupCheckStrategy()
+            );
+        // }
+
+        @SneakyThrows
+        @Test
+        public void testCommandIsExecuted() {
+            waitForHello(bboxWithIndefiniteOneShot);
+
+            assertThat(bboxWithIndefiniteOneShot.isRunning()).isFalse();
+        }
+    }
+
+    public static class MinimumDurationStrategyTest {
+        @Rule
+        // withMinimumDurationStrategy {
+        public GenericContainer bboxWithMinimumDuration = new GenericContainer("busybox:1.31.1")
+            .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
+            .withStartupCheckStrategy(
+                new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(5))
+            );
+        // }
+
+        @SneakyThrows
+        @Test
+        public void testCommandIsExecuted() {
+            waitForHello(bboxWithMinimumDuration);
+
+            assertThat(bboxWithMinimumDuration.isRunning()).isTrue();
+        }
+    }
+}
diff --git a/docs/features/startup_and_waits.md b/docs/features/startup_and_waits.md
index e1d30457e5c..3cbec97af0d 100644
--- a/docs/features/startup_and_waits.md
+++ b/docs/features/startup_and_waits.md
@@ -74,3 +74,52 @@ If none of these options meet your requirements, you can create your own subclas
 appropriate wait mechanism in `waitUntilReady()`. 
 The `GenericContainer.waitingFor()` method accepts any valid [`WaitStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/wait/strategy/WaitStrategy.html).
 
+
+## Startup check Strategies
+
+Ordinarily Testcontainers will check that the container has reached the running state and has not exited.
+In order to do that inspect is executed against the container and state parameter is extracted.
+
+All logic is implemented in [`StartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/startupcheck/StartupCheckStrategy.html) child classes.
+
+### Running startup strategy example
+
+This is the strategy used by default. Testcontainers just checks if container is running.
+
+Implemented in [`IsRunningStartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.html) class.
+
+### One shot startup strategy example
+
+This strategy is intended for use with containers that only run briefly and exit of their own accord. As such, success is deemed to be when
+the container has stopped with exit code 0.
+ 
+<!--codeinclude--> 
+[Using one shot startup strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withOneShotStrategy
+<!--/codeinclude-->
+
+### Indefinite one shot startup strategy example
+
+Variant of one shot strategy that does not impose a timeout. Intended for situation such as when a long running task forms part of
+ container startup.
+
+It has to be assumed that the container will stop of its own accord, either with a success or failure exit code.
+
+<!--codeinclude--> 
+[Using indefinite one shot startup strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withIndefiniteOneShotStrategy
+<!--/codeinclude-->
+
+### Minimum duration startup strategy example
+
+Checks that the container is running and has been running for a defined minimum period of time.
+
+<!--codeinclude--> 
+[Using minimum duration strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withMinimumDurationStrategy
+<!--/codeinclude-->
+
+### Other startup  strategies
+
+If none of these options meet your requirements, you can create your own subclass of 
+[`StartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers
+/startupcheck/StartupCheckStrategy.html) with an appropriate startup check mechanism in `waitUntilStartupSuccessful()`.
+Or you can leave it as is and just implement the `checkStartupState(DockerClient dockerClient, String containerId)` if you still want to check state
+ periodically.

From 0385030aa4307c7041a0150edbbd2159f9060e16 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 21 May 2020 19:25:02 +0100
Subject: [PATCH 0747/4969] Revert "Added additional url params in
 JdbcDatabaseContainer (#1802)" (#2775)

---
 .../containers/ClickHouseContainer.java       |  4 -
 .../containers/CockroachContainer.java        |  4 +-
 .../cockroachdb/SimpleCockroachDBTest.java    | 20 -----
 .../containers/Db2Container.java              |  4 +-
 .../junit/db2/SimpleDb2Test.java              | 15 ----
 .../containers/JdbcDatabaseContainer.java     | 23 -----
 .../containers/MariaDBContainer.java          |  4 +-
 .../junit/mariadb/SimpleMariaDBTest.java      | 20 -----
 .../containers/MSSQLServerContainer.java      |  3 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    | 16 ----
 .../containers/MySQLContainer.java            |  6 +-
 .../junit/mysql/SimpleMySQLTest.java          | 83 +------------------
 .../containers/OracleContainer.java           |  5 --
 .../containers/PostgreSQLContainer.java       | 24 ++++--
 .../PostgreSQLConnectionURLTest.java          |  2 +-
 .../postgresql/SimplePostgreSQLTest.java      | 15 ----
 16 files changed, 26 insertions(+), 222 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 10c0e1835c2..4d4ea2d11a9 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -66,8 +66,4 @@ public String getTestQueryString() {
         return TEST_QUERY;
     }
 
-    @Override
-    public ClickHouseContainer withUrlParam(String paramName, String paramValue) {
-        throw new UnsupportedOperationException("The ClickHouse does not support this");
-    }
 }
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index de64902c88a..3768ca7a008 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -43,9 +43,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        String additionalUrlParams = constructUrlParameters("?", "&");
-        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 14fe20222a3..7c62b2f6bcf 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -9,8 +9,6 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
@@ -44,22 +42,4 @@ public void testExplicitInitScript() throws SQLException {
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
     }
-
-    @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
-        CockroachContainer cockroach = new CockroachContainer()
-            .withUrlParam("sslmode", "disable")
-            .withUrlParam("application_name", "cockroach");
-
-        try {
-            cockroach.start();
-            String jdbcUrl = cockroach.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("sslmode=disable"));
-            assertThat(jdbcUrl, containsString("application_name=cockroach"));
-        } finally {
-            cockroach.stop();
-        }
-    }
 }
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 05edcb2c3ed..b1472b21c6c 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -73,9 +73,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        String additionalUrlParams = constructUrlParameters(":", ";", ";");
-        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 6cc7535f785..08f427cf12b 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -7,8 +7,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleDb2Test extends AbstractContainerDatabaseTest {
@@ -26,17 +24,4 @@ public void testSimple() throws SQLException {
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
-
-    @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (Db2Container db2 = new Db2Container()
-            .withUrlParam("sslConnection", "false")
-            .acceptLicense()) {
-
-            db2.start();
-
-            String jdbcUrl = db2.getJdbcUrl();
-            assertThat(jdbcUrl, containsString(":sslConnection=false;"));
-        }
-    }
 }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 6c265bc6943..36a6461aa74 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.NonNull;
-import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.delegate.DatabaseDelegate;
@@ -18,8 +17,6 @@
 import java.util.Properties;
 import java.util.concurrent.Future;
 
-import static java.util.stream.Collectors.joining;
-
 /**
  * Base class for containers that expose a JDBC connection
  *
@@ -31,7 +28,6 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
     private Driver driver;
     private String initScriptPath;
     protected Map<String, String> parameters = new HashMap<>();
-    protected Map<String, String> urlParameters = new HashMap<>();
 
     private int startupTimeoutSeconds = 120;
     private int connectTimeoutSeconds = 120;
@@ -86,11 +82,7 @@ public SELF withPassword(String password) {
 
     public SELF withDatabaseName(String dbName) {
         throw new UnsupportedOperationException();
-    }
 
-    public SELF withUrlParam(String paramName, String paramValue) {
-        urlParameters.put(paramName, paramValue);
-        return self();
     }
 
     /**
@@ -231,21 +223,6 @@ protected String constructUrlForConnection(String queryString) {
         return getJdbcUrl() + queryString;
     }
 
-    protected String constructUrlParameters(String startCharacter, String delimiter) {
-        return constructUrlParameters(startCharacter, delimiter, StringUtils.EMPTY);
-    }
-
-    protected String constructUrlParameters(String startCharacter, String delimiter, String endCharacter) {
-        String urlParameters = "";
-        if (!this.urlParameters.isEmpty()) {
-            String additionalParameters = this.urlParameters.entrySet().stream()
-                .map(Object::toString)
-                .collect(joining(delimiter));
-            urlParameters = startCharacter + additionalParameters + endCharacter;
-        }
-        return urlParameters;
-    }
-
     protected void optionallyMapResourceParameterAsVolume(@NotNull String paramName, @NotNull String pathNameInContainer, @NotNull String defaultResource) {
         String resourceName = parameters.getOrDefault(paramName, defaultResource);
 
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 04d745a9efe..1b4cb3344e4 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -60,9 +60,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        String additionalUrlParams = constructUrlParameters("?", "&");
-        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index af503ce424b..646fbb40947 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -8,8 +8,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
@@ -70,22 +68,4 @@ public void testMariaDBWithCommandOverride() throws SQLException {
             assertEquals("Auto increment increment should be overriden by command line", "10", result);
         }
     }
-
-    @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
-        MariaDBContainer mariaDBContainer = (MariaDBContainer) new MariaDBContainer()
-            .withUrlParam("connectTimeout", "40000")
-            .withUrlParam("rewriteBatchedStatements", "true");
-
-        try {
-            mariaDBContainer.start();
-            String jdbcUrl = mariaDBContainer.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
-            assertThat(jdbcUrl, containsString("connectTimeout=40000"));
-        } finally {
-            mariaDBContainer.stop();
-        }
-    }
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index b500e6fddf0..631228aeef2 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -62,8 +62,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        String additionalUrlParams = constructUrlParameters(";", ";");
-        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT) + additionalUrlParams;
+        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT);
     }
 
     @Override
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 71e12a6d864..c1699d2473a 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -9,8 +9,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
@@ -26,20 +24,6 @@ public void testSimple() throws SQLException {
         }
     }
 
-    @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()
-            .withUrlParam("integratedSecurity", "false")
-            .withUrlParam("applicationName", "MyApp")) {
-
-            mssqlServer.start();
-
-            String jdbcUrl = mssqlServer.getJdbcUrl();
-            assertThat(jdbcUrl, containsString(";integratedSecurity=false;applicationName=MyApp"));
-        }
-    }
-
-
     @Test
     public void testSetupDatabase() throws SQLException {
         try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()) {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 1ef574cbd5e..79d29234b99 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -5,8 +5,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static java.util.stream.Collectors.joining;
-
 /**
  * @author richardnorth
  */
@@ -72,9 +70,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        String additionalUrlParams = constructUrlParameters("?", "&");
-        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 6d6f8d26453..ee6c3ab6993 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -9,17 +9,9 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
@@ -150,77 +142,4 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
-
-    @Test
-    public void testWithAdditionalUrlParamTimeZone() throws SQLException {
-        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
-            .withUrlParam("serverTimezone", "Europe/Zurich")
-            .withEnv("TZ", "Europe/Zurich")
-            .withLogConsumer(new Slf4jLogConsumer(logger));
-        mysql.start();
-
-        try(Connection connection = mysql.createConnection("")) {
-            Statement statement = connection.createStatement();
-            statement.execute("SELECT NOW();");
-            try (ResultSet resultSet = statement.getResultSet()) {
-                resultSet.next();
-
-                // checking that the time_zone MySQL is Europe/Zurich
-                LocalDateTime localDateTime = resultSet.getObject(1, LocalDateTime.class);
-                ZonedDateTime actualDateTime = localDateTime.atZone(ZoneId.of("Europe/Zurich"))
-                    .truncatedTo(ChronoUnit.MINUTES);
-                ZonedDateTime expectedDateTime = ZonedDateTime.now(ZoneId.of("Europe/Zurich"))
-                    .truncatedTo(ChronoUnit.MINUTES);
-
-                String message = String.format("MySQL time zone is not Europe/Zurich. MySQL date:%s, current date:%s",
-                    actualDateTime, expectedDateTime);
-                assertTrue(message, actualDateTime.equals(expectedDateTime));
-            }
-        } finally {
-            mysql.stop();
-        }
-    }
-
-    @Test
-    public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
-        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
-            .withUrlParam("allowMultiQueries", "true")
-            .withLogConsumer(new Slf4jLogConsumer(logger));
-        mysql.start();
-
-        try(Connection connection = mysql.createConnection("")) {
-            Statement statement = connection.createStatement();
-            String multiQuery = "DROP TABLE IF EXISTS bar; " +
-                "CREATE TABLE bar (foo VARCHAR(20)); " +
-                "INSERT INTO bar (foo) VALUES ('hello world');";
-            statement.execute(multiQuery);
-            statement.execute("SELECT foo FROM bar;");
-            try(ResultSet resultSet = statement.getResultSet()) {
-                resultSet.next();
-                String firstColumnValue = resultSet.getString(1);
-                assertEquals("Value from bar should equal real value", "hello world", firstColumnValue);
-            }
-        } finally {
-            mysql.stop();
-        }
-    }
-
-    @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
-        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
-            .withUrlParam("allowMultiQueries", "true")
-            .withUrlParam("rewriteBatchedStatements", "true")
-            .withLogConsumer(new Slf4jLogConsumer(logger));
-
-        try {
-            mysql.start();
-            String jdbcUrl = mysql.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
-            assertThat(jdbcUrl, containsString("allowMultiQueries=true"));
-        } finally {
-            mysql.stop();
-        }
-    }
 }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index d263a141d4f..60603a7e222 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -89,11 +89,6 @@ public OracleContainer withPassword(String password) {
         return self();
     }
 
-    @Override
-    public OracleContainer withUrlParam(String paramName, String paramValue) {
-        throw new UnsupportedOperationException("The OracleDb does not support this");
-    }
-
     @SuppressWarnings("SameReturnValue")
     public String getSid() {
         return "xe";
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 6ba7390878e..8634f9d70fa 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -55,8 +55,6 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
-        withUrlParam("loggerLevel", "OFF");
         addEnv("POSTGRES_DB", databaseName);
         addEnv("POSTGRES_USER", username);
         addEnv("POSTGRES_PASSWORD", password);
@@ -69,9 +67,25 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        String additionalUrlParams = constructUrlParameters("?", "&");
-        return "jdbc:postgresql://" + getContainerIpAddress() + ":" + getMappedPort(POSTGRESQL_PORT)
-            + "/" + databaseName + additionalUrlParams;
+        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
+        return format("jdbc:postgresql://%s:%d/%s?loggerLevel=OFF", getHost(), getMappedPort(POSTGRESQL_PORT), databaseName);
+    }
+
+    @Override
+    protected String constructUrlForConnection(String queryString) {
+        String baseUrl = getJdbcUrl();
+
+        if ("".equals(queryString)) {
+            return baseUrl;
+        }
+
+        if (!queryString.startsWith("?")) {
+            throw new IllegalArgumentException("The '?' character must be included");
+        }
+
+        return baseUrl.contains("?")
+            ? baseUrl + QUERY_PARAM_SEPARATOR + queryString.substring(1)
+            : baseUrl + queryString;
     }
 
     @Override
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index c0ba7e40d44..05f6ea204a8 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -15,7 +15,7 @@ public void shouldCorrectlyAppendQueryString() {
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
-        assertTrue("Query String contains expected params", queryString.contains("?stringtype=unspecified&stringtype=unspecified"));
+        assertTrue("Query String contains expected params", queryString.contains("&stringtype=unspecified&stringtype=unspecified"));
         assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
         assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
     }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 36ece03b604..9c97f51e64e 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -9,8 +9,6 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 
@@ -65,17 +63,4 @@ public void testExplicitInitScript() throws SQLException {
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
     }
-
-    @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()
-            .withUrlParam("charSet", "UNICODE")) {
-
-            postgres.start();
-            String jdbcUrl = postgres.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("charSet=UNICODE"));
-        }
-    }
 }

From 4ba01a655353dd22c8384a8d00dfc53749666109 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 21 May 2020 19:26:30 +0100
Subject: [PATCH 0748/4969] Revert "Add docs for startup strategy
 information/examples (#1157)" (#2776)

---
 docs/examples/junit4/generic/build.gradle     |  1 -
 .../StartupCheckStrategyTest.java             | 90 -------------------
 docs/features/startup_and_waits.md            | 49 ----------
 3 files changed, 140 deletions(-)
 delete mode 100644 docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 5ce878c7ba2..97902d5d9ca 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -5,5 +5,4 @@ dependencies {
     testCompile project(":testcontainers")
     testCompile project(":selenium")
     testCompile "org.seleniumhq.selenium:selenium-api:3.141.59"
-    testCompile 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
deleted file mode 100644
index 5ab32919bb2..00000000000
--- a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.testcontainers.containers.startupcheck;
-
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import lombok.SneakyThrows;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.WaitingConsumer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
-import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.IndefiniteOneShotStrategyTest;
-import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.MinimumDurationStrategyTest;
-import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.OneShotStrategyTest;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({OneShotStrategyTest.class, IndefiniteOneShotStrategyTest.class, MinimumDurationStrategyTest.class})
-public class StartupCheckStrategyTest {
-
-    private static final String HELLO_TESTCONTAINERS = "Hello Testcontainers!";
-
-    private static void waitForHello(GenericContainer container) throws TimeoutException {
-        WaitingConsumer consumer = new WaitingConsumer();
-        container.followOutput(consumer, STDOUT);
-
-        consumer.waitUntil(frame ->
-            frame.getUtf8String().contains(HELLO_TESTCONTAINERS), 30, TimeUnit.SECONDS);
-    }
-
-    public static class OneShotStrategyTest {
-        @Rule
-        // withOneShotStrategy {
-        public GenericContainer bboxWithOneShot = new GenericContainer("busybox:1.31.1")
-            .withCommand(String.format("echo %s", HELLO_TESTCONTAINERS))
-            .withStartupCheckStrategy(
-                new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3))
-            );
-        // }
-
-        @SneakyThrows
-        @Test
-        public void testCommandIsExecuted() {
-            waitForHello(bboxWithOneShot);
-
-            assertThat(bboxWithOneShot.isRunning()).isFalse();
-        }
-    }
-
-    public static class IndefiniteOneShotStrategyTest {
-        @Rule
-        // withIndefiniteOneShotStrategy {
-        public GenericContainer bboxWithIndefiniteOneShot = new GenericContainer("busybox:1.31.1")
-            .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
-            .withStartupCheckStrategy(
-                new IndefiniteWaitOneShotStartupCheckStrategy()
-            );
-        // }
-
-        @SneakyThrows
-        @Test
-        public void testCommandIsExecuted() {
-            waitForHello(bboxWithIndefiniteOneShot);
-
-            assertThat(bboxWithIndefiniteOneShot.isRunning()).isFalse();
-        }
-    }
-
-    public static class MinimumDurationStrategyTest {
-        @Rule
-        // withMinimumDurationStrategy {
-        public GenericContainer bboxWithMinimumDuration = new GenericContainer("busybox:1.31.1")
-            .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
-            .withStartupCheckStrategy(
-                new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(5))
-            );
-        // }
-
-        @SneakyThrows
-        @Test
-        public void testCommandIsExecuted() {
-            waitForHello(bboxWithMinimumDuration);
-
-            assertThat(bboxWithMinimumDuration.isRunning()).isTrue();
-        }
-    }
-}
diff --git a/docs/features/startup_and_waits.md b/docs/features/startup_and_waits.md
index 3cbec97af0d..e1d30457e5c 100644
--- a/docs/features/startup_and_waits.md
+++ b/docs/features/startup_and_waits.md
@@ -74,52 +74,3 @@ If none of these options meet your requirements, you can create your own subclas
 appropriate wait mechanism in `waitUntilReady()`. 
 The `GenericContainer.waitingFor()` method accepts any valid [`WaitStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/wait/strategy/WaitStrategy.html).
 
-
-## Startup check Strategies
-
-Ordinarily Testcontainers will check that the container has reached the running state and has not exited.
-In order to do that inspect is executed against the container and state parameter is extracted.
-
-All logic is implemented in [`StartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/startupcheck/StartupCheckStrategy.html) child classes.
-
-### Running startup strategy example
-
-This is the strategy used by default. Testcontainers just checks if container is running.
-
-Implemented in [`IsRunningStartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.html) class.
-
-### One shot startup strategy example
-
-This strategy is intended for use with containers that only run briefly and exit of their own accord. As such, success is deemed to be when
-the container has stopped with exit code 0.
- 
-<!--codeinclude--> 
-[Using one shot startup strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withOneShotStrategy
-<!--/codeinclude-->
-
-### Indefinite one shot startup strategy example
-
-Variant of one shot strategy that does not impose a timeout. Intended for situation such as when a long running task forms part of
- container startup.
-
-It has to be assumed that the container will stop of its own accord, either with a success or failure exit code.
-
-<!--codeinclude--> 
-[Using indefinite one shot startup strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withIndefiniteOneShotStrategy
-<!--/codeinclude-->
-
-### Minimum duration startup strategy example
-
-Checks that the container is running and has been running for a defined minimum period of time.
-
-<!--codeinclude--> 
-[Using minimum duration strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withMinimumDurationStrategy
-<!--/codeinclude-->
-
-### Other startup  strategies
-
-If none of these options meet your requirements, you can create your own subclass of 
-[`StartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers
-/startupcheck/StartupCheckStrategy.html) with an appropriate startup check mechanism in `waitUntilStartupSuccessful()`.
-Or you can leave it as is and just implement the `checkStartupState(DockerClient dockerClient, String containerId)` if you still want to check state
- periodically.

From 74a88ad6498b800b0e76d28ca41dc02369d870b9 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 22 May 2020 09:36:20 +0100
Subject: [PATCH 0749/4969] Prevent Local gradle build cache collisions (#2778)

---
 .github/workflows/ci-examples.yml | 3 ---
 .github/workflows/ci.yml          | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index bec794dc167..8dab14e831c 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -25,7 +25,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-testmatrix-examples-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-testmatrix-examples-
-            ${{ runner.os }}-gradle-home-
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -54,8 +53,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-examples-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90e64dde133..6ea2319193d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-testmatrix-
-            ${{ runner.os }}-gradle-home-
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -53,8 +52,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test with Gradle (${{matrix.gradle_args}})

From af077e91508cf7bbdb179053c479af7d4b068b83 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 22 May 2020 10:08:02 +0100
Subject: [PATCH 0750/4969] Reinstate "Add docs for startup strategy
 information/examples" (#2779)

---
 docs/examples/junit4/generic/build.gradle     |  1 +
 .../StartupCheckStrategyTest.java             | 90 +++++++++++++++++++
 docs/features/startup_and_waits.md            | 49 ++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 97902d5d9ca..5ce878c7ba2 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -5,4 +5,5 @@ dependencies {
     testCompile project(":testcontainers")
     testCompile project(":selenium")
     testCompile "org.seleniumhq.selenium:selenium-api:3.141.59"
+    testCompile 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
new file mode 100644
index 00000000000..5ab32919bb2
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
@@ -0,0 +1,90 @@
+package org.testcontainers.containers.startupcheck;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import lombok.SneakyThrows;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.WaitingConsumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
+import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.IndefiniteOneShotStrategyTest;
+import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.MinimumDurationStrategyTest;
+import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.OneShotStrategyTest;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({OneShotStrategyTest.class, IndefiniteOneShotStrategyTest.class, MinimumDurationStrategyTest.class})
+public class StartupCheckStrategyTest {
+
+    private static final String HELLO_TESTCONTAINERS = "Hello Testcontainers!";
+
+    private static void waitForHello(GenericContainer container) throws TimeoutException {
+        WaitingConsumer consumer = new WaitingConsumer();
+        container.followOutput(consumer, STDOUT);
+
+        consumer.waitUntil(frame ->
+            frame.getUtf8String().contains(HELLO_TESTCONTAINERS), 30, TimeUnit.SECONDS);
+    }
+
+    public static class OneShotStrategyTest {
+        @Rule
+        // withOneShotStrategy {
+        public GenericContainer bboxWithOneShot = new GenericContainer("busybox:1.31.1")
+            .withCommand(String.format("echo %s", HELLO_TESTCONTAINERS))
+            .withStartupCheckStrategy(
+                new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3))
+            );
+        // }
+
+        @SneakyThrows
+        @Test
+        public void testCommandIsExecuted() {
+            waitForHello(bboxWithOneShot);
+
+            assertThat(bboxWithOneShot.isRunning()).isFalse();
+        }
+    }
+
+    public static class IndefiniteOneShotStrategyTest {
+        @Rule
+        // withIndefiniteOneShotStrategy {
+        public GenericContainer bboxWithIndefiniteOneShot = new GenericContainer("busybox:1.31.1")
+            .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
+            .withStartupCheckStrategy(
+                new IndefiniteWaitOneShotStartupCheckStrategy()
+            );
+        // }
+
+        @SneakyThrows
+        @Test
+        public void testCommandIsExecuted() {
+            waitForHello(bboxWithIndefiniteOneShot);
+
+            assertThat(bboxWithIndefiniteOneShot.isRunning()).isFalse();
+        }
+    }
+
+    public static class MinimumDurationStrategyTest {
+        @Rule
+        // withMinimumDurationStrategy {
+        public GenericContainer bboxWithMinimumDuration = new GenericContainer("busybox:1.31.1")
+            .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
+            .withStartupCheckStrategy(
+                new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(5))
+            );
+        // }
+
+        @SneakyThrows
+        @Test
+        public void testCommandIsExecuted() {
+            waitForHello(bboxWithMinimumDuration);
+
+            assertThat(bboxWithMinimumDuration.isRunning()).isTrue();
+        }
+    }
+}
diff --git a/docs/features/startup_and_waits.md b/docs/features/startup_and_waits.md
index e1d30457e5c..3cbec97af0d 100644
--- a/docs/features/startup_and_waits.md
+++ b/docs/features/startup_and_waits.md
@@ -74,3 +74,52 @@ If none of these options meet your requirements, you can create your own subclas
 appropriate wait mechanism in `waitUntilReady()`. 
 The `GenericContainer.waitingFor()` method accepts any valid [`WaitStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/wait/strategy/WaitStrategy.html).
 
+
+## Startup check Strategies
+
+Ordinarily Testcontainers will check that the container has reached the running state and has not exited.
+In order to do that inspect is executed against the container and state parameter is extracted.
+
+All logic is implemented in [`StartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/startupcheck/StartupCheckStrategy.html) child classes.
+
+### Running startup strategy example
+
+This is the strategy used by default. Testcontainers just checks if container is running.
+
+Implemented in [`IsRunningStartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.html) class.
+
+### One shot startup strategy example
+
+This strategy is intended for use with containers that only run briefly and exit of their own accord. As such, success is deemed to be when
+the container has stopped with exit code 0.
+ 
+<!--codeinclude--> 
+[Using one shot startup strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withOneShotStrategy
+<!--/codeinclude-->
+
+### Indefinite one shot startup strategy example
+
+Variant of one shot strategy that does not impose a timeout. Intended for situation such as when a long running task forms part of
+ container startup.
+
+It has to be assumed that the container will stop of its own accord, either with a success or failure exit code.
+
+<!--codeinclude--> 
+[Using indefinite one shot startup strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withIndefiniteOneShotStrategy
+<!--/codeinclude-->
+
+### Minimum duration startup strategy example
+
+Checks that the container is running and has been running for a defined minimum period of time.
+
+<!--codeinclude--> 
+[Using minimum duration strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withMinimumDurationStrategy
+<!--/codeinclude-->
+
+### Other startup  strategies
+
+If none of these options meet your requirements, you can create your own subclass of 
+[`StartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers
+/startupcheck/StartupCheckStrategy.html) with an appropriate startup check mechanism in `waitUntilStartupSuccessful()`.
+Or you can leave it as is and just implement the `checkStartupState(DockerClient dockerClient, String containerId)` if you still want to check state
+ periodically.

From a6e8be1066b837fa666ca492233b1f97cc62234f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 22 May 2020 11:00:40 +0100
Subject: [PATCH 0751/4969] Fix flaky StartupCheckStrategyTest

---
 .../startupcheck/StartupCheckStrategyTest.java           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
index 5ab32919bb2..deef64bc59b 100644
--- a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
+++ b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
@@ -1,8 +1,5 @@
 package org.testcontainers.containers.startupcheck;
 
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import lombok.SneakyThrows;
 import org.junit.Rule;
 import org.junit.Test;
@@ -11,6 +8,10 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.WaitingConsumer;
 
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.IndefiniteOneShotStrategyTest;
@@ -75,7 +76,7 @@ public static class MinimumDurationStrategyTest {
         public GenericContainer bboxWithMinimumDuration = new GenericContainer("busybox:1.31.1")
             .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
             .withStartupCheckStrategy(
-                new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(5))
+                new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(1))
             );
         // }
 

From f401b1c202bd05cb2cab78c2949f3ba15b7682b4 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 22 May 2020 12:33:29 +0100
Subject: [PATCH 0752/4969] Reinstate #1874 "Added additional url params in
 JdbcDatabaseContainer" (#2777)

---
 .../containers/ClickHouseContainer.java       |  4 +
 .../containers/CockroachContainer.java        |  4 +-
 .../cockroachdb/SimpleCockroachDBTest.java    | 20 +++++
 .../containers/Db2Container.java              |  4 +-
 .../junit/db2/SimpleDb2Test.java              | 15 ++++
 .../containers/JdbcDatabaseContainer.java     | 39 ++++++++-
 .../containers/MariaDBContainer.java          |  4 +-
 .../junit/mariadb/SimpleMariaDBTest.java      | 20 +++++
 .../containers/MSSQLServerContainer.java      |  3 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    | 16 ++++
 .../containers/MySQLContainer.java            |  6 +-
 .../junit/mysql/SimpleMySQLTest.java          | 83 ++++++++++++++++++-
 .../containers/OracleContainer.java           |  5 ++
 .../containers/PostgreSQLContainer.java       | 24 ++----
 .../PostgreSQLConnectionURLTest.java          |  2 +-
 .../postgresql/SimplePostgreSQLTest.java      | 15 ++++
 16 files changed, 237 insertions(+), 27 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 4d4ea2d11a9..10c0e1835c2 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -66,4 +66,8 @@ public String getTestQueryString() {
         return TEST_QUERY;
     }
 
+    @Override
+    public ClickHouseContainer withUrlParam(String paramName, String paramValue) {
+        throw new UnsupportedOperationException("The ClickHouse does not support this");
+    }
 }
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 3768ca7a008..de64902c88a 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -43,7 +43,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 7c62b2f6bcf..14fe20222a3 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -9,6 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
@@ -42,4 +44,22 @@ public void testExplicitInitScript() throws SQLException {
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        CockroachContainer cockroach = new CockroachContainer()
+            .withUrlParam("sslmode", "disable")
+            .withUrlParam("application_name", "cockroach");
+
+        try {
+            cockroach.start();
+            String jdbcUrl = cockroach.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("sslmode=disable"));
+            assertThat(jdbcUrl, containsString("application_name=cockroach"));
+        } finally {
+            cockroach.stop();
+        }
+    }
 }
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index b1472b21c6c..05edcb2c3ed 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -73,7 +73,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters(":", ";", ";");
+        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 08f427cf12b..6cc7535f785 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -7,6 +7,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleDb2Test extends AbstractContainerDatabaseTest {
@@ -24,4 +26,17 @@ public void testSimple() throws SQLException {
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (Db2Container db2 = new Db2Container()
+            .withUrlParam("sslConnection", "false")
+            .acceptLicense()) {
+
+            db2.start();
+
+            String jdbcUrl = db2.getJdbcUrl();
+            assertThat(jdbcUrl, containsString(":sslConnection=false;"));
+        }
+    }
 }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 36a6461aa74..62fe43e7932 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.NonNull;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.delegate.DatabaseDelegate;
@@ -17,6 +18,8 @@
 import java.util.Properties;
 import java.util.concurrent.Future;
 
+import static java.util.stream.Collectors.joining;
+
 /**
  * Base class for containers that expose a JDBC connection
  *
@@ -28,10 +31,13 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
     private Driver driver;
     private String initScriptPath;
     protected Map<String, String> parameters = new HashMap<>();
+    protected Map<String, String> urlParameters = new HashMap<>();
 
     private int startupTimeoutSeconds = 120;
     private int connectTimeoutSeconds = 120;
 
+    private static final String QUERY_PARAM_SEPARATOR = "&";
+
     public JdbcDatabaseContainer(@NonNull final String dockerImageName) {
         super(dockerImageName);
     }
@@ -82,7 +88,11 @@ public SELF withPassword(String password) {
 
     public SELF withDatabaseName(String dbName) {
         throw new UnsupportedOperationException();
+    }
 
+    public SELF withUrlParam(String paramName, String paramValue) {
+        urlParameters.put(paramName, paramValue);
+        return self();
     }
 
     /**
@@ -220,7 +230,34 @@ public Connection createConnection(String queryString) throws SQLException, NoDr
      * @return a full JDBC URL including queryString
      */
     protected String constructUrlForConnection(String queryString) {
-        return getJdbcUrl() + queryString;
+        String baseUrl = getJdbcUrl();
+
+        if ("".equals(queryString)) {
+            return baseUrl;
+        }
+
+        if (!queryString.startsWith("?")) {
+            throw new IllegalArgumentException("The '?' character must be included");
+        }
+
+        return baseUrl.contains("?")
+            ? baseUrl + QUERY_PARAM_SEPARATOR + queryString.substring(1)
+            : baseUrl + queryString;
+    }
+
+    protected String constructUrlParameters(String startCharacter, String delimiter) {
+        return constructUrlParameters(startCharacter, delimiter, StringUtils.EMPTY);
+    }
+
+    protected String constructUrlParameters(String startCharacter, String delimiter, String endCharacter) {
+        String urlParameters = "";
+        if (!this.urlParameters.isEmpty()) {
+            String additionalParameters = this.urlParameters.entrySet().stream()
+                .map(Object::toString)
+                .collect(joining(delimiter));
+            urlParameters = startCharacter + additionalParameters + endCharacter;
+        }
+        return urlParameters;
     }
 
     protected void optionallyMapResourceParameterAsVolume(@NotNull String paramName, @NotNull String pathNameInContainer, @NotNull String defaultResource) {
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 1b4cb3344e4..04d745a9efe 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -60,7 +60,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 646fbb40947..af503ce424b 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -8,6 +8,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
@@ -68,4 +70,22 @@ public void testMariaDBWithCommandOverride() throws SQLException {
             assertEquals("Auto increment increment should be overriden by command line", "10", result);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        MariaDBContainer mariaDBContainer = (MariaDBContainer) new MariaDBContainer()
+            .withUrlParam("connectTimeout", "40000")
+            .withUrlParam("rewriteBatchedStatements", "true");
+
+        try {
+            mariaDBContainer.start();
+            String jdbcUrl = mariaDBContainer.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
+            assertThat(jdbcUrl, containsString("connectTimeout=40000"));
+        } finally {
+            mariaDBContainer.stop();
+        }
+    }
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 631228aeef2..b500e6fddf0 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -62,7 +62,8 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT);
+        String additionalUrlParams = constructUrlParameters(";", ";");
+        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT) + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index c1699d2473a..71e12a6d864 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -9,6 +9,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
@@ -24,6 +26,20 @@ public void testSimple() throws SQLException {
         }
     }
 
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()
+            .withUrlParam("integratedSecurity", "false")
+            .withUrlParam("applicationName", "MyApp")) {
+
+            mssqlServer.start();
+
+            String jdbcUrl = mssqlServer.getJdbcUrl();
+            assertThat(jdbcUrl, containsString(";integratedSecurity=false;applicationName=MyApp"));
+        }
+    }
+
+
     @Test
     public void testSetupDatabase() throws SQLException {
         try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()) {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 79d29234b99..1ef574cbd5e 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -5,6 +5,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import static java.util.stream.Collectors.joining;
+
 /**
  * @author richardnorth
  */
@@ -70,7 +72,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) +
+            "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index ee6c3ab6993..6d6f8d26453 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -9,9 +9,17 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
+import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
+import java.sql.Statement;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
@@ -142,4 +150,77 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
             assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamTimeZone() throws SQLException {
+        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+            .withUrlParam("serverTimezone", "Europe/Zurich")
+            .withEnv("TZ", "Europe/Zurich")
+            .withLogConsumer(new Slf4jLogConsumer(logger));
+        mysql.start();
+
+        try(Connection connection = mysql.createConnection("")) {
+            Statement statement = connection.createStatement();
+            statement.execute("SELECT NOW();");
+            try (ResultSet resultSet = statement.getResultSet()) {
+                resultSet.next();
+
+                // checking that the time_zone MySQL is Europe/Zurich
+                LocalDateTime localDateTime = resultSet.getObject(1, LocalDateTime.class);
+                ZonedDateTime actualDateTime = localDateTime.atZone(ZoneId.of("Europe/Zurich"))
+                    .truncatedTo(ChronoUnit.MINUTES);
+                ZonedDateTime expectedDateTime = ZonedDateTime.now(ZoneId.of("Europe/Zurich"))
+                    .truncatedTo(ChronoUnit.MINUTES);
+
+                String message = String.format("MySQL time zone is not Europe/Zurich. MySQL date:%s, current date:%s",
+                    actualDateTime, expectedDateTime);
+                assertTrue(message, actualDateTime.equals(expectedDateTime));
+            }
+        } finally {
+            mysql.stop();
+        }
+    }
+
+    @Test
+    public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
+        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+            .withUrlParam("allowMultiQueries", "true")
+            .withLogConsumer(new Slf4jLogConsumer(logger));
+        mysql.start();
+
+        try(Connection connection = mysql.createConnection("")) {
+            Statement statement = connection.createStatement();
+            String multiQuery = "DROP TABLE IF EXISTS bar; " +
+                "CREATE TABLE bar (foo VARCHAR(20)); " +
+                "INSERT INTO bar (foo) VALUES ('hello world');";
+            statement.execute(multiQuery);
+            statement.execute("SELECT foo FROM bar;");
+            try(ResultSet resultSet = statement.getResultSet()) {
+                resultSet.next();
+                String firstColumnValue = resultSet.getString(1);
+                assertEquals("Value from bar should equal real value", "hello world", firstColumnValue);
+            }
+        } finally {
+            mysql.stop();
+        }
+    }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+            .withUrlParam("allowMultiQueries", "true")
+            .withUrlParam("rewriteBatchedStatements", "true")
+            .withLogConsumer(new Slf4jLogConsumer(logger));
+
+        try {
+            mysql.start();
+            String jdbcUrl = mysql.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
+            assertThat(jdbcUrl, containsString("allowMultiQueries=true"));
+        } finally {
+            mysql.stop();
+        }
+    }
 }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 60603a7e222..d263a141d4f 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -89,6 +89,11 @@ public OracleContainer withPassword(String password) {
         return self();
     }
 
+    @Override
+    public OracleContainer withUrlParam(String paramName, String paramValue) {
+        throw new UnsupportedOperationException("The OracleDb does not support this");
+    }
+
     @SuppressWarnings("SameReturnValue")
     public String getSid() {
         return "xe";
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 8634f9d70fa..6ba7390878e 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -55,6 +55,8 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
+        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
+        withUrlParam("loggerLevel", "OFF");
         addEnv("POSTGRES_DB", databaseName);
         addEnv("POSTGRES_USER", username);
         addEnv("POSTGRES_PASSWORD", password);
@@ -67,25 +69,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
-        return format("jdbc:postgresql://%s:%d/%s?loggerLevel=OFF", getHost(), getMappedPort(POSTGRESQL_PORT), databaseName);
-    }
-
-    @Override
-    protected String constructUrlForConnection(String queryString) {
-        String baseUrl = getJdbcUrl();
-
-        if ("".equals(queryString)) {
-            return baseUrl;
-        }
-
-        if (!queryString.startsWith("?")) {
-            throw new IllegalArgumentException("The '?' character must be included");
-        }
-
-        return baseUrl.contains("?")
-            ? baseUrl + QUERY_PARAM_SEPARATOR + queryString.substring(1)
-            : baseUrl + queryString;
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:postgresql://" + getContainerIpAddress() + ":" + getMappedPort(POSTGRESQL_PORT)
+            + "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index 05f6ea204a8..c0ba7e40d44 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -15,7 +15,7 @@ public void shouldCorrectlyAppendQueryString() {
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
-        assertTrue("Query String contains expected params", queryString.contains("&stringtype=unspecified&stringtype=unspecified"));
+        assertTrue("Query String contains expected params", queryString.contains("?stringtype=unspecified&stringtype=unspecified"));
         assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
         assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
     }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 9c97f51e64e..36ece03b604 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -9,6 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 
@@ -63,4 +65,17 @@ public void testExplicitInitScript() throws SQLException {
             assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()
+            .withUrlParam("charSet", "UNICODE")) {
+
+            postgres.start();
+            String jdbcUrl = postgres.getJdbcUrl();
+            assertThat(jdbcUrl, containsString("?"));
+            assertThat(jdbcUrl, containsString("&"));
+            assertThat(jdbcUrl, containsString("charSet=UNICODE"));
+        }
+    }
 }

From 289fb50f06d1ee99c036858b8b0889e96c1396a8 Mon Sep 17 00:00:00 2001
From: AElMehdi <AElMehdi@users.noreply.github.com>
Date: Fri, 22 May 2020 13:34:35 +0200
Subject: [PATCH 0753/4969] Update version #2757 (#2758)

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 48b63c59631..c28e0827f7c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -90,4 +90,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.14.1
+    latest_version: 1.14.2

From 647d1fe9f5766e5aeaa8a238e553976eeaf16bbb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 23 May 2020 13:14:35 +0100
Subject: [PATCH 0754/4969] Bump influxdb-java from 2.18 to 2.19 in
 /modules/influxdb (#2784)

---
 modules/influxdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 02af2e924a9..2deacd3a149 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.18'
-    testCompile 'org.influxdb:influxdb-java:2.17'
+    compileOnly 'org.influxdb:influxdb-java:2.19'
+    testCompile 'org.influxdb:influxdb-java:2.19'
 }

From 066a1bdf4219cd0ea5e31abcdf07faab5e9c1eee Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 23 May 2020 13:14:48 +0100
Subject: [PATCH 0755/4969] Bump pulsar-client from 2.5.1 to 2.5.2 in
 /modules/pulsar (#2787)

---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 74626006ba0..4082197b8ea 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.2'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.1'
 }

From b3cd937da000bf92f0428cbb2ba2e92c2d95fa93 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 23 May 2020 13:14:57 +0100
Subject: [PATCH 0756/4969] Bump aws-java-sdk-sqs from 1.11.784 to 1.11.789 in
 /modules/localstack (#2785)

---
 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 482b977792d..ce921607844 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.784'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.784'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.789'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.782'
     testCompile 'software.amazon.awssdk:s3:2.13.18'
 }

From fe2102a99ce323a1fa00913104954264bda44a86 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 28 May 2020 22:08:35 +0100
Subject: [PATCH 0757/4969] Move away from using quay.io for default images
 (#2805)

---
 .../utility/TestcontainersConfiguration.java  | 21 ++++++++++++++-----
 docs/features/configuration.md                |  8 +++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 64ee03efb06..44691cfb6fb 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -1,11 +1,22 @@
 package org.testcontainers.utility;
 
 import com.google.common.annotations.VisibleForTesting;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.UnstableAPI;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Objects;
@@ -56,7 +67,7 @@ public String getSocatContainerImage() {
     }
 
     public String getVncRecordedContainerImage() {
-        return (String) properties.getOrDefault("vncrecorder.container.image", "quay.io/testcontainers/vnc-recorder:1.1.0");
+        return (String) properties.getOrDefault("vncrecorder.container.image", "testcontainersofficial/vnc-recorder:1.1.0");
     }
 
     public String getDockerComposeContainerImage() {
@@ -72,11 +83,11 @@ public boolean isRyukPrivileged() {
     }
 
     public String getRyukImage() {
-        return (String) properties.getOrDefault("ryuk.container.image", "quay.io/testcontainers/ryuk:0.2.3");
+        return (String) properties.getOrDefault("ryuk.container.image", "testcontainersofficial/ryuk:0.3.0");
     }
 
     public String getSSHdImage() {
-        return (String) properties.getOrDefault("sshd.container.image", "quay.io/testcontainers/sshd:1.0.0");
+        return (String) properties.getOrDefault("sshd.container.image", "testcontainersofficial/sshd:1.0.0");
     }
 
     public Integer getRyukTimeout() {
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index ad039528b5d..f0172b3c978 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -32,7 +32,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **tinyimage.container.image = alpine:3.5**  
 > Used by Testcontainers' core
 
-> **vncrecorder.container.image = quay.io/testcontainers/vnc-recorder:1.1.0**  
+> **vncrecorder.container.image = testcontainersofficial/vnc-recorder:1.1.0**  
 > Used by VNC recorder in Testcontainers' Seleniun integration
 
 > **ambassador.container.image = richnorth/ambassador:latest**  
@@ -49,13 +49,11 @@ Another possibility is to set up a registry mirror in your environment so that a
 For more information, see the [official Docker documentation about "Registry as a pull through cache"](https://docs.docker.com/registry/recipes/mirror/).
 
 !!!tip
-    Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/testcontainers/ryuk:0.2.3`, not).
-    Workaround is to to configure the affected Docker image in `.testcontainers.properties`.
-    For example: `ryuk.container.image = testcontainers/ryuk:0.2.3` or `ryuk.container.image = <your.docker.registry>/testcontainers/ryuk:0.2.3`
+    Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/something/else`, not).
 
 ## Customizing Ryuk resource reaper
 
-> **ryuk.container.image = quay.io/testcontainers/ryuk:0.2.3**
+> **ryuk.container.image = testcontainersofficial/ryuk:0.3.0**
 > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
 
 > **ryuk.container.privileged = false**

From 3a2462cbeb5fee3cafcd885eeb10f2514f6d096b Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 28 May 2020 23:13:46 +0100
Subject: [PATCH 0758/4969] Ensure that ParsedDockerfile supports platform args
 (#2780)

---
 .../images/ParsedDockerfile.java               |  4 ++--
 .../images/ParsedDockerfileTest.java           | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
index 1ad43813757..d4574d17c34 100644
--- a/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
@@ -21,7 +21,7 @@
 @Slf4j
 public class ParsedDockerfile {
 
-    private static final Pattern FROM_LINE_PATTERN = Pattern.compile("FROM ([^\\s]+).*");
+    private static final Pattern FROM_LINE_PATTERN = Pattern.compile("FROM (?<arg>--[^\\s]+\\s)*(?<image>[^\\s]+).*", Pattern.CASE_INSENSITIVE);
 
     private final Path dockerFilePath;
 
@@ -57,7 +57,7 @@ private void parse(List<String> lines) {
         dependencyImageNames = lines.stream()
             .map(FROM_LINE_PATTERN::matcher)
             .filter(Matcher::matches)
-            .map(matcher -> matcher.group(1))
+            .map(matcher -> matcher.group("image"))
             .collect(Collectors.toSet());
 
         if (!dependencyImageNames.isEmpty()) {
diff --git a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
index e2b97f9fab7..52a22c83b00 100644
--- a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
@@ -16,6 +16,12 @@ public void doesSimpleParsing() {
         assertEquals("extracts a single image name", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
     }
 
+    @Test
+    public void isCaseInsensitive() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("from someimage", "RUN something"));
+        assertEquals("extracts a single image name", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
     @Test
     public void handlesTags() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage:tag", "RUN something"));
@@ -40,6 +46,18 @@ public void ignoringBuildStageNames() {
         assertEquals("ignores build stage names and allows multiple images to be extracted", Sets.newHashSet("someimage", "nextimage"), parsedDockerfile.getDependencyImageNames());
     }
 
+    @Test
+    public void ignoringPlatformArgs() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM --platform=linux/amd64 someimage", "RUN something"));
+               assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void ignoringExtraPlatformArgs() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM --platform=linux/amd64 --somethingelse=value someimage", "RUN something"));
+               assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
     @Test
     public void handlesGracefullyIfNoFromLine() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("RUN something", "# is this even a valid Dockerfile?"));

From 77a662c19d524ce3d714df79bf3994368252c109 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 May 2020 23:16:57 +0100
Subject: [PATCH 0759/4969] Bump aws-java-sdk-logs from 1.11.782 to 1.11.789 in
 /modules/localstack (#2788)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 ce921607844..2ad0552bdb3 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.784'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.789'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.782'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.789'
     testCompile 'software.amazon.awssdk:s3:2.13.18'
 }

From f2109fc33a760242942cc869b7914e88336fe5f7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 May 2020 23:17:32 +0100
Subject: [PATCH 0760/4969] Bump s3 from 2.13.18 to 2.13.23 in
 /modules/localstack (#2786)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 2ad0552bdb3..857b752ec1e 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.782'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.789'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.789'
-    testCompile 'software.amazon.awssdk:s3:2.13.18'
+    testCompile 'software.amazon.awssdk:s3:2.13.23'
 }

From 71b9bcefafbe77ec462eeca2444ca3786ce205b0 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 29 May 2020 10:05:18 +0100
Subject: [PATCH 0761/4969] Always clean Azure pipelines builds

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5780a01bb83..185240ae7eb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,7 +14,7 @@ jobs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
         options: "--no-daemon --continue"
-        tasks: "testcontainers:test --tests GenericContainerRuleTest"
+        tasks: "clean testcontainers:test --tests GenericContainerRuleTest"
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
@@ -31,6 +31,6 @@ jobs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
         options: '--no-daemon --continue'
-        tasks: 'check'
+        tasks: 'clean check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'

From 785bdf567f2e771de5613bbeeda419f33b4bdecf Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 29 May 2020 10:36:03 +0100
Subject: [PATCH 0762/4969] Temporarily disable use of build cache

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 185240ae7eb..1e3715bec7c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,7 +13,7 @@ jobs:
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
-        options: "--no-daemon --continue"
+        options: "--no-daemon --continue --no-build-cache"
         tasks: "clean testcontainers:test --tests GenericContainerRuleTest"
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
@@ -30,7 +30,7 @@ jobs:
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
-        options: '--no-daemon --continue'
+        options: '--no-daemon --continue --no-build-cache'
         tasks: 'clean check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'

From 892d84db66b8e99b140aecd863111cb0b0527e5d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 29 May 2020 11:39:20 +0100
Subject: [PATCH 0763/4969] Re-enable build cache

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1e3715bec7c..185240ae7eb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,7 +13,7 @@ jobs:
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
-        options: "--no-daemon --continue --no-build-cache"
+        options: "--no-daemon --continue"
         tasks: "clean testcontainers:test --tests GenericContainerRuleTest"
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
@@ -30,7 +30,7 @@ jobs:
     inputs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
-        options: '--no-daemon --continue --no-build-cache'
+        options: '--no-daemon --continue'
         tasks: 'clean check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'

From 6ac18b2b882f4c1a8b5d550d9ca79de339ce0265 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 29 May 2020 12:43:11 +0200
Subject: [PATCH 0764/4969] Add default labels to images created with
 `ImageFromDockerfile` (#2809)

---
 .../images/builder/ImageFromDockerfile.java   |  6 +++++
 .../builder/ImageFromDockerfileTest.java      | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 11a7e2f4cb6..638db2e351d 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -107,6 +107,12 @@ public void onNext(BuildResponseItem item) {
 
             BuildImageCmd buildImageCmd = dockerClient.buildImageCmd(in);
             configure(buildImageCmd);
+            Map<String, String> labels = new HashMap<>();
+            if (buildImageCmd.getLabels() != null) {
+                labels.putAll(buildImageCmd.getLabels());
+            }
+            labels.putAll(DockerClientFactory.DEFAULT_LABELS);
+            buildImageCmd.withLabels(labels);
 
             prePullDependencyImages(dependencyImageNames);
 
diff --git a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
new file mode 100644
index 00000000000..93ec5cb5cd1
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
@@ -0,0 +1,27 @@
+package org.testcontainers.images.builder;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ImageFromDockerfileTest {
+
+    @Test
+    public void shouldAddDefaultLabels() {
+        ImageFromDockerfile image = new ImageFromDockerfile()
+            .withDockerfileFromBuilder(it -> it.from("scratch"));
+
+        String imageId = image.resolve();
+
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+
+        assertThat(inspectImageResponse.getConfig().getLabels())
+            .containsAllEntriesOf(DockerClientFactory.DEFAULT_LABELS);
+    }
+
+}

From 6e1f8a03699076a54e79e037f7ad34b06202f2f2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 29 May 2020 12:43:27 +0200
Subject: [PATCH 0765/4969] Record and dump Ryuk's logs on timeout (#2810)

---
 .../utility/ResourceReaper.java               | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index f74905e60ef..2f668d80426 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -1,10 +1,12 @@
 package org.testcontainers.utility;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Ports;
@@ -28,6 +30,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -93,6 +96,20 @@ public static String start(String hostIpAddress, DockerClient client) {
 
         client.startContainerCmd(ryukContainerId).exec();
 
+        StringBuilder ryukLog = new StringBuilder();
+
+        client.logContainerCmd(ryukContainerId)
+            .withSince(0)
+            .withFollowStream(true)
+            .withStdOut(true)
+            .withStdErr(true)
+            .exec(new ResultCallback.Adapter<Frame>() {
+                @Override
+                public void onNext(Frame frame) {
+                    ryukLog.append(new String(frame.getPayload(), StandardCharsets.UTF_8));
+                }
+            });
+
         InspectContainerResponse inspectedContainer = client.inspectContainerCmd(ryukContainerId).exec();
 
         Integer ryukPort = inspectedContainer.getNetworkSettings().getPorts().getBindings().values().stream()
@@ -155,7 +172,8 @@ public static String start(String hostIpAddress, DockerClient client) {
 
         // We need to wait before we can start any containers to make sure that we delete them
         if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
-            throw new IllegalStateException("Can not connect to Ryuk");
+            log.error("Timeout out waiting for Ryuk. Ryuk's log:\n{}", ryukLog);
+            throw new IllegalStateException(String.format("Can not connect to Ryuk at %s:%s", hostIpAddress, ryukPort));
         }
 
         return ryukContainerId;

From 835ac71d8ddcf206146af08b2e4efc56532d878f Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Fri, 29 May 2020 14:56:07 +0200
Subject: [PATCH 0766/4969] =?UTF-8?q?couchbase:=20wait=20until=20query=20e?=
 =?UTF-8?q?ngine=20knows=20about=20bucket=20before=20creating=E2=80=A6=20(?=
 =?UTF-8?q?#2662)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The motivation for this change is that in slow environments, it could be that the
query engine is not aware of the just created bucket yet and so the create primary
index will take longer than the 10s read timeout for the subsequent http request.

As a result, this is just another precaution to minimize the chances that in
slow environments the create primary index call times out with a read timeout.
---
 .../couchbase/CouchbaseContainer.java         | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 33f87359a92..92b35da3361 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -19,12 +19,14 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.ContainerNetwork;
+import lombok.Cleanup;
 import okhttp3.Credentials;
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
@@ -36,6 +38,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -224,7 +227,7 @@ private void waitUntilNodeIsOnline() {
     private void renameNode() {
         logger().debug("Renaming Couchbase Node from localhost to {}", getHost());
 
-        Response response = doHttpRequest(MGMT_PORT, "/node/controller/rename", "POST", new FormBody.Builder()
+        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/node/controller/rename", "POST", new FormBody.Builder()
             .add("hostname", getInternalIpAddress())
             .build(), false
         );
@@ -248,7 +251,7 @@ private void initializeServices() {
             }
         }).collect(Collectors.joining(","));
 
-        Response response = doHttpRequest(MGMT_PORT, "/node/controller/setupServices", "POST", new FormBody.Builder()
+        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/node/controller/setupServices", "POST", new FormBody.Builder()
             .add("services", services)
             .build(), false
         );
@@ -264,7 +267,7 @@ private void initializeServices() {
     private void configureAdminUser() {
         logger().debug("Configuring couchbase admin user with username: \"{}\"", username);
 
-        Response response = doHttpRequest(MGMT_PORT, "/settings/web", "POST", new FormBody.Builder()
+        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/settings/web", "POST", new FormBody.Builder()
             .add("username", username)
             .add("password", password)
             .add("port", Integer.toString(MGMT_PORT))
@@ -305,7 +308,7 @@ private void configureExternalPorts() {
             builder.add("ftsSSL", Integer.toString(getMappedPort(SEARCH_SSL_PORT)));
         }
 
-        final Response response = doHttpRequest(
+        @Cleanup Response response = doHttpRequest(
             MGMT_PORT,
             "/node/controller/setupAlternateAddresses/external",
             "PUT",
@@ -322,7 +325,7 @@ private void configureExternalPorts() {
     private void configureIndexer() {
         logger().debug("Configuring the indexer service");
 
-        Response response = doHttpRequest(MGMT_PORT, "/settings/indexes", "POST", new FormBody.Builder()
+        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/settings/indexes", "POST", new FormBody.Builder()
             .add("storageMode", "memory_optimized")
             .build(), true
         );
@@ -339,7 +342,7 @@ private void createBuckets() {
         for (BucketDefinition bucket : buckets) {
             logger().debug("Creating bucket \"" + bucket.getName() + "\"");
 
-            Response response = doHttpRequest(MGMT_PORT, "/pools/default/buckets", "POST", new FormBody.Builder()
+            @Cleanup Response response = doHttpRequest(MGMT_PORT, "/pools/default/buckets", "POST", new FormBody.Builder()
                 .add("name", bucket.getName())
                 .add("ramQuotaMB", Integer.toString(bucket.getQuota()))
                 .build(), true);
@@ -353,9 +356,27 @@ private void createBuckets() {
                 .forStatusCode(200)
                 .waitUntilReady(this);
 
+            if (enabledServices.contains(CouchbaseService.QUERY)) {
+                // If the query service is enabled, make sure that we only proceed if the query engine also
+                // knows about the bucket in its metadata configuration.
+                Unreliables.retryUntilTrue(1, TimeUnit.MINUTES, () -> {
+                    @Cleanup Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
+                        .add("statement", "SELECT COUNT(*) > 0 as present FROM system:keyspaces WHERE name = \"" + bucket.getName() + "\"")
+                        .build(), true);
+
+                    String body = queryResponse.body() != null ? queryResponse.body().string() : null;
+                    checkSuccessfulResponse(queryResponse, "Could not poll query service state for bucket: " + bucket.getName());
+
+                    return Optional.of(MAPPER.readTree(body))
+                        .map(n -> n.at("/results/0/present"))
+                        .map(JsonNode::asBoolean)
+                        .orElse(false);
+                });
+            }
+
             if (bucket.hasPrimaryIndex()) {
                 if (enabledServices.contains(CouchbaseService.QUERY)) {
-                    Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
+                    @Cleanup Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
                         .add("statement", "CREATE PRIMARY INDEX on `" + bucket.getName() + "`")
                         .build(), true);
 
@@ -384,14 +405,8 @@ private String getInternalIpAddress() {
      * @param message the message that should be part of the exception of not successful.
      */
     private void checkSuccessfulResponse(final Response response, final String message) {
-        try {
-            if (!response.isSuccessful()) {
-                throw new IllegalStateException(message + ": " + response.toString());
-            }
-        } finally {
-            if (response.body() != null) {
-                response.body().close();
-            }
+        if (!response.isSuccessful()) {
+            throw new IllegalStateException(message + ": " + response.toString());
         }
     }
 

From 48534069037e17147208e65c3c7d3d03e3c83a47 Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Fri, 29 May 2020 15:02:06 +0200
Subject: [PATCH 0767/4969] Bump Couchbase Server Image Version (#2804)

6.5.1 got released in april 2020 and brings bugfixes and
enhancements. Let's make sure users pick that up by default.
---
 .../java/org/testcontainers/couchbase/CouchbaseContainer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 92b35da3361..ee4b3212cac 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -71,7 +71,7 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private static final String DOCKER_IMAGE_NAME = "couchbase/server";
 
-    private static final String VERSION = "6.5.0";
+    private static final String VERSION = "6.5.1";
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
 

From c8edde492d76899abe3a4abd2faeef7d23b6801c Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 29 May 2020 15:49:51 +0100
Subject: [PATCH 0768/4969] Update mkdocs.yml

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index c28e0827f7c..795a2bdb4e2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -90,4 +90,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.14.2
+    latest_version: 1.14.3

From ee37dfce15f1be44e93123362c791466716bcffe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 15:48:17 +0100
Subject: [PATCH 0769/4969] Bump aws-java-sdk-logs from 1.11.789 to 1.11.792 in
 /modules/localstack (#2822)

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.789 to 1.11.792.
- [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.789...1.11.792)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 857b752ec1e..a6a73430c17 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.784'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.789'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.789'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.792'
     testCompile 'software.amazon.awssdk:s3:2.13.23'
 }

From 904337623fd75653e580faefce57dab854148b33 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 15:48:51 +0100
Subject: [PATCH 0770/4969] Bump aws-java-sdk-sqs from 1.11.789 to 1.11.792 in
 /modules/localstack (#2820)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 a6a73430c17..f3e093a49b8 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.784'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.789'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.792'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.792'
     testCompile 'software.amazon.awssdk:s3:2.13.23'
 }

From 0a6e4159005db2b350041017422b175782ca7246 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 15:57:42 +0100
Subject: [PATCH 0771/4969] Bump solr-solrj from 8.5.1 to 8.5.2 in /examples
 (#2819)

Bumps solr-solrj from 8.5.1 to 8.5.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 7e9b7a8c71f..5845753cb08 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.10"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
-    implementation 'org.apache.solr:solr-solrj:8.5.1'
+    implementation 'org.apache.solr:solr-solrj:8.5.2'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 46f085d0fe54a3a55ca5f80410911c73b98c4ea3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 15:57:51 +0100
Subject: [PATCH 0772/4969] Bump mssql-jdbc from 8.3.0.jre8-preview to
 8.3.1.jre8-preview in /modules/mssqlserver (#2823)

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 8.3.0.jre8-preview to 8.3.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 8cdfa35dee1..bfb9777ddfa 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,12 +10,12 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.2.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.0.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.1.jre8-preview'
 
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.1.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.0.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.1.jre8-preview'
 }

From 289188be6d58c20b042fa7016453fe39875b6e28 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 15:58:02 +0100
Subject: [PATCH 0773/4969] Bump r2dbc-postgresql from 0.8.2.RELEASE to
 0.8.3.RELEASE in /modules/postgresql (#2824)

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.2.RELEASE to 0.8.3.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-postgresql/blob/v0.8.3.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.2.RELEASE...v0.8.3.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/postgresql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 380a3f86a80..1d808b1555d 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,12 +7,12 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.2.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
     testCompile 'org.postgresql:postgresql:42.2.12'
 
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
+    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'
 }

From f6e48a49963be968b4662cfe8493c219daf82d29 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 15:59:17 +0100
Subject: [PATCH 0774/4969] Bump aws-java-sdk-s3 from 1.11.784 to 1.11.792 in
 /modules/localstack (#2817)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index f3e093a49b8..f35d38c3530 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.784'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.782'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.792'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.792'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.792'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.792'
     testCompile 'software.amazon.awssdk:s3:2.13.23'

From 9a4a4a971eed573f77629ec025aeea10cb9114c8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 16:10:06 +0100
Subject: [PATCH 0775/4969] Bump r2dbc-mssql from 0.8.2.RELEASE to
 0.8.3.RELEASE in /modules/mssqlserver (#2821)

Bumps [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 0.8.2.RELEASE to 0.8.3.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v0.8.3.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v0.8.2.RELEASE...v0.8.3.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index bfb9777ddfa..d9e01fe3a57 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.2.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.3.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.1.jre8-preview'
 
     testCompile project(':r2dbc')
-    testCompile 'io.r2dbc:r2dbc-mssql:0.8.1.RELEASE'
+    testCompile 'io.r2dbc:r2dbc-mssql:0.8.3.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))

From a5b4f2c6f8d9ee778389358040464fa1ca6f156e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 30 May 2020 16:18:07 +0100
Subject: [PATCH 0776/4969] Bump testcontainers from 1.14.2 to 1.14.3 in /core
 (#2818)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 48bbf57d7e9..efe90a8b68d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,7 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.14.2', {
+    baseline 'org.testcontainers:testcontainers:1.14.3', {
         exclude group: "*", module: "*"
     }
 

From 0eb2dea4298088e35c59f7bf947812d807f9006e Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Mon, 1 Jun 2020 19:22:27 +0200
Subject: [PATCH 0777/4969] Switch to latest v5 release of release-drafter
 (#2815)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 6f4e849bd5b..3123c3f6fac 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -9,6 +9,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5.2.0
+      - uses: release-drafter/release-drafter@v5.9.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From c3b85deb8a7bafac64bc47a01531522bfd7ba3b5 Mon Sep 17 00:00:00 2001
From: Erhun Baycelik <baycelik_erhun@hotmail.com>
Date: Thu, 4 Jun 2020 15:51:05 +0300
Subject: [PATCH 0778/4969] [Documentation Update] Update Mysql and Postgres
 tests example URLs (#2832)

Tests url was outdated.
---
 docs/modules/databases/jdbc.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 5f83d7fcdeb..21393455a9f 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -115,5 +115,5 @@ Note that if you use `@Rule`, you will be given an isolated container for each t
 
 Examples/Tests:
 
- * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java)
- * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java)
\ No newline at end of file
+ * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java)
+ * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java)

From e94e13e67a9dadcc5e0fffb32d4827a25d176d89 Mon Sep 17 00:00:00 2001
From: Alexander Zapasnik <sanych27@gmail.com>
Date: Thu, 4 Jun 2020 23:19:00 +0300
Subject: [PATCH 0779/4969] Migrate default postgis image to use the new docker
 hub repo (#2797)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../testcontainers/containers/PostgisContainerProvider.java   | 4 ++--
 .../testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
index 83f15e3fd6f..54c87a84648 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
@@ -10,8 +10,8 @@
 public class PostgisContainerProvider extends JdbcDatabaseContainerProvider {
 
     private static final String NAME = "postgis";
-    private static final String DEFAULT_TAG = "10";
-    private static final String DEFAULT_IMAGE = "mdillon/postgis";
+    private static final String DEFAULT_TAG = "12-3.0";
+    private static final String DEFAULT_IMAGE = "postgis/postgis";
     public static final String USER_PARAM = "user";
     public static final String PASSWORD_PARAM = "password";
 
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
index 551ba86e185..b1d01441016 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
@@ -16,7 +16,7 @@ public static Iterable<Object[]> data() {
         return asList(
             new Object[][]{
                 {"jdbc:tc:postgis://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-                {"jdbc:tc:postgis:9.6://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+                {"jdbc:tc:postgis:9.6-2.5://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
             });
     }
 }

From 617cb73acb05d8f1fd8d2d626313d16fb8bff7ca Mon Sep 17 00:00:00 2001
From: SahilWadhwa <sahilwadhwa@gmail.com>
Date: Fri, 5 Jun 2020 20:11:48 +0530
Subject: [PATCH 0780/4969] Enable AWS KMS For LocalStack 0.10.8 (#2812)

Co-authored-by: Sahil <swadhwa@equalexperts.com>
---
 .../localstack/LocalStackContainer.java       |  3 ++-
 .../localstack/LocalstackContainerTest.java   | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 96cedb37726..72eb320c729 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -252,7 +252,8 @@ public enum Service {
         STEPFUNCTIONS("stepfunctions", 4585),
         CLOUDWATCHLOGS("logs", 4586),
         STS("sts", 4592),
-        IAM("iam", 4593);
+        IAM("iam", 4593),
+        KMS("kms", 4599);
 
         String localStackName;
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index ee5945d0aff..d4e2f0c2864 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,6 +1,11 @@
 package org.testcontainers.containers.localstack;
 
 
+import com.amazonaws.services.kms.AWSKMS;
+import com.amazonaws.services.kms.AWSKMSClientBuilder;
+import com.amazonaws.services.kms.model.CreateKeyRequest;
+import com.amazonaws.services.kms.model.CreateKeyResult;
+import com.amazonaws.services.kms.model.Tag;
 import com.amazonaws.services.logs.AWSLogs;
 import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.model.CreateLogGroupRequest;
@@ -38,9 +43,7 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCHLOGS;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.*;
 
 /**
  * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
@@ -58,7 +61,7 @@ public static class WithoutNetwork {
         // without_network {
         @ClassRule
         public static LocalStackContainer localstack = new LocalStackContainer()
-            .withServices(S3, SQS, CLOUDWATCHLOGS);
+            .withServices(S3, SQS, CLOUDWATCHLOGS, KMS);
         // }
 
         @Test
@@ -135,6 +138,21 @@ public void cloudWatchLogsTestOverBridgeNetwork() {
             assertEquals("One log group should be created", 1, groups.size());
             assertEquals("Name of created log group is [foo]", "foo", groups.get(0).getLogGroupName());
         }
+
+        @Test
+        public void kmsKeyCreationTest() {
+            AWSKMS awskms = AWSKMSClientBuilder.standard()
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(KMS))
+                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .build();
+
+            String desc = String.format("AWS CMK Description");
+            Tag createdByTag = new Tag().withTagKey("CreatedBy").withTagValue("StorageService");
+            CreateKeyRequest req = new CreateKeyRequest().withDescription(desc).withTags(createdByTag);
+            CreateKeyResult key = awskms.createKey(req);
+
+            assertEquals("AWS KMS Customer Managed Key should be created ", key.getKeyMetadata().getDescription(), desc);
+        }
     }
 
     public static class WithNetwork {

From ff73a5e355ce72097fd2d7f7e0bf3879f213a514 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 5 Jun 2020 21:31:23 +0200
Subject: [PATCH 0781/4969] Clean up the deprecated methods (#2835)

* Clean up the deprecated methods

* fix the examples project

* add japicmp excludes
---
 core/build.gradle                             |  44 +-
 .../containers/AmbassadorContainer.java       |  67 ---
 .../testcontainers/containers/Container.java  |  28 --
 .../containers/GenericContainer.java          | 110 +----
 .../containers/traits/VncService.java         |  22 -
 .../containers/wait/HostPortWaitStrategy.java |  31 --
 .../containers/wait/HttpWaitStrategy.java     |  77 ----
 .../wait/LogMessageWaitStrategy.java          |  29 --
 .../testcontainers/containers/wait/Wait.java  |  67 ---
 .../containers/wait/WaitAllStrategy.java      |  41 --
 .../containers/wait/WaitStrategy.java         |  38 --
 .../AuditLoggingDockerClient.java             |   4 +-
 .../AuthDelegatingDockerClientConfig.java     |   7 +-
 .../dockerclient/DockerClientConfigUtils.java |  11 +-
 .../DockerClientProviderStrategy.java         |   1 -
 .../okhttp/NamedPipeSocketFactory.java        | 134 ------
 .../okhttp/OkHttpDockerCmdExecFactory.java    | 162 -------
 .../okhttp/OkHttpInvocationBuilder.java       | 414 ------------------
 .../transport/okhttp/OkHttpWebTarget.java     | 113 -----
 .../transport/okhttp/UnixSocketFactory.java   |  92 ----
 .../utility/ResourceReaper.java               |   5 -
 .../linkedcontainer/RedmineContainer.java     |   2 +-
 .../containers/ClickHouseContainer.java       |   2 +-
 .../containers/PostgreSQLContainer.java       |   3 +-
 .../containers/BrowserWebDriverContainer.java |  16 +-
 25 files changed, 58 insertions(+), 1462 deletions(-)
 delete mode 100644 core/src/main/java/org/testcontainers/containers/AmbassadorContainer.java
 delete mode 100644 core/src/main/java/org/testcontainers/containers/traits/VncService.java
 delete mode 100644 core/src/main/java/org/testcontainers/containers/wait/HostPortWaitStrategy.java
 delete mode 100644 core/src/main/java/org/testcontainers/containers/wait/HttpWaitStrategy.java
 delete mode 100644 core/src/main/java/org/testcontainers/containers/wait/LogMessageWaitStrategy.java
 delete mode 100644 core/src/main/java/org/testcontainers/containers/wait/Wait.java
 delete mode 100644 core/src/main/java/org/testcontainers/containers/wait/WaitAllStrategy.java
 delete mode 100644 core/src/main/java/org/testcontainers/containers/wait/WaitStrategy.java
 rename core/src/main/java/org/testcontainers/dockerclient/{auth => }/AuthDelegatingDockerClientConfig.java (90%)
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java

diff --git a/core/build.gradle b/core/build.gradle
index efe90a8b68d..5011d24d70c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -89,9 +89,43 @@ task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
         "org.testcontainers.shaded.*",
     ]
 
+    // TODO remove once 1.15.0 is released
+    classExcludes = [
+        "org.testcontainers.containers.AmbassadorContainer",
+        "org.testcontainers.containers.traits.VncService",
+        "org.testcontainers.containers.wait.HostPortWaitStrategy",
+        "org.testcontainers.containers.wait.HttpWaitStrategy",
+        "org.testcontainers.containers.wait.LogMessageWaitStrategy",
+        "org.testcontainers.containers.wait.Wait",
+        "org.testcontainers.containers.wait.WaitAllStrategy",
+        "org.testcontainers.containers.wait.WaitStrategy",
+        "org.testcontainers.dockerclient.AuditLoggingDockerClient",
+        "org.testcontainers.dockerclient.auth.AuthDelegatingDockerClientConfig",
+        "org.testcontainers.containers.GenericContainer\$AbstractWaitStrategy",
+        "org.testcontainers.dockerclient.transport.okhttp.NamedPipeSocketFactory",
+        "org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory",
+        "org.testcontainers.dockerclient.transport.okhttp.UnixSocketFactory",
+    ]
+
     methodExcludes = [
-        // METHOD_NEW_DEFAULT
-        "org.testcontainers.containers.ContainerState#getHost()"
+        "org.testcontainers.dockerclient.DockerClientConfigUtils#getDetectedDockerHostIp()",
+        "org.testcontainers.dockerclient.DockerClientConfigUtils#getDockerHostIpAddress(com.github.dockerjava.core.DockerClientConfig)",
+
+        "org.testcontainers.utility.ResourceReaper#start(java.lang.String, com.github.dockerjava.api.DockerClient, boolean)",
+
+        "org.testcontainers.containers.Container#fetchDockerDaemonInfo()",
+        "org.testcontainers.containers.Container#getDockerDaemonInfo()",
+
+        "org.testcontainers.containers.GenericContainer#fetchDockerDaemonInfo()",
+        "org.testcontainers.containers.GenericContainer#getDockerDaemonInfo()",
+
+        "org.testcontainers.containers.Container\$ExecResult#Container\$ExecResult(java.lang.String, java.lang.String)",
+    ]
+
+    fieldExcludes = [
+        "org.testcontainers.containers.GenericContainer#containerId",
+        "org.testcontainers.containers.GenericContainer#containerName",
+        "org.testcontainers.containers.GenericContainer#dockerDaemonInfo",
     ]
 
     onlyBinaryIncompatibleModified = true
@@ -127,10 +161,6 @@ dependencies {
 
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
-    shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.1') {
-        exclude(group: "net.java.dev.jna")
-    }
-
     shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.1') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'com.google.code.findbug')
@@ -140,8 +170,6 @@ dependencies {
 
     shaded "org.yaml:snakeyaml:1.25"
 
-    shaded 'com.squareup.okhttp3:okhttp:3.14.8'
-
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
     shaded 'org.zeroturnaround:zt-exec:1.10', {
diff --git a/core/src/main/java/org/testcontainers/containers/AmbassadorContainer.java b/core/src/main/java/org/testcontainers/containers/AmbassadorContainer.java
deleted file mode 100644
index 0b86821d293..00000000000
--- a/core/src/main/java/org/testcontainers/containers/AmbassadorContainer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.testcontainers.containers;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Container;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.testcontainers.containers.traits.LinkableContainer;
-import org.testcontainers.utility.TestcontainersConfiguration;
-
-import java.util.List;
-
-import static java.util.Arrays.asList;
-
-/**
- * An ambassador container is used as a TCP proxy, enabling any TCP port of another linked container to be exposed
- * publicly, even if that container does not make the port public itself. The <code>richnorth/ambassador:latest</code>
- * container is used (based on HAProxy).
- *
- * @deprecated use {@link SocatContainer}
- */
-@EqualsAndHashCode(callSuper = false)
-@Data
-@Deprecated
-public class AmbassadorContainer<SELF extends AmbassadorContainer<SELF>> extends GenericContainer<SELF> {
-
-    private final String otherContainerName;
-    private final String serviceName;
-    private final int servicePort;
-
-    public AmbassadorContainer(LinkableContainer otherContainer, String serviceName, int servicePort) {
-        super(TestcontainersConfiguration.getInstance().getAmbassadorContainerImage());
-
-        /*
-          Use the unique 'identifierPrefix' (random compose project name) so that the ambassador can see
-          the container it's supposed to be proxying.
-         */
-        this.otherContainerName = otherContainer.getContainerName();
-        this.serviceName = serviceName;
-        this.servicePort = servicePort;
-
-        // Link
-        addLink(otherContainer, serviceName);
-
-        // Expose ambassador's port
-        addExposedPort(servicePort);
-
-        // Tell the proxy what to connect to within the docker network
-        addEnv("SERVICE_NAME", serviceName);
-        addEnv("SERVICE_PORT", String.format("%d", servicePort));
-    }
-
-    public boolean isServiceReady() {
-        try {
-            List<Container> allContainers = dockerClient.listContainersCmd().withShowAll(true).exec();
-
-            for (Container container : allContainers) {
-                if (asList(container.getNames()).contains("/" + otherContainerName) && !container.getStatus().contains("Exited")) {
-                    return true;
-                }
-            }
-
-        } catch (DockerException e) {
-            return false;
-        }
-        return false;
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index 631e2653ceb..9c1cb7f8034 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Info;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
@@ -13,14 +12,9 @@
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
-import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.LogUtils;
 import org.testcontainers.utility.MountableFile;
-import org.testcontainers.utility.ThrowingFunction;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
@@ -48,14 +42,6 @@ class ExecResult {
         int exitCode;
         String stdout;
         String stderr;
-
-        /**
-         * @deprecated should not be instantiated outside of the library, please migrate
-         */
-        @Deprecated
-        public ExecResult(String stdout, String stderr) {
-            this(-1, stdout, stderr);
-        }
     }
 
     /**
@@ -413,13 +399,6 @@ default void followOutput(Consumer<OutputFrame> consumer, OutputFrame.OutputType
      */
     SELF withLogConsumer(Consumer<OutputFrame> consumer);
 
-    /**
-     *
-     * @deprecated please use {@code org.testcontainers.DockerClientFactory.instance().client().infoCmd().exec()}
-     */
-    @Deprecated
-    Info fetchDockerDaemonInfo() throws IOException;
-
     List<String> getPortBindings();
 
     List<String> getExtraHosts();
@@ -447,13 +426,6 @@ default void followOutput(Consumer<OutputFrame> consumer, OutputFrame.OutputType
 
     DockerClient getDockerClient();
 
-    /**
-     *
-     * @deprecated please use {@code org.testcontainers.DockerClientFactory.instance().client().infoCmd().exec()}
-     */
-    @Deprecated
-    Info getDockerDaemonInfo();
-
     void setExposedPorts(List<Integer> exposedPorts);
 
     void setPortBindings(List<String> portBindings);
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index d906c320bd5..072129de60c 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -44,8 +44,8 @@
 import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.traits.LinkableContainer;
-import org.testcontainers.containers.wait.Wait;
-import org.testcontainers.containers.wait.WaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
 import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.images.RemoteDockerImage;
@@ -190,30 +190,13 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Setter(AccessLevel.NONE)
     protected DockerClient dockerClient = DockerClientFactory.lazyClient();
 
-    /*
-     * Info about the Docker server; lazily fetched.
-     */
-    @Setter(AccessLevel.NONE)
-    protected Info dockerDaemonInfo = null;
-
     /**
      * Set during container startup
-     * // TODO make it private
      *
-     * @deprecated use {@link ContainerState#getContainerId()}
      */
     @Setter(AccessLevel.NONE)
-    @Deprecated
-    protected String containerId;
-
-    /**
-     * Set during container startup
-     *
-     * @deprecated use {@link GenericContainer#getContainerInfo()}
-     */
-    @Setter(AccessLevel.NONE)
-    @Deprecated
-    protected String containerName;
+    @VisibleForTesting
+    String containerId;
 
     @Setter(AccessLevel.NONE)
     private InspectContainerResponse containerInfo;
@@ -426,7 +409,6 @@ private void tryStart(Instant startedAt) {
 
             // Tell subclasses that we're starting
             containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
-            containerName = containerInfo.getName();
             containerIsStarting(containerInfo, reused);
 
             // Wait until the container has reached the desired running state
@@ -1322,18 +1304,6 @@ public SELF withLogConsumer(Consumer<OutputFrame> consumer) {
         return self();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public synchronized Info fetchDockerDaemonInfo() throws IOException {
-
-        if (this.dockerDaemonInfo == null) {
-            this.dockerDaemonInfo = this.dockerClient.infoCmd().exec();
-        }
-        return this.dockerDaemonInfo;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -1403,74 +1373,8 @@ public int hashCode() {
         return System.identityHashCode(this);
     }
 
-    /**
-     * Convenience class with access to non-public members of GenericContainer.
-     *
-     * @deprecated use {@link org.testcontainers.containers.wait.strategy.AbstractWaitStrategy}
-     */
-    @Deprecated
-    public static abstract class AbstractWaitStrategy extends org.testcontainers.containers.wait.strategy.AbstractWaitStrategy implements WaitStrategy {
-        protected GenericContainer container;
-
-        @NonNull
-        protected Duration startupTimeout = Duration.ofSeconds(60);
-
-        /**
-         * Wait until the container has started.
-         *
-         * @param container the container for which to wait
-         */
-        @Override
-        public void waitUntilReady(GenericContainer container) {
-            this.container = container;
-            waitUntilReady();
-        }
-
-        /**
-         * Wait until {@link #container} has started.
-         */
-        protected abstract void waitUntilReady();
-
-        /**
-         * Set the duration of waiting time until container treated as started.
-         *
-         * @param startupTimeout timeout
-         * @return this
-         * @see WaitStrategy#waitUntilReady(GenericContainer)
-         */
-        public WaitStrategy withStartupTimeout(Duration startupTimeout) {
-            this.startupTimeout = startupTimeout;
-            return this;
-        }
-
-        /**
-         * @return the container's logger
-         */
-        protected Logger logger() {
-            return container.logger();
-        }
-
-        /**
-         * @return the port on which to check if the container is ready
-         * @deprecated see {@link AbstractWaitStrategy#getLivenessCheckPorts()}
-         */
-        @Deprecated
-        protected Integer getLivenessCheckPort() {
-            return container.getLivenessCheckPort();
-        }
-
-        /**
-         * @return the ports on which to check if the container is ready
-         */
-        protected Set<Integer> getLivenessCheckPorts() {
-            return container.getLivenessCheckPorts();
-        }
-
-        /**
-         * @return the rate limiter to use
-         */
-        protected RateLimiter getRateLimiter() {
-            return DOCKER_CLIENT_RATE_LIMITER;
-        }
+    @Override
+    public String getContainerName() {
+        return getContainerInfo().getName();
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/traits/VncService.java b/core/src/main/java/org/testcontainers/containers/traits/VncService.java
deleted file mode 100644
index c0f6458c2c0..00000000000
--- a/core/src/main/java/org/testcontainers/containers/traits/VncService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.testcontainers.containers.traits;
-
-/**
- * A container which exposes a VNC server.
- */
-@Deprecated
-public interface VncService {
-    /**
-     * @return a URL which can be used to connect to the VNC server from the machine running the tests. Exposed for convenience, e.g. to aid manual debugging
-     */
-    String getVncAddress();
-
-    /**
-     * @return the VNC password for this server
-     */
-    String getPassword();
-
-    /**
-     * @return the port number on which the VNC server is running
-     */
-    int getPort();
-}
diff --git a/core/src/main/java/org/testcontainers/containers/wait/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/HostPortWaitStrategy.java
deleted file mode 100644
index e208b80345d..00000000000
--- a/core/src/main/java/org/testcontainers/containers/wait/HostPortWaitStrategy.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.testcontainers.containers.wait;
-
-import lombok.extern.slf4j.Slf4j;
-import org.testcontainers.containers.GenericContainer;
-
-import java.time.Duration;
-
-/**
- * Waits until a socket connection can be established on a port exposed or mapped by the container.
- *
- * @author richardnorth
- *
- * @deprecated Use {@link org.testcontainers.containers.wait.strategy.HostPortWaitStrategy}
- */
-@Deprecated
-@Slf4j
-public class HostPortWaitStrategy extends GenericContainer.AbstractWaitStrategy {
-
-    private org.testcontainers.containers.wait.strategy.HostPortWaitStrategy delegateStrategy = new org.testcontainers.containers.wait.strategy.HostPortWaitStrategy();
-
-    @Override
-    protected void waitUntilReady() {
-        delegateStrategy.waitUntilReady(this.waitStrategyTarget);
-    }
-
-    @Override
-    public WaitStrategy withStartupTimeout(Duration startupTimeout) {
-        delegateStrategy.withStartupTimeout(startupTimeout);
-        return super.withStartupTimeout(startupTimeout);
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/containers/wait/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/HttpWaitStrategy.java
deleted file mode 100644
index d27133c499d..00000000000
--- a/core/src/main/java/org/testcontainers/containers/wait/HttpWaitStrategy.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.testcontainers.containers.wait;
-
-import org.testcontainers.containers.GenericContainer;
-
-import java.util.function.Predicate;
-
-/**
- * Waits until an HTTP(S) endpoint returns a given status code.
- *
- * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
- *
- * @deprecated Use {@link org.testcontainers.containers.wait.strategy.HttpWaitStrategy}
- */
-@Deprecated
-public class HttpWaitStrategy extends GenericContainer.AbstractWaitStrategy {
-
-    private org.testcontainers.containers.wait.strategy.HttpWaitStrategy delegateStrategy = new org.testcontainers.containers.wait.strategy.HttpWaitStrategy();
-
-    /**
-     * Waits for the given status code.
-     *
-     * @param statusCode the expected status code
-     * @return this
-     */
-    public HttpWaitStrategy forStatusCode(int statusCode) {
-        delegateStrategy.forStatusCode(statusCode);
-        return this;
-    }
-
-    /**
-     * Waits for the given path.
-     *
-     * @param path the path to check
-     * @return this
-     */
-    public HttpWaitStrategy forPath(String path) {
-        delegateStrategy.forPath(path);
-        return this;
-    }
-
-    /**
-     * Indicates that the status check should use HTTPS.
-     *
-     * @return this
-     */
-    public HttpWaitStrategy usingTls() {
-        delegateStrategy.usingTls();
-        return this;
-    }
-
-    /**
-     * Authenticate with HTTP Basic Authorization credentials.
-     *
-     * @param username the username
-     * @param password the password
-     * @return this
-     */
-    public HttpWaitStrategy withBasicCredentials(String username, String password) {
-        delegateStrategy.withBasicCredentials(username, password);
-        return this;
-    }
-
-    /**
-     * Waits for the response to pass the given predicate
-     * @param responsePredicate The predicate to test the response against
-     * @return this
-     */
-    public HttpWaitStrategy forResponsePredicate(Predicate<String> responsePredicate) {
-        delegateStrategy.forResponsePredicate(responsePredicate);
-        return this;
-    }
-
-    @Override
-    protected void waitUntilReady() {
-        delegateStrategy.waitUntilReady(this.waitStrategyTarget);
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/containers/wait/LogMessageWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/LogMessageWaitStrategy.java
deleted file mode 100644
index a21b6b66a59..00000000000
--- a/core/src/main/java/org/testcontainers/containers/wait/LogMessageWaitStrategy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.testcontainers.containers.wait;
-
-import org.testcontainers.containers.GenericContainer;
-
-/**
- * Waits until containers logs expected content.
- *
- * @deprecated Use {@link org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy}
- */
-@Deprecated
-public class LogMessageWaitStrategy extends GenericContainer.AbstractWaitStrategy {
-
-    private org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy delegateWaitStrategy = new org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy();
-
-    @Override
-    protected void waitUntilReady() {
-        delegateWaitStrategy.waitUntilReady(this.waitStrategyTarget);
-    }
-
-    public LogMessageWaitStrategy withRegEx(String regEx) {
-        delegateWaitStrategy.withRegEx(regEx);
-        return this;
-    }
-
-    public LogMessageWaitStrategy withTimes(int times) {
-        delegateWaitStrategy.withTimes(times);
-        return this;
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/containers/wait/Wait.java b/core/src/main/java/org/testcontainers/containers/wait/Wait.java
deleted file mode 100644
index 66d055395c5..00000000000
--- a/core/src/main/java/org/testcontainers/containers/wait/Wait.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.testcontainers.containers.wait;
-
-import java.net.HttpURLConnection;
-
-/**
- * Convenience class with logic for building common {@link WaitStrategy} instances.
- *
- * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
- *
- * @deprecated Use {@link org.testcontainers.containers.wait.strategy.Wait}
- */
-@Deprecated
-public class Wait {
-    /**
-     * Convenience method to return the default WaitStrategy.
-     *
-     * @return a WaitStrategy
-     */
-    public static WaitStrategy defaultWaitStrategy() {
-        return forListeningPort();
-    }
-
-    /**
-     * Convenience method to return a WaitStrategy for an exposed or mapped port.
-     *
-     * @return the WaitStrategy
-     * @see HostPortWaitStrategy
-     */
-    public static HostPortWaitStrategy forListeningPort() {
-        return new HostPortWaitStrategy();
-    }
-
-    /**
-     * Convenience method to return a WaitStrategy for an HTTP endpoint.
-     *
-     * @param path the path to check
-     * @return the WaitStrategy
-     * @see HttpWaitStrategy
-     */
-    public static HttpWaitStrategy forHttp(String path) {
-        return new HttpWaitStrategy()
-                .forPath(path);
-    }
-
-    /**
-     * Convenience method to return a WaitStrategy for an HTTPS endpoint.
-     *
-     * @param path the path to check
-     * @return the WaitStrategy
-     * @see HttpWaitStrategy
-     */
-    public static HttpWaitStrategy forHttps(String path) {
-        return forHttp(path)
-                .usingTls();
-    }
-
-    /**
-     * Convenience method to return a WaitStrategy for log messages.
-     *
-     * @param regex the regex pattern to check for
-     * @param times the number of times the pattern is expected
-     * @return LogMessageWaitStrategy
-     */
-    public static LogMessageWaitStrategy forLogMessage(String regex, int times) {
-        return new LogMessageWaitStrategy().withRegEx(regex).withTimes(times);
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/containers/wait/WaitAllStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/WaitAllStrategy.java
deleted file mode 100644
index 7e3032cd76d..00000000000
--- a/core/src/main/java/org/testcontainers/containers/wait/WaitAllStrategy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.testcontainers.containers.wait;
-
-import org.rnorth.ducttape.timeouts.Timeouts;
-import org.testcontainers.containers.GenericContainer;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Wait strategy that waits for a number of other strategies to pass in series.
- *
- * @deprecated Use {@link org.testcontainers.containers.wait.strategy.WaitAllStrategy}
- */
-@Deprecated
-public class WaitAllStrategy implements WaitStrategy {
-
-    private final List<WaitStrategy> strategies = new ArrayList<>();
-    private Duration timeout = Duration.ofSeconds(30);
-
-    @Override
-    public void waitUntilReady(GenericContainer container) {
-        Timeouts.doWithTimeout((int) timeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
-            for (WaitStrategy strategy : strategies) {
-                strategy.waitUntilReady(container);
-            }
-        });
-    }
-
-    public WaitAllStrategy withStrategy(WaitStrategy strategy) {
-        this.strategies.add(strategy);
-        return this;
-    }
-
-    @Override
-    public WaitStrategy withStartupTimeout(Duration startupTimeout) {
-        this.timeout = startupTimeout;
-        return this;
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/containers/wait/WaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/WaitStrategy.java
deleted file mode 100644
index ee2c14d90ae..00000000000
--- a/core/src/main/java/org/testcontainers/containers/wait/WaitStrategy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.testcontainers.containers.wait;
-
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
-
-import java.time.Duration;
-
-/**
- * Approach to determine whether a container is ready.
- *
- * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
- *
- * @deprecated Use {@link org.testcontainers.containers.wait.strategy.WaitStrategy}
- */
-@Deprecated
-public interface WaitStrategy extends org.testcontainers.containers.wait.strategy.WaitStrategy {
-    /**
-     * Wait until the container has started.
-     *
-     * @param container the container for which to wait
-     */
-    default void waitUntilReady(GenericContainer container) {
-        this.waitUntilReady((WaitStrategyTarget)container);
-    }
-
-    /**
-     * @param startupTimeout the duration for which to wait
-     * @return this
-     */
-    WaitStrategy withStartupTimeout(Duration startupTimeout);
-
-    /**
-     * {@inheritDoc}
-     */
-    default void waitUntilReady(WaitStrategyTarget waitStrategyTarget) {
-        //default method for backwards compatibility
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
index 891709e3a0c..2dc88cad313 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
@@ -16,12 +16,10 @@
  * Wrapper for {@link DockerClient} to facilitate 'audit logging' of potentially destruction actions using
  * {@link org.testcontainers.utility.AuditLogger}.
  *
- * @deprecated should not be used publicly
  */
 @Slf4j
 @SuppressWarnings("unchecked")
-@Deprecated
-public class AuditLoggingDockerClient implements DockerClient {
+class AuditLoggingDockerClient implements DockerClient {
 
     @Delegate(excludes = InterceptedMethods.class)
     private final DockerClient wrappedClient;
diff --git a/core/src/main/java/org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig.java b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
similarity index 90%
rename from core/src/main/java/org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig.java
rename to core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
index a68605fdfda..c78a13c99ac 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
@@ -1,4 +1,4 @@
-package org.testcontainers.dockerclient.auth;
+package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -15,11 +15,10 @@
  * to try and obtain auth credentials, but after that {@link RegistryAuthLocator} will be
  * used to try and improve the auth resolution (e.g. using credential helpers).
  *
- * @deprecated should not be used publicly, to be moved to docker-java
+ * TODO move to docker-java
  */
 @Slf4j
-@Deprecated
-public class AuthDelegatingDockerClientConfig implements DockerClientConfig {
+class AuthDelegatingDockerClientConfig implements DockerClientConfig {
 
     @Delegate(excludes = DelegateExclusions.class)
     private DockerClientConfig delegate;
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
index 1060d663d65..b494eb087f6 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
@@ -1,6 +1,5 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.core.DockerClientConfig;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -18,10 +17,6 @@ public class DockerClientConfigUtils {
     // See https://github.com/docker/docker/blob/a9fa38b1edf30b23cae3eade0be48b3d4b1de14b/daemon/initlayer/setup_unix.go#L25
     public static final boolean IN_A_CONTAINER = new File("/.dockerenv").exists();
 
-    @Deprecated
-    @Getter(lazy = true)
-    private static final Optional<String> detectedDockerHostIp = IN_A_CONTAINER ? getDefaultGateway() : Optional.empty();
-
     @Getter(lazy = true)
     private static final Optional<String> defaultGateway = Optional
             .ofNullable(DockerClientFactory.instance().runInsideDocker(
@@ -45,13 +40,9 @@ public class DockerClientConfigUtils {
             .filter(StringUtils::isNotBlank);
 
     /**
-     * Use {@link DockerClientFactory#dockerHostIpAddress()}
+     * @deprecated use {@link DockerClientProviderStrategy#getDockerHostIpAddress()}
      */
     @Deprecated
-    public static String getDockerHostIpAddress(DockerClientConfig config) {
-        return getDockerHostIpAddress(config.getDockerHost());
-    }
-
     public static String getDockerHostIpAddress(URI dockerHost) {
         switch (dockerHost.getScheme()) {
             case "http":
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index c305d56389c..f0af6d51ae2 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -16,7 +16,6 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.dockerclient.auth.AuthDelegatingDockerClientConfig;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.URI;
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
deleted file mode 100644
index d26e2977318..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/NamedPipeSocketFactory.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.testcontainers.dockerclient.transport.okhttp;
-
-import com.sun.jna.platform.win32.Kernel32;
-import lombok.EqualsAndHashCode;
-import lombok.SneakyThrows;
-import lombok.Value;
-import org.rnorth.ducttape.unreliables.Unreliables;
-
-import javax.net.SocketFactory;
-import java.io.*;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @deprecated use com.github.docker-java:docker-java-transport-okhttp
- */
-@Deprecated
-@Value
-@EqualsAndHashCode(callSuper = false)
-public class NamedPipeSocketFactory extends SocketFactory {
-
-    String socketFileName;
-
-    @Override
-    @SneakyThrows
-    public Socket createSocket() {
-        return new Socket() {
-
-            RandomAccessFile file;
-            InputStream is;
-            OutputStream os;
-
-            @Override
-            public void close() throws IOException {
-                if (file != null) {
-                    file.close();
-                    file = null;
-                }
-            }
-
-            @Override
-            public void connect(SocketAddress endpoint) {
-                connect(endpoint, 0);
-            }
-
-            @Override
-            public void connect(SocketAddress endpoint, int timeout) {
-                file = Unreliables.retryUntilSuccess(Math.max(timeout, 10_000), TimeUnit.MILLISECONDS, () -> {
-                    try {
-                        return new RandomAccessFile(socketFileName, "rw");
-                    } catch (FileNotFoundException e) {
-                        Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100);
-                        throw e;
-                    }
-                });
-
-                is = new InputStream() {
-                    @Override
-                    public int read(byte[] bytes, int off, int len) throws IOException {
-                        if (OkHttpInvocationBuilder.CLOSING.get()) {
-                            return 0;
-                        }
-                        return file.read(bytes, off, len);
-                    }
-
-                    @Override
-                    public int read() throws IOException {
-                        if (OkHttpInvocationBuilder.CLOSING.get()) {
-                            return 0;
-                        }
-                        return file.read();
-                    }
-
-                    @Override
-                    public int read(byte[] bytes) throws IOException {
-                        if (OkHttpInvocationBuilder.CLOSING.get()) {
-                            return 0;
-                        }
-                        return file.read(bytes);
-                    }
-                };
-
-                os = new OutputStream() {
-                    @Override
-                    public void write(byte[] bytes, int off, int len) throws IOException {
-                        file.write(bytes, off, len);
-                    }
-
-                    @Override
-                    public void write(int value) throws IOException {
-                        file.write(value);
-                    }
-
-                    @Override
-                    public void write(byte[] bytes) throws IOException {
-                        file.write(bytes);
-                    }
-                };
-            }
-
-            @Override
-            public InputStream getInputStream() {
-                return is;
-            }
-
-            @Override
-            public OutputStream getOutputStream() {
-                return os;
-            }
-        };
-    }
-
-    @Override
-    public Socket createSocket(String s, int i) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Socket createSocket(InetAddress inetAddress, int i) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java
deleted file mode 100644
index 4da568834d5..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpDockerCmdExecFactory.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.testcontainers.dockerclient.transport.okhttp;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.SSLConfig;
-import com.github.dockerjava.core.WebTarget;
-import com.github.dockerjava.core.exec.PingCmdExec;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.MultimapBuilder;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.ConnectionPool;
-import okhttp3.Dns;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import org.apache.commons.io.IOUtils;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.X509TrustManager;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URI;
-import java.security.cert.X509Certificate;
-import java.util.Collections;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @deprecated use com.github.docker-java:docker-java-transport-okhttp
- */
-@Deprecated
-@Slf4j
-public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
-
-    private static final String SOCKET_SUFFIX = ".socket";
-
-    private ObjectMapper objectMapper;
-
-    private OkHttpClient okHttpClient;
-
-    private HttpUrl baseUrl;
-
-    @Override
-    @SneakyThrows
-    public void init(DockerClientConfig dockerClientConfig) {
-        super.init(dockerClientConfig);
-
-        OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
-            .readTimeout(0, TimeUnit.SECONDS)
-            .retryOnConnectionFailure(true);
-
-        URI dockerHost = dockerClientConfig.getDockerHost();
-        switch (dockerHost.getScheme()) {
-            case "unix":
-            case "npipe":
-                String socketPath = dockerHost.getPath();
-
-                if ("unix".equals(dockerHost.getScheme())) {
-                    clientBuilder
-                        .socketFactory(new UnixSocketFactory(socketPath));
-                } else {
-                    clientBuilder
-                        .socketFactory(new NamedPipeSocketFactory(socketPath));
-                }
-
-                clientBuilder
-                    // Disable pooling
-                    .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS))
-                    .dns(hostname -> {
-                        if (hostname.endsWith(SOCKET_SUFFIX)) {
-                            return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0}));
-                        } else {
-                            return Dns.SYSTEM.lookup(hostname);
-                        }
-                    });
-            default:
-        }
-
-        SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
-        if (sslConfig != null) {
-            SSLContext sslContext = sslConfig.getSSLContext();
-            if (sslContext != null) {
-                clientBuilder
-                    .sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager());
-            }
-        }
-
-        okHttpClient = clientBuilder.build();
-
-        HttpUrl.Builder baseUrlBuilder;
-
-        switch (dockerHost.getScheme()) {
-            case "unix":
-            case "npipe":
-                baseUrlBuilder = new HttpUrl.Builder()
-                    .scheme("http")
-                    .host("docker" + SOCKET_SUFFIX);
-                break;
-            case "tcp":
-                baseUrlBuilder = new HttpUrl.Builder()
-                    .scheme(sslConfig != null && sslConfig.getSSLContext() != null ? "https" : "http")
-                    .host(dockerHost.getHost())
-                    .port(dockerHost.getPort());
-                break;
-            default:
-                baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
-        }
-        baseUrl = baseUrlBuilder.build();
-
-        objectMapper = dockerClientConfig.getObjectMapper();
-    }
-
-    @Override
-    protected OkHttpWebTarget getBaseResource() {
-        return new OkHttpWebTarget(
-            objectMapper,
-            okHttpClient,
-            baseUrl,
-            ImmutableList.of(),
-            MultimapBuilder.hashKeys().hashSetValues().build()
-        );
-    }
-
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return new PingCmdExec(getBaseResource(), getDockerClientConfig()) {
-
-            @Override
-            protected Void execute(PingCmd command) {
-                WebTarget webResource = getBaseResource().path("/_ping");
-
-                // TODO contribute to docker-java, make it close the stream
-                IOUtils.closeQuietly(webResource.request().get());
-
-                return null;
-            }
-        };
-    }
-
-    @Override
-    public void close() throws IOException {
-
-    }
-
-    private static class TrustAllX509TrustManager implements X509TrustManager {
-        @Override
-        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
-
-        }
-
-        @Override
-        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
-
-        }
-
-        @Override
-        public X509Certificate[] getAcceptedIssuers() {
-            return new X509Certificate[0];
-        }
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
deleted file mode 100644
index cada10328ec..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package org.testcontainers.dockerclient.transport.okhttp;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.exception.BadRequestException;
-import com.github.dockerjava.api.exception.ConflictException;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.exception.NotModifiedException;
-import com.github.dockerjava.api.exception.UnauthorizedException;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.core.InvocationBuilder;
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.HttpUrl;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.internal.connection.RealConnection;
-import okio.*;
-import org.jetbrains.annotations.Nullable;
-import org.testcontainers.DockerClientFactory;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-@Slf4j
-@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-class OkHttpInvocationBuilder implements InvocationBuilder {
-
-    static final ThreadLocal<Boolean> CLOSING = ThreadLocal.withInitial(() -> false);
-
-    ObjectMapper objectMapper;
-
-    OkHttpClient okHttpClient;
-
-    Request.Builder requestBuilder;
-
-    public OkHttpInvocationBuilder(ObjectMapper objectMapper, OkHttpClient okHttpClient, HttpUrl httpUrl) {
-        this.objectMapper = objectMapper;
-        this.okHttpClient = okHttpClient;
-
-        requestBuilder = new Request.Builder()
-            .url(httpUrl);
-    }
-
-    @Override
-    public OkHttpInvocationBuilder accept(com.github.dockerjava.core.MediaType mediaType) {
-        return header("accept", mediaType.getMediaType());
-    }
-
-    @Override
-    public OkHttpInvocationBuilder header(String name, String value) {
-        requestBuilder.header(name, value);
-        return this;
-    }
-
-    @Override
-    @SneakyThrows
-    public void delete() {
-        Request request = requestBuilder
-            .delete()
-            .build();
-
-        execute(request).close();
-    }
-
-    @Override
-    @SneakyThrows
-    public void get(ResultCallback<Frame> resultCallback) {
-        Request request = requestBuilder
-            .get()
-            .build();
-
-        executeAndStream(
-            request,
-            resultCallback,
-            new FramedSink(resultCallback)
-        );
-    }
-
-    @Override
-    @SneakyThrows(IOException.class)
-    public <T> T get(TypeReference<T> typeReference) {
-        try (InputStream inputStream = get()) {
-            return objectMapper.readValue(inputStream, typeReference);
-        }
-    }
-
-    @Override
-    public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        Request request = requestBuilder
-            .get()
-            .build();
-
-        executeAndStream(
-            request,
-            resultCallback,
-            new JsonSink<>(objectMapper, typeReference, resultCallback)
-        );
-    }
-
-    @Override
-    @SneakyThrows
-    public InputStream post(Object entity) {
-        Request request = requestBuilder
-            .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
-            .build();
-
-        return execute(request).body().byteStream();
-    }
-
-    @Override
-    @SneakyThrows
-    public <T> T post(Object entity, TypeReference<T> typeReference) {
-        Request request = requestBuilder
-            .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
-            .build();
-
-        try (Response response = execute(request)) {
-            String inputStream = response.body().string();
-            return objectMapper.readValue(inputStream, typeReference);
-        }
-    }
-
-    @Override
-    @SneakyThrows(JsonProcessingException.class)
-    public <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)));
-    }
-
-    @Override
-    @SneakyThrows(IOException.class)
-    public <T> T post(TypeReference<T> typeReference, InputStream body) {
-        try (InputStream inputStream = post(body)) {
-            return objectMapper.readValue(inputStream, typeReference);
-        }
-    }
-
-    @Override
-    @SneakyThrows
-    public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback) {
-        Request request = requestBuilder
-            .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
-            .build();
-
-        OkHttpClient okHttpClient = this.okHttpClient;
-
-        if (stdin != null) {
-            // FIXME there must be a better way of handling it
-            okHttpClient = okHttpClient.newBuilder()
-                .addNetworkInterceptor(chain -> {
-                    Response response = chain.proceed(chain.request());
-                    if (response.isSuccessful()) {
-                        Thread thread = new Thread() {
-                            @Override
-                            @SneakyThrows
-                            public void run() {
-                                Field sinkField = RealConnection.class.getDeclaredField("sink");
-                                sinkField.setAccessible(true);
-
-                                try (
-                                    BufferedSink sink = (BufferedSink) sinkField.get(chain.connection());
-                                    Source source = Okio.source(stdin);
-                                ) {
-                                    sink.writeAll(source);
-                                }
-                            }
-                        };
-                        thread.start();
-                    }
-                    return response;
-                })
-                .build();
-        }
-
-        executeAndStream(
-            okHttpClient,
-            request,
-            resultCallback,
-            new FramedSink(resultCallback)
-        );
-    }
-
-    @Override
-    public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
-        Request request = requestBuilder
-            .post(toRequestBody(body, null))
-            .build();
-
-        executeAndStream(
-            request,
-            resultCallback,
-            new JsonSink<>(objectMapper, typeReference, resultCallback)
-        );
-    }
-
-    @Override
-    @SneakyThrows
-    public void postStream(InputStream body) {
-        Request request = requestBuilder
-            .post(toRequestBody(body, null))
-            .build();
-
-        execute(request).close();
-    }
-
-    @Override
-    @SneakyThrows
-    public InputStream get() {
-        Request request = requestBuilder
-            .get()
-            .build();
-
-        return execute(request).body().byteStream();
-    }
-
-    @Override
-    @SneakyThrows
-    public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType) {
-        Request request = requestBuilder
-            .put(toRequestBody(body, mediaType.toString()))
-            .build();
-
-        execute(request).close();
-    }
-
-    protected RequestBody toRequestBody(InputStream body, @Nullable String mediaType) {
-        return new RequestBody() {
-            @Nullable
-            @Override
-            public MediaType contentType() {
-                if (mediaType == null) {
-                    return null;
-                }
-                return MediaType.parse(mediaType);
-            }
-
-            @Override
-            public void writeTo(BufferedSink sink) throws IOException {
-                try (Source source = Okio.source(body)) {
-                    sink.writeAll(source);
-                }
-            }
-        };
-    }
-
-    protected Response execute(Request request) {
-        return execute(okHttpClient, request);
-    }
-
-    @SneakyThrows(IOException.class)
-    protected Response execute(OkHttpClient okHttpClient, Request request) {
-        Response response = okHttpClient.newCall(request).execute();
-        if (!response.isSuccessful()) {
-            String body = response.body().string();
-            switch (response.code()) {
-                case 304:
-                    throw new NotModifiedException(body);
-                case 400:
-                    throw new BadRequestException(body);
-                case 401:
-                    throw new UnauthorizedException(body);
-                case 404:
-                    throw new NotFoundException(body);
-                case 406:
-                    throw new NotAcceptableException(body);
-                case 409:
-                    throw new ConflictException(body);
-                case 500:
-                    throw new InternalServerErrorException(body);
-                default:
-                    throw new DockerException(body, response.code());
-            }
-        } else {
-            return response;
-        }
-    }
-
-    protected <T> void executeAndStream(Request request, ResultCallback<T> callback, Consumer<BufferedSource> sourceConsumer) {
-        executeAndStream(okHttpClient, request, callback, sourceConsumer);
-    }
-
-    protected <T> void executeAndStream(OkHttpClient okHttpClient, Request request, ResultCallback<T> callback, Consumer<BufferedSource> sourceConsumer) {
-        Thread thread = new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, () -> {
-            try (
-                Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build());
-                BufferedSource source = response.body().source();
-            ) {
-                callback.onStart(() -> {
-                    boolean previous = CLOSING.get();
-                    CLOSING.set(true);
-                    try {
-                        response.close();
-                    } finally {
-                        CLOSING.set(previous);
-                    }
-                });
-
-                sourceConsumer.accept(source);
-                callback.onComplete();
-            } catch (Exception e) {
-                callback.onError(e);
-            }
-        }, "tc-okhttp-stream-" + Objects.hashCode(request));
-        thread.setDaemon(true);
-
-        thread.start();
-    }
-
-    @RequiredArgsConstructor
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    private static class JsonSink<T> implements Consumer<BufferedSource> {
-
-        ObjectMapper objectMapper;
-
-        TypeReference<T> typeReference;
-
-        ResultCallback<T> resultCallback;
-
-        @Override
-        public void accept(BufferedSource source) {
-            try {
-                while (true) {
-                    String line = source.readUtf8Line();
-                    if (line == null) {
-                        break;
-                    }
-
-                    resultCallback.onNext(objectMapper.readValue(line, typeReference));
-                }
-            } catch (Exception e) {
-                resultCallback.onError(e);
-            }
-        }
-    }
-
-    @RequiredArgsConstructor
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    private static class FramedSink implements Consumer<BufferedSource> {
-
-        private static final int HEADER_SIZE = 8;
-
-        ResultCallback<Frame> resultCallback;
-
-        @Override
-        public void accept(BufferedSource source) {
-            try {
-                while (!source.exhausted()) {
-                    // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
-                    // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}
-
-                    if (!source.request(HEADER_SIZE)) {
-                        return;
-                    }
-                    byte[] bytes = source.readByteArray(HEADER_SIZE);
-
-                    StreamType streamType = streamType(bytes[0]);
-
-                    if (streamType == StreamType.RAW) {
-                        resultCallback.onNext(new Frame(StreamType.RAW, bytes));
-                        byte[] buffer = new byte[1024];
-                        while (!source.exhausted()) {
-                            int readBytes = source.read(buffer);
-                            if (readBytes != -1) {
-                                resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes)));
-                            }
-                        }
-                        return;
-                    }
-
-                    int payloadSize = ByteBuffer.wrap(bytes, 4, 4).getInt();
-                    if (!source.request(payloadSize)) {
-                        return;
-                    }
-                    byte[] payload = source.readByteArray(payloadSize);
-
-                    resultCallback.onNext(new Frame(streamType, payload));
-                }
-            } catch (Exception e) {
-                resultCallback.onError(e);
-            }
-        }
-
-        private static StreamType streamType(byte streamType) {
-            switch (streamType) {
-                case 0:
-                    return StreamType.STDIN;
-                case 1:
-                    return StreamType.STDOUT;
-                case 2:
-                    return StreamType.STDERR;
-                default:
-                    return StreamType.RAW;
-            }
-        }
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java
deleted file mode 100644
index 9c360522d20..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.testcontainers.dockerclient.transport.okhttp;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.core.InvocationBuilder;
-import com.github.dockerjava.core.WebTarget;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.SetMultimap;
-import lombok.SneakyThrows;
-import lombok.Value;
-import lombok.experimental.Wither;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import org.apache.commons.lang.StringUtils;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@Wither
-@Value
-class OkHttpWebTarget implements WebTarget {
-
-    ObjectMapper objectMapper;
-
-    OkHttpClient okHttpClient;
-
-    HttpUrl baseUrl;
-
-    ImmutableList<String> path;
-
-    SetMultimap<String, String> queryParams;
-
-    @Override
-    @SneakyThrows
-    public InvocationBuilder request() {
-        String resource = StringUtils.join(path, "/");
-
-        if (!resource.startsWith("/")) {
-            resource = "/" + resource;
-        }
-
-        HttpUrl.Builder baseUrlBuilder = baseUrl.newBuilder()
-            .encodedPath(resource);
-
-        for (Map.Entry<String, Collection<String>> queryParamEntry : queryParams.asMap().entrySet()) {
-            String key = queryParamEntry.getKey();
-            for (String paramValue : queryParamEntry.getValue()) {
-                baseUrlBuilder.addQueryParameter(key, paramValue);
-            }
-        }
-
-        return new OkHttpInvocationBuilder(
-            objectMapper,
-            okHttpClient,
-            baseUrlBuilder.build()
-        );
-    }
-
-    @Override
-    public OkHttpWebTarget path(String... components) {
-        return this.withPath(
-            ImmutableList.<String>builder()
-                .addAll(path)
-                .add(components)
-                .build()
-        );
-    }
-
-    @Override
-    public OkHttpWebTarget resolveTemplate(String name, Object value) {
-        ImmutableList.Builder<String> newPath = ImmutableList.builder();
-        for (String component : path) {
-            component = component.replaceAll("\\{" + name + "\\}", value.toString());
-            newPath.add(component);
-        }
-        return this.withPath(newPath.build());
-    }
-
-    @Override
-    public OkHttpWebTarget queryParam(String name, Object value) {
-        if (value == null) {
-            return this;
-        }
-
-        SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
-        newQueryParams.put(name, value.toString());
-
-        return this.withQueryParams(newQueryParams);
-    }
-
-    @Override
-    public OkHttpWebTarget queryParamsSet(String name, Set<?> values) {
-        SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
-        newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet()));
-
-        return this.withQueryParams(newQueryParams);
-    }
-
-    @Override
-    @SneakyThrows(JsonProcessingException.class)
-    public OkHttpWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
-        if (values == null || values.isEmpty()) {
-            return this;
-        }
-
-        // when param value is JSON string
-        return queryParam(name, objectMapper.writeValueAsString(values));
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
deleted file mode 100644
index d1e55f3e647..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/UnixSocketFactory.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.testcontainers.dockerclient.transport.okhttp;
-
-import lombok.EqualsAndHashCode;
-import lombok.SneakyThrows;
-import lombok.Value;
-import org.scalasbt.ipcsocket.UnixDomainSocket;
-
-import javax.net.SocketFactory;
-import java.io.FilterInputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-
-/**
- * @deprecated use com.github.docker-java:docker-java-transport-okhttp
- */
-@Deprecated
-@Value
-@EqualsAndHashCode(callSuper = false)
-public class UnixSocketFactory extends SocketFactory {
-
-    String socketPath;
-
-    @Override
-    @SneakyThrows
-    public Socket createSocket() {
-        return new UnixDomainSocket(socketPath) {
-            @Override
-            public void connect(SocketAddress endpoint, int timeout) throws IOException {
-                // Do nothing since it's not "connectable"
-            }
-
-            @Override
-            public InputStream getInputStream() {
-                return new FilterInputStream(super.getInputStream()) {
-                    @Override
-                    public void close() throws IOException {
-                        shutdownInput();
-                    }
-
-                    @Override
-                    public int read(byte[] b, int off, int len) throws IOException {
-                        if (OkHttpInvocationBuilder.CLOSING.get()) {
-                            return 0;
-                        }
-                        return super.read(b, off, len);
-                    }
-                };
-            }
-
-            @Override
-            public OutputStream getOutputStream() {
-                return new FilterOutputStream(super.getOutputStream()) {
-
-                    @Override
-                    public void write(byte[] b, int off, int len) throws IOException {
-                        out.write(b, off, len);
-                    }
-
-                    @Override
-                    public void close() throws IOException {
-                        shutdownOutput();
-                    }
-                };
-            }
-        };
-    }
-
-    @Override
-    public Socket createSocket(String s, int i) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Socket createSocket(InetAddress inetAddress, int i) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 2f668d80426..4d44cbc3842 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -70,11 +70,6 @@ private ResourceReaper() {
         dockerClient = DockerClientFactory.instance().client();
     }
 
-    @Deprecated
-    public static String start(String hostIpAddress, DockerClient client, boolean withDummyMount) {
-        return start(hostIpAddress, client);
-    }
-
     @SneakyThrows(InterruptedException.class)
     public static String start(String hostIpAddress, DockerClient client) {
         String ryukImage = TestcontainersConfiguration.getInstance().getRyukImage();
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
index a4e8cceb558..113d0a76ec0 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
@@ -2,7 +2,7 @@
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.traits.LinkableContainer;
-import org.testcontainers.containers.wait.Wait;
+import org.testcontainers.containers.wait.strategy.Wait;
 
 /**
  * A Redmine container.
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 10c0e1835c2..dd48f32bece 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 
 import java.time.Duration;
 
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 6ba7390878e..1c814044023 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -1,13 +1,12 @@
 package org.testcontainers.containers;
 
 import org.jetbrains.annotations.NotNull;
-import org.testcontainers.containers.wait.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 
 import java.time.Duration;
 import java.util.HashSet;
 import java.util.Set;
 
-import static java.lang.String.format;
 import static java.time.temporal.ChronoUnit.SECONDS;
 
 /**
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 397f6c4a2cf..16127171c59 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -19,11 +19,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.traits.LinkableContainer;
-import org.testcontainers.containers.traits.VncService;
-import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import org.testcontainers.containers.wait.LogMessageWaitStrategy;
-import org.testcontainers.containers.wait.WaitAllStrategy;
-import org.testcontainers.containers.wait.WaitStrategy;
+import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
 
@@ -44,7 +43,7 @@
  * <p>
  * The container should expose Selenium remote control protocol and VNC.
  */
-public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>> extends GenericContainer<SELF> implements VncService, LinkableContainer, TestLifecycleAware {
+public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>> extends GenericContainer<SELF> implements LinkableContainer, TestLifecycleAware {
 
     private static final String CHROME_IMAGE = "selenium/standalone-chrome-debug:%s";
     private static final String FIREFOX_IMAGE = "selenium/standalone-firefox-debug:%s";
@@ -214,17 +213,16 @@ public URL getSeleniumAddress() {
         }
     }
 
-    @Override
     public String getVncAddress() {
         return "vnc://vnc:secret@" + getHost() + ":" + getMappedPort(VNC_PORT);
     }
 
-    @Override
+    @Deprecated
     public String getPassword() {
         return DEFAULT_PASSWORD;
     }
 
-    @Override
+    @Deprecated
     public int getPort() {
         return VNC_PORT;
     }

From ddae79c2c0ae65d3cf2e898c5aeea9fcf3a55ecd Mon Sep 17 00:00:00 2001
From: Kyle Aure <KyleJAure@gmail.com>
Date: Fri, 5 Jun 2020 16:22:34 -0500
Subject: [PATCH 0782/4969] Add acceptLicense method to MSSQLServerContainer
 (#2085)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/databases/mssqlserver.md          |  5 +++--
 .../containers/MSSQLServerContainer.java       | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index 9e0bec25dad..29c5435be32 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -10,7 +10,8 @@ Running MS SQL Server as a stand-in for in a test:
 public class SomeTest {
 
     @Rule
-    public MSSQLServerContainer mssqlserver = new MSSQLServerContainer();
+    public MSSQLServerContainer mssqlserver = new MSSQLServerContainer()
+        .acceptLicense();
     
     @Test
     public void someTestMethod() {
@@ -20,7 +21,7 @@ public class SomeTest {
 ```
 
 !!! warning "EULA Acceptance"
-    Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the MS SQL Server image EULA, Please place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `mcr.microsoft.com/mssql/server:2017-CU12` (or, if you are overriding the docker image name/tag, update accordingly).
+    Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the MS SQL Server image EULA, call the `acceptLicense()` method, or place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `mcr.microsoft.com/mssql/server:2017-CU12` (or, if you are overriding the docker image name/tag, update accordingly).
     
     Please see the [`microsoft-mssql-server` image documentation](https://hub.docker.com/_/microsoft-mssql-server#environment-variables) for a link to the EULA document.
 
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index b500e6fddf0..7550f820d51 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -50,11 +50,24 @@ protected Integer getLivenessCheckPort() {
 
     @Override
     protected void configure() {
-        LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
-        addEnv("ACCEPT_EULA", "Y");
+        // If license was not accepted programatically, check if it was accepted via resource file
+        if (!getEnvMap().containsKey("ACCEPT_EULA")) {
+            LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+            acceptLicense();
+        }
+
         addEnv("SA_PASSWORD", password);
     }
 
+    /**
+     * Accepts the license for the SQLServer container by setting the ACCEPT_EULA=Y
+     * variable as described at <a href="https://hub.docker.com/_/microsoft-mssql-server">https://hub.docker.com/_/microsoft-mssql-server</a>
+     */
+    public SELF acceptLicense() {
+        addEnv("ACCEPT_EULA", "Y");
+        return self();
+    }
+
     @Override
     public String getDriverClassName() {
         return "com.microsoft.sqlserver.jdbc.SQLServerDriver";
@@ -116,6 +129,5 @@ private void checkPasswordStrength(String password) {
                     "or percent (%)."
             );
         }
-
     }
 }

From 0035c311b8cd3dc342a092992efdf39d158264b6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 6 Jun 2020 09:35:01 +0200
Subject: [PATCH 0783/4969] Avoid connection leaks in `LogUtils` (#2834)

---
 .../wait/strategy/LogMessageWaitStrategy.java | 37 ++++++++++++++-----
 .../org/testcontainers/utility/LogUtils.java  | 26 ++++++++-----
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
index bd164096300..9f7a0078f00 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
@@ -1,15 +1,21 @@
 package org.testcontainers.containers.wait.strategy;
 
+import com.github.dockerjava.api.command.LogContainerCmd;
+import lombok.SneakyThrows;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.WaitingConsumer;
-import org.testcontainers.utility.LogUtils;
 
+import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 
+import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
+import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
+
 public class LogMessageWaitStrategy extends AbstractWaitStrategy {
 
     private String regEx;
@@ -17,18 +23,31 @@ public class LogMessageWaitStrategy extends AbstractWaitStrategy {
     private int times = 1;
 
     @Override
+    @SneakyThrows(IOException.class)
     protected void waitUntilReady() {
         WaitingConsumer waitingConsumer = new WaitingConsumer();
-        LogUtils.followOutput(DockerClientFactory.instance().client(), waitStrategyTarget.getContainerId(), waitingConsumer);
 
-        Predicate<OutputFrame> waitPredicate = outputFrame ->
-            // (?s) enables line terminator matching (equivalent to Pattern.DOTALL)
-            outputFrame.getUtf8String().matches("(?s)" + regEx);
+        LogContainerCmd cmd = DockerClientFactory.instance().client().logContainerCmd(waitStrategyTarget.getContainerId())
+            .withFollowStream(true)
+            .withSince(0)
+            .withStdOut(true)
+            .withStdErr(true);
+
+        try (FrameConsumerResultCallback callback = new FrameConsumerResultCallback()) {
+            callback.addConsumer(STDOUT, waitingConsumer);
+            callback.addConsumer(STDERR, waitingConsumer);
+
+            cmd.exec(callback);
+
+            Predicate<OutputFrame> waitPredicate = outputFrame ->
+                // (?s) enables line terminator matching (equivalent to Pattern.DOTALL)
+                outputFrame.getUtf8String().matches("(?s)" + regEx);
 
-        try {
-            waitingConsumer.waitUntil(waitPredicate, startupTimeout.getSeconds(), TimeUnit.SECONDS, times);
-        } catch (TimeoutException e) {
-            throw new ContainerLaunchException("Timed out waiting for log output matching '" + regEx + "'");
+            try {
+                waitingConsumer.waitUntil(waitPredicate, startupTimeout.getSeconds(), TimeUnit.SECONDS, times);
+            } catch (TimeoutException e) {
+                throw new ContainerLaunchException("Timed out waiting for log output matching '" + regEx + "'");
+            }
         }
     }
 
diff --git a/core/src/main/java/org/testcontainers/utility/LogUtils.java b/core/src/main/java/org/testcontainers/utility/LogUtils.java
index b51325cdda7..ce27387490f 100644
--- a/core/src/main/java/org/testcontainers/utility/LogUtils.java
+++ b/core/src/main/java/org/testcontainers/utility/LogUtils.java
@@ -2,12 +2,15 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.LogContainerCmd;
+import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.ToStringConsumer;
 import org.testcontainers.containers.output.WaitingConsumer;
 
+import java.io.Closeable;
+import java.io.IOException;
 import java.util.function.Consumer;
 
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
@@ -59,6 +62,7 @@ public void followOutput(DockerClient dockerClient,
      * @param types        types of {@link OutputFrame} to receive
      * @return all previous output frames (stdout/stderr being separated by newline characters)
      */
+    @SneakyThrows(IOException.class)
     public String getOutput(DockerClient dockerClient,
                             String containerId,
                             OutputFrame.OutputType... types) {
@@ -73,17 +77,19 @@ public String getOutput(DockerClient dockerClient,
 
         final ToStringConsumer consumer = new ToStringConsumer();
         final WaitingConsumer wait = new WaitingConsumer();
-        attachConsumer(dockerClient, containerId, consumer.andThen(wait), false, types);
-
-        wait.waitUntilEnd();
-        return consumer.toUtf8String();
+        try (Closeable closeable = attachConsumer(dockerClient, containerId, consumer.andThen(wait), false, types)) {
+            wait.waitUntilEnd();
+            return consumer.toUtf8String();
+        }
     }
 
-    private static void attachConsumer(DockerClient dockerClient,
-                                       String containerId,
-                                       Consumer<OutputFrame> consumer,
-                                       boolean followStream,
-                                       OutputFrame.OutputType... types) {
+    private static Closeable attachConsumer(
+        DockerClient dockerClient,
+        String containerId,
+        Consumer<OutputFrame> consumer,
+        boolean followStream,
+        OutputFrame.OutputType... types
+    ) {
 
         final LogContainerCmd cmd = dockerClient.logContainerCmd(containerId)
             .withFollowStream(followStream)
@@ -96,6 +102,6 @@ private static void attachConsumer(DockerClient dockerClient,
             if (type == STDERR) cmd.withStdErr(true);
         }
 
-        cmd.exec(callback);
+        return cmd.exec(callback);
     }
 }

From 54b3a1869468866a2f2e0b0a003f5a0abcc3f2b4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 08:46:11 +0100
Subject: [PATCH 0784/4969] Bump mongo-java-driver from 3.12.4 to 3.12.5 in
 /core (#2844)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.4 to 3.12.5.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.4...r3.12.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 5011d24d70c..e728f1cd48b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -179,7 +179,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.4'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.5'
 
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')

From a4d6963712edd0bdba21e2c7be06c622c80ec943 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 08:48:27 +0100
Subject: [PATCH 0785/4969] Bump elasticsearch-rest-client from 7.6.2 to 7.7.1
 in /modules/elasticsearch (#2841)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.6.2 to 7.7.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.6.2...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 6deaf802112..04e038864ce 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.6.2"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.7.1"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 6d97aa2b5e3e402de7464968bb348e5f9b1049d3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 08:49:28 +0100
Subject: [PATCH 0786/4969] Bump postgresql from 42.2.12 to 42.2.13 in
 /examples (#2842)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.2.13.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.2.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 96dd03c602b..79b66e15c57 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:3.14.8'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.12'
+    testImplementation 'org.postgresql:postgresql:42.2.13'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From adc3729b0d2a949df8c1f2aea1a5bfa0f64580d4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 08:50:02 +0100
Subject: [PATCH 0787/4969] Bump postgresql from 42.2.12 to 42.2.13 in
 /modules/spock (#2840)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.2.13.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.2.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 fea1c8baa2d..7e1b05b7719 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
-    testRuntime 'org.postgresql:postgresql:42.2.12'
+    testRuntime 'org.postgresql:postgresql:42.2.13'
     testRuntime 'mysql:mysql-connector-java:8.0.20'
 }
 

From 7c1d2f1f4d1b7a005f48404b5418419e3ad94ca8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 11:48:34 +0100
Subject: [PATCH 0788/4969] Bump postgresql from 42.2.12 to 42.2.13 in
 /modules/junit-jupiter (#2845)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.2.13.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.2.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 485e02f6089..301c7eaaecc 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
-    testRuntime 'org.postgresql:postgresql:42.2.12'
+    testRuntime 'org.postgresql:postgresql:42.2.13'
     testRuntime 'mysql:mysql-connector-java:8.0.20'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }

From db6e555391a6c6d3d69ec3f458caf37923950672 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 11:50:09 +0100
Subject: [PATCH 0789/4969] Bump aws-java-sdk-sqs from 1.11.792 to 1.11.797 in
 /modules/localstack (#2847)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.792 to 1.11.797.
- [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.792...1.11.797)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 f35d38c3530..ed37cadfb65 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.792'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.792'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.792'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.792'
     testCompile 'software.amazon.awssdk:s3:2.13.23'
 }

From ec1c516d4ed77d2adf39f125c77d58acbe07b6aa Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 11:50:23 +0100
Subject: [PATCH 0790/4969] Bump s3 from 2.13.23 to 2.13.31 in
 /modules/localstack (#2848)

Bumps s3 from 2.13.23 to 2.13.31.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 ed37cadfb65..4a643d5b7f5 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.792'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.792'
-    testCompile 'software.amazon.awssdk:s3:2.13.23'
+    testCompile 'software.amazon.awssdk:s3:2.13.31'
 }

From 99cf50d09cfe6d5817f4d8b1b06e2899214ffe8a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 11:51:18 +0100
Subject: [PATCH 0791/4969] Bump postgresql from 42.2.12 to 42.2.13 in
 /modules/postgresql (#2846)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.2.13.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.2.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 1d808b1555d..2fe381f5fb4 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
-    testCompile 'org.postgresql:postgresql:42.2.12'
+    testCompile 'org.postgresql:postgresql:42.2.13'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'

From f90ad90db67e432cdabe3e9e347a7931ace0f29e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 12:00:42 +0100
Subject: [PATCH 0792/4969] Bump aws-java-sdk-logs from 1.11.792 to 1.11.797 in
 /modules/localstack (#2849)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/localstack/build.gradle | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 4a643d5b7f5..ed4b2073a41 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,9 +3,11 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.792'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.792'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.797'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.792'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'
     testCompile 'software.amazon.awssdk:s3:2.13.31'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'
 }

From 7ba06573feb6561c6fc857cd5b53ff1449808da9 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 6 Jun 2020 21:00:02 +0200
Subject: [PATCH 0793/4969] Use testcontainers/* Docker Hub images (#2850)

---
 .../utility/TestcontainersConfiguration.java               | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 44691cfb6fb..7b76039da52 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -58,6 +58,7 @@ static AtomicReference<TestcontainersConfiguration> getInstanceField() {
         this.properties.putAll(environmentProperties);
     }
 
+    @Deprecated
     public String getAmbassadorContainerImage() {
         return (String) properties.getOrDefault("ambassador.container.image", "richnorth/ambassador:latest");
     }
@@ -67,7 +68,7 @@ public String getSocatContainerImage() {
     }
 
     public String getVncRecordedContainerImage() {
-        return (String) properties.getOrDefault("vncrecorder.container.image", "testcontainersofficial/vnc-recorder:1.1.0");
+        return (String) properties.getOrDefault("vncrecorder.container.image", "testcontainers/vnc-recorder:1.1.0");
     }
 
     public String getDockerComposeContainerImage() {
@@ -83,11 +84,11 @@ public boolean isRyukPrivileged() {
     }
 
     public String getRyukImage() {
-        return (String) properties.getOrDefault("ryuk.container.image", "testcontainersofficial/ryuk:0.3.0");
+        return (String) properties.getOrDefault("ryuk.container.image", "testcontainers/ryuk:0.3.0");
     }
 
     public String getSSHdImage() {
-        return (String) properties.getOrDefault("sshd.container.image", "testcontainersofficial/sshd:1.0.0");
+        return (String) properties.getOrDefault("sshd.container.image", "testcontainers/sshd:1.0.0");
     }
 
     public Integer getRyukTimeout() {

From f353266fe3ec18514f8933a1f9469162ef3c3ad0 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 10 Jun 2020 14:21:21 +0200
Subject: [PATCH 0794/4969] Hard deprecate
 `ProxiedUnixSocketClientProviderStrategy` (#2851)

---
 core/build.gradle                             |  4 ---
 .../DockerMachineClientProviderStrategy.java  |  2 +-
 ...oxiedUnixSocketClientProviderStrategy.java | 32 ++++---------------
 ....dockerclient.DockerClientProviderStrategy |  1 -
 4 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index e728f1cd48b..d0d76392e48 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -155,10 +155,6 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    compile ('org.rnorth:tcp-unix-socket-proxy:1.0.2') {
-        exclude(group: "log4j", module: "log4j")
-    }
-
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
     shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.1') {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
index f1503477500..fac092044c7 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
@@ -31,7 +31,7 @@ protected boolean isPersistable() {
 
     @Override
     protected int getPriority() {
-        return ProxiedUnixSocketClientProviderStrategy.PRIORITY - 10;
+        return EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 100;
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java
index 84671e32efd..b1a21da724c 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java
@@ -1,20 +1,16 @@
 package org.testcontainers.dockerclient;
 
-import lombok.extern.slf4j.Slf4j;
-import org.rnorth.tcpunixsocketproxy.TcpToUnixSocketProxy;
-
-import java.io.File;
-
-@Slf4j
+/**
+ * @deprecated no longer needed since `docker-java` supports all transport modes now
+ */
+@Deprecated
 public class ProxiedUnixSocketClientProviderStrategy extends UnixSocketClientProviderStrategy {
 
     public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 100;
 
-    private final File socketFile = new File(DOCKER_SOCK_PATH);
-
     @Override
     protected boolean isApplicable() {
-        return socketFile.exists();
+        return false;
     }
 
     @Override
@@ -24,26 +20,12 @@ protected int getPriority() {
 
     @Override
     public void test() throws InvalidConfigurationException {
-        TcpToUnixSocketProxy proxy = new TcpToUnixSocketProxy(socketFile);
-
-        try {
-            int proxyPort = proxy.start().getPort();
-
-            config = tryConfiguration("tcp://localhost:" + proxyPort);
-
-            log.debug("Accessing unix domain socket via TCP proxy (" + DOCKER_SOCK_PATH + " via localhost:" + proxyPort + ")");
-        } catch (Exception e) {
-
-            proxy.stop();
-
-            throw new InvalidConfigurationException("ping failed", e);
-        }
-
+        throw new InvalidConfigurationException("Deprecated");
     }
 
     @Override
     public String getDescription() {
-        return "local Unix socket (via TCP proxy)";
+        return "[Deprecated] local Unix socket (via TCP proxy)";
     }
 
 }
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
index 25bbb30d725..cde7fc827e4 100644
--- a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
+++ b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
@@ -1,6 +1,5 @@
 org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy
 org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
-org.testcontainers.dockerclient.ProxiedUnixSocketClientProviderStrategy
 org.testcontainers.dockerclient.DockerMachineClientProviderStrategy
 org.testcontainers.dockerclient.WindowsClientProviderStrategy
 org.testcontainers.dockerclient.NpipeSocketClientProviderStrategy

From 556659751849dfb06313f46a6560d5a194efd035 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 11 Jun 2020 14:40:24 +0200
Subject: [PATCH 0795/4969] Update Windows docs for WSL2 (#2816)

---
 docs/supported_docker_environment/windows.md | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/supported_docker_environment/windows.md b/docs/supported_docker_environment/windows.md
index 6365456b095..6afab5972f2 100644
--- a/docs/supported_docker_environment/windows.md
+++ b/docs/supported_docker_environment/windows.md
@@ -4,18 +4,12 @@
 * [Docker for Windows](https://docs.docker.com/docker-for-windows/) needs to be installed
   * Docker version 17.06 is confirmed to work on Windows 10 with Hyper-V.
   * Testcontainers supports communication with Docker on Docker for Windows using named pipes.
+  * WSL2 backend is supported starting with Windows 10 2004. (**Beta**)
 
 ## Limitations
 The following features are not available or do not work correctly so make sure you do not use them or use them with 
 caution. The list may not be complete.
 
-### Testing
-
-Testcontainers is not regularly tested on Windows, so please consider it to be at an beta level of readiness.
-
-If you wish to use Testcontainers on Windows, please confirm that it works correctly for you before investing significant
-effort.
-
 ### MySQL containers
 * MySQL server prevents custom configuration file (ini-script) from being loaded due to security measures ([link to feature description](../modules/databases/index.md#using-an-init-script-from-a-file))
 
@@ -23,7 +17,18 @@ effort.
 
 * WCOW is currently not supported, since Testcontainers uses auxiliary Linux containers for certain tasks and Docker for Windows does not support hybrid engine mode at the time of writing.
 
-## Windows Subsystem for Linux
+## WSL2 backend
+
+Using Docker for Windows with WSL2 backend should work out of the box.
+
+However, there is an [existing issue](https://github.com/microsoft/WSL/issues/4694) in WSL/WSL2 that effects certain older Docker images. 
+The currently proposed workaround is to enable vsyscall emulation in the WSL2 kernel:
+```
+[wsl2]
+kernelCommandLine = vsyscall=emulate
+```
+
+## Windows Subsystem for Linux (WSL)
 
 Testcontainers supports communicating with Docker for Windows within the Windows Subsystem for Linux *([**WSL**](https://docs.microsoft.com/en-us/windows/wsl/about))*.
 The following additional configurations steps are required:

From 780b8e33811f046e64c7cdf6a25b49fb0fe79ce8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 15 Jun 2020 21:28:37 +0200
Subject: [PATCH 0796/4969] Upgrade to docker-java 3.2.2, add Apache
 HttpClient5 option (#2803)

---
 .github/workflows/ci.yml                      | 18 ++++++++++
 core/build.gradle                             |  7 +++-
 .../DelegatingDockerClient.java               | 12 +++++++
 .../testcontainers/DockerClientFactory.java   |  7 +++-
 .../containers/ContainerState.java            |  2 +-
 .../DockerClientProviderStrategy.java         | 36 ++++++++++++++++---
 .../utility/TestcontainersConfiguration.java  |  5 ---
 examples/build.gradle                         |  4 +++
 8 files changed, 79 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/DelegatingDockerClient.java

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ea2319193d..e2ca5d35daa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,3 +66,21 @@ jobs:
           wget -q https://get.cimate.io/release/linux/cimate
           chmod +x cimate
           ./cimate "**/TEST-*.xml"
+  httpclient5_test:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build with Gradle
+        run: |
+          echo "transport.type=httpclient5" > $HOME/.testcontainers.properties
+          cat $HOME/.testcontainers.properties
+          ./gradlew --no-daemon --scan testcontainers:test --tests '*EventStreamTest'
+      - name: aggregate test reports with ciMate
+        if: always()
+        env:
+          CIMATE_PROJECT_ID: 2348n4vl
+          CIMATE_CI_KEY: "CI / Apache HttpClient5"
+        run: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
diff --git a/core/build.gradle b/core/build.gradle
index d0d76392e48..c273cede20f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -157,13 +157,18 @@ dependencies {
 
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.1') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.2') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'org.slf4j')
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
+    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.2') {
+        exclude(group: 'net.java.dev.jna')
+        exclude(group: 'org.slf4j')
+    }
+
     shaded "org.yaml:snakeyaml:1.25"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
diff --git a/core/src/main/java/org/testcontainers/DelegatingDockerClient.java b/core/src/main/java/org/testcontainers/DelegatingDockerClient.java
new file mode 100644
index 00000000000..ca25650bb02
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/DelegatingDockerClient.java
@@ -0,0 +1,12 @@
+package org.testcontainers;
+
+import com.github.dockerjava.api.DockerClient;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+
+@RequiredArgsConstructor
+class DelegatingDockerClient implements DockerClient {
+
+    @Delegate
+    private final DockerClient dockerClient;
+}
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 4e16a7edf9d..48900631456 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -148,7 +148,12 @@ public DockerClient client() {
 
         String hostIpAddress = strategy.getDockerHostIpAddress();
         log.info("Docker host IP address is {}", hostIpAddress);
-        final DockerClient client = strategy.getClient();
+        final DockerClient client = new DelegatingDockerClient(strategy.getClient()) {
+            @Override
+            public void close() {
+                throw new IllegalStateException("You should never close the global DockerClient!");
+            }
+        };
 
         Info dockerInfo = client.infoCmd().exec();
         Version version = client.versionCmd().exec();
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 1565b4e7e3e..1b1a99d3b89 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -310,8 +310,8 @@ default  <T> T copyFileFromContainer(String containerPath, ThrowingFunction<Inpu
             throw new IllegalStateException("copyFileFromContainer can only be used when the Container is created.");
         }
 
+        DockerClient dockerClient = DockerClientFactory.instance().client();
         try (
-            DockerClient dockerClient = DockerClientFactory.instance().client();
             InputStream inputStream = dockerClient.copyArchiveFromContainerCmd(getContainerId(), containerPath).exec();
             TarArchiveInputStream tarInputStream = new TarArchiveInputStream(inputStream)
         ) {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index f0af6d51ae2..9573613c613 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -4,7 +4,9 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory;
+import com.github.dockerjava.okhttp.OkDockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import org.apache.commons.io.IOUtils;
@@ -116,6 +118,13 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                     try {
                         strategy.test();
                         LOGGER.info("Found Docker environment with {}", strategy.getDescription());
+                        LOGGER.debug(
+                            "Transport type: '{}', Docker host: '{}'",
+                            TestcontainersConfiguration.getInstance().getTransportType(),
+                            strategy.config != null
+                                ? strategy.config.getDockerHost()
+                                : "<unknown>"
+                        );
                         strategy.checkOSType();
 
                         if (strategy.isPersistable()) {
@@ -171,9 +180,28 @@ public DockerClient getClient() {
     }
 
     protected DockerClient getClientForConfig(DockerClientConfig config) {
-        return DockerClientImpl
-            .getInstance(new AuthDelegatingDockerClientConfig(config))
-            .withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory());
+        config = new AuthDelegatingDockerClientConfig(config);
+        final DockerHttpClient dockerHttpClient;
+
+        String transportType = TestcontainersConfiguration.getInstance().getTransportType();
+        switch (transportType) {
+            case "okhttp":
+                dockerHttpClient = new OkDockerHttpClient.Builder()
+                    .dockerHost(config.getDockerHost())
+                    .sslConfig(config.getSSLConfig())
+                    .build();
+                break;
+            case "httpclient5":
+                dockerHttpClient = new ZerodepDockerHttpClient.Builder()
+                    .dockerHost(config.getDockerHost())
+                    .sslConfig(config.getSSLConfig())
+                    .build();
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
+        }
+
+        return DockerClientImpl.getInstance(config, dockerHttpClient);
     }
 
     protected void ping(DockerClient client, int timeoutInSeconds) {
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 7b76039da52..aa829573447 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -120,11 +120,6 @@ public String getDockerClientStrategyClassName() {
         return (String) environmentProperties.get("docker.client.strategy");
     }
 
-    /**
-     *
-     * @deprecated we no longer have different transport types
-     */
-    @Deprecated
     public String getTransportType() {
         return properties.getProperty("transport.type", "okhttp");
     }
diff --git a/examples/build.gradle b/examples/build.gradle
index 25b7c1fcf29..83e196dac00 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -3,4 +3,8 @@ apply from: "$rootDir/../gradle/ci-support.gradle"
 
 subprojects {
     apply plugin:"java"
+
+    repositories {
+        jcenter()
+    }
 }

From 816b8c309ba526b4f34a9970f9f5e9918ad47d06 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 16 Jun 2020 21:56:42 +0200
Subject: [PATCH 0797/4969] Fix log-related leaks (#2883)

* Fix log-related leaks

* Update core/src/main/java/org/testcontainers/utility/ResourceReaper.java

Co-authored-by: Richard North <rich.north@gmail.com>

* Update core/src/main/java/org/testcontainers/utility/ResourceReaper.java

Co-authored-by: Richard North <rich.north@gmail.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../containers/ExecInContainerPattern.java     |  9 +++++----
 .../testcontainers/utility/ResourceReaper.java | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
index 359065d732b..9cd68d48ffb 100644
--- a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
+++ b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
@@ -73,11 +73,12 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
         final ToStringConsumer stdoutConsumer = new ToStringConsumer();
         final ToStringConsumer stderrConsumer = new ToStringConsumer();
 
-        FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
-        callback.addConsumer(OutputFrame.OutputType.STDOUT, stdoutConsumer);
-        callback.addConsumer(OutputFrame.OutputType.STDERR, stderrConsumer);
+        try (FrameConsumerResultCallback callback = new FrameConsumerResultCallback()) {
+            callback.addConsumer(OutputFrame.OutputType.STDOUT, stdoutConsumer);
+            callback.addConsumer(OutputFrame.OutputType.STDERR, stderrConsumer);
 
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(callback).awaitCompletion();
+            dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(callback).awaitCompletion();
+        }
         Integer exitCode = dockerClient.inspectExecCmd(execCreateCmdResponse.getId()).exec().getExitCode();
 
         final Container.ExecResult result = new Container.ExecResult(
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 4d44cbc3842..5d89ab886e7 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -93,7 +93,7 @@ public static String start(String hostIpAddress, DockerClient client) {
 
         StringBuilder ryukLog = new StringBuilder();
 
-        client.logContainerCmd(ryukContainerId)
+        ResultCallback.Adapter<Frame> logCallback = client.logContainerCmd(ryukContainerId)
             .withSince(0)
             .withFollowStream(true)
             .withStdOut(true)
@@ -164,11 +164,17 @@ public void onNext(Frame frame) {
         );
         kiraThread.setDaemon(true);
         kiraThread.start();
-
-        // We need to wait before we can start any containers to make sure that we delete them
-        if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
-            log.error("Timeout out waiting for Ryuk. Ryuk's log:\n{}", ryukLog);
-            throw new IllegalStateException(String.format("Can not connect to Ryuk at %s:%s", hostIpAddress, ryukPort));
+        try {
+            // We need to wait before we can start any containers to make sure that we delete them
+            if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
+                log.error("Timed out waiting for Ryuk container to start. Ryuk's logs:\n{}", ryukLog);
+                throw new IllegalStateException(String.format("Could not connect to Ryuk at %s:%s", hostIpAddress, ryukPort));
+            }
+        } finally {
+            try {
+                logCallback.close();
+            } catch (IOException ignored) {
+            }
         }
 
         return ryukContainerId;

From bfd2f2672360c7b7876ceec86b03dfa4c8ed20df Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 17 Jun 2020 15:08:55 +0200
Subject: [PATCH 0798/4969] Update to docker-java 3.2.3 (#2885)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index c273cede20f..deabf16e90d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -157,14 +157,14 @@ dependencies {
 
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.2') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.3') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'org.slf4j')
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.2') {
+    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.3') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }

From c88fcc1c6359ba22c811a21c9f3b17bb3c614513 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:37:10 +0100
Subject: [PATCH 0799/4969] Bump aws-java-sdk-s3 from 1.11.797 to 1.11.802 in
 /modules/localstack (#2870)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.797 to 1.11.802.
- [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.797...1.11.802)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 ed4b2073a41..4c04a049591 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.797'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.802'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'

From dac46206afca670c34f67cd2d1d478b4f32cd26b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:37:28 +0100
Subject: [PATCH 0800/4969] Bump postgresql from 42.2.13 to 42.2.14 in
 /modules/postgresql (#2867)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.13 to 42.2.14.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.13...REL42.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 2fe381f5fb4..7e6adea9cf1 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
-    testCompile 'org.postgresql:postgresql:42.2.13'
+    testCompile 'org.postgresql:postgresql:42.2.14'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'

From a74afbfc3458cdaf5b9db194710168c2671485de Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:37:48 +0100
Subject: [PATCH 0801/4969] Bump tomcat-jdbc from 9.0.35 to 9.0.36 in
 /modules/jdbc (#2865)

Bumps tomcat-jdbc from 9.0.35 to 9.0.36.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 1cfdeab73b2..3b6aea15c59 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.36'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 }

From 5a793a6c24460c7837dde0ffce50abbcd46a6fc7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:37:59 +0100
Subject: [PATCH 0802/4969] Bump org.springframework.boot from 2.3.0.RELEASE to
 2.3.1.RELEASE in /examples (#2871)

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.3.0.RELEASE to 2.3.1.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.3.0.RELEASE...v2.3.1.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 49e015f1af3..dc59ca877ab 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.0.RELEASE'
+    id 'org.springframework.boot' version '2.3.1.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index ad8d8252fb6..060a7f48357 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.0.RELEASE'
+    id 'org.springframework.boot' version '2.3.1.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 9e361ba447af11a158cbfdb7a3b687292ff6752c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:38:13 +0100
Subject: [PATCH 0803/4969] Bump s3 from 2.13.31 to 2.13.36 in
 /modules/localstack (#2872)

Bumps s3 from 2.13.31 to 2.13.36.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 4c04a049591..8a2a372a0f1 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'
-    testCompile 'software.amazon.awssdk:s3:2.13.31'
+    testCompile 'software.amazon.awssdk:s3:2.13.36'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'
 }

From 66a2cb07068d70ab5874b5267565177956524f1e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:38:23 +0100
Subject: [PATCH 0804/4969] Bump postgresql from 42.2.13 to 42.2.14 in
 /modules/junit-jupiter (#2869)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.13 to 42.2.14.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.13...REL42.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 301c7eaaecc..ffc060d8b01 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
-    testRuntime 'org.postgresql:postgresql:42.2.13'
+    testRuntime 'org.postgresql:postgresql:42.2.14'
     testRuntime 'mysql:mysql-connector-java:8.0.20'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }

From 4207844d1f9b2dbfb55c0df533ce1a799cc006d5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:38:36 +0100
Subject: [PATCH 0805/4969] Bump tomcat-jdbc from 9.0.35 to 9.0.36 in
 /modules/jdbc-test (#2866)

Bumps tomcat-jdbc from 9.0.35 to 9.0.36.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 23564279332..e901869f04e 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     }
 
     compile 'commons-dbutils:commons-dbutils:1.7'
-    compile 'org.apache.tomcat:tomcat-jdbc:9.0.35'
+    compile 'org.apache.tomcat:tomcat-jdbc:9.0.36'
     compile 'org.vibur:vibur-dbcp:25.0'
     compile 'mysql:mysql-connector-java:8.0.20'
 }

From 4219f078222545bcab005d4f6f3a76dda5847c18 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:38:45 +0100
Subject: [PATCH 0806/4969] Bump postgresql from 42.2.13 to 42.2.14 in
 /modules/spock (#2873)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.13 to 42.2.14.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.13...REL42.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 7e1b05b7719..ee4ac56053f 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
-    testRuntime 'org.postgresql:postgresql:42.2.13'
+    testRuntime 'org.postgresql:postgresql:42.2.14'
     testRuntime 'mysql:mysql-connector-java:8.0.20'
 }
 

From c7ebdd7ae0f5fdae9b2bc10874c5d6f8c9cfff2b Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 18 Jun 2020 19:14:08 +0100
Subject: [PATCH 0807/4969] Use PyPI published version of
 mkdocs-codeinclude-plugin

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index dd80510a4b4..227c646dd6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 mkdocs==1.0.4
--e git+https://github.com/rnorth/mkdocs-codeinclude-plugin#egg=mkdocs_codeinclude_plugin
+mkdocs-codeinclude-plugin==0.0.1
 mkdocs-material==4.6.0
 mkdocs-markdownextradata-plugin==0.1.1
 markdown>=3.1,<3.2

From b9ee64c9acecb5bc6c0637f9cc669c08562ad1e5 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 18 Jun 2020 19:21:39 +0100
Subject: [PATCH 0808/4969] Use PyPI published version of
 mkdocs-codeinclude-plugin

---
 Pipfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pipfile b/Pipfile
index 145ddf858a2..2236de86daf 100644
--- a/Pipfile
+++ b/Pipfile
@@ -7,7 +7,7 @@ verify_ssl = true
 
 [packages]
 mkdocs = "*"
-mkdocs-codeinclude-plugin = {editable = true,git = "https://github.com/rnorth/mkdocs-codeinclude-plugin"}
+mkdocs-codeinclude-plugin = "*"
 mkdocs-material = "*"
 mkdocs-markdownextradata-plugin = "*"
 

From 8767b8619356bd31e33a9893c361c070bd3ded10 Mon Sep 17 00:00:00 2001
From: Alex Yaroslavsky <trexinc@gmail.com>
Date: Fri, 19 Jun 2020 12:33:33 +0300
Subject: [PATCH 0809/4969] Fix compilation error related to unicode in source
 code (#2464)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/src/main/java/org/testcontainers/DockerClientFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 48900631456..50c0f3d021c 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -239,7 +239,7 @@ private void checkDiskSpace(DockerClient dockerClient, String id) {
 
     private void check(String message, boolean isSuccessful) {
         if (isSuccessful) {
-            log.info("\u2714︎ {}", message);
+            log.info("\u2714\ufe0e {}", message);
         } else {
             log.error("\u274c {}", message);
             throw new IllegalStateException("Check failed: " + message);

From d345b9163898f556ea63d9c0db25487a74e8cf5a Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Sat, 20 Jun 2020 13:03:23 -0700
Subject: [PATCH 0810/4969] upgrade to Dependabot 2 (#2898)

https://github.blog/2020-06-01-keep-all-your-packages-up-to-date-with-dependabot/

https://help.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
---
 .dependabot/config.yml | 160 -----------------------------------------
 .github/dependabot.yml | 136 +++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+), 160 deletions(-)
 delete mode 100644 .dependabot/config.yml
 create mode 100644 .github/dependabot.yml

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
deleted file mode 100644
index bf80d72ab92..00000000000
--- a/.dependabot/config.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-# See https://github.com/dependabot/feedback/issues/70 for current (beta) configurability
-version: 1
-update_configs:
-  - package_manager: "java:gradle"
-    directory: "/core"
-    update_schedule: "weekly"
-
-# Explicit entry for each module
-  - package_manager: "java:gradle"
-    directory: "/modules/cassandra"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/clickhouse"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/couchbase"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/database-commons"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/dynalite"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/elasticsearch"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/influxdb"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/jdbc"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/jdbc-test"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/junit-jupiter"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/kafka"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/localstack"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mariadb"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mockserver"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mssqlserver"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mysql"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/neo4j"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/nginx"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/oracle-xe"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/postgresql"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/pulsar"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/selenium"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/spock"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/vault"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-
-# Examples
-  - package_manager: "java:gradle"
-    directory: "/examples"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..8abda8d8c5a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,136 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/core"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+
+# Explicit entry for each module
+  - package-ecosystem: "gradle"
+    directory: "/modules/cassandra"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/clickhouse"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/couchbase"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/database-commons"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/dynalite"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/elasticsearch"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/influxdb"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/jdbc"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/jdbc-test"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/junit-jupiter"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/kafka"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/localstack"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mariadb"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mockserver"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mssqlserver"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mysql"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/neo4j"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/nginx"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/oracle-xe"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/postgresql"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/pulsar"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/selenium"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/spock"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/vault"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+
+# Examples
+  - package-ecosystem: "gradle"
+    directory: "/examples"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10

From 0bc4a4db37c1aad0dc97229d0b5e409904a52510 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:04:27 +0100
Subject: [PATCH 0811/4969] Bump elasticsearch-rest-client from 7.7.1 to 7.8.0
 in /modules/elasticsearch (#2889)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.7.1 to 7.8.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.7.1...v7.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 04e038864ce..591760d7b0e 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.7.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.8.0"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From d1f319491ed34c80b43d8bbba7575cc8fd570b31 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:05:13 +0100
Subject: [PATCH 0812/4969] Bump cucumber-junit from 5.7.0 to 6.1.1 in
 /examples (#2891)

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 5.7.0 to 6.1.1.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v5.7.0...v6.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[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 011b2bddecd..dfd80dc16c2 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.14.0'
     testImplementation 'io.cucumber:cucumber-java:5.7.0'
-    testImplementation 'io.cucumber:cucumber-junit:5.7.0'
+    testImplementation 'io.cucumber:cucumber-junit:6.1.1'
     testImplementation 'org.testcontainers:selenium'
 }

From d4c2230d1de7c765a12087aecdd1f3da197f05a9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:05:28 +0100
Subject: [PATCH 0813/4969] Bump pulsar-client from 2.5.2 to 2.6.0 in
 /modules/pulsar (#2893)

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.5.2...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 4082197b8ea..371aa0c11d0 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.5.2'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.1'
 }

From 0e6e14725418a99a38c87b05f3e13d87d428bda3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:05:47 +0100
Subject: [PATCH 0814/4969] Bump postgresql from 42.2.13 to 42.2.14 in
 /examples (#2892)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.13 to 42.2.14.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.13...REL42.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 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 79b66e15c57..52d2d58b6e7 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:3.14.8'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.13'
+    testImplementation 'org.postgresql:postgresql:42.2.14'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From 1955de455c36008048b3756b5a9623fd0382b13f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:06:02 +0100
Subject: [PATCH 0815/4969] Bump aws-java-sdk-s3 from 1.11.802 to 1.11.807 in
 /modules/localstack (#2894)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.802 to 1.11.807.
- [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.802...1.11.807)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 8a2a372a0f1..12f7dbe7e63 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.802'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.797'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.807'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.807'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'
     testCompile 'software.amazon.awssdk:s3:2.13.36'

From 7278c496f4a6ad2cfdf79c187efae36fa35324f0 Mon Sep 17 00:00:00 2001
From: Simon Schneider <10846939+raynigon@users.noreply.github.com>
Date: Sat, 20 Jun 2020 22:07:37 +0200
Subject: [PATCH 0816/4969] Use codeinclude for Elasticsearch Module (#2828)

Co-authored-by: Simon Schneider <raynigon@users.noreply.github.com>
---
 docs/modules/elasticsearch.md                 | 39 +++--------
 .../ElasticsearchContainerTest.java           | 69 +++++++++++++++----
 2 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index c7efa872df6..9959d0b7926 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -9,31 +9,11 @@ Note that it's based on the [official Docker image](https://www.elastic.co/guide
 
 You can start an elasticsearch container instance from any Java application by using:
 
-```java
-// Create the elasticsearch container.
-ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:6.4.1");
+<!--codeinclude-->
+[HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientContainer
+[TransportClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:transportClientContainer
+<!--/codeinclude-->
 
-// Start the container. This step might take some time...
-container.start();
-
-// Do whatever you want with the rest client ...
-final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "changeme"));
-RestClient restClient = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
-        .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
-        .build();
-Response response = restClient.performRequest(new Request("GET", "/"));
-
-// ... or the transport client
-TransportAddress transportAddress = new TransportAddress(container.getTcpHost());
-Settings settings = Settings.builder().put("cluster.name", "docker-cluster").build();
-TransportClient transportClient = new PreBuiltTransportClient(settings)
-    .addTransportAddress(transportAddress);
-ClusterHealthResponse healths = transportClient.admin().cluster().prepareHealth().get();
-
-// Stop the container.
-container.stop();
-```
 
 Note that if you are still using the [TransportClient](https://www.elastic.co/guide/en/elasticsearch/client/java-api/6.3/transport-client.html)
 (not recommended as it is deprecated), the default cluster name is set to `docker-cluster` so you need to change `cluster.name` setting
@@ -41,13 +21,12 @@ or set `client.transport.ignore_cluster_name` to `true`.
 
 ## Choose your Elasticsearch license
 
-If you prefer to start a Docker image with the pure OSS version (which means with no security or
-other advanced features), you can use this instead:
+If you prefer to start a Docker image with the pure OSS version (which means with no security in older versions or
+other new and advanced features), you can use this instead:
 
-```java
-// Create the elasticsearch container.
-ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.1");
-```
+<!--codeinclude-->
+[Elasticsearch OSS](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:oosContainer
+<!--/codeinclude-->
 
 ## Adding this module to your project dependencies
 
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 7aaf49d3af7..5da759872c9 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -1,5 +1,12 @@
 package org.testcontainers.elasticsearch;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.testcontainers.elasticsearch.ElasticsearchContainer.ELASTICSEARCH_DEFAULT_VERSION;
+
+import java.io.IOException;
 
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
@@ -7,6 +14,7 @@
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.util.EntityUtils;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
@@ -19,16 +27,13 @@
 import org.junit.After;
 import org.junit.Test;
 
-import java.io.IOException;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.testcontainers.elasticsearch.ElasticsearchContainer.ELASTICSEARCH_DEFAULT_VERSION;
-
 public class ElasticsearchContainerTest {
 
+    /**
+     * Elasticsearch version which should be used for the Tests
+     */
+    private static final String ELASTICSEARCH_VERSION = Version.CURRENT.toString();
+
     /**
      * Elasticsearch default username, when secured with a license > basic
      */
@@ -51,10 +56,14 @@ public void stopRestClient() throws IOException {
 
     @Test
     public void elasticsearchDefaultTest() throws IOException {
+        // Create the elasticsearch container.
         try (ElasticsearchContainer container = new ElasticsearchContainer()
             .withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
         ) {
+            // Start the container. This step might take some time...
             container.start();
+
+            // Do whatever you want with the rest client ...
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
             assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_DEFAULT_VERSION));
@@ -69,19 +78,22 @@ public void elasticsearchDefaultTest() throws IOException {
 
     @Test
     public void elasticsearchVersion() throws IOException {
-        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:5.6.12")) {
+        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:" + ELASTICSEARCH_VERSION)) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
             String responseAsString = EntityUtils.toString(response.getEntity());
-            assertThat(responseAsString, containsString("5.6.12"));
+            assertThat(responseAsString, containsString(ELASTICSEARCH_VERSION));
         }
     }
 
     @Test
     public void elasticsearchOssImage() throws IOException {
-        try (ElasticsearchContainer container =
-                 new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:" + ELASTICSEARCH_DEFAULT_VERSION)) {
+        try (
+            // oosContainer {
+            ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:" + ELASTICSEARCH_VERSION)
+            // }
+        ) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
@@ -92,11 +104,41 @@ public void elasticsearchOssImage() throws IOException {
         }
     }
 
+    @Test
+    public void restClientClusterHealth() throws IOException {
+        // httpClientContainer {
+        // Create the elasticsearch container.
+        try (ElasticsearchContainer container = new ElasticsearchContainer()) {
+            // Start the container. This step might take some time...
+            container.start();
+
+            // Do whatever you want with the rest client ...
+            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD));
+
+            client = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
+                .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
+                .build();
+
+            Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+        // }}
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+        // httpClientContainer {{
+        }
+        // }
+    }
+
     @Test
     public void transportClientClusterHealth() {
+        // transportClientContainer {
+        // Create the elasticsearch container.
         try (ElasticsearchContainer container = new ElasticsearchContainer()) {
+            // Start the container. This step might take some time...
             container.start();
 
+            // Do whatever you want with the transport client
             TransportAddress transportAddress = new TransportAddress(container.getTcpHost());
             String expectedClusterName = "docker-cluster";
             Settings settings = Settings.builder().put("cluster.name", expectedClusterName).build();
@@ -104,9 +146,12 @@ public void transportClientClusterHealth() {
                 .addTransportAddress(transportAddress)) {
                 ClusterHealthResponse healths = transportClient.admin().cluster().prepareHealth().get();
                 String clusterName = healths.getClusterName();
+                // }}}
                 assertThat(clusterName, is(expectedClusterName));
+                // transportClientContainer {{{
             }
         }
+        // }
     }
 
     private RestClient getClient(ElasticsearchContainer container) {

From 0053dfe559a90c4d8abb2a296d046d513abf0a08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:12:21 +0100
Subject: [PATCH 0817/4969] Bump aws-java-sdk-dynamodb from 1.11.479 to
 1.11.807 in /modules/dynalite (#2905)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.479 to 1.11.807.
- [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.479...1.11.807)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 32d522aa964..7101f40552f 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.479'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.807'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.479'
 }

From 924d36f9773fefc3321f6d3e23d97fea8852ff8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:13:44 +0100
Subject: [PATCH 0818/4969] Bump me.champeau.gradle.japicmp from 0.2.8 to 0.2.9
 in /core (#2900)

Bumps me.champeau.gradle.japicmp from 0.2.8 to 0.2.9.

Signed-off-by: dependabot[bot] <support@github.com>

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 deabf16e90d..69788d1f0de 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 plugins {
-    id 'me.champeau.gradle.japicmp' version '0.2.8'
+    id 'me.champeau.gradle.japicmp' version '0.2.9'
 }
 
 apply plugin: 'com.github.johnrengelman.shadow'

From e61bff8675847eec9db1d626ece77b588c70ad80 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 21 Jun 2020 09:50:05 +0100
Subject: [PATCH 0819/4969] Bump aws-java-sdk-sqs from 1.11.797 to 1.11.807 in
 /modules/localstack (#2896)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/localstack/build.gradle | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 12f7dbe7e63..d90e8e1611a 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,9 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.807'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.807'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.807'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.13.36'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.797'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.797'
 }

From f358ebfcfa36c84ef50707767d4beaa644e7a070 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Jun 2020 09:51:51 +0100
Subject: [PATCH 0820/4969] Bump selenium-remote-driver from 3.14.0 to 3.141.59
 in /examples (#2913)

Bumps [selenium-remote-driver](https://github.com/SeleniumHQ/selenium) from 3.14.0 to 3.141.59.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.14.0...selenium-3.141.59)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 dfd80dc16c2..2131c5766e8 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.14.0'
+    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.14.0'
     testImplementation 'io.cucumber:cucumber-java:5.7.0'

From 0cfa031297e38fd818af8add256dc08f7bd0928d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Jun 2020 09:52:05 +0100
Subject: [PATCH 0821/4969] Bump selenium-chrome-driver from 3.14.0 to 3.141.59
 in /examples (#2914)

Bumps [selenium-chrome-driver](https://github.com/SeleniumHQ/selenium) from 3.14.0 to 3.141.59.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.14.0...selenium-3.141.59)

Signed-off-by: dependabot[bot] <support@github.com>

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 2131c5766e8..e4c44c0e063 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -9,7 +9,7 @@ repositories {
 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.14.0'
+    implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
     testImplementation 'io.cucumber:cucumber-java:5.7.0'
     testImplementation 'io.cucumber:cucumber-junit:6.1.1'
     testImplementation 'org.testcontainers:selenium'

From 043d9ea2e2add78a767c241cbb04f6494071dee5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Jun 2020 09:52:25 +0100
Subject: [PATCH 0822/4969] Bump okhttp from 3.14.8 to 4.7.2 in /examples
 (#2915)

Bumps [okhttp](https://github.com/square/okhttp) from 3.14.8 to 4.7.2.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.8...parent-4.7.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 52d2d58b6e7..f56b8bc46d8 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:3.14.8'
+    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.14'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From 98f5e9bb88de667b5b7ad5d548d0f4901776821e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Jun 2020 19:43:37 +0100
Subject: [PATCH 0823/4969] Bump s3 from 2.13.36 to 2.13.41 in
 /modules/localstack (#2907)

Bumps s3 from 2.13.36 to 2.13.41.

Signed-off-by: dependabot[bot] <support@github.com>

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 d90e8e1611a..a04c04a4751 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.807'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.807'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.13.36'
+    testCompile 'software.amazon.awssdk:s3:2.13.41'
 }

From 859f29d205f88404d7ec290cdaf6e4fb7b8b6ca2 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 23 Jun 2020 15:11:09 +0100
Subject: [PATCH 0824/4969] Upgrade docker-java to 3.2.4 (#2924)

Primarily to incorporate https://github.com/docker-java/docker-java/pull/1420 and improve build stability issues seen recently.
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 69788d1f0de..0e0a41f4914 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -157,14 +157,14 @@ dependencies {
 
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.3') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.4') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'org.slf4j')
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.3') {
+    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.4') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }

From fc03c217b9ebfbc7e6db82bcdd3b54a159580cd9 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 23 Jun 2020 17:59:12 +0100
Subject: [PATCH 0825/4969] Pin registry image used for testing (#2926)

As a workaround for https://github.com/docker/distribution-library-image/issues/107
---
 .../org/testcontainers/utility/AuthenticatedImagePullTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 31f098bab16..3986255f248 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -45,7 +45,7 @@ public class AuthenticatedImagePullTest {
     @ClassRule
     public static GenericContainer<?> authenticatedRegistry = new GenericContainer<>(new ImageFromDockerfile()
         .withDockerfileFromBuilder(builder -> {
-            builder.from("registry:2")
+            builder.from("registry:2.7.0")
                 .run("htpasswd -Bbn testuser notasecret > /htpasswd")
                 .env("REGISTRY_AUTH", "htpasswd")
                 .env("REGISTRY_AUTH_HTPASSWD_PATH", "/htpasswd")

From 3f64d0c9eac4b500730074fb40a20b9a689c6b65 Mon Sep 17 00:00:00 2001
From: Simon Schneider <10846939+raynigon@users.noreply.github.com>
Date: Tue, 23 Jun 2020 19:53:54 +0200
Subject: [PATCH 0826/4969] Convert Docs for the Spock Testframework (#2928)

Convert inline example code to use codeinclude macro for the Spock Testframework documentation
See #1158 for more details.
---
 docs/test_framework_integration/spock.md      | 34 ++-----------------
 .../spock/PostgresContainerIT.groovy          |  2 ++
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/docs/test_framework_integration/spock.md b/docs/test_framework_integration/spock.md
index bbe06a43e80..8528faf4490 100644
--- a/docs/test_framework_integration/spock.md
+++ b/docs/test_framework_integration/spock.md
@@ -9,37 +9,9 @@
 Specifying the `@Testcontainers` annotation will instruct Spock to start and stop all testcontainers accordingly. This annotation 
 can be mixed with Spock's `@Shared` annotation to indicate, that containers shouldn't be restarted between tests.
 
-```groovy
-@Testcontainers
-class DatabaseTest extends Specification {
-
-    @Shared
-    PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer()
-            .withDatabaseName("foo")
-            .withUsername("foo")
-            .withPassword("secret")
-
-    def "database is accessible"() {
-
-        given: "a jdbc connection"
-        HikariConfig hikariConfig = new HikariConfig()
-        hikariConfig.setJdbcUrl(postgreSQLContainer.jdbcUrl)
-        hikariConfig.setUsername("foo")
-        hikariConfig.setPassword("secret")
-        HikariDataSource ds = new HikariDataSource(hikariConfig)
-
-        when: "querying the database"
-        Statement statement = ds.getConnection().createStatement()
-        statement.execute("SELECT 1")
-        ResultSet resultSet = statement.getResultSet()
-        resultSet.next()
-
-        then: "result is returned"
-        int resultSetInt = resultSet.getInt(1)
-        resultSetInt == 1
-    }
-}
-```
+<!--codeinclude-->
+[PostgresContainerIT](../../modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy) inside_block:PostgresContainerIT
+<!--/codeinclude-->
 
 ## Adding Testcontainers Spock support to your project dependencies
 
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
index 6e090e77c33..4ac095bed6f 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
@@ -9,6 +9,7 @@ import spock.lang.Specification
 import java.sql.ResultSet
 import java.sql.Statement
 
+// PostgresContainerIT {
 @Testcontainers
 class PostgresContainerIT extends Specification {
 
@@ -42,3 +43,4 @@ class PostgresContainerIT extends Specification {
     }
 
 }
+// }

From 53e02a5f5ff1d8db7d9ab04890e62ae25e639066 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 24 Jun 2020 08:32:00 +0100
Subject: [PATCH 0827/4969] Run correct subset of docker compose containers
 when `withServices`/`withScaledService` used (#2922)

Co-authored-by: Afshin <mnafshin@gmail.com>
---
 .../containers/DockerComposeContainer.java    | 115 ++++++++++--------
 ...ockerComposeContainerWithServicesTest.java | 107 ++++++++++++++++
 .../compose-scaling-multiple-containers.yml   |   7 ++
 .../compose-with-inline-scale-test.yml        |   5 +
 4 files changed, 184 insertions(+), 50 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
 create mode 100644 core/src/test/resources/compose-scaling-multiple-containers.yml
 create mode 100644 core/src/test/resources/compose-with-inline-scale-test.yml

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 651bd9c8526..c3fe9ab17f9 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -2,9 +2,9 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Container;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Uninterruptibles;
@@ -56,6 +56,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static org.testcontainers.containers.BindMode.READ_ONLY;
@@ -196,23 +197,36 @@ public SELF withServices(@NonNull String... services) {
     }
 
     private void createServices() {
-        // Apply scaling
-        final String servicesWithScalingSettings = Stream.concat(services.stream(), scalingPreferences.keySet().stream())
-            .map(service -> "--scale " + service + "=" + scalingPreferences.getOrDefault(service, 1))
+        // services that have been explicitly requested to be started. If empty, all services should be started.
+        final String serviceNameArgs = Stream.concat(
+            services.stream(),                      // services that have been specified with `withServices`
+            scalingPreferences.keySet().stream()    // services that are implicitly needed via `withScaledService`
+        )
+            .distinct()
             .collect(joining(" "));
 
-        String flags = "-d";
+        // Apply scaling for the services specified using `withScaledService`
+        final String scalingOptions = scalingPreferences.entrySet().stream()
+            .map(entry -> "--scale " + entry.getKey() + "=" + entry.getValue())
+            .distinct()
+            .collect(joining(" "));
+
+        String command = "up -d";
 
         if (build) {
-            flags += " --build";
+            command += " --build";
         }
 
-        // Run the docker-compose container, which starts up the services
-        if(Strings.isNullOrEmpty(servicesWithScalingSettings)) {
-            runWithCompose("up " + flags);
-        } else {
-            runWithCompose("up " + flags + " " + servicesWithScalingSettings);
+        if (!isNullOrEmpty(scalingOptions)) {
+            command += " " + scalingOptions;
+        }
+
+        if (!isNullOrEmpty(serviceNameArgs)) {
+            command += " " + serviceNameArgs;
         }
+
+        // Run the docker-compose container, which starts up the services
+        runWithCompose(command);
     }
 
     private void waitUntilServiceStarted() {
@@ -250,7 +264,7 @@ private void createServiceInstance(Container container) {
 
     private void waitUntilServiceStarted(String serviceName, ComposeServiceWaitStrategyTarget serviceInstance) {
         final WaitAllStrategy waitAllStrategy = waitStrategyMap.get(serviceName);
-        if(waitAllStrategy != null) {
+        if (waitAllStrategy != null) {
             waitAllStrategy.waitUntilReady(serviceInstance);
         }
     }
@@ -273,24 +287,25 @@ private void runWithCompose(String cmd) {
         }
 
         dockerCompose
-                .withCommand(cmd)
-                .withEnv(env)
-                .invoke();
+            .withCommand(cmd)
+            .withEnv(env)
+            .invoke();
     }
 
     private void registerContainersForShutdown() {
         ResourceReaper.instance().registerFilterForCleanup(Arrays.asList(
-                new SimpleEntry<>("label", "com.docker.compose.project=" + project)
+            new SimpleEntry<>("label", "com.docker.compose.project=" + project)
         ));
     }
 
-    private List<Container> listChildContainers() {
+    @VisibleForTesting
+    List<Container> listChildContainers() {
         return dockerClient.listContainersCmd()
-                .withShowAll(true)
-                .exec().stream()
-                .filter(container -> Arrays.stream(container.getNames()).anyMatch(name ->
-                        name.startsWith("/" + project)))
-                .collect(toList());
+            .withShowAll(true)
+            .exec().stream()
+            .filter(container -> Arrays.stream(container.getNames()).anyMatch(name ->
+                name.startsWith("/" + project)))
+            .collect(toList());
     }
 
     private void startAmbassadorContainers() {
@@ -378,12 +393,12 @@ private void addWaitStrategy(String serviceInstanceName, @NonNull WaitStrategy w
     }
 
     /**
-     Specify the {@link WaitStrategy} to use to determine if the container is ready.
+     * Specify the {@link WaitStrategy} to use to determine if the container is ready.
      *
-     * @see org.testcontainers.containers.wait.strategy.Wait#defaultWaitStrategy()
-     * @param serviceName the name of the service to wait for
+     * @param serviceName  the name of the service to wait for
      * @param waitStrategy the WaitStrategy to use
      * @return this
+     * @see org.testcontainers.containers.wait.strategy.Wait#defaultWaitStrategy()
      */
     public SELF waitingFor(String serviceName, @NonNull WaitStrategy waitStrategy) {
         String serviceInstanceName = getServiceInstanceName(serviceName);
@@ -420,8 +435,8 @@ public Integer getServicePort(String serviceName, Integer servicePort) {
 
         if (portMap == null) {
             throw new IllegalArgumentException("Could not get a port for '" + serviceName + "'. " +
-                "Testcontainers does not have an exposed port configured for '" + serviceName + "'. "+
-                "To fix, please ensure that the service '" + serviceName + "' has ports exposed using .withExposedService(...)");
+                                               "Testcontainers does not have an exposed port configured for '" + serviceName + "'. " +
+                                               "To fix, please ensure that the service '" + serviceName + "' has ports exposed using .withExposedService(...)");
         } else {
             return ambassadorContainer.getMappedPort(portMap.get(servicePort));
         }
@@ -479,7 +494,7 @@ public SELF withTailChildContainers(boolean tailChildContainers) {
      * More than one consumer may be registered.
      *
      * @param serviceName the name of the service as set in the docker-compose.yml file
-     * @param consumer consumer that output frames should be sent to
+     * @param consumer    consumer that output frames should be sent to
      * @return this instance, for chaining
      */
     public SELF withLogConsumer(String serviceName, Consumer<OutputFrame> consumer) {
@@ -579,10 +594,10 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
         final String containerPwd = MountableFile.forHostPath(pwd).getFilesystemPath();
 
         final List<String> absoluteDockerComposeFiles = composeFiles.stream()
-                .map(File::getAbsolutePath)
-                .map(MountableFile::forHostPath)
-                .map(MountableFile::getFilesystemPath)
-                .collect(toList());
+            .map(File::getAbsolutePath)
+            .map(MountableFile::forHostPath)
+            .map(MountableFile::getFilesystemPath)
+            .collect(toList());
         final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPERATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
         logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
         addEnv(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
@@ -600,8 +615,8 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
 
     private String getDockerSocketHostPath() {
         return SystemUtils.IS_OS_WINDOWS
-                ? "/" + DOCKER_SOCKET_PATH
-                : DOCKER_SOCKET_PATH;
+            ? "/" + DOCKER_SOCKET_PATH
+            : DOCKER_SOCKET_PATH;
     }
 
     @Override
@@ -621,16 +636,16 @@ public void invoke() {
         AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
 
         final Integer exitCode = this.dockerClient.inspectContainerCmd(getContainerId())
-                .exec()
-                .getState()
-                .getExitCode();
+            .exec()
+            .getState()
+            .getExitCode();
 
         if (exitCode == null || exitCode != 0) {
             throw new ContainerLaunchException(
-                    "Containerised Docker Compose exited abnormally with code " +
-                            exitCode +
-                            " whilst running command: " +
-                            StringUtils.join(this.getCommandParts(), ' '));
+                "Containerised Docker Compose exited abnormally with code " +
+                exitCode +
+                " whilst running command: " +
+                StringUtils.join(this.getCommandParts(), ' '));
         }
     }
 }
@@ -691,23 +706,23 @@ public void invoke() {
         logger().info("Local Docker Compose is running command: {}", cmd);
 
         final List<String> command = Splitter.onPattern(" ")
-                .omitEmptyStrings()
-                .splitToList(COMPOSE_EXECUTABLE + " " + cmd);
+            .omitEmptyStrings()
+            .splitToList(COMPOSE_EXECUTABLE + " " + cmd);
 
         try {
             new ProcessExecutor().command(command)
-                    .redirectOutput(Slf4jStream.of(logger()).asInfo())
-                    .redirectError(Slf4jStream.of(logger()).asInfo()) // docker-compose will log pull information to stderr
-                    .environment(environment)
-                    .directory(pwd)
-                    .exitValueNormal()
-                    .executeNoTimeout();
+                .redirectOutput(Slf4jStream.of(logger()).asInfo())
+                .redirectError(Slf4jStream.of(logger()).asInfo()) // docker-compose will log pull information to stderr
+                .environment(environment)
+                .directory(pwd)
+                .exitValueNormal()
+                .executeNoTimeout();
 
             logger().info("Docker Compose has finished running");
 
         } catch (InvalidExitValueException e) {
             throw new ContainerLaunchException("Local Docker Compose exited abnormally with code " +
-                    e.getExitValue() + " whilst running command: " + cmd);
+                                               e.getExitValue() + " whilst running command: " + cmd);
 
         } catch (Exception e) {
             throw new ContainerLaunchException("Error running local Docker Compose command: " + cmd, e);
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
new file mode 100644
index 00000000000..8927972e642
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -0,0 +1,107 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+
+public class DockerComposeContainerWithServicesTest {
+
+    public static final File SIMPLE_COMPOSE_FILE = new File("src/test/resources/compose-scaling-multiple-containers.yml");
+    public static final File COMPOSE_FILE_WITH_INLINE_SCALE = new File("src/test/resources/compose-with-inline-scale-test.yml");
+
+    @Test
+    public void testDesiredSubsetOfServicesAreStarted() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+                .withServices("redis")
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1");
+        }
+    }
+
+    @Test
+    public void testDesiredSubsetOfScaledServicesAreStarted() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+                .withScaledService("redis", 2)
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1", "redis_2");
+        }
+    }
+
+    @Test
+    public void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+                .withServices("redis")
+                .withScaledService("redis", 2)
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1", "redis_2");
+        }
+    }
+
+    @Test
+    public void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+                .withServices("other")
+                .withScaledService("redis", 2)
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1", "redis_2", "other_1");
+        }
+    }
+
+    @Test
+    public void testAllServicesAreStartedIfNotSpecified() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1", "other_1");
+        }
+    }
+
+    @Test
+    public void testScaleInComposeFileIsRespected() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_INLINE_SCALE)
+        ) {
+            compose.start();
+
+            // the compose file includes `scale: 3` for the redis container
+            verifyStartedContainers(compose, "redis_1", "redis_2", "redis_3");
+        }
+    }
+
+    private void verifyStartedContainers(final DockerComposeContainer<?> compose, final String... names) {
+        final List<String> containerNames = compose.listChildContainers().stream()
+            .flatMap(container -> Stream.of(container.getNames()))
+            .collect(Collectors.toList());
+
+        assertEquals("number of running services of docker-compose is the same as length of listOfServices",
+            names.length, containerNames.size());
+
+        for (final String expectedName : names) {
+            final long matches = containerNames.stream()
+                .filter(foundName -> foundName.endsWith(expectedName))
+                .count();
+
+            assertEquals("container with name starting '" + expectedName + "' should be running", 1L, matches);
+        }
+    }
+}
diff --git a/core/src/test/resources/compose-scaling-multiple-containers.yml b/core/src/test/resources/compose-scaling-multiple-containers.yml
new file mode 100644
index 00000000000..da5ac6f3a07
--- /dev/null
+++ b/core/src/test/resources/compose-scaling-multiple-containers.yml
@@ -0,0 +1,7 @@
+version: '2.4'
+services:
+  redis:
+    image: redis
+  other:
+    image: alpine:3.5
+    command: sleep 10000
diff --git a/core/src/test/resources/compose-with-inline-scale-test.yml b/core/src/test/resources/compose-with-inline-scale-test.yml
new file mode 100644
index 00000000000..f2e7e8c1a79
--- /dev/null
+++ b/core/src/test/resources/compose-with-inline-scale-test.yml
@@ -0,0 +1,5 @@
+version: '2.4'
+services:
+  redis:
+    image: redis
+    scale: 3      # legacy mechanism to specify scale

From f07f31ec49fdfe02d0fc1a6c2674b62b08510736 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 25 Jun 2020 12:11:08 +0200
Subject: [PATCH 0828/4969] Continue on ciMate's error (#2933)

---
 .github/workflows/ci-docker-wormhole.yml | 1 +
 .github/workflows/ci-examples.yml        | 1 +
 .github/workflows/ci.yml                 | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 3c6da54dc1f..f9e106d56b7 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -20,6 +20,7 @@ jobs:
             ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
       - name: aggregate test reports with ciMate
         if: always()
+        continue-on-error: true
         env:
           CIMATE_PROJECT_ID: 2348n4vl
         run: |
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 8dab14e831c..d81a4ffb509 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -61,6 +61,7 @@ jobs:
           ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
       - name: Aggregate Examples test reports with ciMate
         if: always()
+        continue-on-error: true
         env:
           CIMATE_PROJECT_ID: 2348n4vl
           CIMATE_CI_KEY: "Examples / ${{ runner.os }} / ${{matrix.gradle_args}}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2ca5d35daa..b965eb77dc9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,6 +59,7 @@ jobs:
           ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
       - name: Aggregate test reports with ciMate
         if: always()
+        continue-on-error: true
         env:
           CIMATE_PROJECT_ID: 2348n4vl
           CIMATE_CI_KEY: "CI / ${{ runner.os }} / ${{matrix.gradle_args}}"
@@ -77,6 +78,7 @@ jobs:
           ./gradlew --no-daemon --scan testcontainers:test --tests '*EventStreamTest'
       - name: aggregate test reports with ciMate
         if: always()
+        continue-on-error: true
         env:
           CIMATE_PROJECT_ID: 2348n4vl
           CIMATE_CI_KEY: "CI / Apache HttpClient5"

From d09491bdc2fa1dd50c12c66650a2928642d0a037 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 25 Jun 2020 12:17:51 +0200
Subject: [PATCH 0829/4969] Update to `docker-java` 3.2.5 (#2938)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0e0a41f4914..e1fb724597e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -157,14 +157,14 @@ dependencies {
 
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.4') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.5') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'org.slf4j')
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.4') {
+    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.5') {
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }

From 60537db11726a278d0259dd4b08771910278814d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 25 Jun 2020 11:58:20 +0100
Subject: [PATCH 0830/4969] Pin version of RabbitMQ image to
 `3.7.25-management-alpine` (#2941)

---
 .../java/org/testcontainers/containers/RabbitMQContainer.java   | 2 +-
 .../org/testcontainers/containers/RabbitMQContainerTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 49423201d14..d8d46f51b1c 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -28,7 +28,7 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
      * The image defaults to the official RabbitmQ image: <a href="https://hub.docker.com/_/rabbitmq/">RabbitMQ</a>.
      */
     private static final String DEFAULT_IMAGE_NAME = "rabbitmq";
-    private static final String DEFAULT_TAG = "3.7-management-alpine";
+    private static final String DEFAULT_TAG = "3.7.25-management-alpine";
 
     private static final int DEFAULT_AMQP_PORT = 5672;
     private static final int DEFAULT_AMQPS_PORT = 5671;
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 27ac38f55ce..d8e9c7658c0 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -31,7 +31,7 @@
  */
 public class RabbitMQContainerTest {
 
-    public static final String DEFAULT_IMAGE = "rabbitmq:3.7-management-alpine";
+    public static final String DEFAULT_IMAGE = "rabbitmq:3.7.25-management-alpine";
     public static final int DEFAULT_AMQPS_PORT = 5671;
     public static final int DEFAULT_AMQP_PORT = 5672;
     public static final int DEFAULT_HTTPS_PORT = 15671;

From a4d67a68d37b1fbd804daa513c9b93fb4d3cb05c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 25 Jun 2020 12:58:49 +0200
Subject: [PATCH 0831/4969] Delete pom.xml (#2937)

---
 examples/singleton-container/pom.xml | 43 ----------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 examples/singleton-container/pom.xml

diff --git a/examples/singleton-container/pom.xml b/examples/singleton-container/pom.xml
deleted file mode 100644
index 710c32d6b80..00000000000
--- a/examples/singleton-container/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>testcontainers-java-examples</artifactId>
-        <groupId>org.testcontainers.examples</groupId>
-        <version>NOVERSION</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>singleton-container</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-			<version>3.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>23.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

From 22c64030140f9c67023be498faa795709c00ebcd Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 25 Jun 2020 22:38:30 +0200
Subject: [PATCH 0832/4969] Cache Ryuk's failure to prevent the double start
 (#2935)

see #2395
---
 .../org/testcontainers/DockerClientFactory.java | 17 +++++++++++------
 .../testcontainers/DockerClientFactoryTest.java |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 50c0f3d021c..95e0c9838ba 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -66,7 +66,7 @@ public class DockerClientFactory {
     DockerClient dockerClient;
 
     @VisibleForTesting
-    RuntimeException cachedChecksFailure;
+    RuntimeException cachedClientFailure;
 
     private String activeApiVersion;
     private String activeExecutionDriver;
@@ -139,9 +139,9 @@ public DockerClient client() {
         }
 
         // fail-fast if checks have failed previously
-        if (cachedChecksFailure != null) {
-            log.debug("There is a cached checks failure - throwing", cachedChecksFailure);
-            throw cachedChecksFailure;
+        if (cachedClientFailure != null) {
+            log.debug("There is a cached checks failure - throwing", cachedClientFailure);
+            throw cachedClientFailure;
         }
 
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
@@ -170,7 +170,12 @@ public void close() {
         boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
         if (useRyuk) {
             log.debug("Ryuk is enabled");
-            ryukContainerId = ResourceReaper.start(hostIpAddress, client);
+            try {
+                ryukContainerId = ResourceReaper.start(hostIpAddress, client);
+            } catch (RuntimeException e) {
+                cachedClientFailure = e;
+                throw e;
+            }
             log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
         } else {
             log.debug("Ryuk is disabled");
@@ -201,7 +206,7 @@ public void close() {
                     );
                 }
             } catch (RuntimeException e) {
-                cachedChecksFailure = e;
+                cachedClientFailure = e;
                 throw e;
             }
         } else {
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 60fd69e9fd3..04edd407959 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -71,7 +71,7 @@ public void failedChecksFailFast() {
 
         DockerClientFactory instance = new DockerClientFactory();
         DockerClient dockerClient = instance.dockerClient;
-        assertThat(instance.cachedChecksFailure).isNull();
+        assertThat(instance.cachedClientFailure).isNull();
         try {
             // Remove cached client to force the initialization logic
             instance.dockerClient = null;
@@ -80,12 +80,12 @@ public void failedChecksFailFast() {
             assertThatThrownBy(instance::client).isInstanceOf(DockerException.class);
 
             RuntimeException failure = new IllegalStateException("Boom!");
-            instance.cachedChecksFailure = failure;
+            instance.cachedClientFailure = failure;
             // Fail fast
             assertThatThrownBy(instance::client).isEqualTo(failure);
         } finally {
             instance.dockerClient = dockerClient;
-            instance.cachedChecksFailure = null;
+            instance.cachedClientFailure = null;
         }
     }
 }

From f4400a09ef3fef2d98e1fa0085508a8989ab8662 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 25 Jun 2020 22:39:00 +0200
Subject: [PATCH 0833/4969] Do not resolve `LazyFuture` from
 `RemoteDockerImage#toString` (#2930)

---
 .../testcontainers/utility/LazyFuture.java    | 30 +++++++++++--------
 .../images/RemoteDockerImageTest.java         | 30 +++++++++++++++++++
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/LazyFuture.java b/core/src/main/java/org/testcontainers/utility/LazyFuture.java
index b0aa4346cbb..758082f5185 100644
--- a/core/src/main/java/org/testcontainers/utility/LazyFuture.java
+++ b/core/src/main/java/org/testcontainers/utility/LazyFuture.java
@@ -2,10 +2,10 @@
 
 import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.experimental.Delegate;
 import org.rnorth.ducttape.timeouts.Timeouts;
 
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Future implementation with lazy result evaluation <b>in the same Thread</b> as caller.
@@ -14,31 +14,37 @@
  */
 public abstract class LazyFuture<T> implements Future<T> {
 
-    @Delegate(excludes = Excludes.class)
-    private final Future<T> delegate = CompletableFuture.completedFuture(null);
-
     @Getter(value = AccessLevel.MODULE, lazy = true)
     private final T resolvedValue = resolve();
 
     abstract protected T resolve();
 
     @Override
-    public T get() throws InterruptedException, ExecutionException {
+    public boolean cancel(boolean mayInterruptIfRunning) {
+        return false;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return false;
+    }
+
+    @Override
+    public boolean isDone() {
+        return ((AtomicReference<?>) resolvedValue).get() != null;
+    }
+
+    @Override
+    public T get() {
         return getResolvedValue();
     }
 
     @Override
-    public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+    public T get(long timeout, TimeUnit unit) throws TimeoutException {
         try {
             return Timeouts.getWithTimeout((int) timeout, unit, this::get);
         } catch (org.rnorth.ducttape.TimeoutException e) {
             throw new TimeoutException(e.getMessage());
         }
     }
-
-    private interface Excludes<T> {
-        T get();
-
-        T get(long timeout, TimeUnit unit);
-    }
 }
diff --git a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
index c62f15653b3..6b6a82559bf 100644
--- a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
+++ b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
@@ -6,8 +6,11 @@
 
 import org.junit.Test;
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.LazyFuture;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class RemoteDockerImageTest {
 
@@ -44,4 +47,31 @@ public void toStringDoesntResolveImageNameFuture()  {
         imageNameFuture.complete(imageName);
         assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
     }
+
+    @Test(timeout=5000L)
+    public void toStringDoesntResolveLazyFuture() throws Exception {
+        String imageName = Base58.randomString(8).toLowerCase();
+        AtomicBoolean resolved = new AtomicBoolean(false);
+        Future<String> imageNameFuture = new LazyFuture<String>() {
+            @Override
+            protected String resolve() {
+                resolved.set(true);
+                return imageName;
+            }
+        };
+
+        // verify that we've set up the test properly
+        assertFalse(imageNameFuture.isDone());
+
+        RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageNameFuture);
+        assertThat(remoteDockerImage.toString(), containsString("imageName=<resolving>"));
+
+        // Make sure the act of calling toString doesn't resolve the imageNameFuture
+        assertFalse(imageNameFuture.isDone());
+        assertFalse(resolved.get());
+
+        // Trigger resolve
+        imageNameFuture.get();
+        assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
+    }
 }

From 6a005390d670632d63cef2c6bf8939cf76725341 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 26 Jun 2020 10:17:51 +0200
Subject: [PATCH 0834/4969] Remove implicit network in `KafkaContainer` (#2932)

---
 .../containers/KafkaContainer.java            | 23 -------------------
 .../containers/KafkaContainerTest.java        | 22 ------------------
 2 files changed, 45 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index bb92f85b03c..9746849be29 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -29,8 +29,6 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private int port = PORT_NOT_ASSIGNED;
 
-    private boolean useImplicitNetwork = true;
-
     public KafkaContainer() {
         this("5.2.1");
     }
@@ -38,7 +36,6 @@ public KafkaContainer() {
     public KafkaContainer(String confluentPlatformVersion) {
         super(TestcontainersConfiguration.getInstance().getKafkaImage() + ":" + confluentPlatformVersion);
 
-        super.withNetwork(Network.SHARED);
         withExposedPorts(KAFKA_PORT);
 
         // Use two listeners with different names, it will force Kafka to communicate with itself via internal
@@ -54,26 +51,6 @@ public KafkaContainer(String confluentPlatformVersion) {
         withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
     }
 
-    @Override
-    public KafkaContainer withNetwork(Network network) {
-        useImplicitNetwork = false;
-        return super.withNetwork(network);
-    }
-
-    @Override
-    public Network getNetwork() {
-        if (useImplicitNetwork) {
-            // TODO Only for backward compatibility, to be removed soon
-            logger().warn(
-                "Deprecation warning! " +
-                    "KafkaContainer#getNetwork without an explicitly set network. " +
-                    "Consider using KafkaContainer#withNetwork",
-                new Exception("Deprecated method")
-            );
-        }
-        return super.getNetwork();
-    }
-
     public KafkaContainer withEmbeddedZookeeper() {
         externalZookeeperConnect = null;
         return self();
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 1490caa3328..c5d719295ed 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -31,28 +31,6 @@ public void testUsage() throws Exception {
         }
     }
 
-    /**
-     * @deprecated the {@link Network} should be set explicitly with {@link KafkaContainer#withNetwork(Network)}.
-     */
-    @Test
-    @Deprecated
-    public void testExternalZookeeperWithKafkaNetwork() throws Exception {
-        try (
-            KafkaContainer kafka = new KafkaContainer()
-                .withExternalZookeeper("zookeeper:2181");
-
-            GenericContainer zookeeper = new GenericContainer("confluentinc/cp-zookeeper:4.0.0")
-                .withNetwork(kafka.getNetwork())
-                .withNetworkAliases("zookeeper")
-                .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
-        ) {
-            zookeeper.start();
-            kafka.start();
-
-            testKafkaFunctionality(kafka.getBootstrapServers());
-        }
-    }
-
     @Test
     public void testExternalZookeeperWithExternalNetwork() throws Exception {
         try (

From bde786cd0b22ef03ca99bbd557264310f9da4ef3 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 29 Jun 2020 21:36:48 +0100
Subject: [PATCH 0835/4969] Add initial bounty policy documentation. (#2954)

---
 CONTRIBUTING.md |  8 ++++++++
 docs/bounty.md  | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 mkdocs.yml      |  1 +
 3 files changed, 60 insertions(+)
 create mode 100644 docs/bounty.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ffa95a477db..83afa8a9ea8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,3 +3,11 @@
 Please see the [main contributing guidelines](./docs/contributing.md).
 
 There are additional docs describing [contributing documentation changes](./docs/contributing_docs.md).
+
+### GitHub Sponsorship
+
+Testcontainers is [in the GitHub Sponsors program](https://github.com/sponsors/testcontainers)!
+
+This repository is supported by our sponsors, meaning that issues are eligible to have a 'bounty' attached to them by sponsors.
+
+Please see [the bounty policy page](https://testcontainers.org/bounty) if you are interested, either as a sponsor or as a contributor.
\ No newline at end of file
diff --git a/docs/bounty.md b/docs/bounty.md
new file mode 100644
index 00000000000..56ee501062c
--- /dev/null
+++ b/docs/bounty.md
@@ -0,0 +1,51 @@
+# Testcontainers issue bounty policy
+
+## General
+
+We want to use issue bounties to encourage contributions in areas that are important to our sponsors, or tricky to solve.
+This includes bug fixes and new features.
+We hope that this will provide incentives to tackle issues, and gives sponsors a way to influence where development time is expended.
+We also want to reward our contributors, some of whom make huge efforts to improve Testcontainers and help their fellow developers!
+
+!!! note
+    It's early days for our use of sponsorship, so we expect to evolve this policy over time, possibly without notice. In the event of any ambiguity or dispute, the [Testcontainers org core maintainers](#organisation-core-maintainers) have the final say.
+
+    If you'd like to suggest an improvement to this policy, we'd be grateful for your input - please raise a pull request!
+
+## For Sponsors
+
+Sponsors will be able to create a number of 'bounties' per month, varying according to sponsorship tier.
+
+As a sponsor, the process for creating a bounty is as follows:
+
+* Raise an issue, or find an existing issue that describes the bug or feature.
+* Start a discussion with the [Testcontainers org core maintainers](#organisation-core-maintainers) to agree that the issue is suitable for a bounty, and how much the reward amount should be.
+* Once agreed, we will assign a label to the issue so that interested developers can find it.
+
+Sponsors can create up to 1 or 3 bounties (according to tier) _per calendar month_ - i.e. the counter resets on the 1st of each month. 
+If a sponsor does not use their full quota of bounty credits in a calendar month, they cannot be rolled over to the next month.
+
+Bounties will expire 90 days after creation - after this time, if they have not been resolved we will close them.
+
+## For Contributors
+
+As a contributor, the process for working on an issue with a bounty attached is:
+
+* Find an issue with a bounty attached to it and no assignee, clarify the requirements if necessary, and consider how you would approach working on it.
+* Start a discussion with the [Testcontainers org core maintainers](#organisation-core-maintainers) and the bounty owner. To avoid unpleasant surprises at review time, we'll try to confirm that we're happy with your proposed solution.
+* If we're happy with your proposed solution, we will assign the ticket to you.
+* Once work is complete, we will go through the PR process as usual and merge the work when finished.
+* To receive the bounty reward, [raise an invoice](https://opencollective.com/testcontainers/expenses/new) on Open Collective, following the expenses policy on that page.
+
+Note that a 20% cut of the bounty amount will normally be assigned to project maintainers for PR review work.
+We believe this reflects that PR review can often be a significant amount of work for some issues - and also gives maintainers an incentive to complete the review and unlock the bounty reward!
+Some pull requests are so well done that very little review is necessary. If that happens, the maintainers may choose not to take a cut of the bounty, and instead release the full amount to the contributor.
+
+## Organisation core maintainers
+
+The organisation core maintainers are:
+
+* Richard North (@rnorth)
+* Sergei Egorov (@bsideup)
+* Kevin Wittek (@kiview)
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 795a2bdb4e2..b8372e81ed8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -89,5 +89,6 @@ nav:
     - Contributing:
           - contributing.md
           - contributing_docs.md
+          - bounty.md
 extra:
     latest_version: 1.14.3

From 96de42be8fc635196c6fc55bb39c02125897e732 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 29 Jun 2020 21:38:28 +0100
Subject: [PATCH 0836/4969] Create FUNDING.yml

---
 .github/FUNDING.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000000..9889f256efc
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [testcontainers]

From 4ab556ce4527dd0574a377751e82f94832707f83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2020 21:45:07 +0100
Subject: [PATCH 0837/4969] Bump aws-java-sdk-s3 from 1.11.807 to 1.11.812 in
 /modules/localstack (#2948)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.807 to 1.11.812.
- [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.807...1.11.812)

Signed-off-by: dependabot[bot] <support@github.com>

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 a04c04a4751..ee726826b54 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.807'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.812'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.807'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.807'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From 0cc880eb6c4b93feea3ae50175625fd7062e5df3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2020 21:45:20 +0100
Subject: [PATCH 0838/4969] Bump aws-java-sdk-sqs from 1.11.807 to 1.11.812 in
 /modules/localstack (#2949)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.807 to 1.11.812.
- [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.807...1.11.812)

Signed-off-by: dependabot[bot] <support@github.com>

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 ee726826b54..04a18626bad 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.812'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.807'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.807'
+    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.41'
 }

From c48f7077415e0e87d27ffd2247c00d70492f2513 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2020 21:45:36 +0100
Subject: [PATCH 0839/4969] Bump mariadb-java-client from 2.6.0 to 2.6.1 in
 /modules/mariadb (#2950)

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.6.1.
- [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.0...2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 38862c7f03c..a4f2f951233 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.0'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.1'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1'

From 1ad7ffa3bffc71c1768816c8fb86dbbe72186f24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2020 21:46:00 +0100
Subject: [PATCH 0840/4969] Bump aws-java-sdk-dynamodb from 1.11.807 to
 1.11.812 in /modules/dynalite (#2953)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.807 to 1.11.812.
- [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.807...1.11.812)

Signed-off-by: dependabot[bot] <support@github.com>

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 7101f40552f..8045c273496 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.807'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.479'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.812'
+    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.812'
 }

From b0dbd3190e20a09ed3d0030d3cf23174190c82f1 Mon Sep 17 00:00:00 2001
From: Simon Schneider <10846939+raynigon@users.noreply.github.com>
Date: Mon, 29 Jun 2020 23:02:21 +0200
Subject: [PATCH 0841/4969] Convert Docs for Webdriver Containers (#2927)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/webdriver_containers.md          | 62 ++++++----------
 ...ChromeRecordingWebDriverContainerTest.java | 73 ++++++++++++++-----
 .../junit/ChromeWebDriverContainerTest.java   |  2 +
 .../junit/FirefoxWebDriverContainerTest.java  |  2 +
 .../LocalServerWebDriverContainerTest.java    |  4 +
 5 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index 70c06d9dbdd..40b27a5207f 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -22,70 +22,54 @@ every test.
 ## Example
 
 The following field in your JUnit UI test class will prepare a container running Chrome:
-```java
-@Rule
-public BrowserWebDriverContainer chrome =
-    new BrowserWebDriverContainer()
-            .withCapabilities(new ChromeOptions());
-```
+<!--codeinclude-->
+[Chrome](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java) inside_block:junitRule
+<!--/codeinclude-->
+
         
 Now, instead of instantiating an instance of WebDriver directly, use the following to obtain an instance inside your
 test methods:
-```java
-RemoteWebDriver driver = chrome.getWebDriver();
-```
+<!--codeinclude-->
+[RemoteWebDriver](../../modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java) inside_block:getWebDriver
+<!--/codeinclude-->
 
 You can then use this driver instance like a regular WebDriver.
 
 Note that, if you want to test a **web application running on the host machine** (the machine the JUnit tests are
 running on - which is quite likely), you'll need to replace any references to `localhost` with an IP address that the
 Docker container can reach. Use the `getTestHostIpAddress()` method, e.g.:
-```java
-driver.get("http://" + chrome.getTestHostIpAddress() + ":8080/");
-```
+<!--codeinclude-->
+[Open Web Page](../../modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java) inside_block:getPage
+<!--/codeinclude-->
+
 
 ## Options
 
 ### Other browsers
 
 At the moment, Chrome and Firefox are supported. To switch, simply change the first parameter to the rule constructor:
-```java
-new BrowserWebDriverContainer()
-        .withCapabilities(new ChromeOptions());
-```
-        
-or
-```java
-new BrowserWebDriverContainer()
-        .withCapabilities(new FirefoxOptions());
-```
+<!--codeinclude-->
+[Chrome](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java) inside_block:junitRule
+[Firefox](../../modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java) inside_block:junitRule
+<!--/codeinclude-->
 
 ### Recording videos
 
 By default, no videos will be recorded. However, you can instruct Testcontainers to capture videos for all tests or
 just for failing tests.
 
-To do this, simply add extra parameters to the rule constructor:
-```java
-new BrowserWebDriverContainer()
-        .withCapabilities(new ChromeOptions())
-        .withRecordingMode(VncRecordingMode.RECORD_ALL, new File("./target/"))
-```
+<!--codeinclude-->
+[Record all Tests](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordAll
+[Record failing Tests](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordFailing
+<!--/codeinclude-->
 
-or if you only want videos for test failures:
-```java
-new BrowserWebDriverContainer()
-        .withCapabilities(new ChromeOptions())
-        .withRecordingMode(VncRecordingMode.RECORD_FAILING, new File("./target/"))
-```
 Note that the seconds parameter to `withRecordingMode` should be a directory where recordings can be saved.
 
 If you would like to customise the file name of the recording, or provide a different directory at runtime based on the description of the test and/or its success or failure, you may provide a custom recording file factory as follows:
-```java
-new BrowserWebDriverContainer()
-        //...
-        .withRecordingFileFactory(new CustomRecordingFileFactory())
-```
+<!--codeinclude-->
+[CustomRecordingFileFactory](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:withRecordingFileFactory
+<!--/codeinclude-->
+
 
 Note the factory must implement `org.testcontainers.containers.RecordingFileFactory`.
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index 3872e3d8dd2..ead9a21ae4f 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -12,9 +12,12 @@
 import org.testcontainers.containers.DefaultRecordingFileFactory;
 import org.testcontainers.lifecycle.TestDescription;
 
+import java.io.File;
 import java.util.Optional;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
 import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
+import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_FAILING;
 
 @RunWith(Enclosed.class)
 public class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContainerTest {
@@ -26,10 +29,14 @@ public static class ChromeThatRecordsAllTests {
 
         @Test
         public void recordingTestThatShouldBeRecordedAndRetained() {
+            File target = vncRecordingDirectory.getRoot();
             try (
+                // recordAll {
+                // To do this, simply add extra parameters to the rule constructor:
                 BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
                     .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(RECORD_ALL, vncRecordingDirectory.getRoot())
+                    .withRecordingMode(RECORD_ALL, target)
+                    // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
             ) {
                 chrome.start();
@@ -48,7 +55,7 @@ public String getFilesystemFriendlyName() {
                 }, Optional.empty());
 
                 String[] files = vncRecordingDirectory.getRoot().list(new PatternFilenameFilter("PASSED-.*\\.flv"));
-                assertTrue("Recorded file not found", files.length == 1);
+                assertEquals("Recorded file not found", 1, files.length);
             }
         }
     }
@@ -56,28 +63,58 @@ public String getFilesystemFriendlyName() {
     public static class ChromeThatRecordsFailingTests {
 
         @Rule
-        public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
-                .withCapabilities(new ChromeOptions());
+        public TemporaryFolder vncRecordingDirectory = new TemporaryFolder();
 
         @Test
         public void recordingTestThatShouldBeRecordedButNotPersisted() {
-            doSimpleExplore(chrome);
+            try (
+                // withRecordingFileFactory {
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
+                    // }
+                    .withCapabilities(new ChromeOptions())
+                    // withRecordingFileFactory {
+                    .withRecordingFileFactory(new CustomRecordingFileFactory())
+                // }
+            ) {
+                chrome.start();
+
+                doSimpleExplore(chrome);
+            }
         }
 
         @Test
         public void recordingTestThatShouldBeRecordedAndRetained() {
-            doSimpleExplore(chrome);
-            chrome.afterTest(new TestDescription() {
-                @Override
-                public String getTestId() {
-                    return getFilesystemFriendlyName();
-                }
-
-                @Override
-                public String getFilesystemFriendlyName() {
-                    return "ChromeThatRecordsFailingTests-recordingTestThatShouldBeRecordedAndRetained";
-                }
-            }, Optional.of(new RuntimeException("Force writing of video file.")));
+            File target = vncRecordingDirectory.getRoot();
+            try (
+                // recordFailing {
+                // or if you only want videos for test failures:
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
+                    .withCapabilities(new ChromeOptions())
+                    .withRecordingMode(RECORD_FAILING, target)
+                    // }
+                    .withRecordingFileFactory(new DefaultRecordingFileFactory())
+            ) {
+                chrome.start();
+
+                doSimpleExplore(chrome);
+                chrome.afterTest(new TestDescription() {
+                    @Override
+                    public String getTestId() {
+                        return getFilesystemFriendlyName();
+                    }
+
+                    @Override
+                    public String getFilesystemFriendlyName() {
+                        return "ChromeThatRecordsFailingTests-recordingTestThatShouldBeRecordedAndRetained";
+                    }
+                }, Optional.of(new RuntimeException("Force writing of video file.")));
+
+                String[] files = vncRecordingDirectory.getRoot().list(new PatternFilenameFilter("FAILED-.*\\.flv"));
+                assertEquals("Recorded file not found", 1, files.length);
+            }
+
         }
+
+        private static class CustomRecordingFileFactory extends DefaultRecordingFileFactory { }
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
index 7914e1bd810..92ba4e2cd37 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
@@ -11,9 +11,11 @@
  */
 public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest {
 
+    // junitRule {
     @Rule
     public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
         .withCapabilities(new ChromeOptions());
+    // }
 
     @Before
     public void checkBrowserIsIndeedChrome() {
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
index 21b03164102..1f687aab762 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
@@ -11,9 +11,11 @@
  */
 public class FirefoxWebDriverContainerTest extends BaseWebDriverContainerTest {
 
+    // junitRule {
     @Rule
     public BrowserWebDriverContainer firefox = new BrowserWebDriverContainer()
             .withCapabilities(new FirefoxOptions());
+    // }
 
     @Before
     public void checkBrowserIsIndeedFirefox() {
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index 0cee0cf49e2..f7d626c15b5 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -49,11 +49,15 @@ public void setupLocalServer() throws Exception {
 
     @Test
     public void testConnection() {
+        // getWebDriver {
         RemoteWebDriver driver = chrome.getWebDriver();
+        // }
 
         // Construct a URL that the browser container can access
+        // getPage {
         String hostIpAddress = chrome.getTestHostIpAddress();
         driver.get("http://" + hostIpAddress + ":" + localPort);
+        // }
 
         String headingText = driver.findElement(By.cssSelector("h1")).getText().trim();
 

From f0da2f3365a20b8a7f7d62ebc0b55098e95e5665 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2020 22:03:08 +0100
Subject: [PATCH 0842/4969] Bump s3 from 2.13.41 to 2.13.46 in
 /modules/localstack (#2947)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 04a18626bad..44a7e3fb6a8 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.807'
     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.41'
+    testCompile 'software.amazon.awssdk:s3:2.13.46'
 }

From eecaa9a0461740d08e6393753cdd63e45b356088 Mon Sep 17 00:00:00 2001
From: JeanBaptisteWATENBERG <jeanbaptiste.watenberg@gmail.com>
Date: Mon, 29 Jun 2020 23:45:55 +0200
Subject: [PATCH 0843/4969] RabbitMQ: correct
 `shouldMountConfigurationFileSysctl` test so that it exercises the
 `withRabbitMQConfigSysctl` method (#2945)

---
 .../org/testcontainers/containers/RabbitMQContainerTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index d8e9c7658c0..4c2787bf5ab 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -156,7 +156,7 @@ public void shouldMountConfigurationFileSysctl()
     {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
 
-            container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
+            container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
 
             assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");

From d03768bdf6c5c39d4f0382a98f3defbd0e2144d1 Mon Sep 17 00:00:00 2001
From: Simon Schneider <10846939+raynigon@users.noreply.github.com>
Date: Mon, 29 Jun 2020 23:47:00 +0200
Subject: [PATCH 0844/4969] Convert Docs for Kafka Module #1158 (#2925)

---
 docs/modules/kafka.md                         | 36 ++++++++++---------
 .../containers/KafkaContainerTest.java        | 32 +++++++++++++++++
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index a96a0a0b43a..35ac37b6906 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -11,41 +11,45 @@ More precisely Testcontainers uses the official Docker images for [Confluent OSS
 ## Example
 
 The following field in your JUnit test class will prepare a container running Kafka:
-```java
-@Rule
-public KafkaContainer kafka = new KafkaContainer();
-```
+<!--codeinclude-->
+[JUnit Rule](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:junitRule
+<!--/codeinclude-->
         
 Now your tests or any other process running on your machine can get access to running Kafka broker by using the following bootstrap server location:
-```java
-kafka.getBootstrapServers()
-```
+
+<!--codeinclude-->
+[Bootstrap Servers](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:getBootstrapServers
+<!--/codeinclude-->
+
 
 ## Options
 
 ### Selecting Kafka version
 
 You can select a version of Confluent Platform by passing it to the container's constructor:
-```java
-new KafkaContainer("4.1.2")
-```
+<!--codeinclude-->
+[Version Constructor](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:constructorWithVersion
+<!--/codeinclude-->
+
+
 The correspondence between Confluent Platform versions and Kafka versions can be seen [in Confluent documentation](https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility)
         
 ### <a name="zookeeper"></a> Using external Zookeeper
 
 If for some reason you want to use an externally running Zookeeper, then just pass its location during construction:
-```java
-new KafkaContainer().withExternalZookeeper("localhost:2181")
-```
+<!--codeinclude-->
+[External Zookeeper](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withExternalZookeeper
+<!--/codeinclude-->
+
 
 ## Multi-container usage
 
 If your test needs to run some other Docker container which needs access to the Kafka, do the following:
 
 * Run your other container on the same network as Kafka container, e.g.:
-```java
-new GenericContainer("myImage").withNetwork(kafka.getNetwork())
-```
+<!--codeinclude-->
+[Network](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withKafkaNetwork
+<!--/codeinclude-->
 * Use `kafka.getNetworkAliases().get(0)+":9092"` as bootstrap server location. 
 Or just give your Kafka container a network alias of your liking.
 
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index c5d719295ed..25bc1b5022c 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -10,6 +10,7 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.Rule;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 
@@ -23,6 +24,11 @@
 
 public class KafkaContainerTest {
 
+    // junitRule {
+    @Rule
+    public KafkaContainer kafka = new KafkaContainer();
+    // }
+
     @Test
     public void testUsage() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer()) {
@@ -31,22 +37,48 @@ public void testUsage() throws Exception {
         }
     }
 
+
+    @Test
+    public void testUsageWithVersion() throws Exception {
+        try (
+            // constructorWithVersion {
+            KafkaContainer kafka = new KafkaContainer("4.1.2")
+            // }
+        ) {
+            kafka.start();
+            testKafkaFunctionality(
+              // getBootstrapServers {
+              kafka.getBootstrapServers()
+              // }
+            );
+        }
+    }
+
     @Test
     public void testExternalZookeeperWithExternalNetwork() throws Exception {
         try (
             Network network = Network.newNetwork();
 
+            // withExternalZookeeper {
             KafkaContainer kafka = new KafkaContainer()
                 .withNetwork(network)
                 .withExternalZookeeper("zookeeper:2181");
+            // }
 
             GenericContainer zookeeper = new GenericContainer("confluentinc/cp-zookeeper:4.0.0")
                 .withNetwork(network)
                 .withNetworkAliases("zookeeper")
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
+
+            // withKafkaNetwork {
+            GenericContainer application = new GenericContainer("alpine").withNetwork(kafka.getNetwork())
+            // }
+                .withNetworkAliases("dummy")
+                .withCommand("sleep 10000")
         ) {
             zookeeper.start();
             kafka.start();
+            application.start();
 
             testKafkaFunctionality(kafka.getBootstrapServers());
         }

From 6186598c9b518e71fcc55ff313a5ac1460ff3df9 Mon Sep 17 00:00:00 2001
From: Kirill Merkushev <lanwen@yandex.ru>
Date: Tue, 30 Jun 2020 16:49:03 +0200
Subject: [PATCH 0845/4969] Make it possible to enable functions worker in
 PulsarContainer (#2711)

* Method to enable functions worker in pulsar container

This change should simplify a bit pulsar functions development experience
Tried here: https://github.com/lanwen/pulsar-functions-example

Without waiter pulsar could return random 503, depending on how fast
was a call.

* treat functions worker method as a flag to enable in configure

real functions upload test

* upd pulsar to 2.5.1

* don't store jar

* expect error for functions without worker

* reduce the changeset

Co-authored-by: Sergei Egorov <segorov@vmware.com>
---
 modules/pulsar/build.gradle                   |  1 +
 .../containers/PulsarContainer.java           | 23 +++++++++++++-
 .../containers/PulsarContainerTest.java       | 30 +++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 371aa0c11d0..b0a76d673ad 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.5.1'
 }
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index c9532979057..936759efb1a 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 /**
@@ -14,6 +15,8 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     private static final String PULSAR_VERSION = "2.2.0";
 
+    private boolean functionsWorkerEnabled = false;
+
     public PulsarContainer() {
         this(PULSAR_VERSION);
     }
@@ -25,6 +28,25 @@ public PulsarContainer(String pulsarVersion) {
         waitingFor(Wait.forHttp(METRICS_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
     }
 
+    @Override
+    protected void configure() {
+        super.configure();
+
+        if (functionsWorkerEnabled) {
+            withCommand("/pulsar/bin/pulsar", "standalone");
+            waitingFor(
+                new WaitAllStrategy()
+                    .withStrategy(waitStrategy)
+                    .withStrategy(Wait.forLogMessage(".*Function worker service started.*", 1))
+            );
+        }
+    }
+
+    public PulsarContainer withFunctionsWorker() {
+        functionsWorkerEnabled = true;
+        return this;
+    }
+
     public String getPulsarBrokerUrl() {
         return String.format("pulsar://%s:%s", getHost(), getMappedPort(BROKER_PORT));
     }
@@ -33,4 +55,3 @@ public String getHttpServiceUrl() {
         return String.format("http://%s:%s", getHost(), getMappedPort(BROKER_HTTP_PORT));
     }
 }
-
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index cacf79729e0..e9d41516670 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.Producer;
@@ -10,6 +12,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class PulsarContainerTest {
 
@@ -23,6 +26,33 @@ public void testUsage() throws Exception {
         }
     }
 
+    @Test
+    public void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer("2.5.1")) {
+            pulsar.start();
+
+            PulsarAdmin pulsarAdmin = PulsarAdmin.builder()
+                .serviceHttpUrl(pulsar.getHttpServiceUrl())
+                .build();
+
+            assertThatThrownBy(() -> pulsarAdmin.functions().getFunctions("public", "default"))
+                .isInstanceOf(PulsarAdminException.class);
+        }
+    }
+
+    @Test
+    public void shouldWaitForFunctionsWorkerStarted() throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer("2.5.1").withFunctionsWorker()) {
+            pulsar.start();
+
+            PulsarAdmin pulsarAdmin = PulsarAdmin.builder()
+                .serviceHttpUrl(pulsar.getHttpServiceUrl())
+                .build();
+
+            assertThat(pulsarAdmin.functions().getFunctions("public", "default")).hasSize(0);
+        }
+    }
+
     protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception {
 
         try (

From 25a9aa51a11d3c050da8b6b532dac50ef8e227ba Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 30 Jun 2020 21:02:45 +0100
Subject: [PATCH 0846/4969] Add backers (#2958)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/index.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 8b3ffda05d2..d665557cff1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -119,6 +119,21 @@ testImplementation('org.testcontainers:mysql') //no version specified
 * [Transferwise](https://transferwise.com/) - Integration testing for different RDBMS, kafka and micro services
 * [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
 
+## Sponsors
+
+Testcontainers is on Github Sponsors! Please consider sponsoring us to sustain the project and help us improve it further.
+
+<iframe src="https://github.com/sponsors/testcontainers/button" title="Sponsor Testcontainers" height="35" width="107" style="border: 0;"></iframe>
+
+### Backers
+
+A huge thank you to our backers:
+
+* [Philip Riecks (@rieckpil)](https://github.com/rieckpil)
+* [Karl Heinz Marbaise (@khmarbaise)](https://github.com/khmarbaise)
+* [Sascha Frinken (@sascha-frinken)](https://github.com/sascha-frinken)
+
+
 ## License
 
 See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/LICENSE).

From 923472ff114d99b2ac0e199a86829879c24c8471 Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@163.com>
Date: Fri, 3 Jul 2020 23:36:34 +0800
Subject: [PATCH 0847/4969] Add Apache SkyWalking to the list of users (#2967)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index d665557cff1..6c8bf49f08f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -118,6 +118,7 @@ testImplementation('org.testcontainers:mysql') //no version specified
 * [Marquez](https://marquezproject.github.io/marquez) - PostgreSQL integration testing
 * [Transferwise](https://transferwise.com/) - Integration testing for different RDBMS, kafka and micro services
 * [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
+* [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
 
 ## Sponsors
 

From 7eb504a411337b4fb3c0772cf5938a2272f6bf3a Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Sun, 5 Jul 2020 17:04:36 +0200
Subject: [PATCH 0848/4969] Add Windows Server 2019 as unsupported to docs
 (#2963)

---
 docs/supported_docker_environment/windows.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/supported_docker_environment/windows.md b/docs/supported_docker_environment/windows.md
index 6afab5972f2..9a50a844b04 100644
--- a/docs/supported_docker_environment/windows.md
+++ b/docs/supported_docker_environment/windows.md
@@ -5,6 +5,7 @@
   * Docker version 17.06 is confirmed to work on Windows 10 with Hyper-V.
   * Testcontainers supports communication with Docker on Docker for Windows using named pipes.
   * WSL2 backend is supported starting with Windows 10 2004. (**Beta**)
+  * Docker on Windows Server 2019 is currently **not supported** (also note [this issue](https://github.com/testcontainers/testcontainers-java/issues/2960)).
 
 ## Limitations
 The following features are not available or do not work correctly so make sure you do not use them or use them with 

From 66e6a2fb171f9102d699dbd863d4401d5fbfcb6c Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <thomas.schmidt.0001@gmail.com>
Date: Sun, 5 Jul 2020 18:06:13 +0200
Subject: [PATCH 0849/4969] Adapt docs to non deprecated way of setting
 --memory and --memory-swap (#2511)

Co-authored-by: Thomas Schmidt <t.schmidt@austrian-standards.at>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../generic/src/test/java/generic/CmdModifierTest.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index 6d075c0bccc..172a821b178 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -18,10 +18,15 @@ public class CmdModifierTest {
     // }
 
     // memory {
+    private long memoryInBytes = 8 * 1024 * 1024;
+    private long memorySwapInBytes = 12 * 1024 * 1024;
+
     @Rule
     public GenericContainer memoryLimitedRedis = new GenericContainer<>("redis:3.0.2")
-            .withCreateContainerCmdModifier(cmd -> cmd.withMemory((long) 8 * 1024 * 1024))
-            .withCreateContainerCmdModifier(cmd -> cmd.withMemorySwap((long) 12 * 1024 * 1024));
+            .withCreateContainerCmdModifier(cmd -> cmd.getHostConfig()
+                .withMemory(memoryInBytes)
+                .withMemorySwap(memorySwapInBytes)
+            );
     // }
 
 

From 965fcf552dcc27e1fbffd01a50e9a33ea496120c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:33:29 +0100
Subject: [PATCH 0850/4969] Bump tomcat-jdbc from 9.0.36 to 9.0.37 in
 /modules/jdbc-test (#2969)

Bumps tomcat-jdbc from 9.0.36 to 9.0.37.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 e901869f04e..0c06ad083e0 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     }
 
     compile 'commons-dbutils:commons-dbutils:1.7'
-    compile 'org.apache.tomcat:tomcat-jdbc:9.0.36'
+    compile 'org.apache.tomcat:tomcat-jdbc:9.0.37'
     compile 'org.vibur:vibur-dbcp:25.0'
     compile 'mysql:mysql-connector-java:8.0.20'
 }

From f7c027f20779dbfd30eb8592994ae495097f263e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:33:37 +0100
Subject: [PATCH 0851/4969] Bump rest-assured from 4.3.0 to 4.3.1 in
 /modules/vault (#2970)

Bumps [rest-assured](https://github.com/jayway/rest-assured) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/jayway/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/jayway/rest-assured/compare/rest-assured-4.3.0...rest-assured-4.3.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 2b9f702f9d9..0d094905198 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -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.0'
+    testCompile 'io.rest-assured:rest-assured:4.3.1'
     testCompile 'org.assertj:assertj-core:3.16.1'
 
 }

From 8c689fa4e1f32dd0f8db7d79b2b6e2137975de9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:33:47 +0100
Subject: [PATCH 0852/4969] Bump tomcat-jdbc from 9.0.36 to 9.0.37 in
 /modules/jdbc (#2971)

Bumps tomcat-jdbc from 9.0.36 to 9.0.37.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 3b6aea15c59..cd10c7a98c3 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.36'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.37'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 }

From d41e04ca46a4adfeee9dc311acb31c18566dc821 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:33:57 +0100
Subject: [PATCH 0853/4969] Bump s3 from 2.13.46 to 2.13.50 in
 /modules/localstack (#2972)

Bumps s3 from 2.13.46 to 2.13.50.

Signed-off-by: dependabot[bot] <support@github.com>

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 44a7e3fb6a8..8945c082685 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.807'
     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.46'
+    testCompile 'software.amazon.awssdk:s3:2.13.50'
 }

From ddfa60a1932de7b23a73c8ff85a2fb6febbcfb3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:34:06 +0100
Subject: [PATCH 0854/4969] Bump aws-java-sdk-s3 from 1.11.812 to 1.11.816 in
 /modules/localstack (#2973)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.812 to 1.11.816.
- [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.816)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 8945c082685..6e9e44af320 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.812'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.807'
+    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-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.13.50'

From af4b1a312d6523e08f21bbcb69dcafd74597b733 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:34:25 +0100
Subject: [PATCH 0855/4969] Bump pulsar-client-admin from 2.5.1 to 2.6.0 in
 /modules/pulsar (#2975)

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index b0a76d673ad..a8f55696a65 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.1'
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.5.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.0'
 }

From c13aea3f02989f3c9294ec5ca23ed0a59a4b1eaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:34:34 +0100
Subject: [PATCH 0856/4969] Bump aws-java-sdk-dynamodb from 1.11.812 to
 1.11.816 in /modules/dynalite (#2976)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.812 to 1.11.816.
- [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.816)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 8045c273496..b3919a3eaf3 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.812'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.816'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.812'
 }

From 448d05fc7da5fd5d1bd7744201202d8da52abb4c Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 6 Jul 2020 20:01:16 +0100
Subject: [PATCH 0857/4969] Add breaking change and deprecation sections to
 release notes (#2978)

---
 .github/release-drafter.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index af82504717a..4da341055c2 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -5,10 +5,14 @@ template: |
 
     $CHANGES
 categories:
+  - title: ⚠️ Breaking API changes
+    label: type/breaking-api-change
   - title: 🚀 Features & Enhancements
     labels:
       - type/feature
       - type/enhancement
+  - title: ☠️ Deprecations
+    label: type/deprecation
   - title: 🐛 Bug Fixes
     label: type/bug
   - title: 📖 Documentation

From ddbaf94a21aabe2b2e98d16fd735e0917e88a7d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2020 08:53:47 +0100
Subject: [PATCH 0858/4969] Bump cucumber-java from 5.7.0 to 6.1.1 in /examples
 (#2919)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 5.7.0 to 6.1.1.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v5.7.0...v6.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

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 e4c44c0e063..d17837f1518 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:5.7.0'
+    testImplementation 'io.cucumber:cucumber-java:6.1.1'
     testImplementation 'io.cucumber:cucumber-junit:6.1.1'
     testImplementation 'org.testcontainers:selenium'
 }

From 1c97b978ac6ccfba0119986c22e4ac6d9ac955fa Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 9 Jul 2020 17:52:06 +0200
Subject: [PATCH 0859/4969] Un-shade docker-java-api (#2882)

This PR makes Testcontainers depend on `docker-java-api` instead of including it into our JAR unshaded.
Note that `docker-java-core` and `docker-java-transport-okhttp` remain shaded due to their transitive
dependencies like Guava or now-in-Kotlin OkHttp.

The transition requires a breaking change in the `DockerClientProviderStrategy` API and includes a rework.
The rework also includes an improvement that removes one Docker API call (`/_ping`)
and instead reuses the `/_info` one.
---
 build.gradle                                  |   5 -
 core/build.gradle                             |  38 ++++-
 .../testcontainers/JarFileShadingTest.java    |  11 +-
 .../testcontainers/PublicBinaryAPITest.java   |   7 +-
 .../testcontainers/DockerClientFactory.java   |  27 ++-
 .../containers/GenericContainer.java          |   8 +-
 .../output/FrameConsumerResultCallback.java   |   2 +-
 .../DockerClientProviderStrategy.java         | 154 ++++++++++--------
 .../DockerMachineClientProviderStrategy.java  |  87 +++++-----
 ...dSystemPropertyClientProviderStrategy.java |  44 ++---
 .../LogToStringContainerCallback.java         |  10 +-
 .../NpipeSocketClientProviderStrategy.java    |  57 ++-----
 ...oxiedUnixSocketClientProviderStrategy.java |  31 ----
 .../dockerclient/TransportConfig.java         |  18 ++
 .../UnixSocketClientProviderStrategy.java     |  53 ++----
 .../WindowsClientProviderStrategy.java        |  41 -----
 .../images/LoggedPullImageResultCallback.java |   2 +-
 ...eLimitedLoggedPullImageResultCallback.java |   2 +-
 .../images/builder/ImageFromDockerfile.java   |   2 +-
 .../resources/META-INF/services/README.md     |   1 -
 ....dockerclient.DockerClientProviderStrategy |   1 -
 ...ded.com.fasterxml.jackson.core.JsonFactory |   1 -
 ...ded.com.fasterxml.jackson.core.ObjectCodec |   1 -
 ...ockerjava.api.command.DockerCmdExecFactory |   1 -
 ...ers.shaded.javax.ws.rs.ext.RuntimeDelegate |   1 -
 ...fish.hk2.extension.ServiceLocatorGenerator |   1 -
 ...external.generator.ServiceLocatorGenerator |   1 -
 27 files changed, 268 insertions(+), 339 deletions(-)
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java
 create mode 100644 core/src/main/java/org/testcontainers/dockerclient/TransportConfig.java
 delete mode 100644 core/src/main/java/org/testcontainers/dockerclient/WindowsClientProviderStrategy.java
 delete mode 100644 core/src/main/resources/META-INF/services/README.md
 delete mode 100755 core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.JsonFactory
 delete mode 100755 core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.ObjectCodec
 delete mode 100644 core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.github.dockerjava.api.command.DockerCmdExecFactory
 delete mode 100644 core/src/main/resources/META-INF/services/org.testcontainers.shaded.javax.ws.rs.ext.RuntimeDelegate
 delete mode 100644 core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator
 delete mode 100644 core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.jvnet.hk2.external.generator.ServiceLocatorGenerator

diff --git a/build.gradle b/build.gradle
index 382ecdf161e..b7830992b07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,11 +122,6 @@ subprojects {
             for (pkg in packages) {
                 pkg = pkg.replaceAll('/', '.')
 
-                if (pkg.startsWith("com.github.dockerjava.")) {
-                    // Keep docker-java's package inside the final jar
-                    continue;
-                }
-
                 tasks.shadowJar.relocate(pkg, "org.testcontainers.shaded.${pkg}")
             }
         }
diff --git a/core/build.gradle b/core/build.gradle
index e1fb724597e..98452944bd0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -100,17 +100,33 @@ task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
         "org.testcontainers.containers.wait.WaitAllStrategy",
         "org.testcontainers.containers.wait.WaitStrategy",
         "org.testcontainers.dockerclient.AuditLoggingDockerClient",
+        "org.testcontainers.dockerclient.LogToStringContainerCallback",
+        "org.testcontainers.dockerclient.DockerMachineClientProviderStrategy",
+        "org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy",
+        "org.testcontainers.dockerclient.NpipeSocketClientProviderStrategy",
+        "org.testcontainers.dockerclient.ProxiedUnixSocketClientProviderStrategy",
+        "org.testcontainers.dockerclient.WindowsClientProviderStrategy",
+        "org.testcontainers.dockerclient.UnixSocketClientProviderStrategy",
         "org.testcontainers.dockerclient.auth.AuthDelegatingDockerClientConfig",
         "org.testcontainers.containers.GenericContainer\$AbstractWaitStrategy",
         "org.testcontainers.dockerclient.transport.okhttp.NamedPipeSocketFactory",
         "org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory",
         "org.testcontainers.dockerclient.transport.okhttp.UnixSocketFactory",
+        "org.testcontainers.containers.output.FrameConsumerResultCallback",
+        "org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback",
     ]
 
     methodExcludes = [
         "org.testcontainers.dockerclient.DockerClientConfigUtils#getDetectedDockerHostIp()",
         "org.testcontainers.dockerclient.DockerClientConfigUtils#getDockerHostIpAddress(com.github.dockerjava.core.DockerClientConfig)",
 
+        "org.testcontainers.dockerclient.DockerClientProviderStrategy#checkOSType()",
+        "org.testcontainers.dockerclient.DockerClientProviderStrategy#getClientForConfig(com.github.dockerjava.core.DockerClientConfig)",
+        "org.testcontainers.dockerclient.DockerClientProviderStrategy#ping(com.github.dockerjava.api.DockerClient, int)",
+        "org.testcontainers.dockerclient.DockerClientProviderStrategy#test()",
+
+        "org.testcontainers.dockerclient.UnixSocketClientProviderStrategy#tryConfiguration(java.lang.String)",
+
         "org.testcontainers.utility.ResourceReaper#start(java.lang.String, com.github.dockerjava.api.DockerClient, boolean)",
 
         "org.testcontainers.containers.Container#fetchDockerDaemonInfo()",
@@ -126,6 +142,10 @@ task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
         "org.testcontainers.containers.GenericContainer#containerId",
         "org.testcontainers.containers.GenericContainer#containerName",
         "org.testcontainers.containers.GenericContainer#dockerDaemonInfo",
+
+        "org.testcontainers.dockerclient.DockerClientProviderStrategy#LOGGER",
+        "org.testcontainers.dockerclient.DockerClientProviderStrategy#client",
+        "org.testcontainers.dockerclient.DockerClientProviderStrategy#config",
     ]
 
     onlyBinaryIncompatibleModified = true
@@ -150,25 +170,27 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    compile ('org.rnorth.visible-assertions:visible-assertions:2.1.2') {
-        // Excluded in favor of jna-platform below
-        exclude(group: "net.java.dev.jna", module: "jna")
-    }
+    compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compile "net.java.dev.jna:jna-platform:5.5.0"
+    compile "com.github.docker-java:docker-java-api:3.2.5"
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.5') {
-        exclude(group: 'net.java.dev.jna')
+    shaded ('com.github.docker-java:docker-java-core:3.2.5') {
+        exclude(group: 'com.github.docker-java', module: 'docker-java-api')
+        exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
+        exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'org.slf4j')
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-zerodep:3.2.5') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.5') {
+        exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
+    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.5'
+
     shaded "org.yaml:snakeyaml:1.25"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index 587ab6277f6..4cf7b3a9e9f 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -15,21 +15,12 @@ public class JarFileShadingTest extends AbstractJarFileTest {
     public void testPackages() throws Exception {
         assertThatFileList(root).containsOnly(
                 "org",
-                "META-INF",
-                "com"
+                "META-INF"
         );
 
         assertThatFileList(root.resolve("org")).containsOnly(
                 "testcontainers"
         );
-
-        assertThatFileList(root.resolve("com")).containsOnly(
-                "github"
-        );
-
-        assertThatFileList(root.resolve("com").resolve("github")).containsOnly(
-                "dockerjava"
-        );
     }
 
     @Test
diff --git a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
index 93d1a759096..6a5a766d24e 100644
--- a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
@@ -88,10 +88,11 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IO
 
     @Before
     public void setUp() {
-        Assume.assumeFalse(classNode.name.startsWith("com.github.dockerjava."));
         switch (classNode.name) {
-            // TODO should go to docker-java project
-            case "org/testcontainers/dockerclient/auth/AuthDelegatingDockerClientConfig":
+            // Necessary evil
+            case "org/testcontainers/dockerclient/UnixSocketClientProviderStrategy":
+            case "org/testcontainers/dockerclient/DockerClientProviderStrategy":
+            case "org/testcontainers/dockerclient/WindowsClientProviderStrategy":
                 Assume.assumeTrue(false);
         }
     }
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 95e0c9838ba..baebe164c48 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -1,16 +1,17 @@
 package org.testcontainers;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.Version;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.core.command.ExecStartResultCallback;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import lombok.Getter;
@@ -26,6 +27,7 @@
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -148,7 +150,7 @@ public DockerClient client() {
 
         String hostIpAddress = strategy.getDockerHostIpAddress();
         log.info("Docker host IP address is {}", hostIpAddress);
-        final DockerClient client = new DelegatingDockerClient(strategy.getClient()) {
+        final DockerClient client = new DelegatingDockerClient(strategy.getDockerClient()) {
             @Override
             public void close() {
                 throw new IllegalStateException("You should never close the global DockerClient!");
@@ -228,7 +230,24 @@ private void checkDiskSpace(DockerClient dockerClient, String id) {
         try {
             dockerClient
                     .execStartCmd(dockerClient.execCreateCmd(id).withAttachStdout(true).withCmd("df", "-P").exec().getId())
-                    .exec(new ExecStartResultCallback(outputStream, null))
+                    .exec(new ResultCallback.Adapter<Frame>() {
+                        @Override
+                        public void onNext(Frame frame) {
+                            if (frame == null) {
+                                return;
+                            }
+                            switch (frame.getStreamType()) {
+                                case RAW:
+                                case STDOUT:
+                                    try {
+                                        outputStream.write(frame.getPayload());
+                                        outputStream.flush();
+                                    } catch (IOException e) {
+                                        onError(e);
+                                    }
+                            }
+                        }
+                    })
                     .awaitCompletion();
         } catch (Exception e) {
             log.debug("Can't exec disk checking command", e);
@@ -295,7 +314,7 @@ public String dockerHostIpAddress() {
 
     public <T> T runInsideDocker(Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
         // We can't use client() here because it might create an infinite loop
-        return runInsideDocker(getOrInitializeStrategy().getClient(), createContainerCmdConsumer, block);
+        return runInsideDocker(getOrInitializeStrategy().getDockerClient(), createContainerCmdConsumer, block);
     }
 
     private <T> T runInsideDocker(DockerClient client, Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 072129de60c..417826e83b5 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -17,6 +17,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
@@ -514,12 +515,15 @@ void checksumFile(File file, Checksum checksum) {
     @UnstableAPI
     @SneakyThrows(JsonProcessingException.class)
     final String hash(CreateContainerCmd createCommand) {
-        // TODO add Testcontainers' version to the hash
-        byte[] commandJson = new ObjectMapper()
+        DefaultDockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
+
+        byte[] commandJson = dockerClientConfig.getObjectMapper()
+            .copy()
             .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
             .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
             .writeValueAsBytes(createCommand);
 
+        // TODO add Testcontainers' version to the hash
         return Hashing.sha1().hashBytes(commandJson).toString();
     }
 
diff --git a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
index 6894b9ec4b8..8c7480320a8 100644
--- a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
+++ b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
@@ -1,9 +1,9 @@
 package org.testcontainers.containers.output;
 
 
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 9573613c613..3f288d015d0 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -1,14 +1,17 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.okhttp.OkDockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;
@@ -16,8 +19,6 @@
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.URI;
@@ -32,27 +33,21 @@
 /**
  * Mechanism to find a viable Docker client configuration according to the host system environment.
  */
+@Slf4j
 public abstract class DockerClientProviderStrategy {
 
-    protected DockerClient client;
-    protected DockerClientConfig config;
+    @Getter(lazy = true)
+    private final DockerClient dockerClient = getClientForConfig(getTransportConfig());
 
     private String dockerHostIpAddress;
 
-    private static final RateLimiter PING_RATE_LIMITER = RateLimiterBuilder.newBuilder()
-            .withRate(2, TimeUnit.SECONDS)
+    private final RateLimiter PING_RATE_LIMITER = RateLimiterBuilder.newBuilder()
+            .withRate(10, TimeUnit.SECONDS)
             .withConstantThroughput()
             .build();
 
     private static final AtomicBoolean FAIL_FAST_ALWAYS = new AtomicBoolean(false);
 
-    protected static final Logger LOGGER = LoggerFactory.getLogger(DockerClientProviderStrategy.class);
-
-    /**
-     * @throws InvalidConfigurationException if this strategy fails
-     */
-    public abstract void test() throws InvalidConfigurationException;
-
     /**
      * @return a short textual description of the strategy
      */
@@ -73,6 +68,35 @@ protected int getPriority() {
         return 0;
     }
 
+    /**
+     * @throws InvalidConfigurationException if this strategy fails
+     */
+    public abstract TransportConfig getTransportConfig() throws InvalidConfigurationException;
+
+    /**
+     * @return a usable, tested, Docker client configuration for the host system environment
+     *
+     * @deprecated use {@link #getDockerClient()}
+     */
+    @Deprecated
+    public DockerClient getClient() {
+        DockerClient dockerClient = getDockerClient();
+        try {
+            Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS, () -> {
+                return PING_RATE_LIMITER.getWhenReady(() -> {
+                    log.debug("Pinging docker daemon...");
+                    dockerClient.pingCmd().exec();
+                    log.debug("Pinged");
+                    return true;
+                });
+            });
+        } catch (TimeoutException e) {
+            IOUtils.closeQuietly(dockerClient);
+            throw e;
+        }
+        return dockerClient;
+    }
+
     /**
      * Determine the right DockerClientConfig to use for building clients by trial-and-error.
      *
@@ -96,19 +120,19 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                                         Class<? extends DockerClientProviderStrategy> strategyClass = (Class) Thread.currentThread().getContextClassLoader().loadClass(it);
                                         return Stream.of(strategyClass.newInstance());
                                     } catch (ClassNotFoundException e) {
-                                        LOGGER.warn("Can't instantiate a strategy from {} (ClassNotFoundException). " +
+                                        log.warn("Can't instantiate a strategy from {} (ClassNotFoundException). " +
                                                 "This probably means that cached configuration refers to a client provider " +
                                                 "class that is not available in this version of Testcontainers. Other " +
                                                 "strategies will be tried instead.", it);
                                         return Stream.empty();
                                     } catch (InstantiationException | IllegalAccessException e) {
-                                        LOGGER.warn("Can't instantiate a strategy from {}", it, e);
+                                        log.warn("Can't instantiate a strategy from {}", it, e);
                                         return Stream.empty();
                                     }
                                 })
                                 // Ignore persisted strategy if it's not persistable anymore
                                 .filter(DockerClientProviderStrategy::isPersistable)
-                                .peek(strategy -> LOGGER.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName())),
+                                .peek(strategy -> log.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName())),
                         strategies
                                 .stream()
                                 .filter(DockerClientProviderStrategy::isApplicable)
@@ -116,16 +140,35 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                 )
                 .flatMap(strategy -> {
                     try {
-                        strategy.test();
-                        LOGGER.info("Found Docker environment with {}", strategy.getDescription());
-                        LOGGER.debug(
+                        DockerClient dockerClient = strategy.getDockerClient();
+
+                        Info info;
+                        try {
+                            info = Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS, () -> {
+                                return strategy.PING_RATE_LIMITER.getWhenReady(() -> {
+                                    log.debug("Pinging docker daemon...");
+                                    return dockerClient.infoCmd().exec();
+                                });
+                            });
+                        } catch (TimeoutException e) {
+                            IOUtils.closeQuietly(dockerClient);
+                            throw e;
+                        }
+                        log.info("Found Docker environment with {}", strategy.getDescription());
+                        log.debug(
                             "Transport type: '{}', Docker host: '{}'",
                             TestcontainersConfiguration.getInstance().getTransportType(),
-                            strategy.config != null
-                                ? strategy.config.getDockerHost()
-                                : "<unknown>"
+                            strategy.getTransportConfig().getDockerHost()
                         );
-                        strategy.checkOSType();
+
+                        log.debug("Checking Docker OS type for {}", strategy.getDescription());
+                        String osType = info.getOsType();
+                        if (StringUtils.isBlank(osType)) {
+                            log.warn("Could not determine Docker OS type");
+                        } else if (!osType.equals("linux")) {
+                            log.warn("{} is currently not supported", osType);
+                            throw new InvalidConfigurationException(osType + " containers are currently not supported");
+                        }
 
                         if (strategy.isPersistable()) {
                             TestcontainersConfiguration.getInstance().updateGlobalConfig("docker.client.strategy", strategy.getClass().getName());
@@ -155,73 +198,57 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                         }
                         configurationFailures.add(failureDescription);
 
-                        LOGGER.debug(failureDescription);
+                        log.debug(failureDescription);
                         return Stream.empty();
                     }
                 })
                 .findAny()
                 .orElseThrow(() -> {
-                    LOGGER.error("Could not find a valid Docker environment. Please check configuration. Attempted configurations were:");
+                    log.error("Could not find a valid Docker environment. Please check configuration. Attempted configurations were:");
                     for (String failureMessage : configurationFailures) {
-                        LOGGER.error("    " + failureMessage);
+                        log.error("    " + failureMessage);
                     }
-                    LOGGER.error("As no valid configuration was found, execution cannot continue");
+                    log.error("As no valid configuration was found, execution cannot continue");
 
                     FAIL_FAST_ALWAYS.set(true);
                     return new IllegalStateException("Could not find a valid Docker environment. Please see logs and check configuration");
                 });
     }
 
-    /**
-     * @return a usable, tested, Docker client configuration for the host system environment
-     */
-    public DockerClient getClient() {
-        return new AuditLoggingDockerClient(client);
-    }
-
-    protected DockerClient getClientForConfig(DockerClientConfig config) {
-        config = new AuthDelegatingDockerClientConfig(config);
+    public static DockerClient getClientForConfig(TransportConfig transportConfig) {
         final DockerHttpClient dockerHttpClient;
 
         String transportType = TestcontainersConfiguration.getInstance().getTransportType();
         switch (transportType) {
             case "okhttp":
                 dockerHttpClient = new OkDockerHttpClient.Builder()
-                    .dockerHost(config.getDockerHost())
-                    .sslConfig(config.getSSLConfig())
+                    .dockerHost(transportConfig.getDockerHost())
+                    .sslConfig(transportConfig.getSslConfig())
                     .build();
                 break;
             case "httpclient5":
                 dockerHttpClient = new ZerodepDockerHttpClient.Builder()
-                    .dockerHost(config.getDockerHost())
-                    .sslConfig(config.getSSLConfig())
+                    .dockerHost(transportConfig.getDockerHost())
+                    .sslConfig(transportConfig.getSslConfig())
                     .build();
                 break;
             default:
                 throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
         }
 
-        return DockerClientImpl.getInstance(config, dockerHttpClient);
-    }
-
-    protected void ping(DockerClient client, int timeoutInSeconds) {
-        try {
-            Unreliables.retryUntilSuccess(timeoutInSeconds, TimeUnit.SECONDS, () -> {
-                return PING_RATE_LIMITER.getWhenReady(() -> {
-                    LOGGER.debug("Pinging docker daemon...");
-                    client.pingCmd().exec();
-                    return true;
-                });
-            });
-        } catch (TimeoutException e) {
-            IOUtils.closeQuietly(client);
-            throw e;
-        }
+        return DockerClientImpl.getInstance(
+            new AuthDelegatingDockerClientConfig(
+                DefaultDockerClientConfig.createDefaultConfigBuilder()
+                    .withDockerHost(transportConfig.getDockerHost().toString())
+                    .build()
+            ),
+            dockerHttpClient
+        );
     }
 
     public synchronized String getDockerHostIpAddress() {
         if (dockerHostIpAddress == null) {
-            dockerHostIpAddress = resolveDockerHostIpAddress(client, config.getDockerHost());
+            dockerHostIpAddress = resolveDockerHostIpAddress(getDockerClient(), getTransportConfig().getDockerHost());
         }
         return dockerHostIpAddress;
     }
@@ -254,15 +281,4 @@ static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost) {
                 return null;
         }
     }
-
-    protected void checkOSType() {
-        LOGGER.debug("Checking Docker OS type for {}", this.getDescription());
-        String osType = client.infoCmd().exec().getOsType();
-        if (StringUtils.isBlank(osType)) {
-            LOGGER.warn("Could not determine Docker OS type");
-        } else if (!osType.equals("linux")) {
-            LOGGER.warn("{} is currently not supported", osType);
-            throw new InvalidConfigurationException(osType + " containers are currently not supported");
-        }
-    }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
index fac092044c7..2b0454c1ee6 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
@@ -1,10 +1,12 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.LocalDirectorySSLConfig;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.utility.CommandLine;
 import org.testcontainers.utility.DockerMachineClient;
 
+import java.net.URI;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Optional;
@@ -13,15 +15,56 @@
 
 /**
  * Use Docker machine (if available on the PATH) to locate a Docker environment.
+ *
+ * @deprecated this class is used by the SPI and should not be used directly
  */
 @Slf4j
-public class DockerMachineClientProviderStrategy extends DockerClientProviderStrategy {
-    private static final String PING_TIMEOUT_DEFAULT = "30";
-    private static final String PING_TIMEOUT_PROPERTY_NAME = "testcontainers.dockermachineprovider.timeout";
+@Deprecated
+public final class DockerMachineClientProviderStrategy extends DockerClientProviderStrategy {
+
+    @Getter(lazy = true)
+    private final TransportConfig transportConfig = resolveTransportConfig();
+
+    private TransportConfig resolveTransportConfig() throws InvalidConfigurationException {
+        boolean installed = DockerMachineClient.instance().isInstalled();
+        checkArgument(installed, "docker-machine executable was not found on PATH (" + Arrays.toString(CommandLine.getSystemPath()) + ")");
+
+        Optional<String> machineNameOptional = DockerMachineClient.instance().getDefaultMachine();
+        checkArgument(machineNameOptional.isPresent(), "docker-machine is installed but no default machine could be found");
+        String machineName = machineNameOptional.get();
+
+        log.info("Found docker-machine, and will use machine named {}", machineName);
+
+        DockerMachineClient.instance().ensureMachineRunning(machineName);
+
+        String dockerDaemonIpAddress = DockerMachineClient.instance().getDockerDaemonIpAddress(machineName);
+
+        log.info("Docker daemon IP address for docker machine {} is {}", machineName, dockerDaemonIpAddress);
+
+        return TransportConfig.builder()
+            .dockerHost(URI.create("tcp://" + dockerDaemonIpAddress + ":2376"))
+            .sslConfig(
+                new LocalDirectorySSLConfig(
+                    Paths.get(System.getProperty("user.home") + "/.docker/machine/certs/").toString()
+                )
+            )
+            .build();
+    }
 
     @Override
     protected boolean isApplicable() {
-        return DockerMachineClient.instance().isInstalled();
+        boolean installed = DockerMachineClient.instance().isInstalled();
+        if (!installed) {
+            log.info("docker-machine executable was not found on PATH ({})", Arrays.toString(CommandLine.getSystemPath()));
+            return false;
+        }
+
+        Optional<String> machineNameOptional = DockerMachineClient.instance().getDefaultMachine();
+        if (!machineNameOptional.isPresent()) {
+            log.info("docker-machine is installed but no default machine could be found");
+        }
+
+        return true;
     }
 
     @Override
@@ -34,40 +77,6 @@ protected int getPriority() {
         return EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 100;
     }
 
-    @Override
-    public void test() throws InvalidConfigurationException {
-
-        try {
-            boolean installed = DockerMachineClient.instance().isInstalled();
-            checkArgument(installed, "docker-machine executable was not found on PATH (" + Arrays.toString(CommandLine.getSystemPath()) + ")");
-
-            Optional<String> machineNameOptional = DockerMachineClient.instance().getDefaultMachine();
-            checkArgument(machineNameOptional.isPresent(), "docker-machine is installed but no default machine could be found");
-            String machineName = machineNameOptional.get();
-
-            log.info("Found docker-machine, and will use machine named {}", machineName);
-
-            DockerMachineClient.instance().ensureMachineRunning(machineName);
-
-            String dockerDaemonIpAddress = DockerMachineClient.instance().getDockerDaemonIpAddress(machineName);
-
-            log.info("Docker daemon IP address for docker machine {} is {}", machineName, dockerDaemonIpAddress);
-
-            config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                    .withDockerHost("tcp://" + dockerDaemonIpAddress + ":2376")
-                    .withDockerTlsVerify(true)
-                    .withDockerCertPath(Paths.get(System.getProperty("user.home") + "/.docker/machine/certs/").toString())
-                    .build();
-            client = getClientForConfig(config);
-        } catch (Exception e) {
-            throw new InvalidConfigurationException(e.getMessage());
-        }
-
-        // If the docker-machine VM has started, the docker daemon may still not be ready. Retry pinging until it works.
-        final int timeout = Integer.parseInt(System.getProperty(PING_TIMEOUT_PROPERTY_NAME, PING_TIMEOUT_DEFAULT));
-        ping(client, timeout);
-    }
-
     @Override
     public String getDescription() {
         return "docker-machine";
diff --git a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
index 4b02eded72b..c95c9242a07 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
@@ -1,29 +1,28 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.core.DefaultDockerClientConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.SystemUtils;
+import com.github.dockerjava.core.DockerClientConfig;
 
 /**
  * Use environment variables and system properties (as supported by the underlying DockerClient DefaultConfigBuilder)
  * to try and locate a docker environment.
+ *
+ * @deprecated this class is used by the SPI and should not be used directly
  */
-@Slf4j
-public class EnvironmentAndSystemPropertyClientProviderStrategy extends DockerClientProviderStrategy {
+@Deprecated
+public final class EnvironmentAndSystemPropertyClientProviderStrategy extends DockerClientProviderStrategy {
 
     public static final int PRIORITY = 100;
 
-    private static final String PING_TIMEOUT_DEFAULT = "10";
-    private static final String PING_TIMEOUT_PROPERTY_NAME = "testcontainers.environmentprovider.timeout";
-
-    public EnvironmentAndSystemPropertyClientProviderStrategy() {
-        // Try using environment variables
-        config = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
-    }
+    // Try using environment variables
+    private final DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
 
     @Override
-    protected boolean isApplicable() {
-        return "tcp".equalsIgnoreCase(config.getDockerHost().getScheme()) || SystemUtils.IS_OS_LINUX;
+    public TransportConfig getTransportConfig() {
+        return TransportConfig.builder()
+            .dockerHost(dockerClientConfig.getDockerHost())
+            .sslConfig(dockerClientConfig.getSSLConfig())
+            .build();
     }
 
     @Override
@@ -31,25 +30,8 @@ protected int getPriority() {
         return PRIORITY;
     }
 
-    @Override
-    public void test() throws InvalidConfigurationException {
-
-        try {
-            client = getClientForConfig(config);
-
-            final int timeout = Integer.parseInt(System.getProperty(PING_TIMEOUT_PROPERTY_NAME, PING_TIMEOUT_DEFAULT));
-            ping(client, timeout);
-        } catch (Exception | UnsatisfiedLinkError e) {
-            log.error("ping failed with configuration {} due to {}", getDescription(), e.toString(), e);
-            throw new InvalidConfigurationException("ping failed");
-        }
-
-        log.info("Found docker client settings from environment");
-    }
-
     @Override
     public String getDescription() {
-        return "Environment variables, system properties and defaults. Resolved dockerHost=" +
-            (config != null ? config.getDockerHost() : "");
+        return "Environment variables, system properties and defaults. Resolved dockerHost=" + dockerClientConfig.getDockerHost();
     }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java b/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java
index e0ffce7c3a1..d376b685a91 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java
@@ -1,15 +1,19 @@
 package org.testcontainers.dockerclient;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.command.LogContainerResultCallback;
 
-public class LogToStringContainerCallback extends LogContainerResultCallback {
+/**
+ *
+ * @deprecated use {@link ResultCallback.Adapter}
+ */
+@Deprecated
+public class LogToStringContainerCallback extends ResultCallback.Adapter<Frame> {
     private final StringBuffer log = new StringBuffer();
 
     @Override
     public void onNext(Frame frame) {
         log.append(new String(frame.getPayload()));
-        super.onNext(frame);
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
index 329bde36433..fc3c65fd3dd 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
@@ -1,53 +1,31 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.Delegate;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.SystemUtils;
-import org.jetbrains.annotations.NotNull;
 
-@Slf4j
-public class NpipeSocketClientProviderStrategy extends DockerClientProviderStrategy {
+import java.net.URI;
+
+/**
+ *
+ * @deprecated this class is used by the SPI and should not be used directly
+ */
+@Deprecated
+public final class NpipeSocketClientProviderStrategy extends DockerClientProviderStrategy {
 
     protected static final String DOCKER_SOCK_PATH = "//./pipe/docker_engine";
     private static final String SOCKET_LOCATION = "npipe://" + DOCKER_SOCK_PATH;
 
-    private static final String PING_TIMEOUT_DEFAULT = "10";
-    private static final String PING_TIMEOUT_PROPERTY_NAME = "testcontainers.npipesocketprovider.timeout";
-
     public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 20;
 
     @Override
-    protected boolean isApplicable() {
-        return SystemUtils.IS_OS_WINDOWS;
+    public TransportConfig getTransportConfig() {
+        return TransportConfig.builder()
+            .dockerHost(URI.create(SOCKET_LOCATION))
+            .build();
     }
 
     @Override
-    public void test() throws InvalidConfigurationException {
-        try {
-            config = tryConfiguration();
-            log.info("Accessing docker with {}", getDescription());
-        } catch (Exception | UnsatisfiedLinkError e) {
-            throw new InvalidConfigurationException("ping failed", e);
-        }
-    }
-
-    @NotNull
-    private DockerClientConfig tryConfiguration() {
-        config = new DelegatingDockerClientConfig(
-            DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost(SOCKET_LOCATION)
-                .withDockerTlsVerify(false)
-                .build()
-        );
-        client = getClientForConfig(config);
-
-        final int timeout = Integer.parseInt(System.getProperty(PING_TIMEOUT_PROPERTY_NAME, PING_TIMEOUT_DEFAULT));
-        ping(client, timeout);
-
-        return config;
+    protected boolean isApplicable() {
+        return SystemUtils.IS_OS_WINDOWS;
     }
 
     @Override
@@ -59,11 +37,4 @@ public String getDescription() {
     protected int getPriority() {
         return PRIORITY;
     }
-
-    @RequiredArgsConstructor
-    private static class DelegatingDockerClientConfig implements DockerClientConfig {
-
-        @Delegate
-        final DockerClientConfig dockerClientConfig;
-    }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java
deleted file mode 100644
index b1a21da724c..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/ProxiedUnixSocketClientProviderStrategy.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.testcontainers.dockerclient;
-
-/**
- * @deprecated no longer needed since `docker-java` supports all transport modes now
- */
-@Deprecated
-public class ProxiedUnixSocketClientProviderStrategy extends UnixSocketClientProviderStrategy {
-
-    public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 100;
-
-    @Override
-    protected boolean isApplicable() {
-        return false;
-    }
-
-    @Override
-    protected int getPriority() {
-        return PRIORITY;
-    }
-
-    @Override
-    public void test() throws InvalidConfigurationException {
-        throw new InvalidConfigurationException("Deprecated");
-    }
-
-    @Override
-    public String getDescription() {
-        return "[Deprecated] local Unix socket (via TCP proxy)";
-    }
-
-}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/TransportConfig.java b/core/src/main/java/org/testcontainers/dockerclient/TransportConfig.java
new file mode 100644
index 00000000000..cbd1278b179
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/dockerclient/TransportConfig.java
@@ -0,0 +1,18 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.transport.SSLConfig;
+import lombok.Builder;
+import lombok.Value;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+
+@Builder
+@Value
+public class TransportConfig {
+
+    URI dockerHost;
+
+    @Nullable
+    SSLConfig sslConfig;
+}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
index ea192f9b557..fd4ef4f9e6e 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
@@ -1,48 +1,27 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.SystemUtils;
-import org.jetbrains.annotations.NotNull;
-import org.testcontainers.utility.ComparableVersion;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-@Slf4j
-public class UnixSocketClientProviderStrategy extends DockerClientProviderStrategy {
+/**
+ *
+ * @deprecated this class is used by the SPI and should not be used directly
+ */
+@Deprecated
+public final class UnixSocketClientProviderStrategy extends DockerClientProviderStrategy {
     protected static final String DOCKER_SOCK_PATH = "/var/run/docker.sock";
     private static final String SOCKET_LOCATION = "unix://" + DOCKER_SOCK_PATH;
     private static final int SOCKET_FILE_MODE_MASK = 0xc000;
-    private static final String PING_TIMEOUT_DEFAULT = "10";
-    private static final String PING_TIMEOUT_PROPERTY_NAME = "testcontainers.unixsocketprovider.timeout";
 
     public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 20;
 
     @Override
-    protected boolean isApplicable() {
-        final boolean nettyDoesSupportMacUnixSockets = SystemUtils.IS_OS_MAC_OSX &&
-                ComparableVersion.OS_VERSION.isGreaterThanOrEqualTo("10.12");
-
-        return SystemUtils.IS_OS_LINUX || nettyDoesSupportMacUnixSockets;
-    }
-
-    @Override
-    public void test() throws InvalidConfigurationException {
-        try {
-            config = tryConfiguration(SOCKET_LOCATION);
-            log.info("Accessing docker with local Unix socket");
-        } catch (Exception | UnsatisfiedLinkError e) {
-            throw new InvalidConfigurationException("ping failed", e);
-        }
-    }
-
-    @NotNull
-    protected DockerClientConfig tryConfiguration(String dockerHost) {
-
+    public TransportConfig getTransportConfig() throws InvalidConfigurationException {
         Path dockerSocketFile = Paths.get(DOCKER_SOCK_PATH);
         Integer mode;
         try {
@@ -55,16 +34,14 @@ protected DockerClientConfig tryConfiguration(String dockerHost) {
             throw new InvalidConfigurationException("Found docker unix domain socket but file mode was not as expected (expected: srwxr-xr-x). This problem is possibly due to occurrence of this issue in the past: https://github.com/docker/docker/issues/13121");
         }
 
-        config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost(dockerHost)
-                .withDockerTlsVerify(false)
-                .build();
-        client = getClientForConfig(config);
-
-        final int timeout = Integer.parseInt(System.getProperty(PING_TIMEOUT_PROPERTY_NAME, PING_TIMEOUT_DEFAULT));
-        ping(client, timeout);
+        return TransportConfig.builder()
+            .dockerHost(URI.create(SOCKET_LOCATION))
+            .build();
+    }
 
-        return config;
+    @Override
+    protected boolean isApplicable() {
+        return SystemUtils.IS_OS_LINUX;
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/dockerclient/WindowsClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/WindowsClientProviderStrategy.java
deleted file mode 100644
index f53ac10d044..00000000000
--- a/core/src/main/java/org/testcontainers/dockerclient/WindowsClientProviderStrategy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.testcontainers.dockerclient;
-
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.apache.commons.lang.SystemUtils;
-import org.jetbrains.annotations.NotNull;
-
-public class WindowsClientProviderStrategy extends DockerClientProviderStrategy {
-
-    private static final int PING_TIMEOUT_DEFAULT = 5;
-    private static final String PING_TIMEOUT_PROPERTY_NAME = "testcontainers.windowsprovider.timeout";
-
-    @Override
-    protected boolean isApplicable() {
-        return SystemUtils.IS_OS_WINDOWS;
-    }
-
-    @Override
-    public void test() throws InvalidConfigurationException {
-        config = tryConfiguration("tcp://localhost:2375");
-    }
-
-    @Override
-    public String getDescription() {
-        return "Docker for Windows (via TCP port 2375)";
-    }
-
-    @NotNull
-    protected DockerClientConfig tryConfiguration(String dockerHost) {
-        config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost(dockerHost)
-                .withDockerTlsVerify(false)
-                .build();
-        client = getClientForConfig(config);
-
-        final int timeout = Integer.getInteger(PING_TIMEOUT_PROPERTY_NAME, PING_TIMEOUT_DEFAULT);
-        ping(client, timeout);
-
-        return config;
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
index 71b797298aa..2ba8ba6df11 100644
--- a/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
+++ b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
@@ -1,7 +1,7 @@
 package org.testcontainers.images;
 
+import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.core.command.PullImageResultCallback;
 import org.slf4j.Logger;
 
 import java.io.Closeable;
diff --git a/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
index 274eedefded..b6d8539c3e8 100644
--- a/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
+++ b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
@@ -1,7 +1,7 @@
 package org.testcontainers.images;
 
+import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.core.command.PullImageResultCallback;
 import org.slf4j.Logger;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 638db2e351d..133b6e1c4b0 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -2,8 +2,8 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.BuildImageResultCallback;
 import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
 import lombok.Cleanup;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
diff --git a/core/src/main/resources/META-INF/services/README.md b/core/src/main/resources/META-INF/services/README.md
deleted file mode 100644
index fd11f50456e..00000000000
--- a/core/src/main/resources/META-INF/services/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The contents of this folder is a workaround for issues described here: https://github.com/KostyaSha/docker-java-shade/issues/1
\ No newline at end of file
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
index cde7fc827e4..006c3ec7f82 100644
--- a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
+++ b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
@@ -1,5 +1,4 @@
 org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy
 org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
 org.testcontainers.dockerclient.DockerMachineClientProviderStrategy
-org.testcontainers.dockerclient.WindowsClientProviderStrategy
 org.testcontainers.dockerclient.NpipeSocketClientProviderStrategy
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.JsonFactory b/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.JsonFactory
deleted file mode 100755
index 239a78a0a82..00000000000
--- a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.JsonFactory
+++ /dev/null
@@ -1 +0,0 @@
-com.fasterxml.jackson.core.JsonFactory
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.ObjectCodec b/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.ObjectCodec
deleted file mode 100755
index f126bb401c2..00000000000
--- a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.fasterxml.jackson.core.ObjectCodec
+++ /dev/null
@@ -1 +0,0 @@
-com.fasterxml.jackson.databind.ObjectMapper
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.github.dockerjava.api.command.DockerCmdExecFactory b/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.github.dockerjava.api.command.DockerCmdExecFactory
deleted file mode 100644
index f0686bc9f31..00000000000
--- a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.com.github.dockerjava.api.command.DockerCmdExecFactory
+++ /dev/null
@@ -1 +0,0 @@
-com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl
\ No newline at end of file
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.javax.ws.rs.ext.RuntimeDelegate b/core/src/main/resources/META-INF/services/org.testcontainers.shaded.javax.ws.rs.ext.RuntimeDelegate
deleted file mode 100644
index 550198cfdf7..00000000000
--- a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.javax.ws.rs.ext.RuntimeDelegate
+++ /dev/null
@@ -1 +0,0 @@
-org.glassfish.jersey.internal.RuntimeDelegateImpl
\ No newline at end of file
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator b/core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator
deleted file mode 100644
index 7834b52dd6d..00000000000
--- a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator
+++ /dev/null
@@ -1 +0,0 @@
-org.jvnet.hk2.external.generator.ServiceLocatorGeneratorImpl
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.jvnet.hk2.external.generator.ServiceLocatorGenerator b/core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.jvnet.hk2.external.generator.ServiceLocatorGenerator
deleted file mode 100644
index 25f6b0c3fc9..00000000000
--- a/core/src/main/resources/META-INF/services/org.testcontainers.shaded.org.jvnet.hk2.external.generator.ServiceLocatorGenerator
+++ /dev/null
@@ -1 +0,0 @@
-org.testcontainers.shaded.org.jvnet.hk2.external.generator.ServiceLocatorGeneratorImpl

From 8e57ae60565f24c01ec7ef964dc37130a022eba4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 11 Jul 2020 20:14:44 +0200
Subject: [PATCH 0860/4969] Use `EnvAndSysPropClientProviderStrategy` only if
 `DOCKER_HOST` is set (#2987)

---
 .../EnvironmentAndSystemPropertyClientProviderStrategy.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
index c95c9242a07..e0afba9af93 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
@@ -17,6 +17,11 @@ public final class EnvironmentAndSystemPropertyClientProviderStrategy extends Do
     // Try using environment variables
     private final DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
 
+    @Override
+    protected boolean isApplicable() {
+        return System.getenv("DOCKER_HOST") != null;
+    }
+
     @Override
     public TransportConfig getTransportConfig() {
         return TransportConfig.builder()

From 74a9240473ef2404ff9b8bd76f53f33607401cae Mon Sep 17 00:00:00 2001
From: Simon Schneider <10846939+raynigon@users.noreply.github.com>
Date: Sun, 12 Jul 2020 13:58:10 +0200
Subject: [PATCH 0861/4969] Convert Docs for the Junit5 (#2977)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/test_framework_integration/junit_5.md    | 75 +++----------------
 .../junit/jupiter/MixedLifecycleTests.java    | 38 ++++++++++
 ...ntainersNestedRestartedContainerTests.java | 13 +++-
 3 files changed, 59 insertions(+), 67 deletions(-)
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java

diff --git a/docs/test_framework_integration/junit_5.md b/docs/test_framework_integration/junit_5.md
index 11798484b0f..7f3689c0301 100644
--- a/docs/test_framework_integration/junit_5.md
+++ b/docs/test_framework_integration/junit_5.md
@@ -23,28 +23,9 @@ executed. Containers declared as instance fields will be started and stopped for
 unsupported and may have unintended side effects.
   
 *Example:*
-```java
-@Testcontainers
-class MyTestcontainersTests {
-   
-     // will be shared between test methods
-    @Container
-    private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer();
-    
-     // will be started before and stopped after each test method
-    @Container
-    private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer()
-            .withDatabaseName("foo")
-            .withUsername("foo")
-            .withPassword("secret");
-    @Test
-    void test() {
-        assertTrue(MY_SQL_CONTAINER.isRunning());
-        assertTrue(postgresqlContainer.isRunning());
-    }
-}
-```
-
+<!--codeinclude-->
+[Mixed Lifecycle](../../modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java) inside_block:testClass
+<!--/codeinclude-->
 
 ## Examples
 
@@ -55,36 +36,10 @@ To use the Testcontainers extension annotate your test class with `@Testcontaine
 To define a restarted container, define an instance field inside your test class and annotate it with
 the `@Container` annotation.
 
-```java
-@Testcontainers
-class SomeTest {
-
-    @Container
-    private MySQLContainer mySQLContainer = new MySQLContainer();
-
-    @Test
-    void someTestMethod() {
-        String url = mySQLContainer.getJdbcUrl();
-
-        // create a connection and run test as normal
-    }
-
-    @Nested
-    class NestedTests {
+<!--codeinclude-->
+[Restarted Containers](../../modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java) inside_block:testClass
+<!--/codeinclude-->
 
-        @Container
-        private final PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer();
-
-        void nestedTestMethod() {
-            // top level container is restarted for nested methods
-            String mySqlUrl = mySQLContainer.getJdbcUrl();
-            
-            // nested containers are only available inside their nested class
-            String postgresUrl = postgreSQLContainer.getJdbcUrl();
-        }
-    }
-}
-```
 
 ### Shared containers
 
@@ -92,21 +47,9 @@ Shared containers are defined as static fields in a top level test class and hav
 Note that shared containers can't be declared inside nested test classes.
 This is because nested test classes have to be defined non-static and can't therefore have static fields.
 
-```java
-@Testcontainers
-class SomeTest {
-
-    @Container
-    private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer();
-
-    @Test
-    void someTestMethod() {
-        String url = MY_SQL_CONTAINER.getJdbcUrl();
-
-        // create a connection and run test as normal
-    }
-}
-```
+<!--codeinclude-->
+[Shared Container](../../modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java) lines:18-23,32-33,35-36
+<!--/codeinclude-->
 
 ## Singleton containers
 
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
new file mode 100644
index 00000000000..791c887cc19
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
@@ -0,0 +1,38 @@
+package org.testcontainers.junit.jupiter;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+
+// testClass {
+@Testcontainers
+class MixedLifecycleTests {
+
+    // will be shared between test methods
+    @Container
+    private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer();
+
+    // will be started before and stopped after each test method
+    @Container
+    private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer()
+        .withDatabaseName("foo")
+        .withUsername("foo")
+        .withPassword("secret");
+
+    @Test
+    void test() {
+        assertTrue(MY_SQL_CONTAINER.isRunning());
+        assertTrue(postgresqlContainer.isRunning());
+    }
+}
+// }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
index 4d27c410979..fb753744425 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
@@ -8,21 +8,26 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+// testClass {
 @Testcontainers
 class TestcontainersNestedRestartedContainerTests {
 
     @Container
     private final GenericContainer topLevelContainer = new GenericContainer("httpd:2.4-alpine")
         .withExposedPorts(80);
+    // }}
 
     private static String topLevelContainerId;
 
     private static String nestedContainerId;
 
+    // testClass {
     @Test
     void top_level_container_should_be_running() {
         assertTrue(topLevelContainer.isRunning());
+// }}
         topLevelContainerId = topLevelContainer.getContainerId();
+// testClass {{
     }
 
     @Nested
@@ -34,16 +39,20 @@ class NestedTestCase {
 
         @Test
         void both_containers_should_be_running() {
+            // top level container is restarted for nested methods
             assertTrue(topLevelContainer.isRunning());
+            // nested containers are only available inside their nested class
             assertTrue(nestedContainer.isRunning());
-
+// }}}
             if (nestedContainerId == null) {
                 nestedContainerId = nestedContainer.getContainerId();
             } else {
                 assertNotEquals(nestedContainerId, nestedContainer.getContainerId());
             }
+// testClass {{
         }
 
+        // }
         @Test
         void containers_should_not_be_the_same() {
             assertNotEquals(topLevelContainer.getContainerId(), nestedContainer.getContainerId());
@@ -65,5 +74,7 @@ void ids_should_not_change() {
                 assertNotEquals(nestedContainerId, nestedContainer.getContainerId());
             }
         }
+// testClass {{{
     }
 }
+// }

From c137996b2932b223d22cdd81215e96b098a28255 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 12 Jul 2020 18:22:54 +0200
Subject: [PATCH 0862/4969] Allow overriding detected host (#2991)

---
 .../dockerclient/DockerClientProviderStrategy.java           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 3f288d015d0..e21c75a581d 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -255,6 +255,11 @@ public synchronized String getDockerHostIpAddress() {
 
     @VisibleForTesting
     static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost) {
+        String hostOverride = System.getenv("TESTCONTAINERS_HOST_OVERRIDE");
+        if (!StringUtils.isBlank(hostOverride)) {
+            return hostOverride;
+        }
+
         switch (dockerHost.getScheme()) {
             case "http":
             case "https":

From 50c778fa39c8adab5b0ee078ee47b074482112ac Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 15 Jul 2020 14:14:07 +0200
Subject: [PATCH 0863/4969] Add a rootless Docker strategy (#2985)

Closes #2943, #1770
---
 .github/workflows/ci-rootless.yml             | 31 ++++++++++
 .github/workflows/ci.yml                      |  2 +-
 .../testcontainers/DockerClientFactory.java   | 15 +++++
 .../containers/DockerComposeContainer.java    | 24 ++++----
 .../RootlessDockerClientProviderStrategy.java | 58 +++++++++++++++++++
 .../UnixSocketClientProviderStrategy.java     |  2 +-
 .../utility/ResourceReaper.java               |  2 +-
 ....dockerclient.DockerClientProviderStrategy |  1 +
 .../DockerComposeOverridesTest.java           | 13 ++++-
 .../containers/GenericContainerTest.java      |  6 ++
 .../DockerClientConfigUtilsTest.java          |  5 ++
 .../auth-config/docker-credential-fake        | 12 ++--
 docs/features/configuration.md                | 17 ++++++
 13 files changed, 167 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/ci-rootless.yml
 create mode 100644 core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
 rename core/src/test/java/org/testcontainers/{junit => containers}/DockerComposeOverridesTest.java (90%)

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
new file mode 100644
index 00000000000..e752747b804
--- /dev/null
+++ b/.github/workflows/ci-rootless.yml
@@ -0,0 +1,31 @@
+name: CI-Docker-Rootless
+
+on:
+  pull_request: {}
+  push: { branches: [ master ] }
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: debug
+        run: id -u; whoami
+      - name: uninstall rootful Docker
+        run: sudo apt-get -q -y --purge remove moby-engine moby-buildx && sudo rm -rf /var/run/docker.sock
+      - name: install rootless Docker
+        run: curl -fsSL https://get.docker.com/rootless | sh
+      - name: start rootless Docker
+        run: PATH=$HOME/bin:$PATH XDG_RUNTIME_DIR=/tmp/docker-$(id -u) dockerd-rootless.sh --experimental --storage-driver vfs &
+      - name: Build with Gradle
+        run: XDG_RUNTIME_DIR=/tmp/docker-$(id -u) ./gradlew --no-daemon --scan testcontainers:test
+      - name: aggregate test reports with ciMate
+        if: always()
+        continue-on-error: true
+        env:
+          CIMATE_PROJECT_ID: 2348n4vl
+          CIMATE_CI_KEY: "CI / rootless Docker"
+        run: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b965eb77dc9..668dde2b28c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
         run: docker image prune -af
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
-          ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
       - name: Aggregate test reports with ciMate
         if: always()
         continue-on-error: true
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index baebe164c48..b9c4d508f25 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -18,6 +18,7 @@
 import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 import org.testcontainers.dockerclient.DockerMachineClientProviderStrategy;
 import org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback;
@@ -29,6 +30,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -129,6 +131,19 @@ private DockerClientProviderStrategy getOrInitializeStrategy() {
         return strategy;
     }
 
+    @UnstableAPI
+    public String getDockerUnixSocketPath() {
+        String dockerSocketOverride = System.getenv("TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE");
+        if (!StringUtils.isBlank(dockerSocketOverride)) {
+            return dockerSocketOverride;
+        }
+
+        URI dockerHost = getOrInitializeStrategy().getTransportConfig().getDockerHost();
+        return "unix".equals(dockerHost.getScheme())
+            ? dockerHost.getRawPath()
+            : "/var/run/docker.sock";
+    }
+
     /**
      *
      * @return a new initialized Docker client
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index c3fe9ab17f9..8c07c036d11 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -59,7 +59,6 @@
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
-import static org.testcontainers.containers.BindMode.READ_ONLY;
 import static org.testcontainers.containers.BindMode.READ_WRITE;
 
 /**
@@ -580,7 +579,6 @@ interface DockerCompose {
  */
 class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
 
-    private static final String DOCKER_SOCKET_PATH = "/var/run/docker.sock";
     public static final char UNIX_PATH_SEPERATOR = ':';
 
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
@@ -601,24 +599,18 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
         final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPERATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
         logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
         addEnv(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
-        addFileSystemBind(pwd, containerPwd, READ_ONLY);
+        addFileSystemBind(pwd, containerPwd, READ_WRITE);
 
         // Ensure that compose can access docker. Since the container is assumed to be running on the same machine
         //  as the docker daemon, just mapping the docker control socket is OK.
         // As there seems to be a problem with mapping to the /var/run directory in certain environments (e.g. CircleCI)
         //  we map the socket file outside of /var/run, as just /docker.sock
-        addFileSystemBind(getDockerSocketHostPath(), "/docker.sock", READ_WRITE);
+        addFileSystemBind("/" + DockerClientFactory.instance().getDockerUnixSocketPath(), "/docker.sock", READ_WRITE);
         addEnv("DOCKER_HOST", "unix:///docker.sock");
         setStartupCheckStrategy(new IndefiniteWaitOneShotStartupCheckStrategy());
         setWorkingDirectory(containerPwd);
     }
 
-    private String getDockerSocketHostPath() {
-        return SystemUtils.IS_OS_WINDOWS
-            ? "/" + DOCKER_SOCKET_PATH
-            : DOCKER_SOCKET_PATH;
-    }
-
     @Override
     public void invoke() {
         super.start();
@@ -681,16 +673,26 @@ public DockerCompose withEnv(Map<String, String> env) {
         return this;
     }
 
+    @VisibleForTesting
+    static boolean executableExists() {
+        return CommandLine.executableExists(COMPOSE_EXECUTABLE);
+    }
+
     @Override
     public void invoke() {
         // bail out early
-        if (!CommandLine.executableExists(COMPOSE_EXECUTABLE)) {
+        if (!executableExists()) {
             throw new ContainerLaunchException("Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?");
         }
 
         final Map<String, String> environment = Maps.newHashMap(env);
         environment.put(ENV_PROJECT_NAME, identifier);
 
+        String dockerHost = System.getenv("DOCKER_HOST");
+        if (dockerHost == null) {
+            dockerHost = "unix://" + DockerClientFactory.instance().getDockerUnixSocketPath();
+        }
+        environment.put("DOCKER_HOST", dockerHost);
 
         final Stream<String> absoluteDockerComposeFilePaths = composeFiles.stream()
             .map(File::getAbsolutePath)
diff --git a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
new file mode 100644
index 00000000000..cc6b23e506d
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
@@ -0,0 +1,58 @@
+package org.testcontainers.dockerclient;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import org.apache.commons.lang.SystemUtils;
+
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ *
+ * @deprecated this class is used by the SPI and should not be used directly
+ */
+@Deprecated
+public final class RootlessDockerClientProviderStrategy extends DockerClientProviderStrategy {
+
+    public static final int PRIORITY = UnixSocketClientProviderStrategy.PRIORITY + 1;
+
+    private Path getSocketPath() {
+        String xdgRuntimeDir = System.getenv("XDG_RUNTIME_DIR");
+        if (xdgRuntimeDir == null) {
+            xdgRuntimeDir = "/run/user/" + LibC.INSTANCE.getuid();
+        }
+        return Paths.get(xdgRuntimeDir).resolve("docker.sock");
+    }
+
+    @Override
+    public TransportConfig getTransportConfig() throws InvalidConfigurationException {
+        return TransportConfig.builder()
+            .dockerHost(URI.create("unix://" + getSocketPath().toString()))
+            .build();
+    }
+
+    @Override
+    protected boolean isApplicable() {
+        return SystemUtils.IS_OS_LINUX && Files.exists(getSocketPath());
+    }
+
+    @Override
+    public String getDescription() {
+        return "Rootless Docker accessed via Unix socket (" + getSocketPath() + ")";
+    }
+
+    @Override
+    protected int getPriority() {
+        return PRIORITY;
+    }
+
+    private interface LibC extends Library {
+
+        LibC INSTANCE = Native.loadLibrary("c", LibC.class);
+
+        int getuid();
+    }
+
+}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
index fd4ef4f9e6e..6f030ada279 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
@@ -41,7 +41,7 @@ public TransportConfig getTransportConfig() throws InvalidConfigurationException
 
     @Override
     protected boolean isApplicable() {
-        return SystemUtils.IS_OS_LINUX;
+        return SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC;
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 5d89ab886e7..e9c0f68a82b 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -76,7 +76,7 @@ public static String start(String hostIpAddress, DockerClient client) {
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
         List<Bind> binds = new ArrayList<>();
-        binds.add(new Bind("//var/run/docker.sock", new Volume("/var/run/docker.sock")));
+        binds.add(new Bind("/" + DockerClientFactory.instance().getDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
 
         String ryukContainerId = client.createContainerCmd(ryukImage)
                 .withHostConfig(new HostConfig().withAutoRemove(true))
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
index 006c3ec7f82..d9cbad0ebff 100644
--- a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
+++ b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
@@ -2,3 +2,4 @@ org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrate
 org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
 org.testcontainers.dockerclient.DockerMachineClientProviderStrategy
 org.testcontainers.dockerclient.NpipeSocketClientProviderStrategy
+org.testcontainers.dockerclient.RootlessDockerClientProviderStrategy
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
similarity index 90%
rename from core/src/test/java/org/testcontainers/junit/DockerComposeOverridesTest.java
rename to core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
index 6413694d1c5..9e9eb27b509 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
@@ -1,6 +1,8 @@
-package org.testcontainers.junit;
+package org.testcontainers.containers;
 
 import com.google.common.util.concurrent.Uninterruptibles;
+import org.assertj.core.api.Assumptions;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -48,6 +50,15 @@ public static Iterable<Object[]> data() {
         });
     }
 
+    @Before
+    public void setUp() {
+        if (localMode) {
+            Assumptions.assumeThat(LocalDockerCompose.executableExists())
+                .as("docker-compose executable exists")
+                .isTrue();
+        }
+    }
+
     @Test
     public void test() {
         try (DockerComposeContainer compose =
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 78a7a3b1bef..134bdf18f30 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -2,13 +2,16 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse.ContainerState;
+import com.github.dockerjava.api.model.Info;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
+import org.assertj.core.api.Assumptions;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 
@@ -21,6 +24,9 @@ public class GenericContainerTest {
 
     @Test
     public void shouldReportOOMAfterWait() {
+        Info info = DockerClientFactory.instance().client().infoCmd().exec();
+        // Poor man's rootless Docker detection :D
+        Assumptions.assumeThat(info.getDriver()).doesNotContain("vfs");
         try (
             GenericContainer container = new GenericContainer<>()
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
index 353d6ea94e7..442c2efd950 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.api.DockerClient;
+import org.assertj.core.api.Assumptions;
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
 
@@ -16,6 +17,10 @@ public class DockerClientConfigUtilsTest {
 
     @Test
     public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
+        Assumptions.assumeThat(DockerClientConfigUtils.IN_A_CONTAINER)
+            .as("in a container")
+            .isFalse();
+
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("unix:///var/run/docker.sock"));
         assertEquals("localhost", actual);
     }
diff --git a/core/src/test/resources/auth-config/docker-credential-fake b/core/src/test/resources/auth-config/docker-credential-fake
index 880009f2c2a..753e62ca347 100755
--- a/core/src/test/resources/auth-config/docker-credential-fake
+++ b/core/src/test/resources/auth-config/docker-credential-fake
@@ -1,21 +1,21 @@
-#!/bin/bash
+#!/bin/sh
 
-if [[ $1 != "get" ]]; then
+if [ $1 != "get" ]; then
     exit 1
 fi
 
 read inputLine
 
-if [[ $inputLine == "registry2.example.com" ]]; then
+if [ "$inputLine" = "registry2.example.com" ]; then
     echo Fake credentials not found on credentials store \'$inputLine\' 1>&2
     exit 1
 fi
-if [[ $inputLine == "https://not.a.real.registry/url" ]]; then
+if [ "$inputLine" = "https://not.a.real.registry/url" ]; then
     echo Fake credentials not found on credentials store \'$inputLine\' 1>&2
     exit 1
 fi
 
-if [[ $inputLine == "registry.example.com" ]]; then
+if [ "$inputLine" = "registry.example.com" ]; then
     echo '{' \
         '  "ServerURL": "url",' \
         '  "Username": "username",' \
@@ -23,7 +23,7 @@ if [[ $inputLine == "registry.example.com" ]]; then
         '}'
     exit 0
 fi
-if [[ $inputLine == "registrytoken.example.com" ]]; then
+if [ "$inputLine" = "registrytoken.example.com" ]; then
     echo '{' \
         '  "ServerURL": "url",' \
         '  "Username": "<token>",' \
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index f0172b3c978..8b12f8e8d54 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -72,3 +72,20 @@ but does not allow starting privileged containers, you can turn off the Ryuk con
 
 > **pull.pause.timeout = 30**
 > By default Testcontainers will abort the pull of an image if the pull appears stalled (no data transferred) for longer than this duration (in seconds).
+
+## Customizing Docker host detection
+
+Testcontainers will attempt to detect the Docker environment and configure everything.
+
+However, sometimes a customization is required. For that, you can provide the following environment variables:
+
+> **DOCKER_HOST** = unix:///var/run/docker.sock  
+> See [Docker environment variables](https://docs.docker.com/engine/reference/commandline/cli/#environment-variables)
+>
+> **TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE**  
+> Path to Docker's socket. Used by Ryuk, Docker Compose, and a few other containers that need to perform Docker actions.  
+> Example: `/var/run/docker-alt.sock`
+> 
+> **TESTCONTAINERS_HOST_OVERRIDE**  
+> Docker's host on which ports are exposed.  
+> Example: `docker.svc.local`

From cce8a7f7db57278eb81c878c4879a50479917a4d Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 15 Jul 2020 16:48:47 +0200
Subject: [PATCH 0864/4969] Added jOOQ to the who's using section, and me to
 the backers section (#2996)

---
 docs/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 6c8bf49f08f..7619146c8b5 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -119,6 +119,7 @@ testImplementation('org.testcontainers:mysql') //no version specified
 * [Transferwise](https://transferwise.com/) - Integration testing for different RDBMS, kafka and micro services
 * [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
 * [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
+* [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS
 
 ## Sponsors
 
@@ -133,6 +134,7 @@ A huge thank you to our backers:
 * [Philip Riecks (@rieckpil)](https://github.com/rieckpil)
 * [Karl Heinz Marbaise (@khmarbaise)](https://github.com/khmarbaise)
 * [Sascha Frinken (@sascha-frinken)](https://github.com/sascha-frinken)
+* [Lukas Eder (@lukaseder)](https://github.com/lukaseder)
 
 
 ## License

From f8954ff7c0cdd3e0ff3c13e484cab4f221c6f7ea Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 15 Jul 2020 16:21:18 +0100
Subject: [PATCH 0865/4969] Add fkorotkov to backers (#2997)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 7619146c8b5..94224c3c0db 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -135,6 +135,7 @@ A huge thank you to our backers:
 * [Karl Heinz Marbaise (@khmarbaise)](https://github.com/khmarbaise)
 * [Sascha Frinken (@sascha-frinken)](https://github.com/sascha-frinken)
 * [Lukas Eder (@lukaseder)](https://github.com/lukaseder)
+* [Fedor Korotkov (@fedor)](https://github.com/fkorotkov)
 
 
 ## License

From 977058da8e63a06f08e91aed2afd0c22df59641f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 15 Jul 2020 16:25:21 +0100
Subject: [PATCH 0866/4969] Add dreis2211 to backers

And use github username, not twitter handle, for Fedor
---
 docs/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 94224c3c0db..4894297f034 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -135,7 +135,8 @@ A huge thank you to our backers:
 * [Karl Heinz Marbaise (@khmarbaise)](https://github.com/khmarbaise)
 * [Sascha Frinken (@sascha-frinken)](https://github.com/sascha-frinken)
 * [Lukas Eder (@lukaseder)](https://github.com/lukaseder)
-* [Fedor Korotkov (@fedor)](https://github.com/fkorotkov)
+* [Fedor Korotkov (@fkorotkov)](https://github.com/fkorotkov)
+* [Christoph Dreis (@dreis2211)](https://github.com/dreis2211)
 
 
 ## License

From a5c28943992e491c688603982a517c59c7a02d8f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 16 Jul 2020 11:34:49 +0200
Subject: [PATCH 0867/4969] Fix local Docker Compose (#2998)

* Fix local Docker Compose

* set `DOCKER_TLS_VERIFY` as well
---
 .../org/testcontainers/DockerClientFactory.java | 10 ++++++++--
 .../containers/DockerComposeContainer.java      | 17 +++++++++++++++--
 .../testcontainers/utility/ResourceReaper.java  |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index b9c4d508f25..f91b075cdb2 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -21,6 +21,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 import org.testcontainers.dockerclient.DockerMachineClientProviderStrategy;
+import org.testcontainers.dockerclient.TransportConfig;
 import org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.MountableFile;
@@ -132,13 +133,18 @@ private DockerClientProviderStrategy getOrInitializeStrategy() {
     }
 
     @UnstableAPI
-    public String getDockerUnixSocketPath() {
+    public TransportConfig getTransportConfig() {
+        return getOrInitializeStrategy().getTransportConfig();
+    }
+
+    @UnstableAPI
+    public String getRemoteDockerUnixSocketPath() {
         String dockerSocketOverride = System.getenv("TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE");
         if (!StringUtils.isBlank(dockerSocketOverride)) {
             return dockerSocketOverride;
         }
 
-        URI dockerHost = getOrInitializeStrategy().getTransportConfig().getDockerHost();
+        URI dockerHost = getTransportConfig().getDockerHost();
         return "unix".equals(dockerHost.getScheme())
             ? dockerHost.getRawPath()
             : "/var/run/docker.sock";
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 8c07c036d11..50a58ba8c87 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -2,6 +2,8 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.core.LocalDirectorySSLConfig;
+import com.github.dockerjava.transport.SSLConfig;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
@@ -22,6 +24,7 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.dockerclient.TransportConfig;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.utility.AuditLogger;
 import org.testcontainers.utility.Base58;
@@ -605,7 +608,7 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
         //  as the docker daemon, just mapping the docker control socket is OK.
         // As there seems to be a problem with mapping to the /var/run directory in certain environments (e.g. CircleCI)
         //  we map the socket file outside of /var/run, as just /docker.sock
-        addFileSystemBind("/" + DockerClientFactory.instance().getDockerUnixSocketPath(), "/docker.sock", READ_WRITE);
+        addFileSystemBind("/" + DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/docker.sock", READ_WRITE);
         addEnv("DOCKER_HOST", "unix:///docker.sock");
         setStartupCheckStrategy(new IndefiniteWaitOneShotStartupCheckStrategy());
         setWorkingDirectory(containerPwd);
@@ -690,7 +693,17 @@ public void invoke() {
 
         String dockerHost = System.getenv("DOCKER_HOST");
         if (dockerHost == null) {
-            dockerHost = "unix://" + DockerClientFactory.instance().getDockerUnixSocketPath();
+            TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
+            SSLConfig sslConfig = transportConfig.getSslConfig();
+            if (sslConfig != null) {
+                if (sslConfig instanceof LocalDirectorySSLConfig) {
+                    environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
+                    environment.put("DOCKER_TLS_VERIFY", "true");
+                } else {
+                    logger().warn("Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig.");
+                }
+            }
+            dockerHost = transportConfig.getDockerHost().toString();
         }
         environment.put("DOCKER_HOST", dockerHost);
 
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index e9c0f68a82b..0a0728e9306 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -76,7 +76,7 @@ public static String start(String hostIpAddress, DockerClient client) {
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
         List<Bind> binds = new ArrayList<>();
-        binds.add(new Bind("/" + DockerClientFactory.instance().getDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
+        binds.add(new Bind("/" + DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
 
         String ryukContainerId = client.createContainerCmd(ryukImage)
                 .withHostConfig(new HostConfig().withAutoRemove(true))

From 6e8c18e1a3d9a75c86e86577b684bfdb8ce61160 Mon Sep 17 00:00:00 2001
From: Aaron Whiteside <aaronjwhiteside@gmail.com>
Date: Sun, 19 Jul 2020 20:44:41 +1000
Subject: [PATCH 0868/4969] couchbase: include error response from couchbase in
 checkSuccessfulResponse() (#3006)

Also minor logging cleanup, and prevented an exception from being swallowed.

fixes #2799

Co-authored-by: Aaron Whiteside <awhiteside@yapstone.com>
---
 .../couchbase/CouchbaseContainer.java         | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index ee4b3212cac..4a95334752a 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -168,7 +168,7 @@ protected void configure() {
                             .map("healthy"::equals)
                             .orElse(false);
                     } catch (IOException e) {
-                        logger().error("Unable to parse response {}", response);
+                        logger().error("Unable to parse response {}", response, e);
                         return false;
                     }
                 })
@@ -337,10 +337,10 @@ private void configureIndexer() {
      * Based on the user-configured bucket definitions, creating buckets and corresponding indexes if needed.
      */
     private void createBuckets() {
-        logger().debug("Creating " + buckets.size() + " buckets (and corresponding indexes).");
+        logger().debug("Creating {} buckets (and corresponding indexes).", buckets.size());
 
         for (BucketDefinition bucket : buckets) {
-            logger().debug("Creating bucket \"" + bucket.getName() + "\"");
+            logger().debug("Creating bucket \"{}\"", bucket.getName());
 
             @Cleanup Response response = doHttpRequest(MGMT_PORT, "/pools/default/buckets", "POST", new FormBody.Builder()
                 .add("name", bucket.getName())
@@ -382,7 +382,7 @@ private void createBuckets() {
 
                     checkSuccessfulResponse(queryResponse, "Could not create primary index for bucket " + bucket.getName());
                 } else {
-                    logger().info("Primary index creation for bucket " + bucket.getName() + " ignored, since QUERY service is not present.");
+                    logger().info("Primary index creation for bucket {} ignored, since QUERY service is not present.", bucket.getName());
                 }
             }
         }
@@ -406,7 +406,16 @@ private String getInternalIpAddress() {
      */
     private void checkSuccessfulResponse(final Response response, final String message) {
         if (!response.isSuccessful()) {
-            throw new IllegalStateException(message + ": " + response.toString());
+            String body = null;
+            if (response.body() != null) {
+                try {
+                    body = response.body().string();
+                } catch (IOException e) {
+                    logger().debug("Unable to read body of response: {}", response, e);
+                }
+            }
+
+            throw new IllegalStateException(message + ": " + response.toString() + ", body=" + (body == null ? "<null>" : body));
         }
     }
 

From 3c391bf51db8c80156771e8366e30d5ccb44410c Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Sun, 19 Jul 2020 12:47:21 +0200
Subject: [PATCH 0869/4969] Maintain deterministic order in
 withCopyFileToContainer (#2897)

---
 .../java/org/testcontainers/containers/GenericContainer.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 417826e83b5..b3dcf469cfc 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -79,6 +79,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -180,7 +181,8 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Nullable
     private Long shmSize;
 
-    private Map<MountableFile, String> copyToFileContainerPathMap = new HashMap<>();
+    // Maintain order in which entries are added, as earlier target location may be a prefix of a later location.
+    private Map<MountableFile, String> copyToFileContainerPathMap = new LinkedHashMap<>();
 
     protected final Set<Startable> dependencies = new HashSet<>();
 

From fd823a14f8d791def4b04b10e2f8f47b76c02edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20B=C3=B6ckling?= <michael@boeckling.net>
Date: Sun, 19 Jul 2020 13:20:55 +0200
Subject: [PATCH 0870/4969] Make WaitStrategy's regex in PrestoContainer work
 with newer image (#2992)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michael Böckling <michael.boeckling@codecentric.de>
---
 .../java/org/testcontainers/containers/PrestoContainer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 56488525734..c3f25c40ac8 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -30,7 +30,7 @@ public PrestoContainer() {
     public PrestoContainer(final String dockerImageName) {
         super(dockerImageName);
         this.waitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(".*io.prestosql.server.PrestoServer\\s+======== SERVER STARTED ========.*")
+            .withRegEx(".*======== SERVER STARTED ========.*")
             .withStartupTimeout(Duration.of(60, SECONDS));
 
         addExposedPort(PRESTO_PORT);

From c3f53b3a63e6b0bc800a7f0fbce91ce95a8986b3 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 19 Jul 2020 13:32:40 +0100
Subject: [PATCH 0871/4969] Deprecate ambiguous constructors (#2839)

Our constructors for `GenericContainer` and all the classes that inherit from it tend to be a bit inconsistent. In some places, a no-args constructor is favoured, in other places a String parameter is favoured - which can be either a full image name or a tag.

This raises confusion, and in the case of an image tag being the parameter, it restricts which images people can easily use.

Another problem this raises is when the container class specifies a default tag version: this frequently falls out of date. We're stuck for options: some users (and image maintainers) would like to see newer image versions being used, but this could be a breaking change for existing users. This is especially risky when a major version bump is proposed.

This change aims to:

- Deprecate 'ambiguous' constructors for containers - any no-args or String-arg constructor gets this treatment.
- Introduce a new constructor which accepts a `DockerImageName` object. This class is preferred to a String because its meaning is unambiguous.
- Enhance `DockerImageName` with a static factory method and a convenience `withTag` method so that users can easily create and derive new instances.
- Update all modules to follow suit
---
 .../testcontainers/DockerClientFactory.java   |   2 +-
 .../containers/DockerComposeContainer.java    |   2 +-
 .../FixedHostPortGenericContainer.java        |   5 +
 .../containers/GenericContainer.java          |  19 +++-
 .../containers/PortForwardingContainer.java   |   4 +-
 .../containers/SocatContainer.java            |   9 +-
 .../containers/VncRecordingContainer.java     |   2 +-
 .../AuthDelegatingDockerClientConfig.java     |   2 +-
 .../images/AbstractImagePullPolicy.java       |   2 +-
 .../images/LocalImagesCache.java              |   2 +-
 .../images/RemoteDockerImage.java             |  16 ++-
 .../dockerfile/traits/FromStatementTrait.java |   2 +-
 .../utility/DockerImageName.java              | 104 ++++++++++++------
 .../utility/DockerMachineClient.java          |   1 -
 .../utility/ResourceReaper.java               |   4 +-
 .../utility/TestcontainersConfiguration.java  |  45 ++++++++
 .../OutOfPackageImagePullPolicyTest.java      |   4 +-
 .../java/org/testcontainers/DaemonTest.java   |   5 +-
 .../DockerClientFactoryTest.java              |   2 +-
 .../java/org/testcontainers/TestImages.java   |  13 +++
 .../containers/ExposedHostTest.java           |  28 +++--
 .../FailureDetectingExternalResourceTest.java |   1 +
 .../containers/GenericContainerTest.java      |   5 +-
 .../containers/NetworkTest.java               |  24 ++--
 .../containers/ReusabilityUnitTests.java      |  31 +++---
 .../containers/output/ContainerLogsTest.java  |  19 ++--
 .../dockerclient/EventStreamTest.java         |   4 +-
 .../dockerclient/ImagePullTest.java           |   5 +-
 .../images/AgeBasedPullPolicyTest.java        |   2 +-
 .../images/ImagePullPolicyTest.java           |  44 ++++----
 .../images/RemoteDockerImageTest.java         |  11 +-
 .../images/builder/DockerignoreTest.java      |  30 ++---
 .../junit/CopyFileToContainerTest.java        |   9 +-
 .../junit/DependenciesTest.java               |  10 +-
 .../junit/DockerNetworkModeTest.java          |   7 +-
 .../junit/FileOperationsTest.java             |  11 +-
 .../junit/FixedHostPortContainerTest.java     |   9 +-
 .../junit/GenericContainerRuleTest.java       |  71 ++++++++----
 .../junit/NonExistentImagePullTest.java       |   3 +-
 .../junit/OutputStreamTest.java               |   7 +-
 .../junit/OutputStreamWithTTYTest.java        |   7 +-
 .../junit/WorkingDirectoryTest.java           |   3 +-
 .../strategy/AbstractWaitStrategyTest.java    |  20 ++--
 .../strategy/HostPortWaitStrategyTest.java    |   5 +-
 .../utility/AuthenticatedImagePullTest.java   |   9 +-
 .../utility/DockerImageNameTest.java          |  46 ++++++--
 .../utility/RegistryAuthLocatorTest.java      |  20 ++--
 .../test/java/generic/CmdModifierTest.java    |   5 +-
 .../src/test/java/generic/CommandsTest.java   |   3 +-
 .../java/generic/ContainerCreationTest.java   |  21 ++--
 .../test/java/generic/ContainerLabelTest.java |   5 +-
 .../src/test/java/generic/ExecTest.java       |   3 +-
 .../generic/MultiplePortsExposedTest.java     |   3 +-
 .../test/java/generic/WaitStrategiesTest.java |   7 +-
 .../StartupCheckStrategyTest.java             |   7 +-
 .../quickstart/RedisBackedCacheIntTest.java   |   3 +-
 .../quickstart/RedisBackedCacheIntTest.java   |   3 +-
 docs/features/creating_container.md           |  16 ++-
 .../test/java/DisqueBackedMailSenderTest.java |  13 ++-
 .../test/java/SingleDisqueInstanceTest.java   |   8 +-
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 0 -> 58910 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 examples/gradlew                              |  33 +++---
 examples/gradlew.bat                          |   6 +-
 .../LinkedContainerTestImages.java            |   8 ++
 .../linkedcontainer/RedmineClientTest.java    |   4 +-
 .../linkedcontainer/RedmineContainer.java     |   3 +-
 .../containers/MongoDbContainer.java          |  14 ++-
 .../containers/MongoDbContainerTest.java      |   7 +-
 .../src/test/java/RedisBackedCacheTest.java   |   7 +-
 .../src/test/java/RedisBackedCacheTest.java   |   7 +-
 .../com/example/AbstractIntegrationTest.java  |   3 +-
 .../test/java/com/example/SolrQueryTest.java  |  21 ++--
 .../com/example/AbstractIntegrationTest.java  |   3 +-
 .../containers/CassandraContainer.java        |  17 ++-
 .../containers/CassandraContainerTest.java    |  29 +++--
 .../containers/ClickHouseContainer.java       |  14 +++
 .../containers/ClickHouseProvider.java        |   4 +-
 .../testcontainers/ClickhouseTestImages.java  |   7 ++
 .../clickhouse/SimpleClickhouseTest.java      |   3 +-
 .../containers/CockroachContainer.java        |  13 +++
 .../CockroachContainerProvider.java           |   4 +-
 .../testcontainers/CockroachDBTestImages.java |   7 ++
 .../cockroachdb/SimpleCockroachDBTest.java    |   7 +-
 .../couchbase/CouchbaseContainer.java         |  19 +++-
 .../couchbase/CouchbaseContainerTest.java     |   5 +-
 .../containers/Db2Container.java              |  17 ++-
 .../containers/Db2ContainerProvider.java      |   4 +-
 .../org/testcontainers/Db2TestImages.java     |   7 ++
 .../junit/db2/SimpleDb2Test.java              |   5 +-
 .../dynamodb/DynaliteContainer.java           |  18 ++-
 .../dynamodb/DynaliteContainerTest.java       |  13 ++-
 .../elasticsearch/ElasticsearchContainer.java |  11 ++
 .../ElasticsearchContainerTest.java           |  47 +++++---
 .../containers/InfluxDBContainer.java         |  16 ++-
 .../containers/InfluxDBContainerTest.java     |   2 +-
 .../InfluxDBContainerWithUserTest.java        |   4 +-
 .../containers/InfluxDBTestImages.java        |   7 ++
 .../containers/JdbcDatabaseContainer.java     |  11 +-
 .../jdbc/MissingJdbcDriverTest.java           |   3 +-
 .../junit/jupiter/JUnitJupiterTestImages.java |   8 ++
 .../junit/jupiter/PostgresContainerTests.java |   3 +-
 ...ntainersNestedRestartedContainerTests.java |   6 +-
 ...tcontainersNestedSharedContainerTests.java |   3 +-
 .../TestcontainersRestartBetweenTests.java    |   3 +-
 .../TestcontainersSharedContainerTests.java   |   3 +-
 .../jupiter/inheritance/RedisContainer.java   |   7 +-
 .../containers/KafkaContainer.java            |  15 ++-
 .../containers/KafkaContainerTest.java        |  12 +-
 .../localstack/LocalStackContainer.java       |  15 ++-
 .../localstack/LocalstackContainerTest.java   |  15 ++-
 .../containers/MariaDBContainer.java          |  14 +++
 .../containers/MariaDBContainerProvider.java  |   5 +-
 .../org/testcontainers/MariaDBTestImages.java |   7 ++
 .../MariaDBR2DBCDatabaseContainerTest.java    |   3 +-
 .../junit/mariadb/SimpleMariaDBTest.java      |  11 +-
 .../containers/MockServerContainer.java       |  15 ++-
 .../containers/MockServerContainerTest.java   |   7 +-
 .../containers/MongoDBContainer.java          |  13 +++
 .../containers/MongoDBContainerTest.java      |   4 +-
 .../containers/MSSQLServerContainer.java      |  13 +++
 .../MSSQLServerContainerProvider.java         |   4 +-
 .../testcontainers/MSSQLServerTestImages.java |   7 ++
 .../MSSQLR2DBCDatabaseContainerTest.java      |   3 +-
 .../CustomPasswordMSSQLServerTest.java        |   3 +-
 .../CustomizableMSSQLServerTest.java          |   3 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    |   8 +-
 .../containers/MySQLContainer.java            |  16 ++-
 .../containers/MySQLContainerProvider.java    |   5 +-
 .../org/testcontainers/MySQLTestImages.java   |   9 ++
 .../MySQLR2DBCDatabaseContainerTest.java      |   3 +-
 .../junit/mysql/CustomizableMysqlTest.java    |   3 +-
 .../junit/mysql/MultiVersionMySQLTest.java    |   7 +-
 .../junit/mysql/SimpleMySQLTest.java          |  31 +++---
 .../containers/Neo4jContainer.java            |  33 ++++--
 .../Neo4jContainerJUnitIntegrationTest.java   |  11 +-
 .../containers/Neo4jContainerTest.java        |  33 +++---
 .../containers/Neo4jTestImages.java           |   7 ++
 .../containers/NginxContainer.java            |  15 ++-
 .../testcontainers/junit/SimpleNginxTest.java |   5 +-
 .../containers/OracleContainer.java           |  13 +++
 .../containers/OrientDBContainer.java         |  13 +++
 .../containers/OrientDBContainerTest.java     |  11 +-
 .../containers/PostgisContainerProvider.java  |   5 +-
 .../containers/PostgreSQLContainer.java       |  13 +++
 .../PostgreSQLContainerProvider.java          |   5 +-
 .../testcontainers/PostgreSQLTestImages.java  |   7 ++
 .../PostgreSQLConnectionURLTest.java          |   7 ++
 .../PostgreSQLR2DBCDatabaseContainerTest.java |   3 +-
 .../CustomizablePostgreSQLTest.java           |   3 +-
 .../postgresql/SimplePostgreSQLTest.java      |  11 +-
 .../containers/PrestoContainer.java           |  13 +++
 .../containers/PrestoContainerProvider.java   |   5 +-
 .../org/testcontainers/PrestoTestImages.java  |   8 ++
 .../containers/PrestoContainerTest.java       |  14 ++-
 .../containers/PulsarContainer.java           |  20 +++-
 .../containers/PulsarContainerTest.java       |   4 +-
 .../containers/RabbitMQContainer.java         |  15 ++-
 ...RabbitMQContainerJUnitIntegrationTest.java |   2 +-
 .../containers/RabbitMQContainerTest.java     |  51 ++++-----
 .../containers/RabbitMQTestImages.java        |   7 ++
 .../containers/BrowserWebDriverContainer.java |  34 ++++--
 .../testcontainers/SeleniumTestImages.java    |   7 ++
 .../junit/LinkedContainerTest.java            |  12 +-
 .../testcontainers/junit/Selenium3xTest.java  |   4 +-
 ...ecificImageNameWebDriverContainerTest.java |   8 +-
 .../containers/SolrContainer.java             |  25 +++--
 .../containers/SolrContainerTest.java         |  20 ++--
 .../spock/MySqlContainerIT.groovy             |   2 +-
 .../spock/PostgresContainerIT.groovy          |   2 +-
 .../spock/SpockTestImages.groovy              |  11 ++
 .../spock/TestHierarchyIT.groovy              |   2 +-
 .../TestLifecycleAwareContainerMock.java      |   6 +
 ...TestcontainersRestartBetweenTestsIT.groovy |   2 +-
 .../TestcontainersSharedContainerIT.groovy    |   2 +-
 .../containers/ToxiproxyContainer.java        |  17 ++-
 .../containers/ToxiproxyTest.java             |  15 ++-
 .../testcontainers/vault/VaultContainer.java  |  13 +++
 .../testcontainers/vault/VaultClientTest.java |   3 +-
 .../vault/VaultContainerTest.java             |   2 +-
 .../testcontainers/vault/VaultTestImages.java |   7 ++
 181 files changed, 1445 insertions(+), 565 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/TestImages.java
 create mode 100644 examples/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 examples/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
 create mode 100644 modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
 create mode 100644 modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
 create mode 100644 modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
 create mode 100644 modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
 create mode 100644 modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java
 create mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java
 create mode 100644 modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
 create mode 100644 modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/PostgreSQLTestImages.java
 create mode 100644 modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
 create mode 100644 modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQTestImages.java
 create mode 100644 modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java
 create mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
 create mode 100644 modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index f91b075cdb2..1905fc7c098 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -60,7 +60,7 @@ public class DockerClientFactory {
             TESTCONTAINERS_SESSION_ID_LABEL, SESSION_ID
     );
 
-    private static final String TINY_IMAGE = TestcontainersConfiguration.getInstance().getTinyImage();
+    private static final String TINY_IMAGE = TestcontainersConfiguration.getInstance().getTinyDockerImageName().asCanonicalNameString();
     private static DockerClientFactory instance;
 
     // Cached client configuration
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 50a58ba8c87..af1da29442f 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -586,7 +586,7 @@ class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCom
 
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
 
-        super(TestcontainersConfiguration.getInstance().getDockerComposeContainerImage());
+        super(TestcontainersConfiguration.getInstance().getDockerComposeDockerImageName());
         addEnv(ENV_PROJECT_NAME, identifier);
 
         // Map the docker compose file into the container
diff --git a/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java b/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java
index 33c1c8e89bd..6477c28042e 100644
--- a/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java
@@ -12,6 +12,11 @@
  * not available - which could manifest as flaky or unstable tests.</p>
  */
 public class FixedHostPortGenericContainer<SELF extends FixedHostPortGenericContainer<SELF>> extends GenericContainer<SELF> {
+
+    /**
+     * @deprecated it is highly recommended that {@link FixedHostPortGenericContainer} not be used, as it risks port conflicts.
+     */
+    @Deprecated
     public FixedHostPortGenericContainer(@NotNull String dockerImageName) {
         super(dockerImageName);
     }
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index b3dcf469cfc..22a6c2408d6 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -12,7 +12,6 @@
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Volume;
@@ -55,6 +54,7 @@
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.DockerMachineClient;
 import org.testcontainers.utility.MountableFile;
@@ -227,10 +227,27 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Setter(AccessLevel.NONE)
     private boolean shouldBeReused = false;
 
+
+    public GenericContainer(@NonNull final DockerImageName dockerImageName) {
+        this.image = new RemoteDockerImage(dockerImageName);
+    }
+
+    public GenericContainer(@NonNull final RemoteDockerImage image) {
+        this.image = image;
+    }
+
+    /**
+     * @deprecated use {@link GenericContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public GenericContainer() {
         this(TestcontainersConfiguration.getInstance().getTinyImage());
     }
 
+    /**
+     * @deprecated use {@link GenericContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public GenericContainer(@NonNull final String dockerImageName) {
         this.setDockerImageName(dockerImageName);
     }
diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index 09f1d98bd2d..e42f2681675 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -19,7 +19,7 @@
 public enum PortForwardingContainer {
     INSTANCE;
 
-    private GenericContainer container;
+    private GenericContainer<?> container;
 
     private final Set<Entry<Integer, Integer>> exposedPorts = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
@@ -29,7 +29,7 @@ public enum PortForwardingContainer {
     @SneakyThrows
     private Connection createSSHSession() {
         String password = UUID.randomUUID().toString();
-        container = new GenericContainer<>(TestcontainersConfiguration.getInstance().getSSHdImage())
+        container = new GenericContainer<>(TestcontainersConfiguration.getInstance().getSSHdDockerImageName())
             .withExposedPorts(22)
             .withEnv("PASSWORD", password)
             .withCommand(
diff --git a/core/src/main/java/org/testcontainers/containers/SocatContainer.java b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
index 5949a14490d..fbca73eb29d 100644
--- a/core/src/main/java/org/testcontainers/containers/SocatContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.util.HashMap;
@@ -16,7 +17,11 @@ public class SocatContainer extends GenericContainer<SocatContainer> {
     private final Map<Integer, String> targets = new HashMap<>();
 
     public SocatContainer() {
-        super(TestcontainersConfiguration.getInstance().getSocatContainerImage());
+        this(TestcontainersConfiguration.getInstance().getSocatDockerImageName());
+    }
+
+    public SocatContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
         withCreateContainerCmdModifier(it -> it.withEntrypoint("/bin/sh"));
         withCreateContainerCmdModifier(it -> it.withName("testcontainers-socat-" + Base58.randomString(8)));
     }
@@ -39,4 +44,4 @@ protected void configure() {
                         .collect(Collectors.joining(" & "))
         );
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index fd48dd01f92..8ac060c2af6 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -52,7 +52,7 @@ public VncRecordingContainer(@NonNull GenericContainer<?> targetContainer) {
      * Create a sidekick container and attach it to another container. The VNC output of that container will be recorded.
      */
     public VncRecordingContainer(@NonNull Network network, @NonNull String targetNetworkAlias) throws IllegalStateException {
-        super(TestcontainersConfiguration.getInstance().getVncRecordedContainerImage());
+        super(TestcontainersConfiguration.getInstance().getVncDockerImageName());
 
         this.targetNetworkAlias = targetNetworkAlias;
         withNetwork(network);
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
index c78a13c99ac..5acb7ab8835 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
@@ -40,7 +40,7 @@ public AuthConfig effectiveAuthConfig(String imageName) {
         }
 
         // try and obtain more accurate auth config using our resolution
-        final DockerImageName parsed = new DockerImageName(imageName);
+        final DockerImageName parsed = DockerImageName.parse(imageName);
         final AuthConfig effectiveAuthConfig = RegistryAuthLocator.instance()
             .lookupAuthConfig(parsed, fallbackAuthConfig);
 
diff --git a/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java b/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
index 11c621eb08b..f5d75ad9617 100644
--- a/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
+++ b/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
@@ -12,7 +12,7 @@ public abstract class AbstractImagePullPolicy implements ImagePullPolicy {
 
     @Override
     public boolean shouldPull(DockerImageName imageName) {
-        Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
+        Logger logger = DockerLoggerFactory.getLogger(imageName.asCanonicalNameString());
 
         // Does our cache already know the image?
         ImageData cachedImageData = LOCAL_IMAGES_CACHE.get(imageName);
diff --git a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
index e6b330d4c90..ec371ef830e 100644
--- a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
+++ b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
@@ -39,7 +39,7 @@ public Optional<ImageData> refreshCache(DockerImageName imageName) {
 
             InspectImageResponse response = null;
             try {
-                response = dockerClient.inspectImageCmd(imageName.toString()).exec();
+                response = dockerClient.inspectImageCmd(imageName.asCanonicalNameString()).exec();
             } catch (NotFoundException e) {
                 log.trace("Image {} not found", imageName, e);
             }
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index d0e1313edf6..8d3a77c5680 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -38,12 +38,18 @@ public class RemoteDockerImage extends LazyFuture<String> {
     @ToString.Exclude
     private DockerClient dockerClient = DockerClientFactory.lazyClient();
 
+    public RemoteDockerImage(DockerImageName dockerImageName) {
+        this.imageNameFuture = CompletableFuture.completedFuture(dockerImageName);
+    }
+
+    @Deprecated
     public RemoteDockerImage(String dockerImageName) {
-        this.imageNameFuture = CompletableFuture.completedFuture(new DockerImageName(dockerImageName));
+        this.imageNameFuture = CompletableFuture.completedFuture(DockerImageName.parse(dockerImageName));
     }
 
+    @Deprecated
     public RemoteDockerImage(@NonNull String repository, @NonNull String tag) {
-        this.imageNameFuture = CompletableFuture.completedFuture(new DockerImageName(repository, tag));
+        this.imageNameFuture = CompletableFuture.completedFuture(DockerImageName.parse(repository).withTag(tag));
     }
 
     public RemoteDockerImage(@NonNull Future<String> imageFuture) {
@@ -57,7 +63,7 @@ protected final String resolve() {
         Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
         try {
             if (!imagePullPolicy.shouldPull(imageName)) {
-                return imageName.toString();
+                return imageName.asCanonicalNameString();
             }
 
             // The image is not available locally - pull it
@@ -76,7 +82,7 @@ protected final String resolve() {
 
                     LocalImagesCache.INSTANCE.refreshCache(imageName);
 
-                    return imageName.toString();
+                    return imageName.asCanonicalNameString();
                 } catch (InterruptedException | InternalServerErrorException e) {
                     // these classes of exception often relate to timeout/connection errors so should be retried
                     lastFailure = e;
@@ -104,7 +110,7 @@ private String imageNameToString() {
         }
 
         try {
-            return getImageName().toString();
+            return getImageName().asCanonicalNameString();
         } catch (InterruptedException | ExecutionException e) {
             return e.getMessage();
         }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java
index 2a87cb08223..07077259df8 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java
@@ -6,7 +6,7 @@
 public interface FromStatementTrait<SELF extends FromStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
 
     default SELF from(String dockerImageName) {
-        new DockerImageName(dockerImageName).assertValid();
+        DockerImageName.parse(dockerImageName).assertValid();
 
         return ((SELF) this).withStatement(new SingleArgumentStatement("FROM", dockerImageName));
     }
diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
index d57f1044e80..b4a40be2f16 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
@@ -2,12 +2,16 @@
 
 
 import com.google.common.net.HostAndPort;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Pattern;
 
 @EqualsAndHashCode(exclude = "rawName")
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public final class DockerImageName {
 
     /* Regex patterns used for validation */
@@ -19,22 +23,42 @@ public final class DockerImageName {
     private final String rawName;
     private final String registry;
     private final String repo;
-    private final Versioning versioning;
+    @NotNull private final Versioning versioning;
 
-    public DockerImageName(String name) {
-        this.rawName = name;
-        final int slashIndex = name.indexOf('/');
+    /**
+     * Parses a docker image name from a provided string.
+     *
+     * @param fullImageName in standard Docker format, e.g. <code>name:tag</code>,
+     *                      <code>some.registry/path/name:tag</code>,
+     *                      <code>some.registry/path/name@sha256:abcdef...</code>, etc.
+     */
+    public static DockerImageName parse(String fullImageName) {
+        return new DockerImageName(fullImageName);
+    }
+
+    /**
+     * Parses a docker image name from a provided string.
+     *
+     * @param fullImageName in standard Docker format, e.g. <code>name:tag</code>,
+     *                      <code>some.registry/path/name:tag</code>,
+     *                      <code>some.registry/path/name@sha256:abcdef...</code>, etc.
+     * @deprecated use {@link DockerImageName#parse(String)} instead
+     */
+    @Deprecated
+    public DockerImageName(String fullImageName) {
+        this.rawName = fullImageName;
+        final int slashIndex = fullImageName.indexOf('/');
 
         String remoteName;
         if (slashIndex == -1 ||
-            (!name.substring(0, slashIndex).contains(".") &&
-                !name.substring(0, slashIndex).contains(":") &&
-                !name.substring(0, slashIndex).equals("localhost"))) {
+            (!fullImageName.substring(0, slashIndex).contains(".") &&
+             !fullImageName.substring(0, slashIndex).contains(":") &&
+             !fullImageName.substring(0, slashIndex).equals("localhost"))) {
             registry = "";
-            remoteName = name;
+            remoteName = fullImageName;
         } else {
-            registry = name.substring(0, slashIndex);
-            remoteName = name.substring(slashIndex + 1);
+            registry = fullImageName.substring(0, slashIndex);
+            remoteName = fullImageName.substring(slashIndex + 1);
         }
 
         if (remoteName.contains("@sha256:")) {
@@ -49,28 +73,40 @@ public DockerImageName(String name) {
         }
     }
 
-    public DockerImageName(String name, String tag) {
-        this.rawName = name;
-        final int slashIndex = name.indexOf('/');
+    /**
+     * Parses a docker image name from a provided string, and uses a separate provided version.
+     *
+     * @param nameWithoutTag in standard Docker format, e.g. <code>name</code>,
+     *                       <code>some.registry/path/name</code>,
+     *                       <code>some.registry/path/name</code>, etc.
+     * @param version        a docker image version identifier, either as a tag or sha256 checksum, e.g.
+     *                       <code>tag</code>,
+     *                       <code>sha256:abcdef...</code>.
+     * @deprecated use {@link DockerImageName#parse(String)}.{@link DockerImageName#withTag(String)} instead
+     */
+    @Deprecated
+    public DockerImageName(String nameWithoutTag, @NotNull String version) {
+        this.rawName = nameWithoutTag;
+        final int slashIndex = nameWithoutTag.indexOf('/');
 
         String remoteName;
         if (slashIndex == -1 ||
-            (!name.substring(0, slashIndex).contains(".") &&
-                !name.substring(0, slashIndex).contains(":") &&
-                !name.substring(0, slashIndex).equals("localhost"))) {
+            (!nameWithoutTag.substring(0, slashIndex).contains(".") &&
+             !nameWithoutTag.substring(0, slashIndex).contains(":") &&
+             !nameWithoutTag.substring(0, slashIndex).equals("localhost"))) {
             registry = "";
-            remoteName = name;
+            remoteName = nameWithoutTag;
         } else {
-            registry = name.substring(0, slashIndex);
-            remoteName = name.substring(slashIndex + 1);
+            registry = nameWithoutTag.substring(0, slashIndex);
+            remoteName = nameWithoutTag.substring(slashIndex + 1);
         }
 
-        if (tag.startsWith("sha256:")) {
+        if (version.startsWith("sha256:")) {
             repo = remoteName;
-            versioning = new Sha256Versioning(tag.replace("sha256:", ""));
+            versioning = new Sha256Versioning(version.replace("sha256:", ""));
         } else {
             repo = remoteName;
-            versioning = new TagVersioning(tag);
+            versioning = new TagVersioning(version);
         }
     }
 
@@ -92,13 +128,16 @@ public String getVersionPart() {
         return versioning.toString();
     }
 
+    /**
+     * @return canonical name for the image
+     */
+    public String asCanonicalNameString() {
+        return getUnversionedPart() + versioning.getSeparator() + versioning.toString();
+    }
+
     @Override
     public String toString() {
-        if (versioning == null) {
-            return getUnversionedPart();
-        } else {
-            return getUnversionedPart() + versioning.getSeparator() + versioning.toString();
-        }
+        return asCanonicalNameString();
     }
 
     /**
@@ -111,10 +150,6 @@ public void assertValid() {
         if (!REPO_NAME.matcher(repo).matches()) {
             throw new IllegalArgumentException(repo + " is not a valid Docker image name (in " + rawName + ")");
         }
-        if (versioning == null) {
-            throw new IllegalArgumentException("No image tag was specified in docker image name " +
-                "(" + rawName + "). Please provide a tag; this may be 'latest' or a specific version");
-        }
         if (!versioning.isValid()) {
             throw new IllegalArgumentException(versioning + " is not a valid image versioning identifier (in " + rawName + ")");
         }
@@ -124,8 +159,13 @@ public String getRegistry() {
         return registry;
     }
 
+    public DockerImageName withTag(final String newTag) {
+        return new DockerImageName(rawName, registry, repo, new TagVersioning(newTag));
+    }
+
     private interface Versioning {
         boolean isValid();
+
         String getSeparator();
     }
 
@@ -155,7 +195,7 @@ public String toString() {
     }
 
     @Data
-    private class Sha256Versioning implements Versioning {
+    private static class Sha256Versioning implements Versioning {
         public static final String HASH_REGEX = "[0-9a-fA-F]{32,}";
         private final String hash;
 
diff --git a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
index 240a6d5afb4..fe12e9f541d 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
@@ -1,7 +1,6 @@
 package org.testcontainers.utility;
 
 import lombok.NonNull;
-
 import org.apache.commons.lang.SystemUtils;
 import org.slf4j.Logger;
 
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 0a0728e9306..3448e73dce3 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -14,7 +14,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Sets;
-
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
@@ -22,6 +21,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -72,7 +72,7 @@ private ResourceReaper() {
 
     @SneakyThrows(InterruptedException.class)
     public static String start(String hostIpAddress, DockerClient client) {
-        String ryukImage = TestcontainersConfiguration.getInstance().getRyukImage();
+        String ryukImage = TestcontainersConfiguration.getInstance().getRyukDockerImageName().asCanonicalNameString();
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
         List<Bind> binds = new ArrayList<>();
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index aa829573447..1939e8e21b3 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -63,50 +63,95 @@ public String getAmbassadorContainerImage() {
         return (String) properties.getOrDefault("ambassador.container.image", "richnorth/ambassador:latest");
     }
 
+    @Deprecated
     public String getSocatContainerImage() {
         return (String) properties.getOrDefault("socat.container.image", "alpine/socat:latest");
     }
 
+    public DockerImageName getSocatDockerImageName() {
+        return DockerImageName.parse(getSocatContainerImage());
+    }
+
+    @Deprecated
     public String getVncRecordedContainerImage() {
         return (String) properties.getOrDefault("vncrecorder.container.image", "testcontainers/vnc-recorder:1.1.0");
     }
 
+    public DockerImageName getVncDockerImageName() {
+        return DockerImageName.parse(getVncRecordedContainerImage());
+    }
+
+    @Deprecated
     public String getDockerComposeContainerImage() {
         return (String) properties.getOrDefault("compose.container.image", "docker/compose:1.24.1");
     }
 
+    public DockerImageName getDockerComposeDockerImageName() {
+        return DockerImageName.parse(getDockerComposeContainerImage());
+    }
+
+    @Deprecated
     public String getTinyImage() {
         return (String) properties.getOrDefault("tinyimage.container.image", "alpine:3.5");
     }
 
+    public DockerImageName getTinyDockerImageName() {
+        return DockerImageName.parse(getTinyImage());
+    }
+
     public boolean isRyukPrivileged() {
         return Boolean.parseBoolean((String) properties.getOrDefault("ryuk.container.privileged", "false"));
     }
 
+    @Deprecated
     public String getRyukImage() {
         return (String) properties.getOrDefault("ryuk.container.image", "testcontainers/ryuk:0.3.0");
     }
 
+    public DockerImageName getRyukDockerImageName() {
+        return DockerImageName.parse(getRyukImage());
+    }
+
+    @Deprecated
     public String getSSHdImage() {
         return (String) properties.getOrDefault("sshd.container.image", "testcontainers/sshd:1.0.0");
     }
 
+    public DockerImageName getSSHdDockerImageName() {
+        return DockerImageName.parse(getSSHdImage());
+    }
+
     public Integer getRyukTimeout() {
         return Integer.parseInt((String) properties.getOrDefault("ryuk.container.timeout", "30"));
     }
 
+    @Deprecated
     public String getKafkaImage() {
         return (String) properties.getOrDefault("kafka.container.image", "confluentinc/cp-kafka");
     }
 
+    public DockerImageName getKafkaDockerImageName() {
+        return DockerImageName.parse(getKafkaImage());
+    }
+
+    @Deprecated
     public String getPulsarImage() {
         return (String) properties.getOrDefault("pulsar.container.image", "apachepulsar/pulsar");
     }
 
+    public DockerImageName getPulsarDockerImageName() {
+        return DockerImageName.parse(getPulsarImage());
+    }
+
+    @Deprecated
     public String getLocalStackImage() {
         return (String) properties.getOrDefault("localstack.container.image", "localstack/localstack");
     }
 
+    public DockerImageName getLocalstackDockerImageName() {
+        return DockerImageName.parse(getLocalStackImage());
+    }
+
     public boolean isDisableChecks() {
         return Boolean.parseBoolean((String) environmentProperties.getOrDefault("checks.disable", "false"));
     }
diff --git a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
index 2da41a8344e..e4197c7c1f6 100644
--- a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
+++ b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
@@ -7,11 +7,13 @@
 import org.testcontainers.images.ImageData;
 import org.testcontainers.utility.DockerImageName;
 
+import static org.testcontainers.TestImages.TINY_IMAGE;
+
 public class OutOfPackageImagePullPolicyTest {
     @Test
     public void shouldSupportCustomPoliciesOutOfTestContainersPackage() {
         try (
-            GenericContainer<?> container = new GenericContainer<>()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withImagePullPolicy(new AbstractImagePullPolicy() {
                     @Override
                     protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
diff --git a/core/src/test/java/org/testcontainers/DaemonTest.java b/core/src/test/java/org/testcontainers/DaemonTest.java
index e339f30acc9..f08614c8cdc 100644
--- a/core/src/test/java/org/testcontainers/DaemonTest.java
+++ b/core/src/test/java/org/testcontainers/DaemonTest.java
@@ -10,6 +10,7 @@
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
+import static org.testcontainers.TestImages.TINY_IMAGE;
 
 /**
  * This test forks a new JVM, otherwise it's not possible to reliably diff the threads
@@ -19,10 +20,10 @@ public class DaemonTest {
     public static void main(String[] args) {
         Thread mainThread = Thread.currentThread();
 
-        GenericContainer genericContainer = null;
+        GenericContainer<?> genericContainer = null;
 
         try {
-            genericContainer = new GenericContainer().withCommand("top");
+            genericContainer = new GenericContainer<>(TINY_IMAGE).withCommand("top");
             genericContainer.start();
 
             Set<Thread> threads = new HashSet<>(Thread.getAllStackTraces().keySet());
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 04edd407959..030e4164f00 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -30,7 +30,7 @@ public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
         try {
             //remove tiny image, so it will be pulled during next command run
             dockFactory.client()
-                    .removeImageCmd(TestcontainersConfiguration.getInstance().getTinyImage())
+                    .removeImageCmd(TestcontainersConfiguration.getInstance().getTinyDockerImageName().asCanonicalNameString())
                     .withForce(true).exec();
         } catch (NotFoundException ignored) {
             // Do not fail if it's not pulled yet
diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
new file mode 100644
index 00000000000..3f16e88d882
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -0,0 +1,13 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+public interface TestImages {
+    DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
+    DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3");
+    DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
+    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.2");
+    DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
+    DockerImageName TINY_IMAGE = TestcontainersConfiguration.getInstance().getTinyDockerImageName();
+}
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 8c98b0730b0..d17b0709dfa 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -12,6 +12,7 @@
 import java.net.InetSocketAddress;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.TestImages.TINY_IMAGE;
 
 public class ExposedHostTest {
 
@@ -31,9 +32,9 @@ public static void setUpClass() throws Exception {
 
         server.start();
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
-        
+
         Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 80));
-        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));           
+        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));
     }
 
     @AfterClass
@@ -43,24 +44,33 @@ public static void tearDownClass() throws Exception {
 
     @Test
     public void testExposedHost() throws Exception {
-        assertResponse(new GenericContainer().withCommand("top"), server.getAddress().getPort());
+        assertResponse(new GenericContainer<>(TINY_IMAGE)
+            .withCommand("top"),
+            server.getAddress().getPort());
     }
 
     @Test
     public void testExposedHostWithNetwork() throws Exception {
         try (Network network = Network.newNetwork()) {
-            assertResponse(new GenericContainer().withNetwork(network).withCommand("top"), server.getAddress().getPort());
+            assertResponse(new GenericContainer<>(TINY_IMAGE)
+                .withNetwork(network)
+                .withCommand("top"),
+                server.getAddress().getPort());
         }
     }
-    
+
     @Test
     public void testExposedHostPortOnFixedInternalPorts() throws Exception {
-        assertResponse(new GenericContainer().withCommand("top"), 80);
-        assertResponse(new GenericContainer().withCommand("top"), 81);
-    }    
+        assertResponse(new GenericContainer<>(TINY_IMAGE)
+            .withCommand("top"),
+            80);
+        assertResponse(new GenericContainer<>(TINY_IMAGE)
+            .withCommand("top"),
+            81);
+    }
 
     @SneakyThrows
-    protected void assertResponse(GenericContainer container, int port) {
+    protected void assertResponse(GenericContainer<?> container, int port) {
         try {
             container.start();
 
diff --git a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
index 15a9eba7d17..63993bc24ff 100644
--- a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
+++ b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 134bdf18f30..5008ba5baca 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -11,6 +11,7 @@
 import org.assertj.core.api.Assumptions;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.TestImages;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
@@ -28,7 +29,7 @@ public void shouldReportOOMAfterWait() {
         // Poor man's rootless Docker detection :D
         Assumptions.assumeThat(info.getDriver()).doesNotContain("vfs");
         try (
-            GenericContainer container = new GenericContainer<>()
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
                 .waitingFor(new WaitForExitedState(ContainerState::getOOMKilled))
                 .withCreateContainerCmdModifier(it -> {
@@ -49,7 +50,7 @@ public void shouldReportOOMAfterWait() {
     @Test
     public void shouldReportErrorAfterWait() {
         try (
-            GenericContainer container = new GenericContainer<>()
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
                 .waitingFor(new WaitForExitedState(state -> state.getExitCode() > 0))
                 .withCommand("sh", "-c", "usleep 100; exit 123")
diff --git a/core/src/test/java/org/testcontainers/containers/NetworkTest.java b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
index b717b8dc81a..a39f0552a5a 100644
--- a/core/src/test/java/org/testcontainers/containers/NetworkTest.java
+++ b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
@@ -5,9 +5,11 @@
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.Network;
+import org.testcontainers.TestImages;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
 import static org.testcontainers.containers.Network.newNetwork;
 
 @RunWith(Enclosed.class)
@@ -19,13 +21,13 @@ public static class WithRules {
         public Network network = newNetwork();
 
         @Rule
-        public GenericContainer foo = new GenericContainer()
+        public GenericContainer<?> foo = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withNetwork(network)
                 .withNetworkAliases("foo")
                 .withCommand("/bin/sh", "-c", "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done");
 
         @Rule
-        public GenericContainer bar = new GenericContainer()
+        public GenericContainer<?> bar = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withNetwork(network)
                 .withCommand("top");
 
@@ -44,12 +46,12 @@ public void testNetworkSupport() throws Exception {
             try (
                     Network network = Network.newNetwork();
 
-                    GenericContainer foo = new GenericContainer()
+                    GenericContainer<?> foo = new GenericContainer<>(TestImages.TINY_IMAGE)
                             .withNetwork(network)
                             .withNetworkAliases("foo")
                             .withCommand("/bin/sh", "-c", "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done");
 
-                    GenericContainer bar = new GenericContainer()
+                    GenericContainer<?> bar = new GenericContainer<>(TestImages.TINY_IMAGE)
                             .withNetwork(network)
                             .withCommand("top")
             ) {
@@ -63,11 +65,11 @@ public void testNetworkSupport() throws Exception {
         }
 
         @Test
-        public void testBuilder() throws Exception {
+        public void testBuilder() {
             try (
                     Network network = Network.builder()
                             .driver("macvlan")
-                            .build();
+                            .build()
             ) {
                 String id = network.getId();
                 assertEquals(
@@ -79,11 +81,11 @@ public void testBuilder() throws Exception {
         }
 
         @Test
-        public void testModifiers() throws Exception {
+        public void testModifiers() {
             try (
                     Network network = Network.builder()
                             .createNetworkCmdModifier(cmd -> cmd.withDriver("macvlan"))
-                            .build();
+                            .build()
             ) {
                 String id = network.getId();
                 assertEquals(
@@ -95,7 +97,7 @@ public void testModifiers() throws Exception {
         }
 
         @Test
-        public void testReusability() throws Exception {
+        public void testReusability() {
             try (Network network = Network.newNetwork()) {
                 String firstId = network.getId();
                 assertNotNull(
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index b2d4d327ba2..c212d04c33a 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -3,7 +3,12 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
@@ -35,7 +40,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -45,14 +49,11 @@
 import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
+import static org.testcontainers.TestImages.TINY_IMAGE;
 
 @RunWith(Enclosed.class)
 public class ReusabilityUnitTests {
 
-    static final CompletableFuture<String> IMAGE_FUTURE = CompletableFuture.completedFuture(
-        TestcontainersConfiguration.getInstance().getTinyImage()
-    );
-
     @RunWith(Parameterized.class)
     @RequiredArgsConstructor
     @FieldDefaults(makeFinal = true)
@@ -61,8 +62,8 @@ public static class CanBeReusedTest {
         @Parameterized.Parameters(name = "{0}")
         public static Object[][] data() {
             return new Object[][] {
-                { "generic", new GenericContainer(IMAGE_FUTURE), true },
-                { "anonymous generic", new GenericContainer(IMAGE_FUTURE) {}, true },
+                { "generic", new GenericContainer<>(TINY_IMAGE), true },
+                { "anonymous generic", new GenericContainer(TINY_IMAGE) {}, true },
                 { "custom", new CustomContainer(), true },
                 { "anonymous custom", new CustomContainer() {}, true },
                 { "custom with containerIsCreated", new CustomContainerWithContainerIsCreated(), false },
@@ -84,16 +85,16 @@ public void shouldBeReusable() {
             }
         }
 
-        static class CustomContainer extends GenericContainer {
+        static class CustomContainer extends GenericContainer<CustomContainer> {
             CustomContainer() {
-                super(IMAGE_FUTURE);
+                super(TINY_IMAGE);
             }
         }
 
-        static class CustomContainerWithContainerIsCreated extends GenericContainer {
+        static class CustomContainerWithContainerIsCreated extends GenericContainer<CustomContainerWithContainerIsCreated> {
 
             CustomContainerWithContainerIsCreated() {
-                super(IMAGE_FUTURE);
+                super(TINY_IMAGE);
             }
 
             @Override
@@ -109,7 +110,7 @@ public static class HooksTest extends AbstractReusabilityTest {
 
         List<String> script = new ArrayList<>();
 
-        GenericContainer<?> container = makeReusable(new GenericContainer(IMAGE_FUTURE) {
+        GenericContainer<?> container = makeReusable(new GenericContainer(TINY_IMAGE) {
 
             @Override
             protected boolean canBeReused() {
@@ -188,7 +189,7 @@ public void shouldNotCallHookIfNotReused() {
     @FieldDefaults(makeFinal = true)
     public static class HashTest extends AbstractReusabilityTest {
 
-        protected GenericContainer<?> container = makeReusable(new GenericContainer(IMAGE_FUTURE) {
+        protected GenericContainer<?> container = makeReusable(new GenericContainer(TINY_IMAGE) {
             @Override
             public void copyFileToContainer(MountableFile mountableFile, String containerPath) {
                 // NOOP
@@ -296,7 +297,7 @@ public void shouldHashCopiedFiles() {
     @RunWith(BlockJUnit4ClassRunner.class)
     @FieldDefaults(makeFinal = true)
     public static class CopyFilesHashTest {
-        GenericContainer<?> container = new GenericContainer(IMAGE_FUTURE);
+        GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE);
 
         @Test
         public void empty() {
diff --git a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
index ad0e4c76ae2..05ef7373293 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
@@ -7,6 +7,7 @@
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.ALPINE_IMAGE;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
@@ -15,7 +16,7 @@ public class ContainerLogsTest {
     @Test
     @Ignore("fails due to the timing of the shell's decision to flush")
     public void getLogsReturnsAllLogsToDate() {
-        try (GenericContainer container = shortLivedContainer()) {
+        try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
             final String logs = container.getLogs();
@@ -25,7 +26,7 @@ public void getLogsReturnsAllLogsToDate() {
 
     @Test
     public void getLogsContainsBothOutputTypes() {
-        try (GenericContainer container = shortLivedContainer()) {
+        try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
             // docsGetAllLogs {
@@ -38,7 +39,7 @@ public void getLogsContainsBothOutputTypes() {
 
     @Test
     public void getLogsReturnsStdOutToDate() {
-        try (GenericContainer container = shortLivedContainer()) {
+        try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
             // docsGetStdOut {
@@ -50,7 +51,7 @@ public void getLogsReturnsStdOutToDate() {
 
     @Test
     public void getLogsReturnsStdErrToDate() {
-        try (GenericContainer container = shortLivedContainer()) {
+        try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
             // docsGetStdErr {
@@ -62,7 +63,7 @@ public void getLogsReturnsStdErrToDate() {
 
     @Test
     public void getLogsForLongRunningContainer() throws InterruptedException {
-        try (GenericContainer container = longRunningContainer()) {
+        try (GenericContainer<?> container = longRunningContainer()) {
             container.start();
 
             Thread.sleep(1000L);
@@ -72,14 +73,14 @@ public void getLogsForLongRunningContainer() throws InterruptedException {
         }
     }
 
-    private static GenericContainer shortLivedContainer() {
-        return new GenericContainer("alpine:3.3")
+    private static GenericContainer<?> shortLivedContainer() {
+        return new GenericContainer<>(ALPINE_IMAGE)
             .withCommand("/bin/sh", "-c", "echo -n 'stdout' && echo -n 'stderr' 1>&2")
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
     }
 
-    private static GenericContainer longRunningContainer() {
-        return new GenericContainer("alpine:3.3")
+    private static GenericContainer<?> longRunningContainer() {
+        return new GenericContainer<>(ALPINE_IMAGE)
             .withCommand("ping -c 100 127.0.0.1");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
index 4d7a4e21133..a43a001ca5b 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
@@ -16,6 +16,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.testcontainers.TestImages.TINY_IMAGE;
+
 /**
  * Test that event streaming from the {@link DockerClient} works correctly
  */
@@ -32,7 +34,7 @@ public void test() throws IOException, InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
 
         try (
-            GenericContainer container = new GenericContainer<>()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withCommand("true")
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
         ) {
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index 6e319838888..fd936d26c19 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -5,11 +5,12 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 @RunWith(Parameterized.class)
 public class ImagePullTest {
 
-    private String image;
+    private final String image;
 
     @Parameterized.Parameters(name = "{0}")
     public static String[] parameters() {
@@ -34,7 +35,7 @@ public ImagePullTest(String image) {
 
     @Test
     public void test() {
-        try (final GenericContainer container = new GenericContainer<>(image)
+        try (final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(image))
             .withCommand("/bin/sh", "-c", "sleep 0")
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy())) {
             container.start();
diff --git a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
index 20b52798d40..e073fa0522a 100644
--- a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
@@ -13,7 +13,7 @@
 
 public class AgeBasedPullPolicyTest {
 
-    final DockerImageName imageName = new DockerImageName(UUID.randomUUID().toString());
+    final DockerImageName imageName = DockerImageName.parse(UUID.randomUUID().toString());
 
     @Test
     public void shouldPull() {
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
index 69e68f7f225..9b22f5e6166 100644
--- a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -1,12 +1,9 @@
 package org.testcontainers.images;
 
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.core.command.PushImageResultCallback;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -23,20 +20,24 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
+
 public class ImagePullPolicyTest {
 
     @ClassRule
-    public static GenericContainer<?> registry = new GenericContainer<>("registry:2")
+    public static GenericContainer<?> registry = new GenericContainer<>(DOCKER_REGISTRY_IMAGE)
         .withExposedPorts(5000);
 
-    private static String imageName;
+    private static DockerImageName imageName;
 
     @BeforeClass
     public static void beforeClass() throws Exception {
         String testRegistryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
         String testImageName = testRegistryAddress + "/image-pull-policy-test";
         String tag = UUID.randomUUID().toString();
-        imageName = testImageName + ":" + tag;
+        imageName = DockerImageName.parse(testImageName).withTag(tag);
 
         DockerClient client = DockerClientFactory.instance().client();
         String dummySourceImage = "hello-world:latest";
@@ -47,28 +48,22 @@ public static void beforeClass() throws Exception {
         // push the image to the registry
         client.tagImageCmd(dummyImageId, testImageName, tag).exec();
 
-        client.pushImageCmd(imageName)
-            .exec(new PushImageResultCallback())
+        client.pushImageCmd(imageName.asCanonicalNameString())
+            .exec(new ResultCallback.Adapter<>())
             .awaitCompletion(1, TimeUnit.MINUTES);
     }
 
     @AfterClass
     public static void afterClass() {
-        try {
-            DockerClientFactory.instance().client().removeImageCmd(imageName).withForce(true).exec();
-        } catch (NotFoundException ignored) {
-        }
+        removeImage();
     }
 
     @Before
     public void setUp() {
         // Clean up local cache
-        try {
-            DockerClientFactory.instance().client().removeImageCmd(imageName).withForce(true).exec();
-        } catch (NotFoundException ignored) {
-        }
+        removeImage();
 
-        LocalImagesCache.INSTANCE.cache.remove(new DockerImageName(imageName));
+        LocalImagesCache.INSTANCE.cache.remove(imageName);
     }
 
     @Test
@@ -90,7 +85,7 @@ public void shouldAlwaysPull() {
             container.start();
         }
 
-        DockerClientFactory.instance().client().removeImageCmd(imageName).withForce(true).exec();
+        removeImage();
 
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
@@ -175,4 +170,13 @@ private void expectToFailWithNotFoundException(GenericContainer<?> container) {
         }
     }
 
+    private static void removeImage() {
+        try {
+            DockerClientFactory.instance().client()
+                .removeImageCmd(imageName.asCanonicalNameString())
+                .withForce(true)
+                .exec();
+        } catch (NotFoundException ignored) {
+        }
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
index 6b6a82559bf..d2ea3e7188a 100644
--- a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
+++ b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
@@ -1,23 +1,24 @@
 package org.testcontainers.images;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Test;
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LazyFuture;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
 public class RemoteDockerImageTest {
 
     @Test
     public void toStringContainsOnlyImageName() {
         String imageName = Base58.randomString(8).toLowerCase();
-        RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageName);
+        RemoteDockerImage remoteDockerImage = new RemoteDockerImage(DockerImageName.parse(imageName));
         assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
     }
 
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
index faf5fb950b8..b99a70a7650 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
@@ -1,21 +1,21 @@
 package org.testcontainers.images.builder;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.rnorth.visibleassertions.VisibleAssertions.fail;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
+import com.github.dockerjava.api.exception.DockerClientException;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.utility.DockerImageName;
 
-import com.github.dockerjava.api.exception.DockerClientException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.rnorth.visibleassertions.VisibleAssertions.fail;
 
 public class DockerignoreTest {
-    
+
     private static final Path INVALID_DOCKERIGNORE_PATH = Paths.get("src/test/resources/dockerfile-build-invalid");
-    
+
     @Test
     public void testInvalidDockerignore() throws Exception {
         try {
@@ -24,13 +24,13 @@ public void testInvalidDockerignore() throws Exception {
                 .withDockerfile(INVALID_DOCKERIGNORE_PATH.resolve("Dockerfile"))
                 .get();
             fail("Should not be able to build an image with an invalid .dockerignore file");
-        } 
+        }
         catch (DockerClientException e) {
             if (!e.getMessage().contains("Invalid pattern"))
                 throw e;
         }
     }
-    
+
     @SuppressWarnings("resource")
     @Test
     public void testValidDockerignore() throws Exception {
@@ -38,7 +38,7 @@ public void testValidDockerignore() throws Exception {
                 .withFileFromPath(".", DockerfileBuildTest.RESOURCE_PATH)
                 .withDockerfile(DockerfileBuildTest.RESOURCE_PATH.resolve("Dockerfile-currentdir"));
         try(
-            final GenericContainer<?> container = new GenericContainer<>(img.get())
+            final GenericContainer<?> container = new GenericContainer(DockerImageName.parse(img.get()))
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
             .withCommand("ls", "/")
         ) {
@@ -46,11 +46,11 @@ public void testValidDockerignore() throws Exception {
             container.start();
 
             final String logs = container.getLogs();
-            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs, 
+            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
                     logs.contains("should_not_be_ignored.txt"));
-            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs, 
+            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
                     !logs.contains("should_be_ignored.txt"));
         }
     }
-    
+
 }
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index ed6ee561505..b0ed90d9c9e 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -11,6 +11,7 @@
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.TINY_IMAGE;
 
 public class CopyFileToContainerTest {
     private static String containerPath = "/tmp/mappable-resource/";
@@ -19,7 +20,7 @@ public class CopyFileToContainerTest {
     @Test
     public void checkFileCopied() throws IOException, InterruptedException {
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withCommand("sleep", "3000")
                 .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
         ) {
@@ -32,7 +33,7 @@ public void checkFileCopied() throws IOException, InterruptedException {
     @Test
     public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withCommand("sleep", "3000")
                 .withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
         ) {
@@ -45,7 +46,7 @@ public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
     @Test
     public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
         String resource = "/test_copy_to_container.txt";
-        GenericContainer<?> container = new GenericContainer<>()
+        GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
             .withClasspathResourceMapping(resource, "/readOnly", BindMode.READ_ONLY)
             .withClasspathResourceMapping(resource, "/readOnlyNoSelinux", BindMode.READ_ONLY)
 
@@ -64,7 +65,7 @@ public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
     public void shouldCreateFoldersStructureWithCopy() throws Exception {
         String resource = "/test_copy_to_container.txt";
         try (
-            GenericContainer container = new GenericContainer<>()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withCommand("sleep", "3000")
                 .withClasspathResourceMapping(resource, "/a/b/c/file", BindMode.READ_ONLY)
         ) {
diff --git a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
index 4f2ee01bc6d..bd82c58a7f7 100644
--- a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
@@ -16,6 +16,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.testcontainers.TestImages.TINY_IMAGE;
+
 public class DependenciesTest {
 
     @Test
@@ -23,7 +25,7 @@ public void shouldWorkWithSimpleDependency() {
         InvocationCountingStartable startable = new InvocationCountingStartable();
 
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable)
         ) {
@@ -40,7 +42,7 @@ public void shouldWorkWithMutlipleDependencies() {
         InvocationCountingStartable startable2 = new InvocationCountingStartable();
 
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable1, startable2)
         ) {
@@ -56,7 +58,7 @@ public void shouldStartEveryTime() {
         InvocationCountingStartable startable = new InvocationCountingStartable();
 
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable)
         ) {
@@ -83,7 +85,7 @@ public void shouldStartTransitiveDependencies() {
         startable.getDependencies().add(transitiveStartable);
 
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable)
         ) {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
index 873160bdbc9..59c2a63127c 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
@@ -2,12 +2,13 @@
 
 import com.github.dockerjava.api.model.NetworkSettings;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.*;
+import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.TINY_IMAGE;
 
 /**
  * Simple tests of named network modes - more may be possible, but may not be reproducible
@@ -19,7 +20,7 @@ public class DockerNetworkModeTest {
     @Test
     public void testNoNetworkContainer() {
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .withCommand("true")
                 .withNetworkMode("none")
@@ -35,7 +36,7 @@ public void testNoNetworkContainer() {
     @Test
     public void testHostNetworkContainer() {
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .withCommand("true")
                 .withNetworkMode("host")
diff --git a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
index 95de9ef1b85..5e12fafc064 100644
--- a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
@@ -12,6 +12,7 @@
 import java.io.IOException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.ALPINE_IMAGE;
 
 public class FileOperationsTest {
 
@@ -21,7 +22,7 @@ public class FileOperationsTest {
     @Test
     public void copyFileToContainerFileTest() throws Exception {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer("alpine:3.2")
+            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
                 .withCommand("top")
         ) {
             alpineCopyToContainer.start();
@@ -39,7 +40,7 @@ public void copyFileToContainerFileTest() throws Exception {
     @Test
     public void copyFileToContainerFolderTest() throws Exception {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer("alpine:3.2")
+            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
                 .withCommand("top")
         ) {
             alpineCopyToContainer.start();
@@ -57,7 +58,7 @@ public void copyFileToContainerFolderTest() throws Exception {
     @Test
     public void copyFolderToContainerFolderTest() throws Exception {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer("alpine:3.2")
+            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
                 .withCommand("top")
         ) {
 
@@ -76,7 +77,7 @@ public void copyFolderToContainerFolderTest() throws Exception {
     @Test(expected = NotFoundException.class)
     public void copyFromContainerShouldFailBecauseNoFileTest() throws NotFoundException {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer("alpine:3.2")
+            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
                 .withCommand("top")
         ) {
             alpineCopyToContainer.start();
@@ -87,7 +88,7 @@ public void copyFromContainerShouldFailBecauseNoFileTest() throws NotFoundExcept
     @Test
     public void shouldCopyFileFromContainerTest() throws IOException {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer("alpine:3.2")
+            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
                 .withCommand("top")
         ) {
 
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index 5fe49756ba1..34c039b4fd3 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -1,8 +1,5 @@
 package org.testcontainers.junit;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
@@ -15,6 +12,10 @@
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.testcontainers.TestImages.TINY_IMAGE;
+
 /**
  * Test of {@link FixedHostPortGenericContainer}. Note that this is not an example of typical use (usually, a container
  * should be a field on the test class annotated with @Rule or @TestRule). Instead, here, the lifecycle of the container
@@ -46,7 +47,7 @@ public void testFixedHostPortMapping() throws IOException {
         // first find a free port on the docker host that will work for testing
         final Integer unusedHostPort;
         try (
-            final GenericContainer echoServer = new GenericContainer<>(TEST_IMAGE)
+            final GenericContainer echoServer = new GenericContainer(TINY_IMAGE)
                 .withExposedPorts(TEST_PORT)
                 .withCommand("/bin/sh", "-c", HTTP_ECHO_CMD)
         ) {
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index b450244a84d..c13421029e0 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -6,10 +6,19 @@
 import com.mongodb.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import com.rabbitmq.client.*;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.DefaultConsumer;
+import com.rabbitmq.client.Envelope;
 import org.apache.commons.io.FileUtils;
 import org.bson.Document;
-import org.junit.*;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.Container;
@@ -18,7 +27,13 @@
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.TestEnvironment;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
 import java.net.Socket;
 import java.time.Duration;
 import java.util.Arrays;
@@ -30,7 +45,16 @@
 
 import static java.util.Collections.singletonMap;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.ALPINE_IMAGE;
+import static org.testcontainers.TestImages.MONGODB_IMAGE;
+import static org.testcontainers.TestImages.RABBITMQ_IMAGE;
+import static org.testcontainers.TestImages.REDIS_IMAGE;
+import static org.testcontainers.TestImages.TINY_IMAGE;
 import static org.testcontainers.containers.BindMode.READ_ONLY;
 import static org.testcontainers.containers.BindMode.READ_WRITE;
 import static org.testcontainers.containers.SelinuxContext.SHARED;
@@ -47,6 +71,7 @@ public class GenericContainerRuleTest {
     private static final int RABBITMQ_PORT = 5672;
     private static final int MONGO_PORT = 27017;
 
+
     /*
      * Test data setup
      */
@@ -61,29 +86,27 @@ public static void setupContent() throws FileNotFoundException {
      * Redis
      */
     @ClassRule
-    public static GenericContainer redis = new GenericContainer("redis:3.0.2")
+    public static GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
             .withExposedPorts(REDIS_PORT);
 
     /**
      * RabbitMQ
      */
     @ClassRule
-    public static GenericContainer rabbitMq = new GenericContainer("rabbitmq:3.5.3")
+    public static GenericContainer<?> rabbitMq = new GenericContainer<>(RABBITMQ_IMAGE)
             .withExposedPorts(RABBITMQ_PORT);
-
     /**
      * MongoDB
      */
     @ClassRule
-    public static GenericContainer mongo = new GenericContainer("mongo:3.1.5")
+    public static GenericContainer<?> mongo = new GenericContainer<>(MONGODB_IMAGE)
             .withExposedPorts(MONGO_PORT);
-
     /**
      * Pass an environment variable to the container, then run a shell script that exposes the variable in a quick and
      * dirty way for testing.
      */
     @ClassRule
-    public static GenericContainer alpineEnvVar = new GenericContainer<>("alpine:3.2")
+    public static GenericContainer<?> alpineEnvVar = new GenericContainer<>(ALPINE_IMAGE)
             .withExposedPorts(80)
             .withEnv("MAGIC_NUMBER", "4")
             .withEnv("MAGIC_NUMBER", oldValue -> oldValue.orElse("") + "2")
@@ -94,7 +117,7 @@ public static void setupContent() throws FileNotFoundException {
      * dirty way for testing.
      */
     @ClassRule
-    public static GenericContainer alpineEnvVarFromMap = new GenericContainer("alpine:3.2")
+    public static GenericContainer<?> alpineEnvVarFromMap = new GenericContainer<>(ALPINE_IMAGE)
             .withExposedPorts(80)
             .withEnv(ImmutableMap.of(
                     "FIRST", "42",
@@ -106,7 +129,7 @@ public static void setupContent() throws FileNotFoundException {
      * Map a file on the classpath to a file in the container, and then expose the content for testing.
      */
     @ClassRule
-    public static GenericContainer alpineClasspathResource = new GenericContainer("alpine:3.2")
+    public static GenericContainer<?> alpineClasspathResource = new GenericContainer<>(ALPINE_IMAGE)
             .withExposedPorts(80)
             .withClasspathResourceMapping("mappable-resource/test-resource.txt", "/content.txt", READ_ONLY)
             .withCommand("/bin/sh", "-c", "while true; do cat /content.txt | nc -l -p 80; done");
@@ -115,7 +138,7 @@ public static void setupContent() throws FileNotFoundException {
      * Map a file on the classpath to a file in the container, and then expose the content for testing.
      */
     @ClassRule
-    public static GenericContainer alpineClasspathResourceSelinux = new GenericContainer("alpine:3.2")
+    public static GenericContainer<?> alpineClasspathResourceSelinux = new GenericContainer<>(ALPINE_IMAGE)
             .withExposedPorts(80)
             .withClasspathResourceMapping("mappable-resource/test-resource.txt", "/content.txt", READ_WRITE, SHARED)
             .withCommand("/bin/sh", "-c", "while true; do cat /content.txt | nc -l -p 80; done");
@@ -124,14 +147,16 @@ public static void setupContent() throws FileNotFoundException {
      * Create a container with an extra host entry and expose the content of /etc/hosts for testing.
      */
     @ClassRule
-    public static GenericContainer alpineExtrahost = new GenericContainer("alpine:3.2")
+    public static GenericContainer<?> alpineExtrahost = new GenericContainer<>(ALPINE_IMAGE)
             .withExposedPorts(80)
             .withExtraHost("somehost", "192.168.1.10")
             .withCommand("/bin/sh", "-c", "while true; do cat /etc/hosts | nc -l -p 80; done");
 
     @Test
     public void testIsRunning() {
-        try (GenericContainer container = new GenericContainer().withCommand("top")) {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            .withCommand("top")) {
             assertFalse("Container is not started and not running", container.isRunning());
             container.start();
             assertTrue("Container is started and running", container.isRunning());
@@ -141,7 +166,7 @@ public void testIsRunning() {
     @Test
     public void withTmpFsTest() throws Exception {
         try (
-            GenericContainer container = new GenericContainer()
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
                 .withCommand("top")
                 .withTmpFs(singletonMap("/testtmpfs", "rw"))
         ) {
@@ -222,7 +247,7 @@ public void environmentFromMapTest() throws IOException {
 
     @Test
     public void customLabelTest() {
-        try (final GenericContainer alpineCustomLabel = new GenericContainer("alpine:3.2")
+        try (final GenericContainer alpineCustomLabel = new GenericContainer<>(ALPINE_IMAGE)
             .withLabel("our.custom", "label")
             .withCommand("top")) {
 
@@ -240,7 +265,7 @@ public void exceptionThrownWhenTryingToOverrideTestcontainersLabels() {
         assertThrows("When trying to overwrite an 'org.testcontainers' label, withLabel() throws an exception",
             IllegalArgumentException.class,
             () -> {
-                new GenericContainer("alpine:3.2")
+                new GenericContainer<>(ALPINE_IMAGE)
                     .withLabel("org.testcontainers.foo", "false");
             }
         );
@@ -262,7 +287,7 @@ public void customClasspathResourceMappingWithSelinuxTest() throws IOException {
     }
 
     @Test
-    public void exceptionThrownWhenMappedPortNotFound() throws IOException {
+    public void exceptionThrownWhenMappedPortNotFound() {
         assertThrows("When the requested port is not mapped, getMappedPort() throws an exception",
                 IllegalArgumentException.class,
                 () -> {
@@ -279,10 +304,10 @@ protected static void writeStringToFile(File contentFolder, String filename, Str
     }
 
     @Test @Ignore //TODO investigate intermittent failures
-    public void failFastWhenContainerHaltsImmediately() throws Exception {
+    public void failFastWhenContainerHaltsImmediately() {
 
         long startingTimeMs = System.currentTimeMillis();
-        final GenericContainer failsImmediately = new GenericContainer("alpine:3.2")
+        final GenericContainer failsImmediately = new GenericContainer<>(ALPINE_IMAGE)
               .withCommand("/bin/sh", "-c", "return false")
               .withMinimumRunningDuration(Duration.ofMillis(100));
 
@@ -346,7 +371,7 @@ public void createContainerCmdHookTest() {
         // Use random name to avoid the conflicts between the tests
         String randomName = Base58.randomString(5);
         try(
-                GenericContainer container = new GenericContainer<>("redis:3.0.2")
+                GenericContainer<?> container = new GenericContainer<>(REDIS_IMAGE)
                         .withCommand("redis-server", "--help")
                         .withCreateContainerCmdModifier(cmd -> cmd.withName("overrideMe"))
                         // Preserves the order
@@ -390,7 +415,7 @@ public void addingExposedPortTwiceShouldNotFail() {
 
     @Test
     public void sharedMemorySetTest() {
-        try (GenericContainer containerWithSharedMemory = new GenericContainer()
+        try (GenericContainer containerWithSharedMemory = new GenericContainer<>(TINY_IMAGE)
             .withSharedMemorySize(42L * FileUtils.ONE_MB)
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy())) {
 
diff --git a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
index d842829b4b6..95047779551 100644
--- a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.ContainerFetchException;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 
@@ -16,7 +17,7 @@ public void pullingNonExistentImageFailsGracefully() {
 
         assertThrows("Pulling a nonexistent container will cause an exception to be thrown",
                 ContainerFetchException.class, () -> {
-                    new GenericContainer("richnorth/nonexistent:latest").getDockerImageName();
+                    new GenericContainer<>(DockerImageName.parse("testcontainers/nonexistent:latest")).getDockerImageName();
                 });
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
index 83ba05be86e..649a0b56fc4 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
@@ -14,7 +14,10 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.ALPINE_IMAGE;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
 /**
@@ -23,7 +26,7 @@
 public class OutputStreamTest {
 
     @Rule
-    public GenericContainer container = new GenericContainer("alpine:3.2")
+    public GenericContainer container = new GenericContainer(ALPINE_IMAGE)
             .withCommand("ping -c 5 127.0.0.1");
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OutputStreamTest.class);
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
index 0e7b66534b7..b15f63f4158 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
@@ -15,14 +15,17 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.ALPINE_IMAGE;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
 @Slf4j
 public class OutputStreamWithTTYTest {
 
     @Rule
-    public GenericContainer container = new GenericContainer<>("alpine:3.2")
+    public GenericContainer<?> container = new GenericContainer<>(ALPINE_IMAGE)
         .withCommand("ls -1")
         .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
         .withCreateContainerCmdModifier(command -> command.withTty(true));
diff --git a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
index 30230cc12ff..b23ddf2ca1c 100644
--- a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
+++ b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
@@ -6,6 +6,7 @@
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.ALPINE_IMAGE;
 
 /**
  * Created by rnorth on 26/07/2016.
@@ -13,7 +14,7 @@
 public class WorkingDirectoryTest {
 
     @ClassRule
-    public static GenericContainer container = new GenericContainer("alpine:3.2")
+    public static GenericContainer container = new GenericContainer(ALPINE_IMAGE)
             .withWorkingDirectory("/etc")
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
             .withCommand("ls", "-al");
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
index 3d3c2f0606d..480536a54ef 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
@@ -4,6 +4,7 @@
 import org.junit.Before;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.rnorth.visibleassertions.VisibleAssertions;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
@@ -20,7 +21,6 @@
  */
 public abstract class AbstractWaitStrategyTest<W extends WaitStrategy> {
     static final long WAIT_TIMEOUT_MILLIS = 3000;
-    static final String IMAGE_NAME = "alpine:3.7";
 
     /**
      * Indicates that the WaitStrategy has completed waiting successfully.
@@ -38,36 +38,36 @@ public abstract class AbstractWaitStrategyTest<W extends WaitStrategy> {
     protected abstract W buildWaitStrategy(final AtomicBoolean ready);
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         ready = new AtomicBoolean(false);
     }
 
     /**
-     * Starts a GenericContainer with the {@link #IMAGE_NAME} image, passing the given {@code shellCommand} as
+     * Starts a GenericContainer with the Alpine image, passing the given {@code shellCommand} as
      * a parameter to {@literal sh -c} (the container CMD).
      *
      * @param shellCommand the shell command to execute
      * @return the (unstarted) container
      */
-    private GenericContainer startContainerWithCommand(String shellCommand) {
+    private GenericContainer<?> startContainerWithCommand(String shellCommand) {
         return startContainerWithCommand(shellCommand, buildWaitStrategy(ready));
     }
 
     /**
-     * Starts a GenericContainer with the {@link #IMAGE_NAME} image, passing the given {@code shellCommand} as
+     * Starts a GenericContainer with the Alpine image, passing the given {@code shellCommand} as
      * a parameter to {@literal sh -c} (the container CMD) and apply a give wait strategy.
      * Note that the timeout will be overwritten if any with {@link #WAIT_TIMEOUT_MILLIS}.
      * @param shellCommand the shell command to execute
      * @param waitStrategy The wait strategy to apply
      * @return the (unstarted) container
      */
-    protected GenericContainer startContainerWithCommand(String shellCommand, WaitStrategy waitStrategy) {
+    protected GenericContainer<?> startContainerWithCommand(String shellCommand, WaitStrategy waitStrategy) {
         return startContainerWithCommand(shellCommand, waitStrategy, 8080);
     }
 
-    protected GenericContainer startContainerWithCommand(String shellCommand, WaitStrategy waitStrategy, Integer... ports) {
+    protected GenericContainer<?> startContainerWithCommand(String shellCommand, WaitStrategy waitStrategy, Integer... ports) {
         // apply WaitStrategy to container
-        return new GenericContainer(IMAGE_NAME)
+        return new GenericContainer<>(TestImages.ALPINE_IMAGE)
                 .withExposedPorts(ports)
                 .withCommand("sh", "-c", shellCommand)
                 .waitingFor(waitStrategy.withStartupTimeout(Duration.ofMillis(WAIT_TIMEOUT_MILLIS)));
@@ -98,7 +98,7 @@ protected void waitUntilReadyAndTimeout(String shellCommand) {
      *
      * @param container the container to start
      */
-    protected void waitUntilReadyAndTimeout(GenericContainer container) {
+    protected void waitUntilReadyAndTimeout(GenericContainer<?> container) {
         // start() blocks until successful or timeout
         VisibleAssertions.assertThrows("an exception is thrown when timeout occurs (" + WAIT_TIMEOUT_MILLIS + "ms)",
                 ContainerLaunchException.class,
@@ -111,7 +111,7 @@ protected void waitUntilReadyAndTimeout(GenericContainer container) {
      *
      * @param container the container to start
      */
-    protected void waitUntilReadyAndSucceed(GenericContainer container) {
+    protected void waitUntilReadyAndSucceed(GenericContainer<?> container) {
         // start() blocks until successful or timeout
         container.start();
 
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
index d715b25aaf6..5c7d37a7da3 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -15,10 +16,8 @@
  */
 public class HostPortWaitStrategyTest {
 
-    private static final String IMAGE_NAME = "alpine:3.7";
-
     @ClassRule
-    public static GenericContainer container = new GenericContainer(IMAGE_NAME).withExposedPorts()
+    public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE).withExposedPorts()
         .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
         .withExposedPorts(8080)
         .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)));
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 3986255f248..0afb4d956a1 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -28,6 +28,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
 
 /**
  * This test checks the integration between Testcontainers and an authenticated registry, but uses
@@ -45,7 +46,7 @@ public class AuthenticatedImagePullTest {
     @ClassRule
     public static GenericContainer<?> authenticatedRegistry = new GenericContainer<>(new ImageFromDockerfile()
         .withDockerfileFromBuilder(builder -> {
-            builder.from("registry:2.7.0")
+            builder.from(DOCKER_REGISTRY_IMAGE.asCanonicalNameString())
                 .run("htpasswd -Bbn testuser notasecret > /htpasswd")
                 .env("REGISTRY_AUTH", "htpasswd")
                 .env("REGISTRY_AUTH_HTPASSWD_PATH", "/htpasswd")
@@ -69,7 +70,7 @@ public static void setUp() throws InterruptedException {
         testImageName = testRegistryAddress + "/alpine";
         testImageNameWithTag = testImageName + ":latest";
 
-        final DockerImageName expectedName = new DockerImageName(testImageNameWithTag);
+        final DockerImageName expectedName = DockerImageName.parse(testImageNameWithTag);
         final AuthConfig authConfig = new AuthConfig()
             .withUsername("testuser")
             .withPassword("notasecret")
@@ -99,7 +100,7 @@ public static void tearDown() {
     @Test
     public void testThatAuthLocatorIsUsedForContainerCreation() {
         // actually start a container, which will require an authenticated pull
-        try (final GenericContainer<?> container = new GenericContainer<>(testImageNameWithTag)
+        try (final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(testImageNameWithTag))
             .withCommand("/bin/sh", "-c", "sleep 10")) {
             container.start();
 
@@ -165,7 +166,7 @@ private Path getLocalTempFile(String s) throws IOException {
 
     private static void putImageInRegistry() throws InterruptedException {
         // It doesn't matter which image we use for this test, but use one that's likely to have been pulled already
-        final String dummySourceImage = TestcontainersConfiguration.getInstance().getRyukImage();
+        final String dummySourceImage = TestcontainersConfiguration.getInstance().getRyukDockerImageName().asCanonicalNameString();
 
         client.pullImageCmd(dummySourceImage)
             .exec(new PullImageResultCallback())
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index 54488773652..b0ed9428a5d 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -35,7 +35,7 @@ public static String[] getNames() {
 
         @Test
         public void testValidNameAccepted() {
-            new DockerImageName(imageName).assertValid();
+            DockerImageName.parse(imageName).assertValid();
         }
     }
 
@@ -56,7 +56,7 @@ public static String[] getNames() {
 
         @Test(expected = IllegalArgumentException.class)
         public void testInvalidNameRejected() {
-            new DockerImageName(imageName).assertValid();
+            DockerImageName.parse(imageName).assertValid();
         }
     }
 
@@ -66,12 +66,18 @@ public static class Parsing {
         @Parameterized.Parameters(name = "{0}{1}{2}{3}{4}")
         public static String[][] getNames() {
             return new String[][]{
+                {"", "", "myname", ":", null},
                 {"", "", "myname", ":", "latest"},
+                {"", "", "repo/myname", ":", null},
                 {"", "", "repo/myname", ":", "latest"},
+                {"registry.foo.com:1234", "/", "my-name", ":", null},
                 {"registry.foo.com:1234", "/", "my-name", ":", "1.0"},
                 {"registry.foo.com", "/", "my-name", ":", "1.0"},
+                {"registry.foo.com:1234", "/", "repo_here/my-name", ":", null},
                 {"registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"},
+                {"1.2.3.4:1234", "/", "repo_here/my-name", ":", null},
                 {"1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"},
+                {"1.2.3.4:1234", "/", "my-name", ":", null},
                 {"1.2.3.4:1234", "/", "my-name", ":", "1.0"},
                 {"", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
                 {"", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
@@ -98,22 +104,38 @@ public static String[][] getNames() {
         @Test
         public void testParsing() {
             final String unversionedPart = registry + registrySeparator + repo;
-            final String combined = unversionedPart + versionSeparator + version;
+
+            String combined;
+            String canonicalName;
+            if (version != null) {
+                combined = unversionedPart + versionSeparator + version;
+                canonicalName = unversionedPart + versionSeparator + version;
+            } else {
+                combined = unversionedPart;
+                canonicalName = unversionedPart + ":latest";
+            }
 
             VisibleAssertions.context("For " + combined);
             VisibleAssertions.context("Using single-arg constructor:", 2);
 
-            final DockerImageName imageName = new DockerImageName(combined);
+            final DockerImageName imageName = DockerImageName.parse(combined);
             assertEquals(combined + " has registry address: " + registry, registry, imageName.getRegistry());
             assertEquals(combined + " has unversioned part: " + unversionedPart, unversionedPart, imageName.getUnversionedPart());
-            assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
-
-            VisibleAssertions.context("Using two-arg constructor:", 2);
-
-            final DockerImageName imageNameFromSecondaryConstructor = new DockerImageName(unversionedPart, version);
-            assertEquals(combined + " has registry address: " + registry, registry, imageNameFromSecondaryConstructor.getRegistry());
-            assertEquals(combined + " has unversioned part: " + unversionedPart, unversionedPart, imageNameFromSecondaryConstructor.getUnversionedPart());
-            assertEquals(combined + " has version part: " + version, version, imageNameFromSecondaryConstructor.getVersionPart());
+            if (version != null) {
+                assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
+            } else {
+                assertEquals(combined + " has implicit version: latest", "latest", imageName.getVersionPart());
+            }
+            assertEquals(combined + " has canonical name: " + canonicalName, canonicalName, imageName.asCanonicalNameString());
+
+            if (version != null) {
+                VisibleAssertions.context("Using two-arg constructor:", 2);
+
+                final DockerImageName imageNameFromSecondaryConstructor = new DockerImageName(unversionedPart, version);
+                assertEquals(combined + " has registry address: " + registry, registry, imageNameFromSecondaryConstructor.getRegistry());
+                assertEquals(combined + " has unversioned part: " + unversionedPart, unversionedPart, imageNameFromSecondaryConstructor.getUnversionedPart());
+                assertEquals(combined + " has version part: " + version, version, imageNameFromSecondaryConstructor.getVersionPart());
+            }
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index e1cb595e903..a5e5ab4260d 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -18,7 +18,7 @@ public class RegistryAuthLocatorTest {
     public void lookupAuthConfigWithoutCredentials() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("unauthenticated.registry.org/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("unauthenticated.registry.org/org/repo"), new AuthConfig());
 
         assertEquals("Default docker registry URL is set on auth config", "https://index.docker.io/v1/", authConfig.getRegistryAddress());
         assertNull("No username is set", authConfig.getUsername());
@@ -29,7 +29,7 @@ public void lookupAuthConfigWithoutCredentials() throws URISyntaxException {
     public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-basic-auth.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
 
         assertEquals("Default docker registry URL is set on auth config", "https://registry.example.com", authConfig.getRegistryAddress());
         assertEquals("Username is set", "user", authConfig.getUsername());
@@ -40,7 +40,7 @@ public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException
     public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
 
         assertEquals("Default docker registry URL is set on auth config", "https://registry.example.com", authConfig.getRegistryAddress());
         assertEquals("Username is set", "_json_key", authConfig.getUsername());
@@ -51,7 +51,7 @@ public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
     public void lookupAuthConfigUsingStore() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
 
         assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
@@ -62,7 +62,7 @@ public void lookupAuthConfigUsingStore() throws URISyntaxException {
     public void lookupAuthConfigUsingHelper() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
 
         assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
@@ -73,7 +73,7 @@ public void lookupAuthConfigUsingHelper() throws URISyntaxException {
     public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper-using-token.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registrytoken.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registrytoken.example.com/org/repo"), new AuthConfig());
 
         assertEquals("Correct identitytoken is obtained from a credential store", "secret", authConfig.getIdentitytoken());
     }
@@ -82,7 +82,7 @@ public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException {
     public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty-auth-with-helper.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
 
         assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
@@ -93,7 +93,7 @@ public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
     public void lookupNonEmptyAuthWithHelper() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-existing-auth-with-helper.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(new DockerImageName("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
 
         assertEquals("Correct server URL is obtained from a credential helper", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential helper", "username", authConfig.getUsername());
@@ -105,7 +105,7 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException
         Map<String, String> notFoundMessagesReference = new HashMap<>();
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json", notFoundMessagesReference);
 
-        DockerImageName dockerImageName = new DockerImageName("registry2.example.com/org/repo");
+        DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
         final AuthConfig authConfig = authLocator.lookupAuthConfig(dockerImageName, new AuthConfig());
 
         assertNull("No username should have been obtained from a credential store", authConfig.getUsername());
@@ -124,7 +124,7 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException
     public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store-empty.json");
 
-        DockerImageName dockerImageName = new DockerImageName("registry2.example.com/org/repo");
+        DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
         final AuthConfig authConfig = authLocator.lookupAuthConfig(dockerImageName, new AuthConfig());
 
         assertNull("CredStore field will be ignored, because value is blank", authConfig.getAuth());
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index 172a821b178..f49e6a26565 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -4,6 +4,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 
@@ -13,7 +14,7 @@ public class CmdModifierTest {
 
     // hostname {
     @Rule
-    public GenericContainer theCache = new GenericContainer<>("redis:3.0.2")
+    public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
             .withCreateContainerCmdModifier(cmd -> cmd.withHostName("the-cache"));
     // }
 
@@ -22,7 +23,7 @@ public class CmdModifierTest {
     private long memorySwapInBytes = 12 * 1024 * 1024;
 
     @Rule
-    public GenericContainer memoryLimitedRedis = new GenericContainer<>("redis:3.0.2")
+    public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
             .withCreateContainerCmdModifier(cmd -> cmd.getHostConfig()
                 .withMemory(memoryInBytes)
                 .withMemorySwap(memorySwapInBytes)
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
index 486464c7dda..23b265c26fa 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
@@ -3,13 +3,14 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.junit.Assert.assertTrue;
 
 public class CommandsTest {
     @Rule
     // startupCommand {
-    public GenericContainer redisWithCustomPort = new GenericContainer("redis:5.0")
+    public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:5.0"))
         .withCommand("redis-server --port 7777")
     // }
         .withExposedPorts(7777);
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
index 19a40a7c43a..b0e8c98a0e4 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -3,28 +3,35 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.junit.Assert.assertTrue;
 
 public class ContainerCreationTest {
 
+    // simple {
+    public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
+    // }
+
     // simple {
     @ClassRule
-    public static GenericContainer redis =
-        new GenericContainer("redis:3.0.2")
+    public static GenericContainer<?> redis =
+        new GenericContainer<>(REDIS_IMAGE)
                 .withExposedPorts(6379);
     // }
 
+    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.2");
+
     // withOptions {
-    // Set up a plain OS container and customize environment, 
-    //   command and exposed ports. This just listens on port 80 
+    // Set up a plain OS container and customize environment,
+    //   command and exposed ports. This just listens on port 80
     //   and always returns '42'
     @ClassRule
-    public static GenericContainer alpine =
-        new GenericContainer("alpine:3.2")
+    public static GenericContainer<?> alpine =
+        new GenericContainer<>(ALPINE_IMAGE)
                 .withExposedPorts(80)
                 .withEnv("MAGIC_NUMBER", "42")
-                .withCommand("/bin/sh", "-c", 
+                .withCommand("/bin/sh", "-c",
                 "while true; do echo \"$MAGIC_NUMBER\" | nc -l -p 80; done");
     // }
 
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
index f8f26eaa5fe..ca0878e89d4 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
@@ -1,13 +1,14 @@
 package generic;
 
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class ContainerLabelTest {
     // single_label {
-    public GenericContainer containerWithLabel = new GenericContainer("alpine:3.6")
+    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.6"))
         .withLabel("key", "value");
     // }
 
@@ -16,7 +17,7 @@ public class ContainerLabelTest {
     private Map<String, String> mapOfLabels = new HashMap<>();
     // populate map, e.g. mapOfLabels.put("key1", "value1");
 
-    public GenericContainer containerWithMultipleLabels = new GenericContainer("alpine:3.6")
+    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.6"))
         .withLabels(mapOfLabels);
     // }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
index e160390c293..e35ae18af70 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
@@ -4,6 +4,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 
@@ -12,7 +13,7 @@
 public class ExecTest {
 
     @Rule
-    public GenericContainer container = new GenericContainer("alpine:3.6")
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.6"))
         .withCommand("top");
 
     @Test
diff --git a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
index f5a92423b6c..329fd8d8e19 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
@@ -5,6 +5,7 @@
 import org.slf4j.Logger;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -14,7 +15,7 @@ public class MultiplePortsExposedTest {
 
     @Rule
     // rule {
-    public GenericContainer container = new GenericContainer("orientdb:3.0.13")
+    public GenericContainer container = new GenericContainer(DockerImageName.parse("orientdb:3.0.13"))
         .withExposedPorts(2424, 2480)
         .withLogConsumer(new Slf4jLogConsumer(log));
     // }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
index 0bb5eb40bc1..d45b1e28c47 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
@@ -6,6 +6,7 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.junit.Assert.assertTrue;
 
@@ -13,20 +14,20 @@ public class WaitStrategiesTest {
 
     @Rule
     // waitForNetworkListening {
-    public GenericContainer nginx = new GenericContainer("nginx:1.9.4")
+    public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.9.4"))
         .withExposedPorts(80);
     // }
 
     @Rule
     // waitForSimpleHttp {
-    public GenericContainer nginxWithHttpWait = new GenericContainer("nginx:1.9.4")
+    public GenericContainer nginxWithHttpWait = new GenericContainer(DockerImageName.parse("nginx:1.9.4"))
         .withExposedPorts(80)
         .waitingFor(Wait.forHttp("/"));
     // }
 
     @Rule
     // logMessageWait {
-    public GenericContainer containerWithLogWait = new GenericContainer("redis:5.0.3")
+    public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:5.0.3"))
         .withExposedPorts(6379)
         .waitingFor(
             Wait.forLogMessage(".*Ready to accept connections.*\\n", 1)
diff --git a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
index deef64bc59b..0e72efb5723 100644
--- a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
+++ b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
@@ -7,6 +7,7 @@
 import org.junit.runners.Suite;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.WaitingConsumer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
@@ -35,7 +36,7 @@ private static void waitForHello(GenericContainer container) throws TimeoutExcep
     public static class OneShotStrategyTest {
         @Rule
         // withOneShotStrategy {
-        public GenericContainer bboxWithOneShot = new GenericContainer("busybox:1.31.1")
+        public GenericContainer<?> bboxWithOneShot = new GenericContainer<>(DockerImageName.parse("busybox:1.31.1"))
             .withCommand(String.format("echo %s", HELLO_TESTCONTAINERS))
             .withStartupCheckStrategy(
                 new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3))
@@ -54,7 +55,7 @@ public void testCommandIsExecuted() {
     public static class IndefiniteOneShotStrategyTest {
         @Rule
         // withIndefiniteOneShotStrategy {
-        public GenericContainer bboxWithIndefiniteOneShot = new GenericContainer("busybox:1.31.1")
+        public GenericContainer<?> bboxWithIndefiniteOneShot = new GenericContainer<>(DockerImageName.parse("busybox:1.31.1"))
             .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
             .withStartupCheckStrategy(
                 new IndefiniteWaitOneShotStartupCheckStrategy()
@@ -73,7 +74,7 @@ public void testCommandIsExecuted() {
     public static class MinimumDurationStrategyTest {
         @Rule
         // withMinimumDurationStrategy {
-        public GenericContainer bboxWithMinimumDuration = new GenericContainer("busybox:1.31.1")
+        public GenericContainer<?> bboxWithMinimumDuration = new GenericContainer<>(DockerImageName.parse("busybox:1.31.1"))
             .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
             .withStartupCheckStrategy(
                 new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(1))
diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index f2ef1ab0220..cbb49b5fdb3 100644
--- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -5,6 +5,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.junit.Assert.assertEquals;
 
@@ -14,7 +15,7 @@ public class RedisBackedCacheIntTest {
 
     // rule {
     @Rule
-    public GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
+    public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine"))
                                             .withExposedPorts(6379);
     // }
 
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index 0f4f98fb669..9a3855ba23c 100644
--- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -6,6 +6,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -17,7 +18,7 @@ public class RedisBackedCacheIntTest {
 
     // container {
     @Container
-    public GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
+    public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine"))
                                             .withExposedPorts(6379);
     // }
 
diff --git a/docs/features/creating_container.md b/docs/features/creating_container.md
index e92f20e71cd..443e04f1a91 100644
--- a/docs/features/creating_container.md
+++ b/docs/features/creating_container.md
@@ -12,9 +12,23 @@ images as temporary test dependencies. For example, if you might use it to test
 
 With a generic container, you set the container image using a parameter to the rule constructor, e.g.:
 ```java
-new GenericContainer("jboss/wildfly:9.0.1.Final")
+new GenericContainer(DockerImageName.parse("jboss/wildfly:9.0.1.Final"))
 ```
 
+### Specifying an image
+
+Many Container classes in Testcontainers have historically supported: 
+
+* a no-args constructor - for example `new GenericContainer()` and `new ElasticsearchContainer()`. With these constructors, Testcontainers has traditionally used a default image name (including a fixed image tag/version). This has caused a conflict between the need to keep the defaults sane (i.e. up to date) and the need to avoid silently upgrading these dependencies along with new versions of Testcontainers. 
+* a single string-argument constructor, which has taken either a version or an image name as a String. This has caused some ambiguity and confusion.
+
+Since v1.15.0, both of these constructor types have been deprecated, for the reasons given above.
+
+Instead, it is highly recommended that _all containers_ be constructed using a constructor that accepts a `DockerImageName` object.
+The `DockerImageName` class is an unambiguous reference to a docker image.
+
+It is suggested that developers treat `DockerImageName`s as you would any other potentially-constant value - consider defining a constant in your test codebase that matches the production version of the dependency you are using.
+
 ### Examples
 
 A generic container rule can be used with any public docker image; for example:
diff --git a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java b/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
index 5c78b3fdbd0..add59fd15ba 100644
--- a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
+++ b/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
@@ -4,10 +4,17 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.context;
+import static org.rnorth.visibleassertions.VisibleAssertions.info;
 
 /**
  * Created by rnorth on 03/01/2016.
@@ -15,7 +22,7 @@
 public class DisqueBackedMailSenderTest {
 
     @Rule
-    public GenericContainer container = new GenericContainer("richnorth/disque:1.0-rc1")
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("richnorth/disque:1.0-rc1"))
                                                 .withExposedPorts(7711);
     private DisqueClient disqueClient;
 
diff --git a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java b/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
index 8137f8fae90..3fa115bea20 100644
--- a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
+++ b/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
@@ -7,10 +7,14 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.util.concurrent.TimeUnit;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+import static org.rnorth.visibleassertions.VisibleAssertions.context;
+import static org.rnorth.visibleassertions.VisibleAssertions.info;
 
 /**
  * Created by rnorth on 03/01/2016.
@@ -18,7 +22,7 @@
 public class SingleDisqueInstanceTest {
 
     @Rule
-    public GenericContainer container = new GenericContainer("richnorth/disque:1.0-rc1")
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("richnorth/disque:1.0-rc1"))
                                                 .withExposedPorts(7711);
     private DisqueCommands<String, String> connection;
     private AddJobArgs retryAfter1Second;
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..62d4c053550b91381bbd28b1afc82d634bf73a8a
GIT binary patch
literal 58910
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

literal 0
HcmV?d00001

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..622ab64a3cb
--- /dev/null
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 56f7b0fc7bf..fbd7c515832 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -80,7 +80,8 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/../gradle/wrapper/gradle-wrapper.jar
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index f3a074d99d4..5093609d512 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -79,7 +82,8 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\..\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
 
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
new file mode 100644
index 00000000000..8bbbafd189f
--- /dev/null
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
@@ -0,0 +1,8 @@
+package com.example.linkedcontainer;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface LinkedContainerTestImages {
+    DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12");
+    DockerImageName REDMINE_TEST_IMAGE = DockerImageName.parse("redmine:3.3.2");
+}
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
index 82275dcc71c..b84b2a9e2c9 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
@@ -15,11 +15,11 @@ public class RedmineClientTest {
     private static final String POSTGRES_USERNAME = "redmine";
     private static final String POSTGRES_PASSWORD = "secret";
 
-    private PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:9.6.2")
+    private PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>(LinkedContainerTestImages.POSTGRES_TEST_IMAGE)
             .withUsername(POSTGRES_USERNAME)
             .withPassword(POSTGRES_PASSWORD);
 
-    private RedmineContainer redmineContainer = new RedmineContainer("redmine:3.3.2")
+    private RedmineContainer redmineContainer = new RedmineContainer(LinkedContainerTestImages.REDMINE_TEST_IMAGE)
             .withLinkToContainer(postgreSQLContainer, "postgres")
             .withEnv("POSTGRES_ENV_POSTGRES_USER", POSTGRES_USERNAME)
             .withEnv("POSTGRES_ENV_POSTGRES_PASSWORD", POSTGRES_PASSWORD);
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
index 113d0a76ec0..a75867205ab 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
@@ -3,6 +3,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * A Redmine container.
@@ -11,7 +12,7 @@ public class RedmineContainer extends GenericContainer<RedmineContainer> {
 
     private static final int REDMINE_PORT = 3000;
 
-    public RedmineContainer(String dockerImageName) {
+    public RedmineContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
     }
 
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
index 00fd9c05b52..e44f2bb982e 100644
--- a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
+++ b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.jetbrains.annotations.NotNull;
+import org.testcontainers.utility.DockerImageName;
 
 
 /**
@@ -24,7 +25,9 @@ public class MongoDbContainer extends GenericContainer<MongoDbContainer> {
 
     /**
      * Creates a new {@link MongoDbContainer} with the {@value DEFAULT_IMAGE_AND_TAG} image.
+     * @deprecated use {@link MongoDbContainer(DockerImageName)} instead
      */
+    @Deprecated
     public MongoDbContainer() {
         this(DEFAULT_IMAGE_AND_TAG);
     }
@@ -33,9 +36,18 @@ public MongoDbContainer() {
      * Creates a new {@link MongoDbContainer} with the given {@code 'image'}.
      *
      * @param image the image (e.g. {@value DEFAULT_IMAGE_AND_TAG}) to use
+     * @deprecated use {@link MongoDbContainer(DockerImageName)} instead
      */
+    @Deprecated
     public MongoDbContainer(@NotNull String image) {
-        super(image);
+        this(DockerImageName.parse(image));
+    }
+
+    /**
+     * Creates a new {@link MongoDbContainer} with the specified image.
+     */
+    public MongoDbContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
         addExposedPort(MONGODB_PORT);
     }
 
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
index 96096d51c1a..7c87e46bccd 100644
--- a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
+++ b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
@@ -1,16 +1,17 @@
 package org.testcontainers.containers;
 
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
 import java.io.IOException;
 import java.net.Socket;
 
-import org.junit.Test;
-
 
 public class MongoDbContainerTest {
 
     @Test
     public void containerStartsAndPublicPortIsAvailable() {
-        try (MongoDbContainer container = new MongoDbContainer()) {
+        try (MongoDbContainer container = new MongoDbContainer(DockerImageName.parse("mongo:4.0"))) {
             container.start();
             assertThatPortIsAvailable(container);
         }
diff --git a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
index ad2d62a2f04..5d204cf99c4 100644
--- a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
@@ -1,6 +1,7 @@
 import com.mycompany.cache.Cache;
 import com.mycompany.cache.RedisBackedCache;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -9,14 +10,16 @@
 
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
  * Integration test for Redis-backed cache implementation.
  */
 public class RedisBackedCacheTest {
 
-    private static GenericContainer redis = new GenericContainer("redis:3.0.6").withExposedPorts(6379);
+    private static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6")).withExposedPorts(6379);
 
     private Cache cache;
 
diff --git a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
index eaff293e518..d9d93b8255e 100644
--- a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
@@ -4,11 +4,14 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 import redis.clients.jedis.Jedis;
 
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
  * Integration test for Redis-backed cache implementation.
@@ -16,7 +19,7 @@
 public class RedisBackedCacheTest {
 
     @Rule
-    public GenericContainer redis = new GenericContainer("redis:3.0.6")
+    public GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
                                             .withExposedPorts(6379);
     private Cache cache;
 
diff --git a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
index d779adc5630..d152540fb1c 100644
--- a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
@@ -1,10 +1,11 @@
 package com.example;
 
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 public abstract class AbstractIntegrationTest {
 
-    public static final GenericContainer redis = new GenericContainer("redis:3.0.6")
+    public static final GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
             .withExposedPorts(6379);
 
     static {
diff --git a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
index 413d7937853..63ac67ac1cd 100644
--- a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
+++ b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
@@ -1,13 +1,5 @@
 package com.example;
 
-import static com.example.SolrSearchEngine.COLLECTION_NAME;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
@@ -16,10 +8,21 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.testcontainers.containers.SolrContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.example.SolrSearchEngine.COLLECTION_NAME;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class SolrQueryTest {
 
-    public static final SolrContainer solrContainer = new SolrContainer()
+    private static final DockerImageName SOLR_IMAGE = DockerImageName.parse("solr:8.3.0");
+
+    public static final SolrContainer solrContainer = new SolrContainer(SOLR_IMAGE)
         .withCollection(COLLECTION_NAME);
 
     private static SolrClient solrClient;
diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
index 79828923d7d..b6859563c69 100644
--- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
@@ -8,6 +8,7 @@
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = DemoApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
@@ -16,7 +17,7 @@
 @ActiveProfiles("test")
 public abstract class AbstractIntegrationTest {
 
-    static GenericContainer redis = new GenericContainer("redis:3-alpine")
+    static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3-alpine"))
         .withExposedPorts(6379);
 
     @DynamicPropertySource
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index 27c2f182e9e..681c58f4efb 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -7,6 +7,7 @@
 import org.testcontainers.delegate.DatabaseDelegate;
 import org.testcontainers.ext.ScriptUtils;
 import org.testcontainers.ext.ScriptUtils.ScriptLoadException;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 import javax.script.ScriptException;
@@ -24,7 +25,9 @@
  */
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
 
+    @Deprecated
     public static final String IMAGE = "cassandra";
+
     public static final Integer CQL_PORT = 9042;
     private static final String CONTAINER_CONFIG_LOCATION = "/etc/cassandra";
     private static final String USERNAME = "cassandra";
@@ -34,11 +37,23 @@ public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends G
     private String initScriptPath;
     private boolean enableJmxReporting;
 
+    /**
+     * @deprecated use {@link #CassandraContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public CassandraContainer() {
-        this(IMAGE + ":3.11.2");
+        this("cassandra:3.11.2");
     }
 
+    /**
+     * @deprecated use {@link #CassandraContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public CassandraContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public CassandraContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         addExposedPort(CQL_PORT);
         setStartupAttempts(3);
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
index 5bc68aa9972..76c8c8438d7 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -7,8 +7,11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.testcontainers.containers.wait.CassandraQueryWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Eugeny Karpov
@@ -16,11 +19,13 @@
 @Slf4j
 public class CassandraContainerTest {
 
+    private static final DockerImageName CASSANDRA_IMAGE = DockerImageName.parse("cassandra:3.11.2");
+
     private static final String TEST_CLUSTER_NAME_IN_CONF = "Test Cluster Integration Test";
 
     @Test
     public void testSimple() {
-        try (CassandraContainer cassandraContainer = new CassandraContainer<>()) {
+        try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, "SELECT release_version FROM system.local");
             assertTrue("Query was not applied", resultSet.wasApplied());
@@ -31,7 +36,7 @@ public void testSimple() {
     @Test
     public void testSpecificVersion() {
         String cassandraVersion = "3.0.15";
-        try (CassandraContainer cassandraContainer = new CassandraContainer<>("cassandra:" + cassandraVersion)) {
+        try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE.withTag(cassandraVersion))) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, "SELECT release_version FROM system.local");
             assertTrue("Query was not applied", resultSet.wasApplied());
@@ -42,7 +47,7 @@ public void testSpecificVersion() {
     @Test
     public void testConfigurationOverride() {
         try (
-            CassandraContainer cassandraContainer = new CassandraContainer<>()
+            CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
                 .withConfigurationOverride("cassandra-test-configuration-example")
         ) {
             cassandraContainer.start();
@@ -55,7 +60,7 @@ public void testConfigurationOverride() {
     @Test(expected = ContainerLaunchException.class)
     public void testEmptyConfigurationOverride() {
         try (
-            CassandraContainer cassandraContainer = new CassandraContainer<>()
+            CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
                 .withConfigurationOverride("cassandra-empty-configuration")
         ) {
             cassandraContainer.start();
@@ -65,7 +70,7 @@ public void testEmptyConfigurationOverride() {
     @Test
     public void testInitScript() {
         try (
-            CassandraContainer cassandraContainer = new CassandraContainer<>()
+            CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
                 .withInitScript("initial.cql")
         ) {
             cassandraContainer.start();
@@ -76,7 +81,7 @@ public void testInitScript() {
     @Test
     public void testInitScriptWithLegacyCassandra() {
         try (
-            CassandraContainer cassandraContainer = new CassandraContainer<>("cassandra:2.2.11")
+            CassandraContainer<?> cassandraContainer = new CassandraContainer<>(DockerImageName.parse("cassandra:2.2.11"))
                 .withInitScript("initial.cql")
         ) {
             cassandraContainer.start();
@@ -84,10 +89,11 @@ public void testInitScriptWithLegacyCassandra() {
         }
     }
 
+    @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
     public void testCassandraQueryWaitStrategy() {
         try (
-            CassandraContainer cassandraContainer = new CassandraContainer<>()
+            CassandraContainer<?> cassandraContainer = new CassandraContainer<>()
                 .waitingFor(new CassandraQueryWaitStrategy())
         ) {
             cassandraContainer.start();
@@ -96,9 +102,10 @@ public void testCassandraQueryWaitStrategy() {
         }
     }
 
+    @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
     public void testCassandraGetCluster() {
-        try (CassandraContainer cassandraContainer = new CassandraContainer<>()) {
+        try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>()) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer.getCluster(), "SELECT release_version FROM system.local");
             assertTrue("Query was not applied", resultSet.wasApplied());
@@ -106,7 +113,7 @@ public void testCassandraGetCluster() {
         }
     }
 
-    private void testInitScript(CassandraContainer cassandraContainer) {
+    private void testInitScript(CassandraContainer<?> cassandraContainer) {
         ResultSet resultSet = performQuery(cassandraContainer, "SELECT * FROM keySpaceTest.catalog_category");
         assertTrue("Query was not applied", resultSet.wasApplied());
         Row row = resultSet.one();
@@ -114,7 +121,7 @@ private void testInitScript(CassandraContainer cassandraContainer) {
         assertEquals("Inserted row is not in expected state", "test_category", row.getString(1));
     }
 
-    private ResultSet performQuery(CassandraContainer cassandraContainer, String cql) {
+    private ResultSet performQuery(CassandraContainer<?> cassandraContainer, String cql) {
         Cluster explicitCluster = Cluster.builder()
             .addContactPoint(cassandraContainer.getHost())
             .withPort(cassandraContainer.getMappedPort(CassandraContainer.CQL_PORT))
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index dd48f32bece..6bdcff7b3f2 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -1,12 +1,14 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 
 public class ClickHouseContainer extends JdbcDatabaseContainer {
     public static final String NAME = "clickhouse";
     public static final String IMAGE = "yandex/clickhouse-server";
+    @Deprecated
     public static final String DEFAULT_TAG = "18.10.3";
 
     public static final Integer HTTP_PORT = 8123;
@@ -20,11 +22,23 @@ public class ClickHouseContainer extends JdbcDatabaseContainer {
     private String username = "default";
     private String password = "";
 
+    /**
+     * @deprecated use {@link ClickHouseContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public ClickHouseContainer() {
         super(IMAGE + ":" + DEFAULT_TAG);
     }
 
+    /**
+     * @deprecated use {@link ClickHouseContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public ClickHouseContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ClickHouseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         withExposedPorts(HTTP_PORT, NATIVE_PORT);
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
index be5a01657f0..cd2453b8349 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
+
 public class ClickHouseProvider extends JdbcDatabaseContainerProvider {
     @Override
     public boolean supports(String databaseType) {
@@ -8,6 +10,6 @@ public boolean supports(String databaseType) {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new ClickHouseContainer(ClickHouseContainer.IMAGE + ":" + tag);
+        return new ClickHouseContainer(DockerImageName.parse(ClickHouseContainer.IMAGE).withTag(tag));
     }
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
new file mode 100644
index 00000000000..961df045bd1
--- /dev/null
+++ b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface ClickhouseTestImages {
+    DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server:18.10.3");
+}
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
index 2dbce0b3593..8f3879673a0 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -8,12 +8,13 @@
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.ClickhouseTestImages.CLICKHOUSE_IMAGE;
 
 public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer()) {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(CLICKHOUSE_IMAGE)) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index de64902c88a..54420155f05 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 
@@ -18,11 +19,23 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
     private String username = "root";
     private String password = "";
 
+    /**
+     * @deprecated use {@link CockroachContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public CockroachContainer() {
         this(IMAGE + ":" + IMAGE_TAG);
     }
 
+    /**
+     * @deprecated use {@link CockroachContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public CockroachContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public CockroachContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         withExposedPorts(REST_API_PORT, DB_PORT);
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
index 96cafd54f31..deebbd66392 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
+
 public class CockroachContainerProvider extends JdbcDatabaseContainerProvider {
     @Override
     public boolean supports(String databaseType) {
@@ -13,6 +15,6 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new CockroachContainer(CockroachContainer.IMAGE + ":" + tag);
+        return new CockroachContainer(DockerImageName.parse(CockroachContainer.IMAGE).withTag(tag));
     }
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
new file mode 100644
index 00000000000..a309f84e098
--- /dev/null
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface CockroachDBTestImages {
+    DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v19.1.1");
+}
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 14fe20222a3..3121ad82100 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -12,6 +12,7 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.CockroachDBTestImages.COCKROACHDB_IMAGE;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
 
@@ -22,7 +23,7 @@ public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (CockroachContainer cockroach = new CockroachContainer()) {
+        try (CockroachContainer cockroach = new CockroachContainer(COCKROACHDB_IMAGE)) {
             cockroach.start();
 
             ResultSet resultSet = performQuery(cockroach, "SELECT 1");
@@ -34,7 +35,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (CockroachContainer cockroach = new CockroachContainer()
+        try (CockroachContainer cockroach = new CockroachContainer(COCKROACHDB_IMAGE)
                 .withInitScript("somepath/init_postgresql.sql")) { // CockroachDB is expected to be compatible with Postgres
             cockroach.start();
 
@@ -47,7 +48,7 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        CockroachContainer cockroach = new CockroachContainer()
+        CockroachContainer cockroach = new CockroachContainer(COCKROACHDB_IMAGE)
             .withUrlParam("sslmode", "disable")
             .withUrlParam("application_name", "cockroach");
 
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 4a95334752a..4f154708d0c 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -30,6 +30,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -87,7 +88,9 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     /**
      * Creates a new couchbase container with the default image and version.
+     * @deprecated use {@link CouchbaseContainer(DockerImageName)} instead
      */
+    @Deprecated
     public CouchbaseContainer() {
         this(DOCKER_IMAGE_NAME + ":" + VERSION);
     }
@@ -95,10 +98,20 @@ public CouchbaseContainer() {
     /**
      * Creates a new couchbase container with a custom image name.
      *
-     * @param imageName the image name that should be used.
+     * @param dockerImageName the image name that should be used.
+     * @deprecated use {@link CouchbaseContainer(DockerImageName)} instead
      */
-    public CouchbaseContainer(final String imageName) {
-        super(imageName);
+    @Deprecated
+    public CouchbaseContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * Create a new couchbase container with the specified image name.
+     * @param dockerImageName
+     */
+    public CouchbaseContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
     }
 
     /**
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index c5c9f18a58b..3a4438c1fc6 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -24,12 +24,15 @@
 import com.couchbase.client.java.env.CouchbaseEnvironment;
 import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 public class CouchbaseContainerTest {
 
+    private static final DockerImageName COUCHBASE_IMAGE = DockerImageName.parse("couchbase/server:6.5.1");
+
     @Test
     public void testBasicContainerUsage() {
         // bucket_definition {
@@ -38,7 +41,7 @@ public void testBasicContainerUsage() {
 
         try (
             // container_definition {
-            CouchbaseContainer container = new CouchbaseContainer()
+            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE)
                 .withBucket(bucketDefinition)
             // }
         ) {
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 05edcb2c3ed..aa6d136aaec 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
 
 import java.time.Duration;
@@ -19,12 +20,24 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
     private String username = "db2inst1";
     private String password = "foobar1234";
 
+    /**
+     * @deprecated use {@link Db2Container(DockerImageName)} instead
+     */
+    @Deprecated
     public Db2Container() {
         this(DEFAULT_DB2_IMAGE_NAME + ":" + DEFAULT_TAG);
     }
 
-    public Db2Container(String imageName) {
-        super(imageName);
+    /**
+     * @deprecated use {@link Db2Container(DockerImageName)} instead
+     */
+    @Deprecated
+    public Db2Container(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public Db2Container(final DockerImageName dockerImageName) {
+        super(dockerImageName);
         withPrivilegedMode(true);
         this.waitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*Setup has completed\\..*")
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
index 5c78fdc0505..618b97c3ca6 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
+
 public class Db2ContainerProvider extends JdbcDatabaseContainerProvider {
     @Override
     public boolean supports(String databaseType) {
@@ -13,6 +15,6 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new Db2Container(Db2Container.DEFAULT_DB2_IMAGE_NAME + ":" + tag);
+        return new Db2Container(DockerImageName.parse(Db2Container.DEFAULT_DB2_IMAGE_NAME).withTag(tag));
     }
 }
diff --git a/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java b/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
new file mode 100644
index 00000000000..b0bfc869272
--- /dev/null
+++ b/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface Db2TestImages {
+    DockerImageName DB2_IMAGE = DockerImageName.parse("ibmcom/db2:11.5.0.0a");
+}
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 6cc7535f785..b7a1d5478e8 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -10,12 +10,13 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.Db2TestImages.DB2_IMAGE;
 
 public class SimpleDb2Test extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (Db2Container db2 = new Db2Container()
+        try (Db2Container db2 = new Db2Container(DB2_IMAGE)
             .acceptLicense()) {
 
             db2.start();
@@ -29,7 +30,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (Db2Container db2 = new Db2Container()
+        try (Db2Container db2 = new Db2Container(DB2_IMAGE)
             .withUrlParam("sslConnection", "false")
             .acceptLicense()) {
 
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
index 6280ddb9421..6063c1a5dbe 100644
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
@@ -7,6 +7,7 @@
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * Container for Dynalite, a DynamoDB clone.
@@ -16,15 +17,28 @@ public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
     private static final String IMAGE_NAME = "quay.io/testcontainers/dynalite:v1.2.1-1";
     private static final int MAPPED_PORT = 4567;
 
+    /**
+     * @deprecated use {@link DynaliteContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public DynaliteContainer() {
         this(IMAGE_NAME);
         withExposedPorts(MAPPED_PORT);
     }
 
-    public DynaliteContainer(String imageName) {
-        super(imageName);
+    /**
+     * @deprecated use {@link DynaliteContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public DynaliteContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
     }
 
+    public DynaliteContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+    }
+
+
     /**
      * Gets a preconfigured {@link AmazonDynamoDB} client object for connecting to this
      * container.
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
index 524d3f6c34c..0b440939139 100644
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
@@ -2,17 +2,26 @@
 
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
-import com.amazonaws.services.dynamodbv2.model.*;
+import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;
+import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
+import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
+import com.amazonaws.services.dynamodbv2.model.KeyType;
+import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
+import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
+import com.amazonaws.services.dynamodbv2.model.TableDescription;
 import org.junit.Rule;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
 
 public class DynaliteContainerTest {
 
+    private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse("quay.io/testcontainers/dynalite:v1.2.1-1");
+
     @Rule
-    public DynaliteContainer dynamoDB = new DynaliteContainer();
+    public DynaliteContainer dynamoDB = new DynaliteContainer(DYNALITE_IMAGE);
 
     @Test
     public void simpleTestWithManualClientCreation() {
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index e9a0b95d7ed..6ad0172269d 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -3,6 +3,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 
 import java.net.InetSocketAddress;
 import java.time.Duration;
@@ -36,6 +37,10 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
      */
     protected static final String ELASTICSEARCH_DEFAULT_VERSION = "6.4.1";
 
+    /**
+     * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public ElasticsearchContainer() {
         this(ELASTICSEARCH_DEFAULT_IMAGE + ":" + ELASTICSEARCH_DEFAULT_VERSION);
     }
@@ -43,8 +48,14 @@ public ElasticsearchContainer() {
     /**
      * Create an Elasticsearch Container by passing the full docker image name
      * @param dockerImageName Full docker image name, like: docker.elastic.co/elasticsearch/elasticsearch:6.4.1
+     * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
      */
+    @Deprecated
     public ElasticsearchContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         logger().info("Starting an elasticsearch container using [{}]", dockerImageName);
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 5da759872c9..2e617691646 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -1,13 +1,5 @@
 package org.testcontainers.elasticsearch;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.testcontainers.elasticsearch.ElasticsearchContainer.ELASTICSEARCH_DEFAULT_VERSION;
-
-import java.io.IOException;
-
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -26,6 +18,15 @@
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.junit.After;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.testcontainers.elasticsearch.ElasticsearchContainer.ELASTICSEARCH_DEFAULT_VERSION;
 
 public class ElasticsearchContainerTest {
 
@@ -33,6 +34,10 @@ public class ElasticsearchContainerTest {
      * Elasticsearch version which should be used for the Tests
      */
     private static final String ELASTICSEARCH_VERSION = Version.CURRENT.toString();
+    private static final DockerImageName ELASTICSEARCH_IMAGE =
+        DockerImageName
+            .parse("docker.elastic.co/elasticsearch/elasticsearch")
+            .withTag(ELASTICSEARCH_VERSION);
 
     /**
      * Elasticsearch default username, when secured with a license > basic
@@ -54,6 +59,7 @@ public void stopRestClient() throws IOException {
         }
     }
 
+    @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
     public void elasticsearchDefaultTest() throws IOException {
         // Create the elasticsearch container.
@@ -78,7 +84,7 @@ public void elasticsearchDefaultTest() throws IOException {
 
     @Test
     public void elasticsearchVersion() throws IOException {
-        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:" + ELASTICSEARCH_VERSION)) {
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
@@ -89,10 +95,14 @@ public void elasticsearchVersion() throws IOException {
 
     @Test
     public void elasticsearchOssImage() throws IOException {
-        try (
-            // oosContainer {
-            ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:" + ELASTICSEARCH_VERSION)
-            // }
+        try (ElasticsearchContainer container =
+                 // oosContainer {
+                 new ElasticsearchContainer(
+                     DockerImageName
+                         .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
+                         .withTag(ELASTICSEARCH_VERSION)
+                 )
+             // }
         ) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
@@ -104,6 +114,7 @@ public void elasticsearchOssImage() throws IOException {
         }
     }
 
+    @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
     public void restClientClusterHealth() throws IOException {
         // httpClientContainer {
@@ -122,10 +133,10 @@ public void restClientClusterHealth() throws IOException {
                 .build();
 
             Response response = client.performRequest(new Request("GET", "/_cluster/health"));
-        // }}
+            // }}
             assertThat(response.getStatusLine().getStatusCode(), is(200));
             assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
-        // httpClientContainer {{
+            // httpClientContainer {{
         }
         // }
     }
@@ -134,7 +145,11 @@ public void restClientClusterHealth() throws IOException {
     public void transportClientClusterHealth() {
         // transportClientContainer {
         // Create the elasticsearch container.
-        try (ElasticsearchContainer container = new ElasticsearchContainer()) {
+        try (ElasticsearchContainer container = new ElasticsearchContainer(
+            DockerImageName
+                .parse("docker.elastic.co/elasticsearch/elasticsearch")
+                .withTag("6.4.1")
+        )){
             // Start the container. This step might take some time...
             container.start();
 
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index 68efc516504..5d883fea9a7 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -4,6 +4,7 @@
 import org.influxdb.InfluxDBFactory;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.util.Collections;
 import java.util.Set;
@@ -26,13 +27,24 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
     private String username = "any";
     private String password = "any";
 
-
+    /**
+     * @deprecated use {@link InfluxDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public InfluxDBContainer() {
         this(VERSION);
     }
 
+    /**
+     * @deprecated use {@link InfluxDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public InfluxDBContainer(final String version) {
-        super(IMAGE_NAME + ":" + version);
+        this(DockerImageName.parse(IMAGE_NAME + ":" + version));
+    }
+
+    public InfluxDBContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
         waitStrategy = new WaitAllStrategy()
             .withStrategy(Wait.forHttp("/ping").withBasicCredentials(username, password).forStatusCode(204))
             .withStrategy(Wait.forListeningPort());
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
index fa2e54fd0c9..7acf030b5e4 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
@@ -11,7 +11,7 @@
 public class InfluxDBContainerTest {
 
     @ClassRule
-    public static InfluxDBContainer influxDBContainer = new InfluxDBContainer();
+    public static InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(InfluxDBTestImages.INFLUXDB_TEST_IMAGE);
 
     @Test
     public void getUrl() {
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
index 81ad62a7b47..b045ca297c1 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
@@ -17,13 +17,13 @@
 
 public class InfluxDBContainerWithUserTest {
 
-    private static final String TEST_VERSION = "1.4.3";
+    private static final String TEST_VERSION = InfluxDBTestImages.INFLUXDB_TEST_IMAGE.getVersionPart();
     private static final String DATABASE = "test";
     private static final String USER = "test-user";
     private static final String PASSWORD = "test-password";
 
     @Rule
-    public InfluxDBContainer influxDBContainer = new InfluxDBContainer(TEST_VERSION)
+    public InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(InfluxDBTestImages.INFLUXDB_TEST_IMAGE)
         .withDatabase(DATABASE)
         .withUsername(USER)
         .withPassword(PASSWORD);
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java
new file mode 100644
index 00000000000..a0e2d31bbdf
--- /dev/null
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface InfluxDBTestImages {
+    DockerImageName INFLUXDB_TEST_IMAGE = DockerImageName.parse("influxdb:1.4.3");
+}
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 62fe43e7932..4d1c4ece67b 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -8,6 +8,7 @@
 import org.testcontainers.delegate.DatabaseDelegate;
 import org.testcontainers.ext.ScriptUtils;
 import org.testcontainers.jdbc.JdbcDatabaseDelegate;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 import java.sql.Connection;
@@ -38,14 +39,22 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
 
     private static final String QUERY_PARAM_SEPARATOR = "&";
 
+    /**
+     * @deprecated use {@link JdbcDatabaseContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public JdbcDatabaseContainer(@NonNull final String dockerImageName) {
-        super(dockerImageName);
+        this(DockerImageName.parse(dockerImageName));
     }
 
     public JdbcDatabaseContainer(@NonNull final Future<String> image) {
         super(image);
     }
 
+    public JdbcDatabaseContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+    }
+
     /**
      * @return the name of the actual JDBC driver to use
      */
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
index 38ae38095eb..88398cebf85 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -3,6 +3,7 @@
 import com.google.common.base.Throwables;
 import org.junit.Test;
 import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -39,7 +40,7 @@ static class MissingDriverContainer extends JdbcDatabaseContainer {
         private final AtomicInteger connectionAttempts = new AtomicInteger();
 
         MissingDriverContainer() {
-            super("mysql:5.7.22");
+            super(DockerImageName.parse("mysql:5.7.22"));
             withEnv("MYSQL_ROOT_PASSWORD", "test");
             withExposedPorts(3306);
         }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
new file mode 100644
index 00000000000..e99d1ec720c
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
@@ -0,0 +1,8 @@
+package org.testcontainers.junit.jupiter;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface JUnitJupiterTestImages {
+    DockerImageName POSTGRES_IMAGE = DockerImageName.parse("postgres:9.6.12");
+    DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine");
+}
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
index 765a9f6ff6b..4cbc331e64b 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
@@ -9,12 +9,13 @@
 import java.sql.Statement;
 
 import static org.junit.Assert.assertEquals;
+import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.POSTGRES_IMAGE;
 
 @Testcontainers
 class PostgresContainerTests {
 
     @Container
-    private static final PostgreSQLContainer POSTGRE_SQL_CONTAINER = new PostgreSQLContainer()
+    private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER = new PostgreSQLContainer<>(POSTGRES_IMAGE)
             .withDatabaseName("foo")
             .withUsername("foo")
             .withPassword("secret");
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
index fb753744425..6e02e31b774 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
@@ -4,16 +4,16 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 // testClass {
 @Testcontainers
 class TestcontainersNestedRestartedContainerTests {
 
     @Container
-    private final GenericContainer topLevelContainer = new GenericContainer("httpd:2.4-alpine")
+    private final GenericContainer<?> topLevelContainer = new GenericContainer<>(HTTPD_IMAGE)
         .withExposedPorts(80);
     // }}
 
@@ -34,7 +34,7 @@ void top_level_container_should_be_running() {
     class NestedTestCase {
 
         @Container
-        private final GenericContainer nestedContainer = new GenericContainer("httpd:2.4-alpine")
+        private final GenericContainer<?> nestedContainer = new GenericContainer<>(HTTPD_IMAGE)
             .withExposedPorts(80);
 
         @Test
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
index 371a5bae178..cf59e0338a2 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
@@ -6,12 +6,13 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 @Testcontainers
 class TestcontainersNestedSharedContainerTests {
 
     @Container
-    private static final GenericContainer TOP_LEVEL_CONTAINER = new GenericContainer("httpd:2.4-alpine")
+    private static final GenericContainer<?> TOP_LEVEL_CONTAINER = new GenericContainer<>(HTTPD_IMAGE)
         .withExposedPorts(80);
 
     private static String topLevelContainerId;
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
index 2d6959ae065..eeb63b72380 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
@@ -4,12 +4,13 @@
 import org.testcontainers.containers.GenericContainer;
 
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 @Testcontainers
 class TestcontainersRestartBetweenTests {
 
     @Container
-    private GenericContainer genericContainer = new GenericContainer("httpd:2.4-alpine")
+    private GenericContainer<?> genericContainer = new GenericContainer<>(HTTPD_IMAGE)
             .withExposedPorts(80);
 
     private static String lastContainerId;
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
index 321c0d6282f..60094994f69 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
@@ -6,12 +6,13 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 @Testcontainers
 class TestcontainersSharedContainerTests {
 
     @Container
-    private static final GenericContainer GENERIC_CONTAINER = new GenericContainer("httpd:2.4-alpine")
+    private static final GenericContainer<?> GENERIC_CONTAINER = new GenericContainer<>(HTTPD_IMAGE)
         .withExposedPorts(80);
 
     private static String lastContainerId;
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
index 177a48bb9d0..0a9ec62fca2 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
@@ -1,16 +1,13 @@
 package org.testcontainers.junit.jupiter.inheritance;
 
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 import redis.clients.jedis.Jedis;
 
 public class RedisContainer extends GenericContainer<RedisContainer> {
 
     public RedisContainer() {
-        this("redis:3.2.11");
-    }
-
-    public RedisContainer(String dockerImageName) {
-        super(dockerImageName);
+        super(DockerImageName.parse("redis:3.2.11"));
         withExposedPorts(6379);
     }
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 9746849be29..2451278b1c2 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.SneakyThrows;
 import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.nio.charset.StandardCharsets;
@@ -29,12 +30,24 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private int port = PORT_NOT_ASSIGNED;
 
+    /**
+     * @deprecated use {@link KafkaContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public KafkaContainer() {
         this("5.2.1");
     }
 
+    /**
+     * @deprecated use {@link KafkaContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public KafkaContainer(String confluentPlatformVersion) {
-        super(TestcontainersConfiguration.getInstance().getKafkaImage() + ":" + confluentPlatformVersion);
+        this(DockerImageName.parse(TestcontainersConfiguration.getInstance().getKafkaImage() + ":" + confluentPlatformVersion));
+    }
+
+    public KafkaContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
 
         withExposedPorts(KAFKA_PORT);
 
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 25bc1b5022c..b8cd5c9be9c 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -13,6 +13,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -24,6 +25,9 @@
 
 public class KafkaContainerTest {
 
+    private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:5.2.1");
+    private static final DockerImageName ZOOKEEPER_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-zookeeper:4.0.0");
+
     // junitRule {
     @Rule
     public KafkaContainer kafka = new KafkaContainer();
@@ -31,7 +35,7 @@ public class KafkaContainerTest {
 
     @Test
     public void testUsage() throws Exception {
-        try (KafkaContainer kafka = new KafkaContainer()) {
+        try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
         }
@@ -42,7 +46,7 @@ public void testUsage() throws Exception {
     public void testUsageWithVersion() throws Exception {
         try (
             // constructorWithVersion {
-            KafkaContainer kafka = new KafkaContainer("4.1.2")
+            KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)
             // }
         ) {
             kafka.start();
@@ -60,12 +64,12 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
             Network network = Network.newNetwork();
 
             // withExternalZookeeper {
-            KafkaContainer kafka = new KafkaContainer()
+            KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)
                 .withNetwork(network)
                 .withExternalZookeeper("zookeeper:2181");
             // }
 
-            GenericContainer zookeeper = new GenericContainer("confluentinc/cp-zookeeper:4.0.0")
+            GenericContainer<?> zookeeper = new GenericContainer<>(ZOOKEEPER_TEST_IMAGE)
                 .withNetwork(network)
                 .withNetworkAliases("zookeeper")
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 72eb320c729..0136d94e3b2 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -10,6 +10,7 @@
 import org.rnorth.ducttape.Preconditions;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.InetAddress;
@@ -36,12 +37,24 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     private final List<Service> services = new ArrayList<>();
 
+    /**
+     * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public LocalStackContainer() {
         this(VERSION);
     }
 
+    /**
+     * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public LocalStackContainer(String version) {
-        super(TestcontainersConfiguration.getInstance().getLocalStackImage() + ":" + version);
+        this(DockerImageName.parse(TestcontainersConfiguration.getInstance().getLocalStackImage() + ":" + version));
+    }
+
+    public LocalStackContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
 
         withFileSystemBind("//var/run/docker.sock", "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index d4e2f0c2864..63be9d66df7 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -29,6 +29,7 @@
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
+import org.testcontainers.utility.DockerImageName;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
@@ -43,7 +44,10 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.*;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCHLOGS;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.KMS;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
 
 /**
  * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
@@ -56,11 +60,14 @@
 @RunWith(Enclosed.class)
 public class LocalstackContainerTest {
 
+    private static final DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.10.8");
+    private static final DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("atlassian/pipelines-awscli:1.16.302");
+
     public static class WithoutNetwork {
 
         // without_network {
         @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer()
+        public static LocalStackContainer localstack = new LocalStackContainer(LOCALSTACK_IMAGE)
             .withServices(S3, SQS, CLOUDWATCHLOGS, KMS);
         // }
 
@@ -160,14 +167,14 @@ public static class WithNetwork {
         private static Network network = Network.newNetwork();
 
         @ClassRule
-        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer()
+        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(LOCALSTACK_IMAGE)
             .withNetwork(network)
             .withNetworkAliases("notthis", "localstack")    // the last alias is used for HOSTNAME_EXTERNAL
             .withServices(S3, SQS, CLOUDWATCHLOGS);
         // }
 
         @ClassRule
-        public static GenericContainer awsCliInDockerNetwork = new GenericContainer<>("atlassian/pipelines-awscli")
+        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(AWS_CLI_IMAGE)
             .withNetwork(network)
             .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("top"))
             .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 04d745a9efe..e137c186209 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
+
 /**
  * Container implementation for the MariaDB project.
  *
@@ -22,11 +24,23 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
     private static final String MARIADB_ROOT_USER = "root";
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
 
+    /**
+     * @deprecated use {@link MariaDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MariaDBContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
 
+    /**
+     * @deprecated use {@link MariaDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MariaDBContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MariaDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         addExposedPort(MARIADB_PORT);
     }
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
index 86f30ee59e5..4330465a9c3 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
@@ -1,8 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.jdbc.ConnectionUrl;
-
-import java.util.Objects;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * Factory for MariaDB org.testcontainers.containers.
@@ -25,7 +24,7 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new MariaDBContainer(MariaDBContainer.IMAGE + ":" + tag);
+        return new MariaDBContainer(DockerImageName.parse(MariaDBContainer.IMAGE).withTag(tag));
     }
 
     @Override
diff --git a/modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java b/modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java
new file mode 100644
index 00000000000..7d18f2f8365
--- /dev/null
+++ b/modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface MariaDBTestImages {
+    DockerImageName MARIADB_IMAGE = DockerImageName.parse("mariadb:10.3.6");
+}
diff --git a/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
index 30e8cad9c32..b6fb4dd659e 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
@@ -2,6 +2,7 @@
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+import org.testcontainers.utility.DockerImageName;
 
 public class MariaDBR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MariaDBContainer<?>> {
 
@@ -17,7 +18,7 @@ protected String createR2DBCUrl() {
 
     @Override
     protected MariaDBContainer<?> createContainer() {
-        return new MariaDBContainer<>();
+        return new MariaDBContainer<>(DockerImageName.parse("mariadb:10.3.6"));
     }
 
 }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index af503ce424b..4ea98bbe1fe 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -13,13 +13,14 @@
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.MariaDBTestImages.MARIADB_IMAGE;
 
 
 public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (MariaDBContainer<?> mariadb = new MariaDBContainer<>()) {
+        try (MariaDBContainer<?> mariadb = new MariaDBContainer<>(MARIADB_IMAGE)) {
 
             mariadb.start();
 
@@ -32,7 +33,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testSpecificVersion() throws SQLException {
-        try (MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>("mariadb:5.5.51")) {
+        try (MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>(MARIADB_IMAGE.withTag("5.5.51"))) {
 
             mariadbOldVersion.start();
 
@@ -47,7 +48,7 @@ public void testSpecificVersion() throws SQLException {
     public void testMariaDBWithCustomIniFile() throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
 
-        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>("mariadb:10.1.16")
+        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(MARIADB_IMAGE.withTag("10.1.16"))
             .withConfigurationOverride("somepath/mariadb_conf_override")) {
             mariadbCustomConfig.start();
 
@@ -61,7 +62,7 @@ public void testMariaDBWithCustomIniFile() throws SQLException {
     @Test
     public void testMariaDBWithCommandOverride() throws SQLException {
 
-        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>("mariadb:10.1.16")
+        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(MARIADB_IMAGE)
             .withCommand("mysqld --auto_increment_increment=10")) {
             mariadbCustomConfig.start();
             ResultSet resultSet = performQuery(mariadbCustomConfig, "show variables like 'auto_increment_increment'");
@@ -73,7 +74,7 @@ public void testMariaDBWithCommandOverride() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        MariaDBContainer mariaDBContainer = (MariaDBContainer) new MariaDBContainer()
+        MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MARIADB_IMAGE)
             .withUrlParam("connectTimeout", "40000")
             .withUrlParam("rewriteBatchedStatements", "true");
 
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index e35370f4b27..2aa33931d07 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.utility.DockerImageName;
 
 @Slf4j
 public class MockServerContainer extends GenericContainer<MockServerContainer> {
@@ -9,12 +10,24 @@ public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
     public static final int PORT = 1080;
 
+    /**
+     * @deprecated use {@link MockServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MockServerContainer() {
         this(VERSION);
     }
 
+    /**
+     * @deprecated use {@link MockServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MockServerContainer(String version) {
-        super("jamesdbloom/mockserver:mockserver-" + version);
+        this(DockerImageName.parse("jamesdbloom/mockserver:mockserver-" + version));
+    }
+
+    public MockServerContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
         withCommand("-logLevel INFO -serverPort " + PORT);
         addExposedPorts(PORT);
     }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index 91f740b4bd8..e4d11ed3f39 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -4,6 +4,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockserver.client.MockServerClient;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -19,9 +20,11 @@
 
 public class MockServerContainerTest {
 
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("jamesdbloom/mockserver:mockserver-5.5.4");
+
     // creatingProxy {
     @Rule
-    public MockServerContainer mockServer = new MockServerContainer();
+    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
     // }
 
     private static String responseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
@@ -52,7 +55,7 @@ public void shouldReturnExpectation() throws Exception {
     @Test
     public void shouldCallActualMockserverVersion() throws Exception {
         String actualVersion = MockServerClient.class.getPackage().getImplementationVersion();
-        try (MockServerContainer mockServer = new MockServerContainer(actualVersion)) {
+        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE.withTag("mockserver-" + actualVersion))) {
             mockServer.start();
 
             String expectedBody = "Hello World!";
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index a7f57d310f2..1527b3924db 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -5,6 +5,7 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 
@@ -21,11 +22,23 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
     private static final String MONGODB_VERSION_DEFAULT = "4.0.10";
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
 
+    /**
+     * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MongoDBContainer() {
         this("mongo:" + MONGODB_VERSION_DEFAULT);
     }
 
+    /**
+     * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MongoDBContainer(@NonNull final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         withExposedPorts(MONGODB_INTERNAL_PORT);
         withCommand("--replSet", "docker-rs");
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index 7c4f4c12408..d637cb07f2d 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -11,12 +11,14 @@
 import com.mongodb.client.TransactionBody;
 import org.bson.Document;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 
 public class MongoDBContainerTest {
+
     /**
      * Taken from <a href="https://docs.mongodb.com/manual/core/transactions/">https://docs.mongodb.com</a>
      */
@@ -24,7 +26,7 @@ public class MongoDBContainerTest {
     public void shouldExecuteTransactions() {
         try (
             // creatingMongoDBContainer {
-            final MongoDBContainer mongoDBContainer = new MongoDBContainer()
+            final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))
             // }
         ) {
 
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 7550f820d51..0a6d8149e34 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
 
 import java.util.regex.Pattern;
@@ -32,11 +33,23 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
         Pattern.compile("[^a-zA-Z0-9]+", Pattern.CASE_INSENSITIVE)
     };
 
+    /**
+     * @deprecated use {@link MSSQLServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MSSQLServerContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
 
+    /**
+     * @deprecated use {@link MSSQLServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MSSQLServerContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MSSQLServerContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java
index daaa82ee771..c3495c8a3a6 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
+
 /**
  * Factory for MS SQL Server containers.
  */
@@ -16,6 +18,6 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new MSSQLServerContainer(MSSQLServerContainer.IMAGE + ":" + tag);
+        return new MSSQLServerContainer(DockerImageName.parse(MSSQLServerContainer.IMAGE).withTag(tag));
     }
 }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java b/modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java
new file mode 100644
index 00000000000..0cec042e19f
--- /dev/null
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface MSSQLServerTestImages {
+    DockerImageName MSSQL_SERVER_IMAGE = DockerImageName.parse("mcr.microsoft.com/mssql/server:2017-CU12");
+}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
index 1fcf2dd293b..8c0c9ab1c2b 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.MSSQLServerTestImages;
 import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
 
 public class MSSQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MSSQLServerContainer<?>> {
@@ -17,6 +18,6 @@ protected String createR2DBCUrl() {
 
     @Override
     protected MSSQLServerContainer<?> createContainer() {
-        return new MSSQLServerContainer<>();
+        return new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE);
     }
 }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
index 0e1ea05b31d..3df8ff0fa3d 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -4,6 +4,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.MSSQLServerTestImages;
 import org.testcontainers.containers.MSSQLServerContainer;
 
 import java.util.Arrays;
@@ -66,7 +67,7 @@ public static Collection<Object[]> data() {
     @Test
     public void runPasswordTests() {
         try {
-            new MSSQLServerContainer<>().withPassword(this.password);
+            new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE).withPassword(this.password);
             if (!valid)
                 fail("Password " + this.password + " is not valid. Expected exception");
         } catch (IllegalArgumentException e) {
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
index ecbc4e31714..d3c387e7b4a 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -15,7 +16,7 @@ public class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSqlServerConnection() throws SQLException {
-        try (MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>()
+        try (MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(DockerImageName.parse("mcr.microsoft.com/mssql/server:2017-CU12"))
             .withPassword(STRONG_PASSWORD)) {
 
             mssqlServerContainer.start();
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 71e12a6d864..100b29b34f7 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit.mssqlserver;
 
 import org.junit.Test;
+import org.testcontainers.MSSQLServerTestImages;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -12,12 +13,13 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.MSSQLServerTestImages.MSSQL_SERVER_IMAGE;
 
 public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()) {
+        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQL_SERVER_IMAGE)) {
             mssqlServer.start();
             ResultSet resultSet = performQuery(mssqlServer, "SELECT 1");
 
@@ -28,7 +30,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()
+        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQL_SERVER_IMAGE)
             .withUrlParam("integratedSecurity", "false")
             .withUrlParam("applicationName", "MyApp")) {
 
@@ -42,7 +44,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
 
     @Test
     public void testSetupDatabase() throws SQLException {
-        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>()) {
+        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQL_SERVER_IMAGE)) {
             mssqlServer.start();
             DataSource ds = getDataSource(mssqlServer);
             Statement statement = ds.getConnection().createStatement();
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 1ef574cbd5e..35321db5d72 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -1,12 +1,11 @@
 package org.testcontainers.containers;
 
 import org.jetbrains.annotations.NotNull;
+import org.testcontainers.utility.DockerImageName;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import static java.util.stream.Collectors.joining;
-
 /**
  * @author richardnorth
  */
@@ -27,15 +26,28 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
     private String password = DEFAULT_PASSWORD;
     private static final String MYSQL_ROOT_USER = "root";
 
+    /**
+     * @deprecated use {@link MySQLContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MySQLContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
 
+    /**
+     * @deprecated use {@link MySQLContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public MySQLContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MySQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         addExposedPort(MYSQL_PORT);
     }
 
+
     @NotNull
     @Override
     protected Set<Integer> getLivenessCheckPorts() {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
index 7d4919f4b26..18d126635b1 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
@@ -1,8 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.jdbc.ConnectionUrl;
-
-import java.util.Objects;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * Factory for MySQL containers.
@@ -26,7 +25,7 @@ public JdbcDatabaseContainer newInstance() {
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
         if (tag != null) {
-            return new MySQLContainer(MySQLContainer.IMAGE + ":" + tag);
+            return new MySQLContainer(DockerImageName.parse(MySQLContainer.IMAGE).withTag(tag));
         } else {
             return newInstance();
         }
diff --git a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
new file mode 100644
index 00000000000..6c8c6690d1f
--- /dev/null
+++ b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
@@ -0,0 +1,9 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public class MySQLTestImages {
+    public static final DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.22");
+    public static final DockerImageName MYSQL_55_IMAGE = DockerImageName.parse("mysql:5.5");
+    public static final DockerImageName MYSQL_56_IMAGE = DockerImageName.parse("mysql:5.6");
+}
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
index 19edc3dbca4..38abf637c3a 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.MySQLTestImages;
 import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
 
 public class MySQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MySQLContainer<?>> {
@@ -17,7 +18,7 @@ protected String createR2DBCUrl() {
 
     @Override
     protected MySQLContainer<?> createContainer() {
-        return new MySQLContainer<>();
+        return new MySQLContainer<>(MySQLTestImages.MYSQL_IMAGE);
     }
 
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
index 590d288e3fe..708b2b987cd 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit.mysql;
 
 import org.junit.Test;
+import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -17,7 +18,7 @@ public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
     @Test
     public void testSimple() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-        try (MySQLContainer<?> mysql = new MySQLContainer<>("mysql:5.5")
+        try (MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_IMAGE)
             .withDatabaseName(DB_NAME)
             .withUsername(USER)
             .withPassword(PWD)
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index 3c0c86ffafa..b8f1a136d9a 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -3,8 +3,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -27,7 +29,10 @@ public MultiVersionMySQLTest(String version) {
 
     @Test
     public void versionCheckTest() throws SQLException {
-        try (MySQLContainer<?> mysql = new MySQLContainer<>("mysql:" + version)) {
+
+        final DockerImageName dockerImageName = MySQLTestImages.MYSQL_IMAGE.withTag(version);
+
+        try (MySQLContainer<?> mysql = new MySQLContainer<>(dockerImageName)) {
             mysql.start();
             final ResultSet resultSet = performQuery(mysql, "SELECT VERSION()");
             final String resultSetString = resultSet.getString(1);
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 6d6f8d26453..f0ceeb92a48 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -20,10 +20,13 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.rnorth.visibleassertions.VisibleAssertions.fail;
+import static org.testcontainers.MySQLTestImages.MYSQL_55_IMAGE;
+import static org.testcontainers.MySQLTestImages.MYSQL_56_IMAGE;
+import static org.testcontainers.MySQLTestImages.MYSQL_IMAGE;
 
 
 public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
@@ -37,19 +40,19 @@ public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
      */
     /*
     @ClassRule
-    public static MySQLContainer<?> mysql = new MySQLContainer<>();
+    public static MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE);
 
     @ClassRule
-    public static MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>("mysql:5.5");
+    public static MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(DockerImageName.parse("mysql:5.5");)
 
     @ClassRule
-    public static MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>("mysql:5.6")
+    public static MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(DockerImageName.parse("mysql:5.6"))
                                                             .withConfigurationOverride("somepath/mysql_conf_override");
     */
 
     @Test
     public void testSimple() throws SQLException {
-        try (MySQLContainer<?> mysql = new MySQLContainer<>()
+        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
             .withConfigurationOverride("somepath/mysql_conf_override")
             .withLogConsumer(new Slf4jLogConsumer(logger))) {
 
@@ -64,7 +67,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testSpecificVersion() throws SQLException {
-        try (MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>("mysql:5.5")
+        try (MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MYSQL_55_IMAGE)
             .withConfigurationOverride("somepath/mysql_conf_override")
             .withLogConsumer(new Slf4jLogConsumer(logger))) {
 
@@ -81,7 +84,7 @@ public void testSpecificVersion() throws SQLException {
     public void testMySQLWithCustomIniFile() throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
 
-        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>("mysql:5.6")
+        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MYSQL_56_IMAGE)
             .withConfigurationOverride("somepath/mysql_conf_override")) {
 
             mysqlCustomConfig.start();
@@ -95,7 +98,7 @@ public void testMySQLWithCustomIniFile() throws SQLException {
 
     @Test
     public void testCommandOverride() throws SQLException {
-        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>()
+        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MYSQL_IMAGE)
             .withCommand("mysqld --auto_increment_increment=42")) {
 
             mysqlCustomConfig.start();
@@ -109,7 +112,7 @@ public void testCommandOverride() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (MySQLContainer<?> container = new MySQLContainer<>()
+        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_IMAGE)
             .withInitScript("somepath/init_mysql.sql")
             .withLogConsumer(new Slf4jLogConsumer(logger))) {
             container.start();
@@ -123,7 +126,7 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test(expected = ContainerLaunchException.class)
     public void testEmptyPasswordWithNonRootUser() {
-        try (MySQLContainer<?> container = new MySQLContainer<>("mysql:5.5")
+        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_55_IMAGE)
                     .withDatabaseName("TEST")
                     .withUsername("test")
                     .withPassword("")
@@ -136,7 +139,7 @@ public void testEmptyPasswordWithNonRootUser() {
     @Test
     public void testEmptyPasswordWithRootUser() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-        try (MySQLContainer<?> mysql = new MySQLContainer<>("mysql:5.5")
+        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_55_IMAGE)
             .withDatabaseName("foo")
             .withUsername("root")
             .withPassword("")
@@ -153,7 +156,7 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamTimeZone() throws SQLException {
-        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
             .withUrlParam("serverTimezone", "Europe/Zurich")
             .withEnv("TZ", "Europe/Zurich")
             .withLogConsumer(new Slf4jLogConsumer(logger));
@@ -183,7 +186,7 @@ public void testWithAdditionalUrlParamTimeZone() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
-        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
         mysql.start();
@@ -207,7 +210,7 @@ public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        MySQLContainer mysql = (MySQLContainer) new MySQLContainer()
+        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withUrlParam("rewriteBatchedStatements", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 10545da43d6..5d4212ccacd 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -1,19 +1,20 @@
 package org.testcontainers.containers;
 
-import static java.net.HttpURLConnection.*;
-import static java.util.stream.Collectors.*;
-
-import java.time.Duration;
-import java.util.Set;
-import java.util.stream.Stream;
-
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
 import org.testcontainers.utility.MountableFile;
 
+import java.time.Duration;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static java.net.HttpURLConnection.HTTP_OK;
+import static java.util.stream.Collectors.toSet;
+
 /**
  * Testcontainer for Neo4j.
  *
@@ -58,23 +59,29 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
 
     private String adminPassword = DEFAULT_ADMIN_PASSWORD;
 
-    private boolean defaultImage = false;
+    private boolean standardImage = false;
 
     /**
      * Creates a Testcontainer using the official Neo4j docker image.
+     * @deprecated use {@link Neo4jContainer(DockerImageName)} instead
      */
+    @Deprecated
     public Neo4jContainer() {
         this(DOCKER_IMAGE_NAME);
-
-        this.defaultImage = true;
     }
 
     /**
      * Creates a Testcontainer using a specific docker image.
      *
      * @param dockerImageName The docker image to use.
+     * @deprecated use {@link Neo4jContainer(DockerImageName)} instead
      */
+    @Deprecated
     public Neo4jContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public Neo4jContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         WaitStrategy waitForBolt = new LogMessageWaitStrategy()
@@ -89,6 +96,10 @@ public Neo4jContainer(String dockerImageName) {
             .withStartupTimeout(Duration.ofMinutes(2));
 
         addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
+
+        if (dockerImageName.getUnversionedPart().equals(DEFAULT_IMAGE_NAME)) {
+            this.standardImage = true;
+        }
     }
 
     @Override
@@ -139,7 +150,7 @@ public String getHttpsUrl() {
      */
     public S withEnterpriseEdition() {
 
-        if (!defaultImage) {
+        if (!standardImage) {
             throw new IllegalStateException(
                 String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName()));
         }
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
index 96b7a48b96f..5a67674cbe8 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
@@ -1,9 +1,5 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.*;
-
-import java.util.Collections;
-
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.neo4j.driver.v1.AuthTokens;
@@ -11,6 +7,11 @@
 import org.neo4j.driver.v1.GraphDatabase;
 import org.neo4j.driver.v1.Session;
 
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
 /**
  * Test for basic functionality when used as a <code>@ClassRule</code>.
  *
@@ -19,7 +20,7 @@
 public class Neo4jContainerJUnitIntegrationTest {
 
     @ClassRule
-    public static Neo4jContainer neo4jContainer = new Neo4jContainer();
+    public static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE);
 
     @Test
     public void shouldStart() {
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index cbbe5cb5729..6a32dac0af0 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -1,10 +1,5 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.assertj.core.api.Assumptions.*;
-
-import java.util.Collections;
-
 import org.junit.Test;
 import org.neo4j.driver.v1.AuthToken;
 import org.neo4j.driver.v1.AuthTokens;
@@ -15,6 +10,12 @@
 import org.neo4j.driver.v1.StatementResult;
 import org.testcontainers.utility.MountableFile;
 
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
 /**
  * Tests of functionality special to the Neo4jContainer.
  *
@@ -29,7 +30,7 @@ public class Neo4jContainerTest {
     public void shouldDisableAuthentication() {
 
         try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer().withoutAuthentication();
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE).withoutAuthentication()
         ) {
             neo4jContainer.start();
             try (Driver driver = getDriver(neo4jContainer);
@@ -44,8 +45,8 @@ public void shouldDisableAuthentication() {
     @Test
     public void shouldCopyDatabase() {
         try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer()
-                .withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+                .withDatabase(MountableFile.forClasspathResource("/test-graph.db"))
         ) {
             neo4jContainer.start();
             try (
@@ -62,8 +63,8 @@ public void shouldCopyDatabase() {
     @Test
     public void shouldCopyPlugins() {
         try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer()
-                .withPlugins(MountableFile.forClasspathResource("/custom-plugins"));
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+                .withPlugins(MountableFile.forClasspathResource("/custom-plugins"))
         ) {
             neo4jContainer.start();
             try (
@@ -78,8 +79,8 @@ public void shouldCopyPlugins() {
     @Test
     public void shouldCopyPlugin() {
         try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer()
-                .withPlugins(MountableFile.forClasspathResource("/custom-plugins/hello-world.jar"));
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+                .withPlugins(MountableFile.forClasspathResource("/custom-plugins/hello-world.jar"))
         ) {
             neo4jContainer.start();
             try (
@@ -105,7 +106,7 @@ public void shouldCheckEnterpriseLicense() {
         String expectedImageName = "neo4j:3.5.0-enterprise";
 
         assertThatExceptionOfType(IllegalStateException.class)
-            .isThrownBy(() -> new Neo4jContainer().withEnterpriseEdition())
+            .isThrownBy(() -> new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE).withEnterpriseEdition())
             .withMessageContaining("The image " + expectedImageName + " requires you to accept a license agreement.");
     }
 
@@ -114,7 +115,7 @@ public void shouldRunEnterprise() {
         assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNotNull();
 
         try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer()
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
                 .withEnterpriseEdition()
                 .withAdminPassword("Picard123")
         ) {
@@ -134,7 +135,7 @@ public void shouldRunEnterprise() {
     @Test
     public void shouldAddConfigToEnvironment() {
 
-        Neo4jContainer neo4jContainer = new Neo4jContainer()
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
             .withNeo4jConfig("dbms.security.procedures.unrestricted", "apoc.*,algo.*")
             .withNeo4jConfig("dbms.tx_log.rotation.size", "42M");
 
@@ -144,7 +145,7 @@ public void shouldAddConfigToEnvironment() {
             .containsEntry("NEO4J_dbms_tx__log_rotation_size", "42M");
     }
 
-    private static Driver getDriver(Neo4jContainer container) {
+    private static Driver getDriver(Neo4jContainer<?> container) {
 
         AuthToken authToken = AuthTokens.none();
         if (container.getAdminPassword() != null) {
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
new file mode 100644
index 00000000000..2cab24baf2b
--- /dev/null
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface Neo4jTestImages {
+    DockerImageName NEO4J_TEST_IMAGE = DockerImageName.parse("neo4j:3.5.0");
+}
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index fb931bce409..75a4571b68e 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.traits.LinkableContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -15,17 +16,29 @@ public class NginxContainer<SELF extends NginxContainer<SELF>> extends GenericCo
 
     private static final int NGINX_DEFAULT_PORT = 80;
 
+    /**
+     * @deprecated use {@link NginxContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public NginxContainer() {
         this("nginx:1.9.4");
     }
 
+    /**
+     * @deprecated use {@link NginxContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public NginxContainer(String dockerImageName) {
-        super(dockerImageName);
+        this(DockerImageName.parse(dockerImageName));
 
         addExposedPort(NGINX_DEFAULT_PORT);
         setCommand("nginx", "-g", "daemon off;");
     }
 
+    public NginxContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+    }
+
     @NotNull
     @Override
     protected Set<Integer> getLivenessCheckPorts() {
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index b41a0d8361e..e322804bf75 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -6,6 +6,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.NginxContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.*;
 import java.net.URL;
@@ -19,11 +20,13 @@
  */
 public class SimpleNginxTest {
 
+    private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.9.4");
+
     private static String tmpDirectory = System.getProperty("user.home") + "/.tmp-test-container";
 
     // creatingContainer {
     @Rule
-    public NginxContainer nginx = new NginxContainer<>()
+    public NginxContainer<?> nginx = new NginxContainer<>(NGINX_IMAGE)
         .withCustomContent(tmpDirectory)
         .waitingFor(new HttpWaitStrategy());
     // }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index d263a141d4f..8406d8275fb 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.util.concurrent.Future;
@@ -32,11 +33,23 @@ private static String resolveImageName() {
         return image;
     }
 
+    /**
+     * @deprecated use {@link OracleContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public OracleContainer() {
         this(resolveImageName());
     }
 
+    /**
+     * @deprecated use {@link OracleContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public OracleContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public OracleContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         preconfigure();
     }
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index b7fcc85573a..797f73f7159 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -13,6 +13,7 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 import java.net.URL;
@@ -48,11 +49,23 @@ public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
     private OrientDB orientDB;
     private ODatabaseSession session;
 
+    /**
+     * @deprecated use {@link OrientDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public OrientDBContainer() {
         this(DOCKER_IMAGE_NAME);
     }
 
+    /**
+     * @deprecated use {@link OrientDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public OrientDBContainer(@NonNull String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public OrientDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         serverPassword = DEFAULT_SERVER_PASSWORD;
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index 54b0661cae2..60d7b172436 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -2,6 +2,7 @@
 
 import com.orientechnologies.orient.core.db.ODatabaseSession;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -10,9 +11,11 @@
  */
 public class OrientDBContainerTest {
 
+    private static final DockerImageName ORIENTDB_IMAGE = DockerImageName.parse("orientdb:3.0.24-tp3");
+
     @Test
     public void shouldReturnTheSameSession() {
-        try (OrientDBContainer container = new OrientDBContainer()) {
+        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)) {
             container.start();
 
             final ODatabaseSession session = container.getSession();
@@ -24,7 +27,7 @@ public void shouldReturnTheSameSession() {
 
     @Test
     public void shouldInitializeWithCommands() {
-        try (OrientDBContainer container = new OrientDBContainer()) {
+        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)) {
             container.start();
 
             final ODatabaseSession session = container.getSession();
@@ -40,7 +43,7 @@ public void shouldInitializeWithCommands() {
     @Test
     public void shouldQueryWithGremlin() {
 
-        try (OrientDBContainer container = new OrientDBContainer()) {
+        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)) {
             container.start();
 
             final ODatabaseSession session = container.getSession("admin", "admin");
@@ -56,7 +59,7 @@ public void shouldQueryWithGremlin() {
 
     @Test
     public void shouldInitializeDatabaseFromScript() {
-        try (OrientDBContainer container = new OrientDBContainer()
+        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)
             .withScriptPath("initscript.osql")
             .withDatabaseName("persons")) {
 
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
index 54c87a84648..9e59787837b 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
@@ -1,8 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.jdbc.ConnectionUrl;
-
-import java.util.Objects;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * Factory for PostGIS containers, which are a special flavour of PostgreSQL.
@@ -28,7 +27,7 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new PostgreSQLContainer(DEFAULT_IMAGE + ":" + tag);
+        return new PostgreSQLContainer(DockerImageName.parse(DEFAULT_IMAGE).withTag(DEFAULT_TAG));
     }
 
     @Override
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 1c814044023..b1ddb2a26ee 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.util.HashSet;
@@ -31,11 +32,23 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
 
     private static final String QUERY_PARAM_SEPARATOR = "&";
 
+    /**
+     * @deprecated use {@link PostgreSQLContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public PostgreSQLContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
 
+    /**
+     * @deprecated use {@link PostgreSQLContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public PostgreSQLContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public PostgreSQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         this.waitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*database system is ready to accept connections.*\\s")
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
index 77a0329c22c..5e7580c75eb 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
@@ -1,8 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.jdbc.ConnectionUrl;
-
-import java.util.Objects;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * Factory for PostgreSQL containers.
@@ -24,7 +23,7 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new PostgreSQLContainer(PostgreSQLContainer.IMAGE + ":" + tag);
+        return new PostgreSQLContainer(DockerImageName.parse(PostgreSQLContainer.IMAGE).withTag(tag));
     }
 
     @Override
diff --git a/modules/postgresql/src/test/java/org/testcontainers/PostgreSQLTestImages.java b/modules/postgresql/src/test/java/org/testcontainers/PostgreSQLTestImages.java
new file mode 100644
index 00000000000..8be01053570
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/PostgreSQLTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface PostgreSQLTestImages {
+    DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12");
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index c0ba7e40d44..c18f19a109e 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.junit.Test;
+import org.testcontainers.PostgreSQLTestImages;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
@@ -46,6 +47,9 @@ public void shouldRejectInvalidQueryString() {
     }
 
     static class FixedJdbcUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
+        public FixedJdbcUrlPostgreSQLContainer() {
+            super(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);
+        }
 
         @Override
         public String getHost() {
@@ -59,6 +63,9 @@ public Integer getMappedPort(int originalPort) {
     }
 
     static class NoParamsUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
+        public NoParamsUrlPostgreSQLContainer() {
+            super(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);
+        }
 
         @Override
         public String getJdbcUrl() {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
index 505b37859ba..46e439aaf66 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
@@ -1,13 +1,14 @@
 package org.testcontainers.containers;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.PostgreSQLTestImages;
 import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
 
 public class PostgreSQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<PostgreSQLContainer<?>> {
 
     @Override
     protected PostgreSQLContainer<?> createContainer() {
-        return new PostgreSQLContainer<>();
+        return new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);
     }
 
     @Override
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
index 8446440059e..8fd523434dd 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit.postgresql;
 
 import org.junit.Test;
+import org.testcontainers.PostgreSQLTestImages;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -19,7 +20,7 @@ public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:9.6.8")
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withDatabaseName(DB_NAME)
                 .withUsername(USER)
                 .withPassword(PWD)) {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 36ece03b604..95e1fdf10fd 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -13,6 +13,7 @@
 import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
+import static org.testcontainers.PostgreSQLTestImages.POSTGRES_TEST_IMAGE;
 
 public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
@@ -23,7 +24,7 @@ public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>()) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE)) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
@@ -34,7 +35,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testCommandOverride() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42")) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE).withCommand("postgres -c max_connections=42")) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
@@ -45,7 +46,7 @@ public void testCommandOverride() throws SQLException {
 
     @Test
     public void testUnsetCommand() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>().withCommand("postgres -c max_connections=42").withCommand()) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE).withCommand("postgres -c max_connections=42").withCommand()) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
@@ -56,7 +57,7 @@ public void testUnsetCommand() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>().withInitScript("somepath/init_postgresql.sql")) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE).withInitScript("somepath/init_postgresql.sql")) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
@@ -68,7 +69,7 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE)
             .withUrlParam("charSet", "UNICODE")) {
 
             postgres.start();
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index c3f25c40ac8..1c8c03ce4de 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -23,11 +24,23 @@ public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDat
     private String username = "test";
     private String catalog = null;
 
+    /**
+     * @deprecated use {@link PrestoContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public PrestoContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
 
+    /**
+     * @deprecated use {@link PrestoContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public PrestoContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public PrestoContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         this.waitStrategy = new LogMessageWaitStrategy()
             .withRegEx(".*======== SERVER STARTED ========.*")
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
index 663cf9be4a9..8408aab4517 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
@@ -1,8 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.jdbc.ConnectionUrl;
-
-import java.util.Objects;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * Factory for Presto containers.
@@ -24,7 +23,7 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new PrestoContainer(PrestoContainer.IMAGE + ":" + tag);
+        return new PrestoContainer(DockerImageName.parse(PrestoContainer.IMAGE).withTag(tag));
     }
 
     @Override
diff --git a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
new file mode 100644
index 00000000000..1b4e449c99f
--- /dev/null
+++ b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
@@ -0,0 +1,8 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface PrestoTestImages {
+    DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("prestosql/presto:329");
+    DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("prestosql/presto:328");
+}
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
index 07fb6fa30ed..d5a4d9587a6 100644
--- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.testcontainers.PrestoTestImages;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -22,9 +24,10 @@
  * @author findepi
  */
 public class PrestoContainerTest {
+
     @Test
     public void testSimple() throws Exception {
-        try (PrestoContainer<?> prestoSql = new PrestoContainer<>()) {
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.start();
             try (Connection connection = prestoSql.createConnection();
                  Statement statement = connection.createStatement();
@@ -37,21 +40,20 @@ public void testSimple() throws Exception {
 
     @Test
     public void testSpecificVersion() throws Exception {
-        String prestoVersion = Integer.toString(parseInt(PrestoContainer.DEFAULT_TAG) - 1);
-        try (PrestoContainer<?> prestoSql = new PrestoContainer<>("prestosql/presto:" + prestoVersion)) {
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE)) {
             prestoSql.start();
             try (Connection connection = prestoSql.createConnection();
                  Statement statement = connection.createStatement();
                  ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
                 assertTrue("No result", resultSet.next());
-                assertEquals("Presto version", prestoVersion, resultSet.getString("node_version"));
+                assertEquals("Presto version", PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(), resultSet.getString("node_version"));
             }
         }
     }
 
     @Test
     public void testQueryMemoryAndTpch() throws SQLException {
-        try (PrestoContainer<?> prestoSql = new PrestoContainer<>()) {
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.start();
             try (Connection connection = prestoSql.createConnection();
                  Statement statement = connection.createStatement()) {
@@ -77,7 +79,7 @@ public void testQueryMemoryAndTpch() throws SQLException {
 
     @Test
     public void testInitScript() throws Exception {
-        try (PrestoContainer<?> prestoSql = new PrestoContainer<>()) {
+        try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.withInitScript("initial.sql");
             prestoSql.start();
             try (Connection connection = prestoSql.createConnection();
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 936759efb1a..4d30d947113 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -2,6 +2,7 @@
 
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 /**
@@ -13,16 +14,29 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
     public static final int BROKER_HTTP_PORT = 8080;
     public static final String METRICS_ENDPOINT = "/metrics";
 
-    private static final String PULSAR_VERSION = "2.2.0";
+    @Deprecated
+    private static final String DEFAULT_PULSAR_VERSION = "2.2.0";
 
     private boolean functionsWorkerEnabled = false;
 
+    /**
+     * @deprecated use {@link PulsarContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public PulsarContainer() {
-        this(PULSAR_VERSION);
+        this(DEFAULT_PULSAR_VERSION);
     }
 
+    /**
+     * @deprecated use {@link PulsarContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public PulsarContainer(String pulsarVersion) {
-        super(TestcontainersConfiguration.getInstance().getPulsarImage() + ":" + pulsarVersion);
+        this(TestcontainersConfiguration.getInstance().getPulsarDockerImageName().withTag(pulsarVersion));
+    }
+
+    public PulsarContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
         withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT);
         withCommand("/pulsar/bin/pulsar", "standalone", "--no-functions-worker", "-nss");
         waitingFor(Wait.forHttp(METRICS_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index e9d41516670..f2354d98ef7 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -7,6 +7,7 @@
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -17,10 +18,11 @@
 public class PulsarContainerTest {
 
     public static final String TEST_TOPIC = "test_topic";
+    private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:2.2.0");
 
     @Test
     public void testUsage() throws Exception {
-        try (PulsarContainer pulsar = new PulsarContainer()) {
+        try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)) {
             pulsar.start();
             testPulsarFunctionality(pulsar.getPulsarBrokerUrl());
         }
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index d8d46f51b1c..a3b6134b29c 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 import java.io.IOException;
@@ -41,7 +42,9 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
     /**
      * Creates a Testcontainer using the official RabbitMQ docker image.
+     * @deprecated use {@link RabbitMQContainer(DockerImageName)} instead
      */
+    @Deprecated
     public RabbitMQContainer() {
         this(DEFAULT_IMAGE_NAME + ":" + DEFAULT_TAG);
     }
@@ -49,10 +52,16 @@ public RabbitMQContainer() {
     /**
      * Creates a Testcontainer using a specific docker image.
      *
-     * @param image The docker image to use.
+     * @param dockerImageName The docker image to use.
+     * @deprecated use {@link RabbitMQContainer(DockerImageName)} instead
      */
-    public RabbitMQContainer(String image) {
-        super(image);
+    @Deprecated
+    public RabbitMQContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public RabbitMQContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
 
         addExposedPorts(DEFAULT_AMQP_PORT, DEFAULT_AMQPS_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
 
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
index ff71db44348..7473f470f6f 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
@@ -13,7 +13,7 @@
 public class RabbitMQContainerJUnitIntegrationTest {
 
     @ClassRule
-    public static RabbitMQContainer rabbitMQContainer = new RabbitMQContainer();
+    public static RabbitMQContainer rabbitMQContainer = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE);
 
     @Test
     public void shouldStart() {
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 4c2787bf5ab..8be97deb710 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -1,15 +1,16 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.testcontainers.containers.RabbitMQContainer.SslVerification.VERIFY_PEER;
-import static org.testcontainers.utility.MountableFile.forClasspathResource;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
+import org.junit.Test;
+import org.testcontainers.utility.MountableFile;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -20,18 +21,17 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Collections;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-import org.junit.Test;
-import org.testcontainers.utility.MountableFile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.testcontainers.containers.RabbitMQContainer.SslVerification.VERIFY_PEER;
+import static org.testcontainers.utility.MountableFile.forClasspathResource;
 
 /**
  * @author Martin Greber
  */
 public class RabbitMQContainerTest {
 
-    public static final String DEFAULT_IMAGE = "rabbitmq:3.7.25-management-alpine";
     public static final int DEFAULT_AMQPS_PORT = 5671;
     public static final int DEFAULT_AMQP_PORT = 5672;
     public static final int DEFAULT_HTTPS_PORT = 15671;
@@ -40,9 +40,8 @@ public class RabbitMQContainerTest {
     @Test
     public void shouldCreateRabbitMQContainer()
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
 
-            assertThat(container.getDockerImageName()).isEqualTo(DEFAULT_IMAGE);
             assertThat(container.getAdminPassword()).isEqualTo("guest");
             assertThat(container.getAdminUsername()).isEqualTo("guest");
 
@@ -71,18 +70,10 @@ public void shouldCreateRabbitMQContainer()
         }
     }
 
-    @Test
-    public void shouldCreateRabbitMQContainerWithTag()
-    {
-        try (RabbitMQContainer container = new RabbitMQContainer(DEFAULT_IMAGE)) {
-            assertThat(container.getDockerImageName()).isEqualTo(DEFAULT_IMAGE);
-        }
-    }
-
     @Test
     public void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withExchange("test-exchange", "direct");
 
             container.start();
@@ -95,7 +86,7 @@ public void shouldCreateRabbitMQContainerWithExchange() throws IOException, Inte
     @Test
     public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOException, InterruptedException
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withVhost("test-vhost");
             container.withExchange("test-vhost", "test-exchange", "direct", false, false, false, Collections.emptyMap());
 
@@ -109,7 +100,7 @@ public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOExceptio
     @Test
     public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
 
             container.withQueue("queue-one")
                 .withQueue("queue-two", false, true, ImmutableMap.of("x-message-ttl", 1000));
@@ -126,7 +117,7 @@ public void shouldCreateRabbitMQContainerWithQueues() throws IOException, Interr
     @Test
     public void shouldMountConfigurationFile()
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
 
             container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
@@ -140,7 +131,7 @@ public void shouldMountConfigurationFile()
     @Test
     public void shouldMountConfigurationFileErlang()
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
 
             container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
             container.start();
@@ -154,7 +145,7 @@ public void shouldMountConfigurationFileErlang()
     @Test
     public void shouldMountConfigurationFileSysctl()
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
 
             container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
@@ -167,7 +158,7 @@ public void shouldMountConfigurationFileSysctl()
     @Test
     public void shouldStartTheWholeEnchilada() throws IOException, InterruptedException
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container
                     .withVhost("vhost1")
                     .withVhostLimit("vhost1", "max-connections", 1)
@@ -229,7 +220,7 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
     @Test
     public void shouldThrowExceptionForDodgyJson()
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
 
             assertThatCode(() ->
                 container.withQueue(
@@ -245,7 +236,7 @@ public void shouldThrowExceptionForDodgyJson()
     @Test
     public void shouldWorkWithSSL()
     {
-        try (RabbitMQContainer container = new RabbitMQContainer()) {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withSSL(
                 forClasspathResource("/certs/server_key.pem", 0644),
                 forClasspathResource("/certs/server_certificate.pem", 0644),
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQTestImages.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQTestImages.java
new file mode 100644
index 00000000000..0898cbdb350
--- /dev/null
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface RabbitMQTestImages {
+    DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.7.25-management-alpine");
+}
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 16127171c59..f1cedab76ad 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -1,12 +1,10 @@
 package org.testcontainers.containers;
 
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.collect.ImmutableSet;
-
-import com.github.dockerjava.api.command.InspectContainerResponse;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
@@ -25,6 +23,7 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.io.IOException;
@@ -70,8 +69,10 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private static final Logger LOGGER = LoggerFactory.getLogger(BrowserWebDriverContainer.class);
 
     /**
+     * @deprecated use {@link BrowserWebDriverContainer(DockerImageName)} instead
      */
     public BrowserWebDriverContainer() {
+        super();
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
                 .withStartupTimeout(Duration.of(15, SECONDS));
@@ -86,17 +87,36 @@ public BrowserWebDriverContainer() {
 
     /**
      * Constructor taking a specific webdriver container name and tag
-     * @param dockerImageName Name of the docker image to pull
+     * @param dockerImageName Name of the selenium docker image
+     * @deprecated use {@link BrowserWebDriverContainer(DockerImageName)} instead
      */
+    @Deprecated
     public BrowserWebDriverContainer(String dockerImageName) {
-        this();
-        super.setDockerImageName(dockerImageName);
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * Constructor taking a specific webdriver container name and tag
+     * @param dockerImageName Name of the selenium docker image
+     */
+    public BrowserWebDriverContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
+                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
+                .withStartupTimeout(Duration.of(15, SECONDS));
+
+        this.waitStrategy = new WaitAllStrategy()
+                .withStrategy(logWaitStrategy)
+                .withStrategy(new HostPortWaitStrategy())
+                .withStartupTimeout(Duration.of(15, SECONDS));
+
+        this.withRecordingFileFactory(new DefaultRecordingFileFactory());
+
         this.customImageNameIsSet = true;
         // We have to force SKIP mode for the recording by default because we don't know if the image has VNC or not
         recordingMode = VncRecordingMode.SKIP;
     }
 
-
     public SELF withCapabilities(Capabilities capabilities) {
         this.capabilities = capabilities;
         return self();
diff --git a/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java b/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java
new file mode 100644
index 00000000000..82d19adf3b5
--- /dev/null
+++ b/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface SeleniumTestImages {
+    DockerImageName NGINX_TEST_IMAGE = DockerImageName.parse("nginx:1.9.4");
+}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java
index 1a703ad3ea7..d3e458e07ec 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java
@@ -7,13 +7,17 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
+import org.testcontainers.SeleniumTestImages;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.NginxContainer;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 
 /**
@@ -27,13 +31,13 @@ public class LinkedContainerTest {
     public Network network = Network.newNetwork();
 
     @Rule
-    public NginxContainer nginx = new NginxContainer<>()
+    public NginxContainer<?> nginx = new NginxContainer<>(SeleniumTestImages.NGINX_TEST_IMAGE)
             .withNetwork(network)
             .withNetworkAliases("nginx")
             .withCustomContent(contentFolder.toString());
 
     @Rule
-    public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer<>()
+    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
             .withNetwork(network)
             .withCapabilities(new ChromeOptions());
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
index f7415471bc8..bbcd8c15166 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
@@ -5,6 +5,7 @@
 import org.junit.runners.Parameterized;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * Simple test to check that readiness detection works correctly across major versions of the containers.
@@ -22,7 +23,8 @@ public static String[] data() {
 
     @Test
     public void testAdditionalStartupString() {
-        try (BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome-debug:" + tag)
+        final DockerImageName imageName = DockerImageName.parse("selenium/standalone-chrome-debug").withTag(tag);
+        try (BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>(imageName)
                 .withCapabilities(new ChromeOptions())) {
             chrome.start();
         }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
index 01edd70c102..6ecf0899ede 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
@@ -4,14 +4,14 @@
 import org.junit.Test;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.utility.DockerImageName;
 
-/**
- *
- */
 public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
 
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox:2.53.1-beryllium");
+
     @Rule
-    public BrowserWebDriverContainer firefox = new BrowserWebDriverContainer("selenium/standalone-firefox:2.53.1-beryllium")
+    public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
         .withCapabilities(new FirefoxOptions());
 
     @Test
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 90fd674dfda..aeadb664089 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -1,18 +1,17 @@
 package org.testcontainers.containers;
 
-import static java.time.temporal.ChronoUnit.SECONDS;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.SneakyThrows;
+import org.apache.commons.lang.StringUtils;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.net.URL;
 import java.time.Duration;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.github.dockerjava.api.command.InspectContainerResponse;
-
-import lombok.SneakyThrows;
-
-import org.apache.commons.lang.StringUtils;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import static java.time.temporal.ChronoUnit.SECONDS;
 
 /**
  * SolrContainer allows a solr container to be launched and controlled.
@@ -27,11 +26,23 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
 
     private SolrContainerConfiguration configuration;
 
+    /**
+     * @deprecated use {@link SolrContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public SolrContainer() {
         this(IMAGE + ":" + DEFAULT_TAG);
     }
 
+    /**
+     * @deprecated use {@link SolrContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public SolrContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public SolrContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         this.waitStrategy = new LogMessageWaitStrategy()
             .withRegEx(".*o\\.e\\.j\\.s\\.Server Started.*")
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
index 48cb04b7053..c2d19a3e61c 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -1,23 +1,25 @@
 package org.testcontainers.containers;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.io.IOException;
-
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.response.SolrPingResponse;
 import org.junit.After;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Simon Schneider
  */
 public class SolrContainerTest {
 
+    private static final DockerImageName SOLR_IMAGE = DockerImageName.parse("solr:8.3.0");
     private SolrClient client = null;
 
     @After
@@ -30,7 +32,7 @@ public void stopRestClient() throws IOException {
 
     @Test
     public void solrCloudTest() throws IOException, SolrServerException {
-        try (SolrContainer container = new SolrContainer()) {
+        try (SolrContainer container = new SolrContainer(SOLR_IMAGE)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
             assertThat(response.getStatus(), is(0));
@@ -40,7 +42,7 @@ public void solrCloudTest() throws IOException, SolrServerException {
 
     @Test
     public void solrStandaloneTest() throws IOException, SolrServerException {
-        try (SolrContainer container = new SolrContainer().withZookeeper(false)) {
+        try (SolrContainer container = new SolrContainer(SOLR_IMAGE).withZookeeper(false)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
             assertThat(response.getStatus(), is(0));
@@ -52,7 +54,7 @@ public void solrStandaloneTest() throws IOException, SolrServerException {
     public void solrCloudPingTest() throws IOException, SolrServerException {
         // solrContainerUsage {
         // Create the solr container.
-        SolrContainer container = new SolrContainer();
+        SolrContainer container = new SolrContainer(SOLR_IMAGE);
 
         // Start the container. This step might take some time...
         container.start();
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy
index 7a68302289f..639b46f5886 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy
@@ -15,7 +15,7 @@ import spock.lang.Specification
 class MySqlContainerIT extends Specification {
 
     @Shared
-    MySQLContainer mySQLContainer = new MySQLContainer()
+    MySQLContainer mySQLContainer = new MySQLContainer(SpockTestImages.MYSQL_IMAGE)
 
     def "dummy test"() {
         expect:
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
index 4ac095bed6f..a886d552732 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
@@ -14,7 +14,7 @@ import java.sql.Statement
 class PostgresContainerIT extends Specification {
 
     @Shared
-    PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer()
+    PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(SpockTestImages.POSTGRES_TEST_IMAGE)
             .withDatabaseName("foo")
             .withUsername("foo")
             .withPassword("secret")
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
new file mode 100644
index 00000000000..526c1fe5c42
--- /dev/null
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -0,0 +1,11 @@
+package org.testcontainers.spock;
+
+import org.testcontainers.utility.DockerImageName
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+interface SpockTestImages {
+    DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.22")
+    DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
+    DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
+    DockerImageName TINY_IMAGE = TestcontainersConfiguration.getInstance().getTinyDockerImageName()
+}
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
index 123828327bc..7fb37446ca5 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
@@ -10,7 +10,7 @@ import spock.lang.Shared
 class TestHierarchyIT extends MySqlContainerIT {
 
     @Shared
-    PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer()
+    PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(SpockTestImages.POSTGRES_TEST_IMAGE)
             .withDatabaseName("foo")
             .withUsername("foo")
             .withPassword("secret")
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
index 43be6d32ca4..eb628fd2f33 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
@@ -8,6 +8,8 @@
 import java.util.List;
 import java.util.Optional;
 
+import static org.testcontainers.spock.SpockTestImages.TINY_IMAGE;
+
 public class TestLifecycleAwareContainerMock extends GenericContainer<TestLifecycleAwareContainerMock> implements TestLifecycleAware {
 
     static final String BEFORE_TEST = "beforeTest";
@@ -18,6 +20,10 @@ public class TestLifecycleAwareContainerMock extends GenericContainer<TestLifecy
 
     Throwable capturedThrowable;
 
+    public TestLifecycleAwareContainerMock() {
+        super(TINY_IMAGE);
+    }
+
     @Override
     public void beforeTest(TestDescription description) {
         lifecycleMethodCalls.add(BEFORE_TEST);
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy
index b4b3741e580..81ed0eea724 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy
@@ -9,7 +9,7 @@ import spock.lang.Stepwise
 @Testcontainers
 class TestcontainersRestartBetweenTestsIT extends Specification {
 
-    GenericContainer genericContainer = new GenericContainer("httpd:2.4-alpine")
+    GenericContainer genericContainer = new GenericContainer(SpockTestImages.HTTPD_IMAGE)
             .withExposedPorts(80)
 
     @Shared
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
index 5a12ce25b71..23b761fcc38 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
@@ -14,7 +14,7 @@ import spock.lang.Stepwise
 class TestcontainersSharedContainerIT extends Specification {
 
     @Shared
-    GenericContainer genericContainer = new GenericContainer("httpd:2.4-alpine")
+    GenericContainer genericContainer = new GenericContainer(SpockTestImages.HTTPD_IMAGE)
             .withExposedPorts(80)
 
     @Shared
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index f2915b5af11..b01d031cc5b 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -9,6 +9,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -29,12 +30,24 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
     private final Map<String, ContainerProxy> proxies = new HashMap<>();
     private final AtomicInteger nextPort = new AtomicInteger(FIRST_PROXIED_PORT);
 
+    /**
+     * @deprecated use {@link ToxiproxyContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public ToxiproxyContainer() {
         this(IMAGE_NAME);
     }
 
-    public ToxiproxyContainer(String imageName) {
-        super(imageName);
+    /**
+     * @deprecated use {@link ToxiproxyContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public ToxiproxyContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ToxiproxyContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
         addExposedPorts(TOXIPROXY_CONTROL_PORT);
         setWaitStrategy(new HttpWaitStrategy().forPath("/version").forPort(TOXIPROXY_CONTROL_PORT));
 
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index d76851f57b5..87f9758ebf1 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -1,16 +1,19 @@
 package org.testcontainers.containers;
 
 import eu.rekawek.toxiproxy.model.ToxicDirection;
-import java.time.Duration;
 import org.junit.Rule;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
 import java.io.IOException;
+import java.time.Duration;
 
 import static java.lang.String.format;
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class ToxiproxyTest {
 
@@ -25,15 +28,17 @@ public class ToxiproxyTest {
     @Rule
     public Network network = Network.newNetwork();
 
+    private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:5.0.4");
     // The target container - this could be anything
     @Rule
-    public GenericContainer redis = new GenericContainer("redis:5.0.4")
+    public GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
         .withExposedPorts(6379)
         .withNetwork(network);
 
+    private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("shopify/toxiproxy:2.1.0");
     // Toxiproxy container, which will be used as a TCP proxy
     @Rule
-    public ToxiproxyContainer toxiproxy = new ToxiproxyContainer()
+    public ToxiproxyContainer toxiproxy = new ToxiproxyContainer(TOXIPROXY_IMAGE)
         .withNetwork(network)
         .withNetworkAliases(TOXIPROXY_NETWORK_ALIAS);
     // }
@@ -99,7 +104,7 @@ public void testConnectionCut() {
 
     @Test
     public void testMultipleProxiesCanBeCreated() {
-        try (GenericContainer secondRedis = new GenericContainer("redis:5.0.4")
+        try (GenericContainer<?> secondRedis = new GenericContainer<>(REDIS_IMAGE)
             .withExposedPorts(6379)
             .withNetwork(network)) {
 
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index ac4e730adb3..1532f463f37 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,11 +29,23 @@ public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericCo
 
     private int port = VAULT_PORT;
 
+    /**
+     * @deprecated use {@link VaultContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public VaultContainer() {
         this("vault:1.1.3");
     }
 
+    /**
+     * @deprecated use {@link VaultContainer(DockerImageName)} instead
+     */
+    @Deprecated
     public VaultContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public VaultContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         // Use the vault healthcheck endpoint to check for readiness, per https://www.vaultproject.io/api/system/health.html
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
index dfe73cae4b9..4a1a800da17 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
@@ -10,6 +10,7 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.testcontainers.vault.VaultTestImages.VAULT_IMAGE;
 
 public class VaultClientTest {
 
@@ -18,7 +19,7 @@ public class VaultClientTest {
     @Test
     public void writeAndReadMultipleValues() throws VaultException {
         try (
-            VaultContainer vaultContainer = new VaultContainer<>()
+            VaultContainer<?> vaultContainer = new VaultContainer<>(VAULT_IMAGE)
                     .withVaultToken(VAULT_TOKEN)
         ) {
 
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index d7ac5ca8686..b3dd788f053 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -19,7 +19,7 @@ public class VaultContainerTest {
     private static final String VAULT_TOKEN = "my-root-token";
 
     @ClassRule
-    public static VaultContainer vaultContainer = new VaultContainer<>()
+    public static VaultContainer<?> vaultContainer = new VaultContainer<>(VaultTestImages.VAULT_IMAGE)
         .withVaultToken(VAULT_TOKEN)
         .withSecretInVault("secret/testing1", "top_secret=password123")
         .withSecretInVault("secret/testing2",
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java
new file mode 100644
index 00000000000..9afecdcffb9
--- /dev/null
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers.vault;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface VaultTestImages {
+    DockerImageName VAULT_IMAGE = DockerImageName.parse("vault:1.1.3");
+}

From 39c4208ed4edfede2e8721b7aef4d1cb79a9073c Mon Sep 17 00:00:00 2001
From: Kirill Artamonov <artamonov.kirill@gmail.com>
Date: Sun, 19 Jul 2020 20:35:48 +0200
Subject: [PATCH 0872/4969] Update to latest LocalStack container and support
 unified port mode (#2825)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../utility/ComparableVersion.java            |   4 +
 .../localstack/LocalStackContainer.java       |  91 +++++++++++--
 .../containers/localstack/LegacyModeTest.java | 128 ++++++++++++++++++
 .../localstack/LocalstackContainerTest.java   |  80 ++++++-----
 .../localstack/LocalstackTestImages.java      |   8 ++
 5 files changed, 263 insertions(+), 48 deletions(-)
 create mode 100644 modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
 create mode 100644 modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java

diff --git a/core/src/main/java/org/testcontainers/utility/ComparableVersion.java b/core/src/main/java/org/testcontainers/utility/ComparableVersion.java
index 1ffa1642568..d3e3d9eb958 100644
--- a/core/src/main/java/org/testcontainers/utility/ComparableVersion.java
+++ b/core/src/main/java/org/testcontainers/utility/ComparableVersion.java
@@ -32,6 +32,10 @@ public int compareTo(@NotNull ComparableVersion other) {
         return 0;
     }
 
+    public boolean isSemanticVersion() {
+        return parts.length > 0;
+    }
+
     public boolean isLessThan(String other) {
         return this.compareTo(new ComparableVersion(other)) < 0;
     }
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 0136d94e3b2..3a9fab26ae4 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -4,15 +4,6 @@
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import org.rnorth.ducttape.Preconditions;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.TestcontainersConfiguration;
-
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -21,6 +12,16 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import org.rnorth.ducttape.Preconditions;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 /**
  * <p>Container for Atlassian Labs Localstack, 'A fully functional local AWS cloud stack'.</p>
@@ -30,13 +31,28 @@
  * {@link LocalStackContainer#getDefaultCredentialsProvider()}
  * be used to obtain compatible endpoint configuration and credentials, respectively.</p>
  */
+@Slf4j
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
-    public static final String VERSION = "0.10.8";
+    public static final String VERSION = "0.11.2";
+    static final int PORT = 4566;
     private static final String HOSTNAME_EXTERNAL_ENV_VAR = "HOSTNAME_EXTERNAL";
-
     private final List<Service> services = new ArrayList<>();
 
+    /**
+     * Whether or to assume that all APIs run on different ports (when <code>true</code>) or are
+     * exposed on a single port (<code>false</code>). From the Localstack README:
+     *
+     * <blockquote>Note: Starting with version 0.11.0, all APIs are exposed via a single edge
+     * service [...] The API-specific endpoints below are still left for backward-compatibility but
+     * may get removed in a future release - please reconfigure your client SDKs to start using the
+     * single edge endpoint URL!</blockquote>
+     * <p>
+     * Testcontainers will use the tag of the docker image to infer whether or not the used version
+     * of Localstack supports this feature.
+     */
+    private final boolean legacyMode;
+
     /**
      * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
      */
@@ -53,13 +69,41 @@ public LocalStackContainer(String version) {
         this(DockerImageName.parse(TestcontainersConfiguration.getInstance().getLocalStackImage() + ":" + version));
     }
 
+    /**
+     * @param dockerImageName    image name to use for Localstack
+     */
     public LocalStackContainer(final DockerImageName dockerImageName) {
+        this(dockerImageName, shouldRunInLegacyMode(dockerImageName.getVersionPart()));
+    }
+
+    /**
+     * @param dockerImageName    image name to use for Localstack
+     * @param useLegacyMode      if true, each AWS service is exposed on a different port
+     */
+    public LocalStackContainer(final DockerImageName dockerImageName, boolean useLegacyMode) {
         super(dockerImageName);
+        this.legacyMode = useLegacyMode;
 
         withFileSystemBind("//var/run/docker.sock", "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
     }
 
+    private static boolean shouldRunInLegacyMode(String version) {
+        if (version.equals("latest")) {
+            return false;
+        }
+
+        ComparableVersion comparableVersion = new ComparableVersion(version);
+        if (comparableVersion.isSemanticVersion()) {
+            boolean versionRequiresLegacyMode = comparableVersion.isLessThan("0.11");
+            return versionRequiresLegacyMode;
+        }
+
+        log.warn("Version {} is not a semantic version, LocalStack will run in legacy mode.", version);
+        log.warn("Consider using \"LocalStackContainer(DockerImageName dockerImageName, boolean legacyMode)\" constructor if you want to disable legacy mode.");
+        return true;
+    }
+
     @Override
     protected void configure() {
         super.configure();
@@ -81,9 +125,14 @@ protected void configure() {
         }
         logger().info("{} environment variable set to {} ({})", HOSTNAME_EXTERNAL_ENV_VAR, getEnvMap().get(HOSTNAME_EXTERNAL_ENV_VAR), hostnameExternalReason);
 
-        for (Service service : services) {
-            addExposedPort(service.getPort());
-        }
+        exposePorts();
+    }
+
+    private void exposePorts() {
+        services.stream()
+            .map(this::getServicePort)
+            .distinct()
+            .forEach(this::addExposedPort);
     }
 
     /**
@@ -154,12 +203,16 @@ public URI getEndpointOverride(Service service) {
             return new URI("http://" +
                 ipAddress +
                 ":" +
-                getMappedPort(service.getPort()));
+                getMappedPort(getServicePort(service)));
         } catch (UnknownHostException | URISyntaxException e) {
             throw new IllegalStateException("Cannot obtain endpoint URL", e);
         }
     }
 
+    private int getServicePort(Service service) {
+        return legacyMode ? service.port : PORT;
+    }
+
     /**
      * Provides a {@link AWSCredentialsProvider} that is preconfigured to communicate with a given simulated service.
      * The credentials provider should be set in the AWS Java SDK when building a client, e.g.:
@@ -271,5 +324,13 @@ public enum Service {
         String localStackName;
 
         int port;
+
+        @Deprecated
+        /*
+            Since version 0.11, LocalStack exposes all services on a single (4566) port.
+         */
+        public int getPort() {
+            return port;
+        }
     }
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
new file mode 100644
index 00000000000..f50846b091f
--- /dev/null
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -0,0 +1,128 @@
+package org.testcontainers.containers.localstack;
+
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.function.Consumer;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
+import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_IMAGE;
+
+@RunWith(Enclosed.class)
+public class LegacyModeTest {
+
+    @RunWith(Parameterized.class)
+    @AllArgsConstructor
+    public static class Off {
+        private final String description;
+        private final LocalStackContainer localstack;
+
+        @Parameterized.Parameters(name = "{0}")
+        public static Iterable<Object[]> constructors() {
+            return Arrays.asList(new Object[][]{
+                {"default constructor", new LocalStackContainer(LOCALSTACK_IMAGE)},
+                {"latest", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("latest"))},
+                {"0.11.1", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.11.1"))},
+                {"0.7.0 with legacy = off", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.7.0"), false)}
+            });
+        }
+
+        @Test
+        public void samePortIsExposedForAllServices() {
+            localstack.withServices(S3, SQS);
+            localstack.start();
+
+            assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
+            assertEquals(
+                "Endpoint overrides are different",
+                localstack.getEndpointOverride(S3).toString(),
+                localstack.getEndpointOverride(SQS).toString());
+            assertEquals(
+                "Endpoint configuration have different endpoints",
+                localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
+                localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+        }
+
+        @After
+        public void cleanup() {
+            if (localstack != null) localstack.stop();
+        }
+    }
+
+    @RunWith(Parameterized.class)
+    @AllArgsConstructor
+    public static class On {
+        private final String description;
+        private final LocalStackContainer localstack;
+
+        @BeforeClass
+        public static void createCustomTag() {
+            run("docker pull localstack/localstack:latest");
+            run("docker tag localstack/localstack:latest localstack/localstack:custom");
+        }
+
+        @Parameterized.Parameters(name = "{0}")
+        public static Iterable<Object[]> constructors() {
+            return Arrays.asList(new Object[][]{
+                {"0.10.7", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.10.7"))},
+                {"custom", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("custom"))},
+                {"0.11.1 with legacy = on", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.11.1"), true)}
+            });
+        }
+
+        @Test
+        public void differentPortsAreExposed() {
+            localstack.withServices(S3, SQS);
+            localstack.start();
+
+            assertTrue("Multiple ports are exposed", localstack.getExposedPorts().size() > 1);
+            assertNotEquals(
+                "Endpoint overrides are different",
+                localstack.getEndpointOverride(S3).toString(),
+                localstack.getEndpointOverride(SQS).toString());
+            assertNotEquals(
+                "Endpoint configuration have different endpoints",
+                localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
+                localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+        }
+
+        @After
+        public void cleanup() {
+            if (localstack != null) localstack.stop();
+        }
+    }
+
+    @SneakyThrows
+    private static void run(String command) {
+        Process process = Runtime.getRuntime().exec(command);
+        join(process.getInputStream(), System.out::println);
+        join(process.getErrorStream(), System.err::println);
+        process.waitFor();
+        if (process.exitValue() != 0)
+            throw new RuntimeException("Failed to execute " + command);
+    }
+
+    private static void join(InputStream stream, Consumer<String> logger) throws IOException {
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream));
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            logger.accept(line);
+        }
+    }
+
+}
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 63be9d66df7..fad4060341c 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,6 +1,16 @@
 package org.testcontainers.containers.localstack;
 
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.containers.localstack.LocalStackContainer.PORT;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCHLOGS;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.KMS;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
+
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
 import com.amazonaws.services.kms.model.CreateKeyRequest;
@@ -18,6 +28,10 @@
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
 import com.amazonaws.services.sqs.model.CreateQueueResult;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
@@ -35,20 +49,6 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Optional;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCHLOGS;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.KMS;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
-
 /**
  * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
  * <p>
@@ -60,14 +60,13 @@
 @RunWith(Enclosed.class)
 public class LocalstackContainerTest {
 
-    private static final DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.10.8");
-    private static final DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("atlassian/pipelines-awscli:1.16.302");
-
     public static class WithoutNetwork {
 
         // without_network {
         @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(LOCALSTACK_IMAGE)
+        public static LocalStackContainer localstack = new LocalStackContainer(
+            DockerImageName.parse("localstack/localstack:0.11.0")
+        )
             .withServices(S3, SQS, CLOUDWATCHLOGS, KMS);
         // }
 
@@ -124,7 +123,7 @@ public void sqsTestOverBridgeNetwork() {
             CreateQueueResult queueResult = sqs.createQueue("baz");
             String fooQueueUrl = queueResult.getQueueUrl();
             assertThat("Created queue has external hostname URL", fooQueueUrl,
-                containsString("http://" + DockerClientFactory.instance().dockerHostIpAddress() + ":" + localstack.getMappedPort(SQS.getPort())));
+                containsString("http://" + DockerClientFactory.instance().dockerHostIpAddress() + ":" + localstack.getMappedPort(PORT)));
 
             sqs.sendMessage(fooQueueUrl, "test");
             final long messageCount = sqs.receiveMessage(fooQueueUrl).getMessages().stream()
@@ -136,8 +135,8 @@ public void sqsTestOverBridgeNetwork() {
         @Test
         public void cloudWatchLogsTestOverBridgeNetwork() {
             AWSLogs logs = AWSLogsClientBuilder.standard()
-                    .withEndpointConfiguration(localstack.getEndpointConfiguration(CLOUDWATCHLOGS))
-                    .withCredentials(localstack.getDefaultCredentialsProvider()).build();
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(CLOUDWATCHLOGS))
+                .withCredentials(localstack.getDefaultCredentialsProvider()).build();
 
             logs.createLogGroup(new CreateLogGroupRequest("foo"));
 
@@ -160,6 +159,19 @@ public void kmsKeyCreationTest() {
 
             assertEquals("AWS KMS Customer Managed Key should be created ", key.getKeyMetadata().getDescription(), desc);
         }
+
+        @Test
+        public void samePortIsExposedForAllServices() {
+            assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
+            assertEquals(
+                "Endpoint overrides are different",
+                localstack.getEndpointOverride(S3).toString(),
+                localstack.getEndpointOverride(SQS).toString());
+            assertEquals(
+                "Endpoint configuration have different endpoints",
+                localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
+                localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+        }
     }
 
     public static class WithNetwork {
@@ -167,14 +179,16 @@ public static class WithNetwork {
         private static Network network = Network.newNetwork();
 
         @ClassRule
-        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(LOCALSTACK_IMAGE)
+        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(
+            DockerImageName.parse("localstack/localstack:0.11.0")
+        )
             .withNetwork(network)
             .withNetworkAliases("notthis", "localstack")    // the last alias is used for HOSTNAME_EXTERNAL
             .withServices(S3, SQS, CLOUDWATCHLOGS);
         // }
 
         @ClassRule
-        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(AWS_CLI_IMAGE)
+        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(LocalstackTestImages.AWS_CLI_IMAGE)
             .withNetwork(network)
             .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("top"))
             .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
@@ -184,33 +198,33 @@ public static class WithNetwork {
 
         @Test
         public void s3TestOverDockerNetwork() throws Exception {
-            runAwsCliAgainstDockerNetworkContainer("s3api create-bucket --bucket foo", S3.getPort());
-            runAwsCliAgainstDockerNetworkContainer("s3api list-buckets", S3.getPort());
-            runAwsCliAgainstDockerNetworkContainer("s3 ls s3://foo", S3.getPort());
+            runAwsCliAgainstDockerNetworkContainer("s3api create-bucket --bucket foo");
+            runAwsCliAgainstDockerNetworkContainer("s3api list-buckets");
+            runAwsCliAgainstDockerNetworkContainer("s3 ls s3://foo");
         }
 
         @Test
         public void sqsTestOverDockerNetwork() throws Exception {
-            final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer("sqs create-queue --queue-name baz", SQS.getPort());
+            final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer("sqs create-queue --queue-name baz");
 
             assertThat("Created queue has external hostname URL", queueCreationResponse,
-                containsString("http://localstack:" + SQS.getPort()));
+                containsString("http://localstack:" + PORT));
 
             runAwsCliAgainstDockerNetworkContainer(
-                String.format("sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test", SQS.getPort(), SQS.getPort()), SQS.getPort());
+                String.format("sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test", PORT, PORT));
             final String message = runAwsCliAgainstDockerNetworkContainer(
-                String.format("sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz", SQS.getPort(), SQS.getPort()), SQS.getPort());
+                String.format("sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz", PORT, PORT));
 
             assertTrue("the sent message can be received", message.contains("\"Body\": \"test\""));
         }
 
         @Test
         public void cloudWatchLogsTestOverDockerNetwork() throws Exception {
-            runAwsCliAgainstDockerNetworkContainer("logs create-log-group --log-group-name foo", CLOUDWATCHLOGS.getPort());
+            runAwsCliAgainstDockerNetworkContainer("logs create-log-group --log-group-name foo");
         }
 
-        private String runAwsCliAgainstDockerNetworkContainer(String command, final int port) throws Exception {
-            final String[] commandParts = String.format("/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl", command, port).split(" ");
+        private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exception {
+            final String[] commandParts = String.format("/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl", command, PORT).split(" ");
             final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);
             Assert.assertEquals(0, execResult.getExitCode());
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
new file mode 100644
index 00000000000..60e5498daf3
--- /dev/null
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -0,0 +1,8 @@
+package org.testcontainers.containers.localstack;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface LocalstackTestImages {
+    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.11.0");
+    DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("atlassian/pipelines-awscli:1.16.302");
+}

From dd0d21837e7062762969dac3c25207f445b70e0d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 19 Jul 2020 19:43:10 +0100
Subject: [PATCH 0873/4969] Add latest backers

---
 docs/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 4894297f034..131a9074bfd 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -137,6 +137,8 @@ A huge thank you to our backers:
 * [Lukas Eder (@lukaseder)](https://github.com/lukaseder)
 * [Fedor Korotkov (@fkorotkov)](https://github.com/fkorotkov)
 * [Christoph Dreis (@dreis2211)](https://github.com/dreis2211)
+* [Pascal Zwick (@pas2al)](https://github.com/pas2al)
+* [Nikita Zhevnitskiy (@zhenik)](https://github.com/zhenik)
 
 
 ## License

From 706a6697408ef3c9ca98e5d7ab559e4ccfdf8cff Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 27 Jul 2020 18:30:22 +0200
Subject: [PATCH 0874/4969] Fix the Rootless Docker CI job (#3050)

---
 .github/workflows/ci-rootless.yml             | 23 ++++++--
 .../RootlessDockerClientProviderStrategy.java | 54 +++++++++++++++++--
 2 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index e752747b804..7dacc2767a5 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -7,6 +7,14 @@ on:
 jobs:
   test:
     runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { XDG_RUNTIME_DIR: "" }
+          - { XDG_RUNTIME_DIR: "/tmp/docker-testcontainers/" }
+    env:
+      XDG_RUNTIME_DIR: ${{ matrix.XDG_RUNTIME_DIR }}
     steps:
       - uses: actions/checkout@v2
       - name: debug
@@ -14,17 +22,22 @@ jobs:
       - name: uninstall rootful Docker
         run: sudo apt-get -q -y --purge remove moby-engine moby-buildx && sudo rm -rf /var/run/docker.sock
       - name: install rootless Docker
-        run: curl -fsSL https://get.docker.com/rootless | sh
-      - name: start rootless Docker
-        run: PATH=$HOME/bin:$PATH XDG_RUNTIME_DIR=/tmp/docker-$(id -u) dockerd-rootless.sh --experimental --storage-driver vfs &
+        run: |
+          mkdir -p $XDG_RUNTIME_DIR || true
+          curl -fsSL https://get.docker.com/rootless | sh > init.sh
+          cat init.sh
+          source <(grep '^export' init.sh)
+          PATH=$HOME/bin:$PATH dockerd-rootless.sh --experimental --storage-driver vfs &
+          sleep 1
+          DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock docker info || ls -la $XDG_RUNTIME_DIR
       - name: Build with Gradle
-        run: XDG_RUNTIME_DIR=/tmp/docker-$(id -u) ./gradlew --no-daemon --scan testcontainers:test
+        run: ./gradlew --no-daemon --scan testcontainers:test
       - name: aggregate test reports with ciMate
         if: always()
         continue-on-error: true
         env:
           CIMATE_PROJECT_ID: 2348n4vl
-          CIMATE_CI_KEY: "CI / rootless Docker"
+          CIMATE_CI_KEY: "CI / rootless Docker (${{ matrix.XDG_RUNTIME_DIR }})"
         run: |
           wget -q https://get.cimate.io/release/linux/cimate
           chmod +x cimate
diff --git a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
index cc6b23e506d..3ee58f4910a 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
@@ -2,28 +2,72 @@
 
 import com.sun.jna.Library;
 import com.sun.jna.Native;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Optional;
 
 /**
  *
  * @deprecated this class is used by the SPI and should not be used directly
  */
 @Deprecated
+@Slf4j
 public final class RootlessDockerClientProviderStrategy extends DockerClientProviderStrategy {
 
     public static final int PRIORITY = UnixSocketClientProviderStrategy.PRIORITY + 1;
 
-    private Path getSocketPath() {
+    @Getter(lazy = true)
+    @Nullable
+    private final Path socketPath = resolveSocketPath();
+
+    private Path resolveSocketPath() {
+        return tryEnv().orElseGet(() -> {
+            Path homePath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("run");
+            return tryFolder(homePath).orElseGet(() -> {
+                Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
+                return tryFolder(implicitPath).orElse(null);
+            });
+        });
+    }
+
+    private Optional<Path> tryEnv() {
         String xdgRuntimeDir = System.getenv("XDG_RUNTIME_DIR");
-        if (xdgRuntimeDir == null) {
-            xdgRuntimeDir = "/run/user/" + LibC.INSTANCE.getuid();
+        if (StringUtils.isBlank(xdgRuntimeDir)) {
+            log.debug("$XDG_RUNTIME_DIR is not set.");
+            return Optional.empty();
+        }
+        Path path = Paths.get(xdgRuntimeDir);
+        if (!Files.exists(path)) {
+            log.debug("$XDG_RUNTIME_DIR is set to '{}' but the folder does not exist.", path);
+            return Optional.empty();
+        }
+        Path socketPath = path.resolve("docker.sock");
+        if (!Files.exists(socketPath)) {
+            log.debug("$XDG_RUNTIME_DIR is set but '{}' does not exist.", socketPath);
+            return Optional.empty();
+        }
+        return Optional.of(socketPath);
+    }
+
+    private Optional<Path> tryFolder(Path path) {
+        if (!Files.exists(path)) {
+            log.debug("'{}' does not exist.", path);
+            return Optional.empty();
+        }
+        Path socketPath = path.resolve("docker.sock");
+        if (!Files.exists(socketPath)) {
+            log.debug("'{}' does not exist.", socketPath);
+            return Optional.empty();
         }
-        return Paths.get(xdgRuntimeDir).resolve("docker.sock");
+        return Optional.of(socketPath);
     }
 
     @Override
@@ -35,7 +79,7 @@ public TransportConfig getTransportConfig() throws InvalidConfigurationException
 
     @Override
     protected boolean isApplicable() {
-        return SystemUtils.IS_OS_LINUX && Files.exists(getSocketPath());
+        return SystemUtils.IS_OS_LINUX && getSocketPath() != null && Files.exists(getSocketPath());
     }
 
     @Override

From 32c05bd88f120d1b9225f01ed683febd82df0b50 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 28 Jul 2020 13:44:05 +0200
Subject: [PATCH 0875/4969] 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 0876/4969] 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 <rich.north@gmail.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 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 0877/4969] 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] <support@github.com>

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 0878/4969] 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 <rich.north@gmail.com>
---
 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 0879/4969] 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 <rich.north@gmail.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 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 0880/4969] 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 <rich.north@gmail.com>
---
 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 0881/4969] 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 <rich.north@gmail.com>
---
 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 0882/4969] 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 <rich.north@gmail.com>
---
 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 0883/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0884/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0885/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0886/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0887/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0888/4969] 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 <rich.north@gmail.com>
---
 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 0889/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0890/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 0891/4969] 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] <support@github.com>

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 0892/4969] 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 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 0893/4969] 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 <rich.north@gmail.com>
---
 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 0894/4969] 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] <support@github.com>

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 0895/4969] 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] <support@github.com>

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 0896/4969] 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] <support@github.com>

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 <kiview@users.noreply.github.com>
Date: Sat, 1 Aug 2020 16:44:34 +0200
Subject: [PATCH 0897/4969] Add some more logs to bash script used for
 DockerHealthcheckWaitStratgyTest (#2988)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../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

From 135a61eb2b1fc5b36c1e0eea57bbe6efca641930 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:45:27 +0100
Subject: [PATCH 0898/4969] Bump kafka-clients from 2.5.0 to 2.6.0 in
 /modules/kafka (#3085)

Bumps kafka-clients from 2.5.0 to 2.6.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 06090c5b35e..3d8a663a0e9 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.5.0'
+    testCompile 'org.apache.kafka:kafka-clients:2.6.0'
     testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile 'com.google.guava:guava:23.0'
 }

From 22eb3f6e126d71e402ae47b5cad980780f8137e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:45:47 +0100
Subject: [PATCH 0899/4969] Bump aws-java-sdk-s3 from 1.11.831 to 1.11.837 in
 /modules/localstack (#3088)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.831 to 1.11.837.
- [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.831...1.11.837)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index ad5808a97b2..372407baa41 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.831'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.816'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.837'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.837'
     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 c8adfb5ad6829196fea3c8fd9eff148c23b83b98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:17:22 +0100
Subject: [PATCH 0900/4969] Bump mongo-java-driver from 3.12.6 to 3.12.7 in
 /core (#3104)

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.6 to 3.12.7.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.6...r3.12.7)

Signed-off-by: dependabot[bot] <support@github.com>

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 894990fe9a0..81c0c20608c 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.6'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 
     testCompile ('org.mockito:mockito-core:3.4.6') {
         exclude(module: 'hamcrest-core')

From e99822c1b18bbde6c5aeeabab1477e8a3fc8d18b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:17:38 +0100
Subject: [PATCH 0901/4969] Bump mockito-core from 3.4.6 to 3.5.0 in /core
 (#3105)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.6 to 3.5.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.4.6...v3.5.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 81c0c20608c..4c1a47255ce 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.7'
 
-    testCompile ('org.mockito:mockito-core:3.4.6') {
+    testCompile ('org.mockito:mockito-core:3.5.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 36f9e2be29641391df373566e904010522d41213 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:17:54 +0100
Subject: [PATCH 0902/4969] Bump postgresql from 42.2.14 to 42.2.15 in
 /examples (#3108)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.14 to 42.2.15.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.14...REL42.2.15)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 75bc7f3b0e8..9af26701f34 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.8.0'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.14'
+    testImplementation 'org.postgresql:postgresql:42.2.15'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From 91c718d7951435f35e541fb54ba709591783e5c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:18:19 +0100
Subject: [PATCH 0903/4969] Bump cucumber-junit from 6.2.2 to 6.4.0 in
 /examples (#3109)

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 6.2.2 to 6.4.0.
- [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.2.2...v6.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 ae211cedc04..6d56e68473e 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.2.2'
+    testImplementation 'io.cucumber:cucumber-junit:6.4.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 5653f0e80d0ed9e943a73ebdbd94ad005ea43c83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:18:48 +0100
Subject: [PATCH 0904/4969] Bump okhttp from 4.8.0 to 4.8.1 in /examples
 (#3106)

Bumps [okhttp](https://github.com/square/okhttp) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.8.0...parent-4.8.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 9af26701f34..a62854e9b35 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.8.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.8.1'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.15'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From 82bc1658c55ff3828687cd2e9aa1e3d48e395535 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:19:12 +0100
Subject: [PATCH 0905/4969] Bump aws-java-sdk-dynamodb from 1.11.827 to
 1.11.837 in /modules/dynalite (#3090)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index d04705cb4d4..fce2e17bd88 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.827'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.837'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.827'
 }

From 36f31d6a759eda6b4177d2c0695b65d090702a4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:21:33 +0100
Subject: [PATCH 0906/4969] Bump solr-solrj from 8.5.2 to 8.6.1 in /examples
 (#3107)

Bumps solr-solrj from 8.5.2 to 8.6.1.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 5845753cb08..89444aeb378 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.10"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
-    implementation 'org.apache.solr:solr-solrj:8.5.2'
+    implementation 'org.apache.solr:solr-solrj:8.6.1'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 8de8a0a2e323a5962410194ad3b49ecf10cc2521 Mon Sep 17 00:00:00 2001
From: Artjom Kalita <artjom.kalita@gmail.com>
Date: Thu, 20 Aug 2020 10:23:42 +0300
Subject: [PATCH 0907/4969] Whitespace configuration fix (#3127, fixes #3053)

Co-authored-by: artjom.kalita <artjoms.kalita@wandoofinance.com>
---
 .../utility/TestcontainersConfiguration.java  | 24 ++++++++++---------
 .../TestcontainersConfigurationTest.java      |  4 ++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 1939e8e21b3..9f283ba2685 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -37,7 +37,7 @@ public class TestcontainersConfiguration {
     private static File ENVIRONMENT_CONFIG_FILE = new File(System.getProperty("user.home"), "." + PROPERTIES_FILE_NAME);
 
     @Getter(lazy = true)
-    private static final TestcontainersConfiguration instance = loadConfiguration();;
+    private static final TestcontainersConfiguration instance = loadConfiguration();
 
     @SuppressWarnings({"ConstantConditions", "unchecked", "rawtypes"})
     @VisibleForTesting
@@ -56,16 +56,18 @@ static AtomicReference<TestcontainersConfiguration> getInstanceField() {
 
         this.properties.putAll(classpathProperties);
         this.properties.putAll(environmentProperties);
+        properties.keySet()
+            .forEach(key -> properties.replace(key, properties.getProperty(String.valueOf(key)).trim()));
     }
 
     @Deprecated
     public String getAmbassadorContainerImage() {
-        return (String) properties.getOrDefault("ambassador.container.image", "richnorth/ambassador:latest");
+        return String.valueOf(properties.getOrDefault("ambassador.container.image", "richnorth/ambassador:latest"));
     }
 
     @Deprecated
     public String getSocatContainerImage() {
-        return (String) properties.getOrDefault("socat.container.image", "alpine/socat:latest");
+        return String.valueOf(properties.getOrDefault("socat.container.image", "alpine/socat:latest"));
     }
 
     public DockerImageName getSocatDockerImageName() {
@@ -74,7 +76,7 @@ public DockerImageName getSocatDockerImageName() {
 
     @Deprecated
     public String getVncRecordedContainerImage() {
-        return (String) properties.getOrDefault("vncrecorder.container.image", "testcontainers/vnc-recorder:1.1.0");
+        return String.valueOf(properties.getOrDefault("vncrecorder.container.image", "testcontainers/vnc-recorder:1.1.0"));
     }
 
     public DockerImageName getVncDockerImageName() {
@@ -83,7 +85,7 @@ public DockerImageName getVncDockerImageName() {
 
     @Deprecated
     public String getDockerComposeContainerImage() {
-        return (String) properties.getOrDefault("compose.container.image", "docker/compose:1.24.1");
+        return String.valueOf(properties.getOrDefault("compose.container.image", "docker/compose:1.24.1"));
     }
 
     public DockerImageName getDockerComposeDockerImageName() {
@@ -92,7 +94,7 @@ public DockerImageName getDockerComposeDockerImageName() {
 
     @Deprecated
     public String getTinyImage() {
-        return (String) properties.getOrDefault("tinyimage.container.image", "alpine:3.5");
+        return String.valueOf(properties.getOrDefault("tinyimage.container.image", "alpine:3.5"));
     }
 
     public DockerImageName getTinyDockerImageName() {
@@ -105,7 +107,7 @@ public boolean isRyukPrivileged() {
 
     @Deprecated
     public String getRyukImage() {
-        return (String) properties.getOrDefault("ryuk.container.image", "testcontainers/ryuk:0.3.0");
+        return String.valueOf(properties.getOrDefault("ryuk.container.image", "testcontainers/ryuk:0.3.0"));
     }
 
     public DockerImageName getRyukDockerImageName() {
@@ -114,7 +116,7 @@ public DockerImageName getRyukDockerImageName() {
 
     @Deprecated
     public String getSSHdImage() {
-        return (String) properties.getOrDefault("sshd.container.image", "testcontainers/sshd:1.0.0");
+        return String.valueOf(properties.getOrDefault("sshd.container.image", "testcontainers/sshd:1.0.0"));
     }
 
     public DockerImageName getSSHdDockerImageName() {
@@ -127,7 +129,7 @@ public Integer getRyukTimeout() {
 
     @Deprecated
     public String getKafkaImage() {
-        return (String) properties.getOrDefault("kafka.container.image", "confluentinc/cp-kafka");
+        return String.valueOf(properties.getOrDefault("kafka.container.image", "confluentinc/cp-kafka"));
     }
 
     public DockerImageName getKafkaDockerImageName() {
@@ -136,7 +138,7 @@ public DockerImageName getKafkaDockerImageName() {
 
     @Deprecated
     public String getPulsarImage() {
-        return (String) properties.getOrDefault("pulsar.container.image", "apachepulsar/pulsar");
+        return String.valueOf(properties.getOrDefault("pulsar.container.image", "apachepulsar/pulsar"));
     }
 
     public DockerImageName getPulsarDockerImageName() {
@@ -145,7 +147,7 @@ public DockerImageName getPulsarDockerImageName() {
 
     @Deprecated
     public String getLocalStackImage() {
-        return (String) properties.getOrDefault("localstack.container.image", "localstack/localstack");
+        return String.valueOf(properties.getOrDefault("localstack.container.image", "localstack/localstack"));
     }
 
     public DockerImageName getLocalstackDockerImageName() {
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index 49a378554f1..f0b8fb36a37 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -46,6 +46,10 @@ public void shouldReadReuseFromEnvironmentOnly() {
 
         environmentProperties.setProperty("testcontainers.reuse.enable", "true");
         assertTrue("reuse enabled", newConfig().environmentSupportsReuse());
+
+        environmentProperties.setProperty("ryuk.container.image", " testcontainersofficial/ryuk:0.3.0 ");
+        assertEquals("trailing whitespace was not removed from image name property", "testcontainersofficial/ryuk:0.3.0",newConfig().getRyukImage());
+
     }
 
     private TestcontainersConfiguration newConfig() {

From 14a6a09eb7893e8e356ffa4ced29a9d098b523e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 08:52:41 +0100
Subject: [PATCH 0908/4969] Bump s3 from 2.13.61 to 2.13.76 in
 /modules/localstack (#3114)

Bumps s3 from 2.13.61 to 2.13.76.

Signed-off-by: dependabot[bot] <support@github.com>

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 372407baa41..f77d286bfca 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.837'
     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'
+    testCompile 'software.amazon.awssdk:s3:2.13.76'
 }

From 37df788493c470d7994aea463d777a5de9559027 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 20 Aug 2020 09:05:53 +0100
Subject: [PATCH 0909/4969] Add continue-on-error for cache step, and upgrade
 GH cache action (#3133)

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 668dde2b28c..2b5a37a3405 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,8 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v1
+        uses: actions/cache@v2
+        continue-on-error: true
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}

From 2543ea885427d61cec16ae1e0c72a964a928f691 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:06:19 +0100
Subject: [PATCH 0910/4969] Bump aws-java-sdk-s3 from 1.11.837 to 1.11.846 in
 /modules/localstack (#3131)

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 f77d286bfca..d018846c1aa 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.837'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.846'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.837'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.831'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From d9dd5a7692ffcbbf0ce1d3eccb175c5b1dead2ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:06:38 +0100
Subject: [PATCH 0911/4969] Bump aws-java-sdk-sqs from 1.11.831 to 1.11.846 in
 /modules/localstack (#3132)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.831 to 1.11.846.
- [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.831...1.11.846)

Signed-off-by: dependabot[bot] <support@github.com>

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 d018846c1aa..9891879fc1a 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.846'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.837'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.831'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.846'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.13.76'
 }

From 09479d1df577c408f61bdea40c6808f30db02348 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:06:54 +0100
Subject: [PATCH 0912/4969] Bump cucumber-java from 6.2.2 to 6.4.0 in /examples
 (#3112)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 6.2.2 to 6.4.0.
- [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.2.2...v6.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 6d56e68473e..90cc99e7627 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.2.2'
+    testImplementation 'io.cucumber:cucumber-java:6.4.0'
     testImplementation 'io.cucumber:cucumber-junit:6.4.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 58c4cf2d6e8b33046c3ca0ec206acef8f4070065 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:07:10 +0100
Subject: [PATCH 0913/4969] Bump postgresql from 42.2.14 to 42.2.15 in
 /modules/postgresql (#3113)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.14 to 42.2.15.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.14...REL42.2.15)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 8f30490eeb8..894930bc258 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
-    testCompile 'org.postgresql:postgresql:42.2.14'
+    testCompile 'org.postgresql:postgresql:42.2.15'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'

From 9790538a45f8104dc8e24f26fc5ad5028dd0a498 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:07:25 +0100
Subject: [PATCH 0914/4969] Bump postgresql from 42.2.14 to 42.2.15 in
 /modules/junit-jupiter (#3115)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.14 to 42.2.15.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.14...REL42.2.15)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 05ad7d34930..ebc03695d0d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     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 'org.postgresql:postgresql:42.2.15'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }

From 47f3fb71833fc388796ec9fa287908192045b29a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:09:12 +0100
Subject: [PATCH 0915/4969] Bump mockito-core from 3.4.4 to 3.5.2 in
 /modules/junit-jupiter (#3130)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.4 to 3.5.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.4.4...v3.5.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 ebc03695d0d..6e37336545d 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.4.4') {
+    testCompile ('org.mockito:mockito-core:3.5.2') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.16.1'

From 0b6007956ca3f794aad0cfe43be4dfaca6b0c111 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 09:09:23 +0100
Subject: [PATCH 0916/4969] Bump org.springframework.boot from 2.3.2.RELEASE to
 2.3.3.RELEASE in /examples (#3111)

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.3.2.RELEASE to 2.3.3.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.3.2.RELEASE...v2.3.3.RELEASE)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 e8a7861a7d9..eb9c2d9ce3a 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.2.RELEASE'
+    id 'org.springframework.boot' version '2.3.3.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 4821f0921e3..d74851d8eac 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.2.RELEASE'
+    id 'org.springframework.boot' version '2.3.3.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From b1a1dd1c422b2c1f445df81283bf0d1364a72cdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 10:04:27 +0100
Subject: [PATCH 0917/4969] Bump influxdb-java from 2.19 to 2.20 in
 /modules/influxdb (#3120)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 2deacd3a149..40fa6e456ce 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.19'
+    compileOnly 'org.influxdb:influxdb-java:2.20'
     testCompile 'org.influxdb:influxdb-java:2.19'
 }

From 6bdbc8ffe257fc879791eb7fddcf3b5ecccdd52d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 10:04:35 +0100
Subject: [PATCH 0918/4969] Bump postgresql from 42.2.14 to 42.2.15 in
 /modules/spock (#3119)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.14 to 42.2.15.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.14...REL42.2.15)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 1a9eddf4ffc..eb2914ae3ac 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
-    testRuntime 'org.postgresql:postgresql:42.2.14'
+    testRuntime 'org.postgresql:postgresql:42.2.15'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
 }
 

From 93504a5ca04f5d86c604242124fe5e96ae553bf8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:57:58 +0100
Subject: [PATCH 0919/4969] Bump assertj-core from 3.16.1 to 3.17.0 in
 /modules/pulsar (#3153)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.16.1 to 3.17.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.17.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index a8f55696a65..493c5fa4c32 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.0'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.1'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.0'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.0'
 }

From 2459cab02a914db9a1f554104a13b5180d441dc6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:58:27 +0100
Subject: [PATCH 0920/4969] Bump aws-java-sdk-dynamodb from 1.11.837 to
 1.11.847 in /modules/dynalite (#3150)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.837 to 1.11.847.
- [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.837...1.11.847)

Signed-off-by: dependabot[bot] <support@github.com>

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 fce2e17bd88..762e189173b 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.837'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.827'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.847'
+    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.847'
 }

From 4f056827712a475e0db0d45380f1d0d10e45870a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:58:39 +0100
Subject: [PATCH 0921/4969] Bump aws-java-sdk-s3 from 1.11.846 to 1.11.847 in
 /modules/localstack (#3148)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.846 to 1.11.847.
- [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.846...1.11.847)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 9891879fc1a..acf42539c88 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.846'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.837'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.847'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.847'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.846'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.13.76'

From b236eacd54f6362a138f2582f04501cdb8bab5e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:00:11 +0100
Subject: [PATCH 0922/4969] Bump postgresql from 42.2.15 to 42.2.16 in
 /modules/junit-jupiter (#3142)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.15 to 42.2.16.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.15...REL42.2.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 6e37336545d..28f48cf94bb 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
-    testRuntime 'org.postgresql:postgresql:42.2.15'
+    testRuntime 'org.postgresql:postgresql:42.2.16'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }

From c42c8eebad51206be675ad330d5c8aefe07f230d Mon Sep 17 00:00:00 2001
From: Waldemar Panas <8766331+wpanas@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:01:35 +0200
Subject: [PATCH 0923/4969] #3129 Fix dead link for CircleCI configuration
 (#3156)

Co-authored-by: wpanas <wpanas@users.noreply.github.com>
---
 docs/supported_docker_environment/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 7622a5051cd..04cc0c9ee2b 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -6,7 +6,7 @@
 |-------------------------------------|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Linux - general                     | Docker v1.10              |                                                                                                                                                                                                                                                                                                                                                                    |
 | Linux - Travis CI                   | Docker v1.10              | See [example .travis.yml](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/.travis.yml) for baseline Travis CI configuration                                                                                                                                                                                                                                                                                     |
-| Linux - Circle CI (LXC driver)      | Docker v1.9.1               | The `exec` feature is not compatible with Circle CI. See [example circle.yml](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/circle.yml) for baseline CircleCI configuration                                                                                                                                                                                                                                   |
+| Linux - CircleCI (LXC driver)      | Docker v1.9.1               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                                                                                                                                                                                   |
 | Linux - within a Docker container            | Docker v1.12              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                                                                                                                                                                              |
 | Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                                                                                                                                                                                    |
 | Mac OS X - Docker for Mac      | 1.12.0          | *Support is best-efforts at present*. `getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |

From 21af1b9045f2998588375a90d975ac8aca95535c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:01:54 +0100
Subject: [PATCH 0924/4969] Bump elasticsearch-rest-client from 7.8.0 to 7.9.0
 in /modules/elasticsearch (#3152)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.8.0 to 7.9.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.8.0...v7.9.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 591760d7b0e..20097bd19b4 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.8.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.0"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 1c442c9063474f1c4b722a768dec1f4f2a737346 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:24:52 +0100
Subject: [PATCH 0925/4969] Bump pulsar-client-admin from 2.6.0 to 2.6.1 in
 /modules/pulsar (#3154)

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 493c5fa4c32..9aaed8e23fd 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.0'
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.1'
 }

From 698738cacf662ef2f626f8e59b78b559ef5a14ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:25:04 +0100
Subject: [PATCH 0926/4969] Bump assertj-core from 3.16.1 to 3.17.0 in
 /modules/vault (#3146)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.16.1 to 3.17.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.17.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 0d094905198..5c83cbbb56f 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.1'
-    testCompile 'org.assertj:assertj-core:3.16.1'
+    testCompile 'org.assertj:assertj-core:3.17.0'
 
 }

From b5bf40cc58a13ea18c02a36764e40b1528869609 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:25:11 +0100
Subject: [PATCH 0927/4969] Bump postgresql from 42.2.15 to 42.2.16 in
 /modules/postgresql (#3145)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.15 to 42.2.16.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.15...REL42.2.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 894930bc258..720c1d493a5 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
-    testCompile 'org.postgresql:postgresql:42.2.15'
+    testCompile 'org.postgresql:postgresql:42.2.16'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'

From a0521e8e8e9a61d63e0fea81fd9dfabdc0df64fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:25:20 +0100
Subject: [PATCH 0928/4969] Bump assertj-core from 3.16.1 to 3.17.0 in
 /modules/junit-jupiter (#3144)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.16.1 to 3.17.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.17.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 28f48cf94bb..3aa19ddbfce 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.5.2') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.16.1'
+    testCompile 'org.assertj:assertj-core:3.17.0'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
     testRuntime 'org.postgresql:postgresql:42.2.16'

From 41cfc6ef1c6695065d1e84a90b873361ae0c99e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:25:34 +0100
Subject: [PATCH 0929/4969] Bump mockito-core from 3.5.2 to 3.5.5 in
 /modules/junit-jupiter (#3143)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.2 to 3.5.5.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.2...v3.5.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 3aa19ddbfce..d0c53a63f39 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.5.2') {
+    testCompile ('org.mockito:mockito-core:3.5.5') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.17.0'

From 6bca821edffef1680e045982bcf74e40560b3631 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:25:42 +0100
Subject: [PATCH 0930/4969] Bump pulsar-client from 2.6.0 to 2.6.1 in
 /modules/pulsar (#3155)

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 9aaed8e23fd..a8f0d9f48ed 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.1'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.0'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.1'
 }

From 86fa31b815717d98a1e7eda7cfd1b5a6e05a2a86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:27:35 +0100
Subject: [PATCH 0931/4969] Bump mockito-core from 3.5.0 to 3.5.7 in /core
 (#3164)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.0 to 3.5.7.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.0...v3.5.7)

Signed-off-by: dependabot[bot] <support@github.com>

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 4c1a47255ce..68bc339593a 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.7'
 
-    testCompile ('org.mockito:mockito-core:3.5.0') {
+    testCompile ('org.mockito:mockito-core:3.5.7') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From fbc2b4ddd9521661981d98d9f88c317978dffd7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:27:44 +0100
Subject: [PATCH 0932/4969] Bump postgresql from 42.2.15 to 42.2.16 in
 /modules/spock (#3138)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.15 to 42.2.16.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.15...REL42.2.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 eb2914ae3ac..04a6682ee2f 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
-    testRuntime 'org.postgresql:postgresql:42.2.15'
+    testRuntime 'org.postgresql:postgresql:42.2.16'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
 }
 

From 7bcfc6feb0c3741def110118a11974a69ba4a932 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:27:56 +0100
Subject: [PATCH 0933/4969] Bump mockito-core from 3.5.5 to 3.5.7 in
 /modules/junit-jupiter (#3163)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.5 to 3.5.7.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.5...v3.5.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 d0c53a63f39..d1368c2389a 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.5.5') {
+    testCompile ('org.mockito:mockito-core:3.5.7') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.17.0'

From 0f9ca21f11ddce2ff75a88b973dd0f71da632e00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:28:04 +0100
Subject: [PATCH 0934/4969] Bump assertj-core from 3.16.1 to 3.17.0 in
 /modules/kafka (#3139)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.16.1 to 3.17.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.17.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 3d8a663a0e9..a2b73ff4281 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.6.0'
-    testCompile 'org.assertj:assertj-core:3.16.1'
+    testCompile 'org.assertj:assertj-core:3.17.0'
     testCompile 'com.google.guava:guava:23.0'
 }

From f42d3df752ba67e5f8a21438291286023f9abc65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:28:20 +0100
Subject: [PATCH 0935/4969] Bump s3 from 2.13.76 to 2.14.6 in
 /modules/localstack (#3162)

Bumps s3 from 2.13.76 to 2.14.6.

Signed-off-by: dependabot[bot] <support@github.com>

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 acf42539c88..e28117319f5 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.847'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.846'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.13.76'
+    testCompile 'software.amazon.awssdk:s3:2.14.6'
 }

From 5397ddb51e3fcf3930910ba7f9adbbc4c97e6bb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:28:30 +0100
Subject: [PATCH 0936/4969] Bump assertj-core from 3.16.1 to 3.17.0 in
 /modules/neo4j (#3137)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.16.1 to 3.17.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.17.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 4bc92e49cda..2f5e6b05d9f 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.16.1'
+    testCompile 'org.assertj:assertj-core:3.17.0'
 }

From 87571b6ad844705e9c622144595917faebe82bf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 15:13:09 +0100
Subject: [PATCH 0937/4969] Bump assertj-core from 3.16.1 to 3.17.0 in
 /modules/database-commons (#3141)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.16.1 to 3.17.0.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.17.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 82e318e5017..1ab8d67cf02 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.16.1'
+    testCompile 'org.assertj:assertj-core:3.17.0'
 }

From 8bc3bf89e0551b0d5ef602433a76b5fd76d83f91 Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Sat, 29 Aug 2020 09:52:14 +0200
Subject: [PATCH 0938/4969] Fix bind mounts for ResourceReaper/ryuk and
 ContainerisedDockerCompose on macOS (#3159)

Relates to #545
Relates to #2998
---
 .../main/java/org/testcontainers/DockerClientFactory.java   | 6 +++++-
 .../testcontainers/containers/DockerComposeContainer.java   | 2 +-
 .../java/org/testcontainers/utility/ResourceReaper.java     | 2 +-
 .../containers/localstack/LocalStackContainer.java          | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 1905fc7c098..571b18fbcce 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -19,6 +19,7 @@
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 import org.testcontainers.dockerclient.DockerMachineClientProviderStrategy;
 import org.testcontainers.dockerclient.TransportConfig;
@@ -145,9 +146,12 @@ public String getRemoteDockerUnixSocketPath() {
         }
 
         URI dockerHost = getTransportConfig().getDockerHost();
-        return "unix".equals(dockerHost.getScheme())
+        String path = "unix".equals(dockerHost.getScheme())
             ? dockerHost.getRawPath()
             : "/var/run/docker.sock";
+        return SystemUtils.IS_OS_WINDOWS
+               ? "/" + path
+               : path;
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index af1da29442f..d2702b3db5b 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -608,7 +608,7 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
         //  as the docker daemon, just mapping the docker control socket is OK.
         // As there seems to be a problem with mapping to the /var/run directory in certain environments (e.g. CircleCI)
         //  we map the socket file outside of /var/run, as just /docker.sock
-        addFileSystemBind("/" + DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/docker.sock", READ_WRITE);
+        addFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/docker.sock", READ_WRITE);
         addEnv("DOCKER_HOST", "unix:///docker.sock");
         setStartupCheckStrategy(new IndefiniteWaitOneShotStartupCheckStrategy());
         setWorkingDirectory(containerPwd);
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 3448e73dce3..c37e6660654 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -76,7 +76,7 @@ public static String start(String hostIpAddress, DockerClient client) {
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
         List<Bind> binds = new ArrayList<>();
-        binds.add(new Bind("/" + DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
+        binds.add(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
 
         String ryukContainerId = client.createContainerCmd(ryukImage)
                 .withHostConfig(new HostConfig().withAutoRemove(true))
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 3a9fab26ae4..a9547eec94d 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -17,6 +17,7 @@
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
 import org.rnorth.ducttape.Preconditions;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.ComparableVersion;
@@ -84,7 +85,7 @@ public LocalStackContainer(final DockerImageName dockerImageName, boolean useLeg
         super(dockerImageName);
         this.legacyMode = useLegacyMode;
 
-        withFileSystemBind("//var/run/docker.sock", "/var/run/docker.sock");
+        withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
     }
 

From 6fff500b1618759f64dd4d0882e52932ef06652b Mon Sep 17 00:00:00 2001
From: Waldemar Panas <8766331+wpanas@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:51:16 +0200
Subject: [PATCH 0939/4969] #3057 Fix jetbrains annotations configuration scope
 (#3157)

Co-authored-by: wpanas <wpanas@users.noreply.github.com>
---
 core/build.gradle                       | 3 ++-
 examples/mongodb-container/build.gradle | 1 +
 modules/jdbc/build.gradle               | 1 +
 modules/mysql/build.gradle              | 2 ++
 modules/nginx/build.gradle              | 1 +
 modules/postgresql/build.gradle         | 2 ++
 modules/presto/build.gradle             | 1 +
 modules/rabbitmq/build.gradle           | 3 ++-
 modules/selenium/build.gradle           | 3 +++
 modules/spock/build.gradle              | 2 ++
 10 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 68bc339593a..bb27f4378e4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -164,7 +164,8 @@ dependencies {
 
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
-    compile 'org.jetbrains:annotations:19.0.0'
+    compileOnly 'org.jetbrains:annotations:20.0.0'
+    testCompileOnly 'org.jetbrains:annotations:20.0.0'
     compile 'org.apache.commons:commons-compress:1.20'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index d3b85856b8a..2c6b0bbcc13 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -9,4 +9,5 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13'
+    testCompileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index cd10c7a98c3..33ff3e8339f 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,6 +4,7 @@ dependencies {
     compile project(':database-commons')
     testCompile project(':test-support')
 
+    compileOnly 'org.jetbrains:annotations:20.0.0'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.37'
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 3badd2e18e1..545037d2dff 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -14,4 +14,6 @@ dependencies {
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
+
+    compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index e5003b4e103..b56d7f2b4e8 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,4 +2,5 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     compile project(':testcontainers')
+    compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 720c1d493a5..6437bd9c2f8 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -15,4 +15,6 @@ dependencies {
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'
+
+    compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 51c5bf4345e..4130fb74891 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     testCompile project(':jdbc-test')
     testCompile 'io.prestosql:presto-jdbc:331'
+    compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 7b9a5274a7e..73524c2da18 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,6 +2,7 @@ description = "TestContainers :: RabbitMQ"
 
 dependencies {
     compile project(":testcontainers")
-    testCompile "com.rabbitmq:amqp-client:5.7.0"
+    testCompile 'com.rabbitmq:amqp-client:5.7.0'
     testCompile 'org.assertj:assertj-core:3.12.2'
+    compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index f7fcb75107d..a51735ae78a 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -10,4 +10,7 @@ dependencies {
 
     testCompile 'org.mortbay.jetty:jetty:6.1.26'
     testCompile project(':nginx')
+
+    compileOnly 'org.jetbrains:annotations:20.0.0'
+    testCompileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 04a6682ee2f..c559b623b55 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,6 +17,8 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.16'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
+
+    testCompileOnly 'org.jetbrains:annotations:20.0.0'
 }
 
 sourceJar {

From fb4edf618c6e9a4de32a24446d5eff330d226846 Mon Sep 17 00:00:00 2001
From: iaintatchbbc <iaintatchbbc@users.noreply.github.com>
Date: Tue, 1 Sep 2020 11:52:13 +0100
Subject: [PATCH 0940/4969] Remove use of implicit network for multi-container
 Kafka (#3128)

---
 docs/modules/kafka.md                                           | 2 ++
 .../java/org/testcontainers/containers/KafkaContainerTest.java  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 35ac37b6906..83bb8af0628 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -53,6 +53,8 @@ If your test needs to run some other Docker container which needs access to the
 * Use `kafka.getNetworkAliases().get(0)+":9092"` as bootstrap server location. 
 Or just give your Kafka container a network alias of your liking.
 
+You will need to explicitly create a network and set it on the Kafka container as well as on your other containers that need to communicate with Kafka.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index b8cd5c9be9c..71702ce8e62 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -75,7 +75,7 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
 
             // withKafkaNetwork {
-            GenericContainer application = new GenericContainer("alpine").withNetwork(kafka.getNetwork())
+            GenericContainer application = new GenericContainer("alpine").withNetwork(network)
             // }
                 .withNetworkAliases("dummy")
                 .withCommand("sleep 10000")

From c9f756831008ae145a7e7f54e00f9e59e77e1642 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:30:24 +0100
Subject: [PATCH 0941/4969] Bump mssql-jdbc from 8.3.1.jre8-preview to
 8.4.1.jre8 in /modules/mssqlserver (#3174)

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 8.3.1.jre8-preview to 8.4.1.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 508de84a2f9..f0170500e7d 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,12 +10,12 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.4.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.1.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8'
 
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.3.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.1.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8'
 }

From 2ad9fb37458092cf2aeb7a8ba2eb383a9a4626c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:31:08 +0100
Subject: [PATCH 0942/4969] Bump aws-java-sdk-dynamodb from 1.11.847 to
 1.11.851 in /modules/dynalite (#3172)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.847 to 1.11.851.
- [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.847...1.11.851)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 762e189173b..7ebe948ee66 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.847'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.851'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.847'
 }

From 6402f14156981ef09b4a195567040af9c7d2b43d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:32:07 +0100
Subject: [PATCH 0943/4969] Bump aws-java-sdk-sqs from 1.11.846 to 1.11.851 in
 /modules/localstack (#3171)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.846 to 1.11.851.
- [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.846...1.11.851)

Signed-off-by: dependabot[bot] <support@github.com>

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 e28117319f5..37f505374e6 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.847'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.847'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.846'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.851'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.14.6'
 }

From 38587306998d79b8e6625c77e3baad5f570cf8e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:36:46 +0100
Subject: [PATCH 0944/4969] Bump assertj-core from 3.17.0 to 3.17.1 in
 /modules/neo4j (#3167)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.0...assertj-core-3.17.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 2f5e6b05d9f..6a5bab19284 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.17.0'
+    testCompile 'org.assertj:assertj-core:3.17.1'
 }

From 77528c9c5fe46ba9618497cdbeb4e5e14f00ee25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:36:56 +0100
Subject: [PATCH 0945/4969] Bump assertj-core from 3.17.0 to 3.17.1 in
 /modules/database-commons (#3168)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.0...assertj-core-3.17.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 1ab8d67cf02..ac27b84a662 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.17.0'
+    testCompile 'org.assertj:assertj-core:3.17.1'
 }

From b7892600f39e9e089b4560f3fa8312d60cc42e8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:37:11 +0100
Subject: [PATCH 0946/4969] Bump assertj-core from 3.17.0 to 3.17.1 in
 /modules/vault (#3173)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.0...assertj-core-3.17.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 5c83cbbb56f..7c8cac68d05 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.1'
-    testCompile 'org.assertj:assertj-core:3.17.0'
+    testCompile 'org.assertj:assertj-core:3.17.1'
 
 }

From 28125c1aa47dcb98d4f93557cda8f429b435962c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:37:21 +0100
Subject: [PATCH 0947/4969] Bump assertj-core from 3.17.0 to 3.17.1 in
 /modules/junit-jupiter (#3177)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.0...assertj-core-3.17.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 d1368c2389a..7b4d924c9f9 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.5.7') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.17.0'
+    testCompile 'org.assertj:assertj-core:3.17.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
     testRuntime 'org.postgresql:postgresql:42.2.16'

From 0286de04a8843305969633cca5c03bcc2e3dba1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:37:29 +0100
Subject: [PATCH 0948/4969] Bump assertj-core from 3.17.0 to 3.17.1 in
 /modules/pulsar (#3176)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.0...assertj-core-3.17.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index a8f0d9f48ed..5dbbb0d6489 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.1'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.0'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.1'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.1'
 }

From 5f02839ce55c81bd538e83ecb28e7c9f8d6fdc12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:37:40 +0100
Subject: [PATCH 0949/4969] Bump assertj-core from 3.17.0 to 3.17.1 in
 /modules/kafka (#3175)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.0...assertj-core-3.17.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index a2b73ff4281..64c0ee4ce1a 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.6.0'
-    testCompile 'org.assertj:assertj-core:3.17.0'
+    testCompile 'org.assertj:assertj-core:3.17.1'
     testCompile 'com.google.guava:guava:23.0'
 }

From a2146f35b834e112cc5572b5bca757d3c53c7657 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 13:02:33 +0100
Subject: [PATCH 0950/4969] Bump s3 from 2.14.6 to 2.14.8 in
 /modules/localstack (#3181)

Bumps s3 from 2.14.6 to 2.14.8.

Signed-off-by: dependabot[bot] <support@github.com>

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 37f505374e6..fc9ebe3064b 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.847'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.851'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.14.6'
+    testCompile 'software.amazon.awssdk:s3:2.14.8'
 }

From 63692d3d84d2c5e46788d0dea28acc33f4dc1d92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2020 13:02:43 +0100
Subject: [PATCH 0951/4969] Bump aws-java-sdk-s3 from 1.11.847 to 1.11.852 in
 /modules/localstack (#3182)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.847 to 1.11.852.
- [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.847...1.11.852)

Signed-off-by: dependabot[bot] <support@github.com>

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 fc9ebe3064b..eec730235ef 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.847'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.852'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.847'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.851'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From d796707df2f9a3ced54f34924e0dbfbf0cf181f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Coll?= <martingonzalezcoll@gmail.com>
Date: Sat, 12 Sep 2020 15:18:28 -0300
Subject: [PATCH 0952/4969] Use testCompileClasspath instead of testCompileOnly
 (#3219)

---
 core/build.gradle                       | 2 +-
 examples/mongodb-container/build.gradle | 2 +-
 modules/selenium/build.gradle           | 2 +-
 modules/spock/build.gradle              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index bb27f4378e4..65bb8477ed9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -165,7 +165,7 @@ dependencies {
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
     compileOnly 'org.jetbrains:annotations:20.0.0'
-    testCompileOnly 'org.jetbrains:annotations:20.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
     compile 'org.apache.commons:commons-compress:1.20'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 2c6b0bbcc13..285c0f96315 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -9,5 +9,5 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13'
-    testCompileOnly 'org.jetbrains:annotations:20.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index a51735ae78a..d745baefa75 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -12,5 +12,5 @@ dependencies {
     testCompile project(':nginx')
 
     compileOnly 'org.jetbrains:annotations:20.0.0'
-    testCompileOnly 'org.jetbrains:annotations:20.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index c559b623b55..7640188fa54 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntime 'org.postgresql:postgresql:42.2.16'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
 
-    testCompileOnly 'org.jetbrains:annotations:20.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
 }
 
 sourceJar {

From 03304804c7fa87c05efcf0250a53011c01196120 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:25:45 +0100
Subject: [PATCH 0953/4969] Bump assertj-core from 3.17.1 to 3.17.2 in
 /modules/neo4j (#3208)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 6a5bab19284..da90a493a01 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.17.1'
+    testCompile 'org.assertj:assertj-core:3.17.2'
 }

From 29ff3423261ec8e4942678daed6091e2bad509d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:25:56 +0100
Subject: [PATCH 0954/4969] Bump elasticsearch-rest-client from 7.9.0 to 7.9.1
 in /modules/elasticsearch (#3212)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.9.0 to 7.9.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.0...v7.9.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 20097bd19b4..44a5cca5963 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.1"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 95455f2d06c30da0406c58d94551a8e9447e3a37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:26:39 +0100
Subject: [PATCH 0955/4969] Bump assertj-core from 3.16.1 to 3.17.1 in /core
 (#3210)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.16.1 to 3.17.1.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.17.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 65bb8477ed9..b7a029cf5ef 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -211,12 +211,12 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.16.1'
+    testCompile 'org.assertj:assertj-core:3.17.1'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
-    jarFileTestCompile 'org.assertj:assertj-core:3.16.0'
+    jarFileTestCompile 'org.assertj:assertj-core:3.17.1'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
 }

From 8cdec4434fd4c0c526e1330498047c08982a958c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:27:37 +0100
Subject: [PATCH 0956/4969] Bump annotations from 20.0.0 to 20.1.0 in /core
 (#3214)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 b7a029cf5ef..e233ef7b159 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -164,7 +164,7 @@ dependencies {
 
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompileClasspath 'org.jetbrains:annotations:20.0.0'
     compile 'org.apache.commons:commons-compress:1.20'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {

From 842863441bd4f0c21f8deafa9da466f59188fe2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:27:46 +0100
Subject: [PATCH 0957/4969] Bump annotations from 20.0.0 to 20.1.0 in
 /modules/spock (#3204)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 7640188fa54..3d0948e9e83 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntime 'org.postgresql:postgresql:42.2.16'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
 
-    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:20.1.0'
 }
 
 sourceJar {

From 8c7cd3823bc29a3e8ec204982923865b75c10a05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:27:55 +0100
Subject: [PATCH 0958/4969] Bump annotations from 20.0.0 to 20.1.0 in
 /modules/nginx (#3206)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index b56d7f2b4e8..6c4b97876c4 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,5 +2,5 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     compile project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
 }

From 273b22d484bea0a94aec08cc8bbcfce50e1c22cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:28:21 +0100
Subject: [PATCH 0959/4969] Bump annotations from 20.0.0 to 20.1.0 in
 /modules/postgresql (#3207)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 6437bd9c2f8..793cf89406e 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -16,5 +16,5 @@ dependencies {
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
 }

From e14eb8e3055e8db3de0489fed11a735aa69488b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:28:33 +0100
Subject: [PATCH 0960/4969] Bump annotations from 20.0.0 to 20.1.0 in /examples
 (#3217)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/mongodb-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 285c0f96315..c09cb033489 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -9,5 +9,5 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13'
-    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:20.1.0'
 }

From aa5c2dc58282586721b574b76c3ceed02862463d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:28:55 +0100
Subject: [PATCH 0961/4969] Bump annotations from 20.0.0 to 20.1.0 in
 /modules/jdbc (#3196)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 33ff3e8339f..6453b49b052 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile project(':database-commons')
     testCompile project(':test-support')
 
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
     testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.37'

From 07f035f8ba0b54729de754a35b1f16cd9c565f9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:29:10 +0100
Subject: [PATCH 0962/4969] Bump annotations from 20.0.0 to 20.1.0 in
 /modules/selenium (#3195)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index d745baefa75..7c6d81ca1bf 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     testCompile 'org.mortbay.jetty:jetty:6.1.26'
     testCompile project(':nginx')
 
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompileClasspath 'org.jetbrains:annotations:20.0.0'
 }

From 7e1d1b9982334d52e684188378a4c379818824d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:29:44 +0100
Subject: [PATCH 0963/4969] Bump annotations from 20.0.0 to 20.1.0 in
 /modules/mysql (#3198)

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 545037d2dff..9df2e177d3f 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
 }

From 4331b63acd7bc034fabacb7494ac1fb1414505ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:30:15 +0100
Subject: [PATCH 0964/4969] Bump aws-java-sdk-dynamodb from 1.11.851 to
 1.11.856 in /modules/dynalite (#3194)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.851 to 1.11.856.
- [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.851...1.11.856)

Signed-off-by: dependabot[bot] <support@github.com>

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 7ebe948ee66..e850b616f2f 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.851'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.847'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.856'
+    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.856'
 }

From 1f62cad8d86712d8b2253d536dfcedb1aa90b1e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:30:29 +0100
Subject: [PATCH 0965/4969] Bump s3 from 2.14.8 to 2.14.12 in
 /modules/localstack (#3202)

Bumps s3 from 2.14.8 to 2.14.12.

Signed-off-by: dependabot[bot] <support@github.com>

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 eec730235ef..1f9816ae2d8 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.847'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.851'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.14.8'
+    testCompile 'software.amazon.awssdk:s3:2.14.12'
 }

From 2279aa2df0814592066860d933ea0ab0e63eb27f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:30:35 +0100
Subject: [PATCH 0966/4969] Bump aws-java-sdk-s3 from 1.11.852 to 1.11.856 in
 /modules/localstack (#3203)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.852 to 1.11.856.
- [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.852...1.11.856)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 1f9816ae2d8..3aea0db0acd 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.852'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.847'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.856'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.856'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.851'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.14.12'

From d84db2dc76e64d1213b5652927a9062795c53c10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:30:50 +0100
Subject: [PATCH 0967/4969] Bump mockito-core from 3.5.7 to 3.5.10 in
 /modules/junit-jupiter (#3201)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.7 to 3.5.10.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.7...v3.5.10)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 7b4d924c9f9..d649278349b 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.5.7') {
+    testCompile ('org.mockito:mockito-core:3.5.10') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.17.1'

From 37ff402daa646ab676082b92a10e726abc4efc8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:32:07 +0100
Subject: [PATCH 0968/4969] Bump assertj-core from 3.17.1 to 3.17.2 in
 /modules/vault (#3193)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 7c8cac68d05..6d862eeba2c 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.1'
-    testCompile 'org.assertj:assertj-core:3.17.1'
+    testCompile 'org.assertj:assertj-core:3.17.2'
 
 }

From 84024b1ca0cb6cd1d570b35675f25238e9f3f05f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:32:29 +0100
Subject: [PATCH 0969/4969] Bump aws-java-sdk-sqs from 1.11.851 to 1.11.860 in
 /modules/localstack (#3227)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.851 to 1.11.860.
- [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.851...1.11.860)

Signed-off-by: dependabot[bot] <support@github.com>

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 3aea0db0acd..6de26e324b4 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.856'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.856'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.851'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.14.12'
 }

From 9b3c87eb2f350c6211dfa5eadea61f8eb00e2097 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:57:40 +0100
Subject: [PATCH 0970/4969] Bump cucumber-junit from 6.4.0 to 6.6.0 in
 /examples (#3215)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 90cc99e7627..fc4e4aaf3b1 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.4.0'
-    testImplementation 'io.cucumber:cucumber-junit:6.4.0'
+    testImplementation 'io.cucumber:cucumber-junit:6.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 2be4c2a927abbed84e2a6cfcea974f821bfe3628 Mon Sep 17 00:00:00 2001
From: Quincy Bowers <quincy@users.noreply.github.com>
Date: Mon, 14 Sep 2020 02:58:28 -0600
Subject: [PATCH 0971/4969] Exclude id from NetworkImpl.NetworkImplBuilder
 (testcontainers#8125) (#2807)

* Exclude id from NetworkImpl.NetworkImplBuilder (testcontainers#8125)

* Deprecate Network.id field

The field is deprecated in order to mark the NetworkBuildImpl#id method
deprecated so that the method can later be removed.  We'll undeprecate the
field at that time.

Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/src/main/java/org/testcontainers/containers/Network.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
index 1c00fa00fac..2fda5ad1a8d 100644
--- a/core/src/main/java/org/testcontainers/containers/Network.java
+++ b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -52,6 +52,7 @@ class NetworkImpl extends ExternalResource implements Network {
         @Singular
         private Set<Consumer<CreateNetworkCmd>> createNetworkCmdModifiers;
 
+        @Deprecated
         private String id;
 
         private final AtomicBoolean initialized = new AtomicBoolean();

From ec16e7a347242a22aa604005667142f867637a7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:18:57 +0100
Subject: [PATCH 0972/4969] Bump junit-jupiter-engine from 5.6.2 to 5.7.0 in
 /modules/junit-jupiter (#3234)

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.6.2 to 5.7.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.6.2...r5.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 d649278349b..d57835f4cfc 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.16'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 }
 
 test {

From 2854194424504af8ada973b2c623da066bf8559f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:31:06 +0100
Subject: [PATCH 0973/4969] Bump postgresql from 42.2.15 to 42.2.16 in
 /examples (#3216)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.15 to 42.2.16.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.15...REL42.2.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 a62854e9b35..6877a35fec5 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.8.1'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.15'
+    testImplementation 'org.postgresql:postgresql:42.2.16'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From fb66c0cabd1ed5e7d01b6cf9fc895880a9d7e3e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:31:19 +0100
Subject: [PATCH 0974/4969] Bump aws-java-sdk-dynamodb from 1.11.856 to
 1.11.860 in /modules/dynalite (#3235)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index e850b616f2f..7d9fa4d9ea5 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.856'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.856'
 }

From 9327bba287a2e8ebe5be41ae07cb1c85038c6766 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:31:37 +0100
Subject: [PATCH 0975/4969] Bump junit-jupiter-params from 5.6.2 to 5.7.0 in
 /modules/junit-jupiter (#3232)

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.6.2 to 5.7.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.6.2...r5.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 d57835f4cfc..56f9fc3070e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.17.1'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.16'
     testRuntime 'mysql:mysql-connector-java:8.0.21'

From 730e98e570ab4ba695db60bf5e967daac9ed6696 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:31:50 +0100
Subject: [PATCH 0976/4969] Bump junit-jupiter-api from 5.6.2 to 5.7.0 in
 /modules/junit-jupiter (#3233)

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.6.2 to 5.7.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.6.2...r5.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 56f9fc3070e..303d4b20d56 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.6.2'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.7.0'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From a011235b0e2152601387f16a32a6e0b03fb8a7aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:32:01 +0100
Subject: [PATCH 0977/4969] Bump s3 from 2.14.12 to 2.14.16 in
 /modules/localstack (#3231)

Bumps s3 from 2.14.12 to 2.14.16.

Signed-off-by: dependabot[bot] <support@github.com>

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 6de26e324b4..5c069167eb1 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.856'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.14.12'
+    testCompile 'software.amazon.awssdk:s3:2.14.16'
 }

From a4f7880ada6597a67631b5eb8b9f48422cc8b286 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:32:11 +0100
Subject: [PATCH 0978/4969] Bump r2dbc-postgresql from 0.8.4.RELEASE to
 0.8.5.RELEASE in /modules/postgresql (#3230)

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.4.RELEASE to 0.8.5.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.5.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.4.RELEASE...v0.8.5.RELEASE)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/postgresql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 793cf89406e..ea6e4a87226 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,14 +7,14 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.4.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
     testCompile 'org.postgresql:postgresql:42.2.16'
 
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'
+    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:20.1.0'
 }

From 0af261eb363b75b5e6ee1d9ff2f3d9145a9fd81f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:32:20 +0100
Subject: [PATCH 0979/4969] Bump cucumber-java from 6.4.0 to 6.6.0 in /examples
 (#3213)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 6.4.0 to 6.6.0.
- [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.4.0...v6.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 fc4e4aaf3b1..1362b3f257a 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.4.0'
+    testImplementation 'io.cucumber:cucumber-java:6.6.0'
     testImplementation 'io.cucumber:cucumber-junit:6.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 3f5a8a2f0c7b16ff19ae581cc30cbca974f35636 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:51:11 +0100
Subject: [PATCH 0980/4969] Bump assertj-core from 3.17.1 to 3.17.2 in
 /modules/kafka (#3200)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 64c0ee4ce1a..95d844c7a41 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.6.0'
-    testCompile 'org.assertj:assertj-core:3.17.1'
+    testCompile 'org.assertj:assertj-core:3.17.2'
     testCompile 'com.google.guava:guava:23.0'
 }

From 46788e1e980b7d73152cfd15f3949b067c07fa4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:51:24 +0100
Subject: [PATCH 0981/4969] Bump assertj-core from 3.17.1 to 3.17.2 in
 /modules/junit-jupiter (#3199)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 303d4b20d56..8293060b9b4 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.5.10') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.17.1'
+    testCompile 'org.assertj:assertj-core:3.17.2'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.16'

From dafc8841ea5c0cba88ffdf79452925bd83fbdcd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:51:35 +0100
Subject: [PATCH 0982/4969] Bump assertj-core from 3.17.1 to 3.17.2 in
 /modules/database-commons (#3197)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index ac27b84a662..e6d6a1812da 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.17.1'
+    testCompile 'org.assertj:assertj-core:3.17.2'
 }

From e01495d168e951e644b06eb1b1b66dd98dae78ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 19:51:42 +0100
Subject: [PATCH 0983/4969] Bump aws-java-sdk-s3 from 1.11.856 to 1.11.860 in
 /modules/localstack (#3226)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.856 to 1.11.860.
- [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.856...1.11.860)

Signed-off-by: dependabot[bot] <support@github.com>

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 5c069167eb1..3eb02882546 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.856'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.856'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From 77251a17dad3ee3aa6017229f856d46a4a8689b8 Mon Sep 17 00:00:00 2001
From: Gapmeister66 <peterlewis66@hotmail.com>
Date: Mon, 14 Sep 2020 20:30:02 +0100
Subject: [PATCH 0984/4969] Add support for Docker compose `withOptions(...)`
 (#2827)

Co-authored-by: Peter Lewis <Peter.Lewis@nagra.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../containers/DockerComposeContainer.java    | 27 +++++++-
 ...DockerComposeContainerWithOptionsTest.java | 62 +++++++++++++++++++
 .../with-deploy-block.yml                     |  8 +++
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
 create mode 100644 core/src/test/resources/compose-options-test/with-deploy-block.yml

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index d2702b3db5b..bd06083644d 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -45,6 +45,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -81,6 +82,7 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
     private boolean localCompose;
     private boolean pull = true;
     private boolean build = false;
+    private Set<String> options = new HashSet<>();
     private boolean tailChildContainers;
 
     private String project;
@@ -213,7 +215,7 @@ private void createServices() {
             .distinct()
             .collect(joining(" "));
 
-        String command = "up -d";
+        String command = optionsAsString() + "up -d";
 
         if (build) {
             command += " --build";
@@ -231,6 +233,19 @@ private void createServices() {
         runWithCompose(command);
     }
 
+    private String optionsAsString() {
+        String optionsString = options
+            .stream()
+            .collect(joining(" "));
+        if (optionsString.length() !=0 ) {
+            // ensures that there is a space between the options and 'up' if options are passed.
+            return optionsString + " ";
+        } else {
+            // otherwise two spaces would appear between 'docker-compose' and 'up'
+            return StringUtils.EMPTY;
+        }
+    }
+
     private void waitUntilServiceStarted() {
         listChildContainers().forEach(this::createServiceInstance);
 
@@ -517,6 +532,16 @@ public SELF withBuild(boolean build) {
         return self();
     }
 
+    /**
+     * Adds options to the docker-compose command, e.g. docker-compose --compatibility.
+     *
+     * @return this instance, for chaining
+     */
+    public SELF withOptions(String... options) {
+        this.options = new HashSet<>(Arrays.asList(options));
+        return self();
+    }
+
     /**
      * Remove images after containers shutdown.
      *
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
new file mode 100644
index 00000000000..375c9baa070
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
@@ -0,0 +1,62 @@
+package org.testcontainers.junit;
+
+import com.google.common.collect.ImmutableSet;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests the options associated with the docker-compose command.
+ */
+@RunWith(Parameterized.class)
+public class DockerComposeContainerWithOptionsTest {
+
+    public DockerComposeContainerWithOptionsTest(final File composeFile, final boolean local, final Set<String> options, final boolean expectError) {
+        this.composeFile = composeFile;
+        this.local = local;
+        this.options = options;
+        this.expectError = expectError;
+    }
+
+    private final File composeFile;
+    private final boolean local;
+
+    private final Set<String> options;
+    private final boolean expectError;
+
+    @Parameterized.Parameters(name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]")
+
+    public static Object[][] params() {
+        return new Object[][]{
+            // Test the happy day case. THe compatibility option should be accepted by docker-compose.
+            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), false, ImmutableSet.of("--compatibility"), false},
+            // Test with flags absent. Docker compose will warn but continue, ignoring the deploy block.
+            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), false, ImmutableSet.of(""), false},
+            // Test with a bad option. Compose will complain.
+            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), false, ImmutableSet.of("--bad-option"), true},
+            // Local compose
+            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), true, ImmutableSet.of("--compatibility"), false},
+        };
+    }
+
+    @Test
+    public void performTest() {
+
+        try (DockerComposeContainer<?> environment = new DockerComposeContainer<>(composeFile)
+                .withOptions(options.stream().toArray(String[]::new))
+                .withLocalCompose(local)) {
+            environment.start();
+            assertThat(expectError).isEqualTo(false);
+        } catch (Exception e) {
+            assertThat(expectError).isEqualTo(true);
+        }
+
+    }
+
+}
diff --git a/core/src/test/resources/compose-options-test/with-deploy-block.yml b/core/src/test/resources/compose-options-test/with-deploy-block.yml
new file mode 100644
index 00000000000..f52f6747122
--- /dev/null
+++ b/core/src/test/resources/compose-options-test/with-deploy-block.yml
@@ -0,0 +1,8 @@
+version: '3.7'
+services:
+  redis:
+      image: redis:2.6.17
+      deploy:
+        resources:
+          limits:
+            memory: 150M

From b0cdb60e5565ceabe527165143216eecb4532413 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:49:55 +0100
Subject: [PATCH 0985/4969] Bump assertj-core from 3.17.1 to 3.17.2 in
 /modules/pulsar (#3192)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 5dbbb0d6489..2d2ded0c765 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.1'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.1'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.2'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.1'
 }

From 7c994846904d7fd7b4ae82b95b964f66199926bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:50:14 +0100
Subject: [PATCH 0986/4969] Bump aws-java-sdk-dynamodb from 1.11.860 to
 1.11.865 in /modules/dynalite (#3242)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.860 to 1.11.865.
- [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.860...1.11.865)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 7d9fa4d9ea5..0b2e334c633 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.860'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.856'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.865'
+    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.865'
 }

From 625fddb5900496723e18bf7af4e58a688c7d16af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:50:26 +0100
Subject: [PATCH 0987/4969] Bump mockito-core from 3.5.10 to 3.5.11 in
 /modules/junit-jupiter (#3243)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.10 to 3.5.11.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.10...v3.5.11)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 8293060b9b4..dbf54b8d291 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.5.10') {
+    testCompile ('org.mockito:mockito-core:3.5.11') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.17.2'

From 1e6665094fe8d3f30a9af0242f9bd204fea0699b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:50:34 +0100
Subject: [PATCH 0988/4969] Bump solr-solrj from 8.6.1 to 8.6.2 in /examples
 (#3244)

Bumps solr-solrj from 8.6.1 to 8.6.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 89444aeb378..52fa54f1fc5 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.10"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
-    implementation 'org.apache.solr:solr-solrj:8.6.1'
+    implementation 'org.apache.solr:solr-solrj:8.6.2'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From a55fc35345ecd332e2a84a4c451785586d6c6321 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:50:51 +0100
Subject: [PATCH 0989/4969] Bump okhttp from 4.8.1 to 4.9.0 in /examples
 (#3245)

Bumps [okhttp](https://github.com/square/okhttp) from 4.8.1 to 4.9.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.8.1...parent-4.9.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 6877a35fec5..eac2c59df4a 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.8.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.16'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From e90150d32b6e1ffc82ae687c85b17ab7e94b2c3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:51:01 +0100
Subject: [PATCH 0990/4969] Bump cucumber-junit from 6.6.0 to 6.7.0 in
 /examples (#3246)

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 6.6.0 to 6.7.0.
- [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.6.0...v6.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 1362b3f257a..318ed51f24c 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.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:6.6.0'
+    testImplementation 'io.cucumber:cucumber-junit:6.7.0'
     testImplementation 'org.testcontainers:selenium'
 }

From c56dcd8d8ee7a90a70dadddc7805836d07dd3a35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:51:37 +0100
Subject: [PATCH 0991/4969] Bump mockito-core from 3.5.7 to 3.5.11 in /core
 (#3250)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.7 to 3.5.11.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.7...v3.5.11)

Signed-off-by: dependabot[bot] <support@github.com>

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 e233ef7b159..37595c18e7c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -205,7 +205,7 @@ dependencies {
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testCompile ('org.mockito:mockito-core:3.5.7') {
+    testCompile ('org.mockito:mockito-core:3.5.11') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From d81f236de640ae0325c7ffd94080aac9dddae358 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:51:45 +0100
Subject: [PATCH 0992/4969] Bump s3 from 2.14.16 to 2.14.21 in
 /modules/localstack (#3254)

Bumps s3 from 2.14.16 to 2.14.21.

Signed-off-by: dependabot[bot] <support@github.com>

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 3eb02882546..7fa112b3cd2 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.856'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.14.16'
+    testCompile 'software.amazon.awssdk:s3:2.14.21'
 }

From 53932d9988e8e09db45c8ccea0f39d0da7a24dc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:51:55 +0100
Subject: [PATCH 0993/4969] Bump aws-java-sdk-s3 from 1.11.860 to 1.11.865 in
 /modules/localstack (#3255)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.860 to 1.11.865.
- [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.860...1.11.865)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 7fa112b3cd2..436f03ab236 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.860'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.856'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.865'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.865'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.14.21'

From 27428a0ba798ca909db5b2f3202c15a74f34037e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 28 Sep 2020 17:12:37 +0100
Subject: [PATCH 0994/4969] Remove dependency upon internet URLs for selenium
 tests (#3271)

---
 .../junit/BaseWebDriverContainerTest.java     | 50 +++++++-------
 ...ChromeRecordingWebDriverContainerTest.java | 14 ++--
 .../junit/ChromeWebDriverContainerTest.java   | 10 +--
 .../ContainerWithoutCapabilitiesTest.java     |  3 +-
 ...stomWaitTimeoutWebDriverContainerTest.java | 11 +--
 .../junit/FirefoxWebDriverContainerTest.java  | 10 +--
 .../junit/FlakyContainerCreationTest.java     | 31 ---------
 .../junit/LinkedContainerTest.java            | 69 -------------------
 ...ecificImageNameWebDriverContainerTest.java |  8 +--
 9 files changed, 50 insertions(+), 156 deletions(-)
 delete mode 100644 modules/selenium/src/test/java/org/testcontainers/junit/FlakyContainerCreationTest.java
 delete mode 100644 modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java

diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index 0f41b2ce1d2..cf5c762f2ad 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -1,17 +1,20 @@
 package org.testcontainers.junit;
 
 import org.jetbrains.annotations.NotNull;
+import org.junit.ClassRule;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static java.lang.String.format;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
@@ -19,25 +22,31 @@
  */
 public class BaseWebDriverContainerTest {
 
-    protected void doSimpleWebdriverTest(BrowserWebDriverContainer rule) {
+    @ClassRule
+    public static Network NETWORK = Network.newNetwork();
+
+    @ClassRule
+    public static GenericContainer<?> HELLO_WORLD = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld:1.0.0"))
+        .withNetwork(NETWORK)
+        .withNetworkAliases("helloworld")
+        .withExposedPorts(8080, 8081)
+        .waitingFor(new HttpWaitStrategy());
+
+    protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule) {
         RemoteWebDriver driver = setupDriverFromRule(rule);
         System.out.println("Selenium remote URL is: " + rule.getSeleniumAddress());
         System.out.println("VNC URL is: " + rule.getVncAddress());
 
-        driver.get("http://www.google.com");
-        WebElement search = driver.findElement(By.name("q"));
-        search.sendKeys("testcontainers");
-        search.submit();
+        driver.get("http://helloworld:8080");
+        WebElement title = driver.findElement(By.tagName("h1"));
 
-        List<WebElement> results = new WebDriverWait(driver, 15)
-            .until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.cssSelector("#search h3")));
-
-        assertTrue("the word 'testcontainers' appears in search results",
-            results.stream()
-                .anyMatch(el -> el.getText().contains("testcontainers")));
+        assertEquals("the index page contains the title 'Hello world'",
+            "Hello world",
+            title.getText().trim()
+        );
     }
 
-    protected void assertBrowserNameIs(BrowserWebDriverContainer rule, String expectedName) {
+    protected void assertBrowserNameIs(BrowserWebDriverContainer<?> rule, String expectedName) {
         RemoteWebDriver driver = setupDriverFromRule(rule);
         String actual = driver.getCapabilities().getBrowserName();
         assertTrue(format("actual browser name is %s", actual),
@@ -45,18 +54,9 @@ protected void assertBrowserNameIs(BrowserWebDriverContainer rule, String expect
     }
 
     @NotNull
-    private static RemoteWebDriver setupDriverFromRule(BrowserWebDriverContainer rule) {
+    private static RemoteWebDriver setupDriverFromRule(BrowserWebDriverContainer<?> rule) {
         RemoteWebDriver driver = rule.getWebDriver();
         driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
         return driver;
     }
-
-    protected static void doSimpleExplore(BrowserWebDriverContainer rule) {
-        RemoteWebDriver driver = setupDriverFromRule(rule);
-        driver.get("http://en.wikipedia.org/wiki/Randomness");
-
-        // Oh! The irony!
-        assertTrue("Randomness' description has the word 'pattern'", driver.findElementByPartialLinkText("pattern").isDisplayed());
-    }
-
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index ead9a21ae4f..cf8a6227ec1 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -33,11 +33,12 @@ public void recordingTestThatShouldBeRecordedAndRetained() {
             try (
                 // recordAll {
                 // To do this, simply add extra parameters to the rule constructor:
-                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
+                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
                     .withRecordingMode(RECORD_ALL, target)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
+                    .withNetwork(NETWORK)
             ) {
                 chrome.start();
 
@@ -69,12 +70,13 @@ public static class ChromeThatRecordsFailingTests {
         public void recordingTestThatShouldBeRecordedButNotPersisted() {
             try (
                 // withRecordingFileFactory {
-                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
+                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     // }
                     .withCapabilities(new ChromeOptions())
                     // withRecordingFileFactory {
                     .withRecordingFileFactory(new CustomRecordingFileFactory())
-                // }
+                    // }
+                    .withNetwork(NETWORK)
             ) {
                 chrome.start();
 
@@ -88,11 +90,12 @@ public void recordingTestThatShouldBeRecordedAndRetained() {
             try (
                 // recordFailing {
                 // or if you only want videos for test failures:
-                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
+                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
                     .withRecordingMode(RECORD_FAILING, target)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
+                    .withNetwork(NETWORK)
             ) {
                 chrome.start();
 
@@ -115,6 +118,7 @@ public String getFilesystemFriendlyName() {
 
         }
 
-        private static class CustomRecordingFileFactory extends DefaultRecordingFileFactory { }
+        private static class CustomRecordingFileFactory extends DefaultRecordingFileFactory {
+        }
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
index 92ba4e2cd37..bea1909a145 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
@@ -13,20 +13,16 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
     @Rule
-    public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
-        .withCapabilities(new ChromeOptions());
+    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
+        .withCapabilities(new ChromeOptions())
     // }
+        .withNetwork(NETWORK);
 
     @Before
     public void checkBrowserIsIndeedChrome() {
         assertBrowserNameIs(chrome, "chrome");
     }
 
-    @Test
-    public void simpleTest() {
-        doSimpleWebdriverTest(chrome);
-    }
-
     @Test
     public void simpleExploreTest() {
         doSimpleExplore(chrome);
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
index c319395211c..b1214d18b60 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
@@ -7,7 +7,8 @@
 public class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest{
 
     @Rule
-    public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer();
+    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
+        .withNetwork(NETWORK);
 
     @Test
     public void chromeIsStartedIfNoCapabilitiesProvided() {
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
index 1d0f895b682..8448dc40d53 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
@@ -15,12 +15,13 @@
 public class CustomWaitTimeoutWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     @Rule
-    public BrowserWebDriverContainer chromeWithCustomTimeout = new BrowserWebDriverContainer<>()
-            .withCapabilities(new ChromeOptions())
-            .withStartupTimeout(Duration.of(30, SECONDS));
+    public BrowserWebDriverContainer<?> chromeWithCustomTimeout = new BrowserWebDriverContainer<>()
+        .withCapabilities(new ChromeOptions())
+        .withStartupTimeout(Duration.of(30, SECONDS))
+        .withNetwork(NETWORK);
 
     @Test
-    public void simpleTest() {
-        doSimpleWebdriverTest(chromeWithCustomTimeout);
+    public void simpleExploreTest() {
+        doSimpleExplore(chromeWithCustomTimeout);
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
index 1f687aab762..1cffec16bc6 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
@@ -13,20 +13,16 @@ public class FirefoxWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
     @Rule
-    public BrowserWebDriverContainer firefox = new BrowserWebDriverContainer()
-            .withCapabilities(new FirefoxOptions());
+    public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>()
+            .withCapabilities(new FirefoxOptions())
     // }
+        .withNetwork(NETWORK);
 
     @Before
     public void checkBrowserIsIndeedFirefox() {
         assertBrowserNameIs(firefox, "firefox");
     }
 
-    @Test
-    public void simpleTest() {
-        doSimpleWebdriverTest(firefox);
-    }
-
     @Test
     public void simpleExploreTest() {
         doSimpleExplore(firefox);
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FlakyContainerCreationTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/FlakyContainerCreationTest.java
deleted file mode 100644
index d33a4c9c07e..00000000000
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FlakyContainerCreationTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.testcontainers.junit;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import org.testcontainers.containers.BrowserWebDriverContainer;
-
-import java.io.File;
-
-/**
- * Created by rnorth on 30/01/2016.
- */
-public class FlakyContainerCreationTest {
-
-    @Test @Ignore
-    public void testCreationOfManyContainers() {
-        for (int i = 0; i < 50; i++) {
-            BrowserWebDriverContainer container = new BrowserWebDriverContainer()
-                    .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(BrowserWebDriverContainer.VncRecordingMode.RECORD_FAILING, new File("build"));
-
-            container.start();
-            RemoteWebDriver driver = container.getWebDriver();
-
-            driver.get("http://www.google.com");
-
-            container.stop();
-        }
-    }
-}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java
deleted file mode 100644
index d3e458e07ec..00000000000
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LinkedContainerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.testcontainers.junit;
-
-import lombok.Cleanup;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import org.testcontainers.SeleniumTestImages;
-import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.containers.Network;
-import org.testcontainers.containers.NginxContainer;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
-
-/**
- * @author richardnorth
- */
-public class LinkedContainerTest {
-
-    private static File contentFolder = new File(System.getProperty("user.home") + "/.tmp-test-container");
-
-    @Rule
-    public Network network = Network.newNetwork();
-
-    @Rule
-    public NginxContainer<?> nginx = new NginxContainer<>(SeleniumTestImages.NGINX_TEST_IMAGE)
-            .withNetwork(network)
-            .withNetworkAliases("nginx")
-            .withCustomContent(contentFolder.toString());
-
-    @Rule
-    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-            .withNetwork(network)
-            .withCapabilities(new ChromeOptions());
-
-    @BeforeClass
-    public static void setupContent() throws FileNotFoundException {
-        contentFolder.mkdir();
-        contentFolder.setReadable(true, false);
-        contentFolder.setWritable(true, false);
-        contentFolder.setExecutable(true, false);
-
-
-        File indexFile = new File(contentFolder, "index.html");
-        indexFile.setReadable(true, false);
-        indexFile.setWritable(true, false);
-        indexFile.setExecutable(true, false);
-
-        @Cleanup PrintStream printStream = new PrintStream(new FileOutputStream(indexFile));
-        printStream.println("<html><body>This worked</body></html>");
-    }
-
-    @Test
-    public void testWebDriverToNginxContainerAccessViaContainerLink() {
-        RemoteWebDriver driver = chrome.getWebDriver();
-
-        driver.get("http://nginx/");
-
-        assertEquals("Using selenium, an HTTP GET from the nginx server returns the index.html from the custom content directory", "This worked", driver.findElement(By.tagName("body")).getText());
-    }
-}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
index 6ecf0899ede..bbc3b4db7a0 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
@@ -12,12 +12,8 @@ public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContai
 
     @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
-        .withCapabilities(new FirefoxOptions());
-
-    @Test
-    public void simpleTest() {
-        doSimpleWebdriverTest(firefox);
-    }
+        .withCapabilities(new FirefoxOptions())
+        .withNetwork(NETWORK);
 
     @Test
     public void simpleExploreTest() {

From 149badfb729504b91b9127d7e30c014741942918 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 19:11:46 +0100
Subject: [PATCH 0995/4969] Bump aws-java-sdk-s3 from 1.11.865 to 1.11.870 in
 /modules/localstack (#3285)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.865 to 1.11.870.
- [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.865...1.11.870)

Signed-off-by: dependabot[bot] <support@github.com>

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 436f03ab236..f48b3cf71bb 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.865'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.870'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.865'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.860'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From 63e2c49bbf88d9d5b4972051c5a127a34ee8a616 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 29 Sep 2020 09:45:39 +0100
Subject: [PATCH 0996/4969] Make testMatrix task emit all check tasks, rather
 than filtering out up-to-date tasks (#3287)

---
 gradle/ci-support.gradle | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gradle/ci-support.gradle b/gradle/ci-support.gradle
index e83c936f2f3..b878c107796 100644
--- a/gradle/ci-support.gradle
+++ b/gradle/ci-support.gradle
@@ -9,10 +9,7 @@ task testMatrix {
 
         dependsOn(checkTasks)
         doLast {
-            // Obtain a list of check tasks that are not up-to-date, i.e.
-            //  the ones which Gradle cannot find a cached output for.
             def checkTaskPaths = checkTasks
-                .findAll { !it.state.upToDate }
                 .collect { it.path }
 
             println(JsonOutput.toJson(checkTaskPaths))

From 1e597ccd4fa1a7113d3077599e0b13237c1fef51 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 29 Sep 2020 11:02:01 +0100
Subject: [PATCH 0997/4969] Add image compatibility checks (#3021)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 build.gradle                                  |   2 +-
 .../containers/GenericContainer.java          |  76 +++++----
 .../utility/DockerImageName.java              | 152 ++++++++++++------
 .../utility/TestcontainersConfiguration.java  |  51 +++---
 .../testcontainers/utility/Versioning.java    |  95 +++++++++++
 .../utility/AuthenticatedImagePullTest.java   |  17 +-
 .../DockerImageNameCompatibilityTest.java     |  93 +++++++++++
 .../utility/DockerImageNameTest.java          |   4 +-
 .../TestcontainersConfigurationTest.java      |  11 +-
 docs/modules/kafka.md                         |   4 +-
 .../containers/MongoDbContainer.java          |   1 -
 .../containers/CassandraContainer.java        |  14 +-
 .../containers/ClickHouseContainer.java       |  15 +-
 .../containers/CockroachContainer.java        |  21 ++-
 .../couchbase/CouchbaseContainer.java         |  14 +-
 .../containers/Db2Container.java              |  17 +-
 .../dynamodb/DynaliteContainer.java           |  14 +-
 .../elasticsearch/ElasticsearchContainer.java |  31 ++--
 .../ElasticsearchContainerTest.java           |  17 +-
 .../containers/InfluxDBContainer.java         |  14 +-
 .../containers/JdbcDatabaseContainer.java     |   1 -
 .../containers/KafkaContainer.java            |   9 +-
 .../containers/KafkaContainerTest.java        |  43 +++--
 .../localstack/LocalStackContainer.java       |  31 ++--
 .../containers/MariaDBContainer.java          |  19 ++-
 .../containers/MockServerContainer.java       |  13 +-
 .../containers/MongoDBContainer.java          |  13 +-
 .../MSSQLR2DBCDatabaseContainerProvider.java  |   1 +
 .../containers/MSSQLServerContainer.java      |  17 +-
 .../containers/MySQLContainer.java            |  17 +-
 .../containers/Neo4jContainer.java            |  50 +++---
 .../containers/NginxContainer.java            |  16 +-
 .../containers/OracleContainer.java           |   4 -
 .../containers/OrientDBContainer.java         |  11 +-
 .../containers/PostgisContainerProvider.java  |   4 +-
 .../containers/PostgreSQLContainer.java       |  11 +-
 .../containers/PrestoContainer.java           |  10 +-
 .../containers/PulsarContainer.java           |   8 +-
 .../containers/RabbitMQContainer.java         |  12 +-
 .../containers/BrowserWebDriverContainer.java |  60 +++----
 .../testcontainers/junit/Selenium3xTest.java  |   4 +-
 ...ecificImageNameWebDriverContainerTest.java |   3 +-
 .../containers/SolrContainer.java             |  13 +-
 .../containers/ToxiproxyContainer.java        |  12 +-
 .../testcontainers/vault/VaultContainer.java  |  11 +-
 45 files changed, 692 insertions(+), 364 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/utility/Versioning.java
 create mode 100644 core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java

diff --git a/build.gradle b/build.gradle
index b7830992b07..c51b24909cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ subprojects {
     }
 
     lombok {
-        version = '1.18.8'
+        version = '1.18.12'
     }
 
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 22a6c2408d6..95050d8f8ee 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1,8 +1,10 @@
 package org.testcontainers.containers;
 
+import static com.google.common.collect.Lists.newArrayList;
+import static org.testcontainers.utility.CommandLine.runShellCommand;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
@@ -21,6 +23,39 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.hash.Hashing;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.zip.Adler32;
+import java.util.zip.Checksum;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.NonNull;
@@ -62,43 +97,6 @@
 import org.testcontainers.utility.ResourceReaper;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.zip.Adler32;
-import java.util.zip.Checksum;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static org.testcontainers.utility.CommandLine.runShellCommand;
-
 /**
  * Base class for that allows a container to be launched and controlled.
  */
@@ -241,7 +239,7 @@ public GenericContainer(@NonNull final RemoteDockerImage image) {
      */
     @Deprecated
     public GenericContainer() {
-        this(TestcontainersConfiguration.getInstance().getTinyImage());
+        this(TestcontainersConfiguration.getInstance().getTinyDockerImageName().asCanonicalNameString());
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
index b4a40be2f16..af8e5300863 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
@@ -4,26 +4,32 @@
 import com.google.common.net.HostAndPort;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.With;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.testcontainers.utility.Versioning.Sha256Versioning;
+import org.testcontainers.utility.Versioning.TagVersioning;
 
 import java.util.regex.Pattern;
 
-@EqualsAndHashCode(exclude = "rawName")
+@EqualsAndHashCode(exclude = { "rawName", "compatibleSubstituteFor" })
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public final class DockerImageName {
 
     /* Regex patterns used for validation */
     private static final String ALPHA_NUMERIC = "[a-z0-9]+";
-    private static final String SEPARATOR = "([\\.]{1}|_{1,2}|-+)";
+    private static final String SEPARATOR = "([.]|_{1,2}|-+)";
     private static final String REPO_NAME_PART = ALPHA_NUMERIC + "(" + SEPARATOR + ALPHA_NUMERIC + ")*";
     private static final Pattern REPO_NAME = Pattern.compile(REPO_NAME_PART + "(/" + REPO_NAME_PART + ")*");
 
     private final String rawName;
     private final String registry;
     private final String repo;
-    @NotNull private final Versioning versioning;
+    @NotNull @With(AccessLevel.PRIVATE)
+    private final Versioning versioning;
+    @Nullable @With(AccessLevel.PRIVATE)
+    private final DockerImageName compatibleSubstituteFor;
 
     /**
      * Parses a docker image name from a provided string.
@@ -52,8 +58,8 @@ public DockerImageName(String fullImageName) {
         String remoteName;
         if (slashIndex == -1 ||
             (!fullImageName.substring(0, slashIndex).contains(".") &&
-             !fullImageName.substring(0, slashIndex).contains(":") &&
-             !fullImageName.substring(0, slashIndex).equals("localhost"))) {
+                !fullImageName.substring(0, slashIndex).contains(":") &&
+                !fullImageName.substring(0, slashIndex).equals("localhost"))) {
             registry = "";
             remoteName = fullImageName;
         } else {
@@ -69,8 +75,10 @@ public DockerImageName(String fullImageName) {
             versioning = new TagVersioning(remoteName.split(":")[1]);
         } else {
             repo = remoteName;
-            versioning = new TagVersioning("latest");
+            versioning = Versioning.ANY;
         }
+
+        compatibleSubstituteFor = null;
     }
 
     /**
@@ -92,8 +100,8 @@ public DockerImageName(String nameWithoutTag, @NotNull String version) {
         String remoteName;
         if (slashIndex == -1 ||
             (!nameWithoutTag.substring(0, slashIndex).contains(".") &&
-             !nameWithoutTag.substring(0, slashIndex).contains(":") &&
-             !nameWithoutTag.substring(0, slashIndex).equals("localhost"))) {
+                !nameWithoutTag.substring(0, slashIndex).contains(":") &&
+                !nameWithoutTag.substring(0, slashIndex).equals("localhost"))) {
             registry = "";
             remoteName = nameWithoutTag;
         } else {
@@ -108,6 +116,8 @@ public DockerImageName(String nameWithoutTag, @NotNull String version) {
             repo = remoteName;
             versioning = new TagVersioning(version);
         }
+
+        compatibleSubstituteFor = null;
     }
 
     /**
@@ -132,7 +142,7 @@ public String getVersionPart() {
      * @return canonical name for the image
      */
     public String asCanonicalNameString() {
-        return getUnversionedPart() + versioning.getSeparator() + versioning.toString();
+        return getUnversionedPart() + versioning.getSeparator() + getVersionPart();
     }
 
     @Override
@@ -146,7 +156,8 @@ public String toString() {
      * @throws IllegalArgumentException if not valid
      */
     public void assertValid() {
-        HostAndPort.fromString(registry);
+        //noinspection UnstableApiUsage
+        HostAndPort.fromString(registry); // return value ignored - this throws if registry is not a valid host:port string
         if (!REPO_NAME.matcher(repo).matches()) {
             throw new IllegalArgumentException(repo + " is not a valid Docker image name (in " + rawName + ")");
         }
@@ -159,63 +170,98 @@ public String getRegistry() {
         return registry;
     }
 
+    /**
+     * @param newTag version tag for the copy to use
+     * @return an immutable copy of this {@link DockerImageName} with the new version tag
+     */
     public DockerImageName withTag(final String newTag) {
-        return new DockerImageName(rawName, registry, repo, new TagVersioning(newTag));
+        return withVersioning(new TagVersioning(newTag));
     }
 
-    private interface Versioning {
-        boolean isValid();
-
-        String getSeparator();
+    /**
+     * Declare that this {@link DockerImageName} is a compatible substitute for another image - i.e. that this image
+     * behaves as the other does, and is compatible with Testcontainers' assumptions about the other image.
+     *
+     * @param otherImageName the image name of the other image
+     * @return an immutable copy of this {@link DockerImageName} with the compatibility declaration attached.
+     */
+    public DockerImageName asCompatibleSubstituteFor(String otherImageName) {
+        return withCompatibleSubstituteFor(DockerImageName.parse(otherImageName));
     }
 
-    @Data
-    private static class TagVersioning implements Versioning {
-        public static final String TAG_REGEX = "[\\w][\\w\\.\\-]{0,127}";
-        private final String tag;
-
-        TagVersioning(String tag) {
-            this.tag = tag;
-        }
+    /**
+     * Declare that this {@link DockerImageName} is a compatible substitute for another image - i.e. that this image
+     * behaves as the other does, and is compatible with Testcontainers' assumptions about the other image.
+     *
+     * @param otherImageName the image name of the other image
+     * @return an immutable copy of this {@link DockerImageName} with the compatibility declaration attached.
+     */
+    public DockerImageName asCompatibleSubstituteFor(DockerImageName otherImageName) {
+        return withCompatibleSubstituteFor(otherImageName);
+    }
 
-        @Override
-        public boolean isValid() {
-            return tag.matches(TAG_REGEX);
+    /**
+     * Test whether this {@link DockerImageName} has declared compatibility with another image (set using
+     * {@link DockerImageName#asCompatibleSubstituteFor(String)} or
+     * {@link DockerImageName#asCompatibleSubstituteFor(DockerImageName)}.
+     * <p>
+     * If a version tag part is present in the <code>other</code> image name, the tags must exactly match, unless it
+     * is 'latest'. If a version part is not present in the <code>other</code> image name, the tag contents are ignored.
+     *
+     * @param other the other image that we are trying to test compatibility with
+     * @return whether this image has declared compatibility.
+     */
+    public boolean isCompatibleWith(DockerImageName other) {
+        // is this image already the same or equivalent?
+        if (other.equals(this)) {
+            return true;
         }
 
-        @Override
-        public String getSeparator() {
-            return ":";
+        if (this.compatibleSubstituteFor == null) {
+            return false;
         }
 
-        @Override
-        public String toString() {
-            return tag;
-        }
+        return this.compatibleSubstituteFor.isCompatibleWith(other);
     }
 
-    @Data
-    private static class Sha256Versioning implements Versioning {
-        public static final String HASH_REGEX = "[0-9a-fA-F]{32,}";
-        private final String hash;
-
-        Sha256Versioning(String hash) {
-            this.hash = hash;
-        }
-
-        @Override
-        public boolean isValid() {
-            return hash.matches(HASH_REGEX);
+    /**
+     * Behaves as {@link DockerImageName#isCompatibleWith(DockerImageName)} but throws an exception
+     * rather than returning false if a mismatch is detected.
+     *
+     * @param anyOthers the other image(s) that we are trying to check compatibility with. If more
+     *                  than one is provided, this method will check compatibility with at least one
+     *                  of them.
+     * @throws IllegalStateException if {@link DockerImageName#isCompatibleWith(DockerImageName)}
+     *                               returns false
+     */
+    public void assertCompatibleWith(DockerImageName... anyOthers) {
+        if (anyOthers.length == 0) {
+            throw new IllegalArgumentException("anyOthers parameter must be non-empty");
         }
 
-        @Override
-        public String getSeparator() {
-            return "@";
+        for (DockerImageName anyOther : anyOthers) {
+            if (this.isCompatibleWith(anyOther)) {
+                return;
+            }
         }
 
-        @Override
-        public String toString() {
-            return "sha256:" + hash;
-        }
+        final DockerImageName exampleOther = anyOthers[0];
+
+        throw new IllegalStateException(
+            String.format(
+                "Failed to verify that image '%s' is a compatible substitute for '%s'. This generally means that "
+                    +
+                    "you are trying to use an image that Testcontainers has not been designed to use. If this is "
+                    +
+                    "deliberate, and if you are confident that the image is compatible, you should declare "
+                    +
+                    "compatibility in code using the `asCompatibleSubstituteFor` method. For example:\n"
+                    +
+                    "   DockerImageName myImage = DockerImageName.parse(\"%s\").asCompatibleSubstituteFor(\"%s\");\n"
+                    +
+                    "and then use `myImage` instead.",
+                this.rawName, exampleOther.rawName, this.rawName, exampleOther.rawName
+            )
+        );
     }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 9f283ba2685..521a7519c2a 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -56,49 +56,58 @@ static AtomicReference<TestcontainersConfiguration> getInstanceField() {
 
         this.properties.putAll(classpathProperties);
         this.properties.putAll(environmentProperties);
-        properties.keySet()
-            .forEach(key -> properties.replace(key, properties.getProperty(String.valueOf(key)).trim()));
+    }
+
+    private DockerImageName getImage(final String key, final String defaultValue) {
+        return DockerImageName
+            .parse(properties.getProperty(key, defaultValue).trim())
+            .asCompatibleSubstituteFor(defaultValue);
     }
 
     @Deprecated
     public String getAmbassadorContainerImage() {
-        return String.valueOf(properties.getOrDefault("ambassador.container.image", "richnorth/ambassador:latest"));
+        return getAmbassadorContainerDockerImageName().asCanonicalNameString();
+    }
+
+    @Deprecated
+    public DockerImageName getAmbassadorContainerDockerImageName() {
+        return getImage("ambassador.container.image", "richnorth/ambassador:latest");
     }
 
     @Deprecated
     public String getSocatContainerImage() {
-        return String.valueOf(properties.getOrDefault("socat.container.image", "alpine/socat:latest"));
+        return getSocatDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getSocatDockerImageName() {
-        return DockerImageName.parse(getSocatContainerImage());
+        return getImage("socat.container.image", "alpine/socat:latest");
     }
 
     @Deprecated
     public String getVncRecordedContainerImage() {
-        return String.valueOf(properties.getOrDefault("vncrecorder.container.image", "testcontainers/vnc-recorder:1.1.0"));
+        return getVncDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getVncDockerImageName() {
-        return DockerImageName.parse(getVncRecordedContainerImage());
+        return getImage("vncrecorder.container.image", "testcontainers/vnc-recorder:1.1.0");
     }
 
     @Deprecated
     public String getDockerComposeContainerImage() {
-        return String.valueOf(properties.getOrDefault("compose.container.image", "docker/compose:1.24.1"));
+        return getDockerComposeDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getDockerComposeDockerImageName() {
-        return DockerImageName.parse(getDockerComposeContainerImage());
+        return getImage("compose.container.image", "docker/compose:1.24.1");
     }
 
     @Deprecated
     public String getTinyImage() {
-        return String.valueOf(properties.getOrDefault("tinyimage.container.image", "alpine:3.5"));
+        return getTinyDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getTinyDockerImageName() {
-        return DockerImageName.parse(getTinyImage());
+        return getImage("tinyimage.container.image", "alpine:3.5");
     }
 
     public boolean isRyukPrivileged() {
@@ -107,20 +116,20 @@ public boolean isRyukPrivileged() {
 
     @Deprecated
     public String getRyukImage() {
-        return String.valueOf(properties.getOrDefault("ryuk.container.image", "testcontainers/ryuk:0.3.0"));
+        return getRyukDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getRyukDockerImageName() {
-        return DockerImageName.parse(getRyukImage());
+        return getImage("ryuk.container.image", "testcontainers/ryuk:0.3.0");
     }
 
     @Deprecated
     public String getSSHdImage() {
-        return String.valueOf(properties.getOrDefault("sshd.container.image", "testcontainers/sshd:1.0.0"));
+        return getSSHdDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getSSHdDockerImageName() {
-        return DockerImageName.parse(getSSHdImage());
+        return getImage("sshd.container.image", "testcontainers/sshd:1.0.0");
     }
 
     public Integer getRyukTimeout() {
@@ -129,29 +138,29 @@ public Integer getRyukTimeout() {
 
     @Deprecated
     public String getKafkaImage() {
-        return String.valueOf(properties.getOrDefault("kafka.container.image", "confluentinc/cp-kafka"));
+        return getKafkaDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getKafkaDockerImageName() {
-        return DockerImageName.parse(getKafkaImage());
+        return getImage("kafka.container.image", "confluentinc/cp-kafka");
     }
 
     @Deprecated
     public String getPulsarImage() {
-        return String.valueOf(properties.getOrDefault("pulsar.container.image", "apachepulsar/pulsar"));
+        return getPulsarDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getPulsarDockerImageName() {
-        return DockerImageName.parse(getPulsarImage());
+        return getImage("pulsar.container.image", "apachepulsar/pulsar");
     }
 
     @Deprecated
     public String getLocalStackImage() {
-        return String.valueOf(properties.getOrDefault("localstack.container.image", "localstack/localstack"));
+        return getLocalstackDockerImageName().asCanonicalNameString();
     }
 
     public DockerImageName getLocalstackDockerImageName() {
-        return DockerImageName.parse(getLocalStackImage());
+        return getImage("localstack.container.image", "localstack/localstack");
     }
 
     public boolean isDisableChecks() {
diff --git a/core/src/main/java/org/testcontainers/utility/Versioning.java b/core/src/main/java/org/testcontainers/utility/Versioning.java
new file mode 100644
index 00000000000..8944b3f0ba6
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/Versioning.java
@@ -0,0 +1,95 @@
+package org.testcontainers.utility;
+
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * Represents mechanisms for versioning docker images.
+ */
+interface Versioning {
+    AnyVersion ANY = new AnyVersion();
+
+    boolean isValid();
+
+    String getSeparator();
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    class AnyVersion implements Versioning {
+
+        @Override
+        public boolean isValid() {
+            return true;
+        }
+
+        @Override
+        public String getSeparator() {
+            return "";
+        }
+
+        @Override
+        public String toString() {
+            return "";
+        }
+
+        @Override
+        public boolean equals(final Object obj) {
+            return obj instanceof Versioning;
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
+    }
+
+    @EqualsAndHashCode
+    class TagVersioning implements Versioning {
+        public static final String TAG_REGEX = "[\\w][\\w.\\-]{0,127}";
+        private final String tag;
+
+        TagVersioning(String tag) {
+            this.tag = tag;
+        }
+
+        @Override
+        public boolean isValid() {
+            return tag.matches(TAG_REGEX);
+        }
+
+        @Override
+        public String getSeparator() {
+            return ":";
+        }
+
+        @Override
+        public String toString() {
+            return tag;
+        }
+    }
+
+    @EqualsAndHashCode
+    class Sha256Versioning implements Versioning {
+        public static final String HASH_REGEX = "[0-9a-fA-F]{32,}";
+        private final String hash;
+
+        Sha256Versioning(String hash) {
+            this.hash = hash;
+        }
+
+        @Override
+        public boolean isValid() {
+            return hash.matches(HASH_REGEX);
+        }
+
+        @Override
+        public String getSeparator() {
+            return "@";
+        }
+
+        @Override
+        public String toString() {
+            return "sha256:" + hash;
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 0afb4d956a1..e49ff2880df 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -59,7 +59,7 @@ public class AuthenticatedImagePullTest {
     private static DockerClient client;
 
     private static String testImageName;
-    private static String testImageNameWithTag;
+    private static RegistryAuthLocator mockAuthLocator;
 
     @BeforeClass
     public static void setUp() throws InterruptedException {
@@ -68,9 +68,8 @@ public static void setUp() throws InterruptedException {
 
         String testRegistryAddress = authenticatedRegistry.getHost() + ":" + authenticatedRegistry.getFirstMappedPort();
         testImageName = testRegistryAddress + "/alpine";
-        testImageNameWithTag = testImageName + ":latest";
 
-        final DockerImageName expectedName = DockerImageName.parse(testImageNameWithTag);
+        final DockerImageName expectedName = DockerImageName.parse(testImageName);
         final AuthConfig authConfig = new AuthConfig()
             .withUsername("testuser")
             .withPassword("notasecret")
@@ -89,7 +88,7 @@ public static void setUp() throws InterruptedException {
     @Before
     public void removeImageFromLocalDocker() {
         // remove the image tag from local docker so that it must be pulled before use
-        client.removeImageCmd(testImageNameWithTag).withForce(true).exec();
+        client.removeImageCmd(testImageName).withForce(true).exec();
     }
 
     @AfterClass
@@ -100,7 +99,7 @@ public static void tearDown() {
     @Test
     public void testThatAuthLocatorIsUsedForContainerCreation() {
         // actually start a container, which will require an authenticated pull
-        try (final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(testImageNameWithTag))
+        try (final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(testImageName))
             .withCommand("/bin/sh", "-c", "sleep 10")) {
             container.start();
 
@@ -112,7 +111,7 @@ public void testThatAuthLocatorIsUsedForContainerCreation() {
     public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
         // Prepare a simple temporary Dockerfile which requires our custom private image
         Path tempFile = getLocalTempFile(".Dockerfile");
-        String dockerFileContent = "FROM " + testImageNameWithTag;
+        String dockerFileContent = "FROM " + testImageName;
         Files.write(tempFile, dockerFileContent.getBytes());
 
         // Start a container built from a derived image, which will require an authenticated pull
@@ -136,7 +135,7 @@ public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
                 "services:\n" +
                 "  privateservice:\n" +
                 "      command: /bin/sh -c 'sleep 60'\n" +
-                "      image: " + testImageNameWithTag;
+                "      image: " + testImageName;
         Files.write(tempFile, composeFileContent.getBytes());
 
         // Start the docker compose project, which will require an authenticated pull
@@ -177,9 +176,9 @@ private static void putImageInRegistry() throws InterruptedException {
             .getId();
 
         // push the image to the registry
-        client.tagImageCmd(id, testImageName, "latest").exec();
+        client.tagImageCmd(id, testImageName, "").exec();
 
-        client.pushImageCmd(testImageNameWithTag)
+        client.pushImageCmd(testImageName)
             .exec(new ResultCallback.Adapter<>())
             .awaitCompletion(1, TimeUnit.MINUTES);
     }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
new file mode 100644
index 00000000000..9e7136ea6d3
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -0,0 +1,93 @@
+package org.testcontainers.utility;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.hamcrest.core.StringContains.containsString;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+
+
+public class DockerImageNameCompatibilityTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testPlainImage() {
+        DockerImageName subject = DockerImageName.parse("foo");
+
+        assertFalse("image name foo != bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+    }
+    @Test
+    public void testNoTagTreatedAsWildcard() {
+        final DockerImageName subject = DockerImageName.parse("foo:4.5.6");
+        /*
+        foo:1.2.3 != foo:4.5.6
+        foo:1.2.3 ~= foo
+        foo:1.2.3 ~= foo:latest
+
+        The test is effectively making sure that no tag and `latest` tag are equivalent
+         */
+        assertFalse("foo:4.5.6 != foo:1.2.3", subject.isCompatibleWith(DockerImageName.parse("foo:1.2.3")));
+        assertTrue("foo:4.5.6 ~= foo", subject.isCompatibleWith(DockerImageName.parse("foo")));
+    }
+
+    @Test
+    public void testImageWithAutomaticCompatibilityForFullPath() {
+        DockerImageName subject = DockerImageName.parse("repo/foo:1.2.3");
+
+        assertTrue("repo/foo:1.2.3 ~= repo/foo", subject.isCompatibleWith(DockerImageName.parse("repo/foo")));
+    }
+
+    @Test
+    public void testImageWithClaimedCompatibility() {
+        DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar");
+
+        assertTrue("foo(bar) ~= bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+        assertFalse("foo(bar) != fizz", subject.isCompatibleWith(DockerImageName.parse("fizz")));
+    }
+
+    @Test
+    public void testImageWithClaimedCompatibilityAndVersion() {
+        DockerImageName subject = DockerImageName.parse("foo:1.2.3").asCompatibleSubstituteFor("bar");
+
+        assertTrue("foo:1.2.3(bar) ~= bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+    }
+
+    @Test
+    public void testImageWithClaimedCompatibilityForFullPath() {
+        DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("registry/repo/bar");
+
+        assertTrue("foo(registry/repo/bar) ~= registry/repo/bar", subject.isCompatibleWith(DockerImageName.parse("registry/repo/bar")));
+        assertFalse("foo(registry/repo/bar) != repo/bar", subject.isCompatibleWith(DockerImageName.parse("repo/bar")));
+        assertFalse("foo(registry/repo/bar) != bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+    }
+
+    @Test
+    public void testImageWithClaimedCompatibilityForVersion() {
+        DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar:1.2.3");
+
+        assertTrue("foo(bar:1.2.3) ~= bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+        assertTrue("foo(bar:1.2.3) ~= bar:1.2.3", subject.isCompatibleWith(DockerImageName.parse("bar:1.2.3")));
+        assertFalse("foo(bar:1.2.3) != bar:0.0.1", subject.isCompatibleWith(DockerImageName.parse("bar:0.0.1")));
+        assertFalse("foo(bar:1.2.3) != bar:2.0.0", subject.isCompatibleWith(DockerImageName.parse("bar:2.0.0")));
+        assertFalse("foo(bar:1.2.3) != bar:1.2.4", subject.isCompatibleWith(DockerImageName.parse("bar:1.2.4")));
+    }
+
+    @Test
+    public void testAssertMethodAcceptsCompatible() {
+        DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar");
+        subject.assertCompatibleWith(DockerImageName.parse("bar"));
+    }
+
+    @Test
+    public void testAssertMethodRejectsIncompatible() {
+        thrown.expect(IllegalStateException.class);
+        thrown.expectMessage(containsString("Failed to verify that image 'foo' is a compatible substitute for 'bar'"));
+
+        DockerImageName subject = DockerImageName.parse("foo");
+        subject.assertCompatibleWith(DockerImageName.parse("bar"));
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index b0ed9428a5d..34575f2b4b9 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -112,7 +112,7 @@ public void testParsing() {
                 canonicalName = unversionedPart + versionSeparator + version;
             } else {
                 combined = unversionedPart;
-                canonicalName = unversionedPart + ":latest";
+                canonicalName = unversionedPart;
             }
 
             VisibleAssertions.context("For " + combined);
@@ -124,7 +124,7 @@ public void testParsing() {
             if (version != null) {
                 assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
             } else {
-                assertEquals(combined + " has implicit version: latest", "latest", imageName.getVersionPart());
+                assertEquals(combined + " has no version specified", "", imageName.getVersionPart());
             }
             assertEquals(combined + " has canonical name: " + canonicalName, canonicalName, imageName.asCanonicalNameString());
 
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index f0b8fb36a37..ccd68fbd984 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -1,14 +1,13 @@
 package org.testcontainers.utility;
 
-import org.junit.Test;
-
-import java.util.Properties;
-import java.util.UUID;
-
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
+import java.util.Properties;
+import java.util.UUID;
+import org.junit.Test;
+
 public class TestcontainersConfigurationTest {
 
     final Properties environmentProperties = new Properties();
@@ -48,7 +47,7 @@ public void shouldReadReuseFromEnvironmentOnly() {
         assertTrue("reuse enabled", newConfig().environmentSupportsReuse());
 
         environmentProperties.setProperty("ryuk.container.image", " testcontainersofficial/ryuk:0.3.0 ");
-        assertEquals("trailing whitespace was not removed from image name property", "testcontainersofficial/ryuk:0.3.0",newConfig().getRyukImage());
+        assertEquals("trailing whitespace was not removed from image name property", "testcontainersofficial/ryuk:0.3.0",newConfig().getRyukDockerImageName().asCanonicalNameString());
 
     }
 
diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 83bb8af0628..d36273ac8e1 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -26,7 +26,7 @@ Now your tests or any other process running on your machine can get access to ru
 
 ### Selecting Kafka version
 
-You can select a version of Confluent Platform by passing it to the container's constructor:
+You can select a specific Confluent Platform Kafka docker image by passing it to the container's constructor:
 <!--codeinclude-->
 [Version Constructor](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
@@ -44,7 +44,7 @@ If for some reason you want to use an externally running Zookeeper, then just pa
 
 ## Multi-container usage
 
-If your test needs to run some other Docker container which needs access to the Kafka, do the following:
+If your test needs to run some other Docker container which needs access to Kafka, do the following:
 
 * Run your other container on the same network as Kafka container, e.g.:
 <!--codeinclude-->
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
index e44f2bb982e..c4c07c1f601 100644
--- a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
+++ b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
@@ -38,7 +38,6 @@ public MongoDbContainer() {
      * @param image the image (e.g. {@value DEFAULT_IMAGE_AND_TAG}) to use
      * @deprecated use {@link MongoDbContainer(DockerImageName)} instead
      */
-    @Deprecated
     public MongoDbContainer(@NotNull String image) {
         this(DockerImageName.parse(image));
     }
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index 681c58f4efb..597b1c9b017 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -25,8 +25,11 @@
  */
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
 
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cassandra");
+    private static final String DEFAULT_TAG = "3.11.2";
+
     @Deprecated
-    public static final String IMAGE = "cassandra";
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
     public static final Integer CQL_PORT = 9042;
     private static final String CONTAINER_CONFIG_LOCATION = "/etc/cassandra";
@@ -42,19 +45,18 @@ public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends G
      */
     @Deprecated
     public CassandraContainer() {
-        this("cassandra:3.11.2");
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link #CassandraContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public CassandraContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public CassandraContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         addExposedPort(CQL_PORT);
         setStartupAttempts(3);
         this.enableJmxReporting = false;
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 6bdcff7b3f2..e26ca8c8416 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -7,7 +7,12 @@
 
 public class ClickHouseContainer extends JdbcDatabaseContainer {
     public static final String NAME = "clickhouse";
-    public static final String IMAGE = "yandex/clickhouse-server";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yandex/clickhouse-server");
+
+    @Deprecated
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
     @Deprecated
     public static final String DEFAULT_TAG = "18.10.3";
 
@@ -27,13 +32,9 @@ public class ClickHouseContainer extends JdbcDatabaseContainer {
      */
     @Deprecated
     public ClickHouseContainer() {
-        super(IMAGE + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link ClickHouseContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public ClickHouseContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -41,6 +42,8 @@ public ClickHouseContainer(String dockerImageName) {
     public ClickHouseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         withExposedPorts(HTTP_PORT, NATIVE_PORT);
         waitingFor(
             new HttpWaitStrategy()
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 54420155f05..2a7990413e4 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -6,9 +6,18 @@
 import java.time.Duration;
 
 public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cockroachdb/cockroach");
+    private static final String DEFAULT_TAG = "v19.1.1";
+
     public static final String NAME = "cockroach";
-    public static final String IMAGE = "cockroachdb/cockroach";
-    public static final String IMAGE_TAG = "v19.1.1";
+
+    @Deprecated
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
+    @Deprecated
+    public static final String IMAGE_TAG = DEFAULT_TAG;
+
     private static final String JDBC_DRIVER_CLASS_NAME = "org.postgresql.Driver";
     private static final String JDBC_URL_PREFIX = "jdbc:postgresql";
     private static final String TEST_QUERY_STRING = "SELECT 1";
@@ -24,13 +33,9 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
      */
     @Deprecated
     public CockroachContainer() {
-        this(IMAGE + ":" + IMAGE_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link CockroachContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public CockroachContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -38,6 +43,8 @@ public CockroachContainer(final String dockerImageName) {
     public CockroachContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         withExposedPorts(REST_API_PORT, DB_PORT);
         waitingFor(
             new HttpWaitStrategy()
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 4f154708d0c..11960304ee6 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -70,9 +70,9 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private static final int KV_SSL_PORT = 11207;
 
-    private static final String DOCKER_IMAGE_NAME = "couchbase/server";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("couchbase/server");
 
-    private static final String VERSION = "6.5.1";
+    private static final String DEFAULT_TAG = "6.5.1";
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
@@ -92,26 +92,26 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
      */
     @Deprecated
     public CouchbaseContainer() {
-        this(DOCKER_IMAGE_NAME + ":" + VERSION);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
-     * Creates a new couchbase container with a custom image name.
+     * Creates a new couchbase container with the specified image name.
      *
      * @param dockerImageName the image name that should be used.
-     * @deprecated use {@link CouchbaseContainer(DockerImageName)} instead
      */
-    @Deprecated
     public CouchbaseContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     /**
      * Create a new couchbase container with the specified image name.
-     * @param dockerImageName
+     * @param dockerImageName the image name that should be used.
      */
     public CouchbaseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
     }
 
     /**
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index aa6d136aaec..c1a252936ea 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -12,7 +12,13 @@
 public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     public static final String NAME = "db2";
-    public static final String DEFAULT_DB2_IMAGE_NAME = "ibmcom/db2";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ibmcom/db2");
+
+    @Deprecated
+    public static final String DEFAULT_DB2_IMAGE_NAME = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
+    @Deprecated
     public static final String DEFAULT_TAG = "11.5.0.0a";
     public static final int DB2_PORT = 50000;
 
@@ -25,19 +31,18 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
      */
     @Deprecated
     public Db2Container() {
-        this(DEFAULT_DB2_IMAGE_NAME + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link Db2Container(DockerImageName)} instead
-     */
-    @Deprecated
     public Db2Container(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public Db2Container(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         withPrivilegedMode(true);
         this.waitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*Setup has completed\\..*")
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
index 6063c1a5dbe..8900964a8bb 100644
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
@@ -14,7 +14,8 @@
  */
 public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
 
-    private static final String IMAGE_NAME = "quay.io/testcontainers/dynalite:v1.2.1-1";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("quay.io/testcontainers/dynalite");
+    private static final String DEFAULT_TAG = "v1.2.1-1";
     private static final int MAPPED_PORT = 4567;
 
     /**
@@ -22,20 +23,19 @@ public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
      */
     @Deprecated
     public DynaliteContainer() {
-        this(IMAGE_NAME);
-        withExposedPorts(MAPPED_PORT);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link DynaliteContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public DynaliteContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public DynaliteContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(MAPPED_PORT);
     }
 
 
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 6ad0172269d..7ed660d38c6 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -1,16 +1,15 @@
 package org.testcontainers.elasticsearch;
 
+import static java.net.HttpURLConnection.HTTP_OK;
+import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
+
+import java.net.InetSocketAddress;
+import java.time.Duration;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerImageName;
 
-import java.net.InetSocketAddress;
-import java.time.Duration;
-
-import static java.net.HttpURLConnection.HTTP_OK;
-import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
-
 /**
  * Represents an elasticsearch docker instance which exposes by default port 9200 and 9300 (transport.tcp.port)
  * The docker image is by default fetched from docker.elastic.co/elasticsearch/elasticsearch
@@ -28,35 +27,41 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     private static final int ELASTICSEARCH_DEFAULT_TCP_PORT = 9300;
 
     /**
-     * Elasticsearch Docker base URL
+     * Elasticsearch Docker base image
      */
-    private static final String ELASTICSEARCH_DEFAULT_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch");
+    private static final DockerImageName DEFAULT_OSS_IMAGE_NAME = DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss");
 
     /**
      * Elasticsearch Default version
      */
-    protected static final String ELASTICSEARCH_DEFAULT_VERSION = "6.4.1";
+    protected static final String DEFAULT_TAG = "6.4.1";
 
     /**
      * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
      */
     @Deprecated
     public ElasticsearchContainer() {
-        this(ELASTICSEARCH_DEFAULT_IMAGE + ":" + ELASTICSEARCH_DEFAULT_VERSION);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
      * Create an Elasticsearch Container by passing the full docker image name
-     * @param dockerImageName Full docker image name, like: docker.elastic.co/elasticsearch/elasticsearch:6.4.1
-     * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
+     * @param dockerImageName Full docker image name as a {@link String}, like: docker.elastic.co/elasticsearch/elasticsearch:6.4.1
      */
-    @Deprecated
     public ElasticsearchContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
+    /**
+     * Create an Elasticsearch Container by passing the full docker image name
+     * @param dockerImageName Full docker image name as a {@link DockerImageName}, like: docker.elastic.co/elasticsearch/elasticsearch:6.4.1
+     */
     public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME);
+
         logger().info("Starting an elasticsearch container using [{}]", dockerImageName);
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
         withEnv("discovery.type", "single-node");
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 2e617691646..712daf4a11d 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -1,5 +1,12 @@
 package org.testcontainers.elasticsearch;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.testcontainers.elasticsearch.ElasticsearchContainer.DEFAULT_TAG;
+
+import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -20,14 +27,6 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import java.io.IOException;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.testcontainers.elasticsearch.ElasticsearchContainer.ELASTICSEARCH_DEFAULT_VERSION;
-
 public class ElasticsearchContainerTest {
 
     /**
@@ -72,7 +71,7 @@ public void elasticsearchDefaultTest() throws IOException {
             // Do whatever you want with the rest client ...
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_DEFAULT_VERSION));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString(DEFAULT_TAG));
 
             // The default image is running with the features under Elastic License
             response = getClient(container).performRequest(new Request("GET", "/_xpack/"));
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index 5d883fea9a7..7ebfbff1a86 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -14,10 +14,13 @@
  */
 public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends GenericContainer<SELF> {
 
-    public static final String VERSION = "1.4.3";
     public static final Integer INFLUXDB_PORT = 8086;
 
-    private static final String IMAGE_NAME = "influxdb";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb");
+    private static final String DEFAULT_TAG = "1.4.3";
+
+    @Deprecated
+    public static final String VERSION = DEFAULT_TAG;
 
     private boolean authEnabled = true;
     private String admin = "admin";
@@ -32,7 +35,7 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
      */
     @Deprecated
     public InfluxDBContainer() {
-        this(VERSION);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
@@ -40,11 +43,14 @@ public InfluxDBContainer() {
      */
     @Deprecated
     public InfluxDBContainer(final String version) {
-        this(DockerImageName.parse(IMAGE_NAME + ":" + version));
+        this(DEFAULT_IMAGE_NAME.withTag(version));
     }
 
     public InfluxDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         waitStrategy = new WaitAllStrategy()
             .withStrategy(Wait.forHttp("/ping").withBasicCredentials(username, password).forStatusCode(204))
             .withStrategy(Wait.forListeningPort());
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 4d1c4ece67b..26d699a1813 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -42,7 +42,6 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
     /**
      * @deprecated use {@link JdbcDatabaseContainer(DockerImageName)} instead
      */
-    @Deprecated
     public JdbcDatabaseContainer(@NonNull final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 2451278b1c2..4086cd4e2e4 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -18,6 +18,9 @@
  */
 public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
+    private static final String DEFAULT_TAG = "5.2.1";
+
     private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
 
     public static final int KAFKA_PORT = 9093;
@@ -35,7 +38,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
      */
     @Deprecated
     public KafkaContainer() {
-        this("5.2.1");
+        this(TestcontainersConfiguration.getInstance().getKafkaDockerImageName().withTag(DEFAULT_TAG));
     }
 
     /**
@@ -43,12 +46,14 @@ public KafkaContainer() {
      */
     @Deprecated
     public KafkaContainer(String confluentPlatformVersion) {
-        this(DockerImageName.parse(TestcontainersConfiguration.getInstance().getKafkaImage() + ":" + confluentPlatformVersion));
+        this(TestcontainersConfiguration.getInstance().getKafkaDockerImageName().withTag(confluentPlatformVersion));
     }
 
     public KafkaContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         withExposedPorts(KAFKA_PORT);
 
         // Use two listeners with different names, it will force Kafka to communicate with itself via internal
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 71702ce8e62..6a669b2f60d 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -1,6 +1,13 @@
 package org.testcontainers.containers;
 
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
 import com.google.common.collect.ImmutableMap;
+import java.time.Duration;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -10,27 +17,19 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.Rule;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.utility.DockerImageName;
 
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
 public class KafkaContainerTest {
 
     private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:5.2.1");
     private static final DockerImageName ZOOKEEPER_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-zookeeper:4.0.0");
 
     // junitRule {
-    @Rule
-    public KafkaContainer kafka = new KafkaContainer();
+    @ClassRule
+    public static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.2.1"));
     // }
 
     @Test
@@ -43,10 +42,10 @@ public void testUsage() throws Exception {
 
 
     @Test
-    public void testUsageWithVersion() throws Exception {
+    public void testUsageWithSpecificImage() throws Exception {
         try (
             // constructorWithVersion {
-            KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.2.1"))
             // }
         ) {
             kafka.start();
@@ -58,6 +57,17 @@ public void testUsageWithVersion() throws Exception {
         }
     }
 
+
+    @Test
+    public void testUsageWithVersion() throws Exception {
+        try (
+            KafkaContainer kafka = new KafkaContainer("5.2.1")
+        ) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
     @Test
     public void testExternalZookeeperWithExternalNetwork() throws Exception {
         try (
@@ -75,7 +85,8 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
 
             // withKafkaNetwork {
-            GenericContainer application = new GenericContainer("alpine").withNetwork(network)
+            GenericContainer<?> application = new GenericContainer<>(DockerImageName.parse("alpine"))
+                .withNetwork(network)
             // }
                 .withNetworkAliases("dummy")
                 .withCommand("sleep 10000")
@@ -109,8 +120,8 @@ protected void testKafkaFunctionality(String bootstrapServers) throws Exception
                 new StringDeserializer()
             );
         ) {
-            String topicName = "messages";
-            consumer.subscribe(Arrays.asList(topicName));
+            String topicName = "messages-" + UUID.randomUUID();
+            consumer.subscribe(singletonList(topicName));
 
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
 
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index a9547eec94d..7532ebe0b3d 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -4,14 +4,6 @@
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
@@ -24,6 +16,15 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>Container for Atlassian Labs Localstack, 'A fully functional local AWS cloud stack'.</p>
  * <p>{@link LocalStackContainer#withServices(Service...)} should be used to select which services
@@ -35,11 +36,16 @@
 @Slf4j
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
-    public static final String VERSION = "0.11.2";
     static final int PORT = 4566;
     private static final String HOSTNAME_EXTERNAL_ENV_VAR = "HOSTNAME_EXTERNAL";
     private final List<Service> services = new ArrayList<>();
 
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("localstack/localstack");
+    private static final String DEFAULT_TAG = "0.11.2";
+
+    @Deprecated
+    public static final String VERSION = DEFAULT_TAG;
+
     /**
      * Whether or to assume that all APIs run on different ports (when <code>true</code>) or are
      * exposed on a single port (<code>false</code>). From the Localstack README:
@@ -59,7 +65,7 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
      */
     @Deprecated
     public LocalStackContainer() {
-        this(VERSION);
+        this(TestcontainersConfiguration.getInstance().getLocalstackDockerImageName().withTag(DEFAULT_TAG));
     }
 
     /**
@@ -67,7 +73,7 @@ public LocalStackContainer() {
      */
     @Deprecated
     public LocalStackContainer(String version) {
-        this(DockerImageName.parse(TestcontainersConfiguration.getInstance().getLocalStackImage() + ":" + version));
+        this(TestcontainersConfiguration.getInstance().getLocalstackDockerImageName().withTag(version));
     }
 
     /**
@@ -83,6 +89,9 @@ public LocalStackContainer(final DockerImageName dockerImageName) {
      */
     public LocalStackContainer(final DockerImageName dockerImageName, boolean useLegacyMode) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         this.legacyMode = useLegacyMode;
 
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index e137c186209..b43a5f237e5 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -9,10 +9,16 @@
  */
 public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
-    public static final String NAME = "mariadb";
-    public static final String IMAGE = "mariadb";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mariadb");
+
+    @Deprecated
     public static final String DEFAULT_TAG = "10.3.6";
 
+    public static final String NAME = "mariadb";
+
+    @Deprecated
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
     static final String DEFAULT_USER = "test";
 
     static final String DEFAULT_PASSWORD = "test";
@@ -29,19 +35,18 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
      */
     @Deprecated
     public MariaDBContainer() {
-        this(IMAGE + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link MariaDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public MariaDBContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public MariaDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         addExposedPort(MARIADB_PORT);
     }
 
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 2aa33931d07..451a4710b20 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -6,7 +6,11 @@
 @Slf4j
 public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
-    public static final String VERSION = "5.5.4";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver");
+    private static final String DEFAULT_TAG = "mockserver-5.5.4";
+
+    @Deprecated
+    public static final String VERSION = DEFAULT_TAG;
 
     public static final int PORT = 1080;
 
@@ -15,7 +19,7 @@ public class MockServerContainer extends GenericContainer<MockServerContainer> {
      */
     @Deprecated
     public MockServerContainer() {
-        this(VERSION);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
@@ -23,11 +27,14 @@ public MockServerContainer() {
      */
     @Deprecated
     public MockServerContainer(String version) {
-        this(DockerImageName.parse("jamesdbloom/mockserver:mockserver-" + version));
+        this(DEFAULT_IMAGE_NAME.withTag("mockserver-" + version));
     }
 
     public MockServerContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         withCommand("-logLevel INFO -serverPort " + PORT);
         addExposedPorts(PORT);
     }
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 1527b3924db..200b3aa0820 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -16,10 +16,12 @@
  */
 @Slf4j
 public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mongo");
+    private static final String DEFAULT_TAG = "4.0.10";
     private static final int CONTAINER_EXIT_CODE_OK = 0;
     private static final int MONGODB_INTERNAL_PORT = 27017;
     private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
-    private static final String MONGODB_VERSION_DEFAULT = "4.0.10";
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
 
     /**
@@ -27,19 +29,18 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
      */
     @Deprecated
     public MongoDBContainer() {
-        this("mongo:" + MONGODB_VERSION_DEFAULT);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public MongoDBContainer(@NonNull final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         withExposedPorts(MONGODB_INTERNAL_PORT);
         withCommand("--replSet", "docker-rs");
         waitingFor(
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
index d72ab8e8419..fe7ada669bd 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
@@ -21,6 +21,7 @@ public boolean supports(ConnectionFactoryOptions options) {
 
     @Override
     public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        // TODO work out how best to do this if these constants become private
         String image = MSSQLServerContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
         MSSQLServerContainer<?> container = new MSSQLServerContainer<>(image);
 
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 0a6d8149e34..a20c60fd2dc 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -11,10 +11,14 @@
  */
 public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
-    public static final String NAME = "sqlserver";
-    public static final String IMAGE = "mcr.microsoft.com/mssql/server";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mcr.microsoft.com/mssql/server");
+    @Deprecated
     public static final String DEFAULT_TAG = "2017-CU12";
 
+    public static final String NAME = "sqlserver";
+
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
     public static final Integer MS_SQL_SERVER_PORT = 1433;
 
     static final String DEFAULT_USER = "SA";
@@ -38,19 +42,18 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
      */
     @Deprecated
     public MSSQLServerContainer() {
-        this(IMAGE + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link MSSQLServerContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public MSSQLServerContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public MSSQLServerContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
         addExposedPort(MS_SQL_SERVER_PORT);
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 35321db5d72..1dc235e6536 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -12,9 +12,15 @@
 public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     public static final String NAME = "mysql";
-    public static final String IMAGE = "mysql";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mysql");
+
+    @Deprecated
     public static final String DEFAULT_TAG = "5.7.22";
 
+    @Deprecated
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
     static final String DEFAULT_USER = "test";
 
     static final String DEFAULT_PASSWORD = "test";
@@ -31,19 +37,18 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
      */
     @Deprecated
     public MySQLContainer() {
-        this(IMAGE + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link MySQLContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public MySQLContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public MySQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         addExposedPort(MYSQL_PORT);
     }
 
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 5d4212ccacd..e93a840302a 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -1,5 +1,11 @@
 package org.testcontainers.containers;
 
+import static java.net.HttpURLConnection.HTTP_OK;
+import static java.util.stream.Collectors.toSet;
+
+import java.time.Duration;
+import java.util.Set;
+import java.util.stream.Stream;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
@@ -8,13 +14,6 @@
 import org.testcontainers.utility.LicenseAcceptance;
 import org.testcontainers.utility.MountableFile;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import static java.net.HttpURLConnection.HTTP_OK;
-import static java.util.stream.Collectors.toSet;
-
 /**
  * Testcontainer for Neo4j.
  *
@@ -26,14 +25,13 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
     /**
      * The image defaults to the official Neo4j image: <a href="https://hub.docker.com/_/neo4j/">Neo4j</a>.
      */
-    private static final String DEFAULT_IMAGE_NAME = "neo4j";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("neo4j");
 
     /**
      * The default tag (version) to use.
      */
     private static final String DEFAULT_TAG = "3.5.0";
-
-    private static final String DOCKER_IMAGE_NAME = DEFAULT_IMAGE_NAME + ":" + DEFAULT_TAG;
+    private static final String ENTERPRISE_TAG = DEFAULT_TAG + "-enterprise";
 
     /**
      * Default port for the binary Bolt protocol.
@@ -57,33 +55,41 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
 
     private static final String AUTH_FORMAT = "neo4j/%s";
 
-    private String adminPassword = DEFAULT_ADMIN_PASSWORD;
+    private final boolean standardImage;
 
-    private boolean standardImage = false;
+    private String adminPassword = DEFAULT_ADMIN_PASSWORD;
 
     /**
-     * Creates a Testcontainer using the official Neo4j docker image.
+     * Creates a Neo4jContainer using the official Neo4j docker image.
      * @deprecated use {@link Neo4jContainer(DockerImageName)} instead
      */
     @Deprecated
     public Neo4jContainer() {
-        this(DOCKER_IMAGE_NAME);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
-     * Creates a Testcontainer using a specific docker image.
+     * Creates a Neo4jContainer using a specific docker image.
      *
      * @param dockerImageName The docker image to use.
-     * @deprecated use {@link Neo4jContainer(DockerImageName)} instead
      */
-    @Deprecated
     public Neo4jContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
+    /**
+     * Creates a Neo4jContainer using a specific docker image.
+     *
+     * @param dockerImageName The docker image to use.
+     */
     public Neo4jContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
+        this.standardImage = dockerImageName.getUnversionedPart()
+            .equals(DEFAULT_IMAGE_NAME.getUnversionedPart());
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         WaitStrategy waitForBolt = new LogMessageWaitStrategy()
             .withRegEx(String.format(".*Bolt enabled on 0\\.0\\.0\\.0:%d\\.\n", DEFAULT_BOLT_PORT));
         WaitStrategy waitForHttp = new HttpWaitStrategy()
@@ -96,10 +102,6 @@ public Neo4jContainer(final DockerImageName dockerImageName) {
             .withStartupTimeout(Duration.ofMinutes(2));
 
         addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
-
-        if (dockerImageName.getUnversionedPart().equals(DEFAULT_IMAGE_NAME)) {
-            this.standardImage = true;
-        }
     }
 
     @Override
@@ -149,13 +151,13 @@ public String getHttpsUrl() {
      * @return This container.
      */
     public S withEnterpriseEdition() {
-
         if (!standardImage) {
             throw new IllegalStateException(
-                String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName()));
+                String.format("Cannot use enterprise version with alternative image %s.",
+                    getDockerImageName()));
         }
 
-        setDockerImageName(DOCKER_IMAGE_NAME + "-enterprise");
+        setDockerImageName(DEFAULT_IMAGE_NAME.withTag(ENTERPRISE_TAG).asCanonicalNameString());
         LicenseAcceptance.assertLicenseAccepted(getDockerImageName());
 
         addEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes");
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 75a4571b68e..296d82b7997 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -15,28 +15,28 @@
 public class NginxContainer<SELF extends NginxContainer<SELF>> extends GenericContainer<SELF> implements LinkableContainer {
 
     private static final int NGINX_DEFAULT_PORT = 80;
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("nginx");
+    private static final String DEFAULT_TAG = "1.9.4";
 
     /**
      * @deprecated use {@link NginxContainer(DockerImageName)} instead
      */
     @Deprecated
     public NginxContainer() {
-        this("nginx:1.9.4");
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link NginxContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public NginxContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
-
-        addExposedPort(NGINX_DEFAULT_PORT);
-        setCommand("nginx", "-g", "daemon off;");
     }
 
     public NginxContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPort(NGINX_DEFAULT_PORT);
+        setCommand("nginx", "-g", "daemon off;");
     }
 
     @NotNull
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 8406d8275fb..b5700c1e84e 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -41,10 +41,6 @@ public OracleContainer() {
         this(resolveImageName());
     }
 
-    /**
-     * @deprecated use {@link OracleContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public OracleContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index 797f73f7159..f6ce060b6ec 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -29,9 +29,8 @@
 public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
     private static final Logger LOGGER = LoggerFactory.getLogger(OrientDBContainer.class);
 
-    private static final String DEFAULT_IMAGE_NAME = "orientdb";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("orientdb");
     private static final String DEFAULT_TAG = "3.0.24-tp3";
-    private static final String DOCKER_IMAGE_NAME = DEFAULT_IMAGE_NAME + ":" + DEFAULT_TAG;
 
     private static final String DEFAULT_USERNAME = "admin";
     private static final String DEFAULT_PASSWORD = "admin";
@@ -54,13 +53,9 @@ public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
      */
     @Deprecated
     public OrientDBContainer() {
-        this(DOCKER_IMAGE_NAME);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link OrientDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public OrientDBContainer(@NonNull String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -68,6 +63,8 @@ public OrientDBContainer(@NonNull String dockerImageName) {
     public OrientDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         serverPassword = DEFAULT_SERVER_PASSWORD;
         databaseName = DEFAULT_DATABASE_NAME;
 
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
index 9e59787837b..76c213f0931 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
@@ -9,8 +9,8 @@
 public class PostgisContainerProvider extends JdbcDatabaseContainerProvider {
 
     private static final String NAME = "postgis";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("postgis/postgis").asCompatibleSubstituteFor("postgres");
     private static final String DEFAULT_TAG = "12-3.0";
-    private static final String DEFAULT_IMAGE = "postgis/postgis";
     public static final String USER_PARAM = "user";
     public static final String PASSWORD_PARAM = "password";
 
@@ -27,7 +27,7 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new PostgreSQLContainer(DockerImageName.parse(DEFAULT_IMAGE).withTag(DEFAULT_TAG));
+        return new PostgreSQLContainer<>(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     @Override
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index b1ddb2a26ee..5a4abe6d0ee 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -16,7 +16,9 @@
 public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
     public static final String NAME = "postgresql";
     public static final String IMAGE = "postgres";
+
     public static final String DEFAULT_TAG = "9.6.12";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("postgres");
 
     public static final Integer POSTGRESQL_PORT = 5432;
 
@@ -37,19 +39,18 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
      */
     @Deprecated
     public PostgreSQLContainer() {
-        this(IMAGE + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link PostgreSQLContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public PostgreSQLContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public PostgreSQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         this.waitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*database system is ready to accept connections.*\\s")
                 .withTimes(2)
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 1c8c03ce4de..e4934693d14 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -16,6 +16,7 @@
 
 public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
     public static final String NAME = "presto";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("prestosql/presto");
     public static final String IMAGE = "prestosql/presto";
     public static final String DEFAULT_TAG = "329";
 
@@ -29,19 +30,18 @@ public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDat
      */
     @Deprecated
     public PrestoContainer() {
-        this(IMAGE + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link PrestoContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public PrestoContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public PrestoContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         this.waitStrategy = new LogMessageWaitStrategy()
             .withRegEx(".*======== SERVER STARTED ========.*")
             .withStartupTimeout(Duration.of(60, SECONDS));
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 4d30d947113..bceff8927d7 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -14,8 +14,9 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
     public static final int BROKER_HTTP_PORT = 8080;
     public static final String METRICS_ENDPOINT = "/metrics";
 
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar");
     @Deprecated
-    private static final String DEFAULT_PULSAR_VERSION = "2.2.0";
+    private static final String DEFAULT_TAG = "2.2.0";
 
     private boolean functionsWorkerEnabled = false;
 
@@ -24,7 +25,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
      */
     @Deprecated
     public PulsarContainer() {
-        this(DEFAULT_PULSAR_VERSION);
+        this(TestcontainersConfiguration.getInstance().getPulsarDockerImageName().withTag(DEFAULT_TAG));
     }
 
     /**
@@ -37,6 +38,9 @@ public PulsarContainer(String pulsarVersion) {
 
     public PulsarContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DockerImageName.parse("apachepulsar/pulsar"));
+
         withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT);
         withCommand("/pulsar/bin/pulsar", "standalone", "--no-functions-worker", "-nss");
         waitingFor(Wait.forHttp(METRICS_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index a3b6134b29c..edbffcf3174 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -28,7 +28,7 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
     /**
      * The image defaults to the official RabbitmQ image: <a href="https://hub.docker.com/_/rabbitmq/">RabbitMQ</a>.
      */
-    private static final String DEFAULT_IMAGE_NAME = "rabbitmq";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("rabbitmq");
     private static final String DEFAULT_TAG = "3.7.25-management-alpine";
 
     private static final int DEFAULT_AMQP_PORT = 5672;
@@ -41,21 +41,19 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
     private final List<List<String>> values = new ArrayList<>();
 
     /**
-     * Creates a Testcontainer using the official RabbitMQ docker image.
+     * Creates a RabbitMQ container using the official RabbitMQ docker image.
      * @deprecated use {@link RabbitMQContainer(DockerImageName)} instead
      */
     @Deprecated
     public RabbitMQContainer() {
-        this(DEFAULT_IMAGE_NAME + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
-     * Creates a Testcontainer using a specific docker image.
+     * Creates a RabbitMQ container using a specific docker image.
      *
      * @param dockerImageName The docker image to use.
-     * @deprecated use {@link RabbitMQContainer(DockerImageName)} instead
      */
-    @Deprecated
     public RabbitMQContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -63,6 +61,8 @@ public RabbitMQContainer(String dockerImageName) {
     public RabbitMQContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         addExposedPorts(DEFAULT_AMQP_PORT, DEFAULT_AMQPS_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
 
         this.waitStrategy = Wait.
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index f1cedab76ad..d60d9191748 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -1,10 +1,21 @@
 package org.testcontainers.containers;
 
+import static java.time.temporal.ChronoUnit.SECONDS;
+
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.collect.ImmutableSet;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
@@ -25,18 +36,6 @@
 import org.testcontainers.lifecycle.TestLifecycleAware;
 import org.testcontainers.utility.DockerImageName;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static java.time.temporal.ChronoUnit.SECONDS;
-
 /**
  * A chrome/firefox/custom container based on SeleniumHQ's standalone container sets.
  * <p>
@@ -44,8 +43,14 @@
  */
 public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>> extends GenericContainer<SELF> implements LinkableContainer, TestLifecycleAware {
 
-    private static final String CHROME_IMAGE = "selenium/standalone-chrome-debug:%s";
-    private static final String FIREFOX_IMAGE = "selenium/standalone-firefox-debug:%s";
+    private static final DockerImageName CHROME_IMAGE = DockerImageName.parse("selenium/standalone-chrome-debug");
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox-debug");
+    private static final DockerImageName[] COMPATIBLE_IMAGES = new DockerImageName[] {
+        CHROME_IMAGE,
+        FIREFOX_IMAGE,
+        DockerImageName.parse("selenium/standalone-chrome"),
+        DockerImageName.parse("selenium/standalone-firefox")
+    };
 
     private static final String DEFAULT_PASSWORD = "secret";
     private static final int SELENIUM_PORT = 4444;
@@ -56,7 +61,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 
     @Nullable
     private Capabilities capabilities;
-    private boolean customImageNameIsSet = false;
+    private DockerImageName customImageName = null;
 
     @Nullable
     private RemoteWebDriver driver;
@@ -68,9 +73,6 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BrowserWebDriverContainer.class);
 
-    /**
-     * @deprecated use {@link BrowserWebDriverContainer(DockerImageName)} instead
-     */
     public BrowserWebDriverContainer() {
         super();
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
@@ -88,9 +90,7 @@ public BrowserWebDriverContainer() {
     /**
      * Constructor taking a specific webdriver container name and tag
      * @param dockerImageName Name of the selenium docker image
-     * @deprecated use {@link BrowserWebDriverContainer(DockerImageName)} instead
      */
-    @Deprecated
     public BrowserWebDriverContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -101,6 +101,9 @@ public BrowserWebDriverContainer(String dockerImageName) {
      */
     public BrowserWebDriverContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        // we assert compatibility with the chrome/firefox image later, after capabilities are processed
+
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
                 .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
                 .withStartupTimeout(Duration.of(15, SECONDS));
@@ -112,7 +115,7 @@ public BrowserWebDriverContainer(DockerImageName dockerImageName) {
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
 
-        this.customImageNameIsSet = true;
+        this.customImageName = dockerImageName;
         // We have to force SKIP mode for the recording by default because we don't know if the image has VNC or not
         recordingMode = VncRecordingMode.SKIP;
     }
@@ -182,8 +185,12 @@ protected void configure() {
                     .withVncPort(VNC_PORT);
         }
 
-        if (!customImageNameIsSet) {
-            super.setDockerImageName(getImageForCapabilities(capabilities, seleniumVersion));
+        if (customImageName != null) {
+            customImageName.assertCompatibleWith(COMPATIBLE_IMAGES);
+            super.setDockerImageName(customImageName.asCanonicalNameString());
+        } else {
+            DockerImageName standardImageForCapabilities = getImageForCapabilities(capabilities, seleniumVersion);
+            super.setDockerImageName(standardImageForCapabilities.asCanonicalNameString());
         }
 
         String timeZone = System.getProperty("user.timezone");
@@ -211,14 +218,13 @@ protected void configure() {
         setStartupAttempts(3);
     }
 
-    public static String getImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
-
+    private static DockerImageName getImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
         String browserName = capabilities.getBrowserName();
         switch (browserName) {
             case BrowserType.CHROME:
-                return String.format(CHROME_IMAGE, seleniumVersion);
+                return CHROME_IMAGE.withTag(seleniumVersion);
             case BrowserType.FIREFOX:
-                return String.format(FIREFOX_IMAGE, seleniumVersion);
+                return FIREFOX_IMAGE.withTag(seleniumVersion);
             default:
                 throw new UnsupportedOperationException("Browser name must be 'chrome' or 'firefox'; provided '" + browserName + "' is not supported");
         }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
index bbcd8c15166..1c7d3fe494d 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
@@ -23,7 +23,9 @@ public static String[] data() {
 
     @Test
     public void testAdditionalStartupString() {
-        final DockerImageName imageName = DockerImageName.parse("selenium/standalone-chrome-debug").withTag(tag);
+        final DockerImageName imageName = DockerImageName
+            .parse("selenium/standalone-chrome-debug")
+            .withTag(tag);
         try (BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>(imageName)
                 .withCapabilities(new ChromeOptions())) {
             chrome.start();
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
index bbc3b4db7a0..9a15c6b466d 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
@@ -8,7 +8,8 @@
 
 public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
 
-    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox:2.53.1-beryllium");
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName
+        .parse("selenium/standalone-firefox:2.53.1-beryllium");
 
     @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index aeadb664089..4bc2f19ec86 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -18,7 +18,12 @@
  */
 public class SolrContainer extends GenericContainer<SolrContainer> {
 
-    public static final String IMAGE = "solr";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("solr");
+
+    @Deprecated
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
+    @Deprecated
     public static final String DEFAULT_TAG = "8.3.0";
 
     public static final Integer ZOOKEEPER_PORT = 9983;
@@ -31,19 +36,21 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
      */
     @Deprecated
     public SolrContainer() {
-        this(IMAGE + ":" + DEFAULT_TAG);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
      * @deprecated use {@link SolrContainer(DockerImageName)} instead
      */
-    @Deprecated
     public SolrContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public SolrContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         this.waitStrategy = new LogMessageWaitStrategy()
             .withRegEx(".*o\\.e\\.j\\.s\\.Server Started.*")
             .withStartupTimeout(Duration.of(60, SECONDS));
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index b01d031cc5b..e6c143fa358 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -21,7 +21,8 @@
  */
 public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
-    private static final String IMAGE_NAME = "shopify/toxiproxy:2.1.0";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy");
+    private static final String DEFAULT_TAG = "2.1.0";
     private static final int TOXIPROXY_CONTROL_PORT = 8474;
     private static final int FIRST_PROXIED_PORT = 8666;
     private static final int LAST_PROXIED_PORT = 8666 + 31;
@@ -35,19 +36,18 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
      */
     @Deprecated
     public ToxiproxyContainer() {
-        this(IMAGE_NAME);
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link ToxiproxyContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public ToxiproxyContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public ToxiproxyContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         addExposedPorts(TOXIPROXY_CONTROL_PORT);
         setWaitStrategy(new HttpWaitStrategy().forPath("/version").forPort(TOXIPROXY_CONTROL_PORT));
 
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 1532f463f37..b0c8a2a40e3 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -23,6 +23,9 @@
  */
 public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericContainer<SELF> {
 
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("vault");
+    private static final String DEFAULT_TAG = "1.1.3";
+
     private static final int VAULT_PORT = 8200;
 
     private Map<String, List<String>> secretsMap = new HashMap<>();
@@ -34,13 +37,9 @@ public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericCo
      */
     @Deprecated
     public VaultContainer() {
-        this("vault:1.1.3");
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
-    /**
-     * @deprecated use {@link VaultContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public VaultContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -48,6 +47,8 @@ public VaultContainer(String dockerImageName) {
     public VaultContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
         // Use the vault healthcheck endpoint to check for readiness, per https://www.vaultproject.io/api/system/health.html
         setWaitStrategy(Wait.forHttp("/v1/sys/health").forStatusCode(200));
 

From 2cd32fd637d1846fba187cc11fd1ad6ef69c44dc Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:53:41 +0200
Subject: [PATCH 0998/4969] Add support for MongoDB 4.4 (#3083)

Make LogMessageWaitStrategy in MongoDBContainer compatible
Fixes #3077
---
 .../org/testcontainers/containers/MongoDBContainer.java  | 2 +-
 .../testcontainers/containers/MongoDBContainerTest.java  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 200b3aa0820..5fd2451480b 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -44,7 +44,7 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
         withExposedPorts(MONGODB_INTERNAL_PORT);
         withCommand("--replSet", "docker-rs");
         waitingFor(
-            Wait.forLogMessage(".*waiting for connections on port.*", 1)
+            Wait.forLogMessage("(?i).*waiting for connections.*", 1)
         );
     }
 
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index d637cb07f2d..b18e7f15a01 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -73,4 +73,13 @@ public void shouldExecuteTransactions() {
             }
         }
     }
+
+    @Test
+    public void supportsMongoDB_4_4() {
+        try (
+            final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.4"))
+        ) {
+            mongoDBContainer.start();
+        }
+    }
 }

From 17b4f6c136f6f2c7dc223bad407221f62a8f0088 Mon Sep 17 00:00:00 2001
From: Rishu Mehrotra <rishu_mehrotra2002@yahoo.com>
Date: Sat, 3 Oct 2020 16:00:03 +0530
Subject: [PATCH 0999/4969] Don't display a stack trace in the logs when
 .testcontainers.properties is not found (#2293)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../testcontainers/utility/TestcontainersConfiguration.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 521a7519c2a..5b89140fd61 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -9,6 +9,7 @@
 import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.testcontainers.UnstableAPI;
 
 import java.io.File;
@@ -232,9 +233,9 @@ private static Properties readProperties(URL url) {
         try (InputStream inputStream = url.openStream()) {
             properties.load(inputStream);
         } catch (FileNotFoundException e) {
-            log.trace("Testcontainers config override was found on {} but the file was not found", url, e);
+            log.warn("Testcontainers config override was found on {} but the file was not found. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
         } catch (IOException e) {
-            log.warn("Testcontainers config override was found on {} but could not be loaded", url, e);
+            log.warn("Testcontainers config override was found on {} but could not be loaded. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
         }
         return properties;
     }

From ae46d1049230dbc8797b077e4d475a11bfeab6ac Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 7 Oct 2020 12:58:47 +0200
Subject: [PATCH 1000/4969] Support Confluent Platform 6 in Kafka (#3293)

* Support Confluent Platform 6 in Kafka

* remove `KafkaContainer#startZookeeper`
---
 .../containers/KafkaContainer.java            | 26 +++++--------------
 .../containers/KafkaContainerTest.java        | 10 +++++++
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 4086cd4e2e4..ae44e4803a9 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.SneakyThrows;
 import org.testcontainers.images.builder.Transferable;
@@ -8,7 +7,6 @@
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.nio.charset.StandardCharsets;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -108,14 +106,18 @@ protected void containerIsStarting(InspectContainerResponse containerInfo, boole
             return;
         }
 
+        String command = "#!/bin/bash\n";
         final String zookeeperConnect;
         if (externalZookeeperConnect != null) {
             zookeeperConnect = externalZookeeperConnect;
         } else {
-            zookeeperConnect = startZookeeper();
+            zookeeperConnect = "localhost:" + ZOOKEEPER_PORT;
+            command += "echo 'clientPort=" + ZOOKEEPER_PORT + "' > zookeeper.properties\n";
+            command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n";
+            command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n";
+            command += "zookeeper-server-start zookeeper.properties &\n";
         }
 
-        String command = "#!/bin/bash \n";
         command += "export KAFKA_ZOOKEEPER_CONNECT='" + zookeeperConnect + "'\n";
         command += "export KAFKA_ADVERTISED_LISTENERS='" + Stream
             .concat(
@@ -130,22 +132,8 @@ protected void containerIsStarting(InspectContainerResponse containerInfo, boole
         command += "/etc/confluent/docker/launch \n";
 
         copyFileToContainer(
-            Transferable.of(command.getBytes(StandardCharsets.UTF_8), 700),
+            Transferable.of(command.getBytes(StandardCharsets.UTF_8), 0777),
             STARTER_SCRIPT
         );
     }
-
-    @SneakyThrows(InterruptedException.class)
-    private String startZookeeper() {
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(getContainerId())
-            .withCmd("sh", "-c", "" +
-                "printf 'clientPort=" + ZOOKEEPER_PORT + "\ndataDir=/var/lib/zookeeper/data\ndataLogDir=/var/lib/zookeeper/log' > /zookeeper.properties\n" +
-                "zookeeper-server-start /zookeeper.properties\n"
-            )
-            .exec();
-
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).start().awaitStarted(10, TimeUnit.SECONDS);
-
-        return "localhost:" + ZOOKEEPER_PORT;
-    }
 }
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 6a669b2f60d..08b9fb6f856 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -99,6 +99,16 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
         }
     }
 
+    @Test
+    public void testConfluentPlatformVersion6() throws Exception {
+        try (
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.0.0"))
+        ) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
     protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
         try (
             KafkaProducer<String, String> producer = new KafkaProducer<>(

From 3f1cddbb33a2f75f8299a18bc794446768629f29 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 11 Oct 2020 07:05:52 +0100
Subject: [PATCH 1001/4969] When an image version is not specified, use
 `latest` as the default tag (#3313)

---
 .../testcontainers/utility/Versioning.java    |  4 +--
 .../dockerclient/AmbiguousImagePullTest.java  | 34 +++++++++++++++++++
 .../utility/DockerImageNameTest.java          |  4 +--
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java

diff --git a/core/src/main/java/org/testcontainers/utility/Versioning.java b/core/src/main/java/org/testcontainers/utility/Versioning.java
index 8944b3f0ba6..84dcf46274e 100644
--- a/core/src/main/java/org/testcontainers/utility/Versioning.java
+++ b/core/src/main/java/org/testcontainers/utility/Versioning.java
@@ -24,12 +24,12 @@ public boolean isValid() {
 
         @Override
         public String getSeparator() {
-            return "";
+            return ":";
         }
 
         @Override
         public String toString() {
-            return "";
+            return "latest";
         }
 
         @Override
diff --git a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
new file mode 100644
index 00000000000..5d2c42ed1b2
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
@@ -0,0 +1,34 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Image;
+import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.List;
+
+public class AmbiguousImagePullTest {
+
+    @Test(timeout = 30_000)
+    public void testNotUsingParse() {
+        DockerClient client = DockerClientFactory.instance().client();
+        List<Image> alpineImages = client.listImagesCmd()
+            .withImageNameFilter("alpine:latest")
+            .exec();
+        for (Image alpineImage : alpineImages) {
+            client.removeImageCmd(alpineImage.getId()).exec();
+        }
+
+        try (
+            final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine"))
+                .withCommand("/bin/sh", "-c", "sleep 0")
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+            // do nothing other than start and stop
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index 34575f2b4b9..e06407fbf56 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -112,7 +112,7 @@ public void testParsing() {
                 canonicalName = unversionedPart + versionSeparator + version;
             } else {
                 combined = unversionedPart;
-                canonicalName = unversionedPart;
+                canonicalName = unversionedPart + ":latest";
             }
 
             VisibleAssertions.context("For " + combined);
@@ -124,7 +124,7 @@ public void testParsing() {
             if (version != null) {
                 assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
             } else {
-                assertEquals(combined + " has no version specified", "", imageName.getVersionPart());
+                assertEquals(combined + " has automatic 'latest' version specified", "latest", imageName.getVersionPart());
             }
             assertEquals(combined + " has canonical name: " + canonicalName, canonicalName, imageName.asCanonicalNameString());
 

From bc7aaafa75265049c700583b5230dd639b45a30e Mon Sep 17 00:00:00 2001
From: Cristian Greco <cristian@regolo.cc>
Date: Sun, 11 Oct 2020 19:19:13 +0100
Subject: [PATCH 1002/4969] Add workflow for Update Gradle Wrapper Action.
 (#3297)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .github/workflows/update-gradle-wrapper.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/update-gradle-wrapper.yml

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
new file mode 100644
index 00000000000..f3a01949324
--- /dev/null
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -0,0 +1,20 @@
+name: Update Gradle Wrapper
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@74a035c
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: dependencies
+
+      - uses: gradle/wrapper-validation-action@e2c57ac

From edd2a1c44d3e7f9bd9d4a21dd885da394023a0f5 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 12 Oct 2020 17:06:28 +0100
Subject: [PATCH 1003/4969] Always continue on error for examples CI (#3339)

---
 .github/workflows/ci-examples.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index d81a4ffb509..6f8e4868a97 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -20,6 +20,7 @@ jobs:
           java-version: '1.8'
       - name: Cache Gradle Home files
         uses: actions/cache@v1
+        continue-on-error: true
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-examples-${{ hashFiles('**/*.gradle') }}
@@ -48,6 +49,7 @@ jobs:
           java-version: '1.8'
       - name: Cache Gradle Home files
         uses: actions/cache@v1
+        continue-on-error: true
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}

From 5cc47ef9d33028477cc5f678fbeb8ef1d5ddcb74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:10:23 +0100
Subject: [PATCH 1004/4969] Bump snakeyaml from 1.25 to 1.27 in /core (#3252)

Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.25 to 1.27.
- [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.27..snakeyaml-1.25)

Signed-off-by: dependabot[bot] <support@github.com>

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 37595c18e7c..222c04384fb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -192,7 +192,7 @@ dependencies {
 
     compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.5'
 
-    shaded "org.yaml:snakeyaml:1.25"
+    shaded "org.yaml:snakeyaml:1.27"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 7d1734c2e3bb539870ee36524dcdec6cf2bc98e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:12:00 +0100
Subject: [PATCH 1005/4969] Bump lombok from 1.18.12 to 1.18.14 in /examples
 (#3322)

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.12 to 1.18.14.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.12...v1.18.14)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/disque-job-queue/build.gradle | 4 ++--
 examples/solr-container/build.gradle   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index fb8413bdec8..c5e191f4f94 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.12"
-    annotationProcessor "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok:1.18.14"
+    annotationProcessor "org.projectlombok:lombok:1.18.14"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 52fa54f1fc5..f72c3376cac 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok:1.18.14"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
     implementation 'org.apache.solr:solr-solrj:8.6.2'

From aeec90a4529b7ccbe507592f732d7c8c3fba71be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:12:12 +0100
Subject: [PATCH 1006/4969] Bump r2dbc-mariadb from 0.8.3-beta1 to 0.8.4-rc in
 /modules/mariadb (#3300)

Bumps [r2dbc-mariadb](https://github.com/mariadb-corporation/mariadb-connector-r2dbc) from 0.8.3-beta1 to 0.8.4-rc.
- [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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 94164468855..19f1adba2cc 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:0.8.3-beta1'
+    compileOnly 'org.mariadb:r2dbc-mariadb:0.8.4-rc'
 
     testCompile project(':jdbc-test')
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.2'

From 413965a9711621473137e107871eb624ed19c450 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:12:18 +0100
Subject: [PATCH 1007/4969] Bump testng from 7.2.0 to 7.3.0 in /examples
 (#3068)

Bumps [testng](https://github.com/cbeust/testng) from 7.2.0 to 7.3.0.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 62f7de6dcf8..6ef351764f5 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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.2.0'
+    testImplementation 'org.testng:testng:7.3.0'
 }
 
 test {

From 1845cfb8ffea55e29ea3c07435367309efe8ce7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:12:42 +0100
Subject: [PATCH 1008/4969] Bump assertj-core from 3.17.1 to 3.17.2 in /core
 (#3251)

Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 3.17.1 to 3.17.2.
- [Release notes](https://github.com/joel-costigliola/assertj-core/releases)
- [Commits](https://github.com/joel-costigliola/assertj-core/compare/assertj-core-3.17.1...assertj-core-3.17.2)

Signed-off-by: dependabot[bot] <support@github.com>

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 222c04384fb..37c42577942 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -211,7 +211,7 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.17.1'
+    testCompile 'org.assertj:assertj-core:3.17.2'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"

From 05a30f6561509a3c354a14c0655fe939458d3da9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:13:35 +0100
Subject: [PATCH 1009/4969] Bump aws-java-sdk-dynamodb from 1.11.865 to
 1.11.880 in /modules/dynalite (#3332)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.865 to 1.11.880.
- [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.865...1.11.880)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 0b2e334c633..fe8fb883839 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.865'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.865'
 }

From 8b17881508e57b8b807d3a7ca456d28aa6728b66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:16:44 +0100
Subject: [PATCH 1010/4969] Bump mockito-core from 3.5.11 to 3.5.13 in /core
 (#3275)

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 37c42577942..b08e54c9b97 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -205,7 +205,7 @@ dependencies {
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testCompile ('org.mockito:mockito-core:3.5.11') {
+    testCompile ('org.mockito:mockito-core:3.5.13') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 66e5f8a6b018433e17d9389ac9f8686bf87c1c4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:17:10 +0100
Subject: [PATCH 1011/4969] Bump elasticsearch-rest-client from 7.9.1 to 7.9.2
 in /modules/elasticsearch (#3276)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.9.1 to 7.9.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.1...v7.9.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 44a5cca5963..e6de1daa7ab 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.2"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }

From 759a441f370ab589b36099ee0a7c2952bc0d139c Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 12 Oct 2020 19:33:35 +0100
Subject: [PATCH 1012/4969] Increase memory limits used in example (#3340)

For improved test stability
---
 .../generic/src/test/java/generic/CmdModifierTest.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index f49e6a26565..73338ba38ee 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -19,8 +19,8 @@ public class CmdModifierTest {
     // }
 
     // memory {
-    private long memoryInBytes = 8 * 1024 * 1024;
-    private long memorySwapInBytes = 12 * 1024 * 1024;
+    private long memoryInBytes = 32 * 1024 * 1024;
+    private long memorySwapInBytes = 64 * 1024 * 1024;
 
     @Rule
     public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
@@ -40,6 +40,6 @@ public void testHostnameModified() throws IOException, InterruptedException {
     @Test
     public void testMemoryLimitModified() throws IOException, InterruptedException {
         final Container.ExecResult execResult = memoryLimitedRedis.execInContainer("cat", "/sys/fs/cgroup/memory/memory.limit_in_bytes");
-        assertEquals("8388608", execResult.getStdout().trim());
+        assertEquals(String.valueOf(memoryInBytes), execResult.getStdout().trim());
     }
 }

From 831b63918e671c9bfde508c064699ca2a1dd91a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:18:07 +0100
Subject: [PATCH 1013/4969] Bump mockito-core from 3.5.11 to 3.5.13 in
 /modules/junit-jupiter (#3283)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 dbf54b8d291..7b0c0cb82f9 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.5.11') {
+    testCompile ('org.mockito:mockito-core:3.5.13') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.17.2'

From 61c4119be926e4a8f19b873de10b2815b3530cbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:19:11 +0100
Subject: [PATCH 1014/4969] Bump tomcat-jdbc from 9.0.37 to 9.0.39 in
 /modules/jdbc-test (#3338)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 d8df69b094f..ec57ddcea41 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     }
 
     compile 'commons-dbutils:commons-dbutils:1.7'
-    compile 'org.apache.tomcat:tomcat-jdbc:9.0.37'
+    compile 'org.apache.tomcat:tomcat-jdbc:9.0.39'
     compile 'org.vibur:vibur-dbcp:25.0'
     compile 'mysql:mysql-connector-java:8.0.21'
 }

From 0fc92bda50cff021ff4e78bb129a51cb0097c3e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:19:22 +0100
Subject: [PATCH 1015/4969] Bump junit from 4.13 to 4.13.1 in /examples (#3328)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 examples/mongodb-container/build.gradle  | 2 +-
 examples/redis-backed-cache/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index c09cb033489..57b578a1607 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testCompileClasspath 'org.jetbrains:annotations:20.1.0'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 258c98fb107..b0b6865aea7 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }

From b2db18f097fcf134c4c6f2288ba0c7939ceee950 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:20:24 +0100
Subject: [PATCH 1016/4969] Bump mariadb-java-client from 2.6.2 to 2.7.0 in
 /modules/mariadb (#3278)

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.2 to 2.7.0.
- [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.2...2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 19f1adba2cc..e5f19eed97b 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:0.8.4-rc'
 
     testCompile project(':jdbc-test')
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.2'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.0'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'org.mariadb:r2dbc-mariadb:0.8.3-beta1'

From 1261fee751b570ba231ae45854801facb9bcc1b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:20:52 +0100
Subject: [PATCH 1017/4969] Bump solr-solrj from 8.6.2 to 8.6.3 in /examples
 (#3321)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index f72c3376cac..5a8973cab27 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.14"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
-    implementation 'org.apache.solr:solr-solrj:8.6.2'
+    implementation 'org.apache.solr:solr-solrj:8.6.3'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From b6b828ee0606dd046bcb832333d5eeb1842a1fb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:21:05 +0100
Subject: [PATCH 1018/4969] Bump postgresql from 42.2.16 to 42.2.17 in
 /examples (#3323)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 eac2c59df4a..5c4c473becb 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.16'
+    testImplementation 'org.postgresql:postgresql:42.2.17'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From 0f58f36406edf917487345647996afc6cf4ba0e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:21:15 +0100
Subject: [PATCH 1019/4969] Bump postgresql from 42.2.16 to 42.2.17 in
 /modules/junit-jupiter (#3327)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 7b0c0cb82f9..a1acce9f0f3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'org.assertj:assertj-core:3.17.2'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.0'
 
-    testRuntime 'org.postgresql:postgresql:42.2.16'
+    testRuntime 'org.postgresql:postgresql:42.2.17'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 }

From 8558994aa7e66585ad6249cb24fce049b6037629 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:21:32 +0100
Subject: [PATCH 1020/4969] Bump postgresql from 42.2.16 to 42.2.17 in
 /modules/spock (#3330)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 3d0948e9e83..8d05bdf58b6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
-    testRuntime 'org.postgresql:postgresql:42.2.16'
+    testRuntime 'org.postgresql:postgresql:42.2.17'
     testRuntime 'mysql:mysql-connector-java:8.0.21'
 
     testCompileClasspath 'org.jetbrains:annotations:20.1.0'

From 5b70c5860587ed3ed4073cef13d72a0d7ac4362e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:21:42 +0100
Subject: [PATCH 1021/4969] Bump tomcat-jdbc from 9.0.37 to 9.0.39 in
 /modules/jdbc (#3333)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 6453b49b052..2045461785e 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.37'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.39'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 }

From 7681f1214c94042ae937ad010de485dd9f4229fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:21:51 +0100
Subject: [PATCH 1022/4969] Bump postgresql from 42.2.16 to 42.2.17 in
 /modules/postgresql (#3334)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 ea6e4a87226..aa5db7028b5 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
-    testCompile 'org.postgresql:postgresql:42.2.16'
+    testCompile 'org.postgresql:postgresql:42.2.17'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'

From 304c2d702096714fba15270616a5f3c56328a560 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:21:59 +0100
Subject: [PATCH 1023/4969] Bump aws-java-sdk-sqs from 1.11.860 to 1.11.880 in
 /modules/localstack (#3337)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 f48b3cf71bb..8d4b9576cae 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.870'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.865'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.860'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.14.21'
 }

From aa8e5ed0a77f48858fb3622664844d14f5068a3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 21:47:43 +0100
Subject: [PATCH 1024/4969] Bump httpclient from 4.5.12 to 4.5.13 in
 /modules/junit-jupiter (#3326)

Bumps httpclient from 4.5.12 to 4.5.13.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 a1acce9f0f3..28f6049faf4 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'redis.clients:jedis:3.3.0'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
     testCompile ('org.mockito:mockito-core:3.5.13') {
         exclude(module: 'hamcrest-core')
     }

From 98a8260bf05953a823b4a526637effa50054de0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 22:05:52 +0100
Subject: [PATCH 1025/4969] Bump httpclient from 4.5.12 to 4.5.13 in
 /modules/spock (#3329)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 8d05bdf58b6..86724262a29 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testCompile project(':postgresql')
 
     testCompile 'com.zaxxer:HikariCP:3.4.5'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntime 'org.postgresql:postgresql:42.2.17'
     testRuntime 'mysql:mysql-connector-java:8.0.21'

From a0942943e03fc07bfcd03fa2fa0558f32a73d789 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 22:06:12 +0100
Subject: [PATCH 1026/4969] Bump cucumber-junit from 6.7.0 to 6.8.1 in
 /examples (#3325)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.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 318ed51f24c..5a9fd6f048f 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.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:6.7.0'
+    testImplementation 'io.cucumber:cucumber-junit:6.8.1'
     testImplementation 'org.testcontainers:selenium'
 }

From c1e8234f737756619f6b861e94621a7546834042 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 22:15:40 +0100
Subject: [PATCH 1027/4969] Bump org.springframework.boot from 2.3.3.RELEASE to
 2.3.4.RELEASE in /examples (#3247)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 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 eb9c2d9ce3a..2dca03f4004 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.3.RELEASE'
+    id 'org.springframework.boot' version '2.3.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index d74851d8eac..75907da4c0d 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.3.RELEASE'
+    id 'org.springframework.boot' version '2.3.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 325c8b287c7d9a6d56d15bc8c5bb5efa0c5e0d5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 08:09:54 +0100
Subject: [PATCH 1028/4969] Bump aws-java-sdk-s3 from 1.11.870 to 1.11.880 in
 /modules/localstack (#3336)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.870 to 1.11.880.
- [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.870...1.11.880)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 8d4b9576cae..b99ec1c54fe 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.870'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.865'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.880'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.14.21'

From 4801ed82400afd53fb991649cf1f9cf6931030ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 08:48:27 +0100
Subject: [PATCH 1029/4969] Bump zt-exec from 1.10 to 1.12 in /core (#3253)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index b08e54c9b97..e043313ac38 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -196,7 +196,7 @@ dependencies {
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
-    shaded 'org.zeroturnaround:zt-exec:1.10', {
+    shaded 'org.zeroturnaround:zt-exec:1.12', {
         exclude(group: 'org.slf4j')
     }
 

From b2b8e62d1ffbd9f8951944bb7f44f0429fa89156 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 08:48:39 +0100
Subject: [PATCH 1030/4969] Bump s3 from 2.14.21 to 2.15.7 in
 /modules/localstack (#3335)

Bumps s3 from 2.14.21 to 2.15.7.

Signed-off-by: dependabot[bot] <support@github.com>

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 b99ec1c54fe..29abca90878 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.880'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.14.21'
+    testCompile 'software.amazon.awssdk:s3:2.15.7'
 }

From e4c4cfebdbbb21b2b008f86bf6995c7477c59b9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 08:48:52 +0100
Subject: [PATCH 1031/4969] Bump cucumber-java from 6.6.0 to 6.8.1 in /examples
 (#3324)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 6.6.0 to 6.8.1.
- [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.6.0...v6.8.1)

Signed-off-by: dependabot[bot] <support@github.com>

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 5a9fd6f048f..57104731c7e 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.6.0'
+    testImplementation 'io.cucumber:cucumber-java:6.8.1'
     testImplementation 'io.cucumber:cucumber-junit:6.8.1'
     testImplementation 'org.testcontainers:selenium'
 }

From b0735235f0bd990665584f739726a4c4dee1b80f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 13 Oct 2020 09:31:33 +0100
Subject: [PATCH 1032/4969] Remove GitHub Actions cache restore keys (#3342)

For more specific cache matching
---
 .github/workflows/ci-examples.yml | 4 ----
 .github/workflows/ci.yml          | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 6f8e4868a97..4f91341a4a6 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -24,8 +24,6 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-examples-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-testmatrix-examples-
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -53,8 +51,6 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b5a37a3405..df38f3b8a4f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,8 +23,6 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-testmatrix-
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -51,8 +49,6 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test with Gradle (${{matrix.gradle_args}})

From 8ab49eec547103d5d3e4410e3fb0deef08f52336 Mon Sep 17 00:00:00 2001
From: silaev <silaev256@gmail.com>
Date: Tue, 13 Oct 2020 15:36:05 +0300
Subject: [PATCH 1033/4969] Allow users to specify a MongoDB database name
 (#2980)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../containers/MongoDBContainer.java            | 17 ++++++++++++++++-
 .../containers/MongoDBContainerTest.java        | 13 +++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 5fd2451480b..662c4b575f7 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -48,7 +48,22 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
         );
     }
 
+    /**
+     * Gets a replica set url for the default {@value #MONGODB_DATABASE_NAME_DEFAULT} database.
+     *
+     * @return a replica set url.
+     */
     public String getReplicaSetUrl() {
+        return getReplicaSetUrl(MONGODB_DATABASE_NAME_DEFAULT);
+    }
+
+    /**
+     * Gets a replica set url for a provided <code>databaseName</code>.
+     *
+     * @param databaseName a database name.
+     * @return a replica set url.
+     */
+    public String getReplicaSetUrl(final String databaseName) {
         if (!isRunning()) {
             throw new IllegalStateException("MongoDBContainer should be started first");
         }
@@ -56,7 +71,7 @@ public String getReplicaSetUrl() {
             "mongodb://%s:%d/%s",
             getContainerIpAddress(),
             getMappedPort(MONGODB_INTERNAL_PORT),
-            MONGODB_DATABASE_NAME_DEFAULT
+            databaseName
         );
     }
 
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index b18e7f15a01..ff5243acea7 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -13,8 +13,10 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import static org.hamcrest.CoreMatchers.endsWith;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 
 
 public class MongoDBContainerTest {
@@ -82,4 +84,15 @@ public void supportsMongoDB_4_4() {
             mongoDBContainer.start();
         }
     }
+
+    @Test
+    public void shouldTestDatabaseName() {
+        try (
+            final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))
+        ) {
+            mongoDBContainer.start();
+            final String databaseName = "my-db";
+            assertThat(mongoDBContainer.getReplicaSetUrl(databaseName), endsWith(databaseName));
+        }
+    }
 }

From 0065801b4f13cd29af7904abd6a57d4525e710fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 13 Oct 2020 09:51:44 -0500
Subject: [PATCH 1034/4969] Add GCloud module for Google Cloud Datastore,
 Firestore, PubSub, and Spanner emulators (#2690)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/gcloud.md                        |  44 ++++++++
 mkdocs.yml                                    |   1 +
 modules/gcloud/build.gradle                   |  11 ++
 .../DatastoreEmulatorContainer.java           |  29 +++++
 .../FirestoreEmulatorContainer.java           |  30 ++++++
 .../containers/PubSubEmulatorContainer.java   |  30 ++++++
 .../containers/SpannerEmulatorContainer.java  |  28 +++++
 .../DatastoreEmulatorContainerTest.java       |  43 ++++++++
 .../FirestoreEmulatorContainerTest.java       |  49 +++++++++
 .../PubSubEmulatorContainerTest.java          | 102 ++++++++++++++++++
 .../SpannerEmulatorContainerTest.java         |  80 ++++++++++++++
 11 files changed, 447 insertions(+)
 create mode 100644 docs/modules/gcloud.md
 create mode 100644 modules/gcloud/build.gradle
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
 create mode 100644 modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
 create mode 100644 modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
 create mode 100644 modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
 create mode 100644 modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
new file mode 100644
index 00000000000..3400ad881a9
--- /dev/null
+++ b/docs/modules/gcloud.md
@@ -0,0 +1,44 @@
+# GCloud Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+Testcontainers module for the Google's [Cloud SDK](https://cloud.google.com/sdk/).
+
+Currently, the module supports `Datastore`, `Firestore`, `Pub/Sub` and `Spanner` emulators. In order to use it, you should use the following classes:
+
+* DatastoreEmulatorContainer
+* FirestoreEmulatorContainer
+* PubSubEmulatorContainer
+* SpannerEmulatorContainer
+
+## Usage example
+
+Running GCloud as a stand-in for Google Datastore during a test:
+
+<!--codeinclude-->
+[Creating a Datastore container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:creatingDatastoreEmulatorContainer
+<!--/codeinclude-->
+
+And how to start it:
+
+<!--codeinclude-->
+[Starting a Datastore container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:startingDatastoreEmulatorContainer
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:gcloud:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>gcloud</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index b8372e81ed8..dfff99bb302 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -60,6 +60,7 @@ nav:
                 - modules/databases/presto.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
+          - modules/gcloud.md
           - modules/kafka.md
           - modules/localstack.md
           - modules/mockserver.md
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
new file mode 100644
index 00000000000..a5737648a4b
--- /dev/null
+++ b/modules/gcloud/build.gradle
@@ -0,0 +1,11 @@
+description = "Testcontainers :: GCloud"
+
+dependencies {
+    compile project(':testcontainers')
+
+    testCompile 'com.google.cloud:google-cloud-datastore:1.102.4'
+    testCompile 'com.google.cloud:google-cloud-firestore:1.33.0'
+    testCompile 'com.google.cloud:google-cloud-pubsub:1.105.0'
+    testCompile 'com.google.cloud:google-cloud-spanner:1.50.0'
+    testCompile 'org.assertj:assertj-core:3.15.0'
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
new file mode 100644
index 00000000000..85b07b94591
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -0,0 +1,29 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Datastore container that relies in google cloud sdk.
+ *
+ * Default port is 8081.
+ *
+ * @author Eddú Meléndez
+ */
+public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+
+    private static final String CMD = "gcloud beta emulators datastore start --project test-project --host-port 0.0.0.0:8081";
+
+    public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(8081);
+        setWaitStrategy(Wait.forHttp("/").forStatusCode(200));
+        withCommand("/bin/sh", "-c", CMD);
+    }
+
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
new file mode 100644
index 00000000000..41442f0f531
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -0,0 +1,30 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Firestore container that relies in google cloud sdk.
+ *
+ * Default port is 8080.
+ *
+ * @author Eddú Meléndez
+ */
+public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+
+    private static final String CMD = "gcloud beta emulators firestore start --host-port 0.0.0.0:8080";
+
+    public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(8080);
+        setWaitStrategy(new LogMessageWaitStrategy()
+                .withRegEx("(?s).*running.*$"));
+        withCommand("/bin/sh", "-c", CMD);
+    }
+
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
new file mode 100644
index 00000000000..c92145b3d3a
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -0,0 +1,30 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A PubSub container that relies in google cloud sdk.
+ *
+ * Default port is 8085.
+ *
+ * @author Eddú Meléndez
+ */
+public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+
+    private static final String CMD = "gcloud beta emulators pubsub start --host-port 0.0.0.0:8085";
+
+    public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(8085);
+        setWaitStrategy(new LogMessageWaitStrategy()
+                .withRegEx("(?s).*started.*$"));
+        withCommand("/bin/sh", "-c", CMD);
+    }
+
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
new file mode 100644
index 00000000000..5f2a203d911
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -0,0 +1,28 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Spanner container. Default ports: 9010 for GRPC and 9020 for HTTP.
+ *
+ * @author Eddú Meléndez
+ */
+public class SpannerEmulatorContainer extends GenericContainer<SpannerEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator");
+
+    private static final int GRPC_PORT = 9010;
+    private static final int HTTP_PORT = 9020;
+
+    public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(GRPC_PORT, HTTP_PORT);
+        setWaitStrategy(new LogMessageWaitStrategy()
+                .withRegEx(".*Cloud Spanner emulator running\\..*"));
+    }
+
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
new file mode 100644
index 00000000000..f8285e4c691
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -0,0 +1,43 @@
+package org.testcontainers.containers;
+
+import com.google.cloud.NoCredentials;
+import com.google.cloud.ServiceOptions;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Key;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DatastoreEmulatorContainerTest {
+
+    @Rule
+    // creatingDatastoreEmulatorContainer {
+    public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:313.0.0")
+    );
+    // }
+
+    //  startingDatastoreEmulatorContainer {
+    @Test
+    public void testSimple() {
+        DatastoreOptions options = DatastoreOptions.newBuilder()
+                .setHost(emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(8081))
+                .setCredentials(NoCredentials.getInstance())
+                .setRetrySettings(ServiceOptions.getNoRetrySettings())
+                .setProjectId("test-project")
+                .build();
+        Datastore datastore = options.getService();
+
+        Key key = datastore.newKeyFactory().setKind("Task").newKey("sample");
+        Entity entity = Entity.newBuilder(key).set("description", "my description").build();
+        datastore.put(entity);
+
+        assertThat(datastore.get(key).getString("description")).isEqualTo("my description");
+    }
+    // }
+
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
new file mode 100644
index 00000000000..2f23ff40483
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -0,0 +1,49 @@
+package org.testcontainers.containers;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import com.google.api.core.ApiFuture;
+import com.google.cloud.NoCredentials;
+import com.google.cloud.firestore.CollectionReference;
+import com.google.cloud.firestore.DocumentReference;
+import com.google.cloud.firestore.Firestore;
+import com.google.cloud.firestore.FirestoreOptions;
+import com.google.cloud.firestore.QuerySnapshot;
+import com.google.cloud.firestore.WriteResult;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FirestoreEmulatorContainerTest {
+
+    @Rule
+    public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:313.0.0"));
+
+    @Test
+    public void testSimple() throws ExecutionException, InterruptedException {
+        FirestoreOptions options = FirestoreOptions.getDefaultInstance().toBuilder()
+                .setHost(emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(8080))
+                .setCredentials(NoCredentials.getInstance())
+                .setProjectId("test-project")
+                .build();
+        Firestore firestore = options.getService();
+
+        CollectionReference users = firestore.collection("users");
+        DocumentReference docRef = users.document("alovelace");
+        Map<String, Object> data = new HashMap<>();
+        data.put("first", "Ada");
+        data.put("last", "Lovelace");
+        ApiFuture<WriteResult> result = docRef.set(data);
+        result.get();
+
+        ApiFuture<QuerySnapshot> query = users.get();
+        QuerySnapshot querySnapshot = query.get();
+
+        assertThat(querySnapshot.getDocuments().get(0).getData()).containsEntry("first", "Ada");
+    }
+
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
new file mode 100644
index 00000000000..0c5ec888de5
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -0,0 +1,102 @@
+package org.testcontainers.containers;
+
+import java.io.IOException;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.rpc.FixedTransportChannelProvider;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.cloud.pubsub.v1.Publisher;
+import com.google.cloud.pubsub.v1.SubscriptionAdminClient;
+import com.google.cloud.pubsub.v1.SubscriptionAdminSettings;
+import com.google.cloud.pubsub.v1.TopicAdminClient;
+import com.google.cloud.pubsub.v1.TopicAdminSettings;
+import com.google.cloud.pubsub.v1.stub.GrpcSubscriberStub;
+import com.google.cloud.pubsub.v1.stub.SubscriberStub;
+import com.google.cloud.pubsub.v1.stub.SubscriberStubSettings;
+import com.google.protobuf.ByteString;
+import com.google.pubsub.v1.ProjectSubscriptionName;
+import com.google.pubsub.v1.PubsubMessage;
+import com.google.pubsub.v1.PullRequest;
+import com.google.pubsub.v1.PullResponse;
+import com.google.pubsub.v1.PushConfig;
+import com.google.pubsub.v1.TopicName;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class PubSubEmulatorContainerTest {
+
+    public static final String PROJECT_ID = "my-project-id";
+
+    @Rule
+    public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:313.0.0"));
+
+    @Test
+    public void testSimple() throws IOException {
+        String hostport = emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(8085);
+        ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
+        try {
+            TransportChannelProvider channelProvider =
+                    FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
+            NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
+
+            String topicId = "my-topic-id";
+            createTopic(topicId, channelProvider, credentialsProvider);
+
+            String subscriptionId = "my-subscription-id";
+            createSubscription(subscriptionId, topicId, channelProvider, credentialsProvider);
+
+            Publisher publisher = Publisher.newBuilder(TopicName.of(PROJECT_ID, topicId))
+                    .setChannelProvider(channelProvider)
+                    .setCredentialsProvider(credentialsProvider)
+                    .build();
+            PubsubMessage message = PubsubMessage.newBuilder().setData(ByteString.copyFromUtf8("test message")).build();
+            publisher.publish(message);
+
+            SubscriberStubSettings subscriberStubSettings =
+                    SubscriberStubSettings.newBuilder()
+                            .setTransportChannelProvider(channelProvider)
+                            .setCredentialsProvider(credentialsProvider)
+                            .build();
+            try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
+                PullRequest pullRequest = PullRequest.newBuilder()
+                        .setMaxMessages(1)
+                        .setSubscription(ProjectSubscriptionName.format(PROJECT_ID, subscriptionId))
+                        .build();
+                PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
+
+                assertThat(pullResponse.getReceivedMessagesList()).hasSize(1);
+                assertThat(pullResponse.getReceivedMessages(0).getMessage().getData().toStringUtf8()).isEqualTo("test message");
+            }
+        } finally {
+            channel.shutdown();
+        }
+    }
+
+    private void createTopic(String topicId, TransportChannelProvider channelProvider, NoCredentialsProvider credentialsProvider) throws IOException {
+        TopicAdminSettings topicAdminSettings = TopicAdminSettings.newBuilder()
+                .setTransportChannelProvider(channelProvider)
+                .setCredentialsProvider(credentialsProvider)
+                .build();
+        try (TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings)) {
+            TopicName topicName = TopicName.of(PROJECT_ID, topicId);
+            topicAdminClient.createTopic(topicName);
+        }
+    }
+
+    private void createSubscription(String subscriptionId, String topicId, TransportChannelProvider channelProvider, NoCredentialsProvider credentialsProvider) throws IOException {
+        SubscriptionAdminSettings subscriptionAdminSettings = SubscriptionAdminSettings.newBuilder()
+                .setTransportChannelProvider(channelProvider)
+                .setCredentialsProvider(credentialsProvider)
+                .build();
+        SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create(subscriptionAdminSettings);
+        ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(PROJECT_ID, subscriptionId);
+        subscriptionAdminClient.createSubscription(subscriptionName, TopicName.of(PROJECT_ID, topicId), PushConfig.getDefaultInstance(), 10);
+    }
+
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
new file mode 100644
index 00000000000..9093530236a
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
@@ -0,0 +1,80 @@
+package org.testcontainers.containers;
+
+import java.util.Arrays;
+import java.util.concurrent.ExecutionException;
+
+import com.google.cloud.NoCredentials;
+import com.google.cloud.spanner.Database;
+import com.google.cloud.spanner.DatabaseAdminClient;
+import com.google.cloud.spanner.DatabaseClient;
+import com.google.cloud.spanner.DatabaseId;
+import com.google.cloud.spanner.Instance;
+import com.google.cloud.spanner.InstanceAdminClient;
+import com.google.cloud.spanner.InstanceConfigId;
+import com.google.cloud.spanner.InstanceId;
+import com.google.cloud.spanner.InstanceInfo;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Spanner;
+import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.Statement;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SpannerEmulatorContainerTest {
+
+    @Rule
+    public SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.1.0"));
+
+    private static final String PROJECT_NAME = "test-project";
+    private static final String INSTANCE_NAME = "test-instance";
+    private static final String DATABASE_NAME = "test-database";
+
+    @Test
+    public void testSimple() throws ExecutionException, InterruptedException {
+        SpannerOptions options = SpannerOptions.newBuilder()
+                .setEmulatorHost(emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(9010))
+                .setCredentials(NoCredentials.getInstance())
+                .setProjectId(PROJECT_NAME)
+                .build();
+
+        Spanner spanner = options.getService();
+
+        InstanceId instanceId = createInstance(spanner);
+
+        createDatabase(spanner);
+
+        DatabaseId databaseId = DatabaseId.of(instanceId, DATABASE_NAME);
+        DatabaseClient dbClient = spanner.getDatabaseClient(databaseId);
+        dbClient.readWriteTransaction()
+                .run(tx -> {
+                    String sql1 = "Delete from TestTable where 1=1";
+                    tx.executeUpdate(Statement.of(sql1));
+                    String sql = "INSERT INTO TestTable (Key, Value) VALUES (1, 'Java'), (2, 'Go')";
+                    tx.executeUpdate(Statement.of(sql));
+                    return null;
+                });
+
+        ResultSet resultSet = dbClient.readOnlyTransaction()
+                .executeQuery(Statement.of("select * from TestTable order by Key"));
+        resultSet.next();
+        assertThat(resultSet.getLong(0)).isEqualTo(1);
+        assertThat(resultSet.getString(1)).isEqualTo("Java");
+    }
+
+    private void createDatabase(Spanner spanner) throws InterruptedException, ExecutionException {
+        DatabaseAdminClient dbAdminClient = spanner.getDatabaseAdminClient();
+        Database database = dbAdminClient.createDatabase(INSTANCE_NAME, DATABASE_NAME, Arrays.asList("CREATE TABLE TestTable (Key INT64, Value STRING(MAX)) PRIMARY KEY (Key)")).get();
+    }
+
+    private InstanceId createInstance(Spanner spanner) throws InterruptedException, ExecutionException {
+        InstanceConfigId instanceConfig = InstanceConfigId.of(PROJECT_NAME, "emulator-config");
+        InstanceId instanceId = InstanceId.of(PROJECT_NAME, INSTANCE_NAME);
+        InstanceAdminClient insAdminClient = spanner.getInstanceAdminClient();
+        Instance instance = insAdminClient.createInstance(InstanceInfo.newBuilder(instanceId).setNodeCount(1).setDisplayName("Test instance").setInstanceConfigId(instanceConfig).build()).get();
+        return instanceId;
+    }
+
+}

From 3bf8d76683a38bdcdef6b12ab2f699e04b9c6a1c Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 13 Oct 2020 20:01:20 +0100
Subject: [PATCH 1035/4969] Use a lighter weight image for
 MultiplePortsExposedTest (#3343)

* Use a lighter weight image for MultiplePortsExposedTest

* Update helloworld container version
---
 .../java/generic/MultiplePortsExposedTest.java     | 14 +++++++-------
 .../junit/BaseWebDriverContainerTest.java          | 13 ++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
index 329fd8d8e19..de2b56c6a63 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
@@ -1,5 +1,7 @@
 package generic;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -7,23 +9,21 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 public class MultiplePortsExposedTest {
     private static final Logger log = getLogger(MultiplePortsExposedTest.class);
 
 
     @Rule
     // rule {
-    public GenericContainer container = new GenericContainer(DockerImageName.parse("orientdb:3.0.13"))
-        .withExposedPorts(2424, 2480)
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld:1.1.0"))
+        .withExposedPorts(8080, 8081)
         .withLogConsumer(new Slf4jLogConsumer(log));
     // }
 
     @Test
     public void fetchPortsByNumber() {
-        Integer firstMappedPort = container.getMappedPort(2424);
-        Integer secondMappedPort = container.getMappedPort(2480);
+        Integer firstMappedPort = container.getMappedPort(8080);
+        Integer secondMappedPort = container.getMappedPort(8081);
     }
 
     @Test
@@ -39,6 +39,6 @@ public void getHostOnly() {
     @Test
     public void getHostAndMappedPort() {
         String address =
-            container.getHost() + ":" + container.getMappedPort(2424);
+            container.getHost() + ":" + container.getMappedPort(8080);
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index cf5c762f2ad..db369824442 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -1,5 +1,10 @@
 package org.testcontainers.junit;
 
+import static java.lang.String.format;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+
+import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.NotNull;
 import org.junit.ClassRule;
 import org.openqa.selenium.By;
@@ -11,12 +16,6 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.concurrent.TimeUnit;
-
-import static java.lang.String.format;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-
 /**
  *
  */
@@ -26,7 +25,7 @@ public class BaseWebDriverContainerTest {
     public static Network NETWORK = Network.newNetwork();
 
     @ClassRule
-    public static GenericContainer<?> HELLO_WORLD = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld:1.0.0"))
+    public static GenericContainer<?> HELLO_WORLD = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld:1.1.0"))
         .withNetwork(NETWORK)
         .withNetworkAliases("helloworld")
         .withExposedPorts(8080, 8081)

From ae5010aee429620acac888cef532d89135710c1d Mon Sep 17 00:00:00 2001
From: vcvitaly <vcvitaly@yahoo.com>
Date: Wed, 14 Oct 2020 19:26:16 +0300
Subject: [PATCH 1036/4969] docker-machine: get full remote daemon URL, to
 allow for use of custom daemon port (#2769) (#3237)

Co-authored-by: Vitalii Chura <c-vitalii.chura@hulu.com>
---
 .../dockerclient/DockerMachineClientProviderStrategy.java | 6 +++---
 .../org/testcontainers/utility/DockerMachineClient.java   | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
index 2b0454c1ee6..4de508ea808 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
@@ -37,12 +37,12 @@ private TransportConfig resolveTransportConfig() throws InvalidConfigurationExce
 
         DockerMachineClient.instance().ensureMachineRunning(machineName);
 
-        String dockerDaemonIpAddress = DockerMachineClient.instance().getDockerDaemonIpAddress(machineName);
+        String dockerDaemonUrl = DockerMachineClient.instance().getDockerDaemonUrl(machineName);
 
-        log.info("Docker daemon IP address for docker machine {} is {}", machineName, dockerDaemonIpAddress);
+        log.info("Docker daemon URL for docker machine {} is {}", machineName, dockerDaemonUrl);
 
         return TransportConfig.builder()
-            .dockerHost(URI.create("tcp://" + dockerDaemonIpAddress + ":2376"))
+            .dockerHost(URI.create(dockerDaemonUrl))
             .sslConfig(
                 new LocalDirectorySSLConfig(
                     Paths.get(System.getProperty("user.home") + "/.docker/machine/certs/").toString()
diff --git a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
index fe12e9f541d..021baf270d9 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
@@ -79,10 +79,18 @@ public void ensureMachineRunning(@NonNull String machineName) {
         }
     }
 
+    /**
+     * @deprecated Use getDockerDaemonUrl(@NonNull String machineName) for connection to docker-machine
+     */
+    @Deprecated
     public String getDockerDaemonIpAddress(@NonNull String machineName) {
         return runShellCommand(executableName, "ip", machineName);
     }
 
+    public String getDockerDaemonUrl(@NonNull String machineName) {
+        return runShellCommand(executableName, "url", machineName);
+    }
+
     public boolean isMachineRunning(String machineName) {
         String status = runShellCommand("docker-machine", "status", machineName);
         return status.trim().equalsIgnoreCase("running");

From abf0f9aa65207f67e1174ad2b43b4a354f5ae998 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 14 Oct 2020 22:46:52 +0100
Subject: [PATCH 1037/4969] Fix remote gradle cache 400 InvalidArgument error
 (#3346)

per hint given in https://www.digitalocean.com/community/questions/node-upload-file-to-s3-error-invalidargument-null
---
 settings.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.gradle b/settings.gradle
index 2ea21599ceb..849a1ade06b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -46,6 +46,7 @@ buildCache {
         region = 'fra1'
         bucket = 'testcontainers'
         path = 'cache'
+        reducedRedundancy = false
         push = isMasterBuild && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
         headers = [
             'x-amz-acl': 'public-read'

From a33622f143c93ee2d771eda30bb8ab88eb450c9d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 15 Oct 2020 08:46:41 +0100
Subject: [PATCH 1038/4969] Add gcloud endpoint accessors (#3344)

---
 .../containers/DatastoreEmulatorContainer.java   | 11 ++++++++++-
 .../containers/FirestoreEmulatorContainer.java   | 11 ++++++++++-
 .../containers/PubSubEmulatorContainer.java      |  9 +++++++++
 .../containers/SpannerEmulatorContainer.java     | 16 ++++++++++++++++
 .../DatastoreEmulatorContainerTest.java          |  6 +++---
 .../FirestoreEmulatorContainerTest.java          | 11 +++++------
 .../containers/PubSubEmulatorContainerTest.java  |  7 +++----
 .../containers/SpannerEmulatorContainerTest.java |  9 ++++-----
 .../gcloud/src/test/resources/logback-test.xml   | 16 ++++++++++++++++
 9 files changed, 76 insertions(+), 20 deletions(-)
 create mode 100644 modules/gcloud/src/test/resources/logback-test.xml

diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index 85b07b94591..fe0a9959f2d 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -15,15 +15,24 @@ public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulat
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
 
     private static final String CMD = "gcloud beta emulators datastore start --project test-project --host-port 0.0.0.0:8081";
+    private static final int HTTP_PORT = 8081;
 
     public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        withExposedPorts(8081);
+        withExposedPorts(HTTP_PORT);
         setWaitStrategy(Wait.forHttp("/").forStatusCode(200));
         withCommand("/bin/sh", "-c", CMD);
     }
 
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getContainerIpAddress() + ":" + getMappedPort(8081);
+    }
 }
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index 41442f0f531..6353a679130 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -15,16 +15,25 @@ public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulat
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
 
     private static final String CMD = "gcloud beta emulators firestore start --host-port 0.0.0.0:8080";
+    private static final int PORT = 8080;
 
     public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        withExposedPorts(8080);
+        withExposedPorts(PORT);
         setWaitStrategy(new LogMessageWaitStrategy()
                 .withRegEx("(?s).*running.*$"));
         withCommand("/bin/sh", "-c", CMD);
     }
 
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getContainerIpAddress() + ":" + getMappedPort(8080);
+    }
 }
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index c92145b3d3a..90d77c837cf 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -15,6 +15,7 @@ public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorCont
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
 
     private static final String CMD = "gcloud beta emulators pubsub start --host-port 0.0.0.0:8085";
+    private static final int PORT = 8085;
 
     public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
@@ -27,4 +28,12 @@ public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
         withCommand("/bin/sh", "-c", CMD);
     }
 
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * io.grpc.ManagedChannelBuilder#forTarget(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getContainerIpAddress() + ":" + getMappedPort(PORT);
+    }
 }
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index 5f2a203d911..8603b1f3437 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -25,4 +25,20 @@ public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
                 .withRegEx(".*Cloud Spanner emulator running\\..*"));
     }
 
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator's
+     * gRPC endpoint is reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.spanner.SpannerOptions.Builder#setEmulatorHost(java.lang.String) method.
+     */
+    public String getEmulatorGrpcEndpoint() {
+        return getContainerIpAddress() + ":" + getMappedPort(GRPC_PORT);
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator's
+     * HTTP REST endpoint is reachable from the test host machine.
+     */
+    public String getEmulatorHttpEndpoint() {
+        return getContainerIpAddress() + ":" + getMappedPort(HTTP_PORT);
+    }
 }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index f8285e4c691..4709ed1bbd6 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.datastore.Datastore;
@@ -10,8 +12,6 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class DatastoreEmulatorContainerTest {
 
     @Rule
@@ -25,7 +25,7 @@ public class DatastoreEmulatorContainerTest {
     @Test
     public void testSimple() {
         DatastoreOptions options = DatastoreOptions.newBuilder()
-                .setHost(emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(8081))
+                .setHost(emulator.getEmulatorEndpoint())
                 .setCredentials(NoCredentials.getInstance())
                 .setRetrySettings(ServiceOptions.getNoRetrySettings())
                 .setProjectId("test-project")
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index 2f23ff40483..766ce657bf0 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -1,8 +1,6 @@
 package org.testcontainers.containers;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.api.core.ApiFuture;
 import com.google.cloud.NoCredentials;
@@ -12,12 +10,13 @@
 import com.google.cloud.firestore.FirestoreOptions;
 import com.google.cloud.firestore.QuerySnapshot;
 import com.google.cloud.firestore.WriteResult;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class FirestoreEmulatorContainerTest {
 
     @Rule
@@ -26,7 +25,7 @@ public class FirestoreEmulatorContainerTest {
     @Test
     public void testSimple() throws ExecutionException, InterruptedException {
         FirestoreOptions options = FirestoreOptions.getDefaultInstance().toBuilder()
-                .setHost(emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(8080))
+                .setHost(emulator.getEmulatorEndpoint())
                 .setCredentials(NoCredentials.getInstance())
                 .setProjectId("test-project")
                 .build();
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index 0c5ec888de5..2a0acaa14e1 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import java.io.IOException;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GrpcTransportChannel;
@@ -23,12 +23,11 @@
 import com.google.pubsub.v1.TopicName;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class PubSubEmulatorContainerTest {
 
     public static final String PROJECT_ID = "my-project-id";
@@ -38,7 +37,7 @@ public class PubSubEmulatorContainerTest {
 
     @Test
     public void testSimple() throws IOException {
-        String hostport = emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(8085);
+        String hostport = emulator.getEmulatorEndpoint();
         ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
         try {
             TransportChannelProvider channelProvider =
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
index 9093530236a..5a47f9429ad 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.containers;
 
-import java.util.Arrays;
-import java.util.concurrent.ExecutionException;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.cloud.NoCredentials;
 import com.google.cloud.spanner.Database;
@@ -17,12 +16,12 @@
 import com.google.cloud.spanner.Spanner;
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.Statement;
+import java.util.Arrays;
+import java.util.concurrent.ExecutionException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class SpannerEmulatorContainerTest {
 
     @Rule
@@ -35,7 +34,7 @@ public class SpannerEmulatorContainerTest {
     @Test
     public void testSimple() throws ExecutionException, InterruptedException {
         SpannerOptions options = SpannerOptions.newBuilder()
-                .setEmulatorHost(emulator.getContainerIpAddress() + ":" + emulator.getMappedPort(9010))
+                .setEmulatorHost(emulator.getEmulatorGrpcEndpoint())
                 .setCredentials(NoCredentials.getInstance())
                 .setProjectId(PROJECT_NAME)
                 .build();
diff --git a/modules/gcloud/src/test/resources/logback-test.xml b/modules/gcloud/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/gcloud/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>

From 85f1e5e1352c95fb4f66b688c00e32fcf72546c1 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Thu, 15 Oct 2020 21:34:44 +0200
Subject: [PATCH 1039/4969] Elasticsearch: Add test and documentation for
 secured cluster, bump default Elasticsearch version (deprecated constructor)
 from 6.4.1 to 7.9.2 (#2320)

This can be now activated for free with the default basic license.
Also change latest version to 7.9.2.
---
 docs/modules/elasticsearch.md                 |  13 ++-
 modules/elasticsearch/build.gradle            |   2 +-
 .../elasticsearch/ElasticsearchContainer.java |  10 +-
 .../ElasticsearchContainerTest.java           | 106 +++++++++++++++---
 4 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 9959d0b7926..f84a7840e4c 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -3,7 +3,7 @@
 This module helps running [elasticsearch](https://www.elastic.co/products/elasticsearch) using
 Testcontainers.
 
-Note that it's based on the [official Docker image](https://www.elastic.co/guide/en/elasticsearch/reference/6.3/docker.html) provided by elastic.
+Note that it's based on the [official Docker image](https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html) provided by elastic.
 
 ## Usage example
 
@@ -15,10 +15,19 @@ You can start an elasticsearch container instance from any Java application by u
 <!--/codeinclude-->
 
 
-Note that if you are still using the [TransportClient](https://www.elastic.co/guide/en/elasticsearch/client/java-api/6.3/transport-client.html)
+Note that if you are still using the [TransportClient](https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/transport-client.html)
 (not recommended as it is deprecated), the default cluster name is set to `docker-cluster` so you need to change `cluster.name` setting
 or set `client.transport.ignore_cluster_name` to `true`.
 
+## Secure your Elasticsearch cluster
+
+The default distribution of Elasticsearch comes with the basic license which contains security feature.
+You can turn on security by providing some extra environment settings:
+
+<!--codeinclude-->
+[HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientSecuredContainer
+<!--/codeinclude-->
+
 ## Choose your Elasticsearch license
 
 If you prefer to start a Docker image with the pure OSS version (which means with no security in older versions or
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index e6de1daa7ab..126722759ec 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.2"
-    testCompile "org.elasticsearch.client:transport:6.7.1"
+    testCompile "org.elasticsearch.client:transport:7.9.2"
 }
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 7ed660d38c6..e0880aa7849 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -23,7 +23,9 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
 
     /**
      * Elasticsearch Default Transport port
+     * The TransportClient will be removed in Elasticsearch 8. No need to expose this port anymore in the future.
      */
+    @Deprecated
     private static final int ELASTICSEARCH_DEFAULT_TCP_PORT = 9300;
 
     /**
@@ -35,7 +37,8 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     /**
      * Elasticsearch Default version
      */
-    protected static final String DEFAULT_TAG = "6.4.1";
+    @Deprecated
+    protected static final String DEFAULT_TAG = "7.9.2";
 
     /**
      * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
@@ -47,7 +50,7 @@ public ElasticsearchContainer() {
 
     /**
      * Create an Elasticsearch Container by passing the full docker image name
-     * @param dockerImageName Full docker image name as a {@link String}, like: docker.elastic.co/elasticsearch/elasticsearch:6.4.1
+     * @param dockerImageName Full docker image name as a {@link String}, like: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
      */
     public ElasticsearchContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
@@ -55,7 +58,7 @@ public ElasticsearchContainer(String dockerImageName) {
 
     /**
      * Create an Elasticsearch Container by passing the full docker image name
-     * @param dockerImageName Full docker image name as a {@link DockerImageName}, like: docker.elastic.co/elasticsearch/elasticsearch:6.4.1
+     * @param dockerImageName Full docker image name as a {@link DockerImageName}, like: DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:7.9.2")
      */
     public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
@@ -76,6 +79,7 @@ public String getHttpHostAddress() {
         return getHost() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
     }
 
+    @Deprecated // The TransportClient will be removed in Elasticsearch 8. No need to expose this port anymore in the future.
     public InetSocketAddress getTcpHost() {
         return new InetSocketAddress(getHost(), getMappedPort(ELASTICSEARCH_DEFAULT_TCP_PORT));
     }
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 712daf4a11d..f86f1e8c104 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -4,7 +4,6 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.testcontainers.elasticsearch.ElasticsearchContainer.DEFAULT_TAG;
 
 import java.io.IOException;
 import org.apache.http.HttpHost;
@@ -13,7 +12,6 @@
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.util.EntityUtils;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
@@ -32,23 +30,24 @@ public class ElasticsearchContainerTest {
     /**
      * Elasticsearch version which should be used for the Tests
      */
-    private static final String ELASTICSEARCH_VERSION = Version.CURRENT.toString();
+    private static final String ELASTICSEARCH_VERSION = "7.9.2";
     private static final DockerImageName ELASTICSEARCH_IMAGE =
         DockerImageName
             .parse("docker.elastic.co/elasticsearch/elasticsearch")
             .withTag(ELASTICSEARCH_VERSION);
 
     /**
-     * Elasticsearch default username, when secured with a license > basic
+     * Elasticsearch default username, when secured
      */
     private static final String ELASTICSEARCH_USERNAME = "elastic";
 
     /**
-     * Elasticsearch 5.x default password. In 6.x images, there's no security by default as shipped with a basic license.
+     * From 6.8, we can optionally activate security with a default password.
      */
     private static final String ELASTICSEARCH_PASSWORD = "changeme";
 
     private RestClient client = null;
+    private RestClient anonymousClient = null;
 
     @After
     public void stopRestClient() throws IOException {
@@ -56,11 +55,16 @@ public void stopRestClient() throws IOException {
             client.close();
             client = null;
         }
+        if (anonymousClient != null) {
+            anonymousClient.close();
+            anonymousClient = null;
+        }
     }
 
     @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
-    public void elasticsearchDefaultTest() throws IOException {
+    @Deprecated // We will remove this test in the future
+    public void elasticsearchDeprecatedCtorTest() throws IOException {
         // Create the elasticsearch container.
         try (ElasticsearchContainer container = new ElasticsearchContainer()
             .withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
@@ -71,7 +75,29 @@ public void elasticsearchDefaultTest() throws IOException {
             // Do whatever you want with the rest client ...
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString(DEFAULT_TAG));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_VERSION));
+
+            // The default image is running with the features under Elastic License
+            response = getClient(container).performRequest(new Request("GET", "/_xpack/"));
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            // For now we test that we have the monitoring feature available
+            assertThat(EntityUtils.toString(response.getEntity()), containsString("monitoring"));
+        }
+    }
+
+    @Test
+    public void elasticsearchDefaultTest() throws IOException {
+        // Create the elasticsearch container.
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
+            .withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
+        ) {
+            // Start the container. This step might take some time...
+            container.start();
+
+            // Do whatever you want with the rest client ...
+            Response response = getClient(container).performRequest(new Request("GET", "/"));
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_VERSION));
 
             // The default image is running with the features under Elastic License
             response = getClient(container).performRequest(new Request("GET", "/_xpack/"));
@@ -81,6 +107,26 @@ public void elasticsearchDefaultTest() throws IOException {
         }
     }
 
+    @Test
+    public void elasticsearchSecuredTest() throws IOException {
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
+            .withEnv("ELASTIC_PASSWORD", ELASTICSEARCH_PASSWORD)
+            .withEnv("xpack.security.enabled", "true")
+        ) {
+            container.start();
+
+            // The cluster should be secured so it must fail when we try to access / without credentials
+            assertThrows("We should not be able to access / URI with an anonymous client.",
+                ResponseException.class,
+                () -> getAnonymousClient(container).performRequest(new Request("GET", "/")));
+
+            // But it should work when we try to access / with the proper login and password
+            Response response = getClient(container).performRequest(new Request("GET", "/"));
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_VERSION));
+        }
+    }
+
     @Test
     public void elasticsearchVersion() throws IOException {
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
@@ -113,12 +159,11 @@ public void elasticsearchOssImage() throws IOException {
         }
     }
 
-    @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
     public void restClientClusterHealth() throws IOException {
         // httpClientContainer {
         // Create the elasticsearch container.
-        try (ElasticsearchContainer container = new ElasticsearchContainer()) {
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
             // Start the container. This step might take some time...
             container.start();
 
@@ -140,15 +185,41 @@ public void restClientClusterHealth() throws IOException {
         // }
     }
 
+    @Test
+    public void restClientSecuredClusterHealth() throws IOException {
+        // httpClientSecuredContainer {
+        // Create the elasticsearch container.
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
+            // With a password
+            .withEnv("ELASTIC_PASSWORD", ELASTICSEARCH_PASSWORD)
+            .withEnv("xpack.security.enabled", "true")) {
+            // Start the container. This step might take some time...
+            container.start();
+
+            // Create the secured client.
+            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD));
+
+            client = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
+                .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
+                .build();
+
+            Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+            // }}
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+            // httpClientSecuredContainer {{
+        }
+        // }
+    }
+
+    @SuppressWarnings("deprecation") // The TransportClient will be removed in Elasticsearch 8.
     @Test
     public void transportClientClusterHealth() {
         // transportClientContainer {
         // Create the elasticsearch container.
-        try (ElasticsearchContainer container = new ElasticsearchContainer(
-            DockerImageName
-                .parse("docker.elastic.co/elasticsearch/elasticsearch")
-                .withTag("6.4.1")
-        )){
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)){
             // Start the container. This step might take some time...
             container.start();
 
@@ -182,4 +253,11 @@ private RestClient getClient(ElasticsearchContainer container) {
         return client;
     }
 
+    private RestClient getAnonymousClient(ElasticsearchContainer container) {
+        if (anonymousClient == null) {
+            anonymousClient = RestClient.builder(HttpHost.create(container.getHttpHostAddress())).build();
+        }
+
+        return anonymousClient;
+    }
 }

From edb7f7a8e3233f9504f737102aa4180fe0949ec4 Mon Sep 17 00:00:00 2001
From: Kirill Artamonov <artamonov.kirill@gmail.com>
Date: Thu, 15 Oct 2020 22:08:53 +0200
Subject: [PATCH 1040/4969] Update image references in Localstack module docs
 (#3076)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/localstack.md                               | 4 +++-
 .../containers/localstack/LocalstackContainerTest.java   | 9 +++------
 .../containers/localstack/LocalstackTestImages.java      | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 4ff46233b05..41fd2a50a52 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -7,8 +7,10 @@ Testcontainers module for the Atlassian's [LocalStack](https://github.com/locals
 Running LocalStack as a stand-in for AWS S3 during a test:
 
 ```java
+DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:0.11.3");
+
 @Rule
-public LocalStackContainer localstack = new LocalStackContainer()
+public LocalStackContainer localstack = new LocalStackContainer(localstackImage)
         .withServices(S3);
 
 @Test
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index fad4060341c..af4d0694ab6 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -10,6 +10,7 @@
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.KMS;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
+import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_IMAGE;
 
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
@@ -64,9 +65,7 @@ public static class WithoutNetwork {
 
         // without_network {
         @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(
-            DockerImageName.parse("localstack/localstack:0.11.0")
-        )
+        public static LocalStackContainer localstack = new LocalStackContainer(LOCALSTACK_IMAGE)
             .withServices(S3, SQS, CLOUDWATCHLOGS, KMS);
         // }
 
@@ -179,9 +178,7 @@ public static class WithNetwork {
         private static Network network = Network.newNetwork();
 
         @ClassRule
-        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(
-            DockerImageName.parse("localstack/localstack:0.11.0")
-        )
+        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(LOCALSTACK_IMAGE)
             .withNetwork(network)
             .withNetworkAliases("notthis", "localstack")    // the last alias is used for HOSTNAME_EXTERNAL
             .withServices(S3, SQS, CLOUDWATCHLOGS);
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index 60e5498daf3..0dd0ca9b9ac 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -3,6 +3,6 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface LocalstackTestImages {
-    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.11.0");
+    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.11.3");
     DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("atlassian/pipelines-awscli:1.16.302");
 }

From 9d4b31d23d21bacf1f54791264c292e15df61d58 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Fri, 16 Oct 2020 10:43:46 +0200
Subject: [PATCH 1041/4969] Fix `oos` -> `oss` in Elasticsearch's docs (#3349)

---
 docs/modules/elasticsearch.md                                   | 2 +-
 .../elasticsearch/ElasticsearchContainerTest.java               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index f84a7840e4c..357ca782eaa 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -34,7 +34,7 @@ If you prefer to start a Docker image with the pure OSS version (which means wit
 other new and advanced features), you can use this instead:
 
 <!--codeinclude-->
-[Elasticsearch OSS](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:oosContainer
+[Elasticsearch OSS](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:ossContainer
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index f86f1e8c104..3050ab4aedb 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -141,7 +141,7 @@ public void elasticsearchVersion() throws IOException {
     @Test
     public void elasticsearchOssImage() throws IOException {
         try (ElasticsearchContainer container =
-                 // oosContainer {
+                 // ossContainer {
                  new ElasticsearchContainer(
                      DockerImageName
                          .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")

From 443307c21e4c4b20e7cee143b9bbd619f2319333 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 21 Oct 2020 09:28:34 +0100
Subject: [PATCH 1042/4969] Upgrade mkdocs-codeinclude-plugin (#3354)

Fixes indentation of ellipsis in within example code blocks
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 227c646dd6b..f962b36a44f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 mkdocs==1.0.4
-mkdocs-codeinclude-plugin==0.0.1
+mkdocs-codeinclude-plugin==0.1.0
 mkdocs-material==4.6.0
 mkdocs-markdownextradata-plugin==0.1.1
 markdown>=3.1,<3.2

From ec43c31f06d2ec46014d3a2e63a2577e375008ec Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Wed, 21 Oct 2020 17:35:25 +0200
Subject: [PATCH 1043/4969] Elasticsearch: Add withPassword(String) method for
 secure access (#2321)

---
 docs/modules/elasticsearch.md                 |  2 +-
 .../elasticsearch/ElasticsearchContainer.java | 21 +++++++++++++++++++
 .../ElasticsearchContainerTest.java           | 20 +++++++++++++-----
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 357ca782eaa..cd47c9c4ed3 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -22,7 +22,7 @@ or set `client.transport.ignore_cluster_name` to `true`.
 ## Secure your Elasticsearch cluster
 
 The default distribution of Elasticsearch comes with the basic license which contains security feature.
-You can turn on security by providing some extra environment settings:
+You can turn on security by providing a password:
 
 <!--codeinclude-->
 [HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientSecuredContainer
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index e0880aa7849..acbca15aaf5 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -39,6 +39,7 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
      */
     @Deprecated
     protected static final String DEFAULT_TAG = "7.9.2";
+    private boolean isOss = false;
 
     /**
      * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
@@ -65,6 +66,10 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME);
 
+        if (dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME)) {
+            this.isOss = true;
+        }
+
         logger().info("Starting an elasticsearch container using [{}]", dockerImageName);
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
         withEnv("discovery.type", "single-node");
@@ -75,6 +80,22 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
             .withStartupTimeout(Duration.ofMinutes(2)));
     }
 
+    /**
+     * Define the Elasticsearch password to set. It enables security behind the scene.
+     * It's not possible to use security with the oss image.
+     * @param password  Password to set
+     * @return this
+     */
+    public ElasticsearchContainer withPassword(String password) {
+        if (isOss) {
+            throw new IllegalArgumentException("You can not activate security on Elastic OSS Image. " +
+                "Please switch to the default distribution");
+        }
+        withEnv("ELASTIC_PASSWORD", password);
+        withEnv("xpack.security.enabled", "true");
+        return this;
+    }
+
     public String getHttpHostAddress() {
         return getHost() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
     }
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 3050ab4aedb..859587645d7 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -110,9 +110,7 @@ public void elasticsearchDefaultTest() throws IOException {
     @Test
     public void elasticsearchSecuredTest() throws IOException {
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
-            .withEnv("ELASTIC_PASSWORD", ELASTICSEARCH_PASSWORD)
-            .withEnv("xpack.security.enabled", "true")
-        ) {
+            .withPassword(ELASTICSEARCH_PASSWORD)) {
             container.start();
 
             // The cluster should be secured so it must fail when we try to access / without credentials
@@ -191,8 +189,7 @@ public void restClientSecuredClusterHealth() throws IOException {
         // Create the elasticsearch container.
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
             // With a password
-            .withEnv("ELASTIC_PASSWORD", ELASTICSEARCH_PASSWORD)
-            .withEnv("xpack.security.enabled", "true")) {
+            .withPassword(ELASTICSEARCH_PASSWORD)) {
             // Start the container. This step might take some time...
             container.start();
 
@@ -239,6 +236,19 @@ public void transportClientClusterHealth() {
         // }
     }
 
+    @Test
+    public void incompatibleSettingsTest() {
+        // The OSS image can not use security feature
+        assertThrows("We should not be able to activate security with an OSS License",
+            IllegalArgumentException.class,
+            () -> new ElasticsearchContainer(
+                DockerImageName
+                    .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
+                    .withTag(ELASTICSEARCH_VERSION))
+            .withPassword("foo")
+        );
+    }
+
     private RestClient getClient(ElasticsearchContainer container) {
         if (client == null) {
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();

From d3829ed535d3c92fa34dad49fd84ec05fd258630 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:13:09 +0100
Subject: [PATCH 1044/4969] Bump aws-java-sdk-dynamodb from 1.11.880 to
 1.11.882 in /modules/dynalite (#3356)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.880 to 1.11.882.
- [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.880...1.11.882)

Signed-off-by: dependabot[bot] <support@github.com>

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 fe8fb883839..8aa9959ea13 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.880'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.865'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.882'
+    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.882'
 }

From 769e202808439baa67bd47ce476144f48e29f772 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:13:29 +0100
Subject: [PATCH 1045/4969] Bump postgresql from 42.2.17 to 42.2.18 in
 /modules/postgresql (#3358)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.17 to 42.2.18.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.18/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.17...REL42.2.18)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 aa5db7028b5..b16ceaea2a8 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')
-    testCompile 'org.postgresql:postgresql:42.2.17'
+    testCompile 'org.postgresql:postgresql:42.2.18'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'

From 05691471fdb7fb61b90c2d4b286415492f2d7b57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:14:25 +0100
Subject: [PATCH 1046/4969] Bump mysql-connector-java from 8.0.21 to 8.0.22 in
 /modules/mysql (#3357)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.21 to 8.0.22.
- [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/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 9df2e177d3f..da3dad9f2b3 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'mysql:mysql-connector-java:8.0.21'
+    testCompile 'mysql:mysql-connector-java:8.0.22'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'

From 1d80a407c0821d1c269a7ca0108f00a2703fc3a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:14:34 +0100
Subject: [PATCH 1047/4969] Bump guava from 29.0-jre to 30.0-jre in
 /modules/jdbc-test (#3359)

Bumps [guava](https://github.com/google/guava) from 29.0-jre to 30.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 ec57ddcea41..661cc1b4301 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     compile project(':jdbc')
     compile project(':test-support')
 
-    compile 'com.google.guava:guava:29.0-jre'
+    compile 'com.google.guava:guava:30.0-jre'
     compile 'org.apache.commons:commons-lang3:3.11'
     compile 'com.zaxxer:HikariCP-java6:2.3.13'
     compile 'commons-dbutils:commons-dbutils:1.7'

From a71887b5d86fdbd1b4e0a23e87c232395e44fb7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:14:47 +0100
Subject: [PATCH 1048/4969] Bump mysql-connector-java from 8.0.21 to 8.0.22 in
 /modules/jdbc-test (#3360)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.21 to 8.0.22.
- [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/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 661cc1b4301..99841c1d62a 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.39'
     compile 'org.vibur:vibur-dbcp:25.0'
-    compile 'mysql:mysql-connector-java:8.0.21'
+    compile 'mysql:mysql-connector-java:8.0.22'
 }

From 8b10cee92c3e80ed2c833c41f037dc3cbc3a3aa3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:15:00 +0100
Subject: [PATCH 1049/4969] Bump mysql-connector-java from 8.0.21 to 8.0.22 in
 /modules/spock (#3363)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.21 to 8.0.22.
- [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/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 86724262a29..92e75e8cb86 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntime 'org.postgresql:postgresql:42.2.17'
-    testRuntime 'mysql:mysql-connector-java:8.0.21'
+    testRuntime 'mysql:mysql-connector-java:8.0.22'
 
     testCompileClasspath 'org.jetbrains:annotations:20.1.0'
 }

From 2fb35460ba9324544e83a1990409b4dda616f6d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:15:36 +0100
Subject: [PATCH 1050/4969] Bump mssql-jdbc from 8.4.1.jre8 to
 9.1.0.jre8-preview in /modules/mssqlserver (#3364)

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 8.4.1.jre8 to 9.1.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index f0170500e7d..9aab7844148 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,12 +10,12 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.4.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.0.jre8-preview'
 
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.3.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.0.jre8-preview'
 }

From e7c007b03a1fd74d489d562f4c430bf3180a4af9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:15:43 +0100
Subject: [PATCH 1051/4969] Bump aws-java-sdk-s3 from 1.11.880 to 1.11.882 in
 /modules/localstack (#3365)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.880 to 1.11.882.
- [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.880...1.11.882)

Signed-off-by: dependabot[bot] <support@github.com>

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 29abca90878..dcae987bbf4 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.880'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.882'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From 6985c996daa85c01883cf83276ba193bd59eeb0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:16:04 +0100
Subject: [PATCH 1052/4969] Bump lombok from 1.18.14 to 1.18.16 in /examples
 (#3368)

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.14 to 1.18.16.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.14...v1.18.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/disque-job-queue/build.gradle | 2 +-
 examples/solr-container/build.gradle   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index c5e191f4f94..c31cb39b7fe 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.14"
+    compileOnly "org.projectlombok:lombok:1.18.16"
     annotationProcessor "org.projectlombok:lombok:1.18.14"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.6'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 5a8973cab27..75524364100 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.14"
-    annotationProcessor "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok:1.18.16"
+    annotationProcessor "org.projectlombok:lombok:1.18.16"
 
     implementation 'org.apache.solr:solr-solrj:8.6.3'
 

From eeecf94f7c42b628599de13bbc5dbeaa5296f6ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:16:25 +0100
Subject: [PATCH 1053/4969] Bump s3 from 2.15.7 to 2.15.9 in
 /modules/localstack (#3361)

Bumps s3 from 2.15.7 to 2.15.9.

Signed-off-by: dependabot[bot] <support@github.com>

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 dcae987bbf4..ee02504309f 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.880'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.880'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.15.7'
+    testCompile 'software.amazon.awssdk:s3:2.15.9'
 }

From 153b3baf2dce22d706c76d679ba4220cf87a1e55 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 22 Oct 2020 14:22:00 +0100
Subject: [PATCH 1054/4969] Update version to 1.15.0-rc2

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index dfff99bb302..0fa9b2b4c91 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -92,4 +92,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.14.3
+    latest_version: 1.15.0-rc2

From c110086287f96a408c5fbfb589be72d67b033c57 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 22 Oct 2020 17:31:23 +0100
Subject: [PATCH 1055/4969] Change image used for test to avoid image name
 cache preventing proper pull (#3378)

---
 .../dockerclient/AmbiguousImagePullTest.java              | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
index 5d2c42ed1b2..9e62148c3bb 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
@@ -5,7 +5,6 @@
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.List;
@@ -16,16 +15,15 @@ public class AmbiguousImagePullTest {
     public void testNotUsingParse() {
         DockerClient client = DockerClientFactory.instance().client();
         List<Image> alpineImages = client.listImagesCmd()
-            .withImageNameFilter("alpine:latest")
+            .withImageNameFilter("testcontainers/helloworld:latest")
             .exec();
         for (Image alpineImage : alpineImages) {
             client.removeImageCmd(alpineImage.getId()).exec();
         }
 
         try (
-            final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine"))
-                .withCommand("/bin/sh", "-c", "sleep 0")
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+            final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld"))
+                .withExposedPorts(8080)
         ) {
             container.start();
             // do nothing other than start and stop

From bd86ca421482b66df6828dd29ee214bbfb9f0e67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Oct 2020 15:47:49 +0100
Subject: [PATCH 1056/4969] Bump postgresql from 42.2.17 to 42.2.18 in
 /modules/spock (#3362)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.17 to 42.2.18.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.18/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.17...REL42.2.18)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 92e75e8cb86..a095bcb8a80 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntime 'org.postgresql:postgresql:42.2.17'
+    testRuntime 'org.postgresql:postgresql:42.2.18'
     testRuntime 'mysql:mysql-connector-java:8.0.22'
 
     testCompileClasspath 'org.jetbrains:annotations:20.1.0'

From 4e1db24e195ff1c8fdf8f8cb3bf1e0d152d97b34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Oct 2020 15:48:02 +0100
Subject: [PATCH 1057/4969] Bump postgresql from 42.2.17 to 42.2.18 in
 /examples (#3367)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.17 to 42.2.18.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.18/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.17...REL42.2.18)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 5c4c473becb..f5f21a57d21 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.17'
+    testImplementation 'org.postgresql:postgresql:42.2.18'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From d20619cfec8cb55a86ed2cb6b4de14dd3a0c16cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Oct 2020 15:48:10 +0100
Subject: [PATCH 1058/4969] Bump mysql-connector-java from 8.0.21 to 8.0.22 in
 /modules/junit-jupiter (#3370)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.21 to 8.0.22.
- [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/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 28f6049faf4..d85fc9fa85c 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.7.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.17'
-    testRuntime 'mysql:mysql-connector-java:8.0.21'
+    testRuntime 'mysql:mysql-connector-java:8.0.22'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 }
 

From 9353569be58e8bf0d35b2838eebc68e75b07ca43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Oct 2020 15:48:21 +0100
Subject: [PATCH 1059/4969] Bump guava from 29.0-jre to 30.0-jre in /core
 (#3371)

Bumps [guava](https://github.com/google/guava) from 29.0-jre to 30.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>

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 e043313ac38..723b14fd0e6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:29.0-jre'
+        classpath 'com.google.guava:guava:30.0-jre'
     }
 }
 

From b4ac0f39748c9cf45998352f404ae2a0d266d855 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Oct 2020 19:14:37 +0100
Subject: [PATCH 1060/4969] Bump aws-java-sdk-sqs from 1.11.880 to 1.11.884 in
 /modules/localstack (#3377)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.880 to 1.11.884.
- [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.880...1.11.884)

Signed-off-by: dependabot[bot] <support@github.com>

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 ee02504309f..418344b82f2 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.882'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.880'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.880'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.884'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.15.9'
 }

From 1b4a2a6356cb12796b57816e9f90a23e7f5a2a57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Oct 2020 19:14:49 +0100
Subject: [PATCH 1061/4969] Bump postgresql from 42.2.17 to 42.2.18 in
 /modules/junit-jupiter (#3369)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.17 to 42.2.18.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.18/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.17...REL42.2.18)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 d85fc9fa85c..61594d9842b 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'org.assertj:assertj-core:3.17.2'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.0'
 
-    testRuntime 'org.postgresql:postgresql:42.2.17'
+    testRuntime 'org.postgresql:postgresql:42.2.18'
     testRuntime 'mysql:mysql-connector-java:8.0.22'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 }

From f4fb79b002c25d71ab7a64d90860058b0f24e672 Mon Sep 17 00:00:00 2001
From: codefiddler <jamesthayes@googlemail.com>
Date: Thu, 29 Oct 2020 13:21:49 +0100
Subject: [PATCH 1062/4969] Remove potential NullPointerException when trying
 to log an error in VNC recorder (#3408)

---
 .../testcontainers/containers/BrowserWebDriverContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index d60d9191748..884cd33a9dd 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -171,7 +171,7 @@ protected void configure() {
                     vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
                 } catch (IOException e) {
                     // should never happen as per javadoc, since we use valid prefix
-                    logger().error("Exception while trying to create temp directory " + vncRecordingDirectory.getAbsolutePath(), e);
+                    logger().error("Exception while trying to create temp directory", e);
                     throw new ContainerLaunchException("Exception while trying to create temp directory", e);
                 }
             }

From ed6d94f392c4beb23cfa2bd7924376ee7d80d446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 29 Oct 2020 06:23:07 -0600
Subject: [PATCH 1063/4969] Update tests to use emulators image (#3406)

`Google Cloud SDK` released a new image which has just emulators
installed.
---
 .../containers/DatastoreEmulatorContainerTest.java              | 2 +-
 .../containers/FirestoreEmulatorContainerTest.java              | 2 +-
 .../testcontainers/containers/PubSubEmulatorContainerTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index 4709ed1bbd6..f7b35936197 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -17,7 +17,7 @@ public class DatastoreEmulatorContainerTest {
     @Rule
     // creatingDatastoreEmulatorContainer {
     public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:313.0.0")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
     );
     // }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index 766ce657bf0..4003ebdd342 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -20,7 +20,7 @@
 public class FirestoreEmulatorContainerTest {
 
     @Rule
-    public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:313.0.0"));
+    public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators"));
 
     @Test
     public void testSimple() throws ExecutionException, InterruptedException {
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index 2a0acaa14e1..3ea9f831d8e 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -33,7 +33,7 @@ public class PubSubEmulatorContainerTest {
     public static final String PROJECT_ID = "my-project-id";
 
     @Rule
-    public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:313.0.0"));
+    public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators"));
 
     @Test
     public void testSimple() throws IOException {

From a4ea01764c9b3792911dcf6cade3612969a9baeb Mon Sep 17 00:00:00 2001
From: Kirill Artamonov <artamonov.kirill@gmail.com>
Date: Thu, 29 Oct 2020 13:26:56 +0100
Subject: [PATCH 1064/4969] Latest kafka container 5.4.3 (#3402)

---
 docs/modules/kafka.md                             | 15 +++------------
 .../testcontainers/containers/KafkaContainer.java |  2 +-
 .../containers/KafkaContainerTest.java            |  8 ++++----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index d36273ac8e1..b74d4ef49bd 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -14,25 +14,16 @@ The following field in your JUnit test class will prepare a container running Ka
 <!--codeinclude-->
 [JUnit Rule](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:junitRule
 <!--/codeinclude-->
-        
+
+The correspondence between Confluent Platform versions and Kafka versions can be seen [in Confluent documentation](https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility)
+
 Now your tests or any other process running on your machine can get access to running Kafka broker by using the following bootstrap server location:
 
 <!--codeinclude-->
 [Bootstrap Servers](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:getBootstrapServers
 <!--/codeinclude-->
 
-
 ## Options
-
-### Selecting Kafka version
-
-You can select a specific Confluent Platform Kafka docker image by passing it to the container's constructor:
-<!--codeinclude-->
-[Version Constructor](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:constructorWithVersion
-<!--/codeinclude-->
-
-
-The correspondence between Confluent Platform versions and Kafka versions can be seen [in Confluent documentation](https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility)
         
 ### <a name="zookeeper"></a> Using external Zookeeper
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index ae44e4803a9..37f99bf970b 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -17,7 +17,7 @@
 public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
-    private static final String DEFAULT_TAG = "5.2.1";
+    private static final String DEFAULT_TAG = "5.4.3";
 
     private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
 
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 08b9fb6f856..4f721424bb6 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -24,12 +24,12 @@
 
 public class KafkaContainerTest {
 
-    private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:5.2.1");
+    private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:5.4.3");
     private static final DockerImageName ZOOKEEPER_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-zookeeper:4.0.0");
 
     // junitRule {
     @ClassRule
-    public static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.2.1"));
+    public static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"));
     // }
 
     @Test
@@ -45,7 +45,7 @@ public void testUsage() throws Exception {
     public void testUsageWithSpecificImage() throws Exception {
         try (
             // constructorWithVersion {
-            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.2.1"))
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
             // }
         ) {
             kafka.start();
@@ -61,7 +61,7 @@ public void testUsageWithSpecificImage() throws Exception {
     @Test
     public void testUsageWithVersion() throws Exception {
         try (
-            KafkaContainer kafka = new KafkaContainer("5.2.1")
+            KafkaContainer kafka = new KafkaContainer("5.4.3")
         ) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());

From e97fd3d0251e9f054052cd30009db6122c979210 Mon Sep 17 00:00:00 2001
From: DevilzOwn <prateekbokade@gmail.com>
Date: Thu, 29 Oct 2020 17:58:47 +0530
Subject: [PATCH 1065/4969] Reduce severity of warning for failed auth config
 lookups (fixes #1399) (#3353)

Co-authored-by: Prateek Bokade <prateekb@hotstar.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../java/org/testcontainers/utility/RegistryAuthLocator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index 32b49bd8172..846b62f1f25 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -145,7 +145,7 @@ private Optional<AuthConfig> lookupUncachedAuthConfig(String registryName, Docke
                 return Optional.of(existingAuthConfig);
             }
         } catch (Exception e) {
-            log.warn("Failure when attempting to lookup auth config (dockerImageName: {}, configFile: {}. Falling back to docker-java default behaviour. Exception message: {}",
+            log.info("Failure when attempting to lookup auth config. Please ignore if you don't have images in an authenticated registry. Details: (dockerImageName: {}, configFile: {}. Falling back to docker-java default behaviour. Exception message: {}",
                 dockerImageName,
                 configFile,
                 e.getMessage());

From 18fec1dcf5ba43298cdc344bc70293c91f2af28f Mon Sep 17 00:00:00 2001
From: ae-govau <adam.eijdenberg@defence.gov.au>
Date: Thu, 29 Oct 2020 23:29:42 +1100
Subject: [PATCH 1066/4969] Correct documentation for ryuk image (#3383)

Commit 7ba06573feb6561c6fc857cd5b53ff1449808da9 changed the default
values in code, this commit updates the documentation to match.
---
 docs/features/configuration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 8b12f8e8d54..e3ac0fb6ac3 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -32,7 +32,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **tinyimage.container.image = alpine:3.5**  
 > Used by Testcontainers' core
 
-> **vncrecorder.container.image = testcontainersofficial/vnc-recorder:1.1.0**  
+> **vncrecorder.container.image = testcontainers/vnc-recorder:1.1.0**
 > Used by VNC recorder in Testcontainers' Seleniun integration
 
 > **ambassador.container.image = richnorth/ambassador:latest**  
@@ -53,7 +53,7 @@ For more information, see the [official Docker documentation about "Registry as
 
 ## Customizing Ryuk resource reaper
 
-> **ryuk.container.image = testcontainersofficial/ryuk:0.3.0**
+> **ryuk.container.image = testcontainers/ryuk:0.3.0**
 > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
 
 > **ryuk.container.privileged = false**

From 4a529f6aaeb1ec9f59068d70f45b7e558dabcbe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20=C5=81ozi=C5=84ski?= <pawel.lozinski@gmail.com>
Date: Thu, 29 Oct 2020 13:31:55 +0100
Subject: [PATCH 1067/4969] Fix use of HostPortWaitStrategy with Postgres
 container (fixes #3382) (#3403)

---
 .../org/testcontainers/containers/PostgreSQLContainer.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 5a4abe6d0ee..6c16bb8fe61 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -5,10 +5,10 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
-import java.util.HashSet;
 import java.util.Set;
 
 import static java.time.temporal.ChronoUnit.SECONDS;
+import static java.util.Collections.singleton;
 
 /**
  * @author richardnorth
@@ -63,7 +63,7 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) {
     @NotNull
     @Override
     protected Set<Integer> getLivenessCheckPorts() {
-        return new HashSet<>(getMappedPort(POSTGRESQL_PORT));
+        return singleton(getMappedPort(POSTGRESQL_PORT));
     }
 
     @Override

From ca74b044e222e725c72083a1d5d7d70d17a04ecf Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 29 Oct 2020 13:12:50 +0000
Subject: [PATCH 1068/4969] Refactor TestcontainersConfiguration to allow
 config by env var (#3411)

---
 .../utility/TestcontainersConfiguration.java  | 252 +++++++++++++-----
 .../TestcontainersConfigurationTest.java      |  86 ++++--
 2 files changed, 258 insertions(+), 80 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 5b89140fd61..b3c8e88a328 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -1,15 +1,17 @@
 package org.testcontainers.utility;
 
 import com.google.common.annotations.VisibleForTesting;
-import lombok.AccessLevel;
+import com.google.common.collect.ImmutableMap;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.testcontainers.UnstableAPI;
 
 import java.io.File;
@@ -20,22 +22,57 @@
 import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
 /**
- * Provides a mechanism for fetching configuration/defaults from the classpath.
+ * Provides a mechanism for fetching configuration/default settings.
+ * <p>
+ * Configuration may be provided in:
+ * <ul>
+ *     <li>A file in the user's home directory named <code>.testcontainers.properties</code></li>
+ *     <li>A file in the classpath named <code>testcontainers.properties</code></li>
+ *     <li>Environment variables</li>
+ * </ul>
+ * <p>
+ * Note that, if using environment variables, property names are in upper case separated by underscores, preceded by
+ * <code>TESTCONTAINERS_</code>.
  */
 @Data
 @Slf4j
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class TestcontainersConfiguration {
 
     private static String PROPERTIES_FILE_NAME = "testcontainers.properties";
 
-    private static File ENVIRONMENT_CONFIG_FILE = new File(System.getProperty("user.home"), "." + PROPERTIES_FILE_NAME);
+    private static File USER_CONFIG_FILE = new File(System.getProperty("user.home"), "." + PROPERTIES_FILE_NAME);
+
+    private static final String AMBASSADOR_IMAGE = "richnorth/ambassador";
+    private static final String SOCAT_IMAGE = "alpine/socat";
+    private static final String VNC_RECORDER_IMAGE = "testcontainers/vnc-recorder";
+    private static final String COMPOSE_IMAGE = "docker/compose";
+    private static final String ALPINE_IMAGE = "alpine";
+    private static final String RYUK_IMAGE = "testcontainers/ryuk";
+    private static final String KAFKA_IMAGE = "confluentinc/cp-kafka";
+    private static final String PULSAR_IMAGE = "apachepulsar/pulsar";
+    private static final String LOCALSTACK_IMAGE = "localstack/localstack";
+    private static final String SSHD_IMAGE = "testcontainers/sshd";
+
+    private static final ImmutableMap<DockerImageName, String> CONTAINER_MAPPING = ImmutableMap.<DockerImageName, String>builder()
+        .put(DockerImageName.parse(AMBASSADOR_IMAGE), "ambassador.container.image")
+        .put(DockerImageName.parse(SOCAT_IMAGE), "socat.container.image")
+        .put(DockerImageName.parse(VNC_RECORDER_IMAGE), "vncrecorder.container.image")
+        .put(DockerImageName.parse(COMPOSE_IMAGE), "compose.container.image")
+        .put(DockerImageName.parse(ALPINE_IMAGE), "tinyimage.container.image")
+        .put(DockerImageName.parse(RYUK_IMAGE), "ryuk.container.image")
+        .put(DockerImageName.parse(KAFKA_IMAGE), "kafka.container.image")
+        .put(DockerImageName.parse(PULSAR_IMAGE), "pulsar.container.image")
+        .put(DockerImageName.parse(LOCALSTACK_IMAGE), "localstack.container.image")
+        .put(DockerImageName.parse(SSHD_IMAGE), "sshd.container.image")
+        .build();
 
     @Getter(lazy = true)
     private static final TestcontainersConfiguration instance = loadConfiguration();
@@ -47,163 +84,234 @@ static AtomicReference<TestcontainersConfiguration> getInstanceField() {
         return (AtomicReference) (Object) instance;
     }
 
-    @Getter(AccessLevel.NONE)
-    private final Properties environmentProperties;
+    private final Properties userProperties;
+    private final Properties classpathProperties;
+    private final Map<String, String> environment;
 
-    private final Properties properties = new Properties();
-
-    TestcontainersConfiguration(Properties environmentProperties, Properties classpathProperties) {
-        this.environmentProperties = environmentProperties;
-
-        this.properties.putAll(classpathProperties);
-        this.properties.putAll(environmentProperties);
-    }
-
-    private DockerImageName getImage(final String key, final String defaultValue) {
-        return DockerImageName
-            .parse(properties.getProperty(key, defaultValue).trim())
-            .asCompatibleSubstituteFor(defaultValue);
+    TestcontainersConfiguration(Properties userProperties, Properties classpathProperties, final Map<String, String> environment) {
+        this.userProperties = userProperties;
+        this.classpathProperties = classpathProperties;
+        this.environment = environment;
     }
 
     @Deprecated
     public String getAmbassadorContainerImage() {
-        return getAmbassadorContainerDockerImageName().asCanonicalNameString();
-    }
-
-    @Deprecated
-    public DockerImageName getAmbassadorContainerDockerImageName() {
-        return getImage("ambassador.container.image", "richnorth/ambassador:latest");
+        return getImage(AMBASSADOR_IMAGE).asCanonicalNameString();
     }
 
     @Deprecated
     public String getSocatContainerImage() {
-        return getSocatDockerImageName().asCanonicalNameString();
+        return getImage(SOCAT_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getSocatDockerImageName() {
-        return getImage("socat.container.image", "alpine/socat:latest");
+        return getImage(SOCAT_IMAGE);
     }
 
     @Deprecated
     public String getVncRecordedContainerImage() {
-        return getVncDockerImageName().asCanonicalNameString();
+        return getImage(VNC_RECORDER_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getVncDockerImageName() {
-        return getImage("vncrecorder.container.image", "testcontainers/vnc-recorder:1.1.0");
+        return getImage(VNC_RECORDER_IMAGE);
     }
 
     @Deprecated
     public String getDockerComposeContainerImage() {
-        return getDockerComposeDockerImageName().asCanonicalNameString();
+        return getImage(COMPOSE_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getDockerComposeDockerImageName() {
-        return getImage("compose.container.image", "docker/compose:1.24.1");
+        return getImage(COMPOSE_IMAGE);
     }
 
     @Deprecated
     public String getTinyImage() {
-        return getTinyDockerImageName().asCanonicalNameString();
+        return getImage(ALPINE_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getTinyDockerImageName() {
-        return getImage("tinyimage.container.image", "alpine:3.5");
+        return getImage(ALPINE_IMAGE);
     }
 
     public boolean isRyukPrivileged() {
-        return Boolean.parseBoolean((String) properties.getOrDefault("ryuk.container.privileged", "false"));
+        return Boolean
+            .parseBoolean(getEnvVarOrProperty("ryuk.container.privileged", "false"));
     }
 
     @Deprecated
     public String getRyukImage() {
-        return getRyukDockerImageName().asCanonicalNameString();
+        return getImage(RYUK_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getRyukDockerImageName() {
-        return getImage("ryuk.container.image", "testcontainers/ryuk:0.3.0");
+        return getImage(RYUK_IMAGE);
     }
 
     @Deprecated
     public String getSSHdImage() {
-        return getSSHdDockerImageName().asCanonicalNameString();
+        return getImage(SSHD_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getSSHdDockerImageName() {
-        return getImage("sshd.container.image", "testcontainers/sshd:1.0.0");
+        return getImage(SSHD_IMAGE);
     }
 
     public Integer getRyukTimeout() {
-        return Integer.parseInt((String) properties.getOrDefault("ryuk.container.timeout", "30"));
+        return Integer.parseInt(getEnvVarOrProperty("ryuk.container.timeout", "30"));
     }
 
     @Deprecated
     public String getKafkaImage() {
-        return getKafkaDockerImageName().asCanonicalNameString();
+        return getImage(KAFKA_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getKafkaDockerImageName() {
-        return getImage("kafka.container.image", "confluentinc/cp-kafka");
+        return getImage(KAFKA_IMAGE);
+    }
+
+
+    @Deprecated
+    public String getOracleImage() {
+        return getEnvVarOrUserProperty("oracle.container.image", null);
     }
 
     @Deprecated
     public String getPulsarImage() {
-        return getPulsarDockerImageName().asCanonicalNameString();
+        return getImage(PULSAR_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getPulsarDockerImageName() {
-        return getImage("pulsar.container.image", "apachepulsar/pulsar");
+        return getImage(PULSAR_IMAGE);
     }
 
     @Deprecated
     public String getLocalStackImage() {
-        return getLocalstackDockerImageName().asCanonicalNameString();
+        return getImage(LOCALSTACK_IMAGE).asCanonicalNameString();
     }
 
     public DockerImageName getLocalstackDockerImageName() {
-        return getImage("localstack.container.image", "localstack/localstack");
+        return getImage(LOCALSTACK_IMAGE);
     }
 
+
     public boolean isDisableChecks() {
-        return Boolean.parseBoolean((String) environmentProperties.getOrDefault("checks.disable", "false"));
+        return Boolean.parseBoolean(getEnvVarOrUserProperty("checks.disable", "false"));
     }
 
     @UnstableAPI
     public boolean environmentSupportsReuse() {
-        return Boolean.parseBoolean((String) environmentProperties.getOrDefault("testcontainers.reuse.enable", "false"));
+        // specifically not supported as an environment variable or classpath property
+        return Boolean.parseBoolean(getEnvVarOrUserProperty("testcontainers.reuse.enable", "false"));
     }
 
     public String getDockerClientStrategyClassName() {
-        return (String) environmentProperties.get("docker.client.strategy");
+        return getEnvVarOrUserProperty("docker.client.strategy", null);
     }
 
     public String getTransportType() {
-        return properties.getProperty("transport.type", "okhttp");
+        return getEnvVarOrProperty("transport.type", "okhttp");
     }
 
     public Integer getImagePullPauseTimeout() {
-        return Integer.parseInt((String) properties.getOrDefault("pull.pause.timeout", "30"));
+        return Integer.parseInt(getEnvVarOrProperty("pull.pause.timeout", "30"));
     }
 
-    @Synchronized
+    @Nullable
+    @Contract("_, !null, _ -> !null")
+    private String getConfigurable(@NotNull final String propertyName, @Nullable final String defaultValue, Properties... propertiesSources) {
+        String envVarName = propertyName.replaceAll("\\.", "_").toUpperCase();
+        if (!envVarName.startsWith("TESTCONTAINERS_")) {
+            envVarName = "TESTCONTAINERS_" + envVarName;
+        }
+
+        if (environment.containsKey(envVarName)) {
+            return environment.get(envVarName);
+        }
+
+        for (final Properties properties : propertiesSources) {
+            if (properties.get(propertyName) != null) {
+                return (String) properties.get(propertyName);
+            }
+        }
+
+        return defaultValue;
+    }
+
+    /**
+     * Gets a configured setting from an environment variable (if present) or a configuration file property otherwise.
+     * The configuration file will be the <code>.testcontainers.properties</code> file in the user's home directory or
+     * a <code>testcontainers.properties</code> found on the classpath.
+     *
+     * @param propertyName name of configuration file property (dot-separated lower case)
+     * @return the found value, or null if not set
+     */
+    @Nullable
+    @Contract("_, !null -> !null")
+    public String getEnvVarOrProperty(@NotNull final String propertyName, @Nullable final String defaultValue) {
+        return getConfigurable(propertyName, defaultValue, userProperties, classpathProperties);
+    }
+
+    /**
+     * Gets a configured setting from an environment variable (if present) or a configuration file property otherwise.
+     * The configuration file will be the <code>.testcontainers.properties</code> file in the user's home directory.
+     *
+     * @param propertyName name of configuration file property (dot-separated lower case)
+     * @return the found value, or null if not set
+     */
+    @Nullable
+    @Contract("_, !null -> !null")
+    public String getEnvVarOrUserProperty(@NotNull final String propertyName, @Nullable final String defaultValue) {
+        return getConfigurable(propertyName, defaultValue, userProperties);
+    }
+
+    /**
+     * Gets a configured setting from a the user's configuration file.
+     * The configuration file will be the <code>.testcontainers.properties</code> file in the user's home directory.
+     *
+     * @param propertyName name of configuration file property (dot-separated lower case)
+     * @return the found value, or null if not set
+     */
+    @Nullable
+    @Contract("_, !null -> !null")
+    public String getUserProperty(@NotNull final String propertyName, @Nullable final String defaultValue) {
+        return getConfigurable(propertyName, defaultValue);
+    }
+
+    @Deprecated
+    public Properties getProperties() {
+        return Stream.of(userProperties, classpathProperties)
+            .reduce(new Properties(), (a, b) -> {
+                a.putAll(b);
+                return a;
+            });
+    }
+
+    @Deprecated
     public boolean updateGlobalConfig(@NonNull String prop, @NonNull String value) {
+        return updateUserConfig(prop, value);
+    }
+
+    @Synchronized
+    public boolean updateUserConfig(@NonNull String prop, @NonNull String value) {
         try {
-            if (value.equals(environmentProperties.get(prop))) {
+            if (value.equals(userProperties.get(prop))) {
                 return false;
             }
 
-            environmentProperties.setProperty(prop, value);
+            userProperties.setProperty(prop, value);
 
-            ENVIRONMENT_CONFIG_FILE.createNewFile();
-            try (OutputStream outputStream = new FileOutputStream(ENVIRONMENT_CONFIG_FILE)) {
-                environmentProperties.store(outputStream, "Modified by Testcontainers");
+            USER_CONFIG_FILE.createNewFile();
+            try (OutputStream outputStream = new FileOutputStream(USER_CONFIG_FILE)) {
+                userProperties.store(outputStream, "Modified by Testcontainers");
             }
 
             // Update internal state only if environment config was successfully updated
-            properties.setProperty(prop, value);
+            userProperties.setProperty(prop, value);
             return true;
         } catch (Exception e) {
-            log.debug("Can't store environment property {} in {}", prop, ENVIRONMENT_CONFIG_FILE);
+            log.debug("Can't store environment property {} in {}", prop, USER_CONFIG_FILE);
             return false;
         }
     }
@@ -211,7 +319,7 @@ public boolean updateGlobalConfig(@NonNull String prop, @NonNull String value) {
     @SneakyThrows(MalformedURLException.class)
     private static TestcontainersConfiguration loadConfiguration() {
         return new TestcontainersConfiguration(
-            readProperties(ENVIRONMENT_CONFIG_FILE.toURI().toURL()),
+            readProperties(USER_CONFIG_FILE.toURI().toURL()),
             Stream
                 .of(
                     TestcontainersConfiguration.class.getClassLoader(),
@@ -223,8 +331,8 @@ private static TestcontainersConfiguration loadConfiguration() {
                 .reduce(new Properties(), (a, b) -> {
                     a.putAll(b);
                     return a;
-                })
-        );
+                }),
+            System.getenv());
     }
 
     private static Properties readProperties(URL url) {
@@ -239,4 +347,24 @@ private static Properties readProperties(URL url) {
         }
         return properties;
     }
+
+    private DockerImageName getImage(final String defaultValue) {
+        return getConfiguredSubstituteImage(DockerImageName.parse(defaultValue));
+    }
+
+    DockerImageName getConfiguredSubstituteImage(DockerImageName original) {
+        for (final Map.Entry<DockerImageName, String> entry : CONTAINER_MAPPING.entrySet()) {
+            if (original.isCompatibleWith(entry.getKey())) {
+                return
+                    Optional.ofNullable(entry.getValue())
+                        .map(propertyName -> getEnvVarOrProperty(propertyName, null))
+                        .map(String::valueOf)
+                        .map(String::trim)
+                        .map(DockerImageName::parse)
+                        .orElse(original)
+                        .asCompatibleSubstituteFor(original);
+            }
+        }
+        return original;
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index ccd68fbd984..e48a2a6fdf9 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -1,57 +1,107 @@
 package org.testcontainers.utility;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
-import org.junit.Test;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class TestcontainersConfigurationTest {
 
-    final Properties environmentProperties = new Properties();
+    private Properties userProperties;
+    private Properties classpathProperties;
+    private Map<String, String> environment;
 
-    final Properties classpathProperties = new Properties();
+    @Before
+    public void setUp() {
+        userProperties = new Properties();
+        classpathProperties = new Properties();
+        environment = new HashMap<>();
+    }
 
     @Test
-    public void shouldReadChecksFromEnvironmentOnly() {
+    public void shouldNotReadChecksFromClasspathProperties() {
         assertFalse("checks enabled by default", newConfig().isDisableChecks());
 
         classpathProperties.setProperty("checks.disable", "true");
         assertFalse("checks are not affected by classpath properties", newConfig().isDisableChecks());
+    }
+
+    @Test
+    public void shouldReadChecksFromUserProperties() {
+        assertFalse("checks enabled by default", newConfig().isDisableChecks());
 
-        environmentProperties.setProperty("checks.disable", "true");
-        assertTrue("checks disabled", newConfig().isDisableChecks());
+        userProperties.setProperty("checks.disable", "true");
+        assertTrue("checks disabled via user properties", newConfig().isDisableChecks());
     }
 
     @Test
-    public void shouldReadDockerClientStrategyFromEnvironmentOnly() {
+    public void shouldReadChecksFromEnvironment() {
+        assertFalse("checks enabled by default", newConfig().isDisableChecks());
+
+        userProperties.remove("checks.disable");
+        environment.put("TESTCONTAINERS_CHECKS_DISABLE", "true");
+        assertTrue("checks disabled via env var", newConfig().isDisableChecks());
+    }
+
+    @Test
+    public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
         String currentValue = newConfig().getDockerClientStrategyClassName();
 
         classpathProperties.setProperty("docker.client.strategy", UUID.randomUUID().toString());
         assertEquals("Docker client strategy is not affected by classpath properties", currentValue, newConfig().getDockerClientStrategyClassName());
+    }
+
+    @Test
+    public void shouldReadDockerClientStrategyFromUserProperties() {
+        userProperties.setProperty("docker.client.strategy", "foo");
+        assertEquals("Docker client strategy is changed by user property", "foo", newConfig().getDockerClientStrategyClassName());
+    }
 
-        environmentProperties.setProperty("docker.client.strategy", "foo");
-        assertEquals("Docker client strategy is changed", "foo", newConfig().getDockerClientStrategyClassName());
+    @Test
+    public void shouldReadDockerClientStrategyFromEnvironment() {
+               userProperties.remove("docker.client.strategy");
+        environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "foo");
+        assertEquals("Docker client strategy is changed by env var", "foo", newConfig().getDockerClientStrategyClassName());
     }
 
     @Test
-    public void shouldReadReuseFromEnvironmentOnly() {
+    public void shouldNotReadReuseFromClasspathProperties() {
         assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
 
         classpathProperties.setProperty("testcontainers.reuse.enable", "true");
         assertFalse("reuse is not affected by classpath properties", newConfig().environmentSupportsReuse());
+    }
 
-        environmentProperties.setProperty("testcontainers.reuse.enable", "true");
-        assertTrue("reuse enabled", newConfig().environmentSupportsReuse());
+    @Test
+    public void shouldReadReuseFromUserProperties() {
+        assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
+
+        userProperties.setProperty("testcontainers.reuse.enable", "true");
+        assertTrue("reuse enabled via user property", newConfig().environmentSupportsReuse());
+    }
+    @Test
+    public void shouldReadReuseFromEnvironment() {
+        assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
 
-        environmentProperties.setProperty("ryuk.container.image", " testcontainersofficial/ryuk:0.3.0 ");
-        assertEquals("trailing whitespace was not removed from image name property", "testcontainersofficial/ryuk:0.3.0",newConfig().getRyukDockerImageName().asCanonicalNameString());
+        userProperties.remove("testcontainers.reuse.enable");
+        environment.put("TESTCONTAINERS_REUSE_ENABLE", "true");
+        assertTrue("reuse enabled via env var", newConfig().environmentSupportsReuse());
+    }
 
+    @Test
+    public void shouldTrimImageNames() {
+        userProperties.setProperty("ryuk.container.image", " testcontainersofficial/ryuk:0.3.0 ");
+        assertEquals("trailing whitespace was not removed from image name property", "testcontainersofficial/ryuk:0.3.0",newConfig().getRyukImage());
     }
 
     private TestcontainersConfiguration newConfig() {
-        return new TestcontainersConfiguration(environmentProperties, classpathProperties);
+        return new TestcontainersConfiguration(userProperties, classpathProperties, environment);
     }
 }

From b94da0a425ad404a316363bce3241f07233479f2 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 29 Oct 2020 18:22:06 +0000
Subject: [PATCH 1069/4969] Update sponsors (#3410)

Co-authored-by: Fedor Korotkov <fedor.korotkov@gmail.com>
---
 docs/index.md                      |  61 ++++++++++++++++++++---------
 docs/sponsor_logos/cirrus_labs.jpg | Bin 0 -> 3204 bytes
 docs/sponsor_logos/jooq.jpg        | Bin 0 -> 3559 bytes
 docs/sponsor_logos/vivy.png        | Bin 0 -> 4170 bytes
 4 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 docs/sponsor_logos/cirrus_labs.jpg
 create mode 100644 docs/sponsor_logos/jooq.jpg
 create mode 100644 docs/sponsor_logos/vivy.png

diff --git a/docs/index.md b/docs/index.md
index 131a9074bfd..28ca2453993 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -90,6 +90,48 @@ testImplementation('org.testcontainers:mysql') //no version specified
     These libraries in particular seem to be especially prone to conflicts with test code/application under test code. 
     As such, **these libraries are 'shaded' into the core testcontainers JAR** and relocated under `org.testcontainers.shaded` to prevent class conflicts.
 
+## Sponsors
+
+Testcontainers is on Github Sponsors! Please consider sponsoring us to sustain the project and help us improve it further.
+
+<iframe src="https://github.com/sponsors/testcontainers/button" title="Sponsor Testcontainers" height="35" width="107" style="border: 0;"></iframe>
+
+A huge thank you to our sponsors:
+
+### Bronze sponsors
+
+<div style="text-align:center; max-width: 128px; display: inline-block; margin: 5px;">
+    <a href="https://cirrus-ci.org/">
+        <img src="sponsor_logos/cirrus_labs.jpg" style="width: 100%"/>
+        <p>Cirrus CI</p>
+        <!-- via fkorotkov's sponsorship -->
+    </a>
+</div>
+
+<div style="text-align:center; max-width: 128px; display: inline-block; margin: 5px;">
+    <a href="https://vivy.com">
+        <img src="sponsor_logos/vivy.png" style="width: 100%"/>
+        <p>Vivy</p>
+    </a>
+</div>
+
+<div style="text-align:center; max-width: 128px; display: inline-block; margin: 5px;">
+    <a href="https://www.jooq.org/">
+        <img src="sponsor_logos/jooq.jpg" style="width: 100%"/>
+        <p>jOOQ</p>
+    </a>
+</div>
+
+### Backers
+
+* [Philip Riecks (@rieckpil)](https://github.com/rieckpil)
+* [Karl Heinz Marbaise (@khmarbaise)](https://github.com/khmarbaise)
+* [Sascha Frinken (@sascha-frinken)](https://github.com/sascha-frinken)
+* [Christoph Dreis (@dreis2211)](https://github.com/dreis2211)
+* [Pascal Zwick (@pas2al)](https://github.com/pas2al)
+* [Nikita Zhevnitskiy (@zhenik)](https://github.com/zhenik)
+* [Bas Stoker (@bastoker)](https://github.com/bastoker)
+
 ## Who is using Testcontainers?
 
 * [ZeroTurnaround](https://zeroturnaround.com) - Testing of the Java Agents, micro-services, Selenium browser automation
@@ -121,25 +163,6 @@ testImplementation('org.testcontainers:mysql') //no version specified
 * [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
 * [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS
 
-## Sponsors
-
-Testcontainers is on Github Sponsors! Please consider sponsoring us to sustain the project and help us improve it further.
-
-<iframe src="https://github.com/sponsors/testcontainers/button" title="Sponsor Testcontainers" height="35" width="107" style="border: 0;"></iframe>
-
-### Backers
-
-A huge thank you to our backers:
-
-* [Philip Riecks (@rieckpil)](https://github.com/rieckpil)
-* [Karl Heinz Marbaise (@khmarbaise)](https://github.com/khmarbaise)
-* [Sascha Frinken (@sascha-frinken)](https://github.com/sascha-frinken)
-* [Lukas Eder (@lukaseder)](https://github.com/lukaseder)
-* [Fedor Korotkov (@fkorotkov)](https://github.com/fkorotkov)
-* [Christoph Dreis (@dreis2211)](https://github.com/dreis2211)
-* [Pascal Zwick (@pas2al)](https://github.com/pas2al)
-* [Nikita Zhevnitskiy (@zhenik)](https://github.com/zhenik)
-
 
 ## License
 
diff --git a/docs/sponsor_logos/cirrus_labs.jpg b/docs/sponsor_logos/cirrus_labs.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3bec84f0a22693cde05118fa3c241ed9e89cf389
GIT binary patch
literal 3204
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
CQQ(vS

literal 0
HcmV?d00001

diff --git a/docs/sponsor_logos/jooq.jpg b/docs/sponsor_logos/jooq.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7a64f773d615adaa24276c8e47bdd6da063f7b2e
GIT binary patch
literal 3559
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

literal 0
HcmV?d00001

diff --git a/docs/sponsor_logos/vivy.png b/docs/sponsor_logos/vivy.png
new file mode 100644
index 0000000000000000000000000000000000000000..2faa4742dd1c90956794ea1e0b06471cc35dfd13
GIT binary patch
literal 4170
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

literal 0
HcmV?d00001


From 0ac96892fbd9fa91e586658338ef2d22cb5db294 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Fri, 30 Oct 2020 17:23:16 +0100
Subject: [PATCH 1070/4969] Presto: Bump default Presto version (used in
 deprecated constructor and unversioned JDBC URL) from 329 to 344 (#3312)

---
 docs/modules/databases/jdbc.md                                | 2 +-
 .../java/org/testcontainers/containers/PrestoContainer.java   | 2 +-
 .../src/test/java/org/testcontainers/PrestoTestImages.java    | 4 ++--
 .../org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 21393455a9f..65db9aaf07f 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -41,7 +41,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using Presto
 
-`jdbc:tc:presto:329://localhost/memory/default`
+`jdbc:tc:presto:344://localhost/memory/default`
 
 ### Using a classpath init script
 
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index e4934693d14..54cc6758562 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -18,7 +18,7 @@ public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDat
     public static final String NAME = "presto";
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("prestosql/presto");
     public static final String IMAGE = "prestosql/presto";
-    public static final String DEFAULT_TAG = "329";
+    public static final String DEFAULT_TAG = "344";
 
     public static final Integer PRESTO_PORT = 8080;
 
diff --git a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
index 1b4e449c99f..a257500576c 100644
--- a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
+++ b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
@@ -3,6 +3,6 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface PrestoTestImages {
-    DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("prestosql/presto:329");
-    DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("prestosql/presto:328");
+    DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("prestosql/presto:344");
+    DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("prestosql/presto:343");
 }
diff --git a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
index 88939c62939..d1a64c92aaa 100644
--- a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
@@ -15,7 +15,7 @@ public class PrestoJDBCDriverTest extends AbstractJDBCDriverTest {
     public static Iterable<Object[]> data() {
         return asList(
             new Object[][]{
-                {"jdbc:tc:presto:329://hostname/", EnumSet.of(Options.PmdKnownBroken)},
+                {"jdbc:tc:presto:344://hostname/", EnumSet.of(Options.PmdKnownBroken)},
             });
     }
 }

From e64db24003e05a642b5f3d8ce0cb084fc6ac7adb Mon Sep 17 00:00:00 2001
From: Or Noyman <or.s.noyman@jpmchase.com>
Date: Fri, 30 Oct 2020 18:23:55 +0200
Subject: [PATCH 1071/4969] Vault: add a fluent API for configuring Vault's
 logging level (#2231)

---
 .../org/testcontainers/vault/VaultContainer.java   | 12 ++++++++++++
 .../org/testcontainers/vault/VaultLogLevel.java    | 14 ++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java

diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index b0c8a2a40e3..f47818d8c7d 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -10,6 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import static com.github.dockerjava.api.model.Capability.IPC_LOCK;
 
@@ -106,6 +107,17 @@ public SELF withVaultPort(int port) {
         return self();
     }
 
+    /**
+     * Sets the logging level for the Vault server in the container.
+     * Logs can be consumed through {@link #withLogConsumer(Consumer)}.
+     *
+     * @param level the logging level to set for Vault.
+     * @return this
+     */
+    public SELF withLogLevel(VaultLogLevel level) {
+        return withEnv("VAULT_LOG_LEVEL", level.config);
+    }
+
     /**
      * Pre-loads secrets into Vault container. User may specify one or more secrets and all will be added to each path
      * that is specified. Thus this can be called more than once for multiple paths to be added to Vault.
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java
new file mode 100644
index 00000000000..58b22f975ff
--- /dev/null
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java
@@ -0,0 +1,14 @@
+package org.testcontainers.vault;
+
+/**
+ * Vault preset of logging levels.
+ */
+public enum VaultLogLevel {
+    Trace("trace"), Debug("debug"), Info("info"), Warn("warn"), Error("err");
+
+    public final String config;
+
+    VaultLogLevel(String config) {
+        this.config = config;
+    }
+}

From 30c29905babb9fb394be697f2c576be9756a71e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Oct 2020 16:25:54 +0000
Subject: [PATCH 1072/4969] Bump assertj-core from 3.17.2 to 3.18.0 in
 /modules/vault (#3384)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 6d862eeba2c..caddc81d3a7 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.1'
-    testCompile 'org.assertj:assertj-core:3.17.2'
+    testCompile 'org.assertj:assertj-core:3.18.0'
 
 }

From f9f2c8369d4af951197bcbde0bf70397613f4d05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Oct 2020 16:26:09 +0000
Subject: [PATCH 1073/4969] Bump assertj-core from 3.17.2 to 3.18.0 in
 /modules/neo4j (#3385)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index da90a493a01..8d7f59e564e 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.17.2'
+    testCompile 'org.assertj:assertj-core:3.18.0'
 }

From 4ec423484658eabc1b60f6b66c36005c7e36e7b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Oct 2020 16:26:31 +0000
Subject: [PATCH 1074/4969] Bump assertj-core from 3.17.2 to 3.18.0 in
 /modules/junit-jupiter (#3386)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 61594d9842b..321ac8fa82e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.5.13') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.17.2'
+    testCompile 'org.assertj:assertj-core:3.18.0'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.18'

From 6107d553d7fd74d97af2da9220d43ddee0834a8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Oct 2020 16:26:46 +0000
Subject: [PATCH 1075/4969] Bump mockito-core from 3.5.13 to 3.5.15 in
 /modules/junit-jupiter (#3387)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.13 to 3.5.15.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.13...v3.5.15)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 321ac8fa82e..7986c067c89 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.13'
-    testCompile ('org.mockito:mockito-core:3.5.13') {
+    testCompile ('org.mockito:mockito-core:3.5.15') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.18.0'

From ef899a2ce5c43b890ab26ef32e4f7a33959ed4e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 31 Oct 2020 09:59:52 +0000
Subject: [PATCH 1076/4969] Bump s3 from 2.15.9 to 2.15.14 in
 /modules/localstack (#3388)

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 418344b82f2..908f87de07d 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.880'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.884'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.15.9'
+    testCompile 'software.amazon.awssdk:s3:2.15.14'
 }

From 8d1a723617aecda6040bcc9201fb009c2dd9fff9 Mon Sep 17 00:00:00 2001
From: Kirill Artamonov <artamonov.kirill@gmail.com>
Date: Sat, 31 Oct 2020 15:39:45 +0100
Subject: [PATCH 1077/4969] Bump Python mkdocs tool dependency to address
 CVE-2019-10906 (#3379)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 Pipfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 852b507f886..899f8c82170 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -28,7 +28,7 @@
                 "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
                 "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
             ],
-            "version": "==2.10"
+            "version": "==2.11.2"
         },
         "livereload": {
             "hashes": [

From 44e8e9ab279cad2cd9d0c9fc5bb6e7799c409999 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Nov 2020 19:19:08 +0000
Subject: [PATCH 1078/4969] Image substitution (#3102)

* Refactor Testcontainers configuration to allow config by env var

* Add Image substitution mechanism

Builds upon #3021 and #3411:

* adds a pluggable image substitution mechanism using ServiceLoader, enabling users to perform custom substitution/auditing of images being used by their tests

* provides a default implementation that behaves similarly to legacy `TestcontainersConfiguration` approach (`testcontainers.properties`)

Notes:

* behaviour is similar but not quite identical to `TestcontainersConfiguration`: use of a configured custom image for, e.g. Kafka/Pulsar that does not have a tag specified causes the substitution to take effect for all usages. It seems very unlikely that people would be using a mix of the config file image overrides in some places _and_ specific images specified in code in others.

* Duplication of default image names in modules vs `TestcontainersConfiguration` class is intentional: specifying image overrides in `testcontainers.properties` should be removed in the future.

* ~Add log deprecation warnings when `testcontainers.properties` image overrides are used.~ Defer to a future release?

* Remove extraneous change

* Un-ignore docs example test by implementing a 'reversing' image name substitutor

* Use configuration, not service loader, to select an ImageNameSubstitutor

* Add check for order of config setting precedence

* Extract classpath scanner and support finding of multiple resources

* Introduce deterministic merging of classpath properties files

* Update docs

* Update docs

* Remove service loader reference

* Chain substitution through default and configured implementations

* Small tweaks following review

* Fix test compile error

* Add UnstableAPI annotation

* Move TestSpecificImageNameSubstitutor back to original package and remove duplicate use of default substitutor
---
 .../testcontainers/DockerClientFactory.java   |  11 +-
 .../containers/DockerComposeContainer.java    |   5 +-
 .../containers/GenericContainer.java          |   6 +-
 .../containers/PortForwardingContainer.java   |   6 +-
 .../containers/SocatContainer.java            |   8 +-
 .../containers/VncRecordingContainer.java     |   4 +-
 .../DockerClientProviderStrategy.java         |   2 +-
 .../images/RemoteDockerImage.java             |  10 +-
 .../utility/ClasspathScanner.java             |  59 ++++++++
 ...ConfigurationFileImageNameSubstitutor.java |  44 ++++++
 .../utility/DefaultImageNameSubstitutor.java  |  35 +++++
 .../utility/ImageNameSubstitutor.java         | 130 ++++++++++++++++++
 .../utility/ResourceReaper.java               |   4 +-
 .../utility/TestcontainersConfiguration.java  |  68 +++------
 .../DockerClientFactoryTest.java              |   9 +-
 .../java/org/testcontainers/TestImages.java   |   3 +-
 .../utility/AuthenticatedImagePullTest.java   |  26 ++--
 .../utility/ClasspathScannerTest.java         | 114 +++++++++++++++
 .../DefaultImageNameSubstitutorTest.java      |  38 +++++
 .../DockerImageNameCompatibilityTest.java     |   3 +-
 .../utility/FakeImageSubstitutor.java         |  13 ++
 .../utility/ImageNameSubstitutorTest.java     |  75 ++++++++++
 .../TestcontainersConfigurationTest.java      |  63 +++++++++
 .../test/resources/expectedClasspathFile.txt  |   1 +
 docs/examples/junit4/generic/build.gradle     |   3 +
 .../generic/ExampleImageNameSubstitutor.java  |  24 ++++
 .../generic/ImageNameSubstitutionTest.java    |  48 +++++++
 .../TestSpecificImageNameSubstitutor.java     |  26 ++++
 .../src/test/resources/logback-test.xml       |  14 ++
 .../test/resources/testcontainers.properties  |   1 +
 docs/features/configuration.md                |  45 ++++--
 docs/features/image_name_substitution.md      | 117 ++++++++++++++++
 docs/features/pull_rate_limiting.md           |  19 +++
 .../containers/KafkaContainer.java            |   5 +-
 .../containers/KafkaContainerTest.java        |   2 +-
 .../localstack/LocalStackContainer.java       |   5 +-
 .../containers/OracleContainer.java           |   3 +-
 .../containers/PulsarContainer.java           |   5 +-
 .../spock/SpockTestImages.groovy              |   5 +-
 39 files changed, 936 insertions(+), 123 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/utility/ClasspathScanner.java
 create mode 100644 core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java
 create mode 100644 core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
 create mode 100644 core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
 create mode 100644 core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
 create mode 100644 core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
 create mode 100644 core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java
 create mode 100644 core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
 create mode 100644 core/src/test/resources/expectedClasspathFile.txt
 create mode 100644 docs/examples/junit4/generic/src/test/java/generic/ExampleImageNameSubstitutor.java
 create mode 100644 docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
 create mode 100644 docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
 create mode 100644 docs/examples/junit4/generic/src/test/resources/logback-test.xml
 create mode 100644 docs/examples/junit4/generic/src/test/resources/testcontainers.properties
 create mode 100644 docs/features/image_name_substitution.md
 create mode 100644 docs/features/pull_rate_limiting.md

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 571b18fbcce..d44cd3b5b6f 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -25,6 +25,8 @@
 import org.testcontainers.dockerclient.TransportConfig;
 import org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback;
 import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.ImageNameSubstitutor;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.ResourceReaper;
 import org.testcontainers.utility.TestcontainersConfiguration;
@@ -61,7 +63,7 @@ public class DockerClientFactory {
             TESTCONTAINERS_SESSION_ID_LABEL, SESSION_ID
     );
 
-    private static final String TINY_IMAGE = TestcontainersConfiguration.getInstance().getTinyDockerImageName().asCanonicalNameString();
+    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.5");
     private static DockerClientFactory instance;
 
     // Cached client configuration
@@ -343,8 +345,11 @@ public <T> T runInsideDocker(Consumer<CreateContainerCmd> createContainerCmdCons
     }
 
     private <T> T runInsideDocker(DockerClient client, Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
-        checkAndPullImage(client, TINY_IMAGE);
-        CreateContainerCmd createContainerCmd = client.createContainerCmd(TINY_IMAGE)
+
+        final String tinyImage = ImageNameSubstitutor.instance().apply(TINY_IMAGE).asCanonicalNameString();
+
+        checkAndPullImage(client, tinyImage);
+        CreateContainerCmd createContainerCmd = client.createContainerCmd(tinyImage)
                 .withLabels(DEFAULT_LABELS);
         createContainerCmdConsumer.accept(createContainerCmd);
         String id = createContainerCmd.exec().getId();
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index bd06083644d..7a67073e383 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -29,11 +29,11 @@
 import org.testcontainers.utility.AuditLogger;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.LogUtils;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.ResourceReaper;
-import org.testcontainers.utility.TestcontainersConfiguration;
 import org.zeroturnaround.exec.InvalidExitValueException;
 import org.zeroturnaround.exec.ProcessExecutor;
 import org.zeroturnaround.exec.stream.slf4j.Slf4jStream;
@@ -608,10 +608,11 @@ interface DockerCompose {
 class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
 
     public static final char UNIX_PATH_SEPERATOR = ':';
+    public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.24.1");
 
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
 
-        super(TestcontainersConfiguration.getInstance().getDockerComposeDockerImageName());
+        super(DEFAULT_IMAGE_NAME);
         addEnv(ENV_PROJECT_NAME, identifier);
 
         // Map the docker compose file into the container
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 95050d8f8ee..641096a0779 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -239,13 +239,9 @@ public GenericContainer(@NonNull final RemoteDockerImage image) {
      */
     @Deprecated
     public GenericContainer() {
-        this(TestcontainersConfiguration.getInstance().getTinyDockerImageName().asCanonicalNameString());
+        this(TestcontainersConfiguration.getInstance().getTinyImage());
     }
 
-    /**
-     * @deprecated use {@link GenericContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public GenericContainer(@NonNull final String dockerImageName) {
         this.setDockerImageName(dockerImageName);
     }
diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index e42f2681675..b3f020500a1 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -5,15 +5,15 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.SneakyThrows;
-import org.testcontainers.utility.TestcontainersConfiguration;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.util.AbstractMap;
 import java.util.Collections;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 public enum PortForwardingContainer {
@@ -29,7 +29,7 @@ public enum PortForwardingContainer {
     @SneakyThrows
     private Connection createSSHSession() {
         String password = UUID.randomUUID().toString();
-        container = new GenericContainer<>(TestcontainersConfiguration.getInstance().getSSHdDockerImageName())
+        container = new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.0.0"))
             .withExposedPorts(22)
             .withEnv("PASSWORD", password)
             .withCommand(
diff --git a/core/src/main/java/org/testcontainers/containers/SocatContainer.java b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
index fbca73eb29d..7592d9f4d1f 100644
--- a/core/src/main/java/org/testcontainers/containers/SocatContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
@@ -1,12 +1,10 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.utility.Base58;
-import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.TestcontainersConfiguration;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * A socat container is used as a TCP proxy, enabling any TCP port of another container to be exposed
@@ -17,7 +15,7 @@ public class SocatContainer extends GenericContainer<SocatContainer> {
     private final Map<Integer, String> targets = new HashMap<>();
 
     public SocatContainer() {
-        this(TestcontainersConfiguration.getInstance().getSocatDockerImageName());
+        this(DockerImageName.parse("alpine/socat:1.7.3.4-r0"));
     }
 
     public SocatContainer(final DockerImageName dockerImageName) {
diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index 8ac060c2af6..de720110a51 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -6,7 +6,7 @@
 import lombok.ToString;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-import org.testcontainers.utility.TestcontainersConfiguration;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.io.InputStream;
@@ -52,7 +52,7 @@ public VncRecordingContainer(@NonNull GenericContainer<?> targetContainer) {
      * Create a sidekick container and attach it to another container. The VNC output of that container will be recorded.
      */
     public VncRecordingContainer(@NonNull Network network, @NonNull String targetNetworkAlias) throws IllegalStateException {
-        super(TestcontainersConfiguration.getInstance().getVncDockerImageName());
+        super(DockerImageName.parse("testcontainers/vnc-recorder:1.1.0"));
 
         this.targetNetworkAlias = targetNetworkAlias;
         withNetwork(network);
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index e21c75a581d..1bd51da1263 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -171,7 +171,7 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                         }
 
                         if (strategy.isPersistable()) {
-                            TestcontainersConfiguration.getInstance().updateGlobalConfig("docker.client.strategy", strategy.getClass().getName());
+                            TestcontainersConfiguration.getInstance().updateUserConfig("docker.client.strategy", strategy.getClass().getName());
                         }
 
                         return Stream.of(strategy);
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 8d3a77c5680..f4b04712913 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -15,6 +15,7 @@
 import org.testcontainers.containers.ContainerFetchException;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
+import org.testcontainers.utility.ImageNameSubstitutor;
 import org.testcontainers.utility.LazyFuture;
 
 import java.time.Duration;
@@ -44,12 +45,12 @@ public RemoteDockerImage(DockerImageName dockerImageName) {
 
     @Deprecated
     public RemoteDockerImage(String dockerImageName) {
-        this.imageNameFuture = CompletableFuture.completedFuture(DockerImageName.parse(dockerImageName));
+        this(DockerImageName.parse(dockerImageName));
     }
 
     @Deprecated
     public RemoteDockerImage(@NonNull String repository, @NonNull String tag) {
-        this.imageNameFuture = CompletableFuture.completedFuture(DockerImageName.parse(repository).withTag(tag));
+        this(DockerImageName.parse(repository).withTag(tag));
     }
 
     public RemoteDockerImage(@NonNull Future<String> imageFuture) {
@@ -100,7 +101,10 @@ protected final String resolve() {
     }
 
     private DockerImageName getImageName() throws InterruptedException, ExecutionException {
-        return imageNameFuture.get();
+        final DockerImageName specifiedImageName = imageNameFuture.get();
+
+        // Allow the image name to be substituted
+        return ImageNameSubstitutor.instance().apply(specifiedImageName);
     }
 
     @ToString.Include(name = "imageName", rank = 1)
diff --git a/core/src/main/java/org/testcontainers/utility/ClasspathScanner.java b/core/src/main/java/org/testcontainers/utility/ClasspathScanner.java
new file mode 100644
index 00000000000..76716cfdb7c
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/ClasspathScanner.java
@@ -0,0 +1,59 @@
+package org.testcontainers.utility;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.VisibleForTesting;
+
+import java.net.URL;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+/**
+ * Utility for identifying resource files on classloaders.
+ */
+@Slf4j
+class ClasspathScanner {
+
+    @VisibleForTesting
+    static Stream<URL> scanFor(final String name, ClassLoader... classLoaders) {
+        return Stream
+            .of(classLoaders)
+            .flatMap(classLoader -> getAllPropertyFilesOnClassloader(classLoader, name))
+            .filter(Objects::nonNull)
+            .sorted(
+                Comparator
+                    .comparing(ClasspathScanner::filesFileSchemeFirst) // resolve 'local' files first
+                    .thenComparing(URL::toString) // sort alphabetically for the sake of determinism
+            )
+            .distinct();
+    }
+
+    private static Integer filesFileSchemeFirst(final URL t) {
+        return t.getProtocol().equals("file") ? 0 : 1;
+    }
+
+    /**
+     * @param name the resource name to search for
+     * @return distinct, ordered stream of resources found by searching this class' classloader and the current thread's
+     * context classloader. Results are currently alphabetically sorted.
+     */
+    static Stream<URL> scanFor(final String name) {
+        return scanFor(
+            name,
+            ClasspathScanner.class.getClassLoader(),
+            Thread.currentThread().getContextClassLoader()
+        );
+    }
+
+    @Nullable
+    private static Stream<URL> getAllPropertyFilesOnClassloader(final ClassLoader it, final String s) {
+        try {
+            return Collections.list(it.getResources(s)).stream();
+        } catch (Exception e) {
+            log.error("Unable to read configuration from classloader {} - this is probably a bug", it, e);
+            return Stream.empty();
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java
new file mode 100644
index 00000000000..530d5a76118
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java
@@ -0,0 +1,44 @@
+package org.testcontainers.utility;
+
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * {@link ImageNameSubstitutor} which takes replacement image names from configuration.
+ * See {@link TestcontainersConfiguration} for the subset of image names which can be substituted using this mechanism.
+ */
+@Slf4j
+final class ConfigurationFileImageNameSubstitutor extends ImageNameSubstitutor {
+
+    private final TestcontainersConfiguration configuration;
+
+    public ConfigurationFileImageNameSubstitutor() {
+        this(TestcontainersConfiguration.getInstance());
+    }
+
+    @VisibleForTesting
+    ConfigurationFileImageNameSubstitutor(TestcontainersConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    @Override
+    public DockerImageName apply(final DockerImageName original) {
+        final DockerImageName result = configuration
+            .getConfiguredSubstituteImage(original)
+            .asCompatibleSubstituteFor(original);
+
+        if (!result.equals(original)) {
+            log.warn("Image name {} was substituted by configuration to {}. This approach is deprecated and will be removed in the future",
+                original,
+                result
+            );
+        }
+
+        return result;
+    }
+
+    @Override
+    protected String getDescription() {
+        return getClass().getSimpleName();
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
new file mode 100644
index 00000000000..bcc7c96ba18
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
@@ -0,0 +1,35 @@
+package org.testcontainers.utility;
+
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Testcontainers' default implementation of {@link ImageNameSubstitutor}.
+ * Delegates to {@link ConfigurationFileImageNameSubstitutor}.
+ */
+@Slf4j
+final class DefaultImageNameSubstitutor extends ImageNameSubstitutor {
+
+    private final ConfigurationFileImageNameSubstitutor configurationFileImageNameSubstitutor;
+
+    public DefaultImageNameSubstitutor() {
+        configurationFileImageNameSubstitutor = new ConfigurationFileImageNameSubstitutor();
+    }
+
+    @VisibleForTesting
+    DefaultImageNameSubstitutor(
+        final ConfigurationFileImageNameSubstitutor configurationFileImageNameSubstitutor
+    ) {
+        this.configurationFileImageNameSubstitutor = configurationFileImageNameSubstitutor;
+    }
+
+    @Override
+    public DockerImageName apply(final DockerImageName original) {
+        return configurationFileImageNameSubstitutor.apply(original);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "DefaultImageNameSubstitutor (" + configurationFileImageNameSubstitutor.getDescription() + ")";
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
new file mode 100644
index 00000000000..645b717a562
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
@@ -0,0 +1,130 @@
+package org.testcontainers.utility;
+
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.UnstableAPI;
+
+import java.util.function.Function;
+
+/**
+ * An image name substitutor converts a Docker image name, as may be specified in code, to an alternative name.
+ * This is intended to provide a way to override image names, for example to enforce pulling of images from a private
+ * registry.
+ * <p>
+ * This is marked as @{@link UnstableAPI} as this API is new. While we do not think major changes will be required, we
+ * will react to feedback if necessary.
+ */
+@Slf4j
+@UnstableAPI
+public abstract class ImageNameSubstitutor implements Function<DockerImageName, DockerImageName> {
+
+    @VisibleForTesting
+    static ImageNameSubstitutor instance;
+
+    @VisibleForTesting
+    static ImageNameSubstitutor defaultImplementation = new DefaultImageNameSubstitutor();
+
+    public synchronized static ImageNameSubstitutor instance() {
+        if (instance == null) {
+            final String configuredClassName = TestcontainersConfiguration.getInstance().getImageSubstitutorClassName();
+
+            if (configuredClassName != null) {
+                log.debug("Attempting to instantiate an ImageNameSubstitutor with class: {}", configuredClassName);
+                ImageNameSubstitutor configuredInstance;
+                try {
+                    configuredInstance = (ImageNameSubstitutor) Class.forName(configuredClassName).getConstructor().newInstance();
+                } catch (Exception e) {
+                    throw new IllegalArgumentException("Configured Image Substitutor could not be loaded: " + configuredClassName, e);
+                }
+
+                log.info("Found configured ImageNameSubstitutor: {}", configuredInstance.getDescription());
+
+                instance = new ChainedImageNameSubstitutor(
+                    wrapWithLogging(defaultImplementation),
+                    wrapWithLogging(configuredInstance)
+                );
+            } else {
+                instance = wrapWithLogging(defaultImplementation);
+            }
+
+            log.info("Image name substitution will be performed by: {}", instance.getDescription());
+        }
+
+        return instance;
+    }
+
+    private static ImageNameSubstitutor wrapWithLogging(final ImageNameSubstitutor wrappedInstance) {
+        return new LogWrappedImageNameSubstitutor(wrappedInstance);
+    }
+
+    /**
+     * Substitute a {@link DockerImageName} for another, for example to replace a generic Docker Hub image name with a
+     * private registry copy of the image.
+     *
+     * @param original original name to be replaced
+     * @return a replacement name, or the original, as appropriate
+     */
+    public abstract DockerImageName apply(DockerImageName original);
+
+    /**
+     * @return a human-readable description of the substitutor
+     */
+    protected abstract String getDescription();
+
+    /**
+     * Wrapper substitutor which logs which substitutions have been performed.
+     */
+    static class LogWrappedImageNameSubstitutor extends ImageNameSubstitutor {
+        @VisibleForTesting
+        final ImageNameSubstitutor wrappedInstance;
+
+        public LogWrappedImageNameSubstitutor(final ImageNameSubstitutor wrappedInstance) {
+            this.wrappedInstance = wrappedInstance;
+        }
+
+        @Override
+        public DockerImageName apply(final DockerImageName original) {
+            final DockerImageName replacementImage = wrappedInstance.apply(original);
+
+            if (!replacementImage.equals(original)) {
+                log.info("Using {} as a substitute image for {} (using image substitutor: {})", replacementImage.asCanonicalNameString(), original.asCanonicalNameString(), wrappedInstance.getDescription());
+                return replacementImage;
+            } else {
+                log.debug("Did not find a substitute image for {} (using image substitutor: {})", original.asCanonicalNameString(), wrappedInstance.getDescription());
+                return original;
+            }
+        }
+
+        @Override
+        protected String getDescription() {
+            return wrappedInstance.getDescription();
+        }
+    }
+
+    /**
+     * Wrapper substitutor that passes the original image name through a default substitutor and then the configured one
+     */
+    static class ChainedImageNameSubstitutor extends ImageNameSubstitutor {
+        private final ImageNameSubstitutor defaultInstance;
+        private final ImageNameSubstitutor configuredInstance;
+
+        public ChainedImageNameSubstitutor(ImageNameSubstitutor defaultInstance, ImageNameSubstitutor configuredInstance) {
+            this.defaultInstance = defaultInstance;
+            this.configuredInstance = configuredInstance;
+        }
+
+        @Override
+        public DockerImageName apply(DockerImageName original) {
+            return defaultInstance.andThen(configuredInstance).apply(original);
+        }
+
+        @Override
+        protected String getDescription() {
+            return String.format(
+                "Chained substitutor of '%s' and then '%s'",
+                defaultInstance.getDescription(),
+                configuredInstance.getDescription()
+            );
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index c37e6660654..3b0cfa1e289 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -72,7 +72,9 @@ private ResourceReaper() {
 
     @SneakyThrows(InterruptedException.class)
     public static String start(String hostIpAddress, DockerClient client) {
-        String ryukImage = TestcontainersConfiguration.getInstance().getRyukDockerImageName().asCanonicalNameString();
+        String ryukImage = ImageNameSubstitutor.instance()
+            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.0"))
+            .asCanonicalNameString();
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
         List<Bind> binds = new ArrayList<>();
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index b3c8e88a328..987301fbfb9 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -23,7 +23,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
@@ -104,37 +103,21 @@ public String getSocatContainerImage() {
         return getImage(SOCAT_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getSocatDockerImageName() {
-        return getImage(SOCAT_IMAGE);
-    }
-
     @Deprecated
     public String getVncRecordedContainerImage() {
         return getImage(VNC_RECORDER_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getVncDockerImageName() {
-        return getImage(VNC_RECORDER_IMAGE);
-    }
-
     @Deprecated
     public String getDockerComposeContainerImage() {
         return getImage(COMPOSE_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getDockerComposeDockerImageName() {
-        return getImage(COMPOSE_IMAGE);
-    }
-
     @Deprecated
     public String getTinyImage() {
         return getImage(ALPINE_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getTinyDockerImageName() {
-        return getImage(ALPINE_IMAGE);
-    }
-
     public boolean isRyukPrivileged() {
         return Boolean
             .parseBoolean(getEnvVarOrProperty("ryuk.container.privileged", "false"));
@@ -145,19 +128,11 @@ public String getRyukImage() {
         return getImage(RYUK_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getRyukDockerImageName() {
-        return getImage(RYUK_IMAGE);
-    }
-
     @Deprecated
     public String getSSHdImage() {
         return getImage(SSHD_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getSSHdDockerImageName() {
-        return getImage(SSHD_IMAGE);
-    }
-
     public Integer getRyukTimeout() {
         return Integer.parseInt(getEnvVarOrProperty("ryuk.container.timeout", "30"));
     }
@@ -167,11 +142,6 @@ public String getKafkaImage() {
         return getImage(KAFKA_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getKafkaDockerImageName() {
-        return getImage(KAFKA_IMAGE);
-    }
-
-
     @Deprecated
     public String getOracleImage() {
         return getEnvVarOrUserProperty("oracle.container.image", null);
@@ -182,20 +152,11 @@ public String getPulsarImage() {
         return getImage(PULSAR_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getPulsarDockerImageName() {
-        return getImage(PULSAR_IMAGE);
-    }
-
     @Deprecated
     public String getLocalStackImage() {
         return getImage(LOCALSTACK_IMAGE).asCanonicalNameString();
     }
 
-    public DockerImageName getLocalstackDockerImageName() {
-        return getImage(LOCALSTACK_IMAGE);
-    }
-
-
     public boolean isDisableChecks() {
         return Boolean.parseBoolean(getEnvVarOrUserProperty("checks.disable", "false"));
     }
@@ -218,6 +179,10 @@ public Integer getImagePullPauseTimeout() {
         return Integer.parseInt(getEnvVarOrProperty("pull.pause.timeout", "30"));
     }
 
+    public String getImageSubstitutorClassName() {
+        return getEnvVarOrProperty("image.substitutor", null);
+    }
+
     @Nullable
     @Contract("_, !null, _ -> !null")
     private String getConfigurable(@NotNull final String propertyName, @Nullable final String defaultValue, Properties... propertiesSources) {
@@ -279,6 +244,13 @@ public String getUserProperty(@NotNull final String propertyName, @Nullable fina
         return getConfigurable(propertyName, defaultValue);
     }
 
+    /**
+     * @return properties values available from user properties and classpath properties. Values set by environment
+     * variable are NOT included.
+     * @deprecated usages should be removed ASAP. See {@link TestcontainersConfiguration#getEnvVarOrProperty(String, String)},
+     * {@link TestcontainersConfiguration#getEnvVarOrUserProperty(String, String)} or {@link TestcontainersConfiguration#getUserProperty(String, String)}
+     * for suitable replacements.
+     */
     @Deprecated
     public Properties getProperties() {
         return Stream.of(userProperties, classpathProperties)
@@ -320,17 +292,13 @@ public boolean updateUserConfig(@NonNull String prop, @NonNull String value) {
     private static TestcontainersConfiguration loadConfiguration() {
         return new TestcontainersConfiguration(
             readProperties(USER_CONFIG_FILE.toURI().toURL()),
-            Stream
-                .of(
-                    TestcontainersConfiguration.class.getClassLoader(),
-                    Thread.currentThread().getContextClassLoader()
-                )
-                .map(it -> it.getResource(PROPERTIES_FILE_NAME))
-                .filter(Objects::nonNull)
+            ClasspathScanner.scanFor(PROPERTIES_FILE_NAME)
                 .map(TestcontainersConfiguration::readProperties)
                 .reduce(new Properties(), (a, b) -> {
-                    a.putAll(b);
-                    return a;
+                    // first-write-wins merging - URLs appearing first on the classpath alphabetically will take priority.
+                    // Note that this means that file: URLs will always take priority over jar: URLs.
+                    b.putAll(a);
+                    return b;
                 }),
             System.getenv());
     }
@@ -341,9 +309,9 @@ private static Properties readProperties(URL url) {
         try (InputStream inputStream = url.openStream()) {
             properties.load(inputStream);
         } catch (FileNotFoundException e) {
-            log.warn("Testcontainers config override was found on {} but the file was not found. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
+            log.warn("Attempted to read Testcontainers configuration file at {} but the file was not found. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
         } catch (IOException e) {
-            log.warn("Testcontainers config override was found on {} but could not be loaded. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
+            log.warn("Attempted to read Testcontainers configuration file at {} but could it not be loaded. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
         }
         return properties;
     }
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 030e4164f00..d484cc92eaf 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -1,5 +1,9 @@
 package org.testcontainers;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testcontainers.TestImages.TINY_IMAGE;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -12,9 +16,6 @@
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 /**
  * Test for {@link DockerClientFactory}.
  */
@@ -30,7 +31,7 @@ public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
         try {
             //remove tiny image, so it will be pulled during next command run
             dockFactory.client()
-                    .removeImageCmd(TestcontainersConfiguration.getInstance().getTinyDockerImageName().asCanonicalNameString())
+                    .removeImageCmd(TINY_IMAGE.asCanonicalNameString())
                     .withForce(true).exec();
         } catch (NotFoundException ignored) {
             // Do not fail if it's not pulled yet
diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
index 3f16e88d882..7052f7e8f9d 100644
--- a/core/src/test/java/org/testcontainers/TestImages.java
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -1,7 +1,6 @@
 package org.testcontainers;
 
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 public interface TestImages {
     DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
@@ -9,5 +8,5 @@ public interface TestImages {
     DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
     DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.2");
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
-    DockerImageName TINY_IMAGE = TestcontainersConfiguration.getInstance().getTinyDockerImageName();
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.5");
 }
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index e49ff2880df..c99770c4fbf 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -1,9 +1,21 @@
 package org.testcontainers.utility;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
+import static org.testcontainers.TestImages.TINY_IMAGE;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.model.AuthConfig;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
 import org.intellij.lang.annotations.Language;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -18,18 +30,6 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.concurrent.TimeUnit;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
-
 /**
  * This test checks the integration between Testcontainers and an authenticated registry, but uses
  * a mock instance of {@link RegistryAuthLocator} - the purpose of the test is solely to ensure that
@@ -165,7 +165,7 @@ private Path getLocalTempFile(String s) throws IOException {
 
     private static void putImageInRegistry() throws InterruptedException {
         // It doesn't matter which image we use for this test, but use one that's likely to have been pulled already
-        final String dummySourceImage = TestcontainersConfiguration.getInstance().getRyukDockerImageName().asCanonicalNameString();
+        final String dummySourceImage = TINY_IMAGE.asCanonicalNameString();
 
         client.pullImageCmd(dummySourceImage)
             .exec(new PullImageResultCallback())
diff --git a/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
new file mode 100644
index 00000000000..bdd71b0db9f
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
@@ -0,0 +1,114 @@
+package org.testcontainers.utility;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static java.util.stream.Collectors.toList;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class ClasspathScannerTest {
+
+    private static URL FILE_A;
+    private static URL FILE_B;
+    private static URL JAR_A;
+    private static URL JAR_B;
+    private static URL FILE_C;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        FILE_A = new URL("file:///a/someName");
+        FILE_B = new URL("file:///b/someName");
+        FILE_C = new URL("file:///c/someName");
+        JAR_A = new URL("jar:file:a!/someName");
+        JAR_B = new URL("jar:file:b!/someName");
+    }
+
+    @Test
+    public void realClassLoaderLookupOccurs() {
+        // look for a resource that we know exists only once
+        final List<URL> foundURLs = ClasspathScanner.scanFor("expectedClasspathFile.txt").collect(toList());
+
+        assertEquals("Exactly one resource was found", 1, foundURLs.size());
+    }
+
+    @Test
+    public void multipleResultsOnOneClassLoaderAreFound() throws IOException {
+        final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
+        when(firstMockClassLoader.getResources(eq("someName"))).thenReturn(
+            Collections.enumeration(
+                asList(
+                    FILE_A,
+                    FILE_B
+                )
+            )
+        );
+
+        final List<URL> foundURLs = ClasspathScanner.scanFor("someName", firstMockClassLoader).collect(toList());
+        assertEquals(
+            "The expected URLs are found",
+            asList(FILE_A, FILE_B),
+            foundURLs
+        );
+    }
+
+    @Test
+    public void orderIsAlphabeticalForDeterminism() throws IOException {
+        final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
+        when(firstMockClassLoader.getResources(eq("someName"))).thenReturn(
+            Collections.enumeration(
+                asList(
+                    FILE_B,
+                    JAR_A,
+                    JAR_B,
+                    FILE_A
+                )
+            )
+        );
+
+        final List<URL> foundURLs = ClasspathScanner.scanFor("someName", firstMockClassLoader).collect(toList());
+        assertEquals(
+            "The expected URLs are found in the expected order",
+            asList(FILE_A, FILE_B, JAR_A, JAR_B),
+            foundURLs
+        );
+    }
+
+    @Test
+    public void multipleClassLoadersAreQueried() throws IOException {
+        final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
+        when(firstMockClassLoader.getResources(eq("someName"))).thenReturn(
+            Collections.enumeration(
+                asList(
+                    FILE_A,
+                    FILE_B
+                )
+            )
+        );
+        final ClassLoader secondMockClassLoader = mock(ClassLoader.class);
+        when(secondMockClassLoader.getResources(eq("someName"))).thenReturn(
+            Collections.enumeration(
+                asList(
+                    FILE_B, // duplicate
+                    FILE_C
+                )
+            )
+        );
+
+        final List<URL> foundURLs = ClasspathScanner.scanFor("someName", firstMockClassLoader, secondMockClassLoader).collect(toList());
+
+        assertEquals(
+            "The expected URLs are found",
+            asList(FILE_A, FILE_B, FILE_C),
+            foundURLs
+        );
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
new file mode 100644
index 00000000000..a6f7813c3d3
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
@@ -0,0 +1,38 @@
+package org.testcontainers.utility;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+
+public class DefaultImageNameSubstitutorTest {
+
+    public static final DockerImageName ORIGINAL_IMAGE = DockerImageName.parse("foo");
+    public static final DockerImageName SUBSTITUTE_IMAGE = DockerImageName.parse("bar");
+    private ConfigurationFileImageNameSubstitutor underTest;
+
+    @Rule
+    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
+
+    @Before
+    public void setUp() {
+        underTest = new ConfigurationFileImageNameSubstitutor(TestcontainersConfiguration.getInstance());
+    }
+
+    @Test
+    public void testConfigurationLookup() {
+        Mockito
+            .doReturn(SUBSTITUTE_IMAGE)
+            .when(TestcontainersConfiguration.getInstance())
+            .getConfiguredSubstituteImage(eq(ORIGINAL_IMAGE));
+
+        final DockerImageName substitute = underTest.apply(ORIGINAL_IMAGE);
+
+        assertEquals("match is found", SUBSTITUTE_IMAGE, substitute);
+        assertTrue("compatibility is automatically set", substitute.isCompatibleWith(ORIGINAL_IMAGE));
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index 9e7136ea6d3..7c794814faf 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -26,9 +26,8 @@ public void testNoTagTreatedAsWildcard() {
         /*
         foo:1.2.3 != foo:4.5.6
         foo:1.2.3 ~= foo
-        foo:1.2.3 ~= foo:latest
 
-        The test is effectively making sure that no tag and `latest` tag are equivalent
+        The test is effectively making sure that 'no tag' is treated as a wildcard
          */
         assertFalse("foo:4.5.6 != foo:1.2.3", subject.isCompatibleWith(DockerImageName.parse("foo:1.2.3")));
         assertTrue("foo:4.5.6 ~= foo", subject.isCompatibleWith(DockerImageName.parse("foo")));
diff --git a/core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java b/core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java
new file mode 100644
index 00000000000..f74a6c942b3
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java
@@ -0,0 +1,13 @@
+package org.testcontainers.utility;
+
+public class FakeImageSubstitutor extends ImageNameSubstitutor {
+    @Override
+    public DockerImageName apply(final DockerImageName original) {
+        return DockerImageName.parse("transformed-" + original.asCanonicalNameString());
+    }
+
+    @Override
+    protected String getDescription() {
+        return "test implementation";
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
new file mode 100644
index 00000000000..97ee0213f21
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
@@ -0,0 +1,75 @@
+package org.testcontainers.utility;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+
+public class ImageNameSubstitutorTest {
+
+    @Rule
+    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
+    private ImageNameSubstitutor originalInstance;
+    private ImageNameSubstitutor originalDefaultImplementation;
+
+    @Before
+    public void setUp() throws Exception {
+        originalInstance = ImageNameSubstitutor.instance;
+        originalDefaultImplementation = ImageNameSubstitutor.defaultImplementation;
+        ImageNameSubstitutor.instance = null;
+        ImageNameSubstitutor.defaultImplementation = Mockito.mock(ImageNameSubstitutor.class);
+
+        Mockito
+            .doReturn(DockerImageName.parse("substituted-image"))
+            .when(ImageNameSubstitutor.defaultImplementation)
+            .apply(eq(DockerImageName.parse("original")));
+        Mockito
+            .doReturn("default implementation")
+            .when(ImageNameSubstitutor.defaultImplementation)
+            .getDescription();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        ImageNameSubstitutor.instance = originalInstance;
+        ImageNameSubstitutor.defaultImplementation = originalDefaultImplementation;
+    }
+
+    @Test
+    public void simpleConfigurationTest() {
+        Mockito
+            .doReturn(FakeImageSubstitutor.class.getCanonicalName())
+            .when(TestcontainersConfiguration.getInstance())
+            .getImageSubstitutorClassName();
+
+        final ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
+
+        DockerImageName result = imageNameSubstitutor.apply(DockerImageName.parse("original"));
+        assertEquals(
+            "the image has been substituted by default then configured implementations",
+            "transformed-substituted-image:latest",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void testWorksWithoutConfiguredImplementation() {
+        Mockito
+            .doReturn(null)
+            .when(TestcontainersConfiguration.getInstance())
+            .getImageSubstitutorClassName();
+
+        final ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
+
+        DockerImageName result = imageNameSubstitutor.apply(DockerImageName.parse("original"));
+        assertEquals(
+            "the image has been substituted by default then configured implementations",
+            "substituted-image:latest",
+            result.asCanonicalNameString()
+        );
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index e48a2a6fdf9..ae07e2d9131 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -25,6 +25,69 @@ public void setUp() {
         environment = new HashMap<>();
     }
 
+    @Test
+    public void shouldSubstituteImageNamesFromClasspathProperties() {
+        classpathProperties.setProperty("ryuk.container.image", "foo:version");
+        assertEquals(
+            "an image name can be pulled from classpath properties",
+            DockerImageName.parse("foo:version"),
+            newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any"))
+        );
+    }
+
+    @Test
+    public void shouldSubstituteImageNamesFromUserProperties() {
+        userProperties.setProperty("ryuk.container.image", "foo:version");
+        assertEquals(
+            "an image name can be pulled from user properties",
+            DockerImageName.parse("foo:version"),
+            newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any"))
+        );
+    }
+
+    @Test
+    public void shouldSubstituteImageNamesFromEnvironmentVariables() {
+        environment.put("TESTCONTAINERS_RYUK_CONTAINER_IMAGE", "foo:version");
+        assertEquals(
+            "an image name can be pulled from an environment variable",
+            DockerImageName.parse("foo:version"),
+            newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any"))
+        );
+    }
+
+    @Test
+    public void shouldApplySettingsInOrder() {
+        assertEquals(
+            "precedence order for multiple sources of the same value is correct",
+            "default",
+            newConfig().getEnvVarOrProperty("key", "default")
+        );
+
+        classpathProperties.setProperty("key", "foo");
+
+        assertEquals(
+            "precedence order for multiple sources of the same value is correct",
+            "foo",
+            newConfig().getEnvVarOrProperty("key", "default")
+        );
+
+        userProperties.setProperty("key", "bar");
+
+        assertEquals(
+            "precedence order for multiple sources of the same value is correct",
+            "bar",
+            newConfig().getEnvVarOrProperty("key", "default")
+        );
+
+        environment.put("TESTCONTAINERS_KEY", "baz");
+
+        assertEquals(
+            "precedence order for multiple sources of the same value is correct",
+            "baz",
+            newConfig().getEnvVarOrProperty("key", "default")
+        );
+    }
+
     @Test
     public void shouldNotReadChecksFromClasspathProperties() {
         assertFalse("checks enabled by default", newConfig().isDisableChecks());
diff --git a/core/src/test/resources/expectedClasspathFile.txt b/core/src/test/resources/expectedClasspathFile.txt
new file mode 100644
index 00000000000..e13c06f078f
--- /dev/null
+++ b/core/src/test/resources/expectedClasspathFile.txt
@@ -0,0 +1 @@
+This file exists for org.testcontainers.utility.ClasspathScannerTest
diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 5ce878c7ba2..ff1b11f142e 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -4,6 +4,9 @@ dependencies {
     testCompile "junit:junit:4.12"
     testCompile project(":testcontainers")
     testCompile project(":selenium")
+    testCompile project(":mysql")
+
+    testCompile 'mysql:mysql-connector-java:8.0.21'
     testCompile "org.seleniumhq.selenium:selenium-api:3.141.59"
     testCompile 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ExampleImageNameSubstitutor.java b/docs/examples/junit4/generic/src/test/java/generic/ExampleImageNameSubstitutor.java
new file mode 100644
index 00000000000..f6355312b3f
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/java/generic/ExampleImageNameSubstitutor.java
@@ -0,0 +1,24 @@
+package generic;
+
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.ImageNameSubstitutor;
+
+public class ExampleImageNameSubstitutor extends ImageNameSubstitutor {
+
+    @Override
+    public DockerImageName apply(DockerImageName original) {
+        // convert the original name to something appropriate for
+        // our build environment
+        return DockerImageName.parse(
+            // your code goes here - silly example of capitalising
+            // the original name is shown
+            original.asCanonicalNameString().toUpperCase()
+        );
+    }
+
+    @Override
+    protected String getDescription() {
+        // used in logs
+        return "example image name substitutor";
+    }
+}
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
new file mode 100644
index 00000000000..edc622a4104
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
@@ -0,0 +1,48 @@
+package generic;
+
+
+import generic.support.TestSpecificImageNameSubstitutor;
+import org.junit.Test;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
+public class ImageNameSubstitutionTest {
+
+    @Test
+    public void simpleExample() {
+        try (
+            // directDockerHubReference {
+            // Referring directly to an image on Docker Hub (mysql:8.0.22)
+            final MySQLContainer<?> mysql = new MySQLContainer<>(
+                DockerImageName.parse("mysql:8.0.22")
+            )
+
+            // start the container and use it for testing
+            // }
+        ) {
+            mysql.start();
+        }
+    }
+
+    /**
+     * Note that this test uses a fake image name, which will only work because
+     * {@link TestSpecificImageNameSubstitutor} steps in to override the substitution for this exact
+     * image name.
+     */
+    @Test
+    public void substitutedExample() {
+        try (
+            // hardcodedMirror {
+            // Referring directly to an image on a private registry - image name will vary
+            final MySQLContainer<?> mysql = new MySQLContainer<>(
+                DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.22")
+                               .asCompatibleSubstituteFor("mysql")
+            )
+
+            // start the container and use it for testing
+            // }
+        ) {
+            mysql.start();
+        }
+    }
+}
diff --git a/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
new file mode 100644
index 00000000000..5f9e92c0add
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
@@ -0,0 +1,26 @@
+package generic.support;
+
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.ImageNameSubstitutor;
+
+/**
+ * An {@link ImageNameSubstitutor} which makes it possible to use fake image names in
+ * {@link generic.ImageNameSubstitutionTest}. This implementation simply reverses a fake image name when presented, and
+ * is hardcoded to act upon the specific fake name in that test.
+ */
+public class TestSpecificImageNameSubstitutor extends ImageNameSubstitutor {
+
+    @Override
+    public DockerImageName apply(final DockerImageName original) {
+        if (original.equals(DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.22"))) {
+            return DockerImageName.parse("mysql");
+        } else {
+            return original;
+        }
+    }
+
+    @Override
+    protected String getDescription() {
+        return TestSpecificImageNameSubstitutor.class.getSimpleName();
+    }
+}
diff --git a/docs/examples/junit4/generic/src/test/resources/logback-test.xml b/docs/examples/junit4/generic/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..1378a823a63
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+    <logger name="com.github.dockerjava" level="WARN"/>
+</configuration>
diff --git a/docs/examples/junit4/generic/src/test/resources/testcontainers.properties b/docs/examples/junit4/generic/src/test/resources/testcontainers.properties
new file mode 100644
index 00000000000..19bf8288d33
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/resources/testcontainers.properties
@@ -0,0 +1 @@
+image.substitutor=generic.support.TestSpecificImageNameSubstitutor
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index e3ac0fb6ac3..b567a8f564f 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -2,14 +2,26 @@
 
 You can override some default properties if your environment requires that.
 
-## Configuration file location
+## Configuration locations
 The configuration will be loaded from multiple locations. Properties are considered in the following order:
 
-1. `.testcontainers.properties` in user's home folder. Example locations:  
+1. Environment variables
+2. `.testcontainers.properties` in user's home folder. Example locations:  
 **Linux:** `/home/myuser/.testcontainers.properties`  
 **Windows:** `C:/Users/myuser/.testcontainers.properties`  
 **macOS:** `/Users/myuser/.testcontainers.properties`
-2. `testcontainers.properties` on classpath
+3. `testcontainers.properties` on the classpath.
+
+Note that when using environment variables, configuration property names should be set in upper 
+case with underscore separators, preceded by `TESTCONTAINERS_` - e.g. `checks.disable` becomes 
+`TESTCONTAINERS_CHECKS_DISABLE`.
+
+The classpath `testcontainers.properties` file may exist within the local codebase (e.g. within the `src/test/resources` directory) or within library dependencies that you may have. 
+Any such configuration files will have their contents merged.
+If any keys conflict, the value will be taken on the basis of the first value found in:
+
+* 'local' classpath (i.e. where the URL of the file on the classpath begins with `file:`), then
+* other classpath locations (i.e. JAR files) - considered in _alphabetical order of path_  to provide deterministic ordering.
 
 ## Disabling the startup checks
 > **checks.disable = [true|false]**
@@ -26,18 +38,30 @@ It takes a couple of seconds, but if you want to speed up your tests, you can di
 
 ## Customizing images
 
+!!! note
+    This approach is discouraged and deprecated, but is documented for completeness.
+    Overriding individual image names via configuration may be removed in 2021.
+    See [Image Name Substitution](./image_name_substitution.md) for other strategies for substituting image names to pull from other registries.
+
+
 Testcontainers uses public Docker images to perform different actions like startup checks, VNC recording and others. 
 Some companies disallow the usage of Docker Hub, but you can override `*.image` properties with your own images from your private registry to workaround that.
 
+> **ryuk.container.image = testcontainers/ryuk:0.3.0**
+> Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
+
 > **tinyimage.container.image = alpine:3.5**  
-> Used by Testcontainers' core
+> Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))
+
+> **sshd.container.image = testcontainers/sshd:1.0.0**  
+> Required if [exposing host ports to containers](./networking.md#exposing-host-ports-to-the-container)
 
 > **vncrecorder.container.image = testcontainers/vnc-recorder:1.1.0**
-> Used by VNC recorder in Testcontainers' Seleniun integration
+> Used by VNC recorder in Testcontainers' Selenium integration
 
-> **ambassador.container.image = richnorth/ambassador:latest**  
+> **socat.container.image = alpine/socat**  
 > **compose.container.image = docker/compose:1.8.0**  
-> Used by Docker Compose integration
+> Required if using [Docker Compose](../modules/docker_compose.md)
 
 > **kafka.container.image = confluentinc/cp-kafka**  
 > Used by KafkaContainer 
@@ -45,11 +69,8 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **localstack.container.image = localstack/localstack**  
 > Used by LocalStack
 
-Another possibility is to set up a registry mirror in your environment so that all images are pulled from there and not directly from Docker Hub.
-For more information, see the [official Docker documentation about "Registry as a pull through cache"](https://docs.docker.com/registry/recipes/mirror/).
-
-!!!tip
-    Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/something/else`, not).
+> **pulsar.container.image = apachepulsar/pulsar:2.2.0**  
+> Used by Apache Pulsar
 
 ## Customizing Ryuk resource reaper
 
diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
new file mode 100644
index 00000000000..0cf2d4cf8f0
--- /dev/null
+++ b/docs/features/image_name_substitution.md
@@ -0,0 +1,117 @@
+# Image name substitution
+
+Testcontainers supports automatic substitution of Docker image names.
+
+This allows replacement of an image name specified in test code with an alternative name - for example, to replace the 
+name of a Docker Hub image dependency with an alternative hosted on a private image registry.
+
+This is advisable to avoid [Docker Hub rate limiting](./pull_rate_limiting.md), and some companies will prefer this for policy reasons.
+
+This page describes four approaches for image name substitution:
+
+* [Manual substitution](#manual-substitution) - not relying upon an automated approach
+* Using an Image Name Substitutor:
+    * [Developing a custom function for transforming image names on the fly](#developing-a-custom-function-for-transforming-image-names-on-the-fly)
+    * [Overriding image names individually in configuration](#overriding-image-names-individually-in-configuration)
+
+It is assumed that you have already set up a private registry hosting [all the Docker images your build requires](./pull_rate_limiting.md#which-images-are-used-by-testcontainers).
+
+
+
+
+## Manual substitution
+
+Consider this if:
+
+* You use only a few images and updating code is not a chore
+* All developers and CI machines in your organisation have access to a common registry server
+* You also use one of the automated mechanisms to substitute [the images that Testcontainers itself requires](./pull_rate_limiting.md#which-images-are-used-by-testcontainers)
+
+This approach simply entails modifying test code manually, e.g. changing:
+
+For example, you may have a test that uses the `mysql` container image from Docker Hub:
+
+<!--codeinclude--> 
+[Direct Docker Hub image name](../examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java) inside_block:directDockerHubReference
+<!--/codeinclude-->
+
+to:
+
+<!--codeinclude--> 
+[Private registry image name](../examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java) inside_block:hardcodedMirror
+<!--/codeinclude-->
+
+
+
+
+
+
+
+
+
+## Developing a custom function for transforming image names on the fly
+
+Consider this if:
+
+* You have complex rules about which private registry images should be used as substitutes, e.g.:
+    * non-deterministic mapping of names meaning that a [name prefix](#adding-a-registry-url-prefix-to-image-names-automatically) cannot be used
+    * rules depending upon developer identity or location
+* or you wish to add audit logging of images used in the build
+* or you wish to prevent accidental usage of images that are not on an approved list
+
+In this case, image name references in code are **unchanged**.
+i.e. you would leave as-is:
+
+<!--codeinclude--> 
+[Unchanged direct Docker Hub image name](../examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java) inside_block:directDockerHubReference
+<!--/codeinclude-->
+
+You can implement a custom image name substitutor by:
+
+* subclassing `org.testcontainers.utility.ImageNameSubstitutor`
+* configuring Testcontainers to use your custom implementation
+
+The following is an example image substitutor implementation:
+
+<!--codeinclude--> 
+[Example Image Substitutor](../examples/junit4/generic/src/test/java/generic/ExampleImageNameSubstitutor.java) block:ExampleImageNameSubstitutor
+<!--/codeinclude-->
+
+Testcontainers can be configured to find it at runtime via configuration.
+To do this, create or modify a file on the classpath named `testcontainers.properties`.
+
+For example:
+
+```text tab="src/test/resources/testcontainers.properties"
+image.substitutor=com.mycompany.testcontainers.ExampleImageNameSubstitutor
+``` 
+
+Note that it is also possible to provide this same configuration property:
+
+* in a `testcontainers.properties` file at the root of a library JAR file (useful if you wish to distribute a drop-in image substitutor JAR within an organization) 
+* in a properties file in the user's home directory (`~/.testcontainers.properties`; note the leading `.`)
+* or as an environment variable (e.g. `TESTCONTAINERS_IMAGE_SUBSTITUTOR=com.mycompany.testcontainers.ExampleImageNameSubstitutor`).
+
+Please see [the documentation on configuration mechanisms](./configuration.md) for more information.
+
+
+## Overriding image names individually in configuration
+
+!!! note
+    This approach is discouraged and deprecated, but is documented for completeness.
+    Please consider one of the other approaches outlined in this page instead.
+    Overriding individual image names via configuration may be removed in 2021. 
+
+Consider this if:
+
+* You have many references to image names in code and changing them is impractical, and
+* None of the other options are practical for you
+
+In this case, image name references in code are left **unchanged**.
+i.e. you would leave as-is:
+
+<!--codeinclude--> 
+[Unchanged direct Docker Hub image name](../examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java) inside_block:directDockerHubReference
+<!--/codeinclude-->
+
+You can force Testcontainers to substitute in a different image [using a configuration file](./configuration.md), which allows some (but not all) container names to be substituted. 
diff --git a/docs/features/pull_rate_limiting.md b/docs/features/pull_rate_limiting.md
new file mode 100644
index 00000000000..be266545afb
--- /dev/null
+++ b/docs/features/pull_rate_limiting.md
@@ -0,0 +1,19 @@
+# Image Registry rate limiting
+
+As of November 2020 Docker Hub pulls are rate limited. 
+As Testcontainers uses Docker Hub for standard images, some users may hit these rate limits and should mitigate accordingly.
+
+Suggested mitigations are noted in [this issue](https://github.com/testcontainers/testcontainers-java/issues/3099) at present.
+
+## Which images are used by Testcontainers?
+
+As of the current version of Testcontainers ({{latest_version}}):
+
+* every image directly used by your tests
+* images pulled by Testcontainers itself to support functionality:
+    * [`testcontainers/ryuk`](https://hub.docker.com/r/testcontainers/ryuk) - performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](./configuration.md#disabling-ryuk))
+    * [`alpine`](https://hub.docker.com/r/_/alpine) - used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](./configuration.md#disabling-the-startup-checks))
+    * [`testcontainers/sshd`](https://hub.docker.com/r/testcontainers/sshd) - required if [exposing host ports to containers](./networking.md#exposing-host-ports-to-the-container)
+    * [`testcontainers/vnc-recorder`](https://hub.docker.com/r/testcontainers/vnc-recorder) - required if using [Webdriver containers](../modules/webdriver_containers.md) and using the screen recording feature
+    * [`docker/compose`](https://hub.docker.com/r/docker/compose) - required if using [Docker Compose](../modules/docker_compose.md)
+    * [`alpine/socat`](https://hub.docker.com/r/alpine/socat) - required if using [Docker Compose](../modules/docker_compose.md)
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 37f99bf970b..12867239251 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -4,7 +4,6 @@
 import lombok.SneakyThrows;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
@@ -36,7 +35,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
      */
     @Deprecated
     public KafkaContainer() {
-        this(TestcontainersConfiguration.getInstance().getKafkaDockerImageName().withTag(DEFAULT_TAG));
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
@@ -44,7 +43,7 @@ public KafkaContainer() {
      */
     @Deprecated
     public KafkaContainer(String confluentPlatformVersion) {
-        this(TestcontainersConfiguration.getInstance().getKafkaDockerImageName().withTag(confluentPlatformVersion));
+        this(DEFAULT_IMAGE_NAME.withTag(confluentPlatformVersion));
     }
 
     public KafkaContainer(final DockerImageName dockerImageName) {
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 4f721424bb6..263653822e6 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -61,7 +61,7 @@ public void testUsageWithSpecificImage() throws Exception {
     @Test
     public void testUsageWithVersion() throws Exception {
         try (
-            KafkaContainer kafka = new KafkaContainer("5.4.3")
+            KafkaContainer kafka = new KafkaContainer("5.5.1")
         ) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 7532ebe0b3d..b8416afb1ed 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -14,7 +14,6 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.InetAddress;
 import java.net.URI;
@@ -65,7 +64,7 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
      */
     @Deprecated
     public LocalStackContainer() {
-        this(TestcontainersConfiguration.getInstance().getLocalstackDockerImageName().withTag(DEFAULT_TAG));
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
@@ -73,7 +72,7 @@ public LocalStackContainer() {
      */
     @Deprecated
     public LocalStackContainer(String version) {
-        this(TestcontainersConfiguration.getInstance().getLocalstackDockerImageName().withTag(version));
+        this(DEFAULT_IMAGE_NAME.withTag(version));
     }
 
     /**
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index b5700c1e84e..0a66ad6fd27 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -22,8 +22,7 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
     private String password = "oracle";
 
     private static String resolveImageName() {
-        String image = TestcontainersConfiguration.getInstance()
-            .getProperties().getProperty("oracle.container.image");
+        String image = TestcontainersConfiguration.getInstance().getOracleImage();
 
         if (image == null) {
             throw new IllegalStateException("An image to use for Oracle containers must be configured. " +
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index bceff8927d7..b3c836b56a5 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -3,7 +3,6 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 /**
  * This container wraps Apache Pulsar running in standalone mode
@@ -25,7 +24,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
      */
     @Deprecated
     public PulsarContainer() {
-        this(TestcontainersConfiguration.getInstance().getPulsarDockerImageName().withTag(DEFAULT_TAG));
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     /**
@@ -33,7 +32,7 @@ public PulsarContainer() {
      */
     @Deprecated
     public PulsarContainer(String pulsarVersion) {
-        this(TestcontainersConfiguration.getInstance().getPulsarDockerImageName().withTag(pulsarVersion));
+        this(DEFAULT_IMAGE_NAME.withTag(pulsarVersion));
     }
 
     public PulsarContainer(final DockerImageName dockerImageName) {
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
index 526c1fe5c42..9698e7d433a 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -1,11 +1,10 @@
-package org.testcontainers.spock;
+package org.testcontainers.spock
 
 import org.testcontainers.utility.DockerImageName
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 interface SpockTestImages {
     DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.22")
     DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
     DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
-    DockerImageName TINY_IMAGE = TestcontainersConfiguration.getInstance().getTinyDockerImageName()
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.5")
 }

From b28f6efafa8f60e70f95670fecfde29eafbf4e4b Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 5 Nov 2020 20:12:57 +0000
Subject: [PATCH 1079/4969] Fix missing links to new docs from site menu

---
 docs/features/image_name_substitution.md                    | 6 +++---
 .../image_registry_rate_limiting.md}                        | 6 +++---
 mkdocs.yml                                                  | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename docs/{features/pull_rate_limiting.md => supported_docker_environment/image_registry_rate_limiting.md} (81%)

diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
index 0cf2d4cf8f0..45ea6038b49 100644
--- a/docs/features/image_name_substitution.md
+++ b/docs/features/image_name_substitution.md
@@ -5,7 +5,7 @@ Testcontainers supports automatic substitution of Docker image names.
 This allows replacement of an image name specified in test code with an alternative name - for example, to replace the 
 name of a Docker Hub image dependency with an alternative hosted on a private image registry.
 
-This is advisable to avoid [Docker Hub rate limiting](./pull_rate_limiting.md), and some companies will prefer this for policy reasons.
+This is advisable to avoid [Docker Hub rate limiting](../supported_docker_environment/image_registry_rate_limiting.md), and some companies will prefer this for policy reasons.
 
 This page describes four approaches for image name substitution:
 
@@ -14,7 +14,7 @@ This page describes four approaches for image name substitution:
     * [Developing a custom function for transforming image names on the fly](#developing-a-custom-function-for-transforming-image-names-on-the-fly)
     * [Overriding image names individually in configuration](#overriding-image-names-individually-in-configuration)
 
-It is assumed that you have already set up a private registry hosting [all the Docker images your build requires](./pull_rate_limiting.md#which-images-are-used-by-testcontainers).
+It is assumed that you have already set up a private registry hosting [all the Docker images your build requires](../supported_docker_environment/image_registry_rate_limiting.md#which-images-are-used-by-testcontainers).
 
 
 
@@ -25,7 +25,7 @@ Consider this if:
 
 * You use only a few images and updating code is not a chore
 * All developers and CI machines in your organisation have access to a common registry server
-* You also use one of the automated mechanisms to substitute [the images that Testcontainers itself requires](./pull_rate_limiting.md#which-images-are-used-by-testcontainers)
+* You also use one of the automated mechanisms to substitute [the images that Testcontainers itself requires](../supported_docker_environment/image_registry_rate_limiting.md#which-images-are-used-by-testcontainers)
 
 This approach simply entails modifying test code manually, e.g. changing:
 
diff --git a/docs/features/pull_rate_limiting.md b/docs/supported_docker_environment/image_registry_rate_limiting.md
similarity index 81%
rename from docs/features/pull_rate_limiting.md
rename to docs/supported_docker_environment/image_registry_rate_limiting.md
index be266545afb..a136a12b25e 100644
--- a/docs/features/pull_rate_limiting.md
+++ b/docs/supported_docker_environment/image_registry_rate_limiting.md
@@ -11,9 +11,9 @@ As of the current version of Testcontainers ({{latest_version}}):
 
 * every image directly used by your tests
 * images pulled by Testcontainers itself to support functionality:
-    * [`testcontainers/ryuk`](https://hub.docker.com/r/testcontainers/ryuk) - performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](./configuration.md#disabling-ryuk))
-    * [`alpine`](https://hub.docker.com/r/_/alpine) - used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](./configuration.md#disabling-the-startup-checks))
-    * [`testcontainers/sshd`](https://hub.docker.com/r/testcontainers/sshd) - required if [exposing host ports to containers](./networking.md#exposing-host-ports-to-the-container)
+    * [`testcontainers/ryuk`](https://hub.docker.com/r/testcontainers/ryuk) - performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](../features/configuration.md#disabling-ryuk))
+    * [`alpine`](https://hub.docker.com/r/_/alpine) - used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](../features/configuration.md#disabling-the-startup-checks))
+    * [`testcontainers/sshd`](https://hub.docker.com/r/testcontainers/sshd) - required if [exposing host ports to containers](../features/networking.md#exposing-host-ports-to-the-container)
     * [`testcontainers/vnc-recorder`](https://hub.docker.com/r/testcontainers/vnc-recorder) - required if using [Webdriver containers](../modules/webdriver_containers.md) and using the screen recording feature
     * [`docker/compose`](https://hub.docker.com/r/docker/compose) - required if using [Docker Compose](../modules/docker_compose.md)
     * [`alpine/socat`](https://hub.docker.com/r/alpine/socat) - required if using [Docker Compose](../modules/docker_compose.md)
diff --git a/mkdocs.yml b/mkdocs.yml
index 0fa9b2b4c91..90404a80749 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -36,6 +36,7 @@ nav:
           - features/container_logs.md
           - features/creating_images.md
           - features/configuration.md
+          - features/image_name_substitution.md
           - features/advanced_options.md
     - Modules:
           - Databases:
@@ -86,6 +87,7 @@ nav:
                 - supported_docker_environment/continuous_integration/bitbucket_pipelines.md
           - supported_docker_environment/windows.md
           - supported_docker_environment/logging_config.md
+          - supported_docker_environment/image_registry_rate_limiting.md
     - Getting help: getting_help.md
     - Contributing:
           - contributing.md

From c9be54f7ee5a47692f3cc875452cc63bf0a92004 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Fri, 6 Nov 2020 14:04:28 +0100
Subject: [PATCH 1080/4969] Add Presto project to the list of Testcontainers
 users (#3435)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 28ca2453993..22fa9c93738 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -162,6 +162,7 @@ A huge thank you to our sponsors:
 * [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
 * [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
 * [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS
+* [Presto](http://prestosql.io/) - Integration testing all Presto core & connectors, including tests of multi-node deployments and security configurations.
 
 
 ## License

From d57a2bbada8c25f8f380b6258e5b259e02f34954 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 6 Nov 2020 14:05:10 +0100
Subject: [PATCH 1081/4969] Update mkdocs.yml to the latest release

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 90404a80749..618b9679291 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -94,4 +94,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.15.0-rc2
+    latest_version: 1.15.0

From e2c55a236b39b515bfe32294e875bf83cc3251bd Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 8 Nov 2020 11:42:26 +0000
Subject: [PATCH 1082/4969] Selenium: Restore getDockerImageForCapabilities
 method to public scope (#3441)

---
 .../containers/BrowserWebDriverContainer.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 884cd33a9dd..1ceaf67ad2c 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -189,7 +189,7 @@ protected void configure() {
             customImageName.assertCompatibleWith(COMPATIBLE_IMAGES);
             super.setDockerImageName(customImageName.asCanonicalNameString());
         } else {
-            DockerImageName standardImageForCapabilities = getImageForCapabilities(capabilities, seleniumVersion);
+            DockerImageName standardImageForCapabilities = getStandardImageForCapabilities(capabilities, seleniumVersion);
             super.setDockerImageName(standardImageForCapabilities.asCanonicalNameString());
         }
 
@@ -218,7 +218,22 @@ protected void configure() {
         setStartupAttempts(3);
     }
 
-    private static DockerImageName getImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
+    /**
+     * @param capabilities a {@link Capabilities} object for either Chrome or Firefox
+     * @param seleniumVersion the version of selenium in use
+     * @return an image name for the default standalone Docker image for the appropriate browser
+     *
+     * @deprecated note that this method is deprecated and may be removed in the future. The no-args
+     * {@link BrowserWebDriverContainer#BrowserWebDriverContainer()} combined with the
+     * {@link BrowserWebDriverContainer#withCapabilities(Capabilities)} method should be considered. A decision on
+     * removal of this deprecated method will be taken at a future date.
+     */
+    @Deprecated
+    public static String getDockerImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
+        return getStandardImageForCapabilities(capabilities, seleniumVersion).asCanonicalNameString();
+    }
+
+    private static DockerImageName getStandardImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
         String browserName = capabilities.getBrowserName();
         switch (browserName) {
             case BrowserType.CHROME:

From aa01d7a7f8305d068f6e60113ca1b454d0a83759 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Sun, 8 Nov 2020 12:55:48 +0100
Subject: [PATCH 1083/4969] Update Presto URL to use https in 'Who is using'
 list (#3438)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 22fa9c93738..2351837f8af 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -162,7 +162,7 @@ A huge thank you to our sponsors:
 * [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
 * [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
 * [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS
-* [Presto](http://prestosql.io/) - Integration testing all Presto core & connectors, including tests of multi-node deployments and security configurations.
+* [Presto](https://prestosql.io) - Integration testing all Presto core & connectors, including tests of multi-node deployments and security configurations.
 
 
 ## License

From dc9e9c14199caca9d3b130d058cd3de7677ea404 Mon Sep 17 00:00:00 2001
From: eyalkoren <41850454+eyalkoren@users.noreply.github.com>
Date: Sat, 21 Nov 2020 18:08:26 +0200
Subject: [PATCH 1084/4969] Search Oracle image name in classpath (#3439)

Not sure why the new code looks for the Oracle image name only in the user home directory and not in the config file placed in the classpath.
This brakes my test.
---
 .../org/testcontainers/utility/TestcontainersConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 987301fbfb9..47c274c05e6 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -144,7 +144,7 @@ public String getKafkaImage() {
 
     @Deprecated
     public String getOracleImage() {
-        return getEnvVarOrUserProperty("oracle.container.image", null);
+        return getEnvVarOrProperty("oracle.container.image", null);
     }
 
     @Deprecated

From 47c2988ef04c3d1ba7df8b5437d792e189b048f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 Nov 2020 16:10:01 +0000
Subject: [PATCH 1085/4969] Bump aws-java-sdk-dynamodb from 1.11.882 to
 1.11.901 in /modules/dynalite (#3472)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.882 to 1.11.901.
- [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.882...1.11.901)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 8aa9959ea13..5f6ab14d939 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.882'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.901'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.882'
 }

From 9ceca91d672e814e338a1ec5073b14144e188dfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 Nov 2020 16:10:19 +0000
Subject: [PATCH 1086/4969] Bump elasticsearch-rest-client from 7.9.2 to 7.10.0
 in /modules/elasticsearch (#3474)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.9.2 to 7.10.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.2...v7.10.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 126722759ec..3b7ef456875 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.9.2"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.10.0"
     testCompile "org.elasticsearch.client:transport:7.9.2"
 }

From 4f053283075e21f32044286d0237c749d3733dcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 Nov 2020 16:10:27 +0000
Subject: [PATCH 1087/4969] Bump assertj-core from 3.18.0 to 3.18.1 in
 /modules/neo4j (#3477)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.0 to 3.18.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.0...assertj-core-3.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 8d7f59e564e..9aab6b18298 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.18.0'
+    testCompile 'org.assertj:assertj-core:3.18.1'
 }

From 60018dfa586eb62d46060c0ad6403295a238df8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 Nov 2020 16:10:51 +0000
Subject: [PATCH 1088/4969] Bump assertj-core from 3.17.2 to 3.18.1 in
 /modules/database-commons (#3479)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index e6d6a1812da..dacd8a500ac 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.17.2'
+    testCompile 'org.assertj:assertj-core:3.18.1'
 }

From c381a64a6623fe71e95cfb73173907246a21e685 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 23 Nov 2020 11:32:25 +0100
Subject: [PATCH 1089/4969] Update to docker-java 3.2.6 (#3498)

---
 core/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 723b14fd0e6..6e3df56758a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -173,9 +173,9 @@ dependencies {
 
     compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compile "com.github.docker-java:docker-java-api:3.2.5"
+    compile "com.github.docker-java:docker-java-api:3.2.6"
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.5') {
+    shaded ('com.github.docker-java:docker-java-core:3.2.6') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
         exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -184,13 +184,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.5') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.6') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.5'
+    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.6'
 
     shaded "org.yaml:snakeyaml:1.27"
 

From 4e27522e9348059e3ee516c3eaf021da493762a7 Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Tue, 24 Nov 2020 11:24:59 -0800
Subject: [PATCH 1090/4969] Add toxiproxy to dependabot.yml (#3502)

---
 .github/dependabot.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8abda8d8c5a..d854a9aa823 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -122,6 +122,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/toxiproxy"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/vault"
     schedule:

From e9a8ac9e3a9a9db6134ff07232c7e2363a5a99cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:28:02 +0000
Subject: [PATCH 1091/4969] Bump tomcat-jdbc from 9.0.39 to 9.0.40 in
 /modules/jdbc-test (#3513)

Bumps tomcat-jdbc from 9.0.39 to 9.0.40.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 99841c1d62a..8523ca5a3d8 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     }
 
     compile 'commons-dbutils:commons-dbutils:1.7'
-    compile 'org.apache.tomcat:tomcat-jdbc:9.0.39'
+    compile 'org.apache.tomcat:tomcat-jdbc:9.0.40'
     compile 'org.vibur:vibur-dbcp:25.0'
     compile 'mysql:mysql-connector-java:8.0.22'
 }

From 1a2aa0e662669b86e7c285f8ca485ab5b22f558e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:28:09 +0000
Subject: [PATCH 1092/4969] Bump tomcat-jdbc from 9.0.39 to 9.0.40 in
 /modules/jdbc (#3509)

Bumps tomcat-jdbc from 9.0.39 to 9.0.40.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2045461785e..12a53f7cfbc 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.39'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.40'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 }

From 1a2820fa344cbb60a4b156874bcaa04536824f78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:30:07 +0000
Subject: [PATCH 1093/4969] Bump assertj-core from 3.17.2 to 3.18.1 in
 /modules/pulsar (#3475)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 2d2ded0c765..e09ff42f357 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.1'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.17.2'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.1'
 }

From 6565fd2f5b020d341ac30bd353c2390396928ff2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:30:15 +0000
Subject: [PATCH 1094/4969] Bump assertj-core from 3.17.2 to 3.18.1 in
 /modules/kafka (#3469)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 95d844c7a41..4454823bda4 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.apache.kafka:kafka-clients:2.6.0'
-    testCompile 'org.assertj:assertj-core:3.17.2'
+    testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile 'com.google.guava:guava:23.0'
 }

From 9ccb4432f7cbb827a8a0fdd6b918369646a55258 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:30:23 +0000
Subject: [PATCH 1095/4969] Bump assertj-core from 3.18.0 to 3.18.1 in
 /modules/junit-jupiter (#3470)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.0 to 3.18.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.0...assertj-core-3.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 7986c067c89..520cff37254 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile ('org.mockito:mockito-core:3.5.15') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.18.0'
+    testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.0'
 
     testRuntime 'org.postgresql:postgresql:42.2.18'

From a3f0a16d3825a69aa446bd6462f99a2ecda4d756 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:30:56 +0000
Subject: [PATCH 1096/4969] Bump assertj-core from 3.17.2 to 3.18.1 in /core
 (#3471)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.18.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.17.2...assertj-core-3.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 6e3df56758a..ed0fc00d4f6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -211,12 +211,12 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.17.2'
+    testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
-    jarFileTestCompile 'org.assertj:assertj-core:3.17.1'
+    jarFileTestCompile 'org.assertj:assertj-core:3.18.1'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
 }

From cf8c349e43ff05f7364c645cebb9061fda90aabf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:44:04 +0000
Subject: [PATCH 1097/4969] Bump transport from 7.9.2 to 7.10.0 in
 /modules/elasticsearch (#3473)

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.9.2 to 7.10.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.2...v7.10.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 3b7ef456875..bfbfbfae9ce 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.10.0"
-    testCompile "org.elasticsearch.client:transport:7.9.2"
+    testCompile "org.elasticsearch.client:transport:7.10.0"
 }

From cb5e416504e74dfdf5d26640a9f0076f44df1d05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Nov 2020 09:42:59 +0000
Subject: [PATCH 1098/4969] Bump toxiproxy-java from 2.1.3 to 2.1.4 in
 /modules/toxiproxy (#3524)

Bumps [toxiproxy-java](https://github.com/trekawek/toxiproxy-java) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/trekawek/toxiproxy-java/releases)
- [Changelog](https://github.com/trekawek/toxiproxy-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trekawek/toxiproxy-java/compare/toxiproxy-java-2.1.3...toxiproxy-java-2.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 293b8f8f190..47221d68e40 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Toxiproxy"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.3'
+    compile 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.4'
 
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 1d551b664c5b0f4f46a2ddfd22041f5afcd1e09a Mon Sep 17 00:00:00 2001
From: Ray Tsang <saturnism@users.noreply.github.com>
Date: Tue, 1 Dec 2020 23:56:15 -0800
Subject: [PATCH 1099/4969] More examples in the gcloud module doc (#3463)

* updated gcloud module doc

* document container images to use

* updated example links

* fixed links
---
 docs/modules/gcloud.md                        | 110 ++++++++++++++++--
 .../FirestoreEmulatorContainerTest.java       |   8 +-
 .../PubSubEmulatorContainerTest.java          |  13 ++-
 .../SpannerEmulatorContainerTest.java         |  12 +-
 4 files changed, 130 insertions(+), 13 deletions(-)

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 3400ad881a9..041129919ee 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -3,29 +3,119 @@
 !!! note
     This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
 
-Testcontainers module for the Google's [Cloud SDK](https://cloud.google.com/sdk/).
+Testcontainers module for the Google Cloud Platform's [Cloud SDK](https://cloud.google.com/sdk/).
 
-Currently, the module supports `Datastore`, `Firestore`, `Pub/Sub` and `Spanner` emulators. In order to use it, you should use the following classes:
+Currently, the module supports `Datastore`, `Firestore`, `Spanner`, and `Pub/Sub` emulators. In order to use it, you should use the following classes:
 
-* DatastoreEmulatorContainer
-* FirestoreEmulatorContainer
-* PubSubEmulatorContainer
-* SpannerEmulatorContainer
+Class | Container Image
+-|-
+DatastoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
+FirestoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
+SpannerEmulatorContainer | [gcr.io/cloud-spanner-emulator/emulator](https://gcr.io/cloud-spanner-emulator/emulator)
+PubSubEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
 
 ## Usage example
 
-Running GCloud as a stand-in for Google Datastore during a test:
+### Datastore
+
+Start Datastore Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Datastore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:creatingDatastoreEmulatorContainer
+<!--/codeinclude-->
+
+And test against the Emulator:
+
+<!--codeinclude-->
+[Testing with a Datastore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:startingDatastoreEmulatorContainer
+<!--/codeinclude-->
+
+See more examples:
+
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java)
+ * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/datastore-example/src/test/java/com/example/springboot/datastore) 
+
+### Firestore 
+
+Start Firestore Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+And test against the Emulator:
+
+<!--codeinclude-->
+[Testing with a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+<!--/codeinclude-->
+
+See more examples:
+
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java)
+ * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/firestore-example/src/test/java/com/example/springboot/firestore/FirestoreIntegrationTests.java)
+
+### Spanner 
+
+Start Spanner Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Spanner Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+Create a test Spanner Instance in the Emulator:
+
+<!--codeinclude-->
+[Create a test Spanner instance](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:createInstance
+<!--/codeinclude-->
+
+Create a test Database in the Emulator:
+
+<!--codeinclude-->
+[Creating a test Spanner database](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:createDatabase
+<!--/codeinclude-->
+
+And test against the Emulator:
+
+<!--codeinclude-->
+[Testing with a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+<!--/codeinclude-->
+
+See more examples:
+
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java)
+ * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/spanner-example/src/test/java/com/example/springboot/spanner/SpannerIntegrationTests.java)
+
+### Pub/Sub 
+
+Start Pub/Sub Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Pub/Sub Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+Create a test Pub/Sub topic the Emulator:
 
 <!--codeinclude-->
-[Creating a Datastore container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:creatingDatastoreEmulatorContainer
+[Create a test topic](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:createTopic
 <!--/codeinclude-->
 
-And how to start it:
+Create a test Pub/Sub subscription in the Emulator:
 
 <!--codeinclude-->
-[Starting a Datastore container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:startingDatastoreEmulatorContainer
+[Create a test subscription](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:createSubscription
 <!--/codeinclude-->
 
+And test against the Emulator:
+
+<!--codeinclude-->
+[Testing with a Pub/Sub Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+<!--/codeinclude-->
+
+See more examples:
+
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java)
+ * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/pubsub-example/src/test/java/com/example/springboot/pubsub/PubSubIntegrationTests.java)
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index 4003ebdd342..138ff946f6f 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -20,8 +20,13 @@
 public class FirestoreEmulatorContainerTest {
 
     @Rule
-    public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators"));
+    // emulatorContainer {
+    public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
+    );
+    // }
 
+    // testWithEmulatorContainer {
     @Test
     public void testSimple() throws ExecutionException, InterruptedException {
         FirestoreOptions options = FirestoreOptions.getDefaultInstance().toBuilder()
@@ -44,5 +49,6 @@ public void testSimple() throws ExecutionException, InterruptedException {
 
         assertThat(querySnapshot.getDocuments().get(0).getData()).containsEntry("first", "Ada");
     }
+    // }
 
 }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index 3ea9f831d8e..2e692956418 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -33,9 +33,15 @@ public class PubSubEmulatorContainerTest {
     public static final String PROJECT_ID = "my-project-id";
 
     @Rule
-    public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators"));
+    // emulatorContainer {
+    public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
+    );
+    // }
+
 
     @Test
+    // testWithEmulatorContainer {
     public void testSimple() throws IOException {
         String hostport = emulator.getEmulatorEndpoint();
         ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
@@ -76,7 +82,9 @@ public void testSimple() throws IOException {
             channel.shutdown();
         }
     }
+    // }
 
+    // createTopic {
     private void createTopic(String topicId, TransportChannelProvider channelProvider, NoCredentialsProvider credentialsProvider) throws IOException {
         TopicAdminSettings topicAdminSettings = TopicAdminSettings.newBuilder()
                 .setTransportChannelProvider(channelProvider)
@@ -87,7 +95,9 @@ private void createTopic(String topicId, TransportChannelProvider channelProvide
             topicAdminClient.createTopic(topicName);
         }
     }
+    // }
 
+    // createSubscription {
     private void createSubscription(String subscriptionId, String topicId, TransportChannelProvider channelProvider, NoCredentialsProvider credentialsProvider) throws IOException {
         SubscriptionAdminSettings subscriptionAdminSettings = SubscriptionAdminSettings.newBuilder()
                 .setTransportChannelProvider(channelProvider)
@@ -97,5 +107,6 @@ private void createSubscription(String subscriptionId, String topicId, Transport
         ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(PROJECT_ID, subscriptionId);
         subscriptionAdminClient.createSubscription(subscriptionName, TopicName.of(PROJECT_ID, topicId), PushConfig.getDefaultInstance(), 10);
     }
+    // }
 
 }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
index 5a47f9429ad..f801ca5b547 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
@@ -25,12 +25,17 @@
 public class SpannerEmulatorContainerTest {
 
     @Rule
-    public SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.1.0"));
+    // emulatorContainer {
+    public SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(
+        DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.1.0")
+    );
+    // }
 
     private static final String PROJECT_NAME = "test-project";
     private static final String INSTANCE_NAME = "test-instance";
     private static final String DATABASE_NAME = "test-database";
 
+    // testWithEmulatorContainer {
     @Test
     public void testSimple() throws ExecutionException, InterruptedException {
         SpannerOptions options = SpannerOptions.newBuilder()
@@ -62,12 +67,16 @@ public void testSimple() throws ExecutionException, InterruptedException {
         assertThat(resultSet.getLong(0)).isEqualTo(1);
         assertThat(resultSet.getString(1)).isEqualTo("Java");
     }
+    // }
 
+    // createDatabase {
     private void createDatabase(Spanner spanner) throws InterruptedException, ExecutionException {
         DatabaseAdminClient dbAdminClient = spanner.getDatabaseAdminClient();
         Database database = dbAdminClient.createDatabase(INSTANCE_NAME, DATABASE_NAME, Arrays.asList("CREATE TABLE TestTable (Key INT64, Value STRING(MAX)) PRIMARY KEY (Key)")).get();
     }
+    // }
 
+    // createInstance {
     private InstanceId createInstance(Spanner spanner) throws InterruptedException, ExecutionException {
         InstanceConfigId instanceConfig = InstanceConfigId.of(PROJECT_NAME, "emulator-config");
         InstanceId instanceId = InstanceId.of(PROJECT_NAME, INSTANCE_NAME);
@@ -75,5 +84,6 @@ private InstanceId createInstance(Spanner spanner) throws InterruptedException,
         Instance instance = insAdminClient.createInstance(InstanceInfo.newBuilder(instanceId).setNodeCount(1).setDisplayName("Test instance").setInstanceConfigId(instanceConfig).build()).get();
         return instanceId;
     }
+    // }
 
 }

From dc0588e8a1272193e7f2ea59d2ac97d1f4110c39 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 2 Dec 2020 18:02:37 +0100
Subject: [PATCH 1100/4969] Pre-resolve LazyDockerClient from
 `GenericContainer#start()` (#3530)

---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 641096a0779..bece4ef3378 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -305,6 +305,8 @@ public void start() {
             return;
         }
         Startables.deepStart(dependencies).get();
+        // trigger LazyDockerClient's resolve so that we fail fast here and not in getDockerImageName()
+        dockerClient.authConfig();
         doStart();
     }
 

From 602343a87c06c53618b666e3b774652aa16e3dda Mon Sep 17 00:00:00 2001
From: Philip Graf <git@acanda.ch>
Date: Tue, 8 Dec 2020 15:29:09 +0100
Subject: [PATCH 1101/4969] Support timestamps with offset from "inspect image"
 (#3055)

The command "inspect image" can return a "created" timestamp without a
time zone offset (e.g. "2020-07-27T18:23:31.365190246Z") or with a time
zone offset (e.g. "2020-07-27T18:23:31.365190246+02:00"). This change
adds support for timestamps with a time zone offset.

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../org/testcontainers/images/ImageData.java  |  3 ++-
 .../testcontainers/images/ImageDataTest.java  | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/testcontainers/images/ImageDataTest.java

diff --git a/core/src/main/java/org/testcontainers/images/ImageData.java b/core/src/main/java/org/testcontainers/images/ImageData.java
index 54b07d5acf2..345b5939268 100644
--- a/core/src/main/java/org/testcontainers/images/ImageData.java
+++ b/core/src/main/java/org/testcontainers/images/ImageData.java
@@ -7,6 +7,7 @@
 import lombok.Value;
 
 import java.time.Instant;
+import java.time.ZonedDateTime;
 
 @Value
 @Builder
@@ -17,7 +18,7 @@ public class ImageData {
 
     static ImageData from(InspectImageResponse inspectImageResponse) {
         return ImageData.builder()
-            .createdAt(Instant.parse(inspectImageResponse.getCreated()))
+            .createdAt(ZonedDateTime.parse(inspectImageResponse.getCreated()).toInstant())
             .build();
     }
 
diff --git a/core/src/test/java/org/testcontainers/images/ImageDataTest.java b/core/src/test/java/org/testcontainers/images/ImageDataTest.java
new file mode 100644
index 00000000000..3b473cf7ffd
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/ImageDataTest.java
@@ -0,0 +1,27 @@
+package org.testcontainers.images;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Instant;
+
+import org.junit.Test;
+
+import com.github.dockerjava.api.command.InspectImageResponse;
+
+public class ImageDataTest {
+
+    @Test
+    public void shouldReadTimestampWithoutOffsetFromInspectImageResponse() {
+        final String timestamp = "2020-07-27T18:23:31.365190246Z";
+        final ImageData imageData = ImageData.from(new InspectImageResponse().withCreated(timestamp));
+        assertThat(imageData.getCreatedAt()).isEqualTo(Instant.parse(timestamp));
+    }
+
+    @Test
+    public void shouldReadTimestampWithOffsetFromInspectImageResponse() {
+        final String timestamp = "2020-07-27T18:23:31.365190246+02:00";
+        final ImageData imageData = ImageData.from(new InspectImageResponse().withCreated(timestamp));
+        assertThat(imageData.getCreatedAt()).isEqualTo(Instant.parse("2020-07-27T16:23:31.365190246Z"));
+    }
+
+}

From b0cc476550e12396030e5c819d5556f050e3db38 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 9 Dec 2020 23:15:56 +0100
Subject: [PATCH 1102/4969] Avoid using the image name filter. Fixes #3574
 (#3575)

* filter images by reference. Fixes #3574

* Use `inspectImageCmd`
---
 .../main/java/org/testcontainers/DockerClientFactory.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index d44cd3b5b6f..192a6b06ddb 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AccessMode;
@@ -36,6 +37,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -326,8 +328,9 @@ private boolean checkMountableFile() {
    */
     @SneakyThrows
     public void checkAndPullImage(DockerClient client, String image) {
-        List<Image> images = client.listImagesCmd().withImageNameFilter(image).exec();
-        if (images.isEmpty()) {
+        try {
+            client.inspectImageCmd(image).exec();
+        } catch (NotFoundException e) {
             client.pullImageCmd(image).exec(new TimeLimitedLoggedPullImageResultCallback(log)).awaitCompletion();
         }
     }

From d8df52e2168398b76392fce56f99e886253f8b44 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 10 Dec 2020 09:44:24 +0100
Subject: [PATCH 1103/4969] avoid code duplication by using `ContainerState` in
 `ResourceReaper` (#3573)

---
 .../testcontainers/DockerClientFactory.java   |  6 +--
 .../utility/ResourceReaper.java               | 49 ++++++++++++++-----
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 192a6b06ddb..98e8249e4e5 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -177,8 +177,7 @@ public DockerClient client() {
 
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
-        String hostIpAddress = strategy.getDockerHostIpAddress();
-        log.info("Docker host IP address is {}", hostIpAddress);
+        log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
         final DockerClient client = new DelegatingDockerClient(strategy.getDockerClient()) {
             @Override
             public void close() {
@@ -202,7 +201,8 @@ public void close() {
         if (useRyuk) {
             log.debug("Ryuk is enabled");
             try {
-                ryukContainerId = ResourceReaper.start(hostIpAddress, client);
+                //noinspection deprecation
+                ryukContainerId = ResourceReaper.start(client);
             } catch (RuntimeException e) {
                 cachedClientFailure = e;
                 throw e;
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 3b0cfa1e289..f409dbbc865 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -9,7 +9,6 @@
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
@@ -21,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ContainerState;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -70,8 +70,23 @@ private ResourceReaper() {
         dockerClient = DockerClientFactory.instance().client();
     }
 
-    @SneakyThrows(InterruptedException.class)
+
+    /**
+     *
+     * @deprecated internal API
+     */
+    @Deprecated
     public static String start(String hostIpAddress, DockerClient client) {
+        return start(client);
+    }
+
+    /**
+     *
+     * @deprecated internal API
+     */
+    @Deprecated
+    @SneakyThrows(InterruptedException.class)
+    public static String start(DockerClient client) {
         String ryukImage = ImageNameSubstitutor.instance()
             .apply(DockerImageName.parse("testcontainers/ryuk:0.3.0"))
             .asCanonicalNameString();
@@ -107,14 +122,22 @@ public void onNext(Frame frame) {
                 }
             });
 
-        InspectContainerResponse inspectedContainer = client.inspectContainerCmd(ryukContainerId).exec();
+        ContainerState containerState = new ContainerState() {
 
-        Integer ryukPort = inspectedContainer.getNetworkSettings().getPorts().getBindings().values().stream()
-                .flatMap(Stream::of)
-                .findFirst()
-                .map(Ports.Binding::getHostPortSpec)
-                .map(Integer::parseInt)
-                .get();
+            final InspectContainerResponse inspectedContainer = client.inspectContainerCmd(ryukContainerId).exec();
+
+            @Override
+            public List<Integer> getExposedPorts() {
+                return Stream.of(getContainerInfo().getConfig().getExposedPorts())
+                    .map(ExposedPort::getPort)
+                    .collect(Collectors.toList());
+            }
+
+            @Override
+            public InspectContainerResponse getContainerInfo() {
+                return inspectedContainer;
+            }
+        };
 
         CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
 
@@ -126,13 +149,15 @@ public void onNext(Frame frame) {
             );
         }
 
+        String host = containerState.getHost();
+        Integer ryukPort = containerState.getFirstMappedPort();
         Thread kiraThread = new Thread(
                 DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
                 () -> {
                     while (true) {
                         RYUK_ACK_RATE_LIMITER.doWhenReady(() -> {
                             int index = 0;
-                            try(Socket clientSocket = new Socket(hostIpAddress, ryukPort)) {
+                            try(Socket clientSocket = new Socket(host, ryukPort)) {
                                 FilterRegistry registry = new FilterRegistry(clientSocket.getInputStream(), clientSocket.getOutputStream());
 
                                 synchronized (DEATH_NOTE) {
@@ -157,7 +182,7 @@ public void onNext(Frame frame) {
                                     }
                                 }
                             } catch (IOException e) {
-                                log.warn("Can not connect to Ryuk at {}:{}", hostIpAddress, ryukPort, e);
+                                log.warn("Can not connect to Ryuk at {}:{}", host, ryukPort, e);
                             }
                         });
                     }
@@ -170,7 +195,7 @@ public void onNext(Frame frame) {
             // We need to wait before we can start any containers to make sure that we delete them
             if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
                 log.error("Timed out waiting for Ryuk container to start. Ryuk's logs:\n{}", ryukLog);
-                throw new IllegalStateException(String.format("Could not connect to Ryuk at %s:%s", hostIpAddress, ryukPort));
+                throw new IllegalStateException(String.format("Could not connect to Ryuk at %s:%s", host, ryukPort));
             }
         } finally {
             try {

From 0e263f296556c2357f0d4ea99d120a3a2880ceb3 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 10 Dec 2020 10:53:33 +0000
Subject: [PATCH 1104/4969] Default prefixing image substitutor (#3413)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../utility/DefaultImageNameSubstitutor.java  |  14 +-
 .../utility/DockerImageName.java              |  27 ++--
 .../PrefixingImageNameSubstitutor.java        |  58 ++++++++
 .../utility/TestcontainersConfiguration.java  |   3 -
 .../testcontainers/utility/Versioning.java    |   1 +
 ...estcontainers.utility.ImageNameSubstitutor |   1 +
 .../DockerImageNameCompatibilityTest.java     |   8 +-
 .../PrefixingImageNameSubstitutorTest.java    | 140 ++++++++++++++++++
 docs/features/image_name_substitution.md      |  32 +++-
 9 files changed, 257 insertions(+), 27 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java
 create mode 100644 core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor
 create mode 100644 core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java

diff --git a/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
index bcc7c96ba18..840b8a77b40 100644
--- a/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
@@ -5,31 +5,37 @@
 
 /**
  * Testcontainers' default implementation of {@link ImageNameSubstitutor}.
- * Delegates to {@link ConfigurationFileImageNameSubstitutor}.
+ * Delegates to {@link ConfigurationFileImageNameSubstitutor} followed by {@link PrefixingImageNameSubstitutor}.
  */
 @Slf4j
 final class DefaultImageNameSubstitutor extends ImageNameSubstitutor {
 
     private final ConfigurationFileImageNameSubstitutor configurationFileImageNameSubstitutor;
+    private final PrefixingImageNameSubstitutor prefixingImageNameSubstitutor;
 
     public DefaultImageNameSubstitutor() {
         configurationFileImageNameSubstitutor = new ConfigurationFileImageNameSubstitutor();
+        prefixingImageNameSubstitutor = new PrefixingImageNameSubstitutor();
     }
 
     @VisibleForTesting
     DefaultImageNameSubstitutor(
-        final ConfigurationFileImageNameSubstitutor configurationFileImageNameSubstitutor
+        final ConfigurationFileImageNameSubstitutor configurationFileImageNameSubstitutor,
+        final PrefixingImageNameSubstitutor prefixingImageNameSubstitutor
     ) {
         this.configurationFileImageNameSubstitutor = configurationFileImageNameSubstitutor;
+        this.prefixingImageNameSubstitutor = prefixingImageNameSubstitutor;
     }
 
     @Override
     public DockerImageName apply(final DockerImageName original) {
-        return configurationFileImageNameSubstitutor.apply(original);
+        return configurationFileImageNameSubstitutor
+            .andThen(prefixingImageNameSubstitutor)
+            .apply(original);
     }
 
     @Override
     protected String getDescription() {
-        return "DefaultImageNameSubstitutor (" + configurationFileImageNameSubstitutor.getDescription() + ")";
+        return "DefaultImageNameSubstitutor (composite of '" + configurationFileImageNameSubstitutor.getDescription() + "' and '" + prefixingImageNameSubstitutor.getDescription() + "')";
     }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
index af8e5300863..b9d266a41ca 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
@@ -5,6 +5,7 @@
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.With;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -24,8 +25,8 @@ public final class DockerImageName {
     private static final Pattern REPO_NAME = Pattern.compile(REPO_NAME_PART + "(/" + REPO_NAME_PART + ")*");
 
     private final String rawName;
-    private final String registry;
-    private final String repo;
+    @With @Getter private final String registry;
+    @With @Getter private final String repository;
     @NotNull @With(AccessLevel.PRIVATE)
     private final Versioning versioning;
     @Nullable @With(AccessLevel.PRIVATE)
@@ -68,13 +69,13 @@ public DockerImageName(String fullImageName) {
         }
 
         if (remoteName.contains("@sha256:")) {
-            repo = remoteName.split("@sha256:")[0];
+            repository = remoteName.split("@sha256:")[0];
             versioning = new Sha256Versioning(remoteName.split("@sha256:")[1]);
         } else if (remoteName.contains(":")) {
-            repo = remoteName.split(":")[0];
+            repository = remoteName.split(":")[0];
             versioning = new TagVersioning(remoteName.split(":")[1]);
         } else {
-            repo = remoteName;
+            repository = remoteName;
             versioning = Versioning.ANY;
         }
 
@@ -110,10 +111,10 @@ public DockerImageName(String nameWithoutTag, @NotNull String version) {
         }
 
         if (version.startsWith("sha256:")) {
-            repo = remoteName;
+            repository = remoteName;
             versioning = new Sha256Versioning(version.replace("sha256:", ""));
         } else {
-            repo = remoteName;
+            repository = remoteName;
             versioning = new TagVersioning(version);
         }
 
@@ -125,9 +126,9 @@ public DockerImageName(String nameWithoutTag, @NotNull String version) {
      */
     public String getUnversionedPart() {
         if (!"".equals(registry)) {
-            return registry + "/" + repo;
+            return registry + "/" + repository;
         } else {
-            return repo;
+            return repository;
         }
     }
 
@@ -158,18 +159,14 @@ public String toString() {
     public void assertValid() {
         //noinspection UnstableApiUsage
         HostAndPort.fromString(registry); // return value ignored - this throws if registry is not a valid host:port string
-        if (!REPO_NAME.matcher(repo).matches()) {
-            throw new IllegalArgumentException(repo + " is not a valid Docker image name (in " + rawName + ")");
+        if (!REPO_NAME.matcher(repository).matches()) {
+            throw new IllegalArgumentException(repository + " is not a valid Docker image name (in " + rawName + ")");
         }
         if (!versioning.isValid()) {
             throw new IllegalArgumentException(versioning + " is not a valid image versioning identifier (in " + rawName + ")");
         }
     }
 
-    public String getRegistry() {
-        return registry;
-    }
-
     /**
      * @param newTag version tag for the copy to use
      * @return an immutable copy of this {@link DockerImageName} with the new version tag
diff --git a/core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java
new file mode 100644
index 00000000000..c720416deac
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java
@@ -0,0 +1,58 @@
+package org.testcontainers.utility;
+
+import com.google.common.annotations.VisibleForTesting;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * An {@link ImageNameSubstitutor} which applies a prefix to all image names, e.g. a private registry host and path.
+ * The prefix may be set via an environment variable (<code>TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX</code>) or an equivalent
+ * configuration file entry (see {@link TestcontainersConfiguration}).
+ */
+@NoArgsConstructor
+@Slf4j
+final class PrefixingImageNameSubstitutor extends ImageNameSubstitutor {
+
+    @VisibleForTesting
+    static final String PREFIX_PROPERTY_KEY = "hub.image.name.prefix";
+
+    private TestcontainersConfiguration configuration = TestcontainersConfiguration.getInstance();
+
+    @VisibleForTesting
+    PrefixingImageNameSubstitutor(final TestcontainersConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    @Override
+    public DockerImageName apply(DockerImageName original) {
+        final String configuredPrefix = configuration.getEnvVarOrProperty(PREFIX_PROPERTY_KEY, "");
+
+        if (configuredPrefix.isEmpty()) {
+            log.debug("No prefix is configured");
+            return original;
+        }
+
+        boolean isAHubImage = original.getRegistry().isEmpty();
+        if (!isAHubImage) {
+            log.debug("Image {} is not a Docker Hub image - not applying registry/repository change", original);
+            return original;
+        }
+
+        log.debug(
+            "Applying changes to image name {}: applying prefix '{}'",
+            original,
+            configuredPrefix
+        );
+
+        DockerImageName prefixAsImage = DockerImageName.parse(configuredPrefix);
+
+        return original
+            .withRegistry(prefixAsImage.getRegistry())
+            .withRepository(prefixAsImage.getRepository() + original.getRepository());
+    }
+
+    @Override
+    protected String getDescription() {
+        return getClass().getSimpleName();
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 47c274c05e6..3b4d9f8f70c 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -212,7 +212,6 @@ private String getConfigurable(@NotNull final String propertyName, @Nullable fin
      * @param propertyName name of configuration file property (dot-separated lower case)
      * @return the found value, or null if not set
      */
-    @Nullable
     @Contract("_, !null -> !null")
     public String getEnvVarOrProperty(@NotNull final String propertyName, @Nullable final String defaultValue) {
         return getConfigurable(propertyName, defaultValue, userProperties, classpathProperties);
@@ -225,7 +224,6 @@ public String getEnvVarOrProperty(@NotNull final String propertyName, @Nullable
      * @param propertyName name of configuration file property (dot-separated lower case)
      * @return the found value, or null if not set
      */
-    @Nullable
     @Contract("_, !null -> !null")
     public String getEnvVarOrUserProperty(@NotNull final String propertyName, @Nullable final String defaultValue) {
         return getConfigurable(propertyName, defaultValue, userProperties);
@@ -238,7 +236,6 @@ public String getEnvVarOrUserProperty(@NotNull final String propertyName, @Nulla
      * @param propertyName name of configuration file property (dot-separated lower case)
      * @return the found value, or null if not set
      */
-    @Nullable
     @Contract("_, !null -> !null")
     public String getUserProperty(@NotNull final String propertyName, @Nullable final String defaultValue) {
         return getConfigurable(propertyName, defaultValue);
diff --git a/core/src/main/java/org/testcontainers/utility/Versioning.java b/core/src/main/java/org/testcontainers/utility/Versioning.java
index 84dcf46274e..4b1da407440 100644
--- a/core/src/main/java/org/testcontainers/utility/Versioning.java
+++ b/core/src/main/java/org/testcontainers/utility/Versioning.java
@@ -46,6 +46,7 @@ public int hashCode() {
     @EqualsAndHashCode
     class TagVersioning implements Versioning {
         public static final String TAG_REGEX = "[\\w][\\w.\\-]{0,127}";
+        static final TagVersioning LATEST = new TagVersioning("latest");
         private final String tag;
 
         TagVersioning(String tag) {
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor b/core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor
new file mode 100644
index 00000000000..069dc7ee710
--- /dev/null
+++ b/core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor
@@ -0,0 +1 @@
+org.testcontainers.utility.DefaultImageNameSubstitutor
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index 7c794814faf..22d67de5785 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -1,13 +1,13 @@
 package org.testcontainers.utility;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import static org.hamcrest.core.StringContains.containsString;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 
 public class DockerImageNameCompatibilityTest {
 
diff --git a/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
new file mode 100644
index 00000000000..d2c33989deb
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
@@ -0,0 +1,140 @@
+package org.testcontainers.utility;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.utility.PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY;
+
+public class PrefixingImageNameSubstitutorTest {
+
+    private TestcontainersConfiguration mockConfiguration;
+    private PrefixingImageNameSubstitutor underTest;
+
+    @Before
+    public void setUp() {
+        mockConfiguration = mock(TestcontainersConfiguration.class);
+        underTest = new PrefixingImageNameSubstitutor(mockConfiguration);
+    }
+
+    @Test
+    public void testHappyPath() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
+
+        assertEquals(
+            "The prefix is applied",
+            "someregistry.com/our-mirror/some/image:tag",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void hubIoRegistryIsNotChanged() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("docker.io/some/image:tag"));
+
+        assertEquals(
+            "The prefix is applied",
+            "docker.io/some/image:tag",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void hubComRegistryIsNotChanged() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("registry.hub.docker.com/some/image:tag"));
+
+        assertEquals(
+            "The prefix is applied",
+            "registry.hub.docker.com/some/image:tag",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void thirdPartyRegistriesNotAffected() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("gcr.io/something/image:tag"));
+
+        assertEquals(
+            "The prefix is not applied if a third party registry is used",
+            "gcr.io/something/image:tag",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void testNoDoublePrefixing() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("someregistry.com/some/image:tag"));
+
+        assertEquals(
+            "The prefix is not applied if already present",
+            "someregistry.com/some/image:tag",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void testHandlesEmptyValue() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
+
+        assertEquals(
+            "The prefix is not applied if the env var is not set",
+            "some/image:tag",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void testHandlesRegistryOnlyWithTrailingSlash() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
+
+        assertEquals(
+            "The prefix is applied",
+            "someregistry.com/some/image:tag",
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void testCombinesLiterallyForRegistryOnlyWithoutTrailingSlash() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
+
+        assertEquals(
+            "The prefix is applied",
+            "someregistry.comsome/image:tag",   // treating the prefix literally, for predictability
+            result.asCanonicalNameString()
+        );
+    }
+
+    @Test
+    public void testCombinesLiterallyForBothPartsWithoutTrailingSlash() {
+        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror");
+
+        final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
+
+        assertEquals(
+            "The prefix is applied",
+            "someregistry.com/our-mirrorsome/image:tag",   // treating the prefix literally, for predictability
+            result.asCanonicalNameString()
+        );
+    }
+}
diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
index 45ea6038b49..37088473d72 100644
--- a/docs/features/image_name_substitution.md
+++ b/docs/features/image_name_substitution.md
@@ -45,7 +45,37 @@ to:
 
 
 
+## Automatically modifying Docker Hub image names
 
+Testcontainers can be configured to modify Docker Hub image names on the fly to apply a prefix string.
+
+Consider this if:
+
+* Developers and CI machines need to use different image names. For example, developers are able to pull images from Docker Hub, but CI machines need to pull from a private registry
+* Your private registry has copies of images from Docker Hub where the names are predictable, and just adding a prefix is enough. 
+  For example, `registry.mycompany.com/mirror/mysql:8.0.22` can be derived from the original Docker Hub image name (`mysql:8.0.22`) with a consistent prefix string: `registry.mycompany.com/mirror/`
+
+In this case, image name references in code are **unchanged**.
+i.e. you would leave as-is:
+
+<!--codeinclude--> 
+[Unchanged direct Docker Hub image name](../examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java) inside_block:directDockerHubReference
+<!--/codeinclude-->
+
+You can then configure Testcontainers to apply the prefix `registry.mycompany.com/mirror/` to every image that it tries to pull from Docker Hub.
+This can be done in one of two ways:
+
+* Setting environment variables `TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX=registry.mycompany.com/mirror/`
+* Via config file, setting `hub.image.name.prefix` in either:
+    * the `~/.testcontainers.properties` file in your user home directory, or
+    * a file named `testcontainers.properties` on the classpath
+    
+Testcontainers will automatically apply the prefix to every image that it pulls from Docker Hub - please verify that all [the required images](../supported_docker_environment/image_registry_rate_limiting.md#which-images-are-used-by-testcontainers) exist in your registry.
+
+Testcontainers will not apply the prefix to:
+
+* non-Hub image names (e.g. where another registry is set)
+* Docker Hub image names where the hub registry is explicitly part of the name (i.e. anything with a `docker.io` or `registry.hub.docker.com` host part)
 
 
 
@@ -54,7 +84,7 @@ to:
 Consider this if:
 
 * You have complex rules about which private registry images should be used as substitutes, e.g.:
-    * non-deterministic mapping of names meaning that a [name prefix](#adding-a-registry-url-prefix-to-image-names-automatically) cannot be used
+    * non-deterministic mapping of names meaning that a [name prefix](#automatically-modifying-docker-hub-image-names) cannot be used
     * rules depending upon developer identity or location
 * or you wish to add audit logging of images used in the build
 * or you wish to prevent accidental usage of images that are not on an approved list

From f76970f570fd1f1dcd0a6087162de8a3e7733d29 Mon Sep 17 00:00:00 2001
From: Ray Tsang <saturnism@users.noreply.github.com>
Date: Thu, 10 Dec 2020 18:59:21 +0800
Subject: [PATCH 1105/4969] Added Bigtable emulator container support (#3466)

* Added Bigtable emulator container support

* changed port to be consistent w/ other emulators

* Update modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* Removed `getEmulatorHost`

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 modules/gcloud/build.gradle                   |  1 +
 .../containers/BigtableEmulatorContainer.java | 44 +++++++++
 .../BigtableEmulatorContainerTest.java        | 95 +++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
 create mode 100644 modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index a5737648a4b..aa42d7dc560 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,5 +7,6 @@ dependencies {
     testCompile 'com.google.cloud:google-cloud-firestore:1.33.0'
     testCompile 'com.google.cloud:google-cloud-pubsub:1.105.0'
     testCompile 'com.google.cloud:google-cloud-spanner:1.50.0'
+    testCompile 'com.google.cloud:google-cloud-bigtable:1.17.3'
     testCompile 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
new file mode 100644
index 00000000000..4b81e3964ce
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -0,0 +1,44 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Bigtable container that relies in google cloud sdk.
+ *
+ * Default port is 9000.
+ *
+ * @author Eddú Meléndez
+ * @author Ray Tsang
+ */
+public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+
+    private static final String CMD = "gcloud beta emulators bigtable start --host-port 0.0.0.0:9000";
+    private static final int PORT = 9000;
+
+    public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(PORT);
+        setWaitStrategy(new LogMessageWaitStrategy()
+                .withRegEx("(?s).*running.*$"));
+        withCommand("/bin/sh", "-c", CMD);
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getHost() + ":" + getEmulatorPort();
+    }
+
+    public int getEmulatorPort() {
+        return getMappedPort(PORT);
+    }
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
new file mode 100644
index 00000000000..0cc44afcc77
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -0,0 +1,95 @@
+package org.testcontainers.containers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.api.core.ApiFuture;
+import com.google.api.gax.batching.Batcher;
+import com.google.api.gax.core.CredentialsProvider;
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.rpc.FixedTransportChannelProvider;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient;
+import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
+import com.google.cloud.bigtable.admin.v2.models.CreateInstanceRequest;
+import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
+import com.google.cloud.bigtable.admin.v2.models.Instance;
+import com.google.cloud.bigtable.admin.v2.models.Table;
+import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStub;
+import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStubSettings;
+import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStubSettings;
+import com.google.cloud.bigtable.admin.v2.stub.EnhancedBigtableTableAdminStub;
+import com.google.cloud.bigtable.data.v2.BigtableDataClient;
+import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
+import com.google.cloud.bigtable.data.v2.models.Row;
+import com.google.cloud.bigtable.data.v2.models.RowCell;
+import com.google.cloud.bigtable.data.v2.models.RowMutation;
+import com.google.cloud.bigtable.data.v2.models.RowMutationEntry;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+public class BigtableEmulatorContainerTest {
+
+    public static final String PROJECT_ID = "test-project";
+    public static final String INSTANCE_ID = "test-instance";
+
+    @Rule
+    // emulatorContainer {
+    public BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
+    );
+    // }
+
+    @Test
+    // testWithEmulatorContainer {
+    public void testSimple() throws IOException, InterruptedException, ExecutionException {
+        ManagedChannel channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint())
+            .usePlaintext().build();
+
+        TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
+        NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
+
+        try {
+            createTable(channelProvider, credentialsProvider, "test-table" );
+
+            BigtableDataClient client = BigtableDataClient.create(BigtableDataSettings
+                .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
+                .setProjectId(PROJECT_ID)
+                .setInstanceId(INSTANCE_ID)
+                .build());
+
+            client.mutateRow(RowMutation.create("test-table", "1")
+                .setCell("name", "firstName", "Ray"));
+
+            Row row = client.readRow("test-table", "1");
+            List<RowCell> cells = row.getCells("name", "firstName");
+
+            assertThat(cells).isNotNull().hasSize(1);
+            assertThat(cells.get(0).getValue().toStringUtf8()).isEqualTo("Ray");
+        } finally {
+            channel.shutdown();
+        }
+    }
+    // }
+
+    // createTable {
+    private void createTable(TransportChannelProvider channelProvider, CredentialsProvider credentialsProvider, String tableName) throws IOException {
+        EnhancedBigtableTableAdminStub stub = EnhancedBigtableTableAdminStub
+            .createEnhanced(BigtableTableAdminStubSettings.newBuilder()
+                .setTransportChannelProvider(channelProvider)
+                .setCredentialsProvider(credentialsProvider)
+                .build());
+
+        try (BigtableTableAdminClient client = BigtableTableAdminClient.create(PROJECT_ID, INSTANCE_ID, stub)) {
+            Table table = client.createTable(CreateTableRequest.of(tableName).addFamily("name"));
+        }
+    }
+    // }
+}

From d60d490733a9646f8f6eff12d928909afcac86d7 Mon Sep 17 00:00:00 2001
From: Michal Hlavac <miso@hlavki.eu>
Date: Thu, 10 Dec 2020 12:01:43 +0100
Subject: [PATCH 1106/4969] `PostgisContainerProvider` ignores tag parameter
 and uses `DEFAULT_TAG` (#3465)

Co-authored-by: Michal Hlavac <michal.hlavac@xit.camp>
---
 .../org/testcontainers/containers/PostgisContainerProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
index 76c213f0931..e41a349365c 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
@@ -27,7 +27,7 @@ public JdbcDatabaseContainer newInstance() {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new PostgreSQLContainer<>(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+        return new PostgreSQLContainer<>(DEFAULT_IMAGE_NAME.withTag(tag));
     }
 
     @Override

From 1b2d228e3099488c0e5de0c1e3a5dacbf4d3f88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavi=20Arias=20Segu=C3=AD?=
 <876579+xaviarias@users.noreply.github.com>
Date: Thu, 10 Dec 2020 11:18:26 +0000
Subject: [PATCH 1107/4969] Add `HttpWaitStrategy#withMethod` (#3533)

---
 .../containers/wait/strategy/HttpWaitStrategy.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index 5fd7834b12d..a2bf4c4899e 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -35,6 +35,7 @@ public class HttpWaitStrategy extends AbstractWaitStrategy {
     private static final String AUTH_BASIC = "Basic ";
 
     private String path = "/";
+    private String method = "GET";
     private Set<Integer> statusCodes = new HashSet<>();
     private boolean tlsEnabled;
     private String username;
@@ -97,6 +98,17 @@ public HttpWaitStrategy usingTls() {
         return this;
     }
 
+    /**
+     * Indicates the HTTP method to use (<code>GET</code> by default).
+     *
+     * @param method the HTTP method.
+     * @return this
+     */
+    public HttpWaitStrategy withMethod(String method) {
+        this.method = method;
+        return this;
+    }
+
     /**
      * Authenticate with HTTP Basic Authorization credentials.
      *
@@ -167,7 +179,7 @@ protected void waitUntilReady() {
                             connection.setUseCaches(false);
                         }
 
-                        connection.setRequestMethod("GET");
+                        connection.setRequestMethod(method);
                         connection.connect();
 
                         log.trace("Get response code {}", connection.getResponseCode());

From af678a3463e21a0b4d5118e507177d12759ae339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alan=20Artigao=20Carre=C3=B1o?= <alanartigao@gmail.com>
Date: Thu, 10 Dec 2020 12:28:28 +0100
Subject: [PATCH 1108/4969] Expose Toxiproxy control port and proxy name
 (#3454)

* Expose Toxiproxy control port and proxy name

In order to work with and external Toxiproxy client we need the control
port to get the mapped port and the proxy names to interact with.

* Accessor for Toxiproxy mapped control port

Hidden the port constant again and created accessor for Toxiproxy
mapped control port.
---
 .../containers/ToxiproxyContainer.java             | 11 +++++++++++
 .../testcontainers/containers/ToxiproxyTest.java   | 14 ++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index e6c143fa358..e22cc1fdd55 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -63,6 +63,13 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
         client = new ToxiproxyClient(getHost(), getMappedPort(TOXIPROXY_CONTROL_PORT));
     }
 
+    /**
+     * @return Publicly exposed Toxiproxy HTTP API control port.
+     */
+    public int getControlPort() {
+        return getMappedPort(TOXIPROXY_CONTROL_PORT);
+    }
+
     /**
      * Obtain a {@link ContainerProxy} instance for target container that is managed by Testcontainers. The target
      * container should be routable from this <b>from this {@link ToxiproxyContainer} instance</b> (e.g. on the same
@@ -130,6 +137,10 @@ public static class ContainerProxy {
         @Getter private final int originalProxyPort;
         private boolean isCurrentlyCut;
 
+        public String getName() {
+            return toxi.getName();
+        }
+
         public ToxicList toxics() {
             return toxi.toxics();
         }
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 87f9758ebf1..3177fb2e8e8 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -149,6 +149,20 @@ public void testOriginalAndMappedPorts() {
         assertEquals("mapped port is correct", toxiproxy.getMappedPort(proxy2.getOriginalProxyPort()), proxy2.getProxyPort());
     }
 
+    @Test
+    public void testProxyName() {
+        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy("hostname", 7070);
+
+        assertEquals("proxy name is hostname and port", "hostname:7070", proxy.getName());
+    }
+
+    @Test
+    public void testControlPort() {
+        final int controlPort = toxiproxy.getControlPort();
+
+        assertEquals("control port is mapped from port 8474", toxiproxy.getMappedPort(8474), controlPort);
+    }
+
     private void checkCallWithLatency(Jedis jedis, final String description, int expectedMinLatency, long expectedMaxLatency) {
         final long start = System.currentTimeMillis();
         String s = jedis.get("somekey");

From c3a8ca76d0ed69f71c94e5bc2f7f1e0eef1a2259 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 10 Dec 2020 20:58:26 +0100
Subject: [PATCH 1109/4969] Update to docker-java 3.2.7 (#3577)

---
 core/build.gradle                                         | 8 ++++----
 .../dockerclient/DockerClientProviderStrategy.java        | 8 +++++++-
 .../testcontainers/containers/GenericContainerTest.java   | 2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index ed0fc00d4f6..db624e555d9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -173,9 +173,9 @@ dependencies {
 
     compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compile "com.github.docker-java:docker-java-api:3.2.6"
+    compile "com.github.docker-java:docker-java-api:3.2.7"
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.6') {
+    shaded ('com.github.docker-java:docker-java-core:3.2.7') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
         exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -184,13 +184,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.6') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.7') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.6'
+    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.7'
 
     shaded "org.yaml:snakeyaml:1.27"
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 1bd51da1263..35e3b6eabb8 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.okhttp.OkDockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
@@ -236,9 +237,14 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
                 throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
         }
 
+        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
+
+        if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
+            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_30);
+        }
         return DockerClientImpl.getInstance(
             new AuthDelegatingDockerClientConfig(
-                DefaultDockerClientConfig.createDefaultConfigBuilder()
+                configBuilder
                     .withDockerHost(transportConfig.getDockerHost().toString())
                     .build()
             ),
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 5008ba5baca..e059a48709f 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -27,7 +27,7 @@ public class GenericContainerTest {
     public void shouldReportOOMAfterWait() {
         Info info = DockerClientFactory.instance().client().infoCmd().exec();
         // Poor man's rootless Docker detection :D
-        Assumptions.assumeThat(info.getDriver()).doesNotContain("vfs");
+        Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("rootless");
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())

From f033c13086d99d01f398d86187ee6a9a465b6ee2 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 11 Dec 2020 12:49:40 +0100
Subject: [PATCH 1110/4969] Always use Path for MountableFile (#3514)

Also, be conscious on Windows when adding host bind for Docker socket.
Make sure ContainerisedDockerCompose consciously uses Unix path when necessary.

Fixes #3493
---
 .../containers/DockerComposeContainer.java             | 10 +++++++++-
 .../testcontainers/containers/GenericContainer.java    | 10 ++++++++--
 .../java/org/testcontainers/utility/MountableFile.java |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 7a67073e383..3d58ad53b3b 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -33,6 +33,7 @@
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.LogUtils;
 import org.testcontainers.utility.MountableFile;
+import org.testcontainers.utility.PathUtils;
 import org.testcontainers.utility.ResourceReaper;
 import org.zeroturnaround.exec.InvalidExitValueException;
 import org.zeroturnaround.exec.ProcessExecutor;
@@ -618,12 +619,13 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
         // Map the docker compose file into the container
         final File dockerComposeBaseFile = composeFiles.get(0);
         final String pwd = dockerComposeBaseFile.getAbsoluteFile().getParentFile().getAbsolutePath();
-        final String containerPwd = MountableFile.forHostPath(pwd).getFilesystemPath();
+        final String containerPwd =  convertToUnixFilesystemPath(pwd);
 
         final List<String> absoluteDockerComposeFiles = composeFiles.stream()
             .map(File::getAbsolutePath)
             .map(MountableFile::forHostPath)
             .map(MountableFile::getFilesystemPath)
+            .map(this::convertToUnixFilesystemPath)
             .collect(toList());
         final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPERATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
         logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
@@ -669,6 +671,12 @@ public void invoke() {
                 StringUtils.join(this.getCommandParts(), ' '));
         }
     }
+
+    private String convertToUnixFilesystemPath(String path) {
+        return SystemUtils.IS_OS_WINDOWS
+            ? PathUtils.createMinGWPath(path).substring(1)
+            : path;
+    }
 }
 
 /**
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index bece4ef3378..0a0962cd6c0 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -63,6 +63,7 @@
 import lombok.SneakyThrows;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.runner.Description;
@@ -946,9 +947,14 @@ public void addEnv(String key, String value) {
      */
     @Override
     public void addFileSystemBind(final String hostPath, final String containerPath, final BindMode mode, final SelinuxContext selinuxContext) {
+        if (SystemUtils.IS_OS_WINDOWS && hostPath.startsWith("/")) {
+            // e.g. Docker socket mount
+            binds.add(new Bind(hostPath, new Volume(containerPath), mode.accessMode, selinuxContext.selContext));
 
-        final MountableFile mountableFile = MountableFile.forHostPath(hostPath);
-        binds.add(new Bind(mountableFile.getResolvedPath(), new Volume(containerPath), mode.accessMode, selinuxContext.selContext));
+        } else {
+            final MountableFile mountableFile = MountableFile.forHostPath(hostPath);
+            binds.add(new Bind(mountableFile.getResolvedPath(), new Volume(containerPath), mode.accessMode, selinuxContext.selContext));
+        }
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 7b7367b9290..1982538f45d 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -105,7 +105,7 @@ public static MountableFile forClasspathResource(@NotNull final String resourceN
      * @return a {@link MountableFile} that may be used to obtain a mountable path
      */
     public static MountableFile forHostPath(@NotNull final String path, Integer mode) {
-        return new MountableFile(new File(path).toURI().toString(), mode);
+        return forHostPath(Paths.get(path), mode);
     }
 
     /**

From 16c82a4ab24b2a4b9d530ccd566d3ee386a92e9c Mon Sep 17 00:00:00 2001
From: Kirill Merkushev <lanwen@yandex.ru>
Date: Fri, 11 Dec 2020 15:06:55 +0100
Subject: [PATCH 1111/4969] Make MockServer compatible with newer (5.11.x)
 versions (#3437)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 docs/modules/mockserver.md                    |  6 +-
 .../containers/MockServerContainer.java       |  5 +-
 .../MockServerContainerRuleTest.java          | 40 +++++++++++++
 .../containers/MockServerContainerTest.java   | 56 +++++--------------
 .../containers/SimpleHttpClient.java          | 17 ++++++
 5 files changed, 80 insertions(+), 44 deletions(-)
 create mode 100644 modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
 create mode 100644 modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java

diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md
index 051cecf076e..ead9d123915 100644
--- a/docs/modules/mockserver.md
+++ b/docs/modules/mockserver.md
@@ -7,13 +7,13 @@ Mock Server can be used to mock HTTP services by matching requests against user-
 The following example shows how to start Mockserver.
 
 <!--codeinclude-->
-[Creating a MockServer container](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java) inside_block:creatingProxy
+[Creating a MockServer container](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java) inside_block:creatingProxy
 <!--/codeinclude-->
 
 And how to set a simple expectation using the Java MockServerClient.
 
 <!--codeinclude-->
-[Setting a simple expectation](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java) inside_block:testSimpleExpectation
+[Setting a simple expectation](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java) inside_block:testSimpleExpectation
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
@@ -33,3 +33,5 @@ testCompile "org.testcontainers:mockserver:{{latest_version}}"
 </dependency>
 ```
 
+Additionally, don't forget to add a [client dependency `org.mock-server:mockserver-client-java`](https://search.maven.org/search?q=mockserver-client-java) 
+to be able to set expectations, it's not provided by the testcontainers module. Client version should match to the version in a container tag.
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 451a4710b20..0502469208e 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 @Slf4j
@@ -33,7 +34,9 @@ public MockServerContainer(String version) {
     public MockServerContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
 
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DockerImageName.parse("mockserver/mockserver"));
+
+        waitingFor(Wait.forHttp("/mockserver/status").withMethod("PUT").forStatusCode(200));
 
         withCommand("-logLevel INFO -serverPort " + PORT);
         addExposedPorts(PORT);
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
new file mode 100644
index 00000000000..d0c290ad46a
--- /dev/null
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -0,0 +1,40 @@
+package org.testcontainers.containers;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockserver.client.MockServerClient;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+
+public class MockServerContainerRuleTest {
+
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("jamesdbloom/mockserver:mockserver-5.5.4");
+
+    // creatingProxy {
+    @Rule
+    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
+    // }
+
+    @Test
+    public void shouldReturnExpectation() throws Exception {
+        // testSimpleExpectation {
+        new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
+            .when(request()
+                .withPath("/person")
+                .withQueryStringParameter("name", "peter"))
+            .respond(response()
+                .withBody("Peter the person!"));
+
+        // ...a GET request to '/person?name=peter' returns "Peter the person!"
+        // }
+
+        assertThat("Expectation returns expected response body",
+            SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"),
+            containsString("Peter the person")
+        );
+    }
+}
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index e4d11ed3f39..61a5c33c630 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -1,57 +1,19 @@
 package org.testcontainers.containers;
 
-import lombok.Cleanup;
-import org.junit.Rule;
 import org.junit.Test;
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class MockServerContainerTest {
 
     public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("jamesdbloom/mockserver:mockserver-5.5.4");
 
-    // creatingProxy {
-    @Rule
-    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
-    // }
-
-    private static String responseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
-        URLConnection urlConnection = new URL(mockServer.getEndpoint() + path).openConnection();
-        @Cleanup BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
-        return reader.readLine();
-    }
-
-    @Test
-    public void shouldReturnExpectation() throws Exception {
-        // testSimpleExpectation {
-        new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
-            .when(request()
-                .withPath("/person")
-                .withQueryStringParameter("name", "peter"))
-            .respond(response()
-                .withBody("Peter the person!"));
-
-        // ...a GET request to '/person?name=peter' returns "Peter the person!"
-        // }
-
-        assertThat("Expectation returns expected response body",
-            responseFromMockserver(mockServer, "/person?name=peter"),
-            containsString("Peter the person")
-        );
-    }
-
     @Test
     public void shouldCallActualMockserverVersion() throws Exception {
         String actualVersion = MockServerClient.class.getPackage().getImplementationVersion();
@@ -60,14 +22,26 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
             String expectedBody = "Hello World!";
 
-            new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
+            MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort());
+
+            assertTrue("Mockserver running", client.isRunning());
+
+            client
                 .when(request().withPath("/hello"))
                 .respond(response().withBody(expectedBody));
 
             assertThat("MockServer returns correct result",
-                responseFromMockserver(mockServer, "/hello"),
+                SimpleHttpClient.responseFromMockserver(mockServer, "/hello"),
                 equalTo(expectedBody)
             );
         }
     }
+
+    @Test
+    public void newVersionStartsWithDefaultWaitStrategy() {
+        DockerImageName dockerImageName = DockerImageName.parse("mockserver/mockserver:mockserver-5.11.2");
+        try (MockServerContainer mockServer = new MockServerContainer(dockerImageName)) {
+            mockServer.start();
+        }
+    }
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
new file mode 100644
index 00000000000..cd5cb25cabb
--- /dev/null
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
@@ -0,0 +1,17 @@
+package org.testcontainers.containers;
+
+import lombok.Cleanup;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+
+public class SimpleHttpClient {
+    public static String responseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
+        URLConnection urlConnection = new URL(mockServer.getEndpoint() + path).openConnection();
+        @Cleanup BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+        return reader.readLine();
+    }
+}

From 4fc04b64e474075bb88c1f4886a1189d89e01da4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 11 Dec 2020 15:16:05 +0100
Subject: [PATCH 1112/4969] Use lower Jackson version to avoid conflicts.
 (#3579)

Helps with #3433
---
 core/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index db624e555d9..0dc6f07ddf9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -175,6 +175,10 @@ dependencies {
 
     compile "com.github.docker-java:docker-java-api:3.2.7"
 
+    // use lower Jackson version
+    shaded ('com.fasterxml.jackson.core:jackson-databind:2.8.8') {
+        exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
+    }
     shaded ('com.github.docker-java:docker-java-core:3.2.7') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')

From 6932c7aaf98cc17ee66ed5ab33f7a85456a5850d Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 11 Dec 2020 18:36:24 +0100
Subject: [PATCH 1113/4969] Update mkdocs.yml to the latest release

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 618b9679291..2457d06bcf0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -94,4 +94,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.15.0
+    latest_version: 1.15.1

From 87da74e422c519cd0ac2fa124a0e47819145d5b0 Mon Sep 17 00:00:00 2001
From: jochenchrist <jochenchrist@gmail.com>
Date: Sat, 12 Dec 2020 16:55:17 +0100
Subject: [PATCH 1114/4969] Startables#deepStart with varargs (#3261)

Co-authored-by: Jochen Christ <jochen.christ@innoq.com>
---
 .../java/org/testcontainers/lifecycle/Startables.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
index 292e1ab17b3..5ec46f1edb9 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startables.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -1,5 +1,6 @@
 package org.testcontainers.lifecycle;
 
+import java.util.Arrays;
 import lombok.experimental.UtilityClass;
 
 import java.util.Collection;
@@ -42,6 +43,13 @@ public CompletableFuture<Void> deepStart(Iterable<? extends Startable> startable
         return deepStart(StreamSupport.stream(startables.spliterator(), false));
     }
 
+    /**
+     * @see #deepStart(Stream)
+     */
+    public CompletableFuture<Void> deepStart(Startable... startables) {
+        return deepStart(Arrays.stream(startables));
+    }
+
     /**
      * Start every {@link Startable} recursively and asynchronously and join on the result.
      *

From 30f399eca0e4d56c5701cc2aa02bec85f875d6ec Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 29 Dec 2020 13:00:48 +0100
Subject: [PATCH 1115/4969] Remove ciMate (#3631)

---
 .circleci/config.yml                     |  9 ---------
 .github/workflows/ci-docker-wormhole.yml |  9 ---------
 .github/workflows/ci-examples.yml        | 10 ----------
 .github/workflows/ci-rootless.yml        | 10 ----------
 .github/workflows/ci.yml                 | 20 --------------------
 azure-pipelines.yml                      |  2 --
 6 files changed, 60 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8f700dba2b5..b8f75aaf4db 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,15 +7,6 @@ jobs:
     - checkout
     - run:
         command: ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
-    - run:
-        name: aggregate test reports with ciMate
-        when: always
-        environment:
-          CIMATE_PROJECT_ID: 2348n4vl
-        command: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
     - run:
         name: Save test results
         command: |
diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index f9e106d56b7..d750d8b39e0 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -18,12 +18,3 @@ jobs:
             -w "$PWD" \
             openjdk:8-jdk-alpine \
             ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
-      - name: aggregate test reports with ciMate
-        if: always()
-        continue-on-error: true
-        env:
-          CIMATE_PROJECT_ID: 2348n4vl
-        run: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 4f91341a4a6..d69aebcfa88 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -57,13 +57,3 @@ jobs:
         working-directory: ./examples/
         run: |
           ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
-      - name: Aggregate Examples test reports with ciMate
-        if: always()
-        continue-on-error: true
-        env:
-          CIMATE_PROJECT_ID: 2348n4vl
-          CIMATE_CI_KEY: "Examples / ${{ runner.os }} / ${{matrix.gradle_args}}"
-        run: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index bf1fe08bbd2..71ded85cf53 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -32,13 +32,3 @@ jobs:
           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 --tests '*GenericContainerRuleTest'
-      - name: aggregate test reports with ciMate
-        if: always()
-        continue-on-error: true
-        env:
-          CIMATE_PROJECT_ID: 2348n4vl
-          CIMATE_CI_KEY: "CI / rootless Docker (${{ matrix.XDG_RUNTIME_DIR }})"
-        run: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df38f3b8a4f..ef0f915972b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,16 +54,6 @@ jobs:
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
-      - name: Aggregate test reports with ciMate
-        if: always()
-        continue-on-error: true
-        env:
-          CIMATE_PROJECT_ID: 2348n4vl
-          CIMATE_CI_KEY: "CI / ${{ runner.os }} / ${{matrix.gradle_args}}"
-        run: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
   httpclient5_test:
     runs-on: ubuntu-18.04
     steps:
@@ -73,13 +63,3 @@ jobs:
           echo "transport.type=httpclient5" > $HOME/.testcontainers.properties
           cat $HOME/.testcontainers.properties
           ./gradlew --no-daemon --scan testcontainers:test --tests '*EventStreamTest'
-      - name: aggregate test reports with ciMate
-        if: always()
-        continue-on-error: true
-        env:
-          CIMATE_PROJECT_ID: 2348n4vl
-          CIMATE_CI_KEY: "CI / Apache HttpClient5"
-        run: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 185240ae7eb..1471f9948ca 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,8 +17,6 @@ jobs:
         tasks: "clean testcontainers:test --tests GenericContainerRuleTest"
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
-  - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: and(succeededOrFailed(),eq(variables['Agent.OS'], 'Linux'))
 
   # Run all tests when running the Windows CI tests
   - task: Gradle@2

From 184afddf981b58497823fcfae0c51c008ad9d361 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 29 Dec 2020 12:44:10 +0000
Subject: [PATCH 1116/4969] Upgrade Ryuk to 0.3.1 (#3629)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../main/java/org/testcontainers/utility/ResourceReaper.java  | 2 +-
 .../utility/TestcontainersConfigurationTest.java              | 4 ++--
 docs/features/configuration.md                                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index f409dbbc865..71a4b49d0d3 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -88,7 +88,7 @@ public static String start(String hostIpAddress, DockerClient client) {
     @SneakyThrows(InterruptedException.class)
     public static String start(DockerClient client) {
         String ryukImage = ImageNameSubstitutor.instance()
-            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.0"))
+            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.1"))
             .asCanonicalNameString();
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index ae07e2d9131..e5300bce58d 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -160,8 +160,8 @@ public void shouldReadReuseFromEnvironment() {
 
     @Test
     public void shouldTrimImageNames() {
-        userProperties.setProperty("ryuk.container.image", " testcontainersofficial/ryuk:0.3.0 ");
-        assertEquals("trailing whitespace was not removed from image name property", "testcontainersofficial/ryuk:0.3.0",newConfig().getRyukImage());
+        userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.1 ");
+        assertEquals("trailing whitespace was not removed from image name property", "testcontainers/ryuk:0.3.1",newConfig().getRyukImage());
     }
 
     private TestcontainersConfiguration newConfig() {
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index b567a8f564f..da7bbd82d60 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -47,7 +47,7 @@ It takes a couple of seconds, but if you want to speed up your tests, you can di
 Testcontainers uses public Docker images to perform different actions like startup checks, VNC recording and others. 
 Some companies disallow the usage of Docker Hub, but you can override `*.image` properties with your own images from your private registry to workaround that.
 
-> **ryuk.container.image = testcontainers/ryuk:0.3.0**
+> **ryuk.container.image = testcontainers/ryuk:0.3.1**
 > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
 
 > **tinyimage.container.image = alpine:3.5**  
@@ -74,7 +74,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 
 ## Customizing Ryuk resource reaper
 
-> **ryuk.container.image = testcontainers/ryuk:0.3.0**
+> **ryuk.container.image = testcontainers/ryuk:0.3.1**
 > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
 
 > **ryuk.container.privileged = false**

From 84f6dd815b56bf9a089a8dfe9b74622dce57fad7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 13:51:30 +0000
Subject: [PATCH 1117/4969] Bump assertj-core from 3.18.0 to 3.18.1 in
 /modules/vault (#3486)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.0 to 3.18.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.0...assertj-core-3.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index caddc81d3a7..7db7fb2322a 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.1'
-    testCompile 'org.assertj:assertj-core:3.18.0'
+    testCompile 'org.assertj:assertj-core:3.18.1'
 
 }

From 7c4e935578861c99b0f295f5d18162f745aa9247 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 13:51:46 +0000
Subject: [PATCH 1118/4969] Bump influxdb-java from 2.20 to 2.21 in
 /modules/influxdb (#3568)

Bumps [influxdb-java](https://github.com/influxdata/influxdb-java) from 2.20 to 2.21.
- [Release notes](https://github.com/influxdata/influxdb-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-java/compare/influxdb-java-2.20...influxdb-java-2.21)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/influxdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 40fa6e456ce..2e735e1137a 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.20'
-    testCompile 'org.influxdb:influxdb-java:2.19'
+    compileOnly 'org.influxdb:influxdb-java:2.21'
+    testCompile 'org.influxdb:influxdb-java:2.21'
 }

From 5f7bb3ae4f2edcfe79dd451f29cfed3c212a2577 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 13:52:07 +0000
Subject: [PATCH 1119/4969] Bump json from 20180813 to 20201115 in /examples
 (#3567)

Bumps [json](https://github.com/douglascrockford/JSON-java) from 20180813 to 20201115.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 f5f21a57d21..5c7279dd09a 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
-    implementation 'org.json:json:20180813'
+    implementation 'org.json:json:20201115'
     testImplementation 'org.postgresql:postgresql:42.2.18'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'

From 850f72eeb7dd7584ae1b46a1a5ee175c9f252bc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 13:52:21 +0000
Subject: [PATCH 1120/4969] Bump pulsar-client from 2.6.1 to 2.7.0 in
 /modules/pulsar (#3565)

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.6.1...v2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index e09ff42f357..00455fc6602 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.6.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.1'
 }

From 7d683a1cb238d1c5c9eaf9916d010f5479182237 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 13:52:36 +0000
Subject: [PATCH 1121/4969] Bump pulsar-client-admin from 2.6.1 to 2.7.0 in
 /modules/pulsar (#3566)

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.6.1...v2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 00455fc6602..b574519a939 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.0'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.6.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.0'
 }

From bf16881fb9904afebc4bf15ab3a2ed0ea3bfdb99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 14:08:45 +0000
Subject: [PATCH 1122/4969] Bump mssql-jdbc from 9.1.0.jre8-preview to
 9.1.1.jre8-preview in /modules/mssqlserver (#3563)

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 9.1.0.jre8-preview to 9.1.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 9aab7844148..765e1382180 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,12 +10,12 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.4.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.0.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.1.jre8-preview'
 
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.3.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.0.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.1.jre8-preview'
 }

From d1217ab02e5994e88760e046c4ce0d74dfaeb1bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 14:43:52 +0000
Subject: [PATCH 1123/4969] Bump mockito-core from 3.5.13 to 3.6.28 in /core
 (#3542)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.13 to 3.6.28.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.13...v3.6.28)

Signed-off-by: dependabot[bot] <support@github.com>

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 0dc6f07ddf9..35a8bb92f32 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -209,7 +209,7 @@ dependencies {
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testCompile ('org.mockito:mockito-core:3.5.13') {
+    testCompile ('org.mockito:mockito-core:3.6.28') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 96429538eb3a1f080030d79c36acf9275405d206 Mon Sep 17 00:00:00 2001
From: Martin Traverso <mtraverso@gmail.com>
Date: Thu, 31 Dec 2020 03:10:18 -0800
Subject: [PATCH 1124/4969] Rename Presto to Trino (#3649)

PrestoSQL was rebranded as Trino: https://trino.io/blog/2020/12/27/announcing-trino.html
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 2351837f8af..bc6d1e64afe 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -162,7 +162,7 @@ A huge thank you to our sponsors:
 * [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
 * [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
 * [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS
-* [Presto](https://prestosql.io) - Integration testing all Presto core & connectors, including tests of multi-node deployments and security configurations.
+* [Trino (formerly Presto SQL)](https://trino.io) - Integration testing all Trino core & connectors, including tests of multi-node deployments and security configurations.
 
 
 ## License

From 54000d9574213574df7e5b211f3b15a50d1dea3d Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Thu, 31 Dec 2020 12:19:54 +0100
Subject: [PATCH 1125/4969] add github actions to dependabot config (#3633)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d854a9aa823..16b59da6dfa 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -139,3 +139,10 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+
+# GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10

From 4e11573dcd0f9c19ceff519038c863ae807f20b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:39:08 +0000
Subject: [PATCH 1126/4969] Bump mockito-core from 3.5.15 to 3.6.28 in
 /modules/junit-jupiter (#3539)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.15 to 3.6.28.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.15...v3.6.28)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 520cff37254..12d4321d10f 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.13'
-    testCompile ('org.mockito:mockito-core:3.5.15') {
+    testCompile ('org.mockito:mockito-core:3.6.28') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.18.1'

From 3a32e3fd98655e80d2f22dca4fa0944d1c84d1fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:39:16 +0000
Subject: [PATCH 1127/4969] Bump r2dbc-mssql from 0.8.4.RELEASE to
 0.8.5.RELEASE in /modules/mssqlserver (#3397)

Bumps [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 0.8.4.RELEASE to 0.8.5.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v0.8.5.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v0.8.4.RELEASE...v0.8.5.RELEASE)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 765e1382180..c36f1e6ba84 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.4.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.1.jre8-preview'
 
     testCompile project(':r2dbc')
-    testCompile 'io.r2dbc:r2dbc-mssql:0.8.3.RELEASE'
+    testCompile 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))

From a475797c9706e7f2934b6201c81002095903c5c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:39:27 +0000
Subject: [PATCH 1128/4969] Bump rest-assured from 4.3.1 to 4.3.3 in
 /modules/vault (#3588)

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 4.3.1 to 4.3.3.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.3.1...rest-assured-4.3.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 7db7fb2322a..e75d1121131 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -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.1'
+    testCompile 'io.rest-assured:rest-assured:4.3.3'
     testCompile 'org.assertj:assertj-core:3.18.1'
 
 }

From 4a03031d27d1de6f4903258df13480a21aa3fdbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:39:37 +0000
Subject: [PATCH 1129/4969] Bump jedis from 3.3.0 to 3.4.0 in /core (#3586)

Bumps [jedis](https://github.com/xetorthio/jedis) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/xetorthio/jedis/releases)
- [Commits](https://github.com/xetorthio/jedis/compare/jedis-3.3.0...jedis-3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 35a8bb92f32..ef63ce62bda 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -205,7 +205,7 @@ dependencies {
     }
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.3.0'
+    testCompile 'redis.clients:jedis:3.4.0'
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 

From cb2c31005002eef20946f519b23136ae00969751 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:39:51 +0000
Subject: [PATCH 1130/4969] Bump elasticsearch-rest-client from 7.10.0 to
 7.10.1 in /modules/elasticsearch (#3589)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.10.0 to 7.10.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.0...v7.10.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index bfbfbfae9ce..a3442f3234b 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.10.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.10.1"
     testCompile "org.elasticsearch.client:transport:7.10.0"
 }

From 8e7fff80fe7d6e45f6170734979903f70a0e4655 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:40:10 +0000
Subject: [PATCH 1131/4969] Bump tomcat-jdbc from 9.0.40 to 10.0.0 in
 /modules/jdbc (#3592)

Bumps tomcat-jdbc from 9.0.40 to 10.0.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 12a53f7cfbc..910dc29ebad 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.40'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 }

From 804116c18b52590b022e28b10a76e89866f3ed29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:40:18 +0000
Subject: [PATCH 1132/4969] Bump jedis from 3.3.0 to 3.4.0 in /examples (#3595)

Bumps [jedis](https://github.com/xetorthio/jedis) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/xetorthio/jedis/releases)
- [Commits](https://github.com/xetorthio/jedis/compare/jedis-3.3.0...jedis-3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 6ef351764f5..76c245d5b51 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.3.0'
+    implementation 'redis.clients:jedis:3.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index b0b6865aea7..e63d494bcef 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.3.0'
+    implementation 'redis.clients:jedis:3.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 11e6cb2a31b..bbd35cabc49 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.3.0'
+    implementation 'redis.clients:jedis:3.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.30'

From 463c3bb5d85be43f0950c7ae09f46e7882cfd5b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:40:30 +0000
Subject: [PATCH 1133/4969] Bump org.springframework.boot from 2.3.4.RELEASE to
 2.4.1 in /examples (#3594)

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.3.4.RELEASE to 2.4.1.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.3.4.RELEASE...v2.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 2dca03f4004..1f05d7b5663 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.4.RELEASE'
+    id 'org.springframework.boot' version '2.4.1'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index f2d9d8d97ec..9c622648a20 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.1.5.RELEASE"
+    id("org.springframework.boot") version "2.4.1"
     id("org.jetbrains.kotlin.jvm") version "1.3.31"
     id("org.jetbrains.kotlin.plugin.spring") version "1.3.31"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 75907da4c0d..288a9226b90 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.4.RELEASE'
+    id 'org.springframework.boot' version '2.4.1'
 }
 apply plugin: 'io.spring.dependency-management'
 

From cdd1837b7f40b749ad9576b141e3dc7f873f475b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:41:08 +0000
Subject: [PATCH 1134/4969] Bump r2dbc-mariadb from 0.8.4-rc to 1.0.0 in
 /modules/mariadb (#3593)

Bumps [r2dbc-mariadb](https://github.com/mariadb-corporation/mariadb-connector-r2dbc) from 0.8.4-rc to 1.0.0.
- [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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 e5f19eed97b..915e14eb7ee 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.4-rc'
+    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.0'
 
     testCompile project(':jdbc-test')
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.0'
 
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'org.mariadb:r2dbc-mariadb:0.8.3-beta1'
+    testCompile 'org.mariadb:r2dbc-mariadb:1.0.0'
 }

From 6eb362271ff94b519370f752fc3b9844ad47e2d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:41:16 +0000
Subject: [PATCH 1135/4969] Bump cucumber-java from 6.8.1 to 6.9.1 in /examples
 (#3624)

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 6.8.1 to 6.9.1.
- [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.8.1...v6.9.1)

Signed-off-by: dependabot[bot] <support@github.com>

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 57104731c7e..d3be66ddcc6 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.8.1'
+    testImplementation 'io.cucumber:cucumber-java:6.9.1'
     testImplementation 'io.cucumber:cucumber-junit:6.8.1'
     testImplementation 'org.testcontainers:selenium'
 }

From 394cdce6827f5e785a233f7d67cbc72bd0e7ac84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 11:42:06 +0000
Subject: [PATCH 1136/4969] Bump solr-solrj from 8.6.3 to 8.7.0 in /examples
 (#3446)

Bumps solr-solrj from 8.6.3 to 8.7.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 75524364100..fcdf93a9c53 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.16"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
 
-    implementation 'org.apache.solr:solr-solrj:8.6.3'
+    implementation 'org.apache.solr:solr-solrj:8.7.0'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 63d0290639e39084396d2eb4e4ff1be01a4a4abd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 15:10:00 +0000
Subject: [PATCH 1137/4969] Update actions/cache requirement to v2.1.3 (#3651)

Updates the requirements on [actions/cache](https://github.com/actions/cache) to permit the latest version.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/commits/0781355a23dac32fd3bac414512f4b903437991a)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index d69aebcfa88..cea7180566d 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.3
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -46,7 +46,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.3
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef0f915972b..f49b6426a2e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -44,7 +44,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.3
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From c9528eea9477696fe75f7fb5a53015e039270272 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 15:11:20 +0000
Subject: [PATCH 1138/4969] Bump gradle/wrapper-validation-action from e2c57ac
 to 1.0.3 (#3657)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from e2c57ac to 1.0.3. This release includes the previously tagged commit.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/e2c57ac...e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index f3a01949324..883d6dd6cbc 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -17,4 +17,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@e2c57ac
+      - uses: gradle/wrapper-validation-action@e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c

From 3b07d82c18e6f65f8b9c0a443410eb6486aa7ff1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 15:13:30 +0000
Subject: [PATCH 1139/4969] Bump aws-java-sdk-dynamodb from 1.11.901 to
 1.11.929 in /modules/dynalite (#3652)

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.901 to 1.11.929.
- [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.901...1.11.929)

Signed-off-by: dependabot[bot] <support@github.com>

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 5f6ab14d939..a09ef417159 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.901'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.882'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
+    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
 }

From 7d2e184b644b50d0ff964203708a8c82398aa836 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 15:20:56 +0000
Subject: [PATCH 1140/4969] Bump ad-m/github-push-action from
 68af9897f2b021035ca3952bf354bbb4675c1762 to 0.6.0 (#3658)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index cce6e5b9bf1..d2eb803fda2 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -22,6 +22,6 @@ jobs:
                     git add mkdocs.yml
                     git commit -m "Update documentation version to ${GITHUB_REF##*/}" -m "skip-checks: true" || echo "not changed"
             -   name: Push changes
-                uses: ad-m/github-push-action@68af9897f2b021035ca3952bf354bbb4675c1762 # v0.5.0
+                uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6
                 with:
                     github_token: ${{ secrets.GITHUB_TOKEN }}

From fac5e852a0b2ad999ae5ea9991777668c64adeaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 16:51:22 +0000
Subject: [PATCH 1141/4969] Bump guava from 30.0-jre to 30.1-jre in /core
 (#3627)

Bumps [guava](https://github.com/google/guava) from 30.0-jre to 30.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>

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 ef63ce62bda..4b42173cd0f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:30.0-jre'
+        classpath 'com.google.guava:guava:30.1-jre'
     }
 }
 

From 288af58ed0425b1edc713c33d93eb5fb66492ee0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 16:51:31 +0000
Subject: [PATCH 1142/4969] Bump org.jetbrains.kotlin.jvm from 1.3.31 to
 1.4.21-2 in /examples (#3645)

Bumps org.jetbrains.kotlin.jvm from 1.3.31 to 1.4.21-2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 9c622648a20..cc1083ee8d4 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.4.1"
-    id("org.jetbrains.kotlin.jvm") version "1.3.31"
+    id("org.jetbrains.kotlin.jvm") version "1.4.21-2"
     id("org.jetbrains.kotlin.plugin.spring") version "1.3.31"
 }
 

From c64a8cd04a0b33fa949e19d93f31766cab021245 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 16:52:02 +0000
Subject: [PATCH 1143/4969] Bump s3 from 2.15.14 to 2.15.56 in
 /modules/localstack (#3650)

Bumps s3 from 2.15.14 to 2.15.56.

Signed-off-by: dependabot[bot] <support@github.com>

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 908f87de07d..dd66fb69547 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.880'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.884'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.15.14'
+    testCompile 'software.amazon.awssdk:s3:2.15.56'
 }

From 52b467aa792f1c4a68f3ea79446261e4a726427b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 16:52:12 +0000
Subject: [PATCH 1144/4969] Bump aws-java-sdk-s3 from 1.11.882 to 1.11.929 in
 /modules/localstack (#3654)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.882 to 1.11.929.
- [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.882...1.11.929)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index dd66fb69547..e67f6fe0632 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.882'
-    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.880'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.929'
+    testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.929'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.884'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.15.56'

From c5d462abad68933d3f3c9e651edfea25aef62a59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 16:52:45 +0000
Subject: [PATCH 1145/4969] Bump transport from 7.10.0 to 7.10.1 in
 /modules/elasticsearch (#3590)

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.10.0 to 7.10.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.0...v7.10.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a3442f3234b..b4a64a405b7 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,5 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.10.1"
-    testCompile "org.elasticsearch.client:transport:7.10.0"
+    testCompile "org.elasticsearch.client:transport:7.10.1"
 }

From 4daf4dba93cc428f07395400143c6a72605497c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 16:56:56 +0000
Subject: [PATCH 1146/4969] Bump testcontainers from 1.14.3 to 1.15.1 in /core
 (#3587)

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.14.3 to 1.15.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.14.3...1.15.1)

Signed-off-by: dependabot[bot] <support@github.com>

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 4b42173cd0f..ac174e8bc93 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -158,7 +158,7 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.14.3', {
+    baseline 'org.testcontainers:testcontainers:1.15.1', {
         exclude group: "*", module: "*"
     }
 

From acbb0c540dd33e903dabeffbaa9327f1873b046f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 16:57:04 +0000
Subject: [PATCH 1147/4969] Bump cucumber-junit from 6.8.1 to 6.9.1 in
 /examples (#3625)

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 6.8.1 to 6.9.1.
- [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.8.1...v6.9.1)

Signed-off-by: dependabot[bot] <support@github.com>

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 d3be66ddcc6..ddffea03dfe 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.9.1'
-    testImplementation 'io.cucumber:cucumber-junit:6.8.1'
+    testImplementation 'io.cucumber:cucumber-junit:6.9.1'
     testImplementation 'org.testcontainers:selenium'
 }

From 2a9c4ebaf32b4f385b4ebf72ebd06f21a64e41d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:03:05 +0000
Subject: [PATCH 1148/4969] Bump gradle-update/update-gradle-wrapper-action
 from 74a035c to 1.0.9 (#3653)

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 74a035c to 1.0.9. This release includes the previously tagged commit.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/74a035c...74a035ce333f39c84811ce1167669bfa6c65f440)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 883d6dd6cbc..e8f4f130b12 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@74a035c
+        uses: gradle-update/update-gradle-wrapper-action@74a035ce333f39c84811ce1167669bfa6c65f440
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From d9ecb9813bca5b75cdc33dc4715a0c918eaf7c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mads=20M=C3=A6tzke=20Tandrup?= <mads@tandrup.org>
Date: Fri, 1 Jan 2021 19:54:46 +0100
Subject: [PATCH 1149/4969] Add init command parameter to Vault container
 (#3188)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../testcontainers/vault/VaultContainer.java  | 37 +++++++++++++++++++
 .../vault/VaultContainerTest.java             | 13 ++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index f47818d8c7d..37e78a14f95 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -7,10 +7,12 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import static com.github.dockerjava.api.model.Capability.IPC_LOCK;
 
@@ -30,6 +32,7 @@ public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericCo
     private static final int VAULT_PORT = 8200;
 
     private Map<String, List<String>> secretsMap = new HashMap<>();
+    private List<String> initCommands = new ArrayList<>();
 
     private int port = VAULT_PORT;
 
@@ -61,6 +64,7 @@ public VaultContainer(final DockerImageName dockerImageName) {
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         addSecrets();
+        runInitCommands();
     }
 
     private void addSecrets() {
@@ -82,6 +86,23 @@ private String[] buildExecCommand(Map<String, List<String>> map) {
         return new String[]{"/bin/sh", "-c", stringBuilder.toString().substring(4)};
     }
 
+    private void runInitCommands() {
+        if (!initCommands.isEmpty()) {
+            String commands = initCommands.stream()
+                                    .map(command -> "vault " + command)
+                                    .collect(Collectors.joining(" && "));
+            try {
+                ExecResult execResult = this.execInContainer(new String[]{"/bin/sh", "-c", commands});
+                if (execResult.getExitCode() != 0) {
+                    logger().error("Failed to execute these init commands {}. Exit code {}. Stdout {}. Stderr {}",
+                                    initCommands, execResult.getExitCode(), execResult.getStdout(), execResult.getStderr());
+                }
+            } catch (IOException | InterruptedException e) {
+                logger().error("Failed to execute these init commands {}. Exception message: {}", initCommands, e.getMessage());
+            }
+        }
+    }
+
     /**
      * Sets the Vault root token for the container so application tests can source secrets using the token
      *
@@ -142,4 +163,20 @@ public SELF withSecretInVault(String path, String firstSecret, String... remaini
         secretsMap.putIfAbsent(path, list);
         return self();
     }
+
+    /**
+     * Run initialization commands using the vault cli.
+     * 
+     * Useful for enableing more secret engines like:
+     * <pre>
+     *     .withInitCommand("secrets enable pki")
+     *     .withInitCommand("secrets enable transit")
+     * </pre>
+     * @param commands The commands to send to the vault cli
+     * @return this
+     */
+    public SELF withInitCommand(String... commands) {
+        initCommands.addAll(Arrays.asList(commands));
+        return self();
+    }
 }
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index b3dd788f053..9dee4c21416 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -27,7 +27,8 @@ public class VaultContainerTest {
             "secret_two=password2",
             "secret_three=password3",
             "secret_three=password3",
-            "secret_four=password4");
+            "secret_four=password4")
+        .withInitCommand("secrets enable transit", "write -f transit/keys/my-key");
 
     @Test
     public void readFirstSecretPathWithCli() throws IOException, InterruptedException {
@@ -70,6 +71,16 @@ public void readSecondSecretPathOverHttpApi() throws InterruptedException {
             assertThat().body("data.data.secret_four", containsString("password4"));
     }
 
+    @Test
+    public void readTransitKeyOverHttpApi() throws InterruptedException {
+        given().
+            header("X-Vault-Token", VAULT_TOKEN).
+            when().
+            get("http://" + getHostAndPort() + "/v1/transit/keys/my-key").
+            then().
+            assertThat().body("data.name", equalTo("my-key"));
+    }
+
     private String getHostAndPort() {
         return vaultContainer.getHost() + ":" + vaultContainer.getMappedPort(8200);
     }

From e6089e86d605eb3120a3a282c11ae700e577c6fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:55:23 +0000
Subject: [PATCH 1150/4969] Bump org.jetbrains.kotlin.plugin.spring from 1.3.31
 to 1.4.21-2 in /examples (#3646)

Bumps org.jetbrains.kotlin.plugin.spring from 1.3.31 to 1.4.21-2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index cc1083ee8d4..4675f907235 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.4.1"
     id("org.jetbrains.kotlin.jvm") version "1.4.21-2"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.3.31"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.4.21-2"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 40f96736fad1cccf34290294a1ced3cf941ba51a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:55:36 +0000
Subject: [PATCH 1151/4969] Bump aws-java-sdk-s3 from 1.11.929 to 1.11.930 in
 /modules/localstack (#3659)

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.929 to 1.11.930.
- [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.929...1.11.930)

Signed-off-by: dependabot[bot] <support@github.com>

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 e67f6fe0632..a0b30cc5844 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.929'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.930'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.929'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.884'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From b6628c5a8fa837301c01b66454eec93b2d8b46ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:55:46 +0000
Subject: [PATCH 1152/4969] Bump guava from 30.0-jre to 30.1-jre in
 /modules/jdbc-test (#3622)

Bumps [guava](https://github.com/google/guava) from 30.0-jre to 30.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 8523ca5a3d8..b6581d526a5 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     compile project(':jdbc')
     compile project(':test-support')
 
-    compile 'com.google.guava:guava:30.0-jre'
+    compile 'com.google.guava:guava:30.1-jre'
     compile 'org.apache.commons:commons-lang3:3.11'
     compile 'com.zaxxer:HikariCP-java6:2.3.13'
     compile 'commons-dbutils:commons-dbutils:1.7'

From 0e8523db9df728a31c2b951eeee08abf7196ec6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 3 Jan 2021 16:11:50 +0000
Subject: [PATCH 1153/4969] Bump aws-java-sdk-sqs from 1.11.884 to 1.11.930 in
 /modules/localstack (#3660)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.884 to 1.11.930.
- [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.884...1.11.930)

Signed-off-by: dependabot[bot] <support@github.com>

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 a0b30cc5844..fdffc649a72 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.930'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.929'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.884'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.930'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.15.56'
 }

From 39116c09169bcde50a9e4d62bf90c15e3df4dc02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9da=20Housni=20Alaoui?= <reda-alaoui@hey.com>
Date: Sun, 10 Jan 2021 13:23:23 +0100
Subject: [PATCH 1154/4969] Fix handling of locally built images when used with
 `hub.image.name.prefix` (#3666)

---
 .../org/testcontainers/images/builder/ImageFromDockerfile.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 133b6e1c4b0..b36779f1b9e 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -54,7 +54,7 @@ public class ImageFromDockerfile extends LazyFuture<String> implements
     private Set<String> dependencyImageNames = Collections.emptySet();
 
     public ImageFromDockerfile() {
-        this("testcontainers/" + Base58.randomString(16).toLowerCase());
+        this("localhost/testcontainers/" + Base58.randomString(16).toLowerCase());
     }
 
     public ImageFromDockerfile(String dockerImageName) {

From d96dd815d2b8166b75a919c751681da3325e2014 Mon Sep 17 00:00:00 2001
From: "Junho, Kim" <giger85@naver.com>
Date: Sun, 10 Jan 2021 21:31:39 +0900
Subject: [PATCH 1155/4969] Remove duplicated dependency in jdbc-test module
 (#3664)

Co-authored-by: Junho, Kim <giger85.juno@navercorp.com>
---
 modules/jdbc-test/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index b6581d526a5..05a96aaf333 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,6 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    compile 'commons-dbutils:commons-dbutils:1.7'
     compile 'org.apache.tomcat:tomcat-jdbc:9.0.40'
     compile 'org.vibur:vibur-dbcp:25.0'
     compile 'mysql:mysql-connector-java:8.0.22'

From 97493b112f76711adc8f431f6f8e6f3245f05c47 Mon Sep 17 00:00:00 2001
From: Diego Lovison <diegolovison@gmail.com>
Date: Tue, 12 Jan 2021 13:58:27 -0300
Subject: [PATCH 1156/4969] Support Ryuk socket timeout (#3682)

Fixes #3183

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../main/java/org/testcontainers/utility/ResourceReaper.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 71a4b49d0d3..7adbc95bb4c 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -28,6 +28,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -157,7 +158,9 @@ public InspectContainerResponse getContainerInfo() {
                     while (true) {
                         RYUK_ACK_RATE_LIMITER.doWhenReady(() -> {
                             int index = 0;
-                            try(Socket clientSocket = new Socket(host, ryukPort)) {
+                            // not set the read timeout, as Ryuk would not send anything unless a new filter is submitted, meaning that we would get a timeout exception pretty quick
+                            try (Socket clientSocket = new Socket()) {
+                                clientSocket.connect(new InetSocketAddress(host, ryukPort), 5 * 1000);
                                 FilterRegistry registry = new FilterRegistry(clientSocket.getInputStream(), clientSocket.getOutputStream());
 
                                 synchronized (DEATH_NOTE) {

From 864df2d50b0d5baf0ace24fba972444569d0e21e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 6 Feb 2021 15:24:18 +0100
Subject: [PATCH 1157/4969] Force Jackson version to 2.8.8 (forward
 compatibility) (#3602)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/build.gradle | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index ac174e8bc93..7613ed58ccc 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -157,6 +157,13 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
     project.tasks.check.dependsOn(japicmp)
 }
 
+configurations.all {
+    resolutionStrategy {
+        // use lower Jackson version
+        force 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
+    }
+}
+
 dependencies {
     baseline 'org.testcontainers:testcontainers:1.15.1', {
         exclude group: "*", module: "*"
@@ -175,10 +182,6 @@ dependencies {
 
     compile "com.github.docker-java:docker-java-api:3.2.7"
 
-    // use lower Jackson version
-    shaded ('com.fasterxml.jackson.core:jackson-databind:2.8.8') {
-        exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
-    }
     shaded ('com.github.docker-java:docker-java-core:3.2.7') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')

From 7688d1bd808d4ce965cfd86f2053dd61a479f2ed Mon Sep 17 00:00:00 2001
From: Alexander Girke <alexgirke@posteo.de>
Date: Sat, 6 Feb 2021 15:49:21 +0100
Subject: [PATCH 1158/4969] Clarify usage of host port exporting (#3421)

---
 docs/features/networking.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/networking.md b/docs/features/networking.md
index 2fe039b74ef..e7d8493483e 100644
--- a/docs/features/networking.md
+++ b/docs/features/networking.md
@@ -69,7 +69,7 @@ We need to tell Testcontainers to prepare to expose this port to containers:
 <!--/codeinclude-->
 
 !!! warning
-    Note that the above command should be invoked _before_ containers are started.
+    Note that the above command should be invoked _before_ containers are started, but _after_ the server on the host was started.
     
 Having done so, we can now access this port from any containers that are launched.
 From a container's perspective, the hostname will be `host.testcontainers.internal` and the port will be the same value as `localServerPort`.

From ed8386c4cc2e38cc766eea30de68f3d559639a8a Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Sat, 6 Feb 2021 16:23:10 +0100
Subject: [PATCH 1159/4969] couchbase: wait until all services are part of the
 config (#3003)

This changeset adds a predicate to the wait strategy to make sure
that it not only returns a 200, but also that every enabled service
is actually already exposed in the config. Since we are polling
the server during bootstrap here, not all of them might show up
at the same time.

Also, while not contributing to the fix we poll the terse bucket
http config "b" instead of the verbose one "buckets" since it is
a little more efficient on the server side and actually the config
the client internally works with.

fixes #2993

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../couchbase/CouchbaseContainer.java         | 54 +++++++++++++++----
 .../couchbase/CouchbaseService.java           | 17 ++++--
 2 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 11960304ee6..3671608d324 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -36,10 +36,12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -181,7 +183,7 @@ protected void configure() {
                             .map("healthy"::equals)
                             .orElse(false);
                     } catch (IOException e) {
-                        logger().error("Unable to parse response {}", response, e);
+                        logger().error("Unable to parse response: {}", response, e);
                         return false;
                     }
                 })
@@ -254,15 +256,10 @@ private void renameNode() {
     private void initializeServices() {
         logger().debug("Initializing couchbase services on host: {}", enabledServices);
 
-        final String services = enabledServices.stream().map(s -> {
-            switch (s) {
-                case KV: return "kv";
-                case QUERY: return "n1ql";
-                case INDEX: return "index";
-                case SEARCH: return "fts";
-                default: throw new IllegalStateException("Unknown service!");
-            }
-        }).collect(Collectors.joining(","));
+        final String services = enabledServices
+            .stream()
+            .map(CouchbaseService::getIdentifier)
+            .collect(Collectors.joining(","));
 
         @Cleanup Response response = doHttpRequest(MGMT_PORT, "/node/controller/setupServices", "POST", new FormBody.Builder()
             .add("services", services)
@@ -363,10 +360,11 @@ private void createBuckets() {
             checkSuccessfulResponse(response, "Could not create bucket " + bucket.getName());
 
             new HttpWaitStrategy()
-                .forPath("/pools/default/buckets/" + bucket.getName())
+                .forPath("/pools/default/b/" + bucket.getName())
                 .forPort(MGMT_PORT)
                 .withBasicCredentials(username, password)
                 .forStatusCode(200)
+                .forResponsePredicate(new AllServicesEnabledPredicate())
                 .waitUntilReady(this);
 
             if (enabledServices.contains(CouchbaseService.QUERY)) {
@@ -472,4 +470,38 @@ private Response doHttpRequest(final int port, final String path, final String m
             throw new RuntimeException("Could not perform request against couchbase HTTP endpoint ", ex);
         }
     }
+
+    /**
+     * In addition to getting a 200, we need to make sure that all services we need are enabled and available on
+     * the bucket.
+     * <p>
+     *  Fixes the issue observed in https://github.com/testcontainers/testcontainers-java/issues/2993
+     */
+    private class AllServicesEnabledPredicate implements Predicate<String> {
+
+        @Override
+        public boolean test(final String rawConfig) {
+            try {
+                for (JsonNode node : MAPPER.readTree(rawConfig).at("/nodesExt")) {
+                    for (CouchbaseService enabledService : enabledServices) {
+                        boolean found = false;
+                        Iterator<String> fieldNames = node.get("services").fieldNames();
+                        while (fieldNames.hasNext()) {
+                            if (fieldNames.next().startsWith(enabledService.getIdentifier())) {
+                                found = true;
+                            }
+                        }
+                        if (!found) {
+                            logger().trace("Service {} not yet part of config, retrying.", enabledService);
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            } catch (IOException ex) {
+                logger().error("Unable to parse response: {}", rawConfig, ex);
+                return false;
+            }
+        }
+    }
 }
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
index d284c660709..c60fc6b71d0 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
@@ -24,21 +24,30 @@ public enum CouchbaseService {
   /**
    * Key-Value service.
    */
-  KV,
+  KV("kv"),
 
   /**
    * Query (N1QL) service.
    */
-  QUERY,
+  QUERY("n1ql"),
 
   /**
    * Search (FTS) service.
    */
-  SEARCH,
+  SEARCH("fts"),
 
   /**
    * Indexing service (needed if QUERY is also used!).
    */
-  INDEX
+  INDEX("index");
 
+  private final String identifier;
+
+  CouchbaseService(String identifier) {
+    this.identifier = identifier;
+  }
+
+  String getIdentifier() {
+    return identifier;
+  }
 }

From bf0e4836e0136bad3844abd5db24260e2451c8e3 Mon Sep 17 00:00:00 2001
From: Artjom Kalita <artjom.kalita@gmail.com>
Date: Sat, 6 Feb 2021 17:26:55 +0200
Subject: [PATCH 1160/4969] Improve logging for port listener (#3736)

* Improve logging for port listener, additional clean up for string concatenation in loop

Co-authored-by: akalita <a.kalita@bill.me>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../InternalCommandPortListeningCheck.java    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index 9b4be81b4c4..cd601e6a131 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -24,23 +24,23 @@ public class InternalCommandPortListeningCheck implements java.util.concurrent.C
 
     @Override
     public Boolean call() {
-        String command = "true";
+        StringBuilder command = new StringBuilder("true");
 
         for (int internalPort : internalPorts) {
-            command += " && ";
-            command += " (";
-            command += format("cat /proc/net/tcp* | awk '{print $2}' | grep -i ':0*%x'", internalPort);
-            command += " || ";
-            command += format("nc -vz -w 1 localhost %d", internalPort);
-            command += " || ";
-            command += format("/bin/bash -c '</dev/tcp/localhost/%d'", internalPort);
-            command += ")";
+            command.append(" && ");
+            command.append(" (");
+            command.append(format("cat /proc/net/tcp* | awk '{print $2}' | grep -i ':0*%x'", internalPort));
+            command.append(" || ");
+            command.append(format("nc -vz -w 1 localhost %d", internalPort));
+            command.append(" || ");
+            command.append(format("/bin/bash -c '</dev/tcp/localhost/%d'", internalPort));
+            command.append(")");
         }
 
         Instant before = Instant.now();
         try {
-            ExecResult result = ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), "/bin/sh", "-c", command);
-            log.trace("Check for {} took {}", internalPorts, Duration.between(before, Instant.now()));
+            ExecResult result = ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), "/bin/sh", "-c", command.toString());
+            log.trace("Check for {} took {}. Result code '{}', stdout message: '{}'", internalPorts, Duration.between(before, Instant.now()), result.getExitCode(), result.getStdout());
             return result.getExitCode() == 0;
         } catch (Exception e) {
             throw new IllegalStateException(e);

From eaeca262ea6e8492e472481b8cea47873bc2359c Mon Sep 17 00:00:00 2001
From: Ramazan Yapparov <ramazan.yapparov@gmail.com>
Date: Sat, 6 Feb 2021 18:27:51 +0300
Subject: [PATCH 1161/4969] Added documentation for Bigtable Emulator container
 (#3708)

---
 docs/modules/gcloud.md | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 041129919ee..33d50ee634f 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -5,10 +5,11 @@
 
 Testcontainers module for the Google Cloud Platform's [Cloud SDK](https://cloud.google.com/sdk/).
 
-Currently, the module supports `Datastore`, `Firestore`, `Spanner`, and `Pub/Sub` emulators. In order to use it, you should use the following classes:
+Currently, the module supports `Bigtable`, `Datastore`, `Firestore`, `Spanner`, and `Pub/Sub` emulators. In order to use it, you should use the following classes:
 
 Class | Container Image
 -|-
+BigtableEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
 DatastoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
 FirestoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
 SpannerEmulatorContainer | [gcr.io/cloud-spanner-emulator/emulator](https://gcr.io/cloud-spanner-emulator/emulator)
@@ -16,6 +17,26 @@ PubSubEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](h
 
 ## Usage example
 
+### Bigtable
+
+Start Bigtable Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Bigtable Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+Create a test Bigtable table in the Emulator:
+
+<!--codeinclude-->
+[Create a test table](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java) inside_block:createTable
+<!--/codeinclude-->
+
+Test against the Emulator:
+
+<!--codeinclude-->
+[Testing with a Bigtable Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+<!--/codeinclude-->
+
 ### Datastore
 
 Start Datastore Emulator during a test:
@@ -93,7 +114,7 @@ Start Pub/Sub Emulator during a test:
 [Starting a Pub/Sub Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
-Create a test Pub/Sub topic the Emulator:
+Create a test Pub/Sub topic in the Emulator:
 
 <!--codeinclude-->
 [Create a test topic](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:createTopic

From fd7412fe15070a2ccf70f99c8d7edf829501f8e2 Mon Sep 17 00:00:00 2001
From: Per Lundberg <perlun@gmail.com>
Date: Sat, 6 Feb 2021 17:31:13 +0200
Subject: [PATCH 1162/4969] GenericContainer: fix typo in Javadoc (#3684)

---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 0a0962cd6c0..4536a70789c 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1339,7 +1339,7 @@ public void copyFileFromContainer(String containerPath, String destinationPath)
     }
 
     /**
-     * Allow container startup to be attempted more than once if an error occurs. To be if containers are
+     * Allow container startup to be attempted more than once if an error occurs. To be used if containers are
      * 'flaky' but this flakiness is not something that should affect test outcomes.
      *
      * @param attempts number of attempts

From 73da361f47d5c144665f7baf0b45919ec63a61c7 Mon Sep 17 00:00:00 2001
From: Alar Aule <alar.aule@gmail.com>
Date: Sat, 6 Feb 2021 17:34:18 +0200
Subject: [PATCH 1163/4969] PostGIS JDBC url sample version update (#3606)

Latest Testcontainer versions are using new postgis/postgis images, which versioning is different (containing both PostgreSQL version - PostGIS version)
Sample is from older mdillion/postgis versions, with copy-paste sample fails.
---
 docs/modules/databases/jdbc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 65db9aaf07f..6853cf44c5c 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -37,7 +37,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using PostGIS
 
-`jdbc:tc:postgis:9.6:///databasename`
+`jdbc:tc:postgis:9.6-2.5:///databasename`
 
 #### Using Presto
 

From 625ddc374cac2447cbbcb59c9d7e07c49ac30e99 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 6 Feb 2021 16:41:20 +0100
Subject: [PATCH 1164/4969] Kafka cluster example (#1984, #3758)

Co-authored-by: Sean Glover <sean@seanglover.com>
---
 examples/kafka-cluster/build.gradle           |  17 +++
 .../kafkacluster/KafkaContainerCluster.java   | 102 ++++++++++++++++++
 .../KafkaContainerClusterTest.java            |  97 +++++++++++++++++
 examples/settings.gradle                      |   1 +
 .../containers/KafkaContainer.java            |   8 +-
 .../containers/KafkaContainerTest.java        |  16 +++
 6 files changed, 239 insertions(+), 2 deletions(-)
 create mode 100644 examples/kafka-cluster/build.gradle
 create mode 100644 examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
 create mode 100644 examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
new file mode 100644
index 00000000000..db07c6859f3
--- /dev/null
+++ b/examples/kafka-cluster/build.gradle
@@ -0,0 +1,17 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    testCompileOnly "org.projectlombok:lombok:1.18.10"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
+    testCompile 'org.testcontainers:kafka'
+    testCompile 'org.apache.kafka:kafka-clients:2.3.1'
+    testCompile 'org.assertj:assertj-core:3.14.0'
+    testCompile 'com.google.guava:guava:23.0'
+    testCompile 'org.slf4j:slf4j-simple:1.7.30'
+}
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
new file mode 100644
index 00000000000..fd5b1a0a0b6
--- /dev/null
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
@@ -0,0 +1,102 @@
+package com.example.kafkacluster;
+
+import lombok.SneakyThrows;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.lifecycle.Startables;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+/**
+ * Provides an easy way to launch a Kafka cluster with multiple brokers.
+ */
+public class KafkaContainerCluster implements Startable {
+
+    private final int brokersNum;
+    private final Network network;
+    private final GenericContainer<?> zookeeper;
+    private final Collection<KafkaContainer> brokers;
+
+    public KafkaContainerCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) {
+        if (brokersNum < 0) {
+            throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
+        }
+        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+            throw new IllegalArgumentException("internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0");
+        }
+
+        this.brokersNum = brokersNum;
+        this.network = Network.newNetwork();
+
+        this.zookeeper = new GenericContainer<>(DockerImageName.parse("confluentinc/cp-zookeeper").withTag(confluentPlatformVersion))
+            .withNetwork(network)
+            .withNetworkAliases("zookeeper")
+            .withEnv("ZOOKEEPER_CLIENT_PORT", String.valueOf(KafkaContainer.ZOOKEEPER_PORT));
+
+        this.brokers = IntStream
+            .range(0, this.brokersNum)
+            .mapToObj(brokerNum -> {
+                return new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag(confluentPlatformVersion))
+                    .withNetwork(this.network)
+                    .withNetworkAliases("broker-" + brokerNum)
+                    .dependsOn(this.zookeeper)
+                    .withExternalZookeeper("zookeeper:" + KafkaContainer.ZOOKEEPER_PORT)
+                    .withEnv("KAFKA_BROKER_ID", brokerNum + "")
+                    .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
+                    .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
+                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
+                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "");
+            })
+            .collect(Collectors.toList());
+    }
+
+    public Collection<KafkaContainer> getBrokers() {
+        return this.brokers;
+    }
+
+    public String getBootstrapServers() {
+        return brokers.stream()
+            .map(KafkaContainer::getBootstrapServers)
+            .collect(Collectors.joining(","));
+    }
+
+    private Stream<GenericContainer<?>> allContainers() {
+        return Stream.concat(
+            this.brokers.stream(),
+            Stream.of(this.zookeeper)
+        );
+    }
+
+    @Override
+    @SneakyThrows
+    public void start() {
+        Stream<Startable> startables = this.brokers.stream().map(Startable.class::cast);
+        Startables.deepStart(startables).get(60, SECONDS);
+
+        Unreliables.retryUntilTrue(30, TimeUnit.SECONDS, () -> {
+            Container.ExecResult result = this.zookeeper.execInContainer(
+                "sh", "-c",
+                "zookeeper-shell zookeeper:" + KafkaContainer.ZOOKEEPER_PORT + " ls /brokers/ids | tail -n 1"
+            );
+            String brokers = result.getStdout();
+
+            return brokers != null && brokers.split(",").length == this.brokersNum;
+        });
+    }
+
+    @Override
+    public void stop() {
+        allContainers().parallel().forEach(GenericContainer::stop);
+    }
+}
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
new file mode 100644
index 00000000000..0756b24d58a
--- /dev/null
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
@@ -0,0 +1,97 @@
+package com.example.kafkacluster;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.Test;
+import org.rnorth.ducttape.unreliables.Unreliables;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+public class KafkaContainerClusterTest {
+
+    @Test
+    public void testKafkaContainerCluster() throws Exception {
+        try (
+            KafkaContainerCluster cluster = new KafkaContainerCluster("5.2.1", 3, 2)
+        ) {
+            cluster.start();
+            String bootstrapServers = cluster.getBootstrapServers();
+
+            assertThat(cluster.getBrokers()).hasSize(3);
+
+            testKafkaFunctionality(bootstrapServers, 3, 2);
+        }
+    }
+
+    protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
+        try (
+            AdminClient adminClient = AdminClient.create(ImmutableMap.of(
+                AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers
+            ));
+
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                ImmutableMap.of(
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()
+                ),
+                new StringSerializer(),
+                new StringSerializer()
+            );
+
+            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
+                ImmutableMap.of(
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG, "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"
+                ),
+                new StringDeserializer(),
+                new StringDeserializer()
+            );
+        ) {
+            String topicName = "messages";
+
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
+            consumer.subscribe(Collections.singletonList(topicName));
+
+            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
+
+            Unreliables.retryUntilTrue(10, TimeUnit.SECONDS, () -> {
+                ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+
+                if (records.isEmpty()) {
+                    return false;
+                }
+
+                assertThat(records)
+                    .hasSize(1)
+                    .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                    .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+
+                return true;
+            });
+
+            consumer.unsubscribe();
+        }
+    }
+
+}
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 25da14a0931..ea988b4ada8 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -19,6 +19,7 @@ includeBuild '..'
 
 // explicit include to allow Dependabot to autodiscover subprojects
 include 'disque-job-queue'
+include 'kafka-cluster'
 include 'linked-container'
 include 'mongodb-container'
 include 'redis-backed-cache'
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 12867239251..b1bc3d735f9 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -24,6 +24,8 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     public static final int ZOOKEEPER_PORT = 2181;
 
+    private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
+
     private static final int PORT_NOT_ASSIGNED = -1;
 
     protected String externalZookeeperConnect = null;
@@ -60,8 +62,10 @@ public KafkaContainer(final DockerImageName dockerImageName) {
         withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
 
         withEnv("KAFKA_BROKER_ID", "1");
-        withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", "1");
-        withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", "1");
+        withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+        withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", DEFAULT_INTERNAL_TOPIC_RF);
+        withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+        withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", DEFAULT_INTERNAL_TOPIC_RF);
         withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
         withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
     }
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 263653822e6..d219aa17b13 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -6,8 +6,12 @@
 
 import com.google.common.collect.ImmutableMap;
 import java.time.Duration;
+import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -110,7 +114,15 @@ public void testConfluentPlatformVersion6() throws Exception {
     }
 
     protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, 1, 1);
+    }
+
+    protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
         try (
+            AdminClient adminClient = AdminClient.create(ImmutableMap.of(
+                AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers
+            ));
+
             KafkaProducer<String, String> producer = new KafkaProducer<>(
                 ImmutableMap.of(
                     ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
@@ -131,6 +143,10 @@ protected void testKafkaFunctionality(String bootstrapServers) throws Exception
             );
         ) {
             String topicName = "messages-" + UUID.randomUUID();
+
+            Collection<NewTopic> topics = singletonList(new NewTopic(topicName, partitions, (short) rf));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
             consumer.subscribe(singletonList(topicName));
 
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();

From 140fd94b361786e777ae87a8a9643b954ed68e00 Mon Sep 17 00:00:00 2001
From: "Junho, Kim" <giger85@naver.com>
Date: Sun, 7 Feb 2021 00:52:02 +0900
Subject: [PATCH 1165/4969] Change docker command (#3608)

Closes #3571
This also includes changing default tag version (to v19.2.11)

Co-authored-by: Junho, Kim <giger85.juno@navercorp.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../org/testcontainers/containers/CockroachContainer.java     | 4 ++--
 .../test/java/org/testcontainers/CockroachDBTestImages.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 2a7990413e4..333a6ca0158 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -8,7 +8,7 @@
 public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cockroachdb/cockroach");
-    private static final String DEFAULT_TAG = "v19.1.1";
+    private static final String DEFAULT_TAG = "v19.2.11";
 
     public static final String NAME = "cockroach";
 
@@ -53,7 +53,7 @@ public CockroachContainer(final DockerImageName dockerImageName) {
                 .forStatusCode(200)
                 .withStartupTimeout(Duration.ofMinutes(1))
         );
-        withCommand("start --insecure");
+        withCommand("start-single-node --insecure");
     }
 
     @Override
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
index a309f84e098..ac02b2f5d81 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface CockroachDBTestImages {
-    DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v19.1.1");
+    DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v19.2.11");
 }

From 8f13e420f4d8934ad4c39b4104df1dac571b88a7 Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Sat, 6 Feb 2021 09:55:42 -0600
Subject: [PATCH 1166/4969] Show port mappings in HttpWaitStrategy (#2341)

* Show port mappings in HttpWaitStrategy

* Use stream to un-map exposed port

* Catch and log failures when logging

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../wait/strategy/HttpWaitStrategy.java        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index a2bf4c4899e..85216bcedf6 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -162,8 +162,20 @@ protected void waitUntilReady() {
         if (null == livenessCheckPort || -1 == livenessCheckPort) {
             return;
         }
-        final String uri = buildLivenessUri(livenessCheckPort).toString();
-        log.info("{}: Waiting for {} seconds for URL: {}", containerName, startupTimeout.getSeconds(), uri);
+        final URI rawUri = buildLivenessUri(livenessCheckPort);
+        final String uri = rawUri.toString();
+
+        try {
+            // Un-map the port for logging
+            int originalPort = waitStrategyTarget.getExposedPorts().stream()
+                .filter(exposedPort -> rawUri.getPort() == waitStrategyTarget.getMappedPort(exposedPort))
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("Target port " + rawUri.getPort() + " is not exposed"));
+            log.info("{}: Waiting for {} seconds for URL: {} (where port {} maps to container port {})", containerName, startupTimeout.getSeconds(), uri, rawUri.getPort(), originalPort);
+        } catch (RuntimeException e) {
+            // do not allow a failure in logging to prevent progress, but log for diagnosis
+            log.warn("Unexpected error occurred - will proceed to try to wait anyway", e);
+        }
 
         // try to connect to the URL
         try {
@@ -243,7 +255,7 @@ private URI buildLivenessUri(int livenessCheckPort) {
         if ((tlsEnabled && 443 == livenessCheckPort) || (!tlsEnabled && 80 == livenessCheckPort)) {
             portSuffix = "";
         } else {
-            portSuffix = ":" + String.valueOf(livenessCheckPort);
+            portSuffix = ":" + livenessCheckPort;
         }
 
         return URI.create(scheme + host + portSuffix + path);

From 1f9b44e5b1c8785613191b925030d6be09b77826 Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Sat, 6 Feb 2021 16:59:29 +0100
Subject: [PATCH 1167/4969] update release drafter to v5.13.0 (#3632)

* update release drafter to v5.13.0

* use commit sha

Co-authored-by: Richard North <rich.north@gmail.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 3123c3f6fac..8f88ac2231e 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -9,6 +9,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5.9.0
+      - uses: release-drafter/release-drafter@4d1215c #v5.13.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 51ee33bad751debcaf88a0e8b7d72818db3f6df1 Mon Sep 17 00:00:00 2001
From: Renato Mefi <gh@mefi.dev>
Date: Sat, 6 Feb 2021 17:28:35 +0100
Subject: [PATCH 1168/4969] Support HTTP headers on HttpWaitStrategy (#2549)

This enables webservers that depend on headers for healthchecks to be
able to correctly be queried by the HttpWaitStrategy.

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../wait/strategy/HttpWaitStrategy.java       | 26 ++++++++++++++++++
 .../wait/strategy/HttpWaitStrategyTest.java   | 27 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index 85216bcedf6..c4751725707 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -2,6 +2,8 @@
 
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.ContainerLaunchException;
@@ -40,6 +42,7 @@ public class HttpWaitStrategy extends AbstractWaitStrategy {
     private boolean tlsEnabled;
     private String username;
     private String password;
+    private final Map<String, String> headers = new HashMap<>();
     private Predicate<String> responsePredicate;
     private Predicate<Integer> statusCodePredicate = null;
     private Optional<Integer> livenessPort = Optional.empty();
@@ -122,6 +125,27 @@ public HttpWaitStrategy withBasicCredentials(String username, String password) {
         return this;
     }
 
+    /**
+     * Add a custom HTTP Header to the call.
+     * @param name The HTTP Header name
+     * @param value The HTTP Header value
+     * @return this
+     */
+    public HttpWaitStrategy withHeader(String name, String value) {
+        this.headers.put(name, value);
+        return this;
+    }
+
+    /**
+     * Add multiple custom HTTP Headers to the call.
+     * @param headers Headers map of name/value
+     * @return this
+     */
+    public HttpWaitStrategy withHeaders(Map<String, String> headers) {
+        this.headers.putAll(headers);
+        return this;
+    }
+
     /**
      * Set the HTTP connections read timeout.
      *
@@ -191,6 +215,8 @@ protected void waitUntilReady() {
                             connection.setUseCaches(false);
                         }
 
+                        // Add user configured headers
+                        this.headers.forEach(connection::setRequestProperty);
                         connection.setRequestMethod(method);
                         connection.connect();
 
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index e048f4bccb8..c5a39a4538c 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -1,8 +1,13 @@
 package org.testcontainers.junit.wait.strategy;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
+
+import java.util.HashMap;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
+import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 
 import java.time.Duration;
@@ -30,6 +35,28 @@ public void testWaitUntilReadyWithSuccess() {
         waitUntilReadyAndSucceed(createShellCommand("200 OK", GOOD_RESPONSE_BODY));
     }
 
+    /**
+     * Ensures that HTTP requests made with the HttpWaitStrategy can be enriched with user defined headers,
+     * although the test web server does not depend on the header to response with a 200, by checking the
+     * logs we can ensure the HTTP request was correctly sent.
+     */
+    @Test
+    public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
+        HashMap<String, String> headers = new HashMap<>();
+        headers.put("baz", "boo");
+        GenericContainer container = startContainerWithCommand(createShellCommand("200 OK", GOOD_RESPONSE_BODY),
+            createHttpWaitStrategy(ready)
+                .withHeader("foo", "bar")
+                .withHeaders(headers)
+        );
+        waitUntilReadyAndSucceed(container);
+
+        String logs = container.getLogs();
+
+        assertThat(logs, containsString("foo: bar"));
+        assertThat(logs, containsString("baz: boo"));
+    }
+
     /**
      * Expects that the WaitStrategy returns successfully after receiving an HTTP 401 response from the container.
      * This 401 response is checked with a lambda using {@link HttpWaitStrategy#forStatusCodeMatching(Predicate)}

From a6f91e3b69a401159f88d9044cb557a12441d5f6 Mon Sep 17 00:00:00 2001
From: Oussama BADR <oussamabadr@gmail.com>
Date: Wed, 10 Feb 2021 11:08:05 +0100
Subject: [PATCH 1169/4969] Make VNC recorded videos scrollable (#3180)

This PR adds a second video recording mode, MP4, which is easier to consume and is scrollable.

Fixes #512

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
Co-authored-by: Sergei Egorov <segorov@vmware.com>
---
 .../containers/VncRecordingContainer.java     |  65 ++++++++--
 docs/modules/webdriver_containers.md          |   9 +-
 .../containers/BrowserWebDriverContainer.java |  12 +-
 .../DefaultRecordingFileFactory.java          |  13 +-
 .../containers/RecordingFileFactory.java      |   6 +
 .../DefaultRecordingFileFactoryTest.java      |   2 +-
 ...ChromeRecordingWebDriverContainerTest.java | 121 +++++++++++++++---
 7 files changed, 194 insertions(+), 34 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index de720110a51..a171e6ba2f6 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.ToString;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -9,6 +10,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -25,26 +27,30 @@
 @ToString
 public class VncRecordingContainer extends GenericContainer<VncRecordingContainer> {
 
-    private static final String RECORDING_FILE_NAME = "/screen.flv";
+    private static final String ORIGINAL_RECORDING_FILE_NAME = "/screen.flv";
 
     public static final String DEFAULT_VNC_PASSWORD = "secret";
 
     public static final int DEFAULT_VNC_PORT = 5900;
 
+    static final VncRecordingFormat DEFAULT_RECORDING_FORMAT = VncRecordingFormat.FLV;
+
     private final String targetNetworkAlias;
 
     private String vncPassword = DEFAULT_VNC_PASSWORD;
 
+    private VncRecordingFormat videoFormat = DEFAULT_RECORDING_FORMAT;
+
     private int vncPort = 5900;
 
     private int frameRate = 30;
 
     public VncRecordingContainer(@NonNull GenericContainer<?> targetContainer) {
         this(
-                targetContainer.getNetwork(),
-                targetContainer.getNetworkAliases().stream()
-                        .findFirst()
-                        .orElseThrow(() -> new IllegalStateException("Target container must have a network alias"))
+            targetContainer.getNetwork(),
+            targetContainer.getNetworkAliases().stream()
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("Target container must have a network alias"))
         );
     }
 
@@ -52,7 +58,7 @@ public VncRecordingContainer(@NonNull GenericContainer<?> targetContainer) {
      * Create a sidekick container and attach it to another container. The VNC output of that container will be recorded.
      */
     public VncRecordingContainer(@NonNull Network network, @NonNull String targetNetworkAlias) throws IllegalStateException {
-        super(DockerImageName.parse("testcontainers/vnc-recorder:1.1.0"));
+        super(DockerImageName.parse("testcontainers/vnc-recorder:1.2.0"));
 
         this.targetNetworkAlias = targetNetworkAlias;
         withNetwork(network);
@@ -71,6 +77,13 @@ public VncRecordingContainer withVncPort(int vncPort) {
         return this;
     }
 
+    public VncRecordingContainer withVideoFormat(VncRecordingFormat videoFormat) {
+        if (videoFormat != null) {
+            this.videoFormat = videoFormat;
+        }
+        return this;
+    }
+
     public VncRecordingContainer withFrameRate(int frameRate) {
         this.frameRate = frameRate;
         return this;
@@ -81,25 +94,53 @@ protected void configure() {
         withCreateContainerCmdModifier(it -> it.withEntrypoint("/bin/sh"));
         String encodedPassword = Base64.getEncoder().encodeToString(vncPassword.getBytes());
         setCommand(
-                "-c",
-                "echo '" + encodedPassword + "' | base64 -d > /vnc_password && " +
-                        "flvrec.py -o " + RECORDING_FILE_NAME + " -d -r " + frameRate + " -P /vnc_password " + targetNetworkAlias + " " + vncPort
+            "-c",
+            "echo '" + encodedPassword + "' | base64 -d > /vnc_password && " +
+                "flvrec.py -o " + ORIGINAL_RECORDING_FILE_NAME + " -d -r " + frameRate + " -P /vnc_password " + targetNetworkAlias + " " + vncPort
         );
     }
 
     @SneakyThrows
     public InputStream streamRecording() {
+        String newRecordingFileName = videoFormat.reencodeRecording(this, ORIGINAL_RECORDING_FILE_NAME);
+
         TarArchiveInputStream archiveInputStream = new TarArchiveInputStream(
-                dockerClient.copyArchiveFromContainerCmd(getContainerId(), RECORDING_FILE_NAME).exec()
+            dockerClient.copyArchiveFromContainerCmd(getContainerId(), newRecordingFileName).exec()
         );
         archiveInputStream.getNextEntry();
         return archiveInputStream;
     }
 
     @SneakyThrows
-    public void saveRecordingToFile(File file) {
-        try(InputStream inputStream = streamRecording()) {
+    public void saveRecordingToFile(@NonNull File file) {
+        try (InputStream inputStream = streamRecording()) {
             Files.copy(inputStream, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
         }
     }
+
+    @RequiredArgsConstructor
+    public enum VncRecordingFormat {
+        FLV("flv") {
+            @Override
+            String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull String source) throws IOException, InterruptedException {
+                String newFileOutput = "/newScreen.flv";
+                container.execInContainer("ffmpeg", "-i", source, "-vcodec", "libx264", newFileOutput);
+                return newFileOutput;
+            }
+        },
+        MP4("mp4") {
+            @Override
+            String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull String source) throws IOException, InterruptedException {
+                String newFileOutput = "/newScreen.mp4";
+                container.execInContainer("ffmpeg", "-i", source, "-vcodec", "libx264", "-movflags", "faststart", newFileOutput);
+                return newFileOutput;
+            }
+        };
+
+        abstract String reencodeRecording(VncRecordingContainer container, String source) throws IOException, InterruptedException;
+
+        @Getter
+        private final String filenameExtension;
+    }
+
 }
diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index 40b27a5207f..41b7fb6bb23 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -63,7 +63,14 @@ just for failing tests.
 [Record failing Tests](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordFailing
 <!--/codeinclude-->
 
-Note that the seconds parameter to `withRecordingMode` should be a directory where recordings can be saved.
+Note that the second parameter of `withRecordingMode` should be a directory where recordings can be saved.
+
+By default, the video will be recorded in [FLV](https://en.wikipedia.org/wiki/Flash_Video) format, but you can specify it explicitly or change it to [MP4](https://en.wikipedia.org/wiki/MPEG-4_Part_14) using `withRecordingMode` method with `VncRecordingFormat` option:
+
+<!--codeinclude-->
+[Video Format in MP4](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordMp4
+[Video Format in FLV](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordFlv
+<!--/codeinclude-->
 
 If you would like to customise the file name of the recording, or provide a different directory at runtime based on the description of the test and/or its success or failure, you may provide a custom recording file factory as follows:
 <!--codeinclude-->
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 1ceaf67ad2c..4a25ae486cd 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -27,6 +27,7 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
@@ -66,6 +67,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     @Nullable
     private RemoteWebDriver driver;
     private VncRecordingMode recordingMode = VncRecordingMode.RECORD_FAILING;
+    private VncRecordingFormat recordingFormat;
     private RecordingFileFactory recordingFileFactory;
     private File vncRecordingDirectory;
 
@@ -182,7 +184,8 @@ protected void configure() {
 
             vncRecordingContainer = new VncRecordingContainer(this)
                     .withVncPassword(DEFAULT_PASSWORD)
-                    .withVncPort(VNC_PORT);
+                    .withVncPort(VNC_PORT)
+                    .withVideoFormat(recordingFormat);
         }
 
         if (customImageName != null) {
@@ -334,7 +337,7 @@ private void retainRecordingIfNeeded(String prefix, boolean succeeded) {
         }
 
         if (shouldRecord) {
-            File recordingFile = recordingFileFactory.recordingFileForTest(vncRecordingDirectory, prefix, succeeded);
+            File recordingFile = recordingFileFactory.recordingFileForTest(vncRecordingDirectory, prefix, succeeded, vncRecordingContainer.getVideoFormat());
             LOGGER.info("Screen recordings for test {} will be stored at: {}", prefix, recordingFile);
 
             vncRecordingContainer.saveRecordingToFile(recordingFile);
@@ -358,8 +361,13 @@ public SELF withLinkToContainer(LinkableContainer otherContainer, String alias)
     }
 
     public SELF withRecordingMode(VncRecordingMode recordingMode, File vncRecordingDirectory) {
+        return withRecordingMode(recordingMode, vncRecordingDirectory, null);
+    }
+
+    public SELF withRecordingMode(VncRecordingMode recordingMode, File vncRecordingDirectory, VncRecordingFormat recordingFormat) {
         this.recordingMode = recordingMode;
         this.vncRecordingDirectory = vncRecordingDirectory;
+        this.recordingFormat = recordingFormat;
         return self();
     }
 
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java b/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java
index 64e8bbe7055..62a1abd38db 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java
@@ -4,20 +4,29 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import static org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
+
 public class DefaultRecordingFileFactory implements RecordingFileFactory {
 
     private static final SimpleDateFormat filenameDateFormat = new SimpleDateFormat("YYYYMMdd-HHmmss");
     private static final String PASSED = "PASSED";
     private static final String FAILED = "FAILED";
-    private static final String FILENAME_FORMAT = "%s-%s-%s.flv";
+    private static final String FILENAME_FORMAT = "%s-%s-%s.%s";
+
 
     @Override
     public File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded) {
+        return recordingFileForTest(vncRecordingDirectory, prefix, succeeded, VncRecordingContainer.DEFAULT_RECORDING_FORMAT);
+    }
+
+    @Override
+    public File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded, VncRecordingFormat recordingFormat) {
         final String resultMarker = succeeded ? PASSED : FAILED;
         final String fileName = String.format(FILENAME_FORMAT,
             resultMarker,
             prefix,
-            filenameDateFormat.format(new Date())
+            filenameDateFormat.format(new Date()),
+            recordingFormat.getFilenameExtension()
         );
         return new File(vncRecordingDirectory, fileName);
     }
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java b/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
index 2cbd373493b..aff607cf23d 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.junit.runner.Description;
+import org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
 
 import java.io.File;
 
@@ -11,5 +12,10 @@ default File recordingFileForTest(File vncRecordingDirectory, Description descri
         return recordingFileForTest(vncRecordingDirectory, description.getTestClass().getSimpleName() + "-" + description.getMethodName(), succeeded);
     }
 
+    default File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded, VncRecordingFormat recordingFormat) {
+        return recordingFileForTest(vncRecordingDirectory, prefix, succeeded);
+    }
+
     File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded);
+
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
index ef3bd50772e..9abea56c5f2 100644
--- a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
@@ -57,4 +57,4 @@ public void recordingFileThatShouldDescribeTheTestResultAtThePresentTime() throw
 
         assertThat(expectedPossibleFileNames, hasItem(recordingFile));
     }
-}
\ No newline at end of file
+}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index cf8a6227ec1..fdf56aa0134 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -10,29 +10,46 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.DefaultRecordingFileFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.VncRecordingContainer;
+import org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.lifecycle.TestDescription;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
 import java.io.File;
+import java.io.IOException;
+import java.time.Duration;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
+import static java.time.temporal.ChronoUnit.SECONDS;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
 import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_FAILING;
 
 @RunWith(Enclosed.class)
 public class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContainerTest {
 
+    /**
+     * Guaranty a minimum video length for FFmpeg re-encoding.
+     * @see VncRecordingFormat#reencodeRecording(VncRecordingContainer, String)
+     */
+    private static final int MINIMUM_VIDEO_DURATION_MILLISECONDS = 200;
+
     public static class ChromeThatRecordsAllTests {
 
         @Rule
         public TemporaryFolder vncRecordingDirectory = new TemporaryFolder();
 
         @Test
-        public void recordingTestThatShouldBeRecordedAndRetained() {
+        public void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() throws InterruptedException {
             File target = vncRecordingDirectory.getRoot();
             try (
                 // recordAll {
-                // To do this, simply add extra parameters to the rule constructor:
+                // To do this, simply add extra parameters to the rule constructor, so video will default to FLV format:
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
                     .withRecordingMode(RECORD_ALL, target)
@@ -40,25 +57,96 @@ public void recordingTestThatShouldBeRecordedAndRetained() {
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
             ) {
-                chrome.start();
+                File[] files = runSimpleExploreInContainer(chrome, "PASSED-.*\\.flv");
+                assertEquals("Recorded file not found", 1, files.length);
+            }
+        }
 
-                doSimpleExplore(chrome);
-                chrome.afterTest(new TestDescription() {
-                    @Override
-                    public String getTestId() {
-                        return getFilesystemFriendlyName();
-                    }
+        private File[] runSimpleExploreInContainer(BrowserWebDriverContainer<?> container, String fileNamePattern) throws InterruptedException {
+            container.start();
 
-                    @Override
-                    public String getFilesystemFriendlyName() {
-                        return "ChromeThatRecordsAllTests-recordingTestThatShouldBeRecordedAndRetained";
-                    }
-                }, Optional.empty());
+            TimeUnit.MILLISECONDS.sleep(MINIMUM_VIDEO_DURATION_MILLISECONDS);
+            doSimpleExplore(container);
+            container.afterTest(new TestDescription() {
+                @Override
+                public String getTestId() {
+                    return getFilesystemFriendlyName();
+                }
+
+                @Override
+                public String getFilesystemFriendlyName() {
+                    return "ChromeThatRecordsAllTests-recordingTestThatShouldBeRecordedAndRetained";
+                }
+            }, Optional.empty());
+
+            return vncRecordingDirectory.getRoot().listFiles(new PatternFilenameFilter(fileNamePattern));
+        }
 
-                String[] files = vncRecordingDirectory.getRoot().list(new PatternFilenameFilter("PASSED-.*\\.flv"));
+        @Test
+        public void recordingTestShouldHaveFlvExtension() throws InterruptedException {
+            File target = vncRecordingDirectory.getRoot();
+            try (
+                // recordFlv {
+                // Set (explicitly) FLV format for recorded video:
+                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
+                    .withCapabilities(new ChromeOptions())
+                    .withRecordingMode(RECORD_ALL, target, VncRecordingFormat.FLV)
+                    // }
+                    .withRecordingFileFactory(new DefaultRecordingFileFactory())
+                    .withNetwork(NETWORK)
+            ) {
+                File[] files = runSimpleExploreInContainer(chrome, "PASSED-.*\\.flv");
                 assertEquals("Recorded file not found", 1, files.length);
             }
         }
+
+        @Test
+        public void recordingTestShouldHaveMp4Extension() throws InterruptedException {
+            File target = vncRecordingDirectory.getRoot();
+            try (
+                // recordMp4 {
+                // Set MP4 format for recorded video:
+                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
+                    .withCapabilities(new ChromeOptions())
+                    .withRecordingMode(RECORD_ALL, target, VncRecordingFormat.MP4)
+                    // }
+                    .withRecordingFileFactory(new DefaultRecordingFileFactory())
+                    .withNetwork(NETWORK)
+            ) {
+                File[] files = runSimpleExploreInContainer(chrome, "PASSED-.*\\.mp4");
+                assertEquals("Recorded file not found", 1, files.length);
+            }
+        }
+
+        @Test
+        public void recordingTestThatShouldHaveCorrectDuration() throws IOException, InterruptedException {
+            MountableFile mountableFile;
+            try (
+                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
+                    .withCapabilities(new ChromeOptions())
+                    .withRecordingMode(RECORD_ALL, vncRecordingDirectory.getRoot())
+                    .withRecordingFileFactory(new DefaultRecordingFileFactory())
+                    .withNetwork(NETWORK)
+            ) {
+                File[] recordedFiles = runSimpleExploreInContainer(chrome, "PASSED-.*\\.flv");
+                mountableFile = MountableFile.forHostPath(recordedFiles[0].getCanonicalPath());
+            }
+
+            try (GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/vnc-recorder:1.2.0"))) {
+                String recordFileContainerPath = "/tmp/chromeTestRecord.flv";
+                container.withCopyFileToContainer(mountableFile, recordFileContainerPath)
+                        .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withEntrypoint("ffmpeg"))
+                        .withCommand("-i", recordFileContainerPath, "-f", "null", "-")
+                        .waitingFor(new LogMessageWaitStrategy()
+                                                .withRegEx(".*Duration.*")
+                                                .withStartupTimeout(Duration.of(60, SECONDS)))
+                        .start();
+                String ffmpegOutput = container.getLogs();
+
+                assertTrue("Duration is incorrect in:\n " + ffmpegOutput,
+                    ffmpegOutput.contains("Duration: 00:") && !(ffmpegOutput.contains("Duration: 00:00:00.00")));
+            }
+        }
     }
 
     public static class ChromeThatRecordsFailingTests {
@@ -85,7 +173,7 @@ public void recordingTestThatShouldBeRecordedButNotPersisted() {
         }
 
         @Test
-        public void recordingTestThatShouldBeRecordedAndRetained() {
+        public void recordingTestThatShouldBeRecordedAndRetained() throws InterruptedException {
             File target = vncRecordingDirectory.getRoot();
             try (
                 // recordFailing {
@@ -99,6 +187,7 @@ public void recordingTestThatShouldBeRecordedAndRetained() {
             ) {
                 chrome.start();
 
+                TimeUnit.MILLISECONDS.sleep(MINIMUM_VIDEO_DURATION_MILLISECONDS);
                 doSimpleExplore(chrome);
                 chrome.afterTest(new TestDescription() {
                     @Override

From b62b0ef2b7a98815f0a1937c9c1991a232e05aad Mon Sep 17 00:00:00 2001
From: Chris Roemmich <christopher.roemmich@gmail.com>
Date: Wed, 10 Feb 2021 04:11:42 -0600
Subject: [PATCH 1170/4969] Implement getDatabaseName() in CockroachContainer
 (#3778)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../org/testcontainers/containers/CockroachContainer.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 333a6ca0158..f32e6bce385 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -68,6 +68,11 @@ public String getJdbcUrl() {
             "/" + databaseName + additionalUrlParams;
     }
 
+    @Override
+    public final String getDatabaseName() {
+        return databaseName;
+    }
+
     @Override
     public String getUsername() {
         return username;

From b0f1bbcd2eb83f939681390ca56fd929996781ab Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Wed, 10 Feb 2021 13:41:58 +0100
Subject: [PATCH 1171/4969] Switch to Presto image hosted on GHCR (#3667)

The `prestosql` Docker Hub org has been deprecated and the current
Presto image has been moved to GitHub Container Registry.
---
 .../java/org/testcontainers/containers/PrestoContainer.java   | 4 ++--
 .../src/test/java/org/testcontainers/PrestoTestImages.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 54cc6758562..1d9e02114ac 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -16,8 +16,8 @@
 
 public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
     public static final String NAME = "presto";
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("prestosql/presto");
-    public static final String IMAGE = "prestosql/presto";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/trinodb/presto");
+    public static final String IMAGE = "ghcr.io/trinodb/presto";
     public static final String DEFAULT_TAG = "344";
 
     public static final Integer PRESTO_PORT = 8080;
diff --git a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
index a257500576c..174cb7b4d4a 100644
--- a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
+++ b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
@@ -3,6 +3,6 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface PrestoTestImages {
-    DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("prestosql/presto:344");
-    DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("prestosql/presto:343");
+    DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:344");
+    DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:343");
 }

From 106463b2e77d45552dfbfdb23aa559de47bea8cd Mon Sep 17 00:00:00 2001
From: Per Lundberg <perlun@gmail.com>
Date: Wed, 10 Feb 2021 17:38:38 +0200
Subject: [PATCH 1172/4969] Fix extra newlines in container log / exec output
 (#3752)

Fixes #1763
Fixes #1854

Co-authored-by: Sergei Egorov <segorov@vmware.com>
---
 .../containers/output/ToStringConsumer.java   |  7 --
 .../output/ToStringConsumerTest.java          | 89 +++++++++++++++++++
 2 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java b/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
index a12325865aa..40ec60fb744 100644
--- a/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
@@ -10,21 +10,14 @@
  * Created by rnorth on 26/03/2016.
  */
 public class ToStringConsumer extends BaseConsumer<ToStringConsumer> {
-    private static final byte[] NEW_LINE = "\n".getBytes();
-
-    private boolean firstLine = true;
     private ByteArrayOutputStream stringBuffer = new ByteArrayOutputStream();
 
     @Override
     public void accept(OutputFrame outputFrame) {
         try {
             if (outputFrame.getBytes() != null) {
-                if (!firstLine) {
-                    stringBuffer.write(NEW_LINE);
-                }
                 stringBuffer.write(outputFrame.getBytes());
                 stringBuffer.flush();
-                firstLine = false;
             }
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
new file mode 100644
index 00000000000..1610c688931
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -0,0 +1,89 @@
+package org.testcontainers.containers.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.testcontainers.containers.Container.ExecResult;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+
+public class ToStringConsumerTest {
+
+    private static final String LARGE_PAYLOAD;
+
+    static {
+        StringBuilder builder = new StringBuilder(10_003 * 10);;
+        for (int i = 0; i < 10; i++) {
+            builder.append(' ').append(i).append(RandomStringUtils.randomAlphabetic(10000));
+        }
+        LARGE_PAYLOAD = builder.toString();
+        Assertions.assertThat(LARGE_PAYLOAD).doesNotContain("\n");
+    }
+
+    @Test
+    public void newlines_are_not_added_to_exec_output() throws Exception {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+            container.withCommand("sleep", "2m");
+            container.start();
+
+            ExecResult build = container.execInContainer("echo", "-n", LARGE_PAYLOAD);
+            Assertions.assertThat(build.getStdout())
+                .doesNotContain("\n")
+                .isEqualTo(LARGE_PAYLOAD);
+        }
+    }
+
+    @Test(timeout = 60_000L)
+    public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+            container.withCreateContainerCmdModifier(cmd -> {
+                cmd
+                    .withAttachStdin(true)
+                    .withStdinOpen(true)
+                    .withTty(true);
+            });
+            container.withCommand("sleep", "2m");
+            container.start();
+
+            ExecResult build = container.execInContainer("echo", "-n", LARGE_PAYLOAD);
+            assertThat(build.getStdout())
+                .isEqualTo(LARGE_PAYLOAD)
+                .doesNotContain("\n");
+        }
+    }
+
+    @Test
+    public void newlines_are_not_added_to_container_output() {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+            container.withCommand("echo", "-n", LARGE_PAYLOAD);
+            container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.start();
+
+            container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode();
+
+            assertThat(container.getLogs())
+                .isEqualTo(LARGE_PAYLOAD)
+                .doesNotContain("\n");
+        }
+    }
+
+    @Test
+    public void newlines_are_not_added_to_container_output_with_tty() {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+            container.withCreateContainerCmdModifier(cmd -> {
+                cmd.withTty(true);
+            });
+            container.withCommand("echo", "-n", LARGE_PAYLOAD);
+            container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.start();
+
+            container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode();
+
+            assertThat(container.getLogs())
+                .isEqualTo(LARGE_PAYLOAD)
+                .doesNotContain("\n");
+        }
+    }
+}

From c0eaf3412d5a6520ab973e9a693234877ae476e8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 11 Feb 2021 16:57:46 +0100
Subject: [PATCH 1173/4969] Update mkdocs.yml

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 2457d06bcf0..82f2d291164 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -94,4 +94,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.15.1
+    latest_version: 1.15.2

From eaf9b9fe2aab4e60a4b0079e7c15afb38bb44beb Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Mon, 15 Feb 2021 21:11:59 +0100
Subject: [PATCH 1174/4969] Delegate copyFile{To,From}Container's state
 verification to Docker (#3805)

This commit closes #3264 by letting the Docker daemon decide in which state
the copy operation could be performed (we were too strict about it before).
Now, only a quick check (`containerId != null`) is performed.

Co-authored-by: Andrew Jefferson <andrew.jefferson@neotechnology.com>
Co-authored-by: Sergei Egorov <segorov@vmware.com>
---
 .../containers/ContainerState.java            |  4 +-
 .../junit/FileOperationsTest.java             | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 1b1a99d3b89..ad96aeb808c 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -260,7 +260,7 @@ default void copyFileToContainer(MountableFile mountableFile, String containerPa
      */
     @SneakyThrows(IOException.class)
     default void copyFileToContainer(Transferable transferable, String containerPath) {
-        if (!isCreated()) {
+        if (getContainerId() == null) {
             throw new IllegalStateException("copyFileToContainer can only be used with created / running container");
         }
 
@@ -306,7 +306,7 @@ default void copyFileFromContainer(String containerPath, String destinationPath)
      */
     @SneakyThrows
     default  <T> T copyFileFromContainer(String containerPath, ThrowingFunction<InputStream, T> function) {
-        if (!isCreated()) {
+        if (getContainerId() == null) {
             throw new IllegalStateException("copyFileFromContainer can only be used when the Container is created.");
         }
 
diff --git a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
index 5e12fafc064..beca4a8a49f 100644
--- a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
@@ -2,15 +2,19 @@
 
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.MountableFile;
 
 import java.io.File;
 import java.io.IOException;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 import static org.testcontainers.TestImages.ALPINE_IMAGE;
 
@@ -103,4 +107,50 @@ public void shouldCopyFileFromContainerTest() throws IOException {
             assertTrue("Files aren't same ", FileUtils.contentEquals(expectedFile, actualFile));
         }
     }
+
+    @Test
+    public void copyFileOperationsShouldFailWhenNotStartedTest() {
+        try (GenericContainer<?> container = new GenericContainer<>(ALPINE_IMAGE).withCommand("top")) {
+            Assertions
+                .assertThatThrownBy(() -> {
+                    MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
+                    container.copyFileToContainer(mountableFile, "/home/test.txt");
+                })
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining("can only be used with created / running container");
+
+            Assertions
+                .assertThatThrownBy(() -> {
+                    container.copyFileFromContainer(
+                        "/home/test_copy_to_container.txt",
+                        IOUtils::toByteArray
+                    );
+                })
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining("can only be used when the Container is created");
+        }
+    }
+
+    @Test
+    public void shouldCopyFileFromExitedContainerTest() throws IOException {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(ALPINE_IMAGE)
+                .withCommand("sh", "-c", "echo -n 'Hello!' > /home/file_in_container.txt")
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+            assertThat(container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode())
+                .isEqualTo(0);
+
+            container.copyFileFromContainer(
+                "/home/file_in_container.txt",
+                IOUtils::toByteArray
+            );
+
+            container.copyFileToContainer(
+                MountableFile.forClasspathResource("test_copy_to_container.txt"),
+                "/test.txt"
+            );
+        }
+    }
 }

From f588082636dc2749f4129e943b02ede62527b41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonard=20Br=C3=BCnings?= <lord_damokles@gmx.net>
Date: Fri, 19 Feb 2021 16:57:23 +0100
Subject: [PATCH 1175/4969] Fix mp4 recording to be compatible with Firefox
 (#3812)

Firefox still doesn't support yuv444 so use yuv420p
https://shallowsky.com/blog/linux/videos-from-images.html
---
 .../org/testcontainers/containers/VncRecordingContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index a171e6ba2f6..be8a4ed735f 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -132,7 +132,7 @@ String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull Stri
             @Override
             String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull String source) throws IOException, InterruptedException {
                 String newFileOutput = "/newScreen.mp4";
-                container.execInContainer("ffmpeg", "-i", source, "-vcodec", "libx264", "-movflags", "faststart", newFileOutput);
+                container.execInContainer("ffmpeg", "-i", source, "-vcodec", "libx264", "-movflags", "faststart", "-pix_fmt", "yuv420p", newFileOutput);
                 return newFileOutput;
             }
         };

From 80a172e6fd0e82b476bf76e9ad3d9440fbd4b07b Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Mon, 8 Mar 2021 12:48:22 -0700
Subject: [PATCH 1176/4969] Add Google (#3868)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index bc6d1e64afe..b53ebbf4db5 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -163,6 +163,7 @@ A huge thank you to our sponsors:
 * [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
 * [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS
 * [Trino (formerly Presto SQL)](https://trino.io) - Integration testing all Trino core & connectors, including tests of multi-node deployments and security configurations.
+* Google - Various open source projects: [OpenTelemetry](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java), [Universal Application Tool](https://github.com/seattle-uat/universal-application-tool), [CloudBowl](https://github.com/GoogleCloudPlatform/cloudbowl-microservice-game)
 
 
 ## License

From 5c1ac7ca518d985495afd76b89ee5325145adbfc Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 12 Mar 2021 09:58:56 +0000
Subject: [PATCH 1177/4969] Fix GitHub Actions error due to short SHA form
 (#3874)

---
 .github/workflows/release-drafter.yml       | 2 +-
 .github/workflows/update-docs-version.yml   | 2 +-
 .github/workflows/update-gradle-wrapper.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 8f88ac2231e..28f14cb0ad3 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -9,6 +9,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@4d1215c #v5.13.0
+      - uses: release-drafter/release-drafter@e5ccf147077e46b0225a80bbe314d795d77bb7a2 # v5.14.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index d2eb803fda2..64658c1be4a 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -22,6 +22,6 @@ jobs:
                     git add mkdocs.yml
                     git commit -m "Update documentation version to ${GITHUB_REF##*/}" -m "skip-checks: true" || echo "not changed"
             -   name: Push changes
-                uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6
+                uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6 # v0.6.0
                 with:
                     github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index e8f4f130b12..d34110f5a6d 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -12,9 +12,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@74a035ce333f39c84811ce1167669bfa6c65f440
+        uses: gradle-update/update-gradle-wrapper-action@af940e8bff73d435137caae9d08cf7a1badf5497 # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c
+      - uses: gradle/wrapper-validation-action@e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c # v1.0.3

From ca1dfc499d801d2a4882d9b1e4dfe1150498cfaa Mon Sep 17 00:00:00 2001
From: Erhun Baycelik <erhun.baycelik@transferwise.com>
Date: Fri, 12 Mar 2021 15:59:38 +0200
Subject: [PATCH 1178/4969] Documentation TransferWise has changed its name as
 Wise. (#3873)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index b53ebbf4db5..6efa8f82eb3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -158,7 +158,7 @@ A huge thank you to our sponsors:
 * [JHipster](https://www.jhipster.tech/) - Couchbase and Cassandra integration testing
 * [wescale](https://www.wescale.com) - Integration testing against HTTP service mocks and various data stores
 * [Marquez](https://marquezproject.github.io/marquez) - PostgreSQL integration testing
-* [Transferwise](https://transferwise.com/) - Integration testing for different RDBMS, kafka and micro services
+* [Wise (formerly TransferWise)](https://wise.com) - Integration testing for different RDBMS, kafka and micro services
 * [XWiki](https://xwiki.org) - [Testing XWiki](https://dev.xwiki.org/xwiki/bin/view/Community/Testing/DockerTesting/) under all [supported configurations](https://dev.xwiki.org/xwiki/bin/view/Community/SupportStrategy/)
 * [Apache SkyWalking](http://github.com/apache/skywalking) - End-to-end testing of the Apache SkyWalking, and plugin tests of its subproject, [Apache SkyWalking Python](http://github.com/apache/skywalking-python), and of its eco-system built by the community, like [SkyAPM NodeJS Agent](http://github.com/SkyAPM/nodejs)
 * [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS

From 61dcd7ce371f84d28fcc28192223d41c20eb95bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Torres?= <torrespro@users.noreply.github.com>
Date: Fri, 12 Mar 2021 16:33:44 +0000
Subject: [PATCH 1179/4969] Add Backbase to "who is using" section (#3870)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 6efa8f82eb3..18fd3f034b1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -164,6 +164,7 @@ A huge thank you to our sponsors:
 * [jOOQ](https://www.jooq.org) - Integration testing all of jOOQ with a variety of RDBMS
 * [Trino (formerly Presto SQL)](https://trino.io) - Integration testing all Trino core & connectors, including tests of multi-node deployments and security configurations.
 * Google - Various open source projects: [OpenTelemetry](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java), [Universal Application Tool](https://github.com/seattle-uat/universal-application-tool), [CloudBowl](https://github.com/GoogleCloudPlatform/cloudbowl-microservice-game)
+* [Backbase](https://www.backbase.com/) - Unit, Integration and Acceptance testing for different the databases supported (Oracle, SQL Server, MySQL), the different messaging systems supported (Kafka, Rabbit, AMQ) and other microservices and HTTP mocks.
 
 
 ## License

From 60865fa43113eaa1bce6c6761fcd9027c58c05cc Mon Sep 17 00:00:00 2001
From: Viktar Patotski <xp.vit.blr@gmail.com>
Date: Sat, 13 Mar 2021 11:55:34 +0100
Subject: [PATCH 1180/4969] Bump docs environment to python 3.7 (#3871)

---
 docker-compose.yml        | 2 +-
 docs/contributing_docs.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 822956457f7..1ce5532d0bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   docs:
-    image: python:3.6
+    image: python:3.7
     command: sh -c "pip install -r requirements.txt && mkdocs serve -a 0.0.0.0:8000"
     working_dir: /docs
     volumes:
diff --git a/docs/contributing_docs.md b/docs/contributing_docs.md
index 9ed4b08169c..f6f9304a339 100644
--- a/docs/contributing_docs.md
+++ b/docs/contributing_docs.md
@@ -15,7 +15,7 @@ The root of the project contains a `docker-compose.yml` file. Simply run `docker
 
 ### Using Python locally
 
-* Ensure that you have Python 3.6.0 or higher.
+* Ensure that you have Python 3.7.0 or higher.
 * Set up a virtualenv and run `pip install -r requirements.txt` in the `testcontainers-java` root directory.
 * Once Python dependencies have been installed, run `mkdocs serve` to start a local auto-updating MkDocs server.
 

From b635eb5ac38d8c2235dd4a2af145dca21d43dcfc Mon Sep 17 00:00:00 2001
From: GooseMagnet <ilankarasik@gmail.com>
Date: Sat, 13 Mar 2021 05:59:40 -0500
Subject: [PATCH 1181/4969] Fix NPE bug with docker-compose files in working
 directory (#3866)

---
 .../containers/ParsedDockerComposeFile.java   |  2 ++
 .../junit/DockerComposeContainerTest.java     | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index 8f88724647f..a0972273b5b 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -120,6 +120,7 @@ private void findImageNamesInDockerfile(Map serviceDefinitionMap) {
             final Object contextRelativePath = buildElement.get("context");
             if (dockerfileRelativePath instanceof String && contextRelativePath instanceof String) {
                 dockerfilePath = composeFile
+                    .getAbsoluteFile()
                     .getParentFile()
                     .toPath()
                     .resolve((String) contextRelativePath)
@@ -128,6 +129,7 @@ private void findImageNamesInDockerfile(Map serviceDefinitionMap) {
             }
         } else if (buildNode instanceof String) {
             dockerfilePath = composeFile
+                .getAbsoluteFile()
                 .getParentFile()
                 .toPath()
                 .resolve((String) buildNode)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
index 53d90872332..17a9b665513 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
@@ -6,6 +6,9 @@
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Optional;
 
 import static java.lang.String.format;
@@ -53,4 +56,24 @@ public void shouldReturnEmptyResultOnNoneExistingService() {
         Optional<ContainerState> result = environment.getContainerByServiceName(notExistingServiceName);
         assertFalse(format("No container should be found under service name %s", notExistingServiceName), result.isPresent());
     }
+
+    @Test
+    public void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
+        String validYaml =
+            "version: '2.2'\n" +
+                "services:\n" +
+                "  http:\n" +
+                "    build: .\n" +
+                "    image: python:latest\n" +
+                "    ports:\n" +
+                "    - 8080:8080";
+
+        File filePathNotStartWithDotSlash = new File("docker-compose-test.yml");
+        filePathNotStartWithDotSlash.createNewFile();
+        filePathNotStartWithDotSlash.deleteOnExit();
+        Files.write(filePathNotStartWithDotSlash.toPath(), validYaml.getBytes(StandardCharsets.UTF_8));
+
+        final DockerComposeContainer<?> dockerComposeContainer = new DockerComposeContainer<>(filePathNotStartWithDotSlash);
+        assertNotNull("Container could not be created using docker compose file", dockerComposeContainer);
+    }
 }

From 26be859459a8596a58791f4b7101fe7026a3d5ba Mon Sep 17 00:00:00 2001
From: askfor <askfor@gmail.com>
Date: Sat, 13 Mar 2021 19:07:11 +0800
Subject: [PATCH 1182/4969] Make DockerComposeContainer only pull necessary
 images when multiple compose files were given (#3787)

Co-authored-by: tianjie <tianjie@picclife.cn>
---
 .../containers/DockerComposeContainer.java    |  7 ++-
 .../containers/DockerComposeFiles.java        | 43 +++++++++++++++++++
 .../containers/ParsedDockerComposeFile.java   | 17 ++++----
 .../containers/DockerComposeFilesTest.java    | 25 +++++++++++
 ...ParsedDockerComposeFileValidationTest.java | 30 ++++++++++---
 .../docker-compose-imagename-overriding-a.yml | 12 ++++++
 .../docker-compose-imagename-overriding-b.yml | 10 +++++
 7 files changed, 127 insertions(+), 17 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
 create mode 100644 core/src/test/resources/docker-compose-imagename-overriding-a.yml
 create mode 100644 core/src/test/resources/docker-compose-imagename-overriding-b.yml

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 3d58ad53b3b..89d6d692db7 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -77,7 +77,7 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
      */
     private final String identifier;
     private final List<File> composeFiles;
-    private Set<ParsedDockerComposeFile> parsedComposeFiles;
+    private DockerComposeFiles dockerComposeFiles;
     private final Map<String, Integer> scalingPreferences = new HashMap<>();
     private DockerClient dockerClient;
     private boolean localCompose;
@@ -126,7 +126,7 @@ public DockerComposeContainer(String identifier, File... composeFiles) {
     public DockerComposeContainer(String identifier, List<File> composeFiles) {
 
         this.composeFiles = composeFiles;
-        this.parsedComposeFiles = composeFiles.stream().map(ParsedDockerComposeFile::new).collect(Collectors.toSet());
+        this.dockerComposeFiles = new DockerComposeFiles(composeFiles);
 
         // Use a unique identifier so that containers created for this compose environment can be identified
         this.identifier = identifier;
@@ -184,8 +184,7 @@ private void pullImages() {
         // Pull images using our docker client rather than compose itself,
         // (a) as a workaround for https://github.com/docker/compose/issues/5854, which prevents authenticated image pulls being possible when credential helpers are in use
         // (b) so that credential helper-based auth still works when compose is running from within a container
-        parsedComposeFiles.stream()
-            .flatMap(it -> it.getDependencyImageNames().stream())
+        dockerComposeFiles.getDependencyImages()
             .forEach(imageName -> {
                 try {
                     log.info("Preemptively checking local images for '{}', referenced via a compose file or transitive Dockerfile. If not available, it will be pulled.", imageName);
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java b/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
new file mode 100644
index 00000000000..15d035e3673
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
@@ -0,0 +1,43 @@
+package org.testcontainers.containers;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class DockerComposeFiles {
+
+    private List<ParsedDockerComposeFile> parsedComposeFiles;
+
+    public DockerComposeFiles(List<File> composeFiles) {
+        this.parsedComposeFiles = composeFiles.stream().map(ParsedDockerComposeFile::new).collect(Collectors.toList());
+    }
+
+    public Set<String> getDependencyImages() {
+
+        Map<String, Set<String>> mergedServiceNameToImageNames = mergeServiceDependencyImageNames();
+
+        return getImageNames(mergedServiceNameToImageNames);
+    }
+
+    private Map<String, Set<String>> mergeServiceDependencyImageNames() {
+        Map<String, Set<String>> mergedServiceNameToImageNames = new HashMap();
+        for (ParsedDockerComposeFile parsedComposeFile : parsedComposeFiles) {
+            for (Entry<String, Set<String>> entry : parsedComposeFile.getServiceNameToImageNames().entrySet()) {
+                mergedServiceNameToImageNames.put(entry.getKey(), entry.getValue());
+            }
+        }
+        return mergedServiceNameToImageNames;
+    }
+
+    private Set<String> getImageNames(Map<String, Set<String>> serviceToImageNames) {
+        Set<String> imageNames = new HashSet<>();
+        serviceToImageNames.values().stream().forEach(imageNames::addAll);
+        return imageNames;
+    }
+
+}
diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index a0972273b5b..e9457ba92bd 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Sets;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +13,7 @@
 import java.io.FileInputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,7 +30,7 @@ class ParsedDockerComposeFile {
     private final File composeFile;
 
     @Getter
-    private Set<String> dependencyImageNames = new HashSet<>();
+    private Map<String, Set<String>> serviceNameToImageNames = new HashMap<>();
 
     ParsedDockerComposeFile(File composeFile) {
         Yaml yaml = new Yaml();
@@ -87,8 +88,8 @@ private void parseAndValidate() {
             final Map serviceDefinitionMap = (Map) serviceDefinition;
 
             validateNoContainerNameSpecified(serviceName, serviceDefinitionMap);
-            findServiceImageName(serviceDefinitionMap);
-            findImageNamesInDockerfile(serviceDefinitionMap);
+            findServiceImageName(serviceName, serviceDefinitionMap);
+            findImageNamesInDockerfile(serviceName, serviceDefinitionMap);
         }
     }
 
@@ -102,15 +103,15 @@ private void validateNoContainerNameSpecified(String serviceName, Map serviceDef
         }
     }
 
-    private void findServiceImageName(Map serviceDefinitionMap) {
+    private void findServiceImageName(String serviceName, Map serviceDefinitionMap) {
         if (serviceDefinitionMap.containsKey("image") && serviceDefinitionMap.get("image") instanceof String) {
             final String imageName = (String) serviceDefinitionMap.get("image");
             log.debug("Resolved dependency image for Docker Compose in {}: {}", composeFileName, imageName);
-            dependencyImageNames.add(imageName);
+            serviceNameToImageNames.put(serviceName, Sets.newHashSet(imageName));
         }
     }
 
-    private void findImageNamesInDockerfile(Map serviceDefinitionMap) {
+    private void findImageNamesInDockerfile(String serviceName, Map serviceDefinitionMap) {
         final Object buildNode = serviceDefinitionMap.get("build");
         Path dockerfilePath = null;
 
@@ -141,7 +142,7 @@ private void findImageNamesInDockerfile(Map serviceDefinitionMap) {
             Set<String> resolvedImageNames = new ParsedDockerfile(dockerfilePath).getDependencyImageNames();
             if (!resolvedImageNames.isEmpty()) {
                 log.debug("Resolved Dockerfile dependency images for Docker Compose in {} -> {}: {}", composeFileName, dockerfilePath, resolvedImageNames);
-                this.dependencyImageNames.addAll(resolvedImageNames);
+                this.serviceNameToImageNames.put(serviceName, resolvedImageNames);
             }
         }
     }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
new file mode 100644
index 00000000000..8dbcde2181d
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -0,0 +1,25 @@
+package org.testcontainers.containers;
+
+
+import com.google.common.collect.Lists;
+import java.io.File;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class DockerComposeFilesTest {
+    @Test
+    public void shouldGetDependencyImages() {
+        DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-parsing-v2.yml")));
+        Assertions.assertThat(dockerComposeFiles.getDependencyImages())
+            .containsExactlyInAnyOrder("postgres", "redis", "mysql");
+    }
+
+    @Test
+    public void shouldGetDependencyImagesWhenOverriding() {
+        DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(
+            Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-overriding-a.yml"),
+                               new File("src/test/resources/docker-compose-imagename-overriding-b.yml")));
+        Assertions.assertThat(dockerComposeFiles.getDependencyImages())
+            .containsExactlyInAnyOrder("alpine:3.2", "redis:b", "mysql:b", "aservice");
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index 9a8421086f1..bdceba343d9 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -9,7 +9,7 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.entry;
 
 public class ParsedDockerComposeFileValidationTest {
 
@@ -76,27 +76,47 @@ public void shouldIgnoreUnknownStructure() {
     public void shouldObtainImageNamesV1() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "postgres"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, postgres from Dockerfile build
+        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+            .contains(
+                entry("mysql", Sets.newHashSet("mysql")),
+                entry("redis", Sets.newHashSet("redis")),
+                entry("custom", Sets.newHashSet("postgres")))
+            .as("all defined images are found"); // redis, mysql from compose file, postgres from Dockerfile build
     }
 
     @Test
     public void shouldObtainImageNamesV2() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v2.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "postgres"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, postgres from Dockerfile build
+        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+            .contains(
+                entry("mysql", Sets.newHashSet("mysql")),
+                entry("redis", Sets.newHashSet("redis")),
+                entry("custom", Sets.newHashSet("postgres")))
+            .as("all defined images are found");
     }
 
     @Test
     public void shouldObtainImageFromDockerfileBuild() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "alpine:3.2"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, alpine:3.2 from Dockerfile build
+        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+            .contains(
+                entry("mysql", Sets.newHashSet("mysql")),
+                entry("redis", Sets.newHashSet("redis")),
+                entry("custom", Sets.newHashSet("alpine:3.2")))
+            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.2 from Dockerfile build
     }
 
     @Test
     public void shouldObtainImageFromDockerfileBuildWithContext() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "alpine:3.2"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, alpine:3.2 from Dockerfile build
+        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+            .contains(
+                entry("mysql", Sets.newHashSet("mysql")),
+                entry("redis", Sets.newHashSet("redis")),
+                entry("custom", Sets.newHashSet("alpine:3.2")))
+            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.2 from Dockerfile build
     }
 }
diff --git a/core/src/test/resources/docker-compose-imagename-overriding-a.yml b/core/src/test/resources/docker-compose-imagename-overriding-a.yml
new file mode 100644
index 00000000000..50b226d32a4
--- /dev/null
+++ b/core/src/test/resources/docker-compose-imagename-overriding-a.yml
@@ -0,0 +1,12 @@
+version: "2.1"
+services:
+    aservice:
+      image: aservice
+    redis:
+        image: redis:a
+    mysql:
+        image: mysql:a
+    custom:
+        build: .
+networks:
+    custom_network: {}
diff --git a/core/src/test/resources/docker-compose-imagename-overriding-b.yml b/core/src/test/resources/docker-compose-imagename-overriding-b.yml
new file mode 100644
index 00000000000..7e6f83c6b6a
--- /dev/null
+++ b/core/src/test/resources/docker-compose-imagename-overriding-b.yml
@@ -0,0 +1,10 @@
+version: "2.1"
+services:
+    redis:
+        image: redis:b
+    mysql:
+        image: mysql:b
+    custom:
+        build: compose-dockerfile
+networks:
+    custom_network: {}

From 3c8beb2be6d94567bb7856aefc407eadb9a868f2 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sat, 13 Mar 2021 12:19:32 +0000
Subject: [PATCH 1183/4969] Bump copyright dates and remove Java 8 reference

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ec5ab97ca12..c87138e7d1a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Testcontainers
 
-> Testcontainers is a Java 8 library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
+> Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 
 [![Build Status](https://travis-ci.org/testcontainers/testcontainers-java.svg?branch=master)](https://travis-ci.org/testcontainers/testcontainers-java)[ ![Download](https://api.bintray.com/packages/testcontainers/releases/testcontainers/images/download.svg) ](https://bintray.com/testcontainers/releases/testcontainers/_latestVersion)
 
@@ -14,10 +14,10 @@ See [LICENSE](LICENSE).
 
 ## Copyright
 
-Copyright (c) 2015 - 2020 Richard North and other authors.
+Copyright (c) 2015 - 2021 Richard North and other authors.
 
-MS SQL Server module is (c) 2017 - 2020 G DATA Software AG and other authors.
+MS SQL Server module is (c) 2017 - 2021 G DATA Software AG and other authors.
 
-Hashicorp Vault module is (c) 2017 - 2020 Capital One Services, LLC and other authors.
+Hashicorp Vault module is (c) 2017 - 2021 Capital One Services, LLC and other authors.
 
 See [contributors](https://github.com/testcontainers/testcontainers-java/graphs/contributors) for all contributors.

From 57ce0c4861d83c804fc1eafb0d2239f35726553f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 15 Mar 2021 10:45:39 +0000
Subject: [PATCH 1184/4969] Update copyright date

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 18fd3f034b1..013c18d0700 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -179,6 +179,6 @@ This project was initially inspired by a [gist](https://gist.github.com/mosheesh
 
 ## Copyright
 
-Copyright (c) 2015-2020 Richard North and other authors.
+Copyright (c) 2015-2021 Richard North and other authors.
 
 See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/AUTHORS) for contributors.

From a406f0441d4a08431aff2bd661f9baada2e4fe19 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 19 Mar 2021 20:16:43 +0000
Subject: [PATCH 1185/4969] Add Cloudflare Web Analytics to docs site (#3896)

---
 docs/theme/main.html | 5 +++++
 mkdocs.yml           | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 docs/theme/main.html

diff --git a/docs/theme/main.html b/docs/theme/main.html
new file mode 100644
index 00000000000..f96a2669e7e
--- /dev/null
+++ b/docs/theme/main.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block analytics %}
+<!-- Cloudflare Web Analytics --><script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "e44a95720257486eab94698a6b4c6ca6"}'></script><!-- End Cloudflare Web Analytics -->
+{% endblock %}
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 82f2d291164..b0608746825 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -5,6 +5,7 @@ plugins:
     - markdownextradata
 theme:
     name: 'material'
+    custom_dir: 'docs/theme'
     palette:
         primary: 'blue'
         accent: 'teal'

From a032dc21f4991c43dd30f187136d91eadb623b46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Mar 2021 09:31:48 +0000
Subject: [PATCH 1186/4969] Docs: Bump jinja2 from 2.11.2 to 2.11.3 (#3897)

Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.11.2...2.11.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Pipfile.lock | 254 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 179 insertions(+), 75 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 899f8c82170..6ac609b04a9 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "c9a90b5f198797e8a6165fa7cb6c2143158bed425d0a8c5f63dc37ea4dcab632"
+            "sha256": "d3830267ea93391a077a2ba5b93aa8218c0a38002694b404b56df11498da3e56"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -18,76 +18,112 @@
     "default": {
         "click": {
             "hashes": [
-                "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13",
-                "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"
+                "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a",
+                "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"
             ],
-            "version": "==7.0"
+            "version": "==7.1.2"
+        },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71",
+                "sha256:b74159469b464a99cb8cc3e21973e4d96e05d3024d337313fedb618a6e86e6f4"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.7.3"
         },
         "jinja2": {
             "hashes": [
-                "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
-                "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
+                "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419",
+                "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"
             ],
-            "version": "==2.11.2"
+            "index": "pypi",
+            "version": "==2.11.3"
         },
         "livereload": {
             "hashes": [
-                "sha256:29cadfabcedd12eed792e0131991235b9d4764d4474bed75cf525f57109ec0a2",
-                "sha256:e632a6cd1d349155c1d7f13a65be873b38f43ef02961804a1bba8d817fa649a7"
+                "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"
             ],
-            "version": "==2.6.0"
+            "version": "==2.6.3"
         },
         "markdown": {
             "hashes": [
-                "sha256:c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa",
-                "sha256:d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"
+                "sha256:31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49",
+                "sha256:96c3ba1261de2f7547b46a00ea8463832c921d3f9d6aba3f255a6f71386db20c"
             ],
-            "version": "==3.0.1"
+            "version": "==3.3.4"
         },
         "markupsafe": {
             "hashes": [
-                "sha256:048ef924c1623740e70204aa7143ec592504045ae4429b59c30054cb31e3c432",
-                "sha256:130f844e7f5bdd8e9f3f42e7102ef1d49b2e6fdf0d7526df3f87281a532d8c8b",
-                "sha256:19f637c2ac5ae9da8bfd98cef74d64b7e1bb8a63038a3505cd182c3fac5eb4d9",
-                "sha256:1b8a7a87ad1b92bd887568ce54b23565f3fd7018c4180136e1cf412b405a47af",
-                "sha256:1c25694ca680b6919de53a4bb3bdd0602beafc63ff001fea2f2fc16ec3a11834",
-                "sha256:1f19ef5d3908110e1e891deefb5586aae1b49a7440db952454b4e281b41620cd",
-                "sha256:1fa6058938190ebe8290e5cae6c351e14e7bb44505c4a7624555ce57fbbeba0d",
-                "sha256:31cbb1359e8c25f9f48e156e59e2eaad51cd5242c05ed18a8de6dbe85184e4b7",
-                "sha256:3e835d8841ae7863f64e40e19477f7eb398674da6a47f09871673742531e6f4b",
-                "sha256:4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3",
-                "sha256:525396ee324ee2da82919f2ee9c9e73b012f23e7640131dd1b53a90206a0f09c",
-                "sha256:52b07fbc32032c21ad4ab060fec137b76eb804c4b9a1c7c7dc562549306afad2",
-                "sha256:52ccb45e77a1085ec5461cde794e1aa037df79f473cbc69b974e73940655c8d7",
-                "sha256:5c3fbebd7de20ce93103cb3183b47671f2885307df4a17a0ad56a1dd51273d36",
-                "sha256:5e5851969aea17660e55f6a3be00037a25b96a9b44d2083651812c99d53b14d1",
-                "sha256:5edfa27b2d3eefa2210fb2f5d539fbed81722b49f083b2c6566455eb7422fd7e",
-                "sha256:7d263e5770efddf465a9e31b78362d84d015cc894ca2c131901a4445eaa61ee1",
-                "sha256:83381342bfc22b3c8c06f2dd93a505413888694302de25add756254beee8449c",
-                "sha256:857eebb2c1dc60e4219ec8e98dfa19553dae33608237e107db9c6078b1167856",
-                "sha256:98e439297f78fca3a6169fd330fbe88d78b3bb72f967ad9961bcac0d7fdd1550",
-                "sha256:bf54103892a83c64db58125b3f2a43df6d2cb2d28889f14c78519394feb41492",
-                "sha256:d9ac82be533394d341b41d78aca7ed0e0f4ba5a2231602e2f05aa87f25c51672",
-                "sha256:e982fe07ede9fada6ff6705af70514a52beb1b2c3d25d4e873e82114cf3c5401",
-                "sha256:edce2ea7f3dfc981c4ddc97add8a61381d9642dc3273737e756517cc03e84dd6",
-                "sha256:efdc45ef1afc238db84cb4963aa689c0408912a0239b0721cb172b4016eb31d6",
-                "sha256:f137c02498f8b935892d5c0172560d7ab54bc45039de8805075e19079c639a9c",
-                "sha256:f82e347a72f955b7017a39708a3667f106e6ad4d10b25f237396a7115d8ed5fd",
-                "sha256:fb7c206e01ad85ce57feeaaa0bf784b97fa3cad0d4a5737bc5295785f5c613a1"
-            ],
-            "version": "==1.1.0"
+                "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473",
+                "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161",
+                "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235",
+                "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5",
+                "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42",
+                "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f",
+                "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39",
+                "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff",
+                "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b",
+                "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014",
+                "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f",
+                "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1",
+                "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e",
+                "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183",
+                "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66",
+                "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b",
+                "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1",
+                "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15",
+                "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1",
+                "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85",
+                "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1",
+                "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e",
+                "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b",
+                "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905",
+                "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850",
+                "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0",
+                "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735",
+                "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d",
+                "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb",
+                "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e",
+                "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d",
+                "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c",
+                "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1",
+                "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2",
+                "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21",
+                "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2",
+                "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5",
+                "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7",
+                "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b",
+                "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8",
+                "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6",
+                "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193",
+                "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f",
+                "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b",
+                "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f",
+                "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2",
+                "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5",
+                "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c",
+                "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032",
+                "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7",
+                "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be",
+                "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"
+            ],
+            "version": "==1.1.1"
         },
         "mkdocs": {
             "hashes": [
                 "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939",
                 "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"
             ],
+            "index": "pypi",
             "version": "==1.0.4"
         },
         "mkdocs-codeinclude-plugin": {
-            "editable": true,
-            "git": "https://github.com/rnorth/mkdocs-codeinclude-plugin",
-            "ref": "99417fdad0634ccfeea7eaa8ba648a08c7513e7c"
+            "hashes": [
+                "sha256:5d74bd4c1be8e64d71137c1ef1d27a0f9822d3d9ecb2af658d2af7664568a923",
+                "sha256:a94be142e27ef4a70d8ecc702c21d9596304e06d382d86b39a10ffe8b0375887"
+            ],
+            "index": "pypi",
+            "version": "==0.2.0"
         },
         "mkdocs-markdownextradata-plugin": {
             "hashes": [
@@ -106,52 +142,120 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a",
-                "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d"
+                "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94",
+                "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"
             ],
-            "version": "==2.3.1"
+            "version": "==2.8.1"
         },
         "pymdown-extensions": {
             "hashes": [
-                "sha256:25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df",
-                "sha256:6cf0cf36b5a03b291ace22dc2f320f4789ce56fbdb6635a3be5fadbf5d7694dd"
+                "sha256:478b2c04513fbb2db61688d5f6e9030a92fb9be14f1f383535c43f7be9dff95b",
+                "sha256:632371fa3bf1b21a0e3f4063010da59b41db049f261f4c0b0872069a9b6d1735"
             ],
-            "version": "==6.0"
+            "version": "==8.1.1"
         },
         "pyyaml": {
             "hashes": [
-                "sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b",
-                "sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf",
-                "sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a",
-                "sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3",
-                "sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1",
-                "sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1",
-                "sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613",
-                "sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04",
-                "sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f",
-                "sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537",
-                "sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531"
+                "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
+                "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696",
+                "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393",
+                "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77",
+                "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922",
+                "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5",
+                "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8",
+                "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10",
+                "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc",
+                "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018",
+                "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e",
+                "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253",
+                "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347",
+                "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183",
+                "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541",
+                "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb",
+                "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185",
+                "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc",
+                "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db",
+                "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa",
+                "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46",
+                "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122",
+                "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b",
+                "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63",
+                "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df",
+                "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc",
+                "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247",
+                "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6",
+                "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"
             ],
-            "version": "==3.13"
+            "version": "==5.4.1"
         },
         "six": {
             "hashes": [
-                "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c",
-                "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
+                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
+                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
             ],
-            "version": "==1.12.0"
+            "version": "==1.15.0"
         },
         "tornado": {
             "hashes": [
-                "sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d",
-                "sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409",
-                "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f",
-                "sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f",
-                "sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5",
-                "sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb",
-                "sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"
+                "sha256:0a00ff4561e2929a2c37ce706cb8233b7907e0cdc22eab98888aca5dd3775feb",
+                "sha256:0d321a39c36e5f2c4ff12b4ed58d41390460f798422c4504e09eb5678e09998c",
+                "sha256:1e8225a1070cd8eec59a996c43229fe8f95689cb16e552d130b9793cb570a288",
+                "sha256:20241b3cb4f425e971cb0a8e4ffc9b0a861530ae3c52f2b0434e6c1b57e9fd95",
+                "sha256:25ad220258349a12ae87ede08a7b04aca51237721f63b1808d39bdb4b2164558",
+                "sha256:33892118b165401f291070100d6d09359ca74addda679b60390b09f8ef325ffe",
+                "sha256:33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791",
+                "sha256:3447475585bae2e77ecb832fc0300c3695516a47d46cefa0528181a34c5b9d3d",
+                "sha256:34ca2dac9e4d7afb0bed4677512e36a52f09caa6fded70b4e3e1c89dbd92c326",
+                "sha256:3e63498f680547ed24d2c71e6497f24bca791aca2fe116dbc2bd0ac7f191691b",
+                "sha256:548430be2740e327b3fe0201abe471f314741efcb0067ec4f2d7dcfb4825f3e4",
+                "sha256:6196a5c39286cc37c024cd78834fb9345e464525d8991c21e908cc046d1cc02c",
+                "sha256:61b32d06ae8a036a6607805e6720ef00a3c98207038444ba7fd3d169cd998910",
+                "sha256:6286efab1ed6e74b7028327365cf7346b1d777d63ab30e21a0f4d5b275fc17d5",
+                "sha256:65d98939f1a2e74b58839f8c4dab3b6b3c1ce84972ae712be02845e65391ac7c",
+                "sha256:66324e4e1beede9ac79e60f88de548da58b1f8ab4b2f1354d8375774f997e6c0",
+                "sha256:6c77c9937962577a6a76917845d06af6ab9197702a42e1346d8ae2e76b5e3675",
+                "sha256:70dec29e8ac485dbf57481baee40781c63e381bebea080991893cd297742b8fd",
+                "sha256:7250a3fa399f08ec9cb3f7b1b987955d17e044f1ade821b32e5f435130250d7f",
+                "sha256:748290bf9112b581c525e6e6d3820621ff020ed95af6f17fedef416b27ed564c",
+                "sha256:7da13da6f985aab7f6f28debab00c67ff9cbacd588e8477034c0652ac141feea",
+                "sha256:8f959b26f2634a091bb42241c3ed8d3cedb506e7c27b8dd5c7b9f745318ddbb6",
+                "sha256:9de9e5188a782be6b1ce866e8a51bc76a0fbaa0e16613823fc38e4fc2556ad05",
+                "sha256:a48900ecea1cbb71b8c71c620dee15b62f85f7c14189bdeee54966fbd9a0c5bd",
+                "sha256:b87936fd2c317b6ee08a5741ea06b9d11a6074ef4cc42e031bc6403f82a32575",
+                "sha256:c77da1263aa361938476f04c4b6c8916001b90b2c2fdd92d8d535e1af48fba5a",
+                "sha256:cb5ec8eead331e3bb4ce8066cf06d2dfef1bfb1b2a73082dfe8a161301b76e37",
+                "sha256:cc0ee35043162abbf717b7df924597ade8e5395e7b66d18270116f8745ceb795",
+                "sha256:d14d30e7f46a0476efb0deb5b61343b1526f73ebb5ed84f23dc794bdb88f9d9f",
+                "sha256:d371e811d6b156d82aa5f9a4e08b58debf97c302a35714f6f45e35139c332e32",
+                "sha256:d3d20ea5782ba63ed13bc2b8c291a053c8d807a8fa927d941bd718468f7b950c",
+                "sha256:d3f7594930c423fd9f5d1a76bee85a2c36fd8b4b16921cae7e965f22575e9c01",
+                "sha256:dcef026f608f678c118779cd6591c8af6e9b4155c44e0d1bc0c87c036fb8c8c4",
+                "sha256:e0791ac58d91ac58f694d8d2957884df8e4e2f6687cdf367ef7eb7497f79eaa2",
+                "sha256:e385b637ac3acaae8022e7e47dfa7b83d3620e432e3ecb9a3f7f58f150e50921",
+                "sha256:e519d64089b0876c7b467274468709dadf11e41d65f63bba207e04217f47c085",
+                "sha256:e7229e60ac41a1202444497ddde70a48d33909e484f96eb0da9baf8dc68541df",
+                "sha256:ed3ad863b1b40cd1d4bd21e7498329ccaece75db5a5bf58cd3c9f130843e7102",
+                "sha256:f0ba29bafd8e7e22920567ce0d232c26d4d47c8b5cf4ed7b562b5db39fa199c5",
+                "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68",
+                "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5"
+            ],
+            "version": "==6.1"
+        },
+        "typing-extensions": {
+            "hashes": [
+                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
+                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
+                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==3.7.4.3"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76",
+                "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"
             ],
-            "version": "==5.1.1"
+            "version": "==3.4.1"
         }
     },
     "develop": {}

From a2fa424e2f2bf6053a037925b0c1a87cb1b090ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Mar 2021 09:42:17 +0000
Subject: [PATCH 1187/4969] Bump testcontainers from 1.15.1 to 1.15.2 in /core
 (#3795)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 7613ed58ccc..3b30a64c267 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -165,7 +165,7 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.15.1', {
+    baseline 'org.testcontainers:testcontainers:1.15.2', {
         exclude group: "*", module: "*"
     }
 

From 8965712f239ae3c449cec579264af5e79265f314 Mon Sep 17 00:00:00 2001
From: Kevin Robayna <me@kevinrobayna.com>
Date: Sat, 20 Mar 2021 09:53:18 +0000
Subject: [PATCH 1188/4969] Add example of mapping from file in system (#3808)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/features/files.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/features/files.md b/docs/features/files.md
index a74b1add134..7e5f07b3059 100644
--- a/docs/features/files.md
+++ b/docs/features/files.md
@@ -1,5 +1,14 @@
 # Files and volumes
 
+## File mapping
+
+It is possible to map a file or directory from your FileSystem into the container as a volume using `withFileSystemBind`:
+```java
+String pathToFile = System.getProperty("user.home") + "/.aws";
+new GenericContainer(...)
+        .withFileSystemBind(pathToFile, "/home/user/.aws", BindMode.READ_ONLY)
+```
+
 ## Volume mapping
 
 It is possible to map a file or directory **on the classpath** into the container as a volume using `withClasspathResourceMapping`:

From eeb7eb2c608e6eeb27c602a6061c535add8247e3 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Wed, 31 Mar 2021 10:47:32 +0200
Subject: [PATCH 1189/4969] Add TrinoContainer (#3668)

---
 docs/modules/databases/jdbc.md                |  4 +-
 docs/modules/databases/presto.md              |  2 +-
 docs/modules/databases/trino.md               | 88 ++++++++++++++++++
 mkdocs.yml                                    |  1 +
 .../containers/PrestoContainer.java           |  4 +
 modules/trino/build.gradle                    |  9 ++
 .../containers/TrinoContainer.java            | 89 +++++++++++++++++++
 .../containers/TrinoContainerProvider.java    | 23 +++++
 ...s.containers.JdbcDatabaseContainerProvider |  1 +
 .../org/testcontainers/TrinoTestImages.java   |  8 ++
 .../containers/TrinoContainerTest.java        | 64 +++++++++++++
 .../jdbc/trino/TrinoJDBCDriverTest.java       | 21 +++++
 modules/trino/src/test/resources/initial.sql  |  2 +
 13 files changed, 313 insertions(+), 3 deletions(-)
 create mode 100644 docs/modules/databases/trino.md
 create mode 100644 modules/trino/build.gradle
 create mode 100644 modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
 create mode 100644 modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java
 create mode 100644 modules/trino/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
 create mode 100644 modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
 create mode 100644 modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
 create mode 100644 modules/trino/src/test/resources/initial.sql

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 6853cf44c5c..fec250ffdd9 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -39,9 +39,9 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:postgis:9.6-2.5:///databasename`
 
-#### Using Presto
+#### Using Trino
 
-`jdbc:tc:presto:344://localhost/memory/default`
+`jdbc:tc:trino:352://localhost/memory/default`
 
 ### Using a classpath init script
 
diff --git a/docs/modules/databases/presto.md b/docs/modules/databases/presto.md
index 52776d06daf..8e8a2672355 100644
--- a/docs/modules/databases/presto.md
+++ b/docs/modules/databases/presto.md
@@ -1,7 +1,7 @@
 # Presto Module
 
 !!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+    This module is deprecated, use Trino module.
 
 See [Database containers](./index.md) for documentation and usage that is common to all database container types.
 
diff --git a/docs/modules/databases/trino.md b/docs/modules/databases/trino.md
new file mode 100644
index 00000000000..4cd26978af1
--- /dev/null
+++ b/docs/modules/databases/trino.md
@@ -0,0 +1,88 @@
+# Trino Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+See [Database containers](./index.md) for documentation and usage that is common to all database container types.
+
+## Usage example
+
+Running Trino as a stand-in for in a test:
+
+```java
+public class SomeTest {
+
+    @Rule
+    public TrinoContainer trino = new TrinoContainer();
+    
+    @Test
+    public void someTestMethod() {
+        String url = trino.getJdbcUrl();
+
+        ... create a connection and run test as normal
+```
+
+Trino comes with several catalogs preconfigured. Most useful ones for testing are
+
+* `tpch` catalog using the [Trino TPCH Connector](https://trino.io/docs/current/connector/tpch.html).
+  This is a read-only catalog that defines standard TPCH schema, so is available for querying without a need
+  to create any tables.
+* `memory` catalog using the [Trino Memory Connector](https://trino.io/docs/current/connector/memory.html).
+  This catalog can be used for creating schemas and tables and does not require any storage, as everything
+  is stored fully in-memory.
+
+Example test using the `tpch` and `memory` catalogs:
+
+```java
+public class SomeTest {
+    @Rule
+    public TrinoContainer trino = new TrinoContainer();
+
+    @Test
+    public void queryMemoryAndTpchConnectors() throws SQLException {
+        try (Connection connection = trino.createConnection();
+             Statement statement = connection.createStatement()) {
+            // Prepare data
+            statement.execute("CREATE TABLE memory.default.table_with_array AS SELECT 1 id, ARRAY[1, 42, 2, 42, 4, 42] my_array");
+
+            // Query Trino using newly created table and a builtin connector
+            try (ResultSet resultSet = statement.executeQuery("" +
+                "SELECT nationkey, element " +
+                "FROM tpch.tiny.nation " +
+                "JOIN memory.default.table_with_array twa ON nationkey = twa.id " +
+                "LEFT JOIN UNNEST(my_array) a(element) ON true " +
+                "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES ")) {
+                List<Integer> actualElements = new ArrayList<>();
+                while (resultSet.next()) {
+                    actualElements.add(resultSet.getInt("element"));
+                }
+                Assert.assertEquals(Arrays.asList(2, 4, 42, 42, 42), actualElements);
+            }
+        }
+    }
+}
+```
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:trino:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>trino</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add the Trino JDBC driver JAR to your project.
+    You should ensure that your project has the Trino JDBC driver as a dependency, if you plan on using it.
+    Refer to [Trino project download page](https://trino.io/download.html) for instructions.
+
+
diff --git a/mkdocs.yml b/mkdocs.yml
index b0608746825..15cc915f5b2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -60,6 +60,7 @@ nav:
                 - modules/databases/orientdb.md
                 - modules/databases/postgres.md
                 - modules/databases/presto.md
+                - modules/databases/trino.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/gcloud.md
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 1d9e02114ac..30d77c1a469 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -14,6 +14,10 @@
 import static java.lang.String.format;
 import static java.time.temporal.ChronoUnit.SECONDS;
 
+/**
+ * @deprecated Use {@code TrinoContainer} instead.
+ */
+@Deprecated
 public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
     public static final String NAME = "presto";
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/trinodb/presto");
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
new file mode 100644
index 00000000000..d726cbc8e76
--- /dev/null
+++ b/modules/trino/build.gradle
@@ -0,0 +1,9 @@
+description = "Testcontainers :: JDBC :: Trino"
+
+dependencies {
+    compile project(':jdbc')
+
+    testCompile project(':jdbc-test')
+    testCompile 'io.trino:trino-jdbc:352'
+    compileOnly 'org.jetbrains:annotations:20.0.0'
+}
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
new file mode 100644
index 00000000000..825340459f3
--- /dev/null
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
@@ -0,0 +1,89 @@
+package org.testcontainers.containers;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.VisibleForTesting;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.google.common.base.Strings.nullToEmpty;
+import static java.lang.String.format;
+
+public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
+    static final String NAME = "trino";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("trinodb/trino");
+    static final String IMAGE = "trinodb/trino";
+    @VisibleForTesting
+    static final String DEFAULT_TAG = "352";
+
+    private static final int TRINO_PORT = 8080;
+
+    private String username = "test";
+    private String catalog = null;
+
+    public TrinoContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public TrinoContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        addExposedPort(TRINO_PORT);
+    }
+
+    @NotNull
+    @Override
+    protected Set<Integer> getLivenessCheckPorts() {
+        return new HashSet<>(getMappedPort(TRINO_PORT));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "io.trino.jdbc.TrinoDriver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return format("jdbc:trino://%s:%s/%s", getHost(), getMappedPort(TRINO_PORT), nullToEmpty(catalog));
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return "";
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return catalog;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT count(*) FROM tpch.tiny.nation";
+    }
+
+    @Override
+    public TrinoContainer withUsername(final String username) {
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public TrinoContainer withDatabaseName(String dbName) {
+        this.catalog = dbName;
+        return this;
+    }
+
+    public Connection createConnection() throws SQLException, NoDriverFoundException {
+        return createConnection("");
+    }
+}
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java
new file mode 100644
index 00000000000..233fc1b9b07
--- /dev/null
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java
@@ -0,0 +1,23 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for Trino containers.
+ */
+public class TrinoContainerProvider extends JdbcDatabaseContainerProvider {
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(TrinoContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(TrinoContainer.DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new TrinoContainer(DockerImageName.parse(TrinoContainer.IMAGE).withTag(tag));
+    }
+}
diff --git a/modules/trino/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/trino/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..637633627e5
--- /dev/null
+++ b/modules/trino/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.TrinoContainerProvider
diff --git a/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java b/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
new file mode 100644
index 00000000000..0ac56e54129
--- /dev/null
+++ b/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
@@ -0,0 +1,8 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface TrinoTestImages {
+    DockerImageName TRINO_TEST_IMAGE = DockerImageName.parse("trinodb/trino:352");
+    DockerImageName TRINO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("trinodb/trino:351");
+}
diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
new file mode 100644
index 00000000000..d7f8014ca9a
--- /dev/null
+++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
@@ -0,0 +1,64 @@
+package org.testcontainers.containers;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.testcontainers.TrinoTestImages;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.lang.Integer.parseInt;
+import static java.lang.String.format;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TrinoContainerTest {
+
+    @Test
+    public void testSimple() throws Exception {
+        try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) {
+            trino.start();
+            try (Connection connection = trino.createConnection();
+                 Statement statement = connection.createStatement();
+                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+                assertTrue("No result", resultSet.next());
+                assertEquals("Trino version", TrinoContainer.DEFAULT_TAG, resultSet.getString("node_version"));
+            }
+        }
+    }
+
+    @Test
+    public void testSpecificVersion() throws Exception {
+        try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE)) {
+            trino.start();
+            try (Connection connection = trino.createConnection();
+                 Statement statement = connection.createStatement();
+                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+                assertTrue("No result", resultSet.next());
+                assertEquals("Trino version", TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(), resultSet.getString("node_version"));
+            }
+        }
+    }
+
+    @Test
+    public void testInitScript() throws Exception {
+        try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) {
+            trino.withInitScript("initial.sql");
+            trino.start();
+            try (Connection connection = trino.createConnection();
+                 Statement statement = connection.createStatement();
+                 ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")) {
+                assertTrue("No result", resultSet.next());
+                assertEquals("Value", 12345678909324L, resultSet.getObject("a"));
+                assertFalse("Too many result", resultSet.next());
+            }
+        }
+    }
+}
diff --git a/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java b/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
new file mode 100644
index 00000000000..8f06aef7278
--- /dev/null
+++ b/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.trino;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class TrinoJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:trino:352://hostname/", EnumSet.of(Options.PmdKnownBroken)},
+            });
+    }
+}
diff --git a/modules/trino/src/test/resources/initial.sql b/modules/trino/src/test/resources/initial.sql
new file mode 100644
index 00000000000..1a3ecdab4f9
--- /dev/null
+++ b/modules/trino/src/test/resources/initial.sql
@@ -0,0 +1,2 @@
+CREATE TABLE memory.default.test_table(a bigint);
+INSERT INTO memory.default.test_table(a) VALUES (12345678909324);

From 8929dd72947ac102b78e8c51b19821299c2bc01e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Apr 2021 18:26:18 +0100
Subject: [PATCH 1190/4969] Bump release-drafter/release-drafter from
 e5ccf147077e46b0225a80bbe314d795d77bb7a2 to 5.15.0 (#3915)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 28f14cb0ad3..e19e08b9f32 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -9,6 +9,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@e5ccf147077e46b0225a80bbe314d795d77bb7a2 # v5.14.0
+      - uses: release-drafter/release-drafter@fe52e97d262833ae07d05efaf1a239df3f1b5cd4 # v5.15.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 736459168892245bd16727a6a97fd19d6ad846c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Apr 2021 18:27:15 +0100
Subject: [PATCH 1191/4969] Bump org.jetbrains.kotlin.jvm from 1.4.21-2 to
 1.4.32 in /examples (#3947)

Bumps org.jetbrains.kotlin.jvm from 1.4.21-2 to 1.4.32.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 4675f907235..8ffa1b46d2a 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.4.1"
-    id("org.jetbrains.kotlin.jvm") version "1.4.21-2"
+    id("org.jetbrains.kotlin.jvm") version "1.4.32"
     id("org.jetbrains.kotlin.plugin.spring") version "1.4.21-2"
 }
 

From 187c0cce8896dbc3ca683f787611d8fd11039a45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Apr 2021 18:27:47 +0100
Subject: [PATCH 1192/4969] Bump elasticsearch-rest-client from 7.10.1 to
 7.12.0 in /modules/elasticsearch (#3945)

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.10.1 to 7.12.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.1...v7.12.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index b4a64a405b7..cb553c54654 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.10.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.0"
     testCompile "org.elasticsearch.client:transport:7.10.1"
 }

From 79a1a0650eabfa7535607b81a752aae6739b2a5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Apr 2021 18:28:33 +0100
Subject: [PATCH 1193/4969] Bump aws-java-sdk-sqs from 1.11.930 to 1.11.986 in
 /modules/localstack (#3942)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.930 to 1.11.986.
- [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.930...1.11.986)

Signed-off-by: dependabot[bot] <support@github.com>

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 fdffc649a72..8a4df52b54d 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.930'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.929'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.930'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.986'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.15.56'
 }

From bc48eebeefb344b0878637c021b8a1998ff4d677 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Apr 2021 18:29:12 +0100
Subject: [PATCH 1194/4969] Bump pulsar-client from 2.7.0 to 2.7.1 in
 /modules/pulsar (#3913)

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.7.0...v2.7.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index b574519a939..e189e7006eb 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.1'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.0'
 }

From b3cf0624c8f251af0e5361d3a92d155d3563b372 Mon Sep 17 00:00:00 2001
From: Patrik Mihalcin <5480557+pmihalcin@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:44:24 +0200
Subject: [PATCH 1195/4969] Add information for TLS disabled mode in Gitlab
 (#2466)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Docker daemon supports connection over TLS and it’s done by default for Docker 19.03.1 or higher.
We need to instruct docker to not start over TLS with DOCKER_TLS_CERTDIR variable

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../continuous_integration/gitlab_ci.md                       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
index 0cb5017bb87..e6daf84401f 100644
--- a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
@@ -1,7 +1,7 @@
 # GitLab CI
 
 In order to use Testcontainers in a Gitlab CI pipeline, you need to run the job as a Docker container (see [Patterns for running inside Docker](dind_patterns.md)).
-So edit your `.gitlab-ci.yml` to include the [Docker-In-Docker service](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-executor) (`docker:dind`) and set the `DOCKER_HOST` variable to `tcp://docker:2375`.
+So edit your `.gitlab-ci.yml` to include the [Docker-In-Docker service](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-workflow-with-docker-executor) (`docker:dind`) and set the `DOCKER_HOST` variable to `tcp://docker:2375` and `DOCKER_TLS_CERTDIR` to empty string.
 
 Here is a sample `.gitlab-ci.yml` that executes test with gradle:
 
@@ -13,6 +13,8 @@ services:
 variables:
   # Instruct Testcontainers to use the daemon of DinD.
   DOCKER_HOST: "tcp://docker:2375"
+  # Instruct Docker not to start over TLS.
+  DOCKER_TLS_CERTDIR: ""
   # Improve performance with overlayfs.
   DOCKER_DRIVER: overlay2
 

From 8533e9bd190d77c6df2bf7837e9ffb1786e83da8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Apr 2021 15:51:57 +0100
Subject: [PATCH 1196/4969] Bump s3 from 2.15.56 to 2.16.34 in
 /modules/localstack (#3963)

Bumps s3 from 2.15.56 to 2.16.34.

Signed-off-by: dependabot[bot] <support@github.com>

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 8a4df52b54d..c007b2c649e 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.929'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.986'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.15.56'
+    testCompile 'software.amazon.awssdk:s3:2.16.34'
 }

From 1e6deb167491c0f62a21dac403ea13ee07d92776 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 11 Apr 2021 19:54:20 +0100
Subject: [PATCH 1197/4969] Filter mapped ports when port numbers are not
 specified (replaces #3948) (#3979)

Co-authored-by: Ilia Rodionov <ilya.rodionov@gmail.com>
---
 .../containers/ContainerState.java            |  3 ++
 .../containers/ContainerStateTest.java        | 49 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 core/src/test/java/org/testcontainers/containers/ContainerStateTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index ad96aeb808c..da87dbdf724 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -12,6 +12,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
@@ -181,7 +182,9 @@ default List<Integer> getBoundPortNumbers() {
             .map(PortBinding::getBinding)
             .map(Ports.Binding::getHostPortSpec)
             .filter(Objects::nonNull)
+            .filter(NumberUtils::isNumber)
             .map(Integer::valueOf)
+            .filter(port -> port > 0)
             .collect(Collectors.toList());
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
new file mode 100644
index 00000000000..52296678fd4
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
@@ -0,0 +1,49 @@
+package org.testcontainers.containers;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.List;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(Parameterized.class)
+public class ContainerStateTest {
+
+    @Parameterized.Parameters(name = "{0} ({1} -> {2})")
+    public static Object[][] params() {
+        return new Object[][]{
+            new Object[]{"regular mapping", "80:8080/tcp", singletonList(80),},
+            new Object[]{"regular mapping with host", "127.0.0.1:80:8080/tcp", singletonList(80),},
+            new Object[]{"zero port without host", ":0:8080/tcp", emptyList(),},
+            new Object[]{"missing port with host", "0.0.0.0:0:8080/tcp", emptyList(),},
+            new Object[]{"zero port (synthetic case)", "0:8080/tcp", emptyList(),},
+            new Object[]{"missing port", ":8080/tcp", emptyList(),
+            }
+        };
+    }
+
+    @Parameterized.Parameter(0)
+    public String name;
+    @Parameterized.Parameter(1)
+    public String testSet;
+    @Parameterized.Parameter(2)
+    public List<Integer> expectedResult;
+
+    @Test
+    public void test() {
+        ContainerState containerState = mock(ContainerState.class);
+        doCallRealMethod().when(containerState).getBoundPortNumbers();
+
+        when(containerState.getPortBindings()).thenReturn(singletonList(testSet));
+
+        List<Integer> result = containerState.getBoundPortNumbers();
+        Assertions.assertThat(result).hasSameElementsAs(expectedResult);
+    }
+}

From 9183f8f940e12045e8790c6eb6693cf8c62bd779 Mon Sep 17 00:00:00 2001
From: Mark Rotteveel <mrotteveel@users.noreply.github.com>
Date: Sun, 11 Apr 2021 20:57:41 +0200
Subject: [PATCH 1198/4969] Prevent ContainerDatabaseDriver from throwing NPEs
 when on classpath but not initialized (#3976)

When ContainerDatabaseDriver hasn't been used yet to connect, the delegate is null. This causes various JDBC metadata methods of the driver to fail with a NullPointerException. Prevent this by providing reasonable defaults.
---
 .../jdbc/ContainerDatabaseDriver.java               | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index c5413fe7efb..c1b4fc29067 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -230,27 +230,30 @@ private void runInitFunctionIfRequired(final ConnectionUrl connectionUrl, Connec
 
     @Override
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
-        return delegate.getPropertyInfo(url, info);
+        return delegate != null ? delegate.getPropertyInfo(url, info) : new DriverPropertyInfo[0];
     }
 
     @Override
     public int getMajorVersion() {
-        return delegate.getMajorVersion();
+        return delegate != null ? delegate.getMajorVersion() : 1;
     }
 
     @Override
     public int getMinorVersion() {
-        return delegate.getMinorVersion();
+        return delegate != null ? delegate.getMinorVersion() : 0;
     }
 
     @Override
     public boolean jdbcCompliant() {
-        return delegate.jdbcCompliant();
+        return delegate != null && delegate.jdbcCompliant();
     }
 
     @Override
     public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-        return delegate.getParentLogger();
+        if (delegate != null) {
+            return delegate.getParentLogger();
+        }
+        throw new SQLFeatureNotSupportedException("getParentLogger not supported");
     }
 
     /**

From f3ffed66683034e6cde10d62978eb8c807736e06 Mon Sep 17 00:00:00 2001
From: Ivan Stanislavciuc <2766429+seveneves@users.noreply.github.com>
Date: Sun, 11 Apr 2021 21:00:52 +0200
Subject: [PATCH 1199/4969] Fix problem of starting up mysql 5.7.33 version
 when user is root (#3953)

Co-authored-by: Richard North <rich.north@gmail.com>
Co-authored-by: Ivan Stanislavciuc <istanislavciuc@ebay.com>
---
 .../containers/MySQLContainer.java            | 10 ++--
 .../containers/MySQLRootAccountTest.java      | 53 +++++++++++++++++++
 2 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java

diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 1dc235e6536..a126a579489 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -62,10 +62,12 @@ protected Set<Integer> getLivenessCheckPorts() {
     @Override
     protected void configure() {
         optionallyMapResourceParameterAsVolume(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, "/etc/mysql/conf.d",
-                "mysql-default-conf");
+            "mysql-default-conf");
 
         addEnv("MYSQL_DATABASE", databaseName);
-        addEnv("MYSQL_USER", username);
+        if (!MYSQL_ROOT_USER.equalsIgnoreCase(username)) {
+            addEnv("MYSQL_USER", username);
+        }
         if (password != null && !password.isEmpty()) {
             addEnv("MYSQL_PASSWORD", password);
             addEnv("MYSQL_ROOT_PASSWORD", password);
@@ -98,12 +100,12 @@ public String getJdbcUrl() {
     protected String constructUrlForConnection(String queryString) {
         String url = super.constructUrlForConnection(queryString);
 
-        if (! url.contains("useSSL=")) {
+        if (!url.contains("useSSL=")) {
             String separator = url.contains("?") ? "&" : "?";
             url = url + separator + "useSSL=false";
         }
 
-        if (! url.contains("allowPublicKeyRetrieval=")) {
+        if (!url.contains("allowPublicKeyRetrieval=")) {
             url = url + "&allowPublicKeyRetrieval=true";
         }
 
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
new file mode 100644
index 00000000000..c437acac013
--- /dev/null
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
@@ -0,0 +1,53 @@
+package org.testcontainers.containers;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+@Slf4j
+@RunWith(Parameterized.class)
+public class MySQLRootAccountTest {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[]{
+            "mysql:8",
+            "mysql:5"
+        };
+    }
+
+    @Parameterized.Parameter()
+    public String image;
+
+    @Test
+    public void testRootAccountUsageWithDefaultPassword() throws SQLException {
+        testWithDB(new MySQLContainer<>(image).withUsername("root"));
+    }
+
+    @Test
+    public void testRootAccountUsageWithEmptyPassword() throws SQLException {
+        testWithDB(new MySQLContainer<>(image).withUsername("root").withPassword(""));
+    }
+
+    @Test
+    public void testRootAccountUsageWithCustomPassword() throws SQLException {
+        testWithDB(new MySQLContainer<>(image).withUsername("root").withPassword("not-default"));
+    }
+
+    private void testWithDB(MySQLContainer<?> db) throws SQLException {
+        try {
+            db.withLogConsumer(new Slf4jLogConsumer(log)).start();
+            Connection connection = DriverManager.getConnection(db.getJdbcUrl(), db.getUsername(), db.getPassword());
+            connection.createStatement().execute("SELECT 1");
+            connection.createStatement().execute("set sql_log_bin=0"); // requires root
+        } finally {
+            db.close();
+        }
+    }
+}

From 3c70d0895851193ca5f3b1ec1c4b095871ed4f62 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 11 Apr 2021 21:06:40 +0200
Subject: [PATCH 1200/4969] Update docs to clarify shading approach (#3974)

Make the docs section about our shading approach and motivation more up-to-date and less confusing (no JAX-RS/Jersey anymore, mention docker-java-api, etc)
---
 docs/index.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 013c18d0700..176ddd16974 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -86,8 +86,9 @@ testImplementation('org.testcontainers:mysql') //no version specified
 [JitPack](jitpack_dependencies.md) builds are available for pre-release versions.
 
 !!! warning "Shaded dependencies"
-    Testcontainers uses the docker-java client library, which in turn depends on JAX-RS, Jersey and Jackson libraries. 
-    These libraries in particular seem to be especially prone to conflicts with test code/application under test code. 
+    Testcontainers depends on other libraries (like docker-java) for it to work.  
+    Some of them (JUnit, docker-java-{api,transport} and its transitive dependencies, JNA, visible-assertions and others) are part of our public API.  
+    But there are also "private", implementation detail dependencies (e.g. docker-java-core, Guava, OkHttp, etc etc) that are not exposed to public API but prone to conflicts with test code/application under test code. 
     As such, **these libraries are 'shaded' into the core testcontainers JAR** and relocated under `org.testcontainers.shaded` to prevent class conflicts.
 
 ## Sponsors

From 33477107ecd5610eaa25cf8c9cef449f07ac321a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 12 Apr 2021 07:39:28 +0100
Subject: [PATCH 1201/4969] Pin localstack to 0.12.8 (#3981)

---
 .../containers/localstack/LegacyModeTest.java | 117 ++++++++----------
 .../localstack/LocalstackTestImages.java      |   6 +-
 2 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index f50846b091f..b8f2ec1aae0 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -1,30 +1,31 @@
 package org.testcontainers.containers.localstack;
 
+import com.github.dockerjava.api.DockerClient;
 import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
-import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.utility.DockerImageName;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.Arrays;
-import java.util.function.Consumer;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
+import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_10_IMAGE;
+import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_11_IMAGE;
+import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_12_IMAGE;
+import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_7_IMAGE;
 import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_IMAGE;
 
 @RunWith(Enclosed.class)
 public class LegacyModeTest {
+    private static DockerImageName LOCALSTACK_CUSTOM_TAG = LOCALSTACK_IMAGE.withTag("custom");
 
     @RunWith(Parameterized.class)
     @AllArgsConstructor
@@ -35,10 +36,9 @@ public static class Off {
         @Parameterized.Parameters(name = "{0}")
         public static Iterable<Object[]> constructors() {
             return Arrays.asList(new Object[][]{
-                {"default constructor", new LocalStackContainer(LOCALSTACK_IMAGE)},
-                {"latest", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("latest"))},
-                {"0.11.1", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.11.1"))},
-                {"0.7.0 with legacy = off", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.7.0"), false)}
+                {"0.12", new LocalStackContainer(LOCALSTACK_0_12_IMAGE)},
+                {"0.11", new LocalStackContainer(LOCALSTACK_0_11_IMAGE)},
+                {"0.7 with legacy = off", new LocalStackContainer(LOCALSTACK_0_7_IMAGE, false)}
             });
         }
 
@@ -47,20 +47,19 @@ public void samePortIsExposedForAllServices() {
             localstack.withServices(S3, SQS);
             localstack.start();
 
-            assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
-            assertEquals(
-                "Endpoint overrides are different",
-                localstack.getEndpointOverride(S3).toString(),
-                localstack.getEndpointOverride(SQS).toString());
-            assertEquals(
-                "Endpoint configuration have different endpoints",
-                localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
-                localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
-        }
-
-        @After
-        public void cleanup() {
-            if (localstack != null) localstack.stop();
+            try {
+                assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
+                assertEquals(
+                    "Endpoint overrides are different",
+                    localstack.getEndpointOverride(S3).toString(),
+                    localstack.getEndpointOverride(SQS).toString());
+                assertEquals(
+                    "Endpoint configuration have different endpoints",
+                    localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
+                    localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+            } finally {
+                localstack.stop();
+            }
         }
     }
 
@@ -72,16 +71,28 @@ public static class On {
 
         @BeforeClass
         public static void createCustomTag() {
-            run("docker pull localstack/localstack:latest");
-            run("docker tag localstack/localstack:latest localstack/localstack:custom");
+            DockerClient dockerClient = DockerClientFactory.instance().client();
+            DockerClientFactory
+                .instance()
+                .checkAndPullImage(
+                    dockerClient,
+                    LOCALSTACK_0_12_IMAGE.asCanonicalNameString()
+                );
+            dockerClient
+                .tagImageCmd(
+                    LOCALSTACK_0_12_IMAGE.asCanonicalNameString(),
+                    LOCALSTACK_CUSTOM_TAG.getRepository(),
+                    LOCALSTACK_CUSTOM_TAG.getVersionPart()
+                )
+                .exec();
         }
 
         @Parameterized.Parameters(name = "{0}")
         public static Iterable<Object[]> constructors() {
             return Arrays.asList(new Object[][]{
-                {"0.10.7", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.10.7"))},
-                {"custom", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("custom"))},
-                {"0.11.1 with legacy = on", new LocalStackContainer(LOCALSTACK_IMAGE.withTag("0.11.1"), true)}
+                {"0.10", new LocalStackContainer(LOCALSTACK_0_10_IMAGE)},
+                {"custom", new LocalStackContainer(LOCALSTACK_CUSTOM_TAG)},
+                {"0.11 with legacy = on", new LocalStackContainer(LOCALSTACK_0_11_IMAGE, true)}
             });
         }
 
@@ -90,39 +101,19 @@ public void differentPortsAreExposed() {
             localstack.withServices(S3, SQS);
             localstack.start();
 
-            assertTrue("Multiple ports are exposed", localstack.getExposedPorts().size() > 1);
-            assertNotEquals(
-                "Endpoint overrides are different",
-                localstack.getEndpointOverride(S3).toString(),
-                localstack.getEndpointOverride(SQS).toString());
-            assertNotEquals(
-                "Endpoint configuration have different endpoints",
-                localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
-                localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
-        }
-
-        @After
-        public void cleanup() {
-            if (localstack != null) localstack.stop();
-        }
-    }
-
-    @SneakyThrows
-    private static void run(String command) {
-        Process process = Runtime.getRuntime().exec(command);
-        join(process.getInputStream(), System.out::println);
-        join(process.getErrorStream(), System.err::println);
-        process.waitFor();
-        if (process.exitValue() != 0)
-            throw new RuntimeException("Failed to execute " + command);
-    }
-
-    private static void join(InputStream stream, Consumer<String> logger) throws IOException {
-        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream));
-        String line;
-        while ((line = bufferedReader.readLine()) != null) {
-            logger.accept(line);
+            try {
+                assertTrue("Multiple ports are exposed", localstack.getExposedPorts().size() > 1);
+                assertNotEquals(
+                    "Endpoint overrides are different",
+                    localstack.getEndpointOverride(S3).toString(),
+                    localstack.getEndpointOverride(SQS).toString());
+                assertNotEquals(
+                    "Endpoint configuration have different endpoints",
+                    localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
+                    localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+            } finally {
+                localstack.stop();
+            }
         }
     }
-
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index 0dd0ca9b9ac..491394bea8a 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -3,6 +3,10 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface LocalstackTestImages {
-    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.11.3");
+    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.12.8");
+    DockerImageName LOCALSTACK_0_7_IMAGE = LOCALSTACK_IMAGE.withTag("0.7.0");
+    DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
+    DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");
+    DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");
     DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("atlassian/pipelines-awscli:1.16.302");
 }

From 1cd04763de83b4fa523182bae55d8927d99990f8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 12 Apr 2021 08:44:27 +0200
Subject: [PATCH 1202/4969] Update docker-java to 3.2.8 (#3980)

---
 core/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 3b30a64c267..463116dc5ee 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -180,9 +180,9 @@ dependencies {
 
     compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compile "com.github.docker-java:docker-java-api:3.2.7"
+    compile "com.github.docker-java:docker-java-api:3.2.8"
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.7') {
+    shaded ('com.github.docker-java:docker-java-core:3.2.8') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
         exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -191,13 +191,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.7') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.8') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.7'
+    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.8'
 
     shaded "org.yaml:snakeyaml:1.27"
 

From 55838a9248a55ad628e6159fef5e4c0e6beed981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristopher=20Pinz=C3=B3n?= <cristopher.pinzon@gmail.com>
Date: Mon, 12 Apr 2021 01:45:32 -0500
Subject: [PATCH 1203/4969] ec2 added to localstack services enum (#3955)

---
 .../containers/localstack/LocalStackContainer.java               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index b8416afb1ed..4863de6e62d 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -306,6 +306,7 @@ public String getRegion() {
     @FieldDefaults(makeFinal = true)
     public enum Service {
         API_GATEWAY("apigateway", 4567),
+        EC2("ec2", 4597),
         KINESIS("kinesis", 4568),
         DYNAMODB("dynamodb", 4569),
         DYNAMODB_STREAMS("dynamodbstreams", 4570),

From dabc99c73eb9832ed2971c42412dd56bbd4d15be Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 12 Apr 2021 13:36:29 +0200
Subject: [PATCH 1204/4969] Make it possible to provide custom LocalStack
 services (#3995)

---
 .../localstack/LocalStackContainer.java       | 40 +++++++++++++++----
 .../localstack/LocalstackContainerTest.java   |  2 +-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 4863de6e62d..fe3ea6ab34f 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -37,7 +37,7 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     static final int PORT = 4566;
     private static final String HOSTNAME_EXTERNAL_ENV_VAR = "HOSTNAME_EXTERNAL";
-    private final List<Service> services = new ArrayList<>();
+    private final List<EnabledService> services = new ArrayList<>();
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("localstack/localstack");
     private static final String DEFAULT_TAG = "0.11.2";
@@ -119,7 +119,7 @@ protected void configure() {
 
         Preconditions.check("services list must not be empty", !services.isEmpty());
 
-        withEnv("SERVICES", services.stream().map(Service::getLocalStackName).collect(Collectors.joining(",")));
+        withEnv("SERVICES", services.stream().map(EnabledService::getName).collect(Collectors.joining(",")));
 
         String hostnameExternalReason;
         if (getEnvMap().containsKey(HOSTNAME_EXTERNAL_ENV_VAR)) {
@@ -144,12 +144,17 @@ private void exposePorts() {
             .forEach(this::addExposedPort);
     }
 
+    public LocalStackContainer withServices(Service... services) {
+        this.services.addAll(Arrays.asList(services));
+        return self();
+    }
+
     /**
      * Declare a set of simulated AWS services that should be launched by this container.
      * @param services one or more service names
      * @return this container object
      */
-    public LocalStackContainer withServices(Service... services) {
+    public LocalStackContainer withServices(EnabledService... services) {
         this.services.addAll(Arrays.asList(services));
         return self();
     }
@@ -184,6 +189,10 @@ public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service s
         return new AwsClientBuilder.EndpointConfiguration(getEndpointOverride(service).toString(), getRegion());
     }
 
+    public URI getEndpointOverride(Service service) {
+        return getEndpointOverride((EnabledService) service);
+    }
+
     /**
      * Provides an endpoint override that is preconfigured to communicate with a given simulated service.
      * The provided endpoint override should be set in the AWS Java SDK v2 when building a client, e.g.:
@@ -203,7 +212,7 @@ public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service s
      * @param service the service that is to be accessed
      * @return an {@link URI} endpoint override
      */
-    public URI getEndpointOverride(Service service) {
+    public URI getEndpointOverride(EnabledService service) {
         try {
             final String address = getHost();
             String ipAddress = address;
@@ -218,8 +227,8 @@ public URI getEndpointOverride(Service service) {
         }
     }
 
-    private int getServicePort(Service service) {
-        return legacyMode ? service.port : PORT;
+    private int getServicePort(EnabledService service) {
+        return legacyMode ? service.getPort() : PORT;
     }
 
     /**
@@ -301,10 +310,22 @@ public String getRegion() {
         return "us-east-1";
     }
 
+    public interface EnabledService {
+        static EnabledService named(String name) {
+            return () -> name;
+        }
+
+        String getName();
+
+        default int getPort() {
+            return PORT;
+        }
+    }
+
     @RequiredArgsConstructor
     @Getter
     @FieldDefaults(makeFinal = true)
-    public enum Service {
+    public enum Service implements EnabledService {
         API_GATEWAY("apigateway", 4567),
         EC2("ec2", 4597),
         KINESIS("kinesis", 4568),
@@ -335,6 +356,11 @@ public enum Service {
 
         int port;
 
+        @Override
+        public String getName() {
+            return localStackName;
+        }
+
         @Deprecated
         /*
             Since version 0.11, LocalStack exposes all services on a single (4566) port.
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index af4d0694ab6..6b32ba2c102 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -66,7 +66,7 @@ public static class WithoutNetwork {
         // without_network {
         @ClassRule
         public static LocalStackContainer localstack = new LocalStackContainer(LOCALSTACK_IMAGE)
-            .withServices(S3, SQS, CLOUDWATCHLOGS, KMS);
+            .withServices(S3, SQS, CLOUDWATCHLOGS, KMS, LocalStackContainer.EnabledService.named("events"));
         // }
 
         @Test

From 3a6e77e920c06ed2157d9baf0313e529f4395650 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 20 Apr 2021 16:51:15 +0200
Subject: [PATCH 1205/4969] Update mkdocs.yml to the latest release (1.15.3)

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 15cc915f5b2..f3cb11f7fe6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -96,4 +96,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.15.2
+    latest_version: 1.15.3

From 49a103ce6272a51c29119f19951e1d3c92d2ba1d Mon Sep 17 00:00:00 2001
From: vcvitaly <vcvitaly@yahoo.com>
Date: Sat, 24 Apr 2021 21:54:33 +0300
Subject: [PATCH 1206/4969] Improve logging in
 InternalCommandPortListeningCheck (#3001)

---
 .../wait/internal/InternalCommandPortListeningCheck.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index cd601e6a131..a3b7a5d4dc7 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -41,7 +41,11 @@ public Boolean call() {
         try {
             ExecResult result = ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), "/bin/sh", "-c", command.toString());
             log.trace("Check for {} took {}. Result code '{}', stdout message: '{}'", internalPorts, Duration.between(before, Instant.now()), result.getExitCode(), result.getStdout());
-            return result.getExitCode() == 0;
+            int exitCode = result.getExitCode();
+            if (exitCode != 0 && exitCode != 1) {
+                log.warn("An exception while executing the internal check: {}", result);
+            }
+            return exitCode == 0;
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }

From f94737f0d7509e8a6a5f39b23df7c24585bf5dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Torres?= <torrespro@users.noreply.github.com>
Date: Thu, 29 Apr 2021 13:28:21 +0100
Subject: [PATCH 1207/4969] Docs: Add Backbase as Bronze sponsor (#4039)

---
 docs/index.md                   |   7 +++++++
 docs/sponsor_logos/backbase.png | Bin 0 -> 5757 bytes
 2 files changed, 7 insertions(+)
 create mode 100644 docs/sponsor_logos/backbase.png

diff --git a/docs/index.md b/docs/index.md
index 176ddd16974..45213629ed0 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -123,6 +123,13 @@ A huge thank you to our sponsors:
     </a>
 </div>
 
+<div style="text-align:center; max-width: 128px; display: inline-block; margin: 5px;">
+    <a href="https://www.backbase.com/">
+        <img src="sponsor_logos/backbase.png" style="width: 100%"/>
+        <p>Backbase</p>
+    </a>
+</div>
+
 ### Backers
 
 * [Philip Riecks (@rieckpil)](https://github.com/rieckpil)
diff --git a/docs/sponsor_logos/backbase.png b/docs/sponsor_logos/backbase.png
new file mode 100644
index 0000000000000000000000000000000000000000..22acf3aac8e93f4d09f2e4c31502f85a209da4db
GIT binary patch
literal 5757
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
Wn%C=%XDnxTusSdUjWTtIr~d;?(<52{

literal 0
HcmV?d00001


From 3aa5fbfa17be09f4e42b2300396890f76f508c86 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 7 May 2021 13:09:56 +0100
Subject: [PATCH 1208/4969] Use up-to-date MySQL docker images (#4059)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 core/src/test/resources/compose-test.yml      |  2 +-
 .../generic/ImageNameSubstitutionTest.java    |  6 ++---
 .../TestSpecificImageNameSubstitutor.java     |  2 +-
 docs/features/image_name_substitution.md      |  2 +-
 docs/modules/databases/jdbc.md                | 12 +++++-----
 docs/modules/databases/mysql.md               |  2 +-
 docs/modules/databases/r2dbc.md               |  4 ++--
 .../db/AbstractContainerDatabaseTest.java     |  1 -
 .../jdbc/ConnectionUrlDriversTests.java       |  2 +-
 .../jdbc/ConnectionUrlTest.java               | 10 ++++----
 .../jdbc/MissingJdbcDriverTest.java           |  2 +-
 modules/mysql/build.gradle                    |  2 +-
 .../containers/MySQLContainer.java            |  2 +-
 .../org/testcontainers/MySQLTestImages.java   |  6 ++---
 .../MySQLR2DBCDatabaseContainerTest.java      |  4 ++--
 .../containers/MySQLRootAccountTest.java      | 12 ++++++----
 .../jdbc/mysql/JDBCDriverWithPoolTest.java    |  2 +-
 .../jdbc/mysql/MySQLJDBCDriverTest.java       | 16 ++++++-------
 .../junit/mysql/CustomizableMysqlTest.java    |  2 +-
 .../junit/mysql/MultiVersionMySQLTest.java    | 24 +++++++++----------
 .../junit/mysql/SimpleMySQLTest.java          | 23 +++++++++---------
 .../spock/SpockTestImages.groovy              |  2 +-
 22 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/core/src/test/resources/compose-test.yml b/core/src/test/resources/compose-test.yml
index a79a4c0b25b..9c5537e7cab 100644
--- a/core/src/test/resources/compose-test.yml
+++ b/core/src/test/resources/compose-test.yml
@@ -1,6 +1,6 @@
 redis:
   image: redis
 db:
-  image: mysql:5.7.22
+  image: mysql:5.7.34
   environment:
     MYSQL_RANDOM_ROOT_PASSWORD: "true"
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
index edc622a4104..65da67fd401 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
@@ -12,9 +12,9 @@ public class ImageNameSubstitutionTest {
     public void simpleExample() {
         try (
             // directDockerHubReference {
-            // Referring directly to an image on Docker Hub (mysql:8.0.22)
+            // Referring directly to an image on Docker Hub (mysql:8.0.24)
             final MySQLContainer<?> mysql = new MySQLContainer<>(
-                DockerImageName.parse("mysql:8.0.22")
+                DockerImageName.parse("mysql:8.0.24")
             )
 
             // start the container and use it for testing
@@ -35,7 +35,7 @@ public void substitutedExample() {
             // hardcodedMirror {
             // Referring directly to an image on a private registry - image name will vary
             final MySQLContainer<?> mysql = new MySQLContainer<>(
-                DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.22")
+                DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.24")
                                .asCompatibleSubstituteFor("mysql")
             )
 
diff --git a/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
index 5f9e92c0add..01f6fdcb4f0 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
@@ -12,7 +12,7 @@ public class TestSpecificImageNameSubstitutor extends ImageNameSubstitutor {
 
     @Override
     public DockerImageName apply(final DockerImageName original) {
-        if (original.equals(DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.22"))) {
+        if (original.equals(DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.24"))) {
             return DockerImageName.parse("mysql");
         } else {
             return original;
diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
index 37088473d72..7ead811a250 100644
--- a/docs/features/image_name_substitution.md
+++ b/docs/features/image_name_substitution.md
@@ -53,7 +53,7 @@ Consider this if:
 
 * Developers and CI machines need to use different image names. For example, developers are able to pull images from Docker Hub, but CI machines need to pull from a private registry
 * Your private registry has copies of images from Docker Hub where the names are predictable, and just adding a prefix is enough. 
-  For example, `registry.mycompany.com/mirror/mysql:8.0.22` can be derived from the original Docker Hub image name (`mysql:8.0.22`) with a consistent prefix string: `registry.mycompany.com/mirror/`
+  For example, `registry.mycompany.com/mirror/mysql:8.0.24` can be derived from the original Docker Hub image name (`mysql:8.0.24`) with a consistent prefix string: `registry.mycompany.com/mirror/`
 
 In this case, image name references in code are **unchanged**.
 i.e. you would leave as-is:
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index fec250ffdd9..7adaf2f5e70 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -20,7 +20,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 !!! note
     We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
-    From Testcontainers' perspective, `jdbc:mysql:5.7.22://localhost:3306/databasename` and `jdbc:mysql:5.7.22:///databasename` is the same URI.
+    From Testcontainers' perspective, `jdbc:mysql:5.7.34://localhost:3306/databasename` and `jdbc:mysql:5.7.34:///databasename` is the same URI.
 
 !!! warning
     If you're using the JDBC URL support, there is no need to instantiate an instance of the container - Testcontainers will do it automagically.
@@ -29,7 +29,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using Testcontainers with a fixed version
 
-`jdbc:tc:mysql:5.6.23:///databasename`
+`jdbc:tc:mysql:5.7.34:///databasename`
 
 #### Using PostgreSQL
 
@@ -47,7 +47,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
 
-`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
+`jdbc:tc:mysql:5.7.34:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
 
 This is useful if you have a fixed script for setting up database schema, etc.
 
@@ -55,13 +55,13 @@ This is useful if you have a fixed script for setting up database schema, etc.
 
 If the init script path is prefixed `file:`, it will be loaded from a file (relative to the working directory, which will usually be the project root).
 
-`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
+`jdbc:tc:mysql:5.7.34:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
 
 ### Using an init function
 
 Instead of running a fixed script for DB setup, it may be useful to call a Java function that you define. This is intended to allow you to trigger database schema migration tools. To do this, add TC_INITFUNCTION to the URL as follows, passing a full path to the class name and method:
 
- `jdbc:tc:mysql:5.7.22:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
+ `jdbc:tc:mysql:5.7.34:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
 
 The init function must be a public static method which takes a `java.sql.Connection` as its only parameter, e.g.
 ```java
@@ -76,7 +76,7 @@ public class JDBCDriverTest {
 
 By default database container is being stopped as soon as last connection is closed. There are cases when you might need to start container and keep it running till you stop it explicitly or JVM is shutdown. To do this, add `TC_DAEMON` parameter to the URL as follows:
 
- `jdbc:tc:mysql:5.7.22:///databasename?TC_DAEMON=true`
+ `jdbc:tc:mysql:5.7.34:///databasename?TC_DAEMON=true`
 
 With this parameter database container will keep running even when there're no open connections.
 
diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index b32373f3363..ac3a53fe1fe 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -7,7 +7,7 @@ See [Database containers](./index.md) for documentation and usage that is common
 For MySQL databases, it is possible to override configuration settings using resources on the classpath. Assuming `somepath/mysql_conf_override`
 is a directory on the classpath containing .cnf files, the following URL can be used:
 
-  `jdbc:tc:mysql:5.6://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override`
+  `jdbc:tc:mysql:5.7.34://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override`
 
 Any .cnf files in this classpath directory will be mapped into the database container's /etc/mysql/conf.d directory,
 and will be able to override server settings when the container starts.
diff --git a/docs/modules/databases/r2dbc.md b/docs/modules/databases/r2dbc.md
index 6ba3f401a08..dba59b2d3d9 100644
--- a/docs/modules/databases/r2dbc.md
+++ b/docs/modules/databases/r2dbc.md
@@ -22,7 +22,7 @@ The started container will be terminated when the `ConnectionFactory` is closed.
 **Note that, unlike Testcontainers' JDBC URL support, it is not possible to specify an image tag in the 'scheme' part of the URL, and it is always necessary to specify a tag using `TC_IMAGE_TAG`.**
 
 So that the URL becomes:  
-`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.7.22`
+`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.7.34`
 
 !!! note
     We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
@@ -35,7 +35,7 @@ So that the URL becomes:
 
 #### Using MySQL
 
-`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.6.23`
+`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.7.34`
 
 #### Using MariaDB
 
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
index 8881ed963d8..6a5ca5094d6 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
@@ -27,7 +27,6 @@ protected DataSource getDataSource(JdbcDatabaseContainer<?> container) {
         hikariConfig.setUsername(container.getUsername());
         hikariConfig.setPassword(container.getPassword());
         hikariConfig.setDriverClassName(container.getDriverClassName());
-
         return new HikariDataSource(hikariConfig);
     }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index 3f0673d834f..920fab04016 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -33,7 +33,7 @@ public class ConnectionUrlDriversTests {
     public static Iterable<Object[]> data() {
         return asList(
             new Object[][]{
-                {"jdbc:tc:mysql:5.5.43://hostname/test", "mysql", Optional.of("5.5.43"), "hostname/test", "test"},
+                {"jdbc:tc:mysql:5.7.34://hostname/test", "mysql", Optional.of("5.7.34"), "hostname/test", "test"},
                 {"jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test"},
                 {"jdbc:tc:postgresql:1.2.3://hostname/test", "postgresql", Optional.of("1.2.3"), "hostname/test", "test"},
                 {"jdbc:tc:postgresql://hostname/test", "postgresql", Optional.empty(), "hostname/test", "test"},
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index 312d5cf5146..4fefd5d1e13 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -16,11 +16,11 @@ public class ConnectionUrlTest {
 
     @Test
     public void testConnectionUrl1() {
-        String urlString = "jdbc:tc:mysql:5.6.23://somehostname:3306/databasename?a=b&c=d";
+        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertEquals("Database Type value is as expected", "mysql", url.getDatabaseType());
-        assertEquals("Database Image tag value is as expected", "5.6.23", url.getImageTag().get());
+        assertEquals("Database Image tag value is as expected", "5.7.34", url.getImageTag().get());
         assertEquals("Database Host String is as expected", "somehostname:3306/databasename", url.getDbHostString());
         assertEquals("Query String value is as expected", "?a=b&c=d", url.getQueryString().get());
         assertEquals("Database Host value is as expected", "somehostname", url.getDatabaseHost().get());
@@ -72,7 +72,7 @@ public void testTmpfsOption() {
 
     @Test
     public void testInitScriptPathCapture() {
-        String urlString = "jdbc:tc:mysql:5.6.23://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
+        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertEquals("Database Type value is as expected", "somepath/init_mysql.sql", url.getInitScriptPath().get());
@@ -88,7 +88,7 @@ public void testInitScriptPathCapture() {
 
     @Test
     public void testInitFunctionCapture() {
-        String urlString = "jdbc:tc:mysql:5.6.23://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
+        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertTrue("Init Function parameter exists", url.getInitFunction().isPresent());
@@ -100,7 +100,7 @@ public void testInitFunctionCapture() {
 
     @Test
     public void testDaemonCapture() {
-        String urlString = "jdbc:tc:mysql:5.6.23://somehostname:3306/databasename?a=b&c=d&TC_DAEMON=true";
+        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_DAEMON=true";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertTrue("Daemon flag is set to true.", url.isInDaemonMode());
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
index 88398cebf85..46138d91347 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -40,7 +40,7 @@ static class MissingDriverContainer extends JdbcDatabaseContainer {
         private final AtomicInteger connectionAttempts = new AtomicInteger();
 
         MissingDriverContainer() {
-            super(DockerImageName.parse("mysql:5.7.22"));
+            super(DockerImageName.parse("mysql:5.7.34"));
             withEnv("MYSQL_ROOT_PASSWORD", "test");
             withExposedPorts(3306);
         }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index da3dad9f2b3..172ca29070d 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testCompile 'mysql:mysql-connector-java:8.0.22'
 
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
+    testCompile 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:20.1.0'
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index a126a579489..20be08c2aec 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -16,7 +16,7 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mysql");
 
     @Deprecated
-    public static final String DEFAULT_TAG = "5.7.22";
+    public static final String DEFAULT_TAG = "5.7.34";
 
     @Deprecated
     public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
diff --git a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
index 6c8c6690d1f..833dc1448cf 100644
--- a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
+++ b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
@@ -3,7 +3,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 public class MySQLTestImages {
-    public static final DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.22");
-    public static final DockerImageName MYSQL_55_IMAGE = DockerImageName.parse("mysql:5.5");
-    public static final DockerImageName MYSQL_56_IMAGE = DockerImageName.parse("mysql:5.6");
+    public static final DockerImageName MYSQL_56_IMAGE = DockerImageName.parse("mysql:5.6.51");
+    public static final DockerImageName MYSQL_57_IMAGE = DockerImageName.parse("mysql:5.7.34");
+    public static final DockerImageName MYSQL_80_IMAGE = DockerImageName.parse("mysql:8.0.24");
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
index 38abf637c3a..334fabb0a49 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
@@ -13,12 +13,12 @@ protected ConnectionFactoryOptions getOptions(MySQLContainer<?> container) {
 
     @Override
     protected String createR2DBCUrl() {
-        return "r2dbc:tc:mysql:///db?TC_IMAGE_TAG=5.7.22";
+        return "r2dbc:tc:mysql:///db?TC_IMAGE_TAG=" + MySQLTestImages.MYSQL_80_IMAGE.getVersionPart();
     }
 
     @Override
     protected MySQLContainer<?> createContainer() {
-        return new MySQLContainer<>(MySQLTestImages.MYSQL_IMAGE);
+        return new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE);
     }
 
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
index c437acac013..86b13a0d1bf 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
@@ -4,7 +4,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -15,15 +17,15 @@
 public class MySQLRootAccountTest {
 
     @Parameterized.Parameters(name = "{0}")
-    public static String[] params() {
-        return new String[]{
-            "mysql:8",
-            "mysql:5"
+    public static DockerImageName[] params() {
+        return new DockerImageName[]{
+            MySQLTestImages.MYSQL_80_IMAGE,
+            MySQLTestImages.MYSQL_57_IMAGE
         };
     }
 
     @Parameterized.Parameter()
-    public String image;
+    public DockerImageName image;
 
     @Test
     public void testRootAccountUsageWithDefaultPassword() throws SQLException {
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
index 1ad77264c62..3b9f9842095 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
@@ -31,7 +31,7 @@
 @RunWith(Parameterized.class)
 public class JDBCDriverWithPoolTest {
 
-    public static final String URL = "jdbc:tc:mysql:5://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.mysql.JDBCDriverWithPoolTest::sampleInitFunction";
+    public static final String URL = "jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.mysql.JDBCDriverWithPoolTest::sampleInitFunction";
     private final DataSource dataSource;
 
     @Parameterized.Parameters
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
index d4b37b291d5..302621879eb 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
@@ -17,14 +17,14 @@ public static Iterable<Object[]> data() {
             new Object[][]{
                 {"jdbc:tc:mysql://hostname/databasename", EnumSet.noneOf(Options.class)},
                 {"jdbc:tc:mysql://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mysql:5.5.43://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mysql:5.6://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", EnumSet.of(Options.CustomIniFile)},
+                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
+                {"jdbc:tc:mysql:5.7.34://hostname/databasename", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:mysql:5.7.34://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class)},
+                {"jdbc:tc:mysql:5.6.51://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", EnumSet.of(Options.CustomIniFile)},
             });
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
index 708b2b987cd..0b72ce083d2 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
@@ -18,7 +18,7 @@ public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
     @Test
     public void testSimple() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-        try (MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_IMAGE)
+        try (MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
             .withDatabaseName(DB_NAME)
             .withUsername(USER)
             .withPassword(PWD)
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index b8f1a136d9a..32dee3cd056 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -3,7 +3,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
@@ -12,32 +11,33 @@
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.testcontainers.MySQLTestImages.MYSQL_56_IMAGE;
+import static org.testcontainers.MySQLTestImages.MYSQL_57_IMAGE;
+import static org.testcontainers.MySQLTestImages.MYSQL_80_IMAGE;
 
 @RunWith(Parameterized.class)
 public class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
 
     @Parameterized.Parameters(name = "{0}")
-    public static String[] params() {
-        return new String[]{"5.5.62", "5.6.42", "5.7.26", "8.0.16"};
+    public static DockerImageName[] params() {
+        return new DockerImageName[]{
+            MYSQL_56_IMAGE,
+            MYSQL_57_IMAGE,
+            MYSQL_80_IMAGE
+        };
     }
 
-    private final String version;
-
-    public MultiVersionMySQLTest(String version) {
-        this.version = version;
-    }
+    @Parameterized.Parameter()
+    public DockerImageName dockerImageName;
 
     @Test
     public void versionCheckTest() throws SQLException {
-
-        final DockerImageName dockerImageName = MySQLTestImages.MYSQL_IMAGE.withTag(version);
-
         try (MySQLContainer<?> mysql = new MySQLContainer<>(dockerImageName)) {
             mysql.start();
             final ResultSet resultSet = performQuery(mysql, "SELECT VERSION()");
             final String resultSetString = resultSet.getString(1);
 
-            assertEquals("The database version can be set using a container rule parameter", version, resultSetString);
+            assertEquals("The database version can be set using a container rule parameter", dockerImageName.getVersionPart(), resultSetString);
         }
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index f0ceeb92a48..1b6143b3b34 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -24,9 +24,8 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 import static org.rnorth.visibleassertions.VisibleAssertions.fail;
-import static org.testcontainers.MySQLTestImages.MYSQL_55_IMAGE;
 import static org.testcontainers.MySQLTestImages.MYSQL_56_IMAGE;
-import static org.testcontainers.MySQLTestImages.MYSQL_IMAGE;
+import static org.testcontainers.MySQLTestImages.MYSQL_57_IMAGE;
 
 
 public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
@@ -52,7 +51,7 @@ public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
+        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
             .withConfigurationOverride("somepath/mysql_conf_override")
             .withLogConsumer(new Slf4jLogConsumer(logger))) {
 
@@ -67,7 +66,7 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testSpecificVersion() throws SQLException {
-        try (MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MYSQL_55_IMAGE)
+        try (MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MYSQL_56_IMAGE)
             .withConfigurationOverride("somepath/mysql_conf_override")
             .withLogConsumer(new Slf4jLogConsumer(logger))) {
 
@@ -76,7 +75,7 @@ public void testSpecificVersion() throws SQLException {
             ResultSet resultSet = performQuery(mysqlOldVersion, "SELECT VERSION()");
             String resultSetString = resultSet.getString(1);
 
-            assertTrue("The database version can be set using a container rule parameter", resultSetString.startsWith("5.5"));
+            assertTrue("The database version can be set using a container rule parameter", resultSetString.startsWith("5.6"));
         }
     }
 
@@ -98,7 +97,7 @@ public void testMySQLWithCustomIniFile() throws SQLException {
 
     @Test
     public void testCommandOverride() throws SQLException {
-        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MYSQL_IMAGE)
+        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MYSQL_57_IMAGE)
             .withCommand("mysqld --auto_increment_increment=42")) {
 
             mysqlCustomConfig.start();
@@ -112,7 +111,7 @@ public void testCommandOverride() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_IMAGE)
+        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_57_IMAGE)
             .withInitScript("somepath/init_mysql.sql")
             .withLogConsumer(new Slf4jLogConsumer(logger))) {
             container.start();
@@ -126,7 +125,7 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test(expected = ContainerLaunchException.class)
     public void testEmptyPasswordWithNonRootUser() {
-        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_55_IMAGE)
+        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_56_IMAGE)
                     .withDatabaseName("TEST")
                     .withUsername("test")
                     .withPassword("")
@@ -139,7 +138,7 @@ public void testEmptyPasswordWithNonRootUser() {
     @Test
     public void testEmptyPasswordWithRootUser() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_55_IMAGE)
+        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_56_IMAGE)
             .withDatabaseName("foo")
             .withUsername("root")
             .withPassword("")
@@ -156,7 +155,7 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamTimeZone() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
             .withUrlParam("serverTimezone", "Europe/Zurich")
             .withEnv("TZ", "Europe/Zurich")
             .withLogConsumer(new Slf4jLogConsumer(logger));
@@ -186,7 +185,7 @@ public void testWithAdditionalUrlParamTimeZone() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
         mysql.start();
@@ -210,7 +209,7 @@ public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withUrlParam("rewriteBatchedStatements", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
index 9698e7d433a..f18bc8dc96d 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -3,7 +3,7 @@ package org.testcontainers.spock
 import org.testcontainers.utility.DockerImageName
 
 interface SpockTestImages {
-    DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.22")
+    DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.34")
     DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
     DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
     DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.5")

From 99f5fac886d857896b19b8c609161fe53608eda1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20L=C3=B6vdahl?= <slovdahl@hibox.fi>
Date: Fri, 7 May 2021 16:58:22 +0300
Subject: [PATCH 1209/4969] Docs: Use `testImplementation` instead of
 deprecated `testCompile` (#4054)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/examples/junit4/generic/build.gradle | 14 +++++++-------
 docs/examples/junit4/redis/build.gradle   |  4 ++--
 docs/examples/junit5/redis/build.gradle   |  8 ++++----
 docs/index.md                             |  2 +-
 docs/modules/databases/cassandra.md       |  2 +-
 docs/modules/databases/clickhouse.md      |  2 +-
 docs/modules/databases/cockroachdb.md     |  2 +-
 docs/modules/databases/couchbase.md       |  2 +-
 docs/modules/databases/db2.md             |  2 +-
 docs/modules/databases/dynalite.md        |  2 +-
 docs/modules/databases/influxdb.md        |  2 +-
 docs/modules/databases/mariadb.md         |  2 +-
 docs/modules/databases/mongodb.md         |  2 +-
 docs/modules/databases/mssqlserver.md     |  2 +-
 docs/modules/databases/mysql.md           |  2 +-
 docs/modules/databases/neo4j.md           |  2 +-
 docs/modules/databases/oraclexe.md        |  2 +-
 docs/modules/databases/orientdb.md        |  2 +-
 docs/modules/databases/postgres.md        |  2 +-
 docs/modules/databases/presto.md          |  2 +-
 docs/modules/databases/trino.md           |  2 +-
 docs/modules/docker_compose.md            |  2 +-
 docs/modules/elasticsearch.md             |  2 +-
 docs/modules/gcloud.md                    |  2 +-
 docs/modules/kafka.md                     |  2 +-
 docs/modules/localstack.md                |  2 +-
 docs/modules/mockserver.md                |  2 +-
 docs/modules/nginx.md                     |  2 +-
 docs/modules/pulsar.md                    |  2 +-
 docs/modules/rabbitmq.md                  |  2 +-
 docs/modules/solr.md                      |  2 +-
 docs/modules/toxiproxy.md                 |  2 +-
 docs/modules/vault.md                     |  2 +-
 docs/modules/webdriver_containers.md      |  2 +-
 docs/quickstart/junit_4_quickstart.md     |  2 +-
 docs/quickstart/junit_5_quickstart.md     |  8 ++++----
 docs/quickstart/spock_quickstart.md       |  2 +-
 docs/test_framework_integration/spock.md  |  2 +-
 38 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index ff1b11f142e..1021bfeffc0 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -1,12 +1,12 @@
 description = "Examples for docs"
 
 dependencies {
-    testCompile "junit:junit:4.12"
-    testCompile project(":testcontainers")
-    testCompile project(":selenium")
-    testCompile project(":mysql")
+    testImplementation "junit:junit:4.12"
+    testImplementation project(":testcontainers")
+    testImplementation project(":selenium")
+    testImplementation project(":mysql")
 
-    testCompile 'mysql:mysql-connector-java:8.0.21'
-    testCompile "org.seleniumhq.selenium:selenium-api:3.141.59"
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'mysql:mysql-connector-java:8.0.21'
+    testImplementation "org.seleniumhq.selenium:selenium-api:3.141.59"
+    testImplementation 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 76d32e5b4d0..bf203a8fefa 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -3,6 +3,6 @@ description = "Examples for docs"
 dependencies {
     compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
-    testCompile "junit:junit:4.12"
-    testCompile project(":testcontainers")
+    testImplementation "junit:junit:4.12"
+    testImplementation project(":testcontainers")
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 56442b66af3..409b766b758 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,9 @@ description = "Examples for docs"
 dependencies {
     compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
-    testCompile "org.junit.jupiter:junit-jupiter-api:5.4.2"
-    testCompile "org.junit.jupiter:junit-jupiter-params:5.4.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.4.2"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
-    testCompile project(":testcontainers")
-    testCompile project(":junit-jupiter")
+    testImplementation project(":testcontainers")
+    testImplementation project(":junit-jupiter")
 }
diff --git a/docs/index.md b/docs/index.md
index 45213629ed0..e58a23bc330 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -32,7 +32,7 @@ Testcontainers is distributed as separate JARs with a common version number:
 For the core library, the latest Maven/Gradle dependency is as follows: 
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:testcontainers:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index d15304afa81..63213d27343 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -38,7 +38,7 @@ public class SomeTest {
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:cassandra:{{latest_version}}"
+testImplementation "org.testcontainers:cassandra:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/clickhouse.md b/docs/modules/databases/clickhouse.md
index 37f68c41e18..a52a75af51f 100644
--- a/docs/modules/databases/clickhouse.md
+++ b/docs/modules/databases/clickhouse.md
@@ -5,7 +5,7 @@
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:clickhouse:{{latest_version}}"
+testImplementation "org.testcontainers:clickhouse:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
index d9e6def4e48..540f4820a84 100644
--- a/docs/modules/databases/cockroachdb.md
+++ b/docs/modules/databases/cockroachdb.md
@@ -10,7 +10,7 @@ See [Database containers](./index.md) for documentation and usage that is common
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:cockroachdb:{{latest_version}}"
+testImplementation "org.testcontainers:cockroachdb:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/couchbase.md b/docs/modules/databases/couchbase.md
index b71ee5de327..f8ed7465dd9 100644
--- a/docs/modules/databases/couchbase.md
+++ b/docs/modules/databases/couchbase.md
@@ -33,7 +33,7 @@ Running Couchbase as a stand-in in a test:
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:couchbase:{{latest_version}}"
+testImplementation "org.testcontainers:couchbase:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
index bc25b343072..3872e7fa857 100644
--- a/docs/modules/databases/db2.md
+++ b/docs/modules/databases/db2.md
@@ -34,7 +34,7 @@ public class SomeTest {
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:db2:{{latest_version}}"
+testImplementation "org.testcontainers:db2:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/dynalite.md b/docs/modules/databases/dynalite.md
index 2d5c7f7492d..dfc32f35d2e 100644
--- a/docs/modules/databases/dynalite.md
+++ b/docs/modules/databases/dynalite.md
@@ -30,7 +30,7 @@ In part, because it's light and quick to run. Also, please see the [reasons give
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:dynalite:{{latest_version}}"
+testImplementation "org.testcontainers:dynalite:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/influxdb.md b/docs/modules/databases/influxdb.md
index 740cf69982c..5de7d36182a 100644
--- a/docs/modules/databases/influxdb.md
+++ b/docs/modules/databases/influxdb.md
@@ -23,7 +23,7 @@ public class SomeTest {
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:influxdb:{{latest_version}}"
+testImplementation "org.testcontainers:influxdb:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/mariadb.md b/docs/modules/databases/mariadb.md
index 74a4c6e061e..7ef14bed3cc 100644
--- a/docs/modules/databases/mariadb.md
+++ b/docs/modules/databases/mariadb.md
@@ -24,7 +24,7 @@ public class SomeTest {
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:mariadb:{{latest_version}}"
+testImplementation "org.testcontainers:mariadb:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/mongodb.md b/docs/modules/databases/mongodb.md
index fc2cb873f59..3d49ecc6809 100644
--- a/docs/modules/databases/mongodb.md
+++ b/docs/modules/databases/mongodb.md
@@ -41,7 +41,7 @@ That's where the MongoDBContainer might come in handy.
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:mongodb:{{latest_version}}"
+testImplementation "org.testcontainers:mongodb:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index 29c5435be32..6dea62def25 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -30,7 +30,7 @@ public class SomeTest {
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:mssqlserver:{{latest_version}}"
+testImplementation "org.testcontainers:mssqlserver:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index ac3a53fe1fe..f5a428e1cdc 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -18,7 +18,7 @@ and will be able to override server settings when the container starts.
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:mysql:{{latest_version}}"
+testImplementation "org.testcontainers:mysql:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index aaa18d225c9..702f9cc40d7 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -163,7 +163,7 @@ You'll find more information about licensing Neo4j here: [About Neo4j Licenses](
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:neo4j:{{latest_version}}"
+testImplementation "org.testcontainers:neo4j:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/oraclexe.md b/docs/modules/databases/oraclexe.md
index 86a9a5f938c..56eb57bc0e5 100644
--- a/docs/modules/databases/oraclexe.md
+++ b/docs/modules/databases/oraclexe.md
@@ -31,7 +31,7 @@ containing `oracle.container.image=IMAGE`, where IMAGE is a suitable image name
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:oracle-xe:{{latest_version}}"
+testImplementation "org.testcontainers:oracle-xe:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/orientdb.md b/docs/modules/databases/orientdb.md
index 80ed96f9548..4f0b3550e44 100644
--- a/docs/modules/databases/orientdb.md
+++ b/docs/modules/databases/orientdb.md
@@ -46,7 +46,7 @@ You are not limited to Unit tests and can of course use an instance of the Orien
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:orientdb:{{latest_version}}"
+testImplementation "org.testcontainers:orientdb:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/postgres.md b/docs/modules/databases/postgres.md
index 07831766d1b..0777296b0c0 100644
--- a/docs/modules/databases/postgres.md
+++ b/docs/modules/databases/postgres.md
@@ -7,7 +7,7 @@ See [Database containers](./index.md) for documentation and usage that is common
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:postgresql:{{latest_version}}"
+testImplementation "org.testcontainers:postgresql:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/presto.md b/docs/modules/databases/presto.md
index 8e8a2672355..3b987796360 100644
--- a/docs/modules/databases/presto.md
+++ b/docs/modules/databases/presto.md
@@ -68,7 +68,7 @@ public class SomeTest {
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:presto:{{latest_version}}"
+testImplementation "org.testcontainers:presto:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/databases/trino.md b/docs/modules/databases/trino.md
index 4cd26978af1..5b65f45934a 100644
--- a/docs/modules/databases/trino.md
+++ b/docs/modules/databases/trino.md
@@ -68,7 +68,7 @@ public class SomeTest {
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:trino:{{latest_version}}"
+testImplementation "org.testcontainers:trino:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/docker_compose.md b/docs/modules/docker_compose.md
index fa584d7f631..b789a0030a7 100644
--- a/docs/modules/docker_compose.md
+++ b/docs/modules/docker_compose.md
@@ -178,7 +178,7 @@ There are 3 ways to specify location of the `config.json` for Docker Compose:
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:testcontainers:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index cd47c9c4ed3..738bf427a56 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -42,7 +42,7 @@ other new and advanced features), you can use this instead:
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:elasticsearch:{{latest_version}}"
+testImplementation "org.testcontainers:elasticsearch:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 33d50ee634f..aeab52fc932 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -142,7 +142,7 @@ See more examples:
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:gcloud:{{latest_version}}"
+testImplementation "org.testcontainers:gcloud:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index b74d4ef49bd..b0cd1742f6b 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -51,7 +51,7 @@ You will need to explicitly create a network and set it on the Kafka container a
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:kafka:{{latest_version}}"
+testImplementation "org.testcontainers:kafka:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 41fd2a50a52..b6058508ddb 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -67,7 +67,7 @@ Testcontainers will inform Localstack of the best hostname automatically, using
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:localstack:{{latest_version}}"
+testImplementation "org.testcontainers:localstack:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md
index ead9d123915..bf56046deda 100644
--- a/docs/modules/mockserver.md
+++ b/docs/modules/mockserver.md
@@ -21,7 +21,7 @@ And how to set a simple expectation using the Java MockServerClient.
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:mockserver:{{latest_version}}"
+testImplementation "org.testcontainers:mockserver:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/nginx.md b/docs/modules/nginx.md
index d195b5451a2..5169d3c5625 100644
--- a/docs/modules/nginx.md
+++ b/docs/modules/nginx.md
@@ -27,7 +27,7 @@ And how to query the Nginx server for the custom content added.
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:nginx:{{latest_version}}"
+testImplementation "org.testcontainers:nginx:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/pulsar.md b/docs/modules/pulsar.md
index 8e6441586f8..92eda498f7c 100644
--- a/docs/modules/pulsar.md
+++ b/docs/modules/pulsar.md
@@ -5,7 +5,7 @@
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:pulsar:{{latest_version}}"
+testImplementation "org.testcontainers:pulsar:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/rabbitmq.md b/docs/modules/rabbitmq.md
index 92275ad765b..dff8631eeca 100644
--- a/docs/modules/rabbitmq.md
+++ b/docs/modules/rabbitmq.md
@@ -8,7 +8,7 @@
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:rabbitmq:{{latest_version}}"
+testImplementation "org.testcontainers:rabbitmq:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/solr.md b/docs/modules/solr.md
index 4776ffa608b..bb2d18d6431 100644
--- a/docs/modules/solr.md
+++ b/docs/modules/solr.md
@@ -21,7 +21,7 @@ You can start a solr container instance from any Java application by using:
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:solr:{{latest_version}}"
+testImplementation "org.testcontainers:solr:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
index 8ffb910d6c1..a3403ccc377 100644
--- a/docs/modules/toxiproxy.md
+++ b/docs/modules/toxiproxy.md
@@ -73,7 +73,7 @@ Additionally we can disable the proxy to simulate a complete interruption to the
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:toxiproxy:{{latest_version}}"
+testImplementation "org.testcontainers:toxiproxy:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/vault.md b/docs/modules/vault.md
index 1f58c0ab836..3140a6258bc 100644
--- a/docs/modules/vault.md
+++ b/docs/modules/vault.md
@@ -42,7 +42,7 @@ test how your application behaves with Vault by writing different test scenarios
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:vault:{{latest_version}}"
+testImplementation "org.testcontainers:vault:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index 41b7fb6bb23..34d3430830c 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -89,7 +89,7 @@ A few different examples are shown in [ChromeWebDriverContainerTest.java](https:
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:selenium:{{latest_version}}"
+testImplementation "org.testcontainers:selenium:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/quickstart/junit_4_quickstart.md b/docs/quickstart/junit_4_quickstart.md
index a3fecb1a14d..1a2cd84c77e 100644
--- a/docs/quickstart/junit_4_quickstart.md
+++ b/docs/quickstart/junit_4_quickstart.md
@@ -22,7 +22,7 @@ Let's start from here, and see how to improve the test with Testcontainers:
 First, add Testcontainers as a dependency as follows:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:testcontainers:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
index efd52b6c523..eb43bf05797 100644
--- a/docs/quickstart/junit_5_quickstart.md
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -23,11 +23,11 @@ First, add Testcontainers as a dependency as follows:
 
 ```groovy tab='Gradle'
 def junitJupiterVersion = '5.4.2'
-testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-testCompile "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
+testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
+testImplementation "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
 testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
-testCompile "org.testcontainers:testcontainers:{{latest_version}}"
-testCompile "org.testcontainers:junit-jupiter:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
+testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/quickstart/spock_quickstart.md b/docs/quickstart/spock_quickstart.md
index 902f1a78c09..875c1976c93 100644
--- a/docs/quickstart/spock_quickstart.md
+++ b/docs/quickstart/spock_quickstart.md
@@ -22,7 +22,7 @@ Let's start from here, and see how to improve the test with Testcontainers:
 First, add Testcontainers as a dependency as follows:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:spock:{{latest_version}}"
+testImplementation "org.testcontainers:spock:{{latest_version}}"
 ```
 
 ```xml tab='Maven'
diff --git a/docs/test_framework_integration/spock.md b/docs/test_framework_integration/spock.md
index 8528faf4490..11ccf058767 100644
--- a/docs/test_framework_integration/spock.md
+++ b/docs/test_framework_integration/spock.md
@@ -18,7 +18,7 @@ can be mixed with Spock's `@Shared` annotation to indicate, that containers shou
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ```groovy tab='Gradle'
-testCompile "org.testcontainers:spock:{{latest_version}}"
+testImplementation "org.testcontainers:spock:{{latest_version}}"
 ```
 
 ```xml tab='Maven'

From cf6d15c8b8dabb59be8be2e1000d7e4f6d16817c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 7 May 2021 15:59:21 +0200
Subject: [PATCH 1210/4969] Remove visible assertions dependency (#4010)

---
 core/build.gradle                                              | 3 +--
 .../java/org/testcontainers/containers/GenericContainer.java   | 3 +--
 examples/disque-job-queue/build.gradle                         | 1 +
 examples/redis-backed-cache-testng/build.gradle                | 1 +
 examples/redis-backed-cache/build.gradle                       | 1 +
 examples/selenium-container/build.gradle                       | 1 +
 examples/singleton-container/build.gradle                      | 1 +
 examples/solr-container/build.gradle                           | 1 +
 examples/spring-boot/build.gradle                              | 1 +
 modules/dynalite/build.gradle                                  | 2 ++
 modules/elasticsearch/build.gradle                             | 1 +
 modules/jdbc/build.gradle                                      | 1 +
 modules/localstack/build.gradle                                | 1 +
 modules/mockserver/build.gradle                                | 1 +
 modules/nginx/build.gradle                                     | 1 +
 modules/selenium/build.gradle                                  | 1 +
 16 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 463116dc5ee..5c8e9fe875d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -178,8 +178,6 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-
     compile "com.github.docker-java:docker-java-api:3.2.8"
 
     shaded ('com.github.docker-java:docker-java-core:3.2.8') {
@@ -218,6 +216,7 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
     testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile project(':test-support')
 
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 4536a70789c..e53af6240ab 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -71,7 +71,6 @@
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.UnstableAPI;
@@ -748,7 +747,7 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
         boolean shouldCheckFileMountingSupport = binds.size() > 0 && !TestcontainersConfiguration.getInstance().isDisableChecks();
         if (shouldCheckFileMountingSupport) {
             if (!DockerClientFactory.instance().isFileMountingSupported()) {
-                VisibleAssertions.warn(
+                logger().warn(
                     "Unable to mount a file from test host into a running container. " +
                         "This may be a misconfiguration or limitation of your Docker environment. " +
                         "Some features might not work."
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index c31cb39b7fe..90bbdd6d6f9 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -15,4 +15,5 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 76c245d5b51..d297f026323 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testng:testng:7.3.0'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index e63d494bcef..702ce023c6b 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -14,4 +14,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 1f05d7b5663..a671c1832fe 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -15,4 +15,5 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index bbd35cabc49..54a16b25230 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,4 +15,5 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index fcdf93a9c53..8c9fc2fcc11 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,5 +14,6 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 288a9226b90..ce2c028f83a 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,4 +17,5 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index a09ef417159..3ac35862e1a 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -5,4 +5,6 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
+
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index cb553c54654..f50b38bb568 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,4 +4,5 @@ dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.0"
     testCompile "org.elasticsearch.client:transport:7.10.1"
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 910dc29ebad..8b509f54fdb 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -10,4 +10,5 @@ dependencies {
     testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.0'
     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'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index c007b2c649e..6fb69b1ad85 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -8,4 +8,5 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.986'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.16.34'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index b463997fed5..e13343559f5 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,4 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.mock-server:mockserver-client-java:5.5.4'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 6c4b97876c4..1e601312ab4 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,4 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     compile project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:20.1.0'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 7c6d81ca1bf..7911b1ea991 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -10,6 +10,7 @@ dependencies {
 
     testCompile 'org.mortbay.jetty:jetty:6.1.26'
     testCompile project(':nginx')
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
     compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompileClasspath 'org.jetbrains:annotations:20.0.0'

From 67812b567285be124253442007b1fe0034c23c15 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 14 May 2021 05:43:40 +0100
Subject: [PATCH 1211/4969] Reduce dependabot bump rate to monthly (#4083)

---
 .github/dependabot.yml | 56 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 16b59da6dfa..4caa6509af2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,146 +3,146 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/core"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"
     directory: "/modules/cassandra"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/clickhouse"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/couchbase"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/database-commons"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/dynalite"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/elasticsearch"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/influxdb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc-test"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/junit-jupiter"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/localstack"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mariadb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mockserver"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mssqlserver"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mysql"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/neo4j"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/nginx"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/oracle-xe"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/postgresql"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/pulsar"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/selenium"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/spock"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/toxiproxy"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/vault"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
 
 # Examples
   - package-ecosystem: "gradle"
     directory: "/examples"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
 
 # GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10

From 137b00dfb9c72a3af1e0b27c442e8a5aa1a234c3 Mon Sep 17 00:00:00 2001
From: Mark Rotteveel <mrotteveel@users.noreply.github.com>
Date: Wed, 19 May 2021 14:19:16 +0200
Subject: [PATCH 1212/4969] Only run update-* and release-drafter on original
 repository, not on forks (#4104)

---
 .github/workflows/release-drafter.yml       | 1 +
 .github/workflows/update-docs-version.yml   | 1 +
 .github/workflows/update-gradle-wrapper.yml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index e19e08b9f32..bb2afd986f1 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   update_release_draft:
+    if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
       - uses: release-drafter/release-drafter@fe52e97d262833ae07d05efaf1a239df3f1b5cd4 # v5.15.0
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 64658c1be4a..ee11b83026a 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
     build:
+        if: github.repository == 'testcontainers/testcontainers-java'
         runs-on: ubuntu-18.04
         steps:
             -   uses: actions/checkout@v2
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index d34110f5a6d..329230640e7 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   update-gradle-wrapper:
+    if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
 
     steps:

From 3858aff8d63ae0b28b92bd08c21255163ae75160 Mon Sep 17 00:00:00 2001
From: vcvitaly <vcvitaly@yahoo.com>
Date: Wed, 19 May 2021 15:23:26 +0300
Subject: [PATCH 1213/4969] Improve log messages when database container test
 query fails (#3015)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 modules/jdbc/build.gradle                     |  1 +
 .../containers/JdbcDatabaseContainer.java     | 32 ++++-----
 .../containers/JdbcDatabaseContainerTest.java | 71 +++++++++++++++++++
 3 files changed, 88 insertions(+), 16 deletions(-)
 create mode 100644 modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 8b509f54fdb..8f2d8954985 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -11,4 +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'
 }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 26d699a1813..cf5ae150575 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -1,7 +1,9 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import java.sql.Statement;
 import lombok.NonNull;
+import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.traits.LinkableContainer;
@@ -130,25 +132,23 @@ public SELF withInitScript(String initScriptPath) {
         return self();
     }
 
+    @SneakyThrows(InterruptedException.class)
     @Override
     protected void waitUntilContainerStarted() {
         logger().info("Waiting for database connection to become available at {} using query '{}'", getJdbcUrl(), getTestQueryString());
 
         // Repeatedly try and open a connection to the DB and execute a test query
         long start = System.currentTimeMillis();
-        try {
-            while (System.currentTimeMillis() < start + (1000 * startupTimeoutSeconds)) {
-                try {
-                    if (!isRunning()) {
-                        Thread.sleep(100L);
-                        continue; // Don't attempt to connect yet
-                    }
 
-                    try (Connection connection = createConnection("")) {
-                        boolean testQuerySucceeded = connection.createStatement().execute(this.getTestQueryString());
-                        if (testQuerySucceeded) {
-                            break;
-                        }
+        while (System.currentTimeMillis() < start + (1000 * startupTimeoutSeconds)) {
+            if (!isRunning()) {
+                Thread.sleep(100L);
+            } else {
+                try (Statement statement = createConnection("").createStatement()) {
+                    boolean testQuerySucceeded = statement.execute(this.getTestQueryString());
+                    if (testQuerySucceeded) {
+                        logger().info("Container is started (JDBC URL: {})", this.getJdbcUrl());
+                        return;
                     }
                 } catch (NoDriverFoundException e) {
                     // we explicitly want this exception to fail fast without retries
@@ -159,12 +159,12 @@ protected void waitUntilContainerStarted() {
                     Thread.sleep(100L);
                 }
             }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new ContainerLaunchException("Container startup wait was interrupted", e);
         }
 
-        logger().info("Container is started (JDBC URL: {})", JdbcDatabaseContainer.this.getJdbcUrl());
+        throw new IllegalStateException(
+            String.format("Container is started, but cannot be accessed by (JDBC URL: %s), please check container logs",
+                this.getJdbcUrl())
+        );
     }
 
     @Override
diff --git a/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
new file mode 100644
index 00000000000..9f0cf514558
--- /dev/null
+++ b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
@@ -0,0 +1,71 @@
+package org.testcontainers.containers;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import lombok.NonNull;
+import org.junit.Test;
+import org.slf4j.Logger;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+
+public class JdbcDatabaseContainerTest {
+
+    @Test
+    public void anExceptionIsThrownIfJdbcIsNotAvailable() {
+        JdbcDatabaseContainer<?> jdbcContainer = new JdbcDatabaseContainerStub("mysql:latest")
+            .withStartupTimeoutSeconds(1);
+
+        assertThatExceptionOfType(IllegalStateException.class).isThrownBy(jdbcContainer::waitUntilContainerStarted);
+    }
+
+    static class JdbcDatabaseContainerStub extends JdbcDatabaseContainer {
+
+        public JdbcDatabaseContainerStub(@NonNull String dockerImageName) {
+            super(dockerImageName);
+        }
+
+        @Override
+        public String getDriverClassName() {
+            return null;
+        }
+
+        @Override
+        public String getJdbcUrl() {
+            return null;
+        }
+
+        @Override
+        public String getUsername() {
+            return null;
+        }
+
+        @Override
+        public String getPassword() {
+            return null;
+        }
+
+        @Override
+        protected String getTestQueryString() {
+            return null;
+        }
+
+        @Override
+        public boolean isRunning() {
+            return true;
+        }
+
+        @Override
+        public Connection createConnection(String queryString) throws SQLException, NoDriverFoundException {
+            throw new SQLException("Could not create new connection");
+        }
+
+        @Override
+        protected Logger logger() {
+            return mock(Logger.class);
+        }
+
+        @Override
+        public void setDockerImageName(@NonNull String dockerImageName) {}
+    }
+}

From 9c759abbb60d0d9b72aa711f35fee008ec4aa679 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:44:24 +0100
Subject: [PATCH 1214/4969] Bump s3 from 2.16.34 to 2.16.62 in
 /modules/localstack (#4102)

Bumps s3 from 2.16.34 to 2.16.62.

Signed-off-by: dependabot[bot] <support@github.com>

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 6fb69b1ad85..61d9271bad4 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.929'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.986'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.16.34'
+    testCompile 'software.amazon.awssdk:s3:2.16.62'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From dda77d61aa2a7d6f3d74d28e660088f98c5a2dd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:44:51 +0100
Subject: [PATCH 1215/4969] Bump aws-java-sdk-sqs from 1.11.986 to 1.11.1018 in
 /modules/localstack (#4101)

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.986 to 1.11.1018.
- [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.986...1.11.1018)

Signed-off-by: dependabot[bot] <support@github.com>

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 61d9271bad4..15f34e28d76 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.930'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.929'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.986'
+    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'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 8c9feb706db98f12f48f2714927b9ac916cb093e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:45:05 +0100
Subject: [PATCH 1216/4969] Bump mysql-connector-java from 8.0.22 to 8.0.25 in
 /modules/jdbc-test (#4095)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.22 to 8.0.25.
- [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.22...8.0.25)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 05a96aaf333..b7a81682e37 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -16,5 +16,5 @@ dependencies {
 
     compile 'org.apache.tomcat:tomcat-jdbc:9.0.40'
     compile 'org.vibur:vibur-dbcp:25.0'
-    compile 'mysql:mysql-connector-java:8.0.22'
+    compile 'mysql:mysql-connector-java:8.0.25'
 }

From 264796da9d7bc567f8baacdbc4de2a620eba31a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:45:15 +0100
Subject: [PATCH 1217/4969] Bump pulsar-client-admin from 2.7.0 to 2.7.2 in
 /modules/pulsar (#4098)

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.7.0 to 2.7.2.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.7.0...v2.7.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index e189e7006eb..7604a6712a6 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.1'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.0'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }

From eb62a375c4f7e221b83a34959d68ac6908613539 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:45:23 +0100
Subject: [PATCH 1218/4969] Bump mockito-core from 3.6.28 to 3.10.0 in /core
 (#4100)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.6.28 to 3.10.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.6.28...v3.10.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 5c8e9fe875d..e7a2710b796 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -210,7 +210,7 @@ dependencies {
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testCompile ('org.mockito:mockito-core:3.6.28') {
+    testCompile ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 0bfcc10c2dff95fd47478d84c3a8ecfbc5adf716 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:45:45 +0100
Subject: [PATCH 1219/4969] Bump mockito-core from 3.6.28 to 3.10.0 in
 /modules/junit-jupiter (#4094)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.6.28 to 3.10.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.6.28...v3.10.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 12d4321d10f..15a5d665ee0 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.13'
-    testCompile ('org.mockito:mockito-core:3.6.28') {
+    testCompile ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.18.1'

From 83c4b823b93f16d03b99de3536c0c2da6415e136 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:45:53 +0100
Subject: [PATCH 1220/4969] Bump mysql-connector-java from 8.0.22 to 8.0.25 in
 /modules/spock (#4093)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.22 to 8.0.25.
- [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.22...8.0.25)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 a095bcb8a80..d0665614b17 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntime 'org.postgresql:postgresql:42.2.18'
-    testRuntime 'mysql:mysql-connector-java:8.0.22'
+    testRuntime 'mysql:mysql-connector-java:8.0.25'
 
     testCompileClasspath 'org.jetbrains:annotations:20.1.0'
 }

From 3aa1b8a3b8bed2f92b21ebaa342c8114873887f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:46:01 +0100
Subject: [PATCH 1221/4969] Bump aws-java-sdk-dynamodb from 1.11.929 to
 1.11.1018 in /modules/dynalite (#4091)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 3ac35862e1a..ea982a2d9ea 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1018'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
 
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 992322b3437c8fc51fbf59992da92f9b58009c7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:46:22 +0100
Subject: [PATCH 1222/4969] Bump r2dbc-postgresql from 0.8.5.RELEASE to
 0.8.8.RELEASE in /modules/postgresql (#4092)

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.5.RELEASE to 0.8.8.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.8.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.5.RELEASE...v0.8.8.RELEASE)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 b16ceaea2a8..f666394d733 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.5.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.8.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')

From 4ac8dedaae07c7051ea26a59dc3645298fb1d4a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:46:34 +0100
Subject: [PATCH 1223/4969] Bump mariadb-java-client from 2.7.0 to 2.7.3 in
 /modules/mariadb (#4090)

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.7.0 to 2.7.3.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/2.7.3/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.7.0...2.7.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 915e14eb7ee..1424d032020 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.0'
 
     testCompile project(':jdbc-test')
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.0'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'org.mariadb:r2dbc-mariadb:1.0.0'

From 24a2ec9db9090b406c642f82410c2ae257989452 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 12:46:58 +0000
Subject: [PATCH 1224/4969] Bump r2dbc-mariadb from 1.0.0 to 1.0.1 in
 /modules/mariadb

Bumps [r2dbc-mariadb](https://github.com/mariadb-corporation/mariadb-connector-r2dbc) from 1.0.0 to 1.0.1.
- [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/compare/1.0.0...1.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1424d032020..ae55575d421 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.0'
+    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.1'
 
     testCompile project(':jdbc-test')
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.3'

From 10056934e384c9fd2b40287f3e6e8109b460bda0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:52:16 +0100
Subject: [PATCH 1225/4969] Bump pulsar-client from 2.7.1 to 2.7.2 in
 /modules/pulsar (#4097)

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.7.1...v2.7.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 7604a6712a6..10fe90dadf9 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.1'
+    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
     testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }

From ad348c4f7b2ff0bdf00043f09ff9f608005e1d59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:52:24 +0100
Subject: [PATCH 1226/4969] Bump r2dbc-mssql from 0.8.5.RELEASE to
 0.8.6.RELEASE in /modules/mssqlserver (#4089)

Bumps [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 0.8.5.RELEASE to 0.8.6.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v0.8.6.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v0.8.5.RELEASE...v0.8.6.RELEASE)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 c36f1e6ba84..5471a3e3f68 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.5.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.6.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.1.jre8-preview'

From 4bcfbd7a7136394c5dd0682ddd30785562cc3ca4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:52:31 +0100
Subject: [PATCH 1227/4969] Bump testcontainers from 1.15.2 to 1.15.3 in /core
 (#4067)

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.15.2 to 1.15.3.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.15.2...1.15.3)

Signed-off-by: dependabot[bot] <support@github.com>

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 e7a2710b796..cc62e5581c8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -165,7 +165,7 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.15.2', {
+    baseline 'org.testcontainers:testcontainers:1.15.3', {
         exclude group: "*", module: "*"
     }
 

From 52af32194393374c623dff14811547e595bb9360 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:52:38 +0100
Subject: [PATCH 1228/4969] Bump transport from 7.10.1 to 7.12.1 in
 /modules/elasticsearch (#4050)

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.10.1 to 7.12.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.1...v7.12.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index f50b38bb568..fd3b99b491a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.0"
-    testCompile "org.elasticsearch.client:transport:7.10.1"
+    testCompile "org.elasticsearch.client:transport:7.12.1"
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 16d330c28b0d68ee6f3bd8a1cf0ce43403f367f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:52:52 +0100
Subject: [PATCH 1229/4969] Bump junit-jupiter-api from 5.7.0 to 5.7.1 in
 /modules/junit-jupiter (#3770)

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 15a5d665ee0..dc4650ada94 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    compile 'org.junit.jupiter:junit-jupiter-api:5.7.1'
 
     testCompile project(':mysql')
     testCompile project(':postgresql')

From e93cefd83cc775b116efc44f6963e8cf6819a82d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 13:52:59 +0100
Subject: [PATCH 1230/4969] Bump junit from 4.13.1 to 4.13.2 in /examples
 (#3794)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/mongodb-container/build.gradle  | 2 +-
 examples/redis-backed-cache/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 57b578a1607..8a4c727f069 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     testCompileClasspath 'org.jetbrains:annotations:20.1.0'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 702ce023c6b..de1e2d8a0a8 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 4b6b23906d95c88cb76dff4cbfccfd8eedb4006d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:28:59 +0100
Subject: [PATCH 1231/4969] Bump junit-jupiter-params from 5.7.0 to 5.7.1 in
 /modules/junit-jupiter (#3769)

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 dc4650ada94..7e1b17356ca 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.18.1'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.0'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.1'
 
     testRuntime 'org.postgresql:postgresql:42.2.18'
     testRuntime 'mysql:mysql-connector-java:8.0.22'

From 6dd2475e88fbccb9976744425ad7749337b510c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:29:11 +0100
Subject: [PATCH 1232/4969] Bump org.jetbrains.kotlin.plugin.spring from
 1.4.21-2 to 1.4.32 in /examples (#3946)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 8ffa1b46d2a..6810020f17d 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -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.4.21-2"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.4.32"
 }
 
 apply plugin: 'io.spring.dependency-management'

From c7bea124d433ebf6a10ee20363babb0103c0e99a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:29:25 +0100
Subject: [PATCH 1233/4969] Bump auto-service from 1.0-rc7 to 1.0 in
 /modules/mariadb (#3989)

Bumps [auto-service](https://github.com/google/auto) from 1.0-rc7 to 1.0.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/commits/auto-value-1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 1424d032020..c70dfb93bfd 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0'
 
     compile project(':jdbc')
 

From e48b3550e65ccd7e8216d7484532dbbf5ed341d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:29:31 +0100
Subject: [PATCH 1234/4969] Bump auto-service from 1.0-rc7 to 1.0 in
 /modules/mysql (#3988)

Bumps [auto-service](https://github.com/google/auto) from 1.0-rc7 to 1.0.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/commits/auto-value-1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 172ca29070d..5ac1ba945da 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0'
 
     compile project(':jdbc')
 

From 36e2035a0d8a84be8e3256918282f7ca6bb49ac8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:29:37 +0100
Subject: [PATCH 1235/4969] Bump auto-service from 1.0-rc7 to 1.0 in
 /modules/postgresql (#3984)

Bumps [auto-service](https://github.com/google/auto) from 1.0-rc7 to 1.0.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/commits/auto-value-1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/postgresql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index f666394d733..e853387291f 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0'
 
     compile project(':jdbc')
 

From 2a0de4457314ea157e2e76346f743193343dfab5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:29:50 +0100
Subject: [PATCH 1236/4969] Bump lombok from 1.18.16 to 1.18.20 in /examples
 (#3956)

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.16 to 1.18.20.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.16...v1.18.20)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/disque-job-queue/build.gradle | 4 ++--
 examples/kafka-cluster/build.gradle    | 2 +-
 examples/solr-container/build.gradle   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 90bbdd6d6f9..82d1bb548ee 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.16"
-    annotationProcessor "org.projectlombok:lombok:1.18.14"
+    compileOnly "org.projectlombok:lombok:1.18.20"
+    annotationProcessor "org.projectlombok:lombok:1.18.20"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index db07c6859f3..491b5c2f214 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.10"
+    testCompileOnly "org.projectlombok:lombok:1.18.20"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testCompile 'org.testcontainers:kafka'
     testCompile 'org.apache.kafka:kafka-clients:2.3.1'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 8c9fc2fcc11..b01d66ea9a9 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.16"
+    compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
 
     implementation 'org.apache.solr:solr-solrj:8.7.0'

From c69f6f8adb79b29cb4b4460a423f38f3757e0f8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:29:57 +0100
Subject: [PATCH 1237/4969] Bump json from 20201115 to 20210307 in /examples
 (#3884)

Bumps [json](https://github.com/douglascrockford/JSON-java) from 20201115 to 20210307.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 5c7279dd09a..d3055dd3aa8 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
-    implementation 'org.json:json:20201115'
+    implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.2.18'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'

From 5a942431836957d92a6d7ab1686e83e18b5f7e7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:30:04 +0100
Subject: [PATCH 1238/4969] Bump commons-lang3 from 3.11 to 3.12.0 in
 /modules/jdbc-test (#3856)

Bumps commons-lang3 from 3.11 to 3.12.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 b7a81682e37..3dd0d52f2e8 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:30.1-jre'
-    compile 'org.apache.commons:commons-lang3:3.11'
+    compile 'org.apache.commons:commons-lang3:3.12.0'
     compile 'com.zaxxer:HikariCP-java6:2.3.13'
     compile 'commons-dbutils:commons-dbutils:1.7'
 

From c06520dbdb45bf51bc1ff7f3ac5c5adc360d4b07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 14:30:13 +0000
Subject: [PATCH 1239/4969] Bump kafka-clients from 2.6.0 to 2.8.0 in
 /modules/kafka

Bumps kafka-clients from 2.6.0 to 2.8.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 4454823bda4..db400c0b557 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.6.0'
+    testCompile 'org.apache.kafka:kafka-clients:2.8.0'
     testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile 'com.google.guava:guava:23.0'
 }

From 858b1aa06e865d10451f47dd0042cbd5e0025265 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 14:30:23 +0000
Subject: [PATCH 1240/4969] Bump testng from 7.3.0 to 7.4.0 in /examples

Bumps [testng](https://github.com/cbeust/testng) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/compare/7.3.0...7.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index d297f026323..42553843710 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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'
 }
 

From f5e88058f6bc775e73f63ee833734790aff706fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 15:30:33 +0100
Subject: [PATCH 1241/4969] Bump junit-jupiter-engine from 5.7.0 to 5.7.1 in
 /modules/junit-jupiter (#3768)

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 7e1b17356ca..70ba308092b 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.18'
     testRuntime 'mysql:mysql-connector-java:8.0.22'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
 }
 
 test {

From 0b8b301893532c10ec75d9e408260f9d7bfbdd0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 14:30:35 +0000
Subject: [PATCH 1242/4969] Bump okhttp from 4.9.0 to 4.9.1 in /examples

Bumps [okhttp](https://github.com/square/okhttp) from 4.9.0 to 4.9.1.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.0...parent-4.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d3055dd3aa8..b3d339d4db8 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.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.2.18'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

From 0a2dfc4c95fa73757d1741fb1e4ea79ac36da46d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 20 May 2021 13:00:34 +0100
Subject: [PATCH 1243/4969] Allow DOCKER_HOST and related settings to be set in
 `~/.testcontainers.properties` (#4118)

---
 ...dSystemPropertyClientProviderStrategy.java | 29 +++++-
 .../utility/TestcontainersConfiguration.java  | 23 ++++-
 ...temPropertyClientProviderStrategyTest.java | 91 +++++++++++++++++++
 .../TestcontainersConfigurationTest.java      | 23 ++++-
 docs/features/configuration.md                | 15 ++-
 5 files changed, 171 insertions(+), 10 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java

diff --git a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
index e0afba9af93..e9bdbd90bea 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
@@ -2,10 +2,19 @@
 
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientConfig;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.util.Optional;
 
 /**
  * Use environment variables and system properties (as supported by the underlying DockerClient DefaultConfigBuilder)
  * to try and locate a docker environment.
+ * <p>
+ * Resolution order is:
+ * <ol>
+ *     <li>DOCKER_HOST env var</li>
+ *     <li>docker.host in ~/.testcontainers.properties</li>
+ * </ol>
  *
  * @deprecated this class is used by the SPI and should not be used directly
  */
@@ -14,12 +23,26 @@ public final class EnvironmentAndSystemPropertyClientProviderStrategy extends Do
 
     public static final int PRIORITY = 100;
 
-    // Try using environment variables
-    private final DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
+    private final DockerClientConfig dockerClientConfig;
+
+    public EnvironmentAndSystemPropertyClientProviderStrategy() {
+        // use docker-java defaults if present, overridden if our own configuration is set
+        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
+
+        getSetting("docker.host").ifPresent(configBuilder::withDockerHost);
+        getSetting("docker.tls.verify").ifPresent(configBuilder::withDockerTlsVerify);
+        getSetting("docker.cert.path").ifPresent(configBuilder::withDockerCertPath);
+
+        dockerClientConfig = configBuilder.build();
+    }
+
+    private Optional<String> getSetting(final String name) {
+        return Optional.ofNullable(TestcontainersConfiguration.getInstance().getEnvVarOrUserProperty(name, null));
+    }
 
     @Override
     protected boolean isApplicable() {
-        return System.getenv("DOCKER_HOST") != null;
+        return getSetting("docker.host").isPresent();
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 3b4d9f8f70c..9b2ab707a2e 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -168,7 +168,11 @@ public boolean environmentSupportsReuse() {
     }
 
     public String getDockerClientStrategyClassName() {
-        return getEnvVarOrUserProperty("docker.client.strategy", null);
+        // getConfigurable won't apply the TESTCONTAINERS_ prefix when looking for env vars if DOCKER_ appears at the beginning.
+        // Because of this overlap, and the desire to not change this specific TESTCONTAINERS_DOCKER_CLIENT_STRATEGY setting,
+        // we special-case the logic here so that docker.client.strategy is used when reading properties files and
+        // TESTCONTAINERS_DOCKER_CLIENT_STRATEGY is used when searching environment variables.
+        return getEnvVarOrUserProperty("docker.client.strategy", environment.get("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY"));
     }
 
     public String getTransportType() {
@@ -187,7 +191,7 @@ public String getImageSubstitutorClassName() {
     @Contract("_, !null, _ -> !null")
     private String getConfigurable(@NotNull final String propertyName, @Nullable final String defaultValue, Properties... propertiesSources) {
         String envVarName = propertyName.replaceAll("\\.", "_").toUpperCase();
-        if (!envVarName.startsWith("TESTCONTAINERS_")) {
+        if (!envVarName.startsWith("TESTCONTAINERS_") && !envVarName.startsWith("DOCKER_")) {
             envVarName = "TESTCONTAINERS_" + envVarName;
         }
 
@@ -208,6 +212,10 @@ private String getConfigurable(@NotNull final String propertyName, @Nullable fin
      * Gets a configured setting from an environment variable (if present) or a configuration file property otherwise.
      * The configuration file will be the <code>.testcontainers.properties</code> file in the user's home directory or
      * a <code>testcontainers.properties</code> found on the classpath.
+     * <p>
+     * Note that when searching environment variables, the prefix `TESTCONTAINERS_` will usually be applied to the
+     * property name, which will be converted to upper-case with underscore separators. This prefix will not be added
+     * if the property name begins `docker.`.
      *
      * @param propertyName name of configuration file property (dot-separated lower case)
      * @return the found value, or null if not set
@@ -220,6 +228,10 @@ public String getEnvVarOrProperty(@NotNull final String propertyName, @Nullable
     /**
      * Gets a configured setting from an environment variable (if present) or a configuration file property otherwise.
      * The configuration file will be the <code>.testcontainers.properties</code> file in the user's home directory.
+     * <p>
+     * Note that when searching environment variables, the prefix `TESTCONTAINERS_` will usually be applied to the
+     * property name, which will be converted to upper-case with underscore separators. This prefix will not be added
+     * if the property name begins `docker.`.
      *
      * @param propertyName name of configuration file property (dot-separated lower case)
      * @return the found value, or null if not set
@@ -230,8 +242,11 @@ public String getEnvVarOrUserProperty(@NotNull final String propertyName, @Nulla
     }
 
     /**
-     * Gets a configured setting from a the user's configuration file.
-     * The configuration file will be the <code>.testcontainers.properties</code> file in the user's home directory.
+     * Gets a configured setting from an environment variable.
+     * <p>
+     * Note that when searching environment variables, the prefix `TESTCONTAINERS_` will usually be applied to the
+     * property name, which will be converted to upper-case with underscore separators. This prefix will not be added
+     * if the property name begins `docker.`.
      *
      * @param propertyName name of configuration file property (dot-separated lower case)
      * @return the found value, or null if not set
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
new file mode 100644
index 00000000000..91f61848d69
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
@@ -0,0 +1,91 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.LocalDirectorySSLConfig;
+import com.github.dockerjava.transport.SSLConfig;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+
+/**
+ * Test that we can use Testcontainers configuration file to override settings. We assume that docker-java has test
+ * coverage for detection of environment variables (e.g. DOCKER_HOST) and its own properties config file.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class EnvironmentAndSystemPropertyClientProviderStrategyTest {
+
+    @Rule
+    public MockTestcontainersConfigurationRule mockConfig = new MockTestcontainersConfigurationRule();
+    private URI defaultDockerHost;
+    private com.github.dockerjava.core.SSLConfig defaultSSLConfig;
+
+    @Before
+    public void checkEnvironmentClear() {
+        // If docker-java picks up non-default settings from the environment, our test needs to know to expect those
+        DefaultDockerClientConfig defaultConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
+        defaultDockerHost = defaultConfig.getDockerHost();
+        defaultSSLConfig = defaultConfig.getSSLConfig();
+    }
+
+    @Test
+    public void testWhenConfigAbsent() {
+        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
+        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
+        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
+
+        EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
+
+        TransportConfig transportConfig = strategy.getTransportConfig();
+        assertEquals(defaultDockerHost, transportConfig.getDockerHost());
+        assertEquals(defaultSSLConfig, transportConfig.getSslConfig());
+    }
+
+    @Test
+    public void testWhenDockerHostPresent() {
+        Mockito.doReturn("tcp://1.2.3.4:2375").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
+        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
+        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
+
+        EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
+
+        TransportConfig transportConfig = strategy.getTransportConfig();
+        assertEquals("tcp://1.2.3.4:2375", transportConfig.getDockerHost().toString());
+        assertEquals(defaultSSLConfig, transportConfig.getSslConfig());
+    }
+
+    @Test
+    public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
+        Path tempDir = Files.createTempDirectory("testcontainers-test");
+        String tempDirPath = tempDir.toAbsolutePath().toString();
+
+        Mockito.doReturn("tcp://1.2.3.4:2375").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
+        Mockito.doReturn("1").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
+        Mockito.doReturn(tempDirPath).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
+
+        EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
+
+        TransportConfig transportConfig = strategy.getTransportConfig();
+        assertEquals("tcp://1.2.3.4:2375", transportConfig.getDockerHost().toString());
+
+        SSLConfig sslConfig = transportConfig.getSslConfig();
+        assertNotNull(sslConfig);
+        assertTrue(sslConfig instanceof LocalDirectorySSLConfig);
+        assertEquals(tempDirPath, ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index e5300bce58d..0fca36f0f2f 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -113,6 +113,27 @@ public void shouldReadChecksFromEnvironment() {
         assertTrue("checks disabled via env var", newConfig().isDisableChecks());
     }
 
+    @Test
+    public void shouldReadDockerSettingsFromEnvironmentWithoutTestcontainersPrefix() {
+        userProperties.remove("docker.foo");
+        environment.put("DOCKER_FOO", "some value");
+        assertEquals("reads unprefixed env vars for docker. settings", "some value", newConfig().getEnvVarOrUserProperty("docker.foo", "default"));
+    }
+
+    @Test
+    public void shouldNotReadDockerSettingsFromEnvironmentWithTestcontainersPrefix() {
+        userProperties.remove("docker.foo");
+        environment.put("TESTCONTAINERS_DOCKER_FOO", "some value");
+        assertEquals("reads unprefixed env vars for docker. settings", "default", newConfig().getEnvVarOrUserProperty("docker.foo", "default"));
+    }
+
+    @Test
+    public void shouldReadDockerSettingsFromUserProperties() {
+        environment.remove("DOCKER_FOO");
+        userProperties.put("docker.foo", "some value");
+        assertEquals("reads unprefixed user properties for docker. settings", "some value", newConfig().getEnvVarOrUserProperty("docker.foo", "default"));
+    }
+
     @Test
     public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
         String currentValue = newConfig().getDockerClientStrategyClassName();
@@ -129,7 +150,7 @@ public void shouldReadDockerClientStrategyFromUserProperties() {
 
     @Test
     public void shouldReadDockerClientStrategyFromEnvironment() {
-               userProperties.remove("docker.client.strategy");
+        userProperties.remove("docker.client.strategy");
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "foo");
         assertEquals("Docker client strategy is changed by env var", "foo", newConfig().getDockerClientStrategyClassName());
     }
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index da7bbd82d60..2336ec840c5 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -96,9 +96,9 @@ but does not allow starting privileged containers, you can turn off the Ryuk con
 
 ## Customizing Docker host detection
 
-Testcontainers will attempt to detect the Docker environment and configure everything.
+Testcontainers will attempt to detect the Docker environment and configure everything to work automatically.
 
-However, sometimes a customization is required. For that, you can provide the following environment variables:
+However, sometimes customization is required. Testcontainers will respect the following **environment variables**:
 
 > **DOCKER_HOST** = unix:///var/run/docker.sock  
 > See [Docker environment variables](https://docs.docker.com/engine/reference/commandline/cli/#environment-variables)
@@ -110,3 +110,14 @@ However, sometimes a customization is required. For that, you can provide the fo
 > **TESTCONTAINERS_HOST_OVERRIDE**  
 > Docker's host on which ports are exposed.  
 > Example: `docker.svc.local`
+
+For advanced users, the Docker host connection can be configured **via configuration** in `~/.testcontainers.properties`.
+Note that these settings require use of the `EnvironmentAndSystemPropertyClientProviderStrategy`. The example below 
+illustrates usage:
+
+```properties
+docker.client.strategy=org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy
+docker.host=tcp\://my.docker.host\:1234     # Equivalent to the DOCKER_HOST environment variable. Colons should be escaped.
+docker.tls.verify=1                         # Equivalent to the DOCKER_TLS_VERIFY environment variable
+docker.cert.path=/some/path                 # Equivalent to the DOCKER_CERT_PATH environment variable
+```

From 426c6239187c596651b6e40842dd08665fff02a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 May 2021 10:54:02 +0100
Subject: [PATCH 1244/4969] Bump postgresql from 42.2.18 to 42.2.20 in
 /modules/junit-jupiter (#4032)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 70ba308092b..69e13138e2a 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.1'
 
-    testRuntime 'org.postgresql:postgresql:42.2.18'
+    testRuntime 'org.postgresql:postgresql:42.2.20'
     testRuntime 'mysql:mysql-connector-java:8.0.22'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
 }

From e2b0e3c0327e7c8d787925337fed5a0defc42d58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:57:43 +0100
Subject: [PATCH 1245/4969] Bump org.jetbrains.kotlin.plugin.spring from 1.4.32
 to 1.5.0 in /examples (#4115)

Bumps org.jetbrains.kotlin.plugin.spring from 1.4.32 to 1.5.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 6810020f17d..6fb7b4c1d24 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -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.4.32"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.5.0"
 }
 
 apply plugin: 'io.spring.dependency-management'

From bdbe1a457248a1d1b7fab8f22ef24279e63dca9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:57:58 +0100
Subject: [PATCH 1246/4969] Bump elasticsearch-rest-client from 7.12.0 to
 7.12.1 in /modules/elasticsearch (#4049)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index fd3b99b491a..b7fbda347a1 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.1"
     testCompile "org.elasticsearch.client:transport:7.12.1"
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From f01d0e5f91da28cffaae4189eef00912a8bc0ade Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:58:05 +0100
Subject: [PATCH 1247/4969] Bump mssql-jdbc from 9.1.1.jre8-preview to
 9.3.1.jre8-preview in /modules/mssqlserver (#4048)

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 9.1.1.jre8-preview to 9.3.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 5471a3e3f68..10699e508e5 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,12 +10,12 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.6.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.1.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
 
     testCompile project(':r2dbc')
     testCompile 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.1.1.jre8-preview'
+    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
 }

From 4735b7441ecd975e4fcafb8e02ca54fd9946dad0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:58:16 +0100
Subject: [PATCH 1248/4969] Bump jedis from 3.4.0 to 3.6.0 in /core (#4019)

Bumps [jedis](https://github.com/redis/jedis) from 3.4.0 to 3.6.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.4.0...jedis-3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

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 cc62e5581c8..059202e1b41 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -206,7 +206,7 @@ dependencies {
     }
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.4.0'
+    testCompile 'redis.clients:jedis:3.6.0'
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 

From 5b4609a406ef1c353f0ba651c019c5f16ef283c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:58:29 +0100
Subject: [PATCH 1249/4969] Bump jedis from 3.3.0 to 3.6.0 in
 /modules/junit-jupiter (#4028)

Bumps [jedis](https://github.com/redis/jedis) from 3.3.0 to 3.6.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.3.0...jedis-3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 69e13138e2a..99789bf2721 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.5'
-    testCompile 'redis.clients:jedis:3.3.0'
+    testCompile 'redis.clients:jedis:3.6.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
     testCompile ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')

From e86454a7b71b2c4c6431fc3d604e913040e43361 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:58:39 +0100
Subject: [PATCH 1250/4969] Bump auto-service from 1.0-rc7 to 1.0 in
 /modules/mssqlserver (#3983)

Bumps [auto-service](https://github.com/google/auto) from 1.0-rc7 to 1.0.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/commits/auto-value-1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 10699e508e5..143a6582ae1 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: MS SQL Server"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0'
 
     compile project(':jdbc')
 

From 1719cf5a5840bf3ee8f1575c4004d2b991e78fad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:58:49 +0100
Subject: [PATCH 1251/4969] Bump solr-solrj from 8.7.0 to 8.8.2 in /examples
 (#4005)

Bumps solr-solrj from 8.7.0 to 8.8.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index b01d66ea9a9..e0a6f356a77 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
 
-    implementation 'org.apache.solr:solr-solrj:8.7.0'
+    implementation 'org.apache.solr:solr-solrj:8.8.2'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From cd91b0e4f824e9bb215b5caffabbdf13125de078 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:58:59 +0100
Subject: [PATCH 1252/4969] Bump HikariCP from 3.4.5 to 4.0.3 in /modules/spock
 (#3857)

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.5 to 4.0.3.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.5...HikariCP-4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 d0665614b17..07ac5c7ce3b 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
 
-    testCompile 'com.zaxxer:HikariCP:3.4.5'
+    testCompile 'com.zaxxer:HikariCP:4.0.3'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntime 'org.postgresql:postgresql:42.2.18'

From e83895fde8dfd851d8c487e0595d7e4d17a95277 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 19:59:18 +0100
Subject: [PATCH 1253/4969] Bump mysql-connector-java from 8.0.22 to 8.0.25 in
 /modules/mysql (#4086)

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.22 to 8.0.25.
- [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.22...8.0.25)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 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 5ac1ba945da..c6823e247d4 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'mysql:mysql-connector-java:8.0.22'
+    testCompile 'mysql:mysql-connector-java:8.0.25'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From 73d7fd0f28b03c434c24d57c4e0af16e98259c26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 20:00:48 +0100
Subject: [PATCH 1254/4969] Bump assertj-core from 3.18.1 to 3.19.0 in
 /modules/neo4j (#3716)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 9aab6b18298..722e5474388 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     compile project(":testcontainers")
 
     testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.18.1'
+    testCompile 'org.assertj:assertj-core:3.19.0'
 }

From 3167adc033ac3e1d2cf050e1ef83c2b9bc43afb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 20:00:55 +0100
Subject: [PATCH 1255/4969] Bump assertj-core from 3.18.1 to 3.19.0 in
 /modules/vault (#3722)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index e75d1121131..72dc2811292 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testCompile 'com.bettercloud:vault-java-driver:5.1.0'
     testCompile 'io.rest-assured:rest-assured:4.3.3'
-    testCompile 'org.assertj:assertj-core:3.18.1'
+    testCompile 'org.assertj:assertj-core:3.19.0'
 
 }

From 96b2065f27b259530766d968f12339e64b980bc9 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 26 May 2021 06:55:18 +0100
Subject: [PATCH 1256/4969] Only publish exposed ports (#4122)

---
 .../containers/GenericContainer.java          | 107 ++++++++++--------
 .../containers/GenericContainerTest.java      |  61 +++++++++-
 .../containers/ClickHouseContainer.java       |   6 +-
 .../couchbase/CouchbaseContainer.java         |  13 +++
 .../containers/MariaDBContainer.java          |   7 +-
 .../containers/MSSQLServerContainer.java      |   6 +-
 .../containers/OracleContainer.java           |   6 +-
 7 files changed, 147 insertions(+), 59 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index e53af6240ab..10f8e1e7195 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1,8 +1,5 @@
 package org.testcontainers.containers;
 
-import static com.google.common.collect.Lists.newArrayList;
-import static org.testcontainers.utility.CommandLine.runShellCommand;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -16,6 +13,7 @@
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
@@ -23,39 +21,6 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.hash.Hashing;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.zip.Adler32;
-import java.util.zip.Checksum;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.NonNull;
@@ -97,6 +62,43 @@
 import org.testcontainers.utility.ResourceReaper;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.zip.Adler32;
+import java.util.zip.Checksum;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static org.testcontainers.utility.CommandLine.runShellCommand;
+
 /**
  * Base class for that allows a container to be launched and controlled.
  */
@@ -718,21 +720,28 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     private void applyConfiguration(CreateContainerCmd createCommand) {
         HostConfig hostConfig = buildHostConfig();
-        createCommand.withHostConfig(hostConfig);
-
-        // Set up exposed ports (where there are no host port bindings defined)
-        ExposedPort[] portArray = exposedPorts.stream()
-                .map(ExposedPort::new)
-                .toArray(ExposedPort[]::new);
 
-        createCommand.withExposedPorts(portArray);
+        // PortBindings must contain:
+        //  * all exposed ports with a randomized host port (equivalent to -p CONTAINER_PORT)
+        //  * all exposed ports with a fixed host port (equivalent to -p HOST_PORT:CONTAINER_PORT)
+        Map<ExposedPort, PortBinding> allPortBindings = new HashMap<>();
+        // First collect all the randomized host ports from our 'exposedPorts' field
+        for (final Integer tcpPort : exposedPorts) {
+            ExposedPort exposedPort = ExposedPort.tcp(tcpPort);
+            allPortBindings.put(exposedPort, new PortBinding(Ports.Binding.empty(), exposedPort));
+        }
+        // Next collect all the fixed host ports from our 'portBindings' field, overwriting any randomized ports so that
+        // we don't create two bindings for the same container port.
+        for (final String portBinding : portBindings) {
+            PortBinding parsedBinding = PortBinding.parse(portBinding);
+            allPortBindings.put(parsedBinding.getExposedPort(), parsedBinding);
+        }
+        hostConfig.withPortBindings(new ArrayList<>(allPortBindings.values()));
 
-        // Set up exposed ports that need host port bindings
-        PortBinding[] portBindingArray = portBindings.stream()
-                .map(PortBinding::parse)
-                .toArray(PortBinding[]::new);
+        // Next, ExposedPorts must be set up to publish all of the above ports, both randomized and fixed.
+        createCommand.withExposedPorts(new ArrayList<>(allPortBindings.keySet()));
 
-        createCommand.withPortBindings(portBindingArray);
+        createCommand.withHostConfig(hostConfig);
 
         if (commandParts != null) {
             createCommand.withCmd(commandParts);
@@ -798,8 +807,6 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
             createCommand.withNetworkMode(networkForLinks.get());
         }
 
-        createCommand.withPublishAllPorts(true);
-
         PortForwardingContainer.INSTANCE.getNetwork().ifPresent(it -> {
             withExtraHost(INTERNAL_HOST_HOSTNAME, it.getIpAddress());
         });
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index e059a48709f..1e2cb041cf1 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -1,8 +1,12 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse.ContainerState;
+import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.Ports;
+import com.google.common.primitives.Ints;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
@@ -11,15 +15,23 @@
 import org.assertj.core.api.Assumptions;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.testcontainers.TestImages;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.images.builder.ImageFromDockerfile;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class GenericContainerTest {
 
@@ -60,6 +72,53 @@ public void shouldReportErrorAfterWait() {
         }
     }
 
+    @Test
+    public void shouldOnlyPublishExposedPorts() {
+        ImageFromDockerfile image = new ImageFromDockerfile("publish-multiple")
+            .withDockerfileFromBuilder(builder ->
+                builder
+                    .from("testcontainers/helloworld:1.1.0")
+                    .expose(8080, 8081)
+                    .build()
+            );
+        try (GenericContainer<?> container = new GenericContainer<>(image).withExposedPorts(8080)) {
+            container.start();
+
+            InspectContainerResponse inspectedContainer = container.getContainerInfo();
+
+            List<Integer> exposedPorts = Arrays.stream(inspectedContainer.getConfig().getExposedPorts())
+                .map(ExposedPort::getPort)
+                .collect(Collectors.toList());
+
+            assertEquals(
+                "the exposed ports are all of those EXPOSEd by the image",
+                Ints.asList(8080, 8081),
+                exposedPorts
+            );
+
+            Map<ExposedPort, Ports.Binding[]> hostBindings = inspectedContainer.getHostConfig().getPortBindings().getBindings();
+            assertEquals(
+                "only 1 port is bound on the host (published)",
+                1,
+                hostBindings.size()
+            );
+
+            Integer mappedPort = container.getMappedPort(8080);
+            assertTrue(
+                "port 8080 is bound to a different port on the host",
+                mappedPort != 8080
+            );
+
+            assertThrows(
+                "trying to get a non-bound port mapping fails",
+                IllegalArgumentException.class,
+                () -> {
+                    container.getMappedPort(8081);
+                }
+            );
+        }
+    }
+
     static class NoopStartupCheckStrategy extends StartupCheckStrategy {
 
         @Override
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index e26ca8c8416..9b5f130a323 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -1,9 +1,11 @@
 package org.testcontainers.containers;
 
+import com.google.common.collect.Sets;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
+import java.util.Set;
 
 public class ClickHouseContainer extends JdbcDatabaseContainer {
     public static final String NAME = "clickhouse";
@@ -54,8 +56,8 @@ public ClickHouseContainer(final DockerImageName dockerImageName) {
     }
 
     @Override
-    protected Integer getLivenessCheckPort() {
-        return getMappedPort(HTTP_PORT);
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Sets.newHashSet(HTTP_PORT);
     }
 
     @Override
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 3671608d324..8df5844f538 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -166,6 +166,19 @@ public String getConnectionString() {
     protected void configure() {
         super.configure();
 
+        addExposedPorts(
+            MGMT_PORT,
+            MGMT_SSL_PORT,
+            VIEW_PORT,
+            VIEW_SSL_PORT,
+            QUERY_PORT,
+            QUERY_SSL_PORT,
+            SEARCH_PORT,
+            SEARCH_SSL_PORT,
+            KV_PORT,
+            KV_SSL_PORT
+        );
+
         WaitAllStrategy waitStrategy = new WaitAllStrategy();
 
         // Makes sure that all nodes in the cluster are healthy.
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index b43a5f237e5..2e28e5d0480 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -1,7 +1,10 @@
 package org.testcontainers.containers;
 
+import com.google.common.collect.Sets;
 import org.testcontainers.utility.DockerImageName;
 
+import java.util.Set;
+
 /**
  * Container implementation for the MariaDB project.
  *
@@ -51,8 +54,8 @@ public MariaDBContainer(final DockerImageName dockerImageName) {
     }
 
     @Override
-    protected Integer getLivenessCheckPort() {
-        return getMappedPort(MARIADB_PORT);
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Sets.newHashSet(MARIADB_PORT);
     }
 
     @Override
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index a20c60fd2dc..ecccc320b28 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -1,8 +1,10 @@
 package org.testcontainers.containers;
 
+import com.google.common.collect.Sets;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
 
+import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -60,8 +62,8 @@ public MSSQLServerContainer(final DockerImageName dockerImageName) {
     }
 
     @Override
-    protected Integer getLivenessCheckPort() {
-        return getMappedPort(MS_SQL_SERVER_PORT);
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Sets.newHashSet(MS_SQL_SERVER_PORT);
     }
 
     @Override
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 0a66ad6fd27..2573ef722e3 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -1,8 +1,10 @@
 package org.testcontainers.containers;
 
+import com.google.common.collect.Sets;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.util.Set;
 import java.util.concurrent.Future;
 
 /**
@@ -61,8 +63,8 @@ private void preconfigure() {
     }
 
     @Override
-    protected Integer getLivenessCheckPort() {
-        return getMappedPort(ORACLE_PORT);
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Sets.newHashSet(ORACLE_PORT);
     }
 
     @Override

From 841ce8e6bec55b1d9717c2c6e60a0df5290f4859 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jun 2021 05:08:45 +0000
Subject: [PATCH 1257/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.5.0 to 1.5.10.

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 6fb7b4c1d24..6617e830e8b 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -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'

From 8289f3a21d1f2262952faf302ed0950442c5b78f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jun 2021 05:09:35 +0000
Subject: [PATCH 1258/4969] Bump rest-assured from 4.3.3 to 4.4.0 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 4.3.3 to 4.4.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.3.3...rest-assured-4.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 72dc2811292..17edbd3f3fd 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -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'
 
 }

From d992d127fd8bcc1b5fda02a004ca132963ab4f03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jun 2021 05:11:22 +0000
Subject: [PATCH 1259/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.1018 to 1.11.1030.
- [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.1018...1.11.1030)

Signed-off-by: dependabot[bot] <support@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 ea982a2d9ea..58a16a0b62b 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -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'
 }

From ae2d57934e635df1ed8e20a5d89a02a521dd1fd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jun 2021 05:11:42 +0000
Subject: [PATCH 1260/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.12.1 to 7.13.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.1...v7.13.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index b7fbda347a1..21db8e69545 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.1"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.13.0"
     testCompile "org.elasticsearch.client:transport:7.12.1"
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From b82fa09c00c8cfe40748e93b1a4ddc433da48206 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jun 2021 05:11:49 +0000
Subject: [PATCH 1261/4969] Bump aws-java-sdk-s3 from 1.11.930 to 1.11.1030 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.930 to 1.11.1030.
- [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.930...1.11.1030)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 15f34e28d76..e6a6340f686 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -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'

From 371125469210d1de9d3e602dced904350ce8df35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jun 2021 05:30:06 +0000
Subject: [PATCH 1262/4969] Bump actions/setup-java from 1 to 2.1.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1 to 2.1.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v1...v2.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index cea7180566d..e3f540065e3 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f49b6426a2e..727c89f22f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files

From 69ead41b3d4fff61b4a1fe891b5f80335affae49 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Mon, 7 Jun 2021 00:27:24 +0200
Subject: [PATCH 1263/4969] Add @oleg-nenashev as backer, reference @jenkinsci
 and @cloudbees as adopters (#4170)

---
 docs/index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index e58a23bc330..139cbcd3f4e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -139,6 +139,7 @@ A huge thank you to our sponsors:
 * [Pascal Zwick (@pas2al)](https://github.com/pas2al)
 * [Nikita Zhevnitskiy (@zhenik)](https://github.com/zhenik)
 * [Bas Stoker (@bastoker)](https://github.com/bastoker)
+* [Oleg Nenashev (@oleg-nenashev)](https://github.com/oleg-nenashev)
 
 ## Who is using Testcontainers?
 
@@ -173,6 +174,9 @@ A huge thank you to our sponsors:
 * [Trino (formerly Presto SQL)](https://trino.io) - Integration testing all Trino core & connectors, including tests of multi-node deployments and security configurations.
 * Google - Various open source projects: [OpenTelemetry](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java), [Universal Application Tool](https://github.com/seattle-uat/universal-application-tool), [CloudBowl](https://github.com/GoogleCloudPlatform/cloudbowl-microservice-game)
 * [Backbase](https://www.backbase.com/) - Unit, Integration and Acceptance testing for different the databases supported (Oracle, SQL Server, MySQL), the different messaging systems supported (Kafka, Rabbit, AMQ) and other microservices and HTTP mocks.
+* [CloudBees](https://www.cloudbees.com/) - Integration testing of products, including but not limited to database and AWS/Localstack integration testing.
+* [Jenkins](https://www.jenkins.io/) - Integration testing of multiple plugins and the Trilead SSH2 fork maintained by the Jenkins community
+  ([query](https://github.com/search?l=Maven+POM&q=org%3Ajenkinsci+testcontainers&type=Code)).
 
 
 ## License

From b4bafc9a039aa0adf865c33293b89d7fdbe01846 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 7 Jun 2021 09:16:15 +0100
Subject: [PATCH 1264/4969] Combined dependencies PR (#4135)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 modules/database-commons/build.gradle | 2 +-
 modules/jdbc/build.gradle             | 2 +-
 modules/junit-jupiter/build.gradle    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index dacd8a500ac..0eecc1844d0 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.18.1'
+    testCompile 'org.assertj:assertj-core:3.19.0'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 8f2d8954985..992f7611de4 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.0'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.6'
     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'
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index 99789bf2721..393c4cac653 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntime 'org.postgresql:postgresql:42.2.20'
     testRuntime 'mysql:mysql-connector-java:8.0.22'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
 
 test {

From 57f4802095e73a25266b827dc357fbd71521f0aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jun 2021 08:39:30 +0000
Subject: [PATCH 1265/4969] Bump annotations from 20.1.0 to 21.0.1 in
 /modules/spock

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 07ac5c7ce3b..8c065e389cd 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -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 {

From 1c1bc81de3810a1a5c1417c3cd00842a452b314b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jun 2021 08:39:41 +0000
Subject: [PATCH 1266/4969] Bump annotations from 20.1.0 to 21.0.1 in
 /modules/mysql

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c6823e247d4..91a7d2c9918 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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'
 }

From 80491db9816e6afa8406b4aef1626ae23849c2fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jun 2021 08:44:39 +0000
Subject: [PATCH 1267/4969] Bump assertj-core from 3.16.1 to 3.19.0 in
 /modules/jdbc

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.16.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.16.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 992f7611de4..2741a348f34 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -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'
 }

From 9a3bff0b3ecb55ca45eca292515c1410b2c606fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:29:12 +0100
Subject: [PATCH 1268/4969] Bump actions/cache from 2.1.3 to 2.1.6 (#4162)

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.3 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.3...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index cea7180566d..d3b9f7811a2 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v2.1.6
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -46,7 +46,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v2.1.6
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f49b6426a2e..409aff3da98 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -44,7 +44,7 @@ jobs:
         with:
           java-version: '1.8'
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v2.1.6
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From 3844712431165501f9238cc30a6c6d7c34fb64fa Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 8 Jun 2021 14:31:27 +0100
Subject: [PATCH 1269/4969] Add `distribution` config to fix build

---
 .github/workflows/ci-examples.yml | 2 ++
 .github/workflows/ci.yml          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index e3f540065e3..cd696de7edd 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -18,6 +18,7 @@ jobs:
       - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3
         continue-on-error: true
@@ -45,6 +46,7 @@ jobs:
       - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3
         continue-on-error: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 727c89f22f4..0bc9d517322 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,7 @@ jobs:
       - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3
         with:
@@ -43,6 +44,7 @@ jobs:
       - uses: actions/setup-java@v2.1.0
         with:
           java-version: '1.8'
+          distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3
         continue-on-error: true

From 669cc53419c30b7d211f44fb93802a34729b8c20 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 8 Jun 2021 16:55:01 +0100
Subject: [PATCH 1270/4969] Change java-version format

---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index cd696de7edd..83c74833563 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
           distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
           distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0bc9d517322..a84b9fa6723 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
           distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.1.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.292+10'
           distribution: adopt-hotspot
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.3

From 24610cbae71b3d27f9df1ae64678ee0c6012331e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 8 Jun 2021 17:11:21 +0100
Subject: [PATCH 1271/4969] Add combine-prs workflow (#4176)

---
 .github/workflows/combine-prs.yml | 139 ++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 .github/workflows/combine-prs.yml

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
new file mode 100644
index 00000000000..b4a89055446
--- /dev/null
+++ b/.github/workflows/combine-prs.yml
@@ -0,0 +1,139 @@
+name: 'Combine PRs'
+
+# Controls when the action will run - in this case triggered manually
+on:
+  workflow_dispatch:
+    inputs:
+      branchPrefix:
+        description: 'Branch prefix to find combinable PRs based on'
+        required: true
+        default: 'dependabot'
+      mustBeGreen:
+        description: 'Only combine PRs that are green (status is success)'
+        required: true
+        default: 'true'
+      combineBranchName:
+        description: 'Name of the branch to combine PRs into'
+        required: true
+        default: 'combine-prs-branch'
+      ignoreLabel:
+        description: 'Exclude PRs with this label'
+        required: true
+        default: 'nocombine'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "combine-prs"
+  combine-prs:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/github-script@v3
+        id: fetch-branch-names
+        name: Fetch branch names
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', {
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
+            branches = [];
+            prs = [];
+            base_branch = null;
+            for (const pull of pulls) {
+              const branch = pull['head']['ref'];
+              console.log('Pull for branch: ' + branch);
+              if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) {
+                console.log('Branch matched: ' + branch);
+                statusOK = true;
+                if(${{ github.event.inputs.mustBeGreen }}) {
+                  console.log('Checking green status: ' + branch);
+                  const statuses = await github.paginate('GET /repos/{owner}/{repo}/commits/{ref}/status', {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    ref: branch
+                  });
+                  if(statuses.length > 0) {
+                    const latest_status = statuses[0]['state'];
+                    console.log('Validating status: ' + latest_status);
+                    if(latest_status != 'success') {
+                      console.log('Discarding ' + branch + ' with status ' + latest_status);
+                      statusOK = false;
+                    }
+                  }
+                }
+                console.log('Checking labels: ' + branch);
+                const labels = pull['labels'];
+                for(const label of labels) {
+                  const labelName = label['name'];
+                  console.log('Checking label: ' + labelName);
+                  if(labelName == '${{ github.event.inputs.ignoreLabel }}') {
+                    console.log('Discarding ' + branch + ' with label ' + labelName);
+                    statusOK = false;
+                  }
+                }
+                if (statusOK) {
+                  console.log('Adding branch to array: ' + branch);
+                  branches.push(branch);
+                  prs.push('#' + pull['number'] + ' ' + pull['title']);
+                  base_branch = pull['base']['ref'];
+                }
+              }
+            }
+
+            if (branches.length == 0) {
+              core.setFailed('No PRs/branches matched criteria');
+              return;
+            }
+
+            core.setOutput('base-branch', base_branch);
+            core.setOutput('prs-string', prs.join('\n'));
+
+            combined = branches.join(' ')
+            console.log('Combined: ' + combined);
+            return combined
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2.3.3
+        with:
+          fetch-depth: 0
+      # Creates a branch with other PR branches merged together
+      - name: Created combined branch
+        env:
+          BASE_BRANCH: ${{ steps.fetch-branch-names.outputs.base-branch }}
+          BRANCHES_TO_COMBINE: ${{ steps.fetch-branch-names.outputs.result }}
+          COMBINE_BRANCH_NAME: ${{ github.event.inputs.combineBranchName }}
+        run: |
+          echo "${{steps.fetch-branch-names.outputs.result}}"
+          sourcebranches="${BRANCHES_TO_COMBINE%\"}"
+          sourcebranches="${sourcebranches#\"}"
+
+          basebranch="${BASE_BRANCH%\"}"
+          basebranch="${basebranch#\"}"
+
+          git config pull.rebase false
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
+          git branch $COMBINE_BRANCH_NAME $basebranch
+          git checkout $COMBINE_BRANCH_NAME
+          git pull origin $sourcebranches --no-edit
+          git push origin $COMBINE_BRANCH_NAME
+      # Creates a PR with the new combined branch
+      - uses: actions/github-script@v3
+        name: Create Combined Pull Request
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const prString = `${{ steps.fetch-branch-names.outputs.prs-string }}`;
+            const body = 'This PR was created by the Combine PRs action by combining the following PRs:\n' + prString;
+            await github.pulls.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: 'Combined PR',
+              head: '${{ github.event.inputs.combineBranchName }}',
+              base: '${{ steps.fetch-branch-names.outputs.base-branch }}',
+              body: body
+            });

From ec37236bc28e18724f6e4cf6aca5c63224935fa2 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 8 Jun 2021 17:31:47 +0100
Subject: [PATCH 1272/4969] Tweak combine-prs.yml to use check-runs Copied from
 https://github.com/hrvey/combine-prs-workflow/pull/6

---
 .github/workflows/combine-prs.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index b4a89055446..749cc648fb5 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -51,16 +51,15 @@ jobs:
                 statusOK = true;
                 if(${{ github.event.inputs.mustBeGreen }}) {
                   console.log('Checking green status: ' + branch);
-                  const statuses = await github.paginate('GET /repos/{owner}/{repo}/commits/{ref}/status', {
+                  const checkRuns = await github.request('GET /repos/{owner}/{repo}/commits/{ref}/check-runs', {
                     owner: context.repo.owner,
                     repo: context.repo.repo,
                     ref: branch
                   });
-                  if(statuses.length > 0) {
-                    const latest_status = statuses[0]['state'];
-                    console.log('Validating status: ' + latest_status);
-                    if(latest_status != 'success') {
-                      console.log('Discarding ' + branch + ' with status ' + latest_status);
+                  for await (const cr of checkRuns.data.check_runs) {
+                    console.log('Validating check conclusion: ' + cr.conclusion);
+                    if(cr.conclusion != 'success') {
+                      console.log('Discarding ' + branch + ' with check conclusion ' + cr.conclusion);
                       statusOK = false;
                     }
                   }

From 3684a0b6b322d13c0a1e71934af5ca30c8d1e679 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:17 +0000
Subject: [PATCH 1273/4969] Bump HikariCP from 3.4.5 to 4.0.3 in
 /modules/junit-jupiter

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.5 to 4.0.3.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.5...HikariCP-4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 393c4cac653..2bc2a88e7b3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile project(':mysql')
     testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:3.4.5'
+    testCompile 'com.zaxxer:HikariCP:4.0.3'
     testCompile 'redis.clients:jedis:3.6.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
     testCompile ('org.mockito:mockito-core:3.10.0') {

From 8cf5661c18cf3eb0fcc500476865f656c2190323 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:26 +0000
Subject: [PATCH 1274/4969] Bump mysql-connector-java in /modules/junit-jupiter

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.22 to 8.0.25.
- [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.22...8.0.25)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 393c4cac653..aed6deb0c10 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.7.1'
 
     testRuntime 'org.postgresql:postgresql:42.2.20'
-    testRuntime 'mysql:mysql-connector-java:8.0.22'
+    testRuntime 'mysql:mysql-connector-java:8.0.25'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
 

From 160bb814e91b54050afd9a904059566c6f7d9df3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:34 +0000
Subject: [PATCH 1275/4969] Bump org.jetbrains.kotlin.jvm from 1.4.32 to 1.5.10
 in /examples

Bumps org.jetbrains.kotlin.jvm from 1.4.32 to 1.5.10.

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 6617e830e8b..61a74a3950e 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.4.1"
-    id("org.jetbrains.kotlin.jvm") version "1.4.32"
+    id("org.jetbrains.kotlin.jvm") version "1.5.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.10"
 }
 

From 4f573f2802b4a31c44cbb516d3bed2bc7a2ccd20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:42 +0000
Subject: [PATCH 1276/4969] Bump annotations from 20.1.0 to 21.0.1 in
 /modules/postgresql

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e853387291f..c01cd67df48 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -16,5 +16,5 @@ dependencies {
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
 }

From ff462ae0ab0a9b3b671bc7391afc2af96ea52af9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:44 +0000
Subject: [PATCH 1277/4969] Bump annotations from 20.1.0 to 21.0.1 in
 /modules/selenium

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 7911b1ea991..e9e4bf2d4a5 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testCompile project(':nginx')
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compileOnly 'org.jetbrains:annotations:20.1.0'
-    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
+    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
 }

From b820c4a07a8ccc415838851ada8e6e1bfa52466c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:47 +0000
Subject: [PATCH 1278/4969] Bump aws-java-sdk-sqs from 1.11.1018 to 1.12.1 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.1018 to 1.12.1.
- [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.1018...1.12.1)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 e6a6340f686..3948f1443b2 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.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-sqs:1.12.1'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.16.62'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 5091c179d5636c2ccb8e80833a92535a564a418c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:48 +0000
Subject: [PATCH 1279/4969] Bump annotations from 20.1.0 to 21.0.1 in
 /modules/nginx

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 1e601312ab4..c0fe33a8258 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     compile project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
     testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From ef197a4d1b686e8c88e1883ac9c32e4153bb93af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:57:50 +0000
Subject: [PATCH 1280/4969] Bump annotations from 20.1.0 to 21.0.1 in
 /modules/jdbc

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2741a348f34..1152b2a5e93 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile project(':database-commons')
     testCompile project(':test-support')
 
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
     testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.6'

From 5fcbd6db51b92b6eeaf78efb6fb7487c46c47584 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 8 Jun 2021 20:16:43 +0100
Subject: [PATCH 1281/4969] Make release drafter observe PR events

---
 .github/workflows/release-drafter.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index bb2afd986f1..629280b1241 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+  pull_request:
+    types: [opened, reopened, synchronize]
 
 jobs:
   update_release_draft:

From 9a8df79f847dbcca833680e69f8b4ea1ace310bf Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 9 Jun 2021 17:48:37 +0200
Subject: [PATCH 1282/4969] Update to Gradle 7 (#4171)

* Update to Gradle 7

* Add `checkPOMdependencies` task to test that no new dependencies were added

* Update examples to Gradle 7

* Disable the filesystem watching

* Try Gradle 7.0.2

* fix `provided` configuration

* Extract `ComparePOMWithLatestReleasedTask`

* Add missing file
---
 .gitignore                                    |  1 +
 build.gradle                                  | 19 +++---
 buildSrc/build.gradle                         |  7 +++
 .../ComparePOMWithLatestReleasedTask.groovy   | 35 +++++++++++
 core/build.gradle                             | 62 ++++++++-----------
 docs/examples/junit4/redis/build.gradle       |  2 +-
 docs/examples/junit5/redis/build.gradle       |  2 +-
 docs/examples/spock/redis/build.gradle        |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 examples/kafka-cluster/build.gradle           | 10 +--
 gradle.properties                             |  1 +
 gradle/publishing.gradle                      |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 modules/cassandra/build.gradle                |  4 +-
 modules/clickhouse/build.gradle               |  8 +--
 modules/cockroachdb/build.gradle              |  6 +-
 modules/couchbase/build.gradle                |  4 +-
 modules/database-commons/build.gradle         |  4 +-
 modules/db2/build.gradle                      |  6 +-
 modules/dynalite/build.gradle                 |  6 +-
 modules/elasticsearch/build.gradle            |  8 +--
 modules/gcloud/build.gradle                   | 14 ++---
 modules/influxdb/build.gradle                 |  4 +-
 modules/jdbc-test/build.gradle                | 22 +++----
 modules/jdbc/build.gradle                     | 18 +++---
 modules/junit-jupiter/build.gradle            | 26 ++++----
 modules/kafka/build.gradle                    |  8 +--
 modules/localstack/build.gradle               | 12 ++--
 modules/mariadb/build.gradle                  | 10 +--
 modules/mockserver/build.gradle               |  6 +-
 modules/mongodb/build.gradle                  |  4 +-
 modules/mssqlserver/build.gradle              | 14 ++---
 modules/mysql/build.gradle                    | 10 +--
 modules/neo4j/build.gradle                    |  6 +-
 modules/nginx/build.gradle                    |  4 +-
 modules/oracle-xe/build.gradle                |  6 +-
 modules/orientdb/build.gradle                 | 10 +--
 modules/postgresql/build.gradle               | 12 ++--
 modules/presto/build.gradle                   |  6 +-
 modules/pulsar/build.gradle                   |  8 +--
 modules/r2dbc/build.gradle                    | 14 ++---
 modules/rabbitmq/build.gradle                 |  6 +-
 modules/selenium/build.gradle                 | 12 ++--
 modules/solr/build.gradle                     |  4 +-
 modules/spock/build.gradle                    | 18 +++---
 modules/toxiproxy/build.gradle                | 10 +--
 modules/trino/build.gradle                    |  6 +-
 modules/vault/build.gradle                    |  8 +--
 48 files changed, 254 insertions(+), 217 deletions(-)
 create mode 100644 buildSrc/build.gradle
 create mode 100644 buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy

diff --git a/.gitignore b/.gitignore
index 1b6070306a2..aa9fdf33f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ node_modules/
 
 .gradle/
 build/
+!buildSrc/src/main/groovy/org/testcontainers/build
 out/
 *.class
 
diff --git a/build.gradle b/build.gradle
index c51b24909cb..40f5bfed399 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,13 @@
 plugins {
-    id 'io.franzbecker.gradle-lombok' version '3.1.0'
-    id 'nebula.provided-base' version '3.0.3'
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'io.franzbecker.gradle-lombok' version '4.0.0'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
     id "com.jfrog.bintray" version "1.8.4" apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
 
 subprojects {
-    apply plugin: 'nebula.provided-base'
-    apply plugin: 'java'
+    apply plugin: 'java-library'
     apply plugin: 'idea'
     apply plugin: 'io.franzbecker.gradle-lombok'
     apply plugin: 'com.github.johnrengelman.shadow'
@@ -26,8 +24,13 @@ subprojects {
         mavenCentral()
     }
 
+    configurations {
+        provided
+        api.extendsFrom(provided)
+    }
+
     lombok {
-        version = '1.18.12'
+        version = '1.18.20'
     }
 
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
@@ -98,7 +101,7 @@ subprojects {
 
     shadowJar {
         configurations = []
-        classifier = null
+        archiveClassifier.set(null)
 
         doFirst {
             // See https://github.com/johnrengelman/shadow/blob/5.0.0/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ConfigureShadowRelocation.groovy
@@ -128,6 +131,6 @@ subprojects {
     }
 
     dependencies {
-        testCompile 'ch.qos.logback:logback-classic:1.2.3'
+        testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     }
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 00000000000..13414d46a22
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id 'java-gradle-plugin'
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy b/buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy
new file mode 100644
index 00000000000..1bb71ca8f52
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy
@@ -0,0 +1,35 @@
+package org.testcontainers.build
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+
+class ComparePOMWithLatestReleasedTask extends DefaultTask {
+
+    @Input
+    Set<String> ignore = []
+
+    @TaskAction
+    def doCompare() {
+        def rootNode = new XmlSlurper().parse(project.tasks.generatePomFileForMavenJavaPublication.destination)
+
+        def artifactId = rootNode.artifactId.text()
+
+        def latestRelease = new XmlSlurper()
+            .parse("https://repo1.maven.org/maven2/org/testcontainers/${artifactId}/maven-metadata.xml")
+            .versioning.release.text()
+
+        def releasedRootNode = new XmlSlurper()
+            .parse("https://repo1.maven.org/maven2/org/testcontainers/${artifactId}/${latestRelease}/${artifactId}-${latestRelease}.pom")
+
+        Set<String> dependencies = releasedRootNode.dependencies.children()
+            .collect { "${it.groupId.text()}:${it.artifactId.text()}".toString() }
+
+        for (dependency in rootNode.dependencies.children()) {
+            def coordinates = "${dependency.groupId.text()}:${dependency.artifactId.text()}".toString()
+            if (!dependencies.contains(coordinates) && !ignore.contains(coordinates)) {
+                throw new IllegalStateException("A new dependency '${coordinates}' has been added to 'org.testcontainers:${artifactId}' - if this was intentional please add it to the ignore list in ${project.buildFile}")
+            }
+        }
+    }
+}
diff --git a/core/build.gradle b/core/build.gradle
index 059202e1b41..d260ae5317a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -26,7 +26,7 @@ idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs
 configurations {
     baseline
     shaded
-    [runtime, compileOnly, testCompile]*.extendsFrom shaded
+    [api, compileOnly, testCompile]*.extendsFrom shaded
 }
 
 shadowJar {
@@ -34,33 +34,16 @@ shadowJar {
 
     mergeServiceFiles()
 
-    exclude 'org/newsclub/**'
-
     [
         'META-INF/NOTICE',
         'META-INF/NOTICE.txt',
         'META-INF/LICENSE',
         'META-INF/LICENSE.txt',
-        'META-INF/DEPENDENCIES',
         'META-INF/maven/',
         'META-INF/proguard/',
         'META-INF/versions/*/module-info.class',
-        'META-INF/services/README.md',
-        'META-INF/services/com.fasterxml.jackson.core.*',
-        'META-INF/services/com.github.dockerjava.api.command.*',
-        'META-INF/services/javax.ws.rs.ext.*',
         'META-INF/services/java.security.Provider',
-        'mozilla/public-suffix-list.txt',
-        'module-info.class',
     ].each { exclude(it) }
-
-    project.afterEvaluate {
-        dependencies {
-            for (id in project.configurations.compile.resolvedConfiguration.resolvedArtifacts*.moduleVersion*.id) {
-                exclude(dependency("${id.group}:${id.name}"))
-            }
-        }
-    }
 }
 
 task jarFileTest(type: Test) {
@@ -169,16 +152,16 @@ dependencies {
         exclude group: "*", module: "*"
     }
 
-    compile 'junit:junit:4.12'
-    compile 'org.slf4j:slf4j-api:1.7.30'
+    api 'junit:junit:4.12'
+    api 'org.slf4j:slf4j-api:1.7.30'
     compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompileClasspath 'org.jetbrains:annotations:20.0.0'
-    compile 'org.apache.commons:commons-compress:1.20'
-    compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
+    api 'org.apache.commons:commons-compress:1.20'
+    api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    compile "com.github.docker-java:docker-java-api:3.2.8"
+    api "com.github.docker-java:docker-java-api:3.2.8"
 
     shaded ('com.github.docker-java:docker-java-core:3.2.8') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
@@ -195,7 +178,7 @@ dependencies {
         exclude(group: 'org.slf4j')
     }
 
-    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.8'
+    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.8'
 
     shaded "org.yaml:snakeyaml:1.27"
 
@@ -205,24 +188,31 @@ dependencies {
         exclude(group: 'org.slf4j')
     }
 
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.6.0'
-    testCompile 'com.rabbitmq:amqp-client:5.9.0'
-    testCompile 'org.mongodb:mongo-java-driver:3.12.7'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
+    testImplementation 'redis.clients:jedis:3.6.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.9.0'
+    testImplementation 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testCompile ('org.mockito:mockito-core:3.10.0') {
+    testImplementation ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
-    testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
+    testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testCompile 'org.assertj:assertj-core:3.18.1'
-    testCompile project(':test-support')
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
-    jarFileTestCompile 'junit:junit:4.12'
-    jarFileTestCompile 'org.assertj:assertj-core:3.18.1'
-    jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
+    jarFileTestImplementation 'junit:junit:4.12'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.18.1'
+    jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
+
+tasks.generatePomFileForMavenJavaPublication.finalizedBy(
+    tasks.register('checkPOMdependencies', org.testcontainers.build.ComparePOMWithLatestReleasedTask) {
+        ignore = [
+        ]
+    }
+)
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index bf203a8fefa..7551c6e578e 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
+    api "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
     testImplementation "junit:junit:4.12"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 409b766b758..348f4788555 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.1.1.RELEASE"
+    api "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.4.2"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 398a6d3fa1c..1bff637a7fb 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compile "io.lettuce:lettuce-core:5.2.0.RELEASE"
+    api "io.lettuce:lettuce-core:5.2.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 622ab64a3cb..0f80bbf516c 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 491b5c2f214..6ba1a966dae 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -9,9 +9,9 @@ repositories {
 dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.20"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
-    testCompile 'org.testcontainers:kafka'
-    testCompile 'org.apache.kafka:kafka-clients:2.3.1'
-    testCompile 'org.assertj:assertj-core:3.14.0'
-    testCompile 'com.google.guava:guava:23.0'
-    testCompile 'org.slf4j:slf4j-simple:1.7.30'
+    testImplementation 'org.testcontainers:kafka'
+    testImplementation 'org.apache.kafka:kafka-clients:2.3.1'
+    testImplementation 'org.assertj:assertj-core:3.14.0'
+    testImplementation 'com.google.guava:guava:23.0'
+    testImplementation 'org.slf4j:slf4j-simple:1.7.30'
 }
diff --git a/gradle.properties b/gradle.properties
index dad41a4425a..397b832391e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,3 @@
 org.gradle.parallel=false
 org.gradle.caching=true
+
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 3acdeb10c88..84fad9994e5 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -72,7 +72,7 @@ publishing {
                     }
                 }
 
-                project.configurations.compile.dependencies.each { addDependency(it, 'compile') }
+                project.configurations.api.dependencies.each { addDependency(it, 'compile') }
                 project.configurations.provided.dependencies.each { addDependency(it, 'provided') }
             }
         }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6fd47cc3de5..4a66b0f1980 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Sun Apr 05 19:28:23 BST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 9704a05b69d..a5427aaea07 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -1,6 +1,6 @@
 description = "TestContainers :: Cassandra"
 
 dependencies {
-    compile project(":database-commons")
-    compile "com.datastax.cassandra:cassandra-driver-core:3.7.1"
+    api project(":database-commons")
+    api "com.datastax.cassandra:cassandra-driver-core:3.7.1"
 }
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 323475b1d1c..7eb68eb2e51 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: ClickHouse"
 
 dependencies {
-    compile project(':testcontainers')
-    compile project(':jdbc')
+    api project(':testcontainers')
+    api project(':jdbc')
 
-    testCompile project(':jdbc-test')
-    testCompile 'ru.yandex.clickhouse:clickhouse-jdbc:0.2.4'
+    testImplementation project(':jdbc-test')
+    testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.2.4'
 }
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index a3927258679..5222208fae0 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: CockroachDB"
 
 dependencies {
-    compile project(':jdbc')
+    api project(':jdbc')
 
-    testCompile project(':jdbc-test')
-    testCompile 'org.postgresql:postgresql:42.2.12'
+    testImplementation project(':jdbc-test')
+    testImplementation 'org.postgresql:postgresql:42.2.12'
 }
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 9cb778fd479..88eb537269d 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: Couchbase"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile 'com.couchbase.client:java-client:2.7.15'
+    testImplementation 'com.couchbase.client:java-client:2.7.15'
 }
diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 0eecc1844d0..7bba8548c95 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: Database-Commons"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
 }
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index feaf5f790c5..9d5d8a61ab0 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: DB2"
 
 dependencies {
-    compile project(':jdbc')
+    api project(':jdbc')
 
-    testCompile project(':jdbc-test')
-    testCompile 'com.ibm.db2:jcc:11.5.0.0'
+    testImplementation project(':jdbc-test')
+    testImplementation 'com.ibm.db2:jcc:11.5.0.0'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 58a16a0b62b..e3a49df5be2 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -1,10 +1,10 @@
 description = "Testcontainers :: Dynalite"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'
 
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 21db8e69545..e66e045ead4 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -1,8 +1,8 @@
 description = "TestContainers :: elasticsearch"
 
 dependencies {
-    compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.13.0"
-    testCompile "org.elasticsearch.client:transport:7.12.1"
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    api project(':testcontainers')
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.13.0"
+    testImplementation "org.elasticsearch.client:transport:7.12.1"
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index aa42d7dc560..11e68824c34 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -1,12 +1,12 @@
 description = "Testcontainers :: GCloud"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile 'com.google.cloud:google-cloud-datastore:1.102.4'
-    testCompile 'com.google.cloud:google-cloud-firestore:1.33.0'
-    testCompile 'com.google.cloud:google-cloud-pubsub:1.105.0'
-    testCompile 'com.google.cloud:google-cloud-spanner:1.50.0'
-    testCompile 'com.google.cloud:google-cloud-bigtable:1.17.3'
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:1.102.4'
+    testImplementation 'com.google.cloud:google-cloud-firestore:1.33.0'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.105.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:1.50.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:1.17.3'
+    testImplementation 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 2e735e1137a..704bf960724 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: InfluxDB"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
     compileOnly 'org.influxdb:influxdb-java:2.21'
-    testCompile 'org.influxdb:influxdb-java:2.21'
+    testImplementation 'org.influxdb:influxdb-java:2.21'
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 3dd0d52f2e8..3da4eb0f691 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,20 +1,20 @@
 dependencies {
-    compile project(':jdbc')
-    compile project(':test-support')
+    api project(':jdbc')
+    api project(':test-support')
 
-    compile 'com.google.guava:guava:30.1-jre'
-    compile 'org.apache.commons:commons-lang3:3.12.0'
-    compile 'com.zaxxer:HikariCP-java6:2.3.13'
-    compile 'commons-dbutils:commons-dbutils:1.7'
+    api 'com.google.guava:guava:30.1-jre'
+    api 'org.apache.commons:commons-lang3:3.12.0'
+    api 'com.zaxxer:HikariCP-java6:2.3.13'
+    api 'commons-dbutils:commons-dbutils:1.7'
 
-    compile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
+    api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
-    compile('org.rnorth.visible-assertions:visible-assertions:2.1.2') {
+    api('org.rnorth.visible-assertions:visible-assertions:2.1.2') {
         // Excluded in favor of jna-platform
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    compile 'org.apache.tomcat:tomcat-jdbc:9.0.40'
-    compile 'org.vibur:vibur-dbcp:25.0'
-    compile 'mysql:mysql-connector-java:8.0.25'
+    api 'org.apache.tomcat:tomcat-jdbc:9.0.40'
+    api 'org.vibur:vibur-dbcp:25.0'
+    api 'mysql:mysql-connector-java:8.0.25'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 1152b2a5e93..16b95af77bf 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -1,15 +1,15 @@
 description = "Testcontainers :: JDBC"
 
 dependencies {
-    compile project(':database-commons')
-    testCompile project(':test-support')
+    api project(':database-commons')
+    testImplementation project(':test-support')
 
     compileOnly 'org.jetbrains:annotations:21.0.1'
-    testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.vibur:vibur-dbcp:25.0'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.6'
-    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.19.0'
+    testImplementation 'commons-dbutils:commons-dbutils:1.7'
+    testImplementation 'org.vibur:vibur-dbcp:25.0'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.6'
+    testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
+    testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index b06972371ff..ad74eb3ec26 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -1,23 +1,23 @@
 description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
-    compile project(':testcontainers')
-    compile 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+    api project(':testcontainers')
+    api 'org.junit.jupiter:junit-jupiter-api:5.7.1'
 
-    testCompile project(':mysql')
-    testCompile project(':postgresql')
-    testCompile 'com.zaxxer:HikariCP:4.0.3'
-    testCompile 'redis.clients:jedis:3.6.0'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
-    testCompile ('org.mockito:mockito-core:3.10.0') {
+    testImplementation project(':mysql')
+    testImplementation project(':postgresql')
+    testImplementation 'com.zaxxer:HikariCP:4.0.3'
+    testImplementation 'redis.clients:jedis:3.6.0'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')
     }
-    testCompile 'org.assertj:assertj-core:3.18.1'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.7.1'
+    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1'
 
-    testRuntime 'org.postgresql:postgresql:42.2.20'
-    testRuntime 'mysql:mysql-connector-java:8.0.25'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
 
 test {
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index db400c0b557..56abadbce47 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: Kafka"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.8.0'
-    testCompile 'org.assertj:assertj-core:3.18.1'
-    testCompile 'com.google.guava:guava:23.0'
+    testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
+    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'com.google.guava:guava:23.0'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 3948f1443b2..503a3a7bf49 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -1,12 +1,12 @@
 description = "Testcontainers :: Localstack"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
     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.12.1'
-    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.16.62'
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.11.807'
+    testImplementation 'software.amazon.awssdk:s3:2.16.62'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index 17d912b826c..ca267a1fe7c 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -4,14 +4,14 @@ dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
-    compile project(':jdbc')
+    api project(':jdbc')
 
     compileOnly project(':r2dbc')
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.1'
 
-    testCompile project(':jdbc-test')
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
+    testImplementation project(':jdbc-test')
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
 
-    testCompile testFixtures(project(':r2dbc'))
-    testCompile 'org.mariadb:r2dbc-mariadb:1.0.0'
+    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation 'org.mariadb:r2dbc-mariadb:1.0.0'
 }
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index e13343559f5..9ea504ca74a 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: MockServer"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile 'org.mock-server:mockserver-client-java:5.5.4'
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.mock-server:mockserver-client-java:5.5.4'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 57db1be21de..e332badb68b 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: MongoDB"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile("org.mongodb:mongodb-driver-sync:4.0.2")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.0.2")
 }
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 143a6582ae1..74e77d474e9 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -4,18 +4,18 @@ dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
-    compile project(':jdbc')
+    api project(':jdbc')
 
     compileOnly project(':r2dbc')
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.6.RELEASE'
 
-    testCompile project(':jdbc-test')
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
+    testImplementation project(':jdbc-test')
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
 
-    testCompile project(':r2dbc')
-    testCompile 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'
+    testImplementation project(':r2dbc')
+    testImplementation 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
-    testCompile testFixtures(project(':r2dbc'))
-    testCompile 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
+    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
 }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 91a7d2c9918..a14fa678280 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -4,16 +4,16 @@ dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
-    compile project(':jdbc')
+    api project(':jdbc')
 
     compileOnly project(':r2dbc')
     compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
-    testCompile project(':jdbc-test')
-    testCompile 'mysql:mysql-connector-java:8.0.25'
+    testImplementation project(':jdbc-test')
+    testImplementation 'mysql:mysql-connector-java:8.0.25'
 
-    testCompile testFixtures(project(':r2dbc'))
-    testCompile 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
+    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:21.0.1'
 }
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 722e5474388..f556c96095a 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -31,8 +31,8 @@ test.dependsOn customNeo4jPluginJar
 dependencies {
     customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.9"
 
-    compile project(":testcontainers")
+    api project(":testcontainers")
 
-    testCompile "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testCompile 'org.assertj:assertj-core:3.19.0'
+    testImplementation "org.neo4j.driver:neo4j-java-driver:1.7.5"
+    testImplementation 'org.assertj:assertj-core:3.19.0'
 }
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index c0fe33a8258..5bfcfae910b 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: Nginx"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:21.0.1'
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 026521e9a0c..5a6040ac81f 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: Oracle XE"
 
 dependencies {
-    compile project(':jdbc')
+    api project(':jdbc')
 
-    testCompile project(':jdbc-test')
-    testCompile 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
+    testImplementation project(':jdbc-test')
+    testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
 }
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index ffa1350172a..5be59938603 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -1,11 +1,11 @@
 description = "TestContainers :: Orientdb"
 
 dependencies {
-    compile project(":testcontainers")
+    api project(":testcontainers")
 
-    compile "com.orientechnologies:orientdb-client:3.0.24"
+    api "com.orientechnologies:orientdb-client:3.0.24"
 
-    testCompile 'org.assertj:assertj-core:3.12.0'
-    testCompile 'org.apache.tinkerpop:gremlin-driver:3.3.4'
-    testCompile "com.orientechnologies:orientdb-gremlin:3.0.18"
+    testImplementation 'org.assertj:assertj-core:3.12.0'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.3.4'
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.0.18"
 }
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index c01cd67df48..fe9e58820d8 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -4,17 +4,17 @@ dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
-    compile project(':jdbc')
+    api project(':jdbc')
 
     compileOnly project(':r2dbc')
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.8.RELEASE'
 
-    testCompile project(':jdbc-test')
-    testCompile project(':test-support')
-    testCompile 'org.postgresql:postgresql:42.2.18'
+    testImplementation project(':jdbc-test')
+    testImplementation project(':test-support')
+    testImplementation 'org.postgresql:postgresql:42.2.18'
 
-    testCompile testFixtures(project(':r2dbc'))
-    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
+    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:21.0.1'
 }
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 4130fb74891..1db76199969 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: Presto"
 
 dependencies {
-    compile project(':jdbc')
+    api project(':jdbc')
 
-    testCompile project(':jdbc-test')
-    testCompile 'io.prestosql:presto-jdbc:331'
+    testImplementation project(':jdbc-test')
+    testImplementation 'io.prestosql:presto-jdbc:331'
     compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 10fe90dadf9..92cf910f259 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: Pulsar"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
-    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
-    testCompile group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index a7388ebc6d2..21d3c1894e4 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -8,13 +8,13 @@ dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
     compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
 
-    compile project(':testcontainers')
-    compile 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
+    api project(':testcontainers')
+    api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
-    testCompile 'org.assertj:assertj-core:3.14.0'
-    testCompile 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
-    testCompile project(':postgresql')
+    testImplementation 'org.assertj:assertj-core:3.14.0'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
+    testImplementation project(':postgresql')
 
-    testFixturesCompile 'io.projectreactor:reactor-core:3.3.4.RELEASE'
-    testFixturesCompile 'org.assertj:assertj-core:3.14.0'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE'
+    testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
 }
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 73524c2da18..13638b51b97 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -1,8 +1,8 @@
 description = "TestContainers :: RabbitMQ"
 
 dependencies {
-    compile project(":testcontainers")
-    testCompile 'com.rabbitmq:amqp-client:5.7.0'
-    testCompile 'org.assertj:assertj-core:3.12.2'
+    api project(":testcontainers")
+    testImplementation 'com.rabbitmq:amqp-client:5.7.0'
+    testImplementation 'org.assertj:assertj-core:3.12.2'
     compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index e9e4bf2d4a5..f91bb361775 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -1,16 +1,16 @@
 description = "Testcontainers :: Selenium"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
     provided 'org.seleniumhq.selenium:selenium-remote-driver:3.141.59'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
-    testCompile 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
-    testCompile 'org.seleniumhq.selenium:selenium-support:3.141.59'
+    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
+    testImplementation 'org.seleniumhq.selenium:selenium-support:3.141.59'
 
-    testCompile 'org.mortbay.jetty:jetty:6.1.26'
-    testCompile project(':nginx')
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.mortbay.jetty:jetty:6.1.26'
+    testImplementation project(':nginx')
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
     compileOnly 'org.jetbrains:annotations:21.0.1'
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index af3193be52a..76535a2b7c8 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: Solr"
 
 dependencies {
-    compile project(':testcontainers')
-    testCompile 'org.apache.solr:solr-solrj:8.3.0'
+    api project(':testcontainers')
+    testImplementation 'org.apache.solr:solr-solrj:8.3.0'
 
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 8c065e389cd..013a79dbc59 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -5,18 +5,18 @@ plugins {
 description = "Testcontainers :: Spock-Extension"
 
 dependencies {
-    compile project(':testcontainers')
-    compile 'org.spockframework:spock-core:1.3-groovy-2.5'
+    api project(':testcontainers')
+    api 'org.spockframework:spock-core:1.3-groovy-2.5'
 
-    testCompile project(':selenium')
-    testCompile project(':mysql')
-    testCompile project(':postgresql')
+    testImplementation project(':selenium')
+    testImplementation project(':mysql')
+    testImplementation project(':postgresql')
 
-    testCompile 'com.zaxxer:HikariCP:4.0.3'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation 'com.zaxxer:HikariCP:4.0.3'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntime 'org.postgresql:postgresql:42.2.18'
-    testRuntime 'mysql:mysql-connector-java:8.0.25'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.18'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
 
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'
 }
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 47221d68e40..3d7d110609b 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -1,11 +1,11 @@
 description = "Testcontainers :: Toxiproxy"
 
 dependencies {
-    compile project(':testcontainers')
-    compile 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.4'
+    api project(':testcontainers')
+    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.4'
 
-    testCompile 'redis.clients:jedis:3.0.1'
-    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'redis.clients:jedis:3.0.1'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    testCompile project(':test-support')
+    testImplementation project(':test-support')
 }
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index d726cbc8e76..5a3b733934f 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: Trino"
 
 dependencies {
-    compile project(':jdbc')
+    api project(':jdbc')
 
-    testCompile project(':jdbc-test')
-    testCompile 'io.trino:trino-jdbc:352'
+    testImplementation project(':jdbc-test')
+    testImplementation 'io.trino:trino-jdbc:352'
     compileOnly 'org.jetbrains:annotations:20.0.0'
 }
diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 17edbd3f3fd..50797658fbb 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -1,10 +1,10 @@
 description = "Testcontainers :: Vault"
 
 dependencies {
-    compile project(':testcontainers')
+    api project(':testcontainers')
 
-    testCompile 'com.bettercloud:vault-java-driver:5.1.0'
-    testCompile 'io.rest-assured:rest-assured:4.4.0'
-    testCompile 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
+    testImplementation 'io.rest-assured:rest-assured:4.4.0'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
 
 }

From 636b7f9c9eea5e98c3d8be9c902e9890cb0ae710 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:21 +0000
Subject: [PATCH 1283/4969] Bump guava from 30.1-jre to 30.1.1-jre in /core

Bumps [guava](https://github.com/google/guava) from 30.1-jre to 30.1.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d260ae5317a..7f10e4847de 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:30.1-jre'
+        classpath 'com.google.guava:guava:30.1.1-jre'
     }
 }
 

From d4e5687da81bab1d8f6352c261512b516b6a86f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:22 +0000
Subject: [PATCH 1284/4969] Bump guava from 30.1-jre to 30.1.1-jre in
 /modules/jdbc-test

Bumps [guava](https://github.com/google/guava) from 30.1-jre to 30.1.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3da4eb0f691..98ee2ce0880 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
     api project(':test-support')
 
-    api 'com.google.guava:guava:30.1-jre'
+    api 'com.google.guava:guava:30.1.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.7'

From bb9ead01af722fa6c52d84b1461b0656b0ec21bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:24 +0000
Subject: [PATCH 1285/4969] Bump amqp-client from 5.9.0 to 5.12.0 in /core

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.9.0 to 5.12.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.9.0...v5.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d260ae5317a..3d273fc62f0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -190,7 +190,7 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:3.6.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.9.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.12.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.7'
 
     testImplementation ('org.mockito:mockito-core:3.10.0') {

From aaad895f8ee1550a2e2d2fd7fb0ed5d43f52f87e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:25 +0000
Subject: [PATCH 1286/4969] Bump snakeyaml from 1.27 to 1.29 in /core

Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.27 to 1.29.
- [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.29..snakeyaml-1.27)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d260ae5317a..7d05b168ea3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -180,7 +180,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep:3.2.8'
 
-    shaded "org.yaml:snakeyaml:1.27"
+    shaded "org.yaml:snakeyaml:1.29"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 345b9f76bdceb0a4a7ef0dae880a3e2d4fc2e722 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:25 +0000
Subject: [PATCH 1287/4969] Bump kafka-clients from 2.3.1 to 2.8.0 in /examples

Bumps kafka-clients from 2.3.1 to 2.8.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 6ba1a966dae..1ba81fda105 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.20"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:2.3.1'
+    testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
     testImplementation 'org.assertj:assertj-core:3.14.0'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.slf4j:slf4j-simple:1.7.30'

From d60123822c81b77fda450cbac74840d85cb51237 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:26 +0000
Subject: [PATCH 1288/4969] Bump postgresql from 42.2.18 to 42.2.20 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.18 to 42.2.20.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.20/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.18...REL42.2.20)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 013a79dbc59..214005466ce 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.18'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
 
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'

From 0c775ca5517c6487683b164b25c2646f1046f76b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:27 +0000
Subject: [PATCH 1289/4969] Bump postgresql from 42.2.18 to 42.2.20 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.18 to 42.2.20.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.20/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.18...REL42.2.20)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 fe9e58820d8..c44dbe7d009 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.2.18'
+    testImplementation 'org.postgresql:postgresql:42.2.20'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'

From d2370c82ee22e0fab74776b55cf92f2fa77be0b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:34 +0000
Subject: [PATCH 1290/4969] Bump jedis from 3.4.0 to 3.6.0 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 3.4.0 to 3.6.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.4.0...jedis-3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 42553843710..c19c5b22f23 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.4.0'
+    implementation 'redis.clients:jedis:3.6.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index de1e2d8a0a8..a968a6d2bf3 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.4.0'
+    implementation 'redis.clients:jedis:3.6.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 54a16b25230..dfbe856ea62 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.4.0'
+    implementation 'redis.clients:jedis:3.6.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.30'

From 80a082661b470a526e89037c26a54d14a2a235ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:36 +0000
Subject: [PATCH 1291/4969] Bump tomcat-jdbc from 9.0.40 to 10.0.6 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 9.0.40 to 10.0.6.

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3da4eb0f691..8ccf8ee5f88 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:9.0.40'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.6'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.25'
 }

From 6df46bf62622098c3a7286fa6d510bd9bb67867f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:39 +0000
Subject: [PATCH 1292/4969] Bump annotations from 20.1.0 to 21.0.1 in /examples

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/mongodb-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 8a4c727f069..8d8c8731c86 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -9,5 +9,5 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testCompileClasspath 'org.jetbrains:annotations:20.1.0'
+    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
 }

From 89a336843c555480ba9e8af2683bea1a464dff23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:40 +0000
Subject: [PATCH 1293/4969] Bump spock-core from 1.3-groovy-2.5 to
 2.0-groovy-3.0 in /modules/spock

Bumps spock-core from 1.3-groovy-2.5 to 2.0-groovy-3.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 013a79dbc59..e51bb311d4d 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -6,7 +6,7 @@ description = "Testcontainers :: Spock-Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.spockframework:spock-core:1.3-groovy-2.5'
+    api 'org.spockframework:spock-core:2.0-groovy-3.0'
 
     testImplementation project(':selenium')
     testImplementation project(':mysql')

From 66ef00a5573c3e20890562c4dc2fb2b8023ee3c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:43 +0000
Subject: [PATCH 1294/4969] Bump junit-jupiter-api from 5.7.1 to 5.7.2 in
 /modules/junit-jupiter

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.7.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ad74eb3ec26..3bd78867f70 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+    api 'org.junit.jupiter:junit-jupiter-api:5.7.2'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')

From 685997b28fa7d3c5eedb62db365f664bff5fdc24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:44 +0000
Subject: [PATCH 1295/4969] Bump postgresql from 42.2.18 to 42.2.20 in
 /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.18 to 42.2.20.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.18...REL42.2.20)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b3d339d4db8..edb545e79d3 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
-    testImplementation 'org.postgresql:postgresql:42.2.18'
+    testImplementation 'org.postgresql:postgresql:42.2.20'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From a7a6c18843c00756b56101b69c59f24c01f52791 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:45 +0000
Subject: [PATCH 1296/4969] Bump transport from 7.12.1 to 7.13.1 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.12.1 to 7.13.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.1...v7.13.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index e66e045ead4..e1921e755f8 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -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.12.1"
+    testImplementation "org.elasticsearch.client:transport:7.13.1"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From a8156a0f413ec5094a03524ffff4c09abb1032db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:45 +0000
Subject: [PATCH 1297/4969] Bump junit-jupiter-params from 5.7.1 to 5.7.2 in
 /modules/junit-jupiter

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.7.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ad74eb3ec26..5f242c549ae 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.18.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'

From 7c7829072f34992b7607b211a94afc2b049c6eae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:46 +0000
Subject: [PATCH 1298/4969] Bump s3 from 2.16.62 to 2.16.80 in
 /modules/localstack

Bumps s3 from 2.16.62 to 2.16.80.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 503a3a7bf49..87cc407468d 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testImplementation 'software.amazon.awssdk:s3:2.16.62'
+    testImplementation 'software.amazon.awssdk:s3:2.16.80'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 04baf3743197ec8cdfb8a70be66054d0a2376d07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:48 +0000
Subject: [PATCH 1299/4969] Bump clickhouse-jdbc from 0.2.4 to 0.3.1-patch in
 /modules/clickhouse

Bumps [clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-jdbc) from 0.2.4 to 0.3.1-patch.
- [Release notes](https://github.com/ClickHouse/clickhouse-jdbc/releases)
- [Changelog](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/ClickHouse/clickhouse-jdbc/compare/release_0.2.4...v0.3.1-patch)

---
updated-dependencies:
- dependency-name: ru.yandex.clickhouse:clickhouse-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 7eb68eb2e51..39b269d794b 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,5 +5,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.2.4'
+    testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.1-patch'
 }

From b77e22f81fcb0308a99c9c9c6e54e9f9dbbb270f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:49:51 +0000
Subject: [PATCH 1300/4969] Bump annotations from 20.1.0 to 21.0.1 in /core

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index d260ae5317a..a02aad3ddf7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -154,8 +154,8 @@ dependencies {
 
     api 'junit:junit:4.12'
     api 'org.slf4j:slf4j-api:1.7.30'
-    compileOnly 'org.jetbrains:annotations:20.1.0'
-    testCompileClasspath 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
+    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
     api 'org.apache.commons:commons-compress:1.20'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From 4d93101cbbbe1dd97da88d86006d51a5a4ec9884 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 9 Jun 2021 22:21:44 +0200
Subject: [PATCH 1301/4969] Cleanup japicmp excludes (#4192)

---
 core/build.gradle | 59 +++--------------------------------------------
 1 file changed, 3 insertions(+), 56 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index d260ae5317a..353df75b0c4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -72,64 +72,11 @@ task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
         "org.testcontainers.shaded.*",
     ]
 
-    // TODO remove once 1.15.0 is released
-    classExcludes = [
-        "org.testcontainers.containers.AmbassadorContainer",
-        "org.testcontainers.containers.traits.VncService",
-        "org.testcontainers.containers.wait.HostPortWaitStrategy",
-        "org.testcontainers.containers.wait.HttpWaitStrategy",
-        "org.testcontainers.containers.wait.LogMessageWaitStrategy",
-        "org.testcontainers.containers.wait.Wait",
-        "org.testcontainers.containers.wait.WaitAllStrategy",
-        "org.testcontainers.containers.wait.WaitStrategy",
-        "org.testcontainers.dockerclient.AuditLoggingDockerClient",
-        "org.testcontainers.dockerclient.LogToStringContainerCallback",
-        "org.testcontainers.dockerclient.DockerMachineClientProviderStrategy",
-        "org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy",
-        "org.testcontainers.dockerclient.NpipeSocketClientProviderStrategy",
-        "org.testcontainers.dockerclient.ProxiedUnixSocketClientProviderStrategy",
-        "org.testcontainers.dockerclient.WindowsClientProviderStrategy",
-        "org.testcontainers.dockerclient.UnixSocketClientProviderStrategy",
-        "org.testcontainers.dockerclient.auth.AuthDelegatingDockerClientConfig",
-        "org.testcontainers.containers.GenericContainer\$AbstractWaitStrategy",
-        "org.testcontainers.dockerclient.transport.okhttp.NamedPipeSocketFactory",
-        "org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory",
-        "org.testcontainers.dockerclient.transport.okhttp.UnixSocketFactory",
-        "org.testcontainers.containers.output.FrameConsumerResultCallback",
-        "org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback",
-    ]
-
-    methodExcludes = [
-        "org.testcontainers.dockerclient.DockerClientConfigUtils#getDetectedDockerHostIp()",
-        "org.testcontainers.dockerclient.DockerClientConfigUtils#getDockerHostIpAddress(com.github.dockerjava.core.DockerClientConfig)",
-
-        "org.testcontainers.dockerclient.DockerClientProviderStrategy#checkOSType()",
-        "org.testcontainers.dockerclient.DockerClientProviderStrategy#getClientForConfig(com.github.dockerjava.core.DockerClientConfig)",
-        "org.testcontainers.dockerclient.DockerClientProviderStrategy#ping(com.github.dockerjava.api.DockerClient, int)",
-        "org.testcontainers.dockerclient.DockerClientProviderStrategy#test()",
-
-        "org.testcontainers.dockerclient.UnixSocketClientProviderStrategy#tryConfiguration(java.lang.String)",
-
-        "org.testcontainers.utility.ResourceReaper#start(java.lang.String, com.github.dockerjava.api.DockerClient, boolean)",
+    classExcludes = []
 
-        "org.testcontainers.containers.Container#fetchDockerDaemonInfo()",
-        "org.testcontainers.containers.Container#getDockerDaemonInfo()",
+    methodExcludes = []
 
-        "org.testcontainers.containers.GenericContainer#fetchDockerDaemonInfo()",
-        "org.testcontainers.containers.GenericContainer#getDockerDaemonInfo()",
-
-        "org.testcontainers.containers.Container\$ExecResult#Container\$ExecResult(java.lang.String, java.lang.String)",
-    ]
-
-    fieldExcludes = [
-        "org.testcontainers.containers.GenericContainer#containerId",
-        "org.testcontainers.containers.GenericContainer#containerName",
-        "org.testcontainers.containers.GenericContainer#dockerDaemonInfo",
-
-        "org.testcontainers.dockerclient.DockerClientProviderStrategy#LOGGER",
-        "org.testcontainers.dockerclient.DockerClientProviderStrategy#client",
-        "org.testcontainers.dockerclient.DockerClientProviderStrategy#config",
-    ]
+    fieldExcludes = []
 
     onlyBinaryIncompatibleModified = true
     htmlOutputFile = file("$buildDir/reports/japi.html")

From b86410e694f54c28ecf2c25448ff86c7b37c82ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:19:18 +0000
Subject: [PATCH 1302/4969] Bump assertj-core from 3.18.1 to 3.19.0 in
 /modules/pulsar

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 92cf910f259..61e1208381d 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }

From c903ae0b17c82f18153b99d0a65f163d0c88079c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:19:21 +0000
Subject: [PATCH 1303/4969] Bump assertj-core from 3.14.0 to 3.19.0 in
 /examples

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.14.0 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 1ba81fda105..cb1e9e31e7b 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.14.0'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.slf4j:slf4j-simple:1.7.30'
 }

From c75a9dc96d523b119d4b513e8b6d9e9a23e999a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:19:24 +0000
Subject: [PATCH 1304/4969] Bump assertj-core from 3.18.1 to 3.19.0 in
 /modules/kafka

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 56abadbce47..bb112755352 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'com.google.guava:guava:23.0'
 }

From ae8926f712815790cc80c5defd73ad44641de1cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:19:37 +0000
Subject: [PATCH 1305/4969] Bump assertj-core from 3.18.1 to 3.19.0 in /core

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1c469f379d1..adc97a6c69f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -147,7 +147,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"

From edbad59ef7e7874c17b2c976858bb742ea93864e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:19:41 +0000
Subject: [PATCH 1306/4969] Bump assertj-core from 3.18.1 to 3.19.0 in
 /modules/junit-jupiter

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.18.1 to 3.19.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.18.1...assertj-core-3.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a21a97824ed..ab2477ed883 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.20'

From eac7bbb963ee8233a90e537b495c2fa7e5a0ef86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:33:37 +0000
Subject: [PATCH 1307/4969] Bump org.springframework.boot from 2.4.1 to 2.5.0
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index a671c1832fe..bcd2f97100b 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.4.1'
+    id 'org.springframework.boot' version '2.5.0'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 61a74a3950e..3f3469f8548 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.4.1"
+    id("org.springframework.boot") version "2.5.0"
     id("org.jetbrains.kotlin.jvm") version "1.5.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index ce2c028f83a..33f5b9aa878 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.4.1'
+    id 'org.springframework.boot' version '2.5.0'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 618dd80ac383221c18022548bfd7a20ad7695ce0 Mon Sep 17 00:00:00 2001
From: Fedor Korotkov <fedor@cirruslabs.org>
Date: Mon, 14 Jun 2021 05:37:17 -0400
Subject: [PATCH 1308/4969] Fixed NPE when `getContextClassLoader()` returns
 `null` (#4193)

---
 .../main/java/org/testcontainers/utility/MountableFile.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 1982538f45d..071d36631b0 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -130,6 +130,10 @@ private static URL getClasspathResource(@NotNull final String resourcePath, @Not
         classLoadersToSearch.add(MountableFile.class.getClassLoader());
 
         for (final ClassLoader classLoader : classLoadersToSearch) {
+            if (classLoader == null) {
+                continue;
+            }
+
             URL resource = classLoader.getResource(resourcePath);
             if (resource != null) {
                 return resource;

From f2ec729b7fee7e7119a25e11269fbfadbc17e65d Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 17 Jun 2021 21:29:56 +0200
Subject: [PATCH 1309/4969] Update docker-java to 3.2.10 (#4202)

---
 core/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index adc97a6c69f..f4cdfbea410 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,9 +108,9 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    api "com.github.docker-java:docker-java-api:3.2.8"
+    api "com.github.docker-java:docker-java-api:3.2.10"
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.8') {
+    shaded ('com.github.docker-java:docker-java-core:3.2.10') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
         exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -119,13 +119,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.8') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.10') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.8'
+    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.10'
 
     shaded "org.yaml:snakeyaml:1.29"
 

From f68994f4a2af1940b29c0709b720c5b69680cc0e Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Thu, 24 Jun 2021 00:06:26 +0000
Subject: [PATCH 1310/4969] Update Gradle Wrapper from 7.0.2 to 7.1.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 58910 -> 59536 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   3 +-
 examples/gradlew                              |   4 +-
 examples/gradlew.bat                          | 193 ++++++++----------
 4 files changed, 93 insertions(+), 107 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b91381bbd28b1afc82d634bf73a8a..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18328
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
Y(TzS~Xdo8@nTUZrK}a{fL*HNQe=4o%4FCWD

delta 17568
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
TK;AHhi6z%JZ-!akW0(E{0YX_0

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf516c..234b6472e12 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index fbd7c515832..744e882ed57 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index 5093609d512..ac1b06f9382 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -1,104 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From ad264f0b0e47eba6005244d0ff58d26749002c42 Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Thu, 24 Jun 2021 00:06:34 +0000
Subject: [PATCH 1311/4969] Update Gradle Wrapper from 7.0.2 to 7.1.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 55616 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   6 +++---
 gradlew                                  |   4 +++-
 gradlew.bat                              |  25 +++++++----------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 26482
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

delta 22605
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4a66b0f1980..283500479a3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 05 19:28:23 BST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionSha256Sum=a9e356a21595348b6f04b024ed0b08ac8aea6b2ac37e6c0ef58e51549cd7b9cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d95e..744e882ed57 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 24467a141f7..ac1b06f9382 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 6756ed465ea89d870a16de6a291e29e19364175a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 25 Jun 2021 16:39:50 +0100
Subject: [PATCH 1312/4969] Remove GitHub Sponsors button

---
 docs/index.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 139cbcd3f4e..16f61899947 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -93,10 +93,6 @@ testImplementation('org.testcontainers:mysql') //no version specified
 
 ## Sponsors
 
-Testcontainers is on Github Sponsors! Please consider sponsoring us to sustain the project and help us improve it further.
-
-<iframe src="https://github.com/sponsors/testcontainers/button" title="Sponsor Testcontainers" height="35" width="107" style="border: 0;"></iframe>
-
 A huge thank you to our sponsors:
 
 ### Bronze sponsors

From e01c5a3214a0903fc3bf0dfc4c1fc3d5bc24e028 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 29 Jun 2021 11:23:34 +0100
Subject: [PATCH 1313/4969] Remove stalebot (#4216)

---
 .github/stale.yml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index 5f903fb0189..00000000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 90
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - "resolution/acknowledged"
-  - "help wanted"
-  - "good first issue"
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. If you believe
-  this is a mistake, please reply to this comment to keep it open. If there isn't 
-  one already, a PR to fix or at least reproduce the problem in a test case will 
-  always help us get back on track to tackle this.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed due to inactivity. We apologise if
-  this is still an active problem for you, and would ask you to re-open the 
-  issue if this is the case.

From 271ae2f6cd864d3963da9908b677a837263c9885 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 29 Jun 2021 14:52:55 +0200
Subject: [PATCH 1314/4969] Update `docker-java` to 3.2.11 (#4220)

---
 core/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index f4cdfbea410..b27031af1bb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,9 +108,9 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    api "com.github.docker-java:docker-java-api:3.2.10"
+    api "com.github.docker-java:docker-java-api:3.2.11"
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.10') {
+    shaded ('com.github.docker-java:docker-java-core:3.2.11') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
         exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -119,13 +119,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.10') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.11') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.10'
+    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.11'
 
     shaded "org.yaml:snakeyaml:1.29"
 

From 655110a6cefb5a7ea26628d15d27b8339b5001a2 Mon Sep 17 00:00:00 2001
From: Tobias Happ <Gerschtli@users.noreply.github.com>
Date: Tue, 29 Jun 2021 18:25:45 +0200
Subject: [PATCH 1315/4969] Couchbase: Update to latest version, add
 flushEnabled flag (#4041)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/databases/couchbase.md           |  7 +-
 modules/couchbase/AUTHORS                     |  1 +
 modules/couchbase/build.gradle                |  3 +-
 .../couchbase/BucketDefinition.java           | 16 ++++
 .../couchbase/CouchbaseContainer.java         |  1 +
 .../couchbase/CouchbaseContainerTest.java     | 90 ++++++++++++-------
 6 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/docs/modules/databases/couchbase.md b/docs/modules/databases/couchbase.md
index f8ed7465dd9..e45a971f626 100644
--- a/docs/modules/databases/couchbase.md
+++ b/docs/modules/databases/couchbase.md
@@ -18,16 +18,11 @@ Running Couchbase as a stand-in in a test:
     [Container definition](../../../modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java) inside_block:container_definition
     <!--/codeinclude-->
 
-3. create an environment & cluster:
+3. create an cluster:
     <!--codeinclude-->
     [Cluster creation](../../../modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java) inside_block:cluster_creation
     <!--/codeinclude-->
 
-4. authenticate:
-    <!--codeinclude-->
-    [Authentication](../../../modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java) inside_block:auth
-    <!--/codeinclude-->
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/couchbase/AUTHORS b/modules/couchbase/AUTHORS
index db292de72f1..480841c2906 100644
--- a/modules/couchbase/AUTHORS
+++ b/modules/couchbase/AUTHORS
@@ -1 +1,2 @@
 Tayeb Chlyah <tayebchlyah@gmail.com>
+Tobias Happ <tobias.happ@gmx.de>
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 88eb537269d..1ce51019607 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,5 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.couchbase.client:java-client:2.7.15'
+    testImplementation 'com.couchbase.client:java-client:3.1.6'
+    testImplementation 'org.awaitility:awaitility:3.0.0'
 }
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
index 8c2b11403ad..3778833182e 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
@@ -22,6 +22,7 @@
 public class BucketDefinition {
 
     private final String name;
+    private boolean flushEnabled = false;
     private boolean queryPrimaryIndex = true;
     private int quota = 100;
 
@@ -29,6 +30,17 @@ public BucketDefinition(final String name) {
         this.name = name;
     }
 
+    /**
+     * Enables flush for this bucket (disabled by default).
+     *
+     * @param flushEnabled if true, the bucket can be flushed.
+     * @return this {@link BucketDefinition} for chaining purposes.
+     */
+    public BucketDefinition withFlushEnabled(final boolean flushEnabled) {
+        this.flushEnabled = flushEnabled;
+        return this;
+    }
+
     /**
      * Sets a custom bucket quota (100MB by default).
      *
@@ -58,6 +70,10 @@ public String getName() {
         return name;
     }
 
+    public boolean hasFlushEnabled() {
+        return flushEnabled;
+    }
+
     public boolean hasPrimaryIndex() {
         return queryPrimaryIndex;
     }
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 8df5844f538..64489f30531 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -368,6 +368,7 @@ private void createBuckets() {
             @Cleanup Response response = doHttpRequest(MGMT_PORT, "/pools/default/buckets", "POST", new FormBody.Builder()
                 .add("name", bucket.getName())
                 .add("ramQuotaMB", Integer.toString(bucket.getQuota()))
+                .add("flushEnabled", bucket.hasFlushEnabled() ? "1" : "0")
                 .build(), true);
 
             checkSuccessfulResponse(response, "Could not create bucket " + bucket.getName());
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 3a4438c1fc6..57b726eb663 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -18,16 +18,17 @@
 
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
-import com.couchbase.client.java.CouchbaseCluster;
-import com.couchbase.client.java.document.JsonDocument;
-import com.couchbase.client.java.document.json.JsonObject;
-import com.couchbase.client.java.env.CouchbaseEnvironment;
-import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
+import com.couchbase.client.java.Collection;
+import com.couchbase.client.java.json.JsonObject;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 public class CouchbaseContainerTest {
 
@@ -45,37 +46,60 @@ public void testBasicContainerUsage() {
                 .withBucket(bucketDefinition)
             // }
         ) {
-            container.start();
-
-            // cluster_creation {
-            CouchbaseEnvironment environment = DefaultCouchbaseEnvironment
-                .builder()
-                .bootstrapCarrierDirectPort(container.getBootstrapCarrierDirectPort())
-                .bootstrapHttpDirectPort(container.getBootstrapHttpDirectPort())
-                .build();
-
-            Cluster cluster = CouchbaseCluster.create(
-                environment,
-                container.getHost()
-            );
-            // }
+            setUpClient(container, cluster -> {
+                Bucket bucket = cluster.bucket(bucketDefinition.getName());
+                bucket.waitUntilReady(Duration.ofSeconds(10L));
+
+                Collection collection = bucket.defaultCollection();
+
+                collection.upsert("foo", JsonObject.create().put("key", "value"));
+
+                JsonObject fooObject = collection.get("foo").contentAsObject();
+
+                assertEquals("value", fooObject.getString("key"));
+            });
+        }
+    }
+
+    @Test
+    public void testBucketIsFlushableIfEnabled() {
+        BucketDefinition bucketDefinition = new BucketDefinition("mybucket")
+            .withFlushEnabled(true);
 
-            try {
-                // auth {
-                cluster.authenticate(container.getUsername(), container.getPassword());
-                // }
+        try (
+            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE)
+                .withBucket(bucketDefinition)
+        ) {
+            setUpClient(container, cluster -> {
+                Bucket bucket = cluster.bucket(bucketDefinition.getName());
+                bucket.waitUntilReady(Duration.ofSeconds(10L));
+
+                Collection collection = bucket.defaultCollection();
 
-                Bucket bucket = cluster.openBucket(bucketDefinition.getName());
+                collection.upsert("foo", JsonObject.create().put("key", "value"));
 
-                bucket.upsert(JsonDocument.create("foo", JsonObject.empty()));
+                cluster.buckets().flushBucket(bucketDefinition.getName());
 
-                assertTrue(bucket.exists("foo"));
-                assertNotNull(cluster.clusterManager().getBucket(bucketDefinition.getName()));
-            } finally {
-                cluster.disconnect();
-                environment.shutdown();
-            }
+                await().untilAsserted(() -> assertFalse(collection.exists("foo").exists()));
+            });
         }
     }
 
+    private void setUpClient(CouchbaseContainer container, Consumer<Cluster> consumer) {
+        container.start();
+
+        // cluster_creation {
+        Cluster cluster = Cluster.connect(
+            container.getConnectionString(),
+            container.getUsername(),
+            container.getPassword()
+        );
+        // }
+
+        try {
+            consumer.accept(cluster);
+        } finally {
+            cluster.disconnect();
+        }
+    }
 }

From adae983eb93bb83c97e7a6b49a0b83344865f83a Mon Sep 17 00:00:00 2001
From: Dennis Federico <dennisfederico@gmail.com>
Date: Wed, 30 Jun 2021 11:24:45 +0200
Subject: [PATCH 1316/4969] Fix KafkaContainer with multiple networks defined
 (#4213)

Current implementation exposes only two listeners PLAINTEXT and BROKER. BROKER must be advertised to explicitly specified network or bridge. If a host port is exposed using `Testcontainers.exposeHostPorts` and a network is specified, the container will be "attached" to an additional network, creating to listeners with the same name

Configure the BROKER listener using the network specified (withNetwork) or "bridge" if not specified, instead of iterating over all the networks in the container info. Additional test cases when a port of the host is exposed (proxy container started) and a external network is specified to the container placing multiple network entries in the container info, making additional Kafka Broker listener entries with the same name "BROKER"


Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../containers/KafkaContainer.java            | 38 ++++++++++++++-----
 .../containers/KafkaContainerTest.java        | 19 ++++++++++
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index b1bc3d735f9..d9c8e35e852 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -6,8 +6,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.nio.charset.StandardCharsets;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Comparator;
 
 /**
  * This container wraps Confluent Kafka and Zookeeper (optionally)
@@ -122,13 +121,8 @@ protected void containerIsStarting(InspectContainerResponse containerInfo, boole
         }
 
         command += "export KAFKA_ZOOKEEPER_CONNECT='" + zookeeperConnect + "'\n";
-        command += "export KAFKA_ADVERTISED_LISTENERS='" + Stream
-            .concat(
-                Stream.of(getBootstrapServers()),
-                containerInfo.getNetworkSettings().getNetworks().values().stream()
-                    .map(it -> "BROKER://" + it.getIpAddress() + ":9092")
-            )
-            .collect(Collectors.joining(",")) + "'\n";
+
+        command += "export KAFKA_ADVERTISED_LISTENERS='" + String.join(",", getBootstrapServers(), brokerAdvertisedListener(containerInfo)) + "'\n";
 
         command += ". /etc/confluent/docker/bash-config \n";
         command += "/etc/confluent/docker/configure \n";
@@ -139,4 +133,30 @@ protected void containerIsStarting(InspectContainerResponse containerInfo, boole
             STARTER_SCRIPT
         );
     }
+
+    protected String brokerAdvertisedListener(InspectContainerResponse containerInfo) {
+        // Kafka supports only one INTER_BROKER listener, so we have to pick one.
+        // The current algorithm uses the following order of resolving the IP:
+        // 1. Custom network's IP set via `withNetwork`
+        // 2. Bridge network's IP
+        // 3. Best effort fallback to getNetworkSettings#ipAddress
+        String ipAddress = containerInfo.getNetworkSettings().getNetworks().entrySet()
+            .stream()
+            .filter(it -> it.getValue().getIpAddress() != null)
+            .max(Comparator.comparingInt(entry -> {
+                if (getNetwork() != null && getNetwork().getId().equals(entry.getValue().getNetworkID())) {
+                    return 2;
+                }
+
+                if ("bridge".equals(entry.getKey())) {
+                    return 1;
+                }
+
+                return 0;
+            }))
+            .map(it -> it.getValue().getIpAddress())
+            .orElseGet(() -> containerInfo.getNetworkSettings().getIpAddress());
+
+        return String.format("BROKER://%s:%s", ipAddress, "9092");
+    }
 }
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index d219aa17b13..e16081d16d9 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -24,6 +24,7 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
 public class KafkaContainerTest {
@@ -113,6 +114,24 @@ public void testConfluentPlatformVersion6() throws Exception {
         }
     }
 
+    @Test
+    public void testWithHostExposedPort() throws Exception {
+        Testcontainers.exposeHostPorts(12345);
+        try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
+    @Test
+    public void testWithHostExposedPortAndExternalNetwork() throws Exception {
+        Testcontainers.exposeHostPorts(12345);
+        try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE).withNetwork(Network.newNetwork())) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
     protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
         testKafkaFunctionality(bootstrapServers, 1, 1);
     }

From 40807676491effb9878fce92c11fe26303218e4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:27 +0000
Subject: [PATCH 1317/4969] Bump tomcat-jdbc from 10.0.6 to 10.0.7 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.6 to 10.0.7.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 87e33f804a0..99cba7dcb70 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.6'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.7'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.25'
 }

From 18a3efd8003bb0a9d8ffdd70f8b0ab0d7b129ea3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:28 +0000
Subject: [PATCH 1318/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /modules/vault

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 50797658fbb..18897f66908 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:4.4.0'
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
 
 }

From 36eaee53b29fb5841b286ac46e9e2ad80b848bae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:29 +0000
Subject: [PATCH 1319/4969] Bump awaitility from 3.0.0 to 4.1.0 in
 /modules/couchbase

Bumps [awaitility](https://github.com/awaitility/awaitility) from 3.0.0 to 4.1.0.
- [Release notes](https://github.com/awaitility/awaitility/releases)
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-3.0.0...awaitility-4.1.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 1ce51019607..40f59128ec8 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.couchbase.client:java-client:3.1.6'
-    testImplementation 'org.awaitility:awaitility:3.0.0'
+    testImplementation 'org.awaitility:awaitility:4.1.0'
 }

From b1b04bdc7734ee9015e3ccb6f4685718f069814f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:29 +0000
Subject: [PATCH 1320/4969] Bump jedis from 3.6.0 to 3.6.1 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.6.0...jedis-3.6.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ab2477ed883..f33bff6398b 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:3.6.0'
+    testImplementation 'redis.clients:jedis:3.6.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')

From a6210dc258fa10a957941ed4a1dd6fce9614f5d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:30 +0000
Subject: [PATCH 1321/4969] Bump postgresql from 42.2.20 to 42.2.22 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.20 to 42.2.22.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.22/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.20...REL42.2.22)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c44dbe7d009..9b7063e3a0c 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.2.20'
+    testImplementation 'org.postgresql:postgresql:42.2.22'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'

From 50d4922384cc09139e5011f68729631972c981ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:30 +0000
Subject: [PATCH 1322/4969] Bump jedis from 3.6.0 to 3.6.1 in /core

Bumps [jedis](https://github.com/redis/jedis) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.6.0...jedis-3.6.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index b27031af1bb..7cbabcd4783 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -136,7 +136,7 @@ dependencies {
     }
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:3.6.0'
+    testImplementation 'redis.clients:jedis:3.6.1'
     testImplementation 'com.rabbitmq:amqp-client:5.12.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.7'
 

From cb12788039131c1a6c2d5a8f7b450c3d3cb7fcad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:30 +0000
Subject: [PATCH 1323/4969] Bump postgresql from 42.2.20 to 42.2.22 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.20 to 42.2.22.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.22/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.20...REL42.2.22)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 eb82bdcfc41..6ee936b7ca7 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
 
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'

From 496728436f742052acbbfc2b191715bc1917c828 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:30 +0000
Subject: [PATCH 1324/4969] Bump aws-java-sdk-s3 from 1.11.1030 to 1.12.16 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.1030 to 1.12.16.
- [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.1030...1.12.16)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 87cc407468d..6d7b683200c 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.16'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.11.807'

From 9974c8f02d36d8916349c5a53b76f5fcfb3de8ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:30 +0000
Subject: [PATCH 1325/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /modules/jdbc

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 16b95af77bf..2f776044169 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
 }

From ce5c685d18229fafbd5a0356d676d82f841ba959 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:30 +0000
Subject: [PATCH 1326/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /modules/kafka

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index bb112755352..c83859e0c20 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 10768c88d4db87e0adf88f326fba4e909295e008 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:31 +0000
Subject: [PATCH 1327/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /modules/junit-jupiter

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ab2477ed883..b333b71c1b6 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.20'

From 5189aebedfc13b643c9b4daf65672ccef2bfc90f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:31 +0000
Subject: [PATCH 1328/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.1030 to 1.12.16.
- [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.1030...1.12.16)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index e3a49df5be2..c92b1969147 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.16'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From b1ada036d900e60b8e6c7e978d53c66d0e0d7431 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:32 +0000
Subject: [PATCH 1329/4969] Bump org.springframework.boot from 2.5.0 to 2.5.2
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.5.0 to 2.5.2.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.0...v2.5.2)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index bcd2f97100b..70c4a2683b0 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.5.0'
+    id 'org.springframework.boot' version '2.5.2'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 3f3469f8548..d39de1a995d 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.5.0"
+    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.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 33f5b9aa878..00f6f22728d 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.5.0'
+    id 'org.springframework.boot' version '2.5.2'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 5514570afcf8e6537174f2e8b725851c6c5ee5e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:33 +0000
Subject: [PATCH 1330/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /modules/neo4j

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index f556c96095a..08eda371597 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
 }

From 7ebefec50e0adaaaee3ab084dbca689479d3ecde Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:34 +0000
Subject: [PATCH 1331/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /modules/pulsar

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 61e1208381d..478c47fff29 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.0'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.20.2'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }

From 3b8149d89f575378fa50959f63f35c1e2db5a464 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:34 +0000
Subject: [PATCH 1332/4969] Bump postgresql from 42.2.20 to 42.2.22 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.20 to 42.2.22.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.22/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.20...REL42.2.22)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ab2477ed883..8c97073a540 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }

From dd68c10acf0200c4640bb7c55b810902d695f98d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:35 +0000
Subject: [PATCH 1333/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /examples

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index cb1e9e31e7b..79c14941c11 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.slf4j:slf4j-simple:1.7.30'
 }

From 9eed46bf9e3290682b7a0528a043958925abe7e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:35 +0000
Subject: [PATCH 1334/4969] Bump mockito-core from 3.10.0 to 3.11.2 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.10.0 to 3.11.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.10.0...v3.11.2)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index b27031af1bb..762e30054e7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -140,7 +140,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.12.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testImplementation ('org.mockito:mockito-core:3.10.0') {
+    testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 17bdb7ce09e79b896501a1fe0513de49ddb9354b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:35 +0000
Subject: [PATCH 1335/4969] Bump transport from 7.13.1 to 7.13.2 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.13.1 to 7.13.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.13.1...v7.13.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index e1921e755f8..67e03df2945 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -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.1"
+    testImplementation "org.elasticsearch.client:transport:7.13.2"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From a027522e063de7d43a06706e771f63df14327213 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:38 +0000
Subject: [PATCH 1336/4969] Bump mockito-core from 3.10.0 to 3.11.2 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.10.0 to 3.11.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.10.0...v3.11.2)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ab2477ed883..3203f13ca11 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:3.6.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:3.10.0') {
+    testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.19.0'

From be077663330869adcad683faac658ae04a6078fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:40 +0000
Subject: [PATCH 1337/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.5.10 to 1.5.20.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 3f3469f8548..bd1e474b411 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.5.0"
     id("org.jetbrains.kotlin.jvm") version "1.5.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.5.10"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.5.20"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 58960f3a5c1b431424664fbde7a61c48d54c2f23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:40 +0000
Subject: [PATCH 1338/4969] Bump solr-solrj from 8.8.2 to 8.9.0 in /examples

Bumps solr-solrj from 8.8.2 to 8.9.0.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index e0a6f356a77..d416c4d8c45 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
 
-    implementation 'org.apache.solr:solr-solrj:8.8.2'
+    implementation 'org.apache.solr:solr-solrj:8.9.0'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 47afef9c6bf274d8318a19317af08f47d0e98ae6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:41 +0000
Subject: [PATCH 1339/4969] Bump aws-java-sdk-logs from 1.11.807 to 1.12.16 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.11.807 to 1.12.16.
- [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.807...1.12.16)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 87cc407468d..08e8202e09b 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.11.807'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16'
     testImplementation 'software.amazon.awssdk:s3:2.16.80'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From c797df1bd6b2cc6323ac4a8589399645b5157e54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:47 +0000
Subject: [PATCH 1340/4969] Bump postgresql from 42.2.20 to 42.2.22 in
 /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.20 to 42.2.22.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.22/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.20...REL42.2.22)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 edb545e79d3..c5706da277a 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
-    testImplementation 'org.postgresql:postgresql:42.2.20'
+    testImplementation 'org.postgresql:postgresql:42.2.22'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

From 37bdb1cb6c42a12cd8bdb50749216b7c6e5787fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:00:50 +0000
Subject: [PATCH 1341/4969] Bump gson from 2.8.6 to 2.8.7 in /examples

Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.7.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.7)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 82d1bb548ee..04d8f249511 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.20"
     implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.mockito:mockito-all:1.10.19'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index c19c5b22f23..aad845a5d78 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'redis.clients:jedis:3.6.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index a968a6d2bf3..f1c900708ae 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'redis.clients:jedis:3.6.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index dfbe856ea62..490f85abfeb 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:3.6.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
 

From 149882905ddc7a1672ce8cfe8d5292eee1ed68bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:01:08 +0000
Subject: [PATCH 1342/4969] Bump actions/github-script from 3 to 4.0.2

Bumps [actions/github-script](https://github.com/actions/github-script) from 3 to 4.0.2.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v3...v4.0.2)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 749cc648fb5..e1d96a20895 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -30,7 +30,7 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v4.0.2
         id: fetch-branch-names
         name: Fetch branch names
         with:
@@ -121,7 +121,7 @@ jobs:
           git pull origin $sourcebranches --no-edit
           git push origin $COMBINE_BRANCH_NAME
       # Creates a PR with the new combined branch
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v4.0.2
         name: Create Combined Pull Request
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}

From 9cd1a5abe8f3a3a9056ed66561d71a6e0e3e1a27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 22:01:13 +0000
Subject: [PATCH 1343/4969] Bump gradle-update/update-gradle-wrapper-action
 from 1.0.13 to 1.0.14

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 1.0.13 to 1.0.14.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/af940e8bff73d435137caae9d08cf7a1badf5497...6356f411fa7c14aab1fb2ac2fd20762a629e2fbf)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 329230640e7..272594c26df 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@af940e8bff73d435137caae9d08cf7a1badf5497 # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@6356f411fa7c14aab1fb2ac2fd20762a629e2fbf # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From 5d87f611fb628a201f30690b9141188754da0699 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 8 Jul 2021 11:35:31 +0100
Subject: [PATCH 1344/4969] Switch from using Travis to GitHub Actions for
 release (#3434)

---
 .github/workflows/release.yml | 31 +++++++++++++++++++++++++++++++
 .travis.yml                   | 24 ------------------------
 README.md                     |  2 --
 build.gradle                  | 16 ----------------
 gradle/bintray.gradle         | 24 ------------------------
 gradle/publishing.gradle      | 21 +++++++++++++++++----
 6 files changed, 48 insertions(+), 70 deletions(-)
 create mode 100644 .github/workflows/release.yml
 delete mode 100644 .travis.yml
 delete mode 100644 gradle/bintray.gradle

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..943dfcf005a
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,31 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+env:
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+  release:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '1.8'
+      - name: Clear existing docker image cache
+        run: docker image prune -af
+
+      - name: Run Gradle Build
+        run: ./gradlew build --scan --no-daemon -i
+
+      - name: Run Gradle Publish
+        run: |
+          ./gradlew publish \
+            -Pversion="${{github.event.release.tag_name}}" --scan --no-daemon -i
+        env:
+          OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}}
+          OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ec7a5d343d9..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-if: tag is present
-
-language: java
-jdk:
-  - openjdk8
-
-sudo: required
-services:
-  - docker
-
-jobs:
-  include:
-
-    - stage: deploy
-      sudo: false
-      services: []
-      install: skip
-      script: skip
-      deploy:
-        provider: script
-        script: ./gradlew -Pversion=$TRAVIS_TAG release --scan --no-daemon -i
-        on:
-          tags: true
-          branch: master
diff --git a/README.md b/README.md
index c87138e7d1a..d3446cbb31e 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@
 
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 
-[![Build Status](https://travis-ci.org/testcontainers/testcontainers-java.svg?branch=master)](https://travis-ci.org/testcontainers/testcontainers-java)[ ![Download](https://api.bintray.com/packages/testcontainers/releases/testcontainers/images/download.svg) ](https://bintray.com/testcontainers/releases/testcontainers/_latestVersion)
-
 ![Testcontainers logo](docs/logo.png)
 
 # [Read the documentation here](http://www.testcontainers.org)
diff --git a/build.gradle b/build.gradle
index 40f5bfed399..98b9b5a30bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'io.franzbecker.gradle-lombok' version '4.0.0'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id "com.jfrog.bintray" version "1.8.4" apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -20,7 +19,6 @@ subprojects {
     compileTestJava.options.encoding = 'UTF-8'
 
     repositories {
-        jcenter()
         mavenCentral()
     }
 
@@ -48,20 +46,6 @@ subprojects {
     // specific modules should be excluded from publication
     if ( ! ["test-support", "jdbc-test"].contains(it.name) && !it.path.startsWith(":docs:") && it != project(":docs") ) {
         apply from: "$rootDir/gradle/publishing.gradle"
-        apply from: "$rootDir/gradle/bintray.gradle"
-
-        jar.archiveClassifier.set("original")
-
-        publishing {
-            publications {
-                mavenJava(MavenPublication) { publication ->
-                    artifacts.removeAll { it.classifier == jar.archiveClassifier.get() }
-                    artifact project.tasks.shadowJar
-                }
-            }
-        }
-
-        task release(dependsOn: bintrayUpload)
     }
 
     test {
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
deleted file mode 100644
index 5ddfefd8e49..00000000000
--- a/gradle/bintray.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-apply plugin: "com.jfrog.bintray"
-
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-
-    publications = ['mavenJava']
-
-    pkg {
-        userOrg = 'testcontainers'
-        repo = 'releases'
-        name = 'testcontainers'
-
-        publish = true
-        override = true
-
-        version {
-            name = project.version
-            vcsTag = project.version
-            released = new Date()
-            gpg.sign = true
-        }
-    }
-}
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 84fad9994e5..e6bf5d2acbd 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -1,24 +1,28 @@
 apply plugin: 'maven-publish'
 
 task sourceJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set( 'sources')
     from sourceSets.main.allJava
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc
 }
 
+jar.archiveClassifier.set("original")
+
 publishing {
     publications {
         mavenJava(MavenPublication) { publication ->
             artifactId = project.name
-
-            artifact project.tasks.jar
             artifact sourceJar
             artifact javadocJar
 
+            artifact project.tasks.jar
+            artifacts.removeAll { it.classifier == jar.archiveClassifier.get() }
+            artifact project.tasks.shadowJar
+
             pom.withXml {
                 def rootNode = asNode()
                 rootNode.children().last() + {
@@ -77,4 +81,13 @@ publishing {
             }
         }
     }
+    repositories {
+        maven {
+            url("https://oss.sonatype.org/service/local/staging/deploy/maven2")
+            credentials {
+                username = System.getenv("OSSRH_USERNAME")
+                password = System.getenv("OSSRH_PASSWORD")
+            }
+        }
+    }
 }

From c3429ac64c8cbf86180739e2ef4c09831a024c5d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 8 Jul 2021 11:42:19 +0100
Subject: [PATCH 1345/4969] Update Gradle Wrapper to 7.1.1 (#4266)

Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 gradle/wrapper/gradle-wrapper.properties          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 234b6472e12..2957f437446 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionSha256Sum=bf8b869948901d422e9bb7d1fa61da6a6e19411baa7ad6ee929073df85d6365d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 283500479a3..17ba19021b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a9e356a21595348b6f04b024ed0b08ac8aea6b2ac37e6c0ef58e51549cd7b9cb
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
+distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From a3f659f7a3bbcac1782dac8a8a0a9ec9bc66f416 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:03:29 +0000
Subject: [PATCH 1346/4969] Bump s3 from 2.16.80 to 2.16.97 in
 /modules/localstack

Bumps s3 from 2.16.80 to 2.16.97.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3770c37f4e3..ca14658a287 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16'
-    testImplementation 'software.amazon.awssdk:s3:2.16.80'
+    testImplementation 'software.amazon.awssdk:s3:2.16.97'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 4a83864aab94dd8f9fe94849ffd2b5f30d1f582f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:03:31 +0000
Subject: [PATCH 1347/4969] Bump tomcat-jdbc from 10.0.6 to 10.0.8 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.6 to 10.0.8.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2f776044169..4f6c6608b4d 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:21.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.6'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.8'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 590676316d27945ccf632b6fc0caadb5e7e1cd73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:03:31 +0000
Subject: [PATCH 1348/4969] Bump assertj-core from 3.19.0 to 3.20.2 in
 /modules/database-commons

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 7bba8548c95..35578b55d68 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
 }

From 30cbc6937e2b04f4607df26d65144c57a2a1ef64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:03:41 +0000
Subject: [PATCH 1349/4969] Bump aws-java-sdk-sqs from 1.12.1 to 1.12.19 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.1 to 1.12.19.
- [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.12.1...1.12.19)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3770c37f4e3..802905df563 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.16'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.19'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16'
     testImplementation 'software.amazon.awssdk:s3:2.16.80'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 6df76958c9bfad06f90169e699f199399ba01446 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:03:45 +0000
Subject: [PATCH 1350/4969] Bump assertj-core from 3.19.0 to 3.20.2 in /core

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.19.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.19.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2634bc4cae6..384c1caf1f2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -147,13 +147,13 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.12'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.18.1'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.20.2'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 6d1c0d6847c3fc11cba09dc0cce2e186407b39cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jul 2021 12:03:49 +0000
Subject: [PATCH 1351/4969] Bump jedis from 3.6.0 to 3.6.1 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.6.0...jedis-3.6.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index aad845a5d78..58f31827717 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.6.0'
+    implementation 'redis.clients:jedis:3.6.1'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f1c900708ae..4fb93cb71b5 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'redis.clients:jedis:3.6.0'
+    implementation 'redis.clients:jedis:3.6.1'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 490f85abfeb..e803f616998 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.6.0'
+    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'

From f4c1add362eda0ef684baf975aa17052ba8455f6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 16 Jul 2021 12:00:59 +0200
Subject: [PATCH 1352/4969] Use Apache HttpClient5 transport as the default
 (#4287)

---
 .../org/testcontainers/utility/TestcontainersConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 9b2ab707a2e..2f3f4370e50 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -176,7 +176,7 @@ public String getDockerClientStrategyClassName() {
     }
 
     public String getTransportType() {
-        return getEnvVarOrProperty("transport.type", "okhttp");
+        return getEnvVarOrProperty("transport.type", "httpclient5");
     }
 
     public Integer getImagePullPauseTimeout() {

From 014500b18964e9780355a8c5c7152632357124ef Mon Sep 17 00:00:00 2001
From: Tobias Happ <Gerschtli@users.noreply.github.com>
Date: Fri, 16 Jul 2021 13:08:27 +0200
Subject: [PATCH 1353/4969] Add support for community edition of couchbase
 server (#4221)

---
 .../couchbase/CouchbaseContainer.java         | 18 +++++++++-
 .../couchbase/CouchbaseContainerTest.java     | 34 ++++++++++++++++---
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 64489f30531..844917c053f 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -88,6 +88,8 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private final List<BucketDefinition> buckets = new ArrayList<>();
 
+    private boolean isEnterprise = false;
+
     /**
      * Creates a new couchbase container with the default image and version.
      * @deprecated use {@link CouchbaseContainer(DockerImageName)} instead
@@ -220,6 +222,7 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo)
         logger().debug("Couchbase container is starting, performing configuration.");
 
         waitUntilNodeIsOnline();
+        initializeIsEnterprise();
         renameNode();
         initializeServices();
         configureAdminUser();
@@ -246,6 +249,19 @@ private void waitUntilNodeIsOnline() {
             .waitUntilReady(this);
     }
 
+    /**
+     * Fetches edition (enterprise or community) of started container.
+     */
+    private void initializeIsEnterprise() {
+        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/pools", "GET", null, true);
+
+        try {
+            isEnterprise = MAPPER.readTree(response.body().string()).get("isEnterprise").asBoolean();
+        } catch (IOException e) {
+            throw new IllegalStateException("Couchbase /pools did not return valid JSON");
+        }
+    }
+
     /**
      * Rebinds/renames the internal hostname.
      * <p>
@@ -349,7 +365,7 @@ private void configureIndexer() {
         logger().debug("Configuring the indexer service");
 
         @Cleanup Response response = doHttpRequest(MGMT_PORT, "/settings/indexes", "POST", new FormBody.Builder()
-            .add("storageMode", "memory_optimized")
+            .add("storageMode", isEnterprise ? "memory_optimized" : "forestdb")
             .build(), true
         );
 
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 57b726eb663..fcebbe2bb62 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -32,17 +32,20 @@
 
 public class CouchbaseContainerTest {
 
-    private static final DockerImageName COUCHBASE_IMAGE = DockerImageName.parse("couchbase/server:6.5.1");
+    private static final DockerImageName COUCHBASE_IMAGE_ENTERPRISE =
+        DockerImageName.parse("couchbase/server:enterprise-6.6.2");
+    private static final DockerImageName COUCHBASE_IMAGE_COMMUNITY =
+        DockerImageName.parse("couchbase/server:community-6.6.0");
 
     @Test
-    public void testBasicContainerUsage() {
+    public void testBasicContainerUsageForEnterpriseContainer() {
         // bucket_definition {
         BucketDefinition bucketDefinition = new BucketDefinition("mybucket");
         // }
 
         try (
             // container_definition {
-            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE)
+            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_ENTERPRISE)
                 .withBucket(bucketDefinition)
             // }
         ) {
@@ -61,13 +64,36 @@ public void testBasicContainerUsage() {
         }
     }
 
+    @Test
+    public void testBasicContainerUsageForCommunityContainer() {
+        BucketDefinition bucketDefinition = new BucketDefinition("mybucket");
+
+        try (
+            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
+                .withBucket(bucketDefinition)
+        ) {
+            setUpClient(container, cluster -> {
+                Bucket bucket = cluster.bucket(bucketDefinition.getName());
+                bucket.waitUntilReady(Duration.ofSeconds(10L));
+
+                Collection collection = bucket.defaultCollection();
+
+                collection.upsert("foo", JsonObject.create().put("key", "value"));
+
+                JsonObject fooObject = collection.get("foo").contentAsObject();
+
+                assertEquals("value", fooObject.getString("key"));
+            });
+        }
+    }
+
     @Test
     public void testBucketIsFlushableIfEnabled() {
         BucketDefinition bucketDefinition = new BucketDefinition("mybucket")
             .withFlushEnabled(true);
 
         try (
-            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE)
+            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_ENTERPRISE)
                 .withBucket(bucketDefinition)
         ) {
             setUpClient(container, cluster -> {

From e89dce16e6471513772aa2a9dbb67430740b13b7 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 16 Jul 2021 08:55:50 -0400
Subject: [PATCH 1354/4969] Allow for docker timestamps with timezone offsets
 (#4073)

Docker prefers to use UTC time when making images/containers,
but it's happy to parse non-UTC times too. It will then pass those on in its
output.

DateTimeFormatter.ISO_OFFSET_DATE_TIME accepts a superset of what
DateTimeFormatter.ISO_INSTANT accepts, so replace use of
ISO_INSTANT with ISO_OFFSET_DATE_TIME.

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../testcontainers/utility/DockerStatus.java  |  4 +-
 .../utility/DockerStatusTest.java             | 53 ++++++++++++-------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/DockerStatus.java b/core/src/main/java/org/testcontainers/utility/DockerStatus.java
index 63b19db410b..a410597dcfb 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerStatus.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerStatus.java
@@ -40,7 +40,7 @@ public static boolean isContainerRunning(InspectContainerResponse.ContainerState
             if (minimumRunningDuration == null) {
                 return true;
             }
-            Instant startedAt = DateTimeFormatter.ISO_INSTANT.parse(
+            Instant startedAt = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(
                 state.getStartedAt(), Instant::from);
 
             if (startedAt.isBefore(now.minus(minimumRunningDuration))) {
@@ -75,7 +75,7 @@ public static boolean isDockerTimestampNonEmpty(String dockerTimestamp) {
         return dockerTimestamp != null
                 && !dockerTimestamp.isEmpty()
                 && !dockerTimestamp.equals(DOCKER_TIMESTAMP_ZERO)
-                && DateTimeFormatter.ISO_INSTANT.parse(dockerTimestamp, Instant::from).getEpochSecond() >= 0L;
+                && DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(dockerTimestamp, Instant::from).getEpochSecond() >= 0L;
     }
 
     public static boolean isContainerExitCodeSuccess(InspectContainerResponse.ContainerState state) {
diff --git a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
index 4b63719f928..1ef8e136a32 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
@@ -2,10 +2,13 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.mockito.Mockito;
 
 import java.time.Duration;
 import java.time.Instant;
+import 	java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
 import static org.junit.Assert.assertFalse;
@@ -15,33 +18,47 @@
 /**
  *
  */
+ @RunWith(Parameterized.class)
 public class DockerStatusTest {
+    private final DateTimeFormatter dateTimeFormatter;
 
-    private static Instant now = Instant.now();
+    private static final Instant now = Instant.now();
 
-    private static InspectContainerResponse.ContainerState running =
-        buildState(true, false, buildTimestamp(now.minusMillis(30)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
+    private final InspectContainerResponse.ContainerState running;
 
-    private static InspectContainerResponse.ContainerState runningVariant =
-        buildState(true, false, buildTimestamp(now.minusMillis(30)), "");
+    private final InspectContainerResponse.ContainerState runningVariant;
 
-    private static InspectContainerResponse.ContainerState shortRunning =
-        buildState(true, false, buildTimestamp(now.minusMillis(10)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
+    private final InspectContainerResponse.ContainerState shortRunning;
 
-    private static InspectContainerResponse.ContainerState created =
-        buildState(false, false, DockerStatus.DOCKER_TIMESTAMP_ZERO, DockerStatus.DOCKER_TIMESTAMP_ZERO);
+    private final InspectContainerResponse.ContainerState created;
 
     // a container in the "created" state is not running, and has both startedAt and finishedAt empty.
-    private static InspectContainerResponse.ContainerState createdVariant =
-        buildState(false, false, null, null);
+    private final InspectContainerResponse.ContainerState createdVariant;
 
-    private static InspectContainerResponse.ContainerState exited =
-        buildState(false, false, buildTimestamp(now.minusMillis(100)), buildTimestamp(now.minusMillis(90)));
+    private final InspectContainerResponse.ContainerState exited;
 
-    private static InspectContainerResponse.ContainerState paused =
-        buildState(false, true, buildTimestamp(now.minusMillis(100)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
+    private final InspectContainerResponse.ContainerState paused;
 
-    private static Duration minimumDuration = Duration.ofMillis(20);
+    private static final Duration minimumDuration = Duration.ofMillis(20);
+
+    public DockerStatusTest(DateTimeFormatter dateTimeFormatter) {
+        this.dateTimeFormatter = dateTimeFormatter;
+        running = buildState(true, false, buildTimestamp(now.minusMillis(30)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
+        runningVariant = buildState(true, false, buildTimestamp(now.minusMillis(30)), "");
+        shortRunning = buildState(true, false, buildTimestamp(now.minusMillis(10)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
+        created = buildState(false, false, DockerStatus.DOCKER_TIMESTAMP_ZERO, DockerStatus.DOCKER_TIMESTAMP_ZERO);
+        createdVariant = buildState(false, false, null, null);
+        exited = buildState(false, false, buildTimestamp(now.minusMillis(100)), buildTimestamp(now.minusMillis(90)));
+        paused = buildState(false, true, buildTimestamp(now.minusMillis(100)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
+    }
+
+    @Parameterized.Parameters
+    public static Object[][] parameters() {
+        return new Object[][] {
+            { DateTimeFormatter.ISO_INSTANT},
+            { DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("America/New_York")) }
+        };
+    }
 
     @Test
     public void testRunning() throws Exception {
@@ -65,8 +82,8 @@ public void testStopped() throws Exception {
         assertFalse(DockerStatus.isContainerStopped(paused));
     }
 
-    private static String buildTimestamp(Instant instant) {
-        return DateTimeFormatter.ISO_INSTANT.format(instant);
+    private String buildTimestamp(Instant instant) {
+        return dateTimeFormatter.format(instant);
     }
 
     // ContainerState is a non-static inner class, with private member variables, in a different package.

From bfd61d7eda8502c2bd93542fa45a509fd6ecfea8 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 18 Jul 2021 15:53:53 +0100
Subject: [PATCH 1355/4969] Use implicit strategy when `docker.host`
 configuration is set (#4175)

---
 .../utility/TestcontainersConfiguration.java  | 24 ++++++++++++++-
 .../TestcontainersConfigurationTest.java      | 29 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 2f3f4370e50..fddeec9c9b7 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.testcontainers.UnstableAPI;
+import org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -23,6 +24,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
@@ -172,7 +174,27 @@ public String getDockerClientStrategyClassName() {
         // Because of this overlap, and the desire to not change this specific TESTCONTAINERS_DOCKER_CLIENT_STRATEGY setting,
         // we special-case the logic here so that docker.client.strategy is used when reading properties files and
         // TESTCONTAINERS_DOCKER_CLIENT_STRATEGY is used when searching environment variables.
-        return getEnvVarOrUserProperty("docker.client.strategy", environment.get("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY"));
+
+        // looks for TESTCONTAINERS_ prefixed env var only
+        String prefixedEnvVarStrategy = environment.get("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY");
+        if (prefixedEnvVarStrategy != null) {
+            return prefixedEnvVarStrategy;
+        }
+
+        // looks for unprefixed env var or unprefixed property
+        String unprefixedEnvVarOrProperty = getEnvVarOrUserProperty("docker.client.strategy", null);
+        if (unprefixedEnvVarOrProperty != null) {
+            return unprefixedEnvVarOrProperty;
+        }
+
+        // If docker.host is set then EnvironmentAndSystemPropertyClientProviderStrategy is likely to work
+        String dockerHostProperty = getEnvVarOrUserProperty("docker.host", null);
+        if (dockerHostProperty != null) {
+            return EnvironmentAndSystemPropertyClientProviderStrategy.class.getCanonicalName();
+        }
+
+        // No value set, and no implicit value to use either
+        return null;
     }
 
     public String getTransportType() {
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index 0fca36f0f2f..ff56f62e4e4 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -155,6 +156,34 @@ public void shouldReadDockerClientStrategyFromEnvironment() {
         assertEquals("Docker client strategy is changed by env var", "foo", newConfig().getDockerClientStrategyClassName());
     }
 
+    @Test
+    public void shouldUseImplicitDockerClientStrategyWhenDockerHostPropertyIsSet() {
+        userProperties.remove("docker.client.strategy");
+        userProperties.put("docker.host", "tcp://1.2.3.4:5678");
+        assertEquals("Docker client strategy is implicitly set when docker host property is set", EnvironmentAndSystemPropertyClientProviderStrategy.class.getCanonicalName(), newConfig().getDockerClientStrategyClassName());
+    }
+
+    @Test
+    public void shouldNotUseImplicitDockerClientStrategyWhenDockerHostAndStrategyAreBothSet() {
+        userProperties.put("docker.client.strategy", "foo");
+        userProperties.put("docker.host", "tcp://1.2.3.4:5678");
+        assertEquals("Docker client strategy is can be explicitly set", "foo", newConfig().getDockerClientStrategyClassName());
+
+        userProperties.remove("docker.client.strategy");
+
+        environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "bar");
+        userProperties.put("docker.client.strategy", "foo");
+        assertEquals("Docker client strategy is can be explicitly set", "bar", newConfig().getDockerClientStrategyClassName());
+
+        environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "bar");
+        userProperties.remove("docker.client.strategy");
+        assertEquals("Docker client strategy is can be explicitly set", "bar", newConfig().getDockerClientStrategyClassName());
+
+        environment.remove("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY");
+        userProperties.put("docker.client.strategy", "foo");
+        assertEquals("Docker client strategy is can be explicitly set", "foo", newConfig().getDockerClientStrategyClassName());
+    }
+
     @Test
     public void shouldNotReadReuseFromClasspathProperties() {
         assertFalse("no reuse by default", newConfig().environmentSupportsReuse());

From b837bb15dbbe784155922cc4b13f0cbe8b296ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lef=C3=A8vre?= <tle@nine.dk>
Date: Mon, 19 Jul 2021 15:07:40 +0200
Subject: [PATCH 1356/4969] Spock Testcontainers annotation is now inherited
 (#4053)

---
 .../groovy/org/testcontainers/spock/Testcontainers.groovy     | 4 +++-
 .../groovy/org/testcontainers/spock/TestHierarchyIT.groovy    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
index 7bbd47a4629..675ed68c4a6 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
@@ -3,13 +3,15 @@ package org.testcontainers.spock
 import org.spockframework.runtime.extension.ExtensionAnnotation
 
 import java.lang.annotation.ElementType
+import java.lang.annotation.Inherited
 import java.lang.annotation.Retention
 import java.lang.annotation.RetentionPolicy
 import java.lang.annotation.Target
 
+@Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target([ElementType.TYPE, ElementType.METHOD])
 @ExtensionAnnotation(TestcontainersExtension)
 @interface Testcontainers {
 
-}
\ No newline at end of file
+}
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
index 7fb37446ca5..c28643910a4 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
@@ -4,9 +4,9 @@ import org.testcontainers.containers.PostgreSQLContainer
 import spock.lang.Shared
 
 /**
- * This test verifies that integration tests can subclass each other
+ * This test verifies that integration tests can subclass each other.
+ * Also verifies that the @Testcontainers annotation is inherited.
  */
-@Testcontainers
 class TestHierarchyIT extends MySqlContainerIT {
 
     @Shared

From 71314ab78f7105a939d257e05ea2b335dfba7dbf Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 19 Jul 2021 20:34:50 +0200
Subject: [PATCH 1357/4969] Fallback to x86 image if image pulling fails
 (#4290)

* Fallback to x86 image if image pulling fails

* Add the fallback to `checkAndPullImage`
---
 .../testcontainers/DockerClientFactory.java   | 18 +++++++++++++-----
 .../DockerClientProviderStrategy.java         |  2 +-
 .../images/RemoteDockerImage.java             | 19 +++++++++++++++----
 docs/supported_docker_environment/index.md    | 12 ++++++------
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 98e8249e4e5..411b5139de4 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -3,13 +3,13 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.Version;
 import com.github.dockerjava.api.model.Volume;
@@ -37,7 +37,6 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -330,8 +329,17 @@ private boolean checkMountableFile() {
     public void checkAndPullImage(DockerClient client, String image) {
         try {
             client.inspectImageCmd(image).exec();
-        } catch (NotFoundException e) {
-            client.pullImageCmd(image).exec(new TimeLimitedLoggedPullImageResultCallback(log)).awaitCompletion();
+        } catch (NotFoundException notFoundException) {
+            PullImageCmd pullImageCmd = client.pullImageCmd(image);
+            try {
+                pullImageCmd.exec(new TimeLimitedLoggedPullImageResultCallback(log)).awaitCompletion();
+            } catch (DockerClientException e) {
+                // Try to fallback to x86
+                pullImageCmd
+                    .withPlatform("linux/amd64")
+                    .exec(new TimeLimitedLoggedPullImageResultCallback(log))
+                    .awaitCompletion();
+            }
         }
     }
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 35e3b6eabb8..248e40790aa 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -240,7 +240,7 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
         DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
 
         if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
-            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_30);
+            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32);
         }
         return DockerClientImpl.getInstance(
             new AuthDelegatingDockerClientConfig(
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index f4b04712913..4ce38124fe7 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -1,6 +1,7 @@
 package org.testcontainers.images;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.google.common.util.concurrent.Futures;
@@ -75,11 +76,21 @@ protected final String resolve() {
 
             while (Instant.now().isBefore(lastRetryAllowed)) {
                 try {
-                    dockerClient
+                    PullImageCmd pullImageCmd = dockerClient
                         .pullImageCmd(imageName.getUnversionedPart())
-                        .withTag(imageName.getVersionPart())
-                        .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
-                        .awaitCompletion();
+                        .withTag(imageName.getVersionPart());
+
+                    try {
+                        pullImageCmd
+                            .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
+                            .awaitCompletion();
+                    } catch (DockerClientException e) {
+                        // Try to fallback to x86
+                        pullImageCmd
+                            .withPlatform("linux/amd64")
+                            .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
+                            .awaitCompletion();
+                    }
 
                     LocalImagesCache.INSTANCE.refreshCache(imageName);
 
diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 04cc0c9ee2b..62a2bbe0af2 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -4,15 +4,15 @@
 
 | Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                                                                                                                                                                                |
 |-------------------------------------|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Linux - general                     | Docker v1.10              |                                                                                                                                                                                                                                                                                                                                                                    |
-| Linux - Travis CI                   | Docker v1.10              | See [example .travis.yml](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/.travis.yml) for baseline Travis CI configuration                                                                                                                                                                                                                                                                                     |
-| Linux - CircleCI (LXC driver)      | Docker v1.9.1               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                                                                                                                                                                                   |
-| Linux - within a Docker container            | Docker v1.12              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                                                                                                                                                                              |
+| Linux - general                     | Docker v17.09              |                                                                                                                                                                                                                                                                                                                                                                    |
+| Linux - Travis CI                   | Docker v17.09              | See [example .travis.yml](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/.travis.yml) for baseline Travis CI configuration                                                                                                                                                                                                                                                                                     |
+| Linux - CircleCI (LXC driver)      | Docker v17.09               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                                                                                                                                                                                   |
+| Linux - within a Docker container            | Docker v17.09              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                                                                                                                                                                              |
 | Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                                                                                                                                                                                    |
-| Mac OS X - Docker for Mac      | 1.12.0          | *Support is best-efforts at present*. `getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
+| Mac OS X - Docker for Mac      | v17.09          | *Support is best-efforts at present*. `getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
 | Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                                                                                                                                                                               |
 | Windows - Docker for Windows   |                             | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md)                                                                                                                                                                                                                                                                                                                                        |
-| Windows - Windows Subsystem for Linux (WSL) | Docker v17.06                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md). |
+| Windows - Windows Subsystem for Linux (WSL) | Docker v17.09                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md). |
 
 ## Docker environment discovery
 

From 3c614f2538bce1564ea6fab5cd51e560721b2030 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 20 Jul 2021 08:34:49 +0100
Subject: [PATCH 1358/4969] Upgrade alpine images for better M1 compatibility
 (#4291)

---
 .../main/java/org/testcontainers/DockerClientFactory.java | 2 +-
 core/src/test/java/org/testcontainers/TestImages.java     | 4 ++--
 .../testcontainers/containers/DockerComposeFilesTest.java | 2 +-
 .../containers/ParsedDockerComposeFileValidationTest.java | 8 ++++----
 .../containers/output/ToStringConsumerTest.java           | 8 ++++----
 .../org/testcontainers/dockerclient/ImagePullTest.java    | 7 ++-----
 .../java/org/testcontainers/junit/DockerfileTest.java     | 6 +++---
 .../testcontainers/junit/FixedHostPortContainerTest.java  | 2 +-
 .../junit/ParameterizedDockerfileContainerTest.java       | 8 +++-----
 .../testcontainers/utility/DirectoryTarResourceTest.java  | 6 +++---
 core/src/test/resources/compose-dockerfile/Dockerfile     | 4 ++--
 .../resources/compose-scaling-multiple-containers.yml     | 2 +-
 .../test/resources/dockerfile-build-invalid/Dockerfile    | 2 +-
 core/src/test/resources/dockerfile-build-test/Dockerfile  | 2 +-
 .../test/resources/dockerfile-build-test/Dockerfile-alt   | 2 +-
 .../resources/dockerfile-build-test/Dockerfile-buildarg   | 2 +-
 .../resources/dockerfile-build-test/Dockerfile-currentdir | 2 +-
 .../resources/health-wait-strategy-dockerfile/Dockerfile  | 2 +-
 core/src/test/resources/mappable-dockerfile/Dockerfile    | 4 ++--
 .../src/test/java/generic/ContainerCreationTest.java      | 2 +-
 .../generic/src/test/java/generic/ContainerLabelTest.java | 4 ++--
 .../junit4/generic/src/test/java/generic/ExecTest.java    | 2 +-
 docs/features/configuration.md                            | 2 +-
 docs/features/creating_images.md                          | 2 +-
 .../org/testcontainers/spock/SpockTestImages.groovy       | 2 +-
 25 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 411b5139de4..554860d8985 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -64,7 +64,7 @@ public class DockerClientFactory {
             TESTCONTAINERS_SESSION_ID_LABEL, SESSION_ID
     );
 
-    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.5");
+    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
     private static DockerClientFactory instance;
 
     // Cached client configuration
diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
index 7052f7e8f9d..3798f42af0d 100644
--- a/core/src/test/java/org/testcontainers/TestImages.java
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -6,7 +6,7 @@ public interface TestImages {
     DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
     DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3");
     DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
-    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.2");
+    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.14");
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
-    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.5");
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
index 8dbcde2181d..81586c8290b 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -20,6 +20,6 @@ public void shouldGetDependencyImagesWhenOverriding() {
             Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-overriding-a.yml"),
                                new File("src/test/resources/docker-compose-imagename-overriding-b.yml")));
         Assertions.assertThat(dockerComposeFiles.getDependencyImages())
-            .containsExactlyInAnyOrder("alpine:3.2", "redis:b", "mysql:b", "aservice");
+            .containsExactlyInAnyOrder("alpine:3.14", "redis:b", "mysql:b", "aservice");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index bdceba343d9..ef70d06ada1 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -104,8 +104,8 @@ public void shouldObtainImageFromDockerfileBuild() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.2")))
-            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.2 from Dockerfile build
+                entry("custom", Sets.newHashSet("alpine:3.14")))
+            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.14 from Dockerfile build
     }
 
     @Test
@@ -116,7 +116,7 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.2")))
-            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.2 from Dockerfile build
+                entry("custom", Sets.newHashSet("alpine:3.14")))
+            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.14 from Dockerfile build
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
index 1610c688931..8da67e897e9 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -24,7 +24,7 @@ public class ToStringConsumerTest {
 
     @Test
     public void newlines_are_not_added_to_exec_output() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
             container.withCommand("sleep", "2m");
             container.start();
 
@@ -37,7 +37,7 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
 
     @Test(timeout = 60_000L)
     public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd
                     .withAttachStdin(true)
@@ -56,7 +56,7 @@ public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
 
     @Test
     public void newlines_are_not_added_to_container_output() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
             container.withCommand("echo", "-n", LARGE_PAYLOAD);
             container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
             container.start();
@@ -71,7 +71,7 @@ public void newlines_are_not_added_to_container_output() {
 
     @Test
     public void newlines_are_not_added_to_container_output_with_tty() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.13")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withTty(true);
             });
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index fd936d26c19..8691e8f5f56 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -16,12 +16,9 @@ public class ImagePullTest {
     public static String[] parameters() {
         return new String[] {
             "alpine:latest",
-            "alpine:3.6",
+            "alpine:3.14",
             "alpine", // omitting the tag should work and default to latest
-            "alpine@sha256:8fd4b76819e1e5baac82bd0a3d03abfe3906e034cc5ee32100d12aaaf3956dc7",
-            "gliderlabs/alpine:latest",
-            "gliderlabs/alpine:3.5",
-            "gliderlabs/alpine@sha256:a19aa4a17a525c97e5a90a0c53a9f3329d2dc61b0a14df5447757a865671c085",
+            "alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
             "quay.io/testcontainers/ryuk:latest",
             "quay.io/testcontainers/ryuk:0.2.3",
             "quay.io/testcontainers/ryuk@sha256:bb5a635cac4bd96c93cc476969ce11dc56436238ec7cd028d0524462f4739dd9",
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
index 7390b21fce2..2197d7be0e7 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
@@ -40,7 +40,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
                 super.configure(buildImageCmd);
 
                 List<String> dockerfile = Arrays.asList(
-                        "FROM alpine:3.2",
+                        "FROM alpine:3.14",
                         "RUN echo 'hello from Docker build process'",
                         "CMD yes"
                 );
@@ -59,7 +59,7 @@ public void dockerfileBuilderWorks() {
                 .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
                 .withFileFromString("folder/someFile.txt", "hello")
                 .withDockerfileFromBuilder(builder -> builder
-                        .from("alpine:3.2")
+                        .from("alpine:3.14")
                         .workDir("/app")
                         .add("test.txt", "test file.txt")
                         .run("ls", "-la", "/app/test file.txt")
@@ -101,7 +101,7 @@ public int getFileMode() {
 
                 })
                 .withDockerfileFromBuilder(builder -> builder
-                        .from("alpine:3.2")
+                        .from("alpine:3.14")
                         .copy("someFile.txt", "/someFile.txt")
                         .cmd("stat -c \"%a\" /someFile.txt")
                 );
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index 34c039b4fd3..02fad53fb1e 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -24,7 +24,7 @@
  */
 public class FixedHostPortContainerTest {
 
-    private static final String TEST_IMAGE = "alpine:3.2";
+    private static final String TEST_IMAGE = "alpine:3.14";
 
     /**
      * Default http server port (just something different from default)
diff --git a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
index 4ea261e68fd..969d2836b2e 100644
--- a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
@@ -35,11 +35,9 @@ public ParameterizedDockerfileContainerTest(String baseImage, String expectedVer
     @Parameterized.Parameters(name = "{0}")
     public static Object[][] data() {
         return new Object[][] {
-                { "alpine:3.2", "3.2"},
-                { "alpine:3.3", "3.3"},
-                { "alpine:3.4", "3.4"},
-                { "alpine:3.5", "3.5"},
-                { "alpine:3.6", "3.6"}
+                { "alpine:3.12", "3.12"},
+                { "alpine:3.13", "3.13"},
+                { "alpine:3.14", "3.14"}
         };
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
index 3789a654c20..f439c55c3ea 100644
--- a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -26,7 +26,7 @@ public void simpleRecursiveFileTest() {
         GenericContainer container = new GenericContainer(
                 new ImageFromDockerfile()
                         .withDockerfileFromBuilder(builder ->
-                                builder.from("alpine:3.3")
+                                builder.from("alpine:3.14")
                                         .copy("/tmp/foo", "/foo")
                                         .cmd("cat /foo/test/resources/test-recursive-file.txt")
                                         .build()
@@ -45,7 +45,7 @@ public void simpleRecursiveFileWithPermissionTest() {
         GenericContainer container = new GenericContainer(
                 new ImageFromDockerfile()
                         .withDockerfileFromBuilder(builder ->
-                                builder.from("alpine:3.3")
+                                builder.from("alpine:3.14")
                                         .copy("/tmp/foo", "/foo")
                                         .cmd("ls", "-al", "/")
                                         .build()
@@ -68,7 +68,7 @@ public void simpleRecursiveClasspathResourceTest() {
         GenericContainer container = new GenericContainer(
                 new ImageFromDockerfile()
                         .withDockerfileFromBuilder(builder ->
-                                builder.from("alpine:3.3")
+                                builder.from("alpine:3.14")
                                         .copy("/tmp/foo", "/foo")
                                         .cmd("ls -lRt /foo")
                                         .build()
diff --git a/core/src/test/resources/compose-dockerfile/Dockerfile b/core/src/test/resources/compose-dockerfile/Dockerfile
index 64613d2cd32..7252932b104 100644
--- a/core/src/test/resources/compose-dockerfile/Dockerfile
+++ b/core/src/test/resources/compose-dockerfile/Dockerfile
@@ -1,5 +1,5 @@
-FROM alpine:3.2
+FROM alpine:3.14
 
 ADD passthrough.sh /passthrough.sh
 
-CMD /passthrough.sh
\ No newline at end of file
+CMD /passthrough.sh
diff --git a/core/src/test/resources/compose-scaling-multiple-containers.yml b/core/src/test/resources/compose-scaling-multiple-containers.yml
index da5ac6f3a07..3ea528d4574 100644
--- a/core/src/test/resources/compose-scaling-multiple-containers.yml
+++ b/core/src/test/resources/compose-scaling-multiple-containers.yml
@@ -3,5 +3,5 @@ services:
   redis:
     image: redis
   other:
-    image: alpine:3.5
+    image: alpine:3.14
     command: sleep 10000
diff --git a/core/src/test/resources/dockerfile-build-invalid/Dockerfile b/core/src/test/resources/dockerfile-build-invalid/Dockerfile
index 6140f575ef7..b0198eb3e02 100644
--- a/core/src/test/resources/dockerfile-build-invalid/Dockerfile
+++ b/core/src/test/resources/dockerfile-build-invalid/Dockerfile
@@ -1 +1 @@
-FROM alpine:3.2
+FROM alpine:3.14
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile b/core/src/test/resources/dockerfile-build-test/Dockerfile
index eee182f21c1..9ae7dba8658 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile
@@ -1,2 +1,2 @@
-FROM alpine:3.2
+FROM alpine:3.14
 COPY localfile.txt /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-alt b/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
index f6938e5fc8d..43e5c556fe9 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
@@ -1,2 +1,2 @@
-FROM alpine:3.2
+FROM alpine:3.14
 RUN echo "test4567" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg b/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
index 4ae26f50f77..b37f4193643 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
@@ -1,3 +1,3 @@
-FROM alpine:3.2
+FROM alpine:3.14
 ARG CUSTOM_ARG
 RUN echo "${CUSTOM_ARG}" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir b/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
index 97f80bdfa65..e8456e1bc1f 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
@@ -1,2 +1,2 @@
-FROM alpine:3.2
+FROM alpine:3.14
 COPY . /
diff --git a/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile b/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile
index ddb0f82bce7..c0abb7bb597 100644
--- a/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile
+++ b/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.14
 
 HEALTHCHECK --interval=1s CMD test -e /testfile
 
diff --git a/core/src/test/resources/mappable-dockerfile/Dockerfile b/core/src/test/resources/mappable-dockerfile/Dockerfile
index b1afd24a3ec..df186f6579c 100644
--- a/core/src/test/resources/mappable-dockerfile/Dockerfile
+++ b/core/src/test/resources/mappable-dockerfile/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.2
+FROM alpine:3.14
 ADD folder/someFile.txt /someFile.txt
 RUN cat /someFile.txt
 ADD test.txt /test.txt
 RUN cat /test.txt
-CMD ping -c 5 www.google.com
\ No newline at end of file
+CMD ping -c 5 www.google.com
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
index b0e8c98a0e4..83b45f0435d 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -20,7 +20,7 @@ public class ContainerCreationTest {
                 .withExposedPorts(6379);
     // }
 
-    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.2");
+    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.14");
 
     // withOptions {
     // Set up a plain OS container and customize environment,
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
index ca0878e89d4..08d57e31057 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
@@ -8,7 +8,7 @@
 
 public class ContainerLabelTest {
     // single_label {
-    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.6"))
+    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.14"))
         .withLabel("key", "value");
     // }
 
@@ -17,7 +17,7 @@ public class ContainerLabelTest {
     private Map<String, String> mapOfLabels = new HashMap<>();
     // populate map, e.g. mapOfLabels.put("key1", "value1");
 
-    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.6"))
+    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.14"))
         .withLabels(mapOfLabels);
     // }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
index e35ae18af70..2530cadb410 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
@@ -13,7 +13,7 @@
 public class ExecTest {
 
     @Rule
-    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.6"))
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.14"))
         .withCommand("top");
 
     @Test
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 2336ec840c5..ba4487f8722 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -50,7 +50,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **ryuk.container.image = testcontainers/ryuk:0.3.1**
 > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
 
-> **tinyimage.container.image = alpine:3.5**  
+> **tinyimage.container.image = alpine:3.14**  
 > Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))
 
 > **sshd.container.image = testcontainers/sshd:1.0.0**  
diff --git a/docs/features/creating_images.md b/docs/features/creating_images.md
index 0539642e159..6a06627efa0 100644
--- a/docs/features/creating_images.md
+++ b/docs/features/creating_images.md
@@ -51,7 +51,7 @@ new GenericContainer(
         new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder ->
                         builder
-                                .from("alpine:3.2")
+                                .from("alpine:3.14")
                                 .run("apk add --update nginx")
                                 .cmd("nginx", "-g", "daemon off;")
                                 .build()))
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
index f18bc8dc96d..b9ef64fe475 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -6,5 +6,5 @@ interface SpockTestImages {
     DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.34")
     DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
     DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
-    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.5")
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14")
 }

From 034daa6e3d4a99c4ce71332ac49bf66957f903db Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 20 Jul 2021 10:37:37 +0200
Subject: [PATCH 1359/4969] Remove withPublishAllPorts from Ryuk and stabilize
 containerInfo content on start (#4263)

`containerInfo` is queried until all ports expected by Testcontainers are mapped.
Introduces Awaitility for retry logic.

Removing `withPublishAllPorts` is especially important because else this can lead to publishing of excluded ports on Windows

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 core/build.gradle                             |  2 +
 .../containers/GenericContainer.java          | 35 +++++++++++++---
 .../utility/DynamicPollInterval.java          | 42 +++++++++++++++++++
 .../utility/ResourceReaper.java               | 34 +++++++++++++--
 .../containers/GenericContainerTest.java      | 27 ++++++++++++
 .../containers/ReusabilityUnitTests.java      |  7 +++-
 6 files changed, 137 insertions(+), 10 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java

diff --git a/core/build.gradle b/core/build.gradle
index 384c1caf1f2..d7ccb9364f8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -108,6 +108,8 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
+    shaded 'org.awaitility:awaitility:4.1.0'
+
     api "com.github.docker-java:docker-java-api:3.2.11"
 
     shaded ('com.github.docker-java:docker-java-core:3.2.11') {
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 10f8e1e7195..56ca5345ecd 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -57,6 +57,7 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.DockerMachineClient;
+import org.testcontainers.utility.DynamicPollInterval;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.PathUtils;
 import org.testcontainers.utility.ResourceReaper;
@@ -84,6 +85,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -97,6 +99,7 @@
 import java.util.zip.Checksum;
 
 import static com.google.common.collect.Lists.newArrayList;
+import static org.awaitility.Awaitility.await;
 import static org.testcontainers.utility.CommandLine.runShellCommand;
 
 /**
@@ -216,10 +219,10 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     private static final Set<String> AVAILABLE_IMAGE_NAME_CACHE = new HashSet<>();
     private static final RateLimiter DOCKER_CLIENT_RATE_LIMITER = RateLimiterBuilder
-            .newBuilder()
-            .withRate(1, TimeUnit.SECONDS)
-            .withConstantThroughput()
-            .build();
+        .newBuilder()
+        .withRate(1, TimeUnit.SECONDS)
+        .withConstantThroughput()
+        .build();
 
     @Nullable
     private Map<String, String> tmpFsMapping;
@@ -425,8 +428,30 @@ private void tryStart(Instant startedAt) {
             // For all registered output consumers, start following as close to container startup as possible
             this.logConsumers.forEach(this::followOutput);
 
+            // Wait until inspect container returns the mapped ports
+            containerInfo = await()
+                .atMost(5, TimeUnit.SECONDS)
+                .pollInterval(DynamicPollInterval.ofMillis(50))
+                .pollInSameThread()
+                .until(
+                    () -> dockerClient.inspectContainerCmd(containerId).exec(),
+                    inspectContainerResponse -> {
+                        Set<Integer> exposedAndMappedPorts = inspectContainerResponse
+                            .getNetworkSettings()
+                            .getPorts()
+                            .getBindings()
+                            .entrySet()
+                            .stream()
+                            .filter(it -> Objects.nonNull(it.getValue())) // filter out exposed but not yet mapped
+                            .map(Entry::getKey)
+                            .map(ExposedPort::getPort)
+                            .collect(Collectors.toSet());
+
+                         return exposedAndMappedPorts.containsAll(exposedPorts);
+                    }
+                );
+
             // Tell subclasses that we're starting
-            containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
             containerIsStarting(containerInfo, reused);
 
             // Wait until the container has reached the desired running state
diff --git a/core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java b/core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java
new file mode 100644
index 00000000000..1252fb2c3a1
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java
@@ -0,0 +1,42 @@
+package org.testcontainers.utility;
+
+import org.awaitility.pollinterval.PollInterval;
+
+import java.time.Duration;
+import java.time.Instant;
+
+/**
+ * Awaitility {@link org.awaitility.pollinterval.PollInterval} that takes execution time into consideration,
+ * to allow a constant poll-interval, as opposed to Awaitility's default poll-delay behaviour.
+ *
+ * @deprecated For internal usage only.
+ */
+@Deprecated
+public class DynamicPollInterval implements PollInterval {
+
+    final Duration interval;
+    Instant lastTimestamp;
+
+    private DynamicPollInterval(Duration interval) {
+        this.interval = interval;
+        lastTimestamp = Instant.now();
+    }
+
+    public static DynamicPollInterval of(Duration duration) {
+        return new DynamicPollInterval(duration);
+    }
+
+    public static DynamicPollInterval ofMillis(long millis) {
+        return DynamicPollInterval.of(Duration.ofMillis(millis));
+    }
+
+    @Override
+    public Duration next(int pollCount, Duration previousDuration) {
+        Instant now = Instant.now();
+        Duration executionDuration = Duration.between(lastTimestamp, now);
+
+        Duration result = interval.minusMillis(Math.min(interval.toMillis(), executionDuration.toMillis()));
+        lastTimestamp = now.plus(result);
+        return result;
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 7adbc95bb4c..75c6e209960 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -9,6 +9,8 @@
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
@@ -32,11 +34,13 @@
 import java.net.Socket;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
@@ -45,6 +49,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Component that responsible for container removal and automatic cleanup of dead containers at JVM shutdown.
  */
@@ -96,10 +102,14 @@ public static String start(DockerClient client) {
         List<Bind> binds = new ArrayList<>();
         binds.add(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
 
+        ExposedPort ryukExposedPort = ExposedPort.tcp(8080);
         String ryukContainerId = client.createContainerCmd(ryukImage)
-                .withHostConfig(new HostConfig().withAutoRemove(true))
-                .withExposedPorts(new ExposedPort(8080))
-                .withPublishAllPorts(true)
+                .withHostConfig(
+                    new HostConfig()
+                        .withAutoRemove(true)
+                        .withPortBindings(new PortBinding(Ports.Binding.empty(), ryukExposedPort))
+                )
+                .withExposedPorts(ryukExposedPort)
                 .withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID)
                 .withLabels(Collections.singletonMap(DockerClientFactory.TESTCONTAINERS_LABEL, "true"))
                 .withBinds(binds)
@@ -125,7 +135,23 @@ public void onNext(Frame frame) {
 
         ContainerState containerState = new ContainerState() {
 
-            final InspectContainerResponse inspectedContainer = client.inspectContainerCmd(ryukContainerId).exec();
+            // inspect container response might initially not contain the mapped port
+            final InspectContainerResponse inspectedContainer = await()
+                .atMost(5, TimeUnit.SECONDS)
+                .pollInterval(DynamicPollInterval.ofMillis(50))
+                .pollInSameThread()
+                .until(
+                    () -> client.inspectContainerCmd(ryukContainerId).exec(),
+                    inspectContainerResponse -> {
+                        return inspectContainerResponse
+                        .getNetworkSettings()
+                        .getPorts()
+                        .getBindings()
+                        .values()
+                        .stream()
+                        .anyMatch(Objects::nonNull);
+                    }
+                );
 
             @Override
             public List<Integer> getExposedPorts() {
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 1e2cb041cf1..93a9cd96479 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -17,6 +17,7 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -29,9 +30,11 @@
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.TINY_IMAGE;
 
 public class GenericContainerTest {
 
@@ -119,6 +122,30 @@ public void shouldOnlyPublishExposedPorts() {
         }
     }
 
+    @Test
+    public void shouldWaitUntilExposedPortIsMapped() {
+
+        ImageFromDockerfile image = new ImageFromDockerfile("publish-multiple")
+            .withDockerfileFromBuilder(builder ->
+                builder
+                    .from("testcontainers/helloworld:1.1.0")
+                    .expose(8080, 8081) // one additional port exposed in image
+                    .build()
+            );
+
+        try (
+            GenericContainer container = new GenericContainer<>(image)
+                .withExposedPorts(8080)
+                .withCreateContainerCmdModifier(it -> it.withExposedPorts(ExposedPort.tcp(8082))) // another port exposed by modifier
+        ) {
+
+            container.start();
+
+            assertEquals("Only withExposedPort should be exposed", 1, container.getExposedPorts().size());
+            assertTrue("withExposedPort should be exposed", container.getExposedPorts().contains(8080));
+        }
+    }
+
     static class NoopStartupCheckStrategy extends StartupCheckStrategy {
 
         @Override
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index c212d04c33a..0540fcdba9d 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.NetworkSettings;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
@@ -22,6 +23,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.Parameterized;
+import org.mockito.Answers;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.rnorth.visibleassertions.VisibleAssertions;
@@ -520,7 +523,9 @@ protected Answer<StartContainerCmd> startContainerAnswer() {
         protected Answer<InspectContainerCmd> inspectContainerAnswer() {
             return invocation -> {
                 InspectContainerCmd.Exec exec = command -> {
-                    return new InspectContainerResponse();
+                    InspectContainerResponse stubResponse = Mockito.mock(InspectContainerResponse.class, Answers.RETURNS_DEEP_STUBS);
+                    when(stubResponse.getNetworkSettings().getPorts().getBindings()).thenReturn(Collections.emptyMap());
+                    return stubResponse;
                 };
                 return new InspectContainerCmdImpl(exec, invocation.getArgument(0));
             };

From 3b3d130c823adf0364815f5bb87df256efbce786 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 20 Jul 2021 13:54:46 +0100
Subject: [PATCH 1360/4969] Split Windows CI into core and non-core steps
 (#4293)

---
 azure-pipelines.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1471f9948ca..247948901d8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,10 +18,10 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
 
-  # Run all tests when running the Windows CI tests
+  # Run all core tests when running the Windows CI tests
   - task: Gradle@2
     condition: eq(variables['Agent.OS'], 'Windows_NT')
-    displayName: Build & test (Windows - all modules)
+    displayName: Build & test (Windows - core)
     env:
       AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
       AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
@@ -29,6 +29,21 @@ jobs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
         options: '--no-daemon --continue'
-        tasks: 'clean check'
+        tasks: 'clean testcontainers:check'
+        publishJUnitResults: true
+        testResultsFiles: '**/TEST-*.xml'
+
+  # Run all non-core tests when running the Windows CI tests
+  - task: Gradle@2
+    condition: eq(variables['Agent.OS'], 'Windows_NT')
+    displayName: Build & test (Windows - all non-core modules)
+    env:
+      AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
+      AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
+    inputs:
+        gradleWrapperFile: 'gradlew'
+        jdkVersionOption: '1.11'
+        options: '--no-daemon --continue'
+        tasks: 'clean check -x testcontainers:test'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'

From 38a443f098c3407a65330bc38ae016cbe4bae8e1 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 29 Jul 2021 16:56:49 +0200
Subject: [PATCH 1361/4969] Update RELEASING.md (#4295)

Update the docs to reflect our current release process.
---
 RELEASING.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index aaba172d20e..34a6b55ae26 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -1,19 +1,23 @@
 # Release process
 
-Testcontainers' release process is automated as a Travis deployment. This describes the basic steps for a project member to perform a release.
+Testcontainers' release process is semi-automated through GitHub Actions. This describes the basic steps for a project member to perform a release.
 
 ## Steps
 
 1. Ensure that the master branch is building and that tests are passing.
-1. Ensure that the [`CHANGELOG`](CHANGELOG.md) file is up to date and includes all merged features.
 1. Create a new release on GitHub. **The tag name is used as the version**, so please keep the tag name plain (e.g. 1.2.3).
-1. Check that the Travis build passed.
-1. Release of published artifacts to Bintray is fully automated.
-1. After successful publication to Bintray, the artifacts must be synced to Maven Central.
+1. The release triggers a GitHub Action workflow, but it gets mostly build using results from the Gradle remote-cache. Therefore, this should be fairly fast.
+1. Login to Sonatype to check the staging repository.
+1. Get the staging url after GitHub Action workflow finished.
+1. Manually test the release with the staging url as maven repository url (e.g. critical issues and features).
+1. Run [TinSalver](https://github.com/bsideup/tinsalver) from GitHub using `npx` to sign artifact (see [TinsSalver README](https://github.com/bsideup/tinsalver/blob/main/README.md)).
+1. Close the release in Sonatype. This will evaluate the release based on given Sontaype rules and afterwards automatically sync to Maven Central.
+1. Handcraft and polish some of the release notes (e.g. substitute combinded dependency PRs and highlight certain features).
 1. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter!
 
 ## Internal details
 
-* The process is done with Gradle and Bintray.
-* Bintray will automatically promote the release to Maven Central.
-* Travis secrets hold Bintray username/passwords that are used for publishing.
+* The process is done with GitHub Actions, TinSalver and Sonatype.
+* Sonatype will automatically promote the staging release to Maven Central.
+* Keybase needs to be installed on the developer machine.
+* GPG key of signing developer needs to be uplodaed to the Ubuntu keyserver (or other server supported by Sonatype).

From 520cfeb5345f4230a1611b9b1c7708c2b1d8353e Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 30 Jul 2021 23:08:49 +0200
Subject: [PATCH 1362/4969] Disable Chrome's GPU support in
 `BrowserWebDriverContainer` (#4315)

* Trigger selenium build on CI

* Try again to trigger build

* Apply potential fix by disabling GPU

* Also --disable-dev-shm-usage

* Alwas add disable-gpu flag

* Smaller check for hack

* Smaller check for hack
---
 .../containers/BrowserWebDriverContainer.java              | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 4a25ae486cd..1209b7af019 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -166,6 +166,13 @@ protected void configure() {
             }
         }
 
+        // Hack for new selenium-chrome image that contains Chrome 92.
+        // If not disabled, container startup will fail in most cases and consume excessive amounts of CPU.
+        if (capabilities instanceof ChromeOptions) {
+            ChromeOptions options = (ChromeOptions) this.capabilities;
+            options.addArguments("--disable-gpu");
+        }
+
         if (recordingMode != VncRecordingMode.SKIP) {
 
             if (vncRecordingDirectory == null) {

From 4df9b900e79e4a3033ef0975abacf9064a0e7353 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 30 Jul 2021 23:56:49 +0200
Subject: [PATCH 1363/4969] Update Kafka config dynamically (#4316)

* Update Kafka config dynamically

* Simplify further, fix the Kafka Cluster example
---
 .../containers/GenericContainer.java          |   2 +-
 .../containers/KafkaContainer.java            | 106 ++++++------------
 2 files changed, 37 insertions(+), 71 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 56ca5345ecd..50e4b927617 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -135,7 +135,7 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @NonNull
     private String networkMode;
 
-    @NonNull
+    @Nullable
     private Network network;
 
     @NonNull
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index d9c8e35e852..f62ca23eb57 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -2,12 +2,8 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.SneakyThrows;
-import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Comparator;
-
 /**
  * This container wraps Confluent Kafka and Zookeeper (optionally)
  *
@@ -17,20 +13,14 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
     private static final String DEFAULT_TAG = "5.4.3";
 
-    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
-
     public static final int KAFKA_PORT = 9093;
 
     public static final int ZOOKEEPER_PORT = 2181;
 
     private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
 
-    private static final int PORT_NOT_ASSIGNED = -1;
-
     protected String externalZookeeperConnect = null;
 
-    private int port = PORT_NOT_ASSIGNED;
-
     /**
      * @deprecated use {@link KafkaContainer(DockerImageName)} instead
      */
@@ -80,83 +70,59 @@ public KafkaContainer withExternalZookeeper(String connectString) {
     }
 
     public String getBootstrapServers() {
-        if (port == PORT_NOT_ASSIGNED) {
-            throw new IllegalStateException("You should start Kafka container first");
-        }
-        return String.format("PLAINTEXT://%s:%s", getHost(), port);
-    }
-
-    @Override
-    protected void doStart() {
-        withCommand("sh", "-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
-
-        if (externalZookeeperConnect == null) {
-            addExposedPort(ZOOKEEPER_PORT);
-        }
-
-        super.doStart();
+        return String.format("PLAINTEXT://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
     }
 
     @Override
-    @SneakyThrows
-    protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
-        super.containerIsStarting(containerInfo, reused);
-
-        port = getMappedPort(KAFKA_PORT);
-
-        if (reused) {
-            return;
-        }
+    protected void configure() {
+        withEnv(
+            "KAFKA_ADVERTISED_LISTENERS",
+            String.format(
+                "BROKER://%s:9092",
+                getNetwork() != null
+                    ? getNetworkAliases().get(0)
+                    : "localhost"
+            )
+        );
 
         String command = "#!/bin/bash\n";
-        final String zookeeperConnect;
         if (externalZookeeperConnect != null) {
-            zookeeperConnect = externalZookeeperConnect;
+            withEnv("KAFKA_ZOOKEEPER_CONNECT", externalZookeeperConnect);
         } else {
-            zookeeperConnect = "localhost:" + ZOOKEEPER_PORT;
+            addExposedPort(ZOOKEEPER_PORT);
+            withEnv("KAFKA_ZOOKEEPER_CONNECT", "localhost:" + ZOOKEEPER_PORT);
             command += "echo 'clientPort=" + ZOOKEEPER_PORT + "' > zookeeper.properties\n";
             command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n";
             command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n";
             command += "zookeeper-server-start zookeeper.properties &\n";
         }
 
-        command += "export KAFKA_ZOOKEEPER_CONNECT='" + zookeeperConnect + "'\n";
-
-        command += "export KAFKA_ADVERTISED_LISTENERS='" + String.join(",", getBootstrapServers(), brokerAdvertisedListener(containerInfo)) + "'\n";
-
-        command += ". /etc/confluent/docker/bash-config \n";
-        command += "/etc/confluent/docker/configure \n";
-        command += "/etc/confluent/docker/launch \n";
+        // Optimization: skip the checks
+        command += "echo '' > /etc/confluent/docker/ensure \n";
+        // Run the original command
+        command += "/etc/confluent/docker/run \n";
+        withCommand("sh", "-c", command);
+    }
 
-        copyFileToContainer(
-            Transferable.of(command.getBytes(StandardCharsets.UTF_8), 0777),
-            STARTER_SCRIPT
+    @Override
+    @SneakyThrows
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        String brokerAdvertisedListener = brokerAdvertisedListener(containerInfo);
+        ExecResult result = execInContainer(
+            "kafka-configs",
+            "--alter",
+            "--bootstrap-server", brokerAdvertisedListener,
+            "--entity-type", "brokers",
+            "--entity-name", getEnvMap().get("KAFKA_BROKER_ID"),
+            "--add-config",
+            "advertised.listeners=[" + String.join(",", getBootstrapServers(), brokerAdvertisedListener) + "]"
         );
+        if (result.getExitCode() != 0) {
+            throw new IllegalStateException(result.getStderr());
+        }
     }
 
     protected String brokerAdvertisedListener(InspectContainerResponse containerInfo) {
-        // Kafka supports only one INTER_BROKER listener, so we have to pick one.
-        // The current algorithm uses the following order of resolving the IP:
-        // 1. Custom network's IP set via `withNetwork`
-        // 2. Bridge network's IP
-        // 3. Best effort fallback to getNetworkSettings#ipAddress
-        String ipAddress = containerInfo.getNetworkSettings().getNetworks().entrySet()
-            .stream()
-            .filter(it -> it.getValue().getIpAddress() != null)
-            .max(Comparator.comparingInt(entry -> {
-                if (getNetwork() != null && getNetwork().getId().equals(entry.getValue().getNetworkID())) {
-                    return 2;
-                }
-
-                if ("bridge".equals(entry.getKey())) {
-                    return 1;
-                }
-
-                return 0;
-            }))
-            .map(it -> it.getValue().getIpAddress())
-            .orElseGet(() -> containerInfo.getNetworkSettings().getIpAddress());
-
-        return String.format("BROKER://%s:%s", ipAddress, "9092");
+        return String.format("BROKER://%s:%s", containerInfo.getConfig().getHostName(), "9092");
     }
 }

From 6d257e682ad01f87645317c21c851fb8db952ff1 Mon Sep 17 00:00:00 2001
From: Martin Gjaldbaek <martin@gjaldbaek.dk>
Date: Sun, 1 Aug 2021 07:44:33 +0200
Subject: [PATCH 1364/4969] Fix potential injection vulnerability (#4314)

See https://github.com/hrvey/combine-prs-workflow/releases/tag/1.2.0
---
 .github/workflows/combine-prs.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index e1d96a20895..2e8177458a0 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -105,7 +105,7 @@ jobs:
           BRANCHES_TO_COMBINE: ${{ steps.fetch-branch-names.outputs.result }}
           COMBINE_BRANCH_NAME: ${{ github.event.inputs.combineBranchName }}
         run: |
-          echo "${{steps.fetch-branch-names.outputs.result}}"
+          echo "$BRANCHES_TO_COMBINE"
           sourcebranches="${BRANCHES_TO_COMBINE%\"}"
           sourcebranches="${sourcebranches#\"}"
 
@@ -123,10 +123,12 @@ jobs:
       # Creates a PR with the new combined branch
       - uses: actions/github-script@v4.0.2
         name: Create Combined Pull Request
+        env:
+          PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }}
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const prString = `${{ steps.fetch-branch-names.outputs.prs-string }}`;
+            const prString = process.env.PRS_STRING;
             const body = 'This PR was created by the Combine PRs action by combining the following PRs:\n' + prString;
             await github.pulls.create({
               owner: context.repo.owner,

From 289521d84555b7680af3edb15a623a210cf08def Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Sun, 1 Aug 2021 06:46:26 +0100
Subject: [PATCH 1365/4969] Delete combine-prs.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removing because we’re now using an external script based on `gh` Which works pretty well for us.
---
 .github/workflows/combine-prs.yml | 140 ------------------------------
 1 file changed, 140 deletions(-)
 delete mode 100644 .github/workflows/combine-prs.yml

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
deleted file mode 100644
index 2e8177458a0..00000000000
--- a/.github/workflows/combine-prs.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-name: 'Combine PRs'
-
-# Controls when the action will run - in this case triggered manually
-on:
-  workflow_dispatch:
-    inputs:
-      branchPrefix:
-        description: 'Branch prefix to find combinable PRs based on'
-        required: true
-        default: 'dependabot'
-      mustBeGreen:
-        description: 'Only combine PRs that are green (status is success)'
-        required: true
-        default: 'true'
-      combineBranchName:
-        description: 'Name of the branch to combine PRs into'
-        required: true
-        default: 'combine-prs-branch'
-      ignoreLabel:
-        description: 'Exclude PRs with this label'
-        required: true
-        default: 'nocombine'
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "combine-prs"
-  combine-prs:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      - uses: actions/github-script@v4.0.2
-        id: fetch-branch-names
-        name: Fetch branch names
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', {
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            branches = [];
-            prs = [];
-            base_branch = null;
-            for (const pull of pulls) {
-              const branch = pull['head']['ref'];
-              console.log('Pull for branch: ' + branch);
-              if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) {
-                console.log('Branch matched: ' + branch);
-                statusOK = true;
-                if(${{ github.event.inputs.mustBeGreen }}) {
-                  console.log('Checking green status: ' + branch);
-                  const checkRuns = await github.request('GET /repos/{owner}/{repo}/commits/{ref}/check-runs', {
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    ref: branch
-                  });
-                  for await (const cr of checkRuns.data.check_runs) {
-                    console.log('Validating check conclusion: ' + cr.conclusion);
-                    if(cr.conclusion != 'success') {
-                      console.log('Discarding ' + branch + ' with check conclusion ' + cr.conclusion);
-                      statusOK = false;
-                    }
-                  }
-                }
-                console.log('Checking labels: ' + branch);
-                const labels = pull['labels'];
-                for(const label of labels) {
-                  const labelName = label['name'];
-                  console.log('Checking label: ' + labelName);
-                  if(labelName == '${{ github.event.inputs.ignoreLabel }}') {
-                    console.log('Discarding ' + branch + ' with label ' + labelName);
-                    statusOK = false;
-                  }
-                }
-                if (statusOK) {
-                  console.log('Adding branch to array: ' + branch);
-                  branches.push(branch);
-                  prs.push('#' + pull['number'] + ' ' + pull['title']);
-                  base_branch = pull['base']['ref'];
-                }
-              }
-            }
-
-            if (branches.length == 0) {
-              core.setFailed('No PRs/branches matched criteria');
-              return;
-            }
-
-            core.setOutput('base-branch', base_branch);
-            core.setOutput('prs-string', prs.join('\n'));
-
-            combined = branches.join(' ')
-            console.log('Combined: ' + combined);
-            return combined
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2.3.3
-        with:
-          fetch-depth: 0
-      # Creates a branch with other PR branches merged together
-      - name: Created combined branch
-        env:
-          BASE_BRANCH: ${{ steps.fetch-branch-names.outputs.base-branch }}
-          BRANCHES_TO_COMBINE: ${{ steps.fetch-branch-names.outputs.result }}
-          COMBINE_BRANCH_NAME: ${{ github.event.inputs.combineBranchName }}
-        run: |
-          echo "$BRANCHES_TO_COMBINE"
-          sourcebranches="${BRANCHES_TO_COMBINE%\"}"
-          sourcebranches="${sourcebranches#\"}"
-
-          basebranch="${BASE_BRANCH%\"}"
-          basebranch="${basebranch#\"}"
-
-          git config pull.rebase false
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-
-          git branch $COMBINE_BRANCH_NAME $basebranch
-          git checkout $COMBINE_BRANCH_NAME
-          git pull origin $sourcebranches --no-edit
-          git push origin $COMBINE_BRANCH_NAME
-      # Creates a PR with the new combined branch
-      - uses: actions/github-script@v4.0.2
-        name: Create Combined Pull Request
-        env:
-          PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }}
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const prString = process.env.PRS_STRING;
-            const body = 'This PR was created by the Combine PRs action by combining the following PRs:\n' + prString;
-            await github.pulls.create({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              title: 'Combined PR',
-              head: '${{ github.event.inputs.combineBranchName }}',
-              base: '${{ steps.fetch-branch-names.outputs.base-branch }}',
-              body: body
-            });

From 676845417c88ac136fd5df323e788f16beec817f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:35 +0000
Subject: [PATCH 1366/4969] Bump mysql-connector-java from 8.0.25 to 8.0.26 in
 /modules/jdbc-test

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26.
- [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.25...8.0.26)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 99cba7dcb70..17c44383f74 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -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'
 }

From d5d91b5d80efa0d95ee5e0b52fd028951e539615 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:36 +0000
Subject: [PATCH 1367/4969] Bump java-client from 3.1.6 to 3.2.0 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.1.6 to 3.2.0.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.1.6...java-client-3.2.0)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 40f59128ec8..823b88a983e 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -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'
 }

From 42a4fddccf1de98a7b7d1b4b98f4e9a0f5a40100 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:37 +0000
Subject: [PATCH 1368/4969] Bump slf4j-api from 1.7.30 to 1.7.32 in /core

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.32.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.32)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d7ccb9364f8..29c521a97e8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -100,7 +100,7 @@ dependencies {
     }
 
     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'

From 41e7cede1a4bee67c1d72504168c2579b5e46d84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:37 +0000
Subject: [PATCH 1369/4969] Bump postgresql from 42.2.22 to 42.2.23 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.22 to 42.2.23.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.23/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9b7063e3a0c..410706429d5 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -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'

From a622e0d06c3dbcf3086ecc4f21963f07362f6f2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:37 +0000
Subject: [PATCH 1370/4969] Bump mysql-connector-java in /modules/junit-jupiter

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26.
- [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.25...8.0.26)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9554f2c9e5b..2722f659bdd 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -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'
 }
 

From f120d5e64b1173bb2b30db9566e70fead0443286 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:37 +0000
Subject: [PATCH 1371/4969] Bump r2dbc-mariadb from 1.0.1 to 1.0.2 in
 /modules/mariadb

Bumps [r2dbc-mariadb](https://github.com/mariadb-corporation/mariadb-connector-r2dbc) from 1.0.1 to 1.0.2.
- [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/compare/1.0.1...1.0.2)

---
updated-dependencies:
- dependency-name: org.mariadb:r2dbc-mariadb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ca267a1fe7c..e9080ce6131 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,11 +7,11 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.1'
+    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.2'
 
     testImplementation project(':jdbc-test')
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'org.mariadb:r2dbc-mariadb:1.0.0'
+    testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'
 }

From 25880f94fd70c0443d83f493ef3c71ee2f9caa9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:41 +0000
Subject: [PATCH 1372/4969] Bump aws-java-sdk-dynamodb from 1.12.16 to 1.12.37
 in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.16 to 1.12.37.
- [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.12.16...1.12.37)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c92b1969147..85c91332c12 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.16'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.37'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.37'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 2ef95ba8d7c1f171d9d4eefbdc639c91ceaddc65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:42 +0000
Subject: [PATCH 1373/4969] Bump jedis from 3.6.1 to 3.6.3 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 3.6.1 to 3.6.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.6.1...v3.6.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9554f2c9e5b..e48d28a5e5e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -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')

From 1f84c2af02453e841297b306d61e3e234c9f102a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:43 +0000
Subject: [PATCH 1374/4969] Bump mysql-connector-java from 8.0.25 to 8.0.26 in
 /modules/mysql

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26.
- [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.25...8.0.26)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a14fa678280..db2deac2d10 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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'

From 695c77f73e56406d55aeb18800fcf73f0901c858 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:43 +0000
Subject: [PATCH 1375/4969] Bump mongo-java-driver from 3.12.7 to 3.12.9 in
 /core

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.7 to 3.12.9.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.7...r3.12.9)

---
updated-dependencies:
- dependency-name: org.mongodb:mongo-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d7ccb9364f8..2677486fa58 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -140,7 +140,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:3.6.1'
     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')

From ab2ede992f69dab8379177832a4fe95b330db930 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:44 +0000
Subject: [PATCH 1376/4969] Bump HikariCP from 4.0.3 to 5.0.0 in /modules/spock

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.3 to 5.0.0.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.3...HikariCP-5.0.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6ee936b7ca7..56f35ffe695 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ 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'

From d8737a9154b35ed3981803ac81a3f3ded6e16631 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:48 +0000
Subject: [PATCH 1377/4969] Bump transport from 7.13.2 to 7.13.4 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.13.2 to 7.13.4.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.13.2...v7.13.4)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 67e03df2945..180f373bddd 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -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'
 }

From 2e53d6deba8df7aba18502bc86b56f0ba510200f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:48 +0000
Subject: [PATCH 1378/4969] Bump aws-java-sdk-s3 from 1.12.16 to 1.12.37 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.16 to 1.12.37.
- [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.12.16...1.12.37)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 031a601bdc9..5158325fa92 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ 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 'software.amazon.awssdk:s3:2.16.97'

From f8ff174917c480019cf2bd361eab01d33397d974 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:52 +0000
Subject: [PATCH 1379/4969] Bump slf4j-api from 1.7.30 to 1.7.32 in /examples

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.32.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.32)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index c5706da277a..6ca8b1ae664 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ 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'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 58f31827717..56dab9c4951 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 4fb93cb71b5..771f55551ea 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -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'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index e803f616998..a806f483938 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -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'

From 3063021a6bc1d6739611339c0cfb0234ce78554d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:54 +0000
Subject: [PATCH 1380/4969] Bump postgresql from 42.2.22 to 42.2.23 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.22 to 42.2.23.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.23/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6ee936b7ca7..7720067b620 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     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'

From e2cb908c5f67180d4ee7ba5bd39ab44fcc5a3cc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:55 +0000
Subject: [PATCH 1381/4969] Bump testcontainers from 1.15.3 to 1.16.0 in /core

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.15.3 to 1.16.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.15.3...1.16.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d7ccb9364f8..3ea1a33a7e3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -95,7 +95,7 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.15.3', {
+    baseline 'org.testcontainers:testcontainers:1.16.0', {
         exclude group: "*", module: "*"
     }
 

From a6f300c4bb1ec0af91f722a14701c68a11c504a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:57 +0000
Subject: [PATCH 1382/4969] Bump aws-java-sdk-logs from 1.12.16 to 1.12.37 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.16 to 1.12.37.
- [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.12.16...1.12.37)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 031a601bdc9..21652d15fa6 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.16'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     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'
 }

From d489acff1bd25b95aadc0c8ef4188d1c971ef2d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:00:59 +0000
Subject: [PATCH 1383/4969] Bump slf4j-simple from 1.7.30 to 1.7.32 in
 /examples

Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.32.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.32)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 79c14941c11..2a4650930a4 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'org.slf4j:slf4j-simple:1.7.30'
+    testImplementation 'org.slf4j:slf4j-simple:1.7.32'
 }

From f5f0dc65f5b872c60cccfc20911a39b89e39b03a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:01:01 +0000
Subject: [PATCH 1384/4969] Bump jedis from 3.6.1 to 3.6.3 in /core

Bumps [jedis](https://github.com/redis/jedis) from 3.6.1 to 3.6.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.6.1...v3.6.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index d7ccb9364f8..8b4abdb11c4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -138,7 +138,7 @@ 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'
 

From 381fa285b6f296c76fb2d7a533a5666bec8db91d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:01:07 +0000
Subject: [PATCH 1385/4969] Bump postgresql from 42.2.22 to 42.2.23 in
 /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.22 to 42.2.23.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.23/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c5706da277a..2bb27ae83cf 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     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'
 }

From b3f10668ec911d55dd16a2b420f13301affc8a60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Aug 2021 22:01:09 +0000
Subject: [PATCH 1386/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.5.20 to 1.5.21.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 7e832956303..db7e4ebe957 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -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'

From ed781dd45ecebb21b11de85d3ff9a79be66fe912 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Aug 2021 08:48:23 +0000
Subject: [PATCH 1387/4969] Bump aws-java-sdk-sqs from 1.12.19 to 1.12.37 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.19 to 1.12.37.
- [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.12.19...1.12.37)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 20c2f18a968..3d250f86087 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     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-sqs:1.12.37'
     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'

From 62c9be485de33406a121f541663ee192f79f1d22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Aug 2021 08:48:23 +0000
Subject: [PATCH 1388/4969] Bump tomcat-jdbc from 10.0.7 to 10.0.8 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.7 to 10.0.8.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 17c44383f74..32b7429f1b6 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.7'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.8'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.26'
 }

From 226b5a0dcd81d95f6a998b78c101b5dd8b777e6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Aug 2021 08:48:24 +0000
Subject: [PATCH 1389/4969] Bump s3 from 2.16.97 to 2.17.9 in
 /modules/localstack

Bumps s3 from 2.16.97 to 2.17.9.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 20c2f18a968..540ba35008d 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     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.37'
-    testImplementation 'software.amazon.awssdk:s3:2.16.97'
+    testImplementation 'software.amazon.awssdk:s3:2.17.9'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 8272e80ed53951c169b67cec272f83a799e556e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Aug 2021 08:48:34 +0000
Subject: [PATCH 1390/4969] Bump commons-compress from 1.20 to 1.21 in /core

Bumps commons-compress from 1.20 to 1.21.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ca1fde00aae..7d62a9fb153 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -103,7 +103,7 @@ dependencies {
     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'
+    api 'org.apache.commons:commons-compress:1.21'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From 97d0959b50dbad55ff1152f978da1b061d4bf660 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Aug 2021 08:48:35 +0000
Subject: [PATCH 1391/4969] Bump logback-classic from 1.2.3 to 1.2.5 in
 /examples

Bumps logback-classic from 1.2.3 to 1.2.5.

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 04d8f249511..1c01bc73a2e 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 8169ea8cf12..ff1b2995e02 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.2.23'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
     testImplementation 'org.testcontainers:postgresql'
 }
 
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 56dab9c4951..aae31424f66 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
     testImplementation 'org.testng:testng:7.4.0'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 771f55551ea..5da9e48a8e0 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index a806f483938..4635eceff7e 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From e58faa5c80bd0a242888d4911ea4ed73b22885da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Aug 2021 08:48:35 +0000
Subject: [PATCH 1392/4969] Bump postgresql from 42.2.22 to 42.2.23 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.22 to 42.2.23.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.23/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a3e271b0d59..abd1ae9feeb 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }

From b5331f48342521b7c0b1f27135b275835a04c44d Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 2 Aug 2021 12:27:52 +0200
Subject: [PATCH 1393/4969] Fix failing `PublicBinaryAPITest` for
 `DynamicPollInterval` (#4353)

Also change `jarFileTest` to take the shadowJar into consideration as input for the cache key.
---
 core/build.gradle                                                | 1 +
 .../jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index ca1fde00aae..824c1bb0c4e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -50,6 +50,7 @@ task jarFileTest(type: Test) {
     testClassesDirs = sourceSets.jarFileTest.output.classesDirs
     classpath = sourceSets.jarFileTest.runtimeClasspath
 
+    file(shadowJar.outputs.files.singleFile) // input for correct caching
     systemProperty("jarFile", shadowJar.outputs.files.singleFile)
 
     dependsOn(shadowJar)
diff --git a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
index 6a5a766d24e..208c8702654 100644
--- a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
@@ -93,6 +93,7 @@ public void setUp() {
             case "org/testcontainers/dockerclient/UnixSocketClientProviderStrategy":
             case "org/testcontainers/dockerclient/DockerClientProviderStrategy":
             case "org/testcontainers/dockerclient/WindowsClientProviderStrategy":
+            case "org/testcontainers/utility/DynamicPollInterval":
                 Assume.assumeTrue(false);
         }
     }

From 12b41272fdf9983dc6e9aed9b3ffd9b617c1f499 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 3 Aug 2021 11:52:38 +0100
Subject: [PATCH 1394/4969] Upgrade ryuk image to 0.3.2 (#4359)

---
 .../main/java/org/testcontainers/utility/ResourceReaper.java  | 2 +-
 .../utility/TestcontainersConfigurationTest.java              | 4 ++--
 docs/features/configuration.md                                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 75c6e209960..ca657675da4 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -95,7 +95,7 @@ public static String start(String hostIpAddress, DockerClient client) {
     @SneakyThrows(InterruptedException.class)
     public static String start(DockerClient client) {
         String ryukImage = ImageNameSubstitutor.instance()
-            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.1"))
+            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.2"))
             .asCanonicalNameString();
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index ff56f62e4e4..cbb36baf580 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -210,8 +210,8 @@ public void shouldReadReuseFromEnvironment() {
 
     @Test
     public void shouldTrimImageNames() {
-        userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.1 ");
-        assertEquals("trailing whitespace was not removed from image name property", "testcontainers/ryuk:0.3.1",newConfig().getRyukImage());
+        userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.2 ");
+        assertEquals("trailing whitespace was not removed from image name property", "testcontainers/ryuk:0.3.2",newConfig().getRyukImage());
     }
 
     private TestcontainersConfiguration newConfig() {
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index ba4487f8722..821d0cc7629 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -47,7 +47,7 @@ It takes a couple of seconds, but if you want to speed up your tests, you can di
 Testcontainers uses public Docker images to perform different actions like startup checks, VNC recording and others. 
 Some companies disallow the usage of Docker Hub, but you can override `*.image` properties with your own images from your private registry to workaround that.
 
-> **ryuk.container.image = testcontainers/ryuk:0.3.1**
+> **ryuk.container.image = testcontainers/ryuk:0.3.2**
 > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
 
 > **tinyimage.container.image = alpine:3.14**  
@@ -74,7 +74,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 
 ## Customizing Ryuk resource reaper
 
-> **ryuk.container.image = testcontainers/ryuk:0.3.1**
+> **ryuk.container.image = testcontainers/ryuk:0.3.2**
 > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
 
 > **ryuk.container.privileged = false**

From 611ebf5313a8148f4d7233227f2c0f1abaa5290a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Aug 2021 10:52:55 +0000
Subject: [PATCH 1395/4969] Bump mysql-connector-java from 8.0.25 to 8.0.26 in
 /modules/spock

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26.
- [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.25...8.0.26)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1e8e8f88503..a883d6027d0 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
 
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'
 }

From c6f0eaa12d0b99d3ed5005b3220fedfbdcee3a28 Mon Sep 17 00:00:00 2001
From: pioorg <piotr+github@przybyl.org>
Date: Tue, 3 Aug 2021 13:00:27 +0200
Subject: [PATCH 1396/4969] Remove accidental overwrite of user properties
 (#4311)

`userProperties` shall be saved only after successful update of config file.

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../org/testcontainers/utility/TestcontainersConfiguration.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index fddeec9c9b7..fd189a0ad59 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -306,8 +306,6 @@ public boolean updateUserConfig(@NonNull String prop, @NonNull String value) {
                 return false;
             }
 
-            userProperties.setProperty(prop, value);
-
             USER_CONFIG_FILE.createNewFile();
             try (OutputStream outputStream = new FileOutputStream(USER_CONFIG_FILE)) {
                 userProperties.store(outputStream, "Modified by Testcontainers");

From 1699e4708b15fcbf26b80f65fbbee48fa0b0c4d0 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 6 Aug 2021 14:49:53 +0200
Subject: [PATCH 1397/4969] Add japicmp to every module (#4364)

---
 build.gradle               | 18 ++++++++++++++++++
 core/build.gradle          | 36 +-----------------------------------
 gradle/japicmp.gradle      | 29 +++++++++++++++++++++++++++++
 modules/kafka/build.gradle |  9 +++++++++
 4 files changed, 57 insertions(+), 35 deletions(-)
 create mode 100644 gradle/japicmp.gradle

diff --git a/build.gradle b/build.gradle
index 98b9b5a30bc..723c429271d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,18 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        // https://github.com/melix/japicmp-gradle-plugin/issues/36
+        classpath 'com.google.guava:guava:30.1.1-jre'
+    }
+}
+
 plugins {
     id 'io.franzbecker.gradle-lombok' version '4.0.0'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -46,6 +58,12 @@ subprojects {
     // specific modules should be excluded from publication
     if ( ! ["test-support", "jdbc-test"].contains(it.name) && !it.path.startsWith(":docs:") && it != project(":docs") ) {
         apply from: "$rootDir/gradle/publishing.gradle"
+
+        if (it.name != "bom") {
+            apply plugin: "me.champeau.gradle.japicmp"
+            tasks.register('japicmp', me.champeau.gradle.japicmp.JapicmpTask)
+            apply from: "$rootDir/gradle/japicmp.gradle"
+        }
     }
 
     test {
diff --git a/core/build.gradle b/core/build.gradle
index 824c1bb0c4e..00d9cfda688 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,18 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:30.1.1-jre'
-    }
-}
-
-plugins {
-    id 'me.champeau.gradle.japicmp' version '0.2.9'
-}
-
 apply plugin: 'com.github.johnrengelman.shadow'
 
 description = "Testcontainers Core"
@@ -24,7 +9,6 @@ sourceSets {
 idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs
 
 configurations {
-    baseline
     shaded
     [api, compileOnly, testCompile]*.extendsFrom shaded
 }
@@ -57,17 +41,7 @@ task jarFileTest(type: Test) {
 }
 project.tasks.check.dependsOn(jarFileTest)
 
-task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
-    dependsOn(tasks.shadowJar)
-
-    oldClasspath = configurations.baseline
-    newClasspath = shadowJar.outputs.files
-    ignoreMissingClasses = true
-
-    accessModifier = "protected"
-    failOnModification = true
-    failOnSourceIncompatibility = true
-
+tasks.japicmp {
     packageExcludes = [
         "com.github.dockerjava.*",
         "org.testcontainers.shaded.*",
@@ -78,14 +52,6 @@ task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
     methodExcludes = []
 
     fieldExcludes = []
-
-    onlyBinaryIncompatibleModified = true
-    htmlOutputFile = file("$buildDir/reports/japi.html")
-}
-// do not run on Windows by default
-// TODO investigate zip issue on Windows
-if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
-    project.tasks.check.dependsOn(japicmp)
 }
 
 configurations.all {
diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
new file mode 100644
index 00000000000..58fbec9c0b7
--- /dev/null
+++ b/gradle/japicmp.gradle
@@ -0,0 +1,29 @@
+configurations {
+    baseline
+}
+
+dependencies {
+    baseline "org.testcontainers:${project.name}:1.16.0", {
+        exclude group: "*", module: "*"
+    }
+}
+
+tasks.japicmp {
+    dependsOn(tasks.shadowJar)
+
+    oldClasspath = configurations.baseline
+    newClasspath = shadowJar.outputs.files
+    ignoreMissingClasses = true
+
+    accessModifier = "protected"
+    failOnModification = true
+    failOnSourceIncompatibility = true
+
+    onlyBinaryIncompatibleModified = true
+    htmlOutputFile = file("$buildDir/reports/japi.html")
+}
+// do not run on Windows by default
+// TODO investigate zip issue on Windows
+if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+    project.tasks.check.dependsOn(japicmp)
+}
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index c83859e0c20..f7e9acda9a0 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -1,5 +1,14 @@
 description = "Testcontainers :: Kafka"
 
+tasks.japicmp {
+    // TODO clean after 1.17.0 is released
+    methodExcludes = [
+        // Overrides removed, not a breaking change per se
+        "org.testcontainers.containers.KafkaContainer#containerIsStarting(com.github.dockerjava.api.command.InspectContainerResponse,boolean)",
+        "org.testcontainers.containers.KafkaContainer#doStart()",
+    ]
+}
+
 dependencies {
     api project(':testcontainers')
 

From ef921c3c60d1c74d0eab9f9fed85fcd1ee8bf228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <social.mdelapenya@gmail.com>
Date: Thu, 12 Aug 2021 13:26:10 +0200
Subject: [PATCH 1398/4969] docs: add Elastic as user (#4369)

* docs: adds Elastic as a user

* docs: wording
---
 docs/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 16f61899947..8894e6bec73 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -173,6 +173,8 @@ A huge thank you to our sponsors:
 * [CloudBees](https://www.cloudbees.com/) - Integration testing of products, including but not limited to database and AWS/Localstack integration testing.
 * [Jenkins](https://www.jenkins.io/) - Integration testing of multiple plugins and the Trilead SSH2 fork maintained by the Jenkins community
   ([query](https://github.com/search?l=Maven+POM&q=org%3Ajenkinsci+testcontainers&type=Code)).
+* [Elastic](https://www.elastic.co) - Integration testing of the Java APM agent
+
 
 
 ## License

From 8638330ba6b3d53ce8e72ac898b8aef7d5f3fc57 Mon Sep 17 00:00:00 2001
From: Sankeerth <sankee168@gmail.com>
Date: Tue, 17 Aug 2021 03:24:03 -0400
Subject: [PATCH 1399/4969] Adding Alkira to list of TC users (#4370)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 8894e6bec73..af5bb4edcdb 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -174,6 +174,7 @@ A huge thank you to our sponsors:
 * [Jenkins](https://www.jenkins.io/) - Integration testing of multiple plugins and the Trilead SSH2 fork maintained by the Jenkins community
   ([query](https://github.com/search?l=Maven+POM&q=org%3Ajenkinsci+testcontainers&type=Code)).
 * [Elastic](https://www.elastic.co) - Integration testing of the Java APM agent
+* [Alkira](https://www.alkira.com/) - Testing of multiple micro-services using Kafka, PostgreSQL, Apache Zookeeper, Etcd and so on.
 
 
 

From 5b660560edbacd6cbbb768e112ce0ca619693a33 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 18 Aug 2021 17:18:28 +0200
Subject: [PATCH 1400/4969] Update mkdocs.yml to 1.16.0

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index f3cb11f7fe6..9929f5292c2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -96,4 +96,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.15.3
+    latest_version: 1.16.0

From 99b91b89b6ee3f8f0e9545e86d9f0744b301db30 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 19 Aug 2021 17:03:28 +0200
Subject: [PATCH 1401/4969] Update `OracleContainer` and re-activate on CI
 (#4298)

Will now use "gvenzl/oracle-xe:18.4.0-slim" by default.

Co-authored-by: Piotr <piotr@przybyl.org>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../utility/TestcontainersConfiguration.java  |  5 +-
 .../containers/OracleContainer.java           | 48 +++++++++++--------
 .../containers/OracleContainerProvider.java   |  9 ++--
 .../junit/oracle/SimpleOracleTest.java        | 13 +++--
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index fd189a0ad59..cbbe92dd76d 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -24,7 +24,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
@@ -61,6 +60,7 @@ public class TestcontainersConfiguration {
     private static final String PULSAR_IMAGE = "apachepulsar/pulsar";
     private static final String LOCALSTACK_IMAGE = "localstack/localstack";
     private static final String SSHD_IMAGE = "testcontainers/sshd";
+    private static final String ORACLE_IMAGE = "gvenzl/oracle-xe";
 
     private static final ImmutableMap<DockerImageName, String> CONTAINER_MAPPING = ImmutableMap.<DockerImageName, String>builder()
         .put(DockerImageName.parse(AMBASSADOR_IMAGE), "ambassador.container.image")
@@ -73,6 +73,7 @@ public class TestcontainersConfiguration {
         .put(DockerImageName.parse(PULSAR_IMAGE), "pulsar.container.image")
         .put(DockerImageName.parse(LOCALSTACK_IMAGE), "localstack.container.image")
         .put(DockerImageName.parse(SSHD_IMAGE), "sshd.container.image")
+        .put(DockerImageName.parse(ORACLE_IMAGE), "oracle.container.image")
         .build();
 
     @Getter(lazy = true)
@@ -146,7 +147,7 @@ public String getKafkaImage() {
 
     @Deprecated
     public String getOracleImage() {
-        return getEnvVarOrProperty("oracle.container.image", null);
+        return getImage(ORACLE_IMAGE).asCanonicalNameString();
     }
 
     @Deprecated
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 2573ef722e3..ccd705f5af9 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -1,45 +1,39 @@
 package org.testcontainers.containers;
 
 import com.google.common.collect.Sets;
+import org.apache.commons.lang.StringUtils;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Future;
 
-/**
- * @author gusohal
- */
 public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     public static final String NAME = "oracle";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe");
+
+
+    static final String DEFAULT_TAG = "18.4.0-slim";
+    static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
     private static final int ORACLE_PORT = 1521;
     private static final int APEX_HTTP_PORT = 8080;
 
     private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
     private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 120;
+    private static final List<String> ORACLE_SYSTEM_USERS = Arrays.asList("system", "sys");
 
-    private String username = "system";
-    private String password = "oracle";
-
-    private static String resolveImageName() {
-        String image = TestcontainersConfiguration.getInstance().getOracleImage();
-
-        if (image == null) {
-            throw new IllegalStateException("An image to use for Oracle containers must be configured. " +
-                "To do this, please place a file on the classpath named `testcontainers.properties`, " +
-                "containing `oracle.container.image=IMAGE`, where IMAGE is a suitable image name and tag.");
-        }
-        return image;
-    }
+    private String username = "test";
+    private String password = "test";
 
     /**
      * @deprecated use {@link OracleContainer(DockerImageName)} instead
      */
     @Deprecated
     public OracleContainer() {
-        this(resolveImageName());
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
     }
 
     public OracleContainer(String dockerImageName) {
@@ -74,7 +68,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:oracle:thin:" + getUsername() + "/" + getPassword() + "@" + getHost() + ":" + getOraclePort() + ":" + getSid();
+        return "jdbc:oracle:thin:" + getUsername() + "/" + getPassword() + "@" + getHost() + ":" + getOraclePort() + "/xepdb1";
     }
 
     @Override
@@ -89,12 +83,21 @@ public String getPassword() {
 
     @Override
     public OracleContainer withUsername(String username) {
+        if (StringUtils.isEmpty(username)) {
+            throw new IllegalArgumentException("Username cannot be null or empty");
+        }
+        if (ORACLE_SYSTEM_USERS.contains(username.toLowerCase())) {
+            throw new IllegalArgumentException("Username cannot be one of " + ORACLE_SYSTEM_USERS);
+        }
         this.username = username;
         return self();
     }
 
     @Override
     public OracleContainer withPassword(String password) {
+        if (StringUtils.isEmpty(password)) {
+            throw new IllegalArgumentException("Password cannot be null or empty");
+        }
         this.password = password;
         return self();
     }
@@ -122,4 +125,11 @@ public Integer getWebPort() {
     public String getTestQueryString() {
         return "SELECT 1 FROM DUAL";
     }
+
+    @Override
+    protected void configure() {
+        withEnv("ORACLE_PASSWORD", password);
+        withEnv("APP_USER", username);
+        withEnv("APP_USER_PASSWORD", password);
+    }
 }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java
index 853ffdaf17a..a298ae23359 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
+
 /**
  * Factory for Oracle containers.
  */
@@ -11,15 +13,14 @@ public boolean supports(String databaseType) {
 
     @Override
     public JdbcDatabaseContainer newInstance() {
-        return new OracleContainer();
+        return newInstance(OracleContainer.DEFAULT_TAG);
     }
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
         if (tag != null) {
-            throw new UnsupportedOperationException("Oracle database tag should be set in the configured image name");
+            return new OracleContainer(DockerImageName.parse(OracleContainer.IMAGE).withTag(tag));
         }
-
-        return new OracleContainer();
+        return newInstance();
     }
 }
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 2415fed11f4..7d026924442 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -1,21 +1,28 @@
 package org.testcontainers.junit.oracle;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
-@Ignore
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
+    public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe:18.4.0-slim");
+
     @Test
     public void testSimple() throws SQLException {
-        try (OracleContainer oracle = new OracleContainer()) {
+
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+                .withUsername("baz")
+                .withPassword("bar")
+        ) {
+            oracle.start();
             ResultSet resultSet = performQuery(oracle, "SELECT 1 FROM dual");
 
             int resultSetInt = resultSet.getInt(1);

From b1cdaf97c0ad110faab5c21cbd3e6412d5cff5b3 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 30 Aug 2021 13:57:14 +0200
Subject: [PATCH 1402/4969] Tune Cassandra options for faster startup (#4309)

* Tune Cassandra options for faster startup

* remove `setStartupAttempts`
---
 .../testcontainers/containers/CassandraContainer.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index 597b1c9b017..e3ae084cb8a 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -58,8 +58,15 @@ public CassandraContainer(DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPort(CQL_PORT);
-        setStartupAttempts(3);
         this.enableJmxReporting = false;
+
+        withEnv("CASSANDRA_SNITCH", "GossipingPropertyFileSnitch");
+        withEnv(
+            "JVM_OPTS",
+            "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0"
+        );
+        withEnv("HEAP_NEWSIZE", "128M");
+        withEnv("MAX_HEAP_SIZE", "1024M");
     }
 
     @Override

From 9f77a6dff067df4f01b7edd91afe4444a9c9b1d3 Mon Sep 17 00:00:00 2001
From: pioorg <piotr+github@przybyl.org>
Date: Wed, 1 Sep 2021 22:06:21 +0200
Subject: [PATCH 1403/4969] Shorten fallback to another strategy (#4386)

* Removed double check of configured Docker client strategy.
* Shortened the ping timeout (when choosing docker client) to 5 seconds.
* Added `client.ping.timeout` configuration option.
* Made relevant change in the docs.
---
 .../dockerclient/DockerClientProviderStrategy.java          | 6 ++++--
 .../testcontainers/utility/TestcontainersConfiguration.java | 4 ++++
 docs/features/configuration.md                              | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 248e40790aa..5c797b3b782 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -111,10 +111,11 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
 
         List<String> configurationFailures = new ArrayList<>();
 
+        String dockerClientStrategyClassName = TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName();
         return Stream
                 .concat(
                         Stream
-                                .of(TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName())
+                                .of(dockerClientStrategyClassName)
                                 .filter(Objects::nonNull)
                                 .flatMap(it -> {
                                     try {
@@ -136,6 +137,7 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                                 .peek(strategy -> log.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName())),
                         strategies
                                 .stream()
+                                .filter(it -> !it.getClass().getCanonicalName().equals(dockerClientStrategyClassName))
                                 .filter(DockerClientProviderStrategy::isApplicable)
                                 .sorted(Comparator.comparing(DockerClientProviderStrategy::getPriority).reversed())
                 )
@@ -145,7 +147,7 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
 
                         Info info;
                         try {
-                            info = Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS, () -> {
+                            info = Unreliables.retryUntilSuccess(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS, () -> {
                                 return strategy.PING_RATE_LIMITER.getWhenReady(() -> {
                                     log.debug("Pinging docker daemon...");
                                     return dockerClient.infoCmd().exec();
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index cbbe92dd76d..91d42e45ba0 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -210,6 +210,10 @@ public String getImageSubstitutorClassName() {
         return getEnvVarOrProperty("image.substitutor", null);
     }
 
+    public Integer getClientPingTimeout() {
+        return Integer.parseInt(getEnvVarOrProperty("client.ping.timeout", "5"));
+    }
+
     @Nullable
     @Contract("_, !null, _ -> !null")
     private String getConfigurable(@NotNull final String propertyName, @Nullable final String defaultValue, Properties... propertiesSources) {
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 821d0cc7629..73876a51483 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -94,6 +94,11 @@ but does not allow starting privileged containers, you can turn off the Ryuk con
 > **pull.pause.timeout = 30**
 > By default Testcontainers will abort the pull of an image if the pull appears stalled (no data transferred) for longer than this duration (in seconds).
 
+## Customizing client ping behaviour
+
+> **client.ping.timeout = 5**
+> Specifies for how long Testcontainers will try to connect to the Docker client to obtain valid info about the client before giving up and trying next strategy, if applicable (in seconds).
+
 ## Customizing Docker host detection
 
 Testcontainers will attempt to detect the Docker environment and configure everything to work automatically.

From fd9d57387c01a83e448591de8a900e27994454e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:30 +0000
Subject: [PATCH 1404/4969] Bump tomcat-jdbc from 10.0.8 to 10.0.10 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.8 to 10.0.10.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 32b7429f1b6..8145855684f 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.8'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.10'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.26'
 }

From eccb15945cb0903f4fc6ea279a5d3de6648e868f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:31 +0000
Subject: [PATCH 1405/4969] Bump jedis from 3.6.3 to 3.7.0 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 3.6.3 to 3.7.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v3.6.3...v3.7.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a3e271b0d59..0ece8912384 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:3.6.3'
+    testImplementation 'redis.clients:jedis:3.7.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')

From b976691f0e8bba50555a68d7e003950d087b6016 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:31 +0000
Subject: [PATCH 1406/4969] Bump annotations from 21.0.1 to 22.0.0 in
 /modules/mysql

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 db2deac2d10..e465acaaee3 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
 }

From a7e047f81bbd0a0897a87ead663123774068ce22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:31 +0000
Subject: [PATCH 1407/4969] Bump mariadb-java-client from 2.7.3 to 2.7.4 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.7.3 to 2.7.4.
- [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.7.3...2.7.4)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e9080ce6131..037573f6143 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.2'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From cdd1033d3ea98fa06a52009f9947610154ace342 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:31 +0000
Subject: [PATCH 1408/4969] Bump annotations from 21.0.1 to 22.0.0 in
 /modules/jdbc

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 4f6c6608b4d..c7ff4a2e76f 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':database-commons')
     testImplementation project(':test-support')
 
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.8'

From ae23f9ef82e3a9ed041d6948060d36d400b80031 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:31 +0000
Subject: [PATCH 1409/4969] Bump jedis from 3.6.3 to 3.7.0 in /core

Bumps [jedis](https://github.com/redis/jedis) from 3.6.3 to 3.7.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v3.6.3...v3.7.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 00d9cfda688..7f1a21ae28d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -105,7 +105,7 @@ dependencies {
     }
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:3.6.3'
+    testImplementation 'redis.clients:jedis:3.7.0'
     testImplementation 'com.rabbitmq:amqp-client:5.12.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.9'
 

From 713d324612d09dc5ad2be301e21cca3e31bfbb89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:31 +0000
Subject: [PATCH 1410/4969] Bump annotations from 21.0.1 to 22.0.0 in
 /modules/spock

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1e8e8f88503..5fcdeb5a2c6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
 
-    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
+    testCompileClasspath 'org.jetbrains:annotations:22.0.0'
 }
 
 sourceJar {

From 5774925e060c3a7b9861de72dfced5c4cc9f1579 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:31 +0000
Subject: [PATCH 1411/4969] Bump annotations from 21.0.1 to 22.0.0 in
 /modules/nginx

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 5bfcfae910b..b8f45d394c1 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From e3c118925ec47904f77285e951c013628932e5ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:32 +0000
Subject: [PATCH 1412/4969] Bump annotations from 21.0.1 to 22.0.0 in
 /modules/selenium

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index f91bb361775..5cff4c544b3 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'
 }

From bc766614dc994e932c5b76d623b053519e249e84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:32 +0000
Subject: [PATCH 1413/4969] Bump aws-java-sdk-dynamodb from 1.12.37 to 1.12.60
 in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.37 to 1.12.60.
- [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.12.37...1.12.60)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 85c91332c12..4cf9b02f160 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.37'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.60'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.37'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From b86dc29bb1137a76711b41ddce6c9c9be449567f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:32 +0000
Subject: [PATCH 1414/4969] Bump tomcat-jdbc from 10.0.8 to 10.0.10 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.8 to 10.0.10.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 4f6c6608b4d..d08b9b68dd8 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:21.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.8'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.10'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From e48e366577227395c312cc869aa64a058f2fed56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:32 +0000
Subject: [PATCH 1415/4969] Bump mssql-jdbc in /modules/mssqlserver

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 9.3.1.jre8-preview to 9.4.0.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 74e77d474e9..cd797a9807f 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -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'
 }

From eeb375ee265b28ecd9a83763484639d0c630dfe5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:33 +0000
Subject: [PATCH 1416/4969] Bump java-client from 3.2.0 to 3.2.1 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.2.0...java-client-3.2.1)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 823b88a983e..99cf927173e 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.couchbase.client:java-client:3.2.0'
+    testImplementation 'com.couchbase.client:java-client:3.2.1'
     testImplementation 'org.awaitility:awaitility:4.1.0'
 }

From 1a754ff370c5fece493464d49e19caf158141418 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:33 +0000
Subject: [PATCH 1417/4969] Bump annotations from 21.0.1 to 22.0.0 in
 /modules/postgresql

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 410706429d5..1842a0e7dd7 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -16,5 +16,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
 }

From 4955e7ad871c8fb2fd623f2832a914c94fbf6937 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:35 +0000
Subject: [PATCH 1418/4969] Bump mockito-core from 3.11.2 to 3.12.4 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.2 to 3.12.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.2...v3.12.4)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a3e271b0d59..6c520397d5a 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:3.6.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:3.11.2') {
+    testImplementation ('org.mockito:mockito-core:3.12.4') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.20.2'

From 6f8bebfcb260f6c26994c9b7dfa4fa9206bfca20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:36 +0000
Subject: [PATCH 1419/4969] Bump mockito-core from 3.11.2 to 3.12.4 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.2 to 3.12.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.2...v3.12.4)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 00d9cfda688..37fb9e1bae1 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.12.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.9'
 
-    testImplementation ('org.mockito:mockito-core:3.11.2') {
+    testImplementation ('org.mockito:mockito-core:3.12.4') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From faff9872c638dab04e40d601020fb151ed2f5ad3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:37 +0000
Subject: [PATCH 1420/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.13.0 to 7.14.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.13.0...v7.14.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 180f373bddd..a27d2b2ecab 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.13.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.14.1"
     testImplementation "org.elasticsearch.client:transport:7.13.4"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 34a912b7da3ea62a10d80e34cf03a6a4ca51892f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:38 +0000
Subject: [PATCH 1421/4969] Bump aws-java-sdk-logs from 1.12.37 to 1.12.60 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.37 to 1.12.60.
- [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.12.37...1.12.60)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9c3fc24d658..3a307cac1b6 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     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.37'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.37'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
     testImplementation 'software.amazon.awssdk:s3:2.17.9'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From e03d8c5c038270dec66f5416ea049570d4e5becc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:38 +0000
Subject: [PATCH 1422/4969] Bump cucumber-junit from 6.9.1 to 6.11.0 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 6.9.1 to 6.11.0.
- [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.9.1...v6.11.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 ddffea03dfe..6d3cfc66955 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.9.1'
-    testImplementation 'io.cucumber:cucumber-junit:6.9.1'
+    testImplementation 'io.cucumber:cucumber-junit:6.11.0'
     testImplementation 'org.testcontainers:selenium'
 }

From fd594634f95b0e9d824e3873c8d7b5bf7960cde1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:46 +0000
Subject: [PATCH 1423/4969] Bump annotations from 21.0.1 to 22.0.0 in /examples

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/mongodb-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 8d8c8731c86..86b3e978019 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -9,5 +9,5 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
+    testCompileClasspath 'org.jetbrains:annotations:22.0.0'
 }

From ebc61e7438d1c8c0b7a3bfcb3af6f5db086a50a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:47 +0000
Subject: [PATCH 1424/4969] Bump mongo-java-driver from 3.12.9 to 3.12.10 in
 /core

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.9 to 3.12.10.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.9...r3.12.10)

---
updated-dependencies:
- dependency-name: org.mongodb:mongo-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 00d9cfda688..df1d8c1579d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -107,7 +107,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:3.6.3'
     testImplementation 'com.rabbitmq:amqp-client:5.12.0'
-    testImplementation 'org.mongodb:mongo-java-driver:3.12.9'
+    testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
     testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')

From ec4cd8bbec86463deb79cb39990fc261a271e566 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:51 +0000
Subject: [PATCH 1425/4969] Bump org.springframework.boot from 2.5.2 to 2.5.4
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.5.2 to 2.5.4.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.2...v2.5.4)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 70c4a2683b0..49893845273 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.5.2'
+    id 'org.springframework.boot' version '2.5.4'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index db7e4ebe957..e32a1446651 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.5.2"
+    id("org.springframework.boot") version "2.5.4"
     id("org.jetbrains.kotlin.jvm") version "1.5.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.21"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 00f6f22728d..3f93d3c153c 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.5.2'
+    id 'org.springframework.boot' version '2.5.4'
 }
 apply plugin: 'io.spring.dependency-management'
 

From bb67ee0f411fc28b38268bfb9815f74df0dfadc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:53 +0000
Subject: [PATCH 1426/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.5.21 to 1.5.30.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index db7e4ebe957..9cf3680a2aa 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -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.21"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.5.30"
 }
 
 apply plugin: 'io.spring.dependency-management'

From c7dcb7a149df3bbbdff127e7447a83677b5bcb39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:00:54 +0000
Subject: [PATCH 1427/4969] Bump gson from 2.8.7 to 2.8.8 in /examples

Bumps [gson](https://github.com/google/gson) from 2.8.7 to 2.8.8.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.7...gson-parent-2.8.8)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 04d8f249511..c869fd9cdc0 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.20"
     implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.8.7'
+    implementation 'com.google.code.gson:gson:2.8.8'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.mockito:mockito-all:1.10.19'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 56dab9c4951..541d55839ec 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     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.code.gson:gson:2.8.8'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 771f55551ea..21e35752540 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     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.code.gson:gson:2.8.8'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index a806f483938..1cd86d10bd4 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:3.6.1'
-    implementation 'com.google.code.gson:gson:2.8.7'
+    implementation 'com.google.code.gson:gson:2.8.8'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 

From 239fc52a798e25d6ba45ba2a92db98175bf6d335 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:01:11 +0000
Subject: [PATCH 1428/4969] Bump gradle-update/update-gradle-wrapper-action
 from 1.0.14 to 1.0.15

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 1.0.14 to 1.0.15.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/6356f411fa7c14aab1fb2ac2fd20762a629e2fbf...a116d8b533be6c4e71a8b3c3871b7344ca72bf12)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 272594c26df..f9f1ec85662 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@6356f411fa7c14aab1fb2ac2fd20762a629e2fbf # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@a116d8b533be6c4e71a8b3c3871b7344ca72bf12 # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From b588ad8f38da48e0af867a174e2a1e8786b364f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:01:15 +0000
Subject: [PATCH 1429/4969] Bump actions/setup-java from 2.1.0 to 2.3.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.1.0 to 2.3.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2.1.0...v2.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 .github/workflows/release.yml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 789c4fdd577..88587a6ab61 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.1.0
+      - uses: actions/setup-java@v2.3.0
         with:
           java-version: '8.0.292+10'
           distribution: adopt-hotspot
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.1.0
+      - uses: actions/setup-java@v2.3.0
         with:
           java-version: '8.0.292+10'
           distribution: adopt-hotspot
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 627d69befad..d44cd414fab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.1.0
+      - uses: actions/setup-java@v2.3.0
         with:
           java-version: '8.0.292+10'
           distribution: adopt-hotspot
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.1.0
+      - uses: actions/setup-java@v2.3.0
         with:
           java-version: '8.0.292+10'
           distribution: adopt-hotspot
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 943dfcf005a..73b3b2152c9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2.3.0
         with:
           java-version: '1.8'
       - name: Clear existing docker image cache

From 36a842728bc0ab73b6c038f29c9155eb3a6d8cbb Mon Sep 17 00:00:00 2001
From: pioorg <piotr+github@przybyl.org>
Date: Sat, 4 Sep 2021 13:28:28 +0200
Subject: [PATCH 1430/4969] Reverted saving user properties. (#4442)

---
 .../org/testcontainers/utility/TestcontainersConfiguration.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 91d42e45ba0..85b25ca8e43 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -311,6 +311,8 @@ public boolean updateUserConfig(@NonNull String prop, @NonNull String value) {
                 return false;
             }
 
+            userProperties.setProperty(prop, value);
+
             USER_CONFIG_FILE.createNewFile();
             try (OutputStream outputStream = new FileOutputStream(USER_CONFIG_FILE)) {
                 userProperties.store(outputStream, "Modified by Testcontainers");

From 8f99905899cca2df5cc70a174de7ec696127dc2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:25:57 +0000
Subject: [PATCH 1431/4969] Bump transport from 7.13.4 to 7.14.1 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.13.4 to 7.14.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.13.4...v7.14.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a27d2b2ecab..183b2428ba8 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -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'
 }

From 21e7b0e207c2e6217bb671c5ead7076d338de70d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:07 +0000
Subject: [PATCH 1432/4969] Bump aws-java-sdk-s3 from 1.12.37 to 1.12.62 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.37 to 1.12.62.
- [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.12.37...1.12.62)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3a307cac1b6..5220306a3f1 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ 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-logs:1.12.60'

From bf6fa3830f47c0a2930107fc283b4e4cb94870b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:08 +0000
Subject: [PATCH 1433/4969] Bump amqp-client from 5.12.0 to 5.13.1 in /core

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.12.0 to 5.13.1.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.12.0...v5.13.1)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index dcf83d1a6f6..fa0e18e40e8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -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') {

From d2e31c172ce1154a229ea5bfeb9a422adbd4ec6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:12 +0000
Subject: [PATCH 1434/4969] Bump cucumber-java from 6.9.1 to 6.11.0 in
 /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 6.9.1 to 6.11.0.
- [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.9.1...v6.11.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 6d3cfc66955..6febeeec483 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.9.1'
+    testImplementation 'io.cucumber:cucumber-java:6.11.0'
     testImplementation 'io.cucumber:cucumber-junit:6.11.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 077c648a0e1bb3e3803c99851d711ede9797ab77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:13 +0000
Subject: [PATCH 1435/4969] Bump org.jetbrains.kotlin.jvm from 1.5.10 to 1.5.30
 in /examples

Bumps org.jetbrains.kotlin.jvm from 1.5.10 to 1.5.30.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 744883204bc..6096fcb37b4 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -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"
 }
 

From c15212d73e4467e8c123245eb644333008e03aca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:13 +0000
Subject: [PATCH 1436/4969] Bump annotations from 21.0.1 to 22.0.0 in /core

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index dcf83d1a6f6..e5a33c49ade 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -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') {

From f829069b8dded7aa3115f4067fa15ee15a9227e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:21 +0000
Subject: [PATCH 1437/4969] Bump aws-java-sdk-sqs from 1.12.37 to 1.12.62 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.37 to 1.12.62.
- [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.12.37...1.12.62)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3a307cac1b6..a569f7dbf2b 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     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.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 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From a9f6c44a81e5c36aef961c7f10eed026791b6fba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:23 +0000
Subject: [PATCH 1438/4969] Bump s3 from 2.17.9 to 2.17.34 in
 /modules/localstack

Bumps s3 from 2.17.9 to 2.17.34.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3a307cac1b6..908055ddfd1 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     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-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'
 }

From cbed98a8101f23b65a85f8f183ccf18b366a89b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:26:28 +0000
Subject: [PATCH 1439/4969] Bump jedis from 3.6.1 to 3.7.0 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.6.1...v3.7.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index b0555f1b38b..fe269d58e77 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -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'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index bba7d9bfc51..2d9f50b86bd 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -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'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 1199b908048..f3a18e685f3 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -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'

From 475e6192010493e3208d69db8d9637d730df8fd4 Mon Sep 17 00:00:00 2001
From: Oguzhan Ozdemir <aoozdemir@live.com>
Date: Tue, 7 Sep 2021 11:07:09 +0300
Subject: [PATCH 1440/4969] Add Thundra Foresight Integration to the CI Build
 (#4313)

---
 .github/workflows/ci.yml | 22 ++++++++++++++++++++--
 README.md                |  2 ++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d44cd414fab..a6ae55e16b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,14 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
 jobs:
+  thundra_test_initializer:
+    runs-on: ubuntu-latest
+    outputs:
+      thundra_agent_testrun_id: ${{ steps.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: thundra_test_initializer
+        uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
     runs-on: ubuntu-18.04
     outputs:
@@ -34,7 +42,7 @@ jobs:
           echo $TASKS
           echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
   check:
-    needs: find_gradle_jobs
+    needs: [find_gradle_jobs, thundra_test_initializer]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
@@ -53,9 +61,19 @@ jobs:
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
       - name: Clear existing docker image cache
         run: docker image prune -af
+      - name: Thundra Gradle Test Instrumentation
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: thundra-io/thundra-gradle-test-action@v1
+        with:
+          apikey: ${{ secrets.THUNDRA_API_KEY }}
+          project_id: ${{ secrets.THUNDRA_PROJECT_ID }}
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
-          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
+          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}} \
+            $($THUNDRA_GRADLE_INIT_SCRIPT_PATH || echo "--init-script $THUNDRA_GRADLE_INIT_SCRIPT_PATH")
+        env:
+          THUNDRA_AGENT_TEST_RUN_ID: ${{ needs.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
+          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1
   httpclient5_test:
     runs-on: ubuntu-18.04
     steps:
diff --git a/README.md b/README.md
index d3446cbb31e..752c501e91f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Testcontainers
 
+[![Thundra Foresight](https://thundra-assets-prod.s3.us-west-2.amazonaws.com/images/badges/thundra-foresight-badge-enabled.svg)](https://foresight.thundra.live/testRuns/5a49cc30-f063-11eb-9a03-0242ac130003)
+
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 
 ![Testcontainers logo](docs/logo.png)

From 8746f20aec2f1f0140a5ae66639e690c3388a4b1 Mon Sep 17 00:00:00 2001
From: Galen S <56940276+schmidt-galen-heb@users.noreply.github.com>
Date: Wed, 8 Sep 2021 06:49:34 -0500
Subject: [PATCH 1441/4969] Use POSIX mode for large numbers in tar archives
 (#4384) (#4388)

* Use POSIX mode for large numbers in tar archives (#4384)

* PR feedback
---
 .../main/java/org/testcontainers/containers/ContainerState.java  | 1 +
 .../org/testcontainers/images/builder/ImageFromDockerfile.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index da87dbdf724..5de9ef7c566 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -272,6 +272,7 @@ default void copyFileToContainer(Transferable transferable, String containerPath
             TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(byteArrayOutputStream)
         ) {
             tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+            tarArchive.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
 
             transferable.transferTo(tarArchive, containerPath);
             tarArchive.finish();
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index b36779f1b9e..05bb6911c3e 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -123,6 +123,7 @@ public void onNext(BuildResponseItem item) {
             // To build an image, we have to send the context to Docker in TAR archive format
             try (TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(new GZIPOutputStream(out))) {
                 tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+                tarArchive.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
 
                 for (Map.Entry<String, Transferable> entry : transferables.entrySet()) {
                     Transferable transferable = entry.getValue();

From 79b064bcb0e1ffba6058fc2e7347cb41934adc00 Mon Sep 17 00:00:00 2001
From: Denis Zavedeev <13610290+cac03@users.noreply.github.com>
Date: Tue, 14 Sep 2021 22:59:40 +0300
Subject: [PATCH 1442/4969] Fix `CmdModifierTest#testMemoryLimitModified` in
 cgroup2 environment. (#4375)

* Fix `CmdModifierTest#testMemoryLimitModified` in cgroup2 environment.

The `testMemoryLimitModified` was failing in cgroup2 environment because of the missing
`/sys/fs/cgroup/memory/memory.limit_in_bytes` file.

In the cgroup2 environment a new file should be checked instead -- `/sys/fs/cgroup/memory.max`.

This commit intrdocues changes to `cat` both files:

1. `/sys/fs/cgroup/memory/memory.limit_in_bytes` from the first version of cgroup
2. `/sys/fs/cgroup/memory.max` from the second

Similar issues:

1. https://github.com/oracle/docker-images/issues/1939
2. https://github.com/apify/apify-js/issues/693

* Use `docker info` to distinguish cgroup version

* Use `DockerClientFactory.instance().client()` instead of `memoryLimitedRedis.getDockerClient()`
---
 .../src/test/java/generic/CmdModifierTest.java  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index 73338ba38ee..5306426070f 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -1,12 +1,16 @@
 package generic;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Info;
 import org.junit.Rule;
 import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import static org.junit.Assert.assertEquals;
 
@@ -39,7 +43,18 @@ public void testHostnameModified() throws IOException, InterruptedException {
 
     @Test
     public void testMemoryLimitModified() throws IOException, InterruptedException {
-        final Container.ExecResult execResult = memoryLimitedRedis.execInContainer("cat", "/sys/fs/cgroup/memory/memory.limit_in_bytes");
+        final Container.ExecResult execResult = memoryLimitedRedis.execInContainer("cat", getMemoryLimitFilePath());
         assertEquals(String.valueOf(memoryInBytes), execResult.getStdout().trim());
     }
+
+    private String getMemoryLimitFilePath() {
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+        Info info = dockerClient.infoCmd().exec();
+        Object cgroupVersion = info.getRawValues().get("CgroupVersion");
+        boolean cgroup2 = Objects.equals("2", cgroupVersion);
+        if (cgroup2) {
+            return "/sys/fs/cgroup/memory.max";
+        }
+        return "/sys/fs/cgroup/memory/memory.limit_in_bytes";
+    }
 }

From 5e88d744dcdf26965a8a4176f52c94e19be204f4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 15 Sep 2021 09:05:30 +0200
Subject: [PATCH 1443/4969] Update to `docker-java` 3.2.12 (#4459)

* Try `docker-java` 3.2.12

* use shaded configuration

* Update build.gradle
---
 core/build.gradle                             | 10 ++++++----
 .../testcontainers/DockerClientFactory.java   | 19 +++++++++++++++++--
 .../org/testcontainers/LazyDockerClient.java  | 16 ----------------
 .../AuthDelegatingDockerClientConfig.java     | 16 +++++-----------
 4 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 core/src/main/java/org/testcontainers/LazyDockerClient.java

diff --git a/core/build.gradle b/core/build.gradle
index ed1e82271ed..f77461a06fc 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -77,9 +77,11 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.1.0'
 
-    api "com.github.docker-java:docker-java-api:3.2.11"
+    shaded platform('com.github.docker-java:docker-java-bom:3.2.12')
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.11') {
+    api "com.github.docker-java:docker-java-api"
+
+    shaded ('com.github.docker-java:docker-java-core') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
         exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -88,13 +90,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.11') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.11'
+    api 'com.github.docker-java:docker-java-transport-zerodep'
 
     shaded "org.yaml:snakeyaml:1.29"
 
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 554860d8985..36c4c717b76 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -1,6 +1,7 @@
 package org.testcontainers;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.DockerClientDelegate;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
@@ -94,7 +95,17 @@ public class DockerClientFactory {
     }
 
     public static DockerClient lazyClient() {
-        return LazyDockerClient.INSTANCE;
+        return new DockerClientDelegate() {
+            @Override
+            protected DockerClient getDockerClient() {
+                return instance().client();
+            }
+
+            @Override
+            public String toString() {
+                return "LazyDockerClient";
+            }
+        };
     }
 
     /**
@@ -177,7 +188,11 @@ public DockerClient client() {
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
         log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
-        final DockerClient client = new DelegatingDockerClient(strategy.getDockerClient()) {
+        final DockerClient client = new DockerClientDelegate() {
+
+            @Getter
+            final DockerClient dockerClient = strategy.getDockerClient();
+
             @Override
             public void close() {
                 throw new IllegalStateException("You should never close the global DockerClient!");
diff --git a/core/src/main/java/org/testcontainers/LazyDockerClient.java b/core/src/main/java/org/testcontainers/LazyDockerClient.java
deleted file mode 100644
index 49ebf9330a7..00000000000
--- a/core/src/main/java/org/testcontainers/LazyDockerClient.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.testcontainers;
-
-import com.github.dockerjava.api.DockerClient;
-import lombok.ToString;
-import lombok.experimental.Delegate;
-
-@ToString
-enum LazyDockerClient implements DockerClient {
-
-    INSTANCE;
-
-    @Delegate
-    final DockerClient getDockerClient() {
-        return DockerClientFactory.instance().client();
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
index 5acb7ab8835..1f534eb59e5 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.DockerClientConfig;
-import lombok.experimental.Delegate;
+import com.github.dockerjava.core.DockerClientConfigDelegate;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.RegistryAuthLocator;
@@ -18,20 +18,18 @@
  * TODO move to docker-java
  */
 @Slf4j
-class AuthDelegatingDockerClientConfig implements DockerClientConfig {
-
-    @Delegate(excludes = DelegateExclusions.class)
-    private DockerClientConfig delegate;
+class AuthDelegatingDockerClientConfig extends DockerClientConfigDelegate {
 
     public AuthDelegatingDockerClientConfig(DockerClientConfig delegate) {
-        this.delegate = delegate;
+        super(delegate);
     }
 
+    @Override
     public AuthConfig effectiveAuthConfig(String imageName) {
         // allow docker-java auth config to be used as a fallback
         AuthConfig fallbackAuthConfig;
         try {
-            fallbackAuthConfig = delegate.effectiveAuthConfig(imageName);
+            fallbackAuthConfig = super.effectiveAuthConfig(imageName);
         } catch (Exception e) {
             log.debug("Delegate call to effectiveAuthConfig failed with cause: '{}'. " +
                 "Resolution of auth config will continue using RegistryAuthLocator.",
@@ -47,8 +45,4 @@ public AuthConfig effectiveAuthConfig(String imageName) {
         log.debug("Effective auth config [{}]", toSafeString(effectiveAuthConfig));
         return effectiveAuthConfig;
     }
-
-    private interface DelegateExclusions {
-        AuthConfig effectiveAuthConfig(String imageName);
-    }
 }

From 6cde564776d9af26e4b69f80e1344f1ea7d0f678 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 16 Sep 2021 13:45:24 +0300
Subject: [PATCH 1444/4969] Allow to disable configuration of
 `EnvironmentAndSystemPropertyClientProviderStrategy` through Testcontainers
 (#4387)

Adds the `dockerconfig.source` property that can be used to change the way `EnvironmentAndSystemPropertyClientProviderStrategy` is configured.  Additionally, `EnvironmentAndSystemPropertyClientProviderStrategy` is not persistable anymore.

Currently supports the following modes:
* `auto` (which is the default), meaning that the Testcontainers configuration mechanisms can be used to configure docker-java
* `autoIgnoringUserProperties`, same as `auto`, but ignoring values set in the user properties
---
 ...dSystemPropertyClientProviderStrategy.java | 38 ++++++++++++++-----
 .../utility/TestcontainersConfiguration.java  | 17 +--------
 ...temPropertyClientProviderStrategyTest.java | 30 +++++++++++++++
 .../TestcontainersConfigurationTest.java      |  8 ----
 docs/features/configuration.md                |  4 ++
 5 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
index e9bdbd90bea..06fdf387d6a 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientConfig;
+import lombok.Getter;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.util.Optional;
@@ -25,13 +26,32 @@ public final class EnvironmentAndSystemPropertyClientProviderStrategy extends Do
 
     private final DockerClientConfig dockerClientConfig;
 
+    @Getter
+    private final boolean applicable;
+
     public EnvironmentAndSystemPropertyClientProviderStrategy() {
         // use docker-java defaults if present, overridden if our own configuration is set
-        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
+        this(DefaultDockerClientConfig.createDefaultConfigBuilder());
+    }
+
+    EnvironmentAndSystemPropertyClientProviderStrategy(DefaultDockerClientConfig.Builder configBuilder) {
+        String dockerConfigSource = TestcontainersConfiguration.getInstance()
+            .getEnvVarOrProperty("dockerconfig.source", "auto");
 
-        getSetting("docker.host").ifPresent(configBuilder::withDockerHost);
-        getSetting("docker.tls.verify").ifPresent(configBuilder::withDockerTlsVerify);
-        getSetting("docker.cert.path").ifPresent(configBuilder::withDockerCertPath);
+        switch (dockerConfigSource) {
+            case "auto":
+                Optional<String> dockerHost = getSetting("docker.host");
+                dockerHost.ifPresent(configBuilder::withDockerHost);
+                applicable = dockerHost.isPresent();
+                getSetting("docker.tls.verify").ifPresent(configBuilder::withDockerTlsVerify);
+                getSetting("docker.cert.path").ifPresent(configBuilder::withDockerCertPath);
+                break;
+            case "autoIgnoringUserProperties":
+                applicable = configBuilder.isDockerHostSetExplicitly();
+                break;
+            default:
+                throw new InvalidConfigurationException("Invalid value for dockerconfig.source: " + dockerConfigSource);
+        }
 
         dockerClientConfig = configBuilder.build();
     }
@@ -40,11 +60,6 @@ private Optional<String> getSetting(final String name) {
         return Optional.ofNullable(TestcontainersConfiguration.getInstance().getEnvVarOrUserProperty(name, null));
     }
 
-    @Override
-    protected boolean isApplicable() {
-        return getSetting("docker.host").isPresent();
-    }
-
     @Override
     public TransportConfig getTransportConfig() {
         return TransportConfig.builder()
@@ -62,4 +77,9 @@ protected int getPriority() {
     public String getDescription() {
         return "Environment variables, system properties and defaults. Resolved dockerHost=" + dockerClientConfig.getDockerHost();
     }
+
+    @Override
+    protected boolean isPersistable() {
+        return false;
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 85b25ca8e43..bb3febd6b3f 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -13,7 +13,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.testcontainers.UnstableAPI;
-import org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -182,20 +181,8 @@ public String getDockerClientStrategyClassName() {
             return prefixedEnvVarStrategy;
         }
 
-        // looks for unprefixed env var or unprefixed property
-        String unprefixedEnvVarOrProperty = getEnvVarOrUserProperty("docker.client.strategy", null);
-        if (unprefixedEnvVarOrProperty != null) {
-            return unprefixedEnvVarOrProperty;
-        }
-
-        // If docker.host is set then EnvironmentAndSystemPropertyClientProviderStrategy is likely to work
-        String dockerHostProperty = getEnvVarOrUserProperty("docker.host", null);
-        if (dockerHostProperty != null) {
-            return EnvironmentAndSystemPropertyClientProviderStrategy.class.getCanonicalName();
-        }
-
-        // No value set, and no implicit value to use either
-        return null;
+        // looks for unprefixed env var or unprefixed property, or null if the strategy is not set at all
+        return getEnvVarOrUserProperty("docker.client.strategy", null);
     }
 
     public String getTransportType() {
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
index 91f61848d69..c8eec1d38d8 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
@@ -16,10 +16,16 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 
@@ -45,6 +51,7 @@ public void checkEnvironmentClear() {
 
     @Test
     public void testWhenConfigAbsent() {
+        Mockito.doReturn("auto").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
         Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
         Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
         Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
@@ -58,6 +65,7 @@ public void testWhenConfigAbsent() {
 
     @Test
     public void testWhenDockerHostPresent() {
+        Mockito.doReturn("auto").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
         Mockito.doReturn("tcp://1.2.3.4:2375").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
         Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
         Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
@@ -74,6 +82,7 @@ public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
         Path tempDir = Files.createTempDirectory("testcontainers-test");
         String tempDirPath = tempDir.toAbsolutePath().toString();
 
+        Mockito.doReturn("auto").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
         Mockito.doReturn("tcp://1.2.3.4:2375").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
         Mockito.doReturn("1").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
         Mockito.doReturn(tempDirPath).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
@@ -88,4 +97,25 @@ public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
         assertTrue(sslConfig instanceof LocalDirectorySSLConfig);
         assertEquals(tempDirPath, ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
     }
+
+    @Test
+    public void applicableWhenIgnoringUserPropertiesAndConfigured() {
+        Mockito.doReturn("autoIgnoringUserProperties").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
+
+        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder()
+            .withDockerHost("tcp://1.2.3.4:2375");
+
+        EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy(configBuilder);
+
+        assertTrue(strategy.isApplicable());
+    }
+
+    @Test
+    public void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {
+        Mockito.doReturn("autoIgnoringUserProperties").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
+
+        EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
+
+        assertFalse(strategy.isApplicable());
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index cbb36baf580..7ca656e1eaf 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -156,13 +155,6 @@ public void shouldReadDockerClientStrategyFromEnvironment() {
         assertEquals("Docker client strategy is changed by env var", "foo", newConfig().getDockerClientStrategyClassName());
     }
 
-    @Test
-    public void shouldUseImplicitDockerClientStrategyWhenDockerHostPropertyIsSet() {
-        userProperties.remove("docker.client.strategy");
-        userProperties.put("docker.host", "tcp://1.2.3.4:5678");
-        assertEquals("Docker client strategy is implicitly set when docker host property is set", EnvironmentAndSystemPropertyClientProviderStrategy.class.getCanonicalName(), newConfig().getDockerClientStrategyClassName());
-    }
-
     @Test
     public void shouldNotUseImplicitDockerClientStrategyWhenDockerHostAndStrategyAreBothSet() {
         userProperties.put("docker.client.strategy", "foo");
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 73876a51483..8024dbb15ef 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -126,3 +126,7 @@ docker.host=tcp\://my.docker.host\:1234     # Equivalent to the DOCKER_HOST envi
 docker.tls.verify=1                         # Equivalent to the DOCKER_TLS_VERIFY environment variable
 docker.cert.path=/some/path                 # Equivalent to the DOCKER_CERT_PATH environment variable
 ```
+In addition, you can deactivate this behaviour by specifying:
+```properties
+dockerconfig.source=autoIgnoringUserProperties # 'auto' by default
+```

From 5e6dbc791b6184f0de6d1f9d184a78324c1ec945 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 16 Sep 2021 16:14:45 +0200
Subject: [PATCH 1445/4969] Retry internal port checking in the same exec
 (#4460)

* Retry internal port checking in the same exec

* Use just grep

* Reduce the changeset
---
 .../InternalCommandPortListeningCheck.java      |  5 +++--
 .../InternalCommandPortListeningCheckTest.java  | 17 ++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index a3b7a5d4dc7..379840a9d7e 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -24,18 +24,19 @@ public class InternalCommandPortListeningCheck implements java.util.concurrent.C
 
     @Override
     public Boolean call() {
-        StringBuilder command = new StringBuilder("true");
+        StringBuilder command = new StringBuilder("while true; do ( true ");
 
         for (int internalPort : internalPorts) {
             command.append(" && ");
             command.append(" (");
-            command.append(format("cat /proc/net/tcp* | awk '{print $2}' | grep -i ':0*%x'", internalPort));
+            command.append(format("grep -i ':0*%x' /proc/net/tcp*", internalPort));
             command.append(" || ");
             command.append(format("nc -vz -w 1 localhost %d", internalPort));
             command.append(" || ");
             command.append(format("/bin/bash -c '</dev/tcp/localhost/%d'", internalPort));
             command.append(")");
         }
+        command.append(" ) && exit 0 || sleep 0.1; done");
 
         Instant before = Instant.now();
         try {
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
index 00c0bc9d1ef..22014cd097a 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
@@ -7,14 +7,13 @@
 import org.junit.runners.Parameterized;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Arrays.asList;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 @RunWith(Parameterized.class)
 public class InternalCommandPortListeningCheckTest {
@@ -45,9 +44,7 @@ public void singleListening() {
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
 
-        final Boolean result = check.call();
-
-        assertTrue("InternalCommandPortListeningCheck identifies a single listening port", result);
+        VisibleAssertions.pass("InternalCommandPortListeningCheck identifies a single listening port");
     }
 
     @Test
@@ -56,13 +53,9 @@ public void nonListening() {
 
         try {
             Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
+            VisibleAssertions.fail("expected to fail");
         } catch (TimeoutException e) {
-            // we expect it to timeout
         }
-
-        final Boolean result = check.call();
-
-        assertFalse("InternalCommandPortListeningCheck detects a non-listening port among many", result);
     }
 
     @Test
@@ -71,8 +64,6 @@ public void lowAndHighPortListening() {
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
 
-        final Boolean result = check.call();
-
-        assertTrue("InternalCommandPortListeningCheck identifies a low and a high port", result);
+        VisibleAssertions.pass("InternalCommandPortListeningCheck identifies a low and a high port");
     }
 }

From e7b98f9a75f64725b9eb72bcbbb4af1e88d613d8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 20 Sep 2021 10:44:02 +0200
Subject: [PATCH 1446/4969] Use distinct with strategies (#4467)

---
 .../DockerClientProviderStrategy.java             | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 5c797b3b782..52700df22f3 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -25,10 +25,13 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 /**
@@ -137,10 +140,18 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
                                 .peek(strategy -> log.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName())),
                         strategies
                                 .stream()
-                                .filter(it -> !it.getClass().getCanonicalName().equals(dockerClientStrategyClassName))
-                                .filter(DockerClientProviderStrategy::isApplicable)
                                 .sorted(Comparator.comparing(DockerClientProviderStrategy::getPriority).reversed())
                 )
+                .filter(new Predicate<DockerClientProviderStrategy>() {
+
+                    final Set<Class<? extends DockerClientProviderStrategy>> classes = new HashSet<>();
+
+                    @Override
+                    public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
+                        return classes.add(dockerClientProviderStrategy.getClass());
+                    }
+                })
+                .filter(DockerClientProviderStrategy::isApplicable)
                 .flatMap(strategy -> {
                     try {
                         DockerClient dockerClient = strategy.getDockerClient();

From c7fa8e22df3b022c883a49199803cbbf00e879c4 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Mon, 20 Sep 2021 13:49:46 +0200
Subject: [PATCH 1447/4969] Update JUnit 4.12 to 4.13.2. (#4167)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 core/build.gradle                         | 4 ++--
 docs/examples/junit4/generic/build.gradle | 2 +-
 docs/examples/junit4/redis/build.gradle   | 2 +-
 test-support/build.gradle                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index f77461a06fc..35cecd76ce8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -66,7 +66,7 @@ dependencies {
         exclude group: "*", module: "*"
     }
 
-    api 'junit:junit:4.12'
+    api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.32'
     compileOnly 'org.jetbrains:annotations:22.0.0'
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'
@@ -123,7 +123,7 @@ dependencies {
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
-    jarFileTestImplementation 'junit:junit:4.12'
+    jarFileTestImplementation 'junit:junit:4.13.2'
     jarFileTestImplementation 'org.assertj:assertj-core:3.20.2'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 1021bfeffc0..da4697a4543 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    testImplementation "junit:junit:4.12"
+    testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
     testImplementation project(":selenium")
     testImplementation project(":mysql")
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 7551c6e578e..ea36761b716 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -3,6 +3,6 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
-    testImplementation "junit:junit:4.12"
+    testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
 }
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 4c6fdd2bed1..bd85b585b0f 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    implementation 'junit:junit:4.12'
+    implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.30'
 }

From 28d74da529427813accd5d14fd2c522796d4fa2a Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Mon, 20 Sep 2021 16:26:34 +0200
Subject: [PATCH 1448/4969] [couchbase] add debug-level phase timings. (#4466)

---
 .../couchbase/CouchbaseContainer.java         | 66 ++++++++++++-------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 844917c053f..e9247b8c84a 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -221,20 +221,22 @@ protected void configure() {
     protected void containerIsStarting(final InspectContainerResponse containerInfo) {
         logger().debug("Couchbase container is starting, performing configuration.");
 
-        waitUntilNodeIsOnline();
-        initializeIsEnterprise();
-        renameNode();
-        initializeServices();
-        configureAdminUser();
-        configureExternalPorts();
+        timePhase("waitUntilNodeIsOnline", this::waitUntilNodeIsOnline);
+        timePhase("initializeIsEnterprise", this::initializeIsEnterprise);
+        timePhase("renameNode", this::renameNode);
+        timePhase("initializeServices", this::initializeServices);
+        timePhase("configureAdminUser", this::configureAdminUser);
+        timePhase("configureExternalPorts", this::configureExternalPorts);
+
         if (enabledServices.contains(CouchbaseService.INDEX)) {
-            configureIndexer();
+            timePhase("configureIndexer", this::configureIndexer);
         }
     }
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        createBuckets();
+        timePhase("createBuckets", this::createBuckets);
+
         logger().info("Couchbase container is ready! UI available at http://{}:{}", getHost(), getMappedPort(MGMT_PORT));
     }
 
@@ -389,30 +391,34 @@ private void createBuckets() {
 
             checkSuccessfulResponse(response, "Could not create bucket " + bucket.getName());
 
-            new HttpWaitStrategy()
+            timePhase("createBucket:" + bucket.getName() + ":waitForAllServicesEnabled", () ->
+                new HttpWaitStrategy()
                 .forPath("/pools/default/b/" + bucket.getName())
                 .forPort(MGMT_PORT)
                 .withBasicCredentials(username, password)
                 .forStatusCode(200)
                 .forResponsePredicate(new AllServicesEnabledPredicate())
-                .waitUntilReady(this);
+                .waitUntilReady(this)
+            );
 
             if (enabledServices.contains(CouchbaseService.QUERY)) {
                 // If the query service is enabled, make sure that we only proceed if the query engine also
                 // knows about the bucket in its metadata configuration.
-                Unreliables.retryUntilTrue(1, TimeUnit.MINUTES, () -> {
-                    @Cleanup Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
-                        .add("statement", "SELECT COUNT(*) > 0 as present FROM system:keyspaces WHERE name = \"" + bucket.getName() + "\"")
-                        .build(), true);
-
-                    String body = queryResponse.body() != null ? queryResponse.body().string() : null;
-                    checkSuccessfulResponse(queryResponse, "Could not poll query service state for bucket: " + bucket.getName());
-
-                    return Optional.of(MAPPER.readTree(body))
-                        .map(n -> n.at("/results/0/present"))
-                        .map(JsonNode::asBoolean)
-                        .orElse(false);
-                });
+                timePhase(
+                    "createBucket:" + bucket.getName() + ":queryKeyspacePresent",
+                    () -> Unreliables.retryUntilTrue(1, TimeUnit.MINUTES, () -> {
+                        @Cleanup Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
+                            .add("statement", "SELECT COUNT(*) > 0 as present FROM system:keyspaces WHERE name = \"" + bucket.getName() + "\"")
+                            .build(), true);
+
+                        String body = queryResponse.body() != null ? queryResponse.body().string() : null;
+                        checkSuccessfulResponse(queryResponse, "Could not poll query service state for bucket: " + bucket.getName());
+
+                        return Optional.of(MAPPER.readTree(body))
+                            .map(n -> n.at("/results/0/present"))
+                            .map(JsonNode::asBoolean)
+                            .orElse(false);
+                }));
             }
 
             if (bucket.hasPrimaryIndex()) {
@@ -501,6 +507,20 @@ private Response doHttpRequest(final int port, final String path, final String m
         }
     }
 
+    /**
+     * Helper method which times an individual phase and logs it for debugging and optimization purposes.
+     *
+     * @param name the name of the phase.
+     * @param toTime the runnable that should be timed.
+     */
+    private void timePhase(final String name, final Runnable toTime) {
+        long start = System.nanoTime();
+        toTime.run();
+        long end = System.nanoTime();
+
+        logger().debug("Phase {} took {}ms", name, TimeUnit.NANOSECONDS.toMillis(end - start));
+    }
+
     /**
      * In addition to getting a 200, we need to make sure that all services we need are enabled and available on
      * the bucket.

From 0ad8154f198cfe6519a845e4ddb4ec564122f85c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 10:11:15 +0100
Subject: [PATCH 1449/4969] Update Gradle Wrapper to 7.2 (#4379)

Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 examples/gradlew                              | 257 +++++++++++-------
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 gradlew                                       | 257 +++++++++++-------
 4 files changed, 310 insertions(+), 212 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 2957f437446..a2e01c0dffe 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bf8b869948901d422e9bb7d1fa61da6a6e19411baa7ad6ee929073df85d6365d
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 744e882ed57..1b6c787337f 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17ba19021b8..a37233c5e2e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed57..1b6c787337f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

From 8712457efea69e0daf4f9add52478d48eb32d68f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 23 Sep 2021 07:19:45 +0100
Subject: [PATCH 1450/4969] Refactor JDBC URL parsing to support different
 Oracle URLs (#4476)

Detects SID `:` or service name `/` in the supplied TC JDBC URL.
In addition, the affected regex patterns have been refactored to use named groups.


Co-authored-by: Justin Wyer <justinwyer@users.noreply.github.com>
---
 .../testcontainers/jdbc/ConnectionUrl.java    | 73 ++++++++++++++-----
 .../jdbc/ConnectionUrlDriversTests.java       | 11 ++-
 2 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index 4f339b43fe5..3354ed45c39 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -7,9 +7,9 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -97,25 +97,25 @@ private void parseUrl() {
                 throw new IllegalArgumentException("JDBC URL matches jdbc:tc: prefix but the database or tag name could not be identified");
             }
         }
-        databaseType = urlMatcher.group(1);
+        databaseType = urlMatcher.group("databaseType");
 
-        imageTag = Optional.ofNullable(urlMatcher.group(3));
+        imageTag = Optional.ofNullable(urlMatcher.group("imageTag"));
 
         //String like hostname:port/database name, which may vary based on target database.
         //Clients can further parse it as needed.
-        dbHostString = urlMatcher.group(4);
+        dbHostString = urlMatcher.group("dbHostString");
 
         //In case it matches to the default pattern
         Matcher dbInstanceMatcher = Patterns.DB_INSTANCE_MATCHING_PATTERN.matcher(dbHostString);
         if (dbInstanceMatcher.matches()) {
-            databaseHost = Optional.of(dbInstanceMatcher.group(1));
-            databasePort = Optional.ofNullable(dbInstanceMatcher.group(3)).map(value -> Integer.valueOf(value));
-            databaseName = Optional.of(dbInstanceMatcher.group(4));
+            databaseHost = Optional.of(dbInstanceMatcher.group("databaseHost"));
+            databasePort = Optional.ofNullable(dbInstanceMatcher.group("databasePort")).map(Integer::valueOf);
+            databaseName = Optional.of(dbInstanceMatcher.group("databaseName"));
         }
 
         queryParameters = Collections.unmodifiableMap(
             parseQueryParameters(
-                Optional.ofNullable(urlMatcher.group(5)).orElse("")));
+                Optional.ofNullable(urlMatcher.group("queryParameters")).orElse("")));
 
         String query = queryParameters
             .entrySet()
@@ -123,7 +123,7 @@ private void parseUrl() {
             .map(e -> e.getKey() + "=" + e.getValue())
             .collect(Collectors.joining("&"));
 
-        if (query == null || query.trim().length() == 0) {
+        if (query.trim().length() == 0) {
             queryString = Optional.empty();
         } else {
             queryString = Optional.of("?" + query);
@@ -149,7 +149,7 @@ private void parseUrl() {
     }
 
     private Map<String, String> parseTmpfsOptions(Map<String, String> containerParameters) {
-        if(!containerParameters.containsKey("TC_TMPFS")){
+        if (!containerParameters.containsKey("TC_TMPFS")) {
             return Collections.emptyMap();
         }
 
@@ -209,16 +209,49 @@ public Map<String, String> getTmpfsOptions() {
      * @author manikmagar
      */
     public interface Patterns {
-        Pattern URL_MATCHING_PATTERN = Pattern.compile("jdbc:tc:([a-z0-9]+)(:([^:]+))?://([^\\?]+)(\\?.*)?");
-
-        Pattern ORACLE_URL_MATCHING_PATTERN = Pattern.compile("jdbc:tc:([a-z]+)(:([^(thin:)]+))?:thin:@([^\\?]+)(\\?.*)?");
+        Pattern URL_MATCHING_PATTERN = Pattern.compile(
+            "jdbc:tc:" +
+                "(?<databaseType>[a-z0-9]+)" +
+                "(:(?<imageTag>[^:]+))?" +
+                "://" +
+                "(?<dbHostString>[^?]+)" +
+                "(?<queryParameters>\\?.*)?"
+        );
+
+        Pattern ORACLE_URL_MATCHING_PATTERN = Pattern.compile(
+            "jdbc:tc:" +
+                "(?<databaseType>[a-z]+)" +
+                "(:(?<imageTag>(?!thin).+))?:thin:(//)?" +
+                "(" +
+                "(?<username>[^:" +
+                "?^/]+)/(?<password>[^?^/]+)" +
+                ")?" +
+                "@" +
+                "(?<dbHostString>[^?]+)" +
+                "(?<queryParameters>\\?.*)?"
+        );
 
         //Matches to part of string - hostname:port/databasename
-        Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile("([^:]+)(:([0-9]+))?/([^\\\\?]+)");
-
-        Pattern DAEMON_MATCHING_PATTERN = Pattern.compile(".*([\\?&]?)TC_DAEMON=([^\\?&]+).*");
-        Pattern INITSCRIPT_MATCHING_PATTERN = Pattern.compile(".*([\\?&]?)TC_INITSCRIPT=([^\\?&]+).*");
-        Pattern INITFUNCTION_MATCHING_PATTERN = Pattern.compile(".*([\\?&]?)TC_INITFUNCTION=" +
+        Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile(
+            "(?<databaseHost>[^:]+)" +
+                "(:(?<databasePort>[0-9]+))?" +
+                "(" +
+                "(?<sidOrServiceName>[:/])" +
+                "|" +
+                ";databaseName=" +
+                ")" +
+                "(?<databaseName>[^\\\\?]+)"
+        );
+
+        Pattern DAEMON_MATCHING_PATTERN = Pattern.compile(".*([?&]?)TC_DAEMON=([^?&]+).*");
+
+        /**
+         * @deprecated for removal
+         */
+        @Deprecated
+        Pattern INITSCRIPT_MATCHING_PATTERN = Pattern.compile(".*([?&]?)TC_INITSCRIPT=([^?&]+).*");
+
+        Pattern INITFUNCTION_MATCHING_PATTERN = Pattern.compile(".*([?&]?)TC_INITFUNCTION=" +
             "((\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)*\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)" +
             "::" +
             "(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)" +
@@ -226,9 +259,9 @@ public interface Patterns {
 
         String TC_PARAM_NAME_PATTERN = "(TC_[A-Z_]+)";
 
-        Pattern TC_PARAM_MATCHING_PATTERN = Pattern.compile(TC_PARAM_NAME_PATTERN + "=([^\\?&]+)");
+        Pattern TC_PARAM_MATCHING_PATTERN = Pattern.compile(TC_PARAM_NAME_PATTERN + "=([^?&]+)");
 
-        Pattern QUERY_PARAM_MATCHING_PATTERN = Pattern.compile("([^\\?&=]+)=([^\\?&]*)");
+        Pattern QUERY_PARAM_MATCHING_PATTERN = Pattern.compile("([^?&=]+)=([^?&]*)");
 
     }
 
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index 920fab04016..12ca5c28c3d 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -37,12 +37,17 @@ public static Iterable<Object[]> data() {
                 {"jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test"},
                 {"jdbc:tc:postgresql:1.2.3://hostname/test", "postgresql", Optional.of("1.2.3"), "hostname/test", "test"},
                 {"jdbc:tc:postgresql://hostname/test", "postgresql", Optional.empty(), "hostname/test", "test"},
-                {"jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test", "sqlserver", Optional.of("1.2.3"), "localhost;instance=SQLEXPRESS:1433;databaseName=test", ""},
-                {"jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test", "sqlserver", Optional.empty(), "localhost;instance=SQLEXPRESS:1433;databaseName=test", ""},
+                {"jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test", "sqlserver", Optional.of("1.2.3"), "localhost;instance=SQLEXPRESS:1433;databaseName=test", "test"},
+                {"jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test", "sqlserver", Optional.empty(), "localhost;instance=SQLEXPRESS:1433;databaseName=test", "test"},
                 {"jdbc:tc:mariadb:1.2.3://localhost:3306/test", "mariadb", Optional.of("1.2.3"), "localhost:3306/test", "test"},
                 {"jdbc:tc:mariadb://localhost:3306/test", "mariadb", Optional.empty(), "localhost:3306/test", "test"},
+                {"jdbc:tc:oracle:1.2.3:thin://@localhost:1521/test", "oracle", Optional.of("1.2.3"), "localhost:1521/test", "test"},
                 {"jdbc:tc:oracle:1.2.3:thin:@localhost:1521/test", "oracle", Optional.of("1.2.3"), "localhost:1521/test", "test"},
-                {"jdbc:tc:oracle:thin:@localhost:1521/test", "oracle", Optional.empty(), "localhost:1521/test", "test"}
+                {"jdbc:tc:oracle:thin:@localhost:1521/test", "oracle", Optional.empty(), "localhost:1521/test", "test"},
+                {"jdbc:tc:oracle:1.2.3:thin:@localhost:1521:test", "oracle", Optional.of("1.2.3"), "localhost:1521:test", "test"},
+                {"jdbc:tc:oracle:1.2.3:thin://@localhost:1521:test", "oracle", Optional.of("1.2.3"), "localhost:1521:test", "test"},
+                {"jdbc:tc:oracle:1.2.3-anything:thin://@localhost:1521:test", "oracle", Optional.of("1.2.3-anything"), "localhost:1521:test", "test"},
+                {"jdbc:tc:oracle:thin:@localhost:1521:test", "oracle", Optional.empty(), "localhost:1521:test", "test"}
             });
     }
 

From d512ca59802c7154dc2d117ff80e2583fe4c1c8f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 23 Sep 2021 07:02:42 -0400
Subject: [PATCH 1451/4969] Tidy up core's build file (#4207)

* Tidy up core's build file

* post-merge fixes

* Extract shading config

* fix modules

* fix tests

* fix merge conflicts, simplify shading.gradle

* cleanup

* Workaround BOM dependency

* Use `resolvedConfiguration`
---
 build.gradle             | 33 +----------------------
 core/build.gradle        | 30 +++++----------------
 gradle/publishing.gradle | 37 ++++++++++++++-----------
 gradle/shading.gradle    | 58 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 71 deletions(-)
 create mode 100644 gradle/shading.gradle

diff --git a/build.gradle b/build.gradle
index 723c429271d..aac0648ec06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'idea'
     apply plugin: 'io.franzbecker.gradle-lombok'
-    apply plugin: 'com.github.johnrengelman.shadow'
+    apply from: "$rootDir/gradle/shading.gradle"
 
     group = "org.testcontainers"
 
@@ -101,37 +101,6 @@ subprojects {
         source = delombok.outputs
     }
 
-    shadowJar {
-        configurations = []
-        archiveClassifier.set(null)
-
-        doFirst {
-            // See https://github.com/johnrengelman/shadow/blob/5.0.0/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ConfigureShadowRelocation.groovy
-            Set<String> packages = []
-            // Always read from core's configurations
-            for (configuration in tasks.getByPath(":testcontainers:shadowJar").configurations) {
-                for (jar in configuration.files) {
-                    def jf = new java.util.jar.JarFile(jar)
-                    for (entry in jf.entries()) {
-                        def name = entry.name
-                        if (name.endsWith(".class")) {
-                            def index = name.lastIndexOf('/')
-                            if (index != -1) {
-                                packages.add(name.substring(0, index))
-                            }
-                        }
-                    }
-                    jf.close()
-                }
-            }
-            for (pkg in packages) {
-                pkg = pkg.replaceAll('/', '.')
-
-                tasks.shadowJar.relocate(pkg, "org.testcontainers.shaded.${pkg}")
-            }
-        }
-    }
-
     dependencies {
         testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     }
diff --git a/core/build.gradle b/core/build.gradle
index 35cecd76ce8..fca331e9d3f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -8,16 +8,7 @@ sourceSets {
 
 idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs
 
-configurations {
-    shaded
-    [api, compileOnly, testCompile]*.extendsFrom shaded
-}
-
 shadowJar {
-    configurations = [project.configurations.shaded]
-
-    mergeServiceFiles()
-
     [
         'META-INF/NOTICE',
         'META-INF/NOTICE.txt',
@@ -77,23 +68,16 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.1.0'
 
+    api platform('com.github.docker-java:docker-java-bom:3.2.12')
     shaded platform('com.github.docker-java:docker-java-bom:3.2.12')
 
     api "com.github.docker-java:docker-java-api"
 
-    shaded ('com.github.docker-java:docker-java-core') {
-        exclude(group: 'com.github.docker-java', module: 'docker-java-api')
-        exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
-        exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
-        exclude(group: 'com.google.code.findbug')
-        exclude(group: 'org.slf4j')
-        exclude(group: 'org.apache.commons', module: 'commons-compress')
-    }
+    shaded 'com.github.docker-java:docker-java-core'
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp') {
-        exclude(group: 'com.github.docker-java', module: 'docker-java-core')
-        exclude(group: 'net.java.dev.jna')
-        exclude(group: 'org.slf4j')
+    shaded 'com.github.docker-java:docker-java-transport-okhttp', {
+        // TODO remove unused `net.java.dev.jna:jna-platform` from `docker-java-transport-okhttp`
+        exclude(group: 'net.java.dev.jna', module: 'jna-platform')
     }
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
@@ -102,9 +86,7 @@ dependencies {
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
-    shaded 'org.zeroturnaround:zt-exec:1.12', {
-        exclude(group: 'org.slf4j')
-    }
+    shaded 'org.zeroturnaround:zt-exec:1.12'
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:3.7.0'
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index e6bf5d2acbd..ffeb3cb38d4 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -57,27 +57,34 @@ publishing {
 
                 def dependenciesNode = rootNode.appendNode('dependencies')
 
-                def addDependency = { dependency, scope ->
-                    dependenciesNode.appendNode('dependency').with {
-                        appendNode('groupId', dependency.group)
-                        appendNode('artifactId', dependency.name)
-                        appendNode('version', dependency.version)
-                        appendNode('scope', scope)
+                def addDependencies = { Configuration configuration, scope ->
+                    for (dependency in configuration.resolvedConfiguration.firstLevelModuleDependencies) {
+                        if (dependency.configuration.startsWith("platform-")) {
+                            continue
+                        }
+                        dependenciesNode.appendNode('dependency').with {
+                            if (!dependency.moduleGroup || !dependency.moduleName || !dependency.moduleVersion) {
+                                throw new IllegalStateException("Wrong dependency: $dependency")
+                            }
+                            appendNode('groupId', dependency.moduleGroup)
+                            appendNode('artifactId', dependency.moduleName)
+                            appendNode('version', dependency.moduleVersion)
+                            appendNode('scope', scope)
 
-                        if (dependency instanceof ModuleDependency && !dependency.excludeRules.empty) {
-                            def excludesNode = appendNode('exclusions')
-                            for (rule in dependency.excludeRules) {
-                                excludesNode.appendNode('exclusion').with {
-                                    appendNode('groupId', rule.group)
-                                    appendNode('artifactId', rule.module)
+                            if (dependency instanceof ModuleDependency && !dependency.excludeRules.empty) {
+                                def excludesNode = appendNode('exclusions')
+                                for (rule in dependency.excludeRules) {
+                                    excludesNode.appendNode('exclusion').with {
+                                        appendNode('groupId', rule.group)
+                                        appendNode('artifactId', rule.module)
+                                    }
                                 }
                             }
                         }
                     }
                 }
-
-                project.configurations.api.dependencies.each { addDependency(it, 'compile') }
-                project.configurations.provided.dependencies.each { addDependency(it, 'provided') }
+                addDependencies(project.configurations.api, 'compile')
+                addDependencies(project.configurations.provided, 'provided')
             }
         }
     }
diff --git a/gradle/shading.gradle b/gradle/shading.gradle
new file mode 100644
index 00000000000..909989caf84
--- /dev/null
+++ b/gradle/shading.gradle
@@ -0,0 +1,58 @@
+import java.util.jar.JarFile
+
+apply plugin: 'com.github.johnrengelman.shadow'
+
+configurations {
+    shaded
+    [apiElements, implementation, compileOnly, testCompile]*.extendsFrom shaded
+}
+configurations.api.canBeResolved = true
+
+shadowJar {
+    configurations = [project.configurations.shaded]
+    archiveClassifier.set(null)
+
+    mergeServiceFiles()
+}
+
+project.afterEvaluate {
+    Set<ModuleIdentifier> apiDependencies = project.configurations.api.resolvedConfiguration.resolvedArtifacts*.moduleVersion*.id*.module
+
+    // Exclude `api` dependencies, to prevent them being included into the final JAR
+    shadowJar.dependencies {
+        for (id in apiDependencies) {
+            exclude(dependency("${id.group}:${id.name}"))
+        }
+    }
+
+    // Inherit dependencies' relocators
+    shadowJar.relocators = configurations.api.dependencies.withType(ProjectDependency).collectMany {
+        return it.dependencyProject.tasks.findByName("shadowJar")?.relocators ?: []
+    }
+
+    // See https://github.com/johnrengelman/shadow/blob/5.0.0/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ConfigureShadowRelocation.groovy
+    Set<String> packages = []
+
+    for (artifact in project.configurations.shaded.resolvedConfiguration.resolvedArtifacts) {
+        if (apiDependencies.contains(artifact.moduleVersion.id.module)) {
+            continue
+        }
+
+        try (def jf = new JarFile(artifact.file)) {
+            for (entry in jf.entries()) {
+                def name = entry.name
+                if (name.endsWith(".class")) {
+                    def index = name.lastIndexOf('/')
+                    if (index != -1) {
+                        packages.add(name.substring(0, index))
+                    }
+                }
+            }
+        }
+    }
+    for (pkg in packages) {
+        pkg = pkg.replaceAll('/', '.')
+
+        tasks.shadowJar.relocate(pkg, "org.testcontainers.shaded.${pkg}")
+    }
+}

From f178e91623d3648ba3b61ee440f5bfc6fd92646f Mon Sep 17 00:00:00 2001
From: Simon Schneider <10846939+raynigon@users.noreply.github.com>
Date: Thu, 23 Sep 2021 13:11:23 +0200
Subject: [PATCH 1452/4969] Make TimescaleDB available with JDBC syntax (#3891)

---
 docs/modules/databases/jdbc.md                |  4 ++
 .../jdbc/AbstractJDBCDriverTest.java          |  4 +-
 .../TimescaleDBContainerProvider.java         | 39 +++++++++++++
 ...s.containers.JdbcDatabaseContainerProvider |  1 +
 .../containers/TimescaleDBContainerTest.java  | 58 +++++++++++++++++++
 .../TimescaleDBJDBCDriverTest.java            | 22 +++++++
 .../resources/somepath/init_timescaledb.sql   | 13 +++++
 7 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
 create mode 100644 modules/postgresql/src/test/resources/somepath/init_timescaledb.sql

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 7adaf2f5e70..d402b5983b4 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -39,6 +39,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:postgis:9.6-2.5:///databasename`
 
+#### Using TimescaleDB
+
+`jdbc:tc:timescaldb:2.1.0-pg13:///databasename`
+
 #### Using Trino
 
 `jdbc:tc:trino:352://localhost/memory/default`
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index 38ca2237567..580aad513e3 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -117,7 +117,9 @@ private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQ
         String databaseQuery = "SELECT DATABASE()";
         // Postgres does not have Database() as a function
         String databaseType = ConnectionUrl.newInstance(jdbcUrl).getDatabaseType();
-        if (databaseType.equalsIgnoreCase("postgresql") || databaseType.equalsIgnoreCase("postgis")) {
+        if (databaseType.equalsIgnoreCase("postgresql") ||
+            databaseType.equalsIgnoreCase("postgis") ||
+            databaseType.equalsIgnoreCase("timescaledb")) {
             databaseQuery = "SELECT CURRENT_DATABASE()";
         }
 
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java
new file mode 100644
index 00000000000..c9b81fccfe4
--- /dev/null
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java
@@ -0,0 +1,39 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.jdbc.ConnectionUrl;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for TimescaleDB containers, which are a special flavour of PostgreSQL.
+ *
+ * @see <a href="https://docs.timescale.com/latest/introduction">https://docs.timescale.com/latest/introduction</a>
+ */
+public class TimescaleDBContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final String NAME = "timescaledb";
+    private static final String DEFAULT_TAG = "2.1.0-pg11";
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("timescale/timescaledb").asCompatibleSubstituteFor("postgres");
+    public static final String USER_PARAM = "user";
+    public static final String PASSWORD_PARAM = "password";
+
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new PostgreSQLContainer(DEFAULT_IMAGE.withTag(tag));
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+    }
+}
diff --git a/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
index 79b2f29340a..05df9054522 100644
--- a/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
+++ b/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -1,2 +1,3 @@
 org.testcontainers.containers.PostgreSQLContainerProvider
 org.testcontainers.containers.PostgisContainerProvider
+org.testcontainers.containers.TimescaleDBContainerProvider
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
new file mode 100644
index 00000000000..f3c73a4111b
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
@@ -0,0 +1,58 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
+
+public class TimescaleDBContainerTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider().newInstance()) {
+            postgres.start();
+
+            ResultSet resultSet = performQuery(postgres, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+
+    @Test
+    public void testCommandOverride() throws SQLException {
+        try (GenericContainer<?> postgres = new TimescaleDBContainerProvider().newInstance().withCommand("postgres -c max_connections=42")) {
+            postgres.start();
+
+            ResultSet resultSet = performQuery((JdbcDatabaseContainer<?>) postgres, "SELECT current_setting('max_connections')");
+            String result = resultSet.getString(1);
+            assertEquals("max_connections should be overriden", "42", result);
+        }
+    }
+
+    @Test
+    public void testUnsetCommand() throws SQLException {
+        try (GenericContainer<?> postgres = new TimescaleDBContainerProvider().newInstance().withCommand("postgres -c max_connections=42").withCommand()) {
+            postgres.start();
+
+            ResultSet resultSet = performQuery((JdbcDatabaseContainer<?>) postgres, "SELECT current_setting('max_connections')");
+            String result = resultSet.getString(1);
+            assertNotEquals("max_connections should not be overriden", "42", result);
+        }
+    }
+
+    @Test
+    public void testExplicitInitScript() throws SQLException {
+        try (JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider().newInstance().withInitScript("somepath/init_timescaledb.sql")) {
+            postgres.start();
+
+            ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
+
+            String firstColumnValue = resultSet.getString(1);
+            assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+        }
+    }
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
new file mode 100644
index 00000000000..8a6eaa3d04b
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
@@ -0,0 +1,22 @@
+package org.testcontainers.jdbc.timescaledb;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.EnumSet;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public class TimescaleDBJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return asList(
+            new Object[][]{
+                {"jdbc:tc:timescaledb://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+                {"jdbc:tc:timescaledb:2.1.0-pg13://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
+            });
+    }
+}
diff --git a/modules/postgresql/src/test/resources/somepath/init_timescaledb.sql b/modules/postgresql/src/test/resources/somepath/init_timescaledb.sql
new file mode 100644
index 00000000000..da11604cf10
--- /dev/null
+++ b/modules/postgresql/src/test/resources/somepath/init_timescaledb.sql
@@ -0,0 +1,13 @@
+-- Extend the database with TimescaleDB
+CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;
+
+CREATE TABLE bar
+(
+    foo  VARCHAR(255),
+    time TIMESTAMPTZ NOT NULL
+);
+
+SELECT create_hypertable('bar', 'time');
+
+INSERT INTO bar (time, foo)
+VALUES (CURRENT_TIMESTAMP, 'hello world');

From 4dd08729a9ee0472cd45bb307631e728571cf4f8 Mon Sep 17 00:00:00 2001
From: PROgrm_JARvis <mrJARVIScraft@gmail.com>
Date: Thu, 23 Sep 2021 14:15:12 +0300
Subject: [PATCH 1453/4969] Fix dangling constructor reference in deprecation
 note (#4443)

---
 .../java/org/testcontainers/containers/PostgreSQLContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 6c16bb8fe61..2b905bd3d37 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -35,7 +35,7 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
     private static final String QUERY_PARAM_SEPARATOR = "&";
 
     /**
-     * @deprecated use {@link PostgreSQLContainer(DockerImageName)} instead
+     * @deprecated use {@link #PostgreSQLContainer(DockerImageName)} or {@link #PostgreSQLContainer(String)} instead
      */
     @Deprecated
     public PostgreSQLContainer() {

From b88d136762b77cb4ac4b1db98ab4e1ddc711b274 Mon Sep 17 00:00:00 2001
From: John Athanaselis <johnathana@gmail.com>
Date: Thu, 23 Sep 2021 16:57:41 +0300
Subject: [PATCH 1454/4969] Randomize naming for createVolumeDirectory method
 (#4195)

Also marks createVolumeDirectory method as deprecated


Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../java/org/testcontainers/containers/GenericContainer.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 50e4b927617..fb82832675b 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -88,6 +88,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -647,8 +648,9 @@ protected Logger logger() {
      * @param temporary is the volume directory temporary? If true, the directory will be deleted on JVM shutdown.
      * @return path to the volume directory
      */
+    @Deprecated
     protected Path createVolumeDirectory(boolean temporary) {
-        Path directory = new File(".tmp-volume-" + System.currentTimeMillis()).toPath();
+        Path directory = new File(".tmp-volume-" + UUID.randomUUID()).toPath();
         PathUtils.mkdirp(directory);
 
         if (temporary) Runtime.getRuntime().addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, () -> {

From 8f312b4fb3f29c8d37cc55f3640693afb912523f Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Thu, 23 Sep 2021 16:00:25 +0200
Subject: [PATCH 1455/4969] Avoid clobbering already configured path (#2957)

---
 .../java/org/testcontainers/containers/GenericContainer.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index fb82832675b..6d9551b8d6e 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1284,6 +1284,9 @@ public SELF withWorkingDirectory(String workDir) {
      */
     @Override
     public SELF withCopyFileToContainer(MountableFile mountableFile, String containerPath) {
+        if (copyToFileContainerPathMap.containsKey(mountableFile)) {
+            throw new IllegalStateException("Path already configured for copy: " + mountableFile);
+        }
         copyToFileContainerPathMap.put(mountableFile, containerPath);
         return self();
     }

From 29a438d84e31dd193bd36614f98b76b6a0f89b90 Mon Sep 17 00:00:00 2001
From: Kyle Aure <KyleJAure@gmail.com>
Date: Mon, 27 Sep 2021 03:55:59 -0500
Subject: [PATCH 1456/4969] Modernize Oracle Container Logic (#4402)

---
 modules/oracle-xe/build.gradle                |   2 +
 .../containers/OracleContainer.java           |  87 ++++++++++--
 .../containers/jdbc/OracleJDBCDriverTest.java |   4 -
 .../junit/oracle/SimpleOracleTest.java        | 133 ++++++++++++++++--
 4 files changed, 203 insertions(+), 23 deletions(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 5a6040ac81f..38146d4dd01 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -5,4 +5,6 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
+
+    compileOnly 'org.jetbrains:annotations:21.0.1'
 }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index ccd705f5af9..c833689e692 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -2,19 +2,24 @@
 
 import com.google.common.collect.Sets;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Future;
 
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static java.util.Collections.singleton;
+
 public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     public static final String NAME = "oracle";
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe");
 
-
     static final String DEFAULT_TAG = "18.4.0-slim";
     static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
@@ -23,10 +28,24 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
     private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 120;
-    private static final List<String> ORACLE_SYSTEM_USERS = Arrays.asList("system", "sys");
 
-    private String username = "test";
-    private String password = "test";
+    // Container defaults
+    static final String DEFAULT_DATABASE_NAME = "xepdb1";
+    static final String DEFAULT_SID = "xe";
+    static final String DEFAULT_SYSTEM_USER = "system";
+    static final String DEFAULT_SYS_USER = "sys";
+    
+    // Test container defaults
+    static final String APP_USER = "test";
+    static final String APP_USER_PASSWORD = "test";
+
+    // Restricted user and database names
+    private static final List<String> ORACLE_SYSTEM_USERS = Arrays.asList(DEFAULT_SYSTEM_USER, DEFAULT_SYS_USER);
+
+    private String databaseName = DEFAULT_DATABASE_NAME;
+    private String username = APP_USER;
+    private String password = APP_USER_PASSWORD;
+    private boolean usingSid = false;
 
     /**
      * @deprecated use {@link OracleContainer(DockerImageName)} instead
@@ -42,6 +61,7 @@ public OracleContainer(String dockerImageName) {
 
     public OracleContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         preconfigure();
     }
 
@@ -51,14 +71,24 @@ public OracleContainer(Future<String> dockerImageName) {
     }
 
     private void preconfigure() {
-        withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
+        this.waitStrategy = new LogMessageWaitStrategy()
+            .withRegEx(".*DATABASE IS READY TO USE!.*\\s")
+            .withTimes(1)
+            .withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, SECONDS));
+        
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
         addExposedPorts(ORACLE_PORT, APEX_HTTP_PORT);
     }
 
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+
+    @NotNull
     @Override
     public Set<Integer> getLivenessCheckPortNumbers() {
-        return Sets.newHashSet(ORACLE_PORT);
+        return singleton(getMappedPort(ORACLE_PORT));
     }
 
     @Override
@@ -68,12 +98,15 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:oracle:thin:" + getUsername() + "/" + getPassword() + "@" + getHost() + ":" + getOraclePort() + "/xepdb1";
+        return isUsingSid() ? 
+            "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + ":" + getSid() :
+            "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + "/" + getDatabaseName();
     }
 
     @Override
     public String getUsername() {
-        return username;
+        // An application user is tied to the database, and therefore not authenticated to connect to SID.
+        return isUsingSid() ? DEFAULT_SYSTEM_USER : username;
     }
 
     @Override
@@ -81,6 +114,15 @@ public String getPassword() {
         return password;
     }
 
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    protected boolean isUsingSid() {
+        return usingSid;
+    }
+
     @Override
     public OracleContainer withUsername(String username) {
         if (StringUtils.isEmpty(username)) {
@@ -102,14 +144,33 @@ public OracleContainer withPassword(String password) {
         return self();
     }
 
+    @Override
+    public OracleContainer withDatabaseName(String databaseName) {
+        if (StringUtils.isEmpty(databaseName)) {
+            throw new IllegalArgumentException("Database name cannot be null or empty");
+        }
+
+        if (DEFAULT_DATABASE_NAME.equals(databaseName.toLowerCase())) {
+            throw new IllegalArgumentException("Database name cannot be set to " + DEFAULT_DATABASE_NAME);
+        }
+
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    public OracleContainer usingSid() {
+        this.usingSid = true;
+        return self();
+    }
+
     @Override
     public OracleContainer withUrlParam(String paramName, String paramValue) {
-        throw new UnsupportedOperationException("The OracleDb does not support this");
+        throw new UnsupportedOperationException("The Oracle Database driver does not support this");
     }
 
     @SuppressWarnings("SameReturnValue")
     public String getSid() {
-        return "xe";
+        return DEFAULT_SID;
     }
 
     public Integer getOraclePort() {
@@ -129,6 +190,12 @@ public String getTestQueryString() {
     @Override
     protected void configure() {
         withEnv("ORACLE_PASSWORD", password);
+
+        // Only set ORACLE_DATABASE if different than the default.
+        if(databaseName != DEFAULT_DATABASE_NAME) {
+            withEnv("ORACLE_DATABASE", databaseName);
+        }
+        
         withEnv("APP_USER", username);
         withEnv("APP_USER_PASSWORD", password);
     }
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
index fbe5ce95a05..79dc35deb64 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
@@ -12,10 +12,6 @@
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
-/**
- * @author gusohal
- */
-@Ignore
 public class OracleJDBCDriverTest {
 
     @Test
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 7d026924442..2dd82c437a4 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -1,5 +1,8 @@
 package org.testcontainers.junit.oracle;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import org.junit.Test;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -8,26 +11,138 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
     public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe:18.4.0-slim");
 
+    private void runTest(OracleContainer container, String databaseName, String username, String password) throws SQLException {
+        //Test config was honored
+        assertEquals(databaseName, container.getDatabaseName());
+        assertEquals(username, container.getUsername());
+        assertEquals(password, container.getPassword());
+        
+        //Test we can get a connection
+        container.start();
+        ResultSet resultSet = performQuery(container, "SELECT 1 FROM dual");
+        int resultSetInt = resultSet.getInt(1);
+        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+    }
+
+    @Test
+    public void testDefaultSettings() throws SQLException {
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);
+        ) {
+            runTest(oracle, "xepdb1", "test", "test");
+
+            // Match against the last '/'
+            String urlSuffix = oracle.getJdbcUrl().split("(\\/)(?!.*\\/)", 2)[1];
+            assertEquals("xepdb1", urlSuffix);
+        }
+    }
+
+    @Test
+    public void testPluggableDatabase() throws SQLException {
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+                .withDatabaseName("testDB")
+        ) {
+            runTest(oracle, "testDB", "test", "test");
+        }
+    }
+
+    @Test
+    public void testPluggableDatabaseAndCustomUser() throws SQLException {
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+                .withDatabaseName("testDB")
+                .withUsername("testUser")
+                .withPassword("testPassword")
+        ) {
+            runTest(oracle, "testDB", "testUser", "testPassword");
+        }
+    }
+
     @Test
-    public void testSimple() throws SQLException {
+    public void testCustomUser() throws SQLException {
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+                .withUsername("testUser")
+                .withPassword("testPassword")
+        ) {
+            runTest(oracle, "xepdb1", "testUser", "testPassword");
+        }
+    }
 
+    @Test
+    public void testSID() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
-                .withUsername("baz")
-                .withPassword("bar")
+                .usingSid();
         ) {
-            oracle.start();
-            ResultSet resultSet = performQuery(oracle, "SELECT 1 FROM dual");
+            runTest(oracle, "xepdb1", "system", "test");
+
+            // Match against the last ':'
+            String urlSuffix = oracle.getJdbcUrl().split("(\\:)(?!.*\\:)", 2)[1];
+            assertEquals("xe", urlSuffix);
+        }
+    }
+
+    @Test
+    public void testSIDAndCustomPassword() throws SQLException {
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+                .usingSid()
+                .withPassword("testPassword");
+        ) {
+            runTest(oracle, "xepdb1", "system", "testPassword");
+        }
+    }
+
+    @Test
+    public void testErrorPaths() throws SQLException {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) {
+            try {
+                oracle.withDatabaseName("XEPDB1");
+                fail("Should not have been able to set database name to xepdb1.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withDatabaseName("");
+                fail("Should not have been able to set database name to nothing.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withUsername("SYSTEM");
+                fail("Should not have been able to set username to system.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withUsername("SYS");
+                fail("Should not have been able to set username to sys.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
 
-            int resultSetInt = resultSet.getInt(1);
+            try {
+                oracle.withUsername("");
+                fail("Should not have been able to set username to nothing.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
 
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            try {
+                oracle.withPassword("");
+                fail("Should not have been able to set password to nothing.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
         }
     }
 }

From 532c0b711bef4443180ae3a41da9d1d6dfb825d1 Mon Sep 17 00:00:00 2001
From: Bennet Schulz <bschulz@redhat.com>
Date: Tue, 28 Sep 2021 12:00:28 +0200
Subject: [PATCH 1457/4969] Add togglz as testcontainers user (#4484)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index af5bb4edcdb..65d417db2af 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -175,7 +175,7 @@ A huge thank you to our sponsors:
   ([query](https://github.com/search?l=Maven+POM&q=org%3Ajenkinsci+testcontainers&type=Code)).
 * [Elastic](https://www.elastic.co) - Integration testing of the Java APM agent
 * [Alkira](https://www.alkira.com/) - Testing of multiple micro-services using Kafka, PostgreSQL, Apache Zookeeper, Etcd and so on.
-
+* [Togglz](https://www.togglz.org/) - Feature Flags for the Java platform
 
 
 ## License

From dd9372515faaea7b8e5ab914fa8010d7afa29024 Mon Sep 17 00:00:00 2001
From: pioorg <piotr+github@przybyl.org>
Date: Mon, 4 Oct 2021 11:51:18 +0200
Subject: [PATCH 1458/4969] Switch from AdoptOpenJDK to Temurin and latest JDK
 8. (#4537)

* Switched from AdoptOpenJDK to Temurin and JDK version 8.0.302.
---
 .github/workflows/ci-examples.yml | 8 ++++----
 .github/workflows/ci.yml          | 8 ++++----
 .github/workflows/release.yml     | 3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 88587a6ab61..3fbdea447b9 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -17,8 +17,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.3.0
         with:
-          java-version: '8.0.292+10'
-          distribution: adopt-hotspot
+          java-version: '8.0.302'
+          distribution: temurin
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         continue-on-error: true
@@ -45,8 +45,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.3.0
         with:
-          java-version: '8.0.292+10'
-          distribution: adopt-hotspot
+          java-version: '8.0.302'
+          distribution: temurin
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         continue-on-error: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6ae55e16b4..c3a85500ff1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,8 +25,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.3.0
         with:
-          java-version: '8.0.292+10'
-          distribution: adopt-hotspot
+          java-version: '8.0.302'
+          distribution: temurin
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         with:
@@ -51,8 +51,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.3.0
         with:
-          java-version: '8.0.292+10'
-          distribution: adopt-hotspot
+          java-version: '8.0.302'
+          distribution: temurin
       - name: Cache Gradle Home files
         uses: actions/cache@v2.1.6
         continue-on-error: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 73b3b2152c9..7b9d480ec37 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2.3.0
         with:
-          java-version: '1.8'
+          java-version: '8.0.302'
+          distribution: temurin
       - name: Clear existing docker image cache
         run: docker image prune -af
 

From cad5cda62859c408962caa1ed4b3fdd756979922 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 09:52:47 +0000
Subject: [PATCH 1459/4969] Bump actions/setup-java from 2.3.0 to 2.3.1

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2.3.0...v2.3.1)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 .github/workflows/release.yml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 3fbdea447b9..a1f81f49bef 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c3a85500ff1..2cbfc92b372 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7b9d480ec37..4e1e9d7c5a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin

From d44e61637b5c9834d9abbfa1c614ebff884fc470 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 4 Oct 2021 12:34:46 +0100
Subject: [PATCH 1460/4969] Prevent Compose image pre-fetching from pulling all
 tags when tag is absent (#4538)

---
 .../containers/DockerComposeFiles.java        | 24 +++++++++----------
 .../containers/DockerComposeFilesTest.java    |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java b/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
index 15d035e3673..76754df5118 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
@@ -1,43 +1,43 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.DockerImageName;
+
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class DockerComposeFiles {
 
-    private List<ParsedDockerComposeFile> parsedComposeFiles;
+    private final List<ParsedDockerComposeFile> parsedComposeFiles;
 
     public DockerComposeFiles(List<File> composeFiles) {
         this.parsedComposeFiles = composeFiles.stream().map(ParsedDockerComposeFile::new).collect(Collectors.toList());
     }
 
     public Set<String> getDependencyImages() {
-
         Map<String, Set<String>> mergedServiceNameToImageNames = mergeServiceDependencyImageNames();
 
         return getImageNames(mergedServiceNameToImageNames);
     }
 
     private Map<String, Set<String>> mergeServiceDependencyImageNames() {
-        Map<String, Set<String>> mergedServiceNameToImageNames = new HashMap();
+        Map<String, Set<String>> mergedServiceNameToImageNames = new HashMap<>();
         for (ParsedDockerComposeFile parsedComposeFile : parsedComposeFiles) {
-            for (Entry<String, Set<String>> entry : parsedComposeFile.getServiceNameToImageNames().entrySet()) {
-                mergedServiceNameToImageNames.put(entry.getKey(), entry.getValue());
-            }
+            mergedServiceNameToImageNames.putAll(parsedComposeFile.getServiceNameToImageNames());
         }
         return mergedServiceNameToImageNames;
     }
 
     private Set<String> getImageNames(Map<String, Set<String>> serviceToImageNames) {
-        Set<String> imageNames = new HashSet<>();
-        serviceToImageNames.values().stream().forEach(imageNames::addAll);
-        return imageNames;
+        return serviceToImageNames.values().stream()
+            .flatMap(Collection::stream)
+            // Pass through DockerImageName to convert image names to canonical form (e.g. making implicit latest tag explicit)
+            .map(DockerImageName::parse)
+            .map(DockerImageName::asCanonicalNameString)
+            .collect(Collectors.toSet());
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
index 81586c8290b..c47db0c4b66 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -11,7 +11,7 @@ public class DockerComposeFilesTest {
     public void shouldGetDependencyImages() {
         DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-parsing-v2.yml")));
         Assertions.assertThat(dockerComposeFiles.getDependencyImages())
-            .containsExactlyInAnyOrder("postgres", "redis", "mysql");
+            .containsExactlyInAnyOrder("postgres:latest", "redis:latest", "mysql:latest");
     }
 
     @Test
@@ -20,6 +20,6 @@ public void shouldGetDependencyImagesWhenOverriding() {
             Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-overriding-a.yml"),
                                new File("src/test/resources/docker-compose-imagename-overriding-b.yml")));
         Assertions.assertThat(dockerComposeFiles.getDependencyImages())
-            .containsExactlyInAnyOrder("alpine:3.14", "redis:b", "mysql:b", "aservice");
+            .containsExactlyInAnyOrder("alpine:3.14", "redis:b", "mysql:b", "aservice:latest");
     }
 }

From 3a5793d2543568ced9a6202fc2c8db06c73e1bdd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:23:56 +0000
Subject: [PATCH 1461/4969] Bump okhttp from 4.9.1 to 4.9.2 in /examples

Bumps [okhttp](https://github.com/square/okhttp) from 4.9.1 to 4.9.2.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.1...parent-4.9.2)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ff1b2995e02..604f04594c0 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.32'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.2.23'
     testImplementation 'ch.qos.logback:logback-classic:1.2.5'

From 472e7c8b808779cf14362ce4c65425b7bb0cf467 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:23:58 +0000
Subject: [PATCH 1462/4969] Bump junit-jupiter-api from 5.7.2 to 5.8.1 in
 /modules/junit-jupiter

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.7.2 to 5.8.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.8.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 03abb675f3b..798d295c1f0 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.7.2'
+    api 'org.junit.jupiter:junit-jupiter-api:5.8.1'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')

From bbe2b6e854db1698531e30511137e9faa9161d75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:04 +0000
Subject: [PATCH 1463/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.5.30 to 1.5.31.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 6096fcb37b4..fe0ed6553c3 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.5.4"
     id("org.jetbrains.kotlin.jvm") version "1.5.30"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.5.30"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"
 }
 
 apply plugin: 'io.spring.dependency-management'

From d2e2ef25d9a6ebf3dba17d36d9f39d7f012a6ea1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:08 +0000
Subject: [PATCH 1464/4969] Bump postgresql from 42.2.23 to 42.2.24 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.23 to 42.2.24.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.24)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 03abb675f3b..f4f9bdd2570 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }

From f5bdb1bc4c5838e5448586051ff1aed4db02111d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:09 +0000
Subject: [PATCH 1465/4969] Bump org.springframework.boot from 2.5.4 to 2.5.5
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.5.4 to 2.5.5.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.4...v2.5.5)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 49893845273..48f9ed91b17 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.5.4'
+    id 'org.springframework.boot' version '2.5.5'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 6096fcb37b4..c48fcb9ad65 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.5.4"
+    id("org.springframework.boot") version "2.5.5"
     id("org.jetbrains.kotlin.jvm") version "1.5.30"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.30"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 3f93d3c153c..20ec4efd463 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.5.4'
+    id 'org.springframework.boot' version '2.5.5'
 }
 apply plugin: 'io.spring.dependency-management'
 

From e44062ccaa4841deb511fd8b2f2217f7d7b481cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:10 +0000
Subject: [PATCH 1466/4969] Bump postgresql from 42.2.23 to 42.2.24 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.23 to 42.2.24.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.24)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f510836c4b5..3fc86d7877b 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:5.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
 
     testCompileClasspath 'org.jetbrains:annotations:22.0.0'

From cb0d8eca5cfa9330a7054a7951805b026128b7e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:16 +0000
Subject: [PATCH 1467/4969] Bump r2dbc-mariadb from 1.0.2 to 1.0.3 in
 /modules/mariadb

Bumps [r2dbc-mariadb](https://github.com/mariadb-corporation/mariadb-connector-r2dbc) from 1.0.2 to 1.0.3.
- [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)

---
updated-dependencies:
- dependency-name: org.mariadb:r2dbc-mariadb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 037573f6143..e24fe293ff1 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.2'
+    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.4'

From a1269586b1bfc5c3a68344950bafd7e5bfa3521b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:18 +0000
Subject: [PATCH 1468/4969] Bump solr-solrj from 8.9.0 to 8.10.0 in /examples

Bumps solr-solrj from 8.9.0 to 8.10.0.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index d416c4d8c45..373ece1df60 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
 
-    implementation 'org.apache.solr:solr-solrj:8.9.0'
+    implementation 'org.apache.solr:solr-solrj:8.10.0'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 6c45f2ef98720991e4decd6bec16c21c14b3c67e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:20 +0000
Subject: [PATCH 1469/4969] Bump transport from 7.14.1 to 7.15.0 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.14.1 to 7.15.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.14.1...v7.15.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 183b2428ba8..c70fd363f55 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -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.14.1"
+    testImplementation "org.elasticsearch.client:transport:7.15.0"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 6ca83c0cb99784a7e636d093fd22ce2c91a4be63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:23 +0000
Subject: [PATCH 1470/4969] Bump postgresql from 42.2.23 to 42.2.24 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.23 to 42.2.24.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.24)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1842a0e7dd7..5c25e6243ef 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.2.23'
+    testImplementation 'org.postgresql:postgresql:42.2.24'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'

From 8bfe5a61705eae285e948f740f8ef33b5bd6190f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:24:27 +0000
Subject: [PATCH 1471/4969] Bump aws-java-sdk-s3 from 1.12.62 to 1.12.80 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.62 to 1.12.80.
- [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.12.62...1.12.80)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 1ccc305595d..a4934425027 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.62'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.37'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.80'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     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.34'

From abf18468c2b3c8ec395f07fe91cd3afd449e28d2 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 5 Oct 2021 16:10:41 +0200
Subject: [PATCH 1472/4969] Give
 EnvironmentAndSystemPropertyClientProviderStrategy the highest priority
 (#4472)

---
 .../DockerClientProviderStrategy.java         | 245 ++++++++++--------
 1 file changed, 133 insertions(+), 112 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 52700df22f3..b595ddba6ca 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -28,10 +28,12 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -113,120 +115,139 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
         }
 
         List<String> configurationFailures = new ArrayList<>();
+        List<DockerClientProviderStrategy> allStrategies = new ArrayList<>();
+
+        // The environment has the highest priority
+        allStrategies.add(new EnvironmentAndSystemPropertyClientProviderStrategy());
+
+        // Next strategy to try out is the one configured using the Testcontainers configuration mechanism
+        loadConfiguredStrategy().ifPresent(allStrategies::add);
+
+        // Finally, add all other strategies ordered by their internal priority
+        strategies
+            .stream()
+            .sorted(Comparator.comparing(DockerClientProviderStrategy::getPriority).reversed())
+            .collect(Collectors.toCollection(() -> allStrategies));
+
+
+        Predicate<DockerClientProviderStrategy> distinctStrategyClassPredicate = new Predicate<DockerClientProviderStrategy>() {
+            final Set<Class<? extends DockerClientProviderStrategy>> classes = new HashSet<>();
+
+            @Override
+            public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
+                return classes.add(dockerClientProviderStrategy.getClass());
+            }
+        };
+
+        return allStrategies
+            .stream()
+            .filter(distinctStrategyClassPredicate)
+            .filter(DockerClientProviderStrategy::isApplicable)
+            .filter(strategy -> tryOutStrategy(configurationFailures, strategy))
+            .findFirst()
+            .orElseThrow(() -> {
+                log.error("Could not find a valid Docker environment. Please check configuration. Attempted configurations were:");
+                for (String failureMessage : configurationFailures) {
+                    log.error("    " + failureMessage);
+                }
+                log.error("As no valid configuration was found, execution cannot continue");
 
-        String dockerClientStrategyClassName = TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName();
-        return Stream
-                .concat(
-                        Stream
-                                .of(dockerClientStrategyClassName)
-                                .filter(Objects::nonNull)
-                                .flatMap(it -> {
-                                    try {
-                                        Class<? extends DockerClientProviderStrategy> strategyClass = (Class) Thread.currentThread().getContextClassLoader().loadClass(it);
-                                        return Stream.of(strategyClass.newInstance());
-                                    } catch (ClassNotFoundException e) {
-                                        log.warn("Can't instantiate a strategy from {} (ClassNotFoundException). " +
-                                                "This probably means that cached configuration refers to a client provider " +
-                                                "class that is not available in this version of Testcontainers. Other " +
-                                                "strategies will be tried instead.", it);
-                                        return Stream.empty();
-                                    } catch (InstantiationException | IllegalAccessException e) {
-                                        log.warn("Can't instantiate a strategy from {}", it, e);
-                                        return Stream.empty();
-                                    }
-                                })
-                                // Ignore persisted strategy if it's not persistable anymore
-                                .filter(DockerClientProviderStrategy::isPersistable)
-                                .peek(strategy -> log.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName())),
-                        strategies
-                                .stream()
-                                .sorted(Comparator.comparing(DockerClientProviderStrategy::getPriority).reversed())
-                )
-                .filter(new Predicate<DockerClientProviderStrategy>() {
-
-                    final Set<Class<? extends DockerClientProviderStrategy>> classes = new HashSet<>();
-
-                    @Override
-                    public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
-                        return classes.add(dockerClientProviderStrategy.getClass());
-                    }
-                })
-                .filter(DockerClientProviderStrategy::isApplicable)
-                .flatMap(strategy -> {
-                    try {
-                        DockerClient dockerClient = strategy.getDockerClient();
-
-                        Info info;
-                        try {
-                            info = Unreliables.retryUntilSuccess(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS, () -> {
-                                return strategy.PING_RATE_LIMITER.getWhenReady(() -> {
-                                    log.debug("Pinging docker daemon...");
-                                    return dockerClient.infoCmd().exec();
-                                });
-                            });
-                        } catch (TimeoutException e) {
-                            IOUtils.closeQuietly(dockerClient);
-                            throw e;
-                        }
-                        log.info("Found Docker environment with {}", strategy.getDescription());
-                        log.debug(
-                            "Transport type: '{}', Docker host: '{}'",
-                            TestcontainersConfiguration.getInstance().getTransportType(),
-                            strategy.getTransportConfig().getDockerHost()
-                        );
-
-                        log.debug("Checking Docker OS type for {}", strategy.getDescription());
-                        String osType = info.getOsType();
-                        if (StringUtils.isBlank(osType)) {
-                            log.warn("Could not determine Docker OS type");
-                        } else if (!osType.equals("linux")) {
-                            log.warn("{} is currently not supported", osType);
-                            throw new InvalidConfigurationException(osType + " containers are currently not supported");
-                        }
-
-                        if (strategy.isPersistable()) {
-                            TestcontainersConfiguration.getInstance().updateUserConfig("docker.client.strategy", strategy.getClass().getName());
-                        }
-
-                        return Stream.of(strategy);
-                    } catch (Exception | ExceptionInInitializerError | NoClassDefFoundError e) {
-                        @Nullable String throwableMessage = e.getMessage();
-                        @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-                        Throwable rootCause = Throwables.getRootCause(e);
-                        @Nullable String rootCauseMessage = rootCause.getMessage();
-
-                        String failureDescription;
-                        if (throwableMessage != null && throwableMessage.equals(rootCauseMessage)) {
-                            failureDescription = String.format("%s: failed with exception %s (%s)",
-                                    strategy.getClass().getSimpleName(),
-                                    e.getClass().getSimpleName(),
-                                    throwableMessage);
-                        } else {
-                            failureDescription = String.format("%s: failed with exception %s (%s). Root cause %s (%s)",
-                                    strategy.getClass().getSimpleName(),
-                                    e.getClass().getSimpleName(),
-                                    throwableMessage,
-                                    rootCause.getClass().getSimpleName(),
-                                    rootCauseMessage
-                            );
-                        }
-                        configurationFailures.add(failureDescription);
-
-                        log.debug(failureDescription);
-                        return Stream.empty();
-                    }
-                })
-                .findAny()
-                .orElseThrow(() -> {
-                    log.error("Could not find a valid Docker environment. Please check configuration. Attempted configurations were:");
-                    for (String failureMessage : configurationFailures) {
-                        log.error("    " + failureMessage);
-                    }
-                    log.error("As no valid configuration was found, execution cannot continue");
-
-                    FAIL_FAST_ALWAYS.set(true);
-                    return new IllegalStateException("Could not find a valid Docker environment. Please see logs and check configuration");
+                FAIL_FAST_ALWAYS.set(true);
+                return new IllegalStateException("Could not find a valid Docker environment. Please see logs and check configuration");
+            });
+    }
+
+    private static boolean tryOutStrategy(List<String> configurationFailures, DockerClientProviderStrategy strategy) {
+        try {
+            log.debug("Trying out strategy: {}", strategy.getClass().getSimpleName());
+            DockerClient dockerClient = strategy.getDockerClient();
+
+            Info info;
+            try {
+                info = Unreliables.retryUntilSuccess(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS, () -> {
+                    return strategy.PING_RATE_LIMITER.getWhenReady(() -> {
+                        log.debug("Pinging docker daemon...");
+                        return dockerClient.infoCmd().exec();
+                    });
                 });
+            } catch (TimeoutException e) {
+                IOUtils.closeQuietly(dockerClient);
+                throw e;
+            }
+            log.info("Found Docker environment with {}", strategy.getDescription());
+            log.debug(
+                "Transport type: '{}', Docker host: '{}'",
+                TestcontainersConfiguration.getInstance().getTransportType(),
+                strategy.getTransportConfig().getDockerHost()
+            );
+
+            log.debug("Checking Docker OS type for {}", strategy.getDescription());
+            String osType = info.getOsType();
+            if (StringUtils.isBlank(osType)) {
+                log.warn("Could not determine Docker OS type");
+            } else if (!osType.equals("linux")) {
+                log.warn("{} is currently not supported", osType);
+                throw new InvalidConfigurationException(osType + " containers are currently not supported");
+            }
+
+            if (strategy.isPersistable()) {
+                TestcontainersConfiguration.getInstance().updateUserConfig("docker.client.strategy", strategy.getClass().getName());
+            }
+
+            return true;
+        } catch (Exception | ExceptionInInitializerError | NoClassDefFoundError e) {
+            @Nullable String throwableMessage = e.getMessage();
+            @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+            Throwable rootCause = Throwables.getRootCause(e);
+            @Nullable String rootCauseMessage = rootCause.getMessage();
+
+            String failureDescription;
+            if (throwableMessage != null && throwableMessage.equals(rootCauseMessage)) {
+                failureDescription = String.format("%s: failed with exception %s (%s)",
+                        strategy.getClass().getSimpleName(),
+                        e.getClass().getSimpleName(),
+                        throwableMessage);
+            } else {
+                failureDescription = String.format("%s: failed with exception %s (%s). Root cause %s (%s)",
+                        strategy.getClass().getSimpleName(),
+                        e.getClass().getSimpleName(),
+                        throwableMessage,
+                        rootCause.getClass().getSimpleName(),
+                        rootCauseMessage
+                );
+            }
+            configurationFailures.add(failureDescription);
+
+            log.debug(failureDescription);
+            return false;
+        }
+    }
+
+    private static Optional<? extends DockerClientProviderStrategy> loadConfiguredStrategy() {
+        String configuredDockerClientStrategyClassName = TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName();
+
+        return Stream
+            .of(configuredDockerClientStrategyClassName)
+            .filter(Objects::nonNull)
+            .flatMap(it -> {
+                try {
+                    Class<? extends DockerClientProviderStrategy> strategyClass = (Class) Thread.currentThread().getContextClassLoader().loadClass(it);
+                    return Stream.of(strategyClass.newInstance());
+                } catch (ClassNotFoundException e) {
+                    log.warn("Can't instantiate a strategy from {} (ClassNotFoundException). " +
+                        "This probably means that cached configuration refers to a client provider " +
+                        "class that is not available in this version of Testcontainers. Other " +
+                        "strategies will be tried instead.", it);
+                    return Stream.empty();
+                } catch (InstantiationException | IllegalAccessException e) {
+                    log.warn("Can't instantiate a strategy from {}", it, e);
+                    return Stream.empty();
+                }
+            })
+            // Ignore persisted strategy if it's not persistable anymore
+            .filter(DockerClientProviderStrategy::isPersistable)
+            .peek(strategy -> log.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName()))
+            .findFirst();
     }
 
     public static DockerClient getClientForConfig(TransportConfig transportConfig) {

From afc71788fa21828f0ec8fabdc81600696456dc7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 18:04:42 +0000
Subject: [PATCH 1473/4969] Bump junit-jupiter-engine from 5.7.2 to 5.8.1 in
 /modules/junit-jupiter

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.7.2 to 5.8.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.8.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 03abb675f3b..20b2179f2d6 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
 test {

From 56876dea783cf45db48f5e86c059ea8bf36386d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 18:09:41 +0000
Subject: [PATCH 1474/4969] Bump tomcat-jdbc from 10.0.10 to 10.0.12 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.10 to 10.0.12.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index b3f53e19333..ccf272554f7 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:22.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.10'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.12'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 3ffd00e635b5628bce953e81bc0b2933bf900404 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 18:15:10 +0000
Subject: [PATCH 1475/4969] Bump s3 from 2.17.34 to 2.17.52 in
 /modules/localstack

Bumps s3 from 2.17.34 to 2.17.52.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 1ccc305595d..e633fbbe05d 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3: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.34'
+    testImplementation 'software.amazon.awssdk:s3:2.17.52'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 33ee416fb6d25ff2517f3c018ddafd24d6c5dbee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 18:20:05 +0000
Subject: [PATCH 1476/4969] Bump annotations from 21.0.1 to 22.0.0 in
 /modules/oracle-xe

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 38146d4dd01..5c18b63bb9d 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
 
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
 }

From 5174d179f115c842acaa5323bd6a002ce534a494 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 18:51:26 +0000
Subject: [PATCH 1477/4969] Bump r2dbc-mssql in /modules/mssqlserver

Bumps [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 0.8.6.RELEASE to 0.8.7.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v0.8.7.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v0.8.6.RELEASE...v0.8.7.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index cd797a9807f..51e5bba3315 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.6.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8'
 
     testImplementation project(':r2dbc')
-    testImplementation 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))

From dace7e4d750552bb3d57036b579318045e203931 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 7 Oct 2021 12:15:23 +0100
Subject: [PATCH 1478/4969] Fix flaky kafka cluster example (#4549)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 examples/kafka-cluster/build.gradle                |  2 +-
 .../kafkacluster/KafkaContainerCluster.java        |  8 +++++---
 .../kafkacluster/KafkaContainerClusterTest.java    |  2 +-
 .../src/test/resources/logback-test.xml            | 14 ++++++++++++++
 .../testcontainers/containers/KafkaContainer.java  |  2 +-
 5 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 examples/kafka-cluster/src/test/resources/logback-test.xml

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 2a4650930a4..8f23284a48e 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'org.slf4j:slf4j-simple:1.7.32'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
 }
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
index fd5b1a0a0b6..398488fe3f9 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
@@ -10,6 +10,7 @@
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
+import java.time.Duration;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -56,7 +57,8 @@ public KafkaContainerCluster(String confluentPlatformVersion, int brokersNum, in
                     .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
                     .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
                     .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
-                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "");
+                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
+                    .withStartupTimeout(Duration.ofMinutes(1));
             })
             .collect(Collectors.toList());
     }
@@ -81,8 +83,8 @@ private Stream<GenericContainer<?>> allContainers() {
     @Override
     @SneakyThrows
     public void start() {
-        Stream<Startable> startables = this.brokers.stream().map(Startable.class::cast);
-        Startables.deepStart(startables).get(60, SECONDS);
+        // sequential start to avoid resource contention on CI systems with weaker hardware
+        brokers.forEach(GenericContainer::start);
 
         Unreliables.retryUntilTrue(30, TimeUnit.SECONDS, () -> {
             Container.ExecResult result = this.zookeeper.execInContainer(
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
index 0756b24d58a..a431c14bba3 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
@@ -30,7 +30,7 @@ public class KafkaContainerClusterTest {
     @Test
     public void testKafkaContainerCluster() throws Exception {
         try (
-            KafkaContainerCluster cluster = new KafkaContainerCluster("5.2.1", 3, 2)
+            KafkaContainerCluster cluster = new KafkaContainerCluster("6.2.1", 3, 2)
         ) {
             cluster.start();
             String bootstrapServers = cluster.getBootstrapServers();
diff --git a/examples/kafka-cluster/src/test/resources/logback-test.xml b/examples/kafka-cluster/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..be4ebaed2c8
--- /dev/null
+++ b/examples/kafka-cluster/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index f62ca23eb57..8b1128efef0 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -118,7 +118,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
             "advertised.listeners=[" + String.join(",", getBootstrapServers(), brokerAdvertisedListener) + "]"
         );
         if (result.getExitCode() != 0) {
-            throw new IllegalStateException(result.getStderr());
+            throw new IllegalStateException(result.toString());
         }
     }
 

From ce15717313b38a584951017e04ca791ed63bc2c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:09 +0000
Subject: [PATCH 1479/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /modules/jdbc

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index b3f53e19333..977827488ce 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 }

From 0900fcb7098293a4dfcc491c81b1ace6358e7ad5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:13 +0000
Subject: [PATCH 1480/4969] Bump assertj-core from 3.20.2 to 3.21.0 in /core

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index fca331e9d3f..e5a36114afb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -100,7 +100,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"

From b77733d69a271a2a5d741a2f5cf9c19e5f6e748f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:25 +0000
Subject: [PATCH 1481/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /modules/neo4j

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 08eda371597..2c25d148418 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 }

From a4feea019dfc658680efa8ffd60d58e63608eebd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:30 +0000
Subject: [PATCH 1482/4969] Bump guava from 30.1.1-jre to 31.0.1-jre in
 /modules/jdbc-test

Bumps [guava](https://github.com/google/guava) from 30.1.1-jre to 31.0.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8145855684f..f24b9bd6df2 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
     api project(':test-support')
 
-    api 'com.google.guava:guava:30.1.1-jre'
+    api 'com.google.guava:guava:31.0.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.7'

From 06db7b6931ff0086808a80598344824c91624117 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:31 +0000
Subject: [PATCH 1483/4969] Bump kafka-clients from 2.8.0 to 3.0.0 in
 /modules/kafka

Bumps kafka-clients from 2.8.0 to 3.0.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index f7e9acda9a0..63f751665b0 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -12,7 +12,7 @@ tasks.japicmp {
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 896f2200ebddaf0f625b6c7a3d8b0dcf771659fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:32 +0000
Subject: [PATCH 1484/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /modules/pulsar

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 478c47fff29..d886be91591 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.20.2'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }

From 3ac377d2bcd61cd375f4ead4bde4e0a487f3673b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:35 +0000
Subject: [PATCH 1485/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /modules/junit-jupiter

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 03abb675f3b..e99ccf32061 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:3.12.4') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.23'

From 97bae71b6903b2c2ffd49d7a08c6f7e3ead72b9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:48 +0000
Subject: [PATCH 1486/4969] Bump kafka-clients from 2.8.0 to 3.0.0 in /examples

Bumps kafka-clients from 2.8.0 to 3.0.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 8f23284a48e..956292df2f8 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.20"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.5'

From 2fe8148fc3c6da51d91d1910a7d694c0b648115d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:16:54 +0000
Subject: [PATCH 1487/4969] Bump logback-classic from 1.2.5 to 1.2.6 in
 /examples

Bumps logback-classic from 1.2.5 to 1.2.6.

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index c3b3e22fbc2..c44b4c7e7e1 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.8'
     implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 8f23284a48e..c4f32682f0f 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index ff1b2995e02..f03ce765d24 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.2.23'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testcontainers:postgresql'
 }
 
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index fe269d58e77..9b1424451ec 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.8'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testng:testng:7.4.0'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 2d9f50b86bd..917f1b0c5a4 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index f3a18e685f3..661f6efc125 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From a79418cdc1dbba3cf0ff6e74864be2a12d2b58b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:24:22 +0000
Subject: [PATCH 1488/4969] Bump gradle/wrapper-validation-action from 1.0.3 to
 1.0.4

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c...e6e38bacfdf1a337459f332974bb2327a31aaf4b)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index f9f1ec85662..08fbc91d00c 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -18,4 +18,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c # v1.0.3
+      - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b # v1.0.3

From 1202161b52b938a49e399c0df5b689d7cb52430c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:29:14 +0000
Subject: [PATCH 1489/4969] Bump influxdb-java from 2.21 to 2.22 in
 /modules/influxdb

Bumps [influxdb-java](https://github.com/influxdata/influxdb-java) from 2.21 to 2.22.
- [Release notes](https://github.com/influxdata/influxdb-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-java/compare/influxdb-java-2.21...influxdb-java-2.22)

---
updated-dependencies:
- dependency-name: org.influxdb:influxdb-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 704bf960724..7a028d4a19d 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.21'
+    compileOnly 'org.influxdb:influxdb-java:2.22'
     testImplementation 'org.influxdb:influxdb-java:2.21'
 }

From 3304899856be39657b5433de3f5545504a24a8ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:34:15 +0000
Subject: [PATCH 1490/4969] Bump tomcat-jdbc from 10.0.10 to 10.0.12 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.10 to 10.0.12.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8145855684f..42fb9e45dae 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.10'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.12'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.26'
 }

From 600e751a73ae971c04cf654e3c5c968bad846b34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:26:45 +0000
Subject: [PATCH 1491/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /examples

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index f284af631e5..3679475d1bd 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'
 }

From 740c0aa85d5da6a603171ec4a751516387ef20c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:26:45 +0000
Subject: [PATCH 1492/4969] Bump junit-jupiter-params from 5.7.2 to 5.8.1 in
 /modules/junit-jupiter

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.7.2 to 5.8.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.8.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7df16da0100..1a7c9a477b6 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.21.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'

From 6f546524d44c968b2ae227bbebbc299b0b830ffa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:26:54 +0000
Subject: [PATCH 1493/4969] Bump postgresql from 42.2.23 to 42.2.24 in
 /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.23 to 42.2.24.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.24)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 475f4032758..da10b960013 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'org.json:json:20210307'
-    testImplementation 'org.postgresql:postgresql:42.2.23'
+    testImplementation 'org.postgresql:postgresql:42.2.24'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testcontainers:postgresql'
 }

From 4b8ea7ee3ccdd5c67f92957b49057793c84e916e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:26:56 +0000
Subject: [PATCH 1494/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /modules/vault

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 18897f66908..4fdb274f999 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:4.4.0'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 
 }

From 878f441d52e65ba1932ab222155bdccd030648d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:26:59 +0000
Subject: [PATCH 1495/4969] Bump org.jetbrains.kotlin.jvm from 1.5.30 to 1.5.31
 in /examples

Bumps org.jetbrains.kotlin.jvm from 1.5.30 to 1.5.31.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 7e6989a1d93..e40e32a4397 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.5.5"
-    id("org.jetbrains.kotlin.jvm") version "1.5.30"
+    id("org.jetbrains.kotlin.jvm") version "1.5.31"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"
 }
 

From 34c76ff0aca7bcada960246baefa025cc7b2ca03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:27:02 +0000
Subject: [PATCH 1496/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /modules/database-commons

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 35578b55d68..73735b0d03d 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 }

From 85368a9ee379c6b641305425fd4818024db3b968 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:27:02 +0000
Subject: [PATCH 1497/4969] Bump assertj-core from 3.20.2 to 3.21.0 in
 /modules/kafka

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.20.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 63f751665b0..b37105f7463 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'com.google.guava:guava:23.0'
 }

From f83a4857ca9c9491beb69e3068791ca38ed18a00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:27:19 +0000
Subject: [PATCH 1498/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.14.1 to 7.15.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.14.1...v7.15.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index c70fd363f55..2897ecb5628 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.14.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.0"
     testImplementation "org.elasticsearch.client:transport:7.15.0"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From fe35c5c6bc87df8dd63c433187cf1e760c7733ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:27:20 +0000
Subject: [PATCH 1499/4969] Bump aws-java-sdk-sqs from 1.12.62 to 1.12.82 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.62 to 1.12.82.
- [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.12.62...1.12.82)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 04583b6ecdd..0d089bdf95f 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.62'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.82'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
     testImplementation 'software.amazon.awssdk:s3:2.17.52'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From aa273b5c0136d8bf8d9eb308040b30006ad98144 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 8 Oct 2021 11:21:48 +0200
Subject: [PATCH 1500/4969] Document Dependabot merge process (#4556)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/contributing.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/contributing.md b/docs/contributing.md
index 7d87945c704..4094fab14ef 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -90,3 +90,17 @@ New modules should have the following warning at the top of their documentation
     This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
 
 We will evaluate incubating modules periodically, and remove the label when appropriate.
+
+
+## Combining Dependabot PRs
+
+Since we generally get a lot of Dependabot PRs, we regularly combine them into single commits. 
+For this, we are using the [gh-combine-prs](https://github.com/rnorth/gh-combine-prs) extension for [GitHub CLI](https://cli.github.com/).
+
+The whole process is as follow:
+
+1. Check that all open Dependabot PRs did succeed their build. If they did not succeed, trigger a rerun if the cause were external factors or else document the reason if obvious.
+2. Run the extension from an up-to-date local `master` branch: `gh combine-prs --query "author:app/dependabot"`
+3. Merge conflicts might appear. Just ignore them, we will get those PRs in a future run.
+4. Once the build of the combined PR did succeed, temporarily enable merge commits and merge the PR using a merge commit through the GitHub UI.
+5. After the merge, disable merge commits again.

From 3740f65ae22bab3d59f5bcae0b40c9b42af5cdb6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 8 Oct 2021 07:22:53 -0400
Subject: [PATCH 1501/4969] Fix `AuthenticatedImagePullTest` (#4560)

Previous implementation was assuming that Docker can pull from the gateway, which may not always be the case.
This change makes the temporary registry run with host network, so that Docker can always pull from it.
---
 .../utility/AuthenticatedImagePullTest.java   | 72 ++++++++++++++-----
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index c99770c4fbf..3243d219cc0 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -1,21 +1,10 @@
 package org.testcontainers.utility;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
-import static org.testcontainers.TestImages.TINY_IMAGE;
-
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageResultCallback;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.concurrent.TimeUnit;
 import org.intellij.lang.annotations.Language;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -27,9 +16,27 @@
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.output.FrameConsumerResultCallback;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
+import static org.testcontainers.TestImages.TINY_IMAGE;
+
 /**
  * This test checks the integration between Testcontainers and an authenticated registry, but uses
  * a mock instance of {@link RegistryAuthLocator} - the purpose of the test is solely to ensure that
@@ -52,8 +59,10 @@ public class AuthenticatedImagePullTest {
                 .env("REGISTRY_AUTH_HTPASSWD_PATH", "/htpasswd")
                 .env("REGISTRY_AUTH_HTPASSWD_REALM", "Test");
         }))
-        .withExposedPorts(5000)
-        .waitingFor(new HttpWaitStrategy());
+        .withEnv("REGISTRY_HTTP_ADDR", "127.0.0.1:0")
+        .withCreateContainerCmdModifier(cmd -> {
+            cmd.getHostConfig().withNetworkMode("host");
+        });
 
     private static RegistryAuthLocator originalAuthLocatorSingleton;
     private static DockerClient client;
@@ -62,11 +71,34 @@ public class AuthenticatedImagePullTest {
     private static RegistryAuthLocator mockAuthLocator;
 
     @BeforeClass
-    public static void setUp() throws InterruptedException {
+    public static void setUp() throws Exception {
         originalAuthLocatorSingleton = RegistryAuthLocator.instance();
         client = DockerClientFactory.instance().client();
 
-        String testRegistryAddress = authenticatedRegistry.getHost() + ":" + authenticatedRegistry.getFirstMappedPort();
+        AtomicInteger port = new AtomicInteger(-1);
+        try (FrameConsumerResultCallback resultCallback = new FrameConsumerResultCallback()) {
+            WaitingConsumer waitingConsumer = new WaitingConsumer();
+            resultCallback.addConsumer(OutputFrame.OutputType.STDERR, waitingConsumer);
+
+            client.logContainerCmd(authenticatedRegistry.getContainerId())
+                .withStdErr(true)
+                .withFollowStream(true)
+                .exec(resultCallback);
+
+            Pattern pattern = Pattern.compile(".*listening on .*:(\\d+).*", Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+            waitingConsumer.waitUntil(it -> {
+                String s = it.getUtf8String();
+                Matcher matcher = pattern.matcher(s);
+                if (matcher.matches()) {
+                    port.set(Integer.parseInt(matcher.group(1)));
+                    return true;
+                } else {
+                    return false;
+                }
+            }, 10, TimeUnit.SECONDS);
+        }
+
+        String testRegistryAddress = authenticatedRegistry.getHost() + ":" + port.get();
         testImageName = testRegistryAddress + "/alpine";
 
         final DockerImageName expectedName = DockerImageName.parse(testImageName);
@@ -88,7 +120,11 @@ public static void setUp() throws InterruptedException {
     @Before
     public void removeImageFromLocalDocker() {
         // remove the image tag from local docker so that it must be pulled before use
-        client.removeImageCmd(testImageName).withForce(true).exec();
+        try {
+            client.removeImageCmd(testImageName).withForce(true).exec();
+        } catch (NotFoundException ignored) {
+
+        }
     }
 
     @AfterClass

From 33218e720158dfe2388bfdf9cad9fdfbfd40990f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 11 Oct 2021 14:15:19 +0100
Subject: [PATCH 1502/4969] OrientDB: Use log wait strategy for more reliable
 readiness detection (#4471)

---
 .../containers/OrientDBContainer.java           | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index f6ce060b6ec..a68f55b60ef 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -9,20 +9,14 @@
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
-import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.time.Duration;
 import java.util.Optional;
 
-import static java.net.HttpURLConnection.HTTP_OK;
-
 /**
  * @author robfrank
  */
@@ -68,14 +62,7 @@ public OrientDBContainer(final DockerImageName dockerImageName) {
         serverPassword = DEFAULT_SERVER_PASSWORD;
         databaseName = DEFAULT_DATABASE_NAME;
 
-        WaitStrategy waitForHttp = new HttpWaitStrategy()
-            .forPort(DEFAULT_HTTP_PORT)
-            .forStatusCodeMatching(response -> response == HTTP_OK);
-
-        waitStrategy = new WaitAllStrategy()
-            .withStrategy(Wait.forListeningPort())
-            .withStrategy(waitForHttp)
-            .withStartupTimeout(Duration.ofMinutes(2));
+        waitStrategy =  new LogMessageWaitStrategy().withRegEx(".*Gremlin started correctly.*");
 
         addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
     }

From f31ee7984093efe303b8326934a9f76b70f65f35 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 11 Oct 2021 15:15:19 +0100
Subject: [PATCH 1503/4969] Skip japicmp for new modules (#4569)

---
 gradle/japicmp.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index 58fbec9c0b7..e74cdccd3af 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -11,6 +11,10 @@ dependencies {
 tasks.japicmp {
     dependsOn(tasks.shadowJar)
 
+    // Disable if baseline dependencies cannot be resolved - such as when developing a new module that doesn't
+    // have an existing published version.
+    enabled = ! configurations.baseline.copy().resolvedConfiguration.lenientConfiguration.getFiles().empty
+
     oldClasspath = configurations.baseline
     newClasspath = shadowJar.outputs.files
     ignoreMissingClasses = true

From 8d40cbd75c4bbb10797e8543d080ad6e046bc1ce Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 12 Oct 2021 09:27:34 +0200
Subject: [PATCH 1504/4969] Enable `JUnitPlatform` for Spock tests (#4568)

Since Spock 2 is based on the JUnit platform, Gradle needs to be configured explicitly to discover and run the tests.
Also, since HikariCP 5 requires JDK 11+, we have to switch back to 4.0.3.
---
 modules/spock/build.gradle | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 3fc86d7877b..1e280e88965 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
 
-    testImplementation 'com.zaxxer:HikariCP:5.0.0'
+    testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
@@ -26,3 +26,10 @@ sourceJar {
        allSource contains both .java and .groovy files */
     from sourceSets.main.allSource
 }
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}

From 1ad2a053d858b2080c359a1c85288dd5481a2b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20Ka=C4=9Fan=20=C3=96zcan?= <onurkaganozcan@gmail.com>
Date: Tue, 12 Oct 2021 10:52:36 +0300
Subject: [PATCH 1505/4969] Add Azure Cosmos DB module: Introduce
 CosmosDBEmulatorContainer (#4303)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/azure.md                         |  64 +++++++++++
 mkdocs.yml                                    |   1 +
 modules/azure/build.gradle                    |   8 ++
 .../containers/CosmosDBEmulatorContainer.java |  52 +++++++++
 .../containers/KeyStoreBuilder.java           | 105 ++++++++++++++++++
 .../CosmosDBEmulatorContainerTest.java        |  73 ++++++++++++
 .../azure/src/test/resources/logback-test.xml |  16 +++
 7 files changed, 319 insertions(+)
 create mode 100644 docs/modules/azure.md
 create mode 100644 modules/azure/build.gradle
 create mode 100644 modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
 create mode 100644 modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java
 create mode 100644 modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
 create mode 100644 modules/azure/src/test/resources/logback-test.xml

diff --git a/docs/modules/azure.md b/docs/modules/azure.md
new file mode 100644
index 00000000000..529f058ea52
--- /dev/null
+++ b/docs/modules/azure.md
@@ -0,0 +1,64 @@
+# Azure Module
+
+!!! note
+This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+Testcontainers module for the Microsoft Azure's [SDK](https://github.com/Azure/azure-sdk-for-java).
+
+Currently, the module supports `CosmosDB` emulator. In order to use it, you should use the following class:
+
+Class | Container Image
+-|-
+CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
+
+## Usage example
+
+### CosmosDB
+
+Start Azure CosmosDB Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Azure CosmosDB Emulator container](../../modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+Prepare KeyStore to use for SSL.
+
+<!--codeinclude-->
+[Building KeyStore from certificate within container](../../modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java) inside_block:buildAndSaveNewKeyStore
+<!--/codeinclude-->
+
+Set system trust-store parameters to use already built KeyStore:
+
+<!--codeinclude-->
+[Set system trust-store parameters](../../modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java) inside_block:setSystemTrustStoreParameters
+<!--/codeinclude-->
+
+Build Azure CosmosDB client:
+
+<!--codeinclude-->
+[Build Azure CosmosDB client](../../modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java) inside_block:buildClient
+<!--/codeinclude-->
+
+Test against the Emulator:
+
+<!--codeinclude-->
+[Testing against Azure CosmosDB Emulator container](../../modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java) inside_block:testWithClientAgainstEmulatorContainer
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testImplementation "org.testcontainers:azure:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>azure</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 9929f5292c2..5d182b79590 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -61,6 +61,7 @@ nav:
                 - modules/databases/postgres.md
                 - modules/databases/presto.md
                 - modules/databases/trino.md
+          - modules/azure.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/gcloud.md
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
new file mode 100644
index 00000000000..19d9b3458fd
--- /dev/null
+++ b/modules/azure/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: Azure"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'com.azure:azure-cosmos:4.16.0'
+}
diff --git a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
new file mode 100644
index 00000000000..9328d881666
--- /dev/null
+++ b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
@@ -0,0 +1,52 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.security.KeyStore;
+
+/**
+ * An Azure CosmosDB container
+ */
+public class CosmosDBEmulatorContainer extends GenericContainer<CosmosDBEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME =
+            DockerImageName.parse("mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator");
+
+    private static final int PORT = 8081;
+
+    /**
+     * @param dockerImageName specified docker image name to run
+     */
+    public CosmosDBEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(PORT);
+        waitingFor(Wait.forLogMessage("(?s).*Started\\r\\n$", 1));
+    }
+
+    /**
+     * @return new KeyStore built with PKCS12
+     */
+    public KeyStore buildNewKeyStore() {
+        return KeyStoreBuilder.buildByDownloadingCertificate(getEmulatorEndpoint(), getEmulatorKey());
+    }
+
+    /**
+     * Emulator key is a known constant and specified in Azure Cosmos DB Documents.
+     * This key is also used as password for emulator certificate file.
+     *
+     * @return predefined emulator key
+     * @see <a href="https://docs.microsoft.com/en-us/azure/cosmos-db/local-emulator?tabs=ssl-netstd21#authenticate-requests">Azure Cosmos DB Documents</a>
+     */
+    public String getEmulatorKey() {
+        return "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
+    }
+
+    /**
+     * @return secure https emulator endpoint to send requests
+     */
+    public String getEmulatorEndpoint() {
+        return "https://" + getHost() + ":" + getMappedPort(PORT);
+    }
+}
diff --git a/modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java b/modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java
new file mode 100644
index 00000000000..0179e8d832a
--- /dev/null
+++ b/modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java
@@ -0,0 +1,105 @@
+package org.testcontainers.containers;
+
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Objects;
+
+final class KeyStoreBuilder {
+
+    static KeyStore buildByDownloadingCertificate(String endpoint, String keyStorePassword) {
+        OkHttpClient client = null;
+        Response response = null;
+        try {
+            TrustManager[] trustAllManagers = buildTrustAllManagers();
+            client = buildTrustAllClient(trustAllManagers);
+            Request request = buildRequest(endpoint);
+            response = client.newCall(request).execute();
+            return buildKeyStore(response.body().byteStream(), keyStorePassword);
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        } finally {
+            closeResponseSilently(response);
+            closeClientSilently(client);
+        }
+    }
+
+    private static TrustManager[] buildTrustAllManagers() {
+        return new TrustManager[] {
+                new X509TrustManager() {
+                    @Override
+                    public void checkClientTrusted(X509Certificate[] chain, String authType) {
+                    }
+
+                    @Override
+                    public void checkServerTrusted(X509Certificate[] chain, String authType) {
+                    }
+
+                    @Override
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return new X509Certificate[]{};
+                    }
+                }
+        };
+    }
+
+    private static OkHttpClient buildTrustAllClient(TrustManager[] trustManagers) throws Exception {
+        SSLContext sslContext = SSLContext.getInstance("SSL");
+        sslContext.init(null, trustManagers, new SecureRandom());
+        SSLSocketFactory socketFactory = sslContext.getSocketFactory();
+        return new OkHttpClient.Builder()
+                .sslSocketFactory(socketFactory, (X509TrustManager) trustManagers[0])
+                .hostnameVerifier((s, sslSession) -> true)
+                .build();
+    }
+
+    private static Request buildRequest(String endpoint) {
+        return new Request.Builder()
+                .get()
+                .url(endpoint + "/_explorer/emulator.pem")
+                .build();
+    }
+
+    private static KeyStore buildKeyStore(InputStream certificateStream, String keyStorePassword) throws Exception {
+        Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(certificateStream);
+        KeyStore keystore = KeyStore.getInstance("PKCS12");
+        keystore.load(null, keyStorePassword.toCharArray());
+        keystore.setCertificateEntry("azure-cosmos-emulator", certificate);
+        return keystore;
+    }
+
+    private static void closeResponseSilently(Response response) {
+        try {
+            if (Objects.nonNull(response)) {
+                response.close();
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
+    private static void closeClientSilently(OkHttpClient client) {
+        try {
+            if (Objects.nonNull(client)) {
+                client.dispatcher().executorService().shutdown();
+                client.connectionPool().evictAll();
+                Cache cache = client.cache();
+                if (Objects.nonNull(cache)) {
+                    cache.close();
+                }
+            }
+        } catch (Exception ignored) {
+        }
+    }
+}
diff --git a/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
new file mode 100644
index 00000000000..dd9dc6b718f
--- /dev/null
+++ b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
@@ -0,0 +1,73 @@
+package org.testcontainers.containers;
+
+import com.azure.cosmos.CosmosAsyncClient;
+import com.azure.cosmos.CosmosClientBuilder;
+import com.azure.cosmos.models.CosmosContainerResponse;
+import com.azure.cosmos.models.CosmosDatabaseResponse;
+import org.assertj.core.api.Assertions;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.FileOutputStream;
+import java.nio.file.Path;
+import java.security.KeyStore;
+import java.util.Properties;
+
+public class CosmosDBEmulatorContainerTest {
+
+    private static Properties originalSystemProperties;
+
+    @BeforeClass
+    public static void captureOriginalSystemProperties() {
+        originalSystemProperties = (Properties) System.getProperties().clone();
+    }
+
+    @AfterClass
+    public static void restoreOriginalSystemProperties() {
+        System.setProperties(originalSystemProperties);
+    }
+
+    @Rule
+    public TemporaryFolder tempFolder = TemporaryFolder.builder().assureDeletion().build();
+
+    @Rule
+    // emulatorContainer {
+    public CosmosDBEmulatorContainer emulator = new CosmosDBEmulatorContainer(
+            DockerImageName.parse("mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest")
+    );
+    // }
+
+    @Test
+    public void testWithCosmosClient() throws Exception {
+        // buildAndSaveNewKeyStore {
+        Path keyStoreFile = tempFolder.newFile("azure-cosmos-emulator.keystore").toPath();
+        KeyStore keyStore = emulator.buildNewKeyStore();
+        keyStore.store(new FileOutputStream(keyStoreFile.toFile()), emulator.getEmulatorKey().toCharArray());
+        // }
+        // setSystemTrustStoreParameters {
+        System.setProperty("javax.net.ssl.trustStore", keyStoreFile.toString());
+        System.setProperty("javax.net.ssl.trustStorePassword", emulator.getEmulatorKey());
+        System.setProperty("javax.net.ssl.trustStoreType", "PKCS12");
+        // }
+        // buildClient {
+        CosmosAsyncClient client = new CosmosClientBuilder()
+                .gatewayMode()
+                .endpointDiscoveryEnabled(false)
+                .endpoint(emulator.getEmulatorEndpoint())
+                .key(emulator.getEmulatorKey())
+                .buildAsyncClient();
+        // }
+        // testWithClientAgainstEmulatorContainer {
+        CosmosDatabaseResponse databaseResponse =
+                client.createDatabaseIfNotExists("Azure").block();
+        Assertions.assertThat(databaseResponse.getStatusCode()).isEqualTo(201);
+        CosmosContainerResponse containerResponse =
+                client.getDatabase("Azure").createContainerIfNotExists("ServiceContainer", "/name").block();
+        Assertions.assertThat(containerResponse.getStatusCode()).isEqualTo(201);
+        // }
+    }
+}
diff --git a/modules/azure/src/test/resources/logback-test.xml b/modules/azure/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/azure/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 92155d949f58080e7aa12538574e3b8252198f53 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 12 Oct 2021 10:27:22 +0100
Subject: [PATCH 1506/4969] Temporarily disable Thundra on master branch
 (#4570)

---
 .github/workflows/ci.yml | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2cbfc92b372..d27955d33e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,14 +9,6 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
 jobs:
-  thundra_test_initializer:
-    runs-on: ubuntu-latest
-    outputs:
-      thundra_agent_testrun_id: ${{ steps.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
-    steps:
-      - uses: actions/checkout@v2
-      - id: thundra_test_initializer
-        uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
     runs-on: ubuntu-18.04
     outputs:
@@ -42,7 +34,7 @@ jobs:
           echo $TASKS
           echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
   check:
-    needs: [find_gradle_jobs, thundra_test_initializer]
+    needs: [find_gradle_jobs]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
@@ -61,19 +53,9 @@ jobs:
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
       - name: Clear existing docker image cache
         run: docker image prune -af
-      - name: Thundra Gradle Test Instrumentation
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: thundra-io/thundra-gradle-test-action@v1
-        with:
-          apikey: ${{ secrets.THUNDRA_API_KEY }}
-          project_id: ${{ secrets.THUNDRA_PROJECT_ID }}
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
-          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}} \
-            $($THUNDRA_GRADLE_INIT_SCRIPT_PATH || echo "--init-script $THUNDRA_GRADLE_INIT_SCRIPT_PATH")
-        env:
-          THUNDRA_AGENT_TEST_RUN_ID: ${{ needs.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
-          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1
+          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
   httpclient5_test:
     runs-on: ubuntu-18.04
     steps:

From b7e9bb6a69264a43bac37edf596a928c96ce5443 Mon Sep 17 00:00:00 2001
From: Ulrich Winter <ulrich.winter@gmail.com>
Date: Tue, 12 Oct 2021 17:54:26 +0200
Subject: [PATCH 1507/4969] Update GitLab CI docs: Add --tls=false to
 docker-in-docker to avoid startup delays (#4573)

---
 .../continuous_integration/gitlab_ci.md                   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
index e6daf84401f..5e701007ab0 100644
--- a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
@@ -1,14 +1,18 @@
 # GitLab CI
 
 In order to use Testcontainers in a Gitlab CI pipeline, you need to run the job as a Docker container (see [Patterns for running inside Docker](dind_patterns.md)).
-So edit your `.gitlab-ci.yml` to include the [Docker-In-Docker service](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-workflow-with-docker-executor) (`docker:dind`) and set the `DOCKER_HOST` variable to `tcp://docker:2375` and `DOCKER_TLS_CERTDIR` to empty string.
+So edit your `.gitlab-ci.yml` to include the [Docker-In-Docker service](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-workflow-with-docker-executor) (`docker:dind`) and set the `DOCKER_HOST` variable to `tcp://docker:2375` and `DOCKER_TLS_CERTDIR` to empty string. 
+
+Caveat: Current docker releases (verified for 20.10.9) intentionally delay the startup, if the docker api is bound to a network address but not TLS protected. To avoid this delay, the docker process needs to be started with the argument `--tls=false`.  Otherwise jobs which access the docker api at the very beginning might fail.
 
 Here is a sample `.gitlab-ci.yml` that executes test with gradle:
 
 ```yml
 # DinD service is required for Testcontainers
 services:
-  - docker:dind
+  - name: docker:dind
+    # explicitly disable tls to avoid docker startup interruption
+    command: ["--tls=false"]
 
 variables:
   # Instruct Testcontainers to use the daemon of DinD.

From b29716dbfafe24dd66e8a9c2405aa1330ea96f60 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 13 Oct 2021 06:25:24 -0400
Subject: [PATCH 1508/4969] Remove `httpclient5_test` (#4562)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .github/workflows/ci.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d27955d33e3..7421b601c8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,12 +56,3 @@ jobs:
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
-  httpclient5_test:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build with Gradle
-        run: |
-          echo "transport.type=httpclient5" > $HOME/.testcontainers.properties
-          cat $HOME/.testcontainers.properties
-          ./gradlew --no-daemon --scan testcontainers:test --tests '*EventStreamTest'

From 69cf13c307a3e898297bce08f7537b4ebabae7e2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 13 Oct 2021 07:12:46 -0400
Subject: [PATCH 1509/4969] Perform port checks in parallel (#4463)

The checks will now also incorporate Awaitility.
---
 .../wait/strategy/AbstractWaitStrategy.java   | 16 ++++++
 .../wait/strategy/HostPortWaitStrategy.java   | 52 ++++++++++++++++---
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java
index dd9421cccf3..5656c21ae1d 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java
@@ -6,10 +6,26 @@
 
 import java.time.Duration;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 
 public abstract class AbstractWaitStrategy implements WaitStrategy {
 
+    static final ExecutorService EXECUTOR = Executors.newCachedThreadPool(new ThreadFactory() {
+
+        private final AtomicLong COUNTER = new AtomicLong(0);
+
+        @Override
+        public Thread newThread(Runnable r) {
+            Thread thread = new Thread(r, "testcontainers-wait-" + COUNTER.getAndIncrement());
+            thread.setDaemon(true);
+            return thread;
+        }
+    });
+
     private static final RateLimiter DOCKER_CLIENT_RATE_LIMITER = RateLimiterBuilder
         .newBuilder()
         .withRate(1, TimeUnit.SECONDS)
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index a0ba1e9950c..ed6365566f1 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -1,16 +1,23 @@
 package org.testcontainers.containers.wait.strategy;
 
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.rnorth.ducttape.TimeoutException;
-import org.rnorth.ducttape.unreliables.Unreliables;
+import org.awaitility.Awaitility;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.wait.internal.ExternalPortListeningCheck;
 import org.testcontainers.containers.wait.internal.InternalCommandPortListeningCheck;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
 /**
@@ -22,6 +29,7 @@
 public class HostPortWaitStrategy extends AbstractWaitStrategy {
 
     @Override
+    @SneakyThrows(InterruptedException.class)
     protected void waitUntilReady() {
         final Set<Integer> externalLivenessCheckPorts = getLivenessCheckPorts();
         if (externalLivenessCheckPorts.isEmpty()) {
@@ -31,7 +39,6 @@ protected void waitUntilReady() {
             return;
         }
 
-        @SuppressWarnings("unchecked")
         List<Integer> exposedPorts = waitStrategyTarget.getExposedPorts();
 
         final Set<Integer> internalPorts = getInternalPorts(externalLivenessCheckPorts, exposedPorts);
@@ -41,10 +48,43 @@ protected void waitUntilReady() {
         Callable<Boolean> externalCheck = new ExternalPortListeningCheck(waitStrategyTarget, externalLivenessCheckPorts);
 
         try {
-            Unreliables.retryUntilTrue((int) startupTimeout.getSeconds(), TimeUnit.SECONDS,
-                () -> getRateLimiter().getWhenReady(() -> internalCheck.call() && externalCheck.call()));
+            List<Future<Boolean>> futures = EXECUTOR.invokeAll(Arrays.asList(
+                // Blocking
+                () -> {
+                    Instant now = Instant.now();
+                    Boolean result = internalCheck.call();
+                    log.debug(
+                        "Internal port check {} for {} in {}",
+                        Boolean.TRUE.equals(result) ? "passed" : "failed",
+                        internalPorts,
+                        Duration.between(now, Instant.now())
+                    );
+                    return result;
+                },
+                // Polling
+                () -> {
+                    Instant now = Instant.now();
+                    Awaitility.await()
+                        .pollInSameThread()
+                        .pollInterval(Duration.ofMillis(100))
+                        .pollDelay(Duration.ZERO)
+                        .forever()
+                        .until(externalCheck);
 
-        } catch (TimeoutException e) {
+                    log.debug(
+                        "External port check passed for {} mapped as {} in {}",
+                        internalPorts,
+                        externalLivenessCheckPorts,
+                        Duration.between(now, Instant.now())
+                    );
+                    return true;
+                }
+            ), startupTimeout.getSeconds(), TimeUnit.SECONDS);
+
+            for (Future<Boolean> future : futures) {
+                future.get(0, TimeUnit.SECONDS);
+            }
+        } catch (CancellationException | ExecutionException | TimeoutException e) {
             throw new ContainerLaunchException("Timed out waiting for container port to open (" +
                     waitStrategyTarget.getHost() +
                     " ports: " +

From 737865fb964f6fd5dd84ff6dbe8ca42ab9efdc53 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 14 Oct 2021 11:39:27 +0100
Subject: [PATCH 1510/4969] Upgrade ryuk image to 0.3.3 (#4581)

---
 .../main/java/org/testcontainers/utility/ResourceReaper.java  | 2 +-
 docs/features/configuration.md                                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index ca657675da4..8c1f28378ef 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -95,7 +95,7 @@ public static String start(String hostIpAddress, DockerClient client) {
     @SneakyThrows(InterruptedException.class)
     public static String start(DockerClient client) {
         String ryukImage = ImageNameSubstitutor.instance()
-            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.2"))
+            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.3"))
             .asCanonicalNameString();
         DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
 
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 8024dbb15ef..1761d1a2a71 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -47,7 +47,7 @@ It takes a couple of seconds, but if you want to speed up your tests, you can di
 Testcontainers uses public Docker images to perform different actions like startup checks, VNC recording and others. 
 Some companies disallow the usage of Docker Hub, but you can override `*.image` properties with your own images from your private registry to workaround that.
 
-> **ryuk.container.image = testcontainers/ryuk:0.3.2**
+> **ryuk.container.image = testcontainers/ryuk:0.3.3**
 > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
 
 > **tinyimage.container.image = alpine:3.14**  
@@ -74,7 +74,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 
 ## Customizing Ryuk resource reaper
 
-> **ryuk.container.image = testcontainers/ryuk:0.3.2**
+> **ryuk.container.image = testcontainers/ryuk:0.3.3**
 > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
 
 > **ryuk.container.privileged = false**

From 2174928a5d2ac6e117643c12300171a03f8de7f8 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 14 Oct 2021 13:44:14 +0200
Subject: [PATCH 1511/4969] Remove unused `@ClassRule` container in
 `KafkaContainerTest` and use `cp-kafka:6.2.1` as default (#4564)

---
 docs/modules/kafka.md                         |  4 +--
 .../containers/KafkaContainerTest.java        | 34 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index b0cd1742f6b..58f447d412e 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -10,9 +10,9 @@ More precisely Testcontainers uses the official Docker images for [Confluent OSS
 
 ## Example
 
-The following field in your JUnit test class will prepare a container running Kafka:
+Create a `KafkaContainer` to use it in your tests:
 <!--codeinclude-->
-[JUnit Rule](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:junitRule
+[Creating a KafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
 
 The correspondence between Confluent Platform versions and Kafka versions can be seen [in Confluent documentation](https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility)
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index e16081d16d9..f0ef0db2067 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -1,14 +1,6 @@
 package org.testcontainers.containers;
 
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
-
 import com.google.common.collect.ImmutableMap;
-import java.time.Duration;
-import java.util.Collection;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
@@ -21,22 +13,25 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.ClassRule;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
+import java.time.Duration;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
 public class KafkaContainerTest {
 
-    private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:5.4.3");
+    private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:6.2.1");
     private static final DockerImageName ZOOKEEPER_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-zookeeper:4.0.0");
 
-    // junitRule {
-    @ClassRule
-    public static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"));
-    // }
-
     @Test
     public void testUsage() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)) {
@@ -50,7 +45,7 @@ public void testUsage() throws Exception {
     public void testUsageWithSpecificImage() throws Exception {
         try (
             // constructorWithVersion {
-            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
             // }
         ) {
             kafka.start();
@@ -62,11 +57,10 @@ public void testUsageWithSpecificImage() throws Exception {
         }
     }
 
-
     @Test
     public void testUsageWithVersion() throws Exception {
         try (
-            KafkaContainer kafka = new KafkaContainer("5.5.1")
+            KafkaContainer kafka = new KafkaContainer("6.2.1")
         ) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
@@ -105,9 +99,9 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
     }
 
     @Test
-    public void testConfluentPlatformVersion6() throws Exception {
+    public void testConfluentPlatformVersion5() throws Exception {
         try (
-            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.0.0"))
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
         ) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());

From 81317a66024cb82f99d349c5b3247f8e3616c7ae Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 18 Oct 2021 07:15:46 -0400
Subject: [PATCH 1512/4969] Provide an API to force access to the host (#4584)

---
 .../containers/GenericContainer.java          | 16 +++++++
 .../containers/PortForwardingContainer.java   | 16 +++++++
 .../containers/ExposedHostTest.java           | 47 ++++++++++++-------
 docs/features/networking.md                   |  3 +-
 4 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 6d9551b8d6e..c2387cf5977 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -231,6 +231,7 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Setter(AccessLevel.NONE)
     private boolean shouldBeReused = false;
 
+    private boolean hostAccessible = false;
 
     public GenericContainer(@NonNull final DockerImageName dockerImageName) {
         this.image = new RemoteDockerImage(dockerImageName);
@@ -834,6 +835,9 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
             createCommand.withNetworkMode(networkForLinks.get());
         }
 
+        if (hostAccessible) {
+            PortForwardingContainer.INSTANCE.start();
+        }
         PortForwardingContainer.INSTANCE.getNetwork().ifPresent(it -> {
             withExtraHost(INTERNAL_HOST_HOSTNAME, it.getIpAddress());
         });
@@ -1424,6 +1428,18 @@ public SELF withReuse(boolean reusable) {
         return self();
     }
 
+    /**
+     * Forces access to the tests host machine.
+     * Use this method if you need to call {@link org.testcontainers.Testcontainers#exposeHostPorts(int...)}
+     * after you start this container.
+     *
+     * @return this
+     */
+    public SELF withAccessToHost(boolean value) {
+        this.hostAccessible = value;
+        return self();
+    }
+
     @Override
     public boolean equals(Object o) {
         return this == o;
diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index b3f020500a1..a854b1e55c3 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -15,6 +15,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
 
 public enum PortForwardingContainer {
     INSTANCE;
@@ -68,9 +69,24 @@ public void exposeHostPort(int hostPort, int containerPort) {
         }
     }
 
+    void start() {
+        getSshConnection();
+    }
+
     Optional<ContainerNetwork> getNetwork() {
         return Optional.ofNullable(container)
             .map(GenericContainer::getContainerInfo)
             .flatMap(it -> it.getNetworkSettings().getNetworks().values().stream().findFirst());
     }
+
+    void reset() {
+        if (container != null) {
+            container.stop();
+        }
+        container = null;
+
+        ((AtomicReference<?>) (Object) sshConnection).set(null);
+
+        exposedPorts.clear();
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index d17b0709dfa..38005014662 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.sun.net.httpserver.HttpServer;
 import lombok.SneakyThrows;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -31,42 +32,52 @@ public static void setUpClass() throws Exception {
         });
 
         server.start();
-        Testcontainers.exposeHostPorts(server.getAddress().getPort());
-
-        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 80));
-        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));
     }
 
     @AfterClass
-    public static void tearDownClass() throws Exception {
+    public static void tearDownClass() {
         server.stop(0);
     }
 
+    @After
+    public void tearDown() {
+        PortForwardingContainer.INSTANCE.reset();
+    }
+
+    @Test
+    public void testExposedHostAfterContainerIsStarted() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+                .withCommand("top")
+                .withAccessToHost(true)
+        ) {
+            container.start();
+            Testcontainers.exposeHostPorts(server.getAddress().getPort());
+            assertResponse(container, server.getAddress().getPort());
+        }
+    }
+
     @Test
     public void testExposedHost() throws Exception {
-        assertResponse(new GenericContainer<>(TINY_IMAGE)
-            .withCommand("top"),
-            server.getAddress().getPort());
+        Testcontainers.exposeHostPorts(server.getAddress().getPort());
+        assertResponse(new GenericContainer<>(TINY_IMAGE).withCommand("top"), server.getAddress().getPort());
     }
 
     @Test
     public void testExposedHostWithNetwork() throws Exception {
+        Testcontainers.exposeHostPorts(server.getAddress().getPort());
         try (Network network = Network.newNetwork()) {
-            assertResponse(new GenericContainer<>(TINY_IMAGE)
-                .withNetwork(network)
-                .withCommand("top"),
-                server.getAddress().getPort());
+            assertResponse(new GenericContainer<>(TINY_IMAGE).withNetwork(network).withCommand("top"), server.getAddress().getPort());
         }
     }
 
     @Test
     public void testExposedHostPortOnFixedInternalPorts() throws Exception {
-        assertResponse(new GenericContainer<>(TINY_IMAGE)
-            .withCommand("top"),
-            80);
-        assertResponse(new GenericContainer<>(TINY_IMAGE)
-            .withCommand("top"),
-            81);
+        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 80));
+        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));
+
+        assertResponse(new GenericContainer<>(TINY_IMAGE).withCommand("top"), 80);
+        assertResponse(new GenericContainer<>(TINY_IMAGE).withCommand("top"), 81);
     }
 
     @SneakyThrows
diff --git a/docs/features/networking.md b/docs/features/networking.md
index e7d8493483e..7ecf929da16 100644
--- a/docs/features/networking.md
+++ b/docs/features/networking.md
@@ -69,7 +69,8 @@ We need to tell Testcontainers to prepare to expose this port to containers:
 <!--/codeinclude-->
 
 !!! warning
-    Note that the above command should be invoked _before_ containers are started, but _after_ the server on the host was started.
+    Note that the above command should be invoked _before_ containers are started, but _after_ the server on the host was started.  
+    Alternatively, use `container.withAccessToHost(true)` to force the host access mechanism (you still need to call `exposeHostPorts` to make the port available).
     
 Having done so, we can now access this port from any containers that are launched.
 From a container's perspective, the hostname will be `host.testcontainers.internal` and the port will be the same value as `localServerPort`.

From 31e55619a36f89afe27234b94e0250417dc5ff8f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 20 Oct 2021 17:19:42 +0100
Subject: [PATCH 1513/4969] Remove Linux Azure pipelines build for Linux
 (#4452)

This retains Windows build
---
 azure-pipelines.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 247948901d8..91e33f202a9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,21 +3,6 @@ jobs:
 - job: azure_pipeline_tests
   steps:
 
-  # Run a minimal set of tests in normal Linux pipeline builds
-  - task: Gradle@2
-    condition: eq(variables['Agent.OS'], 'Linux')
-    displayName: Build & test (Linux - minimal core)
-    env:
-      AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
-      AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
-    inputs:
-        gradleWrapperFile: 'gradlew'
-        jdkVersionOption: '1.11'
-        options: "--no-daemon --continue"
-        tasks: "clean testcontainers:test --tests GenericContainerRuleTest"
-        publishJUnitResults: true
-        testResultsFiles: '**/TEST-*.xml'
-
   # Run all core tests when running the Windows CI tests
   - task: Gradle@2
     condition: eq(variables['Agent.OS'], 'Windows_NT')

From e122628ab3493967636e5f78498d594b12d7d3ff Mon Sep 17 00:00:00 2001
From: Oguzhan Ozdemir <aoozdemir@live.com>
Date: Thu, 21 Oct 2021 14:33:09 +0300
Subject: [PATCH 1514/4969] Revert "Temporarily disable Thundra on master
 branch" (#4571)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/workflows/ci.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7421b601c8d..7336e0767e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,14 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
 jobs:
+  thundra_test_initializer:
+    runs-on: ubuntu-latest
+    outputs:
+      thundra_agent_testrun_id: ${{ steps.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: thundra_test_initializer
+        uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
     runs-on: ubuntu-18.04
     outputs:
@@ -34,7 +42,7 @@ jobs:
           echo $TASKS
           echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
   check:
-    needs: [find_gradle_jobs]
+    needs: [find_gradle_jobs, thundra_test_initializer]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
@@ -53,6 +61,16 @@ jobs:
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
       - name: Clear existing docker image cache
         run: docker image prune -af
+      - name: Thundra Gradle Test Instrumentation
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: thundra-io/thundra-gradle-test-action@v1
+        with:
+          apikey: ${{ secrets.THUNDRA_API_KEY }}
+          project_id: ${{ secrets.THUNDRA_PROJECT_ID }}
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
-          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
+          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}} \
+            $([[ -f $THUNDRA_GRADLE_INIT_SCRIPT_PATH ]] && echo "--init-script $THUNDRA_GRADLE_INIT_SCRIPT_PATH")
+        env:
+          THUNDRA_AGENT_TEST_RUN_ID: ${{ needs.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
+          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1
\ No newline at end of file

From a5418861a0eb605e049ae4ae6a7d6fa08c0e2327 Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Thu, 21 Oct 2021 16:15:33 +0200
Subject: [PATCH 1515/4969] [couchbase] Add support for Couchbase Analytics.
 (#4592)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../couchbase/CouchbaseContainer.java         | 48 ++++++++++++++++++-
 .../couchbase/CouchbaseService.java           |  7 ++-
 .../couchbase/CouchbaseContainerTest.java     | 16 +++++++
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index e9247b8c84a..db8d8ec9666 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -68,6 +68,10 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private static final int SEARCH_SSL_PORT = 18094;
 
+    private static final int ANALYTICS_PORT = 8095;
+
+    private static final int ANALYTICS_SSL_PORT = 18095;
+
     private static final int KV_PORT = 11210;
 
     private static final int KV_SSL_PORT = 11207;
@@ -84,7 +88,17 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private String password = "password";
 
-    private Set<CouchbaseService> enabledServices = EnumSet.allOf(CouchbaseService.class);
+    /**
+     * Enabled services does not include Analytics since most users likely do not need to test
+     * with it and is also a little heavy on memory and runtime requirements. Also, it is only
+     * available with the enterprise edition (EE).
+     */
+    private Set<CouchbaseService> enabledServices = EnumSet.of(
+        CouchbaseService.KV,
+        CouchbaseService.QUERY,
+        CouchbaseService.SEARCH,
+        CouchbaseService.INDEX
+    );
 
     private final List<BucketDefinition> buckets = new ArrayList<>();
 
@@ -144,6 +158,17 @@ public CouchbaseContainer withEnabledServices(final CouchbaseService... enabled)
         return this;
     }
 
+    /**
+     * Enables the analytics service which is not enabled by default.
+     *
+     * @return this {@link CouchbaseContainer} for chaining purposes.
+     */
+    public CouchbaseContainer withAnalyticsService() {
+        checkNotRunning();
+        this.enabledServices.add(CouchbaseService.ANALYTICS);
+        return this;
+    }
+
     public final String getUsername() {
         return username;
     }
@@ -177,6 +202,8 @@ protected void configure() {
             QUERY_SSL_PORT,
             SEARCH_PORT,
             SEARCH_SSL_PORT,
+            ANALYTICS_PORT,
+            ANALYTICS_SSL_PORT,
             KV_PORT,
             KV_SSL_PORT
         );
@@ -214,6 +241,16 @@ protected void configure() {
             );
         }
 
+        if (enabledServices.contains(CouchbaseService.ANALYTICS)) {
+            waitStrategy = waitStrategy.withStrategy(
+                new HttpWaitStrategy()
+                    .forPath("/admin/ping")
+                    .forPort(ANALYTICS_PORT)
+                    .withBasicCredentials(username, password)
+                    .forStatusCode(200)
+            );
+        }
+
         waitingFor(waitStrategy);
     }
 
@@ -262,6 +299,10 @@ private void initializeIsEnterprise() {
         } catch (IOException e) {
             throw new IllegalStateException("Couchbase /pools did not return valid JSON");
         }
+
+        if (!isEnterprise && enabledServices.contains(CouchbaseService.ANALYTICS)) {
+            throw new IllegalStateException("The Analytics Service is only supported with the Enterprise version");
+        }
     }
 
     /**
@@ -349,6 +390,11 @@ private void configureExternalPorts() {
             builder.add("ftsSSL", Integer.toString(getMappedPort(SEARCH_SSL_PORT)));
         }
 
+        if (enabledServices.contains(CouchbaseService.ANALYTICS)) {
+            builder.add("cbas", Integer.toString(getMappedPort(ANALYTICS_PORT)));
+            builder.add("cbasSSL", Integer.toString(getMappedPort(ANALYTICS_SSL_PORT)));
+        }
+
         @Cleanup Response response = doHttpRequest(
             MGMT_PORT,
             "/node/controller/setupAlternateAddresses/external",
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
index c60fc6b71d0..57d3e37fcf2 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
@@ -39,7 +39,12 @@ public enum CouchbaseService {
   /**
    * Indexing service (needed if QUERY is also used!).
    */
-  INDEX("index");
+  INDEX("index"),
+
+  /**
+   * Analytics service.
+   */
+  ANALYTICS("cbas");
 
   private final String identifier;
 
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index fcebbe2bb62..5d2d7d9402a 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -21,6 +21,7 @@
 import com.couchbase.client.java.Collection;
 import com.couchbase.client.java.json.JsonObject;
 import org.junit.Test;
+import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -29,6 +30,7 @@
 import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 
 public class CouchbaseContainerTest {
 
@@ -111,6 +113,20 @@ public void testBucketIsFlushableIfEnabled() {
         }
     }
 
+    /**
+     * Make sure that the code fails fast if the Analytics service is enabled on the community
+     * edition which is not supported.
+     */
+    @Test
+    public void testFailureIfCommunityUsedWithAnalytics() {
+        try (
+            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
+                .withEnabledServices(CouchbaseService.KV, CouchbaseService.ANALYTICS)
+        ) {
+            assertThrows(ContainerLaunchException.class, () -> setUpClient(container, cluster -> {}));
+        }
+    }
+
     private void setUpClient(CouchbaseContainer container, Consumer<Cluster> consumer) {
         container.start();
 

From e257baca07068fdc34894060a1997383c32dc040 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 22 Oct 2021 13:04:22 +0200
Subject: [PATCH 1516/4969] Fix race condition in external port check (#4597)

Makes Awaitility ignore exception (which are expected to occur) during checking external ports.
---
 .../containers/wait/strategy/HostPortWaitStrategy.java           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index ed6365566f1..38ddcb44db6 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -68,6 +68,7 @@ protected void waitUntilReady() {
                         .pollInSameThread()
                         .pollInterval(Duration.ofMillis(100))
                         .pollDelay(Duration.ZERO)
+                        .ignoreExceptions()
                         .forever()
                         .until(externalCheck);
 

From 820161f7be7e43f36b48e2347e3e612bb905bc60 Mon Sep 17 00:00:00 2001
From: Tobias Stadler <ts.stadler@gmx.de>
Date: Fri, 22 Oct 2021 14:17:56 +0200
Subject: [PATCH 1517/4969] Added started log message used in Selenium 4.0.0
 (#4580)

---
 .../containers/BrowserWebDriverContainer.java               | 4 ++--
 .../junit/{Selenium3xTest.java => SeleniumStartTest.java}   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename modules/selenium/src/test/java/org/testcontainers/junit/{Selenium3xTest.java => SeleniumStartTest.java} (86%)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 1209b7af019..17544308691 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -78,7 +78,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     public BrowserWebDriverContainer() {
         super();
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
+                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
                 .withStartupTimeout(Duration.of(15, SECONDS));
 
         this.waitStrategy = new WaitAllStrategy()
@@ -107,7 +107,7 @@ public BrowserWebDriverContainer(DockerImageName dockerImageName) {
         // we assert compatibility with the chrome/firefox image later, after capabilities are processed
 
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
+                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
                 .withStartupTimeout(Duration.of(15, SECONDS));
 
         this.waitStrategy = new WaitAllStrategy()
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
similarity index 86%
rename from modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
rename to modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
index 1c7d3fe494d..a236a9696c1 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/Selenium3xTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
@@ -11,11 +11,11 @@
  * Simple test to check that readiness detection works correctly across major versions of the containers.
  */
 @RunWith(Parameterized.class)
-public class Selenium3xTest {
+public class SeleniumStartTest {
 
     @Parameterized.Parameters(name = "tag: {0}")
     public static String[] data() {
-        return new String[]{"3.4.0", "2.53.0", "2.45.0"};
+        return new String[]{"4.0.0", "3.4.0", "2.53.0", "2.45.0"};
     }
 
     @Parameterized.Parameter()
@@ -24,7 +24,7 @@ public static String[] data() {
     @Test
     public void testAdditionalStartupString() {
         final DockerImageName imageName = DockerImageName
-            .parse("selenium/standalone-chrome-debug")
+            .parse("selenium/standalone-chrome")
             .withTag(tag);
         try (BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>(imageName)
                 .withCapabilities(new ChromeOptions())) {

From ce57df66eff75e77c545ef840376816a19e54cb7 Mon Sep 17 00:00:00 2001
From: Alexander Lehmann <a.lehm@gmx.de>
Date: Fri, 22 Oct 2021 14:25:46 +0200
Subject: [PATCH 1518/4969] Fix double nested lambda in `getWithTimeout`
 (#4470)

This fixes #4469, `getWithTimeou`t did only apply to the outer lambda, which returned immediately (the inner lambda). Instead, wrap getWithTimeout itself inside a lambda.
---
 .../testcontainers/containers/BrowserWebDriverContainer.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 17544308691..7bc37e4701c 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -281,9 +281,8 @@ public int getPort() {
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         driver = Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS,
-                Timeouts.getWithTimeout(10, TimeUnit.SECONDS,
-                        () ->
-                            () -> new RemoteWebDriver(getSeleniumAddress(), capabilities)));
+                () -> Timeouts.getWithTimeout(10, TimeUnit.SECONDS,
+                        () -> new RemoteWebDriver(getSeleniumAddress(), capabilities)));
 
         if (vncRecordingContainer != null) {
             LOGGER.debug("Starting VNC recording");

From 1469b22dc2d0cc4694d080f958e403f598632a55 Mon Sep 17 00:00:00 2001
From: Florent Biville <445792+fbiville@users.noreply.github.com>
Date: Fri, 22 Oct 2021 14:27:14 +0200
Subject: [PATCH 1519/4969] Make Bolt log wait strategy more lenient (#4455)

Fixes #4454
---
 .../main/java/org/testcontainers/containers/Neo4jContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index e93a840302a..7890bf5dcad 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -91,7 +91,7 @@ public Neo4jContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         WaitStrategy waitForBolt = new LogMessageWaitStrategy()
-            .withRegEx(String.format(".*Bolt enabled on 0\\.0\\.0\\.0:%d\\.\n", DEFAULT_BOLT_PORT));
+            .withRegEx(String.format(".*Bolt enabled on .*:%d\\.\n", DEFAULT_BOLT_PORT));
         WaitStrategy waitForHttp = new HttpWaitStrategy()
             .forPort(DEFAULT_HTTP_PORT)
             .forStatusCodeMatching(response -> response == HTTP_OK);

From 902e45a5aca8416ede36b37ea5a84596b5b696ef Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 22 Oct 2021 14:28:39 +0200
Subject: [PATCH 1520/4969] Update RELEASING.md (#4590)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 RELEASING.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index 34a6b55ae26..4ad91b56477 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -6,18 +6,21 @@ Testcontainers' release process is semi-automated through GitHub Actions. This d
 
 1. Ensure that the master branch is building and that tests are passing.
 1. Create a new release on GitHub. **The tag name is used as the version**, so please keep the tag name plain (e.g. 1.2.3).
-1. The release triggers a GitHub Action workflow, but it gets mostly build using results from the Gradle remote-cache. Therefore, this should be fairly fast.
-1. Login to Sonatype to check the staging repository.
-1. Get the staging url after GitHub Action workflow finished.
-1. Manually test the release with the staging url as maven repository url (e.g. critical issues and features).
-1. Run [TinSalver](https://github.com/bsideup/tinsalver) from GitHub using `npx` to sign artifact (see [TinsSalver README](https://github.com/bsideup/tinsalver/blob/main/README.md)).
-1. Close the release in Sonatype. This will evaluate the release based on given Sontaype rules and afterwards automatically sync to Maven Central.
-1. Handcraft and polish some of the release notes (e.g. substitute combinded dependency PRs and highlight certain features).
-1. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter!
+1. The release triggers a GitHub Action workflow.
+1. Log in to [Sonatype](https://oss.sonatype.org/) to check the staging repository.
+    * Getting access to Sonatype requires a Sonatype JIRA account and [raising an issue](https://issues.sonatype.org/browse/OSSRH-74229), requesting access. 
+3. Get the staging URL from Sonatype after GitHub Action workflow finished. The general URL format should be `https://oss.sonatype.org/service/local/repositories/$staging-repo-id/content/`
+4. Manually test the release with the staging URL as maven repository URL (e.g. critical issues and features).
+5. Run [TinSalver](https://github.com/bsideup/tinsalver) from GitHub using `npx` to sign artifact (see [TinSalver README](https://github.com/bsideup/tinsalver/blob/main/README.md)).
+    * For TinSalver to correctly work with keybase on WSL on Windows, you might need to disable pinentry: `keybase config set -b pinentry.disabled true`.
+7. Close the release in Sonatype. This will evaluate the release based on given Sonatype rules.
+8. After successful closing, the release button needs to be clicked and afterwards it is automatically synced to Maven Central.
+9. Handcraft and polish some of the release notes (e.g. substitute combinded dependency PRs and highlight certain features).
+10. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter!
 
 ## Internal details
 
 * The process is done with GitHub Actions, TinSalver and Sonatype.
 * Sonatype will automatically promote the staging release to Maven Central.
 * Keybase needs to be installed on the developer machine.
-* GPG key of signing developer needs to be uplodaed to the Ubuntu keyserver (or other server supported by Sonatype).
+* GPG key of signing developer needs to be uplodaed to the [Ubuntu keyserver](https://keyserver.ubuntu.com/) (or other server supported by Sonatype).

From 76f11b344ce42ad920828b0628a7ec929a9d0eca Mon Sep 17 00:00:00 2001
From: Robert Munteanu <robert.munteanu@gmail.com>
Date: Fri, 22 Oct 2021 14:54:53 +0200
Subject: [PATCH 1521/4969] Upgrade to Docker Compose 1.29.2 (#4164) (#4461)

---
 .../org/testcontainers/containers/DockerComposeContainer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 89d6d692db7..961d066cb91 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -608,7 +608,7 @@ interface DockerCompose {
 class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
 
     public static final char UNIX_PATH_SEPERATOR = ':';
-    public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.24.1");
+    public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.29.2");
 
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
 

From 436fde8cbe1a24b95b6e872bb2247d8018758e2d Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 22 Oct 2021 17:28:37 +0200
Subject: [PATCH 1522/4969] Don't run tests as part of the release build
 (#4600)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e1e9d7c5a1..3779af890ae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
         run: docker image prune -af
 
       - name: Run Gradle Build
-        run: ./gradlew build --scan --no-daemon -i
+        run: ./gradlew build --scan --no-daemon -i -x test
 
       - name: Run Gradle Publish
         run: |

From 94a1a111d6369edead0ff6e051af26d7dc4799ef Mon Sep 17 00:00:00 2001
From: Oguzhan Ozdemir <aoozdemir@live.com>
Date: Mon, 25 Oct 2021 13:19:01 +0300
Subject: [PATCH 1523/4969] Suggestion to add Thundra test summary badge
 (#4604)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 752c501e91f..9bcf6f002f8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Testcontainers
 
 [![Thundra Foresight](https://thundra-assets-prod.s3.us-west-2.amazonaws.com/images/badges/thundra-foresight-badge-enabled.svg)](https://foresight.thundra.live/testRuns/5a49cc30-f063-11eb-9a03-0242ac130003)
+[![Thundra Foresight Test Results](https://foresight.service.thundra.us/public/api/v1/badge/test/5a49cc30-f063-11eb-9a03-0242ac130003)](https://foresight.thundra.live/testRuns/5a49cc30-f063-11eb-9a03-0242ac130003)
 
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 

From 5cbf52a95b81d9a614bff473b617861673119f0b Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 27 Oct 2021 11:19:21 +0100
Subject: [PATCH 1524/4969] Update docs version

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 5d182b79590..be30f26a964 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -97,4 +97,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.16.0
+    latest_version: 1.16.2

From 0654ef6a9186eab85df3accd9ea52a37c68853b0 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 27 Oct 2021 12:16:08 +0100
Subject: [PATCH 1525/4969] Use automated PR to update docs version (#4606)

---
 .github/workflows/update-docs-version.yml | 45 +++++++++++------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index ee11b83026a..3311847da5d 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -1,28 +1,27 @@
 name: Update docs version
 
 on:
-    release:
-        types: [published]
+  release:
+    types: [ published ]
 
 jobs:
-    build:
-        if: github.repository == 'testcontainers/testcontainers-java'
-        runs-on: ubuntu-18.04
-        steps:
-            -   uses: actions/checkout@v2
-                with:
-                  ref: master
-            -   name: Update latest_version property in mkdocs.yml
-                run: |
-                    sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
-                    git diff
-            -   name: Commit changes
-                run: |
-                    git config user.email "nobody@testcontainers.org"
-                    git config user.name "GitHub Action - Update docs version"
-                    git add mkdocs.yml
-                    git commit -m "Update documentation version to ${GITHUB_REF##*/}" -m "skip-checks: true" || echo "not changed"
-            -   name: Push changes
-                uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6 # v0.6.0
-                with:
-                    github_token: ${{ secrets.GITHUB_TOKEN }}
+  build:
+    if: github.repository == 'testcontainers/testcontainers-java'
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: master
+      - name: Update latest_version property in mkdocs.yml
+        run: |
+          sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
+          git diff
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@3c3d696d5b8aa2eb0e70f76c251e4b149122acf1 # v3.10.1
+        with:
+          title: Update docs version to ${GITHUB_REF##*/}
+          body: |
+            Update docs version to ${GITHUB_REF##*/}
+            skip-checks: true
+          branch: update-docs-version
+          delete-branch: true

From 70cc4e3b3df6062251d6aa8191a91b7f88b44f6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:34 +0000
Subject: [PATCH 1526/4969] Bump mysql-connector-java from 8.0.26 to 8.0.27 in
 /modules/mysql

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.26 to 8.0.27.
- [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.26...8.0.27)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e465acaaee3..d84def3e7ba 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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.26'
+    testImplementation 'mysql:mysql-connector-java:8.0.27'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From 659b7a5274b5db8c5d35c7c8952e35b27686d599 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:34 +0000
Subject: [PATCH 1527/4969] Bump neo4j from 3.5.9 to 3.5.29 in /modules/neo4j

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.9 to 3.5.29.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/commits)

---
updated-dependencies:
- dependency-name: org.neo4j:neo4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 2c25d148418..51cc625dc9d 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,7 +29,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.9"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.29"
 
     api project(":testcontainers")
 

From bf7f4e3ef7658e33ce02c84f139f41b658c5fb72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:35 +0000
Subject: [PATCH 1528/4969] Bump testcontainers from 1.16.0 to 1.16.2 in /core

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.16.0 to 1.16.2.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.0...1.16.2)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index e5a36114afb..ad0e189acec 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -53,7 +53,7 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.16.0', {
+    baseline 'org.testcontainers:testcontainers:1.16.2', {
         exclude group: "*", module: "*"
     }
 

From eb95474dc571679d049379861025e6250fac57d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:35 +0000
Subject: [PATCH 1529/4969] Bump mysql-connector-java from 8.0.26 to 8.0.27 in
 /modules/spock

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.26 to 8.0.27.
- [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.26...8.0.27)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1e280e88965..478f3bdd31c 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
 
     testCompileClasspath 'org.jetbrains:annotations:22.0.0'
 }

From 3d3c63189af29f64e4f28d9380bc0127a1b44268 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:35 +0000
Subject: [PATCH 1530/4969] Bump aws-java-sdk-dynamodb from 1.12.60 to 1.12.100
 in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.60 to 1.12.100.
- [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.12.60...1.12.100)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 4cf9b02f160..7dbadb27133 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.60'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.37'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.100'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.100'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 652f433b06624c4967f730b90b64514af2457ac2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:35 +0000
Subject: [PATCH 1531/4969] Bump aws-java-sdk-s3 from 1.12.80 to 1.12.100 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.80 to 1.12.100.
- [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.12.80...1.12.100)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 0d089bdf95f..c1f29a861bc 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.80'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.100'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.82'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'

From 0a27e65fd32e27093bb6f1a1777555a20d9266dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:36 +0000
Subject: [PATCH 1532/4969] Bump mysql-connector-java from 8.0.26 to 8.0.27 in
 /modules/jdbc-test

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.26 to 8.0.27.
- [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.26...8.0.27)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6e03f3e1969..3cfed4d80c0 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -16,5 +16,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.12'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.26'
+    api 'mysql:mysql-connector-java:8.0.27'
 }

From e22501afad14bfe77e673e2f7d14f8c81a8fb89e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:36 +0000
Subject: [PATCH 1533/4969] Bump pulsar-client from 2.7.2 to 2.7.3 in
 /modules/pulsar

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.7.2 to 2.7.3.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.7.2...v2.7.3)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index d886be91591..ef3a4298128 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.3'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }

From 49f558b79bd93028030fe0aa5813e0cf82a673d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:39 +0000
Subject: [PATCH 1534/4969] Bump aws-java-sdk-sqs from 1.12.82 to 1.12.100 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.82 to 1.12.100.
- [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.12.82...1.12.100)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 0d089bdf95f..254f4093667 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.82'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.100'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
     testImplementation 'software.amazon.awssdk:s3:2.17.52'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 4fc1d8a14cf749d66d473752a84e0be7381a2846 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:39 +0000
Subject: [PATCH 1535/4969] Bump mockito-core from 3.12.4 to 4.0.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.4 to 4.0.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.4...v4.0.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index e5a36114afb..995da71ffd4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     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') {
+    testImplementation ('org.mockito:mockito-core:4.0.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 63c3d68ba6f2501a2398c81fb90000cdc8d9b385 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:40 +0000
Subject: [PATCH 1536/4969] Bump java-client from 3.2.1 to 3.2.2 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.2.1...java-client-3.2.2)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 99cf927173e..02917b46045 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.couchbase.client:java-client:3.2.1'
+    testImplementation 'com.couchbase.client:java-client:3.2.2'
     testImplementation 'org.awaitility:awaitility:4.1.0'
 }

From 82fd5d6de922147eba6c6d1502462d60d655caa6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:40 +0000
Subject: [PATCH 1537/4969] Bump transport from 7.15.0 to 7.15.1 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.15.0 to 7.15.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.0...v7.15.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 2897ecb5628..1c3e66edf0d 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.0"
-    testImplementation "org.elasticsearch.client:transport:7.15.0"
+    testImplementation "org.elasticsearch.client:transport:7.15.1"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From fc48919f1691d063cd5cfd247ad63a533bd5cea3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:41 +0000
Subject: [PATCH 1538/4969] Bump pulsar-client-admin from 2.7.2 to 2.7.3 in
 /modules/pulsar

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.7.2 to 2.7.3.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.7.2...v2.7.3)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index d886be91591..0a85bd4dc07 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.3'
 }

From a615b1e1fc8e3dbca584d5238a6c26e45e154cd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:43 +0000
Subject: [PATCH 1539/4969] Bump postgresql from 42.2.24 to 42.3.1 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.24 to 42.3.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.24...REL42.3.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 669a2e6b85d..7f127be30c1 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }

From 84161818095d53ec3d20447ab415ef5c5530a35e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:45 +0000
Subject: [PATCH 1540/4969] Bump solr-solrj from 8.10.0 to 8.10.1 in /examples

Bumps solr-solrj from 8.10.0 to 8.10.1.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 373ece1df60..5f76ada58cf 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
 
-    implementation 'org.apache.solr:solr-solrj:8.10.0'
+    implementation 'org.apache.solr:solr-solrj:8.10.1'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From f086d69041b6f14db9f83f62c894e8c6c7d76ab2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:47 +0000
Subject: [PATCH 1541/4969] Bump s3 from 2.17.52 to 2.17.72 in
 /modules/localstack

Bumps s3 from 2.17.52 to 2.17.72.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 0d089bdf95f..34b35ab8a1f 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.82'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
-    testImplementation 'software.amazon.awssdk:s3:2.17.52'
+    testImplementation 'software.amazon.awssdk:s3:2.17.72'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 16368fc9a99eb901a78fced62e2c675d94356646 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:00:59 +0000
Subject: [PATCH 1542/4969] Bump cucumber-junit from 6.11.0 to 7.0.0 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 6.11.0 to 7.0.0.
- [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.11.0...v7.0.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@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 6febeeec483..ae66a351335 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.11.0'
-    testImplementation 'io.cucumber:cucumber-junit:6.11.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.0.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 489c753d435383f145ca5d666b1463e90460d9c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:01:02 +0000
Subject: [PATCH 1543/4969] Bump gson from 2.8.8 to 2.8.9 in /examples

Bumps [gson](https://github.com/google/gson) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.8...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index c44b4c7e7e1..5d2876fd3b1 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.20"
     implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.mockito:mockito-all:1.10.19'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 9b1424451ec..0771fbeec7f 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'redis.clients:jedis:3.7.0'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 917f1b0c5a4..3651bbe6927 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'redis.clients:jedis:3.7.0'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 661f6efc125..44ce783694b 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:3.7.0'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 

From 7ffce94eb5047b0ad6288ba62f77078baf5c2b9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:01:11 +0000
Subject: [PATCH 1544/4969] Bump org.springframework.boot from 2.5.5 to 2.5.6
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.5.5 to 2.5.6.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.5...v2.5.6)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 48f9ed91b17..f1618268508 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.5.5'
+    id 'org.springframework.boot' version '2.5.6'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index e40e32a4397..c512e594a65 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.5.5"
+    id("org.springframework.boot") version "2.5.6"
     id("org.jetbrains.kotlin.jvm") version "1.5.31"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 20ec4efd463..85cb38f3781 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.5.5'
+    id 'org.springframework.boot' version '2.5.6'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 59b0c3802d4c5721e4b0bd4529ddaf54e5d24f8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:01:20 +0000
Subject: [PATCH 1545/4969] Bump toxiproxy-java from 2.1.4 to 2.1.5 in
 /modules/toxiproxy

Bumps [toxiproxy-java](https://github.com/trekawek/toxiproxy-java) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/trekawek/toxiproxy-java/releases)
- [Changelog](https://github.com/trekawek/toxiproxy-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trekawek/toxiproxy-java/compare/toxiproxy-java-2.1.4...toxiproxy-java-2.1.5)

---
updated-dependencies:
- dependency-name: eu.rekawek.toxiproxy:toxiproxy-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 3d7d110609b..cad4b6b71f3 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Toxiproxy"
 
 dependencies {
     api project(':testcontainers')
-    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.4'
+    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.5'
 
     testImplementation 'redis.clients:jedis:3.0.1'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From d69602467983709d8bdc5665c83f3a0502a189c3 Mon Sep 17 00:00:00 2001
From: Wim Deblauwe <wim.deblauwe@gmail.com>
Date: Tue, 2 Nov 2021 16:13:00 +0100
Subject: [PATCH 1546/4969] Fix Documentation not displaying properly for
 'Docker wormhole pattern' (#4658)

Fixes #4656
---
 .../continuous_integration/dind_patterns.md                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/supported_docker_environment/continuous_integration/dind_patterns.md b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
index e742c047afa..b6fc4e489ea 100644
--- a/docs/supported_docker_environment/continuous_integration/dind_patterns.md
+++ b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
@@ -27,6 +27,7 @@ $ docker run -it --rm -v $PWD:$PWD -w $PWD -v /var/run/docker.sock:/var/run/dock
 ```
 
 Where:
+
 * `-v $PWD:$PWD` will add your current directory as a volume inside the container
 * `-w $PWD` will set the current directory to this volume
 * `-v /var/run/docker.sock:/var/run/docker.sock` will map the Docker socket

From 12b08b9e7ba77fed5d0c5a5665588d1c27338d16 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 8 Nov 2021 13:44:11 +0000
Subject: [PATCH 1547/4969] Fix formatting error

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 65d417db2af..c8fb46f26d6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -65,6 +65,7 @@ Using Maven you can add the following to `dependencyManagement` section in your
     </dependencies>
 </dependencyManagement>
 ```
+
 and then use dependencies without specifying a version:
 
 ```xml tab='Maven'

From 3ad90d78d0b3cffe8b225ea389c16e300d9949e4 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 9 Nov 2021 11:57:57 +0100
Subject: [PATCH 1548/4969] Add Gradle Enterprise (#4057)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .github/workflows/ci-examples.yml |  1 +
 .github/workflows/ci.yml          |  1 +
 settings.gradle                   | 12 +++++++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index a1f81f49bef..286eb41606f 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -7,6 +7,7 @@ on:
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_ACCESS_KEY: ge.testcontainers.org=${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   find_gradle_jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7336e0767e1..91666644dfa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_ACCESS_KEY: ge.testcontainers.org=${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   thundra_test_initializer:
diff --git a/settings.gradle b/settings.gradle
index 849a1ade06b..5a3966e3d25 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,12 +6,14 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.2.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.6.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.2.1"
     }
 }
 
 apply plugin: 'ch.myniva.s3-build-cache'
 apply plugin: 'com.gradle.enterprise'
+apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
 
 rootProject.name = 'testcontainers-java'
 
@@ -56,7 +58,11 @@ buildCache {
 
 gradleEnterprise {
     buildScan {
-        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-        termsOfServiceAgree = 'yes'
+        server = "https://ge.testcontainers.org/"
+        publishAlways()
+        publishIfAuthenticated()
+        uploadInBackground = System.getenv("CI") == null
+        captureTaskInputFiles = true
     }
+
 }

From 484985b137d64533b5a564a2dd705d15293cd845 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 10 Nov 2021 10:15:45 +0100
Subject: [PATCH 1549/4969] Use key=value format for
 GRADLE_ENTERPRISE_ACCESS_KEY value (#4671)

---
 .github/workflows/ci-examples.yml | 2 +-
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 286eb41606f..e98c494a2c1 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -7,7 +7,7 @@ on:
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  GRADLE_ENTERPRISE_ACCESS_KEY: ge.testcontainers.org=${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   find_gradle_jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91666644dfa..93f8307178f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  GRADLE_ENTERPRISE_ACCESS_KEY: ge.testcontainers.org=${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   thundra_test_initializer:
@@ -74,4 +74,4 @@ jobs:
             $([[ -f $THUNDRA_GRADLE_INIT_SCRIPT_PATH ]] && echo "--init-script $THUNDRA_GRADLE_INIT_SCRIPT_PATH")
         env:
           THUNDRA_AGENT_TEST_RUN_ID: ${{ needs.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
-          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1
\ No newline at end of file
+          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1

From 440179d3fe372ff076426b8d1ac9ad614f6eefce Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 10 Nov 2021 14:21:31 +0100
Subject: [PATCH 1550/4969] Update GE plugin in examples to 3.6.1 (#4672)

This aligns the version between the examples and the project.
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index ea988b4ada8..4a979449b07 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.2.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.6.1"
     }
 }
 

From cd04914aa9bd4cdef921e77813d74987c2e1cb97 Mon Sep 17 00:00:00 2001
From: Per Lundberg <perlun@gmail.com>
Date: Tue, 16 Nov 2021 15:22:18 +0200
Subject: [PATCH 1551/4969] Fix typo in Timescale JDBC docs (#4678)

---
 docs/modules/databases/jdbc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index d402b5983b4..b2a1588ae22 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -41,7 +41,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using TimescaleDB
 
-`jdbc:tc:timescaldb:2.1.0-pg13:///databasename`
+`jdbc:tc:timescaledb:2.1.0-pg13:///databasename`
 
 #### Using Trino
 

From ce7693e20bbc21a5e2baca58a8ee0de9223393d9 Mon Sep 17 00:00:00 2001
From: kmcgovern-apixio <66644089+kmcgovern-apixio@users.noreply.github.com>
Date: Wed, 17 Nov 2021 03:16:33 -0800
Subject: [PATCH 1552/4969] Change external port check so it can timeout and
 retry (#4680)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../wait/internal/ExternalPortListeningCheck.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
index b9b63eeee5c..d543d952bbd 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
@@ -4,6 +4,7 @@
 import org.testcontainers.containers.ContainerState;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -21,8 +22,9 @@ public Boolean call() {
         String address = containerState.getHost();
 
         externalLivenessCheckPorts.parallelStream().forEach(externalPort -> {
-            try {
-                new Socket(address, externalPort).close();
+            try (Socket socket = new Socket()) {
+                InetSocketAddress inetSocketAddress = new InetSocketAddress(address, externalPort);
+                socket.connect(inetSocketAddress, 1000);
             } catch (IOException e) {
                 throw new IllegalStateException("Socket not listening yet: " + externalPort);
             }

From ca244d855109962c72f96bee31804d5b2f39896a Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Thu, 25 Nov 2021 11:42:31 -0800
Subject: [PATCH 1553/4969] Add link to webdrivers module (#4699)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index c8fb46f26d6..83e1a682540 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -10,7 +10,7 @@ Testcontainers make the following kinds of tests easier:
 
 * **Data access layer integration tests**: use a containerized instance of a MySQL, PostgreSQL or Oracle database to test your data access layer code for complete compatibility, but without requiring complex setup on developers' machines and safe in the knowledge that your tests will always start with a known DB state. Any other database type that can be containerized can also be used.
 * **Application integration tests**: for running your application in a short-lived test mode with dependencies, such as databases, message queues or web servers.
-* **UI/Acceptance tests**: use containerized web browsers, compatible with Selenium, for conducting automated UI tests. Each test can get a fresh instance of the browser, with no browser state, plugin variations or automated browser upgrades to worry about. And you get a video recording of each test session, or just each session where tests failed.
+* **UI/Acceptance tests**: use [containerized web browsers](https://www.testcontainers.org/modules/webdriver_containers/), compatible with Selenium, for conducting automated UI tests. Each test can get a fresh instance of the browser, with no browser state, plugin variations or automated browser upgrades to worry about. And you get a video recording of each test session, or just each session where tests failed.
 * **Much more!** Check out the various contributed modules or create your own custom container classes using [`GenericContainer`](features/creating_container.md) as a base.
 
 ## Prerequisites

From c86be400c7ef2eda4e36c91b0432d0ba7c74d472 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 25 Nov 2021 14:46:54 -0500
Subject: [PATCH 1554/4969] Use a relative path to the Selenium module (#4700)

Follow-up to #4699
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 83e1a682540..4bfbc723a5a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -10,7 +10,7 @@ Testcontainers make the following kinds of tests easier:
 
 * **Data access layer integration tests**: use a containerized instance of a MySQL, PostgreSQL or Oracle database to test your data access layer code for complete compatibility, but without requiring complex setup on developers' machines and safe in the knowledge that your tests will always start with a known DB state. Any other database type that can be containerized can also be used.
 * **Application integration tests**: for running your application in a short-lived test mode with dependencies, such as databases, message queues or web servers.
-* **UI/Acceptance tests**: use [containerized web browsers](https://www.testcontainers.org/modules/webdriver_containers/), compatible with Selenium, for conducting automated UI tests. Each test can get a fresh instance of the browser, with no browser state, plugin variations or automated browser upgrades to worry about. And you get a video recording of each test session, or just each session where tests failed.
+* **UI/Acceptance tests**: use [containerized web browsers](modules/webdriver_containers.md), compatible with Selenium, for conducting automated UI tests. Each test can get a fresh instance of the browser, with no browser state, plugin variations or automated browser upgrades to worry about. And you get a video recording of each test session, or just each session where tests failed.
 * **Much more!** Check out the various contributed modules or create your own custom container classes using [`GenericContainer`](features/creating_container.md) as a base.
 
 ## Prerequisites

From 368c182e9a133a9985483375c0e5718977faacb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:09 +0000
Subject: [PATCH 1555/4969] Bump postgresql from 42.2.24 to 42.3.1 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.24 to 42.3.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.24...REL42.3.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5c25e6243ef..57c7ed64b14 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.2.24'
+    testImplementation 'org.postgresql:postgresql:42.3.1'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'

From eb1f0a2f17c19f7a9a98a4035a81d81388799111 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:10 +0000
Subject: [PATCH 1556/4969] Bump awaitility from 4.1.0 to 4.1.1 in
 /modules/couchbase

Bumps [awaitility](https://github.com/awaitility/awaitility) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/awaitility/awaitility/releases)
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.1.0...awaitility-4.1.1)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 02917b46045..8539d19d2d6 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.couchbase.client:java-client:3.2.2'
-    testImplementation 'org.awaitility:awaitility:4.1.0'
+    testImplementation 'org.awaitility:awaitility:4.1.1'
 }

From 15db1ce408e442e6a7bf25ff638abcf3deac8f44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:18 +0000
Subject: [PATCH 1557/4969] Bump mockito-core from 3.12.4 to 4.1.0 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.4 to 4.1.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.4...v4.1.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7f127be30c1..cddedb59408 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:3.7.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:3.12.4') {
+    testImplementation ('org.mockito:mockito-core:4.1.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.21.0'

From 01d59303b78fa190927c2d8918240798c124882a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:18 +0000
Subject: [PATCH 1558/4969] Bump postgresql from 42.2.24 to 42.3.1 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.24 to 42.3.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.24...REL42.3.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 478f3bdd31c..0f2843ea007 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
 
     testCompileClasspath 'org.jetbrains:annotations:22.0.0'

From ef9fa8a9ba511cd726dab1284c017fe832469af3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:20 +0000
Subject: [PATCH 1559/4969] Bump mysql-connector-java in /modules/junit-jupiter

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.26 to 8.0.27.
- [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.26...8.0.27)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7f127be30c1..f215680c524 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 

From 6c86a5ef5070c7ad76eafa61e0923a7e18502856 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:23 +0000
Subject: [PATCH 1560/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.15.0 to 7.15.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.0...v7.15.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 1c3e66edf0d..da2508085c0 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.2"
     testImplementation "org.elasticsearch.client:transport:7.15.1"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 8bcc7872fa8372069d43e8e6692bf53510a8958b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:25 +0000
Subject: [PATCH 1561/4969] Bump cucumber-java from 6.11.0 to 7.1.0 in
 /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 6.11.0 to 7.1.0.
- [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.11.0...v7.1.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@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 ae66a351335..49b18404862 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.11.0'
+    testImplementation 'io.cucumber:cucumber-java:7.1.0'
     testImplementation 'io.cucumber:cucumber-junit:7.0.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 1982b714c5ce44e7de61437be546dc8b1b45810a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:26 +0000
Subject: [PATCH 1562/4969] Bump awaitility from 4.1.0 to 4.1.1 in /core

Bumps [awaitility](https://github.com/awaitility/awaitility) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/awaitility/awaitility/releases)
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.1.0...awaitility-4.1.1)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9ef9fab67e6..8a63834d03c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -66,7 +66,7 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    shaded 'org.awaitility:awaitility:4.1.0'
+    shaded 'org.awaitility:awaitility:4.1.1'
 
     api platform('com.github.docker-java:docker-java-bom:3.2.12')
     shaded platform('com.github.docker-java:docker-java-bom:3.2.12')

From d1c958858065b3038cde4343572003f8ba24ef58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:29 +0000
Subject: [PATCH 1563/4969] Bump lombok from 1.18.20 to 1.18.22 in /examples

Bumps [lombok](https://github.com/projectlombok/lombok) from 1.18.20 to 1.18.22.
- [Release notes](https://github.com/projectlombok/lombok/releases)
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.20...v1.18.22)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle | 2 +-
 examples/kafka-cluster/build.gradle    | 4 ++--
 examples/solr-container/build.gradle   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 5d2876fd3b1..c8362c42447 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.20"
+    compileOnly "org.projectlombok:lombok:1.18.22"
     annotationProcessor "org.projectlombok:lombok:1.18.20"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.9'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 3679475d1bd..cef94112f25 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.20"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
+    testCompileOnly "org.projectlombok:lombok:1.18.22"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.21.0'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 5f76ada58cf..965a40b35a8 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.20"
-    annotationProcessor "org.projectlombok:lombok:1.18.16"
+    compileOnly "org.projectlombok:lombok:1.18.22"
+    annotationProcessor "org.projectlombok:lombok:1.18.22"
 
     implementation 'org.apache.solr:solr-solrj:8.10.1'
 

From fc974928ccd7f6ad4e07e557b86f1c32315e3421 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:29 +0000
Subject: [PATCH 1564/4969] Bump postgresql from 42.2.24 to 42.3.1 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.24 to 42.3.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.24...REL42.3.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 da10b960013..b5670402803 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'org.json:json:20210307'
-    testImplementation 'org.postgresql:postgresql:42.2.24'
+    testImplementation 'org.postgresql:postgresql:42.3.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testcontainers:postgresql'
 }

From 8261f3712b91c833657cb7ce5c08130bf87c7a48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:42:35 +0000
Subject: [PATCH 1565/4969] Bump aws-java-sdk-logs from 1.12.60 to 1.12.119 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.60 to 1.12.119.
- [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.12.60...1.12.119)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 1d2297951e8..7d27bf40721 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.100'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.100'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.119'
     testImplementation 'software.amazon.awssdk:s3:2.17.72'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From d1493484d657606a5250a5886d988686d489c0a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1566/4969] Bump transport from 7.15.1 to 7.15.2 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.15.1 to 7.15.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.1...v7.15.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index da2508085c0..ad1446a0f0f 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.2"
-    testImplementation "org.elasticsearch.client:transport:7.15.1"
+    testImplementation "org.elasticsearch.client:transport:7.15.2"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From c1bd5954e829ffb90bf9659de32dcfa470a65443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1567/4969] Bump annotations from 22.0.0 to 23.0.0 in
 /modules/spock

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 0f2843ea007..cec493cf77d 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
 
-    testCompileClasspath 'org.jetbrains:annotations:22.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }
 
 sourceJar {

From 2f07fdcca7716d7766ab69a28fb67575a7c50a39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1568/4969] Bump auto-service from 1.0 to 1.0.1 in
 /modules/mariadb

Bumps [auto-service](https://github.com/google/auto) from 1.0 to 1.0.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-value-1.0...auto-common-1.0.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e24fe293ff1..af67719f8ad 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
     api project(':jdbc')

From 68c27642b4c91a6959899977892bc54d03a04425 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1569/4969] Bump tomcat-jdbc from 10.0.12 to 10.0.13 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.12 to 10.0.13.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3cfed4d80c0..7dd1023b95a 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.12'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.13'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.27'
 }

From b975b886795e17d7b2905de9af9757ce560f0600 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1570/4969] Bump annotations from 22.0.0 to 23.0.0 in
 /modules/postgresql

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 57c7ed64b14..530b0c26eae 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -16,5 +16,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:22.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From d85235ae27884c26dddc9210638d7f9921edd65a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1571/4969] Bump junit-jupiter-api from 5.8.1 to 5.8.2 in
 /modules/junit-jupiter

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 294bcfb48f0..1100219ed96 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    api 'org.junit.jupiter:junit-jupiter-api:5.8.2'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')

From f309c241761863e56355a9a67a02380a649c7e98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1572/4969] Bump annotations from 22.0.0 to 23.0.0 in
 /modules/jdbc

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index e24690963f2..f5056daedf4 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':database-commons')
     testImplementation project(':test-support')
 
-    compileOnly 'org.jetbrains:annotations:22.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.12'

From 5532ac65d38f4be3b1a041405915718388a7de03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1573/4969] Bump annotations from 22.0.0 to 23.0.0 in
 /modules/oracle-xe

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 5c18b63bb9d..107f8e66bdf 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
 
-    compileOnly 'org.jetbrains:annotations:22.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From bb608169669b52acf05eee7f42ab96a3e144caf8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1574/4969] Bump java-client from 3.2.2 to 3.2.3 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.2.2...java-client-3.2.3)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 8539d19d2d6..772876b7bf1 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.couchbase.client:java-client:3.2.2'
+    testImplementation 'com.couchbase.client:java-client:3.2.3'
     testImplementation 'org.awaitility:awaitility:4.1.1'
 }

From caf16e136239d7cd6c0884056b796be29552fb36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:35 +0000
Subject: [PATCH 1575/4969] Bump annotations from 22.0.0 to 23.0.0 in
 /modules/selenium

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 5cff4c544b3..5f0824f8b12 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compileOnly 'org.jetbrains:annotations:22.0.0'
-    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }

From 1d14ec53359dd3dfc89ee9aa5662e786eb86c3f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:36 +0000
Subject: [PATCH 1576/4969] Bump auto-service from 1.0 to 1.0.1 in
 /modules/mssqlserver

Bumps [auto-service](https://github.com/google/auto) from 1.0 to 1.0.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-value-1.0...auto-common-1.0.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 51e5bba3315..de691b47277 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: MS SQL Server"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
     api project(':jdbc')

From 15452779f0865e8a010141d12ff81598816f720c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:36 +0000
Subject: [PATCH 1577/4969] Bump mockito-core from 4.0.0 to 4.1.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 8a63834d03c..0d4c9d565ce 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.13.1'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
-    testImplementation ('org.mockito:mockito-core:4.0.0') {
+    testImplementation ('org.mockito:mockito-core:4.1.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 395129e29ff7cdbdb0b1e2bb9d8ca0d6688c373f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:37 +0000
Subject: [PATCH 1578/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.100 to 1.12.122.
- [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.12.100...1.12.122)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 7dbadb27133..fb4edcf1576 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.100'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.100'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From fda92ef5cb1517c1e8183de34d04635450e4cb87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:37 +0000
Subject: [PATCH 1579/4969] Bump annotations from 22.0.0 to 23.0.0 in
 /modules/nginx

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index b8f45d394c1..288b45b027a 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:22.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From a88fc5a2d4b5a6a0bcfb7e4daa6cd7b335d14a3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:38 +0000
Subject: [PATCH 1580/4969] Bump junit-jupiter-params from 5.8.1 to 5.8.2 in
 /modules/junit-jupiter

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 294bcfb48f0..06f4ea7a846 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.21.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'

From 9055bc67eef4205d8c7586ae23a868e10502e6c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:38 +0000
Subject: [PATCH 1581/4969] Bump auto-service from 1.0 to 1.0.1 in
 /modules/postgresql

Bumps [auto-service](https://github.com/google/auto) from 1.0 to 1.0.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-value-1.0...auto-common-1.0.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 57c7ed64b14..bf18e22d8f6 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
     api project(':jdbc')

From ba506700077bea6aad891f519e584bd0d8ac93b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:41 +0000
Subject: [PATCH 1582/4969] Bump amqp-client from 5.13.1 to 5.14.0 in /core

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.13.1 to 5.14.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.13.1...v5.14.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 8a63834d03c..d238b908762 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -90,7 +90,7 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:3.7.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.13.1'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
     testImplementation ('org.mockito:mockito-core:4.0.0') {

From 23130b842cd687fe495282ed37a94e9dec414916 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:41 +0000
Subject: [PATCH 1583/4969] Bump junit-jupiter-engine from 5.8.1 to 5.8.2 in
 /modules/junit-jupiter

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 294bcfb48f0..b6c193e98bb 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
 test {

From 7d1bef98c819ec80a8bd58278f0a1d8d5a9165fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:42 +0000
Subject: [PATCH 1584/4969] Bump aws-java-sdk-s3 from 1.12.100 to 1.12.122 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.100 to 1.12.122.
- [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.12.100...1.12.122)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 7d27bf40721..39c5c342891 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.100'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.122'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.100'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.119'
     testImplementation 'software.amazon.awssdk:s3:2.17.72'

From da8d136a388918fb7c529e999b55a0f6b10a525c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:43 +0000
Subject: [PATCH 1585/4969] Bump annotations from 22.0.0 to 23.0.0 in /core

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 8a63834d03c..f94c4115c5e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -59,8 +59,8 @@ dependencies {
 
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.32'
-    compileOnly 'org.jetbrains:annotations:22.0.0'
-    testCompileClasspath 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From ae0dee7902629a578172971ff9b51c341ac34597 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:43 +0000
Subject: [PATCH 1586/4969] Bump cucumber-junit from 7.0.0 to 7.1.0 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.0.0 to 7.1.0.
- [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/v7.0.0...v7.1.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 49b18404862..edb62670134 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:7.1.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.0.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.1.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 99cba6b46ef2a3ca5a4d47c764c6fb0cba13b381 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:45 +0000
Subject: [PATCH 1587/4969] Bump okhttp from 4.9.2 to 4.9.3 in /examples

Bumps [okhttp](https://github.com/square/okhttp) from 4.9.2 to 4.9.3.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.2...parent-4.9.3)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b5670402803..f916f6abf81 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.32'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.3.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'

From c669300c3654743d07a9cf4cb88519c6b6f5c82e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:46 +0000
Subject: [PATCH 1588/4969] Bump aws-java-sdk-logs from 1.12.119 to 1.12.122 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.119 to 1.12.122.
- [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.12.119...1.12.122)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 7d27bf40721..11a01bb66f6 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.100'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.100'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.119'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'
     testImplementation 'software.amazon.awssdk:s3:2.17.72'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 721a7334a265cf4aff93aad7595782ff2954bae5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:53 +0000
Subject: [PATCH 1589/4969] Bump annotations from 22.0.0 to 23.0.0 in /examples

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/mongodb-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 86b3e978019..23f193115ba 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -9,5 +9,5 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testCompileClasspath 'org.jetbrains:annotations:22.0.0'
+    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }

From aff143a43a107dc668509718f03ea32e19dd5a1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:00:54 +0000
Subject: [PATCH 1590/4969] Bump logback-classic from 1.2.6 to 1.2.7 in
 /examples

Bumps logback-classic from 1.2.6 to 1.2.7.

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index c8362c42447..051e82f67d7 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index cef94112f25..290a4295368 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index b5670402803..c404e2e7363 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.3.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
     testImplementation 'org.testcontainers:postgresql'
 }
 
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 0771fbeec7f..8f30256e2da 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
     testImplementation 'org.testng:testng:7.4.0'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 3651bbe6927..b6ac1f4ddd6 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 44ce783694b..a8b10171d99 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 0d6f00cf7173547de86fd8bd64c7024ae9d849c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:01:14 +0000
Subject: [PATCH 1591/4969] Bump peter-evans/create-pull-request

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3c3d696d5b8aa2eb0e70f76c251e4b149122acf1 to 3.11.0. This release includes the previously tagged commit.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/3c3d696d5b8aa2eb0e70f76c251e4b149122acf1...67df31e08a133c6a77008b89689677067fef169e)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 3311847da5d..790dad57188 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@3c3d696d5b8aa2eb0e70f76c251e4b149122acf1 # v3.10.1
+        uses: peter-evans/create-pull-request@67df31e08a133c6a77008b89689677067fef169e # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From fedf1d379e2c47a283c387c9c9907f3d2cf14360 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:01:16 +0000
Subject: [PATCH 1592/4969] Bump actions/setup-java from 2.3.1 to 2.4.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2.3.1...v2.4.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 .github/workflows/release.yml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index e98c494a2c1..c850d1acaaf 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -16,7 +16,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.1
+      - uses: actions/setup-java@v2.4.0
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.1
+      - uses: actions/setup-java@v2.4.0
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93f8307178f..a6837c31f43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.1
+      - uses: actions/setup-java@v2.4.0
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.1
+      - uses: actions/setup-java@v2.4.0
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3779af890ae..7b727567ecb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.1
+      - uses: actions/setup-java@v2.4.0
         with:
           java-version: '8.0.302'
           distribution: temurin

From b85859cb6f51b164d584b3cbe71f3e2c86518e36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:01:20 +0000
Subject: [PATCH 1593/4969] Bump actions/cache from 2.1.6 to 2.1.7

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index e98c494a2c1..e3cda845dde 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -21,7 +21,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -49,7 +49,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93f8307178f..d7ffc854dcb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -55,7 +55,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From ab4e058aafc1f9b625feec85a07ef9261c1de1ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:02:41 +0000
Subject: [PATCH 1594/4969] Bump org.jetbrains.kotlin.jvm from 1.5.31 to 1.6.0
 in /examples

Bumps org.jetbrains.kotlin.jvm from 1.5.31 to 1.6.0.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index c512e594a65..4c8d6d551fb 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.5.6"
-    id("org.jetbrains.kotlin.jvm") version "1.5.31"
+    id("org.jetbrains.kotlin.jvm") version "1.6.0"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"
 }
 

From 4aef1dc6d79aea30db9b30a3f776df31d8f39d4f Mon Sep 17 00:00:00 2001
From: mruemeli <88658860+mruemeli@users.noreply.github.com>
Date: Fri, 3 Dec 2021 16:36:27 +0100
Subject: [PATCH 1595/4969] Execute Docker credential programm through shell on
 Windows (#4763)

---
 .../java/org/testcontainers/utility/RegistryAuthLocator.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index 846b62f1f25..b373eedaa03 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.slf4j.Logger;
 import org.zeroturnaround.exec.InvalidResultException;
 import org.zeroturnaround.exec.ProcessExecutor;
@@ -337,8 +338,9 @@ private String extractCredentialProviderErrorMessage(InvalidResultException inva
     private String runCredentialProgram(String hostName, String credentialHelperName)
         throws InvalidResultException, InterruptedException, TimeoutException, IOException {
 
+        String[] command = SystemUtils.IS_OS_WINDOWS ? new String[] {"cmd", "/c", credentialHelperName, "get"} : new String[]{credentialHelperName, "get"};
         return new ProcessExecutor()
-                        .command(credentialHelperName, "get")
+                        .command(command)
                         .redirectInput(new ByteArrayInputStream(hostName.getBytes()))
                         .readOutput(true)
                         .exitValueNormal()

From 4adabdc5c281c05a202ed2139eadf51006c37e49 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 3 Dec 2021 16:05:25 +0000
Subject: [PATCH 1596/4969] Update Gradle Wrapper to 7.3.1 (#4761)

Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 gradle/wrapper/gradle-wrapper.properties          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index a2e01c0dffe..93a3251ccfc 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a37233c5e2e..cf2b23094e4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionSha256Sum=b75392c5625a88bccd58a574552a5a323edca82dab5942d2d41097f809c6bcce
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From b4fcec8189af2b6c203725d47c2277076fe81867 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 9 Dec 2021 14:31:36 +0300
Subject: [PATCH 1597/4969] Adapt Gradle config according to Gradle Enterprise
 Trial experiments (#4705)

We are now utilizing the Gradle Enterprise remote cache.
---
 .github/workflows/ci-examples.yml |  1 +
 .github/workflows/ci.yml          |  1 +
 .gitignore                        |  3 +++
 build.gradle                      |  7 ++++++-
 examples/settings.gradle          |  2 +-
 gradle.properties                 |  2 +-
 settings.gradle                   | 31 ++++++++++++++-----------------
 7 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index b751f1e61a1..7403b53fd8e 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -8,6 +8,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
 
 jobs:
   find_gradle_jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6243237a41..990ffa666b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
 
 jobs:
   thundra_test_initializer:
diff --git a/.gitignore b/.gitignore
index aa9fdf33f1f..d6a9a697796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,6 @@ src/mkdocs-codeinclude-plugin
 src/pip-delete-this-directory.txt
 
 .DS_Store
+
+# Codespaces / VSCode
+/.vscode/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index aac0648ec06..8fb15a6566f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,9 +46,14 @@ subprojects {
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
         def outputDir = file("$buildDir/delombok")
         outputs.dir(outputDir)
+        outputs.cacheIf {
+            true
+        }
         for (srcDir in project.sourceSets.main.java.srcDirs) {
+            // TODO: named input and relative path for `srcDir` to make task more cacheable
             inputs.dir(srcDir)
-            args(srcDir, "-d", outputDir)
+            // TODO: `outputDir` as relative path to make task more cacheable 
+            args(srcDir, "-d", outputDir, "-f", "generateDelombokComment:skip")
         }
     }
     delombok.onlyIf {
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 4a979449b07..13645d5f5ff 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.6.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.7.2"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 397b832391e..a063988958c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.parallel=false
 org.gradle.caching=true
-
+org.gradle.configureondemand=true
diff --git a/settings.gradle b/settings.gradle
index 5a3966e3d25..db8f11f14c0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,13 +5,11 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.6.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.2.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.7.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.1"
     }
 }
 
-apply plugin: 'ch.myniva.s3-build-cache'
 apply plugin: 'com.gradle.enterprise'
 apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
 
@@ -38,21 +36,20 @@ ext.isMasterBuild = false ||
     (System.getenv("GITHUB_REF") == "refs/heads/master") ||
     (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
 
+ext.isCI = System.getenv("CI") != null
+
 buildCache {
     local {
-        enabled = !isMasterBuild
+        enabled = !isCI
     }
-
-    remote(ch.myniva.gradle.caching.s3.AwsS3BuildCache) {
-        endpoint = 'fra1.digitaloceanspaces.com'
-        region = 'fra1'
-        bucket = 'testcontainers'
-        path = 'cache'
-        reducedRedundancy = false
-        push = isMasterBuild && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
-        headers = [
-            'x-amz-acl': 'public-read'
-        ]
+    remote(HttpBuildCache) { 
+        push = isCI
+        enabled = true
+        url = 'https://ge.testcontainers.org/cache/' 
+        credentials {
+            username = 'ci'
+            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+        }
     }
 }
 
@@ -61,7 +58,7 @@ gradleEnterprise {
         server = "https://ge.testcontainers.org/"
         publishAlways()
         publishIfAuthenticated()
-        uploadInBackground = System.getenv("CI") == null
+        uploadInBackground = !isCI
         captureTaskInputFiles = true
     }
 

From 02a8eed88ef22e5894acadb883dd967c2a88080e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 9 Dec 2021 15:17:19 +0000
Subject: [PATCH 1598/4969] Combined dependencies PR (#4768)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 4 ++--
 examples/spring-boot/build.gradle              | 2 +-
 modules/jdbc/build.gradle                      | 2 +-
 modules/localstack/build.gradle                | 2 +-
 modules/mssqlserver/build.gradle               | 4 ++--
 modules/mysql/build.gradle                     | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index f1618268508..242cfcd3810 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.5.6'
+    id 'org.springframework.boot' version '2.6.1'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 4c8d6d551fb..a37b63e6557 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id("org.springframework.boot") version "2.5.6"
+    id("org.springframework.boot") version "2.6.1"
     id("org.jetbrains.kotlin.jvm") version "1.6.0"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.6.0"
 }
 
 apply plugin: 'io.spring.dependency-management'
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 85cb38f3781..b5ddd11cc84 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.5.6'
+    id 'org.springframework.boot' version '2.6.1'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index f5056daedf4..5a4ff7872d4 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.12'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.13'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index b96bd49ed59..4b62d30742f 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.100'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.124'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'
     testImplementation 'software.amazon.awssdk:s3:2.17.72'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index de691b47277..1e554440939 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,12 +10,12 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.5.0.jre8-preview'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.5.0.jre8-preview'
 }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index d84def3e7ba..88a4473f56c 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
     compileOnly 'com.google.auto.service:auto-service:1.0'
 
     api project(':jdbc')
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:22.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 8a6833d2454e918dd7111351e7580446b74ecdf8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Dec 2021 15:18:11 +0000
Subject: [PATCH 1599/4969] Bump tomcat-jdbc from 10.0.12 to 10.0.14 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.12 to 10.0.14.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 5a4ff7872d4..973bc9b01df 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.13'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.14'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From a71554855b4fe06549eb23398e69837617e41974 Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Fri, 10 Dec 2021 08:36:36 +0100
Subject: [PATCH 1600/4969] [couchbase] Ignore transient primary index creation
 error. (#4681)

This changeset makes sure that when a primary index is created, a transient
error is ignored since the indexing engine will automatically retry the
statement later.

Transient errors can happen because we just created the bucket and the
indexer might not have caught up to that bucket just yet, but it will
eventually.

In addition, a check has been added afterwards to make sure that the
primary index is online (so, ready for the user to query) before
returning to the caller, improving the overall stability of queries.
---
 .../couchbase/CouchbaseContainer.java         | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index db8d8ec9666..9ef8e99e19d 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -473,7 +473,30 @@ private void createBuckets() {
                         .add("statement", "CREATE PRIMARY INDEX on `" + bucket.getName() + "`")
                         .build(), true);
 
-                    checkSuccessfulResponse(queryResponse, "Could not create primary index for bucket " + bucket.getName());
+                    try {
+                        checkSuccessfulResponse(queryResponse, "Could not create primary index for bucket " + bucket.getName());
+                    } catch (IllegalStateException ex) {
+                        // potentially ignore the error, the index will be eventually built.
+                        if (!ex.getMessage().contains("Index creation will be retried in background")) {
+                            throw ex;
+                        }
+                    }
+
+                    timePhase(
+                        "createBucket:" + bucket.getName() + ":primaryIndexOnline",
+                        () ->  Unreliables.retryUntilTrue(1, TimeUnit.MINUTES, () -> {
+                            @Cleanup Response stateResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
+                                .add("statement", "SELECT count(*) > 0 AS online FROM system:indexes where keyspace_id = \"" + bucket.getName() + "\" and is_primary = true and state = \"online\"")
+                                .build(), true);
+
+                            String body = stateResponse.body() != null ? stateResponse.body().string() : null;
+                            checkSuccessfulResponse(stateResponse, "Could not poll primary index state for bucket: " + bucket.getName());
+
+                            return Optional.of(MAPPER.readTree(body))
+                                .map(n -> n.at("/results/0/online"))
+                                .map(JsonNode::asBoolean)
+                                .orElse(false);
+                    }));
                 } else {
                     logger().info("Primary index creation for bucket {} ignored, since QUERY service is not present.", bucket.getName());
                 }
@@ -508,7 +531,7 @@ private void checkSuccessfulResponse(final Response response, final String messa
                 }
             }
 
-            throw new IllegalStateException(message + ": " + response.toString() + ", body=" + (body == null ? "<null>" : body));
+            throw new IllegalStateException(message + ": " + response + ", body=" + (body == null ? "<null>" : body));
         }
     }
 

From 42e4905b15b0fa42ef3343939edd8ce7dc531465 Mon Sep 17 00:00:00 2001
From: Szymon Przebierowski <szymonprz@gmail.com>
Date: Wed, 22 Dec 2021 17:01:22 +0100
Subject: [PATCH 1601/4969] Remove hardcoded log level setting on mockserver
 (#4798)

---
 .../java/org/testcontainers/containers/MockServerContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 0502469208e..6ab1c541325 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -38,7 +38,7 @@ public MockServerContainer(DockerImageName dockerImageName) {
 
         waitingFor(Wait.forHttp("/mockserver/status").withMethod("PUT").forStatusCode(200));
 
-        withCommand("-logLevel INFO -serverPort " + PORT);
+        withCommand("-serverPort " + PORT);
         addExposedPorts(PORT);
     }
 

From 7b098bc6bbdf18cf1c212337ba3e39afef6212a5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Dec 2021 10:10:58 +0100
Subject: [PATCH 1602/4969] Update Gradle Wrapper to 7.3.3 (#4800)

* Update Gradle Wrapper from 7.3.1 to 7.3.3.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 gradle/wrapper/gradle-wrapper.properties          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 93a3251ccfc..59250647c40 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cf2b23094e4..ee6ba9a3ac4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b75392c5625a88bccd58a574552a5a323edca82dab5942d2d41097f809c6bcce
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
+distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From a9883cfcc0e4dce5ddd6b584be3d39351b62ce23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Dec 2021 09:05:39 +0000
Subject: [PATCH 1603/4969] Bump mkdocs from 1.0.4 to 1.2.3 (#4771)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Pipfile.lock | 382 +++++++++++++++++++++++++++++----------------------
 1 file changed, 217 insertions(+), 165 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 6ac609b04a9..7dad511e377 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -18,104 +18,133 @@
     "default": {
         "click": {
             "hashes": [
-                "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a",
-                "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"
+                "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3",
+                "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"
             ],
-            "version": "==7.1.2"
+            "markers": "python_version >= '3.6'",
+            "version": "==8.0.3"
         },
-        "importlib-metadata": {
+        "ghp-import": {
             "hashes": [
-                "sha256:742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71",
-                "sha256:b74159469b464a99cb8cc3e21973e4d96e05d3024d337313fedb618a6e86e6f4"
+                "sha256:5f8962b30b20652cdffa9c5a9812f7de6bcb56ec475acac579807719bf242c46",
+                "sha256:947b3771f11be850c852c64b561c600fdddf794bab363060854c1ee7ad05e071"
             ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.7.3"
+            "version": "==2.0.2"
         },
-        "jinja2": {
+        "importlib-metadata": {
             "hashes": [
-                "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419",
-                "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"
+                "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100",
+                "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"
             ],
-            "index": "pypi",
-            "version": "==2.11.3"
+            "markers": "python_version >= '3.6'",
+            "version": "==4.8.2"
         },
-        "livereload": {
+        "jinja2": {
             "hashes": [
-                "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"
+                "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8",
+                "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"
             ],
-            "version": "==2.6.3"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.0.3"
         },
         "markdown": {
             "hashes": [
-                "sha256:31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49",
-                "sha256:96c3ba1261de2f7547b46a00ea8463832c921d3f9d6aba3f255a6f71386db20c"
+                "sha256:76df8ae32294ec39dcf89340382882dfa12975f87f45c3ed1ecdb1e8cefc7006",
+                "sha256:9923332318f843411e9932237530df53162e29dc7a4e2b91e35764583c46c9a3"
             ],
-            "version": "==3.3.4"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.3.6"
         },
         "markupsafe": {
             "hashes": [
-                "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473",
-                "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161",
-                "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235",
-                "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5",
-                "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42",
-                "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f",
-                "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39",
-                "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff",
-                "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b",
-                "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014",
-                "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f",
-                "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1",
-                "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e",
-                "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183",
-                "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66",
-                "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b",
-                "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1",
-                "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15",
-                "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1",
-                "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85",
-                "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1",
-                "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e",
-                "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b",
-                "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905",
-                "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850",
-                "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0",
-                "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735",
-                "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d",
-                "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb",
-                "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e",
-                "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d",
-                "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c",
-                "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1",
-                "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2",
-                "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21",
-                "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2",
-                "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5",
-                "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7",
-                "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b",
-                "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8",
-                "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6",
-                "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193",
-                "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f",
-                "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b",
-                "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f",
-                "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2",
-                "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5",
-                "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c",
-                "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032",
-                "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7",
-                "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be",
-                "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"
+                "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298",
+                "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64",
+                "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b",
+                "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194",
+                "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567",
+                "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff",
+                "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724",
+                "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74",
+                "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646",
+                "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35",
+                "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6",
+                "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a",
+                "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6",
+                "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad",
+                "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26",
+                "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38",
+                "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac",
+                "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7",
+                "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6",
+                "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047",
+                "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75",
+                "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f",
+                "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b",
+                "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135",
+                "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8",
+                "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a",
+                "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a",
+                "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1",
+                "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9",
+                "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864",
+                "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914",
+                "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee",
+                "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f",
+                "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18",
+                "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8",
+                "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2",
+                "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d",
+                "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b",
+                "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b",
+                "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86",
+                "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6",
+                "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f",
+                "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb",
+                "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833",
+                "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28",
+                "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e",
+                "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415",
+                "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902",
+                "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f",
+                "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d",
+                "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9",
+                "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d",
+                "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145",
+                "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066",
+                "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c",
+                "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1",
+                "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a",
+                "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207",
+                "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f",
+                "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53",
+                "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd",
+                "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134",
+                "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85",
+                "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9",
+                "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5",
+                "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94",
+                "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509",
+                "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51",
+                "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"
             ],
-            "version": "==1.1.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.0.1"
+        },
+        "mergedeep": {
+            "hashes": [
+                "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8",
+                "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==1.3.4"
         },
         "mkdocs": {
             "hashes": [
-                "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939",
-                "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"
+                "sha256:89f5a094764381cda656af4298727c9f53dc3e602983087e1fe96ea1df24f4c1",
+                "sha256:a1fa8c2d0c1305d7fc2b9d9f607c71778572a8b110fb26642aa00296c9e6d072"
             ],
             "index": "pypi",
-            "version": "==1.0.4"
+            "version": "==1.2.3"
         },
         "mkdocs-codeinclude-plugin": {
             "hashes": [
@@ -140,122 +169,145 @@
             "index": "pypi",
             "version": "==3.2.0"
         },
+        "packaging": {
+            "hashes": [
+                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
+                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==21.3"
+        },
         "pygments": {
             "hashes": [
-                "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94",
-                "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"
+                "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380",
+                "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"
             ],
-            "version": "==2.8.1"
+            "markers": "python_version >= '3.5'",
+            "version": "==2.10.0"
         },
         "pymdown-extensions": {
             "hashes": [
-                "sha256:478b2c04513fbb2db61688d5f6e9030a92fb9be14f1f383535c43f7be9dff95b",
-                "sha256:632371fa3bf1b21a0e3f4063010da59b41db049f261f4c0b0872069a9b6d1735"
+                "sha256:74247f2c80f1d9e3c7242abe1c16317da36c6f26c7ad4b8a7f457f0ec20f0365",
+                "sha256:b03e66f91f33af4a6e7a0e20c740313522995f69a03d86316b1449766c473d0e"
             ],
-            "version": "==8.1.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==9.1"
+        },
+        "pyparsing": {
+            "hashes": [
+                "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4",
+                "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.0.6"
+        },
+        "python-dateutil": {
+            "hashes": [
+                "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
+                "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.8.2"
         },
         "pyyaml": {
             "hashes": [
-                "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
-                "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696",
-                "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393",
-                "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77",
-                "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922",
-                "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5",
-                "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8",
-                "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10",
-                "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc",
-                "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018",
-                "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e",
-                "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253",
-                "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347",
-                "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183",
-                "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541",
-                "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb",
-                "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185",
-                "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc",
-                "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db",
-                "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa",
-                "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46",
-                "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122",
-                "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b",
-                "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63",
-                "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df",
-                "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc",
-                "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247",
-                "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6",
-                "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"
+                "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",
+                "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b",
+                "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57",
+                "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b",
+                "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4",
+                "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07",
+                "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba",
+                "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9",
+                "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287",
+                "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513",
+                "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0",
+                "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0",
+                "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92",
+                "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f",
+                "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2",
+                "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc",
+                "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c",
+                "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86",
+                "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4",
+                "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c",
+                "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34",
+                "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b",
+                "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c",
+                "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb",
+                "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737",
+                "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3",
+                "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d",
+                "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53",
+                "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78",
+                "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803",
+                "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a",
+                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
+                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
             ],
-            "version": "==5.4.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==6.0"
         },
-        "six": {
+        "pyyaml-env-tag": {
             "hashes": [
-                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
-                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
+                "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb",
+                "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069"
             ],
-            "version": "==1.15.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==0.1"
         },
-        "tornado": {
+        "six": {
             "hashes": [
-                "sha256:0a00ff4561e2929a2c37ce706cb8233b7907e0cdc22eab98888aca5dd3775feb",
-                "sha256:0d321a39c36e5f2c4ff12b4ed58d41390460f798422c4504e09eb5678e09998c",
-                "sha256:1e8225a1070cd8eec59a996c43229fe8f95689cb16e552d130b9793cb570a288",
-                "sha256:20241b3cb4f425e971cb0a8e4ffc9b0a861530ae3c52f2b0434e6c1b57e9fd95",
-                "sha256:25ad220258349a12ae87ede08a7b04aca51237721f63b1808d39bdb4b2164558",
-                "sha256:33892118b165401f291070100d6d09359ca74addda679b60390b09f8ef325ffe",
-                "sha256:33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791",
-                "sha256:3447475585bae2e77ecb832fc0300c3695516a47d46cefa0528181a34c5b9d3d",
-                "sha256:34ca2dac9e4d7afb0bed4677512e36a52f09caa6fded70b4e3e1c89dbd92c326",
-                "sha256:3e63498f680547ed24d2c71e6497f24bca791aca2fe116dbc2bd0ac7f191691b",
-                "sha256:548430be2740e327b3fe0201abe471f314741efcb0067ec4f2d7dcfb4825f3e4",
-                "sha256:6196a5c39286cc37c024cd78834fb9345e464525d8991c21e908cc046d1cc02c",
-                "sha256:61b32d06ae8a036a6607805e6720ef00a3c98207038444ba7fd3d169cd998910",
-                "sha256:6286efab1ed6e74b7028327365cf7346b1d777d63ab30e21a0f4d5b275fc17d5",
-                "sha256:65d98939f1a2e74b58839f8c4dab3b6b3c1ce84972ae712be02845e65391ac7c",
-                "sha256:66324e4e1beede9ac79e60f88de548da58b1f8ab4b2f1354d8375774f997e6c0",
-                "sha256:6c77c9937962577a6a76917845d06af6ab9197702a42e1346d8ae2e76b5e3675",
-                "sha256:70dec29e8ac485dbf57481baee40781c63e381bebea080991893cd297742b8fd",
-                "sha256:7250a3fa399f08ec9cb3f7b1b987955d17e044f1ade821b32e5f435130250d7f",
-                "sha256:748290bf9112b581c525e6e6d3820621ff020ed95af6f17fedef416b27ed564c",
-                "sha256:7da13da6f985aab7f6f28debab00c67ff9cbacd588e8477034c0652ac141feea",
-                "sha256:8f959b26f2634a091bb42241c3ed8d3cedb506e7c27b8dd5c7b9f745318ddbb6",
-                "sha256:9de9e5188a782be6b1ce866e8a51bc76a0fbaa0e16613823fc38e4fc2556ad05",
-                "sha256:a48900ecea1cbb71b8c71c620dee15b62f85f7c14189bdeee54966fbd9a0c5bd",
-                "sha256:b87936fd2c317b6ee08a5741ea06b9d11a6074ef4cc42e031bc6403f82a32575",
-                "sha256:c77da1263aa361938476f04c4b6c8916001b90b2c2fdd92d8d535e1af48fba5a",
-                "sha256:cb5ec8eead331e3bb4ce8066cf06d2dfef1bfb1b2a73082dfe8a161301b76e37",
-                "sha256:cc0ee35043162abbf717b7df924597ade8e5395e7b66d18270116f8745ceb795",
-                "sha256:d14d30e7f46a0476efb0deb5b61343b1526f73ebb5ed84f23dc794bdb88f9d9f",
-                "sha256:d371e811d6b156d82aa5f9a4e08b58debf97c302a35714f6f45e35139c332e32",
-                "sha256:d3d20ea5782ba63ed13bc2b8c291a053c8d807a8fa927d941bd718468f7b950c",
-                "sha256:d3f7594930c423fd9f5d1a76bee85a2c36fd8b4b16921cae7e965f22575e9c01",
-                "sha256:dcef026f608f678c118779cd6591c8af6e9b4155c44e0d1bc0c87c036fb8c8c4",
-                "sha256:e0791ac58d91ac58f694d8d2957884df8e4e2f6687cdf367ef7eb7497f79eaa2",
-                "sha256:e385b637ac3acaae8022e7e47dfa7b83d3620e432e3ecb9a3f7f58f150e50921",
-                "sha256:e519d64089b0876c7b467274468709dadf11e41d65f63bba207e04217f47c085",
-                "sha256:e7229e60ac41a1202444497ddde70a48d33909e484f96eb0da9baf8dc68541df",
-                "sha256:ed3ad863b1b40cd1d4bd21e7498329ccaece75db5a5bf58cd3c9f130843e7102",
-                "sha256:f0ba29bafd8e7e22920567ce0d232c26d4d47c8b5cf4ed7b562b5db39fa199c5",
-                "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68",
-                "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5"
+                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "version": "==6.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.16.0"
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
-                "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
-                "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
+                "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e",
+                "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==3.7.4.3"
+            "version": "==4.0.1"
+        },
+        "watchdog": {
+            "hashes": [
+                "sha256:25fb5240b195d17de949588628fdf93032ebf163524ef08933db0ea1f99bd685",
+                "sha256:3386b367e950a11b0568062b70cc026c6f645428a698d33d39e013aaeda4cc04",
+                "sha256:3becdb380d8916c873ad512f1701f8a92ce79ec6978ffde92919fd18d41da7fb",
+                "sha256:4ae38bf8ba6f39d5b83f78661273216e7db5b00f08be7592062cb1fc8b8ba542",
+                "sha256:8047da932432aa32c515ec1447ea79ce578d0559362ca3605f8e9568f844e3c6",
+                "sha256:8f1c00aa35f504197561060ca4c21d3cc079ba29cf6dd2fe61024c70160c990b",
+                "sha256:922a69fa533cb0c793b483becaaa0845f655151e7256ec73630a1b2e9ebcb660",
+                "sha256:9693f35162dc6208d10b10ddf0458cc09ad70c30ba689d9206e02cd836ce28a3",
+                "sha256:a0f1c7edf116a12f7245be06120b1852275f9506a7d90227648b250755a03923",
+                "sha256:a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7",
+                "sha256:aba5c812f8ee8a3ff3be51887ca2d55fb8e268439ed44110d3846e4229eb0e8b",
+                "sha256:ad6f1796e37db2223d2a3f302f586f74c72c630b48a9872c1e7ae8e92e0ab669",
+                "sha256:ae67501c95606072aafa865b6ed47343ac6484472a2f95490ba151f6347acfc2",
+                "sha256:b2fcf9402fde2672545b139694284dc3b665fd1be660d73eca6805197ef776a3",
+                "sha256:b52b88021b9541a60531142b0a451baca08d28b74a723d0c99b13c8c8d48d604",
+                "sha256:b7d336912853d7b77f9b2c24eeed6a5065d0a0cc0d3b6a5a45ad6d1d05fb8cd8",
+                "sha256:bd9ba4f332cf57b2c1f698be0728c020399ef3040577cde2939f2e045b39c1e5",
+                "sha256:be9be735f827820a06340dff2ddea1fb7234561fa5e6300a62fe7f54d40546a0",
+                "sha256:cca7741c0fcc765568350cb139e92b7f9f3c9a08c4f32591d18ab0a6ac9e71b6",
+                "sha256:d0d19fb2441947b58fbf91336638c2b9f4cc98e05e1045404d7a4cb7cddc7a65",
+                "sha256:e02794ac791662a5eafc6ffeaf9bcc149035a0e48eb0a9d40a8feb4622605a3d",
+                "sha256:e0f30db709c939cabf64a6dc5babb276e6d823fd84464ab916f9b9ba5623ca15",
+                "sha256:e92c2d33858c8f560671b448205a268096e17870dcf60a9bb3ac7bfbafb7f5f9"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==2.1.6"
         },
         "zipp": {
             "hashes": [
-                "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76",
-                "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"
+                "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832",
+                "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"
             ],
-            "version": "==3.4.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.6.0"
         }
     },
     "develop": {}

From cbaedff97aebc2465ec111d525e97c2ec7a6a56e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Wed, 29 Dec 2021 15:44:01 +0000
Subject: [PATCH 1604/4969] Update sponsors as of Dec 2021 (#4806)

---
 docs/index.md                  |  20 +++++++++++++++++++-
 docs/sponsor_logos/elastic.png | Bin 0 -> 23741 bytes
 docs/sponsor_logos/red_hat.png | Bin 0 -> 20118 bytes
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 docs/sponsor_logos/elastic.png
 create mode 100644 docs/sponsor_logos/red_hat.png

diff --git a/docs/index.md b/docs/index.md
index 4bfbc723a5a..136ae53d2ca 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -127,16 +127,34 @@ A huge thank you to our sponsors:
     </a>
 </div>
 
+<div style="text-align:center; max-width: 128px; display: inline-block; margin: 5px;">
+    <a href="https://www.elastic.co/">
+        <img src="sponsor_logos/elastic.png" style="width: 100%"/>
+        <p>Elastic</p>
+    </a>
+</div>
+
+### Donors
+
+<div style="text-align:center; max-width: 128px; display: inline-block; margin: 5px;">
+    <a href="https://www.redhat.com">
+        <img src="sponsor_logos/red_hat.png" style="width: 100%"/>
+        <p>Red Hat</p>
+    </a>
+</div>
+
 ### Backers
 
 * [Philip Riecks (@rieckpil)](https://github.com/rieckpil)
 * [Karl Heinz Marbaise (@khmarbaise)](https://github.com/khmarbaise)
 * [Sascha Frinken (@sascha-frinken)](https://github.com/sascha-frinken)
 * [Christoph Dreis (@dreis2211)](https://github.com/dreis2211)
-* [Pascal Zwick (@pas2al)](https://github.com/pas2al)
 * [Nikita Zhevnitskiy (@zhenik)](https://github.com/zhenik)
 * [Bas Stoker (@bastoker)](https://github.com/bastoker)
 * [Oleg Nenashev (@oleg-nenashev)](https://github.com/oleg-nenashev)
+* [Rik Glover (@rikglover)](https://github.com/rikglover)
+* [Amitosh Swain Mahapatra (@recrsn)](https://github.com/recrsn)
+* [Paris Apostolopoulos](https://opencollective.com/paris-apostolopoulos)
 
 ## Who is using Testcontainers?
 
diff --git a/docs/sponsor_logos/elastic.png b/docs/sponsor_logos/elastic.png
new file mode 100644
index 0000000000000000000000000000000000000000..393e6711c45f58934ffc04bd8278b9872c44bf44
GIT binary patch
literal 23741
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

literal 0
HcmV?d00001

diff --git a/docs/sponsor_logos/red_hat.png b/docs/sponsor_logos/red_hat.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8c28b5d7b094b0531ea8ac7ed068da700513dd2
GIT binary patch
literal 20118
zcmeFZXEdE(zc#w`g<$C=!m<#(1tIFfk|5DVOZ47*?_H4SBs$TF-b+Xj5xsYUDAALs
z(a!XL_Pd{VpS|Dn?R+?6oHd3qtb5LT-gExuuUywPZ(gY=Jt4rO!Gk~`1oCnyH3$SP
z?)C?Y4z3U_=B7g+m<3iE+OFD)&qPcd?6{3g9gNMmJ?$JpI|L#o>FH=>Vq@kCH#W1d
zvKL1jw00oiR;J<zEkQ+IMMoJkODj2VXESwgB@GjA8<R(-2uTS%F;5XNfSsAE5!}<x
z*4{<LQylTnxFX>9+six%_&;4-ZNw4UiYjm!2WK<5Ah#elFG2zjF6L}%E~18d{2w=i
zZ{i3`S64?79v%-54{i^BZU<)z9==D99`W!#;Cb+X3-sV}@v?U{^5n92VZ0sUUt^%m
zTuhv;99^v(?BTa#8W}sdxr!qYpdJ1ngS%Rp|9f<Mm;YEkFa*zS3lASRFVFwp-OSVK
z|Iq!m<-c`zv~+NFaIti7{Lcmamq+|(^MAV$nD2kS#nZ^~f9kBL`2XD9&hEb~!^KtB
z9T?(2jQU^Z^uHe9qT%Ie#-nED;^5|NVkYZuX79@Qk0oyHA|h{RWMTHq%-+J)QXC<`
z%lm(8(XulAZw<FY*}C2C#dCWr@bCx!zDN7tZQ_VW4|(|h-K6tBHr*OqM8(R}%vKv^
zWoKsZ0!ID!JpSFP^M7iUaj<o8RtK(aCXV>m)BbZWME+@0bT9=?{Qpek-%au|GAhmv
z=2o_#%|-2rG+bU*<{{sshYz_PaQ|x<uyG>bUMq7il#wgw^?>&Q9~a*Pt_P1acpr%f
zJQ5Lnr2EgH|8xYQU~1%Q^#9QH)|cU8ptGW)h@6#+tAn%GKbQXH;Ob^h|N8c?ueMhI
zcs3mV&;E)SncP}i9O3BfVCrUKX8O-_!Epa-b#X9v^)PZald=F?D~^ydH@5=&;ssZ^
z^;tL{Hy<yzz<<5N!_o|l_CKzO=RYRJa~o#=YgS@B|83r4|8)4@;u75VuWKOQLE_-~
z&&&b7{Acblvj+*s8Dy63q3tG+y@IX4KKwWPLm;g2Zt=?;A*xiplJj3Ht)im!RGv1)
zy(;N>{lID>!Tg(JZTpGLUhn*cy;bvbdva#`%a-pv-!+>xqvZNBofQ|V^oLtZ<WDlP
z{`d}^W^De<*bEd*QXBIggyi!-;@UcG-sr-wXtCIJ9YOL8Mdp>6@bjaU&h_4-;9qJQ
z)SVo@vQg~k(?fgOepsAm{b)sgrPEqT(CbB$qWt5OFy*idf##gU4<%3fFO8k^1`O`o
z<bD^{ei5qo%7FH&M?vi=et-W@g`(fzhW!RoXH4ET>%7Wb-P^+awbs=`MjEqb7DxQ9
zz3JBo4@c<_qNLwNeF_zbS_QP%<Rnaeqb%0?rM*mFWMli}RCzCM8Y{hhzp7W*pGxf|
z8nwB}EK-mO5v=_g;f;D?=o1?Kj9JnL(shvMpjlVp=UCn~YbG1L-+7KLOg|Ax!6yIE
z$wrK@l4XQ8e9Ff1CFkj`MfREx^h2MP-lu)Kqpx1QV?u7s7Q1@foui;e;5y3bxIiF;
z-M2qz$sB}tArLr39wnvWnX$X*<w-tyj&pb_&hOEWjT;o0^R+ZE&$tK6jCj73oXqKT
z^Nq#_-49JuQy(-w)LZX7t|zZ|dxA#nh!Mt~E){q0vo(~-)L{Ps|7Kf<<i-YxjNE;u
z=Dvjse>ysP+{AY-2Lo42{1!vOD9jkX4eY#j{7xzpB_~6^FE2wdqWLyxXtiVbroVR@
z$24Q(P?!t|3Rh8?RD25Rp>iQ0<oxp1#_|8}`u}YUKv2lho97S`h;e|&v;7--W+}G7
zmVn(wozbrPx;9R$pL=?csgH8R3}_0tk!mu?k-$J0EWMf%0#SizlP1_awEm<<f)3fa
z<gms>a3~&caXk<XDg5KXEQ(31E&q%dvn!sN!)pD3pNB+zO^f?jI33U9%RBro$WxJ7
z95gr#9S_1@DM05feEB!syjTr3K_G^f&){7vqT2C(y`(78CE%y{KIUi%sip4ScHxw`
zxJZtzzR*A<Lmp?PfcX$^$L|{L^LBF-6I&QmIxZZs$?Mb?#zv{1caI;6@iQj`K}Imy
z2<^l?oD=2Zd`Rcl{dbz<n}CMv+T3#PmIEUz<N=nkb(FuU!__73NB*I1lUQP%cRwao
ziQy3E$>@7zIGQ!8BuT71C2d#sX@dQw756oYk+rqxVt8(nZx!MOwznVcY3zmDh+DkQ
zN0vhFeeWDWK;Q}N0TyQ`7mh=eDdmN8g{4<q`5G6J#gITbHnhMT{7MDIV?rv(`^P^i
z^$LmZq3dUVXQvbuCM;)?fn4Cd7Tqs?_p4f<D^daW{d!)A01b;>8WVv*URdDsB?k9d
z3x%?n>`od%+I8Xt0=+A#EJa(L4$9MyC6C0T!RJJWLl8_=qzOojdt!9)BvnchvmWPR
zSt~3yes3@X@L&*lj^A`26$Gq|0XLWJbfk{*Sr-$6NgB>nOhCyz@{ukMLLO9-8ylKT
zCwEWyD-A#PkR*@ekNCHXI@S_gWTm=|x;_@+=POT+)(A0?C`9oevctg6U`u9vR_|E3
zV&fO@3)%Fhi6oz8xaRrykY5usGH~hrOluGNQqm(_m4F+hwxUz}!KPBEv<w2pg~8ZP
zgjLXxoK+AN;skhD4zwMT2I=1!Z*?!q(#w~`IHf4P+|v}^;vc~bGGxfp3n~>imI-=Z
z`K+nqDHehq4jF+6C_^GLf3*K45wpRh9o71iZ|st#TZ8HeN+yFskR`#3>%h)jdU=5`
z%*O{!yG)TwB}R);cXIVEq6EX|JuJ}W=3WrX2c?mq@T%kSOXAB*PG3a9Mk@jsto8MF
z7S%Hzj=8KIuZAY}ZLZ8HI0MHHf<Re+FQ0aGWT8H>LtuuI&CysX=y2)cyWDd1jrK}L
z9H)59C<rr@f2>Ex!l$zRv&&c?LKGh=HQr>!f$L<*jQ`+66#tjbDCQ_8h~?--{oM95
zfhvCzG#uP=@7LemZsz_5VFhBU;o${R$PXV9(4lMTkv08L+g%Wxir{c3?I)qb(Nu#M
z1Ru1^OzWATI5EkFBo^y~$lI^V6vJC6W2#<!+`g<&?vWn9j+H+8DY0|*zT08{==Ht#
z9tTo1x`6~I&4#ZcFgVy$+{`B3rpu`L$pY_bQ`tcqeW<z{NJoo2A%+oQi|6pUds36j
z4j6L{^A_5abhskKSZc>oA@yZEColcNzJ5imtbbL&rq#xcC4<-wmC<@|+YMo03MX~e
z1Z@3KvzniXi<ApQL6K==;`+kZXPx4WulR?1Vg}4#2bkJ-cfm<A7Ogs8Heh-j+{a|9
z!iZ8KW-mRpBnnWAh-!fE-7tupjW-A&jD&g^b4b{YM{5?+cKp@d)}K#l8H6x=a(W)u
zOpK!$ECVOToAwoZ63*ym9xo5W%pvYeqdES$P}<K;aJ5HWUqls&3T{`@jCQ~!r9~TU
zA((vsSf`-JQ0py(v_yzB_^Mc)4Mw-P_UP)_)w_;J6C6f4_-h9e(mT^tB(w^pARM3T
z2aOKB-P6mN(iBaQv&0<Z9jKHf(D!EJI@e@NdUa}@2sR`*vB1pu6S|KAH3|uPrO_@D
zmt<(SK%3?oqT3*M(I?E10u=@W?tQI&SUD~Sfp&M(N<FLJ?Le?L^9?s$NgSK_Ur@x<
zix8HF7Jj{S&SmAcI&khLWr#!YYOa^|-rUJ`^hu4VzfV|>di-g7B!b>b69v0+eH4iq
zk%R2}UasSO70%?<Cm)Q#p-N0V>6`s@XNpZ4@@f=2lgVmIiizQrJasTzX6#whK5bt#
z=oFunuylb84L*tSg2dT|XpJNUomv<R2g{#)CZ)pBG)5q74B~$c3egY;A|NV(p-6<6
zF+Q5*&V8F>@BOnZUa%U{yl@+T*tz6XA?f4PHH8PC99f&rY;uKbNHA{)u%iAWSx|!)
zhGgBw)O0pWfd`u{7ps{0P=?kM5|(2=S1Xiw_w-w7rt-bJ@3h5(ekw%h$<~xVctj`2
z^wG2}l9XQc$4=$Mn@pP7+6Md?NmUtVKl^y7`$2cYm}!~reRjg~?)Mt3a<%4OTxCm$
z;Jy@12okBSuQ2b?;31{G^Sx7n7t>G&t5s%sT|qVqwTCAlKex?^jFbIT(2wl<5wnZg
z6_jk4gw8N!fB0j*YioP5D&Y-bRDQ5oG@LAEm@K4R5kxB$ni`gcA3}x!orx)GkS{GM
z`#HWmL&@aMb5-Iv+k@4rl+{iJR#cArUg4u!rd(;2<K9&!J##h`KKb+KPc$pw-#eYf
z!L9~luIOZ|=*S-h8MYUe{n&}X!VFfaeRh@JBR1}X4kpXWPIcs04I@V@#-^F$(=oRx
zehRS+tn=rXKqc(=u+V}r)au16jRzGF6LYOh_b`Lo9bsu$SfzPPeWj_mkr*6Ku+bC;
ziimzZx9&OeALpcapR>k!0)*`6vD<z`^@Fv%`S$Hws=>LCHrW)@EF(^$L!C<qw6nCd
z=C^xb&0H&Ixh&Y#-aOf837z_u&b8@COxz1)AIj4ANV9j*6pq2I_Y6jG5oCDnf49pn
zFh3eS7E9}Bj~=gv1)}20rls79+xtK3hGK9?*)F!Yt$$0--#U(KRyd8aR18kHh3vk&
zluHzK4;QktKd7mqSm|_5eEj7z*UP4yswx;X1ll3=x#uGpK9l40dsebg-C~6gH$n4@
zdap6c-beejkp;;rut&$_l(HAqIJ2`SxBmX{A-yZz-}B0#QaeR92fD6ib*&yzHO$fM
zAw$N%T9u?-h18*7N%8py$nX}Bp`#<HDQG60druBe&}Z6}=WAc#MGY+a6qkM>ZTK7y
z*M6R!++b&;e<XzaEU;rz<6LY>R9pnbxxWB`oEV3F`tYKSyyxxW`-XWO7iz-tH#tKQ
z5zv@OPOk8FpP2d=gNmZOrvY=}^)-2Sxa5t-5!9M+`FLcAO5PL7DbC7DUH0Ny>~^+8
z>VDy|><3bba9sKKrkO_f!y`3T^q;>()U-Bw=*%#zc3L}N8Y<(L%B@qrjiwlB^NJt5
zYp5K=`2l?#UCna3VK*y>35I-viGYxNyYus}v6U|RUh5MSCWIkZp>y$5Rc}!?&({ac
zS}d4(4VAQwyLs<p(JBm@NpUn=5%2<ybBVtz5hF1=!Z+&gvMUFm=vHvCP)v9{S)OIn
zA{H*ZyhPe1AV99>ZZa+;mugZx-0UwpWe#Rn<gm^5*E+-cX8X)dtqxdlrLWfN_>>Zq
zEEuX8Vc{2AsjS7J6;(qM0*yz)iAjv=)KC}MF>t9&QBh2YbUEb1OZf};xX9g31f&kw
zGpB{|W$l->=HAU;Z&{P1<(8I~C|F&7HcEKmNZL8G5th3fYaexOrxj)MZu%BV3+8;q
zkcQ+ys)}k#$BU20iBf}GaKn*lsb85O<>Q;V`vc145T11N&g=&|@0IcsnjI*JLp95{
zXiL$R?=O?J5C@EQC;K%%&NbXR-waOGHywO??^S4^oFQp@i1D9r<HbE_7y<=R%g+}%
zbIz3tWns+iGqqPH$hpru2geTWOV*c*Q&UwtzB<j&<n9R~m&D9LmgI@&;vBpdJHn}V
zVToT)RKP$YrLl^4eMB@aZe}bZc~6Rl*ksnF3fRcYUW^7cKN-b%5%saETt4@Eqd(8j
zrMboXT86|q6b+W=-YR{^pGmQCG&5$zDN*vToG$df;8z;521A0OFWe&vk^NNzLoLJd
z$x<ZcOfC0m{dHydnaKrK6l>%|h~d&XR}RFXpZD}A+*yUIRwM54pN-WW_R{O5FpcE6
z*+1nCE6#?wi5dw$E<xn<z8)cu|4LCw<eD8`Z+9UNL32ZIwy9Os%pl_tUU4++!DWLE
zrrC*I2odwOGhu0KS4wTi!R0#&xQ_xy$e=95k*uE*R$b&%!@F*z>wNtkPttLbknMbg
zELQyLXVZfxJ4&?LPI)I}kww{K9PIIOut@B?qeMoH#hiHt=*OyQj%`ZCNLkBWL|boO
zAG|UD@8_2Lp~#3yf$4-CGAKI{dHIWFq!0bhAy`Uq<VRh2fHosJ2?H!)@eAS1Z|Ze9
zWD6UM7Y5B1tH5Om2EH_kz2$EzIhxJmnKo7`U)@NB4y`8yanLyA)2||_=x{ifarvdY
ze8K`23l(8`Q!$~|)x}`Wou?Xk4UFDp<>^ZBP=vsG0V|FT@<*M?Jz{MLQZ0U=WNS9k
z%U<|_P>=fhq}0~i97^n9xCY5eze7g}F7~79mn?jh{e+<qXw0B!9r;r?**rUY877rY
zInSskXPt17B<gIkV!`~1%93~amdVP~?fGbE=)tf^bYfzf@|xy1(s2@gZu<JFM!7o%
z&wc~B!v}NY=A#;eOs#-a@$TJ3&8u>Fppq*?WSLkCb|h;Y&32-jBVJ%+DO4hH>U<?_
zUfx#zS9%L28WzLc?7BZxfn|Zi(S!GBG8KQWRk(asxN43HJzlmf72j(1N?_ic>#l%m
zD#IVTZX+7vuNza<yT2mjAS9*aZDygp5nUb(cF%sDtEsUD>DDnt+A*=CbzGgi=vP=W
zN(Rn8*+3Q;6?(iX%`{v1p)EL+0Y%jBJ9i*Xiv_=@tA%x;bte$L<k|!^#AjnK(6xL%
z#vwourUD_;%b2JaII!)%gJ!Sa(&pXcp`osRVXa%B8eh*vSl+-KIKo>zhx7@2mhQ&{
z%UAk_5R<UIWc<EY%79D6kQ4Zrj%Lb)(&>giSS@;~D&{GG#xw)Rf8orNjG?d6oY%u-
z=z_`w-cs{Lj?6WPJNLLv4GO)B{&@fWeGxwDotc+ji_I#u61bSiU{Lp=U1y2=gAg}M
zf<wvNK-f3VKTo^b*fm`2S<lQNco;1cVmUVZ)*-1VS-NFX&3wGLK)iy5+RB`b4hNjx
zSfXX;vU*!Atg`vmm~vcNZM#?qxg6wG@!T1yQcmQE$tToP@#KUwTz^QWK%VxKN%I4k
zTo5`03$F(+ShQ;jEBEjq>2hrCc@SCU2(DaEg0xi*L>>X%)^;ODVFqm}`p6eo7BC@@
z^;$ZueTRvkOSiuUES08t%CBcOmf59CG0#GtY5^y4`CMk=jWl)*fBTS*SQ?!P0>w(b
z8y|tLs|7LgI!+OLo3DMBh)shyPb}|7!ON>^qt5V9r_#bDCvjaKZK7a=lML?@$-NJP
zk=6pfcVaB0HD`v@P^3m>(?y~8$?{6Nm(YJ5c(8xDZZn^IYHd(0PK+4-IWp>KSTCNv
zygl^_f(4D4p8F;D!1&$ti;Xfiwg}vs&~UDgJOwkpg-}dWh%M}QtodQE+`6Zg7`Ab<
zWR5QzTZ=NRJ1eX~OTFRh7#^4eyFf1?lJlO`NZ4&eL&HS#Q@<B4AqhuECt+oCnvPvz
zI}NS8mR#F8NV2+TYHmGcUl&2|-_+h8H$#>K-CMvmxEeN*51pd=wR;CWFn>ucYjt``
zyEKW60fE<PF3@#j8gbGVAel-0gjj=gJ@Kzn9}%a^o4Vfub-v!nKUQfQQgC#VoOo$z
zX+7LlmnU|(FVZs~lb}g$6>FW>c}X1Xt$fu|qdswT2?~Tp(x{d`dAUD2%A1#IiiRd9
zq&U-}IG7#Xa{tXX5gS|1!lZWU*SLtl1~#nFz!h?iAMZMNgP)J$O0R`M3Lt28>ZeNa
zQ|N4a!#|W8tS0f1kUR*_tE{xG=$X4)oB>}(<I^P2+oC?FsL82_D!P<SKYRrZbk$33
z(O)O7?OJI>`<Pl99tua3)9|q<k4Mkp>@JW9(42umAntAoMy}}EihtX#olL}IC9t2+
zGa}c%ZUcrfmr}DsEcofWj%0+{Q!Ydisa8E90;M5>nDFd2kh<!Bz#$KZOg=2E-^VhX
zR!dsMc@~6?E@he{CUr{4bj;t;ky_#nD@a^V9%B)pCuUbeQWS4h&bvrpsJKq0Z>7;(
z7$k^0u_9fMgyV4JNiESegEZO1&h>|1zIU!DaEB<!qRUxBOeJw6mvXmJB%fHiAH;Te
zbfeVV{gi|J#v?<Ek-9XVZ>W>5kD`T*Ll2o$PIabNJEQOmqyzjBzrV^bagEaLg}c8A
zb-l95-poonRGNTrw)V@U>qAB_(OX5Sph%uqv;?BWZkhrk^up35w74M{ncinMmxAH<
zleMIfTO`m|Vh`r{WYAbK;fFA`&`3yNplk{o>+aKYRZANgGq1FU1r?u2_ovjvH1V<*
z4q~zb1q|LYPa}~qq;}~=Y#pZtk`)aZwN*YE42gt<<_1k&eeDeCI92{DIf7X^KlTyS
zrS8Anjoz1Db&V=@<BfH26)0<WEZV_=;vfF5sG02V4Md#9dfXJo>ar$wID8B+B*sXP
z7@i2)k@6o4jt`0VA0#O>?#{r`)u5r@6D^^|N0H8K4e9ZFg*v!~a5=c_=$mFa<lMD>
zOH;trtfe6?I&&NZJ+NQwn(@y2hHzOt*}d+lZ~o&<cx*^~(=8%#s<Y$Q2(I?MCGIIE
z!g68N=byHBD&G@Xpx1An38KTGg8IXoG}jEaKS;gE-UYJjl3M$@Wh<!x;U#AXemJM;
zS-j^Qh;kn@tkaUUlexLpn;ratBD=>)=J&R`qvNk~g-r|rYt(f%67r3~u6h5bEe&R<
z+{yc{x!!cVKuidn9R|q}F)O&fRvLCVz*1!Ry=Qds-JalA!uIKsD}TO4odX*z5UTe1
z3s(5Ke9=*VXjT*yeSUw|Y;i@Rn$L#>IrXOL&GDb$83S@OVpc?f+@#W@;@xc24f3ey
z!h&*sIUp}6i_D$N?q+z;Y!cf`{2g5;auQb>_1UuE4)5GFr4-`|2Zs>--=~AM!&1Tv
z8;d_@qyUt81wYL8k8+wtmDJz(C`A^A`kQ?Uusn0u-ToQsAL*v@8S|Y&p{jH|Ht);E
zQ0iBUnERBkrD8TxNgzn5X4RJr5kav%!7AORIbu<i?^7yCRQ^;&NwcGv?V|k5{n`P6
z_q>7Va%eETpUQs22|U`lVwfQi6>ny$J?*9jQ;!l76m{B3kbxv08L``{f|To&HP+|-
zjljrYNL;@71%hpRf$eZOwSA2T70a@c*#6$?#^K^eP^9s9$gtZqTei|(nx^6KI96aF
zo|J59Wkb16%QZ{3zi<w65dDK+^z;;2=dgfX&a0Ex_a`M(n96-5n>(%)8DOkTupf!Z
zD_=uSN5hk6I@?)nUcBsz;z1O%6X|<}2|5I6C`?F9TTeg0m0{H*&N;+;PWJUJ#hU?m
z^Hbf&<sU?i(riceu_LHMZ+>A7RXt-PXdS0A76^!gLC9xb>ja(@-^+!{vrfoiFcrwt
zia$Kg^vHQip;fc`Dq^FXoPjmlfYy(b`w~y#1P!j%+DH}uc$BCH@l0@V94l*Ql4!c_
z!x;M$)CJ#5V_$A!q)cY_9$RJwFSBl_^rV*=`W`=e<jG}~T>ap=8$CfFg4g2!$=vf*
zwb+T}>};hoiXW)f^){?rVH8(HGWUCIEOXUSa!L2s`$#ID{W?XJqRKI=Nb=aZA)zCW
zZRWC{ttSHS;;z%2pAHVyOdoW2Wy`k=N9+Dl!3c?~YjBv1$SyzKR}`D#)dykC?!AbA
zMCZaO7s+{^&D38cGG?24!bJ)}Kj(6J8(b^smoLesI2KETMIJZ;k&1N>aDJ+uD*pYh
zN*8e?kB|6lID;y>f;59Mxg5#pn?tHhFM8st{XJfEz=s$Z&?hlJj7cwt;^yF@><QoC
z0E!coBhTjwy>7ZYUBPeN(J4w6B{5COrgr==#^7&{XJunFHnwUUT)Lh>Y~RxTG3pQ=
zGkLVxo|RF>(6|3rzAC_$1wE%!v2yFHbg>XQgKSyO=rZctGS?fLav}+u5w6)i`-QC~
z2{LUc%^usGMX&eAD@CTmV&lJNgrxBD*}w)?LPI>FH*Pd&_z}68Kk7SGMkO{vFGSPm
zh0P!BGvmw{pm!^UHWpn}K7UJo2g9m<QHwkmcCz8_5WdC9A3AYp8tp#GF}FvjN}QkN
zlydz^RM%berM_m(TBo(eRE6H;v|a&4!21_aje~0MCo-XyvHHKZuGwQhqWCwSOsL78
zlawNLL-BAiA$jKUi!OP4EIM{_wm+>gB|pJd&Sj8ysWlaJwLMzyNOy`9Fy_Xk3BF)Q
zlQMVT#yJ3b_(Fi~lsPDQ)NITicEy*2AF`BFp(RYE-ju$*Vp23YVK4|DLKC~K6{5*j
ztvwnnS4F$?1G(q<_N)V&j1}U4UrcB_D;vYL;aMy*d0_nw8_pC_ImUf_n*?ULh``Ol
zyXx210yA!c0IPNfO@4$XA%g1so(@(zq#AHhq^!K@L|`&8)rclgOM9w}ySDQNE{6`%
zBVXKS#De(b*Fg44$l|Pv(n>@-d~KioVQBw$H9kGDe+NxmZV{$TwkjQa%K2LDGYL5^
z{56tT-gfYfLnvOd*74S;*P`{nv(2m-JD_}+z!T;h@19<(`kmQ_VlsGlmR_a4@eJPG
zJR7B6BF2qO8k2%s<Eb)CKubsJ#M3PJjVp+C87ChXAR;N^)JFMuM&12<F7xtdlK2(r
z??E6?%wR$|IXZl+cr5a<kJ#opM%T0V5hdtRWNaEINnhO+zh${;KuYIwY^*$q1IZ74
zmM@jRggOO^z0jOr?c9b#k>A8+T{rbU#Y!-B?bC<eJGrEt`4t%n+oRyDqQqvDMoFbj
z2og(wz&kRI{m5x~9T<<t;Qm4bt5nwzn)9t@U@m3XJ2CqDM^62XEV>jzF;b}|g~5zy
za5{ZJ72O{@X>YWRfm(wE%@r1G-O4tx^q1Huvolz;gj5F_Bx+A2_Dk6F(pP4tP-Ghi
zK}}4oBLD7uSDpOEbLj;&F(hzIu?T1HN!X~8;wVJgC!CD|@;<R1t}Bfx#SgO<_>h(}
zkiZZ$iKe<S9#ufW7Zbd#a#oajA01O{sRB*eW2A<QOE$b#F#dI%y$<#Lb5-^Pg?N%k
zyuH8k*SpB)n;W%?`i&mD)Jw7Es=6$%=d0#OrVT|2QJ4cmzs1fXkdG<EuLSlv9;i(B
ziSKxmOk}z->oUwq($h^;pcI)3h@MFz&G!x^Frb_hr6Un7NQ7SP0rk#4f#4uC>=iPN
z<UQ$2*-f73nC>1fiY0Rj>h0exyJ)2#WqE2u)VjL!_d?Me4c!DVnS9x-JQf%(PKz!M
zdbvcIn^>x7WkfS=%8W2`&=erDrmUoBkx9W<;#qK-XV_3k7|k62Z#1;PcIR>ug5|lM
zvUKQVC<B%KsZ%a)EWNd>02I1)Y)SfM1&3cuQZfX+1xZpLjoaYyOBV;-@+gsfj~J;w
zn%n?|s6feRpzSBI*yy-n=xC^5nCeXbHY_K~?V9Z3#SfEv9KfmHQt_?1l$(ADnyjAi
z55!d+55IHrEI_g2LWx80dtpks%=+c4dtVBty5<_#OEY2B`*U+t9o%Jh!hHf|A;90I
z;h0h*@1Jak1mLw@BJNPzp3<q175UJfZo%r6CPxz0r?!QwMA$Jg8IU;@K0M7207d#$
z8vSXFFCH^UVQL^sDOqKcsC#Naiu`Jv8|#l(=ce02V$3}RAtxoQg&UiG?WR}KPx%?a
zk*L}>jnKZkz}wXj4f^bqhA%<ugy_hpPya0co$vH<up#Z;LCeN&fji(dGblJ?LVj9p
zjh@@Le{eEv#zv1TwCc@%dp*}tCwZetC$93dn?CLh5|<&ImIb|JPcN>!H)#ESWFWkA
zdN!c{bqT#+&W$;V+fT9=cgY}UcRz~9F$=6Uk;<R`Ze5=8w0yI(n{68yBX?Fi9HJ~)
z#$`bJnX>SIy$cY<FrF3v#(`u_o`E6o>sCgKYl*ORj(C@*4<&m%m`oNs`$Gv|gO6u<
z&1|upGKc3ejOq~R(Q647yAz)+qB;*J68dG5maMImpEt**2fIXVjY|p<rxa;{bMJDS
z8YZV))zDTxz1j>J?rmIi>J%);ltNmD4!GI8rZmVWvQX1WRx*`M^<9~<=Aen+p5@^6
zsIb`L+tW+Q2YtJdPzukhEK((fcPGljF&^S;JUQGEXxnnWQS*c(czotbOC8ESsZ2VK
z1RO@)h0ht_DwBfFKO0vlZwL)Id2K%9sRR<r$(8Cvb5@1$g;j8rn7JPhX0Kn(4hK#%
z$KV5v-*nhJFka>GPi1$1<>#@2$6l{w3nPc*2XsRLtacq#6S@&OJW_Az9X_!3bu?t=
zMTe;5l$Mr1-$C45vkYBmrz9bIG;!*+NPZ~m*3Q~cZa<-4zxs~BXUR+C^X4u%h|sj~
zqC!s~ZvGvxVdFq$;LGT~{+?PDDu=_#@r4$S`Bm;%OhVA?Hy5kt;3j||3M8l;G8j$x
zLW|yD+7pM5=C*z6V<esGcLdT8J&#1~Pp^OZ$EWpq(JRwx_kGT?)Pb<VjdV2BNZwsl
zpPyVf4_YhhyklYm$_)&v;j2h{hv8@OyAI*j@iLxOBXO9(z90#>Q~nv7jwa!b5EcEv
z1B;K!VLqL_<iU>vF{32I3E(5dy>Aq+F8=7=1Z8Oa>J3WXC4;14O77$Ni^=$j_3Ji%
zs;wMIQgf8~t;_}=bG@OqI4e{f|9iUbe`gOI5Y5VpA|ZhqH8toDKL|-))tFD+nQ4;c
zC(yvd6_Ca)hM|5d;uuNFGs6|9%bh6A#m+6-4d|81PCf_q_y<R-=xC_wANNQP55yWx
zemjg670cyiC8zkzBXwV==P5=N>}W#ZW^y`Ga)Hs=d-6K^3f4d{ZDEG9+G&gf-lD`L
zBc%2@iJFw07|7Z=_YSJJQ0|6ayidfwzwv|&7aE9Z<QlKZD=^_hp9T2f-!RHoNW3Zf
z!7oANTD02be5REp%ms7pENzymXVJ}d*3A3dBOIm42@p8+S?-P+<Qry_0U2hfVQ#x&
z*<nFZ*P~6({q}jE0hJNL81|tO&$Uitr3r3F>$Hs}>6r%RnymoqA>WzmKCS2KcG}Xp
zmPPB<y7$naur1}@@i(W}C)~qtRo|u=^Jp$E$(qn=4^+>k(<2_pZ5I!u)pM-OudmjI
zeQB_(YE;qC3S`^!FJ^B!qd>r6Bx*-WwQCHRMyb?sp@k0~w98;yO&e^sANoF1CjQ+2
zC(@l3tOhF*set!HL;lg;Ip5`?^YJl>Zo`DSrYRNymUQ56cB`O5%sG%qD}*%E0-524
z!P1K6W>ywA?CUkr$B6-t-{~P`(6mJffNmVo8PubT3L?Qn&Xl#X*FbI9KbJYL|8_gO
zda#i8L^iCnZr~2JTqx$rToG5(hB3ZDW3fq4rVQTb+Ni9%keD|-<I$XuQO1-7{OmHc
zIB+)|`NRD9O(;fmy>{L4qbaB&5;G8nr}I2nMGYORwX3;okSpD3k$t(r?(uWzou}vw
z@sFdd59qOEE!@9c`E@~dSv*ExJV3<gR|b#x)2Z+%S<~;U?k$`^neri!Fg%zFL-0r&
zor<_m@wn2{dw-sa{lfecnYDCuX99+XyL<D+z5n&jJtz)^jSDI?6wV0a)RJX(zR<T>
z)V28|@@=_{oV;|*_`?I}Cz}2$q&%ENfjBPei~gPx1WG=M{SE?Y{eoQ|fCWJhLqbJ@
zQsoe=WD2DEgEsjEHab6N9_dNe&}SX;(>mof-axjdNTpz`H9j1MwiLcf#e`89(LDsS
zr#eVEWH4D6!u)v{G`y;fCK|sae}QuWL()DsGmJezG%Vx+EycRv7;l)FR{^^0=y|JL
ze2E;Kfdm1`8NtMZQ7QfMxs*7%cpWp8=RkDz6>V-syj|R-*e76;>qY)~eT>pKdKKuL
zGTj9+>Q8)Ym4_v82=Pe=dIVMuk{A{w04GWDd0MUlPMGk*6}yn=8mPyiC;MF*lCFEw
zflSH2E!n7lMj>~`o}d1eExM!d3xWsxtnWWn5jxr2FIGj;)9B9)oI)hcn=&5(M@UBw
zC0d-O@&?t3G&%-SWlrIbF13sb4$)$h3N?BNd;3rZRzHTvnfH=R;XY{9qYY3~pOc*A
zcP=XF?h*XweJ@hR|JUCF(+!Qh)5Xfevs`WR#3wb3SwcTF_#PgDorB{=t@+@$WR8yW
zjdZ*DhJwOEZv8f(3igoD0w19vepjfYtJ~tR{BbZ{$YG)B*G^@JeuuxGy!<O8Dg`za
zt+1n^4`m|r$1|*yq?+R5;t!NRaWT=^fI3-$&j5>$gn11X$)Hf@=jV5Y>|fSdj+Q<z
zbKje*_c&OJii(nB8l&h1lZZwk2!~TEc64-fr0bN@AIr+hvXVJ_I$5Vp)!R&CeyrF%
z{Uo5s5L)3;E~0p;Q0sHLZ*cuPRZvjSE=@<jQiz$EnS;aT@cSp049CykKZSty#d;g9
zj^$-{97T=E$;rg~ihqCi^X#b?CW*|Xpe8<#)4W3Mf4tZqmbfU7e?K8;`Zex!IiN$m
zNQvu_<-k*(_M^}EJi=nGv2@}T+%Ml|Wi7Es*c((kxc1kSmX-B?`*ynsuRj}=9oH>&
zbw>rM`rC`G9zLnRSXL>uQ_S`jTN~Tj#3UkKw0Ty;5L{dzUNqYG(g$3crRtqT8(e}b
zToO-|?<kbWF&PKMqz^DgWS@jE<Rv5|1P7x>T=ezzS@k%4EG;bsqlzvV**xEw%S@`t
z%gf8jF&xd4ZEkMfnXcsF<m6;yD=8^aRk-JWwi0es=Rv)*qkY`2i9#uqfFo(}X=`gE
zlDu@BsWR%gSUeaK`!le+yBpfPvHIm>hy8)t?sP8R8Uk1d?2ymN?)iS}fwPNCD%XpY
z>};L_+rz8fz{Ykbf^uQ7&P}Ak`J%_Np2wnF?>&zN##k}uDIE)|G>YNRO&a|N$F$pl
z*{?&7mV6GbR)_+CGe9G{)V`f?E7dZq%7#RKUO9{+=eYmu?cvt@*p%etUyTCM@(JCX
z92^|1ti>fIPA0liYFH_XY~*-hS)Qw}((PMHT3TA#qr0eV!t?Pt(~YPO+E14Rr(f1O
zEK5{a@NH1w&Ts8^1G8o%B>b)nxa!~hQ}3ZeWuo|Wj3#BUro3^<dk0)Dvq}Recwe-~
z6GW<Phb3<=!A>tP6&S_{a?N5yN8;h*XZ!!P>c2gwkEy=T<YR~iA@;lc)$6i3WOoqE
z`z39}>F#2?zC-Qb_Z$VB{UUW}h+GxRxjHKo02aV&?x6-2F+ERu3CiakI{XIS@(ndM
za+VbrTQ0SE8TcJPx3aQwA!@XqEWNzEeE&wIw7KIeRdo8ByV||9E(6V*S@R3aEi2)7
z0js|_TZ<hAZ^WI4GC)*7*!f@m4Z^^o(~aGfV^RaLp{=d0udlDGtE;bXAM3w0^&x$D
zb7$(q3r$T;B_*XIrA+i7<fZ8I`S#1bl{5EG!Jps|%e0MOo;5W!A|Cr0Sy@>rDO00`
zr1DJFwJKmFFpL3jPfw4V1tv_|b!Uo8RCNBMVT<d}gsiOn(~C?4{u5QglgbpcN3;~y
z2P|ZGg3SfPo6+;%7f`Jt#J^@tV*S>WwZiXEKXBXD=;Ea%l;XX!*3Z+?_B|Ls%}uyK
z!^mhQ<B`k9v(;#>7Y(~0CR$oVXbIK1P$-n%^!PY<A8l{0(x5~2{bR)p;cAQFthB=V
zW2*+1rTHqOuHD&M7Z;aChh=@RK6Q1{SE$`A+LO>HKmYlFKednvzw_u~xAw_vn#mIN
zq8YQr(QxtBH)c8o1qI6iH&<E)e)UFO;hCZyDJdynh;V6!i`AI+_LG|#t+45xy@h6%
zRBpXD5`VY&Oul3UT%Utb^KkwI9=jQYLnl0=_~p$#QQEA*)z#JI>yt*M`@+pT6|Ilo
z(Ec>d{t&oo1}y*X-Mb<Dhkk#LQfMn$TD(`gUkxgRjw^|Bk-QRK2zdT{a;)H~!^iUt
z`^A>oW&bnv>cubD%h$~?1P8~?-<?W>8dG^UH@BzyCXAf@bJZrjk~inWz!<a3!^csh
zaE8#{HELeN&JZGrx9RCGw6#4q-dTwF5?!1gEGM8xNay|;mRvqR7r8!L+Z)aKunK1F
z=)a}k?)_X-^I?rp>!bR%Hs8TC!OFJZ-()HECO{4fd9HW2&D>ZL2ckF*<6~jj91=Yk
z7#t+P4td>?0#ZD^Q#bMJ46_IxQb;I2n7O%4X5@WlTSH=1dwY8Yg{VJ_bnY`oAl)kN
zYbrE*{#yMrB+4Ty+WINFd_Q?qF3QZpB9>m#f40W#<OkgckOH>Aq_*Z89d<v-uC0sl
z_6sQX_w`Xr`d<d3VbJQY(rWX)Xt4F#%8gKZw4SuPYg;)z@2Mu>97gLo<?QTS0cNh4
z{!q~Ws0$=9!!XGoht}P99oj~9S@Psx(Q1bqW%!-U4#gJlc>DYNGm0ju0b9fpi65z$
zo0~H(N4+j<WrmoVn_nMS2Dp(VDNRgFfcP{4h2phA^iV(Un<75B-<=N>YpbdpL9}YU
zbdm)(F1A1NYD^cycO#(UH9Xm!Ewp-grb{APMbb>4Qn3S4U&f!>yrjI4<t5V5-|PJ>
z&))L7ZBP9E{d-1K+adk_<RS?KBwjkt??D`uZO*_=BK}IhkBW|VXkJgTscd)e3MY8o
z7H6JJ>RBpgLBXlbYroJG&GYeWuW^~1gQIM|z3?4<U-+=J9xzSw$(&8L&wjJa+n39I
z*P=BjLQd4c*RPgSm9)ELx+#J-Q{}j%_kV0`=%!4zSj-6wf`YaSDxJdvOPXpBU9U)4
zfd8etw`y}x#6F6TkFR#ynQG9lfftsS?~Xp9_d8wmxGVM&zo=~gE6JlONax2Mn-!(V
ztxS)l=AVV>AUDo$IWy%QfKpjnR-xNyzsNvq+?T*ispmQ>wCuY!Rym02xLe)(hW1fS
zy?sp@3YDCk?6K^33f^_v3bgk3{Wii4#${(`2W522_aY-B1H-2!z3`FC#=r}Q_WHds
zc60DPlhA^r4A{Y1f1Bg&$?2CagN2IeBxgSLYflvwGar~KWN1CA&aR-97P2~3_|f_I
zu!~5@VQJU*0@R=fFzCd^3fKpS*1ZN`cTKK2sSn!Kt5Yu=xHvdmYWRrB$;h6i36!kw
z8C1xi;^mkY6z+6co;Qvju5^JqKPFu1P~*J*EmrbcxZ379P?mZ}-xAz?2r4E2kTMe@
z%lCKRaS9J7JA2F3$vnU<i`ZDURK$LNe-=4_!~8*^<%J(tvLM#M_GP7~r;AP7419Tg
zH{uTU7<;R9x2DzExWHb*Q||NcAw;zP%XPE}n($wZ9anp+(L72CMpd{}+Ne73<89#9
z)jD=F`jsBLGu0Xv1zU1V&No-5y+)<w-eCfF)|3POj<XeIIDf`v5y;Y^_d6QBJpWTN
zl-T=_(+meB$2nuP?G$9Uy0W<2+2P7<MPr<=TeYh3s0Z1n*=1AT_gBw{`uR8IYuG7C
zzdPM%iNt14p3Href`&<BVPXB*7`(VxzR}m#o+<BgJ6Q4?$&sr5D@F_ww=IZ)!Im~P
zH8n6zLC5c%5`KSYmOTMT1A)EV<YZ!Gl-u?2K4PxcVmSNea&y`spgq2F5ZrnBD>k4m
z0+SBCaymUee&v^Eo4$iE?L)=d($XjkeY;!`kIPs49tHtd_2Q;^pX@IE12%^;`T6-<
zJr3-NR#4pl00Ec?3g_p~(yfW9?bTiV4j@n|UpfZ$u36P<jj6gVbb9~lp#-&K@rRu%
zXVtg<{^;oF)4h4EmoI&xgTugL3d33ACIJKyT>#y=EoHolyhSen$oPGsws75>6Lhzc
zM?HW394saqR04dSw(q`n)s-LrS_6p3lI`mpa$`;P<rZ%O{8p{w6&0CQc>HtR;_~cQ
zQMSJ~7<_M_wBq)&)b4ZZ_qX*9fIozD(|7(di=(a4%?y{Ja-CXZhs;G;ei-y<Z~hcq
zd9+stl!Jq1us3yebx3&5PK%#~1=TJ1)z@Fbq4zxmB|@kyq8mVFfRS5Wf1*QXXJ-L;
z2>_^L_r0n|e@`^!@H_tAJ_%8eeKD)C{PObh`;D{@ZQph|Hw32~S=*$TAG<#3o_U+_
zW%m8M?W_7`hv4M{gC@t^MW>1Da*@7oRN2EqR%1-9gp=QG8gWu@y&9w^m!`ln*eZCu
zLzPginl*UmP~7Llc1p%oaU7d~=4ioXcs6LsP<5}q=H^fKO$-$uLQt??=OWfc`P6;l
z$4CYiKE=%Oebh5$Wy$@fwf(j~Ltv)!;}HT%Y|I52{1!^fAN?}hZcbF+2(L!AthwbU
zZNsy?x7i|iYC(VjsBG8w$PWLWKoy}>Ew<3a#Rr3%ztip>DlgpJj=eTBEr>+iY8qeI
zHy7mPeeO%IGV4!S>55oGGdZP6N=az|upGl9FUcFErL=nI`sIU;wKt;fyE7}M3wdg#
z`T0LSG%jr~wYUC}0VkPBNl7u({P#sgFF?Y`lnn4!RaIRq>&InV2b-G)aKEY1?o(z)
zMiWreluj-|;0~_zi>*d7HrURNl^gd;tzu5)jtbay2BIB18-Z%u?tSchcJ<Kz@~pI!
zee<9zP0)sx@R&q;0XQ6v{tifw7}$3luW2xXI<HQbmw&L{U~uWROwgSk{9vWkcDs$Y
z{uC~pGAGg8q?Wygd0PK9Z?UW}d`gko5AzuPSkq6^e|w6>iv5=B@W0x=<`ok10513=
z2P+rYjY#6mu(k!C&SiivR{Z2`V#EmQ2;`-y7g@S&^_HV~_e9-=#WE^()C-?^9e%<g
z+BKfae;+IH_bX#;XozyqXF_w3JFYHH9s1_OA~&;q>}w0}%45sl)0W6~_?E<$YT)m+
z$m5Pk<1-0QH1}cXE>?XXPIzx_VeNWbt3zbttx1M$GoX<m4yLYNsabCfyc?Q61C?Ff
zzWrG9<No3n$lRNxTFSkC3RF0WEXp6jGq$g)>grrU-dFO^j8qaoo&ZH{B6DJ*FSS%{
zyPH(`Wwo*FTD2VNHs3VZm5Gk~Dk=`n)!Sr}5kW#>0cTzGEp9s-ju#lS_3W(~FWaN|
zE2npkz2{rW?mc~gol<B;O-=2w;M5DagU@%wF$i-WR#r!6Nja3ql9xq0{lgvg*RS0f
zQK<f!sY-)@p+}qD{@O2Jws{=rv-DsD#xp(vIB?3#i{_KnBuTtneqmu@UY;@VV6c@d
zj-KF`>VQc%aSo3DgHsDrQ&TfD06+neo>R6ux2t6NiT)JobTs-zIaB0#w{}>9_X7mZ
z!&Au|T`Ceo649ZAil*Rd0l?B&vZT1!QMgJK>NNRWOK``?IApy#dgAl+q`U4Z<6;X>
zVkD^Nf&tf;ve6WFb9E&k*g=+|x-+*(xNUDGlu?wQpI=Y_kVuJErG5xD!S-~eL1O#4
ziA7OYR?bv1Du_9BYpkHZ$!U$w>qmTun=vA9Z@#g&!}fL6j(YVNU}X1%Avsc+B5op~
zC-p67J69txRZ!PJ`YBY-z6M|cBuRO;>RkH_H=Ptf(i9XFU``-Mg3=Ma7*qS!6qgfq
zc|II)4Tu53J(0RkQO|8_Jqg|1^T5mi@}FWZ%F9EzAIrR_4~&V4A)JY2qUJRCcp3kM
zP6r_2@>7{w|Ms<M>v`20ObTMGkWU}|E*>Umo|xa;6a4_J4&sSI8<_UwC99$)kWtjv
z#KhIbj(4UHs(a}~LqF2sNOub@d9DG6wmz=_G`$E+dqjq)=Zm3}sK(BAQ&94|ce7`k
zfEli?8gH(-rScd^c<e9STy)&HOk-(Ows)O3+8YN*78Mm`gZvDbgZ+8M?zR2Mss|^@
zE3wPNTfCrFt9fWPIOc?511t?-kSgO{6e51!zSRzRJD~^FE7UD{bz1u(=%4ISCtOxh
z(cm*Sj|C)yF}KCO?Wz^WCa{)0{I^hD|1p9t&+U?;EC6EPXv!$_-V>?<Rkj7}^H*$?
zfZ4Yso{r0!($a5zgv4OL*UFMtw?KH|Yi+GLL5_>_h_|HGzDK2a8)HLuU7bJ#(KWz7
z0BByE?9G>VHOub!R~qgi5+Yvm>jD`fQ}gvfZgbB@nyxta{?9j&jE`fQR--s*^)cOF
zYyd1adDfHy=w^e``P^fmpX?|`d-DPp=g_LK-TBQ60c3ty?9Vf`!4FINBK8FRxqXQ&
zfUK4+oh3isovYtjzPUaHmY*{e$0EKs-YK$5OZ4GxJ$SbG@vEJas7~eNL-E^BJE(Pi
z2l@pQ0oQ-Bf!kO7+PqV~4ovswd^1~gRt?HfKqkG_QnAw_{@NIXl2w`lTNiJV8aNq$
zGbJ!8)g)1MTY^B@xdhP5wW&SnH~r07FLUb42d-Nq*p;sUI62y$w3)8ZQ?g#Wt-QCS
zs)0^Y^>jt%AENxGYZWBiqeNwicf3aE23K~yyfN?iEoj15ekdwEeJZ*VN_xxu%m>~A
zw*F23D;*?1$;`~`R>FE{J5y&h4zMWz`{0w|>vW%d8b=cjYXW%;tYOV}<3@$`s7Uh4
z>hIA{0;P9x$;ob@42irO824|f19}0dQ$no^5#O?4_B~PLN)J=iB+h>%g01)p6rY`7
z<_};8LH-k-tpSB_Sp0NhYxMoz&#Ub#8vu+hj()lT%)(kAojbBInEoV&iWo0!F6S%v
z#_GfJw+u4j3!ZDQmD2L|?j)#jzia}fq4AR)Z1lYQ8Sn@nknb~<eHWb53iUi!!dmu^
z(r=Nsvc$P*`y*@Gn$6;833IayjZLX3DHN2HGU{t4z!$RsF9xn>W@;*Mor1>zg08lv
zX6`hTC`@{NeSJ?m5Sv-r5UtZ~T5q~ci)V8_H91)va4?*^YtF#2-2qx&S+8+i`FzWu
z2Nf|932IY%_MOe+%94xcwUYfcx2W`Dzjb(}cA_PP>xKF7!P0`kGxl5+R$4-#=2-yI
zZwbxDo7WD#12sOJjnkt<_leQ*iNS(I?H7bMEm9*vdo8GYIiHl*KqmQl$vs?C4nWe)
zEgcr_4H@K(0hQMSz%Y=fZ1!~pfgVH3qU0*^2)HQN%T_>PZ^=ZJVt!MTCs1`#_1tw-
zRl#3Ct=;KzbjFSV_3d-emJ<bDn8eNHpEpw<IKc!UZTbgEZ0c!~VNsD;fS&<n4&#PR
zQ1JN6T?fow<trd|0Z+NFlp*Y}B*yZp%J1R?q=>!3bbH-;>q!Ekg+su+1vto()F=&n
ztN&2i#0q)u)ld5$ml=qk%$S6Qg}tV&02J*uszPx|0g58@$@}ZgKPbv$k>GfiC16AR
zn{YK*OJAqXQg!Ve`DVe&%jGS)aR8iepA#E!`M#^q2<8N`H$9LB6@?aEzYBT*{XpOG
z6P6pLjdg}qT7N1}$KhxE-dOs8LBVOD;^aR~<)(}6wYODM0J^Wf{zu@jz(0N*Pa8CD
z8p88HSy##uYi?`148LpdDBPY8GX_-JBHQl-(AteEPxpQB=PAdaP-H%|n**~}65Xpq
z!@$NwM~m$>(a{9u0{~l~0p0>+AU5<?s45lT_iESA9;UP*6`r96MAadM$H0F~p5>9(
z(^sq{uLNcZj$y7p$7HA7Sh9%`?A+X0!cMCIzB`@FTFmpid$ljAu$odm28aOgw<h27
z-vHsXf#HAMt=~3XJ=GjtkYxqcYiU7dB0Zy4{-ix$-0va?cv?zg;`qW}EJR^J0RZ!x
z0B78)R`!6R16;Wd_}Zhj7=CO*+8F@PF&x%meB$DM00FHy&YVYItwhkL2_{>XAD-a<
z@@@xu6u{*`kkV^$l~-1d6*ra?aMBN54JB2o%66;EP}>IV*+oB~yb;<nlqtF=h(@y@
zvlwjwG}$t(N_$_ddj%Q**a8@OD=uA9s7)UO04?lQo$dQu-i5M$THphaBA?JYp>D3P
zZh0kOU7!qz0pSz|omtLQ<n9}dB4MxM?DsxfiAb;i9R)K6Q$4xFIi4{g-{Cr0_Z<eB
zWFwjMvn;XMj|MK%Y{vuq!@|4AbU5;NwaLlJLH>c@1cgNcpzrfN2xoWcRuu%I@Fzn@
z0B=C%17dTwWWe<;-FDqliR~RP@1OB9{Ge0&<s5^V1;{wBT%JN9X@!f<{aoWk%7D{Y
z>_$vj7U;4a14UUs;OZCvlG0OU{mN5dyQK!Zc|fet?IiJ@vE4?@kIl^vAap2|Dn)t%
zR~*QeyaC!)rBC?=U1~j0Lg&85Gwz+!(LA{Yfy!dPx`D`;0mL`(iH~Op1v*nPV2S_`
z6&F`&nS{*c+Z@-<0=bJ$+?$MoqG8{D?Y<Pvq6sLh-atb3Zr9(m@IKvt;2Dwyf#CeQ
z{l5T<w|p;zD;lV*x8vtXh0LvvmEaH)biD=Z2I^Uz|CKjON5Z>z=a+wm>D?w&omlBa
zsTjJ+wO+<&W!Y<?r7h^QJqMyK&{q}~764xNKVMG;LdYTz1Mu<i((1*oa{GpcB#tN4
z7v}}uSq5Q2HZwi+Yq5Db3iSPsCjmneI;#x9A-cT}gfU%&pu`@BKhRo0LYf6>K$2zJ
z9yq`a(6Ye0OkM4%hUioRmLro|28%z~Ec1;R?3E3}U_kYBD|_ZU!%f0l1?ajP5NIEA
z7y#?s>KNFqeYgxm!fP=<$BRITZ$17tL&dfpPH>kl;L<4~S}_Ck0YxXHJxyS`b}kII
zD%5eVxKI&CK_lVo*<LTK*PR?@KlU1cEP$s4%jkbLF8jCI&emW{9!7eCvw(Jx%6sX2
zY-vAYyXkdoq}k|u|15}!xx+G#&j9N1CAjgu&d#)GyheRP%7P}NF<1|ft<!)$TbbPc
zDaGWXk?`bCLwF=OV$f=z99l&1VE`}R0U6e6s*W9?5kTRASV?dV=xKhU65v)-Sd=eE
z7K%O(;WB{b9)qKW>oxitKr0zDHp41*-amew2DGM`YLgdE58mbDl~atlUDfn+w*oRS
zJ~k%eFFvjRvjQ-u3elcd)Y=eU?<33B>V=gPR2@(^!2v>9eAx$3ivO=_&i^UtJC5V5
za$1R?Yx4_&Sy?kpOwKe=DZh;CCdz@Sr(v>8ZRh-!qVsE;9%@&984kO0dR>0Y%*Zbh
zF-I#;)6QI+PW+N=Q}PSw5+;Z!?)CXEHh$x{13sVEi`VP<d_0dgG<72kHCQl{%Ska4
z>p%%U%vDk0hb_T8tl$7FL9z)15_Ga9`<$1vUnQryRkU1zdIqfZe}cJtWN5E-v0kD8
zf5SqD4g5C4p7du=c`#r_EDroWT8i!fG^W^k@AD?f8-;2fgAZUZ80kVZ_T=HibJyKE
zqai$NI>(2L9M`<%l;08vxUgYOdg)H#+)bZK%IZ^rngsXi$#kj_oI6pX?t-KzD7jTg
zJzj?A%0Vq{O(r#>34R;Z`}rx@lP)foHS<GoQib1A6F-JIzHTTu_EVM&S<PJSF6a|b
zANHig8w7tc*1|C}rKZHJK8EG?k23S96`rQL-`?&(N(}9uMOO`K!Pt-|#T+}3U4@#V
zW9AsbOoE4_`d0=Jb`SCV4`9hZwY8m|^NjiO^8>>pBYglAH+3ryRL`^yk&OX`MLR~t
zqYGj$n+oh(Xy|W>M}5TRq8!KUqQyKs4c7w|K)mOxYG*6G{hZ!Nt8_HLY7_~Do<!nk
zkwA820Z+q3Fqs;Y@o&iNHnBF578%2?tr1aCPE&U=XSc|eo7*N(UzGal8|AmXSDVg)
z4$#kB#h}LU)uHrWqB~4)xF7V{+Hd_DKuf_sOn~Q#BI62R(jLfffPq9rMmq2^{^<9<
z-2#7k&>CbinHPx!x=i~TY7b&_Ng>^F?t6N4W7`DT17JioGXH+gU4yit7^XAAv2u0S
z&L8TcQKl|seQasx$$3%Q{f7JicJJeO@N9~u*2XwJof4hcTd-D%DC#)9d}x4+6@4f_
zb%+d&t)5+`#}QDVEyoj1_yWYAkeb$&br%C5z=ML#E0r+P&qqbwX>o1tq2>o#IG6gr
z=H}()J&NlKgW(2DxFK`cRj0JA2<Bm&R_Fh`*K!4HU#2b-mwOr^yWkO#&PKE$%pZ7L
zS0d5J@?}?tye%j{W<hRN&*zgsZX>V}wwTr6^C#CgvVD76JGj5}0hlwOqpo7U)*1>%
z+LbmnwOtV7wY5R~oCahAqz!z%?6O-^EF2<Dwl~*R0M0<(-pQ{O2;JT6EJ1$O)z%(>
zhpla_z@=F|cAo`|Ljt1}BnUX2s=?jVn@w_acOAdvM|<m7`D~iq7w<wI;wCgN$1h7m
z7p5sr)*-<>4&Wddb2(56AY>h2#Z)}l8AVblt%?9XVF|JxP8lA_heYp&P3*Ep1_ThA
zhJDQ8bl(d=f|$&&E}np$!>v(w8rTvpJv>}AVc9D!iOubQ{}(})5g1&aOgs}$T}iDQ
z2y18W_UC5h^opNFs9A~9X`L~=Hz<9oJAq!oKK|HCl=j_e<gAw(VfbGAOK?!Y|L`=J
z?P5yy8RVe0gNr*V?jCaBsZz5Pi~Vx!XF_N9_@L<LJmEDo=Of&UUH{z|_NdJJ2B>Kv
R_uw*6=R(4QI|Jjt{}&3q{`~*|

literal 0
HcmV?d00001


From 7d44f6873dbdf56da3483971d1f33e06afbad5cd Mon Sep 17 00:00:00 2001
From: Harsh Mishra <erbeusgriffincasper@gmail.com>
Date: Wed, 29 Dec 2021 21:15:24 +0530
Subject: [PATCH 1605/4969] DOCS: Remove references to Atlassian for LocalStack
 (#4796)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 docs/modules/localstack.md                                    | 4 ++--
 .../containers/localstack/LocalStackContainer.java            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index b6058508ddb..1585c504cff 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -1,6 +1,6 @@
-# Localstack Module
+# LocalStack Module
 
-Testcontainers module for the Atlassian's [LocalStack](https://github.com/localstack/localstack), 'a fully functional local AWS cloud stack'.
+Testcontainers module for [LocalStack](http://localstack.cloud/), 'a fully functional local AWS cloud stack', to develop and test your cloud and serverless apps without actually using the cloud.
 
 ## Usage example
 
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index fe3ea6ab34f..dd03a4206e0 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -25,7 +25,7 @@
 import java.util.stream.Collectors;
 
 /**
- * <p>Container for Atlassian Labs Localstack, 'A fully functional local AWS cloud stack'.</p>
+ * <p>Container for LocalStack, 'A fully functional local AWS cloud stack'.</p>
  * <p>{@link LocalStackContainer#withServices(Service...)} should be used to select which services
  * are to be launched. See {@link Service} for available choices. It is advised that
  * {@link LocalStackContainer#getEndpointConfiguration(Service)} and

From 5897437b33a385778e7e193f1eaed14524a2b8ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:26 +0000
Subject: [PATCH 1606/4969] Bump tomcat-jdbc from 10.0.13 to 10.0.14 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.13 to 10.0.14.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7dd1023b95a..46088aa45ac 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.13'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.14'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.27'
 }

From e90885ee0c818b0d39a5d3ad82a1b1e02701e72b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:27 +0000
Subject: [PATCH 1607/4969] Bump clickhouse-jdbc from 0.3.1-patch to 0.3.2 in
 /modules/clickhouse

Bumps [clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-jdbc) from 0.3.1-patch to 0.3.2.
- [Release notes](https://github.com/ClickHouse/clickhouse-jdbc/releases)
- [Changelog](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/ClickHouse/clickhouse-jdbc/compare/v0.3.1-patch...v0.3.2)

---
updated-dependencies:
- dependency-name: ru.yandex.clickhouse:clickhouse-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 39b269d794b..914ee7efbd4 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,5 +5,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.1-patch'
+    testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
 }

From 5c5d4df5772e193995916f0328d8747ecf14aea9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:28 +0000
Subject: [PATCH 1608/4969] Bump jedis from 3.7.0 to 4.0.1 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 3.7.0 to 4.0.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v3.7.0...v4.0.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7907b30e386..ad0d8d3218a 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:3.7.0'
+    testImplementation 'redis.clients:jedis:4.0.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:4.1.0') {
         exclude(module: 'hamcrest-core')

From 107bf88af7054f48f94b79287b479acd826d25e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:28 +0000
Subject: [PATCH 1609/4969] Bump java-client from 3.2.3 to 3.2.4 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.2.3...java-client-3.2.4)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 772876b7bf1..ea720ca3725 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.couchbase.client:java-client:3.2.3'
+    testImplementation 'com.couchbase.client:java-client:3.2.4'
     testImplementation 'org.awaitility:awaitility:4.1.1'
 }

From d7e28d23fffcfda2008a8963a615e20f4e3b1dcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:29 +0000
Subject: [PATCH 1610/4969] Bump mockito-core from 4.1.0 to 4.2.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 950f73c1d7b..859bdf1fdde 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.14.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
-    testImplementation ('org.mockito:mockito-core:4.1.0') {
+    testImplementation ('org.mockito:mockito-core:4.2.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 05923501981e3006e02f61c2179963935407e86a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:30 +0000
Subject: [PATCH 1611/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.122 to 1.12.131.
- [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.12.122...1.12.131)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 fb4edcf1576..d891ed5b4d9 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.122'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.100'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 97eb8edf78cb4756e2ad22547bdec68f7f2a862a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:31 +0000
Subject: [PATCH 1612/4969] Bump mockito-core from 4.1.0 to 4.2.0 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7907b30e386..01e971407b8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:3.7.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.1.0') {
+    testImplementation ('org.mockito:mockito-core:4.2.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.21.0'

From 38ca320ff7700675c07cf6b6b3cc9e137c0aedb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:32 +0000
Subject: [PATCH 1613/4969] Bump jedis from 3.7.0 to 4.0.1 in /core

Bumps [jedis](https://github.com/redis/jedis) from 3.7.0 to 4.0.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v3.7.0...v4.0.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 950f73c1d7b..6075f6d3089 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -89,7 +89,7 @@ dependencies {
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:3.7.0'
+    testImplementation 'redis.clients:jedis:4.0.1'
     testImplementation 'com.rabbitmq:amqp-client:5.14.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 

From 7be241be812c80b49bfbbf9a6f31b7f3f528431e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:33 +0000
Subject: [PATCH 1614/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.15.2 to 7.16.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.2...v7.16.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index ad1446a0f0f..7b92dc8279d 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
     testImplementation "org.elasticsearch.client:transport:7.15.2"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 39322a75e1a02c79ab2110f78a13f0cbbf878592 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:35 +0000
Subject: [PATCH 1615/4969] Bump snakeyaml from 1.29 to 1.30 in /core

Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.29 to 1.30.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-1.30..snakeyaml-1.29)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 950f73c1d7b..776c519f6b2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -82,7 +82,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded "org.yaml:snakeyaml:1.29"
+    shaded "org.yaml:snakeyaml:1.30"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 86b37183cd103f6677d16626e5c03a02f2c4db4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:35 +0000
Subject: [PATCH 1616/4969] Bump s3 from 2.17.72 to 2.17.102 in
 /modules/localstack

Bumps s3 from 2.17.72 to 2.17.102.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 4b62d30742f..541a33405ca 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.124'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'
-    testImplementation 'software.amazon.awssdk:s3:2.17.72'
+    testImplementation 'software.amazon.awssdk:s3:2.17.102'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 514226ae9cae9aaecd9d8a65f54cc517a328c7f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:35 +0000
Subject: [PATCH 1617/4969] Bump aws-java-sdk-sqs from 1.12.124 to 1.12.131 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.124 to 1.12.131.
- [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.12.124...1.12.131)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 4b62d30742f..4adb5264616 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.124'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.131'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'
     testImplementation 'software.amazon.awssdk:s3:2.17.72'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From fbb031eb93844a6d968eb326dd13da1dcf68ea50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:38 +0000
Subject: [PATCH 1618/4969] Bump aws-java-sdk-s3 from 1.12.122 to 1.12.131 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.122 to 1.12.131.
- [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.12.122...1.12.131)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 4b62d30742f..326778688ab 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.122'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.131'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.124'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'

From a46d0a47bbd7a89a1f5162513a6adcf89c4f0f59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:56 +0000
Subject: [PATCH 1619/4969] Bump jedis from 3.0.1 to 4.0.1 in
 /modules/toxiproxy

Bumps [jedis](https://github.com/redis/jedis) from 3.0.1 to 4.0.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.0.1...v4.0.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index cad4b6b71f3..e055f5a52c5 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.5'
 
-    testImplementation 'redis.clients:jedis:3.0.1'
+    testImplementation 'redis.clients:jedis:4.0.1'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
     testImplementation project(':test-support')

From 3aabcf2fd9bc8a3fff29c08ed5cc3e204b51016c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:00:59 +0000
Subject: [PATCH 1620/4969] Bump gradle-update/update-gradle-wrapper-action
 from 1.0.15 to 1.0.16

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 1.0.15 to 1.0.16.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/a116d8b533be6c4e71a8b3c3871b7344ca72bf12...f31ab392a9d75029f9fd0883d8d6745c0139a006)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 08fbc91d00c..612aec0b406 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@a116d8b533be6c4e71a8b3c3871b7344ca72bf12 # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@f31ab392a9d75029f9fd0883d8d6745c0139a006 # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From cf2a23d4cf0c5ad151ac7ced12796edc075a51c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:01:00 +0000
Subject: [PATCH 1621/4969] Bump solr-solrj from 8.10.1 to 8.11.1 in /examples

Bumps solr-solrj from 8.10.1 to 8.11.1.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 965a40b35a8..c0c69300377 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.22"
     annotationProcessor "org.projectlombok:lombok:1.18.22"
 
-    implementation 'org.apache.solr:solr-solrj:8.10.1'
+    implementation 'org.apache.solr:solr-solrj:8.11.1'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 132476d4d85a044321ab288296c2dea4808890c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:01:03 +0000
Subject: [PATCH 1622/4969] Bump actions/setup-java from 2.4.0 to 2.5.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2.4.0...v2.5.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 .github/workflows/release.yml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 7403b53fd8e..d7351605e6d 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -17,7 +17,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.4.0
+      - uses: actions/setup-java@v2.5.0
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.4.0
+      - uses: actions/setup-java@v2.5.0
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 990ffa666b9..0fd59f892f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.4.0
+      - uses: actions/setup-java@v2.5.0
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.4.0
+      - uses: actions/setup-java@v2.5.0
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7b727567ecb..d9026eb2257 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.4.0
+      - uses: actions/setup-java@v2.5.0
         with:
           java-version: '8.0.302'
           distribution: temurin

From f0ddacf7150fe3d211b67ad97a9bb73abfa4361a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:01:07 +0000
Subject: [PATCH 1623/4969] Bump peter-evans/create-pull-request from 3.11.0 to
 3.12.0

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/67df31e08a133c6a77008b89689677067fef169e...dcd5fd746d53dd8de555c0f10bca6c35628be47a)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 790dad57188..418598f230d 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@67df31e08a133c6a77008b89689677067fef169e # v3.10.1
+        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From 2c26b68bbc07d1f0706d97709e28eb6c13ed60d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:01:08 +0000
Subject: [PATCH 1624/4969] Bump jedis from 3.7.0 to 4.0.1 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 3.7.0 to 4.0.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v3.7.0...v4.0.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 8f30256e2da..7f81bbf4c57 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:3.7.0'
+    implementation 'redis.clients:jedis:4.0.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index b6ac1f4ddd6..5a71ca3d2ff 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:3.7.0'
+    implementation 'redis.clients:jedis:4.0.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index a8b10171d99..35f7483113f 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.7.0'
+    implementation 'redis.clients:jedis:4.0.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'

From 62fdbda74efd649278cee380d13d025ec8807457 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:01:10 +0000
Subject: [PATCH 1625/4969] Bump com.gradle.enterprise.gradle.plugin from 3.7.2
 to 3.8 in /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.7.2 to 3.8.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 13645d5f5ff..22b279b1573 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.7.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8"
     }
 }
 

From a3e264a0dfe858c1417a32fc135a5cb16cf6f3c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:01:16 +0000
Subject: [PATCH 1626/4969] Bump json from 20210307 to 20211205 in /examples

Bumps [json](https://github.com/douglascrockford/JSON-java) from 20210307 to 20211205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 091a35ae042..dfdc749d191 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'org.json:json:20210307'
+    implementation 'org.json:json:20211205'
     testImplementation 'org.postgresql:postgresql:42.3.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.7'
     testImplementation 'org.testcontainers:postgresql'

From 8374167877213329ccabdec1fb317c25592e2f1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:01:19 +0000
Subject: [PATCH 1627/4969] Bump org.jetbrains.kotlin.jvm from 1.6.0 to 1.6.10
 in /examples

Bumps org.jetbrains.kotlin.jvm from 1.6.0 to 1.6.10.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index a37b63e6557..e0028d26b4a 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.6.1"
-    id("org.jetbrains.kotlin.jvm") version "1.6.0"
+    id("org.jetbrains.kotlin.jvm") version "1.6.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.6.0"
 }
 

From 23cbeb30d04a634c6c512e56446c37bf5c10664c Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin@wittek.dev>
Date: Tue, 4 Jan 2022 09:27:50 +0100
Subject: [PATCH 1628/4969] Fix for API changes in Jedis

Use `long` primitive instead of boxed type.
---
 .../junit/jupiter/inheritance/InheritedTests.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
index 720c31cf794..adeaf58675c 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
@@ -12,15 +12,15 @@ class InheritedTests extends AbstractTestBase {
 
     @Test
     void step1() {
-        assertEquals(1, redisPerClass.getJedis().incr("key").longValue());
-        assertEquals(1, redisPerTest.getJedis().incr("key").longValue());
-        assertEquals(1, myRedis.getJedis().incr("key").longValue());
+        assertEquals(1, redisPerClass.getJedis().incr("key"));
+        assertEquals(1, redisPerTest.getJedis().incr("key"));
+        assertEquals(1, myRedis.getJedis().incr("key"));
     }
 
     @Test
     void step2() {
-        assertEquals(2, redisPerClass.getJedis().incr("key").longValue());
-        assertEquals(1, redisPerTest.getJedis().incr("key").longValue());
-        assertEquals(1, myRedis.getJedis().incr("key").longValue());
+        assertEquals(2, redisPerClass.getJedis().incr("key"));
+        assertEquals(1, redisPerTest.getJedis().incr("key"));
+        assertEquals(1, myRedis.getJedis().incr("key"));
     }
 }

From f89decebb35e6564495b084f6a5e826690678e95 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Tue, 4 Jan 2022 11:15:13 +0100
Subject: [PATCH 1629/4969] Upgrade Neo4j server and driver dependencies.
 (#4789)

* Upgrade Neo4j Java Driver for testing to 4.4.2.

* Upgrade Neo4j to 4.4.1.

* Default to 4.4 instead concrete 4.4.1.

* Throw exception if using database copy with Neo4j version !=3.

* More specific javadoc and version check.

* Adjust documentation for copy database functionality.

* More robust check for defined image version.
---
 docs/modules/databases/neo4j.md               |  3 ++
 modules/neo4j/build.gradle                    |  6 +--
 .../containers/Neo4jContainer.java            | 29 +++++++++++-
 .../Neo4jContainerJUnitIntegrationTest.java   |  8 ++--
 .../containers/Neo4jContainerTest.java        | 47 ++++++++++++++-----
 .../containers/Neo4jTestImages.java           |  2 +-
 .../example-container-license-acceptance.txt  |  2 +-
 7 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index 702f9cc40d7..0310d37d817 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -139,6 +139,9 @@ public class ExampleTest {
 }
 ```
 
+!!! note
+The `withDatabase` method will only work with Neo4j 3.5 and throw an exception if used in combination with a newer version.
+
 ## Choose your Neo4j license
 
 If you need the Neo4j enterprise license, you can declare your Neo4j container like this:
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 51cc625dc9d..cdc727921b4 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -18,8 +18,8 @@ sourceSets {
 
 task customNeo4jPluginJar(type: Jar) {
     from sourceSets.customNeo4jPlugin.output
-    archiveName = "hello-world.jar"
-    destinationDir = customNeo4jPluginDestinationDir
+    archiveFileName = "hello-world.jar"
+    destinationDirectory = customNeo4jPluginDestinationDir
 
     inputs.files(sourceSets.customNeo4jPlugin.java.srcDirs)
     outputs.cacheIf { true }
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation "org.neo4j.driver:neo4j-java-driver:1.7.5"
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.2'
     testImplementation 'org.assertj:assertj-core:3.21.0'
 }
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 7890bf5dcad..f844df3f945 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -10,6 +10,7 @@
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
 import org.testcontainers.utility.MountableFile;
@@ -30,7 +31,7 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
     /**
      * The default tag (version) to use.
      */
-    private static final String DEFAULT_TAG = "3.5.0";
+    private static final String DEFAULT_TAG = "4.4";
     private static final String ENTERPRISE_TAG = DEFAULT_TAG + "-enterprise";
 
     /**
@@ -194,6 +195,8 @@ public S withoutAuthentication() {
      * If you want to map your database into the container instead of copying them, please use {@code #withClasspathResourceMapping},
      * but this will only work when your test does not run in a container itself.
      * <br>
+     * Note: This method only works with Neo4j 3.5.
+     * <br>
      * Mapping would work like this:
      * <pre>
      *      &#64;Container
@@ -202,9 +205,14 @@ public S withoutAuthentication() {
      * </pre>
      *
      * @param graphDb The graph.db folder to copy into the container
+     * @throws IllegalArgumentException If the database version is not 3.5.
      * @return This container.
      */
     public S withDatabase(MountableFile graphDb) {
+        if (!isNeo4jDatabaseVersionSupportingDbCopy()) {
+            throw new IllegalArgumentException(
+                "Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
+        }
         return withCopyFileToContainer(graphDb, "/data/databases/graph.db");
     }
 
@@ -250,4 +258,23 @@ private static String formatConfigurationKey(String plainConfigKey) {
             .replaceAll("_", "__")
             .replaceAll("\\.", "_"));
     }
+
+    private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
+        String usedImageVersion = DockerImageName.parse(getDockerImageName()).getVersionPart();
+        ComparableVersion usedComparableVersion = new ComparableVersion(usedImageVersion);
+
+        boolean versionSupportingDbCopy =
+            usedComparableVersion.isLessThan("4.0") && usedComparableVersion.isGreaterThanOrEqualTo("2");
+
+        if (versionSupportingDbCopy) {
+            return true;
+        }
+        if (!usedComparableVersion.isSemanticVersion()) {
+            logger().warn("Version {} is not a semantic version. The function \"withDatabase\" will fail.", usedImageVersion);
+            logger().warn("Copying databases is only supported for Neo4j versions 3.5.x");
+
+        }
+
+        return false;
+    }
 }
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
index 5a67674cbe8..ad6ccad8281 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
@@ -2,10 +2,10 @@
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.neo4j.driver.v1.AuthTokens;
-import org.neo4j.driver.v1.Driver;
-import org.neo4j.driver.v1.GraphDatabase;
-import org.neo4j.driver.v1.Session;
+import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
+import org.neo4j.driver.Session;
 
 import java.util.Collections;
 
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 6a32dac0af0..fcfda6f6873 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -1,13 +1,14 @@
 package org.testcontainers.containers;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
-import org.neo4j.driver.v1.AuthToken;
-import org.neo4j.driver.v1.AuthTokens;
-import org.neo4j.driver.v1.Driver;
-import org.neo4j.driver.v1.GraphDatabase;
-import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.Session;
-import org.neo4j.driver.v1.StatementResult;
+import org.neo4j.driver.AuthToken;
+import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.Result;
+import org.neo4j.driver.Session;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Collections;
@@ -45,7 +46,7 @@ public void shouldDisableAuthentication() {
     @Test
     public void shouldCopyDatabase() {
         try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:3.5.30")
                 .withDatabase(MountableFile.forClasspathResource("/test-graph.db"))
         ) {
             neo4jContainer.start();
@@ -53,13 +54,37 @@ public void shouldCopyDatabase() {
                 Driver driver = getDriver(neo4jContainer);
                 Session session = driver.session()
             ) {
-                StatementResult result = session.run("MATCH (t:Thing) RETURN t");
+                Result result = session.run("MATCH (t:Thing) RETURN t");
                 assertThat(result.list().stream().map(r -> r.get("t").get("name").asString()))
                     .containsExactlyInAnyOrder("Thing", "Thing 2", "Thing 3", "A box");
             }
         }
     }
 
+    @Test
+    public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
+        Assertions.assertThatIllegalArgumentException()
+            .isThrownBy(() -> new Neo4jContainer<>()
+                .withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
+            .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
+    }
+
+    @Test
+    public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
+        Assertions.assertThatIllegalArgumentException()
+            .isThrownBy(() -> new Neo4jContainer<>("neo4j:4.4.1")
+                .withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
+            .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
+    }
+
+    @Test
+    public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
+        Assertions.assertThatIllegalArgumentException()
+            .isThrownBy(() -> new Neo4jContainer<>("neo4j:latest")
+                .withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
+            .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
+    }
+
     @Test
     public void shouldCopyPlugins() {
         try (
@@ -93,7 +118,7 @@ public void shouldCopyPlugin() {
     }
 
     private static void assertThatCustomPluginWasCopied(Session session) {
-        StatementResult result = session.run("RETURN ac.simons.helloWorld('Testcontainers') AS greeting");
+        Result result = session.run("RETURN ac.simons.helloWorld('Testcontainers') AS greeting");
         Record singleRecord = result.single();
         assertThat(singleRecord).isNotNull();
         assertThat(singleRecord.get("greeting").asString()).isEqualTo("Hello, Testcontainers");
@@ -103,7 +128,7 @@ private static void assertThatCustomPluginWasCopied(Session session) {
     public void shouldCheckEnterpriseLicense() {
         assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNull();
 
-        String expectedImageName = "neo4j:3.5.0-enterprise";
+        String expectedImageName = "neo4j:4.4-enterprise";
 
         assertThatExceptionOfType(IllegalStateException.class)
             .isThrownBy(() -> new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE).withEnterpriseEdition())
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
index 2cab24baf2b..aee6f29fc5f 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface Neo4jTestImages {
-    DockerImageName NEO4J_TEST_IMAGE = DockerImageName.parse("neo4j:3.5.0");
+    DockerImageName NEO4J_TEST_IMAGE = DockerImageName.parse("neo4j:4.4.1");
 }
diff --git a/modules/neo4j/src/test/resources/example-container-license-acceptance.txt b/modules/neo4j/src/test/resources/example-container-license-acceptance.txt
index 9b92a79c737..e1f78f2d982 100644
--- a/modules/neo4j/src/test/resources/example-container-license-acceptance.txt
+++ b/modules/neo4j/src/test/resources/example-container-license-acceptance.txt
@@ -1 +1 @@
-neo4j:3.5.0-enterprise
+neo4j:4.4.1-enterprise

From 04d5247dc2d841dceceaa34e1e26a479ee73487e Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Tue, 4 Jan 2022 11:17:09 +0100
Subject: [PATCH 1630/4969] [couchbase] Explicitly configure service quotas
 (and allow customization). (#4802)

This changeset explicitly configures the service memory quotas to their
documented limits by default. This ensures that if a service is enabled,
it does not consume more memory than absolutely needed. This is important
because some services (like analytics) try to grab memory available which
is good for production but of limited use in a testcontainers setting.

A new API is also added which allows to customize the memory quota for
each service should the test case require more than the minimum (which
for most services is 256MB anyways).
---
 .../couchbase/CouchbaseContainer.java         | 57 +++++++++++
 .../couchbase/CouchbaseService.java           | 97 ++++++++++++-------
 2 files changed, 120 insertions(+), 34 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 9ef8e99e19d..5007a8d5ccf 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -36,8 +36,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -100,6 +102,11 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
         CouchbaseService.INDEX
     );
 
+    /**
+     * Holds the custom service quotas if configured by the user.
+     */
+    private final Map<CouchbaseService, Integer> customServiceQuotas = new HashMap<>();
+
     private final List<BucketDefinition> buckets = new ArrayList<>();
 
     private boolean isEnterprise = false;
@@ -158,6 +165,26 @@ public CouchbaseContainer withEnabledServices(final CouchbaseService... enabled)
         return this;
     }
 
+    /**
+     * Configures a custom memory quota for a given service.
+     *
+     * @param service the service to configure the quota for.
+     * @param quotaMb the memory quota in MB.
+     * @return this {@link CouchbaseContainer} for chaining purposes.
+     */
+    public CouchbaseContainer withServiceQuota(final CouchbaseService service, final int quotaMb) {
+        checkNotRunning();
+        if (!service.hasQuota()) {
+            throw new IllegalArgumentException("The provided service (" + service + ") has no quota to configure");
+        }
+        if (quotaMb < service.getMinimumQuotaMb()) {
+            throw new IllegalArgumentException("The custom quota (" + quotaMb + ") must not be smaller than the " +
+                "minimum quota for the service (" + service.getMinimumQuotaMb() + ")");
+        }
+        this.customServiceQuotas.put(service, quotaMb);
+        return this;
+    }
+
     /**
      * Enables the analytics service which is not enabled by default.
      *
@@ -262,6 +289,7 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo)
         timePhase("initializeIsEnterprise", this::initializeIsEnterprise);
         timePhase("renameNode", this::renameNode);
         timePhase("initializeServices", this::initializeServices);
+        timePhase("setMemoryQuotas", this::setMemoryQuotas);
         timePhase("configureAdminUser", this::configureAdminUser);
         timePhase("configureExternalPorts", this::configureExternalPorts);
 
@@ -341,6 +369,35 @@ private void initializeServices() {
         checkSuccessfulResponse(response, "Could not enable couchbase services");
     }
 
+    /**
+     * Sets the memory quotas for each enabled service.
+     * <p>
+     * If there is no explicit custom quota defined, the default minimum quota will be used.
+     */
+    private void setMemoryQuotas() {
+        logger().debug("Custom service memory quotas: {}", customServiceQuotas);
+
+        final FormBody.Builder quotaBuilder = new FormBody.Builder();
+        for (CouchbaseService service : enabledServices) {
+            if (!service.hasQuota()) {
+                continue;
+            }
+
+            int quota = customServiceQuotas.getOrDefault(service, service.getMinimumQuotaMb());
+            if (CouchbaseService.KV.equals(service)) {
+                quotaBuilder.add("memoryQuota", Integer.toString(quota));
+            } else {
+                quotaBuilder.add(service.getIdentifier() + "MemoryQuota", Integer.toString(quota));
+            }
+        }
+
+        @Cleanup Response response = doHttpRequest(
+            MGMT_PORT, "/pools/default", "POST", quotaBuilder.build(), false
+        );
+
+        checkSuccessfulResponse(response, "Could not configure service memory quotas");
+    }
+
     /**
      * Configures the admin user on the couchbase node.
      * <p>
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
index 57d3e37fcf2..a314bd5ccfc 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
@@ -21,38 +21,67 @@
  */
 public enum CouchbaseService {
 
-  /**
-   * Key-Value service.
-   */
-  KV("kv"),
-
-  /**
-   * Query (N1QL) service.
-   */
-  QUERY("n1ql"),
-
-  /**
-   * Search (FTS) service.
-   */
-  SEARCH("fts"),
-
-  /**
-   * Indexing service (needed if QUERY is also used!).
-   */
-  INDEX("index"),
-
-  /**
-   * Analytics service.
-   */
-  ANALYTICS("cbas");
-
-  private final String identifier;
-
-  CouchbaseService(String identifier) {
-    this.identifier = identifier;
-  }
-
-  String getIdentifier() {
-    return identifier;
-  }
+    /**
+     * Key-Value service.
+     */
+    KV("kv", 256),
+
+    /**
+     * Query (N1QL) service.
+     * <p>
+     * Note that the query service has no memory quota, so it is set to 0.
+     */
+    QUERY("n1ql", 0),
+
+    /**
+     * Search (FTS) service.
+     */
+    SEARCH("fts", 256),
+
+    /**
+     * Indexing service (needed if QUERY is also used!).
+     */
+    INDEX("index", 256),
+
+    /**
+     * Analytics service.
+     */
+    ANALYTICS("cbas", 1024);
+
+    private final String identifier;
+
+    private final int minimumQuotaMb;
+
+    CouchbaseService(final String identifier, final int minimumQuotaMb) {
+        this.identifier = identifier;
+        this.minimumQuotaMb = minimumQuotaMb;
+    }
+
+    /**
+     * Returns the internal service identifier.
+     *
+     * @return the internal service identifier.
+     */
+    String getIdentifier() {
+        return identifier;
+    }
+
+    /**
+     * Returns the minimum quota for the service in MB.
+     *
+     * @return the minimum quota in MB.
+     */
+    int getMinimumQuotaMb() {
+        return minimumQuotaMb;
+    }
+
+    /**
+     * Returns true if the service has a quota that needs to be applied.
+     *
+     * @return true if its quota needs to be applied.
+     */
+    boolean hasQuota() {
+        return minimumQuotaMb > 0;
+    }
+
 }

From f257ba3c1f628e01d6fe9612fd6f2dd29f9be521 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:44:24 +0000
Subject: [PATCH 1631/4969] Bump transport from 7.15.2 to 7.16.2 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.15.2 to 7.16.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.2...v7.16.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 7b92dc8279d..3f517353f24 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.15.2"
+    testImplementation "org.elasticsearch.client:transport:7.16.2"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From f8d4f6ad51b7b4aad93b7989de0df0cac4d0700b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:44:29 +0000
Subject: [PATCH 1632/4969] Bump logback-classic from 1.2.7 to 1.2.10 in
 /examples

Bumps logback-classic from 1.2.7 to 1.2.10.

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 051e82f67d7..ff03cee54cc 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 290a4295368..a686fc171c2 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index dfdc749d191..1d6c29b16eb 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20211205'
     testImplementation 'org.postgresql:postgresql:42.3.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testcontainers:postgresql'
 }
 
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 7f81bbf4c57..e1b1f5d639a 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testng:testng:7.4.0'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 5a71ca3d2ff..38b3804b4b8 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 35f7483113f..43d74d16244 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 8685bc3205ea95232f7dfbec67fcafc396b7229b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:44:32 +0000
Subject: [PATCH 1633/4969] Bump aws-java-sdk-logs from 1.12.122 to 1.12.132 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.122 to 1.12.132.
- [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.12.122...1.12.132)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c0075ad198f..ad93e527043 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.131'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.131'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.132'
     testImplementation 'software.amazon.awssdk:s3:2.17.102'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 63a892b357947d4814baa9f6070783003ccdf553 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:44:33 +0000
Subject: [PATCH 1634/4969] Bump org.springframework.boot from 2.6.1 to 2.6.2
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.6.1...v2.6.2)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 242cfcd3810..f79edec4998 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.6.1'
+    id 'org.springframework.boot' version '2.6.2'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index e0028d26b4a..767d6922863 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.6.1"
+    id("org.springframework.boot") version "2.6.2"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.6.0"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index b5ddd11cc84..782f03b561e 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.6.1'
+    id 'org.springframework.boot' version '2.6.2'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 0e8faedaa234d3cefa5af96fa8e20ba5be3a5a79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:44:33 +0000
Subject: [PATCH 1635/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.6.0 to 1.6.10.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index e0028d26b4a..fa951bd3415 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.6.1"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.6.0"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.6.10"
 }
 
 apply plugin: 'io.spring.dependency-management'

From e597f4ab445fad71130e535528d7ef4782c0f38e Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 4 Jan 2022 18:38:13 +0100
Subject: [PATCH 1636/4969] Rollback jedis to 3.0.1 (#4852)

---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index e055f5a52c5..cad4b6b71f3 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.5'
 
-    testImplementation 'redis.clients:jedis:4.0.1'
+    testImplementation 'redis.clients:jedis:3.0.1'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
     testImplementation project(':test-support')

From 3c30a267d1bb678dba13a17c5ccfd53eef4824e7 Mon Sep 17 00:00:00 2001
From: vincz7777 <96777535+vincz7777@users.noreply.github.com>
Date: Wed, 5 Jan 2022 11:24:37 +0100
Subject: [PATCH 1637/4969] Display Ryuk logs when it fails to start (#4842)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Vincent MIJOULE (contractor) <vincent.mijoule@amadeus.com>
Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../utility/ResourceReaper.java               | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 8c1f28378ef..f43835fd01b 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -34,7 +34,6 @@
 import java.net.Socket;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.time.Duration;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -133,10 +132,10 @@ public void onNext(Frame frame) {
                 }
             });
 
-        ContainerState containerState = new ContainerState() {
-
+        InspectContainerResponse inspectedContainer;
+        try {
             // inspect container response might initially not contain the mapped port
-            final InspectContainerResponse inspectedContainer = await()
+            inspectedContainer = await()
                 .atMost(5, TimeUnit.SECONDS)
                 .pollInterval(DynamicPollInterval.ofMillis(50))
                 .pollInSameThread()
@@ -144,14 +143,20 @@ public void onNext(Frame frame) {
                     () -> client.inspectContainerCmd(ryukContainerId).exec(),
                     inspectContainerResponse -> {
                         return inspectContainerResponse
-                        .getNetworkSettings()
-                        .getPorts()
-                        .getBindings()
-                        .values()
-                        .stream()
-                        .anyMatch(Objects::nonNull);
+                            .getNetworkSettings()
+                            .getPorts()
+                            .getBindings()
+                            .values()
+                            .stream()
+                            .anyMatch(Objects::nonNull);
                     }
                 );
+        } catch (Exception e) {
+            log.warn("Ryuk container cannot be inspected and probably had a problem starting. Ryuk's logs:\n{}", ryukLog);
+            throw new IllegalStateException("Ryuk failed to start", e);
+        }
+
+        ContainerState containerState = new ContainerState() {
 
             @Override
             public List<Integer> getExposedPorts() {

From 4fe304ab5128942df4cea708ed859f2e79b2b649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gmail.com>
Date: Wed, 5 Jan 2022 11:54:19 +0100
Subject: [PATCH 1638/4969] Add Gradle Enterprise badge in README (#4850)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9bcf6f002f8..b1c0014c236 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Thundra Foresight](https://thundra-assets-prod.s3.us-west-2.amazonaws.com/images/badges/thundra-foresight-badge-enabled.svg)](https://foresight.thundra.live/testRuns/5a49cc30-f063-11eb-9a03-0242ac130003)
 [![Thundra Foresight Test Results](https://foresight.service.thundra.us/public/api/v1/badge/test/5a49cc30-f063-11eb-9a03-0242ac130003)](https://foresight.thundra.live/testRuns/5a49cc30-f063-11eb-9a03-0242ac130003)
+[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)
 
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 

From ac020bc7ae265ac6f7268c8ae3a054aaf1d84626 Mon Sep 17 00:00:00 2001
From: Piotr Kubowicz <piotr.kubowicz@gmail.com>
Date: Wed, 5 Jan 2022 11:54:44 +0100
Subject: [PATCH 1639/4969] Stop logging about starting when reusing (#4844)

---
 .../java/org/testcontainers/containers/GenericContainer.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index c2387cf5977..69d40a6821b 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -421,12 +421,10 @@ private void tryStart(Instant startedAt) {
             if (!reused) {
                 containerIsCreated(containerId);
 
-                logger().info("Starting container with ID: {}", containerId);
+                logger().info("Container {} is starting: {}", dockerImageName, containerId);
                 dockerClient.startContainerCmd(containerId).exec();
             }
 
-            logger().info("Container {} is starting: {}", dockerImageName, containerId);
-
             // For all registered output consumers, start following as close to container startup as possible
             this.logConsumers.forEach(this::followOutput);
 

From e42a37d615d48cdc60181b4ab634c555898bf988 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 5 Jan 2022 14:46:26 +0100
Subject: [PATCH 1640/4969] Reinstate usage of `READ_ONLY_REMOTE_GRADLE_CACHE`
 to avoid wrong cache hits (#4853)

---
 settings.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index db8f11f14c0..75359bcbf7d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -42,10 +42,10 @@ buildCache {
     local {
         enabled = !isCI
     }
-    remote(HttpBuildCache) { 
-        push = isCI
+    remote(HttpBuildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
         enabled = true
-        url = 'https://ge.testcontainers.org/cache/' 
+        url = 'https://ge.testcontainers.org/cache/'
         credentials {
             username = 'ci'
             password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")

From e70782a01820a12e99b33e1ec701afd107421598 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 5 Jan 2022 18:48:32 +0100
Subject: [PATCH 1641/4969] Increase AzureCI timeout to 120 minutes instead of
 using the default of 60 minutes (#4854)

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 91e33f202a9..53dabc6722b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,7 @@
 jobs:
 
 - job: azure_pipeline_tests
+  timeoutInMinutes: 120
   steps:
 
   # Run all core tests when running the Windows CI tests

From ba3748e3edb51c01f896fa930daadc8eec22e65f Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 5 Jan 2022 19:12:22 +0100
Subject: [PATCH 1642/4969] Add GE remote cache to examples project (#4855)

Als add GE build scans for examples project
---
 examples/settings.gradle | 36 ++++++++++++++++++++++--------------
 settings.gradle          |  8 ++------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 22b279b1573..8641c6134b1 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,11 +7,12 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
     }
 }
 
-apply plugin: 'ch.myniva.s3-build-cache'
 apply plugin: 'com.gradle.enterprise'
+apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
 
 rootProject.name = 'testcontainers-examples'
 
@@ -32,23 +33,30 @@ include 'cucumber'
 include 'spring-boot-kotlin-redis'
 include 'spock'
 
-ext.isMasterBuild = false ||
-    (System.getenv("GITHUB_REF") == "refs/heads/master") ||
-    (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
+ext.isCI = System.getenv("CI") != null
 
 buildCache {
     local {
-        enabled = !isMasterBuild
+        enabled = !isCI
     }
+    remote(HttpBuildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
+        enabled = true
+        url = 'https://ge.testcontainers.org/cache/'
+        credentials {
+            username = 'ci'
+            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+        }
+    }
+}
 
-    remote(ch.myniva.gradle.caching.s3.AwsS3BuildCache) {
-        endpoint = 'fra1.digitaloceanspaces.com'
-        region = 'fra1'
-        bucket = 'testcontainers'
-        path = 'cache'
-        push = isMasterBuild && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
-        headers = [
-            'x-amz-acl': 'public-read'
-        ]
+gradleEnterprise {
+    buildScan {
+        server = "https://ge.testcontainers.org/"
+        publishAlways()
+        publishIfAuthenticated()
+        uploadInBackground = !isCI
+        captureTaskInputFiles = true
     }
+
 }
diff --git a/settings.gradle b/settings.gradle
index 75359bcbf7d..57f18b531b1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,8 +5,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.7.2"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
     }
 }
 
@@ -32,10 +32,6 @@ include ':docs:examples:spock:redis'
 
 include 'test-support'
 
-ext.isMasterBuild = false ||
-    (System.getenv("GITHUB_REF") == "refs/heads/master") ||
-    (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
-
 ext.isCI = System.getenv("CI") != null
 
 buildCache {

From e6caada4f902c171e6db0dc606b4cc2b8ca2fe4e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 6 Jan 2022 15:49:23 +0000
Subject: [PATCH 1643/4969] Tweak logging around reusable mode (#4858)

---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 69d40a6821b..3851cf42fca 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -423,6 +423,8 @@ private void tryStart(Instant startedAt) {
 
                 logger().info("Container {} is starting: {}", dockerImageName, containerId);
                 dockerClient.startContainerCmd(containerId).exec();
+            } else {
+                logger().info("Reusing existing container ({}) and not creating a new one", containerId);
             }
 
             // For all registered output consumers, start following as close to container startup as possible

From 74bea3a37cf259c4b8a1b40da07e06328e4a13ad Mon Sep 17 00:00:00 2001
From: Dan Dobrin <20207377+ddobrin@users.noreply.github.com>
Date: Tue, 11 Jan 2022 05:29:57 -0500
Subject: [PATCH 1644/4969] Update gCloud dependencies (#4857)

Fixes #4856
---
 modules/gcloud/build.gradle                          | 12 ++++++------
 .../containers/BigtableEmulatorContainerTest.java    |  2 +-
 .../containers/DatastoreEmulatorContainerTest.java   |  2 +-
 .../containers/FirestoreEmulatorContainerTest.java   |  2 +-
 .../containers/PubSubEmulatorContainerTest.java      |  2 +-
 .../containers/SpannerEmulatorContainerTest.java     |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 11e68824c34..d20a9edbed0 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:1.102.4'
-    testImplementation 'com.google.cloud:google-cloud-firestore:1.33.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.105.0'
-    testImplementation 'com.google.cloud:google-cloud-spanner:1.50.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:1.17.3'
-    testImplementation 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.2.1'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.9'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.17.3'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.4.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
index 0cc44afcc77..4ba59a75488 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -43,7 +43,7 @@ public class BigtableEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
     // }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index f7b35936197..ba998e402ce 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -17,7 +17,7 @@ public class DatastoreEmulatorContainerTest {
     @Rule
     // creatingDatastoreEmulatorContainer {
     public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
     // }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index 138ff946f6f..04939ecc30e 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -22,7 +22,7 @@ public class FirestoreEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
     // }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index 2e692956418..8db49eb3649 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -35,7 +35,7 @@ public class PubSubEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
     // }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
index f801ca5b547..64b81546499 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
@@ -27,7 +27,7 @@ public class SpannerEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(
-        DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.1.0")
+        DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.4.0")
     );
     // }
 

From d0c4ced72ddca93838c1107b66913b5141872906 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 11 Jan 2022 11:21:06 +0000
Subject: [PATCH 1645/4969] Update dependabot rules for new modules (#4864)

---
 .github/dependabot.yml | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4caa6509af2..355d44f2bb4 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,6 +7,11 @@ updates:
     open-pull-requests-limit: 10
 
 # Explicit entry for each module
+  - package-ecosystem: "gradle"
+    directory: "/modules/azure"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/cassandra"
     schedule:
@@ -17,6 +22,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/cockroachdb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/couchbase"
     schedule:
@@ -27,6 +37,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/db2"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/dynalite"
     schedule:
@@ -37,6 +52,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/gcloud"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/influxdb"
     schedule:
@@ -57,6 +77,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/k3s"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
@@ -77,6 +102,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mongodb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mssqlserver"
     schedule:
@@ -102,21 +132,46 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/orientdb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/postgresql"
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/presto"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/pulsar"
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/r2dbc"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/rabbitmq"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/selenium"
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/solr"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/spock"
     schedule:
@@ -127,6 +182,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/trino"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/vault"
     schedule:

From e681a4f854acde4a7e54fd2c6745714537eaeaa6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:30 +0000
Subject: [PATCH 1646/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/jdbc

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 973bc9b01df..a6f71690e1e 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 8fdae9c304bdfe3bf12ee88fdbc42a220f40ea9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:30 +0000
Subject: [PATCH 1647/4969] Bump jcc from 11.5.0.0 to 11.5.7.0 in /modules/db2

Bumps jcc from 11.5.0.0 to 11.5.7.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 9d5d8a61ab0..0c8cd323779 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.ibm.db2:jcc:11.5.0.0'
+    testImplementation 'com.ibm.db2:jcc:11.5.7.0'
 }

From 954529be0e1b6b8cc81895eac8d67c4358da49cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:31 +0000
Subject: [PATCH 1648/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/database-commons

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 73735b0d03d..7a201d772fb 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From d0a0f21ef89bdf03fb7667fee16aba89c5108559 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:31 +0000
Subject: [PATCH 1649/4969] Bump postgresql from 42.2.12 to 42.3.1 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.3.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.3.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 5222208fae0..ee6a7e2731e 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.2.12'
+    testImplementation 'org.postgresql:postgresql:42.3.1'
 }

From 78754f8ce6fb19054d5a43d46a513619d79b1ad4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:32 +0000
Subject: [PATCH 1650/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.131 to 1.12.137.
- [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.12.131...1.12.137)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index d891ed5b4d9..52881514ac5 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 0c6854077d2e550a21ef023bb8b84930c674e824 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:32 +0000
Subject: [PATCH 1651/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/junit-jupiter

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8344db5aebb..77ff3f842d0 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.2.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'

From 762251dd30f675e0bd4031d5d9bfe15f5232a181 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:34 +0000
Subject: [PATCH 1652/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/kafka

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index b37105f7463..b9157d9d539 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'com.google.guava:guava:23.0'
 }

From f3fed54fe55d672af31806c6327051a26d297c55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:35 +0000
Subject: [PATCH 1653/4969] Bump assertj-core from 3.21.0 to 3.22.0 in /core

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 3ca76eab47a..074273e8fc7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -100,13 +100,13 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.20.2'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.22.0'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 28ada89db26aea589876a514f84b9d7807d47d07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:35 +0000
Subject: [PATCH 1654/4969] Bump google-cloud-firestore from 3.0.9 to 3.0.10 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.0.9 to 3.0.10.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.0.9...v3.0.10)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index d20a9edbed0..f1e473b8c35 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.1'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.9'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.3'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.4.0'

From 18234abf497226469d9cc450b378cc40dc87be1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:38 +0000
Subject: [PATCH 1655/4969] Bump azure-cosmos from 4.16.0 to 4.24.0 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.16.0 to 4.24.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.16.0...azure-cosmos_4.24.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 19d9b3458fd..d3a902cf728 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.15.0'
-    testImplementation 'com.azure:azure-cosmos:4.16.0'
+    testImplementation 'com.azure:azure-cosmos:4.24.0'
 }

From b5f534b09d971d58bda6da47063e524e6ec2faac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:38 +0000
Subject: [PATCH 1656/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/neo4j

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index cdc727921b4..fe99774538c 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.2'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 6a7f32ba11e80a9fa5e2343d758f24a590cc61ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:39 +0000
Subject: [PATCH 1657/4969] Bump pulsar-client-admin from 2.7.3 to 2.7.4 in
 /modules/pulsar

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.7.3...v2.7.4)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 8bdabcd9dc3..7ad057e2e91 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.3'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.3'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.4'
 }

From 6604418e5a956a5eccde8f6609792fe8eecf3576 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:39 +0000
Subject: [PATCH 1658/4969] Bump reactor-core from 3.3.4.RELEASE to 3.4.14 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.3.4.RELEASE to 3.4.14.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.3.4.RELEASE...v3.4.14)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 21d3c1894e4..232714886dc 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.14'
     testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
 }

From ee75985196ec9a483c905724d1bb8411b48ce941 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:40 +0000
Subject: [PATCH 1659/4969] Bump trino-jdbc from 352 to 367 in /modules/trino

Bumps trino-jdbc from 352 to 367.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 5a3b733934f..fb154ba7266 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:352'
+    testImplementation 'io.trino:trino-jdbc:367'
     compileOnly 'org.jetbrains:annotations:20.0.0'
 }

From 0ece0ce0851b72e8c5713611ab045f65e9cc0ec4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:41 +0000
Subject: [PATCH 1660/4969] Bump presto-jdbc from 331 to 350 in /modules/presto

Bumps presto-jdbc from 331 to 350.

---
updated-dependencies:
- dependency-name: io.prestosql:presto-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 1db76199969..2b6955efd8a 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.prestosql:presto-jdbc:331'
+    testImplementation 'io.prestosql:presto-jdbc:350'
     compileOnly 'org.jetbrains:annotations:20.0.0'
 }

From 2d83ea0bb119307d4db5dc764a1e3c66a54c0cb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:41 +0000
Subject: [PATCH 1661/4969] Bump mongodb-driver-sync from 4.0.2 to 4.4.1 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.0.2 to 4.4.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.0.2...r4.4.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index e332badb68b..95919c931d4 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.0.2")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.4.1")
 }

From 0df60341337267cf40e376d18a94997ee7dba682 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:43 +0000
Subject: [PATCH 1662/4969] Bump assertj-core from 3.12.0 to 3.22.0 in
 /modules/orientdb

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.12.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.12.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 5be59938603..820e96e114f 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.0.24"
 
-    testImplementation 'org.assertj:assertj-core:3.12.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.3.4'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.0.18"
 }

From e89b2e650259be9e3ec89c989505c44e3cd25448 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:45 +0000
Subject: [PATCH 1663/4969] Bump assertj-core from 3.14.0 to 3.22.0 in
 /modules/r2dbc

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.14.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.14.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 21d3c1894e4..94867299969 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.14.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
     testImplementation project(':postgresql')
 

From 88cbf80101deaec9a4593c5e42b5d578a2554888 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:45 +0000
Subject: [PATCH 1664/4969] Bump assertj-core from 3.12.2 to 3.22.0 in
 /modules/rabbitmq

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.12.2 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.12.2...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 13638b51b97..de778979f0f 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.7.0'
-    testImplementation 'org.assertj:assertj-core:3.12.2'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     compileOnly 'org.jetbrains:annotations:20.0.0'
 }

From 6db0f46bc762b1d25cce6a0733c3934aa001f416 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:46 +0000
Subject: [PATCH 1665/4969] Bump testng from 7.4.0 to 7.5 in /examples

Bumps [testng](https://github.com/cbeust/testng) from 7.4.0 to 7.5.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/compare/7.4.0...7.5)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index e1b1f5d639a..2046da278f2 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'
-    testImplementation 'org.testng:testng:7.4.0'
+    testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
 

From 8f545a1362d3d9cefdc9b1884f20ce2c2897ae7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:46 +0000
Subject: [PATCH 1666/4969] Bump google-cloud-spanner from 6.17.3 to 6.17.4 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.17.3 to 6.17.4.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.17.3...v6.17.4)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index d20a9edbed0..b9828fb1871 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.1'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.9'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.0'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.17.3'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.4.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 9e755a161546946d823d6be3bdbf0e5b565be387 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:46 +0000
Subject: [PATCH 1667/4969] Bump pulsar-client from 2.7.3 to 2.7.4 in
 /modules/pulsar

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.7.3...v2.7.4)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 8bdabcd9dc3..cb03e560730 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.3'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.4'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.3'
 }

From 1bcccbcd8a8f3afb8346f987ca5004b3e16ef09e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:21:48 +0000
Subject: [PATCH 1668/4969] Bump aws-java-sdk-s3 from 1.12.131 to 1.12.137 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.131 to 1.12.137.
- [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.12.131...1.12.137)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index ad93e527043..900fbfed541 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.131'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.137'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.131'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.132'
     testImplementation 'software.amazon.awssdk:s3:2.17.102'

From 32fbe075ac3f1e63daa2d3ad34c6eb57d3f134a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:23:00 +0000
Subject: [PATCH 1669/4969] Bump solr-solrj from 8.3.0 to 8.11.1 in
 /modules/solr

Bumps solr-solrj from 8.3.0 to 8.11.1.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 76535a2b7c8..b3dfc9b3f92 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Solr"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation 'org.apache.solr:solr-solrj:8.3.0'
+    testImplementation 'org.apache.solr:solr-solrj:8.11.1'
 
 }

From 65b73bbd348bf9a2a61eea68cb599d1da4c37c33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:23:29 +0000
Subject: [PATCH 1670/4969] Bump s3 from 2.17.102 to 2.17.108 in
 /modules/localstack

Bumps s3 from 2.17.102 to 2.17.108.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ad93e527043..4e5371b7bc6 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.131'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.132'
-    testImplementation 'software.amazon.awssdk:s3:2.17.102'
+    testImplementation 'software.amazon.awssdk:s3:2.17.108'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From a282f4185a00b8cd516d5dad32cbccd9e4b2d009 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:23:53 +0000
Subject: [PATCH 1671/4969] Bump auto-service from 1.0-rc6 to 1.0.1 in
 /modules/r2dbc

Bumps [auto-service](https://github.com/google/auto) from 1.0-rc6 to 1.0.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/commits/auto-common-1.0.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 21d3c1894e4..e7011b1d32c 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -5,7 +5,7 @@ plugins {
 description = "Testcontainers :: R2DBC"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
     compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
 
     api project(':testcontainers')

From 510a97507f242f6a23bad1b757c55d02c0b6f8f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:24:46 +0000
Subject: [PATCH 1672/4969] Bump cucumber-junit from 7.1.0 to 7.2.2 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.1.0 to 7.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/v7.1.0...v7.2.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 edb62670134..3f37cbf45e4 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:7.1.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.1.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.2.2'
     testImplementation 'org.testcontainers:selenium'
 }

From 9cc0b82b5df8ff5f63db5435b784de5205c61598 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:23 +0000
Subject: [PATCH 1673/4969] Bump assertj-core from 3.15.0 to 3.22.0 in
 /modules/azure

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.15.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.15.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index d3a902cf728..1dbad6a6698 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Azure"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'com.azure:azure-cosmos:4.24.0'
 }

From 9cefa10a9c83bfebcb6ae95bd065396fc9190327 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:30 +0000
Subject: [PATCH 1674/4969] Bump google-cloud-datastore from 2.2.1 to 2.2.2 in
 /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 72041c6d14b..ab2966c3051 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.2.1'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.2.2'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'

From 740479210f0fe0a7a7cfc6eb35f2e29df7ceb158 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:36 +0000
Subject: [PATCH 1675/4969] Bump annotations from 20.0.0 to 23.0.0 in
 /modules/presto

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 2b6955efd8a..fe0064bf199 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 6c015557bf939b030277bf3107928e77dc7c9161 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:41 +0000
Subject: [PATCH 1676/4969] Bump amqp-client from 5.7.0 to 5.14.0 in
 /modules/rabbitmq

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.7.0 to 5.14.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.7.0...v5.14.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index de778979f0f..005fcf3d97c 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.7.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     compileOnly 'org.jetbrains:annotations:20.0.0'
 }

From 45eae3ef861e1a00cd12259d59dc97becf09953f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:41 +0000
Subject: [PATCH 1677/4969] Bump google-cloud-bigtable from 2.4.0 to 2.5.1 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.4.0...v2.5.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 72041c6d14b..16f2b6e4fc2 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.4.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.1'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 957ee23957ee93412d5d398d3a0e5458f069cf1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:41 +0000
Subject: [PATCH 1678/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/vault

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 4fdb274f999..8aa0a2d689e 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:4.4.0'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 
 }

From 1378f53c4a498c790e2b5df942b94759ee6b7ab6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:43 +0000
Subject: [PATCH 1679/4969] Bump annotations from 20.0.0 to 23.0.0 in
 /modules/rabbitmq

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index de778979f0f..613ef37808f 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.7.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From fcd3892afaa56d6c30d4607d98973b29968b3869 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:43 +0000
Subject: [PATCH 1680/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/pulsar

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 95b373eb5ef..cf11a36b411 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.4'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.22.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.4'
 }

From aae6a044a1025662ea300ff913ee7f59cbfbf86b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:44 +0000
Subject: [PATCH 1681/4969] Bump google-cloud-pubsub from 1.115.0 to 1.115.1 in
 /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.115.0 to 1.115.1.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.115.0...v1.115.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 72041c6d14b..0a6b351e8a0 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.1'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.10'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.0'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.4.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'

From 6db619e8abf6b1bc4f450c3c311f75da2201496d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:48 +0000
Subject: [PATCH 1682/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /examples

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index a686fc171c2..3f28ca4ca9c 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'
 }

From 0a9122295062fd9634ea101e8bc848b704a5b0d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:18:54 +0000
Subject: [PATCH 1683/4969] Bump annotations from 20.0.0 to 23.0.0 in
 /modules/trino

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 23.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...23.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index fb154ba7266..f9223c174a5 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.trino:trino-jdbc:367'
-    compileOnly 'org.jetbrains:annotations:20.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 5d45556f02206678f3367c6fd6debc765d2160b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:19:06 +0000
Subject: [PATCH 1684/4969] Bump cucumber-java from 7.1.0 to 7.2.2 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.1.0 to 7.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/v7.1.0...v7.2.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 3f37cbf45e4..b018d3df5fc 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:7.1.0'
+    testImplementation 'io.cucumber:cucumber-java:7.2.2'
     testImplementation 'io.cucumber:cucumber-junit:7.2.2'
     testImplementation 'org.testcontainers:selenium'
 }

From d59b9e6eaa8979717672b385dd34da6381f02049 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:19:10 +0000
Subject: [PATCH 1685/4969] Bump aws-java-sdk-sqs from 1.12.131 to 1.12.139 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.131 to 1.12.139.
- [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.12.131...1.12.139)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9ae7a3536b3..0e0ee5c7323 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.131'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.139'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.132'
     testImplementation 'software.amazon.awssdk:s3:2.17.108'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 8526f53bd74d771d7896fcfa87194ebf7dde9b5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:19:22 +0000
Subject: [PATCH 1686/4969] Bump r2dbc-postgresql in /modules/r2dbc

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.1.RELEASE to 0.8.11.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.11.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.1.RELEASE...v0.8.11.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 7844671959c..74ab1c9f7f0 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.1.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.4.14'

From f305f8ec61fc0645c632641f72e3fa9a653df42b Mon Sep 17 00:00:00 2001
From: Anna Chernyshova <anna@atomicjar.com>
Date: Thu, 13 Jan 2022 13:11:26 +0300
Subject: [PATCH 1687/4969] Update BrowserWebDriverContainer to add Selenium 4
 support, drop Selenium 2 support (#4914)

Fixes #4593


Co-authored-by: Tobias Stadler <ts.stadler@gmx.de>
---
 docs/modules/webdriver_containers.md          |  2 +-
 .../containers/BrowserWebDriverContainer.java | 54 +++++++++----------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index 34d3430830c..3c6b0ffae27 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -5,7 +5,7 @@ from SeleniumHQ's [docker-selenium](https://github.com/SeleniumHQ/docker-seleniu
 
 ## Benefits
 
-* Fully compatible with Selenium 2/Webdriver tests, by providing a `RemoteWebDriver` instance
+* Fully compatible with Selenium 3 & 4 tests, by providing a `RemoteWebDriver` instance
 * No need to have specific web browsers, or even a desktop environment, installed on test servers. The only dependency
   is a working Docker installation and your Java JUnit test suite.
 * Browsers are always launched from a fixed, clean image. This means no configuration drift from user changes or
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 7bc37e4701c..bd38dead8ac 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -35,6 +35,7 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -44,13 +45,15 @@
  */
 public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>> extends GenericContainer<SELF> implements LinkableContainer, TestLifecycleAware {
 
-    private static final DockerImageName CHROME_IMAGE = DockerImageName.parse("selenium/standalone-chrome-debug");
-    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox-debug");
+    private static final DockerImageName CHROME_IMAGE = DockerImageName.parse("selenium/standalone-chrome");
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox");
+    private static final DockerImageName CHROME_DEBUG_IMAGE = DockerImageName.parse("selenium/standalone-chrome-debug");
+    private static final DockerImageName FIREFOX_DEBUG_IMAGE = DockerImageName.parse("selenium/standalone-firefox-debug");
     private static final DockerImageName[] COMPATIBLE_IMAGES = new DockerImageName[] {
         CHROME_IMAGE,
         FIREFOX_IMAGE,
-        DockerImageName.parse("selenium/standalone-chrome"),
-        DockerImageName.parse("selenium/standalone-firefox")
+        CHROME_DEBUG_IMAGE,
+        FIREFOX_DEBUG_IMAGE
     };
 
     private static final String DEFAULT_PASSWORD = "secret";
@@ -156,23 +159,6 @@ protected void configure() {
 
         String seleniumVersion = SeleniumUtils.determineClasspathSeleniumVersion();
 
-        if (capabilities == null) {
-            if (seleniumVersion.startsWith("2.")) {
-                logger().info("No capabilities provided, falling back to DesiredCapabilities.chrome()");
-                capabilities = DesiredCapabilities.chrome();
-            } else {
-                logger().info("No capabilities provided, falling back to ChromeOptions");
-                capabilities = new ChromeOptions();
-            }
-        }
-
-        // Hack for new selenium-chrome image that contains Chrome 92.
-        // If not disabled, container startup will fail in most cases and consume excessive amounts of CPU.
-        if (capabilities instanceof ChromeOptions) {
-            ChromeOptions options = (ChromeOptions) this.capabilities;
-            options.addArguments("--disable-gpu");
-        }
-
         if (recordingMode != VncRecordingMode.SKIP) {
 
             if (vncRecordingDirectory == null) {
@@ -244,12 +230,14 @@ public static String getDockerImageForCapabilities(Capabilities capabilities, St
     }
 
     private static DockerImageName getStandardImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
-        String browserName = capabilities.getBrowserName();
+        String browserName = capabilities == null ? BrowserType.CHROME : capabilities.getBrowserName();
+        boolean supportsVncWithoutDebugImage = new ComparableVersion(seleniumVersion).isGreaterThanOrEqualTo("4");
+
         switch (browserName) {
             case BrowserType.CHROME:
-                return CHROME_IMAGE.withTag(seleniumVersion);
+                return (supportsVncWithoutDebugImage ? CHROME_IMAGE : CHROME_DEBUG_IMAGE).withTag(seleniumVersion);
             case BrowserType.FIREFOX:
-                return FIREFOX_IMAGE.withTag(seleniumVersion);
+                return (supportsVncWithoutDebugImage ? FIREFOX_IMAGE : FIREFOX_DEBUG_IMAGE).withTag(seleniumVersion);
             default:
                 throw new UnsupportedOperationException("Browser name must be 'chrome' or 'firefox'; provided '" + browserName + "' is not supported");
         }
@@ -280,10 +268,6 @@ public int getPort() {
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        driver = Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS,
-                () -> Timeouts.getWithTimeout(10, TimeUnit.SECONDS,
-                        () -> new RemoteWebDriver(getSeleniumAddress(), capabilities)));
-
         if (vncRecordingContainer != null) {
             LOGGER.debug("Starting VNC recording");
             vncRecordingContainer.start();
@@ -298,7 +282,19 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
      *
      * @return a new Remote Web Driver instance
      */
-    public RemoteWebDriver getWebDriver() {
+    public synchronized RemoteWebDriver getWebDriver() {
+        if (driver == null) {
+            if (capabilities == null) {
+                logger().warn("No capabilities provided - this will cause an exception in future versions. Falling back to ChromeOptions");
+                capabilities = new ChromeOptions();
+            }
+
+            driver = Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS, () -> {
+                return Timeouts.getWithTimeout(10, TimeUnit.SECONDS, () -> {
+                    return new RemoteWebDriver(getSeleniumAddress(), capabilities);
+                });
+            });
+        }
         return driver;
     }
 

From 74173e51e0981bf3a5ea3fc617f385b4fedb6528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 13:03:38 +0000
Subject: [PATCH 1688/4969] Bump aws-java-sdk-logs from 1.12.132 to 1.12.139 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.132 to 1.12.139.
- [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.12.132...1.12.139)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 0e0ee5c7323..7bfec27ccaf 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.139'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.132'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.139'
     testImplementation 'software.amazon.awssdk:s3:2.17.108'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 3a16a794162064effec0e805d7d34342c63f65ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 13:03:39 +0000
Subject: [PATCH 1689/4969] Bump r2dbc-postgresql in /modules/postgresql

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.8.RELEASE to 0.8.11.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.11.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.8.RELEASE...v0.8.11.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/postgresql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index c38b9bc4fc2..a8a6495bfc1 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,14 +7,14 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.8.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
     testImplementation 'org.postgresql:postgresql:42.3.1'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 8186795449a3b32108e663e3208406b38fc61d7e Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 13 Jan 2022 15:27:22 +0000
Subject: [PATCH 1690/4969] Basic K3S module (#4582)

---
 docs/modules/k3s.md                           | 53 +++++++++++++++
 mkdocs.yml                                    |  1 +
 modules/k3s/build.gradle                      | 11 ++++
 .../org/testcontainers/k3s/K3sContainer.java  | 64 +++++++++++++++++++
 .../k3s/Fabric8K3sContainerTest.java          | 43 +++++++++++++
 .../k3s/OfficialClientK3sContainerTest.java   | 43 +++++++++++++
 .../k3s/src/test/resources/logback-test.xml   | 16 +++++
 7 files changed, 231 insertions(+)
 create mode 100644 docs/modules/k3s.md
 create mode 100644 modules/k3s/build.gradle
 create mode 100644 modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
 create mode 100644 modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
 create mode 100644 modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
 create mode 100644 modules/k3s/src/test/resources/logback-test.xml

diff --git a/docs/modules/k3s.md b/docs/modules/k3s.md
new file mode 100644
index 00000000000..a3c2c0fa754
--- /dev/null
+++ b/docs/modules/k3s.md
@@ -0,0 +1,53 @@
+# K3s Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+Testcontainers module for Rancher's [K3s](https://rancher.com/products/k3s/) lightweight Kubernetes.
+This module is intended to be used for testing components that interact with Kubernetes APIs - for example, operators.
+
+## Usage example
+
+Start a K3s server as follows:
+
+<!--codeinclude-->
+[Starting a K3S server](../../modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java) inside_block:starting_k3s
+<!--/codeinclude-->
+
+### Connecting to the server
+
+`K3sContainer` exposes a working Kubernetes client configuration, as a YAML String, via the `getKubeConfigYaml()` method.
+
+This may be used with Kubernetes clients - e.g. for the [official Java client](connecting_with_k8sio) and 
+[the Fabric8 Kubernetes client](https://github.com/fabric8io/kubernetes-client):
+
+<!--codeinclude-->
+[Official Java client](../../modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java) inside_block:connecting_with_k8sio
+[Fabric8 Kubernetes client](../../modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java) inside_block:connecting_with_fabric8
+<!--/codeinclude-->
+
+## Known limitations
+
+!!! warning
+    * K3sContainer runs as a privileged container and needs to be able to spawn its own containers. For these reasons,
+    K3sContainer will not work in certain rootless Docker, Docker-in-Docker, or other environments where privileged
+    containers are disallowed.
+
+    * k3s containers may be unable to run on host machines where `/var/lib/docker` is on a BTRFS filesystem. See [k3s-io/k3s#4863](https://github.com/k3s-io/k3s/issues/4863) for an example.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testImplementation "org.testcontainers:k3s:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>k3s</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index be30f26a964..827ef6a836d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -65,6 +65,7 @@ nav:
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/gcloud.md
+          - modules/k3s.md
           - modules/kafka.md
           - modules/localstack.md
           - modules/mockserver.md
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
new file mode 100644
index 00000000000..85ee36652b3
--- /dev/null
+++ b/modules/k3s/build.gradle
@@ -0,0 +1,11 @@
+description = "Testcontainers :: K3S"
+
+dependencies {
+    api project(":testcontainers")
+
+    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
+
+    testImplementation 'io.fabric8:kubernetes-client:5.11.0'
+    testImplementation 'io.kubernetes:client-java:14.0.0'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
+}
diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
new file mode 100644
index 00000000000..1080563226a
--- /dev/null
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -0,0 +1,64 @@
+package org.testcontainers.k3s;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.SneakyThrows;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class K3sContainer extends GenericContainer<K3sContainer> {
+
+    private String kubeConfigYaml;
+
+    public K3sContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DockerImageName.parse("rancher/k3s"));
+
+        addExposedPorts(6443, 8443);
+        setPrivilegedMode(true);
+        addFileSystemBind("/sys/fs/cgroup", "/sys/fs/cgroup", BindMode.READ_WRITE);
+
+        Map<String, String> tmpFsMapping = new HashMap<>();
+        tmpFsMapping.put("/run", "");
+        tmpFsMapping.put("/var/run", "");
+        setTmpFsMapping(tmpFsMapping);
+
+        setCommand(
+            "server",
+            "--no-deploy=traefik",
+            "--tls-san=" + this.getHost()
+        );
+        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
+    }
+
+    @SneakyThrows
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
+
+        ObjectNode rawKubeConfig = copyFileFromContainer(
+            "/etc/rancher/k3s/k3s.yaml",
+            is -> objectMapper.readValue(is, ObjectNode.class)
+        );
+
+        ObjectNode clusterConfig = rawKubeConfig.at("/clusters/0/cluster").require();
+        clusterConfig.replace("server", new TextNode("https://" + this.getHost() + ":" + this.getMappedPort(6443)));
+
+        rawKubeConfig.set("current-context", new TextNode("default"));
+
+        kubeConfigYaml = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rawKubeConfig);
+    }
+
+    public String getKubeConfigYaml() {
+        return kubeConfigYaml;
+    }
+}
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
new file mode 100644
index 00000000000..8e7b601c5b0
--- /dev/null
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
@@ -0,0 +1,43 @@
+package org.testcontainers.k3s;
+
+import io.fabric8.kubernetes.api.model.Node;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.List;
+
+@Slf4j
+public class Fabric8K3sContainerTest {
+
+    @Test
+    public void shouldStartAndHaveListableNode() {
+        try (
+            // starting_k3s {
+            K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
+                .withLogConsumer(new Slf4jLogConsumer(log))
+            // }
+        ) {
+            k3s.start();
+
+            // connecting_with_fabric8 {
+            // obtain a kubeconfig file which allows us to connect to k3s
+            String kubeConfigYaml = k3s.getKubeConfigYaml();
+
+            // requires io.fabric8:kubernetes-client:5.11.0 or higher
+            Config config = Config.fromKubeconfig(kubeConfigYaml);
+
+            DefaultKubernetesClient client = new DefaultKubernetesClient(config);
+
+            // interact with the running K3s server, e.g.:
+            List<Node> nodes = client.nodes().list().getItems();
+            // }
+
+            Assertions.assertThat(nodes).hasSize(1);
+        }
+    }
+}
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
new file mode 100644
index 00000000000..970e2390457
--- /dev/null
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
@@ -0,0 +1,43 @@
+package org.testcontainers.k3s;
+
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.ApiException;
+import io.kubernetes.client.openapi.apis.CoreV1Api;
+import io.kubernetes.client.openapi.models.V1NodeList;
+import io.kubernetes.client.util.Config;
+import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+@Slf4j
+public class OfficialClientK3sContainerTest {
+
+    @Test
+    public void shouldStartAndHaveListableNode() throws IOException, ApiException {
+        try (
+            // starting_k3s {
+            K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
+                .withLogConsumer(new Slf4jLogConsumer(log))
+            // }
+        ) {
+            k3s.start();
+
+            // connecting_with_k8sio {
+            String kubeConfigYaml = k3s.getKubeConfigYaml();
+
+            ApiClient client = Config.fromConfig(new StringReader(kubeConfigYaml));
+            CoreV1Api api = new CoreV1Api(client);
+
+            // interact with the running K3s server, e.g.:
+            V1NodeList nodes = api.listNode(null, null, null, null, null, null, null, null, null, null);
+            // }
+
+            Assertions.assertThat(nodes.getItems()).hasSize(1);
+        }
+    }
+}
diff --git a/modules/k3s/src/test/resources/logback-test.xml b/modules/k3s/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/k3s/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>

From af7cec02ea6b658dfcb61f50da0ef5dbe08cacaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gradle.com>
Date: Mon, 17 Jan 2022 10:58:06 +0100
Subject: [PATCH 1691/4969] Bump up Gradle Enterprise plugin dependencies
 (#4926)

---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 8641c6134b1..f58ea83fb9b 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 57f18b531b1..e4c65186fb8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
     }
 }

From f7dcfa8593625a490017135698ff6dbb1d794f6b Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 17 Jan 2022 14:34:28 +0100
Subject: [PATCH 1692/4969] Use jackson 2.8.8 in k3s module (#4928)

To ensure same jackson version across TC core and modules, this commit manually aligns them.
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 85ee36652b3..95d2d3bc97c 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: K3S"
 dependencies {
     api project(":testcontainers")
 
-    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
+    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:5.11.0'
     testImplementation 'io.kubernetes:client-java:14.0.0'

From 19b58cdb7b8d2ca56c13743527bb0c674676b60d Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 17 Jan 2022 17:47:16 +0100
Subject: [PATCH 1693/4969] Use 2.8.8 compatible Jackson API (#4930)

---
 .../src/main/java/org/testcontainers/k3s/K3sContainer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index 1080563226a..800d80c67e1 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -50,7 +50,12 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
             is -> objectMapper.readValue(is, ObjectNode.class)
         );
 
-        ObjectNode clusterConfig = rawKubeConfig.at("/clusters/0/cluster").require();
+        JsonNode clusterNode = rawKubeConfig.at("/clusters/0/cluster");
+        if (!clusterNode.isObject()) {
+            throw new IllegalStateException("'/clusters/0/cluster' expected to be an object");
+        }
+        ObjectNode clusterConfig = (ObjectNode) clusterNode;
+
         clusterConfig.replace("server", new TextNode("https://" + this.getHost() + ":" + this.getMappedPort(6443)));
 
         rawKubeConfig.set("current-context", new TextNode("default"));

From 04937b52434edfac91bfbcfb672621d68c327891 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 17 Jan 2022 18:24:31 +0100
Subject: [PATCH 1694/4969] Replace jcenter with mavenCentral in all examples
 (#4931)

---
 examples/build.gradle                           | 2 +-
 examples/cucumber/build.gradle                  | 2 +-
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/mongodb-container/build.gradle         | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/selenium-container/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/solr-container/build.gradle            | 2 +-
 examples/spring-boot/build.gradle               | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/build.gradle b/examples/build.gradle
index 83e196dac00..d340e297d33 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -5,6 +5,6 @@ subprojects {
     apply plugin:"java"
 
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index b018d3df5fc..4f462ed4740 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index ff03cee54cc..1639a091e91 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 3f28ca4ca9c..6351be31488 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 1d6c29b16eb..5ca68b2c514 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
index 23f193115ba..1ae43055790 100644
--- a/examples/mongodb-container/build.gradle
+++ b/examples/mongodb-container/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 2046da278f2..c60d5f08cf4 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 38b3804b4b8..dff9ae7024f 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index f79edec4998..495c279937a 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -5,7 +5,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 43d74d16244..a56f269fa40 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index c0c69300377..cec4f59625b 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 782f03b561e..09b82c34ea7 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -5,7 +5,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {

From 34cfdc8e3fa86852a05131eb7f48b86966864c0a Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Tue, 18 Jan 2022 13:12:32 +0000
Subject: [PATCH 1695/4969] Fix k3s for latest Docker for Mac (cgroupsv2)
 (#4937)

---
 .../org/testcontainers/k3s/K3sContainer.java  |  6 +++
 .../k3s/Fabric8K3sContainerTest.java          | 42 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index 800d80c67e1..511b309e0d5 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.DockerObjectAccessor;
 import lombok.SneakyThrows;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
@@ -25,6 +26,11 @@ public K3sContainer(DockerImageName dockerImageName) {
 
         addExposedPorts(6443, 8443);
         setPrivilegedMode(true);
+        withCreateContainerCmdModifier(it -> {
+            DockerObjectAccessor.overrideRawValue(
+                it.getHostConfig(), "CgroupnsMode", "host"
+            );
+        });
         addFileSystemBind("/sys/fs/cgroup", "/sys/fs/cgroup", BindMode.READ_WRITE);
 
         Map<String, String> tmpFsMapping = new HashMap<>();
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
index 8e7b601c5b0..8b31c299634 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
@@ -1,15 +1,27 @@
 package org.testcontainers.k3s;
 
+import io.fabric8.kubernetes.api.model.ContainerBuilder;
+import io.fabric8.kubernetes.api.model.ContainerPortBuilder;
 import io.fabric8.kubernetes.api.model.Node;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
+import io.fabric8.kubernetes.api.model.PodSpec;
+import io.fabric8.kubernetes.api.model.PodSpecBuilder;
+import io.fabric8.kubernetes.api.model.ProbeBuilder;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.dsl.PodResource;
+import io.fabric8.kubernetes.client.dsl.Readiable;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.Assertions;
+import org.assertj.core.api.Condition;
 import org.junit.Test;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 public class Fabric8K3sContainerTest {
@@ -38,6 +50,36 @@ public void shouldStartAndHaveListableNode() {
             // }
 
             Assertions.assertThat(nodes).hasSize(1);
+
+            // verify that we can start a pod
+            Pod helloworld = dummyStartablePod();
+            client.pods().create(helloworld);
+            client.pods().inNamespace("default").withName("helloworld").waitUntilReady(30, TimeUnit.SECONDS);
+
+            Assertions.assertThat(client.pods().inNamespace("default").withName("helloworld"))
+                .extracting(Readiable::isReady)
+                .isEqualTo(true);
         }
     }
+
+    private Pod dummyStartablePod() {
+        PodSpec podSpec = new PodSpecBuilder()
+            .withContainers(
+                new ContainerBuilder()
+                    .withName("helloworld")
+                    .withImage("testcontainers/helloworld:1.1.0")
+                    .withPorts(new ContainerPortBuilder().withContainerPort(8080).build())
+                    .withReadinessProbe(new ProbeBuilder().withNewTcpSocket().withNewPort(8080).endTcpSocket().build())
+                    .build()
+            )
+            .build();
+
+        return new PodBuilder()
+            .withNewMetadata()
+            .withName("helloworld")
+            .withNamespace("default")
+            .endMetadata()
+            .withSpec(podSpec)
+            .build();
+    }
 }

From 5fe437f0e7ef18d735ab31245d81aed710690778 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 19 Jan 2022 13:09:34 +0100
Subject: [PATCH 1696/4969] Use JDK 1.8 in Azure pipelines (#4942)

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 53dabc6722b..0f01bb7bcd2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,7 +13,7 @@ jobs:
       AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
     inputs:
         gradleWrapperFile: 'gradlew'
-        jdkVersionOption: '1.11'
+        jdkVersionOption: '1.8'
         options: '--no-daemon --continue'
         tasks: 'clean testcontainers:check'
         publishJUnitResults: true
@@ -28,7 +28,7 @@ jobs:
       AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
     inputs:
         gradleWrapperFile: 'gradlew'
-        jdkVersionOption: '1.11'
+        jdkVersionOption: '1.8'
         options: '--no-daemon --continue'
         tasks: 'clean check -x testcontainers:test'
         publishJUnitResults: true

From e50ae1da134eb9ab986e068ba820eaa7fbd98dc0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <marc@gradle.com>
Date: Wed, 19 Jan 2022 16:51:41 +0100
Subject: [PATCH 1697/4969] Simplify dependency management for JUnit Jupiter
 (#4704)

By using the junit-jupiter aggregator artifact.
---
 docs/quickstart/junit_5_quickstart.md | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
index eb43bf05797..b50272cb68d 100644
--- a/docs/quickstart/junit_5_quickstart.md
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -22,10 +22,7 @@ Let's start from here, and see how to improve the test with Testcontainers:
 First, add Testcontainers as a dependency as follows:
 
 ```groovy tab='Gradle'
-def junitJupiterVersion = '5.4.2'
-testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-testImplementation "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
-testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
 testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
 testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
 ```
@@ -33,20 +30,8 @@ testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
 ```xml tab='Maven'
 <dependency>
     <groupId>org.junit.jupiter</groupId>
-    <artifactId>junit-jupiter-api</artifactId>
-    <version>5.4.2</version>
-    <scope>test</scope>
-</dependency>
-<dependency>
-    <groupId>org.junit.jupiter</groupId>
-    <artifactId>junit-jupiter-params</artifactId>
-    <version>5.4.2</version>
-    <scope>test</scope>
-</dependency>
-<dependency>
-    <groupId>org.junit.jupiter</groupId>
-    <artifactId>junit-jupiter-engine</artifactId>
-    <version>5.4.2</version>
+    <artifactId>junit-jupiter</artifactId>
+    <version>5.8.1</version>
     <scope>test</scope>
 </dependency>
 <dependency>

From f9538d16b7f636420cc269ce15fd6b5742be278c Mon Sep 17 00:00:00 2001
From: Alex Stockinger <alex@atomicjar.com>
Date: Mon, 24 Jan 2022 11:16:32 +0100
Subject: [PATCH 1698/4969] Remove some dead code from PostgreSQLContainer
 (#4948)

---
 .../java/org/testcontainers/containers/PostgreSQLContainer.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 2b905bd3d37..3bfb508aa47 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -32,8 +32,6 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
 
     private static final String FSYNC_OFF_OPTION = "fsync=off";
 
-    private static final String QUERY_PARAM_SEPARATOR = "&";
-
     /**
      * @deprecated use {@link #PostgreSQLContainer(DockerImageName)} or {@link #PostgreSQLContainer(String)} instead
      */

From 639fe41a3ca71bf4b2401b82922bb8f20e2cf41d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 28 Jan 2022 12:32:54 +0100
Subject: [PATCH 1699/4969] Update docs version to 1.16.3 (#4932)

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 827ef6a836d..694fca299ca 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -98,4 +98,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.16.2
+    latest_version: 1.16.3

From 242dfde521020ea803a37941b6d043d6bafb56d1 Mon Sep 17 00:00:00 2001
From: Tayeb Chlyah <tayebchlyah@gmail.com>
Date: Mon, 31 Jan 2022 09:31:17 +0100
Subject: [PATCH 1700/4969] [Couchbase] Add support for Eventing service
 (#4953)

---
 .../couchbase/CouchbaseContainer.java         | 43 +++++++++++++++++--
 .../couchbase/CouchbaseService.java           |  7 ++-
 .../couchbase/CouchbaseContainerTest.java     | 18 +++++++-
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 5007a8d5ccf..c2becc68fc3 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -74,6 +74,10 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private static final int ANALYTICS_SSL_PORT = 18095;
 
+    private static final int EVENTING_PORT = 8096;
+
+    private static final int EVENTING_SSL_PORT = 18096;
+
     private static final int KV_PORT = 11210;
 
     private static final int KV_SSL_PORT = 11207;
@@ -196,6 +200,17 @@ public CouchbaseContainer withAnalyticsService() {
         return this;
     }
 
+    /**
+     * Enables the eventing service which is not enabled by default.
+     *
+     * @return this {@link CouchbaseContainer} for chaining purposes.
+     */
+    public CouchbaseContainer withEventingService() {
+        checkNotRunning();
+        this.enabledServices.add(CouchbaseService.EVENTING);
+        return this;
+    }
+
     public final String getUsername() {
         return username;
     }
@@ -232,7 +247,9 @@ protected void configure() {
             ANALYTICS_PORT,
             ANALYTICS_SSL_PORT,
             KV_PORT,
-            KV_SSL_PORT
+            KV_SSL_PORT,
+            EVENTING_PORT,
+            EVENTING_SSL_PORT
         );
 
         WaitAllStrategy waitStrategy = new WaitAllStrategy();
@@ -278,6 +295,16 @@ protected void configure() {
             );
         }
 
+        if (enabledServices.contains(CouchbaseService.EVENTING)) {
+            waitStrategy = waitStrategy.withStrategy(
+                new HttpWaitStrategy()
+                    .forPath("/api/v1/config")
+                    .forPort(EVENTING_PORT)
+                    .withBasicCredentials(username, password)
+                    .forStatusCode(200)
+            );
+        }
+
         waitingFor(waitStrategy);
     }
 
@@ -328,8 +355,13 @@ private void initializeIsEnterprise() {
             throw new IllegalStateException("Couchbase /pools did not return valid JSON");
         }
 
-        if (!isEnterprise && enabledServices.contains(CouchbaseService.ANALYTICS)) {
-            throw new IllegalStateException("The Analytics Service is only supported with the Enterprise version");
+        if (!isEnterprise) {
+            if (enabledServices.contains(CouchbaseService.ANALYTICS)) {
+                throw new IllegalStateException("The Analytics Service is only supported with the Enterprise version");
+            }
+            if (enabledServices.contains(CouchbaseService.EVENTING)) {
+                throw new IllegalStateException("The Eventing Service is only supported with the Enterprise version");
+            }
         }
     }
 
@@ -452,6 +484,11 @@ private void configureExternalPorts() {
             builder.add("cbasSSL", Integer.toString(getMappedPort(ANALYTICS_SSL_PORT)));
         }
 
+        if (enabledServices.contains(CouchbaseService.EVENTING)) {
+            builder.add("eventingAdminPort", Integer.toString(getMappedPort(EVENTING_PORT)));
+            builder.add("eventingSSL", Integer.toString(getMappedPort(EVENTING_SSL_PORT)));
+        }
+
         @Cleanup Response response = doHttpRequest(
             MGMT_PORT,
             "/node/controller/setupAlternateAddresses/external",
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
index a314bd5ccfc..ffb0c9f7f1f 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
@@ -46,7 +46,12 @@ public enum CouchbaseService {
     /**
      * Analytics service.
      */
-    ANALYTICS("cbas", 1024);
+    ANALYTICS("cbas", 1024),
+
+    /**
+     * Eventing service.
+     */
+    EVENTING("eventing", 256);
 
     private final String identifier;
 
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 5d2d7d9402a..c91f3f12d7c 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -35,9 +35,9 @@
 public class CouchbaseContainerTest {
 
     private static final DockerImageName COUCHBASE_IMAGE_ENTERPRISE =
-        DockerImageName.parse("couchbase/server:enterprise-6.6.2");
+        DockerImageName.parse("couchbase/server:enterprise-7.0.3");
     private static final DockerImageName COUCHBASE_IMAGE_COMMUNITY =
-        DockerImageName.parse("couchbase/server:community-6.6.0");
+        DockerImageName.parse("couchbase/server:community-7.0.2");
 
     @Test
     public void testBasicContainerUsageForEnterpriseContainer() {
@@ -127,6 +127,20 @@ public void testFailureIfCommunityUsedWithAnalytics() {
         }
     }
 
+    /**
+     * Make sure that the code fails fast if the Eventing service is enabled on the community
+     * edition which is not supported.
+     */
+    @Test
+    public void testFailureIfCommunityUsedWithEventing() {
+        try (
+            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
+                .withEnabledServices(CouchbaseService.KV, CouchbaseService.EVENTING)
+        ) {
+            assertThrows(ContainerLaunchException.class, () -> setUpClient(container, cluster -> {}));
+        }
+    }
+
     private void setUpClient(CouchbaseContainer container, Consumer<Cluster> consumer) {
         container.start();
 

From 205f21c242d067d67fc7f09d8d4738da28efcd08 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 31 Jan 2022 08:53:01 -0500
Subject: [PATCH 1701/4969] Prune from JVM hook if Ryuk is disabled (#4960)

If Ryuk is disabled, singleton containers and other uncontrolled containers were remaining dangling.
This change adds best-effort Ryuk-like functionality that will use a JVM hook to clean by labels.

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../testcontainers/DockerClientFactory.java   |  3 +
 .../containers/DockerComposeContainer.java    |  6 +-
 .../utility/ResourceReaper.java               | 97 +++++++++++++++----
 3 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 36c4c717b76..1ad7a0bec7e 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -225,6 +225,9 @@ public void close() {
         } else {
             log.debug("Ryuk is disabled");
             ryukContainerId = null;
+            // best-efforts cleanup at JVM shutdown, without using the Ryuk container
+            //noinspection deprecation
+            ResourceReaper.instance().setHook();
         }
 
         boolean checksEnabled = !TestcontainersConfiguration.getInstance().isDisableChecks();
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 961d066cb91..b56c70cb959 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -41,7 +41,6 @@
 
 import java.io.File;
 import java.time.Duration;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -56,7 +55,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -310,8 +308,8 @@ private void runWithCompose(String cmd) {
     }
 
     private void registerContainersForShutdown() {
-        ResourceReaper.instance().registerFilterForCleanup(Arrays.asList(
-            new SimpleEntry<>("label", "com.docker.compose.project=" + project)
+        ResourceReaper.instance().registerLabelsFilterForCleanup(Collections.singletonMap(
+            "com.docker.compose.project", project
         ));
     }
 
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index f43835fd01b..8c2cd3a6108 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -5,12 +5,14 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.PruneType;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
@@ -36,6 +38,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -58,7 +61,14 @@ public final class ResourceReaper {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResourceReaper.class);
 
-    private static final List<List<Map.Entry<String, String>>> DEATH_NOTE = new ArrayList<>();
+    private static final List<List<Map.Entry<String, String>>> DEATH_NOTE = new ArrayList<>(
+        Arrays.asList(
+            DockerClientFactory.DEFAULT_LABELS.entrySet().stream()
+                .<Map.Entry<String, String>>map(it -> new SimpleEntry<>("label", it.getKey() + "=" + it.getValue()))
+                .collect(Collectors.toList())
+        )
+    );
+
     private static final RateLimiter RYUK_ACK_RATE_LIMITER = RateLimiterBuilder
         .newBuilder()
         .withRate(4, TimeUnit.SECONDS)
@@ -66,16 +76,13 @@ public final class ResourceReaper {
         .build();
 
     private static ResourceReaper instance;
-    private final DockerClient dockerClient;
+    private static AtomicBoolean ryukStarted = new AtomicBoolean(false);
+    private final DockerClient dockerClient = DockerClientFactory.lazyClient();
     private Map<String, String> registeredContainers = new ConcurrentHashMap<>();
     private Set<String> registeredNetworks = Sets.newConcurrentHashSet();
     private Set<String> registeredImages = Sets.newConcurrentHashSet();
     private AtomicBoolean hookIsSet = new AtomicBoolean(false);
 
-    private ResourceReaper() {
-        dockerClient = DockerClientFactory.instance().client();
-    }
-
 
     /**
      *
@@ -173,14 +180,6 @@ public InspectContainerResponse getContainerInfo() {
 
         CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
 
-        synchronized (DEATH_NOTE) {
-            DEATH_NOTE.add(
-                    DockerClientFactory.DEFAULT_LABELS.entrySet().stream()
-                            .<Map.Entry<String, String>>map(it -> new SimpleEntry<>("label", it.getKey() + "=" + it.getValue()))
-                            .collect(Collectors.toList())
-            );
-        }
-
         String host = containerState.getHost();
         Integer ryukPort = containerState.getFirstMappedPort();
         Thread kiraThread = new Thread(
@@ -238,6 +237,7 @@ public InspectContainerResponse getContainerInfo() {
             }
         }
 
+        ryukStarted.set(true);
         return ryukContainerId;
     }
 
@@ -253,7 +253,7 @@ public synchronized static ResourceReaper instance() {
      * Perform a cleanup.
      */
     public synchronized void performCleanup() {
-        registeredContainers.forEach(this::stopContainer);
+        registeredContainers.forEach(this::removeContainer);
         registeredNetworks.forEach(this::removeNetwork);
         registeredImages.forEach(this::removeImage);
     }
@@ -262,7 +262,9 @@ public synchronized void performCleanup() {
      * Register a filter to be cleaned up.
      *
      * @param filter the filter
+     * @deprecated only label filter is supported by the prune API, use {@link #registerLabelsFilterForCleanup(Map)}
      */
+    @Deprecated
     public void registerFilterForCleanup(List<Map.Entry<String, String>> filter) {
         synchronized (DEATH_NOTE) {
             DEATH_NOTE.add(filter);
@@ -270,6 +272,19 @@ public void registerFilterForCleanup(List<Map.Entry<String, String>> filter) {
         }
     }
 
+    /**
+     * Register a label to be cleaned up.
+     *
+     * @param labels the filter
+     */
+    public void registerLabelsFilterForCleanup(Map<String, String> labels) {
+        registerFilterForCleanup(
+            labels.entrySet().stream()
+                .map(it -> new SimpleEntry<>("label", it.getKey() + "=" + it.getValue()))
+                .collect(Collectors.toList())
+        );
+    }
+
     /**
      * Register a container to be cleaned up, either on explicit call to stopAndRemoveContainer, or at JVM shutdown.
      *
@@ -287,7 +302,7 @@ public void registerContainerForCleanup(String containerId, String imageName) {
      * @param containerId the ID of the container
      */
     public void stopAndRemoveContainer(String containerId) {
-        stopContainer(containerId, registeredContainers.get(containerId));
+        removeContainer(containerId, registeredContainers.get(containerId));
 
         registeredContainers.remove(containerId);
     }
@@ -299,12 +314,12 @@ public void stopAndRemoveContainer(String containerId) {
      * @param imageName   the image name of the container (used for logging)
      */
     public void stopAndRemoveContainer(String containerId, String imageName) {
-        stopContainer(containerId, imageName);
+        removeContainer(containerId, imageName);
 
         registeredContainers.remove(containerId);
     }
 
-    private void stopContainer(String containerId, String imageName) {
+    private void removeContainer(String containerId, String imageName) {
         boolean running;
         try {
             InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
@@ -444,10 +459,52 @@ private void removeImage(String dockerImageName) {
         }
     }
 
-    private void setHook() {
+    private void prune(PruneType pruneType, List<Map.Entry<String, String>> filters) {
+        String[] labels = filters.stream()
+            .filter(it -> "label".equals(it.getKey()))
+            .map(Map.Entry::getValue)
+            .toArray(String[]::new);
+        switch (pruneType) {
+            // Docker only prunes stopped containers, so we have to do it manually
+            case CONTAINERS:
+                List<Container> containers = dockerClient.listContainersCmd()
+                    .withFilter("label", Arrays.asList(labels))
+                    .withShowAll(true)
+                    .exec();
+
+                containers.parallelStream().forEach(container -> {
+                    removeContainer(container.getId(), container.getImage());
+                });
+                break;
+            default:
+                dockerClient.pruneCmd(pruneType).withLabelFilter(labels).exec();
+                break;
+        }
+    }
+
+    /**
+     * @deprecated internal API, not intended for public usage
+     */
+    @Deprecated
+    public void setHook() {
         if (hookIsSet.compareAndSet(false, true)) {
             // If the JVM stops without containers being stopped, try and stop the container.
-            Runtime.getRuntime().addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, this::performCleanup));
+            Runtime.getRuntime().addShutdownHook(
+                new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
+                    () -> {
+                        performCleanup();
+
+                        if (!ryukStarted.get()) {
+                            synchronized (DEATH_NOTE) {
+                                DEATH_NOTE.forEach(filters -> prune(PruneType.CONTAINERS, filters));
+                                DEATH_NOTE.forEach(filters -> prune(PruneType.NETWORKS, filters));
+                                DEATH_NOTE.forEach(filters -> prune(PruneType.VOLUMES, filters));
+                                DEATH_NOTE.forEach(filters -> prune(PruneType.IMAGES, filters));
+                            }
+                        }
+                    }
+                )
+            );
         }
     }
 

From 53538f4898dad0a0989b40e6f7532a4178df326e Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 1 Feb 2022 11:18:05 +0100
Subject: [PATCH 1702/4969] Remove the INCUBATING label from CockroachDB module
 docs (#4963)

---
 docs/modules/databases/cockroachdb.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
index 540f4820a84..17c5efae8f8 100644
--- a/docs/modules/databases/cockroachdb.md
+++ b/docs/modules/databases/cockroachdb.md
@@ -1,8 +1,5 @@
 # CockroachDB Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
-
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Adding this module to your project dependencies

From 0b12ed23ed757347c81d9e55847d73d9bc6de2dd Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 1 Feb 2022 05:38:11 -0500
Subject: [PATCH 1703/4969] Extract `RyukResourceReaper` (#4959)

---
 .../utility/ResourceReaper.java               | 172 +---------------
 .../utility/RyukResourceReaper.java           | 188 ++++++++++++++++++
 2 files changed, 192 insertions(+), 168 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 8c2cd3a6108..69c849b6c82 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -1,30 +1,18 @@
 package org.testcontainers.utility;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.PruneType;
-import com.github.dockerjava.api.model.Volume;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Sets;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.rnorth.ducttape.ratelimits.RateLimiter;
-import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.ContainerState;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -32,26 +20,16 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.awaitility.Awaitility.await;
 
 /**
  * Component that responsible for container removal and automatic cleanup of dead containers at JVM shutdown.
@@ -61,7 +39,7 @@ public final class ResourceReaper {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResourceReaper.class);
 
-    private static final List<List<Map.Entry<String, String>>> DEATH_NOTE = new ArrayList<>(
+    static final List<List<Map.Entry<String, String>>> DEATH_NOTE = new ArrayList<>(
         Arrays.asList(
             DockerClientFactory.DEFAULT_LABELS.entrySet().stream()
                 .<Map.Entry<String, String>>map(it -> new SimpleEntry<>("label", it.getKey() + "=" + it.getValue()))
@@ -69,12 +47,6 @@ public final class ResourceReaper {
         )
     );
 
-    private static final RateLimiter RYUK_ACK_RATE_LIMITER = RateLimiterBuilder
-        .newBuilder()
-        .withRate(4, TimeUnit.SECONDS)
-        .withConstantThroughput()
-        .build();
-
     private static ResourceReaper instance;
     private static AtomicBoolean ryukStarted = new AtomicBoolean(false);
     private final DockerClient dockerClient = DockerClientFactory.lazyClient();
@@ -98,147 +70,11 @@ public static String start(String hostIpAddress, DockerClient client) {
      * @deprecated internal API
      */
     @Deprecated
-    @SneakyThrows(InterruptedException.class)
     public static String start(DockerClient client) {
-        String ryukImage = ImageNameSubstitutor.instance()
-            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.3"))
-            .asCanonicalNameString();
-        DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
-
-        List<Bind> binds = new ArrayList<>();
-        binds.add(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
-
-        ExposedPort ryukExposedPort = ExposedPort.tcp(8080);
-        String ryukContainerId = client.createContainerCmd(ryukImage)
-                .withHostConfig(
-                    new HostConfig()
-                        .withAutoRemove(true)
-                        .withPortBindings(new PortBinding(Ports.Binding.empty(), ryukExposedPort))
-                )
-                .withExposedPorts(ryukExposedPort)
-                .withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID)
-                .withLabels(Collections.singletonMap(DockerClientFactory.TESTCONTAINERS_LABEL, "true"))
-                .withBinds(binds)
-                .withPrivileged(TestcontainersConfiguration.getInstance().isRyukPrivileged())
-                .exec()
-                .getId();
-
-        client.startContainerCmd(ryukContainerId).exec();
-
-        StringBuilder ryukLog = new StringBuilder();
-
-        ResultCallback.Adapter<Frame> logCallback = client.logContainerCmd(ryukContainerId)
-            .withSince(0)
-            .withFollowStream(true)
-            .withStdOut(true)
-            .withStdErr(true)
-            .exec(new ResultCallback.Adapter<Frame>() {
-                @Override
-                public void onNext(Frame frame) {
-                    ryukLog.append(new String(frame.getPayload(), StandardCharsets.UTF_8));
-                }
-            });
-
-        InspectContainerResponse inspectedContainer;
-        try {
-            // inspect container response might initially not contain the mapped port
-            inspectedContainer = await()
-                .atMost(5, TimeUnit.SECONDS)
-                .pollInterval(DynamicPollInterval.ofMillis(50))
-                .pollInSameThread()
-                .until(
-                    () -> client.inspectContainerCmd(ryukContainerId).exec(),
-                    inspectContainerResponse -> {
-                        return inspectContainerResponse
-                            .getNetworkSettings()
-                            .getPorts()
-                            .getBindings()
-                            .values()
-                            .stream()
-                            .anyMatch(Objects::nonNull);
-                    }
-                );
-        } catch (Exception e) {
-            log.warn("Ryuk container cannot be inspected and probably had a problem starting. Ryuk's logs:\n{}", ryukLog);
-            throw new IllegalStateException("Ryuk failed to start", e);
-        }
-
-        ContainerState containerState = new ContainerState() {
-
-            @Override
-            public List<Integer> getExposedPorts() {
-                return Stream.of(getContainerInfo().getConfig().getExposedPorts())
-                    .map(ExposedPort::getPort)
-                    .collect(Collectors.toList());
-            }
-
-            @Override
-            public InspectContainerResponse getContainerInfo() {
-                return inspectedContainer;
-            }
-        };
-
-        CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
-
-        String host = containerState.getHost();
-        Integer ryukPort = containerState.getFirstMappedPort();
-        Thread kiraThread = new Thread(
-                DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
-                () -> {
-                    while (true) {
-                        RYUK_ACK_RATE_LIMITER.doWhenReady(() -> {
-                            int index = 0;
-                            // not set the read timeout, as Ryuk would not send anything unless a new filter is submitted, meaning that we would get a timeout exception pretty quick
-                            try (Socket clientSocket = new Socket()) {
-                                clientSocket.connect(new InetSocketAddress(host, ryukPort), 5 * 1000);
-                                FilterRegistry registry = new FilterRegistry(clientSocket.getInputStream(), clientSocket.getOutputStream());
-
-                                synchronized (DEATH_NOTE) {
-                                    while (true) {
-                                        if (DEATH_NOTE.size() <= index) {
-                                            try {
-                                                DEATH_NOTE.wait(1_000);
-                                                continue;
-                                            } catch (InterruptedException e) {
-                                                throw new RuntimeException(e);
-                                            }
-                                        }
-                                        List<Map.Entry<String, String>> filters = DEATH_NOTE.get(index);
-                                        boolean isAcknowledged = registry.register(filters);
-                                        if (isAcknowledged) {
-                                            log.debug("Received 'ACK' from Ryuk");
-                                            ryukScheduledLatch.countDown();
-                                            index++;
-                                        } else {
-                                            log.debug("Didn't receive 'ACK' from Ryuk. Will retry to send filters.");
-                                        }
-                                    }
-                                }
-                            } catch (IOException e) {
-                                log.warn("Can not connect to Ryuk at {}:{}", host, ryukPort, e);
-                            }
-                        });
-                    }
-                },
-                "testcontainers-ryuk"
-        );
-        kiraThread.setDaemon(true);
-        kiraThread.start();
-        try {
-            // We need to wait before we can start any containers to make sure that we delete them
-            if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
-                log.error("Timed out waiting for Ryuk container to start. Ryuk's logs:\n{}", ryukLog);
-                throw new IllegalStateException(String.format("Could not connect to Ryuk at %s:%s", host, ryukPort));
-            }
-        } finally {
-            try {
-                logCallback.close();
-            } catch (IOException ignored) {
-            }
-        }
-
+        RyukResourceReaper ryuk = new RyukResourceReaper(client);
+        String containerId = ryuk.getContainerId();
         ryukStarted.set(true);
-        return ryukContainerId;
+        return containerId;
     }
 
     public synchronized static ResourceReaper instance() {
diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
new file mode 100644
index 00000000000..e8aed92fa9d
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -0,0 +1,188 @@
+package org.testcontainers.utility;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Volume;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.rnorth.ducttape.ratelimits.RateLimiter;
+import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ContainerState;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.awaitility.Awaitility.await;
+
+@Slf4j
+class RyukResourceReaper {
+
+    private static final RateLimiter RYUK_ACK_RATE_LIMITER = RateLimiterBuilder
+        .newBuilder()
+        .withRate(4, TimeUnit.SECONDS)
+        .withConstantThroughput()
+        .build();
+
+    @Getter
+    private final String containerId;
+
+    @SneakyThrows(InterruptedException.class)
+    RyukResourceReaper(DockerClient client) {
+        String ryukImage = ImageNameSubstitutor.instance()
+            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.3"))
+            .asCanonicalNameString();
+        DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
+
+        List<Bind> binds = new ArrayList<>();
+        binds.add(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
+
+        ExposedPort ryukExposedPort = ExposedPort.tcp(8080);
+        containerId = client.createContainerCmd(ryukImage)
+            .withHostConfig(
+                new HostConfig()
+                    .withAutoRemove(true)
+                    .withPortBindings(new PortBinding(Ports.Binding.empty(), ryukExposedPort))
+            )
+            .withExposedPorts(ryukExposedPort)
+            .withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID)
+            .withLabels(Collections.singletonMap(DockerClientFactory.TESTCONTAINERS_LABEL, "true"))
+            .withBinds(binds)
+            .withPrivileged(TestcontainersConfiguration.getInstance().isRyukPrivileged())
+            .exec()
+            .getId();
+
+        client.startContainerCmd(containerId).exec();
+
+        StringBuilder ryukLog = new StringBuilder();
+
+        ResultCallback.Adapter<Frame> logCallback = client.logContainerCmd(containerId)
+            .withSince(0)
+            .withFollowStream(true)
+            .withStdOut(true)
+            .withStdErr(true)
+            .exec(new ResultCallback.Adapter<Frame>() {
+                @Override
+                public void onNext(Frame frame) {
+                    ryukLog.append(new String(frame.getPayload(), StandardCharsets.UTF_8));
+                }
+            });
+
+        InspectContainerResponse inspectedContainer;
+        try {
+            // inspect container response might initially not contain the mapped port
+            inspectedContainer = await()
+                .atMost(5, TimeUnit.SECONDS)
+                .pollInterval(DynamicPollInterval.ofMillis(50))
+                .pollInSameThread()
+                .until(
+                    () -> client.inspectContainerCmd(containerId).exec(),
+                    inspectContainerResponse -> {
+                        return inspectContainerResponse
+                            .getNetworkSettings()
+                            .getPorts()
+                            .getBindings()
+                            .values()
+                            .stream()
+                            .anyMatch(Objects::nonNull);
+                    }
+                );
+        } catch (Exception e) {
+            log.warn("Ryuk container cannot be inspected and probably had a problem starting. Ryuk's logs:\n{}", ryukLog);
+            throw new IllegalStateException("Ryuk failed to start", e);
+        }
+
+        ContainerState containerState = new ContainerState() {
+
+            @Override
+            public List<Integer> getExposedPorts() {
+                return Stream.of(getContainerInfo().getConfig().getExposedPorts())
+                    .map(ExposedPort::getPort)
+                    .collect(Collectors.toList());
+            }
+
+            @Override
+            public InspectContainerResponse getContainerInfo() {
+                return inspectedContainer;
+            }
+        };
+
+        CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
+
+        String host = containerState.getHost();
+        Integer ryukPort = containerState.getFirstMappedPort();
+        Thread kiraThread = new Thread(
+            DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
+            () -> {
+                while (true) {
+                    RYUK_ACK_RATE_LIMITER.doWhenReady(() -> {
+                        int index = 0;
+                        // not set the read timeout, as Ryuk would not send anything unless a new filter is submitted, meaning that we would get a timeout exception pretty quick
+                        try (Socket clientSocket = new Socket()) {
+                            clientSocket.connect(new InetSocketAddress(host, ryukPort), 5 * 1000);
+                            ResourceReaper.FilterRegistry registry = new ResourceReaper.FilterRegistry(clientSocket.getInputStream(), clientSocket.getOutputStream());
+
+                            synchronized (ResourceReaper.DEATH_NOTE) {
+                                while (true) {
+                                    if (ResourceReaper.DEATH_NOTE.size() <= index) {
+                                        try {
+                                            ResourceReaper.DEATH_NOTE.wait(1_000);
+                                            continue;
+                                        } catch (InterruptedException e) {
+                                            throw new RuntimeException(e);
+                                        }
+                                    }
+                                    List<Map.Entry<String, String>> filters = ResourceReaper.DEATH_NOTE.get(index);
+                                    boolean isAcknowledged = registry.register(filters);
+                                    if (isAcknowledged) {
+                                        log.debug("Received 'ACK' from Ryuk");
+                                        ryukScheduledLatch.countDown();
+                                        index++;
+                                    } else {
+                                        log.debug("Didn't receive 'ACK' from Ryuk. Will retry to send filters.");
+                                    }
+                                }
+                            }
+                        } catch (IOException e) {
+                            log.warn("Can not connect to Ryuk at {}:{}", host, ryukPort, e);
+                        }
+                    });
+                }
+            },
+            "testcontainers-ryuk"
+        );
+        kiraThread.setDaemon(true);
+        kiraThread.start();
+        try {
+            // We need to wait before we can start any containers to make sure that we delete them
+            if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
+                log.error("Timed out waiting for Ryuk container to start. Ryuk's logs:\n{}", ryukLog);
+                throw new IllegalStateException(String.format("Could not connect to Ryuk at %s:%s", host, ryukPort));
+            }
+        } finally {
+            try {
+                logCallback.close();
+            } catch (IOException ignored) {
+            }
+        }
+    }
+}

From fd6e581f9ab5e904ab30709e614c8ad2b8221871 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:34 +0000
Subject: [PATCH 1704/4969] Bump java-client from 3.2.4 to 3.2.5 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.2.4...java-client-3.2.5)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index ea720ca3725..2c68f163a57 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.couchbase.client:java-client:3.2.4'
+    testImplementation 'com.couchbase.client:java-client:3.2.5'
     testImplementation 'org.awaitility:awaitility:4.1.1'
 }

From 865a5c1c132cdc9765f6fae06607870661429a90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:35 +0000
Subject: [PATCH 1705/4969] Bump tomcat-jdbc from 10.0.14 to 10.0.16 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.14 to 10.0.16.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index a6f71690e1e..71940e0026a 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.14'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.16'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From cc031c6b64666812a1c9f75f9d0ae65a647bae83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:36 +0000
Subject: [PATCH 1706/4969] Bump tomcat-jdbc from 10.0.14 to 10.0.16 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.14 to 10.0.16.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 46088aa45ac..98570722e6a 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.14'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.16'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.27'
 }

From a080cc5f4e764aa5e7edbe20e4dd8841e6e9e834 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:37 +0000
Subject: [PATCH 1707/4969] Bump neo4j-java-driver from 4.4.2 to 4.4.3 in
 /modules/neo4j

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.2 to 4.4.3.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.2...4.4.3)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index fe99774538c..1d5cffc1955 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.2'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.3'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 4cf33a40bf1ab7a36289234a6b27d65b200cfb94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:38 +0000
Subject: [PATCH 1708/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.137 to 1.12.150.
- [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.12.137...1.12.150)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 52881514ac5..ce09dde17e6 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.137'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 38bd2919b94344113b1e782d3d580ac4992a824d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:38 +0000
Subject: [PATCH 1709/4969] Bump mariadb-java-client from 2.7.4 to 3.0.3 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.7.4 to 3.0.3.
- [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.7.4...3.0.3)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 af67719f8ad..8d65ed00deb 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.3'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From 04e88c03810a97c38d306223ba4f26b8d8d79ccd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:38 +0000
Subject: [PATCH 1710/4969] Bump aws-java-sdk-sqs from 1.12.139 to 1.12.150 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.139 to 1.12.150.
- [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.12.139...1.12.150)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 7bfec27ccaf..6e0f620beed 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.139'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.139'
     testImplementation 'software.amazon.awssdk:s3:2.17.108'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 7b8edbda16c4b9c962b568e71212159ffe93c0d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:39 +0000
Subject: [PATCH 1711/4969] Bump testcontainers from 1.16.2 to 1.16.3 in /core

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.16.2 to 1.16.3.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.2...1.16.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 074273e8fc7..a5e627a77aa 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -53,7 +53,7 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.16.2', {
+    baseline 'org.testcontainers:testcontainers:1.16.3', {
         exclude group: "*", module: "*"
     }
 

From cf2e9d83ccea626f1acb758cb8afde0effc9a633 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:40 +0000
Subject: [PATCH 1712/4969] Bump mysql-connector-java from 8.0.27 to 8.0.28 in
 /modules/spock

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.27 to 8.0.28.
- [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.27...8.0.28)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 cec493cf77d..26158b6db57 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.28'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }

From 293059233d4ae97bd5c852dc6e2b6d34843640d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:41 +0000
Subject: [PATCH 1713/4969] Bump jedis from 4.0.1 to 4.1.1 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.0.1...v4.1.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index c60d5f08cf4..ec3d0bd134c 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.0.1'
+    implementation 'redis.clients:jedis:4.1.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index dff9ae7024f..32e35f07766 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.0.1'
+    implementation 'redis.clients:jedis:4.1.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index a56f269fa40..2ebaba5be50 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.0.1'
+    implementation 'redis.clients:jedis:4.1.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'

From 98bf56bbfb27f21b9020f97ca6288a2cb0da6421 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:41 +0000
Subject: [PATCH 1714/4969] Bump mockito-core from 4.2.0 to 4.3.1 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.2.0 to 4.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.2.0...v4.3.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 77ff3f842d0..2069545531d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.0.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.2.0') {
+    testImplementation ('org.mockito:mockito-core:4.3.1') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.22.0'

From ca9423cfe0b83417a795cfe05edb6ff6527c7d73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:42 +0000
Subject: [PATCH 1715/4969] Bump transport from 7.16.2 to 7.17.0 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.16.2 to 7.17.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.16.2...v7.17.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 3f517353f24..fca8ecfe9fb 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.16.2"
+    testImplementation "org.elasticsearch.client:transport:7.17.0"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 7aabc275a4b810ab5200104b665d10b6a9c06e91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:42 +0000
Subject: [PATCH 1716/4969] Bump aws-java-sdk-s3 from 1.12.137 to 1.12.150 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.137 to 1.12.150.
- [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.12.137...1.12.150)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 7bfec27ccaf..54a3f71a769 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.137'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.139'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.139'

From 5cd78705c86800e790e3662e1191db62f6ff8455 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:44 +0000
Subject: [PATCH 1717/4969] Bump slf4j-api from 1.7.32 to 1.7.35 in /core

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.32 to 1.7.35.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.35)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 074273e8fc7..f9b373083ad 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -58,7 +58,7 @@ dependencies {
     }
 
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:1.7.32'
+    api 'org.slf4j:slf4j-api:1.7.35'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'

From 0f0398f4a78f86c43baff8fab62cab80112fc647 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:44 +0000
Subject: [PATCH 1718/4969] Bump org.springframework.boot from 2.6.2 to 2.6.3
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.6.2...v2.6.3)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 495c279937a..d728c13e3c0 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.6.2'
+    id 'org.springframework.boot' version '2.6.3'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 25d92d3ea16..5a9495d86bf 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.6.2"
+    id("org.springframework.boot") version "2.6.3"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.6.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 09b82c34ea7..ace47d12ebe 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.6.2'
+    id 'org.springframework.boot' version '2.6.3'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 8ed5e42c62f6b6ebc16f50de948f3f029ec7a95e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:44 +0000
Subject: [PATCH 1719/4969] Bump jedis from 4.0.1 to 4.1.1 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.0.1...v4.1.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 77ff3f842d0..0c2ffd8d41d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.0.1'
+    testImplementation 'redis.clients:jedis:4.1.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:4.2.0') {
         exclude(module: 'hamcrest-core')

From b24418439fe7280f23a399cf4b1c25953daac580 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:46 +0000
Subject: [PATCH 1720/4969] Bump postgresql from 42.3.1 to 42.3.2 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.1 to 42.3.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.1...REL42.3.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 77ff3f842d0..f450bd15a24 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }

From 8899d1ea4d4f245fb3f0ef5f0e6817e322ed94c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:47 +0000
Subject: [PATCH 1721/4969] Bump postgresql from 42.3.1 to 42.3.2 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.1 to 42.3.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.1...REL42.3.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5ca68b2c514..37fc1b71226 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20211205'
-    testImplementation 'org.postgresql:postgresql:42.3.1'
+    testImplementation 'org.postgresql:postgresql:42.3.2'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testcontainers:postgresql'
 }

From fc2a95e0e66553a1970f04b3d85c200753d6d8ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:47 +0000
Subject: [PATCH 1722/4969] Bump mockito-core from 4.2.0 to 4.3.1 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.2.0 to 4.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.2.0...v4.3.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 074273e8fc7..e835eac8b38 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.14.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
-    testImplementation ('org.mockito:mockito-core:4.2.0') {
+    testImplementation ('org.mockito:mockito-core:4.3.1') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 2e520b2bd3a9e23019b4953ea3c1d7d1454c4be6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:50 +0000
Subject: [PATCH 1723/4969] Bump amqp-client from 5.14.0 to 5.14.1 in /core

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.14.0 to 5.14.1.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.14.0...v5.14.1)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 074273e8fc7..c5c5771f649 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -90,7 +90,7 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.0.1'
-    testImplementation 'com.rabbitmq:amqp-client:5.14.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.1'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
     testImplementation ('org.mockito:mockito-core:4.2.0') {

From 7085b4f1494b4a491f3ac896b8416924f20cc536 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:50 +0000
Subject: [PATCH 1724/4969] Bump kafka-clients from 3.0.0 to 3.1.0 in /examples

Bumps kafka-clients from 3.0.0 to 3.1.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 6351be31488..2e37410bcea 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.22"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.1.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'

From 3ac2016e162186c7383b2c73c54084a78d940ec7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:00:54 +0000
Subject: [PATCH 1725/4969] Bump cucumber-java from 7.2.2 to 7.2.3 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.2.2 to 7.2.3.
- [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/v7.2.2...v7.2.3)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 4f462ed4740..9a402b51b47 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:7.2.2'
+    testImplementation 'io.cucumber:cucumber-java:7.2.3'
     testImplementation 'io.cucumber:cucumber-junit:7.2.2'
     testImplementation 'org.testcontainers:selenium'
 }

From eaa6a9f0fbffa61e9dfbce97262ec704a1a51459 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:01:23 +0000
Subject: [PATCH 1726/4969] Bump release-drafter/release-drafter from 5.15.0 to
 5.17.6

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.15.0 to 5.17.6.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/fe52e97d262833ae07d05efaf1a239df3f1b5cd4...436492609a0c75979acf131d57f61b5321571950)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 629280b1241..aec34acb8ff 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -12,6 +12,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@fe52e97d262833ae07d05efaf1a239df3f1b5cd4 # v5.15.0
+      - uses: release-drafter/release-drafter@436492609a0c75979acf131d57f61b5321571950 # v5.15.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 9100051f213d5c8391ae4730a1011e797f833349 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:01:26 +0000
Subject: [PATCH 1727/4969] Bump gradle-update/update-gradle-wrapper-action
 from 1.0.16 to 1.0.17

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 1.0.16 to 1.0.17.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/f31ab392a9d75029f9fd0883d8d6745c0139a006...5b865a8b4d09fdf6afaaa20397ba68455bb48f0d)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 612aec0b406..253e37c23eb 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@f31ab392a9d75029f9fd0883d8d6745c0139a006 # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@5b865a8b4d09fdf6afaaa20397ba68455bb48f0d # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From 15456fc10ffdd1116fde31c666bb91b4d7435163 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:02:38 +0000
Subject: [PATCH 1728/4969] Bump peter-evans/create-pull-request from 3.12.0 to
 3.12.1

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/dcd5fd746d53dd8de555c0f10bca6c35628be47a...f22a7da129c901513876a2380e2dae9f8e145330)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 418598f230d..2c7626c7ec7 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a # v3.10.1
+        uses: peter-evans/create-pull-request@f22a7da129c901513876a2380e2dae9f8e145330 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From 60725f6dfa4d88b0e8e526519d5ef7b1dc7b3a33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:05:58 +0000
Subject: [PATCH 1729/4969] Bump trino-jdbc from 367 to 369 in /modules/trino

Bumps trino-jdbc from 367 to 369.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index f9223c174a5..9bf0e24f06b 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:367'
+    testImplementation 'io.trino:trino-jdbc:369'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From f5e943f31e5c1f51dc01cf3312ed64d060fd9c8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:05:59 +0000
Subject: [PATCH 1730/4969] Bump postgresql from 42.3.1 to 42.3.2 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.1 to 42.3.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.1...REL42.3.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index ee6a7e2731e..71011c6534b 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.3.1'
+    testImplementation 'org.postgresql:postgresql:42.3.2'
 }

From 900ae910073066def9c422016b25bab310840ff3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:06:00 +0000
Subject: [PATCH 1731/4969] Bump google-cloud-firestore from 3.0.10 to 3.0.11
 in /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.0.10 to 3.0.11.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.0.10...v3.0.11)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 07d0c06a04b..9cda3994e8d 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.2'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.10'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.11'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.1'

From 9502c445d7eaddf899043a699791f39957961958 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:06:01 +0000
Subject: [PATCH 1732/4969] Bump amqp-client from 5.14.0 to 5.14.1 in
 /modules/rabbitmq

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.14.0 to 5.14.1.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.14.0...v5.14.1)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 4b437605785..9b680b12968 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.14.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.1'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 8256b642dd017b4718513db5af3c5e8fef6c396b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:06:04 +0000
Subject: [PATCH 1733/4969] Bump jackson-dataformat-yaml from 2.8.8 to 2.13.1
 in /modules/k3s

Bumps [jackson-dataformat-yaml](https://github.com/FasterXML/jackson-dataformats-text) from 2.8.8 to 2.13.1.
- [Release notes](https://github.com/FasterXML/jackson-dataformats-text/releases)
- [Commits](https://github.com/FasterXML/jackson-dataformats-text/commits/jackson-dataformats-text-2.13.1)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 95d2d3bc97c..85ee36652b3 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: K3S"
 dependencies {
     api project(":testcontainers")
 
-    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
+    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
 
     testImplementation 'io.fabric8:kubernetes-client:5.11.0'
     testImplementation 'io.kubernetes:client-java:14.0.0'

From dcf6bd01d4225ddf54193fd158983251a38b4ff1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:06:07 +0000
Subject: [PATCH 1734/4969] Bump assertj-core from 3.21.0 to 3.22.0 in
 /modules/k3s

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 95d2d3bc97c..0674ee2b24c 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:5.11.0'
     testImplementation 'io.kubernetes:client-java:14.0.0'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From bc4b8ada94a93a5f8790d58098ce098bf51eb11c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 22:06:09 +0000
Subject: [PATCH 1735/4969] Bump google-cloud-bigtable from 2.5.1 to 2.5.2 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.5.1...v2.5.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 07d0c06a04b..81dd0e9dff1 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.2'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From f66a6d256fa5e5f7b9b2c358a41953b5ca5699ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 14:14:38 +0000
Subject: [PATCH 1736/4969] Bump mysql-connector-java from 8.0.27 to 8.0.28 in
 /modules/jdbc-test

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.27 to 8.0.28.
- [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.27...8.0.28)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 98570722e6a..2ea623f75a1 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -16,5 +16,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.16'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.27'
+    api 'mysql:mysql-connector-java:8.0.28'
 }

From c5bec3cee6de41c89c0270da0b42fc126141ec7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 14:14:43 +0000
Subject: [PATCH 1737/4969] Bump cucumber-junit from 7.2.2 to 7.2.3 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.2.2 to 7.2.3.
- [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/v7.2.2...v7.2.3)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9a402b51b47..78d042b95fd 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:7.2.3'
-    testImplementation 'io.cucumber:cucumber-junit:7.2.2'
+    testImplementation 'io.cucumber:cucumber-junit:7.2.3'
     testImplementation 'org.testcontainers:selenium'
 }

From 8de57a2c31db71a3375a70580f73a2c7d702f7ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 14:14:47 +0000
Subject: [PATCH 1738/4969] Bump mysql-connector-java from 8.0.27 to 8.0.28 in
 /modules/mysql

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.27 to 8.0.28.
- [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.27...8.0.28)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 88a4473f56c..1796ff17ef0 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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.27'
+    testImplementation 'mysql:mysql-connector-java:8.0.28'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From 2d09155faa529074f53b10a2e7f828bf531efa2d Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 3 Feb 2022 15:04:50 +0000
Subject: [PATCH 1739/4969] Upgrade mkdocs (#3443)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/contributing.md                       |   2 +-
 docs/index.md                              |  57 ++++----
 docs/modules/azure.md                      |  26 ++--
 docs/modules/databases/cassandra.md        |  79 +++++------
 docs/modules/databases/clickhouse.md       |  24 ++--
 docs/modules/databases/cockroachdb.md      |  24 ++--
 docs/modules/databases/couchbase.md        |  25 ++--
 docs/modules/databases/db2.md              |  25 ++--
 docs/modules/databases/dynalite.md         |  25 ++--
 docs/modules/databases/influxdb.md         |  25 ++--
 docs/modules/databases/mariadb.md          |  25 ++--
 docs/modules/databases/mongodb.md          |  25 ++--
 docs/modules/databases/mssqlserver.md      |  25 ++--
 docs/modules/databases/mysql.md            |  25 ++--
 docs/modules/databases/neo4j.md            | 146 +++++++++++----------
 docs/modules/databases/oraclexe.md         |  25 ++--
 docs/modules/databases/orientdb.md         |  88 +++++++------
 docs/modules/databases/postgres.md         |  25 ++--
 docs/modules/databases/presto.md           |  25 ++--
 docs/modules/databases/trino.md            |  26 ++--
 docs/modules/docker_compose.md             |  25 ++--
 docs/modules/elasticsearch.md              |  26 ++--
 docs/modules/gcloud.md                     |  25 ++--
 docs/modules/k3s.md                        |  25 ++--
 docs/modules/kafka.md                      |  25 ++--
 docs/modules/localstack.md                 |  25 ++--
 docs/modules/mockserver.md                 |  25 ++--
 docs/modules/nginx.md                      |  25 ++--
 docs/modules/pulsar.md                     |  25 ++--
 docs/modules/rabbitmq.md                   |  25 ++--
 docs/modules/solr.md                       |  25 ++--
 docs/modules/toxiproxy.md                  |  25 ++--
 docs/modules/vault.md                      |  25 ++--
 docs/modules/webdriver_containers.md       |  47 +++----
 docs/quickstart/junit_4_quickstart.md      |  25 ++--
 docs/quickstart/junit_5_quickstart.md      |  53 ++++----
 docs/quickstart/spock_quickstart.md        |  34 ++---
 docs/test_framework_integration/junit_5.md |  25 ++--
 docs/test_framework_integration/spock.md   |  25 ++--
 mkdocs.yml                                 |   2 +
 requirements.txt                           |   9 +-
 41 files changed, 675 insertions(+), 618 deletions(-)

diff --git a/docs/contributing.md b/docs/contributing.md
index 4094fab14ef..6cd3e2719f8 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -35,7 +35,7 @@ If the answers to the above are all yes, then a new module may be a good approac
 Otherwise, it is entirely possible for you to:
 
 * publish a code snippet
-* contribute an [example](../examples/README.md) to the Testcontainers repo
+* contribute an example to the Testcontainers repo
 * publish your own third party library
 
 In any case, please contact us to help validate your proposal!
diff --git a/docs/index.md b/docs/index.md
index 136ae53d2ca..998722af50f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,6 +1,7 @@
 # Testcontainers
 
-![Testcontainers logo](./logo.png)
+<!-- allow aspect ratio computation to reduce layout shift. CSS enforces max-width: 100% -->
+<img src="logo.png" alt="Testcontainers logo" width="1024" height="512"/> 
 
 ## About
 
@@ -31,18 +32,19 @@ Testcontainers is distributed as separate JARs with a common version number:
 
 For the core library, the latest Maven/Gradle dependency is as follows: 
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>testcontainers</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 You can also [check the latest version available on Maven Central](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.testcontainers%22).
 
@@ -51,8 +53,8 @@ You can also [check the latest version available on Maven Central](https://searc
 To avoid specifying the version of each dependency, you can use a `BOM` or `Bill Of Materials`.
 
 Using Maven you can add the following to `dependencyManagement` section in your `pom.xml`:
-
-```xml tab='Maven'
+=== "Maven"
+```xml
 <dependencyManagement>
     <dependencies>
         <dependency>
@@ -67,21 +69,22 @@ Using Maven you can add the following to `dependencyManagement` section in your
 ```
 
 and then use dependencies without specifying a version:
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>mysql</artifactId>
-    <scope>test</scope>
-</dependency>
-```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>mysql</artifactId>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 Using Gradle 5.0 or higher, you can add the following to the `dependencies` section in your `build.gradle`:
 
-```groovy tab='Gradle'
-implementation platform('org.testcontainers:testcontainers-bom:{{latest_version}}') //import bom
-testImplementation('org.testcontainers:mysql') //no version specified
-```
+=== "Gradle"
+    ```groovy
+    implementation platform('org.testcontainers:testcontainers-bom:{{latest_version}}') //import bom
+    testImplementation('org.testcontainers:mysql') //no version specified
+    ```
 
 
 [JitPack](jitpack_dependencies.md) builds are available for pre-release versions.
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 529f058ea52..5e80270e90c 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -49,16 +49,18 @@ Test against the Emulator:
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:azure:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>azure</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:azure:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>azure</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index 63213d27343..f7ed3094886 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -4,48 +4,51 @@
 
 This example connects to the Cassandra Cluster, creates a keyspaces and asserts that is has been created.
 
-```java tab="JUnit 4 example"
-public class SomeTest {
-
-    @Rule
-    public CassandraContainer cassandra = new CassandraContainer();
-
-
-    @Test
-    public void test(){
-        Cluster cluster = cassandra.getCluster();
-
-        try(Session session = cluster.connect()) {
-
-            session.execute("CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
-                    "{'class':'SimpleStrategy','replication_factor':'1'};");
-
-            List<KeyspaceMetadata> keyspaces = session.getCluster().getMetadata().getKeyspaces();
-            List<KeyspaceMetadata> filteredKeyspaces = keyspaces
-                    .stream()
-                    .filter(km -> km.getName().equals("test"))
-                    .collect(Collectors.toList());
-
-            assertEquals(1, filteredKeyspaces.size());
+=== "JUnit 4 example"
+    ```java
+    public class SomeTest {
+    
+        @Rule
+        public CassandraContainer cassandra = new CassandraContainer();
+    
+    
+        @Test
+        public void test(){
+            Cluster cluster = cassandra.getCluster();
+    
+            try(Session session = cluster.connect()) {
+    
+                session.execute("CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                        "{'class':'SimpleStrategy','replication_factor':'1'};");
+    
+                List<KeyspaceMetadata> keyspaces = session.getCluster().getMetadata().getKeyspaces();
+                List<KeyspaceMetadata> filteredKeyspaces = keyspaces
+                        .stream()
+                        .filter(km -> km.getName().equals("test"))
+                        .collect(Collectors.toList());
+    
+                assertEquals(1, filteredKeyspaces.size());
+            }
         }
+    
     }
-
-}
-```
+    ```
 
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:cassandra:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>cassandra</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:cassandra:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>cassandra</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/databases/clickhouse.md b/docs/modules/databases/clickhouse.md
index a52a75af51f..b3494867edf 100644
--- a/docs/modules/databases/clickhouse.md
+++ b/docs/modules/databases/clickhouse.md
@@ -4,18 +4,20 @@
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:clickhouse:{{latest_version}}"
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:clickhouse:{{latest_version}}"
+    ```
 
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>clickhouse</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>clickhouse</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
index 17c5efae8f8..45e3f75b86c 100644
--- a/docs/modules/databases/cockroachdb.md
+++ b/docs/modules/databases/cockroachdb.md
@@ -6,18 +6,20 @@ See [Database containers](./index.md) for documentation and usage that is common
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:cockroachdb:{{latest_version}}"
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:cockroachdb:{{latest_version}}"
+    ```
 
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>cockroachdb</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>cockroachdb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/couchbase.md b/docs/modules/databases/couchbase.md
index e45a971f626..5c1ff9f5580 100644
--- a/docs/modules/databases/couchbase.md
+++ b/docs/modules/databases/couchbase.md
@@ -27,15 +27,16 @@ Running Couchbase as a stand-in in a test:
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:couchbase:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>couchbase</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:couchbase:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>couchbase</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
index 3872e7fa857..945536cac05 100644
--- a/docs/modules/databases/db2.md
+++ b/docs/modules/databases/db2.md
@@ -33,18 +33,19 @@ public class SomeTest {
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:db2:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>db2</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:db2:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>db2</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/dynalite.md b/docs/modules/databases/dynalite.md
index dfc32f35d2e..8807ad7f025 100644
--- a/docs/modules/databases/dynalite.md
+++ b/docs/modules/databases/dynalite.md
@@ -29,18 +29,19 @@ In part, because it's light and quick to run. Also, please see the [reasons give
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:dynalite:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>dynalite</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:dynalite:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>dynalite</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add an AWS SDK JAR to your project. You should ensure that your project also has a suitable AWS SDK JAR as a dependency.
diff --git a/docs/modules/databases/influxdb.md b/docs/modules/databases/influxdb.md
index 5de7d36182a..3f5fe0654db 100644
--- a/docs/modules/databases/influxdb.md
+++ b/docs/modules/databases/influxdb.md
@@ -22,18 +22,19 @@ public class SomeTest {
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:influxdb:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>influxdb</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:influxdb:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>influxdb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/mariadb.md b/docs/modules/databases/mariadb.md
index 7ef14bed3cc..495965bee0a 100644
--- a/docs/modules/databases/mariadb.md
+++ b/docs/modules/databases/mariadb.md
@@ -23,18 +23,19 @@ public class SomeTest {
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:mariadb:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>mariadb</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:mariadb:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>mariadb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/mongodb.md b/docs/modules/databases/mongodb.md
index 3d49ecc6809..9e81e28c39f 100644
--- a/docs/modules/databases/mongodb.md
+++ b/docs/modules/databases/mongodb.md
@@ -40,18 +40,19 @@ That's where the MongoDBContainer might come in handy.
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:mongodb:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>mongodb</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:mongodb:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>mongodb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
 Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency
diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index 6dea62def25..7ddd5350a40 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -29,18 +29,19 @@ public class SomeTest {
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:mssqlserver:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>mssqlserver</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:mssqlserver:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>mssqlserver</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 
 !!! hint
diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index f5a428e1cdc..26fc62308ef 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -17,18 +17,19 @@ and will be able to override server settings when the container starts.
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:mysql:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>mysql</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:mysql:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>mysql</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index 0310d37d817..17e1e154fc8 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -13,58 +13,59 @@ On the JVM you would most likely use the [Java driver](https://github.com/neo4j/
 
 The following example uses the JUnit 5 extension `@Testcontainers` and demonstrates both the usage of the Java Driver and the REST endpoint:
 
-```java tab="JUnit 5 example"
-@Testcontainers
-public class ExampleTest {
-
-    @Container
-    private static Neo4jContainer neo4jContainer = new Neo4jContainer()
-        .withAdminPassword(null); // Disable password
-
-    @Test
-    void testSomethingUsingBolt() {
-
-        // Retrieve the Bolt URL from the container
-        String boltUrl = neo4jContainer.getBoltUrl();
-        try (
-            Driver driver = GraphDatabase.driver(boltUrl, AuthTokens.none());
-            Session session = driver.session()
-        ) {
-            long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
-            assertThat(one, is(1L));
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    void testSomethingUsingHttp() throws IOException {
-
-        // Retrieve the HTTP URL from the container
-        String httpUrl = neo4jContainer.getHttpUrl();
-
-        URL url = new URL(httpUrl + "/db/data/transaction/commit");
-        HttpURLConnection con = (HttpURLConnection) url.openConnection();
-
-        con.setRequestMethod("POST");
-        con.setRequestProperty("Content-Type", "application/json");
-        con.setDoOutput(true);
-
-        try (Writer out = new OutputStreamWriter(con.getOutputStream())) {
-            out.write("{\"statements\":[{\"statement\":\"RETURN 1\"}]}");
-            out.flush();
+=== "JUnit 5 example"
+    ```java
+    @Testcontainers
+    public class ExampleTest {
+    
+        @Container
+        private static Neo4jContainer neo4jContainer = new Neo4jContainer()
+            .withAdminPassword(null); // Disable password
+    
+        @Test
+        void testSomethingUsingBolt() {
+    
+            // Retrieve the Bolt URL from the container
+            String boltUrl = neo4jContainer.getBoltUrl();
+            try (
+                Driver driver = GraphDatabase.driver(boltUrl, AuthTokens.none());
+                Session session = driver.session()
+            ) {
+                long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
+                assertThat(one, is(1L));
+            } catch (Exception e) {
+                fail(e.getMessage());
+            }
         }
-
-        assertThat(con.getResponseCode(), is(HttpURLConnection.HTTP_OK));
-        try (BufferedReader buffer = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
-            String expectedResponse = 
-                "{\"results\":[{\"columns\":[\"1\"],\"data\":[{\"row\":[1],\"meta\":[null]}]}],\"errors\":[]}";
-            String response = buffer.lines().collect(Collectors.joining("\n"));
-            assertThat(response, is(expectedResponse));
+    
+        @Test
+        void testSomethingUsingHttp() throws IOException {
+    
+            // Retrieve the HTTP URL from the container
+            String httpUrl = neo4jContainer.getHttpUrl();
+    
+            URL url = new URL(httpUrl + "/db/data/transaction/commit");
+            HttpURLConnection con = (HttpURLConnection) url.openConnection();
+    
+            con.setRequestMethod("POST");
+            con.setRequestProperty("Content-Type", "application/json");
+            con.setDoOutput(true);
+    
+            try (Writer out = new OutputStreamWriter(con.getOutputStream())) {
+                out.write("{\"statements\":[{\"statement\":\"RETURN 1\"}]}");
+                out.flush();
+            }
+    
+            assertThat(con.getResponseCode(), is(HttpURLConnection.HTTP_OK));
+            try (BufferedReader buffer = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+                String expectedResponse = 
+                    "{\"results\":[{\"columns\":[\"1\"],\"data\":[{\"row\":[1],\"meta\":[null]}]}],\"errors\":[]}";
+                String response = buffer.lines().collect(Collectors.joining("\n"));
+                assertThat(response, is(expectedResponse));
+            }
         }
     }
-}
-```
+    ```
 
 You are not limited to Unit tests and can of course use an instance of the Neo4j Testcontainer in vanilla Java code as well.
 
@@ -165,33 +166,36 @@ You'll find more information about licensing Neo4j here: [About Neo4j Licenses](
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:neo4j:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>neo4j</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:neo4j:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>neo4j</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Add the Neo4j Java driver if you plan to access the Testcontainer via Bolt:
     
-    ```groovy tab='Gradle'
-    compile "org.neo4j.driver:neo4j-java-driver:1.7.1"
-    ```
+    === "Gradle"
+        ```groovy
+        compile "org.neo4j.driver:neo4j-java-driver:1.7.1"
+        ```
     
-    ```xml tab='Maven'
-    <dependency>
-        <groupId>org.neo4j.driver</groupId>
-        <artifactId>neo4j-java-driver</artifactId>
-        <version>1.7.1</version>
-    </dependency>
-    ```
+    === "Maven"
+        ```xml
+        <dependency>
+            <groupId>org.neo4j.driver</groupId>
+            <artifactId>neo4j-java-driver</artifactId>
+            <version>1.7.1</version>
+        </dependency>
+        ```
     
 
 
diff --git a/docs/modules/databases/oraclexe.md b/docs/modules/databases/oraclexe.md
index 56eb57bc0e5..583d68f3c3d 100644
--- a/docs/modules/databases/oraclexe.md
+++ b/docs/modules/databases/oraclexe.md
@@ -30,18 +30,19 @@ containing `oracle.container.image=IMAGE`, where IMAGE is a suitable image name
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:oracle-xe:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>oracle-xe</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:oracle-xe:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>oracle-xe</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/orientdb.md b/docs/modules/databases/orientdb.md
index 4f0b3550e44..4beffefa6c2 100644
--- a/docs/modules/databases/orientdb.md
+++ b/docs/modules/databases/orientdb.md
@@ -16,27 +16,28 @@ On the JVM you would most likely use the [Java driver](https://github.com/).
 
 The following example uses the JUnit 5 extension `@Testcontainers` and demonstrates both the usage of the Java Client:
 
-```java tab="JUnit 5 example"
-@Testcontainers
-public class ExampleTest {
-
-    @Container
-    private static OrientDBContainer container = new OrientDBContainer();
-
-    @Test
-    void testDbCreation() {
-
-        final ODatabaseSession session = container.getSession();
-
-        session.command("CREATE CLASS Person EXTENDS V");
-        session.command("INSERT INTO Person set name='john'");
-        session.command("INSERT INTO Person set name='jane'");
-
-        assertThat(session.query("SELECT FROM Person").stream()).hasSize(2);
+=== "JUnit 5 example"
+    ```java
+    @Testcontainers
+    public class ExampleTest {
+    
+        @Container
+        private static OrientDBContainer container = new OrientDBContainer();
+    
+        @Test
+        void testDbCreation() {
+    
+            final ODatabaseSession session = container.getSession();
+    
+            session.command("CREATE CLASS Person EXTENDS V");
+            session.command("INSERT INTO Person set name='john'");
+            session.command("INSERT INTO Person set name='jane'");
+    
+            assertThat(session.query("SELECT FROM Person").stream()).hasSize(2);
+        }
+    
     }
-
-}
-```
+    ```
 
 You are not limited to Unit tests and can of course use an instance of the OrientDB Testcontainer in vanilla Java code as well.
 
@@ -45,33 +46,36 @@ You are not limited to Unit tests and can of course use an instance of the Orien
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:orientdb:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>orientdb</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:orientdb:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>orientdb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Add the OrientDB Java client if you plan to access the Testcontainer:
     
-    ```groovy tab='Gradle'
-    compile "com.orientechnologies:orientdb-client:3.0.24"
-    ```
+    === "Gradle"
+        ```groovy
+        compile "com.orientechnologies:orientdb-client:3.0.24"
+        ```
     
-    ```xml tab='Maven'
-    <dependency>
-        <groupId>com.orientechnologies</groupId>
-        <artifactId>orientdb-client</artifactId>
-        <version>3.0.24</version>
-    </dependency>
-    ```
+    === "Maven"
+        ```xml
+        <dependency>
+            <groupId>com.orientechnologies</groupId>
+            <artifactId>orientdb-client</artifactId>
+            <version>3.0.24</version>
+        </dependency>
+        ```
     
 
 
diff --git a/docs/modules/databases/postgres.md b/docs/modules/databases/postgres.md
index 0777296b0c0..b7632d78293 100644
--- a/docs/modules/databases/postgres.md
+++ b/docs/modules/databases/postgres.md
@@ -6,18 +6,19 @@ See [Database containers](./index.md) for documentation and usage that is common
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:postgresql:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>postgresql</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:postgresql:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/docs/modules/databases/presto.md b/docs/modules/databases/presto.md
index 3b987796360..d0a47fc1d7a 100644
--- a/docs/modules/databases/presto.md
+++ b/docs/modules/databases/presto.md
@@ -67,18 +67,19 @@ public class SomeTest {
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:presto:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>presto</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:presto:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>presto</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add the Presto JDBC driver JAR to your project.
diff --git a/docs/modules/databases/trino.md b/docs/modules/databases/trino.md
index 5b65f45934a..b6aeddafb40 100644
--- a/docs/modules/databases/trino.md
+++ b/docs/modules/databases/trino.md
@@ -67,18 +67,20 @@ public class SomeTest {
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:trino:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>trino</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:trino:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>trino</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add the Trino JDBC driver JAR to your project.
diff --git a/docs/modules/docker_compose.md b/docs/modules/docker_compose.md
index b789a0030a7..50bb946f311 100644
--- a/docs/modules/docker_compose.md
+++ b/docs/modules/docker_compose.md
@@ -177,16 +177,17 @@ There are 3 ways to specify location of the `config.json` for Docker Compose:
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>testcontainers</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 738bf427a56..845ee0d2d1a 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -41,15 +41,17 @@ other new and advanced features), you can use this instead:
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:elasticsearch:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>elasticsearch</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:elasticsearch:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>elasticsearch</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index aeab52fc932..7431ed0de0f 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -141,15 +141,16 @@ See more examples:
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:gcloud:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>gcloud</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:gcloud:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>gcloud</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/k3s.md b/docs/modules/k3s.md
index a3c2c0fa754..27d2f863122 100644
--- a/docs/modules/k3s.md
+++ b/docs/modules/k3s.md
@@ -39,15 +39,16 @@ This may be used with Kubernetes clients - e.g. for the [official Java client](c
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:k3s:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>k3s</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:k3s:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>k3s</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 58f447d412e..9b222cef125 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -50,15 +50,16 @@ You will need to explicitly create a network and set it on the Kafka container a
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:kafka:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>kafka</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:kafka:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>kafka</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 1585c504cff..b551536af74 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -66,15 +66,16 @@ Testcontainers will inform Localstack of the best hostname automatically, using
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:localstack:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>localstack</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:localstack:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>localstack</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md
index bf56046deda..c739278acff 100644
--- a/docs/modules/mockserver.md
+++ b/docs/modules/mockserver.md
@@ -20,18 +20,19 @@ And how to set a simple expectation using the Java MockServerClient.
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:mockserver:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>mockserver</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:mockserver:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>mockserver</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 Additionally, don't forget to add a [client dependency `org.mock-server:mockserver-client-java`](https://search.maven.org/search?q=mockserver-client-java) 
 to be able to set expectations, it's not provided by the testcontainers module. Client version should match to the version in a container tag.
diff --git a/docs/modules/nginx.md b/docs/modules/nginx.md
index 5169d3c5625..fb4270ba4a3 100644
--- a/docs/modules/nginx.md
+++ b/docs/modules/nginx.md
@@ -26,15 +26,16 @@ And how to query the Nginx server for the custom content added.
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:nginx:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>nginx</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:nginx:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>nginx</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/pulsar.md b/docs/modules/pulsar.md
index 92eda498f7c..6d16a248872 100644
--- a/docs/modules/pulsar.md
+++ b/docs/modules/pulsar.md
@@ -4,15 +4,16 @@
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:pulsar:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>pulsar</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:pulsar:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>pulsar</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/rabbitmq.md b/docs/modules/rabbitmq.md
index dff8631eeca..8a9ae9d9b97 100644
--- a/docs/modules/rabbitmq.md
+++ b/docs/modules/rabbitmq.md
@@ -7,15 +7,16 @@
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:rabbitmq:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>rabbitmq</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:rabbitmq:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>rabbitmq</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/solr.md b/docs/modules/solr.md
index bb2d18d6431..44be46c1a1a 100644
--- a/docs/modules/solr.md
+++ b/docs/modules/solr.md
@@ -20,15 +20,16 @@ You can start a solr container instance from any Java application by using:
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:solr:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>solr</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:solr:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>solr</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
index a3403ccc377..aa6013284ed 100644
--- a/docs/modules/toxiproxy.md
+++ b/docs/modules/toxiproxy.md
@@ -72,18 +72,19 @@ Additionally we can disable the proxy to simulate a complete interruption to the
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:toxiproxy:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>toxiproxy</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:toxiproxy:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>toxiproxy</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 ## Acknowledgements
 
diff --git a/docs/modules/vault.md b/docs/modules/vault.md
index 3140a6258bc..577ed91a32f 100644
--- a/docs/modules/vault.md
+++ b/docs/modules/vault.md
@@ -41,18 +41,19 @@ test how your application behaves with Vault by writing different test scenarios
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:vault:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>vault</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:vault:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>vault</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 ## License
 
diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index 3c6b0ffae27..d589aa18098 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -88,32 +88,35 @@ A few different examples are shown in [ChromeWebDriverContainerTest.java](https:
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:selenium:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>selenium</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:selenium:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>selenium</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a Selenium Webdriver JAR to your project. You should ensure that your project also has suitable Selenium dependencies in place, for example:
 
-    ```groovy tab='Gradle'
-    compile "org.seleniumhq.selenium:selenium-remote-driver:3.141.59"
-    ```
+    === "Gradle"
+        ```groovy
+        compile "org.seleniumhq.selenium:selenium-remote-driver:3.141.59"
+        ```
     
-    ```xml tab='Maven'
-    <dependency>
-        <groupId>org.seleniumhq.selenium</groupId>
-        <artifactId>selenium-remote-driver</artifactId>
-        <version>3.141.59</version>
-    </dependency>
-    ```
+    === "Maven"
+        ```xml
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-remote-driver</artifactId>
+            <version>3.141.59</version>
+        </dependency>
+        ```
     
     Testcontainers will try and match the version of the Dockerized browser to whichever version of Selenium is found on the classpath
diff --git a/docs/quickstart/junit_4_quickstart.md b/docs/quickstart/junit_4_quickstart.md
index 1a2cd84c77e..57946c1fb74 100644
--- a/docs/quickstart/junit_4_quickstart.md
+++ b/docs/quickstart/junit_4_quickstart.md
@@ -21,18 +21,19 @@ Let's start from here, and see how to improve the test with Testcontainers:
 
 First, add Testcontainers as a dependency as follows:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>testcontainers</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 ## 2. Get Testcontainers to run a Redis container during our tests
 
diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
index b50272cb68d..24e9dd71a74 100644
--- a/docs/quickstart/junit_5_quickstart.md
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -21,32 +21,33 @@ Let's start from here, and see how to improve the test with Testcontainers:
 
 First, add Testcontainers as a dependency as follows:
 
-```groovy tab='Gradle'
-testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
-testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
-testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.junit.jupiter</groupId>
-    <artifactId>junit-jupiter</artifactId>
-    <version>5.8.1</version>
-    <scope>test</scope>
-</dependency>
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>testcontainers</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>junit-jupiter</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
+    testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
+    testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <version>5.8.1</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 ## 2. Get Testcontainers to run a Redis container during our tests
 
diff --git a/docs/quickstart/spock_quickstart.md b/docs/quickstart/spock_quickstart.md
index 875c1976c93..267954e99ee 100644
--- a/docs/quickstart/spock_quickstart.md
+++ b/docs/quickstart/spock_quickstart.md
@@ -21,27 +21,29 @@ Let's start from here, and see how to improve the test with Testcontainers:
 
 First, add Testcontainers as a dependency as follows:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:spock:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>spock</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:spock:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>spock</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 ## 2. Get Testcontainers to run a Redis container during our tests
 
 Annotate the Spock specification class with the Testcontainers extension:
 
-```groovy tab='Spock Testcontainers annotation'
-@org.testcontainers.spock.Testcontainers
-class RedisBackedCacheIntTest extends Specification {
-```
+=== "Spock Testcontainers annotation"
+    ```groovy
+    @org.testcontainers.spock.Testcontainers
+    class RedisBackedCacheIntTest extends Specification {
+    ```
 
 And add the following field to the body of our test class:
 
diff --git a/docs/test_framework_integration/junit_5.md b/docs/test_framework_integration/junit_5.md
index 7f3689c0301..15597f90cdb 100644
--- a/docs/test_framework_integration/junit_5.md
+++ b/docs/test_framework_integration/junit_5.md
@@ -68,15 +68,16 @@ This extension has only be tested with sequential test execution. Using it with
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>junit-jupiter</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/docs/test_framework_integration/spock.md b/docs/test_framework_integration/spock.md
index 11ccf058767..b8c1d5b7eae 100644
--- a/docs/test_framework_integration/spock.md
+++ b/docs/test_framework_integration/spock.md
@@ -17,18 +17,19 @@ can be mixed with Spock's `@Shared` annotation to indicate, that containers shou
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:spock:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>spock</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:spock:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>spock</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 
 ## Attributions
diff --git a/mkdocs.yml b/mkdocs.yml
index 694fca299ca..e4115625a7f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -21,6 +21,8 @@ markdown_extensions:
     - codehilite:
           linenums: False
     - pymdownx.superfences
+    - pymdownx.tabbed:
+        alternate_style: true
     - pymdownx.snippets
 nav:
     - Home: index.md
diff --git a/requirements.txt b/requirements.txt
index f962b36a44f..8f4a1a5f100 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-mkdocs==1.0.4
-mkdocs-codeinclude-plugin==0.1.0
-mkdocs-material==4.6.0
-mkdocs-markdownextradata-plugin==0.1.1
-markdown>=3.1,<3.2
+mkdocs==1.2.3
+mkdocs-codeinclude-plugin==0.2.0
+mkdocs-material==8.1.3
+mkdocs-markdownextradata-plugin==0.2.5

From 720c2ea81f6bf624ff7d8ad1b2b3f89824c3b006 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 09:23:15 +0100
Subject: [PATCH 1740/4969] Update Gradle Wrapper to 7.4 (#5036)

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 59536 -> 59821 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
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
R_{@Vu|29OF7ypyz{{qB}Ob!45

delta 8722
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

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 59250647c40..1debed0d8fd 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
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
R_{@Vu|29OF7ypyz{{qB}Ob!45

delta 8722
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ee6ba9a3ac4..dcf5e2cb7b3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From affee6c23f2f5192813f1be84b4ec050116b56fd Mon Sep 17 00:00:00 2001
From: Stefan Decker <StefanHufschmidt@users.noreply.github.com>
Date: Thu, 10 Feb 2022 10:02:42 +0100
Subject: [PATCH 1741/4969] #5032 - MS SQL Server disable encrypt by default
 (#5033)

This disables the JDBC driver encrypt option by default for MS SQL Server container connections.
Since release 10.1.0 of the MS JDBC driver, the encrypt option is enabled by default (see https://github.com/microsoft/mssql-jdbc/releases/tag/v10.1.0).
To be able to use the container without having to manually add params the encrypt option will be switched off if it is not set.


Signed-off-by: Decker, Stefan <Stefan.Decker@gdata.de>

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 modules/mssqlserver/build.gradle                      |  3 +--
 .../containers/MSSQLServerContainer.java              | 11 +++++++++++
 .../junit/mssqlserver/SimpleMSSQLServerTest.java      |  3 +--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 1e554440939..1f754303ae1 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,12 +10,11 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.5.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.5.0.jre8-preview'
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index ecccc320b28..fe6270d04c7 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -91,6 +91,17 @@ public String getDriverClassName() {
         return "com.microsoft.sqlserver.jdbc.SQLServerDriver";
     }
 
+    @Override
+    protected String constructUrlForConnection(String queryString) {
+        // The JDBC driver of MS SQL Server enables encryption by default for versions > 10.1.0.
+        // We need to disable it by default to be able to use the container without having to pass extra params.
+        // See https://github.com/microsoft/mssql-jdbc/releases/tag/v10.1.0
+        if (urlParameters.keySet().stream().map(String::toLowerCase).noneMatch("encrypt"::equals)) {
+            urlParameters.put("encrypt", "false");
+        }
+        return super.constructUrlForConnection(queryString);
+    }
+
     @Override
     public String getJdbcUrl() {
         String additionalUrlParams = constructUrlParameters(";", ";");
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 100b29b34f7..1530760b673 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.junit.mssqlserver;
 
 import org.junit.Test;
-import org.testcontainers.MSSQLServerTestImages;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -11,7 +10,7 @@
 import java.sql.Statement;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.testcontainers.MSSQLServerTestImages.MSSQL_SERVER_IMAGE;
 

From 71a073bc5ddfce38b2b5348d9d7d4eb63f296290 Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Thu, 17 Feb 2022 14:40:19 +0100
Subject: [PATCH 1742/4969] Polish code samples on container logs so that they
 are easier to copy & paste (#5038)

---
 docs/features/container_logs.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/features/container_logs.md b/docs/features/container_logs.md
index d603981059a..a063e5329e4 100644
--- a/docs/features/container_logs.md
+++ b/docs/features/container_logs.md
@@ -40,19 +40,19 @@ By default both standard out and standard error will both be emitted at INFO lev
 Standard error may be emitted at ERROR level, if desired:
 
 ```java
-Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log).withSeparateOutputStreams()
+Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER).withSeparateOutputStreams();
 ```
 
 The [Mapped Diagnostic Context (MDC)](http://logback.qos.ch/manual/mdc.html) for emitted messages may be configured using the `withMdc(...)` option:
 
 ```java
-Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log).withMdc("key", "value")
+Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER).withMdc("key", "value");
 ```
 
 or using an existing map of key-value pairs:
 
 ```java
-Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log).withMdc(map)
+Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER).withMdc(map);
 ```
 
 ### Capturing container output as a String

From bfb8cecd69f852eb2ffa8ee93edbfb0edc54762a Mon Sep 17 00:00:00 2001
From: Yannick Weber <yannick.weber@hivemq.com>
Date: Thu, 17 Feb 2022 14:54:27 +0100
Subject: [PATCH 1743/4969] New Module: HiveMQ  (#4797)

Co-authored-by: Jochen Mader <jochen@codepitbull.de>
---
 .github/dependabot.yml                        |   5 +
 .../strategy/MultiLogMessageWaitStrategy.java |  59 ++
 docs/modules/hivemq.md                        | 235 +++++++
 docs/modules_logos/hivemq-module.png          | Bin 0 -> 165340 bytes
 mkdocs.yml                                    |   1 +
 modules/hivemq/build.gradle                   |  37 ++
 .../hivemq/HiveMQContainer.java               | 573 ++++++++++++++++++
 .../hivemq/HiveMQExtension.java               | 287 +++++++++
 .../org/testcontainers/hivemq/PathUtil.java   |  26 +
 .../hivemq/ContainerWithControlCenterIT.java  |  34 ++
 .../hivemq/ContainerWithCustomConfigIT.java   |  43 ++
 ...ContainerWithExtensionFromDirectoryIT.java |  43 ++
 .../hivemq/ContainerWithExtensionIT.java      |  41 ++
 .../ContainerWithExtensionSubclassIT.java     |  35 ++
 .../ContainerWithFileInExtensionHomeIT.java   |  77 +++
 .../hivemq/ContainerWithFileInHomeIT.java     |  75 +++
 .../hivemq/ContainerWithLicenseIT.java        |  78 +++
 .../ContainerWithoutPlatformExtensionsIT.java | 135 +++++
 .../hivemq/CreateFileInCopiedDirectoryIT.java |  92 +++
 .../CreateFileInExtensionDirectoryIT.java     |  76 +++
 ...DisableEnableExtensionFromDirectoryIT.java |  37 ++
 .../hivemq/DisableEnableExtensionIT.java      |  46 ++
 .../hivemq/HiveMQExtensionTest.java           |  13 +
 .../hivemq/HiveMQTestContainerCore.java       |  82 +++
 .../testcontainers/hivemq/PathUtilTest.java   |  43 ++
 .../hivemq/docs/DemoDisableExtensionsIT.java  |  63 ++
 .../hivemq/docs/DemoExtensionTestsIT.java     |  57 ++
 .../hivemq/docs/DemoFilesIT.java              |  62 ++
 .../hivemq/docs/DemoHiveMQContainerIT.java    |  61 ++
 .../hivemq/util/MyExtension.java              |  37 ++
 .../util/MyExtensionWithSubclasses.java       |  26 +
 .../hivemq/util/PublishModifier.java          |  16 +
 .../hivemq/util/TestPublishModifiedUtil.java  |  48 ++
 .../src/test/resources/additionalFile.txt     |   0
 modules/hivemq/src/test/resources/config.xml  |  15 +
 .../src/test/resources/inMemoryConfig.xml     |   6 +
 .../src/test/resources/logback-test.xml       |  18 +
 .../hivemq-extension.xml                      |   8 +
 .../modifier-extension-1.0-SNAPSHOT.jar       | Bin 0 -> 102179 bytes
 .../modifier-extension/hivemq-extension.xml   |   8 +
 .../modifier-extension-1.0-SNAPSHOT.jar       | Bin 0 -> 102179 bytes
 .../test/resources/myExtensionLicense.elic    |   0
 .../hivemq/src/test/resources/myLicense.lic   |   0
 43 files changed, 2598 insertions(+)
 create mode 100644 core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java
 create mode 100644 docs/modules/hivemq.md
 create mode 100644 docs/modules_logos/hivemq-module.png
 create mode 100644 modules/hivemq/build.gradle
 create mode 100644 modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
 create mode 100644 modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
 create mode 100755 modules/hivemq/src/main/java/org/testcontainers/hivemq/PathUtil.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
 create mode 100644 modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java
 create mode 100755 modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
 create mode 100755 modules/hivemq/src/test/resources/additionalFile.txt
 create mode 100755 modules/hivemq/src/test/resources/config.xml
 create mode 100644 modules/hivemq/src/test/resources/inMemoryConfig.xml
 create mode 100644 modules/hivemq/src/test/resources/logback-test.xml
 create mode 100755 modules/hivemq/src/test/resources/modifier-extension-wrong-name/hivemq-extension.xml
 create mode 100644 modules/hivemq/src/test/resources/modifier-extension-wrong-name/modifier-extension-1.0-SNAPSHOT.jar
 create mode 100755 modules/hivemq/src/test/resources/modifier-extension/hivemq-extension.xml
 create mode 100644 modules/hivemq/src/test/resources/modifier-extension/modifier-extension-1.0-SNAPSHOT.jar
 create mode 100755 modules/hivemq/src/test/resources/myExtensionLicense.elic
 create mode 100755 modules/hivemq/src/test/resources/myLicense.lic

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 355d44f2bb4..5d67f278219 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -57,6 +57,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/hivemq"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/influxdb"
     schedule:
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java
new file mode 100644
index 00000000000..0d342f3050f
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java
@@ -0,0 +1,59 @@
+package org.testcontainers.containers.wait.strategy;
+
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.WaitingConsumer;
+import org.testcontainers.utility.LogUtils;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
+
+/**
+ * This is a wait strategy to wait for multiple log patterns.
+ * The wait strategy will continue when every log pattern is matched at least once.
+ */
+public class MultiLogMessageWaitStrategy extends AbstractWaitStrategy {
+
+    private final ConcurrentHashMap<String, Boolean> regexes = new ConcurrentHashMap<>();
+
+    @Override
+    protected void waitUntilReady() {
+        WaitingConsumer waitingConsumer = new WaitingConsumer();
+        LogUtils.followOutput(DockerClientFactory.instance().client(), waitStrategyTarget.getContainerId(), waitingConsumer);
+
+        Predicate<OutputFrame> waitPredicate = outputFrame -> {
+            if (regexes.isEmpty()) {
+                return true;
+            }
+            regexes.entrySet().forEach(regexHasMatched -> {
+                final boolean matched = outputFrame.getUtf8String().matches("(?s)" + regexHasMatched.getKey());
+                if (matched) {
+                    regexHasMatched.setValue(true);
+                }
+            });
+            return regexes.values().stream().reduce(Boolean::logicalAnd).orElse(true);
+        };
+
+        try {
+            waitingConsumer.waitUntil(waitPredicate, startupTimeout.getSeconds(), TimeUnit.SECONDS, 1);
+        } catch (TimeoutException e) {
+            throw new ContainerLaunchException("Timed out waiting for log output matching '" + regexes + "'");
+        }
+    }
+
+    public MultiLogMessageWaitStrategy withRegEx(final String regEx) {
+        regexes.put(regEx, false);
+        return this;
+    }
+
+    public MultiLogMessageWaitStrategy reset() {
+        for (final Map.Entry<String, Boolean> stringBooleanEntry : regexes.entrySet()) {
+            stringBooleanEntry.setValue(false);
+        }
+        return this;
+    }
+}
diff --git a/docs/modules/hivemq.md b/docs/modules/hivemq.md
new file mode 100644
index 00000000000..1e09bac4fc0
--- /dev/null
+++ b/docs/modules/hivemq.md
@@ -0,0 +1,235 @@
+# HiveMQ Module
+
+<img src="../modules_logos/hivemq-module.png" alt="drawing" width="800"/>
+
+Automatic starting HiveMQ docker containers for JUnit4 and JUnit5 tests.
+This enables testing MQTT client applications and integration testing of custom HiveMQ extensions.
+
+- Community forum: https://community.hivemq.com/
+- HiveMQ website: https://www.hivemq.com/
+- MQTT resources:
+    - [MQTT Essentials](https://www.hivemq.com/mqtt-essentials/)
+    - [MQTT 5 Essentials](https://www.hivemq.com/mqtt-5/)
+    
+Please make sure to check out the hivemq-docs for the [Community Edition](https://github.com/hivemq/hivemq-community-edition/wiki/) 
+and the [Enterprise Edition](https://www.hivemq.com/docs/hivemq/4.7/user-guide/).
+
+## Using HiveMQ CE/EE
+
+HiveMQ provides different editions of on [Docker Hub](https://hub.docker.com/u/hivemq):
+
+- the open source [Community Edition](https://github.com/hivemq/hivemq-community-edition) which 
+is published as *hivemq/hivemq-ce*.
+- the [Enterprise Edition](https://www.hivemq.com/docs/hivemq/4.7/user-guide/) which is published as *hivemq/hivemq4*.
+
+Both editions can be used directly:
+
+Using the Community Edition:
+<!--codeinclude-->
+[Community Edition HiveMQ image](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:ceVersion
+<!--/codeinclude-->
+
+Using the Enterprise Edition:
+<!--codeinclude-->
+[Enterprise Edition HiveMQ image](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:eeVersion
+<!--/codeinclude-->
+
+Using a specifc version is possible by using the tag:
+<!--codeinclude-->
+[Specific HiveMQ Version](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:specificVersion
+<!--/codeinclude-->
+
+## Test your MQTT 3 and MQTT 5 client application
+
+Using an Mqtt-client (e.g. the [HiveMQ-Mqtt-Client](https://github.com/hivemq/hivemq-mqtt-client)) you can start 
+testing directly. 
+
+<!--codeinclude-->
+[MQTT5 Client](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:mqtt5client
+<!--/codeinclude-->
+
+## Settings
+
+There are several things that can be adjusted before container setup.
+The following example shows how to enable the Control Center (this is an enterprise feature), set the log level to DEBUG 
+and load a HiveMQ-config-file from the classpath.
+
+<!--codeinclude-->
+[Config Examples](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:eeVersionWithControlCenter
+<!--/codeinclude-->
+
+---
+**Note:**
+The Control Center of HiveMQ can be accessed via the URL presented in the output of the starting container:
+
+```
+2021-09-10 10:35:53,511 INFO  - The HiveMQ Control Center is reachable under: http://localhost:55032
+```
+
+Please be aware that the Control Center is a feature of the enterprise edition of HiveMQ and thus only available with 
+the enterprise image. 
+
+---
+
+## Testing HiveMQ extensions
+
+Using the [Extension SDK](https://github.com/hivemq/hivemq-extension-sdk) the functionality of all editions of HiveMQ
+can be extended. 
+The HiveMQ module also supports testing your own custom extensions.
+
+### Wait Strategy
+
+The raw HiveMQ module is built to wait for certain startup log messages to signal readiness.
+Since extensions are loaded dynamically they can be available a short while after the main container has started.
+We therefore provide custom wait conditions for HiveMQ Extensions:
+
+The following will specify an extension to be loaded from **src/test/resources/modifier-extension** into the container and 
+wait for an  extension named **'My Extension Name'** to be started: 
+
+<!--codeinclude-->
+[Custom Wait Strategy](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java) inside_block:waitStrategy
+<!--/codeinclude-->
+
+Next up we have an example for using an extension directly from the classpath and waiting directly on the extension:
+
+<!--codeinclude-->
+[Extension from Classpath](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java) inside_block:extensionClasspath
+<!--/codeinclude-->
+
+---
+**Note** Debugging extensions
+
+Both examples contain ```.withDebugging()``` which enables remote debugging on the container.
+With debugging enabled you can start putting breakpoints right into your extensions.
+
+--- 
+
+### Testing extensions using Gradle
+
+In a Gradle based HiveMQ Extension project, testing is supported using the dedicated [HiveMQ Extension Gradle Plugin](https://github.com/hivemq/hivemq-extension-gradle-plugin/README.md).
+
+The plugin adds an `integrationTest` task which executes tests from the `integrationTest` source set.
+- Integration test source files are defined in `src/integrationTest`.
+- Integration test dependencies are defined via the `integrationTestImplementation`, `integrationTestRuntimeOnly`, etc. configurations.
+
+The `integrationTest` task builds the extension and unzips it to the `build/hivemq-extension-test` directory.
+The tests can then load the built extension into the HiveMQ Testcontainer.
+
+<!--codeinclude-->
+[Extension from filesystem](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:startFromFilesystem
+<!--/codeinclude-->
+
+### Enable/Disable an extension
+
+It is possible to enable and disable HiveMQ extensions during runtime. Extensions can also be disabled on startup.
+
+---
+**Note**: that disabling or enabling of extension during runtime is only supported in HiveMQ 4 Enterprise Edition Containers.
+
+---
+
+The following example shows how to start a HiveMQ container with the extension called **my-extension** being disabled.
+
+
+<!--codeinclude-->
+[Disable Extension at startup](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:startDisabled
+<!--/codeinclude-->
+
+The following test then proceeds to enable and then disable the extension:
+
+<!--codeinclude-->
+[Enable/Disable extension at runtime](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:runtimeEnable
+<!--/codeinclude-->
+
+## Enable/Disable an extension loaded from a folder
+
+Extensions loaded from an extension folder during runtime can also be enabled/disabled on the fly.
+If the extension folder contains a DISABLED file, the extension will be disabled during startup.
+
+---
+**Note**: that disabling or enabling of extension during runtime is only supported in HiveMQ 4 Enterprise Edition Containers.
+
+---
+
+We first load the extension from the filesytem:
+<!--codeinclude-->
+[Extension from filesystem](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:startFromFilesystem
+<!--/codeinclude-->
+
+Now we can enable/disable the extension using its name:
+
+<!--codeinclude-->
+[Enable/Disable extension at runtime](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:runtimeEnableFilesystem
+<!--/codeinclude-->
+
+### Remove prepackaged HiveMQ Extensions
+
+Since HiveMQ's 4.4 release, HiveMQ Docker images come with the HiveMQ Extension for Kafka, the HiveMQ Enterprise Bridge Extension
+and the HiveMQ Enterprise Security Extension.
+These Extensions are disabled by default, but sometimes you my need to remove them before the container starts.
+
+Removing all extension is as simple as:
+
+<!--codeinclude-->
+[Remove all extensions](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:noExtensions
+<!--/codeinclude-->
+
+A single extension (e.g. Kafka) can be removed as easily:
+<!--codeinclude-->
+[Remove a specific extension](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:noKafkaExtension
+<!--/codeinclude-->
+
+## Put files into the container
+
+### Put a file into HiveMQ home
+
+<!--codeinclude-->
+[Put file into HiveMQ home](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java) inside_block:hivemqHome
+<!--/codeinclude-->
+
+### Put files into extension home
+
+<!--codeinclude-->
+[Put file into HiveMQ-Extension home](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java) inside_block:extensionHome
+<!--/codeinclude-->
+
+### Put license files into the container
+
+<!--codeinclude-->
+[Put license file into the HiveMQ container](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java) inside_block:withLicenses
+<!--/codeinclude-->
+
+
+### Customize the Container further
+
+Since the `HiveMQContainer` extends from [Testcontainer's](https://github.com/testcontainers) `GenericContainer` the container
+can be customized as desired.
+
+## Add to your project
+
+### Gradle
+
+Add to `build.gradle`:
+
+````groovy
+testImplementation 'org.testcontainers:hivemq:{{latest_version}}'
+````
+
+Add to `build.gradle.kts`:
+
+````kotlin
+testImplementation("org.testcontainers:hivemq:{{latest_version}}")
+````
+
+### Maven
+
+Add to `pom.xml`:
+
+```xml
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>hivemq</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/docs/modules_logos/hivemq-module.png b/docs/modules_logos/hivemq-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..55c0ee1644ae05a5ff5b36f90ebdb1006b296f42
GIT binary patch
literal 165340
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
E0rq9^#Q*>R

literal 0
HcmV?d00001

diff --git a/mkdocs.yml b/mkdocs.yml
index e4115625a7f..7ace7382e41 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -67,6 +67,7 @@ nav:
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/gcloud.md
+          - modules/hivemq.md
           - modules/k3s.md
           - modules/kafka.md
           - modules/localstack.md
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
new file mode 100644
index 00000000000..779ac2ec9d8
--- /dev/null
+++ b/modules/hivemq/build.gradle
@@ -0,0 +1,37 @@
+description = "TestContainers :: HiveMQ"
+
+dependencies {
+    api(project(":testcontainers"))
+    api("org.jetbrains:annotations:23.0.0")
+
+    shaded("org.apache.commons:commons-lang3:3.12.0")
+    shaded("commons-io:commons-io:2.11.0")
+    shaded("org.javassist:javassist:3.28.0-GA")
+    shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
+    shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
+    shaded("net.lingala.zip4j:zip4j:2.9.1")
+
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation(project(":junit-jupiter"))
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.7.3")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
+    testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
+    testImplementation("ch.qos.logback:logback-classic:1.2.10")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
new file mode 100644
index 00000000000..37f9a9259d1
--- /dev/null
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -0,0 +1,573 @@
+package org.testcontainers.hivemq;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.apache.commons.io.FileUtils;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.MultiLogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class HiveMQContainer extends GenericContainer<HiveMQContainer> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HiveMQContainer.class);
+
+    private static final DockerImageName DEFAULT_HIVEMQ_EE_IMAGE_NAME = DockerImageName.parse("hivemq/hivemq4");
+    private static final DockerImageName DEFAULT_HIVEMQ_CE_IMAGE_NAME = DockerImageName.parse("hivemq/hivemq-ce");
+
+    private static final int DEBUGGING_PORT = 9000;
+    private static final int MQTT_PORT = 1883;
+    private static final int CONTROL_CENTER_PORT = 8080;
+    @SuppressWarnings("OctalInteger")
+    private static final int MODE = 0777;
+    private static final @NotNull Pattern EXTENSION_ID_PATTERN = Pattern.compile("<id>(.+?)</id>");
+
+    private final @NotNull ConcurrentHashMap<String, CountDownLatch> containerOutputLatches = new ConcurrentHashMap<>();
+    private boolean controlCenterEnabled = false;
+    private boolean debugging = false;
+
+    private final @NotNull Set<String> prepackagedExtensionsToRemove = new HashSet<>();
+    private boolean removeAllPrepackagedExtensions = false;
+
+    private final @NotNull MultiLogMessageWaitStrategy waitStrategy = new MultiLogMessageWaitStrategy();
+
+    public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_HIVEMQ_CE_IMAGE_NAME, DEFAULT_HIVEMQ_EE_IMAGE_NAME);
+
+        addExposedPort(MQTT_PORT);
+
+        waitStrategy.withRegEx("(.*)Started HiveMQ in(.*)");
+        waitingFor(waitStrategy);
+
+        withLogConsumer(outputFrame -> {
+            final String utf8String = outputFrame.getUtf8String();
+            if (debugging && utf8String.startsWith("Listening for transport dt_socket at address:")) {
+                System.out.println("Listening for transport dt_socket at address: " + getMappedPort(DEBUGGING_PORT));
+            }
+            if (!containerOutputLatches.isEmpty()) {
+                containerOutputLatches.forEach((regEx, latch) -> {
+                    if (outputFrame.getUtf8String().matches("(?s)" + regEx)) {
+                        LOGGER.debug("Container Output '{}' matched RegEx '{}'", utf8String, regEx);
+                        latch.countDown();
+                    } else {
+                        LOGGER.debug("Container Output '{}' did not match RegEx '{}'", utf8String, regEx);
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void configure() {
+        final String removeCommand;
+        withCreateContainerCmdModifier(it -> it.withEntrypoint("/bin/sh"));
+
+        if (removeAllPrepackagedExtensions || !prepackagedExtensionsToRemove.isEmpty()) {
+
+            if (removeAllPrepackagedExtensions) {
+                removeCommand = "rm -rf /opt/hivemq/extensions/** &&";
+            } else {
+                removeCommand = prepackagedExtensionsToRemove.stream()
+                    .map(extensionId -> "rm -rf /opt/hivemq/extensions/" + extensionId + "&&")
+                    .collect(Collectors.joining());
+            }
+        } else {
+            removeCommand = "";
+        }
+        setCommand(
+            "-c",
+            removeCommand +
+                "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ " +
+                "; rm -rf /opt/hivemq/temp-extensions/** " +
+                "&& chmod -R 777 /opt/hivemq/extensions " +
+                "&& /opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
+        );
+    }
+
+    protected void containerIsStarted(final @NotNull InspectContainerResponse containerInfo) {
+        if (controlCenterEnabled) {
+            LOGGER.info("The HiveMQ Control Center is reachable under: http://{}:{}", getHost(), getMappedPort(CONTROL_CENTER_PORT));
+        }
+    }
+
+    /**
+     * Adds a wait condition for the extension with this name.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @param extensionName the extension to wait for
+     * @return self
+     */
+    public @NotNull HiveMQContainer waitForExtension(final @NotNull String extensionName) {
+        final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) started successfully(.*)";
+        waitStrategy.withRegEx(regEX);
+        return self();
+    }
+
+    /**
+     * Adds a wait condition for this {@link HiveMQExtension}
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @param extension the extension to wait for
+     * @return self
+     */
+    public @NotNull HiveMQContainer waitForExtension(final @NotNull HiveMQExtension extension) {
+        return this.waitForExtension(extension.getName());
+    }
+
+    /**
+     * Enables the possibility for remote debugging clients to connect.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @return self
+     */
+    public @NotNull HiveMQContainer withDebugging() {
+        debugging = true;
+        addExposedPorts(DEBUGGING_PORT);
+        withEnv("JAVA_OPTS", "-agentlib:jdwp=transport=dt_socket,address=0.0.0.0:" + DEBUGGING_PORT + ",server=y,suspend=y");
+        return self();
+    }
+
+    /**
+     * Sets the logging {@link Level} inside the container.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @param level the {@link Level}
+     * @return self
+     */
+    public @NotNull HiveMQContainer withLogLevel(final @NotNull Level level) {
+        this.withEnv("HIVEMQ_LOG_LEVEL", level.name());
+        return self();
+    }
+
+    /**
+     * Wraps the given class and all its subclasses into an extension
+     * and puts it into '/opt/hivemq/temp-extensions/{extension-id}' inside the container.
+     * <p>
+     * Must be called before the container is started.
+     * <p>
+     * The contents of the '/opt/hivemq/temp-extensions/' directory are copied to '/opt/hivemq/extensions/' before the container is started.
+     *
+     * @param hiveMQExtension the {@link HiveMQExtension} of the extension
+     * @return self
+     */
+    public @NotNull HiveMQContainer withExtension(final @NotNull HiveMQExtension hiveMQExtension) {
+        try {
+            final File extension = hiveMQExtension.createExtension(hiveMQExtension);
+            final MountableFile mountableExtension = MountableFile.forHostPath(extension.getPath(), MODE);
+            withCopyFileToContainer(mountableExtension, "/opt/hivemq/temp-extensions/" + hiveMQExtension.getId());
+        } catch (final Exception e) {
+            throw new ContainerLaunchException(e.getMessage() == null ? "" : e.getMessage(), e);
+        }
+        return self();
+    }
+
+    /**
+     * Puts the given extension folder into '/opt/hivemq/temp-extensions/{directory-name}' inside the container.
+     * It must at least contain a valid hivemq-extension.xml and a valid extension.jar in order to be executed.
+     * The directory-name is taken from the id defined in the hivemq-extension.xml.
+     * <p>
+     * Must be called before the container is started.
+     * <p>
+     * The contents of the '/opt/hivemq/temp-extensions/' directory are copied to '/opt/hivemq/extensions/' before the container is started.
+     *
+     * @param mountableExtension the extension folder on the host machine
+     * @return self
+     */
+    public @NotNull HiveMQContainer withExtension(final @NotNull MountableFile mountableExtension) {
+        final File extensionDir = new File(mountableExtension.getResolvedPath());
+        if (!extensionDir.exists()) {
+            throw new ContainerLaunchException("Extension '" + mountableExtension.getFilesystemPath() + "' could not be mounted. It does not exist.");
+        }
+        if (!extensionDir.isDirectory()) {
+            throw new ContainerLaunchException("Extension '" + mountableExtension.getFilesystemPath() + "' could not be mounted. It is not a directory.");
+        }
+        try {
+            final String extensionDirName = getExtensionDirectoryName(extensionDir);
+            final String containerPath = "/opt/hivemq/temp-extensions/" + extensionDirName;
+            withCopyFileToContainer(cloneWithFileMode(mountableExtension), containerPath);
+            LOGGER.info("Putting extension '{}' into '{}'", extensionDirName, containerPath);
+        } catch (final Exception e) {
+            throw new ContainerLaunchException(e.getMessage() == null ? "" : e.getMessage(), e);
+        }
+        return self();
+    }
+
+    private @NotNull String getExtensionDirectoryName(final @NotNull File extensionDirectory) throws IOException {
+        final File file = new File(extensionDirectory, "hivemq-extension.xml");
+        final String xml = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
+        final Matcher matcher = EXTENSION_ID_PATTERN.matcher(xml);
+
+        if (!matcher.find()) {
+            throw new IllegalStateException("Could not parse extension id from '" + file.getAbsolutePath() + "'");
+        }
+        return matcher.group(1);
+    }
+
+    /**
+     * Removes the specified prepackaged extension folders from '/opt/hivemq/extensions' before the container is started.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @param extensionIds the prepackaged extensions to remove
+     * @return self
+     */
+    public @NotNull HiveMQContainer withoutPrepackagedExtensions(final @NotNull String... extensionIds) {
+        Collections.addAll(prepackagedExtensionsToRemove, extensionIds);
+        return self();
+    }
+
+    /**
+     * Removes all prepackaged extension folders from '/opt/hivemq/extensions' before the container is started.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @return self
+     */
+    public @NotNull HiveMQContainer withoutPrepackagedExtensions() {
+        removeAllPrepackagedExtensions = true;
+        return self();
+    }
+
+    /**
+     * Puts the given license into '/opt/hivemq/license/' inside the container.
+     * It must end with '.lic' or '.elic'.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @param mountableLicense the license file on the host machine
+     * @return self
+     */
+    public @NotNull HiveMQContainer withLicense(final @NotNull MountableFile mountableLicense) {
+        final File licenseFile = new File(mountableLicense.getResolvedPath());
+        if (!licenseFile.exists()) {
+            throw new ContainerLaunchException("License file '" + mountableLicense.getFilesystemPath() + "' does not exist.");
+        }
+        if (!licenseFile.getName().endsWith(".lic") && !licenseFile.getName().endsWith(".elic")) {
+            throw new ContainerLaunchException("License file '" + mountableLicense.getFilesystemPath() + "' does not end wit '.lic' or '.elic'.");
+        }
+        final String containerPath = "/opt/hivemq/license/" + licenseFile.getName();
+        withCopyFileToContainer(cloneWithFileMode(mountableLicense), containerPath);
+        LOGGER.info("Putting license '{}' into '{}'.", licenseFile.getAbsolutePath(), containerPath);
+        return self();
+    }
+
+    /**
+     * Overwrites the HiveMQ configuration in '/opt/hivemq/conf/' inside the container.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @param mountableConfig the config file on the host machine
+     * @return self
+     */
+    public @NotNull HiveMQContainer withHiveMQConfig(final @NotNull MountableFile mountableConfig) {
+        final File config = new File(mountableConfig.getResolvedPath());
+        if (!config.exists()) {
+            throw new ContainerLaunchException("HiveMQ config file '" + mountableConfig.getFilesystemPath() + "' does not exist.");
+        }
+        final String containerPath = "/opt/hivemq/conf/config.xml";
+        withCopyFileToContainer(cloneWithFileMode(mountableConfig), containerPath);
+        LOGGER.info("Putting '{}' into '{}'.", config.getAbsolutePath(), containerPath);
+        return self();
+    }
+
+    /**
+     * Puts the given file into the root of the extension's home '/opt/hivemq/temp-extensions/{extensionId}/'.
+     * <p>
+     * Must be called before the container is started.
+     * <p>
+     * The contents of the '/opt/hivemq/temp-extensions/' directory are copied to '/opt/hivemq/extensions/' before the container is started.
+     *
+     * @param file        the file on the host machine
+     * @param extensionId the extension
+     * @return self
+     */
+    public @NotNull HiveMQContainer withFileInExtensionHomeFolder(
+        final @NotNull MountableFile file,
+        final @NotNull String extensionId) {
+
+        return withFileInExtensionHomeFolder(file, extensionId, "");
+    }
+
+    /**
+     * Puts the given file into given subdirectory of the extensions's home '/opt/hivemq/temp-extensions/{id}/{pathInExtensionHome}/'
+     * <p>
+     * Must be called before the container is started.
+     * <p>
+     * The contents of the '/opt/hivemq/temp-extensions/' directory are copied to '/opt/hivemq/extensions/' before the container is started.
+     *
+     * @param file                the file on the host machine
+     * @param extensionId         the extension
+     * @param pathInExtensionHome the path
+     * @return self
+     */
+    public @NotNull HiveMQContainer withFileInExtensionHomeFolder(
+        final @NotNull MountableFile file,
+        final @NotNull String extensionId,
+        final @NotNull String pathInExtensionHome) {
+
+        return withFileInHomeFolder(file, "/temp-extensions/" + extensionId + PathUtil.prepareAppendPath(pathInExtensionHome));
+    }
+
+    /**
+     * Puts the given file into the given subdirectory of the HiveMQ home folder '/opt/hivemq/{pathInHomeFolder}'.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @param mountableFile    the file on the host machine
+     * @param pathInHomeFolder the path
+     * @return self
+     */
+    public @NotNull HiveMQContainer withFileInHomeFolder(
+        final @NotNull MountableFile mountableFile,
+        final @NotNull String pathInHomeFolder) {
+
+        final File file = new File(mountableFile.getResolvedPath());
+
+        if (pathInHomeFolder.trim().isEmpty()) {
+            throw new ContainerLaunchException("pathInHomeFolder must not be empty");
+        }
+
+        if (!file.exists()) {
+            throw new ContainerLaunchException("File '" + mountableFile.getFilesystemPath() + "‘ does not exist.");
+        }
+        final String containerPath = "/opt/hivemq" + PathUtil.prepareAppendPath(pathInHomeFolder);
+        withCopyFileToContainer(cloneWithFileMode(mountableFile), containerPath);
+        LOGGER.info("Putting file '{}' into container path '{}'.", file.getAbsolutePath(), containerPath);
+        return self();
+    }
+
+    /**
+     * Disables the extension with the given name and extension directory name.
+     * This method blocks until the HiveMQ log for successful disabling is consumed or it times out after {timeOut}.
+     * Note: Disabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param extensionName      the name of the extension to disable
+     * @param extensionDirectory the name of the extension's directory
+     * @param timeout            the timeout
+     * @throws TimeoutException if the extension was not disabled within the configured timeout
+     */
+    public void disableExtension(
+        final @NotNull String extensionName,
+        final @NotNull String extensionDirectory,
+        final @NotNull Duration timeout) throws TimeoutException {
+
+        final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) stopped successfully(.*)";
+        try {
+            final String containerPath = "/opt/hivemq/extensions" + PathUtil.prepareInnerPath(extensionDirectory) + "DISABLED";
+
+            final CountDownLatch latch = new CountDownLatch(1);
+            containerOutputLatches.put(regEX, latch);
+
+            execInContainer("touch", containerPath);
+            LOGGER.info("Putting DISABLED file into container path '{}'", containerPath);
+
+            final boolean await = latch.await(timeout.getSeconds(), TimeUnit.SECONDS);
+            if (!await) {
+                throw new TimeoutException("Extension disabling timed out after '" + timeout.getSeconds() + "' seconds. " +
+                    "Maybe you are using a HiveMQ Community Edition image, " +
+                    "which does not support disabling of extensions");
+            }
+        } catch (final InterruptedException | IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            containerOutputLatches.remove(regEX);
+        }
+    }
+
+    /**
+     * Disables the extension with the given name and extension directory name.
+     * This method blocks until the HiveMQ log for successful disabling is consumed or it times out after 60 seconds.
+     * Note: Disabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param extensionName      the name of the extension to disable
+     * @param extensionDirectory the name of the extension's directory
+     * @throws TimeoutException if the extension was not disabled within 60 seconds
+     */
+    public void disableExtension(
+        final @NotNull String extensionName,
+        final @NotNull String extensionDirectory) throws TimeoutException {
+        disableExtension(extensionName, extensionDirectory, Duration.ofSeconds(60));
+    }
+
+    /**
+     * Disables the extension.
+     * This method blocks until the HiveMQ log for successful disabling is consumed or it times out after {timeOut}.
+     * Note: Disabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param hiveMQExtension the extension
+     * @param timeout         the timeout
+     * @throws TimeoutException if the extension was not disabled within the configured timeout
+     */
+    public void disableExtension(
+        final @NotNull HiveMQExtension hiveMQExtension,
+        final @NotNull Duration timeout) throws TimeoutException {
+        disableExtension(hiveMQExtension.getName(), hiveMQExtension.getId(), timeout);
+    }
+
+    /**
+     * Disables the extension.
+     * This method blocks until the HiveMQ log for successful disabling is consumed or it times out after 60 seconds.
+     * Note: Disabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param hiveMQExtension the extension
+     * @throws TimeoutException if the extension was not disabled within 60 seconds
+     */
+    public void disableExtension(final @NotNull HiveMQExtension hiveMQExtension) throws TimeoutException {
+        disableExtension(hiveMQExtension, Duration.ofSeconds(60));
+    }
+
+    /**
+     * Enables the extension with the given name and extension directory name.
+     * This method blocks until the HiveMQ log for successful enabling is consumed or it times out after {timeOut}.
+     * Note: Enabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param extensionName      the name of the extension to disable
+     * @param extensionDirectory the name of the extension's directory
+     * @param timeout            the timeout
+     * @throws TimeoutException if the extension was not enabled within the configured timeout
+     */
+    public void enableExtension(
+        final @NotNull String extensionName,
+        final @NotNull String extensionDirectory,
+        final @NotNull Duration timeout) throws TimeoutException {
+
+        final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) started successfully(.*)";
+        try {
+            final String containerPath = "/opt/hivemq/extensions" + PathUtil.prepareInnerPath(extensionDirectory) + "DISABLED";
+
+            final CountDownLatch latch = new CountDownLatch(1);
+            containerOutputLatches.put(regEX, latch);
+
+            execInContainer("rm", "-rf", containerPath);
+            LOGGER.info("Removing DISABLED file in container path '{}'", containerPath);
+
+            final boolean await = latch.await(timeout.getSeconds(), TimeUnit.SECONDS);
+            if (!await) {
+                throw new TimeoutException("Extension enabling timed out after '" + timeout.getSeconds() + "' seconds. " +
+                    "Maybe you are using a HiveMQ Community Edition image, " +
+                    "which does not support disabling of extensions");
+            }
+        } catch (final InterruptedException | IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            containerOutputLatches.remove(regEX);
+        }
+    }
+
+    /**
+     * Enables the extension with the given name and extension directory name.
+     * This method blocks until the HiveMQ log for successful enabling is consumed or it times out after 60 seconds.
+     * Note: Enabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param extensionName      the name of the extension to disable
+     * @param extensionDirectory the name of the extension's directory
+     * @throws TimeoutException if the extension was not enabled within 60 seconds
+     */
+    public void enableExtension(
+        final @NotNull String extensionName,
+        final @NotNull String extensionDirectory) throws TimeoutException {
+        enableExtension(extensionName, extensionDirectory, Duration.ofSeconds(60));
+    }
+
+    /**
+     * Enables the extension.
+     * This method blocks until the HiveMQ log for successful enabling is consumed or it times out after {timeOut}.
+     * Note: Enabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param hiveMQExtension the extension
+     * @param timeout         the timeout
+     * @throws TimeoutException if the extension was not enabled within the configured timeout
+     */
+    public void enableExtension(
+        final @NotNull HiveMQExtension hiveMQExtension,
+        final @NotNull Duration timeout) throws TimeoutException {
+        enableExtension(hiveMQExtension.getName(), hiveMQExtension.getId(), timeout);
+    }
+
+    /**
+     * Enables the extension.
+     * This method blocks until the HiveMQ log for successful enabling is consumed or it times out after {timeOut}.
+     * Note: Enabling Extensions is a HiveMQ Enterprise feature, it will not work when using the HiveMQ Community Edition.
+     * <p>
+     * This can only be called once the container is started.
+     *
+     * @param hiveMQExtension the extension
+     * @throws TimeoutException if the extension was not enabled within 60 seconds
+     */
+    public void enableExtension(final @NotNull HiveMQExtension hiveMQExtension) throws TimeoutException {
+        enableExtension(hiveMQExtension, Duration.ofSeconds(60));
+    }
+
+    /**
+     * Enables connection to the HiveMQ Control Center on host port 8080.
+     * Note: the control center is a HiveMQ 4 Enterprise feature.
+     * <p>
+     * Must be called before the container is started.
+     *
+     * @return self
+     */
+    public @NotNull HiveMQContainer withControlCenter() {
+        addExposedPorts(CONTROL_CENTER_PORT);
+        controlCenterEnabled = true;
+        return self();
+    }
+
+    /**
+     * Get the mapped port for the MQTT port of the container.
+     * <p>
+     * Must be called after the container is started.
+     *
+     * @return the port on the host machine for mqtt clients to connect
+     */
+    public int getMqttPort() {
+        return this.getMappedPort(MQTT_PORT);
+    }
+
+    @Override
+    protected void containerIsStopping(final @NotNull InspectContainerResponse containerInfo) {
+        waitStrategy.reset();
+    }
+
+    private @NotNull MountableFile cloneWithFileMode(final @NotNull MountableFile mountableFile) {
+        return MountableFile.forHostPath(mountableFile.getResolvedPath(), HiveMQContainer.MODE);
+    }
+}
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
new file mode 100644
index 00000000000..a975439f4b3
--- /dev/null
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
@@ -0,0 +1,287 @@
+package org.testcontainers.hivemq;
+
+import javassist.ClassPool;
+import javassist.NotFoundException;
+import lombok.Getter;
+import org.apache.commons.io.FileUtils;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ContainerLaunchException;
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+public class HiveMQExtension {
+
+    private static final String VALID_EXTENSION_XML =
+        "<hivemq-extension>" + //
+            "   <id>%s</id>" + //
+            "   <name>%s</name>" + //
+            "   <version>%s</version>" + //
+            "   <priority>%s</priority>" +  //
+            "   <start-priority>%s</start-priority>" +  //
+            "</hivemq-extension>";
+    private static final String EXTENSION_MAIN_CLASS_NAME = "com.hivemq.extension.sdk.api.ExtensionMain";
+    private static final Logger LOGGER = LoggerFactory.getLogger(HiveMQExtension.class);
+
+    @Getter
+    private final @NotNull String id;
+
+    @Getter
+    private final @NotNull String name;
+
+    @Getter
+    private final @NotNull String version;
+
+    @Getter
+    private final int priority;
+
+    @Getter
+    private final int startPriority;
+
+    @Getter
+    private final boolean disabledOnStartup;
+
+    @Getter
+    private final @NotNull Class<?> mainClass;
+
+    private final @NotNull List<Class<?>> additionalClasses;
+
+    private HiveMQExtension(
+        final @NotNull String id,
+        final @NotNull String name,
+        final @NotNull String version,
+        final int priority,
+        final int startPriority,
+        final boolean disabledOnStartup,
+        final @NotNull Class<?> mainClass,
+        final @NotNull List<Class<?>> additionalClasses) {
+
+        this.id = id;
+        this.name = name;
+        this.version = version;
+        this.priority = priority;
+        this.startPriority = startPriority;
+        this.disabledOnStartup = disabledOnStartup;
+        this.mainClass = mainClass;
+        this.additionalClasses = additionalClasses;
+    }
+
+    @NotNull File createExtension(final @NotNull HiveMQExtension hiveMQExtension)
+        throws Exception {
+
+        final File tempDir = Files.createTempDirectory("").toFile();
+
+        final File extensionDir = new File(tempDir, hiveMQExtension.getId());
+        FileUtils.writeStringToFile(new File(extensionDir, "hivemq-extension.xml"),
+            String.format(
+                VALID_EXTENSION_XML,
+                hiveMQExtension.getId(),
+                hiveMQExtension.getName(),
+                hiveMQExtension.getVersion(),
+                hiveMQExtension.getPriority(),
+                hiveMQExtension.getStartPriority()),
+            Charset.defaultCharset());
+
+        if (hiveMQExtension.isDisabledOnStartup()) {
+            final File disabled = new File(extensionDir, "DISABLED");
+            final boolean newFile = disabled.createNewFile();
+            if (!newFile) {
+                throw new ContainerLaunchException("Could not create DISABLED file '" + disabled.getAbsolutePath() + "' on host machine.");
+            }
+        }
+
+        final JavaArchive javaArchive =
+            ShrinkWrap.create(JavaArchive.class)
+                .addAsServiceProvider(EXTENSION_MAIN_CLASS_NAME, hiveMQExtension.getMainClass().getName());
+
+        putSubclassesIntoJar(hiveMQExtension.getId(), hiveMQExtension.getMainClass(), javaArchive);
+        for (final Class<?> additionalClass : hiveMQExtension.getAdditionalClasses()) {
+            javaArchive.addClass(additionalClass);
+            putSubclassesIntoJar(hiveMQExtension.getId(), additionalClass, javaArchive);
+        }
+
+        javaArchive.as(ZipExporter.class).exportTo(new File(extensionDir, "extension.jar"));
+
+        return extensionDir;
+    }
+
+    private void putSubclassesIntoJar(
+        final @NotNull String extensionId,
+        final @Nullable Class<?> clazz,
+        final @NotNull JavaArchive javaArchive) throws NotFoundException {
+
+        if (clazz != null) {
+            final Set<String> subClassNames =
+                ClassPool.getDefault().get(clazz.getName()).getClassFile().getConstPool().getClassNames();
+            for (final String subClassName : subClassNames) {
+                final String className = subClassName.replaceAll("/", ".");
+
+                if (!className.startsWith("[L")) {
+                    LOGGER.debug("Trying to package subclass '{}' into extension '{}'.", className, extensionId);
+                    javaArchive.addClass(className);
+                } else {
+                    LOGGER.debug("Class '{}' will be ignored.", className);
+                }
+            }
+        }
+    }
+
+    public @NotNull List<Class<?>> getAdditionalClasses() {
+        return Collections.unmodifiableList(additionalClasses);
+    }
+
+    public static @NotNull Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private @Nullable String id;
+        private @Nullable String name;
+        private @Nullable String version;
+        private int priority = 0;
+        private int startPriority = 0;
+        private boolean disabledOnStartup = false;
+        private @Nullable Class<?> mainClass;
+        private final @NotNull LinkedList<Class<?>> additionalClasses = new LinkedList<>();
+
+        /**
+         * Builds the {@link HiveMQExtension} with the provided values or default values.
+         * @return the HiveMQ Extension
+         */
+        public @NotNull HiveMQExtension build() {
+            if (id == null || id.isEmpty()) {
+                throw new IllegalArgumentException("extension id must not be null or empty");
+            }
+            if (name == null || name.isEmpty()) {
+                throw new IllegalArgumentException("extension name must not be null or empty");
+            }
+            if (version == null || version.isEmpty()) {
+                throw new IllegalArgumentException("extension version must not be null or empty");
+            }
+            if (mainClass == null) {
+                throw new IllegalArgumentException("extension main class must not be null");
+            }
+            return new HiveMQExtension(
+                id,
+                name,
+                version,
+                priority,
+                startPriority,
+                disabledOnStartup,
+                mainClass,
+                additionalClasses
+            );
+        }
+
+        /**
+         * Sets the identifier of the {@link HiveMQExtension}.
+         *
+         * @param id the identifier, must not be empty
+         * @return the {@link Builder}
+         */
+        public @NotNull Builder id(final @NotNull String id) {
+            this.id = id;
+            return this;
+        }
+
+        /**
+         * Sets the name of the {@link HiveMQExtension}.
+         *
+         * @param name the identifier, must not be empty
+         * @return the {@link Builder}
+         */
+        public @NotNull Builder name(final @NotNull String name) {
+            this.name = name;
+            return this;
+        }
+
+        /**
+         * Sets the version of the {@link HiveMQExtension}.
+         *
+         * @param version the version, must not be empty
+         * @return the {@link Builder}
+         */
+        public @NotNull Builder version(final @NotNull String version) {
+            this.version = version;
+            return this;
+        }
+
+        /**
+         * Sets the priority of the {@link HiveMQExtension}.
+         *
+         * @param priority the priority
+         * @return the {@link Builder}
+         */
+        public @NotNull Builder priority(final int priority) {
+            this.priority = priority;
+            return this;
+        }
+
+        /**
+         * Sets the start-priority of the {@link HiveMQExtension}.
+         *
+         * @param startPriority the start-priority
+         * @return the {@link Builder}
+         */
+        public @NotNull Builder startPriority(final int startPriority) {
+            this.startPriority = startPriority;
+            return this;
+        }
+
+        /**
+         * Flag, that indicates whether the {@link HiveMQExtension} should be disabled when HiveMQ starts.
+         * Disabling on startup is achieved by placing a DISABLED file in the {@link HiveMQExtension}'s directory before coping it to the container.
+         *
+         * @param disabledOnStartup if the {@link HiveMQExtension} should be disabled when HiveMQ starts
+         * @return the {@link Builder}
+         */
+        public @NotNull Builder disabledOnStartup(final boolean disabledOnStartup) {
+            this.disabledOnStartup = disabledOnStartup;
+            return this;
+        }
+
+        /**
+         * The main class of the {@link HiveMQExtension}.
+         * This class MUST implement com.hivemq.extension.sdk.api.ExtensionMain.
+         *
+         * @param mainClass the main class
+         * @return the {@link Builder}
+         * @throws IllegalArgumentException if the provides class does not implement com.hivemq.extension.sdk.api.ExtensionMain}
+         * @throws IllegalStateException if com.hivemq.extension.sdk.api.ExtensionMain is not found in the classpath
+         */
+        public @NotNull Builder mainClass(final @NotNull Class<?> mainClass) {
+            try {
+                final Class<?> extensionMain = Class.forName(EXTENSION_MAIN_CLASS_NAME);
+                if (!extensionMain.isAssignableFrom(mainClass)) {
+                    throw new IllegalArgumentException("The provided class does not implement '" + EXTENSION_MAIN_CLASS_NAME + "'");
+                }
+                this.mainClass = mainClass;
+                return this;
+            } catch (final ClassNotFoundException e) {
+                throw new IllegalStateException("The class '" + EXTENSION_MAIN_CLASS_NAME + "' was not found in the classpath.");
+            }
+        }
+
+        /**
+         * Adds an additional class to the .jar file of the {@link HiveMQExtension}.
+         *
+         * @param clazz the additional class
+         * @return the {@link Builder}
+         */
+        public @NotNull Builder addAdditionalClass(final @NotNull Class<?> clazz) {
+            this.additionalClasses.add(clazz);
+            return this;
+        }
+    }
+}
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/PathUtil.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/PathUtil.java
new file mode 100755
index 00000000000..245052f46b8
--- /dev/null
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/PathUtil.java
@@ -0,0 +1,26 @@
+package org.testcontainers.hivemq;
+
+import org.jetbrains.annotations.NotNull;
+
+class PathUtil {
+
+    static @NotNull String prepareInnerPath(@NotNull String innerPath) {
+        if ("/".equals(innerPath) || innerPath.isEmpty()) {
+            return "/";
+        }
+        if (!innerPath.startsWith("/")) {
+            innerPath = "/" + innerPath;
+        }
+        if (!innerPath.endsWith("/")) {
+            innerPath += "/";
+        }
+        return innerPath;
+    }
+
+    static @NotNull String prepareAppendPath(@NotNull String appendPath) {
+        if (!appendPath.startsWith("/")) {
+            appendPath = "/" + appendPath;
+        }
+        return appendPath;
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
new file mode 100644
index 00000000000..f88d60b22ed
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
@@ -0,0 +1,34 @@
+package org.testcontainers.hivemq;
+
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.concurrent.TimeUnit;
+
+public class ContainerWithControlCenterIT {
+
+    public static final int CONTROL_CENTER_PORT = 8080;
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    public void test() throws Exception {
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                     .withControlCenter()) {
+
+            hivemq.start();
+
+            try (final CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
+                final HttpUriRequest request = new HttpGet("http://" + hivemq.getHost() + ":" + hivemq.getMappedPort(CONTROL_CENTER_PORT));
+                httpClient.execute(request);
+            }
+        }
+
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
new file mode 100755
index 00000000000..17f09d86adf
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
@@ -0,0 +1,43 @@
+package org.testcontainers.hivemq;
+
+import com.hivemq.client.mqtt.datatypes.MqttQos;
+import com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class ContainerWithCustomConfigIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+
+        try (final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+            .withHiveMQConfig(MountableFile.forClasspathResource("/config.xml"))) {
+
+            hivemq.start();
+
+            final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
+                .identifier("publisher")
+                .serverPort(hivemq.getMqttPort())
+                .buildBlocking();
+
+            publisher.connect();
+
+            assertThrows(MqttSessionExpiredException.class, () -> {
+                // this should fail since only QoS 0 is allowed by the configuration
+                publisher.publishWith()
+                    .topic("test/topic")
+                    .qos(MqttQos.EXACTLY_ONCE)
+                    .send();
+            });
+        }
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
new file mode 100755
index 00000000000..7672c70925d
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
@@ -0,0 +1,43 @@
+package org.testcontainers.hivemq;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.slf4j.event.Level;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+public class ContainerWithExtensionFromDirectoryIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        try (
+            final HiveMQContainer hivemq =
+                new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                    .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
+                    .waitForExtension("Modifier Extension")
+                    .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                    .withLogLevel(Level.DEBUG)) {
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test_wrongDirectoryName() throws Exception {
+        try (final HiveMQContainer hivemq =
+            new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                .withExtension(MountableFile.forClasspathResource("/modifier-extension-wrong-name"))
+                .waitForExtension("Modifier Extension")
+                .withLogLevel(Level.DEBUG)) {
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
new file mode 100755
index 00000000000..3ad7b26148a
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
@@ -0,0 +1,41 @@
+package org.testcontainers.hivemq;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.util.MyExtension;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+public class ContainerWithExtensionIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(MyExtension.class).build();
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                     .waitForExtension(hiveMQExtension)
+                     .withExtension(hiveMQExtension)) {
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            hivemq.stop();
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            hivemq.stop();
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
new file mode 100755
index 00000000000..33880a800c9
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
@@ -0,0 +1,35 @@
+package org.testcontainers.hivemq;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.slf4j.event.Level;
+import org.testcontainers.hivemq.util.MyExtensionWithSubclasses;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+public class ContainerWithExtensionSubclassIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(MyExtensionWithSubclasses.class).build();
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                     .waitForExtension(hiveMQExtension)
+                     .withExtension(hiveMQExtension)
+                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                     .withLogLevel(Level.DEBUG)) {
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
new file mode 100755
index 00000000000..1d2b1705eae
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
@@ -0,0 +1,77 @@
+package org.testcontainers.hivemq;
+
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
+
+public class ContainerWithFileInExtensionHomeIT {
+
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(FileCheckerExtension.class).build();
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                     .withExtension(hiveMQExtension)
+                     .waitForExtension(hiveMQExtension)
+                     .withFileInExtensionHomeFolder(
+                         MountableFile.forClasspathResource("/additionalFile.txt"),
+                         "extension-1",
+                         "/additionalFiles/my-file.txt")) {
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+    public static class FileCheckerExtension implements ExtensionMain {
+
+        @Override
+        public void extensionStart(final @NotNull ExtensionStartInput extensionStartInput, final @NotNull ExtensionStartOutput extensionStartOutput) {
+
+            final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
+
+                final File extensionHomeFolder = extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
+
+                final File additionalFile = new File(extensionHomeFolder, "additionalFiles/my-file.txt");
+
+                if (additionalFile.exists()) {
+                    publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                }
+            };
+
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+
+            Services.initializerRegistry().setClientInitializer(clientInitializer);
+        }
+
+        @Override
+        public void extensionStop(final @NotNull ExtensionStopInput extensionStopInput, final @NotNull ExtensionStopOutput extensionStopOutput) {
+
+        }
+    }
+
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
new file mode 100755
index 00000000000..542c54789e8
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
@@ -0,0 +1,75 @@
+package org.testcontainers.hivemq;
+
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
+
+public class ContainerWithFileInHomeIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(FileCheckerExtension.class).build();
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                     .withExtension(hiveMQExtension)
+                     .waitForExtension(hiveMQExtension)
+                     .withFileInHomeFolder(MountableFile.forClasspathResource("/additionalFile.txt"),
+                         "/additionalFiles/my-file.txt")) {
+
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+    public static class FileCheckerExtension implements ExtensionMain {
+
+        @Override
+        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
+
+            final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
+
+                final File homeFolder = extensionStartInput.getServerInformation().getHomeFolder();
+
+                final File additionalFile = new File(homeFolder, "additionalFiles/my-file.txt");
+
+                if (additionalFile.exists()) {
+                    publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                }
+            };
+
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+
+            Services.initializerRegistry().setClientInitializer(clientInitializer);
+        }
+
+        @Override
+        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
+
+        }
+    }
+
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
new file mode 100755
index 00000000000..4fc27adf8c2
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
@@ -0,0 +1,78 @@
+package org.testcontainers.hivemq;
+
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
+
+public class ContainerWithLicenseIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(LicenceCheckerExtension.class).build();
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                     .withExtension(hiveMQExtension)
+                     .waitForExtension(hiveMQExtension)
+                     .withLicense(MountableFile.forClasspathResource("/myLicense.lic"))
+                     .withLicense(MountableFile.forClasspathResource("/myExtensionLicense.elic"))) {
+
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+    @SuppressWarnings("CodeBlock2Expr")
+    public static class LicenceCheckerExtension implements ExtensionMain {
+
+        @Override
+        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
+
+            final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
+
+                final File homeFolder = extensionStartInput.getServerInformation().getHomeFolder();
+                final File myLicence = new File(homeFolder, "license/myLicense.lic");
+                final File myExtensionLicence = new File(homeFolder, "license/myExtensionLicense.elic");
+
+                if (myLicence.exists() && myExtensionLicence.exists()) {
+                    publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                }
+            };
+
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
+                clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            };
+
+            Services.initializerRegistry().setClientInitializer(clientInitializer);
+        }
+
+        @Override
+        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
+
+        }
+    }
+
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
new file mode 100644
index 00000000000..37b37dc0d59
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
@@ -0,0 +1,135 @@
+package org.testcontainers.hivemq;
+
+import com.hivemq.client.mqtt.MqttClient;
+import com.hivemq.client.mqtt.MqttGlobalPublishFilter;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import com.hivemq.extension.sdk.api.auth.SimpleAuthenticator;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.builder.Builders;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ContainerWithoutPlatformExtensionsIT {
+
+    private final @NotNull HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        .name("MyExtension")
+        .id("my-extension")
+        .version("1.0.0")
+        .mainClass(CheckerExtension.class).build();
+
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    public void removeAllPlatformExtensions() throws InterruptedException {
+
+        try (final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+            .withExtension(hiveMQExtension)
+            .waitForExtension(hiveMQExtension)
+            .withoutPrepackagedExtensions()) {
+
+            hivemq.start();
+
+            final Mqtt5BlockingClient client = MqttClient.builder()
+                .serverPort(hivemq.getMqttPort())
+                .useMqttVersion5()
+                .buildBlocking();
+
+            client.connect();
+            final Mqtt5BlockingClient.Mqtt5Publishes publishes = client.publishes(MqttGlobalPublishFilter.ALL);
+            client.subscribeWith().topicFilter("extensions").send();
+
+            final Mqtt5Publish receive = publishes.receive();
+            assertTrue(receive.getPayload().isPresent());
+            final String extensionInfo = new String(receive.getPayloadAsBytes());
+
+            assertFalse(extensionInfo.contains("hivemq-allow-all-extension"));
+            assertFalse(extensionInfo.contains("hivemq-kafka-extension"));
+            assertFalse(extensionInfo.contains("hivemq-bridge-extension"));
+            assertFalse(extensionInfo.contains("hivemq-enterprise-security-extension"));
+
+            hivemq.start();
+        }
+    }
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    public void removeKafkaExtension() throws InterruptedException {
+
+        try (final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+            .withExtension(hiveMQExtension)
+            .waitForExtension(hiveMQExtension)
+            .withoutPrepackagedExtensions("hivemq-kafka-extension")) {
+
+            hivemq.start();
+
+            final Mqtt5BlockingClient client = MqttClient.builder()
+                .serverPort(hivemq.getMqttPort())
+                .useMqttVersion5()
+                .buildBlocking();
+
+            client.connect();
+            final Mqtt5BlockingClient.Mqtt5Publishes publishes = client.publishes(MqttGlobalPublishFilter.ALL);
+            client.subscribeWith().topicFilter("extensions").send();
+
+            final Mqtt5Publish receive = publishes.receive();
+            assertTrue(receive.getPayload().isPresent());
+            final String extensionInfo = new String(receive.getPayloadAsBytes());
+
+            assertTrue(extensionInfo.contains("hivemq-allow-all-extension"));
+            assertFalse(extensionInfo.contains("hivemq-kafka-extension"));
+            assertTrue(extensionInfo.contains("hivemq-bridge-extension"));
+            assertTrue(extensionInfo.contains("hivemq-enterprise-security-extension"));
+        }
+    }
+
+    public static class CheckerExtension implements ExtensionMain {
+
+        @Override
+        public void extensionStart(
+            final @NotNull ExtensionStartInput extensionStartInput,
+            final @NotNull ExtensionStartOutput extensionStartOutput) {
+
+            final String extensionFolders = Arrays.stream(extensionStartInput.getServerInformation().getExtensionsFolder().listFiles())
+                .filter(File::isDirectory)
+                .map(File::getName)
+                .collect(Collectors.joining("\n"));
+
+            final byte[] bytes = extensionFolders.getBytes(StandardCharsets.UTF_8);
+            Services.publishService().publish(Builders.publish()
+                .topic("extensions")
+                .retain(true)
+                .payload(ByteBuffer.wrap(bytes))
+                .build());
+
+            Services.securityRegistry().setAuthenticatorProvider(authenticatorProviderInput ->
+                (SimpleAuthenticator) (simpleAuthInput, simpleAuthOutput) ->
+                    simpleAuthOutput.authenticateSuccessfully());
+
+        }
+
+        @Override
+        public void extensionStop(
+            final @NotNull ExtensionStopInput extensionStopInput,
+            final @NotNull ExtensionStopOutput extensionStopOutput) {
+
+        }
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
new file mode 100755
index 00000000000..85089374624
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -0,0 +1,92 @@
+package org.testcontainers.hivemq;
+
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class CreateFileInCopiedDirectoryIT {
+
+    private @NotNull MountableFile createDirectory() throws IOException {
+        final File directory = new File(Files.createTempDirectory("").toFile(), "directory");
+        assertTrue(directory.mkdir());
+        final File subdirectory = new File(directory, "sub-directory");
+        assertTrue(subdirectory.mkdir());
+        return MountableFile.forHostPath(directory.getPath());
+    }
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        final HiveMQExtension extension = HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(FileCreatorExtension.class).build();
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                     .withExtension(extension)
+                     .waitForExtension(extension)
+                     .withFileInHomeFolder(createDirectory(), "directory")) {
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+    public static class FileCreatorExtension implements ExtensionMain {
+
+        @Override
+        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
+
+            final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
+
+                final File homeFolder = extensionStartInput.getServerInformation().getHomeFolder();
+
+                final File dir = new File(homeFolder, "directory");
+                final File dirFile = new File(dir, "file.txt");
+                final File subDir = new File(dir, "sub-directory");
+                final File subDirFile = new File(subDir, "file.txt");
+
+                try {
+                    if (dirFile.createNewFile() && subDirFile.createNewFile()) {
+                        publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            };
+
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+
+            Services.initializerRegistry().setClientInitializer(clientInitializer);
+        }
+
+        @Override
+        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
+
+        }
+    }
+
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
new file mode 100755
index 00000000000..a7756c69f1d
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
@@ -0,0 +1,76 @@
+package org.testcontainers.hivemq;
+
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
+
+public class CreateFileInExtensionDirectoryIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(FileCreatorExtension.class).build();
+
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                     .waitForExtension(hiveMQExtension)
+                     .withExtension(hiveMQExtension)) {
+
+            hivemq.start();
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+    public static class FileCreatorExtension implements ExtensionMain {
+
+        @Override
+        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
+
+            final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
+
+                final File extensionHomeFolder = extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
+
+                final File file = new File(extensionHomeFolder, "myfile.txt");
+                try {
+                    if (file.createNewFile()) {
+                        publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            };
+
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+
+            Services.initializerRegistry().setClientInitializer(clientInitializer);
+        }
+
+        @Override
+        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
+
+        }
+    }
+
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
new file mode 100644
index 00000000000..2248681a769
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
@@ -0,0 +1,37 @@
+package org.testcontainers.hivemq;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.slf4j.event.Level;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class DisableEnableExtensionFromDirectoryIT {
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                     .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
+                     .waitForExtension("Modifier Extension")
+                     .withLogLevel(Level.DEBUG)) {
+
+            hivemq.start();
+
+
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            hivemq.disableExtension("Modifier Extension", "modifier-extension");
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            hivemq.enableExtension("Modifier Extension", "modifier-extension");
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
new file mode 100644
index 00000000000..7cc943c5527
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
@@ -0,0 +1,46 @@
+package org.testcontainers.hivemq;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.slf4j.event.Level;
+import org.testcontainers.hivemq.util.MyExtension;
+import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class DisableEnableExtensionIT {
+
+    private final @NotNull HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        .id("extension-1")
+        .name("my-extension")
+        .version("1.0")
+        .disabledOnStartup(true)
+        .mainClass(MyExtension.class).build();
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    void test() throws Exception {
+        try (final HiveMQContainer hivemq =
+                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                     .withExtension(hiveMQExtension)
+                     .withLogLevel(Level.DEBUG)) {
+
+
+            hivemq.start();
+
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            hivemq.enableExtension(hiveMQExtension);
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            hivemq.disableExtension(hiveMQExtension);
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            hivemq.enableExtension(hiveMQExtension);
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+        }
+    }
+
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
new file mode 100644
index 00000000000..d614a59bd8c
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
@@ -0,0 +1,13 @@
+package org.testcontainers.hivemq;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class HiveMQExtensionTest {
+
+    @Test
+    void builder_classDoesNotImplementExtensionMain_exception() {
+        assertThrows(IllegalArgumentException.class, () -> HiveMQExtension.builder().mainClass(HiveMQExtensionTest.class));
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
new file mode 100644
index 00000000000..40820e33ded
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
@@ -0,0 +1,82 @@
+package org.testcontainers.hivemq;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class HiveMQTestContainerCore {
+
+    final @NotNull HiveMQContainer container = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"));
+
+    @TempDir
+    File tempDir;
+
+    @Test
+    void withExtension_fileDoesNotExist_Exception() {
+        final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
+        assertThrows(ContainerLaunchException.class, () -> container.withExtension(mountableFile));
+    }
+
+    @Test
+    void withExtension_fileNoDirectory_Exception() throws IOException {
+        final File extension = new File(tempDir, "extension");
+        assertTrue(extension.createNewFile());
+        final MountableFile mountableFile = MountableFile.forHostPath(extension.getAbsolutePath());
+        assertThrows(ContainerLaunchException.class, () -> container.withExtension(mountableFile));
+    }
+
+    @Test
+    void withLicense_fileDoesNotExist_Exception() {
+        final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
+        assertThrows(ContainerLaunchException.class, () -> container.withLicense(mountableFile));
+    }
+
+    @Test
+    void withExtension_fileEndingWrong_Exception() throws IOException {
+        final File extension = new File(tempDir, "extension.wrong");
+        assertTrue(extension.createNewFile());
+        final MountableFile mountableFile = MountableFile.forHostPath(extension.getAbsolutePath());
+        assertThrows(ContainerLaunchException.class, () -> container.withLicense(mountableFile));
+    }
+
+    @Test
+    void withHiveMQConfig_fileDoesNotExist_Exception() {
+        final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
+        assertThrows(ContainerLaunchException.class, () -> container.withHiveMQConfig(mountableFile));
+    }
+
+    @Test
+    void withFileInHomeFolder_fileDoesNotExist_Exception() {
+        final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
+        assertThrows(ContainerLaunchException.class, () -> container.withFileInHomeFolder(mountableFile, "some/path"));
+    }
+
+    @Test
+    void withFileInHomeFolder_pathEmpty_Exception() {
+        final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
+        assertThrows(ContainerLaunchException.class, () -> container.withFileInHomeFolder(mountableFile, ""));
+    }
+
+    @Test
+    void withFileInExtensionHomeFolder_withPath_fileDoesNotExist_Exception() {
+        final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
+        assertThrows(ContainerLaunchException.class, () -> container.withFileInExtensionHomeFolder(mountableFile, "my-extension", "some/path"));
+    }
+
+    @Test
+    void withFileInExtensionHomeFolder_fileDoesNotExist_Exception() {
+        final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
+        assertThrows(ContainerLaunchException.class, () -> {
+            final HiveMQContainer hiveMQContainer = container.withFileInExtensionHomeFolder(mountableFile, "my-extension");
+        });
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java
new file mode 100755
index 00000000000..f1e060e68d9
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java
@@ -0,0 +1,43 @@
+package org.testcontainers.hivemq;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class PathUtilTest {
+
+    @Test
+    void prepareInnerPath_emptyString() {
+        assertEquals("/", PathUtil.prepareInnerPath(""));
+    }
+
+    @Test
+    void prepareInnerPath_onlyDelimiter() {
+        assertEquals("/", PathUtil.prepareInnerPath("/"));
+    }
+
+    @Test
+    void prepareInnerPath_noDelimiter() {
+        assertEquals("/path/", PathUtil.prepareInnerPath("path"));
+    }
+
+    @Test
+    void prepareInnerPath_delimiterAtEnd() {
+        assertEquals("/path/", PathUtil.prepareInnerPath("path/"));
+    }
+
+    @Test
+    void prepareInnerPath_delimiterAtBeginning() {
+        assertEquals("/path/", PathUtil.prepareInnerPath("/path"));
+    }
+
+    @Test
+    void prepareAppendPath_delimiterAtBeginning_noChange() {
+        assertEquals("/path", PathUtil.prepareAppendPath("/path"));
+    }
+
+    @Test
+    void prepareAppendPath_delimiterAtBeginning_delimiterAdded() {
+        assertEquals("/path", PathUtil.prepareAppendPath("path"));
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
new file mode 100644
index 00000000000..e9d9463653e
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
@@ -0,0 +1,63 @@
+package org.testcontainers.hivemq.docs;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.hivemq.HiveMQContainer;
+import org.testcontainers.hivemq.HiveMQExtension;
+import org.testcontainers.hivemq.util.MyExtension;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+@Testcontainers
+public class DemoDisableExtensionsIT {
+
+    // noExtensions {
+    @Container
+    final HiveMQContainer hivemqNoExtensions = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+        .withoutPrepackagedExtensions();
+    // }
+
+    // noKafkaExtension {
+    @Container
+    final HiveMQContainer hivemqNoKafkaExtension = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+        .withoutPrepackagedExtensions("hivemq-kafka-extension");
+    // }
+
+    // startDisabled {
+    private final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        .id("extension-1")
+        .name("my-extension")
+        .version("1.0")
+        .disabledOnStartup(true)
+        .mainClass(MyExtension.class).build();
+
+    @Container
+    final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+        .withExtension(hiveMQExtension);
+    // }
+
+
+    // startFromFilesystem {
+    @Container
+    final HiveMQContainer hivemqExtensionFromFilesystem = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+        .withExtension(MountableFile.forHostPath("src/test/resources/modifier-extension"));
+    // }
+
+
+    // runtimeEnable {
+    @Test
+    void test_disable_enable_extension() throws Exception {
+        hivemq.enableExtension(hiveMQExtension);
+        hivemq.disableExtension(hiveMQExtension);
+    }
+    // }
+
+    // runtimeEnableFilesystem {
+    @Test
+    void test_disable_enable_extension_from_filesystem() throws Exception {
+        hivemqExtensionFromFilesystem.disableExtension("Modifier Extension", "modifier-extension");
+        hivemqExtensionFromFilesystem.enableExtension("Modifier Extension", "modifier-extension");
+    }
+    // }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
new file mode 100644
index 00000000000..2627dca2028
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
@@ -0,0 +1,57 @@
+package org.testcontainers.hivemq.docs;
+
+import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.HiveMQContainer;
+import org.testcontainers.hivemq.HiveMQExtension;
+import org.testcontainers.hivemq.util.MyExtensionWithSubclasses;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+@Testcontainers
+public class DemoExtensionTestsIT {
+
+    // waitStrategy {
+    @Container
+    final HiveMQContainer hivemqWithWaitStrategy =
+        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+            .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
+            .waitForExtension("Modifier Extension");
+    // }
+
+    // extensionClasspath {
+    final HiveMQExtension hiveMQEClasspathxtension = HiveMQExtension.builder()
+        .id("extension-1")
+        .name("my-extension")
+        .version("1.0")
+        .mainClass(MyExtensionWithSubclasses.class).build();
+
+    @Container
+    final HiveMQContainer hivemqWithClasspathExtension =
+        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+            .waitForExtension(hiveMQEClasspathxtension)
+            .withExtension(hiveMQEClasspathxtension)
+            .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"));
+    // }
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    public void test() throws Exception {
+
+        // mqtt5client {
+        final Mqtt5BlockingClient client = Mqtt5Client.builder()
+            .serverPort(hivemqWithClasspathExtension.getMqttPort())
+            .buildBlocking();
+
+        client.connect();
+        client.disconnect();
+        // }
+
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
new file mode 100644
index 00000000000..46c24e8e51d
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
@@ -0,0 +1,62 @@
+package org.testcontainers.hivemq.docs;
+
+import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.hivemq.HiveMQContainer;
+import org.testcontainers.hivemq.HiveMQExtension;
+import org.testcontainers.hivemq.util.MyExtension;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+@Testcontainers
+public class DemoFilesIT {
+
+    // hivemqHome {
+    final HiveMQContainer hivemqFileInHome = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+        .withFileInHomeFolder(
+            MountableFile.forHostPath("src/test/resources/additionalFile.txt"),
+            "/path/in/home/folder");
+    // }
+
+    // extensionHome {
+    @Container
+    final HiveMQContainer hivemqFileInExtensionHome = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+        .withExtension(HiveMQExtension.builder()
+            .id("extension-1")
+            .name("my-extension")
+            .version("1.0")
+            .mainClass(MyExtension.class).build())
+        .withFileInExtensionHomeFolder(
+            MountableFile.forHostPath("src/test/resources/additionalFile.txt"),
+            "extension-1",
+            "/path/in/extension/home");
+    // }
+
+    // withLicenses {
+    @Container
+    final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+        .withLicense(MountableFile.forHostPath("src/test/resources/myLicense.lic"))
+        .withLicense(MountableFile.forHostPath("src/test/resources/myExtensionLicense.elic"));
+    // }
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    public void test() throws Exception {
+
+        // mqtt5client {
+        final Mqtt5BlockingClient client = Mqtt5Client.builder()
+            .serverPort(hivemq.getMqttPort())
+            .buildBlocking();
+
+        client.connect();
+        client.disconnect();
+        // }
+
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
new file mode 100644
index 00000000000..60683c8d612
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -0,0 +1,61 @@
+package org.testcontainers.hivemq.docs;
+
+import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.slf4j.event.Level;
+import org.testcontainers.hivemq.HiveMQContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+@Testcontainers
+public class DemoHiveMQContainerIT {
+
+    // ceVersion {
+    @Container
+    final HiveMQContainer hivemqCe =
+        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+            .withLogLevel(Level.DEBUG);
+    // }
+
+    // eeVersion {
+    @Container
+    final HiveMQContainer hivemqEe =
+        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+            .withLogLevel(Level.DEBUG);
+    // }
+
+    // eeVersionWithControlCenter {
+    @Container
+    final HiveMQContainer hivemqEeWithControLCenter =
+        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+            .withLogLevel(Level.DEBUG)
+            .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+            .withControlCenter();
+    // }
+
+    // specificVersion {
+    @Container
+    final HiveMQContainer hivemqSpecificVersion = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce:2021.3"));
+    // }
+
+    @Test
+    @Timeout(value = 3, unit = TimeUnit.MINUTES)
+    public void test() throws Exception {
+
+        // mqtt5client {
+        final Mqtt5BlockingClient client = Mqtt5Client.builder()
+            .serverPort(hivemqCe.getMqttPort())
+            .buildBlocking();
+
+        client.connect();
+        client.disconnect();
+        // }
+
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java
new file mode 100755
index 00000000000..e707859be77
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java
@@ -0,0 +1,37 @@
+package org.testcontainers.hivemq.util;
+
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import org.jetbrains.annotations.NotNull;
+import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+@SuppressWarnings("CodeBlock2Expr")
+public class MyExtension implements ExtensionMain {
+
+    @Override
+    public void extensionStart(final @NotNull ExtensionStartInput extensionStartInput, final @NotNull ExtensionStartOutput extensionStartOutput) {
+
+        final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
+            publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+        };
+
+        final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
+            clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+        };
+
+        Services.initializerRegistry().setClientInitializer(clientInitializer);
+    }
+
+    @Override
+    public void extensionStop(final @NotNull ExtensionStopInput extensionStopInput, final @NotNull ExtensionStopOutput extensionStopOutput) {
+
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java
new file mode 100755
index 00000000000..abc24585358
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java
@@ -0,0 +1,26 @@
+package org.testcontainers.hivemq.util;
+
+import com.hivemq.extension.sdk.api.ExtensionMain;
+import org.jetbrains.annotations.NotNull;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
+import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
+import com.hivemq.extension.sdk.api.services.Services;
+import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+
+public class MyExtensionWithSubclasses implements ExtensionMain {
+
+    @Override
+    public void extensionStart(final @NotNull ExtensionStartInput extensionStartInput, final @NotNull ExtensionStartOutput extensionStartOutput) {
+
+        final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(new PublishModifier());
+
+        Services.initializerRegistry().setClientInitializer(clientInitializer);
+    }
+
+    @Override
+    public void extensionStop(final @NotNull ExtensionStopInput extensionStopInput, final @NotNull ExtensionStopOutput extensionStopOutput) {
+
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java
new file mode 100755
index 00000000000..d33f29a9c10
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java
@@ -0,0 +1,16 @@
+package org.testcontainers.hivemq.util;
+
+import org.jetbrains.annotations.NotNull;
+import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
+import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishInboundInput;
+import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishInboundOutput;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+public class PublishModifier implements PublishInboundInterceptor {
+    @Override
+    public void onInboundPublish(final @NotNull PublishInboundInput publishInboundInput, final @NotNull PublishInboundOutput publishInboundOutput) {
+        publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+    }
+}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
new file mode 100755
index 00000000000..b2712ef5a1d
--- /dev/null
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
@@ -0,0 +1,48 @@
+package org.testcontainers.hivemq.util;
+
+import com.hivemq.client.mqtt.MqttGlobalPublishFilter;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+public class TestPublishModifiedUtil {
+
+    public static void testPublishModified(final int mqttPort) throws InterruptedException, ExecutionException {
+        final CompletableFuture<Void> publishReceived = new CompletableFuture<>();
+
+        final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
+                .serverPort(mqttPort)
+                .identifier("publisher")
+                .buildBlocking();
+        publisher.connect();
+
+        final Mqtt5BlockingClient subscriber = Mqtt5Client.builder()
+                .serverPort(mqttPort)
+                .identifier("subscriber")
+                .buildBlocking();
+        subscriber.connect();
+        subscriber.subscribeWith().topicFilter("test/topic").send();
+        subscriber.toAsync().publishes(MqttGlobalPublishFilter.ALL, publish -> {
+            if (Arrays.equals(publish.getPayloadAsBytes(), "modified".getBytes(StandardCharsets.UTF_8))) {
+                publishReceived.complete(null);
+            } else {
+                publishReceived.completeExceptionally(new IllegalArgumentException("unexpected payload: " + new String(publish.getPayloadAsBytes())));
+            }
+        });
+
+        publisher.publishWith().topic("test/topic").payload("unmodified".getBytes(StandardCharsets.UTF_8)).send();
+
+        try {
+            publishReceived.get();
+        } finally {
+            publisher.disconnect();
+            subscriber.disconnect();
+        }
+    }
+
+
+}
diff --git a/modules/hivemq/src/test/resources/additionalFile.txt b/modules/hivemq/src/test/resources/additionalFile.txt
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/modules/hivemq/src/test/resources/config.xml b/modules/hivemq/src/test/resources/config.xml
new file mode 100755
index 00000000000..128015e2fee
--- /dev/null
+++ b/modules/hivemq/src/test/resources/config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<hivemq>
+
+    <listeners>
+        <tcp-listener>
+            <port>1883</port>
+            <bind-address>0.0.0.0</bind-address>
+        </tcp-listener>
+    </listeners>
+    <mqtt>
+        <quality-of-service>
+            <max-qos>0</max-qos>
+        </quality-of-service>
+    </mqtt>
+</hivemq>
diff --git a/modules/hivemq/src/test/resources/inMemoryConfig.xml b/modules/hivemq/src/test/resources/inMemoryConfig.xml
new file mode 100644
index 00000000000..33373359243
--- /dev/null
+++ b/modules/hivemq/src/test/resources/inMemoryConfig.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<hivemq>
+    <persistence>
+        <mode>in-memory</mode>
+    </persistence>
+</hivemq>
diff --git a/modules/hivemq/src/test/resources/logback-test.xml b/modules/hivemq/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..8a33fc398f0
--- /dev/null
+++ b/modules/hivemq/src/test/resources/logback-test.xml
@@ -0,0 +1,18 @@
+<configuration scan="false">
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="com.hivemq.client" level="WARN"/>
+    <logger name="org.testcontainers" level="INFO"/>
+    <logger name="com.github.dockerjava" level="WARN"/>
+    <logger name="io.netty" level="WARN"/>
+
+</configuration>
diff --git a/modules/hivemq/src/test/resources/modifier-extension-wrong-name/hivemq-extension.xml b/modules/hivemq/src/test/resources/modifier-extension-wrong-name/hivemq-extension.xml
new file mode 100755
index 00000000000..6ca9c899df4
--- /dev/null
+++ b/modules/hivemq/src/test/resources/modifier-extension-wrong-name/hivemq-extension.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<hivemq-extension>
+    <id>modifier-extension</id>
+    <version>1.0-SNAPSHOT</version>
+    <name>Modifier Extension</name>
+    <author>HiveMQ GmbH</author>
+    <priority>1000</priority>
+</hivemq-extension>
diff --git a/modules/hivemq/src/test/resources/modifier-extension-wrong-name/modifier-extension-1.0-SNAPSHOT.jar b/modules/hivemq/src/test/resources/modifier-extension-wrong-name/modifier-extension-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..18a7ea85f53dcf856d5280676386448b43d2d537
GIT binary patch
literal 102179
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

literal 0
HcmV?d00001

diff --git a/modules/hivemq/src/test/resources/modifier-extension/hivemq-extension.xml b/modules/hivemq/src/test/resources/modifier-extension/hivemq-extension.xml
new file mode 100755
index 00000000000..6ca9c899df4
--- /dev/null
+++ b/modules/hivemq/src/test/resources/modifier-extension/hivemq-extension.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<hivemq-extension>
+    <id>modifier-extension</id>
+    <version>1.0-SNAPSHOT</version>
+    <name>Modifier Extension</name>
+    <author>HiveMQ GmbH</author>
+    <priority>1000</priority>
+</hivemq-extension>
diff --git a/modules/hivemq/src/test/resources/modifier-extension/modifier-extension-1.0-SNAPSHOT.jar b/modules/hivemq/src/test/resources/modifier-extension/modifier-extension-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..18a7ea85f53dcf856d5280676386448b43d2d537
GIT binary patch
literal 102179
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

literal 0
HcmV?d00001

diff --git a/modules/hivemq/src/test/resources/myExtensionLicense.elic b/modules/hivemq/src/test/resources/myExtensionLicense.elic
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/modules/hivemq/src/test/resources/myLicense.lic b/modules/hivemq/src/test/resources/myLicense.lic
new file mode 100755
index 00000000000..e69de29bb2d

From b2bd661f4cfa67f79bfedd9b2687212b22096874 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:54 +0000
Subject: [PATCH 1744/4969] Bump spock-core from 2.0-groovy-3.0 to
 2.1-groovy-3.0 in /modules/spock

Bumps spock-core from 2.0-groovy-3.0 to 2.1-groovy-3.0.

---
updated-dependencies:
- dependency-name: org.spockframework:spock-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 26158b6db57..e745bc23ed6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -6,7 +6,7 @@ description = "Testcontainers :: Spock-Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.spockframework:spock-core:2.0-groovy-3.0'
+    api 'org.spockframework:spock-core:2.1-groovy-3.0'
 
     testImplementation project(':selenium')
     testImplementation project(':mysql')

From 40f3e3f0125e1307a6f0af844e36f4a8c783b55a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:55 +0000
Subject: [PATCH 1745/4969] Bump postgresql from 42.3.1 to 42.3.3 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.1 to 42.3.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.1...REL42.3.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a8a6495bfc1..754d5dde289 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.3.1'
+    testImplementation 'org.postgresql:postgresql:42.3.3'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'

From b5575455cba038b579289c18d966921835e90676 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:55 +0000
Subject: [PATCH 1746/4969] Bump postgresql from 42.3.2 to 42.3.3 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.2 to 42.3.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.2...REL42.3.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 71011c6534b..4d15e4df1c1 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.3.2'
+    testImplementation 'org.postgresql:postgresql:42.3.3'
 }

From 08d1c9c180f7fd38d0c0e3d67dd90ec36c10f81a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:55 +0000
Subject: [PATCH 1747/4969] Bump postgresql from 42.3.2 to 42.3.3 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.2 to 42.3.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.2...REL42.3.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ba0083a25a7..749bf72690d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.2'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }

From bb76a74e71b5a102cc1082b654b6a27a23872a87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:55 +0000
Subject: [PATCH 1748/4969] Bump hivemq-extension-sdk from 4.7.3 to 4.7.4 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.7.3 to 4.7.4.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.7.3...4.7.4)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 779ac2ec9d8..f0c3aaa2e69 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.7.3")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.7.4")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.10")

From 80e64855928f4a70b95fbfbc68377700aedafe53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:55 +0000
Subject: [PATCH 1749/4969] Bump mongodb-driver-sync from 4.4.1 to 4.5.0 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.4.1 to 4.5.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.4.1...r4.5.0)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 95919c931d4..73dba45dbbf 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.4.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.5.0")
 }

From 30b09ba593698c1a8934bf0b6068a29839efebdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:56 +0000
Subject: [PATCH 1750/4969] Bump rest-assured from 4.4.0 to 4.5.1 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 4.4.0 to 4.5.1.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.4.0...rest-assured-4.5.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 8aa0a2d689e..ce000685a10 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:4.4.0'
+    testImplementation 'io.rest-assured:rest-assured:4.5.1'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 
 }

From 232771603089399249f4436cbac505feb3232cb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:56 +0000
Subject: [PATCH 1751/4969] Bump reactor-core from 3.4.14 to 3.4.15 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.14 to 3.4.15.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.14...v3.4.15)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 74ab1c9f7f0..2fa066c21b3 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.14'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.15'
     testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
 }

From ca2dbdd74ec0f61895c7af69c7af1f2731db66fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:57 +0000
Subject: [PATCH 1752/4969] Bump amqp-client from 5.14.1 to 5.14.2 in
 /modules/rabbitmq

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.14.1 to 5.14.2.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.14.1...v5.14.2)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 9b680b12968..967b9eb4ed9 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.14.1'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.2'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From cd9d2b46dde52a3cf4fe42fa54ebe487dc08f124 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:55:00 +0000
Subject: [PATCH 1753/4969] Bump azure-cosmos from 4.24.0 to 4.26.0 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.24.0 to 4.26.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.24.0...azure-cosmos_4.26.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 1dbad6a6698..7e5bc336526 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'com.azure:azure-cosmos:4.24.0'
+    testImplementation 'com.azure:azure-cosmos:4.26.0'
 }

From 9202c67fe321c9e6ca96d9eb4cc86c157e2e1ff5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:55:01 +0000
Subject: [PATCH 1754/4969] Bump amqp-client from 5.14.1 to 5.14.2 in /core

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.14.1 to 5.14.2.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.14.1...v5.14.2)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0d704cecd81..1b54ca4ff1b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -90,7 +90,7 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.0.1'
-    testImplementation 'com.rabbitmq:amqp-client:5.14.1'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.2'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
     testImplementation ('org.mockito:mockito-core:4.3.1') {

From cc3e076f546c53629e62f0c3b266d705d79c4881 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:55:04 +0000
Subject: [PATCH 1755/4969] Bump release-drafter/release-drafter from 5.17.6 to
 5.18.1

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.17.6 to 5.18.1.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/436492609a0c75979acf131d57f61b5321571950...2f7ebf8ab5ef7f9835ee4b0b1eebaa2a14ca1669)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index aec34acb8ff..05485ac57fa 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -12,6 +12,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@436492609a0c75979acf131d57f61b5321571950 # v5.15.0
+      - uses: release-drafter/release-drafter@2f7ebf8ab5ef7f9835ee4b0b1eebaa2a14ca1669 # v5.15.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From a78133cc8dbe6dcd839d4d264d3d5dae647edf22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:55:08 +0000
Subject: [PATCH 1756/4969] Bump postgresql from 42.3.2 to 42.3.3 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.2 to 42.3.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.2...REL42.3.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 37fc1b71226..1cb3a0285f2 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20211205'
-    testImplementation 'org.postgresql:postgresql:42.3.2'
+    testImplementation 'org.postgresql:postgresql:42.3.3'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testcontainers:postgresql'
 }

From 5e016c9432c71f263493d144214f5fb047268d84 Mon Sep 17 00:00:00 2001
From: Yannick Weber <yannick.weber@hivemq.com>
Date: Fri, 18 Feb 2022 13:30:23 +0100
Subject: [PATCH 1757/4969] Use WaitAllStrategy for HiveMQ (#5093)

Also, remove MultiLogMessageWaitStrategy.
---
 .../strategy/MultiLogMessageWaitStrategy.java | 59 -------------------
 .../hivemq/HiveMQContainer.java               | 14 ++---
 2 files changed, 5 insertions(+), 68 deletions(-)
 delete mode 100644 core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java
deleted file mode 100644
index 0d342f3050f..00000000000
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/MultiLogMessageWaitStrategy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.testcontainers.containers.wait.strategy;
-
-import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.ContainerLaunchException;
-import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.WaitingConsumer;
-import org.testcontainers.utility.LogUtils;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Predicate;
-
-/**
- * This is a wait strategy to wait for multiple log patterns.
- * The wait strategy will continue when every log pattern is matched at least once.
- */
-public class MultiLogMessageWaitStrategy extends AbstractWaitStrategy {
-
-    private final ConcurrentHashMap<String, Boolean> regexes = new ConcurrentHashMap<>();
-
-    @Override
-    protected void waitUntilReady() {
-        WaitingConsumer waitingConsumer = new WaitingConsumer();
-        LogUtils.followOutput(DockerClientFactory.instance().client(), waitStrategyTarget.getContainerId(), waitingConsumer);
-
-        Predicate<OutputFrame> waitPredicate = outputFrame -> {
-            if (regexes.isEmpty()) {
-                return true;
-            }
-            regexes.entrySet().forEach(regexHasMatched -> {
-                final boolean matched = outputFrame.getUtf8String().matches("(?s)" + regexHasMatched.getKey());
-                if (matched) {
-                    regexHasMatched.setValue(true);
-                }
-            });
-            return regexes.values().stream().reduce(Boolean::logicalAnd).orElse(true);
-        };
-
-        try {
-            waitingConsumer.waitUntil(waitPredicate, startupTimeout.getSeconds(), TimeUnit.SECONDS, 1);
-        } catch (TimeoutException e) {
-            throw new ContainerLaunchException("Timed out waiting for log output matching '" + regexes + "'");
-        }
-    }
-
-    public MultiLogMessageWaitStrategy withRegEx(final String regEx) {
-        regexes.put(regEx, false);
-        return this;
-    }
-
-    public MultiLogMessageWaitStrategy reset() {
-        for (final Map.Entry<String, Boolean> stringBooleanEntry : regexes.entrySet()) {
-            stringBooleanEntry.setValue(false);
-        }
-        return this;
-    }
-}
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 37f9a9259d1..342903e24af 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -8,7 +8,8 @@
 import org.slf4j.event.Level;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.MultiLogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
@@ -48,7 +49,7 @@ public class HiveMQContainer extends GenericContainer<HiveMQContainer> {
     private final @NotNull Set<String> prepackagedExtensionsToRemove = new HashSet<>();
     private boolean removeAllPrepackagedExtensions = false;
 
-    private final @NotNull MultiLogMessageWaitStrategy waitStrategy = new MultiLogMessageWaitStrategy();
+    private final @NotNull WaitAllStrategy waitStrategy = new WaitAllStrategy();
 
     public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
         super(dockerImageName);
@@ -57,7 +58,7 @@ public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
 
         addExposedPort(MQTT_PORT);
 
-        waitStrategy.withRegEx("(.*)Started HiveMQ in(.*)");
+        waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx("(.*)Started HiveMQ in(.*)"));
         waitingFor(waitStrategy);
 
         withLogConsumer(outputFrame -> {
@@ -121,7 +122,7 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
      */
     public @NotNull HiveMQContainer waitForExtension(final @NotNull String extensionName) {
         final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) started successfully(.*)";
-        waitStrategy.withRegEx(regEX);
+        waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx(regEX));
         return self();
     }
 
@@ -562,11 +563,6 @@ public int getMqttPort() {
         return this.getMappedPort(MQTT_PORT);
     }
 
-    @Override
-    protected void containerIsStopping(final @NotNull InspectContainerResponse containerInfo) {
-        waitStrategy.reset();
-    }
-
     private @NotNull MountableFile cloneWithFileMode(final @NotNull MountableFile mountableFile) {
         return MountableFile.forHostPath(mountableFile.getResolvedPath(), HiveMQContainer.MODE);
     }

From 3ff0bb229b204c0839c256b44d15430080b55dc0 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 21 Feb 2022 07:30:16 -0500
Subject: [PATCH 1758/4969] Fix tests on Windows (#5096)

* Fix tests on Windows

* Fix race condition in `StartupCheckStrategyTest`
---
 azure-pipelines.yml                           |  7 +-
 .../DockerRegistryContainer.java              | 68 +++++++++++++++++++
 .../images/ImagePullPolicyTest.java           |  7 +-
 .../utility/AuthenticatedImagePullTest.java   | 40 ++---------
 .../StartupCheckStrategyTest.java             |  4 +-
 5 files changed, 82 insertions(+), 44 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/DockerRegistryContainer.java

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0f01bb7bcd2..9279b3233f8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 jobs:
 
-- job: azure_pipeline_tests
-  timeoutInMinutes: 120
+- job: core_tests
+  timeoutInMinutes: 60
   steps:
 
   # Run all core tests when running the Windows CI tests
@@ -19,6 +19,9 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
 
+- job: other_tests
+  timeoutInMinutes: 120
+  steps:
   # Run all non-core tests when running the Windows CI tests
   - task: Gradle@2
     condition: eq(variables['Agent.OS'], 'Windows_NT')
diff --git a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
new file mode 100644
index 00000000000..641b1553d72
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
@@ -0,0 +1,68 @@
+package org.testcontainers;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.FrameConsumerResultCallback;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.WaitingConsumer;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DockerRegistryContainer extends GenericContainer<DockerRegistryContainer> {
+
+    @Getter
+    String endpoint;
+
+    public DockerRegistryContainer() {
+        super(TestImages.DOCKER_REGISTRY_IMAGE);
+    }
+
+    public DockerRegistryContainer(@NonNull Future<String> image) {
+        super(image);
+    }
+
+    @Override
+    protected void configure() {
+        super.configure();
+        withEnv("REGISTRY_HTTP_ADDR", "127.0.0.1:0");
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.getHostConfig().withNetworkMode("host");
+        });
+    }
+
+    @Override
+    @SneakyThrows
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        AtomicInteger port = new AtomicInteger(-1);
+        try (FrameConsumerResultCallback resultCallback = new FrameConsumerResultCallback()) {
+            WaitingConsumer waitingConsumer = new WaitingConsumer();
+            resultCallback.addConsumer(OutputFrame.OutputType.STDERR, waitingConsumer);
+
+            dockerClient.logContainerCmd(containerInfo.getId())
+                .withStdErr(true)
+                .withFollowStream(true)
+                .exec(resultCallback);
+
+            Pattern pattern = Pattern.compile(".*listening on .*:(\\d+).*", Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+            waitingConsumer.waitUntil(it -> {
+                String s = it.getUtf8String();
+                Matcher matcher = pattern.matcher(s);
+                if (matcher.matches()) {
+                    port.set(Integer.parseInt(matcher.group(1)));
+                    return true;
+                } else {
+                    return false;
+                }
+            }, 10, TimeUnit.SECONDS);
+        }
+
+        endpoint = getHost() + ":" + port.get();
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
index 9b22f5e6166..85c2e785652 100644
--- a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -12,6 +12,7 @@
 import org.mockito.Mockito;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -22,19 +23,17 @@
 
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
-import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
 
 public class ImagePullPolicyTest {
 
     @ClassRule
-    public static GenericContainer<?> registry = new GenericContainer<>(DOCKER_REGISTRY_IMAGE)
-        .withExposedPorts(5000);
+    public static DockerRegistryContainer registry = new DockerRegistryContainer();
 
     private static DockerImageName imageName;
 
     @BeforeClass
     public static void beforeClass() throws Exception {
-        String testRegistryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
+        String testRegistryAddress = registry.getEndpoint();
         String testImageName = testRegistryAddress + "/image-pull-policy-test";
         String tag = UUID.randomUUID().toString();
         imageName = DockerImageName.parse(testImageName).withTag(tag);
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 3243d219cc0..c57c1d7c0b6 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -13,12 +13,10 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.FrameConsumerResultCallback;
-import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.IOException;
@@ -26,9 +24,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -51,18 +46,14 @@ public class AuthenticatedImagePullTest {
      * Containerised docker image registry, with simple hardcoded credentials
      */
     @ClassRule
-    public static GenericContainer<?> authenticatedRegistry = new GenericContainer<>(new ImageFromDockerfile()
+    public static DockerRegistryContainer authenticatedRegistry = new DockerRegistryContainer(new ImageFromDockerfile()
         .withDockerfileFromBuilder(builder -> {
             builder.from(DOCKER_REGISTRY_IMAGE.asCanonicalNameString())
                 .run("htpasswd -Bbn testuser notasecret > /htpasswd")
                 .env("REGISTRY_AUTH", "htpasswd")
                 .env("REGISTRY_AUTH_HTPASSWD_PATH", "/htpasswd")
                 .env("REGISTRY_AUTH_HTPASSWD_REALM", "Test");
-        }))
-        .withEnv("REGISTRY_HTTP_ADDR", "127.0.0.1:0")
-        .withCreateContainerCmdModifier(cmd -> {
-            cmd.getHostConfig().withNetworkMode("host");
-        });
+        }));
 
     private static RegistryAuthLocator originalAuthLocatorSingleton;
     private static DockerClient client;
@@ -75,30 +66,7 @@ public static void setUp() throws Exception {
         originalAuthLocatorSingleton = RegistryAuthLocator.instance();
         client = DockerClientFactory.instance().client();
 
-        AtomicInteger port = new AtomicInteger(-1);
-        try (FrameConsumerResultCallback resultCallback = new FrameConsumerResultCallback()) {
-            WaitingConsumer waitingConsumer = new WaitingConsumer();
-            resultCallback.addConsumer(OutputFrame.OutputType.STDERR, waitingConsumer);
-
-            client.logContainerCmd(authenticatedRegistry.getContainerId())
-                .withStdErr(true)
-                .withFollowStream(true)
-                .exec(resultCallback);
-
-            Pattern pattern = Pattern.compile(".*listening on .*:(\\d+).*", Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
-            waitingConsumer.waitUntil(it -> {
-                String s = it.getUtf8String();
-                Matcher matcher = pattern.matcher(s);
-                if (matcher.matches()) {
-                    port.set(Integer.parseInt(matcher.group(1)));
-                    return true;
-                } else {
-                    return false;
-                }
-            }, 10, TimeUnit.SECONDS);
-        }
-
-        String testRegistryAddress = authenticatedRegistry.getHost() + ":" + port.get();
+        String testRegistryAddress = authenticatedRegistry.getEndpoint();
         testImageName = testRegistryAddress + "/alpine";
 
         final DockerImageName expectedName = DockerImageName.parse(testImageName);
diff --git a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
index 0e72efb5723..b60225010a1 100644
--- a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
+++ b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
@@ -84,9 +84,9 @@ public static class MinimumDurationStrategyTest {
         @SneakyThrows
         @Test
         public void testCommandIsExecuted() {
-            waitForHello(bboxWithMinimumDuration);
-
             assertThat(bboxWithMinimumDuration.isRunning()).isTrue();
+
+            waitForHello(bboxWithMinimumDuration);
         }
     }
 }

From 257c89bea35901e4318704e883d27c08437d8911 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 21 Feb 2022 08:39:53 -0500
Subject: [PATCH 1759/4969] Start Ryuk lazily when in the reusable mode (#4938)

* Lazy Ryuk

* Add `ResourceReaper#init`
---
 core/build.gradle                             |   7 +-
 .../testcontainers/DockerClientFactory.java   |  56 +++----
 .../containers/GenericContainer.java          |   5 +-
 .../testcontainers/containers/Network.java    |   2 +
 .../images/builder/ImageFromDockerfile.java   |   2 +
 .../utility/JVMHookResourceReaper.java        |  57 +++++++
 .../utility/ResourceReaper.java               | 156 +++++++-----------
 .../utility/RyukResourceReaper.java           |  43 ++++-
 .../DockerClientFactoryTest.java              |  20 +--
 9 files changed, 201 insertions(+), 147 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java

diff --git a/core/build.gradle b/core/build.gradle
index 0d704cecd81..7b014d1ad24 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -40,7 +40,12 @@ tasks.japicmp {
 
     classExcludes = []
 
-    methodExcludes = []
+    methodExcludes = [
+        "org.testcontainers.utility.ResourceReaper#start(java.lang.String,com.github.dockerjava.api.DockerClient)",
+        "org.testcontainers.utility.ResourceReaper#start(com.github.dockerjava.api.DockerClient)",
+        "org.testcontainers.utility.ResourceReaper#registerNetworkForCleanup(java.lang.String)",
+        "org.testcontainers.utility.ResourceReaper#removeNetworks(java.lang.String)",
+    ]
 
     fieldExcludes = []
 }
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 1ad7a0bec7e..d0a4e4a4fb3 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -31,6 +31,7 @@
 import org.testcontainers.utility.ImageNameSubstitutor;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.ResourceReaper;
+import org.testcontainers.utility.RyukResourceReaper;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.ByteArrayOutputStream;
@@ -38,6 +39,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +63,7 @@ public class DockerClientFactory {
     public static final String SESSION_ID = UUID.randomUUID().toString();
 
     public static final Map<String, String> DEFAULT_LABELS = ImmutableMap.of(
-            TESTCONTAINERS_LABEL, "true",
-            TESTCONTAINERS_SESSION_ID_LABEL, SESSION_ID
+            TESTCONTAINERS_LABEL, "true"
     );
 
     private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
@@ -73,7 +74,7 @@ public class DockerClientFactory {
     DockerClientProviderStrategy strategy;
 
     @VisibleForTesting
-    DockerClient dockerClient;
+    DockerClient client;
 
     @VisibleForTesting
     RuntimeException cachedClientFailure;
@@ -174,21 +175,20 @@ public String getRemoteDockerUnixSocketPath() {
      */
     @Synchronized
     public DockerClient client() {
-
-        if (dockerClient != null) {
-            return dockerClient;
-        }
-
         // fail-fast if checks have failed previously
         if (cachedClientFailure != null) {
             log.debug("There is a cached checks failure - throwing", cachedClientFailure);
             throw cachedClientFailure;
         }
 
+        if (client != null) {
+            return client;
+        }
+
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
         log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
-        final DockerClient client = new DockerClientDelegate() {
+        client = new DockerClientDelegate() {
 
             @Getter
             final DockerClient dockerClient = strategy.getDockerClient();
@@ -209,25 +209,14 @@ public void close() {
                 "  Operating System: " + dockerInfo.getOperatingSystem() + "\n" +
                 "  Total Memory: " + dockerInfo.getMemTotal() / (1024 * 1024) + " MB");
 
-        final String ryukContainerId;
-
-        boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
-        if (useRyuk) {
-            log.debug("Ryuk is enabled");
-            try {
-                //noinspection deprecation
-                ryukContainerId = ResourceReaper.start(client);
-            } catch (RuntimeException e) {
-                cachedClientFailure = e;
-                throw e;
-            }
-            log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
-        } else {
-            log.debug("Ryuk is disabled");
-            ryukContainerId = null;
-            // best-efforts cleanup at JVM shutdown, without using the Ryuk container
+        final ResourceReaper resourceReaper;
+        try {
+            resourceReaper = ResourceReaper.instance();
             //noinspection deprecation
-            ResourceReaper.instance().setHook();
+            resourceReaper.init();
+        } catch (RuntimeException e) {
+            cachedClientFailure = e;
+            throw e;
         }
 
         boolean checksEnabled = !TestcontainersConfiguration.getInstance().isDisableChecks();
@@ -237,6 +226,12 @@ public void close() {
             try {
                 log.info("Checking the system...");
                 checkDockerVersion(version.getVersion());
+
+                //noinspection deprecation
+                String ryukContainerId = resourceReaper instanceof RyukResourceReaper
+                    ? ((RyukResourceReaper) resourceReaper).getContainerId()
+                    : null;
+
                 if (ryukContainerId != null) {
                     checkDiskSpace(client, ryukContainerId);
                 } else {
@@ -261,8 +256,7 @@ public void close() {
             log.debug("Checks are disabled");
         }
 
-        dockerClient = client;
-        return dockerClient;
+        return client;
     }
 
     private void checkDockerVersion(String dockerVersion) {
@@ -378,8 +372,10 @@ private <T> T runInsideDocker(DockerClient client, Consumer<CreateContainerCmd>
         final String tinyImage = ImageNameSubstitutor.instance().apply(TINY_IMAGE).asCanonicalNameString();
 
         checkAndPullImage(client, tinyImage);
+        HashMap<String, String> labels = new HashMap<>(DEFAULT_LABELS);
+        labels.putAll(ResourceReaper.instance().getLabels());
         CreateContainerCmd createContainerCmd = client.createContainerCmd(tinyImage)
-                .withLabels(DEFAULT_LABELS);
+                .withLabels(labels);
         createContainerCmdConsumer.accept(createContainerCmd);
         String id = createContainerCmd.exec().getId();
 
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 3851cf42fca..aca543ef7ec 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -364,7 +364,7 @@ private void tryStart(Instant startedAt) {
             CreateContainerCmd createCommand = dockerClient.createContainerCmd(dockerImageName);
             applyConfiguration(createCommand);
 
-            createCommand.getLabels().put(DockerClientFactory.TESTCONTAINERS_LABEL, "true");
+            createCommand.getLabels().putAll(DockerClientFactory.DEFAULT_LABELS);
 
             boolean reused = false;
             final boolean reusable;
@@ -406,7 +406,8 @@ private void tryStart(Instant startedAt) {
             }
 
             if (!reusable) {
-                createCommand.getLabels().put(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL, DockerClientFactory.SESSION_ID);
+                //noinspection deprecation
+                createCommand.getLabels().putAll(ResourceReaper.instance().getLabels());
             }
 
             if (!reused) {
diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
index 2fda5ad1a8d..046133815b6 100644
--- a/core/src/main/java/org/testcontainers/containers/Network.java
+++ b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -87,6 +87,8 @@ private String create() {
             Map<String, String> labels = createNetworkCmd.getLabels();
             labels = new HashMap<>(labels != null ? labels : Collections.emptyMap());
             labels.putAll(DockerClientFactory.DEFAULT_LABELS);
+            //noinspection deprecation
+            labels.putAll(ResourceReaper.instance().getLabels());
             createNetworkCmd.withLabels(labels);
 
             return createNetworkCmd.exec().getId();
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 05bb6911c3e..a434dee2b41 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -112,6 +112,8 @@ public void onNext(BuildResponseItem item) {
                 labels.putAll(buildImageCmd.getLabels());
             }
             labels.putAll(DockerClientFactory.DEFAULT_LABELS);
+            //noinspection deprecation
+            labels.putAll(ResourceReaper.instance().getLabels());
             buildImageCmd.withLabels(labels);
 
             prePullDependencyImages(dependencyImageNames);
diff --git a/core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java b/core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java
new file mode 100644
index 00000000000..173cf28f97c
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java
@@ -0,0 +1,57 @@
+package org.testcontainers.utility;
+
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.PruneType;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A {@link ResourceReaper} implementation that uses {@link Runtime#addShutdownHook(Thread)}
+ * to cleanup containers.
+ */
+class JVMHookResourceReaper extends ResourceReaper {
+
+    @Override
+    public void init() {
+        setHook();
+    }
+
+    @Override
+    public synchronized void performCleanup() {
+        super.performCleanup();
+        synchronized (DEATH_NOTE) {
+            DEATH_NOTE.forEach(filters -> prune(PruneType.CONTAINERS, filters));
+            DEATH_NOTE.forEach(filters -> prune(PruneType.NETWORKS, filters));
+            DEATH_NOTE.forEach(filters -> prune(PruneType.VOLUMES, filters));
+            DEATH_NOTE.forEach(filters -> prune(PruneType.IMAGES, filters));
+        }
+    }
+
+    private void prune(PruneType pruneType, List<Map.Entry<String, String>> filters) {
+        String[] labels = filters.stream()
+            .filter(it -> "label".equals(it.getKey()))
+            .map(Map.Entry::getValue)
+            .toArray(String[]::new);
+        switch (pruneType) {
+            // Docker only prunes stopped containers, so we have to do it manually
+            case CONTAINERS:
+                List<Container> containers = dockerClient.listContainersCmd()
+                    .withFilter("label", Arrays.asList(labels))
+                    .withShowAll(true)
+                    .exec();
+
+                containers.parallelStream().forEach(container -> {
+                    dockerClient.removeContainerCmd(container.getId())
+                        .withForce(true)
+                        .withRemoveVolumes(true)
+                        .exec();
+                });
+                break;
+            default:
+                dockerClient.pruneCmd(pruneType).withLabelFilter(labels).exec();
+                break;
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 69c849b6c82..44f9456ce4c 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -3,9 +3,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.PruneType;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Sets;
@@ -24,62 +22,62 @@
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Component that responsible for container removal and automatic cleanup of dead containers at JVM shutdown.
  */
 @Slf4j
-public final class ResourceReaper {
+public class ResourceReaper {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResourceReaper.class);
 
+    private static final Map<String, String> MARKER_LABELS = Collections.singletonMap(
+        DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL,
+        DockerClientFactory.SESSION_ID
+    );
+
     static final List<List<Map.Entry<String, String>>> DEATH_NOTE = new ArrayList<>(
         Arrays.asList(
-            DockerClientFactory.DEFAULT_LABELS.entrySet().stream()
+            Stream
+                .concat(
+                    DockerClientFactory.DEFAULT_LABELS.entrySet().stream(),
+                    MARKER_LABELS.entrySet().stream()
+                )
                 .<Map.Entry<String, String>>map(it -> new SimpleEntry<>("label", it.getKey() + "=" + it.getValue()))
                 .collect(Collectors.toList())
         )
     );
 
     private static ResourceReaper instance;
-    private static AtomicBoolean ryukStarted = new AtomicBoolean(false);
-    private final DockerClient dockerClient = DockerClientFactory.lazyClient();
+    final DockerClient dockerClient = DockerClientFactory.lazyClient();
     private Map<String, String> registeredContainers = new ConcurrentHashMap<>();
     private Set<String> registeredNetworks = Sets.newConcurrentHashSet();
     private Set<String> registeredImages = Sets.newConcurrentHashSet();
     private AtomicBoolean hookIsSet = new AtomicBoolean(false);
 
-
     /**
-     *
-     * @deprecated internal API
+     * Internal constructor to avoid custom implementations
      */
-    @Deprecated
-    public static String start(String hostIpAddress, DockerClient client) {
-        return start(client);
-    }
-
-    /**
-     *
-     * @deprecated internal API
-     */
-    @Deprecated
-    public static String start(DockerClient client) {
-        RyukResourceReaper ryuk = new RyukResourceReaper(client);
-        String containerId = ryuk.getContainerId();
-        ryukStarted.set(true);
-        return containerId;
+    ResourceReaper() {
     }
 
     public synchronized static ResourceReaper instance() {
         if (instance == null) {
-            instance = new ResourceReaper();
+            boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
+            if (useRyuk) {
+                //noinspection deprecation
+                instance = new RyukResourceReaper();
+            } else {
+                instance = new JVMHookResourceReaper();
+            }
         }
 
         return instance;
@@ -87,8 +85,10 @@ public synchronized static ResourceReaper instance() {
 
     /**
      * Perform a cleanup.
+     * @deprecated no longer supported API, use {@link DockerClient} directly
      */
-    public synchronized void performCleanup() {
+    @Deprecated
+    public void performCleanup() {
         registeredContainers.forEach(this::removeContainer);
         registeredNetworks.forEach(this::removeNetwork);
         registeredImages.forEach(this::removeImage);
@@ -126,7 +126,9 @@ public void registerLabelsFilterForCleanup(Map<String, String> labels) {
      *
      * @param containerId the ID of the container
      * @param imageName   the image name of the container (used for logging)
+     * @deprecated no longer supported API
      */
+    @Deprecated
     public void registerContainerForCleanup(String containerId, String imageName) {
         setHook();
         registeredContainers.put(containerId, imageName);
@@ -136,7 +138,9 @@ public void registerContainerForCleanup(String containerId, String imageName) {
      * Stop a potentially running container and remove it, including associated volumes.
      *
      * @param containerId the ID of the container
+     * @deprecated use {@link DockerClient} directly
      */
+    @Deprecated
     public void stopAndRemoveContainer(String containerId) {
         removeContainer(containerId, registeredContainers.get(containerId));
 
@@ -148,7 +152,9 @@ public void stopAndRemoveContainer(String containerId) {
      *
      * @param containerId the ID of the container
      * @param imageName   the image name of the container (used for logging)
+     * @deprecated use {@link DockerClient} directly
      */
+    @Deprecated
     public void stopAndRemoveContainer(String containerId, String imageName) {
         removeContainer(containerId, imageName);
 
@@ -204,46 +210,24 @@ private void removeContainer(String containerId, String imageName) {
      * Register a network to be cleaned up at JVM shutdown.
      *
      * @param id   the ID of the network
+     * @deprecated no longer supported API
      */
+    @Deprecated
     public void registerNetworkIdForCleanup(String id) {
         setHook();
         registeredNetworks.add(id);
     }
 
-    /**
-     * @param networkName   the name of the network
-     * @deprecated see {@link ResourceReaper#registerNetworkIdForCleanup(String)}
-     */
-    @Deprecated
-    public void registerNetworkForCleanup(String networkName) {
-        try {
-            // Try to find the network by name, so that we can register its ID for later deletion
-            dockerClient.listNetworksCmd()
-                    .withNameFilter(networkName)
-                    .exec()
-            .forEach(network -> registerNetworkIdForCleanup(network.getId()));
-        } catch (Exception e) {
-            LOGGER.trace("Error encountered when looking up network (name: {})", networkName);
-        }
-    }
-
     /**
      * Removes a network by ID.
      * @param id
+     * @deprecated use {@link DockerClient} directly
      */
+    @Deprecated
     public void removeNetworkById(String id) {
       removeNetwork(id);
     }
 
-    /**
-     * Removes a network by ID.
-     * @param identifier
-     * @deprecated see {@link ResourceReaper#removeNetworkById(String)}
-     */
-    @Deprecated
-    public void removeNetworks(String identifier) {
-        removeNetworkById(identifier);
-    }
 
     private void removeNetwork(String id) {
         try {
@@ -273,14 +257,26 @@ private void removeNetwork(String id) {
         }
     }
 
+    /**
+     * @deprecated no longer supported API
+     */
+    @Deprecated
     public void unregisterNetwork(String identifier) {
         registeredNetworks.remove(identifier);
     }
 
+    /**
+     * @deprecated no longer supported API
+     */
+    @Deprecated
     public void unregisterContainer(String identifier) {
         registeredContainers.remove(identifier);
     }
 
+    /**
+     * @deprecated no longer supported API
+     */
+    @Deprecated
     public void registerImageForCleanup(String dockerImageName) {
         setHook();
         registeredImages.add(dockerImageName);
@@ -295,53 +291,27 @@ private void removeImage(String dockerImageName) {
         }
     }
 
-    private void prune(PruneType pruneType, List<Map.Entry<String, String>> filters) {
-        String[] labels = filters.stream()
-            .filter(it -> "label".equals(it.getKey()))
-            .map(Map.Entry::getValue)
-            .toArray(String[]::new);
-        switch (pruneType) {
-            // Docker only prunes stopped containers, so we have to do it manually
-            case CONTAINERS:
-                List<Container> containers = dockerClient.listContainersCmd()
-                    .withFilter("label", Arrays.asList(labels))
-                    .withShowAll(true)
-                    .exec();
-
-                containers.parallelStream().forEach(container -> {
-                    removeContainer(container.getId(), container.getImage());
-                });
-                break;
-            default:
-                dockerClient.pruneCmd(pruneType).withLabelFilter(labels).exec();
-                break;
+    void setHook() {
+        if (hookIsSet.compareAndSet(false, true)) {
+            // If the JVM stops without containers being stopped, try and stop the container.
+            Runtime.getRuntime().addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, this::performCleanup));
         }
     }
 
     /**
-     * @deprecated internal API, not intended for public usage
+     *
+     * @deprecated internal API
      */
     @Deprecated
-    public void setHook() {
-        if (hookIsSet.compareAndSet(false, true)) {
-            // If the JVM stops without containers being stopped, try and stop the container.
-            Runtime.getRuntime().addShutdownHook(
-                new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
-                    () -> {
-                        performCleanup();
-
-                        if (!ryukStarted.get()) {
-                            synchronized (DEATH_NOTE) {
-                                DEATH_NOTE.forEach(filters -> prune(PruneType.CONTAINERS, filters));
-                                DEATH_NOTE.forEach(filters -> prune(PruneType.NETWORKS, filters));
-                                DEATH_NOTE.forEach(filters -> prune(PruneType.VOLUMES, filters));
-                                DEATH_NOTE.forEach(filters -> prune(PruneType.IMAGES, filters));
-                            }
-                        }
-                    }
-                )
-            );
-        }
+    public Map<String, String> getLabels() {
+        return MARKER_LABELS;
+    }
+
+    /**
+     * @deprecated internal API
+     */
+    @Deprecated
+    public void init() {
     }
 
     static class FilterRegistry {
diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
index e8aed92fa9d..743b33856cf 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -29,13 +29,21 @@
 import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.awaitility.Awaitility.await;
 
+/**
+ * Ryuk-based {@link ResourceReaper} implementation.
+ *
+ * @see <a href="https://github.com/testcontainers/moby-ryuk">moby-ryuk</a>
+ * @deprecated internal API
+ */
+@Deprecated
 @Slf4j
-class RyukResourceReaper {
+public class RyukResourceReaper extends ResourceReaper {
 
     private static final RateLimiter RYUK_ACK_RATE_LIMITER = RateLimiterBuilder
         .newBuilder()
@@ -43,11 +51,40 @@ class RyukResourceReaper {
         .withConstantThroughput()
         .build();
 
+    private final AtomicBoolean started = new AtomicBoolean(false);
+
     @Getter
-    private final String containerId;
+    private String containerId = null;
+
+    @Override
+    public void init() {
+        if (!TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
+            log.debug("Ryuk is enabled");
+            maybeStart();
+            log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
+        } else {
+            log.debug("Ryuk is enabled but will be started on demand");
+        }
+    }
+
+    @Override
+    public void registerLabelsFilterForCleanup(Map<String, String> labels) {
+        maybeStart();
+        super.registerLabelsFilterForCleanup(labels);
+    }
+
+    @Override
+    public Map<String, String> getLabels() {
+        maybeStart();
+        return super.getLabels();
+    }
 
     @SneakyThrows(InterruptedException.class)
-    RyukResourceReaper(DockerClient client) {
+    private synchronized void maybeStart() {
+        if (!started.compareAndSet(false, true)) {
+            return;
+        }
+        DockerClient client = DockerClientFactory.lazyClient();
         String ryukImage = ImageNameSubstitutor.instance()
             .apply(DockerImageName.parse("testcontainers/ryuk:0.3.3"))
             .asCanonicalNameString();
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index d484cc92eaf..16d25b2f625 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -4,17 +4,13 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testcontainers.TestImages.TINY_IMAGE;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.junit.Rule;
 import org.junit.Test;
-import org.mockito.Mockito;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory.DiskSpaceUsage;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 /**
  * Test for {@link DockerClientFactory}.
@@ -65,27 +61,15 @@ public void dockerHostIpAddress() {
 
     @Test
     public void failedChecksFailFast() {
-        Mockito.doReturn(false).when(TestcontainersConfiguration.getInstance()).isDisableChecks();
-
-        // Make sure that Ryuk is started
-        assertThat(DockerClientFactory.instance().client()).isNotNull();
-
-        DockerClientFactory instance = new DockerClientFactory();
-        DockerClient dockerClient = instance.dockerClient;
+        DockerClientFactory instance = DockerClientFactory.instance();
+        assertThat(instance.client()).isNotNull();
         assertThat(instance.cachedClientFailure).isNull();
         try {
-            // Remove cached client to force the initialization logic
-            instance.dockerClient = null;
-
-            // Ryuk should fail to start twice due to the name conflict (equal to the session id)
-            assertThatThrownBy(instance::client).isInstanceOf(DockerException.class);
-
             RuntimeException failure = new IllegalStateException("Boom!");
             instance.cachedClientFailure = failure;
             // Fail fast
             assertThatThrownBy(instance::client).isEqualTo(failure);
         } finally {
-            instance.dockerClient = dockerClient;
             instance.cachedClientFailure = null;
         }
     }

From 55a131545b758c04afa1bb0af4319d505ac3abde Mon Sep 17 00:00:00 2001
From: Yannick Weber <yannick.weber@hivemq.com>
Date: Tue, 22 Feb 2022 13:15:20 +0100
Subject: [PATCH 1760/4969] Every HiveMQ IT now uses `getHost()` (#5106)

Ensures better portability across different Docker environments.
---
 .../hivemq/ContainerWithCustomConfigIT.java    |  1 +
 .../ContainerWithExtensionFromDirectoryIT.java |  4 ++--
 .../hivemq/ContainerWithExtensionIT.java       |  6 +++---
 .../ContainerWithExtensionSubclassIT.java      |  2 +-
 .../ContainerWithFileInExtensionHomeIT.java    |  2 +-
 .../hivemq/ContainerWithFileInHomeIT.java      |  2 +-
 .../hivemq/ContainerWithLicenseIT.java         |  2 +-
 .../ContainerWithoutPlatformExtensionsIT.java  |  2 ++
 .../hivemq/CreateFileInCopiedDirectoryIT.java  |  2 +-
 .../CreateFileInExtensionDirectoryIT.java      |  2 +-
 .../DisableEnableExtensionFromDirectoryIT.java |  6 +++---
 .../hivemq/DisableEnableExtensionIT.java       |  8 ++++----
 .../hivemq/docs/DemoExtensionTestsIT.java      |  1 +
 .../hivemq/docs/DemoFilesIT.java               |  1 +
 .../hivemq/docs/DemoHiveMQContainerIT.java     |  1 +
 .../hivemq/util/TestPublishModifiedUtil.java   | 18 ++++++++++--------
 16 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
index 17f09d86adf..57d3b75bc24 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
@@ -27,6 +27,7 @@ void test() throws Exception {
             final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
                 .identifier("publisher")
                 .serverPort(hivemq.getMqttPort())
+                .serverHost(hivemq.getHost())
                 .buildBlocking();
 
             publisher.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
index 7672c70925d..4b89e418b05 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
@@ -23,7 +23,7 @@ void test() throws Exception {
                     .withLogLevel(Level.DEBUG)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
@@ -37,7 +37,7 @@ void test_wrongDirectoryName() throws Exception {
                 .withLogLevel(Level.DEBUG)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
index 3ad7b26148a..8979d2c17b0 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
@@ -27,15 +27,15 @@ void test() throws Exception {
                      .withExtension(hiveMQExtension)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.stop();
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.stop();
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
index 33880a800c9..53714123aff 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
@@ -29,7 +29,7 @@ void test() throws Exception {
                      .withLogLevel(Level.DEBUG)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
index 1d2b1705eae..559737c8868 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
@@ -43,7 +43,7 @@ void test() throws Exception {
                          "/additionalFiles/my-file.txt")) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
index 542c54789e8..efdf6ad298d 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
@@ -41,7 +41,7 @@ void test() throws Exception {
 
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
index 4fc27adf8c2..ba2dc472cdb 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
@@ -41,7 +41,7 @@ void test() throws Exception {
 
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
index 37b37dc0d59..eaec72cb038 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
@@ -49,6 +49,7 @@ public void removeAllPlatformExtensions() throws InterruptedException {
 
             final Mqtt5BlockingClient client = MqttClient.builder()
                 .serverPort(hivemq.getMqttPort())
+                .serverHost(hivemq.getHost())
                 .useMqttVersion5()
                 .buildBlocking();
 
@@ -82,6 +83,7 @@ public void removeKafkaExtension() throws InterruptedException {
 
             final Mqtt5BlockingClient client = MqttClient.builder()
                 .serverPort(hivemq.getMqttPort())
+                .serverHost(hivemq.getHost())
                 .useMqttVersion5()
                 .buildBlocking();
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
index 85089374624..58b70c3d1d9 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -51,7 +51,7 @@ void test() throws Exception {
                      .withFileInHomeFolder(createDirectory(), "directory")) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
index a7756c69f1d..c41137f58c3 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
@@ -39,7 +39,7 @@ void test() throws Exception {
                      .withExtension(hiveMQExtension)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
index 2248681a769..f6b1b9b5cd7 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
@@ -26,11 +26,11 @@ void test() throws Exception {
             hivemq.start();
 
 
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension("Modifier Extension", "modifier-extension");
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension("Modifier Extension", "modifier-extension");
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
index 7cc943c5527..5b3c6ab107f 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
@@ -33,13 +33,13 @@ void test() throws Exception {
 
             hivemq.start();
 
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension(hiveMQExtension);
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension(hiveMQExtension);
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension(hiveMQExtension);
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
index 2627dca2028..3a8ccc1bebe 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
@@ -47,6 +47,7 @@ public void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client.builder()
             .serverPort(hivemqWithClasspathExtension.getMqttPort())
+            .serverHost(hivemqWithClasspathExtension.getHost())
             .buildBlocking();
 
         client.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
index 46c24e8e51d..7ec777d02b8 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
@@ -52,6 +52,7 @@ public void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client.builder()
             .serverPort(hivemq.getMqttPort())
+            .serverHost(hivemq.getHost())
             .buildBlocking();
 
         client.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
index 60683c8d612..51e3a43d9e5 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -51,6 +51,7 @@ public void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client.builder()
             .serverPort(hivemqCe.getMqttPort())
+            .serverHost(hivemqCe.getHost())
             .buildBlocking();
 
         client.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
index b2712ef5a1d..f2f1cfd692f 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
@@ -3,27 +3,29 @@
 import com.hivemq.client.mqtt.MqttGlobalPublishFilter;
 import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
 import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import org.jetbrains.annotations.NotNull;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 
 public class TestPublishModifiedUtil {
 
-    public static void testPublishModified(final int mqttPort) throws InterruptedException, ExecutionException {
+    public static void testPublishModified(final int mqttPort, final @NotNull String host) throws Exception {
         final CompletableFuture<Void> publishReceived = new CompletableFuture<>();
 
         final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
-                .serverPort(mqttPort)
-                .identifier("publisher")
-                .buildBlocking();
+            .serverPort(mqttPort)
+            .serverHost(host)
+            .identifier("publisher")
+            .buildBlocking();
         publisher.connect();
 
         final Mqtt5BlockingClient subscriber = Mqtt5Client.builder()
-                .serverPort(mqttPort)
-                .identifier("subscriber")
-                .buildBlocking();
+            .serverPort(mqttPort)
+            .serverHost(host)
+            .identifier("subscriber")
+            .buildBlocking();
         subscriber.connect();
         subscriber.subscribeWith().topicFilter("test/topic").send();
         subscriber.toAsync().publishes(MqttGlobalPublishFilter.ALL, publish -> {

From fdb58fb3d3dd82dbbd7cf6a2be52ecbbcdbc25db Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 22 Feb 2022 08:33:06 -0500
Subject: [PATCH 1761/4969] Do not mount Selenium's SHM on Windows (#5105)

It looks like mounting /dev/shm did not play well on WSL2.

This change uses Docker's SHM support on Windows.
---
 .../containers/BrowserWebDriverContainer.java            | 9 ++++++++-
 .../junit/BrowserWebDriverContainerTest.java             | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index bd38dead8ac..e47c832e2ff 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -16,6 +16,9 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
@@ -205,7 +208,11 @@ protected void configure() {
         setCommand("/opt/bin/entry_point.sh");
 
         if (getShmSize() == null) {
-            this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));
+            if (SystemUtils.IS_OS_WINDOWS) {
+                withSharedMemorySize(512 * FileUtils.ONE_MB);
+            } else {
+                this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));
+            }
         }
 
         /*
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
index 7b7d3a46733..0589d764573 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -2,6 +2,8 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.SystemUtils;
+import org.junit.Assume;
 import org.junit.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.firefox.FirefoxOptions;
@@ -50,6 +52,7 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
 
     @Test
     public void createContainerWithShmVolume() {
+        Assume.assumeFalse("SHM isn't mounted on Windows", SystemUtils.IS_OS_WINDOWS);
         try (
             BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer()
                 .withCapabilities(new FirefoxOptions())

From 14eff07a7cae8d48b07b80e309bba601f164ae66 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 22 Feb 2022 09:50:27 -0500
Subject: [PATCH 1762/4969] Update to `docker-java` 3.2.13 (#5045)

* Try `docker-java` 3.2.13

* Fix imports

* Update build.gradle

* Update SimplePostgreSQLTest.java

* Use `withCgroupnsMode`

* fix `BrowserWebDriverContainer`

* FML
---
 core/build.gradle                                      | 10 +++-------
 .../java/org/testcontainers/DockerClientFactory.java   |  4 ++--
 .../org/testcontainers/containers/ContainerState.java  |  2 +-
 .../containers/DockerComposeContainer.java             |  4 ++--
 .../testcontainers/containers/GenericContainer.java    |  4 ++--
 .../dockerclient/DockerClientConfigUtils.java          |  2 +-
 .../dockerclient/DockerClientProviderStrategy.java     |  2 +-
 .../NpipeSocketClientProviderStrategy.java             |  2 +-
 .../RootlessDockerClientProviderStrategy.java          |  4 ++--
 .../dockerclient/UnixSocketClientProviderStrategy.java |  2 +-
 .../images/builder/ImageFromDockerfile.java            |  2 +-
 .../images/builder/traits/StringsTrait.java            |  2 +-
 .../java/org/testcontainers/utility/AuditLogger.java   |  2 +-
 .../testcontainers/utility/DockerMachineClient.java    |  2 +-
 .../java/org/testcontainers/utility/MountableFile.java |  2 +-
 .../testcontainers/utility/RegistryAuthLocator.java    |  6 +++---
 .../utility/TestcontainersConfiguration.java           |  2 +-
 .../containers/output/ToStringConsumerTest.java        |  2 +-
 .../dockerfile/statement/AbstractStatementTest.java    |  6 +++---
 .../utility/RegistryAuthLocatorTest.java               |  2 +-
 .../main/java/org/testcontainers/ext/ScriptUtils.java  |  2 +-
 .../testcontainers/jdbc/AbstractJDBCDriverTest.java    |  2 +-
 .../containers/JdbcDatabaseContainer.java              |  2 +-
 .../main/java/org/testcontainers/k3s/K3sContainer.java |  4 +---
 .../junit/mariadb/SimpleMariaDBTest.java               |  2 +-
 .../mssqlserver/CustomPasswordMSSQLServerTest.java     |  2 +-
 .../testcontainers/junit/mysql/SimpleMySQLTest.java    |  2 +-
 .../org/testcontainers/containers/OracleContainer.java | 10 +++++-----
 .../containers/BrowserWebDriverContainer.java          |  2 +-
 .../junit/BrowserWebDriverContainerTest.java           |  2 +-
 .../junit/LocalServerWebDriverContainerTest.java       |  2 +-
 .../org/testcontainers/containers/SolrContainer.java   |  2 +-
 32 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 7b014d1ad24..a471aa4816e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -73,17 +73,13 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.1.1'
 
-    api platform('com.github.docker-java:docker-java-bom:3.2.12')
-    shaded platform('com.github.docker-java:docker-java-bom:3.2.12')
+    api platform('com.github.docker-java:docker-java-bom:3.2.13')
+    shaded platform('com.github.docker-java:docker-java-bom:3.2.13')
 
     api "com.github.docker-java:docker-java-api"
 
     shaded 'com.github.docker-java:docker-java-core'
-
-    shaded 'com.github.docker-java:docker-java-transport-okhttp', {
-        // TODO remove unused `net.java.dev.jna:jna-platform` from `docker-java-transport-okhttp`
-        exclude(group: 'net.java.dev.jna', module: 'jna-platform')
-    }
+    shaded 'com.github.docker-java:docker-java-transport-okhttp'
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index d0a4e4a4fb3..9a6165ef55f 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -20,8 +20,8 @@
 import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 import org.testcontainers.dockerclient.DockerMachineClientProviderStrategy;
 import org.testcontainers.dockerclient.TransportConfig;
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 5de9ef7c566..7fe90bd57a4 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -12,7 +12,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index b56c70cb959..b8913e8ac7c 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -12,8 +12,8 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index aca543ef7ec..22a4f0ba739 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -27,8 +27,8 @@
 import lombok.Setter;
 import lombok.SneakyThrows;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.runner.Description;
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
index b494eb087f6..e393e59419f 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
@@ -2,7 +2,7 @@
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.DockerClientFactory;
 
 import java.io.File;
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index b595ddba6ca..89383698adf 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -14,7 +14,7 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
diff --git a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
index fc3c65fd3dd..7f73e1d7675 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
@@ -1,6 +1,6 @@
 package org.testcontainers.dockerclient;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 
 import java.net.URI;
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
index 3ee58f4910a..36d6b5f6123 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
@@ -4,8 +4,8 @@
 import com.sun.jna.Native;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.URI;
diff --git a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
index 6f030ada279..4a85394155d 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
@@ -1,6 +1,6 @@
 package org.testcontainers.dockerclient;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index a434dee2b41..abf13f8ef02 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -9,7 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.images.ParsedDockerfile;
diff --git a/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java b/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java
index 51423068ec9..2b23551ee58 100644
--- a/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java
@@ -1,7 +1,7 @@
 package org.testcontainers.images.builder.traits;
 
 import lombok.Getter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.images.builder.Transferable;
 
 /**
diff --git a/core/src/main/java/org/testcontainers/utility/AuditLogger.java b/core/src/main/java/org/testcontainers/utility/AuditLogger.java
index 567132da05d..f6c4559485d 100644
--- a/core/src/main/java/org/testcontainers/utility/AuditLogger.java
+++ b/core/src/main/java/org/testcontainers/utility/AuditLogger.java
@@ -5,7 +5,7 @@
 import com.github.dockerjava.api.command.DockerCmd;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.MDC;
diff --git a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
index 021baf270d9..6f1e2c9d50b 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
@@ -1,7 +1,7 @@
 package org.testcontainers.utility;
 
 import lombok.NonNull;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 
 import java.util.List;
diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 071d36631b0..19dca4c134c 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -7,7 +7,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarConstants;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.UnstableAPI;
diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index b373eedaa03..d88bdccd76a 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -4,8 +4,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.zeroturnaround.exec.InvalidResultException;
 import org.zeroturnaround.exec.ProcessExecutor;
@@ -22,7 +22,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.testcontainers.utility.AuthConfigUtil.toSafeString;
 
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index bb3febd6b3f..c6ce7496dd9 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -8,7 +8,7 @@
 import lombok.SneakyThrows;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
index 8da67e897e9..1760a8031b2 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.testcontainers.containers.Container.ExecResult;
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
index 35d325c5f40..15c73cadb5f 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
@@ -1,8 +1,8 @@
 package org.testcontainers.images.builder.dockerfile.statement;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 import org.rnorth.ducttape.Preconditions;
@@ -31,7 +31,7 @@ protected void assertStatement(Statement statement) {
             IOUtils.closeQuietly(inputStream);
             expectedLines = StringUtils.chomp(content.replaceAll("\r\n", "\n").trim()).split("\n");
         } catch (Exception e) {
-            fail("can't load fixture '" + testName.getMethodName() + "'\n" + ExceptionUtils.getFullStackTrace(e));
+            fail("can't load fixture '" + testName.getMethodName() + "'\n" + ExceptionUtils.getStackTrace(e));
         }
 
         StringBuilder builder = new StringBuilder();
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index a5e5ab4260d..5db2583958a 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.io.Resources;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index d30064af28e..76f0cb90ea0 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -17,7 +17,7 @@
 package org.testcontainers.ext;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.delegate.DatabaseDelegate;
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index 580aad513e3..4e5eb03bb49 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -3,7 +3,7 @@
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbutils.QueryRunner;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.AfterClass;
 import org.junit.Test;
 import org.junit.runners.Parameterized.Parameter;
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index cf5ae150575..c4bacf3c8ff 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -4,7 +4,7 @@
 import java.sql.Statement;
 import lombok.NonNull;
 import lombok.SneakyThrows;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.delegate.DatabaseDelegate;
diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index 511b309e0d5..54cb2ff500f 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -27,9 +27,7 @@ public K3sContainer(DockerImageName dockerImageName) {
         addExposedPorts(6443, 8443);
         setPrivilegedMode(true);
         withCreateContainerCmdModifier(it -> {
-            DockerObjectAccessor.overrideRawValue(
-                it.getHostConfig(), "CgroupnsMode", "host"
-            );
+            it.getHostConfig().withCgroupnsMode("host");
         });
         addFileSystemBind("/sys/fs/cgroup", "/sys/fs/cgroup", BindMode.READ_WRITE);
 
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 4ea98bbe1fe..2dcdbafd9e3 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.mariadb;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
index 3df8ff0fa3d..6ebd3624577 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.mssqlserver;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 1b6143b3b34..90973bc4b56 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.mysql;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index c833689e692..689646f0006 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.common.collect.Sets;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
@@ -34,7 +34,7 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
     static final String DEFAULT_SID = "xe";
     static final String DEFAULT_SYSTEM_USER = "system";
     static final String DEFAULT_SYS_USER = "sys";
-    
+
     // Test container defaults
     static final String APP_USER = "test";
     static final String APP_USER_PASSWORD = "test";
@@ -75,7 +75,7 @@ private void preconfigure() {
             .withRegEx(".*DATABASE IS READY TO USE!.*\\s")
             .withTimes(1)
             .withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, SECONDS));
-        
+
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
         addExposedPorts(ORACLE_PORT, APEX_HTTP_PORT);
     }
@@ -98,7 +98,7 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return isUsingSid() ? 
+        return isUsingSid() ?
             "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + ":" + getSid() :
             "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + "/" + getDatabaseName();
     }
@@ -195,7 +195,7 @@ protected void configure() {
         if(databaseName != DEFAULT_DATABASE_NAME) {
             withEnv("ORACLE_DATABASE", databaseName);
         }
-        
+
         withEnv("APP_USER", username);
         withEnv("APP_USER_PASSWORD", password);
     }
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index e47c832e2ff..12bbbc07de5 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -18,7 +18,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
index 0589d764573..a53fa532f99 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.Assume;
 import org.junit.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index f7d626c15b5..772193e2d43 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -10,7 +10,7 @@
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.utility.TestEnvironment;
 
-import static org.apache.commons.lang.SystemUtils.IS_OS_MAC_OSX;
+import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 /**
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 4bc2f19ec86..4d0b5cd1ae1 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.SneakyThrows;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 

From 244c77c618bfdd9ba5dad464a22b4b56789550c2 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Fri, 25 Feb 2022 12:07:11 +0100
Subject: [PATCH 1763/4969] [Neo4j] Include code from tests in docs (#5120)

---
 docs/modules/databases/neo4j.md               | 149 ++++--------------
 examples/neo4j-container/build.gradle         |  14 ++
 .../containers/Neo4jExampleTest.java          |  77 +++++++++
 examples/settings.gradle                      |   1 +
 .../Neo4jContainerJUnitIntegrationTest.java   |   2 +-
 .../containers/Neo4jContainerTest.java        |  27 +++-
 .../containers/Neo4jTestImages.java           |   7 -
 7 files changed, 143 insertions(+), 134 deletions(-)
 create mode 100644 examples/neo4j-container/build.gradle
 create mode 100644 examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
 delete mode 100644 modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index 17e1e154fc8..87a5d9157d1 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -6,68 +6,18 @@ Note that it's based on the [official Docker image](https://hub.docker.com/_/neo
 
 ## Usage example
 
-Declare your Testcontainer as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
-You can either use call `getHttpUrl()` or `getBoltUrl()` on the Neo4j container.
-`getHttpUrl()` gives you the HTTP-address of the transactional HTTP endpoint while `getBoltUrl()` is meant to be used with one of the [official Bolt drivers](https://neo4j.com/developer/language-guides/).
+Declare your Testcontainers as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
+You can either use call `getBoltUrl()` or `getHttpUrl()` on the Neo4j container.
+`getBoltUrl()` is meant to be used with one of the [official Bolt drivers](https://neo4j.com/developer/language-guides/) while `getHttpUrl()` gives you the HTTP-address of the transactional HTTP endpoint.
 On the JVM you would most likely use the [Java driver](https://github.com/neo4j/neo4j-java-driver).
 
 The following example uses the JUnit 5 extension `@Testcontainers` and demonstrates both the usage of the Java Driver and the REST endpoint:
 
-=== "JUnit 5 example"
-    ```java
-    @Testcontainers
-    public class ExampleTest {
-    
-        @Container
-        private static Neo4jContainer neo4jContainer = new Neo4jContainer()
-            .withAdminPassword(null); // Disable password
-    
-        @Test
-        void testSomethingUsingBolt() {
-    
-            // Retrieve the Bolt URL from the container
-            String boltUrl = neo4jContainer.getBoltUrl();
-            try (
-                Driver driver = GraphDatabase.driver(boltUrl, AuthTokens.none());
-                Session session = driver.session()
-            ) {
-                long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
-                assertThat(one, is(1L));
-            } catch (Exception e) {
-                fail(e.getMessage());
-            }
-        }
-    
-        @Test
-        void testSomethingUsingHttp() throws IOException {
-    
-            // Retrieve the HTTP URL from the container
-            String httpUrl = neo4jContainer.getHttpUrl();
-    
-            URL url = new URL(httpUrl + "/db/data/transaction/commit");
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
-    
-            con.setRequestMethod("POST");
-            con.setRequestProperty("Content-Type", "application/json");
-            con.setDoOutput(true);
-    
-            try (Writer out = new OutputStreamWriter(con.getOutputStream())) {
-                out.write("{\"statements\":[{\"statement\":\"RETURN 1\"}]}");
-                out.flush();
-            }
-    
-            assertThat(con.getResponseCode(), is(HttpURLConnection.HTTP_OK));
-            try (BufferedReader buffer = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
-                String expectedResponse = 
-                    "{\"results\":[{\"columns\":[\"1\"],\"data\":[{\"row\":[1],\"meta\":[null]}]}],\"errors\":[]}";
-                String response = buffer.lines().collect(Collectors.joining("\n"));
-                assertThat(response, is(expectedResponse));
-            }
-        }
-    }
-    ```
+<!--codeinclude-->
+[JUnit 5 example](../../../examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java) inside_block:junitExample
+<!--/codeinclude-->
 
-You are not limited to Unit tests and can of course use an instance of the Neo4j Testcontainer in vanilla Java code as well.
+You are not limited to Unit tests and can of course use an instance of the Neo4j Testcontainers in vanilla Java code as well.
 
 ## Additional features
 
@@ -75,70 +25,40 @@ You are not limited to Unit tests and can of course use an instance of the Neo4j
 
 Authentication can be disabled:
 
-```java
-@Testcontainers
-public class ExampleTest {
-
-    @Container
-    Neo4jContainer neo4jContainer = new Neo4jContainer()
-        .withoutAuthentication();
-}
-```
+<!--codeinclude-->
+[Disable authentication](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:withoutAuthentication
+<!--/codeinclude-->
 
 ### Neo4j-Configuration
 
 Neo4j's Docker image needs Neo4j configuration options in a dedicated format.
-The container takes care of that and you can configure the database with standard options like the following:
-
-```java
-@Testcontainers
-public class ExampleTest {
+The container takes care of that, and you can configure the database with standard options like the following:
 
-    @Container
-    Neo4jContainer neo4jContainer = new Neo4jContainer()
-        .withNeo4jConfig("dbms.security.procedures.unrestricted", "apoc.*,algo.*");
-}
-```
+<!--codeinclude-->
+[Neo4j configuration](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:neo4jConfiguration
+<!--/codeinclude-->
 
 ### Add custom plugins
 
 Custom plugins, like APOC, can be copied over to the container from any classpath or host resource like this:
 
-```java
-@Testcontainers
-public class ExampleTest {
-
-    @Container
-    Neo4jContainer neo4jContainer = new Neo4jContainer()
-        .withPlugins(MountableFile.forClasspathResource("/apoc-3.5.0.1-all.jar"));
-}
-```
+<!--codeinclude-->
+[Plugin jar](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:registerPluginsJar
+<!--/codeinclude-->
 
 Whole directories work as well:
 
-```java
-@Testcontainers
-public class ExampleTest {
-
-    @Container
-    Neo4jContainer neo4jContainer = new Neo4jContainer()
-        .withPlugins(MountableFile.forClasspathResource("/my-plugins"));
-}
-```
+<!--codeinclude-->
+[Plugin folder](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:registerPluginsPath
+<!--/codeinclude-->
 
 ### Start the container with a predefined database
 
 If you have an existing database (`graph.db`) you want to work with, copy it over to the container like this:
 
-```java
-@Testcontainers
-public class ExampleTest {
-
-    @Container
-    Neo4jContainer neo4jContainer = new Neo4jContainer()
-        .withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
-}
-```
+<!--codeinclude-->
+[Copy database](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:copyDatabase
+<!--/codeinclude-->
 
 !!! note
 The `withDatabase` method will only work with Neo4j 3.5 and throw an exception if used in combination with a newer version.
@@ -147,16 +67,11 @@ The `withDatabase` method will only work with Neo4j 3.5 and throw an exception i
 
 If you need the Neo4j enterprise license, you can declare your Neo4j container like this:
 
-```java
-@Testcontainers
-public class ExampleTest { 
-    @ClassRule
-    public static Neo4jContainer neo4jContainer = new Neo4jContainer()
-        .withEnterpriseEdition();        
-}
-```
+<!--codeinclude-->
+[Enterprise edition](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:enterpriseEdition
+<!--/codeinclude-->
 
-This creates a Testcontainer based on the Docker image build with the Enterprise version of Neo4j. 
+This creates a Testcontainers based on the Docker image build with the Enterprise version of Neo4j. 
 The call to `withEnterpriseEdition` adds the required environment variable that you accepted the terms and condition of the enterprise version.
 You accept those by adding a file named `container-license-acceptance.txt` to the root of your classpath containing the text `neo4j:3.5.0-enterprise` in one line.
 You'll find more information about licensing Neo4j here: [About Neo4j Licenses](https://neo4j.com/licensing/).
@@ -181,11 +96,11 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
     ```
 
 !!! hint
-    Add the Neo4j Java driver if you plan to access the Testcontainer via Bolt:
+    Add the Neo4j Java driver if you plan to access the Testcontainers via Bolt:
     
     === "Gradle"
         ```groovy
-        compile "org.neo4j.driver:neo4j-java-driver:1.7.1"
+        compile "org.neo4j.driver:neo4j-java-driver:4.4.3"
         ```
     
     === "Maven"
@@ -193,10 +108,6 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>1.7.1</version>
+            <version>4.4.3</version>
         </dependency>
         ```
-    
-
-
-
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
new file mode 100644
index 00000000000..718adc3183a
--- /dev/null
+++ b/examples/neo4j-container/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.3'
+    testImplementation 'org.testcontainers:neo4j'
+    testImplementation 'org.testcontainers:junit-jupiter'
+}
diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
new file mode 100644
index 00000000000..7730d4fa8d0
--- /dev/null
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -0,0 +1,77 @@
+package org.testcontainers.containers;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
+import org.neo4j.driver.Session;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+// junitExample {
+@Testcontainers
+public class Neo4jExampleTest {
+
+    @Container
+    private static Neo4jContainer<?> neo4jContainer =
+        new Neo4jContainer<>(DockerImageName.parse("neo4j:4.4"))
+        .withAdminPassword(null); // Disable password
+
+    @Test
+    void testSomethingUsingBolt() {
+
+        // Retrieve the Bolt URL from the container
+        String boltUrl = neo4jContainer.getBoltUrl();
+        try (
+            Driver driver = GraphDatabase.driver(boltUrl, AuthTokens.none());
+            Session session = driver.session()
+        ) {
+            long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
+            assertThat(one).isEqualTo(1L);
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    void testSomethingUsingHttp() throws IOException {
+
+        // Retrieve the HTTP URL from the container
+        String httpUrl = neo4jContainer.getHttpUrl();
+
+        URL url = new URL(httpUrl + "/db/data/transaction/commit");
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+
+        con.setRequestMethod("POST");
+        con.setRequestProperty("Content-Type", "application/json");
+        con.setDoOutput(true);
+
+        try (Writer out = new OutputStreamWriter(con.getOutputStream())) {
+            out.write("{\"statements\":[{\"statement\":\"RETURN 1\"}]}");
+            out.flush();
+        }
+
+        assertThat(con.getResponseCode()).isEqualTo(HttpURLConnection.HTTP_OK);
+        try (BufferedReader buffer = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+            String expectedResponse =
+                "{\"results\":[{\"columns\":[\"1\"],\"data\":[{\"row\":[1],\"meta\":[null]}]}],\"errors\":[]}";
+            String response = buffer.lines().collect(Collectors.joining("\n"));
+            assertThat(response).isEqualTo(expectedResponse);
+        }
+    }
+}
+// }
diff --git a/examples/settings.gradle b/examples/settings.gradle
index f58ea83fb9b..75f739e9005 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -23,6 +23,7 @@ include 'disque-job-queue'
 include 'kafka-cluster'
 include 'linked-container'
 include 'mongodb-container'
+include 'neo4j-container'
 include 'redis-backed-cache'
 include 'redis-backed-cache-testng'
 include 'selenium-container'
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
index ad6ccad8281..6832dfff0c7 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
@@ -20,7 +20,7 @@
 public class Neo4jContainerJUnitIntegrationTest {
 
     @ClassRule
-    public static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE);
+    public static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4");
 
     @Test
     public void shouldStart() {
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index fcfda6f6873..25924fdd6b4 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -9,6 +9,7 @@
 import org.neo4j.driver.Record;
 import org.neo4j.driver.Result;
 import org.neo4j.driver.Session;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Collections;
@@ -31,7 +32,10 @@ public class Neo4jContainerTest {
     public void shouldDisableAuthentication() {
 
         try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE).withoutAuthentication()
+            // withoutAuthentication {
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+                .withoutAuthentication()
+            // }
         ) {
             neo4jContainer.start();
             try (Driver driver = getDriver(neo4jContainer);
@@ -46,8 +50,10 @@ public void shouldDisableAuthentication() {
     @Test
     public void shouldCopyDatabase() {
         try (
+            // copyDatabase {
             Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:3.5.30")
                 .withDatabase(MountableFile.forClasspathResource("/test-graph.db"))
+            // }
         ) {
             neo4jContainer.start();
             try (
@@ -88,8 +94,10 @@ public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
     @Test
     public void shouldCopyPlugins() {
         try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+            // registerPluginsPath {
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
                 .withPlugins(MountableFile.forClasspathResource("/custom-plugins"))
+            // }
         ) {
             neo4jContainer.start();
             try (
@@ -104,8 +112,10 @@ public void shouldCopyPlugins() {
     @Test
     public void shouldCopyPlugin() {
         try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+            // registerPluginsJar {
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
                 .withPlugins(MountableFile.forClasspathResource("/custom-plugins/hello-world.jar"))
+            // }
         ) {
             neo4jContainer.start();
             try (
@@ -131,7 +141,7 @@ public void shouldCheckEnterpriseLicense() {
         String expectedImageName = "neo4j:4.4-enterprise";
 
         assertThatExceptionOfType(IllegalStateException.class)
-            .isThrownBy(() -> new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE).withEnterpriseEdition())
+            .isThrownBy(() -> new Neo4jContainer<>("neo4j:4.4").withEnterpriseEdition())
             .withMessageContaining("The image " + expectedImageName + " requires you to accept a license agreement.");
     }
 
@@ -140,8 +150,10 @@ public void shouldRunEnterprise() {
         assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNotNull();
 
         try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+            // enterpriseEdition {
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
                 .withEnterpriseEdition()
+            // }
                 .withAdminPassword("Picard123")
         ) {
             neo4jContainer.start();
@@ -159,10 +171,11 @@ public void shouldRunEnterprise() {
 
     @Test
     public void shouldAddConfigToEnvironment() {
-
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(Neo4jTestImages.NEO4J_TEST_IMAGE)
+        // neo4jConfiguration {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
             .withNeo4jConfig("dbms.security.procedures.unrestricted", "apoc.*,algo.*")
             .withNeo4jConfig("dbms.tx_log.rotation.size", "42M");
+        // }
 
         assertThat(neo4jContainer.getEnvMap())
             .containsEntry("NEO4J_dbms_security_procedures_unrestricted", "apoc.*,algo.*");
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
deleted file mode 100644
index aee6f29fc5f..00000000000
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jTestImages.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.testcontainers.containers;
-
-import org.testcontainers.utility.DockerImageName;
-
-public interface Neo4jTestImages {
-    DockerImageName NEO4J_TEST_IMAGE = DockerImageName.parse("neo4j:4.4.1");
-}

From cbccd499fbc9f882a8d4da0f7254796a1ea9d28f Mon Sep 17 00:00:00 2001
From: hellozepp <jingtianyy@qq.com>
Date: Tue, 1 Mar 2022 00:54:49 +0800
Subject: [PATCH 1764/4969] Add the using organization `Byzer` (#5125)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 998722af50f..fdbad94b851 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -198,6 +198,7 @@ A huge thank you to our sponsors:
 * [Elastic](https://www.elastic.co) - Integration testing of the Java APM agent
 * [Alkira](https://www.alkira.com/) - Testing of multiple micro-services using Kafka, PostgreSQL, Apache Zookeeper, Etcd and so on.
 * [Togglz](https://www.togglz.org/) - Feature Flags for the Java platform
+* [Byzer](https://www.byzer.org/home) - Integration tests for Data and AI platforms are based on multiple versions of Byzer, Ray and Apache Spark.
 
 
 ## License

From d21a29e7a4de2c0d82cf2ae4b6c9eb7d85533103 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:08:33 +0000
Subject: [PATCH 1765/4969] Bump aws-java-sdk-s3 from 1.12.150 to 1.12.169 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.150 to 1.12.169.
- [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.12.150...1.12.169)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 8dc6dc2671f..7a076881a96 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.150'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.169'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.139'
     testImplementation 'software.amazon.awssdk:s3:2.17.108'

From 43f807dc8ba58c5cbab61880e24c0ce2fd3595a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:08:50 +0000
Subject: [PATCH 1766/4969] Bump neo4j from 3.5.29 to 3.5.31 in /modules/neo4j

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.29 to 3.5.31.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/commits)

---
updated-dependencies:
- dependency-name: org.neo4j:neo4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 1d5cffc1955..27bf38b9f23 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,7 +29,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.29"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.31"
 
     api project(":testcontainers")
 

From 0343dacda34bccd074700810c4f7c53d0ab74c53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:08:51 +0000
Subject: [PATCH 1767/4969] Bump aws-java-sdk-logs from 1.12.139 to 1.12.169 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.139 to 1.12.169.
- [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.12.139...1.12.169)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 8dc6dc2671f..fda140b12da 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.139'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
     testImplementation 'software.amazon.awssdk:s3:2.17.108'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 7c75b0a3040721b35b592a747c2097fa1abf977b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:09:32 +0000
Subject: [PATCH 1768/4969] Bump guava from 31.0.1-jre to 31.1-jre in
 /modules/jdbc-test

Bumps [guava](https://github.com/google/guava) from 31.0.1-jre to 31.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 98570722e6a..314b3ab6a2d 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
     api project(':test-support')
 
-    api 'com.google.guava:guava:31.0.1-jre'
+    api 'com.google.guava:guava:31.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.7'

From e17bc43e70dc3eaee7224eb1b4ace75c905194a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:09:45 +0000
Subject: [PATCH 1769/4969] Bump transport from 7.17.0 to 7.17.1 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.0 to 7.17.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.0...v7.17.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index fca8ecfe9fb..d669f0fbd05 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.17.0"
+    testImplementation "org.elasticsearch.client:transport:7.17.1"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From d7cb81c9a97deb39cd6d7c100853cb7ccb358476 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:09:46 +0000
Subject: [PATCH 1770/4969] Bump org.springframework.boot from 2.6.3 to 2.6.4
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index d728c13e3c0..7677e82eefb 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.6.3'
+    id 'org.springframework.boot' version '2.6.4'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 5a9495d86bf..45cee0ec20b 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.6.3"
+    id("org.springframework.boot") version "2.6.4"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.6.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index ace47d12ebe..e3b3376e28f 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.6.3'
+    id 'org.springframework.boot' version '2.6.4'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 99578c4b2a2e45b1b7efe4638eb1af4449cbb667 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:10:10 +0000
Subject: [PATCH 1771/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.150 to 1.12.169.
- [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.12.150...1.12.169)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index ce09dde17e6..2fa5978772e 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.169'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 6904d8e21b5a248420c2373d0f8efcefd6a7000d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:10:28 +0000
Subject: [PATCH 1772/4969] Bump actions/setup-java from 2.5.0 to 3

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.5.0 to 3.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2.5.0...v3)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 .github/workflows/release.yml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index d7351605e6d..3fb2467a295 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -17,7 +17,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0fd59f892f0..db7232fffa8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d9026eb2257..f6df0dd46f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.5.0
+      - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
           distribution: temurin

From 5d2806f3bc4a01660cc9f550a37a9213946e62f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:18:26 +0000
Subject: [PATCH 1773/4969] Bump google-cloud-spanner from 6.17.4 to 6.20.0 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.17.4 to 6.20.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.17.4...v6.20.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 72e304029ce..0e5ebee97dd 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.2'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.11'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.2'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 03b5a75d391600f716c5a514d58eb79c985baa42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:18:30 +0000
Subject: [PATCH 1774/4969] Bump google-cloud-firestore from 3.0.11 to 3.0.14
 in /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.0.11 to 3.0.14.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.0.11...v3.0.14)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 72e304029ce..7d17a689ecf 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.2'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.11'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.14'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.2'

From 30e8635e7e5b8160e66f014d4055a20b628e8499 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 3 Mar 2022 06:55:50 -0500
Subject: [PATCH 1775/4969] Add the session header to every Docker request
 (#5145)

To improve tracing and other operations, we add current session's id
to every Docker request that we are making.
---
 .../DockerClientProviderStrategy.java         |  7 ++++-
 .../HeadersAddingDockerHttpClient.java        | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 89383698adf..c65887b6af6 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -20,10 +20,12 @@
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -282,7 +284,10 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
                     .withDockerHost(transportConfig.getDockerHost().toString())
                     .build()
             ),
-            dockerHttpClient
+            new HeadersAddingDockerHttpClient(
+                dockerHttpClient,
+                Collections.singletonMap("x-tc-sid", DockerClientFactory.SESSION_ID)
+            )
         );
     }
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java b/core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java
new file mode 100644
index 00000000000..59a51e19a80
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java
@@ -0,0 +1,27 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.transport.DockerHttpClient;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Delegate;
+
+import java.io.Closeable;
+import java.util.Map;
+
+@RequiredArgsConstructor
+@ToString
+class HeadersAddingDockerHttpClient implements DockerHttpClient {
+
+    @Delegate(types = Closeable.class)
+    final DockerHttpClient delegate;
+
+    final Map<String, String> headers;
+
+    @Override
+    public Response execute(Request request) {
+        request = Request.builder().from(request)
+            .putAllHeaders(headers)
+            .build();
+        return delegate.execute(request);
+    }
+}

From 71a0679a675f5474f8f6c869827de6402d1819b9 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 3 Mar 2022 14:45:15 -0500
Subject: [PATCH 1776/4969] Run tests using shaded dependencies (#5146)

* Test shaded JARs

* Find shaded projects recursively

* Add missing space

* fix core tests

* fix HiveMQ module

* Simplify the HiveMQ workaround

* Add a comment that explains why we pin Jackson version in k3s
---
 ...temPropertyClientProviderStrategyTest.java | 26 +++++++++----------
 gradle/shading.gradle                         | 12 +++++++++
 .../hivemq/HiveMQExtension.java               | 16 +++++++++---
 modules/k3s/build.gradle                      |  5 +++-
 4 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
index c8eec1d38d8..a6bd68be745 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
@@ -1,8 +1,8 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.LocalDirectorySSLConfig;
 import com.github.dockerjava.transport.SSLConfig;
+import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -16,15 +16,12 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
@@ -93,21 +90,24 @@ public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
         assertEquals("tcp://1.2.3.4:2375", transportConfig.getDockerHost().toString());
 
         SSLConfig sslConfig = transportConfig.getSslConfig();
-        assertNotNull(sslConfig);
-        assertTrue(sslConfig instanceof LocalDirectorySSLConfig);
-        assertEquals(tempDirPath, ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
+        Assertions.assertThat(sslConfig)
+            .extracting("dockerCertPath")
+            .isEqualTo(tempDirPath);
     }
 
     @Test
     public void applicableWhenIgnoringUserPropertiesAndConfigured() {
         Mockito.doReturn("autoIgnoringUserProperties").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
 
-        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder()
-            .withDockerHost("tcp://1.2.3.4:2375");
+        Properties oldProperties = System.getProperties();
+        try {
+            System.setProperty("DOCKER_HOST", "tcp://1.2.3.4:2375");
+            EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
-        EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy(configBuilder);
-
-        assertTrue(strategy.isApplicable());
+            assertTrue(strategy.isApplicable());
+        } finally {
+            System.setProperties(oldProperties);
+        }
     }
 
     @Test
diff --git a/gradle/shading.gradle b/gradle/shading.gradle
index 909989caf84..fc7f6587b3e 100644
--- a/gradle/shading.gradle
+++ b/gradle/shading.gradle
@@ -55,4 +55,16 @@ project.afterEvaluate {
 
         tasks.shadowJar.relocate(pkg, "org.testcontainers.shaded.${pkg}")
     }
+
+    // Add shaded JARs first
+    tasks.test.classpath = findShadedProjects(project)
+        .plus(project)
+        .sum { it.tasks.findByName("shadowJar").outputs.files }
+        .plus(sourceSets.test.runtimeClasspath)
+}
+
+static Set<Project> findShadedProjects(Project project) {
+    Set<Project> dependencies = project.configurations.api.dependencies.withType(ProjectDependency)*.dependencyProject
+
+    return dependencies + dependencies.collectMany { it -> findShadedProjects(it) }
 }
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
index a975439f4b3..934dfd0c29c 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
@@ -4,9 +4,12 @@
 import javassist.NotFoundException;
 import lombok.Getter;
 import org.apache.commons.io.FileUtils;
+import org.jboss.shrinkwrap.api.ExtensionLoader;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.exporter.zip.ZipExporterImpl;
+import org.jboss.shrinkwrap.impl.base.spec.JavaArchiveImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -101,9 +104,16 @@ private HiveMQExtension(
             }
         }
 
-        final JavaArchive javaArchive =
-            ShrinkWrap.create(JavaArchive.class)
-                .addAsServiceProvider(EXTENSION_MAIN_CLASS_NAME, hiveMQExtension.getMainClass().getName());
+        // Shadow Gradle plugin doesn't know how to handle ShrinkWrap's SPI definitions
+        // This workaround creates the mappings programmatically
+        // TODO write a custom Gradle Shadow transformer?
+        ExtensionLoader extensionLoader = ShrinkWrap.getDefaultDomain().getConfiguration().getExtensionLoader();
+        extensionLoader.addOverride(JavaArchive.class, JavaArchiveImpl.class);
+        extensionLoader.addOverride(ZipExporter.class, ZipExporterImpl.class);
+
+        final JavaArchive javaArchive = ShrinkWrap
+            .create(JavaArchive.class)
+            .addAsServiceProvider(EXTENSION_MAIN_CLASS_NAME, hiveMQExtension.getMainClass().getName());
 
         putSubclassesIntoJar(hiveMQExtension.getId(), hiveMQExtension.getMainClass(), javaArchive);
         for (final Class<?> additionalClass : hiveMQExtension.getAdditionalClasses()) {
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index e36dc67bd9c..5007c832e7f 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -3,7 +3,10 @@ description = "Testcontainers :: K3S"
 dependencies {
     api project(":testcontainers")
 
-    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
+    // https://youtu.be/otCpCn0l4Wo
+    // The core module depends on jackson-databind 2.8.x for backward compatibility.
+    // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
+    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:5.11.0'
     testImplementation 'io.kubernetes:client-java:14.0.0'

From 947b37e296e883a6eaf62423eb6981aa5c7cfa6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Mar 2022 19:46:16 +0000
Subject: [PATCH 1777/4969] Bump kubernetes-client from 5.11.0 to 5.12.1 in
 /modules/k3s

Bumps [kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 5.11.0 to 5.12.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v5.11.0...v5.12.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 5007c832e7f..075078f36d9 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:5.11.0'
+    testImplementation 'io.fabric8:kubernetes-client:5.12.1'
     testImplementation 'io.kubernetes:client-java:14.0.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 6dea9789db1f970da20fc04d11eb3c5323a8bd4f Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Fri, 4 Mar 2022 10:51:32 +0000
Subject: [PATCH 1778/4969] Fix formatting in docs for image override
 configuration (#5147)

---
 docs/features/image_name_substitution.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
index 7ead811a250..f3c78c1f309 100644
--- a/docs/features/image_name_substitution.md
+++ b/docs/features/image_name_substitution.md
@@ -112,9 +112,10 @@ To do this, create or modify a file on the classpath named `testcontainers.prope
 
 For example:
 
-```text tab="src/test/resources/testcontainers.properties"
-image.substitutor=com.mycompany.testcontainers.ExampleImageNameSubstitutor
-``` 
+=== "`src/test/resources/testcontainers.properties`"
+    ```text
+    image.substitutor=com.mycompany.testcontainers.ExampleImageNameSubstitutor
+    ``` 
 
 Note that it is also possible to provide this same configuration property:
 
@@ -130,7 +131,7 @@ Please see [the documentation on configuration mechanisms](./configuration.md) f
 !!! note
     This approach is discouraged and deprecated, but is documented for completeness.
     Please consider one of the other approaches outlined in this page instead.
-    Overriding individual image names via configuration may be removed in 2021. 
+    Overriding individual image names via configuration may be removed in the future. 
 
 Consider this if:
 

From e12b63692d9f3922b53705041d81a9f529bc479f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Mar 2022 13:59:20 +0000
Subject: [PATCH 1779/4969] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-docker-wormhole.yml    | 2 +-
 .github/workflows/ci-examples.yml           | 4 ++--
 .github/workflows/ci-rootless.yml           | 2 +-
 .github/workflows/ci.yml                    | 6 +++---
 .github/workflows/release.yml               | 2 +-
 .github/workflows/update-docs-version.yml   | 2 +-
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index d750d8b39e0..b93d26d98bb 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -8,7 +8,7 @@ jobs:
   in-docker_test:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build with Gradle
         run: |
           docker run -i --rm \
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 3fb2467a295..a594f936a84 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -16,7 +16,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
@@ -44,7 +44,7 @@ jobs:
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 71ded85cf53..45c58c5e2d0 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -16,7 +16,7 @@ jobs:
     env:
       XDG_RUNTIME_DIR: ${{ matrix.XDG_RUNTIME_DIR }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: debug
         run: id -u; whoami
       - name: uninstall rootful Docker
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db7232fffa8..d0f57d88667 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     outputs:
       thundra_agent_testrun_id: ${{ steps.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - id: thundra_test_initializer
         uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
@@ -24,7 +24,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
@@ -50,7 +50,7 @@ jobs:
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f6df0dd46f4..5c786d440c5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
   release:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           java-version: '8.0.302'
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 2c7626c7ec7..ef039182317 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: master
       - name: Update latest_version property in mkdocs.yml
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 253e37c23eb..e2013d0f1b7 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@5b865a8b4d09fdf6afaaa20397ba68455bb48f0d # v1.0.13

From 5f7ded3ac202fd379f5b92bbf196b2c4e30cc6b4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 8 Mar 2022 09:08:19 -0500
Subject: [PATCH 1780/4969] Deprecate `getTestHostIpAddress` and
 `getContainerIpAddress()` (#5149)

* Deprecate `getTestHostIpAddress`

* Update docs/modules/webdriver_containers.md

Co-authored-by: Richard North <rich.north@gmail.com>

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../testcontainers/containers/Container.java  |  2 ++
 .../containers/ContainerState.java            |  1 +
 .../containers/GenericContainer.java          |  1 +
 docs/modules/webdriver_containers.md          |  3 +--
 .../LocalServerWebDriverContainerTest.java    | 20 ++++++-------------
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index 9c1cb7f8034..d9291fc9fc8 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -365,7 +365,9 @@ default SELF withClasspathResourceMapping(final String resourcePath, final Strin
      * from inside the container is not going to work, since the container has its own IP address.
      *
      * @return the IP address of the host machine
+     * @deprecated use {@link org.testcontainers.Testcontainers#exposeHostPorts(int...)}
      */
+    @Deprecated
     String getTestHostIpAddress();
 
     /**
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 7fe90bd57a4..e5903b0b806 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -44,6 +44,7 @@ public interface ContainerState {
      * Get the IP address that this container may be reached on (may not be the local machine).
      *
      * @return an IP address
+     * @deprecated use {@link #getHost()}
      * @see #getHost()
      */
     default String getContainerIpAddress() {
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 22a4f0ba739..70e080711a7 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1332,6 +1332,7 @@ public String getDockerImageName() {
      * {@inheritDoc}
      */
     @Override
+    @Deprecated
     public String getTestHostIpAddress() {
         if (DockerMachineClient.instance().isInstalled()) {
             try {
diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index d589aa18098..ec1dc2a407f 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -36,8 +36,7 @@ test methods:
 You can then use this driver instance like a regular WebDriver.
 
 Note that, if you want to test a **web application running on the host machine** (the machine the JUnit tests are
-running on - which is quite likely), you'll need to replace any references to `localhost` with an IP address that the
-Docker container can reach. Use the `getTestHostIpAddress()` method, e.g.:
+running on - which is quite likely), you'll need to use [the host exposing](../features/networking.md#exposing-host-ports-to-the-container) feature of Testcontainers, e.g.:
 <!--codeinclude-->
 [Open Web Page](../../modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java) inside_block:getPage
 <!--/codeinclude-->
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index 772193e2d43..3c071984dfb 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -7,10 +7,9 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
+import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.utility.TestEnvironment;
 
-import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 /**
@@ -20,18 +19,11 @@
 public class LocalServerWebDriverContainerTest {
 
     @Rule
-    public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer().withCapabilities(new ChromeOptions());
+    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
+        .withAccessToHost(true)
+        .withCapabilities(new ChromeOptions());
     private int localPort;
 
-    /**
-     * The getTestHostIpAddress() method is only implemented for OS X running docker-machine. Skip JUnit execution elsewhere.
-     */
-    @BeforeClass
-    public static void checkOS() {
-        Assume.assumeTrue("These tests are currently only applicable to OS X", IS_OS_MAC_OSX);
-        Assume.assumeTrue("These tests are only applicable to docker machine", TestEnvironment.dockerIsDockerMachine());
-    }
-
     @Before
     public void setupLocalServer() throws Exception {
 
@@ -55,8 +47,8 @@ public void testConnection() {
 
         // Construct a URL that the browser container can access
         // getPage {
-        String hostIpAddress = chrome.getTestHostIpAddress();
-        driver.get("http://" + hostIpAddress + ":" + localPort);
+        Testcontainers.exposeHostPorts(localPort);
+        driver.get("http://host.testcontainers.internal:" + localPort);
         // }
 
         String headingText = driver.findElement(By.cssSelector("h1")).getText().trim();

From affaf194f08bb1409e23996f03ad05cb3eabe943 Mon Sep 17 00:00:00 2001
From: Yannick Weber <yannick.weber@hivemq.com>
Date: Tue, 8 Mar 2022 16:24:15 +0100
Subject: [PATCH 1781/4969] replaced non-ascii single quote with ascii single
 quote (#5102)

---
 .../main/java/org/testcontainers/hivemq/HiveMQContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 342903e24af..996caad1eb8 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -354,7 +354,7 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
         }
 
         if (!file.exists()) {
-            throw new ContainerLaunchException("File '" + mountableFile.getFilesystemPath() + "‘ does not exist.");
+            throw new ContainerLaunchException("File '" + mountableFile.getFilesystemPath() + "' does not exist.");
         }
         final String containerPath = "/opt/hivemq" + PathUtil.prepareAppendPath(pathInHomeFolder);
         withCopyFileToContainer(cloneWithFileMode(mountableFile), containerPath);

From 40341d3912a2fe623adb83651c52a490734f3ab9 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Fri, 11 Mar 2022 14:16:15 +0100
Subject: [PATCH 1782/4969] Mention that Spring Data Neo4j uses Testcontainers
 in the docs (#5169)

* Fix Neo4j-OGM usage description.

* Add Spring Data Neo4j to the "who is using"-part.
---
 docs/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index fdbad94b851..8749e3678cf 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -176,7 +176,8 @@ A huge thank you to our sponsors:
 * [Instana](https://www.instana.com) - Testing agents and stream processing backends
 * [eBay Marketing](https://www.ebay.com) - Testing for MySQL, Cassandra, Redis, Couchbase, Kafka, etc.
 * [Skyscanner](https://www.skyscanner.net/) - Integration testing against HTTP service mocks and various data stores
-* [Neo4j-OGM](https://neo4j.com/developer/neo4j-ogm/) - Testing new, reactive client implementations
+* [Neo4j-OGM](https://neo4j.com/developer/neo4j-ogm/) - Testing with Neo4j
+* [Spring Data Neo4j](https://github.com/spring-projects/spring-data-neo4j/) - Testing imperative and reactive implementations with Neo4j
 * [Lightbend](https://www.lightbend.com/) - Testing [Alpakka Kafka](https://doc.akka.io/docs/alpakka-kafka/current/) and support in [Alpakka Kafka Testkit](https://doc.akka.io/docs/alpakka-kafka/current/testing.html#testing-with-kafka-in-docker)
 * [Zalando SE](https://corporate.zalando.com/en) - Testing core business services
 * [Europace AG](https://tech.europace.de/) - Integration testing for databases and micro services

From eea61bd9a794842aae7865e505be72a938e2a7e0 Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Thu, 17 Mar 2022 12:48:25 +0100
Subject: [PATCH 1783/4969] Use collapse-after for dependencies category
 (#5157)

Bump release-drafter.yml
---
 .github/release-drafter.yml           | 1 +
 .github/workflows/release-drafter.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 4da341055c2..07376824bf7 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -23,3 +23,4 @@ categories:
       - type/test-improvement
   - title: 📦 Dependency updates
     label: dependencies
+    collapse-after: 5
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 05485ac57fa..839fb43df4d 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -12,6 +12,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@2f7ebf8ab5ef7f9835ee4b0b1eebaa2a14ca1669 # v5.15.0
+      - uses: release-drafter/release-drafter@e9ee02fbac03d922bac6212003695e8358dd88b0 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From e450586648f613abae00e29cb8d290a987e43a25 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Fri, 25 Mar 2022 13:28:48 +0100
Subject: [PATCH 1784/4969] Enable Neo4j labs plugin definition. (#5035)

---
 docs/modules/databases/neo4j.md               | 17 +++++-
 .../containers/Neo4jContainer.java            | 41 +++++++++++++
 .../containers/Neo4jLabsPlugin.java           | 21 +++++++
 .../containers/Neo4jContainerTest.java        | 58 ++++++++++++++++++-
 4 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index 87a5d9157d1..b6a04d2195c 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -52,6 +52,21 @@ Whole directories work as well:
 [Plugin folder](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:registerPluginsPath
 <!--/codeinclude-->
 
+### Add Neo4j Docker Labs plugins
+
+Add any Neo4j Labs plugin from the [Neo4j Docker Labs plugin list](https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins).
+
+!!! note
+    At the moment only the plugins available from the list Neo4j Docker 4.4 are supported by type.
+    If you want to register another supported Neo4j Labs plugin, you have to add it manually
+    by using the method `withLabsPlugins(String... neo4jLabsPlugins)`.
+    Please refer to the list of [supported Docker image plugins](https://neo4j.com/docs/operations-manual/current/docker/operations/#docker-neo4jlabs-plugins).
+
+<!--codeinclude-->
+[Configure Neo4j Labs Plugins](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:configureLabsPlugins
+<!--/codeinclude-->
+
+
 ### Start the container with a predefined database
 
 If you have an existing database (`graph.db`) you want to work with, copy it over to the container like this:
@@ -61,7 +76,7 @@ If you have an existing database (`graph.db`) you want to work with, copy it ove
 <!--/codeinclude-->
 
 !!! note
-The `withDatabase` method will only work with Neo4j 3.5 and throw an exception if used in combination with a newer version.
+    The `withDatabase` method will only work with Neo4j 3.5 and throw an exception if used in combination with a newer version.
 
 ## Choose your Neo4j license
 
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index f844df3f945..6f0cf10ded7 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -4,7 +4,11 @@
 import static java.util.stream.Collectors.toSet;
 
 import java.time.Duration;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
@@ -60,6 +64,8 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
 
     private String adminPassword = DEFAULT_ADMIN_PASSWORD;
 
+    private final Set<String> labsPlugins = new HashSet<>();
+
     /**
      * Creates a Neo4jContainer using the official Neo4j docker image.
      * @deprecated use {@link Neo4jContainer(DockerImageName)} instead
@@ -119,6 +125,15 @@ protected void configure() {
         boolean emptyAdminPassword = this.adminPassword == null || this.adminPassword.isEmpty();
         String neo4jAuth = emptyAdminPassword ? "none" : String.format(AUTH_FORMAT, this.adminPassword);
         addEnv("NEO4J_AUTH", neo4jAuth);
+
+        if (!this.labsPlugins.isEmpty()) {
+            String enabledPlugins = this.labsPlugins.stream()
+                .map(pluginName -> "\"" + pluginName + "\"")
+                .collect(Collectors.joining(","));
+
+            addEnv("NEO4JLABS_PLUGINS", "[" + enabledPlugins + "]");
+        }
+
     }
 
     /**
@@ -251,6 +266,32 @@ public String getAdminPassword() {
         return adminPassword;
     }
 
+    /**
+     * Registers one or more {@link Neo4jLabsPlugin} for download and server startup.
+
+     * @param neo4jLabsPlugins The Neo4j plugins that should get started with the server.
+     * @return This container.
+     */
+    public S withLabsPlugins(Neo4jLabsPlugin... neo4jLabsPlugins) {
+        List<String> pluginNames = Arrays.stream(neo4jLabsPlugins)
+            .map(plugin -> plugin.pluginName)
+            .collect(Collectors.toList());
+
+        this.labsPlugins.addAll(pluginNames);
+        return self();
+    }
+
+    /**
+     * Registers one or more {@link Neo4jLabsPlugin} for download and server startup.
+
+     * @param neo4jLabsPlugins The Neo4j plugins that should get started with the server.
+     * @return This container.
+     */
+    public S withLabsPlugins(String... neo4jLabsPlugins) {
+        this.labsPlugins.addAll(Arrays.asList(neo4jLabsPlugins));
+        return self();
+    }
+
     private static String formatConfigurationKey(String plainConfigKey) {
         final String prefix = "NEO4J_";
 
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java
new file mode 100644
index 00000000000..96c8e987c85
--- /dev/null
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java
@@ -0,0 +1,21 @@
+package org.testcontainers.containers;
+
+/**
+ * Reflects a plugin from the official Neo4j 4.4.
+ * <a href="https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins">Neo4j Labs Plugin list</a>.
+ * There might be plugins not supported by your selected version of Neo4j.
+ */
+public enum Neo4jLabsPlugin {
+    APOC("apoc"),
+    APOC_CORE("apoc-core"),
+    BLOOM("bloom"),
+    STREAMS("streams"),
+    GRAPH_DATA_SCIENCE("graph-data-science"),
+    NEO_SEMANTICS("n10s");
+
+    final String pluginName;
+
+    Neo4jLabsPlugin(String pluginName) {
+        this.pluginName = pluginName;
+    }
+}
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 25924fdd6b4..0d3f04ef570 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -9,7 +9,6 @@
 import org.neo4j.driver.Record;
 import org.neo4j.driver.Result;
 import org.neo4j.driver.Session;
-import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Collections;
@@ -183,6 +182,63 @@ public void shouldAddConfigToEnvironment() {
             .containsEntry("NEO4J_dbms_tx__log_rotation_size", "42M");
     }
 
+    @Test
+    public void shouldConfigureSingleLabsPlugin() {
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            .withLabsPlugins(Neo4jLabsPlugin.APOC)) {
+
+
+            // needs to get called explicitly for setup
+            neo4jContainer.configure();
+
+            assertThat(neo4jContainer.getEnvMap())
+                .containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
+        }
+    }
+
+    @Test
+    public void shouldConfigureMultipleLabsPlugins() {
+        try(
+        // configureLabsPlugins {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            .withLabsPlugins(Neo4jLabsPlugin.APOC, Neo4jLabsPlugin.BLOOM);
+        // }
+        ) {
+            // needs to get called explicitly for setup
+            neo4jContainer.configure();
+
+            assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
+                .containsAnyOf("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
+        }
+    }
+
+    @Test
+    public void shouldConfigureSingleLabsPluginWithString() {
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            .withLabsPlugins("myApoc")) {
+
+            // needs to get called explicitly for setup
+            neo4jContainer.configure();
+
+            assertThat(neo4jContainer.getEnvMap())
+                .containsEntry("NEO4JLABS_PLUGINS", "[\"myApoc\"]");
+        }
+    }
+
+    @Test
+    public void shouldConfigureMultipleLabsPluginsWithString() {
+
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            .withLabsPlugins("myApoc", "myBloom")) {
+
+            // needs to get called explicitly for setup
+            neo4jContainer.configure();
+
+            assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
+                .containsAnyOf("[\"myApoc\",\"myBloom\"]", "[\"myBloom\",\"myApoc\"]");
+        }
+    }
+
     private static Driver getDriver(Neo4jContainer<?> container) {
 
         AuthToken authToken = AuthTokens.none();

From 0545c0e1c61ba87d7bf7350ab4f9d719c46150d4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 28 Mar 2022 11:01:43 -0400
Subject: [PATCH 1785/4969] Remove OkHttp transport (#5113)

* Remove OkHttp transport

* Fix OkHttp dependencies
---
 core/build.gradle                                          | 1 -
 .../dockerclient/DockerClientProviderStrategy.java         | 7 -------
 modules/azure/build.gradle                                 | 2 ++
 modules/couchbase/build.gradle                             | 2 ++
 modules/solr/build.gradle                                  | 3 +++
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 89028d0f9c3..558584a0d7c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -79,7 +79,6 @@ dependencies {
     api "com.github.docker-java:docker-java-api"
 
     shaded 'com.github.docker-java:docker-java-core'
-    shaded 'com.github.docker-java:docker-java-transport-okhttp'
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index c65887b6af6..2ae066d897d 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -6,7 +6,6 @@
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.okhttp.OkDockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
 import com.google.common.annotations.VisibleForTesting;
@@ -257,12 +256,6 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
 
         String transportType = TestcontainersConfiguration.getInstance().getTransportType();
         switch (transportType) {
-            case "okhttp":
-                dockerHttpClient = new OkDockerHttpClient.Builder()
-                    .dockerHost(transportConfig.getDockerHost())
-                    .sslConfig(transportConfig.getSslConfig())
-                    .build();
-                break;
             case "httpclient5":
                 dockerHttpClient = new ZerodepDockerHttpClient.Builder()
                     .dockerHost(transportConfig.getDockerHost())
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 7e5bc336526..b4dab636eb9 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -2,6 +2,8 @@ description = "Testcontainers :: Azure"
 
 dependencies {
     api project(':testcontainers')
+    // TODO use JDK's HTTP client and/or Apache HttpClient5
+    shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'com.azure:azure-cosmos:4.26.0'
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 2c68f163a57..0245a5935cb 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -2,6 +2,8 @@ description = "Testcontainers :: Couchbase"
 
 dependencies {
     api project(':testcontainers')
+    // TODO use JDK's HTTP client and/or Apache HttpClient5
+    shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'com.couchbase.client:java-client:3.2.5'
     testImplementation 'org.awaitility:awaitility:4.1.1'
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index b3dfc9b3f92..49b2a9970f3 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -2,6 +2,9 @@ description = "Testcontainers :: Solr"
 
 dependencies {
     api project(':testcontainers')
+    // TODO use JDK's HTTP client and/or Apache HttpClient5
+    shaded 'com.squareup.okhttp3:okhttp:3.14.9'
+
     testImplementation 'org.apache.solr:solr-solrj:8.11.1'
 
 }

From 6414df1288b0ec9c1e707aeb34c200a191cca74e Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 28 Mar 2022 17:12:09 +0200
Subject: [PATCH 1786/4969] Update mkdocs to 1.3.0 (#5186)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8f4a1a5f100..f77d057b599 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-mkdocs==1.2.3
+mkdocs==1.3.0
 mkdocs-codeinclude-plugin==0.2.0
 mkdocs-material==8.1.3
 mkdocs-markdownextradata-plugin==0.2.5

From 02782d9cb711baebaa504bc00669acdd84e10e51 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 28 Mar 2022 11:13:47 -0400
Subject: [PATCH 1787/4969] Replace deprecated `checkAndPullImage` with
 `RemoteDockerImage` (#5148)

* Replace deprecated `checkAndPullImage` with `RemoteDockerImage`

* fix `runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally`

* Remove `LoggerFactory` usage

* avoid name substitution in `DockerComposeContainer`/`ImageFromDockerfile`

* fix `AuthenticatedImagePullTest`

* remove accidential `@Ignore`

* fix indentation

* put `clearCache` after `catch()`
---
 .../testcontainers/DockerClientFactory.java   | 22 +++++++++----------
 .../containers/DockerComposeContainer.java    |  6 ++++-
 .../images/LocalImagesCache.java              |  3 ++-
 .../images/RemoteDockerImage.java             |  9 +++++---
 .../images/builder/ImageFromDockerfile.java   |  7 +++++-
 .../utility/ImageNameSubstitutor.java         | 17 ++++++++++++++
 .../utility/RyukResourceReaper.java           |  8 +++----
 .../DockerClientFactoryTest.java              | 10 +++++++--
 .../images/LocalImagesCacheAccessor.java      |  9 ++++++++
 .../utility/AuthenticatedImagePullTest.java   |  2 ++
 .../containers/localstack/LegacyModeTest.java |  9 ++------
 11 files changed, 70 insertions(+), 32 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/images/LocalImagesCacheAccessor.java

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 9a6165ef55f..4cbe81f9e2d 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -25,10 +25,10 @@
 import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 import org.testcontainers.dockerclient.DockerMachineClientProviderStrategy;
 import org.testcontainers.dockerclient.TransportConfig;
+import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.ImageNameSubstitutor;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.ResourceReaper;
 import org.testcontainers.utility.RyukResourceReaper;
@@ -236,7 +236,6 @@ public void close() {
                     checkDiskSpace(client, ryukContainerId);
                 } else {
                     runInsideDocker(
-                        client,
                         createContainerCmd -> {
                             createContainerCmd.withName("testcontainers-checks-" + SESSION_ID);
                             createContainerCmd.getHostConfig().withAutoRemove(true);
@@ -335,9 +334,12 @@ private boolean checkMountableFile() {
     }
 
     /**
-   * Check whether the image is available locally and pull it otherwise
-   */
+     * Check whether the image is available locally and pull it otherwise
+     *
+     * @deprecated use {@link RemoteDockerImage}
+     */
     @SneakyThrows
+    @Deprecated
     public void checkAndPullImage(DockerClient client, String image) {
         try {
             client.inspectImageCmd(image).exec();
@@ -363,18 +365,14 @@ public String dockerHostIpAddress() {
     }
 
     public <T> T runInsideDocker(Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
-        // We can't use client() here because it might create an infinite loop
-        return runInsideDocker(getOrInitializeStrategy().getDockerClient(), createContainerCmdConsumer, block);
+        return runInsideDocker(TINY_IMAGE, createContainerCmdConsumer, block);
     }
 
-    private <T> T runInsideDocker(DockerClient client, Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
-
-        final String tinyImage = ImageNameSubstitutor.instance().apply(TINY_IMAGE).asCanonicalNameString();
-
-        checkAndPullImage(client, tinyImage);
+    <T> T runInsideDocker(DockerImageName imageName, Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
+        RemoteDockerImage dockerImage = new RemoteDockerImage(imageName);
         HashMap<String, String> labels = new HashMap<>(DEFAULT_LABELS);
         labels.putAll(ResourceReaper.instance().getLabels());
-        CreateContainerCmd createContainerCmd = client.createContainerCmd(tinyImage)
+        CreateContainerCmd createContainerCmd = client.createContainerCmd(dockerImage.get())
                 .withLabels(labels);
         createContainerCmdConsumer.accept(createContainerCmd);
         String id = createContainerCmd.exec().getId();
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index b8913e8ac7c..4db9361a618 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -25,12 +25,14 @@
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.dockerclient.TransportConfig;
+import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.utility.AuditLogger;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.CommandLine;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
+import org.testcontainers.utility.ImageNameSubstitutor;
 import org.testcontainers.utility.LogUtils;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.PathUtils;
@@ -186,7 +188,9 @@ private void pullImages() {
             .forEach(imageName -> {
                 try {
                     log.info("Preemptively checking local images for '{}', referenced via a compose file or transitive Dockerfile. If not available, it will be pulled.", imageName);
-                    DockerClientFactory.instance().checkAndPullImage(dockerClient, imageName);
+                    new RemoteDockerImage(DockerImageName.parse(imageName))
+                        .withImageNameSubstitutor(ImageNameSubstitutor.noop())
+                        .get();
                 } catch (Exception e) {
                     log.warn("Unable to pre-fetch an image ({}) depended upon by Docker Compose build - startup will continue but may fail. Exception message was: {}", imageName, e.getMessage());
                 }
diff --git a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
index ec371ef830e..ec38721a229 100644
--- a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
+++ b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
@@ -21,7 +21,8 @@
 enum LocalImagesCache {
     INSTANCE;
 
-    private final AtomicBoolean initialized = new AtomicBoolean(false);
+    @VisibleForTesting
+    final AtomicBoolean initialized = new AtomicBoolean(false);
 
     @VisibleForTesting
     final Map<DockerImageName, ImageData> cache = new ConcurrentHashMap<>();
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 4ce38124fe7..3bf2243549a 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -10,7 +10,7 @@
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import lombok.ToString;
-import lombok.experimental.Wither;
+import lombok.With;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ContainerFetchException;
@@ -34,9 +34,12 @@ public class RemoteDockerImage extends LazyFuture<String> {
     @ToString.Exclude
     private Future<DockerImageName> imageNameFuture;
 
-    @Wither
+    @With
     private ImagePullPolicy imagePullPolicy = PullPolicy.defaultPolicy();
 
+    @With
+    private ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
+
     @ToString.Exclude
     private DockerClient dockerClient = DockerClientFactory.lazyClient();
 
@@ -115,7 +118,7 @@ private DockerImageName getImageName() throws InterruptedException, ExecutionExc
         final DockerImageName specifiedImageName = imageNameFuture.get();
 
         // Allow the image name to be substituted
-        return ImageNameSubstitutor.instance().apply(specifiedImageName);
+        return imageNameSubstitutor.apply(specifiedImageName);
     }
 
     @ToString.Include(name = "imageName", rank = 1)
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index abf13f8ef02..281a74feaba 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -13,13 +13,16 @@
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.images.ParsedDockerfile;
+import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.images.builder.traits.BuildContextBuilderTrait;
 import org.testcontainers.images.builder.traits.ClasspathTrait;
 import org.testcontainers.images.builder.traits.DockerfileTrait;
 import org.testcontainers.images.builder.traits.FilesTrait;
 import org.testcontainers.images.builder.traits.StringsTrait;
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
+import org.testcontainers.utility.ImageNameSubstitutor;
 import org.testcontainers.utility.LazyFuture;
 import org.testcontainers.utility.ResourceReaper;
 
@@ -172,7 +175,9 @@ private void prePullDependencyImages(Set<String> imagesToPull) {
         imagesToPull.forEach(imageName -> {
             try {
                 log.info("Pre-emptively checking local images for '{}', referenced via a Dockerfile. If not available, it will be pulled.", imageName);
-                DockerClientFactory.instance().checkAndPullImage(dockerClient, imageName);
+                new RemoteDockerImage(DockerImageName.parse(imageName))
+                    .withImageNameSubstitutor(ImageNameSubstitutor.noop())
+                    .get();
             } catch (Exception e) {
                 log.warn("Unable to pre-fetch an image ({}) depended upon by Dockerfile - image build will continue but may fail. Exception message was: {}", imageName, e.getMessage());
             }
diff --git a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
index 645b717a562..a1cb2492204 100644
--- a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
@@ -53,6 +53,10 @@ public synchronized static ImageNameSubstitutor instance() {
         return instance;
     }
 
+    public static ImageNameSubstitutor noop() {
+        return new NoopImageNameSubstitutor();
+    }
+
     private static ImageNameSubstitutor wrapWithLogging(final ImageNameSubstitutor wrappedInstance) {
         return new LogWrappedImageNameSubstitutor(wrappedInstance);
     }
@@ -127,4 +131,17 @@ protected String getDescription() {
             );
         }
     }
+
+    private static class NoopImageNameSubstitutor extends ImageNameSubstitutor {
+
+        @Override
+        public DockerImageName apply(DockerImageName original) {
+            return original;
+        }
+
+        @Override
+        protected String getDescription() {
+            return "No-op substitutor";
+        }
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
index 743b33856cf..9efbf5ed972 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -17,6 +17,7 @@
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ContainerState;
+import org.testcontainers.images.RemoteDockerImage;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -85,16 +86,13 @@ private synchronized void maybeStart() {
             return;
         }
         DockerClient client = DockerClientFactory.lazyClient();
-        String ryukImage = ImageNameSubstitutor.instance()
-            .apply(DockerImageName.parse("testcontainers/ryuk:0.3.3"))
-            .asCanonicalNameString();
-        DockerClientFactory.instance().checkAndPullImage(client, ryukImage);
+        RemoteDockerImage ryukImage = new RemoteDockerImage(DockerImageName.parse("testcontainers/ryuk:0.3.3"));
 
         List<Bind> binds = new ArrayList<>();
         binds.add(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
 
         ExposedPort ryukExposedPort = ExposedPort.tcp(8080);
-        containerId = client.createContainerCmd(ryukImage)
+        containerId = client.createContainerCmd(ryukImage.get())
             .withHostConfig(
                 new HostConfig()
                     .withAutoRemove(true)
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 16d25b2f625..4dcfc26349f 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.junit.Rule;
@@ -10,6 +9,8 @@
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory.DiskSpaceUsage;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
+import org.testcontainers.images.LocalImagesCacheAccessor;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 
 /**
@@ -24,16 +25,21 @@ public class DockerClientFactoryTest {
     public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
 
         final DockerClientFactory dockFactory = DockerClientFactory.instance();
+
+        DockerImageName imageName = DockerImageName.parse("testcontainers/helloworld:1.1.0");
+
         try {
             //remove tiny image, so it will be pulled during next command run
             dockFactory.client()
-                    .removeImageCmd(TINY_IMAGE.asCanonicalNameString())
+                    .removeImageCmd(imageName.asCanonicalNameString())
                     .withForce(true).exec();
         } catch (NotFoundException ignored) {
             // Do not fail if it's not pulled yet
         }
+        LocalImagesCacheAccessor.clearCache();
 
         dockFactory.runInsideDocker(
+                imageName,
                 cmd -> cmd.withCmd("sh", "-c", "echo 'SUCCESS'"),
                 (client, id) ->
                         client.logContainerCmd(id)
diff --git a/core/src/test/java/org/testcontainers/images/LocalImagesCacheAccessor.java b/core/src/test/java/org/testcontainers/images/LocalImagesCacheAccessor.java
new file mode 100644
index 00000000000..4e7a28c535a
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/LocalImagesCacheAccessor.java
@@ -0,0 +1,9 @@
+package org.testcontainers.images;
+
+public final class LocalImagesCacheAccessor {
+
+    public static synchronized void clearCache() {
+        LocalImagesCache.INSTANCE.cache.clear();
+        LocalImagesCache.INSTANCE.initialized.set(false);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index c57c1d7c0b6..412a945b204 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -17,6 +17,7 @@
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.LocalImagesCacheAccessor;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.IOException;
@@ -93,6 +94,7 @@ public void removeImageFromLocalDocker() {
         } catch (NotFoundException ignored) {
 
         }
+        LocalImagesCacheAccessor.clearCache();
     }
 
     @AfterClass
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index b8f2ec1aae0..b34f43f79ed 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -8,6 +8,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.Arrays;
@@ -72,15 +73,9 @@ public static class On {
         @BeforeClass
         public static void createCustomTag() {
             DockerClient dockerClient = DockerClientFactory.instance().client();
-            DockerClientFactory
-                .instance()
-                .checkAndPullImage(
-                    dockerClient,
-                    LOCALSTACK_0_12_IMAGE.asCanonicalNameString()
-                );
             dockerClient
                 .tagImageCmd(
-                    LOCALSTACK_0_12_IMAGE.asCanonicalNameString(),
+                    new RemoteDockerImage(LOCALSTACK_0_12_IMAGE).get(),
                     LOCALSTACK_CUSTOM_TAG.getRepository(),
                     LOCALSTACK_CUSTOM_TAG.getVersionPart()
                 )

From 5bbffb6c9962807fc0c54180d29f2aa4d3deaa86 Mon Sep 17 00:00:00 2001
From: Yannick Weber <yannick.weber@hivemq.com>
Date: Tue, 29 Mar 2022 14:08:46 +0200
Subject: [PATCH 1788/4969] Improved jitpack dependencies page (#5189)

---
 docs/jitpack_dependencies.md | 61 ++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/docs/jitpack_dependencies.md b/docs/jitpack_dependencies.md
index 7689772de92..23a4c7353ad 100644
--- a/docs/jitpack_dependencies.md
+++ b/docs/jitpack_dependencies.md
@@ -3,22 +3,51 @@
 If you like to live on the bleeding edge, [jitpack.io](https://jitpack.io) can be used to obtain SNAPSHOT versions.
 Use the following dependency description instead:
 
-```xml
-<dependency>
-    <groupId>com.github.testcontainers.testcontainers-java</groupId>
-    <artifactId>--artifact name--</artifactId>
-    <version>-SNAPSHOT</version>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "com.github.testcontainers.testcontainers-java:--artifact name--:master-SNAPSHOT"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>com.github.testcontainers.testcontainers-java</groupId>
+        <artifactId>--artifact name--</artifactId>
+        <version>master-SNAPSHOT</version>
+    </dependency>
+    ```
 
-A specific git revision (such as `093a3a4628`) can be used as a fixed version instead. The JitPack maven repository must also be declared, e.g.:
+A specific git revision (such as `02782d9`) can be used as a fixed version instead: 
 
-```xml
-<repositories>
-    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
-    </repository>
-</repositories>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "com.github.testcontainers.testcontainers-java:--artifact name--:02782d9"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>com.github.testcontainers.testcontainers-java</groupId>
+        <artifactId>--artifact name--</artifactId>
+        <version>02782d9</version>
+    </dependency>
+    ```
 
+
+The JitPack maven repository must also be declared, e.g.:
+
+=== "Gradle"
+    ```groovy
+    repositories {
+        maven {
+            url "https://jitpack.io"
+        }
+    }
+    ```
+=== "Maven"
+    ```xml
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+    ```

From 04ecb68363596d8feb37fd2d4fcf3233031582eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gradle.com>
Date: Wed, 30 Mar 2022 19:36:41 +0200
Subject: [PATCH 1789/4969] Improve Gradle build cacheability (#5188)

* Bump up Gradle plugins version
* Allow cache relocatability for Delombok task
* Declare Delombok task inputs/outputs inside DelombokArgumentProvider
---
 build.gradle                                  | 12 +++------
 .../build/DelombokArgumentProvider.groovy     | 26 +++++++++++++++++++
 settings.gradle                               |  4 +--
 3 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/org/testcontainers/build/DelombokArgumentProvider.groovy

diff --git a/build.gradle b/build.gradle
index 8fb15a6566f..309743477c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,18 +43,14 @@ subprojects {
         version = '1.18.20'
     }
 
+
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
-        def outputDir = file("$buildDir/delombok")
-        outputs.dir(outputDir)
         outputs.cacheIf {
             true
         }
-        for (srcDir in project.sourceSets.main.java.srcDirs) {
-            // TODO: named input and relative path for `srcDir` to make task more cacheable
-            inputs.dir(srcDir)
-            // TODO: `outputDir` as relative path to make task more cacheable 
-            args(srcDir, "-d", outputDir, "-f", "generateDelombokComment:skip")
-        }
+        argumentProviders.addAll(
+            new org.testcontainers.build.DelombokArgumentProvider(srcDirs: project.sourceSets.main.java.srcDirs, outputDir: file("$buildDir/delombok"))
+        )
     }
     delombok.onlyIf {
         project.sourceSets.main.java.srcDirs.find { it.exists() }
diff --git a/buildSrc/src/main/groovy/org/testcontainers/build/DelombokArgumentProvider.groovy b/buildSrc/src/main/groovy/org/testcontainers/build/DelombokArgumentProvider.groovy
new file mode 100644
index 00000000000..2cb4931eb58
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/testcontainers/build/DelombokArgumentProvider.groovy
@@ -0,0 +1,26 @@
+package org.testcontainers.build
+
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.process.CommandLineArgumentProvider
+
+/**
+ * Allows build cache relocatability for Delombok task
+ */
+class DelombokArgumentProvider implements CommandLineArgumentProvider {
+
+    @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
+    Set<File> srcDirs
+
+    @OutputDirectory
+    File outputDir
+
+    @Override
+    Iterable<String> asArguments() {
+        return [srcDirs.collect { it.absolutePath }.join(" "), "-d", outputDir.absolutePath, "-f", "generateDelombokComment:skip"]
+    }
+
+}
diff --git a/settings.gradle b/settings.gradle
index e4c65186fb8..64f2aa5d70a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,8 +5,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.9"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.5"
     }
 }
 

From 457b583df82bc5e778b95276aaf6ad1fc0297dfe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 31 Mar 2022 11:29:13 +0200
Subject: [PATCH 1790/4969] Update Gradle Wrapper to 7.4.1 (#5168)

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 gradle/wrapper/gradle-wrapper.properties          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 1debed0d8fd..ffe61b45c92 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dcf5e2cb7b3..db3bccc1f9b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionSha256Sum=a9a7b7baba105f6557c9dcf9c3c6e8f7e57e6b49889c5f1d133f015d0727e4be
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 0408db806f6d57b8117881adcd10b6bd6c9dcd9c Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Thu, 31 Mar 2022 11:30:10 +0200
Subject: [PATCH 1791/4969] Add virtual environment to git ignore (#5156)

GitHub Codespaces auto detects Pipfile and starts installing dependencies into .venv/

Signed-off-by: Joseph Petersen <josephp90@gmail.com>
---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d6a9a697796..95fc6e52000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,4 +66,7 @@ src/pip-delete-this-directory.txt
 .DS_Store
 
 # Codespaces / VSCode
-/.vscode/
\ No newline at end of file
+/.vscode/
+
+# Python virtual environment
+/.venv/

From 9712d25aa899bc306287daffe77bdf28b64c57b4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 08:47:22 +0200
Subject: [PATCH 1792/4969] Update Gradle Wrapper to 7.4.2 (#5193)

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 gradle/wrapper/gradle-wrapper.properties          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index ffe61b45c92..5c51a4acc9d 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index db3bccc1f9b..e1e0c8dc42b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a9a7b7baba105f6557c9dcf9c3c6e8f7e57e6b49889c5f1d133f015d0727e4be
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
+distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 297621fe4ab0a775d8dc2bf4f869fbed61dac95e Mon Sep 17 00:00:00 2001
From: Yannick Weber <yannick.weber@hivemq.com>
Date: Fri, 1 Apr 2022 13:50:18 +0200
Subject: [PATCH 1793/4969] Added tmpFs usage for HiveMQ module (#5109)

Improves performance for IO heavy operations
---
 .../org/testcontainers/hivemq/HiveMQContainer.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 996caad1eb8..5bb8935c39e 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -18,6 +18,7 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -77,6 +78,16 @@ public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
                 });
             }
         });
+
+        final HashMap<String, String> tmpFs = new HashMap<>();
+        if (dockerImageName.isCompatibleWith(DEFAULT_HIVEMQ_EE_IMAGE_NAME)) {
+            tmpFs.put("/opt/hivemq/audit", "rw");
+            tmpFs.put("/opt/hivemq/backup", "rw");
+        }
+
+        tmpFs.put("/opt/hivemq/log", "rw");
+        tmpFs.put("/opt/hivemq/data", "rw");
+        withTmpFs(tmpFs);
     }
 
     @Override

From 498dac062d628a63c9755492bcdbc13afbddc040 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:38 +0000
Subject: [PATCH 1794/4969] Bump tomcat-jdbc from 10.0.16 to 10.0.20 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.16 to 10.0.20.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 bf90d9603a2..5c10742b7f7 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.16'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.20'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.28'
 }

From 913efe9e73ecf7a7a332e4f1ef33cd6214b56ced Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:39 +0000
Subject: [PATCH 1795/4969] Bump tomcat-jdbc from 10.0.16 to 10.0.20 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.16 to 10.0.20.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 71940e0026a..84b927ac4a9 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.16'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.20'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 95fec38a2cac0f4fe9e5cbdfdad6dbb46e68e6d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:41 +0000
Subject: [PATCH 1796/4969] Bump aws-java-sdk-s3 from 1.12.169 to 1.12.191 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.169 to 1.12.191.
- [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.12.169...1.12.191)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c16baad9a22..ccd322f0952 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.169'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.191'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'

From a4587abe04ce78e3f54abe28b95927d69ceb23de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:41 +0000
Subject: [PATCH 1797/4969] Bump neo4j-java-driver from 4.4.3 to 4.4.5 in
 /modules/neo4j

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.3 to 4.4.5.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.3...4.4.5)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 27bf38b9f23..6187d665098 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.3'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.5'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 9216980323e5fbc4bd81f82058025a876d4240c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:42 +0000
Subject: [PATCH 1798/4969] Bump rest-assured from 4.5.1 to 5.0.0 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 4.5.1 to 5.0.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.5.1...rest-assured-5.0.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index ce000685a10..68daf4ed26f 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:4.5.1'
+    testImplementation 'io.rest-assured:rest-assured:5.0.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 
 }

From e7afcec5a09789bade7e4a808edf6f6eaf1dbc5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:43 +0000
Subject: [PATCH 1799/4969] Bump java-client from 3.2.5 to 3.2.6 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.2.5 to 3.2.6.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.2.5...java-client-3.2.6)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 0245a5935cb..a3cb0fcbc70 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
-    testImplementation 'com.couchbase.client:java-client:3.2.5'
+    testImplementation 'com.couchbase.client:java-client:3.2.6'
     testImplementation 'org.awaitility:awaitility:4.1.1'
 }

From 3ff87f5bdeee8256195fb7b87a801a3eef7a35c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:44 +0000
Subject: [PATCH 1800/4969] Bump jedis from 4.1.1 to 4.2.1 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 4.1.1 to 4.2.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.1.1...v4.2.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index ec3d0bd134c..38a8715364a 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.1.1'
+    implementation 'redis.clients:jedis:4.2.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 32e35f07766..9583fe99147 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.1.1'
+    implementation 'redis.clients:jedis:4.2.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 2ebaba5be50..e8d470f0f23 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.1.1'
+    implementation 'redis.clients:jedis:4.2.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'

From cce236c67ff09ca88aacf4435bd740ebac4f166b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:45 +0000
Subject: [PATCH 1801/4969] Bump mockito-core from 4.3.1 to 4.4.0 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.4.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 749bf72690d..89882481dc1 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.1.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.3.1') {
+    testImplementation ('org.mockito:mockito-core:4.4.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.22.0'

From 156971e69538d73d6a3d4ec1c0bd992b636ee3ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:46 +0000
Subject: [PATCH 1802/4969] Bump transport from 7.17.1 to 7.17.2 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.1 to 7.17.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.1...v7.17.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index d669f0fbd05..a8d718af3c4 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.17.1"
+    testImplementation "org.elasticsearch.client:transport:7.17.2"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 03fa998e2ea9cfabe5d9921f76c96dc82c0be2e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:47 +0000
Subject: [PATCH 1803/4969] Bump logback-classic from 1.2.10 to 1.2.11 in
 /examples

Bumps logback-classic from 1.2.10 to 1.2.11.

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 1639a091e91..2352eace899 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 2e37410bcea..7ba974d3a6d 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.1.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 1cb3a0285f2..c61ce36e473 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20211205'
     testImplementation 'org.postgresql:postgresql:42.3.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
 }
 
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index ec3d0bd134c..bc1d30d9599 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 32e35f07766..f2d5830404d 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 2ebaba5be50..2879ddb4fdd 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From cb58298c4ef96968ce6e0f654d9f87d2a7b56126 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:47 +0000
Subject: [PATCH 1804/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.6.10 to 1.6.20.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 45cee0ec20b..1d98c3e3eff 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.6.4"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.6.10"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.6.20"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 58f70290f0a77c11fa3538cab671dd94b149afdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:48 +0000
Subject: [PATCH 1805/4969] Bump awaitility from 4.1.1 to 4.2.0 in /core

Bumps [awaitility](https://github.com/awaitility/awaitility) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/awaitility/awaitility/releases)
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.1.1...awaitility-4.2.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 558584a0d7c..c17169977cc 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -71,7 +71,7 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    shaded 'org.awaitility:awaitility:4.1.1'
+    shaded 'org.awaitility:awaitility:4.2.0'
 
     api platform('com.github.docker-java:docker-java-bom:3.2.13')
     shaded platform('com.github.docker-java:docker-java-bom:3.2.13')

From 02dec3edf4408a43e5060ce0a639f5ab0043dc54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:51 +0000
Subject: [PATCH 1806/4969] Bump s3 from 2.17.108 to 2.17.162 in
 /modules/localstack

Bumps s3 from 2.17.108 to 2.17.162.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c16baad9a22..401230dbb61 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
-    testImplementation 'software.amazon.awssdk:s3:2.17.108'
+    testImplementation 'software.amazon.awssdk:s3:2.17.162'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 285ce0efe024f2c33d62069d2e89eeb277b7a272 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:00:52 +0000
Subject: [PATCH 1807/4969] Bump neo4j-java-driver from 4.4.3 to 4.4.5 in
 /examples

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.3 to 4.4.5.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.3...4.4.5)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 718adc3183a..652937d8b33 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.3'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.5'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
 }

From 16fb27f651a7d1cd66881238cfa99e2433e483eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:01:23 +0000
Subject: [PATCH 1808/4969] Bump actions/cache from 2.1.7 to 3.0.1

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.7 to 3.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2.1.7...v3.0.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 3fb2467a295..7b9a9e5c3a1 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -22,7 +22,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.1
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -50,7 +50,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.1
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db7232fffa8..4fad892230d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.1
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -56,7 +56,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.1
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From 6f2eb5c6105d2cf5fb9b0e927223f594fdcf9ab8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:01:29 +0000
Subject: [PATCH 1809/4969] Bump peter-evans/create-pull-request from 3.12.1 to
 4.0.1

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.12.1 to 4.0.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/f22a7da129c901513876a2380e2dae9f8e145330...f1a7646cead32c950d90344a4fb5d4e926972a8f)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 2c7626c7ec7..ceb2385e986 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@f22a7da129c901513876a2380e2dae9f8e145330 # v3.10.1
+        uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From a4695120eb1c3f49a030f686e5747c7506251e69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:04:58 +0000
Subject: [PATCH 1810/4969] Bump r2dbc-postgresql in /modules/r2dbc

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.11.RELEASE to 0.8.12.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.12.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.11.RELEASE...v0.8.12.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 2fa066c21b3..ee5f5844e56 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.4.15'

From b00d7c2ced538f9b1ff004a4f67e6a01ac25a32d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:04:59 +0000
Subject: [PATCH 1811/4969] Bump trino-jdbc from 369 to 375 in /modules/trino

Bumps trino-jdbc from 369 to 375.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 9bf0e24f06b..f99951dc7fa 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:369'
+    testImplementation 'io.trino:trino-jdbc:375'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 0bc42f61c149e5d79cdbccec95ad19638cc056d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:04:59 +0000
Subject: [PATCH 1812/4969] Bump okhttp from 3.14.9 to 4.9.3 in /modules/solr

Bumps [okhttp](https://github.com/square/okhttp) from 3.14.9 to 4.9.3.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.9...parent-4.9.3)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 49b2a9970f3..5a6326f3844 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:3.14.9'
+    shaded 'com.squareup.okhttp3:okhttp:4.9.3'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.1'
 

From 1cdac6a748e3a80802d3c0432efc512c45491b77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:05:00 +0000
Subject: [PATCH 1813/4969] Bump client-java from 14.0.0 to 15.0.0 in
 /modules/k3s

Bumps [client-java](https://github.com/kubernetes-client/java) from 14.0.0 to 15.0.0.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/client-java-parent-14.0.0...v15.0.0)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 075078f36d9..a373d8115d7 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:5.12.1'
-    testImplementation 'io.kubernetes:client-java:14.0.0'
+    testImplementation 'io.kubernetes:client-java:15.0.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 5a3881995369330b216773af9fcc1ebf9d98e9ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:05:01 +0000
Subject: [PATCH 1814/4969] Bump google-cloud-bigtable from 2.5.2 to 2.6.1 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.5.2 to 2.6.1.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.5.2...v2.6.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index e0b232ac949..93111ef3f16 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.14'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.2'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.1'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 0cc5b67ef8ce32ec0978eaffbf94628824fd7476 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:05:01 +0000
Subject: [PATCH 1815/4969] Bump mongodb-driver-sync from 4.5.0 to 4.5.1 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.5.0...r4.5.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 73dba45dbbf..6bca2cb892b 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.5.0")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.5.1")
 }

From b9adf8717210a5bc42e850f03722970fbe692409 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:05:02 +0000
Subject: [PATCH 1816/4969] Bump reactor-core from 3.4.15 to 3.4.16 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.15 to 3.4.16.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.15...v3.4.16)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 2fa066c21b3..56e910910d1 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.15'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.16'
     testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
 }

From 8973288c81fb249f80c308e1ec6fbe466b52d237 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:05:12 +0000
Subject: [PATCH 1817/4969] Bump google-cloud-firestore from 3.0.14 to 3.0.21
 in /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.0.14 to 3.0.21.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.0.14...v3.0.21)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index e0b232ac949..cdc07d77c37 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.2'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.14'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.2'

From fe7782c028875eb166982387a2011520aae5ebf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:05:33 +0000
Subject: [PATCH 1818/4969] Bump hivemq-extension-sdk from 4.7.4 to 4.7.5 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.7.4 to 4.7.5.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.7.4...4.7.5)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index f0c3aaa2e69..17be5658992 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.7.4")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.7.5")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.10")

From 64f96781c518b75fddc98bbad05b234faec7169f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:05:35 +0000
Subject: [PATCH 1819/4969] Bump zip4j from 2.9.1 to 2.10.0 in /modules/hivemq

Bumps [zip4j](https://github.com/srikanth-lingala/zip4j) from 2.9.1 to 2.10.0.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases)
- [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.9.1...v2.10.0)

---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index f0c3aaa2e69..79c59bba0d2 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     shaded("org.javassist:javassist:3.28.0-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
-    shaded("net.lingala.zip4j:zip4j:2.9.1")
+    shaded("net.lingala.zip4j:zip4j:2.10.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testImplementation(project(":junit-jupiter"))

From 06fc95f5233b0c11d2ba319b4b02587db0b5028b Mon Sep 17 00:00:00 2001
From: Falko Modler <famod@users.noreply.github.com>
Date: Wed, 6 Apr 2022 17:01:03 +0200
Subject: [PATCH 1820/4969] Fix ScriptUtils.runInitScript() in hierarchical
 classloader setup by using TCCL (#5167)

---
 .../main/java/org/testcontainers/ext/ScriptUtils.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index 76f0cb90ea0..1b94b84f368 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -293,10 +293,13 @@ public static boolean containsSqlScriptDelimiters(String script, String delim) {
 	 */
 	public static void runInitScript(DatabaseDelegate databaseDelegate, String initScriptPath) {
 		try {
-			URL resource = ScriptUtils.class.getClassLoader().getResource(initScriptPath);
+			URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
 			if (resource == null) {
-				LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
-				throw new ScriptLoadException("Could not load classpath init script: " + initScriptPath + ". Resource not found.");
+				resource = ScriptUtils.class.getClassLoader().getResource(initScriptPath);
+				if (resource == null) {
+					LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
+					throw new ScriptLoadException("Could not load classpath init script: " + initScriptPath + ". Resource not found.");
+				}
 			}
 			String scripts = IOUtils.toString(resource, StandardCharsets.UTF_8);
 			executeDatabaseScript(databaseDelegate, initScriptPath, scripts);

From 734678f4be9e9a439b4391265d5f369ed1bab4b5 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 7 Apr 2022 09:29:04 +0200
Subject: [PATCH 1821/4969] Deperecate `getContainerIpAddress` (#5247)

---
 .../main/java/org/testcontainers/containers/ContainerState.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index e5903b0b806..ef2c19a06c9 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -47,6 +47,7 @@ public interface ContainerState {
      * @deprecated use {@link #getHost()}
      * @see #getHost()
      */
+    @Deprecated
     default String getContainerIpAddress() {
         return getHost();
     }

From 53e80aa4115b60eee11823b5aa7d3616065a9421 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <mdedetrich@gmail.com>
Date: Thu, 7 Apr 2022 18:03:27 +0200
Subject: [PATCH 1822/4969] Fix incorrect path for RABBITMQ_CONFIG_FILE (#5184)

Co-authored-by: Kevin Wittek <kevin@wittek.dev>
---
 .../containers/RabbitMQContainer.java         |  2 +-
 .../containers/RabbitMQContainerTest.java     | 24 +++++++------------
 .../src/test/resources/logback-test.xml       | 16 +++++++++++++
 .../src/test/resources/rabbitmq-custom.conf   |  3 +--
 .../src/test/resources/rabbitmq-custom.config | 18 ++++++--------
 5 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 modules/rabbitmq/src/test/resources/logback-test.xml

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index edbffcf3174..37dc2fbe7ca 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -396,7 +396,7 @@ public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
      * @return This container.
      */
     public RabbitMQContainer withRabbitMQConfigSysctl(MountableFile rabbitMQConf) {
-        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom");
+        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.conf");
         return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.conf");
     }
 
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 8be97deb710..474d613cb8b 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -14,6 +14,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -21,6 +22,8 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Collections;
+import java.util.Objects;
+import java.util.Scanner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
@@ -115,43 +118,34 @@ public void shouldCreateRabbitMQContainerWithQueues() throws IOException, Interr
     }
 
     @Test
-    public void shouldMountConfigurationFile()
-    {
+    public void shouldMountConfigurationFile() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
             container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
 
-            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
-            assertThat(container.getLogs()).doesNotContain(" (not found)");
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
         }
     }
 
 
     @Test
-    public void shouldMountConfigurationFileErlang()
-    {
+    public void shouldMountConfigurationFileErlang() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
             container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
             container.start();
 
-            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.config");
-            assertThat(container.getLogs()).doesNotContain(" (not found)");
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
         }
     }
 
 
     @Test
-    public void shouldMountConfigurationFileSysctl()
-    {
+    public void shouldMountConfigurationFileSysctl() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
             container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
 
-            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
-            assertThat(container.getLogs()).doesNotContain(" (not found)");
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
         }
     }
 
diff --git a/modules/rabbitmq/src/test/resources/logback-test.xml b/modules/rabbitmq/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
index 293829a353b..a2994c78602 100644
--- a/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
+++ b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
@@ -1,2 +1 @@
-loopback_users.guest = false
-listeners.tcp.default = 5555
+log.console.level = debug
diff --git a/modules/rabbitmq/src/test/resources/rabbitmq-custom.config b/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
index a1c581542ce..353a854fc42 100644
--- a/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
+++ b/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
@@ -1,13 +1,9 @@
 [
-{ rabbit, [
-{ loopback_users, [ ] },
-		{ tcp_listeners, [ 5555 ] },
-		{ ssl_listeners, [ ] },
-		{ default_vhost, <<"vhost">> },
-		{ hipe_compile, false }
-	] },
-	{ rabbitmq_management, [ { listener, [
-		{ port, 15672 },
-		{ ssl, false }
-	] } ] }
+{rabbit,
+    [
+        {log,
+            [{console, [{level, debug}]}]
+        }
+    ]
+}
 ].

From c7449edda49ff780921067c4a03014ce68b2aa41 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Fri, 8 Apr 2022 09:16:53 +0200
Subject: [PATCH 1823/4969] Elasticsearch: Ensure Elasticsearch 8 works OOTB
 secure as default (#5099)

Since Elasticsearch 8.0 the default is to enable security, meaning TLS
and authentication.

This adds a check for Elasticsearch 8.0 to change the default behaviour
to properly support this change, but you can still run Elasticsearch
with security features disabled, if you want.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../elasticsearch/ElasticsearchContainer.java | 96 +++++++++++++++----
 .../ElasticsearchContainerTest.java           | 38 ++++++--
 2 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index acbca15aaf5..84881b2e87d 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -1,21 +1,33 @@
 package org.testcontainers.elasticsearch;
 
-import static java.net.HttpURLConnection.HTTP_OK;
-import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
-
-import java.net.InetSocketAddress;
-import java.time.Duration;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.apache.commons.io.IOUtils;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.ByteArrayInputStream;
+import java.net.InetSocketAddress;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.util.Optional;
+
 /**
  * Represents an elasticsearch docker instance which exposes by default port 9200 and 9300 (transport.tcp.port)
  * The docker image is by default fetched from docker.elastic.co/elasticsearch/elasticsearch
  */
 public class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
 
+    /**
+     * Elasticsearch Default Password for Elasticsearch &gt;= 8
+     */
+    public static final String ELASTICSEARCH_DEFAULT_PASSWORD = "changeme";
+
     /**
      * Elasticsearch Default HTTP port
      */
@@ -39,7 +51,10 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
      */
     @Deprecated
     protected static final String DEFAULT_TAG = "7.9.2";
-    private boolean isOss = false;
+
+    private final boolean isOss;
+    private final boolean isAtLeastMajorVersion8;
+    private Optional<byte[]> caCertAsBytes = Optional.empty();
 
     /**
      * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
@@ -65,23 +80,67 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME);
-
-        if (dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME)) {
-            this.isOss = true;
-        }
+        this.isOss = dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME);
 
         logger().info("Starting an elasticsearch container using [{}]", dockerImageName);
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
         withEnv("discovery.type", "single-node");
         addExposedPorts(ELASTICSEARCH_DEFAULT_PORT, ELASTICSEARCH_DEFAULT_TCP_PORT);
-        setWaitStrategy(new HttpWaitStrategy()
-            .forPort(ELASTICSEARCH_DEFAULT_PORT)
-            .forStatusCodeMatching(response -> response == HTTP_OK || response == HTTP_UNAUTHORIZED)
-            .withStartupTimeout(Duration.ofMinutes(2)));
+        this.isAtLeastMajorVersion8 = new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("8.0.0");
+        // regex that
+        //   matches 8.0 JSON logging with no whitespace between message field and content
+        //   matches 7.x JSON logging with whitespace between message field and content
+        //   matches 6.x text logging with node name in brackets and just a 'started' message till the end of the line
+        String regex = ".*(\"message\":\\s?\"started\".*|] started\n$)";
+        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(regex));
+        if (isAtLeastMajorVersion8) {
+            withPassword(ELASTICSEARCH_DEFAULT_PASSWORD);
+        }
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        if (isAtLeastMajorVersion8) {
+            byte[] bytes = copyFileFromContainer("/usr/share/elasticsearch/config/certs/http_ca.crt", IOUtils::toByteArray);
+            if (bytes.length > 0) {
+                this.caCertAsBytes = Optional.of(bytes);
+            }
+        }
+    }
+
+    /**
+     * If this is running above Elasticsearch 8, this will return the probably self-signed CA cert that has been extracted
+     *
+     * @return byte array optional containing the CA cert extracted from the docker container
+     */
+    public Optional<byte[]> caCertAsBytes() {
+        return caCertAsBytes;
     }
 
     /**
-     * Define the Elasticsearch password to set. It enables security behind the scene.
+     * A SSL context based on the self signed CA, so that using this SSL Context allows to connect to the Elasticsearch service
+     * @return a customized SSL Context
+     */
+    public SSLContext createSslContextFromCa() {
+        try {
+            CertificateFactory factory = CertificateFactory.getInstance("X.509");
+            Certificate trustedCa = factory.generateCertificate(new ByteArrayInputStream(caCertAsBytes.get()));
+            KeyStore trustStore = KeyStore.getInstance("pkcs12");
+            trustStore.load(null, null);
+            trustStore.setCertificateEntry("ca", trustedCa);
+
+            final SSLContext sslContext = SSLContext.getInstance("TLSv1.3");
+            TrustManagerFactory tmfactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmfactory.init(trustStore);
+            sslContext.init(null, tmfactory.getTrustManagers(), null);
+            return sslContext;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Define the Elasticsearch password to set. It enables security behind the scene for major version below 8.0.0.
      * It's not possible to use security with the oss image.
      * @param password  Password to set
      * @return this
@@ -92,7 +151,10 @@ public ElasticsearchContainer withPassword(String password) {
                 "Please switch to the default distribution");
         }
         withEnv("ELASTIC_PASSWORD", password);
-        withEnv("xpack.security.enabled", "true");
+        if (!isAtLeastMajorVersion8) {
+            // major version 8 is secure by default and does not need this to enable authentication
+            withEnv("xpack.security.enabled", "true");
+        }
         return this;
     }
 
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 859587645d7..956c794135b 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -1,11 +1,5 @@
 package org.testcontainers.elasticsearch;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-
-import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -25,6 +19,13 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+
 public class ElasticsearchContainerTest {
 
     /**
@@ -249,6 +250,31 @@ public void incompatibleSettingsTest() {
         );
     }
 
+    @Test
+    public void testElasticsearch8SecureByDefault() throws Exception {
+        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.0.0")) {
+            // Start the container. This step might take some time...
+            container.start();
+
+            // Create the secured client.
+            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD));
+
+            client = RestClient.builder(HttpHost.create("https://" + container.getHttpHostAddress()))
+                .setHttpClientConfigCallback(httpClientBuilder -> {
+                    httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    httpClientBuilder.setSSLContext(container.createSslContextFromCa());
+                    return httpClientBuilder;
+                })
+                .build();
+
+            Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+        }
+    }
+
     private RestClient getClient(ElasticsearchContainer container) {
         if (client == null) {
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();

From d93dceae969b63645b07881e80a61c57e3ca564b Mon Sep 17 00:00:00 2001
From: Thomas Darimont <thomas.darimont@googlemail.com>
Date: Fri, 8 Apr 2022 16:02:00 +0200
Subject: [PATCH 1824/4969] Allow to create a file in container from a
 Transferable (#3814) (#3815)

Co-authored-by: Alex Stockinger <alex@atomicjar.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Kevin Wittek <kevin@wittek.dev>
---
 core/build.gradle                             |  2 +
 .../testcontainers/containers/Container.java  | 15 +++-
 .../containers/GenericContainer.java          | 53 ++++++-----
 .../images/builder/Transferable.java          | 15 ++++
 .../testcontainers/utility/MountableFile.java | 26 ++++++
 .../containers/GenericContainerTest.java      | 36 ++++++++
 .../containers/ReusabilityUnitTests.java      | 87 +++++++++++++++----
 7 files changed, 193 insertions(+), 41 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index c17169977cc..3f1ad71731d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -45,6 +45,8 @@ tasks.japicmp {
         "org.testcontainers.utility.ResourceReaper#start(com.github.dockerjava.api.DockerClient)",
         "org.testcontainers.utility.ResourceReaper#registerNetworkForCleanup(java.lang.String)",
         "org.testcontainers.utility.ResourceReaper#removeNetworks(java.lang.String)",
+        "org.testcontainers.images.builder.Transferable#of(java.lang.String)",
+        "org.testcontainers.images.builder.Transferable#updateChecksum(java.util.zip.Checksum)"
     ]
 
     fieldExcludes = []
diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index d9291fc9fc8..8fd53fc5a0e 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -12,6 +12,7 @@
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.LogUtils;
 import org.testcontainers.utility.MountableFile;
 
@@ -169,11 +170,23 @@ default SELF withFileSystemBind(String hostPath, String containerPath) {
      * Set the file to be copied before starting a created container
      *
      * @param mountableFile a Mountable file with path of source file / folder on host machine
-     * @param containerPath a destination path on conatiner to which the files / folders to be copied
+     * @param containerPath a destination path on container to which the files / folders to be copied
      * @return this
+     *
+     * @deprecated Use {@link #withCopyToContainer(Transferable, String)} instead
      */
+    @Deprecated
     SELF withCopyFileToContainer(MountableFile mountableFile, String containerPath);
 
+    /**
+     * Set the content to be copied before starting a created container
+     *
+     * @param transferable a Transferable
+     * @param containerPath a destination path on container to which the files / folders to be copied
+     * @return this
+     */
+    SELF withCopyToContainer(Transferable transferable, String containerPath);
+
     /**
      * Add an environment variable to be passed to the container.
      *
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 70e080711a7..d47bc6cfc5e 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -23,6 +23,7 @@
 import com.google.common.hash.Hashing;
 import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.SneakyThrows;
@@ -49,6 +50,7 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
 import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.images.RemoteDockerImage;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.lifecycle.Startables;
 import org.testcontainers.lifecycle.TestDescription;
@@ -186,8 +188,15 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     private Long shmSize;
 
     // Maintain order in which entries are added, as earlier target location may be a prefix of a later location.
+    @Deprecated
     private Map<MountableFile, String> copyToFileContainerPathMap = new LinkedHashMap<>();
 
+    // Maintain order in which entries are added, as earlier target location may be a prefix of a later location.
+    @Setter(AccessLevel.NONE)
+    @Getter(AccessLevel.MODULE)
+    @VisibleForTesting
+    private Map<Transferable, String> copyToTransferableContainerPathMap = new LinkedHashMap<>();
+
     protected final Set<Startable> dependencies = new HashSet<>();
 
     /**
@@ -415,6 +424,8 @@ private void tryStart(Instant startedAt) {
 
                 // TODO use single "copy" invocation (and calculate an hash of the resulting tar archive)
                 copyToFileContainerPathMap.forEach(this::copyFileToContainer);
+
+                copyToTransferableContainerPathMap.forEach(this::copyFileToContainer);
             }
 
             connectToPortForwardingNetwork(createCommand.getNetworkMode());
@@ -530,33 +541,18 @@ private void tryStart(Instant startedAt) {
     @VisibleForTesting
     Checksum hashCopiedFiles() {
         Checksum checksum = new Adler32();
-        copyToFileContainerPathMap.entrySet().stream().sorted(Entry.comparingByValue()).forEach(entry -> {
-            byte[] pathBytes = entry.getValue().getBytes();
-            // Add path to the hash
-            checksum.update(pathBytes, 0, pathBytes.length);
-
-            File file = new File(entry.getKey().getResolvedPath());
-            checksumFile(file, checksum);
-        });
+        Stream.of(copyToFileContainerPathMap, copyToTransferableContainerPathMap)
+            .flatMap(it -> it.entrySet().stream())
+            .sorted(Entry.comparingByValue()).forEach(entry -> {
+                byte[] pathBytes = entry.getValue().getBytes();
+                // Add path to the hash
+                checksum.update(pathBytes, 0, pathBytes.length);
+
+                entry.getKey().updateChecksum(checksum);
+            });
         return checksum;
     }
 
-    @VisibleForTesting
-    @SneakyThrows(IOException.class)
-    void checksumFile(File file, Checksum checksum) {
-        Path path = file.toPath();
-        checksum.update(MountableFile.getUnixFileMode(path));
-        if (file.isDirectory()) {
-            try (Stream<Path> stream = Files.walk(path)) {
-                stream.filter(it -> it != path).forEach(it -> {
-                    checksumFile(it.toFile(), checksum);
-                });
-            }
-        } else {
-            FileUtils.checksum(file, checksum);
-        }
-    }
-
     @UnstableAPI
     @SneakyThrows(JsonProcessingException.class)
     final String hash(CreateContainerCmd createCommand) {
@@ -1296,6 +1292,15 @@ public SELF withCopyFileToContainer(MountableFile mountableFile, String containe
         return self();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public SELF withCopyToContainer(Transferable transferable, String containerPath) {
+        copyToTransferableContainerPathMap.put(transferable, containerPath);
+        return self();
+    }
+
     /**
      * Get the IP address that this container may be reached on (may not be the local machine).
      *
diff --git a/core/src/main/java/org/testcontainers/images/builder/Transferable.java b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
index 3f068f98a18..8ec26c8c3da 100644
--- a/core/src/main/java/org/testcontainers/images/builder/Transferable.java
+++ b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
@@ -5,12 +5,18 @@
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.Checksum;
 
 public interface Transferable {
 
     int DEFAULT_FILE_MODE = 0100644;
     int DEFAULT_DIR_MODE = 040755;
 
+    static Transferable of(String string) {
+        return of(string.getBytes(StandardCharsets.UTF_8));
+    }
+
     static Transferable of(byte[] bytes) {
         return of(bytes, DEFAULT_FILE_MODE);
     }
@@ -27,6 +33,11 @@ public byte[] getBytes() {
                 return bytes;
             }
 
+            @Override
+            public void updateChecksum(Checksum checksum) {
+                checksum.update(bytes, 0, bytes.length);
+            }
+
             @Override
             public int getFileMode() {
                 return fileMode;
@@ -78,4 +89,8 @@ default byte[] getBytes() {
     default String getDescription() {
         return "";
     }
+
+    default void updateChecksum(Checksum checksum) {
+        throw new UnsupportedOperationException("Provide implementation in subclass");
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 19dca4c134c..81cc37adeab 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -1,12 +1,15 @@
 package org.testcontainers.utility;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarConstants;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.DockerClientFactory;
@@ -28,6 +31,8 @@
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.stream.Stream;
+import java.util.zip.Checksum;
 
 import static lombok.AccessLevel.PACKAGE;
 import static org.testcontainers.utility.PathUtils.recursiveDeleteDir;
@@ -361,6 +366,27 @@ public String getDescription() {
         return this.getResolvedPath();
     }
 
+    @Override
+    public void updateChecksum(Checksum checksum) {
+        File file = new File(getResolvedPath());
+        checksumFile(file, checksum);
+    }
+
+    @SneakyThrows(IOException.class)
+    private void checksumFile(File file, Checksum checksum) {
+        Path path = file.toPath();
+        checksum.update(MountableFile.getUnixFileMode(path));
+        if (file.isDirectory()) {
+            try (Stream<Path> stream = Files.walk(path)) {
+                stream.filter(it -> it != path).forEach(it -> {
+                    checksumFile(it.toFile(), checksum);
+                });
+            }
+        } else {
+            FileUtils.checksum(file, checksum);
+        }
+    }
+
     @Override
     public int getFileMode() {
         return getUnixFileMode(this.getResolvedPath());
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 93a9cd96479..0c30d522cd9 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -20,7 +20,11 @@
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.images.builder.Transferable;
+
+import java.nio.charset.StandardCharsets;
 import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.utility.MountableFile;
 
 import java.util.Arrays;
 import java.util.List;
@@ -75,6 +79,38 @@ public void shouldReportErrorAfterWait() {
         }
     }
 
+    @Test
+    public void shouldCopyTransferableAsFile() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
+                .withStartupCheckStrategy(new NoopStartupCheckStrategy())
+                .withCopyToContainer(Transferable.of("test"), "/tmp/test")
+                .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
+                .withCommand("sh", "-c", "grep -q test /tmp/test && exit 100")
+        ) {
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Container exited with code 100");
+        }
+    }
+
+    @Test
+    public void shouldCopyTransferableAfterMountableFile() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
+                .withStartupCheckStrategy(new NoopStartupCheckStrategy())
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("test_copy_to_container.txt"),
+                    "/tmp/test"
+                )
+                .withCopyToContainer(Transferable.of("test"), "/tmp/test")
+                .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
+                .withCommand("sh", "-c", "grep -q test /tmp/test && exit 100")
+        ) {
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Container exited with code 100");
+        }
+    }
+
     @Test
     public void shouldOnlyPublishExposedPorts() {
         ImageFromDockerfile image = new ImageFromDockerfile("publish-multiple")
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 0540fcdba9d..9aad97d7e7b 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -10,7 +10,6 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.NetworkSettings;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
@@ -24,13 +23,13 @@
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.Parameterized;
 import org.mockito.Answers;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.TestcontainersConfiguration;
@@ -39,12 +38,14 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -297,11 +298,65 @@ public void shouldHashCopiedFiles() {
         }
     }
 
-    @RunWith(BlockJUnit4ClassRunner.class)
+    @RunWith(Parameterized.class)
     @FieldDefaults(makeFinal = true)
     public static class CopyFilesHashTest {
+        private final TestStrategy strategy;
+
+        interface TestStrategy {
+            void withCopyFileToContainer(MountableFile mountableFile, String path);
+
+            void clear();
+        }
+
+        private static class MountableFileTestStrategy implements TestStrategy {
+            private final GenericContainer<?> container;
+
+            private MountableFileTestStrategy(GenericContainer<?> container) {
+                this.container = container;
+            }
+
+            @Override
+            public void withCopyFileToContainer(MountableFile mountableFile, String path) {
+                container.withCopyFileToContainer(mountableFile, path);
+            }
+
+            @Override
+            public void clear() {
+                container.getCopyToFileContainerPathMap().clear();
+            }
+        }
+
+        private static class TransferableTestStrategy implements TestStrategy {
+            private final GenericContainer<?> container;
+
+            private TransferableTestStrategy(GenericContainer<?> container) {
+                this.container = container;
+            }
+
+            @Override
+            public void withCopyFileToContainer(MountableFile mountableFile, String path) {
+                container.withCopyToContainer(mountableFile, path);
+            }
+
+            @Override
+            public void clear() {
+                container.getCopyToTransferableContainerPathMap().clear();
+            }
+        }
+
+        @Parameterized.Parameters
+        public static List<Function<GenericContainer<?>, TestStrategy>> strategies() {
+            return Arrays.asList(MountableFileTestStrategy::new, TransferableTestStrategy::new);
+        }
+
+
         GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE);
 
+        public CopyFilesHashTest(Function<GenericContainer<?>, TestStrategy> strategyFactory) {
+            this.strategy = strategyFactory.apply(container);
+        }
+
         @Test
         public void empty() {
             assertThat(container.hashCopiedFiles()).isNotNull();
@@ -311,7 +366,7 @@ public void empty() {
         public void oneFile() {
             long emptyHash = container.hashCopiedFiles().getValue();
 
-            container.withCopyFileToContainer(
+            strategy.withCopyFileToContainer(
                 MountableFile.forClasspathResource("test_copy_to_container.txt"),
                 "/foo/bar"
             );
@@ -322,13 +377,13 @@ public void oneFile() {
         @Test
         public void differentPath() {
             MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
-            container.withCopyFileToContainer(mountableFile, "/foo/bar");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/bar");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
-            container.getCopyToFileContainerPathMap().clear();
+            strategy.clear();
 
-            container.withCopyFileToContainer(mountableFile, "/foo/baz");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/baz");
 
             assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(hash1);
         }
@@ -337,7 +392,7 @@ public void differentPath() {
         public void detectsChangesInFile() throws Exception {
             Path path = File.createTempFile("reusable_test", ".txt").toPath();
             MountableFile mountableFile = MountableFile.forHostPath(path);
-            container.withCopyFileToContainer(mountableFile, "/foo/bar");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/bar");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
@@ -348,13 +403,13 @@ public void detectsChangesInFile() throws Exception {
 
         @Test
         public void multipleFiles() {
-            container.withCopyFileToContainer(
+            strategy.withCopyFileToContainer(
                 MountableFile.forClasspathResource("test_copy_to_container.txt"),
                 "/foo/bar"
             );
             long hash1 = container.hashCopiedFiles().getValue();
 
-            container.withCopyFileToContainer(
+            strategy.withCopyFileToContainer(
                 MountableFile.forClasspathResource("mappable-resource/test-resource.txt"),
                 "/foo/baz"
             );
@@ -368,7 +423,7 @@ public void folder() throws Exception {
 
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
-            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/bar/");
 
             assertThat(container.hashCopiedFiles().getValue()).isNotEqualTo(emptyHash);
         }
@@ -378,7 +433,7 @@ public void changesInFolder() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
             assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
-            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/bar/");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
@@ -397,11 +452,11 @@ public void folderAndFile() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
             assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
-            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/bar/");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
-            container.withCopyFileToContainer(
+            strategy.withCopyFileToContainer(
                 MountableFile.forClasspathResource("test_copy_to_container.txt"),
                 "/foo/baz"
             );
@@ -414,7 +469,7 @@ public void filePermissions() throws Exception {
             Path path = File.createTempFile("reusable_test", ".txt").toPath();
             path.toFile().setExecutable(false);
             MountableFile mountableFile = MountableFile.forHostPath(path);
-            container.withCopyFileToContainer(mountableFile, "/foo/bar");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/bar");
 
             long hash1 = container.hashCopiedFiles().getValue();
 
@@ -432,7 +487,7 @@ public void folderPermissions() throws Exception {
             Path subDir = Files.createDirectory(tempDirectory.resolve("sub"));
             subDir.toFile().setWritable(false);
             assumeThat(subDir.toFile().canWrite()).isFalse();
-            container.withCopyFileToContainer(mountableFile, "/foo/bar/");
+            strategy.withCopyFileToContainer(mountableFile, "/foo/bar/");
 
             long hash1 = container.hashCopiedFiles().getValue();
 

From 17407eff6ef3343ee0c2d52e9306d40708909c43 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:45:17 +0200
Subject: [PATCH 1825/4969] Increase default client ping timeout from 5 to 10
 seconds (#5254)

---
 .../org/testcontainers/utility/TestcontainersConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index c6ce7496dd9..c9dfd543ad6 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -198,7 +198,7 @@ public String getImageSubstitutorClassName() {
     }
 
     public Integer getClientPingTimeout() {
-        return Integer.parseInt(getEnvVarOrProperty("client.ping.timeout", "5"));
+        return Integer.parseInt(getEnvVarOrProperty("client.ping.timeout", "10"));
     }
 
     @Nullable

From af835694bb617fb1ef8d5eb1aa438ced68bcab7b Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 12 Apr 2022 19:27:32 +0200
Subject: [PATCH 1826/4969] Update images and theme for testcontainers.org
 (#5258)

---
 docs/css/extra.css |  14 +++----
 docs/favicon.ico   | Bin 15086 -> 15406 bytes
 docs/logo.png      | Bin 51964 -> 84934 bytes
 docs/logo.svg      |  99 +++++++++++++++++++++++++++++++++++++++++----
 mkdocs.yml         |   7 ++--
 5 files changed, 102 insertions(+), 18 deletions(-)

diff --git a/docs/css/extra.css b/docs/css/extra.css
index d7e7e6b68a3..4c11e3df748 100644
--- a/docs/css/extra.css
+++ b/docs/css/extra.css
@@ -1,10 +1,10 @@
-@import url('https://fonts.googleapis.com/css?family=Inconsolata|Lato|Merriweather+Sans|Open+Sans|Source+Sans+Pro');
-body {
-    font-family: 'Lato', sans-serif;
+@import url('https://fonts.googleapis.com/css?family=Rubik');
+h1, h2, h3, h4, h5, h6 {
+    font-family: 'Rubik', sans-serif;
 
 }
 
-.md-typeset pre {
-    font-family: 'Inconsolata', monospace;
-    font-size: 100%;
-}
\ No newline at end of file
+[data-md-color-scheme="testcontainers"] {
+    --md-primary-fg-color:        #291A3F;
+    --md-accent-fg-color:        #291A3F;
+}
diff --git a/docs/favicon.ico b/docs/favicon.ico
index 004282385c3e9b51ece573d194b64693145dc2e1..311a0acaa373f197360673f8ac6bc1b3c38c7e7f 100644
GIT binary patch
literal 15406
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
Wg8#`(#<`OMv%0-yy%P8?CGbB0OklVG

literal 15086
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
EAH!e_G5`Po

diff --git a/docs/logo.png b/docs/logo.png
index 696e03ad6ff360ce03647928910996169e329b4f..3d8f03fa0cf0fb98578e83d9b2ff71de3ead11c0 100644
GIT binary patch
literal 84934
zcmbTec|4SD`#*k-ZOB?AYZQ@)%D#n&x@9SCq9|F)GWI3RjD!}FC}dBeQlu<pnL)`u
zq>yb!cEV(vG3)Of)qUU3^LjqtKYoAQFZIX$a&=zEc^vQUxNg~6Tkvm^*aSfk|Is66
zCm@Ie{E-df<^n&YI<~(9KX`nP*atum?-tg7u+PIt8U)EgN6k!5hGzb#<$W7;^teJ=
z*y20pGGp-?eKj}K4t>fP_Py)G=iPUs?-qH#c>Cp?dhj6Int#U$4)-gGW5xdbpV!{@
z?Cm0ZT`UcXc*|D@7Ydsu?oqm$Ct_preAD=GkySg9UFXAl50ZYoQ4etc(AlrJba}G#
zND(tTBk^XxU#H<_CpWX$x`p-tiLGDWhTO-5yh&G>C_N?j=B>Wm$%n5`jRq3a#{!#n
z6BcdIneTH<!#l6wv{bjrAMTe}5r3=C)}6Uie=Ysz%laad+Gx1#Uz!(uI*RII)g=g$
zCM8v3>U{<oUym>|D!4W0-X*;5jre*tuy||2a3AK}%hwz}r-wqmydGAc?O#wDU$6Ya
z?G%~7rC>v)@GX##);BeZ%FwvKp0FDwBYYg`TC!Q86wa^{m(yhvoiIZD*(8ZxwJ61j
zuzTw&l&{=Q_f<6LpN-TxvbWBpE~axE$PKc2VB54~&Ob7a`=DNS{`#X-#HQ*SKX=Wh
zUXI?Zmx3fCPOQvT9Nt$*80m0(L@RnBdtywM?;-4hW<qC*mH<P0yaq<j`CL%^T##le
zH3awQl~Z+<qGg~XzxMEHZ+`!7uhX`&7p^(Hb=9Lga<$#Bc(xC5?7NoHly|8_jExzc
zV-aj!MF041Lc#d+!z6aw<mg=j#*X$!auqp=pU7oiZs=oI40I2ME1`{=Do@fUIcWRq
zRB&bv*f;iObBR||@2$%ZiU^bKX2vh4Vmltk|2Sx#)9}WZ&gBJpNz&9mCvq`N9k{WQ
zlKi80O-7PdC9k7q-^8?No@Y)EIUgE?m@7%6?)8F<t!u6x#WSZ@jU@_<Zp^C2HLZ`b
zp}ceOC0aZJ@lIo1UoF!qR&0vqxv#H;Fc;>fPEo7fzaEm|%0Vjcm4oLhz%8ZFRb^c!
zxXHz!Ed;?191mIfJ@QJ%VKdfIyQ@bxCy%9{fKXm_l};ADC729XJH41;i%BXT!x4OR
ze-u+BSZ2)OIWpl{)Mkiqts-3^NR=pKkZO=<$=*{b+Tig4Sy*t_8pbqO`H|#ZlSp)8
zq<BX~_lotr9lYap(wTtLDS7QKk?;1zIF3v=#xpAIE#MlSn>*~7ZmY~!I9+Dt3D~u;
z;MGIYc*8=0MJbEGikOG#?6!BnfkWNz!1KC9C|&m7WMScPq{`^jLtnZAjImq#w#w!x
zqdj+=Fa{Zi-y%O31X>5*+LNd-;QUxcCF8R$4E4l_s$o>5FHFA+PMpnleTOU2(eV6r
zKh;r5o{Z~E?@4;xXMtp|=Z<!D=U?w-n~!|frHC!MQA^sfs1o$Uc%<pa*-G<w!>S3R
z@jHl%F#0|mUV6rL#(I{T-q=H1^>A4!v1UlR@ZCA!(Oy2c5+fZHNcwUBhbi)9HVYVA
z2|Uz+_{wDI-=@}0BkUl%c(pjsWV<TVVT#q31zd%_nZv$nU(|T*-4{-%jPq3}o-l@3
z<R+Z>?6z+Z*4Qy#l+Pjhk(Hv<+p!k~-RYm@7jr5u3h~ks6EEh7_b(TsWY)2m?J%b4
zJp@~Dxa(N4NAI=k4RmkYS6N?!t1w#ibz10}q$xyOcX8h%Oh`%MLZ;(|rM_&2qPMs%
zq^W!MJM`hf(?`C{Otg}j#S$%fMw`m|i;;#=%=rfL!$(ts9dPYC-)B?xr3{}K9es=E
zTOI7?s+qE?M|s`5*`89v^qbkWXcW4W@gc2!pGzyZMxSQ(fcWaGpVv_nhO2$iybQhf
z*L>Hr*L%1as<|N-_<cx-US?1TM}L0D0SxoQ_soGFi&~qqa`3VV6S}6LP@$XFFs#gD
z(}VMup@QZJ0s3FrsBe_LS~!^>HV`d|p?f-O$Ir{*3Jur6Q-9dDBPsH&(+-N}s#rvX
z=r)?=h|$X!_L)&%qE<b}tlh+QtcsvvxO^v7jEkWZ#!RSW653!reMHZ)>S0uKwI83~
zwsS@`!%XyDrPONIeSCe3{;TD>rpmZ^hP0u28Mb(<uWj$*`1kJ<{LB^ya{=rRDHT8H
zdn`41mG||yU%}I2nJ+dyB`K@<t%snEiUhsDK-QIh)1U=E#vy5vvg@$Mqw#e)-c4O4
ziFNMm&cf(cL8a)a*_kcz0X+C4{US6A95u(dS~6qFYs}wjy{*22`z`6|p&Tf`;o`1O
zy?iEB{^Q<5S4Jk${^P;Srr9`b4G(Spc<uHO1WDV%P<vg_dM)GNNUmQcrvR4u)76mK
zbD~!**Qu4#ZKl)+yQysXnpIW}j;i!dRh&$ox;8jcqh#gm233>gUAUZ|=@A+S%Ba5!
zk2(^l1?>~smj4rb8k0GiEA7PUr4{02!Oi=Hbi$jecBs`U>?I3IM!VHZa*Zus;3kK>
z(~Lf-Z-yWDo?Q2wQm$ZM3r5+rI+e@te(USCVl@8L{8+GGi=C2Ws&Dc2*07~K&L|gk
zmvuM%T%Rf6WFF<PrCo}6TAY*Pewi*Rxsby~c3G~abDqp<;UUW{PuT{mg5rAwicfM$
z+9k9XT-+;AS`6}S4N5{fVy%C=fFfxxv-;U6{*sQjK!lmxjmXJHMuTY%w5^5FI;Vzj
zEF$m7DJjmWAcR<a>KLx9$4D=fNNsBR#(>D4@Mdjkzwk!q)g|<OewqUo<?nZEd>y`u
z!_{wrqo;?aSWW$j8u=zxWKMBfn}?`~5ZxSh`iWC^2j5OyQ3WJ+uMBxvPs9CWD<vwS
zQR}F^QI$7&_}2E9A32#}6LgzseBPWcmdPc1eu<G3G%8gP#oWJ;of)a-z)dUB;;mVw
zMV?vbx1sazi8esJX?9{}T$q{}JV_}<dN&6WUB@$t`jYTrt`CfbZ?09Sr9X2BidH#-
zdOgZeLMt_;uF#=XbqE!IFvcD9mZT}c>%Lm{HzfsBD61is*+vQGC#%gK6y7L9K6cV_
zs5XA)y|blR!kTE4>THMg#tm}N;+D|iE<WdvjG)rIY@>Vm8rMt?ijqSxdP9=yaS=o6
zH1>1BO#cjLh(>*P-Uf4&z=pKBfxUeJ&gdIU@UM^;AfR|DiHq4;7THD*?&^Tf@&saZ
zMYJrtM<_Tsu@Mq~zBI!eU7~%{Qup9}QY@3?zNuQUBee{9yoWYfgnw2M92H$9mXKOz
zj?6G`#IwH~l0qgP?-!z3v{9$1L$+Fcm!g=Z`#nUxcE!mdiFoq(*U6&c`Pk{|6fad%
ztj`+hZEQE2k0EnM7K4U-ceG0^e;}<-qu0%3Te`2u)Xf2Wt%v=H+Lg9;7;z~xk2O}z
z6k)_O5uMxT-zLM-?lub>=ql_x6-al>nG#%^dg=ro{T}B`j>}i^EjAVIJ5`!_(hfz~
z^+(1d%p7>jy&tYh7G4zoSpeO*^O3VkvAtb>5tXc)F-1?b$`oJ}YQ#&Lg-g-ke{Fpw
z@<jWG+QF3o_e3)D7&TzsS2|65zB*;-9umW0NL-v+$1Uj-N~rkEGs-%69gX*D3cO^}
z$&i&p^NZPbaUpBb+4|?eV;6m_Z*7A?qVh0CGjs=;hm0jXiWo>|OWVn=A|U!-O=x2*
zGOPDcH8h?Z?4RFa|B!8oc5CTKwow_{*)#7UsEMY4QkW2{VWN!Q&u}#~Q(6c{mzz$$
zE0{(}s9})%i84)cKX|x8$b!A`dWHk+OOomuc!_<}Gxg=ZlM@lGIzJax>CxZWuMv&-
z21thmt3udTp0Q1yXTK)BkW=G24t*JS-Z}>fO(Yqh;_u3QFy2e`T>-P@L*-7o0uL$G
z0A)_6P(Uf*)z>}bOQ~W`-3T4;6aiW>?-a@Qwi%CzKDp4cREbbA<;})04a3&%$3N4Z
zqW9={tr^sn=o^tMC+6=CChWb@bc5dMxRNO&K&s5c@C=o2UO;sAXc3(hmP7J=YMB?!
zjH#G>{lbTu^pMr<xz&5i<E7A#HrjaW{hdQjOSG^R<uJyPF^HM8s$Xq@Dg~|cXaBjD
z<;3?hYGDi$%J7LOZvkVz;~D0XoGEh3+MLY6cB<f0X$5hGZ7+{&@r7cUC$ntbf@~(>
zOvVNGM(oA!aOOb*UM&Ro^Fc!!#hxiqxV9!*&;BCEYTF>5d60VvQQUF8HcM`nyr3I&
zq?N+i1)9imAe6f`I|`hUS>a6sl(VcHL2$_m2HFoKCjavojJ89M1vFEO@IUgqPxSAK
zSBr`VlLhpgTgcI-pTkGH7TLt3i-hIV%QmIkn~gBVVwx!#heuFir>>v4H&Ti~m*S*t
zGi1hdqr}(d8Cq6F#W|8)_^c0uD;Xx!7#><VC#~GC0*^c1%1H^njgHjD-un1)cDnPZ
zF}s7;AH*O8(7VmrDC0!1fY<#gn+Gv4vI|`#JINcSu>pI*oz{?03FaBI{G!&vB^S7x
z{=^E^t(JKHI(estsNC3S%011nXw<pJzQlxBUp({#!ObW%lH5u|e0JV6v&4{83*l~{
zx&`()Vqd-d)_9MBe8@Xp?jMD+5qv+42M9$Xz|kR~`e)s^)0-MXNylo=VS6LL(ho4>
zBR$q*JK0bkbt$VZ|Jijc1xUCS)r%39{3MIZNxsZb$^!%D4CQ<Z8>6t?3RY=|5GKmB
zvM(git-CEgO*~pkEl9E-pq{W|Jc&VwVO{L7DD|_W1O_ZpI~1jJwO#DSG|7N!b-gJ~
zd&u}K(+9@%8IQ^iKhuX=)rkwf`$D*S+tF;4F(zd-Baa>Wd=#Q>O?;EeK{j0uU@N%&
z$|<|cyBo0<#t_1bU}Z7{BhI+y#By~Xy+}%04^Yvcn&9~?L_gtrEB)M5#mx}N7rJzF
zKx1Hcu9W>dC324Yh|zpxu9p}Q&3vZElm0c-y&qM>@P?_8NnL&H_of9Ii#GJ?zH49S
zy!g&y@n_vT=B#O}&cgM#jrX-u%YO`%Ar-f!0#s$oq_J*68rE(T=+95@Daqn;7MxA!
z8UQB@86_cKY~0cV(zD^xb{Ozn7L@FyGNi91Xdt3huzmCAd7WZd7!Z9c3LB;u$MYhB
zG6iSm(Hh6G2i1oWjV1aCx(ahz9Lz{vX49x!&PTy0jI@(;A-~7m7feRU%WzH!940|7
z#Q}rb>Pc|iQnb>kH)Isn)(k6ZVa;9>Q2^f!P&W~qoNxc!6=`Hl=lQ37lp*6OtE*tx
zW_QGc-nO42lCAz_v7&(<X~3=p?Tqe|Cm6kr@wyxjitLl@Vl!pW5@WyhXg1xAfG2Iu
zt>27~HBo#K&X(w{N?s!ONpdClA6l+PdE25&kM8>+Q#`W<#S5X7_d8pS<yLaisdoaF
zo0khex3ttB%A862173!V6rFFk3R@ppq9t*mO^RG)7IK7%ag%aomt_(jvi@Y54XPme
zoH-Uhp<f2u$N9cPX%VGP#OT6RbqkBr*&fHaT$B`#$`Bin{?<h0jz+~?XO13m2})mO
z%nPH=JQ|%q4OiwVYT(bS_sdU15uZr1yNn$URBeN1S3PT0=0XC)s+osm)(+Bp&$$Vp
zQ{6AKKWG4_2R*ifh;h>*$9vUKf7%G=w01bb<{_AS7L?iwCB^Cw@`)*{rV?@9Tj&jY
zqh7{5T1-z{gmRB)9Nc#Oeo8D`>*fUjwkS)CLfWcdG$^;99Svp6`}c<RzGPA;HR~6P
zQ1A~{Jej5Rtzv!Aep94^*Spih7@ocuz3#p_KX07p4-xeF+OurTMt$mtBL3>%?^c%g
zOG5Mg$SO=q7JJ738$F*pjg|SXOtHG;nHT$Q*JXC+fodK80>PtJ>`a#pS~S~ECA~Z<
z$nevR$Ps7SN2sSwX)&KMWsf^^GKP5>$8_Vc7}U$HY_tal(6x~=#x4mNk;53lm0I(0
zW6AF*FF&{Rxjz%@7Q4_H(Jj-U&X0kingapesoagYZ-A<Bf4uje0cxj>K()=&<fQX#
z>)-}$X7M<gd+)iupbuQPnvb<mWm1uCVa$vER(;GB($&mO{Io_PR9efT<h+Gm{L7bq
zu4r#>`UumFotb?)B-@B@T3eCQNawFhD5G#WaLoN=M_L5is6>I9kzCBl|0Op(Z&{9;
zEQAWgoRsFKro`<rA7iP75Tic=ff-+4HWa?-f2{gRsF%r>>cpQ}>BxZQ<xkV0T2KM@
z_1Q3H50<&2yW@)v;i}HP$%mIIZ>(TUzLmH7TjnBHqEXa4Ldpbf4yK{U;?#E9#o796
z+Rm6l7avuf<FGj@G$g^G7fE*F6VKW+1c*k>%Xob45$OSNI%D+Z0MK(~^+<qa$E(F0
zgSk%0<1k+IB`-IjF!ORwEIMUXu4hM!oGYEsbTI?W`JpZS=ZcO;rXTK7d7G5&AGlkf
zMqq>g00@$%LM&Dy$mAa==xNgTB=6FxyGR&Wz_(Rj|2j}vL9K<8wTO#K9=v2_xnuZ+
zJ_VW#gh~#6^YC4MPb{@EjA0RC!>>`g`XAW%cYhTbYa6|G#2zF6-?$j}dY11C3yLbP
zhbz#kZ|}L2vO3nic+$zO(GrTjs2uf(Svm7xy!*=BTxaHlcIKqr`ZDc-dhY~XJ2Fmq
zGhu|SD-?}#8R8?{AV~%cFQK)_AwD$ii9ju(yK0@!#;V<)6gwHCR)6vPVwM^Muvl|S
zQ*z^aiUCs|%p;TnF{J^_D8MN1sJ!6?gDO1(8PKu(iA%H#iegTx?^;ATQXVZaqIuR8
zzuOdV<)?)#%Mwc9PI=c3cNm0|63*7_B_c|`_CCWnh;)TKU%Vc<jXWp`j|%|<>5k=W
zJE)>F<IcN4S1&_yOJ|cF1xtK_j#-TJWJ?LB?Rk%UgIk7Emp_+`ud6p-U)kmmq@Y-B
zGn~@N0=@xdRQ0cjV-CEU0#0uGZ!KTt-$oY9w#@#tbJW~{_o7DCcxIW~b4MZaRGxdH
z@2opFgMJiJ=&&W?VV>a*qlCWE3M}lb%;)L)_b|F-HNJM(Nm7xaDx<y=>-a8z+w7O`
z2ZB7N#K=D!uB2~B6W`*fiW^8bnsZgXrf<BbQv@p_?(A2Zi+qFxXLL%Gjc74rd-)bO
z?YKQR0On750*@E~Iy;drkCU;tMI$Z2Jy@x}2?J#Ns$RM8FUbehLKRHr%zj#{ww1ym
zwl$>q=UQ@RwogL22RCEbJ7(d`Hu4K|ar8*m#i7r5GWBI&0xxyG3swEYX|Vdm+O{c{
z)+wxk9Xj9-UG)bS;NR@J_x@CgTM=G<lyQFwSLEcB!@8ZxiRNtJUT&qw_L$Fjy~2yt
zwcpT(uK&BdwAh(Dc5<<~<N8wyGg#!Bl&ERU6svV3o@8Wzc_uM;h7`<n6Bi-?y|#G0
z=@}-&+Bs)-FoWlGAUa8)YsuS$$@sprWm#|<yxD+2==%n)1t50%446wzFoxV*NN^a#
z8FZB~Ae@Y+1t0y{e_cLU<`ICmel~P*ulgsJP@}7bn|T|xu)E$pF~K^jO-HIi(HhPa
zQS$J&3hy(Y;u2o6k*do;5*HgnLOV8fCT5dEG|GFl<GH8nF@`SCP=YYE&Pl(J(Rd+X
z=p_jsyPo6d_*j%u`q#jL0O%?UqRC3M{||J_Ii2eM=4P{c*<SRd8yK6cTX3}Vamp&Y
zWSlo>y;Xh@A(J8tiCwZj(D(zA5kE5S6+VR`mSBZtx@8u&0hSh*ZFpccc@jB%<%KpM
z%@a<m)`;sG-mbaK2;X;bT#JLzaX)0NU7QVN6ys*QR#MwvQcGBD?yUQ3<kyS5%}=tq
zsPcMUo_<JUDa8E#c;1^V!ht`88i2*BvXjYEf<HT2RF6-9_IG%$@<|!8e)$aj20wIx
zh=Y|JjmQcEvvN9&DeMvAVwdgh_(}=&tY0*0t?uNsaPG+(0*ZE{{S6lfW8t}5`QyRM
zzDtY*%k?kUVzn+vI@kWpT*`2K1SfQG$w}vCyv~2CSEuu0EksS?tMSU8t_GB6kHRc*
zT{$4;49R0f9)sR`e_H!!w$Y#)m$!*#7$YgaJ6BY{1K~3|tr9GgZ!?<Suwc=PxaCSW
zpVFsCNkTQg=jAX~P9HfLy1Tu&8M_u`p1N0Fv_<vNUPHwAf|=~rknbf4Tj^C53ttxt
z-c?dVUg)6_?TDe1kTALA0O_SA&GDTiFS(Mrec15nS_tl|eXosFvAlpWQsA_Ky*w`G
zfbIbni(WDly~S!MapVHlq`K|h+M;R_c%nb@G7_j!0QUkxS>Kf2bnIpHxlK+AI&88u
z`+Mo><8;IU_vISq>svkbpz`+lbiMZ@%IrQ>bpn0Ch`iW2K^H-5&NYVX;P8=8+wGVO
z+KSh5jh0C<)C@XZ)Kq2xpF<ox4jX_m;6{T6Oi{9>J?0(*;KLny-=QP+M)%CkoNuoR
zuUZCd^bz-MpsH>@!(VNngKkmSD%_)*<O=v|X%fqYc#M~?5WT7tnU3a%TBwT_+QY_T
z_D15gxc0O?eIj(5v8{}w%Na+O9Y=6}+>8!OhBL9GHjh+WlQ6|wg$ctH_J&&1zFr#<
zA`g<Fl><i3Kl{JlaV<iHFa3iyu(G_Lb0V{iK5WZNiqyGg4WLd2kiR12X0?w3aJ1_3
zrKH3L+~hxfWbY}=F2MO#jv7=>x5axwPdcf15#PaOEf_P;fN(+7>bi1)!C;l69mAhp
zdp{WS4Q+;ledcNk4(ejO06w5xC+Q_fhx@((<Oj>=?DJ>~MfSajs`vH?oitbaK#uoO
zOvPLL-GNmDk|>Zne@WOZneN|6_jgBer3=}YC7QSK0A8~T2S~HY-VMe|Xp@zMq|joI
zwGy;8?Y21Wvx!lePLlac|JZ?Js^{_nbGeSfTlB#h!&)~Y8hIJ-3zu@*NRe(4QGzr<
zo3%a-u2II?G4J6Kyx3-VV-fmQVeMB;?J%a*0Of%^%!1x#(dhtN|2MczT{*VFk8^=`
zQ`nQ&oD8(Zv-gDeWdXk0jodX|$s*P0?o<;ws3C{{7enTJ#n0<;N!B;J6Lxm1b+|fF
z@IHUqv_3x0`qaGUf-o6DLKtMmjxrSD+&G)9auEeQ#imRX0v_`@+JIRhuFcTaS~ZLe
z<)I}{t-q-Gtt)Vs9lNJU^+mNT!yPnT>EKpaVNUcWHYd{ztxGqX*#pplt#qclJpdgg
z>y{e37X)-SBZ-Dc_Iq_Z$T<wJlSItXXeILMi&~lUs1oG~A)0oAAy>)O;?1P%nCyqJ
z@gOyO3sdcc9WgwN4q>_v|2=`O-R@%-E#`lL4HJH^m%kL4uiqi8!0CTAj(@4Z3N6cO
zy5PM6M=i_V-Uu8T>P%8-r!7V^Wp(b{G^xs+-FS&{rNc&!BO9@&CB<Db)w9*9%-rqD
zq9tdY{=N^StT~cF?3{o#jqb8`GyFSZEeMMl^Mb;LJ3QjU)(WCDd%L}k={4?VBfUb4
zuE;oLCL1u($d=`td;qf_UR|Q)t+V9IGp&^MF!SDj81dqKj?-81BEar;;(m9ENx-a{
zQtdf99`$=&?eWM*`(K_YAfU3tm~Tl@Wf!sRj5wg6#!boL$x*ea2LVeyKgF&ySH0$a
zJ=z_Z<%&a?pUo3Kd>W^pVDqx_XIH-agLyd%=H)-COH=A0^VZI&mk-O3V1O3_fp_OQ
zqbqiLia<NHXr<Ku7I$}*mfI@loBga$j2RSW6thsjV44_rW??{DX=@=0Ni_0G2zfj#
zS#_~X)+O>D15yPDpZZPoUY{wUq_~=6$QPylmvOipTl-0LMKQkR<I~yZ&RhFGenk9{
zSoQ(<<ql-XpH{GAKzm+<7a75bapcoa@FHQ12w-(_vhd-^Toq-t@>>iw_1;uscOfw|
z54j6x6yL-qZhCGL(I%PS$w*70K{~odZtg`h^^?x3?YB>U{d4f8UI}G0{P`XoxrJvK
zt7>+J^wz~IjQ8?6=Q6H2ZO4dD;w`wveDVFI(@V6$M+}zh@uv;sWd*y9$2+g^1SCUt
zH}8(GD|RDJ0_`BdgZD8IUXUzv_CXm^r3~P0|5YHWY3SYYxxq`b@$7*}Z_}l^g7-9!
zINn#nY1MfHOk1istq>b*5$Nnum$=~j1@#8Q&#)rD%(`&rJ&Z=x9Vp1_5T?2rw+T$0
zX_9i4=hBG2#so-zuMPdhZ!mj{9qK;nsv?eML7Q#_@Xwr47bpoC3Lha_%aT0A0228r
zcmFc#7ps|n+eHaiJo8SQ&+e>oHW`_f?MUOQIBu+4=5I%IavEW#V0?UtiCNDZB)QgR
z)}6mxpP1uk$KAr5OXYqGi^MeKe&GYo8t-bDHarmT{(#=oX25LHm6Q0B1pw*~7&};o
zt{#xVg)T?EZ=uATJ@Eg)ut#CEQJB)4#dr&hVaL+-T2iAtK72*IzJfFh187#<dA<Eu
zs%undzQ*6R)*rgnwGqw6FcC6(?>DOdY_T`Zc(~vyoKC%5x=fpYFu51jXosYdzP>16
zUtOSm6*YEAEZ;^g$6^fEZGNMk|Aeo9*&97qSqFHc3eZaR*}gtSP;9vI{3PsxOT=N!
z=-cCZ29yq?p#2d`J89pN((jXuRO#(YjK-;8+4JGyeggv2KJUA^(q7bJ@lpV4)y{fn
ze&f2gSg5=FXtfPl@n(N%#5%fsukR(lB)y98(?IoH0q3Nv2W+5Q62Eklf3sY`0D$+>
zvLs>)hzKFE9o*H;teOIV_06&?H}6U=pX`GSgogw<=b++^ft8mr`y?Fwt?i?urj-ae
z7u7GWf99AuNEAGNrMIMa`6XxFS99*V9?t-o>nO=CQi{Oj%ci$#Z5aEkSx?WGTO+#y
zUEq-x!E0YzKDq+`tOx}V%@(+<KAiX5sJ5+$1ZWBQczJBj59fc}pXLhaQ5(za2hXN)
zd>RG+xuQJEXui(2;^0+<vc}@41^OW|IMa_1L^f|IAUJ{3x*X*m6UF2@r!KY{#dIq*
zSC&j0{L;SO=*wg{Ne;~2oxSRle_mj6o-u5r_yhkQDm@-fA#Ne3KAci>rB4TbfaSg(
zAGq0ka0qk5Ah1H%k&D2({KZEwU#Hgd1GQ2QFVU`OJRaEf++bJAsxbY4&m*5#_;=&$
zF2lgP_YK$~j(dJ3umBWNp|==;fR7==T^a@7%Fr_W`4FVO-iU+`Y%9xWmiY(>oH%1d
zgI-_^XPhS(IZlnR`(ms4f8w1SpWI!{UOn=D;{OJwVT_|Il3Q6g=K6dQ7C3w?OuwPN
zraS29-5LHgE$o`)i`q_iTWmwqHSEo`AfcB>N0?PB4xNCYdA?_izDo%4rL{G8O!NVm
zo4btM_9f%p`VK5+f8CW_10?kzD!k^kHGMD#L>;~`zF$(B+h%OqO6m9tyQye-+W>VI
zW0np2DNv}XuUf4z8xDK`8{-IQ6#3nGOz96jh})pgPkt)Irva4bN<Q#`^CmKh9|EQg
zZWoRh^$9?#i~z#@fYwLP{7ncb;cH!=wmE1Y<07)7lJ7=V7`2aT_l4lMTYJ<AHfWz;
ziDIWE7{+y#A-z2tX*O!F?inz#jCU-LohZIr&1UBn9@3Qm|75SU3fcd|r%?z4Ue9sN
zv;1x}KN<jG_=Pxxyw@gx+l`KiMx0g`^D@tY*qB{z*ZF^11x)C#B2I5x{5Hsy@Ol7R
ze__QoKSC*a;P)7B*Bvd)%<jE=p~&veGMF|z<KHU3{ANBu&`p*vWd2F;Qtrb)5LB3$
zSj-}_0JR*))E!is`$Rf+P=e>jK~~J=A(%H^ia*<1Q%93Nl8TcTpsr>_&l#(H^{3t-
z&|>xhz5FEsHgYP3pFRAv3u(IU4ChR*LJa3>wJ)A)b>N)4xzKd|Gt4@Iy_caKK%ei2
zQD33dhn!xV4~p;$w(t2P0Y7hoLDI!lWly+SZqas@YyDXVi@Ho_5p95>GQhlZTCp5e
za-|mql7HNHXNS_I_b%p`!*dL^-YYe4w>KKBLE$XUM9Z0b#!9{PMdfHDu#23xMPU7S
z+cVw_5mCE4pmc;eZ>Sd6-TCZuBMX2J@6dQsj5m;mJYw8s6$ygffDUNUA3F4wK;SQ+
zQ}3_i*g$R_HWyR()o~oSKb5E<Fep!nk^B@=2#V`l0p!#K;v4lS;?U7$ogzQtCiv&Z
zQG)k%o-c*1oKdJvwN3h3?Y)&I)Li@XXR9#5lWC<=Y|P;~KakLpo>n`c(F1$SPW!qC
zhcWzV^fq8<na{xol(IZrS&?95vfU5*gD;iz;aUK-wKhPs*T_w{<_a_i1JwA*umfxi
zSwOK^9t@)0H;_V#pH6MCYo&aAu<InIi3_VkPGm1>)ZU`S$?RTcD0VG0{UQx@Jneh0
z@Az<L7=Er=PKexhIyJHa!A{>!6NJ6jL<lvMs08>-txHOBoj!+tm(-<VDK-$r=(skO
zOAWDD+#AJwJ>0YBZ~b2OmCD<m&iKsD@dq#ZfYebp;LS(1PTwD2e`6^8H(doKZk8>z
zK~{B5>0kym_bxRb`idY*LlW!Wls&3MoC%Em+YY|iQmy#bx9&h7;h<5EJ$Wq+T}R<!
zqhPeS8VTGU>K7-;NQJb;sp;|>Kq=zOd!He--M<zNH%HY?qO|=l`TZ=*Mm-p1e0RRZ
zelPj;NwYY4@OJ+sp#(&efN|b&5ci9IvC;=m@_zAEhE!W;SlD$9Gt5c*O9j0q-odW)
z{*`c|%l@79{<}5F_(1E0FlOF~uJNTARJ;>==XESb{c7OLi(0auO7~y}OZw;lXJtJ@
zm@o@oPiqR4I*pL=X@TulH{qxIF?d@K#3};8lH_*$l2i%mwimKFKEvsJi<;|i)pzdu
zNU0=1eAFwHERYZa1o5e9(ypCE3)i1>EZL;j$r9+$u5^FU+fZv)khURil$TG7oo-!0
z-T@x2e0_7n6{3EiA)E}XHXAPH4)uc8kA<jEOXHU?%~EcN<x^r7>Vf+gHx_&YeZZPN
zUmD3fPDNub9N*tcDX-Z^xv5uPRa|Aj+}TRm$~wNkIco?&hIpWnn?@*qM%?#Bfi}TW
zk%t67p5lKj|Mp}+Hs+2p?<X$ROt#$PBO0p7lSL4@Zl;&*nCYADxOMBW3cq(nIeL=j
zp7|lA)`N3gHeG2(jzpvOFC>-KOfqTtya#5X5{;2O+7->L8^ORBeR+)YH?Xht-tm!)
z;M1OW{uOaMDZJo>W|s|P%&cTYZk*Py(X%0{p6D%cWL4OnED&mwo|dj<HwI$JRL5^I
zB!7bL;@>SnQ|UlIU&F4Awk@O#iM_F=oxhM!-a6^c9$e1G(5hM9HaWMnGH(S_|A9AL
zMTBpkp1R`tW!Y$Y5N}x7z6##sn1(zK^-93l!2bRXs-?Y=7VCFDSAk>|x^r1q^%pK>
zO1<d37g`3?dlPG{$oD(<nhy??2+=12?C1Mq@iUNE3`{nR2@@`iW-9TIadnUI(W-Am
zgfWH_cNhjdNo|Br>>%Pp7gj3|@ktTzwGy#Z!LWf;j*5#6chNIXaLZ@He&@V4V5orT
zhx=2t+2>hYPwgD$E4Yc?qTLj5I0;;LK;Y|sg!oPK382hmBq7~XrxI7(WfIIoOX4J<
zXkAA_PHz*z@Zhhkz@=pdU6mWjrYrTeHKZET(v3>O`<@hc9*UthHK93&%9E@KY$!vB
z!G59XEa;t_j5y1-<-{MXP(YG3-F=1?JnIL+0MHs11fX8|p`2#BCEA?Q8~~m1EYO(*
zFoGS6jGpKfq#y}NyMi?y)xvW9Bm!T3(cJ^pA>NlmJzZuLyA_RzZ%q>tRC(&b_XE7c
z@VQJA{-FiL(#*{JL8#N*IA7{p#3<v1FXI$Q#96P;>oNxEd*2Bh;!8QLe--6toz-9a
z;dh7qI}yhc8g_t$Nc7|e*u!6Hq}y$zBQfab>cH^0{JSXxnqfq;?@t*`L@x2kS5Tw5
zp#+-N`G@mSf0Bjq?sg3q*dqf!0RvgeE5+|tHYy>!6TiHaMHZY|b6?BibIWF4EC2Zh
zH2%p!2cf3hT6iaI5T;F^m<KAd%x5DbRwQma`vVRDrj#x}`61Qc+OZ7h0@qzA3uvi(
zK#+DL{0QiSa10|v$Of}zAyH+wF*rB1$0`nY*XFdL+s#y&d~EqenAH#W&)Mn)jtA+D
z1iVJ3DWyrm@W)a#^I}@<UKkgnL!WJkml0dZAT19Wph9``TtYpj()7whF3iu!jkx#!
zW8VR57Sr#`ye*ABp1nD%R(DqWaJCV5!?(*jd~`~u`|#(1r1il1Sha?U=zV_kX<Lft
z(d9cYH;@)<UY3*`kt>_#xXsQm%@8>Ii>A)Y%>g5-CueU&F?(~J)`F~t=>_v_rY+{Y
zah>|NYI+x6D<xf%M8%h@S1$H-&M;u)#bmZ)kLYBRY!oQ5|D-j%^KaGV+&S`X(j3ZI
z{osh)-$H2=Fs7D{T_okLgCn~72rtDV6({w0e%ybI>Fe-kcRp}6hpVcvBeSkt$UNGz
zQ^}K-KQ_pvN+!WqwL6PPm1V_q_nW-0fEz&g2=6ASKa6orr~q-?Q$kSy+b<%PNg++q
z)^<g~Gq#>vRB59~1KGou2}zvjMZ98(q$kGL8!5Y%MBuVapfnn(v2e{smh0a{Ra>!I
z@SrCMLVkBJv&VoJeLS1*IYlKlurO+V^tr9xeUeS8CwFt?iZ3zorMk_srp{w7=i!vv
z*N0Z%I~bF=rcDDOZU=q$U4o&K-FiwKI&^Eo4`p3&EC^oR@!+lNB<muw%xVs@+(vu|
zN4$`1qYomgmu2nXvNwO_$TqX^kRydN6g**@I?$QRa-j|I_18`FJ07HMz+3ERk%_l@
z%Z%#D>kH9ZG~)~$;cf##W-$hf5zk({JD^LU554LG=^<?_KEZfeTVgHvE(?WDJXlrU
zfy>!rv-4LtxqUCr>C^(0yJ8YH+shgzAbwM=wAYpX-RCdB5_hg-Y(#aEnw+Wo>8ize
zg(Di$4b`PVnSH(*H}ts%EqdKENcd3qyW;!WKLqVsiak-KNSZW{R{CU;fJEsTs|`!g
zv=3G-4#Azh<TV!3V6>2x&MjmxJkJ73kg*|1iLd~#S{=J_a*PQkM*r*|1`34Z?GB(w
zf}XBVAb@b-V~?TDA8hWMb|4HLdiuDNCr>NVb4NT^YNlN;*}}AfKY}2`5jbbxWie8e
zg-G%^-M6s5F5p8)#73%q3Q7#B#;j#hLV}nQ@HI(V2E5nvuA1rzkjXd#G8wFgDP)IU
z68XkCfNFhse4U*=Mi;tR_M{8J%EczL)ZtqIsz~f*WpuYR1ML1;$18byn~xMeOE>1X
zYX<URT-A$t7^r}=d`BWN;f7T`<_p!xLx+53F0od>?R}<A^)kJZT3t`lI@^c6g~F94
z%IwpIc@YpLOG7-)DIf_I;z}_<9gY|TP&@su4s=q_KyouU63cJ8rJxp0i2~-iY8Pr=
z!Py1j+%~_&P|A=>Kem8;lGCp{e>8*f*r~~?r(+e6;v>sQW>Yzpcaz7b85UFc`hbK-
zzi}oa;%2G!82#y`s7~gCpjo`PBl;qZ%R?q*DZu01(9j^=VN>-ro2+luWi<wWXR7^N
z|52hm{UK+2R>=U5zGLUWb)YKBS>&7S4Stk!gZillxS7i{+9;=3i--50Q#j0__$X#q
z0edeieDukg+DzFyMVH$*tp7rM;v$N#{T)3fe1JUaMy|HSk9$N1d3X5Pal92?SZso8
z+&vcDjS0f*;ZSElOr4tqWRw7?#=w2r`P3qW4%{MU`El$A$o-sy%clJYnv7a}{-dW$
zR!`~2!2_tfu2VGzCK8XGN@0|Q^mFj?Zx2>YJwC*nM-M3A$6%7shE%qZs`qWtb+syT
zT(IC~V_uZxYGwO|yig|={n`NK?ai(OVP0!<QjWm#hw#pKfezdeWiCBv_`-TVE7gFR
z%UEYo&wWvaAYn9Sxx>yl8+A(nyBl|V#lebYEXeib)%ERPZ7WmC65e;1^2TO4`n`G&
z0$e!xj>NTtNsEx!XMqWYFy@&5dOee9DqV3g*Mx}2lkxS4+R2G^;W8{HTo~<V;xvXA
zDMi<swo$KUO`#mKM)XV8R=V?!4YD|kioj`rSo0UN9FqTmjc26L@~(7{`uq=qS^oMy
z7#d(dA|RFmG(<mFCBqKHWfnv`u5)77^6@ltxzJOeYf#L-ESZ70DAb$w3r4-gPLKAD
z2r@Dz6g#$6l=QW*HJx=S(VWt1ttB8rx1qJrsEjEP=zW&5%KHOAvkh<bgcS(d3!op*
zu*^~Oz|t~764);=UEch^%#4oC)NhUt-<@1F(Sn+=sC|{_RhRr7L;L#=mL0So!7L#o
zByq*}_}R<ZzMJ0VvhB-0h^WHo7Q%lF3&*9bI^<BbBhe_E4#NA#-M!0*Wg2PQwxd-j
zA%3MfZ5z03w#v~4`kmc#XA0Sc4!Pg`C*_V@+}LF}x?O25?iagsU<0Yst3cpT=@9IP
z(*7P$F2Y2NxO?bZ*r$T)s29aKac5lUBehpEJ03LU=4ZW(YFZF?B=*rgy`bVodi8@f
zE^NJ1PyL)+wc^*Aj}spstXd{d8QHKv#&s22?VXmtlYM~r@8N}!^8<I6fgmrD73Nry
zM<oh-aU2)rA;HO_#ZE2D7F=f|K30{rt9GcZ2%twl+b(d9(`|Bx6Rg6t_|eR!wEbSh
z*r*f1_88>pHw*UB0ns=38F7USpH9pJsH@*)?cpH{4>3b$`~r#?fS76q?bseu3iyMC
z@KZiG;E(cMK>K+PtoHvA!4W2c)r7xu>%c-V!3!FcwZDFDLpqkt4}h3?lCvGLR*5Wl
zu?zRaa4JQTho<1)jy3@oY17Na$pMi*?FCXaSA5?Ez<~VaIN#4C>~Bmq@2bLLyaiV@
z&d>&YSq36&K#Z^Bx>;5~uvohy{2()oSBAJ*whA7T(gF_Zm?CReW}8E>s^YH%&YRX{
z_{@_fpiu(l*(=H6qE^E<h``At|9IVfMUq?WN#!qNJ=TP-dMvKbB=ZL^>HPzSEc5P<
z&}<BX*LhcX&)E!~;6SvN>bhrqD7&I2wu+AF_=!+k2M)?TmV?5Y5!~9gM_GZ;Lj~xv
z0DE1C72&_V()K3ZWL*5KD8vo~Kw!?<u?%b9u~I95q<wh2_OdcBrykb)sIy7s^=vZB
zhA{l*&tx;2BE!R&uUbt(R;tlBEDBTG#6^@=3$e=A@U3PNNKL5|i<w02Y)R%YIcjT`
zRy(tO<kZ#UXIb&K{GQElbkluLxt*-IUWpC_4n>8Ro%o5uV_+iGsle;k7<CxKSP;45
z0oGm$LFK5O!R+_m`vqv*S1vg1m#a2fI(Em`I`6YrHVF)tjzco|v)thoO+9zS_wh#z
z0rWgpbG0}q0n7~Pbx&nwyjSny>1@mz2m!GnXE9yjmIPF&yUZ7C@3{@L;<V-{<M4Qs
z>o2e3BTR^ev4lhaVktJ@*$#^;&7FA#)T5lg6r;|cSRq}L3}c*KzQCsA_~{=qNHsCw
zn4h1-@3RF3qB+fhhvv?S8`t1POZ#*neAO_1<gAC3Got77>2YlRoOJCA>mS>1P!$pB
zy3mDe^*|7JAndn|XabC@z*}@b)U!G4y5boSi++N?v`njKaA0L-)GB6=SqJC5XZ7G1
z@=p1(#5HBJjgxUpoe~Vfl|C2zsJhqjZU&lZHN`p`Ek8Z-CrLi-AvCgDGy1gvZ4B!q
z2-W&)v%OWr;a~P3vU{nAXdQbY{X~>b$ZEjXpa@bt0PsNng|FedS*c2pyvt%?2ywm?
z){7GKlETVt_8S!F)%f2r8qb#HGrP?4CoYqA)CqgdH>^kIYjG|9?6%StGVcX~f{S{r
z>;-!n4}5ErelL9z&Q!QrsjI<$&9u}9r*3W##%Rsb?w6XrAh~>64OsF$;i)eSBfqd1
zmlVN?l|MxT2}n$u%Xg0ev{P`t`l=5rRL2UYXg>vh)<VJClvU+J7^Mb!+wSA-a+bF}
zFe%`Fut97>hfFrtSYc7S1*^0(51!vL{f#C&vcL~#{>9%$`L;ZtOWQu1u_C)~u~W-*
zb@<(|K?1}?vKyBy(**b0(7-a(lEL!Bf4N&n0p4|`xB5c2htHZ!>_9V*Nf+<4-^qq5
zGgyA1$F9k8Xh5KXWp*1aJVOQ7@m(}A50)9vXiyC!tD+e%e=n59?s~I4KYBr|S#Y;j
zg1gmN&F4<#)R9?{3)%wwxF$55Tz#Aq==&pk(O)Ogz52jCqJR7da)e*NZ=aljjFlVs
zPqOqfrJXn#u_BO$J<6hZW*ZS}Z8se~TKbNNrj7h}OgzYz{zpg#q)$JQ@2~K#s)J31
zgHej9=g*NpHPkZ;US`&yII#I5k#hoWL3s=zatJ%QIwu;-aN}Gm_n*|+wywEwZ5vs;
z&E}z6rBm3n6dphc6;&{aqv+tuDEuWZAj)DXU_R^`&%<@Go(d4u4HtJuo$fc_HvoOb
z185zXs<JPqd)3mWo}>0lHwa$z)FJr*h|c+>x-lb)iHw!`(CEM>v3`3cin&8ZGHtG&
ze9hct>8jMGx<UGII=m#%rL)qMIo}N6%z*B5Yc<szo4*6zT6cCzSbEfrub-KKzJPp2
z7^7X_^z_Db8ZV`u)Vrw?z-!_D8Z0wCRspRhA5V)E-)?_(@0@mP-^}t5OsLZp%uAlQ
zdoSaxcG=elE{a{&34aGr=mp{wJG1c(YB)MDz<jK@Ct;OJDGw6Q?QoIaMQES-bjI<_
z4CHN(QNPocst7j0SW(+4K50<CvU)u6Pxmy6kHY-FZ?GzsaoYhFmsrPU9=8@^3xT^`
z02UnZ;<MUrSEawWo#{>dp?tzMPpRsLFUpB|DUi$fiXAa0WW<Pr_G$bC;nViIZ}{P>
zVjSd>=?vg_=xDtVylINxL?Y4kkMW3QG9*)>>~oHL!WcJxISjvHUYm37eI3ZQ5?q*p
z`sWHPhY0m+{X-N)5hUUFUhL^mLjfFdAVQqWzJF)smj1|_i=xjvRoL8OPVoAKP0?Kl
zGUp~@XC>z(m}k$l;00-tZMGx={z*C80vCDFxc0Q_I3iwCi`Z9pjR|jmSOUW2?xa`u
zf!Fb8Z2ukGRy!mIHa-qXL25SlxK2HcSjmtd0wIz8EN9V`PR?$zkc%4rM1J@jzh#NG
znIfNUzka{~ILAOMqhpVV8#50%R=n=Mr`X6s=`94Ou#PA6s3vpMdKAt@Y@wuBc-_Yb
zHESeQd9Bz08D0_oxTH9}10n;dkdyHS$l{+jvzVnw)0U^Ep+#n$HvxmOH^cnmbb0GH
zRs2@x7Jq4B02$i0ag(DXfUgJ)v{s7uD?F$5u1uK+of^PWeDo4NGtk3pry<PtW5528
zli*}yAwz)PG#_L=S6zcr-izf}Z@P;33$2SJUb9#P?6&R8t>HUxiT-O~ZwIY_>tOX=
zk9|Oz7s>)6>MgKHj0{^)m0cPti;h`}-(y*S#ltM@GoX6B{%i%p<1HIfAW#jt>~np<
z9#YTZPDjeS3HqR{p%hKq8eyc>zFb*vl;Y@&;GWhb_7O6-k}D6bSNHjB$E>lTJmoG0
zwK#>p!_U+zfBydwOW~yLsC%>G8hSbX{3ECD9&fQC&}=eg_p$uVHMd15i-N<Sva*vd
zL&W<S#sjTfim#osX5${gX>-o1QHFFH>B|BLOT4Uv;tiPU;b)2rBSpSqPye3Fdj+5$
z&L1Dd1P`PqsbB9_Y`6Lj83%%F>=w8(U{06d%9)*$tQt^tuyn+(0nbVN8|Y&(Q+%t+
zu5?+4Ho1+EZb_TEGrRFv#C3DiY>{Z797Wd~1s+O_LM5P4(xKHD&qr~J6t^l&#z#b3
zUnoPffi4+R^BRq5@ysJVR0L^Z>nIyc`M>PTjfnLfc3Fz+V7u&6JGNe;&@^*#UQL#t
z|8a7|g52_*z51!ipjv?-x!-Os_cQ>i#h+>WC>+_kr?Pl%L;YZdPBY$ICo)t)<WaBw
zUw^Uy5i*CQ&kmBCC{&JPSRaH58C$i~P8<^H>fgm2qEhD#P=XlM_r{CQlQ%*GgkQ9c
zC{`p7XdAfC{{GN3D~O)RT0YmrfB;i2*y8)$ZUud$Dvp9+%0_gb6{5e7T`-MMFV<5p
zgV|mi!5qRGDTtS8c4?rygK(7dVm=7=6%f$*nmVC==H;h{YV)>?)jhoAj65dSgP?4t
zZjirUI*Tc71kX423t1UzCqD=vM*9uAA0620TY9PG{!V@?5K05fI4lWw<L!WX?V9fL
z$m!J;k7h1twIx!dpqu+bOe}-y5Z$?bKLQrUXbg;Ut5WLf59sJZEtBp}ErraR3$Dz-
zgR@bjlB_MI{ko4kRbHjACQbkgKCu8dFl->%vYW^^zeyS^9swK$mn3jYAG`oavhed!
z=Ts4TZ71+<e&B~x0fCly!09rQ7;CWZYrXFYydJ|`sq=GlQRfoLXp&16BxlUUz5|MK
zNuOIJH%;)`c_Jcv+O(!Om1kBu$j$HL(m3!R|Jf2ujQWcW=rCZmaf3yAx@ZR24pjU<
zb0r-{U}PU*qb0#a>4)eVoVeG;GUc;;Vz5#kvY@9}f-i-BOa~`ZxX`(8_q8@knEx_}
zY^P4l9UN|~L2j#&gfRQvzhRv;tw%6#{G81>Rp!>!Q~`YdeIl~WY(cEW<IABXErnSi
zI(5KyqnYH#vWy0$xzvs5Y#pDO+$-cAt7W-XIhKLk=C1HcWn)##L(n3-<qgdC(g-*d
zB-z{}Fpz&xnt*T9yz#SD?9G{=i<E^;A*bC(s>5NKQb_N(r3{S-SNfOd#rSWvFWUYn
z_^c&~hXBOxr`&k=9lFT^(w{`-Ut9j(_moNC03L!eg}*T2^C;MJ0z0ZKS%`>qX9eDd
z%g+02K}9x%v1)K8fSXA@dajvbF5lRZAwwh00du2MoL2wHTwggBi=y)-==ywF=qoUY
ze2?9?hd{_VUt8EYe|~Qm<6lJrSQ+iQH1t0D@VI>v>uF?p?X%gQcLD`135dKlz#~rQ
zAa5IM6A~T2O!~I75@5QM+c8Mp2yqv7V|cNQWL8B~u3-sHxY|!9un~O<BXG5@45=V!
zM3gaSp9Vn%<<ohuEgAO9Zx39hXwSJ<sM7Rz^Ov?SJH=8LFR&fNvvzNc_p+ji23&i1
zSkXkVgUff4h4z2#3162kF3R}4aSkA4_IH*HB%1*<`G!;08W0RCu}m~~2&IS>+2n0z
zV@Uc=HorS~q?WzAOAlplq~3#h9Xl@xf%8!o!&lKKuW9eWj&M((U=wJiWSw$fd!?ev
z%3yZS++;U)5f3UfP;}?`t}I||2x7sj89Q+(0fEyVfXViFn3Y?e4Et;MoZ`k#4M5*V
zmMOP^x8D$=+U;@YmAf5L#&A)F{64yp<Nfio2gGP0h4TY#eVk0`w8d=B>MRWV!Zjg5
z!W|Kh*!(#IW@ON{#lM1%$Z%%++(~GJ*|ID`2-jhxt@=xVR~A6Cw0CB_RPlZwf+yk@
zOrPbP)JxH-1_lCa^YV}OzQ2d|SNrm(Nwq_{RGr~80_NvKnkScGb`bh<<b_%pS~YV`
zPD}QTc@<`Rv7a%``IX|{T>BUX*dy?Kubd9J#o7nvbmtYqyUP9(I#3twHj7<^@`>cU
z9uF&779?$hqk&<1KsW1GFd2NUBZ&oC@=clgHw*D18_Ji>2K#Cyy58hH3s7{Ah(UE3
zvb(2C!;x!W%HU)e)7G>1&?8TR3jI|*0eQ9;cLDy1y$Xx3Bj6sk@ysD|1CRmH#xl(X
z)kv2B=a;cru6I$QuJk_v_ziQ{>@(;l+gaVDU?bU}N@x3Lalsg*3zH2{m(d$ro<Khk
z!rK?*t+L<QADWmLdnCG}9x~WU6T}zz#LAFMEZ|VBWPpVLwnn+dIXstHDc;%BIfKfX
zLrkrc8ogOP{i<JGO&Jn|hV3Sf{(B=AZ){>E1#L;6U1j02CED1A&R&(ldN}UiPxfSg
zKTB)anP`YMgKTwUd%6f>Ue7(`=)D|#jA0dO)BQG?1;lk`-6hP4U^BGD&;s61lah56
zmY`)r&zKPYF)wu-7?DRo8V;PawgpSm0Yq*W4#UU#=ex-)IK@X#EXKcZLXm#7QUC%N
zvI4?Cz+;^Kk@tRo>qQ%U%Ay3c^)bh=Wrks*5A<TkQ_ULquINU3Iq3_gkb7#qTK%p6
zPBw^u$Xd|WN}TYly%u!uM@jI?E4?>W{$Z@R^(17RJT(a_(^w-77<f1D0*u_i+B5wA
zt{UB}9u@uIRQB)BUi_D&4l33yV<W<AP{;QragdJIhazf<J_pUo?$5k{dy3N9DmD~1
zzFtkE?uEIyT!d&H3DKiZQHD++ux`Bu_xGrlcb1&ZIh>6F``f=Z8)e%#!hr0US{C38
z-t}`8KCH|f2yi|HX92>e|7(4AtYBu6^1v7MBn*QR?vK2Ic-`$GIS`5Cf;zL*7EznX
z7QHWxHQpA)QM3}8*vPGVw`5NE_Fcg}V-f*iU83>td0`cmUtRccl<{$5-6HtU_R2p#
znX&+uZ#9EOA3HnimqNfi`HjJZz(;!?XkZR_?bX=O(SdmKDIf1WwO+D*jgrX^J?FTv
zaHJ#_X7CrMHJ9!4k|`r8O&IB3h|2`sbd)iWS3djm!ian4^v!pbjKN62p#s7MPlFHZ
zgywj^__uWr_A5HJ!HrkiDu8~aYYA_|r$<Uim~Dt_xYs{2Qx%Vxu2??U^@l=PVQh`8
z>cQ*T!&|>lGObdKH($ToQIEwqiM;qkh4zuP=hmrMl+7R))5icEej8CzF<KqG2gWz`
zk|BMAI>@Zp!B8Z1zDTZ44b2W~+p7-G6=mt5U=QnWeMFs)Wb<TWJz)1-YV!HVt#*et
z+&GZge<bq-EZcbk$NCD=jv>IU#rDMHL5znWNbZlT3rE1QD=fn8AWZc$6f5r=2xF+8
zM`dI5A3s=hLj|0E^T;)R2LbbXa(BKex)F1H_QUr}L01=-zAw>Odhkuw2MRXm_AdZ-
zpJh=YlQ;4N3Z?w3thdAZQo--sFUWg1vX(FQSejLHbXcrNQqt{j98uR?lwo7CkE#%j
z?(-2~%*oiOj3|7fo-D?1>fLdOi!9?voU-rP4WAX%h6~I^22FN7nC<G^e};YV?<n%d
z_hC?ekkBvcv~ARRy%0>S93&mz=f}e2tzTImKlwKZvjKQ)saRg34U~r24k?=AiVJpA
z^o6c@#=+1<&Y$O*==jBfIv-V`kwpllyogtKKO=nt%&!xlf^Fn%Fi-#WDVPo4+cfYt
zI1x0vad7EP0}wP>!{(^i>;dI5Uv33}utFF>r=M@)PkpnXZhgFAF>lmFG%I8n+IzNF
zEwi&ev0DT>H-Z{lxmws)=_sdOT86v^EyhiOuW}$Lxs1_@sIan<J}icMMt`Nf86tr+
z(U|^Kcl*zaU%vYvV;}ScUdBc`;Qz=`ScH_)hQY5jkN(J7USc7zsNp#BZDcaoc|2NW
zlvH?w>Yg!`xSB5sjfOER#29;FN79-UQ!7Ps+5*HD5NorVJA|7D-x$nsZDV_1S~qyi
z<0R&3mto`Vsh*;->ZyleENiluHQ@jAqb@8p8hls7ea3mcI@v6LqlI1p0_&ka!HL5S
z{~up(9th?7#*L3%2}zM9Ly{Jy)y^oDq^MM~WLgNvTCy`kC6!RgQi>wk(nuKDW=e&~
zzKa>_WSwD*8MFTGXLLH}yzlq@{nsDW%skJ1-`910wwn{Y;BX9_p^^O0Mp2{{n>v3{
z+7MUPvOV0M_s%ZiR&d`Jp;lA6yBtIBtYBAgFA0CT6n^l9!3`%M(p|<4!O0EuB4$(w
zOfB*P9?zyWa7ujZ#Na}KwT#G0#_!y!;_&bb&<eZ00eyM;yh*U=GW;zwvxYBI0LQ0w
zA#3#u8M~YLFh>8$wY*@i?;UHC^$hw{BaDmsV)sk`tF1?&{;CmdZUvSR==bwF>cu88
zC4q{+Y+npk90P$EH7b`4|LoL1vWS&i41sRMWh%K{Kzy8kbO0X9E#uI@6DvqT|Aeft
zbxI5?40N7<mWE9bK&oOrBLjtC2u`5&(14R$fm$^+VlkFI8zTG5LqbPNoAKcy>mkPf
zFAV5~={E>3+RN1Qi%_u!Re?@GHF9Rg4Tw(L0BGly@ni@FiT34{X0`v-aivKm;VJ-!
zy6r_ufcs6YO-c`1UM+M#22{bn(eKCsb4C|<xo-yGp0EeE&}i+-?{-&AMpX|XL%Tm>
zL^ZinMJS-sYQIBeN9PKPrLKsLc1_>r>q%Oe58(BJ!ae~V7p5z(toQ+#zdYp#d#I~&
zluAP90abiEhWA0y7WcQK^dHdM01R)12!MYd>Th<V7f8a^vvs?)u(qM!Dl-g;1naM2
z-)SLtKy1#BddIQbbai=l0ovoqr?0|1&Qz4a>!uAMzEx1?eINM0_)5_qrUy91?N*`}
z4K`X+M(+bN%z{!sh+BE!CefyUo;!OvzX`P8xlk~d&0Qa>0Q4IsUx$B3+sqN4fy_yN
za}l&-iBT8nrwrEGG3(U>VP%)y4wcDJ2(kOtuj73TqxVf>GsKGb*1l@rClz&Rsd`K{
z2&h6Zfqh22uVa&=!>1`rrCm_7bseJhtoehOn8c*(|1mGw@DI}e^j*L(`fsEgK$~9e
z=qiDW>0H(qN=<;5MI?+zs}TP&cQ7#e9XP^)wuz${J5Ir%u{z=lzL_uGlV0KqNC3CK
z#Ob`v0{G;Y#Hg!UvU=+4kx8zCPuqf;S_EKAr-S5PE;~fwfj0I)kvZ@LRQ$ugbPq$S
zd-d2)i<W7;wZY=0h$58yw$*F^m9{7*WH>dqHr=gyAJIBDwzQq}x>|bD_FMti`%o_?
z))$b$8y7I~zhoyHU*&hadU55~Uhk}B_YZ$i<Et7lP{Sp*9mIQGR@OqhI&zp5U?rF;
zxpzLHfffX84@qZd`hjX_LXj^NY57?eoh4i$-Fm5uoFT?T?N%K+IC@?%Aodno?<W$|
z#jxW1(3fIhuQMXMtpE|zXrEKlAi)J9TB)G6x*eKgFo<sDTWf~?I}ia|10-Wmmpb?J
z!~|cWs+s^=FThEF45+Pyy^l%Kx^d*D=bt$ME?bX$%oj4mw`x+J7@^<bW=uIdzeOUx
zltd=FA0bKOaS}^IMrcVvbn?NGh>*ZH*UAZ|SH#Q=|1y7JAH{NQz3Wr1cYYu6{+*nl
zcph?w1Aw1|-wgD^MWa)&2ko!EKmH6(F<WGpwkFXUGWo140495RThQZxg;@9D3?TGq
zH$t@qzI;NXbr9>_nff)f>JQv+%!!@!@hKL{=eR*%<ifb<r`3$9osVC-cW`G9Pj(Cj
zm$XD1H&^{ng}ftlWb5n0c1h-GZ3Qm_z_nnL{#UE8++#fhxfUFIC0MEN>^ABqP|HQ5
zN_JK0&t9so+I`VWeBYvHs1@!#F^%aVJDrMob`@Xqx|17vh@5W|y%U3do33}>LOFu1
z{5A+Oo4Z`U0DL^ZHLfo}r`c%oH@L+iBO#?x>SyTi&LO1a`kzb%BEcfe(Zr}X#ASz(
zb)u^fXQwXg8{&MmGPkpi*nt)Y2^Bn4qbT<;$?1|-@`?3@rd3aC2sp(guHP+Ae-TQ;
z|0?;wUugQz9MKGHBRH4-6*uC-5L_pA5jgAaL4pJ*`R+{c<vxufEfI*cOxeik&0ab%
z@N@zTxv|D|$H);E)lC)8*xg;+m4Qk)#FAO4z+0<^XNp~MBI4w72)lf(XE}Hrd4sof
zim6j{=YmfocL=v5wjDr_vK7hTu>TK2onC791g{XuxG(e&$i0<msTD%IP9&`b2e!j^
z=Cxk?VZk@_XZ(;!?y@=5{8vKI)v*Rj-9~8j94ZE2$000eIo!z`V13)moj4MLXzTP)
zjdbJ8iUAx!xut8H*e~5a!#A<Vxx0ykIOTr*%%<53`_n-=*Z_H<k6zL`WpF$C*ysZ=
zuqS4%;m83Uy|cy8#ZL(z{%=zyUx&b76`;1({!(UBJYmNLct7m*_G%H7vEG8dRvfS$
zQb`!2WO{F^V4u<~S(@Y1z`Stdml|yx6z=ViT^%rzfH4N~LPaP*R=h^G?Y(#F>xZo`
z5-wbRtO;tHzCinmd1v^H?M+ln9grD5hJi`+Fle-wyD0!kgFSeZNjoRtONs_Uw{PE*
zYcK*tGS@qTE}H7z)NW-E@j|gMGobV7*LC1LZhLP&VD(Sv$MV?Iyj6O`WRejtgXVA|
z4SfT2a!|G2cb=~uB23qCB)WiVM_uR?#NAv?9=E-|&)y0kN)43bzeG*17%TWr;&jek
zmBI=AG?t%#x>i(|;Xo~sXLxMdb8#u}lw}J#<l5n20DEizF;8#pm0>-f?r(<%oyfg6
z=hlfu9DzT{_U0r_!$!wI(*%yehORa8g^<G*uzA2Vy{tq3#fmgve&8$UwZHJ;gOU+a
zjH&%F?2#9?9I_dOoYq3;#J+zc#vM<2)bDfMLoxFl;P$i|m@iJsZ$RCJ7*}wXD{lZ<
z50H19Kie1ziK*T&{mzt`cwNY<V_$A)0=(+(>b)I4+#zmmm;wkjoHlV7J$I<$_V<x)
z?Rae=n(Va6A<ZisDIM5BJWhli+k#eN1fEg!s9G`GO+<rfv)7ms=w60Lzmm%R5GoD2
z=w?;>-qQfW+|mW*z<9che%r0r{>W@~ejscYh{;(u5r_)r;!RiZMdN3n_W7rtr_I^3
z;qzF4JrtqN*g?DygtC4RSsi<xdBF#k0?^xFd@jz(jM1sMx0&Eb>Y`$OX5dY}PP#e;
zs4K554SP;y%O&rq;e2rWyI1~WV_YW&e)1!i+!_JA=v833uIyejYn>|f1Jc_sKkskF
zeAMH0aQIgclA2nOwd3e1AeVGUNziX1yjEQv;)=<p?pMY};^tu9;=D=Z%tv{cAUC``
zLP4WND^n0S<xc}1D$N?mPM6c?b|pb*B<8z7&SAh)HiI{vz1hMnMmbjWA08KsO#mIc
zh!(7P{fq1mux|bz@0J2ftn{2D!@(YpUX$jFzVdc&&jtpT<i7n3!Lifisl$Bp;HH**
zU!EG;F97I^m@Vr-`}XjgGDHXR@g`>&?+;)+1&iS1f@41Le;N@%?#E@sVHHqw0{M}v
zAkm`U3@71MXAFQv`0GVDEDT+SBX{6--%%oV;Ow&0_ND!}#l`A0^A-lzH6-w~6o(|i
zJ39nw+@|_i8|RjqKT6J*Yao!NiwJx9zv40e%#0GPDn~ke9=qWVF)u9C#8STtu?-C*
zVZ`p^&l5Orn)|y4{l9PFxMI2o@{a(INBuwp;A<|Tfw37VbB4d4_JmYhyKKQWGmQ+}
zY9!I(b3*DLMpmI$<0071@~@C9=+V{iAZH7i8PKcSjH>l;6{Z4TX`Os0hDSa%E=MqQ
zf8^R>aJ+$^TXsp%FX55;`=q$WrG8g~D}csC0`l1L^;>K91J5$BZa`Rp!z-cHR?%i@
zOJ`q1KKrBV1<f1117V1~Q>dz50V32O*~b@hUP|j}+8Nr4cJdxUm?T}dR*|(9-b5v{
zL?dvl?rl?~UZaz-2Cw6HYBLOr{MH1`?<nQhEGXR|KuWH7<4;o!0f@nyXGcczyIY5R
zp<TyP56ca|xdAy}vmX8y+WbFzn8t0AlEA(Z^=UT2r5=fsXx=AHAwS5K7`Gj9vqLnO
zzfow}6^T1nG1)l05|A+p3%C1!C$&P6Kf988!XBg46qgLufvIeL&a(xF3ZaLI0F_7p
zZg|GHb8^o7lam1MZYXmv{|In!xceZP0I>KWFsGL}Z#BckNa1hc(I@2f>XFU<k!Xa2
z^k)u7X~hf$G9fn(9|M-?Y0TzkWalW<z5XHT!2Vs>E(J@zHI}~3g%jkt!%cl7NE8|3
zu7fmm?u4@zeC@Q6Sj?(`6~n0s&`6P<0OsE#E#z&2_{f=9f%$Ifj`N7_VBW<t+$<~g
z(GQ`l4lrU~2xGkZr#eOa+O#VvZ<Xt9u{wy>_>F-;0;ASfoDFMX$JIc8YVs}c4qrG4
z?c;y<C)p=CJMlJXF-r8<QXs|_cMFe;H|RMV-SM$1zZ1l^w8(m6AmKCL!s7a}(&*l6
zjh{FbG1Yr08O7Z+0F^sJ&ioT=ne?khkYI=(mH69&*K5A4fC2NP%-+O&g1>NtJY%YQ
z)63Ebv~CT^nF^U1U6R&aS=<L5gSqW7+h1z_^!`)%{*E#O+9*KSS)}3g&fE2BKuL8m
z6<c4}Jc9$><K8GJvgZHQXJ~YhKd+>d>zA}S9uK<59j}CcNOOC)UuWgBBQs>DN+VkO
ziRH78rU!d@YaP&KeCB)=Fm;yU+!r!^DDo`6ZjCLFU;(k|a=TyhAOcaRYlyt+2mR=H
z6ws_i|2p%QaCk(JN4vcD37Qj6Y9s)jSy!^rZYIBm`P#tm*Gh0s9fw?&?E(?!f<#v<
z#)r-)P67{R5Us=2=teIs*Rc8}ccBEGiK2IsPsz_NU02;OZ1!lua&)Vd=_eP?N*H%F
z=zfB9viyoHkI%mbvIMzN;p3Wh3H%gapf*`mWI6!$FE|ZB_)wzj9cE`dB0O^g8@I8r
z@|#b=3E626RuS%-Fq<P9p%0Lwa{xIypT>4={X3CIweIE(WXM+w{}G9_jOw}G_{BJ^
zk^m-TsXsYY;8Y~q+4T@)s5qN|`U)6EKqqImUVLx49+`o<awoGL=L%Umz;XUg>w_hA
zyT0NMNYl5&5yza%PVZm%?jcqE<(YTWF5`<qlb9}Fq~Qv|nIK?rpG^bD(;uY_EL{um
zde$7e^#j|6vat);d|TY`%w$p^>hsG-|02Hs&;r+&;iLcAh(Lxo&~yeZfL*)`492C|
zNKRRM^Nc#Ic*Cp@X$~W1?813M(<vUADd2jgp-WsiUm(H3sU#rMThgvRa3MtBIQ&hl
zaL`vv!rPsWWr(m-K$QDT8}Kqfid&c3_Q&f6)}!ol@E~87+)zK;yc?)UAi_EPOxnz(
zEn;?ot~0*GIY1Q%%SppI`A8Sz$P-sAiD2%1_1nL;`=l4I=H18h#=OJ2Ia6tsb|nuM
zts;2y&m21Po#qzj>Xk)pe#b1>jV(dhksoe=pZ^*-^rzRHO<VJwIR=;+?sPl*<!s}E
z17O-Wxx4wTf-G{UX1L0<{yzKgfeCci4I=Iq^)DF55O~GNJ}-o;*nze$>>P8gcJ5R^
zD);{H2^g;$bNVmd=p|aEJOMVoWbHM>foY>B96FHfUh|tEWHEG$6f7O2Pp@cu`TcSH
z-ykbM4ZsIF^5>=BJz*N!(QZ6t+!lbZ7Sxe;pKQzUfn3tQtMv$7G7hKu@>&G%en`94
z0ki}c6xZ{h_0zhho4;$}Z!G|f;q30m?swz?YjAEs6`V+5PjzeS3TGIoA5(?_Ij!O;
zNS-1;1Y;~?tkgUMS!>+s&S-N0=EeWkD*gl8P{0|h*^qDq_imuQI}O!z3>(0}NwQ;6
zBL#XH)_F0~#>InwB2$b+j}?4pR#D#gq&y)ZN;tC~gPBeoIN?&VBw*YR>%sO<fW?qf
z)c9d?)jiGry)w|gRI3(WkvmxfWK>j8^ME8l;bN<HhqX;1BsMr$$bu5sX}{!)LYaN-
zgezXKecv=9P((sbltBiVbqat@T<w^AE_f4-O<+Z;hIl(lFwhHcT)m%zuTVn74G6pG
z3W4KiS>Nz~Y{<vjLalf6376a1e1q~H{QT2<+hYLS<)YSCa~Gl{W_s*7XR~qHb|j92
zh(NSFcP8g6NRW(K7IvHkE5~beDG;=|Ze9j>OY}UgVIiXRTyU@cG9;@9qe0*Y4{%<O
zNyyt!s@MVt&sP|}1&Kir7NUdeaKnL?d=ElcY|_IT9VnDYoB9A#EWw4&0q|`@mFhA1
zSASNTre)|yWN1C%O)!_vu0iA^<9L`(C32<Nzzt49M}l^Fka~z$Xn%V6p{ik5LWW82
zpfphjn0VVj`0KuT2&C|>voY;_3hX|A`veR!kSnc$1c*7?SU>yWu=inMZjKQOaunXw
zx`<$7*J3A+>#2dKQ0=j9fiN(SDQM?`-mq~n5u9OVAj5!9NgpeiXQ$IMvUfDFy!xCt
zL()4wp(|FjlmrM7voYw$<?NpKu@kt-L@{@P29^M1GP`U57DOOQ3bqSmnb+NLO9et_
zAQdeI0Q9HWkqY3|t4BG#Z$+(3e37sZS3JZuF<`#W=1wrBVAKULisXa2J5RPERcKw(
z-!dD(XB^A5#OURw@rIQ;Y|`gWKD(H<*wh?m&-wC$d>Ts#)z%}4bQ>KRU=&8@%Z7$3
z&HeQWtt3g&#DwCERr$E8Ml?XymWQ?@>Uqn245C$gnH@6%>{$5MKmAUwInE|rfzx9{
zaCc;7cf|Ew7+*^7t2+LfBg6tjAEao6#cKhM6iZ+P`HxW353c@Bm@T6_(MEJ}9v=l(
zx7ky8SGrBCj9CY4eHvLwfrRP@;^zmY!B^4qIwL1aK^B4~OS}$a+kmB$4%QFS5qAuV
zU4wKnd}wunZouNpbq*JEz!`ei=PGlcqieGEIa710fg3-Q2EG$mrn{ESVf?Ryh87Tr
zVp`4H`4fGtV!XqhHtd19@)1t7M$%EVJY-O`KOzDWv#p12oq&P*4jFP0wRw9trFk|V
zf)bCG^@hmJ4wmj<831VO34pfdeqs4~Kyc&36zn`=yd!X5^ujfNZ}KOg4f&OxdMhzm
z2&TmsubARM9SI$7KGj7of%8&A>I<;vLC@a5w+RUzLC*pzLT3jtkVoAy+3mC>#S^{;
zb2H-O3(JxnKsL)lvCqx|4OeBpJT}LD*gh3qxAAQFQD?B(pGqB&yXzC>!nqmzj!Bc0
zugZC3#G~+G7GID>;HeJz-hHgOx?Wx>yyl-wCmOc`f!n>~Ly5b9uF15F7F{T8J}$JQ
zfj8sO(LcEG=#~`Vr-H?m?3YE?|7R`zcl;gzPs|l>%>bBu>-=g@+^^)#)|(viaZ7Dz
zvkav_peZ;5l1YRvDxvr-GL=L~V_;o4mrJ+DZE$c}Tj!6!H*moxM<XZ-p{B|aA@l4+
zzT&-ZZ`1&k_xis$Y+z52aTZ{;_i$1k5!`iQpzyy0J4)MetuIOj4CAnanf#2a^zF^O
zPB>T9vJCC!K^Ac%i@A|k^b~XI$vCuvjPFUE)f?sB0ff@F^p=Ky_?7RcfixESNzpU%
zoX^m{1c-9UiQO~co)P@s{31WF=JJfdz^_!QGazdEcaV>;-NV^vW9DTVTYdnaL?Sp*
zq7!K`1JyGJZ1d%jEWM<nNDT99U=Cra8LOx6ZwRx~KMzjGyZ@!90YI?b7P6VX)8ex#
zk3j2mERRW<2z1Ex?<c_O{?73=Pty6x3)ZfV1ib$bGBClIH88(=4}daUc9rVN8ht^}
zN#=G;b?zXGo>tff+#V1-25l>dQCn__WDjYkp)`JIs}ti}qQ|d7crBRO(U#yZ=ppl%
zC*QO?TU_+OVg(-ZZ)rJO1yYw^HMBWVY9EmZcNo0J0&EU}#i-TEkj*cl3l+D*ygDOJ
zID{fVS(ub;kc_m7uLiL2_W<z87axjD|0Db(oeyYgkbSMj%=!+Ru)CaU0Uf@w3p4?F
zTEZ3aZLjK1$D?d|`xr_vp!_d^qVItm_pBXGesDojiL`{B86)#j3rNeI2O^x4ptDn{
zr_`1+Y}iR=f7>BO7fJzQx^*)^oB(81_Iv_3Sr$a}f<q;qPcVb6_aB1U7Chx&x+Mj%
z6~BKkpDYIO9U`QCuN_Eja^Upa@PJC*#=&7vVZnO*HLzxR0}jc_B6&{@fIC4IK+j9i
zH}wU)j5px($1cjq@2ctsDJfSLwi>zSEQ8=sw#1rNa7%;?=h#{JO|2I8aZj)3k`WJp
zflEqm_&9h5eK*{^r;VVas=X_T#+pkdB%Vm)b#&e21<1Y}Sk+S;{!1v`&Re*WG~Qpc
zWp@M`tk!3GuzhJ-%qUIp?-e&31xpB0Xz^1#*7Rr`Mq~Ivq_RC4QAXSE0p)PWLTW<6
z*Z`~!Qsq7He0jQZf<OP3;zT$*7^FI?kI$lyCF@5nc(Xr2rA?X;NG-*3mdraFxC0JM
zmcUJdW?wW=U7d0PK9xgYV8`o>IVY!#f^q$*I?C4KEL`Qk#(UtM<WmkH1sL5A*4Xjr
zJY=KKNdG@;8n`H`zEjbIF==m90)C9+OQEl#t=5eG%R^h7{oVtPo#Vi~?D1swc<2mE
zV5RThf{T9!4yeC5dJ(uPGLUH}+JOcd^t_p^fHD;aPrp`G;tQCqv445!{&y!e^ILjj
znu4^X{7N@)LR$Z1zuQP<XP55Waj~5x(6=Q5$;t}MK`h;(ON)V$v_{MlAllG-uBVcU
zO1_AA{x5qypCtx1&Gn$8b6-de{cB)>|DO3d`9aR^R5p(Dtu|jNowxSc$+WKVCERG2
zLy|nFv&Wu7I3i>Ol}Ppi_Gef{NN;nMf3P*a2&A_mtgpdVUMpn302L<FjAeKfl4@4m
zZ__>-9<-1OXrH4Xi@KIsRVP4vD#$RmqC)7SgXJhdV3STCOs*Dq`1c(^@sWSAaA24_
z*Bm-0sTIt<P=+hMRTQaRHr@*ALGdG)HtQocS3<s8c~`|Kl${Snx5$X8&H^7@llWNx
zu!-qP^#iV!2!is#QmX^q3rK1T1<13WGw2kudhPrEIUrXRZOKxhciQf>X6u8dd2s~p
zkj8A*2XB{EDt4jjxMU9l6(Iq3F1t^=O7=N0spS;i6<WT_C&?ELZHh(Eb{4VtI=kej
z+Gf;sBhdNrn>nzc=4ZTxCtCIJKhjF-+_}Glfnh3kfXiIG%3B--I|@8zHV17JW{2x3
zI3ZCscPaj21)P|rTh+QvX$#Qp$pYI|0&rI4`n~<zpYmuRJrj~Z{+<>9#dyjEKy9Fh
z{Q^AY$g+a3{OZHEt%5hCBGfsygw5jUNYcT<+<%g{d`j9lcr=JsGx}<G<coUtd4F7z
zqCHL>d}*>|Vcm;|9HkBse=Ah}18ahhK-h4`m-#fP=>Ytu)g?ZkyQd9`XFC*J=2d_e
zQUziga4Qv56(h?_><1?agR|&~F-`ZI`UMSCG%XsjWr(X(yyz4mj|_cLKHf1A>&^*C
zm7_F}r^#X$cbx=c41VPS^d)2?-x3c918~KT4-kgt-F7Pm9W=CkM!cEerVI6}8;S2t
z?d~YS{zj%Lb!}a9K9LA>(B<TV9wWr^EU56<MbOu5yx3kGA;-q1!f+fkPB%<uPT~yz
zYch^Ol^sYcAX~coGG&Vf@2!Q+XEB3t8qMhYM#BBtOpOK`&oacJ%T?fXhQ25`tm@i8
zOtmh{Z*&RAn{Ccd|46F>AV;o0Si0+kbiCk9qH9M3w;7vDXLru*$^u2;pPs^e9CV0a
z-T{M3HWz5u@{AM&(7(lT;PB#40%%1})9#XYGu?zRg@RQtAtV&!3xwF=7H=ZrjCeX<
zKuZOho|$6s6I0)z*I4%AvDHhNlP)}NL4$-)Hz+`$`hcVMJJSV-bp81`Y~ShNdWjm)
zRqV~?-wO3D`86Qv!F3M{D<Hk%gipmr=u?}fr3o-F!8jXyHGrKATzTc*4bU$+1-0vX
zJ|_`M7q5ad-@3g|G9ta2YoU}Z>DiCrd_Q21kCFff)Ss>q&^6bkL;Jpn9EaS$W0Rm`
z`kDwt-eC34KgdCXDfEg5DaD>N5VNWmc6S1D+JGb)bxVgXvbj&lX3%yijq_x6ahCJ!
zy>4FhczH)^%8v$7)O_055j>nX<Q49!0S!ZQ53-IW-qES~Y1VS&P#5HPE;>fFF@iqy
z;SM4sE9a*s?*>3i+poYljT==)iQjZ#z#ss!GI8t0Jp7;y`mcJY5zKvBBFE<Sl*HRK
zqgpzZBo@<f<z}2dOts%qyBA-{4qA!{fF|rSD8}6q1h-b{MlD+jKxyf*X1{w3aV~5K
zYDnJ}4*^p3ja_j|dj>)5EL9WOSX4u{K9^g-64OCzTtFfuEhZ%Scr=KVx(MmdiZMnI
z<z5OhEk{HfA%7px>45)r^U83c2UjJwoB&ltMC2ErL<KP={~=Mc@~l6V>Lk>KgbG3Q
z3|}{FvHv6(h^S5r#V*0P6Altg2MR!T#)@5^<H8hV3MW8K>%|ke1rD8PW@2EUkci>G
zng|z<dlD&wQ-6|wd}z=aXqjU)bQ@^Xwn%3<<W8CaC=v<q&x2u4X`+0V09vOYz@wR$
z+Z?pzz!o$}PXpAkS1`ierF79dVlfUD#}Yts3Ahtgv;sKIx(>P<LbXT;W(`Rt4IYBS
z?oSBVyx8BlS1o{ZxB~7TabGa3T~q!L^}hK5s%t4-qj&Y=lk1=@xmt4bF6<8~Z&3-3
z@ebqKxE&0(PbKjlJNTUPsq{+`+F4N9l_cq@D|miZEU0-yLu`a}_^-X;t^!i$z?uQS
z$0~ZG^*M+_1BM;YNUUP+fb4pIwEsZTnQ2V~l_rH-3L3emQfF}=k90}v!XRu8=Jwuf
zG>u7<KC4|h@$`2&TPlH$J4dQp68OC=>|j2MOCpFq7$4y`hL9p5^V4O(WE_G#c0tS^
z+n}(j-=$?wg%R&Dzj;_s0G#=_5!w?4qJy9XFFw(e<=dysvt@Vri630*_dsypYf!*y
zr1}sRU*;#v2&4{5Q)<y+sUh_|?vYGQI3$AHxy;IzdG5F-&<`%?0pgJ5D>gvaF9a?l
z0MZQbg`Qd^9G3Ay19BF86BOzE!R`jX&w-sA&0igr+;tKZ{Zy$Eud#0s64)Z_2R+|;
zIxqGKEkB1dSc`Zw=u6r#`7PS`vVzR6lJIt2<G&PEP+m!gcUh}FS}rdadF;F<Q*b)T
z1pju>L6a0KTu5JlmjPi?04=<S$}cL}^n8Qq6&YzZI4Xk;U@iCE;rMqK=%d@k+h_$p
zs6N(ghh19=s=E^X!)9uE=c<+~+i`a!t2la<E(}W3*#NF}^FBs`NEF~dD!T^LhkAxM
zvK9E9i&QYTo|Vfmevm_0>yGm40IMsy-ENb7-fHM!iP~+hyHx_z=U{XLXKzC3@g>G9
zEN^W7pYrwN$zwct@evI`Zjyb}4D>l+zt1^PrM|DJfIzp}&<ocU755?A*x=I=v>dBf
zRWHB7tq;bIdic<IPaS-~RPBDN>rF%$DZT2F-JZfKc!Z<Qu1M%<B?}SLfhCat|1P6O
zz#9W@p84&Kfn=GjizH`y{ru}zva;8XeNU--g?wOVW}$=h%1gaSv_tK(f~oDBy@N=`
z2?=*yfxaIRFUObOg4(wg60`My_#=JwKVhnBP#*_i>GhzBgI1HT=z;RdvQ#)t?{ClQ
zgg+e;jo?p23R@nMQ!bjahOEPn4$LQpc09c|mDSnV*YOa|S)}Jgs~Bc+TZ1pxn}XT)
zzjNmGLRH0UGzZUT@KY*aco02rviBO4(VeGtD0KZPoJ9uMj5u+J)X&Ki%bQD8^U8#~
z^t79Q_e9NP8pqhb-nII5+)sKU<!f8sU-WRh+zPULM>x{ELrA(MEi3@q&5+G_bg34I
zu|Uijl;PPz7m8n&s{bkKpv$|vAQMd72IC(ffFN5Ha-`2z&TulWAud0Y9)9=&`>A&B
zSKGVd)_tD+w%q*Ff#_F&1j(v>dgiy%y|Ee?zMI7N02u8sw1{erY0W>9K~%L2MQrI!
zA)kf-r^NxeLO9m}lm%fsJa=Yk57!X3?OGvN74eaMa+JXS<T$O4T8z;vtMH+Q$wm_H
zZGcM3Ge=b~sRH9U-e(c!Jzmj!m<!*x6)QF42ke&k-*<56;d4iq5;&D0(JDXBpyndI
zzR0=w{hk_ry4&u$qV=f{4{p&I;`%~${D<a*e8&6UIQ)QSe{qCa!-<H1y{7gTW(HY`
z{@tY1u?cj?W+~H+&`|-Reicv6EW`KrP{E+a1twLmisvH(d{J_8o=L0jIq(x6nLPTo
zQTG*4mYhuh1Fu}4JLxK(;0aLqbmLIxU<CefdWH3@SkB7<p7gN+e>zBaTG%WFi`9%-
zrXLx~Frc|+W<i3mzQD6<h!}{w=U1BhZY*$5#cIMbYjC5w@sl-B=kRlvKpNYxm(kMf
z)ETZ>1;9At2rTKzpQPCYmcZ2>fVIgn0LrSV3jtZZ%bF~}ISR!7yI3zJ(=5jtR?8Ru
zlAp}p8U)tOF(@<M<`D!OKhilRN8h`*Oz5IFbm)eOes4%PY5=_}`S_U~ys0+9QB*{5
zu}&@S2QB>x$=V&z^$<`6q=F#68Q^nJq1H-0yxJ0Mop*2H8^N5Y{s`0+X9Hn7RVcJT
zX0HroXM&b{m;#y?0#$5C2n>WR4LZ>9_s;WTg^cg;XO4yQ!_r`n24?u;JF!W?=`kQf
zHe~A1<~!-HQ1gqL|8J5phu^qn)dRoSqi_YImEmf@iv9~YH8r|z&^aY8LWuCzQ~sAq
zWK`)wPulJAyxxj6<4fDG!9bYR_N`Ocbs+LaGaB%|4i5qEyL{=<b{KHf^5cw8LG*>H
zL{IwFD=wg;QscatbNME}ssSd)eiH*ZGWLpby}`hNnkf3ZXU)q2@rNvdc`vWKXxlDr
zJ22xMNj(g8rdj{LY~iwg@6p6bnuGPdVTy=^^8>pr*I;_iPhHA*N%R$ck0Zev%dT$m
z7XFF7Fy3~=fe+Rr7mUz3p!e-v_B<#`%JDB424x1=3n3|BQt#MOvNCj;6L3Zx$JzDT
zZ+o#ZOkw!u`#ljF5EAhvQR6Q=+zui12k@LKzy$u6fLABX-Q595L%Ii~wHjC&;B9v#
zkdW8KFIxowv35)ssG_&RfVv6V(hyOf2{IjHp>-6gb5@SRQA+;mAX<1^_X2cL%pq_$
zg*bbl3smV`%eY){(71e*@%_c^!8TebRf_S>=2n;xaze@5fsIEQ_Dt&{8h9;1INb9`
zlFAV$oWU9r`6UlEwou*lWJWRFSAx#zjGcG@NRvt!Fdyr!Mv>e+EQp8|6mvPf0SQmv
z@{<4>s@v0G#Cw3p_4cs@Os*|)=TQ*>>ZadCzxjCG<ryQ5>ZsOov(o$c&**=kR>>d*
zF^(UoHTwoo_}f2s6*2bkHGcb(1Wo0RfuFW)aR6bxdw$*fSq`3@rJyx9(Sld#W`fa|
zz=_(7vO`=33xHoWcO`*UWDO<xE@M;#`v$;gr5l|JpR!TOvr;w|-hCE3fJ$c8ceBUl
zNoVYWHex{#sz&xJaLwrtaEZe1`o~uw)Q-CrcHeXxH+3h(_@BPbB8jqpKu@>#gL%h*
zrgW~Q2~}gOQe6);hzIZrz(y>7bK94<Q5nYTPy`V^@$l0G_JVniY^@}5sD()l3_Bi9
z@j=Kpfkgwxv7CZ8X?g)ijX86+xm42Pf#5;^e$CDb1ZAtDb)0Kokv8?Uxno{6eWKg+
zc=yaH+vlgW*>ReAWS%s}TIfIJT890*Ttj2+wh`#1-Eo1{9|ZMU%~IjxwJ*^dCv<V(
ztNYfv)F#t~96|lD=*3IgD-9C{rwM6n`PPkwuv)rwE<A*5)9I3&*7HtBa1`eYs)j9!
zbCvcfJ}l|TEkUl|^&=^x*Mhmp$>{FuvM>)GJKf{}hsa}^Pma?E^uPNBxR6$_Io;`6
zjzTV}6LM67I~8s)aqOh2j`+&q6O$*%OBL7BfL`xnL_@Ng?oBCvMZE#8m0N~KL1&me
zrm7AFmW42Dbzy6&z`psHm7-~>1MUHKCmc8bWsk<o6O!Nna4X0sr8}e{dP<3~FhZ>L
z8Q#ENc)hyM>qP`%foISxY@Cm)7%xI~BNo|P7-W)DK%u}xyg&s1vfVx1<n;`4U*<c5
z&_aQe2SG$yJaf-$S8@7sBe$`c&mRW&_HEtA_xf$F6ZC-ryXZQ$`BybdCum^^Gpv0A
z(~T-C)n8U^Dy-5vsW{jNaMgZ}UjtRFUv5K0G-5jAL{@CyB3;^{h?U+>c(Gac9r35x
zMd<!PL7qZy_(QPGudo|Ug>HX)114uvaM5F{^Ql7=ZKdtb!Q<x+>TXAhhVd9Kb3U+5
zz5sa!as-f82F>W!$Qw8QltM~zX&f3{iwhpc$E@px*Z+D=ekur9a#8jHrtt9Yna9KL
zMJym)%vGifEADBgwwXJC2})aL?&9HzwR-`9x0-)fI#8ZKB!omAHM)F7k#M5G^9yO{
z04Z4UXP(HhSC8`E!Yy-OJ?Q5|2Y|JtjHAPoWCX4w@Sp(8&mwQg645Q<-@q}_dI*wQ
zS%S+7!DN{{7J3yF`r?Q#aD|RJHwheQ(OL>#ZyW#C4S-ybkk_j&f}5}S&;Y-scvPpb
zbu~M+V247_pp5UN1YMgfo<l={D<ZH&TnadkvwRDWxha2JGo{(M!+_pmuKP;pVYnUc
z^M<!?!EbOgD_DgTeH_&VKJ07~xR>`C!1chNL2*2`HoNM^po8eidG-}UkSqTx%5VjR
zPz;!(z!%<Ru^tDfHRs#G5Nn5P9;BJ-gVdiZFy05tP>V}iK!v%APH*px6Wa9}u<l#i
z*ryH8n;E1|fk1rpZjJjhNHXK6$lcE`2dG&>6<|X?#2kf2H$6UL3ds~IfiO(u(R3S8
z3UnyuFJp^=*hby({3;^}4=^<^qC^5<7yi})L`dYvM(7iyTLig_H*t#@IJ@GOc$Xb`
zq>SWM&>$Yt)Fn!n&gjF8`Q|%>3Fi%?bVp6{Tp(fYV`!%|uPwDR^WB&2>cwm)>Ucj8
zRf0zVCe7{T=C7ELj2FE*ST!vMbr1wD6sm%AT@-S&f`RD+h_YI(SF%+AS?>A%fiNJL
zQf%y@Tkx9Ym1s-aXObpY_X})!c~*87uHOv5bbNB$7X~)-yIW_kYrNQVY;AnQyek%U
zc?qtA<~PpiGIgD=pgP%~thV#+Jqud{BuFvzgkXrT<KUwh70YkA1sqc2RQj04&)We*
zgFw=Uo(tx7$bAxE6c8%T8V{9I9m2%zSwwS0MH=`ioAqF$Wb6)~zoQ>Z-c1{!pZ(L2
zQ?x-hz;9NbhPAh_U0@2g`OwE<FkAlWfd4fP-tj(Dhy5>$p+W*+wuX7s*^;|bcn9vh
zPbZy2B=^u3A9cNTGai0L>X7C%@HVG#;8k3qNogcc;EWuh2RRTzDgty`>#yT1@Ah99
z8+TiqE^Bas@#!gWV(?Q!<|d$F6r%M!--3~GqgRGj@Znd|VgN4sA^?MKekq%0=Qi)l
z{J%;!+vkS|l}+Xz{9v?%$@8igU=Yns3{8S-DhY->?q`7%O?2~W?j3L}-<^Lg!j0T_
z8unY4eHUf(q-96NTjU`MT=qXm9O(0Us#jeTh(S%9b)`tcpjK8LHvt4C5)?QjdPy$}
zLqikemR+?hfpTzrO)>K95I3uXmZfv^Rpy<#5}6h8L3R56+_rEUCHlFIW*ofe8+mD%
zGie6rye+5N$af&C$X5O&0%0WB3gtS=tWC28|H7^W%`PnGzE75XQ+gdLgxRy~1rb_g
zJSt#GG3&&WD7Nhjyg(VZH91$)WPDEvdir6=Xs4^#NFZwb^Jzq2*!a!zB_ETI?1Apf
zXKBI1`;&9c9mCJPfNJR6Gs}YaaikyE@V}O*17zOlJkC-1ZA0@+zNX3KX@71;IPHsh
zUlA7j15G5)o`y3jnsarlNaQX~zg2-*gY^-LOJ58_CHU*pEbqQ_&A3^~H(&#4=NTgC
zhyD9!(rvKe!|%q(kS0D_fPt8t-#cj`jXQMV+Bjprq<8is8Rg%<A>EeDret?in6T-Y
zVIM!Y!u`1q%E#y1C+E+-p}Ka|t1pI9qgdPn0|6vb=Z3)WQ&rSVG{ze@6*IJ8Q3Ng_
zfe|zjjLWnfYIbM6dUQturaEXBH)^qp*)cG=*o+2$-v?3PjqA^pJtH?9`u#PK%4)V{
zQ^1YCx;;-8eZU2<Hg}h_0?z}n?F~DG0B<mWUSHE-DA)%LWU9$sX^Yrw?uRW?wJrCX
z=;|#m*Edj;pPwYq3gXXNv!03NQ<JCTiz<h<+G3DcnHA`TZ_+u4un{q!hkHK6-SG?E
zg+SddAIis^V>KPQZTk+RGs*-na2)hCoN;)i&yvBRq@>yg^t|1qjI_#4*JCVs!V+T)
zePxE^L<^uPp%=Ob?OsXYbqN$-n!k0}LuR?A@m(#~3IPg<%q?TaBDhmyQ|nt%$Ux4m
z4y@74rG|91f`LtL{d5HDT0=S-MJ43wayn}}$v9e#p7o(5Oz7vclbSd(e21<|;i3(W
zDL?6tp1b7n4bAI_&LxG_WOk}!KKr~tGe<D?+)C0QD;ePR6c+hxV3^KZ=Ye}yqC2(O
zb$dJ2&Am(E9tg^h?j1ZO4-C78o@dMbRKT@UXI8PNuhE2>%dLz#<=Z>&WsaZ|yghVb
zPV~6=93E)~Zql;~pCUMbpfy(?37@h>tQ~9j{?3j`t^)6wbzw^ovr7|kh~q<`?$0dd
zCKG}xLPl67muP5myGmACXia94s*(qf@!mF%WK7LZy5U6alFs2x6~NCYZ<$uCy?SJO
ztsidj)TBcE$IEBll$KD-y8uf%hw-t+aATx%3{9kA1el!@<pJh&Gy2<=)`=Y)-dr-F
zSh#O<tjA8nf;7%;v3!rFbi14WzB3pDj~#ZNUyE;4&&)}mYc3mK=|5cOd+WOw5`6-b
zkW{PWQ(;!coPiq=lfTd2GBHjskn{o*p*0bgws=CCiwH4Pfew?cMj!ew-P3GPrm|nT
zhSXH>I=AHeFk31*Q?-8{Uj6PtDdW4)<m2YBt?s>e9UKl^p;xWl?Bg*mjhmU6bhl+}
zxc!bZnNO%<V>~`~(ZWBMkUG&p^;qE;+IAf312Ykc*8Qwwqy^Hz3H0Yvogb>XGN0J*
z7gI5z>C7=grQHR_FlQt|hEtll8Zn3QK4~4K)tq%-7e`K*Byrn$-R2^&FdWM+{w%MZ
zM_DVErZ)4rik|PoAYtBLJsrWLqiaVxmttylJrDMgabsqa@@Tqoz!|(~0MDU%acGi-
z<6LWy^^5EJPLse?9p-TRJtI^$HlV{=(G^Bja1V0zjLoDNYSB9RL*Ei&e!yBqgnQmY
zSHNkh+<~aDol`0!f}_+lJGa`nRdB^-nlFe`c)27lZ@Owl<%YwF2-M`fv*Tyv+Ee1+
zGd3MqyuC@a=$1tOgN(90JIjU${%fBoxQZq(-D}#i>i(9SnHg(b$2E%#;ye$mS5>=Y
zS@-#|@O;rDQ}IaC2o~!M;oWTBY+kwlY(dC{f$%t!>&Ssgn`~=b=v0{Xi?I`hgxlPZ
z8(9rL=+)dYUengdOQ~AyikT*OCBZ$a!PQutN9lLiA2u(73g~;ZizbPgZHP%9L{Hat
zZ^lRys3pEk!#8@7o*TS^LiVy5=-DVFPo($F>P9@T-F#*RxyL6ta&&8(23G4P6;maz
z<2h-w>8N^xF~OkMJ(h||7b78cwS$ell5K0;&8II3bFw^qQj#4p-!oQzsOi$a<?}-C
z$5U5C`Sd#tUvA@)V(l&N$$iXH)NTQELy%WLGj=yc{)sv4rIA+MSEY$dyD#i!oB3RJ
zKr9%S+zkqkXq|CNS}Q(E6DTvg`1Woz!;eTPH$n?_mSeOpTbPD?kJrDxF^t<G^xUfJ
z!o=tZ{b+_zb@<@%6hHFHC)1aor!&w)>Zq~dtwK2V;62|~bYoOH$NSx>q|4=IZi<>O
zj#enblqqO>jJcZ`JNng#)ZqT5j}&^~=O~<R#JOl367`*1)eM)i3D}<PzRK+9BT76x
zbZ;ejhtF+o9!2#0P*Ayv_?#>cXB<4)5@vGk=U{y<7r_}$+O$Vi-8z^%m=nK)%B=~w
zrH%7IkQ?T0z_AmuBaB_S@LI*FchA;Xw9BWZ(F0^<1~q|q>2CJ1=cv!lDaAEi6dGY*
z{9C=Mffy$nj`%upqd(Ckh<GTd_Q?ezHJPnpA?=&!vbuuyAd?;?UFAOPD=6PJrpZ-i
zvtG;6d-a!wtRmn8dfL;u=%d8=q%2X;-UeSbc%Y)%Oenpo8N6FdZ!9MDGw1#Nu13;*
z6-BnX%kFpXqgR4zVo)cHR)y%w*yA>v%+h<m4%)=r!>)2%>?<I?FF-!OAuWDlO83U4
zr963YcJ^&4I-SC4DS)v96Kv4*W(pyE=p-n-@ZojN62sYa1bck9Z=+09j-VLlI;Gi~
zYgYGl;tDx!6@r<4C4?<W@Va94Ej+hU-nWI9k2d*a$Vi?TL09<*5-o@3rO-Ipz%UKR
zMGSdfiW}p>W~Rs8x`*-W5SaI)Tf_BRBpC8vY=pS9_GpXwL&X*bJ$u+42oUb`rCofd
zF~=?CyShYJ&mM!%eP>0P<Dt^)71<46KCyHO?V7`N^AGeWyzvS;eI-}qTAF-%NYJqO
zmU^4VA{b;74`CfT<x50<n8jK@AK$=kxY4IpQG>Nkaca|7L9VZRiM&yUlW!aq08i~x
z-yYP0M@{CC^X~rpw-8ft`6sWcMlS^Di6<6J*tCk<-4sG=o$QLU6=uu$ZxCllAF1?G
z4HTv*3aH)1(j2PiMS|G(<Q5lnA59TnTNBAwZXJ|CeHbO;gqws~2<XL!g9dTTbwtFz
zIkyOEl&tCFEQeNl%9Kju0p1dtw^$uKZF0AJEo1Jf&s4!!j=WSOnq7j8y%!c1D`AE9
zKx#&`;`gkUW+7(rx<Sdw(G1>9=$j?|GjoTf(k-O8@dQGe2RWvi_x@JGKA{6n5eSA~
z8D(Fj>>K8a_sRDR1%d{vlOB|A#81?oh?K4lu1oL}V|G=%p+ARxBhP(W2pt~1@c20|
z(&EFcm~;w^+!N@ETiH@y-E8GM7%Fw#DO7}OpQ>_dv{{ov_lHdznTX;Ex1TyjEv#UN
z>$UB(G5nr-o(P|OWlp-ZLQ{fy`)7@r?o{^|A^O|7rd7AKcBrWc6po+OwlEO&47tYh
zezEh51gjvVSR!8~Jn}wU@?f3hHWi|_(O8_vn~_@O-PexeajLVz#0?_F^GCmAiU#%Y
z&dX@e2ToRKYUW=$aQWn(Fl|4);W;95wb%lZ{j%TUnK%n>xpZ6B6#GV(^6Swcder+b
zdPIscNzo4a$C2ox>H<w6yi`i*aiO~;@^+dqGb|qdp5;+1%$69oiWn%>j-aV!Zo3m>
zf3kZFt?h_LhKKS#=U3kil+hdUV*NTy6=Bzw*QHw%<3At2dsHYL504SL;Ii+bEzzgt
zMD6A?E<@aJ63X2R<Coqm(Bo?4?6yhJ1ILGC7`CvGXQs{G9}k~~M;HnP6+|333J?Js
z-e$Qa39DZ?BnR$a_z-8Z@8~6ECrUhtedVq^H8r^ZbeY??pQF*ZZ*751dU+Uclf|^H
zIfZDaPF|jpoTfg9?K=K8%R5R;V_1Y2<nU=rPO}q*X05XC4bgtJ_9%T2JL{eP1@G}5
zu}UK@n#ZF|-(MezJDzUjO=c_}jnx`)D$)p>PpLZT8Kj1rA_ohj=4(SA!<~rQ4O4-e
z29J>$CY_wrqm`TS*@U9(_Uhu!80_)S+*8e0+s9vj=EY-Dli8H+a0&LhUq7XlpS<;A
zzT4AxU(JG9>G7#7Drh(Ebs-^^no!C0kRSHH{(WJE#rsbW@&vg~yJUw=KP6}hMX{u}
z#&mDFv1#)TDn*R_m2r1P-Gsu%RTily74tG)9z4TgpP)|t>}syryKz#+T8y|~(24uy
zgGE2SNy58dlRVb!$JyF}hRrW<Ru^NmlayVCI=Q=5SwCaEqX-xDF$>1{;IQe@trnjU
z^26DzFz#VoYUYa{OLG*otpSPPV`<NtU{un3jMrQwhosl47zoJikU3nozVUg<Dl236
zq7Pa%Ysg;-J_uqJN6dXr>?ZnHC6TCFBBWP_o7AS~AD&j_v4$TBhQAP29QNYOo-bQ-
z&Zy4=vwv1Y`<OjUg+8wP^7#fM&vc}2=+O81)JN<3M`U1ZQrzMECv)pO9(i@&+2o*&
z;szrw@wzkZ+1K#sPx}Kc)%B^l71g5E=*dq_Y^#(-=9l2r&oAF+Ti6Jo*rd>efG`F3
zv{tZ<kGx3ZG3=eZc!O<vq-%YTLN|->9NpNUQcG6_Uq1H{`DWX~7V;<M+YK`;W@{jq
z)%3aqc?##KnLUlzT~7_nlBEx>K;1~FPRxJwK*xB^s>|ObJIYYpQvYaU_6Acq?M{wN
z(U$jL3w);JK`u8!x~d4pHCeEHz1muWNE6U`5GqqSJm-2bU-L(HicvG~JxzPl4Ck(>
zsx%t+ip2~WdZj?h=B2doq|tNq!n&3{@#)3sp}T!@u{tZ}0$(M>_X}Nh^v5hdL9NW_
zgd=9UBhhN|7z%o1#&T%7J^uP%@w%5tUTdS~LQQ7gdKB-uhN@L5&rf*nH;y@j$HwWs
ztOkfccyKuTLRsOtrerL&Vgc81WMZ-3TLj6(7jLR1B<ih4llud#%Y~dbabm0J1wM!B
zv2MKvjQL>ZHm+_{`1+ld?02tS5##~#F*xE9JcUzrv)VWU{jP!FgoVAs`6+0H=plZL
z7YIlb0?mU6G8M1X_r@WJk{V+8UwxWGvIqt|#b9oKAE!GDi^w*V!`$qR*?+d*<uVNS
z5p}@*ypw$UBpHt8;6(86Cc_sw`NR=KrQA-=_f{)*&{`Nq<e}cyeMKx)_^FM`Imqkn
z8_Q6G>MPySi)*$MZ*u}HV8)2v+7_8m@NbqH4vtjK?+QGgj{^>b{vl~UmA2|y>x$;;
zzjkV!p9@+uOg;z?Yd^&3+!0fhFrTNq#o8!yRz2k$n*9YS##QUAkN18q-Mw>t6dEyh
zQqx=_FD_D==re31Lc#vfjhJ~U7NfS?eI1@q`tFj^HP}f9#OrHtSqiow=6Z{;Ft_xY
zAkS?$7iOeEtiPsxtWVT?$uq5`*^dPet(36#$~ei3tZS#6wVcyCf6)6Rdx4M`lmqUc
zYPdo3j~RM6VW{E7W6B^Nk^C^#sB7+TN{>WD>Xl*F2%WFIvEli3rVEAEE_KK3O|MJp
zHUHkH7X`^S0feRj0bjzgG74^dl5l8R<mUul9p-pXsLPs1g<ooI`%Ja$9<5ryU7w{<
zq~U14w)y77IKy9(#$u*(U#7DhHoFVH`|^pG-Nd!|NH!cr<Jc<I?3$?;p>#7v5xj)p
z&XAxNSR1qy12M-zB&x&P=#1udSfht$7$hkH+tZV<qhDSKevrqsRg)%RL?Tbqb|99C
zT7T7ci54rdiQ-eL8?+5(Elu3PbG&OVxy35#ZUiE`!4)A)sJi@)8TfowM&bzE62<kc
zHS?X*j5F0204K-jc+{Ohg)qvG*$v{$Pv{Ft`8`X@_lpuM{iUBNJFdP0kKqPBviS1K
zz3cJ*b8-^rOr(+rJ|0rA`AlK8xCCnNzS-^>dp5qtp{YW#I{foKz3Xj3+s)FBv?L!C
zME92k>@1;4+_x~s()>2ad&CLnPy0NDCr5w1rIj>yF_Git!PKK^65+<ioZ&~WkE+H4
z3t49B#gRKsF6az_tw}a$rTB-fu&o~>ZXC64)h<5+&%-!Sf2I>A8&k~%eksG&_f5K>
zU7lnG!Ck}1_Bc^|VY7Qg6-<eVX6kn<e8L?kFnWJj7{I`mQA;B<zmWMEsoJh)<2xVD
zYwJBn(QdbsC#*_N=UBN8MxQ`!&<YVw_VeDT#7MrE{*yN&qKo(8a?g`i)93mtSAFx@
zyYu6@huFG}?fZ{9jBC2<@y==Qzhx^miN5~BxG6o$a27c>4SQH2z+j*jatXcC?{?B=
zyXTO4%=KXl+1;PeVO+1KO3if=GwW`Tnhr!UEEX{j;%@I@eZZtmjlzfvarK7D8(?N8
znXR?DpO<tSwFN>CT$&2`^%ODJc$G1Y{yA*0p;pDFmr%M{ac?j_5==YoVaEsb<BJ~n
zmm%D$YZ}JBrpnF6o5V_pgL>tVNV3KgbTw!KNk&3|XG7!(GE&D`%sM^FkmmF|{W;qU
zBv?z<e%rUGHFAjJu8Fnj(fxk<hZJGVg<FO)aRVF18yzk^F;~g|4BOQfAqv}kCS8bU
zI9eBF68cFRWxU<JpLA>lsi6-$&6&lfhUVxYIJheZb{{7grDOcZen@ZHFW~5gv*;Ia
zyoPQ6iCWOcrFP1*B{*^K2E=hy0RmyedRUtft9~D9QJN6m*7?z?BOG6Z!<}0!ZO-&J
zlQ7@(ERhDdZiC%RixK3|%t?`C#lG}v6Lm2jXZk~w`zF|CPjufDQu2d}<ApVk4aGnh
zlU%tsSDho#XE7bTvgU2{xtih&P6NrhWKq2J&tMs2I69ksh^Nj&-8wh88qYIp*Te^M
zZ@BJfp<YnI6WbARc43GMJ=XF%vTv@WY6*?1)?n(zajf5H$@bzrWNK{8yT5w5rYw1?
zI_r<Zu(BamelbLQtas$q!Rp4Rh~@(AbNb`!I2Z0kFQkVvA6Z;FFcRn>a>4b%KIfS3
z6?ZejZ3mxp$@>13&|6P>`7=>iHHkK*cmU>(!db}44!qhv?W%fweRV8j0=?TDsTPaE
zFp!R|25F)ZA6y=e{z#gGalg{H4p$fZue;-EsM)Z0%LRl_uwc^efz3OYV$>W}wr&bs
zRo3=4TI<rn9oOCc0Vhr+T_~l^2Yx?*lVV?~2sV0OUnSHSy_gQ;EvD%vw~KzuNawA;
zg~o8$r-*9_8A0dmp7nKESG-Fy_xbTC=QHP4==s$}DR&;J$RX3*D^W5YAr+dVBEsx@
zmp6_QFv;y3M_udJZ;T%ENvYVrv39WMSo3vjYZKaoy=axKz9U+lmkQnL?MYK={(=<v
zAk(L*GO-@_^WMp`b9U;%yB2qejLT{79mP3(A<|$$iM+XRd&b;-jzj`G#9w&?R(545
zuX=v1#m>s^_^=X-=T&vY8->#)nNw-U+oU&F2Z(D5FOuc;jopgVucpY?jJ(hcI)xZC
ziQ^frUYZ;wMoKo%)b_f<By3e3)T+7rcTF8w_kg-zGd56LC;P^lht91HJ)!FQt$~}o
zHhqRM$JBT$8MOgdk9I#V=@<z9bdN-%rhCZ8efF0yA6m@vxVXeri?LFi3ASb#D()Rx
z6oeNQZ*C@ZbxE7Kah{En<lRogeD{2P?e?9Doda)b1w(d!;)6lr9+75hcYy*E2(t()
zTbb7V@`TJ3*?^rC(qUH8TT57_Whd(CZFQmqd=T+5El`7aiSl!6VbFwqPhsn7K_x}T
zl^{FkPo>ipS0cwd%Hx%d8o5gHgPt#92I-QU4h~+phe_4ju=-1kz|}ZWyF*{f`;x+>
zLcIu21Z0;4xpyoN2GEAA<fRt$%i#3KgC1!(%qT_LY+X7--hJ^_xPjLCuF>ujho2KA
z9wS2E4e?&)Yh2_sO;tTzU<AJ2be6~r4j7cWF>rINFLcH->Z4I?gyF7TUttHX3;Wtv
zb8~M?Ys2(BdKJrjI!8F|TZETjJhezflJ#*sVIS^mFt>F7SuxWQBdtp=uS!uV^(y3h
zceiX20d;&yRP#{Fcd4lTn&gSWt7IzN7>_er6Dxa|y>d?)mD>Nfg?r$hp)|w#G>!LK
zMRs;AaUCc4w&@!GU2=FrqO!AsZsWbh_3O{~$kHzh9FPs}HM~Q7rMDsMuuVn~W9ina
zbu+aROLIDr$_svY_=B()?D+k`%>FGVh*f3ABR%y)K7BRe^Y?i{EL%hvfRQXZxd+^%
zlX3f&9_4fWTw(E2L>bZUor?ZRQGHCcV09OF8wZ5vDW1&K#`Ui<sD&x-S}J8^DY|n9
zq79*+bL}<?yzj4v$D5CzDew(DdBG%9QD6TkZt~7o-|0)Tl{?g#i_~<@^bon7RUsyg
zWmi=^SG!A{o!I_b{qibFt>X-wL~y@h<*(hU6zu$go;{)~-;=3QVsJgrHOdGMjcY|u
zJ)(l>E_c0q4<>%X(35jod;2QCNu)AqhGF&7)itHGz0~B8r5m=}^9B3)p74Wf)bI}C
z-1)_?g+mJA&M<JA36*9VJa|`DkltS2c2X>S67w{E+iPb<9g2=jH6v+AQd>o?-FRv1
z?8Pqa%O_-gFi|LRwrpqO0{UTJv&wwMN|xQ^y06!Gt1{~t8*XVCoZ0<?O2%povDE%Q
zs@^;t%CHR^f5wFDm5{`UB2g3(VU(m&R4Q8;Yqo?+2s0z0l5AzkGFnjCciCo;Jw_Bl
z#=eHJ&Y1OgPw)GF-}n2cj-xs{9?x^%=XGA^dEVFk43~v_+*3!UuZ;*T>)r9Ifnkrd
zyN^yd;!0N$*Tf(0KZy959n<roY{^LOGUcfp!l<PCX{qxSiaNE97{bneH6m~aJ#&CM
zIYe=np_;Lp!>5k%;1*iznp@-z7bE1JqLK9Klz4Ocj&C2}`VYuU<Qd{VxUuOzRE#s0
z3uCJm&r3!OCafGVxn(rdsOO=ME*Uj=t}`Y1tSR{L;F};WjOvTNsDN#(Lx1)t1p3^e
z{wR=`NP2ci%}V;^o)_Fy8>a$Mvcxxm9q8%YoU!-pB&oYXOWUapO7zBlq;H}5_EYUw
zJ>*dII1zqNyZvoVguTH(YfmO$8rjVJg2f#AElpu^S|uP6&29r%w2h>@5ngc#@vt0C
zTk#~Jl=M(P<~os_Gqi8;xA1wJTB?!v$OYa8B%<F$OYMnw?K2h@LlE{F!LkdB_fVc4
zgIIOm86Q;OFidCRAJ`Qs5tEZvUtAZoc95fM@(?i0dz~vcJefcST68J4&1UguI<WsD
zryEWo*QyU3l-<2jid|!mxyn;AMvM4Iz2ce@L&6Tc3<<lpJhS$jo0lEZcNT3SMmlLv
zTNrB~%FJzi!!-87#V=fHi&pQFCmYZCK`h?`IBBVHDxKMdTY6HF>L+yT5v9lOqOQ+!
z+UQV=yt{D5T_3$0zxza*8beh!8(mw*4u>Ew;-8(M51W4#Fu*rO+$i=OHu%{m@-?d>
z@Qkh9eevXh9XpNA{23Ueacj)abI~kve_xUL`K(KT8obt`RZnC+IJ!^AQ}N_xH{X;n
zm*KAEB6gGcW(0z<TK+P&wmUk43DNbILc8g4L!@Qd8_T>(AD=2|&Ne+ij{T8zJHq-S
zyW4;yX$UEvH)9cLgwZAg<9^Re=sU>5FBDo)lp39NgO7wu3s+sAE6{xUp({@}yuYA#
zZ*2UnT4dr-yd!s}C{v2z6<)D%YHihu{2_TQK86XDPo=gQ$^}eqzo}XkONlymc};I5
zKK)Z3%F^mR5#W4c>sKMWTW@yjwK_-^c-kNZq7M(!emqBB&1-AqxzTpVO)i3LC}WN6
zDiRz0)vszwpp332k*teo7dEbw#!iKI+@Jfk7KdA`_`{#|w@&)fa6rl=3LzX4A3Y*{
zwDyi|@vFqTI)%O8pgoTk2|RsrPLXvPv^?w+i6iT)Ol)B2DVxGk9PTd)O*iBl#RaqH
zM=s!p?$Cq(mj&Sc&GdCW7W(a7n<9A`$j#%{+sPsi5(%>tQoIksH+H6V)YB<5YZF{7
zqwz%;M%%+@wWP5Fm9U#HwXV0kaLB`UscAnsIdo(@9v^t&+JWv1j}QbzhoYtpk8k0g
zn+XF$G^;HS*N-G4p8(5-_MW%p=pq>A{_Y)3XVWzg^-gBwc?(WHp2t()m38GoU*UFL
zHDc5gEd*#(mia|$*$jQsbEEi(eY?z1{p&v!%i7ywg4ejy9``s=o4K{z5`<g^s`fx1
z&KnEzdj0+!be1O}<9R_~=Dfysh!r8E?w6S{dhC;9JuBBNsV?%t0J49Bn;k5|pf!gb
z#$9=pe%jJCpKqb^7-TNe;UgRA1ATw&>N_g#X`lAt5L0J$^eU`lc_iujT7(7;Lwhx(
zU>YK?xEQmWCiT=bSrf)0;+FT0qQ9T@WC}`r+s5FH;T;0S{<epdf%}5Q=1;u1Cv!Vh
zwCvfFdkG1{Ck4F@_{Q#MCtdM0|7hUq=(GclB}ptV<JPG&o@`q^;gP^~nYPdR;aN34
z)m-et@Vp$@=%5y=`&*hVpPx#%-&M6aN@eJyFx6TwYmyrMlz9G=f>b}|6)2FAW83!t
zl3lMReeBQZvs@=T!p~2ej+kcd)K$}L+T2$oGPXYB$+|W76LDKWAQ5@T`3Q31-8`Rv
zw-;42Uff&f@1S6uXt2dz{Dw&*OdGdT?7VUHTGgxKy91@#bIX{;@vGD>-12-GBSmw6
z+j2|yx-`leCGi;re#{;5eYtr!fwsp#%VB5BHq;;c_&m94gA|QEJVetL{tzj?i>mnI
zWe|h87a5=MqEdlX*SbMJ{3dwCaOvG(Jmruv|5FtmjVt|<jSpq^6V|rOw&oFWb?p37
zX8FWpsFG-l9kaTBcs*w|=PQC$;+jk^IrXr8q20rJz5164yPc0=$p6hZnElm}@Mbfm
zRQhqj)Kz%ChP%7OZ2h~5yqHhVb+H)Jc-tK1B-bq!v2ex3(VO0}I2!0I?JX_`!@H6l
z<9v4TW9CulM!$t_Zsp;jq057HI|i59vP9BN#|-g?e@$w_Mw2bNp7`0W&wSG!y?Ehp
zh{X4gFn0RpV8~rbBCWIU<>%QNA{XWmW4f=e0H<Q4clb6GwAZq6yR%JCzhQPc8oeHw
zU+&SPy7TH^4e^vIOU!P5kFJ_OwYygL_pZf@cr=Z{oZA8-)FJUBx3hO|K6uA>%B$B;
zd}iU|FiaM^p$0~6!wMZY2aWK{feTVsxi=p^ja@EmbLI_8_~`PO5#r^YnCVYj{`~5U
z_h@vHGi?VidF#Tdr4o&+3%cFC8x(zqBC!syyBl#w#>jepgg-B{mpi?EBe}pcm!vbh
z-DgaqgC>NvMNkCP+O6PI+P6l?gTIUogNW5$8;_}DD3vhgEq})l%qKa_jo-)5G2bfi
z@~|4mUl&2Ffxw=Z(bx?W5nh8L4EAJnD#FS-e#YzV@&)`z1CtL>gpeyFbuhp80}$=U
z4|=2tz*g00j>5Q4UiH~yodN00Hy`3|G0@-W^fhrz({eIJri6Fj@y>nszxvNreUu`E
zNA>UpA(+B9TD#A-y3oQzOe4T?Pt_@{9f9?!^qU9mX-7+$InDJgX2TL_TEr>(@fiZU
z)+<1M9{tdW&CxqYW?Eh7p3U|2SC8cxn?%Z-;_fBna~*?HsAjAy!dxG%A5`hhhV^Oe
ziP9PWwSL=h7SHJVOwPo0J`}$?tjIf;|GIV6AQo@Mi+j9~eu%XaKZ2#~s`9M7Q{TRE
zVK0H2M`ufuwG~Z&OCC+BJ{#O9D?kimS5Tz4^*$OYS6yE7N)ka<`Ph;IOrI9rK0?!T
zrak@GgMWSxRnCJBppTDyuH&Y5l-m7z98H-hpUwy(C-IHlCI90qu`h${u0;p1H1*}n
zJUI#{P`Wl!9sK2;S29WO%oriydfv;eEqC1BB3tjwO*r<>q~}+mkEI3;%b4cYkz<)-
z%~mF&*&$I{yzCiv@3F35R5SfMB9&z1%wflxT9O3o4ral(hCteH?)OxkwP8JD?*F%K
za~vIHF8%$hSEgnS%D6?k#zU^<jn*Grw#e=}`7P$a>bzHKiJ+$Llz0|#ZbES>{%Heh
zE0NyOko_&-ws*75Rh{v7tSakW`yQ_OSlHrDqL;t9UD408z)0gePf`=j5Ys9sxsKZ+
zbhnM^1=+@PVJ5Uix&R{J`)`;x)wUo^02#QOF&)lbI5yX5y)%HS&#sPNe(*4@y7%wX
zxq=AbGAFH;lh}N{k3vND9dApfB<%vXPv8q1`@&n3Z~2k#Q%6%2bZ$Rt{t<8AXXp_(
z9-?V=lFHsP7LNE+{vhWWX3)Nx{s4M?UiIT;{5}R|;|SgItAY_r;Z=lsL2BC5t(=;T
z??1R<v6Zr5hH|d%{tz})tf5ULHD?d=6z&p<oZ|;VvzsUL@Z3!FqdQ5>fZYGWx))l#
zZ@Zd6y6sy~0+)qtx=6!af+)o1_=hUg84VY7Q8i?8c&mB`u@}ikyfT%89j$GadD~V$
zD`8r6O3Z1T;;Qo6vRl3xMwshnKDvay^sQfyIlK_nM2|ZY@gPCl80JlDiLRA=6}Tof
zTETvR_-+*g_e*cYlkOFSMB^P1rJ<AUDa#hT2jC0sHZtc;H*Y^HpvSA?#n6wN{?wj_
zI!US`baqc*)_bR#aSY;neg1(7gX=Y2isb&7$RiJ0fbdJMMJ;@PFrQywioUzv6zS5i
zLD7xt9KFiZ#UPR0sm*j@>@w3n|5wPy=ZeKQsjR@vFFO3LuDMuz2I^1oz;75Kg!y$D
zqt0M1dqr?7Z*0H;0qM;>=#e^8B`QPhpp2f;HDgO4PHMER%!IM;9(kxuB<}lbd+AZV
zJB23rv#;PwqwBU0F$7XG$zV^!`gxM%X+4z$0o~R!p3Ik#<9+L^Ffdf)y6BmpkekI;
z4tz=i%k@MXhV%pKw(PKzh3qMc>7{G1J6+ZZWjv|HEt}r0rP5;qjS43-cefrGq_mw`
z<!3SFplwkmAxyC5pGfw950!FJH6NKVePWoslvKJQ6#+%>`<d99(IT~M$&+380Oc~m
zd=`3Z>57^*bdou$RT9TQ3(AgoRV>CK5Z?^h1vT2yl%q@1`&toxqf)6;6Kkx^$<G%w
z2=9$$I{5ikz1bHE0*&GhV>3y&EY2%$-;xyIV+j2%z|YuIS5Hyait{r>vubU9p!L3h
z1J7l>YguGHlt3c!@h1yW13CRJO!yZD>SMR(%#Pi=si9l8TW<PZD-<9Jo+=t6q{A5<
zOF`T7tG#yLIWqTaXHxlEj{V@#p@s<Iq*=iX?%R+0cU3$$)i_C(c(~Yb)upg&d7~y?
z_;2R6?^XDj?J>`AH1@{GsYWGpKcl&+P3P#%G|{TCe7EDECG>{w+Fx}BQ}d!?=XF)K
zPXqZ&6yd&LoXtABp@2wV?IvJenwEBLZRK5vMOut@&7=kWm1!duYPhi459DPWI)n_K
z5$0LC?tL(Q7Xc%i_Z{!rR`r*1dbWXW)0$kd2dbHs*5tQ4<WPGEE1+5}P`A!<b1b<N
z(p5E^;6y0(d-)$V@HE%#v2W5a`sJX@tLlQx=_>Akiy>N2xWD}R+gv{#%+{ia!aGXc
z`NVi)NKFnLx+bGrgLHj{xkSLUmOn84ICgO81?lVKqx)8xrBh*taV;VGY{>-b9NXD%
z?>;E~A@-N5$Q-Wh;pJV^%NJ`XNOnl6*l2JLf`~>uMQhubt1DLHumsX^+aWOKN7oY!
zrmOw&qt1nPWxrTd!P4@{yRkq7*!oeBSdP{|tSq|ohEX%oiBOJiUfyFkg;LQj9@S=&
zXz#L4TH1}vvR`7p_H9qE3#h;RNj&iQN<7P+z|O>^;<B{|>M#ds^#xuCe?6DOt@r0}
z(~6%V$IC9agVa@moYKBNxlg0edpnl-M?z7?x=%*4Ek>fsoyks?gqF9j=q$7RuS2B8
zJ<nz~Txyw)vZyyd^ak+FWpLJ?xw}T-s(VUGO5+iC*}5ec7uUXx_1{uid8A~E@8`-E
z<DZ{89}Z(9tG4tl>sU&Qf%|P{o1HtZTl~R)|Ikp5R$y(n3SZ3VSE@yRykbk=lGh)#
zHj3sZ8|$eJ8%EdV;S`zS9<_#NH6Wp4E1KF~A>2VP0%Ak2D=voa#hlF=>wk0r#(D#y
z55Knpvx6tzhNMBE*LseUEh;|XHX1S)MjJ>AhZh57JN&3t5`SL0S8J&-7cxsmU)a3J
z9O(?KS7c9_InHkz{W`;@M%v_R&o+woB-8^h>E6RX=HzI6-HE?>Tm<B;#~x~FI&034
zhxq@zA7~A<RFK))eSR3%d2{j|L$?Bx`z&-pggwq9<^&$zZxSEGJV#AIkxmwh+Fhx7
zwDPI^wq2`u)z#m}fA*=~wZX&G>{=eblMsnC9*w?Mdb;%s7GGeFF_r<Xw+O;J7Y)db
zkx@AD8oBctJy}CS=FHAr)Q;xu%iGn&O(B_0OuHoJ{F!z2<FjF*K1<uS_tcpw4h1WZ
zm3py#MuVSc3z6qpwx6Rzn#^JPzMGin3kL{RNW2v(pI9v6z17^#M=)an&xd`1C1eO6
zIBt1nWv;fq7vdP;j1ix)bpLIH&oiinKYZj3$%=-Cs}u*f<6-l8NHr0}qc>r<?i!7Z
zN1uY73AME~ARn2r%@p6IG5F%-$Ovt##P%@3QU`{{5U)`OZ<M?_rc9<dL@w~=6gl4=
zCHV{}k`W7X7=2Lm0z=$7O)ZT?6kd0n)YlkkG%VOf<?UHEAdo`Qwf-~Dp9RIPs6RjS
zazd0E?Rzw*Y0p>_({!udxzPVPThuw--MdTmUTAMuRTgF$eE~Jh=iP3>mK76NH{17-
z^_M-uhhuFbHr}vz@({F+)=1U?k8E0)YtMa#%#26yR*lps9iKMk@`r2X31%6&aItcH
zx}gm}VM}m+%+|`k^o0>2m%bJaW8ePka`NLbPn#asOF3S*ygT*CnUQyBu-Win9DKu^
zh!_4PNjSHUfzqeH3z=NwVH~q-;tgXB*~LswU?yk!rE(Y|hWpOrFcU%k{bnph-e3EX
zyfT~COWRJ)Gdy;A%e>IkEs<mq%lzt-Er_PJ6sMK#jH^kX`E8mfJ|oX0%r-KE9q#6$
z5AH3hos)Z=phoyvezd*OVLYTpsrT)Gs*3x97US*Nvtn0I=y}uCt%@GQ9rk0tQpAVm
zwDWEDjE~|#@WqH7UF&lHnh|EtI008No8q%k!y=H>x?l$i_{b&fw*p|y+VOpXp91Np
zq<rcuI&1KWYwS-7?GRIMq#EnTeR8GljrZUB>IVAA=D7jZ4S#9zkQ$TynIzVnex-d^
zBl)=~CB#q>FZ`#k;5>+biDHhBTdwFZvn__-l=4o7!2%*6#5X#FJ=tFELqHz1{p5|T
z;MwDBw@9UQm~~N7MsIej**Fq{aTW_WW>m-6)46KGN-s(z{*ixJZ`F&M58Qg<=_fGk
z$z}F2w+SuRSp091-0)>v{p^~X2y52Bxt!beHv0EA;#fxHJ9?E>s$>k8k3;Il&t+qy
z7HNm5A1!}_=_VO|Qxo1j(d=!COV#SBkEk+g=!G#IRc|Yd?~ns^DlhW-=(22N<w&N1
zy;2%v$fMSZFTnZVdC;@WF0M{&cpkXCjibh#pXLd`{T9Th1|t~`edGJ6T19!dFkVp8
z)^ZIWbvt^cJv7zQd{+ZaC1LSVNQZj|38Zf=5@d;U?VZ^hQ!AVFWo)w9x$6%P$;}T}
z!v<(GgZVs1ZU>Lsdy|DX8}uaDkA!bAQcfNAScuSGK{~P1Mkgoe7DG67uY<QV9AB+4
z?O(<kW-V@uxI{YUwlOm=IJ%#%`x67QFc*Sh*(Y|=rqZ?xCs)bu)A7yzIDp`pU48bX
z$)x|FY#Q6nN%AKI4swj3qZho!Ulq(MFVB83Q}AT%QY2t`#8IKAV8SWI@|Tj=_qs^?
zbQ5jJ;1^WlmWY?#ir$ls2Lt*Ap^cltx38^`Zs-fgEnAiz-ugP0Z*2E4&++lIbI~={
z%tVr&ShJTSuQBkA!*REK{hC|8p^PV}dzS~zJcF~716#&_kr$*S_L!1+hbUWbhxrJY
zX8gFb8tY9s(Mt#O@J~FswqyGItL^lXX-1$Y`w{lS#9|ju*BULLV@#w3acLiPe8mIF
z?9;Q)k??Y>Q50t31DkGnJZ<Ep1oZu5YQF?G%(Q<kw2%LuT{HV}u_D|IQRae*Xy61t
z7p7G!x{m!3Wz$bhB((+CYZDidY+Asf5u@=VEdNBT+bOSwVG{0?rhgcFLHt!inE*e<
zRVPzpdmDWbv*Af!zrB`Np?b7zY{3Nnw`^FlJ`H-mip;7-EH7h7Up6k}BiTOIy^%-q
zan@-^LX-9Zp+3)sn~eA%{P=HPbz10)Z})E5AWL}#{>hV<g!ve-0+fUzuQn7ee;-O}
z`vvp<;iX}xEjQ{l89HLgkdhzXNpNfED)?^AyK0V(?IqUxey+rMUKU9?$lEvMRefXi
zG5*X3+bB-=q8Iy_Aht-Yuu{~4p*dkUY=YVb!ZOaAntqzO{-u6Z{w)n}>V;I|j{-4l
z+#^u-{``Rr$u3*)4gH!1qx1-fcOf^ddk<VXpN$+$I2JXL#@hGYbT8g_eD}bZn4WQ?
zXiEBJ)2*$xAW|>7@h$7F<TviwP}N+O@Ia%r`quZR)32cO($Z{FWFTpR5%9be#wyS}
z^Nxom?Nl&T%kuLNAnuI6!8ZFnTrs~g`4DFu=1q>aRwt9ZKz6oi8{^1CQTfKgsat!b
zeq8!|>(kxK2No`xGL>Ph1T8sr=nCWcGY2_Uo&@xO0NJ?XNh|DZ`*D|%7n5t~mZ011
zAqetE`4kudmJ1c}w^C$H&cp3ggmT6Bx|h=uNGB=w%(vG1jwSu8t`VoMWf098qiSjy
zok{s*N5VP8qJ$l3MscmJjRg-465b*EqZO`w59CLWh=R|T+Yvaq=Ie#3YL4Z-nNZZf
ztQL60>$l?I<{wt!2h+O?H(?Ck(NOE&UcWaI8Mi=|Bu}cN&S}r`0tf<Qq!7crHBmfR
zQH<RCq}G&>Oew>go0M{^$56Htw2esV&9@3eM`io$Tr3l3eLC@>*qPCK&8QSt5lm|N
z3|QvR!y;Uac(l)|hIc{UHejTir(*`p*~bPFbA_>Ao;IvVvfhC|a^it@UKQItFkqN=
z_M6kor0ICr4xkc-(DJybQvFd~36i!67ke1pw5B{s&0$h53DgyjTvGR|H_eM>%|1@o
zaav5dqtDz>dkxaTUqw_R^57Zn?}n-V{<CGRYg#ow&cd<J4k>(T*i%HVZxtQfvmcIK
z_c(wEG&dB?wWnqfFloIEhxRqf^mnzWKnNsstv`~oGW&ivU(IIS_-j(`dzB_66*b*7
zhia;GN?G<ddjZEbFk?NMouHrE!z2sh135X=<XFk|=f`%Pq{Ik9NFIZfbt#=P;j%l|
z%U>d_9RAKv9F64l-n%Qwddtq~Gq`H0&ocw9G>m9Nl-v=cUo!*`FrT5d>%$d&%}*K4
z&j9oum4vpjp3BL583@;Z;%PpAod=S|a~4ynhh{h7%Yk9M_`m;pX}%X1&1>gwUBPeX
zo`UMv1y+3QT*dRxzJn*=%iNXAl7o~+oy?XysJ-uWF_Uk>r#k^Xdv;h})u0RR|DtWr
z=MtEmb%h)}<1)|9)}K0}C-U>a8-3gC!+#G9CZ5`|p~|)>cYBFatanojwoz@4lHa3x
z<7CpyoNJUknZ+lhtr9(;v$EIqmuBAeYYyX$INvjKlI9}Wv!^J^V<x;)?*Kdlcq(5r
zcxZW^>3Fxw7r~_RqZjd6EBu?my;VQ^i1INW5ojeMsb5dBZ+-oC*qehi4WtxCdYKRi
z>q_`Rl%CUi$Nz3VCh$C%3@`NJ*`de9K?$Go5cjIw?)3^{HRlosX<=`|RvAUb+qPw8
zZHY6l*&v^)WNp2kSzhrvhdg&XSXbA>(LK%Q>hRkUHKowlJz@8=UcB6S94aiPZe7{A
z^Trv_oKy<6pXInOcZ_%pY}QRYnT0`z2PiOh?g!$U)+-C>QvLmcLo$|DgCBs#8!;L6
zI@9O2i;Buy5Oa(&V})l4*$H9s&&`eu(tZ&j11Zba6C42~BxsNPs7vF=a<ur1R>(CT
zJpul=nyY-|ikdMae3p+0y$*cu%kB#^b0wEOncYDSgC3nE^~z;lMDg{VQRe~xh|~<n
zKR4crdIBd95g=n>XxqID4&|Zb-XA_B=lHD>EEbuNeRC2ecP3T=7X2`$H<d2i^ktT#
zWt@)XnFO%P20UsZpxEqOG->wz41AdEQX{;4eHi%uMR_JX&@22^87}tO6AFzIho-hB
zvQj=h=fOVe<e3LAHaTrW-|3w<21(2G1`7x*F1I5O0koC-mQ9HLHNmp;8(vm`P<p^H
z+FX86Sy{Z@t@8_3NfN63_v43YU~(>h2WtSk9%&W7%FqkRPTFJ=+|b}ndnn8G-_1Y|
z_4XBjXnfY#;mw0XRY}V$H+|E5sy~}PPrh&{&FAjgWB0AXBCYe6I5CQeh9!?;nC@4Z
z^`T$E?^67woL4@gcxg+*qGK^W1$)Tu@5_I5u;-1uH&4?W>QCK`tb1^8&r5BpR^D^g
zB?r7qjMVNk;uCMvH@Qk-1~lKqgJfF|xivjWiARXdugg+6Us>|<0}`UIvO?DbNqO2^
z(3b%Ft2eg3K)m@7Rq~uB?OL#rL5c~?+Y01?v09u^XJ#R#$co^$4vPP1uu=xv(BUu3
z6Dm66)^ZG^ovvxpTa`pF`c83p39thBP?}q4kr|ga8eP4_YmtkBXRD&Nnc#x=?pM2-
zGFuv~KuGT0Jf8~fd2yJsql1?z9ePXD19EL?oUZ`qTi<O+-7h$?6YR-Wr@#B3fdLh(
z-(Js<u5ecS0n7oB`T2<%D`Q+Zk3X|GifBCu(RRF8W!N}F{yz%f((F~wc$`;3&<=Fv
z9m!k_>uY`T&J!=FZfrl{L5WTDuf9)1^P0zoae~;40M_N7s$dfM*7d?=ILpdB9eE#p
z8{~Z!&SjAlmdgGii*0Jpu|<<C-<$!86c|PNzLVG(xg;HSL_EK*6qeg6Wxp3F{8=mh
zf{+)@sE6c9c}yKuZc%)NHR+3@*<ZYFGU$_&SpS=M8Q!v3+-Ns0LJt;;KX!%(n%WxL
zKBaOd|Mz*gKtPDZKPbv7M_XF$AduR5<xS4g@(k0F*U~=?aw@N0n;~a|#E@>hlV30f
z?oVu>1*A*oQtO+;ab3B9WS_n-a;zq{I0m-E7VkHr%}-xCCA0r}^rOMmCUUQ|UxY~Q
zefqbZYHMvR-MY`_O?1Dp)#;a>7F-?*{uG!LFx10}*9}f+*lXD;&<YXqej6|~IRFXo
z2vzYlT~p5+B9uP>eQ_@Oa~@8WUSD{Jn;z%$C#i>Vm*HCj0N7To7osiZjzFqazI=t*
zns9i+FaFt#FbDB>y1V@d65rM!(<qA5I5_k1$n3Gtj$(h6b@g2I5nY~N%Ob>T$^F-p
zg=Hu&KI#+9{D$G+sSg^i$bI1rwyQ`RONb{O*P!BQRZWG!DV*k;UFOyE4aQ>DDGE!~
z{1`JGnVn)ZSdZ6@z`R#qR6b7LBKOVIA$FwBw=UEbC<o0nCDhOLlk}3CH@v7tVn;m6
z&*De;8TOPx`+DSKl*6<+`wA`38?|>YgFZ~r6We+)GiHp3i}m;&%umQp4?E)Z7%H#1
zcNNC)i|hY;Brx5^8aGI@SD@D@_MYs53|2JT$4}$WTW$XF<E75`3r8%L54B%7E4uO)
zs?mg^x4R1XF8zV-2A^`@Pu69FH}04*&oX-J)1-TnGH$cs^_Zq|6|B6=>wYHzv?-Kr
zNKI;g4dnyS`>SBf3M5OOsx+^-b8tEad|-{Eoy6lZ!Ic<tFkgUq3N9knD93(s<i}Gb
z$A%At9(GAFJR{DVZ9TaqHR2iz+i?@WHCpL|;a02#Q?BPe*4htO9?5&Z`5}{d?@4c>
z>ZK|kjkLj0Xf%N3VoK7}-a;fyk5qGYeWhxywc&w_`UO;4HAyJ%c%i%0(tonHJq2#V
zjdflV(Uu&X3of_$NV*7STW9wr<6RmS%T7~*b9IIO&YMT)tNSzWt#n)a{}?vjr3l3v
z;IYgG7*q_dyDvxkg7K*tuq$uS6+>ucDmfy%VTh#P_VAthpY=&c@|&s1(WPuH!A|9y
z?p5&7?{k3!w?H$4iVfwS7r)FD6j{xw7%zi+RG}Aw5YQw&nP;Rd(M}*nWN8)S!Bd*^
zDG!JI4_<tK3&_pomzz0;{mG}-7&H1@e^;_k8w7zUz^{HeIS4DAc>zXNdi@Ic_IiTY
zJ?mgB;eBI*EH_u=fgY~61Db`Og(2HtI136$iZ^!0OX0#KExJM_ErwHSj$Xa|awk7U
zB%7ole(gQLf!e-k6;SA-Iol*k<XpnP&$gqcsCW+!CB$I?H~!LRiKn^gyGAKbKH}Il
zR|m%HecQ_TDwogDbZX}wruquJ!p6a6Gm4A@SQ~1P!%x-dZPdRmBf1Z*Azn6U#nNDx
z-)Ct<{s_znkz|~X1Sd{@ywq-+!zWz9;2(cc0LTXQ6j<Rw-O<huY-|VxYt{M3g4RDP
z<4BKJ;3~so7+m@o+;)8Pl7{2|vH&Bc<!Hw@Gx(<WzrYd8ZpV}<TIg#EDey=(yzm~)
zYZ}_l==P9WBFVvJA2C;H(6YXpDwRySbmGY9r5b&LVq&Mqr6EGrNyz^h`#106!Vx0-
zz2pOX;pM<D@@BZq*&$jitotytJTniGxh1r!ZGb&1FOsWr-eBJq@TmWJV;o?~%3eO4
ztMVgz>o;}5pLaySyZq&IUR%5_5fd4p9Cw(Vc5kFFT6MUQS*t13z$cpue<6y+>$t0$
z^BZtCKXbc%9C{)J4W5Y71&rsH>hdna2bi#qtA9-E0zAm!caSCRZ?ECnm$<j1&`D1m
zpZ9dBUU=8q%zoC)tssy4s|A@c&D#@1B%wt<N`YZIJ`CyJ`AJX(S*%f%W9GTm4Wgh`
zQToGp1zM&q<^blU?(6CP;(Ya!%;FZ@li07(1}>fPZ3f2LQxXEtHK4L_yrnW-)o;72
zG~_EpQG^rZOxD&r7Px{IUycp&+~4H}^UV{v;=&7wtl>vn-3({89*irpICQ>K5sn3%
z<Pc~wZ)xekJ^Zb}ibgQ6rQ@SS?$qpMY91w$PMU&cpS5*bx`FA)#Y#;NlsPx8FKDA;
zl?V%hO<FaZoaB0HZh)iUgxAsFmZTG{fSo|fCTkmkJ=L4x(TvXPsv9u>3QnaGZp!BW
z@&S&8qlFp4;NZ^}R!tT1Fp;F0{|?ljU-eMoOLH4Mm0~SgmX(K?+6wGd1!~H{j)4Wh
zoW@{B-7h0ZH_ivVAEaDfxLKt7d-}s&Nl}p+wDEM_`BlbOQS9?4=v@S&l?efPTN$Uw
zcQBPJ8J@8S$dG;eT0s<Ao62rgG9UZsw-`3|>EOsw^7>Sy`wc{fsW2on&Q1<iXz0&c
z)YniIrs9J~z840tLLP`H4U?i_-3ss=Fh3??W%k1lhe67b1;7zRiU;~UlQ=}1WSeul
z1kmtVl^3q0iWRNzo=!ISsp!VmG!b~9`-Ajq)JZ1q)CniyCo-*xA;<;h8<Wp4Jzl~H
zd-_#<(A|VlzSKCFU2JwOZE6leonopD_~F2Zvn@hj9^d}SFc@0}*1HeVc9IA-V!>bJ
z#ESqL-~OnbDv09{fRm^-#)7@w)_)8F)iC-H6?8@C@MS`jXg<&z{d#3ls0w3M^Q(go
zNv2&Mq;*=yO>L#DZdviq{~AZvmg%f6-)_wpi+px7<eo4Vh*fU-lF&!gT)HrNt&9A-
zS9o8QJ_Js>l))SdM0Qleu@PHq<!E5+7JfU8<Yf=)VhAke{Bsae?9ctj$v@{I?%$%E
zyF^FltuchWe!j~?%=L?aq~i0t1t)?njBqnvd-EMo#d(oiG6jYj)?x%ik1j@L3GaUb
zySrILDT!#a6%t1&=!4D+zz+wo|D>8pyzYXS(vZI9_oRj&3wF=|)v@nxEc!C#n+Lpx
zo)#!{8-cA5nhfJ|%oEv>1INy6;eyHf-or;v33f(SY|#4x)I+DYBD(&c_6ZPrnDgfc
zrMM|h`2$H>V?5|^7SaVh9@Fwcj;K@v-(0?7Q@Z!ubiuX(MrvG#2zPhE=BldBc3JMt
zp5;Hc(p9)*FN;7qaDr5fAqQzD{cQxH-l`)#1s!@mWa0<dEA+yFr?QX7J>g&FWy@($
zkv4QToegTt9-Uzv9Bn%qEkWyz%O>suZAiXV2v}&$@L`Y3X9HN`Jv!=ggOr8Th<k6r
zp<4i6@c{Ehwt~g(|65~G;Cf3kZOWddJB;%j&YfQ9_{vOpgoz2;jI6<Y-IKB7!XecH
z(HL!ki^ABL|24rMNv8#|ZS<EB(Lt_Auq}^TRdCf62ia@5!Hxm2PiH6h`XQ?F5F#r$
zpDEqS*&b~g-!Vz~tSu+#son;lphwgT!xKSk$ec}FWq1au6<_~AYA)L-nFSkkzvTXP
zDT{RcSX2@giDUgNDQvnOO%VUE04w&!oJU0tGd2F=GA|yQWV$@)-LR@i63$Sf_1}=*
z{sj&>+wB)S&11j_U^TB)uAlmws152-s}jBbQNfBi0&BeO`sHI_6Qr}j1|7@HBmL?>
z68_+5U0Fx~D_p?+E@S}E$>Tk$ea-ll<0PohBOD?V1Zod0Pi`3hRu|LA5m89-y02%v
z0vbE?lKo}9=D*Iw?_(dCF8DrHE!g@d9<7v$NIGC>`_1emchZh)yD1%#Gs58wIg@xW
zkcu}ZQc2{G#wAatdmakM1Ga-d<rKwKjw}42En;+iN+3QTcH`<B4v-L)>70Yl&u6w!
z8jkk{{&5iFb`G%?aL?f6nQkU1WNlqd$MafUS^!XMoUO$5G%ybMdp8P~hx&}>D`GvF
z3Hf2MrxM|J(YAbZiEE4!Mo=Gp4$Q=Eu(;yA>!GuLad%wkJ7qDkzgf$LM+-k}D)mFI
zfUaE@geIzzPI!Q(iU(TWMgDDu*bWlBy8creF#V#t=!2f{ocmC!cCd(70IQ}LiQMYH
zcHVJYM+Ar8NSK3Cgm(jnW*UoHbiLZw5NBn+jhNAlIt&3TWE@+)@)q>E4=({)vC*-{
zsHg<6v!FF)Pg}iEyL$;2Ey2%n=K9QJHB|~OanBPYw{aa(k6#%%3-0OiWX{_|r5Esy
z&JdXf;g~;D?E1CthB{qSh!s~$*nl+;!U#FEwRu+K^uOYyo?mH!SVF`fb4WJxWOB`e
z)n;?Y4vgS&C28f`aI2N&MKbaM720m~a^ly&#Ru}y@ACCwl!M9$N^QojQ4zOvcCd0r
ziBp<>DGKtPE2G|S>vhQh_mrPGY{b4lmb`8)bG4D}%xiFD6<}29Kj6wa4!uHmoTUzD
z1I+W3{Vx-8Jnc9IjbhnP<g)|7kog<T0ACE?&7xrqOd(Dv@5n-*<}gxW)XPR96V+Q8
z5lm`E6y3QVFnd#fkCpCUx~r9Y1_|tmo9Q~G8<B3LmUi$yYv%ketuiDEV4K4NN+YJQ
z>Rn4BJxUm~18#<C_$cq%u&Umc#Srx5II6W1>>sP&e_kR_-A5Tp8N8GO&uW&AiE3ot
z7J`IXNLoE}^be+1;>p)^FkQgxXo^IQr=2S(_bbQ;gEHQO`l8{}WuT|=UTUfc>s%8_
z<tRT0pi$8P1pZ6KTUvpbRxcxIm9dbEio9*a`P{L(hlWYSl6#<*{b;d|tWHqOX5U9*
z6e>32Ly!gmwidUwmic3Fn~5Gg4<BUS5#~}V&PeHKt=i?{!fVjG%D5Z^^tHkFq&-5=
z$idO?stBHV%81NY%Vhr$0%!^NZz5zr!m*)fVOB&ZhZ@xsW56kxHi+y3B{eGz;}7!O
z<g7HD@46?`fs2J5rUUws<tyLoWdn8!Xp(0%kpE-4LI7}psl4ZFpmw1#?)nR=^A^J@
z9l4tjw6y(@7|->6uz+-=^7=Y)`7}Q}@iEh|IXmZ8N^5sN>`L2b4N1uJc%g$91YVvx
zd$ar9e>hX!0{p2rL{<ZJX;~i3C=pwWlf!g+EEw}ZbN#s-&1zpuEBKI%*$QFKBm(P?
z|JAX=dKg~@5>>opH>7liF_Zbm870>{*DTI#O_>KO*j}*Ty047fsU&L<Sie&iLMs2k
z?zYdU<odRJTj>N;oDbdM1z`3AF#8Ijc8#*5p3Kz#eGcY3++Y*7nnA(X0u|J@#9S%q
z7txpWrNNwsH7-m|H>kuzwBUuB<kvINuOonJCGnF$a0mW^7f%AO)qLu-i#12o^QD18
z7j0_(RA}x(LSN}dj^SHe6#kXpXf5Q@k>o$RQQZ`*Y#&MQhwh?}iu4i*!NT8uabeFq
za~MIM-+*N4M<lAWMq*d#?}py&<LU9Ws>H8XWkARB{UBN7s1uYikg*Q*F&{|?aP=Ae
z0K01{-j-GLIiU;I*k~H0zYqF<1OeB8lcVg-0QDSj;qU76Hb^bc#_^wSDmKOfD7{}K
z5a^}yQ$@20ptLw0>&({0L}S!x$1bj|k#nQUU;amZ6g9=)?TlBu-*U~)%+vH(g&^a!
z50}%-s?n&3wkz@RmcU(H?GDVdtU+k?@&$tJD><yj96qP3?ftIZyaqO_-TRMn_JQXM
znA+IJ5Wxi*kda7(5_4^0Kk^8gBkU}B3A~SnB)jxoQK|tf_54&`iQ78H$o&eA-!y=>
zQ<x1Nm2~|75a)AmX1vA?X=Ope4U60g0H4AI90n74Vj=*2z4t<osdCq+<=SlSZ_7{Z
zB0Y1pf;20>?-IS+bds^VQYC7DB3L$ys~qB@CI&bOhvn1Ms^0fuZ^5yvjHv6Ra`Xv^
zrJ#S}I3$ej?IM3QlTmvZ45f<`Jm7-X2)ir15OIy&1$4TRg2BDPp0WQJqX>8)ss1Y`
zIAyXGGUxySr$HyX{i<qzxxrF-!(DXm5?%jhx;RJk-6|Fn@}N-x_4x-+TK+c35h9yq
zoaxTWnA{4zHif&8QS0$+M@%Zu=Msab>xnSEj{f*BTLRANW4CsAwbsEd9J^$yyd##|
z*i_#vo-3mtE(xJEKWWZY2=PD#eBeQAX1?h~<cko7c+%^F?0Zf?hL)ViMn0e|wY9Me
zzpXKdU#aCEYjFuRu&-lUhyL-~>tn1ajY39iPo)N4C*ng(DJYWvBi<Pt;{ExZ8+yer
zt$v~60ekO&L;Xd&6x=fGPG$z~;TPiBH|$bc-N_JD@fFc-WLo3y<d5yF4BM2KyN8%c
zqo@a7ncA!Vht1kxS1jO!Z;Hp^8Ao_-N(o^XQ6*wQ>u~eY*$?3bBHq36(Feo00@5If
z`@YaKU3Twgy4u4^BzSh9uGmj|nrw)k*(-0U?*x@95|M?R&fKkFLtX&%FC2Z_Wg;{-
zb1z3K*yfe1(mZ2PU$>3AeE9oGP-_>!f$gCu78Hzwx#X~mfS3TIsNpmE$IcA#`Hq6c
z=^Fknu7o`9-?}mPsp@3afoBq#+E2p1L=3|Wc)*z&!(v6a0WzhZn>wsG^7<#=o&*46
z03-&qju4vuS5(V4L^-Rs5`5(w_E1t^9;e!caA1C-N((eJDSMVs5nz7JBK>ASvn}4%
zlqo;tadniGlILpK8zC*-TjwR|Wo?5mYF%3%W^R9YQ}^A?HPy+rMAVEYW3@lyRW|>^
zv;H_&_o2G<5AOy_P_41b@4A&_bA+z=8|$oC^untMuTtM%fPDh8pOhs>$i!+&TIRJ;
z9%w+XwA~%Xx08Qp#`N=yhH+hXdH|6b==2%l8Z+V`_>I0*QJ04R;!uy5Cy-4W|LY>1
zh_WbLPT|P%rzuPY4nqk36K{XnjC8~DKV2*jaSdZ9^l-^08TYB<D+6Trg{RlL+2gk)
zpXPk#(oP)F1sZYzRper+!Oe5B=1&ep3jS^K><D0IMZ774shosbIkm{OUt^WfzAG9H
z<}aw0!U*;3K+|CXeHu$C*yykEe>92Sa-pAqK0gD^87LLF8450N#q(#M7i9JJ4u|!;
zo<aQMd?$()Qy*Oxj1F;f<7hXCIOI8*`FYVkrQ5&@n+omqa`~+@FupWJNDtJ9{|(4T
z!|qBb(**`p302!?c)yO~Ds}Kj1OB{;3D%mqx@}XN>XQ7u$vjvg2A`Xozx#Q{OOp!K
zQ{b@)?N4efzP~;3!^?b-wh`z!fR_X$^}DJJe>`Pxou_Pp2>H45+MDtaBVHhpQ^;{M
zL_<b^GX@QmiKLf1dxMTc4e6j(;1eV*8#~Sfu+SV>*VIn}0^v}CE+zxK^Ik@V@EEI}
za&Y)^QJLB17ka^;q~p$Eo9JtB{jbju%IWhn3&00<)Bh9(`}HLF@Tdh_dB2~Mvw`-n
z{wJ8vvxv|J|NLJcg<*bB3=I2*JD@;3V7O(XM^zFEZEKK*Fq9@k`)Ui3e$ANp^8%wv
zTn#WnBSZD%{lV@4R_f8W$0R@(Db>FNG#^*a{<8=%oYrHMM|_n_m3AU(VmILGg~hU)
z!ODo2DvLk7{!>=I5;((v8uS+ir?+gH4a4c+vSxvs1}?uH!^r3rYn@*%;}6rPxSY6|
zlkP0JuliF5!FXgj=%duG<wN*m+Blrj+SC)YHWJ3N+RQoXZ18!f>^10B_b*5m4prQV
z6jV75F<MvC{r>VHg4t->dAPSC;YLX!f!ka$5O7CNW}WXpWkDhIsUY?f$8D?lCoE+7
zrX2%bgroCkJCfFaO{S{^45a_*gz`Y*%Y{DOPE}UE`g!IHT{dqY6u1=j(nokHGY0cp
zNp{;IF?Q(Rr>M`9IKJV)Ke739X#|s<uqTP-t*EhSb8<nK5*D-dhKHfv`sVvZVdyxd
zvMReQR&qyZ-Gm3L3RlLo)g%45YG$75?R?p|lb1o#_fp_Ii`yp{0N4-?O;mt)M6295
zOE&@q#k%4}aGNGR{|5&!61ITQV2o*b`bWT<q|ULhhEo8dc*KW?_o~_y$&^>RXg^Fx
zmqVKecN`7d2;D_1m|hRvv(q58E#ubpMVGMmnAJtKDXo~aZD%CM`}3V&B^`R5*pE<=
z+;i#GTH=T8$9WAJ1)-Xduv;ZYJmQkjcB}4HwSf&#t!K>i2qwYU(_n<wT04NZq?xgQ
zCuL$hZUPuK;&k(K)#_QnB%8^Eh~T#Jqu22E%4PDK!J;_p*?xu<|Bx?FTWcsf2dHqT
z|6`?se>5FfBmBd4WRtV771P6yEZr7PGuFD(zwm;}=S_T(O|{yNp;g)JnOHiiG>i&L
zR%?6L{XlcK*}T<ZF7wlYSz;R|p9NV~XqxKngg+?{+eLWDxbON7$Y3dh<4}z3a4WC2
zOe{LZ1==&R{hr-iL}dD^q3{5oK4nF#ezQO(;+DVncm^(%9Rqsd!!1tGS!WJ}{7=m>
zn(NnCvIh!4OYVg+*2pH;A`qVGmj!{2XoFAMJeaHNJ39~33KcISzOR`zFty33@}u0N
zN~1h?V5~Uknj!>UN#zRoh*c^4hWbt<;2)M;e0}=eTl_igFQEo#OYTMAOnx|%fPa1F
z$|KIs90!hn4nI62nI{2VNxHLDM7eyShbuf!#7;ha2GiA4ad45TRy?7V_^(_y?1emg
zfM_S63@Tq^`z~+P@y=+a&VqL|A&-vP&pu-;ahadLT8JgD{>c}MDwcdUx|KY3YXXvX
z666|-dc;q2=K2X`?Akb87Si5+w%`>dyr&G<z3$aWNzew@Rjc%0YCA2vTX9-ykonvr
zv;R2pmga@q$#AS7b{fc9RNzewK;33dcN2#2kCmyj^lZX0<4XqoPKw}pK?l_EeJDYv
z!$DdLKnKuVVqtcBz1{*D57CkRB$$s()Ny(Xq(^#OrXJ1H#0J^E)-tg>6&=g5OSi3!
z(swOo#g(HUB*K8Q_sG+ji<z-NBx>xZH@Sv9yu{b&!ZoSxmO=4q@ixC$Z2(w+AnT1O
zOfm`d@Is5Mi(OnX8eOYw@#*z_kQ20LYXMlpU`@+76}=Q0<ab$3A5z>2W035@k|tK(
zm$~(DZr`w8lhaE(v&=S#(AIMWF5tJfU*Z3Hc_2iD*8z9IOu5DWt0-F6#OLSDK{*M4
zyD5hYQUK!Y8pS_yY(9DFvjw4!p~L&v{V6u+IPv)YQy0_m4=<v&Z}f+)FVI<`>zPhm
zY?Z*Yca$^E7=_w{s0A)o{EB?mygO7n^p7v_7+6{b1%UZ<4st>3!R9<)M8H7INN~k$
z2I%i&{?~fQ3PC^LdIDQsC{VpnxAoe;J`L=}ovmet91%W|X=hpTB$!lr?~)r@lch5f
zLg7k1;y51iQ<b=es@$ccJB$o#;CijTbM<J%wDLQq+X&vWVmA%P<+8I~bsuE)19@TO
zp)fq4CWmi@_g8()t)b5TH>R7(FG(i|wTdYpFFKp<pE5X=O~E|@tKvU`h@D+5Y_x;W
zBN8#75^xzCZ#E#RPa9EUDrN_;Bs!Bg@q}WHZcd;eXFCP78Ug_WbR{BYN5GCi<eY?}
z2oR$gDL<mGzQskjcn*6+fl~r!N%3y`vQfe`Z7LX?Yr@>JqQzxCllqv-Ue`OgE5nAL
zLNuF*G-6Mtw94})9UpmfhOu@t1UgJ5dhodtFkOcgCCDQ4L5use=QCzN{Q#Mf|H9i-
zudqg7BrG}d686)VKc+R9(YBrgt;RUdD(slUTQeSm0dq|Inpbkji5iX(ghPK2p%fHx
zwCF_L6Rryqy>%K`-5(KjUQ(jB)*CPr*+%#-GwXhS-K|dC>CHgNff;UElAK|?8F<Et
zZBEyZ9;T~reYurzh8p}RYJ0Vd`z(H6ABu;4iJxgk>VX9|e_v#knm)Z}4Y!*Y=^*BU
zNJolbZuuT)Oh|=EwybCv^M#E(V5BF@W8v(a0+b-&np&=$%~SE8;%qbI&Hh)K8~wyM
zmF0A<RBv7Mn`|RaZ5g{O`RVZ9s6kpluh*<DTi9!%;(oC3rus+Rla28?jQA_nU(osb
z;0V5quH*Yn%3w|gINQY9KR5c@<aw%+br0GVaI?S4?2dYP5Y4Toitl=8b^p+07uTV#
zL}~tmyjTf%hlb2Q4L=feY{l2(r7S{@IanwDxBm8be8$KN{m*>)r|)|%XkNkZUW%TK
zwgT-%o2&9U&~s3wrpHr_fWXwtfUPo0yfFzgOD?iD_qS~?JbH?!nDO|SqVh;03#N9Z
zaf91WK}kJL`904hgZ(OQrl5;>&njOv2DTx`9u~T)lbMKqgED-sxQhWNoIjdr%f74u
z4LX1odS#-sr~KY+!yQ23hF0l^kHZbB@4$s}f${0Vk@z#8-wuBJ+n1+^0=l4-zNkwa
z|E*q1IdWy|7l$|4G}T43_FV^hKU#HGw?<fJ?Occ_S|+3S>MA2JjKvQ|r5#+D9HUzu
z!oSWTUHI{+Vs;-^g)4(MeeDJNQmh_g8Ayz~bP{FG8NbDOT)v}%cWSSBUtUZydHhhP
z(PH|!w!G(Y2y~EOGo2Qn@W1iZXH4^uC>W;=*5ty5M=bY$(8(v{|Aw9bK_l0<10~jT
z+%}SnUGFJ5$!)vtVcpYMQvTAIV+CxMtAg%$X3I}JkE{Hid|~PPTCVAXqxt3Z1-{s_
z8Tb|Jjj32zj1Jf2AS64yUGkHQ+<yEHcbv9Vamv!2{!bORsd4iOGY8}^T0m~+-p%43
zkE>2sPBSGUg*I)Y4Pt>uk|zX+Sws7^%lB>#2weoBV^1b%f!?4!QvQz>0sQ6~fJ&u6
z{#@HWIrt8U$rN9+@DqB$7WU51^*f2psFqV?TQCOYl5PxbipkI>WBhOPv`Zp?NDyk_
z7f-NtiHM7%(gvP%#RgWOL6v;e3_(WLOy~*$@2%hzz+Q#Ve&LU4V3yoO|3=tptw}g7
zNI=@6sxP1sd8$i~M-#03Eco78oOGc-he!rVTGGbct;aM}IXO79(NZIhnvDbUjuYt8
zcl<{k(W1HH-*VLWSdKtzfh#nf1Hm6<#J9^Uy6lKPgPD3`SbE@o*sOHDA&jC_NTg;n
z!CgT?3TX)fgsz_s==M~Ax61pIn8p|3G1I%{x$fU+T|3C_n+bzci6{vIexIk>4ypyJ
zq=CAfdK`i%-2i6JI6<R*>!qiY6^#EQ)BYEf+!y-)sUe4mq-YKtHS?<5M*X)iB{ch{
z6%{_yA4XE^o>nWByX)OOhS@#(xl?K2SL(2dfj;lFl?t}+nCvOxq?iijl@6Z3{)fdW
z^M?ug1*bCL>_4~icO|)e<q{*SMkPW46_dB@dTi9X7w!w3P9~n$$YzB^)hg_@1XjiC
z%rC<yMWl9LlL4LgJCKFdoYP_f4?qfpUjHq=y%eCdQ|0^a-szY8R_8SZnsYr)AdA5Y
zx9)B66T2n@kgH~FD*ckKw^mcSe-)T)_@{X{aYm656B2yrB<$lO%*9y!vS5^|o&gWz
z&ufuGL2;BdF)=dnwUqPMGsT}^qEyw{{cv`VzeI+7ZI|uIP|Sn#_~+SfreArmuiWjR
z(l!DxxpO(5PD`jDH2E1h*B{+mdV?ncVYN4L+G57FG>K#7zn(!w)@mNL;RyhHYTp0s
z{|||Ra?!XznetHrJ63~;H$Sx0zj(L{x^0U;Pvrf)jA5b2%92z=(Dl(``-HX*O?vP{
zdBZLh<m&s*`Pug@a!O6z4%nO>zazIXSNXj}Z+|sBLji>K1amJ6V$bchqyg7d5iYCw
z4}>;sE>t4H;p_P5T98W_bAnBdAb>1jt#zEKnHP2sL^D^mZv5A1v;{Zd#hP*A2OC3H
zrMq-YWVrpy6K7EQ({Fx`{QX}RK;%L-@=*Ai2|+&~JHF8u_IIj;@%^goy^AkYpwHuY
zZ@FjYzL}jF4?UZWYi^wEwAg*XwtW<(6Q(N8>_~E7fbBM0<W;7*1bRM#eiHt}Pq4he
z4*=H>@j&-#;&j<O^I9NSB9HqbsPc_lY|%u4KY1F2I0^%g+y`mA3O!)v#QdNA|Idni
zTM^9XXMXojJn*hW;JRtkTan^H*E;m;uim3%LxDTRiL%w28@oOcYIBrni4k-cI~%Ue
z_DaFQDQ&qo2C!e8GPGxq_6A#<kUh6yH;Qwcnba-wgvx$$JSZtKNzU?o1FW90v-{y0
z|6+Qr9IJ|}{o0H-rlaJZ^~uM875xj0MU*?oNccbQ`=mF}z^g8EytAMP%vO9{nK+|L
z(A!Q>-IzCHr_`ccDZE_MCArZEs8w-G@>}?~3fWWJCf(`WWKu`JMBdh9plBDbB%`A}
zE)uqPkSPY?m8mYPsejA(S+`N@3ycxfuW(rfIHC03zwY%P=p4R3afp-f;4IIA%bX<%
z@}V~qu=F@L{md<J_TH=*OvRg|+-L<}2T4tfrlDalp9p5Z)*N<QOoXA81W`xl6T{|R
z*!E#HL2jnUe_pkrIzKRIUnY8GX=tsew&raCS^rwTHs0YphE{xi1qEl_a5hQjRwSd)
zoi88IB$yq`na1*4f4Q!vV-9kN5lizB=ymQU48%YCuSW4?dQ0mn=<=ec%sFzJi*#^0
z-UnbfUrZq861~pt4~RyFFO_Ar0VdQ^s+!!F=Rh*X2!9y_q^Kz&_W}V-8;Y4heVQgF
zJ#0Ukx{WJ0+YPFndq0l({}}u7cqrTU?`vl4ODZBuXr(A+30a0zh!B-*jgpXLDMgqW
zw1_OFXu(jjM2PHZM)oB`in27ajU_vo88dUe=cxOB?&o>l-|v0@>JR-fpX)lW<M?jJ
zaoR=-K>jg<r^f`w_JmF`We-UDS;8++@VyOCu<gk>=QIQ?WFYeMkuFY%c3pV9Asn{{
zZfqYQ0wVzUmz>(I`+FG&5&TqDXi#7||1Q=y(--&*;FWgd1Kj8g3<RLR&NzS!^Ia1n
z$SD~&+Z;>5oh%Vr6)@)bR&tFp=qK;r=5Y@Wt=tKOu+e;|<j1%!F99&W^&2H(KrT|2
zLAJg>>{<6R><-jdE^62|V{5^z{8o2YbaUnQbqq|I<&RuNigpV;E?!?q5o*xbu9rZ4
zqS1etd?n=Khw8L0C_<TH33`qQr|0B$ZG=FHWchf4G{$DK+)e;{9rk2}VtXHeOH(6`
zEG*_4W&WFUnSF-1nX^`D!_Sox|EizG^@n{ILYy-IK+;)`Mmo?BiO|fP&+KeVOdd9q
z*YRX2be-&FFR{BneiuDhbkA*?&!oP>sm?G?drcuKc&9NT8*|gT)nHm{ZRW%|kMUXz
zG<L};y6{P^bIo1m=~GMz-4TsWF?`v7f_h+Us6yueGD)ZG`oQA!r^YJ&;*3nU{xWbf
zr&;Nkx4NLvHpy)jc}c(Jf7JGkiXB~^gE>?J#Wsp8TS7Pm-chTz1u`uP8GQ5%_6?4h
zF^Jnq#^ljdT2%50v1(~+$9pcNAV&octR*&YfLCtyBwF*OOYo)csej`8-t&e*Xy&1<
z`&O+aAhb7zB>>HzUa3%fUKR40w@Sga{8fWqc{`vNiq=T(9;q9*WGoeRKcyWi=?0^a
z^8d=+htHUmJv-OZZAg8;0U}pH_x!EbQXY}83>&`wnUSs*1x7A3f2F~2|4YH6h-%$1
z`4Iv{yIgWcWG}S?@y$!ZVm|5-E9lB;b`<i%6;{D|`9y=VxR2|YMW1A@s2dWyTMrn2
zTuG!p?1iKvIKi#Wpc93@l)G%^K+FQpT@8>=nn|y`%5XmaVwxFXNL^X>7f9XhUS;@R
zE%GWLy*?~^=|{Mvu{JB`YvQGa<D487V92`gimied>-4pdSYw4NTm}N<1zjw6t(s)n
zWDwm=kLk)A`oY){^-b4gfq5m4obHf#W67hM*wdxL+d3h4q2Vf0WWJ(K8xO%F-L0XS
zfiatyM%g_0+hFa3+}GcY^L5h#5XyKAPH@COP(nX619Jlie%(S@6foj2!7(zwy!~A9
z_>$z1>^kd&9Y<Eaq)oQU2eOy*ktNK1**J6ybYo{Qk#CfH%#!<o4YFASs&xP=hzNT-
zHsr%fQI1$@+kE%80NYKLO#<wfz8S5EZJf`28O5$1g;ITRg7*=4hoZb^FTMJCMr9u$
z)>;sckI=(GfXV^gd1k;^9K_H$p%U-k>OV-OVf;&k&iR>xI@-VMSI8nYl~b)48v@y8
za#O`i;V};yM64rlJ2TOnBt#{%VvuVgr&iM_F4Y}~*@I;`ac+6+%(X|)L+ACHuQx&J
z0_#*8UHU)i4rvB$jx<1*GOxDw%si)->ziIlGfYOMt^o~>Ln{DQZ{au%bDL36`Hu1K
zEKHw=<1@~I6qm(X=&TMW;5LE4|NL7M;#AW@eshB1nE?=|->#?Y*%GkG2~c@+l#j0y
zOI5mXre@9~R#AN5@rNqh^WXU23pF0Tg<Y3H{!AYfOL@tnznnDC;!E#iyz7?}>tQu5
z?>M|J;u_BU)MJ^=R$R5(a+2ywkQCT-xIeBR7xQ$P{Ps#ZBC`i_QYZ(W+|UP>l4?OC
z#J8#--8~32hgF9T9L*gWX-`&<>u-(Ji=}(u*t-4c3U>A&^1kLjw1k=4nW6)PVY-@0
z&;r%@4CK7S0xnuMbb#Xce{57r8g4m^+-?`8%}}M0dl>u=m8sKe+`5U?#8x%dG0B<H
zi*G}5!hHE=b+D>`&>B40sHD*W&K)Tcd?p}2eIBX>--s!oUtsJBR2C&OQb?0J<$3Se
z3)aQwl#Hoj-*2i9M<qW0k@m~7sVThID2i8)$SFZV#{!5#eIso4PDP187_^&xWVxF~
z`0PwZoi5B2jss2l!_48Q20Zub?2&sVuEvGpJl@IC$j>+M@WQ$3nL?m(ON`WxvRal^
z*B|qT4{QXef@?q28ecPEi|(uKGg5_2h>taZ!;rv1Ve$kGdt#YJ&e#DELiwZO*NRu{
zV4ZUL@1i4;J267{2A(T_+?qfQ-0@^gI^w+inVWEn0bxU+!M7)IRTOX;VD@vgO%m6{
zI~gIfH(ZBj$&mwgpDb<t>NbReo4;qIuyWpY@L*MewJ@Gke@0YT`Lo`A#9mS&226!S
z?He@Z<jujylkn1)@%r%pO}7vDy1aTCIeHPtgyMkml&s&`R<jbiqC<Tx>blL(H_@c&
zz>Qx!pDo1SKz!OhOHMx=v<3-vtqWw{!otbl-&uG+0O&|NJ6Bn!RmGM`9yRM=m#c2O
zd#I8)xZ>pT>as3^#1N(Vl|p(nx0jwnd9?f}$Hq;NEbuM=1=a$<+un!{(%8@8zQ-Mi
zKr7lqCbo6B0|C6mUpfPDMUmBdn1R_88}Tbd8du|(RHQiY{`}L}FEbf#X;;Ww@1hKn
zz9y20eU)+ofv}a<k3<W05Ii}$hHIZOAL0G<23EYqgyci2(h@Y^4$BNg(&uMX?f10W
zVAb3oZ;&hVG<OS3p=V$1Sa2lx;AZm=>^u_eW#zRGd@HlAKt~2|TM~LB2~w%jSscev
z6<DUAA~MGkKd}BJwRV)Wf623Z!Wl>O!yuX0H(b!Y`V=GD%h>mwj2rK<c7>IPtHikF
zsT3er-tyV9$zZgmaBXn$Q=9^7;?s)IJYCXqN#8C*euriJer>Zl+_+c2X~?(oc6c$k
zK>OlnL}%N59+@t`*EE%BhciWeJne@zTe3X=l%SyiVNNRK)!rk@3r&zb>zwOdbRTgS
zO3>Hv@XCX`6M%{byZ|N3g!sA#n2+eP-Qn*zZjITEfUbnOI1g;}rOAe<mEETiKg+3)
znpvBg*2STM5Ir_jgRW<oc&f@_frxn6dPRTjI<C4`tcxi){k-qj)||G}k3+1S>p+k1
z;%7=%?`u>QqdqhYNLFHpkCL;ADESN@7-Syrf;cV~445zhV#@_!fo#4GH1pL?r)W0d
zt}Y5t?`r>ht2|14kum;ne&f@G(eAIhF!u}6{!2#<gA};uQ<DaBez3<qf{b&&9H*ua
z<v!C9tZl-jY=O9W5qS5JZd9wa6I8cTo+wVpc(=zOZ|}}61_;>vM)J`-RO>A(9ASVW
z^m8uXsha57K^&B+L_u?D7oUe7<`_0+Xvew>9_m8v!F$c6Hco?t6bPk(BdBCHmZz4b
z5u)qq9khEo3=}P(SE5<_z4BkzCV&J*p8k}n5h@+4sn?5Q=V+$?peM`tM9tpdF7T8=
zc=)re%g`p;E7?WzIEUA~aTGzD(Y^E?PZ$-YH%9pt@o?+*xcB`h>x1$abY{8PUYnQd
z{FfG-ESG9dGP^%^=s-^sIOzu-gY8}{MKVZ7WPvPX@P8`;Tg@~$T9D^cnO|U<tgkjt
zjT5A1>P~_n;Sflry`-RW7IfKLBFG1Sy%Y`pwyu3cqJO#-8#yb{hRmkmu8BT*VaTZJ
zRa)zeo|AaP<Fr&Ap|PErC%7b$IAK_}Z3r45wiaPG!2VYRydXUY*TMu9vRDJUH*}Jt
zsPvR9MKx{oxQ~G9$=k-eO?X&?7DKD42+lB`mPIwEo(rC%l+IT-ev)PFe{<`y<3B<9
z^hz|))dSfgc|5-sivnZbXB47E@%B8wzTHrs{GRx+2@3xHf)MH>gSQuf=CzS!%k29k
z+`5RU1pK*U$I5U!Vy4)~cDcS>hf0eHlA*4C&<9EeiPQdM#99!+^LPx<cP)^r0jiY|
zQH3r-Os~l!>6Cf^#_M0ia!@#ME0oN*0mX3wx#qev(utf;<r&sr7fjfBO>S9|4pEmn
zMU3^j*%qGjsRX;F4`cI<h-x;)@st(C2lIap4@hS3h~zp7rI;3~^3PJCGt<m`1pKXd
zUS?def6<t5kD590Eq8FdoNvR%f%AR(3YR+25-H&)z>Aji0F#W85TLR^oB})%ylH6o
zsqklzJbw0Gjx)8&8FUocB64m<f%SX@kOLF8Nnln^>>amgecCH$3^E-Xm;$46@X`7y
zqtift-x5o#5nD@E9Z1pPp7;I1H+JC*9A8>_*bVXU1AD_P;XBG@i?zJYXyWvf5n^N(
zq7i#Mnr{ax=oGS5(rh=a0a{Vzlgk^UtkP}w0Q>A`3ll~oQqXP=j^IG?Od$82Q(Y}P
zd|BW_0mAvMvef4xO`HKm&a2j(%f5yENO&2?@UnCuN)6MW-R8jA$#d@;0GTkkN1&-V
z2+sBi21@IXzr`S?);A`0A|8rjo3u&k`$OyKk`05!Lg~BUFdIaKnF2dfm1_dn%`e69
zs<iIV1@nrZJ(oRV*!GkGTtRp1jn@yiIFHOoZEhcWq667;#MHIc;^~>XJ6yPwM1aI%
zv+8I6Et&szvt?Atl%J4M-rdif{2L&}dcS(gE&(kyMc?eVLJ;G}0KDc;D1P|Z>p<jz
zs8i6aE{?yw#o5vJ8)oXGO7d(tttyA>XQB-s*Nm9sh3-*U)kB#O9}XJM=yGdqYQX93
zvnrTwjqvlQlzFtYXr;G4w+yvvQI<~NE-A4k0t?RwK<?Rhc}`6VLrR1nu3!w7b4LFs
z->;2P{PpD7<ij^EI+hV{8FxPKc=vN<Kl^sMmfLZFn3{QgZ7lVLlW!?OvO&A*ekQ*?
zEN9}3dG$-><Y1x^U<P?lT=<rG8}nWK9_vT!TiOw%dcIND<s=e*GPq4|ufMrtBKgtP
zEupvzP-{3Ip0^)S@WlE#E$Vg?!_F$Psrd`unqJbR3{EGfsTM5S{M95gd<B-h?}l#Z
z<md)d)VG~A@6X$7X8cP!Xaqrr5-iXbn0c!Ikkze;?_N`$Z!k^4`8g@PeoVMEDuE9f
z<%5o~(Ji4>pSvs#roKNs_(q?9K+RW|Y%tDc#WUD{Ntd@%x%+O?a=sYL=287aoQ8dZ
z&3aWo|Krb<4UOYoACP@~Ek=ESuWQQls7l;`T%;HD%>93X?Y||=hMi@;ziqcaHj2r2
z6FbF^`M|K4=dmUl*0AKTVh2R>5MP<^1m;I%STP`PXn?Z?cWG8x80y7CxM}%D961Lz
z%bYsw7Wz;MguEm^Fj@}70s}-baSYV@pfj{-NPMk~XB{ph`NjO=$vF%H-We@MRUGyR
zS3M@|!8y6761r}#bpJyv2>nt9^4CJjB834_eIIs$Vs`dVsDTrD1qmeXhjnlN+xqjK
z)P&dJk3F*?QFbC$tW$8KVvR;C@z>LRw=>ZpPnMS@Fy{if;l6e9woDZyo9TaQSE|ng
zLU?d?U23i&ee<>L{84zjGo>m42?^J=Lgk)C!V{jA%rX<6MB-joi)L)P2S-JEFQm-c
zTfDTDBYDa1Vs&jMQ$EOn$?|_{Tqjpk&vl$x$WSlI^RvE<A#!m+Hb7G9NZ7Y0(m^!D
zGQ+p_nAeRGUS_;5E@6aD9joA-Eb6?Gyw!kz1YoBHPp+&)y5gEJ^Yi7&m>*{zuAKAu
z7Wy+nAI=;TGBJ6YiTI(tw;qq%a8n|1bSUq~^5$J^TZctU&Acuss~j|W=%9FKaFp`d
zr5w4-=cYGv#xYu-f@0O8kO!*PlGmhLm-kn9b)a1j+PHA$byNZ`wsXd<JfOgXM^?bt
zxg1D8x%=n8mJ>~5BHvO^veleLkOgL&X)nX@aSQjMt0~JW0d6noGxOub&oe}!+Ms+L
z`m=B7s?DanlK6xjWq91T&7oYSMjKdHc;H=@oD-l<uEyh*wd>yD0xc-}@&0=`JZ-1o
zCz~_CmUNJ)&ftig+#m<)>hT<i{sa(kuK~vIG2-UlwqpH{Dx6px#+@T&OR#Q7AF08`
zZvDlF(opTg)w#3-p?H8!Ee4|?zk=trTDnZ5kOHCGoby}H${!ZI`cj7JS4J$mGrV4s
znTXdC9n2PJ8a25Qhq!9!+d5kjFz8)T&nk194IEYI0pb>GlJDeVzE;Cmo`N-;*S?x^
z){+I{s|FB>06YdEe9%w3wWW50d`QXVnnmd^XQD=I1ph~!U5>(csY9_qfnb_HHT;OR
znfC`hKpTU3LO8(xP$oq25KrS~mU+efb6Ugz<I(t?w_Fpq&GTJV(Lr9#q~2{^li4dD
zxIz8OV^#grq3_?TYJEH&_|&k3e#TrkT#TjGy0a9K8w%dLLA0h>Z-u|G;Wm_f*}sQx
z03`imsc--kuub{CpSHV4&gX;{C?_A!wF7|cIaxYx=Nx4V<$jMt(kx<MpZJK*?@<Y$
z?p`UR=<L#(5wln^j6pV9{Os(+RbvE(5~*s4%TM0<@@IxytyjY1PMu2evBq;<*0?gC
zBl#67y5VJ{#5O|vB~$lj;sgxNbDkxbf{*D2cdpec>~KkM<H39MN3N#%%G|R7Wr`4d
z2O=slHsB+xX%73kd<;zBFTb9@SA~66*8QA>^ZEVypC&BM=I$Qa+{t`3c0g2&wgAkk
zZlvzp1E^VWcdL4uKKD=XuS`KWUrqNYU2q^-NA%%4T-w0F&jvfGn6S}rxT7&pGV+Of
zrU;EJBb+xNhx*x~8*++yJ;W=K@+i~uCNyl3q_1o2H-2@P%`J5@h3F+ybO9K>EFXt?
zrV$m$HCA9phocpWGcAa*`jg%d;3lnFfPxh>tJ?Cv=7GX`!gmMn9on4CKK60JP2@Eq
zVD#H?5A&@)@35+t1YS#U&TZb~{aFhJc1`!ogV<aLADPB0hUM?G@ax;jOn#@R=@GQK
z*~W@EgfM$)pd>O9zThl}se|YBt{u~W2KN<&NkJK$bpq`lKe=yAr8_@X-`htF{af7{
zRPa;UGBD$nU+1*8;vYG}XC>XI&b2%qwfT4N4~HFuY4u{}*XOOUaTbe3CQ!A$$ec<E
z9krtrar3AB_Ds3+nV~-7jeZiHC<9>@Z_Q5Jn=t}UdsMex_BLmyh&7F$@yLmqa9Fj#
z+p-SVUnO=Cs&#dy?~^*V(0dLV%d}1bFc1(<uMQCSshQ6P$c|a`>q^h~S<YlvI~aKf
zlW6rh9p2!1hk~+yYymaorV2Rmh}t`BI1&dGZA+%DegXncGG0eBI-o#qk;r72-<)wP
zMr>=}V~-L@lT`e|RBJQ0_IYEHx>&)>R=Z5crH8X~$1tX$7w<qBsP~1kmD9K_6S}sx
z898;QQ>c+goJO@NL(n<_M)&jpMwhTIC+oNC@~{qKyQm(~Z35|LWic=&y5s+W`+f5d
ze^Uht{O_eD8XQ6X1uwWYAPa2NBlVx~8-yF}@l=e75{*itJnbYrznt-QN$DnRrT}l+
zxk=u5?4kov=w?gWuLqr*d4G-fm@67rP%o`%(Xi!$!z!%#!v{^PtZfaXN|V@Xu6-c+
z4bJR^nC5s7>erdN+AGRR?8(Ig>p@JH6T1QaOAN0h1R~%i{#!qJuWqKm%9LrX8Z+X<
zPZ3MfSN{$U4i$2oqt5&oW55x-oYJwr9oC%S0<a6^LXckvA3@LdQ%U+cKSi`@5<_~8
z$;hBa@;r!msy14Rf=L8rG~L!3dazU}*(i}SviyW1t#*?^ZB`W<bD1zYFJSUW<Mk2V
z^Eod_uzYG2C22y5y_|WuEk~rBT`cbMGN~5=N8?n&F3@UyG|GKf{Wy-{273P!4nsKj
zgA*wI!EV$5!yKLVV@F(Dz~C~+E+ppc9Rh>hi`BLq*=lKJIOB{1v4JpgwttNhG^b9$
zG%dJk<L_Kfpc1IRa`G42L#(3cO&y5lWBzJxhWp4Eo?p5@DIk59q07A}ZZY3tPztd}
zJb8KGyiA5`%064>^2tSV@gTZ$EYn-s0N657K+hA(!LWRW{6w0dtg+9;_ne_y%YkeT
zJ-}`$MNXTY3S49?4S{_&|A-D|Q+|Q@iT_J#5cuvT*ya46BXqR{6z;xFK6KsaJ8s@m
zfuIt8P0^NaYe6>@SeEe4un4o5uxh8+wna5HJ5Q`kcssqm-0aAW>=NV4g_ykuCq{fP
zB+np!P9C4bXkH#eTCD>El$%kWc$Ebo=@VA}$rW&NI2F`v^?@y5fZjW>>tocBg@TzE
zu6NxjBAj6ri5`xmJ8t*lm$RT;t5);x^*gbJoG^ptQsWC!LM|d;`W6?-?GX#CT-6me
zkVPG@uykI`%My;;Wp-`tUeo<fWyIhugyNNW@3&CLb{Um<c98BD?Qh=5dlx^j)S98I
zwl(CX6Mc&}v}VDJm;zGTGaCy8-z8^|IalxG5ZV+p=MbM228R6Ku^V6{<|?noYQUZc
zsaKSOl6xsq64Ty4(z?A3?1Hsl8cqKPV|bTL2^%3DN+D_`t003E4<Xat38v0Yjh#Ew
zg$&+UqlYz+8y_|lNuijX)_ilem-SJwM<sghn(b2uu2i9iyxFL-C*}z%+fUYv-pyM$
z;m3LlJTXGBgdTY*KdU(suF#G|$*2F8S`5&SfRED&Qpsndt5#K?H^I9ga9u(d5YF{}
zf|VUEJ&92H-+3G_k4XtzAZUhxEaqR+Nhep<4`%Gwdj{c7!zUukUnXHs@%$2cjAR<_
z9P9SXAQyJio6zwA=SgQ|RlYwQR&F#*2^LUsdcrp5hSyt4GQ&U5Qv8m#-IPtfGV)QO
zW0%RxNSH+{55-k=9>FGSL5gJJ9!@&5WR>MMuCAMsT#V9*_KXj`wJM<vX>kKFAy+vf
z<bPfIp%omuDpa4YkQ(?=43v$ec#*=b^1O6AOB@*6Y}w5|bP*5DnoE4jHwXacn7{b8
zeTGNZp%W;t2KgGTDrLnkDA3moU>d*iGO5t#4NMVa&&tQNNO*^ohdoCXSoxHH_82Er
z0PPekrpUBN{gnk+0zY-cQ2Z_S*w6+DEM59nTu|lhziAsczHzd5zX!j8j^In=J+&i{
zo!hz22eW%LF?pVfKP`rOIEfs#2)#W17R+ZPPVn(Ld-w=EysYlIfzLX6HU9cCK!-*?
zrHZhR>lQ$;frQnfn>~nQ_ncVFr`bE8QV*SnPMrTsQ{BhW0sq9uH;eFqaOfX#V{kZ4
z7bcb5^FZf<-Z%VR4CEpH5e@XU(ItZ$tD>KYrK+5vroM}hxvmDO7!cP_6STRl5jL_P
z5OFQGx?fZpopOcSAMJS*a90;D)HkniYZe;PjD5Q&o*U9Dknx<&#~lNPW4{ZI7vk&z
zsshSObphiG=W_}xy#>sV*wyJsVHM7_NhYPB!yUZm+RS=J^ezrc1M4ER&V+NOJIqjx
zqN+XlvQBPmHR}Xd^a_vz9m3iX2_)Q_Mx7@3OA;0VgA~k;ZiERuKHrGTxH%uCSrifa
z;cjsDeki?JVgoGvgI(zNHnZNmU-7_x=hrCMshvC}c<)&L9Te>9Y`FpU(zR>u{0ZWW
zBrVN9o+A417$C6efHD4iOp<rtpSwN&E>VYxjjMTwe^WD7!%QQdh=km6#4iiuA046R
z%7|P)b(}P2&>N2K7Ep}SHdA6p&0Wo71|epZGU?~eNLbJ2mn_+MLc`sUNVv^m(4_&4
z?}3fb)zA|kpD9$d*)%Pk&ekO}B|28=Lgec~+&X6Xek6zyNB-uBHFNU77UkdsYmVZ-
zTBjN{sv51U-+MchhBEv$a8thpSP+Cc|8~RHo@Fnl@D<;-=c_r1Q^XwEnGN*bMaKlH
zij_wE6_)FON~mA`fpH=|8w7Eq){GssxG9#j%tY=&n{@K}4KxbC0_JV$Ew%QAANok>
z7K4ijW|3bqUIt%rE3Mb!`N_Bm`#E&2%+i@w`QE7$PNR}8b#Sl+`}PE65DX@3vgR&$
zIF#mrjJ2I3>o$w#oVA;y#1j7mIR0Af@W1T~kzcCBy7&ze-Y&Vsg)azw7Btv1&rBQO
z8#|icIhktv4J}$2-^B}+?}5ZVAwL(uGE513x@rECd5>LTxbaOd8SkdHVUVRy#~>jZ
z8Ih&5D$ZHHqN$K4iTmTb#MRF^-4cRYuO@+IGaQ+X2A0&tA*_y<;i{JY6s$7RhZ?en
zf<<+-AZIxSn3@$IFVzcV^UPwvmM_P@ZAq<N$US2q=M1*<xkwrJiIEqm3hW$N%NiCC
zk998+mXL5~{4cSpOmF^y?@gq4*4dc5NT_%aSGw^Nf!u@?jC{=$Af@QYs`7?DmpBF0
zKQXQb_I_$N#9rv$Od_VZ(IVmSs%zZvn^Vm0akoS84?xN|M;iElTE_wN_2f8!oPsX~
z)+{W|I&C<~Nl5(_9{g<xZ4<mGQZie8@6J_*X5nkfr!VcBoOqL|XBsVjiH;7s3jBJ6
zg|nf+(>P5OBe_*FRf(yP%mmX)+`I<YB;CI!o+%OwR2|Vv+Z#XqWo}S;$Hv7Dm;IJj
zTmzI1eX2vj-8QTXKz)yvum)p4U@WImqa(Ee6#$ZD;Fj#DKejlSPPGFthO@~HtT?n4
z<ro6dEeZRk?yS;c(0e&?!Pg<k3XwdnlJRnDLt^f{zR47Q7;MrrB*sMW#~GkaGMVF*
zO=zct3tW8dc_}oi=4Jk6H&wh+7|xVe6`!!=0#)1b7|n&h;BG%LM-ic2Cy2fpBwn_7
ziZtMOxFlWeT<lT}&@ifd4}w$?fLUOTjy?y#{&g@{H;!D+*N6d=N5JlJW}5T#CFTa-
z?)J7CAo_}4l{?L^45-)k0iX`5jLuEUAmWx+$gVpV7kCp+j@f>KYQ?mLQ<dIy++LA@
zl5%A>4Y+`*0nzr>Y8)}%^<zNjiSkxaCu;W1Laj}!vO7FDVFkdI+f5;8o3~2gM%@vx
z>>!1+KR|r`&DjUokLULm`23Hl9S=aq`{YD?j&p`453UaQudbHk9n1jpTiSC#2Rgig
zt$PQ9oKc=xqO24zrznnP9^w~E=9Ui)uC~|NBeCAx`^@K!ib?e#wsBAvA@kDHb-O^I
zBMCQ=+CG2(4CtXkGGDqcr0g;gK0b$D)!_ZJIk4&?%H%IrU~JBVU)NVF1|qm!(DKdG
zMfZP42&pquDLxWbKpL_GBYnsEJpaWC4uK_k#It+a?8G?p84VNH>GorL98f>$5}yUw
zo3gJHGm<eP(TReLrM&4^Yf#*+f}aW3c*aHp;co%sqo4rEK4B7CcY>_<5i7;%7DQh~
z7#zIYb~YCA%QdBD14~+n**ns3Shb9~y^>ulVn2s5276f6qf)_7!-666CMe<~)Sd^{
ze{q5m%i)}O8Rrm`fweQ7>eLI|=^l-o0@r`Y8>uV$j4M_k=Vijmqww_~enCq4mV2Ag
zQpMyxy=P>4668o8rp)j9HSK2pkxEYDtI{rCR3;KGv#oi4&Epml`_BxA$sZ22t__{~
zTxPi&S}@{Au$MS(|4C-Q;gD2XJ6bi2pVMJE`UYsNpw-T`b5<8h1MT3x<w+j#L8Lcl
zux#TOO)_Qn$R^-mV_83ocj(_=b^99y-;H&@O$XxvlE#NO^7L~iz!#;(Xy~GHUS?nl
zG1yv#Fpw$#{pm8soF58phcQ7Eu!%PMh2R7YhCk?Czi@rWT}sSQZH&wHg_Kw8O=l4T
zSzDex<eIW*y<jNMmmNtnK>Ap4MQlRu$%K%DSlXa3?oO9z<IK!Q>ZPLsA9Slc&pE{M
zP!2f_rsEvt85?QTFbAVgSFSHLTwrF7G+Y@T&)kDEUx;Ld=kbs>p+{NbS$XvlCuDa|
z8e>EyA-7NY;3`PPsMEv~MDuFBA!d_C*zndzhs$KIefI9|#43Esucwzj72S8?1!Y&Z
z@^g){55}KV{21i7drmT3+qP7v@9|~B%WDR@V-ds8w(H-BO-8Jhqg$G>Zp}ioIx7RQ
z^O+;`2l3Du=I7&aC5Y#EXqj-;jrg!{x39WZ^SR^z(FJvLXD`QaZnnqMy&01@Atsgd
zn4c}UX;J!ur21TO!##Mrf`v8DUV?iu(If~g<>}Kq_vZ5u`yyoG+EIuFo_9~<b5~Y+
z;Z?^(MaGjsrpPPGi`T_Qmn0+4<S>#HgoJN0LKbws;;IaN*)jfF6LOm-m)GDormlox
zO-&5STv>gg-bvMzb+3KlsFg~t5BXkE2l>{D?4ezkKvqi9G_@@yY596(iya*|9V=+-
zLwW<%MYpkrW{1MypH*d|OqZ0k&Co%*H45*T8tD>qTKT2UIyK3yVpUR5$aPk6E~QB*
zx52eT3*OK8q6JII-Bos345}?o*fPD+_OOy{-Ic#wfos%);borI?is~4x#y2@%h$!0
zy}@nbcLwPlmvPX_{y}b<2|U3!yYObLNbIH#{S;}&QaHW&LpdUXO=>89ld;f=NZXBo
zRR_vK4m#r`;YoQ19(HMH)!rev-nH;qi|x_nqa}(~j^y*sk1DS_bb0S^89u}V#T_Z1
zNPNe~YQ8qqcHWua+x<D_6(+-Z_oTw3!w@qkcw3=)Iz_LRE;u47N<}v(toz=6h$t5O
zo?Jn#z?BWL6SZJ7J7O&6ffKgXE&7XP>^z2%Xn?A(!HFdj+@>2US;r*}qQ2(KQ^JqL
z$DmT!T^1x<iHmm>Yp3Ez5_<G*Pg1}fWH32^ZX^Nb<4jlxesT|9PcIjb6MnaU&$MQ$
z|0m)Jw4J1ZM!|Vj=FZ8|J6gCjT`4N2{46g+&nyWYA)L!o7_nrw)FRfmR7R|)YjXKf
z+d0SDtA)?oJ%h477BPwSa!kW!qN8_2FThJ%Nx1K?b!cW0Q`Ze->gJ_26$MZc4azgj
zJ6do66&<r6@=oaB(vIZLkt^@QMfO{c+I|i_oW}Q7fJM1A#4cW$uoaobjM7z2;j*bW
zrm&XZd_3E?8uwjJ2KcrSjN)8^6jUS$)$J3>qO5CRW%k&mjTu95PgxlCwJ&?QaVrGB
z!o1P7@3L&fY>B;1U-CZ+zNb*1-2p2r8)!8YbagIC4%$BHu=Z>HX6VUQ=)-09BmIZ7
zQP+NLUc9vuPkzuJ7;dPgKP?x!z?G%Yz}V!Yep`Q<u(N`TT@+Ma2`{)Z$)PM+RrZ3%
zkqb<f@pm#vt4a%3=SMm#Qm02QgO@vW%t?w$#IP(*c6lE_nfcTlA`xV+*H)a6wxv02
z?~RUc-U6}3<i2=6D^3_x`)03`xO;2a*$n^jHG$2Hsj@vM>AHE86cQ{&g$c_Lf%ttd
z%@6g92f-|Gz~+3LAq74alot>+m{QbEwR_|)!)F<@QW>OMP@1Fb{;9(k-k4;=dOu|$
ze<`#)N2s^5{ul}OSaLFQyiA<Ry871flzBtS(2fFc!lL)H`YM&B<>x%?w2epur%cs?
z=6>+pb{rK&;U`X^22SvFU5;HLb1^-KA{Wh;G$FPIJ8Yju8?oQsN@fAi_)>_i@{;@^
zd~8w4F<dEl8*57@9O0jRM5WMGQ8vufDP{$p6ed+t^a?cN5@#z}<=f=Z(F^1nuD&)L
z&wTP@(>@|<s(#^WQEWW>mSjT9;v>dBJ^cz+;Q(<yOn~IByb!|AI7gpc{-nOoQtJEy
zUSpI#ZwfP9nJOKZbRhLMSl5^Rx$Gij?g}ND679S4^OeEx-xcN48pD_p06%;BBymH*
z!3pbH;}66529}a;%r&XkO%<3S%l77^!<)LdN1mw=cZ^}czt)i+Eum0R)$;wJH(KSk
zv##j;l&yUcz}`?h^a^pAO8IJCk28qj2^N5=%srBDT(5)}w>Rsh56B^D3WjMSN&zy%
z<<~Y&zHu6Q%=2mh*DVR3ogDl$M;r}4)2k$YCvO_kiVi)w13a>eQ0oOqtU(6B)S0wx
zVKiZLZbP^@^yL1^WZ|yu7yF)cZC@J(Kf$9lrq6?K(2nR^at|Mn;eS^O93d69tkCI1
zgAB~doFIvK1{DlTDoigl&^!i2WDD}oLYLiSlex-L1R^djXMSTF5fR9*l`inuAp=>e
zi2K==A^PT#@@t=b**`u*63ouj(nFn6Of!5)Tajx$?sDZGV(X6&SA2X3LnWdOno`MY
z6?Gua$*u%n-Mv^T=)=B~#B{7{r7!3UT$(2W-hP{UxRd77z*=5QRe3}`#5oZMzaO+y
zZ}kSJoo<kYc@lnnZ#I$5vofOz;exAJRU5CW6QNmFn_d8~AvD(#+2QmF9c6(qNEjpQ
zY|Q<*epy?=KsVE%H15i=;okP>G$&vBU1YugP+e6vFHL1Z=KdUk=a+FajdHubN$y|2
z&Rk3bVn~6GJ7d?(@aJY1`${uU9rN$Qv@kUOtzvD9au?2<y}!78l_96v1`}r>EK4lr
z=a3e>y>_g@_}4n0WtSZqumsoa++8S~(NEdPl!#rS@<YdZM8*)3Naqa}$c?++>*yRO
z^=fq8gSV2<gbd4ixFK09ASO#_z)mRFuQXw)_YJ}zy3z$TV9wJu-op6E#mt$XmGnp=
zTBSr@?tP~w#tK{vdRu&LkHc+y5#HPtdB<lL?3Ya)Zp)n5pAlejg6O=vtd@o;TtVw`
z<EQbOTn66q4{3rUE2Pe{ew<9ch^ZHrRL6Y&g1Oe+X9Uuur%$;oHVv`&(PBxiNcJWx
zGNgEOh#gXmn?fvL$d6-IyoiLD$}N6lU$69W{aX1*Bal1JG(#zMQ0iSy-J0H7FZ&9S
z%6N1y8?^i2QC{|N*;c%Vmt!aveDL+gpU_8$#>#1C<Ja%~U91kp%wD+id^*69=oAW%
zJceOr*dQ}eb=J~=y_C<r>{KDaJ2{jbA~d~;sRFSFw(i|m&>-IzeUb~#O2%IkdAHsz
zbaT(kPQ;n8Jp;IBRB@ks!xDIBdp4tr+DIczEMdV7u#U61NwOa#(@ENOeP(|fMv?qj
z3pdCEg2jb07R1Vk1qJ<$NT!mUdWXsv3PkIs3D$ou#74jG1>h=S=><;CzVUej>#nbH
zu9?P-`@4<i)|yYOh!nsJN~FYmrK~f-j`}<!)9~yZTdN37i^GpKqVqlyKWSM_)$kTN
zg$!>Y;VB=5<sRL+>L&ZKe_49*b=0`c?41^to&dXiAVH9gf=0sNAcGb0k9KNoZwHSb
z$(M{I@}ys1hurOm*91@awxT#sw!I#DY)Z7LquUJ0ej;7m+VW$N`Rt?VwHgnAsj|Sz
z!I{4s>fJ7u6fW%4sPaVFp5u$3v|x&U7;7d-tReQ=u&~9T8xkKYgAlKqqnu-)8jnoX
z9dg!-q8jTk>%VRsmKbE(Z0|F8!S5s<@;<E9x*nE!*mF9Cw;C;c!%SU|guZTzre;gR
zMnQ+_aW(^i{*VkAJXudWv<7rR4T^M;wE}fC_7Cjq8MBRD>86>SmwbT%eQjX(qg%mP
zRM+-6_>?K5GH+#YrW)_hf1Xi1gXLYBDecyRJ^9}&73`N?q<kHTfe6`@^heOFo?<rU
z$5n_clBRB`Y8Xx(nz;fOkI9+aT0e*m>>yr~?BAMb7dW3+PC`rcB~+u0OOh0hp)y-(
zGdjoNoIBO<Ri0DjMfss8r@IQVs^35RKh=W6ClV{qpKQ=g58Ym7xcL4=o;bPU395AK
z-q+36UEb1eJYOuIL?HFg*|oi(Y|Sg)GK=P-*<J?t>tZ7hx#ANBYY7g-BM~l6n}BHo
zzbN^L_gLb-s|_rb?n0UqE2|!sT9yN)^sUt<IDl7fxe_;c6YKGu=+1LX3P!jO4y~AO
zMt_#`PwNj}U+_E_WzeCOQlrZ5Zn(tHzM_|`HiYihK8Norue~eULYUNTL0G-Jb{169
zhT8fir_|=R;32=;p$fI7g9qDvT>K3-n~fk5q(DQ^a1d0KHSYZ1sDU&Fbk{*9%#!+<
zi4F-vm!-67rd@oWpHJk9le-0J8Kj)zK0Pi|U>UO%v{U$iVF7j!QGq%#UbVmdKq?k>
zWcp0*+u1ErMxna|m{+b}a0rKcqLTD)JdHDxz_?a0UpJ4BX_5h8@Scmf2PZ8*7on+i
ze%=IC?gap0tGL;xy=xcl@6{ggg;8BgdhwhBk+19(bJ>!M`Al2wyyiW{$?grb?s~mc
zY-~x_nm4YBH(pP4cJI_X=k#j+ti{B7D$LmWwVME?q}2Gbx0RsLmt*7UY5IG=W1u*h
z@mLG4Tw_}N0d|b-RRI!eC2r$hXoqs5jrjdV@|I#BgGcf4{4&cabLcLkK*x_X%kkAh
zu^ymCyKB(T50GN~#U$b?NObD}PtlAn1hM6DU8<~RPHA|3UON^`UQZPPa3R{J;={pV
zKJWbs6EO`-y~4B_0J&OLCZ};ii_w-02?Oo(ZTPjl7{9f65m6u9h=JTvKAsZ(N|B4i
zD4DCAi@0+*+Py)x=>!CC!>f&@8yL-!xl0{q<%X$$Y69&Z+?%+HwM*S@--BN&T?fCA
zQ_4zmDdzPNQqYx6%aps=?Pz1FYQarSP8CzJDM(mag@`Bh*RP)6g!bf?e{q8wHwG{-
zBtG69+zhc3Z?NGI-e1;T<ZZs}tf?VpG^`Z4LPSihl^rk$NLUm>FtQHdjV1zY<$M$o
zTn7wz1r=vwFO!FuE-%GHx9j^3NC~f&hACMP@w_r42|H|ONhi(`w)XC~6di%S-um;^
z$zFthg6dkIY(l&fwUEEqB9yzo&^?KGLVUCQbQUF#b99H8*WYxtx&8+)IP7_d?0@%p
z;@I*y|4;ZmVr4p3I^WD1jqwC4_|kG&T1O~1iD@SmDBVM`GyV~}*SNT>W<qgS`{c+T
z{Y%RRa+B3yO{v`pC3yr(Lu2&DHe&g8r;KeTruQCRMy@_?US8oF<fn7Qws=AIj~hs5
z2~aMA%r7O?({m8=t2lLt{dvYn+U|(VGGSL6frF#Kmd#0D_(>N_fYoty%)+%Lj_ggU
z;QCPPk>QVdH>ct3g#2MYOIh|zf;%HSjGWlY8I({T#~UJ@2Gc^P_4xT7QU+;el5mk9
zZe#n__USu{(==o3O|2o^zAnl`!<2p8R&{36*W$gTwJz4f>jnsxMcv@_YtI`&w<S-H
zw7mzvamDA&or{oA&k`jcdk2F1H=YiY-hl*tR}BHb(sgA4glcWaMIsCq39>#>UZybg
zEbWM!YUwupTf1KNls%yMMlYx=uop)v!2M{<cl#X8#VRrP#xd&$W~v$MuhG?@SlSP^
zG8aVWV=4yd@97{2qmS|pQyFj8(HfX8ZlTean*h9r*q$mzj05c){=KVn#M|D&m>3O6
zLP(Lu5UzZa4wUg1FNg%3TNtl4e!aATRVjV?gESbEo=DtT=9YvmKN1(5UdV^=HD;9r
zxpBE%JL7qn@um2hLdm_^+eawdJER<cY#o=-X8qlV2P~VhtQ8(6G1wurJZh@6)cuBB
z4PhHxGbBF{>w(Y_l;87_TAr>02iTXz;0C$MqUA`quT940TcF|Loy!z}3}UM#<J8-Q
zncfS1$e1_GzI(8q`(Syy{Ik-Wm_YE@+haybb5PE^fT{tgp(;4TiyD6_uB|wSgufiB
zIMhKFqvEVszx>4?<=1Rl&YvBa{-zQC@{tYT;D7Ukm%HRf(^FCg=!w0)a9pj(mu_M`
z<Jqv9$spSs>N|-f`Llep^;Pyp4jJ$LuEQfVD7iy!Jrvd=7pKL|^gvzp{Q9NzyJ1|o
znh<+y3_s!FXs#rDCFSXyT&Gv8SNqr9V;>H8W(>%U$v|6$@T%DfOExIy{eXm_pMv6w
zX?BBVdFe$7<F@-VfME1sM3=)00F{zppE^Dib9%Xs65bRF-&&rGon^N0;;ETs_XzwA
zi$%nuGTdpk6$M}Rx0v_*$GY2MRutw~Q1ufl_n@~C@$|z3a%sz3XbOY$C||aRgBrV2
z-RiStV2mTRF@fm{ejhr`H0A6Al=H(sWkBCAwZoEVtPTM=!!$VNA2n<C2cWK-+c3Mx
zcNcS9SvTL^Ds+EL0c>zS)QYIe`vRiDa~o3NrODlGumB^mAZRAwurbXW-h)ljkd)_{
za;H)@{ahwdqVCWtn*tc~hmO_P^t*-VEJ@blzV3bfvnaT+Q27Z@9j2ql^;F8a3Vse)
z@Y^J#KK2D@ST{UA5f}B0*5KE1zAN?Lgyf;|5K~F>Cy8{x(T;e5=M>7WmhqCo3*jz0
zMlX2t4Y#FndT%eMvYHdO%c8niJ!Qu(N%~nyRy8K11@P@yWHoG{^`hUuu3YroN#sU_
zl&X3A8ACDsnK6q&q!`O}r!A?|JB#y7>JG+jjq0|fUJRz;tdi!u!Wq%h;m9)vixT*)
zyd)>%&U>)*0D6?}2kO9;bntth+PeJa3E(~N04J0+y}6C}0i!;80<6ljv%mlW$=Uvq
zF~mMeR1H*bBNpv8dVL4g6|y$(nA+==^xZ~lc1hdlD!d|SXPfE4-Gl*p_p;^%L5o3&
zhF?J`W{wmJ!oA3u6qC#yH^mGZmyzRRv4`<>zP}U^smEeh@|E8`FkckGI@iOz3fBRJ
z87vo0)fhs5j8c>R7;n_T5}45*LXX<LC|4N5-E}*~<8vqp?asl7JJg`I=Nv3JqK2MT
zXxM}>_Z$*fQnKG#TgZn;*SR%tRJc>~KT|<_oBXtCK0@Zl$I(Omb7j~{1S~kSO!z^E
zzvnG6haO;e^!~U*EAm%1+P1Jz$pRER!%G?g=gd?;_hmNlZ0_&P!)m8th7pR$l~l>A
zPvuYg)r$5vAbtF$#(3Cryx@b^Q)Mq7V>J9IU*@2c!SCR~O3grzL5Y7ZclO@r`V9p@
z7i`wJkMP;Sx@bq_DYWXBqEgI>dM$0q`rx5ri*qsF4o3ovL|Fpe0|IiU#Kv(nz$hJ2
zK;FCq(QtHuU+{N4i^1Y)mPpJJvATvWeGyA~FP9kyzFY&XPqCgW(&5ARuCZ0>xQ1@x
zLo=5|<ol-euZXH5zKC60GI~sUb+T5)rjY;q;itT$*FY@-1$PDo`_s!45`HUiUY3%u
z8Kd$5V6T6~qck1^4B(9%E*-+rV6E+Ly6nGyYokr8vAmgAA8MjB8fCsJXMi1~CJw&O
z{fYI2)JNJ;2lC9ss(>hh_O52L`M<aw`6~<H%1tvH2#sNN8q-l)n8Gp~UjxuvanP{V
zta_Jay@8*~uov&Z!nWYcOz50XJx+!y_s{_WukE~2jq5d^>s3$dM==uvfAPZ0#pMII
zu5|D}?)MpPCDSlc3twsma2a)l`=`&u%1>8A(2p$|PY@h=h$jK?uT_{}NBoC43yK5R
zyO)J=WXo>Wdy8?z<a)lvpt}pW1^yIDFfsu9zWOp3!*}p~7KIh!LHWeYH)bRH1&^CR
z^7{J<uB+$N;B}`7%px`~PDU^3U_D%DZyuP~z0jInnjhlEB=;_Z(eW~kZF<*jahK|G
z_E=rx6zs%&rn-Mh>;+~+;<KTgb1KX0+4x@?0L)T><cUJzrLM<;GlKFAYC3x_&;%%U
zMrtf;mMS-(McK-=j@yH43zLkA#*Utc2XK6|`F%j8{TwHp;{TG!Oo=(2xJyp`jcXQ`
zou22*CRXv%rkfeBT^Ry+^!XV~oQOPKXo@KvZiyfXe2AY9X==lbU0)mz7Gm&7noGeZ
zlDS$FWoT@wX|QJ3j8i3fg-j#gl_2aHLd#3lzm$Ysy>uIF4F#&doO_c#=B9cieg0<}
zM+43Lm(&4v{`@X$pq#C3Og18dQ-0B+_Hi^eC%rJDi*vGZmYMLnA*RX`)>NXmrclff
zJ#j5{24V?gRQ7%4c~?UW^A$DFcQoU+7n$$R({E$XV8n&kh>ps%h(heydQe`=aGMz+
znTI=X1h}07jpCiwP=~JO_+#fyr%7yGN!W!RXpv;=1*+O|MBRJ@2id42GgnFYq*4?>
z;jZI+<~tdY*nfy05xb2#JWmq9DOfjY{Yd1BwWTGXkW>*uerp034do0G*;5Ch;3VSV
zt83EpePQwEHsIP1<ndqdY<}q8Q;&B<F7U>ilePKQ-wKG6vwBzkDjScpWbUO=J0MX&
zY@$(GK}l}PFdOi)B^4ChOL~8$9yh2e8P1Hvt=rfpJ6bs^1;p=+ZC5E-b%hr;UVV7D
zg~8t-a~?`M3}~?BpT;YWIQ761<!mo)n+k|}{@ne=*p3;yL8f5~!(Vs-HLvr{7Z963
zM`Ax7P4aJm=~D{$Ot-z={mg=z8M{FFm<g8j&$al;s<GRioeHdlHdF+jn5j8%9ga5Y
zYg&hU*CIDV+xqa3q%dFY#@zisl}$pkM2q+fyr0bxL{-|jVMFX5S|YTPL~S|GOl%|y
z=gu8V@)lq2ZMc5jfnnKfI!n^oY05~P@4W^^;FyfvR>$t$KQa&Whd;&750~=F1;`HT
zIsO92i&|AlA(}1Sgu{kn%eo>##lx;D)ajT=V~U%e-fVtH)aaqP0n3R8U*M<xFoB@C
z7pFH!y!nEjf`Mk&4BydWYaBrz;D<aDuw2E$ks~TdEZ-V#-sW|wns&V%sXffPAqIk3
zxq@^*R8eR;bY>RQb=9R^vHS)eRwXBzG8(*MLG`{L4}@q==?>{!gHMTaeT`8ajreMG
z(NP1ELTZ1>Ki^tYN4I6TavI|r2`c51MWHn4h>w(2@;S`@$~RSjL&r;NU4GZW4X@Yf
zab#U2lgJh(!y$sd$lj$6`Aw{ZXFrH#F08e9#)j5A{UO1%a90&}^a@vQOc=89PVLTt
z^k13C;Bw;d_bgpPrCca%&iz9q-0Iop4H0~w(s2)RAer)kdnlO|;7%cz8me(?egb?P
ztw8Pnq2C}2in#4G^w<M@qX4i8Luo*Wo-ybA=EX9cG;6{a_v3N=__F)<tC@wajZ{s*
zFX-Nn(utFQDY~f?vm`iQZh$`3u(46cYMO*TO_-y6eO!MFMe_?*a@TCMgT5N#uP?m_
zz!u30nA9MYFQNhx!&YM9uUm{Eo;}5_Z1<$Mlm(ElDXS80TLW4YUjDhe?28wa^GX>*
z*e@DG#N1@^zR@NnlnL{9`MVRPcLL?y?hCUf0DF@T&Ab3AiR--{nf}YrYGd!Me`2^K
zdgamVaaM_)=T80j*MA=PSfW&6by418;*t)MW~;w;tW<iISW73e_{hYNvO2no88n`=
zRlb&9W8X#&$iz!4$xQNMC@=#<*t_@qLTqSABMo;&+`w;({F8WL!VrA>f@7D;QAT1Y
zj`!XNk8tx2ClV1lPfnV{2+6cu2^2ctpgZnXi|Trud4VZ1b(*b8-aRYw%oS>qBVq+l
z*t#6r6${!;{#_x!Pk@Nx|L|}w<`oe!n?IMxQ8b^v<`#>6!THNli7VjQH@g1IZ3X4q
zmBn7xEI?y#Z^BU_$Y6wi&-f#|3^%+D66+*%jfyPtB*F{lq+rQ`O{}b8f|K{Yv+g8y
z+7GU655jQaCYRxTt^?;%1<o~lZH0Wi;@M3kct{s?%)i_K+y&aZlHJf6C*AM2i+D>Y
zQDsip+as#@-Qq3wMEtc^UyXLkX+RYm9oswJ2{w{C?R9<?0USWuL}D{IvR7%o+Kb>#
z(`C3@#()gEdW<}rE}!nEiM~~JJKo@*-F!zo8;2!z!tZ%jM)HB5?IJXBXX!L7FxqjP
z_0<sKBMqhFG<&!|>>-*l61UGSjLBK`-j3%UAmQwZa+|Tw77bhXE1u+GPo~}%0Rkr|
z^@+m`EXP@u`<PLgAKF?ydd3vzkKiVS17zcP_Dl8LwGik!%_M77s#_AgZYjr?ZLN>O
zqZ<ju=EOpdS@cMm3aVu@<KqUZW#8V;ibK&l=lUgZB0G55mgFC0utq5c+lP)M$Hpw(
zIl$sU1kI>J;pY~O0`P{FD=AoR*aN5aRL&2z@iUKs@lt=)_jPgGSTz?ni(PC)4?c6B
zx{V01G*DxApC1UvnF0=z*u#3j{<5wkCs(2T+Nu?MNEiZT+vz5DJipAj6+G47%vEB~
z%I@z~PX^nweSv|v3s}dZ<JU!e*#`qNc1>!E&U$Z)t*3*t%|6v6bB}4NhocEu65nwz
zocAUHcpZP?m+>5Prw?&aMe7VMdUDwm7AH4ouNf3#zgLJ{S^n8^AL~-ZD}QwCjv-cv
z9lpo>S|6?|lWSh+1j0rVzokm>T6Fn<Inazl;l~QEySq5tAnP9dX!*XHao?UhkX6+7
zx2gpZ;1T|#p8S7tm@az`hY7HFsn5RolYsd#j`l{d+0@$|@%<}`X&7;GY!dRC9(Tbn
z=@VUK1=P*BF_p%<4SvqgttKhgD@#!O5KQBJtoM@PFn4@<8`6OFBwU_1M!U=u``Gtg
zz}8vx{&Bg)y!S1=VKE6Uk>kKo2-cs9XM1&)E$6V$yyb%XuIU>y#)zJ7uF$GqtH#Mf
z%tQ>aInJ^a9v8hpG?qosY*~>b;CLTouMbpj&Cj>Fv133anAL;BI!@BjIQD{g&J3Pd
zzE30uzoFfD4vt$w_0Tc1(^ZBIOI4RlLvRKSD_b)SQtu8iy#n5B^0+1dJx`=OUXQOC
zKtnIixf^JL3u8hr|FITE(AVo>FK040{NOru&W+E!pL#`k;T<p2=qJ?9apf8rLDCRV
z3=@_-xl&ej7>@tZcMi?UJ?we&v^Zimla__;%`FxqJn6D8#PPbaF4!kd$7SYHVgP(0
z4>6{=nfbo#8T}8Pm6oML><fl3X%V!La42Y0%pjFD!OJ(Lg@F?GHBE?Uq4B7>9TDqX
z7w(Yc_KM)&ovkTYM>DASAkPypfS%UerYA!B_-qc{2y4-RZbZsJ+^AEWy=W}4=V=0p
zy|7<|8Los1NGQZ|42AxSP*O9gXUZ3z=1G{n4eq#NxC(S>;Q(}fd~Q`j{F~<<B7XQQ
zWD<Ki@#5kZhueeIgwG2N<XI*IMM7ug5`6Enm3LJq%1ka7(~UM7Y}C=>4c5g?$eV0J
zVjC#klTk%Xhgn^xm9E&h<QCz$3EoF53(sl2pPX*+$z7iQo-sF=VIUgd$D!x*YISDr
z_Tf1G0&-wUD~;@Rg#_=nbhr<Hr_weS)O*z=MJY}bLv6Bhg9P&{w%0#t+L%^<k|Wss
z7ySXZoa9Fb8L*E2+FX%WY^|>sirZ?JAz+01F>{jqp9JW^H#pxL5%Fw0w5*h~orksq
z!EAW|;b!>}s899$(EZr}Dy82dVJW;gSiY7eKEC;=Pz2wmvc3Dp_6~;^%+0>#S(m?i
zqC^rdPc$9wldAk2EClFJOe4(_wX)Tf>1`z10vAfcLz72ZcA>tmX<Twh&B`g=x8-;_
z$07yZ=rtKCQ3RC}4L|_6Bn#BQdgCoE8vzGJBfPVfhZlOQD=hz1L7rSQ`SzL41&t!u
zl?qo#&%`kD_rYgv;oEsH%HR#z(w>6_kRl2mGa(w$#m~*g0#olY6eYvkxcRIox7Z+i
ztCU<N0gt<wDI1O(&3j|$^2mc$Ss(0E-(S_w6Z75FxrKldJv}<r05Zux$xr48lQR1Z
zCLITB?~dT;0CuJ1hb`Xnyt(h-9C-Z4SJ6PoWa6(O{`ysOCGCSz1}C&K0JJfR5fFS+
zM8}tb?aoD$1GXDSu+}&q?&dVELd*oJWHT=iP+k$x+0^ct7h14Z3T0|SXD#vk98-V%
z|5SG7|4{Y)A3rmLp|Y2C7$wq1i;BpgMO{L>lA0+*$u1?#8EK&`m5`DtExN9hB&jSj
zT80Qor6Mzooy=HgF>}uMGt_lo*ZsJE`T7gS<8jXW^ID$o&tacpB_0%WL*b!Ec5hry
zj|I7LyW$CQ=5?ror-mN5a}5P|DS8Q9bh9#NMjtH-YEx?FuuhJToI<}lXOu@+&dx9|
zuMQXK-)L+IDx1|9!f-HNhJ>|Vu;ZYH9}J5}tV2_f%COlrQ1$O<#ePAJ`dAcrOZLUW
z0WAuQo!borO;4!Gu`Sl4;GBBcwJz~nPw^iM{!s~oUo%1nA=+LV5k$YCHiNw51Jc2=
z2Mwxi&q;RjoG0VA3ye8D${O=oeg`Q$8Z0;Pqs-qH_H4HZne*HOO`t9jI^~>hlrss|
zv{u9}`L5u5wx=?{99R-Cju^FJ)2&#;q-Xvh|MTI=<0a>w$w?Y*y+kiwma2janPyN@
z-|npu|A{fWvYsmeG*Qtd;7B(8@=pIOjurX2Ju4=MCQ$92udiQ`j!RFr0Axh<(Kzzt
z3Dar9AlQk?7A&T2j-JDG4sJ`Zm$b_rFP(k#t^V97MeX2Gtut6KJ4ZRf18;A=irot5
zyg9@nh6Fgu0xAJ*eDSp*U9{Lj|3rXi3;lMPuOww`0q_`&a(H`VFArdoPPm&d?k^_G
zp6dB@Q7p-NQ1QPkQX3ePpnxBn@lTIbMnhNBp|$uE<pjZT!QB#(S_G>7sXW$eJ20K%
zhsr}@&M@A-ipZIF;C9qL80wqNWxR_J;Vx{Pt&|jNwBg<keem^)c?zg0c4;%y2RMhR
zbYgG~7k+RD=7ML!ySYoG0Tj7yuNu^M<Uk@+>oli+hmUle0__k-0d=+P@!WD|nC>qf
z5Clp5CGuV%A=<$Hso4uE&l=1lzxP^<oj?hA2!J~H-5monq`^fcUAU{h`b=u*8+Kd-
zu_-7nj*`$X=5|mKIhr#eUPF4|+^gCI$eaOxBKD{!tv72uyLb4USE2luJH&Yu1GRp8
z+&7|+a`&nLQo@Vnh;O(i4MY~5tF8P#L;<4USoU%m;L<r8Ds8~^tFshW3??f>8Z84~
zA*<BbW6!P7KN#=-(ICfx1IwhQre6^6AE3#xNb|jSj2^D#^7KEd5VS9+WA;^xrQOP3
zowFD?@gbKE-|Zg^`$i`kG1~lsMGiVoM~KNtNj-C(_(CWyZyoC^N0B+ge1Ti?{9YFJ
zQFELQQ0Mad<B52QyF>Q;4`Gm*YDX-{v#O3+2vZ`<3BvA1KNk8hqE3@!oQ<OiF?VBT
zZ8j{Twy*ZgLLHQ8?N{-iWPLo9ILQ<KqgZAer+-+S{4H|vMQNQ3Z9(>$^zvQ~USQxs
z(ah;@LPod>5>#@{;D_L+387YyDN(<_O5Np;a~NB>9>X)U?1SYXEZRWWa+StCqcJ*r
zLCTod+cr%(ohv$e&+T6@T3sthq!-s2Q67A9lzQVl2hGsl_6M6Y7@gJzQkTaER}Z?K
zIV8y_8nJGrk6PUQ6I>vnV?2|t&f0ipzcTbWe}`5kZeX)QI_E4va(WkCuKuWgbyp|I
zjgpqf^=U)!`IJ7v4*$htdp|er*)jO#FT2Sxh?S0G5fEkwfDTx7k<mdTw11a2mCIL-
z#2wc<aVt8DbUIb8-?!K=_G+s&?xPhPP1iO)KjIXwHT3GGgD$Gvms<hbt7YA8UK+eq
z{^TC)YCBqUS7hGriX&<-X}(*nkodho;<@h`4yDY;+q-$)`9i(}V#AKVBhTbXc5f2g
zy1W#morOiT_7F?yku3OuwYt|z@x#m2b3A^dTj1MicgbCg+THp@T;CJop9aj-G7Os5
zdr-})(ne}(g*AHD#Y5j3*@dcD4bJE3d#_R_Dq5&rtH-|UR)4bOn^Qstl(-3U+?sIs
z81&bTQ*fVL>|CG}|5w=&S^?)ZRW3s^#9ny&PW)5Q?w3E!qX)moC@?cen>(JPvz0-^
z_|*F48W2;kWEj*VCS&CwW=uxS$cA6hU-gl%KG5>X6HV?X#GM9T8R&~44{X({`B(9B
z;)=0~hg;}Mo6x{wE4_GL*|SAh^nNJq`khV51Nan7s2YWmQnY>bU{G}PI;mQ>0`vUJ
z5KkMtnx3UA%S{de&fbDg&NgnceqsV}=0g%Uzn8HvQo5=Jk{#l_>bqc?JOE)(#;`6V
zaX|8X#A!*uW_rB)xRn9wySPV1Geg+N@3q8$)2FOSYMeG!@<v2X7L!n<GU=O!?>JyN
zolGPxY?j=I>tDu;zlJ~$wja20(IElzV~ti#a((mdp*c{{t4f`YlIGb|N^$QUC>Db}
z$XCKfe$G&84A^&Vh&)N4^mA@H<byY{p+0+vvCb(SW9ybh3V97ihEY=JXN$;$EZtX2
zOZ0Xx#{jYu=#flW>b-E!{{53U4_Y_6clxzF=cEo<RE~E6i4VoK`mG2S%JGi|Q3!G4
zCJOw{8_|W1`<qlTSnZy&<rUI6QT`1D0qzfR_YKtpS<Pj;Hx0Ek?vpA$og<!c!urj2
z`J0EEA8XPBa9a$kaJ546#s2+#;z+bLzdqM`7Ylw_d+bBU&uH^b-<e&PJE0F&@CxY8
z6OdLd*9Csp+EdnS{aw#gQ;k@J$L5!~bu+u%W!T<8VRFC5dW(b+bW}H+O_iIduNUet
z{4H(;MC(CWnZzGlIS)6q<OdZ$a6o<#=%0eT!|CwAOep_^X6<5^9^V|fm<oPMjri?Z
znB%+6#7X50RvCj7W6mFvFs39%Grh5attJain#Z$-h$DFoEg3^7b)L#h1~HVcx>W_(
zNq3yR*@g5mo7C9P8`1%X3eGgcNI4F9Y+<?+I2=XJ9SutuAlU>o9~ffP391X<mq9H#
zcGC(j^$IdyfmED6LA~%AlYX6GH^I=itDUY!i?Uh_#R9Qv*b#+~T`$6(!nS8V;*hXE
zS^7vw7NfRYM^`8~|HS87$??VD3EhVv;Dinz6!&&Ne@MU5-MU;Rht`0@qbOg6_WG^i
z<qHLR&=HDKWNNewKMuUAC`{!hL-&e8&M<Z^^S!j=x2FM9tlryy@m+R#T~286E^v7<
zU{Lu@r!o|f3@$=~qo$8H5)YiS!y;;9XKs%>L&H>GQk{gj&OQ=j#J5BWp}{r$6h9-!
z0XqqEOq+`oup}Ghi@t77Fb$x5*y_g$!0EgRu7GVQ`MT&~J+r=CN#dZa26-1068eql
z&uvG-56g}Z!!IL!Zz~wTk{na<4JGjM{{YS=lLiNPf)6qv3QPuzyrgSKNRNz;(1YND
zMK&LJo0*_^Gz1yL(?MsMrK}xY7^XEeZ)~&+XB#6l;D~e+7xs4_@5Vh=-GuH6-fJ}o
zmuYGGa@<Db^1wHb%U3d#4$f=C9B!tYJ|42YO@*%9R2>Ql*WI0x<|&V^v<$P457oSA
zDL4gFS?IIO_Ts~iB{CdwKo#NnhgG0?n@}@KQgbN2)>9X?=AF6yE)<%Xf5?7tNd6CH
zTDfedf!;%0J%!TCAv2|$Ly)L1LGpPU$JKuunzbM#`Dy07FgN_)j%IEhnnG&p9kU^J
z2c55!sx$HN5lG`5I0GL@c#My>B!!qQDz@Wxl%1XSbs6Ve@G0gwg14ob>&&k+pH?Qv
z=@@lTe)Ol|)DFJQ2&6FfH;2pUx?&z4^$d271KES}NwCh)ZDo<1Hbizz9hvD7rmsS~
zp<{dmx=%InI+8{5nUbMJGMZ+J24fdq8PnJ3cC%v`<T-zOZu})?NI(JnM6`5&wRnwm
zSRvaY1j$HPT%$~A-qOySrl+;zl&Up0v0&?b5|0q9BG(i|;IC9C@@>%m7#+#HWE?k3
zMJITjWrE{04x6)ABiCL@;v9hwB4%RO5EBD&&sRTYg|$IeQ0pKnW0FpUfWuGbGAAjk
z$m4v5i29lC_2NeTT}k5b3(7Y?JgthkfGi6frZB7T+NL@q7yo0B?OH-mfZjWIT3-Sa
zk$$mwi<a_;eu4Q;JGDOdE{eBn-?lHjpC?<`KTEHhP)-mg7;kbR=FdKI<=%Gc-W<#h
zu?0q8e!wW5F|(e23Qk4LGMB_$5PP0lv3;3DiO+kZ6<fIN5Xvl6sk7vwW#L0R?{TAz
z{q(?CLGt`qu&$fAu)h1N!lde7=#`%zYf^eEA$I-H*L+zQ)gKJv1uSw9^iUv8Tk!~p
zyx)!W)JPm`tjm$1_bsN+W?0`(-0xkp#a5_!Qp{J%ZjC8jjR`c7q%*NZfq-fFS)9@*
zw7GK>`<2|X6e(h3ct_odpT(=pZAjRT`(<j<{eJq_mOjp9l0ME_DQS4P=w^ns`ZU|?
zK9b5|k}K{9NHLj9(-}@IbRr_@*RVOT9J%d0FreN$jNE}GJg3%_YACSw?D4~UNNrbf
zAcfW4ZJa#ep9Oawq459By*4*xZUu)un|6$N+P`sgzun=Qi*eQ9GWdkPZkK9gOqq%d
z>kXt7Wiu}Ps5}NX|I-y)CX7+@2zJh8n&JnqlNMTCg|2fJ2r}w0mBad)Zq|;&!u@%A
zO;0jCKIYJpReoq#9gR)y+X`C?*$O6-JMcr0MqC6-1Q+Sk5fjd$ZqYJb)MPl!ea)1+
zDb%hJT13xt0?B^WMr*(QE<TA{Mgc7HV+<&`R4@c;z<c|>=lEY%GPPGcyr!pEYfDD@
zm~r6M!~0&YHN0e8`Yr3ejbT&JDh>>)OsPsXLz0GpQ?m2X)7PX6zmv}`RS#zT9JaAf
zB0#LMyo!;!J+vD$sDCK(Z73bd6R9PV^4m8Jqcx1=6=yxB&J%*`jCS+g1{dAFpsHsw
zxe#IP&O#^GApqBM*>f|W?%7FzP6bu}O~X!|pRe>4msEj|Gy5E#GBt(;11-JWDbl<s
zR7>6KnGk5c+aM6{b?;hqP{!i%k|*>F4co}kiRJj8I`8vsCTKJgM=Uk0$~BqbH^5Cq
zNBJBNRI7HjwKyn#Tzuf3S=JD{W;cZD+C$#Gg|X`GJ4@B79@wVuMjk%c%7SMH52TK!
zJm6JMA{tp%TTUJ~#h`?4napmyMBIDb3VL&)hCBVrFPumg%BOV(hak0Gb4%JRLl9sU
z0OqoHx@_MkW20}wx_)XB$pK9CV_*sCWGs~qqd01LWX4<3Ib*RYp}?tfd>=f&oP7rK
z{7sBXkN)Ov34UQ!$`Pr}5!<ALjD(8PFtc^lj+^K3gI;%=1arMLf2v$l){_A*8I|GE
z8GQQEwc&eIwP$oab-A(T;F>KzL6hA5Y{a_!C=1o7caPOafkJP)8aLx_AM>AH`w4Xg
zIEYw1;J;8h;p{V;4xVeJ4#v*Q$fN#pVbl`P^psQSs93=*pM6S-sD`wV2<%m+YswkP
z1y>0jHmjLK=zN->3SNxUAz&IhX4KWuaT8Vi%4FKQO?6Fbejk+oY$Fb}=^<y8R1Rhz
z3;wd2%aHRfRzQoitz*&-JDTs?%nH_scZhhOO5I>fN%}=TS&Vdm9l~T;a<A;!;|xL5
zp-t-?c90|v-H@3lC;+XxjAS{R4^sMNilaSX%3)8dstqT^s7}tFosmE!x<p8Qu}B&f
zg#4U6?&2C=?<CV>&nTlYq(j`3pU_?bDe$IvTRj_xK&5MKNpj~P1-@AwsZOYR%bU32
zhuv28G$fUa2+7f->^mc`EE`G#HsB)09M%z=fk5!LA5yxq;^>_3=^T2OW^p7G*b4Z9
z>>+|6V~Bwy%5mtTk+;$W?#TBIa)i~7G|z$jGa@AsExiNxMs2ObT-+aJ)}O1u{8M(q
zuCAW*#o{vw5^m=LJHOKY(eS?2GK7lpIV*mtzI4|nAN7Y7v+OP-*{&$46=8`1l_~-9
zKopTj^c|}FCf2^<9V9>08v?ss;3AlvklA3DjmFGFv_Tw?V&<YdW{h``Q&V%%mCRF}
z^~02Hu<m`p=DmS673j)f-PHeXYX_Gj41U<C@)trRH*lzBFAMz`RnQArfs+R(>v+IZ
zE=apu+we1i1~2zLJ8)LrNBR;AR+;dhg2=ubL?3?<AO=l<KWn{XULtkl*~LmlxY&q7
zY}cJqdVi&^M3cjFD0Q3G<Gndl-sq;`5mBz@w9*@~0h<9Jo0CE-OA<lX&Z1whU`~0N
zV1v&pD0XN*o}s5?@QHe0Fo#QBb6RU-fk+2vndr<raLafI$WL68s|+k3rXrhmm1U)`
zohPMUQ~@Q=JVF?tB($dT9t@M%QSZ^wVI;DY=}Gyi<-1L&jx^h(j`%c>te+cx=1i4(
z>rvNF1}Xi;+WcY|W|#`25U~K@U$aho@m1dyAkAp{+gNXKb6yr<iQ+XwfuQHR&hD&j
zYx_{0ulXF3_Xu#oGwRwCQ3bGNUM)_Gbyn8d$wXfpSv)Pq$RY@%UbgNsr2FKLwJg}K
z_SQ1Qy|r?}z|z`H6a?|C56OPF`)>ij__qK6Fu4q`WK@G}HgeRaUAEmeiHQHJ|E9S1
z^@^rR=yvdn*nX4R0ad>yqF}K~;W=d1S1%6F0OQV~(@xrA@W>5vMNYw@bw3p)PL&gJ
z#zxB|H(pn0^qptIIX)O6Lw78}_9)-taIvd+)iN#|fa!!+c)eWqI;-jLrL3-z!&6IH
zWU!QFBJ6%<?Mg7Ck_G{HV<nh_XEs!e!Rk@xS%V${n3ieOOyE7VfCsIfBlpH&ta+B~
zsn3Gf<{oAg?UIx5IL3Nm%$MtuOGcKE8uS{%_T}`*i_7K;Cq(n#h`eY#fBxDTgR`B*
z-DQxsBC~USysPH(`hZ|_&#3%Zq1LUy`0u8xH$hM1poNN`JKa`zeZ(KRRAjMI;^LTE
z4D5#=UQ`?zh^gF-Ow_!r=vw|gCn54<eLOyIDNr`urP`kSdib~@e74j&ebl4t8&Tri
zky}A}t_l5`JvXhoFk|4IHIoJ9Kr6U`elW=fd-Y3?;A9JI$|2uk{}TQ!2T?Fnr?kS0
zFPDK<I9gziAv5a9$Z2{|Yn)URCNFkYKwK0$40?_yWAtMs{+I3XZyI+4A@5_sKlVcI
z)qxm&YX!%q>iYR}lO`<wycgU;+};`U;v7v-LvG)BGe8lElr^;=PIN#jE6_*Fk=I||
z-sPeLLy?yl+YY`AZg@)I(~G;`3CTwoCq?^!XWhYYY@JI7Lg)XF?beGBA%+CU;Og1P
z{)*_VZ)|P$>lG7C5gu$}Tr^K{_by7%(#PcO1M_T<;+5B~_#5+yJ|a-tDN1rToCw!2
z!YJP5(=M~Vu}a%8a;8RL)CX{uE#NXv-&-+Biul$fqAe@&0F8Y*OT>#wPQm!MtbG3>
zz8zW5dkZ{@vn^M)PdT+XSF&c1qzU?!g&%+I&^WWe3UC0e#jqVLsS3faLVj9dyiQ?5
zP}=C83zIz2KS?=!*tQIibP+kdjoq_^TpelfC(`PBu>44|6|BlBi=(U=P7cG`X9+Fh
zcR{FY#K2s8TO<4a4-s&BJJJ~C%(9h7Tmmna1nMbXRldgcmUQnoy%gp@ux(^1VEV1+
za7o=|oKtAza-{fHLMNNdf(Lg_JSzJuaRd1X6#idCukn(*J-+8hNcX7|t1nbHwIxru
zpV;{RMuhmTP*G>hQ{XRA^2jW_&z%g-KNV%8=Th9~*%P|S@!hM`1ba1!KNxfSMl7rL
z&@`m$ZyH+TB}!QR!K9SYl0zV0u?oU|_2n=+7CqjWpL3dgxQ@1MVz(~ZTq*Tup(|yS
zx8M#K<q}vj5zw|%ALp!0%ML-DWP0XbYY2dmlo4gV^ZRo{kXP&lM_SY;#lk8+jEI$~
zl5qu2WqtD{#3X5?@*7ftlPKotM>`t5X^(2#LSRhSU1BO~nS-dDu%QGcu97HY2G*8P
zgvNY2MunNHppkaIf^?ZJ9a9r#JOwZ6jYqF8I%K3|Ha3LrS!xiKe7!z5h6UF}4SnR$
zo4c$+ZVIJ3(~(;{6fTy&vA@la)q|GpQ8_{hfmc5G7c_Kk;pBespSF`!m*%imb<WP1
z4U=m$&t}9MB$jU4$Ca?l&*hTPmj?X|EUXAIwtVEBooM1BR+h{->P$n5CMShS)#)Ba
z&F35C>~Yhi@QFm8(@6M+7$u4EHItq9=JP)Ke(%5h^SZMpbDcrfJB<%R7=jaG_`Ai0
zk2dXIj?}bHR}repYL#-EX4{EaI6<<EuewKt_VKQQy*uva11b<L+ir#c^gDLZ-yZ5e
z+spo)i{^k>X)tvvRwB3m0QvK`WiwT~PJ@+udSIorcI>`gObdxN*1U=K*q?V9!Q{9_
zAliy;m;{{BmbY~@ztHTA+T@AKM)R1Awe<OaCZ4qYTA{XTLGiWr)ExR*f)4N-3n?&2
zY*S)uWUFE1mHh9|pOemHaconSBs%+^`+0!hZ*|6SLZzriNER#KGyrep<nt_BYzCqw
zbOi(o9XQ1n%g-05y}KQPD6=y|$$J<e8J{A7J3O3!lfbL~%&mt#k4xLW<!DgfB{Oj2
z{*H_b>QTzd!CSu5j%(?BQjyMooKjIXR4Hya{a9k^{a&Dgzu<S#*r>V8#c%VG(`!9>
zjQfr&tCp`LX&Qkve=6c=iDH3mFR<n=>8^TKJ8~b)4oe?AO%Hmq^fUAFkf|u^9rL6o
z!0DS@8FSRk)4^i<d^?*jG6jFx_kVWeAR5r-1ToMsZYNY0LW@#@S~=UHg<x~h_I!<#
z4Z`vruf$f)#_s=~XetRP#bI<?9r<+K&xjlbgKR&U6N6JUz4b!V2s*Y$L0PfKh=v{t
zFRhsyy3KvVDva!khHoX?yG0*4fd52S*BAOq1oaJ4B?u+bUuv7xDlOE3z~83zuInB-
HQcnFJ3p12(

literal 51964
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
Gg8vr^t7`)Q

diff --git a/docs/logo.svg b/docs/logo.svg
index 3a8db707fc8..bac0c391a59 100644
--- a/docs/logo.svg
+++ b/docs/logo.svg
@@ -1,9 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="256" height="256" viewBox="0, 0, 256, 256">
-  <g id="Layer_1">
-    <path d="M29.19,73.773 L130.18,145.131 L128.971,248.54 L28.585,174.158 L29.19,73.773 z" fill="#8BCCB0"/>
-    <path d="M28.792,74.457 L28.792,74.457 L129.782,8.541 L227.748,74.457 L129.782,145.815 L28.792,74.457 z" fill="#53A3A6"/>
-    <path d="M128.169,248.54 L129.379,145.131 L227.345,73.773 L227.345,176.577 L128.169,248.54" fill="#318BA2"/>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 263 300" style="enable-background:new 0 0 263 300;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#291A3F;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#1D1130;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000101099586944368145720000003546729761049323710_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF8736;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#F56079;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#09CFBB;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#2BAFAC;}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#00A1B2;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:#361E5B;}
+	.st10{fill-rule:evenodd;clip-rule:evenodd;fill:#44327C;}
+	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:#9991B5;}
+	.st12{fill-rule:evenodd;clip-rule:evenodd;fill:#B6C1DB;}
+	.st13{fill-rule:evenodd;clip-rule:evenodd;fill:#DFE4F4;}
+	.st14{fill-rule:evenodd;clip-rule:evenodd;fill:#EBEFFA;}
+	.st15{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st16{fill:#FFFFFF;}
+	.st17{fill:#0C94AA;}
+	.st18{fill:#2BAFAC;}
+	.st19{fill:#09CFBB;}
+	.st20{fill:#291A3F;}
+	.st21{fill:url(#SVGID_00000052816187072403919610000008607127177337342108_);}
+	.st22{fill:#231F23;}
+	.st23{display:none;}
+	.st24{display:inline;fill:#F7F9FD;}
+	.st25{fill:url(#Path_147-2_00000075143492132382889430000010785895496676937089_);}
+	.st26{fill:none;}
+	.st27{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000025443271018997229600000006097071520280550810_);}
+	.st28{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000047782737284954439300000002399795006678736286_);}
+	.st29{fill:url(#Path_147-2_00000041269427127206779890000005052077150247217314_);}
+	.st30{display:inline;fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+	.st31{display:inline;fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000116233248159464156660000000456114342421350055_);}
+	.st32{display:inline;opacity:0.5;fill:#09CFBB;}
+	.st33{display:inline;}
+	.st34{clip-path:url(#SVGID_00000116202807838708375400000006768742380511134648_);}
+	.st35{fill:#16C1BD;}
+	.st36{display:inline;fill:#FFFFFF;}
+	.st37{fill:#361E5B;}
+	.st38{clip-path:url(#SVGID_00000092439363969720835110000003270323667367017892_);}
+	.st39{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000142870095005844619550000012255658344063531964_);}
+	.st40{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000170967857909509490060000011931952010598925203_);}
+	.st41{fill:url(#Path_147-2_00000003106782360800285540000003019351024857028276_);}
+	.st42{fill:#8BCCB0;}
+	.st43{fill:#53A3A6;}
+	.st44{fill:#318BA2;}
+	.st45{fill-rule:evenodd;clip-rule:evenodd;fill:#8BCCB0;}
+	.st46{fill-rule:evenodd;clip-rule:evenodd;fill:#53A3A6;}
+	.st47{fill-rule:evenodd;clip-rule:evenodd;fill:#318BA2;}
+	.st48{opacity:0.5;}
+	.st49{fill:none;stroke:#9991B5;stroke-width:2.6355;stroke-miterlimit:10;}
+	.st50{fill:#9991B5;}
+	.st51{fill-rule:evenodd;clip-rule:evenodd;fill:#0C94AA;}
+	.st52{fill:#3E2F5B;}
+	.st53{clip-path:url(#SVGID_00000148652813103041192230000008090215812324307346_);}
+	.st54{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000160171850731576420950000017576870150370059650_);}
+	.st55{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000154384169958684016240000017215234966298601403_);}
+	.st56{fill:url(#Path_147-2_00000066502366766358156190000005949336785991715202_);}
+</style>
+<g id="Layer_3">
+	<g>
+		<path class="st16" d="M262.8,81c0-0.2,0-0.4,0-0.7c0-0.6-0.1-1.2-0.2-1.8c-0.5-3.2-2.5-5.9-5.3-7.6c-0.3-0.1-0.5-0.3-0.8-0.4
+			L137,1.5c-3.4-1.9-7.5-1.9-10.8,0L5.6,71c-3.4,1.9-5.4,5.5-5.4,9.4L0.1,219.5c0,3.9,2.1,7.4,5.4,9.4L126,298.5
+			c1.6,1,3.5,1.5,5.4,1.5h0.2c1.9,0,3.8-0.5,5.4-1.5l120.5-69.6c3.4-1.9,5.4-5.5,5.4-9.4L262.8,81z"/>
+		<g>
+			<polygon class="st17" points="239.6,87.6 239.6,212.4 131.5,274.8 131.5,150 			"/>
+			<polygon class="st18" points="239.6,87.6 131.5,150 23.4,87.6 131.5,25.2 			"/>
+			<polygon class="st19" points="131.5,150 131.5,274.8 23.4,212.4 23.4,87.6 			"/>
+		</g>
+	</g>
+</g>
+<g id="Layer_8">
+</g>
+<g id="Layer_7" class="st23">
+</g>
+<g id="Layer_6">
+</g>
+<g id="Layer_4" class="st23">
+</g>
+<g id="Layer_5" class="st23">
+</g>
+<g id="Layer_2" class="st23">
+</g>
+<g id="Layer_1">
+</g>
+<g id="Layer_9">
+</g>
 </svg>
diff --git a/mkdocs.yml b/mkdocs.yml
index 7ace7382e41..16b2106bb3f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -7,9 +7,10 @@ theme:
     name: 'material'
     custom_dir: 'docs/theme'
     palette:
-        primary: 'blue'
-        accent: 'teal'
-    font: false
+        scheme: testcontainers
+    font:
+      text: Roboto
+      code: Roboto Mono
     logo: 'logo.svg'
     favicon: 'favicon.ico'
 extra_css:

From cec49348c70615a3a0b5243d10b8f5c30d3b5697 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 13 Apr 2022 13:07:28 +0200
Subject: [PATCH 1827/4969] Update release docs to contain milestone rename
 step

---
 RELEASING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASING.md b/RELEASING.md
index 4ad91b56477..f04839d9d41 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -16,7 +16,8 @@ Testcontainers' release process is semi-automated through GitHub Actions. This d
 7. Close the release in Sonatype. This will evaluate the release based on given Sonatype rules.
 8. After successful closing, the release button needs to be clicked and afterwards it is automatically synced to Maven Central.
 9. Handcraft and polish some of the release notes (e.g. substitute combinded dependency PRs and highlight certain features).
-10. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter!
+10. Rename existing milestone corresponding to new release and close it. Then create a new `next` milstestone.
+11. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter!
 
 ## Internal details
 

From 66e4be2817f82aa80490c21e8df9e8f8a87fa792 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 13 Apr 2022 07:27:38 -0400
Subject: [PATCH 1828/4969] Fix `StackOverflowError` in
 `DockerClientFactory#client` (#5262)

---
 core/src/main/java/org/testcontainers/DockerClientFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 4cbe81f9e2d..6cf8f716704 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -187,7 +187,6 @@ public DockerClient client() {
 
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
-        log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
         client = new DockerClientDelegate() {
 
             @Getter
@@ -198,6 +197,7 @@ public void close() {
                 throw new IllegalStateException("You should never close the global DockerClient!");
             }
         };
+        log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
 
         Info dockerInfo = client.infoCmd().exec();
         Version version = client.versionCmd().exec();

From 1113cd4cd4a7356c6e745a59c4a6b6711ac55458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 19 Apr 2022 18:02:53 -0500
Subject: [PATCH 1829/4969] Rely on `TransportConfig` to read `DOCKER_HOST` env
 variable for `DockerComposeContainer` (#5276)

`TransportConfig` is already aware of `DOCKER_HOST`.
---
 .../containers/DockerComposeContainer.java    | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 4db9361a618..c0f84307c88 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -726,20 +726,17 @@ public void invoke() {
         final Map<String, String> environment = Maps.newHashMap(env);
         environment.put(ENV_PROJECT_NAME, identifier);
 
-        String dockerHost = System.getenv("DOCKER_HOST");
-        if (dockerHost == null) {
-            TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
-            SSLConfig sslConfig = transportConfig.getSslConfig();
-            if (sslConfig != null) {
-                if (sslConfig instanceof LocalDirectorySSLConfig) {
-                    environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
-                    environment.put("DOCKER_TLS_VERIFY", "true");
-                } else {
-                    logger().warn("Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig.");
-                }
+        TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
+        SSLConfig sslConfig = transportConfig.getSslConfig();
+        if (sslConfig != null) {
+            if (sslConfig instanceof LocalDirectorySSLConfig) {
+                environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
+                environment.put("DOCKER_TLS_VERIFY", "true");
+            } else {
+                logger().warn("Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig.");
             }
-            dockerHost = transportConfig.getDockerHost().toString();
         }
+        String dockerHost = transportConfig.getDockerHost().toString();
         environment.put("DOCKER_HOST", dockerHost);
 
         final Stream<String> absoluteDockerComposeFilePaths = composeFiles.stream()

From bb6b5c5489825398461bf9e0e8d180fde9c15eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 20 Apr 2022 08:13:04 -0500
Subject: [PATCH 1830/4969] Use `getHost` instead of `getContainerIpAddress()`
 (#5277)

`getContainerIpAddress` is deprecated.
---
 .../src/test/java/DisqueBackedMailSenderTest.java             | 2 +-
 .../src/test/java/SingleDisqueInstanceTest.java               | 2 +-
 .../java/com/example/linkedcontainer/RedmineContainer.java    | 2 +-
 .../org/testcontainers/containers/MongoDbContainerTest.java   | 2 +-
 .../src/test/java/RedisBackedCacheTest.java                   | 2 +-
 .../src/test/java/RedisBackedCacheTest.java                   | 2 +-
 .../src/test/java/com/example/BarConcreteTestClass.java       | 2 +-
 .../src/test/java/com/example/FooConcreteTestClass.java       | 2 +-
 .../src/test/java/com/example/SolrQueryTest.java              | 2 +-
 .../testcontainers/containers/DatastoreEmulatorContainer.java | 2 +-
 .../testcontainers/containers/FirestoreEmulatorContainer.java | 2 +-
 .../testcontainers/containers/PubSubEmulatorContainer.java    | 2 +-
 .../testcontainers/containers/SpannerEmulatorContainer.java   | 4 ++--
 .../java/org/testcontainers/containers/MongoDBContainer.java  | 2 +-
 .../org/testcontainers/containers/PostgreSQLContainer.java    | 2 +-
 .../java/org/testcontainers/containers/SolrContainer.java     | 4 ++--
 .../java/org/testcontainers/containers/SolrContainerTest.java | 4 ++--
 17 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java b/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
index add59fd15ba..4da6201eecb 100644
--- a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
+++ b/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
@@ -36,7 +36,7 @@ public class DisqueBackedMailSenderTest {
     @Before
     public void setup() {
         context("");
-        disqueClient = new DisqueClient(DisqueURI.create(container.getContainerIpAddress(), container.getMappedPort(7711)));
+        disqueClient = new DisqueClient(DisqueURI.create(container.getHost(), container.getMappedPort(7711)));
         mockMailApiClient = mock(MailApiClient.class);
 
         service = new DisqueBackedMailSenderService(disqueClient, mockMailApiClient);
diff --git a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java b/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
index 3fa115bea20..7ded5d8da43 100644
--- a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
+++ b/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
@@ -30,7 +30,7 @@ public class SingleDisqueInstanceTest {
     @Before
     public void setup() {
         context("");
-        DisqueClient client = new DisqueClient(DisqueURI.create(container.getContainerIpAddress(), container.getMappedPort(7711)));
+        DisqueClient client = new DisqueClient(DisqueURI.create(container.getHost(), container.getMappedPort(7711)));
         connection = client.connect().sync();
         retryAfter1Second = AddJobArgs.builder().retry(1, TimeUnit.SECONDS).build();
 
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
index a75867205ab..4303bbee682 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
@@ -29,7 +29,7 @@ public RedmineContainer withLinkToContainer(LinkableContainer otherContainer, St
 
     public String getRedmineUrl() {
         return String.format("http://%s:%d",
-                this.getContainerIpAddress(),
+                this.getHost(),
                 this.getMappedPort(REDMINE_PORT));
     }
 }
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
index 7c87e46bccd..5581c76e675 100644
--- a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
+++ b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
@@ -19,7 +19,7 @@ public void containerStartsAndPublicPortIsAvailable() {
 
     private void assertThatPortIsAvailable(MongoDbContainer container) {
         try {
-            new Socket(container.getContainerIpAddress(), container.getPort());
+            new Socket(container.getHost(), container.getPort());
         } catch (IOException e) {
             throw new AssertionError("The expected port " + container.getPort() + " is not available!");
         }
diff --git a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
index 5d204cf99c4..927f097aa5f 100644
--- a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
@@ -35,7 +35,7 @@ public static void stopContainer() {
 
     @BeforeMethod
     public void setUp() {
-        Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getMappedPort(6379));
+        Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "test");
     }
diff --git a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
index d9d93b8255e..aa4199684e8 100644
--- a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
@@ -25,7 +25,7 @@ public class RedisBackedCacheTest {
 
     @Before
     public void setUp() throws Exception {
-        Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getMappedPort(6379));
+        Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "test");
     }
diff --git a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
index 9923b08f1e0..0f4e6d672d8 100644
--- a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
@@ -17,7 +17,7 @@ public class BarConcreteTestClass extends AbstractIntegrationTest {
 
     @Before
     public void setUp() {
-        Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getMappedPort(6379));
+        Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "bar");
     }
diff --git a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
index a57b0d5d4a0..3a9e4e84f04 100644
--- a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
@@ -17,7 +17,7 @@ public class FooConcreteTestClass extends AbstractIntegrationTest {
 
     @Before
     public void setUp() throws Exception {
-        Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getMappedPort(6379));
+        Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "foo");
     }
diff --git a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
index 63ac67ac1cd..49f8cf99f33 100644
--- a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
+++ b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
@@ -30,7 +30,7 @@ public class SolrQueryTest {
     @BeforeClass
     public static void setUp() throws IOException, SolrServerException {
         solrContainer.start();
-        solrClient = new Http2SolrClient.Builder("http://" + solrContainer.getContainerIpAddress() + ":" + solrContainer.getSolrPort() + "/solr").build();
+        solrClient = new Http2SolrClient.Builder("http://" + solrContainer.getHost() + ":" + solrContainer.getSolrPort() + "/solr").build();
 
         // Add Sample Data
         solrClient.add(COLLECTION_NAME, Collections.singletonList(
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index fe0a9959f2d..58e5c023a0e 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -33,6 +33,6 @@ public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
      * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
      */
     public String getEmulatorEndpoint() {
-        return getContainerIpAddress() + ":" + getMappedPort(8081);
+        return getHost() + ":" + getMappedPort(8081);
     }
 }
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index 6353a679130..c36082dfeb6 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -34,6 +34,6 @@ public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
      * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
      */
     public String getEmulatorEndpoint() {
-        return getContainerIpAddress() + ":" + getMappedPort(8080);
+        return getHost() + ":" + getMappedPort(8080);
     }
 }
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index 90d77c837cf..231f7626044 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -34,6 +34,6 @@ public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
      * io.grpc.ManagedChannelBuilder#forTarget(java.lang.String) method.
      */
     public String getEmulatorEndpoint() {
-        return getContainerIpAddress() + ":" + getMappedPort(PORT);
+        return getHost() + ":" + getMappedPort(PORT);
     }
 }
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index 8603b1f3437..0ae8e89dc06 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -31,7 +31,7 @@ public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
      * com.google.cloud.spanner.SpannerOptions.Builder#setEmulatorHost(java.lang.String) method.
      */
     public String getEmulatorGrpcEndpoint() {
-        return getContainerIpAddress() + ":" + getMappedPort(GRPC_PORT);
+        return getHost() + ":" + getMappedPort(GRPC_PORT);
     }
 
     /**
@@ -39,6 +39,6 @@ public String getEmulatorGrpcEndpoint() {
      * HTTP REST endpoint is reachable from the test host machine.
      */
     public String getEmulatorHttpEndpoint() {
-        return getContainerIpAddress() + ":" + getMappedPort(HTTP_PORT);
+        return getHost() + ":" + getMappedPort(HTTP_PORT);
     }
 }
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 662c4b575f7..53336d4fbec 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -69,7 +69,7 @@ public String getReplicaSetUrl(final String databaseName) {
         }
         return String.format(
             "mongodb://%s:%d/%s",
-            getContainerIpAddress(),
+            getHost(),
             getMappedPort(MONGODB_INTERNAL_PORT),
             databaseName
         );
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 3bfb508aa47..741a8c4139a 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -81,7 +81,7 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         String additionalUrlParams = constructUrlParameters("?", "&");
-        return "jdbc:postgresql://" + getContainerIpAddress() + ":" + getMappedPort(POSTGRESQL_PORT)
+        return "jdbc:postgresql://" + getHost() + ":" + getMappedPort(POSTGRESQL_PORT)
             + "/" + databaseName + additionalUrlParams;
     }
 
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 4d0b5cd1ae1..e583c1f54ee 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -136,7 +136,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
 
         if (StringUtils.isNotEmpty(configuration.getConfigurationName())) {
             SolrClientUtils.uploadConfiguration(
-                getContainerIpAddress(),
+                getHost(),
                 getSolrPort(),
                 configuration.getConfigurationName(),
                 configuration.getSolrConfiguration(),
@@ -144,7 +144,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
         }
 
         SolrClientUtils.createCollection(
-            getContainerIpAddress(),
+            getHost(),
             getSolrPort(),
             configuration.getCollectionName(),
             configuration.getConfigurationName());
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
index c2d19a3e61c..9f82e2c3af9 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -60,7 +60,7 @@ public void solrCloudPingTest() throws IOException, SolrServerException {
         container.start();
 
         // Do whatever you want with the client ...
-        SolrClient client = new Http2SolrClient.Builder("http://" + container.getContainerIpAddress() + ":" + container.getSolrPort() + "/solr").build();
+        SolrClient client = new Http2SolrClient.Builder("http://" + container.getHost() + ":" + container.getSolrPort() + "/solr").build();
         SolrPingResponse response = client.ping("dummy");
 
         // Stop the container.
@@ -70,7 +70,7 @@ public void solrCloudPingTest() throws IOException, SolrServerException {
 
     private SolrClient getClient(SolrContainer container) {
         if (client == null) {
-            client = new Http2SolrClient.Builder("http://" + container.getContainerIpAddress() + ":" + container.getSolrPort() + "/solr").build();
+            client = new Http2SolrClient.Builder("http://" + container.getHost() + ":" + container.getSolrPort() + "/solr").build();
         }
         return client;
     }

From 600d235d220d5e507405921b4e241aa73c067a2a Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpass.com>
Date: Thu, 21 Apr 2022 06:45:04 -0600
Subject: [PATCH 1831/4969] Use latest version of alpine/socat container image
 (#5280)

---
 .../main/java/org/testcontainers/containers/SocatContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/SocatContainer.java b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
index 7592d9f4d1f..bc9ced57845 100644
--- a/core/src/main/java/org/testcontainers/containers/SocatContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
@@ -15,7 +15,7 @@ public class SocatContainer extends GenericContainer<SocatContainer> {
     private final Map<Integer, String> targets = new HashMap<>();
 
     public SocatContainer() {
-        this(DockerImageName.parse("alpine/socat:1.7.3.4-r0"));
+        this(DockerImageName.parse("alpine/socat:1.7.4.3-r0"));
     }
 
     public SocatContainer(final DockerImageName dockerImageName) {

From 96601379e0d1e01ab9743566545e8413e7155e81 Mon Sep 17 00:00:00 2001
From: Roman Pylypaka <rpylypaka@gradle.com>
Date: Mon, 25 Apr 2022 08:24:22 +0100
Subject: [PATCH 1832/4969] Fix connection leak in JDBC
 waitUntilContainerStarted (#5281)

Only the Statement was auto-closed, but not the Connection
from which the Statement was created.

Aside from resources leaking, this can cause problems
when database rename transactions are executed by clients.
---
 .../org/testcontainers/containers/JdbcDatabaseContainer.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index c4bacf3c8ff..5e5342f1ee1 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -1,7 +1,6 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import java.sql.Statement;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
@@ -16,6 +15,7 @@
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -144,7 +144,8 @@ protected void waitUntilContainerStarted() {
             if (!isRunning()) {
                 Thread.sleep(100L);
             } else {
-                try (Statement statement = createConnection("").createStatement()) {
+                try (Connection connection = createConnection("");
+                     Statement statement = connection.createStatement()) {
                     boolean testQuerySucceeded = statement.execute(this.getTestQueryString());
                     if (testQuerySucceeded) {
                         logger().info("Container is started (JDBC URL: {})", this.getJdbcUrl());

From 42fa611a18d3433b820c60a1274ccc7217026016 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:44 +0000
Subject: [PATCH 1833/4969] Bump mssql-jdbc in /modules/mssqlserver

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 10.2.0.jre8 to 11.1.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1f754303ae1..dfa15ed1c2a 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.1.1.jre8-preview'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'

From 52cf6a3505e13607a98e512f032a5ea436c2438a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:44 +0000
Subject: [PATCH 1834/4969] Bump postgresql from 42.3.3 to 42.3.4 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.3 to 42.3.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.3...REL42.3.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 89882481dc1..009f62a8a16 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.4'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }

From a43ff9b9be66b1131638801083f7ca017c71a332 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:44 +0000
Subject: [PATCH 1835/4969] Bump s3 from 2.17.162 to 2.17.181 in
 /modules/localstack

Bumps s3 from 2.17.162 to 2.17.181.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c3f2374e23f..59a5173fe73 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
-    testImplementation 'software.amazon.awssdk:s3:2.17.162'
+    testImplementation 'software.amazon.awssdk:s3:2.17.181'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 244159750e6ba3da0fd59c61b352ea627915bead Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:44 +0000
Subject: [PATCH 1836/4969] Bump neo4j from 3.5.31 to 3.5.32 in /modules/neo4j

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.31 to 3.5.32.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/compare/3.5.31...3.5.32)

---
updated-dependencies:
- dependency-name: org.neo4j:neo4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 6187d665098..0bdd9ba960c 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,7 +29,7 @@ task customNeo4jPluginJar(type: Jar) {
 test.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.31"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.32"
 
     api project(":testcontainers")
 

From bda535fa419cd6abf7891af00932b58f46b87dc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:44 +0000
Subject: [PATCH 1837/4969] Bump mysql-connector-java from 8.0.28 to 8.0.29 in
 /modules/mysql

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.28 to 8.0.29.
- [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.28...8.0.29)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1796ff17ef0..e23920eaae9 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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.28'
+    testImplementation 'mysql:mysql-connector-java:8.0.29'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From 6eddddb462011a1b178726c74798d55c495d498f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:45 +0000
Subject: [PATCH 1838/4969] Bump postgresql from 42.3.3 to 42.3.4 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.3 to 42.3.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.3...REL42.3.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 754d5dde289..f2c50c30754 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.3.3'
+    testImplementation 'org.postgresql:postgresql:42.3.4'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'

From 00e366f4eb27425b3e37012f341c55efb828f365 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:46 +0000
Subject: [PATCH 1839/4969] Bump java-client from 3.2.6 to 3.3.0 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.2.6...java-client-3.3.0)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index a3cb0fcbc70..f1e41fcbe11 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
-    testImplementation 'com.couchbase.client:java-client:3.2.6'
+    testImplementation 'com.couchbase.client:java-client:3.3.0'
     testImplementation 'org.awaitility:awaitility:4.1.1'
 }

From 6b52e87ca78f61bd996391b4cbafa50917ee25a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:46 +0000
Subject: [PATCH 1840/4969] Bump mysql-connector-java from 8.0.28 to 8.0.29 in
 /modules/spock

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.28 to 8.0.29.
- [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.28...8.0.29)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e745bc23ed6..396c0071042 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.28'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }

From 92d1b1b29377a18c8c7652bd39589463b27d8a4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:47 +0000
Subject: [PATCH 1841/4969] Bump jedis from 4.2.1 to 4.2.2 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 9092cc86903..4faead13f3a 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.2.1'
+    implementation 'redis.clients:jedis:4.2.2'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 2df4ba7e6d6..b0d64f0524b 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.2.1'
+    implementation 'redis.clients:jedis:4.2.2'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 9a0af108840..2b7c3b7dda4 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.2.1'
+    implementation 'redis.clients:jedis:4.2.2'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'

From f4ef7e7d28e6bc8d62c732325fa7ad76c71edfc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:47 +0000
Subject: [PATCH 1842/4969] Bump testcontainers from 1.16.3 to 1.17.1 in /core

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.16.3 to 1.17.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.3...1.17.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 3f1ad71731d..91ee725184f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -60,7 +60,7 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.16.3', {
+    baseline 'org.testcontainers:testcontainers:1.17.1', {
         exclude group: "*", module: "*"
     }
 

From 338e9bde40b3b857b5403c42c59cfb583670ce08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:47 +0000
Subject: [PATCH 1843/4969] Bump rest-assured from 5.0.0 to 5.0.1 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.0.0...rest-assured-5.0.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 68daf4ed26f..80b416ce235 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.0.0'
+    testImplementation 'io.rest-assured:rest-assured:5.0.1'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 
 }

From c3583f45bb5931e21cff1a51409b82deeddc2a00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:48 +0000
Subject: [PATCH 1844/4969] Bump mysql-connector-java from 8.0.28 to 8.0.29 in
 /modules/jdbc-test

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.28 to 8.0.29.
- [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.28...8.0.29)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5c10742b7f7..d77465c5616 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -16,5 +16,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.20'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.28'
+    api 'mysql:mysql-connector-java:8.0.29'
 }

From dd899533f03c4f7b1df821833e3504cf22c6f559 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:49 +0000
Subject: [PATCH 1845/4969] Bump transport from 7.17.2 to 7.17.3 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.2 to 7.17.3.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.2...v7.17.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a8d718af3c4..3d8f7bff12d 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.17.2"
+    testImplementation "org.elasticsearch.client:transport:7.17.3"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From e70ca03da3577b8cefc52d3a06b88c2dcd057276 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:50 +0000
Subject: [PATCH 1846/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.169 to 1.12.210.
- [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.12.169...1.12.210)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 2fa5978772e..6dabdec119b 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.169'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.210'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.210'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 7425a05dbec152c741e2e35b16018f08bc998c36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:51 +0000
Subject: [PATCH 1847/4969] Bump jedis from 4.1.1 to 4.2.2 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 4.1.1 to 4.2.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.1.1...v4.2.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 89882481dc1..2685e7b7e40 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.1.1'
+    testImplementation 'redis.clients:jedis:4.2.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:4.4.0') {
         exclude(module: 'hamcrest-core')

From e62826489090b6485e4668797eda3ffddf8075c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:55 +0000
Subject: [PATCH 1848/4969] Bump jedis from 4.0.1 to 4.2.2 in /core

Bumps [jedis](https://github.com/redis/jedis) from 4.0.1 to 4.2.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.0.1...v4.2.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 3f1ad71731d..527d8bd6153 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:4.0.1'
+    testImplementation 'redis.clients:jedis:4.2.2'
     testImplementation 'com.rabbitmq:amqp-client:5.14.2'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 

From 93504fdbef0d27cec7b7810704c99270ecf3e743 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:55 +0000
Subject: [PATCH 1849/4969] Bump toxiproxy-java from 2.1.5 to 2.1.7 in
 /modules/toxiproxy

Bumps [toxiproxy-java](https://github.com/trekawek/toxiproxy-java) from 2.1.5 to 2.1.7.
- [Release notes](https://github.com/trekawek/toxiproxy-java/releases)
- [Changelog](https://github.com/trekawek/toxiproxy-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trekawek/toxiproxy-java/compare/toxiproxy-java-2.1.5...toxiproxy-java-2.1.7)

---
updated-dependencies:
- dependency-name: eu.rekawek.toxiproxy:toxiproxy-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index cad4b6b71f3..a1e5f58551a 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Toxiproxy"
 
 dependencies {
     api project(':testcontainers')
-    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.5'
+    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:3.0.1'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From e54b4a3db1f8de8b80cfb0f3aed494ff21ba900e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:56 +0000
Subject: [PATCH 1850/4969] Bump com.gradle.enterprise.gradle.plugin from 3.8.1
 to 3.10 in /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.8.1 to 3.10.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 75f739e9005..ceb39498854 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
     }
 }

From ef3e752393d1720352bd72ad4c0e8b7064f6538f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:59 +0000
Subject: [PATCH 1851/4969] Bump aws-java-sdk-sqs from 1.12.150 to 1.12.210 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.150 to 1.12.210.
- [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.12.150...1.12.210)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c3f2374e23f..704a16204ae 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.191'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.210'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
     testImplementation 'software.amazon.awssdk:s3:2.17.162'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From dcdad30f9e91cb87ab3c45a73b5fb9e264405399 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:00:59 +0000
Subject: [PATCH 1852/4969] Bump lombok from 1.18.22 to 1.18.24 in /examples

Bumps [lombok](https://github.com/projectlombok/lombok) from 1.18.22 to 1.18.24.
- [Release notes](https://github.com/projectlombok/lombok/releases)
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.22...v1.18.24)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle | 4 ++--
 examples/kafka-cluster/build.gradle    | 2 +-
 examples/solr-container/build.gradle   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 2352eace899..bfb89f9cef2 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.22"
-    annotationProcessor "org.projectlombok:lombok:1.18.20"
+    compileOnly "org.projectlombok:lombok:1.18.24"
+    annotationProcessor "org.projectlombok:lombok:1.18.24"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 7ba974d3a6d..ee8035ea51c 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.22"
+    testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.1.0'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index cec4f59625b..3f3366f9d46 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.22"
+    compileOnly "org.projectlombok:lombok:1.18.24"
     annotationProcessor "org.projectlombok:lombok:1.18.22"
 
     implementation 'org.apache.solr:solr-solrj:8.11.1'

From d3350c2e9de0a19d56a8d24e3750167e379d4ff9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:01:06 +0000
Subject: [PATCH 1853/4969] Bump actions/cache from 3.0.1 to 3.0.2

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index c1b4ac7148e..90b493df481 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -22,7 +22,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -50,7 +50,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16397815990..0c0e5eaf601 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -56,7 +56,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From 0bce9aac0621ab988552698a8c6111cc99a0e358 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:02:21 +0000
Subject: [PATCH 1854/4969] Bump peter-evans/create-pull-request from 4.0.1 to
 4.0.2

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/f1a7646cead32c950d90344a4fb5d4e926972a8f...bd72e1b7922d417764d27d30768117ad7da78a0e)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 3fbbda7153c..b5d672c092d 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f # v3.10.1
+        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From 69c73c20274055ce92f39e3f29ffba41bddccf5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:02:29 +0000
Subject: [PATCH 1855/4969] Bump org.jetbrains.kotlin.jvm from 1.6.10 to 1.6.21
 in /examples

Bumps org.jetbrains.kotlin.jvm from 1.6.10 to 1.6.21.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 1d98c3e3eff..b6dd68b33cd 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.6.4"
-    id("org.jetbrains.kotlin.jvm") version "1.6.10"
+    id("org.jetbrains.kotlin.jvm") version "1.6.21"
     id("org.jetbrains.kotlin.plugin.spring") version "1.6.20"
 }
 

From 9ecd399cb1c23d3130f4613ca6888d3e67dca9ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:03:47 +0000
Subject: [PATCH 1856/4969] Bump trino-jdbc from 375 to 379 in /modules/trino

Bumps trino-jdbc from 375 to 379.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index f99951dc7fa..d0b56af633f 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:375'
+    testImplementation 'io.trino:trino-jdbc:379'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From b353a96a8ac2c260aa4ba30180e3f1495dc9835a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:03:58 +0000
Subject: [PATCH 1857/4969] Bump mongodb-driver-sync from 4.5.1 to 4.6.0 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.5.1 to 4.6.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.5.1...r4.6.0)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 6bca2cb892b..d8ef34fbb40 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.5.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.6.0")
 }

From e3525704d983221c94d7af7a87b3e8452ca81933 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:04:00 +0000
Subject: [PATCH 1858/4969] Bump azure-cosmos from 4.26.0 to 4.29.1 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.26.0 to 4.29.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.26.0...azure-cosmos_4.29.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index b4dab636eb9..8ab7612c18b 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'com.azure:azure-cosmos:4.26.0'
+    testImplementation 'com.azure:azure-cosmos:4.29.1'
 }

From 9d1f038121cb0f8bf42611a9092af1f2b3857748 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:04:05 +0000
Subject: [PATCH 1859/4969] Bump kubernetes-client from 5.12.1 to 5.12.2 in
 /modules/k3s

Bumps [kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 5.12.1 to 5.12.2.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v5.12.1...v5.12.2)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index a373d8115d7..0ab368d60c2 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:5.12.1'
+    testImplementation 'io.fabric8:kubernetes-client:5.12.2'
     testImplementation 'io.kubernetes:client-java:15.0.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 3cd4f25f6825def6c6dfeeadf40c09fe95be01d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:04:12 +0000
Subject: [PATCH 1860/4969] Bump postgresql from 42.3.3 to 42.3.4 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.3 to 42.3.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.3...REL42.3.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 4d15e4df1c1..ad1007a4744 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.3.3'
+    testImplementation 'org.postgresql:postgresql:42.3.4'
 }

From 9035c934cd87b8bcb051d4f1533fa0fc1d9fee0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:04:16 +0000
Subject: [PATCH 1861/4969] Bump google-cloud-pubsub from 1.115.1 to 1.116.4 in
 /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.115.1 to 1.116.4.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.115.1...v1.116.4)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 6a51c854552..475cfb56c45 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.2.2'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.116.4'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.1'
     testImplementation 'org.assertj:assertj-core:3.22.0'

From f9abd766159b2d1f595f106fae9fb6325ef0e1b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:04:26 +0000
Subject: [PATCH 1862/4969] Bump reactor-core from 3.4.16 to 3.4.17 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.16 to 3.4.17.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.16...v3.4.17)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index d1ddfc0455a..2a4e3958af8 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.16'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.17'
     testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
 }

From 6a56e04b436b14e406df2ebb2e571dcce87f6bfa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:04:29 +0000
Subject: [PATCH 1863/4969] Bump google-cloud-datastore from 2.2.2 to 2.4.0 in
 /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.2.2 to 2.4.0.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.2.2...v2.4.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 6a51c854552..ab571447bcc 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.2.2'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.4.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'

From bf9a26680a6a4a1394cf1fc230895112e0d53e45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:04:34 +0000
Subject: [PATCH 1864/4969] Bump google-cloud-bigtable from 2.6.1 to 2.6.2 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.6.1...v2.6.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 6a51c854552..2aea93f27e5 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.2'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From f63f9619329a2d6e25c9832c51bba3af06c7c86a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 22:05:33 +0000
Subject: [PATCH 1865/4969] Bump hivemq-extension-sdk from 4.7.5 to 4.8.0 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.7.5 to 4.8.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.7.5...4.8.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index dfd01981894..bfdfecb1761 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.7.5")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.10")

From 9635a350d34035c204e1a2e451c77e617e778055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gradle.com>
Date: Mon, 2 May 2022 16:51:33 +0200
Subject: [PATCH 1866/4969] Manage Gradle Enterprise plugins with Dependabot
 (#5342)

* Add dependabot configuration to monitor Gradle plugins

* Restrict registries to Gradle Plugin Portal
---
 .github/dependabot.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5d67f278219..3e2d53fed65 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,10 +1,25 @@
 version: 2
+registries:
+  gradle-plugin-portal:
+    type: maven-repository
+    url: https://plugins.gradle.org/m2
+    username: dummy # Required by dependabot
+    password: dummy # Required by dependabot
 updates:
   - package-ecosystem: "gradle"
     directory: "/core"
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/"
+    allow:
+      - dependency-name: "com.gradle*"
+    registries:
+      - gradle-plugin-portal
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"

From e21164a893141b5a7be817a4f6c43485a9f930e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 May 2022 20:10:23 +0200
Subject: [PATCH 1867/4969] Bump com.gradle.enterprise.gradle.plugin from 3.9
 to 3.10 (#5343)

Bumps com.gradle.enterprise.gradle.plugin from 3.9 to 3.10.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 64f2aa5d70a..6b80183bc34 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.9"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.5"
     }
 }

From 46ba812ab2315626ca3d90c7432a2a0bbb544f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 6 May 2022 16:10:29 -0500
Subject: [PATCH 1868/4969] Add testcontainers/java-team in CODEOWNERS (#5353)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index add6048a437..effc21c4f1e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,7 +3,7 @@
 # These owners will be the default reviewers for everything in
 # the repo.
 
-*                       @rnorth @bsideup @kiview
+*                       @testcontainers/java-team
 
 # The last matching pattern takes the most
 # precedence.

From b3b2a4694f2f919b2d1a7b3fa447e4e03125d56d Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Sun, 8 May 2022 10:02:27 +0200
Subject: [PATCH 1869/4969] Elasticsearch: Don't throw exception on missing CA
 cert file (#5265)

The current check throws an exception if the version is supposed to be
greater than 8 and the ca cert file is missing. This posed two problems:

1. A custom docker image might have a 'latest' version, and thus is
   newer than version 8
2. A user may have configured their own CA in a different path

In order to accomodate for this, a missing copy of a the ca crt file
will log a warning, but not throw an exception and leave the container
unstarted. There is also another public method, allowing to read the
cert, called `extractCert`.

Closes #5264
---
 .../elasticsearch/ElasticsearchContainer.java | 31 +++++++-
 .../ElasticsearchContainerTest.java           | 79 +++++++++++++++----
 .../src/test/resources/http_ca.crt            | 31 ++++++++
 3 files changed, 123 insertions(+), 18 deletions(-)
 create mode 100644 modules/elasticsearch/src/test/resources/http_ca.crt

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 84881b2e87d..ac0b367f403 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -1,7 +1,10 @@
 package org.testcontainers.elasticsearch;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.Base58;
@@ -21,6 +24,7 @@
  * Represents an elasticsearch docker instance which exposes by default port 9200 and 9300 (transport.tcp.port)
  * The docker image is by default fetched from docker.elastic.co/elasticsearch/elasticsearch
  */
+@Slf4j
 public class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
 
     /**
@@ -55,6 +59,7 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     private final boolean isOss;
     private final boolean isAtLeastMajorVersion8;
     private Optional<byte[]> caCertAsBytes = Optional.empty();
+    private String certPath = "/usr/share/elasticsearch/config/certs/http_ca.crt";
 
     /**
      * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
@@ -100,10 +105,17 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        if (isAtLeastMajorVersion8) {
-            byte[] bytes = copyFileFromContainer("/usr/share/elasticsearch/config/certs/http_ca.crt", IOUtils::toByteArray);
-            if (bytes.length > 0) {
-                this.caCertAsBytes = Optional.of(bytes);
+        if (isAtLeastMajorVersion8 && StringUtils.isNotEmpty(certPath)) {
+            try {
+                byte[] bytes = copyFileFromContainer(certPath, IOUtils::toByteArray);
+                if (bytes.length > 0) {
+                    this.caCertAsBytes = Optional.of(bytes);
+                }
+            } catch (NotFoundException e) {
+                // just emit an error message, but do not throw an exception
+                // this might be ok, if the docker image is accidentally looking like version 8 or latest
+                // can happen if Elasticsearch is repackaged, i.e. with custom plugins
+                log.warn("CA cert under " + certPath + " not found.");
             }
         }
     }
@@ -158,6 +170,17 @@ public ElasticsearchContainer withPassword(String password) {
         return this;
     }
 
+    /**
+     * Configure a CA cert path that is not the default
+     *
+     * @param certPath Path to the CA certificate within the Docker container to extract it from after start up
+     * @return this
+     */
+    public ElasticsearchContainer withCertPath(String certPath) {
+        this.certPath = certPath;
+        return this;
+    }
+
     public String getHttpHostAddress() {
         return getHost() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
     }
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 956c794135b..f8131268e61 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.elasticsearch;
 
+import com.github.dockerjava.api.DockerClient;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -17,8 +18,12 @@
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.junit.After;
 import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
+import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
 
 import static org.hamcrest.CoreMatchers.containsString;
@@ -252,29 +257,75 @@ public void incompatibleSettingsTest() {
 
     @Test
     public void testElasticsearch8SecureByDefault() throws Exception {
-        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.0.0")) {
+        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.1.2")) {
             // Start the container. This step might take some time...
             container.start();
 
-            // Create the secured client.
-            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY,
-                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD));
-
-            client = RestClient.builder(HttpHost.create("https://" + container.getHttpHostAddress()))
-                .setHttpClientConfigCallback(httpClientBuilder -> {
-                    httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-                    httpClientBuilder.setSSLContext(container.createSslContextFromCa());
-                    return httpClientBuilder;
-                })
-                .build();
+            Response response = getClusterHealth(container);
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+        }
+    }
 
-            Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+    @Test
+    public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
+        final MountableFile mountableFile = MountableFile.forClasspathResource("http_ca.crt");
+        String caPath = "/tmp/http_ca.crt";
+        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.1.2")
+            .withCopyToContainer(mountableFile, caPath)
+            .withCertPath(caPath)) {
+
+            container.start();
+
+            // this is expected, as a different cert is used for creating the SSL context
+            assertThrows("PKIX path validation failed: java.security.cert.CertPathValidatorException: Path does not chain with any of the trust anchors", SSLHandshakeException.class, () -> getClusterHealth(container));
+        }
+    }
+
+    @Test
+    public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
+        // this test exists for custom images by users that use the `latest` tag
+        // even though the version might be older than version 8
+        // this tags an old 7.x version as :latest
+        tagImage("docker.elastic.co/elasticsearch/elasticsearch:7.9.2", "elasticsearch-tc-older-release", "latest");
+        DockerImageName image = DockerImageName.parse("elasticsearch-tc-older-release:latest").asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch");
+
+        try (ElasticsearchContainer container = new ElasticsearchContainer(image)) {
+            container.start();
+
+            Response response = getClient(container).performRequest(new Request("GET", "/_cluster/health"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
             assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
         }
     }
 
+    private void tagImage(String sourceImage, String targetImage, String targetTag) throws InterruptedException {
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+        dockerClient.tagImageCmd(
+                new RemoteDockerImage(DockerImageName.parse(sourceImage)).get(),
+                targetImage,
+                targetTag
+            )
+            .exec();
+    }
+
+    private Response getClusterHealth(ElasticsearchContainer container) throws IOException {
+        // Create the secured client.
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+            new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD));
+
+        client = RestClient.builder(HttpHost.create("https://" + container.getHttpHostAddress()))
+            .setHttpClientConfigCallback(httpClientBuilder -> {
+                httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                httpClientBuilder.setSSLContext(container.createSslContextFromCa());
+                return httpClientBuilder;
+            })
+            .build();
+
+        return client.performRequest(new Request("GET", "/_cluster/health"));
+    }
+
     private RestClient getClient(ElasticsearchContainer container) {
         if (client == null) {
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
diff --git a/modules/elasticsearch/src/test/resources/http_ca.crt b/modules/elasticsearch/src/test/resources/http_ca.crt
new file mode 100644
index 00000000000..704e5a37aa6
--- /dev/null
+++ b/modules/elasticsearch/src/test/resources/http_ca.crt
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIVAPVLz0Dwvzl66ZVpyJY/ntos+qQZMA0GCSqGSIb3DQEB
+CwUAMDwxOjA4BgNVBAMTMUVsYXN0aWNzZWFyY2ggc2VjdXJpdHkgYXV0by1jb25m
+aWd1cmF0aW9uIEhUVFAgQ0EwHhcNMjIwNDE0MDcyOTA4WhcNMjUwNDEzMDcyOTA4
+WjA8MTowOAYDVQQDEzFFbGFzdGljc2VhcmNoIHNlY3VyaXR5IGF1dG8tY29uZmln
+dXJhdGlvbiBIVFRQIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+ufHmvM04dPKNF6AulX3HrjNfcYy62pBO2oJIKhScetDzuRupv/qiXkO1gzGT3/jk
+8uk57rzylDFoCgFNUyWdYQAXD+qsy5vbAytGVNCHOGSuWlNm1bbDYwZNTXjZTK6C
+CKIY31lbFn9a4oM+Jp1kvIr8GSMQAYDisq+yrVloDLkRs1SPImnoaXsq8epxloBf
+En0vo5V8PtOh+xQFpPP21pd5QohCSB+jMaxaizScWX+k7BijEaS1LCsc2w2PNvwn
+/bEvtW7w9w+HnzRGZW2nVlt8eji1PHMmfM5Zugn4HAxsSvdI9VRFGAeT2moNiSLN
+zxOWmEvQVl2MxRWiTkM1EM7CFDN40hLHtHej8UddeXTDDXyLoUjY3FmaB45rLKdE
+k/rszepc3lmptEMh74iUowKaYZTS5jRqT0yIDzevP5je3JP+pe4aNkx7lWMhTReQ
+6fs97nd71PfJBuMcHPEA14zwSzSRb/8mNqqaQLBb5H1DpDcZtzbBxb4wFSAa7Dd0
+pVl4A04iB4PS3DaWg/im2C5a83nUTld7Lvy+I6cO1MTaXdkzn6EWXtxkHj7P4VXX
+sFTr+Z2A6g/novqderirQzq8aD87MBp2hLBgG59lVB3IXA+CJTzBRBZipU+FOSs2
+1enMlaEa84d8cb+GSpDkmsvamPMhhLeMw6QLmhQXoWMCAwEAAaNTMFEwHQYDVR0O
+BBYEFOt9JC+RiqfFdGf/UT2vfmnV8f+kMB8GA1UdIwQYMBaAFOt9JC+RiqfFdGf/
+UT2vfmnV8f+kMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBALFX
+r2CKtu2DcLFQaZft9LeRK67xU0rjN8w1+0MN9otSkU9avd8atPOI9p6r67HZyoTv
+LDA47ajitzPo4zAXiy4GUXFVCjx3iPOQ4TTCm0YEf9IudLHLqGTbK+Pup6XlfAMb
+RejkztcXkxw3Cy6SjIRq99xU8J6Y1jAggB162hqnp3u42nA1PgOJgo/biUYeVtu7
+Y01gKPdCEkiqmSFxfLiRPv5Z4WyYoKge6UyDYFHu0zyMY7zQ2hzrPMFsEhI4+g5D
+W7ihilcOijhvfeeWIxcP5lRn2pGbf2GtwqtA7Bt9YKp+NQIBPzK7D1ymS0v/CAWh
+3Bv1rqkqDK8TlBybZitTTB6MgGtXOBccouTPmBFBXSWydvW4GW6Dag/ogHHE2vG2
+xlXY6EC1QEzExcM5FZNJI6SOaK0nl+WKAv060U/1ZqcRIkhyctYdkrK4449n1JMy
+wjtwcDW7QxhQspHp8GEXztLctokqGjnuMcgPjVoFdiF3w/IV0UUvVeFK4Oms0YbH
+uFr3q44Fu/Fol68/1CUk1ytgLUS5anf0Q0WlJsmMUX156ATA29dVBfloJN63EYd7
+01uwbjoMJce7MiwTaLIetW75fxxZHlQK9TMNhaQwKUO8SRaNuE4wKURFoKPg/Dqu
+yPhx9adseStlJ3oV6ziEWMwjOK2JmJf0bmIqQ7KR
+-----END CERTIFICATE-----

From 84a635efad8a2dc1726ee263950e013de9b51e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 9 May 2022 09:11:20 -0500
Subject: [PATCH 1870/4969] Fix docs: use getHost (#5288)

---
 .../src/test/java/com/example/AbstractIntegrationTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
index b6859563c69..dd1b7b6fb5a 100644
--- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
@@ -23,7 +23,7 @@ public abstract class AbstractIntegrationTest {
     @DynamicPropertySource
     static void redisProperties(DynamicPropertyRegistry registry) {
         redis.start();
-        registry.add("spring.redis.host", redis::getContainerIpAddress);
+        registry.add("spring.redis.host", redis::getHost);
         registry.add("spring.redis.port", redis::getFirstMappedPort);
     }
 }

From 0b03b91c22fe79af25c8576c5c13195b76f3f619 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 9 May 2022 20:40:29 -0400
Subject: [PATCH 1871/4969] Fix deadlock in `LocalImagesCache` (#5356)

Fixes #5282
---
 .../java/org/testcontainers/images/LocalImagesCache.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
index ec38721a229..8791ecb6986 100644
--- a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
+++ b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
@@ -27,15 +27,14 @@ enum LocalImagesCache {
     @VisibleForTesting
     final Map<DockerImageName, ImageData> cache = new ConcurrentHashMap<>();
 
-    DockerClient dockerClient = DockerClientFactory.lazyClient();
-
     public ImageData get(DockerImageName imageName) {
-        maybeInitCache();
+        maybeInitCache(DockerClientFactory.instance().client());
         return cache.get(imageName);
     }
 
     public Optional<ImageData> refreshCache(DockerImageName imageName) {
-        if (!maybeInitCache()) {
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+        if (!maybeInitCache(dockerClient)) {
             // Cache may be stale, trying inspectImageCmd...
 
             InspectImageResponse response = null;
@@ -57,7 +56,7 @@ public Optional<ImageData> refreshCache(DockerImageName imageName) {
         return Optional.ofNullable(cache.get(imageName));
     }
 
-    private synchronized boolean maybeInitCache() {
+    private synchronized boolean maybeInitCache(DockerClient dockerClient) {
         if (!initialized.compareAndSet(false, true)) {
             return false;
         }

From 3164d4ec1081a8f43982dcadc9db887ea6ac79b3 Mon Sep 17 00:00:00 2001
From: Felix Seifert <mail@felix-seifert.com>
Date: Tue, 10 May 2022 02:40:56 +0200
Subject: [PATCH 1872/4969] Correct usage of deprecated method
 `createSubscription()` (#5350)

Call non-deprecated `createSubscription` method in `PubSubEmulatorTest`
---
 .../testcontainers/containers/PubSubEmulatorContainerTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index 8db49eb3649..61d56a279d7 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -20,6 +20,7 @@
 import com.google.pubsub.v1.PullRequest;
 import com.google.pubsub.v1.PullResponse;
 import com.google.pubsub.v1.PushConfig;
+import com.google.pubsub.v1.SubscriptionName;
 import com.google.pubsub.v1.TopicName;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -104,7 +105,7 @@ private void createSubscription(String subscriptionId, String topicId, Transport
                 .setCredentialsProvider(credentialsProvider)
                 .build();
         SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create(subscriptionAdminSettings);
-        ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(PROJECT_ID, subscriptionId);
+        SubscriptionName subscriptionName = SubscriptionName.of(PROJECT_ID, subscriptionId);
         subscriptionAdminClient.createSubscription(subscriptionName, TopicName.of(PROJECT_ID, topicId), PushConfig.getDefaultInstance(), 10);
     }
     // }

From d4e7671a09f6312f96044f937f2d0973078860e3 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <mdedetrich@gmail.com>
Date: Tue, 10 May 2022 08:11:31 +0200
Subject: [PATCH 1873/4969] Add getConnectionString() for MongoDBContainer
 (#5271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../containers/MongoDBContainer.java          | 20 +++++++++++++------
 .../containers/MongoDBContainerTest.java      |  4 ++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 53336d4fbec..87db80846a8 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -48,6 +48,19 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
         );
     }
 
+    /**
+     * Gets a connection string url, unlike {@link #getReplicaSetUrl} this does point to a
+     * database
+     * @return a connection url pointing to a mongodb instance
+     */
+    public String getConnectionString() {
+        return String.format(
+            "mongodb://%s:%d",
+            getHost(),
+            getMappedPort(MONGODB_INTERNAL_PORT)
+        );
+    }
+
     /**
      * Gets a replica set url for the default {@value #MONGODB_DATABASE_NAME_DEFAULT} database.
      *
@@ -67,12 +80,7 @@ public String getReplicaSetUrl(final String databaseName) {
         if (!isRunning()) {
             throw new IllegalStateException("MongoDBContainer should be started first");
         }
-        return String.format(
-            "mongodb://%s:%d/%s",
-            getHost(),
-            getMappedPort(MONGODB_INTERNAL_PORT),
-            databaseName
-        );
+        return getConnectionString() + "/" + databaseName;
     }
 
     @Override
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index ff5243acea7..532a86208c1 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -38,11 +38,15 @@ public void shouldExecuteTransactions() {
 
             final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
             assertNotNull(mongoRsUrl);
+            final String connectionString = mongoDBContainer.getConnectionString();
+            final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
             final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
             mongoSyncClient.getDatabase("mydb1").getCollection("foo")
                 .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("abc", 0));
             mongoSyncClient.getDatabase("mydb2").getCollection("bar")
                 .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("xyz", 0));
+            mongoSyncClientBase.getDatabase("mydb3").getCollection("baz")
+                .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("def", 0));
 
             final ClientSession clientSession = mongoSyncClient.startSession();
             final TransactionOptions txnOptions = TransactionOptions.builder()

From 87126060b0e76ace2b4b9b344d92908fe4fb7cf5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 10 May 2022 10:19:57 -0400
Subject: [PATCH 1874/4969] Test `DOCKER_HOST` in
 `DockerClientProviderStrategy` (#5357)

* Test `DOCKER_HOST` in `DockerClientProviderStrategy`

* Update DockerClientProviderStrategy.java
---
 .../DockerClientProviderStrategy.java         | 101 +++++++++++++++---
 1 file changed, 88 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 2ae066d897d..cf091e94328 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -7,6 +7,9 @@
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.transport.NamedPipeSocket;
+import com.github.dockerjava.transport.SSLConfig;
+import com.github.dockerjava.transport.UnixSocket;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
@@ -14,15 +17,28 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.awaitility.Awaitility;
 import org.jetbrains.annotations.Nullable;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.UnstableAPI;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import javax.net.SocketFactory;
+import java.io.File;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
 import java.net.URI;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -31,6 +47,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
@@ -104,6 +121,71 @@ public DockerClient getClient() {
         return dockerClient;
     }
 
+    /**
+     * TODO we should consider moving this to docker-java at some point
+     */
+    @UnstableAPI
+    protected boolean test() {
+        TransportConfig transportConfig = getTransportConfig();
+        URI dockerHost = transportConfig.getDockerHost();
+
+        Callable<Socket> socketProvider;
+        SocketAddress socketAddress;
+        switch (dockerHost.getScheme()) {
+            case "tcp":
+            case "http":
+            case "https":
+                SocketFactory socketFactory = SocketFactory.getDefault();
+                SSLConfig sslConfig = transportConfig.getSslConfig();
+                if (sslConfig != null) {
+                    try {
+                        socketFactory = sslConfig.getSSLContext().getSocketFactory();
+                    } catch (KeyManagementException | UnrecoverableKeyException | NoSuchAlgorithmException | KeyStoreException e) {
+                        log.warn("Exception while creating SSLSocketFactory", e);
+                        return false;
+                    }
+                }
+                socketProvider = socketFactory::createSocket;
+                socketAddress = new InetSocketAddress(dockerHost.getHost(), dockerHost.getPort());
+                break;
+            case "unix":
+            case "npipe":
+                if (!new File(dockerHost.getPath()).exists()) {
+                    log.debug("DOCKER_HOST socket file '{}' does not exist", dockerHost.getPath());
+                    return false;
+                }
+                socketProvider = () -> {
+                    switch (dockerHost.getScheme()) {
+                        case "unix":
+                            return UnixSocket.get(dockerHost.getPath());
+                        case "npipe":
+                            return new NamedPipeSocket(dockerHost.getPath());
+                        default:
+                            throw new IllegalStateException("Unexpected scheme " + dockerHost.getScheme());
+                    }
+                };
+                socketAddress = new InetSocketAddress("localhost", 2375);
+                break;
+            default:
+                log.warn("Unknown DOCKER_HOST scheme {}, skipping the strategy test...", dockerHost.getScheme());
+                return true;
+        }
+
+        try (Socket socket = socketProvider.call()) {
+            Duration timeout = Duration.ofMillis(200);
+            Awaitility.await()
+                .atMost(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS)
+                .pollInterval(timeout)
+                .pollDelay(Duration.ofSeconds(0)) // start checking immediately
+                .ignoreExceptionsInstanceOf(SocketTimeoutException.class)
+                .untilAsserted(() -> socket.connect(socketAddress, (int) timeout.toMillis()));
+            return true;
+        } catch (Exception e) {
+            log.warn("DOCKER_HOST {} is not listening", dockerHost);
+            return false;
+        }
+    }
+
     /**
      * Determine the right DockerClientConfig to use for building clients by trial-and-error.
      *
@@ -161,20 +243,13 @@ public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
     private static boolean tryOutStrategy(List<String> configurationFailures, DockerClientProviderStrategy strategy) {
         try {
             log.debug("Trying out strategy: {}", strategy.getClass().getSimpleName());
-            DockerClient dockerClient = strategy.getDockerClient();
-
-            Info info;
-            try {
-                info = Unreliables.retryUntilSuccess(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS, () -> {
-                    return strategy.PING_RATE_LIMITER.getWhenReady(() -> {
-                        log.debug("Pinging docker daemon...");
-                        return dockerClient.infoCmd().exec();
-                    });
-                });
-            } catch (TimeoutException e) {
-                IOUtils.closeQuietly(dockerClient);
-                throw e;
+
+            if (!strategy.test()) {
+                log.debug("strategy {} did not pass the test", strategy.getClass().getSimpleName());
+                return false;
             }
+
+            Info info = strategy.getDockerClient().infoCmd().exec();
             log.info("Found Docker environment with {}", strategy.getDescription());
             log.debug(
                 "Transport type: '{}', Docker host: '{}'",

From 7d54ff90a4e9514ded0ea0a09d234ae5d76cc10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 11 May 2022 13:22:18 -0500
Subject: [PATCH 1875/4969] Allow to create exchanges, queues, bindings in the
 same vhost (#5348)

---
 .../containers/RabbitMQContainer.java         | 39 +++++++++++++++++++
 .../containers/RabbitMQContainerTest.java     | 16 +++++---
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 37dc2fbe7ca..f5c63a267a9 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -220,8 +220,25 @@ public RabbitMQContainer withBinding(String source, String destination) {
         return self();
     }
 
+    public RabbitMQContainer withBinding(String vhost, String source, String destination) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "binding",
+            "source=" + source,
+            "destination=" + destination));
+        return self();
+    }
+
     public RabbitMQContainer withBinding(String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
         values.add(asList("rabbitmqadmin", "declare", "binding",
+            "source=" + source,
+            "destination=" + destination,
+            "routing_key=" + routingKey,
+            "destination_type=" + destinationType,
+            "arguments=" + toJson(arguments)));
+        return self();
+    }
+
+    public RabbitMQContainer withBinding(String vhost, String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "binding",
                 "source=" + source,
                 "destination=" + destination,
                 "routing_key=" + routingKey,
@@ -332,6 +349,12 @@ public RabbitMQContainer withVhostLimit(String vhost, String name, int value) {
 
     public RabbitMQContainer withQueue(String name) {
         values.add(asList("rabbitmqadmin", "declare", "queue",
+            "name=" + name));
+        return self();
+    }
+
+    public RabbitMQContainer withQueue(String vhost, String name) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue",
                 "name=" + name));
         return self();
     }
@@ -345,6 +368,15 @@ public RabbitMQContainer withQueue(String name, boolean autoDelete, boolean dura
         return self();
     }
 
+    public RabbitMQContainer withQueue(String vhost, String name, boolean autoDelete, boolean durable, Map<String, Object> arguments) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue",
+            "name=" + name,
+            "auto_delete=" + autoDelete,
+            "durable=" + durable,
+            "arguments=" + toJson(arguments)));
+        return self();
+    }
+
     public RabbitMQContainer withExchange(String name, String type) {
         values.add(asList("rabbitmqadmin", "declare", "exchange",
                 "name=" + name,
@@ -352,6 +384,13 @@ public RabbitMQContainer withExchange(String name, String type) {
         return self();
     }
 
+    public RabbitMQContainer withExchange(String vhost, String name, String type) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "exchange",
+            "name=" + name,
+            "type=" + type));
+        return self();
+    }
+
     public RabbitMQContainer withExchange(String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
         values.add(asList("rabbitmqadmin", "declare", "exchange",
             "name=" + name,
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 474d613cb8b..d82051a94db 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -14,7 +14,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -22,8 +21,6 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Collections;
-import java.util.Objects;
-import java.util.Scanner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
@@ -159,9 +156,16 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
                     .withVhost("vhost2", true)
                     .withExchange("direct-exchange", "direct")
                     .withExchange("topic-exchange", "topic")
+                    .withExchange("vhost1", "topic-exchange-2", "topic", false, false, true, Collections.emptyMap())
+                    .withExchange("vhost2", "topic-exchange-3", "topic")
+                    .withExchange("topic-exchange-4", "topic", false, false, true, Collections.emptyMap())
                     .withQueue("queue1")
                     .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                    .withQueue("vhost1", "queue3", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                    .withQueue("vhost2", "queue4")
                     .withBinding("direct-exchange", "queue1")
+                    .withBinding("vhost1", "topic-exchange-2", "queue3")
+                    .withBinding("vhost2", "topic-exchange-3", "queue4", Collections.emptyMap(), "ss7", "queue")
                     .withUser("user1", "password1")
                     .withUser("user2", "password2", ImmutableSet.of("administrator"))
                     .withPermission("vhost1", "user1", ".*", ".*", ".*")
@@ -175,15 +179,15 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "queues")
                 .getStdout())
-                .contains("queue1", "queue2");
+                .contains("queue1", "queue2", "queue3", "queue4");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "exchanges")
                 .getStdout())
-                .contains("direct-exchange", "topic-exchange");
+                .contains("direct-exchange", "topic-exchange", "topic-exchange-2", "topic-exchange-3", "topic-exchange-4");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "bindings")
                 .getStdout())
-                .contains("direct-exchange");
+                .contains("direct-exchange", "topic-exchange-2", "topic-exchange-3");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "users")
                 .getStdout())

From f41bdb2cda1b45e86db07507b18e8acbf8641cc6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 13 May 2022 21:05:43 -0400
Subject: [PATCH 1876/4969] Read `indexServerAddress` from Docker's `/info`
 (#5347)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Read `indexServerAddress` from Docker's `/info`

* remove `setIndexServerAddress`

* Update fallback default registry name to `https://index.docker.io/v1/`

* Fix build

Co-authored-by: Kevin Wittek <kevin@wittek.dev>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../java/org/testcontainers/DockerClientFactory.java |  7 ++++++-
 .../dockerclient/DockerClientProviderStrategy.java   |  7 +++++--
 .../testcontainers/utility/RegistryAuthLocator.java  | 12 ++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 6cf8f716704..cc85645b2b4 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -199,7 +199,7 @@ public void close() {
         };
         log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
 
-        Info dockerInfo = client.infoCmd().exec();
+        Info dockerInfo = strategy.getInfo();
         Version version = client.versionCmd().exec();
         activeApiVersion = version.getApiVersion();
         activeExecutionDriver = dockerInfo.getExecutionDriver();
@@ -434,4 +434,9 @@ public String getActiveExecutionDriver() {
     public boolean isUsing(Class<? extends DockerClientProviderStrategy> providerStrategyClass) {
         return strategy != null && providerStrategyClass.isAssignableFrom(this.strategy.getClass());
     }
+
+    @UnstableAPI
+    public Info getInfo() {
+        return getOrInitializeStrategy().getInfo();
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index cf091e94328..834e670438a 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -65,6 +65,9 @@ public abstract class DockerClientProviderStrategy {
 
     private String dockerHostIpAddress;
 
+    @Getter
+    private Info info;
+
     private final RateLimiter PING_RATE_LIMITER = RateLimiterBuilder.newBuilder()
             .withRate(10, TimeUnit.SECONDS)
             .withConstantThroughput()
@@ -249,7 +252,7 @@ private static boolean tryOutStrategy(List<String> configurationFailures, Docker
                 return false;
             }
 
-            Info info = strategy.getDockerClient().infoCmd().exec();
+            strategy.info = strategy.getDockerClient().infoCmd().exec();
             log.info("Found Docker environment with {}", strategy.getDescription());
             log.debug(
                 "Transport type: '{}', Docker host: '{}'",
@@ -258,7 +261,7 @@ private static boolean tryOutStrategy(List<String> configurationFailures, Docker
             );
 
             log.debug("Checking Docker OS type for {}", strategy.getDescription());
-            String osType = info.getOsType();
+            String osType = strategy.getInfo().getOsType();
             if (StringUtils.isBlank(osType)) {
                 log.warn("Could not determine Docker OS type");
             } else if (!osType.equals("linux")) {
diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index d88bdccd76a..e487bda686b 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -7,6 +7,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
+import org.testcontainers.DockerClientFactory;
 import org.zeroturnaround.exec.InvalidResultException;
 import org.zeroturnaround.exec.ProcessExecutor;
 
@@ -32,7 +33,7 @@
 public class RegistryAuthLocator {
 
     private static final Logger log = getLogger(RegistryAuthLocator.class);
-    private static final String DEFAULT_REGISTRY_NAME = "index.docker.io";
+    private static final String DEFAULT_REGISTRY_NAME = "https://index.docker.io/v1/";
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     private static RegistryAuthLocator instance;
@@ -282,7 +283,14 @@ private String getCredentialProgramName(String credHelper) {
     }
 
     private String effectiveRegistryName(DockerImageName dockerImageName) {
-        return StringUtils.defaultIfEmpty(dockerImageName.getRegistry(), DEFAULT_REGISTRY_NAME);
+        final String registry = dockerImageName.getRegistry();
+        if (!StringUtils.isEmpty(registry)) {
+            return registry;
+        }
+        return StringUtils.defaultString(
+            DockerClientFactory.instance().getInfo().getIndexServerAddress(),
+            DEFAULT_REGISTRY_NAME
+        );
     }
 
     private String getGenericCredentialsNotFoundMsg(String credentialHelperName) {

From bf70b4093fd31850fe58d6d29af2039c1026ce23 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 15 May 2022 11:00:06 -0400
Subject: [PATCH 1877/4969] run `core` tests in parallel (#5365)

* run `core` tests in parallel

* ooops

* Dummy change

* dummy change (2)
---
 core/build.gradle                             |  2 +
 .../DockerClientFactoryTest.java              | 38 +++++-------
 .../DockerRegistryContainer.java              | 36 +++++++++++
 .../dockerclient/AmbiguousImagePullTest.java  | 31 ++++------
 .../images/ImagePullPolicyTest.java           | 59 +++---------------
 .../utility/AuthenticatedImagePullTest.java   | 62 +++----------------
 6 files changed, 79 insertions(+), 149 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 3f1ad71731d..b519673de4b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -6,6 +6,8 @@ sourceSets {
     jarFileTest
 }
 
+test.maxParallelForks = 4
+
 idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs
 
 shadowJar {
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 4dcfc26349f..247a16a76a6 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -1,18 +1,16 @@
 package org.testcontainers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import com.github.dockerjava.api.exception.NotFoundException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory.DiskSpaceUsage;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
-import org.testcontainers.images.LocalImagesCacheAccessor;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 /**
  * Test for {@link DockerClientFactory}.
  */
@@ -23,30 +21,22 @@ public class DockerClientFactoryTest {
 
     @Test
     public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
+        try (DockerRegistryContainer registryContainer = new DockerRegistryContainer()) {
+            registryContainer.start();
+            DockerImageName imageName = registryContainer.createImage();
 
-        final DockerClientFactory dockFactory = DockerClientFactory.instance();
+            DockerClientFactory dockFactory = DockerClientFactory.instance();
 
-        DockerImageName imageName = DockerImageName.parse("testcontainers/helloworld:1.1.0");
-
-        try {
-            //remove tiny image, so it will be pulled during next command run
-            dockFactory.client()
-                    .removeImageCmd(imageName.asCanonicalNameString())
-                    .withForce(true).exec();
-        } catch (NotFoundException ignored) {
-            // Do not fail if it's not pulled yet
-        }
-        LocalImagesCacheAccessor.clearCache();
-
-        dockFactory.runInsideDocker(
+            dockFactory.runInsideDocker(
                 imageName,
                 cmd -> cmd.withCmd("sh", "-c", "echo 'SUCCESS'"),
                 (client, id) ->
-                        client.logContainerCmd(id)
-                                .withStdOut(true)
-                                .exec(new LogToStringContainerCallback())
-                                .toString()
-        );
+                    client.logContainerCmd(id)
+                        .withStdOut(true)
+                        .exec(new LogToStringContainerCallback())
+                        .toString()
+            );
+        }
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
index 641b1553d72..4018b2b954d 100644
--- a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
+++ b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
@@ -1,6 +1,9 @@
 package org.testcontainers;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.PullImageResultCallback;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.SneakyThrows;
@@ -8,7 +11,10 @@
 import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.WaitingConsumer;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
 
+import java.util.UUID;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -65,4 +71,34 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
 
         endpoint = getHost() + ":" + port.get();
     }
+
+    public DockerImageName createImage() {
+        return createImage(UUID.randomUUID().toString());
+    }
+
+    public DockerImageName createImage(String tag) {
+        return createImage("testcontainers/helloworld:latest", tag);
+    }
+
+    @SneakyThrows(InterruptedException.class)
+    public DockerImageName createImage(String originalImage, String tag) {
+        DockerClient client = getDockerClient();
+        client.pullImageCmd(originalImage).exec(new PullImageResultCallback()).awaitCompletion();
+
+        String dummyImageId = client.inspectImageCmd(originalImage).exec().getId();
+
+        DockerImageName imageName = DockerImageName.parse(getEndpoint() + "/" + Base58.randomString(6).toLowerCase()).withTag(tag);
+
+        // push the image to the registry
+        client.tagImageCmd(dummyImageId, imageName.asCanonicalNameString(), tag).exec();
+
+        client.pushImageCmd(imageName.asCanonicalNameString())
+            .exec(new ResultCallback.Adapter<>())
+            .awaitCompletion(1, TimeUnit.MINUTES);
+
+        // Remove from local cache, tests should pull the image themselves
+        client.removeImageCmd(imageName.asCanonicalNameString()).exec();
+
+        return imageName;
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
index 9e62148c3bb..2e39b367c46 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
@@ -1,32 +1,25 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.model.Image;
 import org.junit.Test;
-import org.testcontainers.DockerClientFactory;
+import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.List;
-
 public class AmbiguousImagePullTest {
 
     @Test(timeout = 30_000)
     public void testNotUsingParse() {
-        DockerClient client = DockerClientFactory.instance().client();
-        List<Image> alpineImages = client.listImagesCmd()
-            .withImageNameFilter("testcontainers/helloworld:latest")
-            .exec();
-        for (Image alpineImage : alpineImages) {
-            client.removeImageCmd(alpineImage.getId()).exec();
-        }
-
-        try (
-            final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld"))
-                .withExposedPorts(8080)
-        ) {
-            container.start();
-            // do nothing other than start and stop
+        try (DockerRegistryContainer registryContainer = new DockerRegistryContainer()) {
+            registryContainer.start();
+            DockerImageName imageName = registryContainer.createImage("latest");
+            String imageNameWithoutTag = imageName.getRegistry() + "/" + imageName.getRepository();
+            try (
+                final GenericContainer<?> container = new GenericContainer<>(imageNameWithoutTag)
+                    .withExposedPorts(8080)
+            ) {
+                container.start();
+                // do nothing other than start and stop
+            }
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
index 85c2e785652..9d5ed400d32 100644
--- a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -1,12 +1,6 @@
 package org.testcontainers.images;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.exception.NotFoundException;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -18,9 +12,6 @@
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 
@@ -29,47 +20,13 @@ public class ImagePullPolicyTest {
     @ClassRule
     public static DockerRegistryContainer registry = new DockerRegistryContainer();
 
-    private static DockerImageName imageName;
-
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        String testRegistryAddress = registry.getEndpoint();
-        String testImageName = testRegistryAddress + "/image-pull-policy-test";
-        String tag = UUID.randomUUID().toString();
-        imageName = DockerImageName.parse(testImageName).withTag(tag);
-
-        DockerClient client = DockerClientFactory.instance().client();
-        String dummySourceImage = "hello-world:latest";
-        client.pullImageCmd(dummySourceImage).exec(new PullImageResultCallback()).awaitCompletion();
-
-        String dummyImageId = client.inspectImageCmd(dummySourceImage).exec().getId();
-
-        // push the image to the registry
-        client.tagImageCmd(dummyImageId, testImageName, tag).exec();
-
-        client.pushImageCmd(imageName.asCanonicalNameString())
-            .exec(new ResultCallback.Adapter<>())
-            .awaitCompletion(1, TimeUnit.MINUTES);
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        removeImage();
-    }
-
-    @Before
-    public void setUp() {
-        // Clean up local cache
-        removeImage();
-
-        LocalImagesCache.INSTANCE.cache.remove(imageName);
-    }
+    private final DockerImageName imageName = registry.createImage();
 
     @Test
     public void pullsByDefault() {
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             container.start();
         }
@@ -79,7 +36,7 @@ public void pullsByDefault() {
     public void shouldAlwaysPull() {
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             container.start();
         }
@@ -88,7 +45,7 @@ public void shouldAlwaysPull() {
 
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             expectToFailWithNotFoundException(container);
         }
@@ -99,7 +56,7 @@ public void shouldAlwaysPull() {
                 .withImagePullPolicy(PullPolicy.alwaysPull())
             // }
         ) {
-            container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.withExposedPorts(8080);
             container.start();
         }
     }
@@ -117,7 +74,7 @@ protected boolean shouldPullCached(DockerImageName imageName, ImageData localIma
                 })
             // }
         ) {
-            container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            container.withExposedPorts(8080);
             container.start();
         }
     }
@@ -133,7 +90,7 @@ protected boolean shouldPullCached(DockerImageName imageName, ImageData localIma
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
                 .withImagePullPolicy(policy)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withExposedPorts(8080)
         ) {
             container.start();
 
@@ -169,7 +126,7 @@ private void expectToFailWithNotFoundException(GenericContainer<?> container) {
         }
     }
 
-    private static void removeImage() {
+    private void removeImage() {
         try {
             DockerClientFactory.instance().client()
                 .removeImageCmd(imageName.asCanonicalNameString())
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 412a945b204..a911675dfb3 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -1,37 +1,28 @@
 package org.testcontainers.utility;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.PullImageResultCallback;
-import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import org.intellij.lang.annotations.Language;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.images.LocalImagesCacheAccessor;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.concurrent.TimeUnit;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.when;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 /**
  * This test checks the integration between Testcontainers and an authenticated registry, but uses
@@ -57,20 +48,15 @@ public class AuthenticatedImagePullTest {
         }));
 
     private static RegistryAuthLocator originalAuthLocatorSingleton;
-    private static DockerClient client;
 
-    private static String testImageName;
-    private static RegistryAuthLocator mockAuthLocator;
+    private final DockerImageName testImageName = authenticatedRegistry.createImage();
 
     @BeforeClass
-    public static void setUp() throws Exception {
+    public static void beforeClass() throws Exception {
         originalAuthLocatorSingleton = RegistryAuthLocator.instance();
-        client = DockerClientFactory.instance().client();
 
         String testRegistryAddress = authenticatedRegistry.getEndpoint();
-        testImageName = testRegistryAddress + "/alpine";
 
-        final DockerImageName expectedName = DockerImageName.parse(testImageName);
         final AuthConfig authConfig = new AuthConfig()
             .withUsername("testuser")
             .withPassword("notasecret")
@@ -79,22 +65,8 @@ public static void setUp() throws Exception {
         // Replace the RegistryAuthLocator singleton with our mock, for the duration of this test
         final RegistryAuthLocator mockAuthLocator = Mockito.mock(RegistryAuthLocator.class);
         RegistryAuthLocator.setInstance(mockAuthLocator);
-        when(mockAuthLocator.lookupAuthConfig(eq(expectedName), any()))
+        when(mockAuthLocator.lookupAuthConfig(argThat(argument -> testRegistryAddress.equals(argument.getRegistry())), any()))
             .thenReturn(authConfig);
-
-        // a push will use the auth locator for authentication, although that isn't the goal of this test
-        putImageInRegistry();
-    }
-
-    @Before
-    public void removeImageFromLocalDocker() {
-        // remove the image tag from local docker so that it must be pulled before use
-        try {
-            client.removeImageCmd(testImageName).withForce(true).exec();
-        } catch (NotFoundException ignored) {
-
-        }
-        LocalImagesCacheAccessor.clearCache();
     }
 
     @AfterClass
@@ -105,7 +77,7 @@ public static void tearDown() {
     @Test
     public void testThatAuthLocatorIsUsedForContainerCreation() {
         // actually start a container, which will require an authenticated pull
-        try (final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(testImageName))
+        try (final GenericContainer<?> container = new GenericContainer<>(testImageName)
             .withCommand("/bin/sh", "-c", "sleep 10")) {
             container.start();
 
@@ -117,7 +89,7 @@ public void testThatAuthLocatorIsUsedForContainerCreation() {
     public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
         // Prepare a simple temporary Dockerfile which requires our custom private image
         Path tempFile = getLocalTempFile(".Dockerfile");
-        String dockerFileContent = "FROM " + testImageName;
+        String dockerFileContent = "FROM " + testImageName.asCanonicalNameString();
         Files.write(tempFile, dockerFileContent.getBytes());
 
         // Start a container built from a derived image, which will require an authenticated pull
@@ -141,7 +113,7 @@ public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
                 "services:\n" +
                 "  privateservice:\n" +
                 "      command: /bin/sh -c 'sleep 60'\n" +
-                "      image: " + testImageName;
+                "      image: " + testImageName.asCanonicalNameString();
         Files.write(tempFile, composeFileContent.getBytes());
 
         // Start the docker compose project, which will require an authenticated pull
@@ -168,24 +140,4 @@ private Path getLocalTempFile(String s) throws IOException {
 
         return tempFile;
     }
-
-    private static void putImageInRegistry() throws InterruptedException {
-        // It doesn't matter which image we use for this test, but use one that's likely to have been pulled already
-        final String dummySourceImage = TINY_IMAGE.asCanonicalNameString();
-
-        client.pullImageCmd(dummySourceImage)
-            .exec(new PullImageResultCallback())
-            .awaitCompletion(1, TimeUnit.MINUTES);
-
-        final String id = client.inspectImageCmd(dummySourceImage)
-            .exec()
-            .getId();
-
-        // push the image to the registry
-        client.tagImageCmd(id, testImageName, "").exec();
-
-        client.pushImageCmd(testImageName)
-            .exec(new ResultCallback.Adapter<>())
-            .awaitCompletion(1, TimeUnit.MINUTES);
-    }
 }

From c0183f1d81ae2637d8ed70634ce643e3c75263b0 Mon Sep 17 00:00:00 2001
From: Andriy Redko <drreta@gmail.com>
Date: Mon, 16 May 2022 11:57:23 -0400
Subject: [PATCH 1878/4969] Allow insecure HTTPS/TLS connection for
 HttpWaitStrategy (#4951)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 .../wait/strategy/HttpWaitStrategy.java       | 63 ++++++++++++++++++-
 .../wait/strategy/HttpWaitStrategyTest.java   | 19 ++++++
 .../ElasticsearchContainerTest.java           | 23 +++++++
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index c4751725707..d5d08ce6fd0 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -12,15 +12,26 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.time.Duration;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
 import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;
 
 @Slf4j
@@ -47,6 +58,7 @@ public class HttpWaitStrategy extends AbstractWaitStrategy {
     private Predicate<Integer> statusCodePredicate = null;
     private Optional<Integer> livenessPort = Optional.empty();
     private Duration readTimeout = Duration.ofSeconds(1);
+    private boolean allowInsecure;
 
     /**
      * Waits for the given status code.
@@ -112,6 +124,16 @@ public HttpWaitStrategy withMethod(String method) {
         return this;
     }
 
+    /**
+     * Indicates that HTTPS connection could use untrusted (self signed) certificate chains.
+     *
+     * @return this
+     */
+    public HttpWaitStrategy allowInsecure() {
+        this.allowInsecure = true;
+        return this;
+    }
+
     /**
      * Authenticate with HTTP Basic Authorization credentials.
      *
@@ -206,7 +228,7 @@ protected void waitUntilReady() {
             retryUntilSuccess((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, () -> {
                 getRateLimiter().doWhenReady(() -> {
                     try {
-                        final HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection();
+                        final HttpURLConnection connection = openConnection(uri);
                         connection.setReadTimeout(Math.toIntExact(readTimeout.toMillis()));
 
                         // authenticate
@@ -267,6 +289,45 @@ protected void waitUntilReady() {
         }
     }
 
+    private HttpURLConnection openConnection(final String uri) throws IOException, MalformedURLException {
+        if (tlsEnabled) {
+            final HttpsURLConnection connection = (HttpsURLConnection)new URL(uri).openConnection();
+            if (allowInsecure) {
+                // Create a trust manager that does not validate certificate chains 
+                // and trust all certificates
+                final TrustManager[] trustAllCerts = new TrustManager[] { 
+                    new X509TrustManager() {
+                        @Override
+                        public X509Certificate[] getAcceptedIssuers() { 
+                            return new X509Certificate[0];
+                        }
+                        
+                        @Override
+                        public void checkClientTrusted(final X509Certificate[] certs, final String authType) {
+                        } 
+                        
+                        @Override
+                        public void checkServerTrusted(final X509Certificate[] certs, final String authType) {
+                        }
+                    } 
+                }; 
+
+                try {
+                    // Create custom SSL context and set the "trust all certificates" trust manager
+                    final SSLContext sc = SSLContext.getInstance("SSL"); 
+                    sc.init(new KeyManager[0], trustAllCerts, new SecureRandom()); 
+                    connection.setSSLSocketFactory(sc.getSocketFactory());
+                } catch (final NoSuchAlgorithmException | KeyManagementException ex) {
+                    throw new IOException("Unable to create custom SSL factory instance", ex);
+                }
+            }
+            
+            return connection;
+        } else {
+            return (HttpURLConnection) new URL(uri).openConnection();
+        }
+    }
+
     /**
      * Build the URI on which to check if the container is ready.
      *
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index c5a39a4538c..82207b4537e 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -57,6 +57,17 @@ public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
         assertThat(logs, containsString("baz: boo"));
     }
 
+    /**
+     * Ensures that HTTPS requests made with the HttpWaitStrategy can skip the 
+     * certificate validation chains (to support self-signed certificates for example). 
+     */
+    @Test
+    public void testWaitUntilReadyWithTlsAndAllowUnsecure() {
+        waitUntilReadyAndSucceed(startContainerWithCommand(createHttpsShellCommand("200 OK", GOOD_RESPONSE_BODY, 8080),
+            createHttpWaitStrategy(ready).usingTls().allowInsecure()
+        ));
+    }
+
     /**
      * Expects that the WaitStrategy returns successfully after receiving an HTTP 401 response from the container.
      * This 401 response is checked with a lambda using {@link HttpWaitStrategy#forStatusCodeMatching(Predicate)}
@@ -206,4 +217,12 @@ private String createShellCommand(String header, String responseBody, int port)
             "Content-Length: " + length + NEWLINE + "\";"
             + " echo \"" + responseBody + "\";} | nc -lp " + port + "; done";
     }
+    
+    private String createHttpsShellCommand(String header, String responseBody, int port) {
+        int length = responseBody.getBytes().length;
+        return "apk add nmap-ncat; while true; do { echo -e \"HTTP/1.1 " + header + NEWLINE +
+            "Content-Type: text/html" + NEWLINE +
+            "Content-Length: " + length + NEWLINE + "\";"
+            + " echo \"" + responseBody + "\";} | ncat -lp " + port + " --ssl; done";
+    }
 }
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index f8131268e61..5b6b5ce3194 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -19,6 +19,8 @@
 import org.junit.After;
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -282,6 +284,27 @@ public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exceptio
         }
     }
 
+    @Test
+    public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
+        final HttpWaitStrategy httpsWaitStrategy = Wait.forHttps("/")
+            .forPort(9200)
+            .forStatusCode(200)
+            .withBasicCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+            // trusting self-signed certificate
+            .allowInsecure();
+
+        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.1.2")
+            .waitingFor(httpsWaitStrategy)) {
+
+            // Start the container. This step might take some time...
+            container.start();
+
+            Response response = getClusterHealth(container);
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+        }
+    }
+
     @Test
     public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
         // this test exists for custom images by users that use the `latest` tag

From 98b60fbf87f4f65f96651bee919c8f8027fe0cc5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 16 May 2022 13:27:39 -0400
Subject: [PATCH 1879/4969] Use `GenericContainer` in `RyukResourceReaper`
 (#5358)

* Experiment: Use `GenericContainer` in `RyukResourceReaper`

* reduce global `DockerClient` usage

* revert indentation

* Avoid bind check

* Fix `japicmp`

* Add `ResourceReaperTest`
---
 core/build.gradle                             |  10 +-
 .../ComposeServiceWaitStrategyTarget.java     |   8 +-
 .../testcontainers/containers/Container.java  |   6 +-
 .../containers/ContainerState.java            |  16 ++-
 .../containers/DockerComposeContainer.java    |   9 +-
 .../containers/ExecInContainerPattern.java    |  36 ++++-
 .../containers/GenericContainer.java          |   4 +-
 .../IsRunningStartupCheckStrategy.java        |  17 ++-
 .../startupcheck/StartupCheckStrategy.java    |  10 ++
 .../InternalCommandPortListeningCheck.java    |   2 +-
 .../wait/strategy/LogMessageWaitStrategy.java |   2 +-
 .../utility/ResourceReaper.java               |  12 ++
 .../testcontainers/utility/RyukContainer.java |  27 ++++
 .../utility/RyukResourceReaper.java           | 135 ++++--------------
 .../utility/ResourceReaperTest.java           | 109 ++++++++++++++
 15 files changed, 257 insertions(+), 146 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/utility/RyukContainer.java
 create mode 100644 core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java

diff --git a/core/build.gradle b/core/build.gradle
index b519673de4b..1988063489e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -43,12 +43,8 @@ tasks.japicmp {
     classExcludes = []
 
     methodExcludes = [
-        "org.testcontainers.utility.ResourceReaper#start(java.lang.String,com.github.dockerjava.api.DockerClient)",
-        "org.testcontainers.utility.ResourceReaper#start(com.github.dockerjava.api.DockerClient)",
-        "org.testcontainers.utility.ResourceReaper#registerNetworkForCleanup(java.lang.String)",
-        "org.testcontainers.utility.ResourceReaper#removeNetworks(java.lang.String)",
-        "org.testcontainers.images.builder.Transferable#of(java.lang.String)",
-        "org.testcontainers.images.builder.Transferable#updateChecksum(java.util.zip.Checksum)"
+        "org.testcontainers.containers.Container#getDockerClient()",
+        "org.testcontainers.containers.ContainerState#getDockerClient()",
     ]
 
     fieldExcludes = []
@@ -62,7 +58,7 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.16.3', {
+    baseline 'org.testcontainers:testcontainers:1.17.1', {
         exclude group: "*", module: "*"
     }
 
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java b/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
index 2fb953b4aee..fbb2a7cee6e 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
@@ -1,11 +1,11 @@
 package org.testcontainers.containers;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
 
 import java.util.ArrayList;
@@ -22,13 +22,15 @@ class ComposeServiceWaitStrategyTarget implements WaitStrategyTarget {
 
     private final Container container;
     private final GenericContainer proxyContainer;
+    private final DockerClient dockerClient;
     @NonNull
     private Map<Integer, Integer> mappedPorts;
     @Getter(lazy=true)
-    private final InspectContainerResponse containerInfo = DockerClientFactory.instance().client().inspectContainerCmd(getContainerId()).exec();
+    private final InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(getContainerId()).exec();
 
-    ComposeServiceWaitStrategyTarget(Container container, GenericContainer proxyContainer,
+    ComposeServiceWaitStrategyTarget(DockerClient dockerClient, Container container, GenericContainer proxyContainer,
                                      @NonNull Map<Integer, Integer> mappedPorts) {
+        this.dockerClient = dockerClient;
         this.container = container;
         this.proxyContainer = proxyContainer;
         this.mappedPorts = new HashMap<>(mappedPorts);
diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index 8fd53fc5a0e..88fe4802945 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -389,7 +389,7 @@ default SELF withClasspathResourceMapping(final String resourcePath, final Strin
      * @param consumer consumer that the frames should be sent to
      */
     default void followOutput(Consumer<OutputFrame> consumer) {
-        LogUtils.followOutput(DockerClientFactory.instance().client(), getContainerId(), consumer);
+        LogUtils.followOutput(getDockerClient(), getContainerId(), consumer);
     }
 
     /**
@@ -400,7 +400,7 @@ default void followOutput(Consumer<OutputFrame> consumer) {
      * @param types    types that should be followed (one or both of STDOUT, STDERR)
      */
     default void followOutput(Consumer<OutputFrame> consumer, OutputFrame.OutputType... types) {
-        LogUtils.followOutput(DockerClientFactory.instance().client(), getContainerId(), consumer, types);
+        LogUtils.followOutput(getDockerClient(), getContainerId(), consumer, types);
     }
 
 
@@ -439,8 +439,6 @@ default void followOutput(Consumer<OutputFrame> consumer, OutputFrame.OutputType
     @Deprecated
     Map<String, LinkableContainer> getLinkedContainers();
 
-    DockerClient getDockerClient();
-
     void setExposedPorts(List<Integer> exposedPorts);
 
     void setPortBindings(List<String> portBindings);
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index ef2c19a06c9..51eb4daddde 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -52,6 +52,10 @@ default String getContainerIpAddress() {
         return getHost();
     }
 
+    default DockerClient getDockerClient() {
+        return DockerClientFactory.lazyClient();
+    }
+
     /**
      * Get the host that this container may be reached on (may not be the local machine).
      *
@@ -115,7 +119,7 @@ default boolean isHealthy() {
     }
 
     default InspectContainerResponse getCurrentContainerInfo() {
-        return DockerClientFactory.instance().client().inspectContainerCmd(getContainerId()).exec();
+        return getDockerClient().inspectContainerCmd(getContainerId()).exec();
     }
 
     /**
@@ -195,7 +199,7 @@ default List<Integer> getBoundPortNumbers() {
      * @return all log output from the container from start until the current instant (both stdout and stderr)
      */
     default String getLogs() {
-        return LogUtils.getOutput(DockerClientFactory.instance().client(), getContainerId());
+        return LogUtils.getOutput(getDockerClient(), getContainerId());
     }
 
     /**
@@ -203,7 +207,7 @@ default String getLogs() {
      * @return all log output from the container from start until the current instant
      */
     default String getLogs(OutputFrame.OutputType... types) {
-        return LogUtils.getOutput(DockerClientFactory.instance().client(), getContainerId(), types);
+        return LogUtils.getOutput(getDockerClient(), getContainerId(), types);
     }
 
     /**
@@ -234,7 +238,7 @@ default Container.ExecResult execInContainer(String... command) throws Unsupport
      * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, Charset, String...)
      */
     default Container.ExecResult execInContainer(Charset outputCharset, String... command) throws UnsupportedOperationException, IOException, InterruptedException {
-        return ExecInContainerPattern.execInContainer(getContainerInfo(), outputCharset, command);
+        return ExecInContainerPattern.execInContainer(getDockerClient(), getContainerInfo(), outputCharset, command);
     }
 
     /**
@@ -279,7 +283,7 @@ default void copyFileToContainer(Transferable transferable, String containerPath
             transferable.transferTo(tarArchive, containerPath);
             tarArchive.finish();
 
-            DockerClientFactory.instance().client()
+            getDockerClient()
                 .copyArchiveToContainerCmd(getContainerId())
                 .withTarInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()))
                 .withRemotePath("/")
@@ -316,7 +320,7 @@ default  <T> T copyFileFromContainer(String containerPath, ThrowingFunction<Inpu
             throw new IllegalStateException("copyFileFromContainer can only be used when the Container is created.");
         }
 
-        DockerClient dockerClient = DockerClientFactory.instance().client();
+        DockerClient dockerClient = getDockerClient();
         try (
             InputStream inputStream = dockerClient.copyArchiveFromContainerCmd(getContainerId(), containerPath).exec();
             TarArchiveInputStream tarInputStream = new TarArchiveInputStream(inputStream)
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index c0f84307c88..6f0a3a086b6 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -124,7 +124,6 @@ public DockerComposeContainer(String identifier, File... composeFiles) {
     }
 
     public DockerComposeContainer(String identifier, List<File> composeFiles) {
-
         this.composeFiles = composeFiles;
         this.dockerComposeFiles = new DockerComposeFiles(composeFiles);
 
@@ -132,7 +131,7 @@ public DockerComposeContainer(String identifier, List<File> composeFiles) {
         this.identifier = identifier;
         this.project = randomProjectId();
 
-        this.dockerClient = DockerClientFactory.instance().client();
+        this.dockerClient = DockerClientFactory.lazyClient();
     }
 
     @Override
@@ -269,7 +268,7 @@ private void waitUntilServiceStarted() {
 
     private void createServiceInstance(Container container) {
         String serviceName = getServiceNameFromContainer(container);
-        final ComposeServiceWaitStrategyTarget containerInstance = new ComposeServiceWaitStrategyTarget(container,
+        final ComposeServiceWaitStrategyTarget containerInstance = new ComposeServiceWaitStrategyTarget(dockerClient, container,
             ambassadorContainer, ambassadorPortMappings.getOrDefault(serviceName, new HashMap<>()));
 
         String containerId = containerInstance.getContainerId();
@@ -559,7 +558,7 @@ public Optional<ContainerState> getContainerByServiceName(String serviceName) {
     }
 
     private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
-        LogUtils.followOutput(DockerClientFactory.instance().client(), containerId, consumer);
+        LogUtils.followOutput(dockerClient, containerId, consumer);
     }
 
     private SELF self() {
@@ -659,7 +658,7 @@ public void invoke() {
 
         AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
 
-        final Integer exitCode = this.dockerClient.inspectContainerCmd(getContainerId())
+        final Integer exitCode = getDockerClient().inspectContainerCmd(getContainerId())
             .exec()
             .getState()
             .getExitCode();
diff --git a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
index 9cd68d48ffb..0858476880f 100644
--- a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
+++ b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
@@ -14,6 +14,7 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Provides utility methods for executing commands in containers
@@ -22,17 +23,41 @@
 @Slf4j
 public class ExecInContainerPattern {
 
+
+    /**
+     *
+     * @deprecated use {@link #execInContainer(DockerClient, InspectContainerResponse, String...)}
+     */
+    @Deprecated
+    public Container.ExecResult execInContainer(InspectContainerResponse containerInfo, String... command)
+        throws UnsupportedOperationException, IOException, InterruptedException {
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+        return execInContainer(dockerClient, containerInfo, command);
+    }
+
+    /**
+     *
+     * @deprecated use {@link #execInContainer(DockerClient, InspectContainerResponse, Charset, String...)}
+     */
+    @Deprecated
+    public Container.ExecResult execInContainer(InspectContainerResponse containerInfo, Charset outputCharset, String... command)
+        throws UnsupportedOperationException, IOException, InterruptedException {
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+        return execInContainer(dockerClient, containerInfo, outputCharset, command);
+    }
+
     /**
      * Run a command inside a running container, as though using "docker exec", and interpreting
      * the output as UTF8.
      * <p></p>
+     * @param dockerClient the {@link DockerClient}
      * @param containerInfo the container info
      * @param command the command to execute
-     * @see #execInContainer(InspectContainerResponse, Charset, String...)
+     * @see #execInContainer(DockerClient, InspectContainerResponse, Charset, String...)
      */
-    public Container.ExecResult execInContainer(InspectContainerResponse containerInfo, String... command)
+    public Container.ExecResult execInContainer(DockerClient dockerClient, InspectContainerResponse containerInfo, String... command)
         throws UnsupportedOperationException, IOException, InterruptedException {
-        return execInContainer(containerInfo, Charset.forName("UTF-8"), command);
+        return execInContainer(dockerClient, containerInfo, StandardCharsets.UTF_8, command);
     }
 
     /**
@@ -40,6 +65,7 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
      * <p>
      * This functionality is not available on a docker daemon running the older "lxc" execution driver. At
      * the time of writing, CircleCI was using this driver.
+     * @param dockerClient the {@link DockerClient}
      * @param containerInfo the container info
      * @param outputCharset the character set used to interpret the output.
      * @param command the parts of the command to run
@@ -48,7 +74,7 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
      * @throws InterruptedException if the thread waiting for the response is interrupted
      * @throws UnsupportedOperationException if the docker daemon you're connecting to doesn't support "exec".
      */
-    public Container.ExecResult execInContainer(InspectContainerResponse containerInfo, Charset outputCharset, String... command)
+    public Container.ExecResult execInContainer(DockerClient dockerClient, InspectContainerResponse containerInfo, Charset outputCharset, String... command)
         throws UnsupportedOperationException, IOException, InterruptedException {
         if (!TestEnvironment.dockerExecutionDriverSupportsExec()) {
             // at time of writing, this is the expected result in CircleCI.
@@ -64,8 +90,6 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
         String containerId = containerInfo.getId();
         String containerName = containerInfo.getName();
 
-        DockerClient dockerClient = DockerClientFactory.instance().client();
-
         log.debug("{}: Running \"exec\" command: {}", containerName, String.join(" ", command));
         final ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(containerId)
             .withAttachStdout(true).withAttachStderr(true).withCmd(command).exec();
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index d47bc6cfc5e..4e5e682738d 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -416,7 +416,7 @@ private void tryStart(Instant startedAt) {
 
             if (!reusable) {
                 //noinspection deprecation
-                createCommand.getLabels().putAll(ResourceReaper.instance().getLabels());
+                createCommand = ResourceReaper.instance().register(this, createCommand);
             }
 
             if (!reused) {
@@ -469,7 +469,7 @@ private void tryStart(Instant startedAt) {
             containerIsStarting(containerInfo, reused);
 
             // Wait until the container has reached the desired running state
-            if (!this.startupCheckStrategy.waitUntilStartupSuccessful(dockerClient, containerId)) {
+            if (!this.startupCheckStrategy.waitUntilStartupSuccessful(this)) {
                 // Bail out, don't wait for the port to start listening.
                 // (Exception thrown here will be caught below and wrapped)
                 throw new IllegalStateException("Container did not start correctly.");
diff --git a/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java b/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java
index 6a296e0329c..b4b20aad897 100644
--- a/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerStatus;
 
 /**
@@ -10,10 +11,24 @@
  */
 public class IsRunningStartupCheckStrategy extends StartupCheckStrategy {
 
+    @SuppressWarnings("deprecation")
+    @Override
+    public boolean waitUntilStartupSuccessful(GenericContainer<?> container) {
+        // Optimization: container already has the initial "after start" state, check it first
+        if (checkState(container.getContainerInfo().getState()) == StartupStatus.SUCCESSFUL) {
+            return true;
+        }
+        return super.waitUntilStartupSuccessful(container);
+    }
+
     @Override
     public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
         InspectContainerResponse.ContainerState state = getCurrentState(dockerClient, containerId);
-        if (state.getRunning()) {
+        return checkState(state);
+    }
+
+    private StartupStatus checkState(InspectContainerResponse.ContainerState state) {
+        if (Boolean.TRUE.equals(state.getRunning())) {
             return StartupStatus.SUCCESSFUL;
         } else if (!DockerStatus.isContainerExitCodeSuccess(state)) {
             return StartupStatus.FAILED;
diff --git a/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java b/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
index 1425123473b..d5931454212 100644
--- a/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
@@ -5,6 +5,7 @@
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.GenericContainer;
 
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
@@ -30,6 +31,15 @@ public <SELF extends StartupCheckStrategy> SELF withTimeout(Duration timeout) {
         return (SELF) this;
     }
 
+    /**
+     *
+     * @deprecated internal API
+     */
+    @Deprecated
+    public boolean waitUntilStartupSuccessful(GenericContainer<?> container) {
+        return waitUntilStartupSuccessful(container.getDockerClient(), container.getContainerId());
+    }
+
     public boolean waitUntilStartupSuccessful(DockerClient dockerClient, String containerId) {
         final Boolean[] startedOK = {null};
         Unreliables.retryUntilTrue((int) timeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index 379840a9d7e..1eba8acbbd1 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -40,7 +40,7 @@ public Boolean call() {
 
         Instant before = Instant.now();
         try {
-            ExecResult result = ExecInContainerPattern.execInContainer(waitStrategyTarget.getContainerInfo(), "/bin/sh", "-c", command.toString());
+            ExecResult result = ExecInContainerPattern.execInContainer(waitStrategyTarget.getDockerClient(), waitStrategyTarget.getContainerInfo(), "/bin/sh", "-c", command.toString());
             log.trace("Check for {} took {}. Result code '{}', stdout message: '{}'", internalPorts, Duration.between(before, Instant.now()), result.getExitCode(), result.getStdout());
             int exitCode = result.getExitCode();
             if (exitCode != 0 && exitCode != 1) {
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
index 9f7a0078f00..65370e51bfa 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
@@ -27,7 +27,7 @@ public class LogMessageWaitStrategy extends AbstractWaitStrategy {
     protected void waitUntilReady() {
         WaitingConsumer waitingConsumer = new WaitingConsumer();
 
-        LogContainerCmd cmd = DockerClientFactory.instance().client().logContainerCmd(waitStrategyTarget.getContainerId())
+        LogContainerCmd cmd = waitStrategyTarget.getDockerClient().logContainerCmd(waitStrategyTarget.getContainerId())
             .withFollowStream(true)
             .withSince(0)
             .withStdOut(true)
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 44f9456ce4c..d916579db35 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -1,6 +1,7 @@
 package org.testcontainers.utility;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Network;
@@ -11,6 +12,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -307,6 +309,16 @@ public Map<String, String> getLabels() {
         return MARKER_LABELS;
     }
 
+    /**
+     *
+     * @deprecated internal API
+     */
+    @Deprecated
+    public CreateContainerCmd register(GenericContainer<?> container, CreateContainerCmd cmd) {
+        cmd.getLabels().putAll(getLabels());
+        return cmd;
+    }
+
     /**
      * @deprecated internal API
      */
diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
new file mode 100644
index 00000000000..1e18c14157a
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -0,0 +1,27 @@
+package org.testcontainers.utility;
+
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Volume;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+class RyukContainer extends GenericContainer<RyukContainer> {
+
+    RyukContainer() {
+        super("testcontainers/ryuk:0.3.3");
+
+        withExposedPorts(8080);
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);
+            cmd.withHostConfig(
+                cmd.getHostConfig()
+                    .withAutoRemove(true)
+                    .withPrivileged(TestcontainersConfiguration.getInstance().isRyukPrivileged())
+                    .withBinds(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")))
+            );
+        });
+
+        waitingFor(Wait.forLogMessage(".*Started.*", 1));
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
index 9efbf5ed972..c2e2cf4ef97 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -1,40 +1,21 @@
 package org.testcontainers.utility;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.Volume;
-import lombok.Getter;
+import com.github.dockerjava.api.command.CreateContainerCmd;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.ContainerState;
-import org.testcontainers.images.RemoteDockerImage;
+import org.testcontainers.containers.GenericContainer;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.awaitility.Awaitility.await;
 
 /**
  * Ryuk-based {@link ResourceReaper} implementation.
@@ -54,8 +35,11 @@ public class RyukResourceReaper extends ResourceReaper {
 
     private final AtomicBoolean started = new AtomicBoolean(false);
 
-    @Getter
-    private String containerId = null;
+    private final RyukContainer ryukContainer = new RyukContainer();
+
+    public String getContainerId() {
+        return ryukContainer.getContainerId();
+    }
 
     @Override
     public void init() {
@@ -80,91 +64,29 @@ public Map<String, String> getLabels() {
         return super.getLabels();
     }
 
+    @Override
+    public CreateContainerCmd register(GenericContainer<?> container, CreateContainerCmd cmd) {
+        if (container == ryukContainer) {
+            // Do not register Ryuk container to avoid self-pruning
+            return cmd;
+        }
+
+        maybeStart();
+        return super.register(container, cmd);
+    }
+
     @SneakyThrows(InterruptedException.class)
     private synchronized void maybeStart() {
         if (!started.compareAndSet(false, true)) {
             return;
         }
-        DockerClient client = DockerClientFactory.lazyClient();
-        RemoteDockerImage ryukImage = new RemoteDockerImage(DockerImageName.parse("testcontainers/ryuk:0.3.3"));
-
-        List<Bind> binds = new ArrayList<>();
-        binds.add(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")));
-
-        ExposedPort ryukExposedPort = ExposedPort.tcp(8080);
-        containerId = client.createContainerCmd(ryukImage.get())
-            .withHostConfig(
-                new HostConfig()
-                    .withAutoRemove(true)
-                    .withPortBindings(new PortBinding(Ports.Binding.empty(), ryukExposedPort))
-            )
-            .withExposedPorts(ryukExposedPort)
-            .withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID)
-            .withLabels(Collections.singletonMap(DockerClientFactory.TESTCONTAINERS_LABEL, "true"))
-            .withBinds(binds)
-            .withPrivileged(TestcontainersConfiguration.getInstance().isRyukPrivileged())
-            .exec()
-            .getId();
-
-        client.startContainerCmd(containerId).exec();
-
-        StringBuilder ryukLog = new StringBuilder();
-
-        ResultCallback.Adapter<Frame> logCallback = client.logContainerCmd(containerId)
-            .withSince(0)
-            .withFollowStream(true)
-            .withStdOut(true)
-            .withStdErr(true)
-            .exec(new ResultCallback.Adapter<Frame>() {
-                @Override
-                public void onNext(Frame frame) {
-                    ryukLog.append(new String(frame.getPayload(), StandardCharsets.UTF_8));
-                }
-            });
-
-        InspectContainerResponse inspectedContainer;
-        try {
-            // inspect container response might initially not contain the mapped port
-            inspectedContainer = await()
-                .atMost(5, TimeUnit.SECONDS)
-                .pollInterval(DynamicPollInterval.ofMillis(50))
-                .pollInSameThread()
-                .until(
-                    () -> client.inspectContainerCmd(containerId).exec(),
-                    inspectContainerResponse -> {
-                        return inspectContainerResponse
-                            .getNetworkSettings()
-                            .getPorts()
-                            .getBindings()
-                            .values()
-                            .stream()
-                            .anyMatch(Objects::nonNull);
-                    }
-                );
-        } catch (Exception e) {
-            log.warn("Ryuk container cannot be inspected and probably had a problem starting. Ryuk's logs:\n{}", ryukLog);
-            throw new IllegalStateException("Ryuk failed to start", e);
-        }
-
-        ContainerState containerState = new ContainerState() {
-
-            @Override
-            public List<Integer> getExposedPorts() {
-                return Stream.of(getContainerInfo().getConfig().getExposedPorts())
-                    .map(ExposedPort::getPort)
-                    .collect(Collectors.toList());
-            }
 
-            @Override
-            public InspectContainerResponse getContainerInfo() {
-                return inspectedContainer;
-            }
-        };
+        ryukContainer.start();
 
         CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
 
-        String host = containerState.getHost();
-        Integer ryukPort = containerState.getFirstMappedPort();
+        String host = ryukContainer.getHost();
+        Integer ryukPort = ryukContainer.getFirstMappedPort();
         Thread kiraThread = new Thread(
             DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
             () -> {
@@ -207,17 +129,10 @@ public InspectContainerResponse getContainerInfo() {
         );
         kiraThread.setDaemon(true);
         kiraThread.start();
-        try {
-            // We need to wait before we can start any containers to make sure that we delete them
-            if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
-                log.error("Timed out waiting for Ryuk container to start. Ryuk's logs:\n{}", ryukLog);
-                throw new IllegalStateException(String.format("Could not connect to Ryuk at %s:%s", host, ryukPort));
-            }
-        } finally {
-            try {
-                logCallback.close();
-            } catch (IOException ignored) {
-            }
+        // We need to wait before we can start any containers to make sure that we delete them
+        if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
+            log.error("Timed out waiting for Ryuk container to start. Ryuk's logs:\n{}", ryukContainer.getLogs());
+            throw new IllegalStateException(String.format("Could not connect to Ryuk at %s:%s", host, ryukPort));
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
new file mode 100644
index 00000000000..214b465c297
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
@@ -0,0 +1,109 @@
+package org.testcontainers.utility;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.DockerClient;
+import lombok.SneakyThrows;
+import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionFactory;
+import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.zeroturnaround.exec.ProcessExecutor;
+import org.zeroturnaround.exec.ProcessResult;
+
+import java.io.File;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
+public class ResourceReaperTest {
+
+    @Test
+    public void shouldCleanupWithRyuk() {
+        Map<String, String> labels = runProcess(processExecutor -> {});
+
+        assertCleanup(labels);
+    }
+
+    @Test
+    public void shouldCleanupWithJVM() {
+        Map<String, String> labels = runProcess(processExecutor -> {
+            processExecutor.environment("TESTCONTAINERS_RYUK_DISABLED", "true");
+        });
+
+        assertCleanup(labels);
+    }
+
+    private void assertCleanup(Map<String, String> labels) {
+        DockerClient client = DockerClientFactory.instance().client();
+        ConditionFactory awaitFactory = Awaitility.await().atMost(Duration.ofMinutes(1)).pollInterval(Duration.ofSeconds(1));
+
+        List<String> labelValues = labels.entrySet().stream()
+            .map(it -> it.getKey() + "=" + it.getValue())
+            .collect(Collectors.toList());
+
+        awaitFactory.untilAsserted(() -> {
+            assertThat(client.listContainersCmd().withFilter("label", labelValues).withShowAll(true).exec())
+                .isEmpty();
+        });
+
+        awaitFactory.untilAsserted(() -> {
+            assertThat(client.listNetworksCmd().withFilter("label", labelValues).exec())
+                .isEmpty();
+        });
+
+        awaitFactory.untilAsserted(() -> {
+            assertThat(client.listVolumesCmd().withFilter("label", labelValues).exec().getVolumes())
+                .isEmpty();
+        });
+    }
+
+    @SneakyThrows
+    private Map<String, String> runProcess(Consumer<ProcessExecutor> processExecutorConsumer) {
+        ProcessExecutor processExecutor = new ProcessExecutor(
+            new File(System.getProperty("java.home")).toPath().resolve("bin").resolve("java").toString(),
+            "-ea",
+            "-classpath",
+            System.getProperty("java.class.path"),
+            SimpleUsage.class.getName()
+        );
+        processExecutor.readOutput(true);
+        processExecutor.redirectOutput(System.out);
+        processExecutor.redirectError(System.err);
+        processExecutorConsumer.accept(processExecutor);
+
+        ProcessResult result = processExecutor.execute();
+        assertEquals(0, result.getExitValue());
+
+        String labelsJson = Stream.of(result.outputUTF8().split("\n"))
+            .filter(it -> it.startsWith(SimpleUsage.LABELS_MARKER))
+            .map(it -> it.substring(SimpleUsage.LABELS_MARKER.length()))
+            .findFirst()
+            .get();
+
+        return new ObjectMapper().readValue(labelsJson, Map.class);
+    }
+
+    public static class SimpleUsage {
+
+        static final String LABELS_MARKER = "LABELS:";
+
+        @SneakyThrows
+        @SuppressWarnings("deprecation")
+        public static void main(String[] args) {
+            System.out.println(LABELS_MARKER + new ObjectMapper().writeValueAsString(ResourceReaper.instance().getLabels()));
+
+            GenericContainer<?> container = new GenericContainer<>("testcontainers/helloworld:1.1.0")
+                .withNetwork(org.testcontainers.containers.Network.newNetwork())
+                .withExposedPorts(8080);
+
+            container.start();
+        }
+    }
+}

From b517804acfdfe0c59f484054e2b66a37c057dd5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 21:07:23 +0000
Subject: [PATCH 1880/4969] Bump cucumber-junit from 7.2.3 to 7.3.4 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.2.3 to 7.3.4.
- [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/v7.2.3...v7.3.4)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 78d042b95fd..f23a2d9b7af 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:7.2.3'
-    testImplementation 'io.cucumber:cucumber-junit:7.2.3'
+    testImplementation 'io.cucumber:cucumber-junit:7.3.4'
     testImplementation 'org.testcontainers:selenium'
 }

From b3143fd8009ef82a4ebd9206b73e21da97e868de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 21:07:29 +0000
Subject: [PATCH 1881/4969] Bump r2dbc-mssql in /modules/mssqlserver

Bumps [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 0.8.7.RELEASE to 0.9.0.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/main/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v0.8.7.RELEASE...v0.9.0.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 dfa15ed1c2a..e7a654e12f1 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.1.1.jre8-preview'

From e9e602b3aac9a72c6c7b4d93af62e4cc7d3acd04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 21:07:47 +0000
Subject: [PATCH 1882/4969] Bump awaitility from 4.1.1 to 4.2.0 in
 /modules/couchbase

Bumps [awaitility](https://github.com/awaitility/awaitility) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/awaitility/awaitility/releases)
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.1.1...awaitility-4.2.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index f1e41fcbe11..71844a30d20 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'com.couchbase.client:java-client:3.3.0'
-    testImplementation 'org.awaitility:awaitility:4.1.1'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
 }

From 07543ffad63bb842279abaf5dfecb9974ed2d667 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 21:07:49 +0000
Subject: [PATCH 1883/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps org.jetbrains.kotlin.plugin.spring from 1.6.20 to 1.6.21.

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index b6dd68b33cd..4f3a50de21a 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.6.4"
     id("org.jetbrains.kotlin.jvm") version "1.6.21"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.6.20"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.6.21"
 }
 
 apply plugin: 'io.spring.dependency-management'

From e94eaa11e65b984b6af7e21e98b1e02aade21282 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 21:07:56 +0000
Subject: [PATCH 1884/4969] Bump r2dbc-postgresql in /modules/postgresql

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.11.RELEASE to 0.8.12.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.12.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.11.RELEASE...v0.8.12.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f2c50c30754..c0628afc63a 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')

From 7a957d5819a3fa6964db285a46eb77c0b9360163 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 17 May 2022 18:02:08 -0400
Subject: [PATCH 1885/4969] Remove the disk space check (#5381)

---
 core/build.gradle                             |   4 +-
 .../testcontainers/DockerClientFactory.java   | 102 +-----------------
 .../utility/RyukResourceReaper.java           |   8 +-
 .../DockerClientFactoryTest.java              |  11 --
 4 files changed, 8 insertions(+), 117 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2a81eb8568a..efb08991f8d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -40,7 +40,9 @@ tasks.japicmp {
         "org.testcontainers.shaded.*",
     ]
 
-    classExcludes = []
+    classExcludes = [
+        "org.testcontainers.utility.RyukResourceReaper",
+    ]
 
     methodExcludes = [
         "org.testcontainers.containers.Container#getDockerClient()",
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index cc85645b2b4..c1e999d392a 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerClientDelegate;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
@@ -10,7 +9,6 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.Version;
 import com.github.dockerjava.api.model.Volume;
@@ -31,18 +29,14 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.ResourceReaper;
-import org.testcontainers.utility.RyukResourceReaper;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.UUID;
 import java.util.function.BiFunction;
@@ -80,16 +74,10 @@ public class DockerClientFactory {
     RuntimeException cachedClientFailure;
 
     private String activeApiVersion;
-    private String activeExecutionDriver;
 
     @Getter(lazy = true)
     private final boolean fileMountingSupported = checkMountableFile();
 
-
-    static {
-        System.setProperty("org.testcontainers.shaded.io.netty.packagePrefix", "org.testcontainers.shaded.");
-    }
-
     @VisibleForTesting
     DockerClientFactory() {
 
@@ -200,20 +188,19 @@ public void close() {
         log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
 
         Info dockerInfo = strategy.getInfo();
+        log.debug("Docker info: {}", dockerInfo.getRawValues());
         Version version = client.versionCmd().exec();
+        log.debug("Docker version: {}", version.getRawValues());
         activeApiVersion = version.getApiVersion();
-        activeExecutionDriver = dockerInfo.getExecutionDriver();
         log.info("Connected to docker: \n" +
                 "  Server Version: " + dockerInfo.getServerVersion() + "\n" +
                 "  API Version: " + activeApiVersion + "\n" +
                 "  Operating System: " + dockerInfo.getOperatingSystem() + "\n" +
                 "  Total Memory: " + dockerInfo.getMemTotal() / (1024 * 1024) + " MB");
 
-        final ResourceReaper resourceReaper;
         try {
-            resourceReaper = ResourceReaper.instance();
             //noinspection deprecation
-            resourceReaper.init();
+            ResourceReaper.instance().init();
         } catch (RuntimeException e) {
             cachedClientFailure = e;
             throw e;
@@ -226,27 +213,6 @@ public void close() {
             try {
                 log.info("Checking the system...");
                 checkDockerVersion(version.getVersion());
-
-                //noinspection deprecation
-                String ryukContainerId = resourceReaper instanceof RyukResourceReaper
-                    ? ((RyukResourceReaper) resourceReaper).getContainerId()
-                    : null;
-
-                if (ryukContainerId != null) {
-                    checkDiskSpace(client, ryukContainerId);
-                } else {
-                    runInsideDocker(
-                        createContainerCmd -> {
-                            createContainerCmd.withName("testcontainers-checks-" + SESSION_ID);
-                            createContainerCmd.getHostConfig().withAutoRemove(true);
-                            createContainerCmd.withCmd("tail", "-f", "/dev/null");
-                        },
-                        (__, containerId) -> {
-                            checkDiskSpace(client, containerId);
-                            return "";
-                        }
-                    );
-                }
             } catch (RuntimeException e) {
                 cachedClientFailure = e;
                 throw e;
@@ -263,43 +229,6 @@ private void checkDockerVersion(String dockerVersion) {
         check("Docker server version should be at least 1.6.0", versionIsSufficient);
     }
 
-    private void checkDiskSpace(DockerClient dockerClient, String id) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-        try {
-            dockerClient
-                    .execStartCmd(dockerClient.execCreateCmd(id).withAttachStdout(true).withCmd("df", "-P").exec().getId())
-                    .exec(new ResultCallback.Adapter<Frame>() {
-                        @Override
-                        public void onNext(Frame frame) {
-                            if (frame == null) {
-                                return;
-                            }
-                            switch (frame.getStreamType()) {
-                                case RAW:
-                                case STDOUT:
-                                    try {
-                                        outputStream.write(frame.getPayload());
-                                        outputStream.flush();
-                                    } catch (IOException e) {
-                                        onError(e);
-                                    }
-                            }
-                        }
-                    })
-                    .awaitCompletion();
-        } catch (Exception e) {
-            log.debug("Can't exec disk checking command", e);
-        }
-
-        DiskSpaceUsage df = parseAvailableDiskSpace(outputStream.toString());
-
-        check(
-                "Docker environment should have more than 2GB free disk space",
-                df.availableMB.map(it -> it >= 2048).orElse(true)
-        );
-    }
-
     private void check(String message, boolean isSuccessful) {
         if (isSuccessful) {
             log.info("\u2714\ufe0e {}", message);
@@ -389,28 +318,6 @@ <T> T runInsideDocker(DockerImageName imageName, Consumer<CreateContainerCmd> cr
         }
     }
 
-    @VisibleForTesting
-    static class DiskSpaceUsage {
-        Optional<Long> availableMB = Optional.empty();
-        Optional<Integer> usedPercent = Optional.empty();
-    }
-
-    @VisibleForTesting
-    DiskSpaceUsage parseAvailableDiskSpace(String dfOutput) {
-        DiskSpaceUsage df = new DiskSpaceUsage();
-        String[] lines = dfOutput.split("\n");
-        for (String line : lines) {
-            String[] fields = line.split("\\s+");
-            if (fields.length > 5 && fields[5].equals("/")) {
-                long availableKB = Long.parseLong(fields[3]);
-                df.availableMB = Optional.of(availableKB / 1024L);
-                df.usedPercent = Optional.of(Integer.valueOf(fields[4].replace("%", "")));
-                break;
-            }
-        }
-        return df;
-    }
-
     /**
      * @return the docker API version of the daemon that we have connected to
      */
@@ -423,8 +330,7 @@ public String getActiveApiVersion() {
      * @return the docker execution driver of the daemon that we have connected to
      */
     public String getActiveExecutionDriver() {
-        client();
-        return activeExecutionDriver;
+        return getInfo().getExecutionDriver();
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
index c2e2cf4ef97..6ce9c372fd2 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -21,11 +21,9 @@
  * Ryuk-based {@link ResourceReaper} implementation.
  *
  * @see <a href="https://github.com/testcontainers/moby-ryuk">moby-ryuk</a>
- * @deprecated internal API
  */
-@Deprecated
 @Slf4j
-public class RyukResourceReaper extends ResourceReaper {
+class RyukResourceReaper extends ResourceReaper {
 
     private static final RateLimiter RYUK_ACK_RATE_LIMITER = RateLimiterBuilder
         .newBuilder()
@@ -37,10 +35,6 @@ public class RyukResourceReaper extends ResourceReaper {
 
     private final RyukContainer ryukContainer = new RyukContainer();
 
-    public String getContainerId() {
-        return ryukContainer.getContainerId();
-    }
-
     @Override
     public void init() {
         if (!TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 247a16a76a6..a889764579f 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.rnorth.visibleassertions.VisibleAssertions;
-import org.testcontainers.DockerClientFactory.DiskSpaceUsage;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
@@ -39,15 +37,6 @@ public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
         }
     }
 
-    @Test
-    public void shouldHandleBigDiskSize() throws Exception {
-        String dfOutput = "/dev/disk1     2982480572 1491240286 2982480572    31%    /";
-        DiskSpaceUsage usage = DockerClientFactory.instance().parseAvailableDiskSpace(dfOutput);
-
-        VisibleAssertions.assertEquals("Available MB is correct", 2982480572L / 1024L, usage.availableMB.orElse(0L));
-        VisibleAssertions.assertEquals("Available percentage is correct", 31, usage.usedPercent.orElse(0));
-    }
-
     @Test
     public void dockerHostIpAddress() {
         DockerClientFactory instance = new DockerClientFactory();

From d9fa5130435d6bcd5112b864349924ad5d2cdbae Mon Sep 17 00:00:00 2001
From: Wenjun Ruan <wenjun@apache.org>
Date: Wed, 18 May 2022 06:56:00 +0800
Subject: [PATCH 1886/4969] Add SeaTunnel to who is using testcontainers
 (#5272)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 8749e3678cf..b2c11d6d8e8 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -200,7 +200,7 @@ A huge thank you to our sponsors:
 * [Alkira](https://www.alkira.com/) - Testing of multiple micro-services using Kafka, PostgreSQL, Apache Zookeeper, Etcd and so on.
 * [Togglz](https://www.togglz.org/) - Feature Flags for the Java platform
 * [Byzer](https://www.byzer.org/home) - Integration tests for Data and AI platforms are based on multiple versions of Byzer, Ray and Apache Spark.
-
+* [Apache SeaTunnel](https://github.com/apache/incubator-seatunnel) - Integration testing with different datasource.
 
 ## License
 

From 0073001e603ac8bd583a82f81c2a077251156c5d Mon Sep 17 00:00:00 2001
From: Denis <13610290+cac03@users.noreply.github.com>
Date: Wed, 18 May 2022 02:24:11 +0300
Subject: [PATCH 1887/4969] Remove "Linux - Travis CI" from docs (#4374)

---
 docs/supported_docker_environment/index.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 62a2bbe0af2..3b82cea2165 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -5,7 +5,6 @@
 | Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                                                                                                                                                                                |
 |-------------------------------------|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Linux - general                     | Docker v17.09              |                                                                                                                                                                                                                                                                                                                                                                    |
-| Linux - Travis CI                   | Docker v17.09              | See [example .travis.yml](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/.travis.yml) for baseline Travis CI configuration                                                                                                                                                                                                                                                                                     |
 | Linux - CircleCI (LXC driver)      | Docker v17.09               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                                                                                                                                                                                   |
 | Linux - within a Docker container            | Docker v17.09              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                                                                                                                                                                              |
 | Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                                                                                                                                                                                    |

From 55334479422b97fea8110a0a59bf64127e29a6ae Mon Sep 17 00:00:00 2001
From: John Athanaselis <johnathana@gmail.com>
Date: Wed, 18 May 2022 12:53:27 +0300
Subject: [PATCH 1888/4969] K3sContainer: expose kubeConfig for docker network
 access (#5097)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../org/testcontainers/k3s/K3sContainer.java  | 63 ++++++++++++++-----
 .../k3s/KubectlContainerTest.java             | 45 +++++++++++++
 2 files changed, 93 insertions(+), 15 deletions(-)
 create mode 100644 modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java

diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index 54cb2ff500f..7f21ca7dbb8 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -8,23 +8,29 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.DockerObjectAccessor;
 import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
 public class K3sContainer extends GenericContainer<K3sContainer> {
 
+    public static int KUBE_SECURE_PORT = 6443;
+
+    public static int RANCHER_WEBHOOK_PORT = 8443;
+
     private String kubeConfigYaml;
 
     public K3sContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DockerImageName.parse("rancher/k3s"));
 
-        addExposedPorts(6443, 8443);
+        addExposedPorts(KUBE_SECURE_PORT, RANCHER_WEBHOOK_PORT);
         setPrivilegedMode(true);
         withCreateContainerCmdModifier(it -> {
             it.getHostConfig().withCgroupnsMode("host");
@@ -44,30 +50,57 @@ public K3sContainer(DockerImageName dockerImageName) {
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
     }
 
-    @SneakyThrows
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        String rawKubeConfig = copyFileFromContainer("/etc/rancher/k3s/k3s.yaml",
+            is -> IOUtils.toString(is, StandardCharsets.UTF_8)
+        );
+        String serverUrl = "https://" + this.getHost() + ":" + this.getMappedPort(KUBE_SECURE_PORT);
+        kubeConfigYaml = kubeConfigWithServerUrl(rawKubeConfig, serverUrl);
+    }
+
+    /**
+     * Return the kubernetes client configuration to access k3s from the host machine.
+     *
+     * @return the kubeConfig yaml.
+     */
+    public String getKubeConfigYaml() {
+        return kubeConfigYaml;
+    }
+
+    /**
+     * Generate a kubernetes client configuration for use on a docker internal network. The kubeConfig can be used by
+     * another docker container running in the same network as the k3s container. For access from the host, use
+     * the {@link #getKubeConfigYaml()} method instead.
+     *
+     * @param networkAlias a valid network alias of the k3s container.
+     * @return the kubeConfig yaml.
+     */
+    public String generateInternalKubeConfigYaml(String networkAlias) {
+        if (this.getNetworkAliases().contains(networkAlias)) {
+            String serverUrl = "https://" + networkAlias + ":" + KUBE_SECURE_PORT;
+            return kubeConfigWithServerUrl(kubeConfigYaml, serverUrl);
+        } else {
+            throw new IllegalArgumentException(networkAlias + " is not a network alias for k3s container");
+        }
+    }
+
+    @SneakyThrows
+    private String kubeConfigWithServerUrl(String kubeConfigYaml, String serverUrl) {
         ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
 
-        ObjectNode rawKubeConfig = copyFileFromContainer(
-            "/etc/rancher/k3s/k3s.yaml",
-            is -> objectMapper.readValue(is, ObjectNode.class)
-        );
+        ObjectNode kubeConfigObjectNode = objectMapper.readValue(kubeConfigYaml, ObjectNode.class);
 
-        JsonNode clusterNode = rawKubeConfig.at("/clusters/0/cluster");
+        JsonNode clusterNode = kubeConfigObjectNode.at("/clusters/0/cluster");
         if (!clusterNode.isObject()) {
             throw new IllegalStateException("'/clusters/0/cluster' expected to be an object");
         }
         ObjectNode clusterConfig = (ObjectNode) clusterNode;
+        clusterConfig.replace("server", new TextNode(serverUrl));
 
-        clusterConfig.replace("server", new TextNode("https://" + this.getHost() + ":" + this.getMappedPort(6443)));
+        kubeConfigObjectNode.set("current-context", new TextNode("default"));
 
-        rawKubeConfig.set("current-context", new TextNode("default"));
-
-        kubeConfigYaml = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rawKubeConfig);
-    }
-
-    public String getKubeConfigYaml() {
-        return kubeConfigYaml;
+        return objectMapper.writerWithDefaultPrettyPrinter()
+            .writeValueAsString(kubeConfigObjectNode);
     }
 }
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java
new file mode 100644
index 00000000000..5c0d44ff0f1
--- /dev/null
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java
@@ -0,0 +1,45 @@
+package org.testcontainers.k3s;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class KubectlContainerTest {
+
+    public static Network network = Network.SHARED;
+
+    @ClassRule
+    public static K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
+        .withNetwork(network)
+        .withNetworkAliases("k3s");
+
+    @Test
+    public void shouldExposeKubeConfigForNetworkAlias() throws Exception {
+        String kubeConfigYaml = k3s.generateInternalKubeConfigYaml("k3s");
+
+        try (
+            GenericContainer<?> kubectlContainer = new GenericContainer<>("rancher/kubectl:v1.23.3")
+                .withNetwork(network)
+                .withCopyToContainer(Transferable.of(kubeConfigYaml), "/.kube/config")
+                .withCommand("get namespaces")
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(30)))
+        ) {
+            kubectlContainer.start();
+
+            assertThat(kubectlContainer.getLogs()).contains("kube-system");
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowAnExceptionForUnknownNetworkAlias() {
+        k3s.generateInternalKubeConfigYaml("not-set-network-alias");
+    }
+}

From ada816c136d6a46c77d301b1a85968ae5d4ae430 Mon Sep 17 00:00:00 2001
From: edee111 <4160602+edee111@users.noreply.github.com>
Date: Wed, 18 May 2022 11:59:44 +0200
Subject: [PATCH 1889/4969] Removal of containers from the cache is not
 synchronized (#4598)

Co-authored-by: Eduard Tomek <eduard.tomek@usu.com>
---
 .../org/testcontainers/jdbc/ContainerDatabaseDriver.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index c1b4fc29067..4b3a7ba98f7 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -162,8 +162,10 @@ private Connection wrapConnection(final Connection connection, final JdbcDatabas
         return new ConnectionWrapper(connection, () -> {
             finalConnections.remove(connection);
             if (!isDaemon && finalConnections.isEmpty()) {
-                container.stop();
-                jdbcUrlContainerCache.remove(connectionUrl.getUrl());
+                synchronized (jdbcUrlContainerCache) {
+                    container.stop();
+                    jdbcUrlContainerCache.remove(connectionUrl.getUrl());
+                }
             }
         });
     }

From b8d75b153b61af01127b0fb8a09405d6624a8ab8 Mon Sep 17 00:00:00 2001
From: Jurrian Fahner <JurrianFahner@users.noreply.github.com>
Date: Wed, 18 May 2022 18:30:34 +0200
Subject: [PATCH 1890/4969] Add docs for using Gitlab CI with Docker wormhole
 executor (#4770)

---
 .../continuous_integration/gitlab_ci.md       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
index 5e701007ab0..b4571403654 100644
--- a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
@@ -1,5 +1,36 @@
 # GitLab CI
 
+## Example using Docker socket
+This applies if you have your own GitlabCI runner installed, use the Docker executor and you have `/var/run/docker.sock` mounted in the runner configuration.
+
+See below for an example runner configuration: 
+```toml
+[[runners]]
+  name = "MACHINE_NAME"
+  url = "https://gitlab.com/"
+  token = "GENERATED_GITLAB_RUNNER_TOKEN"
+  executor = "docker"
+  [runners.docker]
+    tls_verify = false
+    image = "docker:latest"
+    privileged = false
+    disable_entrypoint_overwrite = false
+    oom_kill_disable = false
+    disable_cache = false
+    volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"]
+    shm_size = 0
+```
+
+Please also include the following in your GitlabCI pipeline definitions (`.gitlab-ci.yml`) that use Testcontainers:
+```yml
+variables:
+  TESTCONTAINERS_HOST_OVERRIDE: "host.docker.internal"
+```
+
+The environment variable `TESTCONTAINERS_HOST_OVERRIDE` needs to be configured, otherwise, a wrong IP address would be used to resolve the Docker host, which will likely lead to failing tests.
+
+## Example using DinD (Docker-in-Docker)
+
 In order to use Testcontainers in a Gitlab CI pipeline, you need to run the job as a Docker container (see [Patterns for running inside Docker](dind_patterns.md)).
 So edit your `.gitlab-ci.yml` to include the [Docker-In-Docker service](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-workflow-with-docker-executor) (`docker:dind`) and set the `DOCKER_HOST` variable to `tcp://docker:2375` and `DOCKER_TLS_CERTDIR` to empty string. 
 

From 6dc05d30cccd8211728e6082f3aa11c6964d0967 Mon Sep 17 00:00:00 2001
From: Tobias Stadler <ts.stadler@gmx.de>
Date: Wed, 18 May 2022 18:52:15 +0200
Subject: [PATCH 1891/4969] Reset driver and vncRecordingContainer when
 Selenium container stops (#5116)

---
 .../testcontainers/containers/BrowserWebDriverContainer.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 12bbbc07de5..fc3778385cd 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -318,6 +318,7 @@ public void stop() {
             } catch (Exception e) {
                 LOGGER.debug("Failed to quit the driver", e);
             }
+            driver = null;
         }
 
         if (vncRecordingContainer != null) {
@@ -326,6 +327,7 @@ public void stop() {
             } catch (Exception e) {
                 LOGGER.debug("Failed to stop vncRecordingContainer", e);
             }
+            vncRecordingContainer = null;
         }
 
         super.stop();

From ea7b29baac0422c0c7a58554a49b393b7ebcc8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 19 May 2022 12:58:16 -0500
Subject: [PATCH 1892/4969] Upgrade lombok to be compatible against java 17
 (#5388)

---
 build.gradle                         | 4 ++--
 examples/kafka-cluster/build.gradle  | 2 +-
 examples/solr-container/build.gradle | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 309743477c1..96e1940eba5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 plugins {
-    id 'io.franzbecker.gradle-lombok' version '4.0.0'
+    id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
 }
@@ -40,7 +40,7 @@ subprojects {
     }
 
     lombok {
-        version = '1.18.20'
+        version = '1.18.24'
     }
 
 
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index ee8035ea51c..db89b4335fe 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.1.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 3f3366f9d46..abb7c12e0ed 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly "org.projectlombok:lombok:1.18.24"
-    annotationProcessor "org.projectlombok:lombok:1.18.22"
+    annotationProcessor "org.projectlombok:lombok:1.18.24"
 
     implementation 'org.apache.solr:solr-solrj:8.11.1'
 

From fffab559a25d2e0501ab721182bc9cbdcb722506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 19 May 2022 13:32:08 -0500
Subject: [PATCH 1893/4969] Fix TestcontainersTestDescription filename (#5387)

---
 ...nerTestDescription.java => TestcontainersTestDescription.java} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/{TestcontainerTestDescription.java => TestcontainersTestDescription.java} (100%)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainerTestDescription.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersTestDescription.java
similarity index 100%
rename from modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainerTestDescription.java
rename to modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersTestDescription.java

From b04540b2cafbb25a580595d2d7832781a1de9825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 20 May 2022 18:14:30 -0500
Subject: [PATCH 1894/4969] Add spotless and checkstyle (#5383)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 build.gradle                     | 31 +++++++++++++++++++++
 config/checkstyle/checkstyle.xml | 47 ++++++++++++++++++++++++++++++++
 docs/contributing.md             |  1 +
 gradle/ci-support.gradle         |  2 +-
 modules/neo4j/build.gradle       |  2 +-
 5 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 config/checkstyle/checkstyle.xml

diff --git a/build.gradle b/build.gradle
index 96e1940eba5..adbd1a47c4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
+    id 'com.diffplug.spotless' version '6.3.0' apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -22,6 +23,8 @@ subprojects {
     apply plugin: 'idea'
     apply plugin: 'io.franzbecker.gradle-lombok'
     apply from: "$rootDir/gradle/shading.gradle"
+    apply plugin: 'com.diffplug.spotless'
+    apply plugin: 'checkstyle'
 
     group = "org.testcontainers"
 
@@ -105,4 +108,32 @@ subprojects {
     dependencies {
         testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     }
+
+    spotless {
+        enforceCheck false
+        java {
+            removeUnusedImports()
+            trimTrailingWhitespace()
+            endWithNewline()
+
+            prettier(['prettier': '2.5.1', 'prettier-plugin-java': '1.6.1'])
+                .config([
+                    'parser'    : 'java',
+                    'tabWidth'  : 4,
+                    'printWidth': 120
+                ])
+
+            importOrder('', 'java', 'javax', '\\#')
+        }
+        groovyGradle {
+            target '**/*.groovy'
+            greclipse('4.19.0')
+        }
+    }
+
+    checkstyle {
+        toolVersion = "9.3"
+        configFile = rootProject.file('config/checkstyle/checkstyle.xml')
+        ignoreFailures = true
+    }
 }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 00000000000..39598dae2e4
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,47 @@
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <module name="TreeWalker">
+        <module name="SuppressionCommentFilter"/>
+        <module name="NeedBraces">
+            <property name="tokens"
+                      value="
+                      LITERAL_DO,
+                      LITERAL_ELSE,
+                      LITERAL_FOR,
+                      LITERAL_IF,
+                      LITERAL_WHILE,
+                      LITERAL_CASE,
+                      LITERAL_DEFAULT,
+                      LAMBDA,
+                      "
+            />
+            <property name="allowSingleLineStatement" value="true"/>
+        </module>
+        <module name="AvoidStaticImport">
+            <property name="excludes"
+                      value="
+                      io.restassured.RestAssured.*,
+                      org.assertj.core.api.Assertions.*,
+                      org.assertj.core.api.Assumptions.*,
+                      org.awaitility.Awaitility.*,
+                      org.hamcrest.Matchers.*,
+                      org.hamcrest.MatcherAssert.*,
+                      org.junit.Assert.*,
+                      org.junit.Assume.*,
+                      org.junit.jupiter.api.Assertions.*,
+                      org.mockito.Mockito.*,
+                      org.mockito.ArgumentMatchers.*,
+                      org.mockserver.model.HttpRequest.*,
+                      org.mockserver.model.HttpResponse.*,
+                      org.rnorth.ducttape.unreliables.Unreliables.*,
+                      org.rnorth.visibleassertions.VisibleAssertions.*,
+                      "
+            />
+        </module>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="false" />
+        </module>
+        <module name="OneStatementPerLineCheck"/>
+    </module>
+</module>
diff --git a/docs/contributing.md b/docs/contributing.md
index 6cd3e2719f8..01c4fce57b6 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -8,6 +8,7 @@
     * follow the style, naming and structure conventions of the rest of the project.
     * make commits atomic and easy to merge.
     * when updating documentation, please see [our guidance for documentation contributions](contributing_docs.md).
+    * apply format running `./gradlew spotlessApply`
     * verify all tests are passing. Build the project with `./gradlew check` to do this.
     **N.B.** Gradle's Build Cache is enabled by default, but you can add `--no-build-cache` flag to disable it.
 
diff --git a/gradle/ci-support.gradle b/gradle/ci-support.gradle
index b878c107796..5b85837361e 100644
--- a/gradle/ci-support.gradle
+++ b/gradle/ci-support.gradle
@@ -17,7 +17,7 @@ task testMatrix {
     }
 }
 
-// If we're executing the `taskMatrix` task, disable tests and other slow tasks
+// If we're executing the `testMatrix` task, disable tests and other slow tasks
 //  so that we can get a result quickly.
 gradle.taskGraph.whenReady {
     if (it.hasTask(tasks.testMatrix)) {
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 0bdd9ba960c..efba3dd0db5 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -26,7 +26,7 @@ task customNeo4jPluginJar(type: Jar) {
     outputs.dir(customNeo4jPluginDestinationDir)
 }
 
-test.dependsOn customNeo4jPluginJar
+processTestResources.dependsOn customNeo4jPluginJar
 
 dependencies {
     customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.32"

From f60051c0b7f89bed30ddeffd09b8feed0500e342 Mon Sep 17 00:00:00 2001
From: Tobias Stadler <ts.stadler@gmx.de>
Date: Tue, 24 May 2022 20:43:27 +0200
Subject: [PATCH 1895/4969] Use `TestInstances` API from JUnit Jupiter (#2719)

Co-authored-by: Richard North <rich.north@gmail.com>
---
 .../jupiter/TestcontainersExtension.java      | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 1ed5e954e44..990940be14d 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
-import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.Preconditions;
@@ -23,7 +22,8 @@
 import org.testcontainers.lifecycle.TestLifecycleAware;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -34,20 +34,13 @@
 import static java.util.stream.Collectors.toList;
 import static org.testcontainers.junit.jupiter.FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf;
 
-class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition, TestInstancePostProcessor {
+class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition {
 
     private static final Namespace NAMESPACE = Namespace.create(TestcontainersExtension.class);
 
-    private static final String TEST_INSTANCE = "testInstance";
     private static final String SHARED_LIFECYCLE_AWARE_CONTAINERS = "sharedLifecycleAwareContainers";
     private static final String LOCAL_LIFECYCLE_AWARE_CONTAINERS = "localLifecycleAwareContainers";
 
-    @Override
-    public void postProcessTestInstance(final Object testInstance, final ExtensionContext context) {
-        Store store = context.getStore(NAMESPACE);
-        store.put(TEST_INSTANCE, testInstance);
-    }
-
     @Override
     public void beforeAll(ExtensionContext context) {
         Class<?> testClass = context.getTestClass()
@@ -156,17 +149,9 @@ boolean isDockerAvailable() {
     }
 
     private Set<Object> collectParentTestInstances(final ExtensionContext context) {
-        Set<Object> testInstances = new LinkedHashSet<>();
-        Optional<ExtensionContext> current = Optional.of(context);
-        while (current.isPresent()) {
-            ExtensionContext ctx = current.get();
-            Object testInstance = ctx.getStore(NAMESPACE).remove(TEST_INSTANCE);
-            if (testInstance != null) {
-                testInstances.add(testInstance);
-            }
-            current = ctx.getParent();
-        }
-        return testInstances;
+        List<Object> allInstances = new ArrayList<>(context.getRequiredTestInstances().getAllInstances());
+        Collections.reverse(allInstances);
+        return new LinkedHashSet<>(allInstances);
     }
 
     private List<StoreAdapter> findSharedContainers(Class<?> testClass) {

From 2bdbc8cd6d42cb5dc12165617e72abfa0dee2fec Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 24 May 2022 21:07:58 +0200
Subject: [PATCH 1896/4969] Don't delete images if `deleteOnExit` is false
 (#5391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../images/builder/ImageFromDockerfile.java   | 10 +++++-----
 .../builder/ImageFromDockerfileTest.java      | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 281a74feaba..000487bfa4d 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -87,9 +87,6 @@ protected final String resolve() {
         DockerClient dockerClient = DockerClientFactory.instance().client();
 
         try {
-            if (deleteOnExit) {
-                ResourceReaper.instance().registerImageForCleanup(dockerImageName);
-            }
 
             BuildImageResultCallback resultCallback = new BuildImageResultCallback() {
                 @Override
@@ -114,9 +111,12 @@ public void onNext(BuildResponseItem item) {
             if (buildImageCmd.getLabels() != null) {
                 labels.putAll(buildImageCmd.getLabels());
             }
+
             labels.putAll(DockerClientFactory.DEFAULT_LABELS);
-            //noinspection deprecation
-            labels.putAll(ResourceReaper.instance().getLabels());
+            if (deleteOnExit) {
+                //noinspection deprecation
+                labels.putAll(ResourceReaper.instance().getLabels());
+            }
             buildImageCmd.withLabels(labels);
 
             prePullDependencyImages(dependencyImageNames);
diff --git a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
index 93ec5cb5cd1..da3509cea7b 100644
--- a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.command.InspectImageResponse;
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.utility.Base58;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,4 +25,22 @@ public void shouldAddDefaultLabels() {
             .containsAllEntriesOf(DockerClientFactory.DEFAULT_LABELS);
     }
 
+    @Test
+    public void shouldNotAddSessionLabelIfDeleteOnExitIsFalse() {
+        ImageFromDockerfile image = new ImageFromDockerfile("localhost/testcontainers/" + Base58.randomString(16).toLowerCase(), false)
+            .withDockerfileFromBuilder(it -> it.from("scratch"));
+        String imageId = image.resolve();
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+
+        try {
+            InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+            assertThat(inspectImageResponse.getConfig().getLabels())
+                .doesNotContainKey(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL);
+        } finally {
+            // ensure the image is deleted, even if the test fails
+            dockerClient.removeImageCmd(imageId).exec();
+        }
+
+    }
+
 }

From de1324ed2800eff4da326d0c23d281399d006bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 24 May 2022 23:31:37 -0500
Subject: [PATCH 1897/4969] Apply spotless and checkstyle (#5390)

---
 .github/workflows/ci-docker-wormhole.yml      |   1 +
 build.gradle                                  |  11 +-
 config/checkstyle/checkstyle.xml              |   8 +-
 .../testcontainers/AbstractJarFileTest.java   |   5 +-
 .../testcontainers/JarFileShadingTest.java    |  24 +-
 .../testcontainers/PublicBinaryAPITest.java   |  76 +-
 .../testcontainers/DockerClientFactory.java   |  93 ++-
 .../org/testcontainers/Testcontainers.java    |  15 +-
 .../java/org/testcontainers/UnstableAPI.java  |   6 +-
 .../testcontainers/containers/BindMode.java   |   3 +-
 .../ComposeServiceWaitStrategyTarget.java     |  15 +-
 .../testcontainers/containers/Container.java  |  22 +-
 .../containers/ContainerFetchException.java   |   1 +
 .../containers/ContainerState.java            |  42 +-
 .../containers/DockerComposeContainer.java    | 236 ++++--
 .../containers/DockerComposeFiles.java        |   4 +-
 .../containers/ExecInContainerPattern.java    |  38 +-
 .../FailureDetectingExternalResource.java     |  16 +-
 .../FixedHostPortGenericContainer.java        |   5 +-
 .../containers/FutureContainer.java           |   1 +
 .../containers/GenericContainer.java          | 323 ++++----
 .../containers/InternetProtocol.java          |   1 -
 .../testcontainers/containers/Network.java    |   1 -
 .../containers/ParsedDockerComposeFile.java   |  65 +-
 .../containers/PortForwardingContainer.java   |  24 +-
 .../containers/SelinuxContext.java            |   1 -
 .../containers/SocatContainer.java            |  16 +-
 .../containers/VncRecordingContainer.java     |  55 +-
 .../containers/output/BaseConsumer.java       |   1 +
 .../output/FrameConsumerResultCallback.java   |   4 +-
 .../containers/output/OutputFrame.java        |  19 +-
 .../containers/output/Slf4jLogConsumer.java   |  10 +-
 .../containers/output/ToStringConsumer.java   |   1 +
 .../containers/output/WaitingConsumer.java    |   4 +-
 ...finiteWaitOneShotStartupCheckStrategy.java |   1 +
 ...umDurationRunningStartupCheckStrategy.java |   1 -
 .../startupcheck/StartupCheckStrategy.java    |  51 +-
 .../containers/traits/LinkableContainer.java  |   1 -
 .../internal/ExternalPortListeningCheck.java  |  20 +-
 .../InternalCommandPortListeningCheck.java    |  25 +-
 .../wait/strategy/AbstractWaitStrategy.java   |  21 +-
 .../DockerHealthcheckWaitStrategy.java        |   7 +-
 .../wait/strategy/HostPortWaitStrategy.java   |  98 ++-
 .../wait/strategy/HttpWaitStrategy.java       | 207 ++---
 .../wait/strategy/LogMessageWaitStrategy.java |  18 +-
 .../containers/wait/strategy/Wait.java        |   9 +-
 .../wait/strategy/WaitAllStrategy.java        |  29 +-
 .../wait/strategy/WaitStrategy.java           |   1 -
 .../wait/strategy/WaitStrategyTarget.java     |   8 +-
 .../AuditLoggingDockerClient.java             | 127 +--
 .../AuthDelegatingDockerClientConfig.java     |  14 +-
 .../dockerclient/DockerClientConfigUtils.java |  27 +-
 .../DockerClientProviderStrategy.java         | 139 ++--
 .../DockerMachineClientProviderStrategy.java  |  21 +-
 ...dSystemPropertyClientProviderStrategy.java |  11 +-
 .../HeadersAddingDockerHttpClient.java        |   4 +-
 .../InvalidConfigurationException.java        |   2 +-
 .../LogToStringContainerCallback.java         |   1 +
 .../NpipeSocketClientProviderStrategy.java    |   5 +-
 .../RootlessDockerClientProviderStrategy.java |  20 +-
 .../UnixSocketClientProviderStrategy.java     |  11 +-
 .../images/AbstractImagePullPolicy.java       |   3 +-
 .../org/testcontainers/images/ImageData.java  |   7 +-
 .../images/ImagePullPolicy.java               |   2 -
 .../images/LocalImagesCache.java              |   8 +-
 .../images/LoggedPullImageResultCallback.java |  38 +-
 .../images/ParsedDockerfile.java              |  17 +-
 .../org/testcontainers/images/PullPolicy.java |   5 +-
 .../images/RemoteDockerImage.java             |  24 +-
 ...eLimitedLoggedPullImageResultCallback.java |  39 +-
 .../images/builder/ImageFromDockerfile.java   |  54 +-
 .../images/builder/Transferable.java          |   1 -
 .../builder/dockerfile/DockerfileBuilder.java |   5 +-
 .../dockerfile/statement/Statement.java       |   2 +-
 .../dockerfile/traits/AddStatementTrait.java  |   1 -
 .../dockerfile/traits/CmdStatementTrait.java  |   1 -
 .../dockerfile/traits/CopyStatementTrait.java |   1 -
 .../traits/DockerfileBuilderTrait.java        |   1 -
 .../traits/EntryPointStatementTrait.java      |   1 -
 .../dockerfile/traits/EnvStatementTrait.java  |   1 -
 .../traits/ExposeStatementTrait.java          |   8 +-
 .../dockerfile/traits/FromStatementTrait.java |   1 -
 .../traits/LabelStatementTrait.java           |   1 -
 .../dockerfile/traits/RunStatementTrait.java  |   1 -
 .../dockerfile/traits/UserStatementTrait.java |   1 -
 .../traits/VolumeStatementTrait.java          |   1 -
 .../traits/WorkdirStatementTrait.java         |   1 -
 .../traits/BuildContextBuilderTrait.java      |   1 -
 .../images/builder/traits/ClasspathTrait.java |   1 -
 .../builder/traits/DockerfileTrait.java       |  38 +-
 .../images/builder/traits/FilesTrait.java     |   1 -
 .../images/builder/traits/StringsTrait.java   |  29 +-
 .../testcontainers/lifecycle/Startable.java   |   1 -
 .../testcontainers/lifecycle/Startables.java  |  36 +-
 .../lifecycle/TestDescription.java            |   1 -
 .../lifecycle/TestLifecycleAware.java         |   9 +-
 .../testcontainers/utility/AuditLogger.java   |  45 +-
 .../utility/AuthConfigUtil.java               |   9 +-
 .../org/testcontainers/utility/Base58.java    |   3 +-
 .../utility/ClasspathScanner.java             |   6 +-
 .../testcontainers/utility/CommandLine.java   |  14 +-
 .../utility/ComparableVersion.java            |  10 +-
 ...ConfigurationFileImageNameSubstitutor.java |   3 +-
 .../utility/DefaultImageNameSubstitutor.java  |  13 +-
 .../utility/DockerImageName.java              |  68 +-
 .../utility/DockerLoggerFactory.java          |   1 -
 .../utility/DockerMachineClient.java          |  45 +-
 .../testcontainers/utility/DockerStatus.java  |  22 +-
 .../utility/DynamicPollInterval.java          |   1 +
 .../utility/ImageNameSubstitutor.java         |  40 +-
 .../utility/JVMHookResourceReaper.java        |  21 +-
 .../testcontainers/utility/LazyFuture.java    |   2 +-
 .../utility/LicenseAcceptance.java            |  17 +-
 .../org/testcontainers/utility/LogUtils.java  |  40 +-
 .../testcontainers/utility/MountableFile.java | 115 ++-
 .../org/testcontainers/utility/PathUtils.java |  34 +-
 .../PrefixingImageNameSubstitutor.java        |   6 +-
 .../utility/RegistryAuthLocator.java          | 141 ++--
 .../utility/ResourceReaper.java               |  66 +-
 .../testcontainers/utility/RyukContainer.java |  11 +-
 .../utility/RyukResourceReaper.java           |   5 +-
 .../utility/TestEnvironment.java              |   4 +-
 .../utility/TestcontainersConfiguration.java  |  95 ++-
 .../utility/ThrowingFunction.java             |   1 -
 .../testcontainers/utility/Versioning.java    |   5 +
 .../OutOfPackageImagePullPolicyTest.java      |  19 +-
 .../java/org/testcontainers/DaemonTest.java   |  10 +-
 .../DockerClientFactoryTest.java              |   8 +-
 .../DockerRegistryContainer.java              |  39 +-
 .../containers/ContainerStateTest.java        |  22 +-
 ...ockerComposeContainerWithServicesTest.java |  36 +-
 .../containers/DockerComposeFilesTest.java    |  22 +-
 .../DockerComposeOverridesTest.java           |  81 +-
 .../containers/ExposedHostTest.java           |  36 +-
 .../FailureDetectingExternalResourceTest.java |   1 -
 .../containers/GenericContainerTest.java      |  84 +-
 .../containers/NetworkTest.java               |  73 +-
 ...ParsedDockerComposeFileValidationTest.java |  69 +-
 .../containers/ReusabilityUnitTests.java      | 170 ++--
 .../containers/output/ContainerLogsTest.java  |  15 +-
 .../FrameConsumerResultCallbackTest.java      | 100 ++-
 .../output/ToStringConsumerTest.java          |  27 +-
 .../ExternalPortListeningCheckTest.java       |  32 +-
 ...InternalCommandPortListeningCheckTest.java |  44 +-
 .../DockerHealthcheckWaitStrategyTest.java    |  14 +-
 .../wait/strategy/WaitAllStrategyTest.java    |  61 +-
 .../dockerclient/AmbiguousImagePullTest.java  |   3 +-
 .../DockerClientConfigUtilsTest.java          |  24 +-
 ...temPropertyClientProviderStrategyTest.java |  77 +-
 .../dockerclient/EventStreamTest.java         |  30 +-
 .../dockerclient/ImagePullTest.java           |  10 +-
 .../images/AgeBasedPullPolicyTest.java        |  12 +-
 .../testcontainers/images/ImageDataTest.java  |   8 +-
 .../images/ImagePullPolicyTest.java           |  46 +-
 .../images/ParsedDockerfileTest.java          |  90 ++-
 .../images/RemoteDockerImageTest.java         |  10 +-
 .../images/builder/DockerfileBuildTest.java   |  47 +-
 .../images/builder/DockerignoreTest.java      |  30 +-
 .../builder/ImageFromDockerfileTest.java      |  10 +-
 .../statement/AbstractStatementTest.java      |   6 +-
 .../statement/KeyValuesStatementTest.java     |  24 +-
 .../statement/MultiArgsStatementTest.java     |   2 +-
 .../statement/RawStatementTest.java           |   3 +-
 .../SingleArgumentStatementTest.java          |   2 +-
 .../junit/BaseDockerComposeTest.java          |  29 +-
 .../junit/CopyFileToContainerTest.java        |  13 +-
 .../junit/DependenciesTest.java               |  26 +-
 .../DockerComposeContainerScalingTest.java    |  17 +-
 .../junit/DockerComposeContainerTest.java     |  39 +-
 .../DockerComposeContainerWithBuildTest.java  |  84 +-
 ...DockerComposeContainerWithOptionsTest.java |  53 +-
 .../junit/DockerComposeErrorHandlingTest.java |  14 +-
 .../junit/DockerComposeLocalImageTest.java    |   4 +-
 .../junit/DockerComposeLogConsumerTest.java   |  18 +-
 .../junit/DockerComposePassthroughTest.java   |  20 +-
 .../junit/DockerComposeServiceTest.java       |  13 +-
 .../junit/DockerComposeV2FormatTest.java      |   6 +-
 .../junit/DockerComposeV2WithNetworkTest.java |  13 +-
 .../junit/DockerComposeWaitStrategyTest.java  |  62 +-
 .../junit/DockerNetworkModeTest.java          |   6 +-
 .../junit/DockerfileContainerTest.java        |  31 +-
 .../testcontainers/junit/DockerfileTest.java  |  68 +-
 .../junit/FileOperationsTest.java             |  32 +-
 .../junit/FixedHostPortContainerTest.java     |  32 +-
 .../junit/GenericContainerRuleTest.java       | 269 ++++---
 .../junit/NonExistentImagePullTest.java       |  12 +-
 .../junit/OutputStreamTest.java               |  57 +-
 .../junit/OutputStreamWithTTYTest.java        |  43 +-
 .../ParameterizedDockerfileContainerTest.java |  30 +-
 .../junit/WorkingDirectoryTest.java           |  11 +-
 .../strategy/AbstractWaitStrategyTest.java    |  28 +-
 .../strategy/HostPortWaitStrategyTest.java    |   3 +-
 .../wait/strategy/HttpWaitStrategyTest.java   | 154 ++--
 .../strategy/LogMessageWaitStrategyTest.java  |  29 +-
 .../utility/AuthenticatedImagePullTest.java   |  65 +-
 .../utility/ClasspathScannerTest.java         |  83 +-
 .../utility/ComparableVersionTest.java        |  24 +-
 .../DefaultImageNameSubstitutorTest.java      |   2 +
 .../utility/DirectoryTarResourceTest.java     |  81 +-
 .../DockerImageNameCompatibilityTest.java     |  13 +-
 .../utility/DockerImageNameTest.java          |  95 ++-
 .../utility/DockerStatusTest.java             |  18 +-
 .../utility/FakeImageSubstitutor.java         |   1 +
 .../utility/FilterRegistryTest.java           |  12 +-
 .../utility/ImageNameSubstitutorTest.java     |  12 +-
 .../utility/LazyFutureTest.java               |  16 +-
 .../utility/MountableFileTest.java            |  33 +-
 .../PrefixingImageNameSubstitutorTest.java    |  51 +-
 .../utility/RegistryAuthLocatorTest.java      |  76 +-
 .../utility/ResourceReaperTest.java           |  27 +-
 .../TestcontainersConfigurationTest.java      |  69 +-
 .../test/java/generic/CmdModifierTest.java    |  15 +-
 .../src/test/java/generic/CommandsTest.java   |   3 +-
 .../java/generic/ContainerCreationTest.java   |  24 +-
 .../test/java/generic/ContainerLabelTest.java |   2 +-
 .../java/generic/HostPortExposedTest.java     |  24 +-
 .../generic/ImageNameSubstitutionTest.java    |   9 +-
 .../generic/MultiplePortsExposedTest.java     |  13 +-
 .../test/java/generic/WaitStrategiesTest.java |  29 +-
 .../StartupCheckStrategyTest.java             |  38 +-
 .../quickstart/RedisBackedCacheIntTest.java   |   5 +-
 .../RedisBackedCacheIntTestStep0.java         |   2 +-
 .../quickstart/RedisBackedCacheIntTest.java   |   5 +-
 .../RedisBackedCacheIntTestStep0.java         |   2 +-
 .../quickstart/RedisBackedCacheIntTest.groovy |  38 +-
 .../RedisBackedCacheIntTestStep0.groovy       |  26 +-
 docs/modules/hivemq.md                        |   4 +-
 .../containers/CosmosDBEmulatorContainer.java |   5 +-
 .../containers/KeyStoreBuilder.java           |  46 +-
 .../CosmosDBEmulatorContainerTest.java        |  22 +-
 .../containers/CassandraContainer.java        |  34 +-
 .../delegate/CassandraDatabaseDelegate.java   |  11 +-
 .../wait/CassandraQueryWaitStrategy.java      |  22 +-
 .../containers/CassandraContainerTest.java    |  24 +-
 .../containers/ClickHouseContainer.java       |   7 +-
 .../containers/ClickHouseProvider.java        |   1 +
 .../clickhouse/ClickhouseJDBCDriverTest.java  |  12 +-
 .../clickhouse/SimpleClickhouseTest.java      |   4 +-
 .../containers/CockroachContainer.java        |  32 +-
 .../CockroachContainerProvider.java           |   1 +
 .../CockroachDBJDBCDriverTest.java            |  12 +-
 .../cockroachdb/SimpleCockroachDBTest.java    |  15 +-
 .../couchbase/BucketDefinition.java           |   6 +-
 .../couchbase/CouchbaseContainer.java         | 333 +++++---
 .../couchbase/CouchbaseService.java           |   2 -
 .../couchbase/CouchbaseContainerTest.java     |  85 +-
 .../delegate/AbstractDatabaseDelegate.java    |   7 +-
 .../delegate/DatabaseDelegate.java            |   9 +-
 .../org/testcontainers/ext/ScriptUtils.java   | 736 ++++++++++--------
 .../ext/ScriptSplittingTest.java              | 143 ++--
 .../containers/Db2Container.java              |  16 +-
 .../containers/Db2ContainerProvider.java      |   1 +
 .../jdbc/db2/DB2JDBCDriverTest.java           |  12 +-
 .../junit/db2/SimpleDb2Test.java              |  17 +-
 .../dynamodb/DynaliteContainer.java           |  22 +-
 .../dynamodb/DynaliteContainerTest.java       |  30 +-
 .../elasticsearch/ElasticsearchContainer.java |  26 +-
 .../ElasticsearchContainerTest.java           | 215 +++--
 .../containers/BigtableEmulatorContainer.java |   9 +-
 .../DatastoreEmulatorContainer.java           |   9 +-
 .../FirestoreEmulatorContainer.java           |   9 +-
 .../containers/PubSubEmulatorContainer.java   |   9 +-
 .../containers/SpannerEmulatorContainer.java  |   9 +-
 .../BigtableEmulatorContainerTest.java        |  61 +-
 .../DatastoreEmulatorContainerTest.java       |  18 +-
 .../FirestoreEmulatorContainerTest.java       |  24 +-
 .../PubSubEmulatorContainerTest.java          |  85 +-
 .../SpannerEmulatorContainerTest.java         |  68 +-
 .../hivemq/HiveMQContainer.java               | 138 ++--
 .../hivemq/HiveMQExtension.java               |  98 ++-
 .../hivemq/ContainerWithControlCenterIT.java  |  14 +-
 .../hivemq/ContainerWithCustomConfigIT.java   |  25 +-
 ...ContainerWithExtensionFromDirectoryIT.java |  25 +-
 .../hivemq/ContainerWithExtensionIT.java      |  22 +-
 .../ContainerWithExtensionSubclassIT.java     |  22 +-
 .../ContainerWithFileInExtensionHomeIT.java   |  55 +-
 .../hivemq/ContainerWithFileInHomeIT.java     |  52 +-
 .../hivemq/ContainerWithLicenseIT.java        |  46 +-
 .../ContainerWithoutPlatformExtensionsIT.java |  71 +-
 .../hivemq/CreateFileInCopiedDirectoryIT.java |  47 +-
 .../CreateFileInExtensionDirectoryIT.java     |  45 +-
 ...DisableEnableExtensionFromDirectoryIT.java |  19 +-
 .../hivemq/DisableEnableExtensionIT.java      |  29 +-
 .../hivemq/HiveMQExtensionTest.java           |   5 +-
 .../hivemq/HiveMQTestContainerCore.java       |  20 +-
 .../hivemq/docs/DemoDisableExtensionsIT.java  |  27 +-
 .../hivemq/docs/DemoExtensionTestsIT.java     |  32 +-
 .../hivemq/docs/DemoFilesIT.java              |  35 +-
 .../hivemq/docs/DemoHiveMQContainerIT.java    |  31 +-
 .../hivemq/util/MyExtension.java              |  19 +-
 .../util/MyExtensionWithSubclasses.java       |  19 +-
 .../hivemq/util/PublishModifier.java          |  12 +-
 .../hivemq/util/TestPublishModifiedUtil.java  |  31 +-
 .../containers/InfluxDBContainer.java         |  14 +-
 .../containers/InfluxDBContainerTest.java     |   8 +-
 .../InfluxDBContainerWithUserTest.java        |  15 +-
 .../db/AbstractContainerDatabaseTest.java     |   3 +-
 .../jdbc/AbstractJDBCDriverTest.java          | 136 ++--
 .../containers/JdbcDatabaseContainer.java     |  49 +-
 .../JdbcDatabaseContainerProvider.java        |  16 +-
 .../jdbc/ConnectionDelegate.java              |   2 +-
 .../testcontainers/jdbc/ConnectionUrl.java    |  89 +--
 .../jdbc/ConnectionWrapper.java               |   2 +-
 .../jdbc/ContainerDatabaseDriver.java         |  63 +-
 .../jdbc/JdbcDatabaseDelegate.java            |  18 +-
 .../testcontainers/jdbc/ext/ScriptUtils.java  |  62 +-
 .../containers/JdbcDatabaseContainerTest.java |   5 +-
 .../jdbc/ConnectionUrlDriversTests.java       | 109 ++-
 .../jdbc/ConnectionUrlTest.java               |  41 +-
 .../jdbc/ContainerDatabaseDriverTest.java     |  37 +-
 .../jdbc/MissingJdbcDriverTest.java           |   2 +-
 .../FilesystemFriendlyNameGenerator.java      |  10 +-
 .../junit/jupiter/Testcontainers.java         |   1 -
 .../jupiter/TestcontainersExtension.java      |  69 +-
 .../TestcontainersTestDescription.java        |   2 +
 .../junit/jupiter/ComposeContainerTests.java  |   3 +-
 .../FilesystemFriendlyNameGeneratorTest.java  |   6 +-
 .../junit/jupiter/MixedLifecycleTests.java    |   8 -
 .../junit/jupiter/PostgresContainerTests.java |  12 +-
 .../TestLifecycleAwareContainerMock.java      |  10 +-
 ...tLifecycleAwareExceptionCapturingTest.java |   1 +
 .../jupiter/TestLifecycleAwareMethodTest.java |  17 +-
 .../jupiter/TestcontainersExtensionTests.java |  10 +-
 ...ntainersNestedRestartedContainerTests.java |  16 +-
 ...tcontainersNestedSharedContainerTests.java |   5 +-
 .../TestcontainersRestartBetweenTests.java    |  10 +-
 .../TestcontainersSharedContainerTests.java   |   6 +-
 .../jupiter/WrongAnnotationUsageTests.java    |   3 -
 .../jupiter/inheritance/AbstractTestBase.java |   1 -
 .../org/testcontainers/k3s/K3sContainer.java  |  13 +-
 .../k3s/Fabric8K3sContainerTest.java          |  10 +-
 .../containers/KafkaContainer.java            |  18 +-
 .../containers/KafkaContainerTest.java        |  80 +-
 .../localstack/LocalStackContainer.java       |  30 +-
 .../containers/localstack/LegacyModeTest.java |  70 +-
 .../localstack/LocalstackContainerTest.java   | 160 ++--
 .../containers/MariaDBContainer.java          |  19 +-
 .../containers/MariaDBContainerProvider.java  |   3 +-
 .../MariaDBR2DBCDatabaseContainer.java        |   6 +-
 .../MariaDBR2DBCDatabaseContainerTest.java    |   1 -
 .../jdbc/mariadb/MariaDBJDBCDriverTest.java   |  49 +-
 .../junit/mariadb/SimpleMariaDBTest.java      |  37 +-
 .../containers/MockServerContainer.java       |   2 +-
 .../MockServerContainerRuleTest.java          |  12 +-
 .../containers/MockServerContainerTest.java   |  19 +-
 .../containers/SimpleHttpClient.java          |   4 +-
 .../containers/MongoDBContainer.java          |  45 +-
 .../containers/MongoDBContainerTest.java      |  42 +-
 .../MSSQLR2DBCDatabaseContainer.java          |   6 +-
 .../containers/MSSQLServerContainer.java      |  21 +-
 .../MSSQLServerContainerProvider.java         |   1 +
 .../MSSQLServerJDBCDriverTest.java            |  15 +-
 .../CustomPasswordMSSQLServerTest.java        |  60 +-
 .../CustomizableMSSQLServerTest.java          |   9 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    |  25 +-
 .../containers/MySQLContainer.java            |  17 +-
 .../containers/MySQLContainerProvider.java    |   1 -
 .../MySQLR2DBCDatabaseContainer.java          |   6 +-
 .../org/testcontainers/MySQLTestImages.java   |   3 +
 .../MySQLR2DBCDatabaseContainerTest.java      |   1 -
 .../containers/MySQLRootAccountTest.java      |   7 +-
 .../jdbc/mysql/JDBCDriverWithPoolTest.java    |  54 +-
 .../jdbc/mysql/MySQLJDBCDriverTest.java       |  51 +-
 .../junit/mysql/CustomizableMysqlTest.java    |  16 +-
 .../junit/mysql/MultiVersionMySQLTest.java    |  20 +-
 .../junit/mysql/SimpleMySQLTest.java          | 104 +--
 .../neo4j/demos/plugins/HelloWorld.java       |   1 -
 .../containers/Neo4jContainer.java            |  71 +-
 .../Neo4jContainerJUnitIntegrationTest.java   |   5 +-
 .../containers/Neo4jContainerTest.java        |  93 +--
 .../containers/NginxContainer.java            |   7 +-
 .../testcontainers/junit/SimpleNginxTest.java |  14 +-
 .../containers/OracleContainer.java           |  36 +-
 .../containers/OracleContainerProvider.java   |   1 +
 .../containers/jdbc/OracleJDBCDriverTest.java |  24 +-
 .../junit/oracle/SimpleOracleTest.java        |  29 +-
 .../containers/OrientDBContainer.java         |  16 +-
 .../containers/OrientDBContainerTest.java     |  13 +-
 .../containers/PostgisContainerProvider.java  |   9 +-
 .../containers/PostgreSQLContainer.java       |  29 +-
 .../PostgreSQLContainerProvider.java          |   2 +-
 .../PostgreSQLR2DBCDatabaseContainer.java     |   6 +-
 .../TimescaleDBContainerProvider.java         |   9 +-
 .../PostgreSQLConnectionURLTest.java          |  19 +-
 .../PostgreSQLR2DBCDatabaseContainerTest.java |   2 +
 .../containers/TimescaleDBContainerTest.java  |  29 +-
 .../jdbc/DatabaseDriverShutdownTest.java      |   1 +
 .../jdbc/DatabaseDriverTmpfsTest.java         |   1 -
 .../jdbc/postgis/PostgisJDBCDriverTest.java   |  20 +-
 .../postgresql/PostgreSQLJDBCDriverTest.java  |  15 +-
 .../TimescaleDBJDBCDriverTest.java            |  20 +-
 .../CustomizablePostgreSQLTest.java           |  10 +-
 .../postgresql/SimplePostgreSQLTest.java      |  30 +-
 .../containers/PrestoContainer.java           |  26 +-
 .../containers/PrestoContainerProvider.java   |   2 +-
 .../containers/PrestoContainerTest.java       |  98 ++-
 .../jdbc/presto/PrestoJDBCDriverTest.java     |  12 +-
 .../containers/PulsarContainer.java           |   4 +-
 .../containers/PulsarContainerTest.java       |  28 +-
 .../r2dbc/CancellableSubscription.java        |   3 +-
 .../r2dbc/ConnectionPublisher.java            |  10 +-
 .../r2dbc/EmptySubscription.java              |   8 +-
 .../java/org/testcontainers/r2dbc/Hidden.java |   4 +-
 .../r2dbc/R2DBCDatabaseContainer.java         |   1 -
 .../r2dbc/R2DBCDatabaseContainerProvider.java |   1 -
 .../TestcontainersR2DBCConnectionFactory.java |  45 +-
 ...tcontainersR2DBCConnectionFactoryTest.java |  19 +-
 .../AbstractR2DBCDatabaseContainerTest.java   |   4 +-
 .../containers/RabbitMQContainer.java         | 373 ++++++---
 .../containers/RabbitMQContainerTest.java     | 248 +++---
 .../containers/BrowserWebDriverContainer.java | 125 ++-
 .../DefaultRecordingFileFactory.java          |  23 +-
 .../containers/RecordingFileFactory.java      |  15 +-
 .../containers/SeleniumUtils.java             |  13 +-
 .../DefaultRecordingFileFactoryTest.java      |  37 +-
 .../junit/BaseWebDriverContainerTest.java     |  22 +-
 .../junit/BrowserWebDriverContainerTest.java  |  18 +-
 ...ChromeRecordingWebDriverContainerTest.java | 102 +--
 .../junit/ChromeWebDriverContainerTest.java   |   2 +-
 .../ContainerWithoutCapabilitiesTest.java     |   7 +-
 ...stomWaitTimeoutWebDriverContainerTest.java |   5 +-
 .../junit/FirefoxWebDriverContainerTest.java  |   4 +-
 .../LocalServerWebDriverContainerTest.java    |   8 +-
 .../junit/SeleniumStartTest.java              |  14 +-
 .../junit/SeleniumUtilsTest.java              |   2 -
 ...ecificImageNameWebDriverContainerTest.java |   5 +-
 .../containers/SolrClientUtils.java           |  49 +-
 .../containers/SolrClientUtilsException.java  |   1 +
 .../containers/SolrContainer.java             |  23 +-
 .../SolrContainerConfiguration.java           |   8 +-
 .../containers/SolrContainerTest.java         |  15 +-
 .../spock/SpockTestDescription.groovy         |  36 +-
 .../spock/Testcontainers.groovy               |   1 -
 .../spock/TestcontainersExtension.groovy      |  42 +-
 .../TestcontainersMethodInterceptor.groovy    | 224 +++---
 .../spock/ComposeContainerIT.groovy           |  34 +-
 .../spock/MySqlContainerIT.groovy             |  14 +-
 .../spock/PostgresContainerIT.groovy          |  56 +-
 .../spock/SharedComposeContainerIT.groovy     |  36 +-
 .../spock/SpockTestImages.groovy              |   8 +-
 .../spock/TestHierarchyIT.groovy              |  22 +-
 .../TestLifecycleAwareContainerMock.java      |  10 +-
 .../spock/TestLifecycleAwareIT.groovy         |  57 +-
 ...TestcontainersRestartBetweenTestsIT.groovy |  29 +-
 .../TestcontainersSharedContainerIT.groovy    |  61 +-
 .../containers/ToxiproxyContainer.java        |  50 +-
 .../containers/ToxiproxyTest.java             |  78 +-
 .../containers/TrinoContainer.java            |  17 +-
 .../containers/TrinoContainerProvider.java    |   1 +
 .../containers/TrinoContainerTest.java        |  38 +-
 .../jdbc/trino/TrinoJDBCDriverTest.java       |  12 +-
 .../testcontainers/vault/VaultContainer.java  |  46 +-
 .../testcontainers/vault/VaultLogLevel.java   |   6 +-
 .../testcontainers/vault/VaultClientTest.java |  20 +-
 .../vault/VaultContainerTest.java             |  74 +-
 .../org/testcontainers/testsupport/Flaky.java |  10 +-
 .../testsupport/FlakyTestJUnit4RetryRule.java |  14 +-
 .../testsupport/FlakyRuleTest.java            |  60 +-
 458 files changed, 8766 insertions(+), 5973 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index b93d26d98bb..6d0df9a3c21 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -16,5 +16,6 @@ jobs:
             -v "$HOME:$HOME" \
             -v "$PWD:$PWD" \
             -w "$PWD" \
+            -e AUTO_APPLY_GIT_HOOKS=false \
             openjdk:8-jdk-alpine \
             ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
diff --git a/build.gradle b/build.gradle
index adbd1a47c4a..1458b3db027 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,13 @@
 buildscript {
     repositories {
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
         classpath 'com.google.guava:guava:30.1.1-jre'
+        classpath 'com.github.kiview:captain-hook:76a1c11a16'
     }
 }
 
@@ -17,6 +19,12 @@ plugins {
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
+apply plugin: 'com.github.tjni.captainhook'
+
+captainHook {
+    autoApplyGitHooks = Boolean.valueOf(System.getenv("AUTO_APPLY_GIT_HOOKS"))
+    preCommit = './gradlew spotlessApply'
+}
 
 subprojects {
     apply plugin: 'java-library'
@@ -110,8 +118,8 @@ subprojects {
     }
 
     spotless {
-        enforceCheck false
         java {
+            toggleOffOn()
             removeUnusedImports()
             trimTrailingWhitespace()
             endWithNewline()
@@ -134,6 +142,5 @@ subprojects {
     checkstyle {
         toolVersion = "9.3"
         configFile = rootProject.file('config/checkstyle/checkstyle.xml')
-        ignoreFailures = true
     }
 }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 39598dae2e4..ccb8367404c 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -11,8 +11,12 @@
                       LITERAL_FOR,
                       LITERAL_IF,
                       LITERAL_WHILE,
-                      LITERAL_CASE,
-                      LITERAL_DEFAULT,
+                      "
+            />
+        </module>
+        <module name="NeedBraces">
+            <property name="tokens"
+                      value="
                       LAMBDA,
                       "
             />
diff --git a/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java b/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java
index d6043422640..ae92aa371b0 100644
--- a/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java
@@ -5,8 +5,7 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
-import static java.util.Collections.emptyMap;
+import java.util.Collections;
 
 public abstract class AbstractJarFileTest {
 
@@ -16,7 +15,7 @@ public abstract class AbstractJarFileTest {
         try {
             Path jarFilePath = Paths.get(System.getProperty("jarFile"));
             URI jarFileUri = new URI("jar", jarFilePath.toUri().toString(), null);
-            FileSystem fileSystem = FileSystems.newFileSystem(jarFileUri, emptyMap());
+            FileSystem fileSystem = FileSystems.newFileSystem(jarFileUri, Collections.emptyMap());
             root = fileSystem.getPath("/");
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index 4cf7b3a9e9f..99fd1359c85 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -13,34 +13,26 @@ public class JarFileShadingTest extends AbstractJarFileTest {
 
     @Test
     public void testPackages() throws Exception {
-        assertThatFileList(root).containsOnly(
-                "org",
-                "META-INF"
-        );
-
-        assertThatFileList(root.resolve("org")).containsOnly(
-                "testcontainers"
-        );
+        assertThatFileList(root).containsOnly("org", "META-INF");
+
+        assertThatFileList(root.resolve("org")).containsOnly("testcontainers");
     }
 
     @Test
     public void testMetaInf() throws Exception {
-        assertThatFileList(root.resolve("META-INF")).containsOnly(
-                "MANIFEST.MF",
-                "services"
-        );
+        assertThatFileList(root.resolve("META-INF")).containsOnly("MANIFEST.MF", "services");
     }
 
     @Test
     public void testMetaInfServices() throws Exception {
         assertThatFileList(root.resolve("META-INF").resolve("services"))
-                .allMatch(it -> it.startsWith("org.testcontainers."));
+            .allMatch(it -> it.startsWith("org.testcontainers."));
     }
 
     private ListAssert<String> assertThatFileList(Path path) throws IOException {
         return (ListAssert) assertThat(Files.list(path))
-                .extracting(Path::getFileName)
-                .extracting(Path::toString)
-                .extracting(it -> it.endsWith("/") ? it.substring(0, it.length() - 1) : it);
+            .extracting(Path::getFileName)
+            .extracting(Path::toString)
+            .extracting(it -> it.endsWith("/") ? it.substring(0, it.length() - 1) : it);
     }
 }
diff --git a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
index 208c8702654..77156e77636 100644
--- a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
@@ -37,6 +37,7 @@
 public class PublicBinaryAPITest extends AbstractJarFileTest {
 
     private static String SHADED_PACKAGE = "org.testcontainers.shaded.";
+
     private static String SHADED_PACKAGE_PATH = SHADED_PACKAGE.replaceAll("\\.", "/");
 
     static {
@@ -49,36 +50,38 @@ public class PublicBinaryAPITest extends AbstractJarFileTest {
     public static List<Object[]> data() throws Exception {
         List<Object[]> result = new ArrayList<>();
 
-        Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
-
-            @Override
-            public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
-                String fileName = path.toString();
+        Files.walkFileTree(
+            root,
+            new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
+                    String fileName = path.toString();
 
-                if (!fileName.endsWith(".class")) {
-                    return super.visitFile(path, attrs);
-                }
+                    if (!fileName.endsWith(".class")) {
+                        return super.visitFile(path, attrs);
+                    }
 
-                if (!fileName.startsWith("/org/testcontainers/") ) {
-                     return super.visitFile(path, attrs);
-                }
+                    if (!fileName.startsWith("/org/testcontainers/")) {
+                        return super.visitFile(path, attrs);
+                    }
 
-                if (fileName.startsWith("/" + SHADED_PACKAGE_PATH)) {
-                    return super.visitFile(path, attrs);
-                }
+                    if (fileName.startsWith("/" + SHADED_PACKAGE_PATH)) {
+                        return super.visitFile(path, attrs);
+                    }
 
-                try(InputStream inputStream = Files.newInputStream(path)) {
-                    ClassReader reader = new ClassReader(inputStream);
-                    ClassNode node = new ClassNode();
-                    reader.accept(node, ClassReader.SKIP_CODE);
-                    if ((node.access & Opcodes.ACC_PUBLIC) != 0) {
-                        result.add(new Object[]{ fileName, node });
+                    try (InputStream inputStream = Files.newInputStream(path)) {
+                        ClassReader reader = new ClassReader(inputStream);
+                        ClassNode node = new ClassNode();
+                        reader.accept(node, ClassReader.SKIP_CODE);
+                        if ((node.access & Opcodes.ACC_PUBLIC) != 0) {
+                            result.add(new Object[] { fileName, node });
+                        }
                     }
-                }
 
-                return super.visitFile(path, attrs);
+                    return super.visitFile(path, attrs);
+                }
             }
-        });
+        );
         return result;
     }
 
@@ -100,39 +103,36 @@ public void setUp() {
 
     @Test
     public void testSuperClass() {
-        assertThat(classNode.superName)
-                .doesNotStartWith(SHADED_PACKAGE_PATH);
+        assertThat(classNode.superName).doesNotStartWith(SHADED_PACKAGE_PATH);
     }
 
     @Test
     public void testInterfaces() {
-        assertThat(classNode.interfaces)
-                .allSatisfy(it -> assertThat(it).doesNotStartWith(SHADED_PACKAGE_PATH));
+        assertThat(classNode.interfaces).allSatisfy(it -> assertThat(it).doesNotStartWith(SHADED_PACKAGE_PATH));
     }
 
     @Test
     public void testMethodReturnTypes() {
         assertThat(classNode.methods)
-                .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
-                .allSatisfy(it -> assertThat(Type.getReturnType(it.desc).getClassName()).doesNotStartWith(SHADED_PACKAGE));
+            .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
+            .allSatisfy(it -> assertThat(Type.getReturnType(it.desc).getClassName()).doesNotStartWith(SHADED_PACKAGE));
     }
 
     @Test
     public void testMethodArguments() {
         assertThat(classNode.methods)
-                .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
-                .allSatisfy(method -> assertThat(Arrays.asList(Type.getArgumentTypes(method.desc)))
-                        .extracting(Type::getClassName)
-                        .allSatisfy(it -> assertThat(it).doesNotStartWith(SHADED_PACKAGE))
-                );
+            .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
+            .allSatisfy(method -> {
+                assertThat(Arrays.asList(Type.getArgumentTypes(method.desc)))
+                    .extracting(Type::getClassName)
+                    .allSatisfy(it -> assertThat(it).doesNotStartWith(SHADED_PACKAGE));
+            });
     }
 
     @Test
     public void testFields() {
         assertThat(classNode.fields)
-                .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
-                .allSatisfy(it -> assertThat(Type.getType(it.desc).getClassName())
-                        .doesNotStartWith(SHADED_PACKAGE)
-                );
+            .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
+            .allSatisfy(it -> assertThat(Type.getType(it.desc).getClassName()).doesNotStartWith(SHADED_PACKAGE));
     }
 }
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index c1e999d392a..04c20236763 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -51,16 +51,17 @@
 public class DockerClientFactory {
 
     public static final ThreadGroup TESTCONTAINERS_THREAD_GROUP = new ThreadGroup("testcontainers");
+
     public static final String TESTCONTAINERS_LABEL = DockerClientFactory.class.getPackage().getName();
+
     public static final String TESTCONTAINERS_SESSION_ID_LABEL = TESTCONTAINERS_LABEL + ".sessionId";
 
     public static final String SESSION_ID = UUID.randomUUID().toString();
 
-    public static final Map<String, String> DEFAULT_LABELS = ImmutableMap.of(
-            TESTCONTAINERS_LABEL, "true"
-    );
+    public static final Map<String, String> DEFAULT_LABELS = ImmutableMap.of(TESTCONTAINERS_LABEL, "true");
 
     private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
+
     private static DockerClientFactory instance;
 
     // Cached client configuration
@@ -79,9 +80,7 @@ public class DockerClientFactory {
     private final boolean fileMountingSupported = checkMountableFile();
 
     @VisibleForTesting
-    DockerClientFactory() {
-
-    }
+    DockerClientFactory() {}
 
     public static DockerClient lazyClient() {
         return new DockerClientDelegate() {
@@ -102,7 +101,7 @@ public String toString() {
      *
      * @return the singleton instance of DockerClientFactory
      */
-    public synchronized static DockerClientFactory instance() {
+    public static synchronized DockerClientFactory instance() {
         if (instance == null) {
             instance = new DockerClientFactory();
         }
@@ -112,6 +111,7 @@ public synchronized static DockerClientFactory instance() {
 
     /**
      * Checks whether Docker is accessible and {@link #client()} is able to produce a client.
+     *
      * @return true if Docker is available, false if not.
      */
     public synchronized boolean isDockerAvailable() {
@@ -149,16 +149,11 @@ public String getRemoteDockerUnixSocketPath() {
         }
 
         URI dockerHost = getTransportConfig().getDockerHost();
-        String path = "unix".equals(dockerHost.getScheme())
-            ? dockerHost.getRawPath()
-            : "/var/run/docker.sock";
-        return SystemUtils.IS_OS_WINDOWS
-               ? "/" + path
-               : path;
+        String path = "unix".equals(dockerHost.getScheme()) ? dockerHost.getRawPath() : "/var/run/docker.sock";
+        return SystemUtils.IS_OS_WINDOWS ? "/" + path : path;
     }
 
     /**
-     *
      * @return a new initialized Docker client
      */
     @Synchronized
@@ -175,16 +170,16 @@ public DockerClient client() {
 
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
-        client = new DockerClientDelegate() {
-
-            @Getter
-            final DockerClient dockerClient = strategy.getDockerClient();
+        client =
+            new DockerClientDelegate() {
+                @Getter
+                final DockerClient dockerClient = strategy.getDockerClient();
 
-            @Override
-            public void close() {
-                throw new IllegalStateException("You should never close the global DockerClient!");
-            }
-        };
+                @Override
+                public void close() {
+                    throw new IllegalStateException("You should never close the global DockerClient!");
+                }
+            };
         log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
 
         Info dockerInfo = strategy.getInfo();
@@ -192,11 +187,22 @@ public void close() {
         Version version = client.versionCmd().exec();
         log.debug("Docker version: {}", version.getRawValues());
         activeApiVersion = version.getApiVersion();
-        log.info("Connected to docker: \n" +
-                "  Server Version: " + dockerInfo.getServerVersion() + "\n" +
-                "  API Version: " + activeApiVersion + "\n" +
-                "  Operating System: " + dockerInfo.getOperatingSystem() + "\n" +
-                "  Total Memory: " + dockerInfo.getMemTotal() / (1024 * 1024) + " MB");
+        log.info(
+            "Connected to docker: \n" +
+            "  Server Version: " +
+            dockerInfo.getServerVersion() +
+            "\n" +
+            "  API Version: " +
+            activeApiVersion +
+            "\n" +
+            "  Operating System: " +
+            dockerInfo.getOperatingSystem() +
+            "\n" +
+            "  Total Memory: " +
+            dockerInfo.getMemTotal() /
+            (1024 * 1024) +
+            " MB"
+        );
 
         try {
             //noinspection deprecation
@@ -225,7 +231,8 @@ public void close() {
     }
 
     private void checkDockerVersion(String dockerVersion) {
-        boolean versionIsSufficient = new ComparableVersion(dockerVersion).compareTo(new ComparableVersion("1.6.0")) >= 0;
+        boolean versionIsSufficient = new ComparableVersion(dockerVersion).compareTo(new ComparableVersion("1.6.0")) >=
+        0;
         check("Docker server version should be at least 1.6.0", versionIsSufficient);
     }
 
@@ -241,14 +248,22 @@ private void check(String message, boolean isSuccessful) {
     private boolean checkMountableFile() {
         DockerClient dockerClient = client();
 
-        MountableFile mountableFile = MountableFile.forClasspathResource(ResourceReaper.class.getName().replace(".", "/") + ".class");
+        MountableFile mountableFile = MountableFile.forClasspathResource(
+            ResourceReaper.class.getName().replace(".", "/") + ".class"
+        );
 
         Volume volume = new Volume("/dummy");
         try {
             return runInsideDocker(
-                createContainerCmd -> createContainerCmd.withBinds(new Bind(mountableFile.getResolvedPath(), volume, AccessMode.ro)),
+                createContainerCmd -> {
+                    createContainerCmd.withBinds(new Bind(mountableFile.getResolvedPath(), volume, AccessMode.ro));
+                },
                 (__, containerId) -> {
-                    try (InputStream stream = dockerClient.copyArchiveFromContainerCmd(containerId, volume.getPath()).exec()) {
+                    try (
+                        InputStream stream = dockerClient
+                            .copyArchiveFromContainerCmd(containerId, volume.getPath())
+                            .exec()
+                    ) {
                         stream.read();
                         return true;
                     } catch (Exception e) {
@@ -293,16 +308,22 @@ public String dockerHostIpAddress() {
         return getOrInitializeStrategy().getDockerHostIpAddress();
     }
 
-    public <T> T runInsideDocker(Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
+    public <T> T runInsideDocker(
+        Consumer<CreateContainerCmd> createContainerCmdConsumer,
+        BiFunction<DockerClient, String, T> block
+    ) {
         return runInsideDocker(TINY_IMAGE, createContainerCmdConsumer, block);
     }
 
-    <T> T runInsideDocker(DockerImageName imageName, Consumer<CreateContainerCmd> createContainerCmdConsumer, BiFunction<DockerClient, String, T> block) {
+    <T> T runInsideDocker(
+        DockerImageName imageName,
+        Consumer<CreateContainerCmd> createContainerCmdConsumer,
+        BiFunction<DockerClient, String, T> block
+    ) {
         RemoteDockerImage dockerImage = new RemoteDockerImage(imageName);
         HashMap<String, String> labels = new HashMap<>(DEFAULT_LABELS);
         labels.putAll(ResourceReaper.instance().getLabels());
-        CreateContainerCmd createContainerCmd = client.createContainerCmd(dockerImage.get())
-                .withLabels(labels);
+        CreateContainerCmd createContainerCmd = client.createContainerCmd(dockerImage.get()).withLabels(labels);
         createContainerCmdConsumer.accept(createContainerCmd);
         String id = createContainerCmd.exec().getId();
 
diff --git a/core/src/main/java/org/testcontainers/Testcontainers.java b/core/src/main/java/org/testcontainers/Testcontainers.java
index 0f83725c55b..ab567e1fda7 100644
--- a/core/src/main/java/org/testcontainers/Testcontainers.java
+++ b/core/src/main/java/org/testcontainers/Testcontainers.java
@@ -1,12 +1,11 @@
 package org.testcontainers;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 import lombok.experimental.UtilityClass;
-
 import org.testcontainers.containers.PortForwardingContainer;
 
+import java.util.Map;
+import java.util.Map.Entry;
+
 @UtilityClass
 public class Testcontainers {
 
@@ -15,10 +14,10 @@ public void exposeHostPorts(int... ports) {
             PortForwardingContainer.INSTANCE.exposeHostPort(port);
         }
     }
-    
+
     public void exposeHostPorts(Map<Integer, Integer> ports) {
-    	for(Entry<Integer, Integer> entry : ports.entrySet()) {
-    		PortForwardingContainer.INSTANCE.exposeHostPort(entry.getKey(), entry.getValue());
-    	}
+        for (Entry<Integer, Integer> entry : ports.entrySet()) {
+            PortForwardingContainer.INSTANCE.exposeHostPort(entry.getKey(), entry.getValue());
+        }
     }
 }
diff --git a/core/src/main/java/org/testcontainers/UnstableAPI.java b/core/src/main/java/org/testcontainers/UnstableAPI.java
index 21fd2c3176c..01221738dd4 100644
--- a/core/src/main/java/org/testcontainers/UnstableAPI.java
+++ b/core/src/main/java/org/testcontainers/UnstableAPI.java
@@ -11,11 +11,7 @@
  * a stable API.
  */
 @Retention(RetentionPolicy.SOURCE)
-@Target({
-    ElementType.TYPE,
-    ElementType.METHOD,
-    ElementType.FIELD,
-})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Documented
 public @interface UnstableAPI {
 }
diff --git a/core/src/main/java/org/testcontainers/containers/BindMode.java b/core/src/main/java/org/testcontainers/containers/BindMode.java
index 579dc4d5eca..5fc9c610165 100644
--- a/core/src/main/java/org/testcontainers/containers/BindMode.java
+++ b/core/src/main/java/org/testcontainers/containers/BindMode.java
@@ -6,7 +6,8 @@
  * Possible modes for binding storage volumes.
  */
 public enum BindMode {
-    READ_ONLY(AccessMode.ro), READ_WRITE(AccessMode.rw);
+    READ_ONLY(AccessMode.ro),
+    READ_WRITE(AccessMode.rw);
 
     public final AccessMode accessMode;
 
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java b/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
index fbb2a7cee6e..81525710700 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeServiceWaitStrategyTarget.java
@@ -13,7 +13,6 @@
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * Class to provide a wait strategy target for services started through docker-compose
  */
@@ -21,15 +20,23 @@
 class ComposeServiceWaitStrategyTarget implements WaitStrategyTarget {
 
     private final Container container;
+
     private final GenericContainer proxyContainer;
+
     private final DockerClient dockerClient;
+
     @NonNull
     private Map<Integer, Integer> mappedPorts;
-    @Getter(lazy=true)
+
+    @Getter(lazy = true)
     private final InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(getContainerId()).exec();
 
-    ComposeServiceWaitStrategyTarget(DockerClient dockerClient, Container container, GenericContainer proxyContainer,
-                                     @NonNull Map<Integer, Integer> mappedPorts) {
+    ComposeServiceWaitStrategyTarget(
+        DockerClient dockerClient,
+        Container container,
+        GenericContainer proxyContainer,
+        @NonNull Map<Integer, Integer> mappedPorts
+    ) {
         this.dockerClient = dockerClient;
         this.container = container;
         this.proxyContainer = proxyContainer;
diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index 88fe4802945..7e6f492c284 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -1,17 +1,15 @@
 package org.testcontainers.containers;
 
-import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Bind;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
 import lombok.Value;
-import org.testcontainers.DockerClientFactory;
-import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.LogUtils;
 import org.testcontainers.utility.MountableFile;
@@ -25,7 +23,6 @@
 import java.util.function.Function;
 
 public interface Container<SELF extends Container<SELF>> extends LinkableContainer, ContainerState {
-
     /**
      * @return a reference to this container instance, cast to the expected generic type.
      */
@@ -40,8 +37,11 @@ default SELF self() {
     @Value
     @AllArgsConstructor(access = AccessLevel.MODULE)
     class ExecResult {
+
         int exitCode;
+
         String stdout;
+
         String stderr;
     }
 
@@ -298,7 +298,11 @@ default SELF withEnv(String key, Function<Optional<String>, String> mapper) {
      * @param mode          access mode for the file
      * @return this
      */
-    default SELF withClasspathResourceMapping(final String resourcePath, final String containerPath, final BindMode mode) {
+    default SELF withClasspathResourceMapping(
+        final String resourcePath,
+        final String containerPath,
+        final BindMode mode
+    ) {
         withClasspathResourceMapping(resourcePath, containerPath, mode, SelinuxContext.NONE);
         return self();
     }
@@ -313,7 +317,12 @@ default SELF withClasspathResourceMapping(final String resourcePath, final Strin
      * @param selinuxContext selinux context argument to use for this file
      * @return this
      */
-    SELF withClasspathResourceMapping(String resourcePath, String containerPath, BindMode mode, SelinuxContext selinuxContext);
+    SELF withClasspathResourceMapping(
+        String resourcePath,
+        String containerPath,
+        BindMode mode,
+        SelinuxContext selinuxContext
+    );
 
     /**
      * Set the duration of waiting time until container treated as started.
@@ -403,7 +412,6 @@ default void followOutput(Consumer<OutputFrame> consumer, OutputFrame.OutputType
         LogUtils.followOutput(getDockerClient(), getContainerId(), consumer, types);
     }
 
-
     /**
      * Attach an output consumer at container startup, enabling stdout and stderr to be followed, waited on, etc.
      * <p>
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerFetchException.java b/core/src/main/java/org/testcontainers/containers/ContainerFetchException.java
index 66aa1a493b0..66414434786 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerFetchException.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerFetchException.java
@@ -4,6 +4,7 @@
  * Created by rnorth on 15/10/2015.
  */
 public class ContainerFetchException extends RuntimeException {
+
     public ContainerFetchException(String s, Exception e) {
         super(s, e);
     }
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 51eb4daddde..b82b5448d2f 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -37,7 +37,6 @@
 import java.util.stream.Collectors;
 
 public interface ContainerState {
-
     String STATE_HEALTHY = "healthy";
 
     /**
@@ -109,7 +108,9 @@ default boolean isHealthy() {
             InspectContainerResponse inspectContainerResponse = getCurrentContainerInfo();
             HealthState health = inspectContainerResponse.getState().getHealth();
             if (health == null) {
-                throw new RuntimeException("This container's image does not have a healthcheck declared, so health cannot be determined. Either amend the image or use another approach to determine whether containers are healthy.");
+                throw new RuntimeException(
+                    "This container's image does not have a healthcheck declared, so health cannot be determined. Either amend the image or use another approach to determine whether containers are healthy."
+                );
             }
 
             return STATE_HEALTHY.equals(health.getStatus());
@@ -145,7 +146,10 @@ default Integer getFirstMappedPort() {
      * @return the port that the exposed port is mapped to, or null if it is not exposed
      */
     default Integer getMappedPort(int originalPort) {
-        Preconditions.checkState(this.getContainerId() != null, "Mapped port can only be obtained after the container is started");
+        Preconditions.checkState(
+            this.getContainerId() != null,
+            "Mapped port can only be obtained after the container is started"
+        );
 
         Ports.Binding[] binding = new Ports.Binding[0];
         final InspectContainerResponse containerInfo = this.getContainerInfo();
@@ -183,7 +187,8 @@ default List<String> getPortBindings() {
      * @return the bound port numbers
      */
     default List<Integer> getBoundPortNumbers() {
-        return getPortBindings().stream()
+        return getPortBindings()
+            .stream()
             .map(PortBinding::parse)
             .map(PortBinding::getBinding)
             .map(Ports.Binding::getHostPortSpec)
@@ -194,7 +199,6 @@ default List<Integer> getBoundPortNumbers() {
             .collect(Collectors.toList());
     }
 
-
     /**
      * @return all log output from the container from start until the current instant (both stdout and stderr)
      */
@@ -228,7 +232,8 @@ default String getContainerId() {
      * <p>
      * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, String...)
      */
-    default Container.ExecResult execInContainer(String... command) throws UnsupportedOperationException, IOException, InterruptedException {
+    default Container.ExecResult execInContainer(String... command)
+        throws UnsupportedOperationException, IOException, InterruptedException {
         return execInContainer(StandardCharsets.UTF_8, command);
     }
 
@@ -237,7 +242,8 @@ default Container.ExecResult execInContainer(String... command) throws Unsupport
      * <p>
      * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, Charset, String...)
      */
-    default Container.ExecResult execInContainer(Charset outputCharset, String... command) throws UnsupportedOperationException, IOException, InterruptedException {
+    default Container.ExecResult execInContainer(Charset outputCharset, String... command)
+        throws UnsupportedOperationException, IOException, InterruptedException {
         return ExecInContainerPattern.execInContainer(getDockerClient(), getContainerInfo(), outputCharset, command);
     }
 
@@ -253,7 +259,9 @@ default void copyFileToContainer(MountableFile mountableFile, String containerPa
 
         if (containerPath.endsWith("/") && sourceFile.isFile()) {
             final Logger logger = LoggerFactory.getLogger(GenericContainer.class);
-            logger.warn("folder-like containerPath in copyFileToContainer is deprecated, please explicitly specify a file path");
+            logger.warn(
+                "folder-like containerPath in copyFileToContainer is deprecated, please explicitly specify a file path"
+            );
             copyFileToContainer((Transferable) mountableFile, containerPath + sourceFile.getName());
         } else {
             copyFileToContainer((Transferable) mountableFile, containerPath);
@@ -299,13 +307,17 @@ default void copyFileToContainer(Transferable transferable, String containerPath
      * @throws IOException if there's an issue communicating with Docker or receiving entry from TarArchiveInputStream
      * @throws InterruptedException if the thread waiting for the response is interrupted
      */
-    default void copyFileFromContainer(String containerPath, String destinationPath) throws IOException, InterruptedException {
-        copyFileFromContainer(containerPath, inputStream -> {
-            try(FileOutputStream output = new FileOutputStream(destinationPath)) {
-                IOUtils.copy(inputStream, output);
-                return null;
+    default void copyFileFromContainer(String containerPath, String destinationPath)
+        throws IOException, InterruptedException {
+        copyFileFromContainer(
+            containerPath,
+            inputStream -> {
+                try (FileOutputStream output = new FileOutputStream(destinationPath)) {
+                    IOUtils.copy(inputStream, output);
+                    return null;
+                }
             }
-        });
+        );
     }
 
     /**
@@ -315,7 +327,7 @@ default void copyFileFromContainer(String containerPath, String destinationPath)
      * @param function function that takes InputStream of the copied file
      */
     @SneakyThrows
-    default  <T> T copyFileFromContainer(String containerPath, ThrowingFunction<InputStream, T> function) {
+    default <T> T copyFileFromContainer(String containerPath, ThrowingFunction<InputStream, T> function) {
         if (getContainerId() == null) {
             throw new IllegalStateException("copyFileFromContainer can only be used when the Container is created.");
         }
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 6f0a3a086b6..86a98586c7f 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -6,7 +6,9 @@
 import com.github.dockerjava.transport.SSLConfig;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Uninterruptibles;
@@ -57,42 +59,52 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
-import static org.testcontainers.containers.BindMode.READ_WRITE;
-
 /**
  * Container which launches Docker Compose, for the purposes of launching a defined set of containers.
  */
 @Slf4j
-public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> extends FailureDetectingExternalResource implements Startable {
+public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
+    extends FailureDetectingExternalResource
+    implements Startable {
 
     /**
      * Random identifier which will become part of spawned containers names, so we can shut them down
      */
     private final String identifier;
+
     private final List<File> composeFiles;
+
     private DockerComposeFiles dockerComposeFiles;
+
     private final Map<String, Integer> scalingPreferences = new HashMap<>();
+
     private DockerClient dockerClient;
+
     private boolean localCompose;
+
     private boolean pull = true;
+
     private boolean build = false;
+
     private Set<String> options = new HashSet<>();
+
     private boolean tailChildContainers;
 
     private String project;
 
     private final AtomicInteger nextAmbassadorPort = new AtomicInteger(2000);
+
     private final Map<String, Map<Integer, Integer>> ambassadorPortMappings = new ConcurrentHashMap<>();
+
     private final Map<String, ComposeServiceWaitStrategyTarget> serviceInstanceMap = new ConcurrentHashMap<>();
+
     private final Map<String, WaitAllStrategy> waitStrategyMap = new ConcurrentHashMap<>();
+
     private final SocatContainer ambassadorContainer = new SocatContainer();
+
     private final Map<String, List<Consumer<OutputFrame>>> logConsumers = new ConcurrentHashMap<>();
 
     private static final Object MUTEX = new Object();
@@ -104,6 +116,7 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
      * necessarily to containers that are spawned by Compose itself)
      */
     private Map<String, String> env = new HashMap<>();
+
     private RemoveImages removeImages;
 
     @Deprecated
@@ -148,13 +161,11 @@ public void starting(Description description) {
 
     @Override
     @Deprecated
-    protected void succeeded(Description description) {
-    }
+    protected void succeeded(Description description) {}
 
     @Override
     @Deprecated
-    protected void failed(Throwable e, Description description) {
-    }
+    protected void failed(Throwable e, Description description) {}
 
     @Override
     @Deprecated
@@ -183,15 +194,23 @@ private void pullImages() {
         // Pull images using our docker client rather than compose itself,
         // (a) as a workaround for https://github.com/docker/compose/issues/5854, which prevents authenticated image pulls being possible when credential helpers are in use
         // (b) so that credential helper-based auth still works when compose is running from within a container
-        dockerComposeFiles.getDependencyImages()
+        dockerComposeFiles
+            .getDependencyImages()
             .forEach(imageName -> {
                 try {
-                    log.info("Preemptively checking local images for '{}', referenced via a compose file or transitive Dockerfile. If not available, it will be pulled.", imageName);
+                    log.info(
+                        "Preemptively checking local images for '{}', referenced via a compose file or transitive Dockerfile. If not available, it will be pulled.",
+                        imageName
+                    );
                     new RemoteDockerImage(DockerImageName.parse(imageName))
                         .withImageNameSubstitutor(ImageNameSubstitutor.noop())
                         .get();
                 } catch (Exception e) {
-                    log.warn("Unable to pre-fetch an image ({}) depended upon by Docker Compose build - startup will continue but may fail. Exception message was: {}", imageName, e.getMessage());
+                    log.warn(
+                        "Unable to pre-fetch an image ({}) depended upon by Docker Compose build - startup will continue but may fail. Exception message was: {}",
+                        imageName,
+                        e.getMessage()
+                    );
                 }
             });
     }
@@ -203,18 +222,21 @@ public SELF withServices(@NonNull String... services) {
 
     private void createServices() {
         // services that have been explicitly requested to be started. If empty, all services should be started.
-        final String serviceNameArgs = Stream.concat(
-            services.stream(),                      // services that have been specified with `withServices`
-            scalingPreferences.keySet().stream()    // services that are implicitly needed via `withScaledService`
-        )
+        final String serviceNameArgs = Stream
+            .concat(
+                services.stream(), // services that have been specified with `withServices`
+                scalingPreferences.keySet().stream() // services that are implicitly needed via `withScaledService`
+            )
             .distinct()
-            .collect(joining(" "));
+            .collect(Collectors.joining(" "));
 
         // Apply scaling for the services specified using `withScaledService`
-        final String scalingOptions = scalingPreferences.entrySet().stream()
+        final String scalingOptions = scalingPreferences
+            .entrySet()
+            .stream()
             .map(entry -> "--scale " + entry.getKey() + "=" + entry.getValue())
             .distinct()
-            .collect(joining(" "));
+            .collect(Collectors.joining(" "));
 
         String command = optionsAsString() + "up -d";
 
@@ -222,11 +244,11 @@ private void createServices() {
             command += " --build";
         }
 
-        if (!isNullOrEmpty(scalingOptions)) {
+        if (!Strings.isNullOrEmpty(scalingOptions)) {
             command += " " + scalingOptions;
         }
 
-        if (!isNullOrEmpty(serviceNameArgs)) {
+        if (!Strings.isNullOrEmpty(serviceNameArgs)) {
             command += " " + serviceNameArgs;
         }
 
@@ -235,10 +257,8 @@ private void createServices() {
     }
 
     private String optionsAsString() {
-        String optionsString = options
-            .stream()
-            .collect(joining(" "));
-        if (optionsString.length() !=0 ) {
+        String optionsString = options.stream().collect(Collectors.joining(" "));
+        if (optionsString.length() != 0) {
             // ensures that there is a space between the options and 'up' if options are passed.
             return optionsString + " ";
         } else {
@@ -252,15 +272,17 @@ private void waitUntilServiceStarted() {
 
         Set<String> servicesToWaitFor = waitStrategyMap.keySet();
         Set<String> instantiatedServices = serviceInstanceMap.keySet();
-        Sets.SetView<String> missingServiceInstances =
-            Sets.difference(servicesToWaitFor, instantiatedServices);
+        Sets.SetView<String> missingServiceInstances = Sets.difference(servicesToWaitFor, instantiatedServices);
 
         if (!missingServiceInstances.isEmpty()) {
             throw new IllegalStateException(
-                "Services named " + missingServiceInstances + " " +
-                    "do not exist, but wait conditions have been defined " +
-                    "for them. This might mean that you misspelled " +
-                    "the service name when defining the wait condition.");
+                "Services named " +
+                missingServiceInstances +
+                " " +
+                "do not exist, but wait conditions have been defined " +
+                "for them. This might mean that you misspelled " +
+                "the service name when defining the wait condition."
+            );
         }
 
         serviceInstanceMap.forEach(this::waitUntilServiceStarted);
@@ -268,15 +290,21 @@ private void waitUntilServiceStarted() {
 
     private void createServiceInstance(Container container) {
         String serviceName = getServiceNameFromContainer(container);
-        final ComposeServiceWaitStrategyTarget containerInstance = new ComposeServiceWaitStrategyTarget(dockerClient, container,
-            ambassadorContainer, ambassadorPortMappings.getOrDefault(serviceName, new HashMap<>()));
+        final ComposeServiceWaitStrategyTarget containerInstance = new ComposeServiceWaitStrategyTarget(
+            dockerClient,
+            container,
+            ambassadorContainer,
+            ambassadorPortMappings.getOrDefault(serviceName, new HashMap<>())
+        );
 
         String containerId = containerInstance.getContainerId();
         if (tailChildContainers) {
             followLogs(containerId, new Slf4jLogConsumer(log).withPrefix(container.getNames()[0]));
         }
         //follow logs using registered consumers for this service
-        logConsumers.getOrDefault(serviceName, Collections.emptyList()).forEach(consumer -> followLogs(containerId, consumer));
+        logConsumers
+            .getOrDefault(serviceName, Collections.emptyList())
+            .forEach(consumer -> followLogs(containerId, consumer));
         serviceInstanceMap.putIfAbsent(serviceName, containerInstance);
     }
 
@@ -294,8 +322,8 @@ private String getServiceNameFromContainer(Container container) {
     }
 
     private void runWithCompose(String cmd) {
-        checkNotNull(composeFiles);
-        checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
+        Preconditions.checkNotNull(composeFiles);
+        Preconditions.checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
 
         final DockerCompose dockerCompose;
         if (localCompose) {
@@ -304,26 +332,24 @@ private void runWithCompose(String cmd) {
             dockerCompose = new ContainerisedDockerCompose(composeFiles, project);
         }
 
-        dockerCompose
-            .withCommand(cmd)
-            .withEnv(env)
-            .invoke();
+        dockerCompose.withCommand(cmd).withEnv(env).invoke();
     }
 
     private void registerContainersForShutdown() {
-        ResourceReaper.instance().registerLabelsFilterForCleanup(Collections.singletonMap(
-            "com.docker.compose.project", project
-        ));
+        ResourceReaper
+            .instance()
+            .registerLabelsFilterForCleanup(Collections.singletonMap("com.docker.compose.project", project));
     }
 
     @VisibleForTesting
     List<Container> listChildContainers() {
-        return dockerClient.listContainersCmd()
+        return dockerClient
+            .listContainersCmd()
             .withShowAll(true)
-            .exec().stream()
-            .filter(container -> Arrays.stream(container.getNames()).anyMatch(name ->
-                name.startsWith("/" + project)))
-            .collect(toList());
+            .exec()
+            .stream()
+            .filter(container -> Arrays.stream(container.getNames()).anyMatch(name -> name.startsWith("/" + project)))
+            .collect(Collectors.toList());
     }
 
     private void startAmbassadorContainers() {
@@ -345,7 +371,6 @@ public void stop() {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
                 runWithCompose(cmd);
-
             } finally {
                 project = randomProjectId();
             }
@@ -360,12 +385,16 @@ public DockerComposeContainer withExposedService(String serviceName, int instanc
         return withExposedService(serviceName + "_" + instance, servicePort);
     }
 
-    public DockerComposeContainer withExposedService(String serviceName, int instance, int servicePort, WaitStrategy waitStrategy) {
+    public DockerComposeContainer withExposedService(
+        String serviceName,
+        int instance,
+        int servicePort,
+        WaitStrategy waitStrategy
+    ) {
         return withExposedService(serviceName + "_" + instance, servicePort, waitStrategy);
     }
 
     public SELF withExposedService(String serviceName, int servicePort, @NonNull WaitStrategy waitStrategy) {
-
         String serviceInstanceName = getServiceInstanceName(serviceName);
 
         /*
@@ -384,7 +413,9 @@ public SELF withExposedService(String serviceName, int servicePort, @NonNull Wai
 
         // Ambassador container will be started together after docker compose has started
         int ambassadorPort = nextAmbassadorPort.getAndIncrement();
-        ambassadorPortMappings.computeIfAbsent(serviceInstanceName, __ -> new ConcurrentHashMap<>()).put(servicePort, ambassadorPort);
+        ambassadorPortMappings
+            .computeIfAbsent(serviceInstanceName, __ -> new ConcurrentHashMap<>())
+            .put(servicePort, ambassadorPort);
         ambassadorContainer.withTarget(ambassadorPort, serviceInstanceName, servicePort);
         ambassadorContainer.addLink(new FutureContainer(this.project + "_" + serviceInstanceName), serviceInstanceName);
         addWaitStrategy(serviceInstanceName, waitStrategy);
@@ -405,8 +436,13 @@ private String getServiceInstanceName(String serviceName) {
      * The WaitAllStrategy uses an long timeout, because timeouts should be handled by the inner strategies.
      */
     private void addWaitStrategy(String serviceInstanceName, @NonNull WaitStrategy waitStrategy) {
-        final WaitAllStrategy waitAllStrategy = waitStrategyMap.computeIfAbsent(serviceInstanceName, __ ->
-            new WaitAllStrategy(WaitAllStrategy.Mode.WITH_MAXIMUM_OUTER_TIMEOUT).withStartupTimeout(Duration.ofMinutes(30)));
+        final WaitAllStrategy waitAllStrategy = waitStrategyMap.computeIfAbsent(
+            serviceInstanceName,
+            __ -> {
+                return new WaitAllStrategy(WaitAllStrategy.Mode.WITH_MAXIMUM_OUTER_TIMEOUT)
+                    .withStartupTimeout(Duration.ofMinutes(30));
+            }
+        );
         waitAllStrategy.withStrategy(waitStrategy);
     }
 
@@ -452,9 +488,17 @@ public Integer getServicePort(String serviceName, Integer servicePort) {
         Map<Integer, Integer> portMap = ambassadorPortMappings.get(getServiceInstanceName(serviceName));
 
         if (portMap == null) {
-            throw new IllegalArgumentException("Could not get a port for '" + serviceName + "'. " +
-                                               "Testcontainers does not have an exposed port configured for '" + serviceName + "'. " +
-                                               "To fix, please ensure that the service '" + serviceName + "' has ports exposed using .withExposedService(...)");
+            throw new IllegalArgumentException(
+                "Could not get a port for '" +
+                serviceName +
+                "'. " +
+                "Testcontainers does not have an exposed port configured for '" +
+                serviceName +
+                "'. " +
+                "To fix, please ensure that the service '" +
+                serviceName +
+                "' has ports exposed using .withExposedService(...)"
+            );
         } else {
             return ambassadorContainer.getMappedPort(portMap.get(servicePort));
         }
@@ -517,7 +561,8 @@ public SELF withTailChildContainers(boolean tailChildContainers) {
      */
     public SELF withLogConsumer(String serviceName, Consumer<OutputFrame> consumer) {
         String serviceInstanceName = getServiceInstanceName(serviceName);
-        final List<Consumer<OutputFrame>> consumers = this.logConsumers.getOrDefault(serviceInstanceName, new ArrayList<>());
+        final List<Consumer<OutputFrame>> consumers =
+            this.logConsumers.getOrDefault(serviceInstanceName, new ArrayList<>());
         consumers.add(consumer);
         this.logConsumers.putIfAbsent(serviceInstanceName, consumers);
         return self();
@@ -609,34 +654,39 @@ interface DockerCompose {
 class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
 
     public static final char UNIX_PATH_SEPERATOR = ':';
+
     public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.29.2");
 
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
-
         super(DEFAULT_IMAGE_NAME);
         addEnv(ENV_PROJECT_NAME, identifier);
 
         // Map the docker compose file into the container
         final File dockerComposeBaseFile = composeFiles.get(0);
         final String pwd = dockerComposeBaseFile.getAbsoluteFile().getParentFile().getAbsolutePath();
-        final String containerPwd =  convertToUnixFilesystemPath(pwd);
+        final String containerPwd = convertToUnixFilesystemPath(pwd);
 
-        final List<String> absoluteDockerComposeFiles = composeFiles.stream()
+        final List<String> absoluteDockerComposeFiles = composeFiles
+            .stream()
             .map(File::getAbsolutePath)
             .map(MountableFile::forHostPath)
             .map(MountableFile::getFilesystemPath)
             .map(this::convertToUnixFilesystemPath)
-            .collect(toList());
+            .collect(Collectors.toList());
         final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPERATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
         logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
         addEnv(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
-        addFileSystemBind(pwd, containerPwd, READ_WRITE);
+        addFileSystemBind(pwd, containerPwd, BindMode.READ_WRITE);
 
         // Ensure that compose can access docker. Since the container is assumed to be running on the same machine
         //  as the docker daemon, just mapping the docker control socket is OK.
         // As there seems to be a problem with mapping to the /var/run directory in certain environments (e.g. CircleCI)
         //  we map the socket file outside of /var/run, as just /docker.sock
-        addFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/docker.sock", READ_WRITE);
+        addFileSystemBind(
+            DockerClientFactory.instance().getRemoteDockerUnixSocketPath(),
+            "/docker.sock",
+            BindMode.READ_WRITE
+        );
         addEnv("DOCKER_HOST", "unix:///docker.sock");
         setStartupCheckStrategy(new IndefiniteWaitOneShotStartupCheckStrategy());
         setWorkingDirectory(containerPwd);
@@ -649,7 +699,8 @@ public void invoke() {
         this.followOutput(new Slf4jLogConsumer(logger()));
 
         // wait for the compose container to stop, which should only happen after it has spawned all the service containers
-        logger().info("Docker Compose container is running for command: {}", Joiner.on(" ").join(this.getCommandParts()));
+        logger()
+            .info("Docker Compose container is running for command: {}", Joiner.on(" ").join(this.getCommandParts()));
         while (this.isRunning()) {
             logger().trace("Compose container is still running");
             Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
@@ -658,7 +709,8 @@ public void invoke() {
 
         AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
 
-        final Integer exitCode = getDockerClient().inspectContainerCmd(getContainerId())
+        final Integer exitCode = getDockerClient()
+            .inspectContainerCmd(getContainerId())
             .exec()
             .getState()
             .getExitCode();
@@ -668,14 +720,13 @@ public void invoke() {
                 "Containerised Docker Compose exited abnormally with code " +
                 exitCode +
                 " whilst running command: " +
-                StringUtils.join(this.getCommandParts(), ' '));
+                StringUtils.join(this.getCommandParts(), ' ')
+            );
         }
     }
 
     private String convertToUnixFilesystemPath(String path) {
-        return SystemUtils.IS_OS_WINDOWS
-            ? PathUtils.createMinGWPath(path).substring(1)
-            : path;
+        return SystemUtils.IS_OS_WINDOWS ? PathUtils.createMinGWPath(path).substring(1) : path;
     }
 }
 
@@ -683,14 +734,20 @@ private String convertToUnixFilesystemPath(String path) {
  * Use local Docker Compose binary, if present.
  */
 class LocalDockerCompose implements DockerCompose {
+
     /**
      * Executable name for Docker Compose.
      */
-    private static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker-compose.exe" : "docker-compose";
+    private static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS
+        ? "docker-compose.exe"
+        : "docker-compose";
 
     private final List<File> composeFiles;
+
     private final String identifier;
+
     private String cmd = "";
+
     private Map<String, String> env = new HashMap<>();
 
     public LocalDockerCompose(List<File> composeFiles, String identifier) {
@@ -719,7 +776,9 @@ static boolean executableExists() {
     public void invoke() {
         // bail out early
         if (!executableExists()) {
-            throw new ContainerLaunchException("Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?");
+            throw new ContainerLaunchException(
+                "Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?"
+            );
         }
 
         final Map<String, String> environment = Maps.newHashMap(env);
@@ -732,18 +791,23 @@ public void invoke() {
                 environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
                 environment.put("DOCKER_TLS_VERIFY", "true");
             } else {
-                logger().warn("Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig.");
+                logger()
+                    .warn(
+                        "Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig."
+                    );
             }
         }
         String dockerHost = transportConfig.getDockerHost().toString();
         environment.put("DOCKER_HOST", dockerHost);
 
-        final Stream<String> absoluteDockerComposeFilePaths = composeFiles.stream()
+        final Stream<String> absoluteDockerComposeFilePaths = composeFiles
+            .stream()
             .map(File::getAbsolutePath)
             .map(Objects::toString);
 
         final String composeFileEnvVariableValue = absoluteDockerComposeFilePaths.collect(
-            joining(File.pathSeparator + ""));
+            Collectors.joining(File.pathSeparator + "")
+        );
         logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
 
         final File pwd = composeFiles.get(0).getAbsoluteFile().getParentFile().getAbsoluteFile();
@@ -751,12 +815,14 @@ public void invoke() {
 
         logger().info("Local Docker Compose is running command: {}", cmd);
 
-        final List<String> command = Splitter.onPattern(" ")
+        final List<String> command = Splitter
+            .onPattern(" ")
             .omitEmptyStrings()
             .splitToList(COMPOSE_EXECUTABLE + " " + cmd);
 
         try {
-            new ProcessExecutor().command(command)
+            new ProcessExecutor()
+                .command(command)
                 .redirectOutput(Slf4jStream.of(logger()).asInfo())
                 .redirectError(Slf4jStream.of(logger()).asInfo()) // docker-compose will log pull information to stderr
                 .environment(environment)
@@ -765,11 +831,13 @@ public void invoke() {
                 .executeNoTimeout();
 
             logger().info("Docker Compose has finished running");
-
         } catch (InvalidExitValueException e) {
-            throw new ContainerLaunchException("Local Docker Compose exited abnormally with code " +
-                                               e.getExitValue() + " whilst running command: " + cmd);
-
+            throw new ContainerLaunchException(
+                "Local Docker Compose exited abnormally with code " +
+                e.getExitValue() +
+                " whilst running command: " +
+                cmd
+            );
         } catch (Exception e) {
             throw new ContainerLaunchException("Error running local Docker Compose command: " + cmd, e);
         }
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java b/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
index 76754df5118..b96ebfb005e 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
@@ -33,7 +33,9 @@ private Map<String, Set<String>> mergeServiceDependencyImageNames() {
     }
 
     private Set<String> getImageNames(Map<String, Set<String>> serviceToImageNames) {
-        return serviceToImageNames.values().stream()
+        return serviceToImageNames
+            .values()
+            .stream()
             .flatMap(Collection::stream)
             // Pass through DockerImageName to convert image names to canonical form (e.g. making implicit latest tag explicit)
             .map(DockerImageName::parse)
diff --git a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
index 0858476880f..fe641618cc4 100644
--- a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
+++ b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
@@ -23,7 +23,6 @@
 @Slf4j
 public class ExecInContainerPattern {
 
-
     /**
      *
      * @deprecated use {@link #execInContainer(DockerClient, InspectContainerResponse, String...)}
@@ -40,8 +39,11 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
      * @deprecated use {@link #execInContainer(DockerClient, InspectContainerResponse, Charset, String...)}
      */
     @Deprecated
-    public Container.ExecResult execInContainer(InspectContainerResponse containerInfo, Charset outputCharset, String... command)
-        throws UnsupportedOperationException, IOException, InterruptedException {
+    public Container.ExecResult execInContainer(
+        InspectContainerResponse containerInfo,
+        Charset outputCharset,
+        String... command
+    ) throws UnsupportedOperationException, IOException, InterruptedException {
         DockerClient dockerClient = DockerClientFactory.instance().client();
         return execInContainer(dockerClient, containerInfo, outputCharset, command);
     }
@@ -55,8 +57,11 @@ public Container.ExecResult execInContainer(InspectContainerResponse containerIn
      * @param command the command to execute
      * @see #execInContainer(DockerClient, InspectContainerResponse, Charset, String...)
      */
-    public Container.ExecResult execInContainer(DockerClient dockerClient, InspectContainerResponse containerInfo, String... command)
-        throws UnsupportedOperationException, IOException, InterruptedException {
+    public Container.ExecResult execInContainer(
+        DockerClient dockerClient,
+        InspectContainerResponse containerInfo,
+        String... command
+    ) throws UnsupportedOperationException, IOException, InterruptedException {
         return execInContainer(dockerClient, containerInfo, StandardCharsets.UTF_8, command);
     }
 
@@ -74,13 +79,17 @@ public Container.ExecResult execInContainer(DockerClient dockerClient, InspectCo
      * @throws InterruptedException if the thread waiting for the response is interrupted
      * @throws UnsupportedOperationException if the docker daemon you're connecting to doesn't support "exec".
      */
-    public Container.ExecResult execInContainer(DockerClient dockerClient, InspectContainerResponse containerInfo, Charset outputCharset, String... command)
-        throws UnsupportedOperationException, IOException, InterruptedException {
+    public Container.ExecResult execInContainer(
+        DockerClient dockerClient,
+        InspectContainerResponse containerInfo,
+        Charset outputCharset,
+        String... command
+    ) throws UnsupportedOperationException, IOException, InterruptedException {
         if (!TestEnvironment.dockerExecutionDriverSupportsExec()) {
             // at time of writing, this is the expected result in CircleCI.
             throw new UnsupportedOperationException(
-                "Your docker daemon is running the \"lxc\" driver, which doesn't support \"docker exec\".");
-
+                "Your docker daemon is running the \"lxc\" driver, which doesn't support \"docker exec\"."
+            );
         }
 
         if (!isRunning(containerInfo)) {
@@ -91,8 +100,12 @@ public Container.ExecResult execInContainer(DockerClient dockerClient, InspectCo
         String containerName = containerInfo.getName();
 
         log.debug("{}: Running \"exec\" command: {}", containerName, String.join(" ", command));
-        final ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(containerId)
-            .withAttachStdout(true).withAttachStderr(true).withCmd(command).exec();
+        final ExecCreateCmdResponse execCreateCmdResponse = dockerClient
+            .execCreateCmd(containerId)
+            .withAttachStdout(true)
+            .withAttachStderr(true)
+            .withCmd(command)
+            .exec();
 
         final ToStringConsumer stdoutConsumer = new ToStringConsumer();
         final ToStringConsumer stderrConsumer = new ToStringConsumer();
@@ -108,7 +121,8 @@ public Container.ExecResult execInContainer(DockerClient dockerClient, InspectCo
         final Container.ExecResult result = new Container.ExecResult(
             exitCode,
             stdoutConsumer.toString(outputCharset),
-            stderrConsumer.toString(outputCharset));
+            stderrConsumer.toString(outputCharset)
+        );
 
         log.trace("{}: stdout: {}", containerName, result.getStdout());
         log.trace("{}: stderr: {}", containerName, result.getStderr());
diff --git a/core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java b/core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java
index 29a032d320b..71344267d32 100644
--- a/core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java
+++ b/core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java
@@ -16,13 +16,12 @@
  * figures).
  */
 public class FailureDetectingExternalResource implements TestRule {
+
     @Override
     public Statement apply(Statement base, Description description) {
-
         return new Statement() {
             @Override
             public void evaluate() throws Throwable {
-
                 List<Throwable> errors = new ArrayList<Throwable>();
 
                 try {
@@ -41,16 +40,11 @@ public void evaluate() throws Throwable {
         };
     }
 
-    protected void starting(Description description) {
-
-    }
+    protected void starting(Description description) {}
 
-    protected void succeeded(Description description) {
-    }
+    protected void succeeded(Description description) {}
 
-    protected void failed(Throwable e, Description description) {
-    }
+    protected void failed(Throwable e, Description description) {}
 
-    protected void finished(Description description) {
-    }
+    protected void finished(Description description) {}
 }
diff --git a/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java b/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java
index 6477c28042e..db610ad57c2 100644
--- a/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java
@@ -11,7 +11,8 @@
  * <p>Callers are responsible for ensuring that this fixed port is actually available; failure will occur if it is
  * not available - which could manifest as flaky or unstable tests.</p>
  */
-public class FixedHostPortGenericContainer<SELF extends FixedHostPortGenericContainer<SELF>> extends GenericContainer<SELF> {
+public class FixedHostPortGenericContainer<SELF extends FixedHostPortGenericContainer<SELF>>
+    extends GenericContainer<SELF> {
 
     /**
      * @deprecated it is highly recommended that {@link FixedHostPortGenericContainer} not be used, as it risks port conflicts.
@@ -28,7 +29,6 @@ public FixedHostPortGenericContainer(@NotNull String dockerImageName) {
      * @return                  this container
      */
     public SELF withFixedExposedPort(int hostPort, int containerPort) {
-
         return withFixedExposedPort(hostPort, containerPort, InternetProtocol.TCP);
     }
 
@@ -40,7 +40,6 @@ public SELF withFixedExposedPort(int hostPort, int containerPort) {
      * @return                  this container
      */
     public SELF withFixedExposedPort(int hostPort, int containerPort, InternetProtocol protocol) {
-
         super.addFixedExposedPort(hostPort, containerPort, protocol);
 
         return self();
diff --git a/core/src/main/java/org/testcontainers/containers/FutureContainer.java b/core/src/main/java/org/testcontainers/containers/FutureContainer.java
index b2269b534c1..28cfbfff6c9 100644
--- a/core/src/main/java/org/testcontainers/containers/FutureContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/FutureContainer.java
@@ -8,5 +8,6 @@
  */
 @Data
 public class FutureContainer implements LinkableContainer {
+
     private final String containerName;
 }
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 4e5e682738d..7163ea40a93 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -20,6 +20,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.hash.Hashing;
 import lombok.AccessLevel;
 import lombok.Data;
@@ -27,7 +28,6 @@
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.SneakyThrows;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
@@ -56,6 +56,7 @@
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
 import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.CommandLine;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.DockerMachineClient;
@@ -66,12 +67,10 @@
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.nio.charset.Charset;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Duration;
@@ -101,17 +100,15 @@
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
 
-import static com.google.common.collect.Lists.newArrayList;
 import static org.awaitility.Awaitility.await;
-import static org.testcontainers.utility.CommandLine.runShellCommand;
 
 /**
  * Base class for that allows a container to be launched and controlled.
  */
 @Data
 public class GenericContainer<SELF extends GenericContainer<SELF>>
-        extends FailureDetectingExternalResource
-        implements Container<SELF>, AutoCloseable, WaitStrategyTarget, Startable {
+    extends FailureDetectingExternalResource
+    implements Container<SELF>, AutoCloseable, WaitStrategyTarget, Startable {
 
     private static final Charset UTF8 = Charset.forName("UTF-8");
 
@@ -142,9 +139,7 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     private Network network;
 
     @NonNull
-    private List<String> networkAliases = new ArrayList<>(Arrays.asList(
-            "tc-" + Base58.randomString(8)
-    ));
+    private List<String> networkAliases = new ArrayList<>(Arrays.asList("tc-" + Base58.randomString(8)));
 
     @NonNull
     private RemoteDockerImage image;
@@ -228,6 +223,7 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     private final Set<Consumer<CreateContainerCmd>> createContainerCmdModifiers = new LinkedHashSet<>();
 
     private static final Set<String> AVAILABLE_IMAGE_NAME_CACHE = new HashSet<>();
+
     private static final RateLimiter DOCKER_CLIENT_RATE_LIMITER = RateLimiterBuilder
         .newBuilder()
         .withRate(1, TimeUnit.SECONDS)
@@ -315,7 +311,7 @@ public String getContainerId() {
      * Starts the container using docker, pulling an image if necessary.
      */
     @Override
-    @SneakyThrows({InterruptedException.class, ExecutionException.class})
+    @SneakyThrows({ InterruptedException.class, ExecutionException.class })
     public void start() {
         if (containerId != null) {
             return;
@@ -335,12 +331,20 @@ protected void doStart() {
             logger().debug("Starting container: {}", getDockerImageName());
 
             AtomicInteger attempt = new AtomicInteger(0);
-            Unreliables.retryUntilSuccess(startupAttempts, () -> {
-                logger().debug("Trying to start container: {} (attempt {}/{})", getDockerImageName(), attempt.incrementAndGet(), startupAttempts);
-                tryStart(startedAt);
-                return true;
-            });
-
+            Unreliables.retryUntilSuccess(
+                startupAttempts,
+                () -> {
+                    logger()
+                        .debug(
+                            "Trying to start container: {} (attempt {}/{})",
+                            getDockerImageName(),
+                            attempt.incrementAndGet(),
+                            startupAttempts
+                        );
+                    tryStart(startedAt);
+                    return true;
+                }
+            );
         } catch (Exception e) {
             throw new ContainerLaunchException("Container startup failed", e);
         }
@@ -383,10 +387,9 @@ private void tryStart(Instant startedAt) {
                 }
 
                 if (TestcontainersConfiguration.getInstance().environmentSupportsReuse()) {
-                    createCommand.getLabels().put(
-                        COPIED_FILES_HASH_LABEL,
-                        Long.toHexString(hashCopiedFiles().getValue())
-                    );
+                    createCommand
+                        .getLabels()
+                        .put(COPIED_FILES_HASH_LABEL, Long.toHexString(hashCopiedFiles().getValue()));
 
                     String hash = hash(createCommand);
 
@@ -402,12 +405,13 @@ private void tryStart(Instant startedAt) {
                     }
                     reusable = true;
                 } else {
-                    logger().warn(
-                        "" +
+                    logger()
+                        .warn(
+                            "" +
                             "Reuse was requested but the environment does not support the reuse of containers\n" +
                             "To enable reuse of containers, you must set 'testcontainers.reuse.enable=true' in a file located at {}",
-                        Paths.get(System.getProperty("user.home"), ".testcontainers.properties")
-                    );
+                            Paths.get(System.getProperty("user.home"), ".testcontainers.properties")
+                        );
                     reusable = false;
                 }
             } else {
@@ -443,27 +447,28 @@ private void tryStart(Instant startedAt) {
             this.logConsumers.forEach(this::followOutput);
 
             // Wait until inspect container returns the mapped ports
-            containerInfo = await()
-                .atMost(5, TimeUnit.SECONDS)
-                .pollInterval(DynamicPollInterval.ofMillis(50))
-                .pollInSameThread()
-                .until(
-                    () -> dockerClient.inspectContainerCmd(containerId).exec(),
-                    inspectContainerResponse -> {
-                        Set<Integer> exposedAndMappedPorts = inspectContainerResponse
-                            .getNetworkSettings()
-                            .getPorts()
-                            .getBindings()
-                            .entrySet()
-                            .stream()
-                            .filter(it -> Objects.nonNull(it.getValue())) // filter out exposed but not yet mapped
-                            .map(Entry::getKey)
-                            .map(ExposedPort::getPort)
-                            .collect(Collectors.toSet());
-
-                         return exposedAndMappedPorts.containsAll(exposedPorts);
-                    }
-                );
+            containerInfo =
+                await()
+                    .atMost(5, TimeUnit.SECONDS)
+                    .pollInterval(DynamicPollInterval.ofMillis(50))
+                    .pollInSameThread()
+                    .until(
+                        () -> dockerClient.inspectContainerCmd(containerId).exec(),
+                        inspectContainerResponse -> {
+                            Set<Integer> exposedAndMappedPorts = inspectContainerResponse
+                                .getNetworkSettings()
+                                .getPorts()
+                                .getBindings()
+                                .entrySet()
+                                .stream()
+                                .filter(it -> Objects.nonNull(it.getValue())) // filter out exposed but not yet mapped
+                                .map(Entry::getKey)
+                                .map(ExposedPort::getPort)
+                                .collect(Collectors.toSet());
+
+                            return exposedAndMappedPorts.containsAll(exposedPorts);
+                        }
+                    );
 
             // Tell subclasses that we're starting
             containerIsStarting(containerInfo, reused);
@@ -541,9 +546,11 @@ private void tryStart(Instant startedAt) {
     @VisibleForTesting
     Checksum hashCopiedFiles() {
         Checksum checksum = new Adler32();
-        Stream.of(copyToFileContainerPathMap, copyToTransferableContainerPathMap)
+        Stream
+            .of(copyToFileContainerPathMap, copyToTransferableContainerPathMap)
             .flatMap(it -> it.entrySet().stream())
-            .sorted(Entry.comparingByValue()).forEach(entry -> {
+            .sorted(Entry.comparingByValue())
+            .forEach(entry -> {
                 byte[] pathBytes = entry.getValue().getBytes();
                 // Add path to the hash
                 checksum.update(pathBytes, 0, pathBytes.length);
@@ -558,7 +565,8 @@ Checksum hashCopiedFiles() {
     final String hash(CreateContainerCmd createCommand) {
         DefaultDockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
 
-        byte[] commandJson = dockerClientConfig.getObjectMapper()
+        byte[] commandJson = dockerClientConfig
+            .getObjectMapper()
             .copy()
             .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
             .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
@@ -571,7 +579,8 @@ final String hash(CreateContainerCmd createCommand) {
     @VisibleForTesting
     Optional<String> findContainerForReuse(String hash) {
         // TODO locking
-        return dockerClient.listContainersCmd()
+        return dockerClient
+            .listContainersCmd()
             .withLabelFilter(ImmutableMap.of(HASH_LABEL, hash))
             .withLimit(1)
             .withStatusFilter(Arrays.asList("running"))
@@ -596,11 +605,14 @@ private HostConfig buildHostConfig() {
     }
 
     private void connectToPortForwardingNetwork(String networkMode) {
-        PortForwardingContainer.INSTANCE.getNetwork().map(ContainerNetwork::getNetworkID).ifPresent(networkId -> {
-            if (!Arrays.asList(networkId, "none", "host").contains(networkMode)) {
-                dockerClient.connectToNetworkCmd().withContainerId(containerId).withNetworkId(networkId).exec();
-            }
-        });
+        PortForwardingContainer.INSTANCE
+            .getNetwork()
+            .map(ContainerNetwork::getNetworkID)
+            .ifPresent(networkId -> {
+                if (!Arrays.asList(networkId, "none", "host").contains(networkMode)) {
+                    dockerClient.connectToNetworkCmd().withContainerId(containerId).withNetworkId(networkId).exec();
+                }
+            });
     }
 
     /**
@@ -608,7 +620,6 @@ private void connectToPortForwardingNetwork(String networkMode) {
      */
     @Override
     public void stop() {
-
         if (containerId == null) {
             return;
         }
@@ -651,35 +662,40 @@ protected Path createVolumeDirectory(boolean temporary) {
         Path directory = new File(".tmp-volume-" + UUID.randomUUID()).toPath();
         PathUtils.mkdirp(directory);
 
-        if (temporary) Runtime.getRuntime().addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, () -> {
-            PathUtils.recursiveDeleteDir(directory);
-        }));
+        if (temporary) {
+            Runtime
+                .getRuntime()
+                .addShutdownHook(
+                    new Thread(
+                        DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
+                        () -> {
+                            PathUtils.recursiveDeleteDir(directory);
+                        }
+                    )
+                );
+        }
 
         return directory;
     }
 
-    protected void configure() {
-    }
+    protected void configure() {}
 
-    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
-    protected void containerIsCreated(String containerId) {
-    }
+    @SuppressWarnings({ "EmptyMethod", "UnusedParameters" })
+    protected void containerIsCreated(String containerId) {}
 
-    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
-    protected void containerIsStarting(InspectContainerResponse containerInfo) {
-    }
+    @SuppressWarnings({ "EmptyMethod", "UnusedParameters" })
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {}
 
-    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
+    @SuppressWarnings({ "EmptyMethod", "UnusedParameters" })
     @UnstableAPI
     protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
         containerIsStarting(containerInfo);
     }
 
-    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
-    protected void containerIsStarted(InspectContainerResponse containerInfo) {
-    }
+    @SuppressWarnings({ "EmptyMethod", "UnusedParameters" })
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {}
 
-    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
+    @SuppressWarnings({ "EmptyMethod", "UnusedParameters" })
     @UnstableAPI
     protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
         containerIsStarted(containerInfo);
@@ -690,18 +706,16 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
      * Warning! This hook won't be executed if the container is terminated during
      * the JVM's shutdown hook or by Ryuk.
      */
-    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
-    protected void containerIsStopping(InspectContainerResponse containerInfo) {
-    }
+    @SuppressWarnings({ "EmptyMethod", "UnusedParameters" })
+    protected void containerIsStopping(InspectContainerResponse containerInfo) {}
 
     /**
      * A hook that is executed after the container is stopped with {@link #stop()}.
      * Warning! This hook won't be executed if the container is terminated during
      * the JVM's shutdown hook or by Ryuk.
      */
-    @SuppressWarnings({"EmptyMethod", "UnusedParameters"})
-    protected void containerIsStopped(InspectContainerResponse containerInfo) {
-    }
+    @SuppressWarnings({ "EmptyMethod", "UnusedParameters" })
+    protected void containerIsStopped(InspectContainerResponse containerInfo) {}
 
     /**
      * @return the port on which to check if the container is ready
@@ -772,35 +786,36 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
             createCommand.withCmd(commandParts);
         }
 
-        String[] envArray = env.entrySet().stream()
-                .filter(it -> it.getValue() != null)
-                .map(it -> it.getKey() + "=" + it.getValue())
-                .toArray(String[]::new);
+        String[] envArray = env
+            .entrySet()
+            .stream()
+            .filter(it -> it.getValue() != null)
+            .map(it -> it.getKey() + "=" + it.getValue())
+            .toArray(String[]::new);
         createCommand.withEnv(envArray);
 
-        boolean shouldCheckFileMountingSupport = binds.size() > 0 && !TestcontainersConfiguration.getInstance().isDisableChecks();
+        boolean shouldCheckFileMountingSupport =
+            binds.size() > 0 && !TestcontainersConfiguration.getInstance().isDisableChecks();
         if (shouldCheckFileMountingSupport) {
             if (!DockerClientFactory.instance().isFileMountingSupported()) {
-                logger().warn(
-                    "Unable to mount a file from test host into a running container. " +
+                logger()
+                    .warn(
+                        "Unable to mount a file from test host into a running container. " +
                         "This may be a misconfiguration or limitation of your Docker environment. " +
                         "Some features might not work."
-                );
+                    );
             }
         }
 
-        Bind[] bindsArray = binds.stream()
-                .toArray(Bind[]::new);
+        Bind[] bindsArray = binds.stream().toArray(Bind[]::new);
         createCommand.withBinds(bindsArray);
 
-        VolumesFrom[] volumesFromsArray = volumesFroms.stream()
-                .toArray(VolumesFrom[]::new);
+        VolumesFrom[] volumesFromsArray = volumesFroms.stream().toArray(VolumesFrom[]::new);
         createCommand.withVolumesFrom(volumesFromsArray);
 
         Set<Link> allLinks = new HashSet<>();
         Set<String> allLinkedContainerNetworks = new HashSet<>();
         for (Entry<String, LinkableContainer> linkEntries : linkedContainers.entrySet()) {
-
             String alias = linkEntries.getKey();
             LinkableContainer linkableContainer = linkEntries.getValue();
 
@@ -808,9 +823,11 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
             allLinks.addAll(links);
 
             if (allLinks.size() == 0) {
-                throw new ContainerLaunchException("Aborting attempt to link to container " +
-                        linkableContainer.getContainerName() +
-                        " as it is not running");
+                throw new ContainerLaunchException(
+                    "Aborting attempt to link to container " +
+                    linkableContainer.getContainerName() +
+                    " as it is not running"
+                );
             }
 
             Set<String> linkedContainerNetworks = findAllNetworksForLinkedContainers(linkableContainer);
@@ -821,9 +838,12 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
 
         allLinkedContainerNetworks.remove("bridge");
         if (allLinkedContainerNetworks.size() > 1) {
-            logger().warn("Container needs to be on more than one custom network to link to other " +
-                            "containers - this is not currently supported. Required networks are: {}",
-                    allLinkedContainerNetworks);
+            logger()
+                .warn(
+                    "Container needs to be on more than one custom network to link to other " +
+                    "containers - this is not currently supported. Required networks are: {}",
+                    allLinkedContainerNetworks
+                );
         }
 
         Optional<String> networkForLinks = allLinkedContainerNetworks.stream().findFirst();
@@ -835,12 +855,13 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
         if (hostAccessible) {
             PortForwardingContainer.INSTANCE.start();
         }
-        PortForwardingContainer.INSTANCE.getNetwork().ifPresent(it -> {
-            withExtraHost(INTERNAL_HOST_HOSTNAME, it.getIpAddress());
-        });
+        PortForwardingContainer.INSTANCE
+            .getNetwork()
+            .ifPresent(it -> {
+                withExtraHost(INTERNAL_HOST_HOSTNAME, it.getIpAddress());
+            });
 
-        String[] extraHostsArray = extraHosts.stream()
-                .toArray(String[]::new);
+        String[] extraHostsArray = extraHosts.stream().toArray(String[]::new);
         createCommand.withExtraHosts(extraHostsArray);
 
         if (network != null) {
@@ -870,23 +891,29 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
     }
 
     private Set<Link> findLinksFromThisContainer(String alias, LinkableContainer linkableContainer) {
-        return dockerClient.listContainersCmd()
-                .withStatusFilter(Arrays.asList("running"))
-                .exec().stream()
-                .flatMap(container -> Stream.of(container.getNames()))
-                .filter(name -> name.endsWith(linkableContainer.getContainerName()))
-                .map(name -> new Link(name, alias))
-                .collect(Collectors.toSet());
+        return dockerClient
+            .listContainersCmd()
+            .withStatusFilter(Arrays.asList("running"))
+            .exec()
+            .stream()
+            .flatMap(container -> Stream.of(container.getNames()))
+            .filter(name -> name.endsWith(linkableContainer.getContainerName()))
+            .map(name -> new Link(name, alias))
+            .collect(Collectors.toSet());
     }
 
     private Set<String> findAllNetworksForLinkedContainers(LinkableContainer linkableContainer) {
-        return dockerClient.listContainersCmd().exec().stream()
-                .filter(container -> container.getNames()[0].endsWith(linkableContainer.getContainerName()))
-                .filter(container -> container.getNetworkSettings() != null &&
-                        container.getNetworkSettings().getNetworks() != null)
-                .flatMap(container -> container.getNetworkSettings().getNetworks().keySet().stream())
-                .distinct()
-                .collect(Collectors.toSet());
+        return dockerClient
+            .listContainersCmd()
+            .exec()
+            .stream()
+            .filter(container -> container.getNames()[0].endsWith(linkableContainer.getContainerName()))
+            .filter(container -> {
+                return container.getNetworkSettings() != null && container.getNetworkSettings().getNetworks() != null;
+            })
+            .flatMap(container -> container.getNetworkSettings().getNetworks().keySet().stream())
+            .distinct()
+            .collect(Collectors.toSet());
     }
 
     /**
@@ -953,19 +980,12 @@ public Map<String, String> getEnvMap() {
      */
     @Override
     public List<String> getEnv() {
-        return env.entrySet().stream()
-                .map(it -> it.getKey() + "=" + it.getValue())
-                .collect(Collectors.toList());
+        return env.entrySet().stream().map(it -> it.getKey() + "=" + it.getValue()).collect(Collectors.toList());
     }
 
     @Override
     public void setEnv(List<String> env) {
-        this.env = env.stream()
-                .map(it -> it.split("="))
-                .collect(Collectors.toMap(
-                        it -> it[0],
-                        it -> it[1]
-                ));
+        this.env = env.stream().map(it -> it.split("=")).collect(Collectors.toMap(it -> it[0], it -> it[1]));
     }
 
     /**
@@ -980,14 +1000,25 @@ public void addEnv(String key, String value) {
      * {@inheritDoc}
      */
     @Override
-    public void addFileSystemBind(final String hostPath, final String containerPath, final BindMode mode, final SelinuxContext selinuxContext) {
+    public void addFileSystemBind(
+        final String hostPath,
+        final String containerPath,
+        final BindMode mode,
+        final SelinuxContext selinuxContext
+    ) {
         if (SystemUtils.IS_OS_WINDOWS && hostPath.startsWith("/")) {
             // e.g. Docker socket mount
             binds.add(new Bind(hostPath, new Volume(containerPath), mode.accessMode, selinuxContext.selContext));
-
         } else {
             final MountableFile mountableFile = MountableFile.forHostPath(hostPath);
-            binds.add(new Bind(mountableFile.getResolvedPath(), new Volume(containerPath), mode.accessMode, selinuxContext.selContext));
+            binds.add(
+                new Bind(
+                    mountableFile.getResolvedPath(),
+                    new Volume(containerPath),
+                    mode.accessMode,
+                    selinuxContext.selContext
+                )
+            );
         }
     }
 
@@ -1090,9 +1121,8 @@ protected void finished(Description description) {
      */
     @Override
     public SELF withExposedPorts(Integer... ports) {
-        this.setExposedPorts(newArrayList(ports));
+        this.setExposedPorts(Lists.newArrayList(ports));
         return self();
-
     }
 
     /**
@@ -1218,7 +1248,11 @@ public SELF withImagePullPolicy(ImagePullPolicy imagePullPolicy) {
      * {@inheritDoc}
      */
     @Override
-    public SELF withClasspathResourceMapping(final String resourcePath, final String containerPath, final BindMode mode) {
+    public SELF withClasspathResourceMapping(
+        final String resourcePath,
+        final String containerPath,
+        final BindMode mode
+    ) {
         return withClasspathResourceMapping(resourcePath, containerPath, mode, SelinuxContext.NONE);
     }
 
@@ -1226,7 +1260,12 @@ public SELF withClasspathResourceMapping(final String resourcePath, final String
      * {@inheritDoc}
      */
     @Override
-    public SELF withClasspathResourceMapping(final String resourcePath, final String containerPath, final BindMode mode, final SelinuxContext selinuxContext) {
+    public SELF withClasspathResourceMapping(
+        final String resourcePath,
+        final String containerPath,
+        final BindMode mode,
+        final SelinuxContext selinuxContext
+    ) {
         final MountableFile mountableFile = MountableFile.forClasspathResource(resourcePath);
 
         if (mode == BindMode.READ_ONLY && selinuxContext == SelinuxContext.NONE) {
@@ -1346,23 +1385,33 @@ public String getTestHostIpAddress() {
                     throw new IllegalStateException("Could not find a default docker-machine instance");
                 }
 
-                String sshConnectionString = runShellCommand("docker-machine", "ssh", defaultMachine.get(), "echo $SSH_CONNECTION").trim();
+                String sshConnectionString = CommandLine
+                    .runShellCommand("docker-machine", "ssh", defaultMachine.get(), "echo $SSH_CONNECTION")
+                    .trim();
                 if (Strings.isNullOrEmpty(sshConnectionString)) {
-                    throw new IllegalStateException("Could not obtain SSH_CONNECTION environment variable for docker machine " + defaultMachine.get());
+                    throw new IllegalStateException(
+                        "Could not obtain SSH_CONNECTION environment variable for docker machine " +
+                        defaultMachine.get()
+                    );
                 }
 
                 String[] sshConnectionParts = sshConnectionString.split("\\s");
                 if (sshConnectionParts.length != 4) {
-                    throw new IllegalStateException("Unexpected pattern for SSH_CONNECTION for docker machine - expected 'IP PORT IP PORT' pattern but found '" + sshConnectionString + "'");
+                    throw new IllegalStateException(
+                        "Unexpected pattern for SSH_CONNECTION for docker machine - expected 'IP PORT IP PORT' pattern but found '" +
+                        sshConnectionString +
+                        "'"
+                    );
                 }
 
                 return sshConnectionParts[0];
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-
         } else {
-            throw new UnsupportedOperationException("getTestHostIpAddress() is only implemented for docker-machine right now");
+            throw new UnsupportedOperationException(
+                "getTestHostIpAddress() is only implemented for docker-machine right now"
+            );
         }
     }
 
diff --git a/core/src/main/java/org/testcontainers/containers/InternetProtocol.java b/core/src/main/java/org/testcontainers/containers/InternetProtocol.java
index 0df0480a1bf..6574a517cdf 100644
--- a/core/src/main/java/org/testcontainers/containers/InternetProtocol.java
+++ b/core/src/main/java/org/testcontainers/containers/InternetProtocol.java
@@ -4,7 +4,6 @@
  * The IP protocols supported by Docker.
  */
 public enum InternetProtocol {
-
     TCP,
     UDP;
 
diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
index 046133815b6..fac7beff638 100644
--- a/core/src/main/java/org/testcontainers/containers/Network.java
+++ b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -18,7 +18,6 @@
 import java.util.function.Consumer;
 
 public interface Network extends AutoCloseable, TestRule {
-
     Network SHARED = new NetworkImpl(false, null, Collections.emptySet(), null) {
         @Override
         public void close() {
diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index e9457ba92bd..abb6deaab3d 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -26,7 +26,9 @@
 class ParsedDockerComposeFile {
 
     private final Map<String, Object> composeFileContent;
+
     private final String composeFileName;
+
     private final File composeFile;
 
     @Getter
@@ -57,14 +59,20 @@ private void parseAndValidate() {
         final Map<String, ?> servicesMap;
         if (composeFileContent.containsKey("version")) {
             if ("2.0".equals(composeFileContent.get("version"))) {
-                log.warn("Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " +
+                log.warn(
+                    "Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " +
                     "Please see https://github.com/testcontainers/moby-ryuk/issues/2, and specify 'version: \"2.1\"' or " +
-                    "higher in {}", composeFileName);
+                    "higher in {}",
+                    composeFileName
+                );
             }
 
             final Object servicesElement = composeFileContent.get("services");
             if (servicesElement == null) {
-                log.debug("Compose file {} has an unknown format: 'version' is set but 'services' is not defined", composeFileName);
+                log.debug(
+                    "Compose file {} has an unknown format: 'version' is set but 'services' is not defined",
+                    composeFileName
+                );
                 return;
             }
             if (!(servicesElement instanceof Map)) {
@@ -81,7 +89,11 @@ private void parseAndValidate() {
             String serviceName = entry.getKey();
             Object serviceDefinition = entry.getValue();
             if (!(serviceDefinition instanceof Map)) {
-                log.debug("Compose file {} has an unknown format: service '{}' is not Map", composeFileName, serviceName);
+                log.debug(
+                    "Compose file {} has an unknown format: service '{}' is not Map",
+                    composeFileName,
+                    serviceName
+                );
                 break;
             }
 
@@ -95,11 +107,13 @@ private void parseAndValidate() {
 
     private void validateNoContainerNameSpecified(String serviceName, Map serviceDefinitionMap) {
         if (serviceDefinitionMap.containsKey("container_name")) {
-            throw new IllegalStateException(String.format(
-                "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it",
-                composeFileName,
-                serviceName
-            ));
+            throw new IllegalStateException(
+                String.format(
+                    "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it",
+                    composeFileName,
+                    serviceName
+                )
+            );
         }
     }
 
@@ -120,28 +134,35 @@ private void findImageNamesInDockerfile(String serviceName, Map serviceDefinitio
             final Object dockerfileRelativePath = buildElement.get("dockerfile");
             final Object contextRelativePath = buildElement.get("context");
             if (dockerfileRelativePath instanceof String && contextRelativePath instanceof String) {
-                dockerfilePath = composeFile
+                dockerfilePath =
+                    composeFile
+                        .getAbsoluteFile()
+                        .getParentFile()
+                        .toPath()
+                        .resolve((String) contextRelativePath)
+                        .resolve((String) dockerfileRelativePath)
+                        .normalize();
+            }
+        } else if (buildNode instanceof String) {
+            dockerfilePath =
+                composeFile
                     .getAbsoluteFile()
                     .getParentFile()
                     .toPath()
-                    .resolve((String) contextRelativePath)
-                    .resolve((String) dockerfileRelativePath)
+                    .resolve((String) buildNode)
+                    .resolve("./Dockerfile")
                     .normalize();
-            }
-        } else if (buildNode instanceof String) {
-            dockerfilePath = composeFile
-                .getAbsoluteFile()
-                .getParentFile()
-                .toPath()
-                .resolve((String) buildNode)
-                .resolve("./Dockerfile")
-                .normalize();
         }
 
         if (dockerfilePath != null && Files.exists(dockerfilePath)) {
             Set<String> resolvedImageNames = new ParsedDockerfile(dockerfilePath).getDependencyImageNames();
             if (!resolvedImageNames.isEmpty()) {
-                log.debug("Resolved Dockerfile dependency images for Docker Compose in {} -> {}: {}", composeFileName, dockerfilePath, resolvedImageNames);
+                log.debug(
+                    "Resolved Dockerfile dependency images for Docker Compose in {} -> {}: {}",
+                    composeFileName,
+                    dockerfilePath,
+                    resolvedImageNames
+                );
                 this.serviceNameToImageNames.put(serviceName, resolvedImageNames);
             }
         }
diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index a854b1e55c3..22d364c0762 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -30,15 +30,16 @@ public enum PortForwardingContainer {
     @SneakyThrows
     private Connection createSSHSession() {
         String password = UUID.randomUUID().toString();
-        container = new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.0.0"))
-            .withExposedPorts(22)
-            .withEnv("PASSWORD", password)
-            .withCommand(
-                "sh",
-                "-c",
-                // Disable ipv6 & Make it listen on all interfaces, not just localhost
-                "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes"
-            );
+        container =
+            new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.0.0"))
+                .withExposedPorts(22)
+                .withEnv("PASSWORD", password)
+                .withCommand(
+                    "sh",
+                    "-c",
+                    // Disable ipv6 & Make it listen on all interfaces, not just localhost
+                    "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes"
+                );
         container.start();
 
         Connection connection = new Connection(container.getHost(), container.getMappedPort(22));
@@ -64,7 +65,7 @@ public void exposeHostPort(int port) {
 
     @SneakyThrows
     public void exposeHostPort(int hostPort, int containerPort) {
-    	if (exposedPorts.add(new AbstractMap.SimpleEntry<>(hostPort, containerPort))) {
+        if (exposedPorts.add(new AbstractMap.SimpleEntry<>(hostPort, containerPort))) {
             getSshConnection().requestRemotePortForwarding("", containerPort, "localhost", hostPort);
         }
     }
@@ -74,7 +75,8 @@ void start() {
     }
 
     Optional<ContainerNetwork> getNetwork() {
-        return Optional.ofNullable(container)
+        return Optional
+            .ofNullable(container)
             .map(GenericContainer::getContainerInfo)
             .flatMap(it -> it.getNetworkSettings().getNetworks().values().stream().findFirst());
     }
diff --git a/core/src/main/java/org/testcontainers/containers/SelinuxContext.java b/core/src/main/java/org/testcontainers/containers/SelinuxContext.java
index 735d3e3a277..ec814d5640a 100644
--- a/core/src/main/java/org/testcontainers/containers/SelinuxContext.java
+++ b/core/src/main/java/org/testcontainers/containers/SelinuxContext.java
@@ -13,5 +13,4 @@ public enum SelinuxContext {
     NONE(SELContext.none);
 
     public final SELContext selContext;
-
 }
diff --git a/core/src/main/java/org/testcontainers/containers/SocatContainer.java b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
index bc9ced57845..9455ac77227 100644
--- a/core/src/main/java/org/testcontainers/containers/SocatContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/SocatContainer.java
@@ -1,10 +1,11 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.testcontainers.utility.Base58;
-import org.testcontainers.utility.DockerImageName;
 
 /**
  * A socat container is used as a TCP proxy, enabling any TCP port of another container to be exposed
@@ -36,10 +37,13 @@ public SocatContainer withTarget(int exposedPort, String host, int internalPort)
 
     @Override
     protected void configure() {
-        withCommand("-c",
-                targets.entrySet().stream()
-                        .map(entry -> "socat TCP-LISTEN:" + entry.getKey() + ",fork,reuseaddr TCP:" + entry.getValue())
-                        .collect(Collectors.joining(" & "))
+        withCommand(
+            "-c",
+            targets
+                .entrySet()
+                .stream()
+                .map(entry -> "socat TCP-LISTEN:" + entry.getKey() + ",fork,reuseaddr TCP:" + entry.getValue())
+                .collect(Collectors.joining(" & "))
         );
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index be8a4ed735f..f629a141357 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -15,10 +15,9 @@
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Base64;
 
-import static java.time.temporal.ChronoUnit.SECONDS;
-
 /**
  * 'Sidekick container' with the sole purpose of recording the VNC screen output from another container.
  *
@@ -48,7 +47,9 @@ public class VncRecordingContainer extends GenericContainer<VncRecordingContaine
     public VncRecordingContainer(@NonNull GenericContainer<?> targetContainer) {
         this(
             targetContainer.getNetwork(),
-            targetContainer.getNetworkAliases().stream()
+            targetContainer
+                .getNetworkAliases()
+                .stream()
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException("Target container must have a network alias"))
         );
@@ -57,14 +58,16 @@ public VncRecordingContainer(@NonNull GenericContainer<?> targetContainer) {
     /**
      * Create a sidekick container and attach it to another container. The VNC output of that container will be recorded.
      */
-    public VncRecordingContainer(@NonNull Network network, @NonNull String targetNetworkAlias) throws IllegalStateException {
+    public VncRecordingContainer(@NonNull Network network, @NonNull String targetNetworkAlias)
+        throws IllegalStateException {
         super(DockerImageName.parse("testcontainers/vnc-recorder:1.2.0"));
-
         this.targetNetworkAlias = targetNetworkAlias;
         withNetwork(network);
-        waitingFor(new LogMessageWaitStrategy()
-            .withRegEx(".*Connected.*")
-            .withStartupTimeout(Duration.of(15, SECONDS)));
+        waitingFor(
+            new LogMessageWaitStrategy()
+                .withRegEx(".*Connected.*")
+                .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS))
+        );
     }
 
     public VncRecordingContainer withVncPassword(@NonNull String vncPassword) {
@@ -95,8 +98,17 @@ protected void configure() {
         String encodedPassword = Base64.getEncoder().encodeToString(vncPassword.getBytes());
         setCommand(
             "-c",
-            "echo '" + encodedPassword + "' | base64 -d > /vnc_password && " +
-                "flvrec.py -o " + ORIGINAL_RECORDING_FILE_NAME + " -d -r " + frameRate + " -P /vnc_password " + targetNetworkAlias + " " + vncPort
+            "echo '" +
+            encodedPassword +
+            "' | base64 -d > /vnc_password && " +
+            "flvrec.py -o " +
+            ORIGINAL_RECORDING_FILE_NAME +
+            " -d -r " +
+            frameRate +
+            " -P /vnc_password " +
+            targetNetworkAlias +
+            " " +
+            vncPort
         );
     }
 
@@ -122,7 +134,8 @@ public void saveRecordingToFile(@NonNull File file) {
     public enum VncRecordingFormat {
         FLV("flv") {
             @Override
-            String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull String source) throws IOException, InterruptedException {
+            String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull String source)
+                throws IOException, InterruptedException {
                 String newFileOutput = "/newScreen.flv";
                 container.execInContainer("ffmpeg", "-i", source, "-vcodec", "libx264", newFileOutput);
                 return newFileOutput;
@@ -130,17 +143,29 @@ String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull Stri
         },
         MP4("mp4") {
             @Override
-            String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull String source) throws IOException, InterruptedException {
+            String reencodeRecording(@NonNull VncRecordingContainer container, @NonNull String source)
+                throws IOException, InterruptedException {
                 String newFileOutput = "/newScreen.mp4";
-                container.execInContainer("ffmpeg", "-i", source, "-vcodec", "libx264", "-movflags", "faststart", "-pix_fmt", "yuv420p", newFileOutput);
+                container.execInContainer(
+                    "ffmpeg",
+                    "-i",
+                    source,
+                    "-vcodec",
+                    "libx264",
+                    "-movflags",
+                    "faststart",
+                    "-pix_fmt",
+                    "yuv420p",
+                    newFileOutput
+                );
                 return newFileOutput;
             }
         };
 
-        abstract String reencodeRecording(VncRecordingContainer container, String source) throws IOException, InterruptedException;
+        abstract String reencodeRecording(VncRecordingContainer container, String source)
+            throws IOException, InterruptedException;
 
         @Getter
         private final String filenameExtension;
     }
-
 }
diff --git a/core/src/main/java/org/testcontainers/containers/output/BaseConsumer.java b/core/src/main/java/org/testcontainers/containers/output/BaseConsumer.java
index 2967eb4d33a..7679ee8ab57 100644
--- a/core/src/main/java/org/testcontainers/containers/output/BaseConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/BaseConsumer.java
@@ -6,6 +6,7 @@
 import java.util.function.Consumer;
 
 public abstract class BaseConsumer<SELF extends BaseConsumer<SELF>> implements Consumer<OutputFrame> {
+
     @Getter
     @Setter
     private boolean removeColorCodes = true;
diff --git a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
index 8c7480320a8..75c24d1ac1d 100644
--- a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
+++ b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers.output;
 
-
 import com.github.dockerjava.api.async.ResultCallbackTemplate;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
@@ -79,7 +78,7 @@ public void onError(Throwable throwable) {
         // Sink any errors
         try {
             close();
-        } catch (IOException ignored) { }
+        } catch (IOException ignored) {}
     }
 
     @Override
@@ -169,7 +168,6 @@ private String processAnsiColorCodes(String utf8String, Consumer<OutputFrame> co
         return utf8String;
     }
 
-
     private byte[] merge(byte[] str1, byte[] str2) {
         byte[] mergedString = new byte[str1.length + str2.length];
         System.arraycopy(str1, 0, mergedString, 0, str1.length);
diff --git a/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java b/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java
index d5ddcada8c8..f6eb5c18cbc 100644
--- a/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java
+++ b/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java
@@ -12,6 +12,7 @@ public class OutputFrame {
     public static final OutputFrame END = new OutputFrame(OutputType.END, null);
 
     private final OutputType type;
+
     private final byte[] bytes;
 
     public OutputFrame(OutputType type, byte[] bytes) {
@@ -28,7 +29,6 @@ public byte[] getBytes() {
     }
 
     public String getUtf8String() {
-
         if (bytes == null) {
             return "";
         }
@@ -37,14 +37,20 @@ public String getUtf8String() {
     }
 
     public enum OutputType {
-        STDOUT, STDERR, END;
+        STDOUT,
+        STDERR,
+        END;
 
         public static OutputType forStreamType(StreamType streamType) {
             switch (streamType) {
-                case RAW:    return STDOUT;
-                case STDOUT: return STDOUT;
-                case STDERR: return STDERR;
-                default: return null;
+                case RAW:
+                    return STDOUT;
+                case STDOUT:
+                    return STDOUT;
+                case STDERR:
+                    return STDERR;
+                default:
+                    return null;
             }
         }
     }
@@ -56,5 +62,4 @@ public static OutputFrame forFrame(Frame frame) {
         }
         return new OutputFrame(outputType, frame.getPayload());
     }
-
 }
diff --git a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
index a274cd63004..ece7ab0e5b7 100644
--- a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
@@ -1,18 +1,22 @@
 package org.testcontainers.containers.output;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.MDC;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * A consumer for container output that logs output to an SLF4J logger.
  */
 public class Slf4jLogConsumer extends BaseConsumer<Slf4jLogConsumer> {
+
     private final Logger logger;
+
     private final Map<String, String> mdc = new HashMap<>();
+
     private boolean separateOutputStreams;
+
     private String prefix = "";
 
     public Slf4jLogConsumer(Logger logger) {
diff --git a/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java b/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
index 40ec60fb744..444434fa702 100644
--- a/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
@@ -10,6 +10,7 @@
  * Created by rnorth on 26/03/2016.
  */
 public class ToStringConsumer extends BaseConsumer<ToStringConsumer> {
+
     private ByteArrayOutputStream stringBuffer = new ByteArrayOutputStream();
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
index 858f5a4b487..e9b34692319 100644
--- a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
@@ -71,14 +71,14 @@ public void waitUntil(Predicate<OutputFrame> predicate, int limit, TimeUnit limi
      * @param limitUnit maximum time to wait (units)
      * @param times     number of times the predicate has to match
      */
-    public void waitUntil(Predicate<OutputFrame> predicate, long limit, TimeUnit limitUnit, int times) throws TimeoutException {
+    public void waitUntil(Predicate<OutputFrame> predicate, long limit, TimeUnit limitUnit, int times)
+        throws TimeoutException {
         long expiry = limitUnit.toMillis(limit) + System.currentTimeMillis();
 
         waitUntil(predicate, expiry, times);
     }
 
     private void waitUntil(Predicate<OutputFrame> predicate, long expiry, int times) throws TimeoutException {
-
         int numberOfMatches = 0;
         while (System.currentTimeMillis() < expiry) {
             try {
diff --git a/core/src/main/java/org/testcontainers/containers/startupcheck/IndefiniteWaitOneShotStartupCheckStrategy.java b/core/src/main/java/org/testcontainers/containers/startupcheck/IndefiniteWaitOneShotStartupCheckStrategy.java
index f719cb1d476..a547b7885e3 100644
--- a/core/src/main/java/org/testcontainers/containers/startupcheck/IndefiniteWaitOneShotStartupCheckStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/startupcheck/IndefiniteWaitOneShotStartupCheckStrategy.java
@@ -12,6 +12,7 @@
  * It has to be assumed that the container will stop of its own accord, either with a success or failure exit code.
  */
 public class IndefiniteWaitOneShotStartupCheckStrategy extends OneShotStartupCheckStrategy {
+
     @Override
     public boolean waitUntilStartupSuccessful(DockerClient dockerClient, String containerId) {
         while (checkStartupState(dockerClient, containerId) == StartupStatus.NOT_YET_KNOWN) {
diff --git a/core/src/main/java/org/testcontainers/containers/startupcheck/MinimumDurationRunningStartupCheckStrategy.java b/core/src/main/java/org/testcontainers/containers/startupcheck/MinimumDurationRunningStartupCheckStrategy.java
index 3ce50446b77..ce29e0104e1 100644
--- a/core/src/main/java/org/testcontainers/containers/startupcheck/MinimumDurationRunningStartupCheckStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/startupcheck/MinimumDurationRunningStartupCheckStrategy.java
@@ -35,5 +35,4 @@ public StartupStatus checkStartupState(DockerClient dockerClient, String contain
         }
         return StartupStatus.NOT_YET_KNOWN;
     }
-
 }
diff --git a/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java b/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
index d5931454212..50fdcdb8b9b 100644
--- a/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/startupcheck/StartupCheckStrategy.java
@@ -10,20 +10,18 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import static org.testcontainers.containers.GenericContainer.CONTAINER_RUNNING_TIMEOUT_SEC;
-
 /**
  * Approach to determine whether a container has 'started up' correctly.
  */
 public abstract class StartupCheckStrategy {
 
     private static final RateLimiter DOCKER_CLIENT_RATE_LIMITER = RateLimiterBuilder
-            .newBuilder()
-            .withRate(1, TimeUnit.SECONDS)
-            .withConstantThroughput()
-            .build();
+        .newBuilder()
+        .withRate(1, TimeUnit.SECONDS)
+        .withConstantThroughput()
+        .build();
 
-    private Duration timeout = Duration.ofSeconds(CONTAINER_RUNNING_TIMEOUT_SEC);
+    private Duration timeout = Duration.ofSeconds(GenericContainer.CONTAINER_RUNNING_TIMEOUT_SEC);
 
     @SuppressWarnings("unchecked")
     public <SELF extends StartupCheckStrategy> SELF withTimeout(Duration timeout) {
@@ -41,20 +39,27 @@ public boolean waitUntilStartupSuccessful(GenericContainer<?> container) {
     }
 
     public boolean waitUntilStartupSuccessful(DockerClient dockerClient, String containerId) {
-        final Boolean[] startedOK = {null};
-        Unreliables.retryUntilTrue((int) timeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
-            //noinspection CodeBlock2Expr
-            return DOCKER_CLIENT_RATE_LIMITER.getWhenReady(() -> {
-                StartupStatus state = checkStartupState(dockerClient, containerId);
-                switch (state) {
-                    case SUCCESSFUL:    startedOK[0] = true;
-                                        return true;
-                    case FAILED:        startedOK[0] = false;
-                                        return true;
-                    default:            return false;
-                }
-            });
-        });
+        final Boolean[] startedOK = { null };
+        Unreliables.retryUntilTrue(
+            (int) timeout.toMillis(),
+            TimeUnit.MILLISECONDS,
+            () -> {
+                //noinspection CodeBlock2Expr
+                return DOCKER_CLIENT_RATE_LIMITER.getWhenReady(() -> {
+                    StartupStatus state = checkStartupState(dockerClient, containerId);
+                    switch (state) {
+                        case SUCCESSFUL:
+                            startedOK[0] = true;
+                            return true;
+                        case FAILED:
+                            startedOK[0] = false;
+                            return true;
+                        default:
+                            return false;
+                    }
+                });
+            }
+        );
         return startedOK[0];
     }
 
@@ -65,6 +70,8 @@ protected InspectContainerResponse.ContainerState getCurrentState(DockerClient d
     }
 
     public enum StartupStatus {
-        NOT_YET_KNOWN, SUCCESSFUL, FAILED
+        NOT_YET_KNOWN,
+        SUCCESSFUL,
+        FAILED,
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/traits/LinkableContainer.java b/core/src/main/java/org/testcontainers/containers/traits/LinkableContainer.java
index 76e71378969..4973c4dc9c1 100644
--- a/core/src/main/java/org/testcontainers/containers/traits/LinkableContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/traits/LinkableContainer.java
@@ -7,6 +7,5 @@
  */
 @Deprecated
 public interface LinkableContainer {
-
     String getContainerName();
 }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
index d543d952bbd..fbee9c2f9f4 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheck.java
@@ -14,21 +14,25 @@
  */
 @RequiredArgsConstructor
 public class ExternalPortListeningCheck implements Callable<Boolean> {
+
     private final ContainerState containerState;
+
     private final Set<Integer> externalLivenessCheckPorts;
 
     @Override
     public Boolean call() {
         String address = containerState.getHost();
 
-        externalLivenessCheckPorts.parallelStream().forEach(externalPort -> {
-            try (Socket socket = new Socket()) {
-                InetSocketAddress inetSocketAddress = new InetSocketAddress(address, externalPort);
-                socket.connect(inetSocketAddress, 1000);
-            } catch (IOException e) {
-                throw new IllegalStateException("Socket not listening yet: " + externalPort);
-            }
-        });
+        externalLivenessCheckPorts
+            .parallelStream()
+            .forEach(externalPort -> {
+                try (Socket socket = new Socket()) {
+                    InetSocketAddress inetSocketAddress = new InetSocketAddress(address, externalPort);
+                    socket.connect(inetSocketAddress, 1000);
+                } catch (IOException e) {
+                    throw new IllegalStateException("Socket not listening yet: " + externalPort);
+                }
+            });
         return true;
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
index 1eba8acbbd1..aeedbea1e3f 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheck.java
@@ -10,8 +10,6 @@
 import java.time.Instant;
 import java.util.Set;
 
-import static java.lang.String.format;
-
 /**
  * Mechanism for testing that a socket is listening when run from the container being checked.
  */
@@ -20,6 +18,7 @@
 public class InternalCommandPortListeningCheck implements java.util.concurrent.Callable<Boolean> {
 
     private final WaitStrategyTarget waitStrategyTarget;
+
     private final Set<Integer> internalPorts;
 
     @Override
@@ -29,19 +28,31 @@ public Boolean call() {
         for (int internalPort : internalPorts) {
             command.append(" && ");
             command.append(" (");
-            command.append(format("grep -i ':0*%x' /proc/net/tcp*", internalPort));
+            command.append(String.format("grep -i ':0*%x' /proc/net/tcp*", internalPort));
             command.append(" || ");
-            command.append(format("nc -vz -w 1 localhost %d", internalPort));
+            command.append(String.format("nc -vz -w 1 localhost %d", internalPort));
             command.append(" || ");
-            command.append(format("/bin/bash -c '</dev/tcp/localhost/%d'", internalPort));
+            command.append(String.format("/bin/bash -c '</dev/tcp/localhost/%d'", internalPort));
             command.append(")");
         }
         command.append(" ) && exit 0 || sleep 0.1; done");
 
         Instant before = Instant.now();
         try {
-            ExecResult result = ExecInContainerPattern.execInContainer(waitStrategyTarget.getDockerClient(), waitStrategyTarget.getContainerInfo(), "/bin/sh", "-c", command.toString());
-            log.trace("Check for {} took {}. Result code '{}', stdout message: '{}'", internalPorts, Duration.between(before, Instant.now()), result.getExitCode(), result.getStdout());
+            ExecResult result = ExecInContainerPattern.execInContainer(
+                waitStrategyTarget.getDockerClient(),
+                waitStrategyTarget.getContainerInfo(),
+                "/bin/sh",
+                "-c",
+                command.toString()
+            );
+            log.trace(
+                "Check for {} took {}. Result code '{}', stdout message: '{}'",
+                internalPorts,
+                Duration.between(before, Instant.now()),
+                result.getExitCode(),
+                result.getStdout()
+            );
             int exitCode = result.getExitCode();
             if (exitCode != 0 && exitCode != 1) {
                 log.warn("An exception while executing the internal check: {}", result);
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java
index 5656c21ae1d..4adf28406b6 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/AbstractWaitStrategy.java
@@ -14,17 +14,18 @@
 
 public abstract class AbstractWaitStrategy implements WaitStrategy {
 
-    static final ExecutorService EXECUTOR = Executors.newCachedThreadPool(new ThreadFactory() {
-
-        private final AtomicLong COUNTER = new AtomicLong(0);
-
-        @Override
-        public Thread newThread(Runnable r) {
-            Thread thread = new Thread(r, "testcontainers-wait-" + COUNTER.getAndIncrement());
-            thread.setDaemon(true);
-            return thread;
+    static final ExecutorService EXECUTOR = Executors.newCachedThreadPool(
+        new ThreadFactory() {
+            private final AtomicLong COUNTER = new AtomicLong(0);
+
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread thread = new Thread(r, "testcontainers-wait-" + COUNTER.getAndIncrement());
+                thread.setDaemon(true);
+                return thread;
+            }
         }
-    });
+    );
 
     private static final RateLimiter DOCKER_CLIENT_RATE_LIMITER = RateLimiterBuilder
         .newBuilder()
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategy.java
index f2fa797327b..60df3cb9efc 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategy.java
@@ -15,9 +15,12 @@ public class DockerHealthcheckWaitStrategy extends AbstractWaitStrategy {
 
     @Override
     protected void waitUntilReady() {
-
         try {
-            Unreliables.retryUntilTrue((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, waitStrategyTarget::isHealthy);
+            Unreliables.retryUntilTrue(
+                (int) startupTimeout.getSeconds(),
+                TimeUnit.SECONDS,
+                waitStrategyTarget::isHealthy
+            );
         } catch (TimeoutException e) {
             throw new ContainerLaunchException("Timed out waiting for container to become healthy");
         }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index 38ddcb44db6..4ca0c6b9592 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -34,7 +34,10 @@ protected void waitUntilReady() {
         final Set<Integer> externalLivenessCheckPorts = getLivenessCheckPorts();
         if (externalLivenessCheckPorts.isEmpty()) {
             if (log.isDebugEnabled()) {
-                log.debug("Liveness check ports of {} is empty. Not waiting.", waitStrategyTarget.getContainerInfo().getName());
+                log.debug(
+                    "Liveness check ports of {} is empty. Not waiting.",
+                    waitStrategyTarget.getContainerInfo().getName()
+                );
             }
             return;
         }
@@ -45,58 +48,69 @@ protected void waitUntilReady() {
 
         Callable<Boolean> internalCheck = new InternalCommandPortListeningCheck(waitStrategyTarget, internalPorts);
 
-        Callable<Boolean> externalCheck = new ExternalPortListeningCheck(waitStrategyTarget, externalLivenessCheckPorts);
+        Callable<Boolean> externalCheck = new ExternalPortListeningCheck(
+            waitStrategyTarget,
+            externalLivenessCheckPorts
+        );
 
         try {
-            List<Future<Boolean>> futures = EXECUTOR.invokeAll(Arrays.asList(
-                // Blocking
-                () -> {
-                    Instant now = Instant.now();
-                    Boolean result = internalCheck.call();
-                    log.debug(
-                        "Internal port check {} for {} in {}",
-                        Boolean.TRUE.equals(result) ? "passed" : "failed",
-                        internalPorts,
-                        Duration.between(now, Instant.now())
-                    );
-                    return result;
-                },
-                // Polling
-                () -> {
-                    Instant now = Instant.now();
-                    Awaitility.await()
-                        .pollInSameThread()
-                        .pollInterval(Duration.ofMillis(100))
-                        .pollDelay(Duration.ZERO)
-                        .ignoreExceptions()
-                        .forever()
-                        .until(externalCheck);
+            List<Future<Boolean>> futures = EXECUTOR.invokeAll(
+                Arrays.asList(
+                    // Blocking
+                    () -> {
+                        Instant now = Instant.now();
+                        Boolean result = internalCheck.call();
+                        log.debug(
+                            "Internal port check {} for {} in {}",
+                            Boolean.TRUE.equals(result) ? "passed" : "failed",
+                            internalPorts,
+                            Duration.between(now, Instant.now())
+                        );
+                        return result;
+                    },
+                    // Polling
+                    () -> {
+                        Instant now = Instant.now();
+                        Awaitility
+                            .await()
+                            .pollInSameThread()
+                            .pollInterval(Duration.ofMillis(100))
+                            .pollDelay(Duration.ZERO)
+                            .ignoreExceptions()
+                            .forever()
+                            .until(externalCheck);
 
-                    log.debug(
-                        "External port check passed for {} mapped as {} in {}",
-                        internalPorts,
-                        externalLivenessCheckPorts,
-                        Duration.between(now, Instant.now())
-                    );
-                    return true;
-                }
-            ), startupTimeout.getSeconds(), TimeUnit.SECONDS);
+                        log.debug(
+                            "External port check passed for {} mapped as {} in {}",
+                            internalPorts,
+                            externalLivenessCheckPorts,
+                            Duration.between(now, Instant.now())
+                        );
+                        return true;
+                    }
+                ),
+                startupTimeout.getSeconds(),
+                TimeUnit.SECONDS
+            );
 
             for (Future<Boolean> future : futures) {
                 future.get(0, TimeUnit.SECONDS);
             }
         } catch (CancellationException | ExecutionException | TimeoutException e) {
-            throw new ContainerLaunchException("Timed out waiting for container port to open (" +
-                    waitStrategyTarget.getHost() +
-                    " ports: " +
-                    externalLivenessCheckPorts +
-                    " should be listening)");
+            throw new ContainerLaunchException(
+                "Timed out waiting for container port to open (" +
+                waitStrategyTarget.getHost() +
+                " ports: " +
+                externalLivenessCheckPorts +
+                " should be listening)"
+            );
         }
     }
 
     private Set<Integer> getInternalPorts(Set<Integer> externalLivenessCheckPorts, List<Integer> exposedPorts) {
-        return exposedPorts.stream()
-                .filter(it -> externalLivenessCheckPorts.contains(waitStrategyTarget.getMappedPort(it)))
-                .collect(Collectors.toSet());
+        return exposedPorts
+            .stream()
+            .filter(it -> externalLivenessCheckPorts.contains(waitStrategyTarget.getMappedPort(it)))
+            .collect(Collectors.toSet());
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index d5d08ce6fd0..ccaef47a821 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -2,8 +2,6 @@
 
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.ContainerLaunchException;
@@ -15,12 +13,14 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.time.Duration;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
+import java.time.Duration;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -48,16 +48,27 @@ public class HttpWaitStrategy extends AbstractWaitStrategy {
     private static final String AUTH_BASIC = "Basic ";
 
     private String path = "/";
+
     private String method = "GET";
+
     private Set<Integer> statusCodes = new HashSet<>();
+
     private boolean tlsEnabled;
+
     private String username;
+
     private String password;
+
     private final Map<String, String> headers = new HashMap<>();
+
     private Predicate<String> responsePredicate;
+
     private Predicate<Integer> statusCodePredicate = null;
+
     private Optional<Integer> livenessPort = Optional.empty();
+
     private Duration readTimeout = Duration.ofSeconds(1);
+
     private boolean allowInsecure;
 
     /**
@@ -196,14 +207,16 @@ public HttpWaitStrategy forResponsePredicate(Predicate<String> responsePredicate
     protected void waitUntilReady() {
         final String containerName = waitStrategyTarget.getContainerInfo().getName();
 
-        final Integer livenessCheckPort = livenessPort.map(waitStrategyTarget::getMappedPort).orElseGet(() -> {
-            final Set<Integer> livenessCheckPorts = getLivenessCheckPorts();
-            if (livenessCheckPorts == null || livenessCheckPorts.isEmpty()) {
-                log.warn("{}: No exposed ports or mapped ports - cannot wait for status", containerName);
-                return -1;
-            }
-            return livenessCheckPorts.iterator().next();
-        });
+        final Integer livenessCheckPort = livenessPort
+            .map(waitStrategyTarget::getMappedPort)
+            .orElseGet(() -> {
+                final Set<Integer> livenessCheckPorts = getLivenessCheckPorts();
+                if (livenessCheckPorts == null || livenessCheckPorts.isEmpty()) {
+                    log.warn("{}: No exposed ports or mapped ports - cannot wait for status", containerName);
+                    return -1;
+                }
+                return livenessCheckPorts.iterator().next();
+            });
 
         if (null == livenessCheckPort || -1 == livenessCheckPort) {
             return;
@@ -213,11 +226,20 @@ protected void waitUntilReady() {
 
         try {
             // Un-map the port for logging
-            int originalPort = waitStrategyTarget.getExposedPorts().stream()
+            int originalPort = waitStrategyTarget
+                .getExposedPorts()
+                .stream()
                 .filter(exposedPort -> rawUri.getPort() == waitStrategyTarget.getMappedPort(exposedPort))
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException("Target port " + rawUri.getPort() + " is not exposed"));
-            log.info("{}: Waiting for {} seconds for URL: {} (where port {} maps to container port {})", containerName, startupTimeout.getSeconds(), uri, rawUri.getPort(), originalPort);
+            log.info(
+                "{}: Waiting for {} seconds for URL: {} (where port {} maps to container port {})",
+                containerName,
+                startupTimeout.getSeconds(),
+                uri,
+                rawUri.getPort(),
+                originalPort
+            );
         } catch (RuntimeException e) {
             // do not allow a failure in logging to prevent progress, but log for diagnosis
             log.warn("Unexpected error occurred - will proceed to try to wait anyway", e);
@@ -225,103 +247,114 @@ protected void waitUntilReady() {
 
         // try to connect to the URL
         try {
-            retryUntilSuccess((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, () -> {
-                getRateLimiter().doWhenReady(() -> {
-                    try {
-                        final HttpURLConnection connection = openConnection(uri);
-                        connection.setReadTimeout(Math.toIntExact(readTimeout.toMillis()));
-
-                        // authenticate
-                        if (!Strings.isNullOrEmpty(username)) {
-                            connection.setRequestProperty(HEADER_AUTHORIZATION, buildAuthString(username, password));
-                            connection.setUseCaches(false);
-                        }
-
-                        // Add user configured headers
-                        this.headers.forEach(connection::setRequestProperty);
-                        connection.setRequestMethod(method);
-                        connection.connect();
-
-                        log.trace("Get response code {}", connection.getResponseCode());
-
-                        // Choose the statusCodePredicate strategy depending on what we defined.
-                        Predicate<Integer> predicate;
-                        if (statusCodes.isEmpty() && statusCodePredicate == null) {
-                            // We have no status code and no predicate so we expect a 200 OK response code
-                            predicate = responseCode -> HttpURLConnection.HTTP_OK == responseCode;
-                        } else if (!statusCodes.isEmpty() && statusCodePredicate == null) {
-                            // We use the default status predicate checker when we only have status codes
-                            predicate = responseCode -> statusCodes.contains(responseCode);
-                        } else if (statusCodes.isEmpty()) {
-                            // We only have a predicate
-                            predicate = statusCodePredicate;
-                        } else {
-                            // We have both predicate and status code
-                            predicate = statusCodePredicate.or(responseCode -> statusCodes.contains(responseCode));
-                        }
-                        if (!predicate.test(connection.getResponseCode())) {
-                            throw new RuntimeException(String.format("HTTP response code was: %s",
-                                connection.getResponseCode()));
-                        }
-
-                        if(responsePredicate != null) {
-                            String responseBody = getResponseBody(connection);
-
-                            log.trace("Get response {}", responseBody);
-
-                            if(!responsePredicate.test(responseBody)) {
-                                throw new RuntimeException(String.format("Response: %s did not match predicate",
-                                    responseBody));
+            retryUntilSuccess(
+                (int) startupTimeout.getSeconds(),
+                TimeUnit.SECONDS,
+                () -> {
+                    getRateLimiter()
+                        .doWhenReady(() -> {
+                            try {
+                                final HttpURLConnection connection = openConnection(uri);
+                                connection.setReadTimeout(Math.toIntExact(readTimeout.toMillis()));
+
+                                // authenticate
+                                if (!Strings.isNullOrEmpty(username)) {
+                                    connection.setRequestProperty(
+                                        HEADER_AUTHORIZATION,
+                                        buildAuthString(username, password)
+                                    );
+                                    connection.setUseCaches(false);
+                                }
+
+                                // Add user configured headers
+                                this.headers.forEach(connection::setRequestProperty);
+                                connection.setRequestMethod(method);
+                                connection.connect();
+
+                                log.trace("Get response code {}", connection.getResponseCode());
+
+                                // Choose the statusCodePredicate strategy depending on what we defined.
+                                Predicate<Integer> predicate;
+                                if (statusCodes.isEmpty() && statusCodePredicate == null) {
+                                    // We have no status code and no predicate so we expect a 200 OK response code
+                                    predicate = responseCode -> HttpURLConnection.HTTP_OK == responseCode;
+                                } else if (!statusCodes.isEmpty() && statusCodePredicate == null) {
+                                    // We use the default status predicate checker when we only have status codes
+                                    predicate = responseCode -> statusCodes.contains(responseCode);
+                                } else if (statusCodes.isEmpty()) {
+                                    // We only have a predicate
+                                    predicate = statusCodePredicate;
+                                } else {
+                                    // We have both predicate and status code
+                                    predicate =
+                                        statusCodePredicate.or(responseCode -> statusCodes.contains(responseCode));
+                                }
+                                if (!predicate.test(connection.getResponseCode())) {
+                                    throw new RuntimeException(
+                                        String.format("HTTP response code was: %s", connection.getResponseCode())
+                                    );
+                                }
+
+                                if (responsePredicate != null) {
+                                    String responseBody = getResponseBody(connection);
+
+                                    log.trace("Get response {}", responseBody);
+
+                                    if (!responsePredicate.test(responseBody)) {
+                                        throw new RuntimeException(
+                                            String.format("Response: %s did not match predicate", responseBody)
+                                        );
+                                    }
+                                }
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
                             }
-                        }
-
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                });
-                return true;
-            });
-
+                        });
+                    return true;
+                }
+            );
         } catch (TimeoutException e) {
-            throw new ContainerLaunchException(String.format(
-                "Timed out waiting for URL to be accessible (%s should return HTTP %s)", uri, statusCodes.isEmpty() ?
-                    HttpURLConnection.HTTP_OK : statusCodes));
+            throw new ContainerLaunchException(
+                String.format(
+                    "Timed out waiting for URL to be accessible (%s should return HTTP %s)",
+                    uri,
+                    statusCodes.isEmpty() ? HttpURLConnection.HTTP_OK : statusCodes
+                )
+            );
         }
     }
 
     private HttpURLConnection openConnection(final String uri) throws IOException, MalformedURLException {
         if (tlsEnabled) {
-            final HttpsURLConnection connection = (HttpsURLConnection)new URL(uri).openConnection();
+            final HttpsURLConnection connection = (HttpsURLConnection) new URL(uri).openConnection();
             if (allowInsecure) {
-                // Create a trust manager that does not validate certificate chains 
+                // Create a trust manager that does not validate certificate chains
                 // and trust all certificates
-                final TrustManager[] trustAllCerts = new TrustManager[] { 
+                final TrustManager[] trustAllCerts = new TrustManager[] {
                     new X509TrustManager() {
                         @Override
-                        public X509Certificate[] getAcceptedIssuers() { 
+                        public X509Certificate[] getAcceptedIssuers() {
                             return new X509Certificate[0];
                         }
-                        
+
                         @Override
-                        public void checkClientTrusted(final X509Certificate[] certs, final String authType) {
-                        } 
-                        
+                        public void checkClientTrusted(final X509Certificate[] certs, final String authType) {}
+
                         @Override
-                        public void checkServerTrusted(final X509Certificate[] certs, final String authType) {
-                        }
-                    } 
-                }; 
+                        public void checkServerTrusted(final X509Certificate[] certs, final String authType) {}
+                    },
+                };
 
                 try {
                     // Create custom SSL context and set the "trust all certificates" trust manager
-                    final SSLContext sc = SSLContext.getInstance("SSL"); 
-                    sc.init(new KeyManager[0], trustAllCerts, new SecureRandom()); 
+                    final SSLContext sc = SSLContext.getInstance("SSL");
+                    sc.init(new KeyManager[0], trustAllCerts, new SecureRandom());
                     connection.setSSLSocketFactory(sc.getSocketFactory());
                 } catch (final NoSuchAlgorithmException | KeyManagementException ex) {
                     throw new IOException("Unable to create custom SSL factory instance", ex);
                 }
             }
-            
+
             return connection;
         } else {
             return (HttpURLConnection) new URL(uri).openConnection();
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
index 65370e51bfa..7a095d888f2 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/LogMessageWaitStrategy.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.command.LogContainerCmd;
 import lombok.SneakyThrows;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
@@ -13,9 +12,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
-
 public class LogMessageWaitStrategy extends AbstractWaitStrategy {
 
     private String regEx;
@@ -27,22 +23,24 @@ public class LogMessageWaitStrategy extends AbstractWaitStrategy {
     protected void waitUntilReady() {
         WaitingConsumer waitingConsumer = new WaitingConsumer();
 
-        LogContainerCmd cmd = waitStrategyTarget.getDockerClient().logContainerCmd(waitStrategyTarget.getContainerId())
+        LogContainerCmd cmd = waitStrategyTarget
+            .getDockerClient()
+            .logContainerCmd(waitStrategyTarget.getContainerId())
             .withFollowStream(true)
             .withSince(0)
             .withStdOut(true)
             .withStdErr(true);
 
         try (FrameConsumerResultCallback callback = new FrameConsumerResultCallback()) {
-            callback.addConsumer(STDOUT, waitingConsumer);
-            callback.addConsumer(STDERR, waitingConsumer);
+            callback.addConsumer(OutputFrame.OutputType.STDOUT, waitingConsumer);
+            callback.addConsumer(OutputFrame.OutputType.STDERR, waitingConsumer);
 
             cmd.exec(callback);
 
-            Predicate<OutputFrame> waitPredicate = outputFrame ->
+            Predicate<OutputFrame> waitPredicate = outputFrame -> {
                 // (?s) enables line terminator matching (equivalent to Pattern.DOTALL)
-                outputFrame.getUtf8String().matches("(?s)" + regEx);
-
+                return outputFrame.getUtf8String().matches("(?s)" + regEx);
+            };
             try {
                 waitingConsumer.waitUntil(waitPredicate, startupTimeout.getSeconds(), TimeUnit.SECONDS, times);
             } catch (TimeoutException e) {
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
index 034a83a2949..6c3b9e86aec 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
@@ -1,12 +1,11 @@
 package org.testcontainers.containers.wait.strategy;
 
-import java.net.HttpURLConnection;
-
 /**
  * Convenience class with logic for building common {@link WaitStrategy} instances.
  *
  */
 public class Wait {
+
     /**
      * Convenience method to return the default WaitStrategy.
      *
@@ -34,8 +33,7 @@ public static HostPortWaitStrategy forListeningPort() {
      * @see HttpWaitStrategy
      */
     public static HttpWaitStrategy forHttp(String path) {
-        return new HttpWaitStrategy()
-                .forPath(path);
+        return new HttpWaitStrategy().forPath(path);
     }
 
     /**
@@ -46,8 +44,7 @@ public static HttpWaitStrategy forHttp(String path) {
      * @see HttpWaitStrategy
      */
     public static HttpWaitStrategy forHttps(String path) {
-        return forHttp(path)
-                .usingTls();
+        return forHttp(path).usingTls();
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java
index cebacb375b6..5c7530fc67f 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitAllStrategy.java
@@ -1,16 +1,15 @@
 package org.testcontainers.containers.wait.strategy;
 
+import org.rnorth.ducttape.timeouts.Timeouts;
+
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.rnorth.ducttape.timeouts.Timeouts;
-
 public class WaitAllStrategy implements WaitStrategy {
 
     public enum Mode {
-
         /**
          * This is the default mode: The timeout of the {@link WaitAllStrategy strategy} is applied to each individual
          * strategy, so that the container waits maximum for
@@ -30,11 +29,13 @@ public enum Mode {
          * This is the original mode of this strategy: The inner strategies wait with their preconfigured timeout
          * individually and the wait all strategy kills them, if the outer limit is reached.
          */
-        WITH_MAXIMUM_OUTER_TIMEOUT
+        WITH_MAXIMUM_OUTER_TIMEOUT,
     }
 
     private final Mode mode;
+
     private final List<WaitStrategy> strategies = new ArrayList<>();
+
     private Duration timeout = Duration.ofSeconds(30);
 
     public WaitAllStrategy() {
@@ -50,9 +51,13 @@ public void waitUntilReady(WaitStrategyTarget waitStrategyTarget) {
         if (mode == Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY) {
             waitUntilNestedStrategiesAreReady(waitStrategyTarget);
         } else {
-            Timeouts.doWithTimeout((int) timeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
-                waitUntilNestedStrategiesAreReady(waitStrategyTarget);
-            });
+            Timeouts.doWithTimeout(
+                (int) timeout.toMillis(),
+                TimeUnit.MILLISECONDS,
+                () -> {
+                    waitUntilNestedStrategiesAreReady(waitStrategyTarget);
+                }
+            );
         }
     }
 
@@ -63,7 +68,6 @@ private void waitUntilNestedStrategiesAreReady(WaitStrategyTarget waitStrategyTa
     }
 
     public WaitAllStrategy withStrategy(WaitStrategy strategy) {
-
         if (mode == Mode.WITH_OUTER_TIMEOUT) {
             applyStartupTimeout(strategy);
         }
@@ -74,10 +78,13 @@ public WaitAllStrategy withStrategy(WaitStrategy strategy) {
 
     @Override
     public WaitAllStrategy withStartupTimeout(Duration startupTimeout) {
-
         if (mode == Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY) {
-            throw new IllegalStateException(String.format(
-                "Changing startup timeout is not supported with mode %s", Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY));
+            throw new IllegalStateException(
+                String.format(
+                    "Changing startup timeout is not supported with mode %s",
+                    Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY
+                )
+            );
         }
 
         this.timeout = startupTimeout;
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategy.java
index 25703174502..ff371cf775f 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategy.java
@@ -3,7 +3,6 @@
 import java.time.Duration;
 
 public interface WaitStrategy {
-
     void waitUntilReady(WaitStrategyTarget waitStrategyTarget);
 
     WaitStrategy withStartupTimeout(Duration startupTimeout);
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategyTarget.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategyTarget.java
index 49f88fb7711..778c252009b 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategyTarget.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/WaitStrategyTarget.java
@@ -6,13 +6,15 @@
 import java.util.stream.Collectors;
 
 public interface WaitStrategyTarget extends ContainerState {
-
     /**
      * @return the ports on which to check if the container is ready
      */
     default Set<Integer> getLivenessCheckPortNumbers() {
-        final Set<Integer> result = getExposedPorts().stream()
-            .map(this::getMappedPort).distinct().collect(Collectors.toSet());
+        final Set<Integer> result = getExposedPorts()
+            .stream()
+            .map(this::getMappedPort)
+            .distinct()
+            .collect(Collectors.toSet());
         result.addAll(getBoundPortNumbers());
         return result;
     }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
index 2dc88cad313..2b413aafaed 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
@@ -5,13 +5,12 @@
 import lombok.experimental.Delegate;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
+import org.testcontainers.utility.AuditLogger;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 import java.util.function.BiConsumer;
 
-import static org.testcontainers.utility.AuditLogger.doLog;
-
 /**
  * Wrapper for {@link DockerClient} to facilitate 'audit logging' of potentially destruction actions using
  * {@link org.testcontainers.utility.AuditLogger}.
@@ -30,97 +29,117 @@ public AuditLoggingDockerClient(DockerClient wrappedClient) {
 
     @Override
     public CreateContainerCmd createContainerCmd(@NotNull String image) {
-        return wrappedCommand(CreateContainerCmd.class,
-                wrappedClient.createContainerCmd(image),
-                (cmd, res) -> doLog("CREATE", image, res.getId(), cmd),
-                (cmd, e) -> doLog("CREATE", image, null, cmd, e));
-
+        return wrappedCommand(
+            CreateContainerCmd.class,
+            wrappedClient.createContainerCmd(image),
+            (cmd, res) -> AuditLogger.doLog("CREATE", image, res.getId(), cmd),
+            (cmd, e) -> AuditLogger.doLog("CREATE", image, null, cmd, e)
+        );
     }
 
     @Override
     public StartContainerCmd startContainerCmd(@NotNull String containerId) {
-        return wrappedCommand(StartContainerCmd.class,
-                wrappedClient.startContainerCmd(containerId),
-                (cmd, res) -> doLog("START", null, containerId, cmd),
-                (cmd, e) -> doLog("START", null, containerId, cmd, e));
+        return wrappedCommand(
+            StartContainerCmd.class,
+            wrappedClient.startContainerCmd(containerId),
+            (cmd, res) -> AuditLogger.doLog("START", null, containerId, cmd),
+            (cmd, e) -> AuditLogger.doLog("START", null, containerId, cmd, e)
+        );
     }
 
     @Override
     public RemoveContainerCmd removeContainerCmd(@NotNull String containerId) {
-        return wrappedCommand(RemoveContainerCmd.class,
-                wrappedClient.removeContainerCmd(containerId),
-                (cmd, res) -> doLog("REMOVE", null, containerId, cmd),
-                (cmd, e) -> doLog("REMOVE", null, containerId, cmd, e));
+        return wrappedCommand(
+            RemoveContainerCmd.class,
+            wrappedClient.removeContainerCmd(containerId),
+            (cmd, res) -> AuditLogger.doLog("REMOVE", null, containerId, cmd),
+            (cmd, e) -> AuditLogger.doLog("REMOVE", null, containerId, cmd, e)
+        );
     }
 
     @Override
     public StopContainerCmd stopContainerCmd(@NotNull String containerId) {
-        return wrappedCommand(StopContainerCmd.class,
-                wrappedClient.stopContainerCmd(containerId),
-                (cmd, res) -> doLog("STOP", null, containerId, cmd),
-                (cmd, e) -> doLog("STOP", null, containerId, cmd, e));
+        return wrappedCommand(
+            StopContainerCmd.class,
+            wrappedClient.stopContainerCmd(containerId),
+            (cmd, res) -> AuditLogger.doLog("STOP", null, containerId, cmd),
+            (cmd, e) -> AuditLogger.doLog("STOP", null, containerId, cmd, e)
+        );
     }
 
     @Override
     public KillContainerCmd killContainerCmd(@NotNull String containerId) {
-        return wrappedCommand(KillContainerCmd.class,
-                wrappedClient.killContainerCmd(containerId),
-                (cmd, res) -> doLog("KILL", null, containerId, cmd),
-                (cmd, e) -> doLog("KILL", null, containerId, cmd, e));
+        return wrappedCommand(
+            KillContainerCmd.class,
+            wrappedClient.killContainerCmd(containerId),
+            (cmd, res) -> AuditLogger.doLog("KILL", null, containerId, cmd),
+            (cmd, e) -> AuditLogger.doLog("KILL", null, containerId, cmd, e)
+        );
     }
 
     @Override
     public CreateNetworkCmd createNetworkCmd() {
-        return wrappedCommand(CreateNetworkCmd.class,
-                wrappedClient.createNetworkCmd(),
-                (cmd, res) -> doLog("CREATE_NETWORK", null, null, cmd),
-                (cmd, e) -> doLog("CREATE_NETWORK", null, null, cmd, e));
+        return wrappedCommand(
+            CreateNetworkCmd.class,
+            wrappedClient.createNetworkCmd(),
+            (cmd, res) -> AuditLogger.doLog("CREATE_NETWORK", null, null, cmd),
+            (cmd, e) -> AuditLogger.doLog("CREATE_NETWORK", null, null, cmd, e)
+        );
     }
 
     @Override
     public RemoveNetworkCmd removeNetworkCmd(@NotNull String networkId) {
-        return wrappedCommand(RemoveNetworkCmd.class,
-                wrappedClient.removeNetworkCmd(networkId),
-                (cmd, res) -> doLog("REMOVE_NETWORK", null, null, cmd),
-                (cmd, e) -> doLog("REMOVE_NETWORK", null, null, cmd, e));
+        return wrappedCommand(
+            RemoveNetworkCmd.class,
+            wrappedClient.removeNetworkCmd(networkId),
+            (cmd, res) -> AuditLogger.doLog("REMOVE_NETWORK", null, null, cmd),
+            (cmd, e) -> AuditLogger.doLog("REMOVE_NETWORK", null, null, cmd, e)
+        );
     }
 
-    private <T extends SyncDockerCmd<R>, R> T wrappedCommand(Class<T> clazz,
-                                                             T cmd,
-                                                             BiConsumer<T, R> successConsumer,
-                                                             BiConsumer<T, Exception> failureConsumer) {
-
+    private <T extends SyncDockerCmd<R>, R> T wrappedCommand(
+        Class<T> clazz,
+        T cmd,
+        BiConsumer<T, R> successConsumer,
+        BiConsumer<T, Exception> failureConsumer
+    ) {
         return (T) Proxy.newProxyInstance(
-                clazz.getClassLoader(),
-                new Class<?>[]{clazz},
-                (proxy, method, args) -> {
-
-                    if (method.getName().equals("exec")) {
-                        try {
-                            R r = (R) method.invoke(cmd, args);
-                            successConsumer.accept(cmd, r);
-                            return r;
-                        } catch (Exception e) {
-                            if (e instanceof InvocationTargetException && e.getCause() instanceof Exception) {
-                                e = (Exception) e.getCause();
-                            }
-                            failureConsumer.accept(cmd, e);
-                            throw e;
+            clazz.getClassLoader(),
+            new Class<?>[] { clazz },
+            (proxy, method, args) -> {
+                if (method.getName().equals("exec")) {
+                    try {
+                        R r = (R) method.invoke(cmd, args);
+                        successConsumer.accept(cmd, r);
+                        return r;
+                    } catch (Exception e) {
+                        if (e instanceof InvocationTargetException && e.getCause() instanceof Exception) {
+                            e = (Exception) e.getCause();
                         }
-                    } else {
-                        return method.invoke(cmd, args);
+                        failureConsumer.accept(cmd, e);
+                        throw e;
                     }
-                });
+                } else {
+                    return method.invoke(cmd, args);
+                }
+            }
+        );
     }
 
     @SuppressWarnings("unused")
     private interface InterceptedMethods {
         CreateContainerCmd createContainerCmd(String image);
+
         StartContainerCmd startContainerCmd(String containerId);
+
         RemoveContainerCmd removeContainerCmd(String containerId);
+
         StopContainerCmd stopContainerCmd(String containerId);
+
         KillContainerCmd killContainerCmd(String containerId);
+
         CreateNetworkCmd createNetworkCmd();
+
         RemoveNetworkCmd removeNetworkCmd(String networkId);
     }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
index 1f534eb59e5..5713d054e13 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
@@ -4,11 +4,10 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientConfigDelegate;
 import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.utility.AuthConfigUtil;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.RegistryAuthLocator;
 
-import static org.testcontainers.utility.AuthConfigUtil.toSafeString;
-
 /**
  * Facade implementation for {@link DockerClientConfig} which overrides how authentication
  * configuration is obtained. A delegate {@link DockerClientConfig} will be called first
@@ -31,18 +30,21 @@ public AuthConfig effectiveAuthConfig(String imageName) {
         try {
             fallbackAuthConfig = super.effectiveAuthConfig(imageName);
         } catch (Exception e) {
-            log.debug("Delegate call to effectiveAuthConfig failed with cause: '{}'. " +
+            log.debug(
+                "Delegate call to effectiveAuthConfig failed with cause: '{}'. " +
                 "Resolution of auth config will continue using RegistryAuthLocator.",
-                e.getMessage());
+                e.getMessage()
+            );
             fallbackAuthConfig = new AuthConfig();
         }
 
         // try and obtain more accurate auth config using our resolution
         final DockerImageName parsed = DockerImageName.parse(imageName);
-        final AuthConfig effectiveAuthConfig = RegistryAuthLocator.instance()
+        final AuthConfig effectiveAuthConfig = RegistryAuthLocator
+            .instance()
             .lookupAuthConfig(parsed, fallbackAuthConfig);
 
-        log.debug("Effective auth config [{}]", toSafeString(effectiveAuthConfig));
+        log.debug("Effective auth config [{}]", AuthConfigUtil.toSafeString(effectiveAuthConfig));
         return effectiveAuthConfig;
     }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
index e393e59419f..7206a7e1452 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
@@ -8,8 +8,7 @@
 import java.io.File;
 import java.net.URI;
 import java.util.Optional;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 public class DockerClientConfigUtils {
@@ -19,25 +18,31 @@ public class DockerClientConfigUtils {
 
     @Getter(lazy = true)
     private static final Optional<String> defaultGateway = Optional
-            .ofNullable(DockerClientFactory.instance().runInsideDocker(
+        .ofNullable(
+            DockerClientFactory
+                .instance()
+                .runInsideDocker(
                     cmd -> cmd.withCmd("sh", "-c", "ip route|awk '/default/ { print $3 }'"),
                     (client, id) -> {
                         try {
                             LogToStringContainerCallback loggingCallback = new LogToStringContainerCallback();
-                            client.logContainerCmd(id).withStdOut(true)
-                                                      .withFollowStream(true)
-                                                      .exec(loggingCallback)
-                                                      .awaitStarted();
-                            loggingCallback.awaitCompletion(3, SECONDS);
+                            client
+                                .logContainerCmd(id)
+                                .withStdOut(true)
+                                .withFollowStream(true)
+                                .exec(loggingCallback)
+                                .awaitStarted();
+                            loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
                             return loggingCallback.toString();
                         } catch (Exception e) {
                             log.warn("Can't parse the default gateway IP", e);
                             return null;
                         }
                     }
-            ))
-            .map(StringUtils::trimToEmpty)
-            .filter(StringUtils::isNotBlank);
+                )
+        )
+        .map(StringUtils::trimToEmpty)
+        .filter(StringUtils::isNotBlank);
 
     /**
      * @deprecated use {@link DockerClientProviderStrategy#getDockerHostIpAddress()}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 834e670438a..0d2aa3d08ed 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -27,7 +27,6 @@
 import org.testcontainers.UnstableAPI;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
-import javax.net.SocketFactory;
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -54,6 +53,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.net.SocketFactory;
+
 /**
  * Mechanism to find a viable Docker client configuration according to the host system environment.
  */
@@ -68,10 +69,11 @@ public abstract class DockerClientProviderStrategy {
     @Getter
     private Info info;
 
-    private final RateLimiter PING_RATE_LIMITER = RateLimiterBuilder.newBuilder()
-            .withRate(10, TimeUnit.SECONDS)
-            .withConstantThroughput()
-            .build();
+    private final RateLimiter PING_RATE_LIMITER = RateLimiterBuilder
+        .newBuilder()
+        .withRate(10, TimeUnit.SECONDS)
+        .withConstantThroughput()
+        .build();
 
     private static final AtomicBoolean FAIL_FAST_ALWAYS = new AtomicBoolean(false);
 
@@ -109,14 +111,18 @@ protected int getPriority() {
     public DockerClient getClient() {
         DockerClient dockerClient = getDockerClient();
         try {
-            Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS, () -> {
-                return PING_RATE_LIMITER.getWhenReady(() -> {
-                    log.debug("Pinging docker daemon...");
-                    dockerClient.pingCmd().exec();
-                    log.debug("Pinged");
-                    return true;
-                });
-            });
+            Unreliables.retryUntilSuccess(
+                30,
+                TimeUnit.SECONDS,
+                () -> {
+                    return PING_RATE_LIMITER.getWhenReady(() -> {
+                        log.debug("Pinging docker daemon...");
+                        dockerClient.pingCmd().exec();
+                        log.debug("Pinged");
+                        return true;
+                    });
+                }
+            );
         } catch (TimeoutException e) {
             IOUtils.closeQuietly(dockerClient);
             throw e;
@@ -143,7 +149,12 @@ protected boolean test() {
                 if (sslConfig != null) {
                     try {
                         socketFactory = sslConfig.getSSLContext().getSocketFactory();
-                    } catch (KeyManagementException | UnrecoverableKeyException | NoSuchAlgorithmException | KeyStoreException e) {
+                    } catch (
+                        KeyManagementException
+                        | UnrecoverableKeyException
+                        | NoSuchAlgorithmException
+                        | KeyStoreException e
+                    ) {
                         log.warn("Exception while creating SSLSocketFactory", e);
                         return false;
                     }
@@ -157,16 +168,17 @@ protected boolean test() {
                     log.debug("DOCKER_HOST socket file '{}' does not exist", dockerHost.getPath());
                     return false;
                 }
-                socketProvider = () -> {
-                    switch (dockerHost.getScheme()) {
-                        case "unix":
-                            return UnixSocket.get(dockerHost.getPath());
-                        case "npipe":
-                            return new NamedPipeSocket(dockerHost.getPath());
-                        default:
-                            throw new IllegalStateException("Unexpected scheme " + dockerHost.getScheme());
-                    }
-                };
+                socketProvider =
+                    () -> {
+                        switch (dockerHost.getScheme()) {
+                            case "unix":
+                                return UnixSocket.get(dockerHost.getPath());
+                            case "npipe":
+                                return new NamedPipeSocket(dockerHost.getPath());
+                            default:
+                                throw new IllegalStateException("Unexpected scheme " + dockerHost.getScheme());
+                        }
+                    };
                 socketAddress = new InetSocketAddress("localhost", 2375);
                 break;
             default:
@@ -176,7 +188,8 @@ protected boolean test() {
 
         try (Socket socket = socketProvider.call()) {
             Duration timeout = Duration.ofMillis(200);
-            Awaitility.await()
+            Awaitility
+                .await()
                 .atMost(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS)
                 .pollInterval(timeout)
                 .pollDelay(Duration.ofSeconds(0)) // start checking immediately
@@ -195,9 +208,10 @@ protected boolean test() {
      * @return a working DockerClientConfig, as determined by successful execution of a ping command
      */
     public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClientProviderStrategy> strategies) {
-
         if (FAIL_FAST_ALWAYS.get()) {
-            throw new IllegalStateException("Previous attempts to find a Docker environment failed. Will not retry. Please see logs and check configuration");
+            throw new IllegalStateException(
+                "Previous attempts to find a Docker environment failed. Will not retry. Please see logs and check configuration"
+            );
         }
 
         List<String> configurationFailures = new ArrayList<>();
@@ -215,7 +229,6 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
             .sorted(Comparator.comparing(DockerClientProviderStrategy::getPriority).reversed())
             .collect(Collectors.toCollection(() -> allStrategies));
 
-
         Predicate<DockerClientProviderStrategy> distinctStrategyClassPredicate = new Predicate<DockerClientProviderStrategy>() {
             final Set<Class<? extends DockerClientProviderStrategy>> classes = new HashSet<>();
 
@@ -232,14 +245,18 @@ public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
             .filter(strategy -> tryOutStrategy(configurationFailures, strategy))
             .findFirst()
             .orElseThrow(() -> {
-                log.error("Could not find a valid Docker environment. Please check configuration. Attempted configurations were:");
+                log.error(
+                    "Could not find a valid Docker environment. Please check configuration. Attempted configurations were:"
+                );
                 for (String failureMessage : configurationFailures) {
                     log.error("    " + failureMessage);
                 }
                 log.error("As no valid configuration was found, execution cannot continue");
 
                 FAIL_FAST_ALWAYS.set(true);
-                return new IllegalStateException("Could not find a valid Docker environment. Please see logs and check configuration");
+                return new IllegalStateException(
+                    "Could not find a valid Docker environment. Please see logs and check configuration"
+                );
             });
     }
 
@@ -270,30 +287,39 @@ private static boolean tryOutStrategy(List<String> configurationFailures, Docker
             }
 
             if (strategy.isPersistable()) {
-                TestcontainersConfiguration.getInstance().updateUserConfig("docker.client.strategy", strategy.getClass().getName());
+                TestcontainersConfiguration
+                    .getInstance()
+                    .updateUserConfig("docker.client.strategy", strategy.getClass().getName());
             }
 
             return true;
         } catch (Exception | ExceptionInInitializerError | NoClassDefFoundError e) {
-            @Nullable String throwableMessage = e.getMessage();
+            @Nullable
+            String throwableMessage = e.getMessage();
             @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
             Throwable rootCause = Throwables.getRootCause(e);
-            @Nullable String rootCauseMessage = rootCause.getMessage();
+            @Nullable
+            String rootCauseMessage = rootCause.getMessage();
 
             String failureDescription;
             if (throwableMessage != null && throwableMessage.equals(rootCauseMessage)) {
-                failureDescription = String.format("%s: failed with exception %s (%s)",
+                failureDescription =
+                    String.format(
+                        "%s: failed with exception %s (%s)",
                         strategy.getClass().getSimpleName(),
                         e.getClass().getSimpleName(),
-                        throwableMessage);
+                        throwableMessage
+                    );
             } else {
-                failureDescription = String.format("%s: failed with exception %s (%s). Root cause %s (%s)",
+                failureDescription =
+                    String.format(
+                        "%s: failed with exception %s (%s). Root cause %s (%s)",
                         strategy.getClass().getSimpleName(),
                         e.getClass().getSimpleName(),
                         throwableMessage,
                         rootCause.getClass().getSimpleName(),
                         rootCauseMessage
-                );
+                    );
             }
             configurationFailures.add(failureDescription);
 
@@ -303,20 +329,28 @@ private static boolean tryOutStrategy(List<String> configurationFailures, Docker
     }
 
     private static Optional<? extends DockerClientProviderStrategy> loadConfiguredStrategy() {
-        String configuredDockerClientStrategyClassName = TestcontainersConfiguration.getInstance().getDockerClientStrategyClassName();
+        String configuredDockerClientStrategyClassName = TestcontainersConfiguration
+            .getInstance()
+            .getDockerClientStrategyClassName();
 
         return Stream
             .of(configuredDockerClientStrategyClassName)
             .filter(Objects::nonNull)
             .flatMap(it -> {
                 try {
-                    Class<? extends DockerClientProviderStrategy> strategyClass = (Class) Thread.currentThread().getContextClassLoader().loadClass(it);
+                    Class<? extends DockerClientProviderStrategy> strategyClass = (Class) Thread
+                        .currentThread()
+                        .getContextClassLoader()
+                        .loadClass(it);
                     return Stream.of(strategyClass.newInstance());
                 } catch (ClassNotFoundException e) {
-                    log.warn("Can't instantiate a strategy from {} (ClassNotFoundException). " +
+                    log.warn(
+                        "Can't instantiate a strategy from {} (ClassNotFoundException). " +
                         "This probably means that cached configuration refers to a client provider " +
                         "class that is not available in this version of Testcontainers. Other " +
-                        "strategies will be tried instead.", it);
+                        "strategies will be tried instead.",
+                        it
+                    );
                     return Stream.empty();
                 } catch (InstantiationException | IllegalAccessException e) {
                     log.warn("Can't instantiate a strategy from {}", it, e);
@@ -325,7 +359,12 @@ private static Optional<? extends DockerClientProviderStrategy> loadConfiguredSt
             })
             // Ignore persisted strategy if it's not persistable anymore
             .filter(DockerClientProviderStrategy::isPersistable)
-            .peek(strategy -> log.info("Loaded {} from ~/.testcontainers.properties, will try it first", strategy.getClass().getName()))
+            .peek(strategy -> {
+                log.info(
+                    "Loaded {} from ~/.testcontainers.properties, will try it first",
+                    strategy.getClass().getName()
+                );
+            })
             .findFirst();
     }
 
@@ -335,10 +374,11 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
         String transportType = TestcontainersConfiguration.getInstance().getTransportType();
         switch (transportType) {
             case "httpclient5":
-                dockerHttpClient = new ZerodepDockerHttpClient.Builder()
-                    .dockerHost(transportConfig.getDockerHost())
-                    .sslConfig(transportConfig.getSslConfig())
-                    .build();
+                dockerHttpClient =
+                    new ZerodepDockerHttpClient.Builder()
+                        .dockerHost(transportConfig.getDockerHost())
+                        .sslConfig(transportConfig.getSslConfig())
+                        .build();
                 break;
             default:
                 throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
@@ -351,9 +391,7 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
         }
         return DockerClientImpl.getInstance(
             new AuthDelegatingDockerClientConfig(
-                configBuilder
-                    .withDockerHost(transportConfig.getDockerHost().toString())
-                    .build()
+                configBuilder.withDockerHost(transportConfig.getDockerHost().toString()).build()
             ),
             new HeadersAddingDockerHttpClient(
                 dockerHttpClient,
@@ -384,7 +422,8 @@ static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost) {
             case "unix":
             case "npipe":
                 if (DockerClientConfigUtils.IN_A_CONTAINER) {
-                    return client.inspectNetworkCmd()
+                    return client
+                        .inspectNetworkCmd()
                         .withNetworkId("bridge")
                         .exec()
                         .getIpam()
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
index 4de508ea808..7c05a11c198 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
@@ -1,6 +1,7 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.core.LocalDirectorySSLConfig;
+import com.google.common.base.Preconditions;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.utility.CommandLine;
@@ -11,8 +12,6 @@
 import java.util.Arrays;
 import java.util.Optional;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 /**
  * Use Docker machine (if available on the PATH) to locate a Docker environment.
  *
@@ -27,10 +26,16 @@ public final class DockerMachineClientProviderStrategy extends DockerClientProvi
 
     private TransportConfig resolveTransportConfig() throws InvalidConfigurationException {
         boolean installed = DockerMachineClient.instance().isInstalled();
-        checkArgument(installed, "docker-machine executable was not found on PATH (" + Arrays.toString(CommandLine.getSystemPath()) + ")");
+        Preconditions.checkArgument(
+            installed,
+            "docker-machine executable was not found on PATH (" + Arrays.toString(CommandLine.getSystemPath()) + ")"
+        );
 
         Optional<String> machineNameOptional = DockerMachineClient.instance().getDefaultMachine();
-        checkArgument(machineNameOptional.isPresent(), "docker-machine is installed but no default machine could be found");
+        Preconditions.checkArgument(
+            machineNameOptional.isPresent(),
+            "docker-machine is installed but no default machine could be found"
+        );
         String machineName = machineNameOptional.get();
 
         log.info("Found docker-machine, and will use machine named {}", machineName);
@@ -41,7 +46,8 @@ private TransportConfig resolveTransportConfig() throws InvalidConfigurationExce
 
         log.info("Docker daemon URL for docker machine {} is {}", machineName, dockerDaemonUrl);
 
-        return TransportConfig.builder()
+        return TransportConfig
+            .builder()
             .dockerHost(URI.create(dockerDaemonUrl))
             .sslConfig(
                 new LocalDirectorySSLConfig(
@@ -55,7 +61,10 @@ private TransportConfig resolveTransportConfig() throws InvalidConfigurationExce
     protected boolean isApplicable() {
         boolean installed = DockerMachineClient.instance().isInstalled();
         if (!installed) {
-            log.info("docker-machine executable was not found on PATH ({})", Arrays.toString(CommandLine.getSystemPath()));
+            log.info(
+                "docker-machine executable was not found on PATH ({})",
+                Arrays.toString(CommandLine.getSystemPath())
+            );
             return false;
         }
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
index 06fdf387d6a..969610373d1 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
@@ -35,7 +35,8 @@ public EnvironmentAndSystemPropertyClientProviderStrategy() {
     }
 
     EnvironmentAndSystemPropertyClientProviderStrategy(DefaultDockerClientConfig.Builder configBuilder) {
-        String dockerConfigSource = TestcontainersConfiguration.getInstance()
+        String dockerConfigSource = TestcontainersConfiguration
+            .getInstance()
             .getEnvVarOrProperty("dockerconfig.source", "auto");
 
         switch (dockerConfigSource) {
@@ -62,7 +63,8 @@ private Optional<String> getSetting(final String name) {
 
     @Override
     public TransportConfig getTransportConfig() {
-        return TransportConfig.builder()
+        return TransportConfig
+            .builder()
             .dockerHost(dockerClientConfig.getDockerHost())
             .sslConfig(dockerClientConfig.getSSLConfig())
             .build();
@@ -75,7 +77,10 @@ protected int getPriority() {
 
     @Override
     public String getDescription() {
-        return "Environment variables, system properties and defaults. Resolved dockerHost=" + dockerClientConfig.getDockerHost();
+        return (
+            "Environment variables, system properties and defaults. Resolved dockerHost=" +
+            dockerClientConfig.getDockerHost()
+        );
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java b/core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java
index 59a51e19a80..7ff1b0b620c 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/HeadersAddingDockerHttpClient.java
@@ -19,9 +19,7 @@ class HeadersAddingDockerHttpClient implements DockerHttpClient {
 
     @Override
     public Response execute(Request request) {
-        request = Request.builder().from(request)
-            .putAllHeaders(headers)
-            .build();
+        request = Request.builder().from(request).putAllHeaders(headers).build();
         return delegate.execute(request);
     }
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/InvalidConfigurationException.java b/core/src/main/java/org/testcontainers/dockerclient/InvalidConfigurationException.java
index ef834c9cec5..504378cb17e 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/InvalidConfigurationException.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/InvalidConfigurationException.java
@@ -12,4 +12,4 @@ public InvalidConfigurationException(String s) {
     public InvalidConfigurationException(String message, Throwable cause) {
         super(message, cause);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java b/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java
index d376b685a91..2c0716b65f0 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/LogToStringContainerCallback.java
@@ -9,6 +9,7 @@
  */
 @Deprecated
 public class LogToStringContainerCallback extends ResultCallback.Adapter<Frame> {
+
     private final StringBuffer log = new StringBuffer();
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
index 7f73e1d7675..0e1f641fe8a 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/NpipeSocketClientProviderStrategy.java
@@ -12,15 +12,14 @@
 public final class NpipeSocketClientProviderStrategy extends DockerClientProviderStrategy {
 
     protected static final String DOCKER_SOCK_PATH = "//./pipe/docker_engine";
+
     private static final String SOCKET_LOCATION = "npipe://" + DOCKER_SOCK_PATH;
 
     public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 20;
 
     @Override
     public TransportConfig getTransportConfig() {
-        return TransportConfig.builder()
-            .dockerHost(URI.create(SOCKET_LOCATION))
-            .build();
+        return TransportConfig.builder().dockerHost(URI.create(SOCKET_LOCATION)).build();
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
index 36d6b5f6123..a032c2b324d 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
@@ -29,13 +29,15 @@ public final class RootlessDockerClientProviderStrategy extends DockerClientProv
     private final Path socketPath = resolveSocketPath();
 
     private Path resolveSocketPath() {
-        return tryEnv().orElseGet(() -> {
-            Path homePath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("run");
-            return tryFolder(homePath).orElseGet(() -> {
-                Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
-                return tryFolder(implicitPath).orElse(null);
+        return tryEnv()
+            .orElseGet(() -> {
+                Path homePath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("run");
+                return tryFolder(homePath)
+                    .orElseGet(() -> {
+                        Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
+                        return tryFolder(implicitPath).orElse(null);
+                    });
             });
-        });
     }
 
     private Optional<Path> tryEnv() {
@@ -72,9 +74,7 @@ private Optional<Path> tryFolder(Path path) {
 
     @Override
     public TransportConfig getTransportConfig() throws InvalidConfigurationException {
-        return TransportConfig.builder()
-            .dockerHost(URI.create("unix://" + getSocketPath().toString()))
-            .build();
+        return TransportConfig.builder().dockerHost(URI.create("unix://" + getSocketPath().toString())).build();
     }
 
     @Override
@@ -93,10 +93,8 @@ protected int getPriority() {
     }
 
     private interface LibC extends Library {
-
         LibC INSTANCE = Native.loadLibrary("c", LibC.class);
 
         int getuid();
     }
-
 }
diff --git a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
index 4a85394155d..c262bda1db5 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/UnixSocketClientProviderStrategy.java
@@ -14,8 +14,11 @@
  */
 @Deprecated
 public final class UnixSocketClientProviderStrategy extends DockerClientProviderStrategy {
+
     protected static final String DOCKER_SOCK_PATH = "/var/run/docker.sock";
+
     private static final String SOCKET_LOCATION = "unix://" + DOCKER_SOCK_PATH;
+
     private static final int SOCKET_FILE_MODE_MASK = 0xc000;
 
     public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 20;
@@ -31,12 +34,12 @@ public TransportConfig getTransportConfig() throws InvalidConfigurationException
         }
 
         if ((mode & 0xc000) != SOCKET_FILE_MODE_MASK) {
-            throw new InvalidConfigurationException("Found docker unix domain socket but file mode was not as expected (expected: srwxr-xr-x). This problem is possibly due to occurrence of this issue in the past: https://github.com/docker/docker/issues/13121");
+            throw new InvalidConfigurationException(
+                "Found docker unix domain socket but file mode was not as expected (expected: srwxr-xr-x). This problem is possibly due to occurrence of this issue in the past: https://github.com/docker/docker/issues/13121"
+            );
         }
 
-        return TransportConfig.builder()
-            .dockerHost(URI.create(SOCKET_LOCATION))
-            .build();
+        return TransportConfig.builder().dockerHost(URI.create(SOCKET_LOCATION)).build();
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java b/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
index f5d75ad9617..1f9583ef4cf 100644
--- a/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
+++ b/core/src/main/java/org/testcontainers/images/AbstractImagePullPolicy.java
@@ -36,7 +36,6 @@ public boolean shouldPull(DockerImageName imageName) {
             log.debug("Using locally available and not pulling image: {}", imageName);
             return false;
         }
-
     }
 
     /**
@@ -45,5 +44,5 @@ public boolean shouldPull(DockerImageName imageName) {
      *
      * @return {@code true} to update the locally available image, {@code false} to use local instead
      */
-    abstract protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData);
+    protected abstract boolean shouldPullCached(DockerImageName imageName, ImageData localImageData);
 }
diff --git a/core/src/main/java/org/testcontainers/images/ImageData.java b/core/src/main/java/org/testcontainers/images/ImageData.java
index 345b5939268..e57be2dbbbd 100644
--- a/core/src/main/java/org/testcontainers/images/ImageData.java
+++ b/core/src/main/java/org/testcontainers/images/ImageData.java
@@ -17,14 +17,13 @@ public class ImageData {
     Instant createdAt;
 
     static ImageData from(InspectImageResponse inspectImageResponse) {
-        return ImageData.builder()
+        return ImageData
+            .builder()
             .createdAt(ZonedDateTime.parse(inspectImageResponse.getCreated()).toInstant())
             .build();
     }
 
     static ImageData from(Image image) {
-        return ImageData.builder()
-            .createdAt(Instant.ofEpochMilli(image.getCreated()))
-            .build();
+        return ImageData.builder().createdAt(Instant.ofEpochMilli(image.getCreated())).build();
     }
 }
diff --git a/core/src/main/java/org/testcontainers/images/ImagePullPolicy.java b/core/src/main/java/org/testcontainers/images/ImagePullPolicy.java
index e821e511795..a090c3f7b9c 100644
--- a/core/src/main/java/org/testcontainers/images/ImagePullPolicy.java
+++ b/core/src/main/java/org/testcontainers/images/ImagePullPolicy.java
@@ -3,7 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface ImagePullPolicy {
-
     boolean shouldPull(DockerImageName imageName);
-
 }
diff --git a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
index 8791ecb6986..c98339e9f4c 100644
--- a/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
+++ b/core/src/main/java/org/testcontainers/images/LocalImagesCache.java
@@ -79,14 +79,12 @@ private void populateFromList(List<Image> images) {
             }
 
             cache.putAll(
-                Stream.of(repoTags)
+                Stream
+                    .of(repoTags)
                     // Protection against some edge case where local image repository tags end up with duplicates
                     // making toMap crash at merge time.
                     .distinct()
-                    .collect(Collectors.toMap(
-                        DockerImageName::new,
-                        it -> ImageData.from(image)
-                    ))
+                    .collect(Collectors.toMap(DockerImageName::new, it -> ImageData.from(image)))
             );
         }
     }
diff --git a/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
index 2ba8ba6df11..32e19090b5c 100644
--- a/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
+++ b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.model.PullResponseItem;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 
 import java.io.Closeable;
@@ -9,21 +10,25 @@
 import java.time.Instant;
 import java.util.*;
 
-import static java.lang.String.format;
-import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
-
 /**
  * {@link PullImageResultCallback} with improved logging of pull progress.
  */
 class LoggedPullImageResultCallback extends PullImageResultCallback {
+
     private final Logger logger;
 
     private final Set<String> allLayers = new HashSet<>();
+
     private final Set<String> downloadedLayers = new HashSet<>();
+
     private final Set<String> pulledLayers = new HashSet<>();
+
     private final Map<String, Long> totalSizes = new HashMap<>();
+
     private final Map<String, Long> currentSizes = new HashMap<>();
+
     private boolean completed;
+
     private Instant start;
 
     LoggedPullImageResultCallback(final Logger logger) {
@@ -69,8 +74,7 @@ public void onNext(final PullResponseItem item) {
             }
         }
 
-        if (statusLowercase.startsWith("pulling from" ) || statusLowercase.contains("complete" )) {
-
+        if (statusLowercase.startsWith("pulling from") || statusLowercase.contains("complete")) {
             long totalSize = totalLayerSize();
             long currentSize = downloadedLayerSize();
 
@@ -79,15 +83,17 @@ public void onNext(final PullResponseItem item) {
             if (pendingCount > 0) {
                 friendlyTotalSize = "? MB";
             } else {
-                friendlyTotalSize = byteCountToDisplaySize(totalSize);
+                friendlyTotalSize = FileUtils.byteCountToDisplaySize(totalSize);
             }
 
-            logger.info("Pulling image layers: {} pending, {} downloaded, {} extracted, ({}/{})",
-                format("%2d", pendingCount),
-                format("%2d", downloadedLayers.size()),
-                format("%2d", pulledLayers.size()),
-                byteCountToDisplaySize(currentSize),
-                friendlyTotalSize);
+            logger.info(
+                "Pulling image layers: {} pending, {} downloaded, {} extracted, ({}/{})",
+                String.format("%2d", pendingCount),
+                String.format("%2d", downloadedLayers.size()),
+                String.format("%2d", pulledLayers.size()),
+                FileUtils.byteCountToDisplaySize(currentSize),
+                friendlyTotalSize
+            );
         }
 
         if (statusLowercase.contains("complete")) {
@@ -103,11 +109,13 @@ public void onComplete() {
         final long duration = Duration.between(start, Instant.now()).getSeconds();
 
         if (completed) {
-            logger.info("Pull complete. {} layers, pulled in {}s (downloaded {} at {}/s)",
+            logger.info(
+                "Pull complete. {} layers, pulled in {}s (downloaded {} at {}/s)",
                 allLayers.size(),
                 duration,
-                byteCountToDisplaySize(downloadedLayerSize),
-                byteCountToDisplaySize(downloadedLayerSize / duration));
+                FileUtils.byteCountToDisplaySize(downloadedLayerSize),
+                FileUtils.byteCountToDisplaySize(downloadedLayerSize / duration)
+            );
         }
     }
 
diff --git a/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
index d4574d17c34..ed88c1a85ff 100644
--- a/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
@@ -21,7 +21,10 @@
 @Slf4j
 public class ParsedDockerfile {
 
-    private static final Pattern FROM_LINE_PATTERN = Pattern.compile("FROM (?<arg>--[^\\s]+\\s)*(?<image>[^\\s]+).*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern FROM_LINE_PATTERN = Pattern.compile(
+        "FROM (?<arg>--[^\\s]+\\s)*(?<image>[^\\s]+).*",
+        Pattern.CASE_INSENSITIVE
+    );
 
     private final Path dockerFilePath;
 
@@ -54,11 +57,13 @@ private List<String> read() {
     }
 
     private void parse(List<String> lines) {
-        dependencyImageNames = lines.stream()
-            .map(FROM_LINE_PATTERN::matcher)
-            .filter(Matcher::matches)
-            .map(matcher -> matcher.group("image"))
-            .collect(Collectors.toSet());
+        dependencyImageNames =
+            lines
+                .stream()
+                .map(FROM_LINE_PATTERN::matcher)
+                .filter(Matcher::matches)
+                .map(matcher -> matcher.group("image"))
+                .collect(Collectors.toSet());
 
         if (!dependencyImageNames.isEmpty()) {
             log.debug("Found dependency images in Dockerfile {}: {}", dockerFilePath, dependencyImageNames);
diff --git a/core/src/main/java/org/testcontainers/images/PullPolicy.java b/core/src/main/java/org/testcontainers/images/PullPolicy.java
index 3dc2e452b8d..a8b8344a8c2 100644
--- a/core/src/main/java/org/testcontainers/images/PullPolicy.java
+++ b/core/src/main/java/org/testcontainers/images/PullPolicy.java
@@ -1,9 +1,9 @@
 package org.testcontainers.images;
 
-import java.time.Duration;
-
 import lombok.experimental.UtilityClass;
 
+import java.time.Duration;
+
 /**
  * Convenience class with logic for building common {@link ImagePullPolicy} instances.
  *
@@ -34,5 +34,4 @@ public static ImagePullPolicy alwaysPull() {
     public static ImagePullPolicy ageBased(Duration maxAge) {
         return new AgeBasedPullPolicy(maxAge);
     }
-
 }
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 3bf2243549a..7dbd7adec0b 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -62,7 +62,7 @@ public RemoteDockerImage(@NonNull Future<String> imageFuture) {
     }
 
     @Override
-    @SneakyThrows({InterruptedException.class, ExecutionException.class})
+    @SneakyThrows({ InterruptedException.class, ExecutionException.class })
     protected final String resolve() {
         final DockerImageName imageName = getImageName();
         Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
@@ -72,7 +72,10 @@ protected final String resolve() {
             }
 
             // The image is not available locally - pull it
-            logger.info("Pulling docker image: {}. Please be patient; this may take some time but only needs to be done once.", imageName);
+            logger.info(
+                "Pulling docker image: {}. Please be patient; this may take some time but only needs to be done once.",
+                imageName
+            );
 
             Exception lastFailure = null;
             final Instant lastRetryAllowed = Instant.now().plus(PULL_RETRY_TIME_LIMIT);
@@ -84,9 +87,7 @@ protected final String resolve() {
                         .withTag(imageName.getVersionPart());
 
                     try {
-                        pullImageCmd
-                            .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
-                            .awaitCompletion();
+                        pullImageCmd.exec(new TimeLimitedLoggedPullImageResultCallback(logger)).awaitCompletion();
                     } catch (DockerClientException e) {
                         // Try to fallback to x86
                         pullImageCmd
@@ -101,12 +102,19 @@ protected final String resolve() {
                 } catch (InterruptedException | InternalServerErrorException e) {
                     // these classes of exception often relate to timeout/connection errors so should be retried
                     lastFailure = e;
-                    logger.warn("Retrying pull for image: {} ({}s remaining)",
+                    logger.warn(
+                        "Retrying pull for image: {} ({}s remaining)",
                         imageName,
-                        Duration.between(Instant.now(), lastRetryAllowed).getSeconds());
+                        Duration.between(Instant.now(), lastRetryAllowed).getSeconds()
+                    );
                 }
             }
-            logger.error("Failed to pull image: {}. Please check output of `docker pull {}`", imageName, imageName, lastFailure);
+            logger.error(
+                "Failed to pull image: {}. Please check output of `docker pull {}`",
+                imageName,
+                imageName,
+                lastFailure
+            );
 
             throw new ContainerFetchException("Failed to pull image: " + imageName, lastFailure);
         } catch (DockerClientException e) {
diff --git a/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
index b6d8539c3e8..88b8804dd8a 100644
--- a/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
+++ b/core/src/main/java/org/testcontainers/images/TimeLimitedLoggedPullImageResultCallback.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.model.PullResponseItem;
 import org.slf4j.Logger;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.Closeable;
@@ -16,8 +17,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.testcontainers.DockerClientFactory.TESTCONTAINERS_THREAD_GROUP;
-
 /**
  * {@link PullImageResultCallback} with improved logging of pull progress and a 'watchdog' which will abort the pull
  * if progress is not being made, to prevent a hanging test
@@ -25,14 +24,21 @@
 public class TimeLimitedLoggedPullImageResultCallback extends LoggedPullImageResultCallback {
 
     private static final AtomicInteger THREAD_ID = new AtomicInteger(0);
-    private static final ScheduledExecutorService PROGRESS_WATCHDOG_EXECUTOR =
-        Executors.newScheduledThreadPool(0, runnable -> {
-            Thread t = new Thread(TESTCONTAINERS_THREAD_GROUP, runnable);
+
+    private static final ScheduledExecutorService PROGRESS_WATCHDOG_EXECUTOR = Executors.newScheduledThreadPool(
+        0,
+        runnable -> {
+            Thread t = new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, runnable);
             t.setDaemon(true);
             t.setName("testcontainers-pull-watchdog-" + THREAD_ID.incrementAndGet());
             return t;
-        });
-    private static final Duration PULL_PAUSE_TOLERANCE = Duration.ofSeconds(TestcontainersConfiguration.getInstance().getImagePullPauseTimeout());
+        }
+    );
+
+    private static final Duration PULL_PAUSE_TOLERANCE = Duration.ofSeconds(
+        TestcontainersConfiguration.getInstance().getImagePullPauseTimeout()
+    );
+
     private final Logger logger;
 
     // A future which, if it ever fires, will kill the pull
@@ -85,27 +91,30 @@ public void onComplete() {
         super.onComplete();
     }
 
-
     /*
      * This method schedules a future task which will interrupt the waiting waiting threads if ever fired.
      * Every time this method is called (from onStart or onNext), the task is cancelled and recreated 30s in the future,
      * ensuring that it will only fire if the method stops being called regularly (e.g. if the pull has hung).
      */
     private void resetProgressWatchdog(boolean isFinished) {
-        if (nextCheckForProgress != null && ! nextCheckForProgress.isCancelled()) {
+        if (nextCheckForProgress != null && !nextCheckForProgress.isCancelled()) {
             nextCheckForProgress.cancel(false);
         }
         if (!isFinished) {
-            nextCheckForProgress = PROGRESS_WATCHDOG_EXECUTOR.schedule(
-                this::abortPull,
-                PULL_PAUSE_TOLERANCE.getSeconds(),
-                TimeUnit.SECONDS
-            );
+            nextCheckForProgress =
+                PROGRESS_WATCHDOG_EXECUTOR.schedule(
+                    this::abortPull,
+                    PULL_PAUSE_TOLERANCE.getSeconds(),
+                    TimeUnit.SECONDS
+                );
         }
     }
 
     private void abortPull() {
-        logger.error("Docker image pull has not made progress in {}s - aborting pull", PULL_PAUSE_TOLERANCE.getSeconds());
+        logger.error(
+            "Docker image pull has not made progress in {}s - aborting pull",
+            PULL_PAUSE_TOLERANCE.getSeconds()
+        );
         // Interrupt any threads that are waiting, before closing streams, because the stream can take
         //  an indeterminate amount of time to close
         waitingThreads.forEach(Thread::interrupt);
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 000487bfa4d..201cf0fd058 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -39,7 +39,9 @@
 
 @Slf4j
 @Getter
-public class ImageFromDockerfile extends LazyFuture<String> implements
+public class ImageFromDockerfile
+    extends LazyFuture<String>
+    implements
         BuildContextBuilderTrait<ImageFromDockerfile>,
         ClasspathTrait<ImageFromDockerfile>,
         FilesTrait<ImageFromDockerfile>,
@@ -51,9 +53,13 @@ public class ImageFromDockerfile extends LazyFuture<String> implements
     private boolean deleteOnExit = true;
 
     private final Map<String, Transferable> transferables = new HashMap<>();
+
     private final Map<String, String> buildArgs = new HashMap<>();
+
     private Optional<String> dockerFilePath = Optional.empty();
+
     private Optional<Path> dockerfile = Optional.empty();
+
     private Set<String> dependencyImageNames = Collections.emptySet();
 
     public ImageFromDockerfile() {
@@ -87,7 +93,6 @@ protected final String resolve() {
         DockerClient dockerClient = DockerClientFactory.instance().client();
 
         try {
-
             BuildImageResultCallback resultCallback = new BuildImageResultCallback() {
                 @Override
                 public void onNext(BuildResponseItem item) {
@@ -102,8 +107,10 @@ public void onNext(BuildResponseItem item) {
             };
 
             // We have to use pipes to avoid high memory consumption since users might want to build really big images
-            @Cleanup PipedInputStream in = new PipedInputStream();
-            @Cleanup PipedOutputStream out = new PipedOutputStream(in);
+            @Cleanup
+            PipedInputStream in = new PipedInputStream();
+            @Cleanup
+            PipedOutputStream out = new PipedOutputStream(in);
 
             BuildImageCmd buildImageCmd = dockerClient.buildImageCmd(in);
             configure(buildImageCmd);
@@ -140,14 +147,17 @@ public void onNext(BuildResponseItem item) {
             }
 
             log.info("Transferred {} to Docker daemon", FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
-            if (bytesToDockerDaemon > FileUtils.ONE_MB * 50) // warn if >50MB sent to docker daemon
-                log.warn("A large amount of data was sent to the Docker daemon ({}). Consider using a .dockerignore file for better performance.",
-                        FileUtils.byteCountToDisplaySize(bytesToDockerDaemon));
+            if (bytesToDockerDaemon > FileUtils.ONE_MB * 50) {
+                log.warn( // warn if >50MB sent to docker daemon
+                    "A large amount of data was sent to the Docker daemon ({}). Consider using a .dockerignore file for better performance.",
+                    FileUtils.byteCountToDisplaySize(bytesToDockerDaemon)
+                );
+            }
 
             exec.awaitImageId();
 
             return dockerImageName;
-        } catch(IOException e) {
+        } catch (IOException e) {
             throw new RuntimeException("Can't close DockerClient", e);
         }
     }
@@ -156,15 +166,15 @@ protected void configure(BuildImageCmd buildImageCmd) {
         buildImageCmd.withTag(this.getDockerImageName());
         this.dockerFilePath.ifPresent(buildImageCmd::withDockerfilePath);
         this.dockerfile.ifPresent(p -> {
-            buildImageCmd.withDockerfile(p.toFile());
-            dependencyImageNames = new ParsedDockerfile(p).getDependencyImageNames();
+                buildImageCmd.withDockerfile(p.toFile());
+                dependencyImageNames = new ParsedDockerfile(p).getDependencyImageNames();
 
-            if (dependencyImageNames.size() > 0) {
-                // if we'll be pre-pulling images, disable the built-in pull as it is not necessary and will fail for
-                // authenticated registries
-                buildImageCmd.withPull(false);
-            }
-        });
+                if (dependencyImageNames.size() > 0) {
+                    // if we'll be pre-pulling images, disable the built-in pull as it is not necessary and will fail for
+                    // authenticated registries
+                    buildImageCmd.withPull(false);
+                }
+            });
 
         this.buildArgs.forEach(buildImageCmd::withBuildArg);
     }
@@ -174,12 +184,19 @@ private void prePullDependencyImages(Set<String> imagesToPull) {
 
         imagesToPull.forEach(imageName -> {
             try {
-                log.info("Pre-emptively checking local images for '{}', referenced via a Dockerfile. If not available, it will be pulled.", imageName);
+                log.info(
+                    "Pre-emptively checking local images for '{}', referenced via a Dockerfile. If not available, it will be pulled.",
+                    imageName
+                );
                 new RemoteDockerImage(DockerImageName.parse(imageName))
                     .withImageNameSubstitutor(ImageNameSubstitutor.noop())
                     .get();
             } catch (Exception e) {
-                log.warn("Unable to pre-fetch an image ({}) depended upon by Dockerfile - image build will continue but may fail. Exception message was: {}", imageName, e.getMessage());
+                log.warn(
+                    "Unable to pre-fetch an image ({}) depended upon by Dockerfile - image build will continue but may fail. Exception message was: {}",
+                    imageName,
+                    e.getMessage()
+                );
             }
         });
     }
@@ -218,5 +235,4 @@ public ImageFromDockerfile withDockerfile(Path dockerfile) {
         this.dockerfile = Optional.of(dockerfile);
         return this;
     }
-
 }
diff --git a/core/src/main/java/org/testcontainers/images/builder/Transferable.java b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
index 8ec26c8c3da..e98dbc2ad11 100644
--- a/core/src/main/java/org/testcontainers/images/builder/Transferable.java
+++ b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
@@ -9,7 +9,6 @@
 import java.util.zip.Checksum;
 
 public interface Transferable {
-
     int DEFAULT_FILE_MODE = 0100644;
     int DEFAULT_DIR_MODE = 040755;
 
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java
index 17b13b3bac0..0ce794e778f 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java
@@ -10,7 +10,9 @@
 
 @Data
 @Slf4j
-public class DockerfileBuilder implements DockerfileBuilderTrait<DockerfileBuilder>,
+public class DockerfileBuilder
+    implements
+        DockerfileBuilderTrait<DockerfileBuilder>,
         FromStatementTrait<DockerfileBuilder>,
         AddStatementTrait<DockerfileBuilder>,
         CopyStatementTrait<DockerfileBuilder>,
@@ -27,7 +29,6 @@ public class DockerfileBuilder implements DockerfileBuilderTrait<DockerfileBuild
     private final List<Statement> statements = new ArrayList<>();
 
     public String build() {
-
         StringBuilder builder = new StringBuilder();
 
         for (Statement statement : statements) {
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/statement/Statement.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/statement/Statement.java
index b36811a974d..2b9b005a579 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/statement/Statement.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/statement/Statement.java
@@ -7,5 +7,5 @@ public abstract class Statement {
 
     final String type;
 
-    abstract public void appendArguments(StringBuilder dockerfileStringBuilder);
+    public abstract void appendArguments(StringBuilder dockerfileStringBuilder);
 }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/AddStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/AddStatementTrait.java
index 44a35d68ba2..85b6b9ad6ea 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/AddStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/AddStatementTrait.java
@@ -3,7 +3,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.MultiArgsStatement;
 
 public interface AddStatementTrait<SELF extends AddStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF add(String source, String destination) {
         return ((SELF) this).withStatement(new MultiArgsStatement("ADD", source, destination));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CmdStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CmdStatementTrait.java
index 054656af4d1..c9cc93c96c1 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CmdStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CmdStatementTrait.java
@@ -4,7 +4,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.SingleArgumentStatement;
 
 public interface CmdStatementTrait<SELF extends CmdStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF cmd(String command) {
         return ((SELF) this).withStatement(new SingleArgumentStatement("CMD", command));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CopyStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CopyStatementTrait.java
index 03e0cc7b461..0bdb2ef29ab 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CopyStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/CopyStatementTrait.java
@@ -3,7 +3,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.MultiArgsStatement;
 
 public interface CopyStatementTrait<SELF extends CopyStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF copy(String source, String destination) {
         return ((SELF) this).withStatement(new MultiArgsStatement("COPY", source, destination));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/DockerfileBuilderTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/DockerfileBuilderTrait.java
index 7a422da27d5..5fdc74ce1de 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/DockerfileBuilderTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/DockerfileBuilderTrait.java
@@ -5,7 +5,6 @@
 import java.util.List;
 
 public interface DockerfileBuilderTrait<SELF extends DockerfileBuilderTrait<SELF>> {
-
     List<Statement> getStatements();
 
     default SELF withStatement(Statement statement) {
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EntryPointStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EntryPointStatementTrait.java
index c974e58e384..79a6e6315a0 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EntryPointStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EntryPointStatementTrait.java
@@ -4,7 +4,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.SingleArgumentStatement;
 
 public interface EntryPointStatementTrait<SELF extends EntryPointStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF entryPoint(String command) {
         return ((SELF) this).withStatement(new SingleArgumentStatement("ENTRYPOINT", command));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EnvStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EnvStatementTrait.java
index b02c8e71ec7..c1380304a34 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EnvStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/EnvStatementTrait.java
@@ -6,7 +6,6 @@
 import java.util.Map;
 
 public interface EnvStatementTrait<SELF extends EnvStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF env(String key, String value) {
         return env(Collections.singletonMap(key, value));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/ExposeStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/ExposeStatementTrait.java
index bebe243c8de..22dcbeee32b 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/ExposeStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/ExposeStatementTrait.java
@@ -6,8 +6,12 @@
 import java.util.stream.Stream;
 
 public interface ExposeStatementTrait<SELF extends ExposeStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF expose(Integer... ports) {
-        return ((SELF) this).withStatement(new SingleArgumentStatement("EXPOSE", Stream.of(ports).map(Object::toString).collect(Collectors.joining(" "))));
+        return ((SELF) this).withStatement(
+                new SingleArgumentStatement(
+                    "EXPOSE",
+                    Stream.of(ports).map(Object::toString).collect(Collectors.joining(" "))
+                )
+            );
     }
 }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java
index 07077259df8..1ea411d206e 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/FromStatementTrait.java
@@ -4,7 +4,6 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface FromStatementTrait<SELF extends FromStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF from(String dockerImageName) {
         DockerImageName.parse(dockerImageName).assertValid();
 
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/LabelStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/LabelStatementTrait.java
index 0b423453b33..4ed527051dd 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/LabelStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/LabelStatementTrait.java
@@ -6,7 +6,6 @@
 import java.util.Map;
 
 public interface LabelStatementTrait<SELF extends LabelStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF label(String key, String value) {
         return label(Collections.singletonMap(key, value));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/RunStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/RunStatementTrait.java
index 74dfe1b00ab..f8fb064fb32 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/RunStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/RunStatementTrait.java
@@ -4,7 +4,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.SingleArgumentStatement;
 
 public interface RunStatementTrait<SELF extends RunStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF run(String... commandParts) {
         return ((SELF) this).withStatement(new MultiArgsStatement("RUN", commandParts));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/UserStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/UserStatementTrait.java
index 57419ad7c5d..ca44d2d03be 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/UserStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/UserStatementTrait.java
@@ -3,7 +3,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.SingleArgumentStatement;
 
 public interface UserStatementTrait<SELF extends UserStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF user(String user) {
         return ((SELF) this).withStatement(new SingleArgumentStatement("USER", user));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/VolumeStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/VolumeStatementTrait.java
index 2709adf32da..a8cd8621ee6 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/VolumeStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/VolumeStatementTrait.java
@@ -3,7 +3,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.MultiArgsStatement;
 
 public interface VolumeStatementTrait<SELF extends VolumeStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF volume(String... volumes) {
         return ((SELF) this).withStatement(new MultiArgsStatement("VOLUME", volumes));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/WorkdirStatementTrait.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/WorkdirStatementTrait.java
index c4fd5386af8..ea2aaa1412c 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/WorkdirStatementTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/traits/WorkdirStatementTrait.java
@@ -3,7 +3,6 @@
 import org.testcontainers.images.builder.dockerfile.statement.SingleArgumentStatement;
 
 public interface WorkdirStatementTrait<SELF extends WorkdirStatementTrait<SELF> & DockerfileBuilderTrait<SELF>> {
-
     default SELF workDir(String workdir) {
         return ((SELF) this).withStatement(new SingleArgumentStatement("WORKDIR", workdir));
     }
diff --git a/core/src/main/java/org/testcontainers/images/builder/traits/BuildContextBuilderTrait.java b/core/src/main/java/org/testcontainers/images/builder/traits/BuildContextBuilderTrait.java
index 5ddee327cee..74ddf68b365 100644
--- a/core/src/main/java/org/testcontainers/images/builder/traits/BuildContextBuilderTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/traits/BuildContextBuilderTrait.java
@@ -7,6 +7,5 @@
  *
  */
 public interface BuildContextBuilderTrait<SELF extends BuildContextBuilderTrait<SELF>> {
-
     SELF withFileFromTransferable(String path, Transferable transferable);
 }
diff --git a/core/src/main/java/org/testcontainers/images/builder/traits/ClasspathTrait.java b/core/src/main/java/org/testcontainers/images/builder/traits/ClasspathTrait.java
index 5617365f2cd..aadc3ccf7b9 100644
--- a/core/src/main/java/org/testcontainers/images/builder/traits/ClasspathTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/traits/ClasspathTrait.java
@@ -9,7 +9,6 @@
  *
  */
 public interface ClasspathTrait<SELF extends ClasspathTrait<SELF> & BuildContextBuilderTrait<SELF> & FilesTrait<SELF>> {
-
     default SELF withFileFromClasspath(String path, String resourcePath) {
         final MountableFile mountableFile = MountableFile.forClasspathResource(resourcePath);
 
diff --git a/core/src/main/java/org/testcontainers/images/builder/traits/DockerfileTrait.java b/core/src/main/java/org/testcontainers/images/builder/traits/DockerfileTrait.java
index 07ed13ed0fb..293b76a7c5c 100644
--- a/core/src/main/java/org/testcontainers/images/builder/traits/DockerfileTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/traits/DockerfileTrait.java
@@ -10,29 +10,31 @@
  * BuildContextBuilder's trait for Dockerfile-based resources.
  *
  */
-public interface DockerfileTrait<SELF extends DockerfileTrait<SELF> & BuildContextBuilderTrait<SELF> & StringsTrait<SELF>> {
-
+public interface DockerfileTrait<
+    SELF extends DockerfileTrait<SELF> & BuildContextBuilderTrait<SELF> & StringsTrait<SELF>
+> {
     default SELF withDockerfileFromBuilder(Consumer<DockerfileBuilder> builderConsumer) {
-
         DockerfileBuilder builder = new DockerfileBuilder();
 
         builderConsumer.accept(builder);
 
         // return Transferable because we want to build Dockerfile's content lazily
-        return ((SELF) this).withFileFromTransferable("Dockerfile", new Transferable() {
-
-            @Getter(lazy = true)
-            private final byte[] bytes = builder.build().getBytes();
-
-            @Override
-            public long getSize() {
-                return getBytes().length;
-            }
-
-            @Override
-            public String getDescription() {
-                return "Dockerfile: " + builder;
-            }
-        });
+        return ((SELF) this).withFileFromTransferable(
+                "Dockerfile",
+                new Transferable() {
+                    @Getter(lazy = true)
+                    private final byte[] bytes = builder.build().getBytes();
+
+                    @Override
+                    public long getSize() {
+                        return getBytes().length;
+                    }
+
+                    @Override
+                    public String getDescription() {
+                        return "Dockerfile: " + builder;
+                    }
+                }
+            );
     }
 }
diff --git a/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java b/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java
index 61524b59f8a..4c1204f752a 100644
--- a/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java
@@ -10,7 +10,6 @@
  *
  */
 public interface FilesTrait<SELF extends FilesTrait<SELF> & BuildContextBuilderTrait<SELF>> {
-
     /**
      * Adds file to tarball copied into container.
      * @param path in tarball
diff --git a/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java b/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java
index 2b23551ee58..68de3d67c14 100644
--- a/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java
+++ b/core/src/main/java/org/testcontainers/images/builder/traits/StringsTrait.java
@@ -9,22 +9,23 @@
  *
  */
 public interface StringsTrait<SELF extends StringsTrait<SELF> & BuildContextBuilderTrait<SELF>> {
-
     default SELF withFileFromString(String path, String content) {
-        return ((SELF) this).withFileFromTransferable(path, new Transferable() {
-
-            @Getter
-            byte[] bytes = content.getBytes();
+        return ((SELF) this).withFileFromTransferable(
+                path,
+                new Transferable() {
+                    @Getter
+                    byte[] bytes = content.getBytes();
 
-            @Override
-            public long getSize() {
-                return bytes.length;
-            }
+                    @Override
+                    public long getSize() {
+                        return bytes.length;
+                    }
 
-            @Override
-            public String getDescription() {
-                return "String: " + StringUtils.abbreviate(content, 100);
-            }
-        });
+                    @Override
+                    public String getDescription() {
+                        return "String: " + StringUtils.abbreviate(content, 100);
+                    }
+                }
+            );
     }
 }
diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startable.java b/core/src/main/java/org/testcontainers/lifecycle/Startable.java
index 3e73968d06e..2ffa423d2e3 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startable.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startable.java
@@ -4,7 +4,6 @@
 import java.util.Set;
 
 public interface Startable extends AutoCloseable {
-
     default Set<Startable> getDependencies() {
         return Collections.emptySet();
     }
diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
index 5ec46f1edb9..daa63931a88 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startables.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -1,8 +1,8 @@
 package org.testcontainers.lifecycle;
 
-import java.util.Arrays;
 import lombok.experimental.UtilityClass;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -17,17 +17,18 @@
 @UtilityClass
 public class Startables {
 
-    private static final Executor EXECUTOR = Executors.newCachedThreadPool(new ThreadFactory() {
-
-        private final AtomicLong COUNTER = new AtomicLong(0);
+    private static final Executor EXECUTOR = Executors.newCachedThreadPool(
+        new ThreadFactory() {
+            private final AtomicLong COUNTER = new AtomicLong(0);
 
-        @Override
-        public Thread newThread(Runnable r) {
-            Thread thread = new Thread(r, "testcontainers-lifecycle-" + COUNTER.getAndIncrement());
-            thread.setDaemon(true);
-            return thread;
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread thread = new Thread(r, "testcontainers-lifecycle-" + COUNTER.getAndIncrement());
+                thread.setDaemon(true);
+                return thread;
+            }
         }
-    });
+    );
 
     /**
      * @see #deepStart(Stream)
@@ -77,15 +78,22 @@ public CompletableFuture<Void> deepStart(Stream<? extends Startable> startables)
      * @param started an intermediate storage for already started {@link Startable}s to prevent multiple starts.
      * @param startables a {@link Stream} of {@link Startable}s to start and scan for transitive dependencies.
      */
-    private CompletableFuture<Void> deepStart(Map<Startable, CompletableFuture<Void>> started, Stream<? extends Startable> startables) {
+    private CompletableFuture<Void> deepStart(
+        Map<Startable, CompletableFuture<Void>> started,
+        Stream<? extends Startable> startables
+    ) {
         CompletableFuture[] futures = startables
             .sequential()
             .map(it -> {
                 // avoid a recursive update in `computeIfAbsent`
                 Map<Startable, CompletableFuture<Void>> subStarted = new HashMap<>(started);
-                CompletableFuture<Void> future = started.computeIfAbsent(it, startable -> {
-                    return deepStart(subStarted, startable.getDependencies().stream()).thenRunAsync(startable::start, EXECUTOR);
-                });
+                CompletableFuture<Void> future = started.computeIfAbsent(
+                    it,
+                    startable -> {
+                        return deepStart(subStarted, startable.getDependencies().stream())
+                            .thenRunAsync(startable::start, EXECUTOR);
+                    }
+                );
                 started.putAll(subStarted);
                 return future;
             })
diff --git a/core/src/main/java/org/testcontainers/lifecycle/TestDescription.java b/core/src/main/java/org/testcontainers/lifecycle/TestDescription.java
index c27f59fb0fc..3787707509a 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/TestDescription.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/TestDescription.java
@@ -1,7 +1,6 @@
 package org.testcontainers.lifecycle;
 
 public interface TestDescription {
-
     String getTestId();
 
     String getFilesystemFriendlyName();
diff --git a/core/src/main/java/org/testcontainers/lifecycle/TestLifecycleAware.java b/core/src/main/java/org/testcontainers/lifecycle/TestLifecycleAware.java
index 178e081c083..1e5a0258f14 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/TestLifecycleAware.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/TestLifecycleAware.java
@@ -3,12 +3,7 @@
 import java.util.Optional;
 
 public interface TestLifecycleAware {
+    default void beforeTest(TestDescription description) {}
 
-    default void beforeTest(TestDescription description) {
-
-    }
-
-    default void afterTest(TestDescription description, Optional<Throwable> throwable) {
-
-    }
+    default void afterTest(TestDescription description, Optional<Throwable> throwable) {}
 }
diff --git a/core/src/main/java/org/testcontainers/utility/AuditLogger.java b/core/src/main/java/org/testcontainers/utility/AuditLogger.java
index f6c4559485d..518144c4302 100644
--- a/core/src/main/java/org/testcontainers/utility/AuditLogger.java
+++ b/core/src/main/java/org/testcontainers/utility/AuditLogger.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.DockerCmd;
+import com.google.common.base.Strings;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -12,8 +13,6 @@
 
 import java.util.List;
 
-import static com.google.common.base.Strings.nullToEmpty;
-
 /**
  * Logger for tracking potentially destructive actions, intended for usage in a shared Docker environment where
  * traceability is needed. This class uses SLF4J, logging at TRACE level and capturing common fields as MDC fields.
@@ -26,34 +25,36 @@
 public class AuditLogger {
 
     private static final ObjectMapper objectMapper = new ObjectMapper();
-    public static final String MDC_PREFIX = AuditLogger.class.getCanonicalName();
 
-    public static void doLog(@NotNull String action,
-                             @Nullable String image,
-                             @Nullable String containerId,
-                             @NotNull DockerCmd<?> cmd) {
+    public static final String MDC_PREFIX = AuditLogger.class.getCanonicalName();
 
+    public static void doLog(
+        @NotNull String action,
+        @Nullable String image,
+        @Nullable String containerId,
+        @NotNull DockerCmd<?> cmd
+    ) {
         doLog(action, image, containerId, cmd, null);
     }
 
-    public static void doLog(@NotNull String action,
-                             @Nullable String image,
-                             @Nullable String containerId,
-                             @NotNull DockerCmd<?> cmd,
-                             @Nullable Exception e) {
-
-        if (! log.isTraceEnabled()) {
+    public static void doLog(
+        @NotNull String action,
+        @Nullable String image,
+        @Nullable String containerId,
+        @NotNull DockerCmd<?> cmd,
+        @Nullable Exception e
+    ) {
+        if (!log.isTraceEnabled()) {
             return;
         }
 
-        MDC.put(MDC_PREFIX + ".Action", nullToEmpty(action));
-        MDC.put(MDC_PREFIX + ".Image", nullToEmpty(image));
-        MDC.put(MDC_PREFIX + ".ContainerId", nullToEmpty(containerId));
+        MDC.put(MDC_PREFIX + ".Action", Strings.nullToEmpty(action));
+        MDC.put(MDC_PREFIX + ".Image", Strings.nullToEmpty(image));
+        MDC.put(MDC_PREFIX + ".ContainerId", Strings.nullToEmpty(containerId));
 
         try {
             MDC.put(MDC_PREFIX + ".Command", objectMapper.writeValueAsString(cmd));
-        } catch (JsonProcessingException ignored) {
-        }
+        } catch (JsonProcessingException ignored) {}
 
         if (e != null) {
             MDC.put(MDC_PREFIX + ".Exception", e.getLocalizedMessage());
@@ -69,10 +70,8 @@ public static void doLog(@NotNull String action,
         MDC.remove(MDC_PREFIX + ".Exception");
     }
 
-    public static void doComposeLog(@NotNull String[] commandParts,
-                                    @Nullable List<String> env) {
-
-        if (! log.isTraceEnabled()) {
+    public static void doComposeLog(@NotNull String[] commandParts, @Nullable List<String> env) {
+        if (!log.isTraceEnabled()) {
             return;
         }
 
diff --git a/core/src/main/java/org/testcontainers/utility/AuthConfigUtil.java b/core/src/main/java/org/testcontainers/utility/AuthConfigUtil.java
index 77b670d374b..8ed91a5e34e 100644
--- a/core/src/main/java/org/testcontainers/utility/AuthConfigUtil.java
+++ b/core/src/main/java/org/testcontainers/utility/AuthConfigUtil.java
@@ -2,22 +2,23 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.base.MoreObjects;
+import com.google.common.base.Strings;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 /**
  * TODO: Javadocs
  */
 @UtilityClass
 public class AuthConfigUtil {
+
     public static String toSafeString(AuthConfig authConfig) {
         if (authConfig == null) {
             return "null";
         }
 
-        return MoreObjects.toStringHelper(authConfig)
+        return MoreObjects
+            .toStringHelper(authConfig)
             .add("username", authConfig.getUsername())
             .add("password", obfuscated(authConfig.getPassword()))
             .add("auth", obfuscated(authConfig.getAuth()))
@@ -29,6 +30,6 @@ public static String toSafeString(AuthConfig authConfig) {
 
     @NotNull
     private static String obfuscated(String value) {
-        return isNullOrEmpty(value) ? "blank" : "hidden non-blank value";
+        return Strings.isNullOrEmpty(value) ? "blank" : "hidden non-blank value";
     }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/Base58.java b/core/src/main/java/org/testcontainers/utility/Base58.java
index 1f56978c7cc..2cbfc751f4d 100644
--- a/core/src/main/java/org/testcontainers/utility/Base58.java
+++ b/core/src/main/java/org/testcontainers/utility/Base58.java
@@ -7,8 +7,7 @@
  */
 public class Base58 {
 
-    private static final char[] ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-            .toCharArray();
+    private static final char[] ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
 
     private static final SecureRandom RANDOM = new SecureRandom();
 
diff --git a/core/src/main/java/org/testcontainers/utility/ClasspathScanner.java b/core/src/main/java/org/testcontainers/utility/ClasspathScanner.java
index 76716cfdb7c..0c8addc2874 100644
--- a/core/src/main/java/org/testcontainers/utility/ClasspathScanner.java
+++ b/core/src/main/java/org/testcontainers/utility/ClasspathScanner.java
@@ -40,11 +40,7 @@ private static Integer filesFileSchemeFirst(final URL t) {
      * context classloader. Results are currently alphabetically sorted.
      */
     static Stream<URL> scanFor(final String name) {
-        return scanFor(
-            name,
-            ClasspathScanner.class.getClassLoader(),
-            Thread.currentThread().getContextClassLoader()
-        );
+        return scanFor(name, ClasspathScanner.class.getClassLoader(), Thread.currentThread().getContextClassLoader());
     }
 
     @Nullable
diff --git a/core/src/main/java/org/testcontainers/utility/CommandLine.java b/core/src/main/java/org/testcontainers/utility/CommandLine.java
index a217823c40f..1bb8f827148 100644
--- a/core/src/main/java/org/testcontainers/utility/CommandLine.java
+++ b/core/src/main/java/org/testcontainers/utility/CommandLine.java
@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.zeroturnaround.exec.InvalidExitValueException;
 import org.zeroturnaround.exec.ProcessExecutor;
 import org.zeroturnaround.exec.ProcessResult;
@@ -14,14 +15,12 @@
 import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 /**
  * Process execution utility methods.
  */
 public class CommandLine {
 
-    private static final Logger LOGGER = getLogger(CommandLine.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CommandLine.class);
 
     /**
      * Run a shell command synchronously.
@@ -30,16 +29,11 @@ public class CommandLine {
      * @return the stdout output of the command
      */
     public static String runShellCommand(String... command) {
-
         String joinedCommand = String.join(" ", command);
         LOGGER.debug("Executing shell command: `{}`", joinedCommand);
 
         try {
-            ProcessResult result = new ProcessExecutor()
-                .command(command)
-                .readOutput(true)
-                .exitValueNormal()
-                .execute();
+            ProcessResult result = new ProcessExecutor().command(command).readOutput(true).exitValueNormal().execute();
 
             return result.outputUTF8().trim();
         } catch (IOException | InterruptedException | TimeoutException | InvalidExitValueException e) {
@@ -55,7 +49,6 @@ public static String runShellCommand(String... command) {
      * @return  whether the executable exists and is executable
      */
     public static boolean executableExists(String executable) {
-
         // First check if we've been given the full path already
         File directFile = new File(executable);
         if (directFile.exists() && directFile.canExecute()) {
@@ -78,6 +71,7 @@ public static String[] getSystemPath() {
     }
 
     private static class ShellCommandException extends RuntimeException {
+
         public ShellCommandException(String message, Exception e) {
             super(message, e);
         }
diff --git a/core/src/main/java/org/testcontainers/utility/ComparableVersion.java b/core/src/main/java/org/testcontainers/utility/ComparableVersion.java
index d3e3d9eb958..999c4b40b3b 100644
--- a/core/src/main/java/org/testcontainers/utility/ComparableVersion.java
+++ b/core/src/main/java/org/testcontainers/utility/ComparableVersion.java
@@ -1,12 +1,11 @@
 package org.testcontainers.utility;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.common.annotations.VisibleForTesting;
-
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public final class ComparableVersion implements Comparable<ComparableVersion> {
 
     private final int[] parts;
@@ -19,7 +18,7 @@ public ComparableVersion(String version) {
 
     @Override
     public int compareTo(@NotNull ComparableVersion other) {
-        for (int i=0; i<Math.min(this.parts.length, other.parts.length); i++) {
+        for (int i = 0; i < Math.min(this.parts.length, other.parts.length); i++) {
             int thisPart = this.parts[i];
             int otherPart = other.parts[i];
             if (thisPart > otherPart) {
@@ -71,5 +70,4 @@ static int[] parseVersion(final String version) {
 
         return ret;
     }
-
 }
diff --git a/core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java
index 530d5a76118..ee7ab1d95b6 100644
--- a/core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/ConfigurationFileImageNameSubstitutor.java
@@ -28,7 +28,8 @@ public DockerImageName apply(final DockerImageName original) {
             .asCompatibleSubstituteFor(original);
 
         if (!result.equals(original)) {
-            log.warn("Image name {} was substituted by configuration to {}. This approach is deprecated and will be removed in the future",
+            log.warn(
+                "Image name {} was substituted by configuration to {}. This approach is deprecated and will be removed in the future",
                 original,
                 result
             );
diff --git a/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
index 840b8a77b40..a7755f8eea8 100644
--- a/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/DefaultImageNameSubstitutor.java
@@ -11,6 +11,7 @@
 final class DefaultImageNameSubstitutor extends ImageNameSubstitutor {
 
     private final ConfigurationFileImageNameSubstitutor configurationFileImageNameSubstitutor;
+
     private final PrefixingImageNameSubstitutor prefixingImageNameSubstitutor;
 
     public DefaultImageNameSubstitutor() {
@@ -29,13 +30,17 @@ public DefaultImageNameSubstitutor() {
 
     @Override
     public DockerImageName apply(final DockerImageName original) {
-        return configurationFileImageNameSubstitutor
-            .andThen(prefixingImageNameSubstitutor)
-            .apply(original);
+        return configurationFileImageNameSubstitutor.andThen(prefixingImageNameSubstitutor).apply(original);
     }
 
     @Override
     protected String getDescription() {
-        return "DefaultImageNameSubstitutor (composite of '" + configurationFileImageNameSubstitutor.getDescription() + "' and '" + prefixingImageNameSubstitutor.getDescription() + "')";
+        return (
+            "DefaultImageNameSubstitutor (composite of '" +
+            configurationFileImageNameSubstitutor.getDescription() +
+            "' and '" +
+            prefixingImageNameSubstitutor.getDescription() +
+            "')"
+        );
     }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
index b9d266a41ca..9fca02aad6f 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
@@ -1,6 +1,5 @@
 package org.testcontainers.utility;
 
-
 import com.google.common.net.HostAndPort;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -20,16 +19,29 @@ public final class DockerImageName {
 
     /* Regex patterns used for validation */
     private static final String ALPHA_NUMERIC = "[a-z0-9]+";
+
     private static final String SEPARATOR = "([.]|_{1,2}|-+)";
+
     private static final String REPO_NAME_PART = ALPHA_NUMERIC + "(" + SEPARATOR + ALPHA_NUMERIC + ")*";
+
     private static final Pattern REPO_NAME = Pattern.compile(REPO_NAME_PART + "(/" + REPO_NAME_PART + ")*");
 
     private final String rawName;
-    @With @Getter private final String registry;
-    @With @Getter private final String repository;
-    @NotNull @With(AccessLevel.PRIVATE)
+
+    @With
+    @Getter
+    private final String registry;
+
+    @With
+    @Getter
+    private final String repository;
+
+    @NotNull
+    @With(AccessLevel.PRIVATE)
     private final Versioning versioning;
-    @Nullable @With(AccessLevel.PRIVATE)
+
+    @Nullable
+    @With(AccessLevel.PRIVATE)
     private final DockerImageName compatibleSubstituteFor;
 
     /**
@@ -57,10 +69,14 @@ public DockerImageName(String fullImageName) {
         final int slashIndex = fullImageName.indexOf('/');
 
         String remoteName;
-        if (slashIndex == -1 ||
-            (!fullImageName.substring(0, slashIndex).contains(".") &&
+        if (
+            slashIndex == -1 ||
+            (
+                !fullImageName.substring(0, slashIndex).contains(".") &&
                 !fullImageName.substring(0, slashIndex).contains(":") &&
-                !fullImageName.substring(0, slashIndex).equals("localhost"))) {
+                !fullImageName.substring(0, slashIndex).equals("localhost")
+            )
+        ) {
             registry = "";
             remoteName = fullImageName;
         } else {
@@ -99,10 +115,14 @@ public DockerImageName(String nameWithoutTag, @NotNull String version) {
         final int slashIndex = nameWithoutTag.indexOf('/');
 
         String remoteName;
-        if (slashIndex == -1 ||
-            (!nameWithoutTag.substring(0, slashIndex).contains(".") &&
+        if (
+            slashIndex == -1 ||
+            (
+                !nameWithoutTag.substring(0, slashIndex).contains(".") &&
                 !nameWithoutTag.substring(0, slashIndex).contains(":") &&
-                !nameWithoutTag.substring(0, slashIndex).equals("localhost"))) {
+                !nameWithoutTag.substring(0, slashIndex).equals("localhost")
+            )
+        ) {
             registry = "";
             remoteName = nameWithoutTag;
         } else {
@@ -163,7 +183,9 @@ public void assertValid() {
             throw new IllegalArgumentException(repository + " is not a valid Docker image name (in " + rawName + ")");
         }
         if (!versioning.isValid()) {
-            throw new IllegalArgumentException(versioning + " is not a valid image versioning identifier (in " + rawName + ")");
+            throw new IllegalArgumentException(
+                versioning + " is not a valid image versioning identifier (in " + rawName + ")"
+            );
         }
     }
 
@@ -246,18 +268,16 @@ public void assertCompatibleWith(DockerImageName... anyOthers) {
 
         throw new IllegalStateException(
             String.format(
-                "Failed to verify that image '%s' is a compatible substitute for '%s'. This generally means that "
-                    +
-                    "you are trying to use an image that Testcontainers has not been designed to use. If this is "
-                    +
-                    "deliberate, and if you are confident that the image is compatible, you should declare "
-                    +
-                    "compatibility in code using the `asCompatibleSubstituteFor` method. For example:\n"
-                    +
-                    "   DockerImageName myImage = DockerImageName.parse(\"%s\").asCompatibleSubstituteFor(\"%s\");\n"
-                    +
-                    "and then use `myImage` instead.",
-                this.rawName, exampleOther.rawName, this.rawName, exampleOther.rawName
+                "Failed to verify that image '%s' is a compatible substitute for '%s'. This generally means that " +
+                "you are trying to use an image that Testcontainers has not been designed to use. If this is " +
+                "deliberate, and if you are confident that the image is compatible, you should declare " +
+                "compatibility in code using the `asCompatibleSubstituteFor` method. For example:\n" +
+                "   DockerImageName myImage = DockerImageName.parse(\"%s\").asCompatibleSubstituteFor(\"%s\");\n" +
+                "and then use `myImage` instead.",
+                this.rawName,
+                exampleOther.rawName,
+                this.rawName,
+                exampleOther.rawName
             )
         );
     }
diff --git a/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java b/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java
index 69f7b998da2..c372c3cea3e 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java
@@ -9,7 +9,6 @@
 public final class DockerLoggerFactory {
 
     public static Logger getLogger(String dockerImageName) {
-
         final String abbreviatedName;
         if (dockerImageName.contains("@sha256")) {
             abbreviatedName = dockerImageName.substring(0, dockerImageName.indexOf("@sha256") + 14) + "...";
diff --git a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
index 6f1e2c9d50b..1a2b4aafe74 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
@@ -3,44 +3,42 @@
 import lombok.NonNull;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
-import static java.util.Arrays.asList;
-import static org.slf4j.LoggerFactory.getLogger;
-import static org.testcontainers.utility.CommandLine.executableExists;
-import static org.testcontainers.utility.CommandLine.runShellCommand;
-
 /**
  * Created by rnorth on 27/10/2015.
  */
 public class DockerMachineClient {
 
     private static DockerMachineClient instance;
-    private static final Logger LOGGER = getLogger(DockerMachineClient.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerMachineClient.class);
 
     private static final String executableName;
+
     static {
-    	if(SystemUtils.IS_OS_WINDOWS) {
-    		executableName = "docker-machine.exe";
-    	} else {
-    		executableName = "docker-machine";
-    	}
+        if (SystemUtils.IS_OS_WINDOWS) {
+            executableName = "docker-machine.exe";
+        } else {
+            executableName = "docker-machine";
+        }
     }
 
     /**
      * Private constructor
      */
-    private DockerMachineClient() {
-    }
+    private DockerMachineClient() {}
 
     /**
      * Obtain an instance of the DockerMachineClient wrapper.
      *
      * @return the singleton instance of DockerMachineClient
      */
-    public synchronized static DockerMachineClient instance() {
+    public static synchronized DockerMachineClient instance() {
         if (instance == null) {
             instance = new DockerMachineClient();
         }
@@ -49,12 +47,12 @@ public synchronized static DockerMachineClient instance() {
     }
 
     public boolean isInstalled() {
-        return executableExists(executableName);
+        return CommandLine.executableExists(executableName);
     }
 
     public Optional<String> getDefaultMachine() {
-        String ls = runShellCommand(executableName, "ls", "-q");
-        List<String> machineNames = asList(ls.split("\n"));
+        String ls = CommandLine.runShellCommand(executableName, "ls", "-q");
+        List<String> machineNames = Arrays.asList(ls.split("\n"));
 
         String envMachineName = System.getenv("DOCKER_MACHINE_NAME");
 
@@ -65,7 +63,10 @@ public Optional<String> getDefaultMachine() {
             LOGGER.debug("DOCKER_MACHINE_NAME is not set; Using 'default' docker-machine", envMachineName);
             return Optional.of("default");
         } else if (machineNames.size() > 0) {
-            LOGGER.debug("DOCKER_MACHINE_NAME is not set and no machine named 'default' found; Using first machine found with `docker-machine ls`: {}", machineNames.get(0));
+            LOGGER.debug(
+                "DOCKER_MACHINE_NAME is not set and no machine named 'default' found; Using first machine found with `docker-machine ls`: {}",
+                machineNames.get(0)
+            );
             return Optional.of(machineNames.get(0));
         } else {
             return Optional.empty();
@@ -75,7 +76,7 @@ public Optional<String> getDefaultMachine() {
     public void ensureMachineRunning(@NonNull String machineName) {
         if (!isMachineRunning(machineName)) {
             LOGGER.info("Docker-machine '{}' is not running. Will start it now", machineName);
-            runShellCommand("docker-machine", "start", machineName);
+            CommandLine.runShellCommand("docker-machine", "start", machineName);
         }
     }
 
@@ -84,15 +85,15 @@ public void ensureMachineRunning(@NonNull String machineName) {
      */
     @Deprecated
     public String getDockerDaemonIpAddress(@NonNull String machineName) {
-        return runShellCommand(executableName, "ip", machineName);
+        return CommandLine.runShellCommand(executableName, "ip", machineName);
     }
 
     public String getDockerDaemonUrl(@NonNull String machineName) {
-        return runShellCommand(executableName, "url", machineName);
+        return CommandLine.runShellCommand(executableName, "url", machineName);
     }
 
     public boolean isMachineRunning(String machineName) {
-        String status = runShellCommand("docker-machine", "status", machineName);
+        String status = CommandLine.runShellCommand("docker-machine", "status", machineName);
         return status.trim().equalsIgnoreCase("running");
     }
 
diff --git a/core/src/main/java/org/testcontainers/utility/DockerStatus.java b/core/src/main/java/org/testcontainers/utility/DockerStatus.java
index a410597dcfb..00f71249dd1 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerStatus.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerStatus.java
@@ -33,15 +33,16 @@ public class DockerStatus {
      * @param now                    the time to consider as the current time
      * @return true if we can conclude that the container is running, false otherwise
      */
-    public static boolean isContainerRunning(InspectContainerResponse.ContainerState state,
-                                             Duration minimumRunningDuration,
-                                             Instant now) {
+    public static boolean isContainerRunning(
+        InspectContainerResponse.ContainerState state,
+        Duration minimumRunningDuration,
+        Instant now
+    ) {
         if (state.getRunning()) {
             if (minimumRunningDuration == null) {
                 return true;
             }
-            Instant startedAt = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(
-                state.getStartedAt(), Instant::from);
+            Instant startedAt = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(state.getStartedAt(), Instant::from);
 
             if (startedAt.isBefore(now.minus(minimumRunningDuration))) {
                 return true;
@@ -57,7 +58,6 @@ public static boolean isContainerRunning(InspectContainerResponse.ContainerState
      * @return true if we can conclude that the container has started but is now stopped, false otherwise.
      */
     public static boolean isContainerStopped(InspectContainerResponse.ContainerState state) {
-
         // get some preconditions out of the way
         if (state.getRunning() || state.getPaused()) {
             return false;
@@ -72,10 +72,12 @@ public static boolean isContainerStopped(InspectContainerResponse.ContainerState
     public static boolean isDockerTimestampNonEmpty(String dockerTimestamp) {
         // This is a defensive approach. Current versions of Docker use the DOCKER_TIMESTAMP_ZERO value, but
         // that could change.
-        return dockerTimestamp != null
-                && !dockerTimestamp.isEmpty()
-                && !dockerTimestamp.equals(DOCKER_TIMESTAMP_ZERO)
-                && DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(dockerTimestamp, Instant::from).getEpochSecond() >= 0L;
+        return (
+            dockerTimestamp != null &&
+            !dockerTimestamp.isEmpty() &&
+            !dockerTimestamp.equals(DOCKER_TIMESTAMP_ZERO) &&
+            DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(dockerTimestamp, Instant::from).getEpochSecond() >= 0L
+        );
     }
 
     public static boolean isContainerExitCodeSuccess(InspectContainerResponse.ContainerState state) {
diff --git a/core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java b/core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java
index 1252fb2c3a1..043befe04bb 100644
--- a/core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java
+++ b/core/src/main/java/org/testcontainers/utility/DynamicPollInterval.java
@@ -15,6 +15,7 @@
 public class DynamicPollInterval implements PollInterval {
 
     final Duration interval;
+
     Instant lastTimestamp;
 
     private DynamicPollInterval(Duration interval) {
diff --git a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
index a1cb2492204..dae3f178230 100644
--- a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
@@ -24,7 +24,7 @@ public abstract class ImageNameSubstitutor implements Function<DockerImageName,
     @VisibleForTesting
     static ImageNameSubstitutor defaultImplementation = new DefaultImageNameSubstitutor();
 
-    public synchronized static ImageNameSubstitutor instance() {
+    public static synchronized ImageNameSubstitutor instance() {
         if (instance == null) {
             final String configuredClassName = TestcontainersConfiguration.getInstance().getImageSubstitutorClassName();
 
@@ -32,17 +32,22 @@ public synchronized static ImageNameSubstitutor instance() {
                 log.debug("Attempting to instantiate an ImageNameSubstitutor with class: {}", configuredClassName);
                 ImageNameSubstitutor configuredInstance;
                 try {
-                    configuredInstance = (ImageNameSubstitutor) Class.forName(configuredClassName).getConstructor().newInstance();
+                    configuredInstance =
+                        (ImageNameSubstitutor) Class.forName(configuredClassName).getConstructor().newInstance();
                 } catch (Exception e) {
-                    throw new IllegalArgumentException("Configured Image Substitutor could not be loaded: " + configuredClassName, e);
+                    throw new IllegalArgumentException(
+                        "Configured Image Substitutor could not be loaded: " + configuredClassName,
+                        e
+                    );
                 }
 
                 log.info("Found configured ImageNameSubstitutor: {}", configuredInstance.getDescription());
 
-                instance = new ChainedImageNameSubstitutor(
-                    wrapWithLogging(defaultImplementation),
-                    wrapWithLogging(configuredInstance)
-                );
+                instance =
+                    new ChainedImageNameSubstitutor(
+                        wrapWithLogging(defaultImplementation),
+                        wrapWithLogging(configuredInstance)
+                    );
             } else {
                 instance = wrapWithLogging(defaultImplementation);
             }
@@ -79,6 +84,7 @@ private static ImageNameSubstitutor wrapWithLogging(final ImageNameSubstitutor w
      * Wrapper substitutor which logs which substitutions have been performed.
      */
     static class LogWrappedImageNameSubstitutor extends ImageNameSubstitutor {
+
         @VisibleForTesting
         final ImageNameSubstitutor wrappedInstance;
 
@@ -91,10 +97,19 @@ public DockerImageName apply(final DockerImageName original) {
             final DockerImageName replacementImage = wrappedInstance.apply(original);
 
             if (!replacementImage.equals(original)) {
-                log.info("Using {} as a substitute image for {} (using image substitutor: {})", replacementImage.asCanonicalNameString(), original.asCanonicalNameString(), wrappedInstance.getDescription());
+                log.info(
+                    "Using {} as a substitute image for {} (using image substitutor: {})",
+                    replacementImage.asCanonicalNameString(),
+                    original.asCanonicalNameString(),
+                    wrappedInstance.getDescription()
+                );
                 return replacementImage;
             } else {
-                log.debug("Did not find a substitute image for {} (using image substitutor: {})", original.asCanonicalNameString(), wrappedInstance.getDescription());
+                log.debug(
+                    "Did not find a substitute image for {} (using image substitutor: {})",
+                    original.asCanonicalNameString(),
+                    wrappedInstance.getDescription()
+                );
                 return original;
             }
         }
@@ -109,10 +124,15 @@ protected String getDescription() {
      * Wrapper substitutor that passes the original image name through a default substitutor and then the configured one
      */
     static class ChainedImageNameSubstitutor extends ImageNameSubstitutor {
+
         private final ImageNameSubstitutor defaultInstance;
+
         private final ImageNameSubstitutor configuredInstance;
 
-        public ChainedImageNameSubstitutor(ImageNameSubstitutor defaultInstance, ImageNameSubstitutor configuredInstance) {
+        public ChainedImageNameSubstitutor(
+            ImageNameSubstitutor defaultInstance,
+            ImageNameSubstitutor configuredInstance
+        ) {
             this.defaultInstance = defaultInstance;
             this.configuredInstance = configuredInstance;
         }
diff --git a/core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java b/core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java
index 173cf28f97c..39fbc5e10e1 100644
--- a/core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/JVMHookResourceReaper.java
@@ -30,24 +30,29 @@ public synchronized void performCleanup() {
     }
 
     private void prune(PruneType pruneType, List<Map.Entry<String, String>> filters) {
-        String[] labels = filters.stream()
+        String[] labels = filters
+            .stream()
             .filter(it -> "label".equals(it.getKey()))
             .map(Map.Entry::getValue)
             .toArray(String[]::new);
         switch (pruneType) {
             // Docker only prunes stopped containers, so we have to do it manually
             case CONTAINERS:
-                List<Container> containers = dockerClient.listContainersCmd()
+                List<Container> containers = dockerClient
+                    .listContainersCmd()
                     .withFilter("label", Arrays.asList(labels))
                     .withShowAll(true)
                     .exec();
 
-                containers.parallelStream().forEach(container -> {
-                    dockerClient.removeContainerCmd(container.getId())
-                        .withForce(true)
-                        .withRemoveVolumes(true)
-                        .exec();
-                });
+                containers
+                    .parallelStream()
+                    .forEach(container -> {
+                        dockerClient
+                            .removeContainerCmd(container.getId())
+                            .withForce(true)
+                            .withRemoveVolumes(true)
+                            .exec();
+                    });
                 break;
             default:
                 dockerClient.pruneCmd(pruneType).withLabelFilter(labels).exec();
diff --git a/core/src/main/java/org/testcontainers/utility/LazyFuture.java b/core/src/main/java/org/testcontainers/utility/LazyFuture.java
index 758082f5185..bde9feb69ec 100644
--- a/core/src/main/java/org/testcontainers/utility/LazyFuture.java
+++ b/core/src/main/java/org/testcontainers/utility/LazyFuture.java
@@ -17,7 +17,7 @@ public abstract class LazyFuture<T> implements Future<T> {
     @Getter(value = AccessLevel.MODULE, lazy = true)
     private final T resolvedValue = resolve();
 
-    abstract protected T resolve();
+    protected abstract T resolve();
 
     @Override
     public boolean cancel(boolean mayInterruptIfRunning) {
diff --git a/core/src/main/java/org/testcontainers/utility/LicenseAcceptance.java b/core/src/main/java/org/testcontainers/utility/LicenseAcceptance.java
index 55037d8978c..9fe8d9db8e6 100644
--- a/core/src/main/java/org/testcontainers/utility/LicenseAcceptance.java
+++ b/core/src/main/java/org/testcontainers/utility/LicenseAcceptance.java
@@ -27,10 +27,17 @@ public static void assertLicenseAccepted(final String imageName) {
             // suppressed
         }
 
-        throw new IllegalStateException("The image " + imageName + " requires you to accept a license agreement. " +
-                        "Please place a file at the root of the classpath named " + ACCEPTANCE_FILE_NAME + ", e.g. at " +
-                        "src/test/resources/" + ACCEPTANCE_FILE_NAME + ". This file should contain the line:\n  " +
-                        imageName);
-
+        throw new IllegalStateException(
+            "The image " +
+            imageName +
+            " requires you to accept a license agreement. " +
+            "Please place a file at the root of the classpath named " +
+            ACCEPTANCE_FILE_NAME +
+            ", e.g. at " +
+            "src/test/resources/" +
+            ACCEPTANCE_FILE_NAME +
+            ". This file should contain the line:\n  " +
+            imageName
+        );
     }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/LogUtils.java b/core/src/main/java/org/testcontainers/utility/LogUtils.java
index ce27387490f..e5912563cd9 100644
--- a/core/src/main/java/org/testcontainers/utility/LogUtils.java
+++ b/core/src/main/java/org/testcontainers/utility/LogUtils.java
@@ -13,9 +13,6 @@
 import java.io.IOException;
 import java.util.function.Consumer;
 
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
-
 /**
  * Provides utility methods for logging.
  */
@@ -31,11 +28,12 @@ public class LogUtils {
      * @param consumer     a consumer of {@link OutputFrame}s
      * @param types        types of {@link OutputFrame} to receive
      */
-    public void followOutput(DockerClient dockerClient,
-                             String containerId,
-                             Consumer<OutputFrame> consumer,
-                             OutputFrame.OutputType... types) {
-
+    public void followOutput(
+        DockerClient dockerClient,
+        String containerId,
+        Consumer<OutputFrame> consumer,
+        OutputFrame.OutputType... types
+    ) {
         attachConsumer(dockerClient, containerId, consumer, true, types);
     }
 
@@ -47,11 +45,8 @@ public void followOutput(DockerClient dockerClient,
      * @param containerId  container ID to attach to
      * @param consumer     a consumer of {@link OutputFrame}s
      */
-    public void followOutput(DockerClient dockerClient,
-                             String containerId,
-                             Consumer<OutputFrame> consumer) {
-
-        followOutput(dockerClient, containerId, consumer, STDOUT, STDERR);
+    public void followOutput(DockerClient dockerClient, String containerId, Consumer<OutputFrame> consumer) {
+        followOutput(dockerClient, containerId, consumer, OutputFrame.OutputType.STDOUT, OutputFrame.OutputType.STDERR);
     }
 
     /**
@@ -63,16 +58,13 @@ public void followOutput(DockerClient dockerClient,
      * @return all previous output frames (stdout/stderr being separated by newline characters)
      */
     @SneakyThrows(IOException.class)
-    public String getOutput(DockerClient dockerClient,
-                            String containerId,
-                            OutputFrame.OutputType... types) {
-
+    public String getOutput(DockerClient dockerClient, String containerId, OutputFrame.OutputType... types) {
         if (containerId == null) {
             return "";
         }
 
         if (types.length == 0) {
-            types = new OutputFrame.OutputType[] { STDOUT, STDERR };
+            types = new OutputFrame.OutputType[] { OutputFrame.OutputType.STDOUT, OutputFrame.OutputType.STDERR };
         }
 
         final ToStringConsumer consumer = new ToStringConsumer();
@@ -90,16 +82,20 @@ private static Closeable attachConsumer(
         boolean followStream,
         OutputFrame.OutputType... types
     ) {
-
-        final LogContainerCmd cmd = dockerClient.logContainerCmd(containerId)
+        final LogContainerCmd cmd = dockerClient
+            .logContainerCmd(containerId)
             .withFollowStream(followStream)
             .withSince(0);
 
         final FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         for (OutputFrame.OutputType type : types) {
             callback.addConsumer(type, consumer);
-            if (type == STDOUT) cmd.withStdOut(true);
-            if (type == STDERR) cmd.withStdErr(true);
+            if (type == OutputFrame.OutputType.STDOUT) {
+                cmd.withStdOut(true);
+            }
+            if (type == OutputFrame.OutputType.STDERR) {
+                cmd.withStdErr(true);
+            }
         }
 
         return cmd.exec(callback);
diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
index 81cc37adeab..a8a9f465a19 100644
--- a/core/src/main/java/org/testcontainers/utility/MountableFile.java
+++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -1,7 +1,7 @@
 package org.testcontainers.utility;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -34,23 +34,24 @@
 import java.util.stream.Stream;
 import java.util.zip.Checksum;
 
-import static lombok.AccessLevel.PACKAGE;
-import static org.testcontainers.utility.PathUtils.recursiveDeleteDir;
-
 /**
  * An abstraction over files and classpath resources aimed at encapsulating all the complexity of generating
  * a path that the Docker daemon is about to create a volume mount for.
  */
-@RequiredArgsConstructor(access = PACKAGE)
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 @Slf4j
 public class MountableFile implements Transferable {
 
     private static final String TESTCONTAINERS_TMP_DIR_PREFIX = ".testcontainers-tmp-";
+
     private static final String OS_MAC_TMP_DIR = "/tmp";
+
     private static final int BASE_FILE_MODE = 0100000;
+
     private static final int BASE_DIR_MODE = 0040000;
 
     private final String path;
+
     private final Integer forcedFileMode;
 
     @Getter(lazy = true)
@@ -124,10 +125,11 @@ public static MountableFile forHostPath(final Path path, Integer mode) {
         return new MountableFile(path.toAbsolutePath().toString(), mode);
     }
 
-
     @NotNull
-    private static URL getClasspathResource(@NotNull final String resourcePath, @NotNull final Set<ClassLoader> classLoaders) {
-
+    private static URL getClasspathResource(
+        @NotNull final String resourcePath,
+        @NotNull final Set<ClassLoader> classLoaders
+    ) {
         final Set<ClassLoader> classLoadersToSearch = new HashSet<>(classLoaders);
         // try context and system classloaders as well
         classLoadersToSearch.add(Thread.currentThread().getContextClassLoader());
@@ -153,16 +155,22 @@ private static URL getClasspathResource(@NotNull final String resourcePath, @Not
             }
         }
 
-        throw new IllegalArgumentException("Resource with path " + resourcePath + " could not be found on any of these classloaders: " + classLoadersToSearch);
+        throw new IllegalArgumentException(
+            "Resource with path " +
+            resourcePath +
+            " could not be found on any of these classloaders: " +
+            classLoadersToSearch
+        );
     }
 
     private static String unencodeResourceURIToFilePath(@NotNull final String resource) {
         try {
             // Convert any url-encoded characters (e.g. spaces) back into unencoded form
-            return URLDecoder.decode(resource.replaceAll("\\+", "%2B"), Charsets.UTF_8.name())
-                    .replaceFirst("jar:", "")
-                    .replaceFirst("file:", "")
-                    .replaceAll("!.*", "");
+            return URLDecoder
+                .decode(resource.replaceAll("\\+", "%2B"), Charsets.UTF_8.name())
+                .replaceFirst("jar:", "")
+                .replaceFirst("file:", "")
+                .replaceAll("!.*", "");
         } catch (UnsupportedEncodingException e) {
             throw new IllegalStateException(e);
         }
@@ -237,15 +245,19 @@ private String extractClassPathResourceToTempLocation(final String hostPath) {
                 JarEntry entry = entries.nextElement();
                 final String name = entry.getName();
                 if (name.startsWith(internalPath)) {
-                    log.debug("Copying classpath resource(s) from {} to {} to permit Docker to bind",
-                            hostPath,
-                            tmpLocation);
+                    log.debug(
+                        "Copying classpath resource(s) from {} to {} to permit Docker to bind",
+                        hostPath,
+                        tmpLocation
+                    );
                     copyFromJarToLocation(jarFile, entry, internalPath, tmpLocation);
                 }
             }
-
         } catch (IOException e) {
-            throw new IllegalStateException("Failed to process JAR file when extracting classpath resource: " + hostPath, e);
+            throw new IllegalStateException(
+                "Failed to process JAR file when extracting classpath resource: " + hostPath,
+                e
+            );
         }
 
         // Mark temporary files/dirs for deletion at JVM shutdown
@@ -264,23 +276,22 @@ private File createTempDirectory() {
                 return Files.createTempDirectory(Paths.get(OS_MAC_TMP_DIR), TESTCONTAINERS_TMP_DIR_PREFIX).toFile();
             }
             return Files.createTempDirectory(TESTCONTAINERS_TMP_DIR_PREFIX).toFile();
-        } catch  (IOException e) {
+        } catch (IOException e) {
             return new File(TESTCONTAINERS_TMP_DIR_PREFIX + Base58.randomString(5));
         }
     }
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
-    private void copyFromJarToLocation(final JarFile jarFile,
-                                       final JarEntry entry,
-                                       final String fromRoot,
-                                       final File toRoot) throws IOException {
-
+    private void copyFromJarToLocation(
+        final JarFile jarFile,
+        final JarEntry entry,
+        final String fromRoot,
+        final File toRoot
+    ) throws IOException {
         String destinationName = entry.getName().replaceFirst(fromRoot, "");
         File newFile = new File(toRoot, destinationName);
 
-        log.debug("Copying resource {} from JAR file {}",
-                fromRoot,
-                jarFile.getName());
+        log.debug("Copying resource {} from JAR file {}", fromRoot, jarFile.getName());
 
         if (!entry.isDirectory()) {
             // Create parent directories
@@ -291,14 +302,21 @@ private void copyFromJarToLocation(final JarFile jarFile,
             try (InputStream is = jarFile.getInputStream(entry)) {
                 Files.copy(is, newFile.toPath());
             } catch (IOException e) {
-                log.error("Failed to extract classpath resource " + entry.getName() + " from JAR file " + jarFile.getName(), e);
+                log.error(
+                    "Failed to extract classpath resource " + entry.getName() + " from JAR file " + jarFile.getName(),
+                    e
+                );
                 throw e;
             }
         }
     }
 
     private void deleteOnExit(final Path path) {
-        Runtime.getRuntime().addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, () -> recursiveDeleteDir(path)));
+        Runtime
+            .getRuntime()
+            .addShutdownHook(
+                new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, () -> PathUtils.recursiveDeleteDir(path))
+            );
     }
 
     /**
@@ -312,11 +330,20 @@ public void transferTo(final TarArchiveOutputStream outputStream, String destina
     /*
      * Recursively copies a file/directory into a TarArchiveOutputStream
      */
-    private void recursiveTar(String entryFilename, String rootPath, String itemPath, TarArchiveOutputStream tarArchive) {
+    private void recursiveTar(
+        String entryFilename,
+        String rootPath,
+        String itemPath,
+        TarArchiveOutputStream tarArchive
+    ) {
         try {
-            final File sourceFile = new File(itemPath).getCanonicalFile();     // e.g. /foo/bar/baz
-            final File sourceRootFile = new File(rootPath).getCanonicalFile();     // e.g. /foo
-            final String relativePathToSourceFile = sourceRootFile.toPath().relativize(sourceFile.toPath()).toFile().toString();    // e.g. /bar/baz
+            final File sourceFile = new File(itemPath).getCanonicalFile(); // e.g. /foo/bar/baz
+            final File sourceRootFile = new File(rootPath).getCanonicalFile(); // e.g. /foo
+            final String relativePathToSourceFile = sourceRootFile
+                .toPath()
+                .relativize(sourceFile.toPath())
+                .toFile()
+                .toString(); // e.g. /bar/baz
 
             final String tarEntryFilename;
             if (relativePathToSourceFile.isEmpty()) {
@@ -341,7 +368,12 @@ private void recursiveTar(String entryFilename, String rootPath, String itemPath
             if (children != null) {
                 // recurse into child files/directories
                 for (final File child : children) {
-                    recursiveTar(entryFilename, sourceRootFile.getCanonicalPath(), child.getCanonicalPath(), tarArchive);
+                    recursiveTar(
+                        entryFilename,
+                        sourceRootFile.getCanonicalPath(),
+                        child.getCanonicalPath(),
+                        tarArchive
+                    );
                 }
             }
         } catch (IOException e) {
@@ -352,7 +384,6 @@ private void recursiveTar(String entryFilename, String rootPath, String itemPath
 
     @Override
     public long getSize() {
-
         final File file = new File(this.getResolvedPath());
         if (file.isFile()) {
             return file.length();
@@ -378,9 +409,11 @@ private void checksumFile(File file, Checksum checksum) {
         checksum.update(MountableFile.getUnixFileMode(path));
         if (file.isDirectory()) {
             try (Stream<Path> stream = Files.walk(path)) {
-                stream.filter(it -> it != path).forEach(it -> {
-                    checksumFile(it.toFile(), checksum);
-                });
+                stream
+                    .filter(it -> it != path)
+                    .forEach(it -> {
+                        checksumFile(it.toFile(), checksum);
+                    });
             }
         } else {
             FileUtils.checksum(file, checksum);
@@ -405,9 +438,11 @@ public static int getUnixFileMode(final Path path) {
         try {
             int unixMode = (int) Files.readAttributes(path, "unix:mode").get("mode");
             // Truncate mode bits for z/OS
-            if ("OS/390".equals(SystemUtils.OS_NAME) ||
+            if (
+                "OS/390".equals(SystemUtils.OS_NAME) ||
                 "z/OS".equals(SystemUtils.OS_NAME) ||
-                "zOS".equals(SystemUtils.OS_NAME) ) {
+                "zOS".equals(SystemUtils.OS_NAME)
+            ) {
                 unixMode &= TarConstants.MAXID;
                 unixMode |= Files.isDirectory(path) ? 040000 : 0100000;
             }
diff --git a/core/src/main/java/org/testcontainers/utility/PathUtils.java b/core/src/main/java/org/testcontainers/utility/PathUtils.java
index 2dcf9db8a8d..7f8b5925689 100644
--- a/core/src/main/java/org/testcontainers/utility/PathUtils.java
+++ b/core/src/main/java/org/testcontainers/utility/PathUtils.java
@@ -23,21 +23,23 @@ public class PathUtils {
      */
     public static void recursiveDeleteDir(final @NonNull Path directory) {
         try {
-            Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
-                @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-                    Files.delete(dir);
-                    return FileVisitResult.CONTINUE;
-                }
+            Files.walkFileTree(
+                directory,
+                new SimpleFileVisitor<Path>() {
+                    @Override
+                    public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                        Files.delete(dir);
+                        return FileVisitResult.CONTINUE;
+                    }
 
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                    Files.delete(file);
-                    return FileVisitResult.CONTINUE;
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                        Files.delete(file);
+                        return FileVisitResult.CONTINUE;
+                    }
                 }
-            });
-        } catch (IOException ignored) {
-        }
+            );
+        } catch (IOException ignored) {}
     }
 
     /**
@@ -66,8 +68,10 @@ public static String createMinGWPath(String path) {
         }
 
         // drive-letter must be lower case
-        mingwPath = "//" + Character.toLowerCase(mingwPath.charAt(driveLetterIndex)) +
-                mingwPath.substring(driveLetterIndex + 1);
+        mingwPath =
+            "//" +
+            Character.toLowerCase(mingwPath.charAt(driveLetterIndex)) +
+            mingwPath.substring(driveLetterIndex + 1);
         mingwPath = mingwPath.replace(":", "");
         return mingwPath;
     }
diff --git a/core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java
index c720416deac..7cf082000a4 100644
--- a/core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/PrefixingImageNameSubstitutor.java
@@ -38,11 +38,7 @@ public DockerImageName apply(DockerImageName original) {
             return original;
         }
 
-        log.debug(
-            "Applying changes to image name {}: applying prefix '{}'",
-            original,
-            configuredPrefix
-        );
+        log.debug("Applying changes to image name {}: applying prefix '{}'", original, configuredPrefix);
 
         DockerImageName prefixAsImage = DockerImageName.parse(configuredPrefix);
 
diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index e487bda686b..0001b926059 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -7,6 +7,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
 import org.zeroturnaround.exec.InvalidResultException;
 import org.zeroturnaround.exec.ProcessExecutor;
@@ -23,23 +24,23 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.slf4j.LoggerFactory.getLogger;
-import static org.testcontainers.utility.AuthConfigUtil.toSafeString;
-
 /**
  * Utility to look up registry authentication information for an image.
  */
 public class RegistryAuthLocator {
 
-    private static final Logger log = getLogger(RegistryAuthLocator.class);
+    private static final Logger log = LoggerFactory.getLogger(RegistryAuthLocator.class);
+
     private static final String DEFAULT_REGISTRY_NAME = "https://index.docker.io/v1/";
+
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     private static RegistryAuthLocator instance;
 
     private final String commandPathPrefix;
+
     private final String commandExtension;
+
     private final File configFile;
 
     private final Map<String, Optional<AuthConfig>> cache = new ConcurrentHashMap<>();
@@ -51,8 +52,12 @@ public class RegistryAuthLocator {
     private final Map<String, String> CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE;
 
     @VisibleForTesting
-    RegistryAuthLocator(File configFile, String commandPathPrefix, String commandExtension,
-                        Map<String, String> notFoundMessageHolderReference) {
+    RegistryAuthLocator(
+        File configFile,
+        String commandPathPrefix,
+        String commandExtension,
+        Map<String, String> notFoundMessageHolderReference
+    ) {
         this.configFile = configFile;
         this.commandPathPrefix = commandPathPrefix;
         this.commandExtension = commandExtension;
@@ -63,8 +68,9 @@ public class RegistryAuthLocator {
     /**
      */
     protected RegistryAuthLocator() {
-        final String dockerConfigLocation = System.getenv().getOrDefault("DOCKER_CONFIG",
-            System.getProperty("user.home") + "/.docker");
+        final String dockerConfigLocation = System
+            .getenv()
+            .getOrDefault("DOCKER_CONFIG", System.getProperty("user.home") + "/.docker");
         this.configFile = new File(dockerConfigLocation + "/config.json");
         this.commandPathPrefix = "";
         this.commandExtension = "";
@@ -72,7 +78,7 @@ protected RegistryAuthLocator() {
         this.CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE = new HashMap<>();
     }
 
-    public synchronized static RegistryAuthLocator instance() {
+    public static synchronized RegistryAuthLocator instance() {
         if (instance == null) {
             instance = new RegistryAuthLocator();
         }
@@ -106,23 +112,31 @@ public AuthConfig lookupAuthConfig(DockerImageName dockerImageName, AuthConfig d
         final String registryName = effectiveRegistryName(dockerImageName);
         log.debug("Looking up auth config for image: {} at registry: {}", dockerImageName, registryName);
 
-        final Optional<AuthConfig> cachedAuth = cache.computeIfAbsent(registryName, __ -> lookupUncachedAuthConfig(registryName, dockerImageName));
+        final Optional<AuthConfig> cachedAuth = cache.computeIfAbsent(
+            registryName,
+            __ -> lookupUncachedAuthConfig(registryName, dockerImageName)
+        );
 
         if (cachedAuth.isPresent()) {
-            log.debug("Cached auth found: [{}]", toSafeString(cachedAuth.get()));
+            log.debug("Cached auth found: [{}]", AuthConfigUtil.toSafeString(cachedAuth.get()));
             return cachedAuth.get();
         } else {
-            log.debug("No matching Auth Configs - falling back to defaultAuthConfig [{}]", toSafeString(defaultAuthConfig));
+            log.debug(
+                "No matching Auth Configs - falling back to defaultAuthConfig [{}]",
+                AuthConfigUtil.toSafeString(defaultAuthConfig)
+            );
             // otherwise, defaultAuthConfig should already contain any credentials available
             return defaultAuthConfig;
         }
     }
 
     private Optional<AuthConfig> lookupUncachedAuthConfig(String registryName, DockerImageName dockerImageName) {
-        log.debug("RegistryAuthLocator has configFile: {} ({}) and commandPathPrefix: {}",
+        log.debug(
+            "RegistryAuthLocator has configFile: {} ({}) and commandPathPrefix: {}",
             configFile,
             configFile.exists() ? "exists" : "does not exist",
-            commandPathPrefix);
+            commandPathPrefix
+        );
 
         try {
             final JsonNode config = OBJECT_MAPPER.readTree(configFile);
@@ -131,32 +145,33 @@ private Optional<AuthConfig> lookupUncachedAuthConfig(String registryName, Docke
             // use helper preferentially (per https://docs.docker.com/engine/reference/commandline/cli/)
             final AuthConfig helperAuthConfig = authConfigUsingHelper(config, registryName);
             if (helperAuthConfig != null) {
-                log.debug("found helper auth config [{}]", toSafeString(helperAuthConfig));
+                log.debug("found helper auth config [{}]", AuthConfigUtil.toSafeString(helperAuthConfig));
                 return Optional.of(helperAuthConfig);
             }
             // no credsHelper to use, using credsStore:
             final AuthConfig storeAuthConfig = authConfigUsingStore(config, registryName);
             if (storeAuthConfig != null) {
-                log.debug("found creds store auth config [{}]", toSafeString(storeAuthConfig));
+                log.debug("found creds store auth config [{}]", AuthConfigUtil.toSafeString(storeAuthConfig));
                 return Optional.of(storeAuthConfig);
             }
             // fall back to base64 encoded auth hardcoded in config file
             final AuthConfig existingAuthConfig = findExistingAuthConfig(config, registryName);
             if (existingAuthConfig != null) {
-                log.debug("found existing auth config [{}]", toSafeString(existingAuthConfig));
+                log.debug("found existing auth config [{}]", AuthConfigUtil.toSafeString(existingAuthConfig));
                 return Optional.of(existingAuthConfig);
             }
         } catch (Exception e) {
-            log.info("Failure when attempting to lookup auth config. Please ignore if you don't have images in an authenticated registry. Details: (dockerImageName: {}, configFile: {}. Falling back to docker-java default behaviour. Exception message: {}",
+            log.info(
+                "Failure when attempting to lookup auth config. Please ignore if you don't have images in an authenticated registry. Details: (dockerImageName: {}, configFile: {}. Falling back to docker-java default behaviour. Exception message: {}",
                 dockerImageName,
                 configFile,
-                e.getMessage());
+                e.getMessage()
+            );
         }
         return Optional.empty();
     }
 
     private AuthConfig findExistingAuthConfig(final JsonNode config, final String reposName) throws Exception {
-
         final Map.Entry<String, JsonNode> entry = findAuthNode(config, reposName);
 
         if (entry != null && entry.getValue() != null && entry.getValue().size() > 0) {
@@ -164,10 +179,11 @@ private AuthConfig findExistingAuthConfig(final JsonNode config, final String re
                 .treeToValue(entry.getValue(), AuthConfig.class)
                 .withRegistryAddress(entry.getKey());
 
-            if (isBlank(deserializedAuth.getUsername()) &&
-                isBlank(deserializedAuth.getPassword()) &&
-                !isBlank(deserializedAuth.getAuth())) {
-
+            if (
+                StringUtils.isBlank(deserializedAuth.getUsername()) &&
+                StringUtils.isBlank(deserializedAuth.getPassword()) &&
+                !StringUtils.isBlank(deserializedAuth.getAuth())
+            ) {
                 final String rawAuth = new String(Base64.getDecoder().decode(deserializedAuth.getAuth()));
                 final String[] splitRawAuth = rawAuth.split(":", 2);
 
@@ -198,7 +214,7 @@ private AuthConfig authConfigUsingStore(final JsonNode config, final String repo
         final JsonNode credsStoreNode = config.get("credsStore");
         if (credsStoreNode != null && !credsStoreNode.isMissingNode() && credsStoreNode.isTextual()) {
             final String credsStore = credsStoreNode.asText();
-            if (isBlank(credsStore)) {
+            if (StringUtils.isBlank(credsStore)) {
                 log.warn("Docker auth config credsStore field will be ignored, because value is blank");
                 return null;
             }
@@ -222,8 +238,7 @@ private Map.Entry<String, JsonNode> findAuthNode(final JsonNode config, final St
     }
 
     private AuthConfig runCredentialProvider(String hostName, String helperOrStoreName) throws Exception {
-
-        if (isBlank(hostName)) {
+        if (StringUtils.isBlank(hostName)) {
             log.debug("There is no point in locating AuthConfig for blank hostName. Returning NULL to allow fallback");
             return null;
         }
@@ -231,28 +246,34 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
         final String credentialProgramName = getCredentialProgramName(helperOrStoreName);
         final String data;
 
-        log.debug("Executing docker credential provider: {} to locate auth config for: {}",
-            credentialProgramName, hostName);
+        log.debug(
+            "Executing docker credential provider: {} to locate auth config for: {}",
+            credentialProgramName,
+            hostName
+        );
 
         try {
             data = runCredentialProgram(hostName, credentialProgramName);
         } catch (InvalidResultException e) {
-
             final String responseErrorMsg = extractCredentialProviderErrorMessage(e);
 
-            if (!isBlank(responseErrorMsg)) {
+            if (!StringUtils.isBlank(responseErrorMsg)) {
                 String credentialsNotFoundMsg = getGenericCredentialsNotFoundMsg(credentialProgramName);
                 if (credentialsNotFoundMsg != null && credentialsNotFoundMsg.equals(responseErrorMsg)) {
-                    log.info("Credential helper/store ({}) does not have credentials for {}",
+                    log.info(
+                        "Credential helper/store ({}) does not have credentials for {}",
                         credentialProgramName,
-                        hostName);
+                        hostName
+                    );
 
                     return null;
                 }
 
-                log.debug("Failure running docker credential helper/store ({}) with output '{}'",
-                    credentialProgramName, responseErrorMsg);
-
+                log.debug(
+                    "Failure running docker credential helper/store ({}) with output '{}'",
+                    credentialProgramName,
+                    responseErrorMsg
+                );
             } else {
                 log.debug("Failure running docker credential helper/store ({})", credentialProgramName);
             }
@@ -296,7 +317,7 @@ private String effectiveRegistryName(DockerImageName dockerImageName) {
     private String getGenericCredentialsNotFoundMsg(String credentialHelperName) {
         if (!CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE.containsKey(credentialHelperName)) {
             String credentialsNotFoundMsg = discoverCredentialsHelperNotFoundMessage(credentialHelperName);
-            if (!isBlank(credentialsNotFoundMsg)) {
+            if (!StringUtils.isBlank(credentialsNotFoundMsg)) {
                 CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE.put(credentialHelperName, credentialsNotFoundMsg);
             }
         }
@@ -317,19 +338,26 @@ private String discoverCredentialsHelperNotFoundMessage(String credentialHelperN
             runCredentialProgram(notExistentFakeHostName, credentialHelperName);
 
             // should not reach here
-            log.warn("Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response",
-                credentialHelperName);
-        } catch(Exception e) {
+            log.warn(
+                "Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response",
+                credentialHelperName
+            );
+        } catch (Exception e) {
             if (e instanceof InvalidResultException) {
-                credentialsNotFoundMsg = extractCredentialProviderErrorMessage((InvalidResultException)e);
+                credentialsNotFoundMsg = extractCredentialProviderErrorMessage((InvalidResultException) e);
             }
 
-            if (isBlank(credentialsNotFoundMsg)) {
-                log.warn("Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response. Exception message: {}",
+            if (StringUtils.isBlank(credentialsNotFoundMsg)) {
+                log.warn(
+                    "Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response. Exception message: {}",
                     credentialHelperName,
-                    e.getMessage());
+                    e.getMessage()
+                );
             } else {
-                log.debug("Got credentials not found error message from docker credential helper - {}", credentialsNotFoundMsg);
+                log.debug(
+                    "Got credentials not found error message from docker credential helper - {}",
+                    credentialsNotFoundMsg
+                );
             }
         }
 
@@ -345,16 +373,17 @@ private String extractCredentialProviderErrorMessage(InvalidResultException inva
 
     private String runCredentialProgram(String hostName, String credentialHelperName)
         throws InvalidResultException, InterruptedException, TimeoutException, IOException {
-
-        String[] command = SystemUtils.IS_OS_WINDOWS ? new String[] {"cmd", "/c", credentialHelperName, "get"} : new String[]{credentialHelperName, "get"};
+        String[] command = SystemUtils.IS_OS_WINDOWS
+            ? new String[] { "cmd", "/c", credentialHelperName, "get" }
+            : new String[] { credentialHelperName, "get" };
         return new ProcessExecutor()
-                        .command(command)
-                        .redirectInput(new ByteArrayInputStream(hostName.getBytes()))
-                        .readOutput(true)
-                        .exitValueNormal()
-                        .timeout(30, TimeUnit.SECONDS)
-                        .execute()
-                        .outputUTF8()
-                        .trim();
+            .command(command)
+            .redirectInput(new ByteArrayInputStream(hostName.getBytes()))
+            .readOutput(true)
+            .exitValueNormal()
+            .timeout(30, TimeUnit.SECONDS)
+            .execute()
+            .outputUTF8()
+            .trim();
     }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index d916579db35..ad0c949f6e7 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -49,29 +49,30 @@ public class ResourceReaper {
     static final List<List<Map.Entry<String, String>>> DEATH_NOTE = new ArrayList<>(
         Arrays.asList(
             Stream
-                .concat(
-                    DockerClientFactory.DEFAULT_LABELS.entrySet().stream(),
-                    MARKER_LABELS.entrySet().stream()
-                )
+                .concat(DockerClientFactory.DEFAULT_LABELS.entrySet().stream(), MARKER_LABELS.entrySet().stream())
                 .<Map.Entry<String, String>>map(it -> new SimpleEntry<>("label", it.getKey() + "=" + it.getValue()))
                 .collect(Collectors.toList())
         )
     );
 
     private static ResourceReaper instance;
+
     final DockerClient dockerClient = DockerClientFactory.lazyClient();
+
     private Map<String, String> registeredContainers = new ConcurrentHashMap<>();
+
     private Set<String> registeredNetworks = Sets.newConcurrentHashSet();
+
     private Set<String> registeredImages = Sets.newConcurrentHashSet();
+
     private AtomicBoolean hookIsSet = new AtomicBoolean(false);
 
     /**
      * Internal constructor to avoid custom implementations
      */
-    ResourceReaper() {
-    }
+    ResourceReaper() {}
 
-    public synchronized static ResourceReaper instance() {
+    public static synchronized ResourceReaper instance() {
         if (instance == null) {
             boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
             if (useRyuk) {
@@ -117,7 +118,9 @@ public void registerFilterForCleanup(List<Map.Entry<String, String>> filter) {
      */
     public void registerLabelsFilterForCleanup(Map<String, String> labels) {
         registerFilterForCleanup(
-            labels.entrySet().stream()
+            labels
+                .entrySet()
+                .stream()
                 .map(it -> new SimpleEntry<>("label", it.getKey() + "=" + it.getValue()))
                 .collect(Collectors.toList())
         );
@@ -172,9 +175,11 @@ private void removeContainer(String containerId, String imageName) {
             LOGGER.trace("Was going to stop container but it apparently no longer exists: {}", containerId);
             return;
         } catch (Exception e) {
-            LOGGER.trace("Error encountered when checking container for shutdown (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
+            LOGGER.trace(
+                "Error encountered when checking container for shutdown (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
                 containerId,
-                Throwables.getRootCause(e).getMessage());
+                Throwables.getRootCause(e).getMessage()
+            );
             return;
         }
 
@@ -184,9 +189,11 @@ private void removeContainer(String containerId, String imageName) {
                 dockerClient.killContainerCmd(containerId).exec();
                 LOGGER.trace("Stopped container: {}", imageName);
             } catch (Exception e) {
-                LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
+                LOGGER.trace(
+                    "Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
                     containerId,
-                    Throwables.getRootCause(e).getMessage());
+                    Throwables.getRootCause(e).getMessage()
+                );
             }
         }
 
@@ -202,9 +209,11 @@ private void removeContainer(String containerId, String imageName) {
             dockerClient.removeContainerCmd(containerId).withRemoveVolumes(true).withForce(true).exec();
             LOGGER.debug("Removed container and associated volume(s): {}", imageName);
         } catch (Exception e) {
-            LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
+            LOGGER.trace(
+                "Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped. Root cause: {}",
                 containerId,
-                Throwables.getRootCause(e).getMessage());
+                Throwables.getRootCause(e).getMessage()
+            );
         }
     }
 
@@ -227,10 +236,9 @@ public void registerNetworkIdForCleanup(String id) {
      */
     @Deprecated
     public void removeNetworkById(String id) {
-      removeNetwork(id);
+        removeNetwork(id);
     }
 
-
     private void removeNetwork(String id) {
         try {
             List<Network> networks;
@@ -239,7 +247,10 @@ private void removeNetwork(String id) {
                 // Listing by ID first prevents docker-java logging an error if we just go blindly into removeNetworkCmd
                 networks = dockerClient.listNetworksCmd().withIdFilter(id).exec();
             } catch (Exception e) {
-                LOGGER.trace("Error encountered when looking up network for removal (name: {}) - it may not have been removed", id);
+                LOGGER.trace(
+                    "Error encountered when looking up network for removal (name: {}) - it may not have been removed",
+                    id
+                );
                 return;
             }
 
@@ -251,7 +262,10 @@ private void removeNetwork(String id) {
                     registeredNetworks.remove(network.getId());
                     LOGGER.debug("Removed network: {}", id);
                 } catch (Exception e) {
-                    LOGGER.trace("Error encountered removing network (name: {}) - it may not have been removed", network.getName());
+                    LOGGER.trace(
+                        "Error encountered removing network (name: {}) - it may not have been removed",
+                        network.getName()
+                    );
                 }
             }
         } finally {
@@ -296,7 +310,9 @@ private void removeImage(String dockerImageName) {
     void setHook() {
         if (hookIsSet.compareAndSet(false, true)) {
             // If the JVM stops without containers being stopped, try and stop the container.
-            Runtime.getRuntime().addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, this::performCleanup));
+            Runtime
+                .getRuntime()
+                .addShutdownHook(new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, this::performCleanup));
         }
     }
 
@@ -323,8 +339,7 @@ public CreateContainerCmd register(GenericContainer<?> container, CreateContaine
      * @deprecated internal API
      */
     @Deprecated
-    public void init() {
-    }
+    public void init() {}
 
     static class FilterRegistry {
 
@@ -332,6 +347,7 @@ static class FilterRegistry {
         static final String ACKNOWLEDGMENT = "ACK";
 
         private final BufferedReader in;
+
         private final OutputStream out;
 
         FilterRegistry(InputStream ryukInputStream, OutputStream ryukOutputStream) {
@@ -347,10 +363,13 @@ static class FilterRegistry {
          * @throws IOException if communication with Ryuk fails
          */
         protected boolean register(List<Map.Entry<String, String>> filters) throws IOException {
-            String query = filters.stream()
+            String query = filters
+                .stream()
                 .map(it -> {
                     try {
-                        return URLEncoder.encode(it.getKey(), "UTF-8") + "=" + URLEncoder.encode(it.getValue(), "UTF-8");
+                        return (
+                            URLEncoder.encode(it.getKey(), "UTF-8") + "=" + URLEncoder.encode(it.getValue(), "UTF-8")
+                        );
                     } catch (UnsupportedEncodingException e) {
                         throw new RuntimeException(e);
                     }
@@ -372,6 +391,5 @@ private static boolean waitForAcknowledgment(BufferedReader in) throws IOExcepti
             }
             return ACKNOWLEDGMENT.equalsIgnoreCase(line);
         }
-
     }
 }
diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 1e18c14157a..511e6ccac17 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -10,15 +10,20 @@ class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
         super("testcontainers/ryuk:0.3.3");
-
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);
             cmd.withHostConfig(
-                cmd.getHostConfig()
+                cmd
+                    .getHostConfig()
                     .withAutoRemove(true)
                     .withPrivileged(TestcontainersConfiguration.getInstance().isRyukPrivileged())
-                    .withBinds(new Bind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), new Volume("/var/run/docker.sock")))
+                    .withBinds(
+                        new Bind(
+                            DockerClientFactory.instance().getRemoteDockerUnixSocketPath(),
+                            new Volume("/var/run/docker.sock")
+                        )
+                    )
             );
         });
 
diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
index 6ce9c372fd2..999b1cbbffb 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -90,7 +90,10 @@ private synchronized void maybeStart() {
                         // not set the read timeout, as Ryuk would not send anything unless a new filter is submitted, meaning that we would get a timeout exception pretty quick
                         try (Socket clientSocket = new Socket()) {
                             clientSocket.connect(new InetSocketAddress(host, ryukPort), 5 * 1000);
-                            ResourceReaper.FilterRegistry registry = new ResourceReaper.FilterRegistry(clientSocket.getInputStream(), clientSocket.getOutputStream());
+                            ResourceReaper.FilterRegistry registry = new ResourceReaper.FilterRegistry(
+                                clientSocket.getInputStream(),
+                                clientSocket.getOutputStream()
+                            );
 
                             synchronized (ResourceReaper.DEATH_NOTE) {
                                 while (true) {
diff --git a/core/src/main/java/org/testcontainers/utility/TestEnvironment.java b/core/src/main/java/org/testcontainers/utility/TestEnvironment.java
index dbd8e45a98f..ee58199540b 100644
--- a/core/src/main/java/org/testcontainers/utility/TestEnvironment.java
+++ b/core/src/main/java/org/testcontainers/utility/TestEnvironment.java
@@ -8,8 +8,7 @@
  */
 public class TestEnvironment {
 
-    private TestEnvironment() {
-    }
+    private TestEnvironment() {}
 
     public static boolean dockerApiAtLeast(String minimumVersion) {
         ComparableVersion min = new ComparableVersion(minimumVersion);
@@ -29,4 +28,3 @@ public static boolean dockerIsDockerMachine() {
         return DockerClientFactory.instance().isUsing(DockerMachineClientProviderStrategy.class);
     }
 }
-
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index c9dfd543ad6..e647a8d50b3 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -50,18 +50,29 @@ public class TestcontainersConfiguration {
     private static File USER_CONFIG_FILE = new File(System.getProperty("user.home"), "." + PROPERTIES_FILE_NAME);
 
     private static final String AMBASSADOR_IMAGE = "richnorth/ambassador";
+
     private static final String SOCAT_IMAGE = "alpine/socat";
+
     private static final String VNC_RECORDER_IMAGE = "testcontainers/vnc-recorder";
+
     private static final String COMPOSE_IMAGE = "docker/compose";
+
     private static final String ALPINE_IMAGE = "alpine";
+
     private static final String RYUK_IMAGE = "testcontainers/ryuk";
+
     private static final String KAFKA_IMAGE = "confluentinc/cp-kafka";
+
     private static final String PULSAR_IMAGE = "apachepulsar/pulsar";
+
     private static final String LOCALSTACK_IMAGE = "localstack/localstack";
+
     private static final String SSHD_IMAGE = "testcontainers/sshd";
+
     private static final String ORACLE_IMAGE = "gvenzl/oracle-xe";
 
-    private static final ImmutableMap<DockerImageName, String> CONTAINER_MAPPING = ImmutableMap.<DockerImageName, String>builder()
+    private static final ImmutableMap<DockerImageName, String> CONTAINER_MAPPING = ImmutableMap
+        .<DockerImageName, String>builder()
         .put(DockerImageName.parse(AMBASSADOR_IMAGE), "ambassador.container.image")
         .put(DockerImageName.parse(SOCAT_IMAGE), "socat.container.image")
         .put(DockerImageName.parse(VNC_RECORDER_IMAGE), "vncrecorder.container.image")
@@ -78,7 +89,7 @@ public class TestcontainersConfiguration {
     @Getter(lazy = true)
     private static final TestcontainersConfiguration instance = loadConfiguration();
 
-    @SuppressWarnings({"ConstantConditions", "unchecked", "rawtypes"})
+    @SuppressWarnings({ "ConstantConditions", "unchecked", "rawtypes" })
     @VisibleForTesting
     static AtomicReference<TestcontainersConfiguration> getInstanceField() {
         // Lazy Getter from Lombok changes the field's type to AtomicReference
@@ -86,10 +97,16 @@ static AtomicReference<TestcontainersConfiguration> getInstanceField() {
     }
 
     private final Properties userProperties;
+
     private final Properties classpathProperties;
+
     private final Map<String, String> environment;
 
-    TestcontainersConfiguration(Properties userProperties, Properties classpathProperties, final Map<String, String> environment) {
+    TestcontainersConfiguration(
+        Properties userProperties,
+        Properties classpathProperties,
+        final Map<String, String> environment
+    ) {
         this.userProperties = userProperties;
         this.classpathProperties = classpathProperties;
         this.environment = environment;
@@ -121,8 +138,7 @@ public String getTinyImage() {
     }
 
     public boolean isRyukPrivileged() {
-        return Boolean
-            .parseBoolean(getEnvVarOrProperty("ryuk.container.privileged", "false"));
+        return Boolean.parseBoolean(getEnvVarOrProperty("ryuk.container.privileged", "false"));
     }
 
     @Deprecated
@@ -203,7 +219,11 @@ public Integer getClientPingTimeout() {
 
     @Nullable
     @Contract("_, !null, _ -> !null")
-    private String getConfigurable(@NotNull final String propertyName, @Nullable final String defaultValue, Properties... propertiesSources) {
+    private String getConfigurable(
+        @NotNull final String propertyName,
+        @Nullable final String defaultValue,
+        Properties... propertiesSources
+    ) {
         String envVarName = propertyName.replaceAll("\\.", "_").toUpperCase();
         if (!envVarName.startsWith("TESTCONTAINERS_") && !envVarName.startsWith("DOCKER_")) {
             envVarName = "TESTCONTAINERS_" + envVarName;
@@ -279,11 +299,15 @@ public String getUserProperty(@NotNull final String propertyName, @Nullable fina
      */
     @Deprecated
     public Properties getProperties() {
-        return Stream.of(userProperties, classpathProperties)
-            .reduce(new Properties(), (a, b) -> {
-                a.putAll(b);
-                return a;
-            });
+        return Stream
+            .of(userProperties, classpathProperties)
+            .reduce(
+                new Properties(),
+                (a, b) -> {
+                    a.putAll(b);
+                    return a;
+                }
+            );
     }
 
     @Deprecated
@@ -318,15 +342,20 @@ public boolean updateUserConfig(@NonNull String prop, @NonNull String value) {
     private static TestcontainersConfiguration loadConfiguration() {
         return new TestcontainersConfiguration(
             readProperties(USER_CONFIG_FILE.toURI().toURL()),
-            ClasspathScanner.scanFor(PROPERTIES_FILE_NAME)
+            ClasspathScanner
+                .scanFor(PROPERTIES_FILE_NAME)
                 .map(TestcontainersConfiguration::readProperties)
-                .reduce(new Properties(), (a, b) -> {
-                    // first-write-wins merging - URLs appearing first on the classpath alphabetically will take priority.
-                    // Note that this means that file: URLs will always take priority over jar: URLs.
-                    b.putAll(a);
-                    return b;
-                }),
-            System.getenv());
+                .reduce(
+                    new Properties(),
+                    (a, b) -> {
+                        // first-write-wins merging - URLs appearing first on the classpath alphabetically will take priority.
+                        // Note that this means that file: URLs will always take priority over jar: URLs.
+                        b.putAll(a);
+                        return b;
+                    }
+                ),
+            System.getenv()
+        );
     }
 
     private static Properties readProperties(URL url) {
@@ -335,9 +364,17 @@ private static Properties readProperties(URL url) {
         try (InputStream inputStream = url.openStream()) {
             properties.load(inputStream);
         } catch (FileNotFoundException e) {
-            log.warn("Attempted to read Testcontainers configuration file at {} but the file was not found. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
+            log.warn(
+                "Attempted to read Testcontainers configuration file at {} but the file was not found. Exception message: {}",
+                url,
+                ExceptionUtils.getRootCauseMessage(e)
+            );
         } catch (IOException e) {
-            log.warn("Attempted to read Testcontainers configuration file at {} but could it not be loaded. Exception message: {}", url, ExceptionUtils.getRootCauseMessage(e));
+            log.warn(
+                "Attempted to read Testcontainers configuration file at {} but could it not be loaded. Exception message: {}",
+                url,
+                ExceptionUtils.getRootCauseMessage(e)
+            );
         }
         return properties;
     }
@@ -349,14 +386,14 @@ private DockerImageName getImage(final String defaultValue) {
     DockerImageName getConfiguredSubstituteImage(DockerImageName original) {
         for (final Map.Entry<DockerImageName, String> entry : CONTAINER_MAPPING.entrySet()) {
             if (original.isCompatibleWith(entry.getKey())) {
-                return
-                    Optional.ofNullable(entry.getValue())
-                        .map(propertyName -> getEnvVarOrProperty(propertyName, null))
-                        .map(String::valueOf)
-                        .map(String::trim)
-                        .map(DockerImageName::parse)
-                        .orElse(original)
-                        .asCompatibleSubstituteFor(original);
+                return Optional
+                    .ofNullable(entry.getValue())
+                    .map(propertyName -> getEnvVarOrProperty(propertyName, null))
+                    .map(String::valueOf)
+                    .map(String::trim)
+                    .map(DockerImageName::parse)
+                    .orElse(original)
+                    .asCompatibleSubstituteFor(original);
             }
         }
         return original;
diff --git a/core/src/main/java/org/testcontainers/utility/ThrowingFunction.java b/core/src/main/java/org/testcontainers/utility/ThrowingFunction.java
index 6b2cef907e1..a8138f9dda0 100644
--- a/core/src/main/java/org/testcontainers/utility/ThrowingFunction.java
+++ b/core/src/main/java/org/testcontainers/utility/ThrowingFunction.java
@@ -1,6 +1,5 @@
 package org.testcontainers.utility;
 
 public interface ThrowingFunction<T, R> {
-
     R apply(T t) throws Exception;
 }
diff --git a/core/src/main/java/org/testcontainers/utility/Versioning.java b/core/src/main/java/org/testcontainers/utility/Versioning.java
index 4b1da407440..372a105518f 100644
--- a/core/src/main/java/org/testcontainers/utility/Versioning.java
+++ b/core/src/main/java/org/testcontainers/utility/Versioning.java
@@ -45,8 +45,11 @@ public int hashCode() {
 
     @EqualsAndHashCode
     class TagVersioning implements Versioning {
+
         public static final String TAG_REGEX = "[\\w][\\w.\\-]{0,127}";
+
         static final TagVersioning LATEST = new TagVersioning("latest");
+
         private final String tag;
 
         TagVersioning(String tag) {
@@ -71,7 +74,9 @@ public String toString() {
 
     @EqualsAndHashCode
     class Sha256Versioning implements Versioning {
+
         public static final String HASH_REGEX = "[0-9a-fA-F]{32,}";
+
         private final String hash;
 
         Sha256Versioning(String hash) {
diff --git a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
index e4197c7c1f6..168932106fb 100644
--- a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
+++ b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
@@ -1,29 +1,30 @@
 package alt.testcontainers.images;
 
 import org.junit.Test;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.images.AbstractImagePullPolicy;
 import org.testcontainers.images.ImageData;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.testcontainers.TestImages.TINY_IMAGE;
-
 public class OutOfPackageImagePullPolicyTest {
+
     @Test
     public void shouldSupportCustomPoliciesOutOfTestContainersPackage() {
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
-                .withImagePullPolicy(new AbstractImagePullPolicy() {
-                    @Override
-                    protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
-                        return false;
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
+                .withImagePullPolicy(
+                    new AbstractImagePullPolicy() {
+                        @Override
+                        protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+                            return false;
+                        }
                     }
-                })
+                )
         ) {
             container.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
             container.start();
         }
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/DaemonTest.java b/core/src/test/java/org/testcontainers/DaemonTest.java
index f08614c8cdc..c1a1c20d60a 100644
--- a/core/src/test/java/org/testcontainers/DaemonTest.java
+++ b/core/src/test/java/org/testcontainers/DaemonTest.java
@@ -10,7 +10,6 @@
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 /**
  * This test forks a new JVM, otherwise it's not possible to reliably diff the threads
@@ -23,7 +22,7 @@ public static void main(String[] args) {
         GenericContainer<?> genericContainer = null;
 
         try {
-            genericContainer = new GenericContainer<>(TINY_IMAGE).withCommand("top");
+            genericContainer = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top");
             genericContainer.start();
 
             Set<Thread> threads = new HashSet<>(Thread.getAllStackTraces().keySet());
@@ -34,11 +33,14 @@ public static void main(String[] args) {
             if (nonDaemonThreads.isEmpty()) {
                 VisibleAssertions.pass("All threads marked as daemon");
             } else {
-                String nonDaemonThreadNames = nonDaemonThreads.stream()
+                String nonDaemonThreadNames = nonDaemonThreads
+                    .stream()
                     .map(Thread::getName)
                     .collect(Collectors.joining("\n", "\n", ""));
 
-                VisibleAssertions.fail("Expected all threads to be daemons but the following are not:\n" + nonDaemonThreadNames);
+                VisibleAssertions.fail(
+                    "Expected all threads to be daemons but the following are not:\n" + nonDaemonThreadNames
+                );
             }
         } finally {
             if (genericContainer != null) {
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index a889764579f..794bbbc37c9 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -28,11 +28,13 @@ public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
             dockFactory.runInsideDocker(
                 imageName,
                 cmd -> cmd.withCmd("sh", "-c", "echo 'SUCCESS'"),
-                (client, id) ->
-                    client.logContainerCmd(id)
+                (client, id) -> {
+                    return client
+                        .logContainerCmd(id)
                         .withStdOut(true)
                         .exec(new LogToStringContainerCallback())
-                        .toString()
+                        .toString();
+                }
             );
         }
     }
diff --git a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
index 4018b2b954d..a907c674386 100644
--- a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
+++ b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
@@ -51,22 +51,30 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
             WaitingConsumer waitingConsumer = new WaitingConsumer();
             resultCallback.addConsumer(OutputFrame.OutputType.STDERR, waitingConsumer);
 
-            dockerClient.logContainerCmd(containerInfo.getId())
+            dockerClient
+                .logContainerCmd(containerInfo.getId())
                 .withStdErr(true)
                 .withFollowStream(true)
                 .exec(resultCallback);
 
-            Pattern pattern = Pattern.compile(".*listening on .*:(\\d+).*", Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
-            waitingConsumer.waitUntil(it -> {
-                String s = it.getUtf8String();
-                Matcher matcher = pattern.matcher(s);
-                if (matcher.matches()) {
-                    port.set(Integer.parseInt(matcher.group(1)));
-                    return true;
-                } else {
-                    return false;
-                }
-            }, 10, TimeUnit.SECONDS);
+            Pattern pattern = Pattern.compile(
+                ".*listening on .*:(\\d+).*",
+                Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE
+            );
+            waitingConsumer.waitUntil(
+                it -> {
+                    String s = it.getUtf8String();
+                    Matcher matcher = pattern.matcher(s);
+                    if (matcher.matches()) {
+                        port.set(Integer.parseInt(matcher.group(1)));
+                        return true;
+                    } else {
+                        return false;
+                    }
+                },
+                10,
+                TimeUnit.SECONDS
+            );
         }
 
         endpoint = getHost() + ":" + port.get();
@@ -87,12 +95,15 @@ public DockerImageName createImage(String originalImage, String tag) {
 
         String dummyImageId = client.inspectImageCmd(originalImage).exec().getId();
 
-        DockerImageName imageName = DockerImageName.parse(getEndpoint() + "/" + Base58.randomString(6).toLowerCase()).withTag(tag);
+        DockerImageName imageName = DockerImageName
+            .parse(getEndpoint() + "/" + Base58.randomString(6).toLowerCase())
+            .withTag(tag);
 
         // push the image to the registry
         client.tagImageCmd(dummyImageId, imageName.asCanonicalNameString(), tag).exec();
 
-        client.pushImageCmd(imageName.asCanonicalNameString())
+        client
+            .pushImageCmd(imageName.asCanonicalNameString())
             .exec(new ResultCallback.Adapter<>())
             .awaitCompletion(1, TimeUnit.MINUTES);
 
diff --git a/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
index 52296678fd4..4909e908713 100644
--- a/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
@@ -5,10 +5,9 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.Collections;
 import java.util.List;
 
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -18,21 +17,22 @@ public class ContainerStateTest {
 
     @Parameterized.Parameters(name = "{0} ({1} -> {2})")
     public static Object[][] params() {
-        return new Object[][]{
-            new Object[]{"regular mapping", "80:8080/tcp", singletonList(80),},
-            new Object[]{"regular mapping with host", "127.0.0.1:80:8080/tcp", singletonList(80),},
-            new Object[]{"zero port without host", ":0:8080/tcp", emptyList(),},
-            new Object[]{"missing port with host", "0.0.0.0:0:8080/tcp", emptyList(),},
-            new Object[]{"zero port (synthetic case)", "0:8080/tcp", emptyList(),},
-            new Object[]{"missing port", ":8080/tcp", emptyList(),
-            }
+        return new Object[][] {
+            new Object[] { "regular mapping", "80:8080/tcp", Collections.singletonList(80) },
+            new Object[] { "regular mapping with host", "127.0.0.1:80:8080/tcp", Collections.singletonList(80) },
+            new Object[] { "zero port without host", ":0:8080/tcp", Collections.emptyList() },
+            new Object[] { "missing port with host", "0.0.0.0:0:8080/tcp", Collections.emptyList() },
+            new Object[] { "zero port (synthetic case)", "0:8080/tcp", Collections.emptyList() },
+            new Object[] { "missing port", ":8080/tcp", Collections.emptyList() },
         };
     }
 
     @Parameterized.Parameter(0)
     public String name;
+
     @Parameterized.Parameter(1)
     public String testSet;
+
     @Parameterized.Parameter(2)
     public List<Integer> expectedResult;
 
@@ -41,7 +41,7 @@ public void test() {
         ContainerState containerState = mock(ContainerState.class);
         doCallRealMethod().when(containerState).getBoundPortNumbers();
 
-        when(containerState.getPortBindings()).thenReturn(singletonList(testSet));
+        when(containerState.getPortBindings()).thenReturn(Collections.singletonList(testSet));
 
         List<Integer> result = containerState.getBoundPortNumbers();
         Assertions.assertThat(result).hasSameElementsAs(expectedResult);
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
index 8927972e642..8f056de98fa 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -9,17 +9,20 @@
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
-
 public class DockerComposeContainerWithServicesTest {
 
-    public static final File SIMPLE_COMPOSE_FILE = new File("src/test/resources/compose-scaling-multiple-containers.yml");
-    public static final File COMPOSE_FILE_WITH_INLINE_SCALE = new File("src/test/resources/compose-with-inline-scale-test.yml");
+    public static final File SIMPLE_COMPOSE_FILE = new File(
+        "src/test/resources/compose-scaling-multiple-containers.yml"
+    );
+
+    public static final File COMPOSE_FILE_WITH_INLINE_SCALE = new File(
+        "src/test/resources/compose-with-inline-scale-test.yml"
+    );
 
     @Test
     public void testDesiredSubsetOfServicesAreStarted() {
         try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
-                .withServices("redis")
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE).withServices("redis")
         ) {
             compose.start();
 
@@ -67,9 +70,7 @@ public void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
 
     @Test
     public void testAllServicesAreStartedIfNotSpecified() {
-        try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
-        ) {
+        try (DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)) {
             compose.start();
 
             verifyStartedContainers(compose, "redis_1", "other_1");
@@ -78,9 +79,7 @@ public void testAllServicesAreStartedIfNotSpecified() {
 
     @Test
     public void testScaleInComposeFileIsRespected() {
-        try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_INLINE_SCALE)
-        ) {
+        try (DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_INLINE_SCALE)) {
             compose.start();
 
             // the compose file includes `scale: 3` for the redis container
@@ -89,17 +88,20 @@ public void testScaleInComposeFileIsRespected() {
     }
 
     private void verifyStartedContainers(final DockerComposeContainer<?> compose, final String... names) {
-        final List<String> containerNames = compose.listChildContainers().stream()
+        final List<String> containerNames = compose
+            .listChildContainers()
+            .stream()
             .flatMap(container -> Stream.of(container.getNames()))
             .collect(Collectors.toList());
 
-        assertEquals("number of running services of docker-compose is the same as length of listOfServices",
-            names.length, containerNames.size());
+        assertEquals(
+            "number of running services of docker-compose is the same as length of listOfServices",
+            names.length,
+            containerNames.size()
+        );
 
         for (final String expectedName : names) {
-            final long matches = containerNames.stream()
-                .filter(foundName -> foundName.endsWith(expectedName))
-                .count();
+            final long matches = containerNames.stream().filter(foundName -> foundName.endsWith(expectedName)).count();
 
             assertEquals("container with name starting '" + expectedName + "' should be running", 1L, matches);
         }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
index c47db0c4b66..6e1630f005f 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -1,25 +1,33 @@
 package org.testcontainers.containers;
 
-
 import com.google.common.collect.Lists;
-import java.io.File;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
+import java.io.File;
+
 public class DockerComposeFilesTest {
+
     @Test
     public void shouldGetDependencyImages() {
-        DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-parsing-v2.yml")));
-        Assertions.assertThat(dockerComposeFiles.getDependencyImages())
+        DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(
+            Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-parsing-v2.yml"))
+        );
+        Assertions
+            .assertThat(dockerComposeFiles.getDependencyImages())
             .containsExactlyInAnyOrder("postgres:latest", "redis:latest", "mysql:latest");
     }
 
     @Test
     public void shouldGetDependencyImagesWhenOverriding() {
         DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(
-            Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-overriding-a.yml"),
-                               new File("src/test/resources/docker-compose-imagename-overriding-b.yml")));
-        Assertions.assertThat(dockerComposeFiles.getDependencyImages())
+            Lists.newArrayList(
+                new File("src/test/resources/docker-compose-imagename-overriding-a.yml"),
+                new File("src/test/resources/docker-compose-imagename-overriding-b.yml")
+            )
+        );
+        Assertions
+            .assertThat(dockerComposeFiles.getDependencyImages())
             .containsExactlyInAnyOrder("alpine:3.14", "redis:b", "mysql:b", "aservice:latest");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
index 9e9eb27b509..6207ae5ff45 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
@@ -8,7 +8,6 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -24,14 +23,23 @@
 public class DockerComposeOverridesTest {
 
     private static final File BASE_COMPOSE_FILE = new File("src/test/resources/docker-compose-base.yml");
+
     private static final String BASE_ENV_VAR = "bar=base";
-    private static final File OVERRIDE_COMPOSE_FILE = new File("src/test/resources/docker-compose-non-default-override.yml");
+
+    private static final File OVERRIDE_COMPOSE_FILE = new File(
+        "src/test/resources/docker-compose-non-default-override.yml"
+    );
+
     private static final String OVERRIDE_ENV_VAR = "bar=overwritten";
+
     private static final int SERVICE_PORT = 3000;
+
     private static final String SERVICE_NAME = "alpine_1";
 
     private final boolean localMode;
+
     private final String expectedEnvVar;
+
     private final File[] composeFiles;
 
     public DockerComposeOverridesTest(boolean localMode, String expectedEnvVar, File... composeFiles) {
@@ -42,18 +50,21 @@ public DockerComposeOverridesTest(boolean localMode, String expectedEnvVar, File
 
     @Parameters(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
     public static Iterable<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-            {true, BASE_ENV_VAR, new File[]{BASE_COMPOSE_FILE}},
-            {true, OVERRIDE_ENV_VAR, new File[]{BASE_COMPOSE_FILE, OVERRIDE_COMPOSE_FILE}},
-            {false, BASE_ENV_VAR, new File[]{BASE_COMPOSE_FILE}},
-            {false, OVERRIDE_ENV_VAR, new File[]{BASE_COMPOSE_FILE, OVERRIDE_COMPOSE_FILE}},
-        });
+        return Arrays.asList(
+            new Object[][] {
+                { true, BASE_ENV_VAR, new File[] { BASE_COMPOSE_FILE } },
+                { true, OVERRIDE_ENV_VAR, new File[] { BASE_COMPOSE_FILE, OVERRIDE_COMPOSE_FILE } },
+                { false, BASE_ENV_VAR, new File[] { BASE_COMPOSE_FILE } },
+                { false, OVERRIDE_ENV_VAR, new File[] { BASE_COMPOSE_FILE, OVERRIDE_COMPOSE_FILE } },
+            }
+        );
     }
 
     @Before
     public void setUp() {
         if (localMode) {
-            Assumptions.assumeThat(LocalDockerCompose.executableExists())
+            Assumptions
+                .assumeThat(LocalDockerCompose.executableExists())
                 .as("docker-compose executable exists")
                 .isTrue();
         }
@@ -61,33 +72,43 @@ public void setUp() {
 
     @Test
     public void test() {
-        try (DockerComposeContainer compose =
-                 new DockerComposeContainer(composeFiles)
-                     .withLocalCompose(localMode)
-                     .withExposedService(SERVICE_NAME, SERVICE_PORT)) {
-
+        try (
+            DockerComposeContainer compose = new DockerComposeContainer(composeFiles)
+                .withLocalCompose(localMode)
+                .withExposedService(SERVICE_NAME, SERVICE_PORT)
+        ) {
             compose.start();
 
-            BufferedReader br = Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
-                Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+            BufferedReader br = Unreliables.retryUntilSuccess(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
 
-                Socket socket = new Socket(compose.getServiceHost(SERVICE_NAME, SERVICE_PORT), compose.getServicePort(SERVICE_NAME, SERVICE_PORT));
-                return new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            });
+                    Socket socket = new Socket(
+                        compose.getServiceHost(SERVICE_NAME, SERVICE_PORT),
+                        compose.getServicePort(SERVICE_NAME, SERVICE_PORT)
+                    );
+                    return new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                }
+            );
 
-            Unreliables.retryUntilTrue(10, TimeUnit.SECONDS, () -> {
-                while (br.ready()) {
-                    String line = br.readLine();
-                    if (line.contains(expectedEnvVar)) {
-                        pass("Mapped environment variable was found");
-                        return true;
+            Unreliables.retryUntilTrue(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    while (br.ready()) {
+                        String line = br.readLine();
+                        if (line.contains(expectedEnvVar)) {
+                            pass("Mapped environment variable was found");
+                            return true;
+                        }
                     }
+                    info("Mapped environment variable was not found yet - process probably not ready");
+                    Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+                    return false;
                 }
-                info("Mapped environment variable was not found yet - process probably not ready");
-                Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-                return false;
-            });
+            );
         }
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 38005014662..4afddeaa5dd 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -7,13 +7,13 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.testcontainers.TestImages;
 import org.testcontainers.Testcontainers;
 
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 public class ExposedHostTest {
 
@@ -22,14 +22,17 @@ public class ExposedHostTest {
     @BeforeClass
     public static void setUpClass() throws Exception {
         server = HttpServer.create(new InetSocketAddress(0), 0);
-        server.createContext("/", exchange -> {
-            byte[] content = "Hello World!".getBytes();
-            exchange.sendResponseHeaders(200, content.length);
-            try (OutputStream responseBody = exchange.getResponseBody()) {
-                responseBody.write(content);
-                responseBody.flush();
+        server.createContext(
+            "/",
+            exchange -> {
+                byte[] content = "Hello World!".getBytes();
+                exchange.sendResponseHeaders(200, content.length);
+                try (OutputStream responseBody = exchange.getResponseBody()) {
+                    responseBody.write(content);
+                    responseBody.flush();
+                }
             }
-        });
+        );
 
         server.start();
     }
@@ -47,7 +50,7 @@ public void tearDown() {
     @Test
     public void testExposedHostAfterContainerIsStarted() {
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("top")
                 .withAccessToHost(true)
         ) {
@@ -60,14 +63,17 @@ public void testExposedHostAfterContainerIsStarted() {
     @Test
     public void testExposedHost() throws Exception {
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
-        assertResponse(new GenericContainer<>(TINY_IMAGE).withCommand("top"), server.getAddress().getPort());
+        assertResponse(new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top"), server.getAddress().getPort());
     }
 
     @Test
     public void testExposedHostWithNetwork() throws Exception {
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
         try (Network network = Network.newNetwork()) {
-            assertResponse(new GenericContainer<>(TINY_IMAGE).withNetwork(network).withCommand("top"), server.getAddress().getPort());
+            assertResponse(
+                new GenericContainer<>(TestImages.TINY_IMAGE).withNetwork(network).withCommand("top"),
+                server.getAddress().getPort()
+            );
         }
     }
 
@@ -76,8 +82,8 @@ public void testExposedHostPortOnFixedInternalPorts() throws Exception {
         Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 80));
         Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));
 
-        assertResponse(new GenericContainer<>(TINY_IMAGE).withCommand("top"), 80);
-        assertResponse(new GenericContainer<>(TINY_IMAGE).withCommand("top"), 81);
+        assertResponse(new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top"), 80);
+        assertResponse(new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top"), 81);
     }
 
     @SneakyThrows
@@ -85,7 +91,9 @@ protected void assertResponse(GenericContainer<?> container, int port) {
         try {
             container.start();
 
-            String response = container.execInContainer("wget", "-O", "-", "http://host.testcontainers.internal:" + port).getStdout();
+            String response = container
+                .execInContainer("wget", "-O", "-", "http://host.testcontainers.internal:" + port)
+                .getStdout();
 
             assertEquals("received response", "Hello World!", response);
         } finally {
diff --git a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
index 63993bc24ff..c743fcf6a43 100644
--- a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
+++ b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
@@ -25,5 +25,4 @@ public void finishedIsCalledForCleanupIfStartingThrows() throws Throwable {
         verify(res).starting(any());
         verify(res).finished(any());
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 0c30d522cd9..fdd8ac1b146 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -17,13 +17,10 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
-import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
-import org.testcontainers.images.builder.Transferable;
-
-import java.nio.charset.StandardCharsets;
 import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Arrays;
@@ -34,11 +31,9 @@
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 public class GenericContainerTest {
 
@@ -52,7 +47,8 @@ public void shouldReportOOMAfterWait() {
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
                 .waitingFor(new WaitForExitedState(ContainerState::getOOMKilled))
                 .withCreateContainerCmdModifier(it -> {
-                    it.getHostConfig()
+                    it
+                        .getHostConfig()
                         .withMemory(20 * FileUtils.ONE_MB)
                         .withMemorySwappiness(0L)
                         .withMemorySwap(0L)
@@ -61,8 +57,7 @@ public void shouldReportOOMAfterWait() {
                 })
                 .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; done; sleep 10m")
         ) {
-            assertThatThrownBy(container::start)
-                .hasStackTraceContaining("Container crashed with out-of-memory");
+            assertThatThrownBy(container::start).hasStackTraceContaining("Container crashed with out-of-memory");
         }
     }
 
@@ -74,8 +69,7 @@ public void shouldReportErrorAfterWait() {
                 .waitingFor(new WaitForExitedState(state -> state.getExitCode() > 0))
                 .withCommand("sh", "-c", "usleep 100; exit 123")
         ) {
-            assertThatThrownBy(container::start)
-                .hasStackTraceContaining("Container exited with code 123");
+            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 123");
         }
     }
 
@@ -88,8 +82,7 @@ public void shouldCopyTransferableAsFile() {
                 .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
                 .withCommand("sh", "-c", "grep -q test /tmp/test && exit 100")
         ) {
-            assertThatThrownBy(container::start)
-                .hasStackTraceContaining("Container exited with code 100");
+            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 100");
         }
     }
 
@@ -98,34 +91,31 @@ public void shouldCopyTransferableAfterMountableFile() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
-                .withCopyFileToContainer(
-                    MountableFile.forClasspathResource("test_copy_to_container.txt"),
-                    "/tmp/test"
-                )
+                .withCopyFileToContainer(MountableFile.forClasspathResource("test_copy_to_container.txt"), "/tmp/test")
                 .withCopyToContainer(Transferable.of("test"), "/tmp/test")
                 .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
                 .withCommand("sh", "-c", "grep -q test /tmp/test && exit 100")
         ) {
-            assertThatThrownBy(container::start)
-                .hasStackTraceContaining("Container exited with code 100");
+            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 100");
         }
     }
 
     @Test
     public void shouldOnlyPublishExposedPorts() {
         ImageFromDockerfile image = new ImageFromDockerfile("publish-multiple")
-            .withDockerfileFromBuilder(builder ->
+            .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("testcontainers/helloworld:1.1.0")
+                    .from("testcontainers/helloworld:1.1.0") //
                     .expose(8080, 8081)
-                    .build()
-            );
+                    .build();
+            });
         try (GenericContainer<?> container = new GenericContainer<>(image).withExposedPorts(8080)) {
             container.start();
 
             InspectContainerResponse inspectedContainer = container.getContainerInfo();
 
-            List<Integer> exposedPorts = Arrays.stream(inspectedContainer.getConfig().getExposedPorts())
+            List<Integer> exposedPorts = Arrays
+                .stream(inspectedContainer.getConfig().getExposedPorts())
                 .map(ExposedPort::getPort)
                 .collect(Collectors.toList());
 
@@ -135,18 +125,14 @@ public void shouldOnlyPublishExposedPorts() {
                 exposedPorts
             );
 
-            Map<ExposedPort, Ports.Binding[]> hostBindings = inspectedContainer.getHostConfig().getPortBindings().getBindings();
-            assertEquals(
-                "only 1 port is bound on the host (published)",
-                1,
-                hostBindings.size()
-            );
+            Map<ExposedPort, Ports.Binding[]> hostBindings = inspectedContainer
+                .getHostConfig()
+                .getPortBindings()
+                .getBindings();
+            assertEquals("only 1 port is bound on the host (published)", 1, hostBindings.size());
 
             Integer mappedPort = container.getMappedPort(8080);
-            assertTrue(
-                "port 8080 is bound to a different port on the host",
-                mappedPort != 8080
-            );
+            assertTrue("port 8080 is bound to a different port on the host", mappedPort != 8080);
 
             assertThrows(
                 "trying to get a non-bound port mapping fails",
@@ -160,21 +146,19 @@ public void shouldOnlyPublishExposedPorts() {
 
     @Test
     public void shouldWaitUntilExposedPortIsMapped() {
-
         ImageFromDockerfile image = new ImageFromDockerfile("publish-multiple")
-            .withDockerfileFromBuilder(builder ->
+            .withDockerfileFromBuilder(builder -> {
                 builder
                     .from("testcontainers/helloworld:1.1.0")
                     .expose(8080, 8081) // one additional port exposed in image
-                    .build()
-            );
+                    .build();
+            });
 
         try (
             GenericContainer container = new GenericContainer<>(image)
                 .withExposedPorts(8080)
                 .withCreateContainerCmdModifier(it -> it.withExposedPorts(ExposedPort.tcp(8082))) // another port exposed by modifier
         ) {
-
             container.start();
 
             assertEquals("Only withExposedPort should be exposed", 1, container.getExposedPorts().size());
@@ -200,16 +184,20 @@ static class WaitForExitedState extends AbstractWaitStrategy {
         @Override
         @SneakyThrows
         protected void waitUntilReady() {
-            Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, () -> {
-                ContainerState state = waitStrategyTarget.getCurrentContainerInfo().getState();
-
-                log.debug("Current state: {}", state);
-                if (!"exited".equalsIgnoreCase(state.getStatus())) {
-                    Thread.sleep(100);
-                    return false;
+            Unreliables.retryUntilTrue(
+                5,
+                TimeUnit.SECONDS,
+                () -> {
+                    ContainerState state = waitStrategyTarget.getCurrentContainerInfo().getState();
+
+                    log.debug("Current state: {}", state);
+                    if (!"exited".equalsIgnoreCase(state.getStatus())) {
+                        Thread.sleep(100);
+                        return false;
+                    }
+                    return predicate.test(state);
                 }
-                return predicate.test(state);
-            });
+            );
 
             throw new IllegalStateException("Nope!");
         }
diff --git a/core/src/test/java/org/testcontainers/containers/NetworkTest.java b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
index a39f0552a5a..d783f95e6d1 100644
--- a/core/src/test/java/org/testcontainers/containers/NetworkTest.java
+++ b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
@@ -10,7 +10,6 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
-import static org.testcontainers.containers.Network.newNetwork;
 
 @RunWith(Enclosed.class)
 public class NetworkTest {
@@ -18,18 +17,18 @@ public class NetworkTest {
     public static class WithRules {
 
         @Rule
-        public Network network = newNetwork();
+        public Network network = Network.newNetwork();
 
         @Rule
         public GenericContainer<?> foo = new GenericContainer<>(TestImages.TINY_IMAGE)
-                .withNetwork(network)
-                .withNetworkAliases("foo")
-                .withCommand("/bin/sh", "-c", "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done");
+            .withNetwork(network)
+            .withNetworkAliases("foo")
+            .withCommand("/bin/sh", "-c", "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done");
 
         @Rule
         public GenericContainer<?> bar = new GenericContainer<>(TestImages.TINY_IMAGE)
-                .withNetwork(network)
-                .withCommand("top");
+            .withNetwork(network)
+            .withCommand("top");
 
         @Test
         public void testNetworkSupport() throws Exception {
@@ -44,16 +43,18 @@ public static class WithoutRules {
         public void testNetworkSupport() throws Exception {
             // useCustomNetwork {
             try (
-                    Network network = Network.newNetwork();
-
-                    GenericContainer<?> foo = new GenericContainer<>(TestImages.TINY_IMAGE)
-                            .withNetwork(network)
-                            .withNetworkAliases("foo")
-                            .withCommand("/bin/sh", "-c", "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done");
-
-                    GenericContainer<?> bar = new GenericContainer<>(TestImages.TINY_IMAGE)
-                            .withNetwork(network)
-                            .withCommand("top")
+                Network network = Network.newNetwork();
+                GenericContainer<?> foo = new GenericContainer<>(TestImages.TINY_IMAGE)
+                    .withNetwork(network)
+                    .withNetworkAliases("foo")
+                    .withCommand(
+                        "/bin/sh",
+                        "-c",
+                        "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done"
+                    );
+                GenericContainer<?> bar = new GenericContainer<>(TestImages.TINY_IMAGE)
+                    .withNetwork(network)
+                    .withCommand("top")
             ) {
                 foo.start();
                 bar.start();
@@ -66,16 +67,12 @@ public void testNetworkSupport() throws Exception {
 
         @Test
         public void testBuilder() {
-            try (
-                    Network network = Network.builder()
-                            .driver("macvlan")
-                            .build()
-            ) {
+            try (Network network = Network.builder().driver("macvlan").build()) {
                 String id = network.getId();
                 assertEquals(
-                        "Flag is set",
-                        "macvlan",
-                        DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(id).exec().getDriver()
+                    "Flag is set",
+                    "macvlan",
+                    DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(id).exec().getDriver()
                 );
             }
         }
@@ -83,15 +80,13 @@ public void testBuilder() {
         @Test
         public void testModifiers() {
             try (
-                    Network network = Network.builder()
-                            .createNetworkCmdModifier(cmd -> cmd.withDriver("macvlan"))
-                            .build()
+                Network network = Network.builder().createNetworkCmdModifier(cmd -> cmd.withDriver("macvlan")).build()
             ) {
                 String id = network.getId();
                 assertEquals(
-                        "Flag is set",
-                        "macvlan",
-                        DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(id).exec().getDriver()
+                    "Flag is set",
+                    "macvlan",
+                    DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(id).exec().getDriver()
                 );
             }
         }
@@ -101,16 +96,22 @@ public void testReusability() {
             try (Network network = Network.newNetwork()) {
                 String firstId = network.getId();
                 assertNotNull(
-                        "Network exists",
-                        DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(firstId).exec()
+                    "Network exists",
+                    DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(firstId).exec()
                 );
 
                 network.close();
 
                 assertNotEquals(
-                        "New network created",
-                        firstId,
-                        DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(network.getId()).exec().getId()
+                    "New network created",
+                    firstId,
+                    DockerClientFactory
+                        .instance()
+                        .client()
+                        .inspectNetworkCmd()
+                        .withNetworkId(network.getId())
+                        .exec()
+                        .getId()
                 );
             }
         }
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index ef70d06ada1..61955de98ba 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -6,9 +6,9 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.util.Collections;
 
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 
 public class ParsedDockerComposeFileValidationTest {
@@ -16,8 +16,7 @@ public class ParsedDockerComposeFileValidationTest {
     @Test
     public void shouldValidate() {
         File file = new File("src/test/resources/docker-compose-container-name-v1.yml");
-        Assertions
-            .assertThatThrownBy(() -> {
+        assertThatThrownBy(() -> {
                 new ParsedDockerComposeFile(file);
             })
             .hasMessageContaining(file.getAbsolutePath())
@@ -26,25 +25,23 @@ public void shouldValidate() {
 
     @Test
     public void shouldRejectContainerNameV1() {
-        Assertions
-            .assertThatThrownBy(() -> {
-                new ParsedDockerComposeFile(ImmutableMap.of(
-                    "redis", ImmutableMap.of("container_name", "redis")
-                ));
+        assertThatThrownBy(() -> {
+                new ParsedDockerComposeFile(ImmutableMap.of("redis", ImmutableMap.of("container_name", "redis")));
             })
             .hasMessageContaining("'container_name' property set for service 'redis'");
     }
 
     @Test
     public void shouldRejectContainerNameV2() {
-        Assertions
-            .assertThatThrownBy(() -> {
-                new ParsedDockerComposeFile(ImmutableMap.of(
-                    "version", "2",
-                    "services", ImmutableMap.of(
-                        "redis", ImmutableMap.of("container_name", "redis")
+        assertThatThrownBy(() -> {
+                new ParsedDockerComposeFile(
+                    ImmutableMap.of(
+                        "version",
+                        "2",
+                        "services",
+                        ImmutableMap.of("redis", ImmutableMap.of("container_name", "redis"))
                     )
-                ));
+                );
             })
             .hasMessageContaining("'container_name' property set for service 'redis'");
     }
@@ -52,35 +49,29 @@ public void shouldRejectContainerNameV2() {
     @Test
     public void shouldIgnoreUnknownStructure() {
         // Everything is a list
-        new ParsedDockerComposeFile(emptyMap());
+        new ParsedDockerComposeFile(Collections.emptyMap());
 
         // services is not a map but List
-        new ParsedDockerComposeFile(ImmutableMap.of(
-            "version", "2",
-            "services", emptyList()
-        ));
+        new ParsedDockerComposeFile(ImmutableMap.of("version", "2", "services", Collections.emptyList()));
 
         // services is not a collection
-        new ParsedDockerComposeFile(ImmutableMap.of(
-            "version", "2",
-            "services", true
-        ));
+        new ParsedDockerComposeFile(ImmutableMap.of("version", "2", "services", true));
 
         // no services while version is defined
-        new ParsedDockerComposeFile(ImmutableMap.of(
-            "version", "9000"
-        ));
+        new ParsedDockerComposeFile(ImmutableMap.of("version", "9000"));
     }
 
     @Test
     public void shouldObtainImageNamesV1() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+        Assertions
+            .assertThat(parsedFile.getServiceNameToImageNames())
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("postgres")))
+                entry("custom", Sets.newHashSet("postgres"))
+            )
             .as("all defined images are found"); // redis, mysql from compose file, postgres from Dockerfile build
     }
 
@@ -88,11 +79,13 @@ public void shouldObtainImageNamesV1() {
     public void shouldObtainImageNamesV2() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v2.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+        Assertions
+            .assertThat(parsedFile.getServiceNameToImageNames())
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("postgres")))
+                entry("custom", Sets.newHashSet("postgres"))
+            )
             .as("all defined images are found");
     }
 
@@ -100,11 +93,13 @@ public void shouldObtainImageNamesV2() {
     public void shouldObtainImageFromDockerfileBuild() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+        Assertions
+            .assertThat(parsedFile.getServiceNameToImageNames())
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.14")))
+                entry("custom", Sets.newHashSet("alpine:3.14"))
+            )
             .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.14 from Dockerfile build
     }
 
@@ -112,11 +107,13 @@ public void shouldObtainImageFromDockerfileBuild() {
     public void shouldObtainImageFromDockerfileBuildWithContext() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions.assertThat(parsedFile.getServiceNameToImageNames())
+        Assertions
+            .assertThat(parsedFile.getServiceNameToImageNames())
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.14")))
+                entry("custom", Sets.newHashSet("alpine:3.14"))
+            )
             .as("all defined images are found"); // redis, mysql from compose file, alpine:3.14 from Dockerfile build
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 9aad97d7e7b..7aafb0149bd 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -27,9 +27,9 @@
 import org.mockito.stubbing.Answer;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
-import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.TestcontainersConfiguration;
@@ -53,7 +53,6 @@
 import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 @RunWith(Enclosed.class)
 public class ReusabilityUnitTests {
@@ -66,8 +65,8 @@ public static class CanBeReusedTest {
         @Parameterized.Parameters(name = "{0}")
         public static Object[][] data() {
             return new Object[][] {
-                { "generic", new GenericContainer<>(TINY_IMAGE), true },
-                { "anonymous generic", new GenericContainer(TINY_IMAGE) {}, true },
+                { "generic", new GenericContainer<>(TestImages.TINY_IMAGE), true },
+                { "anonymous generic", new GenericContainer(TestImages.TINY_IMAGE) {}, true },
                 { "custom", new CustomContainer(), true },
                 { "anonymous custom", new CustomContainer() {}, true },
                 { "custom with containerIsCreated", new CustomContainerWithContainerIsCreated(), false },
@@ -90,15 +89,17 @@ public void shouldBeReusable() {
         }
 
         static class CustomContainer extends GenericContainer<CustomContainer> {
+
             CustomContainer() {
-                super(TINY_IMAGE);
+                super(TestImages.TINY_IMAGE);
             }
         }
 
-        static class CustomContainerWithContainerIsCreated extends GenericContainer<CustomContainerWithContainerIsCreated> {
+        static class CustomContainerWithContainerIsCreated
+            extends GenericContainer<CustomContainerWithContainerIsCreated> {
 
             CustomContainerWithContainerIsCreated() {
-                super(TINY_IMAGE);
+                super(TestImages.TINY_IMAGE);
             }
 
             @Override
@@ -114,29 +115,30 @@ public static class HooksTest extends AbstractReusabilityTest {
 
         List<String> script = new ArrayList<>();
 
-        GenericContainer<?> container = makeReusable(new GenericContainer(TINY_IMAGE) {
-
-            @Override
-            protected boolean canBeReused() {
-                // Because we override "containerIsCreated"
-                return true;
-            }
+        GenericContainer<?> container = makeReusable(
+            new GenericContainer(TestImages.TINY_IMAGE) {
+                @Override
+                protected boolean canBeReused() {
+                    // Because we override "containerIsCreated"
+                    return true;
+                }
 
-            @Override
-            protected void containerIsCreated(String containerId) {
-                script.add("containerIsCreated");
-            }
+                @Override
+                protected void containerIsCreated(String containerId) {
+                    script.add("containerIsCreated");
+                }
 
-            @Override
-            protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
-                script.add("containerIsStarting(reused=" + reused + ")");
-            }
+                @Override
+                protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
+                    script.add("containerIsStarting(reused=" + reused + ")");
+                }
 
-            @Override
-            protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
-                script.add("containerIsStarted(reused=" + reused + ")");
+                @Override
+                protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+                    script.add("containerIsStarted(reused=" + reused + ")");
+                }
             }
-        });
+        );
 
         @Test
         public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
@@ -149,11 +151,12 @@ public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
             when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
 
             container.start();
-            assertThat(script).containsExactly(
-                "containerIsCreated",
-                "containerIsStarting(reused=false)",
-                "containerIsStarted(reused=false)"
-            );
+            assertThat(script)
+                .containsExactly(
+                    "containerIsCreated",
+                    "containerIsStarting(reused=false)",
+                    "containerIsStarted(reused=false)"
+                );
         }
 
         @Test
@@ -166,10 +169,7 @@ public void shouldCallHookIfReused() {
             when(client.inspectContainerCmd(existingContainerId)).then(inspectContainerAnswer());
 
             container.start();
-            assertThat(script).containsExactly(
-                "containerIsStarting(reused=true)",
-                "containerIsStarted(reused=true)"
-            );
+            assertThat(script).containsExactly("containerIsStarting(reused=true)", "containerIsStarted(reused=true)");
         }
 
         @Test
@@ -181,11 +181,12 @@ public void shouldNotCallHookIfNotReused() {
             when(client.inspectContainerCmd(containerId)).then(inspectContainerAnswer());
 
             container.start();
-            assertThat(script).containsExactly(
-                "containerIsCreated",
-                "containerIsStarting(reused=false)",
-                "containerIsStarted(reused=false)"
-            );
+            assertThat(script)
+                .containsExactly(
+                    "containerIsCreated",
+                    "containerIsStarting(reused=false)",
+                    "containerIsStarted(reused=false)"
+                );
         }
     }
 
@@ -193,12 +194,14 @@ public void shouldNotCallHookIfNotReused() {
     @FieldDefaults(makeFinal = true)
     public static class HashTest extends AbstractReusabilityTest {
 
-        protected GenericContainer<?> container = makeReusable(new GenericContainer(TINY_IMAGE) {
-            @Override
-            public void copyFileToContainer(MountableFile mountableFile, String containerPath) {
-                // NOOP
+        protected GenericContainer<?> container = makeReusable(
+            new GenericContainer(TestImages.TINY_IMAGE) {
+                @Override
+                public void copyFileToContainer(MountableFile mountableFile, String containerPath) {
+                    // NOOP
+                }
             }
-        });
+        );
 
         @Test
         public void shouldStartIfListReturnsEmpty() {
@@ -260,8 +263,7 @@ public void shouldSetCopiedFilesHashLabel() {
             container.start();
 
             assertThat(commandRef).isNotNull();
-            assertThat(commandRef.get().getLabels())
-                .containsKeys(GenericContainer.COPIED_FILES_HASH_LABEL);
+            assertThat(commandRef.get().getLabels()).containsKeys(GenericContainer.COPIED_FILES_HASH_LABEL);
         }
 
         @Test
@@ -292,15 +294,20 @@ public void shouldHashCopiedFiles() {
             );
             container.start();
 
-            assertThat(commandRef.get().getLabels()).hasEntrySatisfying(GenericContainer.COPIED_FILES_HASH_LABEL, newHash -> {
-                assertThat(newHash).as("new hash").isNotEqualTo(oldHash);
-            });
+            assertThat(commandRef.get().getLabels())
+                .hasEntrySatisfying(
+                    GenericContainer.COPIED_FILES_HASH_LABEL,
+                    newHash -> {
+                        assertThat(newHash).as("new hash").isNotEqualTo(oldHash);
+                    }
+                );
         }
     }
 
     @RunWith(Parameterized.class)
     @FieldDefaults(makeFinal = true)
     public static class CopyFilesHashTest {
+
         private final TestStrategy strategy;
 
         interface TestStrategy {
@@ -310,6 +317,7 @@ interface TestStrategy {
         }
 
         private static class MountableFileTestStrategy implements TestStrategy {
+
             private final GenericContainer<?> container;
 
             private MountableFileTestStrategy(GenericContainer<?> container) {
@@ -328,6 +336,7 @@ public void clear() {
         }
 
         private static class TransferableTestStrategy implements TestStrategy {
+
             private final GenericContainer<?> container;
 
             private TransferableTestStrategy(GenericContainer<?> container) {
@@ -350,8 +359,7 @@ public static List<Function<GenericContainer<?>, TestStrategy>> strategies() {
             return Arrays.asList(MountableFileTestStrategy::new, TransferableTestStrategy::new);
         }
 
-
-        GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE);
+        GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE);
 
         public CopyFilesHashTest(Function<GenericContainer<?>, TestStrategy> strategyFactory) {
             this.strategy = strategyFactory.apply(container);
@@ -499,7 +507,7 @@ public void folderPermissions() throws Exception {
     }
 
     @FieldDefaults(makeFinal = true)
-    public static abstract class AbstractReusabilityTest {
+    public abstract static class AbstractReusabilityTest {
 
         @Rule
         public MockTestcontainersConfigurationRule configurationMock = new MockTestcontainersConfigurationRule();
@@ -509,25 +517,26 @@ public static abstract class AbstractReusabilityTest {
         protected <T extends GenericContainer<?>> T makeReusable(T container) {
             container.dockerClient = client;
             container.withNetworkMode("none"); // to disable the port forwarding
-            container.withStartupCheckStrategy(new StartupCheckStrategy() {
-
-                @Override
-                public boolean waitUntilStartupSuccessful(DockerClient dockerClient, String containerId) {
-                    // Skip DockerClient rate limiter
-                    return true;
+            container.withStartupCheckStrategy(
+                new StartupCheckStrategy() {
+                    @Override
+                    public boolean waitUntilStartupSuccessful(DockerClient dockerClient, String containerId) {
+                        // Skip DockerClient rate limiter
+                        return true;
+                    }
+
+                    @Override
+                    public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
+                        return StartupStatus.SUCCESSFUL;
+                    }
                 }
-
-                @Override
-                public StartupStatus checkStartupState(DockerClient dockerClient, String containerId) {
-                    return StartupStatus.SUCCESSFUL;
-                }
-            });
-            container.waitingFor(new AbstractWaitStrategy() {
-                @Override
-                protected void waitUntilReady() {
-
+            );
+            container.waitingFor(
+                new AbstractWaitStrategy() {
+                    @Override
+                    protected void waitUntilReady() {}
                 }
-            });
+            );
             container.withReuse(true);
             return container;
         }
@@ -539,12 +548,11 @@ protected String randomContainerId() {
         protected Answer<ListContainersCmd> listContainersAnswer(String... ids) {
             return invocation -> {
                 ListContainersCmd.Exec exec = command -> {
-                    return new ObjectMapper().convertValue(
-                        Stream.of(ids)
-                            .map(id -> Collections.singletonMap("Id", id))
-                            .collect(Collectors.toList()),
-                        new TypeReference<List<Container>>() {}
-                    );
+                    return new ObjectMapper()
+                        .convertValue(
+                            Stream.of(ids).map(id -> Collections.singletonMap("Id", id)).collect(Collectors.toList()),
+                            new TypeReference<List<Container>>() {}
+                        );
                 };
                 return new ListContainersCmdImpl(exec);
             };
@@ -554,7 +562,10 @@ protected Answer<CreateContainerCmd> createContainerAnswer(String containerId) {
             return createContainerAnswer(containerId, command -> {});
         }
 
-        protected Answer<CreateContainerCmd> createContainerAnswer(String containerId, Consumer<CreateContainerCmd> cmdConsumer) {
+        protected Answer<CreateContainerCmd> createContainerAnswer(
+            String containerId,
+            Consumer<CreateContainerCmd> cmdConsumer
+        ) {
             return invocation -> {
                 CreateContainerCmd.Exec exec = command -> {
                     cmdConsumer.accept(command);
@@ -578,7 +589,10 @@ protected Answer<StartContainerCmd> startContainerAnswer() {
         protected Answer<InspectContainerCmd> inspectContainerAnswer() {
             return invocation -> {
                 InspectContainerCmd.Exec exec = command -> {
-                    InspectContainerResponse stubResponse = Mockito.mock(InspectContainerResponse.class, Answers.RETURNS_DEEP_STUBS);
+                    InspectContainerResponse stubResponse = Mockito.mock(
+                        InspectContainerResponse.class,
+                        Answers.RETURNS_DEEP_STUBS
+                    );
                     when(stubResponse.getNetworkSettings().getPorts().getBindings()).thenReturn(Collections.emptyMap());
                     return stubResponse;
                 };
diff --git a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
index 05ef7373293..a860b7802ec 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
@@ -2,14 +2,12 @@
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.ALPINE_IMAGE;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDERR;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
 public class ContainerLogsTest {
 
@@ -43,7 +41,7 @@ public void getLogsReturnsStdOutToDate() {
             container.start();
 
             // docsGetStdOut {
-            final String logs = container.getLogs(STDOUT);
+            final String logs = container.getLogs(OutputFrame.OutputType.STDOUT);
             // }
             assertTrue("stdout is reflected in the returned logs", logs.contains("stdout"));
         }
@@ -55,7 +53,7 @@ public void getLogsReturnsStdErrToDate() {
             container.start();
 
             // docsGetStdErr {
-            final String logs = container.getLogs(STDERR);
+            final String logs = container.getLogs(OutputFrame.OutputType.STDERR);
             // }
             assertTrue("stderr is reflected in the returned logs", logs.contains("stderr"));
         }
@@ -68,19 +66,18 @@ public void getLogsForLongRunningContainer() throws InterruptedException {
 
             Thread.sleep(1000L);
 
-            final String logs = container.getLogs(STDOUT);
+            final String logs = container.getLogs(OutputFrame.OutputType.STDOUT);
             assertTrue("stdout is reflected in the returned logs for a running container", logs.contains("seq=0"));
         }
     }
 
     private static GenericContainer<?> shortLivedContainer() {
-        return new GenericContainer<>(ALPINE_IMAGE)
+        return new GenericContainer<>(TestImages.ALPINE_IMAGE)
             .withCommand("/bin/sh", "-c", "echo -n 'stdout' && echo -n 'stderr' 1>&2")
             .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
     }
 
     private static GenericContainer<?> longRunningContainer() {
-        return new GenericContainer<>(ALPINE_IMAGE)
-            .withCommand("ping -c 100 127.0.0.1");
+        return new GenericContainer<>(TestImages.ALPINE_IMAGE).withCommand("ping -c 100 127.0.0.1");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
index 325cccdd378..5282712b733 100644
--- a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
@@ -12,17 +12,19 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.testcontainers.containers.output.OutputFrame.OutputType;
 
 public class FrameConsumerResultCallbackTest {
-    private static final String FRAME_PAYLOAD = "\u001B[0;32mТест1\u001B[0m\n\u001B[1;33mTest2\u001B[0m\n\u001B[0;31mTest3\u001B[0m";
+
+    private static final String FRAME_PAYLOAD =
+        "\u001B[0;32mТест1\u001B[0m\n\u001B[1;33mTest2\u001B[0m\n\u001B[0;31mTest3\u001B[0m";
+
     private static final String LOG_RESULT = "Тест1\nTest2\nTest3";
 
     @Test
     public void passStderrFrameWithoutColors() {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer();
-        callback.addConsumer(OutputType.STDERR, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
         callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
         assertEquals(LOG_RESULT, consumer.toUtf8String());
     }
@@ -31,7 +33,7 @@ public void passStderrFrameWithoutColors() {
     public void passStderrFrameWithColors() {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDERR, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
         callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
         assertEquals(FRAME_PAYLOAD, consumer.toUtf8String());
     }
@@ -40,7 +42,7 @@ public void passStderrFrameWithColors() {
     public void passStdoutFrameWithoutColors() {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer();
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
         assertEquals(LOG_RESULT, consumer.toUtf8String());
     }
@@ -49,7 +51,7 @@ public void passStdoutFrameWithoutColors() {
     public void passStdoutFrameWithColors() {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
         assertEquals(FRAME_PAYLOAD, consumer.toUtf8String());
     }
@@ -58,7 +60,7 @@ public void passStdoutFrameWithColors() {
     public void basicConsumer() {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         BasicConsumer consumer = new BasicConsumer();
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
         assertEquals(LOG_RESULT, consumer.toString());
     }
@@ -67,7 +69,7 @@ public void basicConsumer() {
     public void passStdoutNull() {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, null));
         assertEquals("", consumer.toUtf8String());
     }
@@ -77,7 +79,7 @@ public void passStdoutEmptyLine() {
         String payload = "";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
         assertEquals(payload, consumer.toUtf8String());
     }
@@ -87,7 +89,7 @@ public void passStdoutSingleLine() {
         String payload = "Test";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
         assertEquals(payload, consumer.toUtf8String());
     }
@@ -97,7 +99,7 @@ public void passStdoutSingleLineWithNewline() {
         String payload = "Test\n";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
         assertEquals(payload, consumer.toUtf8String());
     }
@@ -106,38 +108,90 @@ public void passStdoutSingleLineWithNewline() {
     public void passRawFrameWithoutColors() throws TimeoutException, IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         WaitingConsumer waitConsumer = new WaitingConsumer();
-        callback.addConsumer(OutputType.STDOUT, waitConsumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, waitConsumer);
         callback.onNext(new Frame(StreamType.RAW, FRAME_PAYLOAD.getBytes()));
-        waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("Test2"), 1, TimeUnit.SECONDS);
-        waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("Тест1"), 1, TimeUnit.SECONDS);
+        waitConsumer.waitUntil(
+            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Test2"),
+            1,
+            TimeUnit.SECONDS
+        );
+        waitConsumer.waitUntil(
+            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Тест1"),
+            1,
+            TimeUnit.SECONDS
+        );
         Exception exception = null;
         try {
-            waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("Test3"), 1, TimeUnit.SECONDS);
+            waitConsumer.waitUntil(
+                frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Test3"),
+                1,
+                TimeUnit.SECONDS
+            );
         } catch (Exception e) {
             exception = e;
         }
         assertTrue(exception instanceof TimeoutException);
         callback.close();
-        waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("Test3"), 1, TimeUnit.SECONDS);
+        waitConsumer.waitUntil(
+            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Test3"),
+            1,
+            TimeUnit.SECONDS
+        );
     }
 
     @Test
     public void passRawFrameWithColors() throws TimeoutException, IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         WaitingConsumer waitConsumer = new WaitingConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDOUT, waitConsumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, waitConsumer);
         callback.onNext(new Frame(StreamType.RAW, FRAME_PAYLOAD.getBytes()));
-        waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("\u001B[1;33mTest2\u001B[0m"), 1, TimeUnit.SECONDS);
-        waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("\u001B[0;32mТест1\u001B[0m"), 1, TimeUnit.SECONDS);
+        waitConsumer.waitUntil(
+            frame -> {
+                return (
+                    frame.getType() == OutputFrame.OutputType.STDOUT &&
+                    frame.getUtf8String().equals("\u001B[1;33mTest2\u001B[0m")
+                );
+            },
+            1,
+            TimeUnit.SECONDS
+        );
+        waitConsumer.waitUntil(
+            frame -> {
+                return (
+                    frame.getType() == OutputFrame.OutputType.STDOUT &&
+                    frame.getUtf8String().equals("\u001B[0;32mТест1\u001B[0m")
+                );
+            },
+            1,
+            TimeUnit.SECONDS
+        );
         Exception exception = null;
         try {
-            waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("\u001B[0;31mTest3\u001B[0m"), 1, TimeUnit.SECONDS);
+            waitConsumer.waitUntil(
+                frame -> {
+                    return (
+                        frame.getType() == OutputFrame.OutputType.STDOUT &&
+                        frame.getUtf8String().equals("\u001B[0;31mTest3\u001B[0m")
+                    );
+                },
+                1,
+                TimeUnit.SECONDS
+            );
         } catch (Exception e) {
             exception = e;
         }
         assertTrue(exception instanceof TimeoutException);
         callback.close();
-        waitConsumer.waitUntil(frame -> frame.getType() == OutputType.STDOUT && frame.getUtf8String().equals("\u001B[0;31mTest3\u001B[0m"), 1, TimeUnit.SECONDS);
+        waitConsumer.waitUntil(
+            frame -> {
+                return (
+                    frame.getType() == OutputFrame.OutputType.STDOUT &&
+                    frame.getUtf8String().equals("\u001B[0;31mTest3\u001B[0m")
+                );
+            },
+            1,
+            TimeUnit.SECONDS
+        );
     }
 
     @Test
@@ -150,7 +204,7 @@ public void reconstructBreakedUnicode() throws IOException {
         System.arraycopy(payloadBytes, bytes1.length, bytes2, 0, bytes2.length);
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-        callback.addConsumer(OutputType.STDOUT, consumer);
+        callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.RAW, bytes1));
         callback.onNext(new Frame(StreamType.RAW, bytes2));
         callback.close();
@@ -158,7 +212,9 @@ public void reconstructBreakedUnicode() throws IOException {
     }
 
     private static class BasicConsumer implements Consumer<OutputFrame> {
+
         private boolean firstLine = true;
+
         private StringBuilder input = new StringBuilder();
 
         @Override
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
index 1760a8031b2..08973f2d601 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.containers.output;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
@@ -9,12 +7,14 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class ToStringConsumerTest {
 
     private static final String LARGE_PAYLOAD;
 
     static {
-        StringBuilder builder = new StringBuilder(10_003 * 10);;
+        StringBuilder builder = new StringBuilder(10_003 * 10);
         for (int i = 0; i < 10; i++) {
             builder.append(' ').append(i).append(RandomStringUtils.randomAlphabetic(10000));
         }
@@ -29,9 +29,7 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
             container.start();
 
             ExecResult build = container.execInContainer("echo", "-n", LARGE_PAYLOAD);
-            Assertions.assertThat(build.getStdout())
-                .doesNotContain("\n")
-                .isEqualTo(LARGE_PAYLOAD);
+            Assertions.assertThat(build.getStdout()).doesNotContain("\n").isEqualTo(LARGE_PAYLOAD);
         }
     }
 
@@ -39,18 +37,13 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
     public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
         try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
             container.withCreateContainerCmdModifier(cmd -> {
-                cmd
-                    .withAttachStdin(true)
-                    .withStdinOpen(true)
-                    .withTty(true);
+                cmd.withAttachStdin(true).withStdinOpen(true).withTty(true);
             });
             container.withCommand("sleep", "2m");
             container.start();
 
             ExecResult build = container.execInContainer("echo", "-n", LARGE_PAYLOAD);
-            assertThat(build.getStdout())
-                .isEqualTo(LARGE_PAYLOAD)
-                .doesNotContain("\n");
+            assertThat(build.getStdout()).isEqualTo(LARGE_PAYLOAD).doesNotContain("\n");
         }
     }
 
@@ -63,9 +56,7 @@ public void newlines_are_not_added_to_container_output() {
 
             container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode();
 
-            assertThat(container.getLogs())
-                .isEqualTo(LARGE_PAYLOAD)
-                .doesNotContain("\n");
+            assertThat(container.getLogs()).isEqualTo(LARGE_PAYLOAD).doesNotContain("\n");
         }
     }
 
@@ -81,9 +72,7 @@ public void newlines_are_not_added_to_container_output_with_tty() {
 
             container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode();
 
-            assertThat(container.getLogs())
-                .isEqualTo(LARGE_PAYLOAD)
-                .doesNotContain("\n");
+            assertThat(container.getLogs()).isEqualTo(LARGE_PAYLOAD).doesNotContain("\n");
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
index 19f3a772d41..c76d2481c7c 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
@@ -16,8 +16,11 @@
 public class ExternalPortListeningCheckTest {
 
     private ServerSocket listeningSocket1;
+
     private ServerSocket listeningSocket2;
+
     private ServerSocket nonListeningSocket;
+
     private WaitStrategyTarget mockContainer;
 
     @Before
@@ -34,8 +37,10 @@ public void setUp() throws Exception {
 
     @Test
     public void singleListening() {
-
-        final ExternalPortListeningCheck check = new ExternalPortListeningCheck(mockContainer, ImmutableSet.of(listeningSocket1.getLocalPort()));
+        final ExternalPortListeningCheck check = new ExternalPortListeningCheck(
+            mockContainer,
+            ImmutableSet.of(listeningSocket1.getLocalPort())
+        );
 
         final Boolean result = check.call();
 
@@ -44,8 +49,10 @@ public void singleListening() {
 
     @Test
     public void multipleListening() {
-
-        final ExternalPortListeningCheck check = new ExternalPortListeningCheck(mockContainer, ImmutableSet.of(listeningSocket1.getLocalPort(), listeningSocket2.getLocalPort()));
+        final ExternalPortListeningCheck check = new ExternalPortListeningCheck(
+            mockContainer,
+            ImmutableSet.of(listeningSocket1.getLocalPort(), listeningSocket2.getLocalPort())
+        );
 
         final Boolean result = check.call();
 
@@ -54,13 +61,16 @@ public void multipleListening() {
 
     @Test
     public void oneNotListening() {
-
-        final ExternalPortListeningCheck check = new ExternalPortListeningCheck(mockContainer, ImmutableSet.of(listeningSocket1.getLocalPort(), nonListeningSocket.getLocalPort()));
-
-        assertThrows("ExternalPortListeningCheck detects a non-listening port among many",
-                IllegalStateException.class,
-                (Runnable) check::call);
-
+        final ExternalPortListeningCheck check = new ExternalPortListeningCheck(
+            mockContainer,
+            ImmutableSet.of(listeningSocket1.getLocalPort(), nonListeningSocket.getLocalPort())
+        );
+
+        assertThrows(
+            "ExternalPortListeningCheck detects a non-listening port among many",
+            IllegalStateException.class,
+            (Runnable) check::call
+        );
     }
 
     @After
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
index 22014cd097a..6f2a5d3158c 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
@@ -11,36 +11,41 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class InternalCommandPortListeningCheckTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"internal-port-check-dockerfile/Dockerfile-tcp"},
-                {"internal-port-check-dockerfile/Dockerfile-nc"},
-                {"internal-port-check-dockerfile/Dockerfile-bash"},
-            });
+        return Arrays.asList(
+            new Object[][] {
+                { "internal-port-check-dockerfile/Dockerfile-tcp" },
+                { "internal-port-check-dockerfile/Dockerfile-nc" },
+                { "internal-port-check-dockerfile/Dockerfile-bash" },
+            }
+        );
     }
 
     @Rule
     public GenericContainer container;
 
     public InternalCommandPortListeningCheckTest(String dockerfile) {
-        container = new GenericContainer(new ImageFromDockerfile()
-            .withFileFromClasspath("Dockerfile", dockerfile)
-            .withFileFromClasspath("nginx.conf", "internal-port-check-dockerfile/nginx.conf")
-        );
+        container =
+            new GenericContainer(
+                new ImageFromDockerfile()
+                    .withFileFromClasspath("Dockerfile", dockerfile)
+                    .withFileFromClasspath("nginx.conf", "internal-port-check-dockerfile/nginx.conf")
+            );
     }
 
     @Test
     public void singleListening() {
-        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(container, ImmutableSet.of(8080));
+        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(
+            container,
+            ImmutableSet.of(8080)
+        );
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
 
@@ -49,18 +54,23 @@ public void singleListening() {
 
     @Test
     public void nonListening() {
-        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(container, ImmutableSet.of(8080, 1234));
+        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(
+            container,
+            ImmutableSet.of(8080, 1234)
+        );
 
         try {
             Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
             VisibleAssertions.fail("expected to fail");
-        } catch (TimeoutException e) {
-        }
+        } catch (TimeoutException e) {}
     }
 
     @Test
     public void lowAndHighPortListening() {
-        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(container, ImmutableSet.of(100, 8080));
+        final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(
+            container,
+            ImmutableSet.of(100, 8080)
+        );
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
 
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
index d867233f5d7..0d102def5a9 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
@@ -17,10 +17,16 @@ public class DockerHealthcheckWaitStrategyTest {
     @Before
     public void setUp() {
         // Using a Dockerfile here, since Dockerfile builder DSL doesn't support HEALTHCHECK
-        container = new GenericContainer(new ImageFromDockerfile()
-            .withFileFromClasspath("write_file_and_loop.sh", "health-wait-strategy-dockerfile/write_file_and_loop.sh")
-            .withFileFromClasspath("Dockerfile", "health-wait-strategy-dockerfile/Dockerfile"))
-            .waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(3)));
+        container =
+            new GenericContainer(
+                new ImageFromDockerfile()
+                    .withFileFromClasspath(
+                        "write_file_and_loop.sh",
+                        "health-wait-strategy-dockerfile/write_file_and_loop.sh"
+                    )
+                    .withFileFromClasspath("Dockerfile", "health-wait-strategy-dockerfile/Dockerfile")
+            )
+                .waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(3)));
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
index 897293282bd..2b8ba7c33ec 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
@@ -19,10 +19,13 @@ public class WaitAllStrategyTest {
 
     @Mock
     private GenericContainer container;
+
     @Mock
     private WaitStrategy strategy1;
+
     @Mock
     private WaitStrategy strategy2;
+
     @Mock
     private WaitStrategy strategy3;
 
@@ -36,32 +39,25 @@ public void setUp() {
      */
     @Test
     public void parentTimeoutApplies() {
-
         DummyStrategy child1 = new DummyStrategy(Duration.ofMillis(10));
         child1.withStartupTimeout(Duration.ofMillis(20));
 
         assertEquals("withStartupTimeout directly sets the timeout", 20L, child1.startupTimeout.toMillis());
 
-        new WaitAllStrategy()
-            .withStrategy(child1)
-            .withStartupTimeout(Duration.ofMillis(30));
+        new WaitAllStrategy().withStrategy(child1).withStartupTimeout(Duration.ofMillis(30));
 
         assertEquals("WaitAllStrategy overrides a child's timeout", 30L, child1.startupTimeout.toMillis());
     }
 
     @Test
     public void parentTimeoutAppliesToMultipleChildren() {
-
         Duration defaultInnerWait = Duration.ofMillis(2);
         Duration outerWait = Duration.ofMillis(6);
 
         DummyStrategy child1 = new DummyStrategy(defaultInnerWait);
         DummyStrategy child2 = new DummyStrategy(defaultInnerWait);
 
-        new WaitAllStrategy()
-            .withStrategy(child1)
-            .withStrategy(child2)
-            .withStartupTimeout(outerWait);
+        new WaitAllStrategy().withStrategy(child1).withStrategy(child2).withStartupTimeout(outerWait);
 
         assertEquals("WaitAllStrategy overrides a child's timeout (1st)", 6L, child1.startupTimeout.toMillis());
         assertEquals("WaitAllStrategy overrides a child's timeout (2nd)", 6L, child2.startupTimeout.toMillis());
@@ -69,20 +65,20 @@ public void parentTimeoutAppliesToMultipleChildren() {
 
     @Test
     public void parentTimeoutAppliesToAdditionalChildren() {
-
         Duration defaultInnerWait = Duration.ofMillis(2);
         Duration outerWait = Duration.ofMillis(20);
 
         DummyStrategy child1 = new DummyStrategy(defaultInnerWait);
         DummyStrategy child2 = new DummyStrategy(defaultInnerWait);
 
-        new WaitAllStrategy()
-            .withStrategy(child1)
-            .withStartupTimeout(outerWait)
-            .withStrategy(child2);
+        new WaitAllStrategy().withStrategy(child1).withStartupTimeout(outerWait).withStrategy(child2);
 
         assertEquals("WaitAllStrategy overrides a child's timeout (1st)", 20L, child1.startupTimeout.toMillis());
-        assertEquals("WaitAllStrategy overrides a child's timeout (2nd, additional)", 20L, child2.startupTimeout.toMillis());
+        assertEquals(
+            "WaitAllStrategy overrides a child's timeout (2nd, additional)",
+            20L,
+            child2.startupTimeout.toMillis()
+        );
     }
 
     /*
@@ -90,10 +86,7 @@ public void parentTimeoutAppliesToAdditionalChildren() {
      */
     @Test
     public void childExecutionTest() {
-
-        final WaitStrategy underTest = new WaitAllStrategy()
-            .withStrategy(strategy1)
-            .withStrategy(strategy2);
+        final WaitStrategy underTest = new WaitAllStrategy().withStrategy(strategy1).withStrategy(strategy2);
 
         doNothing().when(strategy1).waitUntilReady(eq(container));
         doNothing().when(strategy2).waitUntilReady(eq(container));
@@ -107,7 +100,6 @@ public void childExecutionTest() {
 
     @Test
     public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
-
         final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
             .withStrategy(strategy1)
             .withStrategy(strategy2)
@@ -116,9 +108,13 @@ public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
         doNothing().when(strategy1).waitUntilReady(eq(container));
         doThrow(TimeoutException.class).when(strategy2).waitUntilReady(eq(container));
 
-        assertThrows("The outer strategy timeout applies", TimeoutException.class, () -> {
-            underTest.waitUntilReady(container);
-        });
+        assertThrows(
+            "The outer strategy timeout applies",
+            TimeoutException.class,
+            () -> {
+                underTest.waitUntilReady(container);
+            }
+        );
 
         InOrder inOrder = inOrder(strategy1, strategy2, strategy3);
         inOrder.verify(strategy1).waitUntilReady(any());
@@ -128,17 +124,19 @@ public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
 
     @Test
     public void timeoutChangeShouldNotBePossibleWithIndividualTimeoutMode() {
-
         final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY);
 
-        assertThrows("Cannot change timeout for individual timeouts", IllegalStateException.class, () -> {
-            underTest.withStartupTimeout(Duration.ofSeconds(42));
-        });
+        assertThrows(
+            "Cannot change timeout for individual timeouts",
+            IllegalStateException.class,
+            () -> {
+                underTest.withStartupTimeout(Duration.ofSeconds(42));
+            }
+        );
     }
 
     @Test
     public void shouldNotMessWithIndividualTimeouts() {
-
         new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
             .withStrategy(strategy1)
             .withStrategy(strategy2);
@@ -149,18 +147,15 @@ public void shouldNotMessWithIndividualTimeouts() {
 
     @Test
     public void shouldOverwriteIndividualTimeouts() {
-
         Duration someSeconds = Duration.ofSeconds(23);
-        new WaitAllStrategy()
-            .withStartupTimeout(someSeconds)
-            .withStrategy(strategy1)
-            .withStrategy(strategy2);
+        new WaitAllStrategy().withStartupTimeout(someSeconds).withStrategy(strategy1).withStrategy(strategy2);
 
         verify(strategy1).withStartupTimeout(someSeconds);
         verify(strategy1).withStartupTimeout(someSeconds);
     }
 
     static class DummyStrategy extends AbstractWaitStrategy {
+
         DummyStrategy(Duration defaultInnerWait) {
             super.startupTimeout = defaultInnerWait;
         }
diff --git a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
index 2e39b367c46..f67ad212d77 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
@@ -14,8 +14,7 @@ public void testNotUsingParse() {
             DockerImageName imageName = registryContainer.createImage("latest");
             String imageNameWithoutTag = imageName.getRegistry() + "/" + imageName.getRepository();
             try (
-                final GenericContainer<?> container = new GenericContainer<>(imageNameWithoutTag)
-                    .withExposedPorts(8080)
+                final GenericContainer<?> container = new GenericContainer<>(imageNameWithoutTag).withExposedPorts(8080)
             ) {
                 container.start();
                 // do nothing other than start and stop
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
index 442c2efd950..39e1338bc46 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -17,29 +17,39 @@ public class DockerClientConfigUtilsTest {
 
     @Test
     public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
-        Assumptions.assumeThat(DockerClientConfigUtils.IN_A_CONTAINER)
-            .as("in a container")
-            .isFalse();
+        Assumptions.assumeThat(DockerClientConfigUtils.IN_A_CONTAINER).as("in a container").isFalse();
 
-        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("unix:///var/run/docker.sock"));
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
+            client,
+            URI.create("unix:///var/run/docker.sock")
+        );
         assertEquals("localhost", actual);
     }
 
     @Test
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
-        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("http://12.23.34.45"));
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
+            client,
+            URI.create("http://12.23.34.45")
+        );
         assertEquals("12.23.34.45", actual);
     }
 
     @Test
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
-        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("tcp://12.23.34.45"));
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
+            client,
+            URI.create("tcp://12.23.34.45")
+        );
         assertEquals("12.23.34.45", actual);
     }
 
     @Test
     public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
-        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("gopher://12.23.34.45"));
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
+            client,
+            URI.create("gopher://12.23.34.45")
+        );
         assertNull(actual);
     }
 
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
index a6bd68be745..b2ab27aad27 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
@@ -20,7 +20,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -35,7 +34,9 @@ public class EnvironmentAndSystemPropertyClientProviderStrategyTest {
 
     @Rule
     public MockTestcontainersConfigurationRule mockConfig = new MockTestcontainersConfigurationRule();
+
     private URI defaultDockerHost;
+
     private com.github.dockerjava.core.SSLConfig defaultSSLConfig;
 
     @Before
@@ -48,10 +49,22 @@ public void checkEnvironmentClear() {
 
     @Test
     public void testWhenConfigAbsent() {
-        Mockito.doReturn("auto").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
-        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
-        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
-        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
+        Mockito
+            .doReturn("auto")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
+        Mockito
+            .doReturn(null)
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.host"), isNull());
+        Mockito
+            .doReturn(null)
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
+        Mockito
+            .doReturn(null)
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
 
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
@@ -62,10 +75,22 @@ public void testWhenConfigAbsent() {
 
     @Test
     public void testWhenDockerHostPresent() {
-        Mockito.doReturn("auto").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
-        Mockito.doReturn("tcp://1.2.3.4:2375").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
-        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
-        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
+        Mockito
+            .doReturn("auto")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
+        Mockito
+            .doReturn("tcp://1.2.3.4:2375")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.host"), isNull());
+        Mockito
+            .doReturn(null)
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
+        Mockito
+            .doReturn(null)
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
 
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
@@ -79,10 +104,22 @@ public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
         Path tempDir = Files.createTempDirectory("testcontainers-test");
         String tempDirPath = tempDir.toAbsolutePath().toString();
 
-        Mockito.doReturn("auto").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
-        Mockito.doReturn("tcp://1.2.3.4:2375").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.host"), isNull());
-        Mockito.doReturn("1").when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
-        Mockito.doReturn(tempDirPath).when(TestcontainersConfiguration.getInstance()).getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
+        Mockito
+            .doReturn("auto")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
+        Mockito
+            .doReturn("tcp://1.2.3.4:2375")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.host"), isNull());
+        Mockito
+            .doReturn("1")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.tls.verify"), isNull());
+        Mockito
+            .doReturn(tempDirPath)
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrUserProperty(eq("docker.cert.path"), isNull());
 
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
@@ -90,14 +127,15 @@ public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
         assertEquals("tcp://1.2.3.4:2375", transportConfig.getDockerHost().toString());
 
         SSLConfig sslConfig = transportConfig.getSslConfig();
-        Assertions.assertThat(sslConfig)
-            .extracting("dockerCertPath")
-            .isEqualTo(tempDirPath);
+        Assertions.assertThat(sslConfig).extracting("dockerCertPath").isEqualTo(tempDirPath);
     }
 
     @Test
     public void applicableWhenIgnoringUserPropertiesAndConfigured() {
-        Mockito.doReturn("autoIgnoringUserProperties").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
+        Mockito
+            .doReturn("autoIgnoringUserProperties")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
 
         Properties oldProperties = System.getProperties();
         try {
@@ -112,7 +150,10 @@ public void applicableWhenIgnoringUserPropertiesAndConfigured() {
 
     @Test
     public void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {
-        Mockito.doReturn("autoIgnoringUserProperties").when(TestcontainersConfiguration.getInstance()).getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
+        Mockito
+            .doReturn("autoIgnoringUserProperties")
+            .when(TestcontainersConfiguration.getInstance())
+            .getEnvVarOrProperty(eq("dockerconfig.source"), anyString());
 
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
index a43a001ca5b..642eb6d7390 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
@@ -8,6 +8,7 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
@@ -16,8 +17,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.testcontainers.TestImages.TINY_IMAGE;
-
 /**
  * Test that event streaming from the {@link DockerClient} works correctly
  */
@@ -34,7 +33,7 @@ public void test() throws IOException, InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
 
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("true")
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
         ) {
@@ -43,24 +42,31 @@ public void test() throws IOException, InterruptedException {
 
             // Request all events between startTime and endTime for the container
             try (
-                EventsResultCallback response = DockerClientFactory.instance().client().eventsCmd()
+                EventsResultCallback response = DockerClientFactory
+                    .instance()
+                    .client()
+                    .eventsCmd()
                     .withContainerFilter(container.getContainerId())
                     .withEventFilter("create")
                     .withSince(Instant.parse(createdAt).getEpochSecond() + "")
-                    .exec(new EventsResultCallback() {
-                        @Override
-                        public void onNext(@NotNull Event event) {
-                            // Check that a create event for the container is received
-                            if (event.getId().equals(container.getContainerId()) && event.getStatus().equals("create")) {
-                                latch.countDown();
+                    .exec(
+                        new EventsResultCallback() {
+                            @Override
+                            public void onNext(@NotNull Event event) {
+                                // Check that a create event for the container is received
+                                if (
+                                    event.getId().equals(container.getContainerId()) &&
+                                    event.getStatus().equals("create")
+                                ) {
+                                    latch.countDown();
+                                }
                             }
                         }
-                    })
+                    )
             ) {
                 response.awaitStarted(5, TimeUnit.SECONDS);
                 latch.await(5, TimeUnit.SECONDS);
             }
         }
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index 8691e8f5f56..730208c553f 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -22,7 +22,7 @@ public static String[] parameters() {
             "quay.io/testcontainers/ryuk:latest",
             "quay.io/testcontainers/ryuk:0.2.3",
             "quay.io/testcontainers/ryuk@sha256:bb5a635cac4bd96c93cc476969ce11dc56436238ec7cd028d0524462f4739dd9",
-//            "ibmcom/db2express-c", // Big image for testing with slow networks
+            //            "ibmcom/db2express-c", // Big image for testing with slow networks
         };
     }
 
@@ -32,9 +32,11 @@ public ImagePullTest(String image) {
 
     @Test
     public void test() {
-        try (final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(image))
-            .withCommand("/bin/sh", "-c", "sleep 0")
-            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())) {
+        try (
+            final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(image))
+                .withCommand("/bin/sh", "-c", "sleep 0")
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
             container.start();
             // do nothing other than start and stop
         }
diff --git a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
index e073fa0522a..96fdfa4010b 100644
--- a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
@@ -1,15 +1,15 @@
 package org.testcontainers.images;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
-import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class AgeBasedPullPolicyTest {
 
@@ -17,9 +17,7 @@ public class AgeBasedPullPolicyTest {
 
     @Test
     public void shouldPull() {
-        ImageData imageData = ImageData.builder()
-            .createdAt(Instant.now().minus(2, ChronoUnit.HOURS))
-            .build();
+        ImageData imageData = ImageData.builder().createdAt(Instant.now().minus(2, ChronoUnit.HOURS)).build();
 
         AgeBasedPullPolicy oneHour = new AgeBasedPullPolicy(Duration.of(1L, ChronoUnit.HOURS));
         assertTrue(oneHour.shouldPullCached(imageName, imageData));
diff --git a/core/src/test/java/org/testcontainers/images/ImageDataTest.java b/core/src/test/java/org/testcontainers/images/ImageDataTest.java
index 3b473cf7ffd..6ff75e9e355 100644
--- a/core/src/test/java/org/testcontainers/images/ImageDataTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImageDataTest.java
@@ -1,12 +1,11 @@
 package org.testcontainers.images;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import org.junit.Test;
 
 import java.time.Instant;
 
-import org.junit.Test;
-
-import com.github.dockerjava.api.command.InspectImageResponse;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ImageDataTest {
 
@@ -23,5 +22,4 @@ public void shouldReadTimestampWithOffsetFromInspectImageResponse() {
         final ImageData imageData = ImageData.from(new InspectImageResponse().withCreated(timestamp));
         assertThat(imageData.getCreatedAt()).isEqualTo(Instant.parse("2020-07-27T16:23:31.365190246Z"));
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
index 9d5ed400d32..0b0ee5f1b70 100644
--- a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -24,29 +24,20 @@ public class ImagePullPolicyTest {
 
     @Test
     public void pullsByDefault() {
-        try (
-            GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withExposedPorts(8080)
-        ) {
+        try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {
             container.start();
         }
     }
 
     @Test
     public void shouldAlwaysPull() {
-        try (
-            GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withExposedPorts(8080)
-        ) {
+        try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {
             container.start();
         }
 
         removeImage();
 
-        try (
-            GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withExposedPorts(8080)
-        ) {
+        try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {
             expectToFailWithNotFoundException(container);
         }
 
@@ -66,12 +57,14 @@ public void shouldSupportCustomPolicies() {
         try (
             // custom_image_pull_policy {
             GenericContainer<?> container = new GenericContainer<>(imageName)
-                .withImagePullPolicy(new AbstractImagePullPolicy() {
-                    @Override
-                    protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
-                        return System.getenv("ALWAYS_PULL_IMAGE") != null;
+                .withImagePullPolicy(
+                    new AbstractImagePullPolicy() {
+                        @Override
+                        protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+                            return System.getenv("ALWAYS_PULL_IMAGE") != null;
+                        }
                     }
-                })
+                )
             // }
         ) {
             container.withExposedPorts(8080);
@@ -81,12 +74,14 @@ protected boolean shouldPullCached(DockerImageName imageName, ImageData localIma
 
     @Test
     public void shouldCheckPolicy() {
-        ImagePullPolicy policy = Mockito.spy(new AbstractImagePullPolicy() {
-            @Override
-            protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
-                return false;
+        ImagePullPolicy policy = Mockito.spy(
+            new AbstractImagePullPolicy() {
+                @Override
+                protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+                    return false;
+                }
             }
-        });
+        );
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
                 .withImagePullPolicy(policy)
@@ -128,11 +123,12 @@ private void expectToFailWithNotFoundException(GenericContainer<?> container) {
 
     private void removeImage() {
         try {
-            DockerClientFactory.instance().client()
+            DockerClientFactory
+                .instance()
+                .client()
                 .removeImageCmd(imageName.asCanonicalNameString())
                 .withForce(true)
                 .exec();
-        } catch (NotFoundException ignored) {
-        }
+        } catch (NotFoundException ignored) {}
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
index 52a22c83b00..cd4509965e6 100644
--- a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
@@ -4,69 +4,119 @@
 import org.junit.Test;
 
 import java.nio.file.Paths;
+import java.util.Arrays;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 
 public class ParsedDockerfileTest {
 
     @Test
     public void doesSimpleParsing() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage", "RUN something"));
-        assertEquals("extracts a single image name", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("FROM someimage", "RUN something")
+        );
+        assertEquals(
+            "extracts a single image name",
+            Sets.newHashSet("someimage"),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 
     @Test
     public void isCaseInsensitive() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("from someimage", "RUN something"));
-        assertEquals("extracts a single image name", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("from someimage", "RUN something")
+        );
+        assertEquals(
+            "extracts a single image name",
+            Sets.newHashSet("someimage"),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 
     @Test
     public void handlesTags() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage:tag", "RUN something"));
-        assertEquals("retains tags in image names", Sets.newHashSet("someimage:tag"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("FROM someimage:tag", "RUN something")
+        );
+        assertEquals(
+            "retains tags in image names",
+            Sets.newHashSet("someimage:tag"),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 
     @Test
     public void handlesDigests() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage@sha256:abc123", "RUN something"));
-        assertEquals("retains digests in image names", Sets.newHashSet("someimage@sha256:abc123"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("FROM someimage@sha256:abc123", "RUN something")
+        );
+        assertEquals(
+            "retains digests in image names",
+            Sets.newHashSet("someimage@sha256:abc123"),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 
     @Test
     public void ignoringCommentedFromLines() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage", "#FROM somethingelse"));
-        assertEquals("ignores commented from lines", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("FROM someimage", "#FROM somethingelse")
+        );
+        assertEquals(
+            "ignores commented from lines",
+            Sets.newHashSet("someimage"),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 
     @Test
     public void ignoringBuildStageNames() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage --as=base", "RUN something", "FROM nextimage", "RUN something"));
-        assertEquals("ignores build stage names and allows multiple images to be extracted", Sets.newHashSet("someimage", "nextimage"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("FROM someimage --as=base", "RUN something", "FROM nextimage", "RUN something")
+        );
+        assertEquals(
+            "ignores build stage names and allows multiple images to be extracted",
+            Sets.newHashSet("someimage", "nextimage"),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 
     @Test
     public void ignoringPlatformArgs() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM --platform=linux/amd64 someimage", "RUN something"));
-               assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("FROM --platform=linux/amd64 someimage", "RUN something")
+        );
+        assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
     }
 
     @Test
     public void ignoringExtraPlatformArgs() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM --platform=linux/amd64 --somethingelse=value someimage", "RUN something"));
-               assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("FROM --platform=linux/amd64 --somethingelse=value someimage", "RUN something")
+        );
+        assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
     }
 
     @Test
     public void handlesGracefullyIfNoFromLine() {
-        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("RUN something", "# is this even a valid Dockerfile?"));
-        assertEquals("handles invalid Dockerfiles gracefully", Sets.newHashSet(), parsedDockerfile.getDependencyImageNames());
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
+            Arrays.asList("RUN something", "# is this even a valid Dockerfile?")
+        );
+        assertEquals(
+            "handles invalid Dockerfiles gracefully",
+            Sets.newHashSet(),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 
     @Test
     public void handlesGracefullyIfDockerfileNotFound() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(Paths.get("nonexistent.Dockerfile"));
-        assertEquals("handles missing Dockerfiles gracefully", Sets.newHashSet(), parsedDockerfile.getDependencyImageNames());
+        assertEquals(
+            "handles missing Dockerfiles gracefully",
+            Sets.newHashSet(),
+            parsedDockerfile.getDependencyImageNames()
+        );
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
index d2ea3e7188a..592d46f33d1 100644
--- a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
+++ b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
@@ -9,7 +9,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 
@@ -23,7 +23,7 @@ public void toStringContainsOnlyImageName() {
     }
 
     @Test
-    public void toStringWithExceptionContainsOnlyImageNameFuture()  {
+    public void toStringWithExceptionContainsOnlyImageNameFuture() {
         CompletableFuture<String> imageNameFuture = new CompletableFuture<>();
         imageNameFuture.completeExceptionally(new RuntimeException("arbitrary"));
 
@@ -31,8 +31,8 @@ public void toStringWithExceptionContainsOnlyImageNameFuture()  {
         assertThat(remoteDockerImage.toString(), containsString("imageName=java.lang.RuntimeException: arbitrary"));
     }
 
-    @Test(timeout=5000L)
-    public void toStringDoesntResolveImageNameFuture()  {
+    @Test(timeout = 5000L)
+    public void toStringDoesntResolveImageNameFuture() {
         CompletableFuture<String> imageNameFuture = new CompletableFuture<>();
 
         // verify that we've set up the test properly
@@ -49,7 +49,7 @@ public void toStringDoesntResolveImageNameFuture()  {
         assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
     }
 
-    @Test(timeout=5000L)
+    @Test(timeout = 5000L)
     public void toStringDoesntResolveLazyFuture() throws Exception {
         String imageName = Base58.randomString(8).toLowerCase();
         AtomicBoolean resolved = new AtomicBoolean(false);
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
index 9a9d647d71b..29cf4fcf6a7 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
@@ -6,7 +6,6 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -18,39 +17,41 @@ public class DockerfileBuildTest {
     static final Path RESOURCE_PATH = Paths.get("src/test/resources/dockerfile-build-test");
 
     public String expectedFileContent;
+
     public ImageFromDockerfile image;
 
     @Parameterized.Parameters
     public static Object[][] parameters() {
-        return new Object[][]{
+        return new Object[][] {
             // Dockerfile build without explicit per-file inclusion
-            new Object[]{"test1234",
+            new Object[] {
+                "test1234",
+                // spotless:off
                 // docsShowRecursiveFileInclusion {
                 new ImageFromDockerfile()
-                    .withFileFromPath(".", RESOURCE_PATH)
+                    .withFileFromPath(".", RESOURCE_PATH),
                 // }
+                // spotless:on
             },
-
             // Dockerfile build using a non-standard Dockerfile
-            new Object[]{"test4567",
-                new ImageFromDockerfile()
-                    .withFileFromPath(".", RESOURCE_PATH)
-                    .withDockerfilePath("./Dockerfile-alt")
+            new Object[] {
+                "test4567",
+                new ImageFromDockerfile().withFileFromPath(".", RESOURCE_PATH).withDockerfilePath("./Dockerfile-alt"),
             },
-
             // Dockerfile build using build args
-            new Object[]{"test7890",
+            new Object[] {
+                "test7890",
                 new ImageFromDockerfile()
                     .withFileFromPath(".", RESOURCE_PATH)
                     .withDockerfilePath("./Dockerfile-buildarg")
-                    .withBuildArg("CUSTOM_ARG", "test7890")
+                    .withBuildArg("CUSTOM_ARG", "test7890"),
             },
-            
-           // Dockerfile build using withDockerfile(File)
-            new Object[]{"test4567",
+            // Dockerfile build using withDockerfile(File)
+            new Object[] {
+                "test4567",
                 new ImageFromDockerfile()
                     .withFileFromPath(".", RESOURCE_PATH)
-                    .withDockerfile(RESOURCE_PATH.resolve("Dockerfile-alt"))
+                    .withDockerfile(RESOURCE_PATH.resolve("Dockerfile-alt")),
             },
         };
     }
@@ -62,14 +63,18 @@ public DockerfileBuildTest(String expectedFileContent, ImageFromDockerfile image
 
     @Test
     public void performTest() {
-        try (final GenericContainer container = new GenericContainer(image)
-            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-            .withCommand("cat", "/test.txt")) {
+        try (
+            final GenericContainer container = new GenericContainer(image)
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withCommand("cat", "/test.txt")
+        ) {
             container.start();
 
             final String logs = container.getLogs();
-            assertTrue("expected file content indicates that dockerfile build steps have been run", logs.contains(expectedFileContent));
+            assertTrue(
+                "expected file content indicates that dockerfile build steps have been run",
+                logs.contains(expectedFileContent)
+            );
         }
     }
-    
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
index b99a70a7650..513b1ce1784 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
@@ -24,10 +24,10 @@ public void testInvalidDockerignore() throws Exception {
                 .withDockerfile(INVALID_DOCKERIGNORE_PATH.resolve("Dockerfile"))
                 .get();
             fail("Should not be able to build an image with an invalid .dockerignore file");
-        }
-        catch (DockerClientException e) {
-            if (!e.getMessage().contains("Invalid pattern"))
+        } catch (DockerClientException e) {
+            if (!e.getMessage().contains("Invalid pattern")) {
                 throw e;
+            }
         }
     }
 
@@ -35,22 +35,24 @@ public void testInvalidDockerignore() throws Exception {
     @Test
     public void testValidDockerignore() throws Exception {
         ImageFromDockerfile img = new ImageFromDockerfile()
-                .withFileFromPath(".", DockerfileBuildTest.RESOURCE_PATH)
-                .withDockerfile(DockerfileBuildTest.RESOURCE_PATH.resolve("Dockerfile-currentdir"));
-        try(
+            .withFileFromPath(".", DockerfileBuildTest.RESOURCE_PATH)
+            .withDockerfile(DockerfileBuildTest.RESOURCE_PATH.resolve("Dockerfile-currentdir"));
+        try (
             final GenericContainer<?> container = new GenericContainer(DockerImageName.parse(img.get()))
-            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-            .withCommand("ls", "/")
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+                .withCommand("ls", "/")
         ) {
-
             container.start();
 
             final String logs = container.getLogs();
-            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
-                    logs.contains("should_not_be_ignored.txt"));
-            assertTrue("Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
-                    !logs.contains("should_be_ignored.txt"));
+            assertTrue(
+                "Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
+                logs.contains("should_not_be_ignored.txt")
+            );
+            assertTrue(
+                "Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
+                !logs.contains("should_be_ignored.txt")
+            );
         }
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
index da3509cea7b..abc05eb567c 100644
--- a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
@@ -12,8 +12,7 @@ public class ImageFromDockerfileTest {
 
     @Test
     public void shouldAddDefaultLabels() {
-        ImageFromDockerfile image = new ImageFromDockerfile()
-            .withDockerfileFromBuilder(it -> it.from("scratch"));
+        ImageFromDockerfile image = new ImageFromDockerfile().withDockerfileFromBuilder(it -> it.from("scratch"));
 
         String imageId = image.resolve();
 
@@ -27,7 +26,10 @@ public void shouldAddDefaultLabels() {
 
     @Test
     public void shouldNotAddSessionLabelIfDeleteOnExitIsFalse() {
-        ImageFromDockerfile image = new ImageFromDockerfile("localhost/testcontainers/" + Base58.randomString(16).toLowerCase(), false)
+        ImageFromDockerfile image = new ImageFromDockerfile(
+            "localhost/testcontainers/" + Base58.randomString(16).toLowerCase(),
+            false
+        )
             .withDockerfileFromBuilder(it -> it.from("scratch"));
         String imageId = image.resolve();
         DockerClient dockerClient = DockerClientFactory.instance().client();
@@ -40,7 +42,5 @@ public void shouldNotAddSessionLabelIfDeleteOnExitIsFalse() {
             // ensure the image is deleted, even if the test fails
             dockerClient.removeImageCmd(imageId).exec();
         }
-
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
index 15c73cadb5f..69d9a1b6840 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
@@ -19,7 +19,6 @@ public abstract class AbstractStatementTest {
     public TestName testName = new TestName();
 
     protected void assertStatement(Statement statement) {
-
         String[] expectedLines = new String[0];
         try {
             String path = "fixtures/statements/" + getClass().getSimpleName() + "/" + testName.getMethodName();
@@ -39,7 +38,9 @@ protected void assertStatement(Statement statement) {
         String[] resultLines = StringUtils.chomp(builder.toString().trim()).split("\n");
 
         if (expectedLines.length != resultLines.length) {
-            fail("number of lines is not the same. Expected " + expectedLines.length + " but got " + resultLines.length);
+            fail(
+                "number of lines is not the same. Expected " + expectedLines.length + " but got " + resultLines.length
+            );
         }
 
         if (!Arrays.equals(expectedLines, resultLines)) {
@@ -59,7 +60,6 @@ protected void assertStatement(Statement statement) {
                     failureBuilder.append(expectedLine);
                     failureBuilder.append(">\n");
                 }
-
             }
 
             fail(failureBuilder.toString());
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java
index 6add9d462f2..f446e48b42c 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java
@@ -9,11 +9,12 @@ public class KeyValuesStatementTest extends AbstractStatementTest {
 
     @Test
     public void multilineTest() throws Exception {
-        ImmutableMap<String, String> pairs = ImmutableMap.<String, String>builder()
-                .put("line1", "1")
-                .put("line2", "2")
-                .put("line3", "3")
-                .build();
+        ImmutableMap<String, String> pairs = ImmutableMap
+            .<String, String>builder()
+            .put("line1", "1")
+            .put("line2", "2")
+            .put("line3", "3")
+            .build();
 
         assertStatement(new KeyValuesStatement("TEST", pairs));
     }
@@ -35,12 +36,13 @@ public void keyWithTabsTest() throws Exception {
 
     @Test
     public void valueIsEscapedTest() throws Exception {
-        ImmutableMap<String, String> pairs = ImmutableMap.<String, String>builder()
-                .put("1", "value with spaces")
-                .put("2", "value\nwith\nnewlines")
-                .put("3", "value\twith\ttab")
-                .build();
+        ImmutableMap<String, String> pairs = ImmutableMap
+            .<String, String>builder()
+            .put("1", "value with spaces")
+            .put("2", "value\nwith\nnewlines")
+            .put("3", "value\twith\ttab")
+            .build();
 
         assertStatement(new KeyValuesStatement("TEST", pairs));
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java
index 3b36af8861e..50bc8bedd96 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java
@@ -13,4 +13,4 @@ public void simpleTest() throws Exception {
     public void multilineTest() throws Exception {
         assertStatement(new MultiArgsStatement("TEST", "some\nmultiline\nargument"));
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java
index a600451bd71..70724a03f09 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java
@@ -8,5 +8,4 @@ public class RawStatementTest extends AbstractStatementTest {
     public void simpleTest() throws Exception {
         assertStatement(new RawStatement("TEST", "value\nas\t\\\nis"));
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java
index 75d290b240d..dbdabab9fff 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java
@@ -13,4 +13,4 @@ public void simpleTest() throws Exception {
     public void multilineTest() throws Exception {
         assertStatement(new SingleArgumentStatement("TEST", "hello\nworld"));
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
index 7f8b5d79953..dd62ace1fac 100644
--- a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.is;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 
@@ -37,7 +37,10 @@ public static void checkVersion() {
 
     @Test
     public void simpleTest() {
-        Jedis jedis = new Jedis(getEnvironment().getServiceHost("redis_1", REDIS_PORT), getEnvironment().getServicePort("redis_1", REDIS_PORT));
+        Jedis jedis = new Jedis(
+            getEnvironment().getServiceHost("redis_1", REDIS_PORT),
+            getEnvironment().getServicePort("redis_1", REDIS_PORT)
+        );
 
         jedis.incr("test");
         jedis.incr("test");
@@ -49,7 +52,10 @@ public void simpleTest() {
     @Test
     public void secondTest() {
         // used in manual checking for cleanup in between tests
-        Jedis jedis = new Jedis(getEnvironment().getServiceHost("redis_1", REDIS_PORT), getEnvironment().getServicePort("redis_1", REDIS_PORT));
+        Jedis jedis = new Jedis(
+            getEnvironment().getServiceHost("redis_1", REDIS_PORT),
+            getEnvironment().getServicePort("redis_1", REDIS_PORT)
+        );
 
         jedis.incr("test");
         jedis.incr("test");
@@ -62,18 +68,23 @@ public void secondTest() {
 
     @Before
     public void captureNetworks() {
-      existingNetworks.addAll(findAllNetworks());
+        existingNetworks.addAll(findAllNetworks());
     }
 
     @After
     public void verifyNoNetworks() {
-      assertThat("The networks", findAllNetworks(), is(existingNetworks));
+        assertThat("The networks", findAllNetworks(), is(existingNetworks));
     }
 
     private List<String> findAllNetworks() {
-      return DockerClientFactory.instance().client().listNetworksCmd().exec().stream()
-        .map(Network::getName)
-        .sorted()
-        .collect(Collectors.toList());
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listNetworksCmd()
+            .exec()
+            .stream()
+            .map(Network::getName)
+            .sorted()
+            .collect(Collectors.toList());
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index b0ed90d9c9e..7041e74912a 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit;
 
 import org.junit.Test;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.SelinuxContext;
@@ -11,16 +12,17 @@
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 public class CopyFileToContainerTest {
+
     private static String containerPath = "/tmp/mappable-resource/";
+
     private static String fileName = "test-resource.txt";
 
     @Test
     public void checkFileCopied() throws IOException, InterruptedException {
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("sleep", "3000")
                 .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
         ) {
@@ -33,7 +35,7 @@ public void checkFileCopied() throws IOException, InterruptedException {
     @Test
     public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("sleep", "3000")
                 .withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
         ) {
@@ -46,10 +48,9 @@ public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
     @Test
     public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
         String resource = "/test_copy_to_container.txt";
-        GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+        GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
             .withClasspathResourceMapping(resource, "/readOnly", BindMode.READ_ONLY)
             .withClasspathResourceMapping(resource, "/readOnlyNoSelinux", BindMode.READ_ONLY)
-
             .withClasspathResourceMapping(resource, "/readOnlyShared", BindMode.READ_ONLY, SelinuxContext.SHARED)
             .withClasspathResourceMapping(resource, "/readWrite", BindMode.READ_WRITE);
 
@@ -65,7 +66,7 @@ public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
     public void shouldCreateFoldersStructureWithCopy() throws Exception {
         String resource = "/test_copy_to_container.txt";
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("sleep", "3000")
                 .withClasspathResourceMapping(resource, "/a/b/c/file", BindMode.READ_ONLY)
         ) {
diff --git a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
index bd82c58a7f7..78e55335d9a 100644
--- a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
@@ -3,6 +3,7 @@
 import lombok.Getter;
 import org.junit.Test;
 import org.rnorth.visibleassertions.VisibleAssertions;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.lifecycle.Startable;
@@ -16,8 +17,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.testcontainers.TestImages.TINY_IMAGE;
-
 public class DependenciesTest {
 
     @Test
@@ -25,7 +24,7 @@ public void shouldWorkWithSimpleDependency() {
         InvocationCountingStartable startable = new InvocationCountingStartable();
 
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable)
         ) {
@@ -42,7 +41,7 @@ public void shouldWorkWithMutlipleDependencies() {
         InvocationCountingStartable startable2 = new InvocationCountingStartable();
 
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable1, startable2)
         ) {
@@ -58,7 +57,7 @@ public void shouldStartEveryTime() {
         InvocationCountingStartable startable = new InvocationCountingStartable();
 
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable)
         ) {
@@ -85,7 +84,7 @@ public void shouldStartTransitiveDependencies() {
         startable.getDependencies().add(transitiveStartable);
 
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .dependsOn(startable)
         ) {
@@ -94,8 +93,16 @@ public void shouldStartTransitiveDependencies() {
         }
 
         VisibleAssertions.assertEquals("Root started", 1, startable.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("Transitive started", 1, transitiveStartable.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("Transitive of transitive started", 1, transitiveOfTransitiveStartable.getStartInvocationCount().intValue());
+        VisibleAssertions.assertEquals(
+            "Transitive started",
+            1,
+            transitiveStartable.getStartInvocationCount().intValue()
+        );
+        VisibleAssertions.assertEquals(
+            "Transitive of transitive started",
+            1,
+            transitiveOfTransitiveStartable.getStartInvocationCount().intValue()
+        );
     }
 
     @Test
@@ -123,7 +130,8 @@ public void shouldHandleDiamondDependencies() throws Exception {
 
     @Test
     public void shouldHandleParallelStream() throws Exception {
-        List<Startable> startables = Stream.generate(InvocationCountingStartable::new)
+        List<Startable> startables = Stream
+            .generate(InvocationCountingStartable::new)
             .limit(10)
             .collect(Collectors.toList());
 
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
index a44d8de49f4..651696696c7 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
@@ -24,25 +24,26 @@ public static void checkVersion() {
     }
 
     @Rule
-    public DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/scaled-compose-test.yml"))
-            .withScaledService("redis", 3)
-            .withExposedService("redis", REDIS_PORT) // implicit '_1'
-            .withExposedService("redis_2", REDIS_PORT) // explicit service index
-            .withExposedService("redis", 3, REDIS_PORT); // explicit service index via parameter
+    public DockerComposeContainer environment = new DockerComposeContainer(
+        new File("src/test/resources/scaled-compose-test.yml")
+    )
+        .withScaledService("redis", 3)
+        .withExposedService("redis", REDIS_PORT) // implicit '_1'
+        .withExposedService("redis_2", REDIS_PORT) // explicit service index
+        .withExposedService("redis", 3, REDIS_PORT); // explicit service index via parameter
 
     @Before
     public void setupClients() {
         for (int i = 0; i < 3; i++) {
-
             String name = String.format("redis_%d", i + 1);
 
-            clients[i] = new Jedis(environment.getServiceHost(name, REDIS_PORT), environment.getServicePort(name, REDIS_PORT));
+            clients[i] =
+                new Jedis(environment.getServiceHost(name, REDIS_PORT), environment.getServicePort(name, REDIS_PORT));
         }
     }
 
     @Test
     public void simpleTest() {
-
         for (int i = 0; i < 3; i++) {
             clients[i].incr("somekey");
 
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
index 17a9b665513..c49663a4e35 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
@@ -9,10 +9,9 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.util.Collections;
 import java.util.Optional;
 
-import static java.lang.String.format;
-import static java.util.Collections.singletonList;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
@@ -24,7 +23,9 @@
 public class DockerComposeContainerTest extends BaseDockerComposeTest {
 
     @Rule
-    public DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+    public DockerComposeContainer environment = new DockerComposeContainer(
+        new File("src/test/resources/compose-test.yml")
+    )
         .withExposedService("redis_1", REDIS_PORT)
         .withExposedService("db_1", 3306);
 
@@ -46,34 +47,46 @@ public void testGetServicePort() {
     public void shouldRetrieveContainerByServiceName() {
         String existingServiceName = "db_1";
         Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
-        assertTrue(format("Container should be found by service name %s", existingServiceName), result.isPresent());
-        assertEquals("Mapped port for result container was wrong, probably wrong container found", result.get().getExposedPorts(), singletonList(3306));
+        assertTrue(
+            String.format("Container should be found by service name %s", existingServiceName),
+            result.isPresent()
+        );
+        assertEquals(
+            "Mapped port for result container was wrong, probably wrong container found",
+            result.get().getExposedPorts(),
+            Collections.singletonList(3306)
+        );
     }
 
     @Test
     public void shouldReturnEmptyResultOnNoneExistingService() {
         String notExistingServiceName = "db_256";
         Optional<ContainerState> result = environment.getContainerByServiceName(notExistingServiceName);
-        assertFalse(format("No container should be found under service name %s", notExistingServiceName), result.isPresent());
+        assertFalse(
+            String.format("No container should be found under service name %s", notExistingServiceName),
+            result.isPresent()
+        );
     }
 
     @Test
     public void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
         String validYaml =
             "version: '2.2'\n" +
-                "services:\n" +
-                "  http:\n" +
-                "    build: .\n" +
-                "    image: python:latest\n" +
-                "    ports:\n" +
-                "    - 8080:8080";
+            "services:\n" +
+            "  http:\n" +
+            "    build: .\n" +
+            "    image: python:latest\n" +
+            "    ports:\n" +
+            "    - 8080:8080";
 
         File filePathNotStartWithDotSlash = new File("docker-compose-test.yml");
         filePathNotStartWithDotSlash.createNewFile();
         filePathNotStartWithDotSlash.deleteOnExit();
         Files.write(filePathNotStartWithDotSlash.toPath(), validYaml.getBytes(StandardCharsets.UTF_8));
 
-        final DockerComposeContainer<?> dockerComposeContainer = new DockerComposeContainer<>(filePathNotStartWithDotSlash);
+        final DockerComposeContainer<?> dockerComposeContainer = new DockerComposeContainer<>(
+            filePathNotStartWithDotSlash
+        );
         assertNotNull("Container could not be created using docker compose file", dockerComposeContainer);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
index 1b1efc878af..e0705a2c73b 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
@@ -14,30 +14,32 @@
 import java.util.stream.Stream;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.containers.DockerComposeContainer.RemoveImages.ALL;
-import static org.testcontainers.containers.DockerComposeContainer.RemoveImages.LOCAL;
 
 @RunWith(Parameterized.class)
 public class DockerComposeContainerWithBuildTest {
 
-    public DockerComposeContainerWithBuildTest(final DockerComposeContainer.RemoveImages removeMode,
-                                               final boolean shouldBuiltImageBePresentAfterRunning,
-                                               final boolean shouldPulledImageBePresentAfterRunning) {
+    public DockerComposeContainerWithBuildTest(
+        final DockerComposeContainer.RemoveImages removeMode,
+        final boolean shouldBuiltImageBePresentAfterRunning,
+        final boolean shouldPulledImageBePresentAfterRunning
+    ) {
         this.removeMode = removeMode;
         this.shouldBuiltImageBePresentAfterRunning = shouldBuiltImageBePresentAfterRunning;
         this.shouldPulledImageBePresentAfterRunning = shouldPulledImageBePresentAfterRunning;
     }
 
     public final DockerComposeContainer.RemoveImages removeMode;
+
     public final boolean shouldBuiltImageBePresentAfterRunning;
+
     public final boolean shouldPulledImageBePresentAfterRunning;
 
     @Parameterized.Parameters(name = "removeMode = {0}")
     public static Object[][] params() {
-        return new Object[][]{
-            {null, true, true},
-            {LOCAL, false, true},
-            {ALL, false, false},
+        return new Object[][] {
+            { null, true, true },
+            { DockerComposeContainer.RemoveImages.LOCAL, false, true },
+            { DockerComposeContainer.RemoveImages.ALL, false, false },
         };
     }
 
@@ -47,11 +49,12 @@ public void performTest() {
 
         final AtomicReference<String> builtImageName = new AtomicReference<>("");
         final AtomicReference<String> pulledImageName = new AtomicReference<>("");
-        try (DockerComposeContainer environment = new DockerComposeContainer<>(composeFile)
-            .withExposedService("customredis", 6379)
-            .withBuild(true)
-            .withRemoveImages(removeMode)) {
-
+        try (
+            DockerComposeContainer environment = new DockerComposeContainer<>(composeFile)
+                .withExposedService("customredis", 6379)
+                .withBuild(true)
+                .withRemoveImages(removeMode)
+        ) {
             environment.start();
 
             builtImageName.set(imageNameForRunningContainer("_customredis_1"));
@@ -63,21 +66,42 @@ public void performTest() {
             assertEquals("the pulled image is present while running", true, isPulledImagePresentWhileRunning);
         }
 
-        Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
-            final boolean isBuiltImagePresentAfterRunning = isImagePresent(builtImageName.get());
-            assertEquals("the built image is not present after running", shouldBuiltImageBePresentAfterRunning, isBuiltImagePresentAfterRunning);
-            return null;
-        });
-
-        Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
-            final boolean isPulledImagePresentAfterRunning = isImagePresent(pulledImageName.get());
-            assertEquals("the pulled image is present after running", shouldPulledImageBePresentAfterRunning, isPulledImagePresentAfterRunning);
-            return null;
-        });
+        Unreliables.retryUntilSuccess(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                final boolean isBuiltImagePresentAfterRunning = isImagePresent(builtImageName.get());
+                assertEquals(
+                    "the built image is not present after running",
+                    shouldBuiltImageBePresentAfterRunning,
+                    isBuiltImagePresentAfterRunning
+                );
+                return null;
+            }
+        );
+
+        Unreliables.retryUntilSuccess(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                final boolean isPulledImagePresentAfterRunning = isImagePresent(pulledImageName.get());
+                assertEquals(
+                    "the pulled image is present after running",
+                    shouldPulledImageBePresentAfterRunning,
+                    isPulledImagePresentAfterRunning
+                );
+                return null;
+            }
+        );
     }
 
     private String imageNameForRunningContainer(final String containerNameSuffix) {
-        return DockerClientFactory.instance().client().listContainersCmd().exec().stream()
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listContainersCmd()
+            .exec()
+            .stream()
             .filter(it -> Stream.of(it.getNames()).anyMatch(name -> name.endsWith(containerNameSuffix)))
             .findFirst()
             .map(Container::getImage)
@@ -85,7 +109,13 @@ private String imageNameForRunningContainer(final String containerNameSuffix) {
     }
 
     private boolean isImagePresent(final String imageName) {
-        return DockerClientFactory.instance().client().listImagesCmd().withImageNameFilter(imageName).exec().stream()
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listImagesCmd()
+            .withImageNameFilter(imageName)
+            .exec()
+            .stream()
             .findFirst()
             .isPresent();
     }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
index 375c9baa070..77e60580b39 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
@@ -17,7 +17,12 @@
 @RunWith(Parameterized.class)
 public class DockerComposeContainerWithOptionsTest {
 
-    public DockerComposeContainerWithOptionsTest(final File composeFile, final boolean local, final Set<String> options, final boolean expectError) {
+    public DockerComposeContainerWithOptionsTest(
+        final File composeFile,
+        final boolean local,
+        final Set<String> options,
+        final boolean expectError
+    ) {
         this.composeFile = composeFile;
         this.local = local;
         this.options = options;
@@ -25,38 +30,60 @@ public DockerComposeContainerWithOptionsTest(final File composeFile, final boole
     }
 
     private final File composeFile;
+
     private final boolean local;
 
     private final Set<String> options;
-    private final boolean expectError;
 
-    @Parameterized.Parameters(name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]")
+    private final boolean expectError;
 
+    @Parameterized.Parameters(
+        name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]"
+    )
     public static Object[][] params() {
-        return new Object[][]{
+        return new Object[][] {
             // Test the happy day case. THe compatibility option should be accepted by docker-compose.
-            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), false, ImmutableSet.of("--compatibility"), false},
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                false,
+                ImmutableSet.of("--compatibility"),
+                false,
+            },
             // Test with flags absent. Docker compose will warn but continue, ignoring the deploy block.
-            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), false, ImmutableSet.of(""), false},
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                false,
+                ImmutableSet.of(""),
+                false,
+            },
             // Test with a bad option. Compose will complain.
-            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), false, ImmutableSet.of("--bad-option"), true},
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                false,
+                ImmutableSet.of("--bad-option"),
+                true,
+            },
             // Local compose
-            {new File("src/test/resources/compose-options-test/with-deploy-block.yml"), true, ImmutableSet.of("--compatibility"), false},
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                true,
+                ImmutableSet.of("--compatibility"),
+                false,
+            },
         };
     }
 
     @Test
     public void performTest() {
-
-        try (DockerComposeContainer<?> environment = new DockerComposeContainer<>(composeFile)
+        try (
+            DockerComposeContainer<?> environment = new DockerComposeContainer<>(composeFile)
                 .withOptions(options.stream().toArray(String[]::new))
-                .withLocalCompose(local)) {
+                .withLocalCompose(local)
+        ) {
             environment.start();
             assertThat(expectError).isEqualTo(false);
         } catch (Exception e) {
             assertThat(expectError).isEqualTo(true);
         }
-
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
index b8e26ffd3f1..51f09bdb095 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
@@ -10,11 +10,15 @@ public class DockerComposeErrorHandlingTest {
 
     @Test
     public void simpleTest() {
-        VisibleAssertions.assertThrows("starting with an invalid docker-compose file throws an exception",
+        VisibleAssertions.assertThrows(
+            "starting with an invalid docker-compose file throws an exception",
             IllegalArgumentException.class,
-                () -> {
-                    DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/invalid-compose.yml"))
-                        .withExposedService("something", 123);
-                });
+            () -> {
+                DockerComposeContainer environment = new DockerComposeContainer(
+                    new File("src/test/resources/invalid-compose.yml")
+                )
+                    .withExposedService("something", 123);
+            }
+        );
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
index 890fa34b0f8..dd2054e1e2e 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
@@ -14,7 +14,9 @@ public class DockerComposeLocalImageTest {
     public void usesLocalImageEvenWhenPullFails() throws InterruptedException {
         tagImage("redis:4.0.10", "redis-local", "latest");
 
-        DockerComposeContainer composeContainer = new DockerComposeContainer(new File("src/test/resources/local-compose-test.yml"))
+        DockerComposeContainer composeContainer = new DockerComposeContainer(
+            new File("src/test/resources/local-compose-test.yml")
+        )
             .withExposedService("redis", 6379);
         composeContainer.start();
     }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
index 6cd90d3cd9c..97e686a9b92 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
@@ -3,26 +3,36 @@
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.containers.output.OutputFrame.OutputType;
 import org.testcontainers.containers.output.WaitingConsumer;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
-
 public class DockerComposeLogConsumerTest {
 
     @Test
     public void testLogConsumer() throws TimeoutException {
         WaitingConsumer logConsumer = new WaitingConsumer();
-        DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/v2-compose-test.yml"))
+        DockerComposeContainer environment = new DockerComposeContainer(
+            new File("src/test/resources/v2-compose-test.yml")
+        )
             .withExposedService("redis_1", 6379)
             .withLogConsumer("redis_1", logConsumer);
 
         try {
             environment.starting(Description.EMPTY);
-            logConsumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("Ready to accept connections"), 5, TimeUnit.SECONDS);
+            logConsumer.waitUntil(
+                frame -> {
+                    return (
+                        frame.getType() == OutputType.STDOUT &&
+                        frame.getUtf8String().contains("Ready to accept connections")
+                    );
+                },
+                5,
+                TimeUnit.SECONDS
+            );
         } finally {
             environment.finished(Description.EMPTY);
         }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
index cdeea00d201..c026bcaa741 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
@@ -13,7 +13,7 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.Matchers.hasItem;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 
@@ -30,25 +30,27 @@ public static void checkVersion() {
     }
 
     @Rule
-    public DockerComposeContainer compose =
-        new DockerComposeContainer(new File("src/test/resources/v2-compose-test-passthrough.yml"))
-            .withEnv("foo", "bar")
-            .withExposedService("alpine_1", 3000, waitStrategy);
-
+    public DockerComposeContainer compose = new DockerComposeContainer(
+        new File("src/test/resources/v2-compose-test-passthrough.yml")
+    )
+        .withEnv("foo", "bar")
+        .withExposedService("alpine_1", 3000, waitStrategy);
 
     @Test
     public void testContainerInstanceProperties() {
         final ContainerState container = waitStrategy.getContainer();
 
         //check environment variable was set
-        assertThat("Environment variable set correctly", Arrays.asList(Objects.requireNonNull(container.getContainerInfo()
-            .getConfig().getEnv())), hasItem("bar=bar"));
+        assertThat(
+            "Environment variable set correctly",
+            Arrays.asList(Objects.requireNonNull(container.getContainerInfo().getConfig().getEnv())),
+            hasItem("bar=bar")
+        );
 
         //check other container properties
         assertNotNull("Container id is not null", container.getContainerId());
         assertNotNull("Port mapped", container.getMappedPort(3000));
         assertThat("Exposed Ports", container.getExposedPorts(), hasItem(3000));
-
     }
 
     /*
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
index ec8c50d42ab..5e6ba4cc30f 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
@@ -4,17 +4,18 @@
 import org.junit.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
-
 import java.io.File;
 
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+
 public class DockerComposeServiceTest extends BaseDockerComposeTest {
 
     @Rule
-    public DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withServices("redis")
-            .withExposedService("redis_1", REDIS_PORT);
-
+    public DockerComposeContainer environment = new DockerComposeContainer(
+        new File("src/test/resources/compose-test.yml")
+    )
+        .withServices("redis")
+        .withExposedService("redis_1", REDIS_PORT);
 
     @Override
     protected DockerComposeContainer getEnvironment() {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
index bed19bd0d09..f3dc2ee3cc8 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
@@ -11,8 +11,10 @@
 public class DockerComposeV2FormatTest extends BaseDockerComposeTest {
 
     @Rule
-    public DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/v2-compose-test.yml"))
-            .withExposedService("redis_1", REDIS_PORT);
+    public DockerComposeContainer environment = new DockerComposeContainer(
+        new File("src/test/resources/v2-compose-test.yml")
+    )
+        .withExposedService("redis_1", REDIS_PORT);
 
     @Override
     protected DockerComposeContainer getEnvironment() {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
index 26764476687..b28dfc3ee51 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
@@ -1,21 +1,20 @@
 package org.testcontainers.junit;
 
-import java.io.File;
-
 import org.junit.Rule;
 import org.testcontainers.containers.DockerComposeContainer;
 
+import java.io.File;
+
 public class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
 
     @Rule
-    public DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/v2-compose-test-with-network.yml"))
-            .withExposedService("redis_1", REDIS_PORT);
+    public DockerComposeContainer environment = new DockerComposeContainer(
+        new File("src/test/resources/v2-compose-test-with-network.yml")
+    )
+        .withExposedService("redis_1", REDIS_PORT);
 
     @Override
     protected DockerComposeContainer getEnvironment() {
         return environment;
     }
-
-
-
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
index 32465010700..a30c716964e 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
@@ -1,10 +1,5 @@
 package org.testcontainers.junit;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
-
-import java.io.File;
-import java.time.Duration;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -15,6 +10,12 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
+import java.io.File;
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
 public class DockerComposeWaitStrategyTest {
 
     private static final int REDIS_PORT = 6379;
@@ -23,8 +24,7 @@ public class DockerComposeWaitStrategyTest {
 
     @Before
     public final void setUp() {
-        environment = new DockerComposeContainer<>(
-            new File("src/test/resources/compose-test.yml"));
+        environment = new DockerComposeContainer<>(new File("src/test/resources/compose-test.yml"));
     }
 
     @After
@@ -34,14 +34,15 @@ public final void cleanUp() {
 
     @Test
     public void testWaitOnListeningPort() {
-        environment
-            .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort());
+        environment.withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort());
 
         try {
             environment.starting(Description.createTestDescription(Object.class, "name"));
             VisibleAssertions.pass("Docker compose should start after waiting for listening port");
         } catch (RuntimeException e) {
-            VisibleAssertions.fail("Docker compose should start after waiting for listening port with failed with: " + e);
+            VisibleAssertions.fail(
+                "Docker compose should start after waiting for listening port with failed with: " + e
+            );
         }
     }
 
@@ -56,29 +57,45 @@ public void testWaitOnMultipleStrategiesPassing() {
             environment.starting(Description.createTestDescription(Object.class, "name"));
             VisibleAssertions.pass("Docker compose should start after waiting for listening port");
         } catch (RuntimeException e) {
-            VisibleAssertions.fail("Docker compose should start after waiting for listening port with failed with: " + e);
+            VisibleAssertions.fail(
+                "Docker compose should start after waiting for listening port with failed with: " + e
+            );
         }
     }
 
     @Test
     public void testWaitingFails() {
-        environment
-            .withExposedService("redis_1", REDIS_PORT, Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10)));
-        VisibleAssertions.assertThrows("waiting on an invalid http path times out",
+        environment.withExposedService(
+            "redis_1",
+            REDIS_PORT,
+            Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10))
+        );
+        VisibleAssertions.assertThrows(
+            "waiting on an invalid http path times out",
             RuntimeException.class,
-            () -> environment.starting(Description.createTestDescription(Object.class, "name")));
+            () -> environment.starting(Description.createTestDescription(Object.class, "name"))
+        );
     }
 
     @Test
     public void testWaitOnOneOfMultipleStrategiesFailing() {
         environment
-            .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)))
-            .waitingFor("db_1", Wait.forLogMessage(".*test test test.*\\s", 1).withStartupTimeout(Duration.ofSeconds(10)))
+            .withExposedService(
+                "redis_1",
+                REDIS_PORT,
+                Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10))
+            )
+            .waitingFor(
+                "db_1",
+                Wait.forLogMessage(".*test test test.*\\s", 1).withStartupTimeout(Duration.ofSeconds(10))
+            )
             .withTailChildContainers(true);
 
-        VisibleAssertions.assertThrows("waiting on one failing strategy to time out",
+        VisibleAssertions.assertThrows(
+            "waiting on one failing strategy to time out",
             RuntimeException.class,
-            () -> environment.starting(Description.createTestDescription(Object.class, "name")));
+            () -> environment.starting(Description.createTestDescription(Object.class, "name"))
+        );
     }
 
     @Test
@@ -93,14 +110,11 @@ public void testWaitingForNonexistentServices() {
             .waitingFor(nonexistentServiceName1, someWaitStrategy)
             .waitingFor(nonexistentServiceName2, someWaitStrategy);
 
-        Throwable thrownWhenRequestedToWaitForNonexistentService =
-            catchThrowable(environment::start);
+        Throwable thrownWhenRequestedToWaitForNonexistentService = catchThrowable(environment::start);
 
         assertThat(thrownWhenRequestedToWaitForNonexistentService)
             .isInstanceOf(IllegalStateException.class)
-            .hasMessageContaining(
-                nonexistentServiceName1,
-                nonexistentServiceName2)
+            .hasMessageContaining(nonexistentServiceName1, nonexistentServiceName2)
             .hasMessageNotContaining(existentServiceName);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
index 59c2a63127c..7962b87e157 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
@@ -3,12 +3,12 @@
 import com.github.dockerjava.api.model.NetworkSettings;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.TINY_IMAGE;
 
 /**
  * Simple tests of named network modes - more may be possible, but may not be reproducible
@@ -20,7 +20,7 @@ public class DockerNetworkModeTest {
     @Test
     public void testNoNetworkContainer() {
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .withCommand("true")
                 .withNetworkMode("none")
@@ -36,7 +36,7 @@ public void testNoNetworkContainer() {
     @Test
     public void testHostNetworkContainer() {
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .withCommand("true")
                 .withNetworkMode("host")
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
index 6ad7c3ea26e..715ba3f64a1 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
@@ -21,13 +21,16 @@ public class DockerfileContainerTest {
 
     @Rule
     public GenericContainer dslContainer = new GenericContainer(
-            new ImageFromDockerfile("tcdockerfile/nginx", false).withDockerfileFromBuilder(builder -> {
-                    builder
-                            .from("alpine:3.2")
-                            .run("apk add --update nginx")
-                            .cmd("nginx", "-g", "daemon off;")
-                            .build(); }))
-            .withExposedPorts(80);
+        new ImageFromDockerfile("tcdockerfile/nginx", false)
+            .withDockerfileFromBuilder(builder -> {
+                builder
+                    .from("alpine:3.2") //
+                    .run("apk add --update nginx")
+                    .cmd("nginx", "-g", "daemon off;")
+                    .build();
+            })
+    )
+        .withExposedPorts(80);
 
     @Test
     public void simpleDslTest() throws IOException {
@@ -37,11 +40,15 @@ public void simpleDslTest() throws IOException {
         HttpGet get = new HttpGet(address);
 
         try (CloseableHttpResponse response = httpClient.execute(get)) {
-            assertEquals("A container built from a dockerfile can run nginx as expected, and returns a good status code",
-                            200,
-                            response.getStatusLine().getStatusCode());
-            assertTrue("A container built from a dockerfile can run nginx as expected, and returns an expected Server header",
-                            response.getHeaders("Server")[0].getValue().contains("nginx"));
+            assertEquals(
+                "A container built from a dockerfile can run nginx as expected, and returns a good status code",
+                200,
+                response.getStatusLine().getStatusCode()
+            );
+            assertTrue(
+                "A container built from a dockerfile can run nginx as expected, and returns an expected Server header",
+                response.getHeaders("Server")[0].getValue().contains("nginx")
+            );
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
index 2197d7be0e7..e121e7db5a4 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
@@ -5,6 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -16,7 +17,6 @@
 import java.util.concurrent.TimeoutException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.pass;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
 public class DockerfileTest {
 
@@ -25,9 +25,9 @@ public class DockerfileTest {
     @Test
     public void simpleDockerfileWorks() {
         ImageFromDockerfile image = new ImageFromDockerfile()
-                .withFileFromString("folder/someFile.txt", "hello")
-                .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
-                .withFileFromClasspath("Dockerfile", "mappable-dockerfile/Dockerfile");
+            .withFileFromString("folder/someFile.txt", "hello")
+            .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
+            .withFileFromClasspath("Dockerfile", "mappable-dockerfile/Dockerfile");
 
         verifyImage(image);
     }
@@ -40,9 +40,9 @@ protected void configure(BuildImageCmd buildImageCmd) {
                 super.configure(buildImageCmd);
 
                 List<String> dockerfile = Arrays.asList(
-                        "FROM alpine:3.14",
-                        "RUN echo 'hello from Docker build process'",
-                        "CMD yes"
+                    "FROM alpine:3.14",
+                    "RUN echo 'hello from Docker build process'",
+                    "CMD yes"
                 );
                 withFileFromString("Dockerfile", String.join("\n", dockerfile));
 
@@ -56,28 +56,30 @@ protected void configure(BuildImageCmd buildImageCmd) {
     @Test
     public void dockerfileBuilderWorks() {
         ImageFromDockerfile image = new ImageFromDockerfile()
-                .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
-                .withFileFromString("folder/someFile.txt", "hello")
-                .withDockerfileFromBuilder(builder -> builder
-                        .from("alpine:3.14")
-                        .workDir("/app")
-                        .add("test.txt", "test file.txt")
-                        .run("ls", "-la", "/app/test file.txt")
-                        .copy("folder/someFile.txt", "/someFile.txt")
-                        .expose(80, 8080)
-                        .cmd("while true; do cat /someFile.txt | nc -l -p 80; done")
-                );
+            .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
+            .withFileFromString("folder/someFile.txt", "hello")
+            .withDockerfileFromBuilder(builder -> {
+                builder
+                    .from("alpine:3.14")
+                    .workDir("/app")
+                    .add("test.txt", "test file.txt")
+                    .run("ls", "-la", "/app/test file.txt")
+                    .copy("folder/someFile.txt", "/someFile.txt")
+                    .expose(80, 8080)
+                    .cmd("while true; do cat /someFile.txt | nc -l -p 80; done");
+            });
 
         verifyImage(image);
     }
 
     @Test
     public void filePermissions() throws TimeoutException {
-
         WaitingConsumer consumer = new WaitingConsumer();
 
         ImageFromDockerfile image = new ImageFromDockerfile()
-                .withFileFromTransferable("/someFile.txt", new Transferable() {
+            .withFileFromTransferable(
+                "/someFile.txt",
+                new Transferable() {
                     @Override
                     public long getSize() {
                         return 0;
@@ -97,23 +99,27 @@ public String getDescription() {
                     public int getFileMode() {
                         return 0123;
                     }
-
-
-                })
-                .withDockerfileFromBuilder(builder -> builder
-                        .from("alpine:3.14")
-                        .copy("someFile.txt", "/someFile.txt")
-                        .cmd("stat -c \"%a\" /someFile.txt")
-                );
+                }
+            )
+            .withDockerfileFromBuilder(builder -> {
+                builder
+                    .from("alpine:3.14") //
+                    .copy("someFile.txt", "/someFile.txt")
+                    .cmd("stat -c \"%a\" /someFile.txt");
+            });
 
         GenericContainer container = new GenericContainer(image)
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-                .withLogConsumer(consumer);
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+            .withLogConsumer(consumer);
 
         try {
             container.start();
 
-            consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("123"), 5, TimeUnit.SECONDS);
+            consumer.waitUntil(
+                frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("123"),
+                5,
+                TimeUnit.SECONDS
+            );
         } finally {
             container.stop();
         }
diff --git a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
index beca4a8a49f..e61721f80c4 100644
--- a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
@@ -7,6 +7,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.MountableFile;
@@ -16,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.ALPINE_IMAGE;
 
 public class FileOperationsTest {
 
@@ -26,7 +26,7 @@ public class FileOperationsTest {
     @Test
     public void copyFileToContainerFileTest() throws Exception {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
+            GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
         ) {
             alpineCopyToContainer.start();
@@ -44,7 +44,7 @@ public void copyFileToContainerFileTest() throws Exception {
     @Test
     public void copyFileToContainerFolderTest() throws Exception {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
+            GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
         ) {
             alpineCopyToContainer.start();
@@ -62,10 +62,9 @@ public void copyFileToContainerFolderTest() throws Exception {
     @Test
     public void copyFolderToContainerFolderTest() throws Exception {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
+            GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
         ) {
-
             alpineCopyToContainer.start();
             final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/");
             alpineCopyToContainer.copyFileToContainer(mountableFile, "/home/test/");
@@ -81,7 +80,7 @@ public void copyFolderToContainerFolderTest() throws Exception {
     @Test(expected = NotFoundException.class)
     public void copyFromContainerShouldFailBecauseNoFileTest() throws NotFoundException {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
+            GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
         ) {
             alpineCopyToContainer.start();
@@ -92,10 +91,9 @@ public void copyFromContainerShouldFailBecauseNoFileTest() throws NotFoundExcept
     @Test
     public void shouldCopyFileFromContainerTest() throws IOException {
         try (
-            GenericContainer alpineCopyToContainer = new GenericContainer(ALPINE_IMAGE)
+            GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
         ) {
-
             alpineCopyToContainer.start();
             final MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
             alpineCopyToContainer.copyFileToContainer(mountableFile, "/home/");
@@ -110,7 +108,7 @@ public void shouldCopyFileFromContainerTest() throws IOException {
 
     @Test
     public void copyFileOperationsShouldFailWhenNotStartedTest() {
-        try (GenericContainer<?> container = new GenericContainer<>(ALPINE_IMAGE).withCommand("top")) {
+        try (GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE).withCommand("top")) {
             Assertions
                 .assertThatThrownBy(() -> {
                     MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
@@ -121,10 +119,7 @@ public void copyFileOperationsShouldFailWhenNotStartedTest() {
 
             Assertions
                 .assertThatThrownBy(() -> {
-                    container.copyFileFromContainer(
-                        "/home/test_copy_to_container.txt",
-                        IOUtils::toByteArray
-                    );
+                    container.copyFileFromContainer("/home/test_copy_to_container.txt", IOUtils::toByteArray);
                 })
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessageContaining("can only be used when the Container is created");
@@ -134,18 +129,17 @@ public void copyFileOperationsShouldFailWhenNotStartedTest() {
     @Test
     public void shouldCopyFileFromExitedContainerTest() throws IOException {
         try (
-            GenericContainer<?> container = new GenericContainer<>(ALPINE_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
                 .withCommand("sh", "-c", "echo -n 'Hello!' > /home/file_in_container.txt")
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
         ) {
             container.start();
-            assertThat(container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode())
+            assertThat(
+                container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode()
+            )
                 .isEqualTo(0);
 
-            container.copyFileFromContainer(
-                "/home/file_in_container.txt",
-                IOUtils::toByteArray
-            );
+            container.copyFileFromContainer("/home/file_in_container.txt", IOUtils::toByteArray);
 
             container.copyFileToContainer(
                 MountableFile.forClasspathResource("test_copy_to_container.txt"),
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index 02fad53fb1e..a6bb13d160c 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -3,6 +3,7 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.GenericContainer;
 
@@ -12,9 +13,8 @@
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.testcontainers.TestImages.TINY_IMAGE;
+import static org.hamcrest.Matchers.equalTo;
 
 /**
  * Test of {@link FixedHostPortGenericContainer}. Note that this is not an example of typical use (usually, a container
@@ -39,15 +39,18 @@ public class FixedHostPortContainerTest {
     /**
      * *nix pipe to fire test response on test port
      */
-    private static final String HTTP_ECHO_CMD =
-        String.format("while true; do echo \"%s\" | nc -l -p %d; done", TEST_RESPONSE, TEST_PORT);
+    private static final String HTTP_ECHO_CMD = String.format(
+        "while true; do echo \"%s\" | nc -l -p %d; done",
+        TEST_RESPONSE,
+        TEST_PORT
+    );
 
     @Test
     public void testFixedHostPortMapping() throws IOException {
         // first find a free port on the docker host that will work for testing
         final Integer unusedHostPort;
         try (
-            final GenericContainer echoServer = new GenericContainer(TINY_IMAGE)
+            final GenericContainer echoServer = new GenericContainer(TestImages.TINY_IMAGE)
                 .withExposedPorts(TEST_PORT)
                 .withCommand("/bin/sh", "-c", HTTP_ECHO_CMD)
         ) {
@@ -58,15 +61,18 @@ public void testFixedHostPortMapping() throws IOException {
         // now starting echo server container mapped to known-as-free host port
         try (
             final GenericContainer echoServer = new FixedHostPortGenericContainer(TEST_IMAGE)
-            // using workaround for port bind+expose
-            .withFixedExposedPort(unusedHostPort, TEST_PORT)
-            .withExposedPorts(TEST_PORT)
-            .withCommand("/bin/sh", "-c", HTTP_ECHO_CMD)
+                // using workaround for port bind+expose
+                .withFixedExposedPort(unusedHostPort, TEST_PORT)
+                .withExposedPorts(TEST_PORT)
+                .withCommand("/bin/sh", "-c", HTTP_ECHO_CMD)
         ) {
             echoServer.start();
 
-            assertThat("Port mapping does not seem to match given fixed port",
-                echoServer.getMappedPort(TEST_PORT), equalTo(unusedHostPort));
+            assertThat(
+                "Port mapping does not seem to match given fixed port",
+                echoServer.getMappedPort(TEST_PORT),
+                equalTo(unusedHostPort)
+            );
 
             final String content = this.readResponse(echoServer, unusedHostPort);
             assertThat("Returned echo from fixed port does not match expected", content, equalTo(TEST_RESPONSE));
@@ -83,7 +89,9 @@ public void testFixedHostPortMapping() throws IOException {
      */
     private String readResponse(GenericContainer container, Integer port) throws IOException {
         try (
-            final BufferedReader reader = Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS,
+            final BufferedReader reader = Unreliables.retryUntilSuccess(
+                10,
+                TimeUnit.SECONDS,
                 () -> {
                     Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
                     final Socket socket = new Socket(container.getHost(), port);
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index c13421029e0..8c696585902 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -21,8 +21,11 @@
 import org.junit.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.TestImages;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.TestEnvironment;
@@ -37,27 +40,19 @@
 import java.net.Socket;
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static java.util.Collections.singletonMap;
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.Matchers.equalTo;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.ALPINE_IMAGE;
-import static org.testcontainers.TestImages.MONGODB_IMAGE;
-import static org.testcontainers.TestImages.RABBITMQ_IMAGE;
-import static org.testcontainers.TestImages.REDIS_IMAGE;
-import static org.testcontainers.TestImages.TINY_IMAGE;
-import static org.testcontainers.containers.BindMode.READ_ONLY;
-import static org.testcontainers.containers.BindMode.READ_WRITE;
-import static org.testcontainers.containers.SelinuxContext.SHARED;
 
 /**
  * Tests for GenericContainerRules
@@ -65,12 +60,16 @@
 public class GenericContainerRuleTest {
 
     private static final int REDIS_PORT = 6379;
+
     private static final String RABBIQMQ_TEST_EXCHANGE = "TestExchange";
+
     private static final String RABBITMQ_TEST_ROUTING_KEY = "TestRoutingKey";
+
     private static final String RABBITMQ_TEST_MESSAGE = "Hello world";
+
     private static final int RABBITMQ_PORT = 5672;
-    private static final int MONGO_PORT = 27017;
 
+    private static final int MONGO_PORT = 27017;
 
     /*
      * Test data setup
@@ -86,77 +85,79 @@ public static void setupContent() throws FileNotFoundException {
      * Redis
      */
     @ClassRule
-    public static GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
-            .withExposedPorts(REDIS_PORT);
+    public static GenericContainer<?> redis = new GenericContainer<>(TestImages.REDIS_IMAGE)
+        .withExposedPorts(REDIS_PORT);
 
     /**
      * RabbitMQ
      */
     @ClassRule
-    public static GenericContainer<?> rabbitMq = new GenericContainer<>(RABBITMQ_IMAGE)
-            .withExposedPorts(RABBITMQ_PORT);
+    public static GenericContainer<?> rabbitMq = new GenericContainer<>(TestImages.RABBITMQ_IMAGE)
+        .withExposedPorts(RABBITMQ_PORT);
+
     /**
      * MongoDB
      */
     @ClassRule
-    public static GenericContainer<?> mongo = new GenericContainer<>(MONGODB_IMAGE)
-            .withExposedPorts(MONGO_PORT);
+    public static GenericContainer<?> mongo = new GenericContainer<>(TestImages.MONGODB_IMAGE)
+        .withExposedPorts(MONGO_PORT);
+
     /**
      * Pass an environment variable to the container, then run a shell script that exposes the variable in a quick and
      * dirty way for testing.
      */
     @ClassRule
-    public static GenericContainer<?> alpineEnvVar = new GenericContainer<>(ALPINE_IMAGE)
-            .withExposedPorts(80)
-            .withEnv("MAGIC_NUMBER", "4")
-            .withEnv("MAGIC_NUMBER", oldValue -> oldValue.orElse("") + "2")
-            .withCommand("/bin/sh", "-c", "while true; do echo \"$MAGIC_NUMBER\" | nc -l -p 80; done");
+    public static GenericContainer<?> alpineEnvVar = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        .withExposedPorts(80)
+        .withEnv("MAGIC_NUMBER", "4")
+        .withEnv("MAGIC_NUMBER", oldValue -> oldValue.orElse("") + "2")
+        .withCommand("/bin/sh", "-c", "while true; do echo \"$MAGIC_NUMBER\" | nc -l -p 80; done");
 
     /**
      * Pass environment variables to the container, then run a shell script that exposes the variables in a quick and
      * dirty way for testing.
      */
     @ClassRule
-    public static GenericContainer<?> alpineEnvVarFromMap = new GenericContainer<>(ALPINE_IMAGE)
-            .withExposedPorts(80)
-            .withEnv(ImmutableMap.of(
-                    "FIRST", "42",
-                    "SECOND", "50"
-            ))
-            .withCommand("/bin/sh", "-c", "while true; do echo \"$FIRST and $SECOND\" | nc -l -p 80; done");
+    public static GenericContainer<?> alpineEnvVarFromMap = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        .withExposedPorts(80)
+        .withEnv(ImmutableMap.of("FIRST", "42", "SECOND", "50"))
+        .withCommand("/bin/sh", "-c", "while true; do echo \"$FIRST and $SECOND\" | nc -l -p 80; done");
 
     /**
      * Map a file on the classpath to a file in the container, and then expose the content for testing.
      */
     @ClassRule
-    public static GenericContainer<?> alpineClasspathResource = new GenericContainer<>(ALPINE_IMAGE)
-            .withExposedPorts(80)
-            .withClasspathResourceMapping("mappable-resource/test-resource.txt", "/content.txt", READ_ONLY)
-            .withCommand("/bin/sh", "-c", "while true; do cat /content.txt | nc -l -p 80; done");
+    public static GenericContainer<?> alpineClasspathResource = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        .withExposedPorts(80)
+        .withClasspathResourceMapping("mappable-resource/test-resource.txt", "/content.txt", BindMode.READ_ONLY)
+        .withCommand("/bin/sh", "-c", "while true; do cat /content.txt | nc -l -p 80; done");
 
     /**
      * Map a file on the classpath to a file in the container, and then expose the content for testing.
      */
     @ClassRule
-    public static GenericContainer<?> alpineClasspathResourceSelinux = new GenericContainer<>(ALPINE_IMAGE)
-            .withExposedPorts(80)
-            .withClasspathResourceMapping("mappable-resource/test-resource.txt", "/content.txt", READ_WRITE, SHARED)
-            .withCommand("/bin/sh", "-c", "while true; do cat /content.txt | nc -l -p 80; done");
+    public static GenericContainer<?> alpineClasspathResourceSelinux = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        .withExposedPorts(80)
+        .withClasspathResourceMapping(
+            "mappable-resource/test-resource.txt",
+            "/content.txt",
+            BindMode.READ_WRITE,
+            SelinuxContext.SHARED
+        )
+        .withCommand("/bin/sh", "-c", "while true; do cat /content.txt | nc -l -p 80; done");
 
     /**
      * Create a container with an extra host entry and expose the content of /etc/hosts for testing.
      */
     @ClassRule
-    public static GenericContainer<?> alpineExtrahost = new GenericContainer<>(ALPINE_IMAGE)
-            .withExposedPorts(80)
-            .withExtraHost("somehost", "192.168.1.10")
-            .withCommand("/bin/sh", "-c", "while true; do cat /etc/hosts | nc -l -p 80; done");
+    public static GenericContainer<?> alpineExtrahost = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        .withExposedPorts(80)
+        .withExtraHost("somehost", "192.168.1.10")
+        .withCommand("/bin/sh", "-c", "while true; do cat /etc/hosts | nc -l -p 80; done");
 
     @Test
     public void testIsRunning() {
-        try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
-            .withCommand("top")) {
+        try (GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top")) {
             assertFalse("Container is not started and not running", container.isRunning());
             container.start();
             assertTrue("Container is started and running", container.isRunning());
@@ -166,16 +167,19 @@ public void testIsRunning() {
     @Test
     public void withTmpFsTest() throws Exception {
         try (
-            GenericContainer<?> container = new GenericContainer<>(TINY_IMAGE)
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("top")
-                .withTmpFs(singletonMap("/testtmpfs", "rw"))
+                .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
         ) {
             container.start();
             // check file doesn't exist
             String path = "/testtmpfs/test.file";
             Container.ExecResult execResult = container.execInContainer("ls", path);
-            assertEquals("tmpfs inside container works fine", execResult.getStderr(),
-                "ls: /testtmpfs/test.file: No such file or directory\n");
+            assertEquals(
+                "tmpfs inside container works fine",
+                execResult.getStderr(),
+                "ls: /testtmpfs/test.file: No such file or directory\n"
+            );
             // touch && check file does exist
             container.execInContainer("touch", path);
             execResult = container.execInContainer("ls", path);
@@ -183,7 +187,6 @@ public void withTmpFsTest() throws Exception {
         }
     }
 
-
     @Test
     public void simpleRabbitMqTest() throws IOException, TimeoutException {
         ConnectionFactory factory = new ConnectionFactory();
@@ -198,23 +201,39 @@ public void simpleRabbitMqTest() throws IOException, TimeoutException {
 
         // Set up a consumer on the queue
         final boolean[] messageWasReceived = new boolean[1];
-        channel.basicConsume(queueName, false, new DefaultConsumer(channel) {
-            @Override
-            public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException {
-                messageWasReceived[0] = Arrays.equals(body, RABBITMQ_TEST_MESSAGE.getBytes());
+        channel.basicConsume(
+            queueName,
+            false,
+            new DefaultConsumer(channel) {
+                @Override
+                public void handleDelivery(
+                    String consumerTag,
+                    Envelope envelope,
+                    AMQP.BasicProperties properties,
+                    byte[] body
+                ) throws IOException {
+                    messageWasReceived[0] = Arrays.equals(body, RABBITMQ_TEST_MESSAGE.getBytes());
+                }
             }
-        });
+        );
 
         // post a message
         channel.basicPublish(RABBIQMQ_TEST_EXCHANGE, RABBITMQ_TEST_ROUTING_KEY, null, RABBITMQ_TEST_MESSAGE.getBytes());
 
         // check the message was received
-        assertTrue("The message was received", Unreliables.retryUntilSuccess(5, TimeUnit.SECONDS, () -> {
-            if (!messageWasReceived[0]) {
-                throw new IllegalStateException("Message not received yet");
-            }
-            return true;
-        }));
+        assertTrue(
+            "The message was received",
+            Unreliables.retryUntilSuccess(
+                5,
+                TimeUnit.SECONDS,
+                () -> {
+                    if (!messageWasReceived[0]) {
+                        throw new IllegalStateException("Message not received yet");
+                    }
+                    return true;
+                }
+            )
+        );
     }
 
     @Test
@@ -223,8 +242,7 @@ public void simpleMongoDbTest() {
         MongoDatabase database = mongoClient.getDatabase("test");
         MongoCollection<Document> collection = database.getCollection("testCollection");
 
-        Document doc = new Document("name", "foo")
-                .append("value", 1);
+        Document doc = new Document("name", "foo").append("value", 1);
         collection.insertOne(doc);
 
         Document doc2 = collection.find(new Document("name", "foo")).first();
@@ -247,10 +265,11 @@ public void environmentFromMapTest() throws IOException {
 
     @Test
     public void customLabelTest() {
-        try (final GenericContainer alpineCustomLabel = new GenericContainer<>(ALPINE_IMAGE)
-            .withLabel("our.custom", "label")
-            .withCommand("top")) {
-
+        try (
+            final GenericContainer alpineCustomLabel = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+                .withLabel("our.custom", "label")
+                .withCommand("top")
+        ) {
             alpineCustomLabel.start();
 
             Map<String, String> labels = alpineCustomLabel.getCurrentContainerInfo().getConfig().getLabels();
@@ -262,11 +281,11 @@ public void customLabelTest() {
 
     @Test
     public void exceptionThrownWhenTryingToOverrideTestcontainersLabels() {
-        assertThrows("When trying to overwrite an 'org.testcontainers' label, withLabel() throws an exception",
+        assertThrows(
+            "When trying to overwrite an 'org.testcontainers' label, withLabel() throws an exception",
             IllegalArgumentException.class,
             () -> {
-                new GenericContainer<>(ALPINE_IMAGE)
-                    .withLabel("org.testcontainers.foo", "false");
+                new GenericContainer<>(TestImages.ALPINE_IMAGE).withLabel("org.testcontainers.foo", "false");
             }
         );
     }
@@ -277,25 +296,36 @@ public void customClasspathResourceMappingTest() throws IOException {
         // in that case this test will fail.
         String line = getReaderForContainerPort80(alpineClasspathResource).readLine();
 
-        assertEquals("Resource on the classpath can be mapped using calls to withClasspathResourceMapping", "FOOBAR", line);
+        assertEquals(
+            "Resource on the classpath can be mapped using calls to withClasspathResourceMapping",
+            "FOOBAR",
+            line
+        );
     }
 
     @Test
     public void customClasspathResourceMappingWithSelinuxTest() throws IOException {
         String line = getReaderForContainerPort80(alpineClasspathResourceSelinux).readLine();
-        assertEquals("Resource on the classpath can be mapped using calls to withClasspathResourceMappingSelinux", "FOOBAR", line);
+        assertEquals(
+            "Resource on the classpath can be mapped using calls to withClasspathResourceMappingSelinux",
+            "FOOBAR",
+            line
+        );
     }
 
     @Test
     public void exceptionThrownWhenMappedPortNotFound() {
-        assertThrows("When the requested port is not mapped, getMappedPort() throws an exception",
-                IllegalArgumentException.class,
-                () -> {
-                    return redis.getMappedPort(666);
-                });
+        assertThrows(
+            "When the requested port is not mapped, getMappedPort() throws an exception",
+            IllegalArgumentException.class,
+            () -> {
+                return redis.getMappedPort(666);
+            }
+        );
     }
 
-    protected static void writeStringToFile(File contentFolder, String filename, String string) throws FileNotFoundException {
+    protected static void writeStringToFile(File contentFolder, String filename, String string)
+        throws FileNotFoundException {
         File file = new File(contentFolder, filename);
 
         PrintStream printStream = new PrintStream(new FileOutputStream(file));
@@ -303,32 +333,34 @@ protected static void writeStringToFile(File contentFolder, String filename, Str
         printStream.close();
     }
 
-    @Test @Ignore //TODO investigate intermittent failures
+    @Test
+    @Ignore //TODO investigate intermittent failures
     public void failFastWhenContainerHaltsImmediately() {
-
         long startingTimeMs = System.currentTimeMillis();
-        final GenericContainer failsImmediately = new GenericContainer<>(ALPINE_IMAGE)
-              .withCommand("/bin/sh", "-c", "return false")
-              .withMinimumRunningDuration(Duration.ofMillis(100));
+        final GenericContainer failsImmediately = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+            .withCommand("/bin/sh", "-c", "return false")
+            .withMinimumRunningDuration(Duration.ofMillis(100));
 
         try {
             assertThrows(
-                  "When we start a container that halts immediately, an exception is thrown",
-                  RetryCountExceededException.class,
-                  () -> {
-                      failsImmediately.start();
-                      return null;
-                  });
+                "When we start a container that halts immediately, an exception is thrown",
+                RetryCountExceededException.class,
+                () -> {
+                    failsImmediately.start();
+                    return null;
+                }
+            );
 
             // Check how long it took, to verify that we ARE bailing out early.
             // Want to strike a balance here; too short and this test will fail intermittently
             // on slow systems and/or due to GC variation, too long and we won't properly test
             // what we're intending to test.
-            int allowedSecondsToFailure =
-                GenericContainer.CONTAINER_RUNNING_TIMEOUT_SEC / 2;
+            int allowedSecondsToFailure = GenericContainer.CONTAINER_RUNNING_TIMEOUT_SEC / 2;
             long completedTimeMs = System.currentTimeMillis();
-            assertTrue("container should not take long to start up",
-                  completedTimeMs - startingTimeMs < 1000L * allowedSecondsToFailure);
+            assertTrue(
+                "container should not take long to start up",
+                completedTimeMs - startingTimeMs < 1000L * allowedSecondsToFailure
+            );
         } finally {
             failsImmediately.stop();
         }
@@ -336,19 +368,20 @@ public void failFastWhenContainerHaltsImmediately() {
 
     @Test
     public void testExecInContainer() throws Exception {
-
         // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
         // that's the case for CircleCI.
         // Once they resolve the issue, this clause can be removed.
         Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
 
         final GenericContainer.ExecResult result = redis.execInContainer("redis-cli", "role");
-        assertTrue("Output for \"redis-cli role\" command should start with \"master\"", result.getStdout().startsWith("master"));
+        assertTrue(
+            "Output for \"redis-cli role\" command should start with \"master\"",
+            result.getStdout().startsWith("master")
+        );
         assertEquals("Stderr for \"redis-cli role\" command should be empty", "", result.getStderr());
         // We expect to reach this point for modern Docker versions.
     }
 
-
     @Test
     public void extraHostTest() throws IOException {
         BufferedReader br = getReaderForContainerPort80(alpineExtrahost);
@@ -370,30 +403,37 @@ public void extraHostTest() throws IOException {
     public void createContainerCmdHookTest() {
         // Use random name to avoid the conflicts between the tests
         String randomName = Base58.randomString(5);
-        try(
-                GenericContainer<?> container = new GenericContainer<>(REDIS_IMAGE)
-                        .withCommand("redis-server", "--help")
-                        .withCreateContainerCmdModifier(cmd -> cmd.withName("overrideMe"))
-                        // Preserves the order
-                        .withCreateContainerCmdModifier(cmd -> cmd.withName(randomName))
-                        // Allows to override pre-configured values by GenericContainer
-                        .withCreateContainerCmdModifier(cmd -> cmd.withCmd("redis-server", "--port", "6379"))
+        try (
+            GenericContainer<?> container = new GenericContainer<>(TestImages.REDIS_IMAGE)
+                .withCommand("redis-server", "--help")
+                .withCreateContainerCmdModifier(cmd -> cmd.withName("overrideMe"))
+                // Preserves the order
+                .withCreateContainerCmdModifier(cmd -> cmd.withName(randomName))
+                // Allows to override pre-configured values by GenericContainer
+                .withCreateContainerCmdModifier(cmd -> cmd.withCmd("redis-server", "--port", "6379"))
         ) {
             container.start();
 
             assertEquals("Name is configured", "/" + randomName, container.getContainerInfo().getName());
-            assertEquals("Command is configured", "[redis-server, --port, 6379]", Arrays.toString(container.getContainerInfo().getConfig().getCmd()));
+            assertEquals(
+                "Command is configured",
+                "[redis-server, --port, 6379]",
+                Arrays.toString(container.getContainerInfo().getConfig().getCmd())
+            );
         }
     }
 
     private BufferedReader getReaderForContainerPort80(GenericContainer container) {
+        return Unreliables.retryUntilSuccess(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
 
-        return Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
-            Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
-
-            Socket socket = new Socket(container.getHost(), container.getFirstMappedPort());
-            return new BufferedReader(new InputStreamReader(socket.getInputStream()));
-        });
+                Socket socket = new Socket(container.getHost(), container.getFirstMappedPort());
+                return new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            }
+        );
     }
 
     @Test
@@ -415,10 +455,11 @@ public void addingExposedPortTwiceShouldNotFail() {
 
     @Test
     public void sharedMemorySetTest() {
-        try (GenericContainer containerWithSharedMemory = new GenericContainer<>(TINY_IMAGE)
-            .withSharedMemorySize(42L * FileUtils.ONE_MB)
-            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())) {
-
+        try (
+            GenericContainer containerWithSharedMemory = new GenericContainer<>(TestImages.TINY_IMAGE)
+                .withSharedMemorySize(42L * FileUtils.ONE_MB)
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
             containerWithSharedMemory.start();
 
             HostConfig hostConfig = containerWithSharedMemory.getContainerInfo().getHostConfig();
diff --git a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
index 95047779551..33909e2ed27 100644
--- a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
@@ -14,10 +14,12 @@ public class NonExistentImagePullTest {
 
     @Test(timeout = 60_000L)
     public void pullingNonExistentImageFailsGracefully() {
-
-        assertThrows("Pulling a nonexistent container will cause an exception to be thrown",
-                ContainerFetchException.class, () -> {
-                    new GenericContainer<>(DockerImageName.parse("testcontainers/nonexistent:latest")).getDockerImageName();
-                });
+        assertThrows(
+            "Pulling a nonexistent container will cause an exception to be thrown",
+            ContainerFetchException.class,
+            () -> {
+                new GenericContainer<>(DockerImageName.parse("testcontainers/nonexistent:latest")).getDockerImageName();
+            }
+        );
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
index 649a0b56fc4..104fb78fe48 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
@@ -4,6 +4,7 @@
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -17,8 +18,6 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.ALPINE_IMAGE;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
 /**
  * Simple test for following container output.
@@ -26,61 +25,74 @@
 public class OutputStreamTest {
 
     @Rule
-    public GenericContainer container = new GenericContainer(ALPINE_IMAGE)
-            .withCommand("ping -c 5 127.0.0.1");
+    public GenericContainer container = new GenericContainer(TestImages.ALPINE_IMAGE)
+        .withCommand("ping -c 5 127.0.0.1");
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OutputStreamTest.class);
 
     @Test(timeout = 60_000L)
     public void testFetchStdout() throws TimeoutException {
-
         WaitingConsumer consumer = new WaitingConsumer();
 
-        container.followOutput(consumer, STDOUT);
+        container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
-        consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("seq=2"),
-                30, TimeUnit.SECONDS);
+        consumer.waitUntil(
+            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("seq=2"),
+            30,
+            TimeUnit.SECONDS
+        );
     }
 
     @Test(timeout = 60_000L)
     public void testFetchStdoutWithTimeout() {
-
         WaitingConsumer consumer = new WaitingConsumer();
 
-        container.followOutput(consumer, STDOUT);
-
-        assertThrows("a TimeoutException should be thrown", TimeoutException.class, () -> {
-            consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("seq=5"),
-                    2, TimeUnit.SECONDS);
-            return true;
-        });
+        container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
+
+        assertThrows(
+            "a TimeoutException should be thrown",
+            TimeoutException.class,
+            () -> {
+                consumer.waitUntil(
+                    frame -> {
+                        return (
+                            frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("seq=5")
+                        );
+                    },
+                    2,
+                    TimeUnit.SECONDS
+                );
+                return true;
+            }
+        );
     }
 
     @Test(timeout = 60_000L)
     public void testFetchStdoutWithNoLimit() throws TimeoutException {
-
         WaitingConsumer consumer = new WaitingConsumer();
 
-        container.followOutput(consumer, STDOUT);
+        container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
-        consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("seq=2"));
+        consumer.waitUntil(frame -> {
+            return frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("seq=2");
+        });
     }
 
     @Test(timeout = 60_000L)
     public void testLogConsumer() throws TimeoutException {
-
         WaitingConsumer waitingConsumer = new WaitingConsumer();
         Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
 
         Consumer<OutputFrame> composedConsumer = logConsumer.andThen(waitingConsumer);
         container.followOutput(composedConsumer);
 
-        waitingConsumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("seq=2"));
+        waitingConsumer.waitUntil(frame -> {
+            return frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("seq=2");
+        });
     }
 
     @Test(timeout = 60_000L)
     public void testToStringConsumer() throws TimeoutException {
-
         WaitingConsumer waitingConsumer = new WaitingConsumer();
         ToStringConsumer toStringConsumer = new ToStringConsumer();
 
@@ -95,4 +107,3 @@ public void testToStringConsumer() throws TimeoutException {
         assertFalse("a non-expected value was found", utf8String.contains("seq=42"));
     }
 }
-
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
index b15f63f4158..a87dbef3990 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
@@ -4,6 +4,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -18,14 +19,12 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.ALPINE_IMAGE;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
 
 @Slf4j
 public class OutputStreamWithTTYTest {
 
     @Rule
-    public GenericContainer<?> container = new GenericContainer<>(ALPINE_IMAGE)
+    public GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
         .withCommand("ls -1")
         .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
         .withCreateContainerCmdModifier(command -> command.withTty(true));
@@ -37,30 +36,44 @@ public class OutputStreamWithTTYTest {
     public void testFetchStdout() throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
 
-        container.followOutput(consumer, STDOUT);
+        container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
-        consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("home"), 4, TimeUnit.SECONDS);
+        consumer.waitUntil(
+            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("home"),
+            4,
+            TimeUnit.SECONDS
+        );
     }
 
     @Test
     public void testFetchStdoutWithTimeout() {
         WaitingConsumer consumer = new WaitingConsumer();
 
-        container.followOutput(consumer, STDOUT);
-
-        assertThrows("a TimeoutException should be thrown", TimeoutException.class, () -> {
-            consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("qqq"), 1, TimeUnit.SECONDS);
-            return true;
-        });
+        container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
+
+        assertThrows(
+            "a TimeoutException should be thrown",
+            TimeoutException.class,
+            () -> {
+                consumer.waitUntil(
+                    frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("qqq"),
+                    1,
+                    TimeUnit.SECONDS
+                );
+                return true;
+            }
+        );
     }
 
     @Test
     public void testFetchStdoutWithNoLimit() throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
 
-        container.followOutput(consumer, STDOUT);
+        container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
-        consumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("home"));
+        consumer.waitUntil(frame -> {
+            return frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("home");
+        });
     }
 
     @Test
@@ -71,7 +84,9 @@ public void testLogConsumer() throws TimeoutException {
         Consumer<OutputFrame> composedConsumer = logConsumer.andThen(waitingConsumer);
         container.followOutput(composedConsumer);
 
-        waitingConsumer.waitUntil(frame -> frame.getType() == STDOUT && frame.getUtf8String().contains("home"));
+        waitingConsumer.waitUntil(frame -> {
+            return frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("home");
+        });
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
index 969d2836b2e..62eccc2000c 100644
--- a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
@@ -22,22 +22,27 @@ public class ParameterizedDockerfileContainerTest {
     public GenericContainer container;
 
     public ParameterizedDockerfileContainerTest(String baseImage, String expectedVersion) {
-        container = new GenericContainer(new ImageFromDockerfile().withDockerfileFromBuilder(builder -> {
-                builder
-                        .from(baseImage)
-                        // Could potentially customise the image here, e.g. adding files, running
-                        //  commands, etc.
-                        .build();
-            })).withCommand("top");
+        container =
+            new GenericContainer(
+                new ImageFromDockerfile()
+                    .withDockerfileFromBuilder(builder -> {
+                        builder
+                            .from(baseImage)
+                            // Could potentially customise the image here, e.g. adding files, running
+                            //  commands, etc.
+                            .build();
+                    })
+            )
+                .withCommand("top");
         this.expectedVersion = expectedVersion;
     }
 
     @Parameterized.Parameters(name = "{0}")
     public static Object[][] data() {
-        return new Object[][] {
-                { "alpine:3.12", "3.12"},
-                { "alpine:3.13", "3.13"},
-                { "alpine:3.14", "3.14"}
+        return new Object[][] { //
+            { "alpine:3.12", "3.12" },
+            { "alpine:3.13", "3.13" },
+            { "alpine:3.14", "3.14" },
         };
     }
 
@@ -45,7 +50,6 @@ public static Object[][] data() {
     public void simpleTest() throws Exception {
         final String release = container.execInContainer("cat", "/etc/alpine-release").getStdout();
 
-        assertTrue("/etc/alpine-release starts with " + expectedVersion,
-                release.startsWith(expectedVersion));
+        assertTrue("/etc/alpine-release starts with " + expectedVersion, release.startsWith(expectedVersion));
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
index b23ddf2ca1c..0be4022c171 100644
--- a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
+++ b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
@@ -2,11 +2,11 @@
 
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.ALPINE_IMAGE;
 
 /**
  * Created by rnorth on 26/07/2016.
@@ -14,10 +14,10 @@
 public class WorkingDirectoryTest {
 
     @ClassRule
-    public static GenericContainer container = new GenericContainer(ALPINE_IMAGE)
-            .withWorkingDirectory("/etc")
-            .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
-            .withCommand("ls", "-al");
+    public static GenericContainer container = new GenericContainer(TestImages.ALPINE_IMAGE)
+        .withWorkingDirectory("/etc")
+        .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        .withCommand("ls", "-al");
 
     @Test
     public void checkOutput() {
@@ -27,5 +27,4 @@ public void checkOutput() {
         assertTrue("Directory listing contains expected /etc content", listing.contains("init.d"));
         assertTrue("Directory listing contains expected /etc content", listing.contains("passwd"));
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
index 480536a54ef..de16eb0e582 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
@@ -20,6 +20,7 @@
  * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
  */
 public abstract class AbstractWaitStrategyTest<W extends WaitStrategy> {
+
     static final long WAIT_TIMEOUT_MILLIS = 3000;
 
     /**
@@ -65,12 +66,16 @@ protected GenericContainer<?> startContainerWithCommand(String shellCommand, Wai
         return startContainerWithCommand(shellCommand, waitStrategy, 8080);
     }
 
-    protected GenericContainer<?> startContainerWithCommand(String shellCommand, WaitStrategy waitStrategy, Integer... ports) {
+    protected GenericContainer<?> startContainerWithCommand(
+        String shellCommand,
+        WaitStrategy waitStrategy,
+        Integer... ports
+    ) {
         // apply WaitStrategy to container
         return new GenericContainer<>(TestImages.ALPINE_IMAGE)
-                .withExposedPorts(ports)
-                .withCommand("sh", "-c", shellCommand)
-                .waitingFor(waitStrategy.withStartupTimeout(Duration.ofMillis(WAIT_TIMEOUT_MILLIS)));
+            .withExposedPorts(ports)
+            .withCommand("sh", "-c", shellCommand)
+            .waitingFor(waitStrategy.withStartupTimeout(Duration.ofMillis(WAIT_TIMEOUT_MILLIS)));
     }
 
     /**
@@ -100,10 +105,11 @@ protected void waitUntilReadyAndTimeout(String shellCommand) {
      */
     protected void waitUntilReadyAndTimeout(GenericContainer<?> container) {
         // start() blocks until successful or timeout
-        VisibleAssertions.assertThrows("an exception is thrown when timeout occurs (" + WAIT_TIMEOUT_MILLIS + "ms)",
-                ContainerLaunchException.class,
-                container::start);
-
+        VisibleAssertions.assertThrows(
+            "an exception is thrown when timeout occurs (" + WAIT_TIMEOUT_MILLIS + "ms)",
+            ContainerLaunchException.class,
+            container::start
+        );
     }
 
     /**
@@ -115,7 +121,9 @@ protected void waitUntilReadyAndSucceed(GenericContainer<?> container) {
         // start() blocks until successful or timeout
         container.start();
 
-        assertTrue(String.format("Expected container to be ready after timeout of %sms",
-            WAIT_TIMEOUT_MILLIS), ready.get());
+        assertTrue(
+            String.format("Expected container to be ready after timeout of %sms", WAIT_TIMEOUT_MILLIS),
+            ready.get()
+        );
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
index 5c7d37a7da3..4b5f43a4d4b 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
@@ -17,7 +17,8 @@
 public class HostPortWaitStrategyTest {
 
     @ClassRule
-    public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE).withExposedPorts()
+    public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        .withExposedPorts()
         .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
         .withExposedPorts(8080)
         .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)));
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index 82207b4537e..7014749115e 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -1,9 +1,5 @@
 package org.testcontainers.junit.wait.strategy;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
-
-import java.util.HashMap;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
@@ -11,15 +7,20 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 
 import java.time.Duration;
+import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
+
 /**
  * Tests for {@link HttpWaitStrategy}.
  *
  * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
  */
 public class HttpWaitStrategyTest extends AbstractWaitStrategyTest<HttpWaitStrategy> {
+
     /**
      * newline sequence indicating end of the HTTP header.
      */
@@ -44,10 +45,9 @@ public void testWaitUntilReadyWithSuccess() {
     public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
         HashMap<String, String> headers = new HashMap<>();
         headers.put("baz", "boo");
-        GenericContainer container = startContainerWithCommand(createShellCommand("200 OK", GOOD_RESPONSE_BODY),
-            createHttpWaitStrategy(ready)
-                .withHeader("foo", "bar")
-                .withHeaders(headers)
+        GenericContainer container = startContainerWithCommand(
+            createShellCommand("200 OK", GOOD_RESPONSE_BODY),
+            createHttpWaitStrategy(ready).withHeader("foo", "bar").withHeaders(headers)
         );
         waitUntilReadyAndSucceed(container);
 
@@ -58,14 +58,17 @@ public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
     }
 
     /**
-     * Ensures that HTTPS requests made with the HttpWaitStrategy can skip the 
-     * certificate validation chains (to support self-signed certificates for example). 
+     * Ensures that HTTPS requests made with the HttpWaitStrategy can skip the
+     * certificate validation chains (to support self-signed certificates for example).
      */
     @Test
     public void testWaitUntilReadyWithTlsAndAllowUnsecure() {
-        waitUntilReadyAndSucceed(startContainerWithCommand(createHttpsShellCommand("200 OK", GOOD_RESPONSE_BODY, 8080),
-            createHttpWaitStrategy(ready).usingTls().allowInsecure()
-        ));
+        waitUntilReadyAndSucceed(
+            startContainerWithCommand(
+                createHttpsShellCommand("200 OK", GOOD_RESPONSE_BODY, 8080),
+                createHttpWaitStrategy(ready).usingTls().allowInsecure()
+            )
+        );
     }
 
     /**
@@ -74,10 +77,12 @@ public void testWaitUntilReadyWithTlsAndAllowUnsecure() {
      */
     @Test
     public void testWaitUntilReadyWithUnauthorizedWithLambda() {
-        waitUntilReadyAndSucceed(startContainerWithCommand(createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
-            createHttpWaitStrategy(ready)
-                .forStatusCodeMatching(it -> it >= 200 && it < 300 || it == 401)
-        ));
+        waitUntilReadyAndSucceed(
+            startContainerWithCommand(
+                createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
+                createHttpWaitStrategy(ready).forStatusCodeMatching(it -> it >= 200 && it < 300 || it == 401)
+            )
+        );
     }
 
     /**
@@ -86,12 +91,12 @@ public void testWaitUntilReadyWithUnauthorizedWithLambda() {
      */
     @Test
     public void testWaitUntilReadyWithManyStatusCodes() {
-        waitUntilReadyAndSucceed(startContainerWithCommand(createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
-            createHttpWaitStrategy(ready)
-                .forStatusCode(300)
-                .forStatusCode(401)
-                .forStatusCode(500)
-        ));
+        waitUntilReadyAndSucceed(
+            startContainerWithCommand(
+                createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
+                createHttpWaitStrategy(ready).forStatusCode(300).forStatusCode(401).forStatusCode(500)
+            )
+        );
     }
 
     /**
@@ -101,12 +106,15 @@ public void testWaitUntilReadyWithManyStatusCodes() {
      */
     @Test
     public void testWaitUntilReadyWithManyStatusCodesAndLambda() {
-        waitUntilReadyAndSucceed(startContainerWithCommand(createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
-            createHttpWaitStrategy(ready)
-                .forStatusCode(300)
-                .forStatusCode(500)
-                .forStatusCodeMatching(it -> it == 401)
-        ));
+        waitUntilReadyAndSucceed(
+            startContainerWithCommand(
+                createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
+                createHttpWaitStrategy(ready)
+                    .forStatusCode(300)
+                    .forStatusCode(500)
+                    .forStatusCodeMatching(it -> it == 401)
+            )
+        );
     }
 
     /**
@@ -116,11 +124,12 @@ public void testWaitUntilReadyWithManyStatusCodesAndLambda() {
      */
     @Test
     public void testWaitUntilReadyWithTimeoutAndWithManyStatusCodesAndLambda() {
-        waitUntilReadyAndTimeout(startContainerWithCommand(createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
-            createHttpWaitStrategy(ready)
-                .forStatusCode(300)
-                .forStatusCodeMatching(it -> it == 500)
-        ));
+        waitUntilReadyAndTimeout(
+            startContainerWithCommand(
+                createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
+                createHttpWaitStrategy(ready).forStatusCode(300).forStatusCodeMatching(it -> it == 500)
+            )
+        );
     }
 
     /**
@@ -132,10 +141,12 @@ public void testWaitUntilReadyWithTimeoutAndWithManyStatusCodesAndLambda() {
      */
     @Test
     public void testWaitUntilReadyWithTimeoutAndWithLambdaShouldNotMatchOk() {
-        waitUntilReadyAndTimeout(startContainerWithCommand(createShellCommand("200 OK", GOOD_RESPONSE_BODY),
-            createHttpWaitStrategy(ready)
-                .forStatusCodeMatching(it -> it >= 300)
-        ));
+        waitUntilReadyAndTimeout(
+            startContainerWithCommand(
+                createShellCommand("200 OK", GOOD_RESPONSE_BODY),
+                createHttpWaitStrategy(ready).forStatusCodeMatching(it -> it >= 300)
+            )
+        );
     }
 
     /**
@@ -156,27 +167,31 @@ public void testWaitUntilReadyWithTimeoutAndBadResponseBody() {
         waitUntilReadyAndTimeout(createShellCommand("200 OK", "Bad Response"));
     }
 
-
     /**
      * Expects the WaitStrategy probing the right port.
      */
     @Test
     public void testWaitUntilReadyWithSpecificPort() {
-        waitUntilReadyAndSucceed(startContainerWithCommand(
-            createShellCommand("200 OK", GOOD_RESPONSE_BODY, 9090),
-            createHttpWaitStrategy(ready)
-                .forPort(9090),
-            7070, 8080, 9090
-        ));
+        waitUntilReadyAndSucceed(
+            startContainerWithCommand(
+                createShellCommand("200 OK", GOOD_RESPONSE_BODY, 9090),
+                createHttpWaitStrategy(ready).forPort(9090),
+                7070,
+                8080,
+                9090
+            )
+        );
     }
 
     @Test
     public void testWaitUntilReadyWithTimoutCausedByReadTimeout() {
         waitUntilReadyAndTimeout(
-            startContainerWithCommand(createShellCommand("0 Connection Refused", GOOD_RESPONSE_BODY, 9090),
+            startContainerWithCommand(
+                createShellCommand("0 Connection Refused", GOOD_RESPONSE_BODY, 9090),
                 createHttpWaitStrategy(ready).forPort(9090).withReadTimeout(Duration.ofMillis(1)),
                 9090
-            ));
+            )
+        );
     }
 
     /**
@@ -185,8 +200,7 @@ public void testWaitUntilReadyWithTimoutCausedByReadTimeout() {
      */
     @NotNull
     protected HttpWaitStrategy buildWaitStrategy(final AtomicBoolean ready) {
-        return createHttpWaitStrategy(ready)
-            .forResponsePredicate(s -> s.equals(GOOD_RESPONSE_BODY));
+        return createHttpWaitStrategy(ready).forResponsePredicate(s -> s.equals(GOOD_RESPONSE_BODY));
     }
 
     /**
@@ -212,17 +226,41 @@ private String createShellCommand(String header, String responseBody) {
 
     private String createShellCommand(String header, String responseBody, int port) {
         int length = responseBody.getBytes().length;
-        return "while true; do { echo -e \"HTTP/1.1 " + header + NEWLINE +
-            "Content-Type: text/html" + NEWLINE +
-            "Content-Length: " + length + NEWLINE + "\";"
-            + " echo \"" + responseBody + "\";} | nc -lp " + port + "; done";
+        return (
+            "while true; do { echo -e \"HTTP/1.1 " +
+            header +
+            NEWLINE +
+            "Content-Type: text/html" +
+            NEWLINE +
+            "Content-Length: " +
+            length +
+            NEWLINE +
+            "\";" +
+            " echo \"" +
+            responseBody +
+            "\";} | nc -lp " +
+            port +
+            "; done"
+        );
     }
-    
+
     private String createHttpsShellCommand(String header, String responseBody, int port) {
         int length = responseBody.getBytes().length;
-        return "apk add nmap-ncat; while true; do { echo -e \"HTTP/1.1 " + header + NEWLINE +
-            "Content-Type: text/html" + NEWLINE +
-            "Content-Length: " + length + NEWLINE + "\";"
-            + " echo \"" + responseBody + "\";} | ncat -lp " + port + " --ssl; done";
+        return (
+            "apk add nmap-ncat; while true; do { echo -e \"HTTP/1.1 " +
+            header +
+            NEWLINE +
+            "Content-Type: text/html" +
+            NEWLINE +
+            "Content-Length: " +
+            length +
+            NEWLINE +
+            "\";" +
+            " echo \"" +
+            responseBody +
+            "\";} | ncat -lp " +
+            port +
+            " --ssl; done"
+        );
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java
index a6ef9f11ba4..5dd9623107b 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java
@@ -19,9 +19,9 @@ public class LogMessageWaitStrategyTest extends AbstractWaitStrategyTest<LogMess
     @Parameterized.Parameters(name = "{0}")
     public static Object[] parameters() {
         return new String[] {
-            ".*ready.*\\s",     // previous recommended style (explicit line ending)
-            ".*ready!\\s",      // explicit line ending without wildcard after expected text
-            ".*ready.*"         // new style (line ending matched by wildcard)
+            ".*ready.*\\s", // previous recommended style (explicit line ending)
+            ".*ready!\\s", // explicit line ending without wildcard after expected text
+            ".*ready.*", // new style (line ending matched by wildcard)
         };
     }
 
@@ -33,29 +33,34 @@ public LogMessageWaitStrategyTest(String pattern) {
 
     @Test
     public void testWaitUntilReady_Success() {
-        waitUntilReadyAndSucceed("echo -e \"" + READY_MESSAGE + "\";" +
-                "echo -e \"foobar\";" +
-                "echo -e \"" + READY_MESSAGE + "\";" +
-                "sleep 300");
+        waitUntilReadyAndSucceed(
+            "echo -e \"" +
+            READY_MESSAGE +
+            "\";" +
+            "echo -e \"foobar\";" +
+            "echo -e \"" +
+            READY_MESSAGE +
+            "\";" +
+            "sleep 300"
+        );
     }
 
     @Test
     public void testWaitUntilReady_Timeout() {
-        waitUntilReadyAndTimeout("echo -e \"" + READY_MESSAGE + "\";" +
-                "echo -e \"foobar\";" +
-                "sleep 300");
+        waitUntilReadyAndTimeout("echo -e \"" + READY_MESSAGE + "\";" + "echo -e \"foobar\";" + "sleep 300");
     }
 
     @NotNull
     @Override
     protected LogMessageWaitStrategy buildWaitStrategy(AtomicBoolean ready) {
-
         return new LogMessageWaitStrategy() {
             @Override
             protected void waitUntilReady() {
                 super.waitUntilReady();
                 ready.set(true);
             }
-        }.withRegEx(pattern).withTimes(2);
+        }
+            .withRegEx(pattern)
+            .withTimes(2);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index a911675dfb3..bcf88d7be11 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -8,6 +8,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.testcontainers.DockerRegistryContainer;
+import org.testcontainers.TestImages;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.GenericContainer;
@@ -22,7 +23,6 @@
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.when;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.TestImages.DOCKER_REGISTRY_IMAGE;
 
 /**
  * This test checks the integration between Testcontainers and an authenticated registry, but uses
@@ -38,14 +38,17 @@ public class AuthenticatedImagePullTest {
      * Containerised docker image registry, with simple hardcoded credentials
      */
     @ClassRule
-    public static DockerRegistryContainer authenticatedRegistry = new DockerRegistryContainer(new ImageFromDockerfile()
-        .withDockerfileFromBuilder(builder -> {
-            builder.from(DOCKER_REGISTRY_IMAGE.asCanonicalNameString())
-                .run("htpasswd -Bbn testuser notasecret > /htpasswd")
-                .env("REGISTRY_AUTH", "htpasswd")
-                .env("REGISTRY_AUTH_HTPASSWD_PATH", "/htpasswd")
-                .env("REGISTRY_AUTH_HTPASSWD_REALM", "Test");
-        }));
+    public static DockerRegistryContainer authenticatedRegistry = new DockerRegistryContainer(
+        new ImageFromDockerfile()
+            .withDockerfileFromBuilder(builder -> {
+                builder
+                    .from(TestImages.DOCKER_REGISTRY_IMAGE.asCanonicalNameString())
+                    .run("htpasswd -Bbn testuser notasecret > /htpasswd")
+                    .env("REGISTRY_AUTH", "htpasswd")
+                    .env("REGISTRY_AUTH_HTPASSWD_PATH", "/htpasswd")
+                    .env("REGISTRY_AUTH_HTPASSWD_REALM", "Test");
+            })
+    );
 
     private static RegistryAuthLocator originalAuthLocatorSingleton;
 
@@ -65,7 +68,12 @@ public static void beforeClass() throws Exception {
         // Replace the RegistryAuthLocator singleton with our mock, for the duration of this test
         final RegistryAuthLocator mockAuthLocator = Mockito.mock(RegistryAuthLocator.class);
         RegistryAuthLocator.setInstance(mockAuthLocator);
-        when(mockAuthLocator.lookupAuthConfig(argThat(argument -> testRegistryAddress.equals(argument.getRegistry())), any()))
+        when(
+            mockAuthLocator.lookupAuthConfig(
+                argThat(argument -> testRegistryAddress.equals(argument.getRegistry())),
+                any()
+            )
+        )
             .thenReturn(authConfig);
     }
 
@@ -77,8 +85,10 @@ public static void tearDown() {
     @Test
     public void testThatAuthLocatorIsUsedForContainerCreation() {
         // actually start a container, which will require an authenticated pull
-        try (final GenericContainer<?> container = new GenericContainer<>(testImageName)
-            .withCommand("/bin/sh", "-c", "sleep 10")) {
+        try (
+            final GenericContainer<?> container = new GenericContainer<>(testImageName)
+                .withCommand("/bin/sh", "-c", "sleep 10")
+        ) {
             container.start();
 
             assertTrue("container started following an authenticated pull", container.isRunning());
@@ -93,11 +103,12 @@ public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
         Files.write(tempFile, dockerFileContent.getBytes());
 
         // Start a container built from a derived image, which will require an authenticated pull
-        try (final GenericContainer<?> container = new GenericContainer<>(
-            new ImageFromDockerfile()
-                .withDockerfile(tempFile)
-        )
-            .withCommand("/bin/sh", "-c", "sleep 10")) {
+        try (
+            final GenericContainer<?> container = new GenericContainer<>(
+                new ImageFromDockerfile().withDockerfile(tempFile)
+            )
+                .withCommand("/bin/sh", "-c", "sleep 10")
+        ) {
             container.start();
 
             assertTrue("container started following an authenticated pull", container.isRunning());
@@ -108,23 +119,23 @@ public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
     public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
         // Prepare a simple temporary Docker Compose manifest which requires our custom private image
         Path tempFile = getLocalTempFile(".docker-compose.yml");
-        @Language("yaml") String composeFileContent =
+        @Language("yaml")
+        String composeFileContent =
             "version: '2.0'\n" +
-                "services:\n" +
-                "  privateservice:\n" +
-                "      command: /bin/sh -c 'sleep 60'\n" +
-                "      image: " + testImageName.asCanonicalNameString();
+            "services:\n" +
+            "  privateservice:\n" +
+            "      command: /bin/sh -c 'sleep 60'\n" +
+            "      image: " +
+            testImageName.asCanonicalNameString();
         Files.write(tempFile, composeFileContent.getBytes());
 
         // Start the docker compose project, which will require an authenticated pull
         try (final DockerComposeContainer<?> compose = new DockerComposeContainer<>(tempFile.toFile())) {
             compose.start();
 
-            assertTrue("container started following an authenticated pull",
-                compose
-                    .getContainerByServiceName("privateservice_1")
-                    .map(ContainerState::isRunning)
-                    .orElse(false)
+            assertTrue(
+                "container started following an authenticated pull",
+                compose.getContainerByServiceName("privateservice_1").map(ContainerState::isRunning).orElse(false)
             );
         }
     }
diff --git a/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
index bdd71b0db9f..4ed86e3a8fa 100644
--- a/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
@@ -5,11 +5,11 @@
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import static java.util.Arrays.asList;
-import static java.util.stream.Collectors.toList;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -18,9 +18,13 @@
 public class ClasspathScannerTest {
 
     private static URL FILE_A;
+
     private static URL FILE_B;
+
     private static URL JAR_A;
+
     private static URL JAR_B;
+
     private static URL FILE_C;
 
     @BeforeClass
@@ -35,7 +39,7 @@ public static void setUp() throws Exception {
     @Test
     public void realClassLoaderLookupOccurs() {
         // look for a resource that we know exists only once
-        final List<URL> foundURLs = ClasspathScanner.scanFor("expectedClasspathFile.txt").collect(toList());
+        final List<URL> foundURLs = ClasspathScanner.scanFor("expectedClasspathFile.txt").collect(Collectors.toList());
 
         assertEquals("Exactly one resource was found", 1, foundURLs.size());
     }
@@ -43,41 +47,27 @@ public void realClassLoaderLookupOccurs() {
     @Test
     public void multipleResultsOnOneClassLoaderAreFound() throws IOException {
         final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
-        when(firstMockClassLoader.getResources(eq("someName"))).thenReturn(
-            Collections.enumeration(
-                asList(
-                    FILE_A,
-                    FILE_B
-                )
-            )
-        );
+        when(firstMockClassLoader.getResources(eq("someName")))
+            .thenReturn(Collections.enumeration(Arrays.asList(FILE_A, FILE_B)));
 
-        final List<URL> foundURLs = ClasspathScanner.scanFor("someName", firstMockClassLoader).collect(toList());
-        assertEquals(
-            "The expected URLs are found",
-            asList(FILE_A, FILE_B),
-            foundURLs
-        );
+        final List<URL> foundURLs = ClasspathScanner
+            .scanFor("someName", firstMockClassLoader)
+            .collect(Collectors.toList());
+        assertEquals("The expected URLs are found", Arrays.asList(FILE_A, FILE_B), foundURLs);
     }
 
     @Test
     public void orderIsAlphabeticalForDeterminism() throws IOException {
         final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
-        when(firstMockClassLoader.getResources(eq("someName"))).thenReturn(
-            Collections.enumeration(
-                asList(
-                    FILE_B,
-                    JAR_A,
-                    JAR_B,
-                    FILE_A
-                )
-            )
-        );
+        when(firstMockClassLoader.getResources(eq("someName")))
+            .thenReturn(Collections.enumeration(Arrays.asList(FILE_B, JAR_A, JAR_B, FILE_A)));
 
-        final List<URL> foundURLs = ClasspathScanner.scanFor("someName", firstMockClassLoader).collect(toList());
+        final List<URL> foundURLs = ClasspathScanner
+            .scanFor("someName", firstMockClassLoader)
+            .collect(Collectors.toList());
         assertEquals(
             "The expected URLs are found in the expected order",
-            asList(FILE_A, FILE_B, JAR_A, JAR_B),
+            Arrays.asList(FILE_A, FILE_B, JAR_A, JAR_B),
             foundURLs
         );
     }
@@ -85,30 +75,23 @@ public void orderIsAlphabeticalForDeterminism() throws IOException {
     @Test
     public void multipleClassLoadersAreQueried() throws IOException {
         final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
-        when(firstMockClassLoader.getResources(eq("someName"))).thenReturn(
-            Collections.enumeration(
-                asList(
-                    FILE_A,
-                    FILE_B
-                )
-            )
-        );
+        when(firstMockClassLoader.getResources(eq("someName")))
+            .thenReturn(Collections.enumeration(Arrays.asList(FILE_A, FILE_B)));
         final ClassLoader secondMockClassLoader = mock(ClassLoader.class);
-        when(secondMockClassLoader.getResources(eq("someName"))).thenReturn(
-            Collections.enumeration(
-                asList(
-                    FILE_B, // duplicate
-                    FILE_C
+        when(secondMockClassLoader.getResources(eq("someName")))
+            .thenReturn(
+                Collections.enumeration(
+                    Arrays.asList(
+                        FILE_B, // duplicate
+                        FILE_C
+                    )
                 )
-            )
-        );
+            );
 
-        final List<URL> foundURLs = ClasspathScanner.scanFor("someName", firstMockClassLoader, secondMockClassLoader).collect(toList());
+        final List<URL> foundURLs = ClasspathScanner
+            .scanFor("someName", firstMockClassLoader, secondMockClassLoader)
+            .collect(Collectors.toList());
 
-        assertEquals(
-            "The expected URLs are found",
-            asList(FILE_A, FILE_B, FILE_C),
-            foundURLs
-        );
+        assertEquals("The expected URLs are found", Arrays.asList(FILE_A, FILE_B, FILE_C), foundURLs);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java b/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
index d5a2c63a5b8..fb3c7e05c0b 100644
--- a/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
@@ -1,18 +1,19 @@
 package org.testcontainers.utility;
 
-import java.util.Arrays;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.Arrays;
+
 import static org.junit.Assert.assertArrayEquals;
 
 @RunWith(Parameterized.class)
 public class ComparableVersionTest {
 
     private final int[] expected;
+
     private final String given;
 
     public ComparableVersionTest(final String given, final int[] expected) {
@@ -27,14 +28,15 @@ public void shouldParseVersions() {
 
     @Parameters(name = "Parsed version: {0}={1}")
     public static Iterable<Object[]> data() {
-        return Arrays.asList(new Object[][] {
-            {"1.2.3", new int[] {1, 2, 3}},
-            {"", new int[0]},
-            {"1", new int[] {1}},
-            {"1.2.3.4.5.6.7", new int[] {1, 2, 3, 4, 5, 6, 7}},
-            {"1.2-dev", new int[] {1, 2}},
-            {"18.06.0-dev", new int[] {18, 6}},
-        });
+        return Arrays.asList(
+            new Object[][] {
+                { "1.2.3", new int[] { 1, 2, 3 } },
+                { "", new int[0] },
+                { "1", new int[] { 1 } },
+                { "1.2.3.4.5.6.7", new int[] { 1, 2, 3, 4, 5, 6, 7 } },
+                { "1.2-dev", new int[] { 1, 2 } },
+                { "18.06.0-dev", new int[] { 18, 6 } },
+            }
+        );
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
index a6f7813c3d3..0978003f815 100644
--- a/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
@@ -12,7 +12,9 @@
 public class DefaultImageNameSubstitutorTest {
 
     public static final DockerImageName ORIGINAL_IMAGE = DockerImageName.parse("foo");
+
     public static final DockerImageName SUBSTITUTE_IMAGE = DockerImageName.parse("bar");
+
     private ConfigurationFileImageNameSubstitutor underTest;
 
     @Rule
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
index f439c55c3ea..cbd35a62b52 100644
--- a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -11,8 +11,8 @@
 import java.io.File;
 import java.util.Arrays;
 
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
@@ -24,41 +24,51 @@ public void simpleRecursiveFileTest() {
         File directory = new File("src");
 
         GenericContainer container = new GenericContainer(
-                new ImageFromDockerfile()
-                        .withDockerfileFromBuilder(builder ->
-                                builder.from("alpine:3.14")
-                                        .copy("/tmp/foo", "/foo")
-                                        .cmd("cat /foo/test/resources/test-recursive-file.txt")
-                                        .build()
-                        ).withFileFromFile("/tmp/foo", directory))
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            new ImageFromDockerfile()
+                .withDockerfileFromBuilder(builder -> {
+                    builder
+                        .from("alpine:3.14")
+                        .copy("/tmp/foo", "/foo")
+                        .cmd("cat /foo/test/resources/test-recursive-file.txt")
+                        .build();
+                })
+                .withFileFromFile("/tmp/foo", directory)
+        )
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
 
         container.start();
 
         final String results = container.getLogs();
 
-        assertTrue("The container has a file that was copied in via a recursive copy", results.contains("Used for DirectoryTarResourceTest"));
+        assertTrue(
+            "The container has a file that was copied in via a recursive copy",
+            results.contains("Used for DirectoryTarResourceTest")
+        );
     }
 
     @Test
     public void simpleRecursiveFileWithPermissionTest() {
         GenericContainer container = new GenericContainer(
-                new ImageFromDockerfile()
-                        .withDockerfileFromBuilder(builder ->
-                                builder.from("alpine:3.14")
-                                        .copy("/tmp/foo", "/foo")
-                                        .cmd("ls", "-al", "/")
-                                        .build()
-                        ).withFileFromFile("/tmp/foo", new File("/mappable-resource/test-resource.txt"),
-                        0754))
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            new ImageFromDockerfile()
+                .withDockerfileFromBuilder(builder -> {
+                    builder
+                        .from("alpine:3.14") //
+                        .copy("/tmp/foo", "/foo")
+                        .cmd("ls", "-al", "/")
+                        .build();
+                })
+                .withFileFromFile("/tmp/foo", new File("/mappable-resource/test-resource.txt"), 0754)
+        )
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
 
         container.start();
         String listing = container.getLogs();
 
-        assertThat("Listing shows that file is copied with mode requested.",
-                Arrays.asList(listing.split("\\n")),
-                exactlyNItems(1, allOf(containsString("-rwxr-xr--"), containsString("foo"))));
+        assertThat(
+            "Listing shows that file is copied with mode requested.",
+            Arrays.asList(listing.split("\\n")),
+            exactlyNItems(1, allOf(containsString("-rwxr-xr--"), containsString("foo")))
+        );
     }
 
     @Test
@@ -66,21 +76,27 @@ public void simpleRecursiveClasspathResourceTest() {
         // This test combines the copying of classpath resources from JAR files with the recursive TAR approach, to allow JARed classpath resources to be copied in to an image
 
         GenericContainer container = new GenericContainer(
-                new ImageFromDockerfile()
-                        .withDockerfileFromBuilder(builder ->
-                                builder.from("alpine:3.14")
-                                        .copy("/tmp/foo", "/foo")
-                                        .cmd("ls -lRt /foo")
-                                        .build()
-                        ).withFileFromClasspath("/tmp/foo", "/recursive/dir"))          // here we use /org/junit as a directory that really should exist on the classpath
-                .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            new ImageFromDockerfile()
+                .withDockerfileFromBuilder(builder -> {
+                    builder
+                        .from("alpine:3.14") //
+                        .copy("/tmp/foo", "/foo")
+                        .cmd("ls -lRt /foo")
+                        .build();
+                })
+                .withFileFromClasspath("/tmp/foo", "/recursive/dir")
+        ) // here we use /org/junit as a directory that really should exist on the classpath
+            .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
 
         container.start();
 
         final String results = container.getLogs();
 
         // ExternalResource.class is known to exist in a subdirectory of /org/junit so should be successfully copied in
-        assertTrue("The container has a file that was copied in via a recursive copy from a JAR resource", results.contains("content.txt"));
+        assertTrue(
+            "The container has a file that was copied in via a recursive copy from a JAR resource",
+            results.contains("content.txt")
+        );
     }
 
     public static <T> Matcher<Iterable<? super T>> exactlyNItems(final int n, Matcher<? super T> elementMatcher) {
@@ -91,7 +107,6 @@ protected boolean matchesSafely(Iterable<? super T> collection, Description mism
                 boolean isPastFirst = false;
 
                 for (Object item : collection) {
-
                     if (elementMatcher.matches(item)) {
                         count++;
                     }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index 22d67de5785..f2ca26b8947 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -1,13 +1,12 @@
 package org.testcontainers.utility;
 
-import static org.hamcrest.core.StringContains.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class DockerImageNameCompatibilityTest {
 
@@ -20,6 +19,7 @@ public void testPlainImage() {
 
         assertFalse("image name foo != bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
     }
+
     @Test
     public void testNoTagTreatedAsWildcard() {
         final DockerImageName subject = DockerImageName.parse("foo:4.5.6");
@@ -59,7 +59,10 @@ public void testImageWithClaimedCompatibilityAndVersion() {
     public void testImageWithClaimedCompatibilityForFullPath() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("registry/repo/bar");
 
-        assertTrue("foo(registry/repo/bar) ~= registry/repo/bar", subject.isCompatibleWith(DockerImageName.parse("registry/repo/bar")));
+        assertTrue(
+            "foo(registry/repo/bar) ~= registry/repo/bar",
+            subject.isCompatibleWith(DockerImageName.parse("registry/repo/bar"))
+        );
         assertFalse("foo(registry/repo/bar) != repo/bar", subject.isCompatibleWith(DockerImageName.parse("repo/bar")));
         assertFalse("foo(registry/repo/bar) != bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
     }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index e06407fbf56..98fd21064ed 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -16,7 +16,7 @@ public static class ValidNames {
 
         @Parameterized.Parameters(name = "{0}")
         public static String[] getNames() {
-            return new String[]{
+            return new String[] {
                 "myname:latest",
                 "repo/my-name:1.0",
                 "registry.foo.com:1234/my-name:1.0",
@@ -27,7 +27,8 @@ public static String[] getNames() {
                 "1.2.3.4/my-name:1.0",
                 "1.2.3.4:1234/my-name:1.0",
                 "1.2.3.4/repo-here/my-name:1.0",
-                "1.2.3.4:1234/repo-here/my-name:1.0"};
+                "1.2.3.4:1234/repo-here/my-name:1.0",
+            };
         }
 
         @Parameterized.Parameter
@@ -44,11 +45,13 @@ public static class InvalidNames {
 
         @Parameterized.Parameters(name = "{0}")
         public static String[] getNames() {
-            return new String[]{":latest",
+            return new String[] {
+                ":latest",
                 "/myname:latest",
                 "/myname@sha256:latest",
                 "/myname@sha256:gggggggggggggggggggggggggggggggg",
-                "repo:notaport/myname:latest"};
+                "repo:notaport/myname:latest",
+            };
         }
 
         @Parameterized.Parameter
@@ -65,39 +68,43 @@ public static class Parsing {
 
         @Parameterized.Parameters(name = "{0}{1}{2}{3}{4}")
         public static String[][] getNames() {
-            return new String[][]{
-                {"", "", "myname", ":", null},
-                {"", "", "myname", ":", "latest"},
-                {"", "", "repo/myname", ":", null},
-                {"", "", "repo/myname", ":", "latest"},
-                {"registry.foo.com:1234", "/", "my-name", ":", null},
-                {"registry.foo.com:1234", "/", "my-name", ":", "1.0"},
-                {"registry.foo.com", "/", "my-name", ":", "1.0"},
-                {"registry.foo.com:1234", "/", "repo_here/my-name", ":", null},
-                {"registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"},
-                {"1.2.3.4:1234", "/", "repo_here/my-name", ":", null},
-                {"1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"},
-                {"1.2.3.4:1234", "/", "my-name", ":", null},
-                {"1.2.3.4:1234", "/", "my-name", ":", "1.0"},
-                {"", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
-                {"", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
-                {"registry.foo.com:1234", "/", "repo-here/my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
-                {"registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
-                {"1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
-                {"1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
-                {"1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"},
-                {"1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"}
+            return new String[][] {
+                { "", "", "myname", ":", null },
+                { "", "", "myname", ":", "latest" },
+                { "", "", "repo/myname", ":", null },
+                { "", "", "repo/myname", ":", "latest" },
+                { "registry.foo.com:1234", "/", "my-name", ":", null },
+                { "registry.foo.com:1234", "/", "my-name", ":", "1.0" },
+                { "registry.foo.com", "/", "my-name", ":", "1.0" },
+                { "registry.foo.com:1234", "/", "repo_here/my-name", ":", null },
+                { "registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0" },
+                { "1.2.3.4:1234", "/", "repo_here/my-name", ":", null },
+                { "1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0" },
+                { "1.2.3.4:1234", "/", "my-name", ":", null },
+                { "1.2.3.4:1234", "/", "my-name", ":", "1.0" },
+                { "", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
+                { "", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
+                { "registry.foo.com:1234", "/", "repo-here/my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
+                { "registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
+                { "1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
+                { "1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
+                { "1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
+                { "1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
             };
         }
 
         @Parameterized.Parameter(0)
         public String registry;
+
         @Parameterized.Parameter(1)
         public String registrySeparator;
+
         @Parameterized.Parameter(2)
         public String repo;
+
         @Parameterized.Parameter(3)
         public String versionSeparator;
+
         @Parameterized.Parameter(4)
         public String version;
 
@@ -120,21 +127,45 @@ public void testParsing() {
 
             final DockerImageName imageName = DockerImageName.parse(combined);
             assertEquals(combined + " has registry address: " + registry, registry, imageName.getRegistry());
-            assertEquals(combined + " has unversioned part: " + unversionedPart, unversionedPart, imageName.getUnversionedPart());
+            assertEquals(
+                combined + " has unversioned part: " + unversionedPart,
+                unversionedPart,
+                imageName.getUnversionedPart()
+            );
             if (version != null) {
                 assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
             } else {
-                assertEquals(combined + " has automatic 'latest' version specified", "latest", imageName.getVersionPart());
+                assertEquals(
+                    combined + " has automatic 'latest' version specified",
+                    "latest",
+                    imageName.getVersionPart()
+                );
             }
-            assertEquals(combined + " has canonical name: " + canonicalName, canonicalName, imageName.asCanonicalNameString());
+            assertEquals(
+                combined + " has canonical name: " + canonicalName,
+                canonicalName,
+                imageName.asCanonicalNameString()
+            );
 
             if (version != null) {
                 VisibleAssertions.context("Using two-arg constructor:", 2);
 
                 final DockerImageName imageNameFromSecondaryConstructor = new DockerImageName(unversionedPart, version);
-                assertEquals(combined + " has registry address: " + registry, registry, imageNameFromSecondaryConstructor.getRegistry());
-                assertEquals(combined + " has unversioned part: " + unversionedPart, unversionedPart, imageNameFromSecondaryConstructor.getUnversionedPart());
-                assertEquals(combined + " has version part: " + version, version, imageNameFromSecondaryConstructor.getVersionPart());
+                assertEquals(
+                    combined + " has registry address: " + registry,
+                    registry,
+                    imageNameFromSecondaryConstructor.getRegistry()
+                );
+                assertEquals(
+                    combined + " has unversioned part: " + unversionedPart,
+                    unversionedPart,
+                    imageNameFromSecondaryConstructor.getUnversionedPart()
+                );
+                assertEquals(
+                    combined + " has version part: " + version,
+                    version,
+                    imageNameFromSecondaryConstructor.getVersionPart()
+                );
             }
         }
     }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
index 1ef8e136a32..36196aaf4c1 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
@@ -8,7 +8,7 @@
 
 import java.time.Duration;
 import java.time.Instant;
-import 	java.time.ZoneId;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
 import static org.junit.Assert.assertFalse;
@@ -18,8 +18,9 @@
 /**
  *
  */
- @RunWith(Parameterized.class)
+@RunWith(Parameterized.class)
 public class DockerStatusTest {
+
     private final DateTimeFormatter dateTimeFormatter;
 
     private static final Instant now = Instant.now();
@@ -55,8 +56,8 @@ public DockerStatusTest(DateTimeFormatter dateTimeFormatter) {
     @Parameterized.Parameters
     public static Object[][] parameters() {
         return new Object[][] {
-            { DateTimeFormatter.ISO_INSTANT},
-            { DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("America/New_York")) }
+            { DateTimeFormatter.ISO_INSTANT },
+            { DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("America/New_York")) },
         };
     }
 
@@ -88,9 +89,12 @@ private String buildTimestamp(Instant instant) {
 
     // ContainerState is a non-static inner class, with private member variables, in a different package.
     // It's simpler to mock it that to try to create one.
-    private static InspectContainerResponse.ContainerState buildState(boolean running, boolean paused,
-                                                                      String startedAt, String finishedAt) {
-
+    private static InspectContainerResponse.ContainerState buildState(
+        boolean running,
+        boolean paused,
+        String startedAt,
+        String finishedAt
+    ) {
         InspectContainerResponse.ContainerState state = Mockito.mock(InspectContainerResponse.ContainerState.class);
         when(state.getRunning()).thenReturn(running);
         when(state.getPaused()).thenReturn(paused);
diff --git a/core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java b/core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java
index f74a6c942b3..50681ddc729 100644
--- a/core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java
+++ b/core/src/test/java/org/testcontainers/utility/FakeImageSubstitutor.java
@@ -1,6 +1,7 @@
 package org.testcontainers.utility;
 
 public class FakeImageSubstitutor extends ImageNameSubstitutor {
+
     @Override
     public DockerImageName apply(final DockerImageName original) {
         return DockerImageName.parse("transformed-" + original.asCanonicalNameString());
diff --git a/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java b/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
index 49bc870e8d0..30367975d1e 100644
--- a/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
+++ b/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
@@ -9,22 +9,27 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.AbstractMap.SimpleEntry;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class FilterRegistryTest {
 
-    private static final List<Entry<String, String>> FILTERS = asList(
-        new SimpleEntry<>("key1!", "value2?"), new SimpleEntry<>("key2#", "value2%")
+    private static final List<Entry<String, String>> FILTERS = Arrays.asList(
+        new SimpleEntry<>("key1!", "value2?"),
+        new SimpleEntry<>("key2#", "value2%")
     );
+
     private static final String URL_ENCODED_FILTERS = "key1%21=value2%3F&key2%23=value2%25";
+
     private static final byte[] ACKNOWLEDGEMENT = FilterRegistry.ACKNOWLEDGMENT.getBytes();
+
     private static final byte[] NO_ACKNOWLEDGEMENT = "".getBytes();
+
     private static final String NEW_LINE = "\n";
 
     @Test
@@ -66,5 +71,4 @@ private static InputStream anyInputStream() {
     private static OutputStream anyOutputStream() {
         return new ByteArrayOutputStream();
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
index 97ee0213f21..f7e319a5948 100644
--- a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
@@ -13,7 +13,9 @@ public class ImageNameSubstitutorTest {
 
     @Rule
     public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
+
     private ImageNameSubstitutor originalInstance;
+
     private ImageNameSubstitutor originalDefaultImplementation;
 
     @Before
@@ -27,10 +29,7 @@ public void setUp() throws Exception {
             .doReturn(DockerImageName.parse("substituted-image"))
             .when(ImageNameSubstitutor.defaultImplementation)
             .apply(eq(DockerImageName.parse("original")));
-        Mockito
-            .doReturn("default implementation")
-            .when(ImageNameSubstitutor.defaultImplementation)
-            .getDescription();
+        Mockito.doReturn("default implementation").when(ImageNameSubstitutor.defaultImplementation).getDescription();
     }
 
     @After
@@ -58,10 +57,7 @@ public void simpleConfigurationTest() {
 
     @Test
     public void testWorksWithoutConfiguredImplementation() {
-        Mockito
-            .doReturn(null)
-            .when(TestcontainersConfiguration.getInstance())
-            .getImageSubstitutorClassName();
+        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getImageSubstitutorClassName();
 
         final ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
 
diff --git a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
index 81805106806..99443221805 100644
--- a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
+++ b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
@@ -8,9 +8,9 @@
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static java.util.stream.Collectors.toList;
 import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 public class LazyFutureTest {
@@ -64,9 +64,14 @@ protected Integer resolve() {
             }
         };
 
-        Future<List<Integer>> task = new ForkJoinPool(numOfThreads).submit(() -> {
-            return IntStream.rangeClosed(1, numOfThreads).parallel().mapToObj(i -> Futures.getUnchecked(lazyFuture)).collect(toList());
-        });
+        Future<List<Integer>> task = new ForkJoinPool(numOfThreads)
+            .submit(() -> {
+                return IntStream
+                    .rangeClosed(1, numOfThreads)
+                    .parallel()
+                    .mapToObj(i -> Futures.getUnchecked(lazyFuture))
+                    .collect(Collectors.toList());
+            });
 
         while (latch.getCount() > 0) {
             latch.countDown();
@@ -74,5 +79,4 @@ protected Integer resolve() {
 
         assertEquals("All threads receives the same result", Collections.nCopies(numOfThreads, 1), task.get());
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/testcontainers/utility/MountableFileTest.java b/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
index c7dcaad2908..d3ff085c5de 100644
--- a/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
+++ b/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
@@ -20,7 +20,9 @@
 public class MountableFileTest {
 
     private static final int TEST_FILE_MODE = 0532;
+
     private static final int BASE_FILE_MODE = 0100000;
+
     private static final int BASE_DIR_MODE = 0040000;
 
     @Test
@@ -67,7 +69,10 @@ public void forHostPathWithSpaces() throws Exception {
         performChecks(mountableFile);
 
         assertTrue("The resolved path contains the original space", mountableFile.getResolvedPath().contains(" "));
-        assertFalse("The resolved path does not contain an escaped space", mountableFile.getResolvedPath().contains("\\ "));
+        assertFalse(
+            "The resolved path does not contain an escaped space",
+            mountableFile.getResolvedPath().contains("\\ ")
+        );
     }
 
     @Test
@@ -78,13 +83,18 @@ public void forHostPathWithPlus() throws Exception {
         performChecks(mountableFile);
 
         assertTrue("The resolved path contains the original space", mountableFile.getResolvedPath().contains("+"));
-        assertFalse("The resolved path does not contain an escaped space", mountableFile.getResolvedPath().contains(" "));
+        assertFalse(
+            "The resolved path does not contain an escaped space",
+            mountableFile.getResolvedPath().contains(" ")
+        );
     }
 
     @Test
     public void forClasspathResourceWithPermission() throws Exception {
-        final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/test-resource.txt",
-            TEST_FILE_MODE);
+        final MountableFile mountableFile = MountableFile.forClasspathResource(
+            "mappable-resource/test-resource.txt",
+            TEST_FILE_MODE
+        );
 
         performChecks(mountableFile);
         assertEquals("Valid file mode.", BASE_FILE_MODE | TEST_FILE_MODE, mountableFile.getFileMode());
@@ -110,7 +120,8 @@ public void forHostDirPathWithPermission() throws Exception {
     public void noTrailingSlashesInTarEntryNames() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/test-resource.txt");
 
-        @Cleanup final TarArchiveInputStream tais = intoTarArchive((taos) -> {
+        @Cleanup
+        final TarArchiveInputStream tais = intoTarArchive(taos -> {
             mountableFile.transferTo(taos, "/some/path.txt");
             mountableFile.transferTo(taos, "/path.txt");
             mountableFile.transferTo(taos, "path.txt");
@@ -123,8 +134,10 @@ public void noTrailingSlashesInTarEntryNames() throws Exception {
     }
 
     private TarArchiveInputStream intoTarArchive(Consumer<TarArchiveOutputStream> consumer) throws IOException {
-        @Cleanup final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        @Cleanup final TarArchiveOutputStream taos = new TarArchiveOutputStream(baos);
+        @Cleanup
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        @Cleanup
+        final TarArchiveOutputStream taos = new TarArchiveOutputStream(baos);
         consumer.accept(taos);
         taos.close();
 
@@ -151,7 +164,9 @@ private Path createTempDir() throws IOException {
     private void performChecks(final MountableFile mountableFile) {
         final String mountablePath = mountableFile.getResolvedPath();
         assertTrue("The filesystem path '" + mountablePath + "' can be found", new File(mountablePath).exists());
-        assertFalse("The filesystem path '" + mountablePath + "' does not contain any URL escaping", mountablePath.contains("%20"));
+        assertFalse(
+            "The filesystem path '" + mountablePath + "' does not contain any URL escaping",
+            mountablePath.contains("%20")
+        );
     }
-
 }
diff --git a/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
index d2c33989deb..211f8e00536 100644
--- a/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
@@ -8,11 +8,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.utility.PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY;
 
 public class PrefixingImageNameSubstitutorTest {
 
     private TestcontainersConfiguration mockConfiguration;
+
     private PrefixingImageNameSubstitutor underTest;
 
     @Before
@@ -23,7 +23,8 @@ public void setUp() {
 
     @Test
     public void testHappyPath() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com/our-mirror/");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
@@ -36,33 +37,28 @@ public void testHappyPath() {
 
     @Test
     public void hubIoRegistryIsNotChanged() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com/our-mirror/");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("docker.io/some/image:tag"));
 
-        assertEquals(
-            "The prefix is applied",
-            "docker.io/some/image:tag",
-            result.asCanonicalNameString()
-        );
+        assertEquals("The prefix is applied", "docker.io/some/image:tag", result.asCanonicalNameString());
     }
 
     @Test
     public void hubComRegistryIsNotChanged() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com/our-mirror/");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("registry.hub.docker.com/some/image:tag"));
 
-        assertEquals(
-            "The prefix is applied",
-            "registry.hub.docker.com/some/image:tag",
-            result.asCanonicalNameString()
-        );
+        assertEquals("The prefix is applied", "registry.hub.docker.com/some/image:tag", result.asCanonicalNameString());
     }
 
     @Test
     public void thirdPartyRegistriesNotAffected() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com/our-mirror/");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("gcr.io/something/image:tag"));
 
@@ -75,7 +71,8 @@ public void thirdPartyRegistriesNotAffected() {
 
     @Test
     public void testNoDoublePrefixing() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror/");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com/our-mirror/");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("someregistry.com/some/image:tag"));
 
@@ -88,7 +85,8 @@ public void testNoDoublePrefixing() {
 
     @Test
     public void testHandlesEmptyValue() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
@@ -101,39 +99,38 @@ public void testHandlesEmptyValue() {
 
     @Test
     public void testHandlesRegistryOnlyWithTrailingSlash() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com/");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
-        assertEquals(
-            "The prefix is applied",
-            "someregistry.com/some/image:tag",
-            result.asCanonicalNameString()
-        );
+        assertEquals("The prefix is applied", "someregistry.com/some/image:tag", result.asCanonicalNameString());
     }
 
     @Test
     public void testCombinesLiterallyForRegistryOnlyWithoutTrailingSlash() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
         assertEquals(
             "The prefix is applied",
-            "someregistry.comsome/image:tag",   // treating the prefix literally, for predictability
+            "someregistry.comsome/image:tag", // treating the prefix literally, for predictability
             result.asCanonicalNameString()
         );
     }
 
     @Test
     public void testCombinesLiterallyForBothPartsWithoutTrailingSlash() {
-        when(mockConfiguration.getEnvVarOrProperty(eq(PREFIX_PROPERTY_KEY), any())).thenReturn("someregistry.com/our-mirror");
+        when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
+            .thenReturn("someregistry.com/our-mirror");
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
         assertEquals(
             "The prefix is applied",
-            "someregistry.com/our-mirrorsome/image:tag",   // treating the prefix literally, for predictability
+            "someregistry.com/our-mirrorsome/image:tag", // treating the prefix literally, for predictability
             result.asCanonicalNameString()
         );
     }
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index 5db2583958a..4ddfad8454f 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -14,13 +14,21 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 public class RegistryAuthLocatorTest {
+
     @Test
     public void lookupAuthConfigWithoutCredentials() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("unauthenticated.registry.org/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("unauthenticated.registry.org/org/repo"),
+            new AuthConfig()
+        );
 
-        assertEquals("Default docker registry URL is set on auth config", "https://index.docker.io/v1/", authConfig.getRegistryAddress());
+        assertEquals(
+            "Default docker registry URL is set on auth config",
+            "https://index.docker.io/v1/",
+            authConfig.getRegistryAddress()
+        );
         assertNull("No username is set", authConfig.getUsername());
         assertNull("No password is set", authConfig.getPassword());
     }
@@ -29,9 +37,16 @@ public void lookupAuthConfigWithoutCredentials() throws URISyntaxException {
     public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-basic-auth.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
 
-        assertEquals("Default docker registry URL is set on auth config", "https://registry.example.com", authConfig.getRegistryAddress());
+        assertEquals(
+            "Default docker registry URL is set on auth config",
+            "https://registry.example.com",
+            authConfig.getRegistryAddress()
+        );
         assertEquals("Username is set", "user", authConfig.getUsername());
         assertEquals("Password is set", "pass", authConfig.getPassword());
     }
@@ -40,9 +55,16 @@ public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException
     public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
 
-        assertEquals("Default docker registry URL is set on auth config", "https://registry.example.com", authConfig.getRegistryAddress());
+        assertEquals(
+            "Default docker registry URL is set on auth config",
+            "https://registry.example.com",
+            authConfig.getRegistryAddress()
+        );
         assertEquals("Username is set", "_json_key", authConfig.getUsername());
         assertNotNull("Password is set", authConfig.getPassword());
     }
@@ -51,7 +73,10 @@ public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
     public void lookupAuthConfigUsingStore() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
 
         assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
@@ -62,7 +87,10 @@ public void lookupAuthConfigUsingStore() throws URISyntaxException {
     public void lookupAuthConfigUsingHelper() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
 
         assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
@@ -73,16 +101,26 @@ public void lookupAuthConfigUsingHelper() throws URISyntaxException {
     public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper-using-token.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registrytoken.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registrytoken.example.com/org/repo"),
+            new AuthConfig()
+        );
 
-        assertEquals("Correct identitytoken is obtained from a credential store", "secret", authConfig.getIdentitytoken());
+        assertEquals(
+            "Correct identitytoken is obtained from a credential store",
+            "secret",
+            authConfig.getIdentitytoken()
+        );
     }
 
     @Test
     public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty-auth-with-helper.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
 
         assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
@@ -93,7 +131,10 @@ public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
     public void lookupNonEmptyAuthWithHelper() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-existing-auth-with-helper.json");
 
-        final AuthConfig authConfig = authLocator.lookupAuthConfig(DockerImageName.parse("registry.example.com/org/repo"), new AuthConfig());
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
 
         assertEquals("Correct server URL is obtained from a credential helper", "url", authConfig.getRegistryAddress());
         assertEquals("Correct username is obtained from a credential helper", "username", authConfig.getUsername());
@@ -103,7 +144,10 @@ public void lookupNonEmptyAuthWithHelper() throws URISyntaxException {
     @Test
     public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException {
         Map<String, String> notFoundMessagesReference = new HashMap<>();
-        final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json", notFoundMessagesReference);
+        final RegistryAuthLocator authLocator = createTestAuthLocator(
+            "config-with-store.json",
+            notFoundMessagesReference
+        );
 
         DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
         final AuthConfig authConfig = authLocator.lookupAuthConfig(dockerImageName, new AuthConfig());
@@ -117,7 +161,8 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException
         assertEquals(
             "Not correct message discovered",
             "Fake credentials not found on credentials store 'https://not.a.real.registry/url'",
-            discoveredMessage);
+            discoveredMessage
+        );
     }
 
     @Test
@@ -136,7 +181,8 @@ private RegistryAuthLocator createTestAuthLocator(String configName) throws URIS
     }
 
     @NotNull
-    private RegistryAuthLocator createTestAuthLocator(String configName, Map<String, String> notFoundMessagesReference) throws URISyntaxException {
+    private RegistryAuthLocator createTestAuthLocator(String configName, Map<String, String> notFoundMessagesReference)
+        throws URISyntaxException {
         final File configFile = new File(Resources.getResource("auth-config/" + configName).toURI());
 
         String commandPathPrefix = configFile.getParentFile().getAbsolutePath() + "/";
diff --git a/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
index 214b465c297..60f57a28b3e 100644
--- a/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
@@ -42,25 +42,27 @@ public void shouldCleanupWithJVM() {
 
     private void assertCleanup(Map<String, String> labels) {
         DockerClient client = DockerClientFactory.instance().client();
-        ConditionFactory awaitFactory = Awaitility.await().atMost(Duration.ofMinutes(1)).pollInterval(Duration.ofSeconds(1));
-
-        List<String> labelValues = labels.entrySet().stream()
+        ConditionFactory awaitFactory = Awaitility
+            .await()
+            .atMost(Duration.ofMinutes(1))
+            .pollInterval(Duration.ofSeconds(1));
+
+        List<String> labelValues = labels
+            .entrySet()
+            .stream()
             .map(it -> it.getKey() + "=" + it.getValue())
             .collect(Collectors.toList());
 
         awaitFactory.untilAsserted(() -> {
-            assertThat(client.listContainersCmd().withFilter("label", labelValues).withShowAll(true).exec())
-                .isEmpty();
+            assertThat(client.listContainersCmd().withFilter("label", labelValues).withShowAll(true).exec()).isEmpty();
         });
 
         awaitFactory.untilAsserted(() -> {
-            assertThat(client.listNetworksCmd().withFilter("label", labelValues).exec())
-                .isEmpty();
+            assertThat(client.listNetworksCmd().withFilter("label", labelValues).exec()).isEmpty();
         });
 
         awaitFactory.untilAsserted(() -> {
-            assertThat(client.listVolumesCmd().withFilter("label", labelValues).exec().getVolumes())
-                .isEmpty();
+            assertThat(client.listVolumesCmd().withFilter("label", labelValues).exec().getVolumes()).isEmpty();
         });
     }
 
@@ -81,7 +83,8 @@ private Map<String, String> runProcess(Consumer<ProcessExecutor> processExecutor
         ProcessResult result = processExecutor.execute();
         assertEquals(0, result.getExitValue());
 
-        String labelsJson = Stream.of(result.outputUTF8().split("\n"))
+        String labelsJson = Stream
+            .of(result.outputUTF8().split("\n"))
             .filter(it -> it.startsWith(SimpleUsage.LABELS_MARKER))
             .map(it -> it.substring(SimpleUsage.LABELS_MARKER.length()))
             .findFirst()
@@ -97,7 +100,9 @@ public static class SimpleUsage {
         @SneakyThrows
         @SuppressWarnings("deprecation")
         public static void main(String[] args) {
-            System.out.println(LABELS_MARKER + new ObjectMapper().writeValueAsString(ResourceReaper.instance().getLabels()));
+            System.out.println(
+                LABELS_MARKER + new ObjectMapper().writeValueAsString(ResourceReaper.instance().getLabels())
+            );
 
             GenericContainer<?> container = new GenericContainer<>("testcontainers/helloworld:1.1.0")
                 .withNetwork(org.testcontainers.containers.Network.newNetwork())
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index 7ca656e1eaf..56cbdb98a56 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -15,7 +15,9 @@
 public class TestcontainersConfigurationTest {
 
     private Properties userProperties;
+
     private Properties classpathProperties;
+
     private Map<String, String> environment;
 
     @Before
@@ -117,21 +119,33 @@ public void shouldReadChecksFromEnvironment() {
     public void shouldReadDockerSettingsFromEnvironmentWithoutTestcontainersPrefix() {
         userProperties.remove("docker.foo");
         environment.put("DOCKER_FOO", "some value");
-        assertEquals("reads unprefixed env vars for docker. settings", "some value", newConfig().getEnvVarOrUserProperty("docker.foo", "default"));
+        assertEquals(
+            "reads unprefixed env vars for docker. settings",
+            "some value",
+            newConfig().getEnvVarOrUserProperty("docker.foo", "default")
+        );
     }
 
     @Test
     public void shouldNotReadDockerSettingsFromEnvironmentWithTestcontainersPrefix() {
         userProperties.remove("docker.foo");
         environment.put("TESTCONTAINERS_DOCKER_FOO", "some value");
-        assertEquals("reads unprefixed env vars for docker. settings", "default", newConfig().getEnvVarOrUserProperty("docker.foo", "default"));
+        assertEquals(
+            "reads unprefixed env vars for docker. settings",
+            "default",
+            newConfig().getEnvVarOrUserProperty("docker.foo", "default")
+        );
     }
 
     @Test
     public void shouldReadDockerSettingsFromUserProperties() {
         environment.remove("DOCKER_FOO");
         userProperties.put("docker.foo", "some value");
-        assertEquals("reads unprefixed user properties for docker. settings", "some value", newConfig().getEnvVarOrUserProperty("docker.foo", "default"));
+        assertEquals(
+            "reads unprefixed user properties for docker. settings",
+            "some value",
+            newConfig().getEnvVarOrUserProperty("docker.foo", "default")
+        );
     }
 
     @Test
@@ -139,41 +153,69 @@ public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
         String currentValue = newConfig().getDockerClientStrategyClassName();
 
         classpathProperties.setProperty("docker.client.strategy", UUID.randomUUID().toString());
-        assertEquals("Docker client strategy is not affected by classpath properties", currentValue, newConfig().getDockerClientStrategyClassName());
+        assertEquals(
+            "Docker client strategy is not affected by classpath properties",
+            currentValue,
+            newConfig().getDockerClientStrategyClassName()
+        );
     }
 
     @Test
     public void shouldReadDockerClientStrategyFromUserProperties() {
         userProperties.setProperty("docker.client.strategy", "foo");
-        assertEquals("Docker client strategy is changed by user property", "foo", newConfig().getDockerClientStrategyClassName());
+        assertEquals(
+            "Docker client strategy is changed by user property",
+            "foo",
+            newConfig().getDockerClientStrategyClassName()
+        );
     }
 
     @Test
     public void shouldReadDockerClientStrategyFromEnvironment() {
         userProperties.remove("docker.client.strategy");
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "foo");
-        assertEquals("Docker client strategy is changed by env var", "foo", newConfig().getDockerClientStrategyClassName());
+        assertEquals(
+            "Docker client strategy is changed by env var",
+            "foo",
+            newConfig().getDockerClientStrategyClassName()
+        );
     }
 
     @Test
     public void shouldNotUseImplicitDockerClientStrategyWhenDockerHostAndStrategyAreBothSet() {
         userProperties.put("docker.client.strategy", "foo");
         userProperties.put("docker.host", "tcp://1.2.3.4:5678");
-        assertEquals("Docker client strategy is can be explicitly set", "foo", newConfig().getDockerClientStrategyClassName());
+        assertEquals(
+            "Docker client strategy is can be explicitly set",
+            "foo",
+            newConfig().getDockerClientStrategyClassName()
+        );
 
         userProperties.remove("docker.client.strategy");
 
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "bar");
         userProperties.put("docker.client.strategy", "foo");
-        assertEquals("Docker client strategy is can be explicitly set", "bar", newConfig().getDockerClientStrategyClassName());
+        assertEquals(
+            "Docker client strategy is can be explicitly set",
+            "bar",
+            newConfig().getDockerClientStrategyClassName()
+        );
 
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "bar");
         userProperties.remove("docker.client.strategy");
-        assertEquals("Docker client strategy is can be explicitly set", "bar", newConfig().getDockerClientStrategyClassName());
+        assertEquals(
+            "Docker client strategy is can be explicitly set",
+            "bar",
+            newConfig().getDockerClientStrategyClassName()
+        );
 
         environment.remove("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY");
         userProperties.put("docker.client.strategy", "foo");
-        assertEquals("Docker client strategy is can be explicitly set", "foo", newConfig().getDockerClientStrategyClassName());
+        assertEquals(
+            "Docker client strategy is can be explicitly set",
+            "foo",
+            newConfig().getDockerClientStrategyClassName()
+        );
     }
 
     @Test
@@ -191,6 +233,7 @@ public void shouldReadReuseFromUserProperties() {
         userProperties.setProperty("testcontainers.reuse.enable", "true");
         assertTrue("reuse enabled via user property", newConfig().environmentSupportsReuse());
     }
+
     @Test
     public void shouldReadReuseFromEnvironment() {
         assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
@@ -203,7 +246,11 @@ public void shouldReadReuseFromEnvironment() {
     @Test
     public void shouldTrimImageNames() {
         userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.2 ");
-        assertEquals("trailing whitespace was not removed from image name property", "testcontainers/ryuk:0.3.2",newConfig().getRyukImage());
+        assertEquals(
+            "trailing whitespace was not removed from image name property",
+            "testcontainers/ryuk:0.3.2",
+            newConfig().getRyukImage()
+        );
     }
 
     private TestcontainersConfiguration newConfig() {
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index 5306426070f..218ed90e5e0 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -19,21 +19,26 @@ public class CmdModifierTest {
     // hostname {
     @Rule
     public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
-            .withCreateContainerCmdModifier(cmd -> cmd.withHostName("the-cache"));
+        .withCreateContainerCmdModifier(cmd -> cmd.withHostName("the-cache"));
+
     // }
 
+    // spotless:off
     // memory {
     private long memoryInBytes = 32 * 1024 * 1024;
+
     private long memorySwapInBytes = 64 * 1024 * 1024;
 
     @Rule
     public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
-            .withCreateContainerCmdModifier(cmd -> cmd.getHostConfig()
+        .withCreateContainerCmdModifier(cmd -> {
+            cmd.getHostConfig()
                 .withMemory(memoryInBytes)
-                .withMemorySwap(memorySwapInBytes)
-            );
-    // }
+                .withMemorySwap(memorySwapInBytes);
+        });
 
+    // }
+    // spotless:on
 
     @Test
     public void testHostnameModified() throws IOException, InterruptedException {
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
index 23b265c26fa..80292465521 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
@@ -8,11 +8,12 @@
 import static org.junit.Assert.assertTrue;
 
 public class CommandsTest {
+
     @Rule
     // startupCommand {
     public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:5.0"))
         .withCommand("redis-server --port 7777")
-    // }
+        // }
         .withExposedPorts(7777);
 
     @Test
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
index 83b45f0435d..bdd82968191 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -9,31 +9,33 @@
 
 public class ContainerCreationTest {
 
+    // spotless:off
     // simple {
     public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
-    // }
 
-    // simple {
     @ClassRule
-    public static GenericContainer<?> redis =
-        new GenericContainer<>(REDIS_IMAGE)
-                .withExposedPorts(6379);
+    public static GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
+        .withExposedPorts(6379);
+
     // }
+    // spotless:on
 
     public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.14");
 
+    // spotless:off
     // withOptions {
     // Set up a plain OS container and customize environment,
     //   command and exposed ports. This just listens on port 80
     //   and always returns '42'
     @ClassRule
-    public static GenericContainer<?> alpine =
-        new GenericContainer<>(ALPINE_IMAGE)
-                .withExposedPorts(80)
-                .withEnv("MAGIC_NUMBER", "42")
-                .withCommand("/bin/sh", "-c",
-                "while true; do echo \"$MAGIC_NUMBER\" | nc -l -p 80; done");
+    public static GenericContainer<?> alpine = new GenericContainer<>(ALPINE_IMAGE)
+        .withExposedPorts(80)
+        .withEnv("MAGIC_NUMBER", "42")
+        .withCommand("/bin/sh", "-c",
+            "while true; do echo \"$MAGIC_NUMBER\" | nc -l -p 80; done");
+
     // }
+    // spotless:on
 
     @Test
     public void testStartup() {
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
index 08d57e31057..64618ad25a9 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
@@ -7,12 +7,12 @@
 import java.util.Map;
 
 public class ContainerLabelTest {
+
     // single_label {
     public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.14"))
         .withLabel("key", "value");
     // }
 
-
     // multiple_labels {
     private Map<String, String> mapOfLabels = new HashMap<>();
     // populate map, e.g. mapOfLabels.put("key1", "value1");
diff --git a/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
index 1d15c2553b8..22bf0332a9d 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
@@ -18,19 +18,23 @@
 public class HostPortExposedTest {
 
     private static HttpServer server;
+
     private static int localServerPort;
 
     @BeforeClass
     public static void setUp() throws Exception {
         server = HttpServer.create(new InetSocketAddress(0), 0);
-        server.createContext("/", exchange -> {
-            byte[] content = "Hello World!".getBytes();
-            exchange.sendResponseHeaders(200, content.length);
-            try (OutputStream responseBody = exchange.getResponseBody()) {
-                responseBody.write(content);
-                responseBody.flush();
+        server.createContext(
+            "/",
+            exchange -> {
+                byte[] content = "Hello World!".getBytes();
+                exchange.sendResponseHeaders(200, content.length);
+                try (OutputStream responseBody = exchange.getResponseBody()) {
+                    responseBody.write(content);
+                    responseBody.flush();
+                }
             }
-        });
+        );
 
         server.start();
         localServerPort = server.getAddress().getPort();
@@ -46,14 +50,12 @@ public static void tearDown() throws Exception {
     }
 
     @Rule
-    public BrowserWebDriverContainer browser = new BrowserWebDriverContainer()
-        .withCapabilities(new ChromeOptions());
+    public BrowserWebDriverContainer browser = new BrowserWebDriverContainer().withCapabilities(new ChromeOptions());
 
     @Test
     public void testContainerRunningAgainstExposedHostPort() {
         // useHostExposedPort {
-        final String rootUrl =
-            String.format("http://host.testcontainers.internal:%d/", localServerPort);
+        final String rootUrl = String.format("http://host.testcontainers.internal:%d/", localServerPort);
 
         final RemoteWebDriver webDriver = browser.getWebDriver();
         webDriver.get(rootUrl);
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
index 65da67fd401..afbe38fe835 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
@@ -1,6 +1,5 @@
 package generic;
 
-
 import generic.support.TestSpecificImageNameSubstitutor;
 import org.junit.Test;
 import org.testcontainers.containers.MySQLContainer;
@@ -11,14 +10,15 @@ public class ImageNameSubstitutionTest {
     @Test
     public void simpleExample() {
         try (
+            // spotless:off
             // directDockerHubReference {
             // Referring directly to an image on Docker Hub (mysql:8.0.24)
             final MySQLContainer<?> mysql = new MySQLContainer<>(
                 DockerImageName.parse("mysql:8.0.24")
             )
-
             // start the container and use it for testing
             // }
+            // spotless:on
         ) {
             mysql.start();
         }
@@ -32,15 +32,16 @@ public void simpleExample() {
     @Test
     public void substitutedExample() {
         try (
+            // spotless:off
             // hardcodedMirror {
             // Referring directly to an image on a private registry - image name will vary
             final MySQLContainer<?> mysql = new MySQLContainer<>(
                 DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.24")
-                               .asCompatibleSubstituteFor("mysql")
+                    .asCompatibleSubstituteFor("mysql")
             )
-
             // start the container and use it for testing
             // }
+            // spotless:on
         ) {
             mysql.start();
         }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
index de2b56c6a63..49e62cff217 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
@@ -1,23 +1,25 @@
 package generic;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
 public class MultiplePortsExposedTest {
-    private static final Logger log = getLogger(MultiplePortsExposedTest.class);
 
+    private static final Logger log = LoggerFactory.getLogger(MultiplePortsExposedTest.class);
 
     @Rule
     // rule {
-    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld:1.1.0"))
+    public GenericContainer<?> container = new GenericContainer<>(
+        DockerImageName.parse("testcontainers/helloworld:1.1.0")
+    )
         .withExposedPorts(8080, 8081)
         .withLogConsumer(new Slf4jLogConsumer(log));
+
     // }
 
     @Test
@@ -38,7 +40,6 @@ public void getHostOnly() {
 
     @Test
     public void getHostAndMappedPort() {
-        String address =
-            container.getHost() + ":" + container.getMappedPort(8080);
+        String address = container.getHost() + ":" + container.getMappedPort(8080);
     }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
index d45b1e28c47..bdc0d3ced8a 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
@@ -14,8 +14,9 @@ public class WaitStrategiesTest {
 
     @Rule
     // waitForNetworkListening {
-    public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.9.4"))
+    public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.9.4")) //
         .withExposedPorts(80);
+
     // }
 
     @Rule
@@ -23,44 +24,48 @@ public class WaitStrategiesTest {
     public GenericContainer nginxWithHttpWait = new GenericContainer(DockerImageName.parse("nginx:1.9.4"))
         .withExposedPorts(80)
         .waitingFor(Wait.forHttp("/"));
+
     // }
 
     @Rule
     // logMessageWait {
     public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:5.0.3"))
         .withExposedPorts(6379)
-        .waitingFor(
-            Wait.forLogMessage(".*Ready to accept connections.*\\n", 1)
-        );
+        .waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\n", 1));
+
     // }
 
     private static final HttpWaitStrategy MULTI_CODE_HTTP_WAIT =
+        // spotless:off
         // waitForHttpWithMultipleStatusCodes {
         Wait.forHttp("/")
             .forStatusCode(200)
-            .forStatusCode(301)
+            .forStatusCode(301);
         // }
-        ;
+        // spotless:on
 
     private static final HttpWaitStrategy PREDICATE_HTTP_WAIT =
+        // spotless:off
         // waitForHttpWithStatusCodePredicate {
         Wait.forHttp("/all")
-            .forStatusCodeMatching(it -> it >= 200 && it < 300 || it == 401)
+            .forStatusCodeMatching(it -> it >= 200 && it < 300 || it == 401);
         // }
-        ;
+        // spotless:on
 
     private static final HttpWaitStrategy TLS_HTTP_WAIT =
+        // spotless:off
         // waitForHttpWithTls {
         Wait.forHttp("/all")
-            .usingTls()
+            .usingTls();
         // }
-        ;
+        // spotless:on
 
     private static final WaitStrategy HEALTHCHECK_WAIT =
+        // spotless:off
         // healthcheckWait {
-        Wait.forHealthcheck()
+        Wait.forHealthcheck();
         // }
-        ;
+        // spotless:on
 
     @Test
     public void testContainersAllStarted() {
diff --git a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
index b60225010a1..82e3d83ab24 100644
--- a/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
+++ b/docs/examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -14,34 +15,39 @@
 import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;
-import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.IndefiniteOneShotStrategyTest;
-import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.MinimumDurationStrategyTest;
-import static org.testcontainers.containers.startupcheck.StartupCheckStrategyTest.OneShotStrategyTest;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({OneShotStrategyTest.class, IndefiniteOneShotStrategyTest.class, MinimumDurationStrategyTest.class})
+@Suite.SuiteClasses(
+    {
+        StartupCheckStrategyTest.OneShotStrategyTest.class,
+        StartupCheckStrategyTest.IndefiniteOneShotStrategyTest.class,
+        StartupCheckStrategyTest.MinimumDurationStrategyTest.class,
+    }
+)
 public class StartupCheckStrategyTest {
 
     private static final String HELLO_TESTCONTAINERS = "Hello Testcontainers!";
 
     private static void waitForHello(GenericContainer container) throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
-        container.followOutput(consumer, STDOUT);
+        container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
-        consumer.waitUntil(frame ->
-            frame.getUtf8String().contains(HELLO_TESTCONTAINERS), 30, TimeUnit.SECONDS);
+        consumer.waitUntil(frame -> frame.getUtf8String().contains(HELLO_TESTCONTAINERS), 30, TimeUnit.SECONDS);
     }
 
     public static class OneShotStrategyTest {
+
         @Rule
+        // spotless:off
         // withOneShotStrategy {
         public GenericContainer<?> bboxWithOneShot = new GenericContainer<>(DockerImageName.parse("busybox:1.31.1"))
             .withCommand(String.format("echo %s", HELLO_TESTCONTAINERS))
             .withStartupCheckStrategy(
                 new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3))
             );
+
         // }
+        // spotless:on
 
         @SneakyThrows
         @Test
@@ -53,14 +59,20 @@ public void testCommandIsExecuted() {
     }
 
     public static class IndefiniteOneShotStrategyTest {
+
         @Rule
+        // spotless:off
         // withIndefiniteOneShotStrategy {
-        public GenericContainer<?> bboxWithIndefiniteOneShot = new GenericContainer<>(DockerImageName.parse("busybox:1.31.1"))
+        public GenericContainer<?> bboxWithIndefiniteOneShot = new GenericContainer<>(
+            DockerImageName.parse("busybox:1.31.1")
+        )
             .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
             .withStartupCheckStrategy(
                 new IndefiniteWaitOneShotStartupCheckStrategy()
             );
+
         // }
+        // spotless:on
 
         @SneakyThrows
         @Test
@@ -72,14 +84,20 @@ public void testCommandIsExecuted() {
     }
 
     public static class MinimumDurationStrategyTest {
+
         @Rule
+        // spotless:off
         // withMinimumDurationStrategy {
-        public GenericContainer<?> bboxWithMinimumDuration = new GenericContainer<>(DockerImageName.parse("busybox:1.31.1"))
+        public GenericContainer<?> bboxWithMinimumDuration = new GenericContainer<>(
+            DockerImageName.parse("busybox:1.31.1")
+        )
             .withCommand("sh", "-c", String.format("sleep 5 && echo \"%s\"", HELLO_TESTCONTAINERS))
             .withStartupCheckStrategy(
                 new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(1))
             );
+
         // }
+        // spotless:on
 
         @SneakyThrows
         @Test
diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index cbb49b5fdb3..1d3d178975f 100644
--- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -1,6 +1,5 @@
 package quickstart;
 
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -16,9 +15,9 @@ public class RedisBackedCacheIntTest {
     // rule {
     @Rule
     public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine"))
-                                            .withExposedPorts(6379);
-    // }
+        .withExposedPorts(6379);
 
+    // }
 
     @Before
     public void setUp() {
diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
index 61a86ac3f8b..f837b3af0d5 100644
--- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
+++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
@@ -1,6 +1,5 @@
 package quickstart;
 
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -9,6 +8,7 @@
 
 @Ignore("This test class is deliberately invalid, as it relies on a non-existent local Redis")
 public class RedisBackedCacheIntTestStep0 {
+
     private RedisBackedCache underTest;
 
     @Before
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index 9a3855ba23c..59d92210549 100644
--- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -1,6 +1,5 @@
 package quickstart;
 
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
@@ -19,9 +18,9 @@ public class RedisBackedCacheIntTest {
     // container {
     @Container
     public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine"))
-                                            .withExposedPorts(6379);
-    // }
+        .withExposedPorts(6379);
 
+    // }
 
     @BeforeEach
     public void setUp() {
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
index c81a185a188..d9f889a8943 100644
--- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
@@ -1,6 +1,5 @@
 package quickstart;
 
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -9,6 +8,7 @@
 
 @Disabled("This test class is deliberately invalid, as it relies on a non-existent local Redis")
 public class RedisBackedCacheIntTestStep0 {
+
     private RedisBackedCache underTest;
 
     @BeforeEach
diff --git a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
index 068c8079a7d..5cc04dc6b9d 100644
--- a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
+++ b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
@@ -7,30 +7,30 @@ import spock.lang.Specification
 @org.testcontainers.spock.Testcontainers
 class RedisBackedCacheIntTest extends Specification {
 
-    private RedisBackedCache underTest
+	private RedisBackedCache underTest
 
-    // init {
-    GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
-        .withExposedPorts(6379)
-    // }
+	// init {
+	GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
+	.withExposedPorts(6379)
+	// }
 
-    void setup() {
-        String address = redis.host
-        Integer port = redis.firstMappedPort
+	void setup() {
+		String address = redis.host
+		Integer port = redis.firstMappedPort
 
-        // Now we have an address and port for Redis, no matter where it is running
-        underTest = new RedisBackedCache(address, port)
-    }
+		// Now we have an address and port for Redis, no matter where it is running
+		underTest = new RedisBackedCache(address, port)
+	}
 
-    void testSimplePutAndGet() {
-        setup:
-        underTest.put("test", "example")
+	void testSimplePutAndGet() {
+		setup:
+		underTest.put("test", "example")
 
-        when:
-        String retrieved = underTest.get("test")
+		when:
+		String retrieved = underTest.get("test")
 
-        then:
-        retrieved == "example"
-    }
+		then:
+		retrieved == "example"
+	}
 }
 // }
diff --git a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
index 52897c30097..d28942420da 100644
--- a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
+++ b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTestStep0.groovy
@@ -5,21 +5,21 @@ import spock.lang.Specification
 
 @Ignore("This test class is deliberately invalid, as it relies on a non-existent local Redis")
 class RedisBackedCacheIntTestStep0 extends Specification {
-    private RedisBackedCache underTest
+	private RedisBackedCache underTest
 
-    void setup() {
-        // Assume that we have Redis running locally?
-        underTest = new RedisBackedCache("localhost", 6379)
-    }
+	void setup() {
+		// Assume that we have Redis running locally?
+		underTest = new RedisBackedCache("localhost", 6379)
+	}
 
-    void testSimplePutAndGet() {
-        setup:
-        underTest.put("test", "example")
+	void testSimplePutAndGet() {
+		setup:
+		underTest.put("test", "example")
 
-        when:
-        String retrieved = underTest.get("test")
+		when:
+		String retrieved = underTest.get("test")
 
-        then:
-        retrieved == "example"
-    }
+		then:
+		retrieved == "example"
+	}
 }
diff --git a/docs/modules/hivemq.md b/docs/modules/hivemq.md
index 1e09bac4fc0..66f9670648c 100644
--- a/docs/modules/hivemq.md
+++ b/docs/modules/hivemq.md
@@ -31,7 +31,7 @@ Using the Community Edition:
 
 Using the Enterprise Edition:
 <!--codeinclude-->
-[Enterprise Edition HiveMQ image](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:eeVersion
+[Enterprise Edition HiveMQ image](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:hiveEEVersion
 <!--/codeinclude-->
 
 Using a specifc version is possible by using the tag:
@@ -138,7 +138,7 @@ The following example shows how to start a HiveMQ container with the extension c
 The following test then proceeds to enable and then disable the extension:
 
 <!--codeinclude-->
-[Enable/Disable extension at runtime](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:runtimeEnable
+[Enable/Disable extension at runtime](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:hiveRuntimeEnable
 <!--/codeinclude-->
 
 ## Enable/Disable an extension loaded from a folder
diff --git a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
index 9328d881666..57af95ef106 100644
--- a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
@@ -10,8 +10,9 @@
  */
 public class CosmosDBEmulatorContainer extends GenericContainer<CosmosDBEmulatorContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME =
-            DockerImageName.parse("mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator"
+    );
 
     private static final int PORT = 8081;
 
diff --git a/modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java b/modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java
index 0179e8d832a..f7b6af370ac 100644
--- a/modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java
+++ b/modules/azure/src/main/java/org/testcontainers/containers/KeyStoreBuilder.java
@@ -5,10 +5,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
 import java.io.InputStream;
 import java.security.KeyStore;
 import java.security.SecureRandom;
@@ -17,6 +13,11 @@
 import java.security.cert.X509Certificate;
 import java.util.Objects;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
 final class KeyStoreBuilder {
 
     static KeyStore buildByDownloadingCertificate(String endpoint, String keyStorePassword) {
@@ -38,20 +39,18 @@ static KeyStore buildByDownloadingCertificate(String endpoint, String keyStorePa
 
     private static TrustManager[] buildTrustAllManagers() {
         return new TrustManager[] {
-                new X509TrustManager() {
-                    @Override
-                    public void checkClientTrusted(X509Certificate[] chain, String authType) {
-                    }
+            new X509TrustManager() {
+                @Override
+                public void checkClientTrusted(X509Certificate[] chain, String authType) {}
 
-                    @Override
-                    public void checkServerTrusted(X509Certificate[] chain, String authType) {
-                    }
+                @Override
+                public void checkServerTrusted(X509Certificate[] chain, String authType) {}
 
-                    @Override
-                    public X509Certificate[] getAcceptedIssuers() {
-                        return new X509Certificate[]{};
-                    }
+                @Override
+                public X509Certificate[] getAcceptedIssuers() {
+                    return new X509Certificate[] {};
                 }
+            },
         };
     }
 
@@ -60,16 +59,13 @@ private static OkHttpClient buildTrustAllClient(TrustManager[] trustManagers) th
         sslContext.init(null, trustManagers, new SecureRandom());
         SSLSocketFactory socketFactory = sslContext.getSocketFactory();
         return new OkHttpClient.Builder()
-                .sslSocketFactory(socketFactory, (X509TrustManager) trustManagers[0])
-                .hostnameVerifier((s, sslSession) -> true)
-                .build();
+            .sslSocketFactory(socketFactory, (X509TrustManager) trustManagers[0])
+            .hostnameVerifier((s, sslSession) -> true)
+            .build();
     }
 
     private static Request buildRequest(String endpoint) {
-        return new Request.Builder()
-                .get()
-                .url(endpoint + "/_explorer/emulator.pem")
-                .build();
+        return new Request.Builder().get().url(endpoint + "/_explorer/emulator.pem").build();
     }
 
     private static KeyStore buildKeyStore(InputStream certificateStream, String keyStorePassword) throws Exception {
@@ -85,8 +81,7 @@ private static void closeResponseSilently(Response response) {
             if (Objects.nonNull(response)) {
                 response.close();
             }
-        } catch (Exception ignored) {
-        }
+        } catch (Exception ignored) {}
     }
 
     private static void closeClientSilently(OkHttpClient client) {
@@ -99,7 +94,6 @@ private static void closeClientSilently(OkHttpClient client) {
                     cache.close();
                 }
             }
-        } catch (Exception ignored) {
-        }
+        } catch (Exception ignored) {}
     }
 }
diff --git a/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
index dd9dc6b718f..37422b30af7 100644
--- a/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
@@ -37,8 +37,9 @@ public static void restoreOriginalSystemProperties() {
     @Rule
     // emulatorContainer {
     public CosmosDBEmulatorContainer emulator = new CosmosDBEmulatorContainer(
-            DockerImageName.parse("mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest")
+        DockerImageName.parse("mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest")
     );
+
     // }
 
     @Test
@@ -55,18 +56,19 @@ public void testWithCosmosClient() throws Exception {
         // }
         // buildClient {
         CosmosAsyncClient client = new CosmosClientBuilder()
-                .gatewayMode()
-                .endpointDiscoveryEnabled(false)
-                .endpoint(emulator.getEmulatorEndpoint())
-                .key(emulator.getEmulatorKey())
-                .buildAsyncClient();
+            .gatewayMode()
+            .endpointDiscoveryEnabled(false)
+            .endpoint(emulator.getEmulatorEndpoint())
+            .key(emulator.getEmulatorKey())
+            .buildAsyncClient();
         // }
         // testWithClientAgainstEmulatorContainer {
-        CosmosDatabaseResponse databaseResponse =
-                client.createDatabaseIfNotExists("Azure").block();
+        CosmosDatabaseResponse databaseResponse = client.createDatabaseIfNotExists("Azure").block();
         Assertions.assertThat(databaseResponse.getStatusCode()).isEqualTo(201);
-        CosmosContainerResponse containerResponse =
-                client.getDatabase("Azure").createContainerIfNotExists("ServiceContainer", "/name").block();
+        CosmosContainerResponse containerResponse = client
+            .getDatabase("Azure")
+            .createContainerIfNotExists("ServiceContainer", "/name")
+            .block();
         Assertions.assertThat(containerResponse.getStatusCode()).isEqualTo(201);
         // }
     }
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index e3ae084cb8a..3c78743fb62 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -10,12 +10,13 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
-import javax.script.ScriptException;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
+import javax.script.ScriptException;
+
 /**
  * Cassandra container
  *
@@ -26,18 +27,24 @@
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cassandra");
+
     private static final String DEFAULT_TAG = "3.11.2";
 
     @Deprecated
     public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
     public static final Integer CQL_PORT = 9042;
+
     private static final String CONTAINER_CONFIG_LOCATION = "/etc/cassandra";
+
     private static final String USERNAME = "cassandra";
+
     private static final String PASSWORD = "cassandra";
 
     private String configLocation;
+
     private String initScriptPath;
+
     private boolean enableJmxReporting;
 
     /**
@@ -54,17 +61,13 @@ public CassandraContainer(String dockerImageName) {
 
     public CassandraContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPort(CQL_PORT);
         this.enableJmxReporting = false;
 
         withEnv("CASSANDRA_SNITCH", "GossipingPropertyFileSnitch");
-        withEnv(
-            "JVM_OPTS",
-            "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0"
-        );
+        withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0");
         withEnv("HEAP_NEWSIZE", "128M");
         withEnv("MAX_HEAP_SIZE", "1024M");
     }
@@ -88,7 +91,9 @@ private void runInitScriptIfRequired() {
                 URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
                 if (resource == null) {
                     logger().warn("Could not load classpath init script: {}", initScriptPath);
-                    throw new ScriptLoadException("Could not load classpath init script: " + initScriptPath + ". Resource not found.");
+                    throw new ScriptLoadException(
+                        "Could not load classpath init script: " + initScriptPath + ". Resource not found."
+                    );
                 }
                 String cql = IOUtils.toString(resource, StandardCharsets.UTF_8);
                 DatabaseDelegate databaseDelegate = getDatabaseDelegate();
@@ -98,7 +103,10 @@ private void runInitScriptIfRequired() {
                 throw new ScriptLoadException("Could not load classpath init script: " + initScriptPath, e);
             } catch (ScriptException e) {
                 logger().error("Error while executing init script: {}", initScriptPath, e);
-                throw new ScriptUtils.UncategorizedScriptException("Error while executing init script: " + initScriptPath, e);
+                throw new ScriptUtils.UncategorizedScriptException(
+                    "Error while executing init script: " + initScriptPath,
+                    e
+                );
             }
         }
     }
@@ -112,9 +120,10 @@ private void runInitScriptIfRequired() {
      * @param resourceLocation    relative classpath to resource
      */
     protected void optionallyMapResourceParameterAsVolume(String pathNameInContainer, String resourceLocation) {
-        Optional.ofNullable(resourceLocation)
-                .map(MountableFile::forClasspathResource)
-                .ifPresent(mountableFile -> withCopyFileToContainer(mountableFile, pathNameInContainer));
+        Optional
+            .ofNullable(resourceLocation)
+            .map(MountableFile::forClasspathResource)
+            .ifPresent(mountableFile -> withCopyFileToContainer(mountableFile, pathNameInContainer));
     }
 
     /**
@@ -184,7 +193,8 @@ public Cluster getCluster() {
     }
 
     public static Cluster getCluster(ContainerState containerState, boolean enableJmxReporting) {
-        final Cluster.Builder builder = Cluster.builder()
+        final Cluster.Builder builder = Cluster
+            .builder()
             .addContactPoint(containerState.getHost())
             .withPort(containerState.getMappedPort(CQL_PORT));
         if (!enableJmxReporting) {
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
index e55dd31b0ff..8bc72e7f154 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
@@ -25,8 +25,7 @@ public class CassandraDatabaseDelegate extends AbstractDatabaseDelegate<Session>
     @Override
     protected Session createNewConnection() {
         try {
-            return CassandraContainer.getCluster(container)
-                    .newSession();
+            return CassandraContainer.getCluster(container).newSession();
         } catch (DriverException e) {
             log.error("Could not obtain cassandra connection");
             throw new ConnectionCreationException("Could not obtain cassandra connection", e);
@@ -34,7 +33,13 @@ protected Session createNewConnection() {
     }
 
     @Override
-    public void execute(String statement, String scriptPath, int lineNumber, boolean continueOnError, boolean ignoreFailedDrops) {
+    public void execute(
+        String statement,
+        String scriptPath,
+        int lineNumber,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    ) {
         try {
             ResultSet result = getConnection().execute(statement);
             if (result.wasApplied()) {
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
index cf7f3769985..aa2466cf7c4 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
@@ -18,20 +18,26 @@
 public class CassandraQueryWaitStrategy extends AbstractWaitStrategy {
 
     private static final String SELECT_VERSION_QUERY = "SELECT release_version FROM system.local";
+
     private static final String TIMEOUT_ERROR = "Timed out waiting for Cassandra to be accessible for query execution";
 
     @Override
     protected void waitUntilReady() {
         // execute select version query until success or timeout
         try {
-            retryUntilSuccess((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, () -> {
-                getRateLimiter().doWhenReady(() -> {
-                    try (DatabaseDelegate databaseDelegate = getDatabaseDelegate()) {
-                        databaseDelegate.execute(SELECT_VERSION_QUERY, "", 1, false, false);
-                    }
-                });
-                return true;
-            });
+            retryUntilSuccess(
+                (int) startupTimeout.getSeconds(),
+                TimeUnit.SECONDS,
+                () -> {
+                    getRateLimiter()
+                        .doWhenReady(() -> {
+                            try (DatabaseDelegate databaseDelegate = getDatabaseDelegate()) {
+                                databaseDelegate.execute(SELECT_VERSION_QUERY, "", 1, false, false);
+                            }
+                        });
+                    return true;
+                }
+            );
         } catch (TimeoutException e) {
             throw new ContainerLaunchException(TIMEOUT_ERROR);
         }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
index 76c8c8438d7..45cbba0abc7 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -36,7 +36,11 @@ public void testSimple() {
     @Test
     public void testSpecificVersion() {
         String cassandraVersion = "3.0.15";
-        try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE.withTag(cassandraVersion))) {
+        try (
+            CassandraContainer<?> cassandraContainer = new CassandraContainer<>(
+                CASSANDRA_IMAGE.withTag(cassandraVersion)
+            )
+        ) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, "SELECT release_version FROM system.local");
             assertTrue("Query was not applied", resultSet.wasApplied());
@@ -53,7 +57,11 @@ public void testConfigurationOverride() {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, "SELECT cluster_name FROM system.local");
             assertTrue("Query was not applied", resultSet.wasApplied());
-            assertEquals("Cassandra configuration is not overridden", TEST_CLUSTER_NAME_IN_CONF, resultSet.one().getString(0));
+            assertEquals(
+                "Cassandra configuration is not overridden",
+                TEST_CLUSTER_NAME_IN_CONF,
+                resultSet.one().getString(0)
+            );
         }
     }
 
@@ -81,7 +89,9 @@ public void testInitScript() {
     @Test
     public void testInitScriptWithLegacyCassandra() {
         try (
-            CassandraContainer<?> cassandraContainer = new CassandraContainer<>(DockerImageName.parse("cassandra:2.2.11"))
+            CassandraContainer<?> cassandraContainer = new CassandraContainer<>(
+                DockerImageName.parse("cassandra:2.2.11")
+            )
                 .withInitScript("initial.cql")
         ) {
             cassandraContainer.start();
@@ -107,7 +117,10 @@ public void testCassandraQueryWaitStrategy() {
     public void testCassandraGetCluster() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>()) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer.getCluster(), "SELECT release_version FROM system.local");
+            ResultSet resultSet = performQuery(
+                cassandraContainer.getCluster(),
+                "SELECT release_version FROM system.local"
+            );
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertNotNull("Result set has no release_version", resultSet.one().getString(0));
         }
@@ -122,7 +135,8 @@ private void testInitScript(CassandraContainer<?> cassandraContainer) {
     }
 
     private ResultSet performQuery(CassandraContainer<?> cassandraContainer, String cql) {
-        Cluster explicitCluster = Cluster.builder()
+        Cluster explicitCluster = Cluster
+            .builder()
             .addContactPoint(cassandraContainer.getHost())
             .withPort(cassandraContainer.getMappedPort(CassandraContainer.CQL_PORT))
             .build();
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 9b5f130a323..4528c48e935 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -8,6 +8,7 @@
 import java.util.Set;
 
 public class ClickHouseContainer extends JdbcDatabaseContainer {
+
     public static final String NAME = "clickhouse";
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yandex/clickhouse-server");
@@ -19,14 +20,19 @@ public class ClickHouseContainer extends JdbcDatabaseContainer {
     public static final String DEFAULT_TAG = "18.10.3";
 
     public static final Integer HTTP_PORT = 8123;
+
     public static final Integer NATIVE_PORT = 9000;
 
     private static final String DRIVER_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
+
     private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+
     private static final String TEST_QUERY = "SELECT 1";
 
     private String databaseName = "default";
+
     private String username = "default";
+
     private String password = "";
 
     /**
@@ -43,7 +49,6 @@ public ClickHouseContainer(String dockerImageName) {
 
     public ClickHouseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(HTTP_PORT, NATIVE_PORT);
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
index cd2453b8349..80fb71bd5da 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
@@ -3,6 +3,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 public class ClickHouseProvider extends JdbcDatabaseContainerProvider {
+
     @Override
     public boolean supports(String databaseType) {
         return databaseType.equals(ClickHouseContainer.NAME);
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java b/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
index f3946c8a317..056aace7772 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
@@ -4,18 +4,18 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class ClickhouseJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken)},
-            });
+        return Arrays.asList(
+            new Object[][] { //
+                { "jdbc:tc:clickhouse://hostname/databasename", EnumSet.of(Options.PmdKnownBroken) },
+            }
+        );
     }
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
index 8f3879673a0..d2375891f8c 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit.clickhouse;
 
 import org.junit.Test;
+import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -8,13 +9,12 @@
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.ClickhouseTestImages.CLICKHOUSE_IMAGE;
 
 public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer(CLICKHOUSE_IMAGE)) {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_IMAGE)) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index f32e6bce385..dfec3988f15 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -8,6 +8,7 @@
 public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cockroachdb/cockroach");
+
     private static final String DEFAULT_TAG = "v19.2.11";
 
     public static final String NAME = "cockroach";
@@ -19,13 +20,19 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
     public static final String IMAGE_TAG = DEFAULT_TAG;
 
     private static final String JDBC_DRIVER_CLASS_NAME = "org.postgresql.Driver";
+
     private static final String JDBC_URL_PREFIX = "jdbc:postgresql";
+
     private static final String TEST_QUERY_STRING = "SELECT 1";
+
     private static final int REST_API_PORT = 8080;
+
     private static final int DB_PORT = 26257;
 
     private String databaseName = "postgres";
+
     private String username = "root";
+
     private String password = "";
 
     /**
@@ -42,7 +49,6 @@ public CockroachContainer(final String dockerImageName) {
 
     public CockroachContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(REST_API_PORT, DB_PORT);
@@ -64,8 +70,16 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         String additionalUrlParams = constructUrlParameters("?", "&");
-        return JDBC_URL_PREFIX + "://" + getHost() + ":" + getMappedPort(DB_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return (
+            JDBC_URL_PREFIX +
+            "://" +
+            getHost() +
+            ":" +
+            getMappedPort(DB_PORT) +
+            "/" +
+            databaseName +
+            additionalUrlParams
+        );
     }
 
     @Override
@@ -90,16 +104,22 @@ public String getTestQueryString() {
 
     @Override
     public CockroachContainer withUsername(String username) {
-        throw new UnsupportedOperationException("The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826");
+        throw new UnsupportedOperationException(
+            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
+        );
     }
 
     @Override
     public CockroachContainer withPassword(String password) {
-        throw new UnsupportedOperationException("The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826");
+        throw new UnsupportedOperationException(
+            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
+        );
     }
 
     @Override
     public CockroachContainer withDatabaseName(final String databaseName) {
-        throw new UnsupportedOperationException("The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826");
+        throw new UnsupportedOperationException(
+            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
+        );
     }
 }
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
index deebbd66392..60d2c3aeb15 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainerProvider.java
@@ -3,6 +3,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 public class CockroachContainerProvider extends JdbcDatabaseContainerProvider {
+
     @Override
     public boolean supports(String databaseType) {
         return databaseType.equals(CockroachContainer.NAME);
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
index 75b1fadb47e..86aaf6b4f63 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
@@ -4,18 +4,18 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class)},
-            });
+        return Arrays.asList(
+            new Object[][] { //
+                { "jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class) },
+            }
+        );
     }
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 3121ad82100..87e82fb30e3 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit.cockroachdb;
 
 import org.junit.Test;
+import org.testcontainers.CockroachDBTestImages;
 import org.testcontainers.containers.CockroachContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -9,13 +10,11 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.CockroachDBTestImages.COCKROACHDB_IMAGE;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
-
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
@@ -23,7 +22,7 @@ public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (CockroachContainer cockroach = new CockroachContainer(COCKROACHDB_IMAGE)) {
+        try (CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)) {
             cockroach.start();
 
             ResultSet resultSet = performQuery(cockroach, "SELECT 1");
@@ -35,8 +34,10 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (CockroachContainer cockroach = new CockroachContainer(COCKROACHDB_IMAGE)
-                .withInitScript("somepath/init_postgresql.sql")) { // CockroachDB is expected to be compatible with Postgres
+        try (
+            CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
+                .withInitScript("somepath/init_postgresql.sql")
+        ) { // CockroachDB is expected to be compatible with Postgres
             cockroach.start();
 
             ResultSet resultSet = performQuery(cockroach, "SELECT foo FROM bar");
@@ -48,7 +49,7 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        CockroachContainer cockroach = new CockroachContainer(COCKROACHDB_IMAGE)
+        CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
             .withUrlParam("sslmode", "disable")
             .withUrlParam("application_name", "cockroach");
 
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
index 3778833182e..ad666b4ffef 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
@@ -22,8 +22,11 @@
 public class BucketDefinition {
 
     private final String name;
+
     private boolean flushEnabled = false;
+
     private boolean queryPrimaryIndex = true;
+
     private int quota = 100;
 
     public BucketDefinition(final String name) {
@@ -49,7 +52,7 @@ public BucketDefinition withFlushEnabled(final boolean flushEnabled) {
      */
     public BucketDefinition withQuota(final int quota) {
         if (quota < 100) {
-          throw new IllegalArgumentException("Bucket quota cannot be less than 100MB!");
+            throw new IllegalArgumentException("Bucket quota cannot be less than 100MB!");
         }
         this.quota = quota;
         return this;
@@ -81,5 +84,4 @@ public boolean hasPrimaryIndex() {
     public int getQuota() {
         return quota;
     }
-
 }
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index c2becc68fc3..4f190a5413c 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.testcontainers.couchbase;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -139,7 +140,6 @@ public CouchbaseContainer(final String dockerImageName) {
      */
     public CouchbaseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
     }
 
@@ -182,8 +182,14 @@ public CouchbaseContainer withServiceQuota(final CouchbaseService service, final
             throw new IllegalArgumentException("The provided service (" + service + ") has no quota to configure");
         }
         if (quotaMb < service.getMinimumQuotaMb()) {
-            throw new IllegalArgumentException("The custom quota (" + quotaMb + ") must not be smaller than the " +
-                "minimum quota for the service (" + service.getMinimumQuotaMb() + ")");
+            throw new IllegalArgumentException(
+                "The custom quota (" +
+                quotaMb +
+                ") must not be smaller than the " +
+                "minimum quota for the service (" +
+                service.getMinimumQuotaMb() +
+                ")"
+            );
         }
         this.customServiceQuotas.put(service, quotaMb);
         return this;
@@ -255,54 +261,59 @@ protected void configure() {
         WaitAllStrategy waitStrategy = new WaitAllStrategy();
 
         // Makes sure that all nodes in the cluster are healthy.
-        waitStrategy = waitStrategy.withStrategy(
-            new HttpWaitStrategy()
-                .forPath("/pools/default")
-                .forPort(MGMT_PORT)
-                .withBasicCredentials(username, password)
-                .forStatusCode(200)
-                .forResponsePredicate(response -> {
-                    try {
-                        return Optional.of(MAPPER.readTree(response))
-                            .map(n -> n.at("/nodes/0/status"))
-                            .map(JsonNode::asText)
-                            .map("healthy"::equals)
-                            .orElse(false);
-                    } catch (IOException e) {
-                        logger().error("Unable to parse response: {}", response, e);
-                        return false;
-                    }
-                })
-        );
-
-        if (enabledServices.contains(CouchbaseService.QUERY)) {
-            waitStrategy = waitStrategy.withStrategy(
+        waitStrategy =
+            waitStrategy.withStrategy(
                 new HttpWaitStrategy()
-                    .forPath("/admin/ping")
-                    .forPort(QUERY_PORT)
+                    .forPath("/pools/default")
+                    .forPort(MGMT_PORT)
                     .withBasicCredentials(username, password)
                     .forStatusCode(200)
+                    .forResponsePredicate(response -> {
+                        try {
+                            return Optional
+                                .of(MAPPER.readTree(response))
+                                .map(n -> n.at("/nodes/0/status"))
+                                .map(JsonNode::asText)
+                                .map("healthy"::equals)
+                                .orElse(false);
+                        } catch (IOException e) {
+                            logger().error("Unable to parse response: {}", response, e);
+                            return false;
+                        }
+                    })
             );
+
+        if (enabledServices.contains(CouchbaseService.QUERY)) {
+            waitStrategy =
+                waitStrategy.withStrategy(
+                    new HttpWaitStrategy()
+                        .forPath("/admin/ping")
+                        .forPort(QUERY_PORT)
+                        .withBasicCredentials(username, password)
+                        .forStatusCode(200)
+                );
         }
 
         if (enabledServices.contains(CouchbaseService.ANALYTICS)) {
-            waitStrategy = waitStrategy.withStrategy(
-                new HttpWaitStrategy()
-                    .forPath("/admin/ping")
-                    .forPort(ANALYTICS_PORT)
-                    .withBasicCredentials(username, password)
-                    .forStatusCode(200)
-            );
+            waitStrategy =
+                waitStrategy.withStrategy(
+                    new HttpWaitStrategy()
+                        .forPath("/admin/ping")
+                        .forPort(ANALYTICS_PORT)
+                        .withBasicCredentials(username, password)
+                        .forStatusCode(200)
+                );
         }
 
         if (enabledServices.contains(CouchbaseService.EVENTING)) {
-            waitStrategy = waitStrategy.withStrategy(
-                new HttpWaitStrategy()
-                    .forPath("/api/v1/config")
-                    .forPort(EVENTING_PORT)
-                    .withBasicCredentials(username, password)
-                    .forStatusCode(200)
-            );
+            waitStrategy =
+                waitStrategy.withStrategy(
+                    new HttpWaitStrategy()
+                        .forPath("/api/v1/config")
+                        .forPort(EVENTING_PORT)
+                        .withBasicCredentials(username, password)
+                        .forStatusCode(200)
+                );
         }
 
         waitingFor(waitStrategy);
@@ -329,25 +340,23 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo)
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         timePhase("createBuckets", this::createBuckets);
 
-        logger().info("Couchbase container is ready! UI available at http://{}:{}", getHost(), getMappedPort(MGMT_PORT));
+        logger()
+            .info("Couchbase container is ready! UI available at http://{}:{}", getHost(), getMappedPort(MGMT_PORT));
     }
 
     /**
      * Before we can start configuring the host, we need to wait until the cluster manager is listening.
      */
     private void waitUntilNodeIsOnline() {
-        new HttpWaitStrategy()
-            .forPort(MGMT_PORT)
-            .forPath("/pools")
-            .forStatusCode(200)
-            .waitUntilReady(this);
+        new HttpWaitStrategy().forPort(MGMT_PORT).forPath("/pools").forStatusCode(200).waitUntilReady(this);
     }
 
     /**
      * Fetches edition (enterprise or community) of started container.
      */
     private void initializeIsEnterprise() {
-        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/pools", "GET", null, true);
+        @Cleanup
+        Response response = doHttpRequest(MGMT_PORT, "/pools", "GET", null, true);
 
         try {
             isEnterprise = MAPPER.readTree(response.body().string()).get("isEnterprise").asBoolean();
@@ -374,9 +383,13 @@ private void initializeIsEnterprise() {
     private void renameNode() {
         logger().debug("Renaming Couchbase Node from localhost to {}", getHost());
 
-        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/node/controller/rename", "POST", new FormBody.Builder()
-            .add("hostname", getInternalIpAddress())
-            .build(), false
+        @Cleanup
+        Response response = doHttpRequest(
+            MGMT_PORT,
+            "/node/controller/rename",
+            "POST",
+            new FormBody.Builder().add("hostname", getInternalIpAddress()).build(),
+            false
         );
 
         checkSuccessfulResponse(response, "Could not rename couchbase node");
@@ -393,9 +406,13 @@ private void initializeServices() {
             .map(CouchbaseService::getIdentifier)
             .collect(Collectors.joining(","));
 
-        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/node/controller/setupServices", "POST", new FormBody.Builder()
-            .add("services", services)
-            .build(), false
+        @Cleanup
+        Response response = doHttpRequest(
+            MGMT_PORT,
+            "/node/controller/setupServices",
+            "POST",
+            new FormBody.Builder().add("services", services).build(),
+            false
         );
 
         checkSuccessfulResponse(response, "Could not enable couchbase services");
@@ -423,9 +440,8 @@ private void setMemoryQuotas() {
             }
         }
 
-        @Cleanup Response response = doHttpRequest(
-            MGMT_PORT, "/pools/default", "POST", quotaBuilder.build(), false
-        );
+        @Cleanup
+        Response response = doHttpRequest(MGMT_PORT, "/pools/default", "POST", quotaBuilder.build(), false);
 
         checkSuccessfulResponse(response, "Could not configure service memory quotas");
     }
@@ -438,11 +454,18 @@ private void setMemoryQuotas() {
     private void configureAdminUser() {
         logger().debug("Configuring couchbase admin user with username: \"{}\"", username);
 
-        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/settings/web", "POST", new FormBody.Builder()
-            .add("username", username)
-            .add("password", password)
-            .add("port", Integer.toString(MGMT_PORT))
-            .build(), false);
+        @Cleanup
+        Response response = doHttpRequest(
+            MGMT_PORT,
+            "/settings/web",
+            "POST",
+            new FormBody.Builder()
+                .add("username", username)
+                .add("password", password)
+                .add("port", Integer.toString(MGMT_PORT))
+                .build(),
+            false
+        );
 
         checkSuccessfulResponse(response, "Could not configure couchbase admin user");
     }
@@ -489,7 +512,8 @@ private void configureExternalPorts() {
             builder.add("eventingSSL", Integer.toString(getMappedPort(EVENTING_SSL_PORT)));
         }
 
-        @Cleanup Response response = doHttpRequest(
+        @Cleanup
+        Response response = doHttpRequest(
             MGMT_PORT,
             "/node/controller/setupAlternateAddresses/external",
             "PUT",
@@ -506,9 +530,13 @@ private void configureExternalPorts() {
     private void configureIndexer() {
         logger().debug("Configuring the indexer service");
 
-        @Cleanup Response response = doHttpRequest(MGMT_PORT, "/settings/indexes", "POST", new FormBody.Builder()
-            .add("storageMode", isEnterprise ? "memory_optimized" : "forestdb")
-            .build(), true
+        @Cleanup
+        Response response = doHttpRequest(
+            MGMT_PORT,
+            "/settings/indexes",
+            "POST",
+            new FormBody.Builder().add("storageMode", isEnterprise ? "memory_optimized" : "forestdb").build(),
+            true
         );
 
         checkSuccessfulResponse(response, "Could not configure the indexing service");
@@ -523,22 +551,32 @@ private void createBuckets() {
         for (BucketDefinition bucket : buckets) {
             logger().debug("Creating bucket \"{}\"", bucket.getName());
 
-            @Cleanup Response response = doHttpRequest(MGMT_PORT, "/pools/default/buckets", "POST", new FormBody.Builder()
-                .add("name", bucket.getName())
-                .add("ramQuotaMB", Integer.toString(bucket.getQuota()))
-                .add("flushEnabled", bucket.hasFlushEnabled() ? "1" : "0")
-                .build(), true);
+            @Cleanup
+            Response response = doHttpRequest(
+                MGMT_PORT,
+                "/pools/default/buckets",
+                "POST",
+                new FormBody.Builder()
+                    .add("name", bucket.getName())
+                    .add("ramQuotaMB", Integer.toString(bucket.getQuota()))
+                    .add("flushEnabled", bucket.hasFlushEnabled() ? "1" : "0")
+                    .build(),
+                true
+            );
 
             checkSuccessfulResponse(response, "Could not create bucket " + bucket.getName());
 
-            timePhase("createBucket:" + bucket.getName() + ":waitForAllServicesEnabled", () ->
-                new HttpWaitStrategy()
-                .forPath("/pools/default/b/" + bucket.getName())
-                .forPort(MGMT_PORT)
-                .withBasicCredentials(username, password)
-                .forStatusCode(200)
-                .forResponsePredicate(new AllServicesEnabledPredicate())
-                .waitUntilReady(this)
+            timePhase(
+                "createBucket:" + bucket.getName() + ":waitForAllServicesEnabled",
+                () -> {
+                    new HttpWaitStrategy()
+                        .forPath("/pools/default/b/" + bucket.getName())
+                        .forPort(MGMT_PORT)
+                        .withBasicCredentials(username, password)
+                        .forStatusCode(200)
+                        .forResponsePredicate(new AllServicesEnabledPredicate())
+                        .waitUntilReady(this);
+                }
             );
 
             if (enabledServices.contains(CouchbaseService.QUERY)) {
@@ -546,29 +584,62 @@ private void createBuckets() {
                 // knows about the bucket in its metadata configuration.
                 timePhase(
                     "createBucket:" + bucket.getName() + ":queryKeyspacePresent",
-                    () -> Unreliables.retryUntilTrue(1, TimeUnit.MINUTES, () -> {
-                        @Cleanup Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
-                            .add("statement", "SELECT COUNT(*) > 0 as present FROM system:keyspaces WHERE name = \"" + bucket.getName() + "\"")
-                            .build(), true);
-
-                        String body = queryResponse.body() != null ? queryResponse.body().string() : null;
-                        checkSuccessfulResponse(queryResponse, "Could not poll query service state for bucket: " + bucket.getName());
-
-                        return Optional.of(MAPPER.readTree(body))
-                            .map(n -> n.at("/results/0/present"))
-                            .map(JsonNode::asBoolean)
-                            .orElse(false);
-                }));
+                    () -> {
+                        Unreliables.retryUntilTrue(
+                            1,
+                            TimeUnit.MINUTES,
+                            () -> {
+                                @Cleanup
+                                Response queryResponse = doHttpRequest(
+                                    QUERY_PORT,
+                                    "/query/service",
+                                    "POST",
+                                    new FormBody.Builder()
+                                        .add(
+                                            "statement",
+                                            "SELECT COUNT(*) > 0 as present FROM system:keyspaces WHERE name = \"" +
+                                            bucket.getName() +
+                                            "\""
+                                        )
+                                        .build(),
+                                    true
+                                );
+
+                                String body = queryResponse.body() != null ? queryResponse.body().string() : null;
+                                checkSuccessfulResponse(
+                                    queryResponse,
+                                    "Could not poll query service state for bucket: " + bucket.getName()
+                                );
+
+                                return Optional
+                                    .of(MAPPER.readTree(body))
+                                    .map(n -> n.at("/results/0/present"))
+                                    .map(JsonNode::asBoolean)
+                                    .orElse(false);
+                            }
+                        );
+                    }
+                );
             }
 
             if (bucket.hasPrimaryIndex()) {
                 if (enabledServices.contains(CouchbaseService.QUERY)) {
-                    @Cleanup Response queryResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
-                        .add("statement", "CREATE PRIMARY INDEX on `" + bucket.getName() + "`")
-                        .build(), true);
+                    @Cleanup
+                    Response queryResponse = doHttpRequest(
+                        QUERY_PORT,
+                        "/query/service",
+                        "POST",
+                        new FormBody.Builder()
+                            .add("statement", "CREATE PRIMARY INDEX on `" + bucket.getName() + "`")
+                            .build(),
+                        true
+                    );
 
                     try {
-                        checkSuccessfulResponse(queryResponse, "Could not create primary index for bucket " + bucket.getName());
+                        checkSuccessfulResponse(
+                            queryResponse,
+                            "Could not create primary index for bucket " + bucket.getName()
+                        );
                     } catch (IllegalStateException ex) {
                         // potentially ignore the error, the index will be eventually built.
                         if (!ex.getMessage().contains("Index creation will be retried in background")) {
@@ -578,21 +649,48 @@ private void createBuckets() {
 
                     timePhase(
                         "createBucket:" + bucket.getName() + ":primaryIndexOnline",
-                        () ->  Unreliables.retryUntilTrue(1, TimeUnit.MINUTES, () -> {
-                            @Cleanup Response stateResponse = doHttpRequest(QUERY_PORT, "/query/service", "POST", new FormBody.Builder()
-                                .add("statement", "SELECT count(*) > 0 AS online FROM system:indexes where keyspace_id = \"" + bucket.getName() + "\" and is_primary = true and state = \"online\"")
-                                .build(), true);
-
-                            String body = stateResponse.body() != null ? stateResponse.body().string() : null;
-                            checkSuccessfulResponse(stateResponse, "Could not poll primary index state for bucket: " + bucket.getName());
-
-                            return Optional.of(MAPPER.readTree(body))
-                                .map(n -> n.at("/results/0/online"))
-                                .map(JsonNode::asBoolean)
-                                .orElse(false);
-                    }));
+                        () -> {
+                            Unreliables.retryUntilTrue(
+                                1,
+                                TimeUnit.MINUTES,
+                                () -> {
+                                    @Cleanup
+                                    Response stateResponse = doHttpRequest(
+                                        QUERY_PORT,
+                                        "/query/service",
+                                        "POST",
+                                        new FormBody.Builder()
+                                            .add(
+                                                "statement",
+                                                "SELECT count(*) > 0 AS online FROM system:indexes where keyspace_id = \"" +
+                                                bucket.getName() +
+                                                "\" and is_primary = true and state = \"online\""
+                                            )
+                                            .build(),
+                                        true
+                                    );
+
+                                    String body = stateResponse.body() != null ? stateResponse.body().string() : null;
+                                    checkSuccessfulResponse(
+                                        stateResponse,
+                                        "Could not poll primary index state for bucket: " + bucket.getName()
+                                    );
+
+                                    return Optional
+                                        .of(MAPPER.readTree(body))
+                                        .map(n -> n.at("/results/0/online"))
+                                        .map(JsonNode::asBoolean)
+                                        .orElse(false);
+                                }
+                            );
+                        }
+                    );
                 } else {
-                    logger().info("Primary index creation for bucket {} ignored, since QUERY service is not present.", bucket.getName());
+                    logger()
+                        .info(
+                            "Primary index creation for bucket {} ignored, since QUERY service is not present.",
+                            bucket.getName()
+                        );
                 }
             }
         }
@@ -602,7 +700,11 @@ private void createBuckets() {
      * Helper method to extract the internal IP address based on the network configuration.
      */
     private String getInternalIpAddress() {
-        return getContainerInfo().getNetworkSettings().getNetworks().values().stream()
+        return getContainerInfo()
+            .getNetworkSettings()
+            .getNetworks()
+            .values()
+            .stream()
             .findFirst()
             .map(ContainerNetwork::getIpAddress)
             .orElseThrow(() -> new IllegalStateException("No network available to extract the internal IP from!"));
@@ -648,8 +750,13 @@ private void checkNotRunning() {
      * @param auth if authentication with the admin user and password should be used.
      * @return the response of the request.
      */
-    private Response doHttpRequest(final int port, final String path, final String method, final RequestBody body,
-                                   final boolean auth) {
+    private Response doHttpRequest(
+        final int port,
+        final String path,
+        final String method,
+        final RequestBody body,
+        final boolean auth
+    ) {
         try {
             Request.Builder requestBuilder = new Request.Builder()
                 .url("http://" + getHost() + ":" + getMappedPort(port) + path);
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
index ffb0c9f7f1f..d9a9d2ffe3a 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseService.java
@@ -20,7 +20,6 @@
  * Describes the different services that should be exposed on the container.
  */
 public enum CouchbaseService {
-
     /**
      * Key-Value service.
      */
@@ -88,5 +87,4 @@ int getMinimumQuotaMb() {
     boolean hasQuota() {
         return minimumQuotaMb > 0;
     }
-
 }
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index c91f3f12d7c..1bdbe2ab1db 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -34,10 +34,13 @@
 
 public class CouchbaseContainerTest {
 
-    private static final DockerImageName COUCHBASE_IMAGE_ENTERPRISE =
-        DockerImageName.parse("couchbase/server:enterprise-7.0.3");
-    private static final DockerImageName COUCHBASE_IMAGE_COMMUNITY =
-        DockerImageName.parse("couchbase/server:community-7.0.2");
+    private static final DockerImageName COUCHBASE_IMAGE_ENTERPRISE = DockerImageName.parse(
+        "couchbase/server:enterprise-7.0.3"
+    );
+
+    private static final DockerImageName COUCHBASE_IMAGE_COMMUNITY = DockerImageName.parse(
+        "couchbase/server:community-7.0.2"
+    );
 
     @Test
     public void testBasicContainerUsageForEnterpriseContainer() {
@@ -51,18 +54,21 @@ public void testBasicContainerUsageForEnterpriseContainer() {
                 .withBucket(bucketDefinition)
             // }
         ) {
-            setUpClient(container, cluster -> {
-                Bucket bucket = cluster.bucket(bucketDefinition.getName());
-                bucket.waitUntilReady(Duration.ofSeconds(10L));
+            setUpClient(
+                container,
+                cluster -> {
+                    Bucket bucket = cluster.bucket(bucketDefinition.getName());
+                    bucket.waitUntilReady(Duration.ofSeconds(10L));
 
-                Collection collection = bucket.defaultCollection();
+                    Collection collection = bucket.defaultCollection();
 
-                collection.upsert("foo", JsonObject.create().put("key", "value"));
+                    collection.upsert("foo", JsonObject.create().put("key", "value"));
 
-                JsonObject fooObject = collection.get("foo").contentAsObject();
+                    JsonObject fooObject = collection.get("foo").contentAsObject();
 
-                assertEquals("value", fooObject.getString("key"));
-            });
+                    assertEquals("value", fooObject.getString("key"));
+                }
+            );
         }
     }
 
@@ -74,42 +80,47 @@ public void testBasicContainerUsageForCommunityContainer() {
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withBucket(bucketDefinition)
         ) {
-            setUpClient(container, cluster -> {
-                Bucket bucket = cluster.bucket(bucketDefinition.getName());
-                bucket.waitUntilReady(Duration.ofSeconds(10L));
+            setUpClient(
+                container,
+                cluster -> {
+                    Bucket bucket = cluster.bucket(bucketDefinition.getName());
+                    bucket.waitUntilReady(Duration.ofSeconds(10L));
 
-                Collection collection = bucket.defaultCollection();
+                    Collection collection = bucket.defaultCollection();
 
-                collection.upsert("foo", JsonObject.create().put("key", "value"));
+                    collection.upsert("foo", JsonObject.create().put("key", "value"));
 
-                JsonObject fooObject = collection.get("foo").contentAsObject();
+                    JsonObject fooObject = collection.get("foo").contentAsObject();
 
-                assertEquals("value", fooObject.getString("key"));
-            });
+                    assertEquals("value", fooObject.getString("key"));
+                }
+            );
         }
     }
 
     @Test
     public void testBucketIsFlushableIfEnabled() {
-        BucketDefinition bucketDefinition = new BucketDefinition("mybucket")
-            .withFlushEnabled(true);
+        BucketDefinition bucketDefinition = new BucketDefinition("mybucket").withFlushEnabled(true);
 
         try (
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_ENTERPRISE)
                 .withBucket(bucketDefinition)
         ) {
-            setUpClient(container, cluster -> {
-                Bucket bucket = cluster.bucket(bucketDefinition.getName());
-                bucket.waitUntilReady(Duration.ofSeconds(10L));
+            setUpClient(
+                container,
+                cluster -> {
+                    Bucket bucket = cluster.bucket(bucketDefinition.getName());
+                    bucket.waitUntilReady(Duration.ofSeconds(10L));
 
-                Collection collection = bucket.defaultCollection();
+                    Collection collection = bucket.defaultCollection();
 
-                collection.upsert("foo", JsonObject.create().put("key", "value"));
+                    collection.upsert("foo", JsonObject.create().put("key", "value"));
 
-                cluster.buckets().flushBucket(bucketDefinition.getName());
+                    cluster.buckets().flushBucket(bucketDefinition.getName());
 
-                await().untilAsserted(() -> assertFalse(collection.exists("foo").exists()));
-            });
+                    await().untilAsserted(() -> assertFalse(collection.exists("foo").exists()));
+                }
+            );
         }
     }
 
@@ -123,7 +134,12 @@ public void testFailureIfCommunityUsedWithAnalytics() {
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.ANALYTICS)
         ) {
-            assertThrows(ContainerLaunchException.class, () -> setUpClient(container, cluster -> {}));
+            assertThrows(
+                ContainerLaunchException.class,
+                () -> {
+                    setUpClient(container, cluster -> {});
+                }
+            );
         }
     }
 
@@ -137,7 +153,12 @@ public void testFailureIfCommunityUsedWithEventing() {
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.EVENTING)
         ) {
-            assertThrows(ContainerLaunchException.class, () -> setUpClient(container, cluster -> {}));
+            assertThrows(
+                ContainerLaunchException.class,
+                () -> {
+                    setUpClient(container, cluster -> {});
+                }
+            );
         }
     }
 
diff --git a/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java b/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java
index 14572dec421..196eb485b5f 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java
@@ -27,7 +27,12 @@ protected CONNECTION getConnection() {
     }
 
     @Override
-    public void execute(Collection<String> statements, String scriptPath, boolean continueOnError, boolean ignoreFailedDrops) {
+    public void execute(
+        Collection<String> statements,
+        String scriptPath,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    ) {
         int lineNumber = 0;
         for (String statement : statements) {
             lineNumber++;
diff --git a/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java b/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java
index 55886d88143..eda8f197008 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java
@@ -10,11 +10,16 @@
  * @author Eugeny Karpov
  */
 public interface DatabaseDelegate extends AutoCloseable {
-
     /**
      * Execute statement by the implementation of the delegate
      */
-    void execute(String statement, String scriptPath, int lineNumber, boolean continueOnError, boolean ignoreFailedDrops);
+    void execute(
+        String statement,
+        String scriptPath,
+        int lineNumber,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    );
 
     /**
      * Execute collection of statements
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index 1b94b84f368..eca4989c70e 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -22,13 +22,14 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.delegate.DatabaseDelegate;
 
-import javax.script.ScriptException;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.script.ScriptException;
+
 /**
  * This is a modified version of the Spring-JDBC ScriptUtils class, adapted to reduce
  * dependencies and slightly alter the API.
@@ -48,278 +49,346 @@
  */
 public abstract class ScriptUtils {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ScriptUtils.class);
-
-	/**
-	 * Default statement separator within SQL scripts.
-	 */
-	public static final String DEFAULT_STATEMENT_SEPARATOR = ";";
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScriptUtils.class);
 
-	/**
-	 * Fallback statement separator within SQL scripts.
-	 * <p>Used if neither a custom defined separator nor the
-	 * {@link #DEFAULT_STATEMENT_SEPARATOR} is present in a given script.
-	 */
-	public static final String FALLBACK_STATEMENT_SEPARATOR = "\n";
+    /**
+     * Default statement separator within SQL scripts.
+     */
+    public static final String DEFAULT_STATEMENT_SEPARATOR = ";";
 
-	/**
-	 * Default prefix for line comments within SQL scripts.
-	 */
-	public static final String DEFAULT_COMMENT_PREFIX = "--";
+    /**
+     * Fallback statement separator within SQL scripts.
+     * <p>Used if neither a custom defined separator nor the
+     * {@link #DEFAULT_STATEMENT_SEPARATOR} is present in a given script.
+     */
+    public static final String FALLBACK_STATEMENT_SEPARATOR = "\n";
 
-	/**
-	 * Default start delimiter for block comments within SQL scripts.
-	 */
-	public static final String DEFAULT_BLOCK_COMMENT_START_DELIMITER = "/*";
+    /**
+     * Default prefix for line comments within SQL scripts.
+     */
+    public static final String DEFAULT_COMMENT_PREFIX = "--";
 
-	/**
-	 * Default end delimiter for block comments within SQL scripts.
-	 */
-	public static final String DEFAULT_BLOCK_COMMENT_END_DELIMITER = "*/";
+    /**
+     * Default start delimiter for block comments within SQL scripts.
+     */
+    public static final String DEFAULT_BLOCK_COMMENT_START_DELIMITER = "/*";
 
+    /**
+     * Default end delimiter for block comments within SQL scripts.
+     */
+    public static final String DEFAULT_BLOCK_COMMENT_END_DELIMITER = "*/";
 
-	/**
-	 * Prevent instantiation of this utility class.
-	 */
-	private ScriptUtils() {
-		/* no-op */
-	}
+    /**
+     * Prevent instantiation of this utility class.
+     */
+    private ScriptUtils() {
+        /* no-op */
+    }
 
     /**
-	 * Split an SQL script into separate statements delimited by the provided
-	 * separator string. Each individual statement will be added to the provided
-	 * {@code List}.
-	 * <p>Within the script, the provided {@code commentPrefix} will be honored:
-	 * any text beginning with the comment prefix and extending to the end of the
-	 * line will be omitted from the output. Similarly, the provided
-	 * {@code blockCommentStartDelimiter} and {@code blockCommentEndDelimiter}
-	 * delimiters will be honored: any text enclosed in a block comment will be
-	 * omitted from the output. In addition, multiple adjacent whitespace characters
-	 * will be collapsed into a single space.
-	 * @param resource the resource from which the script was read
-	 * @param script the SQL script; never {@code null} or empty
-	 * @param separator text separating each statement &mdash; typically a ';' or
-	 * newline character; never {@code null}
-	 * @param commentPrefix the prefix that identifies SQL line comments &mdash;
-	 * typically "--"; never {@code null} or empty
-	 * @param blockCommentStartDelimiter the <em>start</em> block comment delimiter;
-	 * never {@code null} or empty
-	 * @param blockCommentEndDelimiter the <em>end</em> block comment delimiter;
-	 * never {@code null} or empty
-	 * @param statements the list that will contain the individual statements
-	 */
-	public static void splitSqlScript(String resource, String script, String separator, String commentPrefix,
-                                      String blockCommentStartDelimiter, String blockCommentEndDelimiter, List<String> statements) {
-
-		checkArgument(StringUtils.isNotEmpty(script), "script must not be null or empty");
-		checkArgument(separator != null, "separator must not be null");
-		checkArgument(StringUtils.isNotEmpty(commentPrefix), "commentPrefix must not be null or empty");
-		checkArgument(StringUtils.isNotEmpty(blockCommentStartDelimiter), "blockCommentStartDelimiter must not be null or empty");
-		checkArgument(StringUtils.isNotEmpty(blockCommentEndDelimiter), "blockCommentEndDelimiter must not be null or empty");
-
-		StringBuilder sb = new StringBuilder();
-		boolean inEscape = false;
-		boolean inLineComment = false;
-		boolean inBlockComment = false;
-		Character currentLiteralDelimiter = null;
-
-		int compoundStatementDepth = 0;
-		final String lowerCaseScriptContent = script.toLowerCase();
-		char[] content = script.toCharArray();
-		for (int i = 0; i < script.length(); i++) {
-			char c = content[i];
-			if (inEscape) {
-				inEscape = false;
-				sb.append(c);
-				continue;
-			}
-			// MySQL style escapes
-			if (c == '\\') {
-				inEscape = true;
-				sb.append(c);
-				continue;
-			}
-			// Determine whether we're entering/leaving a string literal
-			if (!inBlockComment && !inLineComment && (c == '\'' || c == '"' || c == '`')) {
-				if (currentLiteralDelimiter == null) { // ignore delimiters within an existing string literal
-					currentLiteralDelimiter = c;
-				} else if (currentLiteralDelimiter == c) { // find end of string literal
-					currentLiteralDelimiter = null;
-				}
-			}
-			final boolean inLiteral = currentLiteralDelimiter != null;
-
-			if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, commentPrefix, i)) {
-				inLineComment = true;
-			}
- 			if (inLineComment && c == '\n') {
-				inLineComment = false;
-			}
-			if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, blockCommentStartDelimiter, i)) {
-				inBlockComment = true;
-			}
-			if (!inLiteral && inBlockComment && containsSubstringAtOffset(lowerCaseScriptContent, blockCommentEndDelimiter, i)) {
-				inBlockComment = false;
-			}
-			final boolean inComment = inLineComment || inBlockComment;
-
-			if (!inLiteral && !inComment && containsKeywordsAtOffset(lowerCaseScriptContent, "BEGIN", i, separator, commentPrefix, blockCommentStartDelimiter)) {
-				compoundStatementDepth++;
-			}
-			if (!inLiteral && !inComment && containsKeywordsAtOffset(lowerCaseScriptContent, "END", i, separator, commentPrefix, blockCommentStartDelimiter)) {
-				compoundStatementDepth--;
-			}
-			final boolean inCompoundStatement = compoundStatementDepth != 0;
-
-			if (!inLiteral && !inCompoundStatement) {
-				if (script.startsWith(separator, i)) {
-					// we've reached the end of the current statement
-					sb = flushStringBuilder(sb, statements);
-					i += separator.length() - 1;
-					continue;
-				}
-				else if (script.startsWith(commentPrefix, i)) {
-					// skip over any content from the start of the comment to the EOL
-					int indexOfNextNewline = script.indexOf("\n", i);
-					if (indexOfNextNewline > i) {
-						i = indexOfNextNewline;
-						continue;
-					}
-					else {
-						// if there's no EOL, we must be at the end
-						// of the script, so stop here.
-						break;
-					}
-				}
-				else if (script.startsWith(blockCommentStartDelimiter, i)) {
-					// skip over any block comments
-					int indexOfCommentEnd = script.indexOf(blockCommentEndDelimiter, i);
-					if (indexOfCommentEnd > i) {
-						i = indexOfCommentEnd + blockCommentEndDelimiter.length() - 1;
+     * Split an SQL script into separate statements delimited by the provided
+     * separator string. Each individual statement will be added to the provided
+     * {@code List}.
+     * <p>Within the script, the provided {@code commentPrefix} will be honored:
+     * any text beginning with the comment prefix and extending to the end of the
+     * line will be omitted from the output. Similarly, the provided
+     * {@code blockCommentStartDelimiter} and {@code blockCommentEndDelimiter}
+     * delimiters will be honored: any text enclosed in a block comment will be
+     * omitted from the output. In addition, multiple adjacent whitespace characters
+     * will be collapsed into a single space.
+     * @param resource the resource from which the script was read
+     * @param script the SQL script; never {@code null} or empty
+     * @param separator text separating each statement &mdash; typically a ';' or
+     * newline character; never {@code null}
+     * @param commentPrefix the prefix that identifies SQL line comments &mdash;
+     * typically "--"; never {@code null} or empty
+     * @param blockCommentStartDelimiter the <em>start</em> block comment delimiter;
+     * never {@code null} or empty
+     * @param blockCommentEndDelimiter the <em>end</em> block comment delimiter;
+     * never {@code null} or empty
+     * @param statements the list that will contain the individual statements
+     */
+    public static void splitSqlScript(
+        String resource,
+        String script,
+        String separator,
+        String commentPrefix,
+        String blockCommentStartDelimiter,
+        String blockCommentEndDelimiter,
+        List<String> statements
+    ) {
+        checkArgument(StringUtils.isNotEmpty(script), "script must not be null or empty");
+        checkArgument(separator != null, "separator must not be null");
+        checkArgument(StringUtils.isNotEmpty(commentPrefix), "commentPrefix must not be null or empty");
+        checkArgument(
+            StringUtils.isNotEmpty(blockCommentStartDelimiter),
+            "blockCommentStartDelimiter must not be null or empty"
+        );
+        checkArgument(
+            StringUtils.isNotEmpty(blockCommentEndDelimiter),
+            "blockCommentEndDelimiter must not be null or empty"
+        );
+
+        StringBuilder sb = new StringBuilder();
+        boolean inEscape = false;
+        boolean inLineComment = false;
+        boolean inBlockComment = false;
+        Character currentLiteralDelimiter = null;
+
+        int compoundStatementDepth = 0;
+        final String lowerCaseScriptContent = script.toLowerCase();
+        char[] content = script.toCharArray();
+        for (int i = 0; i < script.length(); i++) {
+            char c = content[i];
+            if (inEscape) {
+                inEscape = false;
+                sb.append(c);
+                continue;
+            }
+            // MySQL style escapes
+            if (c == '\\') {
+                inEscape = true;
+                sb.append(c);
+                continue;
+            }
+            // Determine whether we're entering/leaving a string literal
+            if (!inBlockComment && !inLineComment && (c == '\'' || c == '"' || c == '`')) {
+                if (currentLiteralDelimiter == null) { // ignore delimiters within an existing string literal
+                    currentLiteralDelimiter = c;
+                } else if (currentLiteralDelimiter == c) { // find end of string literal
+                    currentLiteralDelimiter = null;
+                }
+            }
+            final boolean inLiteral = currentLiteralDelimiter != null;
+
+            if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, commentPrefix, i)) {
+                inLineComment = true;
+            }
+            if (inLineComment && c == '\n') {
+                inLineComment = false;
+            }
+            if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, blockCommentStartDelimiter, i)) {
+                inBlockComment = true;
+            }
+            if (
+                !inLiteral &&
+                inBlockComment &&
+                containsSubstringAtOffset(lowerCaseScriptContent, blockCommentEndDelimiter, i)
+            ) {
+                inBlockComment = false;
+            }
+            final boolean inComment = inLineComment || inBlockComment;
+
+            if (
+                !inLiteral &&
+                !inComment &&
+                containsKeywordsAtOffset(
+                    lowerCaseScriptContent,
+                    "BEGIN",
+                    i,
+                    separator,
+                    commentPrefix,
+                    blockCommentStartDelimiter
+                )
+            ) {
+                compoundStatementDepth++;
+            }
+            if (
+                !inLiteral &&
+                !inComment &&
+                containsKeywordsAtOffset(
+                    lowerCaseScriptContent,
+                    "END",
+                    i,
+                    separator,
+                    commentPrefix,
+                    blockCommentStartDelimiter
+                )
+            ) {
+                compoundStatementDepth--;
+            }
+            final boolean inCompoundStatement = compoundStatementDepth != 0;
+
+            if (!inLiteral && !inCompoundStatement) {
+                if (script.startsWith(separator, i)) {
+                    // we've reached the end of the current statement
+                    sb = flushStringBuilder(sb, statements);
+                    i += separator.length() - 1;
+                    continue;
+                } else if (script.startsWith(commentPrefix, i)) {
+                    // skip over any content from the start of the comment to the EOL
+                    int indexOfNextNewline = script.indexOf("\n", i);
+                    if (indexOfNextNewline > i) {
+                        i = indexOfNextNewline;
+                        continue;
+                    } else {
+                        // if there's no EOL, we must be at the end
+                        // of the script, so stop here.
+                        break;
+                    }
+                } else if (script.startsWith(blockCommentStartDelimiter, i)) {
+                    // skip over any block comments
+                    int indexOfCommentEnd = script.indexOf(blockCommentEndDelimiter, i);
+                    if (indexOfCommentEnd > i) {
+                        i = indexOfCommentEnd + blockCommentEndDelimiter.length() - 1;
                         inBlockComment = false;
-						continue;
-					}
-					else {
-						throw new ScriptParseException(String.format("Missing block comment end delimiter [%s].",
-							blockCommentEndDelimiter), resource);
-					}
-				}
-				else if (c == ' ' || c == '\n' || c == '\t' || c == '\r') {
-					// avoid multiple adjacent whitespace characters
-					if (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' ') {
-						c = ' ';
-					}
-					else {
-						continue;
-					}
-				}
-			}
-			sb.append(c);
-		}
-		flushStringBuilder(sb, statements);
-	}
-
-	private static StringBuilder flushStringBuilder(StringBuilder sb, List<String> statements) {
-		if (sb.length() == 0) {
-			return sb;
-		}
-
-		final String s = sb.toString().trim();
-		if (StringUtils.isNotEmpty(s)) {
-			statements.add(s);
-		}
-
-		return new StringBuilder();
-	}
-
-	private static boolean isSeperator(char c, String separator, String commentPrefix,
-                                       String blockCommentStartDelimiter) {
-	    return c == ' ' || c == '\r' || c == '\n' || c == '\t' ||
-            c == separator.charAt(0) || c == separator.charAt(separator.length() - 1) ||
-            c == commentPrefix.charAt(0) || c == blockCommentStartDelimiter.charAt(0) ||
-            c == blockCommentStartDelimiter.charAt(blockCommentStartDelimiter.length() - 1);
+                        continue;
+                    } else {
+                        throw new ScriptParseException(
+                            String.format("Missing block comment end delimiter [%s].", blockCommentEndDelimiter),
+                            resource
+                        );
+                    }
+                } else if (c == ' ' || c == '\n' || c == '\t' || c == '\r') {
+                    // avoid multiple adjacent whitespace characters
+                    if (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' ') {
+                        c = ' ';
+                    } else {
+                        continue;
+                    }
+                }
+            }
+            sb.append(c);
+        }
+        flushStringBuilder(sb, statements);
+    }
+
+    private static StringBuilder flushStringBuilder(StringBuilder sb, List<String> statements) {
+        if (sb.length() == 0) {
+            return sb;
+        }
+
+        final String s = sb.toString().trim();
+        if (StringUtils.isNotEmpty(s)) {
+            statements.add(s);
+        }
+
+        return new StringBuilder();
     }
 
-	private static boolean containsSubstringAtOffset(String lowercaseString, String substring, int offset) {
-		String lowercaseSubstring = substring.toLowerCase();
+    private static boolean isSeperator(
+        char c,
+        String separator,
+        String commentPrefix,
+        String blockCommentStartDelimiter
+    ) {
+        return (
+            c == ' ' ||
+            c == '\r' ||
+            c == '\n' ||
+            c == '\t' ||
+            c == separator.charAt(0) ||
+            c == separator.charAt(separator.length() - 1) ||
+            c == commentPrefix.charAt(0) ||
+            c == blockCommentStartDelimiter.charAt(0) ||
+            c == blockCommentStartDelimiter.charAt(blockCommentStartDelimiter.length() - 1)
+        );
+    }
 
-		return lowercaseString.startsWith(lowercaseSubstring, offset);
-	}
+    private static boolean containsSubstringAtOffset(String lowercaseString, String substring, int offset) {
+        String lowercaseSubstring = substring.toLowerCase();
 
-    private static boolean containsKeywordsAtOffset(String lowercaseString, String keywords, int offset,
-                                                    String separator, String commentPrefix,
-                                                    String blockCommentStartDelimiter) {
+        return lowercaseString.startsWith(lowercaseSubstring, offset);
+    }
+
+    private static boolean containsKeywordsAtOffset(
+        String lowercaseString,
+        String keywords,
+        int offset,
+        String separator,
+        String commentPrefix,
+        String blockCommentStartDelimiter
+    ) {
         String lowercaseKeywords = keywords.toLowerCase();
 
-        boolean backSeperated = (offset == 0) || isSeperator(lowercaseString.charAt(offset - 1),
-            separator, commentPrefix, blockCommentStartDelimiter);
-        boolean frontSeperated = (offset >= (lowercaseString.length() - keywords.length())) ||
-            isSeperator(lowercaseString.charAt(offset + keywords.length()),
-                separator, commentPrefix, blockCommentStartDelimiter);
+        boolean backSeperated =
+            (offset == 0) ||
+            isSeperator(lowercaseString.charAt(offset - 1), separator, commentPrefix, blockCommentStartDelimiter);
+        boolean frontSeperated =
+            (offset >= (lowercaseString.length() - keywords.length())) ||
+            isSeperator(
+                lowercaseString.charAt(offset + keywords.length()),
+                separator,
+                commentPrefix,
+                blockCommentStartDelimiter
+            );
 
         return backSeperated && frontSeperated && lowercaseString.startsWith(lowercaseKeywords, offset);
     }
 
-	private static void checkArgument(boolean expression, String errorMessage) {
-		if (!expression) {
-			throw new IllegalArgumentException(errorMessage);
-		}
-	}
-
-	/**
-	 * Does the provided SQL script contain the specified delimiter?
-	 * @param script the SQL script
-	 * @param delim String delimiting each statement - typically a ';' character
-	 */
-	public static boolean containsSqlScriptDelimiters(String script, String delim) {
-		boolean inLiteral = false;
-		char[] content = script.toCharArray();
-		for (int i = 0; i < script.length(); i++) {
-			if (content[i] == '\'') {
-				inLiteral = !inLiteral;
-			}
-			if (!inLiteral && script.startsWith(delim, i)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Load script from classpath and apply it to the given database
-	 *
-	 * @param databaseDelegate database delegate for script execution
-	 * @param initScriptPath   the resource to load the init script from
-	 */
-	public static void runInitScript(DatabaseDelegate databaseDelegate, String initScriptPath) {
-		try {
-			URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
-			if (resource == null) {
-				resource = ScriptUtils.class.getClassLoader().getResource(initScriptPath);
-				if (resource == null) {
-					LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
-					throw new ScriptLoadException("Could not load classpath init script: " + initScriptPath + ". Resource not found.");
-				}
-			}
-			String scripts = IOUtils.toString(resource, StandardCharsets.UTF_8);
-			executeDatabaseScript(databaseDelegate, initScriptPath, scripts);
-		} catch (IOException e) {
-			LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
-			throw new ScriptLoadException("Could not load classpath init script: " + initScriptPath, e);
-		} catch (ScriptException e) {
-			LOGGER.error("Error while executing init script: {}", initScriptPath, e);
-			throw new UncategorizedScriptException("Error while executing init script: " + initScriptPath, e);
-		}
-	}
-
-    public static void executeDatabaseScript(DatabaseDelegate databaseDelegate, String scriptPath, String script) throws ScriptException {
-        executeDatabaseScript(databaseDelegate, scriptPath, script, false, false, DEFAULT_COMMENT_PREFIX, DEFAULT_STATEMENT_SEPARATOR, DEFAULT_BLOCK_COMMENT_START_DELIMITER, DEFAULT_BLOCK_COMMENT_END_DELIMITER);
+    private static void checkArgument(boolean expression, String errorMessage) {
+        if (!expression) {
+            throw new IllegalArgumentException(errorMessage);
+        }
+    }
+
+    /**
+     * Does the provided SQL script contain the specified delimiter?
+     * @param script the SQL script
+     * @param delim String delimiting each statement - typically a ';' character
+     */
+    public static boolean containsSqlScriptDelimiters(String script, String delim) {
+        boolean inLiteral = false;
+        char[] content = script.toCharArray();
+        for (int i = 0; i < script.length(); i++) {
+            if (content[i] == '\'') {
+                inLiteral = !inLiteral;
+            }
+            if (!inLiteral && script.startsWith(delim, i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Load script from classpath and apply it to the given database
+     *
+     * @param databaseDelegate database delegate for script execution
+     * @param initScriptPath   the resource to load the init script from
+     */
+    public static void runInitScript(DatabaseDelegate databaseDelegate, String initScriptPath) {
+        try {
+            URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
+            if (resource == null) {
+                resource = ScriptUtils.class.getClassLoader().getResource(initScriptPath);
+                if (resource == null) {
+                    LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
+                    throw new ScriptLoadException(
+                        "Could not load classpath init script: " + initScriptPath + ". Resource not found."
+                    );
+                }
+            }
+            String scripts = IOUtils.toString(resource, StandardCharsets.UTF_8);
+            executeDatabaseScript(databaseDelegate, initScriptPath, scripts);
+        } catch (IOException e) {
+            LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
+            throw new ScriptLoadException("Could not load classpath init script: " + initScriptPath, e);
+        } catch (ScriptException e) {
+            LOGGER.error("Error while executing init script: {}", initScriptPath, e);
+            throw new UncategorizedScriptException("Error while executing init script: " + initScriptPath, e);
+        }
+    }
+
+    public static void executeDatabaseScript(DatabaseDelegate databaseDelegate, String scriptPath, String script)
+        throws ScriptException {
+        executeDatabaseScript(
+            databaseDelegate,
+            scriptPath,
+            script,
+            false,
+            false,
+            DEFAULT_COMMENT_PREFIX,
+            DEFAULT_STATEMENT_SEPARATOR,
+            DEFAULT_BLOCK_COMMENT_START_DELIMITER,
+            DEFAULT_BLOCK_COMMENT_END_DELIMITER
+        );
     }
 
     /**
-	 * Execute the given database script.
-	 * <p>Statement separators and comments will be removed before executing
-	 * individual statements within the supplied script.
+     * Execute the given database script.
+     * <p>Statement separators and comments will be removed before executing
+     * individual statements within the supplied script.
      * <p><b>Do not use this method to execute DDL if you expect rollback.</b>
      * @param databaseDelegate database delegate for script execution
      * @param scriptPath the resource (potentially associated with a specific encoding)
@@ -328,85 +397,104 @@ public static void executeDatabaseScript(DatabaseDelegate databaseDelegate, Stri
      *@param continueOnError whether or not to continue without throwing an exception
      * in the event of an error
      * @param ignoreFailedDrops whether or not to continue in the event of specifically
-* an error on a {@code DROP} statement
+     * an error on a {@code DROP} statement
      * @param commentPrefix the prefix that identifies comments in the SQL script &mdash;
-* typically "--"
+     * typically "--"
      * @param separator the script statement separator; defaults to
-* {@value #DEFAULT_STATEMENT_SEPARATOR} if not specified and falls back to
-* {@value #FALLBACK_STATEMENT_SEPARATOR} as a last resort
+     * {@value #DEFAULT_STATEMENT_SEPARATOR} if not specified and falls back to
+     * {@value #FALLBACK_STATEMENT_SEPARATOR} as a last resort
      * @param blockCommentStartDelimiter the <em>start</em> block comment delimiter; never
-* {@code null} or empty
+     * {@code null} or empty
      * @param blockCommentEndDelimiter the <em>end</em> block comment delimiter; never
-* {@code null} or empty       @throws ScriptException if an error occurred while executing the SQL script
-	 */
-	public static void executeDatabaseScript(DatabaseDelegate databaseDelegate, String scriptPath, String script, boolean continueOnError,
-			boolean ignoreFailedDrops, String commentPrefix, String separator, String blockCommentStartDelimiter,
-			String blockCommentEndDelimiter) throws ScriptException {
-
-		try {
-			if (LOGGER.isInfoEnabled()) {
-				LOGGER.info("Executing database script from " + scriptPath);
-			}
-
-			long startTime = System.currentTimeMillis();
-			List<String> statements = new LinkedList<>();
-
-			if (separator == null) {
-				separator = DEFAULT_STATEMENT_SEPARATOR;
-			}
-			if (!containsSqlScriptDelimiters(script, separator)) {
-				separator = FALLBACK_STATEMENT_SEPARATOR;
-			}
-
-			splitSqlScript(scriptPath, script, separator, commentPrefix, blockCommentStartDelimiter,
-				blockCommentEndDelimiter, statements);
-
-			try (DatabaseDelegate closeableDelegate = databaseDelegate) {
-				closeableDelegate.execute(statements, scriptPath, continueOnError, ignoreFailedDrops);
-			}
-
-			long elapsedTime = System.currentTimeMillis() - startTime;
-			if (LOGGER.isInfoEnabled()) {
-				LOGGER.info("Executed database script from " + scriptPath + " in " + elapsedTime + " ms.");
-			}
-		}
-		catch (Exception ex) {
-			if (ex instanceof ScriptException) {
-				throw (ScriptException) ex;
-			}
-
-			throw new UncategorizedScriptException(
-				"Failed to execute database script from resource [" + script + "]", ex);
-		}
-	}
-
-	public static class ScriptLoadException extends RuntimeException {
-		public ScriptLoadException(String message) {
-			super(message);
-		}
-
-		public ScriptLoadException(String message, Throwable cause) {
-			super(message, cause);
-		}
-	}
-
-	public static class ScriptParseException extends RuntimeException {
-		public ScriptParseException(String format, String scriptPath) {
-			super(String.format(format, scriptPath));
-		}
-	}
-
-	public static class ScriptStatementFailedException extends RuntimeException {
-		public ScriptStatementFailedException(String statement, int lineNumber, String scriptPath) {
-			this(statement, lineNumber, scriptPath, null);
-		}
-
-		public ScriptStatementFailedException(String statement, int lineNumber, String scriptPath, Exception ex) {
-			super(String.format("Script execution failed (%s:%d): %s", scriptPath, lineNumber, statement), ex);
-		}
-	}
+     * {@code null} or empty       @throws ScriptException if an error occurred while executing the SQL script
+     */
+    public static void executeDatabaseScript(
+        DatabaseDelegate databaseDelegate,
+        String scriptPath,
+        String script,
+        boolean continueOnError,
+        boolean ignoreFailedDrops,
+        String commentPrefix,
+        String separator,
+        String blockCommentStartDelimiter,
+        String blockCommentEndDelimiter
+    ) throws ScriptException {
+        try {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("Executing database script from " + scriptPath);
+            }
+
+            long startTime = System.currentTimeMillis();
+            List<String> statements = new LinkedList<>();
+
+            if (separator == null) {
+                separator = DEFAULT_STATEMENT_SEPARATOR;
+            }
+            if (!containsSqlScriptDelimiters(script, separator)) {
+                separator = FALLBACK_STATEMENT_SEPARATOR;
+            }
+
+            splitSqlScript(
+                scriptPath,
+                script,
+                separator,
+                commentPrefix,
+                blockCommentStartDelimiter,
+                blockCommentEndDelimiter,
+                statements
+            );
+
+            try (DatabaseDelegate closeableDelegate = databaseDelegate) {
+                closeableDelegate.execute(statements, scriptPath, continueOnError, ignoreFailedDrops);
+            }
+
+            long elapsedTime = System.currentTimeMillis() - startTime;
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("Executed database script from " + scriptPath + " in " + elapsedTime + " ms.");
+            }
+        } catch (Exception ex) {
+            if (ex instanceof ScriptException) {
+                throw (ScriptException) ex;
+            }
+
+            throw new UncategorizedScriptException(
+                "Failed to execute database script from resource [" + script + "]",
+                ex
+            );
+        }
+    }
+
+    public static class ScriptLoadException extends RuntimeException {
+
+        public ScriptLoadException(String message) {
+            super(message);
+        }
+
+        public ScriptLoadException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    public static class ScriptParseException extends RuntimeException {
+
+        public ScriptParseException(String format, String scriptPath) {
+            super(String.format(format, scriptPath));
+        }
+    }
+
+    public static class ScriptStatementFailedException extends RuntimeException {
+
+        public ScriptStatementFailedException(String statement, int lineNumber, String scriptPath) {
+            this(statement, lineNumber, scriptPath, null);
+        }
+
+        public ScriptStatementFailedException(String statement, int lineNumber, String scriptPath, Exception ex) {
+            super(String.format("Script execution failed (%s:%d): %s", scriptPath, lineNumber, statement), ex);
+        }
+    }
 
     public static class UncategorizedScriptException extends RuntimeException {
+
         public UncategorizedScriptException(String s, Exception ex) {
             super(s, ex);
         }
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index 202a3b995db..bc9476cc83d 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -4,11 +4,10 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assert.fail;
-import static org.testcontainers.ext.ScriptUtils.*;
 
 public class ScriptSplittingTest {
 
@@ -16,18 +15,15 @@ public class ScriptSplittingTest {
     public void testStringDemarcation() {
         String script = "SELECT 'foo `bar`'; SELECT 'foo -- `bar`'; SELECT 'foo /* `bar`';";
 
-        List<String> expected = asList(
-            "SELECT 'foo `bar`'",
-            "SELECT 'foo -- `bar`'",
-            "SELECT 'foo /* `bar`'"
-        );
+        List<String> expected = Arrays.asList("SELECT 'foo `bar`'", "SELECT 'foo -- `bar`'", "SELECT 'foo /* `bar`'");
 
         splitAndCompare(script, expected);
     }
 
     @Test
     public void testIssue1547Case1() {
-        String script = "create database if not exists ttt;\n" +
+        String script =
+            "create database if not exists ttt;\n" +
             "\n" +
             "use ttt;\n" +
             "\n" +
@@ -43,7 +39,7 @@ public void testIssue1547Case1() {
             "    id                  bigint auto_increment   primary key\n" +
             ") comment 'bbb';";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "create database if not exists ttt",
             "use ttt",
             "create table aaa ( id bigint auto_increment primary key, end_time datetime null COMMENT 'end_time', data_status varchar(16) not null ) comment 'aaa'",
@@ -55,14 +51,15 @@ public void testIssue1547Case1() {
 
     @Test
     public void testIssue1547Case2() {
-        String script = "CREATE TABLE bar (\n" +
+        String script =
+            "CREATE TABLE bar (\n" +
             "  end_time VARCHAR(255)\n" +
             ");\n" +
             "CREATE TABLE bar (\n" +
             "  end_time VARCHAR(255)\n" +
             ");";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "CREATE TABLE bar ( end_time VARCHAR(255) )",
             "CREATE TABLE bar ( end_time VARCHAR(255) )"
         );
@@ -74,25 +71,17 @@ public void testIssue1547Case2() {
     public void testUnusualSemicolonPlacement() {
         String script = "SELECT 1;;;;;SELECT 2;\n;SELECT 3\n; SELECT 4;\n SELECT 5";
 
-        List<String> expected = asList(
-            "SELECT 1",
-            "SELECT 2",
-            "SELECT 3",
-            "SELECT 4",
-            "SELECT 5"
-        );
+        List<String> expected = Arrays.asList("SELECT 1", "SELECT 2", "SELECT 3", "SELECT 4", "SELECT 5");
 
         splitAndCompare(script, expected);
     }
 
     @Test
     public void testCommentedSemicolon() {
-        String script = "CREATE TABLE bar (\n" +
-            "  foo VARCHAR(255)\n" +
-            "); \nDROP PROCEDURE IF EXISTS -- ;\n" +
-            "    count_foo";
+        String script =
+            "CREATE TABLE bar (\n" + "  foo VARCHAR(255)\n" + "); \nDROP PROCEDURE IF EXISTS -- ;\n" + "    count_foo";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "CREATE TABLE bar ( foo VARCHAR(255) )",
             "DROP PROCEDURE IF EXISTS count_foo"
         );
@@ -102,11 +91,12 @@ public void testCommentedSemicolon() {
 
     @Test
     public void testStringEscaping() {
-        String script = "SELECT \"a /* string literal containing comment characters like -- here\";\n" +
+        String script =
+            "SELECT \"a /* string literal containing comment characters like -- here\";\n" +
             "SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\";\n" +
             "SELECT * from `bar`;";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "SELECT \"a /* string literal containing comment characters like -- here\"",
             "SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\"",
             "SELECT * from `bar`"
@@ -119,18 +109,17 @@ public void testStringEscaping() {
     public void testBlockCommentExclusion() {
         String script = "INSERT INTO bar (foo) /* ; */ VALUES ('hello world');";
 
-        List<String> expected = asList(
-            "INSERT INTO bar (foo) VALUES ('hello world')"
-        );
+        List<String> expected = Arrays.asList("INSERT INTO bar (foo) VALUES ('hello world')");
 
         splitAndCompare(script, expected);
     }
 
     @Test
     public void testBeginEndKeywordCorrectDetection() {
-        String script = "INSERT INTO something_end (begin_with_the_token, another_field) /*end*/ VALUES /* end */ (' begin ', `end`)-- begin\n;";
+        String script =
+            "INSERT INTO something_end (begin_with_the_token, another_field) /*end*/ VALUES /* end */ (' begin ', `end`)-- begin\n;";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "INSERT INTO something_end (begin_with_the_token, another_field) VALUES (' begin ', `end`)"
         );
 
@@ -139,16 +128,17 @@ public void testBeginEndKeywordCorrectDetection() {
 
     @Test
     public void testCommentInStrings() {
-        String script = "CREATE TABLE bar (foo VARCHAR(255));\n" +
+        String script =
+            "CREATE TABLE bar (foo VARCHAR(255));\n" +
             "\n" +
             "/* Insert Values */\n" +
             "INSERT INTO bar (foo) values ('--1');\n" +
             "INSERT INTO bar (foo) values ('--2');\n" +
             "INSERT INTO bar (foo) values ('/* something */');\n" +
-            "/* INSERT INTO bar (foo) values (' */'); -- '*/;\n" +      // purposefully broken, to see if it breaks our splitting
+            "/* INSERT INTO bar (foo) values (' */'); -- '*/;\n" + // purposefully broken, to see if it breaks our splitting
             "INSERT INTO bar (foo) values ('foo');";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "CREATE TABLE bar (foo VARCHAR(255))",
             "INSERT INTO bar (foo) values ('--1')",
             "INSERT INTO bar (foo) values ('--2')",
@@ -162,7 +152,8 @@ public void testCommentInStrings() {
 
     @Test
     public void testMultipleBeginEndDetection() {
-        String script = "CREATE TABLE bar (foo VARCHAR(255));\n" +
+        String script =
+            "CREATE TABLE bar (foo VARCHAR(255));\n" +
             "\n" +
             "CREATE TABLE gender (gender VARCHAR(255));\n" +
             "CREATE TABLE ending (ending VARCHAR(255));\n" +
@@ -187,24 +178,16 @@ public void testMultipleBeginEndDetection() {
             "\n" +
             "CREATE TABLE foo (bar VARCHAR(255));";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "CREATE TABLE bar (foo VARCHAR(255))",
             "CREATE TABLE gender (gender VARCHAR(255))",
             "CREATE TABLE ending (ending VARCHAR(255))",
             "CREATE TABLE end2 (end2 VARCHAR(255))",
             "CREATE TABLE end_2 (end2 VARCHAR(255))",
-            "BEGIN\n" +
-                "  INSERT INTO ending values ('ending');\n" +
-                "END",
-            "BEGIN\n" +
-                "  INSERT INTO ending values ('ending');\n" +
-                "END",
-            "BEGIN--Hello\n" +
-                "  INSERT INTO ending values ('ending');\n" +
-                "END",
-            "BEGIN\n" +
-                "  INSERT INTO ending values ('ending');\n" +
-                "END",
+            "BEGIN\n" + "  INSERT INTO ending values ('ending');\n" + "END",
+            "BEGIN\n" + "  INSERT INTO ending values ('ending');\n" + "END",
+            "BEGIN--Hello\n" + "  INSERT INTO ending values ('ending');\n" + "END",
+            "BEGIN\n" + "  INSERT INTO ending values ('ending');\n" + "END",
             "CREATE TABLE foo (bar VARCHAR(255))"
         );
 
@@ -213,7 +196,8 @@ public void testMultipleBeginEndDetection() {
 
     @Test
     public void testProcedureBlock() {
-        String script = "CREATE PROCEDURE count_foo()\n" +
+        String script =
+            "CREATE PROCEDURE count_foo()\n" +
             "  BEGIN\n" +
             "\n" +
             "    BEGIN\n" +
@@ -239,31 +223,31 @@ public void testProcedureBlock() {
             "\n" +
             "  END /*; */;";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "CREATE PROCEDURE count_foo() BEGIN\n" +
-                "\n" +
-                "    BEGIN\n" +
-                "      SELECT *\n" +
-                "      FROM bar;\n" +
-                "      SELECT 1\n" +
-                "      FROM dual;\n" +
-                "    END;\n" +
-                "\n" +
-                "    BEGIN\n" +
-                "      select * from bar;\n" +
-                "    END;\n" +
-                "\n" +
-                "    -- we can do comments\n" +
-                "\n" +
-                "    /* including block\n" +
-                "       comments\n" +
-                "     */\n" +
-                "\n" +
-                "    /* what if BEGIN appears inside a comment? */\n" +
-                "\n" +
-                "    select \"or what if BEGIN appears inside a literal?\";\n" +
-                "\n" +
-                "  END"
+            "\n" +
+            "    BEGIN\n" +
+            "      SELECT *\n" +
+            "      FROM bar;\n" +
+            "      SELECT 1\n" +
+            "      FROM dual;\n" +
+            "    END;\n" +
+            "\n" +
+            "    BEGIN\n" +
+            "      select * from bar;\n" +
+            "    END;\n" +
+            "\n" +
+            "    -- we can do comments\n" +
+            "\n" +
+            "    /* including block\n" +
+            "       comments\n" +
+            "     */\n" +
+            "\n" +
+            "    /* what if BEGIN appears inside a comment? */\n" +
+            "\n" +
+            "    select \"or what if BEGIN appears inside a literal?\";\n" +
+            "\n" +
+            "  END"
         );
 
         splitAndCompare(script, expected);
@@ -283,12 +267,13 @@ public void testUnclosedBlockComment() {
 
     @Test
     public void testIssue1452Case() {
-        String script = "create table test (text VARCHAR(255));\n" +
+        String script =
+            "create table test (text VARCHAR(255));\n" +
             "\n" +
             "/* some comment */\n" +
             "insert into `test` (`text`) values ('a     b');";
 
-        List<String> expected = asList(
+        List<String> expected = Arrays.asList(
             "create table test (text VARCHAR(255))",
             "insert into `test` (`text`) values ('a     b')"
         );
@@ -303,7 +288,15 @@ private void splitAndCompare(String script, List<String> expected) {
 
     private List<String> doSplit(String script) {
         final List<String> statements = new ArrayList<>();
-        ScriptUtils.splitSqlScript("ignored", script, DEFAULT_STATEMENT_SEPARATOR, DEFAULT_COMMENT_PREFIX, DEFAULT_BLOCK_COMMENT_START_DELIMITER, DEFAULT_BLOCK_COMMENT_END_DELIMITER, statements);
+        ScriptUtils.splitSqlScript(
+            "ignored",
+            script,
+            ScriptUtils.DEFAULT_STATEMENT_SEPARATOR,
+            ScriptUtils.DEFAULT_COMMENT_PREFIX,
+            ScriptUtils.DEFAULT_BLOCK_COMMENT_START_DELIMITER,
+            ScriptUtils.DEFAULT_BLOCK_COMMENT_END_DELIMITER,
+            statements
+        );
         return statements;
     }
 }
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index c1a252936ea..29e2ce8aa07 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -20,10 +20,13 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     @Deprecated
     public static final String DEFAULT_TAG = "11.5.0.0a";
+
     public static final int DB2_PORT = 50000;
 
     private String databaseName = "test";
+
     private String username = "db2inst1";
+
     private String password = "foobar1234";
 
     /**
@@ -40,11 +43,11 @@ public Db2Container(String dockerImageName) {
 
     public Db2Container(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withPrivilegedMode(true);
-        this.waitStrategy = new LogMessageWaitStrategy()
+        this.waitStrategy =
+            new LogMessageWaitStrategy()
                 .withRegEx(".*Setup has completed\\..*")
                 .withStartupTimeout(Duration.of(10, ChronoUnit.MINUTES));
 
@@ -69,10 +72,12 @@ protected void configure() {
         addEnv("DB2INST1_PASSWORD", password);
 
         // These settings help the DB2 container start faster
-        if (!getEnvMap().containsKey("AUTOCONFIG"))
+        if (!getEnvMap().containsKey("AUTOCONFIG")) {
             addEnv("AUTOCONFIG", "false");
-        if (!getEnvMap().containsKey("ARCHIVE_LOGS"))
+        }
+        if (!getEnvMap().containsKey("ARCHIVE_LOGS")) {
             addEnv("ARCHIVE_LOGS", "false");
+        }
     }
 
     /**
@@ -92,8 +97,7 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         String additionalUrlParams = constructUrlParameters(":", ";", ";");
-        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
index 618b97c3ca6..42ac21f271b 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2ContainerProvider.java
@@ -3,6 +3,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 public class Db2ContainerProvider extends JdbcDatabaseContainerProvider {
+
     @Override
     public boolean supports(String databaseType) {
         return databaseType.equals(Db2Container.NAME);
diff --git a/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
index 2c87a4a1a65..4a03f824a28 100644
--- a/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
+++ b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
@@ -4,18 +4,18 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class DB2JDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class)}
-            });
+        return Arrays.asList(
+            new Object[][] { //
+                { "jdbc:tc:db2://hostname/databasename", EnumSet.noneOf(Options.class) },
+            }
+        );
     }
 }
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index b7a1d5478e8..8f3489eae95 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -1,24 +1,22 @@
 package org.testcontainers.junit.db2;
 
 import org.junit.Test;
+import org.testcontainers.Db2TestImages;
 import org.testcontainers.containers.Db2Container;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.Db2TestImages.DB2_IMAGE;
 
 public class SimpleDb2Test extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (Db2Container db2 = new Db2Container(DB2_IMAGE)
-            .acceptLicense()) {
-
+        try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) {
             db2.start();
 
             ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
@@ -30,10 +28,11 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (Db2Container db2 = new Db2Container(DB2_IMAGE)
-            .withUrlParam("sslConnection", "false")
-            .acceptLicense()) {
-
+        try (
+            Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE)
+                .withUrlParam("sslConnection", "false")
+                .acceptLicense()
+        ) {
             db2.start();
 
             String jdbcUrl = db2.getJdbcUrl();
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
index 8900964a8bb..401fa8782b1 100644
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
@@ -15,7 +15,9 @@
 public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("quay.io/testcontainers/dynalite");
+
     private static final String DEFAULT_TAG = "v1.2.1-1";
+
     private static final int MAPPED_PORT = 4567;
 
     /**
@@ -32,13 +34,11 @@ public DynaliteContainer(String dockerImageName) {
 
     public DynaliteContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(MAPPED_PORT);
     }
 
-
     /**
      * Gets a preconfigured {@link AmazonDynamoDB} client object for connecting to this
      * container.
@@ -46,10 +46,11 @@ public DynaliteContainer(final DockerImageName dockerImageName) {
      * @return preconfigured client
      */
     public AmazonDynamoDB getClient() {
-        return AmazonDynamoDBClientBuilder.standard()
-                .withEndpointConfiguration(getEndpointConfiguration())
-                .withCredentials(getCredentials())
-                .build();
+        return AmazonDynamoDBClientBuilder
+            .standard()
+            .withEndpointConfiguration(getEndpointConfiguration())
+            .withCredentials(getCredentials())
+            .build();
     }
 
     /**
@@ -59,9 +60,10 @@ public AmazonDynamoDB getClient() {
      * @return endpoint configuration
      */
     public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration() {
-        return new AwsClientBuilder.EndpointConfiguration("http://" +
-                this.getHost() + ":" +
-                this.getMappedPort(MAPPED_PORT), null);
+        return new AwsClientBuilder.EndpointConfiguration(
+            "http://" + this.getHost() + ":" + this.getMappedPort(MAPPED_PORT),
+            null
+        );
     }
 
     /**
@@ -72,6 +74,4 @@ public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration() {
     public AWSCredentialsProvider getCredentials() {
         return new AWSStaticCredentialsProvider(new BasicAWSCredentials("dummy", "dummy"));
     }
-
-
 }
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
index 0b440939139..ced5931de31 100644
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
@@ -18,17 +18,20 @@
 
 public class DynaliteContainerTest {
 
-    private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse("quay.io/testcontainers/dynalite:v1.2.1-1");
+    private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse(
+        "quay.io/testcontainers/dynalite:v1.2.1-1"
+    );
 
     @Rule
     public DynaliteContainer dynamoDB = new DynaliteContainer(DYNALITE_IMAGE);
 
     @Test
     public void simpleTestWithManualClientCreation() {
-        final AmazonDynamoDB client = AmazonDynamoDBClientBuilder.standard()
-                .withEndpointConfiguration(dynamoDB.getEndpointConfiguration())
-                .withCredentials(dynamoDB.getCredentials())
-                .build();
+        final AmazonDynamoDB client = AmazonDynamoDBClientBuilder
+            .standard()
+            .withEndpointConfiguration(dynamoDB.getEndpointConfiguration())
+            .withCredentials(dynamoDB.getCredentials())
+            .build();
 
         runTest(client);
     }
@@ -42,13 +45,10 @@ public void simpleTestWithProvidedClient() {
 
     private void runTest(AmazonDynamoDB client) {
         CreateTableRequest request = new CreateTableRequest()
-                .withAttributeDefinitions(new AttributeDefinition(
-                        "Name", ScalarAttributeType.S))
-                .withKeySchema(new KeySchemaElement("Name", KeyType.HASH))
-                .withProvisionedThroughput(new ProvisionedThroughput(
-                    10L, 10L))
-                .withTableName("foo");
-
+            .withAttributeDefinitions(new AttributeDefinition("Name", ScalarAttributeType.S))
+            .withKeySchema(new KeySchemaElement("Name", KeyType.HASH))
+            .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L))
+            .withTableName("foo");
 
         client.createTable(request);
 
@@ -56,6 +56,10 @@ private void runTest(AmazonDynamoDB client) {
 
         assertNotNull("the description is not null", tableDescription);
         assertEquals("the table has the right name", "foo", tableDescription.getTableName());
-        assertEquals("the name has the right primary key", "Name", tableDescription.getKeySchema().get(0).getAttributeName());
+        assertEquals(
+            "the name has the right primary key",
+            "Name",
+            tableDescription.getKeySchema().get(0).getAttributeName()
+        );
     }
 }
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index ac0b367f403..5a64a5e67a2 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -11,8 +11,6 @@
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
 import java.io.ByteArrayInputStream;
 import java.net.InetSocketAddress;
 import java.security.KeyStore;
@@ -20,6 +18,9 @@
 import java.security.cert.CertificateFactory;
 import java.util.Optional;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+
 /**
  * Represents an elasticsearch docker instance which exposes by default port 9200 and 9300 (transport.tcp.port)
  * The docker image is by default fetched from docker.elastic.co/elasticsearch/elasticsearch
@@ -47,8 +48,13 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     /**
      * Elasticsearch Docker base image
      */
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch");
-    private static final DockerImageName DEFAULT_OSS_IMAGE_NAME = DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "docker.elastic.co/elasticsearch/elasticsearch"
+    );
+
+    private static final DockerImageName DEFAULT_OSS_IMAGE_NAME = DockerImageName.parse(
+        "docker.elastic.co/elasticsearch/elasticsearch-oss"
+    );
 
     /**
      * Elasticsearch Default version
@@ -57,8 +63,11 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     protected static final String DEFAULT_TAG = "7.9.2";
 
     private final boolean isOss;
+
     private final boolean isAtLeastMajorVersion8;
+
     private Optional<byte[]> caCertAsBytes = Optional.empty();
+
     private String certPath = "/usr/share/elasticsearch/config/certs/http_ca.crt";
 
     /**
@@ -83,7 +92,6 @@ public ElasticsearchContainer(String dockerImageName) {
      */
     public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME);
         this.isOss = dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME);
 
@@ -91,7 +99,8 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
         withEnv("discovery.type", "single-node");
         addExposedPorts(ELASTICSEARCH_DEFAULT_PORT, ELASTICSEARCH_DEFAULT_TCP_PORT);
-        this.isAtLeastMajorVersion8 = new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("8.0.0");
+        this.isAtLeastMajorVersion8 =
+            new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("8.0.0");
         // regex that
         //   matches 8.0 JSON logging with no whitespace between message field and content
         //   matches 7.x JSON logging with whitespace between message field and content
@@ -159,8 +168,9 @@ public SSLContext createSslContextFromCa() {
      */
     public ElasticsearchContainer withPassword(String password) {
         if (isOss) {
-            throw new IllegalArgumentException("You can not activate security on Elastic OSS Image. " +
-                "Please switch to the default distribution");
+            throw new IllegalArgumentException(
+                "You can not activate security on Elastic OSS Image. " + "Please switch to the default distribution"
+            );
         }
         withEnv("ELASTIC_PASSWORD", password);
         if (!isAtLeastMajorVersion8) {
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 5b6b5ce3194..4427163ca56 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -25,12 +25,13 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
-import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
+import javax.net.ssl.SSLHandshakeException;
+
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 
 public class ElasticsearchContainerTest {
@@ -39,10 +40,10 @@ public class ElasticsearchContainerTest {
      * Elasticsearch version which should be used for the Tests
      */
     private static final String ELASTICSEARCH_VERSION = "7.9.2";
-    private static final DockerImageName ELASTICSEARCH_IMAGE =
-        DockerImageName
-            .parse("docker.elastic.co/elasticsearch/elasticsearch")
-            .withTag(ELASTICSEARCH_VERSION);
+
+    private static final DockerImageName ELASTICSEARCH_IMAGE = DockerImageName
+        .parse("docker.elastic.co/elasticsearch/elasticsearch")
+        .withTag(ELASTICSEARCH_VERSION);
 
     /**
      * Elasticsearch default username, when secured
@@ -55,6 +56,7 @@ public class ElasticsearchContainerTest {
     private static final String ELASTICSEARCH_PASSWORD = "changeme";
 
     private RestClient client = null;
+
     private RestClient anonymousClient = null;
 
     @After
@@ -74,8 +76,8 @@ public void stopRestClient() throws IOException {
     @Deprecated // We will remove this test in the future
     public void elasticsearchDeprecatedCtorTest() throws IOException {
         // Create the elasticsearch container.
-        try (ElasticsearchContainer container = new ElasticsearchContainer()
-            .withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer().withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
         ) {
             // Start the container. This step might take some time...
             container.start();
@@ -96,8 +98,8 @@ public void elasticsearchDeprecatedCtorTest() throws IOException {
     @Test
     public void elasticsearchDefaultTest() throws IOException {
         // Create the elasticsearch container.
-        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
-            .withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
         ) {
             // Start the container. This step might take some time...
             container.start();
@@ -117,14 +119,18 @@ public void elasticsearchDefaultTest() throws IOException {
 
     @Test
     public void elasticsearchSecuredTest() throws IOException {
-        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
-            .withPassword(ELASTICSEARCH_PASSWORD)) {
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
+                .withPassword(ELASTICSEARCH_PASSWORD)
+        ) {
             container.start();
 
             // The cluster should be secured so it must fail when we try to access / without credentials
-            assertThrows("We should not be able to access / URI with an anonymous client.",
+            assertThrows(
+                "We should not be able to access / URI with an anonymous client.",
                 ResponseException.class,
-                () -> getAnonymousClient(container).performRequest(new Request("GET", "/")));
+                () -> getAnonymousClient(container).performRequest(new Request("GET", "/"))
+            );
 
             // But it should work when we try to access / with the proper login and password
             Response response = getClient(container).performRequest(new Request("GET", "/"));
@@ -146,22 +152,24 @@ public void elasticsearchVersion() throws IOException {
 
     @Test
     public void elasticsearchOssImage() throws IOException {
-        try (ElasticsearchContainer container =
-                 // ossContainer {
-                 new ElasticsearchContainer(
-                     DockerImageName
-                         .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                         .withTag(ELASTICSEARCH_VERSION)
-                 )
-             // }
+        try (
+            // ossContainer {
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                DockerImageName
+                    .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
+                    .withTag(ELASTICSEARCH_VERSION)
+            )
+            // }
         ) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
             // The OSS image does not have any feature under Elastic License
-            assertThrows("We should not have /_xpack endpoint with an OSS License",
+            assertThrows(
+                "We should not have /_xpack endpoint with an OSS License",
                 ResponseException.class,
-                () -> getClient(container).performRequest(new Request("GET", "/_xpack/")));
+                () -> getClient(container).performRequest(new Request("GET", "/_xpack/"))
+            );
         }
     }
 
@@ -175,12 +183,18 @@ public void restClientClusterHealth() throws IOException {
 
             // Do whatever you want with the rest client ...
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY,
-                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD));
-
-            client = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
-                .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
-                .build();
+            credentialsProvider.setCredentials(
+                AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+            );
+
+            client =
+                RestClient
+                    .builder(HttpHost.create(container.getHttpHostAddress()))
+                    .setHttpClientConfigCallback(httpClientBuilder -> {
+                        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    })
+                    .build();
 
             Response response = client.performRequest(new Request("GET", "/_cluster/health"));
             // }}
@@ -195,20 +209,28 @@ public void restClientClusterHealth() throws IOException {
     public void restClientSecuredClusterHealth() throws IOException {
         // httpClientSecuredContainer {
         // Create the elasticsearch container.
-        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
-            // With a password
-            .withPassword(ELASTICSEARCH_PASSWORD)) {
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
+                // With a password
+                .withPassword(ELASTICSEARCH_PASSWORD)
+        ) {
             // Start the container. This step might take some time...
             container.start();
 
             // Create the secured client.
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY,
-                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD));
-
-            client = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
-                .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
-                .build();
+            credentialsProvider.setCredentials(
+                AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+            );
+
+            client =
+                RestClient
+                    .builder(HttpHost.create(container.getHttpHostAddress()))
+                    .setHttpClientConfigCallback(httpClientBuilder -> {
+                        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    })
+                    .build();
 
             Response response = client.performRequest(new Request("GET", "/_cluster/health"));
             // }}
@@ -224,7 +246,7 @@ public void restClientSecuredClusterHealth() throws IOException {
     public void transportClientClusterHealth() {
         // transportClientContainer {
         // Create the elasticsearch container.
-        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)){
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
             // Start the container. This step might take some time...
             container.start();
 
@@ -232,8 +254,10 @@ public void transportClientClusterHealth() {
             TransportAddress transportAddress = new TransportAddress(container.getTcpHost());
             String expectedClusterName = "docker-cluster";
             Settings settings = Settings.builder().put("cluster.name", expectedClusterName).build();
-            try (TransportClient transportClient = new PreBuiltTransportClient(settings)
-                .addTransportAddress(transportAddress)) {
+            try (
+                TransportClient transportClient = new PreBuiltTransportClient(settings)
+                    .addTransportAddress(transportAddress)
+            ) {
                 ClusterHealthResponse healths = transportClient.admin().cluster().prepareHealth().get();
                 String clusterName = healths.getClusterName();
                 // }}}
@@ -247,19 +271,27 @@ public void transportClientClusterHealth() {
     @Test
     public void incompatibleSettingsTest() {
         // The OSS image can not use security feature
-        assertThrows("We should not be able to activate security with an OSS License",
+        assertThrows(
+            "We should not be able to activate security with an OSS License",
             IllegalArgumentException.class,
-            () -> new ElasticsearchContainer(
-                DockerImageName
-                    .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                    .withTag(ELASTICSEARCH_VERSION))
-            .withPassword("foo")
+            () -> {
+                new ElasticsearchContainer(
+                    DockerImageName
+                        .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
+                        .withTag(ELASTICSEARCH_VERSION)
+                )
+                    .withPassword("foo");
+            }
         );
     }
 
     @Test
     public void testElasticsearch8SecureByDefault() throws Exception {
-        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.1.2")) {
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+            )
+        ) {
             // Start the container. This step might take some time...
             container.start();
 
@@ -273,29 +305,40 @@ public void testElasticsearch8SecureByDefault() throws Exception {
     public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("http_ca.crt");
         String caPath = "/tmp/http_ca.crt";
-        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.1.2")
-            .withCopyToContainer(mountableFile, caPath)
-            .withCertPath(caPath)) {
-
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+            )
+                .withCopyToContainer(mountableFile, caPath)
+                .withCertPath(caPath)
+        ) {
             container.start();
 
             // this is expected, as a different cert is used for creating the SSL context
-            assertThrows("PKIX path validation failed: java.security.cert.CertPathValidatorException: Path does not chain with any of the trust anchors", SSLHandshakeException.class, () -> getClusterHealth(container));
+            assertThrows(
+                "PKIX path validation failed: java.security.cert.CertPathValidatorException: Path does not chain with any of the trust anchors",
+                SSLHandshakeException.class,
+                () -> getClusterHealth(container)
+            );
         }
     }
 
     @Test
     public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
-        final HttpWaitStrategy httpsWaitStrategy = Wait.forHttps("/")
+        final HttpWaitStrategy httpsWaitStrategy = Wait
+            .forHttps("/")
             .forPort(9200)
             .forStatusCode(200)
             .withBasicCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
             // trusting self-signed certificate
             .allowInsecure();
 
-        try (ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.1.2")
-            .waitingFor(httpsWaitStrategy)) {
-
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+            )
+                .waitingFor(httpsWaitStrategy)
+        ) {
             // Start the container. This step might take some time...
             container.start();
 
@@ -311,7 +354,9 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
         // even though the version might be older than version 8
         // this tags an old 7.x version as :latest
         tagImage("docker.elastic.co/elasticsearch/elasticsearch:7.9.2", "elasticsearch-tc-older-release", "latest");
-        DockerImageName image = DockerImageName.parse("elasticsearch-tc-older-release:latest").asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch");
+        DockerImageName image = DockerImageName
+            .parse("elasticsearch-tc-older-release:latest")
+            .asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch");
 
         try (ElasticsearchContainer container = new ElasticsearchContainer(image)) {
             container.start();
@@ -324,27 +369,31 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
 
     private void tagImage(String sourceImage, String targetImage, String targetTag) throws InterruptedException {
         DockerClient dockerClient = DockerClientFactory.instance().client();
-        dockerClient.tagImageCmd(
-                new RemoteDockerImage(DockerImageName.parse(sourceImage)).get(),
-                targetImage,
-                targetTag
-            )
+        dockerClient
+            .tagImageCmd(new RemoteDockerImage(DockerImageName.parse(sourceImage)).get(), targetImage, targetTag)
             .exec();
     }
 
     private Response getClusterHealth(ElasticsearchContainer container) throws IOException {
         // Create the secured client.
         final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-        credentialsProvider.setCredentials(AuthScope.ANY,
-            new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD));
+        credentialsProvider.setCredentials(
+            AuthScope.ANY,
+            new UsernamePasswordCredentials(
+                ELASTICSEARCH_USERNAME,
+                ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD
+            )
+        );
 
-        client = RestClient.builder(HttpHost.create("https://" + container.getHttpHostAddress()))
-            .setHttpClientConfigCallback(httpClientBuilder -> {
-                httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-                httpClientBuilder.setSSLContext(container.createSslContextFromCa());
-                return httpClientBuilder;
-            })
-            .build();
+        client =
+            RestClient
+                .builder(HttpHost.create("https://" + container.getHttpHostAddress()))
+                .setHttpClientConfigCallback(httpClientBuilder -> {
+                    httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    httpClientBuilder.setSSLContext(container.createSslContextFromCa());
+                    return httpClientBuilder;
+                })
+                .build();
 
         return client.performRequest(new Request("GET", "/_cluster/health"));
     }
@@ -352,12 +401,18 @@ private Response getClusterHealth(ElasticsearchContainer container) throws IOExc
     private RestClient getClient(ElasticsearchContainer container) {
         if (client == null) {
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY,
-                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD));
-
-            client = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
-                .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
-                .build();
+            credentialsProvider.setCredentials(
+                AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+            );
+
+            client =
+                RestClient
+                    .builder(HttpHost.create(container.getHttpHostAddress()))
+                    .setHttpClientConfigCallback(httpClientBuilder -> {
+                        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    })
+                    .build();
         }
 
         return client;
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index 4b81e3964ce..84515fc7244 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -13,19 +13,20 @@
  */
 public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulatorContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
 
     private static final String CMD = "gcloud beta emulators bigtable start --host-port 0.0.0.0:9000";
+
     private static final int PORT = 9000;
 
     public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(PORT);
-        setWaitStrategy(new LogMessageWaitStrategy()
-                .withRegEx("(?s).*running.*$"));
+        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index 58e5c023a0e..b0716829875 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -12,14 +12,17 @@
  */
 public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulatorContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
+
+    private static final String CMD =
+        "gcloud beta emulators datastore start --project test-project --host-port 0.0.0.0:8081";
 
-    private static final String CMD = "gcloud beta emulators datastore start --project test-project --host-port 0.0.0.0:8081";
     private static final int HTTP_PORT = 8081;
 
     public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(HTTP_PORT);
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index c36082dfeb6..a04c1e5831f 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -12,19 +12,20 @@
  */
 public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulatorContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
 
     private static final String CMD = "gcloud beta emulators firestore start --host-port 0.0.0.0:8080";
+
     private static final int PORT = 8080;
 
     public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(PORT);
-        setWaitStrategy(new LogMessageWaitStrategy()
-                .withRegEx("(?s).*running.*$"));
+        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index 231f7626044..8d9f76e44ae 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -12,19 +12,20 @@
  */
 public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
 
     private static final String CMD = "gcloud beta emulators pubsub start --host-port 0.0.0.0:8085";
+
     private static final int PORT = 8085;
 
     public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(8085);
-        setWaitStrategy(new LogMessageWaitStrategy()
-                .withRegEx("(?s).*started.*$"));
+        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*started.*$"));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index 0ae8e89dc06..dc45b004c6c 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -10,19 +10,20 @@
  */
 public class SpannerEmulatorContainer extends GenericContainer<SpannerEmulatorContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/cloud-spanner-emulator/emulator"
+    );
 
     private static final int GRPC_PORT = 9010;
+
     private static final int HTTP_PORT = 9020;
 
     public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(GRPC_PORT, HTTP_PORT);
-        setWaitStrategy(new LogMessageWaitStrategy()
-                .withRegEx(".*Cloud Spanner emulator running\\..*"));
+        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Cloud Spanner emulator running\\..*"));
     }
 
     /**
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
index 4ba59a75488..3e22231220b 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -1,22 +1,13 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.api.core.ApiFuture;
-import com.google.api.gax.batching.Batcher;
 import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.rpc.FixedTransportChannelProvider;
 import com.google.api.gax.rpc.TransportChannelProvider;
-import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient;
 import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
-import com.google.cloud.bigtable.admin.v2.models.CreateInstanceRequest;
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
-import com.google.cloud.bigtable.admin.v2.models.Instance;
 import com.google.cloud.bigtable.admin.v2.models.Table;
-import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStub;
-import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStubSettings;
 import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStubSettings;
 import com.google.cloud.bigtable.admin.v2.stub.EnhancedBigtableTableAdminStub;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
@@ -24,20 +15,22 @@
 import com.google.cloud.bigtable.data.v2.models.Row;
 import com.google.cloud.bigtable.data.v2.models.RowCell;
 import com.google.cloud.bigtable.data.v2.models.RowMutation;
-import com.google.cloud.bigtable.data.v2.models.RowMutationEntry;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class BigtableEmulatorContainerTest {
 
     public static final String PROJECT_ID = "test-project";
+
     public static final String INSTANCE_ID = "test-instance";
 
     @Rule
@@ -45,28 +38,31 @@ public class BigtableEmulatorContainerTest {
     public BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
         DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
+
     // }
 
     @Test
     // testWithEmulatorContainer {
     public void testSimple() throws IOException, InterruptedException, ExecutionException {
-        ManagedChannel channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint())
-            .usePlaintext().build();
+        ManagedChannel channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint()).usePlaintext().build();
 
-        TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
+        TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
+            GrpcTransportChannel.create(channel)
+        );
         NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
 
         try {
-            createTable(channelProvider, credentialsProvider, "test-table" );
+            createTable(channelProvider, credentialsProvider, "test-table");
 
-            BigtableDataClient client = BigtableDataClient.create(BigtableDataSettings
-                .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
-                .setProjectId(PROJECT_ID)
-                .setInstanceId(INSTANCE_ID)
-                .build());
+            BigtableDataClient client = BigtableDataClient.create(
+                BigtableDataSettings
+                    .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
+                    .setProjectId(PROJECT_ID)
+                    .setInstanceId(INSTANCE_ID)
+                    .build()
+            );
 
-            client.mutateRow(RowMutation.create("test-table", "1")
-                .setCell("name", "firstName", "Ray"));
+            client.mutateRow(RowMutation.create("test-table", "1").setCell("name", "firstName", "Ray"));
 
             Row row = client.readRow("test-table", "1");
             List<RowCell> cells = row.getCells("name", "firstName");
@@ -77,15 +73,22 @@ public void testSimple() throws IOException, InterruptedException, ExecutionExce
             channel.shutdown();
         }
     }
+
     // }
 
     // createTable {
-    private void createTable(TransportChannelProvider channelProvider, CredentialsProvider credentialsProvider, String tableName) throws IOException {
-        EnhancedBigtableTableAdminStub stub = EnhancedBigtableTableAdminStub
-            .createEnhanced(BigtableTableAdminStubSettings.newBuilder()
+    private void createTable(
+        TransportChannelProvider channelProvider,
+        CredentialsProvider credentialsProvider,
+        String tableName
+    ) throws IOException {
+        EnhancedBigtableTableAdminStub stub = EnhancedBigtableTableAdminStub.createEnhanced(
+            BigtableTableAdminStubSettings
+                .newBuilder()
                 .setTransportChannelProvider(channelProvider)
                 .setCredentialsProvider(credentialsProvider)
-                .build());
+                .build()
+        );
 
         try (BigtableTableAdminClient client = BigtableTableAdminClient.create(PROJECT_ID, INSTANCE_ID, stub)) {
             Table table = client.createTable(CreateTableRequest.of(tableName).addFamily("name"));
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index ba998e402ce..a7fe340791d 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.datastore.Datastore;
@@ -12,6 +10,8 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class DatastoreEmulatorContainerTest {
 
     @Rule
@@ -19,17 +19,19 @@ public class DatastoreEmulatorContainerTest {
     public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
         DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
+
     // }
 
     //  startingDatastoreEmulatorContainer {
     @Test
     public void testSimple() {
-        DatastoreOptions options = DatastoreOptions.newBuilder()
-                .setHost(emulator.getEmulatorEndpoint())
-                .setCredentials(NoCredentials.getInstance())
-                .setRetrySettings(ServiceOptions.getNoRetrySettings())
-                .setProjectId("test-project")
-                .build();
+        DatastoreOptions options = DatastoreOptions
+            .newBuilder()
+            .setHost(emulator.getEmulatorEndpoint())
+            .setCredentials(NoCredentials.getInstance())
+            .setRetrySettings(ServiceOptions.getNoRetrySettings())
+            .setProjectId("test-project")
+            .build();
         Datastore datastore = options.getService();
 
         Key key = datastore.newKeyFactory().setKind("Task").newKey("sample");
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index 04939ecc30e..c87f8e5176a 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.google.api.core.ApiFuture;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.firestore.CollectionReference;
@@ -10,13 +8,16 @@
 import com.google.cloud.firestore.FirestoreOptions;
 import com.google.cloud.firestore.QuerySnapshot;
 import com.google.cloud.firestore.WriteResult;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class FirestoreEmulatorContainerTest {
 
     @Rule
@@ -24,16 +25,19 @@ public class FirestoreEmulatorContainerTest {
     public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
         DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
+
     // }
 
     // testWithEmulatorContainer {
     @Test
     public void testSimple() throws ExecutionException, InterruptedException {
-        FirestoreOptions options = FirestoreOptions.getDefaultInstance().toBuilder()
-                .setHost(emulator.getEmulatorEndpoint())
-                .setCredentials(NoCredentials.getInstance())
-                .setProjectId("test-project")
-                .build();
+        FirestoreOptions options = FirestoreOptions
+            .getDefaultInstance()
+            .toBuilder()
+            .setHost(emulator.getEmulatorEndpoint())
+            .setCredentials(NoCredentials.getInstance())
+            .setProjectId("test-project")
+            .build();
         Firestore firestore = options.getService();
 
         CollectionReference users = firestore.collection("users");
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index 61d56a279d7..aeb92bc4a69 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.rpc.FixedTransportChannelProvider;
@@ -24,11 +22,14 @@
 import com.google.pubsub.v1.TopicName;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class PubSubEmulatorContainerTest {
 
     public static final String PROJECT_ID = "my-project-id";
@@ -38,8 +39,8 @@ public class PubSubEmulatorContainerTest {
     public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
         DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
     );
-    // }
 
+    // }
 
     @Test
     // testWithEmulatorContainer {
@@ -47,8 +48,9 @@ public void testSimple() throws IOException {
         String hostport = emulator.getEmulatorEndpoint();
         ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
         try {
-            TransportChannelProvider channelProvider =
-                    FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
+            TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
+                GrpcTransportChannel.create(channel)
+            );
             NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
 
             String topicId = "my-topic-id";
@@ -57,56 +59,77 @@ public void testSimple() throws IOException {
             String subscriptionId = "my-subscription-id";
             createSubscription(subscriptionId, topicId, channelProvider, credentialsProvider);
 
-            Publisher publisher = Publisher.newBuilder(TopicName.of(PROJECT_ID, topicId))
-                    .setChannelProvider(channelProvider)
-                    .setCredentialsProvider(credentialsProvider)
-                    .build();
+            Publisher publisher = Publisher
+                .newBuilder(TopicName.of(PROJECT_ID, topicId))
+                .setChannelProvider(channelProvider)
+                .setCredentialsProvider(credentialsProvider)
+                .build();
             PubsubMessage message = PubsubMessage.newBuilder().setData(ByteString.copyFromUtf8("test message")).build();
             publisher.publish(message);
 
-            SubscriberStubSettings subscriberStubSettings =
-                    SubscriberStubSettings.newBuilder()
-                            .setTransportChannelProvider(channelProvider)
-                            .setCredentialsProvider(credentialsProvider)
-                            .build();
+            SubscriberStubSettings subscriberStubSettings = SubscriberStubSettings
+                .newBuilder()
+                .setTransportChannelProvider(channelProvider)
+                .setCredentialsProvider(credentialsProvider)
+                .build();
             try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
-                PullRequest pullRequest = PullRequest.newBuilder()
-                        .setMaxMessages(1)
-                        .setSubscription(ProjectSubscriptionName.format(PROJECT_ID, subscriptionId))
-                        .build();
+                PullRequest pullRequest = PullRequest
+                    .newBuilder()
+                    .setMaxMessages(1)
+                    .setSubscription(ProjectSubscriptionName.format(PROJECT_ID, subscriptionId))
+                    .build();
                 PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
 
                 assertThat(pullResponse.getReceivedMessagesList()).hasSize(1);
-                assertThat(pullResponse.getReceivedMessages(0).getMessage().getData().toStringUtf8()).isEqualTo("test message");
+                assertThat(pullResponse.getReceivedMessages(0).getMessage().getData().toStringUtf8())
+                    .isEqualTo("test message");
             }
         } finally {
             channel.shutdown();
         }
     }
+
     // }
 
     // createTopic {
-    private void createTopic(String topicId, TransportChannelProvider channelProvider, NoCredentialsProvider credentialsProvider) throws IOException {
-        TopicAdminSettings topicAdminSettings = TopicAdminSettings.newBuilder()
-                .setTransportChannelProvider(channelProvider)
-                .setCredentialsProvider(credentialsProvider)
-                .build();
+    private void createTopic(
+        String topicId,
+        TransportChannelProvider channelProvider,
+        NoCredentialsProvider credentialsProvider
+    ) throws IOException {
+        TopicAdminSettings topicAdminSettings = TopicAdminSettings
+            .newBuilder()
+            .setTransportChannelProvider(channelProvider)
+            .setCredentialsProvider(credentialsProvider)
+            .build();
         try (TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings)) {
             TopicName topicName = TopicName.of(PROJECT_ID, topicId);
             topicAdminClient.createTopic(topicName);
         }
     }
+
     // }
 
     // createSubscription {
-    private void createSubscription(String subscriptionId, String topicId, TransportChannelProvider channelProvider, NoCredentialsProvider credentialsProvider) throws IOException {
-        SubscriptionAdminSettings subscriptionAdminSettings = SubscriptionAdminSettings.newBuilder()
-                .setTransportChannelProvider(channelProvider)
-                .setCredentialsProvider(credentialsProvider)
-                .build();
+    private void createSubscription(
+        String subscriptionId,
+        String topicId,
+        TransportChannelProvider channelProvider,
+        NoCredentialsProvider credentialsProvider
+    ) throws IOException {
+        SubscriptionAdminSettings subscriptionAdminSettings = SubscriptionAdminSettings
+            .newBuilder()
+            .setTransportChannelProvider(channelProvider)
+            .setCredentialsProvider(credentialsProvider)
+            .build();
         SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create(subscriptionAdminSettings);
         SubscriptionName subscriptionName = SubscriptionName.of(PROJECT_ID, subscriptionId);
-        subscriptionAdminClient.createSubscription(subscriptionName, TopicName.of(PROJECT_ID, topicId), PushConfig.getDefaultInstance(), 10);
+        subscriptionAdminClient.createSubscription(
+            subscriptionName,
+            TopicName.of(PROJECT_ID, topicId),
+            PushConfig.getDefaultInstance(),
+            10
+        );
     }
     // }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
index 64b81546499..b246e7e1f0d 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.containers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.google.cloud.NoCredentials;
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.DatabaseAdminClient;
@@ -16,12 +14,15 @@
 import com.google.cloud.spanner.Spanner;
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.Statement;
-import java.util.Arrays;
-import java.util.concurrent.ExecutionException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import java.util.Arrays;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SpannerEmulatorContainerTest {
 
     @Rule
@@ -29,20 +30,24 @@ public class SpannerEmulatorContainerTest {
     public SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(
         DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.4.0")
     );
+
     // }
 
     private static final String PROJECT_NAME = "test-project";
+
     private static final String INSTANCE_NAME = "test-instance";
+
     private static final String DATABASE_NAME = "test-database";
 
     // testWithEmulatorContainer {
     @Test
     public void testSimple() throws ExecutionException, InterruptedException {
-        SpannerOptions options = SpannerOptions.newBuilder()
-                .setEmulatorHost(emulator.getEmulatorGrpcEndpoint())
-                .setCredentials(NoCredentials.getInstance())
-                .setProjectId(PROJECT_NAME)
-                .build();
+        SpannerOptions options = SpannerOptions
+            .newBuilder()
+            .setEmulatorHost(emulator.getEmulatorGrpcEndpoint())
+            .setCredentials(NoCredentials.getInstance())
+            .setProjectId(PROJECT_NAME)
+            .build();
 
         Spanner spanner = options.getService();
 
@@ -52,28 +57,38 @@ public void testSimple() throws ExecutionException, InterruptedException {
 
         DatabaseId databaseId = DatabaseId.of(instanceId, DATABASE_NAME);
         DatabaseClient dbClient = spanner.getDatabaseClient(databaseId);
-        dbClient.readWriteTransaction()
-                .run(tx -> {
-                    String sql1 = "Delete from TestTable where 1=1";
-                    tx.executeUpdate(Statement.of(sql1));
-                    String sql = "INSERT INTO TestTable (Key, Value) VALUES (1, 'Java'), (2, 'Go')";
-                    tx.executeUpdate(Statement.of(sql));
-                    return null;
-                });
-
-        ResultSet resultSet = dbClient.readOnlyTransaction()
-                .executeQuery(Statement.of("select * from TestTable order by Key"));
+        dbClient
+            .readWriteTransaction()
+            .run(tx -> {
+                String sql1 = "Delete from TestTable where 1=1";
+                tx.executeUpdate(Statement.of(sql1));
+                String sql = "INSERT INTO TestTable (Key, Value) VALUES (1, 'Java'), (2, 'Go')";
+                tx.executeUpdate(Statement.of(sql));
+                return null;
+            });
+
+        ResultSet resultSet = dbClient
+            .readOnlyTransaction()
+            .executeQuery(Statement.of("select * from TestTable order by Key"));
         resultSet.next();
         assertThat(resultSet.getLong(0)).isEqualTo(1);
         assertThat(resultSet.getString(1)).isEqualTo("Java");
     }
+
     // }
 
     // createDatabase {
     private void createDatabase(Spanner spanner) throws InterruptedException, ExecutionException {
         DatabaseAdminClient dbAdminClient = spanner.getDatabaseAdminClient();
-        Database database = dbAdminClient.createDatabase(INSTANCE_NAME, DATABASE_NAME, Arrays.asList("CREATE TABLE TestTable (Key INT64, Value STRING(MAX)) PRIMARY KEY (Key)")).get();
+        Database database = dbAdminClient
+            .createDatabase(
+                INSTANCE_NAME,
+                DATABASE_NAME,
+                Arrays.asList("CREATE TABLE TestTable (Key INT64, Value STRING(MAX)) PRIMARY KEY (Key)")
+            )
+            .get();
     }
+
     // }
 
     // createInstance {
@@ -81,7 +96,16 @@ private InstanceId createInstance(Spanner spanner) throws InterruptedException,
         InstanceConfigId instanceConfig = InstanceConfigId.of(PROJECT_NAME, "emulator-config");
         InstanceId instanceId = InstanceId.of(PROJECT_NAME, INSTANCE_NAME);
         InstanceAdminClient insAdminClient = spanner.getInstanceAdminClient();
-        Instance instance = insAdminClient.createInstance(InstanceInfo.newBuilder(instanceId).setNodeCount(1).setDisplayName("Test instance").setInstanceConfigId(instanceConfig).build()).get();
+        Instance instance = insAdminClient
+            .createInstance(
+                InstanceInfo
+                    .newBuilder(instanceId)
+                    .setNodeCount(1)
+                    .setDisplayName("Test instance")
+                    .setInstanceConfigId(instanceConfig)
+                    .build()
+            )
+            .get();
         return instanceId;
     }
     // }
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 5bb8935c39e..242cc7bdb43 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -34,27 +34,38 @@ public class HiveMQContainer extends GenericContainer<HiveMQContainer> {
     private static final Logger LOGGER = LoggerFactory.getLogger(HiveMQContainer.class);
 
     private static final DockerImageName DEFAULT_HIVEMQ_EE_IMAGE_NAME = DockerImageName.parse("hivemq/hivemq4");
+
     private static final DockerImageName DEFAULT_HIVEMQ_CE_IMAGE_NAME = DockerImageName.parse("hivemq/hivemq-ce");
 
     private static final int DEBUGGING_PORT = 9000;
+
     private static final int MQTT_PORT = 1883;
+
     private static final int CONTROL_CENTER_PORT = 8080;
+
     @SuppressWarnings("OctalInteger")
     private static final int MODE = 0777;
-    private static final @NotNull Pattern EXTENSION_ID_PATTERN = Pattern.compile("<id>(.+?)</id>");
 
-    private final @NotNull ConcurrentHashMap<String, CountDownLatch> containerOutputLatches = new ConcurrentHashMap<>();
+    @NotNull
+    private static final Pattern EXTENSION_ID_PATTERN = Pattern.compile("<id>(.+?)</id>");
+
+    @NotNull
+    private final ConcurrentHashMap<String, CountDownLatch> containerOutputLatches = new ConcurrentHashMap<>();
+
     private boolean controlCenterEnabled = false;
+
     private boolean debugging = false;
 
-    private final @NotNull Set<String> prepackagedExtensionsToRemove = new HashSet<>();
+    @NotNull
+    private final Set<String> prepackagedExtensionsToRemove = new HashSet<>();
+
     private boolean removeAllPrepackagedExtensions = false;
 
-    private final @NotNull WaitAllStrategy waitStrategy = new WaitAllStrategy();
+    @NotNull
+    private final WaitAllStrategy waitStrategy = new WaitAllStrategy();
 
     public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_HIVEMQ_CE_IMAGE_NAME, DEFAULT_HIVEMQ_EE_IMAGE_NAME);
 
         addExposedPort(MQTT_PORT);
@@ -96,13 +107,14 @@ protected void configure() {
         withCreateContainerCmdModifier(it -> it.withEntrypoint("/bin/sh"));
 
         if (removeAllPrepackagedExtensions || !prepackagedExtensionsToRemove.isEmpty()) {
-
             if (removeAllPrepackagedExtensions) {
                 removeCommand = "rm -rf /opt/hivemq/extensions/** &&";
             } else {
-                removeCommand = prepackagedExtensionsToRemove.stream()
-                    .map(extensionId -> "rm -rf /opt/hivemq/extensions/" + extensionId + "&&")
-                    .collect(Collectors.joining());
+                removeCommand =
+                    prepackagedExtensionsToRemove
+                        .stream()
+                        .map(extensionId -> "rm -rf /opt/hivemq/extensions/" + extensionId + "&&")
+                        .collect(Collectors.joining());
             }
         } else {
             removeCommand = "";
@@ -110,16 +122,20 @@ protected void configure() {
         setCommand(
             "-c",
             removeCommand +
-                "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ " +
-                "; rm -rf /opt/hivemq/temp-extensions/** " +
-                "&& chmod -R 777 /opt/hivemq/extensions " +
-                "&& /opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
+            "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ " +
+            "; rm -rf /opt/hivemq/temp-extensions/** " +
+            "&& chmod -R 777 /opt/hivemq/extensions " +
+            "&& /opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
         );
     }
 
     protected void containerIsStarted(final @NotNull InspectContainerResponse containerInfo) {
         if (controlCenterEnabled) {
-            LOGGER.info("The HiveMQ Control Center is reachable under: http://{}:{}", getHost(), getMappedPort(CONTROL_CENTER_PORT));
+            LOGGER.info(
+                "The HiveMQ Control Center is reachable under: http://{}:{}",
+                getHost(),
+                getMappedPort(CONTROL_CENTER_PORT)
+            );
         }
     }
 
@@ -159,7 +175,10 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
     public @NotNull HiveMQContainer withDebugging() {
         debugging = true;
         addExposedPorts(DEBUGGING_PORT);
-        withEnv("JAVA_OPTS", "-agentlib:jdwp=transport=dt_socket,address=0.0.0.0:" + DEBUGGING_PORT + ",server=y,suspend=y");
+        withEnv(
+            "JAVA_OPTS",
+            "-agentlib:jdwp=transport=dt_socket,address=0.0.0.0:" + DEBUGGING_PORT + ",server=y,suspend=y"
+        );
         return self();
     }
 
@@ -213,10 +232,16 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
     public @NotNull HiveMQContainer withExtension(final @NotNull MountableFile mountableExtension) {
         final File extensionDir = new File(mountableExtension.getResolvedPath());
         if (!extensionDir.exists()) {
-            throw new ContainerLaunchException("Extension '" + mountableExtension.getFilesystemPath() + "' could not be mounted. It does not exist.");
+            throw new ContainerLaunchException(
+                "Extension '" + mountableExtension.getFilesystemPath() + "' could not be mounted. It does not exist."
+            );
         }
         if (!extensionDir.isDirectory()) {
-            throw new ContainerLaunchException("Extension '" + mountableExtension.getFilesystemPath() + "' could not be mounted. It is not a directory.");
+            throw new ContainerLaunchException(
+                "Extension '" +
+                mountableExtension.getFilesystemPath() +
+                "' could not be mounted. It is not a directory."
+            );
         }
         try {
             final String extensionDirName = getExtensionDirectoryName(extensionDir);
@@ -277,10 +302,14 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
     public @NotNull HiveMQContainer withLicense(final @NotNull MountableFile mountableLicense) {
         final File licenseFile = new File(mountableLicense.getResolvedPath());
         if (!licenseFile.exists()) {
-            throw new ContainerLaunchException("License file '" + mountableLicense.getFilesystemPath() + "' does not exist.");
+            throw new ContainerLaunchException(
+                "License file '" + mountableLicense.getFilesystemPath() + "' does not exist."
+            );
         }
         if (!licenseFile.getName().endsWith(".lic") && !licenseFile.getName().endsWith(".elic")) {
-            throw new ContainerLaunchException("License file '" + mountableLicense.getFilesystemPath() + "' does not end wit '.lic' or '.elic'.");
+            throw new ContainerLaunchException(
+                "License file '" + mountableLicense.getFilesystemPath() + "' does not end wit '.lic' or '.elic'."
+            );
         }
         final String containerPath = "/opt/hivemq/license/" + licenseFile.getName();
         withCopyFileToContainer(cloneWithFileMode(mountableLicense), containerPath);
@@ -299,7 +328,9 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
     public @NotNull HiveMQContainer withHiveMQConfig(final @NotNull MountableFile mountableConfig) {
         final File config = new File(mountableConfig.getResolvedPath());
         if (!config.exists()) {
-            throw new ContainerLaunchException("HiveMQ config file '" + mountableConfig.getFilesystemPath() + "' does not exist.");
+            throw new ContainerLaunchException(
+                "HiveMQ config file '" + mountableConfig.getFilesystemPath() + "' does not exist."
+            );
         }
         final String containerPath = "/opt/hivemq/conf/config.xml";
         withCopyFileToContainer(cloneWithFileMode(mountableConfig), containerPath);
@@ -320,8 +351,8 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
      */
     public @NotNull HiveMQContainer withFileInExtensionHomeFolder(
         final @NotNull MountableFile file,
-        final @NotNull String extensionId) {
-
+        final @NotNull String extensionId
+    ) {
         return withFileInExtensionHomeFolder(file, extensionId, "");
     }
 
@@ -340,9 +371,12 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
     public @NotNull HiveMQContainer withFileInExtensionHomeFolder(
         final @NotNull MountableFile file,
         final @NotNull String extensionId,
-        final @NotNull String pathInExtensionHome) {
-
-        return withFileInHomeFolder(file, "/temp-extensions/" + extensionId + PathUtil.prepareAppendPath(pathInExtensionHome));
+        final @NotNull String pathInExtensionHome
+    ) {
+        return withFileInHomeFolder(
+            file,
+            "/temp-extensions/" + extensionId + PathUtil.prepareAppendPath(pathInExtensionHome)
+        );
     }
 
     /**
@@ -356,8 +390,8 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
      */
     public @NotNull HiveMQContainer withFileInHomeFolder(
         final @NotNull MountableFile mountableFile,
-        final @NotNull String pathInHomeFolder) {
-
+        final @NotNull String pathInHomeFolder
+    ) {
         final File file = new File(mountableFile.getResolvedPath());
 
         if (pathInHomeFolder.trim().isEmpty()) {
@@ -388,11 +422,12 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
     public void disableExtension(
         final @NotNull String extensionName,
         final @NotNull String extensionDirectory,
-        final @NotNull Duration timeout) throws TimeoutException {
-
+        final @NotNull Duration timeout
+    ) throws TimeoutException {
         final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) stopped successfully(.*)";
         try {
-            final String containerPath = "/opt/hivemq/extensions" + PathUtil.prepareInnerPath(extensionDirectory) + "DISABLED";
+            final String containerPath =
+                "/opt/hivemq/extensions" + PathUtil.prepareInnerPath(extensionDirectory) + "DISABLED";
 
             final CountDownLatch latch = new CountDownLatch(1);
             containerOutputLatches.put(regEX, latch);
@@ -402,9 +437,13 @@ public void disableExtension(
 
             final boolean await = latch.await(timeout.getSeconds(), TimeUnit.SECONDS);
             if (!await) {
-                throw new TimeoutException("Extension disabling timed out after '" + timeout.getSeconds() + "' seconds. " +
+                throw new TimeoutException(
+                    "Extension disabling timed out after '" +
+                    timeout.getSeconds() +
+                    "' seconds. " +
                     "Maybe you are using a HiveMQ Community Edition image, " +
-                    "which does not support disabling of extensions");
+                    "which does not support disabling of extensions"
+                );
             }
         } catch (final InterruptedException | IOException e) {
             throw new RuntimeException(e);
@@ -424,9 +463,8 @@ public void disableExtension(
      * @param extensionDirectory the name of the extension's directory
      * @throws TimeoutException if the extension was not disabled within 60 seconds
      */
-    public void disableExtension(
-        final @NotNull String extensionName,
-        final @NotNull String extensionDirectory) throws TimeoutException {
+    public void disableExtension(final @NotNull String extensionName, final @NotNull String extensionDirectory)
+        throws TimeoutException {
         disableExtension(extensionName, extensionDirectory, Duration.ofSeconds(60));
     }
 
@@ -441,9 +479,8 @@ public void disableExtension(
      * @param timeout         the timeout
      * @throws TimeoutException if the extension was not disabled within the configured timeout
      */
-    public void disableExtension(
-        final @NotNull HiveMQExtension hiveMQExtension,
-        final @NotNull Duration timeout) throws TimeoutException {
+    public void disableExtension(final @NotNull HiveMQExtension hiveMQExtension, final @NotNull Duration timeout)
+        throws TimeoutException {
         disableExtension(hiveMQExtension.getName(), hiveMQExtension.getId(), timeout);
     }
 
@@ -476,11 +513,12 @@ public void disableExtension(final @NotNull HiveMQExtension hiveMQExtension) thr
     public void enableExtension(
         final @NotNull String extensionName,
         final @NotNull String extensionDirectory,
-        final @NotNull Duration timeout) throws TimeoutException {
-
+        final @NotNull Duration timeout
+    ) throws TimeoutException {
         final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) started successfully(.*)";
         try {
-            final String containerPath = "/opt/hivemq/extensions" + PathUtil.prepareInnerPath(extensionDirectory) + "DISABLED";
+            final String containerPath =
+                "/opt/hivemq/extensions" + PathUtil.prepareInnerPath(extensionDirectory) + "DISABLED";
 
             final CountDownLatch latch = new CountDownLatch(1);
             containerOutputLatches.put(regEX, latch);
@@ -490,9 +528,13 @@ public void enableExtension(
 
             final boolean await = latch.await(timeout.getSeconds(), TimeUnit.SECONDS);
             if (!await) {
-                throw new TimeoutException("Extension enabling timed out after '" + timeout.getSeconds() + "' seconds. " +
+                throw new TimeoutException(
+                    "Extension enabling timed out after '" +
+                    timeout.getSeconds() +
+                    "' seconds. " +
                     "Maybe you are using a HiveMQ Community Edition image, " +
-                    "which does not support disabling of extensions");
+                    "which does not support disabling of extensions"
+                );
             }
         } catch (final InterruptedException | IOException e) {
             throw new RuntimeException(e);
@@ -512,9 +554,8 @@ public void enableExtension(
      * @param extensionDirectory the name of the extension's directory
      * @throws TimeoutException if the extension was not enabled within 60 seconds
      */
-    public void enableExtension(
-        final @NotNull String extensionName,
-        final @NotNull String extensionDirectory) throws TimeoutException {
+    public void enableExtension(final @NotNull String extensionName, final @NotNull String extensionDirectory)
+        throws TimeoutException {
         enableExtension(extensionName, extensionDirectory, Duration.ofSeconds(60));
     }
 
@@ -529,9 +570,8 @@ public void enableExtension(
      * @param timeout         the timeout
      * @throws TimeoutException if the extension was not enabled within the configured timeout
      */
-    public void enableExtension(
-        final @NotNull HiveMQExtension hiveMQExtension,
-        final @NotNull Duration timeout) throws TimeoutException {
+    public void enableExtension(final @NotNull HiveMQExtension hiveMQExtension, final @NotNull Duration timeout)
+        throws TimeoutException {
         enableExtension(hiveMQExtension.getName(), hiveMQExtension.getId(), timeout);
     }
 
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
index 934dfd0c29c..91e984835d6 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQExtension.java
@@ -1,7 +1,5 @@
 package org.testcontainers.hivemq;
 
-import javassist.ClassPool;
-import javassist.NotFoundException;
 import lombok.Getter;
 import org.apache.commons.io.FileUtils;
 import org.jboss.shrinkwrap.api.ExtensionLoader;
@@ -23,28 +21,35 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import javassist.ClassPool;
+import javassist.NotFoundException;
 
 public class HiveMQExtension {
 
     private static final String VALID_EXTENSION_XML =
         "<hivemq-extension>" + //
-            "   <id>%s</id>" + //
-            "   <name>%s</name>" + //
-            "   <version>%s</version>" + //
-            "   <priority>%s</priority>" +  //
-            "   <start-priority>%s</start-priority>" +  //
-            "</hivemq-extension>";
+        "   <id>%s</id>" + //
+        "   <name>%s</name>" + //
+        "   <version>%s</version>" + //
+        "   <priority>%s</priority>" + //
+        "   <start-priority>%s</start-priority>" + //
+        "</hivemq-extension>";
+
     private static final String EXTENSION_MAIN_CLASS_NAME = "com.hivemq.extension.sdk.api.ExtensionMain";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(HiveMQExtension.class);
 
     @Getter
-    private final @NotNull String id;
+    @NotNull
+    private final String id;
 
     @Getter
-    private final @NotNull String name;
+    @NotNull
+    private final String name;
 
     @Getter
-    private final @NotNull String version;
+    @NotNull
+    private final String version;
 
     @Getter
     private final int priority;
@@ -56,9 +61,11 @@ public class HiveMQExtension {
     private final boolean disabledOnStartup;
 
     @Getter
-    private final @NotNull Class<?> mainClass;
+    @NotNull
+    private final Class<?> mainClass;
 
-    private final @NotNull List<Class<?>> additionalClasses;
+    @NotNull
+    private final List<Class<?>> additionalClasses;
 
     private HiveMQExtension(
         final @NotNull String id,
@@ -68,8 +75,8 @@ private HiveMQExtension(
         final int startPriority,
         final boolean disabledOnStartup,
         final @NotNull Class<?> mainClass,
-        final @NotNull List<Class<?>> additionalClasses) {
-
+        final @NotNull List<Class<?>> additionalClasses
+    ) {
         this.id = id;
         this.name = name;
         this.version = version;
@@ -80,27 +87,31 @@ private HiveMQExtension(
         this.additionalClasses = additionalClasses;
     }
 
-    @NotNull File createExtension(final @NotNull HiveMQExtension hiveMQExtension)
-        throws Exception {
-
+    @NotNull
+    File createExtension(final @NotNull HiveMQExtension hiveMQExtension) throws Exception {
         final File tempDir = Files.createTempDirectory("").toFile();
 
         final File extensionDir = new File(tempDir, hiveMQExtension.getId());
-        FileUtils.writeStringToFile(new File(extensionDir, "hivemq-extension.xml"),
+        FileUtils.writeStringToFile(
+            new File(extensionDir, "hivemq-extension.xml"),
             String.format(
                 VALID_EXTENSION_XML,
                 hiveMQExtension.getId(),
                 hiveMQExtension.getName(),
                 hiveMQExtension.getVersion(),
                 hiveMQExtension.getPriority(),
-                hiveMQExtension.getStartPriority()),
-            Charset.defaultCharset());
+                hiveMQExtension.getStartPriority()
+            ),
+            Charset.defaultCharset()
+        );
 
         if (hiveMQExtension.isDisabledOnStartup()) {
             final File disabled = new File(extensionDir, "DISABLED");
             final boolean newFile = disabled.createNewFile();
             if (!newFile) {
-                throw new ContainerLaunchException("Could not create DISABLED file '" + disabled.getAbsolutePath() + "' on host machine.");
+                throw new ContainerLaunchException(
+                    "Could not create DISABLED file '" + disabled.getAbsolutePath() + "' on host machine."
+                );
             }
         }
 
@@ -129,11 +140,15 @@ private HiveMQExtension(
     private void putSubclassesIntoJar(
         final @NotNull String extensionId,
         final @Nullable Class<?> clazz,
-        final @NotNull JavaArchive javaArchive) throws NotFoundException {
-
+        final @NotNull JavaArchive javaArchive
+    ) throws NotFoundException {
         if (clazz != null) {
-            final Set<String> subClassNames =
-                ClassPool.getDefault().get(clazz.getName()).getClassFile().getConstPool().getClassNames();
+            final Set<String> subClassNames = ClassPool
+                .getDefault()
+                .get(clazz.getName())
+                .getClassFile()
+                .getConstPool()
+                .getClassNames();
             for (final String subClassName : subClassNames) {
                 final String className = subClassName.replaceAll("/", ".");
 
@@ -156,14 +171,27 @@ private void putSubclassesIntoJar(
     }
 
     public static final class Builder {
-        private @Nullable String id;
-        private @Nullable String name;
-        private @Nullable String version;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String name;
+
+        @Nullable
+        private String version;
+
         private int priority = 0;
+
         private int startPriority = 0;
+
         private boolean disabledOnStartup = false;
-        private @Nullable Class<?> mainClass;
-        private final @NotNull LinkedList<Class<?>> additionalClasses = new LinkedList<>();
+
+        @Nullable
+        private Class<?> mainClass;
+
+        @NotNull
+        private final LinkedList<Class<?>> additionalClasses = new LinkedList<>();
 
         /**
          * Builds the {@link HiveMQExtension} with the provided values or default values.
@@ -274,12 +302,16 @@ public static final class Builder {
             try {
                 final Class<?> extensionMain = Class.forName(EXTENSION_MAIN_CLASS_NAME);
                 if (!extensionMain.isAssignableFrom(mainClass)) {
-                    throw new IllegalArgumentException("The provided class does not implement '" + EXTENSION_MAIN_CLASS_NAME + "'");
+                    throw new IllegalArgumentException(
+                        "The provided class does not implement '" + EXTENSION_MAIN_CLASS_NAME + "'"
+                    );
                 }
                 this.mainClass = mainClass;
                 return this;
             } catch (final ClassNotFoundException e) {
-                throw new IllegalStateException("The class '" + EXTENSION_MAIN_CLASS_NAME + "' was not found in the classpath.");
+                throw new IllegalStateException(
+                    "The class '" + EXTENSION_MAIN_CLASS_NAME + "' was not found in the classpath."
+                );
             }
         }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
index f88d60b22ed..a3e8a20216d 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
@@ -17,18 +17,18 @@ public class ContainerWithControlCenterIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     public void test() throws Exception {
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
-                     .withControlCenter()) {
-
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                .withControlCenter()
+        ) {
             hivemq.start();
 
             try (final CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
-                final HttpUriRequest request = new HttpGet("http://" + hivemq.getHost() + ":" + hivemq.getMappedPort(CONTROL_CENTER_PORT));
+                final HttpUriRequest request = new HttpGet(
+                    "http://" + hivemq.getHost() + ":" + hivemq.getMappedPort(CONTROL_CENTER_PORT)
+                );
                 httpClient.execute(request);
             }
         }
-
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
index 57d3b75bc24..fe119854c80 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
@@ -18,13 +18,14 @@ public class ContainerWithCustomConfigIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-
-        try (final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
-            .withHiveMQConfig(MountableFile.forClasspathResource("/config.xml"))) {
-
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                .withHiveMQConfig(MountableFile.forClasspathResource("/config.xml"))
+        ) {
             hivemq.start();
 
-            final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
+            final Mqtt5BlockingClient publisher = Mqtt5Client
+                .builder()
                 .identifier("publisher")
                 .serverPort(hivemq.getMqttPort())
                 .serverHost(hivemq.getHost())
@@ -32,13 +33,13 @@ void test() throws Exception {
 
             publisher.connect();
 
-            assertThrows(MqttSessionExpiredException.class, () -> {
-                // this should fail since only QoS 0 is allowed by the configuration
-                publisher.publishWith()
-                    .topic("test/topic")
-                    .qos(MqttQos.EXACTLY_ONCE)
-                    .send();
-            });
+            assertThrows(
+                MqttSessionExpiredException.class,
+                () -> {
+                    // this should fail since only QoS 0 is allowed by the configuration
+                    publisher.publishWith().topic("test/topic").qos(MqttQos.EXACTLY_ONCE).send();
+                }
+            );
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
index 4b89e418b05..c1e6e72cc32 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
@@ -15,13 +15,14 @@ public class ContainerWithExtensionFromDirectoryIT {
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
         try (
-            final HiveMQContainer hivemq =
-                new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                    .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
-                    .waitForExtension("Modifier Extension")
-                    .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                    .withLogLevel(Level.DEBUG)) {
-
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
+                .waitForExtension("Modifier Extension")
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .withLogLevel(Level.DEBUG)
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
@@ -30,12 +31,14 @@ void test() throws Exception {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test_wrongDirectoryName() throws Exception {
-        try (final HiveMQContainer hivemq =
-            new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
                 .withExtension(MountableFile.forClasspathResource("/modifier-extension-wrong-name"))
                 .waitForExtension("Modifier Extension")
-                .withLogLevel(Level.DEBUG)) {
-
+                .withLogLevel(Level.DEBUG)
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
index 8979d2c17b0..01a67e0dcfb 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
@@ -14,18 +14,22 @@ public class ContainerWithExtensionIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        final HiveMQExtension hiveMQExtension = HiveMQExtension
+            .builder()
             .id("extension-1")
             .name("my-extension")
             .version("1.0")
-            .mainClass(MyExtension.class).build();
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                     .waitForExtension(hiveMQExtension)
-                     .withExtension(hiveMQExtension)) {
-
+            .mainClass(MyExtension.class)
+            .build();
+
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .waitForExtension(hiveMQExtension)
+                .withExtension(hiveMQExtension)
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.stop();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
index 53714123aff..1f3d9de4aeb 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
@@ -15,19 +15,23 @@ public class ContainerWithExtensionSubclassIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        final HiveMQExtension hiveMQExtension = HiveMQExtension
+            .builder()
             .id("extension-1")
             .name("my-extension")
             .version("1.0")
-            .mainClass(MyExtensionWithSubclasses.class).build();
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                     .waitForExtension(hiveMQExtension)
-                     .withExtension(hiveMQExtension)
-                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                     .withLogLevel(Level.DEBUG)) {
+            .mainClass(MyExtensionWithSubclasses.class)
+            .build();
 
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .waitForExtension(hiveMQExtension)
+                .withExtension(hiveMQExtension)
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .withLogLevel(Level.DEBUG)
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
index 559737c8868..a5b5238ce25 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
@@ -22,26 +22,30 @@
 
 public class ContainerWithFileInExtensionHomeIT {
 
-
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        final HiveMQExtension hiveMQExtension = HiveMQExtension
+            .builder()
             .id("extension-1")
             .name("my-extension")
             .version("1.0")
-            .mainClass(FileCheckerExtension.class).build();
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                     .withExtension(hiveMQExtension)
-                     .waitForExtension(hiveMQExtension)
-                     .withFileInExtensionHomeFolder(
-                         MountableFile.forClasspathResource("/additionalFile.txt"),
-                         "extension-1",
-                         "/additionalFiles/my-file.txt")) {
-
+            .mainClass(FileCheckerExtension.class)
+            .build();
+
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .withExtension(hiveMQExtension)
+                .waitForExtension(hiveMQExtension)
+                .withFileInExtensionHomeFolder(
+                    MountableFile.forClasspathResource("/additionalFile.txt"),
+                    "extension-1",
+                    "/additionalFiles/my-file.txt"
+                )
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
@@ -50,28 +54,33 @@ void test() throws Exception {
     public static class FileCheckerExtension implements ExtensionMain {
 
         @Override
-        public void extensionStart(final @NotNull ExtensionStartInput extensionStartInput, final @NotNull ExtensionStartOutput extensionStartOutput) {
-
+        public void extensionStart(
+            final @NotNull ExtensionStartInput extensionStartInput,
+            final @NotNull ExtensionStartOutput extensionStartOutput
+        ) {
             final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
-
                 final File extensionHomeFolder = extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
 
                 final File additionalFile = new File(extensionHomeFolder, "additionalFiles/my-file.txt");
 
                 if (additionalFile.exists()) {
-                    publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                    publishInboundOutput
+                        .getPublishPacket()
+                        .setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
                 }
             };
 
-            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
+                clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            };
 
             Services.initializerRegistry().setClientInitializer(clientInitializer);
         }
 
         @Override
-        public void extensionStop(final @NotNull ExtensionStopInput extensionStopInput, final @NotNull ExtensionStopOutput extensionStopOutput) {
-
-        }
+        public void extensionStop(
+            final @NotNull ExtensionStopInput extensionStopInput,
+            final @NotNull ExtensionStopOutput extensionStopOutput
+        ) {}
     }
-
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
index efdf6ad298d..2fd387f394c 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
@@ -25,21 +25,26 @@ public class ContainerWithFileInHomeIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        final HiveMQExtension hiveMQExtension = HiveMQExtension
+            .builder()
             .id("extension-1")
             .name("my-extension")
             .version("1.0")
-            .mainClass(FileCheckerExtension.class).build();
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                     .withExtension(hiveMQExtension)
-                     .waitForExtension(hiveMQExtension)
-                     .withFileInHomeFolder(MountableFile.forClasspathResource("/additionalFile.txt"),
-                         "/additionalFiles/my-file.txt")) {
-
-
+            .mainClass(FileCheckerExtension.class)
+            .build();
+
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .withExtension(hiveMQExtension)
+                .waitForExtension(hiveMQExtension)
+                .withFileInHomeFolder(
+                    MountableFile.forClasspathResource("/additionalFile.txt"),
+                    "/additionalFiles/my-file.txt"
+                )
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
@@ -48,28 +53,33 @@ void test() throws Exception {
     public static class FileCheckerExtension implements ExtensionMain {
 
         @Override
-        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
-
+        public void extensionStart(
+            @NotNull ExtensionStartInput extensionStartInput,
+            @NotNull ExtensionStartOutput extensionStartOutput
+        ) {
             final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
-
                 final File homeFolder = extensionStartInput.getServerInformation().getHomeFolder();
 
                 final File additionalFile = new File(homeFolder, "additionalFiles/my-file.txt");
 
                 if (additionalFile.exists()) {
-                    publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                    publishInboundOutput
+                        .getPublishPacket()
+                        .setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
                 }
             };
 
-            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
+                clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            };
 
             Services.initializerRegistry().setClientInitializer(clientInitializer);
         }
 
         @Override
-        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
-
-        }
+        public void extensionStop(
+            @NotNull ExtensionStopInput extensionStopInput,
+            @NotNull ExtensionStopOutput extensionStopOutput
+        ) {}
     }
-
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
index ba2dc472cdb..9d82188c35c 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
@@ -25,21 +25,24 @@ public class ContainerWithLicenseIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        final HiveMQExtension hiveMQExtension = HiveMQExtension
+            .builder()
             .id("extension-1")
             .name("my-extension")
             .version("1.0")
-            .mainClass(LicenceCheckerExtension.class).build();
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                     .withExtension(hiveMQExtension)
-                     .waitForExtension(hiveMQExtension)
-                     .withLicense(MountableFile.forClasspathResource("/myLicense.lic"))
-                     .withLicense(MountableFile.forClasspathResource("/myExtensionLicense.elic"))) {
-
-
+            .mainClass(LicenceCheckerExtension.class)
+            .build();
+
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .withExtension(hiveMQExtension)
+                .waitForExtension(hiveMQExtension)
+                .withLicense(MountableFile.forClasspathResource("/myLicense.lic"))
+                .withLicense(MountableFile.forClasspathResource("/myExtensionLicense.elic"))
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
@@ -49,16 +52,19 @@ void test() throws Exception {
     public static class LicenceCheckerExtension implements ExtensionMain {
 
         @Override
-        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
-
+        public void extensionStart(
+            @NotNull ExtensionStartInput extensionStartInput,
+            @NotNull ExtensionStartOutput extensionStartOutput
+        ) {
             final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
-
                 final File homeFolder = extensionStartInput.getServerInformation().getHomeFolder();
                 final File myLicence = new File(homeFolder, "license/myLicense.lic");
                 final File myExtensionLicence = new File(homeFolder, "license/myExtensionLicense.elic");
 
                 if (myLicence.exists() && myExtensionLicence.exists()) {
-                    publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                    publishInboundOutput
+                        .getPublishPacket()
+                        .setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
                 }
             };
 
@@ -70,9 +76,9 @@ public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @No
         }
 
         @Override
-        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
-
-        }
+        public void extensionStop(
+            @NotNull ExtensionStopInput extensionStopInput,
+            @NotNull ExtensionStopOutput extensionStopOutput
+        ) {}
     }
-
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
index eaec72cb038..75d308e3f90 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
@@ -29,25 +29,28 @@
 
 public class ContainerWithoutPlatformExtensionsIT {
 
-    private final @NotNull HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+    @NotNull
+    private final HiveMQExtension hiveMQExtension = HiveMQExtension
+        .builder()
         .name("MyExtension")
         .id("my-extension")
         .version("1.0.0")
-        .mainClass(CheckerExtension.class).build();
-
+        .mainClass(CheckerExtension.class)
+        .build();
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     public void removeAllPlatformExtensions() throws InterruptedException {
-
-        try (final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
-            .withExtension(hiveMQExtension)
-            .waitForExtension(hiveMQExtension)
-            .withoutPrepackagedExtensions()) {
-
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                .withExtension(hiveMQExtension)
+                .waitForExtension(hiveMQExtension)
+                .withoutPrepackagedExtensions()
+        ) {
             hivemq.start();
 
-            final Mqtt5BlockingClient client = MqttClient.builder()
+            final Mqtt5BlockingClient client = MqttClient
+                .builder()
                 .serverPort(hivemq.getMqttPort())
                 .serverHost(hivemq.getHost())
                 .useMqttVersion5()
@@ -73,15 +76,16 @@ public void removeAllPlatformExtensions() throws InterruptedException {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     public void removeKafkaExtension() throws InterruptedException {
-
-        try (final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
-            .withExtension(hiveMQExtension)
-            .waitForExtension(hiveMQExtension)
-            .withoutPrepackagedExtensions("hivemq-kafka-extension")) {
-
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                .withExtension(hiveMQExtension)
+                .waitForExtension(hiveMQExtension)
+                .withoutPrepackagedExtensions("hivemq-kafka-extension")
+        ) {
             hivemq.start();
 
-            final Mqtt5BlockingClient client = MqttClient.builder()
+            final Mqtt5BlockingClient client = MqttClient
+                .builder()
                 .serverPort(hivemq.getMqttPort())
                 .serverHost(hivemq.getHost())
                 .useMqttVersion5()
@@ -107,31 +111,32 @@ public static class CheckerExtension implements ExtensionMain {
         @Override
         public void extensionStart(
             final @NotNull ExtensionStartInput extensionStartInput,
-            final @NotNull ExtensionStartOutput extensionStartOutput) {
-
-            final String extensionFolders = Arrays.stream(extensionStartInput.getServerInformation().getExtensionsFolder().listFiles())
+            final @NotNull ExtensionStartOutput extensionStartOutput
+        ) {
+            final String extensionFolders = Arrays
+                .stream(extensionStartInput.getServerInformation().getExtensionsFolder().listFiles())
                 .filter(File::isDirectory)
                 .map(File::getName)
                 .collect(Collectors.joining("\n"));
 
             final byte[] bytes = extensionFolders.getBytes(StandardCharsets.UTF_8);
-            Services.publishService().publish(Builders.publish()
-                .topic("extensions")
-                .retain(true)
-                .payload(ByteBuffer.wrap(bytes))
-                .build());
-
-            Services.securityRegistry().setAuthenticatorProvider(authenticatorProviderInput ->
-                (SimpleAuthenticator) (simpleAuthInput, simpleAuthOutput) ->
-                    simpleAuthOutput.authenticateSuccessfully());
-
+            Services
+                .publishService()
+                .publish(Builders.publish().topic("extensions").retain(true).payload(ByteBuffer.wrap(bytes)).build());
+
+            Services
+                .securityRegistry()
+                .setAuthenticatorProvider(authenticatorProviderInput -> {
+                    return (SimpleAuthenticator) (simpleAuthInput, simpleAuthOutput) -> {
+                        simpleAuthOutput.authenticateSuccessfully();
+                    };
+                });
         }
 
         @Override
         public void extensionStop(
             final @NotNull ExtensionStopInput extensionStopInput,
-            final @NotNull ExtensionStopOutput extensionStopOutput) {
-
-        }
+            final @NotNull ExtensionStopOutput extensionStopOutput
+        ) {}
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
index 58b70c3d1d9..191ea41f303 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -37,19 +37,23 @@ public class CreateFileInCopiedDirectoryIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        final HiveMQExtension extension = HiveMQExtension.builder()
+        final HiveMQExtension extension = HiveMQExtension
+            .builder()
             .id("extension-1")
             .name("my-extension")
             .version("1.0")
-            .mainClass(FileCreatorExtension.class).build();
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                     .withExtension(extension)
-                     .waitForExtension(extension)
-                     .withFileInHomeFolder(createDirectory(), "directory")) {
-
+            .mainClass(FileCreatorExtension.class)
+            .build();
+
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .withExtension(extension)
+                .waitForExtension(extension)
+                .withFileInHomeFolder(createDirectory(), "directory")
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
@@ -58,10 +62,11 @@ void test() throws Exception {
     public static class FileCreatorExtension implements ExtensionMain {
 
         @Override
-        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
-
+        public void extensionStart(
+            @NotNull ExtensionStartInput extensionStartInput,
+            @NotNull ExtensionStartOutput extensionStartOutput
+        ) {
             final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
-
                 final File homeFolder = extensionStartInput.getServerInformation().getHomeFolder();
 
                 final File dir = new File(homeFolder, "directory");
@@ -71,22 +76,26 @@ public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @No
 
                 try {
                     if (dirFile.createNewFile() && subDirFile.createNewFile()) {
-                        publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                        publishInboundOutput
+                            .getPublishPacket()
+                            .setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
                     }
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
             };
 
-            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
+                clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            };
 
             Services.initializerRegistry().setClientInitializer(clientInitializer);
         }
 
         @Override
-        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
-
-        }
+        public void extensionStop(
+            @NotNull ExtensionStopInput extensionStopInput,
+            @NotNull ExtensionStopOutput extensionStopOutput
+        ) {}
     }
-
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
index c41137f58c3..44f5f4f632d 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
@@ -26,18 +26,22 @@ public class CreateFileInExtensionDirectoryIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+        final HiveMQExtension hiveMQExtension = HiveMQExtension
+            .builder()
             .id("extension-1")
             .name("my-extension")
             .version("1.0")
-            .mainClass(FileCreatorExtension.class).build();
-
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-                     .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-                     .waitForExtension(hiveMQExtension)
-                     .withExtension(hiveMQExtension)) {
-
+            .mainClass(FileCreatorExtension.class)
+            .build();
+
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+            )
+                .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+                .waitForExtension(hiveMQExtension)
+                .withExtension(hiveMQExtension)
+        ) {
             hivemq.start();
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
@@ -46,31 +50,36 @@ void test() throws Exception {
     public static class FileCreatorExtension implements ExtensionMain {
 
         @Override
-        public void extensionStart(@NotNull ExtensionStartInput extensionStartInput, @NotNull ExtensionStartOutput extensionStartOutput) {
-
+        public void extensionStart(
+            @NotNull ExtensionStartInput extensionStartInput,
+            @NotNull ExtensionStartOutput extensionStartOutput
+        ) {
             final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
-
                 final File extensionHomeFolder = extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
 
                 final File file = new File(extensionHomeFolder, "myfile.txt");
                 try {
                     if (file.createNewFile()) {
-                        publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+                        publishInboundOutput
+                            .getPublishPacket()
+                            .setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
                     }
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
             };
 
-            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
+                clientContext.addPublishInboundInterceptor(publishInboundInterceptor);
+            };
 
             Services.initializerRegistry().setClientInitializer(clientInitializer);
         }
 
         @Override
-        public void extensionStop(@NotNull ExtensionStopInput extensionStopInput, @NotNull ExtensionStopOutput extensionStopOutput) {
-
-        }
+        public void extensionStop(
+            @NotNull ExtensionStopInput extensionStopInput,
+            @NotNull ExtensionStopOutput extensionStopOutput
+        ) {}
     }
-
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
index f6b1b9b5cd7..9588e3404e6 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
@@ -17,21 +17,22 @@ public class DisableEnableExtensionFromDirectoryIT {
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
-                     .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
-                     .waitForExtension("Modifier Extension")
-                     .withLogLevel(Level.DEBUG)) {
-
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
+                .waitForExtension("Modifier Extension")
+                .withLogLevel(Level.DEBUG)
+        ) {
             hivemq.start();
 
-
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension("Modifier Extension", "modifier-extension");
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
+            assertThrows(
+                ExecutionException.class,
+                () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost())
+            );
             hivemq.enableExtension("Modifier Extension", "modifier-extension");
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
-
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
index 5b3c6ab107f..e50664f240e 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
@@ -15,32 +15,39 @@
 
 public class DisableEnableExtensionIT {
 
-    private final @NotNull HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+    @NotNull
+    private final HiveMQExtension hiveMQExtension = HiveMQExtension
+        .builder()
         .id("extension-1")
         .name("my-extension")
         .version("1.0")
         .disabledOnStartup(true)
-        .mainClass(MyExtension.class).build();
+        .mainClass(MyExtension.class)
+        .build();
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test() throws Exception {
-        try (final HiveMQContainer hivemq =
-                 new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
-                     .withExtension(hiveMQExtension)
-                     .withLogLevel(Level.DEBUG)) {
-
-
+        try (
+            final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+                .withExtension(hiveMQExtension)
+                .withLogLevel(Level.DEBUG)
+        ) {
             hivemq.start();
 
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
+            assertThrows(
+                ExecutionException.class,
+                () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost())
+            );
             hivemq.enableExtension(hiveMQExtension);
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension(hiveMQExtension);
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
+            assertThrows(
+                ExecutionException.class,
+                () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost())
+            );
             hivemq.enableExtension(hiveMQExtension);
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
-
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
index d614a59bd8c..08e1df797a1 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
@@ -8,6 +8,9 @@ class HiveMQExtensionTest {
 
     @Test
     void builder_classDoesNotImplementExtensionMain_exception() {
-        assertThrows(IllegalArgumentException.class, () -> HiveMQExtension.builder().mainClass(HiveMQExtensionTest.class));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> HiveMQExtension.builder().mainClass(HiveMQExtensionTest.class)
+        );
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
index 40820e33ded..d4dd2be9621 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
@@ -15,7 +15,8 @@
 
 class HiveMQTestContainerCore {
 
-    final @NotNull HiveMQContainer container = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"));
+    @NotNull
+    final HiveMQContainer container = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"));
 
     @TempDir
     File tempDir;
@@ -69,14 +70,23 @@ void withFileInHomeFolder_pathEmpty_Exception() {
     @Test
     void withFileInExtensionHomeFolder_withPath_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(ContainerLaunchException.class, () -> container.withFileInExtensionHomeFolder(mountableFile, "my-extension", "some/path"));
+        assertThrows(
+            ContainerLaunchException.class,
+            () -> container.withFileInExtensionHomeFolder(mountableFile, "my-extension", "some/path")
+        );
     }
 
     @Test
     void withFileInExtensionHomeFolder_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(ContainerLaunchException.class, () -> {
-            final HiveMQContainer hiveMQContainer = container.withFileInExtensionHomeFolder(mountableFile, "my-extension");
-        });
+        assertThrows(
+            ContainerLaunchException.class,
+            () -> {
+                final HiveMQContainer hiveMQContainer = container.withFileInExtensionHomeFolder(
+                    mountableFile,
+                    "my-extension"
+                );
+            }
+        );
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
index e9d9463653e..97a1365ac91 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
@@ -14,43 +14,54 @@ public class DemoDisableExtensionsIT {
 
     // noExtensions {
     @Container
-    final HiveMQContainer hivemqNoExtensions = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+    final HiveMQContainer hivemqNoExtensions = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4")
+    )
         .withoutPrepackagedExtensions();
+
     // }
 
     // noKafkaExtension {
     @Container
-    final HiveMQContainer hivemqNoKafkaExtension = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+    final HiveMQContainer hivemqNoKafkaExtension = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4")
+    )
         .withoutPrepackagedExtensions("hivemq-kafka-extension");
+
     // }
 
     // startDisabled {
-    private final HiveMQExtension hiveMQExtension = HiveMQExtension.builder()
+    private final HiveMQExtension hiveMQExtension = HiveMQExtension
+        .builder()
         .id("extension-1")
         .name("my-extension")
         .version("1.0")
         .disabledOnStartup(true)
-        .mainClass(MyExtension.class).build();
+        .mainClass(MyExtension.class)
+        .build();
 
     @Container
     final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
         .withExtension(hiveMQExtension);
-    // }
 
+    // }
 
     // startFromFilesystem {
     @Container
-    final HiveMQContainer hivemqExtensionFromFilesystem = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
+    final HiveMQContainer hivemqExtensionFromFilesystem = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4")
+    )
         .withExtension(MountableFile.forHostPath("src/test/resources/modifier-extension"));
-    // }
 
+    // }
 
-    // runtimeEnable {
+    // hiveRuntimeEnable {
     @Test
     void test_disable_enable_extension() throws Exception {
         hivemq.enableExtension(hiveMQExtension);
         hivemq.disableExtension(hiveMQExtension);
     }
+
     // }
 
     // runtimeEnableFilesystem {
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
index 3a8ccc1bebe..e5385369d3a 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
@@ -19,33 +19,39 @@ public class DemoExtensionTestsIT {
 
     // waitStrategy {
     @Container
-    final HiveMQContainer hivemqWithWaitStrategy =
-        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
-            .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
-            .waitForExtension("Modifier Extension");
+    final HiveMQContainer hivemqWithWaitStrategy = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4")
+    )
+        .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
+        .waitForExtension("Modifier Extension");
+
     // }
 
     // extensionClasspath {
-    final HiveMQExtension hiveMQEClasspathxtension = HiveMQExtension.builder()
+    final HiveMQExtension hiveMQEClasspathxtension = HiveMQExtension
+        .builder()
         .id("extension-1")
         .name("my-extension")
         .version("1.0")
-        .mainClass(MyExtensionWithSubclasses.class).build();
+        .mainClass(MyExtensionWithSubclasses.class)
+        .build();
 
     @Container
-    final HiveMQContainer hivemqWithClasspathExtension =
-        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-            .waitForExtension(hiveMQEClasspathxtension)
-            .withExtension(hiveMQEClasspathxtension)
-            .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"));
+    final HiveMQContainer hivemqWithClasspathExtension = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+    )
+        .waitForExtension(hiveMQEClasspathxtension)
+        .withExtension(hiveMQEClasspathxtension)
+        .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"));
+
     // }
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     public void test() throws Exception {
-
         // mqtt5client {
-        final Mqtt5BlockingClient client = Mqtt5Client.builder()
+        final Mqtt5BlockingClient client = Mqtt5Client
+            .builder()
             .serverPort(hivemqWithClasspathExtension.getMqttPort())
             .serverHost(hivemqWithClasspathExtension.getHost())
             .buildBlocking();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
index 7ec777d02b8..d0bf6fc6b9c 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
@@ -18,24 +18,36 @@
 public class DemoFilesIT {
 
     // hivemqHome {
-    final HiveMQContainer hivemqFileInHome = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+    final HiveMQContainer hivemqFileInHome = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+    )
         .withFileInHomeFolder(
             MountableFile.forHostPath("src/test/resources/additionalFile.txt"),
-            "/path/in/home/folder");
+            "/path/in/home/folder"
+        );
+
     // }
 
     // extensionHome {
     @Container
-    final HiveMQContainer hivemqFileInExtensionHome = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-        .withExtension(HiveMQExtension.builder()
-            .id("extension-1")
-            .name("my-extension")
-            .version("1.0")
-            .mainClass(MyExtension.class).build())
+    final HiveMQContainer hivemqFileInExtensionHome = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+    )
+        .withExtension(
+            HiveMQExtension
+                .builder()
+                .id("extension-1")
+                .name("my-extension")
+                .version("1.0")
+                .mainClass(MyExtension.class)
+                .build()
+        )
         .withFileInExtensionHomeFolder(
             MountableFile.forHostPath("src/test/resources/additionalFile.txt"),
             "extension-1",
-            "/path/in/extension/home");
+            "/path/in/extension/home"
+        );
+
     // }
 
     // withLicenses {
@@ -43,14 +55,15 @@ public class DemoFilesIT {
     final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
         .withLicense(MountableFile.forHostPath("src/test/resources/myLicense.lic"))
         .withLicense(MountableFile.forHostPath("src/test/resources/myExtensionLicense.elic"));
+
     // }
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     public void test() throws Exception {
-
         // mqtt5client {
-        final Mqtt5BlockingClient client = Mqtt5Client.builder()
+        final Mqtt5BlockingClient client = Mqtt5Client
+            .builder()
             .serverPort(hivemq.getMqttPort())
             .serverHost(hivemq.getHost())
             .buildBlocking();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
index 51e3a43d9e5..be39fe6d7f2 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -18,38 +18,41 @@ public class DemoHiveMQContainerIT {
 
     // ceVersion {
     @Container
-    final HiveMQContainer hivemqCe =
-        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-            .withLogLevel(Level.DEBUG);
+    final HiveMQContainer hivemqCe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+        .withLogLevel(Level.DEBUG);
+
     // }
 
-    // eeVersion {
+    // hiveEEVersion {
     @Container
-    final HiveMQContainer hivemqEe =
-        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-            .withLogLevel(Level.DEBUG);
+    final HiveMQContainer hivemqEe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+        .withLogLevel(Level.DEBUG);
+
     // }
 
     // eeVersionWithControlCenter {
     @Container
-    final HiveMQContainer hivemqEeWithControLCenter =
-        new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
-            .withLogLevel(Level.DEBUG)
-            .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
-            .withControlCenter();
+    final HiveMQContainer hivemqEeWithControlCenter = new HiveMQContainer(
+        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+    )
+        .withLogLevel(Level.DEBUG)
+        .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
+        .withControlCenter();
+
     // }
 
     // specificVersion {
     @Container
     final HiveMQContainer hivemqSpecificVersion = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce:2021.3"));
+
     // }
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     public void test() throws Exception {
-
         // mqtt5client {
-        final Mqtt5BlockingClient client = Mqtt5Client.builder()
+        final Mqtt5BlockingClient client = Mqtt5Client
+            .builder()
             .serverPort(hivemqCe.getMqttPort())
             .serverHost(hivemqCe.getHost())
             .buildBlocking();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java
index e707859be77..4c3991122d7 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtension.java
@@ -1,7 +1,6 @@
 package org.testcontainers.hivemq.util;
 
 import com.hivemq.extension.sdk.api.ExtensionMain;
-import org.jetbrains.annotations.NotNull;
 import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
@@ -9,6 +8,7 @@
 import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
 import com.hivemq.extension.sdk.api.services.Services;
 import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+import org.jetbrains.annotations.NotNull;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -17,10 +17,14 @@
 public class MyExtension implements ExtensionMain {
 
     @Override
-    public void extensionStart(final @NotNull ExtensionStartInput extensionStartInput, final @NotNull ExtensionStartOutput extensionStartOutput) {
-
+    public void extensionStart(
+        final @NotNull ExtensionStartInput extensionStartInput,
+        final @NotNull ExtensionStartOutput extensionStartOutput
+    ) {
         final PublishInboundInterceptor publishInboundInterceptor = (publishInboundInput, publishInboundOutput) -> {
-            publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+            publishInboundOutput
+                .getPublishPacket()
+                .setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
         };
 
         final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
@@ -31,7 +35,8 @@ public void extensionStart(final @NotNull ExtensionStartInput extensionStartInpu
     }
 
     @Override
-    public void extensionStop(final @NotNull ExtensionStopInput extensionStopInput, final @NotNull ExtensionStopOutput extensionStopOutput) {
-
-    }
+    public void extensionStop(
+        final @NotNull ExtensionStopInput extensionStopInput,
+        final @NotNull ExtensionStopOutput extensionStopOutput
+    ) {}
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java
index abc24585358..9e4565b15c9 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/MyExtensionWithSubclasses.java
@@ -1,26 +1,31 @@
 package org.testcontainers.hivemq.util;
 
 import com.hivemq.extension.sdk.api.ExtensionMain;
-import org.jetbrains.annotations.NotNull;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
 import com.hivemq.extension.sdk.api.services.Services;
 import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
+import org.jetbrains.annotations.NotNull;
 
 public class MyExtensionWithSubclasses implements ExtensionMain {
 
     @Override
-    public void extensionStart(final @NotNull ExtensionStartInput extensionStartInput, final @NotNull ExtensionStartOutput extensionStartOutput) {
-
-        final ClientInitializer clientInitializer = (initializerInput, clientContext) -> clientContext.addPublishInboundInterceptor(new PublishModifier());
+    public void extensionStart(
+        final @NotNull ExtensionStartInput extensionStartInput,
+        final @NotNull ExtensionStartOutput extensionStartOutput
+    ) {
+        final ClientInitializer clientInitializer = (initializerInput, clientContext) -> {
+            clientContext.addPublishInboundInterceptor(new PublishModifier());
+        };
 
         Services.initializerRegistry().setClientInitializer(clientInitializer);
     }
 
     @Override
-    public void extensionStop(final @NotNull ExtensionStopInput extensionStopInput, final @NotNull ExtensionStopOutput extensionStopOutput) {
-
-    }
+    public void extensionStop(
+        final @NotNull ExtensionStopInput extensionStopInput,
+        final @NotNull ExtensionStopOutput extensionStopOutput
+    ) {}
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java
index d33f29a9c10..ec5b63ee1e6 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/PublishModifier.java
@@ -1,16 +1,22 @@
 package org.testcontainers.hivemq.util;
 
-import org.jetbrains.annotations.NotNull;
 import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
 import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishInboundInput;
 import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishInboundOutput;
+import org.jetbrains.annotations.NotNull;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 public class PublishModifier implements PublishInboundInterceptor {
+
     @Override
-    public void onInboundPublish(final @NotNull PublishInboundInput publishInboundInput, final @NotNull PublishInboundOutput publishInboundOutput) {
-        publishInboundOutput.getPublishPacket().setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
+    public void onInboundPublish(
+        final @NotNull PublishInboundInput publishInboundInput,
+        final @NotNull PublishInboundOutput publishInboundOutput
+    ) {
+        publishInboundOutput
+            .getPublishPacket()
+            .setPayload(ByteBuffer.wrap("modified".getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
index f2f1cfd692f..963570c07c4 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
@@ -14,27 +14,38 @@ public class TestPublishModifiedUtil {
     public static void testPublishModified(final int mqttPort, final @NotNull String host) throws Exception {
         final CompletableFuture<Void> publishReceived = new CompletableFuture<>();
 
-        final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
+        final Mqtt5BlockingClient publisher = Mqtt5Client
+            .builder()
             .serverPort(mqttPort)
             .serverHost(host)
             .identifier("publisher")
             .buildBlocking();
         publisher.connect();
 
-        final Mqtt5BlockingClient subscriber = Mqtt5Client.builder()
+        final Mqtt5BlockingClient subscriber = Mqtt5Client
+            .builder()
             .serverPort(mqttPort)
             .serverHost(host)
             .identifier("subscriber")
             .buildBlocking();
         subscriber.connect();
         subscriber.subscribeWith().topicFilter("test/topic").send();
-        subscriber.toAsync().publishes(MqttGlobalPublishFilter.ALL, publish -> {
-            if (Arrays.equals(publish.getPayloadAsBytes(), "modified".getBytes(StandardCharsets.UTF_8))) {
-                publishReceived.complete(null);
-            } else {
-                publishReceived.completeExceptionally(new IllegalArgumentException("unexpected payload: " + new String(publish.getPayloadAsBytes())));
-            }
-        });
+        subscriber
+            .toAsync()
+            .publishes(
+                MqttGlobalPublishFilter.ALL,
+                publish -> {
+                    if (Arrays.equals(publish.getPayloadAsBytes(), "modified".getBytes(StandardCharsets.UTF_8))) {
+                        publishReceived.complete(null);
+                    } else {
+                        publishReceived.completeExceptionally(
+                            new IllegalArgumentException(
+                                "unexpected payload: " + new String(publish.getPayloadAsBytes())
+                            )
+                        );
+                    }
+                }
+            );
 
         publisher.publishWith().topic("test/topic").payload("unmodified".getBytes(StandardCharsets.UTF_8)).send();
 
@@ -45,6 +56,4 @@ public static void testPublishModified(final int mqttPort, final @NotNull String
             subscriber.disconnect();
         }
     }
-
-
 }
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index 7ebfbff1a86..40eea721b57 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -17,17 +17,22 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
     public static final Integer INFLUXDB_PORT = 8086;
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb");
+
     private static final String DEFAULT_TAG = "1.4.3";
 
     @Deprecated
     public static final String VERSION = DEFAULT_TAG;
 
     private boolean authEnabled = true;
+
     private String admin = "admin";
+
     private String adminPassword = "password";
 
     private String database;
+
     private String username = "any";
+
     private String password = "any";
 
     /**
@@ -48,12 +53,12 @@ public InfluxDBContainer(final String version) {
 
     public InfluxDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        waitStrategy = new WaitAllStrategy()
-            .withStrategy(Wait.forHttp("/ping").withBasicCredentials(username, password).forStatusCode(204))
-            .withStrategy(Wait.forListeningPort());
+        waitStrategy =
+            new WaitAllStrategy()
+                .withStrategy(Wait.forHttp("/ping").withBasicCredentials(username, password).forStatusCode(204))
+                .withStrategy(Wait.forListeningPort());
 
         addExposedPort(INFLUXDB_PORT);
     }
@@ -144,7 +149,6 @@ public SELF withPassword(final String password) {
         return self();
     }
 
-
     /**
      * @return a url to influxDb
      */
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
index 7acf030b5e4..c7fc71a3a19 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
@@ -4,14 +4,16 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
 public class InfluxDBContainerTest {
 
     @ClassRule
-    public static InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(InfluxDBTestImages.INFLUXDB_TEST_IMAGE);
+    public static InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+        InfluxDBTestImages.INFLUXDB_TEST_IMAGE
+    );
 
     @Test
     public void getUrl() {
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
index b045ca297c1..a7ae347e7cc 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
@@ -9,17 +9,20 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 public class InfluxDBContainerWithUserTest {
 
     private static final String TEST_VERSION = InfluxDBTestImages.INFLUXDB_TEST_IMAGE.getVersionPart();
+
     private static final String DATABASE = "test";
+
     private static final String USER = "test-user";
+
     private static final String PASSWORD = "test-password";
 
     @Rule
@@ -52,7 +55,8 @@ public void checkVersion() {
     public void queryForWriteAndRead() {
         InfluxDB influxDB = influxDBContainer.getNewInfluxDB();
 
-        Point point = Point.measurement("cpu")
+        Point point = Point
+            .measurement("cpu")
             .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
             .addField("idle", 90L)
             .addField("user", 9L)
@@ -67,6 +71,5 @@ public void queryForWriteAndRead() {
         assertThat(actual.getError(), nullValue());
         assertThat(actual.getResults(), notNullValue());
         assertThat(actual.getResults().size(), is(1));
-
     }
 }
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
index 6a5ca5094d6..6d3080c7ee3 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java
@@ -4,11 +4,12 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
-import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import javax.sql.DataSource;
+
 public abstract class AbstractContainerDatabaseTest {
 
     protected ResultSet performQuery(JdbcDatabaseContainer<?> container, String sql) throws SQLException {
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index 4e5eb03bb49..5566db6244e 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -25,22 +25,19 @@ protected enum Options {
         CharacterSet,
         CustomIniFile,
         JDBCParams,
-        PmdKnownBroken
+        PmdKnownBroken,
     }
 
     @Parameter
     public String jdbcUrl;
+
     @Parameter(1)
     public EnumSet<Options> options;
 
     public static void sampleInitFunction(Connection connection) throws SQLException {
-        connection.createStatement().execute("CREATE TABLE bar (\n" +
-            "  foo VARCHAR(255)\n" +
-            ");");
+        connection.createStatement().execute("CREATE TABLE bar (\n" + "  foo VARCHAR(255)\n" + ");");
         connection.createStatement().execute("INSERT INTO bar (foo) VALUES ('hello world');");
-        connection.createStatement().execute("CREATE TABLE my_counter (\n" +
-            "  n INT\n" +
-            ");");
+        connection.createStatement().execute("CREATE TABLE my_counter (\n" + "  n INT\n" + ");");
     }
 
     @AfterClass
@@ -79,67 +76,99 @@ private void performSimpleTest(HikariDataSource dataSource) throws SQLException
             query = "SELECT 1 FROM SYSIBM.SYSDUMMY1";
         }
 
-        boolean result = new QueryRunner(dataSource, options.contains(Options.PmdKnownBroken)).query(query, rs -> {
-            rs.next();
-            int resultSetInt = rs.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-            return true;
-        });
+        boolean result = new QueryRunner(dataSource, options.contains(Options.PmdKnownBroken))
+            .query(
+                query,
+                rs -> {
+                    rs.next();
+                    int resultSetInt = rs.getInt(1);
+                    assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+                    return true;
+                }
+            );
 
         assertTrue("The database returned a record as expected", result);
     }
 
     private void performTestForScriptedSchema(HikariDataSource dataSource) throws SQLException {
-        boolean result = new QueryRunner(dataSource).query("SELECT foo FROM bar WHERE foo LIKE '%world'", rs -> {
-            rs.next();
-            String resultSetString = rs.getString(1);
-            assertEquals("A basic SELECT query succeeds where the schema has been applied from a script", "hello world", resultSetString);
-            return true;
-        });
+        boolean result = new QueryRunner(dataSource)
+            .query(
+                "SELECT foo FROM bar WHERE foo LIKE '%world'",
+                rs -> {
+                    rs.next();
+                    String resultSetString = rs.getString(1);
+                    assertEquals(
+                        "A basic SELECT query succeeds where the schema has been applied from a script",
+                        "hello world",
+                        resultSetString
+                    );
+                    return true;
+                }
+            );
 
         assertTrue("The database returned a record as expected", result);
     }
 
     private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQLException {
-        boolean result = new QueryRunner(dataSource).query("select CURRENT_USER", rs -> {
-            rs.next();
-            String resultUser = rs.getString(1);
-            // Not all databases (eg. Postgres) return @% at the end of user name. We just need to make sure the user name matches.
-            if (resultUser.endsWith("@%")) {
-                resultUser = resultUser.substring(0, resultUser.length() - 2);
-            }
-            assertEquals("User from query param is created.", "someuser", resultUser);
-            return true;
-        });
+        boolean result = new QueryRunner(dataSource)
+            .query(
+                "select CURRENT_USER",
+                rs -> {
+                    rs.next();
+                    String resultUser = rs.getString(1);
+                    // Not all databases (eg. Postgres) return @% at the end of user name. We just need to make sure the user name matches.
+                    if (resultUser.endsWith("@%")) {
+                        resultUser = resultUser.substring(0, resultUser.length() - 2);
+                    }
+                    assertEquals("User from query param is created.", "someuser", resultUser);
+                    return true;
+                }
+            );
 
         assertTrue("The database returned a record as expected", result);
 
         String databaseQuery = "SELECT DATABASE()";
         // Postgres does not have Database() as a function
         String databaseType = ConnectionUrl.newInstance(jdbcUrl).getDatabaseType();
-        if (databaseType.equalsIgnoreCase("postgresql") ||
+        if (
+            databaseType.equalsIgnoreCase("postgresql") ||
             databaseType.equalsIgnoreCase("postgis") ||
-            databaseType.equalsIgnoreCase("timescaledb")) {
+            databaseType.equalsIgnoreCase("timescaledb")
+        ) {
             databaseQuery = "SELECT CURRENT_DATABASE()";
         }
 
-        result = new QueryRunner(dataSource).query(databaseQuery, rs -> {
-            rs.next();
-            String resultDB = rs.getString(1);
-            assertEquals("Database name from URL String is used.", "databasename", resultDB);
-            return true;
-        });
+        result =
+            new QueryRunner(dataSource)
+                .query(
+                    databaseQuery,
+                    rs -> {
+                        rs.next();
+                        String resultDB = rs.getString(1);
+                        assertEquals("Database name from URL String is used.", "databasename", resultDB);
+                        return true;
+                    }
+                );
 
         assertTrue("The database returned a record as expected", result);
     }
 
-    private void performTestForCharacterEncodingForInitialScriptConnection(HikariDataSource dataSource) throws SQLException {
-        boolean result = new QueryRunner(dataSource).query("SELECT foo FROM bar WHERE foo LIKE '%мир'", rs -> {
-            rs.next();
-            String resultSetString = rs.getString(1);
-            assertEquals("A SELECT query succeed and the correct charset has been applied for the init script", "привет мир", resultSetString);
-            return true;
-        });
+    private void performTestForCharacterEncodingForInitialScriptConnection(HikariDataSource dataSource)
+        throws SQLException {
+        boolean result = new QueryRunner(dataSource)
+            .query(
+                "SELECT foo FROM bar WHERE foo LIKE '%мир'",
+                rs -> {
+                    rs.next();
+                    String resultSetString = rs.getString(1);
+                    assertEquals(
+                        "A SELECT query succeed and the correct charset has been applied for the init script",
+                        "привет мир",
+                        resultSetString
+                    );
+                    return true;
+                }
+            );
 
         assertTrue("The database returned a record as expected", result);
     }
@@ -160,12 +189,19 @@ private void performSimpleTestWithCharacterSet(String jdbcUrl) throws SQLExcepti
 
     private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException {
         HikariDataSource dataSource = getDataSource(jdbcUrl, 1);
-        boolean result = new QueryRunner(dataSource).query("SHOW VARIABLES LIKE 'character\\_set\\_connection'", rs -> {
-            rs.next();
-            String resultSetString = rs.getString(2);
-            assertTrue("Passing query parameters to set DB connection encoding is successful", resultSetString.startsWith("utf8"));
-            return true;
-        });
+        boolean result = new QueryRunner(dataSource)
+            .query(
+                "SHOW VARIABLES LIKE 'character\\_set\\_connection'",
+                rs -> {
+                    rs.next();
+                    String resultSetString = rs.getString(2);
+                    assertTrue(
+                        "Passing query parameters to set DB connection encoding is successful",
+                        resultSetString.startsWith("utf8")
+                    );
+                    return true;
+                }
+            );
 
         assertTrue("The database returned a record as expected", result);
         return dataSource;
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 5e5342f1ee1..84d242a29c7 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -20,23 +20,29 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Future;
-
-import static java.util.stream.Collectors.joining;
+import java.util.stream.Collectors;
 
 /**
  * Base class for containers that expose a JDBC connection
  *
  * @author richardnorth
  */
-public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<SELF>> extends GenericContainer<SELF> implements LinkableContainer {
+public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<SELF>>
+    extends GenericContainer<SELF>
+    implements LinkableContainer {
 
     private static final Object DRIVER_LOAD_MUTEX = new Object();
+
     private Driver driver;
+
     private String initScriptPath;
+
     protected Map<String, String> parameters = new HashMap<>();
+
     protected Map<String, String> urlParameters = new HashMap<>();
 
     private int startupTimeoutSeconds = 120;
+
     private int connectTimeoutSeconds = 120;
 
     private static final String QUERY_PARAM_SEPARATOR = "&";
@@ -135,7 +141,12 @@ public SELF withInitScript(String initScriptPath) {
     @SneakyThrows(InterruptedException.class)
     @Override
     protected void waitUntilContainerStarted() {
-        logger().info("Waiting for database connection to become available at {} using query '{}'", getJdbcUrl(), getTestQueryString());
+        logger()
+            .info(
+                "Waiting for database connection to become available at {} using query '{}'",
+                getJdbcUrl(),
+                getTestQueryString()
+            );
 
         // Repeatedly try and open a connection to the DB and execute a test query
         long start = System.currentTimeMillis();
@@ -144,8 +155,7 @@ protected void waitUntilContainerStarted() {
             if (!isRunning()) {
                 Thread.sleep(100L);
             } else {
-                try (Connection connection = createConnection("");
-                     Statement statement = connection.createStatement()) {
+                try (Connection connection = createConnection(""); Statement statement = connection.createStatement()) {
                     boolean testQuerySucceeded = statement.execute(this.getTestQueryString());
                     if (testQuerySucceeded) {
                         logger().info("Container is started (JDBC URL: {})", this.getJdbcUrl());
@@ -163,8 +173,10 @@ protected void waitUntilContainerStarted() {
         }
 
         throw new IllegalStateException(
-            String.format("Container is started, but cannot be accessed by (JDBC URL: %s), please check container logs",
-                this.getJdbcUrl())
+            String.format(
+                "Container is started, but cannot be accessed by (JDBC URL: %s), please check container logs",
+                this.getJdbcUrl()
+            )
         );
     }
 
@@ -179,7 +191,6 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
      * @return a JDBC Driver
      */
     public Driver getJdbcDriverInstance() throws NoDriverFoundException {
-
         synchronized (DRIVER_LOAD_MUTEX) {
             if (driver == null) {
                 try {
@@ -215,7 +226,13 @@ public Connection createConnection(String queryString) throws SQLException, NoDr
             // give up if we hit the time limit or the container stops running for some reason
             while (System.currentTimeMillis() < start + (1000 * connectTimeoutSeconds) && isRunning()) {
                 try {
-                    logger().debug("Trying to create JDBC connection using {} to {} with properties: {}", driver.getClass().getName(), url, info);
+                    logger()
+                        .debug(
+                            "Trying to create JDBC connection using {} to {} with properties: {}",
+                            driver.getClass().getName(),
+                            url,
+                            info
+                        );
 
                     return jdbcDriverInstance.connect(url, info);
                 } catch (SQLException e) {
@@ -261,15 +278,18 @@ protected String constructUrlParameters(String startCharacter, String delimiter)
     protected String constructUrlParameters(String startCharacter, String delimiter, String endCharacter) {
         String urlParameters = "";
         if (!this.urlParameters.isEmpty()) {
-            String additionalParameters = this.urlParameters.entrySet().stream()
-                .map(Object::toString)
-                .collect(joining(delimiter));
+            String additionalParameters =
+                this.urlParameters.entrySet().stream().map(Object::toString).collect(Collectors.joining(delimiter));
             urlParameters = startCharacter + additionalParameters + endCharacter;
         }
         return urlParameters;
     }
 
-    protected void optionallyMapResourceParameterAsVolume(@NotNull String paramName, @NotNull String pathNameInContainer, @NotNull String defaultResource) {
+    protected void optionallyMapResourceParameterAsVolume(
+        @NotNull String paramName,
+        @NotNull String pathNameInContainer,
+        @NotNull String defaultResource
+    ) {
         String resourceName = parameters.getOrDefault(paramName, defaultResource);
 
         if (resourceName != null) {
@@ -319,6 +339,7 @@ protected DatabaseDelegate getDatabaseDelegate() {
     }
 
     public static class NoDriverFoundException extends RuntimeException {
+
         public NoDriverFoundException(String message, Throwable e) {
             super(message, e);
         }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
index f8694306384..3cd74dc98d4 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainerProvider.java
@@ -1,8 +1,7 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.jdbc.ConnectionUrl;
-
 import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.jdbc.ConnectionUrl;
 
 import java.util.Objects;
 
@@ -26,9 +25,12 @@ public abstract class JdbcDatabaseContainerProvider {
      * @return Instance of {@link JdbcDatabaseContainer}
      */
     public JdbcDatabaseContainer newInstance() {
-        log.warn("No explicit version tag was provided in JDBC URL and this class ({}) does not " +
+        log.warn(
+            "No explicit version tag was provided in JDBC URL and this class ({}) does not " +
             "override newInstance() to set a default tag. `latest` will be used but results may " +
-            "be unreliable!", this.getClass().getCanonicalName());
+            "be unreliable!",
+            this.getClass().getCanonicalName()
+        );
         return this.newInstance("latest");
     }
 
@@ -55,7 +57,11 @@ public JdbcDatabaseContainer newInstance(ConnectionUrl url) {
         return result;
     }
 
-    protected JdbcDatabaseContainer newInstanceFromConnectionUrl(ConnectionUrl connectionUrl, final String userParamName, final String pwdParamName) {
+    protected JdbcDatabaseContainer newInstanceFromConnectionUrl(
+        ConnectionUrl connectionUrl,
+        final String userParamName,
+        final String pwdParamName
+    ) {
         Objects.requireNonNull(connectionUrl, "Connection URL cannot be null");
 
         final String databaseName = connectionUrl.getDatabaseName().orElse("test");
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java
index e7f59b2df4f..47d3cadc823 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionDelegate.java
@@ -1,13 +1,13 @@
 package org.testcontainers.jdbc;
 
 import lombok.RequiredArgsConstructor;
-import lombok.Value;
 import lombok.experimental.Delegate;
 
 import java.sql.Connection;
 
 @RequiredArgsConstructor
 class ConnectionDelegate implements Connection {
+
     @Delegate
     private final Connection delegate;
 }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index 3354ed45c39..b4aef740da0 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -1,5 +1,10 @@
 package org.testcontainers.jdbc;
 
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.testcontainers.UnstableAPI;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -10,13 +15,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.testcontainers.UnstableAPI;
-
-import static java.util.stream.Collectors.toMap;
-
 /**
  * This is an Immutable class holding JDBC Connection Url and its parsed components, used by {@link ContainerDatabaseDriver}.
  * <p>
@@ -60,6 +58,7 @@ public class ConnectionUrl {
     private Map<String, String> containerParameters;
 
     private Map<String, String> queryParameters;
+
     private Map<String, String> tmpfsOptions = new HashMap<>();
 
     public static ConnectionUrl newInstance(final String url) {
@@ -94,7 +93,9 @@ private void parseUrl() {
             //Try for Oracle pattern
             urlMatcher = Patterns.ORACLE_URL_MATCHING_PATTERN.matcher(this.getUrl());
             if (!urlMatcher.matches()) {
-                throw new IllegalArgumentException("JDBC URL matches jdbc:tc: prefix but the database or tag name could not be identified");
+                throw new IllegalArgumentException(
+                    "JDBC URL matches jdbc:tc: prefix but the database or tag name could not be identified"
+                );
             }
         }
         databaseType = urlMatcher.group("databaseType");
@@ -113,9 +114,10 @@ private void parseUrl() {
             databaseName = Optional.of(dbInstanceMatcher.group("databaseName"));
         }
 
-        queryParameters = Collections.unmodifiableMap(
-            parseQueryParameters(
-                Optional.ofNullable(urlMatcher.group("queryParameters")).orElse("")));
+        queryParameters =
+            Collections.unmodifiableMap(
+                parseQueryParameters(Optional.ofNullable(urlMatcher.group("queryParameters")).orElse(""))
+            );
 
         String query = queryParameters
             .entrySet()
@@ -133,7 +135,6 @@ private void parseUrl() {
 
         tmpfsOptions = parseTmpfsOptions(containerParameters);
 
-
         initScriptPath = Optional.ofNullable(containerParameters.get("TC_INITSCRIPT"));
 
         reusable = Boolean.parseBoolean(containerParameters.get("TC_REUSABLE"));
@@ -145,7 +146,6 @@ private void parseUrl() {
 
         Matcher daemonMatcher = Patterns.DAEMON_MATCHING_PATTERN.matcher(this.getUrl());
         inDaemonMode = daemonMatcher.matches() && Boolean.parseBoolean(daemonMatcher.group(2));
-
     }
 
     private Map<String, String> parseTmpfsOptions(Map<String, String> containerParameters) {
@@ -155,10 +155,9 @@ private Map<String, String> parseTmpfsOptions(Map<String, String> containerParam
 
         String tmpfsOptions = containerParameters.get("TC_TMPFS");
 
-        return Stream.of(tmpfsOptions.split(","))
-            .collect(toMap(
-                string -> string.split(":")[0],
-                string -> string.split(":")[1]));
+        return Stream
+            .of(tmpfsOptions.split(","))
+            .collect(Collectors.toMap(string -> string.split(":")[0], string -> string.split(":")[1]));
     }
 
     /**
@@ -167,7 +166,6 @@ private Map<String, String> parseTmpfsOptions(Map<String, String> containerParam
      * @return {@link Map}
      */
     private Map<String, String> parseContainerParameters() {
-
         Map<String, String> results = new HashMap<>();
 
         Matcher matcher = Patterns.TC_PARAM_MATCHING_PATTERN.matcher(this.getUrl());
@@ -186,14 +184,14 @@ private Map<String, String> parseContainerParameters() {
      * @return {@link Map}
      */
     private Map<String, String> parseQueryParameters(final String queryString) {
-
         Map<String, String> results = new HashMap<>();
         Matcher matcher = Patterns.QUERY_PARAM_MATCHING_PATTERN.matcher(queryString);
         while (matcher.find()) {
             String key = matcher.group(1);
             String value = matcher.group(2);
-            if (!key.matches(Patterns.TC_PARAM_NAME_PATTERN))
+            if (!key.matches(Patterns.TC_PARAM_NAME_PATTERN)) {
                 results.put(key, value);
+            }
         }
 
         return results;
@@ -211,36 +209,36 @@ public Map<String, String> getTmpfsOptions() {
     public interface Patterns {
         Pattern URL_MATCHING_PATTERN = Pattern.compile(
             "jdbc:tc:" +
-                "(?<databaseType>[a-z0-9]+)" +
-                "(:(?<imageTag>[^:]+))?" +
-                "://" +
-                "(?<dbHostString>[^?]+)" +
-                "(?<queryParameters>\\?.*)?"
+            "(?<databaseType>[a-z0-9]+)" +
+            "(:(?<imageTag>[^:]+))?" +
+            "://" +
+            "(?<dbHostString>[^?]+)" +
+            "(?<queryParameters>\\?.*)?"
         );
 
         Pattern ORACLE_URL_MATCHING_PATTERN = Pattern.compile(
             "jdbc:tc:" +
-                "(?<databaseType>[a-z]+)" +
-                "(:(?<imageTag>(?!thin).+))?:thin:(//)?" +
-                "(" +
-                "(?<username>[^:" +
-                "?^/]+)/(?<password>[^?^/]+)" +
-                ")?" +
-                "@" +
-                "(?<dbHostString>[^?]+)" +
-                "(?<queryParameters>\\?.*)?"
+            "(?<databaseType>[a-z]+)" +
+            "(:(?<imageTag>(?!thin).+))?:thin:(//)?" +
+            "(" +
+            "(?<username>[^:" +
+            "?^/]+)/(?<password>[^?^/]+)" +
+            ")?" +
+            "@" +
+            "(?<dbHostString>[^?]+)" +
+            "(?<queryParameters>\\?.*)?"
         );
 
         //Matches to part of string - hostname:port/databasename
         Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile(
             "(?<databaseHost>[^:]+)" +
-                "(:(?<databasePort>[0-9]+))?" +
-                "(" +
-                "(?<sidOrServiceName>[:/])" +
-                "|" +
-                ";databaseName=" +
-                ")" +
-                "(?<databaseName>[^\\\\?]+)"
+            "(:(?<databasePort>[0-9]+))?" +
+            "(" +
+            "(?<sidOrServiceName>[:/])" +
+            "|" +
+            ";databaseName=" +
+            ")" +
+            "(?<databaseName>[^\\\\?]+)"
         );
 
         Pattern DAEMON_MATCHING_PATTERN = Pattern.compile(".*([?&]?)TC_DAEMON=([^?&]+).*");
@@ -251,24 +249,27 @@ public interface Patterns {
         @Deprecated
         Pattern INITSCRIPT_MATCHING_PATTERN = Pattern.compile(".*([?&]?)TC_INITSCRIPT=([^?&]+).*");
 
-        Pattern INITFUNCTION_MATCHING_PATTERN = Pattern.compile(".*([?&]?)TC_INITFUNCTION=" +
+        Pattern INITFUNCTION_MATCHING_PATTERN = Pattern.compile(
+            ".*([?&]?)TC_INITFUNCTION=" +
             "((\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)*\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)" +
             "::" +
             "(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)" +
-            ".*");
+            ".*"
+        );
 
         String TC_PARAM_NAME_PATTERN = "(TC_[A-Z_]+)";
 
         Pattern TC_PARAM_MATCHING_PATTERN = Pattern.compile(TC_PARAM_NAME_PATTERN + "=([^?&]+)");
 
         Pattern QUERY_PARAM_MATCHING_PATTERN = Pattern.compile("([^?&=]+)=([^?&]*)");
-
     }
 
     @Getter
     @AllArgsConstructor
     public class InitFunctionDef {
+
         private String className;
+
         private String methodName;
     }
 }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java
index 3e1f67c5b86..4f245590f78 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionWrapper.java
@@ -17,7 +17,7 @@ public void close() throws SQLException {
         super.close();
         try {
             closeCallback.run();
-        } catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index 4b3a7ba98f7..23ed9d78b25 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -7,7 +7,6 @@
 import org.testcontainers.delegate.DatabaseDelegate;
 import org.testcontainers.ext.ScriptUtils;
 
-import javax.script.ScriptException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -17,6 +16,8 @@
 import java.util.*;
 import java.util.logging.Logger;
 
+import javax.script.ScriptException;
+
 /**
  * Test Containers JDBC proxy driver. This driver will handle JDBC URLs of the form:
  * <p>
@@ -38,9 +39,13 @@ public class ContainerDatabaseDriver implements Driver {
     private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ContainerDatabaseDriver.class);
 
     private Driver delegate;
+
     private static final Map<String, Set<Connection>> containerConnections = new HashMap<>();
+
     private static final Map<String, JdbcDatabaseContainer> jdbcUrlContainerCache = new HashMap<>();
+
     private static final Set<String> initializedContainers = new HashSet<>();
+
     private static final String FILE_PATH_PREFIX = "file:";
 
     static {
@@ -62,7 +67,6 @@ public boolean acceptsURL(String url) throws SQLException {
 
     @Override
     public synchronized Connection connect(String url, final Properties info) throws SQLException {
-
         /*
           The driver should return "null" if it realizes it is the wrong kind of driver to connect to the given URL.
          */
@@ -73,7 +77,6 @@ public synchronized Connection connect(String url, final Properties info) throws
         ConnectionUrl connectionUrl = ConnectionUrl.newInstance(url);
 
         synchronized (jdbcUrlContainerCache) {
-
             String queryString = connectionUrl.getQueryString().orElse("");
             /*
               If we already have a running container for this exact connection string, we want to connect
@@ -81,7 +84,6 @@ public synchronized Connection connect(String url, final Properties info) throws
              */
             JdbcDatabaseContainer container = jdbcUrlContainerCache.get(connectionUrl.getUrl());
             if (container == null) {
-
                 LOGGER.debug("Container not found in cache, creating new instance");
 
                 Map<String, String> parameters = connectionUrl.getContainerParameters();
@@ -89,7 +91,9 @@ public synchronized Connection connect(String url, final Properties info) throws
                 /*
                   Find a matching container type using ServiceLoader.
                  */
-                ServiceLoader<JdbcDatabaseContainerProvider> databaseContainers = ServiceLoader.load(JdbcDatabaseContainerProvider.class);
+                ServiceLoader<JdbcDatabaseContainerProvider> databaseContainers = ServiceLoader.load(
+                    JdbcDatabaseContainerProvider.class
+                );
                 for (JdbcDatabaseContainerProvider candidateContainerType : databaseContainers) {
                     if (candidateContainerType.supports(connectionUrl.getDatabaseType())) {
                         container = candidateContainerType.newInstance(connectionUrl);
@@ -98,7 +102,9 @@ public synchronized Connection connect(String url, final Properties info) throws
                     }
                 }
                 if (container == null) {
-                    throw new UnsupportedOperationException("Database name " + connectionUrl.getDatabaseType() + " not supported");
+                    throw new UnsupportedOperationException(
+                        "Database name " + connectionUrl.getDatabaseType() + " not supported"
+                    );
                 }
 
                 /*
@@ -138,7 +144,6 @@ public synchronized Connection connect(String url, final Properties info) throws
         }
     }
 
-
     /**
      * Wrap the connection, setting up a callback to be called when the connection is closed.
      * <p>
@@ -149,25 +154,34 @@ public synchronized Connection connect(String url, final Properties info) throws
      * @param connectionUrl {@link ConnectionUrl} instance representing JDBC Url for this connection
      * @return the connection, wrapped
      */
-    private Connection wrapConnection(final Connection connection, final JdbcDatabaseContainer container, final ConnectionUrl connectionUrl) {
-
+    private Connection wrapConnection(
+        final Connection connection,
+        final JdbcDatabaseContainer container,
+        final ConnectionUrl connectionUrl
+    ) {
         final boolean isDaemon = connectionUrl.isInDaemonMode() || connectionUrl.isReusable();
 
-        Set<Connection> connections = containerConnections.computeIfAbsent(container.getContainerId(), k -> new HashSet<>());
+        Set<Connection> connections = containerConnections.computeIfAbsent(
+            container.getContainerId(),
+            k -> new HashSet<>()
+        );
 
         connections.add(connection);
 
         final Set<Connection> finalConnections = connections;
 
-        return new ConnectionWrapper(connection, () -> {
-            finalConnections.remove(connection);
-            if (!isDaemon && finalConnections.isEmpty()) {
-                synchronized (jdbcUrlContainerCache) {
-                    container.stop();
-                    jdbcUrlContainerCache.remove(connectionUrl.getUrl());
+        return new ConnectionWrapper(
+            connection,
+            () -> {
+                finalConnections.remove(connection);
+                if (!isDaemon && finalConnections.isEmpty()) {
+                    synchronized (jdbcUrlContainerCache) {
+                        container.stop();
+                        jdbcUrlContainerCache.remove(connectionUrl.getUrl());
+                    }
                 }
             }
-        });
+        );
     }
 
     /**
@@ -177,7 +191,8 @@ private Connection wrapConnection(final Connection connection, final JdbcDatabas
      * @param databaseDelegate database delegate to apply init scripts to the database
      * @throws SQLException on script or DB error
      */
-    private void runInitScriptIfRequired(final ConnectionUrl connectionUrl, DatabaseDelegate databaseDelegate) throws SQLException {
+    private void runInitScriptIfRequired(final ConnectionUrl connectionUrl, DatabaseDelegate databaseDelegate)
+        throws SQLException {
         if (connectionUrl.getInitScriptPath().isPresent()) {
             String initScriptPath = connectionUrl.getInitScriptPath().get();
             try {
@@ -191,7 +206,9 @@ private void runInitScriptIfRequired(final ConnectionUrl connectionUrl, Database
                 }
                 if (resource == null) {
                     LOGGER.warn("Could not load classpath init script: {}", initScriptPath);
-                    throw new SQLException("Could not load classpath init script: " + initScriptPath + ". Resource not found.");
+                    throw new SQLException(
+                        "Could not load classpath init script: " + initScriptPath + ". Resource not found."
+                    );
                 }
 
                 String sql = IOUtils.toString(resource, StandardCharsets.UTF_8);
@@ -213,7 +230,8 @@ private void runInitScriptIfRequired(final ConnectionUrl connectionUrl, Database
      * @param connection    JDBC connection to apply init functions to.
      * @throws SQLException on script or DB error
      */
-    private void runInitFunctionIfRequired(final ConnectionUrl connectionUrl, Connection connection) throws SQLException {
+    private void runInitFunctionIfRequired(final ConnectionUrl connectionUrl, Connection connection)
+        throws SQLException {
         if (connectionUrl.getInitFunction().isPresent()) {
             String className = connectionUrl.getInitFunction().get().getClassName();
             String methodName = connectionUrl.getInitFunction().get().getMethodName();
@@ -223,7 +241,9 @@ private void runInitFunctionIfRequired(final ConnectionUrl connectionUrl, Connec
                 Method method = initFunctionClazz.getMethod(methodName, Connection.class);
 
                 method.invoke(null, connection);
-            } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            } catch (
+                ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e
+            ) {
                 LOGGER.error("Error while executing init function: {}::{}", className, methodName, e);
                 throw new SQLException("Error while executing init function: " + className + "::" + methodName, e);
             }
@@ -270,7 +290,6 @@ public static void killContainers() {
             containerConnections.clear();
             initializedContainers.clear();
         }
-
     }
 
     /**
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
index 6173a8f6a37..7ed2f7ffde1 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
@@ -18,6 +18,7 @@
 public class JdbcDatabaseDelegate extends AbstractDatabaseDelegate<Statement> {
 
     private JdbcDatabaseContainer container;
+
     private String queryString;
 
     public JdbcDatabaseDelegate(JdbcDatabaseContainer container, String queryString) {
@@ -35,16 +36,27 @@ protected Statement createNewConnection() {
         }
     }
 
-
     @Override
-    public void execute(String statement, String scriptPath, int lineNumber, boolean continueOnError, boolean ignoreFailedDrops) {
+    public void execute(
+        String statement,
+        String scriptPath,
+        int lineNumber,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    ) {
         try {
             boolean rowsAffected = getConnection().execute(statement);
             log.debug("{} returned as updateCount for SQL: {}", rowsAffected, statement);
         } catch (SQLException ex) {
             boolean dropStatement = statement.trim().toLowerCase().startsWith("drop");
             if (continueOnError || (dropStatement && ignoreFailedDrops)) {
-                log.debug("Failed to execute SQL script statement at line {} of resource {}: {}", lineNumber, scriptPath, statement, ex);
+                log.debug(
+                    "Failed to execute SQL script statement at line {} of resource {}: {}",
+                    lineNumber,
+                    scriptPath,
+                    statement,
+                    ex
+                );
             } else {
                 throw new ScriptUtils.ScriptStatementFailedException(statement, lineNumber, scriptPath, ex);
             }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ext/ScriptUtils.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ext/ScriptUtils.java
index 76b7a044c9d..c6a3c0fa3ed 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ext/ScriptUtils.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ext/ScriptUtils.java
@@ -18,10 +18,11 @@
 
 import org.testcontainers.jdbc.ContainerLessJdbcDelegate;
 
-import javax.script.ScriptException;
 import java.sql.Connection;
 import java.util.List;
 
+import javax.script.ScriptException;
+
 /**
  * Wrapper for database-agnostic ScriptUtils
  *
@@ -68,9 +69,24 @@ private ScriptUtils() {
      * @see org.testcontainers.ext.ScriptUtils
      * @deprecated Needed only to keep binary compatibility for this internal API. Consider using database-agnostic ScriptUtils
      */
-    public static void splitSqlScript(String resource, String script, String separator, String commentPrefix,
-                                      String blockCommentStartDelimiter, String blockCommentEndDelimiter, List<String> statements) {
-        org.testcontainers.ext.ScriptUtils.splitSqlScript(resource, script, separator, commentPrefix, blockCommentStartDelimiter, blockCommentEndDelimiter, statements);
+    public static void splitSqlScript(
+        String resource,
+        String script,
+        String separator,
+        String commentPrefix,
+        String blockCommentStartDelimiter,
+        String blockCommentEndDelimiter,
+        List<String> statements
+    ) {
+        org.testcontainers.ext.ScriptUtils.splitSqlScript(
+            resource,
+            script,
+            separator,
+            commentPrefix,
+            blockCommentStartDelimiter,
+            blockCommentEndDelimiter,
+            statements
+        );
     }
 
     /**
@@ -85,18 +101,40 @@ public static boolean containsSqlScriptDelimiters(String script, String delim) {
      * @see org.testcontainers.ext.ScriptUtils
      * @deprecated Needed only to keep binary compatibility for this internal API. Consider using database-agnostic ScriptUtils
      */
-    public static void executeSqlScript(Connection connection, String scriptPath, String script) throws ScriptException {
-        org.testcontainers.ext.ScriptUtils.executeDatabaseScript(new ContainerLessJdbcDelegate(connection), scriptPath, script);
+    public static void executeSqlScript(Connection connection, String scriptPath, String script)
+        throws ScriptException {
+        org.testcontainers.ext.ScriptUtils.executeDatabaseScript(
+            new ContainerLessJdbcDelegate(connection),
+            scriptPath,
+            script
+        );
     }
 
     /**
      * @see org.testcontainers.ext.ScriptUtils
      * @deprecated Needed only to keep binary compatibility for this internal API. Consider using database-agnostic ScriptUtils
      */
-    public static void executeSqlScript(Connection connection, String scriptPath, String script, boolean continueOnError,
-                                        boolean ignoreFailedDrops, String commentPrefix, String separator, String blockCommentStartDelimiter,
-                                        String blockCommentEndDelimiter) throws ScriptException {
-        org.testcontainers.ext.ScriptUtils.executeDatabaseScript(new ContainerLessJdbcDelegate(connection), scriptPath,
-                script, continueOnError, ignoreFailedDrops, commentPrefix, separator, blockCommentStartDelimiter, blockCommentEndDelimiter);
+    public static void executeSqlScript(
+        Connection connection,
+        String scriptPath,
+        String script,
+        boolean continueOnError,
+        boolean ignoreFailedDrops,
+        String commentPrefix,
+        String separator,
+        String blockCommentStartDelimiter,
+        String blockCommentEndDelimiter
+    ) throws ScriptException {
+        org.testcontainers.ext.ScriptUtils.executeDatabaseScript(
+            new ContainerLessJdbcDelegate(connection),
+            scriptPath,
+            script,
+            continueOnError,
+            ignoreFailedDrops,
+            commentPrefix,
+            separator,
+            blockCommentStartDelimiter,
+            blockCommentEndDelimiter
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
index 9f0cf514558..1dc6646bd17 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
@@ -1,11 +1,12 @@
 package org.testcontainers.containers;
 
-import java.sql.Connection;
-import java.sql.SQLException;
 import lombok.NonNull;
 import org.junit.Test;
 import org.slf4j.Logger;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.mock;
 
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index 12ca5c28c3d..9b88e6b503d 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -5,9 +5,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 
+import java.util.Arrays;
 import java.util.Optional;
 
-import static java.util.Arrays.asList;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 /**
@@ -20,35 +20,106 @@ public class ConnectionUrlDriversTests {
 
     @Parameter
     public String jdbcUrl;
+
     @Parameter(1)
     public String databaseType;
+
     @Parameter(2)
     public Optional<String> tag;
+
     @Parameter(3)
     public String dbHostString;
+
     @Parameter(4)
     public String databaseName;
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:mysql:5.7.34://hostname/test", "mysql", Optional.of("5.7.34"), "hostname/test", "test"},
-                {"jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test"},
-                {"jdbc:tc:postgresql:1.2.3://hostname/test", "postgresql", Optional.of("1.2.3"), "hostname/test", "test"},
-                {"jdbc:tc:postgresql://hostname/test", "postgresql", Optional.empty(), "hostname/test", "test"},
-                {"jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test", "sqlserver", Optional.of("1.2.3"), "localhost;instance=SQLEXPRESS:1433;databaseName=test", "test"},
-                {"jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test", "sqlserver", Optional.empty(), "localhost;instance=SQLEXPRESS:1433;databaseName=test", "test"},
-                {"jdbc:tc:mariadb:1.2.3://localhost:3306/test", "mariadb", Optional.of("1.2.3"), "localhost:3306/test", "test"},
-                {"jdbc:tc:mariadb://localhost:3306/test", "mariadb", Optional.empty(), "localhost:3306/test", "test"},
-                {"jdbc:tc:oracle:1.2.3:thin://@localhost:1521/test", "oracle", Optional.of("1.2.3"), "localhost:1521/test", "test"},
-                {"jdbc:tc:oracle:1.2.3:thin:@localhost:1521/test", "oracle", Optional.of("1.2.3"), "localhost:1521/test", "test"},
-                {"jdbc:tc:oracle:thin:@localhost:1521/test", "oracle", Optional.empty(), "localhost:1521/test", "test"},
-                {"jdbc:tc:oracle:1.2.3:thin:@localhost:1521:test", "oracle", Optional.of("1.2.3"), "localhost:1521:test", "test"},
-                {"jdbc:tc:oracle:1.2.3:thin://@localhost:1521:test", "oracle", Optional.of("1.2.3"), "localhost:1521:test", "test"},
-                {"jdbc:tc:oracle:1.2.3-anything:thin://@localhost:1521:test", "oracle", Optional.of("1.2.3-anything"), "localhost:1521:test", "test"},
-                {"jdbc:tc:oracle:thin:@localhost:1521:test", "oracle", Optional.empty(), "localhost:1521:test", "test"}
-            });
+        return Arrays.asList(
+            new Object[][] {
+                { "jdbc:tc:mysql:5.7.34://hostname/test", "mysql", Optional.of("5.7.34"), "hostname/test", "test" },
+                { "jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test" },
+                {
+                    "jdbc:tc:postgresql:1.2.3://hostname/test",
+                    "postgresql",
+                    Optional.of("1.2.3"),
+                    "hostname/test",
+                    "test",
+                },
+                { "jdbc:tc:postgresql://hostname/test", "postgresql", Optional.empty(), "hostname/test", "test" },
+                {
+                    "jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                    "sqlserver",
+                    Optional.of("1.2.3"),
+                    "localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                    "sqlserver",
+                    Optional.empty(),
+                    "localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:mariadb:1.2.3://localhost:3306/test",
+                    "mariadb",
+                    Optional.of("1.2.3"),
+                    "localhost:3306/test",
+                    "test",
+                },
+                { "jdbc:tc:mariadb://localhost:3306/test", "mariadb", Optional.empty(), "localhost:3306/test", "test" },
+                {
+                    "jdbc:tc:oracle:1.2.3:thin://@localhost:1521/test",
+                    "oracle",
+                    Optional.of("1.2.3"),
+                    "localhost:1521/test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:oracle:1.2.3:thin:@localhost:1521/test",
+                    "oracle",
+                    Optional.of("1.2.3"),
+                    "localhost:1521/test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:oracle:thin:@localhost:1521/test",
+                    "oracle",
+                    Optional.empty(),
+                    "localhost:1521/test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:oracle:1.2.3:thin:@localhost:1521:test",
+                    "oracle",
+                    Optional.of("1.2.3"),
+                    "localhost:1521:test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:oracle:1.2.3:thin://@localhost:1521:test",
+                    "oracle",
+                    Optional.of("1.2.3"),
+                    "localhost:1521:test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:oracle:1.2.3-anything:thin://@localhost:1521:test",
+                    "oracle",
+                    Optional.of("1.2.3-anything"),
+                    "localhost:1521:test",
+                    "test",
+                },
+                {
+                    "jdbc:tc:oracle:thin:@localhost:1521:test",
+                    "oracle",
+                    Optional.empty(),
+                    "localhost:1521:test",
+                    "test",
+                },
+            }
+        );
     }
 
     @Test
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index 4fefd5d1e13..6888f881ec4 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -13,7 +13,6 @@ public class ConnectionUrlTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-
     @Test
     public void testConnectionUrl1() {
         String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d";
@@ -31,7 +30,6 @@ public void testConnectionUrl1() {
         assertEquals("Parameter c is captured", "d", url.getQueryParameters().get("c"));
     }
 
-
     @Test
     public void testConnectionUrl2() {
         String urlString = "jdbc:tc:mysql://somehostname/databasename";
@@ -46,7 +44,6 @@ public void testConnectionUrl2() {
         assertEquals("Database Name value is as expected", "databasename", url.getDatabaseName().get());
 
         assertTrue("Connection Parameters set is empty", url.getQueryParameters().isEmpty());
-
     }
 
     @Test
@@ -62,40 +59,55 @@ public void testTmpfsOption() {
 
         assertTrue("Connection Parameters set is empty", url.getQueryParameters().isEmpty());
         assertFalse("Container Parameters set is not empty", url.getContainerParameters().isEmpty());
-        assertEquals("Container Parameter TC_TMPFS is true", "key:value,key1:value1", url.getContainerParameters().get("TC_TMPFS"));
+        assertEquals(
+            "Container Parameter TC_TMPFS is true",
+            "key:value,key1:value1",
+            url.getContainerParameters().get("TC_TMPFS")
+        );
         assertTrue("tmpfs option key exists", url.getTmpfsOptions().containsKey("key"));
-        assertEquals("tmpfs option key has correct value", "value" , url.getTmpfsOptions().get("key"));
+        assertEquals("tmpfs option key has correct value", "value", url.getTmpfsOptions().get("key"));
         assertTrue("tmpfs option key1 exists", url.getTmpfsOptions().containsKey("key1"));
-        assertEquals("tmpfs option key1 has correct value", "value1" , url.getTmpfsOptions().get("key1"));
+        assertEquals("tmpfs option key1 has correct value", "value1", url.getTmpfsOptions().get("key1"));
     }
 
-
     @Test
     public void testInitScriptPathCapture() {
-        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
+        String urlString =
+            "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertEquals("Database Type value is as expected", "somepath/init_mysql.sql", url.getInitScriptPath().get());
         assertEquals("Query String value is as expected", "?a=b&c=d", url.getQueryString().get());
-        assertEquals("INIT SCRIPT Path exists in Container Parameters", "somepath/init_mysql.sql", url.getContainerParameters().get("TC_INITSCRIPT"));
+        assertEquals(
+            "INIT SCRIPT Path exists in Container Parameters",
+            "somepath/init_mysql.sql",
+            url.getContainerParameters().get("TC_INITSCRIPT")
+        );
 
         //Parameter sets are unmodifiable
         thrown.expect(UnsupportedOperationException.class);
         url.getContainerParameters().remove("TC_INITSCRIPT");
         url.getQueryParameters().remove("a");
-
     }
 
     @Test
     public void testInitFunctionCapture() {
-        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
+        String urlString =
+            "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertTrue("Init Function parameter exists", url.getInitFunction().isPresent());
 
-        assertEquals("Init function class is as expected", "org.testcontainers.jdbc.JDBCDriverTest", url.getInitFunction().get().getClassName());
-        assertEquals("Init function class is as expected", "sampleInitFunction", url.getInitFunction().get().getMethodName());
-
+        assertEquals(
+            "Init function class is as expected",
+            "org.testcontainers.jdbc.JDBCDriverTest",
+            url.getInitFunction().get().getClassName()
+        );
+        assertEquals(
+            "Init function class is as expected",
+            "sampleInitFunction",
+            url.getInitFunction().get().getMethodName()
+        );
     }
 
     @Test
@@ -104,6 +116,5 @@ public void testDaemonCapture() {
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertTrue("Daemon flag is set to true.", url.isInDaemonMode());
-
     }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
index d33e399db27..5b4d223cd36 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
@@ -13,23 +13,22 @@
 
 public class ContainerDatabaseDriverTest {
 
-	private static final String PLAIN_POSTGRESQL_JDBC_URL = "jdbc:postgresql://localhost:5432/test";
-
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Test
-	public void shouldNotTryToConnectToNonMatchingJdbcUrlDirectly() throws SQLException {
-		ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
-		Connection connection = driver.connect(PLAIN_POSTGRESQL_JDBC_URL, new Properties());
-		Assert.assertNull(connection);
-	}
-
-	@Test
-	public void shouldNotTryToConnectToNonMatchingJdbcUrlViaDriverManager() throws SQLException {
-		thrown.expect(SQLException.class);
-		thrown.expectMessage(CoreMatchers.startsWith("No suitable driver found for "));
-		DriverManager.getConnection(PLAIN_POSTGRESQL_JDBC_URL);
-	}
-
+    private static final String PLAIN_POSTGRESQL_JDBC_URL = "jdbc:postgresql://localhost:5432/test";
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void shouldNotTryToConnectToNonMatchingJdbcUrlDirectly() throws SQLException {
+        ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
+        Connection connection = driver.connect(PLAIN_POSTGRESQL_JDBC_URL, new Properties());
+        Assert.assertNull(connection);
+    }
+
+    @Test
+    public void shouldNotTryToConnectToNonMatchingJdbcUrlViaDriverManager() throws SQLException {
+        thrown.expect(SQLException.class);
+        thrown.expectMessage(CoreMatchers.startsWith("No suitable driver found for "));
+        DriverManager.getConnection(PLAIN_POSTGRESQL_JDBC_URL);
+    }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
index 46138d91347..68afe8692e8 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -17,7 +17,6 @@ public class MissingJdbcDriverTest {
 
     @Test
     public void shouldFailFastIfNoDriverFound() {
-
         final MissingDriverContainer container = new MissingDriverContainer();
 
         try {
@@ -37,6 +36,7 @@ public void shouldFailFastIfNoDriverFound() {
      * Container class for the purposes of testing, with a known non-existent driver
      */
     static class MissingDriverContainer extends JdbcDatabaseContainer {
+
         private final AtomicInteger connectionAttempts = new AtomicInteger();
 
         MissingDriverContainer() {
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
index ef8560b3f19..a8612fc1516 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
@@ -1,22 +1,22 @@
 package org.testcontainers.junit.jupiter;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.util.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.platform.commons.util.StringUtils.isBlank;
+import java.nio.charset.StandardCharsets;
 
 class FilesystemFriendlyNameGenerator {
+
     private static final String UNKNOWN_NAME = "unknown";
 
     static String filesystemFriendlyNameOf(ExtensionContext context) {
         String contextId = context.getUniqueId();
         try {
-            return (isBlank(contextId))
+            return (StringUtils.isBlank(contextId))
                 ? UNKNOWN_NAME
-                : URLEncoder.encode(contextId, UTF_8.toString());
+                : URLEncoder.encode(contextId, StandardCharsets.UTF_8.toString());
         } catch (UnsupportedEncodingException e) {
             return UNKNOWN_NAME;
         }
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
index db8273563a7..730339f0fd5 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
@@ -59,7 +59,6 @@
 @ExtendWith(TestcontainersExtension.class)
 @Inherited
 public @interface Testcontainers {
-
     /**
      * Whether tests should be disabled (rather than failing) when Docker is not available.
      */
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 990940be14d..47ed56d9ac5 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -29,33 +29,38 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static java.util.stream.Collectors.toList;
-import static org.testcontainers.junit.jupiter.FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf;
-
-class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition {
+class TestcontainersExtension
+    implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition {
 
     private static final Namespace NAMESPACE = Namespace.create(TestcontainersExtension.class);
 
     private static final String SHARED_LIFECYCLE_AWARE_CONTAINERS = "sharedLifecycleAwareContainers";
+
     private static final String LOCAL_LIFECYCLE_AWARE_CONTAINERS = "localLifecycleAwareContainers";
 
     @Override
     public void beforeAll(ExtensionContext context) {
-        Class<?> testClass = context.getTestClass()
-            .orElseThrow(() -> new ExtensionConfigurationException("TestcontainersExtension is only supported for classes."));
+        Class<?> testClass = context
+            .getTestClass()
+            .orElseThrow(() -> {
+                return new ExtensionConfigurationException("TestcontainersExtension is only supported for classes.");
+            });
 
         Store store = context.getStore(NAMESPACE);
         List<StoreAdapter> sharedContainersStoreAdapters = findSharedContainers(testClass);
 
-        sharedContainersStoreAdapters.forEach(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()));
+        sharedContainersStoreAdapters.forEach(adapter -> {
+            store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start());
+        });
 
         List<TestLifecycleAware> lifecycleAwareContainers = sharedContainersStoreAdapters
             .stream()
             .filter(this::isTestLifecycleAware)
             .map(lifecycleAwareAdapter -> (TestLifecycleAware) lifecycleAwareAdapter.container)
-            .collect(toList());
+            .collect(Collectors.toList());
 
         store.put(SHARED_LIFECYCLE_AWARE_CONTAINERS, lifecycleAwareContainers);
         signalBeforeTestToContainers(lifecycleAwareContainers, testDescriptionFrom(context));
@@ -70,12 +75,13 @@ public void afterAll(ExtensionContext context) {
     public void beforeEach(final ExtensionContext context) {
         Store store = context.getStore(NAMESPACE);
 
-        List<TestLifecycleAware> lifecycleAwareContainers = collectParentTestInstances(context).parallelStream()
+        List<TestLifecycleAware> lifecycleAwareContainers = collectParentTestInstances(context)
+            .parallelStream()
             .flatMap(this::findRestartContainers)
             .peek(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()))
             .filter(this::isTestLifecycleAware)
             .map(lifecycleAwareAdapter -> (TestLifecycleAware) lifecycleAwareAdapter.container)
-            .collect(toList());
+            .collect(Collectors.toList());
 
         store.put(LOCAL_LIFECYCLE_AWARE_CONTAINERS, lifecycleAwareContainers);
         signalBeforeTestToContainers(lifecycleAwareContainers, testDescriptionFrom(context));
@@ -86,13 +92,17 @@ public void afterEach(ExtensionContext context) {
         signalAfterTestToContainersFor(LOCAL_LIFECYCLE_AWARE_CONTAINERS, context);
     }
 
-    private void signalBeforeTestToContainers(List<TestLifecycleAware> lifecycleAwareContainers, TestDescription testDescription) {
+    private void signalBeforeTestToContainers(
+        List<TestLifecycleAware> lifecycleAwareContainers,
+        TestDescription testDescription
+    ) {
         lifecycleAwareContainers.forEach(container -> container.beforeTest(testDescription));
     }
 
     private void signalAfterTestToContainersFor(String storeKey, ExtensionContext context) {
-        List<TestLifecycleAware> lifecycleAwareContainers =
-            (List<TestLifecycleAware>) context.getStore(NAMESPACE).get(storeKey);
+        List<TestLifecycleAware> lifecycleAwareContainers = (List<TestLifecycleAware>) context
+            .getStore(NAMESPACE)
+            .get(storeKey);
         if (lifecycleAwareContainers != null) {
             TestDescription description = testDescriptionFrom(context);
             Optional<Throwable> throwable = context.getExecutionException();
@@ -103,7 +113,7 @@ private void signalAfterTestToContainersFor(String storeKey, ExtensionContext co
     private TestDescription testDescriptionFrom(ExtensionContext context) {
         return new TestcontainersTestDescription(
             context.getUniqueId(),
-            filesystemFriendlyNameOf(context)
+            FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf(context)
         );
     }
 
@@ -113,14 +123,18 @@ private boolean isTestLifecycleAware(StoreAdapter adapter) {
 
     @Override
     public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-        return findTestcontainers(context).map(this::evaluate)
+        return findTestcontainers(context)
+            .map(this::evaluate)
             .orElseThrow(() -> new ExtensionConfigurationException("@Testcontainers not found"));
     }
 
     private Optional<Testcontainers> findTestcontainers(ExtensionContext context) {
         Optional<ExtensionContext> current = Optional.of(context);
         while (current.isPresent()) {
-            Optional<Testcontainers> testcontainers = AnnotationUtils.findAnnotation(current.get().getRequiredTestClass(), Testcontainers.class);
+            Optional<Testcontainers> testcontainers = AnnotationUtils.findAnnotation(
+                current.get().getRequiredTestClass(),
+                Testcontainers.class
+            );
             if (testcontainers.isPresent()) {
                 return testcontainers;
             }
@@ -155,13 +169,11 @@ private Set<Object> collectParentTestInstances(final ExtensionContext context) {
     }
 
     private List<StoreAdapter> findSharedContainers(Class<?> testClass) {
-        return ReflectionUtils.findFields(
-                testClass,
-                isSharedContainer(),
-                ReflectionUtils.HierarchyTraversalMode.TOP_DOWN)
+        return ReflectionUtils
+            .findFields(testClass, isSharedContainer(), ReflectionUtils.HierarchyTraversalMode.TOP_DOWN)
             .stream()
             .map(f -> getContainerInstance(null, f))
-            .collect(toList());
+            .collect(Collectors.toList());
     }
 
     private Predicate<Field> isSharedContainer() {
@@ -169,10 +181,8 @@ private Predicate<Field> isSharedContainer() {
     }
 
     private Stream<StoreAdapter> findRestartContainers(Object testInstance) {
-        return ReflectionUtils.findFields(
-                testInstance.getClass(),
-                isRestartContainer(),
-                ReflectionUtils.HierarchyTraversalMode.TOP_DOWN)
+        return ReflectionUtils
+            .findFields(testInstance.getClass(), isRestartContainer(), ReflectionUtils.HierarchyTraversalMode.TOP_DOWN)
             .stream()
             .map(f -> getContainerInstance(testInstance, f));
     }
@@ -188,7 +198,9 @@ private static Predicate<Field> isContainer() {
                 boolean isStartable = Startable.class.isAssignableFrom(field.getType());
 
                 if (!isStartable) {
-                    throw new ExtensionConfigurationException(String.format("FieldName: %s does not implement Startable", field.getName()));
+                    throw new ExtensionConfigurationException(
+                        String.format("FieldName: %s does not implement Startable", field.getName())
+                    );
                 }
                 return true;
             }
@@ -199,7 +211,10 @@ private static Predicate<Field> isContainer() {
     private static StoreAdapter getContainerInstance(final Object testInstance, final Field field) {
         try {
             field.setAccessible(true);
-            Startable containerInstance = Preconditions.notNull((Startable) field.get(testInstance), "Container " + field.getName() + " needs to be initialized");
+            Startable containerInstance = Preconditions.notNull(
+                (Startable) field.get(testInstance),
+                "Container " + field.getName() + " needs to be initialized"
+            );
             return new StoreAdapter(field.getDeclaringClass(), field.getName(), containerInstance);
         } catch (IllegalAccessException e) {
             throw new ExtensionConfigurationException("Can not access container defined in field " + field.getName());
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersTestDescription.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersTestDescription.java
index 568d228e08c..3cf466a5708 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersTestDescription.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersTestDescription.java
@@ -5,6 +5,8 @@
 
 @Value
 class TestcontainersTestDescription implements TestDescription {
+
     String testId;
+
     String filesystemFriendlyName;
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
index 11b9027b392..f49aa8732f5 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
@@ -18,7 +18,8 @@ class ComposeContainerTests {
 
     @Container
     private DockerComposeContainer composeContainer = new DockerComposeContainer(
-        new File("src/test/resources/docker-compose.yml"))
+        new File("src/test/resources/docker-compose.yml")
+    )
         .withExposedService("whoami_1", 80, Wait.forHttp("/"));
 
     private String host;
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java
index 96617b0e063..9050df6f257 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGeneratorTest.java
@@ -10,7 +10,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.testcontainers.junit.jupiter.FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf;
 
 class FilesystemFriendlyNameGeneratorTest {
 
@@ -18,10 +17,9 @@ class FilesystemFriendlyNameGeneratorTest {
     @MethodSource("provideDisplayNamesAndFilesystemFriendlyNames")
     void should_generate_filesystem_friendly_name(String displayName, String expectedName) {
         ExtensionContext context = mock(ExtensionContext.class);
-        doReturn(displayName)
-            .when(context).getUniqueId();
+        doReturn(displayName).when(context).getUniqueId();
 
-        String filesystemFriendlyName = filesystemFriendlyNameOf(context);
+        String filesystemFriendlyName = FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf(context);
 
         assertThat(filesystemFriendlyName).isEqualTo(expectedName);
     }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
index 791c887cc19..6c44d978b69 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
@@ -1,19 +1,11 @@
 package org.testcontainers.junit.jupiter;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 // testClass {
 @Testcontainers
 class MixedLifecycleTests {
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
index 4cbc331e64b..186d4095b0d 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
@@ -9,16 +9,17 @@
 import java.sql.Statement;
 
 import static org.junit.Assert.assertEquals;
-import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.POSTGRES_IMAGE;
 
 @Testcontainers
 class PostgresContainerTests {
 
     @Container
-    private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER = new PostgreSQLContainer<>(POSTGRES_IMAGE)
-            .withDatabaseName("foo")
-            .withUsername("foo")
-            .withPassword("secret");
+    private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER = new PostgreSQLContainer<>(
+        JUnitJupiterTestImages.POSTGRES_IMAGE
+    )
+        .withDatabaseName("foo")
+        .withUsername("foo")
+        .withPassword("secret");
 
     @Test
     void waits_until_postgres_accepts_jdbc_connections() throws Exception {
@@ -37,5 +38,4 @@ void waits_until_postgres_accepts_jdbc_connections() throws Exception {
             assertEquals(1, resultSetInt);
         }
     }
-
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java
index 38751c8789a..a8217d60840 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java
@@ -11,9 +11,11 @@
 public class TestLifecycleAwareContainerMock implements Startable, TestLifecycleAware {
 
     static final String BEFORE_TEST = "beforeTest";
+
     static final String AFTER_TEST = "afterTest";
 
     private final List<String> lifecycleMethodCalls = new ArrayList<>();
+
     private final List<String> lifecycleFilesystemFriendlyNames = new ArrayList<>();
 
     private Throwable capturedThrowable;
@@ -43,12 +45,8 @@ public List<String> getLifecycleFilesystemFriendlyNames() {
     }
 
     @Override
-    public void start() {
-
-    }
+    public void start() {}
 
     @Override
-    public void stop() {
-
-    }
+    public void stop() {}
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
index 85d837a7880..09b816be56e 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
@@ -14,6 +14,7 @@
 @Testcontainers
 @TestMethodOrder(OrderAnnotation.class)
 class TestLifecycleAwareExceptionCapturingTest {
+
     @Container
     private final TestLifecycleAwareContainerMock testContainer = new TestLifecycleAwareContainerMock();
 
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java
index cecdff490ef..a77242e1d3a 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java
@@ -10,14 +10,13 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testcontainers.junit.jupiter.TestLifecycleAwareContainerMock.AFTER_TEST;
-import static org.testcontainers.junit.jupiter.TestLifecycleAwareContainerMock.BEFORE_TEST;
 
 // The order of @ExtendsWith and @Testcontainers is crucial for the tests
-@ExtendWith({TestLifecycleAwareMethodTest.SharedContainerAfterAllTestExtension.class})
+@ExtendWith({ TestLifecycleAwareMethodTest.SharedContainerAfterAllTestExtension.class })
 @Testcontainers
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class TestLifecycleAwareMethodTest {
+
     @Container
     private final TestLifecycleAwareContainerMock testContainer = new TestLifecycleAwareContainerMock();
 
@@ -28,8 +27,8 @@ class TestLifecycleAwareMethodTest {
 
     @BeforeAll
     static void beforeAll() {
-        assertThat(SHARED_CONTAINER.getLifecycleMethodCalls()).containsExactly(BEFORE_TEST);
-
+        assertThat(SHARED_CONTAINER.getLifecycleMethodCalls())
+            .containsExactly(TestLifecycleAwareContainerMock.BEFORE_TEST);
     }
 
     @Test
@@ -43,7 +42,7 @@ void should_prepare_before_and_after_test() {
     @Order(2)
     void should_call_beforeTest_first_afterTest_later_with_filesystem_friendly_name() {
         assertThat(startedTestContainer.getLifecycleMethodCalls())
-            .containsExactly(BEFORE_TEST, AFTER_TEST);
+            .containsExactly(TestLifecycleAwareContainerMock.BEFORE_TEST, TestLifecycleAwareContainerMock.AFTER_TEST);
     }
 
     @Test
@@ -63,11 +62,15 @@ void static_container_should_have_a_filesystem_friendly_name_after_container_has
     }
 
     static class SharedContainerAfterAllTestExtension implements AfterAllCallback {
+
         // Unfortunately it's not possible to write a @Test that is run after all tests
         @Override
         public void afterAll(ExtensionContext context) {
             assertThat(SHARED_CONTAINER.getLifecycleMethodCalls())
-                .containsExactly(BEFORE_TEST, AFTER_TEST);
+                .containsExactly(
+                    TestLifecycleAwareContainerMock.BEFORE_TEST,
+                    TestLifecycleAwareContainerMock.AFTER_TEST
+                );
         }
     }
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
index f3aea9bb850..526038853c9 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
@@ -46,14 +46,10 @@ private ExtensionContext extensionContext(Class clazz) {
     }
 
     @Testcontainers(disabledWithoutDocker = true)
-    static final class DisabledWithoutDocker {
-
-    }
+    static final class DisabledWithoutDocker {}
 
     @Testcontainers
-    static final class EnabledWithoutDocker {
-
-    }
+    static final class EnabledWithoutDocker {}
 
     static final class TestTestcontainersExtension extends TestcontainersExtension {
 
@@ -66,7 +62,5 @@ private TestTestcontainersExtension(boolean dockerAvailable) {
         boolean isDockerAvailable() {
             return dockerAvailable;
         }
-
     }
-
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
index 6e02e31b774..c41b184defa 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
@@ -6,15 +6,15 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 // testClass {
 @Testcontainers
 class TestcontainersNestedRestartedContainerTests {
 
     @Container
-    private final GenericContainer<?> topLevelContainer = new GenericContainer<>(HTTPD_IMAGE)
+    private final GenericContainer<?> topLevelContainer = new GenericContainer<>(JUnitJupiterTestImages.HTTPD_IMAGE)
         .withExposedPorts(80);
+
     // }}
 
     private static String topLevelContainerId;
@@ -25,16 +25,16 @@ class TestcontainersNestedRestartedContainerTests {
     @Test
     void top_level_container_should_be_running() {
         assertTrue(topLevelContainer.isRunning());
-// }}
+        // }}
         topLevelContainerId = topLevelContainer.getContainerId();
-// testClass {{
+        // testClass {{
     }
 
     @Nested
     class NestedTestCase {
 
         @Container
-        private final GenericContainer<?> nestedContainer = new GenericContainer<>(HTTPD_IMAGE)
+        private final GenericContainer<?> nestedContainer = new GenericContainer<>(JUnitJupiterTestImages.HTTPD_IMAGE)
             .withExposedPorts(80);
 
         @Test
@@ -43,13 +43,13 @@ void both_containers_should_be_running() {
             assertTrue(topLevelContainer.isRunning());
             // nested containers are only available inside their nested class
             assertTrue(nestedContainer.isRunning());
-// }}}
+            // }}}
             if (nestedContainerId == null) {
                 nestedContainerId = nestedContainer.getContainerId();
             } else {
                 assertNotEquals(nestedContainerId, nestedContainer.getContainerId());
             }
-// testClass {{
+            // testClass {{
         }
 
         // }
@@ -74,7 +74,7 @@ void ids_should_not_change() {
                 assertNotEquals(nestedContainerId, nestedContainer.getContainerId());
             }
         }
-// testClass {{{
+        // testClass {{{
     }
 }
 // }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
index cf59e0338a2..c00e66c2d9d 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
@@ -6,13 +6,14 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 @Testcontainers
 class TestcontainersNestedSharedContainerTests {
 
     @Container
-    private static final GenericContainer<?> TOP_LEVEL_CONTAINER = new GenericContainer<>(HTTPD_IMAGE)
+    private static final GenericContainer<?> TOP_LEVEL_CONTAINER = new GenericContainer<>(
+        JUnitJupiterTestImages.HTTPD_IMAGE
+    )
         .withExposedPorts(80);
 
     private static String topLevelContainerId;
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
index eeb63b72380..46c6045984f 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
@@ -4,14 +4,13 @@
 import org.testcontainers.containers.GenericContainer;
 
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 @Testcontainers
 class TestcontainersRestartBetweenTests {
 
     @Container
-    private GenericContainer<?> genericContainer = new GenericContainer<>(HTTPD_IMAGE)
-            .withExposedPorts(80);
+    private GenericContainer<?> genericContainer = new GenericContainer<>(JUnitJupiterTestImages.HTTPD_IMAGE)
+        .withExposedPorts(80);
 
     private static String lastContainerId;
 
@@ -19,7 +18,7 @@ class TestcontainersRestartBetweenTests {
     void first_test() {
         if (lastContainerId == null) {
             lastContainerId = genericContainer.getContainerId();
-        }  else {
+        } else {
             assertNotEquals(lastContainerId, genericContainer.getContainerId());
         }
     }
@@ -28,9 +27,8 @@ void first_test() {
     void second_test() {
         if (lastContainerId == null) {
             lastContainerId = genericContainer.getContainerId();
-        }  else {
+        } else {
             assertNotEquals(lastContainerId, genericContainer.getContainerId());
         }
     }
-
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
index 60094994f69..b23b2fe0e53 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
@@ -6,13 +6,14 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.testcontainers.junit.jupiter.JUnitJupiterTestImages.HTTPD_IMAGE;
 
 @Testcontainers
 class TestcontainersSharedContainerTests {
 
     @Container
-    private static final GenericContainer<?> GENERIC_CONTAINER = new GenericContainer<>(HTTPD_IMAGE)
+    private static final GenericContainer<?> GENERIC_CONTAINER = new GenericContainer<>(
+        JUnitJupiterTestImages.HTTPD_IMAGE
+    )
         .withExposedPorts(80);
 
     private static String lastContainerId;
@@ -39,5 +40,4 @@ void second_test() {
             assertEquals(lastContainerId, GENERIC_CONTAINER.getContainerId());
         }
     }
-
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/WrongAnnotationUsageTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/WrongAnnotationUsageTests.java
index bec99894307..9fe9893d9ee 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/WrongAnnotationUsageTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/WrongAnnotationUsageTests.java
@@ -1,10 +1,8 @@
 package org.testcontainers.junit.jupiter;
 
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-
 @Disabled
 @Testcontainers
 class WrongAnnotationUsageTests {
@@ -16,5 +14,4 @@ class WrongAnnotationUsageTests {
     void extension_throws_exception() {
         assert true;
     }
-
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java
index 3766c3f7a60..70614d3dbc7 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/AbstractTestBase.java
@@ -11,5 +11,4 @@ abstract class AbstractTestBase {
 
     @Container
     RedisContainer redisPerTest = new RedisContainer();
-
 }
diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index 7f21ca7dbb8..c9dad93a06e 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.DockerObjectAccessor;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
 import org.testcontainers.containers.BindMode;
@@ -42,17 +41,14 @@ public K3sContainer(DockerImageName dockerImageName) {
         tmpFsMapping.put("/var/run", "");
         setTmpFsMapping(tmpFsMapping);
 
-        setCommand(
-            "server",
-            "--no-deploy=traefik",
-            "--tls-san=" + this.getHost()
-        );
+        setCommand("server", "--no-deploy=traefik", "--tls-san=" + this.getHost());
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
     }
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        String rawKubeConfig = copyFileFromContainer("/etc/rancher/k3s/k3s.yaml",
+        String rawKubeConfig = copyFileFromContainer(
+            "/etc/rancher/k3s/k3s.yaml",
             is -> IOUtils.toString(is, StandardCharsets.UTF_8)
         );
         String serverUrl = "https://" + this.getHost() + ":" + this.getMappedPort(KUBE_SECURE_PORT);
@@ -100,7 +96,6 @@ private String kubeConfigWithServerUrl(String kubeConfigYaml, String serverUrl)
 
         kubeConfigObjectNode.set("current-context", new TextNode("default"));
 
-        return objectMapper.writerWithDefaultPrettyPrinter()
-            .writeValueAsString(kubeConfigObjectNode);
+        return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(kubeConfigObjectNode);
     }
 }
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
index 8b31c299634..6f9550eab2a 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
@@ -10,19 +10,17 @@
 import io.fabric8.kubernetes.api.model.ProbeBuilder;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.dsl.PodResource;
 import io.fabric8.kubernetes.client.dsl.Readiable;
 import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.Assertions;
-import org.assertj.core.api.Condition;
 import org.junit.Test;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @Slf4j
 public class Fabric8K3sContainerTest {
 
@@ -49,14 +47,14 @@ public void shouldStartAndHaveListableNode() {
             List<Node> nodes = client.nodes().list().getItems();
             // }
 
-            Assertions.assertThat(nodes).hasSize(1);
+            assertThat(nodes).hasSize(1);
 
             // verify that we can start a pod
             Pod helloworld = dummyStartablePod();
             client.pods().create(helloworld);
             client.pods().inNamespace("default").withName("helloworld").waitUntilReady(30, TimeUnit.SECONDS);
 
-            Assertions.assertThat(client.pods().inNamespace("default").withName("helloworld"))
+            assertThat(client.pods().inNamespace("default").withName("helloworld"))
                 .extracting(Readiable::isReady)
                 .isEqualTo(true);
         }
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 8b1128efef0..02342351b83 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -11,6 +11,7 @@
 public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
+
     private static final String DEFAULT_TAG = "5.4.3";
 
     public static final int KAFKA_PORT = 9093;
@@ -39,7 +40,6 @@ public KafkaContainer(String confluentPlatformVersion) {
 
     public KafkaContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(KAFKA_PORT);
@@ -77,12 +77,7 @@ public String getBootstrapServers() {
     protected void configure() {
         withEnv(
             "KAFKA_ADVERTISED_LISTENERS",
-            String.format(
-                "BROKER://%s:9092",
-                getNetwork() != null
-                    ? getNetworkAliases().get(0)
-                    : "localhost"
-            )
+            String.format("BROKER://%s:9092", getNetwork() != null ? getNetworkAliases().get(0) : "localhost")
         );
 
         String command = "#!/bin/bash\n";
@@ -111,9 +106,12 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
         ExecResult result = execInContainer(
             "kafka-configs",
             "--alter",
-            "--bootstrap-server", brokerAdvertisedListener,
-            "--entity-type", "brokers",
-            "--entity-name", getEnvMap().get("KAFKA_BROKER_ID"),
+            "--bootstrap-server",
+            brokerAdvertisedListener,
+            "--entity-type",
+            "brokers",
+            "--entity-name",
+            getEnvMap().get("KAFKA_BROKER_ID"),
             "--add-config",
             "advertised.listeners=[" + String.join(",", getBootstrapServers(), brokerAdvertisedListener) + "]"
         );
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index f0ef0db2067..380df00e9e9 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -20,17 +20,20 @@
 
 import java.time.Duration;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 
 public class KafkaContainerTest {
 
     private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:6.2.1");
-    private static final DockerImageName ZOOKEEPER_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-zookeeper:4.0.0");
+
+    private static final DockerImageName ZOOKEEPER_TEST_IMAGE = DockerImageName.parse(
+        "confluentinc/cp-zookeeper:4.0.0"
+    );
 
     @Test
     public void testUsage() throws Exception {
@@ -40,7 +43,6 @@ public void testUsage() throws Exception {
         }
     }
 
-
     @Test
     public void testUsageWithSpecificImage() throws Exception {
         try (
@@ -50,18 +52,16 @@ public void testUsageWithSpecificImage() throws Exception {
         ) {
             kafka.start();
             testKafkaFunctionality(
-              // getBootstrapServers {
-              kafka.getBootstrapServers()
-              // }
+                // getBootstrapServers {
+                kafka.getBootstrapServers()
+                // }
             );
         }
     }
 
     @Test
     public void testUsageWithVersion() throws Exception {
-        try (
-            KafkaContainer kafka = new KafkaContainer("6.2.1")
-        ) {
+        try (KafkaContainer kafka = new KafkaContainer("6.2.1")) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
         }
@@ -71,7 +71,6 @@ public void testUsageWithVersion() throws Exception {
     public void testExternalZookeeperWithExternalNetwork() throws Exception {
         try (
             Network network = Network.newNetwork();
-
             // withExternalZookeeper {
             KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)
                 .withNetwork(network)
@@ -82,11 +81,10 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
                 .withNetwork(network)
                 .withNetworkAliases("zookeeper")
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
-
             // withKafkaNetwork {
             GenericContainer<?> application = new GenericContainer<>(DockerImageName.parse("alpine"))
                 .withNetwork(network)
-            // }
+                // }
                 .withNetworkAliases("dummy")
                 .withCommand("sleep 10000")
         ) {
@@ -100,9 +98,7 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
 
     @Test
     public void testConfluentPlatformVersion5() throws Exception {
-        try (
-            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
-        ) {
+        try (KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
         }
@@ -132,24 +128,27 @@ protected void testKafkaFunctionality(String bootstrapServers) throws Exception
 
     protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
         try (
-            AdminClient adminClient = AdminClient.create(ImmutableMap.of(
-                AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers
-            ));
-
+            AdminClient adminClient = AdminClient.create(
+                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
+            );
             KafkaProducer<String, String> producer = new KafkaProducer<>(
                 ImmutableMap.of(
-                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
-                    ProducerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG,
+                    UUID.randomUUID().toString()
                 ),
                 new StringSerializer(),
                 new StringSerializer()
             );
-
             KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
                 ImmutableMap.of(
-                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
-                    ConsumerConfig.GROUP_ID_CONFIG, "tc-" + UUID.randomUUID(),
-                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG,
+                    "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+                    "earliest"
                 ),
                 new StringDeserializer(),
                 new StringDeserializer()
@@ -157,30 +156,33 @@ protected void testKafkaFunctionality(String bootstrapServers, int partitions, i
         ) {
             String topicName = "messages-" + UUID.randomUUID();
 
-            Collection<NewTopic> topics = singletonList(new NewTopic(topicName, partitions, (short) rf));
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
             adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
 
-            consumer.subscribe(singletonList(topicName));
+            consumer.subscribe(Collections.singletonList(topicName));
 
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
 
-            Unreliables.retryUntilTrue(10, TimeUnit.SECONDS, () -> {
-                ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+            Unreliables.retryUntilTrue(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
 
-                if (records.isEmpty()) {
-                    return false;
-                }
+                    if (records.isEmpty()) {
+                        return false;
+                    }
 
-                assertThat(records)
-                    .hasSize(1)
-                    .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
-                    .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+                    assertThat(records)
+                        .hasSize(1)
+                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
 
-                return true;
-            });
+                    return true;
+                }
+            );
 
             consumer.unsubscribe();
         }
     }
-
 }
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index dd03a4206e0..8bd6f14d3fd 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -36,10 +36,13 @@
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     static final int PORT = 4566;
+
     private static final String HOSTNAME_EXTERNAL_ENV_VAR = "HOSTNAME_EXTERNAL";
+
     private final List<EnabledService> services = new ArrayList<>();
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("localstack/localstack");
+
     private static final String DEFAULT_TAG = "0.11.2";
 
     @Deprecated
@@ -88,7 +91,6 @@ public LocalStackContainer(final DockerImageName dockerImageName) {
      */
     public LocalStackContainer(final DockerImageName dockerImageName, boolean useLegacyMode) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         this.legacyMode = useLegacyMode;
@@ -109,7 +111,9 @@ private static boolean shouldRunInLegacyMode(String version) {
         }
 
         log.warn("Version {} is not a semantic version, LocalStack will run in legacy mode.", version);
-        log.warn("Consider using \"LocalStackContainer(DockerImageName dockerImageName, boolean legacyMode)\" constructor if you want to disable legacy mode.");
+        log.warn(
+            "Consider using \"LocalStackContainer(DockerImageName dockerImageName, boolean legacyMode)\" constructor if you want to disable legacy mode."
+        );
         return true;
     }
 
@@ -126,22 +130,25 @@ protected void configure() {
             // do nothing
             hostnameExternalReason = "explicitly as environment variable";
         } else if (getNetwork() != null && getNetworkAliases() != null && getNetworkAliases().size() >= 1) {
-            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getNetworkAliases().get(getNetworkAliases().size() - 1));  // use the last network alias set
+            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getNetworkAliases().get(getNetworkAliases().size() - 1)); // use the last network alias set
             hostnameExternalReason = "to match last network alias on container with non-default network";
         } else {
             withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getHost());
             hostnameExternalReason = "to match host-routable address for container";
         }
-        logger().info("{} environment variable set to {} ({})", HOSTNAME_EXTERNAL_ENV_VAR, getEnvMap().get(HOSTNAME_EXTERNAL_ENV_VAR), hostnameExternalReason);
+        logger()
+            .info(
+                "{} environment variable set to {} ({})",
+                HOSTNAME_EXTERNAL_ENV_VAR,
+                getEnvMap().get(HOSTNAME_EXTERNAL_ENV_VAR),
+                hostnameExternalReason
+            );
 
         exposePorts();
     }
 
     private void exposePorts() {
-        services.stream()
-            .map(this::getServicePort)
-            .distinct()
-            .forEach(this::addExposedPort);
+        services.stream().map(this::getServicePort).distinct().forEach(this::addExposedPort);
     }
 
     public LocalStackContainer withServices(Service... services) {
@@ -218,10 +225,7 @@ public URI getEndpointOverride(EnabledService service) {
             String ipAddress = address;
             // resolve IP address and use that as the endpoint so that path-style access is automatically used for S3
             ipAddress = InetAddress.getByName(address).getHostAddress();
-            return new URI("http://" +
-                ipAddress +
-                ":" +
-                getMappedPort(getServicePort(service)));
+            return new URI("http://" + ipAddress + ":" + getMappedPort(getServicePort(service)));
         } catch (UnknownHostException | URISyntaxException e) {
             throw new IllegalStateException("Cannot obtain endpoint URL", e);
         }
@@ -332,7 +336,7 @@ public enum Service implements EnabledService {
         DYNAMODB("dynamodb", 4569),
         DYNAMODB_STREAMS("dynamodbstreams", 4570),
         // TODO: Clarify usage for ELASTICSEARCH and ELASTICSEARCH_SERVICE
-//        ELASTICSEARCH("es",           4571),
+        //        ELASTICSEARCH("es",           4571),
         S3("s3", 4572),
         FIREHOSE("firehose", 4573),
         LAMBDA("lambda", 4574),
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index b34f43f79ed..a757c11e928 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -16,48 +16,51 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
-import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_10_IMAGE;
-import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_11_IMAGE;
-import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_12_IMAGE;
-import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_0_7_IMAGE;
-import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_IMAGE;
 
 @RunWith(Enclosed.class)
 public class LegacyModeTest {
-    private static DockerImageName LOCALSTACK_CUSTOM_TAG = LOCALSTACK_IMAGE.withTag("custom");
+
+    private static DockerImageName LOCALSTACK_CUSTOM_TAG = LocalstackTestImages.LOCALSTACK_IMAGE.withTag("custom");
 
     @RunWith(Parameterized.class)
     @AllArgsConstructor
     public static class Off {
+
         private final String description;
+
         private final LocalStackContainer localstack;
 
         @Parameterized.Parameters(name = "{0}")
         public static Iterable<Object[]> constructors() {
-            return Arrays.asList(new Object[][]{
-                {"0.12", new LocalStackContainer(LOCALSTACK_0_12_IMAGE)},
-                {"0.11", new LocalStackContainer(LOCALSTACK_0_11_IMAGE)},
-                {"0.7 with legacy = off", new LocalStackContainer(LOCALSTACK_0_7_IMAGE, false)}
-            });
+            return Arrays.asList(
+                new Object[][] {
+                    { "0.12", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_12_IMAGE) },
+                    { "0.11", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE) },
+                    {
+                        "0.7 with legacy = off",
+                        new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_7_IMAGE, false),
+                    },
+                }
+            );
         }
 
         @Test
         public void samePortIsExposedForAllServices() {
-            localstack.withServices(S3, SQS);
+            localstack.withServices(LocalStackContainer.Service.S3, LocalStackContainer.Service.SQS);
             localstack.start();
 
             try {
                 assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
                 assertEquals(
                     "Endpoint overrides are different",
-                    localstack.getEndpointOverride(S3).toString(),
-                    localstack.getEndpointOverride(SQS).toString());
+                    localstack.getEndpointOverride(LocalStackContainer.Service.S3).toString(),
+                    localstack.getEndpointOverride(LocalStackContainer.Service.SQS).toString()
+                );
                 assertEquals(
                     "Endpoint configuration have different endpoints",
-                    localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
-                    localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+                    localstack.getEndpointConfiguration(LocalStackContainer.Service.S3).getServiceEndpoint(),
+                    localstack.getEndpointConfiguration(LocalStackContainer.Service.SQS).getServiceEndpoint()
+                );
             } finally {
                 localstack.stop();
             }
@@ -67,7 +70,9 @@ public void samePortIsExposedForAllServices() {
     @RunWith(Parameterized.class)
     @AllArgsConstructor
     public static class On {
+
         private final String description;
+
         private final LocalStackContainer localstack;
 
         @BeforeClass
@@ -75,7 +80,7 @@ public static void createCustomTag() {
             DockerClient dockerClient = DockerClientFactory.instance().client();
             dockerClient
                 .tagImageCmd(
-                    new RemoteDockerImage(LOCALSTACK_0_12_IMAGE).get(),
+                    new RemoteDockerImage(LocalstackTestImages.LOCALSTACK_0_12_IMAGE).get(),
                     LOCALSTACK_CUSTOM_TAG.getRepository(),
                     LOCALSTACK_CUSTOM_TAG.getVersionPart()
                 )
@@ -84,28 +89,35 @@ public static void createCustomTag() {
 
         @Parameterized.Parameters(name = "{0}")
         public static Iterable<Object[]> constructors() {
-            return Arrays.asList(new Object[][]{
-                {"0.10", new LocalStackContainer(LOCALSTACK_0_10_IMAGE)},
-                {"custom", new LocalStackContainer(LOCALSTACK_CUSTOM_TAG)},
-                {"0.11 with legacy = on", new LocalStackContainer(LOCALSTACK_0_11_IMAGE, true)}
-            });
+            return Arrays.asList(
+                new Object[][] {
+                    { "0.10", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_10_IMAGE) },
+                    { "custom", new LocalStackContainer(LOCALSTACK_CUSTOM_TAG) },
+                    {
+                        "0.11 with legacy = on",
+                        new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE, true),
+                    },
+                }
+            );
         }
 
         @Test
         public void differentPortsAreExposed() {
-            localstack.withServices(S3, SQS);
+            localstack.withServices(LocalStackContainer.Service.S3, LocalStackContainer.Service.SQS);
             localstack.start();
 
             try {
                 assertTrue("Multiple ports are exposed", localstack.getExposedPorts().size() > 1);
                 assertNotEquals(
                     "Endpoint overrides are different",
-                    localstack.getEndpointOverride(S3).toString(),
-                    localstack.getEndpointOverride(SQS).toString());
+                    localstack.getEndpointOverride(LocalStackContainer.Service.S3).toString(),
+                    localstack.getEndpointOverride(LocalStackContainer.Service.SQS).toString()
+                );
                 assertNotEquals(
                     "Endpoint configuration have different endpoints",
-                    localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
-                    localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+                    localstack.getEndpointConfiguration(LocalStackContainer.Service.S3).getServiceEndpoint(),
+                    localstack.getEndpointConfiguration(LocalStackContainer.Service.SQS).getServiceEndpoint()
+                );
             } finally {
                 localstack.stop();
             }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 6b32ba2c102..cf4e1a813a4 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,17 +1,5 @@
 package org.testcontainers.containers.localstack;
 
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.containers.localstack.LocalStackContainer.PORT;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCHLOGS;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.KMS;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
-import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
-import static org.testcontainers.containers.localstack.LocalstackTestImages.LOCALSTACK_IMAGE;
-
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
 import com.amazonaws.services.kms.model.CreateKeyRequest;
@@ -29,10 +17,6 @@
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
 import com.amazonaws.services.sqs.model.CreateQueueResult;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
@@ -44,12 +28,22 @@
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.containers.localstack.LocalStackContainer.Service;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Optional;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+
 /**
  * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
  * <p>
@@ -65,15 +59,22 @@ public static class WithoutNetwork {
 
         // without_network {
         @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(LOCALSTACK_IMAGE)
-            .withServices(S3, SQS, CLOUDWATCHLOGS, KMS, LocalStackContainer.EnabledService.named("events"));
+        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+            .withServices(
+                Service.S3,
+                Service.SQS,
+                Service.CLOUDWATCHLOGS,
+                Service.KMS,
+                LocalStackContainer.EnabledService.named("events")
+            );
+
         // }
 
         @Test
         public void s3TestOverBridgeNetwork() throws IOException {
             AmazonS3 s3 = AmazonS3ClientBuilder
                 .standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.S3))
                 .withCredentials(localstack.getDefaultCredentialsProvider())
                 .build();
 
@@ -82,7 +83,10 @@ public void s3TestOverBridgeNetwork() throws IOException {
             s3.putObject(bucketName, "bar", "baz");
 
             final List<Bucket> buckets = s3.listBuckets();
-            final Optional<Bucket> maybeBucket = buckets.stream().filter(b -> b.getName().equals(bucketName)).findFirst();
+            final Optional<Bucket> maybeBucket = buckets
+                .stream()
+                .filter(b -> b.getName().equals(bucketName))
+                .findFirst();
             assertTrue("The created bucket is present", maybeBucket.isPresent());
             final Bucket bucket = maybeBucket.get();
 
@@ -100,32 +104,49 @@ public void s3TestOverBridgeNetwork() throws IOException {
         public void s3TestUsingAwsSdkV2() {
             S3Client s3 = S3Client
                 .builder()
-                .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
-                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
-                    localstack.getAccessKey(), localstack.getSecretKey()
-                )))
+                .endpointOverride(localstack.getEndpointOverride(Service.S3))
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
                 .region(Region.of(localstack.getRegion()))
                 .build();
 
             final String bucketName = "foov2";
             s3.createBucket(b -> b.bucket(bucketName));
-            assertTrue("New bucket was created", s3.listBuckets().buckets().stream().anyMatch(b -> b.name().equals(bucketName)));
+            assertTrue(
+                "New bucket was created",
+                s3.listBuckets().buckets().stream().anyMatch(b -> b.name().equals(bucketName))
+            );
         }
 
         @Test
         public void sqsTestOverBridgeNetwork() {
-            AmazonSQS sqs = AmazonSQSClientBuilder.standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(SQS))
+            AmazonSQS sqs = AmazonSQSClientBuilder
+                .standard()
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.SQS))
                 .withCredentials(localstack.getDefaultCredentialsProvider())
                 .build();
 
             CreateQueueResult queueResult = sqs.createQueue("baz");
             String fooQueueUrl = queueResult.getQueueUrl();
-            assertThat("Created queue has external hostname URL", fooQueueUrl,
-                containsString("http://" + DockerClientFactory.instance().dockerHostIpAddress() + ":" + localstack.getMappedPort(PORT)));
+            assertThat(
+                "Created queue has external hostname URL",
+                fooQueueUrl,
+                containsString(
+                    "http://" +
+                    DockerClientFactory.instance().dockerHostIpAddress() +
+                    ":" +
+                    localstack.getMappedPort(LocalStackContainer.PORT)
+                )
+            );
 
             sqs.sendMessage(fooQueueUrl, "test");
-            final long messageCount = sqs.receiveMessage(fooQueueUrl).getMessages().stream()
+            final long messageCount = sqs
+                .receiveMessage(fooQueueUrl)
+                .getMessages()
+                .stream()
                 .filter(message -> message.getBody().equals("test"))
                 .count();
             assertEquals("the sent message can be received", 1L, messageCount);
@@ -133,9 +154,11 @@ public void sqsTestOverBridgeNetwork() {
 
         @Test
         public void cloudWatchLogsTestOverBridgeNetwork() {
-            AWSLogs logs = AWSLogsClientBuilder.standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(CLOUDWATCHLOGS))
-                .withCredentials(localstack.getDefaultCredentialsProvider()).build();
+            AWSLogs logs = AWSLogsClientBuilder
+                .standard()
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.CLOUDWATCHLOGS))
+                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .build();
 
             logs.createLogGroup(new CreateLogGroupRequest("foo"));
 
@@ -146,8 +169,9 @@ public void cloudWatchLogsTestOverBridgeNetwork() {
 
         @Test
         public void kmsKeyCreationTest() {
-            AWSKMS awskms = AWSKMSClientBuilder.standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(KMS))
+            AWSKMS awskms = AWSKMSClientBuilder
+                .standard()
+                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.KMS))
                 .withCredentials(localstack.getDefaultCredentialsProvider())
                 .build();
 
@@ -156,7 +180,11 @@ public void kmsKeyCreationTest() {
             CreateKeyRequest req = new CreateKeyRequest().withDescription(desc).withTags(createdByTag);
             CreateKeyResult key = awskms.createKey(req);
 
-            assertEquals("AWS KMS Customer Managed Key should be created ", key.getKeyMetadata().getDescription(), desc);
+            assertEquals(
+                "AWS KMS Customer Managed Key should be created ",
+                key.getKeyMetadata().getDescription(),
+                desc
+            );
         }
 
         @Test
@@ -164,35 +192,42 @@ public void samePortIsExposedForAllServices() {
             assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
             assertEquals(
                 "Endpoint overrides are different",
-                localstack.getEndpointOverride(S3).toString(),
-                localstack.getEndpointOverride(SQS).toString());
+                localstack.getEndpointOverride(Service.S3).toString(),
+                localstack.getEndpointOverride(Service.SQS).toString()
+            );
             assertEquals(
                 "Endpoint configuration have different endpoints",
-                localstack.getEndpointConfiguration(S3).getServiceEndpoint(),
-                localstack.getEndpointConfiguration(SQS).getServiceEndpoint());
+                localstack.getEndpointConfiguration(Service.S3).getServiceEndpoint(),
+                localstack.getEndpointConfiguration(Service.SQS).getServiceEndpoint()
+            );
         }
     }
 
     public static class WithNetwork {
+
         // with_network {
         private static Network network = Network.newNetwork();
 
         @ClassRule
-        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(LOCALSTACK_IMAGE)
+        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(
+            LocalstackTestImages.LOCALSTACK_IMAGE
+        )
             .withNetwork(network)
-            .withNetworkAliases("notthis", "localstack")    // the last alias is used for HOSTNAME_EXTERNAL
-            .withServices(S3, SQS, CLOUDWATCHLOGS);
+            .withNetworkAliases("notthis", "localstack") // the last alias is used for HOSTNAME_EXTERNAL
+            .withServices(Service.S3, Service.SQS, Service.CLOUDWATCHLOGS);
+
         // }
 
         @ClassRule
-        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(LocalstackTestImages.AWS_CLI_IMAGE)
+        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(
+            LocalstackTestImages.AWS_CLI_IMAGE
+        )
             .withNetwork(network)
             .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("top"))
             .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
             .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
             .withEnv("AWS_REGION", "eu-west-1");
 
-
         @Test
         public void s3TestOverDockerNetwork() throws Exception {
             runAwsCliAgainstDockerNetworkContainer("s3api create-bucket --bucket foo");
@@ -202,15 +237,30 @@ public void s3TestOverDockerNetwork() throws Exception {
 
         @Test
         public void sqsTestOverDockerNetwork() throws Exception {
-            final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer("sqs create-queue --queue-name baz");
+            final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer(
+                "sqs create-queue --queue-name baz"
+            );
 
-            assertThat("Created queue has external hostname URL", queueCreationResponse,
-                containsString("http://localstack:" + PORT));
+            assertThat(
+                "Created queue has external hostname URL",
+                queueCreationResponse,
+                containsString("http://localstack:" + LocalStackContainer.PORT)
+            );
 
             runAwsCliAgainstDockerNetworkContainer(
-                String.format("sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test", PORT, PORT));
+                String.format(
+                    "sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test",
+                    LocalStackContainer.PORT,
+                    LocalStackContainer.PORT
+                )
+            );
             final String message = runAwsCliAgainstDockerNetworkContainer(
-                String.format("sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz", PORT, PORT));
+                String.format(
+                    "sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz",
+                    LocalStackContainer.PORT,
+                    LocalStackContainer.PORT
+                )
+            );
 
             assertTrue("the sent message can be received", message.contains("\"Body\": \"test\""));
         }
@@ -221,7 +271,13 @@ public void cloudWatchLogsTestOverDockerNetwork() throws Exception {
         }
 
         private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exception {
-            final String[] commandParts = String.format("/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl", command, PORT).split(" ");
+            final String[] commandParts = String
+                .format(
+                    "/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl",
+                    command,
+                    LocalStackContainer.PORT
+                )
+                .split(" ");
             final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);
             Assert.assertEquals(0, execResult.getExitCode());
 
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 2e28e5d0480..b0944a6d3c0 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -27,10 +27,15 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
     static final String DEFAULT_PASSWORD = "test";
 
     static final Integer MARIADB_PORT = 3306;
+
     private String databaseName = "test";
+
     private String username = DEFAULT_USER;
+
     private String password = DEFAULT_PASSWORD;
+
     private static final String MARIADB_ROOT_USER = "root";
+
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
 
     /**
@@ -47,7 +52,6 @@ public MariaDBContainer(String dockerImageName) {
 
     public MariaDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPort(MARIADB_PORT);
@@ -60,7 +64,11 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     @Override
     protected void configure() {
-        optionallyMapResourceParameterAsVolume(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, "/etc/mysql/conf.d", "mariadb-default-conf");
+        optionallyMapResourceParameterAsVolume(
+            MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
+            "/etc/mysql/conf.d",
+            "mariadb-default-conf"
+        );
 
         addEnv("MYSQL_DATABASE", databaseName);
         addEnv("MYSQL_USER", username);
@@ -83,13 +91,14 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         String additionalUrlParams = constructUrlParameters("?", "&");
-        return "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return (
+            "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName + additionalUrlParams
+        );
     }
 
     @Override
     public String getDatabaseName() {
-    	return databaseName;
+        return databaseName;
     }
 
     @Override
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
index 4330465a9c3..6697255ca79 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainerProvider.java
@@ -29,7 +29,6 @@ public JdbcDatabaseContainer newInstance(String tag) {
 
     @Override
     public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
-       return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
     }
-
 }
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
index e37e9b0b6bf..99041e83e28 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainer.java
@@ -13,7 +13,8 @@ public class MariaDBR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
     private final MariaDBContainer<?> container;
 
     public static ConnectionFactoryOptions getOptions(MariaDBContainer<?> container) {
-        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
             .option(ConnectionFactoryOptions.DRIVER, MariaDBR2DBCDatabaseContainerProvider.DRIVER)
             .build();
 
@@ -22,7 +23,8 @@ public static ConnectionFactoryOptions getOptions(MariaDBContainer<?> container)
 
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
-        return options.mutate()
+        return options
+            .mutate()
             .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MariaDBContainer.MARIADB_PORT))
             .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
diff --git a/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
index b6fb4dd659e..f2339b0e5f9 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
@@ -20,5 +20,4 @@ protected String createR2DBCUrl() {
     protected MariaDBContainer<?> createContainer() {
         return new MariaDBContainer<>(DockerImageName.parse("mariadb:10.3.6"));
     }
-
 }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
index ef1dfef2703..ffb26f19734 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
@@ -4,26 +4,47 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class MariaDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:mariadb://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mariadb://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mariadb.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mariadb.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override", EnumSet.of(Options.CustomIniFile)},
-            });
+        return Arrays.asList(
+            new Object[][] {
+                { "jdbc:tc:mariadb://hostname/databasename", EnumSet.noneOf(Options.class) },
+                {
+                    "jdbc:tc:mariadb://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                { "jdbc:tc:mariadb:10.2.14://hostname/databasename", EnumSet.noneOf(Options.class) },
+                {
+                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mariadb.sql&useUnicode=yes&characterEncoding=utf8",
+                    EnumSet.of(Options.CharacterSet),
+                },
+                {
+                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mariadb.sql",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override",
+                    EnumSet.of(Options.CustomIniFile),
+                },
+            }
+        );
     }
 }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 2dcdbafd9e3..21a48b6e73c 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -2,26 +2,24 @@
 
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
+import org.testcontainers.MariaDBTestImages;
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.testcontainers.MariaDBTestImages.MARIADB_IMAGE;
-
 
 public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (MariaDBContainer<?> mariadb = new MariaDBContainer<>(MARIADB_IMAGE)) {
-
+        try (MariaDBContainer<?> mariadb = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)) {
             mariadb.start();
 
             ResultSet resultSet = performQuery(mariadb, "SELECT 1");
@@ -33,14 +31,20 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testSpecificVersion() throws SQLException {
-        try (MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>(MARIADB_IMAGE.withTag("5.5.51"))) {
-
+        try (
+            MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>(
+                MariaDBTestImages.MARIADB_IMAGE.withTag("5.5.51")
+            )
+        ) {
             mariadbOldVersion.start();
 
             ResultSet resultSet = performQuery(mariadbOldVersion, "SELECT VERSION()");
             String resultSetString = resultSet.getString(1);
 
-            assertTrue("The database version can be set using a container rule parameter", resultSetString.startsWith("5.5.51"));
+            assertTrue(
+                "The database version can be set using a container rule parameter",
+                resultSetString.startsWith("5.5.51")
+            );
         }
     }
 
@@ -48,8 +52,12 @@ public void testSpecificVersion() throws SQLException {
     public void testMariaDBWithCustomIniFile() throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
 
-        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(MARIADB_IMAGE.withTag("10.1.16"))
-            .withConfigurationOverride("somepath/mariadb_conf_override")) {
+        try (
+            MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(
+                MariaDBTestImages.MARIADB_IMAGE.withTag("10.1.16")
+            )
+                .withConfigurationOverride("somepath/mariadb_conf_override")
+        ) {
             mariadbCustomConfig.start();
 
             ResultSet resultSet = performQuery(mariadbCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
@@ -61,9 +69,10 @@ public void testMariaDBWithCustomIniFile() throws SQLException {
 
     @Test
     public void testMariaDBWithCommandOverride() throws SQLException {
-
-        try (MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(MARIADB_IMAGE)
-            .withCommand("mysqld --auto_increment_increment=10")) {
+        try (
+            MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)
+                .withCommand("mysqld --auto_increment_increment=10")
+        ) {
             mariadbCustomConfig.start();
             ResultSet resultSet = performQuery(mariadbCustomConfig, "show variables like 'auto_increment_increment'");
             String result = resultSet.getString("Value");
@@ -74,7 +83,7 @@ public void testMariaDBWithCommandOverride() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MARIADB_IMAGE)
+        MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)
             .withUrlParam("connectTimeout", "40000")
             .withUrlParam("rewriteBatchedStatements", "true");
 
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 6ab1c541325..8b39d5d3763 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -8,6 +8,7 @@
 public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver");
+
     private static final String DEFAULT_TAG = "mockserver-5.5.4";
 
     @Deprecated
@@ -33,7 +34,6 @@ public MockServerContainer(String version) {
 
     public MockServerContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DockerImageName.parse("mockserver/mockserver"));
 
         waitingFor(Wait.forHttp("/mockserver/status").withMethod("PUT").forStatusCode(200));
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index d0c290ad46a..3f34d000603 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -5,22 +5,26 @@
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 
 public class MockServerContainerRuleTest {
 
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("jamesdbloom/mockserver:mockserver-5.5.4");
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
+        "jamesdbloom/mockserver:mockserver-5.5.4"
+    );
 
     // creatingProxy {
     @Rule
     public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
+
     // }
 
     @Test
     public void shouldReturnExpectation() throws Exception {
+        // spotless:off
         // testSimpleExpectation {
         new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
             .when(request()
@@ -31,8 +35,10 @@ public void shouldReturnExpectation() throws Exception {
 
         // ...a GET request to '/person?name=peter' returns "Peter the person!"
         // }
+        // spotless:on
 
-        assertThat("Expectation returns expected response body",
+        assertThat(
+            "Expectation returns expected response body",
             SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"),
             containsString("Peter the person")
         );
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index 61a5c33c630..d038b111824 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -4,7 +4,7 @@
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.Matchers.equalTo;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
@@ -12,12 +12,18 @@
 
 public class MockServerContainerTest {
 
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("jamesdbloom/mockserver:mockserver-5.5.4");
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
+        "jamesdbloom/mockserver:mockserver-5.5.4"
+    );
 
     @Test
     public void shouldCallActualMockserverVersion() throws Exception {
         String actualVersion = MockServerClient.class.getPackage().getImplementationVersion();
-        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE.withTag("mockserver-" + actualVersion))) {
+        try (
+            MockServerContainer mockServer = new MockServerContainer(
+                MOCKSERVER_IMAGE.withTag("mockserver-" + actualVersion)
+            )
+        ) {
             mockServer.start();
 
             String expectedBody = "Hello World!";
@@ -26,11 +32,10 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
             assertTrue("Mockserver running", client.isRunning());
 
-            client
-                .when(request().withPath("/hello"))
-                .respond(response().withBody(expectedBody));
+            client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-            assertThat("MockServer returns correct result",
+            assertThat(
+                "MockServer returns correct result",
                 SimpleHttpClient.responseFromMockserver(mockServer, "/hello"),
                 equalTo(expectedBody)
             );
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
index cd5cb25cabb..da60ca9396a 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
@@ -9,9 +9,11 @@
 import java.net.URLConnection;
 
 public class SimpleHttpClient {
+
     public static String responseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
         URLConnection urlConnection = new URL(mockServer.getEndpoint() + path).openConnection();
-        @Cleanup BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+        @Cleanup
+        BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
         return reader.readLine();
     }
 }
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 87db80846a8..81bb59fd69d 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -18,10 +18,15 @@
 public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mongo");
+
     private static final String DEFAULT_TAG = "4.0.10";
+
     private static final int CONTAINER_EXIT_CODE_OK = 0;
+
     private static final int MONGODB_INTERNAL_PORT = 27017;
+
     private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
+
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
 
     /**
@@ -38,14 +43,11 @@ public MongoDBContainer(@NonNull final String dockerImageName) {
 
     public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(MONGODB_INTERNAL_PORT);
         withCommand("--replSet", "docker-rs");
-        waitingFor(
-            Wait.forLogMessage("(?i).*waiting for connections.*", 1)
-        );
+        waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
     }
 
     /**
@@ -54,11 +56,7 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
      * @return a connection url pointing to a mongodb instance
      */
     public String getConnectionString() {
-        return String.format(
-            "mongodb://%s:%d",
-            getHost(),
-            getMappedPort(MONGODB_INTERNAL_PORT)
-        );
+        return String.format("mongodb://%s:%d", getHost(), getMappedPort(MONGODB_INTERNAL_PORT));
     }
 
     /**
@@ -89,7 +87,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
     }
 
     private String[] buildMongoEvalCommand(final String command) {
-        return new String[]{"mongo", "--eval", command};
+        return new String[] { "mongo", "--eval", command };
     }
 
     private void checkMongoNodeExitCode(final Container.ExecResult execResult) {
@@ -103,21 +101,19 @@ private void checkMongoNodeExitCode(final Container.ExecResult execResult) {
     private String buildMongoWaitCommand() {
         return String.format(
             "var attempt = 0; " +
-                "while" +
-                "(%s) " +
-                "{ " +
-                "if (attempt > %d) {quit(1);} " +
-                "print('%s ' + attempt); sleep(100);  attempt++; " +
-                " }",
+            "while" +
+            "(%s) " +
+            "{ " +
+            "if (attempt > %d) {quit(1);} " +
+            "print('%s ' + attempt); sleep(100);  attempt++; " +
+            " }",
             "db.runCommand( { isMaster: 1 } ).ismaster==false",
             AWAIT_INIT_REPLICA_SET_ATTEMPTS,
             "An attempt to await for a single node replica set initialization:"
         );
     }
 
-    private void checkMongoNodeExitCodeAfterWaiting(
-        final Container.ExecResult execResultWaitForMaster
-    ) {
+    private void checkMongoNodeExitCodeAfterWaiting(final Container.ExecResult execResultWaitForMaster) {
         if (execResultWaitForMaster.getExitCode() != CONTAINER_EXIT_CODE_OK) {
             final String errorMessage = String.format(
                 "A single node replica set was not initialized in a set timeout: %d attempts",
@@ -128,12 +124,10 @@ private void checkMongoNodeExitCodeAfterWaiting(
         }
     }
 
-    @SneakyThrows(value = {IOException.class, InterruptedException.class})
+    @SneakyThrows(value = { IOException.class, InterruptedException.class })
     private void initReplicaSet() {
         log.debug("Initializing a single node node replica set...");
-        final ExecResult execResultInitRs = execInContainer(
-            buildMongoEvalCommand("rs.initiate();")
-        );
+        final ExecResult execResultInitRs = execInContainer(buildMongoEvalCommand("rs.initiate();"));
         log.debug(execResultInitRs.getStdout());
         checkMongoNodeExitCode(execResultInitRs);
 
@@ -141,15 +135,14 @@ private void initReplicaSet() {
             "Awaiting for a single node replica set initialization up to {} attempts",
             AWAIT_INIT_REPLICA_SET_ATTEMPTS
         );
-        final ExecResult execResultWaitForMaster = execInContainer(
-            buildMongoEvalCommand(buildMongoWaitCommand())
-        );
+        final ExecResult execResultWaitForMaster = execInContainer(buildMongoEvalCommand(buildMongoWaitCommand()));
         log.debug(execResultWaitForMaster.getStdout());
 
         checkMongoNodeExitCodeAfterWaiting(execResultWaitForMaster);
     }
 
     public static class ReplicaSetInitializationException extends RuntimeException {
+
         ReplicaSetInitializationException(final String errorMessage) {
             super(errorMessage);
         }
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index 532a86208c1..6c98978f20a 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -13,12 +13,11 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.hamcrest.CoreMatchers.endsWith;
+import static org.hamcrest.Matchers.endsWith;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
-
 public class MongoDBContainerTest {
 
     /**
@@ -31,7 +30,6 @@ public void shouldExecuteTransactions() {
             final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))
             // }
         ) {
-
             // startingMongoDBContainer {
             mongoDBContainer.start();
             // }
@@ -41,15 +39,25 @@ public void shouldExecuteTransactions() {
             final String connectionString = mongoDBContainer.getConnectionString();
             final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
             final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
-            mongoSyncClient.getDatabase("mydb1").getCollection("foo")
-                .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("abc", 0));
-            mongoSyncClient.getDatabase("mydb2").getCollection("bar")
-                .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("xyz", 0));
-            mongoSyncClientBase.getDatabase("mydb3").getCollection("baz")
-                .withWriteConcern(WriteConcern.MAJORITY).insertOne(new Document("def", 0));
+            mongoSyncClient
+                .getDatabase("mydb1")
+                .getCollection("foo")
+                .withWriteConcern(WriteConcern.MAJORITY)
+                .insertOne(new Document("abc", 0));
+            mongoSyncClient
+                .getDatabase("mydb2")
+                .getCollection("bar")
+                .withWriteConcern(WriteConcern.MAJORITY)
+                .insertOne(new Document("xyz", 0));
+            mongoSyncClientBase
+                .getDatabase("mydb3")
+                .getCollection("baz")
+                .withWriteConcern(WriteConcern.MAJORITY)
+                .insertOne(new Document("def", 0));
 
             final ClientSession clientSession = mongoSyncClient.startSession();
-            final TransactionOptions txnOptions = TransactionOptions.builder()
+            final TransactionOptions txnOptions = TransactionOptions
+                .builder()
                 .readPreference(ReadPreference.primary())
                 .readConcern(ReadConcern.LOCAL)
                 .writeConcern(WriteConcern.MAJORITY)
@@ -58,10 +66,8 @@ public void shouldExecuteTransactions() {
             final String trxResult = "Inserted into collections in different databases";
 
             TransactionBody<String> txnBody = () -> {
-                final MongoCollection<Document> coll1 =
-                    mongoSyncClient.getDatabase("mydb1").getCollection("foo");
-                final MongoCollection<Document> coll2 =
-                    mongoSyncClient.getDatabase("mydb2").getCollection("bar");
+                final MongoCollection<Document> coll1 = mongoSyncClient.getDatabase("mydb1").getCollection("foo");
+                final MongoCollection<Document> coll2 = mongoSyncClient.getDatabase("mydb2").getCollection("bar");
 
                 coll1.insertOne(clientSession, new Document("abc", 1));
                 coll2.insertOne(clientSession, new Document("xyz", 999));
@@ -82,18 +88,14 @@ public void shouldExecuteTransactions() {
 
     @Test
     public void supportsMongoDB_4_4() {
-        try (
-            final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.4"))
-        ) {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.4"))) {
             mongoDBContainer.start();
         }
     }
 
     @Test
     public void shouldTestDatabaseName() {
-        try (
-            final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))
-        ) {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))) {
             mongoDBContainer.start();
             final String databaseName = "my-db";
             assertThat(mongoDBContainer.getReplicaSetUrl(databaseName), endsWith(databaseName));
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
index 59c3ed0de68..6a58b3488ff 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainer.java
@@ -13,7 +13,8 @@ public class MSSQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
     private final MSSQLServerContainer<?> container;
 
     public static ConnectionFactoryOptions getOptions(MSSQLServerContainer<?> container) {
-        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
             .option(ConnectionFactoryOptions.DRIVER, MSSQLR2DBCDatabaseContainerProvider.DRIVER)
             .build();
 
@@ -22,7 +23,8 @@ public static ConnectionFactoryOptions getOptions(MSSQLServerContainer<?> contai
 
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
-        return options.mutate()
+        return options
+            .mutate()
             .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT))
             // TODO enable if/when MSSQLServerContainer adds support for customizing the DB name
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index fe6270d04c7..532316fb967 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -14,6 +14,7 @@
 public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mcr.microsoft.com/mssql/server");
+
     @Deprecated
     public static final String DEFAULT_TAG = "2017-CU12";
 
@@ -30,13 +31,14 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
     private String password = DEFAULT_PASSWORD;
 
     private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
+
     private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 240;
 
-    private static final Pattern[] PASSWORD_CATEGORY_VALIDATION_PATTERNS = new Pattern[]{
+    private static final Pattern[] PASSWORD_CATEGORY_VALIDATION_PATTERNS = new Pattern[] {
         Pattern.compile("[A-Z]+"),
         Pattern.compile("[a-z]+"),
         Pattern.compile("[0-9]+"),
-        Pattern.compile("[^a-zA-Z0-9]+", Pattern.CASE_INSENSITIVE)
+        Pattern.compile("[^a-zA-Z0-9]+", Pattern.CASE_INSENSITIVE),
     };
 
     /**
@@ -53,7 +55,6 @@ public MSSQLServerContainer(final String dockerImageName) {
 
     public MSSQLServerContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
@@ -131,7 +132,6 @@ public SELF withPassword(final String password) {
     }
 
     private void checkPasswordStrength(String password) {
-
         if (password == null) {
             throw new IllegalArgumentException("Null password is not allowed");
         }
@@ -144,18 +144,19 @@ private void checkPasswordStrength(String password) {
             throw new IllegalArgumentException("Password can be up to 128 characters long");
         }
 
-        long satisfiedCategories = Stream.of(PASSWORD_CATEGORY_VALIDATION_PATTERNS)
+        long satisfiedCategories = Stream
+            .of(PASSWORD_CATEGORY_VALIDATION_PATTERNS)
             .filter(p -> p.matcher(password).find())
             .count();
 
         if (satisfiedCategories < 3) {
             throw new IllegalArgumentException(
                 "Password must contain characters from three of the following four categories:\n" +
-                    " - Latin uppercase letters (A through Z)\n" +
-                    " - Latin lowercase letters (a through z)\n" +
-                    " - Base 10 digits (0 through 9)\n" +
-                    " - Non-alphanumeric characters such as: exclamation point (!), dollar sign ($), number sign (#), " +
-                    "or percent (%)."
+                " - Latin uppercase letters (A through Z)\n" +
+                " - Latin lowercase letters (a through z)\n" +
+                " - Base 10 digits (0 through 9)\n" +
+                " - Non-alphanumeric characters such as: exclamation point (!), dollar sign ($), number sign (#), " +
+                "or percent (%)."
             );
         }
     }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java
index c3495c8a3a6..27e8ab75225 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainerProvider.java
@@ -6,6 +6,7 @@
  * Factory for MS SQL Server containers.
  */
 public class MSSQLServerContainerProvider extends JdbcDatabaseContainerProvider {
+
     @Override
     public boolean supports(String databaseType) {
         return databaseType.equals(MSSQLServerContainer.NAME);
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
index 00e22199b46..bdb623136fb 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
@@ -4,18 +4,21 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class MSSQLServerJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename", EnumSet.noneOf(Options.class)},
-            });
+        return Arrays.asList(
+            new Object[][] {
+                {
+                    "jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename",
+                    EnumSet.noneOf(Options.class),
+                },
+            }
+        );
     }
 }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
index 6ebd3624577..49bae13d9e3 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -22,11 +22,15 @@
 public class CustomPasswordMSSQLServerTest {
 
     private static String UPPER_CASE_LETTERS = "ABCDE";
+
     private static String LOWER_CASE_LETTERS = "abcde";
+
     private static String NUMBERS = "12345";
+
     private static String SPECIAL_CHARS = "_(!)_";
 
     private String password;
+
     private Boolean valid;
 
     public CustomPasswordMSSQLServerTest(String password, Boolean valid) {
@@ -36,45 +40,41 @@ public CustomPasswordMSSQLServerTest(String password, Boolean valid) {
 
     @Parameterized.Parameters
     public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-            new Object[]{null, false},
-            // too short
-            {"abc123", false},
-
-            // too long
-            {RandomStringUtils.randomAlphabetic(129), false},
-
-            // only 2 categories
-            {UPPER_CASE_LETTERS + NUMBERS, false},
-            {UPPER_CASE_LETTERS + SPECIAL_CHARS, false},
-            {LOWER_CASE_LETTERS + NUMBERS, false},
-            {LOWER_CASE_LETTERS + SPECIAL_CHARS, false},
-            {NUMBERS + SPECIAL_CHARS, false},
-
-            // 3 categories
-            {UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS, true},
-            {UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + SPECIAL_CHARS, true},
-            {UPPER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true},
-            {LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true},
-
-            // 4 categories
-            {UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true},
-
-
-        });
+        return Arrays.asList(
+            new Object[][] {
+                new Object[] { null, false },
+                // too short
+                { "abc123", false },
+                // too long
+                { RandomStringUtils.randomAlphabetic(129), false },
+                // only 2 categories
+                { UPPER_CASE_LETTERS + NUMBERS, false },
+                { UPPER_CASE_LETTERS + SPECIAL_CHARS, false },
+                { LOWER_CASE_LETTERS + NUMBERS, false },
+                { LOWER_CASE_LETTERS + SPECIAL_CHARS, false },
+                { NUMBERS + SPECIAL_CHARS, false },
+                // 3 categories
+                { UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS, true },
+                { UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + SPECIAL_CHARS, true },
+                { UPPER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true },
+                { LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true },
+                // 4 categories
+                { UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true },
+            }
+        );
     }
 
     @Test
     public void runPasswordTests() {
         try {
             new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE).withPassword(this.password);
-            if (!valid)
+            if (!valid) {
                 fail("Password " + this.password + " is not valid. Expected exception");
+            }
         } catch (IllegalArgumentException e) {
-            if (valid)
+            if (valid) {
                 fail("Password " + this.password + " should have been validated");
+            }
         }
     }
-
-
 }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
index d3c387e7b4a..21ea5380801 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
@@ -16,9 +16,12 @@ public class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSqlServerConnection() throws SQLException {
-        try (MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(DockerImageName.parse("mcr.microsoft.com/mssql/server:2017-CU12"))
-            .withPassword(STRONG_PASSWORD)) {
-
+        try (
+            MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
+                DockerImageName.parse("mcr.microsoft.com/mssql/server:2017-CU12")
+            )
+                .withPassword(STRONG_PASSWORD)
+        ) {
             mssqlServerContainer.start();
 
             ResultSet resultSet = performQuery(mssqlServerContainer, mssqlServerContainer.getTestQueryString());
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 1530760b673..36d215c8757 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -1,24 +1,27 @@
 package org.testcontainers.junit.mssqlserver;
 
 import org.junit.Test;
+import org.testcontainers.MSSQLServerTestImages;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
-import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import javax.sql.DataSource;
+
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.MSSQLServerTestImages.MSSQL_SERVER_IMAGE;
 
 public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQL_SERVER_IMAGE)) {
+        try (
+            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
+        ) {
             mssqlServer.start();
             ResultSet resultSet = performQuery(mssqlServer, "SELECT 1");
 
@@ -29,10 +32,11 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQL_SERVER_IMAGE)
-            .withUrlParam("integratedSecurity", "false")
-            .withUrlParam("applicationName", "MyApp")) {
-
+        try (
+            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
+                .withUrlParam("integratedSecurity", "false")
+                .withUrlParam("applicationName", "MyApp")
+        ) {
             mssqlServer.start();
 
             String jdbcUrl = mssqlServer.getJdbcUrl();
@@ -40,10 +44,11 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         }
     }
 
-
     @Test
     public void testSetupDatabase() throws SQLException {
-        try (MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQL_SERVER_IMAGE)) {
+        try (
+            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
+        ) {
             mssqlServer.start();
             DataSource ds = getDataSource(mssqlServer);
             Statement statement = ds.getConnection().createStatement();
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 20be08c2aec..14206018954 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -26,10 +26,15 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
     static final String DEFAULT_PASSWORD = "test";
 
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
+
     public static final Integer MYSQL_PORT = 3306;
+
     private String databaseName = "test";
+
     private String username = DEFAULT_USER;
+
     private String password = DEFAULT_PASSWORD;
+
     private static final String MYSQL_ROOT_USER = "root";
 
     /**
@@ -46,13 +51,11 @@ public MySQLContainer(String dockerImageName) {
 
     public MySQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPort(MYSQL_PORT);
     }
 
-
     @NotNull
     @Override
     protected Set<Integer> getLivenessCheckPorts() {
@@ -61,8 +64,11 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-        optionallyMapResourceParameterAsVolume(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, "/etc/mysql/conf.d",
-            "mysql-default-conf");
+        optionallyMapResourceParameterAsVolume(
+            MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
+            "/etc/mysql/conf.d",
+            "mysql-default-conf"
+        );
 
         addEnv("MYSQL_DATABASE", databaseName);
         if (!MYSQL_ROOT_USER.equalsIgnoreCase(username)) {
@@ -92,8 +98,7 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         String additionalUrlParams = constructUrlParameters("?", "&");
-        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) +
-            "/" + databaseName + additionalUrlParams;
+        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName + additionalUrlParams;
     }
 
     @Override
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
index 18d126635b1..621001d7b57 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainerProvider.java
@@ -35,5 +35,4 @@ public JdbcDatabaseContainer newInstance(String tag) {
     public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
         return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
     }
-
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
index 274224352a8..4bbb542fec8 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainer.java
@@ -13,7 +13,8 @@ public class MySQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
     private final MySQLContainer<?> container;
 
     public static ConnectionFactoryOptions getOptions(MySQLContainer<?> container) {
-        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
             .option(ConnectionFactoryOptions.DRIVER, MySQLR2DBCDatabaseContainerProvider.DRIVER)
             .build();
 
@@ -22,7 +23,8 @@ public static ConnectionFactoryOptions getOptions(MySQLContainer<?> container) {
 
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
-        return options.mutate()
+        return options
+            .mutate()
             .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MySQLContainer.MYSQL_PORT))
             .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
diff --git a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
index 833dc1448cf..81de83be0b9 100644
--- a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
+++ b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
@@ -3,7 +3,10 @@
 import org.testcontainers.utility.DockerImageName;
 
 public class MySQLTestImages {
+
     public static final DockerImageName MYSQL_56_IMAGE = DockerImageName.parse("mysql:5.6.51");
+
     public static final DockerImageName MYSQL_57_IMAGE = DockerImageName.parse("mysql:5.7.34");
+
     public static final DockerImageName MYSQL_80_IMAGE = DockerImageName.parse("mysql:8.0.24");
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
index 334fabb0a49..42a852ad1f1 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java
@@ -20,5 +20,4 @@ protected String createR2DBCUrl() {
     protected MySQLContainer<?> createContainer() {
         return new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE);
     }
-
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
index 86b13a0d1bf..0320eee9255 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
@@ -18,13 +18,10 @@ public class MySQLRootAccountTest {
 
     @Parameterized.Parameters(name = "{0}")
     public static DockerImageName[] params() {
-        return new DockerImageName[]{
-            MySQLTestImages.MYSQL_80_IMAGE,
-            MySQLTestImages.MYSQL_57_IMAGE
-        };
+        return new DockerImageName[] { MySQLTestImages.MYSQL_80_IMAGE, MySQLTestImages.MYSQL_57_IMAGE };
     }
 
-    @Parameterized.Parameter()
+    @Parameterized.Parameter
     public DockerImageName image;
 
     @Test
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
index 3b9f9842095..a30f3f59888 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
@@ -11,15 +11,16 @@
 import org.testcontainers.jdbc.ContainerDatabaseDriver;
 import org.vibur.dbcp.ViburDBCPDataSource;
 
-import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import static java.util.Arrays.asList;
+import javax.sql.DataSource;
+
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 /**
@@ -31,12 +32,14 @@
 @RunWith(Parameterized.class)
 public class JDBCDriverWithPoolTest {
 
-    public static final String URL = "jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.mysql.JDBCDriverWithPoolTest::sampleInitFunction";
+    public static final String URL =
+        "jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.mysql.JDBCDriverWithPoolTest::sampleInitFunction";
+
     private final DataSource dataSource;
 
     @Parameterized.Parameters
     public static Iterable<Supplier<DataSource>> dataSourceSuppliers() {
-        return asList(
+        return Arrays.asList(
             JDBCDriverWithPoolTest::getTomcatDataSourceWithDriverClassName,
             JDBCDriverWithPoolTest::getTomcatDataSource,
             JDBCDriverWithPoolTest::getHikariDataSourceWithDriverClassName,
@@ -54,13 +57,12 @@ public JDBCDriverWithPoolTest(Supplier<DataSource> dataSourceSupplier) {
 
     @Test
     public void testMySQLWithConnectionPoolUsingSameContainer() throws SQLException, InterruptedException {
-
         // Populate the database with some data in multiple threads, so that multiple connections from the pool will be used
         for (int i = 0; i < 100; i++) {
             executorService.submit(() -> {
                 try {
-                    new QueryRunner(dataSource).insert("INSERT INTO my_counter (n) VALUES (5)",
-                        (ResultSetHandler<Object>) rs -> true);
+                    new QueryRunner(dataSource)
+                        .insert("INSERT INTO my_counter (n) VALUES (5)", (ResultSetHandler<Object>) rs -> true);
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
@@ -72,22 +74,28 @@ public void testMySQLWithConnectionPoolUsingSameContainer() throws SQLException,
         executorService.awaitTermination(5, TimeUnit.MINUTES);
 
         // compare to expected results
-        int count = new QueryRunner(dataSource).query("SELECT COUNT(1) FROM my_counter", rs -> {
-            rs.next();
-            return rs.getInt(1);
-        });
+        int count = new QueryRunner(dataSource)
+            .query(
+                "SELECT COUNT(1) FROM my_counter",
+                rs -> {
+                    rs.next();
+                    return rs.getInt(1);
+                }
+            );
         assertEquals("Reuse of a datasource points to the same DB container", 100, count);
 
-
-        int sum = new QueryRunner(dataSource).query("SELECT SUM(n) FROM my_counter", rs -> {
-            rs.next();
-            return rs.getInt(1);
-        });
+        int sum = new QueryRunner(dataSource)
+            .query(
+                "SELECT SUM(n) FROM my_counter",
+                rs -> {
+                    rs.next();
+                    return rs.getInt(1);
+                }
+            );
         // 100 records * 5 = 500 expected
         assertEquals("Reuse of a datasource points to the same DB container", 500, sum);
     }
 
-
     private static DataSource getTomcatDataSourceWithDriverClassName() {
         PoolProperties poolProperties = new PoolProperties();
         poolProperties.setUrl(URL + ";TEST=TOMCAT_WITH_CLASSNAME"); // append a dummy URL element to ensure different DB per test
@@ -134,7 +142,7 @@ private static DataSource getViburDataSourceWithDriverClassName() {
         ViburDBCPDataSource ds = new ViburDBCPDataSource();
 
         ds.setJdbcUrl(URL + ";TEST=VIBUR_WITH_CLASSNAME");
-        ds.setUsername("any");  // Recent versions of Vibur require a username, even though it will not be used
+        ds.setUsername("any"); // Recent versions of Vibur require a username, even though it will not be used
         ds.setPassword("");
         ds.setPoolInitialSize(3);
         ds.setPoolMaxSize(10);
@@ -149,7 +157,7 @@ private static DataSource getViburDataSourceWithDriverClassName() {
     private static DataSource getViburDataSource() {
         ViburDBCPDataSource ds = new ViburDBCPDataSource();
         ds.setJdbcUrl(URL + ";TEST=VIBUR");
-        ds.setUsername("any");  // Recent versions of Vibur require a username, even though it will not be used
+        ds.setUsername("any"); // Recent versions of Vibur require a username, even though it will not be used
         ds.setPassword("");
         ds.setPoolInitialSize(3);
         ds.setPoolMaxSize(10);
@@ -162,12 +170,8 @@ private static DataSource getViburDataSource() {
 
     @SuppressWarnings("SqlNoDataSourceInspection")
     public static void sampleInitFunction(Connection connection) throws SQLException {
-        connection.createStatement().execute("CREATE TABLE bar (\n" +
-            "  foo VARCHAR(255)\n" +
-            ");");
+        connection.createStatement().execute("CREATE TABLE bar (\n" + "  foo VARCHAR(255)\n" + ");");
         connection.createStatement().execute("INSERT INTO bar (foo) VALUES ('hello world');");
-        connection.createStatement().execute("CREATE TABLE my_counter (\n" +
-            "  n INT\n" +
-            ");");
+        connection.createStatement().execute("CREATE TABLE my_counter (\n" + "  n INT\n" + ");");
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
index 302621879eb..752fbca8e07 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
@@ -4,27 +4,48 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class MySQLJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:mysql://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mysql://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
-                {"jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8", EnumSet.of(Options.CharacterSet)},
-                {"jdbc:tc:mysql:5.7.34://hostname/databasename", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mysql:5.7.34://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class)},
-                {"jdbc:tc:mysql:5.6.51://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override", EnumSet.of(Options.CustomIniFile)},
-            });
+        return Arrays.asList(
+            new Object[][] {
+                { "jdbc:tc:mysql://hostname/databasename", EnumSet.noneOf(Options.class) },
+                {
+                    "jdbc:tc:mysql://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mysql.sql",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8",
+                    EnumSet.of(Options.CharacterSet),
+                },
+                { "jdbc:tc:mysql:5.7.34://hostname/databasename", EnumSet.noneOf(Options.class) },
+                { "jdbc:tc:mysql:5.7.34://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class) },
+                {
+                    "jdbc:tc:mysql:5.6.51://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override",
+                    EnumSet.of(Options.CustomIniFile),
+                },
+            }
+        );
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
index 0b72ce083d2..20b49d19201 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
@@ -11,19 +11,23 @@
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
+
     private static final String DB_NAME = "foo";
+
     private static final String USER = "bar";
+
     private static final String PWD = "baz";
 
     @Test
     public void testSimple() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-        try (MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
-            .withDatabaseName(DB_NAME)
-            .withUsername(USER)
-            .withPassword(PWD)
-            .withEnv("MYSQL_ROOT_HOST", "%")) {
-
+        try (
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+                .withDatabaseName(DB_NAME)
+                .withUsername(USER)
+                .withPassword(PWD)
+                .withEnv("MYSQL_ROOT_HOST", "%")
+        ) {
             mysql.start();
 
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index 32dee3cd056..735af251236 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
@@ -11,23 +12,20 @@
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.testcontainers.MySQLTestImages.MYSQL_56_IMAGE;
-import static org.testcontainers.MySQLTestImages.MYSQL_57_IMAGE;
-import static org.testcontainers.MySQLTestImages.MYSQL_80_IMAGE;
 
 @RunWith(Parameterized.class)
 public class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
 
     @Parameterized.Parameters(name = "{0}")
     public static DockerImageName[] params() {
-        return new DockerImageName[]{
-            MYSQL_56_IMAGE,
-            MYSQL_57_IMAGE,
-            MYSQL_80_IMAGE
+        return new DockerImageName[] {
+            MySQLTestImages.MYSQL_56_IMAGE,
+            MySQLTestImages.MYSQL_57_IMAGE,
+            MySQLTestImages.MYSQL_80_IMAGE,
         };
     }
 
-    @Parameterized.Parameter()
+    @Parameterized.Parameter
     public DockerImageName dockerImageName;
 
     @Test
@@ -37,7 +35,11 @@ public void versionCheckTest() throws SQLException {
             final ResultSet resultSet = performQuery(mysql, "SELECT VERSION()");
             final String resultSetString = resultSet.getString(1);
 
-            assertEquals("The database version can be set using a container rule parameter", dockerImageName.getVersionPart(), resultSetString);
+            assertEquals(
+                "The database version can be set using a container rule parameter",
+                dockerImageName.getVersionPart(),
+                resultSetString
+            );
         }
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 90973bc4b56..6441724c443 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -4,6 +4,7 @@
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -18,15 +19,12 @@
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeFalse;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 import static org.rnorth.visibleassertions.VisibleAssertions.fail;
-import static org.testcontainers.MySQLTestImages.MYSQL_56_IMAGE;
-import static org.testcontainers.MySQLTestImages.MYSQL_57_IMAGE;
-
 
 public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
@@ -51,10 +49,11 @@ public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
-            .withConfigurationOverride("somepath/mysql_conf_override")
-            .withLogConsumer(new Slf4jLogConsumer(logger))) {
-
+        try (
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+                .withConfigurationOverride("somepath/mysql_conf_override")
+                .withLogConsumer(new Slf4jLogConsumer(logger))
+        ) {
             mysql.start();
 
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
@@ -66,16 +65,20 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testSpecificVersion() throws SQLException {
-        try (MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MYSQL_56_IMAGE)
-            .withConfigurationOverride("somepath/mysql_conf_override")
-            .withLogConsumer(new Slf4jLogConsumer(logger))) {
-
+        try (
+            MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+                .withConfigurationOverride("somepath/mysql_conf_override")
+                .withLogConsumer(new Slf4jLogConsumer(logger))
+        ) {
             mysqlOldVersion.start();
 
             ResultSet resultSet = performQuery(mysqlOldVersion, "SELECT VERSION()");
             String resultSetString = resultSet.getString(1);
 
-            assertTrue("The database version can be set using a container rule parameter", resultSetString.startsWith("5.6"));
+            assertTrue(
+                "The database version can be set using a container rule parameter",
+                resultSetString.startsWith("5.6")
+            );
         }
     }
 
@@ -83,9 +86,10 @@ public void testSpecificVersion() throws SQLException {
     public void testMySQLWithCustomIniFile() throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
 
-        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MYSQL_56_IMAGE)
-            .withConfigurationOverride("somepath/mysql_conf_override")) {
-
+        try (
+            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+                .withConfigurationOverride("somepath/mysql_conf_override")
+        ) {
             mysqlCustomConfig.start();
 
             ResultSet resultSet = performQuery(mysqlCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
@@ -97,9 +101,10 @@ public void testMySQLWithCustomIniFile() throws SQLException {
 
     @Test
     public void testCommandOverride() throws SQLException {
-        try (MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MYSQL_57_IMAGE)
-            .withCommand("mysqld --auto_increment_increment=42")) {
-
+        try (
+            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+                .withCommand("mysqld --auto_increment_increment=42")
+        ) {
             mysqlCustomConfig.start();
 
             ResultSet resultSet = performQuery(mysqlCustomConfig, "show variables like 'auto_increment_increment'");
@@ -111,9 +116,11 @@ public void testCommandOverride() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_57_IMAGE)
-            .withInitScript("somepath/init_mysql.sql")
-            .withLogConsumer(new Slf4jLogConsumer(logger))) {
+        try (
+            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+                .withInitScript("somepath/init_mysql.sql")
+                .withLogConsumer(new Slf4jLogConsumer(logger))
+        ) {
             container.start();
 
             ResultSet resultSet = performQuery(container, "SELECT foo FROM bar");
@@ -125,11 +132,13 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test(expected = ContainerLaunchException.class)
     public void testEmptyPasswordWithNonRootUser() {
-        try (MySQLContainer<?> container = new MySQLContainer<>(MYSQL_56_IMAGE)
-                    .withDatabaseName("TEST")
-                    .withUsername("test")
-                    .withPassword("")
-                    .withEnv("MYSQL_ROOT_HOST", "%")){
+        try (
+            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+                .withDatabaseName("TEST")
+                .withUsername("test")
+                .withPassword("")
+                .withEnv("MYSQL_ROOT_HOST", "%")
+        ) {
             container.start();
             fail("ContainerLaunchException expected to be thrown");
         }
@@ -138,12 +147,13 @@ public void testEmptyPasswordWithNonRootUser() {
     @Test
     public void testEmptyPasswordWithRootUser() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-        try (MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_56_IMAGE)
-            .withDatabaseName("foo")
-            .withUsername("root")
-            .withPassword("")
-            .withEnv("MYSQL_ROOT_HOST", "%")) {
-
+        try (
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+                .withDatabaseName("foo")
+                .withUsername("root")
+                .withPassword("")
+                .withEnv("MYSQL_ROOT_HOST", "%")
+        ) {
             mysql.start();
 
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
@@ -155,13 +165,13 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamTimeZone() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
             .withUrlParam("serverTimezone", "Europe/Zurich")
             .withEnv("TZ", "Europe/Zurich")
             .withLogConsumer(new Slf4jLogConsumer(logger));
         mysql.start();
 
-        try(Connection connection = mysql.createConnection("")) {
+        try (Connection connection = mysql.createConnection("")) {
             Statement statement = connection.createStatement();
             statement.execute("SELECT NOW();");
             try (ResultSet resultSet = statement.getResultSet()) {
@@ -169,13 +179,18 @@ public void testWithAdditionalUrlParamTimeZone() throws SQLException {
 
                 // checking that the time_zone MySQL is Europe/Zurich
                 LocalDateTime localDateTime = resultSet.getObject(1, LocalDateTime.class);
-                ZonedDateTime actualDateTime = localDateTime.atZone(ZoneId.of("Europe/Zurich"))
+                ZonedDateTime actualDateTime = localDateTime
+                    .atZone(ZoneId.of("Europe/Zurich"))
                     .truncatedTo(ChronoUnit.MINUTES);
-                ZonedDateTime expectedDateTime = ZonedDateTime.now(ZoneId.of("Europe/Zurich"))
+                ZonedDateTime expectedDateTime = ZonedDateTime
+                    .now(ZoneId.of("Europe/Zurich"))
                     .truncatedTo(ChronoUnit.MINUTES);
 
-                String message = String.format("MySQL time zone is not Europe/Zurich. MySQL date:%s, current date:%s",
-                    actualDateTime, expectedDateTime);
+                String message = String.format(
+                    "MySQL time zone is not Europe/Zurich. MySQL date:%s, current date:%s",
+                    actualDateTime,
+                    expectedDateTime
+                );
                 assertTrue(message, actualDateTime.equals(expectedDateTime));
             }
         } finally {
@@ -185,19 +200,20 @@ public void testWithAdditionalUrlParamTimeZone() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
         mysql.start();
 
-        try(Connection connection = mysql.createConnection("")) {
+        try (Connection connection = mysql.createConnection("")) {
             Statement statement = connection.createStatement();
-            String multiQuery = "DROP TABLE IF EXISTS bar; " +
+            String multiQuery =
+                "DROP TABLE IF EXISTS bar; " +
                 "CREATE TABLE bar (foo VARCHAR(20)); " +
                 "INSERT INTO bar (foo) VALUES ('hello world');";
             statement.execute(multiQuery);
             statement.execute("SELECT foo FROM bar;");
-            try(ResultSet resultSet = statement.getResultSet()) {
+            try (ResultSet resultSet = statement.getResultSet()) {
                 resultSet.next();
                 String firstColumnValue = resultSet.getString(1);
                 assertEquals("Value from bar should equal real value", "hello world", firstColumnValue);
@@ -209,7 +225,7 @@ public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_57_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withUrlParam("rewriteBatchedStatements", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
diff --git a/modules/neo4j/src/custom-neo4j-plugin/java/ac/simons/neo4j/demos/plugins/HelloWorld.java b/modules/neo4j/src/custom-neo4j-plugin/java/ac/simons/neo4j/demos/plugins/HelloWorld.java
index cbfcdc03a55..8948c98d53c 100644
--- a/modules/neo4j/src/custom-neo4j-plugin/java/ac/simons/neo4j/demos/plugins/HelloWorld.java
+++ b/modules/neo4j/src/custom-neo4j-plugin/java/ac/simons/neo4j/demos/plugins/HelloWorld.java
@@ -9,7 +9,6 @@ public class HelloWorld {
     @UserFunction("ac.simons.helloWorld")
     @Description("Simple Hello World")
     public String helloWorld(@Name("name") String name) {
-
         return "Hello, " + name;
     }
 }
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 6f0cf10ded7..94b4263fe8c 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -1,15 +1,5 @@
 package org.testcontainers.containers;
 
-import static java.net.HttpURLConnection.HTTP_OK;
-import static java.util.stream.Collectors.toSet;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
@@ -19,6 +9,15 @@
 import org.testcontainers.utility.LicenseAcceptance;
 import org.testcontainers.utility.MountableFile;
 
+import java.net.HttpURLConnection;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * Testcontainer for Neo4j.
  *
@@ -36,6 +35,7 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
      * The default tag (version) to use.
      */
     private static final String DEFAULT_TAG = "4.4";
+
     private static final String ENTERPRISE_TAG = DEFAULT_TAG + "-enterprise";
 
     /**
@@ -91,9 +91,7 @@ public Neo4jContainer(String dockerImageName) {
      */
     public Neo4jContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
-        this.standardImage = dockerImageName.getUnversionedPart()
-            .equals(DEFAULT_IMAGE_NAME.getUnversionedPart());
+        this.standardImage = dockerImageName.getUnversionedPart().equals(DEFAULT_IMAGE_NAME.getUnversionedPart());
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
@@ -101,39 +99,37 @@ public Neo4jContainer(final DockerImageName dockerImageName) {
             .withRegEx(String.format(".*Bolt enabled on .*:%d\\.\n", DEFAULT_BOLT_PORT));
         WaitStrategy waitForHttp = new HttpWaitStrategy()
             .forPort(DEFAULT_HTTP_PORT)
-            .forStatusCodeMatching(response -> response == HTTP_OK);
+            .forStatusCodeMatching(response -> response == HttpURLConnection.HTTP_OK);
 
-        this.waitStrategy = new WaitAllStrategy()
-            .withStrategy(waitForBolt)
-            .withStrategy(waitForHttp)
-            .withStartupTimeout(Duration.ofMinutes(2));
+        this.waitStrategy =
+            new WaitAllStrategy()
+                .withStrategy(waitForBolt)
+                .withStrategy(waitForHttp)
+                .withStartupTimeout(Duration.ofMinutes(2));
 
         addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
     }
 
     @Override
     public Set<Integer> getLivenessCheckPortNumbers() {
-
-        return Stream.of(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT)
+        return Stream
+            .of(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT)
             .map(this::getMappedPort)
-            .collect(toSet());
+            .collect(Collectors.toSet());
     }
 
     @Override
     protected void configure() {
-
         boolean emptyAdminPassword = this.adminPassword == null || this.adminPassword.isEmpty();
         String neo4jAuth = emptyAdminPassword ? "none" : String.format(AUTH_FORMAT, this.adminPassword);
         addEnv("NEO4J_AUTH", neo4jAuth);
 
         if (!this.labsPlugins.isEmpty()) {
-            String enabledPlugins = this.labsPlugins.stream()
-                .map(pluginName -> "\"" + pluginName + "\"")
-                .collect(Collectors.joining(","));
+            String enabledPlugins =
+                this.labsPlugins.stream().map(pluginName -> "\"" + pluginName + "\"").collect(Collectors.joining(","));
 
             addEnv("NEO4JLABS_PLUGINS", "[" + enabledPlugins + "]");
         }
-
     }
 
     /**
@@ -169,8 +165,8 @@ public String getHttpsUrl() {
     public S withEnterpriseEdition() {
         if (!standardImage) {
             throw new IllegalStateException(
-                String.format("Cannot use enterprise version with alternative image %s.",
-                    getDockerImageName()));
+                String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName())
+            );
         }
 
         setDockerImageName(DEFAULT_IMAGE_NAME.withTag(ENTERPRISE_TAG).asCanonicalNameString());
@@ -189,7 +185,6 @@ public S withEnterpriseEdition() {
      * @return This container.
      */
     public S withAdminPassword(final String adminPassword) {
-
         this.adminPassword = adminPassword;
         return self();
     }
@@ -226,7 +221,8 @@ public S withoutAuthentication() {
     public S withDatabase(MountableFile graphDb) {
         if (!isNeo4jDatabaseVersionSupportingDbCopy()) {
             throw new IllegalArgumentException(
-                "Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
+                "Copying database folder is not supported for Neo4j instances with version 4.0 or higher."
+            );
         }
         return withCopyFileToContainer(graphDb, "/data/databases/graph.db");
     }
@@ -254,7 +250,6 @@ public S withPlugins(MountableFile plugins) {
      * @return This container.
      */
     public S withNeo4jConfig(String key, String value) {
-
         addEnv(formatConfigurationKey(key), value);
         return self();
     }
@@ -273,7 +268,8 @@ public String getAdminPassword() {
      * @return This container.
      */
     public S withLabsPlugins(Neo4jLabsPlugin... neo4jLabsPlugins) {
-        List<String> pluginNames = Arrays.stream(neo4jLabsPlugins)
+        List<String> pluginNames = Arrays
+            .stream(neo4jLabsPlugins)
             .map(plugin -> plugin.pluginName)
             .collect(Collectors.toList());
 
@@ -295,9 +291,7 @@ public S withLabsPlugins(String... neo4jLabsPlugins) {
     private static String formatConfigurationKey(String plainConfigKey) {
         final String prefix = "NEO4J_";
 
-        return String.format("%s%s", prefix, plainConfigKey
-            .replaceAll("_", "__")
-            .replaceAll("\\.", "_"));
+        return String.format("%s%s", prefix, plainConfigKey.replaceAll("_", "__").replaceAll("\\.", "_"));
     }
 
     private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
@@ -311,9 +305,12 @@ private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
             return true;
         }
         if (!usedComparableVersion.isSemanticVersion()) {
-            logger().warn("Version {} is not a semantic version. The function \"withDatabase\" will fail.", usedImageVersion);
+            logger()
+                .warn(
+                    "Version {} is not a semantic version. The function \"withDatabase\" will fail.",
+                    usedImageVersion
+                );
             logger().warn("Copying databases is only supported for Neo4j versions 3.5.x");
-
         }
 
         return false;
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
index 6832dfff0c7..3a2df1f7d0c 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
@@ -24,12 +24,11 @@ public class Neo4jContainerJUnitIntegrationTest {
 
     @Test
     public void shouldStart() {
-
         boolean actual = neo4jContainer.isRunning();
         assertThat(actual).isTrue();
 
-        try (Driver driver = GraphDatabase
-            .driver(neo4jContainer.getBoltUrl(), AuthTokens.basic("neo4j", "password"));
+        try (
+            Driver driver = GraphDatabase.driver(neo4jContainer.getBoltUrl(), AuthTokens.basic("neo4j", "password"));
             Session session = driver.session()
         ) {
             long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 0d3f04ef570..20cd38dc70c 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -29,17 +29,16 @@ public class Neo4jContainerTest {
 
     @Test
     public void shouldDisableAuthentication() {
-
         try (
+            // spotless:off
             // withoutAuthentication {
             Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
                 .withoutAuthentication()
             // }
+            // spotless:on
         ) {
             neo4jContainer.start();
-            try (Driver driver = getDriver(neo4jContainer);
-                Session session = driver.session()
-            ) {
+            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
                 long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
                 assertThat(one).isEqualTo(1L);
             }
@@ -55,10 +54,7 @@ public void shouldCopyDatabase() {
             // }
         ) {
             neo4jContainer.start();
-            try (
-                Driver driver = getDriver(neo4jContainer);
-                Session session = driver.session()
-            ) {
+            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
                 Result result = session.run("MATCH (t:Thing) RETURN t");
                 assertThat(result.list().stream().map(r -> r.get("t").get("name").asString()))
                     .containsExactlyInAnyOrder("Thing", "Thing 2", "Thing 3", "A box");
@@ -68,25 +64,29 @@ public void shouldCopyDatabase() {
 
     @Test
     public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
-        Assertions.assertThatIllegalArgumentException()
-            .isThrownBy(() -> new Neo4jContainer<>()
-                .withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
+        Assertions
+            .assertThatIllegalArgumentException()
+            .isThrownBy(() -> new Neo4jContainer<>().withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
 
     @Test
     public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
-        Assertions.assertThatIllegalArgumentException()
-            .isThrownBy(() -> new Neo4jContainer<>("neo4j:4.4.1")
-                .withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
+        Assertions
+            .assertThatIllegalArgumentException()
+            .isThrownBy(() -> {
+                new Neo4jContainer<>("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
+            })
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
 
     @Test
     public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
-        Assertions.assertThatIllegalArgumentException()
-            .isThrownBy(() -> new Neo4jContainer<>("neo4j:latest")
-                .withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
+        Assertions
+            .assertThatIllegalArgumentException()
+            .isThrownBy(() -> {
+                new Neo4jContainer<>("neo4j:latest").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
+            })
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
 
@@ -99,10 +99,7 @@ public void shouldCopyPlugins() {
             // }
         ) {
             neo4jContainer.start();
-            try (
-                Driver driver = getDriver(neo4jContainer);
-                Session session = driver.session()
-            ) {
+            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
                 assertThatCustomPluginWasCopied(session);
             }
         }
@@ -117,10 +114,7 @@ public void shouldCopyPlugin() {
             // }
         ) {
             neo4jContainer.start();
-            try (
-                Driver driver = getDriver(neo4jContainer);
-                Session session = driver.session()
-            ) {
+            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
                 assertThatCustomPluginWasCopied(session);
             }
         }
@@ -152,17 +146,16 @@ public void shouldRunEnterprise() {
             // enterpriseEdition {
             Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
                 .withEnterpriseEdition()
-            // }
+                // }
                 .withAdminPassword("Picard123")
         ) {
             neo4jContainer.start();
-            try (
-                Driver driver = getDriver(neo4jContainer);
-                Session session = driver.session()
-            ) {
+            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
                 String edition = session
                     .run("CALL dbms.components() YIELD edition RETURN edition", Collections.emptyMap())
-                    .next().get(0).asString();
+                    .next()
+                    .get(0)
+                    .asString();
                 assertThat(edition).isEqualTo("enterprise");
             }
         }
@@ -178,31 +171,28 @@ public void shouldAddConfigToEnvironment() {
 
         assertThat(neo4jContainer.getEnvMap())
             .containsEntry("NEO4J_dbms_security_procedures_unrestricted", "apoc.*,algo.*");
-        assertThat(neo4jContainer.getEnvMap())
-            .containsEntry("NEO4J_dbms_tx__log_rotation_size", "42M");
+        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_dbms_tx__log_rotation_size", "42M");
     }
 
     @Test
     public void shouldConfigureSingleLabsPlugin() {
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
-            .withLabsPlugins(Neo4jLabsPlugin.APOC)) {
-
-
+        try (
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins(Neo4jLabsPlugin.APOC)
+        ) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
 
-            assertThat(neo4jContainer.getEnvMap())
-                .containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
+            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
         }
     }
 
     @Test
     public void shouldConfigureMultipleLabsPlugins() {
-        try(
-        // configureLabsPlugins {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
-            .withLabsPlugins(Neo4jLabsPlugin.APOC, Neo4jLabsPlugin.BLOOM);
-        // }
+        try (
+            // configureLabsPlugins {
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+                .withLabsPlugins(Neo4jLabsPlugin.APOC, Neo4jLabsPlugin.BLOOM);
+            // }
         ) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
@@ -214,23 +204,19 @@ public void shouldConfigureMultipleLabsPlugins() {
 
     @Test
     public void shouldConfigureSingleLabsPluginWithString() {
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
-            .withLabsPlugins("myApoc")) {
-
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("myApoc")) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
 
-            assertThat(neo4jContainer.getEnvMap())
-                .containsEntry("NEO4JLABS_PLUGINS", "[\"myApoc\"]");
+            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"myApoc\"]");
         }
     }
 
     @Test
     public void shouldConfigureMultipleLabsPluginsWithString() {
-
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
-            .withLabsPlugins("myApoc", "myBloom")) {
-
+        try (
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("myApoc", "myBloom")
+        ) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
 
@@ -240,7 +226,6 @@ public void shouldConfigureMultipleLabsPluginsWithString() {
     }
 
     private static Driver getDriver(Neo4jContainer<?> container) {
-
         AuthToken authToken = AuthTokens.none();
         if (container.getAdminPassword() != null) {
             authToken = AuthTokens.basic("neo4j", container.getAdminPassword());
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 296d82b7997..3e7a2062fd0 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -12,10 +12,14 @@
 /**
  * @author richardnorth
  */
-public class NginxContainer<SELF extends NginxContainer<SELF>> extends GenericContainer<SELF> implements LinkableContainer {
+public class NginxContainer<SELF extends NginxContainer<SELF>>
+    extends GenericContainer<SELF>
+    implements LinkableContainer {
 
     private static final int NGINX_DEFAULT_PORT = 80;
+
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("nginx");
+
     private static final String DEFAULT_TAG = "1.9.4";
 
     /**
@@ -32,7 +36,6 @@ public NginxContainer(String dockerImageName) {
 
     public NginxContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPort(NGINX_DEFAULT_PORT);
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index e322804bf75..c1ba3d30684 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -12,7 +12,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 /**
@@ -29,9 +29,10 @@ public class SimpleNginxTest {
     public NginxContainer<?> nginx = new NginxContainer<>(NGINX_IMAGE)
         .withCustomContent(tmpDirectory)
         .waitingFor(new HttpWaitStrategy());
+
     // }
 
-    @SuppressWarnings({"Duplicates", "ResultOfMethodCallIgnored"})
+    @SuppressWarnings({ "Duplicates", "ResultOfMethodCallIgnored" })
     @BeforeClass
     public static void setupContent() throws Exception {
         // addCustomContent {
@@ -43,7 +44,8 @@ public static void setupContent() throws Exception {
         // And "hello world" HTTP file
         File indexFile = new File(contentFolder, "index.html");
         indexFile.deleteOnExit();
-        @Cleanup PrintStream printStream = new PrintStream(new FileOutputStream(indexFile));
+        @Cleanup
+        PrintStream printStream = new PrintStream(new FileOutputStream(indexFile));
         printStream.println("<html><body>Hello World!</body></html>");
         // }
     }
@@ -53,7 +55,8 @@ public void testSimple() throws Exception {
         // getFromNginxServer {
         URL baseUrl = nginx.getBaseUrl("http", 80);
 
-        assertThat("An HTTP GET from the Nginx server returns the index.html from the custom content directory",
+        assertThat(
+            "An HTTP GET from the Nginx server returns the index.html from the custom content directory",
             responseFromNginx(baseUrl),
             containsString("Hello World!")
         );
@@ -62,7 +65,8 @@ public void testSimple() throws Exception {
 
     private static String responseFromNginx(URL baseUrl) throws IOException {
         URLConnection urlConnection = baseUrl.openConnection();
-        @Cleanup BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+        @Cleanup
+        BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
         return reader.readLine();
     }
 }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 689646f0006..bd5d9aeb7ca 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -1,50 +1,59 @@
 package org.testcontainers.containers;
 
-import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Future;
 
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static java.util.Collections.singleton;
-
 public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     public static final String NAME = "oracle";
+
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe");
 
     static final String DEFAULT_TAG = "18.4.0-slim";
+
     static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
     private static final int ORACLE_PORT = 1521;
+
     private static final int APEX_HTTP_PORT = 8080;
 
     private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
+
     private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 120;
 
     // Container defaults
     static final String DEFAULT_DATABASE_NAME = "xepdb1";
+
     static final String DEFAULT_SID = "xe";
+
     static final String DEFAULT_SYSTEM_USER = "system";
+
     static final String DEFAULT_SYS_USER = "sys";
 
     // Test container defaults
     static final String APP_USER = "test";
+
     static final String APP_USER_PASSWORD = "test";
 
     // Restricted user and database names
     private static final List<String> ORACLE_SYSTEM_USERS = Arrays.asList(DEFAULT_SYSTEM_USER, DEFAULT_SYS_USER);
 
     private String databaseName = DEFAULT_DATABASE_NAME;
+
     private String username = APP_USER;
+
     private String password = APP_USER_PASSWORD;
+
     private boolean usingSid = false;
 
     /**
@@ -71,10 +80,11 @@ public OracleContainer(Future<String> dockerImageName) {
     }
 
     private void preconfigure() {
-        this.waitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(".*DATABASE IS READY TO USE!.*\\s")
-            .withTimes(1)
-            .withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, SECONDS));
+        this.waitStrategy =
+            new LogMessageWaitStrategy()
+                .withRegEx(".*DATABASE IS READY TO USE!.*\\s")
+                .withTimes(1)
+                .withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, ChronoUnit.SECONDS));
 
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
         addExposedPorts(ORACLE_PORT, APEX_HTTP_PORT);
@@ -88,7 +98,7 @@ protected void waitUntilContainerStarted() {
     @NotNull
     @Override
     public Set<Integer> getLivenessCheckPortNumbers() {
-        return singleton(getMappedPort(ORACLE_PORT));
+        return Collections.singleton(getMappedPort(ORACLE_PORT));
     }
 
     @Override
@@ -98,9 +108,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return isUsingSid() ?
-            "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + ":" + getSid() :
-            "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + "/" + getDatabaseName();
+        return isUsingSid()
+            ? "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + ":" + getSid()
+            : "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + "/" + getDatabaseName();
     }
 
     @Override
@@ -192,7 +202,7 @@ protected void configure() {
         withEnv("ORACLE_PASSWORD", password);
 
         // Only set ORACLE_DATABASE if different than the default.
-        if(databaseName != DEFAULT_DATABASE_NAME) {
+        if (databaseName != DEFAULT_DATABASE_NAME) {
             withEnv("ORACLE_DATABASE", databaseName);
         }
 
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java
index a298ae23359..f92f0ec40be 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainerProvider.java
@@ -6,6 +6,7 @@
  * Factory for Oracle containers.
  */
 public class OracleContainerProvider extends JdbcDatabaseContainerProvider {
+
     @Override
     public boolean supports(String databaseType) {
         return databaseType.equals(OracleContainer.NAME);
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
index 79dc35deb64..003941f4dfc 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
@@ -4,7 +4,6 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.sql.ResultSet;
@@ -19,18 +18,21 @@ public void testOracleWithNoSpecifiedVersion() throws SQLException {
         performSimpleTest("jdbc:tc:oracle://hostname/databasename");
     }
 
-
     private void performSimpleTest(String jdbcUrl) throws SQLException {
         HikariDataSource dataSource = getDataSource(jdbcUrl, 1);
-        new QueryRunner(dataSource).query("SELECT 1 FROM dual", new ResultSetHandler<Object>() {
-            @Override
-            public Object handle(ResultSet rs) throws SQLException {
-                rs.next();
-                int resultSetInt = rs.getInt(1);
-                assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
-                return true;
-            }
-        });
+        new QueryRunner(dataSource)
+            .query(
+                "SELECT 1 FROM dual",
+                new ResultSetHandler<Object>() {
+                    @Override
+                    public Object handle(ResultSet rs) throws SQLException {
+                        rs.next();
+                        int resultSetInt = rs.getInt(1);
+                        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+                        return true;
+                    }
+                }
+            );
         dataSource.close();
     }
 
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 2dd82c437a4..2c514062415 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -1,8 +1,5 @@
 package org.testcontainers.junit.oracle;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import org.junit.Test;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -11,16 +8,22 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
-    public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe:18.4.0-slim");
+    public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
+        "gvenzl/oracle-xe:18.4.0-slim"
+    );
 
-    private void runTest(OracleContainer container, String databaseName, String username, String password) throws SQLException {
+    private void runTest(OracleContainer container, String databaseName, String username, String password)
+        throws SQLException {
         //Test config was honored
         assertEquals(databaseName, container.getDatabaseName());
         assertEquals(username, container.getUsername());
         assertEquals(password, container.getPassword());
-        
+
         //Test we can get a connection
         container.start();
         ResultSet resultSet = performQuery(container, "SELECT 1 FROM dual");
@@ -30,9 +33,7 @@ private void runTest(OracleContainer container, String databaseName, String user
 
     @Test
     public void testDefaultSettings() throws SQLException {
-        try (
-            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);
-        ) {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);) {
             runTest(oracle, "xepdb1", "test", "test");
 
             // Match against the last '/'
@@ -43,10 +44,7 @@ public void testDefaultSettings() throws SQLException {
 
     @Test
     public void testPluggableDatabase() throws SQLException {
-        try (
-            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
-                .withDatabaseName("testDB")
-        ) {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).withDatabaseName("testDB")) {
             runTest(oracle, "testDB", "test", "test");
         }
     }
@@ -76,10 +74,7 @@ public void testCustomUser() throws SQLException {
 
     @Test
     public void testSID() throws SQLException {
-        try (
-            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
-                .usingSid();
-        ) {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid();) {
             runTest(oracle, "xepdb1", "system", "test");
 
             // Match against the last ':'
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index a68f55b60ef..2f606475dc0 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -21,25 +21,33 @@
  * @author robfrank
  */
 public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(OrientDBContainer.class);
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("orientdb");
+
     private static final String DEFAULT_TAG = "3.0.24-tp3";
 
     private static final String DEFAULT_USERNAME = "admin";
+
     private static final String DEFAULT_PASSWORD = "admin";
+
     private static final String DEFAULT_SERVER_PASSWORD = "root";
 
     private static final String DEFAULT_DATABASE_NAME = "testcontainers";
 
     private static final int DEFAULT_BINARY_PORT = 2424;
+
     private static final int DEFAULT_HTTP_PORT = 2480;
 
     private String databaseName;
+
     private String serverPassword;
+
     private Optional<String> scriptPath = Optional.empty();
 
     private OrientDB orientDB;
+
     private ODatabaseSession session;
 
     /**
@@ -56,13 +64,12 @@ public OrientDBContainer(@NonNull String dockerImageName) {
 
     public OrientDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         serverPassword = DEFAULT_SERVER_PASSWORD;
         databaseName = DEFAULT_DATABASE_NAME;
 
-        waitStrategy =  new LogMessageWaitStrategy().withRegEx(".*Gremlin started correctly.*");
+        waitStrategy = new LogMessageWaitStrategy().withRegEx(".*Gremlin started correctly.*");
 
         addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
     }
@@ -133,7 +140,9 @@ private void loadScript(String path, ODatabaseSession session) {
 
             if (resource == null) {
                 LOGGER.warn("Could not load classpath init script: {}", scriptPath);
-                throw new RuntimeException("Could not load classpath init script: " + scriptPath + ". Resource not found.");
+                throw new RuntimeException(
+                    "Could not load classpath init script: " + scriptPath + ". Resource not found."
+                );
             }
 
             String script = IOUtils.toString(resource, StandardCharsets.UTF_8);
@@ -147,5 +156,4 @@ private void loadScript(String path, ODatabaseSession session) {
             throw new RuntimeException("Error while executing init script: " + scriptPath, e);
         }
     }
-
 }
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index 60d7b172436..675218637ce 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -42,7 +42,6 @@ public void shouldInitializeWithCommands() {
 
     @Test
     public void shouldQueryWithGremlin() {
-
         try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)) {
             container.start();
 
@@ -52,17 +51,17 @@ public void shouldQueryWithGremlin() {
             session.command("INSERT INTO Person set name='john'");
             session.command("INSERT INTO Person set name='jane'");
 
-            assertThat(session.execute("gremlin",
-                "g.V().hasLabel('Person')").stream()).hasSize(2);
+            assertThat(session.execute("gremlin", "g.V().hasLabel('Person')").stream()).hasSize(2);
         }
     }
 
     @Test
     public void shouldInitializeDatabaseFromScript() {
-        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)
-            .withScriptPath("initscript.osql")
-            .withDatabaseName("persons")) {
-
+        try (
+            OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)
+                .withScriptPath("initscript.osql")
+                .withDatabaseName("persons")
+        ) {
             container.start();
 
             assertThat(container.getDbUrl())
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
index e41a349365c..0c30ebbb246 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgisContainerProvider.java
@@ -9,11 +9,16 @@
 public class PostgisContainerProvider extends JdbcDatabaseContainerProvider {
 
     private static final String NAME = "postgis";
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("postgis/postgis").asCompatibleSubstituteFor("postgres");
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName
+        .parse("postgis/postgis")
+        .asCompatibleSubstituteFor("postgres");
+
     private static final String DEFAULT_TAG = "12-3.0";
+
     public static final String USER_PARAM = "user";
-    public static final String PASSWORD_PARAM = "password";
 
+    public static final String PASSWORD_PARAM = "password";
 
     @Override
     public boolean supports(String databaseType) {
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 741a8c4139a..3b36b61ea77 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -5,19 +5,21 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
 import java.util.Set;
 
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static java.util.Collections.singleton;
-
 /**
  * @author richardnorth
  */
 public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
+
     public static final String NAME = "postgresql";
+
     public static final String IMAGE = "postgres";
 
     public static final String DEFAULT_TAG = "9.6.12";
+
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("postgres");
 
     public static final Integer POSTGRESQL_PORT = 5432;
@@ -27,7 +29,9 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
     static final String DEFAULT_PASSWORD = "test";
 
     private String databaseName = "test";
+
     private String username = "test";
+
     private String password = "test";
 
     private static final String FSYNC_OFF_OPTION = "fsync=off";
@@ -46,13 +50,13 @@ public PostgreSQLContainer(final String dockerImageName) {
 
     public PostgreSQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.waitStrategy = new LogMessageWaitStrategy()
+        this.waitStrategy =
+            new LogMessageWaitStrategy()
                 .withRegEx(".*database system is ready to accept connections.*\\s")
                 .withTimes(2)
-                .withStartupTimeout(Duration.of(60, SECONDS));
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
         this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
 
         addExposedPort(POSTGRESQL_PORT);
@@ -61,7 +65,7 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) {
     @NotNull
     @Override
     protected Set<Integer> getLivenessCheckPorts() {
-        return singleton(getMappedPort(POSTGRESQL_PORT));
+        return Collections.singleton(getMappedPort(POSTGRESQL_PORT));
     }
 
     @Override
@@ -81,8 +85,15 @@ public String getDriverClassName() {
     @Override
     public String getJdbcUrl() {
         String additionalUrlParams = constructUrlParameters("?", "&");
-        return "jdbc:postgresql://" + getHost() + ":" + getMappedPort(POSTGRESQL_PORT)
-            + "/" + databaseName + additionalUrlParams;
+        return (
+            "jdbc:postgresql://" +
+            getHost() +
+            ":" +
+            getMappedPort(POSTGRESQL_PORT) +
+            "/" +
+            databaseName +
+            additionalUrlParams
+        );
     }
 
     @Override
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
index 5e7580c75eb..de98885510c 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainerProvider.java
@@ -9,6 +9,7 @@
 public class PostgreSQLContainerProvider extends JdbcDatabaseContainerProvider {
 
     public static final String USER_PARAM = "user";
+
     public static final String PASSWORD_PARAM = "password";
 
     @Override
@@ -30,5 +31,4 @@ public JdbcDatabaseContainer newInstance(String tag) {
     public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
         return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
     }
-
 }
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
index 88b5497f5d3..d2b933694c7 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainer.java
@@ -13,7 +13,8 @@ public final class PostgreSQLR2DBCDatabaseContainer implements R2DBCDatabaseCont
     private final PostgreSQLContainer<?> container;
 
     public static ConnectionFactoryOptions getOptions(PostgreSQLContainer<?> container) {
-        ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
             .option(ConnectionFactoryOptions.DRIVER, PostgreSQLR2DBCDatabaseContainerProvider.DRIVER)
             .build();
 
@@ -22,7 +23,8 @@ public static ConnectionFactoryOptions getOptions(PostgreSQLContainer<?> contain
 
     @Override
     public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
-        return options.mutate()
+        return options
+            .mutate()
             .option(ConnectionFactoryOptions.HOST, container.getHost())
             .option(ConnectionFactoryOptions.PORT, container.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT))
             .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java
index c9b81fccfe4..86fcca2c039 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/TimescaleDBContainerProvider.java
@@ -11,11 +11,16 @@
 public class TimescaleDBContainerProvider extends JdbcDatabaseContainerProvider {
 
     private static final String NAME = "timescaledb";
+
     private static final String DEFAULT_TAG = "2.1.0-pg11";
-    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("timescale/timescaledb").asCompatibleSubstituteFor("postgres");
+
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName
+        .parse("timescale/timescaledb")
+        .asCompatibleSubstituteFor("postgres");
+
     public static final String USER_PARAM = "user";
-    public static final String PASSWORD_PARAM = "password";
 
+    public static final String PASSWORD_PARAM = "password";
 
     @Override
     public boolean supports(String databaseType) {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index c18f19a109e..3be7685ea27 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -16,7 +16,10 @@ public void shouldCorrectlyAppendQueryString() {
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
-        assertTrue("Query String contains expected params", queryString.contains("?stringtype=unspecified&stringtype=unspecified"));
+        assertTrue(
+            "Query String contains expected params",
+            queryString.contains("?stringtype=unspecified&stringtype=unspecified")
+        );
         assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
         assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
     }
@@ -27,7 +30,10 @@ public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
-        assertTrue("Query String contains expected params", queryString.contains("?stringtype=unspecified&stringtype=unspecified"));
+        assertTrue(
+            "Query String contains expected params",
+            queryString.contains("?stringtype=unspecified&stringtype=unspecified")
+        );
         assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
         assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
     }
@@ -42,11 +48,15 @@ public void shouldReturnOriginalURLWhenEmptyQueryString() {
 
     @Test
     public void shouldRejectInvalidQueryString() {
-        assertThrows("Fails when invalid query string provided", IllegalArgumentException.class,
-            () -> new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified"));
+        assertThrows(
+            "Fails when invalid query string provided",
+            IllegalArgumentException.class,
+            () -> new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified")
+        );
     }
 
     static class FixedJdbcUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
+
         public FixedJdbcUrlPostgreSQLContainer() {
             super(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);
         }
@@ -63,6 +73,7 @@ public Integer getMappedPort(int originalPort) {
     }
 
     static class NoParamsUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
+
         public NoParamsUrlPostgreSQLContainer() {
             super(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);
         }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
index 46e439aaf66..fb503bfd659 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java
@@ -13,11 +13,13 @@ protected PostgreSQLContainer<?> createContainer() {
 
     @Override
     protected ConnectionFactoryOptions getOptions(PostgreSQLContainer<?> container) {
+        // spotless:off
         // get_options {
         ConnectionFactoryOptions options = PostgreSQLR2DBCDatabaseContainer.getOptions(
             container
         );
         // }
+        // spotless:on
 
         return options;
     }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
index f3c73a4111b..74d60b2d32d 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
@@ -24,10 +24,17 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testCommandOverride() throws SQLException {
-        try (GenericContainer<?> postgres = new TimescaleDBContainerProvider().newInstance().withCommand("postgres -c max_connections=42")) {
+        try (
+            GenericContainer<?> postgres = new TimescaleDBContainerProvider()
+                .newInstance()
+                .withCommand("postgres -c max_connections=42")
+        ) {
             postgres.start();
 
-            ResultSet resultSet = performQuery((JdbcDatabaseContainer<?>) postgres, "SELECT current_setting('max_connections')");
+            ResultSet resultSet = performQuery(
+                (JdbcDatabaseContainer<?>) postgres,
+                "SELECT current_setting('max_connections')"
+            );
             String result = resultSet.getString(1);
             assertEquals("max_connections should be overriden", "42", result);
         }
@@ -35,10 +42,18 @@ public void testCommandOverride() throws SQLException {
 
     @Test
     public void testUnsetCommand() throws SQLException {
-        try (GenericContainer<?> postgres = new TimescaleDBContainerProvider().newInstance().withCommand("postgres -c max_connections=42").withCommand()) {
+        try (
+            GenericContainer<?> postgres = new TimescaleDBContainerProvider()
+                .newInstance()
+                .withCommand("postgres -c max_connections=42")
+                .withCommand()
+        ) {
             postgres.start();
 
-            ResultSet resultSet = performQuery((JdbcDatabaseContainer<?>) postgres, "SELECT current_setting('max_connections')");
+            ResultSet resultSet = performQuery(
+                (JdbcDatabaseContainer<?>) postgres,
+                "SELECT current_setting('max_connections')"
+            );
             String result = resultSet.getString(1);
             assertNotEquals("max_connections should not be overriden", "42", result);
         }
@@ -46,7 +61,11 @@ public void testUnsetCommand() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider().newInstance().withInitScript("somepath/init_timescaledb.sql")) {
+        try (
+            JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider()
+                .newInstance()
+                .withInitScript("somepath/init_timescaledb.sql")
+        ) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
index 9e3e0b03413..5acbd875c23 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
@@ -19,6 +19,7 @@
  * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
 public class DatabaseDriverShutdownTest {
+
     @AfterClass
     public static void testCleanup() {
         ContainerDatabaseDriver.killContainers();
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index a2b1fd5da8b..4c8d6afeef0 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -22,7 +22,6 @@ public class DatabaseDriverTmpfsTest {
     public void testDatabaseHasTmpFsViaConnectionString() throws Exception {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
         try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
-
             JdbcDatabaseContainer<?> container = ContainerDatabaseDriver.getContainer(jdbcUrl);
             // check file doesn't exist
             String path = "/testtmpfs/test.file";
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
index b1d01441016..abc0a3b76bc 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
@@ -4,19 +4,25 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class PostgisJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:postgis://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-                {"jdbc:tc:postgis:9.6-2.5://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-            });
+        return Arrays.asList(
+            new Object[][] {
+                {
+                    "jdbc:tc:postgis://hostname/databasename?user=someuser&password=somepwd",
+                    EnumSet.of(Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:postgis:9.6-2.5://hostname/databasename?user=someuser&password=somepwd",
+                    EnumSet.of(Options.JDBCParams),
+                },
+            }
+        );
     }
 }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
index c63eb9ffb9d..d42f17f3ec2 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
@@ -4,18 +4,21 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class PostgreSQLJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:postgresql:9.6.8://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-            });
+        return Arrays.asList(
+            new Object[][] {
+                {
+                    "jdbc:tc:postgresql:9.6.8://hostname/databasename?user=someuser&password=somepwd",
+                    EnumSet.of(Options.JDBCParams),
+                },
+            }
+        );
     }
 }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
index 8a6eaa3d04b..2a50b46c901 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
@@ -4,19 +4,25 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class TimescaleDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:timescaledb://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-                {"jdbc:tc:timescaledb:2.1.0-pg13://hostname/databasename?user=someuser&password=somepwd", EnumSet.of(Options.JDBCParams)},
-            });
+        return Arrays.asList(
+            new Object[][] {
+                {
+                    "jdbc:tc:timescaledb://hostname/databasename?user=someuser&password=somepwd",
+                    EnumSet.of(Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:timescaledb:2.1.0-pg13://hostname/databasename?user=someuser&password=somepwd",
+                    EnumSet.of(Options.JDBCParams),
+                },
+            }
+        );
     }
 }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
index 8fd523434dd..1b256c0fd6b 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
@@ -14,17 +14,21 @@
  * @author richardnorth
  */
 public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
+
     private static final String DB_NAME = "foo";
+
     private static final String USER = "bar";
+
     private static final String PWD = "baz";
 
     @Test
     public void testSimple() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+        try (
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withDatabaseName(DB_NAME)
                 .withUsername(USER)
-                .withPassword(PWD)) {
-
+                .withPassword(PWD)
+        ) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 95e1fdf10fd..2a0dd351ad6 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit.postgresql;
 
 import org.junit.Test;
+import org.testcontainers.PostgreSQLTestImages;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -9,14 +10,12 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
-import static org.testcontainers.PostgreSQLTestImages.POSTGRES_TEST_IMAGE;
 
 public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
-
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
@@ -24,7 +23,7 @@ public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE)) {
+        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
@@ -35,7 +34,10 @@ public void testSimple() throws SQLException {
 
     @Test
     public void testCommandOverride() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE).withCommand("postgres -c max_connections=42")) {
+        try (
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+                .withCommand("postgres -c max_connections=42")
+        ) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
@@ -46,7 +48,11 @@ public void testCommandOverride() throws SQLException {
 
     @Test
     public void testUnsetCommand() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE).withCommand("postgres -c max_connections=42").withCommand()) {
+        try (
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+                .withCommand("postgres -c max_connections=42")
+                .withCommand()
+        ) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
@@ -57,7 +63,10 @@ public void testUnsetCommand() throws SQLException {
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE).withInitScript("somepath/init_postgresql.sql")) {
+        try (
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+                .withInitScript("somepath/init_postgresql.sql")
+        ) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
@@ -69,9 +78,10 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(POSTGRES_TEST_IMAGE)
-            .withUrlParam("charSet", "UNICODE")) {
-
+        try (
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+                .withUrlParam("charSet", "UNICODE")
+        ) {
             postgres.start();
             String jdbcUrl = postgres.getJdbcUrl();
             assertThat(jdbcUrl, containsString("?"));
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 30d77c1a469..e73f6cc0f6b 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import com.google.common.base.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
@@ -7,26 +8,28 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.google.common.base.Strings.nullToEmpty;
-import static java.lang.String.format;
-import static java.time.temporal.ChronoUnit.SECONDS;
-
 /**
  * @deprecated Use {@code TrinoContainer} instead.
  */
 @Deprecated
 public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
+
     public static final String NAME = "presto";
+
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/trinodb/presto");
+
     public static final String IMAGE = "ghcr.io/trinodb/presto";
+
     public static final String DEFAULT_TAG = "344";
 
     public static final Integer PRESTO_PORT = 8080;
 
     private String username = "test";
+
     private String catalog = null;
 
     /**
@@ -43,12 +46,12 @@ public PrestoContainer(final String dockerImageName) {
 
     public PrestoContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.waitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(".*======== SERVER STARTED ========.*")
-            .withStartupTimeout(Duration.of(60, SECONDS));
+        this.waitStrategy =
+            new LogMessageWaitStrategy()
+                .withRegEx(".*======== SERVER STARTED ========.*")
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
 
         addExposedPort(PRESTO_PORT);
     }
@@ -66,7 +69,12 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return format("jdbc:presto://%s:%s/%s", getHost(), getMappedPort(PRESTO_PORT), nullToEmpty(catalog));
+        return String.format(
+            "jdbc:presto://%s:%s/%s",
+            getHost(),
+            getMappedPort(PRESTO_PORT),
+            Strings.nullToEmpty(catalog)
+        );
     }
 
     @Override
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
index 8408aab4517..f37efb9438e 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainerProvider.java
@@ -9,6 +9,7 @@
 public class PrestoContainerProvider extends JdbcDatabaseContainerProvider {
 
     public static final String USER_PARAM = "user";
+
     public static final String PASSWORD_PARAM = "password";
 
     @Override
@@ -30,5 +31,4 @@ public JdbcDatabaseContainer newInstance(String tag) {
     public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
         return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
     }
-
 }
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
index d5a4d9587a6..a54108ea1a2 100644
--- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -3,7 +3,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.testcontainers.PrestoTestImages;
-import org.testcontainers.utility.DockerImageName;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -14,8 +13,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static java.lang.Integer.parseInt;
-import static java.lang.String.format;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -29,9 +26,11 @@ public class PrestoContainerTest {
     public void testSimple() throws Exception {
         try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.start();
-            try (Connection connection = prestoSql.createConnection();
-                 Statement statement = connection.createStatement();
-                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+            try (
+                Connection connection = prestoSql.createConnection();
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
+            ) {
                 assertTrue("No result", resultSet.next());
                 assertEquals("Presto version", PrestoContainer.DEFAULT_TAG, resultSet.getString("node_version"));
             }
@@ -40,13 +39,21 @@ public void testSimple() throws Exception {
 
     @Test
     public void testSpecificVersion() throws Exception {
-        try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE)) {
+        try (
+            PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE)
+        ) {
             prestoSql.start();
-            try (Connection connection = prestoSql.createConnection();
-                 Statement statement = connection.createStatement();
-                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+            try (
+                Connection connection = prestoSql.createConnection();
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
+            ) {
                 assertTrue("No result", resultSet.next());
-                assertEquals("Presto version", PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(), resultSet.getString("node_version"));
+                assertEquals(
+                    "Presto version",
+                    PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(),
+                    resultSet.getString("node_version")
+                );
             }
         }
     }
@@ -55,18 +62,26 @@ public void testSpecificVersion() throws Exception {
     public void testQueryMemoryAndTpch() throws SQLException {
         try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.start();
-            try (Connection connection = prestoSql.createConnection();
-                 Statement statement = connection.createStatement()) {
+            try (
+                Connection connection = prestoSql.createConnection();
+                Statement statement = connection.createStatement()
+            ) {
                 // Prepare data
-                statement.execute("CREATE TABLE memory.default.table_with_array AS SELECT 1 id, ARRAY[1, 42, 2, 42, 4, 42] my_array");
+                statement.execute(
+                    "CREATE TABLE memory.default.table_with_array AS SELECT 1 id, ARRAY[1, 42, 2, 42, 4, 42] my_array"
+                );
 
                 // Query Presto using newly created table and a builtin connector
-                try (ResultSet resultSet = statement.executeQuery("" +
-                    "SELECT nationkey, element " +
-                    "FROM tpch.tiny.nation " +
-                    "JOIN memory.default.table_with_array twa ON nationkey = twa.id " +
-                    "LEFT JOIN UNNEST(my_array) a(element) ON true " +
-                    "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES ")) {
+                try (
+                    ResultSet resultSet = statement.executeQuery(
+                        "" +
+                        "SELECT nationkey, element " +
+                        "FROM tpch.tiny.nation " +
+                        "JOIN memory.default.table_with_array twa ON nationkey = twa.id " +
+                        "LEFT JOIN UNNEST(my_array) a(element) ON true " +
+                        "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES "
+                    )
+                ) {
                     List<Integer> actualElements = new ArrayList<>();
                     while (resultSet.next()) {
                         actualElements.add(resultSet.getInt("element"));
@@ -82,9 +97,11 @@ public void testInitScript() throws Exception {
         try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.withInitScript("initial.sql");
             prestoSql.start();
-            try (Connection connection = prestoSql.createConnection();
-                 Statement statement = connection.createStatement();
-                 ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")) {
+            try (
+                Connection connection = prestoSql.createConnection();
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")
+            ) {
                 assertTrue("No result", resultSet.next());
                 assertEquals("Value", 12345678909324L, resultSet.getObject("a"));
                 assertFalse("Too many result", resultSet.next());
@@ -94,19 +111,38 @@ public void testInitScript() throws Exception {
 
     @Test
     public void testTcJdbcUri() throws Exception {
-        try (Connection connection = DriverManager.getConnection(format("jdbc:tc:presto:%s://hostname/", PrestoContainer.DEFAULT_TAG))) {
+        try (
+            Connection connection = DriverManager.getConnection(
+                String.format("jdbc:tc:presto:%s://hostname/", PrestoContainer.DEFAULT_TAG)
+            )
+        ) {
             // Verify metadata with tc: JDBC connection URI
-            assertEquals(connection.getMetaData().getDatabaseMajorVersion(), parseInt(PrestoContainer.DEFAULT_TAG));
+            assertEquals(
+                connection.getMetaData().getDatabaseMajorVersion(),
+                Integer.parseInt(PrestoContainer.DEFAULT_TAG)
+            );
 
             // Verify transactions with tc: JDBC connection URI
             assertTrue("Is autocommit", connection.getAutoCommit());
             connection.setAutoCommit(false);
             assertFalse("Is autocommit", connection.getAutoCommit());
-            assertEquals("Transaction isolation", Connection.TRANSACTION_READ_UNCOMMITTED, connection.getTransactionIsolation());
+            assertEquals(
+                "Transaction isolation",
+                Connection.TRANSACTION_READ_UNCOMMITTED,
+                connection.getTransactionIsolation()
+            );
 
             try (Statement statement = connection.createStatement()) {
-                assertEquals("Update result", 0, statement.executeUpdate("CREATE TABLE memory.default.test_tc(a bigint)"));
-                try (ResultSet resultSet = statement.executeQuery("SELECT sum(cast(node_version AS bigint)) AS v FROM system.runtime.nodes")) {
+                assertEquals(
+                    "Update result",
+                    0,
+                    statement.executeUpdate("CREATE TABLE memory.default.test_tc(a bigint)")
+                );
+                try (
+                    ResultSet resultSet = statement.executeQuery(
+                        "SELECT sum(cast(node_version AS bigint)) AS v FROM system.runtime.nodes"
+                    )
+                ) {
                     assertTrue(resultSet.next());
                     assertEquals(PrestoContainer.DEFAULT_TAG, resultSet.getString("v"));
                     assertFalse(resultSet.next());
@@ -117,7 +153,11 @@ public void testTcJdbcUri() throws Exception {
             }
             connection.setAutoCommit(true);
             assertTrue("Is autocommit", connection.getAutoCommit());
-            assertEquals("Transaction isolation should be retained", Connection.TRANSACTION_READ_UNCOMMITTED, connection.getTransactionIsolation());
+            assertEquals(
+                "Transaction isolation should be retained",
+                Connection.TRANSACTION_READ_UNCOMMITTED,
+                connection.getTransactionIsolation()
+            );
         }
     }
 }
diff --git a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
index d1a64c92aaa..9c5dd712104 100644
--- a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
@@ -4,18 +4,18 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class PrestoJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:presto:344://hostname/", EnumSet.of(Options.PmdKnownBroken)},
-            });
+        return Arrays.asList(
+            new Object[][] { //
+                { "jdbc:tc:presto:344://hostname/", EnumSet.of(Options.PmdKnownBroken) },
+            }
+        );
     }
 }
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index b3c836b56a5..9b14e90d736 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -10,10 +10,13 @@
 public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     public static final int BROKER_PORT = 6650;
+
     public static final int BROKER_HTTP_PORT = 8080;
+
     public static final String METRICS_ENDPOINT = "/metrics";
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar");
+
     @Deprecated
     private static final String DEFAULT_TAG = "2.2.0";
 
@@ -37,7 +40,6 @@ public PulsarContainer(String pulsarVersion) {
 
     public PulsarContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DockerImageName.parse("apachepulsar/pulsar"));
 
         withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT);
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index f2354d98ef7..6d739dfbf98 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -18,6 +18,7 @@
 public class PulsarContainerTest {
 
     public static final String TEST_TOPIC = "test_topic";
+
     private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:2.2.0");
 
     @Test
@@ -33,9 +34,7 @@ public void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer("2.5.1")) {
             pulsar.start();
 
-            PulsarAdmin pulsarAdmin = PulsarAdmin.builder()
-                .serviceHttpUrl(pulsar.getHttpServiceUrl())
-                .build();
+            PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build();
 
             assertThatThrownBy(() -> pulsarAdmin.functions().getFunctions("public", "default"))
                 .isInstanceOf(PulsarAdminException.class);
@@ -47,36 +46,23 @@ public void shouldWaitForFunctionsWorkerStarted() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer("2.5.1").withFunctionsWorker()) {
             pulsar.start();
 
-            PulsarAdmin pulsarAdmin = PulsarAdmin.builder()
-                .serviceHttpUrl(pulsar.getHttpServiceUrl())
-                .build();
+            PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build();
 
             assertThat(pulsarAdmin.functions().getFunctions("public", "default")).hasSize(0);
         }
     }
 
     protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception {
-
         try (
-            PulsarClient client = PulsarClient.builder()
-                .serviceUrl(pulsarBrokerUrl)
-                .build();
-            Consumer consumer = client.newConsumer()
-                .topic(TEST_TOPIC)
-                .subscriptionName("test-subs")
-                .subscribe();
-            Producer<byte[]> producer = client.newProducer()
-                .topic(TEST_TOPIC)
-                .create()
+            PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).build();
+            Consumer consumer = client.newConsumer().topic(TEST_TOPIC).subscriptionName("test-subs").subscribe();
+            Producer<byte[]> producer = client.newProducer().topic(TEST_TOPIC).create()
         ) {
-
             producer.send("test containers".getBytes());
             CompletableFuture<Message> future = consumer.receiveAsync();
             Message message = future.get(5, TimeUnit.SECONDS);
 
-            assertThat(new String(message.getData()))
-                .isEqualTo("test containers");
+            assertThat(new String(message.getData())).isEqualTo("test containers");
         }
     }
-
 }
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java
index e64d19a9f49..3f4fd7e4b1e 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/CancellableSubscription.java
@@ -9,8 +9,7 @@ class CancellableSubscription implements Subscription {
     private final AtomicBoolean cancelled = new AtomicBoolean();
 
     @Override
-    public void request(long n) {
-    }
+    public void request(long n) {}
 
     @Override
     public void cancel() {
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java
index 489d545429d..d1b1c0e43f3 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java
@@ -56,8 +56,8 @@ synchronized void transitionTo(SubscriptionState newState) {
         }
 
         abstract class SubscriptionState implements Subscription {
-            void enter() {
-            }
+
+            void enter() {}
         }
 
         class WaitRequestSubscriptionState extends SubscriptionState {
@@ -68,8 +68,7 @@ public void request(long n) {
             }
 
             @Override
-            public void cancel() {
-            }
+            public void cancel() {}
         }
 
         class WaitFutureCompletionSubscriptionState extends SubscriptionState {
@@ -93,8 +92,7 @@ void enter() {
             }
 
             @Override
-            public void request(long n) {
-            }
+            public void request(long n) {}
 
             @Override
             public void cancel() {
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java
index 7828d121c6f..5cd2ffbd894 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/EmptySubscription.java
@@ -6,12 +6,8 @@ enum EmptySubscription implements Subscription {
     INSTANCE;
 
     @Override
-    public void request(long n) {
-
-    }
+    public void request(long n) {}
 
     @Override
-    public void cancel() {
-
-    }
+    public void cancel() {}
 }
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
index f642a60d67c..1eecb22a2c7 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
@@ -52,7 +52,8 @@ private ConnectionFactoryOptions removeProxying(ConnectionFactoryOptions options
             // when protocol does NOT contain COLON, the length becomes 1
             String protocolDelegate = protocols.length == 2 ? protocols[1] : "";
 
-            return ConnectionFactoryOptions.builder()
+            return ConnectionFactoryOptions
+                .builder()
                 .from(options)
                 .option(ConnectionFactoryOptions.DRIVER, driverDelegate)
                 .option(ConnectionFactoryOptions.PROTOCOL, protocolDelegate)
@@ -68,6 +69,5 @@ public boolean supports(ConnectionFactoryOptions options) {
         public String getDriver() {
             return DRIVER;
         }
-
     }
 }
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java
index a303cbafff8..8bf0401fe69 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainer.java
@@ -4,6 +4,5 @@
 import org.testcontainers.lifecycle.Startable;
 
 public interface R2DBCDatabaseContainer extends Startable {
-
     ConnectionFactoryOptions configure(ConnectionFactoryOptions options);
 }
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
index 287407dc15e..9d3efc17ac7 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
@@ -9,7 +9,6 @@
 import javax.annotation.Nullable;
 
 public interface R2DBCDatabaseContainerProvider {
-
     Option<Boolean> REUSABLE_OPTION = Option.valueOf("TC_REUSABLE");
 
     Option<String> IMAGE_TAG_OPTION = Option.valueOf("TC_IMAGE_TAG");
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
index 691775a94f8..bada076eec9 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
@@ -36,34 +36,36 @@ class TestcontainersR2DBCConnectionFactory implements ConnectionFactory, Closeab
     TestcontainersR2DBCConnectionFactory(ConnectionFactoryOptions options) {
         this.options = options;
 
-        containerProvider = StreamSupport.stream(ServiceLoader.load(R2DBCDatabaseContainerProvider.class).spliterator(), false)
-            .filter(it -> it.supports(options))
-            .findAny()
-            .orElseThrow(() -> new IllegalArgumentException("Missing provider for " + options));
+        containerProvider =
+            StreamSupport
+                .stream(ServiceLoader.load(R2DBCDatabaseContainerProvider.class).spliterator(), false)
+                .filter(it -> it.supports(options))
+                .findAny()
+                .orElseThrow(() -> new IllegalArgumentException("Missing provider for " + options));
     }
 
     @Override
     public Publisher<? extends Connection> create() {
-        return new ConnectionPublisher(
-            () -> {
-                if (future == null) {
-                    synchronized (this) {
-                        if (future == null) {
-                            future = CompletableFuture.supplyAsync(() -> {
-                                R2DBCDatabaseContainer container = containerProvider.createContainer(options);
-                                container.start();
-                                return container;
-                            }, EXECUTOR);
-                        }
+        return new ConnectionPublisher(() -> {
+            if (future == null) {
+                synchronized (this) {
+                    if (future == null) {
+                        future =
+                            CompletableFuture.supplyAsync(
+                                () -> {
+                                    R2DBCDatabaseContainer container = containerProvider.createContainer(options);
+                                    container.start();
+                                    return container;
+                                },
+                                EXECUTOR
+                            );
                     }
                 }
-                return future.thenApply(it -> {
-                    return ConnectionFactories.find(
-                        it.configure(options)
-                    );
-                });
             }
-        );
+            return future.thenApply(it -> {
+                return ConnectionFactories.find(it.configure(options));
+            });
+        });
     }
 
     @Override
@@ -99,5 +101,4 @@ public Publisher<Void> close() {
             }
         };
     }
-
 }
diff --git a/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
index 6fad93f0e2a..3772e6d49a6 100644
--- a/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
+++ b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
@@ -48,16 +48,15 @@ public void reusesUntilConnectionFactoryIsClosed() {
 
         assertThat(updated).isEqualTo(1);
 
-        Flux<Long> select = Flux
-            .usingWhen(
-                Flux.defer(connectionFactory::create),
-                connection -> {
-                    return Flux
-                        .from(connection.createStatement("SELECT COUNT(*) FROM test").execute())
-                        .flatMap(it -> it.map((row, meta) -> (Long) row.get(0)));
-                },
-                Connection::close
-            );
+        Flux<Long> select = Flux.usingWhen(
+            Flux.defer(connectionFactory::create),
+            connection -> {
+                return Flux
+                    .from(connection.createStatement("SELECT COUNT(*) FROM test").execute())
+                    .flatMap(it -> it.map((row, meta) -> (Long) row.get(0)));
+            },
+            Connection::close
+        );
 
         Long rows = select.blockFirst();
 
diff --git a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
index c21c7078410..63603379e40 100644
--- a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
+++ b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
@@ -60,9 +60,7 @@ protected void runTestQuery(ConnectionFactory connectionFactory) {
                 .flatMap(it -> it.map((row, meta) -> (Number) row.get(0)))
                 .blockFirst();
 
-            assertThat(result)
-                .isNotNull()
-                .returns(expected, Number::intValue);
+            assertThat(result).isNotNull().returns(expected, Number::intValue);
         } finally {
             if (connectionFactory instanceof Closeable) {
                 Mono.from(((Closeable) connectionFactory).close()).block();
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index f5c63a267a9..c13dfdf1a24 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -11,13 +11,11 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static java.lang.String.join;
-import static java.util.Arrays.asList;
-
 /**
  * Testcontainer for RabbitMQ.
  *
@@ -29,15 +27,21 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
      * The image defaults to the official RabbitmQ image: <a href="https://hub.docker.com/_/rabbitmq/">RabbitMQ</a>.
      */
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("rabbitmq");
+
     private static final String DEFAULT_TAG = "3.7.25-management-alpine";
 
     private static final int DEFAULT_AMQP_PORT = 5672;
+
     private static final int DEFAULT_AMQPS_PORT = 5671;
+
     private static final int DEFAULT_HTTPS_PORT = 15671;
+
     private static final int DEFAULT_HTTP_PORT = 15672;
 
     private String adminPassword = "guest";
+
     private String adminUsername = "guest";
+
     private final List<List<String>> values = new ArrayList<>();
 
     /**
@@ -60,14 +64,12 @@ public RabbitMQContainer(String dockerImageName) {
 
     public RabbitMQContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPorts(DEFAULT_AMQP_PORT, DEFAULT_AMQPS_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
 
-        this.waitStrategy = Wait.
-                forLogMessage(".*Server startup complete.*", 1)
-                .withStartupTimeout(Duration.ofSeconds(60));
+        this.waitStrategy =
+            Wait.forLogMessage(".*Server startup complete.*", 1).withStartupTimeout(Duration.ofSeconds(60));
     }
 
     @Override
@@ -79,7 +81,6 @@ protected void configure() {
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
-
         values.forEach(command -> {
             try {
                 ExecResult execResult = execInContainer(command.toArray(new String[0]));
@@ -159,257 +160,394 @@ public RabbitMQContainer withAdminPassword(final String adminPassword) {
     }
 
     public enum SslVerification {
-        VERIFY_NONE("verify_none"), VERIFY_PEER("verify_peer");
+        VERIFY_NONE("verify_none"),
+        VERIFY_PEER("verify_peer");
 
         SslVerification(String value) {
             this.value = value;
         }
-        private final String value;
 
+        private final String value;
     }
 
     public RabbitMQContainer withSSL(
-            final MountableFile keyFile,
-            final MountableFile certFile,
-            final MountableFile caFile,
-            final SslVerification verify,
-            boolean failIfNoCert,
-            int verificationDepth) {
-
+        final MountableFile keyFile,
+        final MountableFile certFile,
+        final MountableFile caFile,
+        final SslVerification verify,
+        boolean failIfNoCert,
+        int verificationDepth
+    ) {
         return withSSL(keyFile, certFile, caFile, verify, failIfNoCert)
-                .withEnv("RABBITMQ_SSL_DEPTH", String.valueOf(verificationDepth));
+            .withEnv("RABBITMQ_SSL_DEPTH", String.valueOf(verificationDepth));
     }
 
     public RabbitMQContainer withSSL(
-            final MountableFile keyFile,
-            final MountableFile certFile,
-            final MountableFile caFile,
-            final SslVerification verify,
-            boolean failIfNoCert) {
-
+        final MountableFile keyFile,
+        final MountableFile certFile,
+        final MountableFile caFile,
+        final SslVerification verify,
+        boolean failIfNoCert
+    ) {
         return withSSL(keyFile, certFile, caFile, verify)
-                .withEnv("RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT", String.valueOf(failIfNoCert));
+            .withEnv("RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT", String.valueOf(failIfNoCert));
     }
 
     public RabbitMQContainer withSSL(
-            final MountableFile keyFile,
-            final MountableFile certFile,
-            final MountableFile caFile,
-            final SslVerification verify) {
-
+        final MountableFile keyFile,
+        final MountableFile certFile,
+        final MountableFile caFile,
+        final SslVerification verify
+    ) {
         return withEnv("RABBITMQ_SSL_CACERTFILE", "/etc/rabbitmq/ca_cert.pem")
-                .withEnv("RABBITMQ_SSL_CERTFILE", "/etc/rabbitmq/rabbitmq_cert.pem")
-                .withEnv("RABBITMQ_SSL_KEYFILE", "/etc/rabbitmq/rabbitmq_key.pem")
-                .withEnv("RABBITMQ_SSL_VERIFY", verify.value)
-                .withCopyFileToContainer(certFile, "/etc/rabbitmq/rabbitmq_cert.pem")
-                .withCopyFileToContainer(caFile, "/etc/rabbitmq/ca_cert.pem")
-                .withCopyFileToContainer(keyFile, "/etc/rabbitmq/rabbitmq_key.pem");
+            .withEnv("RABBITMQ_SSL_CERTFILE", "/etc/rabbitmq/rabbitmq_cert.pem")
+            .withEnv("RABBITMQ_SSL_KEYFILE", "/etc/rabbitmq/rabbitmq_key.pem")
+            .withEnv("RABBITMQ_SSL_VERIFY", verify.value)
+            .withCopyFileToContainer(certFile, "/etc/rabbitmq/rabbitmq_cert.pem")
+            .withCopyFileToContainer(caFile, "/etc/rabbitmq/ca_cert.pem")
+            .withCopyFileToContainer(keyFile, "/etc/rabbitmq/rabbitmq_key.pem");
     }
 
     public RabbitMQContainer withPluginsEnabled(String... pluginNames) {
-        List<String> command = new ArrayList<>(asList("rabbitmq-plugins", "enable"));
-        command.addAll(asList(pluginNames));
+        List<String> command = new ArrayList<>(Arrays.asList("rabbitmq-plugins", "enable"));
+        command.addAll(Arrays.asList(pluginNames));
         values.add(command);
         return self();
     }
 
     public RabbitMQContainer withBinding(String source, String destination) {
-        values.add(asList("rabbitmqadmin", "declare", "binding",
-                "source=" + source,
-                "destination=" + destination));
+        values.add(
+            Arrays.asList("rabbitmqadmin", "declare", "binding", "source=" + source, "destination=" + destination)
+        );
         return self();
     }
 
     public RabbitMQContainer withBinding(String vhost, String source, String destination) {
-        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "binding",
-            "source=" + source,
-            "destination=" + destination));
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "--vhost=" + vhost,
+                "declare",
+                "binding",
+                "source=" + source,
+                "destination=" + destination
+            )
+        );
         return self();
     }
 
-    public RabbitMQContainer withBinding(String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
-        values.add(asList("rabbitmqadmin", "declare", "binding",
-            "source=" + source,
-            "destination=" + destination,
-            "routing_key=" + routingKey,
-            "destination_type=" + destinationType,
-            "arguments=" + toJson(arguments)));
+    public RabbitMQContainer withBinding(
+        String source,
+        String destination,
+        Map<String, Object> arguments,
+        String routingKey,
+        String destinationType
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "binding",
+                "source=" + source,
+                "destination=" + destination,
+                "routing_key=" + routingKey,
+                "destination_type=" + destinationType,
+                "arguments=" + toJson(arguments)
+            )
+        );
         return self();
     }
 
-    public RabbitMQContainer withBinding(String vhost, String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
-        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "binding",
+    public RabbitMQContainer withBinding(
+        String vhost,
+        String source,
+        String destination,
+        Map<String, Object> arguments,
+        String routingKey,
+        String destinationType
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "--vhost=" + vhost,
+                "declare",
+                "binding",
                 "source=" + source,
                 "destination=" + destination,
                 "routing_key=" + routingKey,
                 "destination_type=" + destinationType,
-                "arguments=" + toJson(arguments)));
+                "arguments=" + toJson(arguments)
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withParameter(String component, String name, String value) {
-        values.add(asList("rabbitmqadmin", "declare", "parameter",
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "parameter",
                 "component=" + component,
                 "name=" + name,
-                "value=" + value));
+                "value=" + value
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withPermission(String vhost, String user, String configure, String write, String read) {
-        values.add(asList("rabbitmqadmin", "declare", "permission",
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "permission",
                 "vhost=" + vhost,
                 "user=" + user,
                 "configure=" + configure,
                 "write=" + write,
-                "read=" + read));
+                "read=" + read
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withUser(String name, String password) {
-        values.add(asList("rabbitmqadmin", "declare", "user",
-                "name=" + name,
-                "password=" + password,
-                "tags="));
+        values.add(Arrays.asList("rabbitmqadmin", "declare", "user", "name=" + name, "password=" + password, "tags="));
         return self();
     }
 
     public RabbitMQContainer withUser(String name, String password, Set<String> tags) {
-        values.add(asList("rabbitmqadmin", "declare", "user",
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "user",
                 "name=" + name,
                 "password=" + password,
-                "tags=" + join(",", tags)));
+                "tags=" + String.join(",", tags)
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Object> definition) {
-        values.add(asList("rabbitmqadmin", "declare", "policy",
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "policy",
                 "name=" + name,
                 "pattern=" + pattern,
-                "definition=" + toJson(definition)));
+                "definition=" + toJson(definition)
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withPolicy(String vhost, String name, String pattern, Map<String, Object> definition) {
-        values.add(asList("rabbitmqadmin", "declare", "policy",
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "policy",
                 "--vhost=" + vhost,
                 "name=" + name,
                 "pattern=" + pattern,
-                "definition=" + toJson(definition)));
+                "definition=" + toJson(definition)
+            )
+        );
         return self();
     }
 
-    public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Object> definition, int priority, String applyTo) {
-        values.add(asList("rabbitmqadmin", "declare", "policy",
+    public RabbitMQContainer withPolicy(
+        String name,
+        String pattern,
+        Map<String, Object> definition,
+        int priority,
+        String applyTo
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "policy",
                 "name=" + name,
                 "pattern=" + pattern,
                 "priority=" + priority,
                 "apply-to=" + applyTo,
-                "definition=" + toJson(definition)));
+                "definition=" + toJson(definition)
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withOperatorPolicy(String name, String pattern, Map<String, Object> definition) {
-        values.add(new ArrayList<>(asList("rabbitmqadmin", "declare", "operator_policy",
-                "name=" + name,
-                "pattern=" + pattern,
-                "definition=" + toJson(definition))));
+        values.add(
+            new ArrayList<>(
+                Arrays.asList(
+                    "rabbitmqadmin",
+                    "declare",
+                    "operator_policy",
+                    "name=" + name,
+                    "pattern=" + pattern,
+                    "definition=" + toJson(definition)
+                )
+            )
+        );
         return self();
     }
 
-    public RabbitMQContainer withOperatorPolicy(String name, String pattern, Map<String, Object> definition, int priority, String applyTo) {
-        values.add(asList("rabbitmqadmin", "declare", "operator_policy",
+    public RabbitMQContainer withOperatorPolicy(
+        String name,
+        String pattern,
+        Map<String, Object> definition,
+        int priority,
+        String applyTo
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "operator_policy",
                 "name=" + name,
                 "pattern=" + pattern,
                 "priority=" + priority,
                 "apply-to=" + applyTo,
-                "definition=" + toJson(definition)));
+                "definition=" + toJson(definition)
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withVhost(String name) {
-        values.add(asList("rabbitmqadmin", "declare", "vhost",
-                "name=" + name));
+        values.add(Arrays.asList("rabbitmqadmin", "declare", "vhost", "name=" + name));
         return self();
     }
 
     public RabbitMQContainer withVhost(String name, boolean tracing) {
-        values.add(asList("rabbitmqadmin", "declare", "vhost",
-                "name=" + name,
-                "tracing=" + tracing));
+        values.add(Arrays.asList("rabbitmqadmin", "declare", "vhost", "name=" + name, "tracing=" + tracing));
         return self();
     }
 
     public RabbitMQContainer withVhostLimit(String vhost, String name, int value) {
-        values.add(asList("rabbitmqadmin", "declare", "vhost_limit",
-                "vhost=" + vhost,
-                "name=" + name,
-                "value=" + value));
+        values.add(
+            Arrays.asList("rabbitmqadmin", "declare", "vhost_limit", "vhost=" + vhost, "name=" + name, "value=" + value)
+        );
         return self();
     }
 
     public RabbitMQContainer withQueue(String name) {
-        values.add(asList("rabbitmqadmin", "declare", "queue",
-            "name=" + name));
+        values.add(Arrays.asList("rabbitmqadmin", "declare", "queue", "name=" + name));
         return self();
     }
 
     public RabbitMQContainer withQueue(String vhost, String name) {
-        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue",
-                "name=" + name));
+        values.add(Arrays.asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue", "name=" + name));
         return self();
     }
 
-    public RabbitMQContainer withQueue(String name, boolean autoDelete, boolean durable, Map<String, Object> arguments) {
-        values.add(asList("rabbitmqadmin", "declare", "queue",
+    public RabbitMQContainer withQueue(
+        String name,
+        boolean autoDelete,
+        boolean durable,
+        Map<String, Object> arguments
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "queue",
                 "name=" + name,
                 "auto_delete=" + autoDelete,
                 "durable=" + durable,
-                "arguments=" + toJson(arguments)));
+                "arguments=" + toJson(arguments)
+            )
+        );
         return self();
     }
 
-    public RabbitMQContainer withQueue(String vhost, String name, boolean autoDelete, boolean durable, Map<String, Object> arguments) {
-        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue",
-            "name=" + name,
-            "auto_delete=" + autoDelete,
-            "durable=" + durable,
-            "arguments=" + toJson(arguments)));
+    public RabbitMQContainer withQueue(
+        String vhost,
+        String name,
+        boolean autoDelete,
+        boolean durable,
+        Map<String, Object> arguments
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "--vhost=" + vhost,
+                "declare",
+                "queue",
+                "name=" + name,
+                "auto_delete=" + autoDelete,
+                "durable=" + durable,
+                "arguments=" + toJson(arguments)
+            )
+        );
         return self();
     }
 
     public RabbitMQContainer withExchange(String name, String type) {
-        values.add(asList("rabbitmqadmin", "declare", "exchange",
-                "name=" + name,
-                "type=" + type));
+        values.add(Arrays.asList("rabbitmqadmin", "declare", "exchange", "name=" + name, "type=" + type));
         return self();
     }
 
     public RabbitMQContainer withExchange(String vhost, String name, String type) {
-        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "exchange",
-            "name=" + name,
-            "type=" + type));
+        values.add(
+            Arrays.asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "exchange", "name=" + name, "type=" + type)
+        );
         return self();
     }
 
-    public RabbitMQContainer withExchange(String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
-        values.add(asList("rabbitmqadmin", "declare", "exchange",
-            "name=" + name,
-            "type=" + type,
-            "auto_delete=" + autoDelete,
-            "internal=" + internal,
-            "durable=" + durable,
-            "arguments=" + toJson(arguments)));
+    public RabbitMQContainer withExchange(
+        String name,
+        String type,
+        boolean autoDelete,
+        boolean internal,
+        boolean durable,
+        Map<String, Object> arguments
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "declare",
+                "exchange",
+                "name=" + name,
+                "type=" + type,
+                "auto_delete=" + autoDelete,
+                "internal=" + internal,
+                "durable=" + durable,
+                "arguments=" + toJson(arguments)
+            )
+        );
         return self();
     }
 
-    public RabbitMQContainer withExchange(String vhost, String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
-        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "exchange",
+    public RabbitMQContainer withExchange(
+        String vhost,
+        String name,
+        String type,
+        boolean autoDelete,
+        boolean internal,
+        boolean durable,
+        Map<String, Object> arguments
+    ) {
+        values.add(
+            Arrays.asList(
+                "rabbitmqadmin",
+                "--vhost=" + vhost,
+                "declare",
+                "exchange",
                 "name=" + name,
                 "type=" + type,
                 "auto_delete=" + autoDelete,
                 "internal=" + internal,
                 "durable=" + durable,
-                "arguments=" + toJson(arguments)));
+                "arguments=" + toJson(arguments)
+            )
+        );
         return self();
     }
 
@@ -420,7 +558,6 @@ public RabbitMQContainer withExchange(String vhost, String name, String type, bo
      * @return This container.
      */
     public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
-
         return withRabbitMQConfigSysctl(rabbitMQConf);
     }
 
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index d82051a94db..6bc935b4e6c 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -6,11 +6,9 @@
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import org.junit.Test;
+import org.testcontainers.containers.RabbitMQContainer.SslVerification;
 import org.testcontainers.utility.MountableFile;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -22,10 +20,12 @@
 import java.security.cert.CertificateException;
 import java.util.Collections;
 
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.testcontainers.containers.RabbitMQContainer.SslVerification.VERIFY_PEER;
-import static org.testcontainers.utility.MountableFile.forClasspathResource;
 
 /**
  * @author Martin Greber
@@ -33,46 +33,55 @@
 public class RabbitMQContainerTest {
 
     public static final int DEFAULT_AMQPS_PORT = 5671;
+
     public static final int DEFAULT_AMQP_PORT = 5672;
+
     public static final int DEFAULT_HTTPS_PORT = 15671;
+
     public static final int DEFAULT_HTTP_PORT = 15672;
 
     @Test
-    public void shouldCreateRabbitMQContainer()
-    {
+    public void shouldCreateRabbitMQContainer() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
             assertThat(container.getAdminPassword()).isEqualTo("guest");
             assertThat(container.getAdminUsername()).isEqualTo("guest");
 
             container.start();
 
-            assertThat(container.getAmqpsUrl()).isEqualTo(
-                String.format("amqps://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQPS_PORT)));
-            assertThat(container.getAmqpUrl()).isEqualTo(
-                String.format("amqp://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQP_PORT)));
-            assertThat(container.getHttpsUrl()).isEqualTo(
-                String.format("https://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTPS_PORT)));
-            assertThat(container.getHttpUrl()).isEqualTo(
-                String.format("http://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTP_PORT)));
+            assertThat(container.getAmqpsUrl())
+                .isEqualTo(
+                    String.format("amqps://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQPS_PORT))
+                );
+            assertThat(container.getAmqpUrl())
+                .isEqualTo(
+                    String.format("amqp://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQP_PORT))
+                );
+            assertThat(container.getHttpsUrl())
+                .isEqualTo(
+                    String.format("https://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTPS_PORT))
+                );
+            assertThat(container.getHttpUrl())
+                .isEqualTo(
+                    String.format("http://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTP_PORT))
+                );
 
             assertThat(container.getHttpsPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTPS_PORT));
             assertThat(container.getHttpPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTP_PORT));
             assertThat(container.getAmqpsPort()).isEqualTo(container.getMappedPort(DEFAULT_AMQPS_PORT));
             assertThat(container.getAmqpPort()).isEqualTo(container.getMappedPort(DEFAULT_AMQP_PORT));
 
-            assertThat(container.getLivenessCheckPortNumbers()).containsExactlyInAnyOrder(
-                container.getMappedPort(DEFAULT_AMQP_PORT),
-                container.getMappedPort(DEFAULT_AMQPS_PORT),
-                container.getMappedPort(DEFAULT_HTTP_PORT),
-                container.getMappedPort(DEFAULT_HTTPS_PORT)
-            );
+            assertThat(container.getLivenessCheckPortNumbers())
+                .containsExactlyInAnyOrder(
+                    container.getMappedPort(DEFAULT_AMQP_PORT),
+                    container.getMappedPort(DEFAULT_AMQPS_PORT),
+                    container.getMappedPort(DEFAULT_HTTP_PORT),
+                    container.getMappedPort(DEFAULT_HTTPS_PORT)
+                );
         }
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException
-    {
+    public void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withExchange("test-exchange", "direct");
 
@@ -84,11 +93,18 @@ public void shouldCreateRabbitMQContainerWithExchange() throws IOException, Inte
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOException, InterruptedException
-    {
+    public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withVhost("test-vhost");
-            container.withExchange("test-vhost", "test-exchange", "direct", false, false, false, Collections.emptyMap());
+            container.withExchange(
+                "test-vhost",
+                "test-exchange",
+                "direct",
+                false,
+                false,
+                false,
+                Collections.emptyMap()
+            );
 
             container.start();
 
@@ -98,11 +114,10 @@ public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOExceptio
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException
-    {
+    public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
-            container.withQueue("queue-one")
+            container
+                .withQueue("queue-one")
                 .withQueue("queue-two", false, true, ImmutableMap.of("x-message-ttl", 1000));
 
             container.start();
@@ -124,7 +139,6 @@ public void shouldMountConfigurationFile() {
         }
     }
 
-
     @Test
     public void shouldMountConfigurationFileErlang() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
@@ -135,7 +149,6 @@ public void shouldMountConfigurationFileErlang() {
         }
     }
 
-
     @Test
     public void shouldMountConfigurationFileSysctl() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
@@ -147,132 +160,143 @@ public void shouldMountConfigurationFileSysctl() {
     }
 
     @Test
-    public void shouldStartTheWholeEnchilada() throws IOException, InterruptedException
-    {
+    public void shouldStartTheWholeEnchilada() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container
-                    .withVhost("vhost1")
-                    .withVhostLimit("vhost1", "max-connections", 1)
-                    .withVhost("vhost2", true)
-                    .withExchange("direct-exchange", "direct")
-                    .withExchange("topic-exchange", "topic")
-                    .withExchange("vhost1", "topic-exchange-2", "topic", false, false, true, Collections.emptyMap())
-                    .withExchange("vhost2", "topic-exchange-3", "topic")
-                    .withExchange("topic-exchange-4", "topic", false, false, true, Collections.emptyMap())
-                    .withQueue("queue1")
-                    .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
-                    .withQueue("vhost1", "queue3", true, false, ImmutableMap.of("x-message-ttl", 1000))
-                    .withQueue("vhost2", "queue4")
-                    .withBinding("direct-exchange", "queue1")
-                    .withBinding("vhost1", "topic-exchange-2", "queue3")
-                    .withBinding("vhost2", "topic-exchange-3", "queue4", Collections.emptyMap(), "ss7", "queue")
-                    .withUser("user1", "password1")
-                    .withUser("user2", "password2", ImmutableSet.of("administrator"))
-                    .withPermission("vhost1", "user1", ".*", ".*", ".*")
-                    .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
-                    .withPolicy("alternate exchange policy", "^direct-exchange", ImmutableMap.of("alternate-exchange", "amq.direct"))
-                    .withPolicy("vhost2", "ha-all", ".*", ImmutableMap.of("ha-mode", "all", "ha-sync-mode", "automatic"))
-                    .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
-                    .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
+                .withVhost("vhost1")
+                .withVhostLimit("vhost1", "max-connections", 1)
+                .withVhost("vhost2", true)
+                .withExchange("direct-exchange", "direct")
+                .withExchange("topic-exchange", "topic")
+                .withExchange("vhost1", "topic-exchange-2", "topic", false, false, true, Collections.emptyMap())
+                .withExchange("vhost2", "topic-exchange-3", "topic")
+                .withExchange("topic-exchange-4", "topic", false, false, true, Collections.emptyMap())
+                .withQueue("queue1")
+                .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                .withQueue("vhost1", "queue3", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                .withQueue("vhost2", "queue4")
+                .withBinding("direct-exchange", "queue1")
+                .withBinding("vhost1", "topic-exchange-2", "queue3")
+                .withBinding("vhost2", "topic-exchange-3", "queue4", Collections.emptyMap(), "ss7", "queue")
+                .withUser("user1", "password1")
+                .withUser("user2", "password2", ImmutableSet.of("administrator"))
+                .withPermission("vhost1", "user1", ".*", ".*", ".*")
+                .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
+                .withPolicy(
+                    "alternate exchange policy",
+                    "^direct-exchange",
+                    ImmutableMap.of("alternate-exchange", "amq.direct")
+                )
+                .withPolicy("vhost2", "ha-all", ".*", ImmutableMap.of("ha-mode", "all", "ha-sync-mode", "automatic"))
+                .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
+                .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
 
             container.start();
 
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "queues")
-                .getStdout())
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "queues").getStdout())
                 .contains("queue1", "queue2", "queue3", "queue4");
 
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "exchanges")
-                .getStdout())
-                .contains("direct-exchange", "topic-exchange", "topic-exchange-2", "topic-exchange-3", "topic-exchange-4");
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "exchanges").getStdout())
+                .contains(
+                    "direct-exchange",
+                    "topic-exchange",
+                    "topic-exchange-2",
+                    "topic-exchange-3",
+                    "topic-exchange-4"
+                );
 
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "bindings")
-                .getStdout())
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "bindings").getStdout())
                 .contains("direct-exchange", "topic-exchange-2", "topic-exchange-3");
 
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "users")
-                .getStdout())
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "users").getStdout())
                 .contains("user1", "user2");
 
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies")
-                .getStdout())
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies").getStdout())
                 .contains("max length policy", "alternate exchange policy");
 
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies", "--vhost=vhost2")
-                    .getStdout())
-                    .contains("ha-all", "ha-sync-mode");
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies", "--vhost=vhost2").getStdout())
+                .contains("ha-all", "ha-sync-mode");
 
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "operator_policies")
-                .getStdout())
+            assertThat(container.execInContainer("rabbitmqadmin", "list", "operator_policies").getStdout())
                 .contains("operator policy 1");
 
-            assertThat(container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_shovel", "--quiet")
-                .getStdout())
+            assertThat(
+                container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_shovel", "--quiet").getStdout()
+            )
                 .contains("rabbitmq_shovel is enabled");
 
-            assertThat(container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_random_exchange", "--quiet")
-                .getStdout())
+            assertThat(
+                container
+                    .execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_random_exchange", "--quiet")
+                    .getStdout()
+            )
                 .contains("rabbitmq_random_exchange is enabled");
         }
     }
 
     @Test
-    public void shouldThrowExceptionForDodgyJson()
-    {
+    public void shouldThrowExceptionForDodgyJson() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
-            assertThatCode(() ->
-                container.withQueue(
-                    "queue2",
-                    true,
-                    false,
-                    ImmutableMap.of("x-message-ttl", container))
-            ).hasMessageStartingWith("Failed to convert arguments into json");
-
+            assertThatCode(() -> container.withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", container))
+                )
+                .hasMessageStartingWith("Failed to convert arguments into json");
         }
     }
 
     @Test
-    public void shouldWorkWithSSL()
-    {
+    public void shouldWorkWithSSL() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withSSL(
-                forClasspathResource("/certs/server_key.pem", 0644),
-                forClasspathResource("/certs/server_certificate.pem", 0644),
-                forClasspathResource("/certs/ca_certificate.pem", 0644),
-                VERIFY_PEER,
+                MountableFile.forClasspathResource("/certs/server_key.pem", 0644),
+                MountableFile.forClasspathResource("/certs/server_certificate.pem", 0644),
+                MountableFile.forClasspathResource("/certs/ca_certificate.pem", 0644),
+                SslVerification.VERIFY_PEER,
                 true
             );
 
             container.start();
 
             assertThatCode(() -> {
-                ConnectionFactory connectionFactory = new ConnectionFactory();
-                connectionFactory.useSslProtocol(createSslContext(
-                    "certs/client_key.p12", "password",
-                    "certs/truststore.jks", "password"));
-                connectionFactory.enableHostnameVerification();
-                connectionFactory.setUri(container.getAmqpsUrl());
-                connectionFactory.setPassword(container.getAdminPassword());
-                Connection connection = connectionFactory.newConnection();
-                Channel channel = connection.openChannel().orElseThrow(() -> new RuntimeException("Failed to Open channel"));
-                channel.close();
-                connection.close();
-            }).doesNotThrowAnyException();
+                    ConnectionFactory connectionFactory = new ConnectionFactory();
+                    connectionFactory.useSslProtocol(
+                        createSslContext("certs/client_key.p12", "password", "certs/truststore.jks", "password")
+                    );
+                    connectionFactory.enableHostnameVerification();
+                    connectionFactory.setUri(container.getAmqpsUrl());
+                    connectionFactory.setPassword(container.getAdminPassword());
+                    Connection connection = connectionFactory.newConnection();
+                    Channel channel = connection
+                        .openChannel()
+                        .orElseThrow(() -> new RuntimeException("Failed to Open channel"));
+                    channel.close();
+                    connection.close();
+                })
+                .doesNotThrowAnyException();
         }
     }
 
-    private SSLContext createSslContext(String keystoreFile, String keystorePassword, String truststoreFile, String truststorePassword)
-        throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, KeyManagementException
-    {
+    private SSLContext createSslContext(
+        String keystoreFile,
+        String keystorePassword,
+        String truststoreFile,
+        String truststorePassword
+    )
+        throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, KeyManagementException {
         ClassLoader classLoader = getClass().getClassLoader();
 
         KeyStore ks = KeyStore.getInstance("PKCS12");
-        ks.load(new FileInputStream(new File(classLoader.getResource(keystoreFile).getFile())), keystorePassword.toCharArray());
+        ks.load(
+            new FileInputStream(new File(classLoader.getResource(keystoreFile).getFile())),
+            keystorePassword.toCharArray()
+        );
         KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
         kmf.init(ks, "password".toCharArray());
 
         KeyStore trustStore = KeyStore.getInstance("PKCS12");
-        trustStore.load(new FileInputStream(new File(classLoader.getResource(truststoreFile).getFile())), truststorePassword.toCharArray());
+        trustStore.load(
+            new FileInputStream(new File(classLoader.getResource(truststoreFile).getFile())),
+            truststorePassword.toCharArray()
+        );
         TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
         tmf.init(trustStore);
 
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index fc3778385cd..08d7ab053c6 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -1,22 +1,10 @@
 package org.testcontainers.containers;
 
-import static java.time.temporal.ChronoUnit.SECONDS;
-
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.collect.ImmutableSet;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
@@ -41,40 +29,67 @@
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 /**
  * A chrome/firefox/custom container based on SeleniumHQ's standalone container sets.
  * <p>
  * The container should expose Selenium remote control protocol and VNC.
  */
-public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>> extends GenericContainer<SELF> implements LinkableContainer, TestLifecycleAware {
+public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>>
+    extends GenericContainer<SELF>
+    implements LinkableContainer, TestLifecycleAware {
 
     private static final DockerImageName CHROME_IMAGE = DockerImageName.parse("selenium/standalone-chrome");
+
     private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox");
+
     private static final DockerImageName CHROME_DEBUG_IMAGE = DockerImageName.parse("selenium/standalone-chrome-debug");
-    private static final DockerImageName FIREFOX_DEBUG_IMAGE = DockerImageName.parse("selenium/standalone-firefox-debug");
+
+    private static final DockerImageName FIREFOX_DEBUG_IMAGE = DockerImageName.parse(
+        "selenium/standalone-firefox-debug"
+    );
+
     private static final DockerImageName[] COMPATIBLE_IMAGES = new DockerImageName[] {
         CHROME_IMAGE,
         FIREFOX_IMAGE,
         CHROME_DEBUG_IMAGE,
-        FIREFOX_DEBUG_IMAGE
+        FIREFOX_DEBUG_IMAGE,
     };
 
     private static final String DEFAULT_PASSWORD = "secret";
+
     private static final int SELENIUM_PORT = 4444;
+
     private static final int VNC_PORT = 5900;
 
     private static final String NO_PROXY_KEY = "no_proxy";
+
     private static final String TC_TEMP_DIR_PREFIX = "tc";
 
     @Nullable
     private Capabilities capabilities;
+
     private DockerImageName customImageName = null;
 
     @Nullable
     private RemoteWebDriver driver;
+
     private VncRecordingMode recordingMode = VncRecordingMode.RECORD_FAILING;
+
     private VncRecordingFormat recordingFormat;
+
     private RecordingFileFactory recordingFileFactory;
+
     private File vncRecordingDirectory;
 
     private VncRecordingContainer vncRecordingContainer = null;
@@ -84,13 +99,16 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     public BrowserWebDriverContainer() {
         super();
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
-                .withStartupTimeout(Duration.of(15, SECONDS));
+            .withRegEx(
+                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
+            )
+            .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
 
-        this.waitStrategy = new WaitAllStrategy()
+        this.waitStrategy =
+            new WaitAllStrategy()
                 .withStrategy(logWaitStrategy)
                 .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, SECONDS));
+                .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
     }
@@ -109,17 +127,19 @@ public BrowserWebDriverContainer(String dockerImageName) {
      */
     public BrowserWebDriverContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-
         // we assert compatibility with the chrome/firefox image later, after capabilities are processed
 
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
-                .withStartupTimeout(Duration.of(15, SECONDS));
+            .withRegEx(
+                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
+            )
+            .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
 
-        this.waitStrategy = new WaitAllStrategy()
+        this.waitStrategy =
+            new WaitAllStrategy()
                 .withStrategy(logWaitStrategy)
                 .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, SECONDS));
+                .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
 
@@ -159,11 +179,9 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-
         String seleniumVersion = SeleniumUtils.determineClasspathSeleniumVersion();
 
         if (recordingMode != VncRecordingMode.SKIP) {
-
             if (vncRecordingDirectory == null) {
                 try {
                     vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
@@ -178,7 +196,8 @@ protected void configure() {
                 withNetwork(Network.SHARED);
             }
 
-            vncRecordingContainer = new VncRecordingContainer(this)
+            vncRecordingContainer =
+                new VncRecordingContainer(this)
                     .withVncPassword(DEFAULT_PASSWORD)
                     .withVncPort(VNC_PORT)
                     .withVideoFormat(recordingFormat);
@@ -188,7 +207,10 @@ protected void configure() {
             customImageName.assertCompatibleWith(COMPATIBLE_IMAGES);
             super.setDockerImageName(customImageName.asCanonicalNameString());
         } else {
-            DockerImageName standardImageForCapabilities = getStandardImageForCapabilities(capabilities, seleniumVersion);
+            DockerImageName standardImageForCapabilities = getStandardImageForCapabilities(
+                capabilities,
+                seleniumVersion
+            );
             super.setDockerImageName(standardImageForCapabilities.asCanonicalNameString());
         }
 
@@ -246,7 +268,9 @@ private static DockerImageName getStandardImageForCapabilities(Capabilities capa
             case BrowserType.FIREFOX:
                 return (supportsVncWithoutDebugImage ? FIREFOX_IMAGE : FIREFOX_DEBUG_IMAGE).withTag(seleniumVersion);
             default:
-                throw new UnsupportedOperationException("Browser name must be 'chrome' or 'firefox'; provided '" + browserName + "' is not supported");
+                throw new UnsupportedOperationException(
+                    "Browser name must be 'chrome' or 'firefox'; provided '" + browserName + "' is not supported"
+                );
         }
     }
 
@@ -254,7 +278,7 @@ public URL getSeleniumAddress() {
         try {
             return new URL("http", getHost(), getMappedPort(SELENIUM_PORT), "/wd/hub");
         } catch (MalformedURLException e) {
-            e.printStackTrace();// TODO
+            e.printStackTrace(); // TODO
             return null;
         }
     }
@@ -292,15 +316,27 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
     public synchronized RemoteWebDriver getWebDriver() {
         if (driver == null) {
             if (capabilities == null) {
-                logger().warn("No capabilities provided - this will cause an exception in future versions. Falling back to ChromeOptions");
+                logger()
+                    .warn(
+                        "No capabilities provided - this will cause an exception in future versions. Falling back to ChromeOptions"
+                    );
                 capabilities = new ChromeOptions();
             }
 
-            driver = Unreliables.retryUntilSuccess(30, TimeUnit.SECONDS, () -> {
-                return Timeouts.getWithTimeout(10, TimeUnit.SECONDS, () -> {
-                    return new RemoteWebDriver(getSeleniumAddress(), capabilities);
-                });
-            });
+            driver =
+                Unreliables.retryUntilSuccess(
+                    30,
+                    TimeUnit.SECONDS,
+                    () -> {
+                        return Timeouts.getWithTimeout(
+                            10,
+                            TimeUnit.SECONDS,
+                            () -> {
+                                return new RemoteWebDriver(getSeleniumAddress(), capabilities);
+                            }
+                        );
+                    }
+                );
         }
         return driver;
     }
@@ -348,7 +384,12 @@ private void retainRecordingIfNeeded(String prefix, boolean succeeded) {
         }
 
         if (shouldRecord) {
-            File recordingFile = recordingFileFactory.recordingFileForTest(vncRecordingDirectory, prefix, succeeded, vncRecordingContainer.getVideoFormat());
+            File recordingFile = recordingFileFactory.recordingFileForTest(
+                vncRecordingDirectory,
+                prefix,
+                succeeded,
+                vncRecordingContainer.getVideoFormat()
+            );
             LOGGER.info("Screen recordings for test {} will be stored at: {}", prefix, recordingFile);
 
             vncRecordingContainer.saveRecordingToFile(recordingFile);
@@ -375,7 +416,11 @@ public SELF withRecordingMode(VncRecordingMode recordingMode, File vncRecordingD
         return withRecordingMode(recordingMode, vncRecordingDirectory, null);
     }
 
-    public SELF withRecordingMode(VncRecordingMode recordingMode, File vncRecordingDirectory, VncRecordingFormat recordingFormat) {
+    public SELF withRecordingMode(
+        VncRecordingMode recordingMode,
+        File vncRecordingDirectory,
+        VncRecordingFormat recordingFormat
+    ) {
         this.recordingMode = recordingMode;
         this.vncRecordingDirectory = vncRecordingDirectory;
         this.recordingFormat = recordingFormat;
@@ -388,6 +433,8 @@ public SELF withRecordingFileFactory(RecordingFileFactory recordingFileFactory)
     }
 
     public enum VncRecordingMode {
-        SKIP, RECORD_ALL, RECORD_FAILING
+        SKIP,
+        RECORD_ALL,
+        RECORD_FAILING,
     }
 }
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java b/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java
index 62a1abd38db..3815f5de3e1 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/DefaultRecordingFileFactory.java
@@ -4,25 +4,36 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
-
 public class DefaultRecordingFileFactory implements RecordingFileFactory {
 
     private static final SimpleDateFormat filenameDateFormat = new SimpleDateFormat("YYYYMMdd-HHmmss");
+
     private static final String PASSED = "PASSED";
+
     private static final String FAILED = "FAILED";
-    private static final String FILENAME_FORMAT = "%s-%s-%s.%s";
 
+    private static final String FILENAME_FORMAT = "%s-%s-%s.%s";
 
     @Override
     public File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded) {
-        return recordingFileForTest(vncRecordingDirectory, prefix, succeeded, VncRecordingContainer.DEFAULT_RECORDING_FORMAT);
+        return recordingFileForTest(
+            vncRecordingDirectory,
+            prefix,
+            succeeded,
+            VncRecordingContainer.DEFAULT_RECORDING_FORMAT
+        );
     }
 
     @Override
-    public File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded, VncRecordingFormat recordingFormat) {
+    public File recordingFileForTest(
+        File vncRecordingDirectory,
+        String prefix,
+        boolean succeeded,
+        VncRecordingContainer.VncRecordingFormat recordingFormat
+    ) {
         final String resultMarker = succeeded ? PASSED : FAILED;
-        final String fileName = String.format(FILENAME_FORMAT,
+        final String fileName = String.format(
+            FILENAME_FORMAT,
             resultMarker,
             prefix,
             filenameDateFormat.format(new Date()),
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java b/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
index aff607cf23d..31946dac59e 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
@@ -6,16 +6,23 @@
 import java.io.File;
 
 public interface RecordingFileFactory {
-
     @Deprecated
     default File recordingFileForTest(File vncRecordingDirectory, Description description, boolean succeeded) {
-        return recordingFileForTest(vncRecordingDirectory, description.getTestClass().getSimpleName() + "-" + description.getMethodName(), succeeded);
+        return recordingFileForTest(
+            vncRecordingDirectory,
+            description.getTestClass().getSimpleName() + "-" + description.getMethodName(),
+            succeeded
+        );
     }
 
-    default File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded, VncRecordingFormat recordingFormat) {
+    default File recordingFileForTest(
+        File vncRecordingDirectory,
+        String prefix,
+        boolean succeeded,
+        VncRecordingFormat recordingFormat
+    ) {
         return recordingFileForTest(vncRecordingDirectory, prefix, succeeded);
     }
 
     File recordingFileForTest(File vncRecordingDirectory, String prefix, boolean succeeded);
-
 }
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/SeleniumUtils.java b/modules/selenium/src/main/java/org/testcontainers/containers/SeleniumUtils.java
index 131f5a953ea..4fc0765cc86 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/SeleniumUtils.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/SeleniumUtils.java
@@ -45,19 +45,24 @@ public static String determineClasspathSeleniumVersion() {
                     }
                 }
             }
-
         } catch (Exception e) {
             LOGGER.debug("Failed to determine Selenium-Version from selenium-api JAR Manifest", e);
         }
 
         if (seleniumVersions.size() == 0) {
-            LOGGER.warn("Failed to determine Selenium version from classpath - will use default version of {}", DEFAULT_SELENIUM_VERSION);
+            LOGGER.warn(
+                "Failed to determine Selenium version from classpath - will use default version of {}",
+                DEFAULT_SELENIUM_VERSION
+            );
             return DEFAULT_SELENIUM_VERSION;
         }
 
         String foundVersion = seleniumVersions.iterator().next();
         if (seleniumVersions.size() > 1) {
-            LOGGER.warn("Multiple versions of Selenium API found on classpath - will select {}, but this may not be reliable", foundVersion);
+            LOGGER.warn(
+                "Multiple versions of Selenium API found on classpath - will select {}, but this may not be reliable",
+                foundVersion
+            );
         }
 
         return foundVersion;
@@ -76,7 +81,7 @@ public static String getSeleniumVersionFromManifest(Manifest manifest) {
         }
 
         // Compatibility Selenium > 3.X
-        if(seleniumVersion == null) {
+        if (seleniumVersion == null) {
             Attributes seleniumInfo = manifest.getAttributes("Selenium");
             if (seleniumInfo != null) {
                 seleniumVersion = seleniumInfo.getValue("Selenium-Version");
diff --git a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
index 9abea56c5f2..0d8daaad219 100644
--- a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
@@ -8,19 +8,15 @@
 
 import java.io.File;
 import java.nio.file.Files;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import static java.lang.Boolean.FALSE;
-import static java.lang.Boolean.TRUE;
-import static java.lang.String.format;
-import static java.time.LocalDateTime.now;
-import static org.hamcrest.core.IsCollectionContaining.hasItem;
+import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertThat;
-import static org.junit.runner.Description.createTestDescription;
 
 @RunWith(Parameterized.class)
 @Value
@@ -29,30 +25,47 @@ public class DefaultRecordingFileFactoryTest {
     private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("YYYYMMdd-HHmmss");
 
     private final DefaultRecordingFileFactory factory = new DefaultRecordingFileFactory();
+
     private final String methodName;
+
     private final String prefix;
+
     private final boolean success;
 
     @Parameterized.Parameters
     public static Collection<Object[]> data() {
         Collection<Object[]> args = new ArrayList<>();
-        args.add(new Object[]{"testMethod1", "FAILED", FALSE});
-        args.add(new Object[]{"testMethod2", "PASSED", TRUE});
+        args.add(new Object[] { "testMethod1", "FAILED", Boolean.FALSE });
+        args.add(new Object[] { "testMethod2", "PASSED", Boolean.TRUE });
         return args;
     }
 
     @Test
     public void recordingFileThatShouldDescribeTheTestResultAtThePresentTime() throws Exception {
         File vncRecordingDirectory = Files.createTempDirectory("recording").toFile();
-        Description description = createTestDescription(getClass().getCanonicalName(), methodName, Test.class);
+        Description description = Description.createTestDescription(
+            getClass().getCanonicalName(),
+            methodName,
+            Test.class
+        );
 
         File recordingFile = factory.recordingFileForTest(vncRecordingDirectory, description, success);
 
-        String expectedFilePrefix = format("%s-%s-%s", prefix, getClass().getSimpleName(), methodName);
+        String expectedFilePrefix = String.format("%s-%s-%s", prefix, getClass().getSimpleName(), methodName);
 
         List<File> expectedPossibleFileNames = Arrays.asList(
-                new File(vncRecordingDirectory, format("%s-%s.flv", expectedFilePrefix, now().format(DATETIME_FORMATTER))),
-                new File(vncRecordingDirectory, format("%s-%s.flv", expectedFilePrefix, now().minusSeconds(1L).format(DATETIME_FORMATTER)))
+            new File(
+                vncRecordingDirectory,
+                String.format("%s-%s.flv", expectedFilePrefix, LocalDateTime.now().format(DATETIME_FORMATTER))
+            ),
+            new File(
+                vncRecordingDirectory,
+                String.format(
+                    "%s-%s.flv",
+                    expectedFilePrefix,
+                    LocalDateTime.now().minusSeconds(1L).format(DATETIME_FORMATTER)
+                )
+            )
         );
 
         assertThat(expectedPossibleFileNames, hasItem(recordingFile));
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index db369824442..d0865a06b09 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -1,10 +1,5 @@
 package org.testcontainers.junit;
 
-import static java.lang.String.format;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-
-import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.NotNull;
 import org.junit.ClassRule;
 import org.openqa.selenium.By;
@@ -16,6 +11,11 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
+import java.util.concurrent.TimeUnit;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+
 /**
  *
  */
@@ -25,7 +25,9 @@ public class BaseWebDriverContainerTest {
     public static Network NETWORK = Network.newNetwork();
 
     @ClassRule
-    public static GenericContainer<?> HELLO_WORLD = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld:1.1.0"))
+    public static GenericContainer<?> HELLO_WORLD = new GenericContainer<>(
+        DockerImageName.parse("testcontainers/helloworld:1.1.0")
+    )
         .withNetwork(NETWORK)
         .withNetworkAliases("helloworld")
         .withExposedPorts(8080, 8081)
@@ -39,17 +41,13 @@ protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule) {
         driver.get("http://helloworld:8080");
         WebElement title = driver.findElement(By.tagName("h1"));
 
-        assertEquals("the index page contains the title 'Hello world'",
-            "Hello world",
-            title.getText().trim()
-        );
+        assertEquals("the index page contains the title 'Hello world'", "Hello world", title.getText().trim());
     }
 
     protected void assertBrowserNameIs(BrowserWebDriverContainer<?> rule, String expectedName) {
         RemoteWebDriver driver = setupDriverFromRule(rule);
         String actual = driver.getCapabilities().getBrowserName();
-        assertTrue(format("actual browser name is %s", actual),
-            actual.equals(expectedName));
+        assertTrue(String.format("actual browser name is %s", actual), actual.equals(expectedName));
     }
 
     @NotNull
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
index a53fa532f99..60d113dc290 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -9,10 +9,10 @@
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toList;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class BrowserWebDriverContainerTest {
@@ -40,7 +40,6 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
         try (
             BrowserWebDriverContainer chromeWithoutNoProxySet = new BrowserWebDriverContainer()
                 .withCapabilities(new ChromeOptions())
-
         ) {
             chromeWithoutNoProxySet.start();
 
@@ -49,7 +48,6 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
         }
     }
 
-
     @Test
     public void createContainerWithShmVolume() {
         Assume.assumeFalse("SHM isn't mounted on Windows", SystemUtils.IS_OS_WINDOWS);
@@ -76,19 +74,19 @@ public void createContainerWithoutShmVolume() {
         ) {
             webDriverContainer.start();
 
-            assertEquals("Shared memory size is configured",
-                512 * FileUtils.ONE_MB,
-                webDriverContainer.getShmSize());
+            assertEquals("Shared memory size is configured", 512 * FileUtils.ONE_MB, webDriverContainer.getShmSize());
 
-            assertEquals("No shm mounts present", emptyList(), shmVolumes(webDriverContainer));
+            assertEquals("No shm mounts present", Collections.emptyList(), shmVolumes(webDriverContainer));
         }
     }
 
     private List<InspectContainerResponse.Mount> shmVolumes(final BrowserWebDriverContainer container) {
-        return container.getContainerInfo().getMounts()
+        return container
+            .getContainerInfo()
+            .getMounts()
             .stream()
             // destination path is always /dev/shm
             .filter(m -> m.getDestination().getPath().equals("/dev/shm"))
-            .collect(toList());
+            .collect(Collectors.toList());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index fdf56aa0134..b2b7d8d6b1c 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.junit;
 
-
 import com.google.common.io.PatternFilenameFilter;
 import org.junit.Rule;
 import org.junit.Test;
@@ -9,6 +8,7 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode;
 import org.testcontainers.containers.DefaultRecordingFileFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.VncRecordingContainer;
@@ -21,14 +21,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import static java.time.temporal.ChronoUnit.SECONDS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
-import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_FAILING;
 
 @RunWith(Enclosed.class)
 public class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContainerTest {
@@ -52,7 +50,7 @@ public void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() t
                 // To do this, simply add extra parameters to the rule constructor, so video will default to FLV format:
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(RECORD_ALL, target)
+                    .withRecordingMode(VncRecordingMode.RECORD_ALL, target)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
@@ -62,22 +60,26 @@ public void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() t
             }
         }
 
-        private File[] runSimpleExploreInContainer(BrowserWebDriverContainer<?> container, String fileNamePattern) throws InterruptedException {
+        private File[] runSimpleExploreInContainer(BrowserWebDriverContainer<?> container, String fileNamePattern)
+            throws InterruptedException {
             container.start();
 
             TimeUnit.MILLISECONDS.sleep(MINIMUM_VIDEO_DURATION_MILLISECONDS);
             doSimpleExplore(container);
-            container.afterTest(new TestDescription() {
-                @Override
-                public String getTestId() {
-                    return getFilesystemFriendlyName();
-                }
-
-                @Override
-                public String getFilesystemFriendlyName() {
-                    return "ChromeThatRecordsAllTests-recordingTestThatShouldBeRecordedAndRetained";
-                }
-            }, Optional.empty());
+            container.afterTest(
+                new TestDescription() {
+                    @Override
+                    public String getTestId() {
+                        return getFilesystemFriendlyName();
+                    }
+
+                    @Override
+                    public String getFilesystemFriendlyName() {
+                        return "ChromeThatRecordsAllTests-recordingTestThatShouldBeRecordedAndRetained";
+                    }
+                },
+                Optional.empty()
+            );
 
             return vncRecordingDirectory.getRoot().listFiles(new PatternFilenameFilter(fileNamePattern));
         }
@@ -90,7 +92,7 @@ public void recordingTestShouldHaveFlvExtension() throws InterruptedException {
                 // Set (explicitly) FLV format for recorded video:
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(RECORD_ALL, target, VncRecordingFormat.FLV)
+                    .withRecordingMode(VncRecordingMode.RECORD_ALL, target, VncRecordingFormat.FLV)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
@@ -108,7 +110,7 @@ public void recordingTestShouldHaveMp4Extension() throws InterruptedException {
                 // Set MP4 format for recorded video:
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(RECORD_ALL, target, VncRecordingFormat.MP4)
+                    .withRecordingMode(VncRecordingMode.RECORD_ALL, target, VncRecordingFormat.MP4)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
@@ -124,7 +126,7 @@ public void recordingTestThatShouldHaveCorrectDuration() throws IOException, Int
             try (
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(RECORD_ALL, vncRecordingDirectory.getRoot())
+                    .withRecordingMode(VncRecordingMode.RECORD_ALL, vncRecordingDirectory.getRoot())
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
             ) {
@@ -132,19 +134,28 @@ public void recordingTestThatShouldHaveCorrectDuration() throws IOException, Int
                 mountableFile = MountableFile.forHostPath(recordedFiles[0].getCanonicalPath());
             }
 
-            try (GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/vnc-recorder:1.2.0"))) {
+            try (
+                GenericContainer<?> container = new GenericContainer<>(
+                    DockerImageName.parse("testcontainers/vnc-recorder:1.2.0")
+                )
+            ) {
                 String recordFileContainerPath = "/tmp/chromeTestRecord.flv";
-                container.withCopyFileToContainer(mountableFile, recordFileContainerPath)
-                        .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withEntrypoint("ffmpeg"))
-                        .withCommand("-i", recordFileContainerPath, "-f", "null", "-")
-                        .waitingFor(new LogMessageWaitStrategy()
-                                                .withRegEx(".*Duration.*")
-                                                .withStartupTimeout(Duration.of(60, SECONDS)))
-                        .start();
+                container
+                    .withCopyFileToContainer(mountableFile, recordFileContainerPath)
+                    .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withEntrypoint("ffmpeg"))
+                    .withCommand("-i", recordFileContainerPath, "-f", "null", "-")
+                    .waitingFor(
+                        new LogMessageWaitStrategy()
+                            .withRegEx(".*Duration.*")
+                            .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
+                    )
+                    .start();
                 String ffmpegOutput = container.getLogs();
 
-                assertTrue("Duration is incorrect in:\n " + ffmpegOutput,
-                    ffmpegOutput.contains("Duration: 00:") && !(ffmpegOutput.contains("Duration: 00:00:00.00")));
+                assertTrue(
+                    "Duration is incorrect in:\n " + ffmpegOutput,
+                    ffmpegOutput.contains("Duration: 00:") && !(ffmpegOutput.contains("Duration: 00:00:00.00"))
+                );
             }
         }
     }
@@ -180,7 +191,7 @@ public void recordingTestThatShouldBeRecordedAndRetained() throws InterruptedExc
                 // or if you only want videos for test failures:
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(RECORD_FAILING, target)
+                    .withRecordingMode(VncRecordingMode.RECORD_FAILING, target)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
@@ -189,25 +200,26 @@ public void recordingTestThatShouldBeRecordedAndRetained() throws InterruptedExc
 
                 TimeUnit.MILLISECONDS.sleep(MINIMUM_VIDEO_DURATION_MILLISECONDS);
                 doSimpleExplore(chrome);
-                chrome.afterTest(new TestDescription() {
-                    @Override
-                    public String getTestId() {
-                        return getFilesystemFriendlyName();
-                    }
-
-                    @Override
-                    public String getFilesystemFriendlyName() {
-                        return "ChromeThatRecordsFailingTests-recordingTestThatShouldBeRecordedAndRetained";
-                    }
-                }, Optional.of(new RuntimeException("Force writing of video file.")));
+                chrome.afterTest(
+                    new TestDescription() {
+                        @Override
+                        public String getTestId() {
+                            return getFilesystemFriendlyName();
+                        }
+
+                        @Override
+                        public String getFilesystemFriendlyName() {
+                            return "ChromeThatRecordsFailingTests-recordingTestThatShouldBeRecordedAndRetained";
+                        }
+                    },
+                    Optional.of(new RuntimeException("Force writing of video file."))
+                );
 
                 String[] files = vncRecordingDirectory.getRoot().list(new PatternFilenameFilter("FAILED-.*\\.flv"));
                 assertEquals("Recorded file not found", 1, files.length);
             }
-
         }
 
-        private static class CustomRecordingFileFactory extends DefaultRecordingFileFactory {
-        }
+        private static class CustomRecordingFileFactory extends DefaultRecordingFileFactory {}
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
index bea1909a145..eb9872b06e9 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
@@ -15,7 +15,7 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest {
     @Rule
     public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
         .withCapabilities(new ChromeOptions())
-    // }
+        // }
         .withNetwork(NETWORK);
 
     @Before
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
index b1214d18b60..d20f8c3aad8 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
@@ -4,11 +4,10 @@
 import org.junit.Test;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
-public class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest{
+public class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest {
 
     @Rule
-    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-        .withNetwork(NETWORK);
+    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>().withNetwork(NETWORK);
 
     @Test
     public void chromeIsStartedIfNoCapabilitiesProvided() {
@@ -16,7 +15,7 @@ public void chromeIsStartedIfNoCapabilitiesProvided() {
     }
 
     @Test
-    public void simpleExploreTestWhenNoCapabilitiesProvided(){
+    public void simpleExploreTestWhenNoCapabilitiesProvided() {
         doSimpleExplore(chrome);
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
index 8448dc40d53..362be6550e4 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
@@ -6,8 +6,7 @@
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
 import java.time.Duration;
-
-import static java.time.temporal.ChronoUnit.SECONDS;
+import java.time.temporal.ChronoUnit;
 
 /**
  *
@@ -17,7 +16,7 @@ public class CustomWaitTimeoutWebDriverContainerTest extends BaseWebDriverContai
     @Rule
     public BrowserWebDriverContainer<?> chromeWithCustomTimeout = new BrowserWebDriverContainer<>()
         .withCapabilities(new ChromeOptions())
-        .withStartupTimeout(Duration.of(30, SECONDS))
+        .withStartupTimeout(Duration.of(30, ChronoUnit.SECONDS))
         .withNetwork(NETWORK);
 
     @Test
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
index 1cffec16bc6..e56b33a1704 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
@@ -14,8 +14,8 @@ public class FirefoxWebDriverContainerTest extends BaseWebDriverContainerTest {
     // junitRule {
     @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>()
-            .withCapabilities(new FirefoxOptions())
-    // }
+        .withCapabilities(new FirefoxOptions())
+        // }
         .withNetwork(NETWORK);
 
     @Before
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index 3c071984dfb..2d2feb6aaff 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -22,11 +22,11 @@ public class LocalServerWebDriverContainerTest {
     public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
         .withAccessToHost(true)
         .withCapabilities(new ChromeOptions());
+
     private int localPort;
 
     @Before
     public void setupLocalServer() throws Exception {
-
         // Set up a local Jetty HTTP server
         Server server = new Server();
         server.addConnector(new SocketConnector());
@@ -53,6 +53,10 @@ public void testConnection() {
 
         String headingText = driver.findElement(By.cssSelector("h1")).getText().trim();
 
-        assertEquals("The hardcoded success message was found on a page fetched from a local server", "It worked", headingText);
+        assertEquals(
+            "The hardcoded success message was found on a page fetched from a local server",
+            "It worked",
+            headingText
+        );
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
index a236a9696c1..04a31662099 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
@@ -15,19 +15,19 @@ public class SeleniumStartTest {
 
     @Parameterized.Parameters(name = "tag: {0}")
     public static String[] data() {
-        return new String[]{"4.0.0", "3.4.0", "2.53.0", "2.45.0"};
+        return new String[] { "4.0.0", "3.4.0", "2.53.0", "2.45.0" };
     }
 
-    @Parameterized.Parameter()
+    @Parameterized.Parameter
     public String tag;
 
     @Test
     public void testAdditionalStartupString() {
-        final DockerImageName imageName = DockerImageName
-            .parse("selenium/standalone-chrome")
-            .withTag(tag);
-        try (BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>(imageName)
-                .withCapabilities(new ChromeOptions())) {
+        final DockerImageName imageName = DockerImageName.parse("selenium/standalone-chrome").withTag(tag);
+        try (
+            BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>(imageName)
+                .withCapabilities(new ChromeOptions())
+        ) {
             chrome.start();
         }
     }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
index d706d0fc390..4cbfca77d21 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
@@ -8,7 +8,6 @@
 
 import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
-
 /**
  * Created by Julien LAMY
  */
@@ -35,5 +34,4 @@ private void checkSeleniumVersionDetected(String urlManifest, String expectedVer
         String seleniumVersion = SeleniumUtils.getSeleniumVersionFromManifest(manifest);
         assertEquals("Check if Selenium Version detected is the correct one.", expectedVersion, seleniumVersion);
     }
-
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
index 9a15c6b466d..e3db8ad5887 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
@@ -8,8 +8,9 @@
 
 public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
 
-    private static final DockerImageName FIREFOX_IMAGE = DockerImageName
-        .parse("selenium/standalone-firefox:2.53.1-beryllium");
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse(
+        "selenium/standalone-firefox:2.53.1-beryllium"
+    );
 
     @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
index 4492ca0befe..f831cdd82e9 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
@@ -1,5 +1,13 @@
 package org.testcontainers.containers;
 
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.apache.commons.io.IOUtils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -11,15 +19,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.commons.io.IOUtils;
-
-import okhttp3.HttpUrl;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
 /**
  * Utils class which can create collections and configurations.
  *
@@ -38,7 +37,13 @@ public class SolrClientUtils {
      * @param solrConfig        the url under which the solrconfig.xml can be found
      * @param solrSchema        the url under which the schema.xml can be found or null if the default schema should be used
      */
-    public static void uploadConfiguration(String hostname, int port, String configurationName, URL solrConfig, URL solrSchema) throws URISyntaxException, IOException {
+    public static void uploadConfiguration(
+        String hostname,
+        int port,
+        String configurationName,
+        URL solrConfig,
+        URL solrSchema
+    ) throws URISyntaxException, IOException {
         Map<String, String> parameters = new HashMap<>();
         parameters.put("action", "UPLOAD");
         parameters.put("name", configurationName);
@@ -46,7 +51,6 @@ public static void uploadConfiguration(String hostname, int port, String configu
 
         byte[] configurationZipFile = generateConfigZipFile(solrConfig, solrSchema);
         executePost(url, configurationZipFile);
-
     }
 
     /**
@@ -58,7 +62,8 @@ public static void uploadConfiguration(String hostname, int port, String configu
      * @param configurationName the name of the configuration which should used to create the collection
      *                          or null if the default configuration should be used
      */
-    public static void createCollection(String hostname, int port, String collectionName, String configurationName) throws URISyntaxException, IOException {
+    public static void createCollection(String hostname, int port, String collectionName, String configurationName)
+        throws URISyntaxException, IOException {
         Map<String, String> parameters = new HashMap<>();
         parameters.put("action", "CREATE");
         parameters.put("name", collectionName);
@@ -73,16 +78,11 @@ public static void createCollection(String hostname, int port, String collection
     }
 
     private static void executePost(HttpUrl url, byte[] data) throws IOException {
+        RequestBody requestBody = data == null
+            ? RequestBody.create(MediaType.parse("text/plain"), "")
+            : RequestBody.create(MediaType.parse("application/octet-stream"), data);
+        Request request = new Request.Builder().url(url).post(requestBody).build();
 
-        RequestBody requestBody = data == null ?
-            RequestBody.create(MediaType.parse("text/plain"), "") :
-            RequestBody.create(MediaType.parse("application/octet-stream"), data);
-        ;
-
-        Request request = new Request.Builder()
-            .url(url)
-            .post(requestBody)
-            .build();
         Response response = httpClient.newCall(request).execute();
         if (!response.isSuccessful()) {
             String responseBody = "";
@@ -97,7 +97,12 @@ private static void executePost(HttpUrl url, byte[] data) throws IOException {
         }
     }
 
-    private static HttpUrl generateSolrURL(String hostname, int port, List<String> pathSegments, Map<String, String> parameters) throws URISyntaxException {
+    private static HttpUrl generateSolrURL(
+        String hostname,
+        int port,
+        List<String> pathSegments,
+        Map<String, String> parameters
+    ) throws URISyntaxException {
         HttpUrl.Builder builder = new HttpUrl.Builder();
         builder.scheme("http");
         builder.host(hostname);
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java
index 5ba0865502c..a3b2cfd77c6 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtilsException.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 public class SolrClientUtilsException extends RuntimeException {
+
     public SolrClientUtilsException(int statusCode, String msg) {
         super("Http Call Status: " + statusCode + "\n" + msg);
     }
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index e583c1f54ee..5161bce2738 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -8,11 +8,10 @@
 
 import java.net.URL;
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
 
-import static java.time.temporal.ChronoUnit.SECONDS;
-
 /**
  * SolrContainer allows a solr container to be launched and controlled.
  */
@@ -27,6 +26,7 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
     public static final String DEFAULT_TAG = "8.3.0";
 
     public static final Integer ZOOKEEPER_PORT = 9983;
+
     public static final Integer SOLR_PORT = 8983;
 
     private SolrContainerConfiguration configuration;
@@ -48,12 +48,12 @@ public SolrContainer(final String dockerImageName) {
 
     public SolrContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.waitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(".*o\\.e\\.j\\.s\\.Server Started.*")
-            .withStartupTimeout(Duration.of(60, SECONDS));
+        this.waitStrategy =
+            new LogMessageWaitStrategy()
+                .withRegEx(".*o\\.e\\.j\\.s\\.Server Started.*")
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
         this.configuration = new SolrContainerConfiguration();
     }
 
@@ -129,7 +129,9 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
         if (!configuration.isZookeeper()) {
             ExecResult result = execInContainer("solr", "create_core", "-c", configuration.getCollectionName());
             if (result.getExitCode() != 0) {
-                throw new IllegalStateException("Unable to create solr core:\nStdout: " + result.getStdout() + "\nStderr:" + result.getStderr());
+                throw new IllegalStateException(
+                    "Unable to create solr core:\nStdout: " + result.getStdout() + "\nStderr:" + result.getStderr()
+                );
             }
             return;
         }
@@ -140,14 +142,15 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
                 getSolrPort(),
                 configuration.getConfigurationName(),
                 configuration.getSolrConfiguration(),
-                configuration.getSolrSchema());
+                configuration.getSolrSchema()
+            );
         }
 
         SolrClientUtils.createCollection(
             getHost(),
             getSolrPort(),
             configuration.getCollectionName(),
-            configuration.getConfigurationName());
+            configuration.getConfigurationName()
+        );
     }
 }
-
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
index 1f35ce2a810..698e956c8fe 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
@@ -1,9 +1,9 @@
 package org.testcontainers.containers;
 
-import java.net.URL;
-
 import lombok.Data;
 
+import java.net.URL;
+
 /**
  * @author Simon Schneider
  */
@@ -11,8 +11,12 @@
 public class SolrContainerConfiguration {
 
     private boolean zookeeper = true;
+
     private String collectionName = "dummy";
+
     private String configurationName;
+
     private URL solrConfiguration;
+
     private URL solrSchema;
 }
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
index 9f82e2c3af9..9b561e5cda9 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -10,9 +10,9 @@
 
 import java.io.IOException;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 
 /**
  * @author Simon Schneider
@@ -20,6 +20,7 @@
 public class SolrContainerTest {
 
     private static final DockerImageName SOLR_IMAGE = DockerImageName.parse("solr:8.3.0");
+
     private SolrClient client = null;
 
     @After
@@ -60,7 +61,10 @@ public void solrCloudPingTest() throws IOException, SolrServerException {
         container.start();
 
         // Do whatever you want with the client ...
-        SolrClient client = new Http2SolrClient.Builder("http://" + container.getHost() + ":" + container.getSolrPort() + "/solr").build();
+        SolrClient client = new Http2SolrClient.Builder(
+            "http://" + container.getHost() + ":" + container.getSolrPort() + "/solr"
+        )
+            .build();
         SolrPingResponse response = client.ping("dummy");
 
         // Stop the container.
@@ -70,9 +74,10 @@ public void solrCloudPingTest() throws IOException, SolrServerException {
 
     private SolrClient getClient(SolrContainer container) {
         if (client == null) {
-            client = new Http2SolrClient.Builder("http://" + container.getHost() + ":" + container.getSolrPort() + "/solr").build();
+            client =
+                new Http2SolrClient.Builder("http://" + container.getHost() + ":" + container.getSolrPort() + "/solr")
+                    .build();
         }
         return client;
     }
-
 }
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
index 85b58724000..6c71ac421c6 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
@@ -12,25 +12,25 @@ import org.testcontainers.lifecycle.TestDescription
 @PackageScope
 class SpockTestDescription implements TestDescription {
 
-    String specName
-    String featureName
+	String specName
+	String featureName
 
-    static SpockTestDescription fromTestDescription(IMethodInvocation invocation) {
-        return new SpockTestDescription([
-            specName: invocation.spec.name,
-            featureName: invocation.feature.name
-        ])
-    }
+	static SpockTestDescription fromTestDescription(IMethodInvocation invocation) {
+		return new SpockTestDescription([
+			specName: invocation.spec.name,
+			featureName: invocation.feature.name
+		])
+	}
 
-    @Override
-    String getTestId() {
-        return getFilesystemFriendlyName()
-    }
+	@Override
+	String getTestId() {
+		return getFilesystemFriendlyName()
+	}
 
-    @Override
-    String getFilesystemFriendlyName() {
-        return [specName, featureName].collect {
-            URLEncoder.encode(it, 'UTF-8')
-        }.join('-')
-    }
+	@Override
+	String getFilesystemFriendlyName() {
+		return [specName, featureName].collect {
+			URLEncoder.encode(it, 'UTF-8')
+		}.join('-')
+	}
 }
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
index 675ed68c4a6..2e70b6d589f 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
@@ -13,5 +13,4 @@ import java.lang.annotation.Target
 @Target([ElementType.TYPE, ElementType.METHOD])
 @ExtensionAnnotation(TestcontainersExtension)
 @interface Testcontainers {
-
 }
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
index 1f66fd8f596..40392210f3a 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
@@ -7,26 +7,24 @@ import org.spockframework.runtime.model.SpecInfo
 
 class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcontainers> {
 
-    @Override
-    void visitSpecAnnotation(Testcontainers annotation, SpecInfo spec) {
-        def listener = new ErrorListener()
-        def interceptor = new TestcontainersMethodInterceptor(spec, listener)
-        spec.addSetupSpecInterceptor(interceptor)
-        spec.addCleanupSpecInterceptor(interceptor)
-        spec.addSetupInterceptor(interceptor)
-        spec.addCleanupInterceptor(interceptor)
-
-        spec.addListener(listener)
-
-    }
-
-    private class ErrorListener extends AbstractRunListener {
-        List<ErrorInfo> errors = []
-
-        @Override
-        void error(ErrorInfo error) {
-            errors.add(error)
-        }
-    }
-
+	@Override
+	void visitSpecAnnotation(Testcontainers annotation, SpecInfo spec) {
+		def listener = new ErrorListener()
+		def interceptor = new TestcontainersMethodInterceptor(spec, listener)
+		spec.addSetupSpecInterceptor(interceptor)
+		spec.addCleanupSpecInterceptor(interceptor)
+		spec.addSetupInterceptor(interceptor)
+		spec.addCleanupInterceptor(interceptor)
+
+		spec.addListener(listener)
+	}
+
+	private class ErrorListener extends AbstractRunListener {
+		List<ErrorInfo> errors = []
+
+		@Override
+		void error(ErrorInfo error) {
+			errors.add(error)
+		}
+	}
 }
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
index 16be002aeb1..2399a0a6e32 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
@@ -11,116 +11,116 @@ import org.testcontainers.spock.TestcontainersExtension.ErrorListener
 
 class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 
-    private final SpecInfo spec
-    private final ErrorListener errorListener
-
-    TestcontainersMethodInterceptor(SpecInfo spec, ErrorListener errorListener) {
-        this.spec = spec
-        this.errorListener = errorListener
-    }
-
-    @Override
-    void interceptSetupSpecMethod(IMethodInvocation invocation) throws Throwable {
-        def containers = findAllContainers(true)
-        startContainers(containers, invocation)
-
-        def compose = findAllComposeContainers(true)
-        startComposeContainers(compose, invocation)
-
-        invocation.proceed()
-    }
-
-    @Override
-    void interceptCleanupSpecMethod(IMethodInvocation invocation) throws Throwable {
-        def containers = findAllContainers(true)
-        stopContainers(containers, invocation)
-
-        def compose = findAllComposeContainers(true)
-        stopComposeContainers(compose, invocation)
-
-        invocation.proceed()
-    }
-
-    @Override
-    void interceptSetupMethod(IMethodInvocation invocation) throws Throwable {
-        def containers = findAllContainers(false)
-        startContainers(containers, invocation)
-
-        def compose = findAllComposeContainers(false)
-        startComposeContainers(compose, invocation)
-
-        invocation.proceed()
-    }
-
-
-    @Override
-    void interceptCleanupMethod(IMethodInvocation invocation) throws Throwable {
-        def containers = findAllContainers(false)
-        stopContainers(containers, invocation)
-
-        def compose = findAllComposeContainers(false)
-        stopComposeContainers(compose, invocation)
-
-        invocation.proceed()
-    }
-
-    private List<FieldInfo> findAllContainers(boolean shared) {
-        spec.allFields.findAll { FieldInfo f ->
-            GenericContainer.isAssignableFrom(f.type) && f.shared == shared
-        }
-    }
-
-    private List<FieldInfo> findAllComposeContainers(boolean shared) {
-        spec.allFields.findAll { FieldInfo f ->
-            DockerComposeContainer.isAssignableFrom(f.type) && f.shared == shared
-        }
-    }
-
-    private static void startContainers(List<FieldInfo> containers, IMethodInvocation invocation) {
-        containers.each { FieldInfo f ->
-            GenericContainer container = readContainerFromField(f, invocation)
-            if(!container.isRunning()){
-                container.start()
-            }
-
-            if (container instanceof TestLifecycleAware) {
-                def testDescription = SpockTestDescription.fromTestDescription(invocation)
-                (container as TestLifecycleAware).beforeTest(testDescription)
-            }
-        }
-    }
-
-    private void stopContainers(List<FieldInfo> containers, IMethodInvocation invocation) {
-        containers.each { FieldInfo f ->
-            GenericContainer container = readContainerFromField(f, invocation)
-
-            if (container instanceof TestLifecycleAware) {
-                // we assume first error is the one we want
-                def maybeException = Optional.ofNullable(errorListener.errors[0]?.exception)
-                def testDescription = SpockTestDescription.fromTestDescription(invocation)
-                (container as TestLifecycleAware).afterTest(testDescription, maybeException)
-            }
-
-            container.stop()
-        }
-    }
-
-    private static void startComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
-        compose.each { FieldInfo f ->
-            DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
-            c.start()
-        }
-    }
-
-    private static void stopComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
-        compose.each { FieldInfo f ->
-            DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
-            c.stop()
-        }
-    }
-
-
-    private static GenericContainer readContainerFromField(FieldInfo f, IMethodInvocation invocation) {
-        f.readValue(invocation.instance) as GenericContainer
-    }
+	private final SpecInfo spec
+	private final ErrorListener errorListener
+
+	TestcontainersMethodInterceptor(SpecInfo spec, ErrorListener errorListener) {
+		this.spec = spec
+		this.errorListener = errorListener
+	}
+
+	@Override
+	void interceptSetupSpecMethod(IMethodInvocation invocation) throws Throwable {
+		def containers = findAllContainers(true)
+		startContainers(containers, invocation)
+
+		def compose = findAllComposeContainers(true)
+		startComposeContainers(compose, invocation)
+
+		invocation.proceed()
+	}
+
+	@Override
+	void interceptCleanupSpecMethod(IMethodInvocation invocation) throws Throwable {
+		def containers = findAllContainers(true)
+		stopContainers(containers, invocation)
+
+		def compose = findAllComposeContainers(true)
+		stopComposeContainers(compose, invocation)
+
+		invocation.proceed()
+	}
+
+	@Override
+	void interceptSetupMethod(IMethodInvocation invocation) throws Throwable {
+		def containers = findAllContainers(false)
+		startContainers(containers, invocation)
+
+		def compose = findAllComposeContainers(false)
+		startComposeContainers(compose, invocation)
+
+		invocation.proceed()
+	}
+
+
+	@Override
+	void interceptCleanupMethod(IMethodInvocation invocation) throws Throwable {
+		def containers = findAllContainers(false)
+		stopContainers(containers, invocation)
+
+		def compose = findAllComposeContainers(false)
+		stopComposeContainers(compose, invocation)
+
+		invocation.proceed()
+	}
+
+	private List<FieldInfo> findAllContainers(boolean shared) {
+		spec.allFields.findAll { FieldInfo f ->
+			GenericContainer.isAssignableFrom(f.type) && f.shared == shared
+		}
+	}
+
+	private List<FieldInfo> findAllComposeContainers(boolean shared) {
+		spec.allFields.findAll { FieldInfo f ->
+			DockerComposeContainer.isAssignableFrom(f.type) && f.shared == shared
+		}
+	}
+
+	private static void startContainers(List<FieldInfo> containers, IMethodInvocation invocation) {
+		containers.each { FieldInfo f ->
+			GenericContainer container = readContainerFromField(f, invocation)
+			if(!container.isRunning()){
+				container.start()
+			}
+
+			if (container instanceof TestLifecycleAware) {
+				def testDescription = SpockTestDescription.fromTestDescription(invocation)
+				(container as TestLifecycleAware).beforeTest(testDescription)
+			}
+		}
+	}
+
+	private void stopContainers(List<FieldInfo> containers, IMethodInvocation invocation) {
+		containers.each { FieldInfo f ->
+			GenericContainer container = readContainerFromField(f, invocation)
+
+			if (container instanceof TestLifecycleAware) {
+				// we assume first error is the one we want
+				def maybeException = Optional.ofNullable(errorListener.errors[0]?.exception)
+				def testDescription = SpockTestDescription.fromTestDescription(invocation)
+				(container as TestLifecycleAware).afterTest(testDescription, maybeException)
+			}
+
+			container.stop()
+		}
+	}
+
+	private static void startComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
+		compose.each { FieldInfo f ->
+			DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
+			c.start()
+		}
+	}
+
+	private static void stopComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
+		compose.each { FieldInfo f ->
+			DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
+			c.stop()
+		}
+	}
+
+
+	private static GenericContainer readContainerFromField(FieldInfo f, IMethodInvocation invocation) {
+		f.readValue(invocation.instance) as GenericContainer
+	}
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
index b952dd1c5dc..7294d534275 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
@@ -9,27 +9,27 @@ import spock.lang.Specification
 @Testcontainers
 class ComposeContainerIT extends Specification {
 
-    DockerComposeContainer composeContainer = new DockerComposeContainer(
-            new File("src/test/resources/docker-compose.yml"))
-            .withExposedService("whoami_1", 80, Wait.forHttp("/"))
+	DockerComposeContainer composeContainer = new DockerComposeContainer(
+	new File("src/test/resources/docker-compose.yml"))
+	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
 
-    String host
+	String host
 
-    int port
+	int port
 
-    def setup() {
-        host = composeContainer.getServiceHost("whoami_1", 80)
-        port = composeContainer.getServicePort("whoami_1", 80)
-    }
+	def setup() {
+		host = composeContainer.getServiceHost("whoami_1", 80)
+		port = composeContainer.getServicePort("whoami_1", 80)
+	}
 
-    def "running compose defined container is accessible on configured port"() {
-        given: "a http client"
-        def client = HttpClientBuilder.create().build()
+	def "running compose defined container is accessible on configured port"() {
+		given: "a http client"
+		def client = HttpClientBuilder.create().build()
 
-        when: "accessing web server"
-        def response = client.execute(new HttpGet("http://$host:$port"))
+		when: "accessing web server"
+		def response = client.execute(new HttpGet("http://$host:$port"))
 
-        then: "docker container is running and returns http status code 200"
-        response.statusLine.statusCode == 200
-    }
+		then: "docker container is running and returns http status code 200"
+		response.statusLine.statusCode == 200
+	}
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy
index 639b46f5886..2f44408fed6 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/MySqlContainerIT.groovy
@@ -14,13 +14,11 @@ import spock.lang.Specification
 @Testcontainers
 class MySqlContainerIT extends Specification {
 
-    @Shared
-    MySQLContainer mySQLContainer = new MySQLContainer(SpockTestImages.MYSQL_IMAGE)
-
-    def "dummy test"() {
-        expect:
-        mySQLContainer.isRunning()
-    }
-
+	@Shared
+	MySQLContainer mySQLContainer = new MySQLContainer(SpockTestImages.MYSQL_IMAGE)
 
+	def "dummy test"() {
+		expect:
+		mySQLContainer.isRunning()
+	}
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
index a886d552732..19edca4b459 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
@@ -13,34 +13,34 @@ import java.sql.Statement
 @Testcontainers
 class PostgresContainerIT extends Specification {
 
-    @Shared
-    PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(SpockTestImages.POSTGRES_TEST_IMAGE)
-            .withDatabaseName("foo")
-            .withUsername("foo")
-            .withPassword("secret")
-
-    def "waits until postgres accepts jdbc connections"() {
-
-        given: "a jdbc connection"
-        HikariConfig hikariConfig = new HikariConfig()
-        hikariConfig.setJdbcUrl(postgreSQLContainer.jdbcUrl)
-        hikariConfig.setUsername("foo")
-        hikariConfig.setPassword("secret")
-        HikariDataSource ds = new HikariDataSource(hikariConfig)
-
-        when: "querying the database"
-        Statement statement = ds.getConnection().createStatement()
-        statement.execute("SELECT 1")
-        ResultSet resultSet = statement.getResultSet()
-        resultSet.next()
-
-        then: "result is returned"
-        int resultSetInt = resultSet.getInt(1)
-        resultSetInt == 1
-
-        cleanup:
-        ds.close()
-    }
+	@Shared
+	PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(SpockTestImages.POSTGRES_TEST_IMAGE)
+	.withDatabaseName("foo")
+	.withUsername("foo")
+	.withPassword("secret")
+
+	def "waits until postgres accepts jdbc connections"() {
+
+		given: "a jdbc connection"
+		HikariConfig hikariConfig = new HikariConfig()
+		hikariConfig.setJdbcUrl(postgreSQLContainer.jdbcUrl)
+		hikariConfig.setUsername("foo")
+		hikariConfig.setPassword("secret")
+		HikariDataSource ds = new HikariDataSource(hikariConfig)
+
+		when: "querying the database"
+		Statement statement = ds.getConnection().createStatement()
+		statement.execute("SELECT 1")
+		ResultSet resultSet = statement.getResultSet()
+		resultSet.next()
+
+		then: "result is returned"
+		int resultSetInt = resultSet.getInt(1)
+		resultSetInt == 1
+
+		cleanup:
+		ds.close()
+	}
 
 }
 // }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
index dd2ce9f5b3c..f728212278f 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
@@ -10,28 +10,28 @@ import spock.lang.Specification
 @Testcontainers
 class SharedComposeContainerIT extends Specification {
 
-    @Shared
-    DockerComposeContainer composeContainer = new DockerComposeContainer(
-            new File("src/test/resources/docker-compose.yml"))
-            .withExposedService("whoami_1", 80, Wait.forHttp("/"))
+	@Shared
+	DockerComposeContainer composeContainer = new DockerComposeContainer(
+	new File("src/test/resources/docker-compose.yml"))
+	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
 
-    String host
+	String host
 
-    int port
+	int port
 
-    def setup() {
-        host = composeContainer.getServiceHost("whoami_1", 80)
-        port = composeContainer.getServicePort("whoami_1", 80)
-    }
+	def setup() {
+		host = composeContainer.getServiceHost("whoami_1", 80)
+		port = composeContainer.getServicePort("whoami_1", 80)
+	}
 
-    def "running compose defined container is accessible on configured port"() {
-        given: "a http client"
-        def client = HttpClientBuilder.create().build()
+	def "running compose defined container is accessible on configured port"() {
+		given: "a http client"
+		def client = HttpClientBuilder.create().build()
 
-        when: "accessing web server"
-        def response = client.execute(new HttpGet("http://$host:$port"))
+		when: "accessing web server"
+		def response = client.execute(new HttpGet("http://$host:$port"))
 
-        then: "docker container is running and returns http status code 200"
-        response.statusLine.statusCode == 200
-    }
+		then: "docker container is running and returns http status code 200"
+		response.statusLine.statusCode == 200
+	}
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
index b9ef64fe475..41432e5e514 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -3,8 +3,8 @@ package org.testcontainers.spock
 import org.testcontainers.utility.DockerImageName
 
 interface SpockTestImages {
-    DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.34")
-    DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
-    DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
-    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14")
+	DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.34")
+	DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
+	DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
+	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14")
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
index c28643910a4..567998281a7 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestHierarchyIT.groovy
@@ -9,17 +9,15 @@ import spock.lang.Shared
  */
 class TestHierarchyIT extends MySqlContainerIT {
 
-    @Shared
-    PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(SpockTestImages.POSTGRES_TEST_IMAGE)
-            .withDatabaseName("foo")
-            .withUsername("foo")
-            .withPassword("secret")
-
-    def "both containers are running"() {
-        expect:
-        postgreSQLContainer.isRunning()
-        mySQLContainer.isRunning()
-
-    }
+	@Shared
+	PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(SpockTestImages.POSTGRES_TEST_IMAGE)
+	.withDatabaseName("foo")
+	.withUsername("foo")
+	.withPassword("secret")
 
+	def "both containers are running"() {
+		expect:
+		postgreSQLContainer.isRunning()
+		mySQLContainer.isRunning()
+	}
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
index eb628fd2f33..7502d097008 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareContainerMock.java
@@ -8,20 +8,22 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.testcontainers.spock.SpockTestImages.TINY_IMAGE;
-
-public class TestLifecycleAwareContainerMock extends GenericContainer<TestLifecycleAwareContainerMock> implements TestLifecycleAware {
+public class TestLifecycleAwareContainerMock
+    extends GenericContainer<TestLifecycleAwareContainerMock>
+    implements TestLifecycleAware {
 
     static final String BEFORE_TEST = "beforeTest";
+
     static final String AFTER_TEST = "afterTest";
 
     final List<String> lifecycleMethodCalls = new ArrayList<>();
+
     final List<String> lifecycleFilesystemFriendlyNames = new ArrayList<>();
 
     Throwable capturedThrowable;
 
     public TestLifecycleAwareContainerMock() {
-        super(TINY_IMAGE);
+        super(SpockTestImages.TINY_IMAGE);
     }
 
     @Override
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy
index 18f7517ea3f..fae834ea422 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestLifecycleAwareIT.groovy
@@ -7,12 +7,12 @@ import spock.util.EmbeddedSpecRunner
 
 class TestLifecycleAwareIT extends Specification {
 
-    @Unroll("When failing test is #fails, afterTest receives '#filesystemFriendlyNames' and throwable starting with message '#errorMessageStartsWith'")
-    def "lifecycle awareness"() {
-        given:
+	@Unroll("When failing test is #fails, afterTest receives '#filesystemFriendlyNames' and throwable starting with message '#errorMessageStartsWith'")
+	def "lifecycle awareness"() {
+		given:
 
-        @Language("groovy")
-        String myTest = """
+		@Language("groovy")
+				String myTest = """
 import org.testcontainers.spock.Testcontainers
 import org.testcontainers.containers.GenericContainer
 import spock.lang.Specification
@@ -28,28 +28,27 @@ class TestLifecycleAwareIT extends Specification {
     }
 }
 """
-        and:
-        def container = new TestLifecycleAwareContainerMock()
-        System.properties["org.testcontainers.container"] = container
-        System.properties["org.testcontainers.shouldFail"] = fails
-
-        when: "executing the test"
-        def runner = new EmbeddedSpecRunner(throwFailure: false)
-        runner.run(myTest)
-
-        then: "mock container received lifecycle calls as expected"
-        container.lifecycleMethodCalls == ["beforeTest", "afterTest"]
-        container.lifecycleFilesystemFriendlyNames.join(",") == filesystemFriendlyNames
-        if (errorMessageStartsWith) {
-            assert container.capturedThrowable.message.startsWith(errorMessageStartsWith)
-        } else {
-            assert container.capturedThrowable == null
-        }
-
-        where:
-        fails | filesystemFriendlyNames             | errorMessageStartsWith
-        false | 'TestLifecycleAwareIT-perform+test' | null
-        true  | 'TestLifecycleAwareIT-perform+test' | "Condition not satisfied:"
-    }
-
+		and:
+		def container = new TestLifecycleAwareContainerMock()
+		System.properties["org.testcontainers.container"] = container
+		System.properties["org.testcontainers.shouldFail"] = fails
+
+		when: "executing the test"
+		def runner = new EmbeddedSpecRunner(throwFailure: false)
+		runner.run(myTest)
+
+		then: "mock container received lifecycle calls as expected"
+		container.lifecycleMethodCalls == ["beforeTest", "afterTest"]
+		container.lifecycleFilesystemFriendlyNames.join(",") == filesystemFriendlyNames
+		if (errorMessageStartsWith) {
+			assert container.capturedThrowable.message.startsWith(errorMessageStartsWith)
+		} else {
+			assert container.capturedThrowable == null
+		}
+
+		where:
+		fails | filesystemFriendlyNames             | errorMessageStartsWith
+		false | 'TestLifecycleAwareIT-perform+test' | null
+		true  | 'TestLifecycleAwareIT-perform+test' | "Condition not satisfied:"
+	}
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy
index 81ed0eea724..ebbb1de2474 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersRestartBetweenTestsIT.groovy
@@ -9,23 +9,22 @@ import spock.lang.Stepwise
 @Testcontainers
 class TestcontainersRestartBetweenTestsIT extends Specification {
 
-    GenericContainer genericContainer = new GenericContainer(SpockTestImages.HTTPD_IMAGE)
-            .withExposedPorts(80)
+	GenericContainer genericContainer = new GenericContainer(SpockTestImages.HTTPD_IMAGE)
+	.withExposedPorts(80)
 
-    @Shared
-    String lastContainerId
+	@Shared
+	String lastContainerId
 
-    def "retrieving first id"() {
-        when:
-        lastContainerId = genericContainer.containerId
+	def "retrieving first id"() {
+		when:
+		lastContainerId = genericContainer.containerId
 
-        then:
-        true
-    }
-
-    def "containers is recreated between tests"() {
-        expect:
-        genericContainer.containerId != lastContainerId
-    }
+		then:
+		true
+	}
 
+	def "containers is recreated between tests"() {
+		expect:
+		genericContainer.containerId != lastContainerId
+	}
 }
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
index 23b761fcc38..dd2f8443772 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersSharedContainerIT.groovy
@@ -13,35 +13,34 @@ import spock.lang.Stepwise
 @Testcontainers
 class TestcontainersSharedContainerIT extends Specification {
 
-    @Shared
-    GenericContainer genericContainer = new GenericContainer(SpockTestImages.HTTPD_IMAGE)
-            .withExposedPorts(80)
-
-    @Shared
-    String lastContainerId
-
-    def "starts accessible docker container"() {
-        given: "a http client"
-        def client = HttpClientBuilder.create().build()
-        lastContainerId = genericContainer.containerId
-
-        when: "accessing web server"
-        CloseableHttpResponse response = performHttpRequest(client)
-
-        then: "docker container is running and returns http status code 200"
-        response.statusLine.statusCode == 200
-    }
-
-    def "containers keeps on running between features"() {
-        expect:
-        genericContainer.containerId == lastContainerId
-    }
-
-    private CloseableHttpResponse performHttpRequest(CloseableHttpClient client) {
-        String ip = genericContainer.host
-        String port = genericContainer.getMappedPort(80)
-        def response = client.execute(new HttpGet("http://$ip:$port"))
-        response
-    }
-
+	@Shared
+	GenericContainer genericContainer = new GenericContainer(SpockTestImages.HTTPD_IMAGE)
+	.withExposedPorts(80)
+
+	@Shared
+	String lastContainerId
+
+	def "starts accessible docker container"() {
+		given: "a http client"
+		def client = HttpClientBuilder.create().build()
+		lastContainerId = genericContainer.containerId
+
+		when: "accessing web server"
+		CloseableHttpResponse response = performHttpRequest(client)
+
+		then: "docker container is running and returns http status code 200"
+		response.statusLine.statusCode == 200
+	}
+
+	def "containers keeps on running between features"() {
+		expect:
+		genericContainer.containerId == lastContainerId
+	}
+
+	private CloseableHttpResponse performHttpRequest(CloseableHttpClient client) {
+		String ip = genericContainer.host
+		String port = genericContainer.getMappedPort(80)
+		def response = client.execute(new HttpGet("http://$ip:$port"))
+		response
+	}
 }
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index e22cc1fdd55..ed8413a2a31 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -22,13 +22,19 @@
 public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy");
+
     private static final String DEFAULT_TAG = "2.1.0";
+
     private static final int TOXIPROXY_CONTROL_PORT = 8474;
+
     private static final int FIRST_PROXIED_PORT = 8666;
+
     private static final int LAST_PROXIED_PORT = 8666 + 31;
 
     private ToxiproxyClient client;
+
     private final Map<String, ContainerProxy> proxies = new HashMap<>();
+
     private final AtomicInteger nextPort = new AtomicInteger(FIRST_PROXIED_PORT);
 
     /**
@@ -45,7 +51,6 @@ public ToxiproxyContainer(String dockerImageName) {
 
     public ToxiproxyContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPorts(TOXIPROXY_CONTROL_PORT);
@@ -99,42 +104,55 @@ public ContainerProxy getProxy(GenericContainer<?> container, int port) {
     public ContainerProxy getProxy(String hostname, int port) {
         String upstream = hostname + ":" + port;
 
-        return proxies.computeIfAbsent(upstream, __ -> {
-            try {
-                final int toxiPort = nextPort.getAndIncrement();
-                if (toxiPort > LAST_PROXIED_PORT) {
-                    throw new IllegalStateException("Maximum number of proxies exceeded");
+        return proxies.computeIfAbsent(
+            upstream,
+            __ -> {
+                try {
+                    final int toxiPort = nextPort.getAndIncrement();
+                    if (toxiPort > LAST_PROXIED_PORT) {
+                        throw new IllegalStateException("Maximum number of proxies exceeded");
+                    }
+
+                    final Proxy proxy = client.createProxy(upstream, "0.0.0.0:" + toxiPort, upstream);
+                    final int mappedPort = getMappedPort(toxiPort);
+                    return new ContainerProxy(proxy, getHost(), mappedPort, toxiPort);
+                } catch (IOException e) {
+                    throw new RuntimeException("Proxy could not be created", e);
                 }
-
-                final Proxy proxy = client.createProxy(upstream, "0.0.0.0:" + toxiPort, upstream);
-                final int mappedPort = getMappedPort(toxiPort);
-                return new ContainerProxy(proxy, getHost(), mappedPort, toxiPort);
-            } catch (IOException e) {
-                throw new RuntimeException("Proxy could not be created", e);
             }
-        });
+        );
     }
 
     @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
     public static class ContainerProxy {
+
         private static final String CUT_CONNECTION_DOWNSTREAM = "CUT_CONNECTION_DOWNSTREAM";
+
         private static final String CUT_CONNECTION_UPSTREAM = "CUT_CONNECTION_UPSTREAM";
+
         private final Proxy toxi;
+
         /**
          * The IP address that this proxy container may be reached on from the host machine.
          */
-        @Getter private final String containerIpAddress;
+        @Getter
+        private final String containerIpAddress;
+
         /**
          * The mapped port of this proxy. This is a port of the host machine. It can be used to
          * access the Toxiproxy container from the host machine.
          */
-        @Getter private final int proxyPort;
+        @Getter
+        private final int proxyPort;
+
         /**
          * The original (exposed) port of this proxy. This is a port of the Toxiproxy Docker
          * container. It can be used to access this container from a different Docker container
          * on the same network.
          */
-        @Getter private final int originalProxyPort;
+        @Getter
+        private final int originalProxyPort;
+
         private boolean isCurrentlyCut;
 
         public String getName() {
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 3177fb2e8e8..c5982bc45c1 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -10,7 +10,6 @@
 import java.io.IOException;
 import java.time.Duration;
 
-import static java.lang.String.format;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
@@ -19,6 +18,7 @@ public class ToxiproxyTest {
 
     private static final Duration JEDIS_TIMEOUT = Duration.ofSeconds(10);
 
+    // spotless:off
     // creatingProxy {
     // An alias that can be used to resolve the Toxiproxy container by name in the network it is connected to.
     // It can be used as a hostname of the Toxiproxy container by other containers in the same network.
@@ -29,6 +29,7 @@ public class ToxiproxyTest {
     public Network network = Network.newNetwork();
 
     private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:5.0.4");
+
     // The target container - this could be anything
     @Rule
     public GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
@@ -36,12 +37,15 @@ public class ToxiproxyTest {
         .withNetwork(network);
 
     private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("shopify/toxiproxy:2.1.0");
+
     // Toxiproxy container, which will be used as a TCP proxy
     @Rule
     public ToxiproxyContainer toxiproxy = new ToxiproxyContainer(TOXIPROXY_IMAGE)
         .withNetwork(network)
         .withNetworkAliases(TOXIPROXY_NETWORK_ALIAS);
+
     // }
+    // spotless:on
 
     @Test
     public void testDirect() {
@@ -68,12 +72,14 @@ public void testLatencyViaProxy() throws IOException {
 
         checkCallWithLatency(jedis, "without interference", 0, 250);
 
+        // spotless:off
         // addingLatency {
         proxy.toxics()
             .latency("latency", ToxicDirection.DOWNSTREAM, 1_100)
             .setJitter(100);
         // from now on the connection latency should be from 1000-1200 ms.
         // }
+        // spotless:on
 
         checkCallWithLatency(jedis, "with interference", 1_000, 1_500);
     }
@@ -84,30 +90,42 @@ public void testConnectionCut() {
         final Jedis jedis = createJedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
         jedis.set("somekey", "somevalue");
 
-        assertEquals("access to the container works OK before cutting the connection", "somevalue", jedis.get("somekey"));
+        assertEquals(
+            "access to the container works OK before cutting the connection",
+            "somevalue",
+            jedis.get("somekey")
+        );
 
         // disableProxy {
         proxy.setConnectionCut(true);
 
         // for example, expect failure when the connection is cut
-        assertThrows("calls fail when the connection is cut",
-            JedisConnectionException.class, () -> {
+        assertThrows(
+            "calls fail when the connection is cut",
+            JedisConnectionException.class,
+            () -> {
                 jedis.get("somekey");
-            });
+            }
+        );
 
         proxy.setConnectionCut(false);
 
         // and with the connection re-established, expect success
-        assertEquals("access to the container works OK after re-establishing the connection", "somevalue", jedis.get("somekey"));
+        assertEquals(
+            "access to the container works OK after re-establishing the connection",
+            "somevalue",
+            jedis.get("somekey")
+        );
         // }
     }
 
     @Test
     public void testMultipleProxiesCanBeCreated() {
-        try (GenericContainer<?> secondRedis = new GenericContainer<>(REDIS_IMAGE)
-            .withExposedPorts(6379)
-            .withNetwork(network)) {
-
+        try (
+            GenericContainer<?> secondRedis = new GenericContainer<>(REDIS_IMAGE)
+                .withExposedPorts(6379)
+                .withNetwork(network)
+        ) {
             secondRedis.start();
 
             final ToxiproxyContainer.ContainerProxy firstProxy = toxiproxy.getProxy(redis, 6379);
@@ -121,10 +139,13 @@ public void testMultipleProxiesCanBeCreated() {
 
             firstProxy.setConnectionCut(true);
 
-            assertThrows("calls fail when the connection is cut, for only the relevant proxy",
-                JedisConnectionException.class, () -> {
+            assertThrows(
+                "calls fail when the connection is cut, for only the relevant proxy",
+                JedisConnectionException.class,
+                () -> {
                     firstJedis.get("somekey");
-                });
+                }
+            );
 
             assertEquals("access via a different proxy is OK", "somevalue", secondJedis.get("somekey"));
         }
@@ -142,11 +163,19 @@ public void testOriginalAndMappedPorts() {
 
         final ToxiproxyContainer.ContainerProxy proxy1 = toxiproxy.getProxy("hostname1", 8080);
         assertEquals("original port is correct", 8667, proxy1.getOriginalProxyPort());
-        assertEquals("mapped port is correct", toxiproxy.getMappedPort(proxy1.getOriginalProxyPort()), proxy1.getProxyPort());
+        assertEquals(
+            "mapped port is correct",
+            toxiproxy.getMappedPort(proxy1.getOriginalProxyPort()),
+            proxy1.getProxyPort()
+        );
 
         final ToxiproxyContainer.ContainerProxy proxy2 = toxiproxy.getProxy("hostname2", 9090);
         assertEquals("original port is correct", 8668, proxy2.getOriginalProxyPort());
-        assertEquals("mapped port is correct", toxiproxy.getMappedPort(proxy2.getOriginalProxyPort()), proxy2.getProxyPort());
+        assertEquals(
+            "mapped port is correct",
+            toxiproxy.getMappedPort(proxy2.getOriginalProxyPort()),
+            proxy2.getProxyPort()
+        );
     }
 
     @Test
@@ -163,15 +192,26 @@ public void testControlPort() {
         assertEquals("control port is mapped from port 8474", toxiproxy.getMappedPort(8474), controlPort);
     }
 
-    private void checkCallWithLatency(Jedis jedis, final String description, int expectedMinLatency, long expectedMaxLatency) {
+    private void checkCallWithLatency(
+        Jedis jedis,
+        final String description,
+        int expectedMinLatency,
+        long expectedMaxLatency
+    ) {
         final long start = System.currentTimeMillis();
         String s = jedis.get("somekey");
         final long end = System.currentTimeMillis();
         final long duration = end - start;
 
-        assertEquals(format("access to the container %s works OK", description), "somevalue", s);
-        assertTrue(format("%s there is at least %dms latency", description, expectedMinLatency), duration >= expectedMinLatency);
-        assertTrue(format("%s there is no more than %dms latency", description, expectedMaxLatency), duration < expectedMaxLatency);
+        assertEquals(String.format("access to the container %s works OK", description), "somevalue", s);
+        assertTrue(
+            String.format("%s there is at least %dms latency", description, expectedMinLatency),
+            duration >= expectedMinLatency
+        );
+        assertTrue(
+            String.format("%s there is no more than %dms latency", description, expectedMaxLatency),
+            duration < expectedMaxLatency
+        );
     }
 
     private static Jedis createJedis(String host, int port) {
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
index 825340459f3..9ed18e96d28 100644
--- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import com.google.common.base.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.VisibleForTesting;
 import org.testcontainers.utility.DockerImageName;
@@ -9,19 +10,21 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.google.common.base.Strings.nullToEmpty;
-import static java.lang.String.format;
-
 public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
+
     static final String NAME = "trino";
+
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("trinodb/trino");
+
     static final String IMAGE = "trinodb/trino";
+
     @VisibleForTesting
     static final String DEFAULT_TAG = "352";
 
     private static final int TRINO_PORT = 8080;
 
     private String username = "test";
+
     private String catalog = null;
 
     public TrinoContainer(final String dockerImageName) {
@@ -30,7 +33,6 @@ public TrinoContainer(final String dockerImageName) {
 
     public TrinoContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         addExposedPort(TRINO_PORT);
     }
@@ -48,7 +50,12 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return format("jdbc:trino://%s:%s/%s", getHost(), getMappedPort(TRINO_PORT), nullToEmpty(catalog));
+        return String.format(
+            "jdbc:trino://%s:%s/%s",
+            getHost(),
+            getMappedPort(TRINO_PORT),
+            Strings.nullToEmpty(catalog)
+        );
     }
 
     @Override
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java
index 233fc1b9b07..30d877c9e4a 100644
--- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java
@@ -6,6 +6,7 @@
  * Factory for Trino containers.
  */
 public class TrinoContainerProvider extends JdbcDatabaseContainerProvider {
+
     @Override
     public boolean supports(String databaseType) {
         return databaseType.equals(TrinoContainer.NAME);
diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
index d7f8014ca9a..97bbdf6dedd 100644
--- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
@@ -1,20 +1,12 @@
 package org.testcontainers.containers;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.testcontainers.TrinoTestImages;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
-import static java.lang.Integer.parseInt;
-import static java.lang.String.format;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -25,9 +17,11 @@ public class TrinoContainerTest {
     public void testSimple() throws Exception {
         try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) {
             trino.start();
-            try (Connection connection = trino.createConnection();
-                 Statement statement = connection.createStatement();
-                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+            try (
+                Connection connection = trino.createConnection();
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
+            ) {
                 assertTrue("No result", resultSet.next());
                 assertEquals("Trino version", TrinoContainer.DEFAULT_TAG, resultSet.getString("node_version"));
             }
@@ -38,11 +32,17 @@ public void testSimple() throws Exception {
     public void testSpecificVersion() throws Exception {
         try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE)) {
             trino.start();
-            try (Connection connection = trino.createConnection();
-                 Statement statement = connection.createStatement();
-                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")) {
+            try (
+                Connection connection = trino.createConnection();
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
+            ) {
                 assertTrue("No result", resultSet.next());
-                assertEquals("Trino version", TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(), resultSet.getString("node_version"));
+                assertEquals(
+                    "Trino version",
+                    TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(),
+                    resultSet.getString("node_version")
+                );
             }
         }
     }
@@ -52,9 +52,11 @@ public void testInitScript() throws Exception {
         try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) {
             trino.withInitScript("initial.sql");
             trino.start();
-            try (Connection connection = trino.createConnection();
-                 Statement statement = connection.createStatement();
-                 ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")) {
+            try (
+                Connection connection = trino.createConnection();
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")
+            ) {
                 assertTrue("No result", resultSet.next());
                 assertEquals("Value", 12345678909324L, resultSet.getObject("a"));
                 assertFalse("Too many result", resultSet.next());
diff --git a/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java b/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
index 8f06aef7278..9ec98c2e6d7 100644
--- a/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
@@ -4,18 +4,18 @@
 import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 
-import static java.util.Arrays.asList;
-
 @RunWith(Parameterized.class)
 public class TrinoJDBCDriverTest extends AbstractJDBCDriverTest {
 
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
-        return asList(
-            new Object[][]{
-                {"jdbc:tc:trino:352://hostname/", EnumSet.of(Options.PmdKnownBroken)},
-            });
+        return Arrays.asList(
+            new Object[][] { //
+                { "jdbc:tc:trino:352://hostname/", EnumSet.of(Options.PmdKnownBroken) },
+            }
+        );
     }
 }
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 37e78a14f95..31bb1f31d9f 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.vault;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Capability;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
@@ -14,9 +15,6 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static com.github.dockerjava.api.model.Capability.IPC_LOCK;
-
-
 /**
  * GenericContainer subclass for Vault specific configuration and features. The main feature is the
  * withSecretInVault method, where users can specify which secrets to be pre-loaded into Vault for
@@ -27,11 +25,13 @@
 public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("vault");
+
     private static final String DEFAULT_TAG = "1.1.3";
 
     private static final int VAULT_PORT = 8200;
 
     private Map<String, List<String>> secretsMap = new HashMap<>();
+
     private List<String> initCommands = new ArrayList<>();
 
     private int port = VAULT_PORT;
@@ -50,13 +50,12 @@ public VaultContainer(String dockerImageName) {
 
     public VaultContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         // Use the vault healthcheck endpoint to check for readiness, per https://www.vaultproject.io/api/system/health.html
         setWaitStrategy(Wait.forHttp("/v1/sys/health").forStatusCode(200));
 
-        withCreateContainerCmdModifier(cmd -> cmd.withCapAdd(IPC_LOCK));
+        withCreateContainerCmdModifier(cmd -> cmd.withCapAdd(Capability.IPC_LOCK));
         withEnv("VAULT_ADDR", "http://0.0.0.0:" + port);
         withExposedPorts(port);
     }
@@ -72,7 +71,12 @@ private void addSecrets() {
             try {
                 this.execInContainer(buildExecCommand(secretsMap)).getStdout().contains("Success");
             } catch (IOException | InterruptedException e) {
-                logger().error("Failed to add these secrets {} into Vault via exec command. Exception message: {}", secretsMap, e.getMessage());
+                logger()
+                    .error(
+                        "Failed to add these secrets {} into Vault via exec command. Exception message: {}",
+                        secretsMap,
+                        e.getMessage()
+                    );
             }
         }
     }
@@ -83,22 +87,34 @@ private String[] buildExecCommand(Map<String, List<String>> map) {
             stringBuilder.append(" && vault kv put " + path);
             secrets.forEach(item -> stringBuilder.append(" " + item));
         });
-        return new String[]{"/bin/sh", "-c", stringBuilder.toString().substring(4)};
+        return new String[] { "/bin/sh", "-c", stringBuilder.toString().substring(4) };
     }
 
     private void runInitCommands() {
         if (!initCommands.isEmpty()) {
-            String commands = initCommands.stream()
-                                    .map(command -> "vault " + command)
-                                    .collect(Collectors.joining(" && "));
+            String commands = initCommands
+                .stream()
+                .map(command -> "vault " + command)
+                .collect(Collectors.joining(" && "));
             try {
-                ExecResult execResult = this.execInContainer(new String[]{"/bin/sh", "-c", commands});
+                ExecResult execResult = this.execInContainer(new String[] { "/bin/sh", "-c", commands });
                 if (execResult.getExitCode() != 0) {
-                    logger().error("Failed to execute these init commands {}. Exit code {}. Stdout {}. Stderr {}",
-                                    initCommands, execResult.getExitCode(), execResult.getStdout(), execResult.getStderr());
+                    logger()
+                        .error(
+                            "Failed to execute these init commands {}. Exit code {}. Stdout {}. Stderr {}",
+                            initCommands,
+                            execResult.getExitCode(),
+                            execResult.getStdout(),
+                            execResult.getStderr()
+                        );
                 }
             } catch (IOException | InterruptedException e) {
-                logger().error("Failed to execute these init commands {}. Exception message: {}", initCommands, e.getMessage());
+                logger()
+                    .error(
+                        "Failed to execute these init commands {}. Exception message: {}",
+                        initCommands,
+                        e.getMessage()
+                    );
             }
         }
     }
@@ -166,7 +182,7 @@ public SELF withSecretInVault(String path, String firstSecret, String... remaini
 
     /**
      * Run initialization commands using the vault cli.
-     * 
+     *
      * Useful for enableing more secret engines like:
      * <pre>
      *     .withInitCommand("secrets enable pki")
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java
index 58b22f975ff..e5f0db784a8 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultLogLevel.java
@@ -4,7 +4,11 @@
  * Vault preset of logging levels.
  */
 public enum VaultLogLevel {
-    Trace("trace"), Debug("debug"), Info("info"), Warn("warn"), Error("err");
+    Trace("trace"),
+    Debug("debug"),
+    Info("info"),
+    Warn("warn"),
+    Error("err");
 
     public final String config;
 
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
index 4a1a800da17..cd1f1a8acea 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
@@ -10,7 +10,6 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testcontainers.vault.VaultTestImages.VAULT_IMAGE;
 
 public class VaultClientTest {
 
@@ -19,10 +18,9 @@ public class VaultClientTest {
     @Test
     public void writeAndReadMultipleValues() throws VaultException {
         try (
-            VaultContainer<?> vaultContainer = new VaultContainer<>(VAULT_IMAGE)
-                    .withVaultToken(VAULT_TOKEN)
+            VaultContainer<?> vaultContainer = new VaultContainer<>(VaultTestImages.VAULT_IMAGE)
+                .withVaultToken(VAULT_TOKEN)
         ) {
-
             vaultContainer.start();
 
             final VaultConfig config = new VaultConfig()
@@ -37,22 +35,14 @@ public void writeAndReadMultipleValues() throws VaultException {
             secrets.put("other_value", "another world");
 
             // Write operation
-            final LogicalResponse writeResponse = vault.logical()
-                .write("secret/hello", secrets);
+            final LogicalResponse writeResponse = vault.logical().write("secret/hello", secrets);
 
             assertThat(writeResponse.getRestResponse().getStatus()).isEqualTo(200);
 
             // Read operation
-            final Map<String, String> value = vault.logical()
-                .read("secret/hello")
-                .getData();
-
-
-            assertThat(value)
-                .containsEntry("value", "world")
-                .containsEntry("other_value", "another world");
+            final Map<String, String> value = vault.logical().read("secret/hello").getData();
 
+            assertThat(value).containsEntry("value", "world").containsEntry("other_value", "another world");
         }
-
     }
 }
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index 9dee4c21416..22310bf7a23 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -7,7 +7,7 @@
 import java.io.IOException;
 
 import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -22,24 +22,38 @@ public class VaultContainerTest {
     public static VaultContainer<?> vaultContainer = new VaultContainer<>(VaultTestImages.VAULT_IMAGE)
         .withVaultToken(VAULT_TOKEN)
         .withSecretInVault("secret/testing1", "top_secret=password123")
-        .withSecretInVault("secret/testing2",
+        .withSecretInVault(
+            "secret/testing2",
             "secret_one=password1",
             "secret_two=password2",
             "secret_three=password3",
             "secret_three=password3",
-            "secret_four=password4")
+            "secret_four=password4"
+        )
         .withInitCommand("secrets enable transit", "write -f transit/keys/my-key");
 
     @Test
     public void readFirstSecretPathWithCli() throws IOException, InterruptedException {
-        GenericContainer.ExecResult result = vaultContainer.execInContainer("vault", "kv", "get", "-format=json", "secret/testing1");
+        GenericContainer.ExecResult result = vaultContainer.execInContainer(
+            "vault",
+            "kv",
+            "get",
+            "-format=json",
+            "secret/testing1"
+        );
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
         assertThat(output, containsString("password123"));
     }
 
     @Test
     public void readSecondSecretPathWithCli() throws IOException, InterruptedException {
-        GenericContainer.ExecResult result = vaultContainer.execInContainer("vault", "kv", "get", "-format=json", "secret/testing2");
+        GenericContainer.ExecResult result = vaultContainer.execInContainer(
+            "vault",
+            "kv",
+            "get",
+            "-format=json",
+            "secret/testing2"
+        );
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
         System.out.println("output = " + output);
         assertThat(output, containsString("password1"));
@@ -50,40 +64,44 @@ public void readSecondSecretPathWithCli() throws IOException, InterruptedExcepti
 
     @Test
     public void readFirstSecretPathOverHttpApi() throws InterruptedException {
-        given().
-            header("X-Vault-Token", VAULT_TOKEN).
-            when().
-            get("http://" + getHostAndPort() + "/v1/secret/data/testing1").
-            then().
-            assertThat().body("data.data.top_secret", equalTo("password123"));
+        given()
+            .header("X-Vault-Token", VAULT_TOKEN)
+            .when()
+            .get("http://" + getHostAndPort() + "/v1/secret/data/testing1")
+            .then()
+            .assertThat()
+            .body("data.data.top_secret", equalTo("password123"));
     }
 
     @Test
     public void readSecondSecretPathOverHttpApi() throws InterruptedException {
-        given().
-            header("X-Vault-Token", VAULT_TOKEN).
-            when().
-            get("http://" + getHostAndPort() + "/v1/secret/data/testing2").
-            then().
-            assertThat().body("data.data.secret_one", containsString("password1")).
-            assertThat().body("data.data.secret_two", containsString("password2")).
-            assertThat().body("data.data.secret_three", hasItem("password3")).
-            assertThat().body("data.data.secret_four", containsString("password4"));
+        given()
+            .header("X-Vault-Token", VAULT_TOKEN)
+            .when()
+            .get("http://" + getHostAndPort() + "/v1/secret/data/testing2")
+            .then()
+            .assertThat()
+            .body("data.data.secret_one", containsString("password1"))
+            .assertThat()
+            .body("data.data.secret_two", containsString("password2"))
+            .assertThat()
+            .body("data.data.secret_three", hasItem("password3"))
+            .assertThat()
+            .body("data.data.secret_four", containsString("password4"));
     }
 
     @Test
     public void readTransitKeyOverHttpApi() throws InterruptedException {
-        given().
-            header("X-Vault-Token", VAULT_TOKEN).
-            when().
-            get("http://" + getHostAndPort() + "/v1/transit/keys/my-key").
-            then().
-            assertThat().body("data.name", equalTo("my-key"));
+        given()
+            .header("X-Vault-Token", VAULT_TOKEN)
+            .when()
+            .get("http://" + getHostAndPort() + "/v1/transit/keys/my-key")
+            .then()
+            .assertThat()
+            .body("data.name", equalTo("my-key"));
     }
 
     private String getHostAndPort() {
         return vaultContainer.getHost() + ":" + vaultContainer.getMappedPort(8200);
     }
-
-
 }
diff --git a/test-support/src/main/java/org/testcontainers/testsupport/Flaky.java b/test-support/src/main/java/org/testcontainers/testsupport/Flaky.java
index cc5f6f947fa..83e18bfa161 100644
--- a/test-support/src/main/java/org/testcontainers/testsupport/Flaky.java
+++ b/test-support/src/main/java/org/testcontainers/testsupport/Flaky.java
@@ -1,19 +1,17 @@
 package org.testcontainers.testsupport;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 /**
  * Annotation for test methods that should be retried in the event of failure. See {@link FlakyTestJUnit4RetryRule} for
  * more details.
  */
-@Retention(RUNTIME)
-@Target({METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD })
 public @interface Flaky {
-
     /**
      * @return a URL for a GitHub issue where this flaky test can be discussed, and where actions to resolve it can be
      * coordinated.
diff --git a/test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java b/test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java
index aa1a3ed3c5f..759e23ebbca 100644
--- a/test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java
+++ b/test-support/src/main/java/org/testcontainers/testsupport/FlakyTestJUnit4RetryRule.java
@@ -31,7 +31,6 @@ public class FlakyTestJUnit4RetryRule implements TestRule {
 
     @Override
     public Statement apply(Statement base, Description description) {
-
         final Flaky annotation = description.getAnnotation(Flaky.class);
 
         if (annotation == null) {
@@ -53,11 +52,13 @@ public Statement apply(Statement base, Description description) {
         try {
             reviewDate = LocalDate.parse(annotation.reviewDate());
         } catch (DateTimeParseException e) {
-            throw new IllegalArgumentException("@Flaky reviewDate could not be parsed. Please provide a date in yyyy-mm-dd format");
+            throw new IllegalArgumentException(
+                "@Flaky reviewDate could not be parsed. Please provide a date in yyyy-mm-dd format"
+            );
         }
 
         // the annotation should only have an effect before the review date, to encourage review and resolution
-        if ( LocalDate.now().isBefore(reviewDate) ) {
+        if (LocalDate.now().isBefore(reviewDate)) {
             return new RetryingStatement(base, description, maxTries);
         } else {
             return base;
@@ -65,8 +66,11 @@ public Statement apply(Statement base, Description description) {
     }
 
     private static class RetryingStatement extends Statement {
+
         private final Statement base;
+
         private final Description description;
+
         private final int maxTries;
 
         RetryingStatement(Statement base, Description description, int maxTries) {
@@ -77,7 +81,6 @@ private static class RetryingStatement extends Statement {
 
         @Override
         public void evaluate() {
-
             int attempts = 0;
             final List<Throwable> causes = new ArrayList<>();
 
@@ -93,7 +96,8 @@ public void evaluate() {
 
             throw new IllegalStateException(
                 "@Flaky-annotated test failed despite retries.",
-                new MultipleFailureException(causes));
+                new MultipleFailureException(causes)
+            );
         }
     }
 }
diff --git a/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java b/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
index 07b0ffe1fa8..14a3d4c018c 100644
--- a/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
+++ b/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
@@ -12,11 +12,15 @@
 public class FlakyRuleTest {
 
     private static final String VALID_URL = "http://some.url/here";
+
     private static final String INVALID_URL = "";
 
     private static final String VALID_DATE_IN_FAR_FUTURE = "2063-04-05";
+
     private static final String VALID_DATE_IN_PAST = "1991-08-16";
+
     private static final String INVALID_DATE = "91-01-45";
+
     private static final int DEFAULT_TRIES = 3;
 
     private FlakyTestJUnit4RetryRule rule = new FlakyTestJUnit4RetryRule();
@@ -28,9 +32,7 @@ public void testIgnoresMethodWithoutAnnotation() throws Throwable {
         try {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
-        } catch (Exception ignored) {
-
-        }
+        } catch (Exception ignored) {}
         assertEquals("The statement should only be invoked once, even if it throws", 1, statement.invocationCount);
     }
 
@@ -42,9 +44,7 @@ public void testRetriesMethodWithAnnotationUntilFailure() throws Throwable {
         try {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
-        } catch (Exception ignored) {
-
-        }
+        } catch (Exception ignored) {}
         assertEquals("The statement should be invoked three times", 3, statement.invocationCount);
     }
 
@@ -56,9 +56,7 @@ public void testCustomRetryCount() throws Throwable {
         try {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
-        } catch (Exception ignored) {
-
-        }
+        } catch (Exception ignored) {}
         assertEquals("The statement should be invoked ten times", 10, statement.invocationCount);
     }
 
@@ -70,7 +68,11 @@ public void testRetriesMethodWithAnnotationUntilSuccess() throws Throwable {
 
         rule.apply(statement, description).evaluate();
 
-        assertEquals("The statement should be invoked three times, and succeed the third time", 3, statement.invocationCount);
+        assertEquals(
+            "The statement should be invoked three times, and succeed the third time",
+            3,
+            statement.invocationCount
+        );
     }
 
     @Test
@@ -91,9 +93,7 @@ public void testTreatsExpiredAnnotationAsNoAnnotation() throws Throwable {
         try {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
-        } catch (Exception ignored) {
-
-        }
+        } catch (Exception ignored) {}
         assertEquals("The statement should only be invoked once, even if it throws", 1, statement.invocationCount);
     }
 
@@ -104,9 +104,7 @@ public void testThrowsOnInvalidDateFormat() throws Throwable {
         try {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
-        } catch (IllegalArgumentException ignored) {
-
-        }
+        } catch (IllegalArgumentException ignored) {}
         assertEquals("The statement should not be invoked if the annotation is invalid", 0, statement.invocationCount);
     }
 
@@ -117,14 +115,16 @@ public void testThrowsOnInvalidGitHubUrl() throws Throwable {
         try {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
-        } catch (IllegalArgumentException ignored) {
-
-        }
+        } catch (IllegalArgumentException ignored) {}
         assertEquals("The statement should not be invoked if the annotation is invalid", 0, statement.invocationCount);
     }
 
     private Description newDescriptionWithAnnotation(String reviewDate, String gitHubUrl) {
-        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(reviewDate, gitHubUrl, DEFAULT_TRIES));
+        return Description.createTestDescription(
+            "SomeTestClass",
+            "someMethod",
+            newAnnotation(reviewDate, gitHubUrl, DEFAULT_TRIES)
+        );
     }
 
     private Description newDescriptionWithoutAnnotation() {
@@ -132,15 +132,27 @@ private Description newDescriptionWithoutAnnotation() {
     }
 
     private Description newDescriptionWithAnnotation() {
-        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(VALID_DATE_IN_FAR_FUTURE, VALID_URL, DEFAULT_TRIES));
+        return Description.createTestDescription(
+            "SomeTestClass",
+            "someMethod",
+            newAnnotation(VALID_DATE_IN_FAR_FUTURE, VALID_URL, DEFAULT_TRIES)
+        );
     }
 
     private Description newDescriptionWithAnnotationAndCustomTries(int maxTries) {
-        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(VALID_DATE_IN_FAR_FUTURE, VALID_URL, maxTries));
+        return Description.createTestDescription(
+            "SomeTestClass",
+            "someMethod",
+            newAnnotation(VALID_DATE_IN_FAR_FUTURE, VALID_URL, maxTries)
+        );
     }
 
     private Description newDescriptionWithExpiredAnnotation() {
-        return Description.createTestDescription("SomeTestClass", "someMethod", newAnnotation(VALID_DATE_IN_PAST, VALID_URL, DEFAULT_TRIES));
+        return Description.createTestDescription(
+            "SomeTestClass",
+            "someMethod",
+            newAnnotation(VALID_DATE_IN_PAST, VALID_URL, DEFAULT_TRIES)
+        );
     }
 
     private Flaky newAnnotation(final String reviewDate, String gitHubUrl, int tries) {
@@ -174,7 +186,9 @@ private DummyStatement newStatement(int timesToThrow) {
     }
 
     private static class DummyStatement extends Statement {
+
         int shouldThrowTimes = -1;
+
         int invocationCount = 0;
 
         @Override

From 3a82068bf2b20ff7dfce801fc5ca063698c3e0c9 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 26 May 2022 09:39:03 -0400
Subject: [PATCH 1898/4969] Update mkdocs.yml

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 16b2106bb3f..f6daad68155 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -102,4 +102,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.16.3
+    latest_version: 1.17.2

From 5d3349ffd6a376f89b92e530b9b7048c826e16b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 26 May 2022 10:13:11 -0500
Subject: [PATCH 1899/4969] Add try-with-resources to HttpWaitStrategyTest
 (#5397)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../strategy/AbstractWaitStrategyTest.java    |  8 +-
 .../wait/strategy/HttpWaitStrategyTest.java   | 85 ++++++++++++-------
 2 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
index de16eb0e582..530638f0f70 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
@@ -84,7 +84,9 @@ protected GenericContainer<?> startContainerWithCommand(
      * @param shellCommand the shell command to execute
      */
     protected void waitUntilReadyAndSucceed(String shellCommand) {
-        waitUntilReadyAndSucceed(startContainerWithCommand(shellCommand));
+        try (GenericContainer<?> container = startContainerWithCommand(shellCommand)) {
+            waitUntilReadyAndSucceed(container);
+        }
     }
 
     /**
@@ -94,7 +96,9 @@ protected void waitUntilReadyAndSucceed(String shellCommand) {
      * @param shellCommand the shell command to execute
      */
     protected void waitUntilReadyAndTimeout(String shellCommand) {
-        waitUntilReadyAndTimeout(startContainerWithCommand(shellCommand));
+        try (GenericContainer<?> container = startContainerWithCommand(shellCommand)) {
+            waitUntilReadyAndTimeout(container);
+        }
     }
 
     /**
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index 7014749115e..972bf2ab66a 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -11,8 +11,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
 
 /**
  * Tests for {@link HttpWaitStrategy}.
@@ -45,16 +45,19 @@ public void testWaitUntilReadyWithSuccess() {
     public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
         HashMap<String, String> headers = new HashMap<>();
         headers.put("baz", "boo");
-        GenericContainer container = startContainerWithCommand(
-            createShellCommand("200 OK", GOOD_RESPONSE_BODY),
-            createHttpWaitStrategy(ready).withHeader("foo", "bar").withHeaders(headers)
-        );
-        waitUntilReadyAndSucceed(container);
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
+                createShellCommand("200 OK", GOOD_RESPONSE_BODY),
+                createHttpWaitStrategy(ready).withHeader("foo", "bar").withHeaders(headers)
+            )
+        ) {
+            waitUntilReadyAndSucceed(container);
 
-        String logs = container.getLogs();
+            String logs = container.getLogs();
 
-        assertThat(logs, containsString("foo: bar"));
-        assertThat(logs, containsString("baz: boo"));
+            assertThat(logs, containsString("foo: bar"));
+            assertThat(logs, containsString("baz: boo"));
+        }
     }
 
     /**
@@ -63,12 +66,14 @@ public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
      */
     @Test
     public void testWaitUntilReadyWithTlsAndAllowUnsecure() {
-        waitUntilReadyAndSucceed(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createHttpsShellCommand("200 OK", GOOD_RESPONSE_BODY, 8080),
                 createHttpWaitStrategy(ready).usingTls().allowInsecure()
             )
-        );
+        ) {
+            waitUntilReadyAndSucceed(container);
+        }
     }
 
     /**
@@ -77,12 +82,14 @@ public void testWaitUntilReadyWithTlsAndAllowUnsecure() {
      */
     @Test
     public void testWaitUntilReadyWithUnauthorizedWithLambda() {
-        waitUntilReadyAndSucceed(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
                 createHttpWaitStrategy(ready).forStatusCodeMatching(it -> it >= 200 && it < 300 || it == 401)
             )
-        );
+        ) {
+            waitUntilReadyAndSucceed(container);
+        }
     }
 
     /**
@@ -91,12 +98,14 @@ public void testWaitUntilReadyWithUnauthorizedWithLambda() {
      */
     @Test
     public void testWaitUntilReadyWithManyStatusCodes() {
-        waitUntilReadyAndSucceed(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
                 createHttpWaitStrategy(ready).forStatusCode(300).forStatusCode(401).forStatusCode(500)
             )
-        );
+        ) {
+            waitUntilReadyAndSucceed(container);
+        }
     }
 
     /**
@@ -106,15 +115,17 @@ public void testWaitUntilReadyWithManyStatusCodes() {
      */
     @Test
     public void testWaitUntilReadyWithManyStatusCodesAndLambda() {
-        waitUntilReadyAndSucceed(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
                 createHttpWaitStrategy(ready)
                     .forStatusCode(300)
                     .forStatusCode(500)
                     .forStatusCodeMatching(it -> it == 401)
             )
-        );
+        ) {
+            waitUntilReadyAndSucceed(container);
+        }
     }
 
     /**
@@ -124,12 +135,14 @@ public void testWaitUntilReadyWithManyStatusCodesAndLambda() {
      */
     @Test
     public void testWaitUntilReadyWithTimeoutAndWithManyStatusCodesAndLambda() {
-        waitUntilReadyAndTimeout(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
                 createHttpWaitStrategy(ready).forStatusCode(300).forStatusCodeMatching(it -> it == 500)
             )
-        );
+        ) {
+            waitUntilReadyAndTimeout(container);
+        }
     }
 
     /**
@@ -141,12 +154,14 @@ public void testWaitUntilReadyWithTimeoutAndWithManyStatusCodesAndLambda() {
      */
     @Test
     public void testWaitUntilReadyWithTimeoutAndWithLambdaShouldNotMatchOk() {
-        waitUntilReadyAndTimeout(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("200 OK", GOOD_RESPONSE_BODY),
                 createHttpWaitStrategy(ready).forStatusCodeMatching(it -> it >= 300)
             )
-        );
+        ) {
+            waitUntilReadyAndTimeout(container);
+        }
     }
 
     /**
@@ -172,26 +187,30 @@ public void testWaitUntilReadyWithTimeoutAndBadResponseBody() {
      */
     @Test
     public void testWaitUntilReadyWithSpecificPort() {
-        waitUntilReadyAndSucceed(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("200 OK", GOOD_RESPONSE_BODY, 9090),
                 createHttpWaitStrategy(ready).forPort(9090),
                 7070,
                 8080,
                 9090
             )
-        );
+        ) {
+            waitUntilReadyAndSucceed(container);
+        }
     }
 
     @Test
     public void testWaitUntilReadyWithTimoutCausedByReadTimeout() {
-        waitUntilReadyAndTimeout(
-            startContainerWithCommand(
+        try (
+            GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("0 Connection Refused", GOOD_RESPONSE_BODY, 9090),
                 createHttpWaitStrategy(ready).forPort(9090).withReadTimeout(Duration.ofMillis(1)),
                 9090
             )
-        );
+        ) {
+            waitUntilReadyAndTimeout(container);
+        }
     }
 
     /**

From aeab7a55c4564e7199efe531705f4c9268839f43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:40 +0000
Subject: [PATCH 1900/4969] Bump tomcat-jdbc from 10.0.20 to 10.0.21 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.20 to 10.0.21.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d77465c5616..5674f235c7f 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.20'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.21'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.29'
 }

From af64f653ecced7237ee1035504ebaa8d07b430de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:42 +0000
Subject: [PATCH 1901/4969] Bump neo4j from 3.5.32 to 3.5.33 in /modules/neo4j

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.32 to 3.5.33.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/compare/3.5.32...3.5.33)

---
updated-dependencies:
- dependency-name: org.neo4j:neo4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index efba3dd0db5..da996db865f 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,7 +29,7 @@ task customNeo4jPluginJar(type: Jar) {
 processTestResources.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.32"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.33"
 
     api project(":testcontainers")
 

From 443f9d250456be62802b7d8c11bdf8f77e37dac9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:43 +0000
Subject: [PATCH 1902/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/jdbc

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 84b927ac4a9..54023b6bed4 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From a615e261b90cc2d1f1e177f593b529865d5fcac8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:43 +0000
Subject: [PATCH 1903/4969] Bump mockito-core from 4.3.1 to 4.6.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.3.1 to 4.6.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.6.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index efb08991f8d..3b148503c51 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -95,7 +95,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.14.2'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
-    testImplementation ('org.mockito:mockito-core:4.3.1') {
+    testImplementation ('org.mockito:mockito-core:4.6.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 84f5d0cebb278b058d3b00bc3e2f3f6008ab154d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:43 +0000
Subject: [PATCH 1904/4969] Bump postgresql from 42.3.4 to 42.3.6 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.4 to 42.3.6.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.4...REL42.3.6)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f2c50c30754..d849ad408df 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.3.4'
+    testImplementation 'org.postgresql:postgresql:42.3.6'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'

From c36cdcad20c666f83b42de1ef9b7e0bb2950d5b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:43 +0000
Subject: [PATCH 1905/4969] Bump mariadb-java-client from 3.0.3 to 3.0.5 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.3 to 3.0.5.
- [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/3.0.3...3.0.5)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8d65ed00deb..fd534915ba1 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.3'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.5'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From fab88d0d60f90fa9e08f2f6c2f083b3323dbc145 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:44 +0000
Subject: [PATCH 1906/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/neo4j

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index efba3dd0db5..555d55e3a72 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.5'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From af16f640661406c78c2a591f6dcc80ba981203d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:44 +0000
Subject: [PATCH 1907/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/kafka

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index b9157d9d539..a1022ae1720 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 670f523cee9bdcc1bdf258a83905071ea0b5a417 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:44 +0000
Subject: [PATCH 1908/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/pulsar

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index cf11a36b411..69c63cc3033 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.4'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.22.0'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.4'
 }

From 43feb287518abb1d777cb10a46d839f03fd9e10b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:45 +0000
Subject: [PATCH 1909/4969] Bump tomcat-jdbc from 10.0.20 to 10.0.21 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.20 to 10.0.21.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 84b927ac4a9..3c9865b5246 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.20'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.21'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From e267d78335346416aaf065d04b9c5a39757d78e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:46 +0000
Subject: [PATCH 1910/4969] Bump aws-java-sdk-s3 from 1.12.191 to 1.12.231 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.191 to 1.12.231.
- [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.12.191...1.12.231)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 496b4e23983..8a12cd75327 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.191'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.231'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.210'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
     testImplementation 'software.amazon.awssdk:s3:2.17.181'

From a67d40a1e1fa8447b021ad6e98350fe4edc898b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:47 +0000
Subject: [PATCH 1911/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.210 to 1.12.232.
- [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.12.210...1.12.232)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 6dabdec119b..09cb51e10a4 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.210'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.232'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.210'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 7fb15fbac3912e999aedd63431461142c61a0fb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:48 +0000
Subject: [PATCH 1912/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/junit-jupiter

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6685eddf15a..7efd4fe3afa 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.4.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.4'

From 6f33590747b80490d0f7c873fa366e559e9e9ffc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:49 +0000
Subject: [PATCH 1913/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/vault

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 80b416ce235..f6e94f2139d 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.0.1'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 
 }

From 0f2f843d5b205a8dbda4be9ca5840722bf9777f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:49 +0000
Subject: [PATCH 1914/4969] Bump common-custom-user-data-gradle-plugin in
 /examples

Bumps common-custom-user-data-gradle-plugin from 1.6.2 to 1.7.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index ceb39498854..2046a7d282e 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7"
     }
 }
 

From 761e70a06761036246647dd0a1313d7f2ff9d1bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:52 +0000
Subject: [PATCH 1915/4969] Bump assertj-core from 3.22.0 to 3.23.1 in /core

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index efb08991f8d..3b870a59e5c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -102,7 +102,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"

From b8466947c2451bebc2760397293e57334f101697 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:52 +0000
Subject: [PATCH 1916/4969] Bump postgresql from 42.3.1 to 42.3.6 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.1 to 42.3.6.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.1...REL42.3.6)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 396c0071042..e609733d398 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.6'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'

From a76a9ca56f20070a0bf96b73dc155eec6e07c817 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:53 +0000
Subject: [PATCH 1917/4969] Bump jedis from 4.2.2 to 4.2.3 in /core

Bumps [jedis](https://github.com/redis/jedis) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.2.2...v4.2.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index efb08991f8d..833831f0aed 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:4.2.2'
+    testImplementation 'redis.clients:jedis:4.2.3'
     testImplementation 'com.rabbitmq:amqp-client:5.14.2'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 

From e97b0c2073f1ec59ccf89890442ed50047fbf7f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:56 +0000
Subject: [PATCH 1918/4969] Bump postgresql from 42.3.4 to 42.3.6 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.4 to 42.3.6.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.4...REL42.3.6)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6685eddf15a..0b1a21a3970 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.6'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }

From 553405f0c0e28ade15637578922f0bd6f7936ed0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:57 +0000
Subject: [PATCH 1919/4969] Bump transport from 7.17.3 to 7.17.4 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.3 to 7.17.4.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.3...v7.17.4)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 3d8f7bff12d..4bff8106f0b 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.17.3"
+    testImplementation "org.elasticsearch.client:transport:7.17.4"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From dd539ed0409658cd278ee26f4c795e472bbd0c67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:57 +0000
Subject: [PATCH 1920/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/database-commons

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 7a201d772fb..33a6d1e9826 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 4f6fea6c5feaf1c5c90ecbec8b823aa09fec708b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:00:57 +0000
Subject: [PATCH 1921/4969] Bump aws-java-sdk-logs from 1.12.169 to 1.12.232 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.169 to 1.12.232.
- [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.12.169...1.12.232)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 496b4e23983..6917199b470 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.191'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.210'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'
     testImplementation 'software.amazon.awssdk:s3:2.17.181'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 62d34bd7899fadbc9c4ba2874d5cdc2e2f0ef7f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:01:01 +0000
Subject: [PATCH 1922/4969] Bump postgresql from 42.3.3 to 42.3.6 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.3 to 42.3.6.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.3...REL42.3.6)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c61ce36e473..05c5b241b51 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20211205'
-    testImplementation 'org.postgresql:postgresql:42.3.3'
+    testImplementation 'org.postgresql:postgresql:42.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
 }

From ce9b09a1fdbc28509d53485371089339416ed44c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:01:25 +0000
Subject: [PATCH 1923/4969] Bump peter-evans/create-pull-request from 4.0.2 to
 4.0.3

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/bd72e1b7922d417764d27d30768117ad7da78a0e...f094b77505fb89581e68a1163fbd2fffece39da1)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index b5d672c092d..b4d4d250346 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e # v3.10.1
+        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From 76381504e6c5cf4083ec1e42a1ffd4f241820793 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:01:30 +0000
Subject: [PATCH 1924/4969] Bump actions/cache from 3.0.2 to 3.0.3

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.2...v3.0.3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 90b493df481..9a7b314c67f 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -22,7 +22,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -50,7 +50,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c0e5eaf601..56bb4e0799d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -56,7 +56,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From c3e8979012144fa559629f11ad8bad9d742839d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:01:35 +0000
Subject: [PATCH 1925/4969] Bump release-drafter/release-drafter from 5.19.0 to
 5.20.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.19.0 to 5.20.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/e9ee02fbac03d922bac6212003695e8358dd88b0...ac463ffd9cc4c6ad5682af93dc3e3591c4657ee3)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 839fb43df4d..132b5ffd0a5 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -12,6 +12,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@e9ee02fbac03d922bac6212003695e8358dd88b0 # v5.19.0
+      - uses: release-drafter/release-drafter@ac463ffd9cc4c6ad5682af93dc3e3591c4657ee3 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From b8c4ddf2a2c2eb1b56b6b566db9e29ff3e88991b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:19 +0000
Subject: [PATCH 1926/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/orientdb

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 820e96e114f..05bdb380c28 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.0.24"
 
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.3.4'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.0.18"
 }

From 7e93a7e78e710589e14ef8da91a1b5d392274471 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:22 +0000
Subject: [PATCH 1927/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/rabbitmq

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 967b9eb4ed9..6c2953909bb 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.14.2'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 46d75a20b081044fc341e7db3b4278d36450a67a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:25 +0000
Subject: [PATCH 1928/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/k3s

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 0ab368d60c2..1c7e6138b7f 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -10,5 +10,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:5.12.2'
     testImplementation 'io.kubernetes:client-java:15.0.0'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 0c7730eb1d1e4e034a872b9bb52dced44e65ece7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:25 +0000
Subject: [PATCH 1929/4969] Bump trino-jdbc from 379 to 382 in /modules/trino

Bumps trino-jdbc from 379 to 382.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index d0b56af633f..8305e8e0629 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:379'
+    testImplementation 'io.trino:trino-jdbc:382'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From c0b0612ace8545533258f2295358fb750d65d6af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:26 +0000
Subject: [PATCH 1930/4969] Bump google-cloud-pubsub from 1.116.4 to 1.119.0 in
 /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.116.4 to 1.119.0.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.116.4...v1.119.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 031e68a7f76..c493020c61f 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.4.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.116.4'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.2'
     testImplementation 'org.assertj:assertj-core:3.22.0'

From c6beb9219642e0b054802e9cc221462dd3218751 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:27 +0000
Subject: [PATCH 1931/4969] Bump postgresql from 42.3.4 to 42.3.6 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.4 to 42.3.6.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.4...REL42.3.6)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index ad1007a4744..490b2d7fb11 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.3.4'
+    testImplementation 'org.postgresql:postgresql:42.3.6'
 }

From 2e6ac22bcbf163329d171c5b4f57b3ecbb2e2ed8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:31 +0000
Subject: [PATCH 1932/4969] Bump azure-cosmos from 4.29.1 to 4.30.0 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.29.1 to 4.30.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.29.1...azure-cosmos_4.30.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 8ab7612c18b..f26028b8ede 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'com.azure:azure-cosmos:4.29.1'
+    testImplementation 'com.azure:azure-cosmos:4.30.0'
 }

From 110fe8e4f9e813949779a3d8473655f216b44375 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:44 +0000
Subject: [PATCH 1933/4969] Bump google-cloud-bigtable from 2.6.2 to 2.8.0 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.6.2 to 2.8.0.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.6.2...v2.8.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 031e68a7f76..cdb09edd51f 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.116.4'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.2'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.8.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From 4a66388f7f10e587280b135673c87958758db9fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:05:45 +0000
Subject: [PATCH 1934/4969] Bump reactor-core from 3.4.17 to 3.4.18 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.17 to 3.4.18.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.17...v3.4.18)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 2a4e3958af8..11e22e2bc9f 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.17'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.18'
     testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
 }

From eeba70a2266b7f20ce94a6566fffdb99f3950ee3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:06:07 +0000
Subject: [PATCH 1935/4969] Bump hivemq-extension-sdk from 4.8.0 to 4.8.1 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.8.0...4.8.1)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index bfdfecb1761..972e07d1f8a 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.10")

From 1bbdbb1deccfe70ef1c64de566963c7334ba8bc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 22:07:49 +0000
Subject: [PATCH 1936/4969] Bump common-custom-user-data-gradle-plugin from
 1.6.5 to 1.7

Bumps common-custom-user-data-gradle-plugin from 1.6.5 to 1.7.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 6b80183bc34..cf15e5ec31a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.5"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7"
     }
 }
 

From 69856364f1a06803c12719b45e6e693e2258404a Mon Sep 17 00:00:00 2001
From: adrianpozueco <adrian.pozueco@gmail.com>
Date: Thu, 2 Jun 2022 20:35:29 +0200
Subject: [PATCH 1937/4969] [Localstack] Get region from env variables or
 default (#3556)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Pozueco Adrian <pozuecoa@ryanair.com>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../localstack/LocalStackContainer.java       |  4 ++-
 .../localstack/LocalstackContainerTest.java   | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 8bd6f14d3fd..d37c80d06fa 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -45,6 +45,8 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     private static final String DEFAULT_TAG = "0.11.2";
 
+    private static final String DEFAULT_REGION = "us-east-1";
+
     @Deprecated
     public static final String VERSION = DEFAULT_TAG;
 
@@ -311,7 +313,7 @@ public String getSecretKey() {
      * @return a default region
      */
     public String getRegion() {
-        return "us-east-1";
+        return this.getEnvMap().getOrDefault("DEFAULT_REGION", DEFAULT_REGION);
     }
 
     public interface EnabledService {
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index cf4e1a813a4..3b85c69ca34 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers.localstack;
 
+import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
 import com.amazonaws.services.kms.model.CreateKeyRequest;
@@ -286,4 +287,29 @@ private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exc
             return logs;
         }
     }
+
+    public static class WithRegion {
+
+        // with_region {
+        private static String region = "eu-west-1";
+
+        @ClassRule
+        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+            .withEnv("DEFAULT_REGION", region)
+            .withServices(Service.S3);
+
+        // }
+
+        @Test
+        public void s3EndpointHasProperRegion() {
+            final AwsClientBuilder.EndpointConfiguration endpointConfiguration = localstack.getEndpointConfiguration(
+                Service.S3
+            );
+            assertEquals(
+                "The endpoint configuration has right region",
+                region,
+                endpointConfiguration.getSigningRegion()
+            );
+        }
+    }
 }

From 74e87885ecd4737c392eb4c67ec41e7294977089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 2 Jun 2022 14:05:48 -0500
Subject: [PATCH 1938/4969] Cleanup japicmp baselines (#5463)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 core/build.gradle          | 4 ----
 gradle/japicmp.gradle      | 2 +-
 modules/kafka/build.gradle | 9 ---------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index efb08991f8d..7aac72e50ed 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -60,10 +60,6 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.17.1', {
-        exclude group: "*", module: "*"
-    }
-
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.35'
     compileOnly 'org.jetbrains:annotations:23.0.0'
diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index e74cdccd3af..fe3f8881b1c 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-    baseline "org.testcontainers:${project.name}:1.16.0", {
+    baseline "org.testcontainers:${project.name}:1.17.2", {
         exclude group: "*", module: "*"
     }
 }
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index b9157d9d539..6d1cf82e5c8 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -1,14 +1,5 @@
 description = "Testcontainers :: Kafka"
 
-tasks.japicmp {
-    // TODO clean after 1.17.0 is released
-    methodExcludes = [
-        // Overrides removed, not a breaking change per se
-        "org.testcontainers.containers.KafkaContainer#containerIsStarting(com.github.dockerjava.api.command.InspectContainerResponse,boolean)",
-        "org.testcontainers.containers.KafkaContainer#doStart()",
-    ]
-}
-
 dependencies {
     api project(':testcontainers')
 

From 7ea69bdd4e911c98003487b5ee444b47aa52432f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:47:36 +0000
Subject: [PATCH 1939/4969] Bump neo4j-java-driver from 4.4.5 to 4.4.6 in
 /examples

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.5 to 4.4.6.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.5...4.4.6)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 652937d8b33..745d3206953 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.5'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.6'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
 }

From 3e4d1213715d08886e5abeabf6df4a1b93eff883 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:47:54 +0000
Subject: [PATCH 1940/4969] Bump mongo-java-driver from 3.12.10 to 3.12.11 in
 /core

Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.10 to 3.12.11.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.10...r3.12.11)

---
updated-dependencies:
- dependency-name: org.mongodb:mongo-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index f6b336e9600..310b4f43ef0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -89,7 +89,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.2.3'
     testImplementation 'com.rabbitmq:amqp-client:5.14.2'
-    testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
+    testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
     testImplementation ('org.mockito:mockito-core:4.6.0') {
         exclude(module: 'hamcrest-core')

From deef741188cc4d659dfae0849cb2e0ea948b4c24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:47:55 +0000
Subject: [PATCH 1941/4969] Bump mysql-connector-java in /modules/junit-jupiter

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.27 to 8.0.29.
- [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.27...8.0.29)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5c42d57fcbb..386fc023902 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.6'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 

From c22e1e7dbe84614b79cea59d970c882b97a4abe9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:00 +0000
Subject: [PATCH 1942/4969] Bump json from 20211205 to 20220320 in /examples

Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 05c5b241b51..a801e4f8588 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'org.json:json:20211205'
+    implementation 'org.json:json:20220320'
     testImplementation 'org.postgresql:postgresql:42.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'

From a8ae7c898c297b81d6d872865a823ef8b02ef106 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:02 +0000
Subject: [PATCH 1943/4969] Bump client-java from 15.0.0 to 15.0.1 in
 /modules/k3s

Bumps [client-java](https://github.com/kubernetes-client/java) from 15.0.0 to 15.0.1.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v15.0.0...v15.0.1)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 1c7e6138b7f..bf51cbfefa9 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:5.12.2'
-    testImplementation 'io.kubernetes:client-java:15.0.0'
+    testImplementation 'io.kubernetes:client-java:15.0.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From bbb31506cb890ef75c48461ac107c73615885e99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:03 +0000
Subject: [PATCH 1944/4969] Bump slf4j-api from 1.7.35 to 1.7.36 in /core

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.35 to 1.7.36.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.35...v_1.7.36)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index f6b336e9600..393272aabf3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -61,7 +61,7 @@ configurations.all {
 
 dependencies {
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:1.7.35'
+    api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'

From e7b77ba2a640672e2893920351f374010c241df6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:06 +0000
Subject: [PATCH 1945/4969] Bump logback-classic from 1.2.10 to 1.2.11 in
 /modules/hivemq

Bumps logback-classic from 1.2.10 to 1.2.11.

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 972e07d1f8a..7add9af67ea 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.8.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.2.10")
+    testImplementation("ch.qos.logback:logback-classic:1.2.11")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
 }
 

From 0891ac2410871133c57b2931ac89bec97673224f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:09 +0000
Subject: [PATCH 1946/4969] Bump kafka-clients from 3.0.0 to 3.2.0 in
 /modules/kafka

Bumps kafka-clients from 3.0.0 to 3.2.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index cc081326932..79264b8207f 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 231a01b52e7e97409f0ea2fdfa94e92c6725e624 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:16 +0000
Subject: [PATCH 1947/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 7.16.2 to 8.2.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.16.2...v8.2.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 4bff8106f0b..6d2b5b8a667 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.2.2"
     testImplementation "org.elasticsearch.client:transport:7.17.4"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 0cab47b7b3fa3b8fb41b619a1ea4ea8c2c771bfe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:18 +0000
Subject: [PATCH 1948/4969] Bump jedis from 4.2.2 to 4.2.3 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.2.2...v4.2.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5c42d57fcbb..371eb6ea4a8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.2.2'
+    testImplementation 'redis.clients:jedis:4.2.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:4.4.0') {
         exclude(module: 'hamcrest-core')

From 74dd5f49055fbb5160426548ff6784336491caa7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:23 +0000
Subject: [PATCH 1949/4969] Bump s3 from 2.17.181 to 2.17.204 in
 /modules/localstack

Bumps s3 from 2.17.181 to 2.17.204.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 f512b3d5fab..0b8aa654dd5 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.210'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'
-    testImplementation 'software.amazon.awssdk:s3:2.17.181'
+    testImplementation 'software.amazon.awssdk:s3:2.17.204'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 9ae45502f706067a7cb1a8b637c6769cf6235adc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:23 +0000
Subject: [PATCH 1950/4969] Bump com.gradle.enterprise.gradle.plugin from 3.10
 to 3.10.1

Bumps com.gradle.enterprise.gradle.plugin from 3.10 to 3.10.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cf15e5ec31a..16b3fcdf98a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7"
     }
 }

From 97d436d90b463e5f6182b63e945ec2452f52ea03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:27 +0000
Subject: [PATCH 1951/4969] Bump jedis from 4.2.2 to 4.2.3 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.2.2...v4.2.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 4faead13f3a..ba883520719 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.2.2'
+    implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index b0d64f0524b..87c54f81a8d 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.2.2'
+    implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 2b7c3b7dda4..0195c1704f8 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.2.2'
+    implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'

From f4281805934055ac969c6b9aedca4fd5620362f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:28 +0000
Subject: [PATCH 1952/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/r2dbc

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 11e22e2bc9f..51199c9a53c 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,10 +11,10 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.4.18'
-    testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
+    testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 1fe3c1f17ef7f02bbb032fb3e1bc01ce92198b4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:29 +0000
Subject: [PATCH 1953/4969] Bump google-cloud-datastore from 2.4.0 to 2.7.0 in
 /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.4.0 to 2.7.0.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.4.0...v2.7.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 32854badc04..cc674a584b2 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.4.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.7.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'

From 133233647c587993bc5214940240161a159914f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:36 +0000
Subject: [PATCH 1954/4969] Bump rest-assured from 5.0.1 to 5.1.0 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.0.1 to 5.1.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.0.1...rest-assured-5.1.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index f6e94f2139d..1ffc366987c 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.0.1'
+    testImplementation 'io.rest-assured:rest-assured:5.1.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
 }

From a8cbbdce72ba627410935824034ba82117a3bf5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:39 +0000
Subject: [PATCH 1955/4969] Bump aws-java-sdk-sqs from 1.12.210 to 1.12.233 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.210 to 1.12.233.
- [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.12.210...1.12.233)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 f512b3d5fab..5fc67214e69 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.210'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.233'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'
     testImplementation 'software.amazon.awssdk:s3:2.17.181'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 0b15e6ecd3dbbb96bb9d9f4c2ccc12ba1b4dd5eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:40 +0000
Subject: [PATCH 1956/4969] Bump google-cloud-spanner from 6.20.0 to 6.25.5 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.20.0 to 6.25.5.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.20.0...v6.25.5)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 32854badc04..29df32c0b33 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.4.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.25.5'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.8.0'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }

From b544343eeb97ffa2e6ca4c4e4c53e0af4910e9fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:41 +0000
Subject: [PATCH 1957/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/gcloud

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 32854badc04..9b3bcd403de 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 4ad81aebc92107af531b970cc3db04eda00d27c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:48:56 +0000
Subject: [PATCH 1958/4969] Bump mockito-core from 4.4.0 to 4.6.1 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.4.0 to 4.6.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.6.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5c42d57fcbb..27d62be6b6d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.2.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.4.0') {
+    testImplementation ('org.mockito:mockito-core:4.6.1') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 979d74a785daa96fc380a346c64491d1710503ea Mon Sep 17 00:00:00 2001
From: Maxim Bartkov <84171296+MaxBartkov@users.noreply.github.com>
Date: Sat, 11 Jun 2022 00:29:07 +0300
Subject: [PATCH 1959/4969] Added the Bucket4j library to "Who is using
 Testcontainers?" (#5480)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index b2c11d6d8e8..0ad72bcb400 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -201,6 +201,7 @@ A huge thank you to our sponsors:
 * [Togglz](https://www.togglz.org/) - Feature Flags for the Java platform
 * [Byzer](https://www.byzer.org/home) - Integration tests for Data and AI platforms are based on multiple versions of Byzer, Ray and Apache Spark.
 * [Apache SeaTunnel](https://github.com/apache/incubator-seatunnel) - Integration testing with different datasource.
+* [Bucket4j](https://github.com/bucket4j/bucket4j) - Java rate-limiting library based on the token-bucket algorithm.
 
 ## License
 

From e7cdfa31af08074aa9dbb3f3d21a622144995b9d Mon Sep 17 00:00:00 2001
From: anatoly0karyakin <anatoly0karyakin@gmail.com>
Date: Mon, 13 Jun 2022 14:02:09 +0300
Subject: [PATCH 1960/4969] Don't ignore sql test query exception, add it as
 cause exception (#5484)

---
 .../org/testcontainers/containers/JdbcDatabaseContainer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 84d242a29c7..0b80eaac406 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -151,6 +151,7 @@ protected void waitUntilContainerStarted() {
         // Repeatedly try and open a connection to the DB and execute a test query
         long start = System.currentTimeMillis();
 
+        Exception lastConnectionException = null;
         while (System.currentTimeMillis() < start + (1000 * startupTimeoutSeconds)) {
             if (!isRunning()) {
                 Thread.sleep(100L);
@@ -165,6 +166,7 @@ protected void waitUntilContainerStarted() {
                     // we explicitly want this exception to fail fast without retries
                     throw e;
                 } catch (Exception e) {
+                    lastConnectionException = e;
                     // ignore so that we can try again
                     logger().debug("Failure when trying test query", e);
                     Thread.sleep(100L);
@@ -176,7 +178,8 @@ protected void waitUntilContainerStarted() {
             String.format(
                 "Container is started, but cannot be accessed by (JDBC URL: %s), please check container logs",
                 this.getJdbcUrl()
-            )
+            ),
+            lastConnectionException
         );
     }
 

From 7f9293b089bf4a2e27d28f12e91ef9b22963c473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 13 Jun 2022 11:32:19 -0500
Subject: [PATCH 1961/4969] [LocalStack] Deprecate methods using aws sdk v1
 (#5489)

Currently, `LocalStackContainer` depends on aws sdk v1. We have received
feedback about moving to aws sdk v2. However, we think that the
class already provides the enough information to be used such as
`getEndpointOverride()`, `getRegion()`, `getAccessKey()` and `getSecretKey`.
So, we are deprecating `getDefaultCredentialsProvider()` and `getEndpointConfiguration`
which are going to be removed in the feature and `LocalStack` module will
not depend on any aws sdk.
---
 .../containers/localstack/LocalStackContainer.java            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index d37c80d06fa..f3f905b84f6 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -193,7 +193,9 @@ public LocalStackContainer withServices(EnabledService... services) {
      *
      * @param service the service that is to be accessed
      * @return an {@link AwsClientBuilder.EndpointConfiguration}
+     * @deprecated {@link LocalStackContainer} will not depend on aws sdk.
      */
+    @Deprecated
     public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service service) {
         return new AwsClientBuilder.EndpointConfiguration(getEndpointOverride(service).toString(), getRegion());
     }
@@ -257,7 +259,9 @@ private int getServicePort(EnabledService service) {
              .build()
      </code></pre>
      * @return an {@link AWSCredentialsProvider}
+     * @deprecated {@link LocalStackContainer} will not depend on aws sdk.
      */
+    @Deprecated
     public AWSCredentialsProvider getDefaultCredentialsProvider() {
         return new AWSStaticCredentialsProvider(new BasicAWSCredentials(getAccessKey(), getSecretKey()));
     }

From 2cd6b560bcb67087b12e172bbde6bf5902f853f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 02:32:59 +0000
Subject: [PATCH 1962/4969] Bump gson from 2.8.9 to 2.9.0 in /examples

Bumps [gson](https://github.com/google/gson) from 2.8.9 to 2.9.0.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.9...gson-parent-2.9.0)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index bfb89f9cef2..1dc3497ec42 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.24"
     annotationProcessor "org.projectlombok:lombok:1.18.24"
     implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.mockito:mockito-all:1.10.19'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index ba883520719..56ba5934bdb 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 87c54f81a8d..c563cc658d8 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 0195c1704f8..416f29de095 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 

From 2fec86109e9bedb6f18d5627a6e7074b019e02a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 02:33:00 +0000
Subject: [PATCH 1963/4969] Bump slf4j-api from 1.7.32 to 1.7.36 in /examples

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.32 to 1.7.36.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.36)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index a801e4f8588..f25127f75eb 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.32'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20220320'
     testImplementation 'org.postgresql:postgresql:42.3.6'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index ba883520719..d7e174d55c1 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.32'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 87c54f81a8d..11bec04a48b 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.32'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 0195c1704f8..61a63f6fab5 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.32'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:testcontainers'

From a35a4e13eead2a10e13bd9a62264256eb13508c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 02:33:28 +0000
Subject: [PATCH 1964/4969] Bump google-cloud-firestore from 3.0.21 to 3.2.0 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.0.21 to 3.2.0.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.0.21...v3.2.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index f1060b8ec83..cdea13f5fac 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.7.0'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.25.5'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.8.0'

From 7831ef2bceb076d584c69ffd29eb5f2f3bb62e39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 02:33:28 +0000
Subject: [PATCH 1965/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /modules/azure

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index f26028b8ede..6656445af09 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.azure:azure-cosmos:4.30.0'
 }

From 731da03265983689c80d9c6faee96c77e910d2bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 02:33:48 +0000
Subject: [PATCH 1966/4969] Bump common-custom-user-data-gradle-plugin in
 /examples

Bumps common-custom-user-data-gradle-plugin from 1.7 to 1.7.2.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 2046a7d282e..b9fb73f86c1 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
     }
 }
 

From 4083228e0f72e9155a47b9a651c24ac896dd2a08 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 14 Jun 2022 18:30:46 +0200
Subject: [PATCH 1967/4969] Add section about MySQL root user password to docs
 (#5497)

---
 docs/modules/databases/mysql.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index 26fc62308ef..6e6265e91ba 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -12,6 +12,11 @@ is a directory on the classpath containing .cnf files, the following URL can be
 Any .cnf files in this classpath directory will be mapped into the database container's /etc/mysql/conf.d directory,
 and will be able to override server settings when the container starts.
 
+## MySQL `root` user password
+
+If no custom password is specified, the container will use the default user password `test` for the `root` user as well.
+When you specify a custom password for the database user,
+this will also act as the password of the MySQL `root` user automatically. 
 
 ## Adding this module to your project dependencies
 

From d96137a6614f06c5288de6000d43c7dab726b024 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 14 Jun 2022 18:41:02 +0200
Subject: [PATCH 1968/4969] Add MariaDB `root` user password section to docs
 (#5498)

---
 docs/modules/databases/mariadb.md | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/docs/modules/databases/mariadb.md b/docs/modules/databases/mariadb.md
index 495965bee0a..25367d629bd 100644
--- a/docs/modules/databases/mariadb.md
+++ b/docs/modules/databases/mariadb.md
@@ -2,22 +2,11 @@
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
-## Usage example
+## MariaDB `root` user password
 
-Running MariaDB as a stand-in for in a test:
-
-```java
-public class SomeTest {
-
-    @Rule
-    public MariaDBContainer mariaDB = new MariaDBContainer();
-    
-    @Test
-    public void someTestMethod() {
-        String url = mariaDB.getJdbcUrl();
-
-        ... create a connection and run test as normal
-```
+If no custom password is specified, the container will use the default user password `test` for the `root` user as well.
+When you specify a custom password for the database user,
+this will also act as the password of the MariaDB `root` user automatically.
 
 ## Adding this module to your project dependencies
 

From b3f1b6676e934e67987fd564ddec701d6e0b6647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Jun 2022 13:11:11 -0500
Subject: [PATCH 1969/4969] Add issue forms (#5490)

Introducing issue forms for: bug report, enhacements and features.
In case of help or question there is a link to the slack channel.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml  | 96 +++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml       |  5 ++
 .github/ISSUE_TEMPLATE/enhancement.yaml | 56 +++++++++++++++
 .github/ISSUE_TEMPLATE/feature.yaml     | 85 ++++++++++++++++++++++
 4 files changed, 242 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/enhancement.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/feature.yaml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 00000000000..80e0b47741d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,96 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["type/bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: dropdown
+    id: module
+    attributes:
+      label: Module
+      description: Which Testcontainers module are you using?
+      options:
+        - Core
+        - Azure
+        - Cassandra
+        - Clickhouse
+        - Couchbase
+        - DB2
+        - Dynalite
+        - Elasticsearch
+        - GCloud
+        - HiveMQ
+        - InfluxDB
+        - K3S
+        - Kafka
+        - LocalStack
+        - MariaDB
+        - MockServer
+        - MongoDB
+        - MSSQLServer
+        - MySQL
+        - Neo4j
+        - NGINX
+        - Oracle-XE
+        - OrientDB
+        - PostgreSQL
+        - Presto
+        - Pulsar
+        - RabbitMQ
+        - Selenium
+        - Solr
+        - ToxiProxy
+        - Trino
+        - Vault
+    validations:
+      required: true
+  - type: input
+    id: tc-version
+    attributes:
+      label: Testcontainers version
+      description: Which Testcontainers version are you using?
+      placeholder: ex. 1.17.2
+    validations:
+      required: true
+  - type: dropdown
+    id: latest-version
+    attributes:
+      label: Using the latest Testcontainers version?
+      description: If you are not using the latest version, can you update your project and try to reproduce the issue? Is it still happening?
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+  - type: textarea
+    id: docker-version
+    attributes:
+      label: Docker version
+      description: Please run `docker version` and copy and paste the output into this field.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Provide the context and the expected result.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. The content will be automatically formatted as code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional Information
+      description: |
+        Any links or references to have more context about the issue.
+
+        Tip: You can attach a minimal sample project to reproduce the issue or provide further log files by clicking into this area to focus it and then dragging files in.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..d27b0d086e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Need help or have a question?
+    url: https://slack.testcontainers.org/
+    about: Visit our slack channel.
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
new file mode 100644
index 00000000000..f06ea99c8ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -0,0 +1,56 @@
+name: Enhancement
+description: Suggest an enhancement
+title: "[Enhancement]: "
+labels: ["type/enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please provide the following information
+  - type: dropdown
+    id: module
+    attributes:
+      label: Module
+      description: For which Testcontainers module does the enhancement proposal apply?
+      options:
+        - Core
+        - Azure
+        - Cassandra
+        - Clickhouse
+        - Couchbase
+        - DB2
+        - Dynalite
+        - Elasticsearch
+        - GCloud
+        - HiveMQ
+        - InfluxDB
+        - K3S
+        - Kafka
+        - LocalStack
+        - MariaDB
+        - MockServer
+        - MongoDB
+        - MSSQLServer
+        - MySQL
+        - Neo4j
+        - NGINX
+        - Oracle-XE
+        - OrientDB
+        - PostgreSQL
+        - Presto
+        - Pulsar
+        - RabbitMQ
+        - Selenium
+        - Solr
+        - ToxiProxy
+        - Trino
+        - Vault
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: What should be improved? What are the limitations of the current implications that would be solved by the proposal?
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
new file mode 100644
index 00000000000..32edb0d25f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -0,0 +1,85 @@
+name: Feature
+description: Suggest a new feature
+title: "[Feature]: "
+labels: ["type/feature"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please provide the following information
+  - type: dropdown
+    id: module
+    attributes:
+      label: Module
+      description: Is this feature related to any of the existing modules?
+      options:
+        - Core
+        - Azure
+        - Cassandra
+        - Clickhouse
+        - Couchbase
+        - DB2
+        - Dynalite
+        - Elasticsearch
+        - GCloud
+        - HiveMQ
+        - InfluxDB
+        - K3S
+        - Kafka
+        - LocalStack
+        - MariaDB
+        - MockServer
+        - MongoDB
+        - MSSQLServer
+        - MySQL
+        - Neo4j
+        - NGINX
+        - Oracle-XE
+        - OrientDB
+        - PostgreSQL
+        - Presto
+        - Pulsar
+        - RabbitMQ
+        - Selenium
+        - Solr
+        - ToxiProxy
+        - Trino
+        - Vault
+        - New Module
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: Is this feature related to a problem? Please describe it.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Solution
+      description: What's the proposed solution for this feature?
+    validations:
+      required: true
+  - type: textarea
+    id: benefit
+    attributes:
+      label: Benefit
+      description: What's the benefit of addng this feature to the project?
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Benefit
+      description: Are there other alternatives? Please describe them.
+    validations:
+      required: true
+  - type: dropdown
+    id: contribute
+    attributes:
+      label: Would you like to help contributing this feature?
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true

From c769e64d94a1d756245c53a62ab17670fcfff78c Mon Sep 17 00:00:00 2001
From: Hyeonmin Park <hyeonmin.park@kennysoft.kr>
Date: Thu, 16 Jun 2022 23:54:24 +0900
Subject: [PATCH 1970/4969] Remove free disk space check log in example (#5502)

---
 docs/features/configuration.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 1761d1a2a71..cccae7a86df 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -30,7 +30,6 @@ Before running any containers Testcontainers will perform a set of startup check
 ```
         ℹ︎ Checking the system...
         ✔ Docker version should be at least 1.6.0
-        ✔ Docker environment should have more than 2GB free disk space
         ✔ File should be mountable
         ✔ A port exposed by a docker container should be accessible
 ```

From d57d7e940a02098b0f75c0599d4d4e8614e9c970 Mon Sep 17 00:00:00 2001
From: Cheng Pan <pan3793@gmail.com>
Date: Fri, 17 Jun 2022 07:00:50 +0800
Subject: [PATCH 1971/4969] Docs: Add Spark ClickHouse Connector use case
 (#5270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 0ad72bcb400..3a99c88a5b1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -202,6 +202,7 @@ A huge thank you to our sponsors:
 * [Byzer](https://www.byzer.org/home) - Integration tests for Data and AI platforms are based on multiple versions of Byzer, Ray and Apache Spark.
 * [Apache SeaTunnel](https://github.com/apache/incubator-seatunnel) - Integration testing with different datasource.
 * [Bucket4j](https://github.com/bucket4j/bucket4j) - Java rate-limiting library based on the token-bucket algorithm.
+* [Spark ClickHouse Connector](https://github.com/housepower/spark-clickhouse-connector) - Integration tests for Apache Spark with both single node ClickHouse instance and multi-node ClickHouse cluster.
 
 ## License
 

From 5dc5c21b3f4ae29fcf05d7c6ba9b287b65cc2517 Mon Sep 17 00:00:00 2001
From: Cristian Briscaru <39033668+cristianbriscaru@users.noreply.github.com>
Date: Fri, 17 Jun 2022 00:23:43 +0100
Subject: [PATCH 1972/4969] adds docs cockroach jdbc example (#5100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/databases/jdbc.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index b2a1588ae22..3c52dd1d8a8 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -47,6 +47,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:trino:352://localhost/memory/default`
 
+#### Using CockroachDB
+
+`jdbc:tc:cockroach:v21.2.3:///databasename`
+
 ### Using a classpath init script
 
 Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:

From 745bfc337071ffec7289758df0fe136c2c307430 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 20 Jun 2022 21:45:49 +0200
Subject: [PATCH 1973/4969] Add color for links (#5508)

The rebranding of the docs removed any special rendering of links, so they became invisible to users.
This change adds an explicit color for links (with the color taken from the TC logo).
This also implicitly highlights the currently selected page in the side-navigation panel.
---
 docs/css/extra.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/css/extra.css b/docs/css/extra.css
index 4c11e3df748..e97480c5341 100644
--- a/docs/css/extra.css
+++ b/docs/css/extra.css
@@ -5,6 +5,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 [data-md-color-scheme="testcontainers"] {
-    --md-primary-fg-color:        #291A3F;
+    --md-primary-fg-color:       #291A3F;
     --md-accent-fg-color:        #291A3F;
+    --md-typeset-a-color:        #0C94AA;
 }

From 2afe714517640b24a404124dce23fe49bbe910f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= <boschi1997@gmail.com>
Date: Tue, 21 Jun 2022 01:41:15 +0200
Subject: [PATCH 1974/4969] Pulsar: add flag to enable transactions and set
 configuration (#5479)

* Add `withTransactions()` method to enable transactions on Pulsar container
* Set default version to latest released (2.10.0)
* New docker command that enables the user to easily change configuration parameters
* Added new tests to cover new methods
* Improved the documentation with simple usage and new methods
---
 docs/modules/pulsar.md                        |  46 +++++++
 modules/pulsar/build.gradle                   |   4 +-
 .../containers/PulsarContainer.java           |  57 +++++++--
 .../containers/PulsarContainerTest.java       | 113 ++++++++++++++++--
 4 files changed, 195 insertions(+), 25 deletions(-)

diff --git a/docs/modules/pulsar.md b/docs/modules/pulsar.md
index 6d16a248872..f74c315cbdc 100644
--- a/docs/modules/pulsar.md
+++ b/docs/modules/pulsar.md
@@ -1,5 +1,51 @@
 # Apache Pulsar Module
 
+Testcontainers can be used to automatically create [Apache Pulsar](https://pulsar.apache.org) containers without external services.
+
+It's based on the official Apache Pulsar docker image, it is recommended to read the [official guide](https://pulsar.apache.org/docs/next/getting-started-docker/).
+
+## Example
+
+Create a `PulsarContainer` to use it in your tests:
+
+<!--codeinclude-->
+[Create a Pulsar container](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithVersion
+<!--/codeinclude-->
+
+Then you can retrieve the broker and the admin url:
+
+<!--codeinclude-->
+[Get broker and admin urls](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:coordinates
+<!--/codeinclude-->
+
+## Options
+
+### Configuration
+If you need to set Pulsar configuration variables you can use the native APIs and set each variable with `PULSAR_PREFIX_` as prefix.
+
+For example, if you want to enable `brokerDeduplicationEnabled`:
+
+<!--codeinclude-->
+[Set configuration variables](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithEnv
+<!--/codeinclude-->
+
+### Pulsar IO
+
+If you need to test Pulsar IO framework you can enable the Pulsar Functions Worker:
+
+<!--codeinclude-->
+[Create a Pulsar container with functions worker](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithFunctionsWorker
+<!--/codeinclude-->
+
+### Pulsar Transactions
+
+If you need to test Pulsar Transactions you can enable the transactions feature:
+
+<!--codeinclude-->
+[Create a Pulsar container with transactions](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithTransactions
+<!--/codeinclude-->
+
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 69c63cc3033..a1b24efba37 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.4'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.4'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.0'
 }
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 9b14e90d736..069fccaae65 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -2,8 +2,12 @@
 
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * This container wraps Apache Pulsar running in standalone mode
  */
@@ -15,13 +19,21 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     public static final String METRICS_ENDPOINT = "/metrics";
 
+    /**
+     * See <a href="https://github.com/apache/pulsar/blob/master/pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java">SystemTopicNames</a>.
+     */
+    private static final String TRANSACTION_TOPIC_ENDPOINT =
+        "/admin/v2/persistent/pulsar/system/transaction_coordinator_assign/partitions";
+
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar");
 
     @Deprecated
-    private static final String DEFAULT_TAG = "2.2.0";
+    private static final String DEFAULT_TAG = "2.10.0";
 
     private boolean functionsWorkerEnabled = false;
 
+    private boolean transactionsEnabled = false;
+
     /**
      * @deprecated use {@link PulsarContainer(DockerImageName)} instead
      */
@@ -41,24 +53,13 @@ public PulsarContainer(String pulsarVersion) {
     public PulsarContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DockerImageName.parse("apachepulsar/pulsar"));
-
         withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT);
-        withCommand("/pulsar/bin/pulsar", "standalone", "--no-functions-worker", "-nss");
-        waitingFor(Wait.forHttp(METRICS_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
     }
 
     @Override
     protected void configure() {
         super.configure();
-
-        if (functionsWorkerEnabled) {
-            withCommand("/pulsar/bin/pulsar", "standalone");
-            waitingFor(
-                new WaitAllStrategy()
-                    .withStrategy(waitStrategy)
-                    .withStrategy(Wait.forLogMessage(".*Function worker service started.*", 1))
-            );
-        }
+        setupCommandAndEnv();
     }
 
     public PulsarContainer withFunctionsWorker() {
@@ -66,6 +67,11 @@ public PulsarContainer withFunctionsWorker() {
         return this;
     }
 
+    public PulsarContainer withTransactions() {
+        transactionsEnabled = true;
+        return this;
+    }
+
     public String getPulsarBrokerUrl() {
         return String.format("pulsar://%s:%s", getHost(), getMappedPort(BROKER_PORT));
     }
@@ -73,4 +79,29 @@ public String getPulsarBrokerUrl() {
     public String getHttpServiceUrl() {
         return String.format("http://%s:%s", getHost(), getMappedPort(BROKER_HTTP_PORT));
     }
+
+    protected void setupCommandAndEnv() {
+        String standaloneBaseCommand =
+            "/pulsar/bin/apply-config-from-env.py /pulsar/conf/standalone.conf " + "&& bin/pulsar standalone";
+
+        if (!functionsWorkerEnabled) {
+            standaloneBaseCommand += " --no-functions-worker -nss";
+        }
+
+        withCommand("/bin/bash", "-c", standaloneBaseCommand);
+
+        List<WaitStrategy> waitStrategies = new ArrayList<>();
+        waitStrategies.add(Wait.defaultWaitStrategy());
+        waitStrategies.add(Wait.forHttp(METRICS_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
+        if (transactionsEnabled) {
+            withEnv("PULSAR_PREFIX_transactionCoordinatorEnabled", "true");
+            waitStrategies.add(Wait.forHttp(TRANSACTION_TOPIC_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
+        }
+        if (functionsWorkerEnabled) {
+            waitStrategies.add(Wait.forLogMessage(".*Function worker service started.*", 1));
+        }
+        final WaitAllStrategy compoundedWaitStrategy = new WaitAllStrategy();
+        waitStrategies.forEach(compoundedWaitStrategy::withStrategy);
+        waitingFor(compoundedWaitStrategy);
+    }
 }
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index 6d739dfbf98..91397d00c40 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -6,6 +6,9 @@
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.apache.pulsar.client.api.transaction.Transaction;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
@@ -19,11 +22,33 @@ public class PulsarContainerTest {
 
     public static final String TEST_TOPIC = "test_topic";
 
-    private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:2.2.0");
+    private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:2.10.0");
 
     @Test
     public void testUsage() throws Exception {
-        try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)) {
+        try (
+            // do not use PULSAR_IMAGE to make the doc looks easier
+            // constructorWithVersion {
+            PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:2.10.0"));
+            // }
+        ) {
+            pulsar.start();
+            // coordinates {
+            final String pulsarBrokerUrl = pulsar.getPulsarBrokerUrl();
+            final String httpServiceUrl = pulsar.getHttpServiceUrl();
+            // }
+            testPulsarFunctionality(pulsarBrokerUrl);
+        }
+    }
+
+    @Test
+    public void envVarsUsage() throws Exception {
+        try (
+            // constructorWithEnv {
+            PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)
+                .withEnv("PULSAR_PREFIX_brokerDeduplicationEnabled", "true");
+            // }
+        ) {
             pulsar.start();
             testPulsarFunctionality(pulsar.getPulsarBrokerUrl());
         }
@@ -31,24 +56,69 @@ public void testUsage() throws Exception {
 
     @Test
     public void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
-        try (PulsarContainer pulsar = new PulsarContainer("2.5.1")) {
+        try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)) {
             pulsar.start();
 
-            PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build();
-
-            assertThatThrownBy(() -> pulsarAdmin.functions().getFunctions("public", "default"))
-                .isInstanceOf(PulsarAdminException.class);
+            try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build()) {
+                assertThatThrownBy(() -> pulsarAdmin.functions().getFunctions("public", "default"))
+                    .isInstanceOf(PulsarAdminException.class);
+            }
         }
     }
 
     @Test
     public void shouldWaitForFunctionsWorkerStarted() throws Exception {
-        try (PulsarContainer pulsar = new PulsarContainer("2.5.1").withFunctionsWorker()) {
+        try (
+            // constructorWithFunctionsWorker {
+            PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withFunctionsWorker();
+            // }
+        ) {
+            pulsar.start();
+
+            try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build()) {
+                assertThat(pulsarAdmin.functions().getFunctions("public", "default")).hasSize(0);
+            }
+        }
+    }
+
+    @Test
+    public void testTransactions() throws Exception {
+        try (
+            // constructorWithTransactions {
+            PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withTransactions();
+            // }
+        ) {
             pulsar.start();
 
-            PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build();
+            try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build()) {
+                assertThat(
+                    pulsarAdmin
+                        .topics()
+                        .getList("pulsar/system")
+                        .contains("persistent://pulsar/system/transaction_coordinator_assign-partition-0")
+                )
+                    .isTrue();
+            }
+            testTransactionFunctionality(pulsar.getPulsarBrokerUrl());
+        }
+    }
+
+    @Test
+    public void testTransactionsAndFunctionsWorker() throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withTransactions().withFunctionsWorker()) {
+            pulsar.start();
 
-            assertThat(pulsarAdmin.functions().getFunctions("public", "default")).hasSize(0);
+            try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build();) {
+                assertThat(
+                    pulsarAdmin
+                        .topics()
+                        .getList("pulsar/system")
+                        .contains("persistent://pulsar/system/transaction_coordinator_assign-partition-0")
+                )
+                    .isTrue();
+                assertThat(pulsarAdmin.functions().getFunctions("public", "default")).hasSize(0);
+            }
+            testTransactionFunctionality(pulsar.getPulsarBrokerUrl());
         }
     }
 
@@ -65,4 +135,27 @@ protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception
             assertThat(new String(message.getData())).isEqualTo("test containers");
         }
     }
+
+    protected void testTransactionFunctionality(String pulsarBrokerUrl) throws Exception {
+        try (
+            PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).enableTransaction(true).build();
+            Consumer<String> consumer = client
+                .newConsumer(Schema.STRING)
+                .topic("transaction-topic")
+                .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+                .subscriptionName("test-transaction-sub")
+                .subscribe();
+            Producer<String> producer = client
+                .newProducer(Schema.STRING)
+                .sendTimeout(0, TimeUnit.SECONDS)
+                .topic("transaction-topic")
+                .create()
+        ) {
+            final Transaction transaction = client.newTransaction().build().get();
+            producer.newMessage(transaction).value("first").send();
+            transaction.commit();
+            Message<String> message = consumer.receive();
+            assertThat(message.getValue()).isEqualTo("first");
+        }
+    }
 }

From a2acf3cc6f828ad81a92eb4cc624ee9ddd29c2e2 Mon Sep 17 00:00:00 2001
From: Daniel Shuy <daniel_shuy@hotmail.com>
Date: Tue, 21 Jun 2022 07:43:11 +0800
Subject: [PATCH 1975/4969] Feature template: Fix typo in Alternatives section
 label (#5505)

---
 .github/ISSUE_TEMPLATE/feature.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 32edb0d25f5..9e79553d357 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -70,7 +70,7 @@ body:
   - type: textarea
     id: alternatives
     attributes:
-      label: Benefit
+      label: Alternatives
       description: Are there other alternatives? Please describe them.
     validations:
       required: true

From 00faa95834120b482117d7d0363e9b713adb18eb Mon Sep 17 00:00:00 2001
From: Yannick Weber <yannick.weber@hivemq.com>
Date: Wed, 22 Jun 2022 10:56:25 +0200
Subject: [PATCH 1976/4969] [HiveMQ] do not delete /opt/hivemq/temp-extensions
 in startup command (#5509)

* do not delete /opt/hivemq/temp-extensions in startup command
* command does not get stuck when '/opt/hivemq/temp-extensions' does not exist
---
 .../main/java/org/testcontainers/hivemq/HiveMQContainer.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 242cc7bdb43..8a2832f65bd 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -123,8 +123,7 @@ protected void configure() {
             "-c",
             removeCommand +
             "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ " +
-            "; rm -rf /opt/hivemq/temp-extensions/** " +
-            "&& chmod -R 777 /opt/hivemq/extensions " +
+            "; chmod -R 777 /opt/hivemq/extensions " +
             "&& /opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
         );
     }

From 1f7dc46e2f48d76e6770dce10479a2c63d30bad1 Mon Sep 17 00:00:00 2001
From: Jaromir Hamala <jaromir.hamala@gmail.com>
Date: Wed, 22 Jun 2022 19:10:26 +0200
Subject: [PATCH 1977/4969] Use sshd container 1.1.0 (#5486)

---
 .../testcontainers/containers/PortForwardingContainer.java | 7 +++++--
 docs/features/configuration.md                             | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index 22d364c0762..4a99ccacd91 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -31,14 +31,17 @@ public enum PortForwardingContainer {
     private Connection createSSHSession() {
         String password = UUID.randomUUID().toString();
         container =
-            new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.0.0"))
+            new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.1.0"))
                 .withExposedPorts(22)
                 .withEnv("PASSWORD", password)
                 .withCommand(
                     "sh",
                     "-c",
                     // Disable ipv6 & Make it listen on all interfaces, not just localhost
-                    "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes"
+                    // Enable algorithms supported by our ssh client library
+                    "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes " +
+                    "-o AddressFamily=inet -o GatewayPorts=yes -o AllowAgentForwarding=yes -o AllowTcpForwarding=yes " +
+                    "-o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa "
                 );
         container.start();
 
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index cccae7a86df..fbb369fe6a6 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -52,7 +52,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **tinyimage.container.image = alpine:3.14**  
 > Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))
 
-> **sshd.container.image = testcontainers/sshd:1.0.0**  
+> **sshd.container.image = testcontainers/sshd:1.1.0**  
 > Required if [exposing host ports to containers](./networking.md#exposing-host-ports-to-the-container)
 
 > **vncrecorder.container.image = testcontainers/vnc-recorder:1.1.0**

From cfc64bd2997000f67c46fa891dc402fd4ddbc5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 22 Jun 2022 12:56:20 -0500
Subject: [PATCH 1978/4969] Add clickhouse/clickhouse-server compatibility
 (#5488)

`clickhouse` was initially developed by Yandex and now it is
OpenSource. See more [here](https://clickhouse.com/blog/yandex-opensources-click-house/)

For backward compatibility, we will be supporting the image provided
by Yandex too.
---
 .../containers/ClickHouseContainer.java       |  4 +++-
 .../testcontainers/ClickhouseTestImages.java  |  3 ++-
 .../clickhouse/SimpleClickhouseTest.java      | 20 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 4528c48e935..16bbeef6c81 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -13,6 +13,8 @@ public class ClickHouseContainer extends JdbcDatabaseContainer {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yandex/clickhouse-server");
 
+    private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse("clickhouse/clickhouse-server");
+
     @Deprecated
     public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
@@ -49,7 +51,7 @@ public ClickHouseContainer(String dockerImageName) {
 
     public ClickHouseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLICKHOUSE_IMAGE_NAME);
 
         withExposedPorts(HTTP_PORT, NATIVE_PORT);
         waitingFor(
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
index 961df045bd1..a6707705ff8 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
@@ -3,5 +3,6 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface ClickhouseTestImages {
-    DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server:18.10.3");
+    DockerImageName YANDEX_CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server:18.10.3");
+    DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
index d2375891f8c..2f6edcc722d 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -1,20 +1,38 @@
 package org.testcontainers.junit.clickhouse;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
+@RunWith(Parameterized.class)
 public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
 
+    private final DockerImageName imageName;
+
+    public SimpleClickhouseTest(DockerImageName imageName) {
+        this.imageName = imageName;
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Object[][] data() {
+        return new Object[][] { //
+            { ClickhouseTestImages.CLICKHOUSE_IMAGE },
+            { ClickhouseTestImages.YANDEX_CLICKHOUSE_IMAGE },
+        };
+    }
+
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_IMAGE)) {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(this.imageName)) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");

From a9c2e9e148097f4996dc7a96f85fced1ee857ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 22 Jun 2022 13:30:09 -0500
Subject: [PATCH 1979/4969] [LocalStack] Remove usage of deprecated methods
 (#5491)

Improve documentation and tests avoiding usage of deprecated
methods.
---
 docs/modules/localstack.md                    | 35 +++------
 .../localstack/LocalStackContainer.java       |  5 +-
 .../containers/localstack/LegacyModeTest.java | 38 +++++++---
 .../localstack/LocalstackContainerTest.java   | 75 ++++++++++++++++---
 4 files changed, 102 insertions(+), 51 deletions(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index b551536af74..dcc474e484e 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -12,33 +12,18 @@ DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:0
 @Rule
 public LocalStackContainer localstack = new LocalStackContainer(localstackImage)
         .withServices(S3);
-
-@Test
-public void someTestMethod() {
-    // AWS SDK v1
-    AmazonS3 s3 = AmazonS3ClientBuilder
-                    .standard()
-                    .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
-                    .withCredentials(localstack.getDefaultCredentialsProvider())
-                    .build();
-    
-            s3.createBucket("foo");
-            s3.putObject("foo", "bar", "baz");
-
-    // AWS SDK v2
-    S3Client s3 = S3Client
-                .builder()
-                .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
-                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
-                    localstack.getAccessKey(), localstack.getSecretKey()
-                )))
-                .region(Region.of(localstack.getRegion()))
-                .build();
-
-            s3.createBucket(b -> b.bucket("foo"));
-            s3.putObject(b -> b.bucket("foo").key("bar"), RequestBody.fromBytes("baz".getBytes()));
 ```
 
+## Creating a client using AWS SDK
+
+<!--codeinclude-->
+[AWS SDK V1](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v1
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v2
+<!--/codeinclude-->
+
 Environment variables listed in [Localstack's README](https://github.com/localstack/localstack#configurations) may be used to customize Localstack's configuration. 
 Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
 
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index f3f905b84f6..146cb3200f1 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -27,10 +27,7 @@
 /**
  * <p>Container for LocalStack, 'A fully functional local AWS cloud stack'.</p>
  * <p>{@link LocalStackContainer#withServices(Service...)} should be used to select which services
- * are to be launched. See {@link Service} for available choices. It is advised that
- * {@link LocalStackContainer#getEndpointConfiguration(Service)} and
- * {@link LocalStackContainer#getDefaultCredentialsProvider()}
- * be used to obtain compatible endpoint configuration and credentials, respectively.</p>
+ * are to be launched. See {@link Service} for available choices.
  */
 @Slf4j
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index a757c11e928..c075d2805d6 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers.localstack;
 
+import com.amazonaws.client.builder.AwsClientBuilder;
 import com.github.dockerjava.api.DockerClient;
 import lombok.AllArgsConstructor;
 import org.junit.BeforeClass;
@@ -8,6 +9,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.localstack.LocalStackContainer.Service;
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.utility.DockerImageName;
 
@@ -46,20 +48,28 @@ public static Iterable<Object[]> constructors() {
 
         @Test
         public void samePortIsExposedForAllServices() {
-            localstack.withServices(LocalStackContainer.Service.S3, LocalStackContainer.Service.SQS);
+            localstack.withServices(Service.S3, Service.SQS);
             localstack.start();
 
             try {
                 assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
                 assertEquals(
                     "Endpoint overrides are different",
-                    localstack.getEndpointOverride(LocalStackContainer.Service.S3).toString(),
-                    localstack.getEndpointOverride(LocalStackContainer.Service.SQS).toString()
+                    localstack.getEndpointOverride(Service.S3).toString(),
+                    localstack.getEndpointOverride(Service.SQS).toString()
                 );
                 assertEquals(
                     "Endpoint configuration have different endpoints",
-                    localstack.getEndpointConfiguration(LocalStackContainer.Service.S3).getServiceEndpoint(),
-                    localstack.getEndpointConfiguration(LocalStackContainer.Service.SQS).getServiceEndpoint()
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.S3).toString(),
+                        localstack.getRegion()
+                    )
+                        .getServiceEndpoint(),
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.SQS).toString(),
+                        localstack.getRegion()
+                    )
+                        .getServiceEndpoint()
                 );
             } finally {
                 localstack.stop();
@@ -103,20 +113,28 @@ public static Iterable<Object[]> constructors() {
 
         @Test
         public void differentPortsAreExposed() {
-            localstack.withServices(LocalStackContainer.Service.S3, LocalStackContainer.Service.SQS);
+            localstack.withServices(Service.S3, Service.SQS);
             localstack.start();
 
             try {
                 assertTrue("Multiple ports are exposed", localstack.getExposedPorts().size() > 1);
                 assertNotEquals(
                     "Endpoint overrides are different",
-                    localstack.getEndpointOverride(LocalStackContainer.Service.S3).toString(),
-                    localstack.getEndpointOverride(LocalStackContainer.Service.SQS).toString()
+                    localstack.getEndpointOverride(Service.S3).toString(),
+                    localstack.getEndpointOverride(Service.SQS).toString()
                 );
                 assertNotEquals(
                     "Endpoint configuration have different endpoints",
-                    localstack.getEndpointConfiguration(LocalStackContainer.Service.S3).getServiceEndpoint(),
-                    localstack.getEndpointConfiguration(LocalStackContainer.Service.SQS).getServiceEndpoint()
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.S3).toString(),
+                        localstack.getRegion()
+                    )
+                        .getServiceEndpoint(),
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.SQS).toString(),
+                        localstack.getRegion()
+                    )
+                        .getServiceEndpoint()
                 );
             } finally {
                 localstack.stop();
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 3b85c69ca34..950f29866ba 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers.localstack;
 
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
@@ -73,11 +75,22 @@ public static class WithoutNetwork {
 
         @Test
         public void s3TestOverBridgeNetwork() throws IOException {
+            // with_aws_sdk_v1 {
             AmazonS3 s3 = AmazonS3ClientBuilder
                 .standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.S3))
-                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .withEndpointConfiguration(
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.S3).toString(),
+                        localstack.getRegion()
+                    )
+                )
+                .withCredentials(
+                    new AWSStaticCredentialsProvider(
+                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
                 .build();
+            // }
 
             final String bucketName = "foo";
             s3.createBucket(bucketName);
@@ -103,6 +116,7 @@ public void s3TestOverBridgeNetwork() throws IOException {
 
         @Test
         public void s3TestUsingAwsSdkV2() {
+            // with_aws_sdk_v2 {
             S3Client s3 = S3Client
                 .builder()
                 .endpointOverride(localstack.getEndpointOverride(Service.S3))
@@ -113,6 +127,7 @@ public void s3TestUsingAwsSdkV2() {
                 )
                 .region(Region.of(localstack.getRegion()))
                 .build();
+            // }
 
             final String bucketName = "foov2";
             s3.createBucket(b -> b.bucket(bucketName));
@@ -126,8 +141,17 @@ public void s3TestUsingAwsSdkV2() {
         public void sqsTestOverBridgeNetwork() {
             AmazonSQS sqs = AmazonSQSClientBuilder
                 .standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.SQS))
-                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .withEndpointConfiguration(
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.SQS).toString(),
+                        localstack.getRegion()
+                    )
+                )
+                .withCredentials(
+                    new AWSStaticCredentialsProvider(
+                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
                 .build();
 
             CreateQueueResult queueResult = sqs.createQueue("baz");
@@ -157,8 +181,17 @@ public void sqsTestOverBridgeNetwork() {
         public void cloudWatchLogsTestOverBridgeNetwork() {
             AWSLogs logs = AWSLogsClientBuilder
                 .standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.CLOUDWATCHLOGS))
-                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .withEndpointConfiguration(
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.CLOUDWATCHLOGS).toString(),
+                        localstack.getRegion()
+                    )
+                )
+                .withCredentials(
+                    new AWSStaticCredentialsProvider(
+                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
                 .build();
 
             logs.createLogGroup(new CreateLogGroupRequest("foo"));
@@ -172,8 +205,17 @@ public void cloudWatchLogsTestOverBridgeNetwork() {
         public void kmsKeyCreationTest() {
             AWSKMS awskms = AWSKMSClientBuilder
                 .standard()
-                .withEndpointConfiguration(localstack.getEndpointConfiguration(Service.KMS))
-                .withCredentials(localstack.getDefaultCredentialsProvider())
+                .withEndpointConfiguration(
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.KMS).toString(),
+                        localstack.getRegion()
+                    )
+                )
+                .withCredentials(
+                    new AWSStaticCredentialsProvider(
+                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
                 .build();
 
             String desc = String.format("AWS CMK Description");
@@ -198,8 +240,16 @@ public void samePortIsExposedForAllServices() {
             );
             assertEquals(
                 "Endpoint configuration have different endpoints",
-                localstack.getEndpointConfiguration(Service.S3).getServiceEndpoint(),
-                localstack.getEndpointConfiguration(Service.SQS).getServiceEndpoint()
+                new AwsClientBuilder.EndpointConfiguration(
+                    localstack.getEndpointOverride(Service.S3).toString(),
+                    localstack.getRegion()
+                )
+                    .getServiceEndpoint(),
+                new AwsClientBuilder.EndpointConfiguration(
+                    localstack.getEndpointOverride(Service.SQS).toString(),
+                    localstack.getRegion()
+                )
+                    .getServiceEndpoint()
             );
         }
     }
@@ -302,8 +352,9 @@ public static class WithRegion {
 
         @Test
         public void s3EndpointHasProperRegion() {
-            final AwsClientBuilder.EndpointConfiguration endpointConfiguration = localstack.getEndpointConfiguration(
-                Service.S3
+            final AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration(
+                localstack.getEndpointOverride(Service.S3).toString(),
+                localstack.getRegion()
             );
             assertEquals(
                 "The endpoint configuration has right region",

From afde5d3cde1657625e890740c9f137344b360cee Mon Sep 17 00:00:00 2001
From: Andrei Nevedomskii <kloz.klaud@gmail.com>
Date: Mon, 27 Jun 2022 20:34:49 +0200
Subject: [PATCH 1980/4969] JdbcDatabaseContainer: fix wrong instance call
 (#5465)

createConnection() method calls a wrong driver instance when logging
---
 .../org/testcontainers/containers/JdbcDatabaseContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 0b80eaac406..aa397929497 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -232,7 +232,7 @@ public Connection createConnection(String queryString) throws SQLException, NoDr
                     logger()
                         .debug(
                             "Trying to create JDBC connection using {} to {} with properties: {}",
-                            driver.getClass().getName(),
+                            jdbcDriverInstance.getClass().getName(),
                             url,
                             info
                         );

From c0eb042dabe7b048130f33459d4a542075fb1355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 27 Jun 2022 19:52:38 -0500
Subject: [PATCH 1981/4969] Polish examples (#5520)

---
 .../examples/CucumberTest.java                                  | 2 +-
 .../{testcontainsers => testcontainers}/examples/Stepdefs.java  | 2 +-
 .../examples/is_search_possible.feature                         | 0
 .../java/org/testcontainers/containers/Neo4jExampleTest.java    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename examples/cucumber/src/test/java/org/{testcontainsers => testcontainers}/examples/CucumberTest.java (84%)
 rename examples/cucumber/src/test/java/org/{testcontainsers => testcontainers}/examples/Stepdefs.java (98%)
 rename examples/cucumber/src/test/resources/org/{testcontainsers => testcontainers}/examples/is_search_possible.feature (100%)

diff --git a/examples/cucumber/src/test/java/org/testcontainsers/examples/CucumberTest.java b/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
similarity index 84%
rename from examples/cucumber/src/test/java/org/testcontainsers/examples/CucumberTest.java
rename to examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
index 0551b4dbf2e..f55919c0fe6 100644
--- a/examples/cucumber/src/test/java/org/testcontainsers/examples/CucumberTest.java
+++ b/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
@@ -1,4 +1,4 @@
-package org.testcontainsers.examples;
+package org.testcontainers.examples;
 
 import io.cucumber.junit.Cucumber;
 import io.cucumber.junit.CucumberOptions;
diff --git a/examples/cucumber/src/test/java/org/testcontainsers/examples/Stepdefs.java b/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
similarity index 98%
rename from examples/cucumber/src/test/java/org/testcontainsers/examples/Stepdefs.java
rename to examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
index ca70173ae92..e1b9c7e81ef 100644
--- a/examples/cucumber/src/test/java/org/testcontainsers/examples/Stepdefs.java
+++ b/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
@@ -1,4 +1,4 @@
-package org.testcontainsers.examples;
+package org.testcontainers.examples;
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
diff --git a/examples/cucumber/src/test/resources/org/testcontainsers/examples/is_search_possible.feature b/examples/cucumber/src/test/resources/org/testcontainers/examples/is_search_possible.feature
similarity index 100%
rename from examples/cucumber/src/test/resources/org/testcontainsers/examples/is_search_possible.feature
rename to examples/cucumber/src/test/resources/org/testcontainers/examples/is_search_possible.feature
diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
index 7730d4fa8d0..d151e1a3f24 100644
--- a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -24,7 +24,7 @@
 
 // junitExample {
 @Testcontainers
-public class Neo4jExampleTest {
+class Neo4jExampleTest {
 
     @Container
     private static Neo4jContainer<?> neo4jContainer =

From 56d0cf1941ad5faf77d1223766a4a0c495b29f8c Mon Sep 17 00:00:00 2001
From: Dave Maughan <davidamaughan@gmail.com>
Date: Tue, 28 Jun 2022 02:16:44 +0100
Subject: [PATCH 1982/4969] Check admin endpoint instead of metrics for Pulsar
 WaitStrategy.  (#5514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #5513

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../testcontainers/containers/PulsarContainer.java  | 13 ++++++++++++-
 .../containers/PulsarContainerTest.java             | 11 +++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 069fccaae65..30c36db01d8 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -17,8 +17,14 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     public static final int BROKER_HTTP_PORT = 8080;
 
+    /**
+     * @deprecated The metrics endpoint is no longer being used for the WaitStrategy.
+     */
+    @Deprecated
     public static final String METRICS_ENDPOINT = "/metrics";
 
+    private static final String ADMIN_CLUSTERS_ENDPOINT = "/admin/v2/clusters";
+
     /**
      * See <a href="https://github.com/apache/pulsar/blob/master/pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java">SystemTopicNames</a>.
      */
@@ -92,7 +98,12 @@ protected void setupCommandAndEnv() {
 
         List<WaitStrategy> waitStrategies = new ArrayList<>();
         waitStrategies.add(Wait.defaultWaitStrategy());
-        waitStrategies.add(Wait.forHttp(METRICS_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
+        waitStrategies.add(
+            Wait
+                .forHttp(ADMIN_CLUSTERS_ENDPOINT)
+                .forPort(BROKER_HTTP_PORT)
+                .forResponsePredicate("[\"standalone\"]"::equals)
+        );
         if (transactionsEnabled) {
             withEnv("PULSAR_PREFIX_transactionCoordinatorEnabled", "true");
             waitStrategies.add(Wait.forHttp(TRANSACTION_TOPIC_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index 91397d00c40..29de6c4c872 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -122,6 +122,17 @@ public void testTransactionsAndFunctionsWorker() throws Exception {
         }
     }
 
+    @Test
+    public void testClusterFullyInitialized() throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)) {
+            pulsar.start();
+
+            try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build()) {
+                assertThat(pulsarAdmin.clusters().getClusters()).hasSize(1).contains("standalone");
+            }
+        }
+    }
+
     protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception {
         try (
             PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).build();

From 5a2d76fa7f26b5ad1b57c98b2f1cac94ace397cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Mu=C3=B1oz?= <gmunozfe@redhat.com>
Date: Tue, 28 Jun 2022 06:58:54 +0200
Subject: [PATCH 1983/4969] Switch default image to ghcr.io and update default
 tag to 2.4.0 (#5173)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../org/testcontainers/containers/ToxiproxyContainer.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index ed8413a2a31..9850d7a0918 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -25,6 +25,8 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
     private static final String DEFAULT_TAG = "2.1.0";
 
+    private static final DockerImageName GHCR_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy");
+
     private static final int TOXIPROXY_CONTROL_PORT = 8474;
 
     private static final int FIRST_PROXIED_PORT = 8666;
@@ -51,7 +53,7 @@ public ToxiproxyContainer(String dockerImageName) {
 
     public ToxiproxyContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, GHCR_IMAGE_NAME);
 
         addExposedPorts(TOXIPROXY_CONTROL_PORT);
         setWaitStrategy(new HttpWaitStrategy().forPath("/version").forPort(TOXIPROXY_CONTROL_PORT));

From e23f378e68938f2a1f459f82d80c9485c7fcf006 Mon Sep 17 00:00:00 2001
From: Andrei Navrotski <6005070+anavrotski@users.noreply.github.com>
Date: Tue, 28 Jun 2022 08:32:35 +0300
Subject: [PATCH 1984/4969] [clickhouse] Add new JDBC driver name (#5474)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, fix the liveness port.

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/ClickHouseContainer.java       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 16bbeef6c81..4e87c77ee5b 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -1,13 +1,13 @@
 package org.testcontainers.containers;
 
-import com.google.common.collect.Sets;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
+import java.util.HashSet;
 import java.util.Set;
 
-public class ClickHouseContainer extends JdbcDatabaseContainer {
+public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
 
     public static final String NAME = "clickhouse";
 
@@ -53,23 +53,27 @@ public ClickHouseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLICKHOUSE_IMAGE_NAME);
 
-        withExposedPorts(HTTP_PORT, NATIVE_PORT);
-        waitingFor(
+        addExposedPorts(HTTP_PORT, NATIVE_PORT);
+        this.waitStrategy =
             new HttpWaitStrategy()
                 .forStatusCode(200)
-                .forResponsePredicate(responseBody -> "Ok.".equals(responseBody))
-                .withStartupTimeout(Duration.ofMinutes(1))
-        );
+                .forResponsePredicate("Ok."::equals)
+                .withStartupTimeout(Duration.ofMinutes(1));
     }
 
     @Override
     public Set<Integer> getLivenessCheckPortNumbers() {
-        return Sets.newHashSet(HTTP_PORT);
+        return new HashSet<>(getMappedPort(HTTP_PORT));
     }
 
     @Override
     public String getDriverClassName() {
-        return DRIVER_CLASS_NAME;
+        try {
+            Class.forName(DRIVER_CLASS_NAME);
+            return DRIVER_CLASS_NAME;
+        } catch (ClassNotFoundException e) {
+            return "com.clickhouse.jdbc.ClickHouseDriver";
+        }
     }
 
     @Override

From 4a14eccad30b0090ea99db7bd1ffa49a94ba37a1 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Wed, 29 Jun 2022 00:27:00 +0200
Subject: [PATCH 1985/4969] Elasticsearch: Fix startup check for 8.3 and above
 (#5521)

---
 .../elasticsearch/ElasticsearchContainer.java |  3 ++-
 .../ElasticsearchContainerTest.java           | 21 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 5a64a5e67a2..f8b9f779519 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -102,10 +102,11 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         this.isAtLeastMajorVersion8 =
             new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("8.0.0");
         // regex that
+        //   matches 8.3 JSON logging with started message and some follow up content within the message field
         //   matches 8.0 JSON logging with no whitespace between message field and content
         //   matches 7.x JSON logging with whitespace between message field and content
         //   matches 6.x text logging with node name in brackets and just a 'started' message till the end of the line
-        String regex = ".*(\"message\":\\s?\"started\".*|] started\n$)";
+        String regex = ".*(\"message\":\\s?\"started[\\s?|\"].*|] started\n$)";
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx(regex));
         if (isAtLeastMajorVersion8) {
             withPassword(ELASTICSEARCH_DEFAULT_PASSWORD);
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 4427163ca56..9fcfc45af76 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -150,6 +150,20 @@ public void elasticsearchVersion() throws IOException {
         }
     }
 
+    @Test
+    public void elasticsearchVersion83() throws IOException {
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.3.0"
+            )
+        ) {
+            container.start();
+            Response response = getClient(container).performRequest(new Request("GET", "/"));
+            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(EntityUtils.toString(response.getEntity()), containsString("8.3.0"));
+        }
+    }
+
     @Test
     public void elasticsearchOssImage() throws IOException {
         try (
@@ -406,10 +420,15 @@ private RestClient getClient(ElasticsearchContainer container) {
                 new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
             );
 
+            String protocol = container.caCertAsBytes().isPresent() ? "https://" : "http://";
+
             client =
                 RestClient
-                    .builder(HttpHost.create(container.getHttpHostAddress()))
+                    .builder(HttpHost.create(protocol + container.getHttpHostAddress()))
                     .setHttpClientConfigCallback(httpClientBuilder -> {
+                        if (container.caCertAsBytes().isPresent()) {
+                            httpClientBuilder.setSSLContext(container.createSslContextFromCa());
+                        }
                         return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
                     })
                     .build();

From 3395ceba894b2f58e37524e1df4786f662c4aab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 29 Jun 2022 03:46:20 -0500
Subject: [PATCH 1986/4969] Add labeler action (#5516)

Triage PRs.
---
 .github/labeler.yml           | 79 +++++++++++++++++++++++++++++++++++
 .github/workflows/labeler.yml | 14 +++++++
 2 files changed, 93 insertions(+)
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/labeler.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000000..9293237182e
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,79 @@
+"github_actions":
+  - .github/workflows/*
+"gradle-wrapper":
+  - gradle/wrapper/*
+  - gradlew
+  - gradlew.bat
+"modules/azure":
+  - modules/azure/*
+"modules/cassandra":
+  - modules/cassandra/*
+"modules/clickhouse":
+  - modules/clickhouse/*
+"modules/cockroachdb":
+  - modules/cockroachdb/*
+"modules/couchbase":
+  - modules/couchbase/*
+"modules/db2":
+  - modules/db2/*
+"modules/dynalite":
+  - modules/dynalite/*
+"modules/elasticsearch":
+  - modules/elasticsearch/*
+"modules/gcloud":
+  - modules/gcloud/*
+"modules/hivemq":
+  - modules/hivemq/*
+"modules/influx":
+  - modules/influxdb/*
+"modules/jdbc":
+  - modules/jdbc/*
+"modules/jupiter":
+  - modules/junit-jupiter/*
+"modules/k3s":
+  - modules/k3s/*
+"modules/kafka":
+  - modules/kafka/*
+"modules/localstack":
+  - modules/localstack/*
+"modules/mariadb":
+  - modules/mariadb/*
+"modules/mockserver":
+  - modules/mockserver/*
+"modules/mongodb":
+  - modules/mongodb/*
+"modules/sql-server":
+  - modules/mssqlserver/*
+"modules/mysql":
+  - modules/mysql/*
+"modules/neo4j":
+  - modules/neo4j/*
+"modules/nginx":
+  - modules/nginx/*
+"modules/oracle":
+  - modules/oracle-xe/*
+"modules/orientdb":
+  - modules/orientdb/*
+"modules/postgres":
+  - modules/postgresql/*
+"modules/presto":
+  - modules/presto/*
+"modules/pulsar":
+  - modules/pulsar/*
+"modules/r2dbc":
+  - modules/r2dbc/*
+"modules/rabbitmq":
+  - modules/rabbitmq/*
+"modules/selenium":
+  - modules/selenium/*
+"modules/solr":
+  - modules/solr/*
+"modules/spock":
+  - modules/spock/*
+"modules/toxiproxy":
+  - modules/toxiproxy/*
+"modules/trino":
+  - modules/trino/*
+"modules/vault":
+  - modules/vault/*
+"type/docs": docs/**/*
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 00000000000..057208eda32
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,14 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From c562080f1ce487dfedf19e76f7d890e9871ddd03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 29 Jun 2022 03:51:47 -0500
Subject: [PATCH 1987/4969] Update latest version in mkdocs.yml

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index f6daad68155..21e157969e5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -102,4 +102,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.17.2
+    latest_version: 1.17.3

From fbc5fe4935fd97747a1f7e18dade3132d474045f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 29 Jun 2022 03:52:58 -0500
Subject: [PATCH 1988/4969] Upgrade testcontainers version to 1.17.3 in japicmp

---
 gradle/japicmp.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index fe3f8881b1c..3c438d340f0 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-    baseline "org.testcontainers:${project.name}:1.17.2", {
+    baseline "org.testcontainers:${project.name}:1.17.3", {
         exclude group: "*", module: "*"
     }
 }

From 1fe0ef23f4851506b56b355a134fb60203554631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 29 Jun 2022 11:40:49 -0500
Subject: [PATCH 1989/4969] Improve docs (#5522)

Add additional steps for linux and colima
---
 docs/supported_docker_environment/index.md | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 3b82cea2165..aa6c7b1b867 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -2,16 +2,25 @@
 
 ## Overview
 
-| Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                                                                                                                                                                                |
-|-------------------------------------|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Linux - general                     | Docker v17.09              |                                                                                                                                                                                                                                                                                                                                                                    |
-| Linux - CircleCI (LXC driver)      | Docker v17.09               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                                                                                                                                                                                   |
-| Linux - within a Docker container            | Docker v17.09              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                                                                                                                                                                              |
-| Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                                                                                                                                                                                    |
+| Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                 |
+|-------------------------------------|-----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Linux - general                     | Docker v17.09              | After docker installation, follow [post-installation steps](https://docs.docker.com/engine/install/linux-postinstall/).                                                                             |
+| Linux - CircleCI (LXC driver)      | Docker v17.09               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                     |
+| Linux - within a Docker container            | Docker v17.09              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                              |
+| Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                     |
 | Mac OS X - Docker for Mac      | v17.09          | *Support is best-efforts at present*. `getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
-| Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                                                                                                                                                                               |
-| Windows - Docker for Windows   |                             | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md)                                                                                                                                                                                                                                                                                                                                        |
-| Windows - Windows Subsystem for Linux (WSL) | Docker v17.09                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md). |
+| Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                |
+| Windows - Docker for Windows   |                             | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md)                                                                   |
+| Windows - Windows Subsystem for Linux (WSL) | Docker v17.09                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md).                                                                  |
+
+## Using Colima?
+
+In order to run testcontainers against [colima](https://github.com/abiosoft/colima) the env vars bellow should be set
+
+```
+export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
+export DOCKER_HOST="unix://${HOME}/.colima/docker.sock"
+```
 
 ## Docker environment discovery
 

From a2bf452bb5851a9278315b26741984038c66cd1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 1 Jul 2022 14:48:52 -0500
Subject: [PATCH 1990/4969] Add host os and arch in bug report template (#5525)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 80e0b47741d..dc86b416e46 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -65,6 +65,22 @@ body:
         - 'No'
     validations:
       required: true
+  - type: input
+    id: host-os
+    attributes:
+      label: Host OS
+      description: Which Operating System are you using?
+      placeholder: e.g. Linux, Windows
+    validations:
+      required: true
+  - type: input
+    id: host-arch
+    attributes:
+      label: Host Arch
+      description: Which architecture are you using?
+      placeholder: e.g. x86, ARM
+    validations:
+      required: true
   - type: textarea
     id: docker-version
     attributes:

From 0fc238075546f56e22b0fd44ba985c2fcc2f8424 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:03:51 +0000
Subject: [PATCH 1991/4969] Bump neo4j-java-driver from 4.4.5 to 4.4.6 in
 /modules/neo4j

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.5 to 4.4.6.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.5...4.4.6)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index e0a51ea783e..feff7329185 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.5'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.6'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 9d63e7fa477e050d2fe1998b6f8824768b667397 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:03:53 +0000
Subject: [PATCH 1992/4969] Bump neo4j from 3.5.33 to 3.5.34 in /modules/neo4j

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.33 to 3.5.34.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/compare/3.5.33...3.5.34)

---
updated-dependencies:
- dependency-name: org.neo4j:neo4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index e0a51ea783e..779aab2bde8 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,7 +29,7 @@ task customNeo4jPluginJar(type: Jar) {
 processTestResources.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.33"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.34"
 
     api project(":testcontainers")
 

From 1748c8ed29ccaf6964614bb97ff0d326675bab31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:04:32 +0000
Subject: [PATCH 1993/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.232 to 1.12.253.
- [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.12.232...1.12.253)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 09cb51e10a4..acf379cda79 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.232'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.210'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 80695194043f8824a28c0aae44659b2f4f5051fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:04:34 +0000
Subject: [PATCH 1994/4969] Bump mariadb-java-client from 3.0.5 to 3.0.6 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.5 to 3.0.6.
- [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/3.0.5...3.0.6)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 fd534915ba1..ed7f428ba3e 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.5'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.6'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From 37afe8e054c764ce2898ce3e7525b56c44fee4a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:04:43 +0000
Subject: [PATCH 1995/4969] Bump transport from 7.17.4 to 7.17.5 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.4 to 7.17.5.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.4...v7.17.5)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 6d2b5b8a667..29e6591034d 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.2.2"
-    testImplementation "org.elasticsearch.client:transport:7.17.4"
+    testImplementation "org.elasticsearch.client:transport:7.17.5"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 72846fdf802e5d4a6c6bf11bd8a741049e480253 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:12 +0000
Subject: [PATCH 1996/4969] Bump java-client from 3.3.0 to 3.3.1 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.3.0...java-client-3.3.1)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 71844a30d20..df7f4cbc221 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
-    testImplementation 'com.couchbase.client:java-client:3.3.0'
+    testImplementation 'com.couchbase.client:java-client:3.3.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
 }

From 602d11d68f4b8e225e6d5635b85a640c3fcde92a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:32 +0000
Subject: [PATCH 1997/4969] Bump rest-assured from 5.1.0 to 5.1.1 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.1.0...rest-assured-5.1.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 1ffc366987c..499286ae72a 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.1.0'
+    testImplementation 'io.rest-assured:rest-assured:5.1.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
 }

From 49f680ead43656a758d03441254bc42448c89fa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:36 +0000
Subject: [PATCH 1998/4969] Bump tomcat-jdbc from 10.0.21 to 10.0.22 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.21 to 10.0.22.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 043c2774d6c..012e9f410ec 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.21'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.22'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 81e19bf43be0927fb1ac598ad09a645eef59f415 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:38 +0000
Subject: [PATCH 1999/4969] Bump pulsar-client from 2.10.0 to 2.10.1 in
 /modules/pulsar

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.10.0...v2.10.1)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index a1b24efba37..31524211f63 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.1'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.0'
 }

From c4aa3db14fdbc189de6b368069f9871ab456891f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:39 +0000
Subject: [PATCH 2000/4969] Bump mssql-jdbc in /modules/mssqlserver

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 11.1.1.jre8-preview to 11.1.2.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e7a654e12f1..30b9af2bd77 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.1.1.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.1.2.jre8-preview'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'

From b1c4fb664fa8d8b42c0e44b3a30555c3138994ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:43 +0000
Subject: [PATCH 2001/4969] Bump pulsar-client-admin from 2.10.0 to 2.10.1 in
 /modules/pulsar

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.10.0...v2.10.1)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index a1b24efba37..e49b46a85ed 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.1'
 }

From d20ddfbecc1d82ce3bda4f441d18d82fc7070290 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:45 +0000
Subject: [PATCH 2002/4969] Bump amqp-client from 5.14.2 to 5.15.0 in /core

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.14.2 to 5.15.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.14.2...v5.15.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ebfd4f36bcb..b4c6d7ad4a2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,7 +88,7 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.2.3'
-    testImplementation 'com.rabbitmq:amqp-client:5.14.2'
+    testImplementation 'com.rabbitmq:amqp-client:5.15.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
     testImplementation ('org.mockito:mockito-core:4.6.0') {

From f3fdbf6a94c5cf7082c2ea452ab93610044e2af6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:45 +0000
Subject: [PATCH 2003/4969] Bump aws-java-sdk-sqs from 1.12.233 to 1.12.253 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.233 to 1.12.253.
- [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.12.233...1.12.253)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 b6fb4fd3111..e73bf61c19d 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.233'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.253'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'
     testImplementation 'software.amazon.awssdk:s3:2.17.204'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 17086e24c6fe00f93fbec6f7653df62c78f3cc34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:05:46 +0000
Subject: [PATCH 2004/4969] Bump s3 from 2.17.204 to 2.17.224 in
 /modules/localstack

Bumps s3 from 2.17.204 to 2.17.224.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 b6fb4fd3111..4a191afd82a 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.233'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'
-    testImplementation 'software.amazon.awssdk:s3:2.17.204'
+    testImplementation 'software.amazon.awssdk:s3:2.17.224'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 183500e91eb6cbb79e9e7b29bedea3664556b1af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:06:14 +0000
Subject: [PATCH 2005/4969] Bump peter-evans/create-pull-request from 4.0.3 to
 4.0.4

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/f094b77505fb89581e68a1163fbd2fffece39da1...923ad837f191474af6b1721408744feb989a4c27)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index b4d4d250346..ed21bca4670 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1 # v3.10.1
+        uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From d3ea1fca61c21e46f243b744e06ec78d73d9294f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:06:16 +0000
Subject: [PATCH 2006/4969] Bump gradle-update/update-gradle-wrapper-action
 from 1.0.17 to 1.0.18

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 1.0.17 to 1.0.18.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/5b865a8b4d09fdf6afaaa20397ba68455bb48f0d...981c551b17dbcf1940b1b4435afdb79babb7c13a)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index e2013d0f1b7..5855e609fce 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@5b865a8b4d09fdf6afaaa20397ba68455bb48f0d # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@981c551b17dbcf1940b1b4435afdb79babb7c13a # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From 82cf76073948a2e278a28fc8fd1d42fb41b49c9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:06:20 +0000
Subject: [PATCH 2007/4969] Bump actions/cache from 3.0.3 to 3.0.4

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.3...v3.0.4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 9a7b314c67f..b1466ba8621 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -22,7 +22,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -50,7 +50,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56bb4e0799d..70ee552b798 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -56,7 +56,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From 92c087da00e3c67a861601c7c15d490ac2ed3390 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:07:07 +0000
Subject: [PATCH 2008/4969] Bump cucumber-java from 7.2.3 to 7.4.1 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.2.3 to 7.4.1.
- [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/v7.2.3...v7.4.1)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 f23a2d9b7af..3e03e776ac4 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:7.2.3'
+    testImplementation 'io.cucumber:cucumber-java:7.4.1'
     testImplementation 'io.cucumber:cucumber-junit:7.3.4'
     testImplementation 'org.testcontainers:selenium'
 }

From 87e734d9c5af84bd34838e8f2f84cccf5210a078 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:07:18 +0000
Subject: [PATCH 2009/4969] Bump assertj-core from 3.22.0 to 3.23.1 in
 /examples

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle   | 2 +-
 examples/neo4j-container/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index db89b4335fe..79e91ec5a68 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.1.0'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
 }
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 745d3206953..e937bd2954b 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.6'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'

From 76a7c3b24c754519ccd622e42d84118a864482d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:07:25 +0000
Subject: [PATCH 2010/4969] Bump postgresql from 42.3.6 to 42.4.0 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.6 to 42.4.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.6...REL42.4.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f25127f75eb..4bb216e6fb7 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20220320'
-    testImplementation 'org.postgresql:postgresql:42.3.6'
+    testImplementation 'org.postgresql:postgresql:42.4.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
 }

From cae5491705e415e9369eda6ce61a2224aae1631f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:07:27 +0000
Subject: [PATCH 2011/4969] Bump com.gradle.enterprise.gradle.plugin in
 /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.10 to 3.10.2.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index b9fb73f86c1..5a4ae8c0d2e 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.2"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
     }
 }

From 010ca107405a11d1e9674c635dfc965830fcfba9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:09:12 +0000
Subject: [PATCH 2012/4969] Bump reactor-core from 3.4.18 to 3.4.19 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.18 to 3.4.19.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.18...v3.4.19)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 51199c9a53c..692b5ac9ce5 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.18'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.19'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 7ca244e24d036c64d957905580aee5ae818fff5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:09:21 +0000
Subject: [PATCH 2013/4969] Bump hivemq-extension-sdk from 4.8.1 to 4.8.2 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.8.1 to 4.8.2.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.8.1...4.8.2)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 7add9af67ea..aa566381d0c 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.1")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.2")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.11")

From c130082dee8f2e3de1b48022ffc6675df5a9435e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:09:26 +0000
Subject: [PATCH 2014/4969] Bump trino-jdbc from 382 to 388 in /modules/trino

Bumps trino-jdbc from 382 to 388.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 8305e8e0629..caf1f322c12 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:382'
+    testImplementation 'io.trino:trino-jdbc:388'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 30508fe29ed6aab8160efa17c5f67f3f8ecb9fe2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:09:36 +0000
Subject: [PATCH 2015/4969] Bump google-cloud-datastore from 2.7.0 to 2.10.0 in
 /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.7.0 to 2.10.0.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.7.0...v2.10.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index cdea13f5fac..ddb634fbd79 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.7.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.10.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.25.5'

From c0cc90ffc90d3d324e767d63ad0f1388cc8435ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:09:37 +0000
Subject: [PATCH 2016/4969] Bump client-java from 15.0.1 to 16.0.0 in
 /modules/k3s

Bumps [client-java](https://github.com/kubernetes-client/java) from 15.0.1 to 16.0.0.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v15.0.1...v16.0.0)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index bf51cbfefa9..2223909f051 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:5.12.2'
-    testImplementation 'io.kubernetes:client-java:15.0.1'
+    testImplementation 'io.kubernetes:client-java:16.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From d6dfc0b544c3cada52c8827d83d4851e782f25b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:09:40 +0000
Subject: [PATCH 2017/4969] Bump google-cloud-bigtable from 2.8.0 to 2.9.0 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.8.0...v2.9.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index cdea13f5fac..3debc0391cf 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.25.5'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.8.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.9.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 183fce7a00e383de48e95ff672d8a0372a6c61d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:09:45 +0000
Subject: [PATCH 2018/4969] Bump google-cloud-pubsub from 1.119.0 to 1.120.0 in
 /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.119.0 to 1.120.0.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.119.0...v1.120.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index cdea13f5fac..1369d741f1d 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.7.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.25.5'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.8.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 1e7ed80c8be857bb80a1bd3e158221ff97269516 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:10:03 +0000
Subject: [PATCH 2019/4969] Bump amqp-client from 5.14.2 to 5.15.0 in
 /modules/rabbitmq

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.14.2 to 5.15.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.14.2...v5.15.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 6c2953909bb..9825a27a499 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.14.2'
+    testImplementation 'com.rabbitmq:amqp-client:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 889b990fb7dc7ae31a370c1bd28d6d7265c3fa6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:10:09 +0000
Subject: [PATCH 2020/4969] Bump mongodb-driver-sync from 4.6.0 to 4.6.1 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.6.0...r4.6.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index d8ef34fbb40..297bcd21f3b 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.6.0")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.6.1")
 }

From 10e5c4936911629cc805a8b9085e79cfa957cf27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:10:14 +0000
Subject: [PATCH 2021/4969] Bump azure-cosmos from 4.30.0 to 4.32.1 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.30.0 to 4.32.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.30.0...azure-cosmos_4.32.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 6656445af09..5f8c6837d79 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.30.0'
+    testImplementation 'com.azure:azure-cosmos:4.32.1'
 }

From 267df8d0bc5a2a8b16513b0b59b3a8ebe6c22150 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:10:32 +0000
Subject: [PATCH 2022/4969] Bump postgresql from 42.3.6 to 42.4.0 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.6 to 42.4.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.6...REL42.4.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 490b2d7fb11..fb9f53189d9 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.3.6'
+    testImplementation 'org.postgresql:postgresql:42.4.0'
 }

From d5d78d0f471462612ac080284423871d0808ec2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:11:53 +0000
Subject: [PATCH 2023/4969] Bump com.gradle.enterprise.gradle.plugin from
 3.10.1 to 3.10.2

Bumps com.gradle.enterprise.gradle.plugin from 3.10.1 to 3.10.2.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 16b3fcdf98a..73cd6b977fd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.2"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7"
     }
 }

From c8daeb689cf4b1f500869a8565ebe4cbcf35390a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:34 +0000
Subject: [PATCH 2024/4969] Bump postgresql from 42.3.6 to 42.4.0 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.6 to 42.4.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.6...REL42.4.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9a74389e8a9..73a8897800c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.6'
+    testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }

From ea4f953dc06ea7e0751f0b2ac23230af3eef41f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:34 +0000
Subject: [PATCH 2025/4969] Bump postgresql from 42.3.6 to 42.4.0 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.6 to 42.4.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.6...REL42.4.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e609733d398..a9e3b7d09b1 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.6'
+    testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'

From 7066793701465e01ecf4734a9fccb7b900995228 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:35 +0000
Subject: [PATCH 2026/4969] Bump postgresql from 42.3.6 to 42.4.0 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.6 to 42.4.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.6...REL42.4.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f083d4ed949..87705f77d5d 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.3.6'
+    testImplementation 'org.postgresql:postgresql:42.4.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'

From 1dec0ec57754e4ba2d201cd09f979a3d93b8519c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:39 +0000
Subject: [PATCH 2027/4969] Bump org.jetbrains.kotlin.jvm from 1.6.21 to 1.7.0
 in /examples

Bumps [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) from 1.6.21 to 1.7.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.6.21...v1.7.0)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 4f3a50de21a..c0bd965ab79 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.6.4"
-    id("org.jetbrains.kotlin.jvm") version "1.6.21"
+    id("org.jetbrains.kotlin.jvm") version "1.7.0"
     id("org.jetbrains.kotlin.plugin.spring") version "1.6.21"
 }
 

From 770a9d86a721dc8fda92fe883bd4f97d49d20069 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:39 +0000
Subject: [PATCH 2028/4969] Bump tomcat-jdbc from 10.0.21 to 10.0.22 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.21 to 10.0.22.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5674f235c7f..3649396773d 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.21'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.22'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.29'
 }

From 799f1dd49bbe835b65bc1f543df9a5d459fbee3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:39 +0000
Subject: [PATCH 2029/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.2.2 to 8.3.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.2.2...v8.3.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 29e6591034d..a4a277596fc 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.2.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.3.1"
     testImplementation "org.elasticsearch.client:transport:7.17.5"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From f14382d24fb349d370a18c185100f27ba603e80d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:43 +0000
Subject: [PATCH 2030/4969] Bump mockito-core from 4.6.0 to 4.6.1 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.0...v4.6.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index b4c6d7ad4a2..d32e2fc43b2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.15.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
-    testImplementation ('org.mockito:mockito-core:4.6.0') {
+    testImplementation ('org.mockito:mockito-core:4.6.1') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 4ce0ab4a855a81a0267d2a64ec3805633b0643ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:46 +0000
Subject: [PATCH 2031/4969] Bump cucumber-junit from 7.3.4 to 7.4.1 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.3.4 to 7.4.1.
- [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/v7.3.4...v7.4.1)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 3e03e776ac4..1bf4e1f72cb 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:7.4.1'
-    testImplementation 'io.cucumber:cucumber-junit:7.3.4'
+    testImplementation 'io.cucumber:cucumber-junit:7.4.1'
     testImplementation 'org.testcontainers:selenium'
 }

From cd03ce9275d6f6a1289c91196bf21f23ba81f6c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:48 +0000
Subject: [PATCH 2032/4969] Bump aws-java-sdk-s3 from 1.12.231 to 1.12.253 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.231 to 1.12.253.
- [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.12.231...1.12.253)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 d6bd9781720..4ff9066b4c4 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.231'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.253'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.253'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'

From 3e9202d8411bf077f617403e99b0c6c312e73041 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:22:51 +0000
Subject: [PATCH 2033/4969] Bump aws-java-sdk-logs from 1.12.232 to 1.12.253 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.232 to 1.12.253.
- [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.12.232...1.12.253)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 d6bd9781720..17e63142882 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.253'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.253'
     testImplementation 'software.amazon.awssdk:s3:2.17.224'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 69948b3600aa71f9e1ffd8c7e73acbc4a5dd0f49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:23:01 +0000
Subject: [PATCH 2034/4969] Bump okhttp from 4.9.3 to 4.10.0 in /examples

Bumps [okhttp](https://github.com/square/okhttp) from 4.9.3 to 4.10.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.3...parent-4.10.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4bb216e6fb7..c6272fc7522 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.36'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220320'
     testImplementation 'org.postgresql:postgresql:42.4.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'

From 5eed792d4679811cf84c1e58887dac7bb1b13901 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:23:03 +0000
Subject: [PATCH 2035/4969] Bump google-cloud-spanner from 6.25.5 to 6.25.7 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.25.5 to 6.25.7.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.25.5...v6.25.7)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 4af736c6cb8..2cabbc4cf30 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.10.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.0'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.25.5'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.25.7'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.9.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 2c0a004b5208edc57aed7c65d5241325b08b9cd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:23:15 +0000
Subject: [PATCH 2036/4969] Bump common-custom-user-data-gradle-plugin from 1.7
 to 1.7.2

Bumps common-custom-user-data-gradle-plugin from 1.7 to 1.7.2.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 73cd6b977fd..d4605c2ad84 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.2"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
     }
 }
 

From 0060e2b11ce5602f0b000d3deb9ce74b49c91b97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 20:43:23 +0000
Subject: [PATCH 2037/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin) from 1.6.21 to 1.7.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.6.21...v1.7.0)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index c0bd965ab79..90338ff9959 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.6.4"
     id("org.jetbrains.kotlin.jvm") version "1.7.0"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.6.21"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.7.0"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 46b48e60fc2685ceefe7384e3b95f5d8183cbbd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 20:43:33 +0000
Subject: [PATCH 2038/4969] Bump kafka-clients from 3.1.0 to 3.2.0 in /examples

Bumps kafka-clients from 3.1.0 to 3.2.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 79e91ec5a68..d69af5ceb68 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.1.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'

From 364111407464cf4b50bf45f1d8638b1a49ed38e0 Mon Sep 17 00:00:00 2001
From: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Date: Thu, 7 Jul 2022 18:47:42 -0500
Subject: [PATCH 2039/4969] chore: Set permissions for GitHub actions (#5523)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
---
 .github/workflows/ci-docker-wormhole.yml  | 3 +++
 .github/workflows/ci-examples.yml         | 3 +++
 .github/workflows/ci-rootless.yml         | 3 +++
 .github/workflows/release-drafter.yml     | 6 ++++++
 .github/workflows/release.yml             | 3 +++
 .github/workflows/update-docs-version.yml | 6 ++++++
 6 files changed, 24 insertions(+)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 6d0df9a3c21..e27e4d8d611 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -4,6 +4,9 @@ on:
   pull_request: {}
   push: { branches: [ master ] }
 
+permissions:
+  contents: read
+
 jobs:
   in-docker_test:
     runs-on: ubuntu-18.04
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index b1466ba8621..f24fd6f6916 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -10,6 +10,9 @@ env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
 
+permissions:
+  contents: read
+
 jobs:
   find_gradle_jobs:
     runs-on: ubuntu-18.04
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 45c58c5e2d0..348cf5aaaf7 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -4,6 +4,9 @@ on:
   pull_request: {}
   push: { branches: [ master ] }
 
+permissions:
+  contents: read
+
 jobs:
   test:
     runs-on: ubuntu-18.04
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 132b5ffd0a5..fb0780d781f 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -7,8 +7,14 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
+permissions:
+  contents: read
+
 jobs:
   update_release_draft:
+    permissions:
+      contents: write  # for release-drafter/release-drafter to create a github release
+      pull-requests: write  # for release-drafter/release-drafter to add label to PR
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5c786d440c5..29a0b920922 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,9 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
+permissions:
+  contents: read
+
 jobs:
   release:
     runs-on: ubuntu-18.04
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index ed21bca4670..b2736c42590 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -4,8 +4,14 @@ on:
   release:
     types: [ published ]
 
+permissions:
+  contents: read
+
 jobs:
   build:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-18.04
     steps:

From 2f3178d04fb19dbdaa9d686380c6894e443b2377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 7 Jul 2022 18:49:12 -0500
Subject: [PATCH 2040/4969] Add read permission to ci.yml

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70ee552b798..3287499c2fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,9 @@ on:
   pull_request: {}
   push: { branches: [ master ] }
 
+permissions:
+  contents: read
+
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

From 84d3444600aaeeac6813505fe5bfbf9ffce760ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 7 Jul 2022 19:44:03 -0500
Subject: [PATCH 2041/4969] Add test-retry plugin (#5586)

* Enable the plugin only in CI environment
* Every test will retry up to 2 times. 3 runs per test in general
* Disable retry if 5 tests (no retries are count) fail
---
 build.gradle | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build.gradle b/build.gradle
index 1458b3db027..8c956133b03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
     id 'com.diffplug.spotless' version '6.3.0' apply false
+    id 'org.gradle.test-retry' version '1.4.0'
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -33,6 +34,7 @@ subprojects {
     apply from: "$rootDir/gradle/shading.gradle"
     apply plugin: 'com.diffplug.spotless'
     apply plugin: 'checkstyle'
+    apply plugin: 'org.gradle.test-retry'
 
     group = "org.testcontainers"
 
@@ -86,6 +88,14 @@ subprojects {
             exceptionFormat = 'full'
             events "STARTED", "PASSED", "FAILED", "SKIPPED"
         }
+        ext.isCI = System.getenv("CI") != null
+        if (isCI) {
+            retry {
+                maxRetries = 2
+                maxFailures = 5
+                failOnPassedAfterRetry = false
+            }
+        }
     }
 
     tasks.withType(Test).all {

From d1b13d716616ae359cb9c9b99bd097493d691da1 Mon Sep 17 00:00:00 2001
From: Josef Cacek <josef.cacek@gmail.com>
Date: Tue, 12 Jul 2022 14:08:29 +0200
Subject: [PATCH 2042/4969] Fix javadoc comment in
 ToxiproxyContainer#getProxy(GenericContainer, int) (#5591)

---
 .../java/org/testcontainers/containers/ToxiproxyContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index 9850d7a0918..5f496a38873 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -79,7 +79,7 @@ public int getControlPort() {
 
     /**
      * Obtain a {@link ContainerProxy} instance for target container that is managed by Testcontainers. The target
-     * container should be routable from this <b>from this {@link ToxiproxyContainer} instance</b> (e.g. on the same
+     * container should be routable <b>from this {@link ToxiproxyContainer} instance</b> (e.g. on the same
      * Docker {@link Network}).
      *
      * @param container target container

From a76a7f52513426692f8d41cb01369f2aa10a3160 Mon Sep 17 00:00:00 2001
From: Quinn Bast <bast200q@uregina.ca>
Date: Wed, 13 Jul 2022 17:17:15 -0600
Subject: [PATCH 2043/4969] Add documentation for DependsOn (#5597)

---
 .../src/test/java/generic/DependsOnTest.java  | 25 +++++++++++++++++++
 docs/features/startup_and_waits.md            |  8 ++++++
 2 files changed, 33 insertions(+)
 create mode 100644 docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java

diff --git a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
new file mode 100644
index 00000000000..6534a35a00f
--- /dev/null
+++ b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
@@ -0,0 +1,25 @@
+package generic;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+
+import static org.junit.Assert.assertTrue;
+
+public class DependsOnTest {
+
+    @Rule
+    // dependsOn {
+    public GenericContainer<?> redis = new GenericContainer<>("redis:3.0.2").withExposedPorts(6379);
+
+    @Rule
+    public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.9.4").dependsOn(redis).withExposedPorts(80);
+
+    // }
+
+    @Test
+    public void testContainersAllStarted() {
+        assertTrue(redis.isRunning());
+        assertTrue(nginx.isRunning());
+    }
+}
diff --git a/docs/features/startup_and_waits.md b/docs/features/startup_and_waits.md
index 3cbec97af0d..e092919d496 100644
--- a/docs/features/startup_and_waits.md
+++ b/docs/features/startup_and_waits.md
@@ -123,3 +123,11 @@ If none of these options meet your requirements, you can create your own subclas
 /startupcheck/StartupCheckStrategy.html) with an appropriate startup check mechanism in `waitUntilStartupSuccessful()`.
 Or you can leave it as is and just implement the `checkStartupState(DockerClient dockerClient, String containerId)` if you still want to check state
  periodically.
+
+## Depending on another container
+
+Sometimes, a container relies on another container to be ready before it should start itself. An example of this might be a database that needs to be started before your application container can link to it. You can tell a container that it depends on another container by using the `dependsOn` method:
+
+<!--codeinclude--> 
+[Depending on another container](../examples/junit4/generic/src/test/java/generic/DependsOnTest.java) inside_block:dependsOn
+<!--/codeinclude-->

From 7e364891eed1eda2fdc1cdfea7e5facaccc7b025 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 19:31:32 -0500
Subject: [PATCH 2044/4969] Update Gradle Wrapper to 7.5 (#5598)

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 59821 -> 60756 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   6 ++++++
 examples/gradlew.bat                          |  14 ++++++++------
 gradle/wrapper/gradle-wrapper.jar             | Bin 59821 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   6 ++++++
 gradlew.bat                                   |  14 ++++++++------
 8 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10197
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
V^VU-c2;R4Y5)%S~aP=SP{{YK41APDh

delta 9308
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

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 5c51a4acc9d..012d6d90445 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 1b6c787337f..a69d9cb6c20 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index ac1b06f9382..53a6b238d41 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10197
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
V^VU-c2;R4Y5)%S~aP=SP{{YK41APDh

delta 9308
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1e0c8dc42b..ef80eb5051f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337f..a69d9cb6c20 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9382..53a6b238d41 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From 55ec5f1c5311f7fbc959ae56a4b1e546915c87fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Jul 2022 16:50:55 -0500
Subject: [PATCH 2045/4969] Use host instead of containerIpAddress for Kotlin
 sample

---
 .../test/kotlin/com/example/redis/AbstractIntegrationTest.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
index 6350ace9bd9..98f56192087 100644
--- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
@@ -26,7 +26,7 @@ abstract class AbstractIntegrationTest {
             redisContainer.start()
 
             TestPropertyValues.of(
-                "spring.redis.host=${redisContainer.containerIpAddress}",
+                "spring.redis.host=${redisContainer.host}",
                 "spring.redis.port=${redisContainer.firstMappedPort}"
             ).applyTo(configurableApplicationContext.environment)
         }

From 8c8bf2a818da7bbe1ae3dca2171eebef89746a2b Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 20 Jul 2022 19:11:35 +0200
Subject: [PATCH 2046/4969] Enable JUnitPlatform in Gradle for JUnit5 examples
 (#4130)

---
 docs/examples/junit5/redis/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 348f4788555..16f0d5bc598 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -9,3 +9,7 @@ dependencies {
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
 }
+
+test {
+    useJUnitPlatform()
+}

From c654018f93f5259897762c2c6a662b542a765fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 21 Jul 2022 03:16:53 -0500
Subject: [PATCH 2047/4969] Update spotless version to 6.8.0 (#5605)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8c956133b03..0ded70ad71a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
-    id 'com.diffplug.spotless' version '6.3.0' apply false
+    id 'com.diffplug.spotless' version '6.8.0' apply false
     id 'org.gradle.test-retry' version '1.4.0'
 }
 

From d387d8518cf0976618c6580c09f68b53c4008283 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 21 Jul 2022 16:51:50 +0200
Subject: [PATCH 2048/4969] Update Oracle-XE docs and use code example from
 tests (#4385)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 docs/modules/databases/oraclexe.md            | 25 +++----------------
 .../junit/oracle/SimpleOracleTest.java        |  4 ++-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/docs/modules/databases/oraclexe.md b/docs/modules/databases/oraclexe.md
index 583d68f3c3d..bfc06d9a106 100644
--- a/docs/modules/databases/oraclexe.md
+++ b/docs/modules/databases/oraclexe.md
@@ -4,27 +4,10 @@ See [Database containers](./index.md) for documentation and usage that is common
 
 ## Usage example
 
-Running Oracle XE as a stand-in for in a test:
-
-```java
-public class SomeTest {
-
-    @Rule
-    public OracleContainer oracle = new OracleContainer("name_of_your_oracle_xe_image");
-    
-    @Test
-    public void someTestMethod() {
-        String url = oracle.getJdbcUrl();
-
-        ... create a connection and run test as normal
-```
-
-## Specifying a docker image name via config
-
-If you do not pass an image name to the `OracleContainer` constructor, a suitable image name should be placed in
-configuration instead.
-To do this, please place a file on the classpath named `testcontainers.properties`,
-containing `oracle.container.image=IMAGE`, where IMAGE is a suitable image name and tag.
+You can use `OracleContainer` like any other JDBC container:
+<!--codeinclude-->
+[Container creation](../../../modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java) inside_block:constructor
+<!--/codeinclude-->
 
 ## Adding this module to your project dependencies
 
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 2c514062415..b48bd67efc9 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -52,10 +52,12 @@ public void testPluggableDatabase() throws SQLException {
     @Test
     public void testPluggableDatabaseAndCustomUser() throws SQLException {
         try (
-            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+            // constructor {
+            OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:18.4.0-slim")
                 .withDatabaseName("testDB")
                 .withUsername("testUser")
                 .withPassword("testPassword")
+            // }
         ) {
             runTest(oracle, "testDB", "testUser", "testPassword");
         }

From 29aa84d19739f3d20c485275180e0619dd4145b1 Mon Sep 17 00:00:00 2001
From: Tobias Stadler <ts.stadler@gmx.de>
Date: Thu, 21 Jul 2022 16:54:40 +0200
Subject: [PATCH 2049/4969] Update alpine image to 3.16 (#4698)

---
 .../main/java/org/testcontainers/DockerClientFactory.java | 2 +-
 core/src/test/java/org/testcontainers/TestImages.java     | 4 ++--
 .../testcontainers/containers/DockerComposeFilesTest.java | 2 +-
 .../containers/ParsedDockerComposeFileValidationTest.java | 8 ++++----
 .../containers/output/ToStringConsumerTest.java           | 8 ++++----
 .../org/testcontainers/dockerclient/ImagePullTest.java    | 2 +-
 .../java/org/testcontainers/junit/DockerfileTest.java     | 6 +++---
 .../testcontainers/junit/FixedHostPortContainerTest.java  | 2 +-
 .../junit/ParameterizedDockerfileContainerTest.java       | 2 ++
 .../testcontainers/utility/DirectoryTarResourceTest.java  | 6 +++---
 core/src/test/resources/compose-dockerfile/Dockerfile     | 2 +-
 .../resources/compose-scaling-multiple-containers.yml     | 2 +-
 .../test/resources/dockerfile-build-invalid/Dockerfile    | 2 +-
 core/src/test/resources/dockerfile-build-test/Dockerfile  | 2 +-
 .../test/resources/dockerfile-build-test/Dockerfile-alt   | 2 +-
 .../resources/dockerfile-build-test/Dockerfile-buildarg   | 2 +-
 .../resources/dockerfile-build-test/Dockerfile-currentdir | 2 +-
 .../resources/health-wait-strategy-dockerfile/Dockerfile  | 2 +-
 core/src/test/resources/mappable-dockerfile/Dockerfile    | 2 +-
 .../src/test/java/generic/ContainerCreationTest.java      | 2 +-
 .../generic/src/test/java/generic/ContainerLabelTest.java | 4 ++--
 .../junit4/generic/src/test/java/generic/ExecTest.java    | 2 +-
 docs/features/configuration.md                            | 2 +-
 docs/features/creating_images.md                          | 2 +-
 .../org/testcontainers/spock/SpockTestImages.groovy       | 2 +-
 25 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 04c20236763..d4b40193ca2 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -60,7 +60,7 @@ public class DockerClientFactory {
 
     public static final Map<String, String> DEFAULT_LABELS = ImmutableMap.of(TESTCONTAINERS_LABEL, "true");
 
-    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
+    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
 
     private static DockerClientFactory instance;
 
diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
index 3798f42af0d..5308f341100 100644
--- a/core/src/test/java/org/testcontainers/TestImages.java
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -6,7 +6,7 @@ public interface TestImages {
     DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
     DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3");
     DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
-    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.14");
+    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
-    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14");
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
index 6e1630f005f..612d249449b 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -28,6 +28,6 @@ public void shouldGetDependencyImagesWhenOverriding() {
         );
         Assertions
             .assertThat(dockerComposeFiles.getDependencyImages())
-            .containsExactlyInAnyOrder("alpine:3.14", "redis:b", "mysql:b", "aservice:latest");
+            .containsExactlyInAnyOrder("alpine:3.16", "redis:b", "mysql:b", "aservice:latest");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index 61955de98ba..f374018a8ef 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -98,9 +98,9 @@ public void shouldObtainImageFromDockerfileBuild() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.14"))
+                entry("custom", Sets.newHashSet("alpine:3.16"))
             )
-            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.14 from Dockerfile build
+            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.16 from Dockerfile build
     }
 
     @Test
@@ -112,8 +112,8 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.14"))
+                entry("custom", Sets.newHashSet("alpine:3.16"))
             )
-            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.14 from Dockerfile build
+            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.16 from Dockerfile build
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
index 08973f2d601..211b12080a0 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -24,7 +24,7 @@ public class ToStringConsumerTest {
 
     @Test
     public void newlines_are_not_added_to_exec_output() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             container.withCommand("sleep", "2m");
             container.start();
 
@@ -35,7 +35,7 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
 
     @Test(timeout = 60_000L)
     public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withAttachStdin(true).withStdinOpen(true).withTty(true);
             });
@@ -49,7 +49,7 @@ public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
 
     @Test
     public void newlines_are_not_added_to_container_output() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             container.withCommand("echo", "-n", LARGE_PAYLOAD);
             container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
             container.start();
@@ -62,7 +62,7 @@ public void newlines_are_not_added_to_container_output() {
 
     @Test
     public void newlines_are_not_added_to_container_output_with_tty() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.14")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withTty(true);
             });
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index 730208c553f..e1c2a56e8a9 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -16,7 +16,7 @@ public class ImagePullTest {
     public static String[] parameters() {
         return new String[] {
             "alpine:latest",
-            "alpine:3.14",
+            "alpine:3.16",
             "alpine", // omitting the tag should work and default to latest
             "alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
             "quay.io/testcontainers/ryuk:latest",
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
index e121e7db5a4..df7bc417688 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
@@ -40,7 +40,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
                 super.configure(buildImageCmd);
 
                 List<String> dockerfile = Arrays.asList(
-                    "FROM alpine:3.14",
+                    "FROM alpine:3.16",
                     "RUN echo 'hello from Docker build process'",
                     "CMD yes"
                 );
@@ -60,7 +60,7 @@ public void dockerfileBuilderWorks() {
             .withFileFromString("folder/someFile.txt", "hello")
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.14")
+                    .from("alpine:3.16")
                     .workDir("/app")
                     .add("test.txt", "test file.txt")
                     .run("ls", "-la", "/app/test file.txt")
@@ -103,7 +103,7 @@ public int getFileMode() {
             )
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.14") //
+                    .from("alpine:3.16") //
                     .copy("someFile.txt", "/someFile.txt")
                     .cmd("stat -c \"%a\" /someFile.txt");
             });
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index a6bb13d160c..08545535e6b 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -24,7 +24,7 @@
  */
 public class FixedHostPortContainerTest {
 
-    private static final String TEST_IMAGE = "alpine:3.14";
+    private static final String TEST_IMAGE = "alpine:3.16";
 
     /**
      * Default http server port (just something different from default)
diff --git a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
index 62eccc2000c..7c176f14a1a 100644
--- a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
@@ -43,6 +43,8 @@ public static Object[][] data() {
             { "alpine:3.12", "3.12" },
             { "alpine:3.13", "3.13" },
             { "alpine:3.14", "3.14" },
+            { "alpine:3.15", "3.15" },
+            { "alpine:3.16", "3.16" },
         };
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
index cbd35a62b52..46fd6894a02 100644
--- a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -27,7 +27,7 @@ public void simpleRecursiveFileTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.14")
+                        .from("alpine:3.16")
                         .copy("/tmp/foo", "/foo")
                         .cmd("cat /foo/test/resources/test-recursive-file.txt")
                         .build();
@@ -52,7 +52,7 @@ public void simpleRecursiveFileWithPermissionTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.14") //
+                        .from("alpine:3.16") //
                         .copy("/tmp/foo", "/foo")
                         .cmd("ls", "-al", "/")
                         .build();
@@ -79,7 +79,7 @@ public void simpleRecursiveClasspathResourceTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.14") //
+                        .from("alpine:3.16") //
                         .copy("/tmp/foo", "/foo")
                         .cmd("ls -lRt /foo")
                         .build();
diff --git a/core/src/test/resources/compose-dockerfile/Dockerfile b/core/src/test/resources/compose-dockerfile/Dockerfile
index 7252932b104..566428fa97f 100644
--- a/core/src/test/resources/compose-dockerfile/Dockerfile
+++ b/core/src/test/resources/compose-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.16
 
 ADD passthrough.sh /passthrough.sh
 
diff --git a/core/src/test/resources/compose-scaling-multiple-containers.yml b/core/src/test/resources/compose-scaling-multiple-containers.yml
index 3ea528d4574..fc498a9fd42 100644
--- a/core/src/test/resources/compose-scaling-multiple-containers.yml
+++ b/core/src/test/resources/compose-scaling-multiple-containers.yml
@@ -3,5 +3,5 @@ services:
   redis:
     image: redis
   other:
-    image: alpine:3.14
+    image: alpine:3.16
     command: sleep 10000
diff --git a/core/src/test/resources/dockerfile-build-invalid/Dockerfile b/core/src/test/resources/dockerfile-build-invalid/Dockerfile
index b0198eb3e02..66663986d13 100644
--- a/core/src/test/resources/dockerfile-build-invalid/Dockerfile
+++ b/core/src/test/resources/dockerfile-build-invalid/Dockerfile
@@ -1 +1 @@
-FROM alpine:3.14
+FROM alpine:3.16
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile b/core/src/test/resources/dockerfile-build-test/Dockerfile
index 9ae7dba8658..3f341034fef 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile
@@ -1,2 +1,2 @@
-FROM alpine:3.14
+FROM alpine:3.16
 COPY localfile.txt /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-alt b/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
index 43e5c556fe9..fe36516c397 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-alt
@@ -1,2 +1,2 @@
-FROM alpine:3.14
+FROM alpine:3.16
 RUN echo "test4567" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg b/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
index b37f4193643..f137d39f0d2 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-buildarg
@@ -1,3 +1,3 @@
-FROM alpine:3.14
+FROM alpine:3.16
 ARG CUSTOM_ARG
 RUN echo "${CUSTOM_ARG}" > /test.txt
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir b/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
index e8456e1bc1f..3a6bfd62f02 100644
--- a/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-currentdir
@@ -1,2 +1,2 @@
-FROM alpine:3.14
+FROM alpine:3.16
 COPY . /
diff --git a/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile b/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile
index c0abb7bb597..ed404c1f0d8 100644
--- a/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile
+++ b/core/src/test/resources/health-wait-strategy-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.16
 
 HEALTHCHECK --interval=1s CMD test -e /testfile
 
diff --git a/core/src/test/resources/mappable-dockerfile/Dockerfile b/core/src/test/resources/mappable-dockerfile/Dockerfile
index df186f6579c..5b9f6a02783 100644
--- a/core/src/test/resources/mappable-dockerfile/Dockerfile
+++ b/core/src/test/resources/mappable-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.16
 ADD folder/someFile.txt /someFile.txt
 RUN cat /someFile.txt
 ADD test.txt /test.txt
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
index bdd82968191..0f6269968dd 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -20,7 +20,7 @@ public class ContainerCreationTest {
     // }
     // spotless:on
 
-    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.14");
+    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
 
     // spotless:off
     // withOptions {
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
index 64618ad25a9..868b8ec44f7 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
@@ -9,7 +9,7 @@
 public class ContainerLabelTest {
 
     // single_label {
-    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.14"))
+    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.16"))
         .withLabel("key", "value");
     // }
 
@@ -17,7 +17,7 @@ public class ContainerLabelTest {
     private Map<String, String> mapOfLabels = new HashMap<>();
     // populate map, e.g. mapOfLabels.put("key1", "value1");
 
-    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.14"))
+    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.16"))
         .withLabels(mapOfLabels);
     // }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
index 2530cadb410..7548ae4a613 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
@@ -13,7 +13,7 @@
 public class ExecTest {
 
     @Rule
-    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.14"))
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.16"))
         .withCommand("top");
 
     @Test
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index fbb369fe6a6..f93d0807d01 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -49,7 +49,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **ryuk.container.image = testcontainers/ryuk:0.3.3**
 > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
 
-> **tinyimage.container.image = alpine:3.14**  
+> **tinyimage.container.image = alpine:3.16**  
 > Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))
 
 > **sshd.container.image = testcontainers/sshd:1.1.0**  
diff --git a/docs/features/creating_images.md b/docs/features/creating_images.md
index 6a06627efa0..e4e6315a405 100644
--- a/docs/features/creating_images.md
+++ b/docs/features/creating_images.md
@@ -51,7 +51,7 @@ new GenericContainer(
         new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder ->
                         builder
-                                .from("alpine:3.14")
+                                .from("alpine:3.16")
                                 .run("apk add --update nginx")
                                 .cmd("nginx", "-g", "daemon off;")
                                 .build()))
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
index 41432e5e514..bea0a974c89 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -6,5 +6,5 @@ interface SpockTestImages {
 	DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.34")
 	DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
 	DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
-	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.14")
+	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16")
 }

From 6aab4d92aeaef5d1e6174f52267bf48edc3aaf8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 25 Jul 2022 03:05:10 -0500
Subject: [PATCH 2050/4969] Add pr label for area/docker-compose (#5610)

---
 .github/labeler.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 9293237182e..84e21af744a 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,3 +1,6 @@
+"area/docker-compose":
+  - core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+  - core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
 "github_actions":
   - .github/workflows/*
 "gradle-wrapper":

From d3cb25ec7d66332d124ad1a8fa36771a7090412d Mon Sep 17 00:00:00 2001
From: Erik Pragt <91307175+epragtbeamtree@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:47:04 +1000
Subject: [PATCH 2051/4969] Update CircleCI docs for current Cloud/v2/v3
 configuration (#5611)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../continuous_integration/circle_ci.md           | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/docs/supported_docker_environment/continuous_integration/circle_ci.md b/docs/supported_docker_environment/continuous_integration/circle_ci.md
index 64e7ea131f2..05f0776f6c1 100644
--- a/docs/supported_docker_environment/continuous_integration/circle_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/circle_ci.md
@@ -1,19 +1,16 @@
-# CircleCI 2.0
+# CircleCI (Cloud, Server v2.x, and Server v3.x)
 
-Your CircleCI configuration should use a dedicated VM for testcontainers to work. You can achieve this by specifying the 
-executor type in your `.circleci/config.yml` to be `machine` instead of the default `docker` executor ( see [Choosing an Executor Type](https://circleci.com/docs/2.0/executor-types/) for more info ).  
+Your CircleCI configuration should use a dedicated VM for Testcontainers to work. You can achieve this by specifying the 
+executor type in your `.circleci/config.yml` to be `machine` instead of the default `docker` executor (see [Choosing an Executor Type](https://circleci.com/docs/2.0/executor-types/) for more info).  
 
-Here is a sample CircleCI configuration that does a checkout of a project and runs maven:
+Here is a sample CircleCI configuration that does a checkout of a project and runs Maven:
 
 ```yml
-# Check https://circleci.com/docs/2.0/language-java/ for more details
-#
-version: 2
-machine: true
 jobs:
   build:
+    # Check https://circleci.com/docs/executor-intro#linux-vm for more details
+    machine: true
     steps:
       - checkout
-
       - run: mvn -B clean install
 ```

From fd97b769a8b083a8e3a208d119377176fe88cb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 27 Jul 2022 19:57:31 -0500
Subject: [PATCH 2052/4969] Add docs for AWS CodeBuild and Tekton (#5614)

---
 .../continuous_integration/aws_codebuild.md   | 18 ++++
 .../continuous_integration/tekton.md          | 94 +++++++++++++++++++
 mkdocs.yml                                    |  2 +
 3 files changed, 114 insertions(+)
 create mode 100644 docs/supported_docker_environment/continuous_integration/aws_codebuild.md
 create mode 100644 docs/supported_docker_environment/continuous_integration/tekton.md

diff --git a/docs/supported_docker_environment/continuous_integration/aws_codebuild.md b/docs/supported_docker_environment/continuous_integration/aws_codebuild.md
new file mode 100644
index 00000000000..c28854d9e0e
--- /dev/null
+++ b/docs/supported_docker_environment/continuous_integration/aws_codebuild.md
@@ -0,0 +1,18 @@
+# AWS CodeBuild
+
+To enable access to Docker in AWS CodeBuild, go to `Privileged` section and check  
+`Enable this flag if you want to build Docker images or want your builds to get elevated privileges`.
+
+This is a sample `buildspec.yml` config:
+
+```yaml
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      java: corretto17
+  build:
+    commands:
+      - ./mvnw test
+```
diff --git a/docs/supported_docker_environment/continuous_integration/tekton.md b/docs/supported_docker_environment/continuous_integration/tekton.md
new file mode 100644
index 00000000000..f8c6fb96adc
--- /dev/null
+++ b/docs/supported_docker_environment/continuous_integration/tekton.md
@@ -0,0 +1,94 @@
+# Tekton
+
+o enable access to Docker in Tekton, a dind sidecar needs to be added. An example of it can be found 
+[here](https://github.com/tektoncd/pipeline/blob/main/examples/v1beta1/taskruns/dind-sidecar.yaml)
+
+This is an example
+
+```yaml
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: run-tests
+  description: Run Tests
+spec:
+  workspaces:
+    - name: source
+  steps:
+    - name: read
+      image: eclipse-temurin:17.0.3_7-jdk-alpine
+      workingDir: $(workspaces.source.path)
+      script: ./mvnw test
+      volumeMounts:
+        - mountPath: /var/run/
+          name: dind-socket
+  sidecars:
+    - image: docker:20.10-dind
+      name: docker
+      securityContext:
+        privileged: true
+      volumeMounts:
+        - mountPath: /var/lib/docker
+          name: dind-storage
+        - mountPath: /var/run/
+          name: dind-socket
+  volumes:
+    - name: dind-storage
+      emptyDir: { }
+    - name: dind-socket
+      emptyDir: { }
+---
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: testcontainers-demo
+spec:
+  description: |
+    This pipeline clones a git repo, run testcontainers.
+  params:
+    - name: repo-url
+      type: string
+      description: The git repo URL to clone from.
+  workspaces:
+    - name: shared-data
+      description: |
+        This workspace contains the cloned repo files, so they can be read by the
+        next task.
+  tasks:
+    - name: fetch-source
+      taskRef:
+        name: git-clone
+      workspaces:
+        - name: output
+          workspace: shared-data
+      params:
+        - name: url
+          value: $(params.repo-url)
+    - name: run-tests
+      runAfter: ["fetch-source"]
+      taskRef:
+        name: run-tests
+      workspaces:
+        - name: source
+          workspace: shared-data
+---
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: testcontainers-demo-run
+spec:
+  pipelineRef:
+    name: testcontainers-demo
+  workspaces:
+    - name: shared-data
+      volumeClaimTemplate:
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 1Gi
+  params:
+    - name: repo-url
+      value: https://github.com/testcontainers/testcontainers-java-repro.git
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 21e157969e5..396986a955b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -88,11 +88,13 @@ nav:
     - System Requirements:
           - supported_docker_environment/index.md
           - Continuous Integration:
+                - supported_docker_environment/continuous_integration/aws_codebuild.md
                 - supported_docker_environment/continuous_integration/dind_patterns.md
                 - supported_docker_environment/continuous_integration/circle_ci.md
                 - supported_docker_environment/continuous_integration/drone.md
                 - supported_docker_environment/continuous_integration/gitlab_ci.md
                 - supported_docker_environment/continuous_integration/bitbucket_pipelines.md
+                - supported_docker_environment/continuous_integration/tekton.md
           - supported_docker_environment/windows.md
           - supported_docker_environment/logging_config.md
           - supported_docker_environment/image_registry_rate_limiting.md

From fca585db3920b127dae56600772d889e509a5dca Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 28 Jul 2022 03:10:56 -0400
Subject: [PATCH 2053/4969] Link to the docs on environment discovery failure
 (#5615)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../dockerclient/DockerClientProviderStrategy.java       | 9 ++++-----
 docs/_redirects                                          | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 0d2aa3d08ed..01fb60e4b5d 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -246,12 +246,11 @@ public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
             .findFirst()
             .orElseThrow(() -> {
                 log.error(
-                    "Could not find a valid Docker environment. Please check configuration. Attempted configurations were:"
+                    "Could not find a valid Docker environment. Please check configuration. Attempted configurations were:\n" +
+                    configurationFailures.stream().map(it -> "\t" + it).collect(Collectors.joining("\n")) +
+                    "As no valid configuration was found, execution cannot continue.\n" +
+                    "See https://www.testcontainers.org/on_failure.html for more details."
                 );
-                for (String failureMessage : configurationFailures) {
-                    log.error("    " + failureMessage);
-                }
-                log.error("As no valid configuration was found, execution cannot continue");
 
                 FAIL_FAST_ALWAYS.set(true);
                 return new IllegalStateException(
diff --git a/docs/_redirects b/docs/_redirects
index 99fe10d6900..5918fb853f2 100644
--- a/docs/_redirects
+++ b/docs/_redirects
@@ -12,6 +12,7 @@
 /usage/database_containers.html         /modules/databases/
 /usage/neo4j_container.html             /modules/databases/neo4j/
 /compatibility.html                     /supported_docker_environment/
+/on_failure.html                        /supported_docker_environment/
 
 # No great 1:1 mapping exists for the following, so redirect to somewhere where at least a sensible sidebar will be shown
 

From 1419cf24eea3e145ab86f4fd17356143a5f9e9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 28 Jul 2022 10:26:59 -0500
Subject: [PATCH 2054/4969] Improve Pulsar's wait strategy to rely on
 clusterName (#5613)

`PulsarContainer` allow to override configuration using env vars,
using `PULSAR_PREFIX_clusterName" will override the default's value
"standalone". The endpoint response should adapt accordingly.
---
 .../testcontainers/containers/PulsarContainer.java    |  8 ++++----
 .../containers/PulsarContainerTest.java               | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 30c36db01d8..10dc35dc4c8 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -96,13 +96,13 @@ protected void setupCommandAndEnv() {
 
         withCommand("/bin/bash", "-c", standaloneBaseCommand);
 
+        final String clusterName = getEnvMap().getOrDefault("PULSAR_PREFIX_clusterName", "standalone");
+        final String response = String.format("[\"%s\"]", clusterName);
+
         List<WaitStrategy> waitStrategies = new ArrayList<>();
         waitStrategies.add(Wait.defaultWaitStrategy());
         waitStrategies.add(
-            Wait
-                .forHttp(ADMIN_CLUSTERS_ENDPOINT)
-                .forPort(BROKER_HTTP_PORT)
-                .forResponsePredicate("[\"standalone\"]"::equals)
+            Wait.forHttp(ADMIN_CLUSTERS_ENDPOINT).forPort(BROKER_HTTP_PORT).forResponsePredicate(response::equals)
         );
         if (transactionsEnabled) {
             withEnv("PULSAR_PREFIX_transactionCoordinatorEnabled", "true");
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index 29de6c4c872..bf9f3d2201f 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -54,6 +54,17 @@ public void envVarsUsage() throws Exception {
         }
     }
 
+    @Test
+    public void customClusterName() throws Exception {
+        try (
+            PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)
+                .withEnv("PULSAR_PREFIX_clusterName", "tc-cluster");
+        ) {
+            pulsar.start();
+            testPulsarFunctionality(pulsar.getPulsarBrokerUrl());
+        }
+    }
+
     @Test
     public void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)) {

From bac4dfea7994c2f4993a98b02d50104825a6953e Mon Sep 17 00:00:00 2001
From: Henri Tremblay <henri.tremblay@gmail.com>
Date: Fri, 29 Jul 2022 06:33:04 -0400
Subject: [PATCH 2055/4969] Make outer maximum startup timeout in
 DockerComposeContainer configurable (#5588)

---
 .../containers/DockerComposeContainer.java     | 16 ++++++++++++++--
 ...DockerComposeContainerWithServicesTest.java | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 86a98586c7f..14124d88c28 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -103,6 +103,8 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
 
     private final Map<String, WaitAllStrategy> waitStrategyMap = new ConcurrentHashMap<>();
 
+    private Duration startupTimeout = Duration.ofMinutes(30);
+
     private final SocatContainer ambassadorContainer = new SocatContainer();
 
     private final Map<String, List<Consumer<OutputFrame>>> logConsumers = new ConcurrentHashMap<>();
@@ -433,14 +435,14 @@ private String getServiceInstanceName(String serviceName) {
     /*
      * can have multiple wait strategies for a single container, e.g. if waiting on several ports
      * if no wait strategy is defined, the WaitAllStrategy will return immediately.
-     * The WaitAllStrategy uses an long timeout, because timeouts should be handled by the inner strategies.
+     * The WaitAllStrategy uses the startup timeout for everything as a global maximum, but we expect timeouts to be handled by the inner strategies.
      */
     private void addWaitStrategy(String serviceInstanceName, @NonNull WaitStrategy waitStrategy) {
         final WaitAllStrategy waitAllStrategy = waitStrategyMap.computeIfAbsent(
             serviceInstanceName,
             __ -> {
                 return new WaitAllStrategy(WaitAllStrategy.Mode.WITH_MAXIMUM_OUTER_TIMEOUT)
-                    .withStartupTimeout(Duration.ofMinutes(30));
+                    .withStartupTimeout(startupTimeout);
             }
         );
         waitAllStrategy.withStrategy(waitStrategy);
@@ -598,6 +600,16 @@ public SELF withRemoveImages(RemoveImages removeImages) {
         return self();
     }
 
+    /**
+     * Set the maximum startup timeout all the waits set are bounded to.
+     *
+     * @return this instance. for chaining
+     */
+    public SELF withStartupTimeout(Duration startupTimeout) {
+        this.startupTimeout = startupTimeout;
+        return self();
+    }
+
     public Optional<ContainerState> getContainerByServiceName(String serviceName) {
         return Optional.ofNullable(serviceInstanceMap.get(serviceName));
     }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
index 8f056de98fa..305de496cc9 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -1,12 +1,15 @@
 package org.testcontainers.containers;
 
 import org.junit.Test;
+import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class DockerComposeContainerWithServicesTest {
@@ -87,6 +90,21 @@ public void testScaleInComposeFileIsRespected() {
         }
     }
 
+    @Test
+    public void testStartupTimeoutSetsTheHighestTimeout() {
+        assertThrows("We expect a timeout from the startup timeout", org.rnorth.ducttape.TimeoutException.class,
+            () -> {
+                try (
+                    DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+                        .withServices("redis")
+                        .withStartupTimeout(Duration.ofMillis(1))
+                        .withExposedService("redis", 80, Wait.forListeningPort().withStartupTimeout(Duration.ofMinutes(1)));
+                ) {
+                    compose.start();
+                }
+            });
+    }
+
     private void verifyStartedContainers(final DockerComposeContainer<?> compose, final String... names) {
         final List<String> containerNames = compose
             .listChildContainers()

From 0b374b391d4aaa4ccd9c723b41e8bac9a55a5d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 29 Jul 2022 16:19:02 -0500
Subject: [PATCH 2056/4969] Fix format

---
 .../DockerComposeContainerWithServicesTest.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
index 305de496cc9..b7b820a3011 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -9,8 +9,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 
 public class DockerComposeContainerWithServicesTest {
 
@@ -92,17 +92,24 @@ public void testScaleInComposeFileIsRespected() {
 
     @Test
     public void testStartupTimeoutSetsTheHighestTimeout() {
-        assertThrows("We expect a timeout from the startup timeout", org.rnorth.ducttape.TimeoutException.class,
+        assertThrows(
+            "We expect a timeout from the startup timeout",
+            org.rnorth.ducttape.TimeoutException.class,
             () -> {
                 try (
                     DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
                         .withServices("redis")
                         .withStartupTimeout(Duration.ofMillis(1))
-                        .withExposedService("redis", 80, Wait.forListeningPort().withStartupTimeout(Duration.ofMinutes(1)));
+                        .withExposedService(
+                            "redis",
+                            80,
+                            Wait.forListeningPort().withStartupTimeout(Duration.ofMinutes(1))
+                        );
                 ) {
                     compose.start();
                 }
-            });
+            }
+        );
     }
 
     private void verifyStartedContainers(final DockerComposeContainer<?> compose, final String... names) {

From edee92250a03f54d3e2908de3589b0b7efd754eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:05:48 +0000
Subject: [PATCH 2057/4969] Bump kafka-clients from 3.2.0 to 3.2.1 in
 /modules/kafka

Bumps kafka-clients from 3.2.0 to 3.2.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 79264b8207f..ebd9c84120c 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.2.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 8b2d5d17f503e44b2713267648938942e086b108 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:05:51 +0000
Subject: [PATCH 2058/4969] Bump tomcat-jdbc from 10.0.22 to 10.0.23 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.22 to 10.0.23.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 012e9f410ec..3a6681aee13 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.22'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From c83590275d4342eb10345e9a9451f3cb54c920a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:06:01 +0000
Subject: [PATCH 2059/4969] Bump neo4j-java-driver from 4.4.6 to 4.4.9 in
 /modules/neo4j

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.6 to 4.4.9.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.6...4.4.9)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 355dbe3f4ee..de42bca2d5d 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.6'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.9'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 0d1ebaee2c19c3a2a2bc3538099b94072838ff5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:06:06 +0000
Subject: [PATCH 2060/4969] Bump java-client from 3.3.1 to 3.3.2 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.3.1...java-client-3.3.2)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index df7f4cbc221..e59e346c29f 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
-    testImplementation 'com.couchbase.client:java-client:3.3.1'
+    testImplementation 'com.couchbase.client:java-client:3.3.2'
     testImplementation 'org.awaitility:awaitility:4.2.0'
 }

From 699938b9a3f4675adc07452d368ef504b1fa2dd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:06:07 +0000
Subject: [PATCH 2061/4969] Bump mysql-connector-java from 8.0.29 to 8.0.30 in
 /modules/jdbc-test

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.29 to 8.0.30.
- [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.29...8.0.30)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3649396773d..a3c7dfdeefe 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -16,5 +16,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.22'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.29'
+    api 'mysql:mysql-connector-java:8.0.30'
 }

From 26386e6ef2f41e0c403e24c2dcf4d87848c06d25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:06:08 +0000
Subject: [PATCH 2062/4969] Bump tomcat-jdbc from 10.0.22 to 10.0.23 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.22 to 10.0.23.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3649396773d..038cc110a1b 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.22'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.29'
 }

From 463a5c5d48b55f882f29b046bb6e5e5ecc5ae0b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:06:12 +0000
Subject: [PATCH 2063/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.253 to 1.12.273.
- [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.12.253...1.12.273)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index acf379cda79..5b9ff919da7 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 85cc40b057c9c2e740180ce92dfb980c5430c9de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:06:20 +0000
Subject: [PATCH 2064/4969] Bump mysql-connector-java from 8.0.29 to 8.0.30 in
 /modules/mysql

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.29 to 8.0.30.
- [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.29...8.0.30)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e23920eaae9..87887384973 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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.29'
+    testImplementation 'mysql:mysql-connector-java:8.0.30'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From 33f08921d5996d71f41b353d5e5cc8b28494f00a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:07:10 +0000
Subject: [PATCH 2065/4969] Bump mysql-connector-java from 8.0.29 to 8.0.30 in
 /modules/spock

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.29 to 8.0.30.
- [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.29...8.0.30)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a9e3b7d09b1..3eadd33ea2a 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }

From c43589ffb3ac30e564885df29168234ced5c6273 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:07:11 +0000
Subject: [PATCH 2066/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.3.1 to 8.3.3.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.3.1...v8.3.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a4a277596fc..a3a47d11fab 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.3.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.3.3"
     testImplementation "org.elasticsearch.client:transport:7.17.5"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 17526d7085dc1044aad98c801df407d99b5d196d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:07:16 +0000
Subject: [PATCH 2067/4969] Bump junit-jupiter-api from 5.8.2 to 5.9.0 in
 /modules/junit-jupiter

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 73a8897800c..167529f9fea 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    api 'org.junit.jupiter:junit-jupiter-api:5.9.0'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')

From cc10355394942be97fc22aac1c882e88386f7ccf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:07:21 +0000
Subject: [PATCH 2068/4969] Bump junit-jupiter-params from 5.8.2 to 5.9.0 in
 /modules/junit-jupiter

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 73a8897800c..a7e23a2f65c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'

From b9d49464dd9e0dc60643d38a11e4eeae478b9a31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:07:30 +0000
Subject: [PATCH 2069/4969] Bump junit-jupiter-engine from 5.8.2 to 5.9.0 in
 /modules/junit-jupiter

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 73a8897800c..3dd6c7dd25f 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }
 
 test {

From 8dfe6c5aaea81e6c7794acac22168ef874e9e826 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:08:21 +0000
Subject: [PATCH 2070/4969] Bump actions/cache from 3.0.4 to 3.0.5

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.4...v3.0.5)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index f24fd6f6916..9fa1f78e47b 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -53,7 +53,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3287499c2fc..55432b3e2c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -59,7 +59,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From b687658cf70d842de21c000b5da409cf270cb1a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:08:29 +0000
Subject: [PATCH 2071/4969] Bump influxdb-java from 2.22 to 2.23 in
 /modules/influxdb

Bumps [influxdb-java](https://github.com/influxdata/influxdb-java) from 2.22 to 2.23.
- [Release notes](https://github.com/influxdata/influxdb-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-java/compare/influxdb-java-2.22...influxdb-java-2.23)

---
updated-dependencies:
- dependency-name: org.influxdb:influxdb-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 7a028d4a19d..a7ff4e66729 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.22'
-    testImplementation 'org.influxdb:influxdb-java:2.21'
+    compileOnly 'org.influxdb:influxdb-java:2.23'
+    testImplementation 'org.influxdb:influxdb-java:2.23'
 }

From 5cb65abe0014e2ef0a1cb7245589e789760e7f49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:08:39 +0000
Subject: [PATCH 2072/4969] Bump s3 from 2.17.224 to 2.17.244 in
 /modules/localstack

Bumps s3 from 2.17.224 to 2.17.244.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 56776965f8a..9a29eb0e343 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.253'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.253'
-    testImplementation 'software.amazon.awssdk:s3:2.17.224'
+    testImplementation 'software.amazon.awssdk:s3:2.17.244'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 1cf31e61d347f0e95a13729f094b719c193bf43e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:09:23 +0000
Subject: [PATCH 2073/4969] Bump neo4j-java-driver from 4.4.6 to 4.4.9 in
 /examples

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.6 to 4.4.9.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.6...4.4.9)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index e937bd2954b..e7e42ff00bd 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.6'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.9'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
 }

From 95e917f31b8152fb84a2ebcf1dd5ef2f4e720785 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:09:23 +0000
Subject: [PATCH 2074/4969] Bump com.gradle.enterprise.gradle.plugin in
 /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.10.2 to 3.10.3.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 5a4ae8c0d2e..cfb204f4b00 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
     }
 }

From 6436b1019cec2a27c029ecc28b8b53044c9e8dce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:09:25 +0000
Subject: [PATCH 2075/4969] Bump kafka-clients from 3.2.0 to 3.2.1 in /examples

Bumps kafka-clients from 3.2.0 to 3.2.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index d69af5ceb68..c3a79d4058f 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.2.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'

From 6fcaeefcbf1bdeb3cfb5b7ec07255e3fba39580e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:09:29 +0000
Subject: [PATCH 2076/4969] Bump cucumber-junit from 7.4.1 to 7.5.0 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.4.1 to 7.5.0.
- [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/v7.4.1...v7.5.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 1bf4e1f72cb..5cf03f419fe 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:7.4.1'
-    testImplementation 'io.cucumber:cucumber-junit:7.4.1'
+    testImplementation 'io.cucumber:cucumber-junit:7.5.0'
     testImplementation 'org.testcontainers:selenium'
 }

From eb766900d2c12168e17e9af2fc9d667e49040207 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:09:39 +0000
Subject: [PATCH 2077/4969] Bump gson from 2.9.0 to 2.9.1 in /examples

Bumps [gson](https://github.com/google/gson) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.9.0...gson-parent-2.9.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/disque-job-queue/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 1dc3497ec42..47bf340e2eb 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.24"
     annotationProcessor "org.projectlombok:lombok:1.18.24"
     implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.mockito:mockito-all:1.10.19'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 0c4de18f3c6..1e09fbc84f0 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 6e9d7664384..94f445f5ffe 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 7ece47a44ea..fd603d515c7 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 

From 57159ae6ede175c641e3afc5b7c8cd59ae15c031 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:10:19 +0000
Subject: [PATCH 2078/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin) from 1.7.0 to 1.7.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.0...v1.7.10)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 90338ff9959..4a48c40d8bf 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.6.4"
     id("org.jetbrains.kotlin.jvm") version "1.7.0"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.7.0"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 9b8d2391a3eb9f30f38d1be47eadf8b3081f528d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:11:31 +0000
Subject: [PATCH 2079/4969] Bump trino-jdbc from 388 to 391 in /modules/trino

Bumps trino-jdbc from 388 to 391.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index caf1f322c12..c25007bb223 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:388'
+    testImplementation 'io.trino:trino-jdbc:391'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 89283187e0b3a047a335da9d53399ba7a6c8c5e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:11:50 +0000
Subject: [PATCH 2080/4969] Bump mongodb-driver-sync from 4.6.1 to 4.7.1 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.6.1 to 4.7.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.6.1...r4.7.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 297bcd21f3b..7f9725bf0e8 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.6.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.7.1")
 }

From bfd82f4536195abe12dde5ee4ca2c617a923603d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:11:58 +0000
Subject: [PATCH 2081/4969] Bump reactor-core from 3.4.19 to 3.4.21 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.19 to 3.4.21.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.19...v3.4.21)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 692b5ac9ce5..f51a13b9296 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.19'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.21'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From b303688bdedcd84e8f660993591dadcc9ea5e338 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:12:07 +0000
Subject: [PATCH 2082/4969] Bump azure-cosmos from 4.32.1 to 4.33.1 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.32.1 to 4.33.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.32.1...azure-cosmos_4.33.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 5f8c6837d79..c6707401ff6 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.32.1'
+    testImplementation 'com.azure:azure-cosmos:4.33.1'
 }

From 9aeb0c78803af4ef061d81c3bccbc44ddb83756d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:12:15 +0000
Subject: [PATCH 2083/4969] Bump junit-jupiter-engine from 5.8.2 to 5.9.0 in
 /modules/hivemq

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index aa566381d0c..b62121ce9cc 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.11")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 }
 
 test {

From bb1769c468c9dd5ca88abd4a70bca913e60f0f9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:12:21 +0000
Subject: [PATCH 2084/4969] Bump junit-jupiter-api from 5.8.2 to 5.9.0 in
 /modules/hivemq

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index aa566381d0c..a30a7d30517 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.10.0")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.8.2")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")

From 909404b9be70970673c6e592aec72041fff9d49a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:13:32 +0000
Subject: [PATCH 2085/4969] Bump com.gradle.enterprise.gradle.plugin from
 3.10.2 to 3.10.3

Bumps com.gradle.enterprise.gradle.plugin from 3.10.2 to 3.10.3.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d4605c2ad84..b56048c1126 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
     }
 }

From 456bdcc6a22099e743d98459ce262a0a86b98ab1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:14:19 +0000
Subject: [PATCH 2086/4969] Bump google-cloud-datastore from 2.10.0 to 2.10.1
 in /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.10.0...v2.10.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 2cabbc4cf30..d885dc11023 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.10.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.0'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.25.7'

From 7499443fae265f702fd15a718de25c63fbdd8d07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:14:34 +0000
Subject: [PATCH 2087/4969] Bump google-cloud-pubsub from 1.120.0 to 1.120.6 in
 /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.0 to 1.120.6.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.0...v1.120.6)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 2cabbc4cf30..9c837ff5e0e 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.10.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.0'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.25.7'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.9.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 720024f1f9244b766165782ce1c1889ce35e13c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 10:30:50 +0000
Subject: [PATCH 2088/4969] Bump mysql-connector-java in /modules/junit-jupiter

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.29 to 8.0.30.
- [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.29...8.0.30)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5bf5aa4557a..790aa394849 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }
 

From 521eb8d8a746531415d5043cf0a02e4ad697717f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 10:31:01 +0000
Subject: [PATCH 2089/4969] Bump aws-java-sdk-sqs from 1.12.253 to 1.12.273 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.253 to 1.12.273.
- [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.12.253...1.12.273)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9a29eb0e343..d754c676320 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.253'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.253'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.253'
     testImplementation 'software.amazon.awssdk:s3:2.17.244'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

From 04842f1559b4f8e073ac430d7b73e9bc496f44a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 10:31:14 +0000
Subject: [PATCH 2090/4969] Bump org.jetbrains.kotlin.jvm from 1.7.0 to 1.7.10
 in /examples

Bumps [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) from 1.7.0 to 1.7.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.0...v1.7.10)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 4a48c40d8bf..383491eb32d 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.6.4"
-    id("org.jetbrains.kotlin.jvm") version "1.7.0"
+    id("org.jetbrains.kotlin.jvm") version "1.7.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"
 }
 

From 6805a75ce7747fc09bca48cb27f8b83c07146abb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 10:31:20 +0000
Subject: [PATCH 2091/4969] Bump google-cloud-spanner from 6.25.7 to 6.27.0 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.25.7 to 6.27.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.25.7...v6.27.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 395ef1372bf..2da6136c67b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.25.7'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.27.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.9.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From ada9da62207c4ffa0d04804cc6a04249d412bb2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 10:41:10 +0000
Subject: [PATCH 2092/4969] Bump cucumber-java from 7.4.1 to 7.5.0 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.4.1 to 7.5.0.
- [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/v7.4.1...v7.5.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 5cf03f419fe..ba51bbe0d2c 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:7.4.1'
+    testImplementation 'io.cucumber:cucumber-java:7.5.0'
     testImplementation 'io.cucumber:cucumber-junit:7.5.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 485a743aecc0a65733d0dc2bbbb45727cf11810a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:00:47 +0000
Subject: [PATCH 2093/4969] Bump aws-java-sdk-logs from 1.12.253 to 1.12.273 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.253 to 1.12.273.
- [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.12.253...1.12.273)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 d754c676320..2c547febfb8 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.253'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.253'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.273'
     testImplementation 'software.amazon.awssdk:s3:2.17.244'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

From 87265750993592ebe617be1ec885ed2e9d0580a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:00:48 +0000
Subject: [PATCH 2094/4969] Bump google-cloud-firestore from 3.2.0 to 3.3.0 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.2.0...v3.3.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 2da6136c67b..eeca4d49fde 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.3.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.27.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.9.0'

From 290818fdb13baf7d13cd9364d470ce90852c8f67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:00:51 +0000
Subject: [PATCH 2095/4969] Bump aws-java-sdk-s3 from 1.12.253 to 1.12.273 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.253 to 1.12.273.
- [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.12.253...1.12.273)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index d754c676320..0ff951ad1b9 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.253'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.273'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.253'
     testImplementation 'software.amazon.awssdk:s3:2.17.244'

From 1518bebe30d028a2d69014f080d4e61221aa9caa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:00:52 +0000
Subject: [PATCH 2096/4969] Bump google-cloud-bigtable from 2.9.0 to 2.10.1 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.9.0 to 2.10.1.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.9.0...v2.10.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 2da6136c67b..b96e9e5fd94 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.2.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.27.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.9.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 7c3c00e02e8d93201b5934cd2a2803f530de404a Mon Sep 17 00:00:00 2001
From: Kishan B <kishancs46@gmail.com>
Date: Wed, 3 Aug 2022 21:22:33 +0530
Subject: [PATCH 2097/4969] Add syntax highlighting to colima usage doc (#5673)

---
 docs/supported_docker_environment/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index aa6c7b1b867..debca47e574 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -17,7 +17,7 @@
 
 In order to run testcontainers against [colima](https://github.com/abiosoft/colima) the env vars bellow should be set
 
-```
+```bash
 export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
 export DOCKER_HOST="unix://${HOME}/.colima/docker.sock"
 ```

From c38ba11e9bd018edcd2896e234cc277552ab2c7d Mon Sep 17 00:00:00 2001
From: Erik Merkle <github@emerkle.net>
Date: Thu, 4 Aug 2022 07:37:49 -0500
Subject: [PATCH 2098/4969] Update Cassandra driver to 4.x (#2830)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, deprecate Driver 3.x methods and remove some driver coupling.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/databases/cassandra.md           | 35 +++---------------
 modules/cassandra/build.gradle                |  9 ++++-
 .../containers/CassandraContainer.java        | 34 +++++++++++++++++
 .../containers/CassandraContainerTest.java    | 13 +++----
 .../containers/CassandraDriver3Test.java      | 37 +++++++++++++++++++
 .../containers/CassandraDriver4Test.java      | 35 ++++++++++++++++++
 6 files changed, 126 insertions(+), 37 deletions(-)
 create mode 100644 modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
 create mode 100644 modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java

diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index f7ed3094886..73f93bf203a 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -4,35 +4,12 @@
 
 This example connects to the Cassandra Cluster, creates a keyspaces and asserts that is has been created.
 
-=== "JUnit 4 example"
-    ```java
-    public class SomeTest {
-    
-        @Rule
-        public CassandraContainer cassandra = new CassandraContainer();
-    
-    
-        @Test
-        public void test(){
-            Cluster cluster = cassandra.getCluster();
-    
-            try(Session session = cluster.connect()) {
-    
-                session.execute("CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
-                        "{'class':'SimpleStrategy','replication_factor':'1'};");
-    
-                List<KeyspaceMetadata> keyspaces = session.getCluster().getMetadata().getKeyspaces();
-                List<KeyspaceMetadata> filteredKeyspaces = keyspaces
-                        .stream()
-                        .filter(km -> km.getName().equals("test"))
-                        .collect(Collectors.toList());
-    
-                assertEquals(1, filteredKeyspaces.size());
-            }
-        }
-    
-    }
-    ```
+<!--codeinclude-->
+[Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java) inside_block:cassandra
+<!--/codeinclude-->
+
+!!! warning
+    All methods returning instances of the Cassandra Driver's Cluster object in `CassandraContainer` have been deprecated. Providing these methods unnecessarily couples the Container to the Driver and creates potential breaking changes if the driver is updated.
 
 ## Adding this module to your project dependencies
 
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index a5427aaea07..b00740d09fd 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -1,6 +1,13 @@
 description = "TestContainers :: Cassandra"
 
+configurations.all {
+    resolutionStrategy {
+        force 'io.dropwizard.metrics:metrics-core:3.2.4'
+    }
+}
+
 dependencies {
     api project(":database-commons")
-    api "com.datastax.cassandra:cassandra-driver-core:3.7.1"
+    api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
+    testImplementation 'com.datastax.oss:java-driver-core:4.8.0'
 }
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index 3c78743fb62..a12ac03f18d 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -11,6 +11,7 @@
 import org.testcontainers.utility.MountableFile;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
@@ -35,6 +36,8 @@ public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends G
 
     public static final Integer CQL_PORT = 9042;
 
+    private static final String DEFAULT_LOCAL_DATACENTER = "datacenter1";
+
     private static final String CONTAINER_CONFIG_LOCATION = "/etc/cassandra";
 
     private static final String USERNAME = "cassandra";
@@ -70,6 +73,8 @@ public CassandraContainer(DockerImageName dockerImageName) {
         withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0");
         withEnv("HEAP_NEWSIZE", "128M");
         withEnv("MAX_HEAP_SIZE", "1024M");
+        withEnv("CASSANDRA_ENDPOINT_SNITCH", "GossipingPropertyFileSnitch");
+        withEnv("CASSANDRA_DC", DEFAULT_LOCAL_DATACENTER);
     }
 
     @Override
@@ -187,11 +192,20 @@ public String getPassword() {
      * Get configured Cluster
      *
      * Can be used to obtain connections to Cassandra in the container
+     *
+     * @deprecated For Cassandra driver 3.x, use {@link #getHost()} and {@link #getMappedPort(int)} with
+     * the driver's {@link Cluster#builder() Cluster.Builder} {@code addContactPoint(String)} and
+     * {@code withPort(int)} methods to create a Cluster object. For Cassandra driver 4.x, use
+     * {@link #getContactPoint()} and {@link #getLocalDatacenter()} with the driver's {@code CqlSession.builder()}
+     * {@code addContactPoint(InetSocketAddress)} and {@code withLocalDatacenter(String)} methods to create
+     * a Session Object. See https://docs.datastax.com/en/developer/java-driver/ for more on the driver.
      */
+    @Deprecated
     public Cluster getCluster() {
         return getCluster(this, enableJmxReporting);
     }
 
+    @Deprecated
     public static Cluster getCluster(ContainerState containerState, boolean enableJmxReporting) {
         final Cluster.Builder builder = Cluster
             .builder()
@@ -203,10 +217,30 @@ public static Cluster getCluster(ContainerState containerState, boolean enableJm
         return builder.build();
     }
 
+    @Deprecated
     public static Cluster getCluster(ContainerState containerState) {
         return getCluster(containerState, false);
     }
 
+    /**
+     * Retrieve an {@link InetSocketAddress} for connecting to the Cassandra container via the driver.
+     *
+     * @return A InetSocketAddrss representation of this Cassandra container's host and port.
+     */
+    public InetSocketAddress getContactPoint() {
+        return new InetSocketAddress(getHost(), getMappedPort(CQL_PORT));
+    }
+
+    /**
+     * Retrieve the Local Datacenter for connecting to the Cassandra container via the driver.
+     *
+     * @return The configured local Datacenter name.
+     */
+    public String getLocalDatacenter() {
+        return getEnvMap().getOrDefault("CASSANDRA_DC", DEFAULT_LOCAL_DATACENTER);
+    }
+
+    @Deprecated
     private DatabaseDelegate getDatabaseDelegate() {
         return new CassandraDatabaseDelegate(this);
     }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
index 45cbba0abc7..d1ad581bcc0 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -23,11 +23,13 @@ public class CassandraContainerTest {
 
     private static final String TEST_CLUSTER_NAME_IN_CONF = "Test Cluster Integration Test";
 
+    private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
+
     @Test
     public void testSimple() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer, "SELECT release_version FROM system.local");
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertNotNull("Result set has no release_version", resultSet.one().getString(0));
         }
@@ -42,7 +44,7 @@ public void testSpecificVersion() {
             )
         ) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer, "SELECT release_version FROM system.local");
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertEquals("Cassandra has wrong version", cassandraVersion, resultSet.one().getString(0));
         }
@@ -107,7 +109,7 @@ public void testCassandraQueryWaitStrategy() {
                 .waitingFor(new CassandraQueryWaitStrategy())
         ) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer, "SELECT release_version FROM system.local");
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
         }
     }
@@ -117,10 +119,7 @@ public void testCassandraQueryWaitStrategy() {
     public void testCassandraGetCluster() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>()) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(
-                cassandraContainer.getCluster(),
-                "SELECT release_version FROM system.local"
-            );
+            ResultSet resultSet = performQuery(cassandraContainer.getCluster(), BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertNotNull("Result set has no release_version", resultSet.one().getString(0));
         }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
new file mode 100644
index 00000000000..78f3fd2a664
--- /dev/null
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
@@ -0,0 +1,37 @@
+package org.testcontainers.containers;
+
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+
+public class CassandraDriver3Test {
+
+    @Rule
+    public CassandraContainer<?> cassandra = new CassandraContainer<>("cassandra:3.11.2");
+
+    @Test
+    public void testCassandraGetContactPoint() {
+        try (
+            // cassandra {
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(this.cassandra.getContactPoint())
+                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
+                .build()
+            // }
+        ) {
+            session.execute(
+                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                "{'class':'SimpleStrategy','replication_factor':'1'};"
+            );
+
+            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
+
+            assertNotNull("Failed to create test keyspace", keyspace);
+        }
+    }
+}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
new file mode 100644
index 00000000000..3a05bc723bc
--- /dev/null
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
@@ -0,0 +1,35 @@
+package org.testcontainers.containers;
+
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+
+public class CassandraDriver4Test {
+
+    @Rule
+    public CassandraContainer<?> cassandra = new CassandraContainer<>("cassandra:3.11.2");
+
+    @Test
+    public void testCassandraGetContactPoint() {
+        try (
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(this.cassandra.getContactPoint())
+                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
+                .build()
+        ) {
+            session.execute(
+                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                "{'class':'SimpleStrategy','replication_factor':'1'};"
+            );
+
+            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
+
+            assertNotNull("Failed to create test keyspace", keyspace);
+        }
+    }
+}

From 4d2b98fca08f13f4b847776aee104e94249f52d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 4 Aug 2022 22:40:06 -0500
Subject: [PATCH 2099/4969] Add cockroachdb to issue's template

---
 .github/ISSUE_TEMPLATE/bug_report.yaml  | 1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml | 1 +
 .github/ISSUE_TEMPLATE/feature.yaml     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index dc86b416e46..686086d076c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -17,6 +17,7 @@ body:
         - Azure
         - Cassandra
         - Clickhouse
+        - CockroachDB
         - Couchbase
         - DB2
         - Dynalite
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index f06ea99c8ba..9ef8eafaab2 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -17,6 +17,7 @@ body:
         - Azure
         - Cassandra
         - Clickhouse
+        - CockroachDB
         - Couchbase
         - DB2
         - Dynalite
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 9e79553d357..1ab2693f210 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -17,6 +17,7 @@ body:
         - Azure
         - Cassandra
         - Clickhouse
+        - CockroachDB
         - Couchbase
         - DB2
         - Dynalite

From ef50721d86f83c7a1c0769001f004673b12c11c2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Aug 2022 19:28:53 -0500
Subject: [PATCH 2100/4969] Update Gradle Wrapper to 7.5.1 (#5676)

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 gradle/wrapper/gradle-wrapper.properties          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 012d6d90445..b916c04dbb2 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ef80eb5051f..f7189a776c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From cae12726c04ca80a7049b49245b8d005ac38e95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 8 Aug 2022 08:07:13 -0500
Subject: [PATCH 2101/4969] Update ryuk version to 0.3.4 (#5619)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 511e6ccac17..beed2e92c62 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.3.3");
+        super("testcontainers/ryuk:0.3.4");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From e8d737513cc0c7f16ea757a6f4f2eeea7a5e602e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 8 Aug 2022 18:06:47 -0500
Subject: [PATCH 2102/4969] Move to assertj (#5679)

---
 config/checkstyle/checkstyle.xml              |   1 -
 core/build.gradle                             |   1 -
 .../java/org/testcontainers/DaemonTest.java   |  14 +-
 .../containers/ContainerStateTest.java        |   4 +-
 ...ockerComposeContainerWithServicesTest.java |  29 +--
 .../containers/DockerComposeFilesTest.java    |   9 +-
 .../DockerComposeOverridesTest.java           |   5 -
 .../containers/ExposedHostTest.java           |   4 +-
 .../containers/GenericContainerTest.java      |  30 +--
 .../containers/NetworkTest.java               |  39 ++--
 ...ParsedDockerComposeFileValidationTest.java |  30 ++-
 .../containers/ReusabilityUnitTests.java      |   5 +-
 .../containers/output/ContainerLogsTest.java  |  15 +-
 .../output/ToStringConsumerTest.java          |   5 +-
 .../ExternalPortListeningCheckTest.java       |  16 +-
 ...InternalCommandPortListeningCheckTest.java |   9 +-
 .../DockerHealthcheckWaitStrategyTest.java    |   7 +-
 .../wait/strategy/WaitAllStrategyTest.java    |  51 ++---
 ...temPropertyClientProviderStrategyTest.java |  21 +--
 .../images/ImagePullPolicyTest.java           |   6 +-
 .../images/builder/DockerfileBuildTest.java   |   9 +-
 .../images/builder/DockerignoreTest.java      |  18 +-
 .../statement/AbstractStatementTest.java      |   5 +-
 .../junit/BaseDockerComposeTest.java          |  10 +-
 .../junit/CopyFileToContainerTest.java        |  17 +-
 .../junit/DependenciesTest.java               |  39 ++--
 .../DockerComposeContainerScalingTest.java    |   4 +-
 .../junit/DockerComposeContainerTest.java     |  35 ++--
 .../DockerComposeContainerWithBuildTest.java  |  24 ++-
 .../junit/DockerComposeErrorHandlingTest.java |  16 +-
 .../junit/DockerComposePassthroughTest.java   |  18 +-
 .../junit/DockerComposeServiceTest.java       |   4 +-
 .../junit/DockerComposeWaitStrategyTest.java  |  28 +--
 .../junit/DockerNetworkModeTest.java          |  11 +-
 .../junit/DockerfileContainerTest.java        |  20 +-
 .../testcontainers/junit/DockerfileTest.java  |   4 -
 .../junit/FileOperationsTest.java             |  19 +-
 .../junit/GenericContainerRuleTest.java       | 134 ++++++--------
 .../junit/NonExistentImagePullTest.java       |  15 +-
 .../junit/OutputStreamTest.java               |  24 ++-
 .../junit/OutputStreamWithTTYTest.java        |  34 ++--
 .../ParameterizedDockerfileContainerTest.java |   4 +-
 .../junit/WorkingDirectoryTest.java           |   8 +-
 .../strategy/AbstractWaitStrategyTest.java    |  11 +-
 .../strategy/HostPortWaitStrategyTest.java    |   6 +-
 .../utility/AuthenticatedImagePullTest.java   |  13 +-
 .../utility/ClasspathScannerTest.java         |  16 +-
 .../utility/DirectoryTarResourceTest.java     | 132 +++++--------
 .../DockerImageNameCompatibilityTest.java     |  52 ++++--
 .../utility/DockerImageNameTest.java          |  62 +++----
 .../utility/ImageNameSubstitutorTest.java     |  18 +-
 .../utility/LazyFutureTest.java               |  22 ++-
 .../utility/MountableFileTest.java            |  37 ++--
 .../PrefixingImageNameSubstitutorTest.java    |  60 +++---
 .../utility/RegistryAuthLocatorTest.java      | 114 +++++++-----
 .../utility/TestEnvironmentTest.java          |  18 +-
 .../TestcontainersConfigurationTest.java      | 174 +++++++-----------
 docs/examples/junit5/redis/build.gradle       |   1 +
 .../quickstart/RedisBackedCacheIntTest.java   |   4 +-
 .../RedisBackedCacheIntTestStep0.java         |   4 +-
 examples/disque-job-queue/build.gradle        |   2 +-
 .../test/java/DisqueBackedMailSenderTest.java |  26 +--
 .../test/java/SingleDisqueInstanceTest.java   |  31 +---
 .../redis-backed-cache-testng/build.gradle    |   2 +-
 .../src/test/java/RedisBackedCacheTest.java   |  14 +-
 examples/redis-backed-cache/build.gradle      |   2 +-
 .../src/test/java/RedisBackedCacheTest.java   |  14 +-
 examples/selenium-container/build.gradle      |   2 +-
 .../src/test/java/SeleniumContainerTest.java  |   4 +-
 examples/settings.gradle                      |   1 -
 examples/singleton-container/build.gradle     |   2 +-
 .../com/example/BarConcreteTestClass.java     |   7 +-
 .../com/example/FooConcreteTestClass.java     |   9 +-
 examples/solr-container/build.gradle          |   2 +-
 .../test/java/com/example/SolrQueryTest.java  |  12 +-
 examples/spring-boot/build.gradle             |   1 -
 .../java/com/example/DemoControllerTest.java  |   8 +-
 .../CosmosDBEmulatorContainerTest.java        |   7 +-
 modules/clickhouse/build.gradle               |   1 +
 .../clickhouse/SimpleClickhouseTest.java      |   4 +-
 modules/cockroachdb/build.gradle              |   1 +
 .../cockroachdb/SimpleCockroachDBTest.java    |  16 +-
 .../ext/ScriptSplittingTest.java              |   6 +-
 modules/db2/build.gradle                      |   1 +
 .../junit/db2/SimpleDb2Test.java              |   8 +-
 modules/dynalite/build.gradle                 |   3 +-
 .../dynamodb/DynaliteContainerTest.java       |  15 +-
 modules/elasticsearch/build.gradle            |   2 +-
 .../ElasticsearchContainerTest.java           |  96 +++++-----
 modules/hivemq/build.gradle                   |   1 +
 .../hivemq/ContainerWithCustomConfigIT.java   |  10 +-
 .../ContainerWithoutPlatformExtensionsIT.java |  23 ++-
 .../hivemq/CreateFileInCopiedDirectoryIT.java |   6 +-
 ...DisableEnableExtensionFromDirectoryIT.java |   8 +-
 .../hivemq/DisableEnableExtensionIT.java      |  14 +-
 .../hivemq/HiveMQExtensionTest.java           |   8 +-
 .../hivemq/HiveMQTestContainerCore.java       |  43 +++--
 .../testcontainers/hivemq/PathUtilTest.java   |  16 +-
 modules/jdbc-test/build.gradle                |   5 +-
 .../jdbc/AbstractJDBCDriverTest.java          |  48 +++--
 modules/jdbc/build.gradle                     |   1 -
 .../jdbc/ConnectionUrlDriversTests.java       |  10 +-
 .../jdbc/ConnectionUrlTest.java               | 102 +++++-----
 .../jdbc/MissingJdbcDriverTest.java           |  13 +-
 .../junit/jupiter/ComposeContainerTests.java  |   4 +-
 .../junit/jupiter/MixedLifecycleTests.java    |   6 +-
 .../jupiter/TestcontainersExtensionTests.java |  11 +-
 ...ntainersNestedRestartedContainerTests.java |  19 +-
 ...tcontainersNestedSharedContainerTests.java |   9 +-
 .../TestcontainersRestartBetweenTests.java    |   6 +-
 .../TestcontainersSharedContainerTests.java   |   9 +-
 .../jupiter/inheritance/InheritedTests.java   |  14 +-
 .../k3s/OfficialClientK3sContainerTest.java   |   5 +-
 modules/localstack/build.gradle               |   2 +-
 .../containers/localstack/LegacyModeTest.java |  60 +++---
 .../localstack/LocalstackContainerTest.java   |  94 +++++-----
 .../junit/mariadb/SimpleMariaDBTest.java      |  26 ++-
 modules/mockserver/build.gradle               |   2 +-
 .../MockServerContainerRuleTest.java          |  11 +-
 .../containers/MockServerContainerTest.java   |  14 +-
 .../src/test/resources/logback-test.xml       |  16 ++
 .../CustomPasswordMSSQLServerTest.java        |   2 +-
 .../CustomizableMSSQLServerTest.java          |   4 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    |  10 +-
 .../jdbc/mysql/JDBCDriverWithPoolTest.java    |   6 +-
 .../junit/mysql/CustomizableMysqlTest.java    |   4 +-
 .../junit/mysql/MultiVersionMySQLTest.java    |  10 +-
 .../junit/mysql/SimpleMySQLTest.java          |  36 ++--
 .../containers/Neo4jContainerTest.java        |  13 +-
 modules/nginx/build.gradle                    |   2 +-
 .../testcontainers/junit/SimpleNginxTest.java |  11 +-
 .../containers/jdbc/OracleJDBCDriverTest.java |   4 +-
 .../containers/OrientDBContainerTest.java     |   2 +-
 .../PostgreSQLConnectionURLTest.java          |  42 ++---
 .../containers/TimescaleDBContainerTest.java  |  11 +-
 .../jdbc/DatabaseDriverShutdownTest.java      |  12 +-
 .../jdbc/DatabaseDriverTmpfsTest.java         |   9 +-
 .../CustomizablePostgreSQLTest.java           |   4 +-
 .../postgresql/SimplePostgreSQLTest.java      |  19 +-
 ...tcontainersR2DBCConnectionFactoryTest.java |   8 +-
 modules/selenium/build.gradle                 |   2 +-
 .../junit/BaseWebDriverContainerTest.java     |   9 +-
 .../junit/BrowserWebDriverContainerTest.java  |  18 +-
 .../LocalServerWebDriverContainerTest.java    |  10 +-
 .../junit/SeleniumUtilsTest.java              |   6 +-
 modules/toxiproxy/build.gradle                |   2 +-
 .../containers/ToxiproxyTest.java             |  93 +++++-----
 147 files changed, 1265 insertions(+), 1544 deletions(-)
 create mode 100644 modules/mockserver/src/test/resources/logback-test.xml

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index ccb8367404c..6e73f4da4aa 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -39,7 +39,6 @@
                       org.mockserver.model.HttpRequest.*,
                       org.mockserver.model.HttpResponse.*,
                       org.rnorth.ducttape.unreliables.Unreliables.*,
-                      org.rnorth.visibleassertions.VisibleAssertions.*,
                       "
             />
         </module>
diff --git a/core/build.gradle b/core/build.gradle
index d32e2fc43b2..9febf2802e9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -97,7 +97,6 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation project(':test-support')
 
diff --git a/core/src/test/java/org/testcontainers/DaemonTest.java b/core/src/test/java/org/testcontainers/DaemonTest.java
index c1a1c20d60a..dd35112f781 100644
--- a/core/src/test/java/org/testcontainers/DaemonTest.java
+++ b/core/src/test/java/org/testcontainers/DaemonTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers;
 
 import org.junit.Test;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.File;
@@ -9,7 +8,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 /**
  * This test forks a new JVM, otherwise it's not possible to reliably diff the threads
@@ -30,17 +30,13 @@ public static void main(String[] args) {
 
             Set<Thread> nonDaemonThreads = threads.stream().filter(it -> !it.isDaemon()).collect(Collectors.toSet());
 
-            if (nonDaemonThreads.isEmpty()) {
-                VisibleAssertions.pass("All threads marked as daemon");
-            } else {
+            if (!nonDaemonThreads.isEmpty()) {
                 String nonDaemonThreadNames = nonDaemonThreads
                     .stream()
                     .map(Thread::getName)
                     .collect(Collectors.joining("\n", "\n", ""));
 
-                VisibleAssertions.fail(
-                    "Expected all threads to be daemons but the following are not:\n" + nonDaemonThreadNames
-                );
+                fail("Expected all threads to be daemons but the following are not:\n" + nonDaemonThreadNames);
             }
         } finally {
             if (genericContainer != null) {
@@ -59,6 +55,6 @@ public void testThatAllThreadsAreDaemons() throws Exception {
             DaemonTest.class.getCanonicalName()
         );
 
-        assertEquals(0, processBuilder.inheritIO().start().waitFor());
+        assertThat(processBuilder.inheritIO().start().waitFor()).isZero();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
index 4909e908713..d3cedc11464 100644
--- a/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -8,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -44,6 +44,6 @@ public void test() {
         when(containerState.getPortBindings()).thenReturn(Collections.singletonList(testSet));
 
         List<Integer> result = containerState.getBoundPortNumbers();
-        Assertions.assertThat(result).hasSameElementsAs(expectedResult);
+        assertThat(result).hasSameElementsAs(expectedResult);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
index b7b820a3011..029e8447a81 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.junit.Test;
+import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.io.File;
@@ -9,8 +10,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class DockerComposeContainerWithServicesTest {
 
@@ -92,10 +93,8 @@ public void testScaleInComposeFileIsRespected() {
 
     @Test
     public void testStartupTimeoutSetsTheHighestTimeout() {
-        assertThrows(
-            "We expect a timeout from the startup timeout",
-            org.rnorth.ducttape.TimeoutException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 try (
                     DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
                         .withServices("redis")
@@ -108,8 +107,10 @@ public void testStartupTimeoutSetsTheHighestTimeout() {
                 ) {
                     compose.start();
                 }
-            }
-        );
+            })
+        )
+            .as("We expect a timeout from the startup timeout")
+            .isInstanceOf(TimeoutException.class);
     }
 
     private void verifyStartedContainers(final DockerComposeContainer<?> compose, final String... names) {
@@ -119,16 +120,16 @@ private void verifyStartedContainers(final DockerComposeContainer<?> compose, fi
             .flatMap(container -> Stream.of(container.getNames()))
             .collect(Collectors.toList());
 
-        assertEquals(
-            "number of running services of docker-compose is the same as length of listOfServices",
-            names.length,
-            containerNames.size()
-        );
+        assertThat(containerNames)
+            .as("number of running services of docker-compose is the same as length of listOfServices")
+            .hasSize(names.length);
 
         for (final String expectedName : names) {
             final long matches = containerNames.stream().filter(foundName -> foundName.endsWith(expectedName)).count();
 
-            assertEquals("container with name starting '" + expectedName + "' should be running", 1L, matches);
+            assertThat(matches)
+                .as("container with name starting '" + expectedName + "' should be running")
+                .isEqualTo(1L);
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
index 612d249449b..41870eb593d 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -1,11 +1,12 @@
 package org.testcontainers.containers;
 
 import com.google.common.collect.Lists;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.io.File;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class DockerComposeFilesTest {
 
     @Test
@@ -13,8 +14,7 @@ public void shouldGetDependencyImages() {
         DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(
             Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-parsing-v2.yml"))
         );
-        Assertions
-            .assertThat(dockerComposeFiles.getDependencyImages())
+        assertThat(dockerComposeFiles.getDependencyImages())
             .containsExactlyInAnyOrder("postgres:latest", "redis:latest", "mysql:latest");
     }
 
@@ -26,8 +26,7 @@ public void shouldGetDependencyImagesWhenOverriding() {
                 new File("src/test/resources/docker-compose-imagename-overriding-b.yml")
             )
         );
-        Assertions
-            .assertThat(dockerComposeFiles.getDependencyImages())
+        assertThat(dockerComposeFiles.getDependencyImages())
             .containsExactlyInAnyOrder("alpine:3.16", "redis:b", "mysql:b", "aservice:latest");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
index 6207ae5ff45..50fedd3cf0f 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
@@ -16,9 +16,6 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.info;
-import static org.rnorth.visibleassertions.VisibleAssertions.pass;
-
 @RunWith(Parameterized.class)
 public class DockerComposeOverridesTest {
 
@@ -100,11 +97,9 @@ public void test() {
                     while (br.ready()) {
                         String line = br.readLine();
                         if (line.contains(expectedEnvVar)) {
-                            pass("Mapped environment variable was found");
                             return true;
                         }
                     }
-                    info("Mapped environment variable was not found yet - process probably not ready");
                     Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
                     return false;
                 }
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 4afddeaa5dd..5f88be90ad8 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -13,7 +13,7 @@
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ExposedHostTest {
 
@@ -95,7 +95,7 @@ protected void assertResponse(GenericContainer<?> container, int port) {
                 .execInContainer("wget", "-O", "-", "http://host.testcontainers.internal:" + port)
                 .getStdout();
 
-            assertEquals("received response", "Hello World!", response);
+            assertThat(response).as("received response").isEqualTo("Hello World!");
         } finally {
             container.stop();
         }
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index fdd8ac1b146..1967ad95135 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -6,7 +6,6 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.Ports;
-import com.google.common.primitives.Ints;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
@@ -30,10 +29,9 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class GenericContainerTest {
 
@@ -119,28 +117,20 @@ public void shouldOnlyPublishExposedPorts() {
                 .map(ExposedPort::getPort)
                 .collect(Collectors.toList());
 
-            assertEquals(
-                "the exposed ports are all of those EXPOSEd by the image",
-                Ints.asList(8080, 8081),
-                exposedPorts
-            );
+            assertThat(exposedPorts).as("the exposed ports are all of those EXPOSEd by the image").contains(8080, 8081);
 
             Map<ExposedPort, Ports.Binding[]> hostBindings = inspectedContainer
                 .getHostConfig()
                 .getPortBindings()
                 .getBindings();
-            assertEquals("only 1 port is bound on the host (published)", 1, hostBindings.size());
+            assertThat(hostBindings).as("only 1 port is bound on the host (published)").hasSize(1);
 
             Integer mappedPort = container.getMappedPort(8080);
-            assertTrue("port 8080 is bound to a different port on the host", mappedPort != 8080);
+            assertThat(mappedPort != 8080).as("port 8080 is bound to a different port on the host").isTrue();
 
-            assertThrows(
-                "trying to get a non-bound port mapping fails",
-                IllegalArgumentException.class,
-                () -> {
-                    container.getMappedPort(8081);
-                }
-            );
+            assertThat(catchThrowable(() -> container.getMappedPort(8081)))
+                .as("trying to get a non-bound port mapping fails")
+                .isInstanceOf(IllegalArgumentException.class);
         }
     }
 
@@ -161,8 +151,8 @@ public void shouldWaitUntilExposedPortIsMapped() {
         ) {
             container.start();
 
-            assertEquals("Only withExposedPort should be exposed", 1, container.getExposedPorts().size());
-            assertTrue("withExposedPort should be exposed", container.getExposedPorts().contains(8080));
+            assertThat(container.getExposedPorts()).as("Only withExposedPort should be exposed").hasSize(1);
+            assertThat(container.getExposedPorts()).as("withExposedPort should be exposed").contains(8080);
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/NetworkTest.java b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
index d783f95e6d1..099bef20ed7 100644
--- a/core/src/test/java/org/testcontainers/containers/NetworkTest.java
+++ b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
@@ -7,9 +7,7 @@
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Enclosed.class)
 public class NetworkTest {
@@ -33,7 +31,7 @@ public static class WithRules {
         @Test
         public void testNetworkSupport() throws Exception {
             String response = bar.execInContainer("wget", "-O", "-", "http://foo:8080").getStdout();
-            assertEquals("received response", "yay", response);
+            assertThat(response).as("received response").isEqualTo("yay");
         }
     }
 
@@ -60,7 +58,7 @@ public void testNetworkSupport() throws Exception {
                 bar.start();
 
                 String response = bar.execInContainer("wget", "-O", "-", "http://foo:8080").getStdout();
-                assertEquals("received response", "yay", response);
+                assertThat(response).as("received response").isEqualTo("yay");
             }
             // }
         }
@@ -69,11 +67,11 @@ public void testNetworkSupport() throws Exception {
         public void testBuilder() {
             try (Network network = Network.builder().driver("macvlan").build()) {
                 String id = network.getId();
-                assertEquals(
-                    "Flag is set",
-                    "macvlan",
+                assertThat(
                     DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(id).exec().getDriver()
-                );
+                )
+                    .as("Flag is set")
+                    .isEqualTo("macvlan");
             }
         }
 
@@ -83,11 +81,11 @@ public void testModifiers() {
                 Network network = Network.builder().createNetworkCmdModifier(cmd -> cmd.withDriver("macvlan")).build()
             ) {
                 String id = network.getId();
-                assertEquals(
-                    "Flag is set",
-                    "macvlan",
+                assertThat(
                     DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(id).exec().getDriver()
-                );
+                )
+                    .as("Flag is set")
+                    .isEqualTo("macvlan");
             }
         }
 
@@ -95,16 +93,13 @@ public void testModifiers() {
         public void testReusability() {
             try (Network network = Network.newNetwork()) {
                 String firstId = network.getId();
-                assertNotNull(
-                    "Network exists",
-                    DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(firstId).exec()
-                );
+                assertThat(DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(firstId).exec())
+                    .as("Network exists")
+                    .isNotNull();
 
                 network.close();
 
-                assertNotEquals(
-                    "New network created",
-                    firstId,
+                assertThat(
                     DockerClientFactory
                         .instance()
                         .client()
@@ -112,7 +107,9 @@ public void testReusability() {
                         .withNetworkId(network.getId())
                         .exec()
                         .getId()
-                );
+                )
+                    .as("New network created")
+                    .isNotEqualTo(firstId);
             }
         }
     }
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index f374018a8ef..8a41ac8d8a4 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -2,12 +2,12 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.io.File;
 import java.util.Collections;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 
@@ -65,55 +65,51 @@ public void shouldIgnoreUnknownStructure() {
     public void shouldObtainImageNamesV1() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions
-            .assertThat(parsedFile.getServiceNameToImageNames())
+        assertThat(parsedFile.getServiceNameToImageNames())
+            .as("all defined images are found")
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
                 entry("custom", Sets.newHashSet("postgres"))
-            )
-            .as("all defined images are found"); // redis, mysql from compose file, postgres from Dockerfile build
+            ); // redis, mysql from compose file, postgres from Dockerfile build
     }
 
     @Test
     public void shouldObtainImageNamesV2() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v2.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions
-            .assertThat(parsedFile.getServiceNameToImageNames())
+        assertThat(parsedFile.getServiceNameToImageNames())
+            .as("all defined images are found")
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
                 entry("custom", Sets.newHashSet("postgres"))
-            )
-            .as("all defined images are found");
+            );
     }
 
     @Test
     public void shouldObtainImageFromDockerfileBuild() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions
-            .assertThat(parsedFile.getServiceNameToImageNames())
+        assertThat(parsedFile.getServiceNameToImageNames())
+            .as("all defined images are found")
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
                 entry("custom", Sets.newHashSet("alpine:3.16"))
-            )
-            .as("all defined images are found"); // r/ redis, mysql from compose file, alpine:3.16 from Dockerfile build
+            ); // r/ redis, mysql from compose file, alpine:3.16 from Dockerfile build
     }
 
     @Test
     public void shouldObtainImageFromDockerfileBuildWithContext() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
-        Assertions
-            .assertThat(parsedFile.getServiceNameToImageNames())
+        assertThat(parsedFile.getServiceNameToImageNames())
+            .as("all defined images are found")
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
                 entry("custom", Sets.newHashSet("alpine:3.16"))
-            )
-            .as("all defined images are found"); // redis, mysql from compose file, alpine:3.16 from Dockerfile build
+            ); // redis, mysql from compose file, alpine:3.16 from Dockerfile build
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 7aafb0149bd..04f97fef514 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -25,7 +25,6 @@
 import org.mockito.Answers;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
@@ -82,9 +81,9 @@ public static Object[][] data() {
         @Test
         public void shouldBeReusable() {
             if (reusable) {
-                VisibleAssertions.assertTrue("Is reusable", container.canBeReused());
+                assertThat(container.canBeReused()).as("Is reusable").isTrue();
             } else {
-                VisibleAssertions.assertFalse("Is not reusable", container.canBeReused());
+                assertThat(container.canBeReused()).as("Is not reusable").isFalse();
             }
         }
 
diff --git a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
index a860b7802ec..cc3a98dba47 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
@@ -6,8 +6,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ContainerLogsTest {
 
@@ -18,7 +17,7 @@ public void getLogsReturnsAllLogsToDate() {
             container.start();
 
             final String logs = container.getLogs();
-            assertEquals("stdout and stderr are reflected in the returned logs", "stdout\nstderr", logs);
+            assertThat(logs).as("stdout and stderr are reflected in the returned logs").isEqualTo("stdout\nstderr");
         }
     }
 
@@ -30,8 +29,8 @@ public void getLogsContainsBothOutputTypes() {
             // docsGetAllLogs {
             final String logs = container.getLogs();
             // }
-            assertTrue("stdout is reflected in the returned logs", logs.contains("stdout"));
-            assertTrue("stderr is reflected in the returned logs", logs.contains("stderr"));
+            assertThat(logs).as("stdout is reflected in the returned logs").contains("stdout");
+            assertThat(logs).as("stderr is reflected in the returned logs").contains("stderr");
         }
     }
 
@@ -43,7 +42,7 @@ public void getLogsReturnsStdOutToDate() {
             // docsGetStdOut {
             final String logs = container.getLogs(OutputFrame.OutputType.STDOUT);
             // }
-            assertTrue("stdout is reflected in the returned logs", logs.contains("stdout"));
+            assertThat(logs).as("stdout is reflected in the returned logs").contains("stdout");
         }
     }
 
@@ -55,7 +54,7 @@ public void getLogsReturnsStdErrToDate() {
             // docsGetStdErr {
             final String logs = container.getLogs(OutputFrame.OutputType.STDERR);
             // }
-            assertTrue("stderr is reflected in the returned logs", logs.contains("stderr"));
+            assertThat(logs).as("stderr is reflected in the returned logs").contains("stderr");
         }
     }
 
@@ -67,7 +66,7 @@ public void getLogsForLongRunningContainer() throws InterruptedException {
             Thread.sleep(1000L);
 
             final String logs = container.getLogs(OutputFrame.OutputType.STDOUT);
-            assertTrue("stdout is reflected in the returned logs for a running container", logs.contains("seq=0"));
+            assertThat(logs).as("stdout is reflected in the returned logs for a running container").contains("seq=0");
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
index 211b12080a0..2755f4142d4 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.containers.output;
 
 import org.apache.commons.lang3.RandomStringUtils;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.GenericContainer;
@@ -19,7 +18,7 @@ public class ToStringConsumerTest {
             builder.append(' ').append(i).append(RandomStringUtils.randomAlphabetic(10000));
         }
         LARGE_PAYLOAD = builder.toString();
-        Assertions.assertThat(LARGE_PAYLOAD).doesNotContain("\n");
+        assertThat(LARGE_PAYLOAD).doesNotContain("\n");
     }
 
     @Test
@@ -29,7 +28,7 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
             container.start();
 
             ExecResult build = container.execInContainer("echo", "-n", LARGE_PAYLOAD);
-            Assertions.assertThat(build.getStdout()).doesNotContain("\n").isEqualTo(LARGE_PAYLOAD);
+            assertThat(build.getStdout()).doesNotContain("\n").isEqualTo(LARGE_PAYLOAD);
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
index c76d2481c7c..b7d9fd5a6fa 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
@@ -4,14 +4,14 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
 
 import java.net.ServerSocket;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
 
 public class ExternalPortListeningCheckTest {
 
@@ -44,7 +44,7 @@ public void singleListening() {
 
         final Boolean result = check.call();
 
-        VisibleAssertions.assertTrue("ExternalPortListeningCheck identifies a single listening port", result);
+        assertThat(result).as("ExternalPortListeningCheck identifies a single listening port").isTrue();
     }
 
     @Test
@@ -56,7 +56,7 @@ public void multipleListening() {
 
         final Boolean result = check.call();
 
-        VisibleAssertions.assertTrue("ExternalPortListeningCheck identifies multiple listening port", result);
+        assertThat(result).as("ExternalPortListeningCheck identifies multiple listening port").isTrue();
     }
 
     @Test
@@ -66,11 +66,9 @@ public void oneNotListening() {
             ImmutableSet.of(listeningSocket1.getLocalPort(), nonListeningSocket.getLocalPort())
         );
 
-        assertThrows(
-            "ExternalPortListeningCheck detects a non-listening port among many",
-            IllegalStateException.class,
-            (Runnable) check::call
-        );
+        assertThat(catchThrowable(check::call))
+            .as("ExternalPortListeningCheck detects a non-listening port among many")
+            .isInstanceOf(IllegalStateException.class);
     }
 
     @After
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
index 6f2a5d3158c..d93eb90c339 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
@@ -7,13 +7,14 @@
 import org.junit.runners.Parameterized;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.fail;
+
 @RunWith(Parameterized.class)
 public class InternalCommandPortListeningCheckTest {
 
@@ -48,8 +49,6 @@ public void singleListening() {
         );
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
-
-        VisibleAssertions.pass("InternalCommandPortListeningCheck identifies a single listening port");
     }
 
     @Test
@@ -61,7 +60,7 @@ public void nonListening() {
 
         try {
             Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
-            VisibleAssertions.fail("expected to fail");
+            fail("expected to fail");
         } catch (TimeoutException e) {}
     }
 
@@ -73,7 +72,5 @@ public void lowAndHighPortListening() {
         );
 
         Unreliables.retryUntilTrue(5, TimeUnit.SECONDS, check);
-
-        VisibleAssertions.pass("InternalCommandPortListeningCheck identifies a low and a high port");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
index 0d102def5a9..0cbf257e9b5 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
@@ -8,7 +8,8 @@
 
 import java.time.Duration;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class DockerHealthcheckWaitStrategyTest {
 
@@ -37,6 +38,8 @@ public void startsOnceHealthy() {
     @Test
     public void containerStartFailsIfContainerIsUnhealthy() {
         container.withCommand("tail", "-f", "/dev/null");
-        assertThrows("Container launch fails when unhealthy", ContainerLaunchException.class, container::start);
+        assertThat(catchThrowable(container::start))
+            .as("Container launch fails when unhealthy")
+            .isInstanceOf(ContainerLaunchException.class);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
index 2b8ba7c33ec..36facd92329 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
@@ -10,10 +10,11 @@
 
 import java.time.Duration;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 public class WaitAllStrategyTest {
 
@@ -42,11 +43,11 @@ public void parentTimeoutApplies() {
         DummyStrategy child1 = new DummyStrategy(Duration.ofMillis(10));
         child1.withStartupTimeout(Duration.ofMillis(20));
 
-        assertEquals("withStartupTimeout directly sets the timeout", 20L, child1.startupTimeout.toMillis());
+        assertThat(child1.startupTimeout.toMillis()).as("withStartupTimeout directly sets the timeout").isEqualTo(20L);
 
         new WaitAllStrategy().withStrategy(child1).withStartupTimeout(Duration.ofMillis(30));
 
-        assertEquals("WaitAllStrategy overrides a child's timeout", 30L, child1.startupTimeout.toMillis());
+        assertThat(child1.startupTimeout.toMillis()).as("WaitAllStrategy overrides a child's timeout").isEqualTo(30L);
     }
 
     @Test
@@ -59,8 +60,12 @@ public void parentTimeoutAppliesToMultipleChildren() {
 
         new WaitAllStrategy().withStrategy(child1).withStrategy(child2).withStartupTimeout(outerWait);
 
-        assertEquals("WaitAllStrategy overrides a child's timeout (1st)", 6L, child1.startupTimeout.toMillis());
-        assertEquals("WaitAllStrategy overrides a child's timeout (2nd)", 6L, child2.startupTimeout.toMillis());
+        assertThat(child1.startupTimeout.toMillis())
+            .as("WaitAllStrategy overrides a child's timeout (1st)")
+            .isEqualTo(6L);
+        assertThat(child2.startupTimeout.toMillis())
+            .as("WaitAllStrategy overrides a child's timeout (2nd)")
+            .isEqualTo(6L);
     }
 
     @Test
@@ -73,12 +78,12 @@ public void parentTimeoutAppliesToAdditionalChildren() {
 
         new WaitAllStrategy().withStrategy(child1).withStartupTimeout(outerWait).withStrategy(child2);
 
-        assertEquals("WaitAllStrategy overrides a child's timeout (1st)", 20L, child1.startupTimeout.toMillis());
-        assertEquals(
-            "WaitAllStrategy overrides a child's timeout (2nd, additional)",
-            20L,
-            child2.startupTimeout.toMillis()
-        );
+        assertThat(child1.startupTimeout.toMillis())
+            .as("WaitAllStrategy overrides a child's timeout (1st)")
+            .isEqualTo(20L);
+        assertThat(child2.startupTimeout.toMillis())
+            .as("WaitAllStrategy overrides a child's timeout (2nd, additional)")
+            .isEqualTo(20L);
     }
 
     /*
@@ -108,13 +113,13 @@ public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
         doNothing().when(strategy1).waitUntilReady(eq(container));
         doThrow(TimeoutException.class).when(strategy2).waitUntilReady(eq(container));
 
-        assertThrows(
-            "The outer strategy timeout applies",
-            TimeoutException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 underTest.waitUntilReady(container);
-            }
-        );
+            })
+        )
+            .as("The outer strategy timeout applies")
+            .isInstanceOf(TimeoutException.class);
 
         InOrder inOrder = inOrder(strategy1, strategy2, strategy3);
         inOrder.verify(strategy1).waitUntilReady(any());
@@ -126,13 +131,13 @@ public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
     public void timeoutChangeShouldNotBePossibleWithIndividualTimeoutMode() {
         final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY);
 
-        assertThrows(
-            "Cannot change timeout for individual timeouts",
-            IllegalStateException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 underTest.withStartupTimeout(Duration.ofSeconds(42));
-            }
-        );
+            })
+        )
+            .as("Cannot change timeout for individual timeouts")
+            .isInstanceOf(IllegalStateException.class);
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
index b2ab27aad27..062c3d793a5 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.transport.SSLConfig;
-import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -18,9 +17,7 @@
 import java.nio.file.Path;
 import java.util.Properties;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
@@ -69,8 +66,8 @@ public void testWhenConfigAbsent() {
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
         TransportConfig transportConfig = strategy.getTransportConfig();
-        assertEquals(defaultDockerHost, transportConfig.getDockerHost());
-        assertEquals(defaultSSLConfig, transportConfig.getSslConfig());
+        assertThat(transportConfig.getDockerHost()).isEqualTo(defaultDockerHost);
+        assertThat(transportConfig.getSslConfig()).isEqualTo(defaultSSLConfig);
     }
 
     @Test
@@ -95,8 +92,8 @@ public void testWhenDockerHostPresent() {
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
         TransportConfig transportConfig = strategy.getTransportConfig();
-        assertEquals("tcp://1.2.3.4:2375", transportConfig.getDockerHost().toString());
-        assertEquals(defaultSSLConfig, transportConfig.getSslConfig());
+        assertThat(transportConfig.getDockerHost().toString()).isEqualTo("tcp://1.2.3.4:2375");
+        assertThat(transportConfig.getSslConfig()).isEqualTo(defaultSSLConfig);
     }
 
     @Test
@@ -124,10 +121,10 @@ public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
         TransportConfig transportConfig = strategy.getTransportConfig();
-        assertEquals("tcp://1.2.3.4:2375", transportConfig.getDockerHost().toString());
+        assertThat(transportConfig.getDockerHost().toString()).isEqualTo("tcp://1.2.3.4:2375");
 
         SSLConfig sslConfig = transportConfig.getSslConfig();
-        Assertions.assertThat(sslConfig).extracting("dockerCertPath").isEqualTo(tempDirPath);
+        assertThat(sslConfig).extracting("dockerCertPath").isEqualTo(tempDirPath);
     }
 
     @Test
@@ -142,7 +139,7 @@ public void applicableWhenIgnoringUserPropertiesAndConfigured() {
             System.setProperty("DOCKER_HOST", "tcp://1.2.3.4:2375");
             EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
-            assertTrue(strategy.isApplicable());
+            assertThat(strategy.isApplicable()).isTrue();
         } finally {
             System.setProperties(oldProperties);
         }
@@ -157,6 +154,6 @@ public void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {
 
         EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
 
-        assertFalse(strategy.isApplicable());
+        assertThat(strategy.isApplicable()).isFalse();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
index 0b0ee5f1b70..a885c035e5c 100644
--- a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -4,7 +4,6 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.ContainerLaunchException;
@@ -12,7 +11,7 @@
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 
 public class ImagePullPolicyTest {
@@ -113,11 +112,10 @@ private void expectToFailWithNotFoundException(GenericContainer<?> container) {
             while (throwable.getCause() != null) {
                 throwable = throwable.getCause();
                 if (throwable.getCause() instanceof NotFoundException) {
-                    VisibleAssertions.pass("Caused by NotFoundException");
                     return;
                 }
             }
-            VisibleAssertions.fail("Caused by NotFoundException");
+            fail("Caused by NotFoundException");
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
index 29cf4fcf6a7..c45233ea390 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
@@ -9,7 +9,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Parameterized.class)
 public class DockerfileBuildTest {
@@ -71,10 +71,9 @@ public void performTest() {
             container.start();
 
             final String logs = container.getLogs();
-            assertTrue(
-                "expected file content indicates that dockerfile build steps have been run",
-                logs.contains(expectedFileContent)
-            );
+            assertThat(logs)
+                .as("expected file content indicates that dockerfile build steps have been run")
+                .contains(expectedFileContent);
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
index 513b1ce1784..8c6d288da99 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
@@ -9,8 +9,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.rnorth.visibleassertions.VisibleAssertions.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 public class DockerignoreTest {
 
@@ -45,14 +45,12 @@ public void testValidDockerignore() throws Exception {
             container.start();
 
             final String logs = container.getLogs();
-            assertTrue(
-                "Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
-                logs.contains("should_not_be_ignored.txt")
-            );
-            assertTrue(
-                "Files in the container indicated the .dockerignore was not applied. Output was: " + logs,
-                !logs.contains("should_be_ignored.txt")
-            );
+            assertThat(logs)
+                .as("Files in the container indicated the .dockerignore was not applied. Output was: " + logs)
+                .contains("should_not_be_ignored.txt");
+            assertThat(logs)
+                .as("Files in the container indicated the .dockerignore was not applied. Output was: " + logs)
+                .doesNotContain("should_be_ignored.txt");
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
index 69d9a1b6840..0c47d556137 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
@@ -10,8 +10,7 @@
 import java.io.InputStream;
 import java.util.Arrays;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.fail;
-import static org.rnorth.visibleassertions.VisibleAssertions.pass;
+import static org.assertj.core.api.Assertions.fail;
 
 public abstract class AbstractStatementTest {
 
@@ -64,7 +63,5 @@ protected void assertStatement(Statement statement) {
 
             fail(failureBuilder.toString());
         }
-
-        pass(testName.getMethodName());
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
index dd62ace1fac..c1aee4d7f2b 100644
--- a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
@@ -15,9 +15,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.hamcrest.Matchers.is;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 21/05/2016.
@@ -46,7 +44,7 @@ public void simpleTest() {
         jedis.incr("test");
         jedis.incr("test");
 
-        assertEquals("A redis instance defined in compose can be used in isolation", "3", jedis.get("test"));
+        assertThat(jedis.get("test")).as("A redis instance defined in compose can be used in isolation").isEqualTo("3");
     }
 
     @Test
@@ -61,7 +59,7 @@ public void secondTest() {
         jedis.incr("test");
         jedis.incr("test");
 
-        assertEquals("Tests use fresh container instances", "3", jedis.get("test"));
+        assertThat(jedis.get("test")).as("Tests use fresh container instances").isEqualTo("3");
         // if these end up using the same container one of the test methods will fail.
         // However, @Rule creates a separate DockerComposeContainer instance per test, so this just shouldn't happen
     }
@@ -73,7 +71,7 @@ public void captureNetworks() {
 
     @After
     public void verifyNoNetworks() {
-        assertThat("The networks", findAllNetworks(), is(existingNetworks));
+        assertThat(findAllNetworks()).as("The networks").isEqualTo(existingNetworks);
     }
 
     private List<String> findAllNetworks() {
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index 7041e74912a..b139ece5410 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -10,8 +10,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CopyFileToContainerTest {
 
@@ -28,7 +27,7 @@ public void checkFileCopied() throws IOException, InterruptedException {
         ) {
             container.start();
             String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
-            assertTrue("file list contains the file", filesList.contains(fileName));
+            assertThat(filesList).as("file list contains the file").contains(fileName);
         }
     }
 
@@ -41,7 +40,7 @@ public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
         ) {
             container.start();
             String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
-            assertTrue("file list contains the file", filesList.contains(fileName));
+            assertThat(filesList).as("file list contains the file").contains(fileName);
         }
     }
 
@@ -55,11 +54,11 @@ public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
             .withClasspathResourceMapping(resource, "/readWrite", BindMode.READ_WRITE);
 
         Map<MountableFile, String> copyMap = container.getCopyToFileContainerPathMap();
-        assertTrue("uses copy for read-only", copyMap.containsValue("/readOnly"));
-        assertTrue("uses copy for read-only and no Selinux", copyMap.containsValue("/readOnlyNoSelinux"));
+        assertThat(copyMap).as("uses copy for read-only").containsValue("/readOnly");
+        assertThat(copyMap).as("uses copy for read-only and no Selinux").containsValue("/readOnlyNoSelinux");
 
-        assertFalse("uses mount for read-only with Selinux", copyMap.containsValue("/readOnlyShared"));
-        assertFalse("uses mount for read-write", copyMap.containsValue("/readWrite"));
+        assertThat(copyMap).as("uses mount for read-only with Selinux").doesNotContainValue("/readOnlyShared");
+        assertThat(copyMap).as("uses mount for read-write").doesNotContainValue("/readWrite");
     }
 
     @Test
@@ -72,7 +71,7 @@ public void shouldCreateFoldersStructureWithCopy() throws Exception {
         ) {
             container.start();
             String filesList = container.execInContainer("ls", "/a/b/c/").getStdout();
-            assertTrue("file list contains the file", filesList.contains("file"));
+            assertThat(filesList).as("file list contains the file").contains("file");
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
index 78e55335d9a..fd58dc4335f 100644
--- a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
@@ -2,7 +2,6 @@
 
 import lombok.Getter;
 import org.junit.Test;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -17,6 +16,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class DependenciesTest {
 
     @Test
@@ -31,8 +32,8 @@ public void shouldWorkWithSimpleDependency() {
             container.start();
         }
 
-        VisibleAssertions.assertEquals("Started once", 1, startable.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("Does not trigger .stop()", 0, startable.getStopInvocationCount().intValue());
+        assertThat(startable.getStartInvocationCount().intValue()).as("Started once").isEqualTo(1);
+        assertThat(startable.getStopInvocationCount().intValue()).as("Does not trigger .stop()").isZero();
     }
 
     @Test
@@ -48,8 +49,8 @@ public void shouldWorkWithMutlipleDependencies() {
             container.start();
         }
 
-        VisibleAssertions.assertEquals("Startable1 started once", 1, startable1.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("Startable2 started once", 1, startable2.getStartInvocationCount().intValue());
+        assertThat(startable1.getStartInvocationCount().intValue()).as("Startable1 started once").isEqualTo(1);
+        assertThat(startable2.getStartInvocationCount().intValue()).as("Startable2 started once").isEqualTo(1);
     }
 
     @Test
@@ -70,8 +71,8 @@ public void shouldStartEveryTime() {
             container.start();
         }
 
-        VisibleAssertions.assertEquals("Started multiple times", 3, startable.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("Does not trigger .stop()", 0, startable.getStopInvocationCount().intValue());
+        assertThat(startable.getStartInvocationCount().intValue()).as("Started multiple times").isEqualTo(3);
+        assertThat(startable.getStopInvocationCount().intValue()).as("Does not trigger .stop()").isZero();
     }
 
     @Test
@@ -92,17 +93,11 @@ public void shouldStartTransitiveDependencies() {
             container.stop();
         }
 
-        VisibleAssertions.assertEquals("Root started", 1, startable.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals(
-            "Transitive started",
-            1,
-            transitiveStartable.getStartInvocationCount().intValue()
-        );
-        VisibleAssertions.assertEquals(
-            "Transitive of transitive started",
-            1,
-            transitiveOfTransitiveStartable.getStartInvocationCount().intValue()
-        );
+        assertThat(startable.getStartInvocationCount().intValue()).as("Root started").isEqualTo(1);
+        assertThat(transitiveStartable.getStartInvocationCount().intValue()).as("Transitive started").isEqualTo(1);
+        assertThat(transitiveOfTransitiveStartable.getStartInvocationCount().intValue())
+            .as("Transitive of transitive started")
+            .isEqualTo(1);
     }
 
     @Test
@@ -122,10 +117,10 @@ public void shouldHandleDiamondDependencies() throws Exception {
 
         Startables.deepStart(Stream.of(d)).get(1, TimeUnit.SECONDS);
 
-        VisibleAssertions.assertEquals("A started", 1, a.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("B started", 1, b.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("C started", 1, c.getStartInvocationCount().intValue());
-        VisibleAssertions.assertEquals("D started", 1, d.getStartInvocationCount().intValue());
+        assertThat(a.getStartInvocationCount().intValue()).as("A started").isEqualTo(1);
+        assertThat(b.getStartInvocationCount().intValue()).as("B started").isEqualTo(1);
+        assertThat(c.getStartInvocationCount().intValue()).as("C started").isEqualTo(1);
+        assertThat(d.getStartInvocationCount().intValue()).as("D started").isEqualTo(1);
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
index 651696696c7..dc0187f5251 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
@@ -7,7 +7,7 @@
 
 import java.io.File;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 08/08/2015.
@@ -47,7 +47,7 @@ public void simpleTest() {
         for (int i = 0; i < 3; i++) {
             clients[i].incr("somekey");
 
-            assertEquals("Each redis instance is separate", "1", clients[i].get("somekey"));
+            assertThat(clients[i].get("somekey")).as("Each redis instance is separate").isEqualTo("1");
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
index c49663a4e35..c610fc584af 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
@@ -12,10 +12,7 @@
 import java.util.Collections;
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 08/08/2015.
@@ -37,35 +34,31 @@ protected DockerComposeContainer getEnvironment() {
     @Test
     public void testGetServicePort() {
         int serviceWithInstancePort = environment.getServicePort("redis_1", REDIS_PORT);
-        assertNotNull("Port is set for service with instance number", serviceWithInstancePort);
+        assertThat(serviceWithInstancePort).as("Port is set for service with instance number").isNotNull();
         int serviceWithoutInstancePort = environment.getServicePort("redis", REDIS_PORT);
-        assertNotNull("Port is set for service with instance number", serviceWithoutInstancePort);
-        assertEquals("Service ports are the same", serviceWithInstancePort, serviceWithoutInstancePort);
+        assertThat(serviceWithoutInstancePort).as("Port is set for service with instance number").isNotNull();
+        assertThat(serviceWithoutInstancePort).as("Service ports are the same").isEqualTo(serviceWithInstancePort);
     }
 
     @Test
     public void shouldRetrieveContainerByServiceName() {
         String existingServiceName = "db_1";
         Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
-        assertTrue(
-            String.format("Container should be found by service name %s", existingServiceName),
-            result.isPresent()
-        );
-        assertEquals(
-            "Mapped port for result container was wrong, probably wrong container found",
-            result.get().getExposedPorts(),
-            Collections.singletonList(3306)
-        );
+        assertThat(result)
+            .as(String.format("Container should be found by service name %s", existingServiceName))
+            .isPresent();
+        assertThat(Collections.singletonList(3306))
+            .as("Mapped port for result container was wrong, probably wrong container found")
+            .isEqualTo(result.get().getExposedPorts());
     }
 
     @Test
     public void shouldReturnEmptyResultOnNoneExistingService() {
         String notExistingServiceName = "db_256";
         Optional<ContainerState> result = environment.getContainerByServiceName(notExistingServiceName);
-        assertFalse(
-            String.format("No container should be found under service name %s", notExistingServiceName),
-            result.isPresent()
-        );
+        assertThat(result)
+            .as(String.format("No container should be found under service name %s", notExistingServiceName))
+            .isNotPresent();
     }
 
     @Test
@@ -87,6 +80,6 @@ public void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOExceptio
         final DockerComposeContainer<?> dockerComposeContainer = new DockerComposeContainer<>(
             filePathNotStartWithDotSlash
         );
-        assertNotNull("Container could not be created using docker compose file", dockerComposeContainer);
+        assertThat(dockerComposeContainer).as("Container could not be created using docker compose file").isNotNull();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
index e0705a2c73b..ea7e35689d0 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
@@ -13,7 +13,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Parameterized.class)
 public class DockerComposeContainerWithBuildTest {
@@ -59,11 +59,13 @@ public void performTest() {
 
             builtImageName.set(imageNameForRunningContainer("_customredis_1"));
             final boolean isBuiltImagePresentWhileRunning = isImagePresent(builtImageName.get());
-            assertEquals("the built image is present while running", true, isBuiltImagePresentWhileRunning);
+            assertThat(isBuiltImagePresentWhileRunning).as("the built image is present while running").isEqualTo(true);
 
             pulledImageName.set(imageNameForRunningContainer("_normalredis_1"));
             final boolean isPulledImagePresentWhileRunning = isImagePresent(pulledImageName.get());
-            assertEquals("the pulled image is present while running", true, isPulledImagePresentWhileRunning);
+            assertThat(isPulledImagePresentWhileRunning)
+                .as("the pulled image is present while running")
+                .isEqualTo(true);
         }
 
         Unreliables.retryUntilSuccess(
@@ -71,11 +73,9 @@ public void performTest() {
             TimeUnit.SECONDS,
             () -> {
                 final boolean isBuiltImagePresentAfterRunning = isImagePresent(builtImageName.get());
-                assertEquals(
-                    "the built image is not present after running",
-                    shouldBuiltImageBePresentAfterRunning,
-                    isBuiltImagePresentAfterRunning
-                );
+                assertThat(isBuiltImagePresentAfterRunning)
+                    .as("the built image is not present after running")
+                    .isEqualTo(shouldBuiltImageBePresentAfterRunning);
                 return null;
             }
         );
@@ -85,11 +85,9 @@ public void performTest() {
             TimeUnit.SECONDS,
             () -> {
                 final boolean isPulledImagePresentAfterRunning = isImagePresent(pulledImageName.get());
-                assertEquals(
-                    "the pulled image is present after running",
-                    shouldPulledImageBePresentAfterRunning,
-                    isPulledImagePresentAfterRunning
-                );
+                assertThat(isPulledImagePresentAfterRunning)
+                    .as("the pulled image is present after running")
+                    .isEqualTo(shouldPulledImageBePresentAfterRunning);
                 return null;
             }
         );
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
index 51f09bdb095..63383bb7175 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
@@ -1,24 +1,26 @@
 package org.testcontainers.junit;
 
 import org.junit.Test;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
 public class DockerComposeErrorHandlingTest {
 
     @Test
     public void simpleTest() {
-        VisibleAssertions.assertThrows(
-            "starting with an invalid docker-compose file throws an exception",
-            IllegalArgumentException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 DockerComposeContainer environment = new DockerComposeContainer(
                     new File("src/test/resources/invalid-compose.yml")
                 )
                     .withExposedService("something", 123);
-            }
-        );
+            })
+        )
+            .as("starting with an invalid docker-compose file throws an exception")
+            .isInstanceOf(IllegalArgumentException.class);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
index c026bcaa741..10a26306248 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
@@ -13,9 +13,7 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static org.hamcrest.Matchers.hasItem;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 11/06/2016.
@@ -41,16 +39,14 @@ public void testContainerInstanceProperties() {
         final ContainerState container = waitStrategy.getContainer();
 
         //check environment variable was set
-        assertThat(
-            "Environment variable set correctly",
-            Arrays.asList(Objects.requireNonNull(container.getContainerInfo().getConfig().getEnv())),
-            hasItem("bar=bar")
-        );
+        assertThat(Arrays.asList(Objects.requireNonNull(container.getContainerInfo().getConfig().getEnv())))
+            .as("Environment variable set correctly")
+            .containsOnlyOnce("bar=bar");
 
         //check other container properties
-        assertNotNull("Container id is not null", container.getContainerId());
-        assertNotNull("Port mapped", container.getMappedPort(3000));
-        assertThat("Exposed Ports", container.getExposedPorts(), hasItem(3000));
+        assertThat(container.getContainerId()).as("Container id is not null").isNotNull();
+        assertThat(container.getMappedPort(3000)).as("Port mapped").isNotNull();
+        assertThat(container.getExposedPorts()).containsExactly(3000);
     }
 
     /*
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
index 5e6ba4cc30f..ccca85407f3 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
@@ -6,7 +6,7 @@
 
 import java.io.File;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DockerComposeServiceTest extends BaseDockerComposeTest {
 
@@ -29,6 +29,6 @@ public void testDbIsNotStarting() {
 
     @Test
     public void testRedisIsStarting() {
-        assertNotNull("Redis server started", environment.getServicePort("redis_1", REDIS_PORT));
+        assertThat(environment.getServicePort("redis_1", REDIS_PORT)).as("Redis server started").isNotNull();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
index a30c716964e..b110e776285 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
@@ -5,7 +5,6 @@
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.mockito.Mockito;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
@@ -15,6 +14,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.assertj.core.api.Assertions.fail;
 
 public class DockerComposeWaitStrategyTest {
 
@@ -38,11 +38,8 @@ public void testWaitOnListeningPort() {
 
         try {
             environment.starting(Description.createTestDescription(Object.class, "name"));
-            VisibleAssertions.pass("Docker compose should start after waiting for listening port");
         } catch (RuntimeException e) {
-            VisibleAssertions.fail(
-                "Docker compose should start after waiting for listening port with failed with: " + e
-            );
+            fail("Docker compose should start after waiting for listening port with failed with: " + e);
         }
     }
 
@@ -55,11 +52,8 @@ public void testWaitOnMultipleStrategiesPassing() {
 
         try {
             environment.starting(Description.createTestDescription(Object.class, "name"));
-            VisibleAssertions.pass("Docker compose should start after waiting for listening port");
         } catch (RuntimeException e) {
-            VisibleAssertions.fail(
-                "Docker compose should start after waiting for listening port with failed with: " + e
-            );
+            fail("Docker compose should start after waiting for listening port with failed with: " + e);
         }
     }
 
@@ -70,11 +64,9 @@ public void testWaitingFails() {
             REDIS_PORT,
             Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10))
         );
-        VisibleAssertions.assertThrows(
-            "waiting on an invalid http path times out",
-            RuntimeException.class,
-            () -> environment.starting(Description.createTestDescription(Object.class, "name"))
-        );
+        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+            .as("waiting on an invalid http path times out")
+            .isInstanceOf(RuntimeException.class);
     }
 
     @Test
@@ -91,11 +83,9 @@ public void testWaitOnOneOfMultipleStrategiesFailing() {
             )
             .withTailChildContainers(true);
 
-        VisibleAssertions.assertThrows(
-            "waiting on one failing strategy to time out",
-            RuntimeException.class,
-            () -> environment.starting(Description.createTestDescription(Object.class, "name"))
-        );
+        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+            .as("waiting on one failing strategy to time out")
+            .isInstanceOf(RuntimeException.class);
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
index 7962b87e157..b048e4716fd 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
@@ -7,8 +7,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Simple tests of named network modes - more may be possible, but may not be reproducible
@@ -28,8 +27,8 @@ public void testNoNetworkContainer() {
             container.start();
             NetworkSettings networkSettings = container.getContainerInfo().getNetworkSettings();
 
-            assertEquals("only one network is set", 1, networkSettings.getNetworks().size());
-            assertTrue("network is 'none'", networkSettings.getNetworks().containsKey("none"));
+            assertThat(networkSettings.getNetworks()).as("only one network is set").hasSize(1);
+            assertThat(networkSettings.getNetworks()).as("network is 'none'").containsKey("none");
         }
     }
 
@@ -44,8 +43,8 @@ public void testHostNetworkContainer() {
             container.start();
             NetworkSettings networkSettings = container.getContainerInfo().getNetworkSettings();
 
-            assertEquals("only one network is set", 1, networkSettings.getNetworks().size());
-            assertTrue("network is 'host'", networkSettings.getNetworks().containsKey("host"));
+            assertThat(networkSettings.getNetworks()).as("only one network is set").hasSize(1);
+            assertThat(networkSettings.getNetworks()).as("network is 'host'").containsKey("host");
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
index 715ba3f64a1..9ed143aca9c 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
@@ -11,8 +11,7 @@
 
 import java.io.IOException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Simple test case / demonstration of creating a fresh container image from a Dockerfile DSL
@@ -40,15 +39,14 @@ public void simpleDslTest() throws IOException {
         HttpGet get = new HttpGet(address);
 
         try (CloseableHttpResponse response = httpClient.execute(get)) {
-            assertEquals(
-                "A container built from a dockerfile can run nginx as expected, and returns a good status code",
-                200,
-                response.getStatusLine().getStatusCode()
-            );
-            assertTrue(
-                "A container built from a dockerfile can run nginx as expected, and returns an expected Server header",
-                response.getHeaders("Server")[0].getValue().contains("nginx")
-            );
+            assertThat(response.getStatusLine().getStatusCode())
+                .as("A container built from a dockerfile can run nginx as expected, and returns a good status code")
+                .isEqualTo(200);
+            assertThat(response.getHeaders("Server")[0].getValue())
+                .as(
+                    "A container built from a dockerfile can run nginx as expected, and returns an expected Server header"
+                )
+                .contains("nginx");
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
index df7bc417688..86292bcf9ac 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
@@ -16,8 +16,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.pass;
-
 public class DockerfileTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DockerfileTest.class);
@@ -130,8 +128,6 @@ protected void verifyImage(ImageFromDockerfile image) {
 
         try {
             container.start();
-
-            pass("Should start from Dockerfile");
         } finally {
             container.stop();
         }
diff --git a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
index e61721f80c4..d9655443480 100644
--- a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
@@ -3,7 +3,6 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -16,7 +15,7 @@
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class FileOperationsTest {
 
@@ -37,7 +36,7 @@ public void copyFileToContainerFileTest() throws Exception {
             alpineCopyToContainer.copyFileFromContainer("/test.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath());
-            assertTrue("Files aren't same ", FileUtils.contentEquals(expectedFile, actualFile));
+            assertThat(FileUtils.contentEquals(expectedFile, actualFile)).as("Files aren't same ").isTrue();
         }
     }
 
@@ -55,7 +54,7 @@ public void copyFileToContainerFolderTest() throws Exception {
             alpineCopyToContainer.copyFileFromContainer("/home/test_copy_to_container.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath());
-            assertTrue("Files aren't same ", FileUtils.contentEquals(expectedFile, actualFile));
+            assertThat(FileUtils.contentEquals(expectedFile, actualFile)).as("Files aren't same ").isTrue();
         }
     }
 
@@ -73,7 +72,7 @@ public void copyFolderToContainerFolderTest() throws Exception {
             alpineCopyToContainer.copyFileFromContainer("/home/test/test-resource.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath() + "/test-resource.txt");
-            assertTrue("Files aren't same ", FileUtils.contentEquals(expectedFile, actualFile));
+            assertThat(FileUtils.contentEquals(expectedFile, actualFile)).as("Files aren't same ").isTrue();
         }
     }
 
@@ -102,23 +101,21 @@ public void shouldCopyFileFromContainerTest() throws IOException {
             alpineCopyToContainer.copyFileFromContainer("/home/test_copy_to_container.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath());
-            assertTrue("Files aren't same ", FileUtils.contentEquals(expectedFile, actualFile));
+            assertThat(FileUtils.contentEquals(expectedFile, actualFile)).as("Files aren't same ").isTrue();
         }
     }
 
     @Test
     public void copyFileOperationsShouldFailWhenNotStartedTest() {
         try (GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE).withCommand("top")) {
-            Assertions
-                .assertThatThrownBy(() -> {
+            assertThatThrownBy(() -> {
                     MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
                     container.copyFileToContainer(mountableFile, "/home/test.txt");
                 })
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessageContaining("can only be used with created / running container");
 
-            Assertions
-                .assertThatThrownBy(() -> {
+            assertThatThrownBy(() -> {
                     container.copyFileFromContainer("/home/test_copy_to_container.txt", IOUtils::toByteArray);
                 })
                 .isInstanceOf(IllegalStateException.class)
@@ -137,7 +134,7 @@ public void shouldCopyFileFromExitedContainerTest() throws IOException {
             assertThat(
                 container.getDockerClient().waitContainerCmd(container.getContainerId()).start().awaitStatusCode()
             )
-                .isEqualTo(0);
+                .isZero();
 
             container.copyFileFromContainer("/home/file_in_container.txt", IOUtils::toByteArray);
 
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index 8c696585902..4ba491d83fd 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -47,12 +47,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 /**
  * Tests for GenericContainerRules
@@ -158,9 +154,9 @@ public static void setupContent() throws FileNotFoundException {
     @Test
     public void testIsRunning() {
         try (GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top")) {
-            assertFalse("Container is not started and not running", container.isRunning());
+            assertThat(container.isRunning()).as("Container is not started and not running").isFalse();
             container.start();
-            assertTrue("Container is started and running", container.isRunning());
+            assertThat(container.isRunning()).as("Container is started and running").isTrue();
         }
     }
 
@@ -175,15 +171,13 @@ public void withTmpFsTest() throws Exception {
             // check file doesn't exist
             String path = "/testtmpfs/test.file";
             Container.ExecResult execResult = container.execInContainer("ls", path);
-            assertEquals(
-                "tmpfs inside container works fine",
-                execResult.getStderr(),
-                "ls: /testtmpfs/test.file: No such file or directory\n"
-            );
+            assertThat(execResult.getStderr())
+                .as("tmpfs inside container works fine")
+                .isEqualTo("ls: /testtmpfs/test.file: No such file or directory\n");
             // touch && check file does exist
             container.execInContainer("touch", path);
             execResult = container.execInContainer("ls", path);
-            assertEquals("tmpfs inside container works fine", execResult.getStdout(), path + "\n");
+            assertThat(execResult.getStdout()).as("tmpfs inside container works fine").isEqualTo(path + "\n");
         }
     }
 
@@ -221,8 +215,7 @@ public void handleDelivery(
         channel.basicPublish(RABBIQMQ_TEST_EXCHANGE, RABBITMQ_TEST_ROUTING_KEY, null, RABBITMQ_TEST_MESSAGE.getBytes());
 
         // check the message was received
-        assertTrue(
-            "The message was received",
+        assertThat(
             Unreliables.retryUntilSuccess(
                 5,
                 TimeUnit.SECONDS,
@@ -233,7 +226,9 @@ public void handleDelivery(
                     return true;
                 }
             )
-        );
+        )
+            .as("The message was received")
+            .isTrue();
     }
 
     @Test
@@ -246,21 +241,21 @@ public void simpleMongoDbTest() {
         collection.insertOne(doc);
 
         Document doc2 = collection.find(new Document("name", "foo")).first();
-        assertEquals("A record can be inserted into and retrieved from MongoDB", 1, doc2.get("value"));
+        assertThat(doc2.get("value")).as("A record can be inserted into and retrieved from MongoDB").isEqualTo(1);
     }
 
     @Test
     public void environmentAndCustomCommandTest() throws IOException {
         String line = getReaderForContainerPort80(alpineEnvVar).readLine();
 
-        assertEquals("An environment variable can be passed into a command", "42", line);
+        assertThat(line).as("An environment variable can be passed into a command").isEqualTo("42");
     }
 
     @Test
     public void environmentFromMapTest() throws IOException {
         String line = getReaderForContainerPort80(alpineEnvVarFromMap).readLine();
 
-        assertEquals("Environment variables can be passed into a command from a map", "42 and 50", line);
+        assertThat(line).as("Environment variables can be passed into a command from a map").isEqualTo("42 and 50");
     }
 
     @Test
@@ -273,21 +268,21 @@ public void customLabelTest() {
             alpineCustomLabel.start();
 
             Map<String, String> labels = alpineCustomLabel.getCurrentContainerInfo().getConfig().getLabels();
-            assertTrue("org.testcontainers label is present", labels.containsKey("org.testcontainers"));
-            assertTrue("our.custom label is present", labels.containsKey("our.custom"));
-            assertEquals("our.custom label value is label", labels.get("our.custom"), "label");
+            assertThat(labels).as("org.testcontainers label is present").containsKey("org.testcontainers");
+            assertThat(labels).as("our.custom label is present").containsKey("our.custom");
+            assertThat(labels).as("our.custom label value is label").containsEntry("our.custom", "label");
         }
     }
 
     @Test
     public void exceptionThrownWhenTryingToOverrideTestcontainersLabels() {
-        assertThrows(
-            "When trying to overwrite an 'org.testcontainers' label, withLabel() throws an exception",
-            IllegalArgumentException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 new GenericContainer<>(TestImages.ALPINE_IMAGE).withLabel("org.testcontainers.foo", "false");
-            }
-        );
+            })
+        )
+            .as("When trying to overwrite an 'org.testcontainers' label, withLabel() throws an exception")
+            .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
@@ -296,32 +291,24 @@ public void customClasspathResourceMappingTest() throws IOException {
         // in that case this test will fail.
         String line = getReaderForContainerPort80(alpineClasspathResource).readLine();
 
-        assertEquals(
-            "Resource on the classpath can be mapped using calls to withClasspathResourceMapping",
-            "FOOBAR",
-            line
-        );
+        assertThat(line)
+            .as("Resource on the classpath can be mapped using calls to withClasspathResourceMapping")
+            .isEqualTo("FOOBAR");
     }
 
     @Test
     public void customClasspathResourceMappingWithSelinuxTest() throws IOException {
         String line = getReaderForContainerPort80(alpineClasspathResourceSelinux).readLine();
-        assertEquals(
-            "Resource on the classpath can be mapped using calls to withClasspathResourceMappingSelinux",
-            "FOOBAR",
-            line
-        );
+        assertThat(line)
+            .as("Resource on the classpath can be mapped using calls to withClasspathResourceMappingSelinux")
+            .isEqualTo("FOOBAR");
     }
 
     @Test
     public void exceptionThrownWhenMappedPortNotFound() {
-        assertThrows(
-            "When the requested port is not mapped, getMappedPort() throws an exception",
-            IllegalArgumentException.class,
-            () -> {
-                return redis.getMappedPort(666);
-            }
-        );
+        assertThat(catchThrowable(() -> redis.getMappedPort(666)))
+            .as("When the requested port is not mapped, getMappedPort() throws an exception")
+            .isInstanceOf(IllegalArgumentException.class);
     }
 
     protected static void writeStringToFile(File contentFolder, String filename, String string)
@@ -342,14 +329,9 @@ public void failFastWhenContainerHaltsImmediately() {
             .withMinimumRunningDuration(Duration.ofMillis(100));
 
         try {
-            assertThrows(
-                "When we start a container that halts immediately, an exception is thrown",
-                RetryCountExceededException.class,
-                () -> {
-                    failsImmediately.start();
-                    return null;
-                }
-            );
+            assertThat(catchThrowable(failsImmediately::start))
+                .as("When we start a container that halts immediately, an exception is thrown")
+                .isInstanceOf(RetryCountExceededException.class);
 
             // Check how long it took, to verify that we ARE bailing out early.
             // Want to strike a balance here; too short and this test will fail intermittently
@@ -357,10 +339,9 @@ public void failFastWhenContainerHaltsImmediately() {
             // what we're intending to test.
             int allowedSecondsToFailure = GenericContainer.CONTAINER_RUNNING_TIMEOUT_SEC / 2;
             long completedTimeMs = System.currentTimeMillis();
-            assertTrue(
-                "container should not take long to start up",
-                completedTimeMs - startingTimeMs < 1000L * allowedSecondsToFailure
-            );
+            assertThat(completedTimeMs - startingTimeMs < 1000L * allowedSecondsToFailure)
+                .as("container should not take long to start up")
+                .isTrue();
         } finally {
             failsImmediately.stop();
         }
@@ -374,11 +355,10 @@ public void testExecInContainer() throws Exception {
         Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
 
         final GenericContainer.ExecResult result = redis.execInContainer("redis-cli", "role");
-        assertTrue(
-            "Output for \"redis-cli role\" command should start with \"master\"",
-            result.getStdout().startsWith("master")
-        );
-        assertEquals("Stderr for \"redis-cli role\" command should be empty", "", result.getStderr());
+        assertThat(result.getStdout())
+            .as("Output for \"redis-cli role\" command should start with \"master\"")
+            .startsWith("master");
+        assertThat(result.getStderr()).as("Stderr for \"redis-cli role\" command should be empty").isEmpty();
         // We expect to reach this point for modern Docker versions.
     }
 
@@ -396,7 +376,7 @@ public void extraHostTest() throws IOException {
         }
 
         Matcher matcher = Pattern.compile("^192.168.1.10\\s.*somehost", Pattern.MULTILINE).matcher(hosts.toString());
-        assertTrue("The hosts file of container contains extra host", matcher.find());
+        assertThat(matcher.find()).as("The hosts file of container contains extra host").isTrue();
     }
 
     @Test
@@ -414,12 +394,10 @@ public void createContainerCmdHookTest() {
         ) {
             container.start();
 
-            assertEquals("Name is configured", "/" + randomName, container.getContainerInfo().getName());
-            assertEquals(
-                "Command is configured",
-                "[redis-server, --port, 6379]",
-                Arrays.toString(container.getContainerInfo().getConfig().getCmd())
-            );
+            assertThat(container.getContainerInfo().getName()).as("Name is configured").isEqualTo("/" + randomName);
+            assertThat(Arrays.toString(container.getContainerInfo().getConfig().getCmd()))
+                .as("Command is configured")
+                .isEqualTo("[redis-server, --port, 6379]");
         }
     }
 
@@ -439,18 +417,18 @@ private BufferedReader getReaderForContainerPort80(GenericContainer container) {
     @Test
     public void addExposedPortAfterWithExposedPortsTest() {
         redis.addExposedPort(8987);
-        assertThat("Both ports should be exposed", redis.getExposedPorts().size(), equalTo(2));
-        assertTrue("withExposedPort should be exposed", redis.getExposedPorts().contains(REDIS_PORT));
-        assertTrue("addExposedPort should be exposed", redis.getExposedPorts().contains(8987));
+        assertThat(redis.getExposedPorts()).as("Both ports should be exposed").hasSize(2);
+        assertThat(redis.getExposedPorts()).as("withExposedPort should be exposed").contains(REDIS_PORT);
+        assertThat(redis.getExposedPorts()).as("addExposedPort should be exposed").contains(8987);
     }
 
     @Test
     public void addingExposedPortTwiceShouldNotFail() {
         redis.addExposedPort(8987);
         redis.addExposedPort(8987);
-        assertThat("Both ports should be exposed", redis.getExposedPorts().size(), equalTo(2)); // 2 ports = de-duplicated port 8897 and original port 6379
-        assertTrue("withExposedPort should be exposed", redis.getExposedPorts().contains(REDIS_PORT));
-        assertTrue("addExposedPort should be exposed", redis.getExposedPorts().contains(8987));
+        assertThat(redis.getExposedPorts()).as("Both ports should be exposed").hasSize(2); // 2 ports = de-duplicated port 8897 and original port 6379
+        assertThat(redis.getExposedPorts()).as("withExposedPort should be exposed").contains(REDIS_PORT);
+        assertThat(redis.getExposedPorts()).as("addExposedPort should be exposed").contains(8987);
     }
 
     @Test
@@ -463,7 +441,9 @@ public void sharedMemorySetTest() {
             containerWithSharedMemory.start();
 
             HostConfig hostConfig = containerWithSharedMemory.getContainerInfo().getHostConfig();
-            assertEquals("Shared memory not set on container", hostConfig.getShmSize(), 42L * FileUtils.ONE_MB);
+            assertThat(hostConfig.getShmSize())
+                .as("Shared memory not set on container")
+                .isEqualTo(42L * FileUtils.ONE_MB);
         }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
index 33909e2ed27..aff9b29cbe7 100644
--- a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
@@ -5,7 +5,8 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 /**
  * Created by rnorth on 20/03/2016.
@@ -14,12 +15,12 @@ public class NonExistentImagePullTest {
 
     @Test(timeout = 60_000L)
     public void pullingNonExistentImageFailsGracefully() {
-        assertThrows(
-            "Pulling a nonexistent container will cause an exception to be thrown",
-            ContainerFetchException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 new GenericContainer<>(DockerImageName.parse("testcontainers/nonexistent:latest")).getDockerImageName();
-            }
-        );
+            })
+        )
+            .as("Pulling a nonexistent container will cause an exception to be thrown")
+            .isInstanceOf(ContainerFetchException.class);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
index 104fb78fe48..17b1d247cbb 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
@@ -15,9 +15,8 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 /**
  * Simple test for following container output.
@@ -49,10 +48,8 @@ public void testFetchStdoutWithTimeout() {
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
-        assertThrows(
-            "a TimeoutException should be thrown",
-            TimeoutException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 consumer.waitUntil(
                     frame -> {
                         return (
@@ -62,9 +59,10 @@ public void testFetchStdoutWithTimeout() {
                     2,
                     TimeUnit.SECONDS
                 );
-                return true;
-            }
-        );
+            })
+        )
+            .as("a TimeoutException should be thrown")
+            .isInstanceOf(TimeoutException.class);
     }
 
     @Test(timeout = 60_000L)
@@ -102,8 +100,8 @@ public void testToStringConsumer() throws TimeoutException {
         waitingConsumer.waitUntilEnd(30, TimeUnit.SECONDS);
 
         String utf8String = toStringConsumer.toUtf8String();
-        assertTrue("the expected first value was found", utf8String.contains("seq=1"));
-        assertTrue("the expected last value was found", utf8String.contains("seq=4"));
-        assertFalse("a non-expected value was found", utf8String.contains("seq=42"));
+        assertThat(utf8String).as("the expected first value was found").contains("seq=1");
+        assertThat(utf8String).as("the expected last value was found").contains("seq=4");
+        assertThat(utf8String).as("a non-expected value was found").doesNotContain("seq=42");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
index a87dbef3990..c340f26d3fb 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
@@ -16,9 +16,8 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 @Slf4j
 public class OutputStreamWithTTYTest {
@@ -39,7 +38,9 @@ public void testFetchStdout() throws TimeoutException {
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
         consumer.waitUntil(
-            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("home"),
+            frame -> {
+                return frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("home");
+            },
             4,
             TimeUnit.SECONDS
         );
@@ -51,18 +52,21 @@ public void testFetchStdoutWithTimeout() {
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
 
-        assertThrows(
-            "a TimeoutException should be thrown",
-            TimeoutException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 consumer.waitUntil(
-                    frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("qqq"),
+                    frame -> {
+                        return (
+                            frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().contains("qqq")
+                        );
+                    },
                     1,
                     TimeUnit.SECONDS
                 );
-                return true;
-            }
-        );
+            })
+        )
+            .as("a TimeoutException should be thrown")
+            .isInstanceOf(TimeoutException.class);
     }
 
     @Test
@@ -100,8 +104,8 @@ public void testToStringConsumer() throws TimeoutException {
         waitingConsumer.waitUntilEnd(4, TimeUnit.SECONDS);
 
         String utf8String = toStringConsumer.toUtf8String();
-        assertTrue("the expected first value was found", utf8String.contains("home"));
-        assertTrue("the expected last value was found", utf8String.contains("media"));
-        assertFalse("a non-expected value was found", utf8String.contains("qqq"));
+        assertThat(utf8String).as("the expected first value was found").contains("home");
+        assertThat(utf8String).as("the expected last value was found").contains("media");
+        assertThat(utf8String).as("a non-expected value was found").doesNotContain("qqq");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
index 7c176f14a1a..8437123f97a 100644
--- a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
@@ -7,7 +7,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Simple test case / demonstration of creating a fresh container image from a Dockerfile DSL when the test
@@ -52,6 +52,6 @@ public static Object[][] data() {
     public void simpleTest() throws Exception {
         final String release = container.execInContainer("cat", "/etc/alpine-release").getStdout();
 
-        assertTrue("/etc/alpine-release starts with " + expectedVersion, release.startsWith(expectedVersion));
+        assertThat(release).as("/etc/alpine-release starts with " + expectedVersion).startsWith(expectedVersion);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
index 0be4022c171..05f65e1f493 100644
--- a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
+++ b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
@@ -6,7 +6,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 26/07/2016.
@@ -23,8 +23,8 @@ public class WorkingDirectoryTest {
     public void checkOutput() {
         String listing = container.getLogs();
 
-        assertTrue("Directory listing contains expected /etc content", listing.contains("hostname"));
-        assertTrue("Directory listing contains expected /etc content", listing.contains("init.d"));
-        assertTrue("Directory listing contains expected /etc content", listing.contains("passwd"));
+        assertThat(listing).as("Directory listing contains expected /etc content").contains("hostname");
+        assertThat(listing).as("Directory listing contains expected /etc content").contains("init.d");
+        assertThat(listing).as("Directory listing contains expected /etc content").contains("passwd");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
index 530638f0f70..45809f95627 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
@@ -3,7 +3,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.rnorth.ducttape.RetryCountExceededException;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
@@ -12,6 +11,8 @@
 import java.time.Duration;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -109,11 +110,9 @@ protected void waitUntilReadyAndTimeout(String shellCommand) {
      */
     protected void waitUntilReadyAndTimeout(GenericContainer<?> container) {
         // start() blocks until successful or timeout
-        VisibleAssertions.assertThrows(
-            "an exception is thrown when timeout occurs (" + WAIT_TIMEOUT_MILLIS + "ms)",
-            ContainerLaunchException.class,
-            container::start
-        );
+        assertThat(catchThrowable(container::start))
+            .as("an exception is thrown when timeout occurs (" + WAIT_TIMEOUT_MILLIS + "ms)")
+            .isInstanceOf(ContainerLaunchException.class);
     }
 
     /**
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
index 4b5f43a4d4b..d5a0ba6929d 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
@@ -8,8 +8,6 @@
 
 import java.time.Duration;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.pass;
-
 /**
  * Test wait strategy with overloaded waitingFor methods.
  * Other implementations of WaitStrategy are tested through backwards compatible wait strategy tests
@@ -24,7 +22,5 @@ public class HostPortWaitStrategyTest {
         .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)));
 
     @Test
-    public void testWaiting() {
-        pass("Container starts after waiting");
-    }
+    public void testWaiting() {}
 }
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index bcf88d7be11..0e00dd87bf7 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -19,10 +19,10 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.when;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 /**
  * This test checks the integration between Testcontainers and an authenticated registry, but uses
@@ -91,7 +91,7 @@ public void testThatAuthLocatorIsUsedForContainerCreation() {
         ) {
             container.start();
 
-            assertTrue("container started following an authenticated pull", container.isRunning());
+            assertThat(container.isRunning()).as("container started following an authenticated pull").isTrue();
         }
     }
 
@@ -111,7 +111,7 @@ public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
         ) {
             container.start();
 
-            assertTrue("container started following an authenticated pull", container.isRunning());
+            assertThat(container.isRunning()).as("container started following an authenticated pull").isTrue();
         }
     }
 
@@ -133,10 +133,11 @@ public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
         try (final DockerComposeContainer<?> compose = new DockerComposeContainer<>(tempFile.toFile())) {
             compose.start();
 
-            assertTrue(
-                "container started following an authenticated pull",
+            assertThat(
                 compose.getContainerByServiceName("privateservice_1").map(ContainerState::isRunning).orElse(false)
-            );
+            )
+                .as("container started following an authenticated pull")
+                .isTrue();
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
index 4ed86e3a8fa..e775a2cd492 100644
--- a/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
@@ -10,10 +10,10 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class ClasspathScannerTest {
 
@@ -41,7 +41,7 @@ public void realClassLoaderLookupOccurs() {
         // look for a resource that we know exists only once
         final List<URL> foundURLs = ClasspathScanner.scanFor("expectedClasspathFile.txt").collect(Collectors.toList());
 
-        assertEquals("Exactly one resource was found", 1, foundURLs.size());
+        assertThat(foundURLs).as("Exactly one resource was found").hasSize(1);
     }
 
     @Test
@@ -53,7 +53,7 @@ public void multipleResultsOnOneClassLoaderAreFound() throws IOException {
         final List<URL> foundURLs = ClasspathScanner
             .scanFor("someName", firstMockClassLoader)
             .collect(Collectors.toList());
-        assertEquals("The expected URLs are found", Arrays.asList(FILE_A, FILE_B), foundURLs);
+        assertThat(foundURLs).as("The expected URLs are found").containsExactly(FILE_A, FILE_B);
     }
 
     @Test
@@ -65,11 +65,9 @@ public void orderIsAlphabeticalForDeterminism() throws IOException {
         final List<URL> foundURLs = ClasspathScanner
             .scanFor("someName", firstMockClassLoader)
             .collect(Collectors.toList());
-        assertEquals(
-            "The expected URLs are found in the expected order",
-            Arrays.asList(FILE_A, FILE_B, JAR_A, JAR_B),
-            foundURLs
-        );
+        assertThat(foundURLs)
+            .as("The expected URLs are found in the expected order")
+            .containsExactly(FILE_A, FILE_B, JAR_A, JAR_B);
     }
 
     @Test
@@ -92,6 +90,6 @@ public void multipleClassLoadersAreQueried() throws IOException {
             .scanFor("someName", firstMockClassLoader, secondMockClassLoader)
             .collect(Collectors.toList());
 
-        assertEquals("The expected URLs are found", Arrays.asList(FILE_A, FILE_B, FILE_C), foundURLs);
+        assertThat(foundURLs).as("The expected URLs are found").containsExactly(FILE_A, FILE_B, FILE_C);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
index 46fd6894a02..6215f84520b 100644
--- a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -1,20 +1,15 @@
 package org.testcontainers.utility;
 
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.core.IsCollectionContaining;
+import org.assertj.core.api.Condition;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.File;
-import java.util.Arrays;
+import java.util.function.Predicate;
 
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DirectoryTarResourceTest {
 
@@ -40,88 +35,63 @@ public void simpleRecursiveFileTest() {
 
         final String results = container.getLogs();
 
-        assertTrue(
-            "The container has a file that was copied in via a recursive copy",
-            results.contains("Used for DirectoryTarResourceTest")
-        );
+        assertThat(results)
+            .as("The container has a file that was copied in via a recursive copy")
+            .contains("Used for DirectoryTarResourceTest");
     }
 
     @Test
     public void simpleRecursiveFileWithPermissionTest() {
-        GenericContainer container = new GenericContainer(
-            new ImageFromDockerfile()
-                .withDockerfileFromBuilder(builder -> {
-                    builder
-                        .from("alpine:3.16") //
-                        .copy("/tmp/foo", "/foo")
-                        .cmd("ls", "-al", "/")
-                        .build();
-                })
-                .withFileFromFile("/tmp/foo", new File("/mappable-resource/test-resource.txt"), 0754)
-        )
-            .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
-
-        container.start();
-        String listing = container.getLogs();
-
-        assertThat(
-            "Listing shows that file is copied with mode requested.",
-            Arrays.asList(listing.split("\\n")),
-            exactlyNItems(1, allOf(containsString("-rwxr-xr--"), containsString("foo")))
-        );
+        try (
+            GenericContainer container = new GenericContainer(
+                new ImageFromDockerfile()
+                    .withDockerfileFromBuilder(builder -> {
+                        builder
+                            .from("alpine:3.16") //
+                            .copy("/tmp/foo", "/foo")
+                            .cmd("ls", "-al", "/")
+                            .build();
+                    })
+                    .withFileFromFile("/tmp/foo", new File("/mappable-resource/test-resource.txt"), 0754)
+            )
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+            String listing = container.getLogs();
+
+            Predicate<String> condition = s -> s.contains("-rwxr-xr--") && s.contains("foo");
+            assertThat(listing.split("\\n"))
+                .as("Listing shows that file is copied with mode requested.")
+                .haveAtLeastOne(new Condition<>(condition, "File not found in listing"));
+        }
     }
 
     @Test
     public void simpleRecursiveClasspathResourceTest() {
         // This test combines the copying of classpath resources from JAR files with the recursive TAR approach, to allow JARed classpath resources to be copied in to an image
 
-        GenericContainer container = new GenericContainer(
-            new ImageFromDockerfile()
-                .withDockerfileFromBuilder(builder -> {
-                    builder
-                        .from("alpine:3.16") //
-                        .copy("/tmp/foo", "/foo")
-                        .cmd("ls -lRt /foo")
-                        .build();
-                })
-                .withFileFromClasspath("/tmp/foo", "/recursive/dir")
-        ) // here we use /org/junit as a directory that really should exist on the classpath
-            .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
-
-        container.start();
-
-        final String results = container.getLogs();
-
-        // ExternalResource.class is known to exist in a subdirectory of /org/junit so should be successfully copied in
-        assertTrue(
-            "The container has a file that was copied in via a recursive copy from a JAR resource",
-            results.contains("content.txt")
-        );
-    }
-
-    public static <T> Matcher<Iterable<? super T>> exactlyNItems(final int n, Matcher<? super T> elementMatcher) {
-        return new IsCollectionContaining<T>(elementMatcher) {
-            @Override
-            protected boolean matchesSafely(Iterable<? super T> collection, Description mismatchDescription) {
-                int count = 0;
-                boolean isPastFirst = false;
-
-                for (Object item : collection) {
-                    if (elementMatcher.matches(item)) {
-                        count++;
-                    }
-                    if (isPastFirst) {
-                        mismatchDescription.appendText(", ");
-                    }
-                    elementMatcher.describeMismatch(item, mismatchDescription);
-                    isPastFirst = true;
-                }
-
-                if (count != n) {
-                    mismatchDescription.appendText(". Expected exactly " + n + " but got " + count);
-                }
-                return count == n;
-            }
-        };
+        try (
+            GenericContainer container = new GenericContainer(
+                new ImageFromDockerfile()
+                    .withDockerfileFromBuilder(builder -> {
+                        builder
+                            .from("alpine:3.16") //
+                            .copy("/tmp/foo", "/foo")
+                            .cmd("ls -lRt /foo")
+                            .build();
+                    })
+                    .withFileFromClasspath("/tmp/foo", "/recursive/dir")
+            ) // here we use /org/junit as a directory that really should exist on the classpath
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+
+            final String results = container.getLogs();
+
+            // ExternalResource.class is known to exist in a subdirectory of /org/junit so should be successfully copied in
+            assertThat(results)
+                .as("The container has a file that was copied in via a recursive copy from a JAR resource")
+                .contains("content.txt");
+        }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index f2ca26b8947..e9aac2ed475 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -4,9 +4,8 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class DockerImageNameCompatibilityTest {
 
@@ -17,7 +16,7 @@ public class DockerImageNameCompatibilityTest {
     public void testPlainImage() {
         DockerImageName subject = DockerImageName.parse("foo");
 
-        assertFalse("image name foo != bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("image name foo != bar").isFalse();
     }
 
     @Test
@@ -29,53 +28,66 @@ public void testNoTagTreatedAsWildcard() {
 
         The test is effectively making sure that 'no tag' is treated as a wildcard
          */
-        assertFalse("foo:4.5.6 != foo:1.2.3", subject.isCompatibleWith(DockerImageName.parse("foo:1.2.3")));
-        assertTrue("foo:4.5.6 ~= foo", subject.isCompatibleWith(DockerImageName.parse("foo")));
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("foo:1.2.3"))).as("foo:4.5.6 != foo:1.2.3").isFalse();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("foo"))).as("foo:4.5.6 ~= foo").isTrue();
     }
 
     @Test
     public void testImageWithAutomaticCompatibilityForFullPath() {
         DockerImageName subject = DockerImageName.parse("repo/foo:1.2.3");
 
-        assertTrue("repo/foo:1.2.3 ~= repo/foo", subject.isCompatibleWith(DockerImageName.parse("repo/foo")));
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("repo/foo")))
+            .as("repo/foo:1.2.3 ~= repo/foo")
+            .isTrue();
     }
 
     @Test
     public void testImageWithClaimedCompatibility() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar");
 
-        assertTrue("foo(bar) ~= bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
-        assertFalse("foo(bar) != fizz", subject.isCompatibleWith(DockerImageName.parse("fizz")));
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("foo(bar) ~= bar").isTrue();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("fizz"))).as("foo(bar) != fizz").isFalse();
     }
 
     @Test
     public void testImageWithClaimedCompatibilityAndVersion() {
         DockerImageName subject = DockerImageName.parse("foo:1.2.3").asCompatibleSubstituteFor("bar");
 
-        assertTrue("foo:1.2.3(bar) ~= bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("foo:1.2.3(bar) ~= bar").isTrue();
     }
 
     @Test
     public void testImageWithClaimedCompatibilityForFullPath() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("registry/repo/bar");
 
-        assertTrue(
-            "foo(registry/repo/bar) ~= registry/repo/bar",
-            subject.isCompatibleWith(DockerImageName.parse("registry/repo/bar"))
-        );
-        assertFalse("foo(registry/repo/bar) != repo/bar", subject.isCompatibleWith(DockerImageName.parse("repo/bar")));
-        assertFalse("foo(registry/repo/bar) != bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("registry/repo/bar")))
+            .as("foo(registry/repo/bar) ~= registry/repo/bar")
+            .isTrue();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("repo/bar")))
+            .as("foo(registry/repo/bar) != repo/bar")
+            .isFalse();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar")))
+            .as("foo(registry/repo/bar) != bar")
+            .isFalse();
     }
 
     @Test
     public void testImageWithClaimedCompatibilityForVersion() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar:1.2.3");
 
-        assertTrue("foo(bar:1.2.3) ~= bar", subject.isCompatibleWith(DockerImageName.parse("bar")));
-        assertTrue("foo(bar:1.2.3) ~= bar:1.2.3", subject.isCompatibleWith(DockerImageName.parse("bar:1.2.3")));
-        assertFalse("foo(bar:1.2.3) != bar:0.0.1", subject.isCompatibleWith(DockerImageName.parse("bar:0.0.1")));
-        assertFalse("foo(bar:1.2.3) != bar:2.0.0", subject.isCompatibleWith(DockerImageName.parse("bar:2.0.0")));
-        assertFalse("foo(bar:1.2.3) != bar:1.2.4", subject.isCompatibleWith(DockerImageName.parse("bar:1.2.4")));
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("foo(bar:1.2.3) ~= bar").isTrue();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar:1.2.3")))
+            .as("foo(bar:1.2.3) ~= bar:1.2.3")
+            .isTrue();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar:0.0.1")))
+            .as("foo(bar:1.2.3) != bar:0.0.1")
+            .isFalse();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar:2.0.0")))
+            .as("foo(bar:1.2.3) != bar:2.0.0")
+            .isFalse();
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("bar:1.2.4")))
+            .as("foo(bar:1.2.3) != bar:1.2.4")
+            .isFalse();
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index 98fd21064ed..b1a0cbc980f 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -4,9 +4,8 @@
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.rnorth.visibleassertions.VisibleAssertions;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Enclosed.class)
 public class DockerImageNameTest {
@@ -122,50 +121,35 @@ public void testParsing() {
                 canonicalName = unversionedPart + ":latest";
             }
 
-            VisibleAssertions.context("For " + combined);
-            VisibleAssertions.context("Using single-arg constructor:", 2);
-
             final DockerImageName imageName = DockerImageName.parse(combined);
-            assertEquals(combined + " has registry address: " + registry, registry, imageName.getRegistry());
-            assertEquals(
-                combined + " has unversioned part: " + unversionedPart,
-                unversionedPart,
-                imageName.getUnversionedPart()
-            );
+            assertThat(imageName.getRegistry()).as(combined + " has registry address: " + registry).isEqualTo(registry);
+            assertThat(imageName.getUnversionedPart())
+                .as(combined + " has unversioned part: " + unversionedPart)
+                .isEqualTo(unversionedPart);
             if (version != null) {
-                assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
+                assertThat(imageName.getVersionPart())
+                    .as(combined + " has version part: " + version)
+                    .isEqualTo(version);
             } else {
-                assertEquals(
-                    combined + " has automatic 'latest' version specified",
-                    "latest",
-                    imageName.getVersionPart()
-                );
+                assertThat(imageName.getVersionPart())
+                    .as(combined + " has automatic 'latest' version specified")
+                    .isEqualTo("latest");
             }
-            assertEquals(
-                combined + " has canonical name: " + canonicalName,
-                canonicalName,
-                imageName.asCanonicalNameString()
-            );
+            assertThat(imageName.asCanonicalNameString())
+                .as(combined + " has canonical name: " + canonicalName)
+                .isEqualTo(canonicalName);
 
             if (version != null) {
-                VisibleAssertions.context("Using two-arg constructor:", 2);
-
                 final DockerImageName imageNameFromSecondaryConstructor = new DockerImageName(unversionedPart, version);
-                assertEquals(
-                    combined + " has registry address: " + registry,
-                    registry,
-                    imageNameFromSecondaryConstructor.getRegistry()
-                );
-                assertEquals(
-                    combined + " has unversioned part: " + unversionedPart,
-                    unversionedPart,
-                    imageNameFromSecondaryConstructor.getUnversionedPart()
-                );
-                assertEquals(
-                    combined + " has version part: " + version,
-                    version,
-                    imageNameFromSecondaryConstructor.getVersionPart()
-                );
+                assertThat(imageNameFromSecondaryConstructor.getRegistry())
+                    .as(combined + " has registry address: " + registry)
+                    .isEqualTo(registry);
+                assertThat(imageNameFromSecondaryConstructor.getUnversionedPart())
+                    .as(combined + " has unversioned part: " + unversionedPart)
+                    .isEqualTo(unversionedPart);
+                assertThat(imageNameFromSecondaryConstructor.getVersionPart())
+                    .as(combined + " has version part: " + version)
+                    .isEqualTo(version);
             }
         }
     }
diff --git a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
index f7e319a5948..5c65d9e5841 100644
--- a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
@@ -6,8 +6,8 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class ImageNameSubstitutorTest {
 
@@ -48,11 +48,9 @@ public void simpleConfigurationTest() {
         final ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
 
         DockerImageName result = imageNameSubstitutor.apply(DockerImageName.parse("original"));
-        assertEquals(
-            "the image has been substituted by default then configured implementations",
-            "transformed-substituted-image:latest",
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("the image has been substituted by default then configured implementations")
+            .isEqualTo("transformed-substituted-image:latest");
     }
 
     @Test
@@ -62,10 +60,8 @@ public void testWorksWithoutConfiguredImplementation() {
         final ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
 
         DockerImageName result = imageNameSubstitutor.apply(DockerImageName.parse("original"));
-        assertEquals(
-            "the image has been substituted by default then configured implementations",
-            "substituted-image:latest",
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("the image has been substituted by default then configured implementations")
+            .isEqualTo("substituted-image:latest");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
index 99443221805..8631bf6de19 100644
--- a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
+++ b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
@@ -11,7 +11,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class LazyFutureTest {
 
@@ -26,16 +27,16 @@ protected Integer resolve() {
             }
         };
 
-        assertEquals("No resolve() invocations before get()", 0, counter.get());
-        assertEquals("get() call returns proper result", 1, lazyFuture.get());
-        assertEquals("resolve() was called only once after single get() call", 1, counter.get());
+        assertThat(counter).as("No resolve() invocations before get()").hasValue(0);
+        assertThat(lazyFuture.get()).as("get() call returns proper result").isEqualTo(1);
+        assertThat(counter).as("resolve() was called only once after single get() call").hasValue(1);
 
         counter.incrementAndGet();
-        assertEquals("result of resolve() must be cached", 1, lazyFuture.get());
+        assertThat(lazyFuture.get()).as("result of resolve() must be cached").isEqualTo(1);
     }
 
     @Test(timeout = 5_000)
-    public void timeoutWorks() throws Exception {
+    public void timeoutWorks() {
         Future<Void> lazyFuture = new LazyFuture<Void>() {
             @Override
             @SneakyThrows(InterruptedException.class)
@@ -45,8 +46,9 @@ protected Void resolve() {
             }
         };
 
-        assertThrows("Should timeout", TimeoutException.class, () -> lazyFuture.get(10, TimeUnit.MILLISECONDS));
-        pass("timeout works");
+        assertThat(catchThrowable(() -> lazyFuture.get(10, TimeUnit.MILLISECONDS)))
+            .as("Should timeout")
+            .isInstanceOf(TimeoutException.class);
     }
 
     @Test(timeout = 5_000)
@@ -77,6 +79,8 @@ protected Integer resolve() {
             latch.countDown();
         }
 
-        assertEquals("All threads receives the same result", Collections.nCopies(numOfThreads, 1), task.get());
+        assertThat(task.get())
+            .as("All threads receives the same result")
+            .isEqualTo(Collections.nCopies(numOfThreads, 1));
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/MountableFileTest.java b/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
index d3ff085c5de..fbfb537ef87 100644
--- a/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
+++ b/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
@@ -15,7 +15,7 @@
 import java.nio.file.Path;
 import java.util.function.Consumer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class MountableFileTest {
 
@@ -68,11 +68,10 @@ public void forHostPathWithSpaces() throws Exception {
 
         performChecks(mountableFile);
 
-        assertTrue("The resolved path contains the original space", mountableFile.getResolvedPath().contains(" "));
-        assertFalse(
-            "The resolved path does not contain an escaped space",
-            mountableFile.getResolvedPath().contains("\\ ")
-        );
+        assertThat(mountableFile.getResolvedPath()).as("The resolved path contains the original space").contains(" ");
+        assertThat(mountableFile.getResolvedPath())
+            .as("The resolved path does not contain an escaped space")
+            .doesNotContain("\\ ");
     }
 
     @Test
@@ -82,11 +81,10 @@ public void forHostPathWithPlus() throws Exception {
 
         performChecks(mountableFile);
 
-        assertTrue("The resolved path contains the original space", mountableFile.getResolvedPath().contains("+"));
-        assertFalse(
-            "The resolved path does not contain an escaped space",
-            mountableFile.getResolvedPath().contains(" ")
-        );
+        assertThat(mountableFile.getResolvedPath()).as("The resolved path contains the original space").contains("+");
+        assertThat(mountableFile.getResolvedPath())
+            .as("The resolved path does not contain an escaped space")
+            .doesNotContain(" ");
     }
 
     @Test
@@ -97,7 +95,7 @@ public void forClasspathResourceWithPermission() throws Exception {
         );
 
         performChecks(mountableFile);
-        assertEquals("Valid file mode.", BASE_FILE_MODE | TEST_FILE_MODE, mountableFile.getFileMode());
+        assertThat(mountableFile.getFileMode()).as("Valid file mode.").isEqualTo(BASE_FILE_MODE | TEST_FILE_MODE);
     }
 
     @Test
@@ -105,7 +103,7 @@ public void forHostFilePathWithPermission() throws Exception {
         final Path file = createTempFile("somepath");
         final MountableFile mountableFile = MountableFile.forHostPath(file.toString(), TEST_FILE_MODE);
         performChecks(mountableFile);
-        assertEquals("Valid file mode.", BASE_FILE_MODE | TEST_FILE_MODE, mountableFile.getFileMode());
+        assertThat(mountableFile.getFileMode()).as("Valid file mode.").isEqualTo(BASE_FILE_MODE | TEST_FILE_MODE);
     }
 
     @Test
@@ -113,7 +111,7 @@ public void forHostDirPathWithPermission() throws Exception {
         final Path dir = createTempDir();
         final MountableFile mountableFile = MountableFile.forHostPath(dir.toString(), TEST_FILE_MODE);
         performChecks(mountableFile);
-        assertEquals("Valid dir mode.", BASE_DIR_MODE | TEST_FILE_MODE, mountableFile.getFileMode());
+        assertThat(mountableFile.getFileMode()).as("Valid dir mode.").isEqualTo(BASE_DIR_MODE | TEST_FILE_MODE);
     }
 
     @Test
@@ -129,7 +127,7 @@ public void noTrailingSlashesInTarEntryNames() throws Exception {
 
         ArchiveEntry entry;
         while ((entry = tais.getNextEntry()) != null) {
-            assertFalse("no entries should have a trailing slash", entry.getName().endsWith("/"));
+            assertThat(entry.getName()).as("no entries should have a trailing slash").doesNotEndWith("/");
         }
     }
 
@@ -163,10 +161,9 @@ private Path createTempDir() throws IOException {
 
     private void performChecks(final MountableFile mountableFile) {
         final String mountablePath = mountableFile.getResolvedPath();
-        assertTrue("The filesystem path '" + mountablePath + "' can be found", new File(mountablePath).exists());
-        assertFalse(
-            "The filesystem path '" + mountablePath + "' does not contain any URL escaping",
-            mountablePath.contains("%20")
-        );
+        assertThat(new File(mountablePath)).as("The filesystem path '" + mountablePath + "' can be found").exists();
+        assertThat(mountablePath)
+            .as("The filesystem path '" + mountablePath + "' does not contain any URL escaping")
+            .doesNotContain("%20");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
index 211f8e00536..04786119e36 100644
--- a/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
@@ -3,11 +3,11 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
 public class PrefixingImageNameSubstitutorTest {
 
@@ -28,11 +28,9 @@ public void testHappyPath() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
-        assertEquals(
-            "The prefix is applied",
-            "someregistry.com/our-mirror/some/image:tag",
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is applied")
+            .isEqualTo("someregistry.com/our-mirror/some/image:tag");
     }
 
     @Test
@@ -42,7 +40,7 @@ public void hubIoRegistryIsNotChanged() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("docker.io/some/image:tag"));
 
-        assertEquals("The prefix is applied", "docker.io/some/image:tag", result.asCanonicalNameString());
+        assertThat(result.asCanonicalNameString()).as("The prefix is applied").isEqualTo("docker.io/some/image:tag");
     }
 
     @Test
@@ -52,7 +50,9 @@ public void hubComRegistryIsNotChanged() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("registry.hub.docker.com/some/image:tag"));
 
-        assertEquals("The prefix is applied", "registry.hub.docker.com/some/image:tag", result.asCanonicalNameString());
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is applied")
+            .isEqualTo("registry.hub.docker.com/some/image:tag");
     }
 
     @Test
@@ -62,11 +62,9 @@ public void thirdPartyRegistriesNotAffected() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("gcr.io/something/image:tag"));
 
-        assertEquals(
-            "The prefix is not applied if a third party registry is used",
-            "gcr.io/something/image:tag",
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is not applied if a third party registry is used")
+            .isEqualTo("gcr.io/something/image:tag");
     }
 
     @Test
@@ -76,11 +74,9 @@ public void testNoDoublePrefixing() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("someregistry.com/some/image:tag"));
 
-        assertEquals(
-            "The prefix is not applied if already present",
-            "someregistry.com/some/image:tag",
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is not applied if already present")
+            .isEqualTo("someregistry.com/some/image:tag");
     }
 
     @Test
@@ -90,11 +86,9 @@ public void testHandlesEmptyValue() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
-        assertEquals(
-            "The prefix is not applied if the env var is not set",
-            "some/image:tag",
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is not applied if the env var is not set")
+            .isEqualTo("some/image:tag");
     }
 
     @Test
@@ -104,7 +98,9 @@ public void testHandlesRegistryOnlyWithTrailingSlash() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
-        assertEquals("The prefix is applied", "someregistry.com/some/image:tag", result.asCanonicalNameString());
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is applied")
+            .isEqualTo("someregistry.com/some/image:tag");
     }
 
     @Test
@@ -114,11 +110,9 @@ public void testCombinesLiterallyForRegistryOnlyWithoutTrailingSlash() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
-        assertEquals(
-            "The prefix is applied",
-            "someregistry.comsome/image:tag", // treating the prefix literally, for predictability
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is applied")
+            .isEqualTo("someregistry.comsome/image:tag");
     }
 
     @Test
@@ -128,10 +122,8 @@ public void testCombinesLiterallyForBothPartsWithoutTrailingSlash() {
 
         final DockerImageName result = underTest.apply(DockerImageName.parse("some/image:tag"));
 
-        assertEquals(
-            "The prefix is applied",
-            "someregistry.com/our-mirrorsome/image:tag", // treating the prefix literally, for predictability
-            result.asCanonicalNameString()
-        );
+        assertThat(result.asCanonicalNameString())
+            .as("The prefix is applied")
+            .isEqualTo("someregistry.com/our-mirrorsome/image:tag");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index 4ddfad8454f..fea7f93ed5a 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -11,7 +11,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class RegistryAuthLocatorTest {
 
@@ -24,13 +24,11 @@ public void lookupAuthConfigWithoutCredentials() throws URISyntaxException {
             new AuthConfig()
         );
 
-        assertEquals(
-            "Default docker registry URL is set on auth config",
-            "https://index.docker.io/v1/",
-            authConfig.getRegistryAddress()
-        );
-        assertNull("No username is set", authConfig.getUsername());
-        assertNull("No password is set", authConfig.getPassword());
+        assertThat(authConfig.getRegistryAddress())
+            .as("Default docker registry URL is set on auth config")
+            .isEqualTo("https://index.docker.io/v1/");
+        assertThat(authConfig.getUsername()).as("No username is set").isNull();
+        assertThat(authConfig.getPassword()).as("No password is set").isNull();
     }
 
     @Test
@@ -42,13 +40,11 @@ public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException
             new AuthConfig()
         );
 
-        assertEquals(
-            "Default docker registry URL is set on auth config",
-            "https://registry.example.com",
-            authConfig.getRegistryAddress()
-        );
-        assertEquals("Username is set", "user", authConfig.getUsername());
-        assertEquals("Password is set", "pass", authConfig.getPassword());
+        assertThat(authConfig.getRegistryAddress())
+            .as("Default docker registry URL is set on auth config")
+            .isEqualTo("https://registry.example.com");
+        assertThat(authConfig.getUsername()).as("Username is set").isEqualTo("user");
+        assertThat(authConfig.getPassword()).as("Password is set").isEqualTo("pass");
     }
 
     @Test
@@ -60,13 +56,11 @@ public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
             new AuthConfig()
         );
 
-        assertEquals(
-            "Default docker registry URL is set on auth config",
-            "https://registry.example.com",
-            authConfig.getRegistryAddress()
-        );
-        assertEquals("Username is set", "_json_key", authConfig.getUsername());
-        assertNotNull("Password is set", authConfig.getPassword());
+        assertThat(authConfig.getRegistryAddress())
+            .as("Default docker registry URL is set on auth config")
+            .isEqualTo("https://registry.example.com");
+        assertThat(authConfig.getUsername()).as("Username is set").isEqualTo("_json_key");
+        assertThat(authConfig.getPassword()).as("Password is set").isNotNull();
     }
 
     @Test
@@ -78,9 +72,15 @@ public void lookupAuthConfigUsingStore() throws URISyntaxException {
             new AuthConfig()
         );
 
-        assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
-        assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
-        assertEquals("Correct secret is obtained from a credential store", "secret", authConfig.getPassword());
+        assertThat(authConfig.getRegistryAddress())
+            .as("Correct server URL is obtained from a credential store")
+            .isEqualTo("url");
+        assertThat(authConfig.getUsername())
+            .as("Correct username is obtained from a credential store")
+            .isEqualTo("username");
+        assertThat(authConfig.getPassword())
+            .as("Correct secret is obtained from a credential store")
+            .isEqualTo("secret");
     }
 
     @Test
@@ -92,9 +92,15 @@ public void lookupAuthConfigUsingHelper() throws URISyntaxException {
             new AuthConfig()
         );
 
-        assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
-        assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
-        assertEquals("Correct secret is obtained from a credential store", "secret", authConfig.getPassword());
+        assertThat(authConfig.getRegistryAddress())
+            .as("Correct server URL is obtained from a credential store")
+            .isEqualTo("url");
+        assertThat(authConfig.getUsername())
+            .as("Correct username is obtained from a credential store")
+            .isEqualTo("username");
+        assertThat(authConfig.getPassword())
+            .as("Correct secret is obtained from a credential store")
+            .isEqualTo("secret");
     }
 
     @Test
@@ -106,11 +112,9 @@ public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException {
             new AuthConfig()
         );
 
-        assertEquals(
-            "Correct identitytoken is obtained from a credential store",
-            "secret",
-            authConfig.getIdentitytoken()
-        );
+        assertThat(authConfig.getIdentitytoken())
+            .as("Correct identitytoken is obtained from a credential store")
+            .isEqualTo("secret");
     }
 
     @Test
@@ -122,9 +126,15 @@ public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
             new AuthConfig()
         );
 
-        assertEquals("Correct server URL is obtained from a credential store", "url", authConfig.getRegistryAddress());
-        assertEquals("Correct username is obtained from a credential store", "username", authConfig.getUsername());
-        assertEquals("Correct secret is obtained from a credential store", "secret", authConfig.getPassword());
+        assertThat(authConfig.getRegistryAddress())
+            .as("Correct server URL is obtained from a credential store")
+            .isEqualTo("url");
+        assertThat(authConfig.getUsername())
+            .as("Correct username is obtained from a credential store")
+            .isEqualTo("username");
+        assertThat(authConfig.getPassword())
+            .as("Correct secret is obtained from a credential store")
+            .isEqualTo("secret");
     }
 
     @Test
@@ -136,9 +146,15 @@ public void lookupNonEmptyAuthWithHelper() throws URISyntaxException {
             new AuthConfig()
         );
 
-        assertEquals("Correct server URL is obtained from a credential helper", "url", authConfig.getRegistryAddress());
-        assertEquals("Correct username is obtained from a credential helper", "username", authConfig.getUsername());
-        assertEquals("Correct password is obtained from a credential helper", "secret", authConfig.getPassword());
+        assertThat(authConfig.getRegistryAddress())
+            .as("Correct server URL is obtained from a credential helper")
+            .isEqualTo("url");
+        assertThat(authConfig.getUsername())
+            .as("Correct username is obtained from a credential helper")
+            .isEqualTo("username");
+        assertThat(authConfig.getPassword())
+            .as("Correct password is obtained from a credential helper")
+            .isEqualTo("secret");
     }
 
     @Test
@@ -152,17 +168,19 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException
         DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
         final AuthConfig authConfig = authLocator.lookupAuthConfig(dockerImageName, new AuthConfig());
 
-        assertNull("No username should have been obtained from a credential store", authConfig.getUsername());
-        assertNull("No secret should have been obtained from a credential store", authConfig.getPassword());
-        assertEquals("Should have one 'credentials not found' message discovered", 1, notFoundMessagesReference.size());
+        assertThat(authConfig.getUsername())
+            .as("No username should have been obtained from a credential store")
+            .isNull();
+        assertThat(authConfig.getPassword()).as("No secret should have been obtained from a credential store").isNull();
+        assertThat(notFoundMessagesReference.size())
+            .as("Should have one 'credentials not found' message discovered")
+            .isEqualTo(1);
 
         String discoveredMessage = notFoundMessagesReference.values().iterator().next();
 
-        assertEquals(
-            "Not correct message discovered",
-            "Fake credentials not found on credentials store 'https://not.a.real.registry/url'",
-            discoveredMessage
-        );
+        assertThat(discoveredMessage)
+            .as("Not correct message discovered")
+            .isEqualTo("Fake credentials not found on credentials store 'https://not.a.real.registry/url'");
     }
 
     @Test
@@ -172,7 +190,7 @@ public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException {
         DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
         final AuthConfig authConfig = authLocator.lookupAuthConfig(dockerImageName, new AuthConfig());
 
-        assertNull("CredStore field will be ignored, because value is blank", authConfig.getAuth());
+        assertThat(authConfig.getAuth()).as("CredStore field will be ignored, because value is blank").isNull();
     }
 
     @NotNull
diff --git a/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java b/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
index de97d100a39..4bd9e1b8edb 100644
--- a/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 03/07/2016.
@@ -11,21 +11,29 @@ public class TestEnvironmentTest {
 
     @Test
     public void testCompareVersionGreaterThanSameMajor() {
-        assertTrue("1.22 > 1.20", new ComparableVersion("1.22").compareTo(new ComparableVersion("1.20")) > 0);
+        assertThat(new ComparableVersion("1.22").compareTo(new ComparableVersion("1.20")) > 0)
+            .as("1.22 > 1.20")
+            .isTrue();
     }
 
     @Test
     public void testCompareVersionEqual() {
-        assertTrue("1.20 == 1.20", new ComparableVersion("1.20").compareTo(new ComparableVersion("1.20")) == 0);
+        assertThat(new ComparableVersion("1.20"))
+            .as("1.20 == 1.20")
+            .isEqualByComparingTo(new ComparableVersion("1.20"));
     }
 
     @Test
     public void testCompareVersionGreaterThan() {
-        assertTrue("2.10 > 1.20", new ComparableVersion("2.10").compareTo(new ComparableVersion("1.20")) > 0);
+        assertThat(new ComparableVersion("2.10").compareTo(new ComparableVersion("1.20")) > 0)
+            .as("2.10 > 1.20")
+            .isTrue();
     }
 
     @Test
     public void testCompareVersionIgnoresExcessLength() {
-        assertTrue("1.20 == 1.20.3", new ComparableVersion("1.20").compareTo(new ComparableVersion("1.20.3")) == 0);
+        assertThat(new ComparableVersion("1.20"))
+            .as("1.20 == 1.20.3")
+            .isEqualByComparingTo(new ComparableVersion("1.20.3"));
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index 56cbdb98a56..d51bc89348c 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -8,9 +8,7 @@
 import java.util.Properties;
 import java.util.UUID;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestcontainersConfigurationTest {
 
@@ -30,122 +28,102 @@ public void setUp() {
     @Test
     public void shouldSubstituteImageNamesFromClasspathProperties() {
         classpathProperties.setProperty("ryuk.container.image", "foo:version");
-        assertEquals(
-            "an image name can be pulled from classpath properties",
-            DockerImageName.parse("foo:version"),
-            newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any"))
-        );
+        assertThat(newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any")))
+            .as("an image name can be pulled from classpath properties")
+            .isEqualTo(DockerImageName.parse("foo:version"));
     }
 
     @Test
     public void shouldSubstituteImageNamesFromUserProperties() {
         userProperties.setProperty("ryuk.container.image", "foo:version");
-        assertEquals(
-            "an image name can be pulled from user properties",
-            DockerImageName.parse("foo:version"),
-            newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any"))
-        );
+        assertThat(newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any")))
+            .as("an image name can be pulled from user properties")
+            .isEqualTo(DockerImageName.parse("foo:version"));
     }
 
     @Test
     public void shouldSubstituteImageNamesFromEnvironmentVariables() {
         environment.put("TESTCONTAINERS_RYUK_CONTAINER_IMAGE", "foo:version");
-        assertEquals(
-            "an image name can be pulled from an environment variable",
-            DockerImageName.parse("foo:version"),
-            newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any"))
-        );
+        assertThat(newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any")))
+            .as("an image name can be pulled from an environment variable")
+            .isEqualTo(DockerImageName.parse("foo:version"));
     }
 
     @Test
     public void shouldApplySettingsInOrder() {
-        assertEquals(
-            "precedence order for multiple sources of the same value is correct",
-            "default",
-            newConfig().getEnvVarOrProperty("key", "default")
-        );
+        assertThat(newConfig().getEnvVarOrProperty("key", "default"))
+            .as("precedence order for multiple sources of the same value is correct")
+            .isEqualTo("default");
 
         classpathProperties.setProperty("key", "foo");
 
-        assertEquals(
-            "precedence order for multiple sources of the same value is correct",
-            "foo",
-            newConfig().getEnvVarOrProperty("key", "default")
-        );
+        assertThat(newConfig().getEnvVarOrProperty("key", "default"))
+            .as("precedence order for multiple sources of the same value is correct")
+            .isEqualTo("foo");
 
         userProperties.setProperty("key", "bar");
 
-        assertEquals(
-            "precedence order for multiple sources of the same value is correct",
-            "bar",
-            newConfig().getEnvVarOrProperty("key", "default")
-        );
+        assertThat(newConfig().getEnvVarOrProperty("key", "default"))
+            .as("precedence order for multiple sources of the same value is correct")
+            .isEqualTo("bar");
 
         environment.put("TESTCONTAINERS_KEY", "baz");
 
-        assertEquals(
-            "precedence order for multiple sources of the same value is correct",
-            "baz",
-            newConfig().getEnvVarOrProperty("key", "default")
-        );
+        assertThat(newConfig().getEnvVarOrProperty("key", "default"))
+            .as("precedence order for multiple sources of the same value is correct")
+            .isEqualTo("baz");
     }
 
     @Test
     public void shouldNotReadChecksFromClasspathProperties() {
-        assertFalse("checks enabled by default", newConfig().isDisableChecks());
+        assertThat(newConfig().isDisableChecks()).as("checks enabled by default").isFalse();
 
         classpathProperties.setProperty("checks.disable", "true");
-        assertFalse("checks are not affected by classpath properties", newConfig().isDisableChecks());
+        assertThat(newConfig().isDisableChecks()).as("checks are not affected by classpath properties").isFalse();
     }
 
     @Test
     public void shouldReadChecksFromUserProperties() {
-        assertFalse("checks enabled by default", newConfig().isDisableChecks());
+        assertThat(newConfig().isDisableChecks()).as("checks enabled by default").isFalse();
 
         userProperties.setProperty("checks.disable", "true");
-        assertTrue("checks disabled via user properties", newConfig().isDisableChecks());
+        assertThat(newConfig().isDisableChecks()).as("checks disabled via user properties").isTrue();
     }
 
     @Test
     public void shouldReadChecksFromEnvironment() {
-        assertFalse("checks enabled by default", newConfig().isDisableChecks());
+        assertThat(newConfig().isDisableChecks()).as("checks enabled by default").isFalse();
 
         userProperties.remove("checks.disable");
         environment.put("TESTCONTAINERS_CHECKS_DISABLE", "true");
-        assertTrue("checks disabled via env var", newConfig().isDisableChecks());
+        assertThat(newConfig().isDisableChecks()).as("checks disabled via env var").isTrue();
     }
 
     @Test
     public void shouldReadDockerSettingsFromEnvironmentWithoutTestcontainersPrefix() {
         userProperties.remove("docker.foo");
         environment.put("DOCKER_FOO", "some value");
-        assertEquals(
-            "reads unprefixed env vars for docker. settings",
-            "some value",
-            newConfig().getEnvVarOrUserProperty("docker.foo", "default")
-        );
+        assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
+            .as("reads unprefixed env vars for docker. settings")
+            .isEqualTo("some value");
     }
 
     @Test
     public void shouldNotReadDockerSettingsFromEnvironmentWithTestcontainersPrefix() {
         userProperties.remove("docker.foo");
         environment.put("TESTCONTAINERS_DOCKER_FOO", "some value");
-        assertEquals(
-            "reads unprefixed env vars for docker. settings",
-            "default",
-            newConfig().getEnvVarOrUserProperty("docker.foo", "default")
-        );
+        assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
+            .as("reads unprefixed env vars for docker. settings")
+            .isEqualTo("default");
     }
 
     @Test
     public void shouldReadDockerSettingsFromUserProperties() {
         environment.remove("DOCKER_FOO");
         userProperties.put("docker.foo", "some value");
-        assertEquals(
-            "reads unprefixed user properties for docker. settings",
-            "some value",
-            newConfig().getEnvVarOrUserProperty("docker.foo", "default")
-        );
+        assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
+            .as("reads unprefixed user properties for docker. settings")
+            .isEqualTo("some value");
     }
 
     @Test
@@ -153,104 +131,90 @@ public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
         String currentValue = newConfig().getDockerClientStrategyClassName();
 
         classpathProperties.setProperty("docker.client.strategy", UUID.randomUUID().toString());
-        assertEquals(
-            "Docker client strategy is not affected by classpath properties",
-            currentValue,
-            newConfig().getDockerClientStrategyClassName()
-        );
+        assertThat(newConfig().getDockerClientStrategyClassName())
+            .as("Docker client strategy is not affected by classpath properties")
+            .isEqualTo(currentValue);
     }
 
     @Test
     public void shouldReadDockerClientStrategyFromUserProperties() {
         userProperties.setProperty("docker.client.strategy", "foo");
-        assertEquals(
-            "Docker client strategy is changed by user property",
-            "foo",
-            newConfig().getDockerClientStrategyClassName()
-        );
+        assertThat(newConfig().getDockerClientStrategyClassName())
+            .as("Docker client strategy is changed by user property")
+            .isEqualTo("foo");
     }
 
     @Test
     public void shouldReadDockerClientStrategyFromEnvironment() {
         userProperties.remove("docker.client.strategy");
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "foo");
-        assertEquals(
-            "Docker client strategy is changed by env var",
-            "foo",
-            newConfig().getDockerClientStrategyClassName()
-        );
+        assertThat(newConfig().getDockerClientStrategyClassName())
+            .as("Docker client strategy is changed by env var")
+            .isEqualTo("foo");
     }
 
     @Test
     public void shouldNotUseImplicitDockerClientStrategyWhenDockerHostAndStrategyAreBothSet() {
         userProperties.put("docker.client.strategy", "foo");
         userProperties.put("docker.host", "tcp://1.2.3.4:5678");
-        assertEquals(
-            "Docker client strategy is can be explicitly set",
-            "foo",
-            newConfig().getDockerClientStrategyClassName()
-        );
+        assertThat(newConfig().getDockerClientStrategyClassName())
+            .as("Docker client strategy is can be explicitly set")
+            .isEqualTo("foo");
 
         userProperties.remove("docker.client.strategy");
 
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "bar");
         userProperties.put("docker.client.strategy", "foo");
-        assertEquals(
-            "Docker client strategy is can be explicitly set",
-            "bar",
-            newConfig().getDockerClientStrategyClassName()
-        );
+        assertThat(newConfig().getDockerClientStrategyClassName())
+            .as("Docker client strategy is can be explicitly set")
+            .isEqualTo("bar");
 
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "bar");
         userProperties.remove("docker.client.strategy");
-        assertEquals(
-            "Docker client strategy is can be explicitly set",
-            "bar",
-            newConfig().getDockerClientStrategyClassName()
-        );
+        assertThat(newConfig().getDockerClientStrategyClassName())
+            .as("Docker client strategy is can be explicitly set")
+            .isEqualTo("bar");
 
         environment.remove("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY");
         userProperties.put("docker.client.strategy", "foo");
-        assertEquals(
-            "Docker client strategy is can be explicitly set",
-            "foo",
-            newConfig().getDockerClientStrategyClassName()
-        );
+        assertThat(newConfig().getDockerClientStrategyClassName())
+            .as("Docker client strategy is can be explicitly set")
+            .isEqualTo("foo");
     }
 
     @Test
     public void shouldNotReadReuseFromClasspathProperties() {
-        assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
+        assertThat(newConfig().environmentSupportsReuse()).as("no reuse by default").isFalse();
 
         classpathProperties.setProperty("testcontainers.reuse.enable", "true");
-        assertFalse("reuse is not affected by classpath properties", newConfig().environmentSupportsReuse());
+        assertThat(newConfig().environmentSupportsReuse())
+            .as("reuse is not affected by classpath properties")
+            .isFalse();
     }
 
     @Test
     public void shouldReadReuseFromUserProperties() {
-        assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
+        assertThat(newConfig().environmentSupportsReuse()).as("no reuse by default").isFalse();
 
         userProperties.setProperty("testcontainers.reuse.enable", "true");
-        assertTrue("reuse enabled via user property", newConfig().environmentSupportsReuse());
+        assertThat(newConfig().environmentSupportsReuse()).as("reuse enabled via user property").isTrue();
     }
 
     @Test
     public void shouldReadReuseFromEnvironment() {
-        assertFalse("no reuse by default", newConfig().environmentSupportsReuse());
+        assertThat(newConfig().environmentSupportsReuse()).as("no reuse by default").isFalse();
 
         userProperties.remove("testcontainers.reuse.enable");
         environment.put("TESTCONTAINERS_REUSE_ENABLE", "true");
-        assertTrue("reuse enabled via env var", newConfig().environmentSupportsReuse());
+        assertThat(newConfig().environmentSupportsReuse()).as("reuse enabled via env var").isTrue();
     }
 
     @Test
     public void shouldTrimImageNames() {
         userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.2 ");
-        assertEquals(
-            "trailing whitespace was not removed from image name property",
-            "testcontainers/ryuk:0.3.2",
-            newConfig().getRyukImage()
-        );
+        assertThat(newConfig().getRyukImage())
+            .as("trailing whitespace was not removed from image name property")
+            .isEqualTo("testcontainers/ryuk:0.3.2");
     }
 
     private TestcontainersConfiguration newConfig() {
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 16f0d5bc598..72b943adc23 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,6 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
 
 test {
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index 59d92210549..2c5f4baef67 100644
--- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -7,7 +7,7 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // class {
 @Testcontainers
@@ -36,7 +36,7 @@ public void testSimplePutAndGet() {
         underTest.put("test", "example");
 
         String retrieved = underTest.get("test");
-        assertEquals("example", retrieved);
+        assertThat(retrieved).isEqualTo("example");
     }
 }
 // }
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
index d9f889a8943..e1f3c3efbe8 100644
--- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Disabled("This test class is deliberately invalid, as it relies on a non-existent local Redis")
 public class RedisBackedCacheIntTestStep0 {
@@ -22,6 +22,6 @@ public void testSimplePutAndGet() {
         underTest.put("test", "example");
 
         String retrieved = underTest.get("test");
-        assertEquals("example", retrieved);
+        assertThat(retrieved).isEqualTo("example");
     }
 }
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
index 47bf340e2eb..6c7a453c3e9 100644
--- a/examples/disque-job-queue/build.gradle
+++ b/examples/disque-job-queue/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java b/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
index 4da6201eecb..dfbab3f9e6a 100644
--- a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
+++ b/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
@@ -6,15 +6,13 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.context;
-import static org.rnorth.visibleassertions.VisibleAssertions.info;
 
 /**
  * Created by rnorth on 03/01/2016.
@@ -35,14 +33,11 @@ public class DisqueBackedMailSenderTest {
 
     @Before
     public void setup() {
-        context("");
         disqueClient = new DisqueClient(DisqueURI.create(container.getHost(), container.getMappedPort(7711)));
         mockMailApiClient = mock(MailApiClient.class);
 
         service = new DisqueBackedMailSenderService(disqueClient, mockMailApiClient);
 
-        info("Initialized a fresh Disque instance and service instance");
-
         dummyMessage1 = new MailMessage("Dummy Message 1", "bob@example.com", "Test body");
         dummyMessage2 = new MailMessage("Dummy Message 2", "bob@example.com", "Test body");
         dummyMessage3 = new MailMessage("Dummy Message 3", "bob@example.com", "Test body");
@@ -69,28 +64,23 @@ public void testRetryOnFailure() throws Exception {
         service.enqueueMessage(dummyMessage2);
         service.enqueueMessage(dummyMessage3);
 
-        info("Message 1 will fail to send on the first attempt");
         when(mockMailApiClient.send(eq(dummyMessage1))).thenThrow(MailApiClient.MailSendException.class).thenReturn(true);
         when(mockMailApiClient.send(eq(dummyMessage2))).thenReturn(true);
         when(mockMailApiClient.send(eq(dummyMessage3))).thenReturn(true);
 
         MailSenderService.Result result;
-        context("Simulating sending messages");
-        context("First sending attempt", 4);
+
         result = service.doScheduledSend();
-        assertEquals("2 messages were 'sent' successfully", 2, result.successfulCount);
-        assertEquals("1 messages failed", 1, result.failedCount);
+        assertThat(result.successfulCount).as("2 messages were 'sent' successfully").isEqualTo(2);
+        assertThat(result.failedCount).as("1 messages failed").isEqualTo(1);
 
-        context("Second attempt", 4);
         result = service.doScheduledSend();
-        assertEquals("1 message was 'sent' successfully", 1, result.successfulCount);
-        assertEquals("0 messages failed", 0, result.failedCount);
+        assertThat(result.successfulCount).as("1 message was 'sent' successfully").isEqualTo(1);
+        assertThat(result.failedCount).as("0 messages failed").isZero();
 
-        context("Third attempt", 4);
-        info("No messages should be due to send this time");
         result = service.doScheduledSend();
-        assertEquals("0 messages were 'sent' successfully", 0, result.successfulCount);
-        assertEquals("0 messages failed", 0, result.failedCount);
+        assertThat(result.successfulCount).as("0 messages were 'sent' successfully").isZero();
+        assertThat(result.failedCount).as("0 messages failed").isZero();
 
         verify(mockMailApiClient, times(2)).send(eq(dummyMessage1));
         verify(mockMailApiClient).send(eq(dummyMessage2));
diff --git a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java b/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
index 7ded5d8da43..09830614eb0 100644
--- a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
+++ b/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
@@ -11,10 +11,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
-import static org.rnorth.visibleassertions.VisibleAssertions.context;
-import static org.rnorth.visibleassertions.VisibleAssertions.info;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 03/01/2016.
@@ -29,54 +26,36 @@ public class SingleDisqueInstanceTest {
 
     @Before
     public void setup() {
-        context("");
         DisqueClient client = new DisqueClient(DisqueURI.create(container.getHost(), container.getMappedPort(7711)));
         connection = client.connect().sync();
         retryAfter1Second = AddJobArgs.builder().retry(1, TimeUnit.SECONDS).build();
-
-        info("Initialized a fresh Disque instance and client");
     }
 
     @Test
     public void testJobStoreAndRetrieve() {
-
-        info("Adding a job to the queue");
         connection.addjob("main_queue", "body", 1, TimeUnit.MINUTES);
 
-        info("Getting a job from the queue");
         Job<String, String> job = connection.getjob("main_queue");
 
-        assertEquals("The retrieved job is the same as the one that was added",
-                "body",
-                job.getBody());
+        assertThat(job.getBody()).as("The retrieved job is the same as the one that was added").isEqualTo("body");
 
-        info("Acknowledging the job to mark completion");
         connection.ackjob(job.getId());
     }
 
     @Test
     public void testFailureToAckJobBeforeTimeout() throws InterruptedException {
-
-        info("Adding a job to the queue");
         connection.addjob("main_queue", "body", 1, TimeUnit.MINUTES, retryAfter1Second);
 
-        info("Getting a job from the queue");
         Job<String, String> job = connection.getjob("main_queue");
 
-        assertEquals("The retrieved job is the same as the one that was added",
-                        "body",
-                        job.getBody());
+        assertThat(job.getBody()).as("The retrieved job is the same as the one that was added").isEqualTo("body");
 
-        info("Simulating a failure to ack the job before the timeout (1s)");
         TimeUnit.SECONDS.sleep(2);
 
-        info("Attempting to get another job from the queue - the RETRY setting for the job means it should have reappeared");
         // The timeout specified here is how long the command will wait for a job to appear
         Job<String, String> job2 = connection.getjob(5, TimeUnit.SECONDS, "main_queue");
 
-        assertNotNull("After re-getting the original job is back on the queue", job2);
-        assertEquals("The retrieved job is the same as the one that was added",
-                        "body",
-                        job2.getBody());
+        assertThat(job2).as("After re-getting the original job is back on the queue").isNotNull();
+        assertThat(job2.getBody()).as("The retrieved job is the same as the one that was added").isEqualTo("body");
     }
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 1e09fbc84f0..9d0fd118f61 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testng:testng:7.5'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
 
 test {
diff --git a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
index 927f097aa5f..e02b271f290 100644
--- a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
@@ -10,9 +10,7 @@
 
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Integration test for Redis-backed cache implementation.
@@ -45,18 +43,14 @@ public void testFindingAnInsertedValue() {
         cache.put("foo", "FOO");
         Optional<String> foundObject = cache.get("foo", String.class);
 
-        assertTrue("When an object in the cache is retrieved, it can be found",
-                        foundObject.isPresent());
-        assertEquals("When we put a String in to the cache and retrieve it, the value is the same",
-                        "FOO",
-                        foundObject.get());
+        assertThat(foundObject).as("When an object in the cache is retrieved, it can be found").isPresent();
+        assertThat(foundObject).as("When we put a String in to the cache and retrieve it, the value is the same").contains("FOO");
     }
 
     @Test
     public void testNotFindingAValueThatWasNotInserted() {
         Optional<String> foundObject = cache.get("bar", String.class);
 
-        assertFalse("When an object that's not in the cache is retrieved, nothing is found",
-                foundObject.isPresent());
+        assertThat(foundObject).as("When an object that's not in the cache is retrieved, nothing is found").isNotPresent();
     }
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 94f445f5ffe..c5f365b5502 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
index aa4199684e8..24a21723b15 100644
--- a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
@@ -9,9 +9,7 @@
 
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Integration test for Redis-backed cache implementation.
@@ -35,18 +33,14 @@ public void testFindingAnInsertedValue() {
         cache.put("foo", "FOO");
         Optional<String> foundObject = cache.get("foo", String.class);
 
-        assertTrue("When an object in the cache is retrieved, it can be found",
-                        foundObject.isPresent());
-        assertEquals("When we put a String in to the cache and retrieve it, the value is the same",
-                        "FOO",
-                        foundObject.get());
+        assertThat(foundObject.isPresent()).as("When an object in the cache is retrieved, it can be found").isTrue();
+        assertThat(foundObject.get()).as("When we put a String in to the cache and retrieve it, the value is the same").isEqualTo("FOO");
     }
 
     @Test
     public void testNotFindingAValueThatWasNotInserted() {
         Optional<String> foundObject = cache.get("bar", String.class);
 
-        assertFalse("When an object that's not in the cache is retrieved, nothing is found",
-                foundObject.isPresent());
+        assertThat(foundObject.isPresent()).as("When an object that's not in the cache is retrieved, nothing is found").isFalse();
     }
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 7677e82eefb..dc10798a060 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/selenium-container/src/test/java/SeleniumContainerTest.java b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
index c21d6bf4eca..32411b98ed9 100644
--- a/examples/selenium-container/src/test/java/SeleniumContainerTest.java
+++ b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
@@ -19,7 +19,7 @@
 import java.io.File;
 import java.util.List;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
 
 /**
@@ -45,7 +45,7 @@ public void simplePlainSeleniumTest() {
         driver.get("http://host.testcontainers.internal:" + port + "/foo.html");
         List<WebElement> hElement = driver.findElementsByTagName("h");
 
-        assertTrue("The h element is found", hElement != null && hElement.size() > 0);
+        assertThat(hElement).as("The h element is found").isNotEmpty();
     }
 
     public static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
diff --git a/examples/settings.gradle b/examples/settings.gradle
index cfb204f4b00..be455a78955 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -32,7 +32,6 @@ include 'solr-container'
 include 'spring-boot'
 include 'cucumber'
 include 'spring-boot-kotlin-redis'
-include 'spock'
 
 ext.isCI = System.getenv("CI") != null
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index fd603d515c7..89f067d3a19 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,5 +15,5 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
index 0f4e6d672d8..fff6e1a4a3a 100644
--- a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
@@ -8,8 +8,7 @@
 
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class BarConcreteTestClass extends AbstractIntegrationTest {
 
@@ -27,8 +26,8 @@ public void testInsertValue() {
         cache.put("bar", "BAR");
         Optional<String> foundObject = cache.get("bar", String.class);
 
-        assertTrue("When inserting an object into the cache, it can be retrieved", foundObject.isPresent());
-        assertEquals("When accessing the value of a retrieved object, the value must be the same", "BAR", foundObject.get());
+        assertThat(foundObject).as("When inserting an object into the cache, it can be retrieved").isPresent();
+        assertThat(foundObject).as("When accessing the value of a retrieved object, the value must be the same").contains("BAR");
     }
 
 }
diff --git a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
index 3a9e4e84f04..11ad98a0580 100644
--- a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
@@ -8,15 +8,14 @@
 
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class FooConcreteTestClass extends AbstractIntegrationTest {
 
     private Cache cache;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "foo");
@@ -27,7 +26,7 @@ public void testInsertValue() {
         cache.put("foo", "FOO");
         Optional<String> foundObject = cache.get("foo", String.class);
 
-        assertTrue("When inserting an object into the cache, it can be retrieved", foundObject.isPresent());
-        assertEquals("When accessing the value of a retrieved object, the value must be the same", "FOO", foundObject.get());
+        assertThat(foundObject).as("When inserting an object into the cache, it can be retrieved").isPresent();
+        assertThat(foundObject).as("When accessing the value of a retrieved object, the value must be the same").contains("FOO");
     }
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index abb7c12e0ed..56fd297cf5e 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,6 +14,6 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 
 }
diff --git a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
index 49f8cf99f33..6443a19b869 100644
--- a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
+++ b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 
 import static com.example.SolrSearchEngine.COLLECTION_NAME;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class SolrQueryTest {
 
@@ -55,8 +55,8 @@ public void testQueryForShoes() {
         SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
 
         SearchResult result = searchEngine.search("shoes");
-        assertEquals("When searching for shoes we expect one result", 1L, result.getTotalHits());
-        assertEquals("The result should have the id 1", "1", result.getResults().get(0).get("id"));
+        assertThat(result.getTotalHits()).as("When searching for shoes we expect one result").isEqualTo(1L);
+        assertThat(result.getResults().get(0).get("id")).as("The result should have the id 1").isEqualTo("1");
     }
 
     @Test
@@ -64,8 +64,8 @@ public void testQueryForTShirt() {
         SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
 
         SearchResult result = searchEngine.search("t-shirt");
-        assertEquals("When searching for t-shirt we expect one result", 1L, result.getTotalHits());
-        assertEquals("The result should have the id 2", "2", result.getResults().get(0).get("id"));
+        assertThat(result.getTotalHits()).as("When searching for t-shirt we expect one result").isEqualTo(1L);
+        assertThat(result.getResults().get(0).get("id")).as("The result should have the id 2").isEqualTo("2");
     }
 
     @Test
@@ -73,7 +73,7 @@ public void testQueryForAsterisk() {
         SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
 
         SearchResult result = searchEngine.search("*");
-        assertEquals("When searching for * we expect no results", 0L, result.getTotalHits());
+        assertThat(result.getTotalHits()).as("When searching for * we expect no results").isEqualTo(0L);
     }
 
     private static SolrInputField createInputField(String key, String value) {
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index e3b3376e28f..650b5a60d98 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,5 +17,4 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java b/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
index 286ce41ffbf..c305ae67811 100644
--- a/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
+++ b/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
@@ -4,8 +4,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.info;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DemoControllerTest extends AbstractIntegrationTest {
 
@@ -19,10 +18,9 @@ public class DemoControllerTest extends AbstractIntegrationTest {
     public void simpleTest() {
         String fooResource = "/foo";
 
-        info("putting 'bar' to " + fooResource);
         restTemplate.put(fooResource, "bar");
 
-        assertEquals("value is set", "bar", restTemplate.getForObject(fooResource, String.class));
+        assertThat(restTemplate.getForObject(fooResource, String.class)).as("value is set").isEqualTo("bar");
     }
 
     @Test
@@ -33,7 +31,7 @@ public void simpleJPATest() {
 
         DemoEntity result = restTemplate.getForObject("/" + demoEntity.getId(), DemoEntity.class);
 
-        assertEquals("value is set", "Some value", result.getValue());
+        assertThat(result.getValue()).as("value is set").isEqualTo("Some value");
     }
 
 }
diff --git a/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
index 37422b30af7..140bd64c39a 100644
--- a/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
@@ -4,7 +4,6 @@
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.models.CosmosContainerResponse;
 import com.azure.cosmos.models.CosmosDatabaseResponse;
-import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -17,6 +16,8 @@
 import java.security.KeyStore;
 import java.util.Properties;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class CosmosDBEmulatorContainerTest {
 
     private static Properties originalSystemProperties;
@@ -64,12 +65,12 @@ public void testWithCosmosClient() throws Exception {
         // }
         // testWithClientAgainstEmulatorContainer {
         CosmosDatabaseResponse databaseResponse = client.createDatabaseIfNotExists("Azure").block();
-        Assertions.assertThat(databaseResponse.getStatusCode()).isEqualTo(201);
+        assertThat(databaseResponse.getStatusCode()).isEqualTo(201);
         CosmosContainerResponse containerResponse = client
             .getDatabase("Azure")
             .createContainerIfNotExists("ServiceContainer", "/name")
             .block();
-        Assertions.assertThat(containerResponse.getStatusCode()).isEqualTo(201);
+        assertThat(containerResponse.getStatusCode()).isEqualTo(201);
         // }
     }
 }
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 914ee7efbd4..9f7df373b27 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -6,4 +6,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
index 2f6edcc722d..8f81c88bfc0 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -11,7 +11,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Parameterized.class)
 public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
@@ -38,7 +38,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
 
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 }
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index fb9f53189d9..80763e312b5 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'org.postgresql:postgresql:42.4.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 87e82fb30e3..65c79441f32 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -10,9 +10,7 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
     static {
@@ -28,7 +26,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(cockroach, "SELECT 1");
 
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -43,7 +41,7 @@ public void testExplicitInitScript() throws SQLException {
             ResultSet resultSet = performQuery(cockroach, "SELECT foo FROM bar");
 
             String firstColumnValue = resultSet.getString(1);
-            assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+            assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
         }
     }
 
@@ -56,10 +54,10 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         try {
             cockroach.start();
             String jdbcUrl = cockroach.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("sslmode=disable"));
-            assertThat(jdbcUrl, containsString("application_name=cockroach"));
+            assertThat(jdbcUrl).contains("?");
+            assertThat(jdbcUrl).contains("&");
+            assertThat(jdbcUrl).contains("sslmode=disable");
+            assertThat(jdbcUrl).contains("application_name=cockroach");
         } finally {
             cockroach.stop();
         }
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index bc9476cc83d..99ebb69a1e8 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -1,13 +1,13 @@
 package org.testcontainers.ext;
 
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 public class ScriptSplittingTest {
 
@@ -283,7 +283,7 @@ public void testIssue1452Case() {
 
     private void splitAndCompare(String script, List<String> expected) {
         final List<String> statements = doSplit(script);
-        Assertions.assertThat(statements).isEqualTo(expected);
+        assertThat(statements).isEqualTo(expected);
     }
 
     private List<String> doSplit(String script) {
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 0c8cd323779..804f51000d7 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.ibm.db2:jcc:11.5.7.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 8f3489eae95..2c2c4cb2f09 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -8,9 +8,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class SimpleDb2Test extends AbstractContainerDatabaseTest {
 
@@ -22,7 +20,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
 
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -36,7 +34,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
             db2.start();
 
             String jdbcUrl = db2.getJdbcUrl();
-            assertThat(jdbcUrl, containsString(":sslConnection=false;"));
+            assertThat(jdbcUrl).contains(":sslConnection=false;");
         }
     }
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 5b9ff919da7..6abd9cd943a 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -5,6 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'
-
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
index ced5931de31..10e02566d16 100644
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
@@ -13,8 +13,7 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DynaliteContainerTest {
 
@@ -54,12 +53,10 @@ private void runTest(AmazonDynamoDB client) {
 
         final TableDescription tableDescription = client.describeTable("foo").getTable();
 
-        assertNotNull("the description is not null", tableDescription);
-        assertEquals("the table has the right name", "foo", tableDescription.getTableName());
-        assertEquals(
-            "the name has the right primary key",
-            "Name",
-            tableDescription.getKeySchema().get(0).getAttributeName()
-        );
+        assertThat(tableDescription).as("the description is not null").isNotNull();
+        assertThat(tableDescription.getTableName()).as("the table has the right name").isEqualTo("foo");
+        assertThat(tableDescription.getKeySchema().get(0).getAttributeName())
+            .as("the name has the right primary key")
+            .isEqualTo("Name");
     }
 }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a3a47d11fab..0e6c5bd7b5d 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.3.3"
     testImplementation "org.elasticsearch.client:transport:7.17.5"
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 9fcfc45af76..1e1e70b5d75 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -29,10 +29,8 @@
 
 import javax.net.ssl.SSLHandshakeException;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class ElasticsearchContainerTest {
 
@@ -84,14 +82,14 @@ public void elasticsearchDeprecatedCtorTest() throws IOException {
 
             // Do whatever you want with the rest client ...
             Response response = getClient(container).performRequest(new Request("GET", "/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_VERSION));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains(ELASTICSEARCH_VERSION);
 
             // The default image is running with the features under Elastic License
             response = getClient(container).performRequest(new Request("GET", "/_xpack/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
             // For now we test that we have the monitoring feature available
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("monitoring"));
+            assertThat(EntityUtils.toString(response.getEntity())).contains("monitoring");
         }
     }
 
@@ -106,14 +104,14 @@ public void elasticsearchDefaultTest() throws IOException {
 
             // Do whatever you want with the rest client ...
             Response response = getClient(container).performRequest(new Request("GET", "/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_VERSION));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains(ELASTICSEARCH_VERSION);
 
             // The default image is running with the features under Elastic License
             response = getClient(container).performRequest(new Request("GET", "/_xpack/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
             // For now we test that we have the monitoring feature available
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("monitoring"));
+            assertThat(EntityUtils.toString(response.getEntity())).contains("monitoring");
         }
     }
 
@@ -126,16 +124,14 @@ public void elasticsearchSecuredTest() throws IOException {
             container.start();
 
             // The cluster should be secured so it must fail when we try to access / without credentials
-            assertThrows(
-                "We should not be able to access / URI with an anonymous client.",
-                ResponseException.class,
-                () -> getAnonymousClient(container).performRequest(new Request("GET", "/"))
-            );
+            assertThat(catchThrowable(() -> getAnonymousClient(container).performRequest(new Request("GET", "/"))))
+                .as("We should not be able to access / URI with an anonymous client.")
+                .isInstanceOf(ResponseException.class);
 
             // But it should work when we try to access / with the proper login and password
             Response response = getClient(container).performRequest(new Request("GET", "/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString(ELASTICSEARCH_VERSION));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains(ELASTICSEARCH_VERSION);
         }
     }
 
@@ -144,9 +140,9 @@ public void elasticsearchVersion() throws IOException {
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
             String responseAsString = EntityUtils.toString(response.getEntity());
-            assertThat(responseAsString, containsString(ELASTICSEARCH_VERSION));
+            assertThat(responseAsString).contains(ELASTICSEARCH_VERSION);
         }
     }
 
@@ -159,8 +155,8 @@ public void elasticsearchVersion83() throws IOException {
         ) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("8.3.0"));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("8.3.0");
         }
     }
 
@@ -177,13 +173,11 @@ public void elasticsearchOssImage() throws IOException {
         ) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
             // The OSS image does not have any feature under Elastic License
-            assertThrows(
-                "We should not have /_xpack endpoint with an OSS License",
-                ResponseException.class,
-                () -> getClient(container).performRequest(new Request("GET", "/_xpack/"))
-            );
+            assertThat(catchThrowable(() -> getClient(container).performRequest(new Request("GET", "/_xpack/"))))
+                .as("We should not have /_xpack endpoint with an OSS License")
+                .isInstanceOf(ResponseException.class);
         }
     }
 
@@ -212,8 +206,8 @@ public void restClientClusterHealth() throws IOException {
 
             Response response = client.performRequest(new Request("GET", "/_cluster/health"));
             // }}
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
             // httpClientContainer {{
         }
         // }
@@ -248,8 +242,8 @@ public void restClientSecuredClusterHealth() throws IOException {
 
             Response response = client.performRequest(new Request("GET", "/_cluster/health"));
             // }}
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
             // httpClientSecuredContainer {{
         }
         // }
@@ -275,7 +269,7 @@ public void transportClientClusterHealth() {
                 ClusterHealthResponse healths = transportClient.admin().cluster().prepareHealth().get();
                 String clusterName = healths.getClusterName();
                 // }}}
-                assertThat(clusterName, is(expectedClusterName));
+                assertThat(clusterName).isEqualTo(expectedClusterName);
                 // transportClientContainer {{{
             }
         }
@@ -285,18 +279,18 @@ public void transportClientClusterHealth() {
     @Test
     public void incompatibleSettingsTest() {
         // The OSS image can not use security feature
-        assertThrows(
-            "We should not be able to activate security with an OSS License",
-            IllegalArgumentException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 new ElasticsearchContainer(
                     DockerImageName
                         .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
                         .withTag(ELASTICSEARCH_VERSION)
                 )
                     .withPassword("foo");
-            }
-        );
+            })
+        )
+            .as("We should not be able to activate security with an OSS License")
+            .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
@@ -310,8 +304,8 @@ public void testElasticsearch8SecureByDefault() throws Exception {
             container.start();
 
             Response response = getClusterHealth(container);
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
         }
     }
 
@@ -329,11 +323,11 @@ public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exceptio
             container.start();
 
             // this is expected, as a different cert is used for creating the SSL context
-            assertThrows(
-                "PKIX path validation failed: java.security.cert.CertPathValidatorException: Path does not chain with any of the trust anchors",
-                SSLHandshakeException.class,
-                () -> getClusterHealth(container)
-            );
+            assertThat(catchThrowable(() -> getClusterHealth(container)))
+                .as(
+                    "PKIX path validation failed: java.security.cert.CertPathValidatorException: Path does not chain with any of the trust anchors"
+                )
+                .isInstanceOf(SSLHandshakeException.class);
         }
     }
 
@@ -357,8 +351,8 @@ public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception
             container.start();
 
             Response response = getClusterHealth(container);
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
         }
     }
 
@@ -376,8 +370,8 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
             container.start();
 
             Response response = getClient(container).performRequest(new Request("GET", "/_cluster/health"));
-            assertThat(response.getStatusLine().getStatusCode(), is(200));
-            assertThat(EntityUtils.toString(response.getEntity()), containsString("cluster_name"));
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
         }
     }
 
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1651517dece..8336cfd8249 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,6 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.11")
+    testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
index fe119854c80..3a3f2d13bb7 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
@@ -11,7 +11,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 public class ContainerWithCustomConfigIT {
 
@@ -33,13 +33,11 @@ void test() throws Exception {
 
             publisher.connect();
 
-            assertThrows(
-                MqttSessionExpiredException.class,
-                () -> {
+            assertThatExceptionOfType(MqttSessionExpiredException.class)
+                .isThrownBy(() -> {
                     // this should fail since only QoS 0 is allowed by the configuration
                     publisher.publishWith().topic("test/topic").qos(MqttQos.EXACTLY_ONCE).send();
-                }
-            );
+                });
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
index 75d308e3f90..fde18e09285 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
@@ -24,8 +24,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ContainerWithoutPlatformExtensionsIT {
 
@@ -61,13 +60,13 @@ public void removeAllPlatformExtensions() throws InterruptedException {
             client.subscribeWith().topicFilter("extensions").send();
 
             final Mqtt5Publish receive = publishes.receive();
-            assertTrue(receive.getPayload().isPresent());
+            assertThat(receive.getPayload()).isPresent();
             final String extensionInfo = new String(receive.getPayloadAsBytes());
 
-            assertFalse(extensionInfo.contains("hivemq-allow-all-extension"));
-            assertFalse(extensionInfo.contains("hivemq-kafka-extension"));
-            assertFalse(extensionInfo.contains("hivemq-bridge-extension"));
-            assertFalse(extensionInfo.contains("hivemq-enterprise-security-extension"));
+            assertThat(extensionInfo).doesNotContain("hivemq-allow-all-extension");
+            assertThat(extensionInfo).doesNotContain("hivemq-kafka-extension");
+            assertThat(extensionInfo).doesNotContain("hivemq-bridge-extension");
+            assertThat(extensionInfo).doesNotContain("hivemq-enterprise-security-extension");
 
             hivemq.start();
         }
@@ -96,13 +95,13 @@ public void removeKafkaExtension() throws InterruptedException {
             client.subscribeWith().topicFilter("extensions").send();
 
             final Mqtt5Publish receive = publishes.receive();
-            assertTrue(receive.getPayload().isPresent());
+            assertThat(receive.getPayload().isPresent()).isTrue();
             final String extensionInfo = new String(receive.getPayloadAsBytes());
 
-            assertTrue(extensionInfo.contains("hivemq-allow-all-extension"));
-            assertFalse(extensionInfo.contains("hivemq-kafka-extension"));
-            assertTrue(extensionInfo.contains("hivemq-bridge-extension"));
-            assertTrue(extensionInfo.contains("hivemq-enterprise-security-extension"));
+            assertThat(extensionInfo).contains("hivemq-allow-all-extension");
+            assertThat(extensionInfo).doesNotContain("hivemq-kafka-extension");
+            assertThat(extensionInfo).contains("hivemq-bridge-extension");
+            assertThat(extensionInfo).contains("hivemq-enterprise-security-extension");
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
index 191ea41f303..cd83cb8a10d 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -22,15 +22,15 @@
 import java.nio.file.Files;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CreateFileInCopiedDirectoryIT {
 
     private @NotNull MountableFile createDirectory() throws IOException {
         final File directory = new File(Files.createTempDirectory("").toFile(), "directory");
-        assertTrue(directory.mkdir());
+        assertThat(directory.mkdir()).isTrue();
         final File subdirectory = new File(directory, "sub-directory");
-        assertTrue(subdirectory.mkdir());
+        assertThat(subdirectory.mkdir()).isTrue();
         return MountableFile.forHostPath(directory.getPath());
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
index 9588e3404e6..a2ee9edfbcf 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
@@ -10,7 +10,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 public class DisableEnableExtensionFromDirectoryIT {
 
@@ -27,10 +27,8 @@ void test() throws Exception {
 
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension("Modifier Extension", "modifier-extension");
-            assertThrows(
-                ExecutionException.class,
-                () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost())
-            );
+            assertThatExceptionOfType(ExecutionException.class)
+                .isThrownBy(() -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension("Modifier Extension", "modifier-extension");
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
index e50664f240e..361af190a57 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
@@ -11,7 +11,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 public class DisableEnableExtensionIT {
 
@@ -35,17 +35,13 @@ void test() throws Exception {
         ) {
             hivemq.start();
 
-            assertThrows(
-                ExecutionException.class,
-                () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost())
-            );
+            assertThatExceptionOfType(ExecutionException.class)
+                .isThrownBy(() -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension(hiveMQExtension);
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension(hiveMQExtension);
-            assertThrows(
-                ExecutionException.class,
-                () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost())
-            );
+            assertThatExceptionOfType(ExecutionException.class)
+                .isThrownBy(() -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension(hiveMQExtension);
             TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
index 08e1df797a1..38b8e918925 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQExtensionTest.java
@@ -2,15 +2,13 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 class HiveMQExtensionTest {
 
     @Test
     void builder_classDoesNotImplementExtensionMain_exception() {
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> HiveMQExtension.builder().mainClass(HiveMQExtensionTest.class)
-        );
+        assertThatExceptionOfType(IllegalArgumentException.class)
+            .isThrownBy(() -> HiveMQExtension.builder().mainClass(HiveMQExtensionTest.class));
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
index d4dd2be9621..32097e52641 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
@@ -10,8 +10,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 class HiveMQTestContainerCore {
 
@@ -24,69 +24,72 @@ class HiveMQTestContainerCore {
     @Test
     void withExtension_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(ContainerLaunchException.class, () -> container.withExtension(mountableFile));
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withExtension(mountableFile));
     }
 
     @Test
     void withExtension_fileNoDirectory_Exception() throws IOException {
         final File extension = new File(tempDir, "extension");
-        assertTrue(extension.createNewFile());
+        assertThat(extension.createNewFile()).isTrue();
         final MountableFile mountableFile = MountableFile.forHostPath(extension.getAbsolutePath());
-        assertThrows(ContainerLaunchException.class, () -> container.withExtension(mountableFile));
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withExtension(mountableFile));
     }
 
     @Test
     void withLicense_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(ContainerLaunchException.class, () -> container.withLicense(mountableFile));
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withLicense(mountableFile));
     }
 
     @Test
     void withExtension_fileEndingWrong_Exception() throws IOException {
         final File extension = new File(tempDir, "extension.wrong");
-        assertTrue(extension.createNewFile());
+        assertThat(extension.createNewFile()).isTrue();
         final MountableFile mountableFile = MountableFile.forHostPath(extension.getAbsolutePath());
-        assertThrows(ContainerLaunchException.class, () -> container.withLicense(mountableFile));
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withLicense(mountableFile));
     }
 
     @Test
     void withHiveMQConfig_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(ContainerLaunchException.class, () -> container.withHiveMQConfig(mountableFile));
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withHiveMQConfig(mountableFile));
     }
 
     @Test
     void withFileInHomeFolder_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(ContainerLaunchException.class, () -> container.withFileInHomeFolder(mountableFile, "some/path"));
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withFileInHomeFolder(mountableFile, "some/path"));
     }
 
     @Test
     void withFileInHomeFolder_pathEmpty_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(ContainerLaunchException.class, () -> container.withFileInHomeFolder(mountableFile, ""));
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withFileInHomeFolder(mountableFile, ""));
     }
 
     @Test
     void withFileInExtensionHomeFolder_withPath_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(
-            ContainerLaunchException.class,
-            () -> container.withFileInExtensionHomeFolder(mountableFile, "my-extension", "some/path")
-        );
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> container.withFileInExtensionHomeFolder(mountableFile, "my-extension", "some/path"));
     }
 
     @Test
     void withFileInExtensionHomeFolder_fileDoesNotExist_Exception() {
         final MountableFile mountableFile = MountableFile.forHostPath("/this/does/not/exist");
-        assertThrows(
-            ContainerLaunchException.class,
-            () -> {
+        assertThatExceptionOfType(ContainerLaunchException.class)
+            .isThrownBy(() -> {
                 final HiveMQContainer hiveMQContainer = container.withFileInExtensionHomeFolder(
                     mountableFile,
                     "my-extension"
                 );
-            }
-        );
+            });
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java
index f1e060e68d9..d845acb6684 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/PathUtilTest.java
@@ -2,42 +2,42 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class PathUtilTest {
 
     @Test
     void prepareInnerPath_emptyString() {
-        assertEquals("/", PathUtil.prepareInnerPath(""));
+        assertThat(PathUtil.prepareInnerPath("")).isEqualTo("/");
     }
 
     @Test
     void prepareInnerPath_onlyDelimiter() {
-        assertEquals("/", PathUtil.prepareInnerPath("/"));
+        assertThat(PathUtil.prepareInnerPath("/")).isEqualTo("/");
     }
 
     @Test
     void prepareInnerPath_noDelimiter() {
-        assertEquals("/path/", PathUtil.prepareInnerPath("path"));
+        assertThat(PathUtil.prepareInnerPath("path")).isEqualTo("/path/");
     }
 
     @Test
     void prepareInnerPath_delimiterAtEnd() {
-        assertEquals("/path/", PathUtil.prepareInnerPath("path/"));
+        assertThat(PathUtil.prepareInnerPath("path/")).isEqualTo("/path/");
     }
 
     @Test
     void prepareInnerPath_delimiterAtBeginning() {
-        assertEquals("/path/", PathUtil.prepareInnerPath("/path"));
+        assertThat(PathUtil.prepareInnerPath("/path")).isEqualTo("/path/");
     }
 
     @Test
     void prepareAppendPath_delimiterAtBeginning_noChange() {
-        assertEquals("/path", PathUtil.prepareAppendPath("/path"));
+        assertThat(PathUtil.prepareAppendPath("/path")).isEqualTo("/path");
     }
 
     @Test
     void prepareAppendPath_delimiterAtBeginning_delimiterAdded() {
-        assertEquals("/path", PathUtil.prepareAppendPath("path"));
+        assertThat(PathUtil.prepareAppendPath("path")).isEqualTo("/path");
     }
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 0d8e2abedf9..f8b55d01bc5 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -9,10 +9,7 @@ dependencies {
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
-    api('org.rnorth.visible-assertions:visible-assertions:2.1.2') {
-        // Excluded in favor of jna-platform
-        exclude(group: "net.java.dev.jna", module: "jna")
-    }
+    api 'org.assertj:assertj-core:3.23.1'
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     api 'org.vibur:vibur-dbcp:25.0'
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index 5566db6244e..a152a1ae550 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -14,9 +14,8 @@
 import java.sql.Statement;
 import java.util.EnumSet;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class AbstractJDBCDriverTest {
 
@@ -82,12 +81,12 @@ private void performSimpleTest(HikariDataSource dataSource) throws SQLException
                 rs -> {
                     rs.next();
                     int resultSetInt = rs.getInt(1);
-                    assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+                    assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
                     return true;
                 }
             );
 
-        assertTrue("The database returned a record as expected", result);
+        assertThat(result).as("The database returned a record as expected").isTrue();
     }
 
     private void performTestForScriptedSchema(HikariDataSource dataSource) throws SQLException {
@@ -97,16 +96,14 @@ private void performTestForScriptedSchema(HikariDataSource dataSource) throws SQ
                 rs -> {
                     rs.next();
                     String resultSetString = rs.getString(1);
-                    assertEquals(
-                        "A basic SELECT query succeeds where the schema has been applied from a script",
-                        "hello world",
-                        resultSetString
-                    );
+                    assertThat(resultSetString)
+                        .as("A basic SELECT query succeeds where the schema has been applied from a script")
+                        .isEqualTo("hello world");
                     return true;
                 }
             );
 
-        assertTrue("The database returned a record as expected", result);
+        assertThat(result).as("The database returned a record as expected").isTrue();
     }
 
     private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQLException {
@@ -120,12 +117,12 @@ private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQ
                     if (resultUser.endsWith("@%")) {
                         resultUser = resultUser.substring(0, resultUser.length() - 2);
                     }
-                    assertEquals("User from query param is created.", "someuser", resultUser);
+                    assertThat(resultUser).as("User from query param is created.").isEqualTo("someuser");
                     return true;
                 }
             );
 
-        assertTrue("The database returned a record as expected", result);
+        assertThat(result).as("The database returned a record as expected").isTrue();
 
         String databaseQuery = "SELECT DATABASE()";
         // Postgres does not have Database() as a function
@@ -145,12 +142,12 @@ private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQ
                     rs -> {
                         rs.next();
                         String resultDB = rs.getString(1);
-                        assertEquals("Database name from URL String is used.", "databasename", resultDB);
+                        assertThat(resultDB).as("Database name from URL String is used.").isEqualTo("databasename");
                         return true;
                     }
                 );
 
-        assertTrue("The database returned a record as expected", result);
+        assertThat(result).as("The database returned a record as expected").isTrue();
     }
 
     private void performTestForCharacterEncodingForInitialScriptConnection(HikariDataSource dataSource)
@@ -161,16 +158,14 @@ private void performTestForCharacterEncodingForInitialScriptConnection(HikariDat
                 rs -> {
                     rs.next();
                     String resultSetString = rs.getString(1);
-                    assertEquals(
-                        "A SELECT query succeed and the correct charset has been applied for the init script",
-                        "привет мир",
-                        resultSetString
-                    );
+                    assertThat(resultSetString)
+                        .as("A basic SELECT query succeeds where the schema has been applied from a script")
+                        .isEqualTo("привет мир");
                     return true;
                 }
             );
 
-        assertTrue("The database returned a record as expected", result);
+        assertThat(result).as("The database returned a record as expected").isTrue();
     }
 
     /**
@@ -195,15 +190,14 @@ private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException
                 rs -> {
                     rs.next();
                     String resultSetString = rs.getString(2);
-                    assertTrue(
-                        "Passing query parameters to set DB connection encoding is successful",
-                        resultSetString.startsWith("utf8")
-                    );
+                    assertThat(resultSetString)
+                        .as("Passing query parameters to set DB connection encoding is successful")
+                        .startsWith("utf8");
                     return true;
                 }
             );
 
-        assertTrue("The database returned a record as expected", result);
+        assertThat(result).as("The database returned a record as expected").isTrue();
         return dataSource;
     }
 
@@ -213,10 +207,10 @@ private void performTestForCustomIniFile(HikariDataSource dataSource) throws SQL
         statement.execute("SELECT @@GLOBAL.innodb_file_format");
         ResultSet resultSet = statement.getResultSet();
 
-        assertTrue("The query returns a result", resultSet.next());
+        assertThat(resultSet.next()).as("The query returns a result").isTrue();
         String result = resultSet.getString(1);
 
-        assertEquals("The InnoDB file format has been set by the ini file content", "Barracuda", result);
+        assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
     }
 
     private HikariDataSource getDataSource(String jdbcUrl, int poolSize) {
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 3a6681aee13..6047a3c0f3e 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -10,6 +10,5 @@ dependencies {
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index 9b88e6b503d..2ac8cf88b5d 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -8,7 +8,7 @@
 import java.util.Arrays;
 import java.util.Optional;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * This Test class validates that all supported JDBC URL's can be parsed by ConnectionUrl class.
@@ -125,9 +125,9 @@ public static Iterable<Object[]> data() {
     @Test
     public void test() {
         ConnectionUrl url = ConnectionUrl.newInstance(jdbcUrl);
-        assertEquals("Database Type is as expected", databaseType, url.getDatabaseType());
-        assertEquals("Image tag is as expected", tag, url.getImageTag());
-        assertEquals("Database Host String is as expected", dbHostString, url.getDbHostString());
-        assertEquals("Database Name is as expected", databaseName, url.getDatabaseName().orElse(""));
+        assertThat(url.getDatabaseType()).as("Database Type is as expected").isEqualTo(databaseType);
+        assertThat(url.getImageTag()).as("Image tag is as expected").isEqualTo(tag);
+        assertThat(url.getDbHostString()).as("Database Host String is as expected").isEqualTo(dbHostString);
+        assertThat(url.getDatabaseName().orElse("")).as("Database Name is as expected").isEqualTo(databaseName);
     }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index 6888f881ec4..fa50dbbe76e 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -4,9 +4,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import java.util.Optional;
-
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ConnectionUrlTest {
 
@@ -18,16 +16,18 @@ public void testConnectionUrl1() {
         String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
-        assertEquals("Database Type value is as expected", "mysql", url.getDatabaseType());
-        assertEquals("Database Image tag value is as expected", "5.7.34", url.getImageTag().get());
-        assertEquals("Database Host String is as expected", "somehostname:3306/databasename", url.getDbHostString());
-        assertEquals("Query String value is as expected", "?a=b&c=d", url.getQueryString().get());
-        assertEquals("Database Host value is as expected", "somehostname", url.getDatabaseHost().get());
-        assertEquals("Database Port value is as expected", 3306, url.getDatabasePort().get());
-        assertEquals("Database Name value is as expected", "databasename", url.getDatabaseName().get());
-
-        assertEquals("Parameter a is captured", "b", url.getQueryParameters().get("a"));
-        assertEquals("Parameter c is captured", "d", url.getQueryParameters().get("c"));
+        assertThat(url.getDatabaseType()).as("Database Type value is as expected").isEqualTo("mysql");
+        assertThat(url.getImageTag()).as("Database Image tag value is as expected").contains("5.7.34");
+        assertThat(url.getDbHostString())
+            .as("Database Host String is as expected")
+            .isEqualTo("somehostname:3306/databasename");
+        assertThat(url.getQueryString()).as("Query String value is as expected").contains("?a=b&c=d");
+        assertThat(url.getDatabaseHost()).as("Database Host value is as expected").contains("somehostname");
+        assertThat(url.getDatabasePort()).as("Database Port value is as expected").contains(3306);
+        assertThat(url.getDatabaseName()).as("Database Name value is as expected").contains("databasename");
+
+        assertThat(url.getQueryParameters()).as("Parameter a is captured").containsEntry("a", "b");
+        assertThat(url.getQueryParameters()).as("Parameter c is captured").containsEntry("c", "d");
     }
 
     @Test
@@ -35,21 +35,23 @@ public void testConnectionUrl2() {
         String urlString = "jdbc:tc:mysql://somehostname/databasename";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
-        assertEquals("Database Type value is as expected", "mysql", url.getDatabaseType());
-        assertFalse("Database Image tag value is as expected", url.getImageTag().isPresent());
-        assertEquals("Database Host String is as expected", "somehostname/databasename", url.getDbHostString());
-        assertEquals("Query String value is as expected", Optional.empty(), url.getQueryString());
-        assertEquals("Database Host value is as expected", "somehostname", url.getDatabaseHost().get());
-        assertFalse("Database Port is null as expected", url.getDatabasePort().isPresent());
-        assertEquals("Database Name value is as expected", "databasename", url.getDatabaseName().get());
-
-        assertTrue("Connection Parameters set is empty", url.getQueryParameters().isEmpty());
+        assertThat(url.getDatabaseType()).as("Database Type value is as expected").isEqualTo("mysql");
+        assertThat(url.getImageTag()).as("Database Image tag value is as expected").isNotPresent();
+        assertThat(url.getDbHostString())
+            .as("Database Host String is as expected")
+            .isEqualTo("somehostname/databasename");
+        assertThat(url.getQueryString()).as("Query String value is as expected").isEmpty();
+        assertThat(url.getDatabaseHost()).as("Database Host value is as expected").contains("somehostname");
+        assertThat(url.getDatabasePort()).as("Database Port is null as expected").isNotPresent();
+        assertThat(url.getDatabaseName()).as("Database Name value is as expected").contains("databasename");
+
+        assertThat(url.getQueryParameters().isEmpty()).as("Connection Parameters set is empty").isTrue();
     }
 
     @Test
     public void testEmptyQueryParameter() {
         ConnectionUrl url = ConnectionUrl.newInstance("jdbc:tc:mysql://somehostname/databasename?key=");
-        assertEquals("'key' property value", "", url.getQueryParameters().get("key"));
+        assertThat(url.getQueryParameters().get("key")).as("'key' property value").isEqualTo("");
     }
 
     @Test
@@ -57,17 +59,13 @@ public void testTmpfsOption() {
         String urlString = "jdbc:tc:mysql://somehostname/databasename?TC_TMPFS=key:value,key1:value1";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
-        assertTrue("Connection Parameters set is empty", url.getQueryParameters().isEmpty());
-        assertFalse("Container Parameters set is not empty", url.getContainerParameters().isEmpty());
-        assertEquals(
-            "Container Parameter TC_TMPFS is true",
-            "key:value,key1:value1",
-            url.getContainerParameters().get("TC_TMPFS")
-        );
-        assertTrue("tmpfs option key exists", url.getTmpfsOptions().containsKey("key"));
-        assertEquals("tmpfs option key has correct value", "value", url.getTmpfsOptions().get("key"));
-        assertTrue("tmpfs option key1 exists", url.getTmpfsOptions().containsKey("key1"));
-        assertEquals("tmpfs option key1 has correct value", "value1", url.getTmpfsOptions().get("key1"));
+        assertThat(url.getQueryParameters()).as("Connection Parameters set is empty").isEmpty();
+        assertThat(url.getContainerParameters()).as("Container Parameters set is not empty").isNotEmpty();
+        assertThat(url.getContainerParameters())
+            .as("Container Parameter TC_TMPFS is true")
+            .containsEntry("TC_TMPFS", "key:value,key1:value1");
+        assertThat(url.getTmpfsOptions()).as("tmpfs option key has correct value").containsEntry("key", "value");
+        assertThat(url.getTmpfsOptions()).as("tmpfs option key1 has correct value").containsEntry("key1", "value1");
     }
 
     @Test
@@ -76,13 +74,13 @@ public void testInitScriptPathCapture() {
             "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
-        assertEquals("Database Type value is as expected", "somepath/init_mysql.sql", url.getInitScriptPath().get());
-        assertEquals("Query String value is as expected", "?a=b&c=d", url.getQueryString().get());
-        assertEquals(
-            "INIT SCRIPT Path exists in Container Parameters",
-            "somepath/init_mysql.sql",
-            url.getContainerParameters().get("TC_INITSCRIPT")
-        );
+        assertThat(url.getInitScriptPath())
+            .as("Database Type value is as expected")
+            .contains("somepath/init_mysql.sql");
+        assertThat(url.getQueryString()).as("Query String value is as expected").contains("?a=b&c=d");
+        assertThat(url.getContainerParameters())
+            .as("INIT SCRIPT Path exists in Container Parameters")
+            .containsEntry("TC_INITSCRIPT", "somepath/init_mysql.sql");
 
         //Parameter sets are unmodifiable
         thrown.expect(UnsupportedOperationException.class);
@@ -96,18 +94,14 @@ public void testInitFunctionCapture() {
             "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
-        assertTrue("Init Function parameter exists", url.getInitFunction().isPresent());
-
-        assertEquals(
-            "Init function class is as expected",
-            "org.testcontainers.jdbc.JDBCDriverTest",
-            url.getInitFunction().get().getClassName()
-        );
-        assertEquals(
-            "Init function class is as expected",
-            "sampleInitFunction",
-            url.getInitFunction().get().getMethodName()
-        );
+        assertThat(url.getInitFunction()).as("Init Function parameter exists").isPresent();
+
+        assertThat(url.getInitFunction().get().getClassName())
+            .as("Init function class is as expected")
+            .isEqualTo("org.testcontainers.jdbc.JDBCDriverTest");
+        assertThat(url.getInitFunction().get().getMethodName())
+            .as("Init function class is as expected")
+            .isEqualTo("sampleInitFunction");
     }
 
     @Test
@@ -115,6 +109,6 @@ public void testDaemonCapture() {
         String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_DAEMON=true";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
-        assertTrue("Daemon flag is set to true.", url.isInDaemonMode());
+        assertThat(url.isInDaemonMode()).as("Daemon flag is set to true.").isTrue();
     }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
index 68afe8692e8..379b262aa3a 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -9,9 +9,8 @@
 import java.sql.SQLException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.rnorth.visibleassertions.VisibleAssertions.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 public class MissingJdbcDriverTest {
 
@@ -24,12 +23,16 @@ public void shouldFailFastIfNoDriverFound() {
             fail("The container is expected to fail to start");
         } catch (Exception e) {
             final Throwable rootCause = Throwables.getRootCause(e);
-            assertTrue("ClassNotFoundException is the root cause", rootCause instanceof ClassNotFoundException);
+            assertThat(rootCause)
+                .as("ClassNotFoundException is the root cause")
+                .isInstanceOf(ClassNotFoundException.class);
         } finally {
             container.stop();
         }
 
-        assertEquals("only one connection attempt should have been made", 1, container.getConnectionAttempts());
+        assertThat(container.getConnectionAttempts())
+            .as("only one connection attempt should have been made")
+            .isEqualTo(1);
     }
 
     /**
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
index f49aa8732f5..866b76df301 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Testcontainers
 class ComposeContainerTests {
@@ -38,6 +38,6 @@ void running_compose_defined_container_is_accessible_on_configured_port() throws
 
         HttpResponse response = client.execute(new HttpGet("http://" + host + ":" + port));
 
-        assertEquals(200, response.getStatusLine().getStatusCode());
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
     }
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
index 6c44d978b69..e8ce714ab28 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
@@ -4,7 +4,7 @@
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // testClass {
 @Testcontainers
@@ -23,8 +23,8 @@ class MixedLifecycleTests {
 
     @Test
     void test() {
-        assertTrue(MY_SQL_CONTAINER.isRunning());
-        assertTrue(postgresqlContainer.isRunning());
+        assertThat(MY_SQL_CONTAINER.isRunning()).isTrue();
+        assertThat(postgresqlContainer.isRunning()).isTrue();
     }
 }
 // }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
index 526038853c9..8852524d451 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersExtensionTests.java
@@ -4,8 +4,7 @@
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -15,28 +14,28 @@ public class TestcontainersExtensionTests {
     void whenDisabledWithoutDockerAndDockerIsAvailableTestsAreEnabled() {
         ConditionEvaluationResult result = new TestTestcontainersExtension(true)
             .evaluateExecutionCondition(extensionContext(DisabledWithoutDocker.class));
-        assertFalse(result.isDisabled());
+        assertThat(result.isDisabled()).isFalse();
     }
 
     @Test
     void whenDisabledWithoutDockerAndDockerIsUnavailableTestsAreDisabled() {
         ConditionEvaluationResult result = new TestTestcontainersExtension(false)
             .evaluateExecutionCondition(extensionContext(DisabledWithoutDocker.class));
-        assertTrue(result.isDisabled());
+        assertThat(result.isDisabled()).isTrue();
     }
 
     @Test
     void whenEnabledWithoutDockerAndDockerIsAvailableTestsAreEnabled() {
         ConditionEvaluationResult result = new TestTestcontainersExtension(true)
             .evaluateExecutionCondition(extensionContext(EnabledWithoutDocker.class));
-        assertFalse(result.isDisabled());
+        assertThat(result.isDisabled()).isFalse();
     }
 
     @Test
     void whenEnabledWithoutDockerAndDockerIsUnavailableTestsAreEnabled() {
         ConditionEvaluationResult result = new TestTestcontainersExtension(false)
             .evaluateExecutionCondition(extensionContext(EnabledWithoutDocker.class));
-        assertFalse(result.isDisabled());
+        assertThat(result.isDisabled()).isFalse();
     }
 
     private ExtensionContext extensionContext(Class clazz) {
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
index c41b184defa..f3d81a0dfcd 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedRestartedContainerTests.java
@@ -4,8 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 // testClass {
 @Testcontainers
@@ -24,7 +23,7 @@ class TestcontainersNestedRestartedContainerTests {
     // testClass {
     @Test
     void top_level_container_should_be_running() {
-        assertTrue(topLevelContainer.isRunning());
+        assertThat(topLevelContainer.isRunning()).isTrue();
         // }}
         topLevelContainerId = topLevelContainer.getContainerId();
         // testClass {{
@@ -40,14 +39,14 @@ class NestedTestCase {
         @Test
         void both_containers_should_be_running() {
             // top level container is restarted for nested methods
-            assertTrue(topLevelContainer.isRunning());
+            assertThat(topLevelContainer.isRunning()).isTrue();
             // nested containers are only available inside their nested class
-            assertTrue(nestedContainer.isRunning());
+            assertThat(nestedContainer.isRunning()).isTrue();
             // }}}
             if (nestedContainerId == null) {
                 nestedContainerId = nestedContainer.getContainerId();
             } else {
-                assertNotEquals(nestedContainerId, nestedContainer.getContainerId());
+                assertThat(nestedContainer.getContainerId()).isNotEqualTo(nestedContainerId);
             }
             // testClass {{
         }
@@ -55,23 +54,23 @@ void both_containers_should_be_running() {
         // }
         @Test
         void containers_should_not_be_the_same() {
-            assertNotEquals(topLevelContainer.getContainerId(), nestedContainer.getContainerId());
+            assertThat(nestedContainer.getContainerId()).isNotEqualTo(topLevelContainer.getContainerId());
 
             if (nestedContainerId == null) {
                 nestedContainerId = nestedContainer.getContainerId();
             } else {
-                assertNotEquals(nestedContainerId, nestedContainer.getContainerId());
+                assertThat(nestedContainer.getContainerId()).isNotEqualTo(nestedContainerId);
             }
         }
 
         @Test
         void ids_should_not_change() {
-            assertNotEquals(topLevelContainerId, topLevelContainer.getContainerId());
+            assertThat(topLevelContainer.getContainerId()).isNotEqualTo(topLevelContainerId);
 
             if (nestedContainerId == null) {
                 nestedContainerId = nestedContainer.getContainerId();
             } else {
-                assertNotEquals(nestedContainerId, nestedContainer.getContainerId());
+                assertThat(nestedContainer.getContainerId()).isNotEqualTo(nestedContainerId);
             }
         }
         // testClass {{{
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
index c00e66c2d9d..61a4df2c6ec 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersNestedSharedContainerTests.java
@@ -4,8 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Testcontainers
 class TestcontainersNestedSharedContainerTests {
@@ -20,7 +19,7 @@ class TestcontainersNestedSharedContainerTests {
 
     @Test
     void top_level_container_should_be_running() {
-        assertTrue(TOP_LEVEL_CONTAINER.isRunning());
+        assertThat(TOP_LEVEL_CONTAINER.isRunning()).isTrue();
         topLevelContainerId = TOP_LEVEL_CONTAINER.getContainerId();
     }
 
@@ -29,12 +28,12 @@ class NestedTestCase {
 
         @Test
         void top_level_containers_should_be_running() {
-            assertTrue(TOP_LEVEL_CONTAINER.isRunning());
+            assertThat(TOP_LEVEL_CONTAINER.isRunning()).isTrue();
         }
 
         @Test
         void ids_should_not_change() {
-            assertEquals(topLevelContainerId, TOP_LEVEL_CONTAINER.getContainerId());
+            assertThat(TOP_LEVEL_CONTAINER.getContainerId()).isEqualTo(topLevelContainerId);
         }
     }
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
index 46c6045984f..53e6a0968a0 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersRestartBetweenTests.java
@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Testcontainers
 class TestcontainersRestartBetweenTests {
@@ -19,7 +19,7 @@ void first_test() {
         if (lastContainerId == null) {
             lastContainerId = genericContainer.getContainerId();
         } else {
-            assertNotEquals(lastContainerId, genericContainer.getContainerId());
+            assertThat(genericContainer.getContainerId()).isNotEqualTo(lastContainerId);
         }
     }
 
@@ -28,7 +28,7 @@ void second_test() {
         if (lastContainerId == null) {
             lastContainerId = genericContainer.getContainerId();
         } else {
-            assertNotEquals(lastContainerId, genericContainer.getContainerId());
+            assertThat(genericContainer.getContainerId()).isNotEqualTo(lastContainerId);
         }
     }
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
index b23b2fe0e53..9bd23e8d20e 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestcontainersSharedContainerTests.java
@@ -4,8 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Testcontainers
 class TestcontainersSharedContainerTests {
@@ -20,7 +19,7 @@ class TestcontainersSharedContainerTests {
 
     @BeforeAll
     static void doSomethingWithAContainer() {
-        assertTrue(GENERIC_CONTAINER.isRunning());
+        assertThat(GENERIC_CONTAINER.isRunning()).isTrue();
     }
 
     @Test
@@ -28,7 +27,7 @@ void first_test() {
         if (lastContainerId == null) {
             lastContainerId = GENERIC_CONTAINER.getContainerId();
         } else {
-            assertEquals(lastContainerId, GENERIC_CONTAINER.getContainerId());
+            assertThat(GENERIC_CONTAINER.getContainerId()).isEqualTo(lastContainerId);
         }
     }
 
@@ -37,7 +36,7 @@ void second_test() {
         if (lastContainerId == null) {
             lastContainerId = GENERIC_CONTAINER.getContainerId();
         } else {
-            assertEquals(lastContainerId, GENERIC_CONTAINER.getContainerId());
+            assertThat(GENERIC_CONTAINER.getContainerId()).isEqualTo(lastContainerId);
         }
     }
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
index adeaf58675c..f57fde6b419 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/InheritedTests.java
@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class InheritedTests extends AbstractTestBase {
 
@@ -12,15 +12,15 @@ class InheritedTests extends AbstractTestBase {
 
     @Test
     void step1() {
-        assertEquals(1, redisPerClass.getJedis().incr("key"));
-        assertEquals(1, redisPerTest.getJedis().incr("key"));
-        assertEquals(1, myRedis.getJedis().incr("key"));
+        assertThat(redisPerClass.getJedis().incr("key")).isEqualTo(1);
+        assertThat(redisPerTest.getJedis().incr("key")).isEqualTo(1);
+        assertThat(myRedis.getJedis().incr("key")).isEqualTo(1);
     }
 
     @Test
     void step2() {
-        assertEquals(2, redisPerClass.getJedis().incr("key"));
-        assertEquals(1, redisPerTest.getJedis().incr("key"));
-        assertEquals(1, myRedis.getJedis().incr("key"));
+        assertThat(redisPerClass.getJedis().incr("key")).isEqualTo(2);
+        assertThat(redisPerTest.getJedis().incr("key")).isEqualTo(1);
+        assertThat(myRedis.getJedis().incr("key")).isEqualTo(1);
     }
 }
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
index 970e2390457..c2504c27dbe 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
@@ -6,7 +6,6 @@
 import io.kubernetes.client.openapi.models.V1NodeList;
 import io.kubernetes.client.util.Config;
 import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
@@ -14,6 +13,8 @@
 import java.io.IOException;
 import java.io.StringReader;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @Slf4j
 public class OfficialClientK3sContainerTest {
 
@@ -37,7 +38,7 @@ public void shouldStartAndHaveListableNode() throws IOException, ApiException {
             V1NodeList nodes = api.listNode(null, null, null, null, null, null, null, null, null, null);
             // }
 
-            Assertions.assertThat(nodes.getItems()).hasSize(1);
+            assertThat(nodes.getItems()).hasSize(1);
         }
     }
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 72149520b6a..8702d2e1a83 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.273'
     testImplementation 'software.amazon.awssdk:s3:2.17.244'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index c075d2805d6..a535699438f 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -15,9 +15,7 @@
 
 import java.util.Arrays;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Enclosed.class)
 public class LegacyModeTest {
@@ -52,25 +50,25 @@ public void samePortIsExposedForAllServices() {
             localstack.start();
 
             try {
-                assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
-                assertEquals(
-                    "Endpoint overrides are different",
-                    localstack.getEndpointOverride(Service.S3).toString(),
-                    localstack.getEndpointOverride(Service.SQS).toString()
-                );
-                assertEquals(
-                    "Endpoint configuration have different endpoints",
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.S3).toString(),
-                        localstack.getRegion()
-                    )
-                        .getServiceEndpoint(),
+                assertThat(localstack.getExposedPorts()).as("A single port is exposed").hasSize(1);
+                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                    .as("Endpoint overrides are different")
+                    .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+                assertThat(
                     new AwsClientBuilder.EndpointConfiguration(
                         localstack.getEndpointOverride(Service.SQS).toString(),
                         localstack.getRegion()
                     )
                         .getServiceEndpoint()
-                );
+                )
+                    .as("Endpoint configuration have different endpoints")
+                    .isEqualTo(
+                        new AwsClientBuilder.EndpointConfiguration(
+                            localstack.getEndpointOverride(Service.S3).toString(),
+                            localstack.getRegion()
+                        )
+                            .getServiceEndpoint()
+                    );
             } finally {
                 localstack.stop();
             }
@@ -117,25 +115,25 @@ public void differentPortsAreExposed() {
             localstack.start();
 
             try {
-                assertTrue("Multiple ports are exposed", localstack.getExposedPorts().size() > 1);
-                assertNotEquals(
-                    "Endpoint overrides are different",
-                    localstack.getEndpointOverride(Service.S3).toString(),
-                    localstack.getEndpointOverride(Service.SQS).toString()
-                );
-                assertNotEquals(
-                    "Endpoint configuration have different endpoints",
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.S3).toString(),
-                        localstack.getRegion()
-                    )
-                        .getServiceEndpoint(),
+                assertThat(localstack.getExposedPorts()).as("Multiple ports are exposed").hasSizeGreaterThan(1);
+                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                    .as("Endpoint overrides are different")
+                    .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+                assertThat(
                     new AwsClientBuilder.EndpointConfiguration(
                         localstack.getEndpointOverride(Service.SQS).toString(),
                         localstack.getRegion()
                     )
                         .getServiceEndpoint()
-                );
+                )
+                    .as("Endpoint configuration have different endpoints")
+                    .isNotEqualTo(
+                        new AwsClientBuilder.EndpointConfiguration(
+                            localstack.getEndpointOverride(Service.S3).toString(),
+                            localstack.getRegion()
+                        )
+                            .getServiceEndpoint()
+                    );
             } finally {
                 localstack.stop();
             }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 950f29866ba..a678d30eb80 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -38,14 +38,11 @@
 import software.amazon.awssdk.services.s3.S3Client;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Optional;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
@@ -101,17 +98,17 @@ public void s3TestOverBridgeNetwork() throws IOException {
                 .stream()
                 .filter(b -> b.getName().equals(bucketName))
                 .findFirst();
-            assertTrue("The created bucket is present", maybeBucket.isPresent());
+            assertThat(maybeBucket).as("The created bucket is present").isPresent();
             final Bucket bucket = maybeBucket.get();
 
-            assertEquals("The created bucket has the right name", bucketName, bucket.getName());
+            assertThat(bucket.getName()).as("The created bucket has the right name").isEqualTo(bucketName);
 
             final ObjectListing objectListing = s3.listObjects(bucketName);
-            assertEquals("The created bucket has 1 item in it", 1, objectListing.getObjectSummaries().size());
+            assertThat(objectListing.getObjectSummaries()).as("The created bucket has 1 item in it").hasSize(1);
 
             final S3Object object = s3.getObject(bucketName, "bar");
-            final String content = IOUtils.toString(object.getObjectContent(), Charset.forName("UTF-8"));
-            assertEquals("The object can be retrieved", "baz", content);
+            final String content = IOUtils.toString(object.getObjectContent(), StandardCharsets.UTF_8);
+            assertThat(content).as("The object can be retrieved").isEqualTo("baz");
         }
 
         @Test
@@ -131,10 +128,9 @@ public void s3TestUsingAwsSdkV2() {
 
             final String bucketName = "foov2";
             s3.createBucket(b -> b.bucket(bucketName));
-            assertTrue(
-                "New bucket was created",
-                s3.listBuckets().buckets().stream().anyMatch(b -> b.name().equals(bucketName))
-            );
+            assertThat(s3.listBuckets().buckets().stream().anyMatch(b -> b.name().equals(bucketName)))
+                .as("New bucket was created")
+                .isTrue();
         }
 
         @Test
@@ -156,16 +152,14 @@ public void sqsTestOverBridgeNetwork() {
 
             CreateQueueResult queueResult = sqs.createQueue("baz");
             String fooQueueUrl = queueResult.getQueueUrl();
-            assertThat(
-                "Created queue has external hostname URL",
-                fooQueueUrl,
-                containsString(
+            assertThat(fooQueueUrl)
+                .as("Created queue has external hostname URL")
+                .contains(
                     "http://" +
                     DockerClientFactory.instance().dockerHostIpAddress() +
                     ":" +
                     localstack.getMappedPort(LocalStackContainer.PORT)
-                )
-            );
+                );
 
             sqs.sendMessage(fooQueueUrl, "test");
             final long messageCount = sqs
@@ -174,7 +168,7 @@ public void sqsTestOverBridgeNetwork() {
                 .stream()
                 .filter(message -> message.getBody().equals("test"))
                 .count();
-            assertEquals("the sent message can be received", 1L, messageCount);
+            assertThat(messageCount).as("the sent message can be received").isEqualTo(1L);
         }
 
         @Test
@@ -197,8 +191,8 @@ public void cloudWatchLogsTestOverBridgeNetwork() {
             logs.createLogGroup(new CreateLogGroupRequest("foo"));
 
             List<LogGroup> groups = logs.describeLogGroups().getLogGroups();
-            assertEquals("One log group should be created", 1, groups.size());
-            assertEquals("Name of created log group is [foo]", "foo", groups.get(0).getLogGroupName());
+            assertThat(groups).as("One log group should be created").hasSize(1);
+            assertThat(groups.get(0).getLogGroupName()).as("Name of created log group is [foo]").isEqualTo("foo");
         }
 
         @Test
@@ -223,34 +217,32 @@ public void kmsKeyCreationTest() {
             CreateKeyRequest req = new CreateKeyRequest().withDescription(desc).withTags(createdByTag);
             CreateKeyResult key = awskms.createKey(req);
 
-            assertEquals(
-                "AWS KMS Customer Managed Key should be created ",
-                key.getKeyMetadata().getDescription(),
-                desc
-            );
+            assertThat(desc)
+                .as("AWS KMS Customer Managed Key should be created ")
+                .isEqualTo(key.getKeyMetadata().getDescription());
         }
 
         @Test
         public void samePortIsExposedForAllServices() {
-            assertTrue("A single port is exposed", localstack.getExposedPorts().size() == 1);
-            assertEquals(
-                "Endpoint overrides are different",
-                localstack.getEndpointOverride(Service.S3).toString(),
-                localstack.getEndpointOverride(Service.SQS).toString()
-            );
-            assertEquals(
-                "Endpoint configuration have different endpoints",
-                new AwsClientBuilder.EndpointConfiguration(
-                    localstack.getEndpointOverride(Service.S3).toString(),
-                    localstack.getRegion()
-                )
-                    .getServiceEndpoint(),
+            assertThat(localstack.getExposedPorts()).as("A single port is exposed").hasSize(1);
+            assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                .as("Endpoint overrides are different")
+                .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+            assertThat(
                 new AwsClientBuilder.EndpointConfiguration(
                     localstack.getEndpointOverride(Service.SQS).toString(),
                     localstack.getRegion()
                 )
                     .getServiceEndpoint()
-            );
+            )
+                .as("Endpoint configuration have different endpoints")
+                .isEqualTo(
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpointOverride(Service.S3).toString(),
+                        localstack.getRegion()
+                    )
+                        .getServiceEndpoint()
+                );
         }
     }
 
@@ -292,11 +284,9 @@ public void sqsTestOverDockerNetwork() throws Exception {
                 "sqs create-queue --queue-name baz"
             );
 
-            assertThat(
-                "Created queue has external hostname URL",
-                queueCreationResponse,
-                containsString("http://localstack:" + LocalStackContainer.PORT)
-            );
+            assertThat(queueCreationResponse)
+                .as("Created queue has external hostname URL")
+                .contains("http://localstack:" + LocalStackContainer.PORT);
 
             runAwsCliAgainstDockerNetworkContainer(
                 String.format(
@@ -313,7 +303,7 @@ public void sqsTestOverDockerNetwork() throws Exception {
                 )
             );
 
-            assertTrue("the sent message can be received", message.contains("\"Body\": \"test\""));
+            assertThat(message).as("the sent message can be received").contains("\"Body\": \"test\"");
         }
 
         @Test
@@ -356,11 +346,9 @@ public void s3EndpointHasProperRegion() {
                 localstack.getEndpointOverride(Service.S3).toString(),
                 localstack.getRegion()
             );
-            assertEquals(
-                "The endpoint configuration has right region",
-                region,
-                endpointConfiguration.getSigningRegion()
-            );
+            assertThat(endpointConfiguration.getSigningRegion())
+                .as("The endpoint configuration has right region")
+                .isEqualTo(region);
         }
     }
 }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 21a48b6e73c..e403a09b382 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -9,11 +9,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
@@ -25,7 +22,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(mariadb, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
 
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -41,10 +38,9 @@ public void testSpecificVersion() throws SQLException {
             ResultSet resultSet = performQuery(mariadbOldVersion, "SELECT VERSION()");
             String resultSetString = resultSet.getString(1);
 
-            assertTrue(
-                "The database version can be set using a container rule parameter",
-                resultSetString.startsWith("5.5.51")
-            );
+            assertThat(resultSetString)
+                .as("The database version can be set using a container rule parameter")
+                .startsWith("5.5.51");
         }
     }
 
@@ -63,7 +59,7 @@ public void testMariaDBWithCustomIniFile() throws SQLException {
             ResultSet resultSet = performQuery(mariadbCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
             String result = resultSet.getString(1);
 
-            assertEquals("The InnoDB file format has been set by the ini file content", "Barracuda", result);
+            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
         }
     }
 
@@ -77,7 +73,7 @@ public void testMariaDBWithCommandOverride() throws SQLException {
             ResultSet resultSet = performQuery(mariadbCustomConfig, "show variables like 'auto_increment_increment'");
             String result = resultSet.getString("Value");
 
-            assertEquals("Auto increment increment should be overriden by command line", "10", result);
+            assertThat(result).as("Auto increment increment should be overriden by command line").isEqualTo("10");
         }
     }
 
@@ -90,10 +86,10 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         try {
             mariaDBContainer.start();
             String jdbcUrl = mariaDBContainer.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
-            assertThat(jdbcUrl, containsString("connectTimeout=40000"));
+            assertThat(jdbcUrl).contains("?");
+            assertThat(jdbcUrl).contains("&");
+            assertThat(jdbcUrl).contains("rewriteBatchedStatements=true");
+            assertThat(jdbcUrl).contains("connectTimeout=40000");
         } finally {
             mariaDBContainer.stop();
         }
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 9ea504ca74a..2156ef045cd 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.5.4'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index 3f34d000603..84d472f5e75 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -5,10 +5,9 @@
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.hamcrest.Matchers.containsString;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
 
 public class MockServerContainerRuleTest {
 
@@ -37,10 +36,8 @@ public void shouldReturnExpectation() throws Exception {
         // }
         // spotless:on
 
-        assertThat(
-            "Expectation returns expected response body",
-            SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"),
-            containsString("Peter the person")
-        );
+        assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"))
+            .as("Expectation returns expected response body")
+            .contains("Peter the person");
     }
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index d038b111824..6ddce4b6cbf 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -4,11 +4,9 @@
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.hamcrest.Matchers.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class MockServerContainerTest {
 
@@ -30,15 +28,13 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
             MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort());
 
-            assertTrue("Mockserver running", client.isRunning());
+            assertThat(client.isRunning()).as("Mockserver running").isTrue();
 
             client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-            assertThat(
-                "MockServer returns correct result",
-                SimpleHttpClient.responseFromMockserver(mockServer, "/hello"),
-                equalTo(expectedBody)
-            );
+            assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/hello"))
+                .as("MockServer returns correct result")
+                .isEqualTo(expectedBody);
         }
     }
 
diff --git a/modules/mockserver/src/test/resources/logback-test.xml b/modules/mockserver/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/mockserver/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
index 49bae13d9e3..97904c6b7d1 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -10,7 +10,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.fail;
+import static org.assertj.core.api.Assertions.fail;
 
 /**
  * Tests if the password passed to the container satisfied the password policy described at
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
index 21ea5380801..4cfc34f9e73 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
@@ -8,7 +8,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
 
@@ -26,7 +26,7 @@ public void testSqlServerConnection() throws SQLException {
 
             ResultSet resultSet = performQuery(mssqlServerContainer, mssqlServerContainer.getTestQueryString());
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 36d215c8757..15edbaa2ca1 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -11,9 +11,7 @@
 
 import javax.sql.DataSource;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
 
@@ -26,7 +24,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(mssqlServer, "SELECT 1");
 
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -40,7 +38,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
             mssqlServer.start();
 
             String jdbcUrl = mssqlServer.getJdbcUrl();
-            assertThat(jdbcUrl, containsString(";integratedSecurity=false;applicationName=MyApp"));
+            assertThat(jdbcUrl).contains(";integratedSecurity=false;applicationName=MyApp");
         }
     }
 
@@ -63,7 +61,7 @@ public void testSetupDatabase() throws SQLException {
 
             resultSet.next();
             int resultSetInt = resultSet.getInt("ID");
-            assertEquals("A basic SELECT query succeeds", 3, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(3);
         }
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
index a30f3f59888..254f58807b7 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
@@ -21,7 +21,7 @@
 
 import javax.sql.DataSource;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * This test belongs in the jdbc module, as it is focused on testing the behaviour of {@link org.testcontainers.containers.JdbcDatabaseContainer}.
@@ -82,7 +82,7 @@ public void testMySQLWithConnectionPoolUsingSameContainer() throws SQLException,
                     return rs.getInt(1);
                 }
             );
-        assertEquals("Reuse of a datasource points to the same DB container", 100, count);
+        assertThat(count).as("Reuse of a datasource points to the same DB container").isEqualTo(100);
 
         int sum = new QueryRunner(dataSource)
             .query(
@@ -93,7 +93,7 @@ public void testMySQLWithConnectionPoolUsingSameContainer() throws SQLException,
                 }
             );
         // 100 records * 5 = 500 expected
-        assertEquals("Reuse of a datasource points to the same DB container", 500, sum);
+        assertThat(sum).as("Reuse of a datasource points to the same DB container").isEqualTo(500);
     }
 
     private static DataSource getTomcatDataSourceWithDriverClassName() {
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
index 20b49d19201..f0a4f5d24ea 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
@@ -8,7 +8,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
 
@@ -33,7 +33,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
 
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index 735af251236..8a6c17c538e 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -11,7 +11,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Parameterized.class)
 public class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
@@ -35,11 +35,9 @@ public void versionCheckTest() throws SQLException {
             final ResultSet resultSet = performQuery(mysql, "SELECT VERSION()");
             final String resultSetString = resultSet.getString(1);
 
-            assertEquals(
-                "The database version can be set using a container rule parameter",
-                dockerImageName.getVersionPart(),
-                resultSetString
-            );
+            assertThat(resultSetString)
+                .as("The database version can be set using a container rule parameter")
+                .isEqualTo(dockerImageName.getVersionPart());
         }
     }
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 6441724c443..146010058ac 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -19,12 +19,9 @@
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 import static org.junit.Assume.assumeFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
-import static org.rnorth.visibleassertions.VisibleAssertions.fail;
 
 public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
@@ -59,7 +56,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
 
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -75,10 +72,9 @@ public void testSpecificVersion() throws SQLException {
             ResultSet resultSet = performQuery(mysqlOldVersion, "SELECT VERSION()");
             String resultSetString = resultSet.getString(1);
 
-            assertTrue(
-                "The database version can be set using a container rule parameter",
-                resultSetString.startsWith("5.6")
-            );
+            assertThat(resultSetString)
+                .as("The database version can be set using a container rule parameter")
+                .startsWith("5.6");
         }
     }
 
@@ -95,7 +91,7 @@ public void testMySQLWithCustomIniFile() throws SQLException {
             ResultSet resultSet = performQuery(mysqlCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
             String result = resultSet.getString(1);
 
-            assertEquals("The InnoDB file format has been set by the ini file content", "Barracuda", result);
+            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
         }
     }
 
@@ -110,7 +106,7 @@ public void testCommandOverride() throws SQLException {
             ResultSet resultSet = performQuery(mysqlCustomConfig, "show variables like 'auto_increment_increment'");
             String result = resultSet.getString("Value");
 
-            assertEquals("Auto increment increment should be overriden by command line", "42", result);
+            assertThat(result).as("Auto increment increment should be overriden by command line").isEqualTo("42");
         }
     }
 
@@ -126,7 +122,7 @@ public void testExplicitInitScript() throws SQLException {
             ResultSet resultSet = performQuery(container, "SELECT foo FROM bar");
             String firstColumnValue = resultSet.getString(1);
 
-            assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+            assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
         }
     }
 
@@ -159,7 +155,7 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
 
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -191,7 +187,7 @@ public void testWithAdditionalUrlParamTimeZone() throws SQLException {
                     actualDateTime,
                     expectedDateTime
                 );
-                assertTrue(message, actualDateTime.equals(expectedDateTime));
+                assertThat(actualDateTime).as(message).isEqualTo(expectedDateTime);
             }
         } finally {
             mysql.stop();
@@ -216,7 +212,7 @@ public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
             try (ResultSet resultSet = statement.getResultSet()) {
                 resultSet.next();
                 String firstColumnValue = resultSet.getString(1);
-                assertEquals("Value from bar should equal real value", "hello world", firstColumnValue);
+                assertThat(firstColumnValue).as("Value from bar should equal real value").isEqualTo("hello world");
             }
         } finally {
             mysql.stop();
@@ -233,10 +229,10 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         try {
             mysql.start();
             String jdbcUrl = mysql.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("rewriteBatchedStatements=true"));
-            assertThat(jdbcUrl, containsString("allowMultiQueries=true"));
+            assertThat(jdbcUrl).contains("?");
+            assertThat(jdbcUrl).contains("&");
+            assertThat(jdbcUrl).contains("rewriteBatchedStatements=true");
+            assertThat(jdbcUrl).contains("allowMultiQueries=true");
         } finally {
             mysql.stop();
         }
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 20cd38dc70c..de5420afd88 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.AuthTokens;
@@ -13,8 +12,7 @@
 
 import java.util.Collections;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.*;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
 /**
@@ -64,16 +62,14 @@ public void shouldCopyDatabase() {
 
     @Test
     public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
-        Assertions
-            .assertThatIllegalArgumentException()
+        assertThatIllegalArgumentException()
             .isThrownBy(() -> new Neo4jContainer<>().withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
 
     @Test
     public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
-        Assertions
-            .assertThatIllegalArgumentException()
+        assertThatIllegalArgumentException()
             .isThrownBy(() -> {
                 new Neo4jContainer<>("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
             })
@@ -82,8 +78,7 @@ public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
 
     @Test
     public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
-        Assertions
-            .assertThatIllegalArgumentException()
+        assertThatIllegalArgumentException()
             .isThrownBy(() -> {
                 new Neo4jContainer<>("neo4j:latest").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
             })
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 288b45b027a..aee69e253ad 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:23.0.0'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index c1ba3d30684..24e913cf281 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -12,8 +12,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author richardnorth
@@ -55,11 +54,9 @@ public void testSimple() throws Exception {
         // getFromNginxServer {
         URL baseUrl = nginx.getBaseUrl("http", 80);
 
-        assertThat(
-            "An HTTP GET from the Nginx server returns the index.html from the custom content directory",
-            responseFromNginx(baseUrl),
-            containsString("Hello World!")
-        );
+        assertThat(responseFromNginx(baseUrl))
+            .as("An HTTP GET from the Nginx server returns the index.html from the custom content directory")
+            .contains("Hello World!");
         // }
     }
 
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
index 003941f4dfc..5e44f0d368c 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
@@ -9,7 +9,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class OracleJDBCDriverTest {
 
@@ -28,7 +28,7 @@ private void performSimpleTest(String jdbcUrl) throws SQLException {
                     public Object handle(ResultSet rs) throws SQLException {
                         rs.next();
                         int resultSetInt = rs.getInt(1);
-                        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+                        assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
                         return true;
                     }
                 }
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index 675218637ce..6cf0e2e8ea9 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -4,7 +4,7 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author robfrank
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index 3be7685ea27..275517250b6 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -3,10 +3,8 @@
 import org.junit.Test;
 import org.testcontainers.PostgreSQLTestImages;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class PostgreSQLConnectionURLTest {
 
@@ -16,12 +14,11 @@ public void shouldCorrectlyAppendQueryString() {
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
-        assertTrue(
-            "Query String contains expected params",
-            queryString.contains("?stringtype=unspecified&stringtype=unspecified")
-        );
-        assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
-        assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
+        assertThat(queryString)
+            .as("Query String contains expected params")
+            .contains("?stringtype=unspecified&stringtype=unspecified");
+        assertThat(queryString.indexOf('?')).as("Query String starts with '?'").isZero();
+        assertThat(queryString.substring(1)).as("Query String does not contain extra '?'").doesNotContain("?");
     }
 
     @Test
@@ -30,12 +27,11 @@ public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
 
-        assertTrue(
-            "Query String contains expected params",
-            queryString.contains("?stringtype=unspecified&stringtype=unspecified")
-        );
-        assertEquals("Query String starts with '?'", 0, queryString.indexOf('?'));
-        assertFalse("Query String does not contain extra '?'", queryString.substring(1).contains("?"));
+        assertThat(queryString)
+            .as("Query String contains expected params")
+            .contains("?stringtype=unspecified&stringtype=unspecified");
+        assertThat(queryString.indexOf('?')).as("Query String starts with '?'").isZero();
+        assertThat(queryString.substring(1)).as("Query String does not contain extra '?'").doesNotContain("?");
     }
 
     @Test
@@ -43,16 +39,18 @@ public void shouldReturnOriginalURLWhenEmptyQueryString() {
         PostgreSQLContainer<?> postgres = new FixedJdbcUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("");
 
-        assertTrue("Query String remains unchanged", postgres.getJdbcUrl().equals(connectionUrl));
+        assertThat(postgres.getJdbcUrl()).as("Query String remains unchanged").isEqualTo(connectionUrl);
     }
 
     @Test
     public void shouldRejectInvalidQueryString() {
-        assertThrows(
-            "Fails when invalid query string provided",
-            IllegalArgumentException.class,
-            () -> new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified")
-        );
+        assertThat(
+            catchThrowable(() -> {
+                new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified");
+            })
+        )
+            .as("Fails when invalid query string provided")
+            .isInstanceOf(IllegalArgumentException.class);
     }
 
     static class FixedJdbcUrlPostgreSQLContainer extends PostgreSQLContainer<FixedJdbcUrlPostgreSQLContainer> {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
index 74d60b2d32d..f49c7dc6aa7 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
@@ -6,8 +6,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TimescaleDBContainerTest extends AbstractContainerDatabaseTest {
 
@@ -18,7 +17,7 @@ public void testSimple() throws SQLException {
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -36,7 +35,7 @@ public void testCommandOverride() throws SQLException {
                 "SELECT current_setting('max_connections')"
             );
             String result = resultSet.getString(1);
-            assertEquals("max_connections should be overriden", "42", result);
+            assertThat(result).as("max_connections should be overriden").isEqualTo("42");
         }
     }
 
@@ -55,7 +54,7 @@ public void testUnsetCommand() throws SQLException {
                 "SELECT current_setting('max_connections')"
             );
             String result = resultSet.getString(1);
-            assertNotEquals("max_connections should not be overriden", "42", result);
+            assertThat(result).as("max_connections should not be overriden").isNotEqualTo("42");
         }
     }
 
@@ -71,7 +70,7 @@ public void testExplicitInitScript() throws SQLException {
             ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
 
             String firstColumnValue = resultSet.getString(1);
-            assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+            assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
         }
     }
 }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
index 5acbd875c23..ed519ed2e4b 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
@@ -8,9 +8,7 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNull;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * This test belongs in the jdbc module, as it is focused on testing the behaviour of {@link org.testcontainers.containers.JdbcDatabaseContainer}.
@@ -32,7 +30,7 @@ public void shouldStopContainerWhenAllConnectionsClosed() throws SQLException {
         getConnectionAndClose(jdbcUrl);
 
         JdbcDatabaseContainer<?> container = ContainerDatabaseDriver.getContainer(jdbcUrl);
-        assertNull("Database container instance is null as expected", container);
+        assertThat(container).as("Database container instance is null as expected").isNull();
     }
 
     @Test
@@ -42,13 +40,13 @@ public void shouldNotStopDaemonContainerWhenAllConnectionsClosed() throws SQLExc
         getConnectionAndClose(jdbcUrl);
 
         JdbcDatabaseContainer<?> container = ContainerDatabaseDriver.getContainer(jdbcUrl);
-        assertNotNull("Database container instance is not null as expected", container);
-        assertTrue("Database container is running as expected", container.isRunning());
+        assertThat(container).as("Database container instance is not null as expected").isNotNull();
+        assertThat(container.isRunning()).as("Database container is running as expected").isTrue();
     }
 
     private void getConnectionAndClose(String jdbcUrl) throws SQLException {
         try (Connection connection = DriverManager.getConnection(jdbcUrl)) {
-            assertNotNull("Obtained connection as expected", connection);
+            assertThat(connection).as("Obtained connection as expected").isNotNull();
         }
     }
 }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index 4c8d6afeef0..463981d2d59 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -7,8 +7,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * This test belongs in the jdbc module, as it is focused on testing the behaviour of {@link org.testcontainers.containers.JdbcDatabaseContainer}.
@@ -26,11 +25,13 @@ public void testDatabaseHasTmpFsViaConnectionString() throws Exception {
             // check file doesn't exist
             String path = "/testtmpfs/test.file";
             Container.ExecResult execResult = container.execInContainer("ls", path);
-            assertNotEquals("tmpfs inside container doesn't have file that doesn't exist", 0, execResult.getExitCode());
+            assertThat(execResult.getExitCode())
+                .as("tmpfs inside container doesn't have file that doesn't exist")
+                .isNotZero();
             // touch && check file does exist
             container.execInContainer("touch", path);
             execResult = container.execInContainer("ls", path);
-            assertEquals("tmpfs inside container has file that does exist", 0, execResult.getExitCode());
+            assertThat(execResult.getExitCode()).as("tmpfs inside container has file that does exist").isZero();
         }
     }
 }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
index 1b256c0fd6b..6dea67c9e26 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
@@ -8,7 +8,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author richardnorth
@@ -34,7 +34,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
 
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 2a0dd351ad6..2a7db242421 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -10,10 +10,7 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertNotEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
     static {
@@ -28,7 +25,7 @@ public void testSimple() throws SQLException {
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
-            assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
         }
     }
 
@@ -42,7 +39,7 @@ public void testCommandOverride() throws SQLException {
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
             String result = resultSet.getString(1);
-            assertEquals("max_connections should be overriden", "42", result);
+            assertThat(result).as("max_connections should be overriden").isEqualTo("42");
         }
     }
 
@@ -57,7 +54,7 @@ public void testUnsetCommand() throws SQLException {
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
             String result = resultSet.getString(1);
-            assertNotEquals("max_connections should not be overriden", "42", result);
+            assertThat(result).as("max_connections should not be overriden").isNotEqualTo("42");
         }
     }
 
@@ -72,7 +69,7 @@ public void testExplicitInitScript() throws SQLException {
             ResultSet resultSet = performQuery(postgres, "SELECT foo FROM bar");
 
             String firstColumnValue = resultSet.getString(1);
-            assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+            assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
         }
     }
 
@@ -84,9 +81,9 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         ) {
             postgres.start();
             String jdbcUrl = postgres.getJdbcUrl();
-            assertThat(jdbcUrl, containsString("?"));
-            assertThat(jdbcUrl, containsString("&"));
-            assertThat(jdbcUrl, containsString("charSet=UNICODE"));
+            assertThat(jdbcUrl).contains("?");
+            assertThat(jdbcUrl).contains("&");
+            assertThat(jdbcUrl).contains("charSet=UNICODE");
         }
     }
 }
diff --git a/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
index 3772e6d49a6..9ae49b00bd1 100644
--- a/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
+++ b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
@@ -6,7 +6,6 @@
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.Result;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -14,14 +13,14 @@
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestcontainersR2DBCConnectionFactoryTest {
 
     @Test
     public void failsOnUnknownProvider() {
         String nonExistingProvider = UUID.randomUUID().toString();
-        Assertions
-            .assertThatThrownBy(() -> {
+        assertThatThrownBy(() -> {
                 ConnectionFactories.get(String.format("r2dbc:tc:%s:///db", nonExistingProvider));
             })
             .hasMessageContaining("Missing provider")
@@ -64,8 +63,7 @@ public void reusesUntilConnectionFactoryIsClosed() {
 
         close(connectionFactory);
 
-        Assertions
-            .assertThatThrownBy(select::blockFirst)
+        assertThatThrownBy(select::blockFirst)
             .isInstanceOf(PostgresqlException.class)
             // relation "X" does not exists
             // https://github.com/postgres/postgres/blob/REL_10_0/src/backend/utils/errcodes.txt#L349
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 5f0824f8b12..38fab63dc0a 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index d0865a06b09..c49e24ba867 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -13,8 +13,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  *
@@ -41,13 +40,15 @@ protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule) {
         driver.get("http://helloworld:8080");
         WebElement title = driver.findElement(By.tagName("h1"));
 
-        assertEquals("the index page contains the title 'Hello world'", "Hello world", title.getText().trim());
+        assertThat(title.getText().trim())
+            .as("the index page contains the title 'Hello world'")
+            .isEqualTo("Hello world");
     }
 
     protected void assertBrowserNameIs(BrowserWebDriverContainer<?> rule, String expectedName) {
         RemoteWebDriver driver = setupDriverFromRule(rule);
         String actual = driver.getCapabilities().getBrowserName();
-        assertTrue(String.format("actual browser name is %s", actual), actual.equals(expectedName));
+        assertThat(actual).as(String.format("actual browser name is %s", actual)).isEqualTo(expectedName);
     }
 
     @NotNull
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
index 60d113dc290..370d9cffedb 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class BrowserWebDriverContainerTest {
 
@@ -31,7 +31,7 @@ public void honorPresetNoProxyEnvironment() {
             chromeWithNoProxySet.start();
 
             Object noProxy = chromeWithNoProxySet.getEnvMap().get(NO_PROXY_KEY);
-            assertEquals("no_proxy should be preserved by the container rule", NO_PROXY_VALUE, noProxy);
+            assertThat(noProxy).as("no_proxy should be preserved by the container rule").isEqualTo(NO_PROXY_VALUE);
         }
     }
 
@@ -44,7 +44,7 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
             chromeWithoutNoProxySet.start();
 
             Object noProxy = chromeWithoutNoProxySet.getEnvMap().get(NO_PROXY_KEY);
-            assertEquals("no_proxy should be set to default if not already present", "localhost", noProxy);
+            assertThat(noProxy).as("no_proxy should be set to default if not already present").isEqualTo("localhost");
         }
     }
 
@@ -59,9 +59,9 @@ public void createContainerWithShmVolume() {
 
             final List<InspectContainerResponse.Mount> shmVolumes = shmVolumes(webDriverContainer);
 
-            assertEquals("Only one shm mount present", 1, shmVolumes.size());
-            assertEquals("Shm mount source is correct", "/dev/shm", shmVolumes.get(0).getSource());
-            assertEquals("Shm mount mode is correct", "rw", shmVolumes.get(0).getMode());
+            assertThat(shmVolumes).as("Only one shm mount present").hasSize(1);
+            assertThat(shmVolumes.get(0).getSource()).as("Shm mount source is correct").isEqualTo("/dev/shm");
+            assertThat(shmVolumes.get(0).getMode()).as("Shm mount mode is correct").isEqualTo("rw");
         }
     }
 
@@ -74,9 +74,11 @@ public void createContainerWithoutShmVolume() {
         ) {
             webDriverContainer.start();
 
-            assertEquals("Shared memory size is configured", 512 * FileUtils.ONE_MB, webDriverContainer.getShmSize());
+            assertThat(webDriverContainer.getShmSize())
+                .as("Shared memory size is configured")
+                .isEqualTo(512 * FileUtils.ONE_MB);
 
-            assertEquals("No shm mounts present", Collections.emptyList(), shmVolumes(webDriverContainer));
+            assertThat(shmVolumes(webDriverContainer)).as("No shm mounts present").isEqualTo(Collections.emptyList());
         }
     }
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index 2d2feb6aaff..88b40f4fbbe 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -10,7 +10,7 @@
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test that a browser running in a container can access a web server hosted on the host machine (i.e. the one running
@@ -53,10 +53,8 @@ public void testConnection() {
 
         String headingText = driver.findElement(By.cssSelector("h1")).getText().trim();
 
-        assertEquals(
-            "The hardcoded success message was found on a page fetched from a local server",
-            "It worked",
-            headingText
-        );
+        assertThat(headingText)
+            .as("The hardcoded success message was found on a page fetched from a local server")
+            .isEqualTo("It worked");
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
index 4cbfca77d21..6208cb3a5bb 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
@@ -6,7 +6,7 @@
 import java.io.IOException;
 import java.util.jar.Manifest;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by Julien LAMY
@@ -32,6 +32,8 @@ private void checkSeleniumVersionDetected(String urlManifest, String expectedVer
         Manifest manifest = new Manifest();
         manifest.read(this.getClass().getClassLoader().getResourceAsStream(urlManifest));
         String seleniumVersion = SeleniumUtils.getSeleniumVersionFromManifest(manifest);
-        assertEquals("Check if Selenium Version detected is the correct one.", expectedVersion, seleniumVersion);
+        assertThat(seleniumVersion)
+            .as("Check if Selenium Version detected is the correct one.")
+            .isEqualTo(expectedVersion);
     }
 }
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index a1e5f58551a..afe76308ba6 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:3.0.1'
-    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 
     testImplementation project(':test-support')
 }
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index c5982bc45c1..bfe488eaac1 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -10,9 +10,8 @@
 import java.io.IOException;
 import java.time.Duration;
 
-import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertThrows;
-import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class ToxiproxyTest {
 
@@ -53,7 +52,7 @@ public void testDirect() {
         jedis.set("somekey", "somevalue");
 
         final String s = jedis.get("somekey");
-        assertEquals("direct access to the container works OK", "somevalue", s);
+        assertThat(s).as("direct access to the container works OK").isEqualTo("somevalue");
     }
 
     @Test
@@ -90,32 +89,28 @@ public void testConnectionCut() {
         final Jedis jedis = createJedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
         jedis.set("somekey", "somevalue");
 
-        assertEquals(
-            "access to the container works OK before cutting the connection",
-            "somevalue",
-            jedis.get("somekey")
-        );
+        assertThat(jedis.get("somekey"))
+            .as("access to the container works OK before cutting the connection")
+            .isEqualTo("somevalue");
 
         // disableProxy {
         proxy.setConnectionCut(true);
 
         // for example, expect failure when the connection is cut
-        assertThrows(
-            "calls fail when the connection is cut",
-            JedisConnectionException.class,
-            () -> {
+        assertThat(
+            catchThrowable(() -> {
                 jedis.get("somekey");
-            }
-        );
+            })
+        )
+            .as("calls fail when the connection is cut")
+            .isInstanceOf(JedisConnectionException.class);
 
         proxy.setConnectionCut(false);
 
         // and with the connection re-established, expect success
-        assertEquals(
-            "access to the container works OK after re-establishing the connection",
-            "somevalue",
-            jedis.get("somekey")
-        );
+        assertThat(jedis.get("somekey"))
+            .as("access to the container works OK after re-establishing the connection")
+            .isEqualTo("somevalue");
         // }
     }
 
@@ -139,15 +134,15 @@ public void testMultipleProxiesCanBeCreated() {
 
             firstProxy.setConnectionCut(true);
 
-            assertThrows(
-                "calls fail when the connection is cut, for only the relevant proxy",
-                JedisConnectionException.class,
-                () -> {
+            assertThat(
+                catchThrowable(() -> {
                     firstJedis.get("somekey");
-                }
-            );
+                })
+            )
+                .as("calls fail when the connection is cut, for only the relevant proxy")
+                .isInstanceOf(JedisConnectionException.class);
 
-            assertEquals("access via a different proxy is OK", "somevalue", secondJedis.get("somekey"));
+            assertThat(secondJedis.get("somekey")).as("access via a different proxy is OK").isEqualTo("somevalue");
         }
     }
 
@@ -158,38 +153,34 @@ public void testOriginalAndMappedPorts() {
         final String hostViaToxiproxy = TOXIPROXY_NETWORK_ALIAS;
         final int portViaToxiproxy = proxy.getOriginalProxyPort();
         // }
-        assertEquals("host is correct", TOXIPROXY_NETWORK_ALIAS, hostViaToxiproxy);
-        assertEquals("original port is correct", 8666, portViaToxiproxy);
+        assertThat(hostViaToxiproxy).as("host is correct").isEqualTo(TOXIPROXY_NETWORK_ALIAS);
+        assertThat(portViaToxiproxy).as("original port is correct").isEqualTo(8666);
 
         final ToxiproxyContainer.ContainerProxy proxy1 = toxiproxy.getProxy("hostname1", 8080);
-        assertEquals("original port is correct", 8667, proxy1.getOriginalProxyPort());
-        assertEquals(
-            "mapped port is correct",
-            toxiproxy.getMappedPort(proxy1.getOriginalProxyPort()),
-            proxy1.getProxyPort()
-        );
+        assertThat(proxy1.getOriginalProxyPort()).as("original port is correct").isEqualTo(8667);
+        assertThat(proxy1.getProxyPort())
+            .as("mapped port is correct")
+            .isEqualTo(toxiproxy.getMappedPort(proxy1.getOriginalProxyPort()));
 
         final ToxiproxyContainer.ContainerProxy proxy2 = toxiproxy.getProxy("hostname2", 9090);
-        assertEquals("original port is correct", 8668, proxy2.getOriginalProxyPort());
-        assertEquals(
-            "mapped port is correct",
-            toxiproxy.getMappedPort(proxy2.getOriginalProxyPort()),
-            proxy2.getProxyPort()
-        );
+        assertThat(proxy2.getOriginalProxyPort()).as("original port is correct").isEqualTo(8668);
+        assertThat(proxy2.getProxyPort())
+            .as("mapped port is correct")
+            .isEqualTo(toxiproxy.getMappedPort(proxy2.getOriginalProxyPort()));
     }
 
     @Test
     public void testProxyName() {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy("hostname", 7070);
 
-        assertEquals("proxy name is hostname and port", "hostname:7070", proxy.getName());
+        assertThat(proxy.getName()).as("proxy name is hostname and port").isEqualTo("hostname:7070");
     }
 
     @Test
     public void testControlPort() {
         final int controlPort = toxiproxy.getControlPort();
 
-        assertEquals("control port is mapped from port 8474", toxiproxy.getMappedPort(8474), controlPort);
+        assertThat(controlPort).as("control port is mapped from port 8474").isEqualTo(toxiproxy.getMappedPort(8474));
     }
 
     private void checkCallWithLatency(
@@ -203,15 +194,13 @@ private void checkCallWithLatency(
         final long end = System.currentTimeMillis();
         final long duration = end - start;
 
-        assertEquals(String.format("access to the container %s works OK", description), "somevalue", s);
-        assertTrue(
-            String.format("%s there is at least %dms latency", description, expectedMinLatency),
-            duration >= expectedMinLatency
-        );
-        assertTrue(
-            String.format("%s there is no more than %dms latency", description, expectedMaxLatency),
-            duration < expectedMaxLatency
-        );
+        assertThat(s).as(String.format("access to the container %s works OK", description)).isEqualTo("somevalue");
+        assertThat(duration >= expectedMinLatency)
+            .as(String.format("%s there is at least %dms latency", description, expectedMinLatency))
+            .isTrue();
+        assertThat(duration < expectedMaxLatency)
+            .as(String.format("%s there is no more than %dms latency", description, expectedMaxLatency))
+            .isTrue();
     }
 
     private static Jedis createJedis(String host, int port) {

From 7c70a8af559935fe6474848cd30241a2731d484f Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Tue, 9 Aug 2022 09:14:55 +0100
Subject: [PATCH 2103/4969] Removes unused module junit-toolbox (#5678)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 modules/jdbc/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 6047a3c0f3e..43ff0968715 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -9,6 +9,8 @@ dependencies {
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation ('org.mockito:mockito-core:4.6.1') {
+        exclude(module: 'hamcrest-core')
+    }
 }

From 54d7f3931d8856e7a53b8d1b2646aff0faa3dbf2 Mon Sep 17 00:00:00 2001
From: Cheese <qizhi.wang@pingcap.com>
Date: Mon, 15 Aug 2022 22:01:46 +0800
Subject: [PATCH 2104/4969] Add TiDB module (#5511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Kevin Wittek <kevin@wittek.dev>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   2 +
 docs/modules/databases/jdbc.md                |   4 +
 docs/modules/databases/tidb.md                |  25 ++++
 mkdocs.yml                                    |   1 +
 modules/tidb/build.gradle                     |  10 ++
 modules/tidb/sql/init_mysql.sql               |   5 +
 .../testcontainers/tidb/TiDBContainer.java    | 126 ++++++++++++++++++
 .../tidb/TiDBContainerProvider.java           |  32 +++++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 .../org/testcontainers/TiDBTestImages.java    |   8 ++
 .../jdbc/tidb/TiDBJDBCDriverTest.java         |  19 +++
 .../junit/tidb/SimpleTiDBTest.java            |  54 ++++++++
 .../tidb/src/test/resources/logback-test.xml  |  16 +++
 .../src/test/resources/somepath/init_tidb.sql |  16 +++
 18 files changed, 327 insertions(+)
 create mode 100644 docs/modules/databases/tidb.md
 create mode 100644 modules/tidb/build.gradle
 create mode 100644 modules/tidb/sql/init_mysql.sql
 create mode 100644 modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
 create mode 100644 modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainerProvider.java
 create mode 100644 modules/tidb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/tidb/src/test/java/org/testcontainers/TiDBTestImages.java
 create mode 100644 modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java
 create mode 100644 modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
 create mode 100644 modules/tidb/src/test/resources/logback-test.xml
 create mode 100644 modules/tidb/src/test/resources/somepath/init_tidb.sql

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 686086d076c..07d944243cd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -43,6 +43,7 @@ body:
         - RabbitMQ
         - Selenium
         - Solr
+        - TiDB
         - ToxiProxy
         - Trino
         - Vault
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 9ef8eafaab2..ea190cefc80 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -43,6 +43,7 @@ body:
         - RabbitMQ
         - Selenium
         - Solr
+        - TiDB
         - ToxiProxy
         - Trino
         - Vault
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 1ab2693f210..09810d3e56f 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -43,6 +43,7 @@ body:
         - RabbitMQ
         - Selenium
         - Solr
+        - TiDB
         - ToxiProxy
         - Trino
         - Vault
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3e2d53fed65..2d877f664ab 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -197,6 +197,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/tidb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/toxiproxy"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 84e21af744a..826e5c16215 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -73,6 +73,8 @@
   - modules/solr/*
 "modules/spock":
   - modules/spock/*
+"modules/tidb":
+  - modules/tidb/*
 "modules/toxiproxy":
   - modules/toxiproxy/*
 "modules/trino":
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 3c52dd1d8a8..e3a077333cd 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -51,6 +51,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:cockroach:v21.2.3:///databasename`
 
+#### Using TiDB
+
+`jdbc:tc:tidb:v6.1.0:///databasename`
+
 ### Using a classpath init script
 
 Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
diff --git a/docs/modules/databases/tidb.md b/docs/modules/databases/tidb.md
new file mode 100644
index 00000000000..01c6b4cfcd4
--- /dev/null
+++ b/docs/modules/databases/tidb.md
@@ -0,0 +1,25 @@
+# TiDB Module
+
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:tidb:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>tidb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/mkdocs.yml b/mkdocs.yml
index 396986a955b..9491ebe6019 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -63,6 +63,7 @@ nav:
                 - modules/databases/orientdb.md
                 - modules/databases/postgres.md
                 - modules/databases/presto.md
+                - modules/databases/tidb.md
                 - modules/databases/trino.md
           - modules/azure.md
           - modules/docker_compose.md
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
new file mode 100644
index 00000000000..51f15a6a798
--- /dev/null
+++ b/modules/tidb/build.gradle
@@ -0,0 +1,10 @@
+description = "Testcontainers :: JDBC :: TiDB"
+
+dependencies {
+    api project(':jdbc')
+
+    testImplementation project(':jdbc-test')
+    testImplementation 'mysql:mysql-connector-java:8.0.29'
+
+    compileOnly 'org.jetbrains:annotations:23.0.0'
+}
diff --git a/modules/tidb/sql/init_mysql.sql b/modules/tidb/sql/init_mysql.sql
new file mode 100644
index 00000000000..2b00ee968b0
--- /dev/null
+++ b/modules/tidb/sql/init_mysql.sql
@@ -0,0 +1,5 @@
+CREATE TABLE bar (
+  foo VARCHAR(255)
+);
+
+INSERT INTO bar (foo) VALUES ('hello world');
\ No newline at end of file
diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
new file mode 100644
index 00000000000..f8030fd2422
--- /dev/null
+++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
@@ -0,0 +1,126 @@
+package org.testcontainers.tidb;
+
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for TiDB.
+ *
+ * @author Icemap
+ */
+public class TiDBContainer extends JdbcDatabaseContainer<TiDBContainer> {
+
+    static final String NAME = "tidb";
+
+    static final String DOCKER_IMAGE_NAME = "pingcap/tidb";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_IMAGE_NAME);
+
+    private static final Integer TIDB_PORT = 4000;
+
+    private static final int REST_API_PORT = 10080;
+
+    private String databaseName = "test";
+
+    private String username = "root";
+
+    private String password = "";
+
+    public TiDBContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public TiDBContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPorts(TIDB_PORT, REST_API_PORT);
+
+        waitingFor(
+            new HttpWaitStrategy()
+                .forPath("/status")
+                .forPort(REST_API_PORT)
+                .forStatusCode(200)
+                .withStartupTimeout(Duration.ofMinutes(1))
+        );
+    }
+
+    @NotNull
+    @Override
+    protected Set<Integer> getLivenessCheckPorts() {
+        return new HashSet<>(getMappedPort(TIDB_PORT));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            return "com.mysql.cj.jdbc.Driver";
+        } catch (ClassNotFoundException e) {
+            return "com.mysql.jdbc.Driver";
+        }
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(TIDB_PORT) + "/" + databaseName + additionalUrlParams;
+    }
+
+    @Override
+    protected String constructUrlForConnection(String queryString) {
+        String url = super.constructUrlForConnection(queryString);
+
+        if (!url.contains("useSSL=")) {
+            String separator = url.contains("?") ? "&" : "?";
+            url = url + separator + "useSSL=false";
+        }
+
+        if (!url.contains("allowPublicKeyRetrieval=")) {
+            url = url + "&allowPublicKeyRetrieval=true";
+        }
+
+        return url;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1";
+    }
+
+    @Override
+    public TiDBContainer withDatabaseName(final String databaseName) {
+        throw new UnsupportedOperationException("The TiDB docker image does not currently support this");
+    }
+
+    @Override
+    public TiDBContainer withUsername(final String username) {
+        throw new UnsupportedOperationException("The TiDB docker image does not currently support this");
+    }
+
+    @Override
+    public TiDBContainer withPassword(final String password) {
+        throw new UnsupportedOperationException("The TiDB docker image does not currently support this");
+    }
+}
diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainerProvider.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainerProvider.java
new file mode 100644
index 00000000000..ee66771b42c
--- /dev/null
+++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainerProvider.java
@@ -0,0 +1,32 @@
+package org.testcontainers.tidb;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for TiDB containers.
+ */
+public class TiDBContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final String DEFAULT_TAG = "v6.1.0";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(TiDBContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        if (tag != null) {
+            return new TiDBContainer(DockerImageName.parse(TiDBContainer.DOCKER_IMAGE_NAME).withTag(tag));
+        } else {
+            return newInstance();
+        }
+    }
+}
diff --git a/modules/tidb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/tidb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..a4168b00e74
--- /dev/null
+++ b/modules/tidb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.tidb.TiDBContainerProvider
diff --git a/modules/tidb/src/test/java/org/testcontainers/TiDBTestImages.java b/modules/tidb/src/test/java/org/testcontainers/TiDBTestImages.java
new file mode 100644
index 00000000000..32fb57911a2
--- /dev/null
+++ b/modules/tidb/src/test/java/org/testcontainers/TiDBTestImages.java
@@ -0,0 +1,8 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public class TiDBTestImages {
+
+    public static final DockerImageName TIDB_IMAGE = DockerImageName.parse("pingcap/tidb:v6.1.0");
+}
diff --git a/modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java b/modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java
new file mode 100644
index 00000000000..566850fa629
--- /dev/null
+++ b/modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java
@@ -0,0 +1,19 @@
+package org.testcontainers.jdbc.tidb;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+@RunWith(Parameterized.class)
+public class TiDBJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] { { "jdbc:tc:tidb://hostname/databasename", EnumSet.noneOf(Options.class) } }
+        );
+    }
+}
diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
new file mode 100644
index 00000000000..c4833f14224
--- /dev/null
+++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
@@ -0,0 +1,54 @@
+package org.testcontainers.junit.tidb;
+
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Test;
+import org.testcontainers.TiDBTestImages;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.tidb.TiDBContainer;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class SimpleTiDBTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE)) {
+            tidb.start();
+
+            ResultSet resultSet = performQuery(tidb, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            Assert.assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        }
+    }
+
+    @Test
+    public void testExplicitInitScript() throws SQLException {
+        try (
+            TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withInitScript("somepath/init_tidb.sql")
+        ) { // TiDB is expected to be compatible with MySQL
+            tidb.start();
+
+            ResultSet resultSet = performQuery(tidb, "SELECT foo FROM bar");
+
+            String firstColumnValue = resultSet.getString(1);
+            Assert.assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+        }
+    }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withUrlParam("sslmode", "disable");
+
+        try {
+            tidb.start();
+            String jdbcUrl = tidb.getJdbcUrl();
+            Assert.assertThat(jdbcUrl, Matchers.containsString("?"));
+            Assert.assertThat(jdbcUrl, Matchers.containsString("sslmode=disable"));
+        } finally {
+            tidb.stop();
+        }
+    }
+}
diff --git a/modules/tidb/src/test/resources/logback-test.xml b/modules/tidb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/tidb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/tidb/src/test/resources/somepath/init_tidb.sql b/modules/tidb/src/test/resources/somepath/init_tidb.sql
new file mode 100644
index 00000000000..73bc09151cb
--- /dev/null
+++ b/modules/tidb/src/test/resources/somepath/init_tidb.sql
@@ -0,0 +1,16 @@
+CREATE TABLE bar (
+  foo VARCHAR(255)
+);
+
+SELECT "a /* string literal containing comment characters like -- here";
+SELECT "a 'quoting' \"scenario ` involving BEGIN keyword\" here";
+SELECT * from `bar`;
+
+-- What about a line comment containing imbalanced string delimiters? "
+
+/* or a block comment
+    containing imbalanced string delimiters?
+    ' "
+    */
+
+INSERT INTO bar (foo) /* ; */ VALUES ('hello world');

From 89803a204af6c3d4ba8de80d50ac5b43bcd12ea3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:17 +0000
Subject: [PATCH 2105/4969] Bump mockito-core from 4.6.1 to 4.7.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9febf2802e9..c210ed48510 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.15.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
-    testImplementation ('org.mockito:mockito-core:4.6.1') {
+    testImplementation ('org.mockito:mockito-core:4.7.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 13cbb5d321216239524731476649acf9c976ea57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:18 +0000
Subject: [PATCH 2106/4969] Bump java-client from 3.3.2 to 3.3.3 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.3.2...java-client-3.3.3)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index e59e346c29f..10970df542e 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
-    testImplementation 'com.couchbase.client:java-client:3.3.2'
+    testImplementation 'com.couchbase.client:java-client:3.3.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
 }

From 7dcb1d1705fff6c01fb21626954301b2b6c3ab76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:19 +0000
Subject: [PATCH 2107/4969] Bump com.gradle.enterprise.gradle.plugin from
 3.10.3 to 3.11.1

Bumps com.gradle.enterprise.gradle.plugin from 3.10.3 to 3.11.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index b56048c1126..116a4e26506 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
     }
 }

From 3b2c90e71e72be89648e0b0a2b658ce1a6116638 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:19 +0000
Subject: [PATCH 2108/4969] Bump postgresql from 42.4.0 to 42.4.1 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.0 to 42.4.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.0...REL42.4.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 80763e312b5..1fc5dac8d8a 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.4.0'
+    testImplementation 'org.postgresql:postgresql:42.4.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 981d47e0d3e45eb3ab726b08b421cf9cb3b50d91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:19 +0000
Subject: [PATCH 2109/4969] Bump java-driver-core from 4.8.0 to 4.14.1 in
 /modules/cassandra

Bumps [java-driver-core](https://github.com/datastax/java-driver) from 4.8.0 to 4.14.1.
- [Release notes](https://github.com/datastax/java-driver/releases)
- [Commits](https://github.com/datastax/java-driver/compare/4.8.0...4.14.1)

---
updated-dependencies:
- dependency-name: com.datastax.oss:java-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index b00740d09fd..385001db8f8 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -9,5 +9,5 @@ configurations.all {
 dependencies {
     api project(":database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
-    testImplementation 'com.datastax.oss:java-driver-core:4.8.0'
+    testImplementation 'com.datastax.oss:java-driver-core:4.14.1'
 }

From caee839e2b97fe7fee57b71e463a6464ff04faea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:22 +0000
Subject: [PATCH 2110/4969] Bump azure-cosmos from 4.33.1 to 4.34.0 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.33.1 to 4.34.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.33.1...azure-cosmos_4.34.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index c6707401ff6..f8a7193571e 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.33.1'
+    testImplementation 'com.azure:azure-cosmos:4.34.0'
 }

From 88773a7dfda704643972d8ca625f745b5afab4e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:23 +0000
Subject: [PATCH 2111/4969] Bump mariadb-java-client from 3.0.6 to 3.0.7 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.6 to 3.0.7.
- [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/3.0.6...3.0.7)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ed7f428ba3e..1a11f0fbfb6 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.6'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.7'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From e0c1b3652258b8e44f27807fd3a5248417dbe306 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:25 +0000
Subject: [PATCH 2112/4969] Bump postgresql from 42.4.0 to 42.4.1 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.0 to 42.4.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.0...REL42.4.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 57932ec84fd..7e14656f20f 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.4.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }

From aa8a67964f2f2b6aea378081eeb7aa41f3a27c10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:25 +0000
Subject: [PATCH 2113/4969] Bump mssql-jdbc in /modules/mssqlserver

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 11.1.2.jre8-preview to 11.2.0.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 30b9af2bd77..cc05b6ffea4 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.1.2.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre8'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'

From 4495b0c89efb355373faa986772cde94c157f29c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:26 +0000
Subject: [PATCH 2114/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.273 to 1.12.281.
- [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.12.273...1.12.281)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 6abd9cd943a..81ec1f9deb5 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.273'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 2c9e843d09868f3ec877fdb5a9e6916ae59e586e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:27 +0000
Subject: [PATCH 2115/4969] Bump hivemq-extension-sdk from 4.8.2 to 4.8.3 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.8.2 to 4.8.3.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.8.2...4.8.3)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 8336cfd8249..a85288f9fbd 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.2")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.2.11")

From c3586528904a4fcfc1de8cf1666606c248b53b3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:28 +0000
Subject: [PATCH 2116/4969] Bump mockito-core from 4.6.1 to 4.7.0 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 57932ec84fd..03ae3a9a08c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.2.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.6.1') {
+    testImplementation ('org.mockito:mockito-core:4.7.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 3f3987a1ee46c9f0101a055e2e4d4353fcad2fe6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:29 +0000
Subject: [PATCH 2117/4969] Bump postgresql from 42.4.0 to 42.4.1 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.0 to 42.4.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.0...REL42.4.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 87705f77d5d..f769bf9b07c 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.4.0'
+    testImplementation 'org.postgresql:postgresql:42.4.1'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'

From 11ca75a76836b51b649d6464e03d9a2b8dff27be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:29 +0000
Subject: [PATCH 2118/4969] Bump trino-jdbc from 391 to 392 in /modules/trino

Bumps trino-jdbc from 391 to 392.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index c25007bb223..09b5b8cb16c 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:391'
+    testImplementation 'io.trino:trino-jdbc:392'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 7f036604c36b6f68bc938b9ad2695b31025c5a60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:29 +0000
Subject: [PATCH 2119/4969] Bump neo4j from 3.5.34 to 3.5.35 in /modules/neo4j

Bumps [neo4j](https://github.com/neo4j/neo4j) from 3.5.34 to 3.5.35.
- [Release notes](https://github.com/neo4j/neo4j/releases)
- [Commits](https://github.com/neo4j/neo4j/compare/3.5.34...3.5.35)

---
updated-dependencies:
- dependency-name: org.neo4j:neo4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index de42bca2d5d..aabb571edf6 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -29,7 +29,7 @@ task customNeo4jPluginJar(type: Jar) {
 processTestResources.dependsOn customNeo4jPluginJar
 
 dependencies {
-    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.34"
+    customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.35"
 
     api project(":testcontainers")
 

From 7bba5118cfd74b9bee5687e546801e56c7dd8779 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:30 +0000
Subject: [PATCH 2120/4969] Bump aws-java-sdk-s3 from 1.12.273 to 1.12.281 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.273 to 1.12.281.
- [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.12.273...1.12.281)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 8702d2e1a83..0b28ee848ae 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.273'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.281'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.273'

From 3842d784ec323af87bfe958b7ff1422ecbdc2ae6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:30 +0000
Subject: [PATCH 2121/4969] Bump postgresql from 42.4.0 to 42.4.1 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.0 to 42.4.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.0...REL42.4.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3eadd33ea2a..304e0b98dc4 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.4.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'

From ae6d57c4c2999527d0c91ceb90d597432754ceb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:30 +0000
Subject: [PATCH 2122/4969] Bump reactor-core from 3.4.21 to 3.4.22 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.21 to 3.4.22.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.21...v3.4.22)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index f51a13b9296..f38803104a3 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.21'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.22'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 6d873e0f9534706ee5a007eb6e125055f14c4b20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:32 +0000
Subject: [PATCH 2123/4969] Bump mysql-connector-java from 8.0.29 to 8.0.30 in
 /modules/tidb

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.29 to 8.0.30.
- [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.29...8.0.30)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 51f15a6a798..36f6acfe806 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.29'
+    testImplementation 'mysql:mysql-connector-java:8.0.30'
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From f4a68fe044779bef456e0b2cb917fc21f5217c4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:35 +0000
Subject: [PATCH 2124/4969] Bump aws-java-sdk-logs from 1.12.273 to 1.12.281 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.273 to 1.12.281.
- [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.12.273...1.12.281)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 8702d2e1a83..eacdc411a73 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.273'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
     testImplementation 'software.amazon.awssdk:s3:2.17.244'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From dd5dc8a813faa02c8d3bc5b8cf4a697fdf487307 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:35 +0000
Subject: [PATCH 2125/4969] Bump google-cloud-spanner from 6.27.0 to 6.28.0 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.27.0 to 6.28.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.27.0...v6.28.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index ee7f563c88e..bac92bebde9 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.3.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.27.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 93051c42ac1afaa24959b189cec1270ab7f55443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:35 +0000
Subject: [PATCH 2126/4969] Bump actions/cache from 3.0.5 to 3.0.7

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.5 to 3.0.7.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.5...v3.0.7)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 9fa1f78e47b..f23fc66e889 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.7
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -53,7 +53,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.7
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55432b3e2c6..288e9329824 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.7
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -59,7 +59,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.7
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From 63e65926b2b97f7249ffe3f626978948df65327a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:38 +0000
Subject: [PATCH 2127/4969] Bump cucumber-java from 7.5.0 to 7.6.0 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.5.0 to 7.6.0.
- [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/v7.5.0...v7.6.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 ba51bbe0d2c..cc6b073413f 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:7.5.0'
+    testImplementation 'io.cucumber:cucumber-java:7.6.0'
     testImplementation 'io.cucumber:cucumber-junit:7.5.0'
     testImplementation 'org.testcontainers:selenium'
 }

From a45bb987ed20e03fb441fc76da119eeccb04d744 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:39 +0000
Subject: [PATCH 2128/4969] Bump google-cloud-firestore from 3.3.0 to 3.4.0 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.3.0...v3.4.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index ee7f563c88e..f28fb904be8 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.3.0'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.27.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.1'

From 39e2005700fffeb88ed1d4f9788684e1d2b32044 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:02:44 +0000
Subject: [PATCH 2129/4969] Bump com.gradle.enterprise.gradle.plugin in
 /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.10.3 to 3.11.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index be455a78955..1d3956a88cb 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
     }
 }

From 625947f89c7e2fcbebbf70462923987deded02b5 Mon Sep 17 00:00:00 2001
From: Julien <julien.baillagou@gmail.com>
Date: Mon, 15 Aug 2022 16:31:59 +0200
Subject: [PATCH 2130/4969] Add Consul module (#4683)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   2 +
 docs/modules/consul.md                        |  36 +++++++
 mkdocs.yml                                    |   1 +
 modules/consul/build.gradle                   |   9 ++
 .../consul/ConsulContainer.java               | 100 ++++++++++++++++++
 .../consul/ConsulContainerTest.java           |  78 ++++++++++++++
 .../consul/ConsulTestImages.java              |   7 ++
 .../src/test/resources/logback-test.xml       |  16 +++
 12 files changed, 257 insertions(+)
 create mode 100644 docs/modules/consul.md
 create mode 100644 modules/consul/build.gradle
 create mode 100644 modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
 create mode 100644 modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
 create mode 100644 modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java
 create mode 100644 modules/consul/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 07d944243cd..5aca9e624b3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -18,6 +18,7 @@ body:
         - Cassandra
         - Clickhouse
         - CockroachDB
+        - Consul
         - Couchbase
         - DB2
         - Dynalite
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index ea190cefc80..ba5b1f88006 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -18,6 +18,7 @@ body:
         - Cassandra
         - Clickhouse
         - CockroachDB
+        - Consul
         - Couchbase
         - DB2
         - Dynalite
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 09810d3e56f..981f5613a1e 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -18,6 +18,7 @@ body:
         - Cassandra
         - Clickhouse
         - CockroachDB
+        - Consul
         - Couchbase
         - DB2
         - Dynalite
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2d877f664ab..22437e15825 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -42,6 +42,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/consul"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/couchbase"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 826e5c16215..cf75af99d26 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -15,6 +15,8 @@
   - modules/clickhouse/*
 "modules/cockroachdb":
   - modules/cockroachdb/*
+"modules/consul":
+  - modules/consul/*
 "modules/couchbase":
   - modules/couchbase/*
 "modules/db2":
diff --git a/docs/modules/consul.md b/docs/modules/consul.md
new file mode 100644
index 00000000000..1580690cad7
--- /dev/null
+++ b/docs/modules/consul.md
@@ -0,0 +1,36 @@
+# Hashicorp Consul Module
+
+Testcontainers module for [Consul](https://github.com/hashicorp/consul). Consul is a tool for managing key value properties. More information on Consul [here](https://www.consul.io/).
+
+## Usage example
+
+<!--codeinclude-->
+[Running Consul in your Junit tests](../../modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java)
+<!--/codeinclude-->
+
+## Why Consul in Junit tests?
+
+With the increasing popularity of Consul and config externalization, applications are now needing to source properties from Consul.
+This can prove challenging in the development phase without a running Consul instance readily on hand. This library 
+aims to solve your apps integration testing with Consul. You can also use it to
+test how your application behaves with Consul by writing different test scenarios in Junit.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testImplementation "org.testcontainers:consul:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>consul</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/modules/consul/AUTHORS) for contributors.
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 9491ebe6019..a836e0a2ff7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -66,6 +66,7 @@ nav:
                 - modules/databases/tidb.md
                 - modules/databases/trino.md
           - modules/azure.md
+          - modules/consul.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/gcloud.md
diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
new file mode 100644
index 00000000000..0d0d6e7e992
--- /dev/null
+++ b/modules/consul/build.gradle
@@ -0,0 +1,9 @@
+description = "Testcontainers :: Consul"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'com.ecwid.consul:consul-api:1.4.5'
+    testImplementation 'io.rest-assured:rest-assured:4.4.0'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
+}
diff --git a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
new file mode 100644
index 00000000000..0c9d2607072
--- /dev/null
+++ b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
@@ -0,0 +1,100 @@
+package org.testcontainers.consul;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Capability;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Testcontainers implementation for Consul.
+ */
+public class ConsulContainer extends GenericContainer<ConsulContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("consul");
+
+    private static final int CONSUL_HTTP_PORT = 8500;
+
+    private static final int CONSUL_GRPC_PORT = 8502;
+
+    private List<String> initCommands = new ArrayList<>();
+
+    private String[] startConsulCmd = new String[] { "agent", "-dev", "-client", "0.0.0.0" };
+
+    public ConsulContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ConsulContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        // Use the status leader endpoint to verify if consul is running.
+        setWaitStrategy(Wait.forHttp("/v1/status/leader").forPort(CONSUL_HTTP_PORT).forStatusCode(200));
+
+        withCreateContainerCmdModifier(cmd -> cmd.getHostConfig().withCapAdd(Capability.IPC_LOCK));
+        withEnv("CONSUL_ADDR", "http://0.0.0.0:" + CONSUL_HTTP_PORT);
+        withCommand(startConsulCmd);
+        withExposedPorts(CONSUL_HTTP_PORT, CONSUL_GRPC_PORT);
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        runConsulCommands();
+    }
+
+    private void runConsulCommands() {
+        if (!initCommands.isEmpty()) {
+            String commands = initCommands
+                .stream()
+                .map(command -> "consul " + command)
+                .collect(Collectors.joining(" && "));
+            try {
+                ExecResult execResult = this.execInContainer(new String[] { "/bin/sh", "-c", commands });
+                if (execResult.getExitCode() != 0) {
+                    logger()
+                        .error(
+                            "Failed to execute these init commands {}. Exit code {}. Stdout {}. Stderr {}",
+                            initCommands,
+                            execResult.getExitCode(),
+                            execResult.getStdout(),
+                            execResult.getStderr()
+                        );
+                }
+            } catch (IOException | InterruptedException e) {
+                logger()
+                    .error(
+                        "Failed to execute these init commands {}. Exception message: {}",
+                        initCommands,
+                        e.getMessage()
+                    );
+            }
+        }
+    }
+
+    /**
+     * Run consul commands using the consul cli.
+     *
+     * Useful for enableing more secret engines like:
+     * <pre>
+     *     .withConsulCommand("secrets enable pki")
+     *     .withConsulCommand("secrets enable transit")
+     * </pre>
+     * or register specific K/V like:
+     * <pre>
+     *     .withConsulCommand("kv put config/testing1 value123")
+     * </pre>
+     * @param commands The commands to send to the consul cli
+     * @return this
+     */
+    public ConsulContainer withConsulCommand(String... commands) {
+        initCommands.addAll(Arrays.asList(commands));
+        return self();
+    }
+}
diff --git a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
new file mode 100644
index 00000000000..e29ff7ffbd8
--- /dev/null
+++ b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
@@ -0,0 +1,78 @@
+package org.testcontainers.consul;
+
+import com.ecwid.consul.v1.ConsulClient;
+import com.ecwid.consul.v1.Response;
+import com.ecwid.consul.v1.kv.model.GetValue;
+import io.restassured.RestAssured;
+import org.assertj.core.api.Assertions;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This test shows the pattern to use the ConsulContainer @ClassRule for a junit test. It also has tests that ensure
+ * the properties were added correctly by reading from Consul with the CLI and over HTTP.
+ */
+public class ConsulContainerTest {
+
+    @ClassRule
+    public static ConsulContainer consulContainer = new ConsulContainer(ConsulTestImages.CONSUL_IMAGE)
+        .withConsulCommand("kv put config/testing1 value123");
+
+    @Test
+    public void readFirstPropertyPathWithCli() throws IOException, InterruptedException {
+        GenericContainer.ExecResult result = consulContainer.execInContainer("consul", "kv", "get", "config/testing1");
+        final String output = result.getStdout().replaceAll("\\r?\\n", "");
+        MatcherAssert.assertThat(output, CoreMatchers.containsString("value123"));
+    }
+
+    @Test
+    public void readFirstSecretPathOverHttpApi() throws InterruptedException {
+        RestAssured
+            .given()
+            .when()
+            .get("http://" + getHostAndPort() + "/v1/kv/config/testing1")
+            .then()
+            .assertThat()
+            .body(
+                "[0].Value",
+                CoreMatchers.equalTo(Base64.getEncoder().encodeToString("value123".getBytes(StandardCharsets.UTF_8)))
+            );
+    }
+
+    @Test
+    public void writeAndReadMultipleValuesUsingClient() {
+        final ConsulClient consulClient = new ConsulClient(
+            consulContainer.getHost(),
+            consulContainer.getFirstMappedPort()
+        );
+
+        final Map<String, String> properties = new HashMap<>();
+        properties.put("value", "world");
+        properties.put("other_value", "another world");
+
+        // Write operation
+        properties.forEach((key, value) -> {
+            Response<Boolean> writeResponse = consulClient.setKVValue(key, value);
+            Assertions.assertThat(writeResponse.getValue()).isTrue();
+        });
+
+        // Read operation
+        properties.forEach((key, value) -> {
+            Response<GetValue> readResponse = consulClient.getKVValue(key);
+            Assertions.assertThat(readResponse.getValue().getDecodedValue()).isEqualTo(value);
+        });
+    }
+
+    private String getHostAndPort() {
+        return consulContainer.getHost() + ":" + consulContainer.getMappedPort(8500);
+    }
+}
diff --git a/modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java b/modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java
new file mode 100644
index 00000000000..de2b9702066
--- /dev/null
+++ b/modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers.consul;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface ConsulTestImages {
+    DockerImageName CONSUL_IMAGE = DockerImageName.parse("consul:1.10.12");
+}
diff --git a/modules/consul/src/test/resources/logback-test.xml b/modules/consul/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/consul/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>

From 84102fe2590c9128f218a3c65ac77e3a606d69bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 14:32:43 +0000
Subject: [PATCH 2131/4969] Bump assertj-core from 3.21.0 to 3.23.1 in
 /modules/consul

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.23.1.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.21.0...assertj-core-3.23.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index 0d0d6e7e992..49e9b404690 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:4.4.0'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From df2b1d1aed8b8f612059781ff9c620ef06eb2999 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:24 +0000
Subject: [PATCH 2132/4969] Bump google-cloud-bigtable from 2.10.1 to 2.10.3 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.10.1 to 2.10.3.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.10.1...v2.10.3)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 60778fff111..ce332830e07 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 9b51b77f02d776583cca635e55e114b82b687f57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:25 +0000
Subject: [PATCH 2133/4969] Bump common-custom-user-data-gradle-plugin from
 1.7.2 to 1.8.0

Bumps common-custom-user-data-gradle-plugin from 1.7.2 to 1.8.0.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 116a4e26506..bd51349bb05 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.0"
     }
 }
 

From b1cd2beca42b259813fa09884c279b79cf0f9b71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:34 +0000
Subject: [PATCH 2134/4969] Bump aws-java-sdk-sqs from 1.12.273 to 1.12.282 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.273 to 1.12.282.
- [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.12.273...1.12.282)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ea528389c23..98027ef09b7 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.281'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.282'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
     testImplementation 'software.amazon.awssdk:s3:2.17.244'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From c3ba559f13f32b44353efc59cc44d4b7f66faf8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:49 +0000
Subject: [PATCH 2135/4969] Bump google-cloud-datastore from 2.10.1 to 2.11.0
 in /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.10.1...v2.11.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 60778fff111..5202c3c8fbe 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'

From 04c7b0a49c470592cb8fa1f1344273987a87e598 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:49 +0000
Subject: [PATCH 2136/4969] Bump google-cloud-pubsub from 1.120.6 to 1.120.11
 in /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.6 to 1.120.11.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.6...v1.120.11)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 60778fff111..db006563c74 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.11'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 115eca1a326bf7fc4e925461ddfdccc987e3a0c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:51 +0000
Subject: [PATCH 2137/4969] Bump postgresql from 42.4.0 to 42.4.1 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.0 to 42.4.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.0...REL42.4.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c6272fc7522..ab32d55df91 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220320'
-    testImplementation 'org.postgresql:postgresql:42.4.0'
+    testImplementation 'org.postgresql:postgresql:42.4.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
 }

From 66e51c890f9992d4fbfdfb01138252821e97a09f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:51 +0000
Subject: [PATCH 2138/4969] Bump mockito-core from 4.6.1 to 4.7.0 in
 /modules/jdbc

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 43ff0968715..ba0f845b47d 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation ('org.mockito:mockito-core:4.6.1') {
+    testImplementation ('org.mockito:mockito-core:4.7.0') {
         exclude(module: 'hamcrest-core')
     }
 }

From 5bc0a1c0c5f741ca63e595c69b47a44a165935ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:32:54 +0000
Subject: [PATCH 2139/4969] Bump s3 from 2.17.244 to 2.17.253 in
 /modules/localstack

Bumps s3 from 2.17.244 to 2.17.253.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ea528389c23..d29dbda0cd2 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
-    testImplementation 'software.amazon.awssdk:s3:2.17.244'
+    testImplementation 'software.amazon.awssdk:s3:2.17.253'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From f92ff763362857e9f0854ed3c7a43673ff0dad5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:33:04 +0000
Subject: [PATCH 2140/4969] Bump rest-assured from 4.4.0 to 5.1.1 in
 /modules/consul

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 4.4.0 to 5.1.1.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.4.0...rest-assured-5.1.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index 49e9b404690..acb97a47927 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:4.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.1.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 159922275dd6ddb6ecac7f6ea7b0a923ab9e509c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:33:04 +0000
Subject: [PATCH 2141/4969] Bump common-custom-user-data-gradle-plugin in
 /examples

Bumps common-custom-user-data-gradle-plugin from 1.7.2 to 1.8.0.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 1d3956a88cb..83ba91e8321 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.0"
     }
 }
 

From ae2e71c82bc33922376f7272b9801d79025bd068 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 01:33:07 +0000
Subject: [PATCH 2142/4969] Bump cucumber-junit from 7.5.0 to 7.6.0 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.5.0 to 7.6.0.
- [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/v7.5.0...v7.6.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 cc6b073413f..ab0331f81f4 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:7.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.5.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.6.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 6a3e649b296bba3c5723a2538b21d4eabb593cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 16 Aug 2022 09:25:10 -0500
Subject: [PATCH 2143/4969] Move junit4 to assertj (#5685)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 config/checkstyle/checkstyle.xml              |  4 -
 .../FrameConsumerResultCallbackTest.java      | 27 ++++---
 .../DockerClientConfigUtilsTest.java          | 14 ++--
 .../images/AgeBasedPullPolicyTest.java        |  7 +-
 .../images/ParsedDockerfileTest.java          | 74 ++++++++-----------
 .../images/RemoteDockerImageTest.java         | 26 +++----
 .../junit/FixedHostPortContainerTest.java     | 13 ++--
 .../strategy/AbstractWaitStrategyTest.java    |  8 +-
 .../wait/strategy/HttpWaitStrategyTest.java   |  7 +-
 .../utility/ComparableVersionTest.java        |  4 +-
 .../DefaultImageNameSubstitutorTest.java      |  7 +-
 .../DockerImageNameCompatibilityTest.java     | 14 +---
 .../utility/DockerStatusTest.java             | 31 ++++----
 .../utility/FilterRegistryTest.java           | 10 +--
 .../utility/ResourceReaperTest.java           |  3 +-
 .../test/java/generic/CmdModifierTest.java    |  6 +-
 .../src/test/java/generic/CommandsTest.java   |  4 +-
 .../java/generic/ContainerCreationTest.java   |  6 +-
 .../src/test/java/generic/DependsOnTest.java  |  6 +-
 .../src/test/java/generic/ExecTest.java       |  6 +-
 .../java/generic/HostPortExposedTest.java     |  4 +-
 .../test/java/generic/WaitStrategiesTest.java |  8 +-
 docs/examples/junit4/redis/build.gradle       |  1 +
 .../quickstart/RedisBackedCacheIntTest.java   |  4 +-
 .../RedisBackedCacheIntTestStep0.java         |  4 +-
 examples/linked-container/build.gradle        |  1 +
 .../linkedcontainer/RedmineClientTest.java    |  7 +-
 .../containers/Neo4jExampleTest.java          |  2 +-
 modules/cassandra/build.gradle                |  2 +
 .../containers/CassandraContainerTest.java    | 34 ++++-----
 .../containers/CassandraDriver3Test.java      |  4 +-
 .../containers/CassandraDriver4Test.java      |  4 +-
 .../consul/ConsulContainerTest.java           | 25 +++----
 modules/couchbase/build.gradle                |  1 +
 .../couchbase/CouchbaseContainerTest.java     | 27 +++----
 modules/influxdb/build.gradle                 |  1 +
 .../containers/InfluxDBContainerTest.java     | 14 ++--
 .../InfluxDBContainerWithUserTest.java        | 26 +++----
 .../jdbc/ContainerDatabaseDriverTest.java     |  5 +-
 .../junit/jupiter/PostgresContainerTests.java |  4 +-
 ...tLifecycleAwareExceptionCapturingTest.java |  7 +-
 .../localstack/LocalstackContainerTest.java   |  3 +-
 modules/mongodb/build.gradle                  |  1 +
 .../containers/MongoDBContainerTest.java      | 11 +--
 .../junit/oracle/SimpleOracleTest.java        | 16 ++--
 .../containers/PrestoContainerTest.java       | 71 ++++++++----------
 .../DefaultRecordingFileFactoryTest.java      |  5 +-
 ...ChromeRecordingWebDriverContainerTest.java | 19 +++--
 modules/solr/build.gradle                     |  2 +-
 .../containers/SolrContainerTest.java         | 12 ++-
 .../junit/tidb/SimpleTiDBTest.java            | 12 +--
 .../containers/TrinoContainerTest.java        | 26 +++----
 .../vault/VaultContainerTest.java             | 46 ++++++------
 test-support/build.gradle                     |  1 +
 .../testsupport/FlakyRuleTest.java            | 34 +++++----
 55 files changed, 325 insertions(+), 396 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 6e73f4da4aa..6e51c56c942 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -29,11 +29,7 @@
                       org.assertj.core.api.Assertions.*,
                       org.assertj.core.api.Assumptions.*,
                       org.awaitility.Awaitility.*,
-                      org.hamcrest.Matchers.*,
-                      org.hamcrest.MatcherAssert.*,
-                      org.junit.Assert.*,
                       org.junit.Assume.*,
-                      org.junit.jupiter.api.Assertions.*,
                       org.mockito.Mockito.*,
                       org.mockito.ArgumentMatchers.*,
                       org.mockserver.model.HttpRequest.*,
diff --git a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
index 5282712b733..298e7a981a0 100644
--- a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
@@ -10,8 +10,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class FrameConsumerResultCallbackTest {
 
@@ -26,7 +25,7 @@ public void passStderrFrameWithoutColors() {
         ToStringConsumer consumer = new ToStringConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
         callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
-        assertEquals(LOG_RESULT, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(LOG_RESULT);
     }
 
     @Test
@@ -35,7 +34,7 @@ public void passStderrFrameWithColors() {
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
         callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
-        assertEquals(FRAME_PAYLOAD, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(FRAME_PAYLOAD);
     }
 
     @Test
@@ -44,7 +43,7 @@ public void passStdoutFrameWithoutColors() {
         ToStringConsumer consumer = new ToStringConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
-        assertEquals(LOG_RESULT, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(LOG_RESULT);
     }
 
     @Test
@@ -53,7 +52,7 @@ public void passStdoutFrameWithColors() {
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
-        assertEquals(FRAME_PAYLOAD, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(FRAME_PAYLOAD);
     }
 
     @Test
@@ -62,7 +61,7 @@ public void basicConsumer() {
         BasicConsumer consumer = new BasicConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
-        assertEquals(LOG_RESULT, consumer.toString());
+        assertThat(consumer.toString()).isEqualTo(LOG_RESULT);
     }
 
     @Test
@@ -71,7 +70,7 @@ public void passStdoutNull() {
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, null));
-        assertEquals("", consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo("");
     }
 
     @Test
@@ -81,7 +80,7 @@ public void passStdoutEmptyLine() {
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
-        assertEquals(payload, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(payload);
     }
 
     @Test
@@ -91,7 +90,7 @@ public void passStdoutSingleLine() {
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
-        assertEquals(payload, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(payload);
     }
 
     @Test
@@ -101,7 +100,7 @@ public void passStdoutSingleLineWithNewline() {
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
-        assertEquals(payload, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(payload);
     }
 
     @Test
@@ -130,7 +129,7 @@ public void passRawFrameWithoutColors() throws TimeoutException, IOException {
         } catch (Exception e) {
             exception = e;
         }
-        assertTrue(exception instanceof TimeoutException);
+        assertThat(exception instanceof TimeoutException).isTrue();
         callback.close();
         waitConsumer.waitUntil(
             frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Test3"),
@@ -180,7 +179,7 @@ public void passRawFrameWithColors() throws TimeoutException, IOException {
         } catch (Exception e) {
             exception = e;
         }
-        assertTrue(exception instanceof TimeoutException);
+        assertThat(exception instanceof TimeoutException).isTrue();
         callback.close();
         waitConsumer.waitUntil(
             frame -> {
@@ -208,7 +207,7 @@ public void reconstructBreakedUnicode() throws IOException {
         callback.onNext(new Frame(StreamType.RAW, bytes1));
         callback.onNext(new Frame(StreamType.RAW, bytes2));
         callback.close();
-        assertEquals(payload, consumer.toUtf8String());
+        assertThat(consumer.toUtf8String()).isEqualTo(payload);
     }
 
     private static class BasicConsumer implements Consumer<OutputFrame> {
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
index 39e1338bc46..d14ffda42cc 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -7,9 +7,7 @@
 
 import java.net.URI;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DockerClientConfigUtilsTest {
 
@@ -23,7 +21,7 @@ public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
             client,
             URI.create("unix:///var/run/docker.sock")
         );
-        assertEquals("localhost", actual);
+        assertThat(actual).isEqualTo("localhost");
     }
 
     @Test
@@ -32,7 +30,7 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
             client,
             URI.create("http://12.23.34.45")
         );
-        assertEquals("12.23.34.45", actual);
+        assertThat(actual).isEqualTo("12.23.34.45");
     }
 
     @Test
@@ -41,7 +39,7 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
             client,
             URI.create("tcp://12.23.34.45")
         );
-        assertEquals("12.23.34.45", actual);
+        assertThat(actual).isEqualTo("12.23.34.45");
     }
 
     @Test
@@ -50,11 +48,11 @@ public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
             client,
             URI.create("gopher://12.23.34.45")
         );
-        assertNull(actual);
+        assertThat(actual).isNull();
     }
 
     @Test(timeout = 5_000)
     public void getDefaultGateway() {
-        assertNotNull(DockerClientConfigUtils.getDefaultGateway());
+        assertThat(DockerClientConfigUtils.getDefaultGateway()).isNotNull();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
index 96fdfa4010b..0bdf969688b 100644
--- a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
@@ -8,8 +8,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class AgeBasedPullPolicyTest {
 
@@ -20,9 +19,9 @@ public void shouldPull() {
         ImageData imageData = ImageData.builder().createdAt(Instant.now().minus(2, ChronoUnit.HOURS)).build();
 
         AgeBasedPullPolicy oneHour = new AgeBasedPullPolicy(Duration.of(1L, ChronoUnit.HOURS));
-        assertTrue(oneHour.shouldPullCached(imageName, imageData));
+        assertThat(oneHour.shouldPullCached(imageName, imageData)).isTrue();
 
         AgeBasedPullPolicy fiveHours = new AgeBasedPullPolicy(Duration.of(5L, ChronoUnit.HOURS));
-        assertFalse(fiveHours.shouldPullCached(imageName, imageData));
+        assertThat(fiveHours.shouldPullCached(imageName, imageData)).isFalse();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
index cd4509965e6..f8c66860022 100644
--- a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
@@ -6,7 +6,7 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ParsedDockerfileTest {
 
@@ -15,11 +15,9 @@ public void doesSimpleParsing() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage", "RUN something")
         );
-        assertEquals(
-            "extracts a single image name",
-            Sets.newHashSet("someimage"),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("extracts a single image name")
+            .isEqualTo(Sets.newHashSet("someimage"));
     }
 
     @Test
@@ -27,11 +25,9 @@ public void isCaseInsensitive() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("from someimage", "RUN something")
         );
-        assertEquals(
-            "extracts a single image name",
-            Sets.newHashSet("someimage"),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("extracts a single image name")
+            .isEqualTo(Sets.newHashSet("someimage"));
     }
 
     @Test
@@ -39,11 +35,9 @@ public void handlesTags() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage:tag", "RUN something")
         );
-        assertEquals(
-            "retains tags in image names",
-            Sets.newHashSet("someimage:tag"),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("retains tags in image names")
+            .isEqualTo(Sets.newHashSet("someimage:tag"));
     }
 
     @Test
@@ -51,11 +45,9 @@ public void handlesDigests() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage@sha256:abc123", "RUN something")
         );
-        assertEquals(
-            "retains digests in image names",
-            Sets.newHashSet("someimage@sha256:abc123"),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("retains digests in image names")
+            .isEqualTo(Sets.newHashSet("someimage@sha256:abc123"));
     }
 
     @Test
@@ -63,11 +55,9 @@ public void ignoringCommentedFromLines() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage", "#FROM somethingelse")
         );
-        assertEquals(
-            "ignores commented from lines",
-            Sets.newHashSet("someimage"),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("ignores commented from lines")
+            .isEqualTo(Sets.newHashSet("someimage"));
     }
 
     @Test
@@ -75,11 +65,9 @@ public void ignoringBuildStageNames() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage --as=base", "RUN something", "FROM nextimage", "RUN something")
         );
-        assertEquals(
-            "ignores build stage names and allows multiple images to be extracted",
-            Sets.newHashSet("someimage", "nextimage"),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("ignores build stage names and allows multiple images to be extracted")
+            .isEqualTo(Sets.newHashSet("someimage", "nextimage"));
     }
 
     @Test
@@ -87,7 +75,9 @@ public void ignoringPlatformArgs() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM --platform=linux/amd64 someimage", "RUN something")
         );
-        assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("ignores platform args")
+            .isEqualTo(Sets.newHashSet("someimage"));
     }
 
     @Test
@@ -95,7 +85,9 @@ public void ignoringExtraPlatformArgs() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM --platform=linux/amd64 --somethingelse=value someimage", "RUN something")
         );
-        assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("ignores platform args")
+            .isEqualTo(Sets.newHashSet("someimage"));
     }
 
     @Test
@@ -103,20 +95,16 @@ public void handlesGracefullyIfNoFromLine() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("RUN something", "# is this even a valid Dockerfile?")
         );
-        assertEquals(
-            "handles invalid Dockerfiles gracefully",
-            Sets.newHashSet(),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("handles invalid Dockerfiles gracefully")
+            .isEqualTo(Sets.newHashSet());
     }
 
     @Test
     public void handlesGracefullyIfDockerfileNotFound() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(Paths.get("nonexistent.Dockerfile"));
-        assertEquals(
-            "handles missing Dockerfiles gracefully",
-            Sets.newHashSet(),
-            parsedDockerfile.getDependencyImageNames()
-        );
+        assertThat(parsedDockerfile.getDependencyImageNames())
+            .as("handles missing Dockerfiles gracefully")
+            .isEqualTo(Sets.newHashSet());
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
index 592d46f33d1..9e4ac66fb53 100644
--- a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
+++ b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
@@ -9,9 +9,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class RemoteDockerImageTest {
 
@@ -19,7 +17,7 @@ public class RemoteDockerImageTest {
     public void toStringContainsOnlyImageName() {
         String imageName = Base58.randomString(8).toLowerCase();
         RemoteDockerImage remoteDockerImage = new RemoteDockerImage(DockerImageName.parse(imageName));
-        assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
+        assertThat(remoteDockerImage.toString()).contains("imageName=" + imageName);
     }
 
     @Test
@@ -28,7 +26,7 @@ public void toStringWithExceptionContainsOnlyImageNameFuture() {
         imageNameFuture.completeExceptionally(new RuntimeException("arbitrary"));
 
         RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageNameFuture);
-        assertThat(remoteDockerImage.toString(), containsString("imageName=java.lang.RuntimeException: arbitrary"));
+        assertThat(remoteDockerImage.toString()).contains("imageName=java.lang.RuntimeException: arbitrary");
     }
 
     @Test(timeout = 5000L)
@@ -36,17 +34,17 @@ public void toStringDoesntResolveImageNameFuture() {
         CompletableFuture<String> imageNameFuture = new CompletableFuture<>();
 
         // verify that we've set up the test properly
-        assertFalse(imageNameFuture.isDone());
+        assertThat(imageNameFuture).isNotDone();
 
         RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageNameFuture);
-        assertThat(remoteDockerImage.toString(), containsString("imageName=<resolving>"));
+        assertThat(remoteDockerImage.toString()).contains("imageName=<resolving>");
 
         // Make sure the act of calling toString doesn't resolve the imageNameFuture
-        assertFalse(imageNameFuture.isDone());
+        assertThat(imageNameFuture).isNotDone();
 
         String imageName = Base58.randomString(8).toLowerCase();
         imageNameFuture.complete(imageName);
-        assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
+        assertThat(remoteDockerImage.toString()).contains("imageName=" + imageName);
     }
 
     @Test(timeout = 5000L)
@@ -62,17 +60,17 @@ protected String resolve() {
         };
 
         // verify that we've set up the test properly
-        assertFalse(imageNameFuture.isDone());
+        assertThat(imageNameFuture).isNotDone();
 
         RemoteDockerImage remoteDockerImage = new RemoteDockerImage(imageNameFuture);
-        assertThat(remoteDockerImage.toString(), containsString("imageName=<resolving>"));
+        assertThat(remoteDockerImage.toString()).contains("imageName=<resolving>");
 
         // Make sure the act of calling toString doesn't resolve the imageNameFuture
-        assertFalse(imageNameFuture.isDone());
-        assertFalse(resolved.get());
+        assertThat(imageNameFuture).isNotDone();
+        assertThat(resolved).isFalse();
 
         // Trigger resolve
         imageNameFuture.get();
-        assertThat(remoteDockerImage.toString(), containsString("imageName=" + imageName));
+        assertThat(remoteDockerImage.toString()).contains("imageName=" + imageName);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index 08545535e6b..45feb85b359 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -13,8 +13,7 @@
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test of {@link FixedHostPortGenericContainer}. Note that this is not an example of typical use (usually, a container
@@ -68,14 +67,12 @@ public void testFixedHostPortMapping() throws IOException {
         ) {
             echoServer.start();
 
-            assertThat(
-                "Port mapping does not seem to match given fixed port",
-                echoServer.getMappedPort(TEST_PORT),
-                equalTo(unusedHostPort)
-            );
+            assertThat(echoServer.getMappedPort(TEST_PORT))
+                .as("Port mapping does not seem to match given fixed port")
+                .isEqualTo(unusedHostPort);
 
             final String content = this.readResponse(echoServer, unusedHostPort);
-            assertThat("Returned echo from fixed port does not match expected", content, equalTo(TEST_RESPONSE));
+            assertThat(content).as("Returned echo from fixed port does not match expected").isEqualTo(TEST_RESPONSE);
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
index 45809f95627..23ad3802c1b 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
@@ -13,7 +13,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Common test methods for {@link WaitStrategy} implementations.
@@ -124,9 +123,8 @@ protected void waitUntilReadyAndSucceed(GenericContainer<?> container) {
         // start() blocks until successful or timeout
         container.start();
 
-        assertTrue(
-            String.format("Expected container to be ready after timeout of %sms", WAIT_TIMEOUT_MILLIS),
-            ready.get()
-        );
+        assertThat(ready)
+            .as(String.format("Expected container to be ready after timeout of %sms", WAIT_TIMEOUT_MILLIS))
+            .isTrue();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index 972bf2ab66a..37bbe985bac 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -11,8 +11,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for {@link HttpWaitStrategy}.
@@ -55,8 +54,8 @@ public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
 
             String logs = container.getLogs();
 
-            assertThat(logs, containsString("foo: bar"));
-            assertThat(logs, containsString("baz: boo"));
+            assertThat(logs).contains("foo: bar");
+            assertThat(logs).contains("baz: boo");
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java b/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
index fb3c7e05c0b..cd95d8a5f3d 100644
--- a/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
@@ -7,7 +7,7 @@
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Parameterized.class)
 public class ComparableVersionTest {
@@ -23,7 +23,7 @@ public ComparableVersionTest(final String given, final int[] expected) {
 
     @Test
     public void shouldParseVersions() {
-        assertArrayEquals(expected, ComparableVersion.parseVersion(given));
+        assertThat(ComparableVersion.parseVersion(given)).containsExactly(expected);
     }
 
     @Parameters(name = "Parsed version: {0}={1}")
diff --git a/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
index 0978003f815..90f7745edd7 100644
--- a/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
@@ -5,8 +5,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 
 public class DefaultImageNameSubstitutorTest {
@@ -34,7 +33,7 @@ public void testConfigurationLookup() {
 
         final DockerImageName substitute = underTest.apply(ORIGINAL_IMAGE);
 
-        assertEquals("match is found", SUBSTITUTE_IMAGE, substitute);
-        assertTrue("compatibility is automatically set", substitute.isCompatibleWith(ORIGINAL_IMAGE));
+        assertThat(substitute).as("match is found").isEqualTo(SUBSTITUTE_IMAGE);
+        assertThat(substitute.isCompatibleWith(ORIGINAL_IMAGE)).as("compatibility is automatically set").isTrue();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index e9aac2ed475..0bb1b3f75ca 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -1,17 +1,12 @@
 package org.testcontainers.utility;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.containsString;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class DockerImageNameCompatibilityTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
     public void testPlainImage() {
         DockerImageName subject = DockerImageName.parse("foo");
@@ -98,10 +93,9 @@ public void testAssertMethodAcceptsCompatible() {
 
     @Test
     public void testAssertMethodRejectsIncompatible() {
-        thrown.expect(IllegalStateException.class);
-        thrown.expectMessage(containsString("Failed to verify that image 'foo' is a compatible substitute for 'bar'"));
-
         DockerImageName subject = DockerImageName.parse("foo");
-        subject.assertCompatibleWith(DockerImageName.parse("bar"));
+        assertThatThrownBy(() -> subject.assertCompatibleWith(DockerImageName.parse("bar")))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Failed to verify that image 'foo' is a compatible substitute for 'bar'");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
index 36196aaf4c1..304bbc4190d 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
@@ -11,8 +11,7 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
 /**
@@ -63,24 +62,24 @@ public static Object[][] parameters() {
 
     @Test
     public void testRunning() throws Exception {
-        assertTrue(DockerStatus.isContainerRunning(running, minimumDuration, now));
-        assertTrue(DockerStatus.isContainerRunning(runningVariant, minimumDuration, now));
-        assertFalse(DockerStatus.isContainerRunning(shortRunning, minimumDuration, now));
-        assertFalse(DockerStatus.isContainerRunning(created, minimumDuration, now));
-        assertFalse(DockerStatus.isContainerRunning(createdVariant, minimumDuration, now));
-        assertFalse(DockerStatus.isContainerRunning(exited, minimumDuration, now));
-        assertFalse(DockerStatus.isContainerRunning(paused, minimumDuration, now));
+        assertThat(DockerStatus.isContainerRunning(running, minimumDuration, now)).isTrue();
+        assertThat(DockerStatus.isContainerRunning(runningVariant, minimumDuration, now)).isTrue();
+        assertThat(DockerStatus.isContainerRunning(shortRunning, minimumDuration, now)).isFalse();
+        assertThat(DockerStatus.isContainerRunning(created, minimumDuration, now)).isFalse();
+        assertThat(DockerStatus.isContainerRunning(createdVariant, minimumDuration, now)).isFalse();
+        assertThat(DockerStatus.isContainerRunning(exited, minimumDuration, now)).isFalse();
+        assertThat(DockerStatus.isContainerRunning(paused, minimumDuration, now)).isFalse();
     }
 
     @Test
     public void testStopped() throws Exception {
-        assertFalse(DockerStatus.isContainerStopped(running));
-        assertFalse(DockerStatus.isContainerStopped(runningVariant));
-        assertFalse(DockerStatus.isContainerStopped(shortRunning));
-        assertFalse(DockerStatus.isContainerStopped(created));
-        assertFalse(DockerStatus.isContainerStopped(createdVariant));
-        assertTrue(DockerStatus.isContainerStopped(exited));
-        assertFalse(DockerStatus.isContainerStopped(paused));
+        assertThat(DockerStatus.isContainerStopped(running)).isFalse();
+        assertThat(DockerStatus.isContainerStopped(runningVariant)).isFalse();
+        assertThat(DockerStatus.isContainerStopped(shortRunning)).isFalse();
+        assertThat(DockerStatus.isContainerStopped(created)).isFalse();
+        assertThat(DockerStatus.isContainerStopped(createdVariant)).isFalse();
+        assertThat(DockerStatus.isContainerStopped(exited)).isTrue();
+        assertThat(DockerStatus.isContainerStopped(paused)).isFalse();
     }
 
     private String buildTimestamp(Instant instant) {
diff --git a/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java b/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
index 30367975d1e..2741edb5cee 100644
--- a/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
+++ b/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
@@ -13,9 +13,7 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class FilterRegistryTest {
 
@@ -38,7 +36,7 @@ public void registerReturnsTrueIfAcknowledgementIsReadFromInputStream() throws I
 
         boolean successful = registry.register(FILTERS);
 
-        assertTrue(successful);
+        assertThat(successful).isTrue();
     }
 
     @Test
@@ -47,7 +45,7 @@ public void registerReturnsFalseIfNoAcknowledgementIsReadFromInputStream() throw
 
         boolean successful = registry.register(FILTERS);
 
-        assertFalse(successful);
+        assertThat(successful).isFalse();
     }
 
     @Test
@@ -57,7 +55,7 @@ public void registerWritesUrlEncodedFiltersAndNewlineToOutputStream() throws IOE
 
         registry.register(FILTERS);
 
-        assertEquals(URL_ENCODED_FILTERS + NEW_LINE, new String(outputStream.toByteArray()));
+        assertThat(new String(outputStream.toByteArray())).isEqualTo(URL_ENCODED_FILTERS + NEW_LINE);
     }
 
     private static InputStream inputStream(byte[] bytes) {
diff --git a/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
index 60f57a28b3e..77c5d528ba4 100644
--- a/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
@@ -20,7 +20,6 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
 
 public class ResourceReaperTest {
 
@@ -81,7 +80,7 @@ private Map<String, String> runProcess(Consumer<ProcessExecutor> processExecutor
         processExecutorConsumer.accept(processExecutor);
 
         ProcessResult result = processExecutor.execute();
-        assertEquals(0, result.getExitValue());
+        assertThat(result.getExitValue()).isEqualTo(0);
 
         String labelsJson = Stream
             .of(result.outputUTF8().split("\n"))
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index 218ed90e5e0..a32f23ca8c2 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.util.Objects;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CmdModifierTest {
 
@@ -43,13 +43,13 @@ public class CmdModifierTest {
     @Test
     public void testHostnameModified() throws IOException, InterruptedException {
         final Container.ExecResult execResult = theCache.execInContainer("hostname");
-        assertEquals("the-cache", execResult.getStdout().trim());
+        assertThat(execResult.getStdout().trim()).isEqualTo("the-cache");
     }
 
     @Test
     public void testMemoryLimitModified() throws IOException, InterruptedException {
         final Container.ExecResult execResult = memoryLimitedRedis.execInContainer("cat", getMemoryLimitFilePath());
-        assertEquals(String.valueOf(memoryInBytes), execResult.getStdout().trim());
+        assertThat(execResult.getStdout().trim()).isEqualTo(String.valueOf(memoryInBytes));
     }
 
     private String getMemoryLimitFilePath() {
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
index 80292465521..3cab77770dc 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
@@ -5,7 +5,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CommandsTest {
 
@@ -18,6 +18,6 @@ public class CommandsTest {
 
     @Test
     public void testStartupCommandOverrideApplied() {
-        assertTrue(redisWithCustomPort.isRunning()); // good enough to check that the container started listening
+        assertThat(redisWithCustomPort.isRunning()).isTrue(); // good enough to check that the container started listening
     }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
index 0f6269968dd..d98e09ff036 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -5,7 +5,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ContainerCreationTest {
 
@@ -39,7 +39,7 @@ public class ContainerCreationTest {
 
     @Test
     public void testStartup() {
-        assertTrue(redis.isRunning()); // good enough to check that the container started listening
-        assertTrue(alpine.isRunning()); // good enough to check that the container started listening
+        assertThat(redis.isRunning()).isTrue(); // good enough to check that the container started listening
+        assertThat(alpine.isRunning()).isTrue(); // good enough to check that the container started listening
     }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
index 6534a35a00f..7116f375283 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
@@ -4,7 +4,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DependsOnTest {
 
@@ -19,7 +19,7 @@ public class DependsOnTest {
 
     @Test
     public void testContainersAllStarted() {
-        assertTrue(redis.isRunning());
-        assertTrue(nginx.isRunning());
+        assertThat(redis.isRunning()).isTrue();
+        assertThat(nginx.isRunning()).isTrue();
     }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
index 7548ae4a613..7ccb0f2cc54 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
@@ -8,7 +8,7 @@
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ExecTest {
 
@@ -26,8 +26,8 @@ public void testSimpleExec() throws IOException, InterruptedException {
         Container.ExecResult lsResult = container.execInContainer("ls", "-al", "/");
         String stdout = lsResult.getStdout();
         int exitCode = lsResult.getExitCode();
-        assertTrue(stdout.contains("somefile.txt"));
-        assertTrue(exitCode == 0);
+        assertThat(stdout).contains("somefile.txt");
+        assertThat(exitCode).isZero();
         // }
     }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
index 22bf0332a9d..3e80133411a 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
@@ -13,7 +13,7 @@
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class HostPortExposedTest {
 
@@ -62,6 +62,6 @@ public void testContainerRunningAgainstExposedHostPort() {
         // }
 
         final String pageSource = webDriver.getPageSource();
-        assertTrue(pageSource.contains("Hello World!"));
+        assertThat(pageSource).contains("Hello World!");
     }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
index bdc0d3ced8a..0b2b166d1d9 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
@@ -8,7 +8,7 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class WaitStrategiesTest {
 
@@ -69,8 +69,8 @@ public class WaitStrategiesTest {
 
     @Test
     public void testContainersAllStarted() {
-        assertTrue(nginx.isRunning());
-        assertTrue(nginxWithHttpWait.isRunning());
-        assertTrue(containerWithLogWait.isRunning());
+        assertThat(nginx.isRunning()).isTrue();
+        assertThat(nginxWithHttpWait.isRunning()).isTrue();
+        assertThat(containerWithLogWait.isRunning()).isTrue();
     }
 }
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index ea36761b716..7ab7cddc88f 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index 1d3d178975f..0f219397bdc 100644
--- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -6,7 +6,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class RedisBackedCacheIntTest {
 
@@ -33,6 +33,6 @@ public void testSimplePutAndGet() {
         underTest.put("test", "example");
 
         String retrieved = underTest.get("test");
-        assertEquals("example", retrieved);
+        assertThat(retrieved).isEqualTo("example");
     }
 }
diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
index f837b3af0d5..e3f52403c48 100644
--- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
+++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTestStep0.java
@@ -4,7 +4,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Ignore("This test class is deliberately invalid, as it relies on a non-existent local Redis")
 public class RedisBackedCacheIntTestStep0 {
@@ -22,6 +22,6 @@ public void testSimplePutAndGet() {
         underTest.put("test", "example");
 
         String retrieved = underTest.get("test");
-        assertEquals("example", retrieved);
+        assertThat(retrieved).isEqualTo("example");
     }
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index ab32d55df91..1865f70f801 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -12,5 +12,6 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.4.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
 
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
index b84b2a9e2c9..6e4186698e7 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
@@ -5,7 +5,7 @@
 import org.junit.rules.RuleChain;
 import org.testcontainers.containers.PostgreSQLContainer;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for RedmineClient.
@@ -33,9 +33,6 @@ public void canGetIssueCount() throws Exception {
         RedmineClient redmineClient = new RedmineClient(
                 redmineContainer.getRedmineUrl());
 
-        assertEquals(
-                "The issue count can be retrieved.",
-                0,
-                redmineClient.getIssueCount());
+        assertThat(redmineClient.getIssueCount()).as("The issue count can be retrieved.").isZero();
     }
 }
diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
index d151e1a3f24..bc7aeed10bd 100644
--- a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -20,7 +20,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;
 
 // junitExample {
 @Testcontainers
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 385001db8f8..ff110637ced 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -9,5 +9,7 @@ configurations.all {
 dependencies {
     api project(":database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
+
     testImplementation 'com.datastax.oss:java-driver-core:4.14.1'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
index d1ad581bcc0..d8f21fc3068 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -9,9 +9,7 @@
 import org.testcontainers.containers.wait.CassandraQueryWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Eugeny Karpov
@@ -30,8 +28,8 @@ public void testSimple() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
-            assertTrue("Query was not applied", resultSet.wasApplied());
-            assertNotNull("Result set has no release_version", resultSet.one().getString(0));
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+            assertThat(resultSet.one().getString(0)).as("Result set has release_version").isNotNull();
         }
     }
 
@@ -45,8 +43,8 @@ public void testSpecificVersion() {
         ) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
-            assertTrue("Query was not applied", resultSet.wasApplied());
-            assertEquals("Cassandra has wrong version", cassandraVersion, resultSet.one().getString(0));
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+            assertThat(resultSet.one().getString(0)).as("Cassandra has right version").isEqualTo(cassandraVersion);
         }
     }
 
@@ -58,12 +56,10 @@ public void testConfigurationOverride() {
         ) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, "SELECT cluster_name FROM system.local");
-            assertTrue("Query was not applied", resultSet.wasApplied());
-            assertEquals(
-                "Cassandra configuration is not overridden",
-                TEST_CLUSTER_NAME_IN_CONF,
-                resultSet.one().getString(0)
-            );
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+            assertThat(resultSet.one().getString(0))
+                .as("Cassandra configuration is overridden")
+                .isEqualTo(TEST_CLUSTER_NAME_IN_CONF);
         }
     }
 
@@ -110,7 +106,7 @@ public void testCassandraQueryWaitStrategy() {
         ) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
-            assertTrue("Query was not applied", resultSet.wasApplied());
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
         }
     }
 
@@ -120,17 +116,17 @@ public void testCassandraGetCluster() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>()) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer.getCluster(), BASIC_QUERY);
-            assertTrue("Query was not applied", resultSet.wasApplied());
-            assertNotNull("Result set has no release_version", resultSet.one().getString(0));
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+            assertThat(resultSet.one().getString(0)).as("Result set has release_version").isNotNull();
         }
     }
 
     private void testInitScript(CassandraContainer<?> cassandraContainer) {
         ResultSet resultSet = performQuery(cassandraContainer, "SELECT * FROM keySpaceTest.catalog_category");
-        assertTrue("Query was not applied", resultSet.wasApplied());
+        assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
         Row row = resultSet.one();
-        assertEquals("Inserted row is not in expected state", 1, row.getLong(0));
-        assertEquals("Inserted row is not in expected state", "test_category", row.getString(1));
+        assertThat(row.getLong(0)).as("Inserted row is in expected state").isEqualTo(1);
+        assertThat(row.getString(1)).as("Inserted row is in expected state").isEqualTo("test_category");
     }
 
     private ResultSet performQuery(CassandraContainer<?> cassandraContainer, String cql) {
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
index 78f3fd2a664..502f2ca8e67 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
@@ -6,7 +6,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CassandraDriver3Test {
 
@@ -31,7 +31,7 @@ public void testCassandraGetContactPoint() {
 
             KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
 
-            assertNotNull("Failed to create test keyspace", keyspace);
+            assertThat(keyspace).as("keyspace created").isNotNull();
         }
     }
 }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
index 3a05bc723bc..a4fb8c87b8e 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
@@ -6,7 +6,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CassandraDriver4Test {
 
@@ -29,7 +29,7 @@ public void testCassandraGetContactPoint() {
 
             KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
 
-            assertNotNull("Failed to create test keyspace", keyspace);
+            assertThat(keyspace).as("test keyspace created").isNotNull();
         }
     }
 }
diff --git a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
index e29ff7ffbd8..c0c022d31bb 100644
--- a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
+++ b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
@@ -4,9 +4,6 @@
 import com.ecwid.consul.v1.Response;
 import com.ecwid.consul.v1.kv.model.GetValue;
 import io.restassured.RestAssured;
-import org.assertj.core.api.Assertions;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
@@ -17,6 +14,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * This test shows the pattern to use the ConsulContainer @ClassRule for a junit test. It also has tests that ensure
  * the properties were added correctly by reading from Consul with the CLI and over HTTP.
@@ -31,21 +30,19 @@ public class ConsulContainerTest {
     public void readFirstPropertyPathWithCli() throws IOException, InterruptedException {
         GenericContainer.ExecResult result = consulContainer.execInContainer("consul", "kv", "get", "config/testing1");
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
-        MatcherAssert.assertThat(output, CoreMatchers.containsString("value123"));
+        assertThat(output).contains("value123");
     }
 
     @Test
-    public void readFirstSecretPathOverHttpApi() throws InterruptedException {
-        RestAssured
+    public void readFirstSecretPathOverHttpApi() {
+        io.restassured.response.Response response = RestAssured
             .given()
             .when()
             .get("http://" + getHostAndPort() + "/v1/kv/config/testing1")
-            .then()
-            .assertThat()
-            .body(
-                "[0].Value",
-                CoreMatchers.equalTo(Base64.getEncoder().encodeToString("value123".getBytes(StandardCharsets.UTF_8)))
-            );
+            .andReturn();
+
+        assertThat(response.body().jsonPath().getString("[0].Value"))
+            .isEqualTo(Base64.getEncoder().encodeToString("value123".getBytes(StandardCharsets.UTF_8)));
     }
 
     @Test
@@ -62,13 +59,13 @@ public void writeAndReadMultipleValuesUsingClient() {
         // Write operation
         properties.forEach((key, value) -> {
             Response<Boolean> writeResponse = consulClient.setKVValue(key, value);
-            Assertions.assertThat(writeResponse.getValue()).isTrue();
+            assertThat(writeResponse.getValue()).isTrue();
         });
 
         // Read operation
         properties.forEach((key, value) -> {
             Response<GetValue> readResponse = consulClient.getKVValue(key);
-            Assertions.assertThat(readResponse.getValue().getDecodedValue()).isEqualTo(value);
+            assertThat(readResponse.getValue().getDecodedValue()).isEqualTo(value);
         });
     }
 
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 10970df542e..6cdacbcf77a 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -7,4 +7,5 @@ dependencies {
 
     testImplementation 'com.couchbase.client:java-client:3.3.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 1bdbe2ab1db..691dc1307ef 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -27,10 +27,9 @@
 import java.time.Duration;
 import java.util.function.Consumer;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
 
 public class CouchbaseContainerTest {
 
@@ -66,7 +65,7 @@ public void testBasicContainerUsageForEnterpriseContainer() {
 
                     JsonObject fooObject = collection.get("foo").contentAsObject();
 
-                    assertEquals("value", fooObject.getString("key"));
+                    assertThat(fooObject.getString("key")).isEqualTo("value");
                 }
             );
         }
@@ -92,7 +91,7 @@ public void testBasicContainerUsageForCommunityContainer() {
 
                     JsonObject fooObject = collection.get("foo").contentAsObject();
 
-                    assertEquals("value", fooObject.getString("key"));
+                    assertThat(fooObject.getString("key")).isEqualTo("value");
                 }
             );
         }
@@ -118,7 +117,7 @@ public void testBucketIsFlushableIfEnabled() {
 
                     cluster.buckets().flushBucket(bucketDefinition.getName());
 
-                    await().untilAsserted(() -> assertFalse(collection.exists("foo").exists()));
+                    await().untilAsserted(() -> assertThat(collection.exists("foo").exists()).isFalse());
                 }
             );
         }
@@ -134,12 +133,10 @@ public void testFailureIfCommunityUsedWithAnalytics() {
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.ANALYTICS)
         ) {
-            assertThrows(
-                ContainerLaunchException.class,
-                () -> {
+            assertThatThrownBy(() -> {
                     setUpClient(container, cluster -> {});
-                }
-            );
+                })
+                .isInstanceOf(ContainerLaunchException.class);
         }
     }
 
@@ -153,12 +150,10 @@ public void testFailureIfCommunityUsedWithEventing() {
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.EVENTING)
         ) {
-            assertThrows(
-                ContainerLaunchException.class,
-                () -> {
+            assertThatThrownBy(() -> {
                     setUpClient(container, cluster -> {});
-                }
-            );
+                })
+                .isInstanceOf(ContainerLaunchException.class);
         }
     }
 
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index a7ff4e66729..2a75c343653 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.23'
     testImplementation 'org.influxdb:influxdb-java:2.23'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
index c7fc71a3a19..bcf3d21f25b 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
@@ -4,9 +4,7 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class InfluxDBContainerTest {
 
@@ -19,28 +17,28 @@ public class InfluxDBContainerTest {
     public void getUrl() {
         String actual = influxDBContainer.getUrl();
 
-        assertThat(actual, notNullValue());
+        assertThat(actual).isNotNull();
     }
 
     @Test
     public void getNewInfluxDB() {
         InfluxDB actual = influxDBContainer.getNewInfluxDB();
 
-        assertThat(actual, notNullValue());
-        assertThat(actual.ping(), notNullValue());
+        assertThat(actual).isNotNull();
+        assertThat(actual.ping()).isNotNull();
     }
 
     @Test
     public void getLivenessCheckPort() {
         Integer actual = influxDBContainer.getLivenessCheckPort();
 
-        assertThat(actual, notNullValue());
+        assertThat(actual).isNotNull();
     }
 
     @Test
     public void isRunning() {
         boolean actual = influxDBContainer.isRunning();
 
-        assertThat(actual, is(true));
+        assertThat(actual).isTrue();
     }
 }
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
index a7ae347e7cc..7a34bbb4fd6 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
@@ -9,11 +9,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class InfluxDBContainerWithUserTest {
 
@@ -35,20 +31,20 @@ public class InfluxDBContainerWithUserTest {
     public void describeDatabases() {
         InfluxDB actual = influxDBContainer.getNewInfluxDB();
 
-        assertThat(actual, notNullValue());
-        assertThat(actual.describeDatabases(), hasItem(DATABASE));
+        assertThat(actual).isNotNull();
+        assertThat(actual.describeDatabases()).contains(DATABASE);
     }
 
     @Test
     public void checkVersion() {
         InfluxDB actual = influxDBContainer.getNewInfluxDB();
 
-        assertThat(actual, notNullValue());
+        assertThat(actual).isNotNull();
 
-        assertThat(actual.ping(), notNullValue());
-        assertThat(actual.ping().getVersion(), is(TEST_VERSION));
+        assertThat(actual.ping()).isNotNull();
+        assertThat(actual.ping().getVersion()).isEqualTo(TEST_VERSION);
 
-        assertThat(actual.version(), is(TEST_VERSION));
+        assertThat(actual.version()).isEqualTo(TEST_VERSION);
     }
 
     @Test
@@ -67,9 +63,9 @@ public void queryForWriteAndRead() {
         Query query = new Query("SELECT idle FROM cpu", DATABASE);
         QueryResult actual = influxDB.query(query);
 
-        assertThat(actual, notNullValue());
-        assertThat(actual.getError(), nullValue());
-        assertThat(actual.getResults(), notNullValue());
-        assertThat(actual.getResults().size(), is(1));
+        assertThat(actual).isNotNull();
+        assertThat(actual.getError()).isNull();
+        assertThat(actual.getResults()).isNotNull();
+        assertThat(actual.getResults()).hasSize(1);
     }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
index 5b4d223cd36..4edd5d449ba 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.jdbc;
 
 import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -11,6 +10,8 @@
 import java.sql.SQLException;
 import java.util.Properties;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class ContainerDatabaseDriverTest {
 
     private static final String PLAIN_POSTGRESQL_JDBC_URL = "jdbc:postgresql://localhost:5432/test";
@@ -22,7 +23,7 @@ public class ContainerDatabaseDriverTest {
     public void shouldNotTryToConnectToNonMatchingJdbcUrlDirectly() throws SQLException {
         ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
         Connection connection = driver.connect(PLAIN_POSTGRESQL_JDBC_URL, new Properties());
-        Assert.assertNull(connection);
+        assertThat(connection).isNull();
     }
 
     @Test
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
index 186d4095b0d..ee6d1f1a841 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/PostgresContainerTests.java
@@ -8,7 +8,7 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Testcontainers
 class PostgresContainerTests {
@@ -35,7 +35,7 @@ void waits_until_postgres_accepts_jdbc_connections() throws Exception {
             resultSet.next();
 
             int resultSetInt = resultSet.getInt(1);
-            assertEquals(1, resultSetInt);
+            assertThat(resultSetInt).isEqualTo(1);
         }
     }
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
index 09b816be56e..b64f2f3c328 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
@@ -6,8 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
 // The order of @ExtendsWith and @Testcontainers is crucial in order for the tests
@@ -32,7 +31,7 @@ void failing_test_should_pass_throwable_to_testContainer() {
     @Order(2)
     void should_have_captured_thrownException() {
         Throwable capturedThrowable = startedTestContainer.getCapturedThrowable();
-        assertTrue(capturedThrowable instanceof AssumptionViolatedException);
-        assertEquals("got: <false>, expected: is <true>", capturedThrowable.getMessage());
+        assertThat(capturedThrowable).isInstanceOf(AssumptionViolatedException.class);
+        assertThat(capturedThrowable.getMessage()).isEqualTo("got: <false>, expected: is <true>");
     }
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index a678d30eb80..b879b27f0e6 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -22,7 +22,6 @@
 import com.amazonaws.services.sqs.model.CreateQueueResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
@@ -320,7 +319,7 @@ private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exc
                 )
                 .split(" ");
             final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);
-            Assert.assertEquals(0, execResult.getExitCode());
+            assertThat(execResult.getExitCode()).isEqualTo(0);
 
             final String logs = execResult.getStdout() + execResult.getStderr();
             log.info(logs);
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 7f9725bf0e8..6e4b5208298 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -4,4 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:4.7.1")
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index 6c98978f20a..ff6d0d6ccba 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -13,10 +13,7 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.hamcrest.Matchers.endsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class MongoDBContainerTest {
 
@@ -35,7 +32,7 @@ public void shouldExecuteTransactions() {
             // }
 
             final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
-            assertNotNull(mongoRsUrl);
+            assertThat(mongoRsUrl).isNotNull();
             final String connectionString = mongoDBContainer.getConnectionString();
             final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
             final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
@@ -76,7 +73,7 @@ public void shouldExecuteTransactions() {
 
             try {
                 final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
-                assertEquals(trxResult, trxResultActual);
+                assertThat(trxResultActual).isEqualTo(trxResult);
             } catch (RuntimeException re) {
                 throw new IllegalStateException(re.getMessage(), re);
             } finally {
@@ -98,7 +95,7 @@ public void shouldTestDatabaseName() {
         try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))) {
             mongoDBContainer.start();
             final String databaseName = "my-db";
-            assertThat(mongoDBContainer.getReplicaSetUrl(databaseName), endsWith(databaseName));
+            assertThat(mongoDBContainer.getReplicaSetUrl(databaseName)).endsWith(databaseName);
         }
     }
 }
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index b48bd67efc9..b7afba041de 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -8,8 +8,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
@@ -20,15 +20,15 @@ public class SimpleOracleTest extends AbstractContainerDatabaseTest {
     private void runTest(OracleContainer container, String databaseName, String username, String password)
         throws SQLException {
         //Test config was honored
-        assertEquals(databaseName, container.getDatabaseName());
-        assertEquals(username, container.getUsername());
-        assertEquals(password, container.getPassword());
+        assertThat(container.getDatabaseName()).isEqualTo(databaseName);
+        assertThat(container.getUsername()).isEqualTo(username);
+        assertThat(container.getPassword()).isEqualTo(password);
 
         //Test we can get a connection
         container.start();
         ResultSet resultSet = performQuery(container, "SELECT 1 FROM dual");
         int resultSetInt = resultSet.getInt(1);
-        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+        assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
     }
 
     @Test
@@ -38,7 +38,7 @@ public void testDefaultSettings() throws SQLException {
 
             // Match against the last '/'
             String urlSuffix = oracle.getJdbcUrl().split("(\\/)(?!.*\\/)", 2)[1];
-            assertEquals("xepdb1", urlSuffix);
+            assertThat(urlSuffix).isEqualTo("xepdb1");
         }
     }
 
@@ -81,7 +81,7 @@ public void testSID() throws SQLException {
 
             // Match against the last ':'
             String urlSuffix = oracle.getJdbcUrl().split("(\\:)(?!.*\\:)", 2)[1];
-            assertEquals("xe", urlSuffix);
+            assertThat(urlSuffix).isEqualTo("xe");
         }
     }
 
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
index a54108ea1a2..721186807aa 100644
--- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.testcontainers.PrestoTestImages;
 
@@ -13,9 +12,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author findepi
@@ -31,8 +28,10 @@ public void testSimple() throws Exception {
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
             ) {
-                assertTrue("No result", resultSet.next());
-                assertEquals("Presto version", PrestoContainer.DEFAULT_TAG, resultSet.getString("node_version"));
+                assertThat(resultSet.next()).as("has result").isTrue();
+                assertThat(resultSet.getString("node_version"))
+                    .as("Presto version")
+                    .isEqualTo(PrestoContainer.DEFAULT_TAG);
             }
         }
     }
@@ -48,12 +47,10 @@ public void testSpecificVersion() throws Exception {
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
             ) {
-                assertTrue("No result", resultSet.next());
-                assertEquals(
-                    "Presto version",
-                    PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(),
-                    resultSet.getString("node_version")
-                );
+                assertThat(resultSet.next()).as("has result").isTrue();
+                assertThat(resultSet.getString("node_version"))
+                    .as("Presto version")
+                    .isEqualTo(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart());
             }
         }
     }
@@ -86,7 +83,7 @@ public void testQueryMemoryAndTpch() throws SQLException {
                     while (resultSet.next()) {
                         actualElements.add(resultSet.getInt("element"));
                     }
-                    Assert.assertEquals(Arrays.asList(2, 4, 42, 42, 42), actualElements);
+                    assertThat(actualElements).isEqualTo(Arrays.asList(2, 4, 42, 42, 42));
                 }
             }
         }
@@ -102,9 +99,9 @@ public void testInitScript() throws Exception {
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")
             ) {
-                assertTrue("No result", resultSet.next());
-                assertEquals("Value", 12345678909324L, resultSet.getObject("a"));
-                assertFalse("Too many result", resultSet.next());
+                assertThat(resultSet.next()).as("has result").isTrue();
+                assertThat(resultSet.getObject("a")).as("Value").isEqualTo(12345678909324L);
+                assertThat(resultSet.next()).as("only has one result").isFalse();
             }
         }
     }
@@ -117,47 +114,39 @@ public void testTcJdbcUri() throws Exception {
             )
         ) {
             // Verify metadata with tc: JDBC connection URI
-            assertEquals(
-                connection.getMetaData().getDatabaseMajorVersion(),
-                Integer.parseInt(PrestoContainer.DEFAULT_TAG)
-            );
+            assertThat(Integer.parseInt(PrestoContainer.DEFAULT_TAG))
+                .isEqualTo(connection.getMetaData().getDatabaseMajorVersion());
 
             // Verify transactions with tc: JDBC connection URI
-            assertTrue("Is autocommit", connection.getAutoCommit());
+            assertThat(connection.getAutoCommit()).as("Is autocommit").isTrue();
             connection.setAutoCommit(false);
-            assertFalse("Is autocommit", connection.getAutoCommit());
-            assertEquals(
-                "Transaction isolation",
-                Connection.TRANSACTION_READ_UNCOMMITTED,
-                connection.getTransactionIsolation()
-            );
+            assertThat(connection.getAutoCommit()).as("Is autocommit").isFalse();
+            assertThat(connection.getTransactionIsolation())
+                .as("Transaction isolation")
+                .isEqualTo(Connection.TRANSACTION_READ_UNCOMMITTED);
 
             try (Statement statement = connection.createStatement()) {
-                assertEquals(
-                    "Update result",
-                    0,
-                    statement.executeUpdate("CREATE TABLE memory.default.test_tc(a bigint)")
-                );
+                assertThat(statement.executeUpdate("CREATE TABLE memory.default.test_tc(a bigint)"))
+                    .as("Update result")
+                    .isEqualTo(0);
                 try (
                     ResultSet resultSet = statement.executeQuery(
                         "SELECT sum(cast(node_version AS bigint)) AS v FROM system.runtime.nodes"
                     )
                 ) {
-                    assertTrue(resultSet.next());
-                    assertEquals(PrestoContainer.DEFAULT_TAG, resultSet.getString("v"));
-                    assertFalse(resultSet.next());
+                    assertThat(resultSet.next()).isTrue();
+                    assertThat(resultSet.getString("v")).isEqualTo(PrestoContainer.DEFAULT_TAG);
+                    assertThat(resultSet.next()).isFalse();
                 }
                 connection.commit();
             } finally {
                 connection.rollback();
             }
             connection.setAutoCommit(true);
-            assertTrue("Is autocommit", connection.getAutoCommit());
-            assertEquals(
-                "Transaction isolation should be retained",
-                Connection.TRANSACTION_READ_UNCOMMITTED,
-                connection.getTransactionIsolation()
-            );
+            assertThat(connection.getAutoCommit()).as("Is autocommit").isTrue();
+            assertThat(connection.getTransactionIsolation())
+                .as("Transaction isolation should be retained")
+                .isEqualTo(Connection.TRANSACTION_READ_UNCOMMITTED);
         }
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
index 0d8daaad219..aa894810930 100644
--- a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
@@ -15,8 +15,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Parameterized.class)
 @Value
@@ -68,6 +67,6 @@ public void recordingFileThatShouldDescribeTheTestResultAtThePresentTime() throw
             )
         );
 
-        assertThat(expectedPossibleFileNames, hasItem(recordingFile));
+        assertThat(expectedPossibleFileNames).contains(recordingFile);
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index b2b7d8d6b1c..d0bdb796181 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -25,8 +25,7 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(Enclosed.class)
 public class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContainerTest {
@@ -56,7 +55,7 @@ public void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() t
                     .withNetwork(NETWORK)
             ) {
                 File[] files = runSimpleExploreInContainer(chrome, "PASSED-.*\\.flv");
-                assertEquals("Recorded file not found", 1, files.length);
+                assertThat(files).as("Recorded file found").hasSize(1);
             }
         }
 
@@ -98,7 +97,7 @@ public void recordingTestShouldHaveFlvExtension() throws InterruptedException {
                     .withNetwork(NETWORK)
             ) {
                 File[] files = runSimpleExploreInContainer(chrome, "PASSED-.*\\.flv");
-                assertEquals("Recorded file not found", 1, files.length);
+                assertThat(files).as("Recorded file found").hasSize(1);
             }
         }
 
@@ -116,7 +115,7 @@ public void recordingTestShouldHaveMp4Extension() throws InterruptedException {
                     .withNetwork(NETWORK)
             ) {
                 File[] files = runSimpleExploreInContainer(chrome, "PASSED-.*\\.mp4");
-                assertEquals("Recorded file not found", 1, files.length);
+                assertThat(files).as("Recorded file found").hasSize(1);
             }
         }
 
@@ -152,10 +151,10 @@ public void recordingTestThatShouldHaveCorrectDuration() throws IOException, Int
                     .start();
                 String ffmpegOutput = container.getLogs();
 
-                assertTrue(
-                    "Duration is incorrect in:\n " + ffmpegOutput,
-                    ffmpegOutput.contains("Duration: 00:") && !(ffmpegOutput.contains("Duration: 00:00:00.00"))
-                );
+                assertThat(ffmpegOutput)
+                    .as("Duration starts with 00:")
+                    .contains("Duration: 00:")
+                    .doesNotContain("Duration: 00:00:00.00");
             }
         }
     }
@@ -216,7 +215,7 @@ public String getFilesystemFriendlyName() {
                 );
 
                 String[] files = vncRecordingDirectory.getRoot().list(new PatternFilenameFilter("FAILED-.*\\.flv"));
-                assertEquals("Recorded file not found", 1, files.length);
+                assertThat(files).as("recorded file count").hasSize(1);
             }
         }
 
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 5a6326f3844..f8e2a99888d 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.9.3'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.1'
-
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
index 9b561e5cda9..94a02acf579 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -10,9 +10,7 @@
 
 import java.io.IOException;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Simon Schneider
@@ -36,8 +34,8 @@ public void solrCloudTest() throws IOException, SolrServerException {
         try (SolrContainer container = new SolrContainer(SOLR_IMAGE)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
-            assertThat(response.getStatus(), is(0));
-            assertThat(response.jsonStr(), containsString("zkConnected\":true"));
+            assertThat(response.getStatus()).isZero();
+            assertThat(response.jsonStr()).contains("zkConnected\":true");
         }
     }
 
@@ -46,8 +44,8 @@ public void solrStandaloneTest() throws IOException, SolrServerException {
         try (SolrContainer container = new SolrContainer(SOLR_IMAGE).withZookeeper(false)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
-            assertThat(response.getStatus(), is(0));
-            assertThat(response.jsonStr(), containsString("zkConnected\":null"));
+            assertThat(response.getStatus()).isZero();
+            assertThat(response.jsonStr()).contains("zkConnected\":null");
         }
     }
 
diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
index c4833f14224..714c9854f39 100644
--- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
+++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.junit.tidb;
 
-import org.hamcrest.Matchers;
-import org.junit.Assert;
 import org.junit.Test;
 import org.testcontainers.TiDBTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -10,6 +8,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SimpleTiDBTest extends AbstractContainerDatabaseTest {
 
     @Test
@@ -20,7 +20,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(tidb, "SELECT 1");
 
             int resultSetInt = resultSet.getInt(1);
-            Assert.assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+            assertThat(resultSetInt).isEqualTo(1);
         }
     }
 
@@ -34,7 +34,7 @@ public void testExplicitInitScript() throws SQLException {
             ResultSet resultSet = performQuery(tidb, "SELECT foo FROM bar");
 
             String firstColumnValue = resultSet.getString(1);
-            Assert.assertEquals("Value from init script should equal real value", "hello world", firstColumnValue);
+            assertThat(firstColumnValue).isEqualTo("hello world");
         }
     }
 
@@ -45,8 +45,8 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         try {
             tidb.start();
             String jdbcUrl = tidb.getJdbcUrl();
-            Assert.assertThat(jdbcUrl, Matchers.containsString("?"));
-            Assert.assertThat(jdbcUrl, Matchers.containsString("sslmode=disable"));
+            assertThat(jdbcUrl).contains("?");
+            assertThat(jdbcUrl).contains("sslmode=disable");
         } finally {
             tidb.stop();
         }
diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
index 97bbdf6dedd..a58944946f0 100644
--- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
@@ -7,9 +7,7 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TrinoContainerTest {
 
@@ -22,8 +20,10 @@ public void testSimple() throws Exception {
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
             ) {
-                assertTrue("No result", resultSet.next());
-                assertEquals("Trino version", TrinoContainer.DEFAULT_TAG, resultSet.getString("node_version"));
+                assertThat(resultSet.next()).as("results").isTrue();
+                assertThat(resultSet.getString("node_version"))
+                    .as("Trino version")
+                    .isEqualTo(TrinoContainer.DEFAULT_TAG);
             }
         }
     }
@@ -37,12 +37,10 @@ public void testSpecificVersion() throws Exception {
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
             ) {
-                assertTrue("No result", resultSet.next());
-                assertEquals(
-                    "Trino version",
-                    TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart(),
-                    resultSet.getString("node_version")
-                );
+                assertThat(resultSet.next()).as("results").isTrue();
+                assertThat(resultSet.getString("node_version"))
+                    .as("Trino version")
+                    .isEqualTo(TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart());
             }
         }
     }
@@ -57,9 +55,9 @@ public void testInitScript() throws Exception {
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT a FROM memory.default.test_table")
             ) {
-                assertTrue("No result", resultSet.next());
-                assertEquals("Value", 12345678909324L, resultSet.getObject("a"));
-                assertFalse("Too many result", resultSet.next());
+                assertThat(resultSet.next()).as("results").isTrue();
+                assertThat(resultSet.getObject("a")).as("Value").isEqualTo(12345678909324L);
+                assertThat(resultSet.next()).as("results").isFalse();
             }
         }
     }
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index 22310bf7a23..f7a7cd49eaf 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.vault;
 
+import io.restassured.response.Response;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
@@ -7,8 +8,7 @@
 import java.io.IOException;
 
 import static io.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * This test shows the pattern to use the VaultContainer @ClassRule for a junit test. It also has tests that ensure
@@ -42,7 +42,7 @@ public void readFirstSecretPathWithCli() throws IOException, InterruptedExceptio
             "secret/testing1"
         );
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
-        assertThat(output, containsString("password123"));
+        assertThat(output).contains("password123");
     }
 
     @Test
@@ -56,49 +56,45 @@ public void readSecondSecretPathWithCli() throws IOException, InterruptedExcepti
         );
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
         System.out.println("output = " + output);
-        assertThat(output, containsString("password1"));
-        assertThat(output, containsString("password2"));
-        assertThat(output, containsString("password3"));
-        assertThat(output, containsString("password4"));
+        assertThat(output).contains("password1");
+        assertThat(output).contains("password2");
+        assertThat(output).contains("password3");
+        assertThat(output).contains("password4");
     }
 
     @Test
     public void readFirstSecretPathOverHttpApi() throws InterruptedException {
-        given()
+        Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
             .get("http://" + getHostAndPort() + "/v1/secret/data/testing1")
-            .then()
-            .assertThat()
-            .body("data.data.top_secret", equalTo("password123"));
+            .thenReturn();
+        assertThat(response.body().jsonPath().getString("data.data.top_secret")).isEqualTo("password123");
     }
 
     @Test
     public void readSecondSecretPathOverHttpApi() throws InterruptedException {
-        given()
+        Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
             .get("http://" + getHostAndPort() + "/v1/secret/data/testing2")
-            .then()
-            .assertThat()
-            .body("data.data.secret_one", containsString("password1"))
-            .assertThat()
-            .body("data.data.secret_two", containsString("password2"))
-            .assertThat()
-            .body("data.data.secret_three", hasItem("password3"))
-            .assertThat()
-            .body("data.data.secret_four", containsString("password4"));
+            .andReturn();
+
+        assertThat(response.body().jsonPath().getString("data.data.secret_one")).contains("password1");
+        assertThat(response.body().jsonPath().getString("data.data.secret_two")).contains("password2");
+        assertThat(response.body().jsonPath().getList("data.data.secret_three")).contains("password3");
+        assertThat(response.body().jsonPath().getString("data.data.secret_four")).contains("password4");
     }
 
     @Test
     public void readTransitKeyOverHttpApi() throws InterruptedException {
-        given()
+        Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
             .get("http://" + getHostAndPort() + "/v1/transit/keys/my-key")
-            .then()
-            .assertThat()
-            .body("data.name", equalTo("my-key"));
+            .thenReturn();
+
+        assertThat(response.body().jsonPath().getString("data.name")).isEqualTo("my-key");
     }
 
     private String getHostAndPort() {
diff --git a/test-support/build.gradle b/test-support/build.gradle
index bd85b585b0f..ecf9a0bc60e 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,4 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.30'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java b/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
index 14a3d4c018c..60a311922d0 100644
--- a/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
+++ b/test-support/src/test/java/org/testcontainers/testsupport/FlakyRuleTest.java
@@ -6,8 +6,8 @@
 
 import java.lang.annotation.Annotation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 public class FlakyRuleTest {
 
@@ -33,7 +33,9 @@ public void testIgnoresMethodWithoutAnnotation() throws Throwable {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
         } catch (Exception ignored) {}
-        assertEquals("The statement should only be invoked once, even if it throws", 1, statement.invocationCount);
+        assertThat(statement.invocationCount)
+            .as("The statement should only be invoked once, even if it throws")
+            .isEqualTo(1);
     }
 
     @Test
@@ -45,7 +47,7 @@ public void testRetriesMethodWithAnnotationUntilFailure() throws Throwable {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
         } catch (Exception ignored) {}
-        assertEquals("The statement should be invoked three times", 3, statement.invocationCount);
+        assertThat(statement.invocationCount).as("The statement should be invoked three times").isEqualTo(3);
     }
 
     @Test
@@ -57,7 +59,7 @@ public void testCustomRetryCount() throws Throwable {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
         } catch (Exception ignored) {}
-        assertEquals("The statement should be invoked ten times", 10, statement.invocationCount);
+        assertThat(statement.invocationCount).as("The statement should be invoked ten times").isEqualTo(10);
     }
 
     @Test
@@ -68,11 +70,9 @@ public void testRetriesMethodWithAnnotationUntilSuccess() throws Throwable {
 
         rule.apply(statement, description).evaluate();
 
-        assertEquals(
-            "The statement should be invoked three times, and succeed the third time",
-            3,
-            statement.invocationCount
-        );
+        assertThat(statement.invocationCount)
+            .as("The statement should be invoked three times, and succeed the third time")
+            .isEqualTo(3);
     }
 
     @Test
@@ -83,7 +83,7 @@ public void testDoesNotRetryMethodWithAnnotationIfNotThrowing() throws Throwable
 
         rule.apply(statement, description).evaluate();
 
-        assertEquals("The statement should be invoked once", 1, statement.invocationCount);
+        assertThat(statement.invocationCount).as("The statement should be invoked once").isEqualTo(1);
     }
 
     @Test
@@ -94,7 +94,9 @@ public void testTreatsExpiredAnnotationAsNoAnnotation() throws Throwable {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
         } catch (Exception ignored) {}
-        assertEquals("The statement should only be invoked once, even if it throws", 1, statement.invocationCount);
+        assertThat(statement.invocationCount)
+            .as("The statement should only be invoked once, even if it throws")
+            .isEqualTo(1);
     }
 
     @Test
@@ -105,7 +107,9 @@ public void testThrowsOnInvalidDateFormat() throws Throwable {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
         } catch (IllegalArgumentException ignored) {}
-        assertEquals("The statement should not be invoked if the annotation is invalid", 0, statement.invocationCount);
+        assertThat(statement.invocationCount)
+            .as("The statement should not be invoked if the annotation is invalid")
+            .isEqualTo(0);
     }
 
     @Test
@@ -116,7 +120,9 @@ public void testThrowsOnInvalidGitHubUrl() throws Throwable {
             rule.apply(statement, description).evaluate();
             fail("Should not reach here");
         } catch (IllegalArgumentException ignored) {}
-        assertEquals("The statement should not be invoked if the annotation is invalid", 0, statement.invocationCount);
+        assertThat(statement.invocationCount)
+            .as("The statement should not be invoked if the annotation is invalid")
+            .isEqualTo(0);
     }
 
     private Description newDescriptionWithAnnotation(String reviewDate, String gitHubUrl) {

From 9275bc51e20e0e7bf937f48d2850a9865cb41948 Mon Sep 17 00:00:00 2001
From: Matt Hornung <hornung.m1@gmail.com>
Date: Tue, 16 Aug 2022 10:06:59 -0500
Subject: [PATCH 2144/4969] Make JUnit5 TestcontainersExtension public (#5285)

This allows more flexible and programmatic usage of the `TestcontainersExtension`

Fixes #2045
---
 .../testcontainers/junit/jupiter/TestcontainersExtension.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 47ed56d9ac5..5a11b927ec0 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -32,7 +32,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-class TestcontainersExtension
+public class TestcontainersExtension
     implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition {
 
     private static final Namespace NAMESPACE = Namespace.create(TestcontainersExtension.class);

From df5e1eec19a133dd922498b0634fdd712bcdd153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 16 Aug 2022 11:02:34 -0500
Subject: [PATCH 2145/4969] Drop usage of `org.junit.platform.commons.util`
 (#5729)

Classes from `org.junit.platform.commons.util` are used for internal
use in JUnit Jupiter. This commit introduces replacements.
---
 .../FilesystemFriendlyNameGenerator.java      |  3 +-
 .../jupiter/TestcontainersExtension.java      | 28 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
index a8612fc1516..fe5ddcf32e0 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/FilesystemFriendlyNameGenerator.java
@@ -1,7 +1,6 @@
 package org.testcontainers.junit.jupiter;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.platform.commons.util.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -14,7 +13,7 @@ class FilesystemFriendlyNameGenerator {
     static String filesystemFriendlyNameOf(ExtensionContext context) {
         String contextId = context.getUniqueId();
         try {
-            return (StringUtils.isBlank(contextId))
+            return (contextId == null || contextId.trim().isEmpty())
                 ? UNKNOWN_NAME
                 : URLEncoder.encode(contextId, StandardCharsets.UTF_8.toString());
         } catch (UnsupportedEncodingException e) {
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 5a11b927ec0..757083dc322 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -13,9 +13,9 @@
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
 import org.junit.platform.commons.support.AnnotationSupport;
-import org.junit.platform.commons.util.AnnotationUtils;
-import org.junit.platform.commons.util.Preconditions;
-import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.commons.support.HierarchyTraversalMode;
+import org.junit.platform.commons.support.ModifierSupport;
+import org.junit.platform.commons.support.ReflectionSupport;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.lifecycle.TestDescription;
@@ -131,7 +131,7 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
     private Optional<Testcontainers> findTestcontainers(ExtensionContext context) {
         Optional<ExtensionContext> current = Optional.of(context);
         while (current.isPresent()) {
-            Optional<Testcontainers> testcontainers = AnnotationUtils.findAnnotation(
+            Optional<Testcontainers> testcontainers = AnnotationSupport.findAnnotation(
                 current.get().getRequiredTestClass(),
                 Testcontainers.class
             );
@@ -169,26 +169,26 @@ private Set<Object> collectParentTestInstances(final ExtensionContext context) {
     }
 
     private List<StoreAdapter> findSharedContainers(Class<?> testClass) {
-        return ReflectionUtils
-            .findFields(testClass, isSharedContainer(), ReflectionUtils.HierarchyTraversalMode.TOP_DOWN)
+        return ReflectionSupport
+            .findFields(testClass, isSharedContainer(), HierarchyTraversalMode.TOP_DOWN)
             .stream()
             .map(f -> getContainerInstance(null, f))
             .collect(Collectors.toList());
     }
 
     private Predicate<Field> isSharedContainer() {
-        return isContainer().and(ReflectionUtils::isStatic);
+        return isContainer().and(ModifierSupport::isStatic);
     }
 
     private Stream<StoreAdapter> findRestartContainers(Object testInstance) {
-        return ReflectionUtils
-            .findFields(testInstance.getClass(), isRestartContainer(), ReflectionUtils.HierarchyTraversalMode.TOP_DOWN)
+        return ReflectionSupport
+            .findFields(testInstance.getClass(), isRestartContainer(), HierarchyTraversalMode.TOP_DOWN)
             .stream()
             .map(f -> getContainerInstance(testInstance, f));
     }
 
     private Predicate<Field> isRestartContainer() {
-        return isContainer().and(ReflectionUtils::isNotStatic);
+        return isContainer().and(ModifierSupport::isNotStatic);
     }
 
     private static Predicate<Field> isContainer() {
@@ -211,10 +211,10 @@ private static Predicate<Field> isContainer() {
     private static StoreAdapter getContainerInstance(final Object testInstance, final Field field) {
         try {
             field.setAccessible(true);
-            Startable containerInstance = Preconditions.notNull(
-                (Startable) field.get(testInstance),
-                "Container " + field.getName() + " needs to be initialized"
-            );
+            Startable containerInstance = (Startable) field.get(testInstance);
+            if (containerInstance == null) {
+                throw new ExtensionConfigurationException("Container " + field.getName() + " needs to be initialized");
+            }
             return new StoreAdapter(field.getDeclaringClass(), field.getName(), containerInstance);
         } catch (IllegalAccessException e) {
             throw new ExtensionConfigurationException("Can not access container defined in field " + field.getName());

From 18304642dcbbd5db229bc4390d431e9208be88d0 Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Thu, 18 Aug 2022 15:01:50 +0200
Subject: [PATCH 2146/4969] Enforce UTF-8 as Javadoc encoding (#5738)

* Use com.gradle:common-custom-user-data-gradle-plugin:1.8 (instead of 1.8.0)
---
 build.gradle             | 1 +
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0ded70ad71a..a53bd19298d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,7 @@ subprojects {
     targetCompatibility = 1.8
     compileJava.options.encoding = 'UTF-8'
     compileTestJava.options.encoding = 'UTF-8'
+    javadoc.options.encoding = 'UTF-8'
 
     repositories {
         mavenCentral()
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 83ba91e8321..9ed079cd7b8 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.0"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index bd51349bb05..2beb91dea01 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.0"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8"
     }
 }
 

From 9fb5db16a6af38257256fd04e452737e0f1ac15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 18 Aug 2022 12:09:55 -0500
Subject: [PATCH 2147/4969] Add Pull Request Template (#5735)

It provides some useful information about what to take into account
when submitting a PR.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/pull_request_template.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000000..643177f08a9
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,19 @@
+<!--
+Thanks for contributing to Testcontainers. Please review the following notes before
+submitting a pull request.
+
+New Modules:
+Make sure to add it to `bug_report.yaml`, `enhancement.yaml` and `feature.yaml`.
+Also, add it to `dependabot.yml` and `labeler.yml`.
+
+Before comitting, run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
+
+Describing Your Changes:
+
+If, after having reviewed the notes above, you're ready to submit your pull request, please
+provide a brief description of the proposed changes and their context. If they fix a bug, please
+describe the broken behaviour and how the changes fix it. If they make an enhancement,
+please describe the new functionality and why you believe it's useful. If your pull
+request relates to any existing issues, please reference them by using the issue number
+prefixed with #.
+-->

From 20fdee2da625aa3c12d1212ea0b370f299901e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 18 Aug 2022 18:06:21 -0500
Subject: [PATCH 2148/4969] Add `Transferable.of(String, int)` (#5741)

The new method adds similar capability of `Transferable.of(byte[], int)`
but for `String`.
---
 core/build.gradle                                   |  6 ++++++
 .../testcontainers/images/builder/Transferable.java |  4 ++++
 .../containers/GenericContainerTest.java            | 13 +++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index c210ed48510..aa4c6eabf22 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -113,3 +113,9 @@ tasks.generatePomFileForMavenJavaPublication.finalizedBy(
         ]
     }
 )
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.images.builder.Transferable#of(java.lang.String,int)"
+    ]
+}
diff --git a/core/src/main/java/org/testcontainers/images/builder/Transferable.java b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
index e98dbc2ad11..292a70d6ac7 100644
--- a/core/src/main/java/org/testcontainers/images/builder/Transferable.java
+++ b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
@@ -16,6 +16,10 @@ static Transferable of(String string) {
         return of(string.getBytes(StandardCharsets.UTF_8));
     }
 
+    static Transferable of(String string, int fileMode) {
+        return of(string.getBytes(StandardCharsets.UTF_8), fileMode);
+    }
+
     static Transferable of(byte[] bytes) {
         return of(bytes, DEFAULT_FILE_MODE);
     }
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 1967ad95135..12f5810bc27 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -84,6 +84,19 @@ public void shouldCopyTransferableAsFile() {
         }
     }
 
+    @Test
+    public void shouldCopyTransferableAsFileWithFileMode() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
+                .withStartupCheckStrategy(new NoopStartupCheckStrategy())
+                .withCopyToContainer(Transferable.of("test", 0777), "/tmp/test")
+                .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
+                .withCommand("sh", "-c", "ls -ll /tmp | grep '\\-rwxrwxrwx\\|test' && exit 100")
+        ) {
+            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 100");
+        }
+    }
+
     @Test
     public void shouldCopyTransferableAfterMountableFile() {
         try (

From 8b55a3e63ae2a5dfbf4f916d7fc9f6eb008b2f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 18 Aug 2022 18:35:59 -0500
Subject: [PATCH 2149/4969] Add Redpanda module (#5740)

New module uses `docker.redpanda.com/vectorized/redpanda:v22.2.1` docker image as a
base giving the `--mode dev-container` flag added in that version.

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   2 +
 docs/modules/redpanda.md                      |  38 +++++
 mkdocs.yml                                    |   1 +
 modules/redpanda/build.gradle                 |   8 ++
 .../redpanda/RedpandaContainer.java           |  60 ++++++++
 .../redpanda/RedpandaContainerTest.java       | 130 ++++++++++++++++++
 .../src/test/resources/logback-test.xml       |  16 +++
 11 files changed, 263 insertions(+)
 create mode 100644 docs/modules/redpanda.md
 create mode 100644 modules/redpanda/build.gradle
 create mode 100644 modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
 create mode 100644 modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
 create mode 100644 modules/redpanda/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 5aca9e624b3..163c5455b1e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -42,6 +42,7 @@ body:
         - Presto
         - Pulsar
         - RabbitMQ
+        - Redpanda
         - Selenium
         - Solr
         - TiDB
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index ba5b1f88006..b753332073b 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -42,6 +42,7 @@ body:
         - Presto
         - Pulsar
         - RabbitMQ
+        - Redpanda
         - Selenium
         - Solr
         - TiDB
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 981f5613a1e..91031adfeee 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -42,6 +42,7 @@ body:
         - Presto
         - Pulsar
         - RabbitMQ
+        - Redpanda
         - Selenium
         - Solr
         - TiDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 22437e15825..4c270ef762c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -187,6 +187,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/redpanda"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/selenium"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index cf75af99d26..492991a9947 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -69,6 +69,8 @@
   - modules/r2dbc/*
 "modules/rabbitmq":
   - modules/rabbitmq/*
+"modules/redpanda":
+  - modules/redpanda/*
 "modules/selenium":
   - modules/selenium/*
 "modules/solr":
diff --git a/docs/modules/redpanda.md b/docs/modules/redpanda.md
new file mode 100644
index 00000000000..8749c9c87f5
--- /dev/null
+++ b/docs/modules/redpanda.md
@@ -0,0 +1,38 @@
+# Redpanda
+
+Testcontainers can be used to automatically instantiate and manage [Redpanda](https://redpanda.com/) containers.
+More precisely Testcontainers uses the official Docker images for [Redpanda](https://hub.docker.com/r/vectorized/redpanda/)
+
+!!! note
+    This module uses features provided in `docker.redpanda.com/vectorized/redpanda`.
+
+## Example
+
+Create a `Redpanda` to use it in your tests:
+<!--codeinclude-->
+[Creating a Redpanda](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:constructorWithVersion
+<!--/codeinclude-->
+
+Now your tests or any other process running on your machine can get access to running Redpanda broker by using the following bootstrap server location:
+
+<!--codeinclude-->
+[Bootstrap Servers](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:getBootstrapServers
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+```groovy
+testImplementation "org.testcontainers:redpanda:{{latest_version}}"
+```
+=== "Maven"
+```xml
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>redpanda</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index a836e0a2ff7..42011817a5c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -78,6 +78,7 @@ nav:
           - modules/nginx.md
           - modules/pulsar.md
           - modules/rabbitmq.md
+          - modules/redpanda.md
           - modules/solr.md
           - modules/toxiproxy.md
           - modules/vault.md
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
new file mode 100644
index 00000000000..5750e873bf6
--- /dev/null
+++ b/modules/redpanda/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: Redpanda"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+}
diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
new file mode 100644
index 00000000000..cbb7db1e7c1
--- /dev/null
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -0,0 +1,60 @@
+package org.testcontainers.redpanda;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Redpanda.
+ */
+public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
+
+    private static final String REDPANDA_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda";
+
+    private static final DockerImageName REDPANDA_IMAGE = DockerImageName.parse(REDPANDA_FULL_IMAGE_NAME);
+
+    private static final int REDPANDA_PORT = 9092;
+
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
+    public RedpandaContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public RedpandaContainer(DockerImageName imageName) {
+        super(imageName);
+        imageName.assertCompatibleWith(REDPANDA_IMAGE);
+
+        boolean isLessThanBaseVersion = new ComparableVersion(imageName.getVersionPart()).isLessThan("v22.2.1");
+        if (REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) && isLessThanBaseVersion) {
+            throw new IllegalArgumentException("Redpanda version must be >= v22.2.1");
+        }
+
+        withExposedPorts(REDPANDA_PORT);
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.withEntrypoint("sh");
+        });
+        waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1));
+        withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        super.containerIsStarting(containerInfo);
+
+        String command = "#!/bin/bash\n";
+
+        command += "/usr/bin/rpk redpanda start --mode dev-container ";
+        command += "--kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 ";
+        command += "--advertise-kafka-addr PLAINTEXT://kafka:29092,OUTSIDE://" + getHost() + ":" + getMappedPort(9092);
+
+        copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
+    }
+
+    public String getBootstrapServers() {
+        return String.format("PLAINTEXT://%s:%s", getHost(), getMappedPort(REDPANDA_PORT));
+    }
+}
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
new file mode 100644
index 00000000000..086bf43364b
--- /dev/null
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -0,0 +1,130 @@
+package org.testcontainers.redpanda;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.Test;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.tuple;
+
+public class RedpandaContainerTest {
+
+    private static final String REDPANDA_IMAGE = "docker.redpanda.com/vectorized/redpanda:v22.2.1";
+
+    private static final DockerImageName REDPANDA_DOCKER_IMAGE = DockerImageName.parse(REDPANDA_IMAGE);
+
+    @Test
+    public void testUsage() throws Exception {
+        try (RedpandaContainer container = new RedpandaContainer(REDPANDA_DOCKER_IMAGE)) {
+            container.start();
+            testKafkaFunctionality(container.getBootstrapServers());
+        }
+    }
+
+    @Test
+    public void testUsageWithStringImage() throws Exception {
+        try (
+            // constructorWithVersion {
+            RedpandaContainer container = new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v22.2.1")
+            // }
+        ) {
+            container.start();
+            testKafkaFunctionality(
+                // getBootstrapServers {
+                container.getBootstrapServers()
+                // }
+            );
+        }
+    }
+
+    @Test
+    public void testNotCompatibleVersion() {
+        assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v21.11.19"))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("Redpanda version must be >= v22.2.1");
+    }
+
+    private void testKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, 1, 1);
+    }
+
+    private void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
+        try (
+            AdminClient adminClient = AdminClient.create(
+                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
+            );
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                ImmutableMap.of(
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG,
+                    UUID.randomUUID().toString()
+                ),
+                new StringSerializer(),
+                new StringSerializer()
+            );
+            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
+                ImmutableMap.of(
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG,
+                    "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+                    "earliest"
+                ),
+                new StringDeserializer(),
+                new StringDeserializer()
+            );
+        ) {
+            String topicName = "messages-" + UUID.randomUUID();
+
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
+            consumer.subscribe(Collections.singletonList(topicName));
+
+            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
+
+            Unreliables.retryUntilTrue(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+
+                    if (records.isEmpty()) {
+                        return false;
+                    }
+
+                    assertThat(records)
+                        .hasSize(1)
+                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+
+                    return true;
+                }
+            );
+
+            consumer.unsubscribe();
+        }
+    }
+}
diff --git a/modules/redpanda/src/test/resources/logback-test.xml b/modules/redpanda/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/redpanda/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 5f486d9c5e3e6a0c8ca7a270bd1c033cf0292c23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:27 +0000
Subject: [PATCH 2150/4969] Bump postgresql from 42.4.1 to 42.4.2 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 1fc5dac8d8a..fbd2415e53c 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.4.1'
+    testImplementation 'org.postgresql:postgresql:42.4.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From e8f7c19278c3d12c84097c868a64bb2e969ca298 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:29 +0000
Subject: [PATCH 2151/4969] Bump postgresql from 42.4.1 to 42.4.2 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 08afd67839d..dd1d0c7ed6e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.4.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.4.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }

From ba585921f607a12b770bacbda3d6bc1be7fa0f44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:29 +0000
Subject: [PATCH 2152/4969] Bump google-cloud-pubsub from 1.120.11 to 1.120.12
 in /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.11 to 1.120.12.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.11...v1.120.12)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index e7bc4065d82..bb79bfbbcc2 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.11'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.12'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 87b0a80d69b674d727b1cc216e13e3b0819e07aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:30 +0000
Subject: [PATCH 2153/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.281 to 1.12.285.
- [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.12.281...1.12.285)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 81ec1f9deb5..8b548d5b91f 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 6c7b68c88dcb01a67f56dc9c7d701deca3b1b718 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:31 +0000
Subject: [PATCH 2154/4969] Bump trino-jdbc from 392 to 393 in /modules/trino

Bumps trino-jdbc from 392 to 393.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 09b5b8cb16c..e5b7efee873 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:392'
+    testImplementation 'io.trino:trino-jdbc:393'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 42ddd6b86bcfd1e5f54b594b22f8b13e2ac86c24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:32 +0000
Subject: [PATCH 2155/4969] Bump postgresql from 42.4.1 to 42.4.2 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f769bf9b07c..0c5035df549 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.4.1'
+    testImplementation 'org.postgresql:postgresql:42.4.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'

From c4462e6d05390988b871b9bce277b9e14733c179 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:37 +0000
Subject: [PATCH 2156/4969] Bump s3 from 2.17.253 to 2.17.256 in
 /modules/localstack

Bumps s3 from 2.17.253 to 2.17.256.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 76090d2f6dd..23f4d045cba 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.282'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
-    testImplementation 'software.amazon.awssdk:s3:2.17.253'
+    testImplementation 'software.amazon.awssdk:s3:2.17.256'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 23d93d52d6414a02772e3768aa6bd70671e333f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:40 +0000
Subject: [PATCH 2157/4969] Bump release-drafter/release-drafter from 5.20.0 to
 5.20.1

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.20.0 to 5.20.1.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/ac463ffd9cc4c6ad5682af93dc3e3591c4657ee3...06a49bf28488e030d35ca2ac6dbf7f408a481779)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index fb0780d781f..94af563bcda 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@ac463ffd9cc4c6ad5682af93dc3e3591c4657ee3 # v5.19.0
+      - uses: release-drafter/release-drafter@06a49bf28488e030d35ca2ac6dbf7f408a481779 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From aa1512123425260157c313ccd4e8011a436dbc50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:41 +0000
Subject: [PATCH 2158/4969] Bump aws-java-sdk-s3 from 1.12.281 to 1.12.285 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.281 to 1.12.285.
- [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.12.281...1.12.285)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 76090d2f6dd..65128d624bc 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.281'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.285'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.282'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
     testImplementation 'software.amazon.awssdk:s3:2.17.253'

From d100185f041aae612e19c11df7223d2f214f56ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:43 +0000
Subject: [PATCH 2159/4969] Bump peter-evans/create-pull-request from 4.0.4 to
 4.1.1

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.0.4 to 4.1.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/923ad837f191474af6b1721408744feb989a4c27...18f90432bedd2afd6a825469ffd38aa24712a91d)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index b2736c42590..070fa2c55d4 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 # v3.10.1
+        uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From 1850fa7ca123cc7ee5e375d8867b2d80881b2b66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:36:47 +0000
Subject: [PATCH 2160/4969] Bump postgresql from 42.4.1 to 42.4.2 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1865f70f801..5b690597eaf 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220320'
-    testImplementation 'org.postgresql:postgresql:42.4.1'
+    testImplementation 'org.postgresql:postgresql:42.4.2'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From b82ae5c02cddb455d13c7525785799295b767b4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 02:15:39 +0000
Subject: [PATCH 2161/4969] Bump aws-java-sdk-logs from 1.12.281 to 1.12.285 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.281 to 1.12.285.
- [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.12.281...1.12.285)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 6c19c73b3be..ed6f57fb6d2 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.282'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.285'
     testImplementation 'software.amazon.awssdk:s3:2.17.256'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 3bb9afa1d42e968297c285ca46f80b49f0142a9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 02:15:44 +0000
Subject: [PATCH 2162/4969] Bump postgresql from 42.4.1 to 42.4.2 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 304e0b98dc4..543824ea8f6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.4.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.4.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'

From 917f451cd04f313f923682fb19ddcc7255d403ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 14:48:41 +0000
Subject: [PATCH 2163/4969] Bump aws-java-sdk-sqs from 1.12.282 to 1.12.285 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.282 to 1.12.285.
- [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.12.282...1.12.285)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ed6f57fb6d2..ad43f6f9c08 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.282'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.285'
     testImplementation 'software.amazon.awssdk:s3:2.17.256'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From dcf416cdc31c59131819f73e92e382e0b5c368af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 19 Aug 2022 11:35:54 -0500
Subject: [PATCH 2164/4969] Fix type/docs label (#5759)

Only consider files with `.md` extension.
---
 .github/labeler.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 492991a9947..85144b7d7f9 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -85,4 +85,5 @@
   - modules/trino/*
 "modules/vault":
   - modules/vault/*
-"type/docs": docs/**/*
+"type/docs":
+  - docs/**/*.md

From 017d937dc7d2d847f2f412ba37c3db226c4623d5 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 22 Aug 2022 16:48:59 +0200
Subject: [PATCH 2165/4969] Update GHA runner image to latest Ubuntu (#5761)

`ubuntu-latest` means `ubuntu-20.04` at the time of the commit. It should always be a LTS version.
---
 .github/workflows/ci-docker-wormhole.yml  | 2 +-
 .github/workflows/ci-examples.yml         | 4 ++--
 .github/workflows/ci-rootless.yml         | 2 +-
 .github/workflows/ci.yml                  | 4 ++--
 .github/workflows/release.yml             | 2 +-
 .github/workflows/update-docs-version.yml | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index e27e4d8d611..ace645e1bb1 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   in-docker_test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Build with Gradle
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index f23fc66e889..70917663e25 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   find_gradle_jobs:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 348cf5aaaf7..334fe69e9c4 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 288e9329824..ee1b64b6429 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - id: thundra_test_initializer
         uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 29a0b920922..fedef1c4a52 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   release:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 070fa2c55d4..443ba11788f 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: github.repository == 'testcontainers/testcontainers-java'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:

From d568e9d2d865f9ec530839d8957941a764825118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 23 Aug 2022 13:18:24 -0500
Subject: [PATCH 2166/4969] Add samples section (#5763)

List examples provided in testcontainers by providing an specific
section in the docs.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/examples.md | 16 ++++++++++++++++
 mkdocs.yml       |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 docs/examples.md

diff --git a/docs/examples.md b/docs/examples.md
new file mode 100644
index 00000000000..abd5e410c21
--- /dev/null
+++ b/docs/examples.md
@@ -0,0 +1,16 @@
+# Examples
+
+Examples of different use cases provided by Testcontainers can be found below:
+
+- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/kafka-cluster)
+- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/linked-container)
+- [MongoDB](https://github.com/testcontainers/testcontainers-java/tree/master/examples/mongodb-container)
+- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/master/examples/neo4j-container)
+- [Redis](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache)
+- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
+- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
+- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/master/examples/singleton-container)
+- [Solr](https://github.com/testcontainers/testcontainers-java/tree/master/examples/solr-container)
+- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot)
+- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot-kotlin-redis)
+- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache-testng)
diff --git a/mkdocs.yml b/mkdocs.yml
index 42011817a5c..87b19de4f0a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -88,6 +88,7 @@ nav:
           - test_framework_integration/junit_5.md
           - test_framework_integration/spock.md
           - test_framework_integration/manual_lifecycle_control.md
+    - Examples: examples.md
     - System Requirements:
           - supported_docker_environment/index.md
           - Continuous Integration:

From 7044cde703809ff1d2330923cd30ceecf6845f47 Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Tue, 23 Aug 2022 23:02:11 +0200
Subject: [PATCH 2167/4969] [couchbase] only expose ports for enabled services
 (#4595)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This changeset is a minor cleanup, but it makes sense to
only actually expose the ports for the services which are
enabled and not all of them all the time.

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../couchbase/CouchbaseContainer.java         | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 4f190a5413c..8603a0b0787 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -241,22 +241,7 @@ public String getConnectionString() {
     protected void configure() {
         super.configure();
 
-        addExposedPorts(
-            MGMT_PORT,
-            MGMT_SSL_PORT,
-            VIEW_PORT,
-            VIEW_SSL_PORT,
-            QUERY_PORT,
-            QUERY_SSL_PORT,
-            SEARCH_PORT,
-            SEARCH_SSL_PORT,
-            ANALYTICS_PORT,
-            ANALYTICS_SSL_PORT,
-            KV_PORT,
-            KV_SSL_PORT,
-            EVENTING_PORT,
-            EVENTING_SSL_PORT
-        );
+        exposePorts();
 
         WaitAllStrategy waitStrategy = new WaitAllStrategy();
 
@@ -319,6 +304,34 @@ protected void configure() {
         waitingFor(waitStrategy);
     }
 
+    /**
+     * Configures the exposed ports based on the enabled services.
+     * <p>
+     * Note that the MGMT_PORTs are always enabled since there must always be a cluster
+     * manager. Also, the View engine ports are implicitly available on the same nodes
+     * where the KV service is enabled - it is not possible to configure them individually.
+     */
+    private void exposePorts() {
+        addExposedPorts(MGMT_PORT, MGMT_SSL_PORT);
+
+        if (enabledServices.contains(CouchbaseService.KV)) {
+            addExposedPorts(KV_PORT, KV_SSL_PORT);
+            addExposedPorts(VIEW_PORT, VIEW_SSL_PORT);
+        }
+        if (enabledServices.contains(CouchbaseService.ANALYTICS)) {
+            addExposedPorts(ANALYTICS_PORT, ANALYTICS_SSL_PORT);
+        }
+        if (enabledServices.contains(CouchbaseService.QUERY)) {
+            addExposedPorts(QUERY_PORT, QUERY_SSL_PORT);
+        }
+        if (enabledServices.contains(CouchbaseService.SEARCH)) {
+            addExposedPorts(SEARCH_PORT, SEARCH_SSL_PORT);
+        }
+        if (enabledServices.contains(CouchbaseService.EVENTING)) {
+            addExposedPorts(EVENTING_PORT, EVENTING_SSL_PORT);
+        }
+    }
+
     @Override
     protected void containerIsStarting(final InspectContainerResponse containerInfo) {
         logger().debug("Couchbase container is starting, performing configuration.");

From 62fc6a9cd3a1ab9af19d59612977968e50e9192e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 24 Aug 2022 04:20:13 -0500
Subject: [PATCH 2168/4969] Upgrade spring-boot version to 2.7.3 in examples
 (#5764)

`driver.findElementsByTagName()` is not available anymore in 2.7.3
---
 examples/selenium-container/build.gradle                     | 2 +-
 .../src/test/java/SeleniumContainerTest.java                 | 5 +++--
 examples/spring-boot-kotlin-redis/build.gradle               | 4 ++--
 examples/spring-boot/build.gradle                            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index dc10798a060..6183b89e1d6 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.6.4'
+    id 'org.springframework.boot' version '2.7.3'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/selenium-container/src/test/java/SeleniumContainerTest.java b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
index 32411b98ed9..c28c9bc54cb 100644
--- a/examples/selenium-container/src/test/java/SeleniumContainerTest.java
+++ b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
@@ -2,12 +2,13 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.context.WebServerInitializedEvent;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -43,7 +44,7 @@ public void simplePlainSeleniumTest() {
         RemoteWebDriver driver = chrome.getWebDriver();
 
         driver.get("http://host.testcontainers.internal:" + port + "/foo.html");
-        List<WebElement> hElement = driver.findElementsByTagName("h");
+        List<WebElement> hElement = driver.findElements(By.tagName("h"));
 
         assertThat(hElement).as("The h element is found").isNotEmpty();
     }
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 383491eb32d..180d6780c8f 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.6.4"
+    id("org.springframework.boot") version "2.7.3"
     id("org.jetbrains.kotlin.jvm") version "1.7.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"
 }
@@ -25,4 +25,4 @@ compileKotlin {
         jvmTarget = "1.8"
         freeCompilerArgs = ["-Xjsr305=strict"]
     }
-}
\ No newline at end of file
+}
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 650b5a60d98..52a4a63386a 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.6.4'
+    id 'org.springframework.boot' version '2.7.3'
 }
 apply plugin: 'io.spring.dependency-management'
 

From d5ff8c362b36a7a3e1b9ee22b0b1cecce9675f43 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 24 Aug 2022 11:55:45 +0200
Subject: [PATCH 2169/4969] Revert "Update GHA runner image to latest Ubuntu
 (#5761)" (#5766)

This reverts commit 017d937dc7d2d847f2f412ba37c3db226c4623d5.

Necessary to fix CI for the Azure module.
---
 .github/workflows/ci-docker-wormhole.yml  | 2 +-
 .github/workflows/ci-examples.yml         | 4 ++--
 .github/workflows/ci-rootless.yml         | 2 +-
 .github/workflows/ci.yml                  | 4 ++--
 .github/workflows/release.yml             | 2 +-
 .github/workflows/update-docs-version.yml | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index ace645e1bb1..e27e4d8d611 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   in-docker_test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v3
       - name: Build with Gradle
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 70917663e25..f23fc66e889 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   find_gradle_jobs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 334fe69e9c4..348cf5aaaf7 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee1b64b6429..288e9329824 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - id: thundra_test_initializer
         uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fedef1c4a52..29a0b920922 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 443ba11788f..070fa2c55d4 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: github.repository == 'testcontainers/testcontainers-java'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v3
         with:

From f6399608f53aece84a813386ee13d1c4360e813b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 25 Aug 2022 01:55:37 -0500
Subject: [PATCH 2170/4969] Add link to GH Discussions to Issue forms (#5767)

---
 .github/ISSUE_TEMPLATE/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index d27b0d086e9..418d5a62fe9 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,3 +3,6 @@ contact_links:
   - name: Need help or have a question?
     url: https://slack.testcontainers.org/
     about: Visit our slack channel.
+  - name: Have a question or want to drive a Community conversation?
+    url: https://github.com/testcontainers/testcontainers-java/discussions/
+    about: Visit our Discussions page.

From 1b961d8518339ddcfbb44081c59466260a5aec42 Mon Sep 17 00:00:00 2001
From: Aidan Do <43259657+REslim30@users.noreply.github.com>
Date: Fri, 26 Aug 2022 01:43:26 +0930
Subject: [PATCH 2171/4969] Set default elasticsearch heap size to 2GB (#5684)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../elasticsearch/ElasticsearchContainer.java |  8 +++
 .../elasticsearch-default-memory-vm.options   |  2 +
 .../ElasticsearchContainerTest.java           | 50 +++++++++++++++++++
 .../resources/test-custom-memory-jvm.options  |  2 +
 4 files changed, 62 insertions(+)
 create mode 100644 modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options
 create mode 100644 modules/elasticsearch/src/test/resources/test-custom-memory-jvm.options

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index f8b9f779519..edef04e001e 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -5,6 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.Base58;
@@ -98,6 +99,13 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         logger().info("Starting an elasticsearch container using [{}]", dockerImageName);
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
         withEnv("discovery.type", "single-node");
+        // Sets default memory of elasticsearch instance to 2GB
+        // Spaces are deliberate to allow user to define additional jvm options as elasticsearch resolves option files lexicographically
+        withClasspathResourceMapping(
+            "elasticsearch-default-memory-vm.options",
+            "/usr/share/elasticsearch/config/jvm.options.d/ elasticsearch-default-memory-vm.options",
+            BindMode.READ_ONLY
+        );
         addExposedPorts(ELASTICSEARCH_DEFAULT_PORT, ELASTICSEARCH_DEFAULT_TCP_PORT);
         this.isAtLeastMajorVersion8 =
             new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("8.0.0");
diff --git a/modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options b/modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options
new file mode 100644
index 00000000000..10db7b96157
--- /dev/null
+++ b/modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options
@@ -0,0 +1,2 @@
+-Xms2147483648
+-Xmx2147483648
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 1e1e70b5d75..7ee81c82759 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -19,6 +19,7 @@
 import org.junit.After;
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.RemoteDockerImage;
@@ -375,6 +376,46 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
         }
     }
 
+    @Test
+    public void testElasticsearchDefaultMaxHeapSize() throws Exception {
+        long defaultHeapSize = 2147483648L;
+
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
+            container.start();
+            assertElasticsearchContainerHasHeapSize(container, defaultHeapSize);
+        }
+    }
+
+    @Test
+    public void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exception {
+        long customHeapSize = 1574961152;
+
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
+                .withEnv("ES_JAVA_OPTS", String.format("-Xms%d  -Xmx%d", customHeapSize, customHeapSize))
+        ) {
+            container.start();
+            assertElasticsearchContainerHasHeapSize(container, customHeapSize);
+        }
+    }
+
+    @Test
+    public void testElasticsearchCustomMaxHeapSizeInJvmOptionsFile() throws Exception {
+        long customHeapSize = 1574961152;
+
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
+                .withClasspathResourceMapping(
+                    "test-custom-memory-jvm.options",
+                    "/usr/share/elasticsearch/config/jvm.options.d/a-user-defined-jvm.options",
+                    BindMode.READ_ONLY
+                );
+        ) {
+            container.start();
+            assertElasticsearchContainerHasHeapSize(container, customHeapSize);
+        }
+    }
+
     private void tagImage(String sourceImage, String targetImage, String targetTag) throws InterruptedException {
         DockerClient dockerClient = DockerClientFactory.instance().client();
         dockerClient
@@ -438,4 +479,13 @@ private RestClient getAnonymousClient(ElasticsearchContainer container) {
 
         return anonymousClient;
     }
+
+    private void assertElasticsearchContainerHasHeapSize(ElasticsearchContainer container, long heapSizeInBytes)
+        throws Exception {
+        Response response = getClient(container).performRequest(new Request("GET", "/_nodes/_all/jvm"));
+        String responseBody = EntityUtils.toString(response.getEntity());
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+        assertThat(responseBody).contains("\"heap_init_in_bytes\":" + heapSizeInBytes);
+        assertThat(responseBody).contains("\"heap_max_in_bytes\":" + heapSizeInBytes);
+    }
 }
diff --git a/modules/elasticsearch/src/test/resources/test-custom-memory-jvm.options b/modules/elasticsearch/src/test/resources/test-custom-memory-jvm.options
new file mode 100644
index 00000000000..e3fe586284e
--- /dev/null
+++ b/modules/elasticsearch/src/test/resources/test-custom-memory-jvm.options
@@ -0,0 +1,2 @@
+-Xms1574961152
+-Xmx1574961152

From a18cab6cea2502c8bbb1f4eb7e4b11a6e6d4749d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 26 Aug 2022 01:07:43 -0600
Subject: [PATCH 2172/4969] Add .sdkmanrc with 8.0.345-tem (#5772)

`.sdkmanrc` is used by sdkman to automatically switch to the version declared in the file via env command
---
 .sdkmanrc | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .sdkmanrc

diff --git a/.sdkmanrc b/.sdkmanrc
new file mode 100644
index 00000000000..95cd27dd1ad
--- /dev/null
+++ b/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.345-tem

From bd22f1e0fbf9a165881d68f6c33e1e4813e2014f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 26 Aug 2022 09:46:51 -0600
Subject: [PATCH 2173/4969] Add compatibility with MongoDB 6 (#5771)

MongoDB 6 removed `mongo` shell and `mongosh` is recommended.
See [here](https://www.mongodb.com/docs/manual/release-notes/6.0-compatibility/#legacy-mongo-shell-removed)

Closes #5768
---
 .../org/testcontainers/containers/MongoDBContainer.java   | 8 +++++++-
 .../testcontainers/containers/MongoDBContainerTest.java   | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 81bb59fd69d..cd2294e09ac 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -5,6 +5,7 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
@@ -29,6 +30,8 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
 
+    private final boolean isAtLeastVersion6;
+
     /**
      * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
      */
@@ -45,6 +48,8 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
+        this.isAtLeastVersion6 = new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("6.0");
+
         withExposedPorts(MONGODB_INTERNAL_PORT);
         withCommand("--replSet", "docker-rs");
         waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
@@ -87,7 +92,8 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
     }
 
     private String[] buildMongoEvalCommand(final String command) {
-        return new String[] { "mongo", "--eval", command };
+        String cmd = this.isAtLeastVersion6 ? "mongosh" : "mongo";
+        return new String[] { cmd, "--eval", command };
     }
 
     private void checkMongoNodeExitCode(final Container.ExecResult execResult) {
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index ff6d0d6ccba..acaa6c8e5d8 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -98,4 +98,11 @@ public void shouldTestDatabaseName() {
             assertThat(mongoDBContainer.getReplicaSetUrl(databaseName)).endsWith(databaseName);
         }
     }
+
+    @Test
+    public void supportsMongoDB_6() {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:6.0.1")) {
+            mongoDBContainer.start();
+        }
+    }
 }

From 84e9a66d31caddc89cd123e6aeaa175d5d946e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 27 Aug 2022 02:03:39 -0600
Subject: [PATCH 2174/4969] Exclude `org.testcontainers.shaded.*` package and
 upgrade deps (#5775)

Add general japicmp's package exclusion.

Also, shadow and test dependencies below are upgraded:
* Upgrade okhttp version to 4.10.0
* Upgrade javassist version to 3.29.0-GA
* Upgrade zip4j version to 2.11.1
* Upgrade kubernetes-client version to 6.0.0
---
 gradle/japicmp.gradle                                         | 3 +++
 modules/azure/build.gradle                                    | 2 +-
 modules/couchbase/build.gradle                                | 2 +-
 modules/hivemq/build.gradle                                   | 4 ++--
 modules/k3s/build.gradle                                      | 2 +-
 .../java/org/testcontainers/k3s/Fabric8K3sContainerTest.java  | 4 ++--
 modules/mockserver/build.gradle                               | 2 +-
 .../containers/MockServerContainerRuleTest.java               | 2 +-
 modules/solr/build.gradle                                     | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index 3c438d340f0..541736a8321 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -25,6 +25,9 @@ tasks.japicmp {
 
     onlyBinaryIncompatibleModified = true
     htmlOutputFile = file("$buildDir/reports/japi.html")
+    packageExcludes = [
+        "org.testcontainers.shaded.*",
+    ]
 }
 // do not run on Windows by default
 // TODO investigate zip issue on Windows
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index f8a7193571e..252eb895d37 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Azure"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:3.14.9'
+    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.azure:azure-cosmos:4.34.0'
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 6cdacbcf77a..5950aac7655 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:3.14.9'
+    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'com.couchbase.client:java-client:3.3.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index a85288f9fbd..9595b3e66b6 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -6,10 +6,10 @@ dependencies {
 
     shaded("org.apache.commons:commons-lang3:3.12.0")
     shaded("commons-io:commons-io:2.11.0")
-    shaded("org.javassist:javassist:3.28.0-GA")
+    shaded("org.javassist:javassist:3.29.0-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
-    shaded("net.lingala.zip4j:zip4j:2.10.0")
+    shaded("net.lingala.zip4j:zip4j:2.11.1")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
     testImplementation(project(":junit-jupiter"))
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 2223909f051..8c6792c42e0 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:5.12.2'
+    testImplementation 'io.fabric8:kubernetes-client:6.0.0'
     testImplementation 'io.kubernetes:client-java:16.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
index 6f9550eab2a..42b08444555 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
@@ -10,7 +10,7 @@
 import io.fabric8.kubernetes.api.model.ProbeBuilder;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.dsl.Readiable;
+import io.fabric8.kubernetes.client.dsl.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -55,7 +55,7 @@ public void shouldStartAndHaveListableNode() {
             client.pods().inNamespace("default").withName("helloworld").waitUntilReady(30, TimeUnit.SECONDS);
 
             assertThat(client.pods().inNamespace("default").withName("helloworld"))
-                .extracting(Readiable::isReady)
+                .extracting(Resource::isReady)
                 .isEqualTo(true);
         }
     }
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 2156ef045cd..df46295df21 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MockServer"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.mock-server:mockserver-client-java:5.5.4'
+    testImplementation 'org.mock-server:mockserver-client-java:5.13.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index 84d472f5e75..0e4fa102b2e 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -12,7 +12,7 @@
 public class MockServerContainerRuleTest {
 
     public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
-        "jamesdbloom/mockserver:mockserver-5.5.4"
+        "jamesdbloom/mockserver:mockserver-5.13.2"
     );
 
     // creatingProxy {
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index f8e2a99888d..72ab2997dea 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.9.3'
+    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 42a7441f59bdaa6315af202dfe7afa7e7b579be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 29 Aug 2022 09:05:39 -0600
Subject: [PATCH 2175/4969] Run mongosh or mongo if cmd exists (#5774)

Previously, the command execution relied on the image version which
is different when building custom images. Instead, `mongosh` or `mongo`
is executed if it is present within the PATH.
---
 .../containers/MongoDBContainer.java          | 12 +--
 .../containers/MongoDBContainerTest.java      | 92 ++++++++++---------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index cd2294e09ac..ae93e4121d3 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -5,7 +5,6 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
@@ -30,8 +29,6 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
 
-    private final boolean isAtLeastVersion6;
-
     /**
      * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
      */
@@ -48,8 +45,6 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.isAtLeastVersion6 = new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("6.0");
-
         withExposedPorts(MONGODB_INTERNAL_PORT);
         withCommand("--replSet", "docker-rs");
         waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
@@ -92,8 +87,11 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
     }
 
     private String[] buildMongoEvalCommand(final String command) {
-        String cmd = this.isAtLeastVersion6 ? "mongosh" : "mongo";
-        return new String[] { cmd, "--eval", command };
+        return new String[] {
+            "sh",
+            "-c",
+            "mongosh mongo --eval \"" + command + "\"  || mongo --eval \"" + command + "\"",
+        };
     }
 
     private void checkMongoNodeExitCode(final Container.ExecResult execResult) {
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index acaa6c8e5d8..dd59420f937 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -30,56 +30,59 @@ public void shouldExecuteTransactions() {
             // startingMongoDBContainer {
             mongoDBContainer.start();
             // }
+            executeTx(mongoDBContainer);
+        }
+    }
 
-            final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
-            assertThat(mongoRsUrl).isNotNull();
-            final String connectionString = mongoDBContainer.getConnectionString();
-            final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
-            final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
-            mongoSyncClient
-                .getDatabase("mydb1")
-                .getCollection("foo")
-                .withWriteConcern(WriteConcern.MAJORITY)
-                .insertOne(new Document("abc", 0));
-            mongoSyncClient
-                .getDatabase("mydb2")
-                .getCollection("bar")
-                .withWriteConcern(WriteConcern.MAJORITY)
-                .insertOne(new Document("xyz", 0));
-            mongoSyncClientBase
-                .getDatabase("mydb3")
-                .getCollection("baz")
-                .withWriteConcern(WriteConcern.MAJORITY)
-                .insertOne(new Document("def", 0));
+    private void executeTx(MongoDBContainer mongoDBContainer) {
+        final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
+        assertThat(mongoRsUrl).isNotNull();
+        final String connectionString = mongoDBContainer.getConnectionString();
+        final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
+        final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
+        mongoSyncClient
+            .getDatabase("mydb1")
+            .getCollection("foo")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("abc", 0));
+        mongoSyncClient
+            .getDatabase("mydb2")
+            .getCollection("bar")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("xyz", 0));
+        mongoSyncClientBase
+            .getDatabase("mydb3")
+            .getCollection("baz")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("def", 0));
 
-            final ClientSession clientSession = mongoSyncClient.startSession();
-            final TransactionOptions txnOptions = TransactionOptions
-                .builder()
-                .readPreference(ReadPreference.primary())
-                .readConcern(ReadConcern.LOCAL)
-                .writeConcern(WriteConcern.MAJORITY)
-                .build();
+        final ClientSession clientSession = mongoSyncClient.startSession();
+        final TransactionOptions txnOptions = TransactionOptions
+            .builder()
+            .readPreference(ReadPreference.primary())
+            .readConcern(ReadConcern.LOCAL)
+            .writeConcern(WriteConcern.MAJORITY)
+            .build();
 
-            final String trxResult = "Inserted into collections in different databases";
+        final String trxResult = "Inserted into collections in different databases";
 
-            TransactionBody<String> txnBody = () -> {
-                final MongoCollection<Document> coll1 = mongoSyncClient.getDatabase("mydb1").getCollection("foo");
-                final MongoCollection<Document> coll2 = mongoSyncClient.getDatabase("mydb2").getCollection("bar");
+        TransactionBody<String> txnBody = () -> {
+            final MongoCollection<Document> coll1 = mongoSyncClient.getDatabase("mydb1").getCollection("foo");
+            final MongoCollection<Document> coll2 = mongoSyncClient.getDatabase("mydb2").getCollection("bar");
 
-                coll1.insertOne(clientSession, new Document("abc", 1));
-                coll2.insertOne(clientSession, new Document("xyz", 999));
-                return trxResult;
-            };
+            coll1.insertOne(clientSession, new Document("abc", 1));
+            coll2.insertOne(clientSession, new Document("xyz", 999));
+            return trxResult;
+        };
 
-            try {
-                final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
-                assertThat(trxResultActual).isEqualTo(trxResult);
-            } catch (RuntimeException re) {
-                throw new IllegalStateException(re.getMessage(), re);
-            } finally {
-                clientSession.close();
-                mongoSyncClient.close();
-            }
+        try {
+            final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
+            assertThat(trxResultActual).isEqualTo(trxResult);
+        } catch (RuntimeException re) {
+            throw new IllegalStateException(re.getMessage(), re);
+        } finally {
+            clientSession.close();
+            mongoSyncClient.close();
         }
     }
 
@@ -103,6 +106,7 @@ public void shouldTestDatabaseName() {
     public void supportsMongoDB_6() {
         try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:6.0.1")) {
             mongoDBContainer.start();
+            executeTx(mongoDBContainer);
         }
     }
 }

From b57cbce1ac6f35d698a0f663a61ec0096981e431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 29 Aug 2022 10:51:21 -0600
Subject: [PATCH 2176/4969] Remove `disque-job-queue` and `mongodb-container`
 examples (#5782)

Examples should provided useful usage of technologies. In this case,
`disque-job-queue` seems to provide a not up-to-date image and
`mongodb-container` already provides its own module.
---
 docs/examples.md                              |  1 -
 examples/disque-job-queue/build.gradle        | 19 ----
 .../java/DisqueBackedMailSenderService.java   | 73 ---------------
 .../src/main/java/MailApiClient.java          | 11 ---
 .../src/main/java/MailMessage.java            | 12 ---
 .../src/main/java/MailSenderService.java      | 45 ----------
 .../test/java/DisqueBackedMailSenderTest.java | 89 -------------------
 .../test/java/SingleDisqueInstanceTest.java   | 61 -------------
 .../src/test/resources/logback-test.xml       | 14 ---
 examples/mongodb-container/build.gradle       | 13 ---
 .../containers/MongoDbContainer.java          | 64 -------------
 .../containers/MongoDbContainerTest.java      | 28 ------
 examples/settings.gradle                      |  2 -
 13 files changed, 432 deletions(-)
 delete mode 100644 examples/disque-job-queue/build.gradle
 delete mode 100644 examples/disque-job-queue/src/main/java/DisqueBackedMailSenderService.java
 delete mode 100644 examples/disque-job-queue/src/main/java/MailApiClient.java
 delete mode 100644 examples/disque-job-queue/src/main/java/MailMessage.java
 delete mode 100644 examples/disque-job-queue/src/main/java/MailSenderService.java
 delete mode 100644 examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
 delete mode 100644 examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
 delete mode 100644 examples/disque-job-queue/src/test/resources/logback-test.xml
 delete mode 100644 examples/mongodb-container/build.gradle
 delete mode 100644 examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
 delete mode 100644 examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java

diff --git a/docs/examples.md b/docs/examples.md
index abd5e410c21..2c6036ab2ea 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -4,7 +4,6 @@ Examples of different use cases provided by Testcontainers can be found below:
 
 - [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/kafka-cluster)
 - [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/linked-container)
-- [MongoDB](https://github.com/testcontainers/testcontainers-java/tree/master/examples/mongodb-container)
 - [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/master/examples/neo4j-container)
 - [Redis](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache)
 - [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
deleted file mode 100644
index 6c7a453c3e9..00000000000
--- a/examples/disque-job-queue/build.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-plugins {
-    id 'java'
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.24"
-    annotationProcessor "org.projectlombok:lombok:1.18.24"
-    implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
-    testImplementation 'org.mockito:mockito-all:1.10.19'
-    testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
-}
diff --git a/examples/disque-job-queue/src/main/java/DisqueBackedMailSenderService.java b/examples/disque-job-queue/src/main/java/DisqueBackedMailSenderService.java
deleted file mode 100644
index d2096106500..00000000000
--- a/examples/disque-job-queue/src/main/java/DisqueBackedMailSenderService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-import biz.paluch.spinach.DisqueClient;
-import biz.paluch.spinach.api.Job;
-import biz.paluch.spinach.api.sync.DisqueCommands;
-import com.google.gson.Gson;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Simple example of how a mail service can be backed by a Disque job queue.
- *
- * It's assumed that for actual sending (SMTP, HTTP API, etc), this service calls a {@link MailApiClient}.
- * However, this can be expected to be quite unreliable, so use of Disque as a backing store helps keep track
- * of sent/failed state.
- */
-public class DisqueBackedMailSenderService implements MailSenderService {
-
-    private final DisqueCommands<String, String> disque;
-    private final Gson gson;
-    private final MailApiClient mailApiClient;
-
-    public DisqueBackedMailSenderService(DisqueClient client, MailApiClient mailApiClient) {
-        this.mailApiClient = mailApiClient;
-
-        // Obtain a Disque connection from DisqueClient
-        disque = client.connect().sync();
-
-        gson = new Gson();
-    }
-
-    @Override
-    public String enqueueMessage(MailMessage message) {
-        String messageAsJson = gson.toJson(message);
-
-        // Enqueue the message as JSON, setting a TTL of 1 day (will expire off the queue if not sent by then)
-        String jobId = disque.addjob("mail", messageAsJson, 1, TimeUnit.DAYS);
-
-        return jobId;
-    }
-
-    @Override
-    public Result doScheduledSend() {
-
-        Set<String> succeededJobIds = new HashSet<>();
-        Set<String> failedJobIds = new HashSet<>();
-
-        // Wait up to 100ms for new messages to arrive on the queue
-        // Retrieve up to 10 messages
-        // (Ordinarily we'd make these configurable!)
-        List<Job<String, String>> jobs = disque.getjobs(100, TimeUnit.MILLISECONDS, 10, "mail");
-
-        for (Job<String, String> job : jobs) {
-            String jsonBody = job.getBody();
-            MailMessage message = gson.fromJson(jsonBody, MailMessage.class);
-
-            try {
-                mailApiClient.send(message);
-                succeededJobIds.add(job.getId());
-            } catch (MailApiClient.MailSendException e) {
-                failedJobIds.add(job.getId());
-            }
-        }
-
-        // For any failed messages, proactively return to the queue
-        disque.nack(failedJobIds.toArray(new String[failedJobIds.size()]));
-        // For any successful jobs, mark as completed
-        disque.ackjob(succeededJobIds.toArray(new String[succeededJobIds.size()]));
-
-        return new Result(succeededJobIds.size(), failedJobIds.size());
-    }
-}
diff --git a/examples/disque-job-queue/src/main/java/MailApiClient.java b/examples/disque-job-queue/src/main/java/MailApiClient.java
deleted file mode 100644
index 61a90112f32..00000000000
--- a/examples/disque-job-queue/src/main/java/MailApiClient.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Created by rnorth on 03/01/2016.
- */
-public interface MailApiClient {
-
-    boolean send(MailMessage message) throws MailSendException;
-
-    class MailSendException extends RuntimeException {
-
-    }
-}
diff --git a/examples/disque-job-queue/src/main/java/MailMessage.java b/examples/disque-job-queue/src/main/java/MailMessage.java
deleted file mode 100644
index de167199057..00000000000
--- a/examples/disque-job-queue/src/main/java/MailMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * Created by rnorth on 03/01/2016.
- */
-@Data @AllArgsConstructor
-public class MailMessage {
-    public final String subject;
-    public final String recipient;
-    public final String body;
-}
diff --git a/examples/disque-job-queue/src/main/java/MailSenderService.java b/examples/disque-job-queue/src/main/java/MailSenderService.java
deleted file mode 100644
index 95237bf2eec..00000000000
--- a/examples/disque-job-queue/src/main/java/MailSenderService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-
-import java.util.concurrent.Callable;
-
-/**
- * Created by rnorth on 03/01/2016.
- */
-public interface MailSenderService extends Callable<MailSenderService.Result> {
-
-    /**
-     * Enqueue a message to be sent on a subsequent {@link DisqueBackedMailSenderService#doScheduledSend()}
-     * @param message   mail message to be sent
-     * @return          an ID for the enqueued message
-     */
-    String enqueueMessage(MailMessage message);
-
-    /**
-     * Trigger a scheduled send of mail messages.
-     *
-     * TODO: In a real implementation this could be called by a {@link java.util.concurrent.ScheduledExecutorService},
-     * probably
-     *
-     * @return the result of sending queued messages.
-     */
-    MailSenderService.Result doScheduledSend();
-
-    /**
-     * call() implementation to allow MailSenderService to be used as a Callable. Simply delegates to
-     * the {@link DisqueBackedMailSenderService#doScheduledSend()} method.
-     *
-     * @return the result of sending queued messages.
-     * @throws Exception
-     */
-    default MailSenderService.Result call() throws Exception {
-        return doScheduledSend();
-    }
-
-    @Data
-    @RequiredArgsConstructor
-    class Result {
-        public final int successfulCount;
-        public final int failedCount;
-    }
-}
diff --git a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java b/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
deleted file mode 100644
index dfbab3f9e6a..00000000000
--- a/examples/disque-job-queue/src/test/java/DisqueBackedMailSenderTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-import biz.paluch.spinach.DisqueClient;
-import biz.paluch.spinach.DisqueURI;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Created by rnorth on 03/01/2016.
- */
-public class DisqueBackedMailSenderTest {
-
-    @Rule
-    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("richnorth/disque:1.0-rc1"))
-                                                .withExposedPorts(7711);
-    private DisqueClient disqueClient;
-
-    private MailSenderService service;
-    private MailApiClient mockMailApiClient;
-
-    private MailMessage dummyMessage1;
-    private MailMessage dummyMessage2;
-    private MailMessage dummyMessage3;
-
-    @Before
-    public void setup() {
-        disqueClient = new DisqueClient(DisqueURI.create(container.getHost(), container.getMappedPort(7711)));
-        mockMailApiClient = mock(MailApiClient.class);
-
-        service = new DisqueBackedMailSenderService(disqueClient, mockMailApiClient);
-
-        dummyMessage1 = new MailMessage("Dummy Message 1", "bob@example.com", "Test body");
-        dummyMessage2 = new MailMessage("Dummy Message 2", "bob@example.com", "Test body");
-        dummyMessage3 = new MailMessage("Dummy Message 3", "bob@example.com", "Test body");
-    }
-
-    @Test
-    public void testSimpleSuccessfulSending() throws Exception {
-        service.enqueueMessage(dummyMessage1);
-        service.enqueueMessage(dummyMessage2);
-        service.enqueueMessage(dummyMessage3);
-
-        when(mockMailApiClient.send(any(MailMessage.class))).thenReturn(true);
-
-        service.doScheduledSend();
-
-        verify(mockMailApiClient).send(eq(dummyMessage1));
-        verify(mockMailApiClient).send(eq(dummyMessage2));
-        verify(mockMailApiClient).send(eq(dummyMessage3));
-    }
-
-    @Test
-    public void testRetryOnFailure() throws Exception {
-        service.enqueueMessage(dummyMessage1);
-        service.enqueueMessage(dummyMessage2);
-        service.enqueueMessage(dummyMessage3);
-
-        when(mockMailApiClient.send(eq(dummyMessage1))).thenThrow(MailApiClient.MailSendException.class).thenReturn(true);
-        when(mockMailApiClient.send(eq(dummyMessage2))).thenReturn(true);
-        when(mockMailApiClient.send(eq(dummyMessage3))).thenReturn(true);
-
-        MailSenderService.Result result;
-
-        result = service.doScheduledSend();
-        assertThat(result.successfulCount).as("2 messages were 'sent' successfully").isEqualTo(2);
-        assertThat(result.failedCount).as("1 messages failed").isEqualTo(1);
-
-        result = service.doScheduledSend();
-        assertThat(result.successfulCount).as("1 message was 'sent' successfully").isEqualTo(1);
-        assertThat(result.failedCount).as("0 messages failed").isZero();
-
-        result = service.doScheduledSend();
-        assertThat(result.successfulCount).as("0 messages were 'sent' successfully").isZero();
-        assertThat(result.failedCount).as("0 messages failed").isZero();
-
-        verify(mockMailApiClient, times(2)).send(eq(dummyMessage1));
-        verify(mockMailApiClient).send(eq(dummyMessage2));
-        verify(mockMailApiClient).send(eq(dummyMessage3));
-    }
-}
diff --git a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java b/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
deleted file mode 100644
index 09830614eb0..00000000000
--- a/examples/disque-job-queue/src/test/java/SingleDisqueInstanceTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-import biz.paluch.spinach.DisqueClient;
-import biz.paluch.spinach.DisqueURI;
-import biz.paluch.spinach.api.AddJobArgs;
-import biz.paluch.spinach.api.Job;
-import biz.paluch.spinach.api.sync.DisqueCommands;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.concurrent.TimeUnit;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Created by rnorth on 03/01/2016.
- */
-public class SingleDisqueInstanceTest {
-
-    @Rule
-    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("richnorth/disque:1.0-rc1"))
-                                                .withExposedPorts(7711);
-    private DisqueCommands<String, String> connection;
-    private AddJobArgs retryAfter1Second;
-
-    @Before
-    public void setup() {
-        DisqueClient client = new DisqueClient(DisqueURI.create(container.getHost(), container.getMappedPort(7711)));
-        connection = client.connect().sync();
-        retryAfter1Second = AddJobArgs.builder().retry(1, TimeUnit.SECONDS).build();
-    }
-
-    @Test
-    public void testJobStoreAndRetrieve() {
-        connection.addjob("main_queue", "body", 1, TimeUnit.MINUTES);
-
-        Job<String, String> job = connection.getjob("main_queue");
-
-        assertThat(job.getBody()).as("The retrieved job is the same as the one that was added").isEqualTo("body");
-
-        connection.ackjob(job.getId());
-    }
-
-    @Test
-    public void testFailureToAckJobBeforeTimeout() throws InterruptedException {
-        connection.addjob("main_queue", "body", 1, TimeUnit.MINUTES, retryAfter1Second);
-
-        Job<String, String> job = connection.getjob("main_queue");
-
-        assertThat(job.getBody()).as("The retrieved job is the same as the one that was added").isEqualTo("body");
-
-        TimeUnit.SECONDS.sleep(2);
-
-        // The timeout specified here is how long the command will wait for a job to appear
-        Job<String, String> job2 = connection.getjob(5, TimeUnit.SECONDS, "main_queue");
-
-        assertThat(job2).as("After re-getting the original job is back on the queue").isNotNull();
-        assertThat(job2.getBody()).as("The retrieved job is the same as the one that was added").isEqualTo("body");
-    }
-}
diff --git a/examples/disque-job-queue/src/test/resources/logback-test.xml b/examples/disque-job-queue/src/test/resources/logback-test.xml
deleted file mode 100644
index be4ebaed2c8..00000000000
--- a/examples/disque-job-queue/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>
diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
deleted file mode 100644
index 1ae43055790..00000000000
--- a/examples/mongodb-container/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-plugins {
-    id 'java'
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13.2'
-    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
-}
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
deleted file mode 100644
index c4c07c1f601..00000000000
--- a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.testcontainers.containers;
-
-import org.jetbrains.annotations.NotNull;
-import org.testcontainers.utility.DockerImageName;
-
-
-/**
- * This {@link Container} is based on the official MongoDb ({@code mongo}) image from
- * <a href="https://hub.docker.com/r/_/mongo/">DockerHub</a>. If you need to use a custom MongoDB
- * image, you can provide the full image name as well.
- *
- * @author Stefan Ludwig
- */
-public class MongoDbContainer extends GenericContainer<MongoDbContainer> {
-
-    /**
-     * This is the internal port on which MongoDB is running inside the container.
-     * <p>
-     * You can use this constant in case you want to map an explicit public port to it
-     * instead of the default random port. This can be done using methods like
-     * {@link #setPortBindings(java.util.List)}.
-     */
-    public static final int MONGODB_PORT = 27017;
-    public static final String DEFAULT_IMAGE_AND_TAG = "mongo:4.0";
-
-    /**
-     * Creates a new {@link MongoDbContainer} with the {@value DEFAULT_IMAGE_AND_TAG} image.
-     * @deprecated use {@link MongoDbContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public MongoDbContainer() {
-        this(DEFAULT_IMAGE_AND_TAG);
-    }
-
-    /**
-     * Creates a new {@link MongoDbContainer} with the given {@code 'image'}.
-     *
-     * @param image the image (e.g. {@value DEFAULT_IMAGE_AND_TAG}) to use
-     * @deprecated use {@link MongoDbContainer(DockerImageName)} instead
-     */
-    public MongoDbContainer(@NotNull String image) {
-        this(DockerImageName.parse(image));
-    }
-
-    /**
-     * Creates a new {@link MongoDbContainer} with the specified image.
-     */
-    public MongoDbContainer(final DockerImageName dockerImageName) {
-        super(dockerImageName);
-        addExposedPort(MONGODB_PORT);
-    }
-
-    /**
-     * Returns the actual public port of the internal MongoDB port ({@value MONGODB_PORT}).
-     *
-     * @return the public port of this container
-     * @see #getMappedPort(int)
-     */
-    @NotNull
-    public Integer getPort() {
-        return getMappedPort(MONGODB_PORT);
-    }
-
-}
diff --git a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java b/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
deleted file mode 100644
index 5581c76e675..00000000000
--- a/examples/mongodb-container/src/test/java/org/testcontainers/containers/MongoDbContainerTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.testcontainers.containers;
-
-import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
-
-import java.io.IOException;
-import java.net.Socket;
-
-
-public class MongoDbContainerTest {
-
-    @Test
-    public void containerStartsAndPublicPortIsAvailable() {
-        try (MongoDbContainer container = new MongoDbContainer(DockerImageName.parse("mongo:4.0"))) {
-            container.start();
-            assertThatPortIsAvailable(container);
-        }
-    }
-
-    private void assertThatPortIsAvailable(MongoDbContainer container) {
-        try {
-            new Socket(container.getHost(), container.getPort());
-        } catch (IOException e) {
-            throw new AssertionError("The expected port " + container.getPort() + " is not available!");
-        }
-    }
-
-}
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 9ed079cd7b8..7194134350d 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -19,10 +19,8 @@ rootProject.name = 'testcontainers-examples'
 includeBuild '..'
 
 // explicit include to allow Dependabot to autodiscover subprojects
-include 'disque-job-queue'
 include 'kafka-cluster'
 include 'linked-container'
-include 'mongodb-container'
 include 'neo4j-container'
 include 'redis-backed-cache'
 include 'redis-backed-cache-testng'

From ffb88b3d80004ad569caf080c00304584352b9db Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 31 Aug 2022 16:05:28 +0200
Subject: [PATCH 2177/4969] Fix link for Selenium examples (#5786)

---
 docs/examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples.md b/docs/examples.md
index 2c6036ab2ea..918688d86cb 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -6,7 +6,7 @@ Examples of different use cases provided by Testcontainers can be found below:
 - [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/linked-container)
 - [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/master/examples/neo4j-container)
 - [Redis](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache)
-- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
+- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/selenium-container)
 - [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
 - [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/master/examples/singleton-container)
 - [Solr](https://github.com/testcontainers/testcontainers-java/tree/master/examples/solr-container)

From fc3d60099165c9f73689ee3269370c5347492513 Mon Sep 17 00:00:00 2001
From: Aidan Do <43259657+REslim30@users.noreply.github.com>
Date: Thu, 1 Sep 2022 06:08:31 +0930
Subject: [PATCH 2178/4969] Allow `getContainerByServiceName` to receive
 serviceName without suffix (#5776)

Fixes #5773
---
 .../containers/DockerComposeContainer.java         |  3 ++-
 .../junit/DockerComposeContainerTest.java          | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 14124d88c28..683e9d9fdf5 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -611,7 +611,8 @@ public SELF withStartupTimeout(Duration startupTimeout) {
     }
 
     public Optional<ContainerState> getContainerByServiceName(String serviceName) {
-        return Optional.ofNullable(serviceInstanceMap.get(serviceName));
+        String serviceInstantName = getServiceInstanceName(serviceName);
+        return Optional.ofNullable(serviceInstanceMap.get(serviceInstantName));
     }
 
     private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
index c610fc584af..96989af90a4 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
@@ -44,6 +44,7 @@ public void testGetServicePort() {
     public void shouldRetrieveContainerByServiceName() {
         String existingServiceName = "db_1";
         Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
+
         assertThat(result)
             .as(String.format("Container should be found by service name %s", existingServiceName))
             .isPresent();
@@ -52,6 +53,19 @@ public void shouldRetrieveContainerByServiceName() {
             .isEqualTo(result.get().getExposedPorts());
     }
 
+    @Test
+    public void shouldRetrieveContainerByServiceNameWithoutNumberedSuffix() {
+        String existingServiceName = "db";
+        Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
+
+        assertThat(result)
+            .as(String.format("Container should be found by service name %s", existingServiceName))
+            .isPresent();
+        assertThat(result.get().getExposedPorts())
+            .as("Mapped port for result container was wrong, perhaps wrong container was found")
+            .isEqualTo(Collections.singletonList(3306));
+    }
+
     @Test
     public void shouldReturnEmptyResultOnNoneExistingService() {
         String notExistingServiceName = "db_256";

From 3ef2c5177f412135d5c2410abb6bcf31619b20e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:15 +0000
Subject: [PATCH 2179/4969] Bump slf4j-api from 1.7.36 to 2.0.0 in /examples

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.36 to 2.0.0.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 5b690597eaf..46d038e4643 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220320'
     testImplementation 'org.postgresql:postgresql:42.4.2'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 9d0fd118f61..799f3f89925 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index c5f365b5502..1d840f11871 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 89f067d3a19..d540a8386ab 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:testcontainers'

From b83777389a000df475bd7b033551f20659d2820b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:22 +0000
Subject: [PATCH 2180/4969] Bump postgresql from 42.4.2 to 42.5.0 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.2 to 42.5.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.2...REL42.5.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5b690597eaf..694261f796a 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220320'
-    testImplementation 'org.postgresql:postgresql:42.4.2'
+    testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 3b006da54b3f4133564cc6a71eea152320b8ef88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:24 +0000
Subject: [PATCH 2181/4969] Bump aws-java-sdk-s3 from 1.12.285 to 1.12.295 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.285 to 1.12.295.
- [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.12.285...1.12.295)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ad43f6f9c08..22966424b31 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.285'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.295'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.285'

From 605a769acdf745ed13bb9e8b0153b1c82f3b52d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:25 +0000
Subject: [PATCH 2182/4969] Bump slf4j-api from 1.7.36 to 2.0.0 in /core

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.36 to 2.0.0.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index aa4c6eabf22..f37a6478b88 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -61,7 +61,7 @@ configurations.all {
 
 dependencies {
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:1.7.36'
+    api 'org.slf4j:slf4j-api:2.0.0'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'

From d8e674fb1ee4b351b33d3f598220a7af100c0eb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:28 +0000
Subject: [PATCH 2183/4969] Bump snakeyaml from 1.30 to 1.31 in /core

Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.30 to 1.31.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-1.31..snakeyaml-1.30)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index aa4c6eabf22..b2f1a71f643 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -80,7 +80,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded "org.yaml:snakeyaml:1.30"
+    shaded "org.yaml:snakeyaml:1.31"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From b6a066fea2d04dcee16f2da3bd9b63dfcf19a7c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:32 +0000
Subject: [PATCH 2184/4969] Bump aws-java-sdk-logs from 1.12.285 to 1.12.295 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.285 to 1.12.295.
- [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.12.285...1.12.295)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ad43f6f9c08..2dc763c860f 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.285'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.285'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
     testImplementation 'software.amazon.awssdk:s3:2.17.256'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 05da3a213d12e3aad87379264c89de725c94c7f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:43 +0000
Subject: [PATCH 2185/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.285 to 1.12.295.
- [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.12.285...1.12.295)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 8b548d5b91f..ac9ff346bea 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.285'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 19d604067a49d6a78771008b44d86cf28f12309a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:43 +0000
Subject: [PATCH 2186/4969] Bump postgresql from 42.4.2 to 42.5.0 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.2 to 42.5.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.2...REL42.5.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 0c5035df549..59515ed7549 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.4.2'
+    testImplementation 'org.postgresql:postgresql:42.5.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'

From ea3b3ad40ccc19db00580b6911110c56e7b4065c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:48 +0000
Subject: [PATCH 2187/4969] Bump r2dbc-postgresql in /modules/postgresql

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.12.RELEASE to 0.8.13.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.13.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.12.RELEASE...v0.8.13.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/postgresql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 0c5035df549..15a39d97766 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,14 +7,14 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
     testImplementation 'org.postgresql:postgresql:42.4.2'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From f6151a20abb84ab2c2310c7a81f1c29c908f76bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:05:49 +0000
Subject: [PATCH 2188/4969] Bump postgresql from 42.4.2 to 42.5.0 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.2 to 42.5.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.2...REL42.5.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 dd1d0c7ed6e..5b91bd181fe 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.4.2'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }

From 236cdf97d814a34814315d215079dea77aad0d78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:06:20 +0000
Subject: [PATCH 2189/4969] Bump transport from 7.17.5 to 7.17.6 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.5 to 7.17.6.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.6)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 0e6c5bd7b5d..8d8125eb1e1 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.3.3"
-    testImplementation "org.elasticsearch.client:transport:7.17.5"
+    testImplementation "org.elasticsearch.client:transport:7.17.6"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 4171dd86a8b95b8e991c7415be4d9ce724dec9cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:06:41 +0000
Subject: [PATCH 2190/4969] Bump actions/cache from 3.0.7 to 3.0.8

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.7 to 3.0.8.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.7...v3.0.8)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index f23fc66e889..fe4610368aa 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -53,7 +53,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 288e9329824..9d7749134ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -59,7 +59,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From 6b716358bcdda694d1692d93c0b879e7920451a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:08:37 +0000
Subject: [PATCH 2191/4969] Bump r2dbc-postgresql in /modules/r2dbc

Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.12.RELEASE to 0.8.13.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases)
- [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.13.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.12.RELEASE...v0.8.13.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index f38803104a3..c55b71ddcb2 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.4.22'

From ee8c818c7ba68bf3024a47776351211b824e9e0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:08:38 +0000
Subject: [PATCH 2192/4969] Bump google-cloud-firestore from 3.4.0 to 3.4.2 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.4.0 to 3.4.2.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.4.0...v3.4.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index bb79bfbbcc2..6b4d90d5de1 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.12'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'

From 150b75de98f44c932d9303522ea9d5a4498f2fd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:08:43 +0000
Subject: [PATCH 2193/4969] Bump google-cloud-spanner from 6.28.0 to 6.29.0 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.28.0 to 6.29.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.28.0...v6.29.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index bb79bfbbcc2..e0c20ca6c16 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.12'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From f6ffb47903edf311a1b1aefcb501bcafb14cfe70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:08:45 +0000
Subject: [PATCH 2194/4969] Bump logback-classic from 1.2.11 to 1.4.0 in
 /modules/hivemq

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.2.11 to 1.4.0.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.11...v_1.4.0)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 9595b3e66b6..477d5ac98a3 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.2.11")
+    testImplementation("ch.qos.logback:logback-classic:1.4.0")
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 }

From d6f318c01c6e28e47e3ad25d858d8827e6276f29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:08:58 +0000
Subject: [PATCH 2195/4969] Bump kubernetes-client from 6.0.0 to 6.1.1 in
 /modules/k3s

Bumps [kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.0.0 to 6.1.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.0.0...v6.1.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 8c6792c42e0..0778419a3e2 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.0.0'
+    testImplementation 'io.fabric8:kubernetes-client:6.1.1'
     testImplementation 'io.kubernetes:client-java:16.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From bc76fc9086812d557c0e3d700f097f43f2355fbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:08:59 +0000
Subject: [PATCH 2196/4969] Bump trino-jdbc from 393 to 394 in /modules/trino

Bumps trino-jdbc from 393 to 394.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index e5b7efee873..ca2619a8631 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:393'
+    testImplementation 'io.trino:trino-jdbc:394'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 9ef2d12be740b590a6f6a11fdfeff4e234a83fb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:09:10 +0000
Subject: [PATCH 2197/4969] Bump postgresql from 42.4.2 to 42.5.0 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.2 to 42.5.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.2...REL42.5.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index fbd2415e53c..638629ef22a 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.4.2'
+    testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 1693da989b29deb265d58c279fc4de89b79ad7ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:09:19 +0000
Subject: [PATCH 2198/4969] Bump azure-cosmos from 4.34.0 to 4.35.1 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.34.0 to 4.35.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.34.0...azure-cosmos_4.35.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 252eb895d37..8753606874c 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.34.0'
+    testImplementation 'com.azure:azure-cosmos:4.35.1'
 }

From efa0a8920e6a1d07a76e0eeac0a33127fdaaad7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:13:19 +0000
Subject: [PATCH 2199/4969] Bump aws-java-sdk-sqs from 1.12.285 to 1.12.295 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.285 to 1.12.295.
- [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.12.285...1.12.295)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5f743a21160..2f727f9072a 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.295'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.285'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.295'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
     testImplementation 'software.amazon.awssdk:s3:2.17.256'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 4e7fc5a32949458478100284a20efa36dc9336a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:13:23 +0000
Subject: [PATCH 2200/4969] Bump s3 from 2.17.256 to 2.17.266 in
 /modules/localstack

Bumps s3 from 2.17.256 to 2.17.266.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5f743a21160..47d483fbc6e 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
-    testImplementation 'software.amazon.awssdk:s3:2.17.256'
+    testImplementation 'software.amazon.awssdk:s3:2.17.266'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 2f7fe4070ffd22bb396aae1202864ce4ab449da6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:13:35 +0000
Subject: [PATCH 2201/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.3.3 to 8.4.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.3.3...v8.4.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 8d8125eb1e1..c5591d0d26a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.3.3"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.1"
     testImplementation "org.elasticsearch.client:transport:7.17.6"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From d047a1ca3cce7b4f8146abe0faf7d70148b017af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:13:38 +0000
Subject: [PATCH 2202/4969] Bump postgresql from 42.4.2 to 42.5.0 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.2 to 42.5.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.2...REL42.5.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 543824ea8f6..a437ff5b502 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.4.2'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'

From 463c45999235b93a1f07acf0984bb630edfc2230 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:13:41 +0000
Subject: [PATCH 2203/4969] Bump google-cloud-bigtable from 2.10.3 to 2.11.1 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.10.3 to 2.11.1.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.10.3...v2.11.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 6028ef7e7c2..c83d92e551a 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.12'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.11.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From caea94d6324aab22bacb522d615e5dc728ba85b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:13:42 +0000
Subject: [PATCH 2204/4969] Bump google-cloud-pubsub from 1.120.12 to 1.120.13
 in /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.12 to 1.120.13.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.12...v1.120.13)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 6028ef7e7c2..cc8187414be 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.12'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.13'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From ebc22dd2eae53691470e5e4f16b23e3267ce6332 Mon Sep 17 00:00:00 2001
From: Alex <93376818+sashashura@users.noreply.github.com>
Date: Fri, 2 Sep 2022 23:39:03 +0200
Subject: [PATCH 2205/4969] Update update-gradle-wrapper.yml (#5821)

---
 .github/workflows/update-gradle-wrapper.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 5855e609fce..c2fe34cfe19 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -4,8 +4,13 @@ on:
   schedule:
     - cron: "0 0 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   update-gradle-wrapper:
+    permissions:
+      pull-requests: write # for gradle-update/update-gradle-wrapper-action
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
 

From a01d571ee52ca935021baf2c3d8904a596b99de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <social.mdelapenya@gmail.com>
Date: Fri, 9 Sep 2022 14:08:38 +0200
Subject: [PATCH 2206/4969] docs: fix link to the bounty program (#5831)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 83afa8a9ea8..93a87222781 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,4 +10,4 @@ Testcontainers is [in the GitHub Sponsors program](https://github.com/sponsors/t
 
 This repository is supported by our sponsors, meaning that issues are eligible to have a 'bounty' attached to them by sponsors.
 
-Please see [the bounty policy page](https://testcontainers.org/bounty) if you are interested, either as a sponsor or as a contributor.
\ No newline at end of file
+Please see [the bounty policy page](https://www.testcontainers.org/bounty) if you are interested, either as a sponsor or as a contributor.

From 0d368f72d898260fc2197564e78b2869d0400ca3 Mon Sep 17 00:00:00 2001
From: Neslihan Wittek <34006979+neslihanedes@users.noreply.github.com>
Date: Sun, 11 Sep 2022 00:00:11 +0200
Subject: [PATCH 2207/4969] Fix typos on index.md (#5832)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 3a99c88a5b1..8cc789e41a1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -92,7 +92,7 @@ Using Gradle 5.0 or higher, you can add the following to the `dependencies` sect
 !!! warning "Shaded dependencies"
     Testcontainers depends on other libraries (like docker-java) for it to work.  
     Some of them (JUnit, docker-java-{api,transport} and its transitive dependencies, JNA, visible-assertions and others) are part of our public API.  
-    But there are also "private", implementation detail dependencies (e.g. docker-java-core, Guava, OkHttp, etc etc) that are not exposed to public API but prone to conflicts with test code/application under test code. 
+    But there are also "private", implementation detail dependencies (e.g., docker-java-core, Guava, OkHttp, etc.) that are not exposed to public API but prone to conflicts with test code/application under test code. 
     As such, **these libraries are 'shaded' into the core testcontainers JAR** and relocated under `org.testcontainers.shaded` to prevent class conflicts.
 
 ## Sponsors

From 6e46662311591312eebd59b9d7f22cb13479018b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 13 Sep 2022 10:00:21 -0500
Subject: [PATCH 2208/4969] Improve Issue Templates (#5836)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Be explicit about searching for an existing `bug`, `feature`, `enhancement`
and avoid duplications.

Co-authored-by: Manuel de la Peña <social.mdelapenya@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml  | 2 +-
 .github/ISSUE_TEMPLATE/enhancement.yaml | 2 +-
 .github/ISSUE_TEMPLATE/feature.yaml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 163c5455b1e..9945297ea7a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report!
+        Thanks for taking the time to fill out this bug report! Before submitting a `bug`, please make sure there is no existing issue for the one you encountered.
   - type: dropdown
     id: module
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index b753332073b..6d5edab909f 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please provide the following information
+        Before submitting an `enhancement`, please make sure there is no existing enhancement for the one you are requesting. If so, please provide the following information:
   - type: dropdown
     id: module
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 91031adfeee..8abeb7d2131 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please provide the following information
+        Before submitting a `feature`, please make sure there is no existing feature for the one you are requesting. If so, please provide the following information:
   - type: dropdown
     id: module
     attributes:

From 1f3a1f764f5c31a2f5715ed502b417475aacdd98 Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Wed, 14 Sep 2022 15:19:25 +0200
Subject: [PATCH 2209/4969] couchbase: allow to configure bucket replicas and
 default to 0. (#5840)

This change allows the user to configure the number of bucket replicas
and defaults it to 0 since most of the time the user ever only needs
no replicas since it is a single container.

Note: technically this is a behavioral change since before the number
of replicas was 1 (if not defined) but this causes issues when
testing transactions (as seen in #5835).

Fixes #5835
---
 .../couchbase/BucketDefinition.java           | 30 +++++++++++++++++--
 .../couchbase/CouchbaseContainer.java         |  1 +
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
index ad666b4ffef..c698855927c 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/BucketDefinition.java
@@ -29,10 +29,32 @@ public class BucketDefinition {
 
     private int quota = 100;
 
+    private int numReplicas = 0;
+
     public BucketDefinition(final String name) {
         this.name = name;
     }
 
+    /**
+     * Allows to configure the number of replicas on a bucket (defaults to 0).
+     * <p>
+     * By default the bucket is initialized with 0 replicas since only a single container is launched. Modifying
+     * this value can still be useful in some test scenarios (i.e. to test failures with the wrong number of replicas
+     * and durability requirements on operations).
+     * <p>
+     * Couchbase buckets can have a maximum of three replicas configured.
+     *
+     * @param numReplicas the number of replicas to configure.
+     * @return this {@link BucketDefinition} for chaining purposes.
+     */
+    public BucketDefinition withReplicas(final int numReplicas) {
+        if (numReplicas < 0 || numReplicas > 3) {
+            throw new IllegalArgumentException("The number of replicas must be between 0 and 3 (inclusive)");
+        }
+        this.numReplicas = numReplicas;
+        return this;
+    }
+
     /**
      * Enables flush for this bucket (disabled by default).
      *
@@ -45,9 +67,9 @@ public BucketDefinition withFlushEnabled(final boolean flushEnabled) {
     }
 
     /**
-     * Sets a custom bucket quota (100MB by default).
+     * Sets a custom bucket quota (100MiB by default).
      *
-     * @param quota the quota to set for the bucket.
+     * @param quota the quota to set for the bucket in mebibytes.
      * @return this {@link BucketDefinition} for chaining purposes.
      */
     public BucketDefinition withQuota(final int quota) {
@@ -84,4 +106,8 @@ public boolean hasPrimaryIndex() {
     public int getQuota() {
         return quota;
     }
+
+    public int getNumReplicas() {
+        return numReplicas;
+    }
 }
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 8603a0b0787..2817b79d71f 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -573,6 +573,7 @@ private void createBuckets() {
                     .add("name", bucket.getName())
                     .add("ramQuotaMB", Integer.toString(bucket.getQuota()))
                     .add("flushEnabled", bucket.hasFlushEnabled() ? "1" : "0")
+                    .add("replicaNumber", Integer.toString(bucket.getNumReplicas()))
                     .build(),
                 true
             );

From 9540652fa46f10f4d4e724787aa5fdf6ca3fbea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 16 Sep 2022 09:09:48 -0500
Subject: [PATCH 2210/4969] Update localstack images in tests (#5783)

`atlassian/pipelines-awscli` is deprecated and it recommends to use
`amazon/aws-cli`.
---
 .../localstack/LocalstackContainerTest.java     | 17 +++++++----------
 .../localstack/LocalstackTestImages.java        |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index b879b27f0e6..d44e98723b7 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -26,7 +26,6 @@
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
@@ -153,12 +152,7 @@ public void sqsTestOverBridgeNetwork() {
             String fooQueueUrl = queueResult.getQueueUrl();
             assertThat(fooQueueUrl)
                 .as("Created queue has external hostname URL")
-                .contains(
-                    "http://" +
-                    DockerClientFactory.instance().dockerHostIpAddress() +
-                    ":" +
-                    localstack.getMappedPort(LocalStackContainer.PORT)
-                );
+                .contains("http://" + localstack.getHost() + ":" + localstack.getMappedPort(LocalStackContainer.PORT));
 
             sqs.sendMessage(fooQueueUrl, "test");
             final long messageCount = sqs
@@ -265,14 +259,17 @@ public static class WithNetwork {
             LocalstackTestImages.AWS_CLI_IMAGE
         )
             .withNetwork(network)
-            .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("top"))
+            .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("tail"))
+            .withCommand(" -f /dev/null")
             .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
             .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
             .withEnv("AWS_REGION", "eu-west-1");
 
         @Test
         public void s3TestOverDockerNetwork() throws Exception {
-            runAwsCliAgainstDockerNetworkContainer("s3api create-bucket --bucket foo");
+            runAwsCliAgainstDockerNetworkContainer(
+                "s3api create-bucket --bucket foo --create-bucket-configuration LocationConstraint=eu-west-1"
+            );
             runAwsCliAgainstDockerNetworkContainer("s3api list-buckets");
             runAwsCliAgainstDockerNetworkContainer("s3 ls s3://foo");
         }
@@ -313,7 +310,7 @@ public void cloudWatchLogsTestOverDockerNetwork() throws Exception {
         private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exception {
             final String[] commandParts = String
                 .format(
-                    "/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl",
+                    "/usr/local/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl",
                     command,
                     LocalStackContainer.PORT
                 )
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index 491394bea8a..fe39b56521a 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -8,5 +8,5 @@ public interface LocalstackTestImages {
     DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
     DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");
     DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");
-    DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("atlassian/pipelines-awscli:1.16.302");
+    DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("amazon/aws-cli:2.7.27");
 }

From 9e98addab9cfe076ace39a41c8cfdf4351649756 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 16 Sep 2022 16:42:12 +0200
Subject: [PATCH 2211/4969] Update slf4j in test-support to 2.0.0 (#5848)

---
 test-support/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-support/build.gradle b/test-support/build.gradle
index ecf9a0bc60e..2fae2344a89 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
-    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'org.slf4j:slf4j-api:2.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 22aa85d24e91a2a380da6d96f21ca03947de9c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 17 Sep 2022 12:22:45 -0500
Subject: [PATCH 2212/4969] Remove thundra from ci.yml (#5850)

Using thundra breaks the gradle cache in `master` branch.
---
 .github/workflows/ci.yml | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d7749134ce..e1eceab8702 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,14 +14,6 @@ env:
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
 
 jobs:
-  thundra_test_initializer:
-    runs-on: ubuntu-latest
-    outputs:
-      thundra_agent_testrun_id: ${{ steps.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
-    steps:
-      - uses: actions/checkout@v3
-      - id: thundra_test_initializer
-        uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
     runs-on: ubuntu-18.04
     outputs:
@@ -47,7 +39,7 @@ jobs:
           echo $TASKS
           echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
   check:
-    needs: [find_gradle_jobs, thundra_test_initializer]
+    needs: [find_gradle_jobs]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
@@ -66,16 +58,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
       - name: Clear existing docker image cache
         run: docker image prune -af
-      - name: Thundra Gradle Test Instrumentation
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: thundra-io/thundra-gradle-test-action@v1
-        with:
-          apikey: ${{ secrets.THUNDRA_API_KEY }}
-          project_id: ${{ secrets.THUNDRA_PROJECT_ID }}
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
-          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}} \
-            $([[ -f $THUNDRA_GRADLE_INIT_SCRIPT_PATH ]] && echo "--init-script $THUNDRA_GRADLE_INIT_SCRIPT_PATH")
-        env:
-          THUNDRA_AGENT_TEST_RUN_ID: ${{ needs.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
-          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1
+          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}

From 459d2f6b8915b9c0cbcd89b24825d412a6739838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 19 Sep 2022 04:55:58 -0500
Subject: [PATCH 2213/4969] Use `testCompileOnly` instead of
 `testCompileClasspath` (#5849)

`testCompileClasspath` is deprecated. Also, removing `org.jetbrains:annotations`
from `selenium` module.
---
 core/build.gradle                                               | 2 +-
 modules/selenium/build.gradle                                   | 1 -
 .../org/testcontainers/junit/BaseWebDriverContainerTest.java    | 2 --
 modules/spock/build.gradle                                      | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index c9dd720e2a3..4072c25db37 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -63,7 +63,7 @@ dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:2.0.0'
     compileOnly 'org.jetbrains:annotations:23.0.0'
-    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
+    testCompileOnly 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 38fab63dc0a..3e5a80a2dfa 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,5 +13,4 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
-    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index c49e24ba867..0ce20ca9800 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.junit;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.ClassRule;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
@@ -51,7 +50,6 @@ protected void assertBrowserNameIs(BrowserWebDriverContainer<?> rule, String exp
         assertThat(actual).as(String.format("actual browser name is %s", actual)).isEqualTo(expectedName);
     }
 
-    @NotNull
     private static RemoteWebDriver setupDriverFromRule(BrowserWebDriverContainer<?> rule) {
         RemoteWebDriver driver = rule.getWebDriver();
         driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index a437ff5b502..a13a7049e13 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
 
-    testCompileClasspath 'org.jetbrains:annotations:23.0.0'
+    testCompileOnly 'org.jetbrains:annotations:23.0.0'
 }
 
 sourceJar {

From de1a77ed837ab5b5a542dbd51d40e08391edb129 Mon Sep 17 00:00:00 2001
From: Neslihan Wittek <34006979+neslihanedes@users.noreply.github.com>
Date: Mon, 26 Sep 2022 12:04:51 +0200
Subject: [PATCH 2214/4969] Improve consistency of Testcontainers name in docs
 (#5866)

---
 docs/contributing_docs.md          | 2 +-
 docs/index.md                      | 2 +-
 docs/modules/databases/orientdb.md | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/contributing_docs.md b/docs/contributing_docs.md
index f6f9304a339..2d706dfe407 100644
--- a/docs/contributing_docs.md
+++ b/docs/contributing_docs.md
@@ -1,6 +1,6 @@
 # Contributing to documentation
 
-The testcontainers-java documentation is a static site built with [MkDocs](https://www.mkdocs.org/).
+The Testcontainers-java documentation is a static site built with [MkDocs](https://www.mkdocs.org/).
 We use the [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) theme, which offers a number of useful extensions to MkDocs.
 
 In addition we use a [custom plugin](https://github.com/rnorth/mkdocs-codeinclude-plugin) for inclusion of code snippets.
diff --git a/docs/index.md b/docs/index.md
index 8cc789e41a1..8eb4ddeb2c4 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -93,7 +93,7 @@ Using Gradle 5.0 or higher, you can add the following to the `dependencies` sect
     Testcontainers depends on other libraries (like docker-java) for it to work.  
     Some of them (JUnit, docker-java-{api,transport} and its transitive dependencies, JNA, visible-assertions and others) are part of our public API.  
     But there are also "private", implementation detail dependencies (e.g., docker-java-core, Guava, OkHttp, etc.) that are not exposed to public API but prone to conflicts with test code/application under test code. 
-    As such, **these libraries are 'shaded' into the core testcontainers JAR** and relocated under `org.testcontainers.shaded` to prevent class conflicts.
+    As such, **these libraries are 'shaded' into the core Testcontainers JAR** and relocated under `org.testcontainers.shaded` to prevent class conflicts.
 
 ## Sponsors
 
diff --git a/docs/modules/databases/orientdb.md b/docs/modules/databases/orientdb.md
index 4beffefa6c2..57839cd99f0 100644
--- a/docs/modules/databases/orientdb.md
+++ b/docs/modules/databases/orientdb.md
@@ -10,7 +10,7 @@ Note that it's based on the [official Docker image](https://hub.docker.com/_/ori
 
 ## Usage example
 
-Declare your Testcontainer as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
+Declare your Testcontainers instance as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
 You can call `getDbUrl()` OrientDB container and build the `ODatabaseSession` by your own, but a more useful `getSession()` method is provided.
 On the JVM you would most likely use the [Java driver](https://github.com/).
 
@@ -39,7 +39,7 @@ The following example uses the JUnit 5 extension `@Testcontainers` and demonstra
     }
     ```
 
-You are not limited to Unit tests and can of course use an instance of the OrientDB Testcontainer in vanilla Java code as well.
+You are not limited to Unit tests and can of course use an instance of the OrientDB Testcontainers implementation in vanilla Java code as well.
 
 
 ## Adding this module to your project dependencies

From 9847d5930bb0faea9d14f606c583919d4e2d2113 Mon Sep 17 00:00:00 2001
From: Aidan Do <43259657+REslim30@users.noreply.github.com>
Date: Mon, 26 Sep 2022 21:20:45 +0930
Subject: [PATCH 2215/4969] Fix: ContainerDatabaseDriver does not register
 Properties object (#5829)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/JdbcDatabaseContainer.java     | 24 +++++++---
 .../jdbc/ContainerDatabaseDriver.java         |  2 +-
 .../MySQLDatabaseContainerDriverTest.java     | 44 +++++++++++++++++++
 3 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index aa397929497..88c418e73cb 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -216,9 +216,23 @@ public Driver getJdbcDriverInstance() throws NoDriverFoundException {
      * @throws SQLException if there is a repeated failure to create the connection
      */
     public Connection createConnection(String queryString) throws SQLException, NoDriverFoundException {
-        final Properties info = new Properties();
-        info.put("user", this.getUsername());
-        info.put("password", this.getPassword());
+        return createConnection(queryString, new Properties());
+    }
+
+    /**
+     * Creates a connection to the underlying containerized database instance.
+     *
+     * @param queryString query string parameters that should be appended to the JDBC connection URL.
+     *                    The '?' character must be included
+     * @param info  additional properties to be passed to the JDBC driver
+     * @return a Connection
+     * @throws SQLException if there is a repeated failure to create the connection
+     */
+    public Connection createConnection(String queryString, Properties info)
+        throws SQLException, NoDriverFoundException {
+        Properties properties = new Properties(info);
+        properties.put("user", this.getUsername());
+        properties.put("password", this.getPassword());
         final String url = constructUrlForConnection(queryString);
 
         final Driver jdbcDriverInstance = getJdbcDriverInstance();
@@ -234,10 +248,10 @@ public Connection createConnection(String queryString) throws SQLException, NoDr
                             "Trying to create JDBC connection using {} to {} with properties: {}",
                             jdbcDriverInstance.getClass().getName(),
                             url,
-                            info
+                            properties
                         );
 
-                    return jdbcDriverInstance.connect(url, info);
+                    return jdbcDriverInstance.connect(url, properties);
                 } catch (SQLException e) {
                     lastException = e;
                     Thread.sleep(100L);
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index 23ed9d78b25..a3fed34f24c 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -127,7 +127,7 @@ public synchronized Connection connect(String url, final Properties info) throws
             /*
               Create a connection using the delegated driver. The container must be ready to accept connections.
              */
-            Connection connection = container.createConnection(queryString);
+            Connection connection = container.createConnection(queryString, info);
 
             /*
               If this container has not been initialized, AND
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
new file mode 100644
index 00000000000..7155e49dd48
--- /dev/null
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
@@ -0,0 +1,44 @@
+package org.testcontainers.jdbc.mysql;
+
+import org.junit.Test;
+import org.testcontainers.jdbc.ContainerDatabaseDriver;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MySQLDatabaseContainerDriverTest {
+
+    @Test
+    public void shouldRespectBothUrlPropertiesAndParameterProperties() throws SQLException {
+        ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
+        String url = "jdbc:tc:mysql:5.7.22://hostname/databasename?padCharsWithSpace=true";
+        Properties properties = new Properties();
+        properties.setProperty("maxRows", "1");
+
+        try (Connection connection = driver.connect(url, properties)) {
+            try (Statement statement = connection.createStatement()) {
+                statement.execute("CREATE TABLE arbitrary_table (length_5_string CHAR(5))");
+                statement.execute("INSERT INTO arbitrary_table VALUES ('abc')");
+                statement.execute("INSERT INTO arbitrary_table VALUES ('123')");
+
+                // Check that maxRows is set
+                try (ResultSet resultSet = statement.executeQuery("SELECT * FROM arbitrary_table")) {
+                    resultSet.next();
+                    assertThat(resultSet.isFirst()).isTrue();
+                    assertThat(resultSet.isLast()).isTrue();
+                }
+
+                // Check that pad with chars is set
+                try (ResultSet resultSet = statement.executeQuery("SELECT * FROM arbitrary_table")) {
+                    assertThat(resultSet.next()).isTrue();
+                    assertThat(resultSet.getString(1)).isEqualTo("abc  ");
+                }
+            }
+        }
+    }
+}

From f54a29a48419b4fb14ef1fc024a656e918d994ae Mon Sep 17 00:00:00 2001
From: Aidan Do <43259657+REslim30@users.noreply.github.com>
Date: Wed, 28 Sep 2022 19:40:08 +0930
Subject: [PATCH 2216/4969] `getLivenessCheckPortNumbers()` should return
 mapped port (#5734)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../org/testcontainers/containers/Db2Container.java    |  8 ++++++--
 .../org/testcontainers/junit/db2/SimpleDb2Test.java    |  6 ++++++
 .../containers/MSSQLServerContainer.java               |  3 +--
 .../junit/mssqlserver/SimpleMSSQLServerTest.java       |  7 +++++++
 .../org/testcontainers/containers/MySQLContainer.java  |  8 ++++++--
 .../testcontainers/junit/mysql/SimpleMySQLTest.java    |  6 ++++++
 .../org/testcontainers/containers/NginxContainer.java  |  8 ++++++--
 .../java/org/testcontainers/junit/SimpleNginxTest.java |  6 ++++++
 .../testcontainers/containers/PostgreSQLContainer.java |  8 ++++++--
 .../junit/postgresql/SimplePostgreSQLTest.java         |  7 +++++++
 .../org/testcontainers/containers/PrestoContainer.java |  8 ++++++--
 .../testcontainers/containers/PrestoContainerTest.java |  7 +++++++
 .../java/org/testcontainers/tidb/TiDBContainer.java    |  8 ++++++--
 .../org/testcontainers/junit/tidb/SimpleTiDBTest.java  | 10 ++++++++++
 .../org/testcontainers/containers/TrinoContainer.java  |  8 ++++++--
 .../testcontainers/containers/TrinoContainerTest.java  |  6 ++++++
 16 files changed, 98 insertions(+), 16 deletions(-)

diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 29e2ce8aa07..333a2e709c3 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -6,7 +6,6 @@
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
-import java.util.HashSet;
 import java.util.Set;
 
 public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
@@ -54,9 +53,14 @@ public Db2Container(final DockerImageName dockerImageName) {
         addExposedPort(DB2_PORT);
     }
 
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
     @Override
+    @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {
-        return new HashSet<>(getMappedPort(DB2_PORT));
+        return super.getLivenessCheckPorts();
     }
 
     @Override
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 2c2c4cb2f09..ae35a8ee77c 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -21,6 +21,7 @@ public void testSimple() throws SQLException {
 
             int resultSetInt = resultSet.getInt(1);
             assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(db2);
         }
     }
 
@@ -37,4 +38,9 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
             assertThat(jdbcUrl).contains(":sslConnection=false;");
         }
     }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(Db2Container db2) {
+        assertThat(db2.getExposedPorts()).containsExactly(Db2Container.DB2_PORT);
+        assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(Db2Container.DB2_PORT));
+    }
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 532316fb967..8ab3c1113a2 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import com.google.common.collect.Sets;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
 
@@ -64,7 +63,7 @@ public MSSQLServerContainer(final DockerImageName dockerImageName) {
 
     @Override
     public Set<Integer> getLivenessCheckPortNumbers() {
-        return Sets.newHashSet(MS_SQL_SERVER_PORT);
+        return super.getLivenessCheckPortNumbers();
     }
 
     @Override
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 15edbaa2ca1..2827544cade 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -25,6 +25,7 @@ public void testSimple() throws SQLException {
 
             int resultSetInt = resultSet.getInt(1);
             assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(mssqlServer);
         }
     }
 
@@ -64,4 +65,10 @@ public void testSetupDatabase() throws SQLException {
             assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(3);
         }
     }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(MSSQLServerContainer<?> mssqlServer) {
+        assertThat(mssqlServer.getExposedPorts()).containsExactly(MSSQLServerContainer.MS_SQL_SERVER_PORT);
+        assertThat(mssqlServer.getLivenessCheckPortNumbers())
+            .containsExactly(mssqlServer.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT));
+    }
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 14206018954..316e709995c 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -3,7 +3,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -56,10 +55,15 @@ public MySQLContainer(final DockerImageName dockerImageName) {
         addExposedPort(MYSQL_PORT);
     }
 
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
     @NotNull
     @Override
+    @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {
-        return new HashSet<>(getMappedPort(MYSQL_PORT));
+        return super.getLivenessCheckPorts();
     }
 
     @Override
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 146010058ac..f60712e7123 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -57,6 +57,7 @@ public void testSimple() throws SQLException {
             int resultSetInt = resultSet.getInt(1);
 
             assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(mysql);
         }
     }
 
@@ -237,4 +238,9 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
             mysql.stop();
         }
     }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer<?> mysql) {
+        assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT);
+        assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT));
+    }
 }
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 3e7a2062fd0..b97992a5684 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -6,7 +6,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -42,10 +41,15 @@ public NginxContainer(final DockerImageName dockerImageName) {
         setCommand("nginx", "-g", "daemon off;");
     }
 
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
     @NotNull
     @Override
+    @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {
-        return Collections.singleton(getMappedPort(80));
+        return super.getLivenessCheckPorts();
     }
 
     public URL getBaseUrl(String scheme, int port) throws MalformedURLException {
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index 24e913cf281..abfbb663207 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -58,6 +58,12 @@ public void testSimple() throws Exception {
             .as("An HTTP GET from the Nginx server returns the index.html from the custom content directory")
             .contains("Hello World!");
         // }
+        assertHasCorrectExposedAndLivenessCheckPorts(nginx);
+    }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(NginxContainer<?> nginxContainer) throws Exception {
+        assertThat(nginxContainer.getExposedPorts()).containsExactly(80);
+        assertThat(nginxContainer.getLivenessCheckPortNumbers()).containsExactly(nginxContainer.getMappedPort(80));
     }
 
     private static String responseFromNginx(URL baseUrl) throws IOException {
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 3b36b61ea77..d3ff65ee351 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -6,7 +6,6 @@
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -62,10 +61,15 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) {
         addExposedPort(POSTGRESQL_PORT);
     }
 
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
     @NotNull
     @Override
+    @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {
-        return Collections.singleton(getMappedPort(POSTGRESQL_PORT));
+        return super.getLivenessCheckPorts();
     }
 
     @Override
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 2a7db242421..84beb779fa4 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -26,6 +26,7 @@ public void testSimple() throws SQLException {
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
             assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(postgres);
         }
     }
 
@@ -86,4 +87,10 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
             assertThat(jdbcUrl).contains("charSet=UNICODE");
         }
     }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(PostgreSQLContainer<?> postgres) {
+        assertThat(postgres.getExposedPorts()).containsExactly(PostgreSQLContainer.POSTGRESQL_PORT);
+        assertThat(postgres.getLivenessCheckPortNumbers())
+            .containsExactly(postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT));
+    }
 }
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index e73f6cc0f6b..5c89682643a 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -9,7 +9,6 @@
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
-import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -56,10 +55,15 @@ public PrestoContainer(final DockerImageName dockerImageName) {
         addExposedPort(PRESTO_PORT);
     }
 
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
     @NotNull
     @Override
+    @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {
-        return new HashSet<>(getMappedPort(PRESTO_PORT));
+        return super.getLivenessCheckPorts();
     }
 
     @Override
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
index 721186807aa..0e86b587c50 100644
--- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -32,6 +32,7 @@ public void testSimple() throws Exception {
                 assertThat(resultSet.getString("node_version"))
                     .as("Presto version")
                     .isEqualTo(PrestoContainer.DEFAULT_TAG);
+                assertHasCorrectExposedAndLivenessCheckPorts(prestoSql);
             }
         }
     }
@@ -149,4 +150,10 @@ public void testTcJdbcUri() throws Exception {
                 .isEqualTo(Connection.TRANSACTION_READ_UNCOMMITTED);
         }
     }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(PrestoContainer<?> prestoSql) {
+        assertThat(prestoSql.getExposedPorts()).containsExactly(PrestoContainer.PRESTO_PORT);
+        assertThat(prestoSql.getLivenessCheckPortNumbers())
+            .containsExactly(prestoSql.getMappedPort(PrestoContainer.PRESTO_PORT));
+    }
 }
diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
index f8030fd2422..c78590d8393 100644
--- a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
+++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
@@ -6,7 +6,6 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
-import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -51,10 +50,15 @@ public TiDBContainer(final DockerImageName dockerImageName) {
         );
     }
 
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
     @NotNull
     @Override
+    @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {
-        return new HashSet<>(getMappedPort(TIDB_PORT));
+        return super.getLivenessCheckPorts();
     }
 
     @Override
diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
index 714c9854f39..6b4429afe75 100644
--- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
+++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
@@ -21,6 +21,7 @@ public void testSimple() throws SQLException {
 
             int resultSetInt = resultSet.getInt(1);
             assertThat(resultSetInt).isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(tidb);
         }
     }
 
@@ -51,4 +52,13 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
             tidb.stop();
         }
     }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(TiDBContainer tidb) {
+        Integer tidbPort = 4000;
+        Integer restApiPort = 10080;
+
+        assertThat(tidb.getExposedPorts()).containsExactlyInAnyOrder(tidbPort, restApiPort);
+        assertThat(tidb.getLivenessCheckPortNumbers())
+            .containsExactlyInAnyOrder(tidb.getMappedPort(tidbPort), tidb.getMappedPort(restApiPort));
+    }
 }
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
index 9ed18e96d28..21171fd2c15 100644
--- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
@@ -7,7 +7,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.HashSet;
 import java.util.Set;
 
 public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
@@ -37,10 +36,15 @@ public TrinoContainer(final DockerImageName dockerImageName) {
         addExposedPort(TRINO_PORT);
     }
 
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
     @NotNull
     @Override
+    @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {
-        return new HashSet<>(getMappedPort(TRINO_PORT));
+        return super.getLivenessCheckPorts();
     }
 
     @Override
diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
index a58944946f0..6ef733ca972 100644
--- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
@@ -24,6 +24,7 @@ public void testSimple() throws Exception {
                 assertThat(resultSet.getString("node_version"))
                     .as("Trino version")
                     .isEqualTo(TrinoContainer.DEFAULT_TAG);
+                assertContainerHasCorrectExposedAndLivenessCheckPorts(trino);
             }
         }
     }
@@ -61,4 +62,9 @@ public void testInitScript() throws Exception {
             }
         }
     }
+
+    private void assertContainerHasCorrectExposedAndLivenessCheckPorts(TrinoContainer trino) {
+        assertThat(trino.getExposedPorts()).containsExactly(8080);
+        assertThat(trino.getLivenessCheckPortNumbers()).containsExactly(trino.getMappedPort(8080));
+    }
 }

From 405ddb7e39443993f8988c4c5782727f0d0b5cc5 Mon Sep 17 00:00:00 2001
From: Dave Maughan <dave.maughan@streamnative.io>
Date: Thu, 29 Sep 2022 09:53:46 +0100
Subject: [PATCH 2217/4969] Allow Pulsar default WaitStrategy to honour startup
 timeout (#5674)

---
 .../containers/PulsarContainer.java           | 22 ++++++++-----------
 .../containers/PulsarContainerTest.java       |  9 ++++++++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 10dc35dc4c8..950149e3226 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -2,12 +2,8 @@
 
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
-import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * This container wraps Apache Pulsar running in standalone mode
  */
@@ -36,6 +32,8 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
     @Deprecated
     private static final String DEFAULT_TAG = "2.10.0";
 
+    private final WaitAllStrategy waitAllStrategy = new WaitAllStrategy();
+
     private boolean functionsWorkerEnabled = false;
 
     private boolean transactionsEnabled = false;
@@ -60,6 +58,7 @@ public PulsarContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DockerImageName.parse("apachepulsar/pulsar"));
         withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT);
+        setWaitStrategy(waitAllStrategy);
     }
 
     @Override
@@ -98,21 +97,18 @@ protected void setupCommandAndEnv() {
 
         final String clusterName = getEnvMap().getOrDefault("PULSAR_PREFIX_clusterName", "standalone");
         final String response = String.format("[\"%s\"]", clusterName);
-
-        List<WaitStrategy> waitStrategies = new ArrayList<>();
-        waitStrategies.add(Wait.defaultWaitStrategy());
-        waitStrategies.add(
+        waitAllStrategy.withStrategy(
             Wait.forHttp(ADMIN_CLUSTERS_ENDPOINT).forPort(BROKER_HTTP_PORT).forResponsePredicate(response::equals)
         );
+
         if (transactionsEnabled) {
             withEnv("PULSAR_PREFIX_transactionCoordinatorEnabled", "true");
-            waitStrategies.add(Wait.forHttp(TRANSACTION_TOPIC_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT));
+            waitAllStrategy.withStrategy(
+                Wait.forHttp(TRANSACTION_TOPIC_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT)
+            );
         }
         if (functionsWorkerEnabled) {
-            waitStrategies.add(Wait.forLogMessage(".*Function worker service started.*", 1));
+            waitAllStrategy.withStrategy(Wait.forLogMessage(".*Function worker service started.*", 1));
         }
-        final WaitAllStrategy compoundedWaitStrategy = new WaitAllStrategy();
-        waitStrategies.forEach(compoundedWaitStrategy::withStrategy);
-        waitingFor(compoundedWaitStrategy);
     }
 }
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index bf9f3d2201f..b054c30d0ac 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -12,6 +12,7 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -144,6 +145,14 @@ public void testClusterFullyInitialized() throws Exception {
         }
     }
 
+    @Test
+    public void testStartupTimeoutIsHonored() {
+        try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withStartupTimeout(Duration.ZERO)) {
+            assertThatThrownBy(pulsar::start)
+                .hasRootCauseMessage("Precondition failed: timeout must be greater than zero");
+        }
+    }
+
     protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception {
         try (
             PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).build();

From 2215e219054ee034583c27f3631154d7ec1b908e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 29 Sep 2022 09:21:07 -0500
Subject: [PATCH 2218/4969] Add Testcontainers icon for JetBrains IDEs (#5870)

---
 .gitignore     |   3 ++-
 .idea/icon.png | Bin 0 -> 5740 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .idea/icon.png

diff --git a/.gitignore b/.gitignore
index 95fc6e52000..120181d6e1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,8 @@ dependency-reduced-pom.xml
 *.iml
 
 ## Directory-based project format:
-.idea/
+.idea/*
+!.idea/icon.png
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff:
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f1d8ff443473bd28bed2d1a6a256a9cd76fd7fb
GIT binary patch
literal 5740
zcmcIo2{e>_+n*UDYh}q^nI@wLnax<nzGqjKB*K^(OwDG-uIv;=Bukc5LbNDE5vIuU
z*b*vBmKIAT5)v=odwQzxJ>Pk^bH4M<Irq$c&;NJ-uHUu%ult%wJZN`dtDvkP2n5<{
zX<_OBd`58({w=_JlRlvX_z+-PxUxYYA#v^j2Ib^QgFw8s6sIErM{I4hi3}Q&Kw@~4
zks&lDfChnd4MLa%;t6s9%$w{>q3glt>KfrN3P}&{qHc?}Wtx!vC>CKXvSXN?6EW-r
z5l?~}=)-hFv;hJdIe-8Qp;75<?GQcq4_<BHoclEj4*LNKIH3nO;u?e<u{{VgVX(+B
zO(a&8h(@Dfns_9}TSJ|oiQf;yqOn*MS_6eqQ^ja%<21A}IM~k@95BZs`Di<sn*THg
zT<O960s@%YC{%E8Ffv#T$zb`SFnBy3g~p<=SXBU_$_}Lm5JFVx?7hDjOv!8_i^2?`
zFz7HYBf*;y7@!9Sr2gdtjrp6F&i)xEAY!Nx0uzNnqPaf(0@~XCdnk?e8_f<d3j(bC
z)ca3~*-oKMGRlF>W(2Z`WV0YLJz(!IV<h75dzpbO>JLvzL=>4yrU5WEAPn={6w{9p
zz+n3^{)HdEmw$W1)HY#}2>}e26N5qhm8pZjSYTK+q&n;m7Yd!k2xcpB75%({Y)S|q
z>%qBMQ$^!dv06?Tyf#Kd1&z^0qyNI$0#!gF1Q7lUB!fip3H^^aTU%{QIy-<sCz35q
z_27UOB!xoKCTnRDv^0QxYZBEpRW->toT@h#4ZL|{h$JEoOYp{O{ZItlZ^|GBa-+t*
z|F3c-F^B-i@4#r|v@jZYH3C5utAW)}_4dK}sA{3{KB{<<mO25esZJsh)PJ$rvnarh
zAyEI3m8*&bFyhHL0tT<9sj9A}K~%+Ha9C9>A{MWziN>Ny1RpY4T@3?=k%-zp3>J+5
zlm~@I@Fk;|bYD2^f7F;Ts0@}Zg9L<Hja$S3JK%){g$-mZ^yjv4B>Vq7qf%f$YE7F!
z<d(P|oXE{BnFRm&HRYc~@4wUe7j3W~86f>vIsXg8X7~gI6If&;Um(o?v7k`@N;#Vl
z^zU{5cUk}c()}}_L_Y%EmkhK@6rAe`irZ8EN(btHXX?k=KlGnpaG<GiPk*;l;No{f
zCes0G7SL`bLA@p*kjN2BQzNI4yxIKlfSm)US`E~6>Ym>j&5Rq{I|%+-b+zSO@)w?=
z>k1+{B6faSO)9+9u;*JWWW}BoLXF$f59}`4r<iv=nr06(%-sR8bi8})M!jNlw$_#}
zi{3)R7Y+{{o4r$2J|kb*(FB{#ANa&xW~XeXeP+zrH;m<nPkpOrAHWL7&ZH_(hQ?mP
zbIMR#8n&GjOO5sfYeHi-qOB&K1qD;e)1g;N!{p|j$7Qd~-1RJpn&YY260^a4$X1cq
z3OtR<Iyg@`vz$Cg*XgK_(cwHsk=6YVGh|zZ3>}vSIIlT^XRqo+--H-#N)D$h?@f`2
zD*hl8H3urVG;u(W-(8M>bu8Q8L4xBCdFJ$*&pmf->i!IIU(_6AOc=V3$<?piuVoGx
zvCbY_W`KpP`@3MpcQ;f;7VS6XT@YHvz*0FUZ_4FtOY`AH(bYvOkdNMj{7m0(M`u`a
zldCW<#0|0j`yiZiLF~hdMyQAtPQ51fs>+M>h5FziW~=z(Xr;_Ix6IF=O^KD`uxa@!
zF(<nZ4gjkrVYI_@dsR|1DR)N#%FX&(qz0*EC6_EPC&xGQFj!@QbQG8GKQ70~kG>LV
zjJx69pAT5s+%XwLP4lx^$rBeS*OA=2SA%AaOiWP?pI%w|de|X+*Gh@uv(391R~#HQ
z0f$e?Fr}CYem35NkOb5bv%@Tjff6cd`ujIpNbqc>*s=mM5H>yL>{O!R_!WTHOFiIy
z73ErkvZyV|xVp6@{gYqxr8@(N`8eVtJxq`s;*L`mqC)6`&~+2FPA~KRTY#iso&p~F
z7VWs09hWA0?(C^1?dJFR9Pe*gB`o~>Yu{#k6*E3Wctv);(C}G7h2|d2ajy4~!e3d9
zrZ`2`<d<`&R-or>+Mh!VSw>Tln~BT&g4_hcMOTbr)0?)5&vP#1hyf{W1qDOoC6X^`
z`D|;F$~SK*x`@2Dos(hN#~$m$HHL7kUJ<j6LrP64_2+X$0Q@nI0nuY2-W=OELG*hY
zrdT)ZtKTDa7HYd!G%WIwjEfdhHUkpDfAaRuYPK^_N`br&AP*#_B?T{#&5`a;R~!a5
zLK}{_i`_;+XBr~qNbxWEOgPCLy`rl8n}-1hHW5DGm!ZAcUzQGtYp*GsQx2R#$oS~h
zroZUQyffcJ%*@ctf|rzu8`5=N?BeV*B`QiSp%(}5lXQ2xv6Uq5kS>fC(2Hi42r7g|
zXalKc)?FRaMr*AFKadrXZKqm`o5;OX!-PxjXsi5?s*tliVS4?G&%0OG{raJkS#RZn
z2D>GsxZFkAOACX>M%cLSmuD_NdJs1G-5Ut~`h>cVo(Q_b#9J8R3I1GAI_rK2>{r&X
zg?-r*DJ$-FKRb=>;w3$BD5hG-5<4C7&h=<@y$^z_Gr8&&esBG-Dd6EvPEB;9M6xAv
z+IzYp@Oph$=Gslf#b#*zH~QmBM!(goQyiD1d-)y8Q6oXOP{hwUqJZx7+=;CpE%txP
zA1c1BNfMaLHCdz%#po)z?@1xp6$T#x@Nh0(2;I2!)hu03FBqRTV0}FDGD<SbbWM#X
zKyM*0<Ax@hHg(!mHp?B5aUwf#&CyH@at1X=e0MVWR`x@eZ*8QR2w2n{-g@}C22TNs
zq?2U>AbXk~DICMj@;y4cC_1}y=<a2w+;Z0Y;p1kIU|hFou14X`q%-E^=<q1Hl8Stq
z6i_5xk1BWFG*hr{n)P0(xZf<*<KM08xxXTA?mo}rNS%Zdf=Wxk(5B>f({+ZGLAC=u
zO(Q7-sJy|!4*r4&YCCNx%!Fms>KHy9(*L~W8o2Yd1!K6onjdIP;^<wsmabh=NGa$!
z(~xw|-6OYplu7OjSgV<MT|Z{^>TUK?Y_yD!7kMoHW7Iy8N4KqejuZTv!Y&-6C5Mh8
z73R;G&%CaZK`6NIu>;8uHhkMCDLJ9Au=F=1JQmd<>{*-h>Yh;NaBa)@@M&;+x5lz(
z@HW-(<=(HAzNS=PRB`!TR;@YQC29w6oY?o9L>V2n>%dUeQi6iXlz5%r=K5u0+sff@
zqXx5?erYP4i!{aaIbF{XC25C74xdZeqSoB@Wcom+D1QA&SmXxI7A2ooMtN*(-J6l!
z=4y>+K9!jq*Sx_mQ<KZ%lK1$kJ%2cDuFwxm@(snL%*3QL*&n4GL}HVgr$;d@I`MyE
z<l8zw_v#|gna!dv8xLu26Mxdvr=AT?fU8CL<t6T!NWS6d-D4YeQ||3FQrZ%>>x^3{
z^IEioyI5jK(wAt=@aKw8H=kP=o|h`TDKldzoFJa;W>l97BO8WzL7OH~S?gr&tT;@g
zL~XrA>{}7bq0#vCwm-yrz2cmlLOib`tXxWHL4^IEqb$TIn_4y+ogfwIBpa%h-J2`(
zJf&ubR*g^9@fFe}h4*!qJ}%8QFik@!D)yQ3C3IlpGh0j3qC8OMF5=JKFw&*9vAD9B
zD&aI26ViqEbw@K_mN}Bn#nYa>RWFJElBA0{7D$q~G~K}8&ivjeo$=*(y<kgPK3XFY
zCmoAbZpcCJxU}LIv*K0djdyx+YmWNF?;GbJWX5X*Ul&hGY<EhS=2$%5DpypzP^V53
z@L5CqsONr+J$R~o`*UPs+lfL_+4bW`L&5L-JEV`xE#mgho;7;Z@Pf~^rgOzBu3cF?
zWQiYkz9;$Kb#e23ol8b#)g6B(Si?p06_$(V?Zzq`PC?rG2F~^NlJ0Cx5W8QapQ><S
zaDQ5sd0fxFThIX&5XkjO_Aumi*W`fLE!_Kqb?pxn;N|Dj?3^}nhhIb5-ue?3r>Ilw
zZ&Poi@b*stL0t5@*gj!e<S1IK0ZpBv4TnB?M7$w6Jcvj;gOC|>3on-~Qw6`9p|?zT
zmT!L}p@-N{mX6~yt{$#>e@%lIR6MJTs?mSt88M76v@rdaV43`~`t`9oK;^~C{6hS2
z=(Q>`*(5D->r;!JWu=;}HkPwOF#BA-x6@)n-4)Hvrr)VUtV0HnsBc5vd~eX+P1U$|
z-66Gw5B!59TKCt!L!OYf!ZvB4qg@pX8`7p{b4x0dY~FRDOD$;q@<~_qc~eVVAFmwb
zi(^+;j#uLVOYv_MMwMrSZXLhU04x>?6xItQyqWArcj?3`rc>a78a?)>)u5os)$ucV
zv$`u0!-FF!>Q;)b`OYm46Fb504za4)<x-R}t-*HT-gVIn!~t?&rqI;xzW2^;%Qcva
zwNxUXeBS=3Eruqbl#)H5(|saQO%#641P(gRl!Y+0wt}_t5<olcOhDWI@5_!=ppkGB
zi*0(7^*O2TVxuNc<?US-`yQ*hd0wTAixg&+D^@SJT@&{^sH<OYvq{wXQjc+3^gYAR
z;he19Sbxm7cX4!Ci)K9~TFctizI|y&z6Fo}h<-e8<jIWBz8*^bRpS^bxFd%hFN<qL
zw>^qn;e8!!kf`FW(|Y}dY(?wSJc~H-&G*6Z*zFMFJ{Io-!4=i<-0BR%v*p~^Rn*W+
z^SmV@-`^!lTM?5fLKUVZY1ihYHcyA!tOVZk@4S~QS^7-HTEWuTaj7u6E?Uhj+`em$
z6woC5MrF;+<j<6}KhX>GhDCkZlI1;SV~pV5)djE$!5-wo8?%uGOqORr3w~u08q9sn
zi++lU>CVP-FH;?S6B8~bAD4`J<D9)YRllgebS>j<R`dyAfGqqj|4JDI^m#pw0Yno#
z3wM=4UYc&r!Um<8SKklw(DY1(q>f<gC;kxHJrtcM+0c~&ssS1BL)Yi<J9>k_?|Plq
z`NuzU-rM+RF|`JleaulFmW#K<JG0E3v&+PyptDw)8>fTDWkmH0o`E7DBO?5(+fRAL
zItakd7k}6X9^-pqH#~n#VXaQ)^@D_F&;2{LDhUk0qkIa4mP%h&&5be;RF(PfhR+(=
zwdM#Z!`;9WiLYVnq5v=Gi=&k2(A|W^k!`&qZlzTqcaQi`)SU0~+y)6jMKNix=}5!t
z{)14^mC{<N6*zNOJY9}0opiRX#7^PlW5EiK^Gwg6gGykFB%5H}gw^qF@2<~>$G-vQ
z?r#vIM&`YuTfjytT|GJO7KM~epIN|!%_z5Qu4+A&c-mPS2Rf>EciNz!XeO#?wO)RO
z1)HwH9WacCrXFxya?bu3>u5^6a9|m`@a<!^ZUnt|J;}ii9CA|dl>OXQqVF@SSKB&6
zBiw+o!wCdD#;rL|v$Ih54rRcqKmTElGDr?!d_1>Wkiz2U41Dson}@OG!$<!F_cMTj
z!eBdeT}`{X_6=8Em<m&mxfSLljMf#L_?jiIABj(B-5@4gD}mY(y%~8|<{pFY#Lce>
zDq@6aHM}tqZrx?&vfQkl5}nr@ckj&(u)j&sDQIYZ;ckV9%JfOx@H99b?Ad1ZYA;8M
z$7u6o(4<4)k2uI=Z#;46&2E1?DOSr;O}9?Di{Pu{9si=V|KzenZFS>u#3$a)+V%8m
z!~(MHFxRWPsIA##n|oc*3(YI1&l48s>=1p3fD$|+NWhTJ!mM%lzeX+{XcKI7@sqC1
zYfutd%%Yxfb{67RMn0#DGbJ)oba5$+KXQ@;pURKB`XK2;a4{s6l$b)j(BS!*vrD2u
z-JZt)Lf-~mCz=H#Eo^}&0WdauA!GEFWz#PY+f65_H@l#!N5*WR<6r+=G`J@|b~Ce@
zsFyPH!nI<>$Jq8q75WkcjY0-A{hvdOUG5+T$5cn`F%ah34#`hp`JZoRzS)B2+rU`o
z4;tDEf`F-6bM95Qw@>tbQN52LEl3Zu;`)bPY!yhV9x}|NaDT|kb_<z_Q2kCF4Vu{~
z!m|?6mR_09cv_Vozno2W%ayJ>xHqiZLHK3=9%D$Vg7!Py`t~`_F0qJXRLQ>LdVl5I
zYWMy}poMqTsk*48YnambV{saH5ciDNIb%{{hLt^Ln{%F5mY&w!x?U^upf=Uk4f(+w
z6bk%I!WGYspk&jviq1dFIAPf}ce1CaMC`|w_f8$%93&#{12g6j-)(3{POUiT5ltr&
zT<I|i7bE_G?QL{z$-a|D0|vh)UYHVA@9iN;{VE>Uzm=9q7x(y|mf(si`XOpK`m8At
zyUU{m>1wt}Y$aT;ECwm~ISQ|CzIDynW_Ig3Q=WMYqd|Lk;{^C!`(Sr4SjCKZ;cTtU
z=!48O&9{rR?`pHCPnFN#2X%%v_yN4Y@6Gw@*^{D^5(JOLTAAj&pwGFbfLA;BM(N^*
zziW5irUcCz6*LE+88scns!}Q9hL`hZ|F&!VkxWFt2`B4QHKik-$jjY#eSm(lq)9Mg
zsLFmY-x05bYY5z2^r3^YcwD@X-i?>;zJJW)V=T(}wI_JgwmYanppU3E5@g3?0HQ0M
z=GrviJt^|AB%i^fe|fDp68w@6XsXIt&XhlJ4V&9r6=dpfZi0-t{|8%|*_qxk_KNvC
DUoGH2

literal 0
HcmV?d00001


From c28fbe029e843b69f9d260ae2d2a0bee01257cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 29 Sep 2022 10:16:33 -0500
Subject: [PATCH 2219/4969] Remove thundra badges

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index b1c0014c236..d2fce2e9911 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Testcontainers
 
-[![Thundra Foresight](https://thundra-assets-prod.s3.us-west-2.amazonaws.com/images/badges/thundra-foresight-badge-enabled.svg)](https://foresight.thundra.live/testRuns/5a49cc30-f063-11eb-9a03-0242ac130003)
-[![Thundra Foresight Test Results](https://foresight.service.thundra.us/public/api/v1/badge/test/5a49cc30-f063-11eb-9a03-0242ac130003)](https://foresight.thundra.live/testRuns/5a49cc30-f063-11eb-9a03-0242ac130003)
 [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)
 
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.

From b6abcef31196682b48cebb26739d607ca9e39ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 29 Sep 2022 10:18:54 -0500
Subject: [PATCH 2220/4969] Update latest version in mkdocs.yml

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 87b19de4f0a..ab57aeb11d6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -108,4 +108,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.17.3
+    latest_version: 1.17.4

From 08f75a5217f601439ef426b059908164a02deba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 29 Sep 2022 10:21:11 -0500
Subject: [PATCH 2221/4969] Upgrade testcontainers version to 1.17.4 in japicmp

---
 gradle/japicmp.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index 541736a8321..6d769bf9286 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-    baseline "org.testcontainers:${project.name}:1.17.3", {
+    baseline "org.testcontainers:${project.name}:1.17.4", {
         exclude group: "*", module: "*"
     }
 }

From ce003ce6c42b423823501503e77d809508c1b502 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:18 +0000
Subject: [PATCH 2222/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.295 to 1.12.313.
- [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.12.295...1.12.313)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index ac9ff346bea..e9cd2111f82 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From d48fef2fab6f82d6707e18fbaaf591e7de606f99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:18 +0000
Subject: [PATCH 2223/4969] Bump snakeyaml from 1.31 to 1.33 in /core

Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.31 to 1.33.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-1.33..snakeyaml-1.31)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 4072c25db37..08ca6d777c5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -80,7 +80,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded "org.yaml:snakeyaml:1.31"
+    shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 052b44a76179a3760b6e2ec2b0a30c17d7e22b4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:23 +0000
Subject: [PATCH 2224/4969] Bump java-driver-core from 4.14.1 to 4.15.0 in
 /modules/cassandra

Bumps [java-driver-core](https://github.com/datastax/java-driver) from 4.14.1 to 4.15.0.
- [Release notes](https://github.com/datastax/java-driver/releases)
- [Commits](https://github.com/datastax/java-driver/compare/4.14.1...4.15.0)

---
updated-dependencies:
- dependency-name: com.datastax.oss:java-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index ff110637ced..ae115c92a71 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     api project(":database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
-    testImplementation 'com.datastax.oss:java-driver-core:4.14.1'
+    testImplementation 'com.datastax.oss:java-driver-core:4.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From dcf8df081a3077d3300dfdd2f7998e6b6de52e11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:27 +0000
Subject: [PATCH 2225/4969] Bump junit-jupiter-params from 5.9.0 to 5.9.1 in
 /modules/junit-jupiter

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.9.0 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5b91bd181fe..0ef2ef20ab7 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'

From d1220f453d1350488e65868a266f817980128f96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:35 +0000
Subject: [PATCH 2226/4969] Bump mockito-core from 4.7.0 to 4.8.0 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5b91bd181fe..085ad9f1893 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.2.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.7.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 4c6a67dd0a6858d3c6985350f140e007201a7069 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:37 +0000
Subject: [PATCH 2227/4969] Bump release-drafter/release-drafter from 5.20.1 to
 5.21.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.20.1 to 5.21.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/06a49bf28488e030d35ca2ac6dbf7f408a481779...df69d584deac33d8569990cb6413f82447181076)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 94af563bcda..9315b7c342f 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@06a49bf28488e030d35ca2ac6dbf7f408a481779 # v5.19.0
+      - uses: release-drafter/release-drafter@df69d584deac33d8569990cb6413f82447181076 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From c8d841668bcbb2f8aaae2574a69ee20e699008c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:38 +0000
Subject: [PATCH 2228/4969] Bump mockito-core from 4.7.0 to 4.8.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 4072c25db37..ed85a732f24 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.15.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
-    testImplementation ('org.mockito:mockito-core:4.7.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 05862eb6321a3bc8bf7ae690106eb5c996cc54df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:39 +0000
Subject: [PATCH 2229/4969] Bump aws-java-sdk-s3 from 1.12.295 to 1.12.313 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.295 to 1.12.313.
- [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.12.295...1.12.313)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 2b38b50f162..58be6dceae6 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.295'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.313'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.295'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
     testImplementation 'software.amazon.awssdk:s3:2.17.266'

From 5ecb572ee3c058d6a4c3253ec80832b32149b6ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:40 +0000
Subject: [PATCH 2230/4969] Bump junit-jupiter-engine from 5.9.0 to 5.9.1 in
 /modules/junit-jupiter

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.0 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5b91bd181fe..e7456adc1e3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 test {

From 5f4fbf85c585ea828adb8576740852defa9f858c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:42 +0000
Subject: [PATCH 2231/4969] Bump peter-evans/create-pull-request from 4.1.1 to
 4.1.3

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.1.1 to 4.1.3.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/18f90432bedd2afd6a825469ffd38aa24712a91d...671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 070fa2c55d4..983f872c4f8 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d # v3.10.1
+        uses: peter-evans/create-pull-request@671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From 912b017d04fc4c4204850dffd5b0d53225cd7063 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:43 +0000
Subject: [PATCH 2232/4969] Bump amqp-client from 5.15.0 to 5.16.0 in /core

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.15.0 to 5.16.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.15.0...v5.16.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 4072c25db37..c9f849a9265 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,7 +88,7 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.2.3'
-    testImplementation 'com.rabbitmq:amqp-client:5.15.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
     testImplementation ('org.mockito:mockito-core:4.7.0') {

From 81619973fc9a66d98a0198d90158506905864efc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:46 +0000
Subject: [PATCH 2233/4969] Bump junit-jupiter-api from 5.9.0 to 5.9.1 in
 /modules/junit-jupiter

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.0 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5b91bd181fe..575e367512c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.9.0'
+    api 'org.junit.jupiter:junit-jupiter-api:5.9.1'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')

From 785c08e6cba914d8092c8e00edf883e9ed390b76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:48 +0000
Subject: [PATCH 2234/4969] Bump java-client from 3.3.3 to 3.3.4 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.3.3...java-client-3.3.4)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 5950aac7655..0542a5d68d0 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.3.3'
+    testImplementation 'com.couchbase.client:java-client:3.3.4'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From aea8f74fee1b1da6f2a01f17741f8a7729f941ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:52 +0000
Subject: [PATCH 2235/4969] Bump tomcat-jdbc from 10.0.23 to 10.1.0 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.0.23 to 10.1.0.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index ba0f845b47d..14c4a431d00 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.0'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation ('org.mockito:mockito-core:4.7.0') {

From fa7a2c3536a3006e86245bb3dc82a6d1a39f38df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:55 +0000
Subject: [PATCH 2236/4969] Bump aws-java-sdk-logs from 1.12.295 to 1.12.313 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.295 to 1.12.313.
- [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.12.295...1.12.313)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 2b38b50f162..8ec3a442bc4 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.295'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.295'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.313'
     testImplementation 'software.amazon.awssdk:s3:2.17.266'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From fcd3f607bd3e2d0c07da6ef83d4d1687da93028d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:06:58 +0000
Subject: [PATCH 2237/4969] Bump common-custom-user-data-gradle-plugin in
 /examples

Bumps common-custom-user-data-gradle-plugin from 1.8 to 1.8.1.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 7194134350d..a4e4bddd880 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }
 

From 92f072f3dea0790aebb5273429e9c7be31d1f10d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:02 +0000
Subject: [PATCH 2238/4969] Bump mockito-core from 4.7.0 to 4.8.0 in
 /modules/jdbc

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index ba0f845b47d..bf590c08748 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation ('org.mockito:mockito-core:4.7.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.0') {
         exclude(module: 'hamcrest-core')
     }
 }

From 502a2abf5808e4d102538146c8415dfcf64d9948 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:02 +0000
Subject: [PATCH 2239/4969] Bump trino-jdbc from 394 to 398 in /modules/trino

Bumps trino-jdbc from 394 to 398.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index ca2619a8631..c534f14bd2a 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:394'
+    testImplementation 'io.trino:trino-jdbc:398'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 9f2e2c14c6f7a8cf47e8ac73a0f3b2a40ed62d37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:14 +0000
Subject: [PATCH 2240/4969] Bump google-cloud-pubsub from 1.120.13 to 1.120.18
 in /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.13 to 1.120.18.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.13...v1.120.18)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 044d82cbb21..aa0b151f6f8 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.13'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.11.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 826657c84ff24b3a8a15ee5bd65fd1bd2a179fee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:16 +0000
Subject: [PATCH 2241/4969] Bump mssql-jdbc from 11.2.0.jre8 to 11.2.1.jre8 in
 /modules/mssqlserver

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 11.2.0.jre8 to 11.2.1.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 cc05b6ffea4..ef91edc79d1 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.1.jre8'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'

From 6f8c1a536c2f1f3b4242b75d2c590870ccf005f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:20 +0000
Subject: [PATCH 2242/4969] Bump mariadb-java-client from 3.0.7 to 3.0.8 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.7 to 3.0.8.
- [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/3.0.7...3.0.8)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1a11f0fbfb6..b4b3b3b4415 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.7'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.8'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From 50c03510cb4e11ad398c726437e0dee26cc2e3b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:23 +0000
Subject: [PATCH 2243/4969] Bump google-cloud-datastore from 2.11.0 to 2.11.4
 in /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.11.0 to 2.11.4.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.11.0...v2.11.4)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 044d82cbb21..2758d755c56 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.11.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.13'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'

From 00f10e3d1388819a792efb0fc218ca40015ce6df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:25 +0000
Subject: [PATCH 2244/4969] Bump azure-cosmos from 4.35.1 to 4.36.0 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.35.1 to 4.36.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.35.1...azure-cosmos_4.36.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 8753606874c..43280db4a88 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.35.1'
+    testImplementation 'com.azure:azure-cosmos:4.36.0'
 }

From 54493fb3c9fe995682890c05997d8b831335678b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:31 +0000
Subject: [PATCH 2245/4969] Bump reactor-core from 3.4.22 to 3.4.23 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.22 to 3.4.23.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.22...v3.4.23)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index c55b71ddcb2..9126ff0a347 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.22'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.23'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 569ae4c8112b2c95ef7dab82e6f5db6c763bb51b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:32 +0000
Subject: [PATCH 2246/4969] Bump amqp-client from 5.15.0 to 5.16.0 in
 /modules/rabbitmq

Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.15.0 to 5.16.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.15.0...v5.16.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 9825a27a499..6cf03d4f984 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.15.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 73596740f3ece5f93af4f1b3e8a2f9e24595f227 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:35 +0000
Subject: [PATCH 2247/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.4.1 to 8.4.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.4.1...v8.4.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index c5591d0d26a..04521b974ea 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.2"
     testImplementation "org.elasticsearch.client:transport:7.17.6"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 25af50d16d32e66a4c05299610a23077905828cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:35 +0000
Subject: [PATCH 2248/4969] Bump kafka-clients from 3.2.1 to 3.3.0 in
 /modules/redpanda

Bumps kafka-clients from 3.2.1 to 3.3.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 5750e873bf6..4d7221711a3 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 9af2f2282caf9f57bfdb1e582405889782097c78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:39 +0000
Subject: [PATCH 2249/4969] Bump common-custom-user-data-gradle-plugin from 1.8
 to 1.8.1

Bumps common-custom-user-data-gradle-plugin from 1.8 to 1.8.1.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 2beb91dea01..f0c1d306671 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }
 

From ea4053bfa065616be0c2c84276279bd60fd16b77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:43 +0000
Subject: [PATCH 2250/4969] Bump rest-assured from 5.1.1 to 5.2.0 in
 /modules/consul

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.1.1 to 5.2.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.1.1...rest-assured-5.2.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index acb97a47927..a72aefaab5f 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.1.1'
+    testImplementation 'io.rest-assured:rest-assured:5.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 80ced857e13cad960b7c781f3b1dd70cb54332aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:45 +0000
Subject: [PATCH 2251/4969] Bump rest-assured from 5.1.1 to 5.2.0 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.1.1 to 5.2.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.1.1...rest-assured-5.2.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 499286ae72a..c9142936b63 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.1.1'
+    testImplementation 'io.rest-assured:rest-assured:5.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
 }

From 29b18d150c2c9f98fb15ec5a38a32f3b4b989833 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:52 +0000
Subject: [PATCH 2252/4969] Bump logback-classic from 1.4.0 to 1.4.1 in
 /modules/hivemq

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.0...v_1.4.1)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 477d5ac98a3..0520440828f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.4.0")
+    testImplementation("ch.qos.logback:logback-classic:1.4.1")
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 }

From e094aceeef5d76b57018b4dd453c686f4883ed0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:56 +0000
Subject: [PATCH 2253/4969] Bump json from 20220320 to 20220924 in /examples

Bumps [json](https://github.com/douglascrockford/JSON-java) from 20220320 to 20220924.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5d9fb93c20d..fe230f3a22e 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'org.json:json:20220320'
+    implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'

From 942923183b8946b8c4c7edb8d5a24bfbb5748611 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:07:59 +0000
Subject: [PATCH 2254/4969] Bump hivemq-extension-sdk from 4.8.3 to 4.9.0 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.8.3 to 4.9.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.8.3...4.9.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 477d5ac98a3..b6b9a42c425 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.9.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.4.0")

From 27bb1aef9800f8b33c413133b970c6dbecd4aa1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:08:03 +0000
Subject: [PATCH 2255/4969] Bump junit-jupiter-api from 5.9.0 to 5.9.1 in
 /modules/hivemq

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.0 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 477d5ac98a3..50b857d7ed6 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.1")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")

From f7bd0350106a97eafb53a5ff722b63d63cc5ce67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:08:06 +0000
Subject: [PATCH 2256/4969] Bump org.springframework.boot from 2.7.3 to 2.7.4
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.3...v2.7.4)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 6183b89e1d6..feb677dc64a 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.7.3'
+    id 'org.springframework.boot' version '2.7.4'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 180d6780c8f..6a98573172c 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.3"
+    id("org.springframework.boot") version "2.7.4"
     id("org.jetbrains.kotlin.jvm") version "1.7.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 52a4a63386a..56cd62e34e6 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.7.3'
+    id 'org.springframework.boot' version '2.7.4'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 5c9d06d226bcb23c00eaa02ff94588dd83d582df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:08:07 +0000
Subject: [PATCH 2257/4969] Bump kafka-clients from 3.2.1 to 3.3.0 in /examples

Bumps kafka-clients from 3.2.1 to 3.3.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index c3a79d4058f..08d3734a956 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'

From 4ec5af3f90e6bb9da32297067e7519a89b61dcb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:08:08 +0000
Subject: [PATCH 2258/4969] Bump junit-jupiter-engine from 5.9.0 to 5.9.1 in
 /modules/hivemq

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.0 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 477d5ac98a3..511e504f8ef 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.4.0")
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
 }
 
 test {

From 21e09603751d887da68dc28b0ea431e1758f2beb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:08:16 +0000
Subject: [PATCH 2259/4969] Bump zip4j from 2.11.1 to 2.11.2 in /modules/hivemq

Bumps [zip4j](https://github.com/srikanth-lingala/zip4j) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases)
- [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.11.1...v2.11.2)

---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 477d5ac98a3..0c336745f77 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     shaded("org.javassist:javassist:3.29.0-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
-    shaded("net.lingala.zip4j:zip4j:2.11.1")
+    shaded("net.lingala.zip4j:zip4j:2.11.2")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
     testImplementation(project(":junit-jupiter"))

From ff13685d346a6329268b2b5de0f82b8323117087 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:08:17 +0000
Subject: [PATCH 2260/4969] Bump cucumber-junit from 7.6.0 to 7.8.0 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.6.0 to 7.8.0.
- [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/v7.6.0...v7.8.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 ab0331f81f4..9d0da7a5e33 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:7.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.6.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.8.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 6b3c7b4fa132021bc443ca09e1322bcc5a2dbb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 29 Sep 2022 18:09:45 -0500
Subject: [PATCH 2261/4969] Rename main branch (#5847)

`main` is the new default branch name.
---
 .github/workflows/ci-docker-wormhole.yml  |  2 +-
 .github/workflows/ci-examples.yml         |  2 +-
 .github/workflows/ci-rootless.yml         |  2 +-
 .github/workflows/ci.yml                  |  2 +-
 .github/workflows/release-drafter.yml     |  2 +-
 .github/workflows/update-docs-version.yml |  2 +-
 RELEASING.md                              |  2 +-
 docs/contributing.md                      |  2 +-
 docs/examples.md                          | 22 +++++++++++-----------
 docs/index.md                             |  4 ++--
 docs/jitpack_dependencies.md              |  4 ++--
 docs/modules/consul.md                    |  2 +-
 docs/modules/databases/jdbc.md            |  4 ++--
 docs/modules/databases/mssqlserver.md     |  4 ++--
 docs/modules/gcloud.md                    |  8 ++++----
 docs/modules/vault.md                     |  4 ++--
 docs/modules/webdriver_containers.md      |  2 +-
 17 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index e27e4d8d611..061a004682e 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -2,7 +2,7 @@ name: CI-Docker-Wormhole
 
 on:
   pull_request: {}
-  push: { branches: [ master ] }
+  push: { branches: [ main ] }
 
 permissions:
   contents: read
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index fe4610368aa..2cdc9f8ed69 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -2,7 +2,7 @@ name: CI-Examples
 
 on:
   pull_request: {}
-  push: { branches: [ master ] }
+  push: { branches: [ main ] }
 
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 348cf5aaaf7..50db1655a4a 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -2,7 +2,7 @@ name: CI-Docker-Rootless
 
 on:
   pull_request: {}
-  push: { branches: [ master ] }
+  push: { branches: [ main ] }
 
 permissions:
   contents: read
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1eceab8702..80f20fb0c0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request: {}
-  push: { branches: [ master ] }
+  push: { branches: [ maing ] }
 
 permissions:
   contents: read
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 94af563bcda..46b1e261789 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -3,7 +3,7 @@ name: Release Drafter
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, reopened, synchronize]
 
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 070fa2c55d4..2c54f92efcf 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: master
+          ref: main
       - name: Update latest_version property in mkdocs.yml
         run: |
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
diff --git a/RELEASING.md b/RELEASING.md
index f04839d9d41..8027cb9cc98 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -4,7 +4,7 @@ Testcontainers' release process is semi-automated through GitHub Actions. This d
 
 ## Steps
 
-1. Ensure that the master branch is building and that tests are passing.
+1. Ensure that the `main` branch is building and that tests are passing.
 1. Create a new release on GitHub. **The tag name is used as the version**, so please keep the tag name plain (e.g. 1.2.3).
 1. The release triggers a GitHub Action workflow.
 1. Log in to [Sonatype](https://oss.sonatype.org/) to check the staging repository.
diff --git a/docs/contributing.md b/docs/contributing.md
index 01c4fce57b6..1457839a5ec 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -101,7 +101,7 @@ For this, we are using the [gh-combine-prs](https://github.com/rnorth/gh-combine
 The whole process is as follow:
 
 1. Check that all open Dependabot PRs did succeed their build. If they did not succeed, trigger a rerun if the cause were external factors or else document the reason if obvious.
-2. Run the extension from an up-to-date local `master` branch: `gh combine-prs --query "author:app/dependabot"`
+2. Run the extension from an up-to-date local `main` branch: `gh combine-prs --query "author:app/dependabot"`
 3. Merge conflicts might appear. Just ignore them, we will get those PRs in a future run.
 4. Once the build of the combined PR did succeed, temporarily enable merge commits and merge the PR using a merge commit through the GitHub UI.
 5. After the merge, disable merge commits again.
diff --git a/docs/examples.md b/docs/examples.md
index 918688d86cb..14f43d21e23 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -2,14 +2,14 @@
 
 Examples of different use cases provided by Testcontainers can be found below:
 
-- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/kafka-cluster)
-- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/linked-container)
-- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/master/examples/neo4j-container)
-- [Redis](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache)
-- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/selenium-container)
-- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
-- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/master/examples/singleton-container)
-- [Solr](https://github.com/testcontainers/testcontainers-java/tree/master/examples/solr-container)
-- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot)
-- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot-kotlin-redis)
-- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache-testng)
+- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/kafka-cluster)
+- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/linked-container)
+- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/main/examples/neo4j-container)
+- [Redis](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache)
+- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/main/examples/selenium-container)
+- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/main/examples/cucumber)
+- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/main/examples/singleton-container)
+- [Solr](https://github.com/testcontainers/testcontainers-java/tree/main/examples/solr-container)
+- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot)
+- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot-kotlin-redis)
+- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache-testng)
diff --git a/docs/index.md b/docs/index.md
index 8eb4ddeb2c4..383f42c0245 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -206,7 +206,7 @@ A huge thank you to our sponsors:
 
 ## License
 
-See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/LICENSE).
+See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/LICENSE).
 
 ## Attributions
 
@@ -218,4 +218,4 @@ This project was initially inspired by a [gist](https://gist.github.com/mosheesh
 
 Copyright (c) 2015-2021 Richard North and other authors.
 
-See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/AUTHORS) for contributors.
+See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/AUTHORS) for contributors.
diff --git a/docs/jitpack_dependencies.md b/docs/jitpack_dependencies.md
index 23a4c7353ad..30687dcd3bc 100644
--- a/docs/jitpack_dependencies.md
+++ b/docs/jitpack_dependencies.md
@@ -5,14 +5,14 @@ Use the following dependency description instead:
 
 === "Gradle"
     ```groovy
-    testImplementation "com.github.testcontainers.testcontainers-java:--artifact name--:master-SNAPSHOT"
+    testImplementation "com.github.testcontainers.testcontainers-java:--artifact name--:main-SNAPSHOT"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>com.github.testcontainers.testcontainers-java</groupId>
         <artifactId>--artifact name--</artifactId>
-        <version>master-SNAPSHOT</version>
+        <version>main-SNAPSHOT</version>
     </dependency>
     ```
 
diff --git a/docs/modules/consul.md b/docs/modules/consul.md
index 1580690cad7..d0eafd6b1a8 100644
--- a/docs/modules/consul.md
+++ b/docs/modules/consul.md
@@ -32,5 +32,5 @@ testImplementation "org.testcontainers:consul:{{latest_version}}"
 </dependency>
 ```
 
-See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/modules/consul/AUTHORS) for contributors.
+See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/modules/consul/AUTHORS) for contributors.
 
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index e3a077333cd..9e976d872ba 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -127,5 +127,5 @@ Note that if you use `@Rule`, you will be given an isolated container for each t
 
 Examples/Tests:
 
- * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java)
- * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java)
+ * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/main/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java)
+ * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/main/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java)
diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index 7ddd5350a40..9d0912f2563 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -49,10 +49,10 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ## License
 
-See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/modules/mssqlserver/LICENSE).
+See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/modules/mssqlserver/LICENSE).
 
 ## Copyright
 
 Copyright (c) 2017 - 2019 G DATA Software AG and other authors.
 
-See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/modules/mssqlserver/AUTHORS) for contributors.
+See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/modules/mssqlserver/AUTHORS) for contributors.
diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 7431ed0de0f..807b81de433 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -53,7 +53,7 @@ And test against the Emulator:
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/datastore-example/src/test/java/com/example/springboot/datastore) 
 
 ### Firestore 
@@ -72,7 +72,7 @@ And test against the Emulator:
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/firestore-example/src/test/java/com/example/springboot/firestore/FirestoreIntegrationTests.java)
 
 ### Spanner 
@@ -103,7 +103,7 @@ And test against the Emulator:
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/spanner-example/src/test/java/com/example/springboot/spanner/SpannerIntegrationTests.java)
 
 ### Pub/Sub 
@@ -134,7 +134,7 @@ And test against the Emulator:
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/master/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/pubsub-example/src/test/java/com/example/springboot/pubsub/PubSubIntegrationTests.java)
 
 ## Adding this module to your project dependencies
diff --git a/docs/modules/vault.md b/docs/modules/vault.md
index 577ed91a32f..4a232361464 100644
--- a/docs/modules/vault.md
+++ b/docs/modules/vault.md
@@ -57,11 +57,11 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 ## License
 
-See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/modules/vault/LICENSE).
+See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/modules/vault/LICENSE).
 
 ## Copyright
 
 Copyright (c) 2017 Capital One Services, LLC and other authors.
 
-See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/modules/vault/AUTHORS) for contributors.
+See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/modules/vault/AUTHORS) for contributors.
 
diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index ec1dc2a407f..7ff4d2d6304 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -81,7 +81,7 @@ Note the factory must implement `org.testcontainers.containers.RecordingFileFact
 
 ## More examples
 
-A few different examples are shown in [ChromeWebDriverContainerTest.java](https://github.com/testcontainers/testcontainers-java/blob/master/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java).
+A few different examples are shown in [ChromeWebDriverContainerTest.java](https://github.com/testcontainers/testcontainers-java/blob/main/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java).
 
 ## Adding this module to your project dependencies
 

From 14687a6cd23d31df43e87216f8d558bb9eb4943d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 30 Sep 2022 09:23:29 -0500
Subject: [PATCH 2262/4969] Reference to GitHub Discussions (#5928)

Take advantage of discussions to have previous conversations with
contributors before investing time working on PRs or asking
general questions.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml  | 2 +-
 .github/ISSUE_TEMPLATE/enhancement.yaml | 2 +-
 .github/ISSUE_TEMPLATE/feature.yaml     | 2 +-
 docs/contributing.md                    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 9945297ea7a..8196451e88f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report! Before submitting a `bug`, please make sure there is no existing issue for the one you encountered.
+        Thanks for taking the time to fill out this bug report! Before submitting a `bug`, please make sure there is no existing issue for the one you encountered and it has been discussed with the team via [discussions](https://github.com/testcontainers/testcontainers-java/discussions) or Slack.
   - type: dropdown
     id: module
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 6d5edab909f..9d65e1f12b8 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Before submitting an `enhancement`, please make sure there is no existing enhancement for the one you are requesting. If so, please provide the following information:
+        Before submitting an `enhancement`, please make sure there is no existing enhancement for the one you are requesting and it has been discussed with the team via [discussions](https://github.com/testcontainers/testcontainers-java/discussions) or Slack. If so, please provide the following information:
   - type: dropdown
     id: module
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 8abeb7d2131..581870d976d 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Before submitting a `feature`, please make sure there is no existing feature for the one you are requesting. If so, please provide the following information:
+        Before submitting a `feature`, please make sure there is no existing feature for the one you are requesting and it has been discussed with the team via [discussions](https://github.com/testcontainers/testcontainers-java/discussions) or Slack. If so, please provide the following information:
   - type: dropdown
     id: module
     attributes:
diff --git a/docs/contributing.md b/docs/contributing.md
index 1457839a5ec..c8eac36e03b 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -2,9 +2,9 @@
 
 * Star the project on [Github](https://github.com/testcontainers/testcontainers-java) and help spread the word :)
 * Join our [Slack group](http://slack.testcontainers.org)
-* [Post an issue](https://github.com/testcontainers/testcontainers-java/issues) if you find any bugs
+* [Start a discussion](https://github.com/testcontainers/testcontainers-java/discussions) if you have an idea, find a possible bug or have a general question.
 * Contribute improvements or fixes using a [Pull Request](https://github.com/testcontainers/testcontainers-java/pulls). If you're going to contribute, thank you! Please just be sure to:
-    * discuss with the authors on an issue ticket prior to doing anything big.
+    * discuss with the authors prior to doing anything big.
     * follow the style, naming and structure conventions of the rest of the project.
     * make commits atomic and easy to merge.
     * when updating documentation, please see [our guidance for documentation contributions](contributing_docs.md).

From f0dd61404fd570b91e71513317bde6a5a2599dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 30 Sep 2022 11:59:54 -0500
Subject: [PATCH 2263/4969] Add banner when Ryuk is disabled (#5929)

This banner will warn the user about unexpected behavior if Ryuk is
disabled.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../java/org/testcontainers/utility/ResourceReaper.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index ad0c949f6e7..1b99cd2abb4 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -79,6 +79,15 @@ public static synchronized ResourceReaper instance() {
                 //noinspection deprecation
                 instance = new RyukResourceReaper();
             } else {
+                String ryukDisabledMessage =
+                    "\n" +
+                    "********************************************************************************" +
+                    "\n" +
+                    "Ryuk has been disabled. This can cause unexpected behavior in your environment." +
+                    "\n" +
+                    "********************************************************************************";
+                LOGGER.warn(ryukDisabledMessage);
+
                 instance = new JVMHookResourceReaper();
             }
         }

From e2aeb68a45d2a3579e9a5667977789c24463478f Mon Sep 17 00:00:00 2001
From: Hari Ohm Prasath <hariohmprasath@gmail.com>
Date: Fri, 30 Sep 2022 10:14:00 -0700
Subject: [PATCH 2264/4969] Test container example for ImmuDB (#5860)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test container example using ImmuDB, performing basic operations

Fixes #5594

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/examples.md                              | 23 +++----
 examples/immudb/build.gradle                  | 14 +++++
 examples/immudb/src/test/java/ImmuDbTest.java | 63 +++++++++++++++++++
 examples/settings.gradle                      |  1 +
 4 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 examples/immudb/build.gradle
 create mode 100644 examples/immudb/src/test/java/ImmuDbTest.java

diff --git a/docs/examples.md b/docs/examples.md
index 14f43d21e23..cd85226e4be 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -2,14 +2,15 @@
 
 Examples of different use cases provided by Testcontainers can be found below:
 
-- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/kafka-cluster)
-- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/linked-container)
-- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/main/examples/neo4j-container)
-- [Redis](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache)
-- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/main/examples/selenium-container)
-- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/main/examples/cucumber)
-- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/main/examples/singleton-container)
-- [Solr](https://github.com/testcontainers/testcontainers-java/tree/main/examples/solr-container)
-- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot)
-- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot-kotlin-redis)
-- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache-testng)
+- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/kafka-cluster)
+- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/linked-container)
+- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/master/examples/neo4j-container)
+- [Redis](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache)
+- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/selenium-container)
+- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
+- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/master/examples/singleton-container)
+- [Solr](https://github.com/testcontainers/testcontainers-java/tree/master/examples/solr-container)
+- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot)
+- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot-kotlin-redis)
+- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache-testng)
+- [ImmuDb](https://github.com/testcontainers/testcontainers-java/tree/master/examples/immudb)
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
new file mode 100644
index 00000000000..5ff55a2205a
--- /dev/null
+++ b/examples/immudb/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
+    implementation 'io.codenotary:immudb4j:0.9.10.2'
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+}
diff --git a/examples/immudb/src/test/java/ImmuDbTest.java b/examples/immudb/src/test/java/ImmuDbTest.java
new file mode 100644
index 00000000000..fd515ddd4aa
--- /dev/null
+++ b/examples/immudb/src/test/java/ImmuDbTest.java
@@ -0,0 +1,63 @@
+import io.codenotary.immudb4j.Entry;
+import io.codenotary.immudb4j.ImmuClient;
+import io.codenotary.immudb4j.exceptions.CorruptedDataException;
+import io.codenotary.immudb4j.exceptions.VerificationException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test class for the ImmuDbClient.
+ */
+public class ImmuDbTest {
+
+    // Default port for the ImmuDb server
+    private static final int IMMUDB_PORT = 3322;
+    // Default username for the ImmuDb server
+    private final String IMMUDB_USER = "immudb";
+    // Default password for the ImmuDb server
+    private final String IMMUDB_PASSWORD = "immudb";
+    // Default database name for the ImmuDb server
+    private final String IMMUDB_DATABASE = "defaultdb";
+
+    // Test container for the ImmuDb database, with the latest version of the image and exposed port
+    @ClassRule
+    public static final GenericContainer<?> immuDbContainer = new GenericContainer<>("codenotary/immudb:1.3")
+        .withExposedPorts(IMMUDB_PORT).waitingFor(
+            Wait.forLogMessage(".*Web API server enabled.*", 1)
+        );
+    // ImmuClient used to interact with the DB
+    private ImmuClient immuClient;
+
+    @Before
+    public void setUp() {
+        this.immuClient = ImmuClient.newBuilder()
+            .withServerUrl(immuDbContainer.getHost())
+            .withServerPort(immuDbContainer.getMappedPort(IMMUDB_PORT))
+            .build();
+        this.immuClient.login(IMMUDB_USER, IMMUDB_PASSWORD);
+        this.immuClient.useDatabase(IMMUDB_DATABASE);
+    }
+
+    @Test
+    public void testGetValue() {
+        try {
+            immuClient.set("test1", "test2".getBytes());
+
+            Entry entry = immuClient.verifiedGet("test1");
+
+            if (entry != null) {
+                byte[] value = entry.getValue();
+                assertThat(new String(value)).isEqualTo("test2");
+            } else {
+                Assert.fail();
+            }
+        } catch (CorruptedDataException | VerificationException e) {
+            Assert.fail();
+        }
+    }
+}
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 7194134350d..2a508013928 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -30,6 +30,7 @@ include 'solr-container'
 include 'spring-boot'
 include 'cucumber'
 include 'spring-boot-kotlin-redis'
+include 'immudb'
 
 ext.isCI = System.getenv("CI") != null
 

From a71b5310185ee69634557557761dfa1ec73a0bee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 17:15:08 +0000
Subject: [PATCH 2265/4969] Bump slf4j-api from 2.0.0 to 2.0.3 in /core

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0...v_2.0.3)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 4072c25db37..e1e38eaeb18 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -61,7 +61,7 @@ configurations.all {
 
 dependencies {
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:2.0.0'
+    api 'org.slf4j:slf4j-api:2.0.3'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'

From a3d94ebf032eeaca9ed3bb5547de48fa405bec19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 01:03:24 +0000
Subject: [PATCH 2266/4969] Bump s3 from 2.17.266 to 2.17.285 in
 /modules/localstack

Bumps s3 from 2.17.266 to 2.17.285.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9759d193475..5ef16b2ca58 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.295'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.313'
-    testImplementation 'software.amazon.awssdk:s3:2.17.266'
+    testImplementation 'software.amazon.awssdk:s3:2.17.285'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 88f23b5fb5bbd25941617b37639f3c2cf852bb27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 01:03:27 +0000
Subject: [PATCH 2267/4969] Bump aws-java-sdk-sqs from 1.12.295 to 1.12.314 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.295 to 1.12.314.
- [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.12.295...1.12.314)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9759d193475..2666932fbbc 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.295'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.313'
     testImplementation 'software.amazon.awssdk:s3:2.17.266'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 3802c2934ded989bb5a433e5d48a5d036a9042f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 01:03:37 +0000
Subject: [PATCH 2268/4969] Bump google-cloud-firestore from 3.4.2 to 3.5.0 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.4.2...v3.5.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 30c11325653..b52e6ea0dd0 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.4'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.11.1'

From a2b1e15f1b008d100fe8b5761a59153a335627ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 01:03:38 +0000
Subject: [PATCH 2269/4969] Bump kafka-clients from 3.2.1 to 3.3.0 in
 /modules/kafka

Bumps kafka-clients from 3.2.1 to 3.3.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index ebd9c84120c..70907510afe 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From d5fe8813f043eda38a5e257f3066bd3520e91314 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 01:03:39 +0000
Subject: [PATCH 2270/4969] Bump cucumber-java from 7.6.0 to 7.8.0 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.6.0 to 7.8.0.
- [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/v7.6.0...v7.8.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 9d0da7a5e33..1b9fe04efd8 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:7.6.0'
+    testImplementation 'io.cucumber:cucumber-java:7.8.0'
     testImplementation 'io.cucumber:cucumber-junit:7.8.0'
     testImplementation 'org.testcontainers:selenium'
 }

From 499f2ce17917e4ac181d08c748fab929014c7912 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 01:03:45 +0000
Subject: [PATCH 2271/4969] Bump google-cloud-spanner from 6.29.0 to 6.31.0 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.29.0 to 6.31.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.29.0...v6.31.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 30c11325653..8be3aab89a5 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.11.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 3aa35988d5e83628846e27f3197b568bde58c5ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 03:52:29 +0000
Subject: [PATCH 2272/4969] Bump google-cloud-bigtable from 2.11.1 to 2.13.0 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.11.1 to 2.13.0.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.11.1...v2.13.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 3258063f5dd..a5a72db0982 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.11.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.13.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From bd6abf933eb383b0d82a805ca49091fb6fdd2f24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 22:00:34 +0000
Subject: [PATCH 2273/4969] Bump aws-java-sdk-s3 from 1.12.313 to 1.12.314 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.313 to 1.12.314.
- [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.12.313...1.12.314)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 b042ee575da..7d263e3e492 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.313'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.314'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.313'

From 554ec64d4aea8aa6ca50fa0bc654ced8057ab195 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 22:00:37 +0000
Subject: [PATCH 2274/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.313 to 1.12.314.
- [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.12.313...1.12.314)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 e9cd2111f82..18ec4a61ac6 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.313'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From f04648425bbc4a7fcf2d26d933e71e30a7886f18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 22:00:39 +0000
Subject: [PATCH 2275/4969] Bump aws-java-sdk-logs from 1.12.313 to 1.12.314 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.313 to 1.12.314.
- [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.12.313...1.12.314)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 b042ee575da..d632c57cbfb 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.313'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.314'
     testImplementation 'software.amazon.awssdk:s3:2.17.285'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From a3889d18f8cd33e40d73bf65b11fd44c8364bdee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 22:01:00 +0000
Subject: [PATCH 2276/4969] Bump actions/cache from 3.0.8 to 3.0.9

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.8 to 3.0.9.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.8...v3.0.9)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 2cdc9f8ed69..527c2eccfeb 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.0.9
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -53,7 +53,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.0.9
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 80f20fb0c0c..f55a5355c4e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.0.9
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -51,7 +51,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.0.9
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From d4c8de272e7a9c358e9066baed82cab097164b42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 22:01:07 +0000
Subject: [PATCH 2277/4969] Bump slf4j-api from 2.0.0 to 2.0.3 in /examples

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0...v_2.0.3)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/immudb/build.gradle                    | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 5ff55a2205a..1d1940cb85b 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.0'
+    compileOnly 'org.slf4j:slf4j-api:2.0.3'
     implementation 'io.codenotary:immudb4j:0.9.10.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index fe230f3a22e..50e38518d39 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.0'
+    compileOnly 'org.slf4j:slf4j-api:2.0.3'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.0'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 799f3f89925..c19dd3a012f 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.0'
+    compileOnly 'org.slf4j:slf4j-api:2.0.3'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 1d840f11871..82197ddc9b5 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.0'
+    compileOnly 'org.slf4j:slf4j-api:2.0.3'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index d540a8386ab..9c56d53faa3 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:2.0.0'
+    compileOnly 'org.slf4j:slf4j-api:2.0.3'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:testcontainers'

From 38e6cc18d77d4cc7b58da1842508142539955795 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 22:04:24 +0000
Subject: [PATCH 2278/4969] Bump azure-cosmos from 4.36.0 to 4.37.0 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.36.0 to 4.37.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.36.0...azure-cosmos_4.37.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 43280db4a88..78c6500d856 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.36.0'
+    testImplementation 'com.azure:azure-cosmos:4.37.0'
 }

From 2798d3403b9099b9bc4253f71ed2f4840a966e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 3 Oct 2022 09:23:22 -0500
Subject: [PATCH 2279/4969] Bump kotlin plugins version to 1.7.20 (#5945)

---
 examples/spring-boot-kotlin-redis/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 6a98573172c..c0ec19f203c 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.7.4"
-    id("org.jetbrains.kotlin.jvm") version "1.7.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"
+    id("org.jetbrains.kotlin.jvm") version "1.7.20"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.7.20"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 318bfc6833482c39f663cdbb0cceaecf46b87202 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 14:31:09 +0000
Subject: [PATCH 2280/4969] Bump javassist from 3.29.0-GA to 3.29.2-GA in
 /modules/hivemq

Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.29.0-GA to 3.29.2-GA.
- [Release notes](https://github.com/jboss-javassist/javassist/releases)
- [Changelog](https://github.com/jboss-javassist/javassist/blob/master/Changes.md)
- [Commits](https://github.com/jboss-javassist/javassist/commits)

---
updated-dependencies:
- dependency-name: org.javassist:javassist
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index a12b3866e4d..1da5ce69645 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     shaded("org.apache.commons:commons-lang3:3.12.0")
     shaded("commons-io:commons-io:2.11.0")
-    shaded("org.javassist:javassist:3.29.0-GA")
+    shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.2")

From 03de1ce271fab9f4499097a9ed81cdee5e575450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 3 Oct 2022 12:44:00 -0500
Subject: [PATCH 2281/4969] Fix example docs links

---
 docs/examples.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/examples.md b/docs/examples.md
index cd85226e4be..e7578c8b375 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -2,15 +2,15 @@
 
 Examples of different use cases provided by Testcontainers can be found below:
 
-- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/kafka-cluster)
-- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/linked-container)
-- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/master/examples/neo4j-container)
-- [Redis](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache)
-- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/selenium-container)
-- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
-- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/master/examples/singleton-container)
-- [Solr](https://github.com/testcontainers/testcontainers-java/tree/master/examples/solr-container)
-- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot)
-- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot-kotlin-redis)
-- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache-testng)
-- [ImmuDb](https://github.com/testcontainers/testcontainers-java/tree/master/examples/immudb)
+- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/kafka-cluster)
+- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/linked-container)
+- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/main/examples/neo4j-container)
+- [Redis](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache)
+- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/main/examples/selenium-container)
+- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/main/examples/cucumber)
+- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/main/examples/singleton-container)
+- [Solr](https://github.com/testcontainers/testcontainers-java/tree/main/examples/solr-container)
+- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot)
+- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot-kotlin-redis)
+- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache-testng)
+- [ImmuDb](https://github.com/testcontainers/testcontainers-java/tree/main/examples/immudb)

From a8ec3e6da1c236b25bfba8d071c27ebbe57e938a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 3 Oct 2022 12:47:25 -0500
Subject: [PATCH 2282/4969] Fix main branch name in ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f55a5355c4e..b406f256ae2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request: {}
-  push: { branches: [ maing ] }
+  push: { branches: [ main ] }
 
 permissions:
   contents: read

From c2a741d3b77531fe196025b559d0ad2fb655993e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 3 Oct 2022 13:35:08 -0500
Subject: [PATCH 2283/4969] Bump logback-classic versions (#5948)

`ch.qos.logback:logback-classic` 1.3.x is compatible with slf4j 2.x.
Currently, logs are not displayed.
---
 build.gradle                                    | 2 +-
 docs/examples/spock/redis/build.gradle          | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 modules/hivemq/build.gradle                     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index a53bd19298d..9e6aa6020e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,7 +125,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.3'
     }
 
     spotless {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 1bff637a7fb..6699788d026 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     api "io.lettuce:lettuce-core:5.2.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 08d3734a956..5212bc33fa9 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 50e38518d39..297bcb5143f 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index c19dd3a012f..8e3394723ba 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
     testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 82197ddc9b5..ed794088790 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 9c56d53faa3..3ef81b866d4 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:2.0.3'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index a12b3866e4d..3d6b653f6d1 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.9.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.4.1")
+    testImplementation("ch.qos.logback:logback-classic:1.4.3")
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
 }

From abf87abcae037e4ddf124c888c21e2a8a65180a8 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:23:50 +0200
Subject: [PATCH 2284/4969] Rollback back to slf4j-api 1.7.36 (#5951)

Reverts #5794, #5942, #5875, #5848, #5794, #5791
---
 core/build.gradle                               | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 test-support/build.gradle                       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index c20ebc1d9b0..2967b35d4ff 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -61,7 +61,7 @@ configurations.all {
 
 dependencies {
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:2.0.3'
+    api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 1d1940cb85b..b2e6fcdba43 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.3'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'io.codenotary:immudb4j:0.9.10.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 297bcb5143f..cf3a3331cc3 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -6,7 +6,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.3'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.0'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 8e3394723ba..2e4bda4fa74 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.3'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index ed794088790..eb684158731 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:2.0.3'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 3ef81b866d4..449fd9ae8e6 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:2.0.3'
+    compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.3'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 2fae2344a89..8247f97dbf4 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
-    implementation 'org.slf4j:slf4j-api:2.0.0'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 320a6203227f93ed138ea905105fa422346c80fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 4 Oct 2022 11:14:25 -0500
Subject: [PATCH 2285/4969] Ignore dependencies in specific modules (#5946)

Some dependencies require Java 11, 17 or have a breaking change such
as r2dbc.
---
 .github/dependabot.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4c270ef762c..87ce5c86463 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,6 +11,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.slf4j:slf4j-api"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
@@ -32,6 +35,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.dropwizard.metrics:metrics-core"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/clickhouse"
     schedule:
@@ -97,6 +103,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.apache.tomcat:tomcat-jdbc"
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/modules/junit-jupiter"
     schedule:
@@ -107,6 +116,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
@@ -122,6 +134,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.mariadb:r2dbc-mariadb"
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/modules/mockserver"
     schedule:
@@ -147,6 +162,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.neo4j.driver:neo4j-java-driver"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/nginx"
     schedule:
@@ -182,6 +200,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.r2dbc:r2dbc-spi"
+        versions: ["0.8.x"]
   - package-ecosystem: "gradle"
     directory: "/modules/rabbitmq"
     schedule:
@@ -202,6 +223,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.apache.solr:solr-solrj"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/spock"
     schedule:
@@ -234,6 +258,17 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "ch.qos.logback:logback-classic"
+        update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "org.apache.solr:solr-solrj"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.neo4j.driver:neo4j-java-driver"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.testng:testng"
+        update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "org.slf4j:slf4j-api"
+        update-types: [ "version-update:semver-major" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From a6ceeba0b15d66e2f2b901ac56b43fc84e9815ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:14:55 +0000
Subject: [PATCH 2286/4969] Bump metrics-core from 3.2.4 to 3.2.6 in
 /modules/cassandra

Bumps [metrics-core](https://github.com/dropwizard/metrics) from 3.2.4 to 3.2.6.
- [Release notes](https://github.com/dropwizard/metrics/releases)
- [Commits](https://github.com/dropwizard/metrics/compare/v3.2.4...v3.2.6)

---
updated-dependencies:
- dependency-name: io.dropwizard.metrics:metrics-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index ae115c92a71..7f9ab53c71b 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: Cassandra"
 
 configurations.all {
     resolutionStrategy {
-        force 'io.dropwizard.metrics:metrics-core:3.2.4'
+        force 'io.dropwizard.metrics:metrics-core:3.2.6'
     }
 }
 

From 461c23d6c65b769f42b5d18077e9b38130dde0bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:14:56 +0000
Subject: [PATCH 2287/4969] Bump mongodb-driver-sync from 4.7.1 to 4.7.2 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.7.1...r4.7.2)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 6e4b5208298..cc4a9288373 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.7.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.7.2")
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c4658989068d3c555fdff9b398c490d300a9a5d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:16:06 +0000
Subject: [PATCH 2288/4969] Bump solr-solrj from 8.11.1 to 8.11.2 in
 /modules/solr

Bumps solr-solrj from 8.11.1 to 8.11.2.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 72ab2997dea..8d053fa4169 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'org.apache.solr:solr-solrj:8.11.1'
+    testImplementation 'org.apache.solr:solr-solrj:8.11.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c0758a2bf6c1f1ccf7154c9c337fc5aa1cdc9a52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:16:08 +0000
Subject: [PATCH 2289/4969] Bump solr-solrj from 8.11.1 to 8.11.2 in /examples

Bumps solr-solrj from 8.11.1 to 8.11.2.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 56fd297cf5e..dd0f7007689 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.24"
     annotationProcessor "org.projectlombok:lombok:1.18.24"
 
-    implementation 'org.apache.solr:solr-solrj:8.11.1'
+    implementation 'org.apache.solr:solr-solrj:8.11.2'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From c65fc31df0620347e7e4236e8714b18ba52c14d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 4 Oct 2022 13:43:29 -0500
Subject: [PATCH 2290/4969] Update latest version in mkdocs.yml

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index ab57aeb11d6..3a802d4ec91 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -108,4 +108,4 @@ nav:
           - contributing_docs.md
           - bounty.md
 extra:
-    latest_version: 1.17.4
+    latest_version: 1.17.5

From b1fa4ece54a4d13e67d20a3db123c98230451f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 4 Oct 2022 13:44:04 -0500
Subject: [PATCH 2291/4969] Upgrade testcontainers version to 1.17.5 in japicmp

---
 gradle/japicmp.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index 6d769bf9286..ed4223324ab 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-    baseline "org.testcontainers:${project.name}:1.17.4", {
+    baseline "org.testcontainers:${project.name}:1.17.5", {
         exclude group: "*", module: "*"
     }
 }

From f5e79b9aab308acc0211fca4bd0d00ab9b57cbd6 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Dolling <JanHendrikDolling@users.noreply.github.com>
Date: Tue, 4 Oct 2022 22:08:46 +0200
Subject: [PATCH 2292/4969] Remove unnecessary configuration from simple tests
 (#5973)

* Remove mysql configuration from simple test
* mysql custom ini file test also runs on Windows

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../java/org/testcontainers/junit/mysql/SimpleMySQLTest.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index f60712e7123..e39c55b85a9 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.junit.mysql;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +20,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.junit.Assume.assumeFalse;
 
 public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
@@ -48,7 +46,6 @@ public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
     public void testSimple() throws SQLException {
         try (
             MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
-                .withConfigurationOverride("somepath/mysql_conf_override")
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
             mysql.start();
@@ -81,8 +78,6 @@ public void testSpecificVersion() throws SQLException {
 
     @Test
     public void testMySQLWithCustomIniFile() throws SQLException {
-        assumeFalse(SystemUtils.IS_OS_WINDOWS);
-
         try (
             MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")

From 2de82d96b38bb163941b64326f6286e8a4dce02d Mon Sep 17 00:00:00 2001
From: "K. Siva Prasad Reddy" <sivaprasadreddy.k@gmail.com>
Date: Wed, 5 Oct 2022 05:47:34 +0530
Subject: [PATCH 2293/4969] Update MockServer Tests to use
 mockserver/mockserver image with 5.14.0 version (#5977)

Fixes #5975
---
 modules/mockserver/build.gradle                             | 2 +-
 .../containers/MockServerContainerRuleTest.java             | 6 ++++--
 .../testcontainers/containers/MockServerContainerTest.java  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index df46295df21..85e7aaa181e 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MockServer"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.mock-server:mockserver-client-java:5.13.2'
+    testImplementation 'org.mock-server:mockserver-client-java:5.14.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index 0e4fa102b2e..7fdacd7c580 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -12,12 +12,14 @@
 public class MockServerContainerRuleTest {
 
     public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
-        "jamesdbloom/mockserver:mockserver-5.13.2"
+        "mockserver/mockserver:mockserver-5.14.0"
     );
 
     // creatingProxy {
     @Rule
-    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
+    public MockServerContainer mockServer = new MockServerContainer(
+        MOCKSERVER_IMAGE.withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion())
+    );
 
     // }
 
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index 6ddce4b6cbf..b59f14cc27b 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -11,7 +11,7 @@
 public class MockServerContainerTest {
 
     public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
-        "jamesdbloom/mockserver:mockserver-5.5.4"
+        "mockserver/mockserver:mockserver-5.14.0"
     );
 
     @Test
@@ -40,7 +40,7 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
     @Test
     public void newVersionStartsWithDefaultWaitStrategy() {
-        DockerImageName dockerImageName = DockerImageName.parse("mockserver/mockserver:mockserver-5.11.2");
+        DockerImageName dockerImageName = DockerImageName.parse("mockserver/mockserver:mockserver-5.14.0");
         try (MockServerContainer mockServer = new MockServerContainer(dockerImageName)) {
             mockServer.start();
         }

From 478b0492ea1526a2941ef714f9c9c7c4bcbb57a9 Mon Sep 17 00:00:00 2001
From: Etienne Dysli Metref <edysli@users.noreply.github.com>
Date: Thu, 6 Oct 2022 01:54:39 +0200
Subject: [PATCH 2294/4969] Update docs about logging configuration (#5976)

* Recommend disabling Apache HTTP client wire logging
* Recommend enabling debug logging only for org.testcontainers

Fixes #4913

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/supported_docker_environment/logging_config.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/supported_docker_environment/logging_config.md b/docs/supported_docker_environment/logging_config.md
index 5c7abcd211c..3e4660e85ae 100644
--- a/docs/supported_docker_environment/logging_config.md
+++ b/docs/supported_docker_environment/logging_config.md
@@ -18,5 +18,14 @@ should be included in your classpath to show a reasonable level of log output:
 
     <logger name="org.testcontainers" level="INFO"/>
     <logger name="com.github.dockerjava" level="WARN"/>
+    <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
 </configuration>
 ```
+
+In order to troubleshoot issues with Testcontainers, increase the logging level of `org.testcontainers` to `DEBUG`:
+
+```xml
+<logger name="org.testcontainers" level="DEBUG"/>
+```
+
+Avoid changing the root logger's level to `DEBUG`, because this turns on debug logging for every package whose level isn't explicitly configured here, resulting in a large amount of log data.

From 09c42a488b2ee1fb010213976fe9621c17d461c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 6 Oct 2022 13:13:13 -0500
Subject: [PATCH 2295/4969] Add reference to supported languages (#5979)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/supported_languages.md | 9 +++++++++
 mkdocs.yml                  | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 docs/supported_languages.md

diff --git a/docs/supported_languages.md b/docs/supported_languages.md
new file mode 100644
index 00000000000..4990559f0e7
--- /dev/null
+++ b/docs/supported_languages.md
@@ -0,0 +1,9 @@
+# Other Supported Languages
+
+Besides *Testcontainers for Java,* you can find Testcontainers implementations for many other languages.
+Please note that not all features that are available in *Testcontainers for Java* might be available in the implementations for other languages yet.
+
+* [Go](https://golang.testcontainers.org/)
+* [.Net](https://github.com/testcontainers/testcontainers-dotnet)
+* [Python](https://testcontainers-python.readthedocs.io/)
+* [JavaScript/NodeJS](https://github.com/testcontainers/testcontainers-node)
diff --git a/mkdocs.yml b/mkdocs.yml
index 3a802d4ec91..70421761e02 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -102,6 +102,7 @@ nav:
           - supported_docker_environment/windows.md
           - supported_docker_environment/logging_config.md
           - supported_docker_environment/image_registry_rate_limiting.md
+    - Other Supported Languages: supported_languages.md
     - Getting help: getting_help.md
     - Contributing:
           - contributing.md

From 914769f56a1b5b9c66d4419e6b1ca0e178cef399 Mon Sep 17 00:00:00 2001
From: Priyambada Roul <75459506+roulpriya@users.noreply.github.com>
Date: Mon, 10 Oct 2022 23:06:01 +0530
Subject: [PATCH 2296/4969] Do not allow empty env vars (#5983)

Fixes #5026

Signed-off-by: Priyambada Roul <roulpriyambada@gmail.com>
---
 .../utility/TestcontainersConfiguration.java              | 5 ++++-
 .../utility/TestcontainersConfigurationTest.java          | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index e647a8d50b3..f3bb8f8319a 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -230,7 +230,10 @@ private String getConfigurable(
         }
 
         if (environment.containsKey(envVarName)) {
-            return environment.get(envVarName);
+            String value = environment.get(envVarName);
+            if (!value.isEmpty()) {
+                return value;
+            }
         }
 
         for (final Properties properties : propertiesSources) {
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index d51bc89348c..fcc0a654ef5 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -126,6 +126,14 @@ public void shouldReadDockerSettingsFromUserProperties() {
             .isEqualTo("some value");
     }
 
+    @Test
+    public void shouldNotReadSettingIfCorrespondingEnvironmentVarIsEmptyString() {
+        environment.put("DOCKER_FOO", "");
+        assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
+            .as("reads unprefixed env vars for docker. settings")
+            .isEqualTo("default");
+    }
+
     @Test
     public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
         String currentValue = newConfig().getDockerClientStrategyClassName();

From 75ac1d1ff5e14a0306f981288d5736d275970d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 11 Oct 2022 20:56:26 -0500
Subject: [PATCH 2297/4969] Upgrade python version to 3.8

---
 docker-compose.yml        | 2 +-
 docs/contributing_docs.md | 2 +-
 runtime.txt               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1ce5532d0bd..bfb6bdc35fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   docs:
-    image: python:3.7
+    image: python:3.8
     command: sh -c "pip install -r requirements.txt && mkdocs serve -a 0.0.0.0:8000"
     working_dir: /docs
     volumes:
diff --git a/docs/contributing_docs.md b/docs/contributing_docs.md
index 2d706dfe407..c303fe6b06c 100644
--- a/docs/contributing_docs.md
+++ b/docs/contributing_docs.md
@@ -15,7 +15,7 @@ The root of the project contains a `docker-compose.yml` file. Simply run `docker
 
 ### Using Python locally
 
-* Ensure that you have Python 3.7.0 or higher.
+* Ensure that you have Python 3.8.0 or higher.
 * Set up a virtualenv and run `pip install -r requirements.txt` in the `testcontainers-java` root directory.
 * Once Python dependencies have been installed, run `mkdocs serve` to start a local auto-updating MkDocs server.
 
diff --git a/runtime.txt b/runtime.txt
index 475ba515c04..cc1923a40b1 100644
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-3.7
+3.8

From 2da2675c1b9b13d7fde985c00001105b800a84ce Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 12 Oct 2022 11:50:26 +0200
Subject: [PATCH 2298/4969] Add paragraph about Docker requirements to docs
 (#5987)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/supported_docker_environment/index.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index debca47e574..885325545ff 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -2,6 +2,15 @@
 
 ## Overview
 
+Testcontainers requires a Docker-API compatible container runtime. 
+During development, Testcontainers is actively tested against recent versions of Docker on Linux, as well as against Docker Desktop on Mac and Windows. 
+These Docker environments are automatically detected and used by Testcontainers without any additional configuration being necessary.
+
+It is possible to configure Testcontainers to work for other Docker setups, such as a remote Docker host or Docker alternatives. 
+However, these are not actively tested in the main development workflow, so not all Testcontainers features might be available and additional manual configuration might be necessary. 
+If you have further questions about configuration details for your setup or whether it supports running Testcontainers-based tests, 
+please contact the Testcontainers team and other users from the Testcontainers community on [Slack](https://slack.testcontainers.org/).
+
 | Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                 |
 |-------------------------------------|-----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Linux - general                     | Docker v17.09              | After docker installation, follow [post-installation steps](https://docs.docker.com/engine/install/linux-postinstall/).                                                                             |

From 96acaf02721c5dbf543ff2b166366a190df57cfa Mon Sep 17 00:00:00 2001
From: Ammar Khaku <akhaku@users.noreply.github.com>
Date: Fri, 14 Oct 2022 08:59:59 -0700
Subject: [PATCH 2299/4969] Catch and ignore more errors when reflecting into
 container subclass (#5990)

With #2830 we added support for 4.x of the Cassandra driver.
It was done in a way to allow a user to use either the 3.x
or 4.x driver while excluding the other one. However if
using 4.x and excluding 3.x, GenericContainer#canBeReused
throws an exception during reflection since the Cluster
class returned by CassandraContainer#getCluster is missing.

This PR works around that issue by catching and ignoring
the thrown NoClassDefFoundError.
---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 7163ea40a93..bc65cb22040 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -360,7 +360,7 @@ protected boolean canBeReused() {
                     logger().warn("{} can't be reused because it overrides {}", getClass(), method.getName());
                     return false;
                 }
-            } catch (NoSuchMethodException e) {
+            } catch (NoSuchMethodException | NoClassDefFoundError e) {
                 // ignore
             }
         }

From 00c5e88562e50f3337d43a3d193669a5fdbac61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 18 Oct 2022 08:12:30 -0500
Subject: [PATCH 2300/4969] Remove Transferable#of(java.lang.String,int) for
 japicmp (#5992)

`Transferable#of(java.lang.String,int)` was introduced in version
1.17.4. Current builds will check against 1.17.5 and binary
compatibility will be fine.
---
 core/build.gradle | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2967b35d4ff..364f51b6b70 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -113,9 +113,3 @@ tasks.generatePomFileForMavenJavaPublication.finalizedBy(
         ]
     }
 )
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.images.builder.Transferable#of(java.lang.String,int)"
-    ]
-}

From 077c84405486e061a31d585b8ffa5c2d3ea0b7c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 19 Oct 2022 02:27:21 -0500
Subject: [PATCH 2301/4969] Deprecate `setCustomContent` and
 `withCustomContent` at `NginxContainer` (#5997)

In order to make `NginxContainer` friendly with remote environments,
we should avoid the use of `addFileSystemBind`. Example has been updated
in order to show how to do it.
---
 .../java/org/testcontainers/containers/NginxContainer.java     | 2 ++
 .../test/java/org/testcontainers/junit/SimpleNginxTest.java    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index b97992a5684..1bf951af7c8 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -56,10 +56,12 @@ public URL getBaseUrl(String scheme, int port) throws MalformedURLException {
         return new URL(scheme + "://" + getHost() + ":" + getMappedPort(port));
     }
 
+    @Deprecated
     public void setCustomContent(String htmlContentPath) {
         addFileSystemBind(htmlContentPath, "/usr/share/nginx/html", BindMode.READ_ONLY);
     }
 
+    @Deprecated
     public SELF withCustomContent(String htmlContentPath) {
         this.setCustomContent(htmlContentPath);
         return self();
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index abfbb663207..d338ebf180b 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -7,6 +7,7 @@
 import org.testcontainers.containers.NginxContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
 import java.io.*;
 import java.net.URL;
@@ -26,7 +27,7 @@ public class SimpleNginxTest {
     // creatingContainer {
     @Rule
     public NginxContainer<?> nginx = new NginxContainer<>(NGINX_IMAGE)
-        .withCustomContent(tmpDirectory)
+        .withCopyFileToContainer(MountableFile.forHostPath(tmpDirectory), "/usr/share/nginx/html")
         .waitingFor(new HttpWaitStrategy());
 
     // }

From 0b0e559141c5b83eaeb8ee89b143b5d28cbc3136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 19 Oct 2022 02:27:36 -0500
Subject: [PATCH 2302/4969] Update toxiproxy image to ghcr.io/shopify/toxiproxy
 (#5996)

`shopify/toxiproxy` has moved to `ghcr.io/shopify/toxiproxy`. Currently,
our tests are using the prior and is display as part of the documentation.
In order to keep our tests and docs up-to-date with latest images
we are updating the image. Also, we are adding the proper configuration
for logging in this module.
---
 .../testcontainers/containers/ToxiproxyTest.java |  2 +-
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 modules/toxiproxy/src/test/resources/logback-test.xml

diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index bfe488eaac1..25a0feccc48 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -35,7 +35,7 @@ public class ToxiproxyTest {
         .withExposedPorts(6379)
         .withNetwork(network);
 
-    private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("shopify/toxiproxy:2.1.0");
+    private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.5.0");
 
     // Toxiproxy container, which will be used as a TCP proxy
     @Rule
diff --git a/modules/toxiproxy/src/test/resources/logback-test.xml b/modules/toxiproxy/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/toxiproxy/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From d1864a466b294296bca00368fd904d78c3a78057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 20 Oct 2022 07:54:15 -0500
Subject: [PATCH 2303/4969] Fix dependabot.yml ignore section (#5999)

---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 87ce5c86463..46c7046300d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -118,7 +118,7 @@ updates:
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
-        update-types: [ "version-update:semver-minor" ]
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
@@ -202,7 +202,7 @@ updates:
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "io.r2dbc:r2dbc-spi"
-        versions: ["0.8.x"]
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/modules/rabbitmq"
     schedule:

From cf1573e4ffab1f302141d5bda20d23ecaba5b148 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:49 +0000
Subject: [PATCH 2304/4969] Bump tomcat-jdbc from 10.0.23 to 10.0.27 in
 /modules/jdbc-test

Bumps tomcat-jdbc from 10.0.23 to 10.0.27.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f8b55d01bc5..798508ffa22 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.23.1'
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.23'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.30'
 }

From 5ee6fd38cf3b4a2940cd399d4a3a662f3d5ec3e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:49 +0000
Subject: [PATCH 2305/4969] Bump mysql-connector-java from 8.0.30 to 8.0.31 in
 /modules/mysql

Bumps mysql-connector-java from 8.0.30 to 8.0.31.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 87887384973..a18941ab9f7 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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.30'
+    testImplementation 'mysql:mysql-connector-java:8.0.31'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From c8ec550ec6278d28cb3e5abcaf376292d2e9920c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:49 +0000
Subject: [PATCH 2306/4969] Bump tomcat-jdbc from 10.1.0 to 10.1.1 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.1.0 to 10.1.1.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 7a0fbf03fc1..92f72287fa2 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.0'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.1'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation ('org.mockito:mockito-core:4.8.0') {

From ceee70954ad8f32252925ff415e6f616b0f3aff3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:51 +0000
Subject: [PATCH 2307/4969] Bump reactor-core from 3.4.23 to 3.4.24 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.23 to 3.4.24.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.23...v3.4.24)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 9126ff0a347..952c9f5b982 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.23'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.24'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From d47b1ca51898e01d3002e76ac6fd6a2f2c6a6502 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:51 +0000
Subject: [PATCH 2308/4969] Bump mysql-connector-java from 8.0.30 to 8.0.31 in
 /modules/spock

Bumps mysql-connector-java from 8.0.30 to 8.0.31.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a13a7049e13..e202b07f411 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
 
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
 }

From b260332e1221363aa5b2bd3139460f6b65485ce0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:51 +0000
Subject: [PATCH 2309/4969] Bump jedis from 4.2.3 to 4.3.1 in
 /modules/junit-jupiter

Bumps [jedis](https://github.com/redis/jedis) from 4.2.3 to 4.3.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.2.3...v4.3.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e801e54ab83..496c273fbde 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.2.3'
+    testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:4.8.0') {
         exclude(module: 'hamcrest-core')

From 46a4edc16b065f9693a5c754670376e9e5d34467 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:52 +0000
Subject: [PATCH 2310/4969] Bump mysql-connector-java in /modules/junit-jupiter

Bumps mysql-connector-java from 8.0.30 to 8.0.31.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e801e54ab83..2819985921d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 

From 5e23c5e8e680b6ddbda496d4b102bae08f7092ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:52 +0000
Subject: [PATCH 2311/4969] Bump pulsar-client-admin from 2.10.1 to 2.10.2 in
 /modules/pulsar

Bumps [pulsar-client-admin](https://github.com/apache/pulsar) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.10.1...v2.10.2)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 8bc139a3a93..c15fc32730e 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.1'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.2'
 }

From aa597b8ed501b6dbda20c06fbe0b42c0b5264b89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:54 +0000
Subject: [PATCH 2312/4969] Bump mysql-connector-java from 8.0.30 to 8.0.31 in
 /modules/tidb

Bumps mysql-connector-java from 8.0.30 to 8.0.31.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 36f6acfe806..92f4aa408d3 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.30'
+    testImplementation 'mysql:mysql-connector-java:8.0.31'
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 070f670a0f7f9c1c4a61c6c1974e42cea41e15c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:58 +0000
Subject: [PATCH 2313/4969] Bump mysql-connector-java from 8.0.21 to 8.0.31 in
 /examples

Bumps mysql-connector-java from 8.0.21 to 8.0.31.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index da4697a4543..9c3edd6fe27 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation project(":selenium")
     testImplementation project(":mysql")
 
-    testImplementation 'mysql:mysql-connector-java:8.0.21'
+    testImplementation 'mysql:mysql-connector-java:8.0.31'
     testImplementation "org.seleniumhq.selenium:selenium-api:3.141.59"
     testImplementation 'org.assertj:assertj-core:3.15.0'
 }

From 852ed7838b1a2d49bca12b6eaf3fcefd7bb82ad8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:54:59 +0000
Subject: [PATCH 2314/4969] Bump pulsar-client from 2.10.1 to 2.10.2 in
 /modules/pulsar

Bumps [pulsar-client](https://github.com/apache/pulsar) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.10.1...v2.10.2)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 8bc139a3a93..fd015a9121f 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.1'
 }

From 5e090c2984fb461fa26d76e14f54f46254dc7b6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:55:00 +0000
Subject: [PATCH 2315/4969] Bump actions/cache from 3.0.9 to 3.0.11

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.9 to 3.0.11.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.9...v3.0.11)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 527c2eccfeb..16b6d5249c7 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.9
+        uses: actions/cache@v3.0.11
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -53,7 +53,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.9
+        uses: actions/cache@v3.0.11
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b406f256ae2..25723b20ef0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.9
+        uses: actions/cache@v3.0.11
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -51,7 +51,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.9
+        uses: actions/cache@v3.0.11
         continue-on-error: true
         with:
           path: ~/.gradle/caches

From c745c8f7256ca3852165b631e7919009bb926c5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:55:03 +0000
Subject: [PATCH 2316/4969] Bump peter-evans/create-pull-request from 4.1.3 to
 4.2.0

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f...b4d51739f96fca8047ad065eccef63442d8e99f7)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index f40b5f41483..53ac0ae9b9a 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f # v3.10.1
+        uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From 7f39a39147eff17b5daed4f29419104cf21321b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 13:55:48 +0000
Subject: [PATCH 2317/4969] Bump release-drafter/release-drafter from 5.21.0 to
 5.21.1

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.21.0 to 5.21.1.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/df69d584deac33d8569990cb6413f82447181076...6df64e4ba4842c203c604c1f45246c5863410adb)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index fca7465637f..df1a05c8441 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@df69d584deac33d8569990cb6413f82447181076 # v5.19.0
+      - uses: release-drafter/release-drafter@6df64e4ba4842c203c604c1f45246c5863410adb # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 64bb21083001d41bb13b1c73fd2df4f44718a529 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:22:42 +0000
Subject: [PATCH 2318/4969] Bump junit-jupiter-params from 5.4.2 to 5.9.1 in
 /examples

Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.4.2 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 72b943adc23..3701d9699e9 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.4.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From f9edf87f7a02926c6ceaa1cf2ce05ac30842b195 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 21 Oct 2022 18:14:44 +0200
Subject: [PATCH 2319/4969] Remove unused Pipfiles (#6046)

---
 Pipfile      |  15 ---
 Pipfile.lock | 314 ---------------------------------------------------
 2 files changed, 329 deletions(-)
 delete mode 100644 Pipfile
 delete mode 100644 Pipfile.lock

diff --git a/Pipfile b/Pipfile
deleted file mode 100644
index 2236de86daf..00000000000
--- a/Pipfile
+++ /dev/null
@@ -1,15 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-
-[packages]
-mkdocs = "*"
-mkdocs-codeinclude-plugin = "*"
-mkdocs-material = "*"
-mkdocs-markdownextradata-plugin = "*"
-
-[requires]
-python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
deleted file mode 100644
index 7dad511e377..00000000000
--- a/Pipfile.lock
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "d3830267ea93391a077a2ba5b93aa8218c0a38002694b404b56df11498da3e56"
-        },
-        "pipfile-spec": 6,
-        "requires": {
-            "python_version": "3.7"
-        },
-        "sources": [
-            {
-                "name": "pypi",
-                "url": "https://pypi.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {
-        "click": {
-            "hashes": [
-                "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3",
-                "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==8.0.3"
-        },
-        "ghp-import": {
-            "hashes": [
-                "sha256:5f8962b30b20652cdffa9c5a9812f7de6bcb56ec475acac579807719bf242c46",
-                "sha256:947b3771f11be850c852c64b561c600fdddf794bab363060854c1ee7ad05e071"
-            ],
-            "version": "==2.0.2"
-        },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100",
-                "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==4.8.2"
-        },
-        "jinja2": {
-            "hashes": [
-                "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8",
-                "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.0.3"
-        },
-        "markdown": {
-            "hashes": [
-                "sha256:76df8ae32294ec39dcf89340382882dfa12975f87f45c3ed1ecdb1e8cefc7006",
-                "sha256:9923332318f843411e9932237530df53162e29dc7a4e2b91e35764583c46c9a3"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.3.6"
-        },
-        "markupsafe": {
-            "hashes": [
-                "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298",
-                "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64",
-                "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b",
-                "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194",
-                "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567",
-                "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff",
-                "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724",
-                "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74",
-                "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646",
-                "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35",
-                "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6",
-                "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a",
-                "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6",
-                "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad",
-                "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26",
-                "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38",
-                "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac",
-                "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7",
-                "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6",
-                "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047",
-                "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75",
-                "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f",
-                "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b",
-                "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135",
-                "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8",
-                "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a",
-                "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a",
-                "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1",
-                "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9",
-                "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864",
-                "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914",
-                "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee",
-                "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f",
-                "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18",
-                "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8",
-                "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2",
-                "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d",
-                "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b",
-                "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b",
-                "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86",
-                "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6",
-                "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f",
-                "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb",
-                "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833",
-                "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28",
-                "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e",
-                "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415",
-                "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902",
-                "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f",
-                "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d",
-                "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9",
-                "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d",
-                "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145",
-                "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066",
-                "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c",
-                "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1",
-                "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a",
-                "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207",
-                "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f",
-                "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53",
-                "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd",
-                "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134",
-                "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85",
-                "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9",
-                "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5",
-                "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94",
-                "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509",
-                "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51",
-                "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==2.0.1"
-        },
-        "mergedeep": {
-            "hashes": [
-                "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8",
-                "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==1.3.4"
-        },
-        "mkdocs": {
-            "hashes": [
-                "sha256:89f5a094764381cda656af4298727c9f53dc3e602983087e1fe96ea1df24f4c1",
-                "sha256:a1fa8c2d0c1305d7fc2b9d9f607c71778572a8b110fb26642aa00296c9e6d072"
-            ],
-            "index": "pypi",
-            "version": "==1.2.3"
-        },
-        "mkdocs-codeinclude-plugin": {
-            "hashes": [
-                "sha256:5d74bd4c1be8e64d71137c1ef1d27a0f9822d3d9ecb2af658d2af7664568a923",
-                "sha256:a94be142e27ef4a70d8ecc702c21d9596304e06d382d86b39a10ffe8b0375887"
-            ],
-            "index": "pypi",
-            "version": "==0.2.0"
-        },
-        "mkdocs-markdownextradata-plugin": {
-            "hashes": [
-                "sha256:64d1c966b288d653f51f7531c03204eb988d0d77e56055c9d703d99105259a36"
-            ],
-            "index": "pypi",
-            "version": "==0.0.5"
-        },
-        "mkdocs-material": {
-            "hashes": [
-                "sha256:524debb6ee8ee89cee08886f2a67c3c3875c0ee9579c598d7448cbd2607cd3b7",
-                "sha256:62ae84082fa9f077c86b7db63e7bedf392005041b451defc850f8d0887a11e91"
-            ],
-            "index": "pypi",
-            "version": "==3.2.0"
-        },
-        "packaging": {
-            "hashes": [
-                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
-                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==21.3"
-        },
-        "pygments": {
-            "hashes": [
-                "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380",
-                "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"
-            ],
-            "markers": "python_version >= '3.5'",
-            "version": "==2.10.0"
-        },
-        "pymdown-extensions": {
-            "hashes": [
-                "sha256:74247f2c80f1d9e3c7242abe1c16317da36c6f26c7ad4b8a7f457f0ec20f0365",
-                "sha256:b03e66f91f33af4a6e7a0e20c740313522995f69a03d86316b1449766c473d0e"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==9.1"
-        },
-        "pyparsing": {
-            "hashes": [
-                "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4",
-                "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.0.6"
-        },
-        "python-dateutil": {
-            "hashes": [
-                "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
-                "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==2.8.2"
-        },
-        "pyyaml": {
-            "hashes": [
-                "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",
-                "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b",
-                "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57",
-                "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b",
-                "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4",
-                "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07",
-                "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba",
-                "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9",
-                "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287",
-                "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513",
-                "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0",
-                "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0",
-                "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92",
-                "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f",
-                "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2",
-                "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc",
-                "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c",
-                "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86",
-                "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4",
-                "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c",
-                "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34",
-                "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b",
-                "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c",
-                "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb",
-                "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737",
-                "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3",
-                "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d",
-                "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53",
-                "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78",
-                "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803",
-                "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a",
-                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
-                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==6.0"
-        },
-        "pyyaml-env-tag": {
-            "hashes": [
-                "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb",
-                "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.1"
-        },
-        "six": {
-            "hashes": [
-                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
-                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.16.0"
-        },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e",
-                "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==4.0.1"
-        },
-        "watchdog": {
-            "hashes": [
-                "sha256:25fb5240b195d17de949588628fdf93032ebf163524ef08933db0ea1f99bd685",
-                "sha256:3386b367e950a11b0568062b70cc026c6f645428a698d33d39e013aaeda4cc04",
-                "sha256:3becdb380d8916c873ad512f1701f8a92ce79ec6978ffde92919fd18d41da7fb",
-                "sha256:4ae38bf8ba6f39d5b83f78661273216e7db5b00f08be7592062cb1fc8b8ba542",
-                "sha256:8047da932432aa32c515ec1447ea79ce578d0559362ca3605f8e9568f844e3c6",
-                "sha256:8f1c00aa35f504197561060ca4c21d3cc079ba29cf6dd2fe61024c70160c990b",
-                "sha256:922a69fa533cb0c793b483becaaa0845f655151e7256ec73630a1b2e9ebcb660",
-                "sha256:9693f35162dc6208d10b10ddf0458cc09ad70c30ba689d9206e02cd836ce28a3",
-                "sha256:a0f1c7edf116a12f7245be06120b1852275f9506a7d90227648b250755a03923",
-                "sha256:a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7",
-                "sha256:aba5c812f8ee8a3ff3be51887ca2d55fb8e268439ed44110d3846e4229eb0e8b",
-                "sha256:ad6f1796e37db2223d2a3f302f586f74c72c630b48a9872c1e7ae8e92e0ab669",
-                "sha256:ae67501c95606072aafa865b6ed47343ac6484472a2f95490ba151f6347acfc2",
-                "sha256:b2fcf9402fde2672545b139694284dc3b665fd1be660d73eca6805197ef776a3",
-                "sha256:b52b88021b9541a60531142b0a451baca08d28b74a723d0c99b13c8c8d48d604",
-                "sha256:b7d336912853d7b77f9b2c24eeed6a5065d0a0cc0d3b6a5a45ad6d1d05fb8cd8",
-                "sha256:bd9ba4f332cf57b2c1f698be0728c020399ef3040577cde2939f2e045b39c1e5",
-                "sha256:be9be735f827820a06340dff2ddea1fb7234561fa5e6300a62fe7f54d40546a0",
-                "sha256:cca7741c0fcc765568350cb139e92b7f9f3c9a08c4f32591d18ab0a6ac9e71b6",
-                "sha256:d0d19fb2441947b58fbf91336638c2b9f4cc98e05e1045404d7a4cb7cddc7a65",
-                "sha256:e02794ac791662a5eafc6ffeaf9bcc149035a0e48eb0a9d40a8feb4622605a3d",
-                "sha256:e0f30db709c939cabf64a6dc5babb276e6d823fd84464ab916f9b9ba5623ca15",
-                "sha256:e92c2d33858c8f560671b448205a268096e17870dcf60a9bb3ac7bfbafb7f5f9"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==2.1.6"
-        },
-        "zipp": {
-            "hashes": [
-                "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832",
-                "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.6.0"
-        }
-    },
-    "develop": {}
-}

From 643b815a1adb825b948dc5d97906123d90d4eefd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Wangryn?= <pwangryn@op.pl>
Date: Fri, 21 Oct 2022 18:49:33 +0200
Subject: [PATCH 2320/4969] Add QuestDB module (#5995)

Introduce Testcontainers implementation for `QuestDB`, `QuestDBContainer`.
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  2 +
 docs/modules/databases/questdb.md             | 29 ++++++
 mkdocs.yml                                    |  1 +
 modules/questdb/build.gradle                  | 13 +++
 .../containers/QuestDBContainer.java          | 88 +++++++++++++++++++
 .../containers/QuestDBProvider.java           | 14 +++
 ...s.containers.JdbcDatabaseContainerProvider |  1 +
 .../org/testcontainers/QuestDBTestImages.java |  7 ++
 .../jdbc/questdb/QuestDBJDBCDriverTest.java   | 19 ++++
 .../junit/questdb/SimpleQuestDBTest.java      | 71 +++++++++++++++
 14 files changed, 253 insertions(+)
 create mode 100644 docs/modules/databases/questdb.md
 create mode 100644 modules/questdb/build.gradle
 create mode 100644 modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
 create mode 100644 modules/questdb/src/main/java/org/testcontainers/containers/QuestDBProvider.java
 create mode 100644 modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java
 create mode 100644 modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
 create mode 100644 modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 8196451e88f..37609ce1424 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -41,6 +41,7 @@ body:
         - PostgreSQL
         - Presto
         - Pulsar
+        - QuestDB
         - RabbitMQ
         - Redpanda
         - Selenium
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 9d65e1f12b8..2bbca5db3ae 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -41,6 +41,7 @@ body:
         - PostgreSQL
         - Presto
         - Pulsar
+        - QuestDB
         - RabbitMQ
         - Redpanda
         - Selenium
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 581870d976d..d29d0178c39 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -39,6 +39,7 @@ body:
         - Oracle-XE
         - OrientDB
         - PostgreSQL
+        - QuestDB
         - Presto
         - Pulsar
         - RabbitMQ
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 46c7046300d..2e3afe8fa8a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -195,6 +195,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/questdb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/r2dbc"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 85144b7d7f9..bda614305fa 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -65,6 +65,8 @@
   - modules/presto/*
 "modules/pulsar":
   - modules/pulsar/*
+"modules/questdb":
+  - modules/questdb/*
 "modules/r2dbc":
   - modules/r2dbc/*
 "modules/rabbitmq":
diff --git a/docs/modules/databases/questdb.md b/docs/modules/databases/questdb.md
new file mode 100644
index 00000000000..8783dd4b757
--- /dev/null
+++ b/docs/modules/databases/questdb.md
@@ -0,0 +1,29 @@
+# QuestDB Module
+
+Testcontainers module for [QuestDB](https://github.com/questdb/questdb). QuestDB is a high-performance, open-source SQL
+database for applications in financial services, IoT, machine learning, DevOps and observability.
+
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container
+types.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+
+```groovy
+testImplementation "org.testcontainers:questdb:{{latest_version}}"
+```
+
+=== "Maven"
+
+```xml
+
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>questdb</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 70421761e02..8871267cace 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -63,6 +63,7 @@ nav:
                 - modules/databases/orientdb.md
                 - modules/databases/postgres.md
                 - modules/databases/presto.md
+                - modules/databases/questdb.md
                 - modules/databases/tidb.md
                 - modules/databases/trino.md
           - modules/azure.md
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
new file mode 100644
index 00000000000..79fc0793879
--- /dev/null
+++ b/modules/questdb/build.gradle
@@ -0,0 +1,13 @@
+description = "Testcontainers :: QuestDB"
+
+dependencies {
+    api project(':testcontainers')
+    api project(':jdbc')
+
+    testImplementation 'org.postgresql:postgresql:42.5.0'
+    testImplementation project(':jdbc-test')
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.questdb:questdb:6.4.3-jdk8'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+}
diff --git a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
new file mode 100644
index 00000000000..dd933dd6c95
--- /dev/null
+++ b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
@@ -0,0 +1,88 @@
+package org.testcontainers.containers;
+
+import lombok.NonNull;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for QuestDB.
+ *
+ * @author vangreen
+ * @author jerrinot
+ */
+public class QuestDBContainer extends JdbcDatabaseContainer<QuestDBContainer> {
+
+    static final String DATABASE_PROVIDER = "postgresql";
+
+    private static final String DEFAULT_DATABASE_NAME = "qdb";
+
+    private static final int DEFAULT_COMMIT_LAG_MS = 1000;
+
+    private static final String DEFAULT_USERNAME = "admin";
+
+    private static final String DEFAULT_PASSWORD = "quest";
+
+    private static final Integer POSTGRES_PORT = 8812;
+
+    private static final Integer REST_PORT = 9000;
+
+    private static final Integer ILP_PORT = 9009;
+
+    static final String TEST_QUERY = "SELECT 1";
+
+    static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("questdb/questdb");
+
+    public QuestDBContainer(@NonNull String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public QuestDBContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(POSTGRES_PORT, REST_PORT, ILP_PORT);
+        addEnv("QDB_CAIRO_COMMIT_LAG", String.valueOf(DEFAULT_COMMIT_LAG_MS));
+        waitingFor(Wait.forLogMessage("(?i).*A server-main enjoy.*", 1));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "org.postgresql.Driver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return String.format("jdbc:postgresql://%s:%d/%s", getHost(), getMappedPort(8812), getDefaultDatabaseName());
+    }
+
+    @Override
+    public String getUsername() {
+        return DEFAULT_USERNAME;
+    }
+
+    @Override
+    public String getPassword() {
+        return DEFAULT_PASSWORD;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return TEST_QUERY;
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+
+    public String getDefaultDatabaseName() {
+        return DEFAULT_DATABASE_NAME;
+    }
+
+    public String getIlpUrl() {
+        return getHost() + ":" + getMappedPort(ILP_PORT);
+    }
+
+    public String getHttpUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(REST_PORT);
+    }
+}
diff --git a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBProvider.java b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBProvider.java
new file mode 100644
index 00000000000..0d4e9c6eeeb
--- /dev/null
+++ b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBProvider.java
@@ -0,0 +1,14 @@
+package org.testcontainers.containers;
+
+public class QuestDBProvider extends JdbcDatabaseContainerProvider {
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(QuestDBContainer.DATABASE_PROVIDER);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new QuestDBContainer(QuestDBContainer.DEFAULT_IMAGE_NAME.withTag(tag));
+    }
+}
diff --git a/modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..922a12a1328
--- /dev/null
+++ b/modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.QuestDBProvider
diff --git a/modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java b/modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java
new file mode 100644
index 00000000000..555b56f172c
--- /dev/null
+++ b/modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface QuestDBTestImages {
+    DockerImageName QUESTDB_IMAGE = DockerImageName.parse("questdb/questdb:6.5.3");
+}
diff --git a/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java b/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
new file mode 100644
index 00000000000..b19c2acc5fd
--- /dev/null
+++ b/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
@@ -0,0 +1,19 @@
+package org.testcontainers.jdbc.questdb;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+@RunWith(Parameterized.class)
+public class QuestDBJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] { { "jdbc:tc:postgresql://hostname/databasename", EnumSet.of(Options.PmdKnownBroken) } }
+        );
+    }
+}
diff --git a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
new file mode 100644
index 00000000000..c38524018c3
--- /dev/null
+++ b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
@@ -0,0 +1,71 @@
+package org.testcontainers.junit.questdb;
+
+import io.questdb.client.Sender;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.junit.Test;
+import org.testcontainers.QuestDBTestImages;
+import org.testcontainers.containers.QuestDBContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class SimpleQuestDBTest extends AbstractContainerDatabaseTest {
+
+    private static final String TABLE_NAME = "mytable";
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (QuestDBContainer questDB = new QuestDBContainer(QuestDBTestImages.QUESTDB_IMAGE)) {
+            questDB.start();
+
+            ResultSet resultSet = performQuery(questDB, questDB.getTestQueryString());
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void testRest() throws IOException {
+        try (QuestDBContainer questdb = new QuestDBContainer(QuestDBTestImages.QUESTDB_IMAGE)) {
+            questdb.start();
+            populateByInfluxLineProtocol(questdb, 1_000);
+            try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
+                String encodedSql = URLEncoder.encode("select * from " + TABLE_NAME, "UTF-8");
+                HttpGet httpGet = new HttpGet(questdb.getHttpUrl() + "/exec?query=" + encodedSql);
+                await()
+                    .untilAsserted(() -> {
+                        try (CloseableHttpResponse response = client.execute(httpGet)) {
+                            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+                            String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                            assertThat(json.contains("\"count\":1000")).isTrue();
+                        }
+                    });
+            }
+        }
+    }
+
+    private static void populateByInfluxLineProtocol(QuestDBContainer questdb, int rowCount) {
+        try (Sender sender = Sender.builder().address(questdb.getIlpUrl()).build()) {
+            for (int i = 0; i < rowCount; i++) {
+                sender
+                    .table(TABLE_NAME)
+                    .symbol("sym", "sym1" + i)
+                    .stringColumn("str", "str1" + i)
+                    .longColumn("long", i)
+                    .atNow();
+            }
+        }
+    }
+}

From 323ddc00e0db862e156c7a3e75e02be46c615c49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 16:50:10 +0000
Subject: [PATCH 2321/4969] Bump client-java from 16.0.0 to 16.0.1 in
 /modules/k3s

Bumps [client-java](https://github.com/kubernetes-client/java) from 16.0.0 to 16.0.1.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v16.0.0...v16.0.1)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 0778419a3e2..e5fdb9f148b 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.1.1'
-    testImplementation 'io.kubernetes:client-java:16.0.0'
+    testImplementation 'io.kubernetes:client-java:16.0.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From dc341029aeb226891070e7a3a8c0681bbc6ce8c1 Mon Sep 17 00:00:00 2001
From: DanielHabenicht <daniel-habenicht@outlook.de>
Date: Fri, 21 Oct 2022 23:05:19 +0200
Subject: [PATCH 2322/4969] Fix edit link in documentation (#6055)

Previously, the edit links always showed a 404
as the `master` branch is not used anymore.
Now, the link is updated to use the current `main` branch.
---
 mkdocs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkdocs.yml b/mkdocs.yml
index 8871267cace..e8f2a1918b0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -109,5 +109,6 @@ nav:
           - contributing.md
           - contributing_docs.md
           - bounty.md
+edit_uri: edit/main/docs/
 extra:
     latest_version: 1.17.5

From fa9b6b97fa76b2e951b8f8df8b559205a06c30e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 21 Oct 2022 17:53:45 -0500
Subject: [PATCH 2323/4969] Fix typo in tekton docs

---
 .../continuous_integration/tekton.md                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/tekton.md b/docs/supported_docker_environment/continuous_integration/tekton.md
index f8c6fb96adc..82c9f1d9a71 100644
--- a/docs/supported_docker_environment/continuous_integration/tekton.md
+++ b/docs/supported_docker_environment/continuous_integration/tekton.md
@@ -1,6 +1,6 @@
 # Tekton
 
-o enable access to Docker in Tekton, a dind sidecar needs to be added. An example of it can be found 
+To enable access to Docker in Tekton, a dind sidecar needs to be added. An example of it can be found 
 [here](https://github.com/tektoncd/pipeline/blob/main/examples/v1beta1/taskruns/dind-sidecar.yaml)
 
 This is an example

From 263282b52900746e00b338f40dc9d32b502c2690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 21 Oct 2022 18:58:00 -0500
Subject: [PATCH 2324/4969] Add travis minimal configuration (#6056)

Fixes #4373
---
 .../continuous_integration/travis.md               | 14 +++++++++++++-
 mkdocs.yml                                         |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/travis.md b/docs/supported_docker_environment/continuous_integration/travis.md
index 860c07f675d..f4ea31abaea 100644
--- a/docs/supported_docker_environment/continuous_integration/travis.md
+++ b/docs/supported_docker_environment/continuous_integration/travis.md
@@ -1,3 +1,15 @@
 # Travis
 
-> TODO
+To run Testcontainers on TravisCI, docker needs to be installed. The configuration below
+is the minimal required config.
+
+```yaml
+language: java
+jdk:
+- openjdk8
+
+services:
+- docker
+
+script: ./mvnw verify
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index e8f2a1918b0..47b000c89fb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -100,6 +100,7 @@ nav:
                 - supported_docker_environment/continuous_integration/gitlab_ci.md
                 - supported_docker_environment/continuous_integration/bitbucket_pipelines.md
                 - supported_docker_environment/continuous_integration/tekton.md
+                - supported_docker_environment/continuous_integration/travis.md
           - supported_docker_environment/windows.md
           - supported_docker_environment/logging_config.md
           - supported_docker_environment/image_registry_rate_limiting.md

From 77f71b855d7684930fde15d515d76a5840c2f00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 24 Oct 2022 10:23:32 -0500
Subject: [PATCH 2325/4969] Add support for flags in DatastoreEmulatorContainer
 (#5993)

Datastore can start with additional flags such as `--consistency 1.0`
which is recommended for testing.
---
 .../DatastoreEmulatorContainer.java           | 23 +++++++++++--
 .../DatastoreEmulatorContainerTest.java       | 32 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index b0716829875..db01001d5ec 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -21,13 +21,32 @@ public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulat
 
     private static final int HTTP_PORT = 8081;
 
+    private String flags;
+
+    public DatastoreEmulatorContainer(final String image) {
+        this(DockerImageName.parse(image));
+    }
+
     public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(HTTP_PORT);
         setWaitStrategy(Wait.forHttp("/").forStatusCode(200));
-        withCommand("/bin/sh", "-c", CMD);
+    }
+
+    @Override
+    protected void configure() {
+        String command = CMD;
+        if (this.flags != null && !this.flags.isEmpty()) {
+            command += " " + this.flags;
+        }
+        withCommand("/bin/sh", "-c", command);
+    }
+
+    public DatastoreEmulatorContainer withFlags(String flags) {
+        this.flags = flags;
+        return this;
     }
 
     /**
@@ -36,6 +55,6 @@ public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
      * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
      */
     public String getEmulatorEndpoint() {
-        return getHost() + ":" + getMappedPort(8081);
+        return getHost() + ":" + getMappedPort(HTTP_PORT);
     }
 }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index a7fe340791d..b1413edefba 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -10,6 +10,8 @@
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.IOException;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class DatastoreEmulatorContainerTest {
@@ -40,6 +42,36 @@ public void testSimple() {
 
         assertThat(datastore.get(key).getString("description")).isEqualTo("my description");
     }
+
     // }
 
+    @Test
+    public void testWithFlags() throws IOException, InterruptedException {
+        try (
+            DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
+                "gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators"
+            )
+                .withFlags("--consistency 1.0")
+        ) {
+            emulator.start();
+
+            assertThat(emulator.getContainerInfo().getConfig().getCmd()).anyMatch(e -> e.contains("--consistency 1.0"));
+            assertThat(emulator.execInContainer("ls", "/root/.config/").getStdout()).contains("gcloud");
+        }
+    }
+
+    @Test
+    public void testWithMultipleFlags() throws IOException, InterruptedException {
+        try (
+            DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
+                "gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators"
+            )
+                .withFlags("--consistency 1.0 --data-dir /root/.config/test-gcloud")
+        ) {
+            emulator.start();
+
+            assertThat(emulator.getContainerInfo().getConfig().getCmd()).anyMatch(e -> e.contains("--consistency 1.0"));
+            assertThat(emulator.execInContainer("ls", "/root/.config/").getStdout()).contains("test-gcloud");
+        }
+    }
 }

From e97b58b65fcfca4628b996f3b120587346d19739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 25 Oct 2022 08:51:58 -0500
Subject: [PATCH 2326/4969] Update set-output command in workflows (#6058)

`set-output` command has been deprecated and warning messages are
printed within the logs. See more [here](https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/)
---
 .github/workflows/ci-examples.yml | 2 +-
 .github/workflows/ci.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 527c2eccfeb..425e9ebd970 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
           echo $TASKS
-          echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
+          echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:
     needs: find_gradle_jobs
     strategy:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b406f256ae2..d240ca2ea79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
         run: |
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
           echo $TASKS
-          echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
+          echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:
     needs: [find_gradle_jobs]
     strategy:

From 84b1ad4efd55d53c068328fa823c1b02390831b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 25 Oct 2022 08:52:40 -0500
Subject: [PATCH 2327/4969] Apply spotless and checkstyle to examples (#6061)

Currently, spotless and checkstyle has been applied to the core
modules. Now, both will execute to core modules and examples.
---
 build.gradle                                  | 24 +----
 examples/build.gradle                         | 11 +++
 examples/cucumber/build.gradle                |  1 +
 .../testcontainers/examples/CucumberTest.java |  7 +-
 .../org/testcontainers/examples/Stepdefs.java | 36 +++----
 examples/immudb/src/test/java/ImmuDbTest.java | 20 ++--
 .../kafkacluster/KafkaContainerCluster.java   | 93 ++++++++++---------
 .../KafkaContainerClusterTest.java            | 54 ++++++-----
 .../linkedcontainer/RedmineClient.java        |  5 +-
 .../linkedcontainer/RedmineClientTest.java    | 21 +++--
 .../linkedcontainer/RedmineContainer.java     |  4 +-
 .../containers/Neo4jExampleTest.java          | 28 +++---
 .../main/java/com/mycompany/cache/Cache.java  |  3 +-
 .../com/mycompany/cache/RedisBackedCache.java |  2 +
 .../src/test/java/RedisBackedCacheTest.java   | 13 ++-
 .../main/java/com/mycompany/cache/Cache.java  |  3 +-
 .../com/mycompany/cache/RedisBackedCache.java |  2 +
 .../src/test/java/RedisBackedCacheTest.java   | 11 ++-
 .../java/com/example/DemoApplication.java     |  1 -
 .../src/test/java/SeleniumContainerTest.java  | 18 ++--
 .../main/java/com/example/cache/Cache.java    |  3 +-
 .../com/example/cache/RedisBackedCache.java   |  2 +
 .../com/example/AbstractIntegrationTest.java  |  2 +-
 .../com/example/BarConcreteTestClass.java     |  5 +-
 .../com/example/FooConcreteTestClass.java     |  4 +-
 .../main/java/com/example/SearchEngine.java   |  1 -
 .../main/java/com/example/SearchResult.java   |  6 +-
 .../java/com/example/SolrSearchEngine.java    | 14 +--
 .../test/java/com/example/SolrQueryTest.java  | 48 ++++++----
 .../java/com/example/DemoApplication.java     |  7 +-
 .../main/java/com/example/DemoController.java |  1 +
 .../src/main/java/com/example/DemoEntity.java |  1 -
 .../main/java/com/example/DemoRepository.java |  4 +-
 .../main/java/com/example/DemoService.java    |  5 +-
 .../com/example/AbstractIntegrationTest.java  |  8 +-
 .../java/com/example/DemoControllerTest.java  |  1 -
 gradle/spotless.gradle                        | 23 +++++
 37 files changed, 268 insertions(+), 224 deletions(-)
 create mode 100644 gradle/spotless.gradle

diff --git a/build.gradle b/build.gradle
index 9e6aa6020e4..7405154491b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ subprojects {
     apply plugin: 'idea'
     apply plugin: 'io.franzbecker.gradle-lombok'
     apply from: "$rootDir/gradle/shading.gradle"
-    apply plugin: 'com.diffplug.spotless'
+    apply from: "$rootDir/gradle/spotless.gradle"
     apply plugin: 'checkstyle'
     apply plugin: 'org.gradle.test-retry'
 
@@ -128,28 +128,6 @@ subprojects {
         testImplementation 'ch.qos.logback:logback-classic:1.3.3'
     }
 
-    spotless {
-        java {
-            toggleOffOn()
-            removeUnusedImports()
-            trimTrailingWhitespace()
-            endWithNewline()
-
-            prettier(['prettier': '2.5.1', 'prettier-plugin-java': '1.6.1'])
-                .config([
-                    'parser'    : 'java',
-                    'tabWidth'  : 4,
-                    'printWidth': 120
-                ])
-
-            importOrder('', 'java', 'javax', '\\#')
-        }
-        groovyGradle {
-            target '**/*.groovy'
-            greclipse('4.19.0')
-        }
-    }
-
     checkstyle {
         toolVersion = "9.3"
         configFile = rootProject.file('config/checkstyle/checkstyle.xml')
diff --git a/examples/build.gradle b/examples/build.gradle
index d340e297d33..b1c31a29c7f 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,10 +1,21 @@
 // empty build.gradle for dependabot
+plugins {
+    id 'com.diffplug.spotless' version '6.8.0' apply false
+}
+
 apply from: "$rootDir/../gradle/ci-support.gradle"
 
 subprojects {
     apply plugin:"java"
+    apply from: "$rootDir/../gradle/spotless.gradle"
+    apply plugin: 'checkstyle'
 
     repositories {
         mavenCentral()
     }
+
+    checkstyle {
+        toolVersion = "9.3"
+        configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
+    }
 }
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 1b9fe04efd8..49dbd831cf5 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -13,4 +13,5 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java:7.8.0'
     testImplementation 'io.cucumber:cucumber-junit:7.8.0'
     testImplementation 'org.testcontainers:selenium'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java b/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
index f55919c0fe6..717c42351a8 100644
--- a/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
+++ b/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
@@ -5,8 +5,5 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@CucumberOptions(plugin = {"pretty"})
-public class CucumberTest {
-
-
-}
+@CucumberOptions(plugin = { "pretty" })
+public class CucumberTest {}
diff --git a/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java b/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
index e1b9c7e81ef..1378100f959 100644
--- a/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
+++ b/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
@@ -10,22 +10,23 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode;
 import org.testcontainers.lifecycle.TestDescription;
 
 import java.io.File;
 import java.util.List;
 import java.util.Optional;
 
-import static junit.framework.TestCase.assertEquals;
-import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class Stepdefs {
 
     private BrowserWebDriverContainer container = new BrowserWebDriverContainer()
-            .withCapabilities(new ChromeOptions())
-            .withRecordingMode(RECORD_ALL, new File("build"));
+        .withCapabilities(new ChromeOptions())
+        .withRecordingMode(VncRecordingMode.RECORD_ALL, new File("build"));
 
     private String location;
+
     private String answer;
 
     @Before
@@ -35,17 +36,20 @@ public void beforeScenario() {
 
     @After
     public void afterScenario(Scenario scenario) {
-        container.afterTest(new TestDescription() {
-            @Override
-            public String getTestId() {
-                return scenario.getId();
-            }
+        container.afterTest(
+            new TestDescription() {
+                @Override
+                public String getTestId() {
+                    return scenario.getId();
+                }
 
-            @Override
-            public String getFilesystemFriendlyName() {
-                return scenario.getName();
-            }
-        }, Optional.of(scenario).filter(Scenario::isFailed).map(__ -> new RuntimeException()));
+                @Override
+                public String getFilesystemFriendlyName() {
+                    return scenario.getName();
+                }
+            },
+            Optional.of(scenario).filter(Scenario::isFailed).map(__ -> new RuntimeException())
+        );
     }
 
     @Given("^location is \"([^\"]*)\"$")
@@ -63,8 +67,6 @@ public void iAskIsItPossibleToSearchHere() throws Exception {
 
     @Then("^I should be told \"([^\"]*)\"$")
     public void iShouldBeTold(String expected) throws Exception {
-        assertEquals(expected, answer);
+        assertThat(answer).isEqualTo(expected);
     }
-
-
 }
diff --git a/examples/immudb/src/test/java/ImmuDbTest.java b/examples/immudb/src/test/java/ImmuDbTest.java
index fd515ddd4aa..f8c208a1073 100644
--- a/examples/immudb/src/test/java/ImmuDbTest.java
+++ b/examples/immudb/src/test/java/ImmuDbTest.java
@@ -8,6 +8,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -17,28 +18,33 @@ public class ImmuDbTest {
 
     // Default port for the ImmuDb server
     private static final int IMMUDB_PORT = 3322;
+
     // Default username for the ImmuDb server
     private final String IMMUDB_USER = "immudb";
+
     // Default password for the ImmuDb server
     private final String IMMUDB_PASSWORD = "immudb";
+
     // Default database name for the ImmuDb server
     private final String IMMUDB_DATABASE = "defaultdb";
 
     // Test container for the ImmuDb database, with the latest version of the image and exposed port
     @ClassRule
     public static final GenericContainer<?> immuDbContainer = new GenericContainer<>("codenotary/immudb:1.3")
-        .withExposedPorts(IMMUDB_PORT).waitingFor(
-            Wait.forLogMessage(".*Web API server enabled.*", 1)
-        );
+        .withExposedPorts(IMMUDB_PORT)
+        .waitingFor(Wait.forLogMessage(".*Web API server enabled.*", 1));
+
     // ImmuClient used to interact with the DB
     private ImmuClient immuClient;
 
     @Before
     public void setUp() {
-        this.immuClient = ImmuClient.newBuilder()
-            .withServerUrl(immuDbContainer.getHost())
-            .withServerPort(immuDbContainer.getMappedPort(IMMUDB_PORT))
-            .build();
+        this.immuClient =
+            ImmuClient
+                .newBuilder()
+                .withServerUrl(immuDbContainer.getHost())
+                .withServerPort(immuDbContainer.getMappedPort(IMMUDB_PORT))
+                .build();
         this.immuClient.login(IMMUDB_USER, IMMUDB_PASSWORD);
         this.immuClient.useDatabase(IMMUDB_DATABASE);
     }
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
index 398488fe3f9..9ab3f25e0ff 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
@@ -4,10 +4,9 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.lifecycle.Startable;
-import org.testcontainers.lifecycle.Startables;
-import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -17,16 +16,17 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 /**
  * Provides an easy way to launch a Kafka cluster with multiple brokers.
  */
 public class KafkaContainerCluster implements Startable {
 
     private final int brokersNum;
+
     private final Network network;
+
     private final GenericContainer<?> zookeeper;
+
     private final Collection<KafkaContainer> brokers;
 
     public KafkaContainerCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) {
@@ -34,33 +34,39 @@ public KafkaContainerCluster(String confluentPlatformVersion, int brokersNum, in
             throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
         }
         if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
-            throw new IllegalArgumentException("internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0");
+            throw new IllegalArgumentException(
+                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+            );
         }
 
         this.brokersNum = brokersNum;
         this.network = Network.newNetwork();
 
-        this.zookeeper = new GenericContainer<>(DockerImageName.parse("confluentinc/cp-zookeeper").withTag(confluentPlatformVersion))
-            .withNetwork(network)
-            .withNetworkAliases("zookeeper")
-            .withEnv("ZOOKEEPER_CLIENT_PORT", String.valueOf(KafkaContainer.ZOOKEEPER_PORT));
-
-        this.brokers = IntStream
-            .range(0, this.brokersNum)
-            .mapToObj(brokerNum -> {
-                return new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag(confluentPlatformVersion))
-                    .withNetwork(this.network)
-                    .withNetworkAliases("broker-" + brokerNum)
-                    .dependsOn(this.zookeeper)
-                    .withExternalZookeeper("zookeeper:" + KafkaContainer.ZOOKEEPER_PORT)
-                    .withEnv("KAFKA_BROKER_ID", brokerNum + "")
-                    .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
-                    .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
-                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
-                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
-                    .withStartupTimeout(Duration.ofMinutes(1));
-            })
-            .collect(Collectors.toList());
+        this.zookeeper =
+            new GenericContainer<>(DockerImageName.parse("confluentinc/cp-zookeeper").withTag(confluentPlatformVersion))
+                .withNetwork(network)
+                .withNetworkAliases("zookeeper")
+                .withEnv("ZOOKEEPER_CLIENT_PORT", String.valueOf(KafkaContainer.ZOOKEEPER_PORT));
+
+        this.brokers =
+            IntStream
+                .range(0, this.brokersNum)
+                .mapToObj(brokerNum -> {
+                    return new KafkaContainer(
+                        DockerImageName.parse("confluentinc/cp-kafka").withTag(confluentPlatformVersion)
+                    )
+                        .withNetwork(this.network)
+                        .withNetworkAliases("broker-" + brokerNum)
+                        .dependsOn(this.zookeeper)
+                        .withExternalZookeeper("zookeeper:" + KafkaContainer.ZOOKEEPER_PORT)
+                        .withEnv("KAFKA_BROKER_ID", brokerNum + "")
+                        .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
+                        .withStartupTimeout(Duration.ofMinutes(1));
+                })
+                .collect(Collectors.toList());
     }
 
     public Collection<KafkaContainer> getBrokers() {
@@ -68,16 +74,11 @@ public Collection<KafkaContainer> getBrokers() {
     }
 
     public String getBootstrapServers() {
-        return brokers.stream()
-            .map(KafkaContainer::getBootstrapServers)
-            .collect(Collectors.joining(","));
+        return brokers.stream().map(KafkaContainer::getBootstrapServers).collect(Collectors.joining(","));
     }
 
     private Stream<GenericContainer<?>> allContainers() {
-        return Stream.concat(
-            this.brokers.stream(),
-            Stream.of(this.zookeeper)
-        );
+        return Stream.concat(this.brokers.stream(), Stream.of(this.zookeeper));
     }
 
     @Override
@@ -86,15 +87,23 @@ public void start() {
         // sequential start to avoid resource contention on CI systems with weaker hardware
         brokers.forEach(GenericContainer::start);
 
-        Unreliables.retryUntilTrue(30, TimeUnit.SECONDS, () -> {
-            Container.ExecResult result = this.zookeeper.execInContainer(
-                "sh", "-c",
-                "zookeeper-shell zookeeper:" + KafkaContainer.ZOOKEEPER_PORT + " ls /brokers/ids | tail -n 1"
-            );
-            String brokers = result.getStdout();
-
-            return brokers != null && brokers.split(",").length == this.brokersNum;
-        });
+        Unreliables.retryUntilTrue(
+            30,
+            TimeUnit.SECONDS,
+            () -> {
+                Container.ExecResult result =
+                    this.zookeeper.execInContainer(
+                            "sh",
+                            "-c",
+                            "zookeeper-shell zookeeper:" +
+                            KafkaContainer.ZOOKEEPER_PORT +
+                            " ls /brokers/ids | tail -n 1"
+                        );
+                String brokers = result.getStdout();
+
+                return brokers != null && brokers.split(",").length == this.brokersNum;
+            }
+        );
     }
 
     @Override
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
index a431c14bba3..63253f4b309 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
@@ -29,9 +29,7 @@ public class KafkaContainerClusterTest {
 
     @Test
     public void testKafkaContainerCluster() throws Exception {
-        try (
-            KafkaContainerCluster cluster = new KafkaContainerCluster("6.2.1", 3, 2)
-        ) {
+        try (KafkaContainerCluster cluster = new KafkaContainerCluster("6.2.1", 3, 2)) {
             cluster.start();
             String bootstrapServers = cluster.getBootstrapServers();
 
@@ -43,24 +41,27 @@ public void testKafkaContainerCluster() throws Exception {
 
     protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
         try (
-            AdminClient adminClient = AdminClient.create(ImmutableMap.of(
-                AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers
-            ));
-
+            AdminClient adminClient = AdminClient.create(
+                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
+            );
             KafkaProducer<String, String> producer = new KafkaProducer<>(
                 ImmutableMap.of(
-                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
-                    ProducerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG,
+                    UUID.randomUUID().toString()
                 ),
                 new StringSerializer(),
                 new StringSerializer()
             );
-
             KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
                 ImmutableMap.of(
-                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers,
-                    ConsumerConfig.GROUP_ID_CONFIG, "tc-" + UUID.randomUUID(),
-                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG,
+                    "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+                    "earliest"
                 ),
                 new StringDeserializer(),
                 new StringDeserializer()
@@ -75,23 +76,26 @@ protected void testKafkaFunctionality(String bootstrapServers, int partitions, i
 
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
 
-            Unreliables.retryUntilTrue(10, TimeUnit.SECONDS, () -> {
-                ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+            Unreliables.retryUntilTrue(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
 
-                if (records.isEmpty()) {
-                    return false;
-                }
+                    if (records.isEmpty()) {
+                        return false;
+                    }
 
-                assertThat(records)
-                    .hasSize(1)
-                    .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
-                    .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+                    assertThat(records)
+                        .hasSize(1)
+                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
 
-                return true;
-            });
+                    return true;
+                }
+            );
 
             consumer.unsubscribe();
         }
     }
-
 }
diff --git a/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java b/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java
index be62d932971..c95ec133e2f 100644
--- a/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java
+++ b/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java
@@ -13,6 +13,7 @@
 public class RedmineClient {
 
     private String url;
+
     private OkHttpClient client;
 
     public RedmineClient(String url) {
@@ -21,9 +22,7 @@ public RedmineClient(String url) {
     }
 
     public int getIssueCount() throws IOException {
-        Request request = new Request.Builder()
-                .url(url + "/issues.json")
-                .build();
+        Request request = new Request.Builder().url(url + "/issues.json").build();
 
         Response response = client.newCall(request).execute();
         JSONObject jsonObject = new JSONObject(response.body().string());
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
index 6e4186698e7..721c00835c9 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
@@ -13,25 +13,26 @@
 public class RedmineClientTest {
 
     private static final String POSTGRES_USERNAME = "redmine";
+
     private static final String POSTGRES_PASSWORD = "secret";
 
-    private PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>(LinkedContainerTestImages.POSTGRES_TEST_IMAGE)
-            .withUsername(POSTGRES_USERNAME)
-            .withPassword(POSTGRES_PASSWORD);
+    private PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>(
+        LinkedContainerTestImages.POSTGRES_TEST_IMAGE
+    )
+        .withUsername(POSTGRES_USERNAME)
+        .withPassword(POSTGRES_PASSWORD);
 
     private RedmineContainer redmineContainer = new RedmineContainer(LinkedContainerTestImages.REDMINE_TEST_IMAGE)
-            .withLinkToContainer(postgreSQLContainer, "postgres")
-            .withEnv("POSTGRES_ENV_POSTGRES_USER", POSTGRES_USERNAME)
-            .withEnv("POSTGRES_ENV_POSTGRES_PASSWORD", POSTGRES_PASSWORD);
+        .withLinkToContainer(postgreSQLContainer, "postgres")
+        .withEnv("POSTGRES_ENV_POSTGRES_USER", POSTGRES_USERNAME)
+        .withEnv("POSTGRES_ENV_POSTGRES_PASSWORD", POSTGRES_PASSWORD);
 
     @Rule
-    public RuleChain chain = RuleChain.outerRule(postgreSQLContainer)
-            .around(redmineContainer);
+    public RuleChain chain = RuleChain.outerRule(postgreSQLContainer).around(redmineContainer);
 
     @Test
     public void canGetIssueCount() throws Exception {
-        RedmineClient redmineClient = new RedmineClient(
-                redmineContainer.getRedmineUrl());
+        RedmineClient redmineClient = new RedmineClient(redmineContainer.getRedmineUrl());
 
         assertThat(redmineClient.getIssueCount()).as("The issue count can be retrieved.").isZero();
     }
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
index 4303bbee682..0f0bea36c1a 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
@@ -28,8 +28,6 @@ public RedmineContainer withLinkToContainer(LinkableContainer otherContainer, St
     }
 
     public String getRedmineUrl() {
-        return String.format("http://%s:%d",
-                this.getHost(),
-                this.getMappedPort(REDMINE_PORT));
+        return String.format("http://%s:%d", this.getHost(), this.getMappedPort(REDMINE_PORT));
     }
 }
diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
index bc7aeed10bd..9ce3a3f078c 100644
--- a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -1,5 +1,14 @@
 package org.testcontainers.containers;
 
+import org.junit.jupiter.api.Test;
+import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
+import org.neo4j.driver.Session;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -10,15 +19,6 @@
 import java.util.Collections;
 import java.util.stream.Collectors;
 
-import org.junit.jupiter.api.Test;
-import org.neo4j.driver.AuthTokens;
-import org.neo4j.driver.Driver;
-import org.neo4j.driver.GraphDatabase;
-import org.neo4j.driver.Session;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -27,19 +27,14 @@
 class Neo4jExampleTest {
 
     @Container
-    private static Neo4jContainer<?> neo4jContainer =
-        new Neo4jContainer<>(DockerImageName.parse("neo4j:4.4"))
+    private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(DockerImageName.parse("neo4j:4.4"))
         .withAdminPassword(null); // Disable password
 
     @Test
     void testSomethingUsingBolt() {
-
         // Retrieve the Bolt URL from the container
         String boltUrl = neo4jContainer.getBoltUrl();
-        try (
-            Driver driver = GraphDatabase.driver(boltUrl, AuthTokens.none());
-            Session session = driver.session()
-        ) {
+        try (Driver driver = GraphDatabase.driver(boltUrl, AuthTokens.none()); Session session = driver.session()) {
             long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
             assertThat(one).isEqualTo(1L);
         } catch (Exception e) {
@@ -49,7 +44,6 @@ void testSomethingUsingBolt() {
 
     @Test
     void testSomethingUsingHttp() throws IOException {
-
         // Retrieve the HTTP URL from the container
         String httpUrl = neo4jContainer.getHttpUrl();
 
diff --git a/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/Cache.java b/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/Cache.java
index 996c31ecac7..f0c7710b355 100644
--- a/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/Cache.java
+++ b/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/Cache.java
@@ -6,7 +6,6 @@
  * Cache, for storing data associated with keys.
  */
 public interface Cache {
-
     /**
      * Store a value object in the cache with no specific expiry time. The object may be evicted by the cache any time,
      * if necessary.
@@ -24,4 +23,4 @@ public interface Cache {
      * @return                  the object if it was in the cache, or an empty Optional if not found.
      */
     <T> Optional<T> get(String key, Class<T> expectedClass);
-}
\ No newline at end of file
+}
diff --git a/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/RedisBackedCache.java b/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/RedisBackedCache.java
index 2c80818c150..8349de77869 100644
--- a/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/RedisBackedCache.java
+++ b/examples/redis-backed-cache-testng/src/main/java/com/mycompany/cache/RedisBackedCache.java
@@ -11,7 +11,9 @@
 public class RedisBackedCache implements Cache {
 
     private final Jedis jedis;
+
     private final String cacheName;
+
     private final Gson gson;
 
     public RedisBackedCache(Jedis jedis, String cacheName) {
diff --git a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
index e02b271f290..45c482c098e 100644
--- a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
@@ -17,13 +17,14 @@
  */
 public class RedisBackedCacheTest {
 
-    private static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6")).withExposedPorts(6379);
+    private static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
+        .withExposedPorts(6379);
 
     private Cache cache;
 
     @BeforeClass
     public static void startContainer() {
-         redis.start();
+        redis.start();
     }
 
     @AfterClass
@@ -44,13 +45,17 @@ public void testFindingAnInsertedValue() {
         Optional<String> foundObject = cache.get("foo", String.class);
 
         assertThat(foundObject).as("When an object in the cache is retrieved, it can be found").isPresent();
-        assertThat(foundObject).as("When we put a String in to the cache and retrieve it, the value is the same").contains("FOO");
+        assertThat(foundObject)
+            .as("When we put a String in to the cache and retrieve it, the value is the same")
+            .contains("FOO");
     }
 
     @Test
     public void testNotFindingAValueThatWasNotInserted() {
         Optional<String> foundObject = cache.get("bar", String.class);
 
-        assertThat(foundObject).as("When an object that's not in the cache is retrieved, nothing is found").isNotPresent();
+        assertThat(foundObject)
+            .as("When an object that's not in the cache is retrieved, nothing is found")
+            .isNotPresent();
     }
 }
diff --git a/examples/redis-backed-cache/src/main/java/com/mycompany/cache/Cache.java b/examples/redis-backed-cache/src/main/java/com/mycompany/cache/Cache.java
index 996c31ecac7..f0c7710b355 100644
--- a/examples/redis-backed-cache/src/main/java/com/mycompany/cache/Cache.java
+++ b/examples/redis-backed-cache/src/main/java/com/mycompany/cache/Cache.java
@@ -6,7 +6,6 @@
  * Cache, for storing data associated with keys.
  */
 public interface Cache {
-
     /**
      * Store a value object in the cache with no specific expiry time. The object may be evicted by the cache any time,
      * if necessary.
@@ -24,4 +23,4 @@ public interface Cache {
      * @return                  the object if it was in the cache, or an empty Optional if not found.
      */
     <T> Optional<T> get(String key, Class<T> expectedClass);
-}
\ No newline at end of file
+}
diff --git a/examples/redis-backed-cache/src/main/java/com/mycompany/cache/RedisBackedCache.java b/examples/redis-backed-cache/src/main/java/com/mycompany/cache/RedisBackedCache.java
index 2c80818c150..8349de77869 100644
--- a/examples/redis-backed-cache/src/main/java/com/mycompany/cache/RedisBackedCache.java
+++ b/examples/redis-backed-cache/src/main/java/com/mycompany/cache/RedisBackedCache.java
@@ -11,7 +11,9 @@
 public class RedisBackedCache implements Cache {
 
     private final Jedis jedis;
+
     private final String cacheName;
+
     private final Gson gson;
 
     public RedisBackedCache(Jedis jedis, String cacheName) {
diff --git a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
index 24a21723b15..e820646a0da 100644
--- a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
@@ -18,7 +18,8 @@ public class RedisBackedCacheTest {
 
     @Rule
     public GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
-                                            .withExposedPorts(6379);
+        .withExposedPorts(6379);
+
     private Cache cache;
 
     @Before
@@ -34,13 +35,17 @@ public void testFindingAnInsertedValue() {
         Optional<String> foundObject = cache.get("foo", String.class);
 
         assertThat(foundObject.isPresent()).as("When an object in the cache is retrieved, it can be found").isTrue();
-        assertThat(foundObject.get()).as("When we put a String in to the cache and retrieve it, the value is the same").isEqualTo("FOO");
+        assertThat(foundObject.get())
+            .as("When we put a String in to the cache and retrieve it, the value is the same")
+            .isEqualTo("FOO");
     }
 
     @Test
     public void testNotFindingAValueThatWasNotInserted() {
         Optional<String> foundObject = cache.get("bar", String.class);
 
-        assertThat(foundObject.isPresent()).as("When an object that's not in the cache is retrieved, nothing is found").isFalse();
+        assertThat(foundObject.isPresent())
+            .as("When an object that's not in the cache is retrieved, nothing is found")
+            .isFalse();
     }
 }
diff --git a/examples/selenium-container/src/main/java/com/example/DemoApplication.java b/examples/selenium-container/src/main/java/com/example/DemoApplication.java
index 909a1ec36e1..6c42baef27d 100644
--- a/examples/selenium-container/src/main/java/com/example/DemoApplication.java
+++ b/examples/selenium-container/src/main/java/com/example/DemoApplication.java
@@ -9,5 +9,4 @@ public class DemoApplication {
     public static void main(String[] args) {
         SpringApplication.run(DemoApplication.class, args);
     }
-
 }
diff --git a/examples/selenium-container/src/test/java/SeleniumContainerTest.java b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
index c28c9bc54cb..52871c4f37e 100644
--- a/examples/selenium-container/src/test/java/SeleniumContainerTest.java
+++ b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
@@ -7,8 +7,8 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.context.WebServerInitializedEvent;
 import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -16,12 +16,12 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode;
 
 import java.io.File;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
 
 /**
  * Simple example of plain Selenium usage.
@@ -36,8 +36,8 @@ public class SeleniumContainerTest {
 
     @Rule
     public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
-                                                    .withCapabilities(new ChromeOptions())
-                                                    .withRecordingMode(RECORD_ALL, new File("build"));
+        .withCapabilities(new ChromeOptions())
+        .withRecordingMode(VncRecordingMode.RECORD_ALL, new File("build"));
 
     @Test
     public void simplePlainSeleniumTest() {
@@ -50,12 +50,14 @@ public void simplePlainSeleniumTest() {
     }
 
     public static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
         @Override
         public void initialize(ConfigurableApplicationContext applicationContext) {
-            applicationContext.addApplicationListener((ApplicationListener<WebServerInitializedEvent>) event -> {
-                Testcontainers.exposeHostPorts(event.getWebServer().getPort());
-            });
+            applicationContext.addApplicationListener(
+                (ApplicationListener<WebServerInitializedEvent>) event -> {
+                    Testcontainers.exposeHostPorts(event.getWebServer().getPort());
+                }
+            );
         }
     }
-
 }
diff --git a/examples/singleton-container/src/main/java/com/example/cache/Cache.java b/examples/singleton-container/src/main/java/com/example/cache/Cache.java
index 986838d20f9..8a0c5776d80 100644
--- a/examples/singleton-container/src/main/java/com/example/cache/Cache.java
+++ b/examples/singleton-container/src/main/java/com/example/cache/Cache.java
@@ -3,8 +3,7 @@
 import java.util.Optional;
 
 public interface Cache {
-
     void put(String key, Object value);
 
     <T> Optional<T> get(String key, Class<T> expectedClass);
-}
\ No newline at end of file
+}
diff --git a/examples/singleton-container/src/main/java/com/example/cache/RedisBackedCache.java b/examples/singleton-container/src/main/java/com/example/cache/RedisBackedCache.java
index 34553dde1f4..430afb2b1f5 100644
--- a/examples/singleton-container/src/main/java/com/example/cache/RedisBackedCache.java
+++ b/examples/singleton-container/src/main/java/com/example/cache/RedisBackedCache.java
@@ -8,7 +8,9 @@
 public class RedisBackedCache implements Cache {
 
     private final Jedis jedis;
+
     private final String cacheName;
+
     private final Gson gson;
 
     public RedisBackedCache(Jedis jedis, String cacheName) {
diff --git a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
index d152540fb1c..729e9fb124d 100644
--- a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
@@ -6,7 +6,7 @@
 public abstract class AbstractIntegrationTest {
 
     public static final GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
-            .withExposedPorts(6379);
+        .withExposedPorts(6379);
 
     static {
         redis.start();
diff --git a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
index fff6e1a4a3a..6b9050be277 100644
--- a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
@@ -27,7 +27,8 @@ public void testInsertValue() {
         Optional<String> foundObject = cache.get("bar", String.class);
 
         assertThat(foundObject).as("When inserting an object into the cache, it can be retrieved").isPresent();
-        assertThat(foundObject).as("When accessing the value of a retrieved object, the value must be the same").contains("BAR");
+        assertThat(foundObject)
+            .as("When accessing the value of a retrieved object, the value must be the same")
+            .contains("BAR");
     }
-
 }
diff --git a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
index 11ad98a0580..ea071202dcd 100644
--- a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
@@ -27,6 +27,8 @@ public void testInsertValue() {
         Optional<String> foundObject = cache.get("foo", String.class);
 
         assertThat(foundObject).as("When inserting an object into the cache, it can be retrieved").isPresent();
-        assertThat(foundObject).as("When accessing the value of a retrieved object, the value must be the same").contains("FOO");
+        assertThat(foundObject)
+            .as("When accessing the value of a retrieved object, the value must be the same")
+            .contains("FOO");
     }
 }
diff --git a/examples/solr-container/src/main/java/com/example/SearchEngine.java b/examples/solr-container/src/main/java/com/example/SearchEngine.java
index c05bc23aad2..397327fe369 100644
--- a/examples/solr-container/src/main/java/com/example/SearchEngine.java
+++ b/examples/solr-container/src/main/java/com/example/SearchEngine.java
@@ -1,6 +1,5 @@
 package com.example;
 
 public interface SearchEngine {
-
     public SearchResult search(String term);
 }
diff --git a/examples/solr-container/src/main/java/com/example/SearchResult.java b/examples/solr-container/src/main/java/com/example/SearchResult.java
index 06544f0ba34..89722d1a5a4 100644
--- a/examples/solr-container/src/main/java/com/example/SearchResult.java
+++ b/examples/solr-container/src/main/java/com/example/SearchResult.java
@@ -1,13 +1,13 @@
 package com.example;
 
-import java.util.List;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/examples/solr-container/src/main/java/com/example/SolrSearchEngine.java b/examples/solr-container/src/main/java/com/example/SolrSearchEngine.java
index 8a7f38e455d..3be96f76690 100644
--- a/examples/solr-container/src/main/java/com/example/SolrSearchEngine.java
+++ b/examples/solr-container/src/main/java/com/example/SolrSearchEngine.java
@@ -1,16 +1,15 @@
 package com.example;
 
-import java.util.stream.Collectors;
-
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.util.ClientUtils;
 import org.apache.solr.common.SolrDocument;
 
+import java.util.stream.Collectors;
+
 @RequiredArgsConstructor
 public class SolrSearchEngine implements SearchEngine {
 
@@ -20,7 +19,6 @@ public class SolrSearchEngine implements SearchEngine {
 
     @SneakyThrows
     public SearchResult search(String term) {
-
         SolrQuery query = new SolrQuery();
         query.setQuery("title:" + ClientUtils.escapeQueryChars(term));
         QueryResponse response = client.query(COLLECTION_NAME, query);
@@ -28,12 +26,10 @@ public SearchResult search(String term) {
     }
 
     private SearchResult createResult(QueryResponse response) {
-        return SearchResult.builder()
+        return SearchResult
+            .builder()
             .totalHits(response.getResults().getNumFound())
-            .results(response.getResults()
-                .stream()
-                .map(SolrDocument::getFieldValueMap)
-                .collect(Collectors.toList()))
+            .results(response.getResults().stream().map(SolrDocument::getFieldValueMap).collect(Collectors.toList()))
             .build();
     }
 }
diff --git a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
index 6443a19b869..e65504c0276 100644
--- a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
+++ b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
@@ -15,7 +15,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.example.SolrSearchEngine.COLLECTION_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class SolrQueryTest {
@@ -23,31 +22,44 @@ public class SolrQueryTest {
     private static final DockerImageName SOLR_IMAGE = DockerImageName.parse("solr:8.3.0");
 
     public static final SolrContainer solrContainer = new SolrContainer(SOLR_IMAGE)
-        .withCollection(COLLECTION_NAME);
+        .withCollection(SolrSearchEngine.COLLECTION_NAME);
 
     private static SolrClient solrClient;
 
     @BeforeClass
     public static void setUp() throws IOException, SolrServerException {
         solrContainer.start();
-        solrClient = new Http2SolrClient.Builder("http://" + solrContainer.getHost() + ":" + solrContainer.getSolrPort() + "/solr").build();
+        solrClient =
+            new Http2SolrClient.Builder(
+                "http://" + solrContainer.getHost() + ":" + solrContainer.getSolrPort() + "/solr"
+            )
+                .build();
 
         // Add Sample Data
-        solrClient.add(COLLECTION_NAME, Collections.singletonList(
-            new SolrInputDocument(createMap(
-                "id", createInputField("id", "1"),
-                "title", createInputField("title", "old skool - trainers - shoes")
-            ))
-        ));
-
-        solrClient.add(COLLECTION_NAME, Collections.singletonList(
-            new SolrInputDocument(createMap(
-                "id", createInputField("id", "2"),
-                "title", createInputField("title", "print t-shirt")
-            ))
-        ));
-
-        solrClient.commit(COLLECTION_NAME);
+        solrClient.add(
+            SolrSearchEngine.COLLECTION_NAME,
+            Collections.singletonList(
+                new SolrInputDocument(
+                    createMap(
+                        "id",
+                        createInputField("id", "1"),
+                        "title",
+                        createInputField("title", "old skool - trainers - shoes")
+                    )
+                )
+            )
+        );
+
+        solrClient.add(
+            SolrSearchEngine.COLLECTION_NAME,
+            Collections.singletonList(
+                new SolrInputDocument(
+                    createMap("id", createInputField("id", "2"), "title", createInputField("title", "print t-shirt"))
+                )
+            )
+        );
+
+        solrClient.commit(SolrSearchEngine.COLLECTION_NAME);
     }
 
     @Test
diff --git a/examples/spring-boot/src/main/java/com/example/DemoApplication.java b/examples/spring-boot/src/main/java/com/example/DemoApplication.java
index c968eb42b78..af96419ad6a 100644
--- a/examples/spring-boot/src/main/java/com/example/DemoApplication.java
+++ b/examples/spring-boot/src/main/java/com/example/DemoApplication.java
@@ -8,8 +8,7 @@
 @EnableJpaRepositories
 public class DemoApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(DemoApplication.class, args);
-	}
-
+    public static void main(String[] args) {
+        SpringApplication.run(DemoApplication.class, args);
+    }
 }
diff --git a/examples/spring-boot/src/main/java/com/example/DemoController.java b/examples/spring-boot/src/main/java/com/example/DemoController.java
index 79f48711cad..90cea36804e 100644
--- a/examples/spring-boot/src/main/java/com/example/DemoController.java
+++ b/examples/spring-boot/src/main/java/com/example/DemoController.java
@@ -7,6 +7,7 @@
 public class DemoController {
 
     private final StringRedisTemplate stringRedisTemplate;
+
     private final DemoService demoService;
 
     public DemoController(StringRedisTemplate stringRedisTemplate, DemoService demoService) {
diff --git a/examples/spring-boot/src/main/java/com/example/DemoEntity.java b/examples/spring-boot/src/main/java/com/example/DemoEntity.java
index 47c0fa94f75..71fceb2c8e8 100644
--- a/examples/spring-boot/src/main/java/com/example/DemoEntity.java
+++ b/examples/spring-boot/src/main/java/com/example/DemoEntity.java
@@ -7,7 +7,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
-
 @Data
 @Entity
 public class DemoEntity {
diff --git a/examples/spring-boot/src/main/java/com/example/DemoRepository.java b/examples/spring-boot/src/main/java/com/example/DemoRepository.java
index 89f3775deb0..8ed3216cc18 100644
--- a/examples/spring-boot/src/main/java/com/example/DemoRepository.java
+++ b/examples/spring-boot/src/main/java/com/example/DemoRepository.java
@@ -1,7 +1,5 @@
 package com.example;
 
-
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface DemoRepository extends JpaRepository<DemoEntity, Long> {
-}
+public interface DemoRepository extends JpaRepository<DemoEntity, Long> {}
diff --git a/examples/spring-boot/src/main/java/com/example/DemoService.java b/examples/spring-boot/src/main/java/com/example/DemoService.java
index 18e8690a99f..78e8c41e907 100644
--- a/examples/spring-boot/src/main/java/com/example/DemoService.java
+++ b/examples/spring-boot/src/main/java/com/example/DemoService.java
@@ -4,15 +4,14 @@
 
 @Service
 public class DemoService {
+
     private final DemoRepository demoRepository;
 
     public DemoService(DemoRepository demoRepository) {
         this.demoRepository = demoRepository;
     }
 
-
     public DemoEntity getDemoEntity(Long id) {
-        return demoRepository.findById(id)
-            .orElseThrow(() ->new RuntimeException("Entity not found"));
+        return demoRepository.findById(id).orElseThrow(() -> new RuntimeException("Entity not found"));
     }
 }
diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
index dd1b7b6fb5a..8a1a508c0b3 100644
--- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
@@ -11,9 +11,11 @@
 import org.testcontainers.utility.DockerImageName;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = DemoApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
-    "spring.datasource.url=jdbc:tc:postgresql:11-alpine:///databasename",
-})
+@SpringBootTest(
+    classes = DemoApplication.class,
+    webEnvironment = WebEnvironment.RANDOM_PORT,
+    properties = { "spring.datasource.url=jdbc:tc:postgresql:11-alpine:///databasename" }
+)
 @ActiveProfiles("test")
 public abstract class AbstractIntegrationTest {
 
diff --git a/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java b/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
index c305ae67811..4282920b37c 100644
--- a/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
+++ b/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
@@ -33,5 +33,4 @@ public void simpleJPATest() {
 
         assertThat(result.getValue()).as("value is set").isEqualTo("Some value");
     }
-
 }
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
new file mode 100644
index 00000000000..ce71829331e
--- /dev/null
+++ b/gradle/spotless.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.diffplug.spotless'
+
+spotless {
+    java {
+        toggleOffOn()
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+
+        prettier(['prettier': '2.5.1', 'prettier-plugin-java': '1.6.1'])
+            .config([
+                'parser'    : 'java',
+                'tabWidth'  : 4,
+                'printWidth': 120
+            ])
+
+        importOrder('', 'java', 'javax', '\\#')
+    }
+    groovyGradle {
+        target '**/*.groovy'
+        greclipse('4.19.0')
+    }
+}

From b9f48abdee62fea8e94ca39ff5f18016646be9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 25 Oct 2022 10:23:05 -0500
Subject: [PATCH 2328/4969] Add zookeeper example (#6059)

Demonstrate how to use Apache Zookeeper along with `GenericContainer`.

Fixes #1514
---
 docs/examples.md                              |  1 +
 examples/settings.gradle                      |  1 +
 examples/zookeeper/build.gradle               | 14 +++++++
 .../com/example/ZookeeperContainerTest.java   | 41 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 ++++++++
 5 files changed, 73 insertions(+)
 create mode 100644 examples/zookeeper/build.gradle
 create mode 100644 examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java
 create mode 100644 examples/zookeeper/src/test/resources/logback-test.xml

diff --git a/docs/examples.md b/docs/examples.md
index e7578c8b375..b7b96ee52bb 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -14,3 +14,4 @@ Examples of different use cases provided by Testcontainers can be found below:
 - [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot-kotlin-redis)
 - [TestNG](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache-testng)
 - [ImmuDb](https://github.com/testcontainers/testcontainers-java/tree/main/examples/immudb)
+- [Zookeeper](https://github.com/testcontainers/testcontainers-java/tree/main/examples/zookeper)
diff --git a/examples/settings.gradle b/examples/settings.gradle
index d26ecef5a98..35b79454204 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -31,6 +31,7 @@ include 'spring-boot'
 include 'cucumber'
 include 'spring-boot-kotlin-redis'
 include 'immudb'
+include 'zookeeper'
 
 ext.isCI = System.getenv("CI") != null
 
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
new file mode 100644
index 00000000000..f2c92eb3b1d
--- /dev/null
+++ b/examples/zookeeper/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'org.apache.curator:curator-framework:5.3.0'
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
+}
diff --git a/examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java b/examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java
new file mode 100644
index 00000000000..a8aad36d201
--- /dev/null
+++ b/examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java
@@ -0,0 +1,41 @@
+package com.example;
+
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.RetryOneTime;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ZookeeperContainerTest {
+
+    private static final int ZOOKEEPER_PORT = 2181;
+
+    @Test
+    public void test() throws Exception {
+        String path = "/messages/zk-tc";
+        String content = "Running Zookeeper with Testcontainers";
+        try (
+            GenericContainer<?> zookeeper = new GenericContainer<>("zookeeper:3.8.0").withExposedPorts(ZOOKEEPER_PORT)
+        ) {
+            zookeeper.start();
+
+            String connectionString = zookeeper.getHost() + ":" + zookeeper.getMappedPort(ZOOKEEPER_PORT);
+            CuratorFramework curatorFramework = CuratorFrameworkFactory
+                .builder()
+                .connectString(connectionString)
+                .retryPolicy(new RetryOneTime(100))
+                .build();
+            curatorFramework.start();
+            curatorFramework.create().creatingParentsIfNeeded().forPath(path, content.getBytes());
+
+            byte[] bytes = curatorFramework.getData().forPath(path);
+            curatorFramework.close();
+
+            assertThat(new String(bytes, StandardCharsets.UTF_8)).isEqualTo(content);
+        }
+    }
+}
diff --git a/examples/zookeeper/src/test/resources/logback-test.xml b/examples/zookeeper/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/zookeeper/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 0b617b4247f098ad538b58c3f012026c1558d59b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:24:44 +0000
Subject: [PATCH 2329/4969] Bump logback-classic from 1.4.3 to 1.4.4 in
 /modules/hivemq

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.3...v_1.4.4)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 3d6b653f6d1..796099b3a62 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.9.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.4.3")
+    testImplementation("ch.qos.logback:logback-classic:1.4.4")
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
 }

From 50ec3f9b1b2111388e9879bb973761f6a2a02330 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:25:10 +0000
Subject: [PATCH 2330/4969] Bump logback-classic from 1.3.3 to 1.3.4 in
 /examples

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.3.3 to 1.3.4.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.3...v_1.3.4)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle                                    | 2 +-
 docs/examples/spock/redis/build.gradle          | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7405154491b..6c2b6a81c7b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,7 +125,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.3'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     }
 
     checkstyle {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 6699788d026..390bc06be79 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     api "io.lettuce:lettuce-core:5.2.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 5212bc33fa9..46c562bac84 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index cf3a3331cc3..08376fd9d3f 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 2e4bda4fa74..5dba21e1c26 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index eb684158731..0d19207f4ba 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 449fd9ae8e6..8ebce1bfb77 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index f2c92eb3b1d..d18be942ff0 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.3.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
 }

From 46b6cd9bf357a96e01d8e48cf241250c816bb1f3 Mon Sep 17 00:00:00 2001
From: Benjamin Manifold <benmanifold@gmail.com>
Date: Wed, 26 Oct 2022 06:50:12 -0400
Subject: [PATCH 2331/4969] Update gitlab_ci.md (#6063)

Clarity around the port number for unencrypted docker host connections, as most gitlab DinD examples recommend 2736 without explaining why.
---
 .../continuous_integration/gitlab_ci.md                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
index b4571403654..f2226f2d34f 100644
--- a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
@@ -46,7 +46,7 @@ services:
     command: ["--tls=false"]
 
 variables:
-  # Instruct Testcontainers to use the daemon of DinD.
+  # Instruct Testcontainers to use the daemon of DinD, use port 2735 for non-tls connections.
   DOCKER_HOST: "tcp://docker:2375"
   # Instruct Docker not to start over TLS.
   DOCKER_TLS_CERTDIR: ""

From b0af2f41f98a65f06cb0245a1d7d431db1b7a22b Mon Sep 17 00:00:00 2001
From: Leo <leocrossuk@gmail.com>
Date: Thu, 27 Oct 2022 12:22:53 +0100
Subject: [PATCH 2332/4969] Add language links to docs index (#6067)

---
 docs/css/extra.css                 |  39 ++++++++++++++++++++
 docs/index.md                      |  16 +++++++-
 docs/language-logos/dotnet.svg     |   7 ++++
 docs/language-logos/go.svg         |  10 +++++
 docs/language-logos/java.svg       |  17 +++++++++
 docs/language-logos/javascript.svg |   4 ++
 docs/language-logos/python.svg     |   8 ++++
 docs/language-logos/rust.svg       |  57 +++++++++++++++++++++++++++++
 docs/logo.png                      | Bin 84934 -> 67366 bytes
 9 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 docs/language-logos/dotnet.svg
 create mode 100644 docs/language-logos/go.svg
 create mode 100644 docs/language-logos/java.svg
 create mode 100644 docs/language-logos/javascript.svg
 create mode 100644 docs/language-logos/python.svg
 create mode 100644 docs/language-logos/rust.svg

diff --git a/docs/css/extra.css b/docs/css/extra.css
index e97480c5341..a89eebc9b24 100644
--- a/docs/css/extra.css
+++ b/docs/css/extra.css
@@ -9,3 +9,42 @@ h1, h2, h3, h4, h5, h6 {
     --md-accent-fg-color:        #291A3F;
     --md-typeset-a-color:        #0C94AA;
 }
+
+.card-grid {
+    display: grid;
+    gap: 10px;
+}
+
+@media (min-width: 680px) {
+    .card-grid {
+        grid-template-columns: repeat(3, 1fr);
+    }
+}
+
+body .card-grid-item {
+    display: flex;
+    align-items: center;
+    gap: 20px;
+    border: 1px solid #C3BEDE;
+    border-radius: 6px;
+    padding: 16px;
+    font-weight: 600;
+    color: #9991B5;
+    background: #F2F4FE;
+}
+
+body .card-grid-item:hover,
+body .card-grid-item:focus {
+    color: #9991B5;
+}
+
+.card-grid-item[href] {
+    color: var(--md-primary-fg-color);
+    background: transparent;
+}
+
+.card-grid-item[href]:hover,
+.card-grid-item[href]:focus {
+    background: #F2F4FE;
+    color: var(--md-primary-fg-color);
+}
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 383f42c0245..ed365b2acf3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,21 @@
 # Testcontainers
 
 <!-- allow aspect ratio computation to reduce layout shift. CSS enforces max-width: 100% -->
-<img src="logo.png" alt="Testcontainers logo" width="1024" height="512"/> 
+<img src="logo.png" alt="Testcontainers logo" width="1024" height="512"/>
+
+## Test dependencies as code for your entire stack
+Get lightweight and throwaway containers during your tests that let you test against any container image (database, broker, browser, etc..) using one of the several supported languages.
+
+
+<p align=center><strong>Select your language</strong></p>
+<div class="card-grid">
+    <a class="card-grid-item"><img src="language-logos/java.svg"/>Java</a>
+    <a href="https://golang.testcontainers.org/" class="card-grid-item"><img src="language-logos/go.svg"/>Go</a>
+    <a href="https://dotnet.testcontainers.org/" class="card-grid-item"><img src="language-logos/dotnet.svg"/>.NET</a>
+    <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
+    <a href="https://github.com/testcontainers/testcontainers-node" class="card-grid-item"><img src="language-logos/javascript.svg"/>JavaScript<wbr>/Node.js</a>
+    <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="language-logos/rust.svg"/>Rust</a>
+</div>
 
 ## About
 
diff --git a/docs/language-logos/dotnet.svg b/docs/language-logos/dotnet.svg
new file mode 100644
index 00000000000..2fb163d4d40
--- /dev/null
+++ b/docs/language-logos/dotnet.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 456 456" width="30" height="30" fill="none">
+<rect width="456" height="456" fill="#512BD4"/>
+<path d="M81.2738 291.333C78.0496 291.333 75.309 290.259 73.052 288.11C70.795 285.906 69.6665 283.289 69.6665 280.259C69.6665 277.173 70.795 274.529 73.052 272.325C75.309 270.121 78.0496 269.019 81.2738 269.019C84.5518 269.019 87.3193 270.121 89.5763 272.325C91.887 274.529 93.0424 277.173 93.0424 280.259C93.0424 283.289 91.887 285.906 89.5763 288.11C87.3193 290.259 84.5518 291.333 81.2738 291.333Z" fill="white"/>
+<path d="M210.167 289.515H189.209L133.994 202.406C132.597 200.202 131.441 197.915 130.528 195.546H130.044C130.474 198.081 130.689 203.508 130.689 211.827V289.515H112.149V171H134.477L187.839 256.043C190.096 259.57 191.547 261.994 192.192 263.316H192.514C191.977 260.176 191.708 254.859 191.708 247.365V171H210.167V289.515Z" fill="white"/>
+<path d="M300.449 289.515H235.561V171H297.87V187.695H254.746V221.249H294.485V237.861H254.746V272.903H300.449V289.515Z" fill="white"/>
+<path d="M392.667 187.695H359.457V289.515H340.272V187.695H307.143V171H392.667V187.695Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/docs/language-logos/go.svg b/docs/language-logos/go.svg
new file mode 100644
index 00000000000..bfcca48ceda
--- /dev/null
+++ b/docs/language-logos/go.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="2 2 30 30" width="30" height="30">
+    <g fill="#00ACD7" fill-rule="evenodd">
+        <path
+            d="M3.35 13.5c-.06 0-.07-.04-.05-.08l.3-.4c.04-.03.11-.06.17-.06h5.17c.06 0 .07.04.05.08l-.25.38c-.03.04-.1.09-.15.09l-5.24-.02zm-2.19 1.33c-.06 0-.07-.03-.04-.08l.3-.39c.03-.04.1-.07.16-.07h6.6c.07 0 .1.04.08.09l-.12.34c-.01.06-.07.1-.13.1H1.16zm3.51 1.33c-.06 0-.08-.04-.05-.09l.2-.36c.04-.04.1-.09.15-.09h2.9c.06 0 .09.05.09.1l-.03.35c0 .06-.06.1-.1.1l-3.16-.01zm15.04-2.93l-2.43.64c-.22.06-.24.07-.42-.15-.22-.24-.38-.4-.69-.55a2.52 2.52 0 00-2.62.22 3.08 3.08 0 00-1.48 2.75 2.27 2.27 0 001.96 2.28c.98.13 1.81-.22 2.46-.96l.4-.53h-2.8c-.3 0-.38-.2-.28-.44.19-.45.54-1.2.74-1.58a.4.4 0 01.36-.23h5.28c-.03.4-.03.78-.09 1.18-.16 1.04-.55 2-1.19 2.84a6.04 6.04 0 01-4.13 2.46 5.13 5.13 0 01-3.9-.96A4.55 4.55 0 019.04 17c-.18-1.58.28-3 1.24-4.25a6.43 6.43 0 014.05-2.5 5 5 0 013.84.7c.77.5 1.32 1.2 1.69 2.05.08.13.02.2-.15.24z">
+        </path>
+        <path
+            d="M24.5 21.25a5.44 5.44 0 01-3.53-1.28 4.55 4.55 0 01-1.56-2.8 5.53 5.53 0 011.17-4.37 6.08 6.08 0 014.06-2.42 5.38 5.38 0 014.13.74 4.51 4.51 0 012.04 3.23 5.6 5.6 0 01-1.67 4.91 6.64 6.64 0 01-3.47 1.86c-.4.07-.79.08-1.16.13zm3.46-5.86c-.02-.19-.02-.33-.05-.48A2.39 2.39 0 0024.96 13a3.17 3.17 0 00-2.54 2.52 2.39 2.39 0 001.33 2.74c.8.34 1.6.3 2.37-.1a3.17 3.17 0 001.84-2.76z"
+            fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/docs/language-logos/java.svg b/docs/language-logos/java.svg
new file mode 100644
index 00000000000..986704918f5
--- /dev/null
+++ b/docs/language-logos/java.svg
@@ -0,0 +1,17 @@
+<svg viewBox="0 0 256 346" xmlns="http://www.w3.org/2000/svg" width="30" height="30">
+    <path
+        d="M82.55 267.47s-13.2 7.68 9.4 10.28c27.37 3.12 41.35 2.67 71.51-3.04 0 0 7.93 4.97 19 9.28-67.6 28.98-153.01-1.68-99.9-16.52m-8.26-37.81s-14.81 10.96 7.8 13.3c29.23 3.01 52.32 3.26 92.27-4.44 0 0 5.53 5.6 14.22 8.67-81.75 23.9-172.8 1.89-114.3-17.53"
+        fill="#5382A1"></path>
+    <path
+        d="M143.94 165.51c16.66 19.19-4.38 36.45-4.38 36.45s42.3-21.84 22.88-49.19c-18.15-25.5-32.06-38.17 43.27-81.86 0 0-118.24 29.53-61.77 94.6"
+        fill="#E76F00"></path>
+    <path
+        d="M233.36 295.44s9.77 8.05-10.75 14.28c-39.03 11.82-162.44 15.39-196.72.47-12.32-5.36 10.79-12.8 18.06-14.37 7.58-1.64 11.91-1.33 11.91-1.33-13.7-9.66-88.58 18.95-38.03 27.15 137.85 22.35 251.3-10.07 215.53-26.2M88.9 190.48s-62.77 14.9-22.23 20.32c17.12 2.3 51.25 1.78 83.03-.89 25.98-2.19 52.07-6.85 52.07-6.85s-9.16 3.93-15.8 8.45c-63.74 16.77-186.88 8.97-151.43-8.18 29.98-14.5 54.36-12.85 54.36-12.85m112.6 62.94c64.8-33.67 34.84-66.03 13.93-61.67-5.12 1.07-7.4 2-7.4 2s1.9-2.99 5.53-4.28c41.37-14.54 73.19 42.9-13.36 65.65 0 0 1-.9 1.3-1.7"
+        fill="#5382A1"></path>
+    <path
+        d="M162.44.37s35.89 35.9-34.04 91.1c-56.07 44.28-12.78 69.53-.02 98.38-32.73-29.53-56.75-55.53-40.64-79.72C111.4 74.6 176.92 57.39 162.44.37"
+        fill="#E76F00"></path>
+    <path
+        d="M95.27 344.67c62.2 3.98 157.71-2.21 159.97-31.64 0 0-4.35 11.15-51.4 20.01-53.09 10-118.57 8.83-157.4 2.42 0 0 7.95 6.58 48.83 9.2"
+        fill="#5382A1"></path>
+</svg>
\ No newline at end of file
diff --git a/docs/language-logos/javascript.svg b/docs/language-logos/javascript.svg
new file mode 100644
index 00000000000..4c808b1bf68
--- /dev/null
+++ b/docs/language-logos/javascript.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 630 630" width="30" height="30">
+<rect width="630" height="630" fill="#f7df1e"/>
+<path d="m423.2 492.19c12.69 20.72 29.2 35.95 58.4 35.95 24.53 0 40.2-12.26 40.2-29.2 0-20.3-16.1-27.49-43.1-39.3l-14.8-6.35c-42.72-18.2-71.1-41-71.1-89.2 0-44.4 33.83-78.2 86.7-78.2 37.64 0 64.7 13.1 84.2 47.4l-46.1 29.6c-10.15-18.2-21.1-25.37-38.1-25.37-17.34 0-28.33 11-28.33 25.37 0 17.76 11 24.95 36.4 35.95l14.8 6.34c50.3 21.57 78.7 43.56 78.7 93 0 53.3-41.87 82.5-98.1 82.5-54.98 0-90.5-26.2-107.88-60.54zm-209.13 5.13c9.3 16.5 17.76 30.45 38.1 30.45 19.45 0 31.72-7.61 31.72-37.2v-201.3h59.2v202.1c0 61.3-35.94 89.2-88.4 89.2-47.4 0-74.85-24.53-88.81-54.075z"/>
+</svg>
\ No newline at end of file
diff --git a/docs/language-logos/python.svg b/docs/language-logos/python.svg
new file mode 100644
index 00000000000..d06a313c96b
--- /dev/null
+++ b/docs/language-logos/python.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 255" width="30" height="30">
+    <path
+        d="M126.916.072c-64.832 0-60.784 28.115-60.784 28.115l.072 29.128h61.868v8.745H41.631S.145 61.355.145 126.77c0 65.417 36.21 63.097 36.21 63.097h21.61v-30.356s-1.165-36.21 35.632-36.21h61.362s34.475.557 34.475-33.319V33.97S194.67.072 126.916.072zM92.802 19.66a11.12 11.12 0 0111.13 11.13 11.12 11.12 0 01-11.13 11.13 11.12 11.12 0 01-11.13-11.13 11.12 11.12 0 0111.13-11.13z"
+        fill="#3372a7"></path>
+    <path
+        d="M128.757 254.126c64.832 0 60.784-28.115 60.784-28.115l-.072-29.127H127.6v-8.745h86.441s41.486 4.705 41.486-60.712c0-65.416-36.21-63.096-36.21-63.096h-21.61v30.355s1.165 36.21-35.632 36.21h-61.362s-34.475-.557-34.475 33.32v56.013s-5.235 33.897 62.518 33.897zm34.114-19.586a11.12 11.12 0 01-11.13-11.13 11.12 11.12 0 0111.13-11.131 11.12 11.12 0 0111.13 11.13 11.12 11.12 0 01-11.13 11.13z"
+        fill="#ffd235"></path>
+</svg>
\ No newline at end of file
diff --git a/docs/language-logos/rust.svg b/docs/language-logos/rust.svg
new file mode 100644
index 00000000000..89039333533
--- /dev/null
+++ b/docs/language-logos/rust.svg
@@ -0,0 +1,57 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 106 106" height="30" width="30">
+<g id="logo" transform="translate(53, 53)">
+  <path id="r" transform="translate(0.5, 0.5)" stroke="black" stroke-width="1" stroke-linejoin="round" d="     M -9,-15 H 4 C 12,-15 12,-7 4,-7 H -9 Z     M -40,22 H 0 V 11 H -9 V 3 H 1 C 12,3 6,22 15,22 H 40     V 3 H 34 V 5 C 34,13 25,12 24,7 C 23,2 19,-2 18,-2 C 33,-10 24,-26 12,-26 H -35     V -15 H -25 V 11 H -40 Z"/>
+  <g id="gear" mask="url(#holes)">
+    <circle r="43" fill="none" stroke="black" stroke-width="9"/>
+    <g id="cogs">
+      <polygon id="cog" stroke="black" stroke-width="3" stroke-linejoin="round" points="46,3 51,0 46,-3"/>
+      <use xlink:href="#cog" transform="rotate(11.25)"/>
+      <use xlink:href="#cog" transform="rotate(22.50)"/>
+      <use xlink:href="#cog" transform="rotate(33.75)"/>
+      <use xlink:href="#cog" transform="rotate(45.00)"/>
+      <use xlink:href="#cog" transform="rotate(56.25)"/>
+      <use xlink:href="#cog" transform="rotate(67.50)"/>
+      <use xlink:href="#cog" transform="rotate(78.75)"/>
+      <use xlink:href="#cog" transform="rotate(90.00)"/>
+      <use xlink:href="#cog" transform="rotate(101.25)"/>
+      <use xlink:href="#cog" transform="rotate(112.50)"/>
+      <use xlink:href="#cog" transform="rotate(123.75)"/>
+      <use xlink:href="#cog" transform="rotate(135.00)"/>
+      <use xlink:href="#cog" transform="rotate(146.25)"/>
+      <use xlink:href="#cog" transform="rotate(157.50)"/>
+      <use xlink:href="#cog" transform="rotate(168.75)"/>
+      <use xlink:href="#cog" transform="rotate(180.00)"/>
+      <use xlink:href="#cog" transform="rotate(191.25)"/>
+      <use xlink:href="#cog" transform="rotate(202.50)"/>
+      <use xlink:href="#cog" transform="rotate(213.75)"/>
+      <use xlink:href="#cog" transform="rotate(225.00)"/>
+      <use xlink:href="#cog" transform="rotate(236.25)"/>
+      <use xlink:href="#cog" transform="rotate(247.50)"/>
+      <use xlink:href="#cog" transform="rotate(258.75)"/>
+      <use xlink:href="#cog" transform="rotate(270.00)"/>
+      <use xlink:href="#cog" transform="rotate(281.25)"/>
+      <use xlink:href="#cog" transform="rotate(292.50)"/>
+      <use xlink:href="#cog" transform="rotate(303.75)"/>
+      <use xlink:href="#cog" transform="rotate(315.00)"/>
+      <use xlink:href="#cog" transform="rotate(326.25)"/>
+      <use xlink:href="#cog" transform="rotate(337.50)"/>
+      <use xlink:href="#cog" transform="rotate(348.75)"/>
+    </g>
+    <g id="mounts">
+      <polygon id="mount" stroke="black" stroke-width="6" stroke-linejoin="round" points="-7,-42 0,-35 7,-42"/>
+      <use xlink:href="#mount" transform="rotate(72)"/>
+      <use xlink:href="#mount" transform="rotate(144)"/>
+      <use xlink:href="#mount" transform="rotate(216)"/>
+      <use xlink:href="#mount" transform="rotate(288)"/>
+    </g>
+  </g>
+  <mask id="holes">
+    <rect x="-60" y="-60" width="120" height="120" fill="white"/>
+    <circle id="hole" cy="-40" r="3"/>
+    <use xlink:href="#hole" transform="rotate(72)"/>
+    <use xlink:href="#hole" transform="rotate(144)"/>
+    <use xlink:href="#hole" transform="rotate(216)"/>
+    <use xlink:href="#hole" transform="rotate(288)"/>
+  </mask>
+</g>
+</svg>
\ No newline at end of file
diff --git a/docs/logo.png b/docs/logo.png
index 3d8f03fa0cf0fb98578e83d9b2ff71de3ead11c0..88961b3e3f0c0520a48e91b06e353a73fce35594 100644
GIT binary patch
literal 67366
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
AC;$Ke

literal 84934
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
HQcnFJ3p12(


From 1545902399f4214d57620a2d0503af0e3f5051cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 27 Oct 2022 10:20:36 -0500
Subject: [PATCH 2333/4969] Add step to create symlink when Docker for Mac 4.13
 is installed (#6064)

Starting Docker for Mac 4.13, `/var/run/docker.sock` symlink is not
created. In order to use it with Testcontainers, the next command
should be executed right after the installation
`sudo ln -s $HOME/.docker/run/docker.sock /var/run/docker.sock`
---
 docs/supported_docker_environment/index.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 885325545ff..66a0932e0bd 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -11,16 +11,16 @@ However, these are not actively tested in the main development workflow, so not
 If you have further questions about configuration details for your setup or whether it supports running Testcontainers-based tests, 
 please contact the Testcontainers team and other users from the Testcontainers community on [Slack](https://slack.testcontainers.org/).
 
-| Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                 |
-|-------------------------------------|-----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Linux - general                     | Docker v17.09              | After docker installation, follow [post-installation steps](https://docs.docker.com/engine/install/linux-postinstall/).                                                                             |
-| Linux - CircleCI (LXC driver)      | Docker v17.09               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                     |
-| Linux - within a Docker container            | Docker v17.09              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                              |
-| Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                     |
-| Mac OS X - Docker for Mac      | v17.09          | *Support is best-efforts at present*. `getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
-| Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                |
-| Windows - Docker for Windows   |                             | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md)                                                                   |
-| Windows - Windows Subsystem for Linux (WSL) | Docker v17.09                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md).                                                                  |
+| Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                                                                                                       |
+|-------------------------------------|-----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Linux - general                     | Docker v17.09              | After docker installation, follow [post-installation steps](https://docs.docker.com/engine/install/linux-postinstall/).                                                                                                                                                                   |
+| Linux - CircleCI (LXC driver)      | Docker v17.09               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                                                                                                           |
+| Linux - within a Docker container            | Docker v17.09              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                                                                                                                    |
+| Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                                                                                                           |
+| Mac OS X - Docker for Mac      | v17.09          | Starting 4.13, run `sudo ln -s $HOME/.docker/run/docker.sock /var/run/docker.sock`<br>Support is best-efforts at present<br>`getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
+| Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                                                                                                      |
+| Windows - Docker for Windows   |                             | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md)                                                                                                                                                         |
+| Windows - Windows Subsystem for Linux (WSL) | Docker v17.09                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md).                                                                                                                                                        |
 
 ## Using Colima?
 

From b7925beb27e8e072dd2ee53757d47ae8bc63d3bc Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Thu, 27 Oct 2022 18:23:43 +0200
Subject: [PATCH 2334/4969] Clarify docs to better reflect the links to other
 languages (#6068)

---
 docs/index.md               | 12 ++++--------
 docs/supported_languages.md |  9 ---------
 mkdocs.yml                  |  3 +--
 3 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 docs/supported_languages.md

diff --git a/docs/index.md b/docs/index.md
index ed365b2acf3..143888be53e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,23 +3,19 @@
 <!-- allow aspect ratio computation to reduce layout shift. CSS enforces max-width: 100% -->
 <img src="logo.png" alt="Testcontainers logo" width="1024" height="512"/>
 
-## Test dependencies as code for your entire stack
-Get lightweight and throwaway containers during your tests that let you test against any container image (database, broker, browser, etc..) using one of the several supported languages.
-
-
-<p align=center><strong>Select your language</strong></p>
+<p align=center><strong>Not using Java? Here are other supported languages!</strong></p>
 <div class="card-grid">
     <a class="card-grid-item"><img src="language-logos/java.svg"/>Java</a>
     <a href="https://golang.testcontainers.org/" class="card-grid-item"><img src="language-logos/go.svg"/>Go</a>
     <a href="https://dotnet.testcontainers.org/" class="card-grid-item"><img src="language-logos/dotnet.svg"/>.NET</a>
     <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
-    <a href="https://github.com/testcontainers/testcontainers-node" class="card-grid-item"><img src="language-logos/javascript.svg"/>JavaScript<wbr>/Node.js</a>
+    <a href="https://github.com/testcontainers/testcontainers-node" class="card-grid-item"><img src="language-logos/javascript.svg"/><span>JavaScript<wbr>/Node.js</span></a>
     <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="language-logos/rust.svg"/>Rust</a>
 </div>
 
-## About
+## About Testcontainers for Java
 
-Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
+*Testcontainers for Java* is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 
 Testcontainers make the following kinds of tests easier:
 
diff --git a/docs/supported_languages.md b/docs/supported_languages.md
deleted file mode 100644
index 4990559f0e7..00000000000
--- a/docs/supported_languages.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Other Supported Languages
-
-Besides *Testcontainers for Java,* you can find Testcontainers implementations for many other languages.
-Please note that not all features that are available in *Testcontainers for Java* might be available in the implementations for other languages yet.
-
-* [Go](https://golang.testcontainers.org/)
-* [.Net](https://github.com/testcontainers/testcontainers-dotnet)
-* [Python](https://testcontainers-python.readthedocs.io/)
-* [JavaScript/NodeJS](https://github.com/testcontainers/testcontainers-node)
diff --git a/mkdocs.yml b/mkdocs.yml
index 47b000c89fb..c4f70e7067e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
-site_name: Testcontainers
+site_name: Testcontainers for Java
 plugins:
     - search
     - codeinclude
@@ -104,7 +104,6 @@ nav:
           - supported_docker_environment/windows.md
           - supported_docker_environment/logging_config.md
           - supported_docker_environment/image_registry_rate_limiting.md
-    - Other Supported Languages: supported_languages.md
     - Getting help: getting_help.md
     - Contributing:
           - contributing.md

From 0bb6925fb7d420dbd2c5d86f2bbf1d8513fd7dfc Mon Sep 17 00:00:00 2001
From: gustavomonarin <gustavomonarin@gmail.com>
Date: Thu, 27 Oct 2022 19:04:21 +0200
Subject: [PATCH 2335/4969] Expose Redpanda schema registry (#5994)

The schema registry port `8081` was added to the list of exposed ports and a supporting method `getSchemaRegistryAddress` was added to easily use for configuring `schema.registry.url` serializer configuration.

A minor change on the internal advertised address was made as the `kafka` alias was not available within the container and the panda proxy was getting lost with the following message:
```
INFO  2022-10-17 19:08:37,164 [shard 0] kafka/client - broker.cc:41 - connected to broker:-1 - 0.0.0.0:29092
WARN  2022-10-17 19:08:37,176 [shard 0] kafka/client - broker.cc:52 - std::system_error: kafka: Not found
ERROR 2022-10-17 19:08:37,177 [shard 0] pandaproxy - service.cc:137 - Schema registry failed to initialize internal topic: kafka::client::broker_error ({ node: -1 }, { error_code: broker_not_available [8] })
```
---
 docs/modules/redpanda.md                      |  6 ++++
 modules/redpanda/build.gradle                 |  1 +
 .../redpanda/RedpandaContainer.java           | 11 +++++--
 .../redpanda/RedpandaContainerTest.java       | 32 +++++++++++++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/docs/modules/redpanda.md b/docs/modules/redpanda.md
index 8749c9c87f5..8cdcc1ee83d 100644
--- a/docs/modules/redpanda.md
+++ b/docs/modules/redpanda.md
@@ -19,6 +19,12 @@ Now your tests or any other process running on your machine can get access to ru
 [Bootstrap Servers](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:getBootstrapServers
 <!--/codeinclude-->
 
+Redpanda also provides a schema registry implementation. Like the Redpanda broker, you can access by using the following schema registry location:
+
+<!--codeinclude-->
+[Schema Registry](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:getSchemaRegistryAddress
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 4d7221711a3..17e0ca201bc 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,4 +5,5 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'io.rest-assured:rest-assured:5.2.0'
 }
diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index cbb7db1e7c1..32b2ae20857 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -18,6 +18,8 @@ public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
 
     private static final int REDPANDA_PORT = 9092;
 
+    private static final int SCHEMA_REGISTRY_PORT = 8081;
+
     private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
 
     public RedpandaContainer(String image) {
@@ -33,7 +35,7 @@ public RedpandaContainer(DockerImageName imageName) {
             throw new IllegalArgumentException("Redpanda version must be >= v22.2.1");
         }
 
-        withExposedPorts(REDPANDA_PORT);
+        withExposedPorts(REDPANDA_PORT, SCHEMA_REGISTRY_PORT);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withEntrypoint("sh");
         });
@@ -49,7 +51,8 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
 
         command += "/usr/bin/rpk redpanda start --mode dev-container ";
         command += "--kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 ";
-        command += "--advertise-kafka-addr PLAINTEXT://kafka:29092,OUTSIDE://" + getHost() + ":" + getMappedPort(9092);
+        command +=
+            "--advertise-kafka-addr PLAINTEXT://127.0.0.1:29092,OUTSIDE://" + getHost() + ":" + getMappedPort(9092);
 
         copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
     }
@@ -57,4 +60,8 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
     public String getBootstrapServers() {
         return String.format("PLAINTEXT://%s:%s", getHost(), getMappedPort(REDPANDA_PORT));
     }
+
+    public String getSchemaRegistryAddress() {
+        return String.format("http://%s:%s", getHost(), getMappedPort(SCHEMA_REGISTRY_PORT));
+    }
 }
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index 086bf43364b..5ffccd63c62 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -1,6 +1,8 @@
 package org.testcontainers.redpanda;
 
 import com.google.common.collect.ImmutableMap;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
@@ -64,6 +66,36 @@ public void testNotCompatibleVersion() {
             .hasMessageContaining("Redpanda version must be >= v22.2.1");
     }
 
+    @Test
+    public void testSchemaRegistry() {
+        try (RedpandaContainer container = new RedpandaContainer(REDPANDA_DOCKER_IMAGE)) {
+            container.start();
+
+            String subjectsEndpoint = String.format(
+                "%s/subjects",
+                // getSchemaRegistryAddress {
+                container.getSchemaRegistryAddress()
+                // }
+            );
+
+            String subjectName = String.format("test-%s-value", UUID.randomUUID());
+
+            Response createSubject = RestAssured
+                .given()
+                .contentType("application/vnd.schemaregistry.v1+json")
+                .pathParam("subject", subjectName)
+                .body("{\"schema\": \"{\\\"type\\\": \\\"string\\\"}\"}")
+                .when()
+                .post(subjectsEndpoint + "/{subject}/versions")
+                .thenReturn();
+            assertThat(createSubject.getStatusCode()).isEqualTo(200);
+
+            Response allSubjects = RestAssured.given().when().get(subjectsEndpoint).thenReturn();
+            assertThat(allSubjects.getStatusCode()).isEqualTo(200);
+            assertThat(allSubjects.jsonPath().getList("$")).contains(subjectName);
+        }
+    }
+
     private void testKafkaFunctionality(String bootstrapServers) throws Exception {
         testKafkaFunctionality(bootstrapServers, 1, 1);
     }

From f3992bb26513733f0b290261c36b134de9b00b56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 17:05:12 +0000
Subject: [PATCH 2336/4969] Bump kafka-clients from 3.3.0 to 3.3.1 in
 /modules/kafka

Bumps kafka-clients from 3.3.0 to 3.3.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 70907510afe..ccc9749db6d 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 287aaab8f3f008ec35c2271add5d976355c44b57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Oct 2022 17:05:17 +0000
Subject: [PATCH 2337/4969] Bump kafka-clients from 3.3.0 to 3.3.1 in /examples

Bumps kafka-clients from 3.3.0 to 3.3.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 5212bc33fa9..87ccacea06f 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.3'

From 695cda7529b7d1845ab80f3a03e105907cfce11c Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 28 Oct 2022 17:43:34 +0200
Subject: [PATCH 2338/4969] chore: sync governance files (#6075)

Also follow-up for using Node.js logo
---
 .github/settings.yml               | 361 +++++++++++++++++++++++++++++
 docs/contributing.md               |  11 +-
 docs/contributing_docs.md          |   2 +-
 docs/index.md                      |   2 +-
 docs/language-logos/javascript.svg |   4 -
 docs/language-logos/nodejs.svg     |   5 +
 6 files changed, 373 insertions(+), 12 deletions(-)
 create mode 100644 .github/settings.yml
 delete mode 100644 docs/language-logos/javascript.svg
 create mode 100644 docs/language-logos/nodejs.svg

diff --git a/.github/settings.yml b/.github/settings.yml
new file mode 100644
index 00000000000..e3839c9030f
--- /dev/null
+++ b/.github/settings.yml
@@ -0,0 +1,361 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+repository:
+  # See https://docs.github.com/en/rest/reference/repos#update-a-repository for all available settings.
+
+  # The name of the repository. Changing this will rename the repository
+  name: testcontainers-java
+
+  # A short description of the repository that will show up on GitHub
+  description: Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
+
+  # A URL with more information about the repository
+  homepage: https://testcontainers.org
+
+  # A comma-separated list of topics to set on the repository
+  topics: java,testing,docker,docker-compose,jvm,test-automation,junit,hacktoberfest
+
+  # Either `true` to make the repository private, or `false` to make it public.
+  private: false
+
+  # Either `true` to enable issues for this repository, `false` to disable them.
+  has_issues: true
+
+  # Either `true` to enable projects for this repository, or `false` to disable them.
+  # If projects are disabled for the organization, passing `true` will cause an API error.
+  has_projects: false
+
+  # Either `true` to enable the wiki for this repository, `false` to disable it.
+  has_wiki: false
+
+  # Either `true` to enable downloads for this repository, `false` to disable them.
+  has_downloads: false
+
+  # Updates the default branch for this repository.
+  default_branch: main
+
+  # Either `true` to allow squash-merging pull requests, or `false` to prevent
+  # squash-merging.
+  allow_squash_merge: true
+
+  # Either `true` to allow merging pull requests with a merge commit, or `false`
+  # to prevent merging pull requests with merge commits.
+  allow_merge_commit: false
+
+  # Either `true` to allow rebase-merging pull requests, or `false` to prevent
+  # rebase-merging.
+  allow_rebase_merge: false
+
+  # Either `true` to enable automatic deletion of branches on merge, or `false` to disable
+  delete_branch_on_merge: true
+
+# Labels: define labels for Issues and Pull Requests
+# If including a `#`, make sure to wrap it with quotes!
+labels:
+  - name: area/bitbucket-pipelines
+    color: '#f9d0c4'
+
+  - name: area/docker-compose
+    color: '#f9d0c4'
+
+  - name: area/logging
+    color: '#f9d0c4'
+
+  - name: area/shading
+    color: '#f9d0c4'
+
+  - name: area/test frameworks
+    color: '#f9d0c4'
+
+  - name: blocker
+    color: '#b60205'
+
+  - name: client/docker-for-mac
+    color: '#c2e0c6'
+
+  - name: client/docker-for-windows
+    color: '#c2e0c6'
+
+  - name: client/docker-machine
+    color: '#c2e0c6'
+
+  - name: client/in-container
+    color: '#c2e0c6'
+
+  - name: client/podman
+    color: '#c2e0c6'
+
+  - name: dependencies
+    color: '#0025ff'
+
+  - name: github_actions
+    color: '#000000'
+
+  - name: good first issue
+    color: '#14d60a'
+
+  - name: gradle-wrapper
+    color: '#02303A'
+
+  - name: hacktoberfest
+    color: '#14d60a'
+
+  - name: hacktoberfest-accepted
+    color: '#79C259'
+
+  - name: help wanted
+    color: '#fef2c0'
+
+  - name: modules/azure
+    color: '#006b75'
+
+  - name: modules/cassandra
+    color: '#006b75'
+
+  - name: modules/clickhouse
+    color: '#006b75'
+
+  - name: modules/cockroachdb
+    color: '#006b75'
+
+  - name: modules/consul
+    color: '#006b75'
+
+  - name: modules/couchbase
+    color: '#006b75'
+
+  - name: modules/db2
+    color: '#006b75'
+
+  - name: modules/dynalite
+    color: '#006b75'
+
+  - name: modules/elasticsearch
+    color: '#006b75'
+
+  - name: modules/gcloud
+    color: '#006b75'
+
+  - name: modules/hivemq
+    color: '#006b75'
+
+  - name: modules/influx
+    color: '#006b75'
+
+  - name: modules/jdbc
+    color: '#006b75'
+
+  - name: modules/jupiter
+    color: '#006b75'
+
+  - name: modules/k3s
+    color: '#006b75'
+
+  - name: modules/kafka
+    color: '#006b75'
+
+  - name: modules/localstack
+    color: '#006b75'
+
+  - name: modules/mariadb
+    color: '#006b75'
+
+  - name: modules/mockserver
+    color: '#006b75'
+
+  - name: modules/mongodb
+    color: '#006b75'
+
+  - name: modules/mysql
+    color: '#006b75'
+
+  - name: modules/neo4j
+    color: '#006b75'
+
+  - name: modules/nginx
+    color: '#006b75'
+
+  - name: modules/oracle
+    color: '#006b75'
+
+  - name: modules/orientdb
+    color: '#006b75'
+
+  - name: modules/postgres
+    color: '#006b75'
+
+  - name: modules/presto
+    color: '#006b75'
+
+  - name: modules/pulsar
+    color: '#006b75'
+
+  - name: modules/questdb
+    color: '#006b75'
+
+  - name: modules/r2dbc
+    color: '#006b75'
+
+  - name: modules/rabbitmq
+    color: '#006b75'
+
+  - name: modules/redpanda
+    color: '#006b75'
+
+  - name: modules/selenium
+    color: '#006b75'
+
+  - name: modules/solr
+    color: '#006b75'
+
+  - name: modules/spock
+    color: '#006b75'
+
+  - name: modules/sql-server
+    color: '#006b75'
+
+  - name: modules/tidb
+    color: '#006b75'
+
+  - name: modules/toxiproxy
+    color: '#006b75'
+
+  - name: modules/trino
+    color: '#006b75'
+
+  - name: modules/vault
+    color: '#006b75'
+
+  - name: os/linux
+    color: '#1d76db'
+
+  - name: os/macOS
+    color: '#1d76db'
+
+  - name: os/windows
+    color: '#1d76db'
+
+  - name: resolution/acknowledged
+    color: '#fef2c0'
+
+  - name: resolution/answered
+    color: '#fef2c0'
+
+  - name: resolution/awaiting-release
+    color: '#fef2c0'
+
+  - name: resolution/duplicate
+    color: '#fef2c0'
+
+  - name: resolution/invalid
+    color: '#fef2c0'
+
+  - name: resolution/pr-submitted
+    color: '#fef2c0'
+
+  - name: resolution/somedaymaybe
+    color: '#fef2c0'
+
+  - name: resolution/waiting-for-info
+    color: '#fef2c0'
+
+  - name: resolution/wontfix
+    color: '#fef2c0'
+
+  - name: security
+    color: '#ee0701'
+
+  - name: stale
+    color: '#ffffff'
+
+  - name: type/breaking-api-change
+    color: '#d4c5f9'
+
+  - name: type/bug
+    color: '#d4c5f9'
+
+  - name: type/deprecation
+    color: '#d4c5f9'
+
+  - name: type/docs
+    color: '#d4c5f9'
+
+  - name: type/enhancement
+    color: '#d4c5f9'
+
+  - name: type/feature
+    color: '#d4c5f9'
+
+  - name: type/housekeeping
+    color: '#d4c5f9'
+
+  - name: type/new module
+    color: '#d4c5f9'
+
+  - name: type/question
+    color: '#d4c5f9'
+
+  - name: type/test-improvement
+    color: '#d4c5f9'
+
+# Collaborators: give specific users access to this repository.
+# See https://docs.github.com/en/rest/reference/repos#add-a-repository-collaborator for available options
+# collaborators:
+#   - username:
+#     permission: maintain
+
+  # Note: `permission` is only valid on organization-owned repositories.
+  # The permission to grant the collaborator. Can be one of:
+  # * `pull` - can pull, but not push to or administer this repository.
+  # * `push` - can pull and push, but not administer this repository.
+  # * `admin` - can pull, push and administer this repository.
+  # * `maintain` - Recommended for project managers who need to manage the repository without access to sensitive or destructive actions.
+  # * `triage` - Recommended for contributors who need to proactively manage issues and pull requests without write access.
+
+# See https://docs.github.com/en/rest/reference/teams#add-or-update-team-repository-permissions for available options
+teams:
+  # Please make sure the team already exist in the organization, as the repository-settings application is not creating them.
+  # See https://github.com/repository-settings/app/discussions/639 for more information about teams and settings
+  - name: java-team
+    # The permission to grant the team. Can be one of:
+    # * `pull` - can pull, but not push to or administer this repository.
+    # * `push` - can pull and push, but not administer this repository.
+    # * `admin` - can pull, push and administer this repository.
+    # * `maintain` - Recommended for project managers who need to manage the repository without access to sensitive or destructive actions.
+    # * `triage` - Recommended for contributors who need to proactively manage issues and pull requests without write access.
+    permission: admin
+  - name: oss-team
+    permission: maintain
+
+branches:
+  - name: main
+    # https://docs.github.com/en/rest/reference/repos#update-branch-protection
+    # Branch Protection settings. Set to null to disable
+    protection:
+      # Required. Require at least one approving review on a pull request, before merging. Set to null to disable.
+      required_pull_request_reviews:
+        # The number of approvals required. (1-6)
+        required_approving_review_count: 1
+        # Dismiss approved reviews automatically when a new commit is pushed.
+        dismiss_stale_reviews: true
+        # Blocks merge until code owners have reviewed.
+        require_code_owner_reviews: true
+        # Specify which users and teams can dismiss pull request reviews. Pass an empty dismissal_restrictions object to disable. User and team dismissal_restrictions are only available for organization-owned repositories. Omit this parameter for personal repositories.
+        dismissal_restrictions:
+          users: []
+          teams: [java-team]
+      # Required. Require status checks to pass before merging. Set to null to disable
+      required_status_checks:
+        # Required. Require branches to be up to date before merging.
+        strict: true
+        # Required. The list of status checks to require in order to merge into this branch
+        contexts: ["check", "check (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core"]
+      # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
+      enforce_admins: false
+      # Prevent merge commits from being pushed to matching branches
+      required_linear_history: true
+      # Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
+      restrictions:
+        apps: []
+        users: []
+        teams: [java-team]
diff --git a/docs/contributing.md b/docs/contributing.md
index c8eac36e03b..0edf9ffb05c 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -1,7 +1,7 @@
 # Contributing
 
 * Star the project on [Github](https://github.com/testcontainers/testcontainers-java) and help spread the word :)
-* Join our [Slack group](http://slack.testcontainers.org)
+* Join our [Slack workspace](http://slack.testcontainers.org)
 * [Start a discussion](https://github.com/testcontainers/testcontainers-java/discussions) if you have an idea, find a possible bug or have a general question.
 * Contribute improvements or fixes using a [Pull Request](https://github.com/testcontainers/testcontainers-java/pulls). If you're going to contribute, thank you! Please just be sure to:
     * discuss with the authors prior to doing anything big.
@@ -56,18 +56,17 @@ Every item on this list will require judgement by the Testcontainers core mainta
 
 #### Module dependencies
 
-- [ ] The module should use as few dependencies as possible, 
+- [ ] The module should use as few dependencies as possible,
 - [ ] Regarding libraries, either:
-    - they should be `compileOnly` if they are likely to already be on the classpath for users' tests (e.g. client libraries or drivers) 
+    - they should be `compileOnly` if they are likely to already be on the classpath for users' tests (e.g. client libraries or drivers)
     - they can be `implementation` (and thus transitive dependencies) if they are very unlikely to conflict with users' dependencies.
 - [ ] If client libraries are used to test or use the module, these MUST be legal for Testcontainers developers and Testcontainers users to download and use.
 
 #### API (e.g. `MyModuleContainer` class)
 
 - [ ] Favour doing the right thing, and least surprising thing, by default
-- [ ] Ensure that method and parameter names are easy to understand. Many users will ignore documentation, so IDE-based substitutes (autocompletion and Javadocs) should be intuitive. 
+- [ ] Ensure that method and parameter names are easy to understand. Many users will ignore documentation, so IDE-based substitutes (autocompletion and Javadocs) should be intuitive.
 - [ ] The module's public API should only handle standard JDK data types and MUST not expose data types that come from `compileOnly` dependencies. This is to reduce the risk of compatibility problems with future versions of third party libraries.
- 
 #### Documentation
 
 - [ ] Every module MUST have a dedicated documentation page containing:
@@ -95,7 +94,7 @@ We will evaluate incubating modules periodically, and remove the label when appr
 
 ## Combining Dependabot PRs
 
-Since we generally get a lot of Dependabot PRs, we regularly combine them into single commits. 
+Since we generally get a lot of Dependabot PRs, we regularly combine them into single commits.
 For this, we are using the [gh-combine-prs](https://github.com/rnorth/gh-combine-prs) extension for [GitHub CLI](https://cli.github.com/).
 
 The whole process is as follow:
diff --git a/docs/contributing_docs.md b/docs/contributing_docs.md
index c303fe6b06c..aa195cf4546 100644
--- a/docs/contributing_docs.md
+++ b/docs/contributing_docs.md
@@ -1,6 +1,6 @@
 # Contributing to documentation
 
-The Testcontainers-java documentation is a static site built with [MkDocs](https://www.mkdocs.org/).
+The Testcontainers for Java documentation is a static site built with [MkDocs](https://www.mkdocs.org/).
 We use the [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) theme, which offers a number of useful extensions to MkDocs.
 
 In addition we use a [custom plugin](https://github.com/rnorth/mkdocs-codeinclude-plugin) for inclusion of code snippets.
diff --git a/docs/index.md b/docs/index.md
index 143888be53e..31d854b8734 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,7 +9,7 @@
     <a href="https://golang.testcontainers.org/" class="card-grid-item"><img src="language-logos/go.svg"/>Go</a>
     <a href="https://dotnet.testcontainers.org/" class="card-grid-item"><img src="language-logos/dotnet.svg"/>.NET</a>
     <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
-    <a href="https://github.com/testcontainers/testcontainers-node" class="card-grid-item"><img src="language-logos/javascript.svg"/><span>JavaScript<wbr>/Node.js</span></a>
+    <a href="https://github.com/testcontainers/testcontainers-node" class="card-grid-item"><img src="language-logos/nodejs.svg"/>Node.js</a>
     <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="language-logos/rust.svg"/>Rust</a>
 </div>
 
diff --git a/docs/language-logos/javascript.svg b/docs/language-logos/javascript.svg
deleted file mode 100644
index 4c808b1bf68..00000000000
--- a/docs/language-logos/javascript.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 630 630" width="30" height="30">
-<rect width="630" height="630" fill="#f7df1e"/>
-<path d="m423.2 492.19c12.69 20.72 29.2 35.95 58.4 35.95 24.53 0 40.2-12.26 40.2-29.2 0-20.3-16.1-27.49-43.1-39.3l-14.8-6.35c-42.72-18.2-71.1-41-71.1-89.2 0-44.4 33.83-78.2 86.7-78.2 37.64 0 64.7 13.1 84.2 47.4l-46.1 29.6c-10.15-18.2-21.1-25.37-38.1-25.37-17.34 0-28.33 11-28.33 25.37 0 17.76 11 24.95 36.4 35.95l14.8 6.34c50.3 21.57 78.7 43.56 78.7 93 0 53.3-41.87 82.5-98.1 82.5-54.98 0-90.5-26.2-107.88-60.54zm-209.13 5.13c9.3 16.5 17.76 30.45 38.1 30.45 19.45 0 31.72-7.61 31.72-37.2v-201.3h59.2v202.1c0 61.3-35.94 89.2-88.4 89.2-47.4 0-74.85-24.53-88.81-54.075z"/>
-</svg>
\ No newline at end of file
diff --git a/docs/language-logos/nodejs.svg b/docs/language-logos/nodejs.svg
new file mode 100644
index 00000000000..60091b1b759
--- /dev/null
+++ b/docs/language-logos/nodejs.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="30" height="30">
+    <path
+        d="M15.516 28.952a2.09 2.09 0 01-1.002-.263l-3.17-1.883c-.478-.262-.24-.358-.096-.405.644-.215.763-.263 1.43-.644.072-.048.167-.024.239.024l2.432 1.454c.095.048.214.048.286 0l9.513-5.507c.095-.048.143-.143.143-.263v-10.99c0-.12-.048-.215-.143-.263L15.635 4.73c-.096-.048-.215-.048-.286 0l-9.513 5.483c-.096.048-.143.167-.143.262v10.991c0 .096.047.215.143.263l2.599 1.502c1.406.715 2.288-.12 2.288-.954V11.428a.29.29 0 01.286-.286h1.216a.29.29 0 01.287.286v10.848c0 1.884-1.026 2.98-2.814 2.98-.548 0-.977 0-2.193-.596L5 23.23A2.012 2.012 0 014 21.49V10.497c0-.715.381-1.383 1.001-1.74l9.513-5.508a2.128 2.128 0 012.003 0l9.513 5.508a2.012 2.012 0 011.001 1.74V21.49c0 .716-.381 1.383-1.001 1.74l-9.513 5.508a2.44 2.44 0 01-1.001.215zm2.932-7.558c-4.172 0-5.03-1.907-5.03-3.529a.29.29 0 01.286-.286h1.24c.142 0 .262.096.262.239.19 1.263.739 1.883 3.266 1.883 2.003 0 2.861-.453 2.861-1.526 0-.62-.238-1.073-3.362-1.383-2.598-.262-4.22-.834-4.22-2.908 0-1.931 1.622-3.076 4.34-3.076 3.051 0 4.553 1.05 4.744 3.338a.385.385 0 01-.072.215c-.047.047-.119.095-.19.095h-1.24a.28.28 0 01-.262-.215c-.286-1.31-1.025-1.74-2.98-1.74-2.194 0-2.456.763-2.456 1.335 0 .691.31.906 3.266 1.288 2.933.381 4.315.93 4.315 2.98-.023 2.098-1.74 3.29-4.768 3.29z"
+        fill="#89D42C"></path>
+</svg>
\ No newline at end of file

From d792aaefeddd84db13aadca425c57c2095cfd16f Mon Sep 17 00:00:00 2001
From: rnzit <32677893+rnzit@users.noreply.github.com>
Date: Sat, 29 Oct 2022 23:47:41 +0700
Subject: [PATCH 2339/4969] Fix link zookeeper example (#6079)

---
 docs/examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples.md b/docs/examples.md
index b7b96ee52bb..cdacd0dad89 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -14,4 +14,4 @@ Examples of different use cases provided by Testcontainers can be found below:
 - [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot-kotlin-redis)
 - [TestNG](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache-testng)
 - [ImmuDb](https://github.com/testcontainers/testcontainers-java/tree/main/examples/immudb)
-- [Zookeeper](https://github.com/testcontainers/testcontainers-java/tree/main/examples/zookeper)
+- [Zookeeper](https://github.com/testcontainers/testcontainers-java/tree/main/examples/zookeeper)

From 442d4cd2d8e58a35432d3fe2ad8ff9731252f7a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:00:43 +0000
Subject: [PATCH 2340/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.314 to 1.12.333.
- [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.12.314...1.12.333)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 18ec4a61ac6..ee77d7e00bb 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c4f3313db9cbfc6409183d24672527b31cbe44d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:00:45 +0000
Subject: [PATCH 2341/4969] Bump mockito-core from 4.8.0 to 4.8.1 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e801e54ab83..6ede900605b 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.2.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.8.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.1') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 268bb93452ca6965cd231b4528d77e2d6d5df3d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:00:49 +0000
Subject: [PATCH 2342/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.4.2 to 8.5.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.4.2...v8.5.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 04521b974ea..7ebc78e6496 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.0"
     testImplementation "org.elasticsearch.client:transport:7.17.6"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From af84b38b1a2195d9e1fae86ace9696016f982c58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:00:50 +0000
Subject: [PATCH 2343/4969] Bump mockito-core from 4.8.0 to 4.8.1 in
 /modules/jdbc

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 7a0fbf03fc1..f753edb46ee 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.0'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation ('org.mockito:mockito-core:4.8.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.1') {
         exclude(module: 'hamcrest-core')
     }
 }

From 559071eccb90ae436115b61911d558a30d9493c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:01:06 +0000
Subject: [PATCH 2344/4969] Bump s3 from 2.17.285 to 2.18.7 in
 /modules/localstack

Bumps s3 from 2.17.285 to 2.18.7.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 87ecdc4a515..3d93021b0c8 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.314'
-    testImplementation 'software.amazon.awssdk:s3:2.17.285'
+    testImplementation 'software.amazon.awssdk:s3:2.18.7'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c8292aabf07c3cfc73e82778f057f6033f36a170 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:01:14 +0000
Subject: [PATCH 2345/4969] Bump aws-java-sdk-s3 from 1.12.314 to 1.12.333 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.314 to 1.12.333.
- [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.12.314...1.12.333)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 87ecdc4a515..43a36decb86 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.314'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.314'
     testImplementation 'software.amazon.awssdk:s3:2.17.285'

From 46b2a37d909d42b3f412edf66fb7a8efdf921ac8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:01:26 +0000
Subject: [PATCH 2346/4969] Bump gradle/wrapper-validation-action from 1.0.4 to
 1.0.5

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/e6e38bacfdf1a337459f332974bb2327a31aaf4b...55e685c48d84285a5b0418cd094606e199cca3b6)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index c2fe34cfe19..269322e4c07 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -23,4 +23,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b # v1.0.3
+      - uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1.0.3

From d182eb40678989107fde9801bf6ee54d583e03f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:01:39 +0000
Subject: [PATCH 2347/4969] Bump com.gradle.enterprise.gradle.plugin in
 /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.11.1 to 3.11.3.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 35b79454204..ea7dacdbb56 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index f0c1d306671..507b03623f4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }

From e53b093f4c31ff790efbf61b9061cc77497ca632 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:01:53 +0000
Subject: [PATCH 2348/4969] Bump cucumber-java from 7.8.0 to 7.9.0 in /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.8.0 to 7.9.0.
- [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/v7.8.0...v7.9.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 49dbd831cf5..453fb789ade 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:7.8.0'
+    testImplementation 'io.cucumber:cucumber-java:7.9.0'
     testImplementation 'io.cucumber:cucumber-junit:7.8.0'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From e2eacdf644bc2cf1cd3cd5440ab44df26736cab4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:02:51 +0000
Subject: [PATCH 2349/4969] Bump commons-compress from 1.21 to 1.22 in /core

Bumps commons-compress from 1.21 to 1.22.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 364f51b6b70..d921f3de9e7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
-    api 'org.apache.commons:commons-compress:1.21'
+    api 'org.apache.commons:commons-compress:1.22'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From d76d6bb789136263f4b3a7bab67908a21d5b01fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:03:02 +0000
Subject: [PATCH 2350/4969] Bump mockito-core from 4.8.0 to 4.8.1 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 364f51b6b70..e475cef76a5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
-    testImplementation ('org.mockito:mockito-core:4.8.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.1') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 9e19bc7e4bc24298337fd20cdf0f3b3d22c75954 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:04:56 +0000
Subject: [PATCH 2351/4969] Bump trino-jdbc from 398 to 401 in /modules/trino

Bumps trino-jdbc from 398 to 401.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index c534f14bd2a..1fd5561d85c 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:398'
+    testImplementation 'io.trino:trino-jdbc:401'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 9004bfb355b8282747a37f902d17c8448c3400d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:05:06 +0000
Subject: [PATCH 2352/4969] Bump google-cloud-pubsub from 1.120.18 to 1.120.24
 in /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.18 to 1.120.24.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.18...v1.120.24)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index a5a72db0982..3fa4f6fd266 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.11.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.13.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 9c008ba19a24f059d77c4aa53cf768f412e1affa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:05:06 +0000
Subject: [PATCH 2353/4969] Bump jcc from 11.5.7.0 to 11.5.8.0 in /modules/db2

Bumps jcc from 11.5.7.0 to 11.5.8.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 804f51000d7..5021e958c60 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.ibm.db2:jcc:11.5.7.0'
+    testImplementation 'com.ibm.db2:jcc:11.5.8.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 98ba3ca666c0227053d61536958b9c2380e93420 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:05:26 +0000
Subject: [PATCH 2354/4969] Bump azure-cosmos from 4.37.0 to 4.38.1 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.37.0 to 4.38.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.37.0...azure-cosmos_4.38.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 78c6500d856..7723ace6404 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.37.0'
+    testImplementation 'com.azure:azure-cosmos:4.38.1'
 }

From ffbab9a7aa9bfbd7b21aa6766ed439dd254893aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:05:41 +0000
Subject: [PATCH 2355/4969] Bump google-cloud-bigtable from 2.13.0 to 2.15.0 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.13.0 to 2.15.0.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.13.0...v2.15.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index a5a72db0982..3f9d2dca356 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.13.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 1db65378af88b8b4ac45231e54043eee62c357ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:05:47 +0000
Subject: [PATCH 2356/4969] Bump google-cloud-datastore from 2.11.4 to 2.12.3
 in /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.11.4 to 2.12.3.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.11.4...v2.12.3)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index a5a72db0982..70f99f52387 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.11.4'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'

From 4debd3371dc91c60fc0202969b9aa3eba08fbeed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:07:01 +0000
Subject: [PATCH 2357/4969] Bump com.gradle.enterprise.gradle.plugin from
 3.11.1 to 3.11.3

Bumps com.gradle.enterprise.gradle.plugin from 3.11.1 to 3.11.3.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f0c1d306671..507b03623f4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }

From 25f88aa5cdc6401ce70af1f587e1f0be1c866945 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:09:51 +0000
Subject: [PATCH 2358/4969] Bump questdb from 6.4.3-jdk8 to 6.5.4-jdk8 in
 /modules/questdb

Bumps [questdb](https://github.com/questdb/questdb) from 6.4.3-jdk8 to 6.5.4-jdk8.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/commits)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 79fc0793879..388e9d5824c 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.questdb:questdb:6.4.3-jdk8'
+    testImplementation 'org.questdb:questdb:6.5.4-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }

From 7dead16bf0fab5fcb5d9ca9262773041aa840956 Mon Sep 17 00:00:00 2001
From: Marcel Blonk <github@blonk.org>
Date: Tue, 1 Nov 2022 18:22:26 -0400
Subject: [PATCH 2359/4969] Fixes Image timestamp calculation (#5988)

According to the docs `Created`  is `integerDate and time at which the image was created as a Unix timestamp (number of seconds sinds EPOCH)`

Fixes #4275
---
 core/src/main/java/org/testcontainers/images/ImageData.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/images/ImageData.java b/core/src/main/java/org/testcontainers/images/ImageData.java
index e57be2dbbbd..694b7ef6528 100644
--- a/core/src/main/java/org/testcontainers/images/ImageData.java
+++ b/core/src/main/java/org/testcontainers/images/ImageData.java
@@ -24,6 +24,6 @@ static ImageData from(InspectImageResponse inspectImageResponse) {
     }
 
     static ImageData from(Image image) {
-        return ImageData.builder().createdAt(Instant.ofEpochMilli(image.getCreated())).build();
+        return ImageData.builder().createdAt(Instant.ofEpochSecond(image.getCreated())).build();
     }
 }

From 8fe59016d4c7abb7bce3f0e69716e919e998255d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 1 Nov 2022 16:41:36 -0600
Subject: [PATCH 2360/4969] chore: sync governance files (#6077)

---
 .github/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index e3839c9030f..81dbefa4f03 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -349,7 +349,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["check", "check (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core"]
+        contexts: ["check (:testcontainers:check)", "check (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches

From 56bc02e463e01f0d677a8deebf0f8db77d1e5d80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 06:37:22 +0000
Subject: [PATCH 2361/4969] Bump java-client from 3.3.4 to 3.4.0 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.3.4 to 3.4.0.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.3.4...java-client-3.4.0)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 0542a5d68d0..c2aad1b4ffd 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.3.4'
+    testImplementation 'com.couchbase.client:java-client:3.4.0'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c7466501a0e4f5c01a10220834fee9e7c68eab99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:08 +0000
Subject: [PATCH 2362/4969] Bump kafka-clients from 3.3.0 to 3.3.1 in
 /modules/redpanda

Bumps kafka-clients from 3.3.0 to 3.3.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 17e0ca201bc..e8b7ce677fe 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'io.rest-assured:rest-assured:5.2.0'
 }

From 1f0bcb626ca3019ea9d0a374487a2d44885a737c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:14 +0000
Subject: [PATCH 2363/4969] Bump mysql-connector-java from 8.0.30 to 8.0.31 in
 /modules/jdbc-test

Bumps mysql-connector-java from 8.0.30 to 8.0.31.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 798508ffa22..ea170edbd82 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -13,5 +13,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.30'
+    api 'mysql:mysql-connector-java:8.0.31'
 }

From b9fed933b532d31db1d32f2879bc7e770fa03825 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:15 +0000
Subject: [PATCH 2364/4969] Bump common-custom-user-data-gradle-plugin from
 1.8.1 to 1.8.2

Bumps common-custom-user-data-gradle-plugin from 1.8.1 to 1.8.2.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 507b03623f4..48ad8755655 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }
 

From 978d7dbea6280739e727eebd4374ca8566b652f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:17 +0000
Subject: [PATCH 2365/4969] Bump jedis from 4.2.3 to 4.3.1 in /core

Bumps [jedis](https://github.com/redis/jedis) from 4.2.3 to 4.3.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.2.3...v4.3.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 26bc31f6680..906310575bf 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -87,7 +87,7 @@ dependencies {
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:4.2.3'
+    testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 

From ed341c5b28940f1ce7712cf0b528204c8cf00ab4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:18 +0000
Subject: [PATCH 2366/4969] Bump kubernetes-client from 6.1.1 to 6.2.0 in
 /modules/k3s

Bumps [kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.1.1 to 6.2.0.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.1.1...v6.2.0)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index e5fdb9f148b..81c4fc253c0 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.1.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.2.0'
     testImplementation 'io.kubernetes:client-java:16.0.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 92bedcfe7b16d846f2d2059f93cce7b95fce947e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:30 +0000
Subject: [PATCH 2367/4969] Bump junit-jupiter-engine from 5.4.2 to 5.9.1 in
 /examples

Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.4.2 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 3701d9699e9..1cc0413faa1 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.1"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 63ac7ba277479008d80de6e33e22a6ff3e4fa2e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:34 +0000
Subject: [PATCH 2368/4969] Bump transport from 7.17.6 to 7.17.7 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.6 to 7.17.7.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.6...v7.17.7)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 7ebc78e6496..a8001ca61e4 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.0"
-    testImplementation "org.elasticsearch.client:transport:7.17.6"
+    testImplementation "org.elasticsearch.client:transport:7.17.7"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 0e79fc6fa6e7ff821727d88bbb7bca0f53d81358 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:39 +0000
Subject: [PATCH 2369/4969] Bump spock-core from 1.2-groovy-2.5 to
 2.3-groovy-4.0 in /examples

Bumps spock-core from 1.2-groovy-2.5 to 2.3-groovy-4.0.

---
updated-dependencies:
- dependency-name: org.spockframework:spock-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/spock/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 390bc06be79..98f8a9142e1 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api "io.lettuce:lettuce-core:5.2.0.RELEASE"
-    testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
 }

From 1d03cafae62a2f0b7ff193162340e5540a10b361 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:44 +0000
Subject: [PATCH 2370/4969] Bump aws-java-sdk-sqs from 1.12.314 to 1.12.333 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.314 to 1.12.333.
- [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.12.314...1.12.333)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 777c8385339..30bb73f9df1 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.314'
     testImplementation 'software.amazon.awssdk:s3:2.18.7'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 175da64e78af47d0eeb829d644e3101233050796 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:51 +0000
Subject: [PATCH 2371/4969] Bump cucumber-junit from 7.8.0 to 7.9.0 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.8.0 to 7.9.0.
- [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/v7.8.0...v7.9.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 453fb789ade..edbc5c17d0a 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,7 +11,7 @@ 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:7.9.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.8.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.9.0'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From bbeb76a84328ab5bc85919b11f51def86f2d5800 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:12:53 +0000
Subject: [PATCH 2372/4969] Bump google-cloud-spanner from 6.31.0 to 6.32.0 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.31.0 to 6.32.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.31.0...v6.32.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index c32a3e96d06..c274a8a3153 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From faf5f12042967f33fa1c0d2eb92afda64d06d429 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Nov 2022 00:51:12 +0000
Subject: [PATCH 2373/4969] Bump aws-java-sdk-logs from 1.12.314 to 1.12.334 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.314 to 1.12.334.
- [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.12.314...1.12.334)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 30bb73f9df1..67caed890a8 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.314'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.334'
     testImplementation 'software.amazon.awssdk:s3:2.18.7'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 506aa49539ddbd96dccb4f143b11c2a73f0a128c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Nov 2022 01:14:51 +0000
Subject: [PATCH 2374/4969] Bump google-cloud-firestore from 3.5.0 to 3.7.0 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.5.0 to 3.7.0.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.5.0...v3.7.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index c274a8a3153..c425fd70762 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'

From a25da3d3236fee437c3dde00d95a844b315d50d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 3 Nov 2022 19:36:00 -0600
Subject: [PATCH 2375/4969] Improve ToxiProxyContainer test and docs (#6065)

Current implementation exposed utilities to handle `ToxiProxyClient`
and proxies. However, there are some issues which demonstrate that
the container class is coupled to the client. Tests and docs have
been updated in order to promote the usage of its own `ToxiProxyClient`.
Also, a note about the number of ports reserved by Testcontainers
is added.
---
 docs/modules/toxiproxy.md                     |  9 +--
 .../containers/ToxiproxyContainer.java        |  5 ++
 .../containers/ToxiproxyTest.java             | 74 +++++++++----------
 3 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
index aa6013284ed..1b8229982e6 100644
--- a/docs/modules/toxiproxy.md
+++ b/docs/modules/toxiproxy.md
@@ -32,16 +32,13 @@ We do this as follows:
 To establish a connection from the test code (on the host machine) to the target container via Toxiproxy, we obtain **Toxiproxy's** proxy host IP and port:
 
 <!--codeinclude-->
-[Obtaining proxied host and port for connections from the host machine](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForHostMachine
+[Obtaining proxied host and port](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForHostMachine
 <!--/codeinclude-->
 
 Code under test should connect to this proxied host IP and port.
 
-To establish a connection from a different container on the same network to the target container via Toxiproxy, we use **Toxiproxy's** network alias and original port:
-
-<!--codeinclude-->
-[Obtaining proxied host and port for connections from a different container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForDifferentContainer
-<!--/codeinclude-->
+!!! note
+    Currently, `ToxiProxyContainer` will reserve 31 ports, starting at 8666.
 
 Other containers should connect to this proxied host and port.
 
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index 5f496a38873..0c5bdda9b79 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -85,7 +85,9 @@ public int getControlPort() {
      * @param container target container
      * @param port port number on the target service that should be proxied
      * @return a {@link ContainerProxy} instance
+     * @deprecated {@link ToxiproxyContainer} will not build the client. Proxies should be provided manually.
      */
+    @Deprecated
     public ContainerProxy getProxy(GenericContainer<?> container, int port) {
         return this.getProxy(container.getNetworkAliases().get(0), port);
     }
@@ -102,7 +104,9 @@ public ContainerProxy getProxy(GenericContainer<?> container, int port) {
      * @param hostname hostname of target server to be proxied
      * @param port port number on the target server that should be proxied
      * @return a {@link ContainerProxy} instance
+     * @deprecated {@link ToxiproxyContainer} will not build the client. Proxies should be provided manually.
      */
+    @Deprecated
     public ContainerProxy getProxy(String hostname, int port) {
         String upstream = hostname + ":" + port;
 
@@ -126,6 +130,7 @@ public ContainerProxy getProxy(String hostname, int port) {
     }
 
     @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+    @Deprecated
     public static class ContainerProxy {
 
         private static final String CUT_CONNECTION_DOWNSTREAM = "CUT_CONNECTION_DOWNSTREAM";
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 25a0feccc48..f1010758fba 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -1,9 +1,10 @@
 package org.testcontainers.containers;
 
+import eu.rekawek.toxiproxy.Proxy;
+import eu.rekawek.toxiproxy.ToxiproxyClient;
 import eu.rekawek.toxiproxy.model.ToxicDirection;
 import org.junit.Rule;
 import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
@@ -19,30 +20,21 @@ public class ToxiproxyTest {
 
     // spotless:off
     // creatingProxy {
-    // An alias that can be used to resolve the Toxiproxy container by name in the network it is connected to.
-    // It can be used as a hostname of the Toxiproxy container by other containers in the same network.
-    private static final String TOXIPROXY_NETWORK_ALIAS = "toxiproxy";
-
     // Create a common docker network so that containers can communicate
     @Rule
     public Network network = Network.newNetwork();
 
-    private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:5.0.4");
-
     // The target container - this could be anything
     @Rule
-    public GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
+    public GenericContainer<?> redis = new GenericContainer<>("redis:5.0.4")
         .withExposedPorts(6379)
-        .withNetwork(network);
-
-    private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.5.0");
+        .withNetwork(network)
+        .withNetworkAliases("redis");
 
     // Toxiproxy container, which will be used as a TCP proxy
     @Rule
-    public ToxiproxyContainer toxiproxy = new ToxiproxyContainer(TOXIPROXY_IMAGE)
-        .withNetwork(network)
-        .withNetworkAliases(TOXIPROXY_NETWORK_ALIAS);
-
+    public ToxiproxyContainer toxiproxy = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.5.0")
+        .withNetwork(network);
     // }
     // spotless:on
 
@@ -58,12 +50,13 @@ public void testDirect() {
     @Test
     public void testLatencyViaProxy() throws IOException {
         // obtainProxyObject {
-        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
+        final ToxiproxyClient toxiproxyClient = new ToxiproxyClient(toxiproxy.getHost(), toxiproxy.getControlPort());
+        final Proxy proxy = toxiproxyClient.createProxy("redis", "0.0.0.0:8666", "redis:6379");
         // }
 
         // obtainProxiedHostAndPortForHostMachine {
-        final String ipAddressViaToxiproxy = proxy.getContainerIpAddress();
-        final int portViaToxiproxy = proxy.getProxyPort();
+        final String ipAddressViaToxiproxy = toxiproxy.getHost();
+        final int portViaToxiproxy = toxiproxy.getMappedPort(8666);
         // }
 
         final Jedis jedis = createJedis(ipAddressViaToxiproxy, portViaToxiproxy);
@@ -84,9 +77,10 @@ public void testLatencyViaProxy() throws IOException {
     }
 
     @Test
-    public void testConnectionCut() {
-        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
-        final Jedis jedis = createJedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
+    public void testConnectionCut() throws IOException {
+        final ToxiproxyClient toxiproxyClient = new ToxiproxyClient(toxiproxy.getHost(), toxiproxy.getControlPort());
+        final Proxy proxy = toxiproxyClient.createProxy("redis", "0.0.0.0:8666", "redis:6379");
+        final Jedis jedis = createJedis(toxiproxy.getHost(), toxiproxy.getMappedPort(8666));
         jedis.set("somekey", "somevalue");
 
         assertThat(jedis.get("somekey"))
@@ -94,7 +88,8 @@ public void testConnectionCut() {
             .isEqualTo("somevalue");
 
         // disableProxy {
-        proxy.setConnectionCut(true);
+        proxy.toxics().bandwidth("CUT_CONNECTION_DOWNSTREAM", ToxicDirection.DOWNSTREAM, 0);
+        proxy.toxics().bandwidth("CUT_CONNECTION_UPSTREAM", ToxicDirection.UPSTREAM, 0);
 
         // for example, expect failure when the connection is cut
         assertThat(
@@ -105,7 +100,8 @@ public void testConnectionCut() {
             .as("calls fail when the connection is cut")
             .isInstanceOf(JedisConnectionException.class);
 
-        proxy.setConnectionCut(false);
+        proxy.toxics().get("CUT_CONNECTION_DOWNSTREAM").remove();
+        proxy.toxics().get("CUT_CONNECTION_UPSTREAM").remove();
 
         // and with the connection re-established, expect success
         assertThat(jedis.get("somekey"))
@@ -115,24 +111,30 @@ public void testConnectionCut() {
     }
 
     @Test
-    public void testMultipleProxiesCanBeCreated() {
+    public void testMultipleProxiesCanBeCreated() throws IOException {
         try (
-            GenericContainer<?> secondRedis = new GenericContainer<>(REDIS_IMAGE)
+            GenericContainer<?> secondRedis = new GenericContainer<>("redis:5.0.4")
                 .withExposedPorts(6379)
                 .withNetwork(network)
+                .withNetworkAliases("redis2")
         ) {
             secondRedis.start();
 
-            final ToxiproxyContainer.ContainerProxy firstProxy = toxiproxy.getProxy(redis, 6379);
-            final ToxiproxyContainer.ContainerProxy secondProxy = toxiproxy.getProxy(secondRedis, 6379);
+            final ToxiproxyClient toxiproxyClient = new ToxiproxyClient(
+                toxiproxy.getHost(),
+                toxiproxy.getControlPort()
+            );
+            final Proxy firstProxy = toxiproxyClient.createProxy("redis1", "0.0.0.0:8666", "redis:6379");
+            toxiproxyClient.createProxy("redis2", "0.0.0.0:8667", "redis2:6379");
 
-            final Jedis firstJedis = createJedis(firstProxy.getContainerIpAddress(), firstProxy.getProxyPort());
-            final Jedis secondJedis = createJedis(secondProxy.getContainerIpAddress(), secondProxy.getProxyPort());
+            final Jedis firstJedis = createJedis(toxiproxy.getHost(), toxiproxy.getMappedPort(8666));
+            final Jedis secondJedis = createJedis(toxiproxy.getHost(), toxiproxy.getMappedPort(8667));
 
             firstJedis.set("somekey", "somevalue");
             secondJedis.set("somekey", "somevalue");
 
-            firstProxy.setConnectionCut(true);
+            firstProxy.toxics().bandwidth("CUT_CONNECTION_DOWNSTREAM", ToxicDirection.DOWNSTREAM, 0);
+            firstProxy.toxics().bandwidth("CUT_CONNECTION_UPSTREAM", ToxicDirection.UPSTREAM, 0);
 
             assertThat(
                 catchThrowable(() -> {
@@ -149,11 +151,8 @@ public void testMultipleProxiesCanBeCreated() {
     @Test
     public void testOriginalAndMappedPorts() {
         final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy("hostname", 7070);
-        // obtainProxiedHostAndPortForDifferentContainer {
-        final String hostViaToxiproxy = TOXIPROXY_NETWORK_ALIAS;
+
         final int portViaToxiproxy = proxy.getOriginalProxyPort();
-        // }
-        assertThat(hostViaToxiproxy).as("host is correct").isEqualTo(TOXIPROXY_NETWORK_ALIAS);
         assertThat(portViaToxiproxy).as("original port is correct").isEqualTo(8666);
 
         final ToxiproxyContainer.ContainerProxy proxy1 = toxiproxy.getProxy("hostname1", 8080);
@@ -176,13 +175,6 @@ public void testProxyName() {
         assertThat(proxy.getName()).as("proxy name is hostname and port").isEqualTo("hostname:7070");
     }
 
-    @Test
-    public void testControlPort() {
-        final int controlPort = toxiproxy.getControlPort();
-
-        assertThat(controlPort).as("control port is mapped from port 8474").isEqualTo(toxiproxy.getMappedPort(8474));
-    }
-
     private void checkCallWithLatency(
         Jedis jedis,
         final String description,

From 2b61912709edeb828d42afdeabe0fefc6c746797 Mon Sep 17 00:00:00 2001
From: Tomaz Fernandes <76525045+tomazfernandes@users.noreply.github.com>
Date: Thu, 3 Nov 2022 23:56:07 -0300
Subject: [PATCH 2376/4969] Add Hazelcast Example (#6117)

A simple Hazelcast example using both a single container and a cluster with two nodes.

Fixes #6115
---
 docs/examples.md                              |   1 +
 examples/hazelcast/build.gradle               |  14 ++
 .../examples/HazelcastTest.java               | 125 ++++++++++++++++++
 .../src/test/resources/logback-test.xml       |  14 ++
 examples/settings.gradle                      |   1 +
 5 files changed, 155 insertions(+)
 create mode 100644 examples/hazelcast/build.gradle
 create mode 100644 examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
 create mode 100644 examples/hazelcast/src/test/resources/logback-test.xml

diff --git a/docs/examples.md b/docs/examples.md
index cdacd0dad89..29e1ca643f3 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -2,6 +2,7 @@
 
 Examples of different use cases provided by Testcontainers can be found below:
 
+- [Hazelcast](https://github.com/testcontainers/testcontainers-java/tree/main/examples/hazelcast)
 - [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/kafka-cluster)
 - [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/linked-container)
 - [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/main/examples/neo4j-container)
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
new file mode 100644
index 00000000000..11eb6cb0d3d
--- /dev/null
+++ b/examples/hazelcast/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'com.hazelcast:hazelcast:5.2.0'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+}
diff --git a/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java b/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
new file mode 100644
index 00000000000..18fc6df6455
--- /dev/null
+++ b/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
@@ -0,0 +1,125 @@
+package org.testcontainers.examples;
+
+import com.hazelcast.client.HazelcastClient;
+import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.core.HazelcastInstance;
+import org.junit.After;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.lifecycle.Startables;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.concurrent.BlockingQueue;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Examples with Hazelcast using both a single container and a cluster with two containers.
+ */
+public class HazelcastTest {
+
+    // Hazelcast values
+    private static final String HZ_IMAGE_NAME = "hazelcast/hazelcast:5.2.0";
+
+    private static final String HZ_CLUSTERNAME_ENV_NAME = "HZ_CLUSTERNAME";
+
+    private static final String HZ_NETWORK_JOIN_AZURE_ENABLED_ENV_NAME = "HZ_NETWORK_JOIN_AZURE_ENABLED";
+
+    private static final String HZ_NETWORK_JOIN_MULTICAST_ENABLED_ENV_NAME = "HZ_NETWORK_JOIN_MULTICAST_ENABLED";
+
+    private static final int DEFAULT_EXPOSED_PORT = 5701;
+
+    // Test values
+    private static final String CLUSTER_STARTUP_LOG_MESSAGE_REGEX = ".*Members \\{size:2.*";
+
+    private static final String HOST_PORT_SEPARATOR = ":";
+
+    private static final String TEST_QUEUE_NAME = "test-queue";
+
+    private static final String TEST_CLUSTER_NAME = "test-cluster";
+
+    private static final String TEST_VALUE = "Hello!";
+
+    private static final String FALSE_VALUE = "false";
+
+    private static final String TRUE_VALUE = "true";
+
+    @After
+    public void cleanUp() {
+        HazelcastClient.shutdownAll();
+    }
+
+    @Test
+    public void singleHazelcastContainer() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(HZ_IMAGE_NAME))
+                .withExposedPorts(DEFAULT_EXPOSED_PORT)
+        ) {
+            container.start();
+            assertThat(container.isRunning()).isTrue();
+
+            ClientConfig clientConfig = new ClientConfig();
+            clientConfig
+                .getNetworkConfig()
+                .addAddress(container.getHost() + HOST_PORT_SEPARATOR + container.getFirstMappedPort());
+            HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
+
+            BlockingQueue<String> queue = client.getQueue(TEST_QUEUE_NAME);
+            queue.put(TEST_VALUE);
+            assertThat(queue.take()).isEqualTo(TEST_VALUE);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Interrupted during singleHazelcastContainer test", e);
+        }
+    }
+
+    @Test
+    public void hazelcastCluster() {
+        Network network = Network.newNetwork();
+        try (
+            GenericContainer<?> container1 = new GenericContainer<>(DockerImageName.parse(HZ_IMAGE_NAME))
+                .withExposedPorts(DEFAULT_EXPOSED_PORT)
+                .withEnv(HZ_CLUSTERNAME_ENV_NAME, TEST_CLUSTER_NAME)
+                // Flags necessary to run on Github Actions which runs on an Azure VM
+                .withEnv(HZ_NETWORK_JOIN_AZURE_ENABLED_ENV_NAME, FALSE_VALUE)
+                .withEnv(HZ_NETWORK_JOIN_MULTICAST_ENABLED_ENV_NAME, TRUE_VALUE)
+                .waitingFor(Wait.forLogMessage(CLUSTER_STARTUP_LOG_MESSAGE_REGEX, 1))
+                .withNetwork(network);
+            GenericContainer<?> container2 = new GenericContainer<>(DockerImageName.parse(HZ_IMAGE_NAME))
+                .withExposedPorts(DEFAULT_EXPOSED_PORT)
+                .withEnv(HZ_CLUSTERNAME_ENV_NAME, TEST_CLUSTER_NAME)
+                // Flags necessary to run on Github Actions which runs on an Azure VM
+                .withEnv(HZ_NETWORK_JOIN_AZURE_ENABLED_ENV_NAME, FALSE_VALUE)
+                .withEnv(HZ_NETWORK_JOIN_MULTICAST_ENABLED_ENV_NAME, TRUE_VALUE)
+                .waitingFor(Wait.forLogMessage(CLUSTER_STARTUP_LOG_MESSAGE_REGEX, 1))
+                .withNetwork(network)
+        ) {
+            Startables.deepStart(container1, container2).join();
+            assertThat(container1.isRunning()).isTrue();
+            assertThat(container2.isRunning()).isTrue();
+
+            ClientConfig clientConfig = new ClientConfig();
+            clientConfig
+                .setClusterName(TEST_CLUSTER_NAME)
+                .getNetworkConfig()
+                // Uncomment the next line to remove the "WARNING: ...Could not connect to member..." message
+                //.setSmartRouting(false)
+                .addAddress(container1.getHost() + HOST_PORT_SEPARATOR + container1.getFirstMappedPort())
+                .addAddress(container2.getHost() + HOST_PORT_SEPARATOR + container2.getFirstMappedPort());
+
+            HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
+
+            assertThat(client.getCluster().getMembers()).hasSize(2);
+
+            BlockingQueue<String> queue = client.getQueue(TEST_QUEUE_NAME);
+            queue.put(TEST_VALUE);
+
+            assertThat(queue.take()).isEqualTo(TEST_VALUE);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Interrupted during hazelcastCluster test", e);
+        }
+    }
+}
diff --git a/examples/hazelcast/src/test/resources/logback-test.xml b/examples/hazelcast/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..be4ebaed2c8
--- /dev/null
+++ b/examples/hazelcast/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
diff --git a/examples/settings.gradle b/examples/settings.gradle
index ea7dacdbb56..b7285eeabd2 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -32,6 +32,7 @@ include 'cucumber'
 include 'spring-boot-kotlin-redis'
 include 'immudb'
 include 'zookeeper'
+include 'hazelcast'
 
 ext.isCI = System.getenv("CI") != null
 

From de20484e53eb8d1f580b74ff9df31261b596ab5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 4 Nov 2022 01:46:23 -0600
Subject: [PATCH 2377/4969] Use `gradle/gradle-build-action` (#6121)

---
 .github/workflows/ci-examples.yml | 18 ++++++------------
 .github/workflows/ci-rootless.yml |  2 ++
 .github/workflows/ci.yml          | 21 ++++++++++-----------
 .github/workflows/release.yml     |  3 +++
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 26e317b1efa..6a1df55adbc 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -24,12 +24,8 @@ jobs:
         with:
           java-version: '8.0.302'
           distribution: temurin
-      - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.11
-        continue-on-error: true
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-home-testmatrix-examples-${{ hashFiles('**/*.gradle') }}
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -52,14 +48,12 @@ jobs:
         with:
           java-version: '8.0.302'
           distribution: temurin
-      - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.11
-        continue-on-error: true
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
       - name: Clear existing docker image cache
         run: docker image prune -af
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
         working-directory: ./examples/
         run: |
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 50db1655a4a..b04ec9a7429 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -33,5 +33,7 @@ jobs:
           PATH=$HOME/bin:$PATH dockerd-rootless.sh --experimental --storage-driver vfs &
           sleep 1
           DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock docker info || ls -la $XDG_RUNTIME_DIR
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e926d8f16db..405d2596d08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,11 +24,8 @@ jobs:
         with:
           java-version: '8.0.302'
           distribution: temurin
-      - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.11
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -50,14 +47,16 @@ jobs:
         with:
           java-version: '8.0.302'
           distribution: temurin
-      - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.11
-        continue-on-error: true
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
       - name: Clear existing docker image cache
         run: docker image prune -af
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-includes: |
+            caches
+            notifications
+            jdks
+          gradle-home-cache-cleanup: true
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 29a0b920922..c6fa99f2477 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,6 +23,9 @@ jobs:
       - name: Clear existing docker image cache
         run: docker image prune -af
 
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+
       - name: Run Gradle Build
         run: ./gradlew build --scan --no-daemon -i -x test
 

From 96af052165f46e1b7b573bc74181c5bbdeb5c725 Mon Sep 17 00:00:00 2001
From: DJ Gregor <dj@gregor.com>
Date: Fri, 4 Nov 2022 23:39:52 -0400
Subject: [PATCH 2378/4969] Remove unnecessary logging from
 ElasticsearchContainer (#6127)

Testcontainers already log once the container started. So, displaying
additional logs can confuse.
---
 .../org/testcontainers/elasticsearch/ElasticsearchContainer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index edef04e001e..1cb43f68bb7 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -96,7 +96,6 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME);
         this.isOss = dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME);
 
-        logger().info("Starting an elasticsearch container using [{}]", dockerImageName);
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
         withEnv("discovery.type", "single-node");
         // Sets default memory of elasticsearch instance to 2GB

From 6e15e0932630e58c1ead950d7ebb0762715476bd Mon Sep 17 00:00:00 2001
From: Ramazan Yapparov <ramazan.yapparov@gmail.com>
Date: Mon, 7 Nov 2022 19:46:55 +0300
Subject: [PATCH 2379/4969] Update Vault docs (#3685)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update code example in the docs to use `codeinclude`
- Remove `VaultClientTest` and moved its contest to `VaultContainerTest`
- Add `getHttpHostAddress()` for usage convenience

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/vault.md                         | 50 +++++------
 .../testcontainers/vault/VaultContainer.java  |  8 +-
 .../testcontainers/vault/VaultClientTest.java |  5 +-
 .../vault/VaultContainerTest.java             | 87 ++++++++++++++++---
 .../testcontainers/vault/VaultTestImages.java |  7 --
 5 files changed, 106 insertions(+), 51 deletions(-)
 delete mode 100644 modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java

diff --git a/docs/modules/vault.md b/docs/modules/vault.md
index 4a232361464..e32abfd1c60 100644
--- a/docs/modules/vault.md
+++ b/docs/modules/vault.md
@@ -4,31 +4,31 @@ Testcontainers module for [Vault](https://github.com/hashicorp/vault). Vault is
 
 ## Usage example
 
-Running Vault in your Junit tests is easily done with an @Rule or @ClassRule such as the following:
-
-```java
-public class SomeTest {
-
-    @ClassRule
-    public static VaultContainer vaultContainer = new VaultContainer<>()
-            .withVaultToken("my-root-token")
-            .withVaultPort(8200)
-            .withSecretInVault("secret/testing", "top_secret=password1","db_password=dbpassword1");
-    
-    @Test
-    public void someTestMethod() {
-       //interact with Vault via the container's host, port and Vault token. 
-       
-       //There are many integration clients for Vault so let's just define a general one here:
-       VaultClient client = new VaultClient(
-               vaultContainer.getHost(),
-               vaultContainer.getMappedPort(8200),
-               "my-root-token");
-       
-       List<String> secrets = client.readSecret("secret/testing");
-       
-    }
-```
+Start Vault container as a `@ClassRule`:
+
+<!--codeinclude-->
+[Starting a Vault container](../../modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java) inside_block:vaultContainer
+<!--/codeinclude-->
+
+Use CLI to read data from Vault container:
+
+<!--codeinclude-->
+[Use CLI to read data](../../modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java) inside_block:readFirstSecretPathWithCli
+<!--/codeinclude-->
+
+Use Http API to read data from Vault container:
+
+<!--codeinclude-->
+[Use Http API to read data](../../modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java) inside_block:readFirstSecretPathOverHttpApi
+<!--/codeinclude-->
+
+Use client library to read data from Vault container:
+
+<!--codeinclude-->
+[Use library to read data](../../modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java) inside_block:readWithLibrary
+<!--/codeinclude-->
+
+[See full example.](https://github.com/testcontainers/testcontainers-java/blob/master/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java)
 
 ## Why Vault in Junit tests?
 
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 31bb1f31d9f..4c44668d565 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -60,6 +60,10 @@ public VaultContainer(final DockerImageName dockerImageName) {
         withExposedPorts(port);
     }
 
+    public String getHttpHostAddress() {
+        return String.format("http://%s:%s", getHost(), getMappedPort(port));
+    }
+
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         addSecrets();
@@ -182,8 +186,8 @@ public SELF withSecretInVault(String path, String firstSecret, String... remaini
 
     /**
      * Run initialization commands using the vault cli.
-     *
-     * Useful for enableing more secret engines like:
+     * <p>
+     * Useful for enabling more secret engines like:
      * <pre>
      *     .withInitCommand("secrets enable pki")
      *     .withInitCommand("secrets enable transit")
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
index cd1f1a8acea..eebf73a5e62 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
@@ -17,10 +17,7 @@ public class VaultClientTest {
 
     @Test
     public void writeAndReadMultipleValues() throws VaultException {
-        try (
-            VaultContainer<?> vaultContainer = new VaultContainer<>(VaultTestImages.VAULT_IMAGE)
-                .withVaultToken(VAULT_TOKEN)
-        ) {
+        try (VaultContainer<?> vaultContainer = new VaultContainer<>("vault:1.1.3").withVaultToken(VAULT_TOKEN)) {
             vaultContainer.start();
 
             final VaultConfig config = new VaultConfig()
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index f7a7cd49eaf..608d8bbb8a7 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -1,25 +1,30 @@
 package org.testcontainers.vault;
 
+import com.bettercloud.vault.Vault;
+import com.bettercloud.vault.VaultConfig;
+import com.bettercloud.vault.response.LogicalResponse;
 import io.restassured.response.Response;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 
-import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * This test shows the pattern to use the VaultContainer @ClassRule for a junit test. It also has tests that ensure
- * the secrets were added correctly by reading from Vault with the CLI and over HTTP.
+ * the secrets were added correctly by reading from Vault with the CLI, over HTTP and over Client Library.
  */
 public class VaultContainerTest {
 
     private static final String VAULT_TOKEN = "my-root-token";
 
     @ClassRule
-    public static VaultContainer<?> vaultContainer = new VaultContainer<>(VaultTestImages.VAULT_IMAGE)
+    // vaultContainer {
+    public static VaultContainer<?> vaultContainer = new VaultContainer<>("vault:1.6.1")
         .withVaultToken(VAULT_TOKEN)
         .withSecretInVault("secret/testing1", "top_secret=password123")
         .withSecretInVault(
@@ -32,8 +37,10 @@ public class VaultContainerTest {
         )
         .withInitCommand("secrets enable transit", "write -f transit/keys/my-key");
 
+    // }
+
     @Test
-    public void readFirstSecretPathWithCli() throws IOException, InterruptedException {
+    public void readFirstSecretPathWithCli() throws Exception {
         GenericContainer.ExecResult result = vaultContainer.execInContainer(
             "vault",
             "kv",
@@ -41,12 +48,11 @@ public void readFirstSecretPathWithCli() throws IOException, InterruptedExceptio
             "-format=json",
             "secret/testing1"
         );
-        final String output = result.getStdout().replaceAll("\\r?\\n", "");
-        assertThat(output).contains("password123");
+        assertThat(result.getStdout()).contains("password123");
     }
 
     @Test
-    public void readSecondSecretPathWithCli() throws IOException, InterruptedException {
+    public void readSecondSecretPathWithCli() throws Exception {
         GenericContainer.ExecResult result = vaultContainer.execInContainer(
             "vault",
             "kv",
@@ -54,6 +60,7 @@ public void readSecondSecretPathWithCli() throws IOException, InterruptedExcepti
             "-format=json",
             "secret/testing2"
         );
+
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
         System.out.println("output = " + output);
         assertThat(output).contains("password1");
@@ -63,11 +70,11 @@ public void readSecondSecretPathWithCli() throws IOException, InterruptedExcepti
     }
 
     @Test
-    public void readFirstSecretPathOverHttpApi() throws InterruptedException {
+    public void readFirstSecretPathOverHttpApi() {
         Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
-            .get("http://" + getHostAndPort() + "/v1/secret/data/testing1")
+            .get(vaultContainer.getHttpHostAddress() + "/v1/secret/data/testing1")
             .thenReturn();
         assertThat(response.body().jsonPath().getString("data.data.top_secret")).isEqualTo("password123");
     }
@@ -77,7 +84,7 @@ public void readSecondSecretPathOverHttpApi() throws InterruptedException {
         Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
-            .get("http://" + getHostAndPort() + "/v1/secret/data/testing2")
+            .get(vaultContainer.getHttpHostAddress() + "/v1/secret/data/testing2")
             .andReturn();
 
         assertThat(response.body().jsonPath().getString("data.data.secret_one")).contains("password1");
@@ -91,13 +98,67 @@ public void readTransitKeyOverHttpApi() throws InterruptedException {
         Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
-            .get("http://" + getHostAndPort() + "/v1/transit/keys/my-key")
+            .get(vaultContainer.getHttpHostAddress() + "/v1/transit/keys/my-key")
             .thenReturn();
 
         assertThat(response.body().jsonPath().getString("data.name")).isEqualTo("my-key");
     }
 
-    private String getHostAndPort() {
-        return vaultContainer.getHost() + ":" + vaultContainer.getMappedPort(8200);
+    @Test
+    // readWithLibrary {
+    public void readFirstSecretPathOverClientLibrary() throws Exception {
+        final VaultConfig config = new VaultConfig()
+            .address(vaultContainer.getHttpHostAddress())
+            .token(VAULT_TOKEN)
+            .build();
+
+        final Vault vault = new Vault(config);
+
+        final Map<String, String> value = vault.logical().read("secret/testing1").getData();
+
+        assertThat(value).containsEntry("top_secret", "password123");
+    }
+
+    // }
+
+    @Test
+    public void readSecondSecretPathOverClientLibrary() throws Exception {
+        final VaultConfig config = new VaultConfig()
+            .address(vaultContainer.getHttpHostAddress())
+            .token(VAULT_TOKEN)
+            .build();
+
+        final Vault vault = new Vault(config);
+        final Map<String, String> value = vault.logical().read("secret/testing2").getData();
+
+        assertThat(value)
+            .containsEntry("secret_one", "password1")
+            .containsEntry("secret_two", "password2")
+            .containsEntry("secret_three", "[\"password3\",\"password3\"]")
+            .containsEntry("secret_four", "password4");
+    }
+
+    @Test
+    public void writeSecretOverClientLibrary() throws Exception {
+        final VaultConfig config = new VaultConfig()
+            .address(vaultContainer.getHttpHostAddress())
+            .token(VAULT_TOKEN)
+            .build();
+
+        final Vault vault = new Vault(config);
+
+        final Map<String, Object> secrets = new HashMap<>();
+        secrets.put("value", "world");
+        secrets.put("other_value", "another world");
+
+        // Write operation
+        final LogicalResponse writeResponse = vault.logical().write("secret/hello", secrets);
+
+        assertThat(writeResponse.getRestResponse().getStatus()).isEqualTo(200);
+
+        // Read operation
+        final Map<String, String> value = vault.logical().read("secret/hello").getData();
+
+        assertThat(value).containsEntry("value", "world").containsEntry("other_value", "another world");
     }
 }
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java
deleted file mode 100644
index 9afecdcffb9..00000000000
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultTestImages.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.testcontainers.vault;
-
-import org.testcontainers.utility.DockerImageName;
-
-public interface VaultTestImages {
-    DockerImageName VAULT_IMAGE = DockerImageName.parse("vault:1.1.3");
-}

From 0699126907585cd7027a4186f7227529a3ff0990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 7 Nov 2022 14:57:42 -0600
Subject: [PATCH 2380/4969] Ignore major version updates for org.neo4j:neo4j
 (#6112)

`org.neo4j:neo4j:5.x` requires JDK 17. For that reason, we are skipping
major version updates.
---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2e3afe8fa8a..095257df4c1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -165,6 +165,8 @@ updates:
     ignore:
       - dependency-name: "org.neo4j.driver:neo4j-java-driver"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.neo4j:neo4j"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/nginx"
     schedule:

From 9432b8a0868fc6b972892afe02093568322acb67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:00:52 +0000
Subject: [PATCH 2381/4969] Bump questdb from 6.5.4-jdk8 to 6.5.5-jdk8 in
 /modules/questdb

Bumps [questdb](https://github.com/questdb/questdb) from 6.5.4-jdk8 to 6.5.5-jdk8.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/commits)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 388e9d5824c..9f61747934a 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.questdb:questdb:6.5.4-jdk8'
+    testImplementation 'org.questdb:questdb:6.5.5-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }

From 60a817cfa316168a543bb179e888f4cd0caaf9c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:10 +0000
Subject: [PATCH 2382/4969] Bump client-java from 16.0.1 to 16.0.2 in
 /modules/k3s

Bumps [client-java](https://github.com/kubernetes-client/java) from 16.0.1 to 16.0.2.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v16.0.1...v16.0.2)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 81c4fc253c0..0b3d5098edb 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.2.0'
-    testImplementation 'io.kubernetes:client-java:16.0.1'
+    testImplementation 'io.kubernetes:client-java:16.0.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 8029b2b38ef3416c98a367744867aa42f8bab34d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:12 +0000
Subject: [PATCH 2383/4969] Bump trino-jdbc from 401 to 402 in /modules/trino

Bumps trino-jdbc from 401 to 402.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 1fd5561d85c..ed0c293a509 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:401'
+    testImplementation 'io.trino:trino-jdbc:402'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From d651bd762e328455361ab49c327b8ae5266bb35b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:15 +0000
Subject: [PATCH 2384/4969] Bump mssql-jdbc in /modules/mssqlserver

Bumps [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 11.2.1.jre8 to 12.1.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ef91edc79d1..02154506560 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.1.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.1.0.jre8-preview'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'

From 6e96fd370e8c64d08384824bddc86001cc2fb21b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:19 +0000
Subject: [PATCH 2385/4969] Bump junit-jupiter-api from 5.4.2 to 5.9.1 in
 /examples

Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.4.2 to 5.9.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 1cc0413faa1..0c15c5b6b29 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.1"
     testImplementation project(":testcontainers")

From 731835cd17d7a85fda2ffe197c824f301ed77852 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:22 +0000
Subject: [PATCH 2386/4969] Bump org.gradle.test-retry from 1.4.0 to 1.4.1 in
 /examples

Bumps org.gradle.test-retry from 1.4.0 to 1.4.1.

---
updated-dependencies:
- dependency-name: org.gradle.test-retry
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6c2b6a81c7b..c819657d875 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
     id 'com.diffplug.spotless' version '6.8.0' apply false
-    id 'org.gradle.test-retry' version '1.4.0'
+    id 'org.gradle.test-retry' version '1.4.1'
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"

From d01c254b7eff44a64d9f91c370b2efcbfed74611 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:24 +0000
Subject: [PATCH 2387/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.333 to 1.12.336.
- [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.12.333...1.12.336)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ee77d7e00bb..0184cf5ada5 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 5b354d4e6c251542023fb99b3bf175d24ae33b1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:26 +0000
Subject: [PATCH 2388/4969] Bump com.github.johnrengelman.shadow from 7.0.0 to
 7.1.2 in /examples

Bumps com.github.johnrengelman.shadow from 7.0.0 to 7.1.2.

---
updated-dependencies:
- dependency-name: com.github.johnrengelman.shadow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6c2b6a81c7b..99360c52227 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
     id 'com.diffplug.spotless' version '6.8.0' apply false
     id 'org.gradle.test-retry' version '1.4.0'

From 778bc8f6070e9d5a45e60a15c75aa6483cc0674e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:37 +0000
Subject: [PATCH 2389/4969] Bump common-custom-user-data-gradle-plugin in
 /examples

Bumps common-custom-user-data-gradle-plugin from 1.8.1 to 1.8.2.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index b7285eeabd2..72bbcd16cac 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }
 

From 3e864636bd56247fb0799c0c231146512db1cc11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:43 +0000
Subject: [PATCH 2390/4969] Bump s3 from 2.18.7 to 2.18.11 in
 /modules/localstack

Bumps s3 from 2.18.7 to 2.18.11.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 67caed890a8..bf19aeba6b4 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.334'
-    testImplementation 'software.amazon.awssdk:s3:2.18.7'
+    testImplementation 'software.amazon.awssdk:s3:2.18.11'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 8a677126d192e46876a7fc20e5b7d2698d3acbf1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:43 +0000
Subject: [PATCH 2391/4969] Bump gson from 2.9.1 to 2.10 in /examples

Bumps [gson](https://github.com/google/gson) from 2.9.1 to 2.10.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.9.1...gson-parent-2.10)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 5dba21e1c26..1584f3dcd71 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 0d19207f4ba..ee2d64b6cbe 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 8ebce1bfb77..b8c5f2a144c 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 

From 78d0a1966c0f493e3453f3b9d001383610ec00c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:52 +0000
Subject: [PATCH 2392/4969] Bump org.springframework.boot from 2.7.4 to 2.7.5
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.4...v2.7.5)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index feb677dc64a..57f4726b115 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.7.4'
+    id 'org.springframework.boot' version '2.7.5'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index c0ec19f203c..8d78cf8da70 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.4"
+    id("org.springframework.boot") version "2.7.5"
     id("org.jetbrains.kotlin.jvm") version "1.7.20"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.20"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 56cd62e34e6..40affdda2c9 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.7.4'
+    id 'org.springframework.boot' version '2.7.5'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 39d6a9d5fa0faa149ad8f2956c94e3e96d4d3a2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:01:53 +0000
Subject: [PATCH 2393/4969] Bump aws-java-sdk-sqs from 1.12.333 to 1.12.336 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.333 to 1.12.336.
- [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.12.333...1.12.336)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 67caed890a8..d857357e574 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.333'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.336'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.334'
     testImplementation 'software.amazon.awssdk:s3:2.18.7'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From b71baa358d3ec04960ea7358191542b96d9e304f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:02:59 +0000
Subject: [PATCH 2394/4969] Bump google-cloud-datastore from 2.12.3 to 2.12.4
 in /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.12.3 to 2.12.4.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.12.3...v2.12.4)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index c425fd70762..0ae152045d8 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'

From 815f36d812124322d67808da952b7e7fc970a70a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:25:23 +0000
Subject: [PATCH 2395/4969] Bump com.diffplug.spotless from 6.8.0 to 6.11.0 in
 /examples

Bumps com.diffplug.spotless from 6.8.0 to 6.11.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle          | 2 +-
 examples/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d68fee723ec..258056b12e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
-    id 'com.diffplug.spotless' version '6.8.0' apply false
+    id 'com.diffplug.spotless' version '6.11.0' apply false
     id 'org.gradle.test-retry' version '1.4.1'
 }
 
diff --git a/examples/build.gradle b/examples/build.gradle
index b1c31a29c7f..811c8abcb58 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.8.0' apply false
+    id 'com.diffplug.spotless' version '6.11.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"

From a318718b9e0cb07af71abb6f869956e91fffbccd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:25:55 +0000
Subject: [PATCH 2396/4969] Bump jedis from 4.2.3 to 4.3.1 in /examples

Bumps [jedis](https://github.com/redis/jedis) from 4.2.3 to 4.3.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.2.3...v4.3.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 1584f3dcd71..b22eabafecd 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.2.3'
+    implementation 'redis.clients:jedis:4.3.1'
     implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index ee2d64b6cbe..743a5e615b7 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.2.3'
+    implementation 'redis.clients:jedis:4.3.1'
     implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index b8c5f2a144c..981c61f6cf3 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.2.3'
+    implementation 'redis.clients:jedis:4.3.1'
     implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 94b425ffb7d6c0f60e6b7c8cb01e2775bcb9dc32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:28:23 +0000
Subject: [PATCH 2397/4969] Bump aws-java-sdk-s3 from 1.12.333 to 1.12.337 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.333 to 1.12.337.
- [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.12.333...1.12.337)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 7d278a967f4..29bc7014cba 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.337'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.336'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.334'

From 5d3d2177e06076958faaeeb9ea7c57cda9aff46a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:28:33 +0000
Subject: [PATCH 2398/4969] Bump aws-java-sdk-logs from 1.12.334 to 1.12.337 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.334 to 1.12.337.
- [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.12.334...1.12.337)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 7d278a967f4..00690a34e3d 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.336'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.334'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.337'
     testImplementation 'software.amazon.awssdk:s3:2.18.11'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From f66aee166e8f9243cd826fc4f786d01a28fa26aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 7 Nov 2022 17:45:31 -0600
Subject: [PATCH 2399/4969] Add lang and version labels to containers (#6124)

The following labels are added `org.testcontainers.lang` and
`org.testcontainers.version`. Those are good identifiers when debugging
and sharing logs.

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 core/build.gradle                             |  6 ++++++
 .../testcontainers/DockerClientFactory.java   | 19 +++++++++++++++++--
 .../junit/GenericContainerRuleTest.java       |  7 +++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 906310575bf..87626f5891a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -10,6 +10,12 @@ test.maxParallelForks = 4
 
 idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs
 
+jar {
+    manifest {
+        attributes('Implementation-Version': project.getProperty("version"))
+    }
+}
+
 shadowJar {
     [
         'META-INF/NOTICE',
diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index d4b40193ca2..73bf24e511c 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -13,7 +13,6 @@
 import com.github.dockerjava.api.model.Version;
 import com.github.dockerjava.api.model.Volume;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.Synchronized;
@@ -34,6 +33,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,9 +56,24 @@ public class DockerClientFactory {
 
     public static final String TESTCONTAINERS_SESSION_ID_LABEL = TESTCONTAINERS_LABEL + ".sessionId";
 
+    public static final String TESTCONTAINERS_LANG_LABEL = TESTCONTAINERS_LABEL + ".lang";
+
+    public static final String TESTCONTAINERS_VERSION_LABEL = TESTCONTAINERS_LABEL + ".version";
+
     public static final String SESSION_ID = UUID.randomUUID().toString();
 
-    public static final Map<String, String> DEFAULT_LABELS = ImmutableMap.of(TESTCONTAINERS_LABEL, "true");
+    public static final Map<String, String> DEFAULT_LABELS = markerLabels();
+
+    static Map<String, String> markerLabels() {
+        String implementationVersion = DockerClientFactory.class.getPackage().getImplementationVersion();
+        String testcontainersVersion = implementationVersion == null ? "unspecified" : implementationVersion;
+
+        Map<String, String> labels = new HashMap<>();
+        labels.put(TESTCONTAINERS_LABEL, "true");
+        labels.put(TESTCONTAINERS_LANG_LABEL, "java");
+        labels.put(TESTCONTAINERS_VERSION_LABEL, testcontainersVersion);
+        return Collections.unmodifiableMap(labels);
+    }
 
     private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
 
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index 4ba491d83fd..a3628a9302f 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -269,6 +269,13 @@ public void customLabelTest() {
 
             Map<String, String> labels = alpineCustomLabel.getCurrentContainerInfo().getConfig().getLabels();
             assertThat(labels).as("org.testcontainers label is present").containsKey("org.testcontainers");
+            assertThat(labels).as("org.testcontainers.lang label is present").containsKey("org.testcontainers.lang");
+            assertThat(labels)
+                .as("org.testcontainers.lang label is present")
+                .containsEntry("org.testcontainers.lang", "java");
+            assertThat(labels)
+                .as("org.testcontainers.version label is present")
+                .containsKey("org.testcontainers.version");
             assertThat(labels).as("our.custom label is present").containsKey("our.custom");
             assertThat(labels).as("our.custom label value is label").containsEntry("our.custom", "label");
         }

From 66bcd391df31c4afdac32ff325974fe0f62968c8 Mon Sep 17 00:00:00 2001
From: Chen Levy <chen_levy@hotmail.com>
Date: Mon, 7 Nov 2022 21:17:07 -0500
Subject: [PATCH 2400/4969] Adds the ability to set a target build stage to a
 Dockerfile (#4810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../images/builder/ImageFromDockerfile.java   | 13 +++++++++
 .../containers/MultiStageBuildTest.java       | 28 +++++++++++++++++++
 core/src/test/resources/Dockerfile-multistage |  9 ++++++
 3 files changed, 50 insertions(+)
 create mode 100644 core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
 create mode 100644 core/src/test/resources/Dockerfile-multistage

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 201cf0fd058..2daed45b3fb 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -60,6 +60,8 @@ public class ImageFromDockerfile
 
     private Optional<Path> dockerfile = Optional.empty();
 
+    private Optional<String> target = Optional.empty();
+
     private Set<String> dependencyImageNames = Collections.emptySet();
 
     public ImageFromDockerfile() {
@@ -177,6 +179,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
             });
 
         this.buildArgs.forEach(buildImageCmd::withBuildArg);
+        this.target.ifPresent(buildImageCmd::withTarget);
     }
 
     private void prePullDependencyImages(Set<String> imagesToPull) {
@@ -211,6 +214,16 @@ public ImageFromDockerfile withBuildArgs(final Map<String, String> args) {
         return this;
     }
 
+    /**
+     * Sets the target build stage to use.
+     *
+     * @param target the target build stage
+     */
+    public ImageFromDockerfile withTarget(String target) {
+        this.target = Optional.of(target);
+        return this;
+    }
+
     /**
      * Sets the Dockerfile to be used for this image.
      *
diff --git a/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java b/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
new file mode 100644
index 00000000000..80ae37a0a07
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
@@ -0,0 +1,28 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MultiStageBuildTest {
+
+    @Test
+    public void testDockerMultistageBuild() throws IOException, InterruptedException {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(
+                new ImageFromDockerfile()
+                    .withDockerfile(Paths.get("src/test/resources/Dockerfile-multistage"))
+                    .withTarget("builder")
+            )
+                .withCommand("/bin/sh", "-c", "sleep 10")
+        ) {
+            container.start();
+            assertThat(container.execInContainer("pwd").getStdout()).contains("/my-files");
+            assertThat(container.execInContainer("ls").getStdout()).contains("hello.txt");
+        }
+    }
+}
diff --git a/core/src/test/resources/Dockerfile-multistage b/core/src/test/resources/Dockerfile-multistage
new file mode 100644
index 00000000000..363b02b22ea
--- /dev/null
+++ b/core/src/test/resources/Dockerfile-multistage
@@ -0,0 +1,9 @@
+FROM alpine:3.14 AS builder
+
+WORKDIR /my-files
+
+RUN echo 'Hello World' > hello.txt
+
+FROM alpine:3.14
+
+COPY --from=builder /my-files/hello.txt hello.txt

From 238a97a1e11c65261586c8050504d4e2667122c4 Mon Sep 17 00:00:00 2001
From: Gerald Venzl <gerald.venzl@gmail.com>
Date: Mon, 7 Nov 2022 20:57:28 -0700
Subject: [PATCH 2401/4969] Update Oracle Database Container version (#5779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change Oracle Database Container version to the latest available version `21-faststart`

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../org/testcontainers/junit/oracle/SimpleOracleTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index b7afba041de..2bcd7112268 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -14,7 +14,7 @@
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
     public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
-        "gvenzl/oracle-xe:18.4.0-slim"
+        "gvenzl/oracle-xe:21-faststart"
     );
 
     private void runTest(OracleContainer container, String databaseName, String username, String password)
@@ -53,7 +53,7 @@ public void testPluggableDatabase() throws SQLException {
     public void testPluggableDatabaseAndCustomUser() throws SQLException {
         try (
             // constructor {
-            OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:18.4.0-slim")
+            OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:21-faststart")
                 .withDatabaseName("testDB")
                 .withUsername("testUser")
                 .withPassword("testPassword")

From 76d767e7e0b90e42abf7b8aee10aa30c9dffc3cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 8 Nov 2022 14:39:59 -0600
Subject: [PATCH 2402/4969] Use slim-faststart images from oracle (#6156)

Previously, the `fastart` images were used but those are quite big.
Instead, it was suggested to use `slim-faststart` tags.
---
 .../org/testcontainers/junit/oracle/SimpleOracleTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 2bcd7112268..82ef9846ab2 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -14,7 +14,7 @@
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
     public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
-        "gvenzl/oracle-xe:21-faststart"
+        "gvenzl/oracle-xe:21-slim-faststart"
     );
 
     private void runTest(OracleContainer container, String databaseName, String username, String password)
@@ -53,7 +53,7 @@ public void testPluggableDatabase() throws SQLException {
     public void testPluggableDatabaseAndCustomUser() throws SQLException {
         try (
             // constructor {
-            OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:21-faststart")
+            OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:21-slim-faststart")
                 .withDatabaseName("testDB")
                 .withUsername("testUser")
                 .withPassword("testPassword")

From b3858d7b29886f536e7de256376448254fe733fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 9 Nov 2022 07:06:02 -0600
Subject: [PATCH 2403/4969] Fix labeler configuration (#6157)

Current configuration is just checking changes in the root folder.
This commit fix it by checking changes in any subfolder too.
---
 .github/labeler.yml | 78 ++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index bda614305fa..fcbe0744bd8 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -8,84 +8,84 @@
   - gradlew
   - gradlew.bat
 "modules/azure":
-  - modules/azure/*
+  - modules/azure/**/*
 "modules/cassandra":
-  - modules/cassandra/*
+  - modules/cassandra/**/*
 "modules/clickhouse":
-  - modules/clickhouse/*
+  - modules/clickhouse/**/*
 "modules/cockroachdb":
-  - modules/cockroachdb/*
+  - modules/cockroachdb/**/*
 "modules/consul":
-  - modules/consul/*
+  - modules/consul/**/*
 "modules/couchbase":
-  - modules/couchbase/*
+  - modules/couchbase/**/*
 "modules/db2":
-  - modules/db2/*
+  - modules/db2/**/*
 "modules/dynalite":
-  - modules/dynalite/*
+  - modules/dynalite/**/*
 "modules/elasticsearch":
-  - modules/elasticsearch/*
+  - modules/elasticsearch/**/*
 "modules/gcloud":
-  - modules/gcloud/*
+  - modules/gcloud/**/*
 "modules/hivemq":
-  - modules/hivemq/*
+  - modules/hivemq/**/*
 "modules/influx":
-  - modules/influxdb/*
+  - modules/influxdb/**/*
 "modules/jdbc":
   - modules/jdbc/*
 "modules/jupiter":
-  - modules/junit-jupiter/*
+  - modules/junit-jupiter/**/*
 "modules/k3s":
-  - modules/k3s/*
+  - modules/k3s/**/*
 "modules/kafka":
-  - modules/kafka/*
+  - modules/kafka/**/*
 "modules/localstack":
-  - modules/localstack/*
+  - modules/localstack/**/*
 "modules/mariadb":
-  - modules/mariadb/*
+  - modules/mariadb/**/*
 "modules/mockserver":
-  - modules/mockserver/*
+  - modules/mockserver/**/*
 "modules/mongodb":
-  - modules/mongodb/*
+  - modules/mongodb/**/*
 "modules/sql-server":
-  - modules/mssqlserver/*
+  - modules/mssqlserver/**/*
 "modules/mysql":
-  - modules/mysql/*
+  - modules/mysql/**/*
 "modules/neo4j":
-  - modules/neo4j/*
+  - modules/neo4j/**/*
 "modules/nginx":
-  - modules/nginx/*
+  - modules/nginx/**/*
 "modules/oracle":
-  - modules/oracle-xe/*
+  - modules/oracle-xe/**/*
 "modules/orientdb":
-  - modules/orientdb/*
+  - modules/orientdb/**/*
 "modules/postgres":
-  - modules/postgresql/*
+  - modules/postgresql/**/*
 "modules/presto":
-  - modules/presto/*
+  - modules/presto/**/*
 "modules/pulsar":
-  - modules/pulsar/*
+  - modules/pulsar/**/*
 "modules/questdb":
-  - modules/questdb/*
+  - modules/questdb/**/*
 "modules/r2dbc":
-  - modules/r2dbc/*
+  - modules/r2dbc/**/*
 "modules/rabbitmq":
-  - modules/rabbitmq/*
+  - modules/rabbitmq/**/*
 "modules/redpanda":
-  - modules/redpanda/*
+  - modules/redpanda/**/*
 "modules/selenium":
-  - modules/selenium/*
+  - modules/selenium/**/*
 "modules/solr":
-  - modules/solr/*
+  - modules/solr/**/*
 "modules/spock":
-  - modules/spock/*
+  - modules/spock/**/*
 "modules/tidb":
-  - modules/tidb/*
+  - modules/tidb/**/*
 "modules/toxiproxy":
-  - modules/toxiproxy/*
+  - modules/toxiproxy/**/*
 "modules/trino":
-  - modules/trino/*
+  - modules/trino/**/*
 "modules/vault":
-  - modules/vault/*
+  - modules/vault/**/*
 "type/docs":
   - docs/**/*.md

From b82291c0de538118666e718b3e90ab0fa789cb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 9 Nov 2022 09:16:37 -0600
Subject: [PATCH 2404/4969] Update japicmp plugin version to 0.4.1 (#6159)

---
 build.gradle          | 2 +-
 gradle/japicmp.gradle | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 258056b12e9..d970b5a3d4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
+    id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
     id 'com.diffplug.spotless' version '6.11.0' apply false
     id 'org.gradle.test-retry' version '1.4.1'
 }
diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index ed4223324ab..bdb321cf75b 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -15,8 +15,8 @@ tasks.japicmp {
     // have an existing published version.
     enabled = ! configurations.baseline.copy().resolvedConfiguration.lenientConfiguration.getFiles().empty
 
-    oldClasspath = configurations.baseline
-    newClasspath = shadowJar.outputs.files
+    oldClasspath.from(configurations.baseline)
+    newClasspath.from(shadowJar.outputs.files)
     ignoreMissingClasses = true
 
     accessModifier = "protected"

From 98ddbb845583ff07e622077522c49122908c40b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 9 Nov 2022 10:43:47 -0600
Subject: [PATCH 2405/4969] Update Java Logo (#6160)

---
 docs/language-logos/java.svg | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/language-logos/java.svg b/docs/language-logos/java.svg
index 986704918f5..590da12d96a 100644
--- a/docs/language-logos/java.svg
+++ b/docs/language-logos/java.svg
@@ -1,17 +1,17 @@
-<svg viewBox="0 0 256 346" xmlns="http://www.w3.org/2000/svg" width="30" height="30">
-    <path
-        d="M82.55 267.47s-13.2 7.68 9.4 10.28c27.37 3.12 41.35 2.67 71.51-3.04 0 0 7.93 4.97 19 9.28-67.6 28.98-153.01-1.68-99.9-16.52m-8.26-37.81s-14.81 10.96 7.8 13.3c29.23 3.01 52.32 3.26 92.27-4.44 0 0 5.53 5.6 14.22 8.67-81.75 23.9-172.8 1.89-114.3-17.53"
-        fill="#5382A1"></path>
-    <path
-        d="M143.94 165.51c16.66 19.19-4.38 36.45-4.38 36.45s42.3-21.84 22.88-49.19c-18.15-25.5-32.06-38.17 43.27-81.86 0 0-118.24 29.53-61.77 94.6"
-        fill="#E76F00"></path>
-    <path
-        d="M233.36 295.44s9.77 8.05-10.75 14.28c-39.03 11.82-162.44 15.39-196.72.47-12.32-5.36 10.79-12.8 18.06-14.37 7.58-1.64 11.91-1.33 11.91-1.33-13.7-9.66-88.58 18.95-38.03 27.15 137.85 22.35 251.3-10.07 215.53-26.2M88.9 190.48s-62.77 14.9-22.23 20.32c17.12 2.3 51.25 1.78 83.03-.89 25.98-2.19 52.07-6.85 52.07-6.85s-9.16 3.93-15.8 8.45c-63.74 16.77-186.88 8.97-151.43-8.18 29.98-14.5 54.36-12.85 54.36-12.85m112.6 62.94c64.8-33.67 34.84-66.03 13.93-61.67-5.12 1.07-7.4 2-7.4 2s1.9-2.99 5.53-4.28c41.37-14.54 73.19 42.9-13.36 65.65 0 0 1-.9 1.3-1.7"
-        fill="#5382A1"></path>
-    <path
-        d="M162.44.37s35.89 35.9-34.04 91.1c-56.07 44.28-12.78 69.53-.02 98.38-32.73-29.53-56.75-55.53-40.64-79.72C111.4 74.6 176.92 57.39 162.44.37"
-        fill="#E76F00"></path>
-    <path
-        d="M95.27 344.67c62.2 3.98 157.71-2.21 159.97-31.64 0 0-4.35 11.15-51.4 20.01-53.09 10-118.57 8.83-157.4 2.42 0 0 7.95 6.58 48.83 9.2"
-        fill="#5382A1"></path>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30" width="30" height="30">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        fill: #ba001f;
+      }
+    </style>
+  </defs>
+  <path d="M27.12,24.71c-.23-.15-.82-.21-.82-.21,0,0,0-.44-.1-.85-.1-.41-.49-.69-.49-.69,0,0,.13-.28,.21-.67,.08-.39-.03-.8-.03-.8,0,0,.46-.51,.69-.77,.23-.26,.59-.64,.72-.93,.13-.28-.08-.49-.39-.87-.31-.39-.93-.9-1.36-1.29-.44-.39-1.96-1.54-1.96-1.54,0,0-.08-.1-.31-.46-.23-.36-.31-.26-.75-.62-.16-.14-.35-.24-.51-.31-.38-1.15-.86-2.44-1.46-3.86-1.32-3.1-1.69-3.89-2.73-5.99-1.04-2.11-2.13-3.82-2.41-4.28-.28-.46-.5-.9-.84-.18,0,0-3,5.7-4.48,9.32-.79,1.93-1.61,3.99-2.29,5.84-.12,.09-.27,.2-.41,.32-.46,.39-.51,.54-1.21,.93-.69,.39-1.52,.8-2.19,1.29-.67,.49-1.16,.85-1.26,.98-.1,.13-.21,.23-.05,.64,.15,.41,.1,.33,.39,.85,.28,.51,.87,1.31,.87,1.31,0,0-.1,.05-.08,.44,.03,.39,.13,.57,.31,.64,.18,.08,.03,.28-.05,.69-.08,.41-.03,.72-.03,.72,0,0-.51,0-.85,.1-.33,.1-.59,.1-.57,.44,.03,.33,.03,.46,.49,.75,.46,.28,.33,.31,.8,.39,.46,.08,.93,.28,1.26-.03,0,0,0,0,.01-.01-.05,.44-.07,.81-.06,1.07,.07,1.07,.07,1.25,.56,1.99,.29,.44,.74,.68,1.4,.71,.8,.04,2-.66,2.82-1.1,.87-.47,1.83-1.26,3.19-1.41,1.46-.16,2.21-.25,3.43,.12s1.88,.6,2.51,1.04c.71,.5,.74,.66,1.24,1.04,.59,.46,.93,.53,1.55,.56,.62,.02,1.11-.14,1.5-.76,.39-.62,.67-1.61,.78-2.46,.01-.1,.02-.23,.03-.38,.12,.07,.29,.16,.48,.24,.36,.15,.46,.21,.8,.05,.33-.15,.39-.31,.77-.59,.39-.28,.8-.64,1-.87,.21-.23,.08-.36-.15-.51Zm-21.12-2.83c-.11-.15-.28-.36-.39-.44-.18-.13-.51-.31-.62-.23-.1,.08-.33,.18-.33,.18,0,0-.87-1.36-1.03-1.65-.15-.28-.31-.26-.1-.44,.21-.18,.46-.49,.93-.82,.46-.33,1.03-.69,1.36-.9,.32-.2,.69-.4,.72-.41,.02,.04,.05,.12,.13,.28,.1,.22,.2,.45,.28,.63-.19,.6-.34,1.14-.46,1.62-.15,.64-.33,1.4-.49,2.19Zm19.22-.8c-.13,.03-.51,0-.8,.21-.28,.21-.21,.46-.21,.46h-.36c-.02-.1-.04-.21-.07-.31-.42-1.9-.35-1.55-.76-3.29,0,0,0,0,0-.01,.13-.22,.27-.52,.4-.86,.19-.53,.18-.56,.18-.57,0,0,.8,.52,1,.72,.21,.21,1.16,1.18,1.29,1.36,.13,.18,.44,.69,.44,.87s-.28,.33-.57,.67c-.28,.33-.41,.72-.54,.75Z"/>
+  <path class="cls-1" d="M22.92,21.62c-.31-1.41-.35-1.56-.52-2.29l-.24-.98c-.39-1.61-.85-3.15-1.48-4.84-.14-.01-.26-.02-.38-.03,0,.06,0,.12,0,.19,0,2.48-2.27,4.49-5.05,4.49s-4.94-1.92-5.05-4.31c-.53,.07-.84,.12-.84,.12-.91,2.34-1.66,4.46-2.01,5.92-.78,3.3-1.27,5.98-1.27,6.96,0,.05,0,.1,0,.14v.06q.07,.97,.42,1.5c.09,.14,.24,.3,.7,.32,.48,.02,1.56-.56,2.14-.88l.22-.12c.18-.1,.38-.22,.59-.34,.75-.46,1.68-1.03,2.92-1.17,1.49-.17,2.39-.26,3.78,.15,1.16,.35,1.98,.62,2.76,1.16,.48,.33,.7,.54,.89,.73,.12,.11,.22,.21,.38,.34,.43,.33,.58,.35,1.04,.37,.39,.01,.54-.06,.72-.35,.29-.46,.55-1.3,.66-2.1,.02-.14,.03-.37,.03-.68,0-1.05-.11-2.93-.43-4.36Z"/>
+  <path class="cls-2" d="M15.25,10.16c-2.25,0-4.07,1.58-4.07,3.51s1.83,3.51,4.07,3.51,4.07-1.58,4.07-3.51-1.83-3.51-4.07-3.51Z"/>
+  <path class="cls-1" d="M14.48,11.55c.18,.43-.18,.99-.8,1.25-.62,.26-1.27,.12-1.45-.31-.18-.43,.18-.99,.8-1.25,.62-.26,1.27-.12,1.45,.31Z"/>
 </svg>
\ No newline at end of file

From b8ca3447c9d2340b76302f6e8c706f4ad062c235 Mon Sep 17 00:00:00 2001
From: Stefan Decker <StefanHufschmidt@users.noreply.github.com>
Date: Mon, 14 Nov 2022 07:16:48 +0100
Subject: [PATCH 2406/4969] Improve mockserver documentation (#6002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Decker, Stefan <Stefan.Decker@gdata.de>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../MockServerContainerRuleTest.java          | 39 +++++++++----------
 .../containers/MockServerContainerTest.java   | 30 ++++++--------
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index 7fdacd7c580..eaf240f0fe2 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -11,35 +11,32 @@
 
 public class MockServerContainerRuleTest {
 
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
-        "mockserver/mockserver:mockserver-5.14.0"
-    );
-
     // creatingProxy {
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
+        .parse("mockserver/mockserver")
+        .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
+
     @Rule
-    public MockServerContainer mockServer = new MockServerContainer(
-        MOCKSERVER_IMAGE.withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion())
-    );
+    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
 
     // }
 
     @Test
     public void shouldReturnExpectation() throws Exception {
-        // spotless:off
         // testSimpleExpectation {
-        new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
-            .when(request()
-                .withPath("/person")
-                .withQueryStringParameter("name", "peter"))
-            .respond(response()
-                .withBody("Peter the person!"));
-
-        // ...a GET request to '/person?name=peter' returns "Peter the person!"
+        try (
+            MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
+        ) {
+            mockServerClient
+                .when(request().withPath("/person").withQueryStringParameter("name", "peter"))
+                .respond(response().withBody("Peter the person!"));
+
+            // ...a GET request to '/person?name=peter' returns "Peter the person!"
+
+            assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"))
+                .as("Expectation returns expected response body")
+                .contains("Peter the person");
+        }
         // }
-        // spotless:on
-
-        assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"))
-            .as("Expectation returns expected response body")
-            .contains("Peter the person");
     }
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index b59f14cc27b..c7225cfe1c2 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -10,38 +10,32 @@
 
 public class MockServerContainerTest {
 
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
-        "mockserver/mockserver:mockserver-5.14.0"
-    );
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
+        .parse("mockserver/mockserver")
+        .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
     @Test
     public void shouldCallActualMockserverVersion() throws Exception {
-        String actualVersion = MockServerClient.class.getPackage().getImplementationVersion();
-        try (
-            MockServerContainer mockServer = new MockServerContainer(
-                MOCKSERVER_IMAGE.withTag("mockserver-" + actualVersion)
-            )
-        ) {
+        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
             String expectedBody = "Hello World!";
 
-            MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort());
+            try (MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())) {
+                assertThat(client.hasStarted()).as("Mockserver running").isTrue();
 
-            assertThat(client.isRunning()).as("Mockserver running").isTrue();
+                client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-            client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
-
-            assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/hello"))
-                .as("MockServer returns correct result")
-                .isEqualTo(expectedBody);
+                assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/hello"))
+                    .as("MockServer returns correct result")
+                    .isEqualTo(expectedBody);
+            }
         }
     }
 
     @Test
     public void newVersionStartsWithDefaultWaitStrategy() {
-        DockerImageName dockerImageName = DockerImageName.parse("mockserver/mockserver:mockserver-5.14.0");
-        try (MockServerContainer mockServer = new MockServerContainer(dockerImageName)) {
+        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
         }
     }

From cbfe089e8593e2f3077b380bd6ddd89e6bf71e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 14 Nov 2022 08:43:54 -0600
Subject: [PATCH 2407/4969] Add Spotify in Donors section (#6083)

---
 docs/index.md                  |   7 +++++++
 docs/sponsor_logos/spotify.png | Bin 0 -> 4336 bytes
 2 files changed, 7 insertions(+)
 create mode 100644 docs/sponsor_logos/spotify.png

diff --git a/docs/index.md b/docs/index.md
index 31d854b8734..f55329e134d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -156,6 +156,13 @@ A huge thank you to our sponsors:
     </a>
 </div>
 
+<div style="text-align:center; max-width: 128px; display: inline-block; margin: 5px;">
+    <a href="https://www.spotify.com">
+        <img src="sponsor_logos/spotify.png" style="width: 100%"/>
+        <p>Spotify</p>
+    </a>
+</div>
+
 ### Backers
 
 * [Philip Riecks (@rieckpil)](https://github.com/rieckpil)
diff --git a/docs/sponsor_logos/spotify.png b/docs/sponsor_logos/spotify.png
new file mode 100644
index 0000000000000000000000000000000000000000..41f149f713b529dae1abc0c49ab7550bbf959b9e
GIT binary patch
literal 4336
zcmb7|^*<br<Hwy7r@Onm4`X6_b4+)))7|ZK4#RO`HZhF19459IHy!8Xm~JMg`R?;4
zd|!{p>-GHQ^#{BjuN2+a8btW?_!t-%M6X_|>i^@~{|o~DOFU2Zm;X?vt7WM6kIZwn
zEVH&47?@1+HY`i_EVK43%l7~4VFH+!?3m}RS?2ATXKYv&9Y_Pgj3egsT?W{!B=l{1
zKvG<~dTpvg6+8t-(l}YlTxB2wA=9KakQSe&T!TDZnxW4aUyX&(hKD*|4F^m^lcmCd
zG^1^NO=2fR<}E^K%tH(nAq$bj5u~JR*CEp8!r~++FyO}JC&yP|#iRh?Nigi=C*omX
zkP^O9RWb}g99iLo*LG2Ju>oRZc*}X&+v5zvJ$3FLpS;82w5lFDJwl6jP9+9Qvd&Gx
zfAdNVQI!85JswO-LKs{x)FZrEEz^-{lWuZG)zbOG(Jf%BJEC$dp%UVfM}f|C6O#Ug
z4bHcPT4!59lKF>1j{~me1uJJO<>ybz3PtTJ+fYhMh41a2;j|764ihIWteP%Kfg3lM
zkSJgPU#~+i9hGn;EEYo<V_GD}L-mh<dhz|wMx3YVXfl;dr~*HEIvpPfK>9=n!2pp3
zi20>W9UjecJg^J0<sAJCjvd=n<K_95@dD?^GlmPm3-9a<tLRn-k$WplOKM?zKXK3o
zFBXqiN9Ob&OEb2Z3%t^u+or#DRcqo(%rp!pFAZy5utA%Vhz7{OKAUv!WsM@Hf25X7
zXDD89FI05-9-o!H>W;FsdxuFTD|T?Kd?3QSgG8$#>BQfhh;<jk-g!y4dr7`&W7WA-
zgA+y91fK$fZpl@IHDab5hu2xhC%QQJQs>j6dRWx8Vo1r)B*`%2%@{G55J%hh^0=0N
z{$S+`x4AKWDV^*T8Obs;YFGq~R^|PE_|IXoGGn3IFvc*<GUDVwkZk=;4Bb&@#mbw5
zY_CJzkhT}S!=$OEnMhe@DN6lr5~XHv9K;8nJWuf|)h3BlAyR(3SFh3VGEoaxD=NK$
zdiz-NgRs3bv{Ji=Yu<7y6z6$a=gLn1V>qiQ9QBzwLLsp%u@&cB;|l-$24IPW8j%07
zKCKOtn2Vho>mi5%6TxA@<&|gjI~O@NTUa9BRfyxVGQ^Qbw0;7^JLRV(;sGBwI<h?C
z$>ca=I{O4H?{UjNHmz~?TbyrTU12{)e4PW(SlrS94}x$ss>^y__o200dDRUbWuzTm
z;`Ji8gU9=%Mi)%$MjE8Qtraub5rB^Cm%0Y_c5wsqFxNc-4HDNz@9pKcM?|65K`KJa
z6hG?TDS}=ydwtU~7W)3Rfr4vZFg-34OLHZ5*n5Y%7Q$369mZ!;d5bc(ikcnY1k!{u
zjf4v1WIra)^QS|L3EMLUblN@bi>Z2auyioU(kIL~Y=zY_rw%+?f8gHQn;Po8i#64a
zk5SrMwbL9pk9W;Mp89pviAI<Y`YNQvVTv^uI$h|dQl#*!7gTUN?2F!(q;-qdx<hga
zGUu{ceUcq_sPrBK=8u2RMh~X_cR76$dEaf_<3-Z{?1ASUm@G$bZQy$n+}->)j*+1=
zdHf=v!Lj>=P7O|uc0@>|Mb^>}@Fy$AR_Y1VM%1%AT+ucz;<>5uRRCGdWzUJ!DuwS*
zg~NC@0V!Oqx8%_*kFb^u9go_|Flr(~PM{(gZF2|OLG5GW?DeYHhaFe+iW5Z<Sr8KO
z=KxY+>z&F?+E}IYBIzxcHkzw8pT}+;d5T<rNPLKXVoov4%c9^+;0V|h-$WZ7>R?rC
zcCbtWL#DWgdD7{h59GM-On&Bb3M*hUwQ`O56}VydEr!5+4j1@I5)ba*(zT6t$ATpF
z=d319Q!kdgxXVsf_3A|_SZt)zpdG?Cij8Ii8T_04YtGhu5uL<k**w#*A&cMbd1&V%
z4pEXonSts3fO2a^H&nAKQ(f<u`b;li8C=A<Qg4r$3~^as86e2fXh)SDN-nq0BABs9
z1PKG&Y1?rC!SA2tK_g8*WF}ZmkSmYc9RZdkM)CWvZX!+}nM(=vczsZBOp9E>_KcAX
z+2#gpXEt}%QezZRZ@CCX!l3fs=o^1qv$%d}|M12ffx6C6_tEKJUbE{fdi>ac970dt
zU;?fP`Y}>Tb-NY)TzZDHiQWClRg`TN(IkD1S6`k*Ye}2Mg|>Q5(=rybU;NEU$E_bp
zLi@*CJBVrjJe5hf<k2l7bA6CazXZ(%#YFNvo|VXx_8y%fdHu!4xP9Pm<@&!(cSs)+
zE~D1iU%H&y4S4!2a7xjd8f~64F1*d3o^wP+(RmRVN_=33hi!9aun>o8x?~I0u<0R^
zE_sWIV{m@8r=)5ZvGAL?q2=*q3HWMFbQ4a4<)=|0OnvYrj-;qiFTEGT#E6RLh<rNH
zW^G+8z3ypP(5(J+8#IPt0gSjf5Yhi4W~%%nUF^_+uOty(qek=U!CAA|vH03dU^$)A
z;XOH|EJ-@@3^hpRMaV4ffcsA6z2jzfu2k+K^S6A}4E3@2B5j_bicj1WZ(?07Q@Rty
zRFsy?pLmU9af`_-_=x|M$HHdfYnizt$lF_~luc@7BouJM+gJ_-;notq$GO8SQ=hNY
zkqUGQl-G`5r<+f7J2QdTz`|S5Xt9g@RFYYbst@(DCl1l5CFZa7SA|Bkb?3j_joWm6
zcXQV!akcrCy%J|+r(%A}zk9`FDhuBt%mvePRS0h3h1GZ%Ir6h=(*AT#6Jx}+tb106
zaWkSoH!f^wIBX4prC#h^S07Zag)wL-tgkBXJlHvPW=ej}_)9Gz;T+!MHO<qnk=_-7
z;U~AsZ5DQIv(dS{jDxZ(;>7z}sS;zapj-=@55RXVN)PO30U-YNYunlfrB3>$xn7Ny
zv3(y2qW8T$cnX59wY+6wrUqFI6erf``-Sm{9~RiT1=m8!3e*Vokk4Y#9q3w3^noBR
ztNJLhbnU9sl1fX2n}&SYeYR{w$gFirc}>-fVOL^6DUgXpnvPo?z4IF81f@wj+I^@F
zMVo%;c<-B`&J^G5cMUZ#zu}F3ypv)A{K}@^(R?kl?s_`K5G68*u(Qw@0~UveNqqFA
zD&H@wEgQiuKnrSmFpof-D*aoANXehmUnytCiysyyZI?n+(-)>iT9fyiv3T;?1$%1u
z>I?GTQ*ux`T{zFoi1e$u1=ow83<tQM36)mY&B-HuB_m7cR6lLQ-oE=Q>h}?k!-~K=
z+ilPCfXFWOd04rwSav0K>bI~bFyy@}1=jm?2Qa>rUfyfhSpgVZaesn!+JSgv1w1gR
z+Q}Ej6eyT@PphBaH50(z9Ufv?rIdZsfW*`nT&ID__g1)as!@9|2RkiV3@*eubPQ7v
zB8W2$6C<fBxM@pLvd7A8pIH&TuRno1ZPF+?GSt8s+36EdKV2w~LQHumY#>#AY44&}
zwkN)qlseGAUezjLT&0P^?4)B)rYBJC5|4Nj@Qn3TqlvUq_<?{2&K@wEL2#D|_1lQ}
zb*6vb8vAz3N&{cpkqph>djY7>-{pSK<i8o_KxF%;49eG6*rUDzDbw8X;6Jm+5xZ`P
z^RpmL8?2Qh9WL89_6bt@x!L&v`LNgZ;wU7ME#*$IP{C1ZmwF?`K2WM8^;7asQi7$K
zPZSd#n}72EZkGkJvF%<U0F80y53Xm#d__1+HwJIH@iGEmm}ymBEo|>zT6vV&2g=Ro
zvl#(J4%$-1GUa4sihNXG<>eVPu6X@KVB5;$!9p&vNwJNLJtSi?-oHQDt*aOC77J@o
zg+g6)_+VOBj2eg0mBQadV2uSoo8uPEi~i={-@xJxv5BOtT#%P#mr^QBR>m_jmloPH
z&Q`~hYqPka%t2{~Wn+nnB8@1;!2T3T>z3m*-fN!ofk!jz#JI#sdq?gm&hpZW2ou_t
z@tz|6b|9$4f?k=lSxGE)`rb$X1N3vMT%Rz?b+b5mha}>2ZecGo^<|rs8t5>p?pD?U
zzUOwB=#^by=W-<=(C`P`x^!LW{>1}RpswGlM9;&i3dvaZsbOJtl!bjYwPB0g1*w9N
zZT%J?O<>vkJHx#yAQy%Z`ydfMgWJUI?1ijUS7_PwQ|k3lb8pTWQeAeZXh{5+HS%(2
zy<LkQdHF?DMe(3*H?@aAyCJaD&|y&pH6WSoG`Qn=T-*#iAqSmZJqWWjzfQ;mvrtv{
za1(*+s@QGTm!mC1cN%@|#f<`l{Vr0Yq=O~IwvIz_Ufe_dJ8zxZB8O4hTg36nw^_qK
zi8r6?rMRV`371$d?_1FQ3Kog;a^^SI$ZSV#e_zI`nV!3-^;BbXYK#!(I6)9^+yYSg
zv!6S6^w2#mJkaGk+>f)40o<N(Vm6~L6e$(4T&b4BDNO$9D_Xx-PC8D+gtNB{QfDFL
z*7svMAt1Bjw;AtDKyWWgSypn!W8JIzs}lnMrMTVRpBDlKzXNBye%0B4J?e?Ba9LXN
z3k0t2G1pl=ZdI5)N7y&V<)kNY+WrHdOtnHFa*9|{Vh+a0j>)8x;21FFSoJ$@ox=sV
zm&GbOvFOIWR$(veuM!9&vx&8aKBYh7urJlwRF+Ez6G&g_oP5kikRsxF;jkzw#x^{1
ztr2f{5l8%it3`H=jm@*#TbCxK91c0X?0){zMH$9pyj91T@B<{K@#R74?@>#2vg!Cy
z^ivTRM+*-Hc-Yk@o(;vhB9x|0^Pkh*xS#YklEn1EuN8JlAhA!;_^hf@CW_rH04orC
zWwd4Wu+s8qFUuBP+D3J!)Q|xF;bFxfQy#hwk%a6;n>l<LQyB4yYXpPK%DomOP|P%F
zS<$hseAh>Le(0iFquLLD(=UVAPk;&#p~_KWc;`nG#Dqd}!IO|8#@MSqqiG3KpeOwU
zrP{vwp>5znd|!?BvWue6dJL}{>B?phgzK&6<?rynuLnp&?`_kIy#{wKKg3eE!~=S~
z*ZA_S7WOeNvqby2WB_!h6Cvq08QfH-K#p*$i=Jdan-tLf`#Hk<#U3tH6ELk1E+Smc
ze=}~7{Ad&rhJ#fxV1?*%8Io$e!rL{i?Ibr;!P5*swEsfbsS_Yt4jsHINl=qS$A7Hx
z{8jYMV`04uoSf@@lBRozAMD?Wx){7@b>lv(%(sg@;Qv8YWi%Vl1}0d;y;E>r_4nY&
z?Uc|9yLKB_LYxg3e*1equ}`;ESvt<z8*zq2Vs3_4&)bU>)_V<YQKSdM`GQ`5ZL~1X
z-)r#~@kVGzU{SBtb9a|vA(*mG=;Wh(KsbA1Gsjz|6aFX7clUMyPT0ic2qx2^^>!Yc
zNUY9)>t?M{cQ@%OhCbJxf<I6AfxmmWjIoe1hb!5qWQvG1ybv1e6N;16==J|FVrUO-
z34E1bb&lW~RX3r+JF;xWgcLbWk708}AM2CY0kmw@ZeGAGnF~2Qn6BU+EB&_)?B}ef
z1(O@uW4+!K?Vnx+4b2EC#WnU@vZ9^lL}0+yV|Ky^fn@UTXY5yj)Q$>yOK6=c?j;!L
z-UGbgZhm6|J&wlAx5YtDZvli*{f-pr^EP&N(J=$<3pW1-aPXl{(E2LU?`p{VmVs-%
zFb!V>+3%NA^+t6#$cnLYk1`yBvtFNV!>(2*ccVlR-++DIOPjUxry6`Q=qu6(TO9)E
pEeDs$*|tTQ=>9)+t+Vlj-@a(tGnS|O@1ekWrS@92LD@F${{SHn4!!^Y

literal 0
HcmV?d00001


From e013a65eb543ee80648660b3cfc01267bcca5c4d Mon Sep 17 00:00:00 2001
From: Etienne Dysli Metref <edysli@users.noreply.github.com>
Date: Mon, 14 Nov 2022 17:59:26 +0100
Subject: [PATCH 2408/4969] Add test for Confluent platform version 7 to
 `KafkaContainerTest` (#5989)

---
 .../org/testcontainers/containers/KafkaContainerTest.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 380df00e9e9..baa857cde20 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -96,6 +96,14 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
         }
     }
 
+    @Test
+    public void testConfluentPlatformVersion7() throws Exception {
+        try (KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.2.2"))) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
     @Test
     public void testConfluentPlatformVersion5() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))) {

From 9f7e49ce7403bd2030e1f0985cb16a9852ca472b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 14 Nov 2022 13:33:25 -0800
Subject: [PATCH 2409/4969] Enhance orientdb module (#5974)

Starting with 3.2.x images, users are not created by default because
of security reasons.

Read more [here](https://orientdb.org/docs/3.2.x/release/3.2/Upgrading-to-OrientDB-3.2.html)
---
 modules/orientdb/build.gradle                 |   6 +-
 .../containers/OrientDBContainer.java         |  30 +++-
 .../containers/OrientDBContainerTest.java     |  11 +-
 .../test/resources/orientdb-server-config.xml | 128 ++++++++++++++++++
 4 files changed, 167 insertions(+), 8 deletions(-)
 create mode 100644 modules/orientdb/src/test/resources/orientdb-server-config.xml

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 05bdb380c28..83db42dcf14 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,9 +3,9 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.0.24"
+    api "com.orientechnologies:orientdb-client:3.2.0"
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.3.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.0.18"
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.0"
 }
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index 2f606475dc0..60207350f67 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -10,11 +10,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Optional;
 
 /**
@@ -69,7 +71,7 @@ public OrientDBContainer(final DockerImageName dockerImageName) {
         serverPassword = DEFAULT_SERVER_PASSWORD;
         databaseName = DEFAULT_DATABASE_NAME;
 
-        waitStrategy = new LogMessageWaitStrategy().withRegEx(".*Gremlin started correctly.*");
+        waitStrategy = new LogMessageWaitStrategy().withRegEx(".*OrientDB Studio available.*");
 
         addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
     }
@@ -107,6 +109,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
         orientDB = new OrientDB(getServerUrl(), "root", serverPassword, OrientDBConfig.defaultConfig());
     }
 
+    @Deprecated
     public OrientDB getOrientDB() {
         return orientDB;
     }
@@ -119,13 +122,33 @@ public String getDbUrl() {
         return getServerUrl() + "/" + databaseName;
     }
 
+    @Deprecated
     public ODatabaseSession getSession() {
         return getSession(DEFAULT_USERNAME, DEFAULT_PASSWORD);
     }
 
+    @Deprecated
     public synchronized ODatabaseSession getSession(String username, String password) {
-        orientDB.createIfNotExists(databaseName, ODatabaseType.PLOCAL);
-
+        String orientdbVersion = Arrays
+            .stream(this.getContainerInfo().getConfig().getEnv())
+            .filter(env -> env.startsWith("ORIENTDB_VERSION"))
+            .map(env -> env.split("=")[1])
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("no required env var"));
+        boolean isGreaterThan32 = new ComparableVersion(orientdbVersion).isGreaterThanOrEqualTo("3.2.0");
+        if (isGreaterThan32) {
+            String script = String.format(
+                "CREATE DATABASE %s plocal users(%s identified by '%s' role admin)",
+                databaseName,
+                username,
+                password
+            );
+            if (!orientDB.exists(databaseName)) {
+                orientDB.execute(script);
+            }
+        } else {
+            orientDB.createIfNotExists(databaseName, ODatabaseType.PLOCAL);
+        }
         if (session == null) {
             session = orientDB.open(databaseName, username, password);
 
@@ -134,6 +157,7 @@ public synchronized ODatabaseSession getSession(String username, String password
         return session;
     }
 
+    @Deprecated
     private void loadScript(String path, ODatabaseSession session) {
         try {
             URL resource = getClass().getClassLoader().getResource(path);
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index 6cf0e2e8ea9..afd7bcee246 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -3,6 +3,7 @@
 import com.orientechnologies.orient.core.db.ODatabaseSession;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -11,7 +12,7 @@
  */
 public class OrientDBContainerTest {
 
-    private static final DockerImageName ORIENTDB_IMAGE = DockerImageName.parse("orientdb:3.0.24-tp3");
+    private static final DockerImageName ORIENTDB_IMAGE = DockerImageName.parse("orientdb:3.2.0-tp3");
 
     @Test
     public void shouldReturnTheSameSession() {
@@ -42,7 +43,13 @@ public void shouldInitializeWithCommands() {
 
     @Test
     public void shouldQueryWithGremlin() {
-        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)) {
+        try (
+            OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("orientdb-server-config.xml"),
+                    "/orientdb/config/orientdb-server-config.xml"
+                )
+        ) {
             container.start();
 
             final ODatabaseSession session = container.getSession("admin", "admin");
diff --git a/modules/orientdb/src/test/resources/orientdb-server-config.xml b/modules/orientdb/src/test/resources/orientdb-server-config.xml
new file mode 100644
index 00000000000..ac6a4900b28
--- /dev/null
+++ b/modules/orientdb/src/test/resources/orientdb-server-config.xml
@@ -0,0 +1,128 @@
+<orient-server>
+    <handlers>
+        <!-- DISABLED-->
+        <!--<handler class="com.orientechnologies.orient.graph.handler.OGraphServerHandler">-->
+        <!--<parameters>-->
+        <!--<parameter name="enabled" value="true"/>-->
+        <!--<parameter name="graph.pool.max" value="50"/>-->
+        <!--</parameters>-->
+        <!--</handler>-->
+        <!-- CLUSTER PLUGIN, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
+        <handler class="com.orientechnologies.orient.server.hazelcast.OHazelcastPlugin">
+            <parameters>
+                <!-- <parameter name="nodeName" value="europe1" /> -->
+                <parameter name="enabled" value="${distributed}"/>
+                <parameter name="configuration.db.default"
+                           value="${ORIENTDB_HOME}/config/default-distributed-db-config.json"/>
+                <parameter name="configuration.hazelcast" value="${ORIENTDB_HOME}/config/hazelcast.xml"/>
+            </parameters>
+        </handler>
+        <!-- JMX SERVER, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
+        <handler class="com.orientechnologies.orient.server.handler.OJMXPlugin">
+            <parameters>
+                <parameter name="enabled" value="false"/>
+                <parameter name="profilerManaged" value="true"/>
+            </parameters>
+        </handler>
+        <!-- AUTOMATIC BACKUP, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
+        <handler class="com.orientechnologies.orient.server.handler.OAutomaticBackup">
+            <parameters>
+                <parameter name="enabled" value="false"/>
+                <!-- LOCATION OF JSON CONFIGURATION FILE -->
+                <parameter name="config" value="${ORIENTDB_HOME}/config/automatic-backup.json"/>
+            </parameters>
+        </handler>
+        <!-- SERVER SIDE SCRIPT INTERPRETER. WARNING, THIS CAN BE A SECURITY HOLE BECAUSE MALICIOUS CODE COULD BE INJECTED.
+            ENABLE IT ONLY IF CLIENTS ARE TRUSTED, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
+        <handler
+            class="com.orientechnologies.orient.server.handler.OServerSideScriptInterpreter">
+            <parameters>
+                <parameter name="enabled" value="true"/>
+                <parameter name="allowedLanguages" value="SQL,GREMLIN"/>
+                <!--  Comma separated packages  allowed in JS scripts eg. java.math.*, java.util.ArrayList -->
+                <parameter name="allowedPackages" value=""/>
+            </parameters>
+        </handler>
+        <!-- CUSTOM SQL FUNCTIONS -->
+        <handler class="com.orientechnologies.orient.server.handler.OCustomSQLFunctionPlugin">
+            <parameters>
+                <!-- LOCATION OF JSON CONFIGURATION FILE -->
+                <parameter name="config" value="${ORIENTDB_HOME}/config/custom-sql-functions.json"/>
+            </parameters>
+        </handler>
+
+    </handlers>
+    <network>
+        <sockets>
+            <socket implementation="com.orientechnologies.orient.server.network.OServerTLSSocketFactory" name="ssl">
+                <parameters>
+                    <parameter value="false" name="network.ssl.clientAuth"/>
+                    <parameter value="config/cert/orientdb.ks" name="network.ssl.keyStore"/>
+                    <parameter value="password" name="network.ssl.keyStorePassword"/>
+                    <parameter value="config/cert/orientdb.ks" name="network.ssl.trustStore"/>
+                    <parameter value="password" name="network.ssl.trustStorePassword"/>
+                </parameters>
+            </socket>
+            <socket implementation="com.orientechnologies.orient.server.network.OServerTLSSocketFactory" name="https">
+                <parameters>
+                    <parameter value="false" name="network.ssl.clientAuth"/>
+                    <parameter value="config/cert/orientdb.ks" name="network.ssl.keyStore"/>
+                    <parameter value="password" name="network.ssl.keyStorePassword"/>
+                    <parameter value="config/cert/orientdb.ks" name="network.ssl.trustStore"/>
+                    <parameter value="password" name="network.ssl.trustStorePassword"/>
+                </parameters>
+            </socket>
+        </sockets>
+        <protocols>
+            <!-- Default registered protocol. It reads commands using the HTTP protocol
+                and write data locally -->
+            <protocol name="binary"
+                      implementation="com.orientechnologies.orient.server.network.protocol.binary.ONetworkProtocolBinary"/>
+            <protocol name="http"
+                      implementation="com.orientechnologies.orient.server.network.protocol.http.ONetworkProtocolHttpDb"/>
+        </protocols>
+        <listeners>
+            <listener protocol="binary" ip-address="0.0.0.0" port-range="2424-2430" socket="default"/>
+            <listener protocol="http" ip-address="0.0.0.0" port-range="2480-2490" socket="default">
+                <parameters>
+                    <!-- Connection's custom parameters. If not specified the global configuration
+                        will be taken -->
+                    <parameter name="network.http.charset" value="utf-8"/>
+                    <parameter value="true" name="network.http.jsonResponseError"/>
+                    <parameter value="Content-Security-Policy: frame-ancestors 'none'" name="network.http.additionalResponseHeaders"></parameter>
+                    <!-- Define additional HTTP headers to always send as response -->
+                    <!-- Allow cross-site scripting -->
+                    <!-- parameter name="network.http.additionalResponseHeaders" value="Access-Control-Allow-Origin:
+                        *;Access-Control-Allow-Credentials: true" / -->
+                </parameters>
+                <commands>
+                    <command
+                        pattern="GET|www GET|studio/ GET| GET|*.htm GET|*.html GET|*.xml GET|*.jpeg GET|*.jpg GET|*.png GET|*.gif GET|*.js GET|*.css GET|*.swf GET|*.ico GET|*.txt GET|*.otf GET|*.pjs GET|*.svg GET|*.json GET|*.woff GET|*.woff2 GET|*.ttf GET|*.svgz"
+                        implementation="com.orientechnologies.orient.server.network.protocol.http.command.get.OServerCommandGetStaticContent">
+                        <parameters>
+                            <!-- Don't cache html resources in development mode -->
+                            <entry name="http.cache:*.htm *.html"
+                                   value="Cache-Control: no-cache, no-store, max-age=0, must-revalidate\r\nPragma: no-cache"/>
+                            <!-- Default caching -->
+                            <entry name="http.cache:default" value="Cache-Control: max-age=120"/>
+                        </parameters>
+                    </command>
+                    <command pattern="GET|gephi/*"
+                             implementation="com.orientechnologies.orient.server.network.protocol.http.command.get.OServerCommandGetGephi"/>
+
+                </commands>
+            </listener>
+        </listeners>
+        <cluster>
+        </cluster>
+    </network>
+    <storages>
+    </storages>
+    <users>
+    </users>
+    <properties>
+        <!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size> -->
+        <entry name="profiler.enabled" value="false"/>
+        <!-- <entry name="profiler.config" value="30,10,10" /> -->
+    </properties>
+</orient-server>

From 152e202bbb3623021f721312ed4994118c8d6888 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 21:34:18 +0000
Subject: [PATCH 2410/4969] Bump orientdb-gremlin from 3.2.0 to 3.2.12 in
 /modules/orientdb

Bumps [orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.0 to 3.2.12.
- [Release notes](https://github.com/orientechnologies/orientdb-gremlin/releases)
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.0...3.2.12)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 83db42dcf14..83a1e57e37a 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.0"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.12"
 }

From 501097e1986dfcd1e6c47d4f3b3eb7fa04f21551 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 21:34:23 +0000
Subject: [PATCH 2411/4969] Bump orientdb-client from 3.2.0 to 3.2.12 in
 /modules/orientdb

Bumps [orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.0 to 3.2.12.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.0...3.2.12)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 83db42dcf14..a5733041aec 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.0"
+    api "com.orientechnologies:orientdb-client:3.2.12"
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'

From e3ec7d44ddca3b478b92857ad8b410a3a5db5dd9 Mon Sep 17 00:00:00 2001
From: Ramin Gharib <ramingharib@gmail.com>
Date: Tue, 15 Nov 2022 18:46:04 +0100
Subject: [PATCH 2412/4969] Add InfluxDB v2 support (#3669)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Richard North <rich.north@gmail.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/databases/influxdb.md            | 117 +++++++---
 modules/influxdb/build.gradle                 |   4 +-
 .../containers/InfluxDBContainer.java         | 202 ++++++++++++++----
 .../containers/InfluxDBContainerTest.java     | 162 ++++++++++++--
 .../containers/InfluxDBContainerV1Test.java   | 129 +++++++++++
 .../InfluxDBContainerWithUserTest.java        |  71 ------
 .../containers/InfluxDBTestImages.java        |   7 -
 .../containers/InfluxDBTestUtils.java         |  10 +
 8 files changed, 532 insertions(+), 170 deletions(-)
 create mode 100644 modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
 delete mode 100644 modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
 delete mode 100644 modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java
 create mode 100644 modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestUtils.java

diff --git a/docs/modules/databases/influxdb.md b/docs/modules/databases/influxdb.md
index 3f5fe0654db..8055f6aed57 100644
--- a/docs/modules/databases/influxdb.md
+++ b/docs/modules/databases/influxdb.md
@@ -1,40 +1,109 @@
 # InfluxDB Module
 
-Testcontainers module for InfluxData [InfluxDB](https://github.com/influxdata/influxdb).
+Testcontainers module for InfluxData [InfluxDB](https://www.influxdata.com/products/influxdb/).
 
-## Usage example
+## Important note
 
-Running influxDbContainer as a stand-in for InfluxDB in a test:
+There are breaking changes in InfluxDB 2.x.
+For more information refer to the main [documentation](https://docs.influxdata.com/influxdb/v2.0/upgrade/v1-to-v2/).
+You can find more information about the official InfluxDB image on [Docker Hub](https://hub.docker.com/_/influxdb).
 
-```java
-public class SomeTest {
+## InfluxDB 2.x usage example
 
-    @Rule
-    public InfluxDBContainer influxDbContainer = new InfluxDBContainer();
-    
-    @Test
-    public void someTestMethod() {
-         InfluxDB influxDB = influxDbContainer.getNewInfluxDB();
-         ...
-```
+Running a `InfluxDBContainer` as a stand-in for InfluxDB in a test:
+
+<!--codeinclude-->
+[Create an InfluxDB container](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java) inside_block:constructorWithDefaultVariables
+<!--/codeinclude-->
+
+
+The InfluxDB instance will be setup with the following data:<br/>
+
+| Property     | Default Value | 
+|--------------|:-------------:|
+| username     |   test-user   | 
+| password     | test-password | 
+| organization |   test-org    |
+| bucket       |  test-bucket  |  
+| retention    | 0 (infinite)  |
+| adminToken   |       -       |
+
+For more details about the InfluxDB setup, please visit the official [InfluxDB documentation](https://docs.influxdata.com/influxdb/v2.0/upgrade/v1-to-v2/docker/#influxdb-2x-initialization-credentials).
+
+It is possible to overwrite the default property values. Create a container with InfluxDB admin token:
+<!--codeinclude-->
+[Create an InfluxDB container with admin token](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java) inside_block:constructorWithAdminToken
+<!--/codeinclude-->
+
+Or create a container with custom username, password, bucket, organization, and retention time:
+<!--codeinclude-->
+[Create an InfluxDB container with custom settings](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java) inside_block:constructorWithCustomVariables
+<!--/codeinclude-->
+
+The following code snippet shows how you can create an InfluxDB Java client:
+
+<!--codeinclude-->
+[Create an InfluxDB Java client](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java) inside_block:createInfluxDBClient
+<!--/codeinclude-->
+
+!!! hint
+    You can find the latest documentation about the InfluxDB 2.x Java client [here](https://github.com/influxdata/influxdb-client-java).
+
+## InfluxDB 1.x usage example
+
+Running a `InfluxDBContainer` as a stand-in for InfluxDB in a test with default env variables:
+
+<!--codeinclude-->
+[Create an InfluxDB container](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java) inside_block:constructorWithDefaultVariables
+<!--/codeinclude-->
+
+The InfluxDB instance will be setup with the following data:<br/>
+
+| Property      | Default Value | 
+|---------------|:-------------:|
+| username      |   test-user   | 
+| password      | test-password | 
+| authEnabled   |     true      |  
+| admin         |     admin     |
+| adminPassword |   password    |
+| database      |       -       |
+
+It is possible to overwrite the default values. 
+For instance, creating an InfluxDB container with a custom username, password, and database name:
+<!--codeinclude-->
+[Create an InfluxDB container with custom settings](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java) inside_block:constructorWithUserPassword
+<!--/codeinclude-->
+
+In the following example you will find a snippet to create an InfluxDB client using the official Java client:
+
+<!--codeinclude-->
+[Create an InfluxDB Java client](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java) inside_block:createInfluxDBClient
+<!--/codeinclude-->
+
+!!! hint
+    You can find the latest documentation about the InfluxDB 1.x Java client [here](https://github.com/influxdata/influxdb-java).
 
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
-    ```groovy
-    testImplementation "org.testcontainers:influxdb:{{latest_version}}"
-    ```
+
+```groovy
+testImplementation "org.testcontainers:influxdb:{{latest_version}}"
+```
+
 === "Maven"
-    ```xml
-    <dependency>
-        <groupId>org.testcontainers</groupId>
-        <artifactId>influxdb</artifactId>
-        <version>{{latest_version}}</version>
-        <scope>test</scope>
-    </dependency>
-    ```
+
+```xml
+
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>influxdb</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
 
 !!! hint
     Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 2a75c343653..c412d837d76 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -4,6 +4,8 @@ dependencies {
     api project(':testcontainers')
 
     compileOnly 'org.influxdb:influxdb-java:2.23'
-    testImplementation 'org.influxdb:influxdb-java:2.23'
+
     testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.influxdb:influxdb-java:2.23'
+    testImplementation "com.influxdb:influxdb-client-java:6.4.0"
 }
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index 40eea721b57..2af4ed1254d 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -1,16 +1,18 @@
 package org.testcontainers.containers;
 
+import lombok.Getter;
 import org.influxdb.InfluxDB;
 import org.influxdb.InfluxDBFactory;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.Collections;
+import java.util.Optional;
 import java.util.Set;
 
 /**
- * See <a href="https://store.docker.com/images/influxdb">https://store.docker.com/images/influxdb</a>
+ * Testcontainers implementation for InfluxDB.
  */
 public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends GenericContainer<SELF> {
 
@@ -23,17 +25,42 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
     @Deprecated
     public static final String VERSION = DEFAULT_TAG;
 
+    private static final int NO_CONTENT_STATUS_CODE = 204;
+
+    @Getter
+    private String username = "test-user";
+
+    @Getter
+    private String password = "test-password";
+
+    /**
+     * Properties of InfluxDB 1.x
+     */
     private boolean authEnabled = true;
 
     private String admin = "admin";
 
     private String adminPassword = "password";
 
+    @Getter
     private String database;
 
-    private String username = "any";
+    /**
+     * Properties of InfluxDB 2.x
+     */
+    @Getter
+    private String bucket = "test-bucket";
+
+    @Getter
+    private String organization = "test-org";
+
+    @Getter
+    private Optional<String> retention = Optional.empty();
 
-    private String password = "any";
+    @Getter
+    private Optional<String> adminToken = Optional.empty();
+
+    private final boolean isAtLeastMajorVersion2;
 
     /**
      * @deprecated use {@link InfluxDBContainer(DockerImageName)} instead
@@ -55,24 +82,61 @@ public InfluxDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        waitStrategy =
-            new WaitAllStrategy()
-                .withStrategy(Wait.forHttp("/ping").withBasicCredentials(username, password).forStatusCode(204))
-                .withStrategy(Wait.forListeningPort());
+        this.waitStrategy =
+            new HttpWaitStrategy()
+                .forPath("/ping")
+                .withBasicCredentials(this.username, this.password)
+                .forStatusCode(NO_CONTENT_STATUS_CODE);
 
+        this.isAtLeastMajorVersion2 =
+            new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("2.0.0");
         addExposedPort(INFLUXDB_PORT);
     }
 
+    /**
+     * Sets the InfluxDB environment variables based on the version
+     */
     @Override
     protected void configure() {
-        addEnv("INFLUXDB_ADMIN_USER", admin);
-        addEnv("INFLUXDB_ADMIN_PASSWORD", adminPassword);
+        if (this.isAtLeastMajorVersion2) {
+            configureInfluxDBV2();
+        } else {
+            configureInfluxDBV1();
+        }
+    }
 
-        addEnv("INFLUXDB_HTTP_AUTH_ENABLED", String.valueOf(authEnabled));
+    /**
+     * Sets the InfluxDB 2.x environment variables
+     *
+     * @see <a href="https://hub.docker.com/_/influxdb"> InfluxDB Dockerhub </a> for full documentation on InfluxDB's
+     * envrinoment variables</a>
+     */
+    private void configureInfluxDBV2() {
+        addEnv("DOCKER_INFLUXDB_INIT_MODE", "setup");
+
+        addEnv("DOCKER_INFLUXDB_INIT_USERNAME", this.username);
+        addEnv("DOCKER_INFLUXDB_INIT_PASSWORD", this.password);
+
+        addEnv("DOCKER_INFLUXDB_INIT_ORG", this.organization);
+        addEnv("DOCKER_INFLUXDB_INIT_BUCKET", this.bucket);
 
-        addEnv("INFLUXDB_DB", database);
-        addEnv("INFLUXDB_USER", username);
-        addEnv("INFLUXDB_USER_PASSWORD", password);
+        this.retention.ifPresent(ret -> addEnv("DOCKER_INFLUXDB_INIT_RETENTION", ret));
+        this.adminToken.ifPresent(token -> addEnv("DOCKER_INFLUXDB_INIT_ADMIN_TOKEN", token));
+    }
+
+    /**
+     * Sets the InfluxDB 1.x environment variables
+     */
+    private void configureInfluxDBV1() {
+        addEnv("INFLUXDB_USER", this.username);
+        addEnv("INFLUXDB_USER_PASSWORD", this.password);
+
+        addEnv("INFLUXDB_HTTP_AUTH_ENABLED", String.valueOf(this.authEnabled));
+
+        addEnv("INFLUXDB_ADMIN_USER", this.admin);
+        addEnv("INFLUXDB_ADMIN_PASSWORD", this.adminPassword);
+
+        addEnv("INFLUXDB_DB", this.database);
     }
 
     @Override
@@ -81,87 +145,131 @@ public Set<Integer> getLivenessCheckPortNumbers() {
     }
 
     /**
-     * Set env variable `INFLUXDB_HTTP_AUTH_ENABLED`.
+     * Set user for InfluxDB
+     *
+     * @param username The username to set for the system's initial super-user
+     * @return a reference to this container instance
+     */
+    public InfluxDBContainer<SELF> withUsername(final String username) {
+        this.username = username;
+        return this;
+    }
+
+    /**
+     * Set password for InfluxDB
+     *
+     * @param password The password to set for the system's initial super-user
+     * @return a reference to this container instance
+     */
+    public InfluxDBContainer<SELF> withPassword(final String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Determines if authentication should be enabled or not
      *
      * @param authEnabled Enables authentication.
      * @return a reference to this container instance
      */
-    public SELF withAuthEnabled(final boolean authEnabled) {
+    public InfluxDBContainer<SELF> withAuthEnabled(final boolean authEnabled) {
         this.authEnabled = authEnabled;
-        return self();
+        return this.self();
     }
 
     /**
-     * Set env variable `INFLUXDB_ADMIN_USER`.
+     * Sets the admin user
      *
      * @param admin The name of the admin user to be created. If this is unset, no admin user is created.
      * @return a reference to this container instance
      */
-    public SELF withAdmin(final String admin) {
+    public InfluxDBContainer<SELF> withAdmin(final String admin) {
         this.admin = admin;
-        return self();
+        return this.self();
     }
 
     /**
-     * Set env variable `INFLUXDB_ADMIN_PASSWORD`.
+     * Sets the admin password
      *
-     * @param adminPassword TThe password for the admin user configured with `INFLUXDB_ADMIN_USER`. If this is unset, a
-     *                      random password is generated and printed to standard out.
+     * @param adminPassword The password for the admin user. If this is unset, a random password is generated and
+     * printed to standard out.
      * @return a reference to this container instance
      */
-    public SELF withAdminPassword(final String adminPassword) {
+    public InfluxDBContainer<SELF> withAdminPassword(final String adminPassword) {
         this.adminPassword = adminPassword;
-        return self();
+        return this.self();
     }
 
     /**
-     * Set env variable `INFLUXDB_DB`.
+     * Initializes database with given name
      *
-     * @param database Automatically initializes a database with the name of this environment variable.
+     * @param database name of the database.
      * @return a reference to this container instance
      */
-    public SELF withDatabase(final String database) {
+    public InfluxDBContainer<SELF> withDatabase(final String database) {
         this.database = database;
-        return self();
+        return this.self();
     }
 
     /**
-     * Set env variable `INFLUXDB_USER`.
+     * Sets the organization name
      *
-     * @param username The name of a user to be created with no privileges. If `INFLUXDB_DB` is set, this user will
-     *                 be granted read and write permissions for that database.
+     * @param organization The organization for the initial setup of influxDB.
      * @return a reference to this container instance
      */
-    public SELF withUsername(final String username) {
-        this.username = username;
-        return self();
+    public InfluxDBContainer<SELF> withOrganization(final String organization) {
+        this.organization = organization;
+        return this;
     }
 
     /**
-     * Set env variable `INFLUXDB_USER_PASSWORD`.
+     * Initializes bucket with given name
      *
-     * @param password The password for the user configured with `INFLUXDB_USER`. If this is unset, a random password
-     *                 is generated and printed to standard out.
+     * @param bucket name of the bucket.
      * @return a reference to this container instance
      */
-    public SELF withPassword(final String password) {
-        this.password = password;
-        return self();
+    public InfluxDBContainer<SELF> withBucket(final String bucket) {
+        this.bucket = bucket;
+        return this;
     }
 
     /**
-     * @return a url to influxDb
+     * Sets the retention in days
+     *
+     * @param retention days bucket will retain data (0 is infinite, default is 0).
+     * @return a reference to this container instance
+     */
+    public InfluxDBContainer<SELF> withRetention(final String retention) {
+        this.retention = Optional.of(retention);
+        return this;
+    }
+
+    /**
+     * Sets the admin token
+     *
+     * @param adminToken Authentication token to associate with the admin user.
+     * @return a reference to this container instance
+     */
+    public InfluxDBContainer<SELF> withAdminToken(final String adminToken) {
+        this.adminToken = Optional.of(adminToken);
+        return this;
+    }
+
+    /**
+     * @return a url to InfluxDB
      */
     public String getUrl() {
-        return "http://" + getHost() + ":" + getLivenessCheckPort();
+        return "http://" + getHost() + ":" + getMappedPort(INFLUXDB_PORT);
     }
 
     /**
-     * @return a influxDb client
+     * @return a InfluxDB client for InfluxDB 1.x.
+     * @deprecated Use the new <a href="https://github.com/influxdata/influxdb-client-java">InfluxDB client library.</a>
      */
+    @Deprecated
     public InfluxDB getNewInfluxDB() {
-        InfluxDB influxDB = InfluxDBFactory.connect(getUrl(), username, password);
-        influxDB.setDatabase(database);
+        final InfluxDB influxDB = InfluxDBFactory.connect(getUrl(), this.username, this.password);
+        influxDB.setDatabase(this.database);
         return influxDB;
     }
 }
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
index bcf3d21f25b..fc80e41ff09 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
@@ -1,44 +1,166 @@
 package org.testcontainers.containers;
 
-import org.influxdb.InfluxDB;
-import org.junit.ClassRule;
+import com.influxdb.client.InfluxDBClient;
+import com.influxdb.client.InfluxDBClientFactory;
+import com.influxdb.client.InfluxDBClientOptions;
+import com.influxdb.client.QueryApi;
+import com.influxdb.client.WriteApi;
+import com.influxdb.client.domain.Bucket;
+import com.influxdb.client.domain.BucketRetentionRules;
+import com.influxdb.client.domain.WritePrecision;
+import com.influxdb.client.write.Point;
+import com.influxdb.query.FluxRecord;
+import com.influxdb.query.FluxTable;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
 
 public class InfluxDBContainerTest {
 
-    @ClassRule
-    public static InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
-        InfluxDBTestImages.INFLUXDB_TEST_IMAGE
-    );
+    private static final String USERNAME = "new-test-user";
+
+    private static final String PASSWORD = "new-test-password";
+
+    private static final String ORG = "new-test-org";
+
+    private static final String BUCKET = "new-test-bucket";
+
+    private static final String RETENTION = "1w";
+
+    private static final String ADMIN_TOKEN = "super-secret-token";
+
+    private static final int SECONDS_IN_WEEK = 604800;
 
     @Test
-    public void getUrl() {
-        String actual = influxDBContainer.getUrl();
+    public void getInfluxDBClient() {
+        try (
+            // constructorWithDefaultVariables {
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                DockerImageName.parse("influxdb:2.0.7")
+            )
+            // }
+        ) {
+            influxDBContainer.start();
 
-        assertThat(actual).isNotNull();
+            try (final InfluxDBClient influxDBClient = createClient(influxDBContainer)) {
+                Assertions.assertThat(influxDBClient).isNotNull();
+                Assertions.assertThat(influxDBClient.ping()).isTrue();
+            }
+        }
     }
 
     @Test
-    public void getNewInfluxDB() {
-        InfluxDB actual = influxDBContainer.getNewInfluxDB();
+    public void getInfluxDBClientWithAdminToken() {
+        try (
+            // constructorWithAdminToken {
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                DockerImageName.parse("influxdb:2.0.7")
+            )
+                .withAdminToken(ADMIN_TOKEN)
+            // }
+        ) {
+            influxDBContainer.start();
+            final Optional<String> adminToken = influxDBContainer.getAdminToken();
+            Assertions.assertThat(adminToken).isNotEmpty();
 
-        assertThat(actual).isNotNull();
-        assertThat(actual.ping()).isNotNull();
+            try (
+                final InfluxDBClient influxDBClient = createClientWithToken(
+                    influxDBContainer.getUrl(),
+                    adminToken.get()
+                )
+            ) {
+                Assertions.assertThat(influxDBClient).isNotNull();
+                Assertions.assertThat(influxDBClient.ping()).isTrue();
+            }
+        }
     }
 
     @Test
-    public void getLivenessCheckPort() {
-        Integer actual = influxDBContainer.getLivenessCheckPort();
+    public void getBucket() {
+        try (
+            // constructorWithCustomVariables {
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                DockerImageName.parse("influxdb:2.0.7")
+            )
+                .withUsername(USERNAME)
+                .withPassword(PASSWORD)
+                .withOrganization(ORG)
+                .withBucket(BUCKET)
+                .withRetention(RETENTION);
+            // }
+        ) {
+            influxDBContainer.start();
 
-        assertThat(actual).isNotNull();
+            try (final InfluxDBClient influxDBClient = createClient(influxDBContainer)) {
+                final Bucket bucket = influxDBClient.getBucketsApi().findBucketByName(BUCKET);
+                Assertions.assertThat(bucket).isNotNull();
+
+                Assertions.assertThat(bucket.getName()).isEqualTo(BUCKET);
+                Assertions
+                    .assertThat(bucket.getRetentionRules())
+                    .hasSize(1)
+                    .first()
+                    .extracting(BucketRetentionRules::getEverySeconds)
+                    .isEqualTo(SECONDS_IN_WEEK);
+            }
+        }
     }
 
     @Test
-    public void isRunning() {
-        boolean actual = influxDBContainer.isRunning();
+    public void queryForWriteAndRead() {
+        try (
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                InfluxDBTestUtils.INFLUXDB_V2_TEST_IMAGE
+            )
+                .withUsername(USERNAME)
+                .withPassword(PASSWORD)
+                .withOrganization(ORG)
+                .withBucket(BUCKET)
+                .withRetention(RETENTION)
+        ) {
+            influxDBContainer.start();
+
+            try (final InfluxDBClient influxDBClient = createClient(influxDBContainer)) {
+                try (final WriteApi writeApi = influxDBClient.makeWriteApi()) {
+                    final Point point = Point
+                        .measurement("temperature")
+                        .addTag("location", "west")
+                        .addField("value", 55.0D)
+                        .time(Instant.now().toEpochMilli(), WritePrecision.MS);
+
+                    writeApi.writePoint(point);
+                }
+
+                final String flux = String.format("from(bucket:\"%s\") |> range(start: 0)", BUCKET);
+
+                final QueryApi queryApi = influxDBClient.getQueryApi();
+
+                final FluxTable fluxTable = queryApi.query(flux).get(0);
+                final List<FluxRecord> records = fluxTable.getRecords();
+                Assertions.assertThat(records).hasSize(1);
+            }
+        }
+    }
+
+    // createInfluxDBClient {
+    public static InfluxDBClient createClient(final InfluxDBContainer<?> influxDBContainer) {
+        final InfluxDBClientOptions influxDBClientOptions = InfluxDBClientOptions
+            .builder()
+            .url(influxDBContainer.getUrl())
+            .authenticate(influxDBContainer.getUsername(), influxDBContainer.getPassword().toCharArray())
+            .bucket(influxDBContainer.getBucket())
+            .org(influxDBContainer.getOrganization())
+            .build();
+        return InfluxDBClientFactory.create(influxDBClientOptions);
+    }
+
+    // }
 
-        assertThat(actual).isTrue();
+    public static InfluxDBClient createClientWithToken(final String url, final String token) {
+        return InfluxDBClientFactory.create(url, token.toCharArray());
     }
 }
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
new file mode 100644
index 00000000000..c9e292c5675
--- /dev/null
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
@@ -0,0 +1,129 @@
+package org.testcontainers.containers;
+
+import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBFactory;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.Query;
+import org.influxdb.dto.QueryResult;
+import org.junit.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class InfluxDBContainerV1Test {
+
+    private static final String TEST_VERSION = InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE.getVersionPart();
+
+    private static final String DATABASE = "test";
+
+    private static final String USER = "new-test-user";
+
+    private static final String PASSWORD = "new-test-password";
+
+    @Test
+    public void createInfluxDBOnlyWithUrlAndCorrectVersion() {
+        try (
+            // constructorWithDefaultVariables {
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                DockerImageName.parse("influxdb:1.4.3")
+            )
+            // }
+        ) {
+            // Start the container. This step might take some time...
+            influxDBContainer.start();
+
+            try (final InfluxDB influxDBClient = createInfluxDBWithUrl(influxDBContainer)) {
+                assertThat(influxDBClient).isNotNull();
+                assertThat(influxDBClient.ping().isGood()).isTrue();
+                assertThat(influxDBClient.version()).isEqualTo(TEST_VERSION);
+            }
+        }
+    }
+
+    @Test
+    public void getNewInfluxDBWithCorrectVersion() {
+        try (
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE
+            )
+        ) {
+            // Start the container. This step might take some time...
+            influxDBContainer.start();
+
+            try (final InfluxDB influxDBClient = createInfluxDBWithUrl(influxDBContainer)) {
+                assertThat(influxDBClient).isNotNull();
+                assertThat(influxDBClient.ping().isGood()).isTrue();
+                assertThat(influxDBClient.version()).isEqualTo(TEST_VERSION);
+            }
+        }
+    }
+
+    @Test
+    public void describeDatabases() {
+        try (
+            // constructorWithUserPassword {
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                DockerImageName.parse("influxdb:1.4.3")
+            )
+                .withDatabase(DATABASE)
+                .withUsername(USER)
+                .withPassword(PASSWORD)
+            // }
+        ) {
+            // Start the container. This step might take some time...
+            influxDBContainer.start();
+
+            try (final InfluxDB influxDBClient = createInfluxDBWithUrl(influxDBContainer)) {
+                assertThat(influxDBClient.describeDatabases()).contains(DATABASE);
+            }
+        }
+    }
+
+    @Test
+    public void queryForWriteAndRead() {
+        try (
+            final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
+                InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE
+            )
+                .withDatabase(DATABASE)
+                .withUsername(USER)
+                .withPassword(PASSWORD)
+        ) {
+            // Start the container. This step might take some time...
+            influxDBContainer.start();
+
+            try (final InfluxDB influxDBClient = createInfluxDBWithUrl(influxDBContainer)) {
+                final Point point = Point
+                    .measurement("cpu")
+                    .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
+                    .addField("idle", 90L)
+                    .addField("user", 9L)
+                    .addField("system", 1L)
+                    .build();
+                influxDBClient.write(point);
+
+                final Query query = new Query("SELECT idle FROM cpu", DATABASE);
+                final QueryResult actual = influxDBClient.query(query);
+
+                assertThat(actual).isNotNull();
+                assertThat(actual.getError()).isNull();
+                assertThat(actual.getResults()).isNotNull();
+                assertThat(actual.getResults()).hasSize(1);
+            }
+        }
+    }
+
+    // createInfluxDBClient {
+    public static InfluxDB createInfluxDBWithUrl(final InfluxDBContainer<?> container) {
+        InfluxDB influxDB = InfluxDBFactory.connect(
+            container.getUrl(),
+            container.getUsername(),
+            container.getPassword()
+        );
+        influxDB.setDatabase(container.getDatabase());
+        return influxDB;
+    }
+    // }
+}
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
deleted file mode 100644
index 7a34bbb4fd6..00000000000
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerWithUserTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.testcontainers.containers;
-
-import org.influxdb.InfluxDB;
-import org.influxdb.dto.Point;
-import org.influxdb.dto.Query;
-import org.influxdb.dto.QueryResult;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.util.concurrent.TimeUnit;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class InfluxDBContainerWithUserTest {
-
-    private static final String TEST_VERSION = InfluxDBTestImages.INFLUXDB_TEST_IMAGE.getVersionPart();
-
-    private static final String DATABASE = "test";
-
-    private static final String USER = "test-user";
-
-    private static final String PASSWORD = "test-password";
-
-    @Rule
-    public InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(InfluxDBTestImages.INFLUXDB_TEST_IMAGE)
-        .withDatabase(DATABASE)
-        .withUsername(USER)
-        .withPassword(PASSWORD);
-
-    @Test
-    public void describeDatabases() {
-        InfluxDB actual = influxDBContainer.getNewInfluxDB();
-
-        assertThat(actual).isNotNull();
-        assertThat(actual.describeDatabases()).contains(DATABASE);
-    }
-
-    @Test
-    public void checkVersion() {
-        InfluxDB actual = influxDBContainer.getNewInfluxDB();
-
-        assertThat(actual).isNotNull();
-
-        assertThat(actual.ping()).isNotNull();
-        assertThat(actual.ping().getVersion()).isEqualTo(TEST_VERSION);
-
-        assertThat(actual.version()).isEqualTo(TEST_VERSION);
-    }
-
-    @Test
-    public void queryForWriteAndRead() {
-        InfluxDB influxDB = influxDBContainer.getNewInfluxDB();
-
-        Point point = Point
-            .measurement("cpu")
-            .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
-            .addField("idle", 90L)
-            .addField("user", 9L)
-            .addField("system", 1L)
-            .build();
-        influxDB.write(point);
-
-        Query query = new Query("SELECT idle FROM cpu", DATABASE);
-        QueryResult actual = influxDB.query(query);
-
-        assertThat(actual).isNotNull();
-        assertThat(actual.getError()).isNull();
-        assertThat(actual.getResults()).isNotNull();
-        assertThat(actual.getResults()).hasSize(1);
-    }
-}
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java
deleted file mode 100644
index a0e2d31bbdf..00000000000
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestImages.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.testcontainers.containers;
-
-import org.testcontainers.utility.DockerImageName;
-
-public interface InfluxDBTestImages {
-    DockerImageName INFLUXDB_TEST_IMAGE = DockerImageName.parse("influxdb:1.4.3");
-}
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestUtils.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestUtils.java
new file mode 100644
index 00000000000..db9ae2bf79f
--- /dev/null
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBTestUtils.java
@@ -0,0 +1,10 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public final class InfluxDBTestUtils {
+
+    static final DockerImageName INFLUXDB_V1_TEST_IMAGE = DockerImageName.parse("influxdb:1.4.3");
+
+    static final DockerImageName INFLUXDB_V2_TEST_IMAGE = DockerImageName.parse("influxdb:2.0.7");
+}

From 858dd0a2829769f065cd99fc3facb617e0e78955 Mon Sep 17 00:00:00 2001
From: Srinivasa Vasu <srinivasan.surprise@gmail.com>
Date: Tue, 15 Nov 2022 23:58:08 +0530
Subject: [PATCH 2413/4969] Add YugabyteDB module (#4372)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Yugabyte provides two implementations `YSQL` and `YCQL`.
This module will provide both `YugabyteDBYSQLContainer`
and `YugabyteDBYCQLContainer`.

Signed-off-by: Srinivasa Vasu <srinivasan.surprise@gmail.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   2 +
 docs/modules/databases/yugabytedb.md          |  59 +++++++
 modules/yugabytedb/build.gradle               |  10 ++
 .../containers/YugabyteDBYCQLContainer.java   | 167 ++++++++++++++++++
 .../containers/YugabyteDBYSQLContainer.java   | 150 ++++++++++++++++
 .../YugabyteDBYSQLContainerProvider.java      |  42 +++++
 .../delegate/AbstractYCQLDelegate.java        |  27 +++
 .../delegate/YugabyteDBYCQLDelegate.java      |  57 ++++++
 .../strategy/YugabyteDBYCQLWaitStrategy.java  |  82 +++++++++
 .../strategy/YugabyteDBYSQLWaitStrategy.java  |  60 +++++++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 .../YugabyteDBYSQLJDBCDriverTest.java         |  29 +++
 .../junit/yugabytedb/YugabyteDBYCQLTest.java  | 122 +++++++++++++
 .../junit/yugabytedb/YugabyteDBYSQLTest.java  |  98 ++++++++++
 .../src/test/resources/init/init_yql.sql      |   5 +
 .../src/test/resources/logback-test.xml       |  16 ++
 20 files changed, 935 insertions(+)
 create mode 100644 docs/modules/databases/yugabytedb.md
 create mode 100644 modules/yugabytedb/build.gradle
 create mode 100644 modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
 create mode 100644 modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
 create mode 100644 modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java
 create mode 100644 modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java
 create mode 100644 modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
 create mode 100644 modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
 create mode 100644 modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
 create mode 100644 modules/yugabytedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
 create mode 100644 modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
 create mode 100644 modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
 create mode 100644 modules/yugabytedb/src/test/resources/init/init_yql.sql
 create mode 100644 modules/yugabytedb/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 37609ce1424..406483c2d45 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -50,6 +50,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - YugabyteDB
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 2bbca5db3ae..2f543615dee 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -50,6 +50,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - YugabyteDB
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index d29d0178c39..85c44eba697 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -50,6 +50,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - YugabyteDB
         - New Module
   - type: textarea
     id: problem
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 095257df4c1..121b8ab4b46 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -258,6 +258,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/yugabytedb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
 
 # Examples
   - package-ecosystem: "gradle"
diff --git a/.github/labeler.yml b/.github/labeler.yml
index fcbe0744bd8..2aff606e27b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -87,5 +87,7 @@
   - modules/trino/**/*
 "modules/vault":
   - modules/vault/**/*
+"modules/yugabytedb":
+  - modules/yugabytedb/**/*
 "type/docs":
   - docs/**/*.md
diff --git a/docs/modules/databases/yugabytedb.md b/docs/modules/databases/yugabytedb.md
new file mode 100644
index 00000000000..4ab3436b57c
--- /dev/null
+++ b/docs/modules/databases/yugabytedb.md
@@ -0,0 +1,59 @@
+# YugabyteDB Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+See [Database containers](./index.md) for documentation and usage that is common to all database container types.
+
+YugabyteDB supports two APIs. 
+- Yugabyte Structured Query Language [YSQL](https://docs.yugabyte.com/latest/api/ysql/) is a fully-relational API that is built by the PostgreSQL code
+- Yugabyte Cloud Query Language [YCQL](https://docs.yugabyte.com/latest/api/ycql/) is a semi-relational SQL API that has its roots in the Cassandra Query Language
+
+## Usage example
+
+### YSQL API 
+
+<!--codeinclude-->
+[Creating a YSQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java) inside_block:creatingYSQLContainer
+<!--/codeinclude-->
+
+
+<!--codeinclude-->
+[Starting a YSQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java) inside_block:startingYSQLContainer
+<!--/codeinclude-->
+
+
+### YCQL API
+
+<!--codeinclude-->
+[Creating a YCQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java) inside_block:creatingYCQLContainer
+<!--/codeinclude-->
+
+
+<!--codeinclude-->
+[Starting a YCQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java) inside_block:startingYCQLContainer
+<!--/codeinclude-->
+
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:yugabytedb:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>yugabytedb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add the Yugabytedb driver JAR to your project.
+    You should ensure that your project has the Yugabytedb driver as a dependency, if you plan on using it.
+    Refer to the driver page [YSQL](https://docs.yugabyte.com/latest/integrations/jdbc-driver/) and [YCQL](https://docs.yugabyte.com/latest/reference/drivers/ycql-client-drivers/) for instructions.
diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
new file mode 100644
index 00000000000..8d0ba6ca3d0
--- /dev/null
+++ b/modules/yugabytedb/build.gradle
@@ -0,0 +1,10 @@
+description = "Testcontainers :: JDBC :: YugabyteDB"
+
+dependencies {
+    api project(':jdbc')
+    testImplementation project(':jdbc-test')
+    // YCQL driver
+    testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-11'
+    // YSQL driver
+    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.4'
+}
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
new file mode 100644
index 00000000000..af20ef9e157
--- /dev/null
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
@@ -0,0 +1,167 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.containers.delegate.YugabyteDBYCQLDelegate;
+import org.testcontainers.containers.strategy.YugabyteDBYCQLWaitStrategy;
+import org.testcontainers.ext.ScriptUtils;
+import org.testcontainers.utility.DockerImageName;
+
+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for YugabyteDB YCQL API.
+ *
+ * @author srinivasa-vasu
+ * @see <a href="https://docs.yugabyte.com/stable/api/ycql/">YCQL API</a>
+ */
+public class YugabyteDBYCQLContainer extends GenericContainer<YugabyteDBYCQLContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yugabytedb/yugabyte");
+
+    private static final Integer YCQL_PORT = 9042;
+
+    private static final Integer MASTER_DASHBOARD_PORT = 7000;
+
+    private static final Integer TSERVER_DASHBOARD_PORT = 9000;
+
+    private static final String ENTRYPOINT = "bin/yugabyted start --background=false";
+
+    private static final String LOCAL_DC = "datacenter1";
+
+    private String keyspace;
+
+    private String username;
+
+    private String password;
+
+    private String initScript;
+
+    /**
+     * @param imageName image name
+     */
+    public YugabyteDBYCQLContainer(final String imageName) {
+        this(DockerImageName.parse(imageName));
+    }
+
+    /**
+     * @param imageName image name
+     */
+    public YugabyteDBYCQLContainer(final DockerImageName imageName) {
+        super(imageName);
+        imageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(YCQL_PORT, MASTER_DASHBOARD_PORT, TSERVER_DASHBOARD_PORT);
+        waitingFor(new YugabyteDBYCQLWaitStrategy(this).withStartupTimeout(Duration.ofSeconds(60)));
+        withCommand(ENTRYPOINT);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Collections.singleton(getMappedPort(YCQL_PORT));
+    }
+
+    /**
+     * Configures the environment variables. Setting up these variables would create the
+     * custom objects. Setting {@link #withKeyspaceName(String)},
+     * {@link #withUsername(String)}, {@link #withPassword(String)} these parameters will
+     * initilaize the database with those custom values
+     */
+    @Override
+    protected void configure() {
+        addEnv("YCQL_KEYSPACE", keyspace);
+        addEnv("YCQL_USER", username);
+        addEnv("YCQL_PASSWORD", password);
+    }
+
+    /**
+     * @param initScript path of the initialization script file
+     * @return {@link YugabyteDBYCQLContainer} instance
+     */
+    public YugabyteDBYCQLContainer withInitScript(String initScript) {
+        this.initScript = initScript;
+        return this;
+    }
+
+    /**
+     * Setting this would create the keyspace
+     * @param keyspace keyspace
+     * @return {@link YugabyteDBYCQLContainer} instance
+     */
+    public YugabyteDBYCQLContainer withKeyspaceName(final String keyspace) {
+        this.keyspace = keyspace;
+        return this;
+    }
+
+    /**
+     * Setting this would create the custom user role
+     * @param username user name
+     * @return {@link YugabyteDBYCQLContainer} instance
+     */
+    public YugabyteDBYCQLContainer withUsername(final String username) {
+        this.username = username;
+        return this;
+    }
+
+    /**
+     * Setting this along with {@link #withUsername(String)} would enable authentication
+     * @param password password
+     * @return {@link YugabyteDBYCQLContainer} instance
+     */
+    public YugabyteDBYCQLContainer withPassword(final String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Executes the initilization script
+     * @param containerInfo containerInfo
+     */
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        if (this.initScript != null) {
+            ScriptUtils.runInitScript(new YugabyteDBYCQLDelegate(this), initScript);
+        }
+    }
+
+    /**
+     * Returns a {@link InetSocketAddress} representation of YCQL's contact point info
+     * @return contactpoint
+     */
+    public InetSocketAddress getContactPoint() {
+        return new InetSocketAddress(getHost(), getMappedPort(YCQL_PORT));
+    }
+
+    /**
+     * Returns the local datacenter name
+     * @return localdc name
+     */
+    public String getLocalDc() {
+        return LOCAL_DC;
+    }
+
+    /**
+     * Username getter method
+     * @return username
+     */
+    public String getUsername() {
+        return this.username;
+    }
+
+    /**
+     * Password getter method
+     * @return password
+     */
+    public String getPassword() {
+        return this.password;
+    }
+
+    /**
+     * Keyspace getter method
+     * @return keyspace
+     */
+    public String getKeyspace() {
+        return this.keyspace;
+    }
+}
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
new file mode 100644
index 00000000000..290269dfe79
--- /dev/null
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
@@ -0,0 +1,150 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.strategy.YugabyteDBYSQLWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for YugabyteDB YSQL API.
+ *
+ * @author srinivasa-vasu
+ * @see <a href="https://docs.yugabyte.com/stable/api/ysql/">YSQL API</a>
+ */
+
+public class YugabyteDBYSQLContainer extends JdbcDatabaseContainer<YugabyteDBYSQLContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yugabytedb/yugabyte");
+
+    private static final Integer YSQL_PORT = 5433;
+
+    private static final Integer MASTER_DASHBOARD_PORT = 7000;
+
+    private static final Integer TSERVER_DASHBOARD_PORT = 9000;
+
+    private static final String JDBC_DRIVER_CLASS = "com.yugabyte.Driver";
+
+    private static final String JDBC_CONNECT_PREFIX = "jdbc:yugabytedb";
+
+    private static final String ENTRYPOINT = "bin/yugabyted start --background=false";
+
+    private String database = "yugabyte";
+
+    private String username = "yugabyte";
+
+    private String password = "yugabyte";
+
+    /**
+     * @param imageName image name
+     */
+    public YugabyteDBYSQLContainer(final String imageName) {
+        this(DockerImageName.parse(imageName));
+    }
+
+    /**
+     * @param imageName image name
+     */
+    public YugabyteDBYSQLContainer(final DockerImageName imageName) {
+        super(imageName);
+        imageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(YSQL_PORT, MASTER_DASHBOARD_PORT, TSERVER_DASHBOARD_PORT);
+        waitingFor(new YugabyteDBYSQLWaitStrategy(this).withStartupTimeout(Duration.ofSeconds(60)));
+        withCommand(ENTRYPOINT);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Collections.singleton(getMappedPort(YSQL_PORT));
+    }
+
+    /**
+     * Configures the environment variables. Setting up these variables would create the
+     * custom objects. Setting {@link #withDatabaseName(String)},
+     * {@link #withUsername(String)}, {@link #withPassword(String)} these parameters will
+     * initilaize the database with those custom values
+     */
+
+    @Override
+    protected void configure() {
+        addEnv("YSQL_DB", database);
+        addEnv("YSQL_USER", username);
+        addEnv("YSQL_PASSWORD", password);
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return JDBC_DRIVER_CLASS;
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return (
+            JDBC_CONNECT_PREFIX +
+            "://" +
+            getHost() +
+            ":" +
+            getMappedPort(YSQL_PORT) +
+            "/" +
+            database +
+            constructUrlParameters("?", "&")
+        );
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return database;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1";
+    }
+
+    /**
+     * Setting this would create the keyspace
+     * @param database database name
+     * @return {@link YugabyteDBYSQLContainer} instance
+     */
+
+    @Override
+    public YugabyteDBYSQLContainer withDatabaseName(final String database) {
+        this.database = database;
+        return this;
+    }
+
+    /**
+     * Setting this would create the custom user role
+     * @param username user name
+     * @return {@link YugabyteDBYSQLContainer} instance
+     */
+
+    @Override
+    public YugabyteDBYSQLContainer withUsername(final String username) {
+        this.username = username;
+        return this;
+    }
+
+    /**
+     * Setting this along with {@link #withUsername(String)} would enable authentication
+     * @param password password
+     * @return {@link YugabyteDBYSQLContainer} instance
+     */
+
+    @Override
+    public YugabyteDBYSQLContainer withPassword(final String password) {
+        this.password = password;
+        return this;
+    }
+}
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java
new file mode 100644
index 00000000000..71d8b583448
--- /dev/null
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java
@@ -0,0 +1,42 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.jdbc.ConnectionUrl;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * YugabyteDB YSQL (Structured Query Language) JDBC container provider
+ *
+ * @author srinivasa-vasu
+ */
+public class YugabyteDBYSQLContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yugabytedb/yugabyte");
+
+    private static final String DEFAULT_TAG = "2.14.4.0-b26";
+
+    private static final String NAME = "yugabyte";
+
+    private static final String USER_PARAM = "user";
+
+    private static final String PASSWORD_PARAM = "password";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new YugabyteDBYSQLContainer(DEFAULT_IMAGE_NAME.withTag(tag));
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+    }
+}
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java
new file mode 100644
index 00000000000..c0e566c7ecf
--- /dev/null
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java
@@ -0,0 +1,27 @@
+package org.testcontainers.containers.delegate;
+
+import org.testcontainers.delegate.DatabaseDelegate;
+
+/**
+ * An abstract delegate do-nothing class
+ *
+ * @author srinivasa-vasu
+ */
+public abstract class AbstractYCQLDelegate implements DatabaseDelegate {
+
+    @Override
+    public void execute(
+        String statement,
+        String scriptPath,
+        int lineNumber,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    ) {
+        // do nothing
+    }
+
+    @Override
+    public void close() {
+        // do nothing
+    }
+}
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
new file mode 100644
index 00000000000..e324679713b
--- /dev/null
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
@@ -0,0 +1,57 @@
+package org.testcontainers.containers.delegate;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.testcontainers.containers.Container.ExecResult;
+import org.testcontainers.containers.YugabyteDBYCQLContainer;
+import org.testcontainers.ext.ScriptUtils.UncategorizedScriptException;
+
+import java.util.Collection;
+
+/**
+ * Query execution delegate class for YCQL API to delegate init-script statements. This
+ * invokes the in-built <code>ycqlsh</code> cli within the container to execute the
+ * statements at one go. It is recommended to use frameworks such as liquibase to manage
+ * this requirement. This functionality is kept to address the initialization requirements
+ * from standalone services that can't leverage liquibase or something similar.
+ *
+ * @author srinivasa-vasu
+ * @see YugabyteDBYCQLContainer
+ */
+@RequiredArgsConstructor
+@Slf4j
+public final class YugabyteDBYCQLDelegate extends AbstractYCQLDelegate {
+
+    private static final String BIN_PATH = "/home/yugabyte/tserver/bin/ycqlsh";
+
+    private final YugabyteDBYCQLContainer container;
+
+    @Override
+    public void execute(
+        Collection<String> statements,
+        String scriptPath,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    ) {
+        try {
+            ExecResult result = container.execInContainer(
+                BIN_PATH,
+                "-u",
+                container.getUsername(),
+                "-p",
+                container.getPassword(),
+                "-k",
+                container.getKeyspace(),
+                "-e",
+                StringUtils.join(statements, ";")
+            );
+            if (result.getExitCode() != 0) {
+                throw new RuntimeException(result.getStderr());
+            }
+        } catch (Exception e) {
+            log.debug(e.getMessage(), e);
+            throw new UncategorizedScriptException(e.getMessage(), e);
+        }
+    }
+}
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
new file mode 100644
index 00000000000..dd775564941
--- /dev/null
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
@@ -0,0 +1,82 @@
+package org.testcontainers.containers.strategy;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.Container.ExecResult;
+import org.testcontainers.containers.YugabyteDBYCQLContainer;
+import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;
+
+/**
+ * Custom wait strategy for YCQL API.
+ *
+ * <p>
+ * Though we can either use HTTP or PORT based wait strategy, when we create a custom
+ * keyspace/role, it gets executed asynchronously. As the wait on container.start() on a
+ * specific port wouldn't fully guarantee the custom object execution. It's better to
+ * check the DB status with this way with a smoke test query that uses the underlying
+ * custom objects and wait for the operation to complete.
+ * </p>
+ *
+ * @author srinivasa-vasu
+ */
+@RequiredArgsConstructor
+@Slf4j
+public final class YugabyteDBYCQLWaitStrategy extends AbstractWaitStrategy {
+
+    private static final String YCQL_TEST_QUERY = "SELECT release_version FROM system.local";
+
+    private static final String BIN_PATH = "/home/yugabyte/tserver/bin/ycqlsh";
+
+    private final WaitStrategyTarget target;
+
+    @Override
+    public void waitUntilReady(WaitStrategyTarget target) {
+        YugabyteDBYCQLContainer container = (YugabyteDBYCQLContainer) target;
+        AtomicBoolean status = new AtomicBoolean(true);
+        retryUntilSuccess(
+            (int) startupTimeout.getSeconds(),
+            TimeUnit.SECONDS,
+            () -> {
+                YugabyteDBYCQLWaitStrategy.this.getRateLimiter()
+                    .doWhenReady(() -> {
+                        try {
+                            ExecResult result = container.execInContainer(
+                                BIN_PATH,
+                                "-u",
+                                container.getUsername(),
+                                "-p",
+                                container.getPassword(),
+                                "-k",
+                                container.getKeyspace(),
+                                "-e",
+                                YCQL_TEST_QUERY
+                            );
+                            if (result.getExitCode() != 0) {
+                                status.set(false);
+                                log.debug(result.getStderr());
+                            }
+                        } catch (Exception e) {
+                            status.set(false);
+                            log.debug(e.getMessage(), e);
+                        } finally {
+                            if (!status.getAndSet(true)) {
+                                throw new RuntimeException("container hasn't come up yet");
+                            }
+                        }
+                    });
+                return status;
+            }
+        );
+    }
+
+    @Override
+    public void waitUntilReady() {
+        waitUntilReady(target);
+    }
+}
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
new file mode 100644
index 00000000000..31fa52a4155
--- /dev/null
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
@@ -0,0 +1,60 @@
+package org.testcontainers.containers.strategy;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.YugabyteDBYSQLContainer;
+import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
+
+import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;
+
+/**
+ * Custom wait strategy for YSQL API.
+ *
+ * <p>
+ * Though we can either use HTTP or PORT based wait strategy, when we create a custom
+ * database/role, it gets executed asynchronously. As the wait on container.start() on a
+ * specific port wouldn't fully guarantee the custom object execution. It's better to
+ * check the DB status with this way with a smoke test query that uses the underlying
+ * custom objects and wait for the operation to complete.
+ * </p>
+ *
+ * @author srinivasa-vasu
+ */
+@RequiredArgsConstructor
+@Slf4j
+public final class YugabyteDBYSQLWaitStrategy extends AbstractWaitStrategy {
+
+    private static final String YSQL_TEST_QUERY = "SELECT 1";
+
+    private final WaitStrategyTarget target;
+
+    @Override
+    public void waitUntilReady(WaitStrategyTarget target) {
+        YugabyteDBYSQLContainer container = (YugabyteDBYSQLContainer) target;
+        retryUntilSuccess(
+            (int) startupTimeout.getSeconds(),
+            TimeUnit.SECONDS,
+            () -> {
+                getRateLimiter()
+                    .doWhenReady(() -> {
+                        try (Connection con = container.createConnection(container.getJdbcUrl())) {
+                            con.createStatement().execute(YSQL_TEST_QUERY);
+                        } catch (SQLException ex) {
+                            log.error("Error connecting to the database", ex);
+                        }
+                    });
+                return true;
+            }
+        );
+    }
+
+    @Override
+    public void waitUntilReady() {
+        waitUntilReady(target);
+    }
+}
diff --git a/modules/yugabytedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/yugabytedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..26e372d51ab
--- /dev/null
+++ b/modules/yugabytedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.YugabyteDBYSQLContainerProvider
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
new file mode 100644
index 00000000000..09c0240e7db
--- /dev/null
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
@@ -0,0 +1,29 @@
+package org.testcontainers.jdbc.yugabytedb;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+/**
+ * YugabyteDB YSQL API JDBC connectivity driver test class
+ *
+ * @author srinivasa-vasu
+ */
+@RunWith(Parameterized.class)
+public class YugabyteDBYSQLJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] {
+                {
+                    "jdbc:tc:yugabyte://hostname/yugabyte?user=yugabyte&password=yugabyte",
+                    EnumSet.noneOf(Options.class),
+                },
+            }
+        );
+    }
+}
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
new file mode 100644
index 00000000000..3616b87850b
--- /dev/null
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
@@ -0,0 +1,122 @@
+package org.testcontainers.junit.yugabytedb;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import org.junit.Test;
+import org.testcontainers.containers.YugabyteDBYCQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * YugabyteDB YCQL API unit test class
+ *
+ * @author srinivasa-vasu
+ */
+public class YugabyteDBYCQLTest {
+
+    private static final String IMAGE_NAME = "yugabytedb/yugabyte:2.14.4.0-b26";
+
+    private static final DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);
+
+    @Test
+    public void testSmoke() {
+        try (
+            // creatingYCQLContainer {
+            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(IMAGE_NAME)
+            // }
+        ) {
+            // startingYCQLContainer {
+            ycqlContainer.start();
+            // }
+            assertThat(performQuery(ycqlContainer, "SELECT release_version FROM system.local").wasApplied())
+                .as("A sample test query succeeds")
+                .isTrue();
+        }
+    }
+
+    @Test
+    public void testCustomKeyspace() {
+        String key = "random";
+        try (
+            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
+                .withKeyspaceName(key)
+        ) {
+            ycqlContainer.start();
+            assertThat(
+                performQuery(
+                    ycqlContainer,
+                    "SELECT keyspace_name FROM system_schema.keyspaces where keyspace_name='" + key + "'"
+                )
+                    .one()
+                    .getString(0)
+            )
+                .as("Custom keyspace creation succeeds")
+                .isEqualTo(key);
+        }
+    }
+
+    @Test
+    public void testAuthenticationEnabled() {
+        String role = "random";
+        try (
+            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
+                .withUsername(role)
+                .withPassword(role)
+        ) {
+            ycqlContainer.start();
+            assertThat(
+                performQuery(ycqlContainer, "SELECT role FROM system_auth.roles where role='" + role + "'")
+                    .one()
+                    .getString(0)
+            )
+                .as("Keyspace login with authentication enabled succeeds")
+                .isEqualTo(role);
+        }
+    }
+
+    @Test
+    public void testAuthenticationDisabled() {
+        try (
+            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
+                .withPassword("")
+                .withUsername("")
+        ) {
+            ycqlContainer.start();
+            assertThat(performQuery(ycqlContainer, "SELECT release_version FROM system.local").wasApplied())
+                .as("Keyspace login with authentication disabled succeeds")
+                .isTrue();
+        }
+    }
+
+    @Test
+    public void testInitScript() {
+        String key = "random";
+        try (
+            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
+                .withKeyspaceName(key)
+                .withUsername(key)
+                .withPassword(key)
+                .withInitScript("init/init_yql.sql")
+        ) {
+            ycqlContainer.start();
+            ResultSet output = performQuery(ycqlContainer, "SELECT greet FROM random.dsql");
+            assertThat(output.wasApplied()).as("Statements from a custom script execution succeeds").isTrue();
+            assertThat(output.one().getString(0)).as("A record match succeeds").isEqualTo("Hello DSQL");
+        }
+    }
+
+    private ResultSet performQuery(YugabyteDBYCQLContainer ycqlContainer, String cql) {
+        try (
+            CqlSession session = CqlSession
+                .builder()
+                .withKeyspace(ycqlContainer.getKeyspace())
+                .withAuthCredentials(ycqlContainer.getUsername(), ycqlContainer.getPassword())
+                .withLocalDatacenter(ycqlContainer.getLocalDc())
+                .addContactPoint(ycqlContainer.getContactPoint())
+                .build()
+        ) {
+            return session.execute(cql);
+        }
+    }
+}
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
new file mode 100644
index 00000000000..cb98fcdc922
--- /dev/null
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
@@ -0,0 +1,98 @@
+package org.testcontainers.junit.yugabytedb;
+
+import org.junit.Test;
+import org.testcontainers.containers.YugabyteDBYSQLContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * YugabyteDB YSQL API unit test class
+ *
+ * @author srinivasa-vasu
+ */
+public class YugabyteDBYSQLTest extends AbstractContainerDatabaseTest {
+
+    private static final String IMAGE_NAME = "yugabytedb/yugabyte:2.14.4.0-b26";
+
+    private static final DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);
+
+    @Test
+    public void testSmoke() throws SQLException {
+        try (
+            // creatingYSQLContainer {
+            final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(IMAGE_NAME)
+            // }
+        ) {
+            // startingYSQLContainer {
+            ysqlContainer.start();
+            // }
+            assertThat(performQuery(ysqlContainer, "SELECT 1").getInt(1))
+                .as("A sample test query succeeds")
+                .isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void testCustomDatabase() throws SQLException {
+        String key = "random";
+        try (
+            final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
+                .withDatabaseName(key)
+        ) {
+            ysqlContainer.start();
+            assertThat(performQuery(ysqlContainer, "SELECT 1").getInt(1))
+                .as("A test query on a custom database succeeds")
+                .isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void testInitScript() throws SQLException {
+        try (
+            final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
+                .withInitScript("init/init_yql.sql")
+        ) {
+            ysqlContainer.start();
+            assertThat(performQuery(ysqlContainer, "SELECT greet FROM dsql").getString(1))
+                .as("A record match succeeds")
+                .isEqualTo("Hello DSQL");
+        }
+    }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (
+            final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
+                .withUrlParam("sslmode", "disable")
+                .withUrlParam("application_name", "yugabyte")
+        ) {
+            ysqlContainer.start();
+            String jdbcUrl = ysqlContainer.getJdbcUrl();
+            assertThat(jdbcUrl)
+                .contains("?")
+                .contains("&")
+                .contains("sslmode=disable")
+                .contains("application_name=yugabyte")
+                .as("A JDBC connection string with additional parameter validation succeeds");
+        }
+    }
+
+    @Test
+    public void testWithCustomRole() throws SQLException {
+        try (
+            final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
+                .withDatabaseName("yugabyte")
+                .withPassword("yugabyte")
+                .withUsername("yugabyte")
+        ) {
+            ysqlContainer.start();
+            assertThat(performQuery(ysqlContainer, "SELECT 1").getInt(1))
+                .as("A sample test query with a custom role succeeds")
+                .isEqualTo(1);
+        }
+    }
+}
diff --git a/modules/yugabytedb/src/test/resources/init/init_yql.sql b/modules/yugabytedb/src/test/resources/init/init_yql.sql
new file mode 100644
index 00000000000..31cbaa6a758
--- /dev/null
+++ b/modules/yugabytedb/src/test/resources/init/init_yql.sql
@@ -0,0 +1,5 @@
+CREATE TABLE dsql(
+    greet text primary key
+);
+
+INSERT INTO dsql (greet) VALUES ('Hello DSQL');
diff --git a/modules/yugabytedb/src/test/resources/logback-test.xml b/modules/yugabytedb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/yugabytedb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 8d0b3905c09db20290258cd21bf9b8e543cbc01f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:37 +0000
Subject: [PATCH 2414/4969] Bump mockito-core from 4.8.1 to 4.9.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.9.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 87626f5891a..876109ae764 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -97,7 +97,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
-    testImplementation ('org.mockito:mockito-core:4.8.1') {
+    testImplementation ('org.mockito:mockito-core:4.9.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 4f72e0fbce0957c4b35e733b7e4695d58460e43a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:37 +0000
Subject: [PATCH 2415/4969] Bump com.gradle.enterprise.gradle.plugin from
 3.11.3 to 3.11.4

Bumps com.gradle.enterprise.gradle.plugin from 3.11.3 to 3.11.4.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 48ad8755655..59331fd92aa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }

From 724ff0efb5c47ee47f94e11d1048d2dbbfce3096 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:38 +0000
Subject: [PATCH 2416/4969] Bump tomcat-jdbc from 10.1.1 to 10.1.2 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.1.1 to 10.1.2.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 8ec50228a2e..b5eba86fb06 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.1'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.2'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation ('org.mockito:mockito-core:4.8.1') {

From 57accc4c3e059b656bb8b4fec17de15a3dbaeadd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:41 +0000
Subject: [PATCH 2417/4969] Bump mariadb-java-client from 3.0.8 to 3.0.9 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.8 to 3.0.9.
- [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/3.0.8...3.0.9)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b4b3b3b4415..747dce84962 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.8'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.9'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From 00b82877b1cf07d1ad4b76c1270a874a7f3ef590 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:41 +0000
Subject: [PATCH 2418/4969] Bump influxdb-client-java from 6.4.0 to 6.7.0 in
 /modules/influxdb

Bumps [influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.4.0 to 6.7.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v6.4.0...v6.7.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index c412d837d76..81acb7be840 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.influxdb:influxdb-java:2.23'
-    testImplementation "com.influxdb:influxdb-client-java:6.4.0"
+    testImplementation "com.influxdb:influxdb-client-java:6.7.0"
 }

From 4f13490cb4ac27797839a95d67bda6246717338d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:42 +0000
Subject: [PATCH 2419/4969] Bump mockito-core from 4.8.1 to 4.9.0 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.9.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4987c027a37..f3e0187bcb1 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.8.1') {
+    testImplementation ('org.mockito:mockito-core:4.9.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 5ee3f20bb3220316dd171d05bdcecee54cfc224e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:42 +0000
Subject: [PATCH 2420/4969] Bump mockito-core from 4.8.1 to 4.9.0 in
 /modules/jdbc

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.9.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 8ec50228a2e..f1e771e018e 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.1'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation ('org.mockito:mockito-core:4.8.1') {
+    testImplementation ('org.mockito:mockito-core:4.9.0') {
         exclude(module: 'hamcrest-core')
     }
 }

From 28ac7764ef8dd8fbe50605ef26174fb5f37a0c6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:42 +0000
Subject: [PATCH 2421/4969] Bump google-cloud-datastore from 2.12.4 to 2.12.5
 in /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.12.4 to 2.12.5.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.12.4...v2.12.5)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 0ae152045d8..ebf26844ad1 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.4'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'

From 838c33d9e3b13bb8fe16edbe441fc1a1827b286d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:42 +0000
Subject: [PATCH 2422/4969] Bump r2dbc-mssql in /modules/mssqlserver

Bumps [r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 0.9.0.RELEASE to 1.0.0.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/main/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v0.9.0.RELEASE...v1.0.0.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 02154506560..ff7ffe46cfc 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.1.0.jre8-preview'
 
     testImplementation project(':r2dbc')
-    testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))

From db967330c07daca7492cceffc9baea9a1de53309 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:43 +0000
Subject: [PATCH 2423/4969] Bump hivemq-extension-sdk from 4.9.0 to 4.9.1 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.9.0 to 4.9.1.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.9.0...4.9.1)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 9f6be24e306..8b01751549c 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.9.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.9.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.4.4")

From 5975fe5adc743cc3936a6c42bde2e5ffa889fb70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:43 +0000
Subject: [PATCH 2424/4969] Bump mongodb-driver-sync from 4.7.2 to 4.8.0 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.7.2 to 4.8.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.7.2...r4.8.0)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index cc4a9288373..dca23147ab4 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.7.2")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.8.0")
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 52b86640d624273673edcba035915bffb0db32bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:43 +0000
Subject: [PATCH 2425/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.5.0 to 8.5.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.5.0...v8.5.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a8001ca61e4..12a949645c6 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.1"
     testImplementation "org.elasticsearch.client:transport:7.17.7"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From a2dfafd78ccc0b46cad0bbe8fcfd9006b7bae803 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:43 +0000
Subject: [PATCH 2426/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.336 to 1.12.342.
- [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.12.336...1.12.342)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 0184cf5ada5..73305850140 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.342'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From fb18457cf616ec3b92ea69ee225a08e7d58ce1ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:44 +0000
Subject: [PATCH 2427/4969] Bump reactor-core from 3.4.24 to 3.5.0 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.4.24 to 3.5.0.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.4.24...v3.5.0)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 952c9f5b982..e0c6fadf35e 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.24'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.0'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 341de03cb2057493cb85529a3e1836aba2c71e0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:45 +0000
Subject: [PATCH 2428/4969] Bump jdbc-yugabytedb from 42.3.4 to 42.3.5-yb-1 in
 /modules/yugabytedb

Bumps [jdbc-yugabytedb](https://github.com/yugabyte/pgjdbc) from 42.3.4 to 42.3.5-yb-1.
- [Release notes](https://github.com/yugabyte/pgjdbc/releases)
- [Changelog](https://github.com/yugabyte/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yugabyte/pgjdbc/commits)

---
updated-dependencies:
- dependency-name: com.yugabyte:jdbc-yugabytedb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index 8d0ba6ca3d0..52b0ce25cc5 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-11'
     // YSQL driver
-    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.4'
+    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-1'
 }

From 4335aa8e5bb0b340d1c5d485ecddd4222630725a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:50 +0000
Subject: [PATCH 2429/4969] Bump google-cloud-pubsub from 1.120.24 to 1.120.25
 in /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.24 to 1.120.25.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.24...v1.120.25)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 0ae152045d8..00d12ba80e2 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.25'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 365bb6ff06f7def6a64b297ce146ec1c723471a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:51 +0000
Subject: [PATCH 2430/4969] Bump aws-java-sdk-sqs from 1.12.336 to 1.12.342 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.336 to 1.12.342.
- [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.12.336...1.12.342)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3a7a2b6be98..93dbbe00bff 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.337'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.336'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.337'
     testImplementation 'software.amazon.awssdk:s3:2.18.11'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 9c4d0c1098614770b013a97949e4c710e1e26a3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:28:54 +0000
Subject: [PATCH 2431/4969] Bump google-cloud-bigtable from 2.15.0 to 2.16.0 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.15.0...v2.16.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 0ae152045d8..20d1d0a7bf2 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 8df7d382724bc89160b589ae32455ccf1b5222df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:29:29 +0000
Subject: [PATCH 2432/4969] Bump curator-framework from 5.3.0 to 5.4.0 in
 /examples

Bumps [curator-framework](https://github.com/apache/curator) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/apache/curator/releases)
- [Commits](https://github.com/apache/curator/compare/apache-curator-5.3.0...apache-curator-5.4.0)

---
updated-dependencies:
- dependency-name: org.apache.curator:curator-framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/zookeeper/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index d18be942ff0..bae5a83a868 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.apache.curator:curator-framework:5.3.0'
+    testImplementation 'org.apache.curator:curator-framework:5.4.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'

From 40513160a4d8906200eea17724d786d211f11bbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:30:07 +0000
Subject: [PATCH 2433/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin) from 1.7.20 to 1.7.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.20...v1.7.21)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 8d78cf8da70..6345f047d6a 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.7.5"
     id("org.jetbrains.kotlin.jvm") version "1.7.20"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.7.20"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.7.21"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 47b7bb52d71406a58a2f27c9f10ae2f2bd91d63e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:30:14 +0000
Subject: [PATCH 2434/4969] Bump lettuce-core from 5.1.1.RELEASE to
 6.2.1.RELEASE in /examples

Bumps [lettuce-core](https://github.com/lettuce-io/lettuce-core) from 5.1.1.RELEASE to 6.2.1.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/lettuce-io/lettuce-core/blob/6.2.1.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/5.1.1.RELEASE...6.2.1.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 7ab7cddc88f..7598fe8bca5 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:5.1.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.1.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 0c15c5b6b29..b7b0515d3db 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:5.1.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.1.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 98f8a9142e1..7d72452b386 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:5.2.0.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.1.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'

From c6a610618c4567bc3fc7e707a32e6f972901ac11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:30:15 +0000
Subject: [PATCH 2435/4969] Bump com.gradle.enterprise.gradle.plugin in
 /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.11.3 to 3.11.4.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 72bbcd16cac..2c2238d031b 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 48ad8755655..59331fd92aa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }

From e5ed4e1bb4cd935e092352abd1e1e03db4065a11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:30:21 +0000
Subject: [PATCH 2436/4969] Bump hazelcast from 5.2.0 to 5.2.1 in /examples

Bumps [hazelcast](https://github.com/hazelcast/hazelcast) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/compare/v5.2.0...v5.2.1)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 11eb6cb0d3d..e45ad5f02bc 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.hazelcast:hazelcast:5.2.0'
+    testImplementation 'com.hazelcast:hazelcast:5.2.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c6c71b7cbe4d36f15ba69bf9f76b4f726375891d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 00:36:20 +0000
Subject: [PATCH 2437/4969] Bump s3 from 2.18.11 to 2.18.18 in
 /modules/localstack

Bumps s3 from 2.18.11 to 2.18.18.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 93dbbe00bff..bbbbbf2b295 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.337'
-    testImplementation 'software.amazon.awssdk:s3:2.18.11'
+    testImplementation 'software.amazon.awssdk:s3:2.18.18'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 24dd8e3d6d38c0a56cb48d4fdbf7a28115775aea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 00:36:23 +0000
Subject: [PATCH 2438/4969] Bump google-cloud-firestore from 3.7.0 to 3.7.1 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.7.0...v3.7.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 42366dd3f27..9a94f7928bf 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.0'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.1'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.25'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'

From 597611b10d912a7e0884b3cac9de830f7e4dbb11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 00:36:45 +0000
Subject: [PATCH 2439/4969] Bump org.jetbrains.kotlin.jvm from 1.7.20 to 1.7.21
 in /examples

Bumps [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) from 1.7.20 to 1.7.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.20...v1.7.21)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 6345f047d6a..8235f8f6809 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.7.5"
-    id("org.jetbrains.kotlin.jvm") version "1.7.20"
+    id("org.jetbrains.kotlin.jvm") version "1.7.21"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.21"
 }
 

From c2abe0d24561b9d565cca9247cc92e5907a0f081 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 01:58:19 +0000
Subject: [PATCH 2440/4969] Bump aws-java-sdk-s3 from 1.12.337 to 1.12.343 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.337 to 1.12.343.
- [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.12.337...1.12.343)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index bbbbbf2b295..30092c4267e 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.337'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.343'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.337'
     testImplementation 'software.amazon.awssdk:s3:2.18.18'

From c17467606c2e1dd42299b213a68ba07e18774609 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 01:58:22 +0000
Subject: [PATCH 2441/4969] Bump aws-java-sdk-logs from 1.12.337 to 1.12.343 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.337 to 1.12.343.
- [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.12.337...1.12.343)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 bbbbbf2b295..c63ee044004 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.337'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.337'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.343'
     testImplementation 'software.amazon.awssdk:s3:2.18.18'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 889ea6b3f534f252d6d9d846b22572f0a2cc51d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 15 Nov 2022 18:11:33 -0800
Subject: [PATCH 2442/4969] Add yugabytedb to mkdocs.yml (#6211)

---
 mkdocs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkdocs.yml b/mkdocs.yml
index c4f70e7067e..fba60bb18d5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -66,6 +66,7 @@ nav:
                 - modules/databases/questdb.md
                 - modules/databases/tidb.md
                 - modules/databases/trino.md
+                - modules/databases/yugabytedb.md
           - modules/azure.md
           - modules/consul.md
           - modules/docker_compose.md

From 77a3c3726500dc07159762cfddc052596e27f420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 16 Nov 2022 08:26:46 -0800
Subject: [PATCH 2443/4969] Improve selenium module (#6204)

* Remove usage of `org.openqa.selenium.remote.BrowserType`, it was
removed in 4.x
* Upgrade to selenium 4.6.0
* Deprecate getWebDriver()

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/examples/junit4/generic/build.gradle     |  2 +-
 .../java/generic/HostPortExposedTest.java     |  5 +++--
 .../org/testcontainers/examples/Stepdefs.java |  5 +++--
 .../src/test/java/SeleniumContainerTest.java  |  4 +++-
 modules/selenium/build.gradle                 |  8 ++++----
 .../containers/BrowserWebDriverContainer.java | 10 +++++++++-
 .../junit/BaseWebDriverContainerTest.java     | 20 ++++++++++---------
 ...ChromeRecordingWebDriverContainerTest.java |  6 +++---
 .../junit/ChromeWebDriverContainerTest.java   |  2 +-
 .../ContainerWithoutCapabilitiesTest.java     |  3 ++-
 ...stomWaitTimeoutWebDriverContainerTest.java |  2 +-
 .../junit/FirefoxWebDriverContainerTest.java  |  2 +-
 .../LocalServerWebDriverContainerTest.java    |  2 +-
 ...ecificImageNameWebDriverContainerTest.java |  2 +-
 14 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 9c3edd6fe27..0a4fd0b85b4 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testImplementation 'mysql:mysql-connector-java:8.0.31'
-    testImplementation "org.seleniumhq.selenium:selenium-api:3.141.59"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.6.0"
     testImplementation 'org.assertj:assertj-core:3.15.0'
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
index 3e80133411a..392fb22c2a9 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/HostPortExposedTest.java
@@ -50,14 +50,15 @@ public static void tearDown() throws Exception {
     }
 
     @Rule
-    public BrowserWebDriverContainer browser = new BrowserWebDriverContainer().withCapabilities(new ChromeOptions());
+    public BrowserWebDriverContainer<?> browser = new BrowserWebDriverContainer<>()
+        .withCapabilities(new ChromeOptions());
 
     @Test
     public void testContainerRunningAgainstExposedHostPort() {
         // useHostExposedPort {
         final String rootUrl = String.format("http://host.testcontainers.internal:%d/", localServerPort);
 
-        final RemoteWebDriver webDriver = browser.getWebDriver();
+        final RemoteWebDriver webDriver = new RemoteWebDriver(this.browser.getSeleniumAddress(), new ChromeOptions());
         webDriver.get(rootUrl);
         // }
 
diff --git a/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java b/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
index 1378100f959..aeccdd183d1 100644
--- a/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
+++ b/examples/cucumber/src/test/java/org/testcontainers/examples/Stepdefs.java
@@ -6,6 +6,7 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
@@ -59,9 +60,9 @@ public void locationIs(String location) throws Exception {
 
     @When("^I ask is it possible to search here$")
     public void iAskIsItPossibleToSearchHere() throws Exception {
-        RemoteWebDriver driver = container.getWebDriver();
+        RemoteWebDriver driver = new RemoteWebDriver(container.getSeleniumAddress(), new ChromeOptions());
         driver.get(location);
-        List<WebElement> searchInputs = driver.findElementsByTagName("input");
+        List<WebElement> searchInputs = driver.findElements(By.tagName("input"));
         answer = searchInputs != null && searchInputs.size() > 0 ? "YES" : "NOPE";
     }
 
diff --git a/examples/selenium-container/src/test/java/SeleniumContainerTest.java b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
index 52871c4f37e..084b8b0a94a 100644
--- a/examples/selenium-container/src/test/java/SeleniumContainerTest.java
+++ b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -41,7 +42,8 @@ public class SeleniumContainerTest {
 
     @Test
     public void simplePlainSeleniumTest() {
-        RemoteWebDriver driver = chrome.getWebDriver();
+        RemoteWebDriver driver = new RemoteWebDriver(chrome.getSeleniumAddress(), new ChromeOptions());
+        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
 
         driver.get("http://host.testcontainers.internal:" + port + "/foo.html");
         List<WebElement> hElement = driver.findElements(By.tagName("h"));
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 3e5a80a2dfa..4891cb1e317 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: Selenium"
 dependencies {
     api project(':testcontainers')
 
-    provided 'org.seleniumhq.selenium:selenium-remote-driver:3.141.59'
-    provided 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
-    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
-    testImplementation 'org.seleniumhq.selenium:selenium-support:3.141.59'
+    provided 'org.seleniumhq.selenium:selenium-remote-driver:4.6.0'
+    provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.6.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.6.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-support:4.6.0'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 08d7ab053c6..48c89533342 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -11,7 +11,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.rnorth.ducttape.timeouts.Timeouts;
@@ -312,7 +311,9 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
      * class (if used as a @ClassRule)
      *
      * @return a new Remote Web Driver instance
+     * @deprecated use {@link #getSeleniumAddress()} instead
      */
+    @Deprecated
     public synchronized RemoteWebDriver getWebDriver() {
         if (driver == null) {
             if (capabilities == null) {
@@ -437,4 +438,11 @@ public enum VncRecordingMode {
         RECORD_ALL,
         RECORD_FAILING,
     }
+
+    private static class BrowserType {
+
+        private static final String CHROME = "chrome";
+
+        private static final String FIREFOX = "firefox";
+    }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index 0ce20ca9800..d81d743ed21 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -2,7 +2,10 @@
 
 import org.junit.ClassRule;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.GenericContainer;
@@ -31,8 +34,9 @@ public class BaseWebDriverContainerTest {
         .withExposedPorts(8080, 8081)
         .waitingFor(new HttpWaitStrategy());
 
-    protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule) {
-        RemoteWebDriver driver = setupDriverFromRule(rule);
+    protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule, Capabilities capabilities) {
+        RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
+        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
         System.out.println("Selenium remote URL is: " + rule.getSeleniumAddress());
         System.out.println("VNC URL is: " + rule.getVncAddress());
 
@@ -42,17 +46,15 @@ protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule) {
         assertThat(title.getText().trim())
             .as("the index page contains the title 'Hello world'")
             .isEqualTo("Hello world");
+        driver.quit();
     }
 
     protected void assertBrowserNameIs(BrowserWebDriverContainer<?> rule, String expectedName) {
-        RemoteWebDriver driver = setupDriverFromRule(rule);
+        Capabilities capabilities = ("chrome".equals(expectedName)) ? new ChromeOptions() : new FirefoxOptions();
+        RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
+        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
         String actual = driver.getCapabilities().getBrowserName();
         assertThat(actual).as(String.format("actual browser name is %s", actual)).isEqualTo(expectedName);
-    }
-
-    private static RemoteWebDriver setupDriverFromRule(BrowserWebDriverContainer<?> rule) {
-        RemoteWebDriver driver = rule.getWebDriver();
-        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-        return driver;
+        driver.quit();
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index d0bdb796181..238077b8847 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -64,7 +64,7 @@ private File[] runSimpleExploreInContainer(BrowserWebDriverContainer<?> containe
             container.start();
 
             TimeUnit.MILLISECONDS.sleep(MINIMUM_VIDEO_DURATION_MILLISECONDS);
-            doSimpleExplore(container);
+            doSimpleExplore(container, new ChromeOptions());
             container.afterTest(
                 new TestDescription() {
                     @Override
@@ -178,7 +178,7 @@ public void recordingTestThatShouldBeRecordedButNotPersisted() {
             ) {
                 chrome.start();
 
-                doSimpleExplore(chrome);
+                doSimpleExplore(chrome, new ChromeOptions());
             }
         }
 
@@ -198,7 +198,7 @@ public void recordingTestThatShouldBeRecordedAndRetained() throws InterruptedExc
                 chrome.start();
 
                 TimeUnit.MILLISECONDS.sleep(MINIMUM_VIDEO_DURATION_MILLISECONDS);
-                doSimpleExplore(chrome);
+                doSimpleExplore(chrome, new ChromeOptions());
                 chrome.afterTest(
                     new TestDescription() {
                         @Override
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
index eb9872b06e9..8499a0d0c6d 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
@@ -25,6 +25,6 @@ public void checkBrowserIsIndeedChrome() {
 
     @Test
     public void simpleExploreTest() {
-        doSimpleExplore(chrome);
+        doSimpleExplore(chrome, new ChromeOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
index d20f8c3aad8..c9aa7ec2221 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
 public class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest {
@@ -16,6 +17,6 @@ public void chromeIsStartedIfNoCapabilitiesProvided() {
 
     @Test
     public void simpleExploreTestWhenNoCapabilitiesProvided() {
-        doSimpleExplore(chrome);
+        doSimpleExplore(chrome, new ChromeOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
index 362be6550e4..43639010e59 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
@@ -21,6 +21,6 @@ public class CustomWaitTimeoutWebDriverContainerTest extends BaseWebDriverContai
 
     @Test
     public void simpleExploreTest() {
-        doSimpleExplore(chromeWithCustomTimeout);
+        doSimpleExplore(chromeWithCustomTimeout, new ChromeOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
index e56b33a1704..76da6d32c40 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
@@ -25,6 +25,6 @@ public void checkBrowserIsIndeedFirefox() {
 
     @Test
     public void simpleExploreTest() {
-        doSimpleExplore(firefox);
+        doSimpleExplore(firefox, new FirefoxOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index 88b40f4fbbe..a4a456f0179 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -42,7 +42,7 @@ public void setupLocalServer() throws Exception {
     @Test
     public void testConnection() {
         // getWebDriver {
-        RemoteWebDriver driver = chrome.getWebDriver();
+        RemoteWebDriver driver = new RemoteWebDriver(chrome.getSeleniumAddress(), new ChromeOptions());
         // }
 
         // Construct a URL that the browser container can access
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
index e3db8ad5887..82df577d249 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
@@ -19,6 +19,6 @@ public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContai
 
     @Test
     public void simpleExploreTest() {
-        doSimpleExplore(firefox);
+        doSimpleExplore(firefox, new FirefoxOptions());
     }
 }

From 8b92d148bc3512e02dcd6d28dd3bec752c081301 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Thu, 17 Nov 2022 09:45:04 +0100
Subject: [PATCH 2444/4969] Feature/neo4j defaults (#6154)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../containers/Neo4jContainer.java            | 71 ++++++++++++---
 .../containers/Neo4jContainerTest.java        | 88 +++++++++++++++++++
 2 files changed, 146 insertions(+), 13 deletions(-)

diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 94b4263fe8c..6d68b76c7d7 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -66,6 +66,16 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
 
     private final Set<String> labsPlugins = new HashSet<>();
 
+    /**
+     * Default wait strategies
+     */
+    public static final WaitStrategy WAIT_FOR_BOLT = new LogMessageWaitStrategy()
+        .withRegEx(String.format(".*Bolt enabled on .*:%d\\.\n", DEFAULT_BOLT_PORT));
+
+    private static final WaitStrategy WAIT_FOR_HTTP = new HttpWaitStrategy()
+        .forPort(DEFAULT_HTTP_PORT)
+        .forStatusCodeMatching(response -> response == HttpURLConnection.HTTP_OK);
+
     /**
      * Creates a Neo4jContainer using the official Neo4j docker image.
      * @deprecated use {@link Neo4jContainer(DockerImageName)} instead
@@ -95,16 +105,10 @@ public Neo4jContainer(final DockerImageName dockerImageName) {
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        WaitStrategy waitForBolt = new LogMessageWaitStrategy()
-            .withRegEx(String.format(".*Bolt enabled on .*:%d\\.\n", DEFAULT_BOLT_PORT));
-        WaitStrategy waitForHttp = new HttpWaitStrategy()
-            .forPort(DEFAULT_HTTP_PORT)
-            .forStatusCodeMatching(response -> response == HttpURLConnection.HTTP_OK);
-
         this.waitStrategy =
             new WaitAllStrategy()
-                .withStrategy(waitForBolt)
-                .withStrategy(waitForHttp)
+                .withStrategy(WAIT_FOR_BOLT)
+                .withStrategy(WAIT_FOR_HTTP)
                 .withStartupTimeout(Duration.ofMinutes(2));
 
         addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
@@ -120,15 +124,56 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     @Override
     protected void configure() {
-        boolean emptyAdminPassword = this.adminPassword == null || this.adminPassword.isEmpty();
-        String neo4jAuth = emptyAdminPassword ? "none" : String.format(AUTH_FORMAT, this.adminPassword);
-        addEnv("NEO4J_AUTH", neo4jAuth);
+        configureAuth();
+        configureLabsPlugins();
+        configureWaitStrategy();
+    }
+
+    /**
+     * Configured via {@link Neo4jContainer#withAdminPassword(String)} or {@link Neo4jContainer#withoutAuthentication()}
+     * It is only possible to set the correct auth in the configuration call.
+     * Also, the custom methods overrule the set env parameter.
+     */
+    private void configureAuth() {
+        String neo4jAuthEnvKey = "NEO4J_AUTH";
+        if (!getEnvMap().containsKey(neo4jAuthEnvKey) || !DEFAULT_ADMIN_PASSWORD.equals(this.adminPassword)) {
+            boolean emptyAdminPassword = this.adminPassword == null || this.adminPassword.isEmpty();
+            String neo4jAuth = emptyAdminPassword ? "none" : String.format(AUTH_FORMAT, this.adminPassword);
+            addEnv(neo4jAuthEnvKey, neo4jAuth);
+        }
+    }
 
-        if (!this.labsPlugins.isEmpty()) {
+    /**
+     * Configured via {@link Neo4jContainer#withLabsPlugins}.
+     * Configuration can only happen in the configuration call because there is no default.
+     */
+    private void configureLabsPlugins() {
+        String neo4jLabsPluginsEnvKey = "NEO4JLABS_PLUGINS";
+        if (!getEnv().contains(neo4jLabsPluginsEnvKey) && !this.labsPlugins.isEmpty()) {
             String enabledPlugins =
                 this.labsPlugins.stream().map(pluginName -> "\"" + pluginName + "\"").collect(Collectors.joining(","));
 
-            addEnv("NEO4JLABS_PLUGINS", "[" + enabledPlugins + "]");
+            addEnv(neo4jLabsPluginsEnvKey, "[" + enabledPlugins + "]");
+        }
+    }
+
+    /**
+     * Update the default Neo4jContainer wait strategy based on the exposed ports.
+     * Still possible to override the startup timeout before starting the container via {@link WaitStrategy#withStartupTimeout(Duration)}.
+     */
+    private void configureWaitStrategy() {
+        List<Integer> exposedPorts = getExposedPorts();
+        boolean boltExposed = exposedPorts.contains(DEFAULT_BOLT_PORT);
+        boolean httpExposed = exposedPorts.contains(DEFAULT_HTTP_PORT);
+        boolean onlyBoltExposed = boltExposed && !httpExposed;
+        boolean onlyHttpExposed = !boltExposed && httpExposed;
+
+        if (onlyBoltExposed) {
+            this.waitStrategy =
+                new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2));
+        } else if (onlyHttpExposed) {
+            this.waitStrategy =
+                new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2));
         }
     }
 
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index de5420afd88..3520df668e5 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -8,6 +8,8 @@
 import org.neo4j.driver.Record;
 import org.neo4j.driver.Result;
 import org.neo4j.driver.Session;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Collections;
@@ -45,6 +47,8 @@ public void shouldDisableAuthentication() {
 
     @Test
     public void shouldCopyDatabase() {
+        // no aarch64 image available for Neo4j 3.5
+        assumeThat(DockerClientFactory.instance().getInfo().getArchitecture()).isNotEqualTo("aarch64");
         try (
             // copyDatabase {
             Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:3.5.30")
@@ -169,6 +173,82 @@ public void shouldAddConfigToEnvironment() {
         assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_dbms_tx__log_rotation_size", "42M");
     }
 
+    @Test
+    public void shouldRespectEnvironmentAuth() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret");
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/secret");
+    }
+
+    @Test
+    public void containerAdminPasswordOverrulesEnvironmentAuth() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            .withEnv("NEO4J_AUTH", "neo4j/secret")
+            .withAdminPassword("anotherSecret");
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/anotherSecret");
+    }
+
+    @Test
+    public void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            .withEnv("NEO4J_AUTH", "neo4j/secret")
+            .withoutAuthentication();
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "none");
+    }
+
+    @Test
+    public void shouldRespectAlreadyDefinedPortMappingsBolt() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withExposedPorts(7687);
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getExposedPorts()).containsExactly(7687);
+    }
+
+    @Test
+    public void shouldRespectAlreadyDefinedPortMappingsHttp() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withExposedPorts(7474);
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getExposedPorts()).containsExactly(7474);
+    }
+
+    @Test
+    public void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withExposedPorts(7687, 7474);
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getExposedPorts()).containsExactlyInAnyOrder(7474, 7687);
+    }
+
+    @Test
+    public void shouldDefaultExportBoltHttpAndHttps() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4");
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getExposedPorts()).containsExactlyInAnyOrder(7473, 7474, 7687);
+    }
+
+    @Test
+    public void shouldRespectCustomWaitStrategy() {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy());
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getWaitStrategy()).isInstanceOf(CustomDummyWaitStrategy.class);
+    }
+
     @Test
     public void shouldConfigureSingleLabsPlugin() {
         try (
@@ -220,6 +300,14 @@ public void shouldConfigureMultipleLabsPluginsWithString() {
         }
     }
 
+    private static class CustomDummyWaitStrategy extends AbstractWaitStrategy {
+
+        @Override
+        protected void waitUntilReady() {
+            // ehm...ready
+        }
+    }
+
     private static Driver getDriver(Neo4jContainer<?> container) {
         AuthToken authToken = AuthTokens.none();
         if (container.getAdminPassword() != null) {

From b48a0fd142be8d2bc088da08c85e7602152041a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Nov 2022 06:39:01 -0800
Subject: [PATCH 2445/4969] Add documentation for reusable containers (#6216)

Reusable containers is an experimental features and docs should
address questions around `what is it?` and `how to enable it?`

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/features/reuse.md | 33 +++++++++++++++++++++++++++++++++
 mkdocs.yml             |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 docs/features/reuse.md

diff --git a/docs/features/reuse.md b/docs/features/reuse.md
new file mode 100644
index 00000000000..517a4775cce
--- /dev/null
+++ b/docs/features/reuse.md
@@ -0,0 +1,33 @@
+# Reusable Containers (Experimental)
+
+!!! warning 
+    Reusable Containers is still an experimental feature and the behavior can change.
+    Those containers won't stop after all tests are finished.
+
+The *Reusable Containers* feature keeps the containers running between test sessions. In order
+to use it, manual container lifecycle instrumentation should be used by calling the `start()` method
+and it needs to be manually enabled through an opt-in mechanism. In order to reuse a container, the
+configuration of the container *must not change*.
+
+!!! note
+    Reusable containers are not suited for CI usage and as an experimental feature
+    not all Testcontainers features are fully working (e.g., resource cleanup
+    or networking).
+
+## How to use it
+
+* Define a container with `withReuse(true)`
+
+```java
+GenericContainer container = new GenericContainer("redis:6-alpine")
+    .withExposedPorts(6379)
+    .withReuse(true)
+```
+
+* Opt-in to Reusable Containers in `~/.testcontainers.properties`, by adding `testcontainers.reuse.enable=true`
+* Containers need to be started manually using `container.start()`. See [docs](../../test_framework_integration/manual_lifecycle_control)
+
+### Reusable Container with Testcontainers JDBC URL
+
+If using the [Testcontainers JDBC URL support](../../modules/databases/jdbc#database-containers-launched-via-jdbc-url-scheme)
+the URL **must** follow the pattern of `jdbc:tc:mysql:5.7.34:///databasename?TC_REUSABLE=true`. `TC_REUSABLE=true` is set as a parameter of the JDBC URL.
diff --git a/mkdocs.yml b/mkdocs.yml
index fba60bb18d5..541f6944249 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -42,6 +42,7 @@ nav:
           - features/configuration.md
           - features/image_name_substitution.md
           - features/advanced_options.md
+          - features/reuse.md
     - Modules:
           - Databases:
                 - modules/databases/index.md

From 407cab15f896fd27991e74473df71d9e319c5a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Nov 2022 07:20:48 -0800
Subject: [PATCH 2446/4969] Update spock dependencies (#6221)

Currently, `docs/examples/spock/redis` is not running (since 89a33684).
After the dependency was upgraded, it stopped running unless `useJUnitPlatform()`
is added. Also, `spock` module is adding two additional dependencies
which are required since `spock-core` version `2.2`.
---
 docs/examples/spock/redis/build.gradle | 6 +++++-
 modules/spock/build.gradle             | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 7d72452b386..e90c638bc1b 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -5,7 +5,11 @@ plugins {
 
 dependencies {
     api "io.lettuce:lettuce-core:6.2.1.RELEASE"
-    testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index e202b07f411..e1f7dba23c0 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -6,7 +6,7 @@ description = "Testcontainers :: Spock-Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.spockframework:spock-core:2.1-groovy-3.0'
+    api 'org.spockframework:spock-core:2.3-groovy-3.0'
 
     testImplementation project(':selenium')
     testImplementation project(':mysql')
@@ -17,6 +17,8 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.1'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'
 
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
 }

From b30edfc3e1e26cdcd847f97bfa3f36156980f3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Nov 2022 07:25:33 -0800
Subject: [PATCH 2447/4969] Add missing logback-test.xml (#6219)

Also, level is set to `INFO`.
---
 core/src/test/resources/logback-test.xml         |  2 +-
 .../cucumber/src/test/resources/logback-test.xml | 16 ++++++++++++++++
 .../src/test/resources/logback-test.xml          |  2 ++
 .../immudb/src/test/resources/logback-test.xml   | 16 ++++++++++++++++
 .../src/test/resources/logback-test.xml          |  2 ++
 .../src/test/resources/logback-test.xml          |  2 ++
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../src/test/resources/logback-test.xml          |  2 ++
 .../src/test/resources/logback-test.xml          |  2 ++
 .../src/test/resources/logback-test.xml          |  2 ++
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../src/test/resources/logback-test.xml          | 15 ++++++++++++++-
 .../src/test/resources/logback-test.xml          |  2 +-
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../consul/src/test/resources/logback-test.xml   |  2 +-
 .../src/test/resources/logback-test.xml          |  2 +-
 modules/db2/src/test/resources/logback-test.xml  | 16 ++++++++++++++++
 .../dynalite/src/test/resources/logback-test.xml |  2 +-
 .../src/test/resources/logback-test.xml          |  2 +-
 .../gcloud/src/test/resources/logback-test.xml   |  2 +-
 .../influxdb/src/test/resources/logback-test.xml |  2 +-
 .../src/main/resources/logback-test.xml          |  2 +-
 modules/jdbc/src/test/resources/logback-test.xml |  2 +-
 .../src/test/resources/logback-test.xml          |  2 +-
 modules/k3s/src/test/resources/logback-test.xml  |  2 +-
 .../kafka/src/test/resources/logback-test.xml    |  2 +-
 .../src/test/resources/logback-test.xml          |  2 +-
 .../mariadb/src/test/resources/logback-test.xml  |  2 +-
 .../mongodb/src/test/resources/logback-test.xml  |  2 +-
 .../src/test/resources/logback-test.xml          |  2 +-
 .../mysql/src/test/resources/logback-test.xml    |  2 +-
 .../neo4j/src/test/resources/logback-test.xml    |  2 +-
 .../nginx/src/test/resources/logback-test.xml    |  2 +-
 .../src/test/resources/logback-test.xml          |  2 +-
 .../orientdb/src/test/resources/logback-test.xml |  4 ++--
 .../src/test/resources/logback-test.xml          |  2 +-
 .../presto/src/test/resources/logback-test.xml   | 16 ++++++++++++++++
 .../pulsar/src/test/resources/logback-test.xml   |  2 +-
 .../questdb/src/test/resources/logback-test.xml  | 16 ++++++++++++++++
 .../r2dbc/src/test/resources/logback-test.xml    |  2 +-
 .../rabbitmq/src/test/resources/logback-test.xml |  2 +-
 .../selenium/src/test/resources/logback-test.xml |  2 +-
 modules/solr/src/test/resources/logback-test.xml | 16 ++++++++++++++++
 .../spock/src/test/resources/logback-test.xml    |  2 +-
 modules/tidb/src/test/resources/logback-test.xml |  2 +-
 .../trino/src/test/resources/logback-test.xml    | 16 ++++++++++++++++
 .../vault/src/test/resources/logback-test.xml    |  2 +-
 50 files changed, 265 insertions(+), 32 deletions(-)
 create mode 100644 examples/cucumber/src/test/resources/logback-test.xml
 create mode 100644 examples/immudb/src/test/resources/logback-test.xml
 create mode 100644 examples/neo4j-container/src/test/resources/logback-test.xml
 create mode 100644 examples/singleton-container/src/test/resources/logback-test.xml
 create mode 100644 examples/solr-container/src/test/resources/logback-test.xml
 create mode 100644 examples/spring-boot-kotlin-redis/src/test/resources/logback-test.xml
 create mode 100644 modules/clickhouse/src/test/resources/logback-test.xml
 create mode 100644 modules/cockroachdb/src/test/resources/logback-test.xml
 create mode 100644 modules/db2/src/test/resources/logback-test.xml
 create mode 100644 modules/presto/src/test/resources/logback-test.xml
 create mode 100644 modules/questdb/src/test/resources/logback-test.xml
 create mode 100644 modules/solr/src/test/resources/logback-test.xml
 create mode 100644 modules/trino/src/test/resources/logback-test.xml

diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
index 5e96a70b244..40e32b54c36 100644
--- a/core/src/test/resources/logback-test.xml
+++ b/core/src/test/resources/logback-test.xml
@@ -12,7 +12,7 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 
     <logger name="com.github.dockerjava" level="WARN"/>
     <logger name="org.zeroturnaround.exec" level="WARN"/>
diff --git a/examples/cucumber/src/test/resources/logback-test.xml b/examples/cucumber/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/cucumber/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/hazelcast/src/test/resources/logback-test.xml b/examples/hazelcast/src/test/resources/logback-test.xml
index be4ebaed2c8..83ef7a1a3ef 100644
--- a/examples/hazelcast/src/test/resources/logback-test.xml
+++ b/examples/hazelcast/src/test/resources/logback-test.xml
@@ -11,4 +11,6 @@
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/examples/immudb/src/test/resources/logback-test.xml b/examples/immudb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/immudb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/kafka-cluster/src/test/resources/logback-test.xml b/examples/kafka-cluster/src/test/resources/logback-test.xml
index be4ebaed2c8..83ef7a1a3ef 100644
--- a/examples/kafka-cluster/src/test/resources/logback-test.xml
+++ b/examples/kafka-cluster/src/test/resources/logback-test.xml
@@ -11,4 +11,6 @@
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/examples/linked-container/src/test/resources/logback-test.xml b/examples/linked-container/src/test/resources/logback-test.xml
index be4ebaed2c8..83ef7a1a3ef 100644
--- a/examples/linked-container/src/test/resources/logback-test.xml
+++ b/examples/linked-container/src/test/resources/logback-test.xml
@@ -11,4 +11,6 @@
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/examples/neo4j-container/src/test/resources/logback-test.xml b/examples/neo4j-container/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/neo4j-container/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml b/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml
index be4ebaed2c8..83ef7a1a3ef 100644
--- a/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml
+++ b/examples/redis-backed-cache-testng/src/test/resources/logback-test.xml
@@ -11,4 +11,6 @@
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/examples/redis-backed-cache/src/test/resources/logback-test.xml b/examples/redis-backed-cache/src/test/resources/logback-test.xml
index be4ebaed2c8..83ef7a1a3ef 100644
--- a/examples/redis-backed-cache/src/test/resources/logback-test.xml
+++ b/examples/redis-backed-cache/src/test/resources/logback-test.xml
@@ -11,4 +11,6 @@
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/examples/selenium-container/src/test/resources/logback-test.xml b/examples/selenium-container/src/test/resources/logback-test.xml
index be4ebaed2c8..83ef7a1a3ef 100644
--- a/examples/selenium-container/src/test/resources/logback-test.xml
+++ b/examples/selenium-container/src/test/resources/logback-test.xml
@@ -11,4 +11,6 @@
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/examples/singleton-container/src/test/resources/logback-test.xml b/examples/singleton-container/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/singleton-container/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/solr-container/src/test/resources/logback-test.xml b/examples/solr-container/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/solr-container/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/spring-boot-kotlin-redis/src/test/resources/logback-test.xml b/examples/spring-boot-kotlin-redis/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/spring-boot-kotlin-redis/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/spring-boot/src/test/resources/logback-test.xml b/examples/spring-boot/src/test/resources/logback-test.xml
index 5431cb6200b..83ef7a1a3ef 100644
--- a/examples/spring-boot/src/test/resources/logback-test.xml
+++ b/examples/spring-boot/src/test/resources/logback-test.xml
@@ -1,3 +1,16 @@
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/cassandra/src/test/resources/logback-test.xml b/modules/cassandra/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/cassandra/src/test/resources/logback-test.xml
+++ b/modules/cassandra/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/clickhouse/src/test/resources/logback-test.xml b/modules/clickhouse/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/clickhouse/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/cockroachdb/src/test/resources/logback-test.xml b/modules/cockroachdb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/cockroachdb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/consul/src/test/resources/logback-test.xml b/modules/consul/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/consul/src/test/resources/logback-test.xml
+++ b/modules/consul/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/couchbase/src/test/resources/logback-test.xml b/modules/couchbase/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/couchbase/src/test/resources/logback-test.xml
+++ b/modules/couchbase/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/db2/src/test/resources/logback-test.xml b/modules/db2/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/db2/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/dynalite/src/test/resources/logback-test.xml b/modules/dynalite/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/dynalite/src/test/resources/logback-test.xml
+++ b/modules/dynalite/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/elasticsearch/src/test/resources/logback-test.xml b/modules/elasticsearch/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/elasticsearch/src/test/resources/logback-test.xml
+++ b/modules/elasticsearch/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/gcloud/src/test/resources/logback-test.xml b/modules/gcloud/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/gcloud/src/test/resources/logback-test.xml
+++ b/modules/gcloud/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/influxdb/src/test/resources/logback-test.xml b/modules/influxdb/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/influxdb/src/test/resources/logback-test.xml
+++ b/modules/influxdb/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/jdbc-test/src/main/resources/logback-test.xml b/modules/jdbc-test/src/main/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/jdbc-test/src/main/resources/logback-test.xml
+++ b/modules/jdbc-test/src/main/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/jdbc/src/test/resources/logback-test.xml b/modules/jdbc/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/jdbc/src/test/resources/logback-test.xml
+++ b/modules/jdbc/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/junit-jupiter/src/test/resources/logback-test.xml b/modules/junit-jupiter/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/junit-jupiter/src/test/resources/logback-test.xml
+++ b/modules/junit-jupiter/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/k3s/src/test/resources/logback-test.xml b/modules/k3s/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/k3s/src/test/resources/logback-test.xml
+++ b/modules/k3s/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/kafka/src/test/resources/logback-test.xml b/modules/kafka/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/kafka/src/test/resources/logback-test.xml
+++ b/modules/kafka/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/localstack/src/test/resources/logback-test.xml b/modules/localstack/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/localstack/src/test/resources/logback-test.xml
+++ b/modules/localstack/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/mariadb/src/test/resources/logback-test.xml b/modules/mariadb/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/mariadb/src/test/resources/logback-test.xml
+++ b/modules/mariadb/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/mongodb/src/test/resources/logback-test.xml b/modules/mongodb/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/mongodb/src/test/resources/logback-test.xml
+++ b/modules/mongodb/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/mssqlserver/src/test/resources/logback-test.xml b/modules/mssqlserver/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/mssqlserver/src/test/resources/logback-test.xml
+++ b/modules/mssqlserver/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/mysql/src/test/resources/logback-test.xml b/modules/mysql/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/mysql/src/test/resources/logback-test.xml
+++ b/modules/mysql/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/neo4j/src/test/resources/logback-test.xml b/modules/neo4j/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/neo4j/src/test/resources/logback-test.xml
+++ b/modules/neo4j/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/nginx/src/test/resources/logback-test.xml b/modules/nginx/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/nginx/src/test/resources/logback-test.xml
+++ b/modules/nginx/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/oracle-xe/src/test/resources/logback-test.xml b/modules/oracle-xe/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/oracle-xe/src/test/resources/logback-test.xml
+++ b/modules/oracle-xe/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/orientdb/src/test/resources/logback-test.xml b/modules/orientdb/src/test/resources/logback-test.xml
index 7bd6a94d827..d91138d8b74 100644
--- a/modules/orientdb/src/test/resources/logback-test.xml
+++ b/modules/orientdb/src/test/resources/logback-test.xml
@@ -12,7 +12,7 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
     <logger name="org.testcontainers.shaded" level="WARN"/>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/modules/postgresql/src/test/resources/logback-test.xml b/modules/postgresql/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/postgresql/src/test/resources/logback-test.xml
+++ b/modules/postgresql/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/presto/src/test/resources/logback-test.xml b/modules/presto/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/presto/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/pulsar/src/test/resources/logback-test.xml b/modules/pulsar/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/pulsar/src/test/resources/logback-test.xml
+++ b/modules/pulsar/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/questdb/src/test/resources/logback-test.xml b/modules/questdb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/questdb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/r2dbc/src/test/resources/logback-test.xml b/modules/r2dbc/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/r2dbc/src/test/resources/logback-test.xml
+++ b/modules/r2dbc/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/rabbitmq/src/test/resources/logback-test.xml b/modules/rabbitmq/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/rabbitmq/src/test/resources/logback-test.xml
+++ b/modules/rabbitmq/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/selenium/src/test/resources/logback-test.xml b/modules/selenium/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/selenium/src/test/resources/logback-test.xml
+++ b/modules/selenium/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/solr/src/test/resources/logback-test.xml b/modules/solr/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/solr/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/spock/src/test/resources/logback-test.xml b/modules/spock/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/spock/src/test/resources/logback-test.xml
+++ b/modules/spock/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/tidb/src/test/resources/logback-test.xml b/modules/tidb/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/tidb/src/test/resources/logback-test.xml
+++ b/modules/tidb/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>
diff --git a/modules/trino/src/test/resources/logback-test.xml b/modules/trino/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/trino/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/vault/src/test/resources/logback-test.xml b/modules/vault/src/test/resources/logback-test.xml
index 535e406fc13..83ef7a1a3ef 100644
--- a/modules/vault/src/test/resources/logback-test.xml
+++ b/modules/vault/src/test/resources/logback-test.xml
@@ -12,5 +12,5 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="org.testcontainers" level="DEBUG"/>
+    <logger name="org.testcontainers" level="INFO"/>
 </configuration>

From 8d4583986e9f0b4183f2bf564c67df7a408304c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Nov 2022 07:37:18 -0800
Subject: [PATCH 2448/4969] Add checks: `AvoidStarImport`,
 `RegexpSinglelineJava` (#6217)

* `AvoidStarImport`, let's be explicit about imports. So, no `*` allowed.
* `RegexpSinglelineJava`, avoid assertions from Junit 4 and Jupiter. It
fails by suggesting to use AssertJ instead.
---
 config/checkstyle/checkstyle.xml              | 15 +++++++++++++
 .../AuditLoggingDockerClient.java             |  9 +++++++-
 .../images/LoggedPullImageResultCallback.java |  6 ++++-
 .../builder/dockerfile/DockerfileBuilder.java | 14 +++++++++++-
 .../testcontainers/utility/LazyFuture.java    |  4 +++-
 .../wait/strategy/WaitAllStrategyTest.java    |  6 ++++-
 .../DockerComposeContainerScalingTest.java    |  6 ++++-
 .../utility/LazyFutureTest.java               |  6 ++++-
 .../main/java/com/example/DemoController.java |  6 ++++-
 .../containers/InfluxDBContainerTest.java     | 22 +++++++++----------
 .../jdbc/ContainerDatabaseDriver.java         | 14 ++++++++++--
 .../containers/Neo4jContainerTest.java        |  4 +++-
 .../testcontainers/junit/SimpleNginxTest.java |  7 +++++-
 .../LocalServerWebDriverContainerTest.java    |  4 +++-
 14 files changed, 99 insertions(+), 24 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 6e51c56c942..5ed1d529e14 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -22,6 +22,7 @@
             />
             <property name="allowSingleLineStatement" value="true"/>
         </module>
+        <module name="AvoidStarImport"/>
         <module name="AvoidStaticImport">
             <property name="excludes"
                       value="
@@ -38,6 +39,20 @@
                       "
             />
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="maximum" value="0"/>
+            <property name="format" value="org\.junit\.Assert\.assert" />
+            <property name="message"
+                      value="Please use AssertJ imports." />
+            <property name="ignoreComments" value="true" />
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="maximum" value="0"/>
+            <property name="format" value="org\.junit\.jupiter\.api\.Assertions\.assert" />
+            <property name="message"
+                      value="Please use AssertJ imports." />
+            <property name="ignoreComments" value="true" />
+        </module>
         <module name="EmptyLineSeparator">
             <property name="allowNoEmptyLineBetweenFields" value="false" />
         </module>
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
index 2b413aafaed..3f6c5c3e1c8 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java
@@ -1,7 +1,14 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.SyncDockerCmd;
 import lombok.experimental.Delegate;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
diff --git a/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
index 32e19090b5c..73af8a05031 100644
--- a/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
+++ b/core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
@@ -8,7 +8,11 @@
 import java.io.Closeable;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 /**
  * {@link PullImageResultCallback} with improved logging of pull progress.
diff --git a/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java b/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java
index 0ce794e778f..181978c9dd7 100644
--- a/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java
+++ b/core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java
@@ -3,7 +3,19 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.images.builder.dockerfile.statement.Statement;
-import org.testcontainers.images.builder.dockerfile.traits.*;
+import org.testcontainers.images.builder.dockerfile.traits.AddStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.CmdStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.CopyStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.DockerfileBuilderTrait;
+import org.testcontainers.images.builder.dockerfile.traits.EntryPointStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.EnvStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.ExposeStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.FromStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.LabelStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.RunStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.UserStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.VolumeStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.WorkdirStatementTrait;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/org/testcontainers/utility/LazyFuture.java b/core/src/main/java/org/testcontainers/utility/LazyFuture.java
index bde9feb69ec..3fb2ed704c0 100644
--- a/core/src/main/java/org/testcontainers/utility/LazyFuture.java
+++ b/core/src/main/java/org/testcontainers/utility/LazyFuture.java
@@ -4,7 +4,9 @@
 import lombok.Getter;
 import org.rnorth.ducttape.timeouts.Timeouts;
 
-import java.util.concurrent.*;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
index 36facd92329..8b69553e5ab 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
@@ -14,7 +14,11 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 public class WaitAllStrategyTest {
 
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
index dc0187f5251..5571e42dcf7 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
@@ -1,6 +1,10 @@
 package org.testcontainers.junit;
 
-import org.junit.*;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.utility.TestEnvironment;
 import redis.clients.jedis.Jedis;
diff --git a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
index 8631bf6de19..dc1a1b803df 100644
--- a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
+++ b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
@@ -6,7 +6,11 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
diff --git a/examples/spring-boot/src/main/java/com/example/DemoController.java b/examples/spring-boot/src/main/java/com/example/DemoController.java
index 90cea36804e..e01f3527a6d 100644
--- a/examples/spring-boot/src/main/java/com/example/DemoController.java
+++ b/examples/spring-boot/src/main/java/com/example/DemoController.java
@@ -1,7 +1,11 @@
 package com.example;
 
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class DemoController {
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
index fc80e41ff09..a3862fb7242 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
@@ -11,7 +11,6 @@
 import com.influxdb.client.write.Point;
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
@@ -19,6 +18,8 @@
 import java.util.List;
 import java.util.Optional;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class InfluxDBContainerTest {
 
     private static final String USERNAME = "new-test-user";
@@ -47,8 +48,8 @@ public void getInfluxDBClient() {
             influxDBContainer.start();
 
             try (final InfluxDBClient influxDBClient = createClient(influxDBContainer)) {
-                Assertions.assertThat(influxDBClient).isNotNull();
-                Assertions.assertThat(influxDBClient.ping()).isTrue();
+                assertThat(influxDBClient).isNotNull();
+                assertThat(influxDBClient.ping()).isTrue();
             }
         }
     }
@@ -65,7 +66,7 @@ public void getInfluxDBClientWithAdminToken() {
         ) {
             influxDBContainer.start();
             final Optional<String> adminToken = influxDBContainer.getAdminToken();
-            Assertions.assertThat(adminToken).isNotEmpty();
+            assertThat(adminToken).isNotEmpty();
 
             try (
                 final InfluxDBClient influxDBClient = createClientWithToken(
@@ -73,8 +74,8 @@ public void getInfluxDBClientWithAdminToken() {
                     adminToken.get()
                 )
             ) {
-                Assertions.assertThat(influxDBClient).isNotNull();
-                Assertions.assertThat(influxDBClient.ping()).isTrue();
+                assertThat(influxDBClient).isNotNull();
+                assertThat(influxDBClient.ping()).isTrue();
             }
         }
     }
@@ -97,11 +98,10 @@ public void getBucket() {
 
             try (final InfluxDBClient influxDBClient = createClient(influxDBContainer)) {
                 final Bucket bucket = influxDBClient.getBucketsApi().findBucketByName(BUCKET);
-                Assertions.assertThat(bucket).isNotNull();
+                assertThat(bucket).isNotNull();
 
-                Assertions.assertThat(bucket.getName()).isEqualTo(BUCKET);
-                Assertions
-                    .assertThat(bucket.getRetentionRules())
+                assertThat(bucket.getName()).isEqualTo(BUCKET);
+                assertThat(bucket.getRetentionRules())
                     .hasSize(1)
                     .first()
                     .extracting(BucketRetentionRules::getEverySeconds)
@@ -141,7 +141,7 @@ public void queryForWriteAndRead() {
 
                 final FluxTable fluxTable = queryApi.query(flux).get(0);
                 final List<FluxRecord> records = fluxTable.getRecords();
-                Assertions.assertThat(records).hasSize(1);
+                assertThat(records).hasSize(1);
             }
         }
     }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
index a3fed34f24c..8f5f5f5a425 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ContainerDatabaseDriver.java
@@ -12,8 +12,18 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import javax.script.ScriptException;
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 3520df668e5..0f38486f45d 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -14,7 +14,9 @@
 
 import java.util.Collections;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
 /**
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index d338ebf180b..fab2f012996 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -9,7 +9,12 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
 import java.net.URL;
 import java.net.URLConnection;
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index a4a456f0179..8d29cb57310 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -1,6 +1,8 @@
 package org.testcontainers.junit;
 
-import org.junit.*;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.bio.SocketConnector;
 import org.mortbay.jetty.handler.ResourceHandler;

From 9377a592460ef1de43bf5189dfe4a114b668c457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Nov 2022 15:03:18 -0800
Subject: [PATCH 2449/4969] Update spock version to 2.3-groovy-4.0 (#6222)

---
 docs/examples/spock/redis/build.gradle | 2 +-
 modules/spock/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index e90c638bc1b..1ebb61ece1e 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api "io.lettuce:lettuce-core:6.2.1.RELEASE"
-    testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index e1f7dba23c0..6784ea26d20 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -6,7 +6,7 @@ description = "Testcontainers :: Spock-Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.spockframework:spock-core:2.3-groovy-3.0'
+    api 'org.spockframework:spock-core:2.3-groovy-4.0'
 
     testImplementation project(':selenium')
     testImplementation project(':mysql')

From 341862470456f627963c90f690566d1968bab508 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Nov 2022 11:21:11 +0100
Subject: [PATCH 2450/4969] Update docs version to 1.17.6 (#5255)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 541f6944249..eabeb1ebecf 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -113,4 +113,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.17.5
+    latest_version: 1.17.6

From b7a72e00f6898c832893180397de82b51de21344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 18 Nov 2022 06:47:16 -0800
Subject: [PATCH 2451/4969] Upgrade testcontainers version to 1.17.6 in japicmp

---
 gradle/japicmp.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index bdb321cf75b..540feedbb79 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-    baseline "org.testcontainers:${project.name}:1.17.5", {
+    baseline "org.testcontainers:${project.name}:1.17.6", {
         exclude group: "*", module: "*"
     }
 }

From c0c02e0cf119302fc731917a917da11cdde3d830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Nov 2022 07:40:48 -0800
Subject: [PATCH 2452/4969] Use `implicitlyWait(Duration)` in selenium examples
 (#6224)

`implicitlyWait(long, TimeUnit)` is deprecated. Use `implicitlyWait(Duration)`
instead.
---
 .../src/test/java/SeleniumContainerTest.java                | 4 ++--
 .../testcontainers/junit/BaseWebDriverContainerTest.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/selenium-container/src/test/java/SeleniumContainerTest.java b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
index 084b8b0a94a..da687158c3d 100644
--- a/examples/selenium-container/src/test/java/SeleniumContainerTest.java
+++ b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
@@ -19,8 +19,8 @@
 import org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -43,7 +43,7 @@ public class SeleniumContainerTest {
     @Test
     public void simplePlainSeleniumTest() {
         RemoteWebDriver driver = new RemoteWebDriver(chrome.getSeleniumAddress(), new ChromeOptions());
-        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
 
         driver.get("http://host.testcontainers.internal:" + port + "/foo.html");
         List<WebElement> hElement = driver.findElements(By.tagName("h"));
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index d81d743ed21..51e5175606d 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -13,7 +13,7 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -36,7 +36,7 @@ public class BaseWebDriverContainerTest {
 
     protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule, Capabilities capabilities) {
         RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
-        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
         System.out.println("Selenium remote URL is: " + rule.getSeleniumAddress());
         System.out.println("VNC URL is: " + rule.getVncAddress());
 
@@ -52,7 +52,7 @@ protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule, Capabil
     protected void assertBrowserNameIs(BrowserWebDriverContainer<?> rule, String expectedName) {
         Capabilities capabilities = ("chrome".equals(expectedName)) ? new ChromeOptions() : new FirefoxOptions();
         RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
-        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
         String actual = driver.getCapabilities().getBrowserName();
         assertThat(actual).as(String.format("actual browser name is %s", actual)).isEqualTo(expectedName);
         driver.quit();

From a93183fb2ce3d72a982281bf34d94ec06695309c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Nov 2022 12:51:40 -0800
Subject: [PATCH 2453/4969] Fix yugabytedb docs (#6226)

Currently, the string version is not displayed.
---
 .../testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java   | 4 +++-
 .../testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
index 3616b87850b..f2154065c14 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
@@ -23,7 +23,9 @@ public class YugabyteDBYCQLTest {
     public void testSmoke() {
         try (
             // creatingYCQLContainer {
-            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(IMAGE_NAME)
+            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(
+                "yugabytedb/yugabyte:2.14.4.0-b26"
+            )
             // }
         ) {
             // startingYCQLContainer {
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
index cb98fcdc922..3061f2a1ace 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
@@ -24,7 +24,9 @@ public class YugabyteDBYSQLTest extends AbstractContainerDatabaseTest {
     public void testSmoke() throws SQLException {
         try (
             // creatingYSQLContainer {
-            final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(IMAGE_NAME)
+            final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(
+                "yugabytedb/yugabyte:2.14.4.0-b26"
+            )
             // }
         ) {
             // startingYSQLContainer {

From 71dc6de1d5678799d7310f8a0dfd70276e015a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 23 Nov 2022 05:39:49 -0800
Subject: [PATCH 2454/4969] Add NATS example (#6230)

Demostrate how to use NATS along with GenericContainer.

Co-authored-by: Krzysztof Kocel <Krzysztof.Kocel@vimn.com>
---
 docs/examples.md                              |  1 +
 examples/nats/build.gradle                    | 15 +++++
 .../java/com/example/NatsContainerTest.java   | 56 +++++++++++++++++++
 .../nats/src/test/resources/logback-test.xml  | 16 ++++++
 examples/settings.gradle                      |  1 +
 5 files changed, 89 insertions(+)
 create mode 100644 examples/nats/build.gradle
 create mode 100644 examples/nats/src/test/java/com/example/NatsContainerTest.java
 create mode 100644 examples/nats/src/test/resources/logback-test.xml

diff --git a/docs/examples.md b/docs/examples.md
index 29e1ca643f3..170ae3e3050 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -16,3 +16,4 @@ Examples of different use cases provided by Testcontainers can be found below:
 - [TestNG](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache-testng)
 - [ImmuDb](https://github.com/testcontainers/testcontainers-java/tree/main/examples/immudb)
 - [Zookeeper](https://github.com/testcontainers/testcontainers-java/tree/main/examples/zookeeper)
+- [NATS](https://github.com/testcontainers/testcontainers-java/tree/main/examples/nats)
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
new file mode 100644
index 00000000000..ac7909e32a1
--- /dev/null
+++ b/examples/nats/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'io.nats:jnats:2.16.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+}
diff --git a/examples/nats/src/test/java/com/example/NatsContainerTest.java b/examples/nats/src/test/java/com/example/NatsContainerTest.java
new file mode 100644
index 00000000000..397b3a4f7b0
--- /dev/null
+++ b/examples/nats/src/test/java/com/example/NatsContainerTest.java
@@ -0,0 +1,56 @@
+package com.example;
+
+import io.nats.client.Connection;
+import io.nats.client.Nats;
+import io.nats.client.Options;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NatsContainerTest {
+
+    public static final Integer NATS_PORT = 4222;
+
+    public static final Integer NATS_MGMT_PORT = 8222;
+
+    @Test
+    public void test() throws IOException, InterruptedException {
+        try (
+            GenericContainer<?> nats = new GenericContainer<>("nats:2.9.8-alpine3.16")
+                .withExposedPorts(NATS_PORT, NATS_MGMT_PORT)
+        ) {
+            nats.start();
+
+            Connection connection = Nats.connect(
+                new Options.Builder().server("nats://" + nats.getHost() + ":" + nats.getMappedPort(NATS_PORT)).build()
+            );
+
+            assertThat(connection.getStatus()).isEqualTo(Connection.Status.CONNECTED);
+        }
+    }
+
+    @Test
+    public void testServerStatus() throws IOException {
+        try (
+            GenericContainer<?> nats = new GenericContainer<>("nats:2.9.8-alpine3.16")
+                .withExposedPorts(NATS_PORT, NATS_MGMT_PORT)
+        ) {
+            nats.start();
+
+            HttpUriRequest request = new HttpGet(
+                String.format("http://%s:%d/varz", nats.getHost(), nats.getMappedPort(NATS_MGMT_PORT))
+            );
+            HttpResponse httpResponse = HttpClientBuilder.create().build().execute(request);
+
+            assertThat(httpResponse.getStatusLine().getStatusCode()).isEqualTo(HttpStatus.SC_OK);
+        }
+    }
+}
diff --git a/examples/nats/src/test/resources/logback-test.xml b/examples/nats/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/nats/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 2c2238d031b..13c237d0866 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -33,6 +33,7 @@ include 'spring-boot-kotlin-redis'
 include 'immudb'
 include 'zookeeper'
 include 'hazelcast'
+include 'nats'
 
 ext.isCI = System.getenv("CI") != null
 

From 7ba6b1c518d8f181b5831229977c260dbff803dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 24 Nov 2022 07:27:21 -0500
Subject: [PATCH 2455/4969] Use testcontainers/vnc-recorder:1.3.0 (#6234)

New version provides ARM image.
---
 .../org/testcontainers/containers/VncRecordingContainer.java    | 2 +-
 docs/features/configuration.md                                  | 2 +-
 .../junit/ChromeRecordingWebDriverContainerTest.java            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
index f629a141357..9e5f6957cdc 100644
--- a/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
@@ -60,7 +60,7 @@ public VncRecordingContainer(@NonNull GenericContainer<?> targetContainer) {
      */
     public VncRecordingContainer(@NonNull Network network, @NonNull String targetNetworkAlias)
         throws IllegalStateException {
-        super(DockerImageName.parse("testcontainers/vnc-recorder:1.2.0"));
+        super(DockerImageName.parse("testcontainers/vnc-recorder:1.3.0"));
         this.targetNetworkAlias = targetNetworkAlias;
         withNetwork(network);
         waitingFor(
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index f93d0807d01..8c33049260d 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -55,7 +55,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **sshd.container.image = testcontainers/sshd:1.1.0**  
 > Required if [exposing host ports to containers](./networking.md#exposing-host-ports-to-the-container)
 
-> **vncrecorder.container.image = testcontainers/vnc-recorder:1.1.0**
+> **vncrecorder.container.image = testcontainers/vnc-recorder:1.3.0**
 > Used by VNC recorder in Testcontainers' Selenium integration
 
 > **socat.container.image = alpine/socat**  
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index 238077b8847..8723d951d3e 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -135,7 +135,7 @@ public void recordingTestThatShouldHaveCorrectDuration() throws IOException, Int
 
             try (
                 GenericContainer<?> container = new GenericContainer<>(
-                    DockerImageName.parse("testcontainers/vnc-recorder:1.2.0")
+                    DockerImageName.parse("testcontainers/vnc-recorder:1.3.0")
                 )
             ) {
                 String recordFileContainerPath = "/tmp/chromeTestRecord.flv";

From f5ec43dc358a01f8c82713ec7e66b2552e386515 Mon Sep 17 00:00:00 2001
From: Cyril Dangerville <1372580+cdanger@users.noreply.github.com>
Date: Mon, 28 Nov 2022 11:58:30 +0100
Subject: [PATCH 2456/4969] Fixes the issue of missing root cause in container
 launch TimeoutException (e.g. SSLHandshakeException) (#5778)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../wait/strategy/HttpWaitStrategy.java       |  3 +-
 .../wait/strategy/HttpWaitStrategyTest.java   | 29 ++++++++++++++++++-
 .../https-wait-strategy-dockerfile/Dockerfile |  6 ++++
 .../nginx-ssl.conf                            | 10 +++++++
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 core/src/test/resources/https-wait-strategy-dockerfile/Dockerfile
 create mode 100644 core/src/test/resources/https-wait-strategy-dockerfile/nginx-ssl.conf

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index ccaef47a821..2400e3ae523 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -319,7 +319,8 @@ protected void waitUntilReady() {
                     "Timed out waiting for URL to be accessible (%s should return HTTP %s)",
                     uri,
                     statusCodes.isEmpty() ? HttpURLConnection.HTTP_OK : statusCodes
-                )
+                ),
+                e
             );
         }
     }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index 37bbe985bac..d3ce006fb2e 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -1,10 +1,12 @@
 package org.testcontainers.junit.wait.strategy;
 
+import org.assertj.core.api.Assertions;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.time.Duration;
 import java.util.HashMap;
@@ -200,7 +202,7 @@ public void testWaitUntilReadyWithSpecificPort() {
     }
 
     @Test
-    public void testWaitUntilReadyWithTimoutCausedByReadTimeout() {
+    public void testWaitUntilReadyWithTimeoutCausedByReadTimeout() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("0 Connection Refused", GOOD_RESPONSE_BODY, 9090),
@@ -212,6 +214,31 @@ public void testWaitUntilReadyWithTimoutCausedByReadTimeout() {
         }
     }
 
+    /**
+     * Test to validate fix from GitHub Pull Request <a href="https://github.com/testcontainers/testcontainers-java/pull/5778">#5778</a>, i.e. when the container startup fails (ContainerLaunchException) before timeout for some reason, we are able to see the root cause of the error in the stack trace, e.g. in this case, a TLS certificate validation error during the TLS handshake test, because we are using a NGINX docker image with self-signed certificate created with the image, that is obviously not trusted.
+     * The exceptions we should see in the stacktrace ('/' means 'caused by'): ContainerLaunchException / TimeoutException / RuntimeException / SSLHandshakeException / ValidatorException (in sun.* package so not accessible) / SunCertPathBuilderException (in sun.* package so not accessible).
+     */
+    @Test
+    public void testWaitUntilReadyWithTimeoutCausedBySslHandshakeError() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(
+                new ImageFromDockerfile()
+                    .withFileFromClasspath("Dockerfile", "https-wait-strategy-dockerfile/Dockerfile")
+                    .withFileFromClasspath("nginx-ssl.conf", "https-wait-strategy-dockerfile/nginx-ssl.conf")
+            )
+                .withExposedPorts(8443)
+                .waitingFor(
+                    createHttpWaitStrategy(ready)
+                        .forPort(8443)
+                        .usingTls()
+                        .withStartupTimeout(Duration.ofMillis(WAIT_TIMEOUT_MILLIS))
+                )
+        ) {
+            Throwable throwable = Assertions.catchThrowable(container::start);
+            assertThat(throwable).hasStackTraceContaining("javax.net.ssl.SSLHandshakeException");
+        }
+    }
+
     /**
      * @param ready the AtomicBoolean on which to indicate success
      * @return the WaitStrategy under test
diff --git a/core/src/test/resources/https-wait-strategy-dockerfile/Dockerfile b/core/src/test/resources/https-wait-strategy-dockerfile/Dockerfile
new file mode 100644
index 00000000000..9a6d2245fb5
--- /dev/null
+++ b/core/src/test/resources/https-wait-strategy-dockerfile/Dockerfile
@@ -0,0 +1,6 @@
+FROM nginx:1.17-alpine
+
+# Create keypair and self-signed certificate for https test
+RUN apk update && apk add bash openssl && openssl req -batch -x509 -nodes -days 365 -newkey rsa:2048 -subj "/CN=localhost" -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt
+
+ADD nginx-ssl.conf /etc/nginx/conf.d/default.conf
diff --git a/core/src/test/resources/https-wait-strategy-dockerfile/nginx-ssl.conf b/core/src/test/resources/https-wait-strategy-dockerfile/nginx-ssl.conf
new file mode 100644
index 00000000000..021741f6b9e
--- /dev/null
+++ b/core/src/test/resources/https-wait-strategy-dockerfile/nginx-ssl.conf
@@ -0,0 +1,10 @@
+# This configuration makes Nginx listen on port port 8443
+# In order to use this config, add this line to the Dockerfile to create the keypair and self-signed certificate:
+# RUN apk update && apk add openssl && openssl req -batch -x509 -nodes -days 365 -newkey rsa:2048 -subj "/CN=localhost" -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt
+
+server {
+    listen              8443 ssl;
+    server_name         localhost;
+    ssl_certificate     /etc/ssl/certs/nginx-selfsigned.crt;
+    ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
+}

From ea32b8b7ff0fb2c520bb5f72d906a4aaf39c6780 Mon Sep 17 00:00:00 2001
From: Christoph Dreis <dreis2211@users.noreply.github.com>
Date: Tue, 29 Nov 2022 22:01:48 +0100
Subject: [PATCH 2457/4969] Avoid Pattern recompilation in log output
 processing (#6239)

---
 .../containers/output/FrameConsumerResultCallback.java      | 6 ++++--
 .../testcontainers/containers/output/Slf4jLogConsumer.java  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
index 75c24d1ac1d..dfc146a8089 100644
--- a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
+++ b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
@@ -30,7 +30,9 @@ public class FrameConsumerResultCallback extends ResultCallbackTemplate<FrameCon
 
     private static final String LINE_BREAK_REGEX = "((\\r?\\n)|(\\r))";
 
-    static final String LINE_BREAK_AT_END_REGEX = LINE_BREAK_REGEX + "$";
+    private static final Pattern LINE_BREAK_PATTERN = Pattern.compile(LINE_BREAK_REGEX);
+
+    static final Pattern LINE_BREAK_AT_END_PATTERN = Pattern.compile(LINE_BREAK_REGEX + "$");
 
     private Map<OutputFrame.OutputType, Consumer<OutputFrame>> consumers;
 
@@ -139,7 +141,7 @@ private synchronized void processOtherFrame(OutputFrame outputFrame, Consumer<Ou
 
     private void normalizeLogLines(String utf8String, Consumer<OutputFrame> consumer) {
         // Reformat strings to normalize new lines.
-        List<String> lines = new ArrayList<>(Arrays.asList(utf8String.split(LINE_BREAK_REGEX)));
+        List<String> lines = new ArrayList<>(Arrays.asList(LINE_BREAK_PATTERN.split(utf8String)));
         if (lines.isEmpty()) {
             consumer.accept(new OutputFrame(OutputFrame.OutputType.STDOUT, EMPTY_LINE));
             return;
diff --git a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
index ece7ab0e5b7..6eff93ae4c8 100644
--- a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
@@ -53,7 +53,7 @@ public void accept(OutputFrame outputFrame) {
         OutputFrame.OutputType outputType = outputFrame.getType();
 
         String utf8String = outputFrame.getUtf8String();
-        utf8String = utf8String.replaceAll(FrameConsumerResultCallback.LINE_BREAK_AT_END_REGEX, "");
+        utf8String = FrameConsumerResultCallback.LINE_BREAK_AT_END_PATTERN.matcher(utf8String).replaceAll("");
 
         Map<String, String> originalMdc = MDC.getCopyOfContextMap();
         MDC.setContextMap(mdc);

From 10e97fd177b7ff3d5668509aabbe096a33cba557 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:24 +0000
Subject: [PATCH 2458/4969] Bump mariadb-java-client from 3.0.9 to 3.1.0 in
 /modules/mariadb

Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.9 to 3.1.0.
- [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/commits)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 747dce84962..d948e3261c9 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.9'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From 5ead714ccebed25d754238bbb35401687d2b1f9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:24 +0000
Subject: [PATCH 2459/4969] Bump rest-assured from 5.2.0 to 5.3.0 in
 /modules/vault

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.2.0...rest-assured-5.3.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index c9142936b63..c901f393059 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.2.0'
+    testImplementation 'io.rest-assured:rest-assured:5.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
 }

From 23963076a113c28e7453babdb3928540a4e6d329 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:24 +0000
Subject: [PATCH 2460/4969] Bump postgresql from 42.5.0 to 42.5.1 in
 /modules/junit-jupiter

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.0...REL42.5.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f3e0187bcb1..35566c09fef 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }

From 76083bd0536c73534dde1572f5a3bbafc9d08329 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:24 +0000
Subject: [PATCH 2461/4969] Bump postgresql from 42.5.0 to 42.5.1 in
 /modules/postgresql

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.0...REL42.5.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b32fb10667f..fafe416b623 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.5.0'
+    testImplementation 'org.postgresql:postgresql:42.5.1'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 0cd398410561d02cdcfe9dd7737cff47ab3a0f5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:26 +0000
Subject: [PATCH 2462/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.342 to 1.12.353.
- [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.12.342...1.12.353)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 73305850140..42fbd245fbc 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.342'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.353'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.353'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From aa4a8bdd82cc711b23557f0dffc6bb25e2e4953d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:27 +0000
Subject: [PATCH 2463/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.5.1 to 8.5.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.5.1...v8.5.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 12a949645c6..8ea60273cca 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.2"
     testImplementation "org.elasticsearch.client:transport:7.17.7"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 11d9aa72ac3d8fdbffefd2fdf4cec6b27549afc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:29 +0000
Subject: [PATCH 2464/4969] Bump docker-java-bom from 3.2.13 to 3.2.14 in /core

Bumps [docker-java-bom](https://github.com/docker-java/docker-java) from 3.2.13 to 3.2.14.
- [Release notes](https://github.com/docker-java/docker-java/releases)
- [Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/docker-java/docker-java/compare/3.2.13...3.2.14)

---
updated-dependencies:
- dependency-name: com.github.docker-java:docker-java-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 876109ae764..500d3fbd3cc 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -77,7 +77,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.2.13')
+    api platform('com.github.docker-java:docker-java-bom:3.2.14')
     shaded platform('com.github.docker-java:docker-java-bom:3.2.13')
 
     api "com.github.docker-java:docker-java-api"

From 39c92176082a45de46a8b61eb10bd3ded62c7798 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:34 +0000
Subject: [PATCH 2465/4969] Bump peter-evans/create-pull-request from 4.2.0 to
 4.2.3

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.2.0 to 4.2.3.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/b4d51739f96fca8047ad065eccef63442d8e99f7...2b011faafdcbc9ceb11414d64d0573f37c774b04)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 53ac0ae9b9a..0915afd3826 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7 # v3.10.1
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

From e51855657ca1af24569c6b098e2716c60ad74851 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:35 +0000
Subject: [PATCH 2466/4969] Bump aws-java-sdk-s3 from 1.12.343 to 1.12.353 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.343 to 1.12.353.
- [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.12.343...1.12.353)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3d52f93e7a4..d45f57a6e56 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.343'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.353'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.343'

From 7226539c46c74f8d1349164c71fb603a10965802 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:00:40 +0000
Subject: [PATCH 2467/4969] Bump aws-java-sdk-logs from 1.12.343 to 1.12.353 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.343 to 1.12.353.
- [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.12.343...1.12.353)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3d52f93e7a4..4df377a8136 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.343'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.343'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
     testImplementation 'software.amazon.awssdk:s3:2.18.18'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From d405cddab1b73e74c33b06d9054b22558cf5165d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:08 +0000
Subject: [PATCH 2468/4969] Bump postgresql from 42.5.0 to 42.5.1 in
 /modules/cockroachdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.0...REL42.5.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 638629ef22a..7f2b5f1850f 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.0'
+    testImplementation 'org.postgresql:postgresql:42.5.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 3622d73286f47fa0645b85fcebb7b132c319e369 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:08 +0000
Subject: [PATCH 2469/4969] Bump orientdb-gremlin from 3.2.12 to 3.2.13 in
 /modules/orientdb

Bumps [orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.12 to 3.2.13.
- [Release notes](https://github.com/orientechnologies/orientdb-gremlin/releases)
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.12...3.2.13)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index aace1259769..d27b37fe304 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.12"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.13"
 }

From aa61c0df911b127df3400ccdd75a693ccb120dfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:08 +0000
Subject: [PATCH 2470/4969] Bump trino-jdbc from 402 to 403 in /modules/trino

Bumps trino-jdbc from 402 to 403.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index ed0c293a509..985127bed24 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:402'
+    testImplementation 'io.trino:trino-jdbc:403'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

From 69e7582be8fe2aa6c5d812ac538681d0c7941927 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:16 +0000
Subject: [PATCH 2471/4969] Bump orientdb-client from 3.2.12 to 3.2.13 in
 /modules/orientdb

Bumps [orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.12 to 3.2.13.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.12...3.2.13)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index aace1259769..28cdffb201a 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.12"
+    api "com.orientechnologies:orientdb-client:3.2.13"
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'

From f8adec42f8b6d2fc1f1bfe4449556a1003376aae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:23 +0000
Subject: [PATCH 2472/4969] Bump logback-classic from 1.4.4 to 1.4.5 in
 /modules/hivemq

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.4...v_1.4.5)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 8b01751549c..b33c6578e1a 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.9.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.4.4")
+    testImplementation("ch.qos.logback:logback-classic:1.4.5")
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
 }

From a75eb4cc100ca75def5042af778f2ca99d18628e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:23 +0000
Subject: [PATCH 2473/4969] Bump google-cloud-pubsub from 1.120.25 to 1.121.1
 in /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.120.25 to 1.121.1.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.120.25...v1.121.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9a94f7928bf..ae1a21cc459 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.1'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.25'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 52fb838cc8bc8ba1ea0b78ff2449600adae8aa0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:24 +0000
Subject: [PATCH 2474/4969] Bump azure-cosmos from 4.38.1 to 4.39.0 in
 /modules/azure

Bumps [azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.38.1 to 4.39.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.38.1...azure-cosmos_4.39.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 7723ace6404..f213006d8cb 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.38.1'
+    testImplementation 'com.azure:azure-cosmos:4.39.0'
 }

From 2d039729089d96fc016dc2f4518867dc02f63f09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:30 +0000
Subject: [PATCH 2475/4969] Bump org.gradle.test-retry from 1.4.1 to 1.5.0 in
 /examples

Bumps org.gradle.test-retry from 1.4.1 to 1.5.0.

---
updated-dependencies:
- dependency-name: org.gradle.test-retry
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d970b5a3d4e..c96191997e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
     id 'com.diffplug.spotless' version '6.11.0' apply false
-    id 'org.gradle.test-retry' version '1.4.1'
+    id 'org.gradle.test-retry' version '1.5.0'
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"

From d6ee6b8dcb87f794113e92df2f9adcec86b93c93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:01:47 +0000
Subject: [PATCH 2476/4969] Bump postgresql from 42.5.0 to 42.5.1 in /examples

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.0...REL42.5.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 08376fd9d3f..6bda049aa66 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
-    testImplementation 'org.postgresql:postgresql:42.5.0'
+    testImplementation 'org.postgresql:postgresql:42.5.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From d27b586b4bec130b3d3e181161f3f3d2d6e9e8a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:02:07 +0000
Subject: [PATCH 2477/4969] Bump rest-assured from 5.2.0 to 5.3.0 in
 /modules/consul

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.2.0...rest-assured-5.3.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index a72aefaab5f..4e0c7db06ca 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.2.0'
+    testImplementation 'io.rest-assured:rest-assured:5.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 8609dfa6f8899932e366256ad9151ce8b1919363 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:02:08 +0000
Subject: [PATCH 2478/4969] Bump rest-assured from 5.2.0 to 5.3.0 in
 /modules/redpanda

Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/rest-assured/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.2.0...rest-assured-5.3.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index e8b7ce677fe..49ee9c3a766 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'io.rest-assured:rest-assured:5.2.0'
+    testImplementation 'io.rest-assured:rest-assured:5.3.0'
 }

From fbfda2df32aa01edc6473dbad9373196baf91f6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:02:32 +0000
Subject: [PATCH 2479/4969] Bump postgresql from 42.5.0 to 42.5.1 in
 /modules/questdb

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.0...REL42.5.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 9f61747934a..d587afca7f2 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testImplementation 'org.postgresql:postgresql:42.5.0'
+    testImplementation 'org.postgresql:postgresql:42.5.1'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.questdb:questdb:6.5.5-jdk8'

From 5081d9c8d4e0b5917d35bc1297553ab8923c1153 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:02:35 +0000
Subject: [PATCH 2480/4969] Bump questdb from 6.5.5-jdk8 to 6.6.1-jdk8 in
 /modules/questdb

Bumps [questdb](https://github.com/questdb/questdb) from 6.5.5-jdk8 to 6.6.1-jdk8.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/commits)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 9f61747934a..f11cc1909d8 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.questdb:questdb:6.5.5-jdk8'
+    testImplementation 'org.questdb:questdb:6.6.1-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }

From 28ff1f48d2779d09ba6d1cf51beb8f37da997ebe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:02:57 +0000
Subject: [PATCH 2481/4969] Bump org.jetbrains.kotlin.jvm from 1.7.21 to 1.7.22
 in /examples

Bumps [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 8235f8f6809..52163904ca4 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.7.5"
-    id("org.jetbrains.kotlin.jvm") version "1.7.21"
+    id("org.jetbrains.kotlin.jvm") version "1.7.22"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.21"
 }
 

From 098573b8a6ab7e0ee86d3d7c8135c55c8907f053 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:03:00 +0000
Subject: [PATCH 2482/4969] Bump jnats from 2.16.4 to 2.16.5 in /examples

Bumps [jnats](https://github.com/nats-io/nats.java) from 2.16.4 to 2.16.5.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.16.4...2.16.5)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index ac7909e32a1..899a305fdbd 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.4'
+    testImplementation 'io.nats:jnats:2.16.5'
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }

From d481b9690900b91082ec124697faa3acf7324ed8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 01:57:40 +0000
Subject: [PATCH 2483/4969] Bump postgresql from 42.5.0 to 42.5.1 in
 /modules/spock

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.0...REL42.5.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6784ea26d20..af0ccbd7afd 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'

From 0e96090a4d83c20514cec1fb8cd401d522a6d5d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 01:57:59 +0000
Subject: [PATCH 2484/4969] Bump google-cloud-firestore from 3.7.1 to 3.7.3 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.7.1 to 3.7.3.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.7.1...v3.7.3)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index ae1a21cc459..56d9ae43b74 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.1'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.3'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'

From fe91ff1d28539e83e042518191b4b531e92aff27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 01:58:00 +0000
Subject: [PATCH 2485/4969] Bump google-cloud-spanner from 6.32.0 to 6.33.0 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.32.0 to 6.33.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.32.0...v6.33.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index ae1a21cc459..ca32e600023 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.1'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.33.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 8e8f4f8e51c41fa2f99ab32a7764e4e5be32e213 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 01:58:05 +0000
Subject: [PATCH 2486/4969] Bump logback-classic from 1.3.4 to 1.3.5 in
 /examples

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.4...v_1.3.5)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle                                    | 2 +-
 docs/examples/spock/redis/build.gradle          | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index d970b5a3d4e..185b053f191 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,7 +125,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     }
 
     checkstyle {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 1ebb61ece1e..39ef4e4f4e7 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.1.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index e45ad5f02bc..5e675ddb8c8 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -9,6 +9,6 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.2.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 4bc07d8938a..dd55185dfef 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 6bda049aa66..d74d75b3666 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 899a305fdbd..2dd37efa1ee 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.5'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index b22eabafecd..3480bcf1704 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 743a5e615b7..f4a0aa56d02 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 981c61f6cf3..d1731188398 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index bae5a83a868..c0673265a88 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.4.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }

From 10603a4d68f190ff0fc15455371bf0106f4630ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 01:58:05 +0000
Subject: [PATCH 2487/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 52163904ca4..8d22d76ead6 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.7.5"
     id("org.jetbrains.kotlin.jvm") version "1.7.22"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.7.21"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.7.22"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 905afa7f045e0f9eea6ed4c09be345f1c3ccec3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 01:58:06 +0000
Subject: [PATCH 2488/4969] Bump aws-java-sdk-sqs from 1.12.342 to 1.12.354 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.342 to 1.12.354.
- [Release notes](https://github.com/aws/aws-sdk-java/releases)
- [Changelog](https://github.com/aws/aws-sdk-java/blob/1.12.354/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.342...1.12.354)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 a42611a65fd..29a3a51c33f 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.353'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.354'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
     testImplementation 'software.amazon.awssdk:s3:2.18.18'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From ef5be8d25854d67fe78838057db1c16357ffbd77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 03:10:26 +0000
Subject: [PATCH 2489/4969] Bump s3 from 2.18.18 to 2.18.29 in
 /modules/localstack

Bumps s3 from 2.18.18 to 2.18.29.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 29a3a51c33f..551e65d04dd 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.354'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
-    testImplementation 'software.amazon.awssdk:s3:2.18.18'
+    testImplementation 'software.amazon.awssdk:s3:2.18.29'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From bf6a86e885ebe20cdb986b103bdfce2f00ad524b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 03:10:27 +0000
Subject: [PATCH 2490/4969] Bump com.diffplug.spotless from 6.11.0 to 6.12.0 in
 /examples

Bumps com.diffplug.spotless from 6.11.0 to 6.12.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle          | 2 +-
 examples/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4e5842f3a63..b80aa9a8dbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
-    id 'com.diffplug.spotless' version '6.11.0' apply false
+    id 'com.diffplug.spotless' version '6.12.0' apply false
     id 'org.gradle.test-retry' version '1.5.0'
 }
 
diff --git a/examples/build.gradle b/examples/build.gradle
index 811c8abcb58..a020fdcd4b2 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.11.0' apply false
+    id 'com.diffplug.spotless' version '6.12.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"

From e871f441fa31597555a120c131373f7af6ff3c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 2 Dec 2022 09:12:25 -0600
Subject: [PATCH 2491/4969] Update permission in update-gradle-wrapper workflow
 (#6280)

Currently, the workflow has been failing. See [workflow runs](https://github.com/testcontainers/testcontainers-java/actions/workflows/update-gradle-wrapper.yml)
This is due to a missing permission which is unable to push the branch
to the repository.
---
 .github/workflows/update-gradle-wrapper.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 269322e4c07..46ecc90cfb1 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -10,6 +10,7 @@ permissions:
 jobs:
   update-gradle-wrapper:
     permissions:
+      contents: write # for gradle-update/update-gradle-wrapper-action
       pull-requests: write # for gradle-update/update-gradle-wrapper-action
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest

From d93d8f1d5fa89c06d21c64c9870d8a4843ece0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 2 Dec 2022 09:12:54 -0600
Subject: [PATCH 2492/4969] Update spring boot version to 2.7.6 (#6278)

2.7.x is compatible with Java 8. For that reason, we are skipping
major versions upgraded due to 3.0.0 needs Java 17.
---
 .github/dependabot.yml                   | 2 ++
 examples/selenium-container/build.gradle | 2 +-
 examples/spring-boot/build.gradle        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 121b8ab4b46..7f8810b606c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -281,6 +281,8 @@ updates:
         update-types: [ "version-update:semver-minor" ]
       - dependency-name: "org.slf4j:slf4j-api"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.springframework.boot:spring-boot-gradle-plugin"
+        update-types: [ "version-update:semver-major" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 57f4726b115..cd80e2503fa 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.7.5'
+    id 'org.springframework.boot' version '2.7.6'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 40affdda2c9..e899b8084eb 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.7.5'
+    id 'org.springframework.boot' version '2.7.6'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 1f814fbe17ae4212ea7bf8711bd84b6646061863 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 15:13:29 +0000
Subject: [PATCH 2493/4969] Bump selenium-api from 4.6.0 to 4.7.0 in /examples

Bumps [selenium-api](https://github.com/SeleniumHQ/selenium) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.6.0...selenium-4.7.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 0a4fd0b85b4..7bc09e92e1b 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testImplementation 'mysql:mysql-connector-java:8.0.31'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.6.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.7.0"
     testImplementation 'org.assertj:assertj-core:3.15.0'
 }

From 3ea29f85b0525138496b8c33206ff8046e6455d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 15:13:29 +0000
Subject: [PATCH 2494/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.353 to 1.12.356.
- [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/commits)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 42fbd245fbc..b1890662268 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.353'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.353'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 5e947584bb9456d4003c5652cecc603960312bb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 15:13:51 +0000
Subject: [PATCH 2495/4969] Bump aws-java-sdk-sqs from 1.12.354 to 1.12.356 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.354 to 1.12.356.
- [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/commits)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 551e65d04dd..22083bcd38e 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.353'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.354'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
     testImplementation 'software.amazon.awssdk:s3:2.18.29'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 70fa48a26d3062e631d83a8263f281e6667b4e9e Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Fri, 2 Dec 2022 16:14:04 +0100
Subject: [PATCH 2496/4969] Clarify docker-socket mounting workaround for
 Docker Desktop (#6282)

---
 .../continuous_integration/dind_patterns.md                  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/supported_docker_environment/continuous_integration/dind_patterns.md b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
index b6fc4e489ea..402e2540789 100644
--- a/docs/supported_docker_environment/continuous_integration/dind_patterns.md
+++ b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
@@ -32,6 +32,11 @@ Where:
 * `-w $PWD` will set the current directory to this volume
 * `-v /var/run/docker.sock:/var/run/docker.sock` will map the Docker socket
 
+
+!!! note
+    If you are using Docker Dekstop, you need to mount the Docker socket that bypasses the API proxy (see [this comment](https://github.com/docker/for-mac/issues/5588#issuecomment-934600089) for more details):
+    `-v /var/run/docker.sock.raw:/var/run/docker.sock`
+
 ### Docker Compose example
 The same can be achieved with Docker Compose:
 ```yaml

From f77d26b57a58335c76771b525a847172ccdbe27e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 16:14:14 +0000
Subject: [PATCH 2497/4969] Bump aws-java-sdk-s3 from 1.12.353 to 1.12.356 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.353 to 1.12.356.
- [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/commits)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 22083bcd38e..139477e33ad 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.353'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.356'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
     testImplementation 'software.amazon.awssdk:s3:2.18.29'

From 4600f74860bab236dc542481c1a722f891a7cbbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 16:14:15 +0000
Subject: [PATCH 2498/4969] Bump aws-java-sdk-logs from 1.12.353 to 1.12.356 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.353 to 1.12.356.
- [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/commits)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 22083bcd38e..8f13cd3995f 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.353'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.356'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.356'
     testImplementation 'software.amazon.awssdk:s3:2.18.29'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From f52f960b2eab13a8c0e66c66b34e5716c08e2e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 2 Dec 2022 11:06:26 -0600
Subject: [PATCH 2499/4969] Ignore org.springframework.boot:*

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7f8810b606c..b0a1ee6fa80 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -281,7 +281,7 @@ updates:
         update-types: [ "version-update:semver-minor" ]
       - dependency-name: "org.slf4j:slf4j-api"
         update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.springframework.boot:spring-boot-gradle-plugin"
+      - dependency-name: "org.springframework.boot:*"
         update-types: [ "version-update:semver-major" ]
 
 # GitHub Actions

From 6dcf8e9c4eccfcd3991d7828b220e51cee5afa79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 2 Dec 2022 15:01:29 -0600
Subject: [PATCH 2500/4969] Explicitly ignore spring boot 3.x updates

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b0a1ee6fa80..fecaa6fc85a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -282,7 +282,7 @@ updates:
       - dependency-name: "org.slf4j:slf4j-api"
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.springframework.boot:*"
-        update-types: [ "version-update:semver-major" ]
+        versions: [ "[3,)" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From 77a92c097a4fb3cec0eb2560c48a64e36d5dca9c Mon Sep 17 00:00:00 2001
From: Bounkong Khamphousone <bounkong@gmail.com>
Date: Fri, 2 Dec 2022 22:43:54 +0100
Subject: [PATCH 2501/4969] Fix MongoDBContainer when reuse is enabled (#6235)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 modules/mongodb/build.gradle                    |  6 ++++++
 .../containers/MongoDBContainer.java            | 17 +++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index dca23147ab4..498403d3188 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -6,3 +6,9 @@ dependencies {
     testImplementation("org.mongodb:mongodb-driver-sync:4.8.0")
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.containers.MongoDBContainer#containerIsStarted(com.github.dockerjava.api.command.InspectContainerResponse)"
+    ]
+}
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index ae93e4121d3..d6304ac8c5d 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -82,8 +82,12 @@ public String getReplicaSetUrl(final String databaseName) {
     }
 
     @Override
-    protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        initReplicaSet();
+    protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+        if (reused && isReplicationSetAlreadyInitialized()) {
+            log.debug("Replica set already initialized.");
+        } else {
+            initReplicaSet();
+        }
     }
 
     private String[] buildMongoEvalCommand(final String command) {
@@ -151,4 +155,13 @@ public static class ReplicaSetInitializationException extends RuntimeException {
             super(errorMessage);
         }
     }
+
+    @SneakyThrows
+    private boolean isReplicationSetAlreadyInitialized() {
+        // since we are creating a replica set with one node, this node must be primary (state = 1)
+        final ExecResult execCheckRsInit = execInContainer(
+            buildMongoEvalCommand("if(db.adminCommand({replSetGetStatus: 1})['myState'] != 1) quit(900)")
+        );
+        return execCheckRsInit.getExitCode() == CONTAINER_EXIT_CODE_OK;
+    }
 }

From bbbf8325f501260d2dd06f9597c90b03f2bf02f1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 18:31:55 -0600
Subject: [PATCH 2502/4969] Update Gradle Wrapper to 7.6 (#6291)

* Update Gradle Wrapper from 7.5.1 to 7.6.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 7.5.1 to 7.6.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 60756 -> 61574 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +++--
 examples/gradlew                              |  12 ++++++++----
 examples/gradlew.bat                          |   1 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 60756 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 +++--
 gradlew                                       |  12 ++++++++----
 gradlew.bat                                   |   1 +
 8 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 36524
zcmZ6yQ*<R<6Rw+%ZQHh;j&0kvofX@*ZD+-{?T$OPlTNa~v&T6X|GAx`E}!{U)mv37
zTVUY_V2yOY5W>&aJ*i+pKn$=zKxk7ICNNX(G9gnUwow3iT2Ov?s|4Q$^q<F%qoQ*v
zm@>H|&1~>6K_f6Q@z)!W6o~05E1}7HS1}Bv=ef%?3Rc##Sb1)XzucCDxr#(Nfxotv
ze%V_W`66|_=BK{+dN$WOZ#V$@kI(=7e7*Y3BMEum`h#%BJi{7P9=hz5ij2k_KbUm(
zhz-iBt4RTzAPma)PhcHhjxYjxR6q^N4p+V6h&tZxbs!p4m8noJ?|i)9ATc@)IUzb~
zw2p)KDi7toTFgE%JA2d_9aWv7{xD{EzTGPb{V6+C=+O-u@I~*@9Q;(P9sE>h-v@&g
ztSnY;?gI0q;XWPTrOm!4!5|uwJYJVPNluyu5}^SCc1ns-U#GrGqZ1B#qCcJbqoMAc
zF$xB#F!(F?RcUqZtueR`*#i7DQ2CF?hhYV&goK!o`U?+H{F-15he}`xQ!)+H>0!QM
z`)D&7s@{0}iVkz$(t{mqBKP?~W4b@KcuDglktFy&<2_z)F8Q~73;QcP`+pO=<OS$B
zMqL6X57H~`N0W#7!2fpSOs3XRU5ong+e3%SOz`o3Zu^kt5%35;Yp2#AzPP=d7EZ$z
zQix&jnNDW*$`;b^xJeDHJ0L3S$djkDzf_=&Bh(lQ5ptC#|1BgGD%EA_oCo!Pk)o$)
zWHiwkW*ANvMCZ~OqxW}PY1HY;y*BpjP)q<&Sf?@#8U~3Ukd;yLExFrf{<{!}hghLM
zrE`-l+!~F{V(>L}4yjlzNuLzuvnVAO``skBd=rV%VWQTd0x6_%ddY*G(AJt06`GHq
zJVxl`G*RiYAeT=`Cf(SUN$kUEju!>SqwEd8RWUIk$|8A<eRN8)l*E=QDfzUehN27T
znrLIPA3tPRcCxORz9de&=0t04A$34Rk~Pop7AHBxPp+qgJLflrFSk#5v+cP<!ZMi@
zD-}{0313cUlt;D74yqL(N^AWlaiz!MdL{`<GcXe%*mTADGshMZe#r^3XO4O%Dmr>&
zAvW|Uo<=TWC~u}V?SNFv`Fq9OeF_VpfyXHPIIay@Pu5J6$$pg{;xE9D7CROVYV>5c
zv^IYXPo_Z4)bg5h?JSUX!K`q_u{>F%FzrG>*!Db_^7*7(F@f%<Xyoek!cME~{+b(U
zF@?inQ(h-LTvs7Z0nsZBYxc*xF*CX*JOF>i34Ps`JBAH6{s=ygSr^CVO)voP`v=SO
z7v;4cFM_D>iVl{&X*N7pe4_^YKV%`5J774`5!DC}g;D@50h?VA!;fU1?Hf%%`N8R1
zSg@hZ8%Dq^eYV1!g8;`6vCSJoK+V1<Za{*N6?fFB4R;(1f-}G3AQ8tu7{J;c*1t6U
zVRfU}YW>Q6N8ImtfE3iXs!<g{^M2wTIRUH7_2MqjA)&QQMIxBSOq%j1c^VBgj&Q<v
zgGQB;Ysq^?aJ>s~B>js)sLHB9w$r+6Q>Oh#Ig&awvm%OBLg!7alaf}9Cuf;M4%Ig9
zx4K}IQfPr&u?k8xWp!wI<a>4{CP#GTs#qR0b+G{&+=vL}I{b-Pha43^%8=K3997~*
z>A|oxYE%Vo4~DiOih`87u|{8!Ql5|9Y+(ZY2nRP+oLdGErjV&YeVKw>A$JyPPAL+C
zA36S<iejUeW3!`{nA$tuzy@hAPmeKO3OtF{DvC-w1QicuZ-QNKxt`Ix&emd>!dNVf
z;xJ)YR;^VPE1?`h-5>{~gwY2pY8R<ku;HDw#`3RQy~n5QvJ-NRBT_0-YG?JTE?dh3
ztr^LhhGtlMS6rRu2a37YUoD1>qhrsiIBmJ}n3G@Zs!!fD6y&KWPq&i8HEm*ZAx`G}
zjq2CD5U==ID^we8k?=geue4Y>_+%u3$-TzVS6QMlb4NoS%_V>;E2hQ)+1Q@v(reC5
zLeK*f%%{PNO-mtrBVl|-!WaiKAkZv-?wnOwmZ=Tv57k=4PX=C?=I4V*THRFRE8a_{
zb>5YwDf4o>>$o{XYlLN{PZ^Ff?0FJl4>A9C-q9A$$&44l122Qsc|6Fd6aTam{=JO3
zBFfFe9seUPSUeyXQc*RA>2{WoKIYVltA&@5spdIW;rzOOqoQo`CN;~UNgU{{m9^c1
zTrN|8w_7+Nws4}Z-4eS9WMpF3h<@81a)oK9njh;-TB74vR;u{vE?>6FDG7<%GVXFL
zUR9l{z*eEND6pp)+hpNT$VVM^Pw*S;#NrbCmH{dhBm?%6D|k)0C@Z9H>T|kby1^)#
zOPmJ8Hq`8waoEK(9}IfP_q4yr(s?ME+T%UV-ikxW!XFb^6w02t30j$n_VSwevg;{9
zx0OXK_uGBFej=gbG><WT7G&giXtK@zPEH4_+NqV<Z8%vd7fGvP{v}IsFGQCqvuFDx
zbZ1o$js{p7OV3vra>G^pEv^`I8&_a@t9>Nr;#r?XNKquD&Ho|`)qK6C^-7SCdo=S&
z)vUi;m5*qIePEIbL=wJ|WCBNY;zCm2F-+@N2i{I^uR9UVZm$o`I|@<&2}w)C`h)vV
zW{)yGJ3?GCZNtFe53Kb#uzrC7v-{JygKZ<lO#t^GY1xV!rfAeLwFQBWL>UiXDV5mR
z5la_vAFOvoh#yn)B`$^ZN*Dxp5Uo~_k8G9skn2)Tb>Kw#Vgxi`bti)^(z--X9F~oR
zZ6=^_x@m<XR-@#YDCW+PvaHaM-p#G6^JqU~F!U+gCv|Cfl#Rve2-P^Xc6HgI*w7k~
zi~#7+V0D~Y-0=$yhDuJw;-LLP&L|Era>DT~=h_@GGVcgBtLzssB1|Xy(xc(lUYJ#_
zgwc&ajE%^cCYW7d;xAxi{#LN*1}s>{K79MZrq!tYMpRA{T!#^tgXP=J5FvkbZ@gx~
ztq-E&c$<P2(ZTW!wt#+AMB$??A%(z%B;XHAs`4LlNEWf$8YeP}TqE}Q!69Y|Y#K0_
z5hnulsn~~d-&m4990ET~iivB?Da9ePQit&}>`|KX8GS2a_voZHf=y8C{6~f~`DpC-
zjQfrt2OGi-WGx}Y4>vM`8<4frU*!bq*NJ*Tyn0cqk=zpDdYth-PJIfz5>pLF@qnai
zzj2FEhuOa-7$JR=U!L{UWWJBA%~SW-6Nh&3;<}iQO)DvOI&VKi1L8rmICePWqoY^F
z-dC8X8~1T}=C9m&yb1kZzbKd2;29_Pm*Cs=y{Z06QZDlT7P<l!ka|EeP8+S;Ymo*8
z?e;wa{R(S&c!S!VuR8m^L9bs6MFIPI<TY!5oZa$Vxz~vUuYs}Bi(v{rvKQ^~#$eNR
z;bE9Yi>oci>1@hFa%t0<`1()UTxcQ}e`fAh6K`<5C_SG`dw$IqzwEYNKvIH3VWlhz
z_#^(T53W}jeWF#WIhj^U7AdI<mbE}4ac_du+9Cdz`W;6>B~3feC--5iUiiT4Qyu81
z;Xa^8#~M@p%6B`LCKWWTa7I+35BLP=EOa&Gp2<m%4MdfXHZ<`G*b?;J)ANiDq-wGL
zVYMK`X`_Oly;=9C*b^uLbh#TDl&XpUpwNjhr3OQ5Dg8Rpp@vT0?=RE86xpQM7WacF
z7}6XN3z0GTS8<;e>pbTWw5HOIjrx;2J(KI$$HT|w8}R-8fbp9sot&LiLs7ILlyZc8
zWbss7=*Ah|X$LEt1O|T?ABkIn-0NN`I8+ipfoBZcW>(WiaASG_khBtKM{hfkm5VBS
zy0Q`4*G6HRRa#9G)10Ik3$C3|nQbFzmU-dA`LjKQY8icnx?2OE4<k^*%nma+G`H4e
zQaf?UlMJ5hqcc}G6;AsCQ6#xw4&;7WQj3*doyeKyyM&N}+>0%z852{OJH=?mbvwr9
zhlx0RDo<cg1ZF<~q_A<_>^D;p*xKx?yT(`s7wj7BHA~rHF2yxnL<1PcU7FM57;?g^
z&CyPh9W4KvZ;T8w;AuNMn|nQ-xJ~CvVT7gAPAGi7w8udw_LOp+p4eZiI`JEC@Mq9F
z#dA2AM_<Y}U>};CnL=y0#tZALdB(P~Rz*KqGqjwec%Fy?K(PGoO0tfskWw-aGhd7$
zTi~x1G>4h5q>ek=tIoT(VBQxrq)&#`_0UHC(j*ZO%%}%C)|EzTWEpvYDqCYXLexR9
zlww1ESB+IiO}=oq)8WZj%cY_FTQcEJ`JdABa=_S;O|kLhX*|5|D>0c{12DoC?K95f
ztNxm(sTU6cWWd$tv`5X(=x?yAo)IYQ3G*2+o#|EfXko6erF;M4Pc;G0)pUDY)t`H9
z76Z8V9HqbWA@!`BelAT&ErrGTz7}%M*605PEY@3{gv+`yEhr{=EVp_tU%`b54Pn4a
zz8nN7`eNx=*`f1t#^7>7G07IEnbnn&`RWZ}4Cp8W_DFDs-5)GU`bw}uBmOQfKmi2@
z(cWWmvHFTUNInRH!0y_ZtuI9Eh@O3+64wy-_2DF~E@KF3abM`0gC%|kHi@&hP_#B$
zLN{Z?$V_;+h?%2zEC{2ITyWOup*w*K?~vpwB(DX1i6oY+F)??;nyHpzaPLIt6G$4;
z6>iAsB+&&NN0;ObWVOL+-^ZwD?nHgY>0k>0<sP{^?Mp2+@T46U{FccM>I3iA7o)f#
zN&aX$lM@r_Iu|n<SUAV}>SdPjoF{#QD9M6>|JSNPLxX^T2!jCKjS5mwNaO+SmBfOY
z;6ZdwfzhO6Vs|9u81f4e%7*mU%8K>A7QWO0;QcX7<jT_Q_h4^Du`TN@xvj?onUvjZ
zEiL_7n|a&c|DLa*0&#Yj3r$CU<Cg4_$DLE-N|_7|kkb>W@|NSUVl)_>7VEf#&N6E~
zn9Wv88@Suo9P+M_G2(f+JFf#Q^GV#7QQ`qH#$N1y{A*_t^`5H1=V^u?Ec|EF6W+6B
z(@Q8ChIUyq;+I5CmjEa1*v%d5{<?yGM|}B87s<%&dT!n&#wj+}arjX<<RlTrpEQ?#
zdHsehntqI5<w-@3txwtgC+XATvpV->WHyhcHSjQuwzQq?;^BmfV#okq3v8bp7dBdk
z54B+%D3=JWd-2w$)puXxZyZH>-$O-?tbSIlGc{em9xHN!44iaCr}6uZ^FpN7IvNh8
zbp!%4xR9np`>AOEd1e2_y}xW#v@@h3wYc?WiwL6Q>fxPQA81V^J)XtGs|Z&er6w~M
z!1Ph~85TMG>R&ixNUnevc(w>fgb%+X#Wds6Yl+wH29aE%;RuDeZz5dEt%#p&2VK1n
zKkqgl&*_YwnO%9`0<6MVP=O3<AJKCZB>{02EcR7PvvZPbL2KMuoRsU|Y%zw38<gt9
zD7Xp4!h8iKF};C<2Bebh-{pJ{+>qeOL#!YFp#_~+rtNJVl>lJSh_*B0A6n3XkE5po
z9RpE_h=pnmDJFX*n6wmsWJ9GLu2=L8y!_R;;Aa2Jl|)I}Qff&`Fy@iOhop8>Y2{F}
zbVk3rNMi$XX(q1JrgcIhC08@d5Zc>wLUL3wYm}hzS^!5d&Mec$Sp^$DUS1lD1>KAt
z|Efof3nJ4^k(WKL_t-u8ud4L(t>q#9ECj?v#W~W#2zTt>|MCh&*H8Wh1_I&^2Li&M
zq9j0`(zk~P7}dB`+15b*j%VPGr$;@4MBQ5AT>-y?0Fxfr2nC1kM2D(y7qMN+p-0yo
zOlND}ImY;a_K$HZCrD=P{byToyC7*@;Y$v6wL!c*DfeH#$QS6|3)pJe68d>R#{zNn
zB0r*Es<6^ZWeH`M)Cdoyz`@Z&Fu_^pu8*089j{gbbd!jV@s7`eI5_X5J3|poVGlq`
zDo9}G;CsjW!hgN2O9=1|GpE;RpQvrBc+&dF)L>V&>9kd6^YIL?+*WDmcQlvwnq`Lf
z&N$gF>3+E*NcJojXXI^}B(B-;@ebpVY}l#EcDWles7s;Ft+KZ@m+6FWaD^oYPBXVw
z3sq|aKIDh1x5Ff=tW$(LO|!e&G?Xvh^H!GfiA(emluL!LmD=EV@|u|8S7w6ibUePJ
z>{sOC6L27R+b&}e?VH;KvV3a;O3G=gwG}YzrkSTV6(&=;o)EV~2OD(Eh4mu@K0G)i
z3#44IZhqN6+Hb2h#3R8YwJW7LesDA9=n)75u#46_ZmSh@6Q-4oHvGxFPY8x;Q+)d@
z*-SDqhVeyPGkoD)iq;z0r*M)IhY5I>gMA@RS&EIYPq}Z{$Q4Jbfd76EVhSF-sR^TO
z!=o?>V(^bx!pG$26J~Z>Tvu&Uu+0;>m+pg(fmbu(97^(OHBH4;J8WIfv-f5}VP#VS
z$Y$}SHKdphDUHlbdIVW!k$L6T{LY)|H}MT=l$22kIl>|46FK9dt$?3Fjk2RA-~AX7
z1|Xe`n)%h~e-O_qLpoFXJ$%gmocq`v0%hRw1k_6nh|+3pvJDy}m)V|xjL&!Z6?%pU
z+m)r2*pWjEl!etAYxdzWb<DeR-tHX$b+<?(Wn%1Gh(S)MdmKB{*KLQ|o}i^=okrgi
z_9tFc+SAl*^)xH(tKi3jdpUyCn<7TfuzsN)Y1<z-uZ+*1n644&T2hhTW#l$JdUVv$
z9F2fCF$SpN?bdF2U!hqU`foD7CNC4D?_2BJVLtYJOiMdLf4g78>0{mGc;#$>rE%)b
z@Rnj78P;$lrzY!XCa0&x+8a^YF*G|Q|C}bGeczz(5m_gq08wJHIH`WqHH?A}!~_3{
zQEvMXmL<*nThl^pL58nbHgQ1n9cYmN{C8J^6AKS%?~>1DCt70Q2Vp0;E@`GF%Tzkc
zSUt&LJ=wHI6@#8<p`nK`!Ea3fOOSLhy@qP*1BsMS6*j7wD>_%=2s=j^4VBd1-h_)3
zeozYua!|{x(qk#z;tavf28rj_5Oen-cYG%;R6I}Hz$yMXeg^)_$OUUXx1r^qrl!DG
zYXkAXKBMrVM-rJwAo<5J{NW1XJhW;Nh*&`n<RXNn6IOA-+&<Z4#Jn~3w@C62#QzG#
zo&6oEY>F<mHlXE8t5UZLqPiHGRHomoh-s|VdWDiw{z6h^=(CmJV!wHN#vuwY`m=y#
z$b3KecI8NVmbWX9fLRxXl*i|Ky5oAwllK*He?k|CYlD-yF=r&qM8m%_O@_wDtIw{?
zsm!8mF2z+!7eXmoti@|4)!q|iq;(;s*+W?H6w13V0El3Hk6%BXBhgeTI5K1PqVf-q
z!+aIreh#~w{+%D~P*}=m=S@Xc@3l_@S##Yb(uRNY84PRS#?R3j5sidz{7PVr_7d6+
zw)@PW*{8JaN_`1$A;iCk%{My7B6QL|yjw&-a@mrll4H}OOf2AOc$xJ}uEDm{jyNG6
z8++BP8}RG4A22G}bSAs|=P6!XsB+#y#vUy}^iHqp)BU>V-Z;Vd({KSkMxV#cn|bXJ
z50GtvFE##sqGhV#lv2s6?^yeBShlhR%XaPIo)iXOue}jwZ;Zq#dgDn8H?74Y+$Z?C
z2Y5mCC66>dp%sVMecUzCir<?IS|{wvN9__C23%k`O7tg=(qtRE5(;!0FJVcjKh07Y
zTNRv{El!qCP?t{?82c5+1<}`8=b4=X6@2MHjbOZ^<#e&J=tQV!{?e_ok!N2LCFvBL
z`MZd0icO@hLwf|Ve+I=0+l8Yvr<Y7+s^4lTL-U<Dr+7fl8XaIdpv~*BFY?f*`zn0h
z>Wq99Ea(TDwClZxtEB~4N-2JmlH#>Z2jOcaNaw4tn?P->BBGNHxUHez7>C@TZNT5Z
zHerlG0a4~06L%>tn!~$s^L5`~{ueLZ5?`$46nHvwKxM0V9VQ(k{A40xDVw{+Qt)RV
zQ)T2Df)cp0nv!lUFt3D=i~k!V|7dUjpz?K2ZiynO)$d{2*YT$N^CQ{t=luZ>WcE!>
zg25p}If9RTho%G@PZp;5zBwv`n+e9iO=6dx1V^|4Ty%`oE=f7O&QC^s!4MJ+lMG>^
za!mgpz*^SHT+M_zm;{H#E~SaU^Kn*y)nTAF*2@t5mF+l)bte+a+goaA*zXJ4P)H|y
z{4OwbJnIPtMp4E~=64gM-Y{#o{x)+8YCg$C7Yy=;9hdyBgRFIY2_L9DL3*B@%$5#m
z8P}+)glf*}UPD$C;_yntx}9VPmSSnY9`Thd09nfoR;3`kar*FRfS)`+as*t2l*U<a
zc9nu(cBKz?7arM)zV;H_Ps3eFwrq3iA)aBYa4pp%PE9r90O+Q<Wlt_YE5AMBb)R~f
z_U$RdmLeat%P`|mW{m3)Gtjq%<5SmI0n2A$F}D5;9lBKuuI&j~;#T&_b^ap1RgNwU
zpyjOvre7@Dh4h0NO<c20sHfS=+fF>SWgmaZ!qFubr1DegTGZspy<V2nIl0@{`(9e$
zZbhb_XeLc77-5o(b$Hl-1-ZBIU}j%?oNw!?h#Og7$C}S6T-^LuM|G3}+ix`Hxr_0o
z&acW)nNFx(89Ed@)*;G@;k^!K{Qi~#6ct)SY7_5rLr*Dsi0>YMgic{inI0dSt+rJR
z((jjMrd<p)oCp*`z<7GLWwxEabV9&%vqF|9&I|WlYLCq$26pZ*9NO&d`7*c-dn@-%
z^ooh2B_QOrs*P~6G3dv|Ve5x=f;J{sC&>q^?VSZ8FCO;0NW@>O_b67gDHP%W*^O?J
z91NQ7ZFODMSvHj3cvT#6RJUF7x=-BJFQ^6<&mOd15Z&M!?b+3Tg!UcgldD9tOAt5K
z3X>MlE-a=sj;K&}sSng48jQ7sp|&u3;@e>V4Cuf(!s@9lZ0Cg^DKWmki%>$<85tOG
zU;e{%zHU~KREBUg?FbcseK{lmK-`*S1p9j_4hF=F$y)NB;HsHwuf_A0Zhy395e<C8
zA~ru0?GH;EyiSV`l6bsHzG)3nf!Y)uDm!6If-?%v=2I{5&)VdRu~Q+{8cWy<7Y0yr
zFenN1YKYr=^-OK)@2=@hmj@XF3n6UE7q|Y+2_s~zF^_f`mVEnK=Sw#OicD>U7o8^A
zi2t7Ch|KVp<w$qTr>rUn03N0T2XshT!g$HTErcQBBG=TWaHkYtaI2CJY7ajI%yr&9
zVC^zJ3WW03bjwGNx{l}#+D&Ml_uI4PQhV}qZPXOP7ffSv(<f8@E13K4YNv44sPM9$
z5}jkawJF1jsl0yFSJqAdeIPZ>O;hX{Ff1|HoA~v)V!4y{CdALyi2YPjrRVmRYilRv
z5PSkj*Z_8Fa*sCqGN?7YTnkr9=i9X`qcw7nqz#{bj?B7NiV9fWF+%~Rb1X@MuS^<Y
zhy-q4^}EzZ4_voD3N3Tn)`-CuQFG!zcw-%FKh$H`;HyF+A&ORjrsSwHx_Ckn@ReGG
zj5=ye0y%yy;deA=EHP@H;=mFaVFIQOmI&yGE;Wi{p<Yj%w+UDE2w^VOi%FChlqTvN
zYyn&S&}yKkiF}x+iGEBEnyv0tp4J}nZpT6P?`{F|u%@o!l0?JtU{mVLIwcW9Qw>Mw
zC)d#K{(-9!?xStM2K5x%x~ogWxgIK>s5r_RT1jU_lxdTtIEFWvi4eJSAiGec&HXQ(
z5t7!J1b#SL|8s4)u147PWQUq_e33<Oxbq&!>!5Z#f$Ja&az)(Htl`Z0<naj}?6F$Y
z$}4lG0(Y-w)Rs-Zdm7qNOQq3BDy@4Qh+s`$pa=!AfIcX|dbX8Kg*?%N8ZU==cr*hI
zTO3p(m<U#|cVVJ~B$&W*53$4|xVn#Qe(q8V6YG1ZCAL(<{ml&SOn@WWwP$#2p)VG0
zZWi3!_`5JRX?;;!NWvp!!`qG9aG#I<BAO%iFc|FT`=mviUxJ4t-qQoJp(_T1bS3-0
zN9pk;=L!I4$_etGN&Ool%e{d3Gt>@Ez)0d74BzNHHfH|<-8q*ZMf?%eJzoGS!0S6Y
zS<yq~kB3Tb%sqy8eGF^b<D=L9FeZP3J5X>U7y^1+;V$Je9F027>1eN#_tz+2t}Y^N
zYfi9}J!N^SU1CYoNBDbD39@84xLroY@0f%%c^(5CE+}!b5-Mt3oXe2nB<C1ScE5|!
zI`R@|JpR6pqCr<tY!>dyicgGIL+rzTTKv`}Pp%fG1f^s?sgNH8=Q}s4Z>0ZCZ8ZYF
z4og8nK%OA~zZMJX01uFtrmwhcgg*XbiMP9kfkPYFASbp7*Bk^5ZBzV)dL)JhPwDkM
zkgdHeKw)orJcj4^)a^wQC2|->G=OBzuc-SskRrrf+H-E%HQ==Ex}d*504#GbIUXIB
zcZs@Oo0i61MG}&0bu%@2N?MMJMRXyTVb8@3wF5eY3G6-1NdT~{{~YFs8f&SNebdaq
zKmP>XqCQ@iaamuvY2m%xJ~gdSLSj~DBhB`NCj_c}NbSjB{r(E`_-+6a#vx*|S>-GU
zHsw^dxxu`<ZZiBgWm(-)b;EY3EtQaf@}DPW1>e)q1HbH==rLFap?cebKumnTo=iJQ
zJD1#=o>0%Y@&jP?^)Q5bTV!pzrf=FoHq2c_59pq@my{D4AW8VU*7LVp;LF-qESV;L
zClRfyQ6CcD$sd84K@e@p_ALH%j(Pz@Em@QFyY`AG&(|!(cG8!oV#ejr`y(LolX}Iu
zL$)G)8^y4sUAY<?JUnp?V+X<+x497_8RXw4qkU3F93UWMksK4owU+_K_<{V3VkWmI
zD75M3nph6sl-syOHNB(%w-56*!?v0+?K_%d3}I{WCUcqMguAOm{GNezK*N1XY58Ds
zcxE<o0etgIY8&>CWprzVR?`#OJ%NU)9U^B!OGSj>Ly;<)<(nNh`?z*GvJ|ZBKfZ`0
z=q_yGHWPp~R+J+{{@APVwmp8`=%N!L7AT^l^oaM|JrCFu7J#@frf=z(vGq2>sQ^@u
zk=^d#gDf}ME!~9PaLfw44~rsG!)T7h8~dY^VcZQa+u<a0comw1=nN&=)$g(2zsse9
zNosK&#4<FTgb^-(s15odlHtgB_~kcWMDnIhO`~wH@saRRni~OEa5N?8JpVd;EXm+-
z)qqqblNN-i(q02>eWPGG$mWXB|H2$$0BT(QAIu|=DJXPQDNes3Q>-|Mh=I<BK=M>h
zy{WR)QmhL5rQbBYPBa+e7)8Vo;<S!ABPkUe41j@N>_aKrg`}izmN>#ATuSDu!QUFA
zsgM|Kv@W<Nnd-_)&UqvT?%DDV>(S}<tg)B`%JZub4IDFiZN?}0E(h6dt3sI+;gPRP
zF3azPXNY>Ag^6e8)9pQc@JLj_2ZIkO=8)#ARm#mU=NncWbmd-SbO;ad=y|k`shy3b
z*8o0@EJo3b$#zSgmnlT7KAp)U!qI2<ZO&1fknVbEVAufta&Oj|ev15eyGb%dk3anI
zg4jI<VAd7EVcnHNQOm>M`hiC@Gp0)pNGHYMe1$MBNE}Hd{Sv^`wI7>MzNwgVv1ZzL
zttmyv!=TKuPH$b>r7$lgP5?vho;#Ks4+zLzaz-1b{p-Fn6dWy1Agg7O2{&VQ5@s3A
zAqzC9QokRD59!@ex#k>xy61kq6h~O$lb;lB;Q|chv&wzR+N<xFV<Y81KH2%km!$hH
zoFo+vR@C3?To2+Y-myBi&h*P^bmmmc=HbrOs4u%OyLxwxW|{8D@-*rGoO}~@05~u8
zZKzIh5yoi9o;p{~MRA7;a~+AZQqdIinbC2Je=+Bh)JR1#*GZFg!&x*oK;x)(LjxY>
zgXdIo%?q1Y$TzsdCo+n$^NODN7yd}cAv+rkG|u-(wTp?zUSUxaA-<EMLrr_!i6MHE
z0wZP7ErGEp1(s0$_G*J~vCPWPfW@gkk_W^pfy$hvWRxlX55g#c5l(;A&y4`xsw!#7
zbjj3Nk26d}ceuVA^{pCcbHXaM9%PAaX~SV29RwLNh4~hlNE66<>W3dwqikdrokwz)
z68)Gn$Nwc1zB$F9`#(af|C3v;|2$bo7fU8f7h^NK6h&@xi2m`)g4mW$?l@5JEc*VV
z6d67@Fl2w6mO;MYUl2U>R996gQUX$d>$D>)TNGq*arz}f21yh^uvIM!3u$H{_CH5!
zrjt9L^&J8UqEV_lLn&}nc|Q=MDei6t=vL_>X-i8B%f5FDi)|qQ;2V-T!qOi*uqq{U
zElET<vy9xrZ6~nISR*357}=cUZ!(b1<dkD){VtGXEQD9o!#fA?H+{Ods|^zX5wB@z
zB=t5saW9~PNiZLkj$Qtc=bV>6#2cb>Z_6p_vw44&mN!;T&~ubi&p`XGepCNAfa0-T
zC84V@VN^R6%z({m=$%iXrbiggxvMiBpww~ktD&=9-JPK3kPCOGCJNQj8+l9k#!QeS
zv3h$Ej>@j<-zBW0Qr`5tNQVRfYK_$3>nWUzf&c*tCpl@aYwa%b;JNeTX10OevcxY7
zqnLgKU-X9G8~&?Dr)`*7GryqhN#;9v`D_c=_xBcD{j-cLop~pSnM?&<Ph{*jW{3zs
zXQD)SW`+zTX5$323+C&4{L$LgzyKOO4ls%ZQetqOx%_}e^jxF|hxG?=ugTSMZR0lO
zj?S^@8~(KRX!6eo`<@t9h<g!pSSe!`Q*bHebhi9@HPWFY5K*(+68GGTi4?n{z%V+X
z3pOsrLRv>7HggX6gb++ftBq$idM1|>5t+68sWf{ixREbMkZesmpjJsAFPQ#2+8Uek
z$BPbu3<xVFpK7dv7KRR3vc|h+Eou!Ce}r1G`v(%`i2Vs+e}pV;{E}3#=nV43Cy~JT
zp{ReQ5+LUy15IBpODF-?F?+=8&q1AX%kg1qa;V=5qvaMo0Q3eieFb)7s(gT}^n|6N
z<n7r|HK^#T6Xz_Cic<SpE|DzHYE0b!W|wP)Dn4k(k6duc6r<-)86l8!XD(5gXC0=o
zKtt6LHkbmHI0-=4c^1$MQs666q<sJXRT-f_%Fb#3VebX;{|Yk|pllkGRz$ruSgWXP
zLghC!4N2mEHcfTrO5&M4bxt$zDtVXT-Y_VIi>cQuNDQq+^M}&ZuSHjxUgxOjF<^%4
z*8lc$CgA<$n=DYg_DsrHB7zYM0Ro|gS8ZnUq$u3GQ+{owv9RdB$wG%d-;R+I>?i?b
z+r_mu{IL6WTYftdz?0#pbHkmQP31LvXcMK6;mAP+;q^L@q}v~TD}Ni>f7@QYcbM!T
zX5kShHv3X1U=>B!2*si9=AEJCBt~GIH7DL4^+gHj+q}tk0F_?Q-=z{JY%77nkw>$F
zG}6ROaL_)3t$jX=ZtFG{Q=LZfNjNb2LK=m9<r^Ty{qi6Q_`T^yhCZvQIHK&iB^%e_
ziBxN$_5Xz9Vv;%S8Bb%-@Bn%T5`VDRMXQZF^ibN%5HA5H%ZT>l|7iaB++N|S$vAr1
z_gf3JpIB|?dptfQ{sOZGlhyj~D;T#hjaNh0X5(o&7)87^t@@Hteh{0DOM{tCu$l#&
z&NhA&V4VR}nzZP{7i(5bGB17<7bu+RJ1}k}=ffSg%=+213Oy@Aj1vv2U>U>8tRhKM
z=*e<21)u<uh~xhWaMrQ3*#wsfNWF0?eaeFy5+Gc}+o;A3QrsU*-XBhVGxL)}N7<EX
zVSGiE+>6SSb{CC&We%#6X@duqLWGJ>O)Ls`uM98``34g11<O-!nvGOEuuT0(LVqtO
zX2s*MMM2(+2gFI*8De<gPSPFXc2J$ge*lW+%MhNqEp3<?8aH~avgxwV?cQ+LglbNd
zTgny`&Mw}<gXQ&GCCAg4nelHjG)ts=LYQm9Wyk%(`iBOLpxM%N5*j+aCvIK_DtP2R
z(9oi@i2Ml+wS=_FCY8bdLHu8tu7w}Nhxm_IAUFsJ>;D}*7>c3+^c|Os&;t}`(BWMD
zfbyr~$j%{6%DZ`kR-}s~p?0#&-5a}b?6tDqwtqY%ep0ypSRIB54G@|0J5E#LkxQk#
z_&xE=d(U}q?*Rh7L7f8A<JhY?St~8>M<fsw8LqS{(O8)T&cz#`t9*_^jXZ*jWVNn+
zmIQjRU-h4bpZw<lsa=D=->5{qdGpC<&t~9YI!%j2G@nUPoLPSiWHjCVP{JAe?cBjQ
zTqI=R{nv5c@|R)8Oi3cTL{&6%XdTgDP4CNYT}q2f5|Xf_hID#;83kd+v0RRyNKYn}
zyPahwd=4ncDORLvatBc~KzT+jiiD{tzd3d*T(f7ayS;J&I1X!xaL2~POrw2ST=Pr5
zu*c}fb@)0P6jv))kNl38C7gmnWGmlL@{PWOVYt9se*cS0w#@W=N+dY#V08ci=Zmg9
z+${f#Qfs5)hOPxC;q{(J{Kx4HF)2QMzlVtXz0-O&h2$VxtT;ROvZ13nN{IG>Asv{%
zHuDqgZ{R2(X*hkO+!HYHHWvRYrvN9fl-1?x6b)oseZY)@dQ6O>9Y#8*23~%bzN~Nf
zpHGMdS-G|%F^v3Gnlsc$s4Wl=ZEu+J6y~*Ih2tpmHfO56JXKjldm$BxDvW6ZH>JrU
zdRo<INz-S^E3^(+i+V(K#JMeB`Zmj{A(unf-ZV)15)_Wr4EXiGsBEYG1nvHZiY*if
zh|vE<rA1s5rVh^#j>}=^466lAq6!qY_@nQ}5ETUEoF;`>7b8W910_Z17!r`D?QNvC
z+WF%@IkPi43n4;0Ks`M{x*0-^GK7oCAp?pFK1`~RoMSe@jAlV8vQruCUNyQ_7wk?`
zSKe*|!4ar@VSA}!ThlIB*Qa5){pu&HS!a)-{lWL2@o1486ZK_!!}FSZ>vyUPIOX#+
z5d3~J24Op?!f!oNytub~egnkB`}h?eh!QyX6&^LbNuA#9vH#N_7IL|#6kIDhLL=be
zE<R8t7<OjI8h7Hy`g96L3Zg7FjWF}3&>g3Cwmw{A(cm{&T<O*na6u2NFOhZWHK|N8
zzF^Udi@lQ}G*3!0m|QnYjkkUa<eRpVhjl|g1Z#*jrZZhN&DA+jO#rB(hp1xg-CwW>
zPg>XIWX24$Mj_#^k2I91C@h;b$8WNVr&MLjEwgAUtSeJ2W0)6Fit}PF!K&1j=*+6g
zL{XOUrqhNyPLemIF4C&hThR8fie9^fYg$yl$m!1|YgcPlO>TB-(X{lkN~X}R=GA!Q
zou<9ZJV6*}SN_4WRsqzRGI&p$;9DxDFTlyPw6Q9rlo@E3tMN&Wo4eFs{1=RCUij$V
z`8)kmh0fhTTiEyvRl90B%q2<lV)d9-o)Ht9<Dd~o9~E}Q#6phQLR^v`8)kjHWYFm{
zdE#&UZ+7GaF%E5p%vN$_HrpW<Hhj3Tkc^zKC~)tWizjzmaKI5GVn+m-?(oa;)NghR
ziOZuPVAUkW&V6vo3<tCXFMI<A`U<2ei-Y~VhNNyC&4tP?Dp$#im0XH@@Z#D8&!82(
z!QQ4+Cnwa<tXboRU6j~tz)^OsB2J-?EwPQoRkv_r4vP~Fmt04>(Moh$jg7{NeQiy>
ze!H{zbG7<3BcK}XE&V_1kFfGA7D^ODxn*@nqlp!{LhYb47zIUlV^m+7kZh^a7L1^D
zvI?m^9PECMnnN$0hi^Ur0b-~QgEORanrv|`dd;ek$4rAgEEof3HyvuYoZ)H*;+TgO
z8CJY~4YDI^7RD7O)m&2h2<Q87rm~8bw|H%P$%uXd8^CHUHs52!jcrIg!ANi7222;r
zmZuQ%tiIgYv69fF5fT1=kWwXX<wZuQejO>K`-4e-I$1zcZ*K>Cd7~sSxEXc{d7-;f
z5Ykr56Nkie%=z4_LIA}H>c81e$%ey=2hjqzTxoO0MDe!J&PE@EmX49jQJJg?HNw;B
zHRHr)3do7CGDa3lPAZ4LAnpT)spnk8(ZiFz$|F$1m*A@!qCPug>Isp|MPI24i>jp~
z((9EQ9W#Rz)0AYT&ZWOWKBNtdNYYm2QytK$o-_|W5j7Abr&73(MG+Ar4K!Ij=nKu#
z;SNkveY?Oc!I<e!FB)q^%Sn>|Vta2{rb@c50#p_byn|_tu>Pv}6YDydl|}X#4oZW2
zvq)Y@8iG5@6c3?uu4vdLS<T0bz2Je0!Wb(B=@uU^mNRR`YI&thp(nXw*QA$-KPijm
z;LTiqJnO*K9f_I&C6c$ZVjq5_{M<L=0LMz=TFp_bA<lb5i%CFXHgq4jVRzt08RMEf
z3@F9PCt(kBjj%#%-^>Bq23P&qUSvtGcu_qgH*?KfaT)@QueLx6apA97FI7sXP=foe
zmrEu7;%Z=yTTGUsHsjR(wU54xNPI$hLFZUOwh=uhZ&rLammOQ?w*)}?Ah#%&K~OZc
zl#Owj1OCEeXt!ALV7LgJ=MVbCo}<%92WX$wCS~Ins}%5+sb*C{WoOT5*<IA)uz@eb
zLP-XZ5-w_QTRhd})@kJPq^5yQMU%(yM2C42W^7h;8W5ewayD_QMDkmJRJe?e57cd#
z?^EvB?N3*~s_#gIUTh!s{H~4Lwlcw8BCUhG8S@AIF>2%sgjya;<b-j7+AJl!1_VzD
zC*X}=DAXZZH*Y33iou^JGK7nXlgI#0aZoc9aJ&B7Oqn*XDYRQ4ScX$<LuoOjqto>~
z|A#;k?j~J9qB)Tku1BGX=MrZ}<%Z4}i$OvCHv<dr0isg_Mc;A)aZ}o>_3vtH_NZoK
zjJljjt(~Yh%aI@gFnM*e*@_*N190p^@w5?SjRMb66N_^3EZ#Yoh<8FM>Yx$+mTbp$
zjQQS7(rs2j^54CJXdkH|$1&$<b^jjZNHa;tGy#1rzLCo4m@7_zJ_d*Uhq}`k@^o?E
zWhm=)-i31piD622iVS5V+l~V#6=;GskJ#TYCYJE4bOD@dHOZ17#;_UqD1b_Tkl~@d
z=uJ`%IP>wPOGDvm^@1o1pl9~!5&B+I=U-f_M-M&r3zfp2%TH%Ib3lz-^t)+Z9E+<g
z6%ri>>W1Bt1`B}rZ$hZ3{<jzL+ML76MX46HOTpFRaR6AuBv`m#NkL(i>0n|nZKM9O
z$?_1+y}fB2$zEzE$zC#46=0E_4x7-VXY5}<+d!g2+Kg$gvU-Xm-A9DBZz+bZ*zDTx
z$Wfb93))oLQf;wKi5JBJ%$yq}m42lacy`bC9PjFg*}pCnqn@dv{k9WiwCC07;6n#e
zJ499v3YGQ^WyYY=x*s`q*;@R_ai1NKNA}<6=F8IvJArr{-YbdY#{l1K{(4l$7^7We
zo~>}l=+L8IJ`BhgR&b$J3hW!ljy5F`+4NA06g$&4oC-`oGb@e5aw-1dSDL}GOnUuy
z)z1W)8W9t(7w%OCn_~#0;^F)xic6It5)3h);vuLAKFS4b)G;Z$n-R&{b6h@yGxGo>
zT-cq0W7~n+qN10;1OS+*c>H$(G<aFTDJgrZDaGTX$mHZXfeKSU5_au$;>oKq4hGG%
zL&XJG$PDQ6K^BD#s_MsnlGPE+$W^B`&a+Z+4;`*nyKil99^E(wW?t>#V_xYWHLl2}
zIV`uiR-__g+<&m#Z*4E|wjKY1R2mCm%k2ayMSDw`Rz_<XkO4Jp9iw$j)U{W7#+T-9
z#!0H)xg9(UtCcr9i(U^Ono4I%UiIpRi0y6<+!vCGPv9^%kl1I2nubR_dn@JtGE3%K
z#cDCp*SImKht;?%sv6gX!vH72S8ovJUM6hjW|y*4u_QYipZ>KA!3P$uIbB`dl`3&A
zmT@gMT@ZpAxBys8zRtgoH+ebSaVA)maP?G1=G4x^Nw3mV0?qehWL35vMI~p$y0hGL
z6@vHf-50P~uoe6yY&*D)Ekmi06LF!Jqz9#7kMvWexYMbAn{}`{3ZBsd6$5jBCujDp
z<0N?b*1%T<-_Nxh`lKtla|FFqs7RZMtjHAwZ0Ck&s{x`#^S?36BNQN1JU^0f&TRoC
z$}c)LW7)-n$CmAg&n(96AycC4!4<n#&B)$fduH~(afa&-<1Aiv_BiNqnK}&Z0oQkp
zwvrKFy~VfD`8Nl`AUt0=V_p>_*D(~HvXyLW>HORuI0;ny$f9h{!Ud0=X0x%{l6NH$
z?lttWn}DQL521;-r~Kf$N_YPo)7H>3gI@Ivt}GnR=8W~Nn7_PE_3{sRNn`R~bs`g1
zoTh`7o4H*TRp7VBp=%>&t&Cd*Ny~@;{C)P;62d^dipuJYUV3-Dh<#a&AIxtrmX42(
zYEH-8F3|^nY-=yw(?^d!hTojNxr~A!n$Ao+2mq*kZ&>Zm+BDC*sul=~!LUtWiokIB
zxc(dNwyk&5o;>WRt)Q-Wj;fvuvJO&DLPe%mt@t!Oq^VsoIN0iTh%fh#`-{Ha?a8gf
zj^yA3`=_NEONO0Z?}YVP*dL{T<jsgAnob~Nzu;@GNAJQ9Rd@nX+$kaw$MHg^PkBR=
zf&se^(HAFh`NNg8o>}v|A&cE7$_0G=g;1s*WDQuRcq>cJ?z=8b5&i<)=3ELSW%Kff
zs=my9Q%8?aMxZeDq=RBHg*&HnIeQ_}X@oh=f#?C^HSg?1dwLn#wu(o^uANrRZD;H;
zYbOec$#wJB(u?w22{gV+zb~pv|Ag!q$N@^|6n+FV5-X=lR$jajjeRh$1tjht$URz1
zhw)(ksAr2;QBXH9T#A$6V4PsR7K)){JQb?79o6&*IwDPZknNqySIa6pwcs)~xN81I
zKc-GmzZ$i(8RaU==$Dx{tD@4nph-V*=W{Ln97*VEN^F+u0!F<%$l=K`ikIp#<^Yt}
z{rx1gk>;rVccPIo6hD=xPQ$PxVwl6Cl;YI6iLf3!aevhsyXXZovK#TOv0|*T+^ii5
z+YO`u(SO3@ybv-DG)w)E;@+ULoj_+<;mc#iW8{9<ye(3SZ;)G-=wF~DyKm6vASWTZ
zO{{K^a*@#@kx(YwebLyZSuRj8?E_%FG1ez;oAd<-5Z|HKrz?QM@kiyg^yTHzUy{tp
zF5XT;g!_*Qazk8=8NE;}L%7S-S;q4!m^lhZ4k`EYesEnQjft(kNupJ_b=pj?v(it|
zcc_G<c@j8RZ3Z?kBwajzh1>Y!99vE`HdAK=Utac&Eq1uy!TLgOS-C1E90Am)B{Tiw
z$>$Er{s{snLEaO5@u&zqxE@v;p6D&?u@40t{#VNA&7SZael};kGEwnHgD4V5RNM@g
z(EL~B=A8&?pPPW-fTja0Oi6SVtI_(3ME!qWLg-uK2afWhBn(C2PAmUyu^2h?Y402i
z9P03g5$1#etGdUUo?#skjQ|$*()ybRGMXM`-2?jjThnTcPV==7sg$k{GxYdF+S*zz
z%d<d0#}l#z%*B))^3X;zIHWqQ8SVAp<}TGArkj|P$tP4REGB!_Bp_FaJ%zs~iK!`q
ze{Xu9=0m>tBo(R9!7SW6Utq|wFpsKMSAH-x{WB|Cz62A8!p8!kHz1tM=9I=M&xqQG
zz17xBW7t?Q?C%@4YC`p*za(>hOrK&ELyDQu{5ACOg9noZS1SGh{-FcLy_W;nf$N`N
zGYxdIzy7mL3K@Kw65DmvPH0<Zl*R94v5zrUWwl03TdFkdFjL|nibA6)q$y=5&2UJB
zTRM;5Tu}8iY79WP-2q{O81+!ho2Txe6{6e`GhHlIj$KCkPf-zmfBv~59rE9ZpxB^q
zV<p<&{{dt8@k0dq@d$n)GfrqcvH8{i3;uWVLRTW1$Jr(Wps11*52rX6Ta}fn#sFeW
zsN;+2m*q4Sr`KWwOUc^I%9<xg^sE><z<Ju(e@NF`Djg>@&;T{y&jP^AsaYENi}q|A
z3}l}5V?z_VvpHf%CkpN@IK`czOuLPY=yBUf8Q3b9$X|kEiYROV$`T8T7ZjFPvKhbK
zDYxzz99JRNzsx0f1Y>IrIQq9o+W(TsB(ZtN@4*)DMGr3?4~Jt|37IBI|7oQknQI3X
zAWs`45xiCHga9;8+<O=u_fH>W{|!Yy>tic?%SNq=3EX@z2Mk!P0dKG0NCHNz0*F-a
z`7K?6d*D4ri*=>wyQyQt{_t=t95*gB1|tdTg45fR{KmKD|3ZuM$QlkX{-tUkq@3Qd
z-6X|jEyZa@tuxB}qrdlJdc0{8``%3M$xl8$9pUzkFa$Ww{Jocp9>;5~oNC8o`3GK&
zy7_X8YoQDCO1TU_a%#Q+rC?Rr`r)W8CdpEe=>uMYDx6^46V_1DthgX`6CnF*E+%bY
z=GYih(DizXEVFDuQ<JCx?PN>RPQY&dc2p;Pwo7L{I2r3;QV8IEPg1McP{PchEUDf}
zbtSAoBMPt?&Q@{fG_3a7gzHl58O7e(h_F6^rKgU=a&(^WpgH3U%`tpj3CMVRA-uol
z(hA)(VF{4@`k@PREUQJ_8w6CcMW4Pm06{fw^*>aMH%#ik6lD{{j~nT}Vw=wZ(;Ct&
zi1nt}RmOGrVHP++5;Z@eE*lkdw~?>AJL_Yg!~p*adS_s1`_o<Um5gSP?T~>T1B26S
zt&1-4twO45pMl<5B9T;SLH9Q?E>dBXcy@5k-{YQ5K!A`=YMYMlLOYc(+LdC<@@UIZ
zxq%vI<;6P)=W4nRb7nxQ9KGzXsOjWs_3V-2*V+r}?dAZA7{7f*>^PxEw|6+WS0wAs
zen2zj2cFKIr`~Ai<sHnmXQ=l#&EhF_$&1z$T*;zE9;?F~V#|Y69&3bZ#mvD7O-oFl
z+Iu>`YU|OR4%DQw8uM=|g2B{;1Ho`mx@??e)rX!p$MSlA70pKVcvZ@|fYLpEV~s7G
z>#?88yv{ekJpeJL<-?FY7wf10XpS{B4}jy{uc)7esm&J1)ZYt5LI_{)0BkN8Nc}ep
zg%SYD0Cub3?KXLY*-dYn<aCFGIZ3oQ_yW5YfHIm$s?p-IJ4C0SY9D*8*Y4b&XU9a<
zU1!(PbZz1rCOe*H*Kqi$)vnpn8-DHKLOAyVXV+lvn@0!7w{b)M^=#K~MRJnk1wNVb
zsMrFntB3^K(~V&j@ZY92He`yi4I@C-b6EoYo3fc~RKp8eWvHYImrxo#QHMB;oE<{M
z%39tlGnBG4CW?())O<2+tn|D*=R4{R$!)mU&Ddp2wd*$F;+$X;9BW26CaW`{bI+5g
z1n~WJL=pJ-Rv*Y83>trghE|}%?RY5i3yVcPFlheiJUMLIr=Xp=<jaCVZxQfts*~Ar
z7Zz5d(`Rwe73K}cMNg0Jgl34iPq(vF-oW5zT0F7<5SLJyWx+l|n}+Xv_Y!5kVw#kq
z=d`&b^&VIkUE(eS4h@^<OEGw+^0d*YhA*n*s)g7LafzU?r^18b&?JfR!)uuL;!l0h
z4+o_RVUjb7(QX<Xb94n*^Z=ehg-(PgN^F!gqGGFC&>U-^siywr8MF^JAEw<pKKeu~
z8)q?!JDMUq59ye58$^+fny3CrjH;~E`V>l2uQ$VIfuDFPisd}4W2ZxY$C`2`tBTA~
zG2P62@*~(9gYmO6#Ya<1TG#3rQd0BwVyNP@Ayt7B(h%z<@N>Iz;|2VkT8T3`anW@3
z03^F>TCLS9Y*sY)#=BX5!LYD9Z;z4QSOL2^Zw~0e;OutRfp)Xu83Yz~srLh8rR}fp
z=#yHH{&=!mHgDg!b;9K@Ux9<Ms)l6QTJ87$oxA$knnKiY5(eqb)@iCc?X6$@C_7+f
zmtQ&Ot^iFkZx+KP%K%)iR{{_Mx>9VmQ*K2Xn%gV6YWHHw(<_uA&($p}$2U2TIs7y+
zM7X5Yk#^wpDE4kQZmN3<X_YMKH6pw6hh0+aBHJXg{JzNS;Qq2Fy^B|@$OpyIviIpy
zf4#Rju6G3m9!AEWA|DqF3FYR|>&VC<TG{HJ4FUx!M2Q58+W<nUh{I*84tz?H%3DxQ
zs1>{!nno7wD2`bEeAwS;W6>$oUt#~E57Imre?b54{c$`tHdB6GMC`IZWLL(%j20Bh
zW@}9_@4EsYT$u1Q3ZPWkvYxUX{6AcsV{;{1w60^@wv!dJW7}rOw!LE8wrwXJr(>&Q
z+xFe(e7mP=RLy@dYSfEoS{pC8K<Uu1vz+scTso%QUQrRu;@TSRAVGOF0-?>XH4kGf
zd``z`=z(*mSdLiXj&Y{>&akI{IMzo@tD>a^<(r*Ssf6Nz;ZsaLra9mcD`MN8$2`!w
zj#+BZCrV}b_c=qEqt7{oF$>wI5*0B0kP{DNQ5_-V9dZ<9u;vm!(L2I_#p*nprX%tU
z!{;Gb7IuVBg7pdB2!{X!ZgHqp5+?drImJ(UE6~P2|C?+`E<DC-F0~Vdfh3v4NM%jF
za?=DNX3I;7iWJU)=~%<06lh>9th5QSv!}?=L}=tvcFMQuyE`=pek1zbRx<g`Q<pRK
zx&9}H$bFQtec60I6|uSVy`cHK!f_KOk9TstY`XN_be~*qS<C``!FB<@h2)VhI&)zx
zMx&wQXQngZPQqj2J;cIr>BAFdgqqB#0~EkA_CpTe0`e$i(eyMD!C!D0SjSaixQMIl
zQ>-Dj?K($9qMGwhRqIt28n$`*FH_6v*JjZRnI<rr9n;liv$!)vElvyi9=5ABdM}$*
zV;4_F>Mxz-qVe_KzSGY5Ph0$(^e$r-hLD4T4m@eV#69bG7_fQ>o`!yu97p=$)>fb;
z&!>)wS*Fj!ag#iKWRWiC735;`@XxXFT)nniSe~^1r0v?bQ6_Fokmx~(-O5D{7$d>R
z#Us$PxL8^}t1rpnJ@#E}+O?`@a4wB;n{#!lX6WlOwo}C3TgP%?N=BT*FrxR=JR(g$
zJn3EhTI~xj_mVxhFImqt22JE`CI;B~Pb~*cFE>{uL*2mnfeKb_aYO6sDC{Kh<R~k0
z*Uoct8q2)=I_<5>p%ba`v>+M4WqY2KK4@w{=P~Tzx42!1yHniJT#~*CHF5|TVC_n_
z&;r3b9d!f0;<hgU&xKMbnC#a^K(97JB*x7U9TyUu!Fk;5sWsZ}M`W<n!T{#QpJ^c%
zOgoCy{d0X>?+iQ8rT1N>MM-D(HQrU-WWU9=w|>nbeG#luD0;ayPj`4=&7Ik$Z{Z3~
z!oob~d$cMHx9;vjAfJ{<vRpDShy<?hDrBBOJ@YV5ZWXaOGtJSz<sGS2-mS=W4_G)T
zA1#J{1#aNe(0D1a?q}q2V*txd1Y6&-PU>XC6R<X1rZS3XQ!pRuP76hZ9}}94mDjuC
zxY-^T>@pzkLW4q1ak{?IimWUVBKithq`vKQD14&60gGKCCale{X}Ft0By269l*P6r
zuTm0E33lN!&zezRh=5l@mQP_RAR5sr^}&4j;(eFAj2@K*7>|(4IdGb4yB%g88|TKZ
z^M@nOtS|f?{!z}s#}S=w{R0`LbVP{k5xhlw?;F>N1tIByWsnp`Bg)hb4sZR>Y12=3
z!#Anh?EEZFm==f$1I@Zw1Y6-%6aE;!l&t#!4vB-%4AfB{X;!sT(jBKx*-5qZn|89Z
zK%Is6JLf#w>eauBET9VUE&>aD*^+~!ilaiM?p&mM&kqY3D1*5QUGBbUOI)=eY1dMv
zJ=ybPA_VaWPE1+MDhiYq4$DfAeVIv!IP-*#v<L<d)(}RtEbU2zUd&$$>53?V-c^a)
zG6p$+O#_1{V`nNcS`{^%iBn8Oi4fO$#Q7x-$tp2dRs-etYmui-mt@P{hh?ldJJP!?
z`!i88d>h`9rIRd6=^pZVuo5}3zUbAX>~uzA4C%servKlplCW0(Ta+B&Eey1CQ5DDV
zf2Mk*YRAVjE>){hi_9poOCsx=BU4gQV)kovP|^v!npW_>^LFUzY<xt1!zGkgHYX4~
zLjVTgLMx3Se}f9XM($nO{gYl$h{|<+$=N!|;XmQAcoFdaUYrF{C^p@tktk-*;hYQi
zNcE<Qdb#aO5@5b1ox#Hy>Hx;MKo!BEj7Xy9Xg-A6>kWs*$)aMAWh^<Z3nACxNbQ;&
zU7-_dy6Ksm-mlhLv(7Rrx%N8OT}CDWT=4TM)JoE`UAYK0FiV}l@|p=I1!tKv&LiZQ
zSVG|KrCA>_0Fnx;eR|2;L0ZjLl*+F1Moh4?D&8h6H6jJQ+OxgwJV51#)zSmqvRnQ5
zz~62JXPCCiwK9W;yo9-%7Xka%OtQeVDK5SGr51}$q@i)OE>BHgfOFiV%SZ5E(VC*q
zYujoHFnnF^qs^WhZG}uBRIs<YvwsNlAb+${F@Uz)*vHtaMQDdr2dZK4xo;O4dzM1=
z?o9Pz%3<ix1-LO@?ZD&A`>4{4xGP&Tbtr=RJ?=4<NBYXYETOoB%>?;IaVA9Yzp!}H
z9QDT#<IFZqPi<yDRi>L{7Y?)r=m^uc<Z};P%sitHIIo$9HxO}=EH*qLk6eT}xFJ^5
zTBydPDR7&9>WOjUuJh*FSmqL?!<1x{iOcP?l7BCorp91#(gUNGIQf@1)d1lXx(RAI
zhm*TFNYgXZn_A}FPfh;WMHE%oCs8d+1emobQCt@YTjxcWoK81LeXY~+9)^+UOmeCk
z)#LMg9G1`jWr;WZrrR$Gwve9&X+lKpB~*OkxAEnRpO&^BwsOm&TDeQBlvTv^nuju5
zyB8jH2{_Xtz=1n}8hD4nhhZvyxynbGz%2iKM-8|$N`wX8O-Toi=&@x087+joKHd4@
zsx+@?mPB(R?mMWCIeejm^dhs63ARzdm}jsA(O)QqT|m}QRWm-(Hzh#M1)wVV%1iJL
zg(a=;b~-ZkGDk#mk1~G*z!7zGrRGL-8}=VILi|%;0knSAjJX1jZXYa@^cU6K|NAIP
zkrpm_?r8?!`$D^>c>@hwX{b1l4f&cY;wwU&Q2vPM9oGB`Uj2&haf>bY84LFfn>4P}
zUwt~VVTwui2<Q<-BhPj!kx~g+!mBJh`+;dWVRn18{rLuu59TJYW@eU#A|25*w}iL-
zFL~9DDvDSxgI8wVAcQB(Ss}vMFm)hLb3<CSiL-8n!T2>oj$uGt#`OH>|MYjm8`R#n
z{<Dz-XhA?oL6Qqk$$`^4u)hCeA@@x=J5X_v;*u~&Fw@CC!;l$*DWjpmm=4H+L8<jn
zaE<qyQq61{In~13t5+|t)YdI8tdv@sfk})o7PZ#yFUaeDJol|WYwvu&8`!-Io@}ot
zu`Im2f3$v1b)NX1@Sbd>C%^u?$@fW&NV}iCuMF`&DU3gT0TNA(vM@&mV$M7yWD^p3
zN996Z8he29k4NFCg+9PbnZ$<&>5-W0fbtK7!ePTkfP37tvtUFQiW$|1%XoEZO`#0Q
z2^XjxY40!DruxCn-p%m|j1RfInIaROco}Cf&3zhkkBHj&Rt=WZ_VkNJdliOb-H{>p
z4n>c+XW~q#1M6<*boFS%=vdUE3ndU*iM+EFUvAM1=)%}A49e~^iF9Tr^(nqF(J^n~
z49*I<-WXCZ`1EG0hYOd%nsoM{LT8_q$a&QSBz;#S3YCwj?)0mjn_saa@O3c^sMqwF
z!ZcWHQHCT~S|SVe5eVTt=z64&T=<uU03rd5so+F-z+?MVAGPh8dn{0XMaz~|(XSr$
zBRisZ%KZ9!NVwlLLL2IRQfB&v=@{F4dji**>nI)wG<+4e2@}Gp9#uWEM+p-{L1PUC
zM9N-bN73qWRRpT*YCLuK_D+uRgFcwsV<oL&LlP~tC1b`CF;?F?CPMMyQ>}^odrD$A
zI~cJDK#5qb8UPL(A_=P(=)Z0U`Aq`WLGuPhE^-isi?g-0`OZ?4kK^MyAsY+mxqt5G
z-B14#h=^(sGv*CF8}cd}Xwl*_z1KEt!uP`_(wPBT8=FmK<+VOOk}fZ4Gj*{W-MSmu
zygps+?d@%?tx#Fn|0(KF86C^QEgcz^1&!sUz|u||p8_`<HX*ZNwU)|i7ky0^l7?O@
z{#QpBdbUo{!~x-fTWPz*Q^PAmwHsvIR-dBxzY(alcFEa>(gR(h#GELI8FrjSjfNCc
zYJ9BHx955<zBzf0E>5<@$3ttNMYtIMa?NQe?V&_luijx2?!gBJ8tg}l4R@z5x73q4
zfZVtX0lZOzVV%@yTg!w5oMcYuMfGrD!RFwqChHhY`G22|vNLn!6a7VRi4gD!@Ae2K
zT6A|%SwkYp{k$!ki4db&5nZ!Hg{8dj)h57Z<$r$9=s?;uzmx54DcKt)m0_ow(XjO@
z{}vbrW9)Fk2;8-9>tkzX!IEOW<s-*k1*RYO5mtqxllVeNq&YvwQedj(Uwq5ydR(tr
zJ!U>7lMb$gf~wwZgu2{whBB$YvW7BQSPQZQDy~)5Wh@8*<tTDsMqo8i+x#A9|MtUL
zOE-8O<*O>P!VrB-YNi~zFb27ia7U<dH3t2Sxu8Lpvi>toAd`4C|JS~iU%&Qw1UMjN
zC(CRqwMFj@{DT5Q%Z!g{R<sk5Indzeq5P~3;qtI8U?OI_@930dZnMT-WW*l=ewTr&
z&t|!n3g^^IF2GDuCA8fpfr2y^-i<I|8i>pCq?C<H#2(IS&-$KBvK_FL$v`Ea*g+D=
z0IMHRzn*E^UdSDWdSVDiz#5U41l&dvdw0hz%iU9*0-q&i^S6@epXuO1<0|wLB_4G*
zV9t@TTC+p6u%~13>pzVQqdKjxHQ1xa=u_EKr1ec5)TH;7hvWIn?hs@&K~48_$RK3+
zdu{2({Eh&7HD%B{)|+9CYaV^V1<$`JDFoj0UB!kwzCp*vlO(9kJe-Iv4aj7J^fJER
zTEQS`H@RGhfs9w?M)S`;LliZ`Qvu3g2?r)nr?wT^cRJy(wBCr0MDqtRFHm$E%-!6g
zMLRw$2+YPDN~0`{Vm}H&to@Nr&fF{~L0>m}Ghn>Vj81s`EIQnE@l@Jse`#}N0!!DL
zkzs?x4I;fLH-LS+=E9Vl88}Td=@l&5&xyb1KaYf^1>c=cC+$#bcr7(`-gQsjD7Tws
zxszZy^8Sv(2%nbY|4UVV<}>Y_l1lTjr<eN(R&0M>Ky;Y5${ej*V%OT0+D~Ec3-9;X
zs?8%af6+X@s}jQO+NREG?W&1rhl(x1!Yfpt@?JLkH~UV_9l*DG6qvuakx_O+bAq=s
z({A;t{jPMtJAA3|O@KE~J3M!)@g5`5KHrMBrNC_Vh4B|&pimlm=+i4!K-R<3m20bD
zzS$K<fWtJ4oP(U~1<u9V7kejmlcJ!J9p^nS>i+QfH%hnUo)1S~{GWomug`!{WD(v+
zuvqIy(f7nr<hvoMAK*B_5)E7Be12wS0vsEg>v3AgZ=8rf6?es-84@=OK6qbY0wJ-G
zL(2<H9N%cfbFY)1n6ZE8!p7cUWAhKo*}w6K)n2V)^Y`j)J{fkh*fXWVb1Mr>?kPhb
zZ{|(D3#69jUn8s@S7FY>F%&HMCc-%c24`6k2Tkw<XB}g(LxAolK#?kmLxq^EQBP(H
zlP(HrT%jK!cGk<)S8)NluymBrZ&1QtXY~)+E4kmSjSq;2^LtvIyI0wNMKf9I?%G36
z{B#kR;4ul%n>B}T>7a66k$Rk>2x3dp&D-EP;6vCr%iE>GKFx;(izH3Le$SQsp0A%5
zm-Se9<@jb?{00JSx_;^KuDtmei!?oLZDoJ59(**b_6Y`2ZP$kvK4#2^Lk;B5oCirY
zRlPg?{iEPr_J_ES2=O`sJ_qloEFsXBDQ+Z4sZubH45vc)72Y|~@)oVTzXL$U?w#*n
zclYx8f%j*|f#eOo&_;}Am3`vA@XpB}-9L>H4kiQkO%r&~{%W@YWSeD_%B5+F67d*j
z?Utu*W~cd#8x`Co76I~a0hZ}GzEOX;;hDT#z2m$G4zcHYIefxJIe3HizO!1pDziPE
z*|lfM&rHZW`dhSY#7rpieqo!w>m&7!e)<F*&tbU3kACh&oW+kwN|2E(-ay+D-`4?$
zj@?hUY=CBoc)ZbCXQk};9piPJgQdWtyKb^Nv$u+MJ8bl6gLQG^tX2XA(G;ng(JFnS
zsiyue25M?R%raxl+a%WL`4R94S2cF$AfJr)NXom`Mz!~JT=i&}@^nSX39cCqv_!F9
z*9hzao083$e<5kl#^MjfN{BsD)#Mh88C8oT6wupT!E(|$_qx#1H2#SoH?ukS?=$~f
zS6Bc{uw0o%y4lKhjYR_;@iHj*mxweLme7-SRT8%~b7{c>!(++5So5!vv0pL0Wxlkw
z;_!rN(U<NN%T}EO7ZTtCby<}Ss-VpqUSkobS(<6`0>5yR9=>CNO_J%S#)QEl@X^i<
z$-v~-byW{BRXav4GT1VHt3jrFK9-@DZunt&iHnR->YIe?0!h%8oHlN&$VawG{+?<<
zoY3lysffn`42Anr(od87p_%kBvtEl~1Jq51oU>0Cs?E%&n0t{t#)ExsgW$H{YuO*?
z(`4X_deFhMU*%36&*Y&?o78sAOZl$&98gl@b9zEa>Ul`Eht&~4&@b1AzPD7{!Ati$
zwXVr7)>u0Sv&p#{<w^OJuXE-Z2v0}GfMX-?!3^`DhfE@+{3h8!XD_X>4{|Qcx56H>
zF?_X1-NV9Zi{jD!EQY!op(nLS=XU(DmJtXhf;wDL&4dvd`O>zAaBzN(?%law3sn1p
z_#_Z!M+Gw0@Qk>REY&5+l&ECBG20Y4{6#618u0a_FxP38r-^@-!(PFvJl*UdjdBDn
z11S4BYW3AgDE#Gc`TX_x<1XiTCE<BmxCTKiU1eWAQd5ICIF~t*)bBm{&>R)+z?$_X
z7n&6Ev$hKOggBsrg&CpBUpqPE1~%I*WKQW)@&B^`ZW5)SBHYAX27S#;6vo)8c5BcH
z!iREPvmG%-xk%IahqAZVSke7KH%Rm!>V_tpH`>bSS4Y|tT-m!g!=Ni9VbK>Rx}WE8
z1ss1w(!|#dy?b|&w)Q0+&&lInD4O`WjJ{*tN3GHw8{8SD?rdB!ZRgxa1F<=81)1({
z2JvQ<rlLW*!>>m?i8VI<$}9MmtE)MyKN(H%%Ec)=3jmP)K#QS&7qL0o;%>!jhlVO3
z&jsJtdo5DnGgt&A^6{Y8a8ne9+lmC2B)oq7mWC?KoKbd`r)Uj|vMQx$o%)qPrk?b_
zW1Nh}Mw*Y_&L<adhzt~44<sD8E@N?iiA!40NF;fJIbv(oBqWXBb>N|blw(R<QP%bg
zfy+cw3mIoG)4c8D6Uu4@d4$2_wVVvR)1*V*S13R1RJ+$wq^m6oZOP(P0e72QPXY>7
zFqMcuihIjBcSQDyLEoxd@%w52JEp%6<HNtG?r(a&9^5`yvjLKwNFJ)6!iMG%lsh}q
zJ*Kp(NEP$(5E6|QULuCK2LAX*^G|~IQPn!lsUYY>+H?S#HPt_I1T@F@jW@935OmoG
zE^SH~5V5=!n&E+yvOEFgM<8j%Fift}(j53d3V%<U*1dI_o?@m~Yy#-_9gZ-I4{Iy<
z#1`qRkmqCI@_`R1(>1r9NT`}I%2p0$%QVx!#G2{NyO0x+|GF&XFcta601En$nx7I1
zQqAX}hG!*o<m}YsuUa5D(Nt>ND@sdrvXZQ=WU5MOE7QtKbgX45%?B?waqj`sNjDd-
zUTH|{!iKvo{j~L-X=^?Us9D+2O!SG>$w%in^7zGGy+BMpnFr)#L4Zc0>7HJeEGS(u
z(RiPD!>0L<(^-m_3%r!)MMdobk+T+6rOX^H>@PRjP^E3Fvx;U$0pz%a=(m-W6LZ}U
zX2QnW7lPQm!-pgsRh$Rxq+tS|LfE_T9hZ*a3%%5EE8!rlmCi9s<r^HpHRN8CGTqH>
zC%T&Q39zQ(krY&I&{y3pYWA%5nHIL{j;9dmcaU{*@}l1i1fbF-HD&(6I+spEHr?l5
z6XUR+=CRY)I%wupKQI4<MBgzZjq-HLr@}EN?ZsO&W?`bZ6q4=X<$@kg2L7nM;lCA|
z%aH>-`6@A*Z2p<?v5E`9rH2!?cc(Ngg_Nw=2FfoBEVHl)3Rfe=?1a~zZ7;)G-*(0&
zp1V+<UY?t@)cz7aAt<>1C5}Q+EOD4Yb@LB`10Ghl=YqM}RO`lWgijdXcY?-_PlpTe
z5*pPp$8~kOI0r-}EJwDCeZBX!`~Vja_Xl`%VEZe$l0N#Q`pQFV5Kk9_nkJD}iNtEl
z0C^Kr-ATPgZ(oeg!%ExcVXg|I_d=BoM=ZHAT`5PDZJr04Ur3RdN~zCSJui+P?cOm?
zZ_4uvSbO6q9^3ohA?X&NT{--uRs)j1^n_QP0Q$3&rxFIzTz7O`nX?jRXhg1DeB#5)
z(GfV1DF?0?JQ|Qk@MriD8NQBaWe&#2Kv2Q%Q{4hBkh-u_vne>zF%J~@`u;J25*=?$
zdhu8F1#*^Vel)g8@`n!4w}b9O5M<kYHz$6-_&#Jr%sUnD-0c8h6f=(k<N=9#g;J!5
z9UP(NseI_R%BfxGc4DSW#9E{ju_TRL=m^?H%YqYg{o$}EDN%TgcDAWQqlk?J5aWG-
z8%@oL5#obbi8)5}Z+vkgYJAnJUwy6vV|bo8QZ-R=o550_`{-O?zQU*N;B4pX8D44s
zKpV^X*^_-8K`B7etl(q5#?|5|uN$N@TOl-i(;>Z9mGr6l(IoOWq9%{A1u0kLk75}<
z&VTouJCQe<1WILdAsGA2MManwFz@+UBd8q0t~Z?>7i9wlMSc4rIngyRBL7^uYc7hA
zBHUFVhg$Uoyx@ss=>vt^E5y7o;$7KRvv{t|CpAnB&qk`W5$c_mfC9N(b79uh8{1b@
z`%f{Lmb-*Z{$${zz}Myib@*kI7yMEizc6;Irq>h1)$KEnLBTf!E}{B15VVoV)p+aT
z76}rh#zlkeIT-ez_6b@mR`!5_WT}T{kciOQ8yX_<@OT6_Pm<rl$)Vnwn}StcwD@;O
z@4expd<CM>xrmJyWnWqxT>-Aho3b*pIl1(z(06k|pbILiK8h1e<%dkjsXB~8Vf{m4
z;ClZn{kzSkl4$w-j^Qx`(3BIce`g>_bgmJy8*cgJ=8Ty6LZs*o(tJ?TUi$1Et5WlE
zPm1hE>IZ@-G>o3sf#8sEAr@8W4+aYgQTPkDDhUV$hNQpvpEmwC*qRWQY}4A92_0DZ
zmPs>)&dZ8l5)X-zicS159QB<YjKb!vN5as14tK${#7$Z4>4{Zwz=3=NVHv+vF*NB9
z1yz|ms<R!0O|!?@rnj7MiYMU-4<$FjBB<(%!DEMnc7}Y~MxQKRit6s<nzr$yJX_)C
zGKj=Uzj3o%)jB5WT773fE9<Lg1C1IP$$`-rq5A%O+|$r*NbfBH%>vE4PVio9vx4?D
z{ZQdbB!aR@<gzRfAbplWxT}MqKf$vny7D8I%-Du2D4JZCcGu9#Uv{Z)riH<Wgv}py
z>k>T3)149tjYac!k9CIDV$2WZDZLI0o-b<iYva`K=<f|qTR<NfS*e&+*d|&BbMds(
zyaVMP-#anSHxnHODJ0L{;A^<7>>X4G9HSuePIX}6fDMrw_{k4w^WTJKctikHje-7u
zn7gF^^f9vkrII_IBPZA9zyVn%O~I^a3h^!RY1?E;v_(46kl<lQEMeF|MGC~Jx`)h@
z)-&DQ(}egd+N^aQE>c%M2I=TV%+aGbx1n_|{GwNit$QzspH)ZRKc+9Ky0a-Mj~~W;
z9=1QW{@mQWZ0CL4h$4e)g#u@U;Tecj_<Ay+v%}eu<6<;SDF_l#2Z0SC#jK{Lo=!1;
z>=E}U`TnGM7>o{0dU4MT*|8>hhQ`?UB!zFB>>~9<{V@O>aC9U~Une<n8Q>3IWIR5R
z_5_;sDvxI0ns0l_QeF?}X5QNM`1(*9drDI7dr~8llWtCKyo`HdZv%?+Yo+%2`Fb=5
zKSVr%FvKu>!KA)Y5<ql;DQIFND{2Z~wNaf-rsQzq<Xb0LYD!;`g7*k(29BBx>&sPD
zuJbS|=5`k){vruC`iTofuv9tp)kTGFd-$o@dfQ&XgVVImF;1#Xx#`I3vul#F$qWYb
z%<w0%QH@LmL+x@i>LOU(SbQDVH4RnT>9}Wa7hO`?yKvd%M<7B)^-9gvI0d9NpIMkS
zRT00KAyowFDZ=SlDLo`s`r?978R0T>hJCU9`HXoWFBuyu7Ifhz-OU9hFUQuonGfWr
zokmWPK)otgYn@!v?`Dtcubl8K1%*k2<rS~ojmPG6Fqv?xBu`QKat<8>j$mrp>~SkW
z=^_So$+T1|P2fC#QyVCNlVUHq?y@pBngYPoosbeTuE5F>N&Y)$kL=WDpkyH~cO!1J
zMU8RHS*10ceS^H7l>?Ax-ySAEq;fFak>8M}foyYCs-;Rmzg$T;k1$Bi^ZQD=+=cv~
zbPGjC8@KD2%G>R7`kXxj(wO;v?YYy^+8h$cQIphb3NS<!jfljCT3%6>8{p_AkYO+3
z@r-QEvcg|3shClf+$g=3b_M|nrQ|lu+E$yX&=MQ;_k3cF{6!0wx6Dg;;-oBc9EN>k
zD#NH0R)&||qCZOZwIv9erOFWBUabK&8^iW^&#Oat0LxZ=F3cTrBau=&v<f4}D7}AB
zCBlCC6eywBj2Uwf6BO>4cK^>5k@gj#zWtyXj%YL_X!h>bYx@JNuVPpBwJE56w;HXl
zZ1;k@d>8+<EJPB+7e1cum6M9XS8~APjz3UHRi>2?a%T+rZv`KSlm|ckXJH62?JJAR
z7ldHyEgPiZ7!yX$7!&3vTs-Y7hkx;Id(DrB6cEMyABU(*M((X7YWt-L#i`S$!5}fl
zC#oXNEBbfMF4HSLYC0$tY1Q-u&Ykz7^Eumbt#?%(T*Y>yC7L`~p}oAkt~tH*7e4Q&
z$EWB(at2C8c9em~sOw`1CvA#}IOF9Z2~%FBmb4G8IYeC!Dm&P!zH#Jna-NO;Qd{(7
zATVoYNg}*h`Jn02H$^WRu1L+psWjwYMr~!BZZ{afjMr|Rh^JQYjck*m8ZE0?)~vqw
zSAykMDOKwNT}~IGR-3e435!bEmBPlvKn{**+>sru9y;ynv+RdQX`cNo_%uiQyM~gY
zkNXTcZ~J38fc(I+Tg@T>ta#K|CyTKv73iu?Y3>J!+07C?lcTyZWvw|?(w33jJN{5-
zynWxvFsqw231<32Aj^xVe<U#72G10sf0!xyZDrlme}19;P^N9e7&iRL`U^&y)&Mu;
z1o9|B1Quzuvrvf@J5^cG?YFeA=2fFxS1kDma)?=}LvfF8bv{SIk;|qPB^skvG_XIn
z+t3`$<F#mz20bh_gVhc(yUppj%<T}oX^+g$p3boF_3&hw5|thbiJDZbRq?5BqbS`>
zS{qBm^{P2re~|C%4rPHF|F>PqE#D4Gqy(PQqW(YSb36aV+<T}R6L35Wlm74ft8P7y
z$9L&HpNd^+E<%Hg^|Wlpfi#if-$0qkNqS2oNc`^`ix&DQf`7tIOAwe^M{3Dgb{KDQ
zw{<y;b{XwTiho>ngr7;Z^rsa`1CFOVGl|5m<s8U7$}AFj7rP_<$=^?bym^Y7gpaMn
zm<g7BZANc2Vnb2NYV7QBgR3ad@q;@kNHJt{C`fT+Ys^q*phY$P@RkT@f<UQ7c&nOH
z{-gi}SI}#0n<8jPLD<un$Ja0vLw-yS3)FKPPZUh;DIWMv2ZYpZnen13b4En%Dg0s&
zrmOd+4qJ$ebPHv+AoG7HJ!gbd#A8Ri8ZjmVFe2>BdB0*q*?%XBXPjPm^A~cwh}`D~
z?6gO&d^<6m>+l5?;>v6BSph|=1uthK(GEITC3RddQQ6I%I8e=$ZwLj#N5a1>8ivCg
zc9PxY9k%zK80_2>^XcdCV4!Dqbplas_v<ep_?bj&2hb={RnU-<vhz52#P@c&)1LA?
z&B>^F62wKZCbfyb7Wbkyg+t5R?jVp_p=87)rAsVG;p?@}0DhfjF2KY=ur_sDRN5Z@
zBoczZ8+*l`4CNsWF7`5M9V-hSSKJz^0xO62%BvUldB37t{XX4Ba8~4nB7(_iRUV7C
zZ;UVO848`?$wGFpL>#F1+QXS!<CQiPEoJ6rnB8}|_b%K;)}%K>7Eecu#h!577tuSg
z6^-(>A_N+VK1MVMP=Fhb(cBTDWU#U9m4gz0I*3`Ekeu#d_-kiPg!qv3`67kym=Gc@
z4AmeEJ6{D5GT9l)0Nt?D)UZ!J6$_sfK%VCX&4dy{lH3oNgOFQ2La|}=(_+;?BPZhJ
zb<ll&#_NG;wOj!{%5z6}q@<Jwtt%O%UGd>klwJ?_h@!#;1t8lY{2DbWMd63lRBe~A
zUI018<L`bjSQgm3@_A00!n2)@H$g2)wYi9C#ULb2he8y}9yGBffV2|7MdP>Hx{L;2
zP!4pmu_b}ynHxga0}8?m18nj=$kLnve9s^Ie^-H@{|7@7h%5N$^Is(t_dm!303><-
zFJ^N8IbO0tDI&&}NbSz6da0ByoGx4z$_S2h1eJKQLn#puSq70^es*d-_l4(XJ#*_n
zK*J}P(truL6NXuaq7uz`1IeN|p&1V&u2eyhN#=m1r|%dhlWusBQB&9Kj?1K#Hhvs^
z-dw2ubqArME!@rtqD~^LMn}(jgSFkP6{lq?QJpdKZ;mfckF6(uBjSn{+8(#`kG@;n
zm3xcjQ0qycjaDG+MetaBT!=+z$|gzdx#dMIAswr_Th_kYiKDKk!&_UmUaRf(O6SR6
zzMcwVclitdu{K&Gt?B%0$DH%Ka)m`JL6Z#Jpcu<41@jFbBz1!FpuJbOJ)Z8kHKT}Q
z_!}IRR?c>0&Nt<?lmT_>&Qj;h!jwPEdQD`+lYT-#aWIWB5Cq~_MoaCWl~Jf%0pW3b
z-Ku(nGC90fjj`rXh7Cc(Xf)$}yt?d+VM=r=6)FS@`OQ&6LV5%jY**8LDEo=q2-2;W
zXLFz5Yj$C0KPF35%Za62bizyq5V&Un=D1ejqYy`jNUkEZx`7gG{jZU)SoHqE-`bUo
zsxgy5URx|pOM9qlM|Bp2^+Otw#8?sx1ynFD)OACtwIT+Y1B}#snwfkd`ZNWUuZ1Dg
z3J5J&JYAt6fN_#GTqdGv#wb8&nj)t%)0R_2(EHvf6Pta)r*dD@@=u{net~%WnTTt@
zjak199mId#cZ9@4m$bZo{wloNngnd}jm87j!n|hi9Gq)eq)1}J<Cu&o1i^;+eFAgI
zh+=GX!OJVp-=Bnu55u&Sc^7ui1sS>2NY6a=#-LWMACKc?Fn0eJgkvFVwzHPJS<V2|
z{vUgIS&+K9XZ&^z3^Z(78P=5YauTAD6aqFZAfz;~tA~PV{4aykF(Spnzo?bo*4kFU
z%2u0eV{HY6VU=ZThpvrB?V65_?!}6_oqFF-r-M1GG!fXhfYi0$4Wq?ZzRPU4*JrTL
z4RsOEXI;Mgy_OYRDK7Q2rxn#<F)UDuP1%6@tuln#hHpgtGaCBy@T8K}BZ*yDFn_9C
z%B3p5+$k}??&NG?YOZ5V(WFysCEZ%@_`q3kYZ?=8_Hj|H?s1WyPgcTwa*@C*tNM;l
z5YnqD|KtHoaQRlmOP^xe*h*yRltlB*Gjg<i{82^FFDZR|cg$B0@Z~JHdJBXjUY(ed
zN&I%z?wC+K=$sj=E)^6#@D>Cda^P{jTCuDdIo7gYl<=sY)}+_Q3T%^*<8y46+?f*t
zH^<~z8%7i-y{g&sZx`Wx(?%_9eB=1?F3Q=~ZWpcXS2{)%Z9?Cz?VlQHnd}xq*zI2y
zC9dbVFHaskv)NGv?a~q}@_}vlro>|<@v`XmF4Xxq2O;^%wnr{e?a?y4zMGVO?J%x^
zqr6{Bq#9Sdib%!nZ>kG=6?f%d7)P_OZ)Dq)iWU>+(HwnZ2ea?AwD@Sgm6u&|?0uVx
zHxW#~O1#4B=U!!E>x~yKjHM?d#H@c!rP-Zxm{VDkNw8W`WrERLYXUVKYIYoFqPj*A
zFD}v?HkI1j_Hx{o@ika5m+~!ax#-9xYI>XIWkO7@)a8b3_C=V??O4fZ7soW&yvXmK
z-Ps1%D+Tf_>unWrYEhe=B?nJ0+0j#<tkHP=YVQaer8X_ivd&u??8UteI$ZHIBss)l
zI3+{wX%+BSj_L-=B7x?bvJ|NZ4qTdH<mPU&(V22}EXH9;wF{9VSIS%gIUds7SZ!&n
zx%!`^-hLfaV_4m$=*itw+t#eHHOOOAVQMYwa<<IOv_ui@IEnHSWDGZF!tKkbVJB3)
z&TW2(XI}u=#fB-&y^@iZHRa%GcjWN4&<$1CA-FLUb;`EIA>f@%V`N7WrAJ=nVTZJE
zu||VpNVe*I9}B7xo>6jqrpD3elbe=GMt4c$PzD=N*o1C^{TEqP{ol-`R~MW*V!kQ%
zn+%OSPE%}dn?Wye?nKP0-xm5TJ80J_9&2daEWBpADhIPefDBt{al>tbKt)<2snTIu
zZ=8K+!iMD>YoHCf*0G)b%;7n6H#1R~!v@As4^5D1lst)5TM3#`b+<F(9IRy>OnbI8
ze2bnPSnwdjYL}M91Q_*VgiH&E$IwTZ8S_za4*+yAgj5BfnG{is4=6U<z$;eWlRL0s
z{|=JyVgDvu?6@)~+g!=D8F;$mPH-C~sST&Qib!Wy0G1yeQ$;WfU?b2^naYxFT79f-
z;VB4hD0BKvNzz>mO(6JZKUR5SgyC~B8+P%s38NFVIE@Q6rfXPzmilun?o|)VM7f+`
zBdcF#M3FbOR$Q@j4_G#;NQenj3gRkK>d0ZD3{BN3G>@?AF2^t#o1j%e<=&-KcS+6#
zm6Eq30rjfpO$--s?Bj7Y=s=H~<AiM@I6zWLtd`wDebR6ob2B5tlBFX-hIb9EmDm*<
zxJh~KgC}hD9q?-1S><(V?^04ns*QVD^CIxlO0hb~rThyP*JH%;Os3o-J4%j@DjkQ*
zLeNu35%fvejsqOEvSa^M)%+~Sb>V1HspK+y1Fw_zI1{Y*=POV}KhLx<6ibQ~4s47T
z9GzXb!%Psmx}s#;glavT22gg7+Otqq7wiTH1hgtBRnI*GQ#>D9U4?Q(U=8Ef&r_)N
z0=gyY`$sC*AdM`2lT31sy!%Z?Ys5TOU?=+5bRrov=-JL8B#s+Yvyd!I7ej~T!?yqB
z0G*_hL^v2o@bg96In$!D)){V8(7HmoIrS38vkt=Hk`(G)a-;#YyjiDcdB0a)e+l(c
zZm;JipJkXo>r!!n|Drb)#WeSzW$q%|2m4c~$7Z)uqb+w8Cuw%9_w^&^?xo*ck_nj3
z@uxkG#F&A0mw=OGT>nKcYT1XP<Gdf@47_MSsD&IWbDOeFEo@b?RL_B_1$<>=j~}ze
zn><9CpZC;te(7Psr&pm%h}d%@$tGv<UxX}=*aM4ykuEf58E~nlojqdk*Dn4(Q_m$T
zfOdNa?=4v*^%g6iT`2vfFPDD0B>Umk74-*flv?d+qOAVh6;i))(ag1T^!K6{7w~ue
z!|EGUtV7CwfxW&=hxs>+K1hz!@B+U!ly3QxjW>KHQcY2c$WirWOqv|mZz>>sCYc8(
zb%Zcz*FDj9+sw}1&G{$)chro>?Mq@q&LmDOu;2mtO(FN?UjNt5^ovxp;t5fo@QHzU
z;@Re6YR|x?3ORQ%4G;Mm9#`^!7H|`;Xumbak->7ftC1n_fQOOC(Y%4vPXoHvvjLG>
zc<yqrk?0I*W~S~UFOshGcSq~=iILXHm#@%?Pp9Gu@twY$1)+Kb`wfNGaPWLQRp89a
z-4`D5(i^CMg4I(a2i7VsENRv<|7in!3UCVf%oTsD?qTQ?Jr{YPWV2Cv0$Ao4J+VLF
znZ3ATm<@W;mZyh7AH@N>8D~=@;n6U(W)GDu&xX|!V_A-YIzVVtZDOu0=ci9mBwRhz
zFqbia8@GeR7L*&w&8f2`d^!*4v5n9uA^pY1j~onD8Uz=Xti(&Y5<IDECOao3)Z$76
z(S_0d_-v?4MilB-BSuG?2W*J$%q-GkZWlr->Vt=jP7-gF6G4=5qf>o$TuBF<{bDQW
z0b?DoR%bxUoO?s<1AS5!>{}@}*5I}_zrca*l2lfIwAeWp8$3<JsCh7XESiabK>sC3
ztEe~-=&EHrxI++EdY}cv7fZKqiMa;iYSBl>2Oym1mZ4f5e0y;F2GSZMs^!hUS$x*a
z2x9lgyVN0Mf+2;s^Orv`y{3ztYA$?w2dJ!1D4*;^h;JGzMmFu3ry<sWxcMuj$$#CF
zDIJ`+eG~pEcrY5zJqSO}Xn~cn*{_tUjv`1Ij~I~4CAhp~N(r{R6QiMdI}wis);|yr
zv*_^gu!Th_AEdi}1Iho?+~vFahyK(&{C=&^*fv^C|Mh1AxcJ85Pe@s7f?K+%`x!Rl
z5JkST|Hp!Xuf%=fjX0_Mr}E*?t6A<3;5v_Q4c7)5BN*Lz(djznbx&|Vt=-K#{k!^s
z_fx;%?lc@^G3KBqT*=>}jIu)6VTR`}{ypX<b+XC8EbEb!7`V{sIS!zAp|Lxa8unPr
zPb7!Z;HY>CA07t@KT>O#Gs%@vd7>me@^RA7eN=#Q>CzXb-L%&MZzWdOV}12D8!Qm#
z!NxL)Cak9k8f)TR<e_%XeN4PIhl7f&?W=A&fBL=j+Q{f5?=mjQxCW(j)sgB_N6{<s
zE?fWaE?a&N3|P+4AAu}X-2^oV+X1DAvu*~CK>!7r3e|{Z$-S|MS9FN8DrR3$qkh}!
z<`ucgSNcmAQP!FnVJ+dIMQmR>##46@b&ruT(WY`9yt%YXg3x?K^J#|)6Kj>n_;2)0
zm3y_Qk*;Ud)nT%?iqrJm(>i>`eX-3+%cjK$o3rJfDbTKEad5T1T|O7#9NrqHu~rmt
zN#oz<o)2jKu!=J#{PD=+#q9%GaT`b$Wk`E!R$XI?9|MF0%y&XTY8RVPFx>S^(SDrA
zsv(RB8@C1~R?f8Zekms{TPVD5IM3Z5td7{^#dnE0>oo=gjzot0pc|W2-CS6Sq_xY2
zKMDYyz&m62bzH&UjDIx#Y3dY%4v<=hB-68UFkV`<fGL*~eSD)bNC;=(kz>UdO2n=$
z#L&BUcq-2)V8}*ybjF?kF<WrQF@k@BMgqso=E?N+RS3fK#OED&OA>jFJ<FHbNgJ<F
zENU~*j|A|LQXqF~C1Z3_xxi<tcJHaFMjCnk0-~C2LleP2Tc&RMnZZ##aro#3W_32f
z6FhZ^)EVwyf!j>jt1T<@KGe!$-^(q=N1LgKCHaX=4v=|7;o~<0rzSEhRMu+*`oOKW
z5<b)S61zte!<ilusc-=n!t&vXmSQ0pQY&<Lo2cp(80G_f2?_<=t5)Dl%M$K5;~aM(
zKy7@M;#(vw#OO?Yjd!<(>?SX<;N?sF@l6-Kc}=7kTvS>_d~#<qE;_50%uJE_?W0)x
zW`}>^UkwD#!5W!16`<H|l0$zipl7I(70PneM8t^T=E~35hFwv&?=7)0|BgWB!5?CY
zKBdneRs9L76BC58sV}OY_eXNb2ZiK%2U?Z(ru_aV`CS%dRD3pXu<$Z}yU^rUlA3ly
z?qD?{fY+$$^vd@y@=%-?pO@Z>VLA}O#fomaSk+2EKlne)J(XWzpHxYn7?p-1nR=c#
zTBjb)7n*)FYNEN|o3!YkmYQ&hI$^e|!bc*!!0>rekNz!DNYZ#$6A^<LWMt0|OQ5Z)
zRX_f1O1k=^iV<?GPr&F7kJOC#oD&O;rtk_Sd!$0Ks%2)9OX@U${zT=SRUbOi^h@)!
zx?n$C<9BeX-kPpV_ZgHWC#?6j6qnI5EqkW@XmYy!fIXM{b`<|>S^LvoH_P$Rlp7@a
zv#OyyvAiwaMX5Am9pv?V@u_5A0<e58*Mm*I4#v~l@*d2i@S}{}Ar+dhPK1WXY&J2S
z-rMq=XhGD#3&s;U?PX4y)Poo@+xzS=VXU=Z_Y|??=1;77Y#BMIN1?}c=*L+~0@j@O
zsoD#GonaT3qdL6I4$0HB!t#OAVB6);%82Vr0fq-{R2vF3UAgsKf5JAq0*G?uUeO9p
z-vycrzq_C7isqMOK386m!#Lch&wM<x)*5X+Ums+Gzx!|6(T0s+1Gd8r+z}hpTGQ|n
z?<v0mkqS_7_K5gS6@v~k?J!T2(S$y`6IRIa4-CZ*x_Q6rqN%Pkt`A<6yhiBA$2C0Z
zOXXeQ3xt(x?(9)i$tn0l1=yAR9JH;!#unc~PI9qqSuSzF(e)orU#r+J#G$T|p5y$^
zPpJ5=PB~$x_zZ8kM|KFhqX|2q1^fuc(p&6X#dB^^$tl2``Ifn@V9k#>mA!KU|3&r8
zpROC7?dY#2mr0fJZOR46^c1;}+FVaQ9q~Ysb}-iX@Fj05!hZBw3NZdz=k&|W(w7ht
zbW%mADXI^t)}f#^V80V&k3;4+rO}GH9b8#W9#VgsSAjF*maJdH`dPzgJo81_2Xj6B
z<izGz2Kq)U#i|d+(&_H-izQx-B-u;w8Mhxn%rHL(W_U$cOHcZ7$R;LQhD&|<djDz9
zG~@$EsfM;mGCnvw9x$5^GgiL8ssi`^aelBYpgbLma5GyxxAyER;WV2ap#ld!9*(MP
zDBoqCsi@nE=ZQu>J?M*!<ZO&C5V1J)5hah}Y{|5>zA#+fIE5N^f$!-N9dpW~a%ubr
zd_d2GxJYsVk4Ts)vAZiCi+n{SDW=MO5zSQ=ui$AD&S~!p9(aku@VF^KE&Dp%D0<Vf
zRgw<f0^Y(Nf0@9mC$LruE%alMflG@JmjS{x6?TWcDE!xzc<^kmM%H4{64D=${$#%R
z5eFl{R9js0KMKZ>f|I?$O6l|8FC5g+$-iz8m9mo|L&C8{W5`2ds*u}tmk?Njg-NH$
zuYOT^Z6+X4k3hP4;z6TETdvNR=lR#Nrl9yIl_xy=)8Zrf?T?DGarFi;1Ez}5*}eDF
z*k0GJ++IymAM%H#tFlzTmafY98Ox-XcLSY8SwvFPht`ItUu$z4q86N?zTuX>LiAb=
zlK=f#yCxc&orpOyjF0y`XPSLU#kcRfrbv8KNQJvbMg)Z051D(nq^I#O+N~k_rE3^b
z7d~@V=<*_xEmBf5X;pk)FMi%&)Db#b=!dc5kMQgRc5;-gb;nNfstPyH)^Ix8@L!5{
zlF1VP3$6U7zVU~d<_qiWn#c2qxq?4l>5EY05pwrj9OV5a;9Pd1I5*(JJPX!(wjzNZ
ztk+_oHW*koHw&sj%v}q8^&1R8`YYHU@|{TOdBLH70I};=UY@EUkS01XT#dOHO5)we
zAg~vu^3FrMVKr&i1H#u2m-wJuqWB1}w_x5H(JExSxDp4Qq{9U}k>OtiWp+5U@H6vL
zBilZ%XL1Ifs^Mk%ad$;&xX#5S+!T>@H@Oek$1*TUQ21Cg<@w+eVAbh%`sIUJ;&s28
z&b|j-P)*TP#fmBIGS^y9D=0=;SE@SUw34e=<)|rOh7_<WYtO?~PaS^|C#x6Hg5Bu5
zO&HuXQEm9h)!-8=F@FKm#-+s93rpQ2-hA5^uss8%3#;*+Xb|QFuT=Dx=Wwu3rQ$XU
ztrtjVb5Hl)%-WgZ!QHuC4i@`8sJacA$oE#Q(go#-a^ug?*%klm@DZ77mqAc5!6%??
z9MyP2HKfp84ej8y%o#Rn%|A-CH$l_jSE3>X)eQ7I@l7#=2=zL~?Q_zyY-NH*)p__8
zXl=T?l&$Mk;T~zeH{2`IHP5}e<7FBv*>4~b*qc<B{ccaJaRNP*m`r{=xIgy0e#Mfz
znai^GAwkiP(X-znT~3)4mUxaN{JQw$ntbbJq55Sp;If=^rEuOcs!*};W*@aBS#rMI
zi~ULj$n##^A(ZLO?`R+v>o{T4Fe{QmTwndm8vgt**DfC7CYj^x4(3e#4BnUZyCm>k
zsypku(lIZ7|KRtdLkDg0(`D|@fP#}ehZPFpUFrPB%_3QBQU4Pv^DH7{W{U;8ceoPy
zV~^<DPbr@|g=u_5tl<me7nh&dW&}&1)x0H_OlKJDn!EEN*vqPwm{%y>F5{ZZp<93x
z9h#!%4@<eV3L^!RV!=E?!8jl8(HIaTYgE+*>8_||RJ`FEIb~EFW}a)A)E--&5iii?
z%}-rwtJHPYM=>hb??##Q1)hIGlDOZ+-FDeHJ%>og3OCN~H?Z<jok1oQM%V`y$`+NK
z0JUwNql3t8n1;A}Etg6=(%_gc$uSr9{245pgwtp3qG8>~H=Cn>dYeGTf&^G!HJ;<K
z0XvqxJYsVJ_UkR62AuGPkXp(DXV;$Gm=J-{@oAvrmB8uBt;7^a@Ya;#TVT3ME1<Pn
zr|JtsEWL$Gy$vTo?rEAeD@1+F)BNU04VO(2a!WH@7R<7i`K%lx>=j{ObHef}gi_Ld
zJJ5hmjNqRtez^0*hgfd>{R0Zxyw&rJ0*4)#u8s9yzg-C?d25;-n4+(`D1;F<D`NEz
z?bPE90~O<6ftauoX!IObt%jpcKdwVY$|#yGI+e89=+0s2%$n0EJTO3T;?5SWV9Va3
zhsUD%q~}IpeerR2=l35_L&#?llrU;AKE(cJl9<6TkZjPkqRA6>Q>!(sUC3!(_REC?
zbP^_^zyPg9hK;2vAV8PR6|A__<*1qLq6$Eq8l4S6miweXq5?a-nHN^HdIY!f_-o@u
zp>Y<5g14Q{Vq)T-cj+<(iSIn49(9+qkL2C3?9iuc1&4aE89IqL*f&6a^^zfQ!1XvI
zfXQM>34_t9t82$vL;XRil9PbsK+TGPzDy#&S3cjbOdEm~NI6t9>84uAq4u_*#>l9q
z>VI>bQwUr-2dEYXydv#&S)X**ktfYGV57CIm05Omhc}Jl(!cnjYr1cFV7GftkGncB
z&Hn2ZS{d3RwD9IFW43<+gepDlSxb;sKMd4%92<=IMHrjqXOhMtmgBT~)AzY1_Q_Nj
zw@j(JDHekRvv=jqG7SP@l9|N~)7YfFU*pUw<#ReCAH21<$J61cB~wM-4wnZuf?!x8
z&@&FDqPxuKW1#{Qs|nwITE(P<^g=KYP1JZt=8t1#dyQx~P)ChKLSV$ir527yem+}C
z&!-)ct4_`<5j}3Z5e_5){UC0`%OIs5&V!TEOyxa5zGJiDegY_wdbk620d=Q*!#?^i
z2(l5VjooD9Z%&w*U%NHIDy}RGVS6`mlYp4y-LVW1;yhH5ADCa|jvjb^77b)wd5-wz
zEa)Y94>QRui~kZH!G|4I!~88=%0&5G0eO<-nmHrap#K1XR^grjSe|Z|icAjz75nrP
zA<ai%)#<>CVIcUvi7-|NNp!+-;Hwr2EQhS0&}q%-04`%he-ML<FonQ>Z%u)DE3(ue
zxb}WfOasY<Uc!fO0xFg%I7hahP!iE!a7L*B$Z==kv^Nq^EK_WbP5}~HWU=EQ2<-%Z
z#=oKhQVEb=u~}SxLZf^MlHC0U348Sje+4+PO)-gH0_5EMh8d-BIZ_2k9+88IdX6nu
ze*O>Lv|TI5YXcSpqy`fNgeG}+nlPF93JI91>1Bv<g!v=il)a9SY{*H00@G!jV&*{_
zrHq1d1Y^db*$m5Wn61E>Y--xvJTv2LSv#U(gM20pcy6m*!qT-REi98kj;igw`RKd(
zC~Lj(W4oNOhm!qSdy9MN+v(nUxk~==dUOJzzjMH4O1xV@F(@m5V@h|b4<bRLNdVr$
zZF`l*XolWe<JK!XVjEN!U_oO}4S?d-t1@FlTSq<!eD~xDhQIE9eR_eb?%)h&d-}57
z^n_YCAnw`m3H0Z;hu<O*?TjBnd%1Imc-+0B0JjMTeLVRF^TS0wnc{Cuwu||E#6~|v
zUqPx}W4Pk!wL)n%yt6E*J)Z|qh=69n<{5jUtV9P+VdKzde07G13aoEKaPE8L2=B^}
z#6z@@#A8;RudtB${nVnKDk77|rq%_5olgI+t22*>a{J?WriGBkzCCt>v1AD;OO~ud
zS+hiL*0B>p#vMeuS<-!EH+B=*GRP8IgoH@h#@K0WF;|rG%kOEr_vJO6f6jBx^PclP
zbLRXpXXg8SK7qpH#M2sM(~zwCG;wtNyn?vMWGJEWiqBj0IAtfzk9VBXz_y~AHU6~9
zecjKYtN>+acdRx@uVVO?`NcJ&LhT1VM{@&HtRG3?=|2^Z60B~K*p@boc23}r-TbaD
z!>XBP(u5m`S#SH_8J3gct?H5V^cvy_&#begx)Yl6h2xK*oRO@Z_Bk#4%g%EXE^a;b
zkdlQ0F~ST`@j9*Ukp#&{yF1LU&!?+q4-voEIiw6U1cY^&#p3_)YP{yLY(Agqbw4*}
z8(ZHtUQ70I_%0rD;mz}WmdC+0xKo3QFeYCmLt{d-lfmT;q-hFyBwF=F%k9>_`t<QK
z`(rgEvqs_r)DIC&$7k(~daIU==~Ex77AJ#MR+B2P)nwGx>!PruazqK8B3CmUW_dDa
zB)FO$wiBn55}<ybJqP;3Y*;pma37z`k3}l<6u28T3AgmIrhZu8dHzG3UOa%SG6ZRj
zxNB)GEI)7MR#fU!40{LED}@NVdKX9G>KS<LdxM;EWG8eCBni#2>%KJ)C|<nz_bK+*
z_nZ79KZudgc-c+1xuJbYl$%p{wCOl6>1^w#z0|)Q6S9)z{ffONO7hcJN5)R|W9vdu
zoyY?Fc{jh}d(4(E0)-LvT6x;Xw+t|wZ!NgmE6k&T#;PUpagBt@kH>C#&)1QC7t?o_
zAGL6{))=~`ebD+i!0lx%G|ZSqFsmA;M>fkEdtL1C89?>1IG+_kb(Cs5{gGC1!-(ON
zM}(4=p|PQTfWwU^_usPnyyi7ADZw^bJ=~J+bw8SzTDySd=E@>hxg8&3{L`~}(y3Z%
zTbEOv62Z1^`_1$_4C`-6(Z~G7_vh=SAG#x|65B2UCPq!?^i5{&D_Tm_eSWw1uIHig
zn@TUk&u!KYG7rm4?ApX8yR0$1&ey!0O9w)5rKNLOWZR)+LC!X^mE!XjZypOQMFo==
zmvnO_yf}T-26K4YI!MOfmLivK-8F<CXP0j82d1yNfEk(DgXCi<P6->#=<~6fxyZh<
zDenbKj-#aen^9$u0nf~#{nX><U34`Y>NLw5e4-uETs@zK<|UKD6Yl2Ed0Icys!G>*
z`dZe_AfCIqLx1P1+N6?X{7YMGtt7VEB{zz~#I=XoGkH}LvBRHap207-`iz$gn{&4{
zh&b+cohV1@otped*^G;Fg|p-3hRt5gX+$C`FV>nOxo6+yY`w>cwW2^NMP27@_Lw}y
zeaVVqMbe^?%#osXsOgU-hFW-hvZ9_)GLOA;>wpBC`+#W8jq)h_D@5#SkY(|uF!^Be
zvpDxpLH;k;0&3`IV|#nk1OM7EvmXh2`2Dis?iDd54f*u<N4&`{xc9#MU32Th7dgM4
zsg>w}jI5THWNIpIqj#NNJ0^2-^Wl*XFz;=xU8n9fv&FLCRIMSj7Q{ZWQ@hZc50(s;
z3m6Qr;uqSO66T^?IXs83+G)5t6Sk}PG{2s=Wk-sPcMR5+`7w%`ajV|Oy3(43TSu+C
zM<HwUy2fGGMEUf0>~-Zmxa(}^%;=3m237SDD%R~xy8}xO5~CNQrV)Ltrk<uZI$s1&
zPb_3AQ;2g;i0kVZAxVPo=4#uYPc)VvJc$qWYY)h_zujB38QHCd%>&z;N6jZt9)3}|
z@p0saOnkL#elg?UO_@Ig`wP$CW^}0K&8wf#eIy++_>C90jd2LruH+s%w`}ihw92os
zil}cNBDANCIN?G$uC+&?1()6!CWQzL*<HeJSn>!D=s5W4p6HKG=QYwh{gCf&{3AST
zrcNN5Ph~ju9%GXq_H!sthKqWX%||#6QQ)I!eFR95MgKL%q5H-4IkR`d3zHeeKHiFy
z(u>-81|;aIADIjbIk)%244uctVlG#1_LwwztihjJ%A5%KqOMyC2rvu|l#eN|91lN5
z=Nt%}c-$Ej=SrDJCxNO7n}28o!M0qw?<gggA(a!o!nICXVeJ%>(~+_vJ6vZYt6Tye
z6T%7!VXP5SO7V$#{fL1jMC{}K@z(d_t)^>op*uwbQ*~aco^uJ0YYm$`n&-3CT0M4^
zFXv+7eDBVP03x6O-dE>vRE;nbk$iI7r0?Z}g>Ni#E!lJJj2W&fiz6x=Nh+D04r|@#
zfX;@vAkD%`Z1>BilpnVOI0lkfdtaiv2ozv;#fqmZm`>4^9_7-NWrc7gB~{=VO0r|6
zi%rTpc9bR18A3{*7gMjq+3UOVpKWMM)QH+;&%Km}>K;^!mqB|X7T<GJYw*d(pOY0G
zF}`y}s`Co6H~`M4s%}?(RmU+-*}zzSMB>OYb9#>(mT>XWq4gBjFX0woPN(1n^o!XP
zq~rFHG`l8OKHGr&=M^G~PMXO+(x<C4tjT&}oJPp`Q#Wh^Pgf6#S<ODlmD$n~twSVw
z)_UC0sBKioWxhD~%_)+{<mA0K`sO~ym#r*5#i!L3*vrLN;oRboc{ylDBUhOif*@-l
z(dEom1hy;YT1kXLAmPjfGe9)uUXl|~WNKzXGX6F+-(B_gfpT4_h@`-%?Z}rq-G@a+
z53`vrOm3}z+7-^P(eMptp-)T*C}a-8JP^4R3w)0g`(KMn%p!%WH)&M}DSDPJOI*kk
zxnUMFHk&KG<joT?rfb4;bd8Iby-RSdl)zZtb`J}1Nu3kc3AuT`<yd7fK?RcXpp#xO
z;g`L{b^9)xUO0|iodoI9)yJn+2$aMLz4N~W_Y|Y7?J7TF%M5GEJi~ToYxLDzm1J!U
zU(a!04NE%ABl@Ol21nZ?)nYT;P0zkN&CsJcIrL3RbvPqFWNV{ll)W8bhU|D&Q@{zs
z(BS`A&8F9)+*$x-WDL*NWgI~CDSQ$ieF|p^<aS>sUFhg$FK8?}<)`m7;V2eyLo#pS
zkX&aXT3)!$R%e?x&V7=z5>efncx|Ql+l*CJ5z3#j#p$}#Gqc4tP0QJgNX<eYxs`V-
zE26WnV)t?TFi?9EAe@=trDMEJ9u1R(?8L8fgAPPAEQtw}WkP_<L}}O_6PU{+1Ci1&
zeP+;iQXLk;4Cb@&f^y7!;3U+$&jK|yp-VVuL*k>W1p`S}VFsL_g(d*5k<P-(xTu#O
z7XZ+CiVwC1Kus~Q2A~JOF2VW9U%fg|(DAJU`YNgp+2;ILN@7OA!KsVDPh;~UDC0^3
z65&7n-%Y44iHQ^eho+=JmuUfj#!Z?A@)xH@YoC?@s7|ubNE?vzg8>cnN{R|e&8PrW
zKTs&SOM>;#Ax#=6M1~6G&d35Z&T2GJkrEZ6pOpa)9IJjGsXzsSkdS{BB;hy<Kl0N!
z2rQiCf|aUK`~B45pxF!@_~{dbr#p107+M`QnkWtGR4_`N_2&Qp)jkM%V~t0DU!poq
z2vh-^=itDBPs{Jqsnmubc@U%hD=dvc22I#pJqQ#7o%Mc&rLjk#0V(=aaCrU{aA1!B
zttky8V+=u}kXeEP-2fQ4U<D((f{L!Ez)Mqb(9i=8`GWr{B{BP;;G!pN7!4xP>eOv!
zKFJJDEwaGMyunY48gwI|%#ti{pmX<oq?10NtT#Ux?R^5wS(1hg`BU@u+5<Si%_Sw+
zXyCt1KJYsU4jv7KGarQ3xdBOWKqsS6hM$`iplWqN+h+{gj5_~OP+bxu9!3S%KdJ&$
zB_8NA`xAncX`qHkD&$B;0<?M`2UJN+ITnJ<V6XnBvL}|cVGSU4hRgSbL49b3Y0G@D
zr`go5%}hRUdRZD4okwj7uLuD&4@(@33r*1*M}-0*h&GM!fGUZh$5WwaE7C`QWtwfQ
zaKie_|9vGrD7vZun{TH!S=yMv&{b*Jz2{)zsv9i$B~*!m$TbC6YcB*Sfyrxd;NaJp
qp9zx(r6lIfTX42t9we^90h*)e0Rzohb{K*H=wvE*%#8H&&i?^nK}2Ez

delta 35766
zcmZ6TQ*>rs)Mit$ZQHhO+qP}J;Tzko*tRRSU9oMal2ljs=<)aX`hJabHP3$5o@<>0
z+y`6!4c0*S13}rfE2|m?1cU(-1cWwa-VZZH@dqxz8+{Dp8!E4*e5J^>D2lW|f-j0x
zo<(~QnFNO1pI8`Gd=Dh1B^mL?ab$;(Lh-=8JXtcDpd5?J1y(UPr2%wU(aZOC<-9lL
zfcxF*)xE2UIN)87z5VfIhVHN5;|_d+;QhP>h}{S&#GHB~#GGp3!G^1MJbr%lo)4`o
zc_%nvPRltX1nccyRLGDVhDq}twP!iOEwD#^U`j(>W|X!^l(A2Bq}thVpju<vWuji?
zUbjavx>pbJb$tJs_GSbRy=NhT>;2vm1Jp_7P7}k!J11JV$6$a@ojwipW`qx8>vXJJ
zJ?zdA<96Wd;j-7&y8wUZb`0vX<7W{%()c?7O2Z!-sp^ecl~$6a?0}R|mAP(@jFxjh
zIhxOTBZ1C!Nb1X5dw}fW(aiP!kXA5QDScn<ttDhmdRD4bI$0=YZestDwl9dO>J7E8
zW{-~6^Pn2k&Fjj}2Ckjx{MvEXtEAXY>rYahfIyx>Hw5VZ;Rj7GOVwBeZnpy+Dv>P!
zGjqds6s?W0{q=I8gany>eP?xNX%WZKX==PuvH9xy+WvMz8S6wDjx)_Zewge9Gq_0k
zEAWR=HIJ|Z#=i8{dR{C6TMglt_Hv?R_Lr}FzoWzvzrxeTP*T{hrUn}X4n&;~;bm)n
zhjTJA;7Z3(7NN6M_mgz4;=Ac5MkX47SN*K1*q|LqUH{umM_55_r&15}m{Drjev2>)
zSD%5XQJ(QP3K<CvXtYJPr(ReO1zA@b^P5VBgB5^%aou**)Yo5_w|i{A@aJM6TVQm^
z5fI@WuWOFdo~(_km{v~sa+q^cc^ZXp@Xe>f{R!Uun#|9FREeI%^-Jz|lJy~g+~DJU
z@}jhnz%n*4U3{jH#O4aLo;oZ~;-*?!?e`q^m&_*lUsR@Vuugr{mlw7#;AMPBJq!28
zFJVD=aoQsXXU9xeE7pV7LVn#q{p!VZ3%Y7}jE47Oc_kZjN{$2I_Ih`Hid_gb!z77k
zLEPp?R;<|(jHShvV>3q;6{-VZbkCCwhse5}9x5_xyKM(xnjv^V-XBsASA(EHumh^r
zu4uRPY+C7=BU8QW{OGSZAfm^B!Ait0-jY>*sG>$R-+;7@n-8id2AU2mHkJf0=Ox7L
z3wA>N`?)k>o~;OBOg*l9-c&2Ax>sd#(g1YY--PWe-tT@R^ihOGFOUaF!s{7t|8@Ch
z_a_pXzZ3hE9!TK$1W#azp-gEOQ-WuU#0`utpn2;A8trA^l6q$YQF51^@s+gh=n(ox
zoxo50I#y^dUD+qqZWwdRChW+6_RmN-hX4{Bk=n^oC1Z8WWcqd|_FqA#1Txzjttspk
z$qnVX*9wL95<qo52^RnqUZ)omT~s6AG6Mx1pAdkRJ1(59{=+IDV2}24_<9=7E=pKu
zHXU$a<ht9B!C$v8<SjY?;NT@kXAwh_7%Y!8RY-M?hFIef5w~TfdZ9S<B)2rjq%nHq
zP@%28Ls;}ys3?**ma8UA$nkXk^)rP9$h^)pw+(#{i<qs+90!m|gb?Dk&T2Fk@>^mN
zFaghCQlK}=ONlTTi^uzFqhx1MtD@5q52vJ+NFxQ!u7FgleEERVM{9Q0KxyV+k(#!U
zjP{AHSQz$~(I<WkCAF>dp)Q>buZc_HZTh*;6r2LVj?1C+I;u46gWXMuJCdyY<=&+h
zm4(^0&>UeXB@WOkTUHnuLdRJ}V^~#YwH&^#l%E<;i*sXUO>N1{m4ma@FJx=_#Nw;<
z>DuvrnXPe9bTKX@WWBobWN|7oK=)Lm*uH{jQz)jjk}-j>shi7zn|@FwV<ML6me7n9
zrZxg+smSR<Sb`#q1bfe$X8^y1(>-hX@U0v25h!EE-T`2>;fbnoybY~s9BLR+`KF%Q
zDzbQ>Qv(mtg1L{<#PeylU~f84G=c~OVgw9kph^bB%mbG$j0Gi*<7%^`biLCi$6A<Y
za>3Ua2o<@&WZB%x_Qab`4f8RYu2zo&RGMRxDj1!RG($dfM3<slGp3K1Hf7amDJvC^
zJq*g1H~}%7)lxa<g76oVu}aJ(n!|#dnR840D&zGN`-5Z!EH?~MOg}*@Q>s(BZguTy
zLQ~Oa_37Ex6x&lHa@^$nGLNS@^H2-MXqXBgn+7g$+NPHtFwcLI4Xtep*>ku19Ga^p
zp#I$0_;mELs}quj#0<%t{k44%{7sS|V3?G1-3ZXqJ$R|-W>adjIc-=-Eg~5@2km53
z@Xnl(UkDbZjcc2EDxRKDmzlg3g;+`NXn<32Cs&Gr8M9>iNKNBkYED;3NV$c>%@2(7
zGuZSz;-4HW^C9IKoKie9{tDcJelMU3LgIin!vgno;{>zF^|F}Zn0+;$q2u1o;iwNQ
z*ah^oyIql#CiRE(k02Ch-UkgWPBjjbKsFW>pRn$M<WKLaKJ62CcIf1mt5}o>umX$j
zqFLTNU8r{i;*<MSs1^EfjbOjQIQkCcsITc@Q$1eaL3O=g+0>{D$hD+hOUa3_r7*l8
zv!m^zk9RI`jl^J^vt>t_yJad>q#1C=@BvNJ3MPiI931*tyGN(dfE8@a@$<p5#WXYR
z<&xD3gu{yKY8rxwJ?st=Wc-o1!-`9?M{3Lj(+Tc$)zv2SbS2+Dv>)+PFz%6ktHt<q
z%vf}d(A5ou)eFHK;7^pMjq$g62+YoGv&LvQ;%GO6mbqq`vu1RJlGUL*kuk`K`v6ZW
z|BQD-UU_jj7Zj;Cj!;~}l9D0nqWnLFhuEDj2jm|t!pjM+j>d^7EFEspL&_D^X<idU
z@W(vA-SMfYulXHfNJk@w2?RhX``@u;pm;@fBt8w~)kOp7z@Ce(v4>zo&X6_DQ78wf
zz1psXF}CZ($`6(2F%C09Pw5W0$pQWGyoi+#B$=AsBzZ;_@JF(*yWu_ba8?#NS)qv3
zq)8|X$tO8<*Cm-6pLzt=@HH~~Whyl@SnX7DTU)W*f~rdggk(W%Z<}b!YT6ltALyJV
z&W{eSCYIj#IUky_2kCU`3+UF0CXWJ{R8hft0T~UY^%aGF@Oo1BC3Im`#{kkc7=7sS
z8CyJwKM+!`5Ng(Bjw7C=YqBjR4pZ2q^G&dX1t1Bk9B9@gNUD)hE_4oC1LkMMj*Bml
z!1|Cs$=oA49A5dB(J*y(pS)A`;qu&G&y}CmAx;G$aS6rh0|Wz#;j$X<m<oJbr{-YF
zo5<91CV#dwkG1Kk_*BmlE%_1()dsawG2BCKp;!t;^23@}C&aaEP~K`(j>WiYE!A`t
z-nl(heIYdB4%$A?#G8lH%12=MhxWT30nM>+I;h~}7?yr1=LE_C8i57|Wo6{sNQ^>;
z76_DvAknlKbXXCYyWKW}OVJIAO$mR9f<dic;-RvppXK*iu`aWY!KQj`*r<PVr>1kA
z`gr)*`~ttfA25CqYm&2*ElP{2i^7qjnqohhLcekYd2ZllD!}7e;-T;lQF}5|iT6py
z$l_@r6W(PRz>DAk+cMkZ60X498M-8S!#MJ%S_YjdN(}{_^tcey;R#>;6?L~{leV>u
zPbWCJT!zM&*IJeiG+#{<Ym|`EyxJC1{*)!3<Q9tO*j%F&1dXd0(e|HH&Mp_FmDp@m
zD$H75ixSe1yFFzzlB7&nu&_FD+^+EIgN59^S!PqPT55y<7_pSP+UzEivNi>cHEvY+
z+Lzy+60#``hEJ4SM{BO+Om>~)RW=p6jE0QoZkC2X1^f$hGAhP8_=LV(#|^Z~<at$z
z4V&GaHk2R98Pg|4Jq`h|@ni5gr^yhrjiWX4F1=CFB$PlApfJNJc8Ny7*f=#?m2^Qo
zYt9cBEx{JReh5-vi!1-V31l<Ao8a^zjabIg3Ue$Es!yGR?MIy^2@!8~rGH1XUC25q
zMN@HTIPD$53i=lZWoDkRx^AhSh@A{P4R9Y&)u?OQB%pXb33O#GvyC2T#zHvmbHmKb
z25&<-&dQyj4i`0Mm(}4_7c+U<u;?<YdWY6Xt7rhAfzqDlnzBBndd8~zicMrjSjkD?
zPc64AhP||@*7HQT(mU|BV%~}>1k`J`5Y4{&kph&!7&$xsda&#_|163LJY#sev<mFE
z)@rE=m2+pBS4#49YpE~Zz=975qr-;1Exr-BHn1*l)Hz$Hzu3U<u_q)Tza%EuI7F=j
zS&asKAWmS{rEuXr6Z8^qu`7WK{d$JExwBgCzC*|_{l2y412IBMDkB+xS?KTrvH1eo
zc~;JB>-!dySjv~soVP|ZwnwS8hq<N?2hnS+0C%90Qm1r=+ZGq8aa@{|_z{8fi(v4a
z#0G4g37nfhFnB|cJcqRQ*S_Y{6}N9fkSUukMcrExUA!Qu)hey^2$Lp>E7eW=?jZIr
zi|q0V2R4CbUK!WWlN?7FFNm=IV8vl((EGk<62$xUXcUio))<rD*Mp!lGVM=L%5q@f
zupl7N&>$cnA|RzW;>9U(Bnp6*3SvPm@L)RUplH%j@jDW74248VZ<D4LE1uq)tn0!z
zluyRKL~)9RVWhnX)>*?j*TrNov+S$c>Dg~fOE1Sik8ABjAeJthLGdbJHnAQl>~+P~
z#8EO}Y7Or4mzgHx>OH=BF}4#ZoI}bJDIC?5J}a%Y(U;mvo%ZW1r2&8f2;ee-6!*6Q
zFsae|^`2GCb)p)TzZ{-!^I1Vp@Gyr_M=`Yr)@w?iR~9Kw1~6sAY<}DO<nVqJck3-$
zIVHO8I&mBaRH*V`b|tq=48xDVDX)3-_zqk$eC~Y8kpzA>F4BFc>oH<+*sWy5S1`mn
zF_U-HR381t#PQ`v5doZKTAbNU&Q!FVsUhGIj1!oSU@eSlp5BJPTk$s@L<y~!e@_}W
zsyW=>7bUstn`sLU5{#Kyg$T}jmaPaIaQUY)z>ik7Gtj+=Nj;AU=gg&6F~`6+*>>bh
zaKRIBVV{_t+a0vt?L;AJae1#NN3)b4T4J^{&oTSdK$>TA&jL2srV0Bw&K~20G=K|j
zcmh{_ur7h{M7$gy0P9R^qHnt{2bc55<CTk00;303ul8#(!ys1JC;hT>gi<NtXLK2Z
zdG&&%(ufwR5*v0a`8KE-`aluW40VKF_7_qSzJlVI+96}S@g#?z=kffCpur^#v4Q3D
zM53qGnufXuW`LM9QoQvTXfZn$_NH7!>`-njR>CF3==d!!^0k-~D{^(9K>;EN-H(QO
zcZVNtB+4?UGK<oEL2@L%EHxX-%LiH|(*ae5n(LU0(@`b1E#s0Yxmw{yh(50qQX@)P
zBLWTEU^sOWtn#hgH1H5(WhHdjh^)9Uo`$74pz>W*dGw=#54>WJ8zmpFY%WPBA)rS~
zPf*sTprcOz<ux`&0qrv-m|Pa%x~Y!*9bbFY(X_~0CWA-32U#xTALVA3vu-1oY#4=y
zwFQ~$nu4)X(O4Q!ztjhs@JlZhClj4@{yTJ^z#AR=McUDHP4S31Z-1`yYNPqjb-6(G
z*JFWEAQ*E*1goOiJvf3KE3jcaDTTyDM-nq*s3W8rpD20;cC1Rdn^Fug>Jg7evUSu!
zamXo{%o5}g-xEvC$qkF|h4Yc;6zl5`G@*CeNRuDYY_Il}tj5jasMb`Qx$ZH!@Y3k6
z+vHg^<dh%k9CUVDH2U&D(CXPP%E<X`p14}$khh<TY|n0MvE5gmUQHf#!k|#=Sk*@I
zqEJY_#|mG2fyAKKZ?X>XC|{@Ma$u!yS5RwTtFrB_OZi>IH14e>hHj(Hr+h7{XhjbX
zmagNjzDdLH2|so87G^T9=ht^OPok%n@-B7JZd+EBohHA~h|rvTnJWJ-cH5wU9a3e0
zvh1;5>}1vXA)efRhiI*5y=m#|(c|RZ5MCv^G^Vm~bPhcT-P#6llM1*B)Q=|}n#G%-
z`-^P3y#>dghcZ-yeS&?^yJeObqdBxnZ6z*>=yfI!cY~2T5*cEWyWcUED2Q2p@DKoz
z^OkzZ20>xZGW_|beg{&(M*r^H<#dy|iq<S=nJ;i9J-`zSqi)1Pj^x!~s)ft3?OrFe
z@?=SvYnL6%;YJQHpy<ua2x^SF{}^T$J0jMBJC^D?arUnjmeBED#%6p6wggHG4{alb
z8PH;4{nc|hgGfAeJ&v-yybeO-%jEmEE0;PcsFR|MFCT8$QIoiMR+*?OJAd}|cL5Tv
z`6J!>Og^qS$Jzp;gQ?*iK&xyqwoSNqVV9;-wY>Bspr8Ti;34;h$o4MC1^b+y{g<PY
zc+>*55ZzjeWc6f)u8Ng9YEkK>jNC-{Gs}VJgcq(_Z-0ggT3-5t0G)sPE93~qXib;-
z5LBi{NKsUJY%s)ymtC2A6uR|VkQQsmlZ8kUrOP}~K7(I=^oSkGxQw1GjA0^MV%;%L
z0MBEeSY!ch`*juR$+7!jxlX!YaQFf2)qaVx6X=@~yOIY|;Q7Tu&urcxOemAGWQ(_%
z&%;!GQtn8uG%}mcAx~*me%RC!O0xY2>NJ^*f>P#Kp-eBx45d;fTDndGZeXa&yJQ*0
za^P$+D(OSmdXmuwlJN$mZO$v<eS5*bBkD{+Q@{Z_HD%Tq!kK}pFeT$B)O93rHny^C
zj)}qjNr#EtqUB`7pjJ7Bn9^EBS>0QWU^gG(CY-0dir%z;;(1zsS?Q1AKQj86wg$o7
ztaYCK?g)FeF_ehxGfp3bBUXIuApba`PhLixgH}sI7BA?5T!650fhsDPJussQVzT~L
zP5z4y@!x}?g|=E(0Tcw}790dbGQ|XgAO(pKDn<8@0#K@EpoAuZF5va2QMp}pDk7RR
zQo~vV)0?F%tU^IPdpV&b?6r{KV$U;U+A#_+^7mH^Q|6no{|gb${o(8lWT=GQf!OKn
z7SHRJpQ4oz;O`yEFG^0h1{E6PX?mV5jwt~=Im%x9VoS4;QCgDzQhy8wG}fsV1JO1V
zcM6lDQh@)v|NL%>uhf-KE=_w#{GDgG=1DGP^8y_P>Ioics)A5zU<IiM`DT)4U_Htc
zQaGl{PZ-6e*HTAsQg{k1ejA9c)0dVr-^FY1Neg?UH-n|;()q&WG?Y}2knJcX{?SF(
zOJRJNHMGDvg~aE5`PK=J0h1C?z|a{EXs&@%6QHT?_bwIk8v16^Sx+D(qT0e~SMNGs
zVqS${ZY8I~R>A;TspE3o<7$qF=&{j!*nQi@J1H*qy&fRj5}9W1>v(;&Vb7tAwk0(9
zX1sh-ItRzL-7*><-FadFS0C!q8K!i%5?|hQ67tW-8Q|}R+f@|t;Ic$CbWHI!seIY3
zIe^Og<x^O0sen0PAcuv?{1aY58(U(|as4yg1q0xwqdiI`$m8$IgF2>vEl}gt)2MvJ
z;gtLYk>PVo4kG_^Iw>~XrqR+p-OR`089eK{vweJqASd7@vpFlX(jNH<!-rQQxNo44
zh{cYfQeJ1q5tq%SoVD&@_5cT8f5_t`%U*$!_xNDZ>;^z~{Ws{A6+fmmO=-OL;THV;
zus@QT@><py>O?g;0>5_oN7s6A7PvE~9pb-ae#N05e%sWJJtWYNI&ELSq4mldQ2=9#
z`vU(jc>Y(av-6N3Ae1N|AOimb-s~ZM${Za5pr%El7L$$<ej*XEgw4ZpF$C|XJ2F~Y
z#aYY+i(j>7&vy&yFYxq@%bWY6mo25l0o3OGDC2c!%j@--0`U3x+zz69A0F$wMN$02
zORhsol7=%CP5jV;jLF3iwdX9hOGcD6<Od8eR$`sL7*y{qHQKlVl#*T&H(4dd?|ms9
zus2yT>I_cCYPwEqhIezA^T%Q<77F`*0GiNr`~`L^B*Mo>e6ZO63)@J@Fqo>rU@%4g
zBQ>m?f}iZCwpg7>R&Sj{rVPv+iupA-bbx1enWI+;``7|Oa603ZVjH;wL(-z&0Znn~
z5H9}mw0MTe1(!`*@n#Iwq7e=93k5VifES@sNo*bC9=`!3ii(saI8k~MU(3w{W)7{j
zUX%$8JUix+_eX&S!K$iFTT_!=GiOa}i2>Qlq6IhOcG@ehjGEgLCyOEfv2W?$yv1pA
zIb$!pW<8rs;3lQ>&p@Cd-A&~|d{)*yLI7wXBAv);-Uzk8`9NG(Ky@37L}C>qfUd6e
zgMD-F76jWB3f@)Y8FvYnC7_nl=kLP-EIK8{+(i0@Bh^x9*Ey`dUcv1SFbl|8Wbv+X
z+>Dkf5qZzB{ae|1+de+rvRmLoGeaFkTUW>|t2w31FZASyo~G8RV~8!DIzpA#uX0+B
zXHtKPVE(#Qq>@_9kejW*=R5@qa7|1{-a~8>5rzd3_~-AbzRQ(`p<%kc!Q>RHp{|e4
z>=bO>kc~5O#H+3iU!9SYvvKvKb2bkFx_(qz&lP%RPW6rF=4zWu)Z>aAEaQj;Y>~C*
zd`Ky5dZEUEtA5d*WDQDWo^GBzYRzxlwa^Miq`Dkc_xcY5)mpuS<w_VifS3A`tA^HQ
zQFV5uWpaC#t{S7yn&Vc@m`roVJ#2Nm+(7j@LqpTH`ttyZmtML&!2-U=cpES-EMJ*R
zrwvyq{LB)jo@PB%1;XG=y#dP(y(gXnbqBelq@ukWVXRR9;W1nuQFovx#Cg?+$mP0m
zR$K+*&wW`~J9<x?7kW<&U>g>3PXOZ9jr@1l63yCA+^HtdWt8pJ@|jO!LFGFVy}u}e
z`9~i8`sn_Hh=0)wWZv|J88rD}5%(K@m0GQ%LFkt2%%nt~pa*fxR4_oZ&z6)y*p{zV
zRUn*J)hw+z%(U9$zKy`?{&d8xow>zdcD6xKtAXOU=+D5)B){w~17M;fWPpO18Wz$F
zPpfrhxkK^m<Sjo^^}|EgP@t++u$fw8sxL%ZE0xwHU8Vj^qQ#k|t=nBHOLHp!^<ne+
z&Suk#q03*#H+x_~m#&I*lX)&rb2d>ad29hK&^B(9#oyT-bQm*N)ngJ+l_Z0NGuDw{
zp-TM`@@k|JAodN{0HDOHmUqiSZjMZv*}sq(&f21cTnsw7^9vEr-tqJd5DV08SVD{1
zDi$GWtahLiXqnw(&tZ%5tDgmLru-2(yb4vjZ(qv5W3bNpeGw|#&y9OFCXZ9)J-kpE
zU7p*%^z+d(+ha%34Ov~uopAsIdP(*$g;)#4oa*b1rnr}r77$-V?h9Y~C56Hp(qw%F
zJ-9GRmRO`9g&Z|YW&CcEAca>8NAkmzX>yoQJ$j8rsV5k>5eX~uOPh3OcqOcP@HE!W
znPD$aTWvp2dkyt=_;<Q5)hd_xD?tb2{0&3$ptisQ%eY_T9yaYqb?Q7<=86&S7wY~_
zJ@X&x*$+leAYgL(Irr0!H)CW}MI*#x*!qU#K>I>RMQkU?8!MSxIJ-YV*9F<(K+HWl
zfgi3a;9LjJw*hu7#j*MvUvvTj?%W@Y7tDdn`!|@JbUr(<S&F5AA|b_%Ia+5-d3(-K
z@O0js!m|1Oz)d|yOnC$=-+06d9oq1EA2u!M$sMMo6|gufoh1C5YGXYNM=``Tmh=bN
z01`xjq4m)w@_=H4lavaVh{kTxDW*Gl3>@HCM^e?U%fAWYDIa&pXU9bBOn4OH)GDN@
z!C859;_}Q9pQ>Btil0}X`c44zc{qF2d0_zX_hEycusnBiKQCvX`r0HMy7gwSAF$ZS
zf4Z#M1i(MwK8bchM%z_W2mBH^kcy2gXpsAiRk?@jO%5D#x#tT+1?*|L3_fb5`ZvWq
zwB;P=M;{(_5>Bem&Y=Y(Z8m_}xu_*Vz#+%y9Z{{#P^mEPr}wM4p+<Xg_oJ#?w?pp#
z7MG{lAeJ(VQ+O1UB0*GwS*Obfbr96#JT~9L)I*Pp?fYqMUIP~`IeKlla92s>l^Ba!
z^ZK?EMLCCHGQ9UQ=|*cl&?WM3mGivfZtrv-tEkKkF~T?3@IW)kyU>5Lj(oVUsPtcx
z_4F_A`2Q#Cc#iM@d1($xOUmeDf4%UwS21vCBNODsH^7<@l1M6GW+SkvvW=Msw6IpE
zvu`k+_=@i1oSv56L{Y<su>wJaQt!9grhmvmP9@*uZn_1YHeMI>_XmPyjwHu}yYeQF
zQ_0X$d+18Ra;<E{CP%xZ9%fq1=Q7N>isQFq1C8Du<QNSAYIVL_Y&fyyqM1#$ZfhI{
zz|L$kyb<7$$0ohwZ_UOF_8k3XyL4u-{t2=~ifGq0)O4?c!sKhHL_M=ejXd6Cwi0+P
z-5CV6z5_hYyxcmToGrt{MO9yK?8hD5)SGd)DG!DP=)|ce6wTIozL>gvb=j^7A;-)T
z8Kw>?m8MpJmwyhH10(K;hEnpTs$(9>q=neA*AeB=PclT})o$W0;XjvwlPGlY>qu$5
z%)3zAuD1jy#z8G)yz+!myes)LwIeKJcV+cauP-!z^ibZFRWn$Jj$HJypESxTxMs%E
ze<v@Hak5q6KmrprGd3aJb6J@aSimsou{$E=Aa9HT{P7aN_wV#blMnJQi%bC@FdRzX
z_E3`x>>(K3yoRkWh{Z1(r;RdLwaI*MJ@<Z$+A<n`pgfb6`Pp?^$t$jaj4dv?O=Jbk
z!UVI8l61^GfOhT$c>*htv`fr3Y+B?*<zZ_O#1AP?CbzJ8;TOJ@Ob8PVeeo_&Z20^L
z@;}cE*Bu#P_sHIb)V4ja@EafD)MemwK0Peg3cY~!m+?1LQ8zZV{H^GpK<L+rF$>Tk
zPDkcp8W}1Y(Fcpzh&?}(5E+Ov{KJUC0zOyyw!#U|cpQBM6$~RJmDIz_zt>A?e1Af~
z|6Cl#{$l=BDx%hbDN2}Z!EU`yxISBGo=t!u;mK*g=+u*3cL+3ENWIM}%?^ecw&te5
zW_gC7GXcN&qcMoFNQF+E_xAt!FLiJ^!K!~m5C0?j|8;M>92CSQE(aatshs+g6eTnY
z+j75!X?mS$FeESvi6JCto$$s|$T=AR!@b<7<CXKwv|elKzOj|#X8PgrFc2xU=<;;b
z6_I9|A}RwOz_5MxoUOVv`c3okbbJ-2Wr%u?>5zp6Sfx(qnco*g)2L$0em0$*S%hbZ
z`hR{Vo>@$__3*(XJr3L%zu&`(nXgo;G|8N=TXR&Gd5=~jJiw>ohjP*CYcIY4@=&rE
z#Xct5tax4~5wZGoHx3C$T0J&7M{Gm8>ts5@f6=@3W}O+RDSWrtCR6kTzz-?+Jw^AQ
zghRGphBr~sclWV>=aNiI7*K9ul%#XN0L_Sy$>YiW`mqe0N2Qjo%HtZJGoAims7@)$
zVV`7E#JR7X+f-JNM5O|kGMDB732L~GrrHBNKs{~ch6)pyDR{TwteT!X`9@2aHM;hy
zz)X{d485vt%S>Lv)4<+}VBK;W9_yDArFAvn1fa4uq#NFBz%4(=Va{dR6{#y12G{=r
zw|<4N=N`QNPIBsV%3PzXvTM0=e~VduZDwX>o`Fzcv^N#4``PH`*2NCcyi@AwT4&G9
zm|QqlDoM1640-GiR+*aX{SbyyNP-J8gwrG&2ECNMNaZ=;{(?ag;EJ`c^sO_m6WvU&
z&KW{JWfJLc6TN_=I|p{1w+xMP3IYFTI>ua1UA^EfWIRHwk9uU_fq;KOET5Y30Cfb1
zk?ipC>Sui%?L`3!WtAX6cY{lOm!ucULQR)dG;3^!tTW=R%&CfK(}|8lW8zmCve^<r
z*NE75QN3T<3#@2y0y?cB^oHjm8Mjomq7C_(4<~9-W;`9r``-l?iAe5RHgeZugP8UI
zPkLoi>`iz7gS6@&q+I{Bt&^)2la;H9xqXTQ2Fm}r=k9Vqrd)7KLHr%9Fp6vD<cR}C
zII<MWEdK!lQVa$H!u>yI_5UvX;1dCZ4Zv>}<PZ6QP&E1~QT^}PZ4e+JZ2u_}K7ma6
z5<mtVPr9V)f{Ux5#I#6FsSFno<J!r`LQ_&h{?)6?aP{uByFn~YI6!-2A_tA46b!m8
zaq-kcwoegFnZ22w^?#h1zWMri{Gtlt;XjuUlFu7%iD!=%WhiAXKE$O*Xy#={52uD>
z$ryCl=d0hZ1Ny<k5Uyf3O>KUXwe#Ps)wBY*-M@Z=iYd)UZvQHuDZ1>wM;%h{+pgbM
z)wWWm6In6A*7gjrvMBF64|94eJB^eNp6T@<>=JdtS@E8V!;aO+YJd^DfZO#Nj2<f<
zFI2PRfwt3RIMSGFw4ZCG73rP*s*=9Xjz~f~Q5;qKah{DP<W>wE6RN-CJ?_k8a;F8f
z02oeQBD8u)&aFG<5~D*;8i7#oOmpg9UV#=Hc*jdM$QC3g*sfMlW@m?O*WxO5{6cd3
zX`ejZ3ysbJ4C^osr=4^_<}DyInJB!z@Tf3ms3<=>a}YcWQyM(IagxaqV5^+3PRm0S
zETO@Ck9QOso5yG%6F3H6>UM8A{s|Z|+TQZKdP_YYw=42PI<GsG`14GCVuIi6cE|uM
zL`-4mDW{vmLl~<^-Bv_&DASx-Uc7e{XI7kJQc%(=^i*ZC$-rPJ<DhW}{TU<s8`1_w
z7iwCJeEK|~!qSDvUI~ae!Hi-2<eM2{m@b@MiB0*(n+=|<1AaVDdgw@zToqugv}9cx
zRf0&Lz5CNL1?ucQq>*Tz6EO+ZmT3cr0cyVA^y%#9?eYNQ2o-rbVekn1#E|tto40;x
zKcvM&tt1g8<&8v4kVLh!d^QxbXF|0dDGpU)vO-C0#it~lciKZ0=teFhq38x5LHsW3
zmVFmKm-vu)H3_ccBrwtdF@;CkT(u*-lG9TC+)?U`%n}V%SHy4<RPxv#9ru|)KSYtO
z(1`LG>%WbPm557IYD&Mb8X(*P4x^A(SGZ<g)trVnEEQQAEtyh7-d6gFGgU!H-*e(7
z{jL7jL{5fbk8n}cLNy?TrEjB-8ngC(-bd&p=e6(E!?NGs?=Q+PQcd?KGsy@>ECio_
z*s4!Y947&NIu%xz8-5lJC+fEw@NF3@KZF}VwjNyT!HaQhw&u6R177I=cCNcov*|zL
z4sKxdF&uJN0--#AC2sH_I?UBZ^j&k(?JP9jNu0gIORjh@^dCeLH$b;*K7N*MJdO03
zWg(1l!uXMI1#Dbp-GNQb85mVg|Kuo&%$_~6i#QO^jCanlgwna0MXz!njj2i_|HJs}
z_=PkI8Q(iln)~HJ3Lw0pE`T1Vr8Mlqf1NhU=NF+#M(<?>tAP-M(s9~Q+LW5xZ)iOJ
z1(#je@5p6<(pG|a2{2uPbr}1k+3|h7!c&*6_haZcaoBWik=N?>@fi;aP7S7@xAUHE
z*hn#x0M}eWpyz53`!jsehk_=6+;mtHtYVJ6*#Bs${WS;Y4k*=@q6a2jE}Ldvd@0RS
zxX`!b5Q@(M9e<nGvuXeIDi1XYGOUDU3@^1#Bu$|w%gO8o0Z1W^A=k=e9l<Uh;Sqp1
z8i&!RJPbz&i52oUXz)iA^#zypg;&{6f8o|vY^a?TU*Mqj<O!tQ(4gA>0b9np0*xXq
zOmUzs5|0}@2Q>f4|3$1sI>jOXD0tKvk4p3lRY@W&oln6`bg?^p6J>&7izET9lOlGX
zab=n`!tbc^C|HpyPT>Uu^0LO)H)a$kVN8djN0gI8?-Sf1KJfI+?yp3OdW5L%Xo^b`
zM-xA0ssWRA8Cb_r!LI=Mg}x9d6v2pyq`XmuCbQIADUu&UM+(y3T?u70KO-A&|4XT{
zLZAkCO1+p6VAp9;8U0(41|7~VXmgnd1BDA4Z>1L}mJ(G#e%vx-V`ztQzJc+0b<0!o
zFO`x1!Z6fdkiXQ2oeVkK#3I=(r&9fodAGTn-`|gqSV3Sd4(2M&Nn#8MW1JV>rY2*e
zp^1L`GEBZQ<LudE;LUik`h&J}DL4D?=6h90rh9H>fJHdqpb+Nd(mlJ4WVxX<bq^M;
zyM_=d3RTQ)iMz%cmdV+}lqZw2nN`j3xL01`Ezh<wD~f9gAGyb~x=)01b|e#61{nrH
zKx~gN>MC9@+r12TU!qw#5sgwj-wc}Q4jdCPPT{ETF?@Uj>Nt8%IAvk(o0faQv<++d
z^?{2ephHKDBrzhm2l<ch4!_(jO(M-W9#2z)+`0|@iO=eSl!JeuY{g%sY~$BZHxBn*
z-;ZT3OJ)ZF1r*E&@alV7`<r$>OkIhqLVJ^fhW2TD{@?xA_z1IGCgR-Mf!ATb5BBTW
z<>EuEG9#_MtNM2?NFkdi`!x|invBmdf}BIi01*t0GdJHs_i+SZoI-BAG8E|ROq3vP
z)j<=o%JEUO_Grn7S~%HV8Wa8z@6Wh1y7J9Q!l>En-QgU_Xmy8*^8Q#kxl~)->TA(v
zef4ykvNXkEO(it9N^k|u9A#!R=ozZMO&PvT-a!#AIvk@yg9>dq<99g@HJO}R_J^FC
zBn${l$A3ZpONaA}Hp2G5WVV9>0TKG2WM-Dsf=R<Og5z@BI%8^1l&l0rKrR-5!bAlD
zv8VZGA^&e7B!JP(-o(u<Pshese<bN!Ham;U*SF1Lqe;Nnejn^Iou#eeSWOTFM~*YS
zF$rl}+c#N~a4s?nrHxy(V-O`CIo=ozG}t%-JfzbcE_g$sV-R)x26cU=$z&r`AP9lP
z9%O7R@M|Y$VfqXw>QmWE$xFjS!((M_MX8>^?*%zX2k@Xy$a~*t`>n;%zt)IZVEq<~
z$RxOMPxD>j_Q8hmw|rme{S85It?&?zz~@bM$b^9G{?s3TV8Q=tjAaFXEeu^N=8ZyX
z40~c_xY(@6`|CihpJU|>Ln1%kpy&^U(F}GKPNAjbhXuMv5@>(yYKiigyZ>OGMJ%P6
zN9rD0KLEWk!=(zRo}03Q@+Ww1$x(hyc9g7A%x$VaKU2#3UIk@}$Fg)IW%)%Wof>;q
z)dV}iqeWM|E{}rB?0kv%n5nObtjBU?8ZOOJiT;=?#hpXeQ3kB91nr7!no-pXBb$a>
z7i04gJV$ozM6Q2LI&Ob%<%B**Zh2eH^OS$-D*&{gUcDd7rb%0h4Ppuv|5*CM8+@|H
z5~qGbwVz(ilVPn<L$hK*Cy+<a=M>-I!lIP%bdt88T^TJug8iaNclGU<zqLa%g)&%$
zC@QnjV&9nGaTMZE(~ClML0XLzGrEN-=H?7`G$hJeKE)$sVk*R?SrC<r>|UAFJt|9q
z96;UBx%57ZCC@F?B!Ie&(}=YOZsx+anhH%RudwPi=BCupCc^yN;saDfMU0y8boIs7
zpk`aQh{3}FhRt$rl*0xyw$*YLcH|(c?8af)PKtR^_J`a|oAvZ`_L{lb<PQ(NP!=|`
zU4@X(*r=H;=54(Ymg=>dYNPFr*2X%M5x^>k$K`6R_9iuS%>}$6YR!#e*x(9F^Y)fT
zFJ<OW&7}7b6&1aWQUMv9;>8NQ5QCBlJJ?pKkf<AM2K}VYu3z6ch?2jn9ezA&Ntj))
zTsIoqt=BlhL{t%MYKD`R)n0u{r1J1$BT9L3hIwYy#&?5Hez2_ikNUV+OtWJUumCRC
z9+dez80;6L`XCCWsT-ve^;9R_p6FxRvSk4`%j>;nIXHUd&=BF(MGOOXAI9`0fqW_X
z;!=^x<^JJaZOxT6?Q(J8R_XS*_D(i!;4!rv3WyX(?eL!^JdCE1GIXA;nG^FHq?vlj
zk{WZ5s?kVJd_$`1_cg{ZiIR$V=z!DI12(eSSO-FRfl%V?SoULOtY-@HdHbTJ2|SON
zSp-@bvu$}3baxB7TUSy?$P3Kk6b}utoD7@wj_IJYb6LpnoG}AYeTX|~Si6l`^agE?
zPUQyM^{XM?;R!Gr(MV@dYC|j>=}a4nQ1H(1dPf-DnNK@BNBHh2obBYi34l?apkiBj
zQ3xy+A}Y!pcrGQI2#}4{3KJemmHleLygC|QH<eq6(Eij1a#5+It~%z20~N~tV5Ft+
z>AH2zN-TxjXuigz$H+A2C3G?ygw13v>_}Q)=jIGy(J;k;GZ)u$c9OXKm!Zk4L{=it
zOtz-}!cADTgcd@Ua}TknHh?>i=Ah>2U!GV}D;)Qje1rwu#P2Z<EZYlpNj|jDhbjtl
z?#{q-eR>_|vpx0h50+0zWP@{TNcP;s0<oRpWEa61Vt_-IF&H3@EZ3l_hDCk6*Y4nY
zy|pQ#=sP+w_sd!4w*zcZIhCqI?X}&t3IwxZB6tj~n#-OJ7a?;!fM6(aMryTuoh!#A
zUHmc?Bfe6#tV$?7-Dz+C-?>?A5KD4E$zWB(1)gq8MCVzJTr2npH)Wk9bQYzkJ0{|s
zfSgN(g&S=+JF@WcLr9q_Raf|}Xg&C?AUuSv8p+*(Yw?O;hFO?VzK%Fb24G9H&7NO}
zk}^N~6=L#03rmRt;CE-Jdj+sve<pD)&d#H}gO6jwQCiy*8#Sqd#K4sWh2qa0d=$(O
zb9vKZVwgJ|ZNwH!@0~iHf#`Z|&6fNAAj2{6Dz$^8yJRd;?wD1KF@p}8fFkCw6mev*
zidC$SM2oh_3D-4EU%|U&b)`vn#GxZxBbH68v$QJKr2tYNFmYioL5~@S;~J;x`?=Qw
z9j>P_3Vq$BS;uyy=h{ocMJ=^Ot%dEH;=h@gb8IW-IB*TzqHV`{AfTZAvjsWQMAAOx
zrK8>Xt0X!Oi*?q+V4B^hE@UY}2NQvxD%I{*c_t6IMd3vi=ib29v~BMJnxMlYzrT@y
zE!Ic%YM!YIz>0zJLuX|pr;SGF2?a2lx9c+nk@y`MiuEzQTDukma~(qgw+cq`LG8o{
zmG@7w2nz@&B6;zCAiNjq+mDAnAirig5-cQOOWYrrju?**(T<FEn&naYVSEW{g4<9a
zH`WMXTf%JghI*M+^;p=L<rwmt`T9$`P#faIk4+l`?37&SZhuE^=$5v;HM%~M0YAk{
zMX#HT$x#*1q4e}(ifwvC9wd|57&sO9QDP~gy@03$BW$!*>Nszhb!$iEKz`Z;n+LWu
zM3sRu6IuFr$w7e;h6QO->}chMx_INTlVMSY5e5SOMoge~?tSG;Q&%lpRUfPI_0Zap
zi`WZ*PJ%Ms-q8R3q;BeBFx79QY`MbqGQCMvEI*Oze3`^7isChyBns#+IESY?9A&sT
z6y^2m)n>f92FQbl3RAk1EMViOCwMX^aul=@+Je9^I`v`2Z<zCc$|%U(p?HRc3L5Y&
z(moX=EmkyVxzbFrOw>W<Vr_Q*H;M(ZW^n@q40QBz3KYw_MAt12jI_+r7EkaLmOP1j
zXzzh*{H(eh>lVuCYzn}(n4CvyE+on+*XzbWTn({Mq&|Lh!8xIr6BWqd4Y`+e(;ED!
z8}OY%YYdEKpz)y7h4TdWYpcv~rcd%u#YpQ&4aHmW`#!ia=FXQ$<cC3BMsl4ua_j?)
zZnl?-<(V1w_~~s$trR8uuAzE{!Je|Cadu_iW$^16^xMU{bE+w}^*K%BkMi+eqJ{hm
zwe0TY(BEPy7b`BS-8p4?duFAD#+923{@cBed7IRMb-tb-A(}u`E`5uFpU}nF0McyV
z&-9Ke!KQ8bhI|}lqjtN(hDzs2EY5$^-Y7&m`SYMp>k<}R8A9V=i7a-r@I|I}1Cc2k
z$Hr64_0FCw9RBM@Yp*q6;_q^1fy<Q)Pz)<JprS1mX|phy&!vu?pra-hA^@U^S->4P
z(bpznR@&%Kclg7aE87k#9EDJzM<vy_K2}P^Iry$;^O)#S5?Bm^$T56<G#8+2+bO`I
z!TNJ6u=fjLaIBDk;6*DeIKu4%2I<H6xe+d97sZV*z0c<0_I>=(NYXL?PS6m%!s!P8
zt=)MxPIKMf7}{!W6SJd~s_shuy$C;q9?PW)AF(x#TrcHdIgSkro4<K8*Sh?p0XY}>
zahz;Q+4qLXxHZRNVdh4*uK=JD{PrYdb?~euzuzcniLv0(g_gGwGYE^SvMQq(|5*~a
zM``!z@O|HDALpbIFaZACba;zWvX7U2?e%Vl;>vU2y79w%@?+mY5M-Ba+-LBhC$x5!
zFcS>v<UlbVK8Mh2-|<E3zB2%cCbcH~3d6xr=Uv3Q_wH5+=3Ymhjvnyi(4JH(2={uF
zux@v%G2-j>eT<7Aqj-Lc%i2_M#QP&@Z40Tl^UCJviNwemWb{X@_1W0?NfRtjkV@Qf
z0QDZ+AlluNNsDoNPn~3VNdI7_u9L;D&6vjS<Hn%&h6=1h&*Gm%hdCIRVWR=AMCD+;
z+%{Z_q!z#A4pRJB8dm{Wch3jtsQQW_GMFM7zw{a!uu|;&IW16VqA_YQ=RrS@JI4<M
z(&VjDY@$cpt0XS(c}vjo?mkrAQwoNc1*l1%*;Q{v0)@&RsTKW#>B*~}X_~?M1gFOf
zyGLns1g)gx_<D}V>sIJxX9|0&nusXS)pfO3V_YTlcVb{ylxhIaP@laOTXBOyLN<&V
z0}8fXRSSA4TB+swnqR~xi?rXWo)~KvS)?9PCHbg2E8Y(ISA5?Gg7jsK$#r$jeMn0Y
zi*hLEt4TBVTVD2-7EFru>rN7p(dASs126pY#;EcVXcrBLbS{FM&(Nk|ZHJ&wKXJ57
z$(D@K%pBMVM==5Xad7u*>(NGsq&;$zuMG$V#Smi)v}DGU-YpX}))}Vm(lors^7a{&
zVHRkf(o{u@;f$T2SW^m-6NbabD&K*Se8)Ub<5L~#JHuQ@V)`_IUmOoObtyuJzC1uY
zH`mN`+83e`>x<(dBxj+`Zf2Z+YoYi8u_~*%k~8prX<dMIcU-TW5U6`(_b4-#K=F8f
z+twM~XSZE`EA?nCnsX9Y|FgRfn~n1IDITJWBb}?m@#-d;tN{G$(S$4)v?DV9kOF3|
z^2tAMG#oP{W)tr16@jA*hq*dIA!gKTiRJsY2!9fc<AE$A%~r8OA*k{3MftTr1F4Dy
z6MEih>rVh``3XKSVW@?^J@^79zF=4l5r1YsRur~&`VroB>cy&XzE=IajU9avpDm28
zj?_Fcl8^d85er3&g)_fVA~K`RE_bu$?gYe=Bb7^&u<HJ3)jOs~A|EPiQesD^wJ+LS
zF+V9(aC&wCXxAJ2XIJCNB>rdPA|y#{y*qP-Bnd!Gf@yZk>oc?|SUZ1E4fJcD>O|q7
za>m?fsDnG<v?utqFUhLxDNkXBs&JlX=J9P!4*rQ+Kux;~2a19InGNmZj-Ej=zffRl
z4#xwiw$C%G{A6>se3uJ6-GJS`hbSXZY5s#`Mw*4V53xznIp@qb*zj3J<d!pqWK8JN
zo(}Nl@6WpH+ylYn)GQ0?M2b0!38XK(O<(q<W$;=?{lt&>_g=+I`L|{AQdrWAXd}y3
zXs4q$<%((|qq6JC8WPVXH5ta?+pl4KsQVHAN)6gY$o+7}48I;a3O+6xm>PS9{0z4u
z8s^ywr(LFNWFp&5?uF9bmsRuz_4(0@bP713{r52%w8v15Dkt5wKP@i(HDzT|ah~Rp
z#xKnPWCRYw(Fju;{OQFsQ=QtL`3Mfo?$-ASjPO&R{ITCB`mOWi))ynZxa{?$HgoUn
zrIFU1ea@i{sa&Bw8;8;@I0?Jc+&z0y>hOk><Em$=W8N^#OL90A%?(6$nFS&zR$+ki
z))X99F1Mq=(QT5^4JRC<zp<xxKk~=Ma(SkWd4L5m@kYpUMya4Z<jwa@^aFHF@b$8M
zfi!&g*;~N1V~QS<`U3@@Ja4b^v~@BXKb~ufNtZFH$i+EUC@<CSf<vs>9VBK1CRdIG
zzr2tP`Yw)=jVb&)7os6i>9}tF$P7SKXg2JsxuNruT+gWTYzo#rmv^2Ha$@;C-NUJA
z`c@2=Hm^^`{iAn^&S`6t<Z({zM7>(}Cj-mO&i*a8)zq2N#G9Y5n#CFdwhw-*qGxZZ
zNnM(8zlm<JcMs^t9s~l%>YGE%88jxU7}B9R>4}Pb%bmOYjSKHY&Il~N#SFlVf}YJQ
zEPU+9AOPD9{rANMT9aCS!066cpoLI24l5oWf6Sy&aJ}<!Rg<8-Y<&*%c4dxjZ~2vo
zA;gf)BM{aD%SokpOX5#_|Ik~fGssXCI`@2_(9S`=liGq8G*kaE!<W)<vsaW={}Ad<
zo7_E9%ik~be2oU&PpL(pG($j1z?x`dT5NR${j{!Z-zz;|dg5dH6W>G;prH5R4ct54
zv;}C%13Kdhn%DLscVV*2`d8L}HwNH#CotTsmd~xeqwHd>;uu#x?lu{^uA_34rE%FR
zynUIf6dY*pz}Pb`BjB_o0*+*i7sCp{#4z!^di6|YLhID}TojNXwggC0aI1~*8j1U=
zu+dz3_z{LnOTRAH&r7LMCOm9*eq1SSI_Ia!k!t7D50ntNBN;s)+o2?CR{kp>@Csx1
zQ)vMxbl_TN5GTYkC1@275IK5J_VMHPfHhk%*`_tDi*I<4-lmOEZJ#7L)$B~Os(fJZ
ziLf5qYiEontFR1G6a>Up8vXJ^m(XNqBQM8%yT5%yI<>5`tVdMr<bGYKX&=aK;oF$9
zKb<xIR{G3<b5nd78q9m|H}Fa~xtbpTQ?QI?6V(a|4$J4)n1>Z?Ma18!WMXUbM(oKC
z;dZB286@@4LBTktO`7{TPx=n60%s?MqGVF3J!YkkRp5-(oFLp-Fef-GIMA1Kz-ZE+
z^2PWfK$zE)*Ad%4*4&@_g>ls{GC{UsH1VBtRsV2w*TUz5a9(c#AUM}VqcOZc{t{}Q
z)l))30Q)YS{P-uKsQ!(IC{ylj@l$@CBLKqH_0*Px(ZAC%QDr+I)X|44h>=_GVQDL<
z4_ZUmo>_k~$>~g*W-pu59pngseFrfKRv?X^Ros44k2M#HuFPge2y~ym1e`8@zrDZX
z1+it${6rbTxf+Q4u{P`iM#ah<We-W?{oy$|Y{M{@$!&L#+n3M9QYAJjuRp#=$_U^v
z!$<q=x-pCa_Rq>uniH>J0GIE^&45qp9n{#r-B^*?(iTG^2_GN|*gYBPo&T~Vlmu#}
z*|gG|0m(X<X?;f`nLY-qsn7jbl}TYcZfB-kcQTG$fbp43FusaVw7NO_6tF^^xqACd
zou`jK&yF?7Ll54@`)LPZPyyZfwE&KK@BQ}x!#dZC^!wsHqZ)zdh7+7@i%)ULn0?#a
zmLT>lf9)vPgR<p~8rvT_1okFOFFM>I#p;iaZG3%9(OdnP7<3dU73W$IDw?eD<2KgJ
zgs$dS;DxRo#X3Co78@wp8O1S^s%D;SGmJHnA*{?c`?z&>9W-!U%;UfK;Q&jx83Jb3
z<CY9t!wkL#P0T;9C9$nM1i{)FwnX}ayD@J_to8*h$9q1yB~JmxAEEP}#ny7^gB8OV
zLnFKn{@H)JLq61M_&|U2h>b3lHt80xjzvpFLl&juOp9VuGlG$B>*4XVP8auhtDuO8
zkdxIMcVp72m|D}oJ`=-EkpdQN+6j_vQy9uRIr%4Vuhim#wc9F~vFf6&qsKVtbT8G)
zx$(=4bjY4EAeZb!t&n>8lVi<`|G-><8Q?Y)%$A97go3&2ZX%vZ5KUO(ivu{k5hYD8
zz1rs+;`5oLXEx5CwAg1$w>~km1qa@4`lu4rlUw7+t%=~_RqG0~uK-`%;1Ngr!x_&g
z@D45*CkRQ4ie@*I(+Iil*Cz_*oXmT_874~CT5A<r9DjLUb9U7fd%#^^GA}wMDfVs-
z2nl=q7)u&}abGBqCu$lV9-=<??2KJ;wh_H>w@rquZ|{(`3OhTiU%FWrJ(XI|Icw^M
z(FAMEe#t9+)LvXHG-_UOG=WC&Y0>+|{%_lO{hyx|`S-&Cq7>rGf7`|yyJ~nE=--Z<
zIpG#)s?yZxy26{dpcEQ(ur_vj#JIS!6zJmBvlN{On~dEZ8^V8qf^W+ieP=04SVp{L
zq8?=dOIhD!-@Xetc?&L*0<Wln?y%ehDHEMsuUl^ai>q^L4>Q`fa2m6*Z6}RwJ85h*
zww-*jZQE93+qTWdR&%;9&c)vUVLi`WbBr<H(S6-<@@I<@06w96X<tS~LG4%z&<EzD
zBoo=jvTS;}P)~qcQ`Cf3B6Wt0)}T3xD8o&`>0WJ$0(TxqLxS^PB(X3S47h2m_CvjB
zB7?Uy=zA>A7`#0R<u9Fo!X_(bQd5I-sj19T^7HBNl=l1$IDfAUGubV<@alD+d!g&A
zR6=y%K&uB6=sgWZTrO2?cm?UB*!K3`1p&*hm%F?JM~lEW@Eo`XyA)#H^W<<Vr#{!A
z<n{T08?%=H5n6hP+QDqitBpIrhY62vT{Yy2$suqh%b;fxUTwSBVR3J%BG1nW>X!R2
z;o7Nr!cluI)=i!ozV4x|SQ56Da&V@1u$d0BagE$bBP#08#J&lWbU)&!rc7e3I~{2p
zv><I5j5ENP5^J*hkoi{<l5`8jtD~;NPe+#)=|0+m(<4rpMdeHlo8pY?#FMp*v0XX$
zjfun3VY}2pM*}a0dh^mm`X#*c1hak>JsLOVU5L%K0_>gq*5Ae$T{uIB)?>`=$!3b6
zTBrT0a5kLQ{}wuon7oC4YIu}NA+T$WH1WB9m@J^_w9R9wH!9dFjqL{|-}QX`l~Cqh
zn3l`wDa!&IM_uY*vogsvuKP^?d#mjpm=4Dc@jtCVC0q1*SB`!Yjhs9C?}@n`Bt1Fp
zV*T}kFyfM_3%2|Uu2jB~*Q?mAgIp_l{N=_`YnkiB@F>4nE!Io3cK)#Tp1hpwR^E8&
zT?YWh!J(*VRBJrQ#MaIz|88r^64~8Sf%j9(dW31rMA=;Cqxnz1x874+v$66THzFs?
z!>mmj$Zc>4#u}6J=kL*yd?vE@kl`P%9rj6onBH0hFL0v6AGkHz0fhXAUYw?;=8zjO
z^d-4w1n#wK>L)1HeTl&vRN_xr_q^N)2}U5M@`63zK0QO~5NWEM<H9|cR9N4jsPy)#
zlr!ls%DUT+1wNZSms8{GZIL7l5&HOAgGs69mavKZ+$_X7B!A;#YPAuAxX)mQcYT-(
zj-Ssw#Gn4(KEe$@idT!nS@LZfar<N>sa;7=N$n)3-j=$*Wn9dn+^T7noK(ucN@W9%
z47Md5UMq809N9y}eC0a>Qbri^=ec`jhgpjp1}K*=;i2ZRh78$@XK2@j9-?26bFbfh
z@asnq(O!^{o6ec_1i{t-BvJ{?!ebL+_<HCNO)SllUs>4F<Jcsaq<7dT6{IrPzZcv!
z(J5N!8B0Z(*b)m^$t%9C&ys_wp`Ixe;1<+aWvGmuigs2#Zl84@kk5KwBqHFg3r=8e
z6vvKQPi~ejnw^`&be7D9wMBU2Ggfdg>he>?3E%7gxBrt9P`#0#IO-(?Y&j{5p?zJ-
zoyysAuntO>Ym}of{o_W6edLMd73CSc8TRBgfo^1GKkPqlyF2|l6F6ky&M27V<UfN)
zoaFT5=6_Lt*+m^#+h|HG%0}ZkyW;BTaeB(y;p%vvyU+E7w8tR_lVHLr-fQyb@2p&8
zQR)nRPJZzBM|4>3#Ts@2vRIH*{iygOb~`f|oexMToOL4dkot;ZCLlfShXg?hY3*`P
zTPqH5L{fWfRTDiz{0lCUolF#xtkXAcM2ktfHj6s;R%@uDQE#%2H2!*o^r=V~dxjJ1
z*vlm3mzr}qwm%(ZJYWoF$kB!uSiyQpxu?wIMjE1nUQT&lbxnl>89fa6JIuk?p70+P
z2a>f0k(R0`6gy|9hk8(GZh+=nqjC41XK@MNgbS8@$^1~qzE!+aQSJtzD1j0Bk(-$|
zIr8diKlRD6&y3?Zcm&d@o7{?N805=PMbXQz`|ck-X(-7=>iD_LI;WHRBk&Snp1-|3
z*rJ%TI6<ZiCOg=GnIv_(A!lnd+DhhKcZ3nHn0$RHu^8&f)3l=(cqhDjjoJFq`k)JL
zTYI_#3K4y;<5bHO-2{RWShcgdKep$1xwHe?cr6a0#M`!`_M98Tv{boZ6@A2YB?W9;
z@+4z%pTK9Yz4LQWbF_bqEOXG$h&N7`g{+SXib~_AI!z^@sQIk?xWtl+Y%QQ@pG+Te
z#NOQ1_IQ|ipgi?)1C3m%i&MR*__)kGSg}*n>{JcYq$S+T?WWqsw-Zc81u)EL(2|Qe
zE*ENq>O|eRvg$TDIrS~W6eq@WWJy@}de}C{sV=?BxxQjmts0_MjZPrh&%mFq+Db0j
z*{`b?#d`s44Rzg7b12!*45f?JVHY3XgBpKIG8)Eh@9}$9YVy|DB1;jQpZ`>%?2%u`
zo@dR7o}5LTW!8rFk;w@8hSLEJ#ygD5dMC(k4{A4ur<T2SbHiw1m|>O9-M_Op%TXtJ
zULnG0+8z1?5+54IVAqFLQOMJ0QAYYi`rYaUf=?M3=rOV;)aXQK=exsgN0BHYB&p}+
z{W(IbecGka*X=1FDGA{f(M{ERjkb^a=EqxXH_MVWM5r;8+Zxzouy3bwqYx(>0;(s*
zxJ^-slyA3(pMbR%MJkp+QnW0|Cif+g#}`^&X!ib0=#DqIrx@rj#SBf|%`BpA@P5zH
z8g0(csXG5dH4tJRx<Lrt(cgr?PS^uc>1cRVzR>=Rks$x(?T1hO*Z<rj#o8-OQvWk$
z|M`r403|S_3FEH4l*~V(wcYrDw;{bRDg_PNz^Nw%4YO(xh7U!1o1ozufGX@>pJPMb
zKvq;rmqeaa;-vxGL|5#bA5=U$i^A0>m`4xeb!P4Sbk>wj%`(~TYJTzextmh6Az11p
z^E%V}*5^6L>#FS}=RViz>bL&aloKP$9L--P>Lp+fa6c6|>)}29Y%%vOpZ#(l6(e*%
zb$Clo^_A<no&Uw^A0lP=l#nXJYg{Mtkfp~x&H#S~Hfq#jjy6{Yo9b!)-D|KHuCJ<G
zhoaT2T&Ko9I26ONIMj!CL!|Z=Z*CIZTD2hkB>#I(ZJque1c6pR9G~+y#=BW<@0c__
zx(vWc^}G8i0>8rE{m?V$93Ar1&pEpL+04$(fu&AiRyNp`3Z0YuC7o-M+uDG<e?!dk
z)TLYTD49TS2s2!)62jznKPGMGu!#CR6iw|=DkJh#F%3s}t%#(h+6#03*-?Q7@)UYO
z+fUXD(FK|e_TUxT&6+z%M4LU+{C8CvH+O)lUnrTQqEqTfUg#3V^zv!eWwY?k6!9~u
zrEIg(UNY`Y<x1V7QkW8b`*^R?L-6QQc=&s8t&)4`_)0~m%+ZC)vg$UyGagz;s4BY(
z!A}p3BjjXKnrkJGS`92!ca=S?M2x7RC}V9Eh2ki*g|>@mVm^Gfm67L>0tdcME^L5M
z9;aNzjLZbb!1&JJd3U$HiOXnkax~9&ScvZWdV6uJvD#~8`Dt6Rt`yfg+v~x{^Os62
z0!PTCF&X>jq{=czY_Tk#sqIpsg*k@VUGtOO>g;w0E!yVx^q>%w5*yRh`sRj{s+|{A
zQ)M++1AhOn*_!Ioj*hNsM4mtAaIV1b=ZELZb68hbNRi7lO~U^DBXrrn+fObRk<35Z
z3UBue9b$sBZx8Jc?0+IkL=S&T@x}j0h|YFI$)Le<yC{TAgzBmmXGRYn&_WNlcq(J0
zI2o9P8bdD+JdHJij4~C)>e_5jU5^sQ?RWrBlNO2JOS3IWRNUR~Uz;ewb>#+%A(%H)
z#f*>}gUf$=h7{&RH=%2%XW87=5vxQGMqNFe+LEr7UdQ0{&)o{~wW}(K53W*hPsKxj
zcb%4P_K&!SJgE1n6E@F~N>M+__H-=p7-Cg!0~t6J^4_Sv-V}}@Pk`rFAW`sEbvXNh
z(+Tkc7ZdOcU)DHwSx45lTiFwEy=H=(IzB_&OKONKN4y&1rk2|a>R+LS$8yQu@}F6M
z=a@Nt*nwy;Ydk=!h3@6O`zq_z)RHP|gGR!OfG3?VIcCGYiLvY}3bEOW3$PX#f^V$v
z;V_?w9>nDkEeJ^}JKd|BC6ua)Lmy+XE}E2_OyR4vrzcwXHJFtQlcED^Mz64=(#4re
zB<hK>nG-HT5O@I4>W&2w5fYf>KjuTj^$+H?#7Pes4$85vIQ523WC{t$(+TdR!d#gX
z>-!e<5Cs^`etP%!OIM=fG2glrVR4w*`Rp9I(FixK(tP5TNORc#=_E7$4h-Y=y*W+k
zl9@j`^J9(L$xtRBXiR~?`VT4cVnpoEu~W2nmxA3AG<I}(+D?VNPgufHCW$l*1&7Iq
z@?n8eKO}A}mParM?$Y2i8uwaN1u@7{5<@Yi5e1F}KR>e{9FXooD*^SyXgoG8In2vd
zwy_A~#_d(@k~Q>d9JC<_3tCBkm?z^obvlV+87<(&>a`2mpnQR;xJgaDAsh<0%7*M@
z15=@nR?4*+%0lEmHjY@@9pMBA8-haZ0@!R1586ZB0%iGLlhM&+$)dosGFzNaE}1O-
zP3_>3l$6LZnkot+XMi_+;RSYZ%-$eFSyv@MVzwElzOJ>%z1m-QoR+fGk=2dY1pRZ~
zohG-Hfs2#G78D2!gia-=W$cVA&o}p+SZY3VsW=2t^ANsucAQ1JjnRrbvPJ5|*%H%N
ze1VJ>80N5iF!7Wu^g5H$R+9M{nuFud%5>W_%yByfyHjvW+^u>LdvAjS1R(xf(0}H#
z{v{(^eo=nN8P3J%nz=D!d&Be5D<pN6EZjIlqS=6l(gN;~pM}c?a~Dp(w<{Nxo>~}~
z46>pkz{LOCYFPjB5(-TtFD{Z{yJlG|oT<yz&s@Up<lkm{rw;4ycCd9rNtD9lFPw%x
z#0)>*Va6{vwiT<IN|I*f`p50xvDp1hiu)p;+bq5P{O}X+Q2_Gh7*F|L<f(KRZ%b|i
zKTLFp&45|mgU}aR909tF+Pf9jzubVxfy7HDtU$%BlCSK+$ZK;|izv#Uv0xnAI!z}3
zPfr>o<TI{x`84rXq0^_Jeg(@9dSB^-($@`H_YC}n7i?eQgKOxG+;?OcoLg=-HLZpC
zvZ%xHKhs2zAqls0e#1LQW@1iw;Z#4028{Mf`~ZtFv~%M)`@2BR11A4Q)B-MQ`OmD=
z=*VLaR*hRwYYq`+ao5bnTFfCBuOqqXZ6X)wv|B-8g_0=0)kI%$fe~`WeVGHySG0va
zn+wm5z%6x%H|6~w_&z?FV9dXvV4b{(VtC92WBaD5e<5-B_Zq)pWExMHfkc9;OSwVy
z_X0l54LtPjIG~w@kSHA*DG|L9{?4`oieURX)|d+7wso}O8$X2$-OfgEdIlM-KKTCf
zN6~)YA_8s6S6zmQ26}5j+!NObky**-EWI;kR{f^+JIGp$Qj$O4_ftwQeeSIM`fDve
zaC*MKKR(-(^@tvDyi9?1|CwJCg9TF-R0I%N@vx%V|HKUTBV4#Bb2$96ZM1zxQG<d0
zLBFKs0EWWxnEk3qYqX+b01V=#_u0j(5MgkDl{=FlkFf87m_x-IfZ?{d_FeJQvf}=k
zZMu_FC3a}kRRizdnSZfCK5dX^{nJ<(VjBC$QqdMcf|6RAcgX;q8qpKNSa&%(SO!pz
zmQnWq2b(c{1;q5!4+!sgB-O>3rR;sK<~^omr5wp?OsMEhAS?(=bMc_|KrgcSOILA8
zal2i)CmrS5n){rG?08?f=u$><a#6YA@)kG}qOM!?l$|2CabfEz2}3!F`ib<<UYB0Q
zns?Dl$2kl~dx!EG{NRd?L6xNl*nk8UMb&R!%l7+f+y$lW(O@OsDApsoToh2j&oP_H
z;|RJO*uAZm$NlmUQ{62*DEpq?QjZVC3)Esqc5eb+I^h=;zce%qHIZE+Y<-6&)pOG+
zQmc}1<w-2Yuj6^C2b%0~!ZJH~jK1Y25%1+u3N;C8$3G4pdX4k7bKpsV(f|xB3`}VU
zWBk<M{3SiRABjx?p^<5s5NShqeLV&dlL5~Oh$m-kH3|o7W?&Dyhu7@<Z>bE)8nzRS
zR-At7_(`6UW1gH6x&I;!gFBtPfoR=zgHE7E-#}R2iNMPO<Fb=xB-9^c)R?NMpf$Nv
zL*A&YbMP_ucMAU9K^FxirUDp29`&i;<(1xf1krysBy$G6CCLAd7R-p__Zt6YbRbT=
z@mnCgRs3+DRmg(nD|8qh9x0ksTsLseU7ELQ$QZuhV&**DbSEdH^ac~Ap!|c4<ri@(
zb@6ZMy_VVCFk;K-0AC4S6RobPGQd><^9rraRAwDXbvg1Xq==uFW(SZ8Z|vW8mc9X6
zWX&%j|2~>q!a_GRuh~-5CidJIch{5EuLZaYx!fq2H4<k1NB{|=w>^_^XYBC*Vf|F^
zZ4%GMQ&K&a%6$3C_cd^A5G84?@6Gt(W`X?cPZ~B)8#o>Ovgd44&nTU%@a;sN*pdy)
zo_wCs9orQ_1f_(FQv{$U_WdhA%(mpdEC$}F-JkccRQnX^tp!C1#wQD7*5)C6^X12I
z?j$Y%d!TR<Ef9EX1~<%qt0J~TsaJXD)$utLsO)>|3i-8_@I^2`+mqTI_9T<{hlqpg
zmcF+9sQnF9#W4Wy*P*vK^G@h;Amf}EYoyx3=joEhp9c^=sxLrGg`vf44HY(NG)J+|
z|F?U2U_kV$f4xSVN0tuQufwaVu{g&Bm6DqFM3r%*Zb*E@1)0OknrZ<loP#~BkZHOS
z7WZL%@+llY&xCROrpwd8^z~nHXGs}q@h|U7T0hTFw4_t#DJ%<YEmO3h>fV29iR<Ur
z7C_OTT0OXUtDXaSc9QqJB;-k}Iy>O0Y;K6h1VcKwT!0*Za171EDtI+fsc@_|X>g|s
zNk=>k9Zi<K2I|X~%%mp2yRhf3)Wi?YXgGeNic0Llh>Z0E6-{Lz%bU&j#34iXzzv_W
z2D_9C?6=D=)@M#tf14cpSP_CZZ%J}Xf0&xQpY15NS`vU$89J3k;ZakLWw|a+-q1Sf
zNppMF#yOe1wDEPAbLJ@w6t{^&-U#_r;o65=9~Hwp-A@0E@<UTJ1(+51OhkrRxX-;p
zLJxRNWl|x8qjSdih{c{DLQY?#{47@@R604wRi0Q=d_}o3jg3ufzuKG9*;#^^o??&O
zi1qzrq6kn!S35Dg51-vpEsjO=1I9qc9`R2T_9s0TCtAP@_FD|X{`GvLhKG*ra1+$0
ztSie1fripYy$!mXQ)1;4cy?<3edgwYb6+nfJ$CP~%!s*W%T9Lwze$my)#DUZu~&yK
z7qJ7AN`nnr?dTyEa(-zSxRahgOrdVV##hT;ZUi{*;V7JG*`2L3_e|89njiIM%qN6e
zoWN)$=SN<ZHaKYU?RL0FEoW8SP1EyL)jp~vkJ)LeuHk9%XnD?v6d8^?z2rcd`xjwb
zP3#6$Xw6o1Ql9<fcv8oAl3`hNcHS3~Rej4~aZcZH$x!K`6-iymEy;O<|BY81Lm_6(
zDG#WVSg*Wlu`E(dw`{M(=!LMqBr~<2t0;Ro5Jw>GGYUMy)A2`cmpuC`d$*xH`Q(~S
z)I#_{A-VTwlQ$upw&Un*STJ3R3SNO8*A%K2k*2wUtpq|}{&)nn0b`9yM^+?Z1=mk+
zO0_MZYB0qslkYW?8q|d4XFKz1B7EPGyaoaeW=>7tV37Vg8P7eR5q*+wfymh&iaDd^
zN^smWa}TmP({jw(bfT=O865K){6a@r$6BUd<&vX>eueAMk(u!?Mavj8$KykMSd*Dq
zfD8K~Hh(7ZG~pb<<_<nQ9<;@rotTwCmK--i;=>I*)x@IPgFAbF0CN<CYF=q?%>nd;
z(AwglQw8@c1&g4g+(vo)r^eALl*>f&SI|6l^EuEwmGfJSL19sOkmpcAzGQXi+8D|*
z{O+Wc_>+=gvg!>I{!pu(M$`%0DG<S^qW!A-@`soL|Nd&|btslc<LhQ&mX>K?7GHTj
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
VwlMN}`%er%aGR6olj~j${vQ;P=LY})

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index b916c04dbb2..adb6acbd81b 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index a69d9cb6c20..65dcd68d65c 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index 53a6b238d41..6689b85beec 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 36524
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

delta 35766
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%0DG<S^qW!A-@`soL|Nd&|btslc<LhQ&mX>K?7GHTj
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
VwlMN}`%er%aGR6olj~j${vQ;P=LY})

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f7189a776c1..bc073f67610 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6c20..65dcd68d65c 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index 53a6b238d41..6689b85beec 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

From 0be89bf6a66dae9a878bf8dd8b97976c0ce3eeab Mon Sep 17 00:00:00 2001
From: Nandor Soma Abonyi <abonyisoma@gmail.com>
Date: Mon, 5 Dec 2022 15:55:38 +0100
Subject: [PATCH 2503/4969] Fix HiveMQ EE image name and tag (#6225)

---
 .../org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
index be39fe6d7f2..ea93ada572e 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -25,7 +25,7 @@ public class DemoHiveMQContainerIT {
 
     // hiveEEVersion {
     @Container
-    final HiveMQContainer hivemqEe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+    final HiveMQContainer hivemqEe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
         .withLogLevel(Level.DEBUG);
 
     // }
@@ -33,7 +33,7 @@ public class DemoHiveMQContainerIT {
     // eeVersionWithControlCenter {
     @Container
     final HiveMQContainer hivemqEeWithControlCenter = new HiveMQContainer(
-        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+        DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4")
     )
         .withLogLevel(Level.DEBUG)
         .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))

From b1232fc6beeda838ab4bd3dc62580e172acb370d Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 6 Dec 2022 03:55:29 +0100
Subject: [PATCH 2504/4969] Add link to CircleCI article to docs (#6295)

---
 .../continuous_integration/circle_ci.md                         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/supported_docker_environment/continuous_integration/circle_ci.md b/docs/supported_docker_environment/continuous_integration/circle_ci.md
index 05f0776f6c1..d6e85a62a79 100644
--- a/docs/supported_docker_environment/continuous_integration/circle_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/circle_ci.md
@@ -14,3 +14,5 @@ jobs:
       - checkout
       - run: mvn -B clean install
 ```
+
+You can learn more about the best practices of using Testcontainers together with CircleCI in [this article](https://www.atomicjar.com/2022/12/testcontainers-with-circleci/).

From 9f02274829513fc870135c0e374c090190732248 Mon Sep 17 00:00:00 2001
From: Jarimatti Valkonen <jarimatti@me.com>
Date: Wed, 7 Dec 2022 18:37:59 +0000
Subject: [PATCH 2505/4969] doc: fix typo in dind_patterns.md (#6300)

Minor typo: "Docker Dekstop" -> "Docker Desktop".
---
 .../continuous_integration/dind_patterns.md                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/dind_patterns.md b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
index 402e2540789..fd31cb75068 100644
--- a/docs/supported_docker_environment/continuous_integration/dind_patterns.md
+++ b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
@@ -34,7 +34,7 @@ Where:
 
 
 !!! note
-    If you are using Docker Dekstop, you need to mount the Docker socket that bypasses the API proxy (see [this comment](https://github.com/docker/for-mac/issues/5588#issuecomment-934600089) for more details):
+    If you are using Docker Desktop, you need to mount the Docker socket that bypasses the API proxy (see [this comment](https://github.com/docker/for-mac/issues/5588#issuecomment-934600089) for more details):
     `-v /var/run/docker.sock.raw:/var/run/docker.sock`
 
 ### Docker Compose example

From 221a8dac14982b05b7823ef9b9ed13ba817911f4 Mon Sep 17 00:00:00 2001
From: Jakob <jakob@ahrer.dev>
Date: Tue, 13 Dec 2022 18:22:04 +0100
Subject: [PATCH 2506/4969] Fix image tag command in test (#6301)

`asCanonicalNameString` includes name and tag, so the result contains the tag twice.
---
 .../test/java/org/testcontainers/DockerRegistryContainer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
index a907c674386..956bb9fff9e 100644
--- a/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
+++ b/core/src/test/java/org/testcontainers/DockerRegistryContainer.java
@@ -100,7 +100,7 @@ public DockerImageName createImage(String originalImage, String tag) {
             .withTag(tag);
 
         // push the image to the registry
-        client.tagImageCmd(dummyImageId, imageName.asCanonicalNameString(), tag).exec();
+        client.tagImageCmd(dummyImageId, imageName.getUnversionedPart(), tag).exec();
 
         client
             .pushImageCmd(imageName.asCanonicalNameString())

From 3b24a7d6b0fd0683421833a4cdf8c1a90c19678c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 14 Dec 2022 12:26:33 -0600
Subject: [PATCH 2507/4969] Accept image names with `library/` prefix as a
 valid substitute (#6174)

Docker official images can be pulled with or without `library/`
prefix as part of the image name. For example, `mysql` or
`library/mysql`. This is explicit when using private repositories.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../org/testcontainers/utility/DockerImageName.java | 13 +++++++++++--
 .../utility/DockerImageNameCompatibilityTest.java   |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
index 9fca02aad6f..e3a35855bf8 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
@@ -26,6 +26,8 @@ public final class DockerImageName {
 
     private static final Pattern REPO_NAME = Pattern.compile(REPO_NAME_PART + "(/" + REPO_NAME_PART + ")*");
 
+    private static final String LIBRARY_PREFIX = "library/";
+
     private final String rawName;
 
     @With
@@ -231,8 +233,15 @@ public DockerImageName asCompatibleSubstituteFor(DockerImageName otherImageName)
      * @return whether this image has declared compatibility.
      */
     public boolean isCompatibleWith(DockerImageName other) {
-        // is this image already the same or equivalent?
-        if (other.equals(this)) {
+        // Make sure we always compare against a version of the image name containing the LIBRARY_PREFIX
+        String finalImageName;
+        if (this.repository.startsWith(LIBRARY_PREFIX)) {
+            finalImageName = this.repository;
+        } else {
+            finalImageName = LIBRARY_PREFIX + this.repository;
+        }
+        DockerImageName imageWithLibraryPrefix = DockerImageName.parse(finalImageName);
+        if (other.equals(this) || imageWithLibraryPrefix.equals(this)) {
             return true;
         }
 
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index 0bb1b3f75ca..dd17981111f 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -91,6 +91,12 @@ public void testAssertMethodAcceptsCompatible() {
         subject.assertCompatibleWith(DockerImageName.parse("bar"));
     }
 
+    @Test
+    public void testAssertMethodAcceptsCompatibleLibraryPrefix() {
+        DockerImageName subject = DockerImageName.parse("library/foo");
+        subject.assertCompatibleWith(DockerImageName.parse("foo"));
+    }
+
     @Test
     public void testAssertMethodRejectsIncompatible() {
         DockerImageName subject = DockerImageName.parse("foo");

From 52b6949b26926cf1727a6bf2c462be53f99c5b30 Mon Sep 17 00:00:00 2001
From: DJ Gregor <dj@gregor.com>
Date: Wed, 14 Dec 2022 13:40:01 -0500
Subject: [PATCH 2508/4969] Make sure we don't hide exceptions from
 waitUntilContainerStarted (#6167)

This adds the original exception as the cause. It also adds the
text "Wait strategy failed." to each exception message.

This addresses two issues:

1. The original exception from waitUntilContainerStarted was not
   being included as the cause in newly thrown exceptions in
   tryStart. The exceptions were not completely hidden because
   they were being logged, however, but the initial cause was
   less visible.

2. The exception messages focused on state that was found at the
   time the exception was received but did not mention that the
   waitUntilContainerStarted method threw an exception.

Because of these issues, unless you look at the source or see the
logs, it isn't clear that this was caused by an exception from
waitUntilContainerStarted. In systems that might highlight the
failure message and stack trace and not logs/console output (test
failure reports, CI systems, etc.), it makes it harder to debug
these issues.

Updated tests to check for the updated messages as well as the
exception from waitUntilContainerStarted.
---
 .../containers/GenericContainer.java          | 16 ++++++++++-----
 .../containers/GenericContainerTest.java      | 20 ++++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index bc65cb22040..c0f6532fa2a 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -493,25 +493,31 @@ private void tryStart(Instant startedAt) {
                 }
 
                 if (inspectContainerResponse == null) {
-                    throw new IllegalStateException("Container is removed");
+                    throw new IllegalStateException("Wait strategy failed. Container is removed", e);
                 }
 
                 InspectContainerResponse.ContainerState state = inspectContainerResponse.getState();
                 if (Boolean.TRUE.equals(state.getDead())) {
-                    throw new IllegalStateException("Container is dead");
+                    throw new IllegalStateException("Wait strategy failed. Container is dead", e);
                 }
 
                 if (Boolean.TRUE.equals(state.getOOMKilled())) {
-                    throw new IllegalStateException("Container crashed with out-of-memory (OOMKilled)");
+                    throw new IllegalStateException(
+                        "Wait strategy failed. Container crashed with out-of-memory (OOMKilled)",
+                        e
+                    );
                 }
 
                 String error = state.getError();
                 if (!StringUtils.isBlank(error)) {
-                    throw new IllegalStateException("Container crashed: " + error);
+                    throw new IllegalStateException("Wait strategy failed. Container crashed: " + error, e);
                 }
 
                 if (!Boolean.TRUE.equals(state.getRunning())) {
-                    throw new IllegalStateException("Container exited with code " + state.getExitCode());
+                    throw new IllegalStateException(
+                        "Wait strategy failed. Container exited with code " + state.getExitCode(),
+                        e
+                    );
                 }
 
                 throw e;
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 12f5810bc27..538e2e3d67a 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -55,7 +55,9 @@ public void shouldReportOOMAfterWait() {
                 })
                 .withCommand("sh", "-c", "A='0123456789'; for i in $(seq 0 32); do A=$A$A; done; sleep 10m")
         ) {
-            assertThatThrownBy(container::start).hasStackTraceContaining("Container crashed with out-of-memory");
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Wait strategy failed. Container crashed with out-of-memory (OOMKilled)")
+                .hasStackTraceContaining("Nope!");
         }
     }
 
@@ -67,7 +69,9 @@ public void shouldReportErrorAfterWait() {
                 .waitingFor(new WaitForExitedState(state -> state.getExitCode() > 0))
                 .withCommand("sh", "-c", "usleep 100; exit 123")
         ) {
-            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 123");
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Wait strategy failed. Container exited with code 123")
+                .hasStackTraceContaining("Nope!");
         }
     }
 
@@ -80,7 +84,9 @@ public void shouldCopyTransferableAsFile() {
                 .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
                 .withCommand("sh", "-c", "grep -q test /tmp/test && exit 100")
         ) {
-            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 100");
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Wait strategy failed. Container exited with code 100")
+                .hasStackTraceContaining("Nope!");
         }
     }
 
@@ -93,7 +99,9 @@ public void shouldCopyTransferableAsFileWithFileMode() {
                 .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
                 .withCommand("sh", "-c", "ls -ll /tmp | grep '\\-rwxrwxrwx\\|test' && exit 100")
         ) {
-            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 100");
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Wait strategy failed. Container exited with code 100")
+                .hasStackTraceContaining("Nope!");
         }
     }
 
@@ -107,7 +115,9 @@ public void shouldCopyTransferableAfterMountableFile() {
                 .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
                 .withCommand("sh", "-c", "grep -q test /tmp/test && exit 100")
         ) {
-            assertThatThrownBy(container::start).hasStackTraceContaining("Container exited with code 100");
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Wait strategy failed. Container exited with code 100")
+                .hasStackTraceContaining("Nope!");
         }
     }
 

From 212892dbc61604331a6e437eb219660afed43775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 14 Dec 2022 20:52:11 -0600
Subject: [PATCH 2509/4969] Polish spring-boot-kotlin-redis example (#6305)

* Update spring boot version to 2.7.6
* Remove unused import
---
 examples/spring-boot-kotlin-redis/build.gradle                  | 2 +-
 .../src/test/kotlin/com/example/redis/RedisTest.kt              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 8d22d76ead6..c607bcbff69 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.5"
+    id("org.springframework.boot") version "2.7.6"
     id("org.jetbrains.kotlin.jvm") version "1.7.22"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.22"
 }
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
index 317916bd3e6..e95ea9ba0e3 100644
--- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
@@ -8,7 +8,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
-import org.springframework.test.web.servlet.setup.MockMvcBuilders
 
 
 class RedisTest : AbstractIntegrationTest() {

From 85af27806152684b0b1d1d7620f2d1b35c639677 Mon Sep 17 00:00:00 2001
From: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
Date: Fri, 16 Dec 2022 15:28:54 +0100
Subject: [PATCH 2510/4969] Fix typo in LocalStack docs (#6308)

---
 docs/modules/localstack.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index dcc474e484e..b6c82ccf67a 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -42,7 +42,7 @@ Testcontainers will inform Localstack of the best hostname automatically, using
 * when running the Localstack container [with a custom network defined](/features/networking/#advanced-networking), it is expected that all calls to the container will be **from other containers on that network**. `HOSTNAME_EXTERNAL` will be set to the *last* network alias that has been configured for the Localstack container.
 
     <!--codeinclude-->
-    [Localstack container running without a custom network](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_network
+    [Localstack container running with a custom network](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_network
     <!--/codeinclude-->
 
 * Other usage scenarios, such as where the Localstack container is used from both the test host and containers on a custom network are not automatically supported. If you have this use case, you should set `HOSTNAME_EXTERNAL` manually.

From b1c1adf6d66f99648007c6878d7cccfb3357d420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 20 Dec 2022 09:21:20 -0600
Subject: [PATCH 2511/4969] Configure `concurrency` for ci workflows (#6312)

`concurrency` configuration will cancel previous jobs given the `group`
allowing to keep running the last update on PRs, for example.
---
 .github/workflows/ci-docker-wormhole.yml | 4 ++++
 .github/workflows/ci-examples.yml        | 4 ++++
 .github/workflows/ci-rootless.yml        | 4 ++++
 .github/workflows/ci.yml                 | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 061a004682e..995c13a9615 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -4,6 +4,10 @@ on:
   pull_request: {}
   push: { branches: [ main ] }
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 6a1df55adbc..ad2df508e61 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -4,6 +4,10 @@ on:
   pull_request: {}
   push: { branches: [ main ] }
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
+  cancel-in-progress: true
+
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index b04ec9a7429..c8203fb7378 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -4,6 +4,10 @@ on:
   pull_request: {}
   push: { branches: [ main ] }
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 405d2596d08..aa4dcae6149 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,10 @@ on:
   pull_request: {}
   push: { branches: [ main ] }
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
+  cancel-in-progress: true
+
 permissions:
   contents: read
 

From 1abf0fabd07df8c1d76098a28185f1145a41a99d Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 20 Dec 2022 18:42:27 +0100
Subject: [PATCH 2512/4969] fix: Make allowInsecure() HttpWaitStrategy work
 with remote Docker daemon (#6314)

---
 .../wait/strategy/HttpWaitStrategy.java        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
index 2400e3ae523..59f6d9077fb 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
@@ -11,6 +11,7 @@
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.Socket;
 import java.net.URI;
 import java.net.URL;
 import java.security.KeyManagementException;
@@ -29,8 +30,9 @@
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
+import javax.net.ssl.X509ExtendedTrustManager;
 
 import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;
 
@@ -332,7 +334,7 @@ private HttpURLConnection openConnection(final String uri) throws IOException, M
                 // Create a trust manager that does not validate certificate chains
                 // and trust all certificates
                 final TrustManager[] trustAllCerts = new TrustManager[] {
-                    new X509TrustManager() {
+                    new X509ExtendedTrustManager() {
                         @Override
                         public X509Certificate[] getAcceptedIssuers() {
                             return new X509Certificate[0];
@@ -343,6 +345,18 @@ public void checkClientTrusted(final X509Certificate[] certs, final String authT
 
                         @Override
                         public void checkServerTrusted(final X509Certificate[] certs, final String authType) {}
+
+                        @Override
+                        public void checkClientTrusted(X509Certificate[] chain, String authType, Socket socket) {}
+
+                        @Override
+                        public void checkServerTrusted(X509Certificate[] chain, String authType, Socket socket) {}
+
+                        @Override
+                        public void checkClientTrusted(X509Certificate[] chain, String authType, SSLEngine engine) {}
+
+                        @Override
+                        public void checkServerTrusted(X509Certificate[] chain, String authType, SSLEngine engine) {}
                     },
                 };
 

From 36d323138ea8850d00bd6ed768c2ee342c5aacb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 31 Dec 2022 21:16:52 -0500
Subject: [PATCH 2513/4969] Add sftp example (#6322)

Demonstrate how to work with SFTP by performing some operations such
as copying, listing, reading, removing files.
---
 docs/examples.md                              |  1 +
 examples/settings.gradle                      |  1 +
 examples/sftp/build.gradle                    | 14 +++++
 .../java/org/example/SftpContainerTest.java   | 52 +++++++++++++++++++
 .../sftp/src/test/resources/logback-test.xml  | 16 ++++++
 .../test/resources/testcontainers/file.txt    |  1 +
 6 files changed, 85 insertions(+)
 create mode 100644 examples/sftp/build.gradle
 create mode 100644 examples/sftp/src/test/java/org/example/SftpContainerTest.java
 create mode 100644 examples/sftp/src/test/resources/logback-test.xml
 create mode 100644 examples/sftp/src/test/resources/testcontainers/file.txt

diff --git a/docs/examples.md b/docs/examples.md
index 170ae3e3050..05638d00d43 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -17,3 +17,4 @@ Examples of different use cases provided by Testcontainers can be found below:
 - [ImmuDb](https://github.com/testcontainers/testcontainers-java/tree/main/examples/immudb)
 - [Zookeeper](https://github.com/testcontainers/testcontainers-java/tree/main/examples/zookeeper)
 - [NATS](https://github.com/testcontainers/testcontainers-java/tree/main/examples/nats)
+- [SFTP](https://github.com/testcontainers/testcontainers-java/tree/main/examples/sftp)
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 13c237d0866..5d2261760b2 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -34,6 +34,7 @@ include 'immudb'
 include 'zookeeper'
 include 'hazelcast'
 include 'nats'
+include 'sftp'
 
 ext.isCI = System.getenv("CI") != null
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
new file mode 100644
index 00000000000..2a4949694dc
--- /dev/null
+++ b/examples/sftp/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'com.jcraft:jsch:0.1.55'
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+}
diff --git a/examples/sftp/src/test/java/org/example/SftpContainerTest.java b/examples/sftp/src/test/java/org/example/SftpContainerTest.java
new file mode 100644
index 00000000000..ce69cf6b75d
--- /dev/null
+++ b/examples/sftp/src/test/java/org/example/SftpContainerTest.java
@@ -0,0 +1,52 @@
+package org.example;
+
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Session;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SftpContainerTest {
+
+    @Test
+    public void test() throws Exception {
+        try (
+            GenericContainer<?> sftp = new GenericContainer<>("atmoz/sftp:alpine-3.7")
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("testcontainers/", 0777),
+                    "/home/foo/upload/testcontainers"
+                )
+                .withExposedPorts(22)
+                .withCommand("foo:pass:::upload")
+        ) {
+            sftp.start();
+            JSch jsch = new JSch();
+            Session jschSession = jsch.getSession("foo", sftp.getHost(), sftp.getMappedPort(22));
+            jschSession.setPassword("pass");
+            jschSession.setConfig("StrictHostKeyChecking", "no");
+            jschSession.connect();
+            ChannelSftp channel = (ChannelSftp) jschSession.openChannel("sftp");
+            channel.connect();
+            assertThat(channel.ls("/upload/testcontainers")).anyMatch(item -> item.toString().contains("file.txt"));
+            assertThat(
+                new BufferedReader(
+                    new InputStreamReader(channel.get("/upload/testcontainers/file.txt"), StandardCharsets.UTF_8)
+                )
+                    .lines()
+                    .collect(Collectors.joining("\n"))
+            )
+                .contains("Testcontainers");
+            channel.rm("/upload/testcontainers/file.txt");
+            assertThat(channel.ls("/upload/testcontainers/"))
+                .noneMatch(item -> item.toString().contains("testcontainers/file.txt"));
+        }
+    }
+}
diff --git a/examples/sftp/src/test/resources/logback-test.xml b/examples/sftp/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/sftp/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/sftp/src/test/resources/testcontainers/file.txt b/examples/sftp/src/test/resources/testcontainers/file.txt
new file mode 100644
index 00000000000..0e40067849a
--- /dev/null
+++ b/examples/sftp/src/test/resources/testcontainers/file.txt
@@ -0,0 +1 @@
+Testcontainers

From 72489d1922a2583353a485c913c100a3d2ef0513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 31 Dec 2022 21:17:12 -0500
Subject: [PATCH 2514/4969] Add sftp example (#6322)

Demonstrate how to work with SFTP by performing some operations such
as copying, listing, reading, removing files.

From b240eb16879f67441dab704afed420a28604cbf0 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Sun, 1 Jan 2023 03:27:37 +0100
Subject: [PATCH 2515/4969] [neo4j] Add random password function and warn on
 too short passwords (#6320)

---
 docs/modules/databases/neo4j.md               | 16 +++++
 .../containers/Neo4jExampleTest.java          |  2 +-
 .../containers/Neo4jContainer.java            |  8 +++
 .../containers/Neo4jContainerTest.java        | 67 +++++++++++++++++++
 4 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index b6a04d2195c..dddf5c4e8f8 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -21,6 +21,14 @@ You are not limited to Unit tests and can of course use an instance of the Neo4j
 
 ## Additional features
 
+### Custom password
+
+A custom password can be provided:
+
+<!--codeinclude-->
+[Custom password](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:withAdminPassword
+<!--/codeinclude-->
+
 ### Disable authentication
 
 Authentication can be disabled:
@@ -29,6 +37,14 @@ Authentication can be disabled:
 [Disable authentication](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:withoutAuthentication
 <!--/codeinclude-->
 
+### Random password
+
+A random (`UUID`-random based) password can be set:
+
+<!--codeinclude-->
+[Random password](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:withRandomPassword
+<!--/codeinclude-->
+
 ### Neo4j-Configuration
 
 Neo4j's Docker image needs Neo4j configuration options in a dedicated format.
diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
index 9ce3a3f078c..38c22a0ff45 100644
--- a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -28,7 +28,7 @@ class Neo4jExampleTest {
 
     @Container
     private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(DockerImageName.parse("neo4j:4.4"))
-        .withAdminPassword(null); // Disable password
+        .withoutAuthentication(); // Disable password
 
     @Test
     void testSomethingUsingBolt() {
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 6d68b76c7d7..43904c8aa18 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -15,6 +15,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -230,6 +231,9 @@ public S withEnterpriseEdition() {
      * @return This container.
      */
     public S withAdminPassword(final String adminPassword) {
+        if (adminPassword != null && adminPassword.length() < 8) {
+            logger().warn("Your provided admin password is too short and will not work with Neo4j 5.3+.");
+        }
         this.adminPassword = adminPassword;
         return self();
     }
@@ -360,4 +364,8 @@ private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
 
         return false;
     }
+
+    public S withRandomPassword() {
+        return withAdminPassword(UUID.randomUUID().toString());
+    }
 }
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 0f38486f45d..6e695b92ebe 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -1,5 +1,9 @@
 package org.testcontainers.containers;
 
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
 import org.junit.Test;
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.AuthTokens;
@@ -10,13 +14,16 @@
 import org.neo4j.driver.Session;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Collections;
+import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
 /**
@@ -184,6 +191,17 @@ public void shouldRespectEnvironmentAuth() {
         assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/secret");
     }
 
+    @Test
+    public void shouldSetCustomPasswordCorrectly() {
+        // withoutAuthentication {
+        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withAdminPassword("verySecret");
+        // }
+
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/verySecret");
+    }
+
     @Test
     public void containerAdminPasswordOverrulesEnvironmentAuth() {
         Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
@@ -302,6 +320,37 @@ public void shouldConfigureMultipleLabsPluginsWithString() {
         }
     }
 
+    @Test
+    public void shouldCreateRandomUuidBasedPasswords() {
+        try (
+            // withRandomPassword {
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withRandomPassword();
+            // }
+        ) {
+            // It will throw an exception if it's not UUID parsable.
+            assertThatNoException().isThrownBy(neo4jContainer::configure);
+            // This basically is always true at if the random password is UUID-like.
+            assertThat(neo4jContainer.getAdminPassword())
+                .satisfies(password -> assertThat(UUID.fromString(password).toString()).isEqualTo(password));
+        }
+    }
+
+    @Test
+    public void shouldWarnOnPasswordTooShort() {
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4");) {
+            Logger logger = (Logger) DockerLoggerFactory.getLogger("neo4j:4.4");
+            TestLogAppender testLogAppender = new TestLogAppender();
+            logger.addAppender(testLogAppender);
+            testLogAppender.start();
+
+            neo4jContainer.withAdminPassword("short");
+
+            testLogAppender.stop();
+
+            assertThat(testLogAppender.passwordTooShortWarningAppeared).isTrue();
+        }
+    }
+
     private static class CustomDummyWaitStrategy extends AbstractWaitStrategy {
 
         @Override
@@ -310,6 +359,24 @@ protected void waitUntilReady() {
         }
     }
 
+    private static class TestLogAppender extends AppenderBase<ILoggingEvent> {
+
+        boolean passwordTooShortWarningAppeared = false;
+
+        @Override
+        protected void append(ILoggingEvent eventObject) {
+            if (eventObject.getLevel().equals(Level.WARN)) {
+                if (
+                    eventObject
+                        .getMessage()
+                        .equals("Your provided admin password is too short and will not work with Neo4j 5.3+.")
+                ) {
+                    passwordTooShortWarningAppeared = true;
+                }
+            }
+        }
+    }
+
     private static Driver getDriver(Neo4jContainer<?> container) {
         AuthToken authToken = AuthTokens.none();
         if (container.getAdminPassword() != null) {

From 96f544ac5afb94c358653b365d3b8e12223578fd Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Sun, 1 Jan 2023 03:28:13 +0100
Subject: [PATCH 2516/4969] [neo4j] Add random password function and warn on
 too short passwords (#6320)


From b6d0dceb6e64f5f63b7a2ea5a10c785d49e48d3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:19 +0000
Subject: [PATCH 2517/4969] Bump s3 from 2.18.29 to 2.19.8 in
 /modules/localstack

Bumps s3 from 2.18.29 to 2.19.8.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 5cd4e0172fe..c91f744f9b6 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.356'
-    testImplementation 'software.amazon.awssdk:s3:2.18.29'
+    testImplementation 'software.amazon.awssdk:s3:2.19.8'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 9aeaf5ac9a01465bff1d8a92b11c40cba7746ef3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:21 +0000
Subject: [PATCH 2518/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/oracle-xe

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 107f8e66bdf..ab87bc2f994 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
 
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 17af84ce36a6610b9a74b39789f909c1a132647d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:21 +0000
Subject: [PATCH 2519/4969] Bump httpclient from 4.5.13 to 4.5.14 in
 /modules/spock

Bumps httpclient from 4.5.13 to 4.5.14.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 af0ccbd7afd..0f9277a3da5 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation project(':postgresql')
 
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'

From 34ecb0a784a5c6d7b10c0a0841708ab921f30a83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:22 +0000
Subject: [PATCH 2520/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/nginx

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index aee69e253ad..efbd0f1e04b 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From d0bd433139ab03a35918231415e40d2f4f4f7fb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:23 +0000
Subject: [PATCH 2521/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/mysql

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a18941ab9f7..b892c29dcb4 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From e10354866546c32bd67ef2f3be34fcfa66c91e64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:23 +0000
Subject: [PATCH 2522/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/jdbc

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 81d0bd0bdaf..928e4903916 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':database-commons')
     testImplementation project(':test-support')
 
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.2'

From 59356ff66aedf798eb6050d1d274e25770a288ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:23 +0000
Subject: [PATCH 2523/4969] Bump neo4j-java-driver from 4.4.9 to 4.4.11 in
 /modules/neo4j

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.9 to 4.4.11.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.9...4.4.11)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index aabb571edf6..ca651fcfbe0 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.9'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From f1efd7a5ad5c33127586e70083dfc8aa97d801d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:23 +0000
Subject: [PATCH 2524/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/postgresql

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 fafe416b623..48103ae01b8 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -16,5 +16,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From f64653ec85f5003b4f60d9b10a0c7358fe8fb8cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:24 +0000
Subject: [PATCH 2525/4969] Bump tomcat-jdbc from 10.1.2 to 10.1.4 in
 /modules/jdbc

Bumps tomcat-jdbc from 10.1.2 to 10.1.4.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 81d0bd0bdaf..f8d11b12d83 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.2'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.4'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation ('org.mockito:mockito-core:4.9.0') {

From deecb5b2f8749dc0c42e52543d0b0c58920321ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:24 +0000
Subject: [PATCH 2526/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/spock

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 af0ccbd7afd..41835b07933 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'
 
-    testCompileOnly 'org.jetbrains:annotations:23.0.0'
+    testCompileOnly 'org.jetbrains:annotations:23.1.0'
 }
 
 sourceJar {

From c2599e0d18109c108c94eb6c67bcefe6b6acf259 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:24 +0000
Subject: [PATCH 2527/4969] Bump java-client from 3.4.0 to 3.4.1 in
 /modules/couchbase

Bumps [java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.4.0...java-client-3.4.1)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index c2aad1b4ffd..853598b71c5 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.0'
+    testImplementation 'com.couchbase.client:java-client:3.4.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From d0a0ecefa82d27f4ca05cab041ebe54574512794 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:24 +0000
Subject: [PATCH 2528/4969] Bump aws-java-sdk-s3 from 1.12.356 to 1.12.376 in
 /modules/localstack

Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.356 to 1.12.376.
- [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/commits/1.12.376)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5cd4e0172fe..ee8a446dab2 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.356'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.356'

From 9b229bfd512e5cc6db50609e76e11da7f7027ff4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:25 +0000
Subject: [PATCH 2529/4969] Bump mockito-core from 4.9.0 to 4.11.0 in
 /modules/junit-jupiter

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.9.0 to 4.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 35566c09fef..49bce10a2f6 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.9.0') {
+    testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'

From abebcd85b6ca0d89220efd388685111812ea5fe4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:26 +0000
Subject: [PATCH 2530/4969] Bump mockito-core from 4.9.0 to 4.11.0 in /core

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.9.0 to 4.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 500d3fbd3cc..4077c812a59 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -97,7 +97,7 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
-    testImplementation ('org.mockito:mockito-core:4.9.0') {
+    testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

From 8774ba68e1d9501594d918201d3c4915d5a009e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:28 +0000
Subject: [PATCH 2531/4969] Bump aws-java-sdk-sqs from 1.12.356 to 1.12.376 in
 /modules/localstack

Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.356 to 1.12.376.
- [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/commits/1.12.376)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5cd4e0172fe..c9a74ff96b5 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.356'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.356'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.356'
     testImplementation 'software.amazon.awssdk:s3:2.18.29'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From d73dd51d51e46b1dd07296095a8368c740faf1cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:28 +0000
Subject: [PATCH 2532/4969] Bump transport from 7.17.7 to 7.17.8 in
 /modules/elasticsearch

Bumps [transport](https://github.com/elastic/elasticsearch) from 7.17.7 to 7.17.8.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.7...v7.17.8)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 8ea60273cca..67672b504d3 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.2"
-    testImplementation "org.elasticsearch.client:transport:7.17.7"
+    testImplementation "org.elasticsearch.client:transport:7.17.8"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 10a1ab032cdbb6a778c32bafa37ac1e6126a7f5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:00:29 +0000
Subject: [PATCH 2533/4969] Bump mockito-core from 4.9.0 to 4.11.0 in
 /modules/jdbc

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.9.0 to 4.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 81d0bd0bdaf..8255e1f2591 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.2'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation ('org.mockito:mockito-core:4.9.0') {
+    testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
 }

From 9dc6d3320f142ce04916063681cbbccf46a937de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:09 +0000
Subject: [PATCH 2534/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/rabbitmq

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 6cf03d4f984..b924adbb0cb 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 03f4461852b9d785ce43988d8ba5c4ee00b144db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:11 +0000
Subject: [PATCH 2535/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/presto

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index fe0064bf199..54945a8e62f 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 8ee4e62f5d59d4ad6b442e1a97bbb9da4219db7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:14 +0000
Subject: [PATCH 2536/4969] Bump reactor-core from 3.5.0 to 3.5.1 in
 /modules/r2dbc

Bumps [reactor-core](https://github.com/reactor/reactor-core) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.0...v3.5.1)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index e0c6fadf35e..4f77005ba5c 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.0'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.1'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 5946cd9d5f2c65db592cb90f94197c7b3d8a77ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:14 +0000
Subject: [PATCH 2537/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/trino

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 985127bed24..2e363785451 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.trino:trino-jdbc:403'
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From cd609b521dbb01922099b153f587406388b90d7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:15 +0000
Subject: [PATCH 2538/4969] Bump hivemq-extension-sdk from 4.9.1 to 4.10.0 in
 /modules/hivemq

Bumps [hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.9.1 to 4.10.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.9.1...4.10.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b33c6578e1a..6eca4aa2527 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.9.1")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.10.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")

From 1013cdea0e836b231cfff4cb410f543aeb75ae52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:16 +0000
Subject: [PATCH 2539/4969] Bump httpclient from 4.5.13 to 4.5.14 in
 /modules/hivemq

Bumps httpclient from 4.5.13 to 4.5.14.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b33c6578e1a..8510e7e8483 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.9.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
-    testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
+    testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")

From 8d0b1c4ca31bb9551ba72c4e304e7df1eeed6819 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:16 +0000
Subject: [PATCH 2540/4969] Bump orientdb-client from 3.2.13 to 3.2.14 in
 /modules/orientdb

Bumps [orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.13 to 3.2.14.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.13...3.2.14)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index a2c47adadd4..f0ff0c7101d 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.13"
+    api "com.orientechnologies:orientdb-client:3.2.14"
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'

From 5954a53d7afee3cbfec84227db794679e93fc212 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:18 +0000
Subject: [PATCH 2541/4969] Bump client-java from 16.0.2 to 17.0.0 in
 /modules/k3s

Bumps [client-java](https://github.com/kubernetes-client/java) from 16.0.2 to 17.0.0.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v16.0.2...v17.0.0)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 0b3d5098edb..30684ba5662 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.2.0'
-    testImplementation 'io.kubernetes:client-java:16.0.2'
+    testImplementation 'io.kubernetes:client-java:17.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 674e2f5bf80d9e47c9d69b3680ccaaf018d1b051 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:18 +0000
Subject: [PATCH 2542/4969] Bump google-cloud-bigtable from 2.16.0 to 2.17.1 in
 /modules/gcloud

Bumps [google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.16.0 to 2.17.1.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.16.0...v2.17.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9cf8e3ebbf8..cb4dc3687e2 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.3'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.33.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 10631cc5c1d063ad93d9c15fd79d2dec65ba4ce8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:20 +0000
Subject: [PATCH 2543/4969] Bump lettuce-core from 6.2.1.RELEASE to
 6.2.2.RELEASE in /examples

Bumps [lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.2.1.RELEASE to 6.2.2.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/lettuce-io/lettuce-core/blob/6.2.2.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.2.1.RELEASE...6.2.2.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 7598fe8bca5..1a9466b7d19 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.2.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index b7b0515d3db..32702df3698 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.2.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 39ef4e4f4e7..69ac02c16fc 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.2.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'

From 5112cb9cbeb7197d0842b9fb97c331c93626bc3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:22 +0000
Subject: [PATCH 2544/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/hivemq

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b33c6578e1a..cdef7a34c5f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:23.0.0")
+    api("org.jetbrains:annotations:23.1.0")
 
     shaded("org.apache.commons:commons-lang3:3.12.0")
     shaded("commons-io:commons-io:2.11.0")

From 4c334688c5a01c39be6b9bda1f43129d9c542ae4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:22 +0000
Subject: [PATCH 2545/4969] Bump orientdb-gremlin from 3.2.13 to 3.2.14 in
 /modules/orientdb

Bumps [orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.13 to 3.2.14.
- [Release notes](https://github.com/orientechnologies/orientdb-gremlin/releases)
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.13...3.2.14)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index a2c47adadd4..ae7e42171c6 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.13"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.14"
 }

From 9bff8e56ab3561083016de880e1911a8517f121b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:23 +0000
Subject: [PATCH 2546/4969] Bump google-cloud-firestore from 3.7.3 to 3.7.4 in
 /modules/gcloud

Bumps [google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.7.3 to 3.7.4.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.7.3...v3.7.4)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9cf8e3ebbf8..9d56a601406 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.3'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.33.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'

From 823c4505ec15c9ee3a17540e15a7b88a8e550ef0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:01:33 +0000
Subject: [PATCH 2547/4969] Bump cucumber-java from 7.9.0 to 7.10.1 in
 /examples

Bumps [cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.9.0 to 7.10.1.
- [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/v7.9.0...v7.10.1)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 edbc5c17d0a..6d646c901f0 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:7.9.0'
+    testImplementation 'io.cucumber:cucumber-java:7.10.1'
     testImplementation 'io.cucumber:cucumber-junit:7.9.0'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 5b311bfd4d8adc96efcb9e35493ab2cb7f13f8ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:02:23 +0000
Subject: [PATCH 2548/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/tidb

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 92f4aa408d3..6329d2dff06 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'mysql:mysql-connector-java:8.0.31'
 
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 7ab8a5710c167269d81f26afecc2005b7c8cdacc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:02:27 +0000
Subject: [PATCH 2549/4969] Bump selenium-api from 4.7.0 to 4.7.2 in /examples

Bumps [selenium-api](https://github.com/SeleniumHQ/selenium) from 4.7.0 to 4.7.2.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 7bc09e92e1b..25827a9fd9f 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testImplementation 'mysql:mysql-connector-java:8.0.31'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.7.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.7.2"
     testImplementation 'org.assertj:assertj-core:3.15.0'
 }

From 8509b1a29f4385f0c1adf74c46823ab189000782 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:02:31 +0000
Subject: [PATCH 2550/4969] Bump neo4j-java-driver from 4.4.9 to 4.4.11 in
 /examples

Bumps [neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.9 to 4.4.11.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.9...4.4.11)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index e7e42ff00bd..8c7b991a9e4 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.9'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
 }

From cd5e688da50a62c133ba11c88f3da85e5f26fd0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:02:46 +0000
Subject: [PATCH 2551/4969] Bump httpclient from 4.5.13 to 4.5.14 in
 /modules/questdb

Bumps httpclient from 4.5.13 to 4.5.14.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 8949e28ec03..046dd5fae8a 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -9,5 +9,5 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.questdb:questdb:6.6.1-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From ff2f9a962ed79459fe007462dc1bc7a27953b2f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:48:38 +0000
Subject: [PATCH 2552/4969] Bump httpclient from 4.5.13 to 4.5.14 in
 /modules/junit-jupiter

Bumps httpclient from 4.5.13 to 4.5.14.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 49bce10a2f6..a0a8c91fb23 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.3.1'
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }

From c5b78e6d59b63de023dac6116b26c97965d6d68e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:48:39 +0000
Subject: [PATCH 2553/4969] Bump annotations from 23.0.0 to 23.1.0 in /core

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 4077c812a59..0b12f5fea9a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -68,7 +68,7 @@ configurations.all {
 dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.22'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {

From d57f962b26976c5d75f62215b9af2226565ee170 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:48:40 +0000
Subject: [PATCH 2554/4969] Bump elasticsearch-rest-client in
 /modules/elasticsearch

Bumps [elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.5.2 to 8.5.3.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.5.2...v8.5.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 67672b504d3..3e0a2c503ad 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.3"
     testImplementation "org.elasticsearch.client:transport:7.17.8"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c1a11acbbe33452bd3fabea875eeb6b31557384c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:48:43 +0000
Subject: [PATCH 2555/4969] Bump annotations from 23.0.0 to 23.1.0 in
 /modules/selenium

Bumps [annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 23.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...23.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 4891cb1e317..c7b344668da 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -12,5 +12,5 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From b30ec86e2161b995b6110dad0e90d20490405ea3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:03 +0000
Subject: [PATCH 2556/4969] Bump google-cloud-datastore from 2.12.5 to 2.13.0
 in /modules/gcloud

Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.12.5 to 2.13.0.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 2371effe212..f2d9cb9d5a0 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.33.0'

From c037056653cded11ad5a62527507d4d3d459561d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:03 +0000
Subject: [PATCH 2557/4969] Bump aws-java-sdk-logs from 1.12.356 to 1.12.376 in
 /modules/localstack

Bumps [aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.356 to 1.12.376.
- [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/commits/1.12.376)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 fc63a21ffde..3f51c9ea618 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.356'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.376'
     testImplementation 'software.amazon.awssdk:s3:2.19.8'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 94e4297ad1cc077766e3244a14364607b4ac7611 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:03 +0000
Subject: [PATCH 2558/4969] Bump aws-java-sdk-dynamodb in /modules/dynalite

Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.356 to 1.12.376.
- [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/commits/1.12.376)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 b1890662268..a0b148c733d 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.356'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.353'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.376'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.376'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From e8679cf9ee99daa4fbbf7a83cbf1d1eba85c3022 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:04 +0000
Subject: [PATCH 2559/4969] Bump google-cloud-spanner from 6.33.0 to 6.34.1 in
 /modules/gcloud

Bumps [google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.33.0 to 6.34.1.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.33.0...v6.34.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 2371effe212..95b79e05527 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.33.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.34.1'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From b7739034609351437208cd424b3d534c184abb32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:04 +0000
Subject: [PATCH 2560/4969] Bump kubernetes-client from 6.2.0 to 6.3.1 in
 /modules/k3s

Bumps [kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.2.0 to 6.3.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.2.0...v6.3.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 30684ba5662..34991dc0d4f 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.2.0'
+    testImplementation 'io.fabric8:kubernetes-client:6.3.1'
     testImplementation 'io.kubernetes:client-java:17.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 198d7ff2bb0e3179267e25c9244f7d0076b9375a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:04 +0000
Subject: [PATCH 2561/4969] Bump mongodb-driver-sync from 4.8.0 to 4.8.1 in
 /modules/mongodb

Bumps [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.8.0...r4.8.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 498403d3188..1266d9d4481 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.8.0")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.8.1")
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
 

From 4d25766ebeb631603543bf25881a3b7ed22f0317 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:05 +0000
Subject: [PATCH 2562/4969] Bump cucumber-junit from 7.9.0 to 7.10.1 in
 /examples

Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.9.0 to 7.10.1.
- [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/v7.9.0...v7.10.1)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 6d646c901f0..26856ebf38e 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,7 +11,7 @@ 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:7.10.1'
-    testImplementation 'io.cucumber:cucumber-junit:7.9.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.10.1'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From cd6953ae88bbfe45f98eba813b6b88a42039348a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 02:49:06 +0000
Subject: [PATCH 2563/4969] Bump trino-jdbc from 403 to 405 in /modules/trino

Bumps trino-jdbc from 403 to 405.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 2e363785451..53fbf33b023 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:403'
+    testImplementation 'io.trino:trino-jdbc:405'
     compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From dc0f81936776c39cd4e384439aed67c66c3f2ed4 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 4 Jan 2023 09:40:21 +0100
Subject: [PATCH 2564/4969] docs: clarify usage of
 `TESTCONTAINERS_HOST_OVERRIDE` for DinD on Docker Desktop (#6383)

Co-authored-by: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com>
---
 .../continuous_integration/dind_patterns.md                  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/supported_docker_environment/continuous_integration/dind_patterns.md b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
index fd31cb75068..2ea0627216e 100644
--- a/docs/supported_docker_environment/continuous_integration/dind_patterns.md
+++ b/docs/supported_docker_environment/continuous_integration/dind_patterns.md
@@ -34,8 +34,9 @@ Where:
 
 
 !!! note
-    If you are using Docker Desktop, you need to mount the Docker socket that bypasses the API proxy (see [this comment](https://github.com/docker/for-mac/issues/5588#issuecomment-934600089) for more details):
-    `-v /var/run/docker.sock.raw:/var/run/docker.sock`
+    If you are using Docker Desktop, you need to configure the `TESTCONTAINERS_HOST_OVERRIDE` environment variable to use the special DNS name
+    `host.docker.internal` for accessing the host from within a container, which is provided by Docker Desktop:
+    `-e TESTCONTAINERS_HOST_OVERRIDE=host.docker.internal`
 
 ### Docker Compose example
 The same can be achieved with Docker Compose:

From 58c569d956202e625616bc9efa79345e101ff947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 4 Jan 2023 09:33:22 -0500
Subject: [PATCH 2565/4969] Update kotlin version to 1.8.0 (#6386)

---
 examples/spring-boot-kotlin-redis/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index c607bcbff69..17df36fa6aa 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.7.6"
-    id("org.jetbrains.kotlin.jvm") version "1.7.22"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.7.22"
+    id("org.jetbrains.kotlin.jvm") version "1.8.0"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.8.0"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 9b7e8ae9074753b074aa438468ad66aa9e3231c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 4 Jan 2023 09:33:48 -0500
Subject: [PATCH 2566/4969] Update gradle enterprise plugin version to 3.12.1
 (#6385)

Latest version of Gradle Enterprise Plugin offers Test Retry plugin
and the build fails when both are in place. Gradle recommends to
use Gradle Enterprise Plugin so Test Retry is removed in order to
make the build pass.
---
 build.gradle             | 2 --
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index b80aa9a8dbb..a4d65ea0574 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,6 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
     id 'com.diffplug.spotless' version '6.12.0' apply false
-    id 'org.gradle.test-retry' version '1.5.0'
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -34,7 +33,6 @@ subprojects {
     apply from: "$rootDir/gradle/shading.gradle"
     apply from: "$rootDir/gradle/spotless.gradle"
     apply plugin: 'checkstyle'
-    apply plugin: 'org.gradle.test-retry'
 
     group = "org.testcontainers"
 
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 5d2261760b2..ef27e6cc437 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.4"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 59331fd92aa..2cdd31fd0bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.4"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }

From 3be6716d675a39ce37c3304bb4cd7f7a6ef2eaa6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 14:34:14 +0000
Subject: [PATCH 2567/4969] Bump google-cloud-pubsub from 1.121.1 to 1.122.2 in
 /modules/gcloud

Bumps [google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.121.1 to 1.122.2.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.121.1...v1.122.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 53347d2cc39..4fe31cfaadc 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.34.1'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From a237ba45e4dd97b70027ca643d922eaec7a966d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 14:34:25 +0000
Subject: [PATCH 2568/4969] Bump com.gradle.enterprise.gradle.plugin from
 3.12.1 to 3.12.2

Bumps com.gradle.enterprise.gradle.plugin from 3.12.1 to 3.12.2.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 2cdd31fd0bf..6f7eb1a2f0c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.2"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }

From 448194c83fa377fd7db706872151328480d161e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 14:34:33 +0000
Subject: [PATCH 2569/4969] Bump com.gradle.enterprise.gradle.plugin in
 /examples

Bumps com.gradle.enterprise.gradle.plugin from 3.12.1 to 3.12.2.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index ef27e6cc437..b3814db166c 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.2"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 2cdd31fd0bf..6f7eb1a2f0c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.2"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }

From dee69b229e296813b61008ffa6f84aa1ab6996fe Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 10 Jan 2023 17:01:20 +0100
Subject: [PATCH 2570/4969] fix: Don't return JSON auth config for partial
 match of registry name (#6323)

---
 .../utility/RegistryAuthLocator.java               |  2 +-
 .../utility/RegistryAuthLocatorTest.java           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index 0001b926059..bd44750a545 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -229,7 +229,7 @@ private Map.Entry<String, JsonNode> findAuthNode(final JsonNode config, final St
             final Iterator<Map.Entry<String, JsonNode>> fields = auths.fields();
             while (fields.hasNext()) {
                 final Map.Entry<String, JsonNode> entry = fields.next();
-                if (entry.getKey().contains("://" + reposName) || entry.getKey().equals(reposName)) {
+                if (entry.getKey().endsWith("://" + reposName) || entry.getKey().equals(reposName)) {
                     return entry;
                 }
             }
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index fea7f93ed5a..36d535cc0b0 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -63,6 +63,20 @@ public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
         assertThat(authConfig.getPassword()).as("Password is set").isNotNull();
     }
 
+    @Test
+    public void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult() throws URISyntaxException {
+        // contains entry for registry.example.com
+        final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.co/org/repo"), // partial match of registry name
+            new AuthConfig()
+        );
+
+        assertThat(authConfig.getUsername()).as("auth config username").isNull();
+        assertThat(authConfig.getPassword()).as("auth config password").isNull();
+    }
+
     @Test
     public void lookupAuthConfigUsingStore() throws URISyntaxException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json");

From 242a139e31c4050cf09051cd352b7b77464556d3 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Sat, 14 Jan 2023 20:20:20 +0100
Subject: [PATCH 2571/4969] Short-circuit CompletableFuture returned by
 Startables#deepStart on exception (#5930)

---
 .../org/testcontainers/lifecycle/Startables.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/lifecycle/Startables.java b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
index daa63931a88..d61919af346 100644
--- a/core/src/main/java/org/testcontainers/lifecycle/Startables.java
+++ b/core/src/main/java/org/testcontainers/lifecycle/Startables.java
@@ -99,6 +99,19 @@ private CompletableFuture<Void> deepStart(
             })
             .toArray(CompletableFuture[]::new);
 
-        return CompletableFuture.allOf(futures);
+        return allOfFailfast(futures);
+    }
+
+    private static <T> CompletableFuture<Void> allOfFailfast(CompletableFuture<?>[] futures) {
+        CompletableFuture<Void> result = CompletableFuture.allOf(futures);
+        for (CompletableFuture<?> future : futures) {
+            future.whenComplete((t, ex) -> {
+                if (ex != null) {
+                    result.completeExceptionally(ex);
+                }
+            });
+        }
+
+        return result;
     }
 }

From 6fe954ab940ccb674d85aca543fe4c979e8932f0 Mon Sep 17 00:00:00 2001
From: Donnerbart <community+github@donnerbart.de>
Date: Sat, 14 Jan 2023 22:03:58 +0100
Subject: [PATCH 2572/4969] Add Docker image name to ContainerLaunchException
 message (#6408)

---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 +-
 .../org/testcontainers/containers/GenericContainerTest.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index c0f6532fa2a..93c13505ef1 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -346,7 +346,7 @@ protected void doStart() {
                 }
             );
         } catch (Exception e) {
-            throw new ContainerLaunchException("Container startup failed", e);
+            throw new ContainerLaunchException("Container startup failed for image " + getDockerImageName(), e);
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 538e2e3d67a..6a6f47c85c7 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -70,6 +70,7 @@ public void shouldReportErrorAfterWait() {
                 .withCommand("sh", "-c", "usleep 100; exit 123")
         ) {
             assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Container startup failed for image " + TestImages.TINY_IMAGE)
                 .hasStackTraceContaining("Wait strategy failed. Container exited with code 123")
                 .hasStackTraceContaining("Nope!");
         }

From 111d519e303d3659e2f94c025ca5baa14363870a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 14 Jan 2023 16:46:15 -0500
Subject: [PATCH 2573/4969] Update immudb4j version to 1.0.0 (#6409)

---
 examples/immudb/build.gradle                  |  5 +++--
 examples/immudb/src/test/java/ImmuDbTest.java | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index b2e6fcdba43..dcbcfd63635 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -7,8 +7,9 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'io.codenotary:immudb4j:0.9.10.2'
+    implementation 'io.codenotary:immudb4j:1.0.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'com.google.guava:guava:23.0'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/immudb/src/test/java/ImmuDbTest.java b/examples/immudb/src/test/java/ImmuDbTest.java
index f8c208a1073..64da774b2de 100644
--- a/examples/immudb/src/test/java/ImmuDbTest.java
+++ b/examples/immudb/src/test/java/ImmuDbTest.java
@@ -1,7 +1,7 @@
 import io.codenotary.immudb4j.Entry;
 import io.codenotary.immudb4j.ImmuClient;
-import io.codenotary.immudb4j.exceptions.CorruptedDataException;
 import io.codenotary.immudb4j.exceptions.VerificationException;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -45,8 +45,12 @@ public void setUp() {
                 .withServerUrl(immuDbContainer.getHost())
                 .withServerPort(immuDbContainer.getMappedPort(IMMUDB_PORT))
                 .build();
-        this.immuClient.login(IMMUDB_USER, IMMUDB_PASSWORD);
-        this.immuClient.useDatabase(IMMUDB_DATABASE);
+        this.immuClient.openSession(IMMUDB_DATABASE, IMMUDB_USER, IMMUDB_PASSWORD);
+    }
+
+    @After
+    public void tearDown() {
+        this.immuClient.closeSession();
     }
 
     @Test
@@ -62,7 +66,7 @@ public void testGetValue() {
             } else {
                 Assert.fail();
             }
-        } catch (CorruptedDataException | VerificationException e) {
+        } catch (VerificationException e) {
             Assert.fail();
         }
     }

From d2430846a833388f2e46d65562e6afb68c0086c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 17 Jan 2023 17:17:22 -0500
Subject: [PATCH 2574/4969] Add devcontainer file (#6412)

---
 .devcontainer/devcontainer.json | 49 +++++++++++++++++++++++++++++++++
 README.md                       |  2 ++
 2 files changed, 51 insertions(+)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000000..2e7f2788b81
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,49 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/java-8
+{
+	"name": "Java 8",
+    "image": "mcr.microsoft.com/devcontainers/java:1-8-bullseye",
+
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Set *default* container specific settings.json values on container create.
+			"settings": {
+				"java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current",
+				"java.configuration.runtimes": [{
+					"default": true,
+					"name": "JavaSE-1.8",
+					"path": "/usr/local/sdkman/candidates/java/current"
+				}]
+			},
+
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"vscjava.vscode-java-pack"
+			]
+		}
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "java -version",
+
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode",
+	"features": {
+        "ghcr.io/devcontainers/features/git:1": {},
+        "ghcr.io/devcontainers/features/github-cli:1": {},
+        "ghcr.io/meaningful-ooo/devcontainer-features/homebrew:2": {},
+        "ghcr.io/devcontainers/features/java:1": {
+            "version": "none",
+            "installMaven": "false",
+            "installGradle": "false"
+        },
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
+        "ghcr.io/devcontainers/features/node:1": {}
+	},
+	"postStartCommand": ["./gradlew", "compileJava"]
+}
diff --git a/README.md b/README.md
index d2fce2e9911..535b21cbce9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Testcontainers
 
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=33816473&machine=standardLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs)
+
 [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)
 
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.

From dbb9be00b91f582e8fdc76e569b700c9f8fb88d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 19 Jan 2023 14:41:49 -0500
Subject: [PATCH 2575/4969] [gcloud] Accept
 gcr.io/google.com/cloudsdktool/google-cloud-cli as a valid image (#6422)

Also, use the new image in tests with a new tag which provides
`amd` and `arm` support. For backward compatibility, previous
image `gcr.io/google.com/cloudsdktool/cloud-sdk` is still valid.

Closes gh-6421
---
 .../containers/BigtableEmulatorContainer.java               | 6 +++++-
 .../containers/DatastoreEmulatorContainer.java              | 6 +++++-
 .../containers/FirestoreEmulatorContainer.java              | 6 +++++-
 .../testcontainers/containers/PubSubEmulatorContainer.java  | 6 +++++-
 .../containers/BigtableEmulatorContainerTest.java           | 2 +-
 .../containers/DatastoreEmulatorContainerTest.java          | 6 +++---
 .../containers/FirestoreEmulatorContainerTest.java          | 2 +-
 .../containers/PubSubEmulatorContainerTest.java             | 2 +-
 8 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index 84515fc7244..3e0ea0f55ce 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -14,6 +14,10 @@
 public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
         "gcr.io/google.com/cloudsdktool/cloud-sdk"
     );
 
@@ -23,7 +27,7 @@ public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulator
 
     public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(PORT);
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index db01001d5ec..dba58f7e145 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -13,6 +13,10 @@
 public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
         "gcr.io/google.com/cloudsdktool/cloud-sdk"
     );
 
@@ -29,7 +33,7 @@ public DatastoreEmulatorContainer(final String image) {
 
     public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(HTTP_PORT);
         setWaitStrategy(Wait.forHttp("/").forStatusCode(200));
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index a04c1e5831f..d0c9180cf14 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -13,6 +13,10 @@
 public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
         "gcr.io/google.com/cloudsdktool/cloud-sdk"
     );
 
@@ -22,7 +26,7 @@ public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulat
 
     public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(PORT);
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index 8d9f76e44ae..03183b2b13c 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -13,6 +13,10 @@
 public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
         "gcr.io/google.com/cloudsdktool/cloud-sdk"
     );
 
@@ -22,7 +26,7 @@ public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorCont
 
     public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(8085);
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*started.*$"));
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
index 3e22231220b..fa611df800c 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -36,7 +36,7 @@ public class BigtableEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
     );
 
     // }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index b1413edefba..864834bf85f 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -19,7 +19,7 @@ public class DatastoreEmulatorContainerTest {
     @Rule
     // creatingDatastoreEmulatorContainer {
     public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
     );
 
     // }
@@ -49,7 +49,7 @@ public void testSimple() {
     public void testWithFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-                "gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators"
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators"
             )
                 .withFlags("--consistency 1.0")
         ) {
@@ -64,7 +64,7 @@ public void testWithFlags() throws IOException, InterruptedException {
     public void testWithMultipleFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-                "gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators"
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators"
             )
                 .withFlags("--consistency 1.0 --data-dir /root/.config/test-gcloud")
         ) {
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index c87f8e5176a..e59302e495d 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -23,7 +23,7 @@ public class FirestoreEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
     );
 
     // }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index aeb92bc4a69..e1d1e74fb9c 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -37,7 +37,7 @@ public class PubSubEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
     );
 
     // }

From a72ec58410d9b04167f6eab0d9a13db81aebe6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 24 Jan 2023 09:46:21 -0500
Subject: [PATCH 2576/4969] Add ConcourseCI section (#6416)

Provide an example to run Testcontainers using ConcourseCI

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../continuous_integration/concourse_ci.md    | 46 +++++++++++++++++++
 mkdocs.yml                                    |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 docs/supported_docker_environment/continuous_integration/concourse_ci.md

diff --git a/docs/supported_docker_environment/continuous_integration/concourse_ci.md b/docs/supported_docker_environment/continuous_integration/concourse_ci.md
new file mode 100644
index 00000000000..3ca1ee897e8
--- /dev/null
+++ b/docs/supported_docker_environment/continuous_integration/concourse_ci.md
@@ -0,0 +1,46 @@
+# Concourse CI
+
+This is an example to run Testcontainers tests on [Concourse CI](https://concourse-ci.org/).
+
+A possible `pipeline.yml` config looks like this:
+
+```yaml
+resources:
+- name: repo
+  type: git
+  source:
+    uri: https://github.com/testcontainers/testcontainers-java-repro.git
+
+jobs:
+- name: testcontainers-job
+  plan:
+  # Add a get step referencing the resource
+  - get: repo
+  - task: testcontainers-task
+    privileged: true
+    config:
+      platform: linux
+      image_resource:
+        type: docker-image
+        source:
+          repository: amidos/dcind
+          tag: 2.1.0
+      inputs:
+      - name: repo
+      run:
+        path: /bin/sh
+        args: 
+          - -c
+          - |
+            source /docker-lib.sh
+            start_docker
+
+            cd repo
+            docker run -it --rm -v "$PWD:$PWD" -w "$PWD" -v /var/run/docker.sock:/var/run/docker.sock eclipse-temurin:17.0.5_8-jdk-alpine ./mvnw clean package
+```
+
+```bash
+fly -t tutorial set-pipeline -p testcontainers-pipeline -c pipeline.yml
+fly -t tutorial unpause-pipeline -p testcontainers-pipeline
+fly -t tutorial trigger-job --job testcontainers-pipeline/testcontainers-job --watch
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index eabeb1ebecf..1edf8c6de98 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -98,6 +98,7 @@ nav:
                 - supported_docker_environment/continuous_integration/aws_codebuild.md
                 - supported_docker_environment/continuous_integration/dind_patterns.md
                 - supported_docker_environment/continuous_integration/circle_ci.md
+                - supported_docker_environment/continuous_integration/concourse_ci.md
                 - supported_docker_environment/continuous_integration/drone.md
                 - supported_docker_environment/continuous_integration/gitlab_ci.md
                 - supported_docker_environment/continuous_integration/bitbucket_pipelines.md

From 5bd900b99c4f2ec55a76c2b19b9acdde83433e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 24 Jan 2023 09:46:41 -0500
Subject: [PATCH 2577/4969] Add Parallel Container Startup docs (#6415)

Add section explaining the usage of `Startables.deepStart`.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/features/advanced_options.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/features/advanced_options.md b/docs/features/advanced_options.md
index 8689ce46021..61b9112a03c 100644
--- a/docs/features/advanced_options.md
+++ b/docs/features/advanced_options.md
@@ -52,3 +52,9 @@ For example, this can be used to change the container hostname:
     It is typically quite stable, though.
 
 For what is possible, consult the [`docker-java CreateContainerCmd` source code](https://github.com/docker-java/docker-java/blob/3.2.1/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java).
+
+## Parallel Container Startup
+
+Usually, containers are started sequentially when more than one container is used.
+Using `Startables.deepStart(container1, container2, ...).join()` will start all containers in parallel. 
+This can be advantageous to reduce the impact of the container startup overhead.

From dab17a7c0050ee2335b2236869b9e3832076a765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 24 Jan 2023 10:46:37 -0500
Subject: [PATCH 2578/4969] Add workflow to update base version used by japicmp
 (#6407)

Previously, this step was done manually. In order to promote
automation `testcontainers.version` has been added to `gradle.properties`
in order to be updated every time there is a new release.

A PR will be created after the release is done.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../update-testcontainers-version.yml         | 32 +++++++++++++++++++
 RELEASING.md                                  |  1 +
 gradle.properties                             |  1 +
 gradle/japicmp.gradle                         |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/update-testcontainers-version.yml

diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
new file mode 100644
index 00000000000..bf11d121eac
--- /dev/null
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -0,0 +1,32 @@
+name: Update testcontainers version
+
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
+    if: github.repository == 'testcontainers/testcontainers-java'
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: main
+      - name: Update testcontainers.version property in gradle.properties
+        run: |
+          sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
+          git diff
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v3.10.1
+        with:
+          title: Update testcontainers version to ${GITHUB_REF##*/}
+          body: |
+            Update testcontainers version to ${GITHUB_REF##*/}
+          branch: update-tc-version
+          delete-branch: true
diff --git a/RELEASING.md b/RELEASING.md
index 8027cb9cc98..31a8217a227 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -18,6 +18,7 @@ Testcontainers' release process is semi-automated through GitHub Actions. This d
 9. Handcraft and polish some of the release notes (e.g. substitute combinded dependency PRs and highlight certain features).
 10. Rename existing milestone corresponding to new release and close it. Then create a new `next` milstestone.
 11. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter!
+12. Merge automated version update PRs in order to update the reference version in `mkdocs.yml` and `gradle.properties`.
 
 ## Internal details
 
diff --git a/gradle.properties b/gradle.properties
index a063988958c..cc9c268c0d6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
+testcontainers.version=1.17.6
diff --git a/gradle/japicmp.gradle b/gradle/japicmp.gradle
index 540feedbb79..a7342c3ba2c 100644
--- a/gradle/japicmp.gradle
+++ b/gradle/japicmp.gradle
@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-    baseline "org.testcontainers:${project.name}:1.17.6", {
+    baseline "org.testcontainers:${project.name}:${project['testcontainers.version']}", {
         exclude group: "*", module: "*"
     }
 }

From 042fffda5151c29a8e8af8f872ae31d1781dba87 Mon Sep 17 00:00:00 2001
From: Srinivasa Vasu <srinivasan.surprise@gmail.com>
Date: Wed, 25 Jan 2023 10:43:21 +0530
Subject: [PATCH 2579/4969] [yugabytedb] Add Testcontainers JDBC URL (#6327)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Srinivasa Vasu <srinivasan.surprise@gmail.com>

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/databases/jdbc.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 9e976d872ba..6cf4977ad96 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -55,6 +55,11 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:tidb:v6.1.0:///databasename`
 
+#### Using YugabyteDB
+
+`jdbc:tc:yugabyte:2.14.4.0-b26:///databasename`
+
+
 ### Using a classpath init script
 
 Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:

From 94829563dcd1434a603920354dd48bec914ed617 Mon Sep 17 00:00:00 2001
From: Thorsten P <84520839+poorSock@users.noreply.github.com>
Date: Mon, 30 Jan 2023 18:59:59 +0100
Subject: [PATCH 2580/4969] [selenium] Add edge support (#6437)

Support `selenium/standalone-edge` image in `BrowserWebDriverContainer`,
which is available with Selenium 4.
---
 docs/modules/webdriver_containers.md          |  5 ++--
 modules/selenium/build.gradle                 |  1 +
 .../containers/BrowserWebDriverContainer.java | 23 ++++++++++++++--
 .../junit/BaseWebDriverContainerTest.java     |  9 ++++---
 .../junit/ChromeWebDriverContainerTest.java   |  2 +-
 .../ContainerWithoutCapabilitiesTest.java     |  2 +-
 .../junit/EdgeWebDriverContainerTest.java     | 27 +++++++++++++++++++
 .../junit/FirefoxWebDriverContainerTest.java  |  2 +-
 8 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java

diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index 7ff4d2d6304..65b39bc5a8f 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -5,7 +5,7 @@ from SeleniumHQ's [docker-selenium](https://github.com/SeleniumHQ/docker-seleniu
 
 ## Benefits
 
-* Fully compatible with Selenium 3 & 4 tests, by providing a `RemoteWebDriver` instance
+* Fully compatible with Selenium 3 & 4 tests for Chrome and Firefox and Selenium 4 tests for Edge, by providing a `RemoteWebDriver` instance
 * No need to have specific web browsers, or even a desktop environment, installed on test servers. The only dependency
   is a working Docker installation and your Java JUnit test suite.
 * Browsers are always launched from a fixed, clean image. This means no configuration drift from user changes or
@@ -46,10 +46,11 @@ running on - which is quite likely), you'll need to use [the host exposing](../f
 
 ### Other browsers
 
-At the moment, Chrome and Firefox are supported. To switch, simply change the first parameter to the rule constructor:
+At the moment, Chrome, Firefox and Edge are supported. To switch, simply change the first parameter to the rule constructor:
 <!--codeinclude-->
 [Chrome](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java) inside_block:junitRule
 [Firefox](../../modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java) inside_block:junitRule
+[Edge](../../modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java) inside_block:junitRule
 <!--/codeinclude-->
 
 ### Recording videos
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index c7b344668da..c56300f5012 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,6 +6,7 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.6.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.6.0'
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.6.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.6.0'
     testImplementation 'org.seleniumhq.selenium:selenium-support:4.6.0'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 48c89533342..fc07186d576 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -52,6 +52,8 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 
     private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox");
 
+    private static final DockerImageName EDGE_IMAGE = DockerImageName.parse("selenium/standalone-edge");
+
     private static final DockerImageName CHROME_DEBUG_IMAGE = DockerImageName.parse("selenium/standalone-chrome-debug");
 
     private static final DockerImageName FIREFOX_DEBUG_IMAGE = DockerImageName.parse(
@@ -61,6 +63,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private static final DockerImageName[] COMPATIBLE_IMAGES = new DockerImageName[] {
         CHROME_IMAGE,
         FIREFOX_IMAGE,
+        EDGE_IMAGE,
         CHROME_DEBUG_IMAGE,
         FIREFOX_DEBUG_IMAGE,
     };
@@ -126,7 +129,7 @@ public BrowserWebDriverContainer(String dockerImageName) {
      */
     public BrowserWebDriverContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        // we assert compatibility with the chrome/firefox image later, after capabilities are processed
+        // we assert compatibility with the chrome/firefox/edge image later, after capabilities are processed
 
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
             .withRegEx(
@@ -266,9 +269,23 @@ private static DockerImageName getStandardImageForCapabilities(Capabilities capa
                 return (supportsVncWithoutDebugImage ? CHROME_IMAGE : CHROME_DEBUG_IMAGE).withTag(seleniumVersion);
             case BrowserType.FIREFOX:
                 return (supportsVncWithoutDebugImage ? FIREFOX_IMAGE : FIREFOX_DEBUG_IMAGE).withTag(seleniumVersion);
+            case BrowserType.EDGE:
+                if (supportsVncWithoutDebugImage) {
+                    return EDGE_IMAGE.withTag(seleniumVersion);
+                }
+                throw new UnsupportedOperationException(
+                    "For browser 'MicrosoftEdge' selenium version must be 4 or higher;" +
+                    "docker images are available from there upwards;" +
+                    "provided version: '" +
+                    seleniumVersion +
+                    "'"
+                );
             default:
                 throw new UnsupportedOperationException(
-                    "Browser name must be 'chrome' or 'firefox'; provided '" + browserName + "' is not supported"
+                    "Browser name must be 'chrome', 'firefox' or 'MicrosoftEdge';" +
+                    "provided '" +
+                    browserName +
+                    "' is not supported"
                 );
         }
     }
@@ -444,5 +461,7 @@ private static class BrowserType {
         private static final String CHROME = "chrome";
 
         private static final String FIREFOX = "firefox";
+
+        private static final String EDGE = "MicrosoftEdge";
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index 51e5175606d..97124802de1 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -4,8 +4,6 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.GenericContainer;
@@ -49,8 +47,11 @@ protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule, Capabil
         driver.quit();
     }
 
-    protected void assertBrowserNameIs(BrowserWebDriverContainer<?> rule, String expectedName) {
-        Capabilities capabilities = ("chrome".equals(expectedName)) ? new ChromeOptions() : new FirefoxOptions();
+    protected void assertBrowserNameIs(
+        BrowserWebDriverContainer<?> rule,
+        String expectedName,
+        Capabilities capabilities
+    ) {
         RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
         driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
         String actual = driver.getCapabilities().getBrowserName();
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
index 8499a0d0c6d..2f0bfc27b0d 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
@@ -20,7 +20,7 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     @Before
     public void checkBrowserIsIndeedChrome() {
-        assertBrowserNameIs(chrome, "chrome");
+        assertBrowserNameIs(chrome, "chrome", new ChromeOptions());
     }
 
     @Test
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
index c9aa7ec2221..f5c03fb32d1 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
@@ -12,7 +12,7 @@ public class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest
 
     @Test
     public void chromeIsStartedIfNoCapabilitiesProvided() {
-        assertBrowserNameIs(chrome, "chrome");
+        assertBrowserNameIs(chrome, "chrome", new ChromeOptions());
     }
 
     @Test
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java
new file mode 100644
index 00000000000..f1935fa84ee
--- /dev/null
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java
@@ -0,0 +1,27 @@
+package org.testcontainers.junit;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openqa.selenium.edge.EdgeOptions;
+import org.testcontainers.containers.BrowserWebDriverContainer;
+
+public class EdgeWebDriverContainerTest extends BaseWebDriverContainerTest {
+
+    // junitRule {
+    @Rule
+    public BrowserWebDriverContainer<?> edge = new BrowserWebDriverContainer<>()
+        .withCapabilities(new EdgeOptions())
+        // }
+        .withNetwork(NETWORK);
+
+    @Before
+    public void checkBrowserIsIndeedMSEdge() {
+        assertBrowserNameIs(edge, "msedge", new EdgeOptions());
+    }
+
+    @Test
+    public void simpleExploreTest() {
+        doSimpleExplore(edge, new EdgeOptions());
+    }
+}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
index 76da6d32c40..211800b8fad 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
@@ -20,7 +20,7 @@ public class FirefoxWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     @Before
     public void checkBrowserIsIndeedFirefox() {
-        assertBrowserNameIs(firefox, "firefox");
+        assertBrowserNameIs(firefox, "firefox", new FirefoxOptions());
     }
 
     @Test

From c9325e498e945a104b7f8bb4df4a5355b6a3a6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 31 Jan 2023 10:06:38 -0500
Subject: [PATCH 2581/4969] Update docker-java version to 3.2.14

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0b12f5fea9a..5f7be88d99d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.0'
 
     api platform('com.github.docker-java:docker-java-bom:3.2.14')
-    shaded platform('com.github.docker-java:docker-java-bom:3.2.13')
+    shaded platform('com.github.docker-java:docker-java-bom:3.2.14')
 
     api "com.github.docker-java:docker-java-api"
 

From 80700c13e11030fa7bd133b6b26cf9b2897a7680 Mon Sep 17 00:00:00 2001
From: trolley813 <trolleybus.1329@gmail.com>
Date: Wed, 1 Feb 2023 23:04:34 +0300
Subject: [PATCH 2582/4969] [clickHouse] Add support for new driver (#6236)

---
 .../containers/ClickHouseContainer.java       | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 4e87c77ee5b..d9879402ebb 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -25,7 +26,9 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     public static final Integer NATIVE_PORT = 9000;
 
-    private static final String DRIVER_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
+    private static final String LEGACY_DRIVER_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
+
+    private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
 
     private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
 
@@ -37,6 +40,8 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private String password = "";
 
+    private boolean supportsNewDriver;
+
     /**
      * @deprecated use {@link ClickHouseContainer(DockerImageName)} instead
      */
@@ -52,6 +57,7 @@ public ClickHouseContainer(String dockerImageName) {
     public ClickHouseContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLICKHOUSE_IMAGE_NAME);
+        supportsNewDriver = isNewDriverSupported(dockerImageName);
 
         addExposedPorts(HTTP_PORT, NATIVE_PORT);
         this.waitStrategy =
@@ -69,13 +75,22 @@ public Set<Integer> getLivenessCheckPortNumbers() {
     @Override
     public String getDriverClassName() {
         try {
-            Class.forName(DRIVER_CLASS_NAME);
-            return DRIVER_CLASS_NAME;
+            if (supportsNewDriver) {
+                Class.forName(DRIVER_CLASS_NAME);
+                return DRIVER_CLASS_NAME;
+            } else {
+                return LEGACY_DRIVER_CLASS_NAME;
+            }
         } catch (ClassNotFoundException e) {
-            return "com.clickhouse.jdbc.ClickHouseDriver";
+            return LEGACY_DRIVER_CLASS_NAME;
         }
     }
 
+    private static boolean isNewDriverSupported(DockerImageName dockerImageName) {
+        // New driver supports versions 20.7+. Check the version part of the tag
+        return new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("20.7");
+    }
+
     @Override
     public String getJdbcUrl() {
         return JDBC_URL_PREFIX + getHost() + ":" + getMappedPort(HTTP_PORT) + "/" + databaseName;

From ae9136e33651a4ebe9e7fc4104a59bbd4c932572 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:23 +0000
Subject: [PATCH 2583/4969] Bump mysql:mysql-connector-java in
 /modules/jdbc-test

Bumps mysql:mysql-connector-java from 8.0.31 to 8.0.32.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ea170edbd82..56051d1d529 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -13,5 +13,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.31'
+    api 'mysql:mysql-connector-java:8.0.32'
 }

From 20347a152116687b80de783bce36fbc722ed5570 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:23 +0000
Subject: [PATCH 2584/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ea170edbd82..cde576b53a7 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
-    api 'org.assertj:assertj-core:3.23.1'
+    api 'org.assertj:assertj-core:3.24.2'
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'

From e584e2e58e0d9e2c3b52eacf667aa22cb641cd6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:25 +0000
Subject: [PATCH 2585/4969] Bump org.assertj:assertj-core in
 /modules/clickhouse

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 9f7df373b27..2374186fd38 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e574d211d634a9a3ac233f3ba2d7ed5d804d504d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:25 +0000
Subject: [PATCH 2586/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/jdbc

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 398da0980b8..3a9b2281e31 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.4'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }

From 1525838a7f8a71101c74a38049904eb3c3f371b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:25 +0000
Subject: [PATCH 2587/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.3.1 to 3.3.2.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index ccc9749db6d..7b66a09badf 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 0a68c64df2de1f8aefa2caa07f4dbba88334fcc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:25 +0000
Subject: [PATCH 2588/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/influxdb

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 81acb7be840..bd37ae0ce50 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.23'
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.influxdb:influxdb-java:2.23'
     testImplementation "com.influxdb:influxdb-client-java:6.7.0"
 }

From c4145a0f9000325416df5b2004b92aa37f5ae673 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:26 +0000
Subject: [PATCH 2589/4969] Bump org.assertj:assertj-core in /modules/cassandra

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 7f9ab53c71b..52f528540ea 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
     testImplementation 'com.datastax.oss:java-driver-core:4.15.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e7c4ec71042dc491a7975ca332317a8f068cc520 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:26 +0000
Subject: [PATCH 2590/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/dynalite

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index a0b148c733d..cb91c5379a2 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.376'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 28636fbfd6be1af8ff1ce821826470fd4fcb4939 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:26 +0000
Subject: [PATCH 2591/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/neo4j

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index ca651fcfbe0..f9c2fff7f29 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 6e716e96a5e2c9103f021d87654070d45a656b34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:26 +0000
Subject: [PATCH 2592/4969] Bump mysql:mysql-connector-java from 8.0.31 to
 8.0.32 in /modules/mysql

Bumps mysql:mysql-connector-java from 8.0.31 to 8.0.32.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b892c29dcb4..0afac285151 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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.31'
+    testImplementation 'mysql:mysql-connector-java:8.0.32'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From 928ac09762f576c0a3a34453a508fd93badbc089 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:26 +0000
Subject: [PATCH 2593/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/vault

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index c901f393059..2ee8e29f1d7 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.3.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 
 }

From 6d4bde92bf06d8a378d1f601868a139056fc9e75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:27 +0000
Subject: [PATCH 2594/4969] Bump org.assertj:assertj-core in
 /modules/database-commons

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 33a6d1e9826..7382aa70333 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 63af9239087afb2073132cf575cc6b39daef176e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:27 +0000
Subject: [PATCH 2595/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.1 to 42.5.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.1...REL42.5.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 48103ae01b8..0552eb7970c 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.5.1'
+    testImplementation 'org.postgresql:postgresql:42.5.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 8c5f3b5436e68101dd9054b34d9ed3f896996ed7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:27 +0000
Subject: [PATCH 2596/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.4.1...java-client-3.4.2)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 853598b71c5..ecf447d2e67 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.1'
+    testImplementation 'com.couchbase.client:java-client:3.4.2'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 8d7d29b4f1d592e124b7827ff3ce593d28565b18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:28 +0000
Subject: [PATCH 2597/4969] Bump org.jetbrains:annotations in
 /modules/oracle-xe

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index ab87bc2f994..c4ded1af921 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 21abde27b1519abecbb8deea4420e0909cc51672 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:29 +0000
Subject: [PATCH 2598/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.1.0.jre8-preview to 12.2.0.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ff7ffe46cfc..a77da44e01a 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.1.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre8'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'

From 025ecc8ce4a04f79799341e11773d0f3bd0dc2cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:29 +0000
Subject: [PATCH 2599/4969] Bump org.assertj:assertj-core in /modules/toxiproxy

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index afe76308ba6..9115a5593b8 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:3.0.1'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 
     testImplementation project(':test-support')
 }

From 48c571e8cec82df6570277fbb7d889ca1eaa4b3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:29 +0000
Subject: [PATCH 2600/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/jdbc

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 398da0980b8..759f4ccdbaf 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':database-commons')
     testImplementation project(':test-support')
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.4'

From e499d8a83fcb15b660beb8e3558f754b03f4d222 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:29 +0000
Subject: [PATCH 2601/4969] Bump org.jetbrains:annotations in /modules/selenium

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index c56300f5012..c8eae97e12f 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 491d7e6ee36a4baa3a6fe8fb966f0903c66b99c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:29 +0000
Subject: [PATCH 2602/4969] Bump org.assertj:assertj-core in /modules/couchbase

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 853598b71c5..9199f1dad98 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'com.couchbase.client:java-client:3.4.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e0d174470630369575ae9b09c836de04a56225f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:30 +0000
Subject: [PATCH 2603/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/nginx

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index efbd0f1e04b..45faa462d24 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:23.1.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7264b54fd975ecbc66375e17d469672b25b846f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:30 +0000
Subject: [PATCH 2604/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.5.3 to 8.6.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.5.3...v8.6.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 3e0a2c503ad..5db3c15764a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.3"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.6.1"
     testImplementation "org.elasticsearch.client:transport:7.17.8"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From cfdcd7594fbb71d5116e336f640b47a0ccbf2e2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:30 +0000
Subject: [PATCH 2605/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/mysql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b892c29dcb4..9f913960b18 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From a09943ee79b8cab6b9da28e54c33afc36ebbb712 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:30 +0000
Subject: [PATCH 2606/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/spock

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 40ea89fb37c..1bd96e6a684 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.1'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'
 
     testCompileOnly 'org.jetbrains:annotations:23.1.0'

From bd40643d00a815857b6d0813e2774ffc447df9dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:31 +0000
Subject: [PATCH 2607/4969] Bump org.apache.pulsar:pulsar-client-admin in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client-admin](https://github.com/apache/pulsar) from 2.10.2 to 2.11.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.10.2...v2.11.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 7d85bc41435..66d467fb4ed 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.11.0'
 }

From 47ec31a43f3d2ec4a455316663a3ff88ae4c313e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:31 +0000
Subject: [PATCH 2608/4969] Bump org.mock-server:mockserver-client-java in
 /modules/mockserver

Bumps [org.mock-server:mockserver-client-java](https://github.com/jamesdbloom/mockservice) from 5.14.0 to 5.15.0.
- [Release notes](https://github.com/jamesdbloom/mockservice/releases)
- [Changelog](https://github.com/mock-server/mockserver/blob/master/changelog.md)
- [Commits](https://github.com/jamesdbloom/mockservice/compare/mockserver-5.14.0...mockserver-5.15.0)

---
updated-dependencies:
- dependency-name: org.mock-server:mockserver-client-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 85e7aaa181e..cb9323e8617 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MockServer"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.mock-server:mockserver-client-java:5.14.0'
+    testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From c21b1a29cdaeef3e55f5295991c0ff5b35901e50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:31 +0000
Subject: [PATCH 2609/4969] Bump org.jetbrains:annotations in
 /modules/postgresql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 48103ae01b8..9b1f65b69bb 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -16,5 +16,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 96f84b1c8d92de1e3015e00c7cc7d2e0558845fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:34 +0000
Subject: [PATCH 2610/4969] Bump io.nats:jnats from 2.16.5 to 2.16.7 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.16.5 to 2.16.7.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.16.5...2.16.7)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 2dd37efa1ee..8d67cff9333 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.5'
+    testImplementation 'io.nats:jnats:2.16.7'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }

From ffa965f94a527693f5bd46e6030a644cfd8ccce2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:00:34 +0000
Subject: [PATCH 2611/4969] Bump org.assertj:assertj-core in
 /modules/elasticsearch

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 3e0a2c503ad..68b8eb12dfd 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.3"
     testImplementation "org.elasticsearch.client:transport:7.17.8"
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From cd054b0ac1ebfe13f37c37149bd6d012c62d061e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:01:39 +0000
Subject: [PATCH 2612/4969] Bump io.fabric8:kubernetes-client from 6.3.1 to
 6.4.1 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.3.1 to 6.4.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.3.1...v6.4.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 34991dc0d4f..b85c92cd9e8 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.3.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.4.1'
     testImplementation 'io.kubernetes:client-java:17.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From f3b1d4444640a0441033732abd5bb7eb249c2bba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:01:41 +0000
Subject: [PATCH 2613/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.1...v3.5.2)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 4f77005ba5c..5058b085f73 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.1'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.2'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 86d786605ead046ce83f19a584152aafad3614f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:01:42 +0000
Subject: [PATCH 2614/4969] Bump com.google.cloud:google-cloud-datastore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.13.0 to 2.13.3.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.13.0...v2.13.3)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 4fe31cfaadc..42e1961937b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.3'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.34.1'

From 80e918c1a3210463b23d4fa94a497ec25d00ddc8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:01:49 +0000
Subject: [PATCH 2615/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.14 to 3.2.15.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.14...3.2.15)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 9f3a84e5514..6396c59db7b 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.14"
+    api "com.orientechnologies:orientdb-client:3.2.15"
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'

From 5610673ba699aeb73e5cf2c1dab3e8a8fdac3544 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:01:49 +0000
Subject: [PATCH 2616/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/k3s

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 34991dc0d4f..0de62700297 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -10,5 +10,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:6.3.1'
     testImplementation 'io.kubernetes:client-java:17.0.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 12786eecbb3f9c9bf981e05778729e97ae837b36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:02 +0000
Subject: [PATCH 2617/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.14 to 3.2.15.
- [Release notes](https://github.com/orientechnologies/orientdb-gremlin/releases)
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.14...3.2.15)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 9f3a84e5514..62f584d683a 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.14"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.15"
 }

From 66f6c5621069c9104b5373d26938737caeffb709 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:06 +0000
Subject: [PATCH 2618/4969] Bump com.azure:azure-cosmos from 4.39.0 to 4.40.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.39.0 to 4.40.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.39.0...azure-cosmos_4.40.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index f213006d8cb..d3ec0226a02 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.39.0'
+    testImplementation 'com.azure:azure-cosmos:4.40.0'
 }

From 4dc5bf5b9e9cd91e41895544e6f9cc01eefbc27f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:07 +0000
Subject: [PATCH 2619/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.10.0...4.11.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c52aef942ef..6b52511335c 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.10.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.11.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")

From 7067ff9fac08db88505b75dde83edd5c76d3a075 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:09 +0000
Subject: [PATCH 2620/4969] Bump com.google.cloud:google-cloud-spanner in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.34.1 to 6.35.2.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.34.1...v6.35.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 4fe31cfaadc..b0212a5bb06 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.34.1'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 653a472ea51b1b3dbf98fb4879d1fb61bd8c7825 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:13 +0000
Subject: [PATCH 2621/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/hivemq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c52aef942ef..fa9b93e7616 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:23.1.0")
+    api("org.jetbrains:annotations:24.0.0")
 
     shaded("org.apache.commons:commons-lang3:3.12.0")
     shaded("commons-io:commons-io:2.11.0")

From afe264bd6b42d831761d29a372f424a2901dd889 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:30 +0000
Subject: [PATCH 2622/4969] Bump net.lingala.zip4j:zip4j from 2.11.2 to 2.11.3
 in /modules/hivemq

Bumps [net.lingala.zip4j:zip4j](https://github.com/srikanth-lingala/zip4j) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases)
- [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.11.2...v2.11.3)

---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c52aef942ef..24a3463c0e4 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
-    shaded("net.lingala.zip4j:zip4j:2.11.2")
+    shaded("net.lingala.zip4j:zip4j:2.11.3")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
     testImplementation(project(":junit-jupiter"))

From 848849ac85ff6a5114e431644f866af222465147 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:33 +0000
Subject: [PATCH 2623/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/hivemq

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c52aef942ef..8c82e8b619f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
 }
 

From fe70b0e621885591db7840c2d709cd6acc3b3dff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:39 +0000
Subject: [PATCH 2624/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c52aef942ef..edfe1a78a0f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.2")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.10.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")

From 5724969d4df03dff77522e0295ad922cf6be203b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:02:48 +0000
Subject: [PATCH 2625/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.12.2 to 3.12.3.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 6f7eb1a2f0c..9c9e9e29f15 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }

From bf2e4ba391028156e2d03e07e0d88d97ac137e80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:03:25 +0000
Subject: [PATCH 2626/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/consul

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index 4e0c7db06ca..e8123eb30c7 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.3.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 36b9d6b2ba2a674bedf106f71fc9db6bb9fb8c4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:03:32 +0000
Subject: [PATCH 2627/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/redpanda

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 49ee9c3a766..3899edb2342 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.0'
 }

From e4e6d8f4cc1066f460afb4c2170258d2ce72653a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:04:53 +0000
Subject: [PATCH 2628/4969] Bump org.questdb:questdb from 6.6.1-jdk8 to
 6.7-jdk8 in /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 6.6.1-jdk8 to 6.7-jdk8.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/commits)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 046dd5fae8a..cf00612f627 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.1'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.questdb:questdb:6.6.1-jdk8'
+    testImplementation 'org.questdb:questdb:6.7-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From da237e23d79b83a030fc4f8e16080870771cfa47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:05:00 +0000
Subject: [PATCH 2629/4969] Bump com.yugabyte:jdbc-yugabytedb in
 /modules/yugabytedb

Bumps [com.yugabyte:jdbc-yugabytedb](https://github.com/yugabyte/pgjdbc) from 42.3.5-yb-1 to 42.3.5-yb-2.
- [Release notes](https://github.com/yugabyte/pgjdbc/releases)
- [Changelog](https://github.com/yugabyte/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yugabyte/pgjdbc/commits/v42.3.5-yb-2)

---
updated-dependencies:
- dependency-name: com.yugabyte:jdbc-yugabytedb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index 52b0ce25cc5..fa68ba41241 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-11'
     // YSQL driver
-    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-1'
+    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-2'
 }

From 853d43293463dd9b9888ff71397d7ef89fc616f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:06:23 +0000
Subject: [PATCH 2630/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 32702df3698..09b6f13fafd 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.1"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.23.1'

From aa1d7a3e701cee407d4f9787db58c07835c00c42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:08:48 +0000
Subject: [PATCH 2631/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /modules/junit-jupiter

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a0a8c91fb23..36975c020e6 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    api 'org.junit.jupiter:junit-jupiter-api:5.9.2'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')

From 531b5bd5b097ae570b4492af7322044d0f61ea3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:16:51 +0000
Subject: [PATCH 2632/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/db2

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 5021e958c60..1055c261cdf 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.ibm.db2:jcc:11.5.8.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 0a535a02fd302e055de6b589d03319b8854cc61b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:17:06 +0000
Subject: [PATCH 2633/4969] Bump com.amazonaws:aws-java-sdk-logs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.376 to 1.12.398.
- [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.12.376...1.12.398)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3f51c9ea618..9fa4d942404 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.356'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.376'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.398'
     testImplementation 'software.amazon.awssdk:s3:2.19.8'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From b0387e36d86f420be38dc475f8244faa8d9fcff5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:18:34 +0000
Subject: [PATCH 2634/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/solr

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 8d053fa4169..857280d082b 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 25a3fb93877b597708c4f083bdd23aa8e49848c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:19:37 +0000
Subject: [PATCH 2635/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.376 to 1.12.398.
- [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.12.376...1.12.398)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index a0b148c733d..579ccb7d621 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.376'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.376'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 36db010adf4501949a84d142c7fac6380f53d6b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:19:48 +0000
Subject: [PATCH 2636/4969] Bump io.trino:trino-jdbc from 405 to 406 in
 /modules/trino

Bumps io.trino:trino-jdbc from 405 to 406.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 53fbf33b023..37c458a3531 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:405'
+    testImplementation 'io.trino:trino-jdbc:406'
     compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 85cbed151433f1c947fed3c9ab63d3bf1bd31281 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:21:22 +0000
Subject: [PATCH 2637/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 32702df3698..daa209d7b45 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.2.2.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.1"
     testImplementation project(":testcontainers")

From a7146ceb6ca5f6a0f480b8d308f6d7dea4cbf2b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:21:36 +0000
Subject: [PATCH 2638/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.12.2 to 3.12.3.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index b3814db166c..bb3ce2952db 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 6f7eb1a2f0c..9c9e9e29f15 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }

From ffbd8b241861869ca9bbc6c6dd5e17f743ef4755 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:21:37 +0000
Subject: [PATCH 2639/4969] Bump org.assertj:assertj-core in
 /modules/junit-jupiter

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a0a8c91fb23..4e3e765cbe2 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.1'

From 482724bd96d9b0ba25537f8ecd093d3e0a11e982 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:23:27 +0000
Subject: [PATCH 2640/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/gcloud

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 4fe31cfaadc..842d6d19aa3 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.34.1'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From ef2c5f2cca15f5f477a20190027d94287b08420a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:32:46 +0000
Subject: [PATCH 2641/4969] Bump org.postgresql:postgresql from 42.5.1 to
 42.5.2 in /examples

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.1 to 42.5.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.1...REL42.5.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d74d75b3666..57ca7c3b3d9 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
-    testImplementation 'org.postgresql:postgresql:42.5.1'
+    testImplementation 'org.postgresql:postgresql:42.5.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From da5a1ff9a31f9cd7e9c3ce2a9a1d1a8480bd2e0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:34:43 +0000
Subject: [PATCH 2642/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /core

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 5f7be88d99d..a6ca165c56a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -68,8 +68,8 @@ configurations.all {
 dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:23.1.0'
-    testCompileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
+    testCompileOnly 'org.jetbrains:annotations:24.0.0'
     api 'org.apache.commons:commons-compress:1.22'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From 301a65fa0a3d6211812c86f1ed6eceb4d6379ac4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:37:25 +0000
Subject: [PATCH 2643/4969] Bump org.seleniumhq.selenium:selenium-edge-driver
 in /modules/selenium

Bumps [org.seleniumhq.selenium:selenium-edge-driver](https://github.com/SeleniumHQ/selenium) from 4.6.0 to 4.8.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.6.0...selenium-4.8.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-edge-driver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index c56300f5012..16692ce8236 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.6.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.6.0'
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.6.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.8.0'
     testImplementation 'org.seleniumhq.selenium:selenium-support:4.6.0'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'

From a94b68909ff5c30e17b2abdb46242562463ea80d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:37:46 +0000
Subject: [PATCH 2644/4969] Bump org.apache.pulsar:pulsar-client in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client](https://github.com/apache/pulsar) from 2.10.2 to 2.11.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v2.10.2...v2.11.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 7d85bc41435..50078a5aeb4 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.11.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.2'
 }

From 7ad8a8b47b22f222a256e2105737f68079cc9fa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:38:41 +0000
Subject: [PATCH 2645/4969] Bump org.assertj:assertj-core in
 /modules/localstack

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 3f51c9ea618..3b6ff469b8d 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.376'
     testImplementation 'software.amazon.awssdk:s3:2.19.8'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 78e755ae54a4f73315a48c473e6fc4bfc04106bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:39:42 +0000
Subject: [PATCH 2646/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.1 to 42.5.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.1...REL42.5.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 7f2b5f1850f..794c1a9f9d8 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.1'
+    testImplementation 'org.postgresql:postgresql:42.5.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 9e98370f7225b392733a9e535eb5ec88ee1f23b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:39:44 +0000
Subject: [PATCH 2647/4969] Bump com.google.code.gson:gson from 2.10 to 2.10.1
 in /examples

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10 to 2.10.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.10...gson-parent-2.10.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 3480bcf1704..7f4759d5913 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.3.1'
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f4a0aa56d02..1911e8a0a79 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:4.3.1'
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index d1731188398..b3be6448007 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:4.3.1'
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 

From ff1153c947e180341bc3a441fd17a47d78641989 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:41:19 +0000
Subject: [PATCH 2648/4969] Bump mysql:mysql-connector-java in
 /modules/junit-jupiter

Bumps mysql:mysql-connector-java from 8.0.31 to 8.0.32.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a0a8c91fb23..09e77f9a4a2 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 

From e98cdbc39a66f7d74bf472ccfe946b601a3c549f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:41:55 +0000
Subject: [PATCH 2649/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/r2dbc

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 4f77005ba5c..34ad5dabf85 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 

From e785450ec6eb70f163eeae6bc39fc1dcfe5a0208 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:43:23 +0000
Subject: [PATCH 2650/4969] Bump org.postgresql:postgresql from 42.5.1 to
 42.5.2 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.1 to 42.5.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.1...REL42.5.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 40ea89fb37c..c623039ffa1 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'

From adb1cc4d89cb8d6a890c072d536cebe0efb96e58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:51:34 +0000
Subject: [PATCH 2651/4969] Bump release-drafter/release-drafter from 5.21.1 to
 5.22.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.21.1 to 5.22.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/6df64e4ba4842c203c604c1f45246c5863410adb...cfc5540ebc9d65a8731f02032e3d44db5e449fb6)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index df1a05c8441..b664c4e8fa6 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@6df64e4ba4842c203c604c1f45246c5863410adb # v5.19.0
+      - uses: release-drafter/release-drafter@cfc5540ebc9d65a8731f02032e3d44db5e449fb6 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 00873cb3f27203f1b21acd2cf098011e4669c179 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:52:41 +0000
Subject: [PATCH 2652/4969] Bump com.amazonaws:aws-java-sdk-s3 in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.376 to 1.12.398.
- [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.12.376...1.12.398)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 3f51c9ea618..7bc937a5527 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.376'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.356'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.398'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.376'
     testImplementation 'software.amazon.awssdk:s3:2.19.8'

From f8f24a676a887a0af729be3df3c61ea9cb01d9c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:53:41 +0000
Subject: [PATCH 2653/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/rabbitmq

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index b924adbb0cb..ebbfe187152 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 524f45593f809dc3498bc47d2887d780912eb94f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:54:46 +0000
Subject: [PATCH 2654/4969] Bump io.cucumber:cucumber-java from 7.10.1 to
 7.11.1 in /examples

Bumps [io.cucumber:cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.10.1 to 7.11.1.
- [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/v7.10.1...v7.11.1)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 26856ebf38e..78e436e98b1 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:7.10.1'
+    testImplementation 'io.cucumber:cucumber-java:7.11.1'
     testImplementation 'io.cucumber:cucumber-junit:7.10.1'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.23.1'

From 7a874e96cc0627807e571f79644bc6edf6eb8316 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:56:48 +0000
Subject: [PATCH 2655/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/mongodb

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 1266d9d4481..6ae4264f114 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:4.8.1")
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
 tasks.japicmp {

From 2dec662b883b00192ed7c2f6d82fd0ea91d83a89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:57:12 +0000
Subject: [PATCH 2656/4969] Bump org.apache.kafka:kafka-clients from 3.3.1 to
 3.3.2 in /examples

Bumps org.apache.kafka:kafka-clients from 3.3.1 to 3.3.2.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index dd55185dfef..6cfdf96982b 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'

From ae19e3f7aae70c7cbd4e6203205cfaceb3721a38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:59:02 +0000
Subject: [PATCH 2657/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /core

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 5f7be88d99d..5aa2fbc9962 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -103,13 +103,13 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.22.0'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.24.2'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 403d82687e767919c4906d0f36dcbd0c59094ef4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 23:02:15 +0000
Subject: [PATCH 2658/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/selenium

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index c56300f5012..1fa586b7239 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 
     compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From b4f37655f376fbde8b524e85b1575cd0c180300e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:33:48 +0000
Subject: [PATCH 2659/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.4 to 10.1.5.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index bcf5feb01d3..3d60cad4116 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.4'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.5'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From d2944063602b5302f3feab0872daacde723fc20b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:33:49 +0000
Subject: [PATCH 2660/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.19.8 to 2.19.29.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c59868d26ea..fc8d1e2d306 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.398'
-    testImplementation 'software.amazon.awssdk:s3:2.19.8'
+    testImplementation 'software.amazon.awssdk:s3:2.19.29'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e0b2fe14fc5b8038481ea7d3abf6c25c8a65490a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:33:49 +0000
Subject: [PATCH 2661/4969] Bump org.assertj:assertj-core in
 /modules/mockserver

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index cb9323e8617..6aabb760988 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From a79a9e6799074edd13a6c9ec86aca0a33a48ebcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:09 +0000
Subject: [PATCH 2662/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.1 to 42.5.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.1...REL42.5.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d1ca901b415..f5960573530 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }

From ef5a0d39d3aa88b14f263fc7ed3b5f819f39e6f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:09 +0000
Subject: [PATCH 2663/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/nginx

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 45faa462d24..8a3e319b125 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 1a63a477cdf5d3866ba2a51b04257e676d5b0996 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:10 +0000
Subject: [PATCH 2664/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit5) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 2540b537256..25e3536a527 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'
 
     testCompileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 89e587778448c7aadb9cbf97996f8f3b819d084f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:10 +0000
Subject: [PATCH 2665/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/kafka

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 7b66a09badf..10e86840a56 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 1cd5eb092a2f025f1e2885453fed2db4eb4a55f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:11 +0000
Subject: [PATCH 2666/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.1.0 to 3.1.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/commits/3.1.2)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d948e3261c9..e268d0952c8 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'

From 04444ba8611c810d1e6adb1adb5a582d53063ef8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:29 +0000
Subject: [PATCH 2667/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /modules/junit-jupiter

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d1ca901b415..c5f4fa6ce61 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
 }
 
 test {

From e2def930a98afe0c4fe4ed72d1d666276528d5bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:30 +0000
Subject: [PATCH 2668/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/trino

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 37c458a3531..eb2efda5c8f 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.trino:trino-jdbc:406'
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 80e3cf0375eee348f14a0a5a941bcc02081788e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:30 +0000
Subject: [PATCH 2669/4969] Bump org.jetbrains:annotations in /modules/rabbitmq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index ebbfe187152..0623e3e6982 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 376259645b505721ffacd766ed67a02c18c113c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:35 +0000
Subject: [PATCH 2670/4969] Bump com.google.cloud:google-cloud-bigtable in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.17.1 to 2.18.3.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.17.1...v2.18.3)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 8c32b3be47a..8b58334faa9 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.18.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From f4c962cd212456fd2e4bc0a0d0ae9f946b26c46b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:35 +0000
Subject: [PATCH 2671/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/orientdb

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 13abd3c5e9a..3ca5182bed1 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.15"
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.15"
 }

From cd5692fb8eaec44600195a09d41998a6969cd999 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:46 +0000
Subject: [PATCH 2672/4969] Bump com.google.cloud:google-cloud-firestore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.7.4 to 3.7.9.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.7.4...v3.7.9)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 8c32b3be47a..ee9796543df 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.3'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.9'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'

From 9c2aae2ed8c7d8cac5d323bebab3bdf1cfbe1aaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:50 +0000
Subject: [PATCH 2673/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 82e68ed9bfb..b3e98f6a93e 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
 }
 
 test {

From 4cdef038f91b30e00cee3e56516e6bc0ce01e8d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:52 +0000
Subject: [PATCH 2674/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.3.1 to 3.3.2.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 3899edb2342..4b156d0b300 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.0'
 }

From 7c9419fa16a79b8ba455b2876ce79b3d96a020de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:53 +0000
Subject: [PATCH 2675/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/questdb

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index cf00612f627..a59d0cd842f 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testImplementation 'org.postgresql:postgresql:42.5.1'
     testImplementation project(':jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.questdb:questdb:6.7-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From 516a8a5e2b24b691c46951836b1f97995f1582fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:53 +0000
Subject: [PATCH 2676/4969] Bump mysql:mysql-connector-java from 8.0.31 to
 8.0.32 in /modules/tidb

Bumps mysql:mysql-connector-java from 8.0.31 to 8.0.32.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 6329d2dff06..43ac69cc56b 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.31'
+    testImplementation 'mysql:mysql-connector-java:8.0.32'
 
     compileOnly 'org.jetbrains:annotations:23.1.0'
 }

From 22a4e6cae10ef52060f28d9b6d0477d2ac7578f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:54 +0000
Subject: [PATCH 2677/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/tidb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 6329d2dff06..894d3b0a750 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'mysql:mysql-connector-java:8.0.31'
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From b1efb3b3461a79e68ff103a754798255cd722bb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:55 +0000
Subject: [PATCH 2678/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /modules/junit-jupiter

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d1ca901b415..cde0a9ba08c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'

From 986c76da0c35131fe995588ad1ccf7a609517fd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:34:56 +0000
Subject: [PATCH 2679/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.8.1 to 4.8.2.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.8.1...r4.8.2)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 6ae4264f114..284991af252 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.8.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.8.2")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From 0014ac69f5b5fd0cc597913e9cc45f4878b5b6c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:35:10 +0000
Subject: [PATCH 2680/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/presto

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 54945a8e62f..7d5bde5a64d 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 17f1d9bccc45b6cf5cd2c186f1475ee81cdbab6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:35:11 +0000
Subject: [PATCH 2681/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/pulsar

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 718b122c0b7..c4419a523d3 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.11.0'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.11.0'
 }

From 0e78f15b59bc2f054ebe88e22eb38cd2e8748d1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:35:14 +0000
Subject: [PATCH 2682/4969] Bump org.jetbrains:annotations from 23.1.0 to
 24.0.0 in /modules/spock

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.1.0 to 24.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.1.0...24.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 2540b537256..73227ca171f 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'
 
-    testCompileOnly 'org.jetbrains:annotations:23.1.0'
+    testCompileOnly 'org.jetbrains:annotations:24.0.0'
 }
 
 sourceJar {

From caa203a40028a4c545225b24df7e221635ef0e20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:35:15 +0000
Subject: [PATCH 2683/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/azure

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index d3ec0226a02..9aa8961bebe 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.azure:azure-cosmos:4.40.0'
 }

From 8ba6fc09a54cad9875dbaeeb83a3ecba3258a2f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:35:16 +0000
Subject: [PATCH 2684/4969] Bump com.amazonaws:aws-java-sdk-sqs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.376 to 1.12.398.
- [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.12.376...1.12.398)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c59868d26ea..57d12f3b202 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.398'
     testImplementation 'software.amazon.awssdk:s3:2.19.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 7c101728937dd5e4d1c8be2f32bbd82143f93065 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:35:17 +0000
Subject: [PATCH 2685/4969] Bump io.cucumber:cucumber-junit from 7.10.1 to
 7.11.1 in /examples

Bumps [io.cucumber:cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 7.10.1 to 7.11.1.
- [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/v7.10.1...v7.11.1)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 78e436e98b1..e56bb1b9590 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -11,7 +11,7 @@ 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:7.11.1'
-    testImplementation 'io.cucumber:cucumber-junit:7.10.1'
+    testImplementation 'io.cucumber:cucumber-junit:7.11.1'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

From 9ae63a28c23d5f93ca966477841651b8e9b38e3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:47:05 +0000
Subject: [PATCH 2686/4969] Bump org.assertj:assertj-core in
 /modules/cockroachdb

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 794c1a9f9d8..38825e9c56f 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'org.postgresql:postgresql:42.5.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 140e7544dcdc98b1eeeb841225d85bfe66027493 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:47:06 +0000
Subject: [PATCH 2687/4969] Bump io.kubernetes:client-java from 17.0.0 to
 17.0.1 in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 17.0.0 to 17.0.1.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v17.0.0...v17.0.1)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index a7f7ae425fe..b4dfd6903dd 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.4.1'
-    testImplementation 'io.kubernetes:client-java:17.0.0'
+    testImplementation 'io.kubernetes:client-java:17.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From d407d9814408001e2bb6080abf43f5db3674855e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:47:24 +0000
Subject: [PATCH 2688/4969] Bump mysql:mysql-connector-java from 8.0.31 to
 8.0.32 in /modules/spock

Bumps mysql:mysql-connector-java from 8.0.31 to 8.0.32.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 581f401f580..bb71179e53b 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'
 

From 8e72417c87eeef5890bdba8da4e5aacedb7ee72f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:47:51 +0000
Subject: [PATCH 2689/4969] Bump com.google.cloud:google-cloud-pubsub in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.122.2 to 1.123.1.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.122.2...v1.123.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 5c981b804e1..9af9ad06d4b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.3'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.9'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.18.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From e1a97634e1c79023528845249793ed8c7f385124 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:47:57 +0000
Subject: [PATCH 2690/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/apache/tinkerpop/releases)
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.6.1...3.6.2)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 3ca5182bed1..b3c318b09bf 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     api "com.orientechnologies:orientdb-client:3.2.15"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.15"
 }

From a9573d1f12b593487e4790367c8f93bd636aa8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 2 Feb 2023 15:54:40 -0500
Subject: [PATCH 2691/4969] Exclude org.mockito:mockito-core updates (#6568)

Mockito 5.x needs Java 11. Testcontainers will remain with 4.11.x.
---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fecaa6fc85a..042433c9fa0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,6 +14,8 @@ updates:
     ignore:
       - dependency-name: "org.slf4j:slf4j-api"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.mockito:mockito-core"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
@@ -98,6 +100,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.mockito:mockito-core"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc-test"
     schedule:
@@ -111,6 +116,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.mockito:mockito-core"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/k3s"
     schedule:

From deb87f1efb47f6504521214f750c55fb9b4c146f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 20:55:31 +0000
Subject: [PATCH 2692/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /examples

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle       | 2 +-
 docs/examples/junit4/redis/build.gradle         | 2 +-
 docs/examples/junit5/redis/build.gradle         | 2 +-
 examples/cucumber/build.gradle                  | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/neo4j-container/build.gradle           | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/selenium-container/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/solr-container/build.gradle            | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 test-support/build.gradle                       | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 25827a9fd9f..b1565603f13 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 
     testImplementation 'mysql:mysql-connector-java:8.0.31'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.7.2"
-    testImplementation 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 1a9466b7d19..eceae0d720b 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 0469613d510..4affde5df1b 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
 test {
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index e56bb1b9590..0b47630bbbe 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java:7.11.1'
     testImplementation 'io.cucumber:cucumber-junit:7.11.1'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 5e675ddb8c8..f48c72466b5 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.2.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index dcbcfd63635..fdd4db1ccc8 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     implementation 'io.codenotary:immudb4j:1.0.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 6cfdf96982b..42c34c84729 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 57ca7c3b3d9..f1dad5c8b21 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 8d67cff9333..55750a7ac87 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.7'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 8c7b991a9e4..1c6795648e3 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 7f4759d5913..3a1e162c82a 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testng:testng:7.5'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 1911e8a0a79..c8286015285 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index cd80e2503fa..84481e1fb0f 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 2a4949694dc..8a538a7d11f 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -9,6 +9,6 @@ repositories {
 dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index b3be6448007..ad7d51c883a 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,5 +15,5 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index dd0f7007689..8302d1d1239 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,6 +14,6 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 
 }
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index c0673265a88..ddbe2ebcfc2 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -9,6 +9,6 @@ repositories {
 dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.4.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 8247f97dbf4..9a1ed6ad774 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.36'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From ac2cc85804d50baad4719c2412bd6dbcc08d410b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 20:55:38 +0000
Subject: [PATCH 2693/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 0469613d510..3c5c4c17782 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.2.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.2"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From f3be2ef4c43905c552a402444b2eb7f8ab315314 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 20:55:39 +0000
Subject: [PATCH 2694/4969] Bump org.apache.httpcomponents:httpclient in
 /examples

Bumps org.apache.httpcomponents:httpclient from 4.5.13 to 4.5.14.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 8d67cff9333..0cdee965387 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.7'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From d7e4f6dff0133c43f735d0b9532524e612085cfc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 20:58:23 +0000
Subject: [PATCH 2695/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin) from 1.8.0 to 1.8.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 17df36fa6aa..8323156ee41 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.7.6"
     id("org.jetbrains.kotlin.jvm") version "1.8.0"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.8.0"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.8.10"
 }
 
 apply plugin: 'io.spring.dependency-management'

From 94176f1b8793f005ea3ba47831a5226836dcdfaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 22:15:04 +0000
Subject: [PATCH 2696/4969] Bump org.jetbrains.kotlin.jvm from 1.8.0 to 1.8.10
 in /examples

Bumps [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) from 1.8.0 to 1.8.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 8323156ee41..555f5e8503a 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.7.6"
-    id("org.jetbrains.kotlin.jvm") version "1.8.0"
+    id("org.jetbrains.kotlin.jvm") version "1.8.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.8.10"
 }
 

From 8c42cca476fd2c1df9f9f9388fc384312a5b83f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 22:15:13 +0000
Subject: [PATCH 2697/4969] Bump mysql:mysql-connector-java from 8.0.31 to
 8.0.32 in /examples

Bumps mysql:mysql-connector-java from 8.0.31 to 8.0.32.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index b1565603f13..88670552578 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation project(":selenium")
     testImplementation project(":mysql")
 
-    testImplementation 'mysql:mysql-connector-java:8.0.31'
+    testImplementation 'mysql:mysql-connector-java:8.0.32'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.7.2"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 4949043608e9b278bb57bbecfee0618d06d6ea24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 2 Feb 2023 18:17:34 -0500
Subject: [PATCH 2698/4969] Update spotless version to 6.13.0 (#6579)

---
 build.gradle          | 2 +-
 examples/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a4d65ea0574..07e1c95bce3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
-    id 'com.diffplug.spotless' version '6.12.0' apply false
+    id 'com.diffplug.spotless' version '6.13.0' apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
diff --git a/examples/build.gradle b/examples/build.gradle
index a020fdcd4b2..a83df2bedce 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.12.0' apply false
+    id 'com.diffplug.spotless' version '6.13.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"

From 11bb6f0b09de5fc1597e6ce12994c9bdb891c813 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 23:17:50 +0000
Subject: [PATCH 2699/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.7.2 to 4.8.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.8.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 88670552578..c4aa240c06a 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testImplementation 'mysql:mysql-connector-java:8.0.32'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.7.2"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.8.0"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7322758d55782b34fe13b449234d601d7d8a1d15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 23:19:49 +0000
Subject: [PATCH 2700/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.8 to 7.17.9.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.8...v7.17.9)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 0525f2fa115..df9fcacce21 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.6.1"
-    testImplementation "org.elasticsearch.client:transport:7.17.8"
+    testImplementation "org.elasticsearch.client:transport:7.17.9"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 343c5a533f4c6148d6e6eea3a3374116365bc91d Mon Sep 17 00:00:00 2001
From: vcvitaly <vcvitaly@yahoo.com>
Date: Fri, 3 Feb 2023 18:10:31 +0200
Subject: [PATCH 2701/4969] [CockroachDB] Support setting
 username/password/database (#6448)

---
 .../containers/CockroachContainer.java        | 37 ++++++++++----
 .../testcontainers/CockroachDBTestImages.java |  9 +++-
 .../cockroachdb/SimpleCockroachDBTest.java    | 51 +++++++++++++++++--
 3 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index dfec3988f15..8d17e8f4107 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -29,12 +30,16 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
 
     private static final int DB_PORT = 26257;
 
+    private static final String FIRST_VERSION_WITH_ENV_VARS_SUPPORT = "22.1.0";
+
     private String databaseName = "postgres";
 
     private String username = "root";
 
     private String password = "";
 
+    private boolean isVersionGreaterThanOrEqualTo221;
+
     /**
      * @deprecated use {@link CockroachContainer(DockerImageName)} instead
      */
@@ -50,6 +55,7 @@ public CockroachContainer(final String dockerImageName) {
     public CockroachContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        isVersionGreaterThanOrEqualTo221 = isVersionGreaterThanOrEqualTo221(dockerImageName);
 
         withExposedPorts(REST_API_PORT, DB_PORT);
         waitingFor(
@@ -104,22 +110,35 @@ public String getTestQueryString() {
 
     @Override
     public CockroachContainer withUsername(String username) {
-        throw new UnsupportedOperationException(
-            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
-        );
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("username");
+        this.username = username;
+        return withEnv("COCKROACH_USER", username);
     }
 
     @Override
     public CockroachContainer withPassword(String password) {
-        throw new UnsupportedOperationException(
-            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
-        );
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("password");
+        this.password = password;
+        return withEnv("COCKROACH_PASSWORD", password).withCommand("start-single-node");
     }
 
     @Override
     public CockroachContainer withDatabaseName(final String databaseName) {
-        throw new UnsupportedOperationException(
-            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
-        );
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("databaseName");
+        this.databaseName = databaseName;
+        return withEnv("COCKROACH_DATABASE", databaseName);
+    }
+
+    private boolean isVersionGreaterThanOrEqualTo221(DockerImageName dockerImageName) {
+        ComparableVersion version = new ComparableVersion(dockerImageName.getVersionPart().replaceFirst("v", ""));
+        return version.isGreaterThanOrEqualTo(FIRST_VERSION_WITH_ENV_VARS_SUPPORT);
+    }
+
+    private void validateIfVersionSupportsUsernameOrPasswordOrDatabase(String parameter) {
+        if (!isVersionGreaterThanOrEqualTo221) {
+            throw new UnsupportedOperationException(
+                String.format("Setting a %s in not supported in the versions below 22.1.0", parameter)
+            );
+        }
     }
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
index ac02b2f5d81..6e18781f2c4 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
@@ -3,5 +3,12 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface CockroachDBTestImages {
-    DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v19.2.11");
+    DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v22.2.3");
+    DockerImageName FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT = DockerImageName.parse(
+        "cockroachdb/cockroach:v22.1.0"
+    );
+
+    DockerImageName COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED = DockerImageName.parse(
+        "cockroachdb/cockroach:v21.2.17"
+    );
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 65c79441f32..fe9ef5fb81c 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -11,6 +11,7 @@
 import java.util.logging.LogManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
     static {
@@ -54,12 +55,54 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         try {
             cockroach.start();
             String jdbcUrl = cockroach.getJdbcUrl();
-            assertThat(jdbcUrl).contains("?");
-            assertThat(jdbcUrl).contains("&");
-            assertThat(jdbcUrl).contains("sslmode=disable");
-            assertThat(jdbcUrl).contains("application_name=cockroach");
+            assertThat(jdbcUrl)
+                .contains("?")
+                .contains("&")
+                .contains("sslmode=disable")
+                .contains("application_name=cockroach");
         } finally {
             cockroach.stop();
         }
     }
+
+    @Test
+    public void testWithUsernamePasswordDatabase() throws SQLException {
+        try (
+            CockroachContainer cockroach = new CockroachContainer(
+                CockroachDBTestImages.FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT
+            )
+                .withUsername("test_user")
+                .withPassword("test_password")
+                .withDatabaseName("test_database")
+        ) {
+            cockroach.start();
+
+            ResultSet resultSet = performQuery(cockroach, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+
+            String jdbcUrl = cockroach.getJdbcUrl();
+            assertThat(jdbcUrl).contains("/" + "test_database");
+        }
+    }
+
+    @Test
+    public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
+        CockroachContainer cockroachContainer = new CockroachContainer(
+            CockroachDBTestImages.COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED
+        );
+
+        assertThatThrownBy(() -> cockroachContainer.withUsername("test_user"))
+            .isInstanceOf(UnsupportedOperationException.class)
+            .withFailMessage("Setting a username in not supported in the versions below 22.1.0");
+
+        assertThatThrownBy(() -> cockroachContainer.withPassword("test_password"))
+            .isInstanceOf(UnsupportedOperationException.class)
+            .withFailMessage("Setting a password in not supported in the versions below 22.1.0");
+
+        assertThatThrownBy(() -> cockroachContainer.withDatabaseName("test_database"))
+            .isInstanceOf(UnsupportedOperationException.class)
+            .withFailMessage("Setting a databaseName in not supported in the versions below 22.1.0");
+    }
 }

From 8758ca70c884fcc11745d10f9eb95b14473abb93 Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Sat, 11 Feb 2023 06:20:51 +0100
Subject: [PATCH 2702/4969] [localstack] Make env var SERVICES optional (#6430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>

Fixes #6428
---
 .../localstack/LocalStackContainer.java       | 42 +++++++++++++++++--
 .../localstack/LocalstackContainerTest.java   | 23 ++++++++++
 .../localstack/LocalstackTestImages.java      |  1 +
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 146cb3200f1..52992011fbf 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -61,6 +61,15 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
      */
     private final boolean legacyMode;
 
+    /**
+     * Starting with version 0.13.0, setting services list on Localstack is not required. When <code>false</code>,
+     * containers are started lazily. When <code>true</code>, container fails to start if services list is not provided.
+     *
+     * Testcontainers will use the tag of the docker image to infer whether or not the used version
+     * of Localstack required services list.
+     */
+    private final boolean servicesEnvVarRequired;
+
     /**
      * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
      */
@@ -93,11 +102,27 @@ public LocalStackContainer(final DockerImageName dockerImageName, boolean useLeg
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         this.legacyMode = useLegacyMode;
+        this.servicesEnvVarRequired = isServicesEnvVarRequired(dockerImageName.getVersionPart());
 
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
     }
 
+    private static boolean isServicesEnvVarRequired(String version) {
+        if (version.equals("latest")) {
+            return false;
+        }
+
+        ComparableVersion comparableVersion = new ComparableVersion(version);
+        if (comparableVersion.isSemanticVersion()) {
+            return comparableVersion.isLessThan("0.13");
+        }
+
+        log.warn("Version {} is not a semantic version, services list is required.", version);
+
+        return true;
+    }
+
     private static boolean shouldRunInLegacyMode(String version) {
         if (version.equals("latest")) {
             return false;
@@ -120,9 +145,16 @@ private static boolean shouldRunInLegacyMode(String version) {
     protected void configure() {
         super.configure();
 
-        Preconditions.check("services list must not be empty", !services.isEmpty());
+        if (servicesEnvVarRequired) {
+            Preconditions.check("services list must not be empty", !services.isEmpty());
+        }
 
-        withEnv("SERVICES", services.stream().map(EnabledService::getName).collect(Collectors.joining(",")));
+        if (!services.isEmpty()) {
+            withEnv("SERVICES", services.stream().map(EnabledService::getName).collect(Collectors.joining(",")));
+            if (this.servicesEnvVarRequired) {
+                withEnv("EAGER_SERVICE_LOADING", "1");
+            }
+        }
 
         String hostnameExternalReason;
         if (getEnvMap().containsKey(HOSTNAME_EXTERNAL_ENV_VAR)) {
@@ -147,7 +179,11 @@ protected void configure() {
     }
 
     private void exposePorts() {
-        services.stream().map(this::getServicePort).distinct().forEach(this::addExposedPort);
+        if (legacyMode) {
+            services.stream().map(this::getServicePort).distinct().forEach(this::addExposedPort);
+        } else {
+            this.addExposedPort(PORT);
+        }
     }
 
     public LocalStackContainer withServices(Service... services) {
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index d44e98723b7..b99c455ae19 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -347,4 +347,27 @@ public void s3EndpointHasProperRegion() {
                 .isEqualTo(region);
         }
     }
+
+    public static class WithoutServices {
+
+        @ClassRule
+        public static LocalStackContainer localstack = new LocalStackContainer(
+            LocalstackTestImages.LOCALSTACK_0_13_IMAGE
+        );
+
+        @Test
+        public void s3ServiceStartLazily() {
+            S3Client s3 = S3Client
+                .builder()
+                .endpointOverride(localstack.getEndpointOverride(Service.S3))
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
+                .region(Region.of(localstack.getRegion()))
+                .build();
+            assertThat(s3.listBuckets().buckets()).as("S3 Service is started lazily").isEmpty();
+        }
+    }
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index fe39b56521a..f6a5cbf50e4 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -8,5 +8,6 @@ public interface LocalstackTestImages {
     DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
     DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");
     DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");
+    DockerImageName LOCALSTACK_0_13_IMAGE = LOCALSTACK_IMAGE.withTag("0.13.0");
     DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("amazon/aws-cli:2.7.27");
 }

From 2771ebb78bec27f0d002314d13add5647a8595b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 10 Feb 2023 23:26:27 -0600
Subject: [PATCH 2703/4969] [dependabot] Ignore com.diffplug.spotless

6.14 requires Java 11
---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 042433c9fa0..4c644519cab 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -291,6 +291,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.springframework.boot:*"
         versions: [ "[3,)" ]
+      - dependency-name: "com.diffplug.spotless"
+        update-types: [ "version-update:semver-minor" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From aebab8579bd720415512d31ed946e7b26a6991ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:38 +0000
Subject: [PATCH 2704/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.3.2 to 3.4.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 10e86840a56..9728203a87c 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
+    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 68577279bad4d6d2c5c41a8043b027acc201560c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:41 +0000
Subject: [PATCH 2705/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.3.2 to 3.4.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 4b156d0b300..52fe94d2ab1 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
+    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.0'
 }

From afe9a1d61473f9a13013c6efc39ff35f4cacf0df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:42 +0000
Subject: [PATCH 2706/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.4.2...java-client-3.4.3)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 286f6d3add6..31be992141d 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.2'
+    testImplementation 'com.couchbase.client:java-client:3.4.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From b39de7f0e1b28741ea9eac171b69b4d3035a9133 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:43 +0000
Subject: [PATCH 2707/4969] Bump org.mongodb:mongo-java-driver from 3.12.11 to
 3.12.12 in /core

Bumps [org.mongodb:mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.11 to 3.12.12.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.11...r3.12.12)

---
updated-dependencies:
- dependency-name: org.mongodb:mongo-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0733424f0b6..0ee4f3b4bac 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -95,7 +95,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
-    testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
+    testImplementation 'org.mongodb:mongo-java-driver:3.12.12'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 21041374f7d4cb6cf51a615cce3bdc93c05c0f7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:43 +0000
Subject: [PATCH 2708/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.2 to 42.5.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.5.3/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.2...REL42.5.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 45905337581..afe3a278ad8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
 }

From ad3df7d8d6ecd5d5438a3e077605e7f9bb173ac7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:43 +0000
Subject: [PATCH 2709/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.8.2 to 4.9.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.8.2...r4.9.0)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 284991af252..db56db32977 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.8.2")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.9.0")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From c3807d68b909ad40eb5dc74b38c93b3e51a8a94e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:43 +0000
Subject: [PATCH 2710/4969] Bump org.postgresql:postgresql from 42.5.1 to
 42.5.3 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.1 to 42.5.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.5.3/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.1...REL42.5.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index a59d0cd842f..28b39b7a62c 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testImplementation 'org.postgresql:postgresql:42.5.1'
+    testImplementation 'org.postgresql:postgresql:42.5.3'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.questdb:questdb:6.7-jdk8'

From 93bad8329496c3a4a226b2587a9d49443faedc6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:43 +0000
Subject: [PATCH 2711/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.2 to 42.5.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.5.3/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.2...REL42.5.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 38825e9c56f..d1c66cf0fee 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.2'
+    testImplementation 'org.postgresql:postgresql:42.5.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7a78b8e5601ec2e0d5c971fa63beed5047cbf768 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:44 +0000
Subject: [PATCH 2712/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.15...3.2.16)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index b3c318b09bf..0df9ac426ff 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.15"
+    api "com.orientechnologies:orientdb-client:3.2.16"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'

From f09a831257f2d3d765966258df63ab63336ac455 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:45 +0000
Subject: [PATCH 2713/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.398 to 1.12.405.
- [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.12.398...1.12.405)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ca194c2aaee..9052b4426fa 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.398'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.376'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.405'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.405'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 60fe2bb918f6f783898185d7f98231a0bacf61bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:45 +0000
Subject: [PATCH 2714/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.2 to 42.5.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.5.3/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.2...REL42.5.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a39291507cd..1285135c5ab 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.5.2'
+    testImplementation 'org.postgresql:postgresql:42.5.3'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 3f430de8165351c742f9954a6f17837e5ee67573 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:46 +0000
Subject: [PATCH 2715/4969] Bump org.postgresql:postgresql from 42.5.2 to
 42.5.3 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.2 to 42.5.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.5.3/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.2...REL42.5.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 bb71179e53b..fc962208114 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'

From e7580f5338eea2a6ab8e9a26776569f21d822d3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:46 +0000
Subject: [PATCH 2716/4969] Bump org.questdb:questdb from 6.7-jdk8 to
 7.0.0-jdk8 in /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 6.7-jdk8 to 7.0.0-jdk8.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/commits)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index a59d0cd842f..03f9650ed84 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.1'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:6.7-jdk8'
+    testImplementation 'org.questdb:questdb:7.0.0-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 683547407f636c5a6395bef043b5f960a2bf2e3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:46 +0000
Subject: [PATCH 2717/4969] Bump net.lingala.zip4j:zip4j from 2.11.3 to 2.11.4
 in /modules/hivemq

Bumps [net.lingala.zip4j:zip4j](https://github.com/srikanth-lingala/zip4j) from 2.11.3 to 2.11.4.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases)
- [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.11.3...v2.11.4)

---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b3e98f6a93e..586984f1915 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
-    shaded("net.lingala.zip4j:zip4j:2.11.3")
+    shaded("net.lingala.zip4j:zip4j:2.11.4")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
     testImplementation(project(":junit-jupiter"))

From 1c1bc3cfa094f66328a9ac395691f64b0d8d681c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:47 +0000
Subject: [PATCH 2718/4969] Bump com.google.cloud:google-cloud-datastore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.13.3 to 2.13.4.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.13.3...v2.13.4)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9af9ad06d4b..b2c6d10cf42 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.3'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.9'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'

From a45f7c02163cfb8aeae14eae614fd4f3d7427863 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:48 +0000
Subject: [PATCH 2719/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/orientechnologies/orientdb-gremlin/releases)
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.15...3.2.16)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index b3c318b09bf..cf952a35d78 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.15"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.16"
 }

From d45dbe58e77cf0d9047a3a8c419e889e79032efd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:51 +0000
Subject: [PATCH 2720/4969] Bump io.nats:jnats from 2.16.7 to 2.16.8 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.16.7 to 2.16.8.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.16.7...2.16.8)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 1fa0336f196..263aebf59ca 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.7'
+    testImplementation 'io.nats:jnats:2.16.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From d6f03c4a8b676a67126dbe80368b12b726ddbb6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:51 +0000
Subject: [PATCH 2721/4969] Bump com.google.cloud:google-cloud-pubsub in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.123.1 to 1.123.2.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.123.1...v1.123.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9af9ad06d4b..d74e0185398 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.3'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.9'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.1'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.18.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From b210b04d6229239fac20f8a386498a3955ef4e6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:55 +0000
Subject: [PATCH 2722/4969] Bump org.postgresql:postgresql from 42.5.2 to
 42.5.3 in /examples

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.2 to 42.5.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.5.3/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.2...REL42.5.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f1dad5c8b21..4ac00f9a6ef 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
-    testImplementation 'org.postgresql:postgresql:42.5.2'
+    testImplementation 'org.postgresql:postgresql:42.5.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 5538639ed35e749b4387ce4881255456314910f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:28:59 +0000
Subject: [PATCH 2723/4969] Bump com.google.cloud:google-cloud-bigtable in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.18.3 to 2.19.0.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.18.3...v2.19.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9af9ad06d4b..73c775041ea 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.9'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.18.3'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 3079e3a968b8539ae4fd40a483b5292ff7c24062 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:29:00 +0000
Subject: [PATCH 2724/4969] Bump org.projectlombok:lombok from 1.18.24 to
 1.18.26 in /examples

Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.24 to 1.18.26.
- [Release notes](https://github.com/projectlombok/lombok/releases)
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.24...v1.18.26)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle  | 4 ++--
 examples/solr-container/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 42c34c84729..797f8bc6d80 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.24"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
+    testCompileOnly "org.projectlombok:lombok:1.18.26"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.26"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 8302d1d1239..e4144a5b545 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.24"
-    annotationProcessor "org.projectlombok:lombok:1.18.24"
+    compileOnly "org.projectlombok:lombok:1.18.26"
+    annotationProcessor "org.projectlombok:lombok:1.18.26"
 
     implementation 'org.apache.solr:solr-solrj:8.11.2'
 

From 60a8f9da1b40131d602f2fbe2413935ae0440a6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:29:03 +0000
Subject: [PATCH 2725/4969] Bump org.apache.kafka:kafka-clients from 3.3.2 to
 3.4.0 in /examples

Bumps org.apache.kafka:kafka-clients from 3.3.2 to 3.4.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 42c34c84729..971a8f1a0a7 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
+    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'

From ed62e499a3eb7fd9dd4624c5c1f260a55aae014c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 05:29:07 +0000
Subject: [PATCH 2726/4969] Bump com.amazonaws:aws-java-sdk-logs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.398 to 1.12.405.
- [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.12.398...1.12.405)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 bae3c32b54e..43eb8779ffd 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.398'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.398'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.405'
     testImplementation 'software.amazon.awssdk:s3:2.19.29'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From f25575b3589e02a958682cf7b0b1fadd9a71cffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 10 Feb 2023 23:29:31 -0600
Subject: [PATCH 2727/4969] [dependabot] Fix ignore org.springframework.boot

spring boot 3.x requires Java 17
---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4c644519cab..b42ae1a7e05 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -289,8 +289,8 @@ updates:
         update-types: [ "version-update:semver-minor" ]
       - dependency-name: "org.slf4j:slf4j-api"
         update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.springframework.boot:*"
-        versions: [ "[3,)" ]
+      - dependency-name: "org.springframework.boot"
+        versions: [ "version-update:semver-major" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-minor" ]
 

From ab7c19deb6512c38eacbfbec67e5cc556aa1f1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sat, 11 Feb 2023 00:26:24 -0600
Subject: [PATCH 2728/4969] Fix dependabot.yml

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b42ae1a7e05..c815677cbae 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -290,7 +290,7 @@ updates:
       - dependency-name: "org.slf4j:slf4j-api"
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.springframework.boot"
-        versions: [ "version-update:semver-major" ]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-minor" ]
 

From e72341e57f1d0140de8f3ab64b3c6b847ff7861e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 06:27:46 +0000
Subject: [PATCH 2729/4969] Bump org.springframework.boot from 2.7.6 to 2.7.8
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.6 to 2.7.8.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.6...v2.7.8)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 84481e1fb0f..bf9ed349fcd 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.7.6'
+    id 'org.springframework.boot' version '2.7.8'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 555f5e8503a..708bb28e86b 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.6"
+    id("org.springframework.boot") version "2.7.8"
     id("org.jetbrains.kotlin.jvm") version "1.8.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.8.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index e899b8084eb..59c35cb3213 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.7.6'
+    id 'org.springframework.boot' version '2.7.8'
 }
 apply plugin: 'io.spring.dependency-management'
 

From cb7f31eaceaad7173bda27d04d25b4640c82551f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 15:43:35 +0000
Subject: [PATCH 2730/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.11.0 to 4.12.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.11.0...4.12.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 586984f1915..0844feba2bb 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.11.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.12.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")

From ba8d4144b283e34ab7903e81bbe343cceb3a8c24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 15:43:51 +0000
Subject: [PATCH 2731/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.19.29 to 2.20.2.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 43eb8779ffd..33de2c98ca9 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.405'
-    testImplementation 'software.amazon.awssdk:s3:2.19.29'
+    testImplementation 'software.amazon.awssdk:s3:2.20.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From bf4145a2ede19a2e9ec97295238fad129c4dae39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 15:43:55 +0000
Subject: [PATCH 2732/4969] Bump com.google.cloud:google-cloud-firestore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.7.9 to 3.7.10.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.7.9...v3.7.10)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 1651f50fe72..3cb6dda8978 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.4'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.9'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.0'

From f72676703085b2fd650064ac06ff9d88b6f3cfae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 15:43:58 +0000
Subject: [PATCH 2733/4969] Bump com.amazonaws:aws-java-sdk-sqs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.398 to 1.12.405.
- [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.12.398...1.12.405)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 43eb8779ffd..891bdc236ff 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.398'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.405'
     testImplementation 'software.amazon.awssdk:s3:2.19.29'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From ed12a38c58fca3ee708fdd2b48ce8f9193bc245b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 16:36:30 +0000
Subject: [PATCH 2734/4969] Bump com.google.cloud:google-cloud-spanner in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.35.2 to 6.36.0.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.35.2...v6.36.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 3cb6dda8978..d7273cb1f9b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.2'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.36.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 1a0b73cadb11785962445ce2ac78f6e98d6c3a15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 16:36:57 +0000
Subject: [PATCH 2735/4969] Bump com.amazonaws:aws-java-sdk-s3 in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.398 to 1.12.405.
- [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.12.398...1.12.405)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/localstack/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index d20d4babc8b..8f3f1de80a7 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.398'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.405'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.405'
     testImplementation 'software.amazon.awssdk:s3:2.20.2'

From 792348963ab90649f52e2fa7ec65e83e3cf23cb2 Mon Sep 17 00:00:00 2001
From: InfoShare Devs <tomito14@interia.pl>
Date: Tue, 14 Feb 2023 17:25:02 +0100
Subject: [PATCH 2736/4969] Add support for Solace PubSub+ (#6583)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   2 +
 .github/settings.yml                          |   3 +
 docs/modules/solace.md                        |  39 +++
 mkdocs.yml                                    |   1 +
 modules/solace/build.gradle                   |  15 +
 .../org/testcontainers/solace/Service.java    |  52 ++++
 .../solace/SolaceContainer.java               | 292 ++++++++++++++++++
 .../solace/SolaceContainerAMQPTest.java       |  96 ++++++
 .../solace/SolaceContainerMQTTTest.java       |  95 ++++++
 .../solace/SolaceContainerRESTTest.java       |  59 ++++
 .../solace/SolaceContainerSMFTest.java        | 166 ++++++++++
 modules/solace/src/test/resources/client.pfx  | Bin 0 -> 3550 bytes
 .../src/test/resources/logback-test.xml       |  16 +
 modules/solace/src/test/resources/rootCA.crt  |  22 ++
 modules/solace/src/test/resources/solace.pem  |  49 +++
 modules/solace/src/test/resources/truststore  | Bin 0 -> 987 bytes
 20 files changed, 915 insertions(+)
 create mode 100644 docs/modules/solace.md
 create mode 100644 modules/solace/build.gradle
 create mode 100644 modules/solace/src/main/java/org/testcontainers/solace/Service.java
 create mode 100644 modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
 create mode 100644 modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
 create mode 100644 modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
 create mode 100644 modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
 create mode 100644 modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
 create mode 100644 modules/solace/src/test/resources/client.pfx
 create mode 100644 modules/solace/src/test/resources/logback-test.xml
 create mode 100644 modules/solace/src/test/resources/rootCA.crt
 create mode 100644 modules/solace/src/test/resources/solace.pem
 create mode 100644 modules/solace/src/test/resources/truststore

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 406483c2d45..ab1de00f6f8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -45,6 +45,7 @@ body:
         - RabbitMQ
         - Redpanda
         - Selenium
+        - Solace
         - Solr
         - TiDB
         - ToxiProxy
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 2f543615dee..b80fa9387da 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -45,6 +45,7 @@ body:
         - RabbitMQ
         - Redpanda
         - Selenium
+        - Solace
         - Solr
         - TiDB
         - ToxiProxy
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 85c44eba697..024d0414d2f 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -45,6 +45,7 @@ body:
         - RabbitMQ
         - Redpanda
         - Selenium
+        - Solace
         - Solr
         - TiDB
         - ToxiProxy
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c815677cbae..ecfb16dcd80 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -233,6 +233,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/solace"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/solr"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 2aff606e27b..0fe24f33658 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -75,6 +75,8 @@
   - modules/redpanda/**/*
 "modules/selenium":
   - modules/selenium/**/*
+"modules/solace":
+  - modules/solace/**/*
 "modules/solr":
   - modules/solr/**/*
 "modules/spock":
diff --git a/.github/settings.yml b/.github/settings.yml
index 81dbefa4f03..7844182893b 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -205,6 +205,9 @@ labels:
   - name: modules/selenium
     color: '#006b75'
 
+  - name: modules/solace
+    color: '#006b75'
+
   - name: modules/solr
     color: '#006b75'
 
diff --git a/docs/modules/solace.md b/docs/modules/solace.md
new file mode 100644
index 00000000000..93fc0e9875f
--- /dev/null
+++ b/docs/modules/solace.md
@@ -0,0 +1,39 @@
+# Solace Container
+
+This module helps running [Solace PubSub+](https://solace.com/products/event-broker/software/) using Testcontainers.
+
+Note that it's based on the [official Docker image](https://hub.docker.com/r/solace/solace-pubsub-standard).
+
+## Usage example
+
+You can start a solace container instance from any Java application by using:
+
+<!--codeinclude-->
+[Solace container setup with simple authentication](../../modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java) inside_block:solaceContainerSetup
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Solace container setup with SSL](../../modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java) inside_block:solaceContainerUsageSSL
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Using a Solace container](../../modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java) inside_block:solaceContainerUsage
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:solace:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>solace</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 1edf8c6de98..441607691ac 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,6 +82,7 @@ nav:
           - modules/pulsar.md
           - modules/rabbitmq.md
           - modules/redpanda.md
+          - modules/solace.md
           - modules/solr.md
           - modules/toxiproxy.md
           - modules/vault.md
diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
new file mode 100644
index 00000000000..677ad462656
--- /dev/null
+++ b/modules/solace/build.gradle
@@ -0,0 +1,15 @@
+description = "Testcontainers :: Solace"
+
+dependencies {
+    api project(':testcontainers')
+
+    shaded 'org.awaitility:awaitility:4.2.0'
+
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.17.0'
+    testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
+    testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
+    testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'
+
+}
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/Service.java b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
new file mode 100644
index 00000000000..de9366a0e31
--- /dev/null
+++ b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
@@ -0,0 +1,52 @@
+package org.testcontainers.solace;
+
+/**
+ * Services that are supported by Testcontainers implementation
+ */
+public enum Service {
+    AMQP("amqp", 5672, "amqp", false),
+    MQTT("mqtt", 1883, "tcp", false),
+    REST("rest", 9000, "http", false),
+    SMF("smf", 55555, "tcp", true),
+    SMF_SSL("smf", 55443, "tcps", true);
+
+    private final String name;
+    private final Integer port;
+    private final String protocol;
+    private final boolean supportSSL;
+
+    Service(String name, Integer port, String protocol, boolean supportSSL) {
+        this.name = name;
+        this.port = port;
+        this.protocol = protocol;
+        this.supportSSL = supportSSL;
+    }
+
+    /**
+     * @return Port assigned for the service
+     */
+    public Integer getPort() {
+        return this.port;
+    }
+
+    /**
+     * @return Protocol of the service
+     */
+    public String getProtocol() {
+        return this.protocol;
+    }
+
+    /**
+     * @return Name of the service
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * @return Is SSL for this service supported ?
+     */
+    public boolean isSupportSSL() {
+        return this.supportSSL;
+    }
+}
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
new file mode 100644
index 00000000000..3418dfe6fbf
--- /dev/null
+++ b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
@@ -0,0 +1,292 @@
+package org.testcontainers.solace;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Ulimit;
+import org.apache.commons.lang3.tuple.Pair;
+import org.awaitility.Awaitility;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Testcontainers implementation of Solace PubSub+
+ */
+public class SolaceContainer extends GenericContainer<SolaceContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("solace/solace-pubsub-standard");
+
+    private static final String DEFAULT_VPN = "default";
+
+    private static final String DEFAULT_USERNAME = "default";
+
+    private static final String SOLACE_READY_MESSAGE = ".*Running pre-startup checks:.*";
+
+    private static final String SOLACE_ACTIVE_MESSAGE = "Primary Virtual Router is now active";
+
+    private static final String TMP_SCRIPT_LOCATION = "/tmp/script.cli";
+
+    private static final Long SHM_SIZE = (long) Math.pow(1024, 3);
+
+    private String username = "root";
+
+    private String password = "password";
+
+    private String vpn = DEFAULT_VPN;
+
+    private final List<Pair<String, Service>> topicsConfiguration = new ArrayList<>();
+
+    private boolean withClientCert;
+
+    /**
+     * Create a new solace container with the specified image name.
+     *
+     * @param dockerImageName the image name that should be used.
+     */
+    public SolaceContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public SolaceContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.getHostConfig().withShmSize(SHM_SIZE).withUlimits(new Ulimit[] { new Ulimit("nofile", 2448L, 6592L) });
+        });
+        this.waitStrategy = Wait.forLogMessage(SOLACE_READY_MESSAGE, 1).withStartupTimeout(Duration.ofSeconds(60));
+    }
+
+    @Override
+    protected void configure() {
+        withCopyToContainer(createConfigurationScript(), TMP_SCRIPT_LOCATION);
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        if (withClientCert) {
+            executeCommand("cp", "/tmp/solace.pem", "/usr/sw/jail/certs/solace.pem");
+            executeCommand("cp", "/tmp/rootCA.crt", "/usr/sw/jail/certs/rootCA.crt");
+        }
+        executeCommand("cp", TMP_SCRIPT_LOCATION, "/usr/sw/jail/cliscripts/script.cli");
+        waitOnCommandResult(SOLACE_ACTIVE_MESSAGE, "grep", "-R", SOLACE_ACTIVE_MESSAGE, "/usr/sw/jail/logs/system.log");
+        executeCommand("/usr/sw/loads/currentload/bin/cli", "-A", "-es", "script.cli");
+    }
+
+    private Transferable createConfigurationScript() {
+        StringBuilder scriptBuilder = new StringBuilder();
+        updateConfigScript(scriptBuilder, "enable");
+        updateConfigScript(scriptBuilder, "configure");
+
+        // Create VPN if not default
+        if (!vpn.equals(DEFAULT_VPN)) {
+            updateConfigScript(scriptBuilder, "create message-vpn " + vpn);
+            updateConfigScript(scriptBuilder, "no shutdown");
+            updateConfigScript(scriptBuilder, "exit");
+        }
+
+        // Configure username and password
+        if (username.equals(DEFAULT_USERNAME)) {
+            throw new RuntimeException("Cannot override password for default client");
+        }
+        updateConfigScript(scriptBuilder, "create client-username " + username + " message-vpn " + vpn);
+        updateConfigScript(scriptBuilder, "password " + password);
+        updateConfigScript(scriptBuilder, "no shutdown");
+        updateConfigScript(scriptBuilder, "exit");
+
+        if (withClientCert) {
+            // Client certificate authority configuration
+            updateConfigScript(scriptBuilder, "authentication");
+            updateConfigScript(scriptBuilder, "create client-certificate-authority RootCA");
+            updateConfigScript(scriptBuilder, "certificate file rootCA.crt");
+            updateConfigScript(scriptBuilder, "show client-certificate-authority ca-name *");
+            updateConfigScript(scriptBuilder, "end");
+
+            // Server certificates configuration
+            updateConfigScript(scriptBuilder, "configure");
+            updateConfigScript(scriptBuilder, "ssl");
+            updateConfigScript(scriptBuilder, "server-certificate solace.pem");
+            updateConfigScript(scriptBuilder, "cipher-suite msg-backbone name AES128-SHA");
+            updateConfigScript(scriptBuilder, "exit");
+
+            updateConfigScript(scriptBuilder, "message-vpn " + vpn);
+            // Enable client certificate authentication
+            updateConfigScript(scriptBuilder, "authentication client-certificate");
+            updateConfigScript(scriptBuilder, "allow-api-provided-username");
+            updateConfigScript(scriptBuilder, "no shutdown");
+            updateConfigScript(scriptBuilder, "end");
+        } else {
+            // Configure VPN Basic authentication
+            updateConfigScript(scriptBuilder, "message-vpn " + vpn);
+            updateConfigScript(scriptBuilder, "authentication basic auth-type internal");
+            updateConfigScript(scriptBuilder, "no shutdown");
+            updateConfigScript(scriptBuilder, "end");
+        }
+
+        if (!topicsConfiguration.isEmpty()) {
+            // Enable services
+            updateConfigScript(scriptBuilder, "configure");
+            // Configure default ACL
+            updateConfigScript(scriptBuilder, "acl-profile default message-vpn " + vpn);
+            // Configure default action to disallow
+            updateConfigScript(scriptBuilder, "subscribe-topic default-action disallow");
+            updateConfigScript(scriptBuilder, "publish-topic default-action disallow");
+            updateConfigScript(scriptBuilder, "exit");
+
+            updateConfigScript(scriptBuilder, "message-vpn " + vpn);
+            updateConfigScript(scriptBuilder, "service");
+            for (Pair<String, Service> topicConfig : topicsConfiguration) {
+                Service service = topicConfig.getValue();
+                String topicName = topicConfig.getKey();
+                updateConfigScript(scriptBuilder, service.getName());
+                if (service.isSupportSSL()) {
+                    if (withClientCert) {
+                        updateConfigScript(scriptBuilder, "ssl");
+                    } else {
+                        updateConfigScript(scriptBuilder, "plain-text");
+                    }
+                }
+                updateConfigScript(scriptBuilder, "no shutdown");
+                updateConfigScript(scriptBuilder, "end");
+                // Add publish/subscribe topic exceptions
+                updateConfigScript(scriptBuilder, "configure");
+                updateConfigScript(scriptBuilder, "acl-profile default message-vpn " + vpn);
+                updateConfigScript(
+                    scriptBuilder,
+                    String.format("publish-topic exceptions %s list %s", service.getName(), topicName)
+                );
+                updateConfigScript(
+                    scriptBuilder,
+                    String.format("subscribe-topic exceptions %s list %s", service.getName(), topicName)
+                );
+                updateConfigScript(scriptBuilder, "end");
+            }
+        }
+        return Transferable.of(scriptBuilder.toString());
+    }
+
+    private void executeCommand(String... command) {
+        try {
+            ExecResult execResult = execInContainer(command);
+            if (execResult.getExitCode() != 0) {
+                logCommandError(execResult.getStderr(), command);
+            }
+        } catch (IOException | InterruptedException e) {
+            logCommandError(e.getMessage(), command);
+        }
+    }
+
+    private void updateConfigScript(StringBuilder scriptBuilder, String command) {
+        scriptBuilder.append(command).append("\n");
+    }
+
+    private void waitOnCommandResult(String waitingFor, String... command) {
+        Awaitility
+            .await()
+            .pollInterval(Duration.ofMillis(500))
+            .timeout(Duration.ofSeconds(30))
+            .until(() -> {
+                try {
+                    return execInContainer(command).getStdout().contains(waitingFor);
+                } catch (IOException | InterruptedException e) {
+                    logCommandError(e.getMessage(), command);
+                    return true;
+                }
+            });
+    }
+
+    private void logCommandError(String error, String... command) {
+        logger().error("Could not execute command {}: {}", command, error);
+    }
+
+    /**
+     * Sets the client credentials
+     *
+     * @param username Client username
+     * @param password Client password
+     * @return This container.
+     */
+    public SolaceContainer withCredentials(final String username, final String password) {
+        this.username = username;
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Adds the topic configuration
+     *
+     * @param topic Name of the topic
+     * @param service Service to be supported on provided topic
+     * @return This container.
+     */
+    public SolaceContainer withTopic(String topic, Service service) {
+        topicsConfiguration.add(Pair.of(topic, service));
+        addExposedPort(service.getPort());
+        return this;
+    }
+
+    /**
+     * Sets the VPN name
+     *
+     * @param vpn VPN name
+     * @return This container.
+     */
+    public SolaceContainer withVpn(String vpn) {
+        this.vpn = vpn;
+        return this;
+    }
+
+    /**
+     * Sets the solace server ceritificates
+     *
+     * @param certFile Server certificate
+     * @param caFile Certified Authority ceritificate
+     * @return This container.
+     */
+    public SolaceContainer withClientCert(final MountableFile certFile, final MountableFile caFile) {
+        this.withClientCert = true;
+        return withCopyFileToContainer(certFile, "/tmp/solace.pem").withCopyFileToContainer(caFile, "/tmp/rootCA.crt");
+    }
+
+    /**
+     * Configured VPN
+     *
+     * @return the configured VPN that should be used for connections
+     */
+    public String getVpn() {
+        return this.vpn;
+    }
+
+    /**
+     * Host address for provided service
+     *
+     * @param service - service for which host needs to be retrieved
+     * @return host address exposed from the container
+     */
+    public String getOrigin(Service service) {
+        return String.format("%s://%s:%s", service.getProtocol(), getHost(), getMappedPort(service.getPort()));
+    }
+
+    /**
+     * Configured username
+     *
+     * @return the standard username that should be used for connections
+     */
+    public String getUsername() {
+        return this.username;
+    }
+
+    /**
+     * Configured password
+     *
+     * @return the standard password that should be used for connections
+     */
+    public String getPassword() {
+        return this.password;
+    }
+}
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
new file mode 100644
index 00000000000..990a8107eb5
--- /dev/null
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
@@ -0,0 +1,96 @@
+package org.testcontainers.solace;
+
+import org.apache.qpid.jms.JmsConnectionFactory;
+import org.assertj.core.api.Assertions;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+
+public class SolaceContainerAMQPTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerAMQPTest.class);
+
+    private static final String MESSAGE = "HelloWorld";
+
+    private static final String TOPIC_NAME = "Topic/ActualTopic";
+
+    @Test
+    public void testSolaceContainer() throws JMSException {
+        try (
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+                .withTopic(TOPIC_NAME, Service.AMQP)
+                .withVpn("amqp-vpn")
+        ) {
+            solaceContainer.start();
+            // solaceContainerUsage {
+            Session session = createSession(
+                solaceContainer.getUsername(),
+                solaceContainer.getPassword(),
+                solaceContainer.getOrigin(Service.AMQP)
+            );
+            // }
+            Assertions.assertThat(session).isNotNull();
+            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            session.close();
+        }
+    }
+
+    private static Session createSession(String username, String password, String host) {
+        try {
+            ConnectionFactory connectionFactory = new JmsConnectionFactory(username, password, host);
+            Connection connection = connectionFactory.createConnection();
+            Session session = connection.createSession();
+            connection.start();
+            return session;
+        } catch (Exception e) {
+            Assert.fail("Error connecting and setting up session! " + e.getMessage());
+            return null;
+        }
+    }
+
+    private void publishMessageToSolace(Session session, Topic topic) throws JMSException {
+        MessageProducer messageProducer = session.createProducer(topic);
+        TextMessage message = session.createTextMessage(MESSAGE);
+        messageProducer.send(message);
+        messageProducer.close();
+    }
+
+    private String consumeMessageFromSolace(Session session) {
+        CountDownLatch latch = new CountDownLatch(1);
+        try {
+            String[] result = new String[1];
+            Topic topic = session.createTopic(TOPIC_NAME);
+            MessageConsumer messageConsumer = session.createConsumer(topic);
+            messageConsumer.setMessageListener(message -> {
+                try {
+                    if (message instanceof TextMessage) {
+                        result[0] = ((TextMessage) message).getText();
+                    }
+                    latch.countDown();
+                } catch (Exception e) {
+                    LOGGER.error("Exception received: " + e.getMessage());
+                    latch.countDown();
+                }
+            });
+            publishMessageToSolace(session, topic);
+            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            messageConsumer.close();
+            return result[0];
+        } catch (Exception e) {
+            throw new RuntimeException("Cannot receive message from solace", e);
+        }
+    }
+}
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
new file mode 100644
index 00000000000..621bb122a7b
--- /dev/null
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
@@ -0,0 +1,95 @@
+package org.testcontainers.solace;
+
+import org.assertj.core.api.Assertions;
+import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
+import org.eclipse.paho.client.mqttv3.MqttCallback;
+import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class SolaceContainerMQTTTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerMQTTTest.class);
+
+    private static final String MESSAGE = "HelloWorld";
+
+    private static final String TOPIC_NAME = "Topic/ActualTopic";
+
+    @Test
+    public void testSolaceContainer() {
+        try (
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+                .withTopic(TOPIC_NAME, Service.MQTT)
+                .withVpn("mqtt-vpn")
+        ) {
+            solaceContainer.start();
+            MqttClient client = createClient(
+                solaceContainer.getUsername(),
+                solaceContainer.getPassword(),
+                solaceContainer.getOrigin(Service.MQTT)
+            );
+            Assertions.assertThat(client).isNotNull();
+            Assertions.assertThat(consumeMessageFromSolace(client)).isEqualTo(MESSAGE);
+        }
+    }
+
+    private static MqttClient createClient(String username, String password, String host) {
+        try {
+            MqttClient mqttClient = new MqttClient(host, MESSAGE);
+            MqttConnectOptions connOpts = new MqttConnectOptions();
+            connOpts.setCleanSession(true);
+            connOpts.setUserName(username);
+            connOpts.setPassword(password.toCharArray());
+            mqttClient.connect(connOpts);
+            return mqttClient;
+        } catch (Exception e) {
+            Assert.fail("Error connecting and setting up session! " + e.getMessage());
+            return null;
+        }
+    }
+
+    private void publishMessageToSolace(MqttClient mqttClient) throws MqttException {
+        MqttMessage message = new MqttMessage(MESSAGE.getBytes());
+        message.setQos(0);
+        mqttClient.publish(TOPIC_NAME, message);
+    }
+
+    private String consumeMessageFromSolace(MqttClient client) {
+        CountDownLatch latch = new CountDownLatch(1);
+        try {
+            String[] result = new String[1];
+            client.setCallback(
+                new MqttCallback() {
+                    @Override
+                    public void connectionLost(Throwable cause) {
+                        LOGGER.error("Exception received: " + cause.getMessage());
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void messageArrived(String topic, MqttMessage message) {
+                        result[0] = new String(message.getPayload());
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void deliveryComplete(IMqttDeliveryToken token) {}
+                }
+            );
+            client.subscribe(TOPIC_NAME, 0);
+            publishMessageToSolace(client);
+            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            return result[0];
+        } catch (Exception e) {
+            throw new RuntimeException("Cannot receive message from solace", e);
+        }
+    }
+}
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
new file mode 100644
index 00000000000..ee0cc849573
--- /dev/null
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
@@ -0,0 +1,59 @@
+package org.testcontainers.solace;
+
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class SolaceContainerRESTTest {
+
+    private static final String MESSAGE = "HelloWorld";
+
+    private static final String TOPIC_NAME = "Topic/ActualTopic";
+
+    @Test
+    public void testSolaceContainer() throws IOException {
+        try (
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+                .withTopic(TOPIC_NAME, Service.REST)
+                .withVpn("rest-vpn")
+        ) {
+            solaceContainer.start();
+            testPublishMessageToSolace(solaceContainer, Service.REST);
+        }
+    }
+
+    private void testPublishMessageToSolace(SolaceContainer solaceContainer, Service service) throws IOException {
+        HttpClient client = createClient(solaceContainer);
+        HttpPost request = new HttpPost(solaceContainer.getOrigin(service) + "/" + TOPIC_NAME);
+        request.setEntity(new StringEntity(MESSAGE));
+        request.addHeader(HttpHeaders.CONTENT_TYPE, "text/plain");
+        HttpResponse response = client.execute(request);
+        if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+            Assert.fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
+        }
+        Assertions.assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
+    }
+
+    private HttpClient createClient(SolaceContainer solaceContainer) {
+        CredentialsProvider provider = new BasicCredentialsProvider();
+        provider.setCredentials(
+            AuthScope.ANY,
+            new UsernamePasswordCredentials(solaceContainer.getUsername(), solaceContainer.getPassword())
+        );
+        return HttpClientBuilder.create().setDefaultCredentialsProvider(provider).build();
+    }
+}
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
new file mode 100644
index 00000000000..afc9639c32f
--- /dev/null
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -0,0 +1,166 @@
+package org.testcontainers.solace;
+
+import com.solacesystems.jcsmp.BytesXMLMessage;
+import com.solacesystems.jcsmp.JCSMPException;
+import com.solacesystems.jcsmp.JCSMPFactory;
+import com.solacesystems.jcsmp.JCSMPProperties;
+import com.solacesystems.jcsmp.JCSMPSession;
+import com.solacesystems.jcsmp.JCSMPStreamingPublishCorrelatingEventHandler;
+import com.solacesystems.jcsmp.TextMessage;
+import com.solacesystems.jcsmp.Topic;
+import com.solacesystems.jcsmp.XMLMessageConsumer;
+import com.solacesystems.jcsmp.XMLMessageListener;
+import com.solacesystems.jcsmp.XMLMessageProducer;
+import org.assertj.core.api.Assertions;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class SolaceContainerSMFTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerSMFTest.class);
+
+    private static final String MESSAGE = "HelloWorld";
+
+    private static final Topic TOPIC = JCSMPFactory.onlyInstance().createTopic("Topic/ActualTopic");
+
+    @Test
+    public void testSolaceContainerWithSimpleAuthentication() {
+        try (
+            // solaceContainerSetup {
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+                .withCredentials("user", "pass")
+                .withTopic("Topic/ActualTopic", Service.SMF)
+                .withVpn("test_vpn")
+            // }
+        ) {
+            solaceContainer.start();
+            JCSMPSession session = createSessionWithBasicAuth(solaceContainer);
+            Assertions.assertThat(session).isNotNull();
+            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            session.closeSession();
+        }
+    }
+
+    @Test
+    public void testSolaceContainerWithCertificates() {
+        try (
+            // solaceContainerUsageSSL {
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+                .withClientCert(
+                    MountableFile.forClasspathResource("solace.pem"),
+                    MountableFile.forClasspathResource("rootCA.crt")
+                )
+                .withTopic("Topic/ActualTopic", Service.SMF_SSL)
+            // }
+        ) {
+            solaceContainer.start();
+            JCSMPSession session = createSessionWithCertificates(solaceContainer);
+            Assertions.assertThat(session).isNotNull();
+            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            session.closeSession();
+        }
+    }
+
+    private String getResourceFileLocation(String name) {
+        return getClass().getClassLoader().getResource(name).getPath();
+    }
+
+    private static JCSMPSession createSessionWithBasicAuth(SolaceContainer solace) {
+        JCSMPProperties properties = new JCSMPProperties();
+        properties.setProperty(JCSMPProperties.HOST, solace.getOrigin(Service.SMF));
+        properties.setProperty(JCSMPProperties.VPN_NAME, solace.getVpn());
+        properties.setProperty(JCSMPProperties.USERNAME, solace.getUsername());
+        properties.setProperty(JCSMPProperties.PASSWORD, solace.getPassword());
+        return createSession(properties);
+    }
+
+    private JCSMPSession createSessionWithCertificates(SolaceContainer solace) {
+        JCSMPProperties properties = new JCSMPProperties();
+        properties.setProperty(JCSMPProperties.HOST, solace.getOrigin(Service.SMF_SSL));
+        properties.setProperty(JCSMPProperties.VPN_NAME, solace.getVpn());
+        properties.setProperty(JCSMPProperties.USERNAME, solace.getUsername());
+        // Just for testing purposes
+        properties.setProperty(JCSMPProperties.SSL_VALIDATE_CERTIFICATE_HOST, false);
+        properties.setProperty(JCSMPProperties.SSL_VALIDATE_CERTIFICATE, true);
+        properties.setProperty(JCSMPProperties.SSL_VALIDATE_CERTIFICATE_DATE, true);
+        properties.setProperty(
+            JCSMPProperties.AUTHENTICATION_SCHEME,
+            JCSMPProperties.AUTHENTICATION_SCHEME_CLIENT_CERTIFICATE
+        );
+        properties.setProperty(JCSMPProperties.SSL_TRUST_STORE, getResourceFileLocation("truststore"));
+        properties.setProperty(JCSMPProperties.SSL_TRUST_STORE_PASSWORD, "solace");
+        properties.setProperty(JCSMPProperties.SSL_KEY_STORE, getResourceFileLocation("client.pfx"));
+        properties.setProperty(JCSMPProperties.SSL_KEY_STORE_PASSWORD, "solace");
+        return createSession(properties);
+    }
+
+    private static JCSMPSession createSession(JCSMPProperties properties) {
+        try {
+            JCSMPSession session = JCSMPFactory.onlyInstance().createSession(properties);
+            session.connect();
+            return session;
+        } catch (Exception e) {
+            Assert.fail("Error connecting and setting up session! " + e.getMessage());
+            return null;
+        }
+    }
+
+    private void publishMessageToSolace(JCSMPSession session) throws JCSMPException {
+        XMLMessageProducer producer = session.getMessageProducer(
+            new JCSMPStreamingPublishCorrelatingEventHandler() {
+                @Override
+                public void responseReceivedEx(Object o) {
+                    LOGGER.info("Producer received response for msg: " + o);
+                }
+
+                @Override
+                public void handleErrorEx(Object o, JCSMPException e, long l) {
+                    LOGGER.error(String.format("Producer received error for msg: %s - %s", o, e));
+                }
+            }
+        );
+        TextMessage msg = producer.createTextMessage();
+        msg.setText(MESSAGE);
+        producer.send(msg, TOPIC);
+    }
+
+    private String consumeMessageFromSolace(JCSMPSession session) {
+        CountDownLatch latch = new CountDownLatch(1);
+        try {
+            String[] result = new String[1];
+            XMLMessageConsumer cons = session.getMessageConsumer(
+                new XMLMessageListener() {
+                    @Override
+                    public void onReceive(BytesXMLMessage msg) {
+                        if (msg instanceof TextMessage) {
+                            TextMessage textMessage = (TextMessage) msg;
+                            String message = textMessage.getText();
+                            result[0] = message;
+                            LOGGER.info("TextMessage received: " + message);
+                        }
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onException(JCSMPException e) {
+                        LOGGER.error("Exception received: " + e.getMessage());
+                        latch.countDown();
+                    }
+                }
+            );
+            session.addSubscription(TOPIC);
+            cons.start();
+            publishMessageToSolace(session);
+            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            return result[0];
+        } catch (Exception e) {
+            throw new RuntimeException("Cannot receive message from solace", e);
+        }
+    }
+}
diff --git a/modules/solace/src/test/resources/client.pfx b/modules/solace/src/test/resources/client.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..a9885184321701f63de7d9efdff6cebb0eb4f208
GIT binary patch
literal 3550
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
P8U<L}+k&_ypy>1;qNt&T

literal 0
HcmV?d00001

diff --git a/modules/solace/src/test/resources/logback-test.xml b/modules/solace/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/solace/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/solace/src/test/resources/rootCA.crt b/modules/solace/src/test/resources/rootCA.crt
new file mode 100644
index 00000000000..c3a19fc580c
--- /dev/null
+++ b/modules/solace/src/test/resources/rootCA.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDmDCCAoCgAwIBAgIIVP5+fnVAfbwwDQYJKoZIhvcNAQELBQAwRjELMAkGA1UE
+BhMCUEwxFzAVBgNVBAoTDnRlc3Rjb250YWluZXJzMR4wHAYDVQQDExV0ZXN0Y29u
+dGFpbmVycy1zb2xhY2UwHhcNMjMwMTIzMTgyMzAwWhcNMzMwMTIzMTgyMzAwWjBG
+MQswCQYDVQQGEwJQTDEXMBUGA1UEChMOdGVzdGNvbnRhaW5lcnMxHjAcBgNVBAMT
+FXRlc3Rjb250YWluZXJzLXNvbGFjZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK9ujwg3eAuwbEodmjJ/3O2Sy1+OBZ0BNiampBhrfSRs5Fg0GkwCZPB5
+QZ0byQKtN0bDqtIWs4W1ujRjrf/0rjKktFsU/6fMMiGiDGcvB/5wiZuFMPPP4gBv
+axP5kCacDbnKwdxQVYoQwWUcrLWMju/NXYDiu/pZ1umClyd40Sv0CTpLibNxdY7Y
+HGSRzcAqMu4Uc1szyhI2+u2hg0VbOiKuky/eACBMOEHW/sfYO1bXYM4+jPbLSQCi
+XvUyUUwG1aCkcOkTjkm6WBXj0twyO9W0vOx6Nnq1wUUqL534qIeLu22R+Fz8LjCG
+b33klaCoiJNmp0Xg/rTPsyP4lOW5gsECAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTbxXlb6cfHBCCHI7w7UCDiD6/VvDALBgNVHQ8EBAMCAoww
+FAYDVR0RBA0wC4IJbG9jYWxob3N0MBEGCWCGSAGG+EIBAQQEAwIABzAeBglghkgB
+hvhCAQ0EERYPeGNhIGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBCwUAA4IBAQBbJUg2
+4+xZjswaJDCFR/pm54tzuTA1BIskXHY95P7sj7EtefzmHqXq79/uvpgjCBbQFzgR
+qbXd+S/s9qYu0Bn2VYx3ba2Ch9J2gyNfz3J3GWUbx51uRfgf2T3MZslq5jqCxjUR
+VWU7of8Imlg30JOMEi0Eseqi/I1mFfZb0dv4Vc7mAZOz6FWEkhwOhzQJcpY/9J7H
+g843lmbU//fNmsTytHgjNKbawdk3cDWawfjqdfoLVzwT8L5CyvPMZYIO1DT0nLFb
+wYQxMirrvH5dfKmHdgqE0orA3yTVFbtUEygRwuCKhZFNXisEO+gll0px4UYt+STl
+A4zogvmOijwjgwuo
+-----END CERTIFICATE-----
diff --git a/modules/solace/src/test/resources/solace.pem b/modules/solace/src/test/resources/solace.pem
new file mode 100644
index 00000000000..947c0102e45
--- /dev/null
+++ b/modules/solace/src/test/resources/solace.pem
@@ -0,0 +1,49 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA43Us+KsRZ218C8JAzB7LiF5dhx95F/spQzkiFgSNJ97215Go
+SIPzDWm1ac4wTGZR1YHiTk2PEFHk21TeJi5sODGHqR0G0Qr2IweSz52Zs5h0p+Xw
+O3x55In/Dx+jIMdOR9HfuU05WlYSTWXdwFyq9VmmXK+ViJ0pZE9X18E1Qtm27S6v
+FIckdEKswh17DCKMQ6kRMDkLwe7yOoBYPAFw0R46o3PXAuVHbkI/3ewn/aopOQ+4
+I0dqTxp7m7spdIanT+oSd5EN4G1a/oTYPO67qbcq/SIgWLHR/iT2dOE28ftAco64
++N5ds5wz5a0JL7CwIdxcgSsndsBSR+hM5cC5kwIDAQABAoIBAERwMkrT9hWfrK5B
+EYwZS/ZJJm0MvDvJ931hiG8FiY9QmAb+rZq8EPqdLteaEZA7TS4nuXcEASLQ8UJJ
+Q9pLJ4a06HOq5y0o1ixuD+9mJSQToC4Qknrjli18lADx7Pxk25nifSVdJf+XXERr
+fRBvEYVnJxZGQoDrgNPMx8qEOMlW9Wub9+O5OttsMdxpVeWw/G36mT8JOVZvIw9W
+frRXNuX9F17lJZIt3E10QrmKSdyogPdTMXBTTw5TCIMck1KH+lRSwP7GRnJMHKNE
+bcq+yoePYHdWfIW87I8bFprgC3IyCumA+ERp3oWNvTEziXkt1bogWx4pe+tFAhIp
+flpCDFkCgYEA8jhvgqEYuX9I7tY5gJHeC5BOg7d0XNpP4RN9cIEYkamgcwil7DAf
+hAn2+Lzvf1wcBtFi4wyygCsXsdP3CeV60vFYHWrgXozlZVs5NIDTb4CWNbylSapR
+mlfhfCQQAGXP8WdKQdoXsGhSgbX3kuAaW7d9BscPgPUSqCbSMvuRKt8CgYEA8GW+
+agfK7EDRbYbLRNcof4UIOnDoZ+vi62tbQ0wRI9dt0dXDgyeUuPMoeD5uTSu1jcjf
+T59UIKHwZO5f6A7ADZeJLU72Oo4dCYxG3H3ZM1VwW6kqVlWOtBkwOoibb5ApUjEP
+jVCtvRNAn+htDO+4nhQDK2xwgJnkOaXCWFZgO80CgYBjPkRSHXdn6YMUeKmuyBVW
+X5YL2crPkJNSAQ5QXlSWug2HlG+HSmBfVUXfvGnUoQTKtlfx923bncxjjBmX8HJW
+o5Qa2YN8ufXzhWD25iG7edARzG1ctXAh8QfuOUhlIVIF8vA18wnpuZS0mL4La87g
+7VlIwZ7Uk5VFWEKfqPtduQKBgQDgqjWKYj4DDZCsC41siKgQhQNrmpmYhZtM6Mgh
+3LUoCe1Yba6KpDMZpiXsOmxbMr46A8CvaPf2h2Fi8mQvO5nBGh3ZejIkByyb/705
+02Np1i9rem1Wwh7bsa6hBYo+eTwk1DT0nLHCQnvi9hT0QhUHpyxPKMj7ZtckCQXY
+COFnAQKBgQCnPzxlGmmv9ktOgDN6pOzTd3VLtthQu+9u7AeumUjC4al69ROfqNW2
+dfzJcdlJqMDfuHDFle+fO0Ahfp3j/BYSZFf7jAzo/jMVh32siYiq6C6MawzknwsS
+nUBfPFBD84Fkv5YaD0TT48p7YUANFL18Roq1PjezPdmkn7T8Nuaz2g==
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDpzCCAo+gAwIBAgIIIFE70OcBFc8wDQYJKoZIhvcNAQELBQAwRjELMAkGA1UE
+BhMCUEwxFzAVBgNVBAoTDnRlc3Rjb250YWluZXJzMR4wHAYDVQQDExV0ZXN0Y29u
+dGFpbmVycy1zb2xhY2UwHhcNMjMwMTIzMTgyODAwWhcNMjQwMTIzMTgyODAwWjA5
+MRcwFQYDVQQKEw50ZXN0Y29udGFpbmVyczEeMBwGA1UEAxMVdGVzdGNvbnRhaW5l
+cnMtc29sYWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA43Us+KsR
+Z218C8JAzB7LiF5dhx95F/spQzkiFgSNJ97215GoSIPzDWm1ac4wTGZR1YHiTk2P
+EFHk21TeJi5sODGHqR0G0Qr2IweSz52Zs5h0p+XwO3x55In/Dx+jIMdOR9HfuU05
+WlYSTWXdwFyq9VmmXK+ViJ0pZE9X18E1Qtm27S6vFIckdEKswh17DCKMQ6kRMDkL
+we7yOoBYPAFw0R46o3PXAuVHbkI/3ewn/aopOQ+4I0dqTxp7m7spdIanT+oSd5EN
+4G1a/oTYPO67qbcq/SIgWLHR/iT2dOE28ftAco64+N5ds5wz5a0JL7CwIdxcgSsn
+dsBSR+hM5cC5kwIDAQABo4GlMIGiMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFE+Q
+HiDtU9dHWo/dnPUdKgC2z7vnMAsGA1UdDwQEAwID6DAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwFAYDVR0RBA0wC4IJbG9jYWxob3N0MBEGCWCGSAGG+EIB
+AQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRlMA0GCSqGSIb3
+DQEBCwUAA4IBAQAb43HdEsj2hV8YrfKDjsRzs0AIwqhwsbeCr+uTXHGUoAV+yh38
+3Dmy6yj4H8OsqiAcQeOSAtORg7YcybcQky9puWd+26iaNGZQVe3qZ7Hx16ZJlywy
+pavx9W/n/EywIUUIfxuOp+KgmFs71OrVPzEBKfNckTTuLHskt1UCfpAuOexnOTV2
+Y79t3vwqrBqK3neZDFTvYQHAchTfr9KJWWZ8caAj+dTFrhjrjgfW+lDlj9489H6U
+Gq2yxL+nHjclGaTA02+qzSahPL8LaHpGiwWTdbWZzetrOoac/2RlWNjex8vbH37N
+pS6zTyCwVPd1WNTqJEPKsmw79nQKqg4O5LOs
+-----END CERTIFICATE-----
diff --git a/modules/solace/src/test/resources/truststore b/modules/solace/src/test/resources/truststore
new file mode 100644
index 0000000000000000000000000000000000000000..502cd12e5216545af75c8d93510dca183d9bafa8
GIT binary patch
literal 987
zcmezO_TO6u1_mY|W(3o0Mfv$9$%#O2o3`85s|>6WdZq@J3=GV344Rl{7&I|8EMR70
zWMbk7`Bzt0>QKAKfR~L^tIebBJ1-+6H!FjIn<2LWCmVAp3!5-gfRCZLfhdT>CCpcn
zT3nKxpI4HYnU`8rY$#_S1Cn4C7DbiNEzZwLOineB6X!KDHZU|YHnafJ22tX?#>iZ%
z+0(?RgzN=IRtDxKMt%l^CPpr%CPqev^?Cgq<`vu<a=c_`8P(r;JLz<MAM0F3Gqq()
zB(iH&a-Kw(Nck|Oe5iDsD}9n_t-0IbRhPszw{G2KlDzi+mvu%<wnU5kUw+0&aS>0t
zKKs9d&e^R7pU*#H$j=u3IYDg>@6J;P?*xQ)2^>t7S+ljL@BP`>hDW=9MP7T^G+n*o
zqV^X~EAP(Dg{6HrWKt%cJ)mXuPNX>6_>_>@ueS@EU8Aj()=k#G$DrV2;dt%e@f+4*
z*Avd!^?W<+$*?Hyt5Kj2+tme23SJ8LdG3l3eSGPTk@eLrd)`!;Rc$@!s--{o$BOpu
z-MJHg#Qf1SXv?pCGIha<j>&1uT_610a(=V&k10=gHXUSQW@KPo+}LT**k-^Fj4@eZ
zM#ldvtOm?L%0Lz*z{euSB69m^W%SGA$5|BGmG@W&C_Lg{e|3)mH%OYFg@u`ksmDMB
z#1UlSHQ;XI%*jtq%*n_vE-?^f<4kDtU~K#0#K;Iz$iQwOhY;dr5ftOENKRBpPAw|Q
zOv_A8EJ;O<EntEJ#ug((w5o^M<2R9gXQWgNTHSx8J?}2wX<*9ItrAma`{du7{*Aho
zf1b%Lef9qSyL~g1Im9lATL`Y)diSUPn{UhXE=Yb0?J3V)+thxktXVn!d{Mb%s`T->
zd9FX?Z`z(oJDK&&s_B@iU}&oK!v7qzBFryL?h(>u+4ySFpWZalZ_yWT{|G(zjB)bj
z7ojbaWcb=mIE$v)f0=i@`JDN*v@8F=pPhB&)0PTllV!IK-ZU>ToptcXtI}WG;Wok_
z_BoyUd?vMt?~2KnIUA!7wip^|z1~w7TeGsgjH~5R*Ma*gS4DS+2x|x)deGH6(Kk+;
z#rlQnbg#mPZn{5Jo-+5mX!_aLWux58y`p|qLa@18aP_&jvQrjV=^5t~aB>0wIB9$9

literal 0
HcmV?d00001


From ad3ef0b7f3d1d20a267cc5ad817ef3d49b1a8263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 14 Feb 2023 12:04:48 -0600
Subject: [PATCH 2737/4969] Polish solace dependencies

* Remove logback dependency
* Ignore `org.apache.qpid:qpid-jms-client` dependency from dependabot
---
 .github/dependabot.yml      | 3 +++
 modules/solace/build.gradle | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ecfb16dcd80..3e781c82e7e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -238,6 +238,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.apache.qpid:qpid-jms-client"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/solr"
     schedule:
diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 677ad462656..6c1c34bb4a6 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,6 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'com.solacesystems:sol-jcsmp:10.17.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'

From 024b33c662a3bb8f6de7fb0c6fdec29837473c20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Feb 2023 18:07:29 +0000
Subject: [PATCH 2738/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.405 to 1.12.406.
- [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.12.405...1.12.406)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9052b4426fa..3db1bfa578f 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.405'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.405'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.406'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.406'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 02bb80c5dd63c543c4ba3f1a495b724dd37df823 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Feb 2023 18:07:33 +0000
Subject: [PATCH 2739/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.17.0 to 10.18.0.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 6c1c34bb4a6..db4f403361a 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.17.0'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.18.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From f35ee8a76223b5f7325b1e003b9ff065f55fa9d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Feb 2023 18:07:37 +0000
Subject: [PATCH 2740/4969] Bump com.amazonaws:aws-java-sdk-logs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.405 to 1.12.406.
- [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.12.405...1.12.406)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 8f3f1de80a7..f97cb52a753 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.405'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.405'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.406'
     testImplementation 'software.amazon.awssdk:s3:2.20.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 6cca6d1c5d77337bb767d376172cc80a3c2f40f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Feb 2023 18:07:39 +0000
Subject: [PATCH 2741/4969] Bump
 org.eclipse.paho:org.eclipse.paho.client.mqttv3 in /modules/solace

Bumps [org.eclipse.paho:org.eclipse.paho.client.mqttv3](https://github.com/eclipse/paho.mqtt.java) from 1.1.0 to 1.2.5.
- [Release notes](https://github.com/eclipse/paho.mqtt.java/releases)
- [Commits](https://github.com/eclipse/paho.mqtt.java/compare/v1.1.0...v1.2.5)

---
updated-dependencies:
- dependency-name: org.eclipse.paho:org.eclipse.paho.client.mqttv3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 6c1c34bb4a6..026baa58bf8 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.solacesystems:sol-jcsmp:10.17.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
-    testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
+    testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'
 
 }

From 22a177e1383e86d8e84d612cd49461de5fac5700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Feb 2023 09:07:38 -0600
Subject: [PATCH 2742/4969] Add checkstyle rule to avoid author tag in javadoc
 (#6639)

Also, all author tag references have been removed.
---
 config/checkstyle/checkstyle.xml                       |  4 ++++
 .../containers/wait/strategy/HostPortWaitStrategy.java |  2 --
 .../junit/wait/strategy/AbstractWaitStrategyTest.java  |  2 --
 .../junit/wait/strategy/HttpWaitStrategyTest.java      |  2 --
 .../testcontainers/containers/CassandraContainer.java  |  2 --
 .../containers/delegate/CassandraDatabaseDelegate.java |  2 --
 .../containers/wait/CassandraQueryWaitStrategy.java    |  2 --
 .../containers/CassandraContainerTest.java             |  3 ---
 .../delegate/AbstractDatabaseDelegate.java             |  1 -
 .../org/testcontainers/delegate/DatabaseDelegate.java  |  2 --
 .../exception/ConnectionCreationException.java         |  2 --
 .../main/java/org/testcontainers/ext/ScriptUtils.java  | 10 ----------
 .../containers/BigtableEmulatorContainer.java          |  3 ---
 .../containers/DatastoreEmulatorContainer.java         |  2 --
 .../containers/FirestoreEmulatorContainer.java         |  2 --
 .../containers/PubSubEmulatorContainer.java            |  2 --
 .../containers/SpannerEmulatorContainer.java           |  2 --
 .../containers/JdbcDatabaseContainer.java              |  2 --
 .../java/org/testcontainers/jdbc/ConnectionUrl.java    |  4 ----
 .../org/testcontainers/jdbc/JdbcDatabaseDelegate.java  |  2 --
 .../testcontainers/jdbc/ConnectionUrlDriversTests.java |  2 --
 .../testcontainers/containers/MariaDBContainer.java    |  2 --
 .../containers/MSSQLServerContainer.java               |  3 ---
 .../mssqlserver/CustomPasswordMSSQLServerTest.java     |  2 --
 .../org/testcontainers/containers/MySQLContainer.java  |  3 ---
 .../org/testcontainers/containers/Neo4jContainer.java  |  1 -
 .../containers/Neo4jContainerJUnitIntegrationTest.java |  2 --
 .../testcontainers/containers/Neo4jContainerTest.java  |  2 --
 .../org/testcontainers/containers/NginxContainer.java  |  3 ---
 .../java/org/testcontainers/junit/SimpleNginxTest.java |  3 ---
 .../testcontainers/containers/OrientDBContainer.java   |  3 ---
 .../containers/OrientDBContainerTest.java              |  3 ---
 .../testcontainers/containers/PostgreSQLContainer.java |  3 ---
 .../junit/postgresql/CustomizablePostgreSQLTest.java   |  3 ---
 .../testcontainers/containers/PrestoContainerTest.java |  3 ---
 .../testcontainers/containers/QuestDBContainer.java    |  3 ---
 .../testcontainers/containers/RabbitMQContainer.java   |  2 --
 .../RabbitMQContainerJUnitIntegrationTest.java         |  2 --
 .../containers/RabbitMQContainerTest.java              |  3 ---
 .../org/testcontainers/containers/SolrClientUtils.java |  2 --
 .../containers/SolrContainerConfiguration.java         |  3 ---
 .../testcontainers/containers/SolrContainerTest.java   |  3 ---
 .../java/org/testcontainers/tidb/TiDBContainer.java    |  2 --
 .../containers/YugabyteDBYCQLContainer.java            |  1 -
 .../containers/YugabyteDBYSQLContainer.java            |  1 -
 .../containers/YugabyteDBYSQLContainerProvider.java    |  2 --
 .../containers/delegate/AbstractYCQLDelegate.java      |  2 --
 .../containers/delegate/YugabyteDBYCQLDelegate.java    |  1 -
 .../strategy/YugabyteDBYCQLWaitStrategy.java           |  2 --
 .../strategy/YugabyteDBYSQLWaitStrategy.java           |  2 --
 .../jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java  |  2 --
 .../junit/yugabytedb/YugabyteDBYCQLTest.java           |  2 --
 .../junit/yugabytedb/YugabyteDBYSQLTest.java           |  2 --
 53 files changed, 4 insertions(+), 124 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 5ed1d529e14..373327ad263 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -58,4 +58,8 @@
         </module>
         <module name="OneStatementPerLineCheck"/>
     </module>
+    <module name="RegexpSingleline">
+        <property name="format" value="^\s*\*\s*@author"/>
+        <property name="message" value="Remove author tags from source files."/>
+    </module>
 </module>
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index 4ca0c6b9592..74acd8f1beb 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -22,8 +22,6 @@
 
 /**
  * Waits until a socket connection can be established on a port exposed or mapped by the container.
- *
- * @author richardnorth
  */
 @Slf4j
 public class HostPortWaitStrategy extends AbstractWaitStrategy {
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
index 23ad3802c1b..6c2dbb50244 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
@@ -16,8 +16,6 @@
 
 /**
  * Common test methods for {@link WaitStrategy} implementations.
- *
- * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
  */
 public abstract class AbstractWaitStrategyTest<W extends WaitStrategy> {
 
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index d3ce006fb2e..91c94009086 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -17,8 +17,6 @@
 
 /**
  * Tests for {@link HttpWaitStrategy}.
- *
- * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
  */
 public class HttpWaitStrategyTest extends AbstractWaitStrategyTest<HttpWaitStrategy> {
 
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index a12ac03f18d..dcebe165f73 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -22,8 +22,6 @@
  * Cassandra container
  *
  * Supports 2.x and 3.x Cassandra versions
- *
- * @author Eugeny Karpov
  */
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
 
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
index 8bc72e7f154..8d604822083 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
@@ -13,8 +13,6 @@
 
 /**
  * Cassandra database delegate
- *
- * @author Eugeny Karpov
  */
 @Slf4j
 @RequiredArgsConstructor
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
index aa2466cf7c4..cffb1ba757e 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
@@ -12,8 +12,6 @@
 
 /**
  * Waits until Cassandra returns its version
- *
- * @author Eugeny Karpov
  */
 public class CassandraQueryWaitStrategy extends AbstractWaitStrategy {
 
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
index d8f21fc3068..eb3a8b068ea 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -11,9 +11,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * @author Eugeny Karpov
- */
 @Slf4j
 public class CassandraContainerTest {
 
diff --git a/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java b/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java
index 196eb485b5f..a84535ed5fd 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/delegate/AbstractDatabaseDelegate.java
@@ -4,7 +4,6 @@
 
 /**
  * @param <CONNECTION> connection to the database
- * @author Eugeny Karpov
  */
 public abstract class AbstractDatabaseDelegate<CONNECTION> implements DatabaseDelegate {
 
diff --git a/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java b/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java
index eda8f197008..e9dd207e112 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/delegate/DatabaseDelegate.java
@@ -6,8 +6,6 @@
  * Database delegate
  *
  * Gives an abstraction from concrete database
- *
- * @author Eugeny Karpov
  */
 public interface DatabaseDelegate extends AutoCloseable {
     /**
diff --git a/modules/database-commons/src/main/java/org/testcontainers/exception/ConnectionCreationException.java b/modules/database-commons/src/main/java/org/testcontainers/exception/ConnectionCreationException.java
index 3b8852dbddc..0a117ac23d2 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/exception/ConnectionCreationException.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/exception/ConnectionCreationException.java
@@ -2,8 +2,6 @@
 
 /**
  * Inability to create connection to the database
- *
- * @author Eugeny Karpov
  */
 public class ConnectionCreationException extends RuntimeException {
 
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index eca4989c70e..4aa91602342 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -36,16 +36,6 @@
  *
  * Generic utility methods for working with SQL scripts. Mainly for internal use
  * within the framework.
- *
- * @author Thomas Risberg
- * @author Sam Brannen
- * @author Juergen Hoeller
- * @author Keith Donald
- * @author Dave Syer
- * @author Chris Beams
- * @author Oliver Gierke
- * @author Chris Baldwin
- * @since 4.0.3
  */
 public abstract class ScriptUtils {
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index 3e0ea0f55ce..f96f0830510 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -7,9 +7,6 @@
  * A Bigtable container that relies in google cloud sdk.
  *
  * Default port is 9000.
- *
- * @author Eddú Meléndez
- * @author Ray Tsang
  */
 public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulatorContainer> {
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index dba58f7e145..38479193c3f 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -7,8 +7,6 @@
  * A Datastore container that relies in google cloud sdk.
  *
  * Default port is 8081.
- *
- * @author Eddú Meléndez
  */
 public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulatorContainer> {
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index d0c9180cf14..82d26339f90 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -7,8 +7,6 @@
  * A Firestore container that relies in google cloud sdk.
  *
  * Default port is 8080.
- *
- * @author Eddú Meléndez
  */
 public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulatorContainer> {
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index 03183b2b13c..af4c62aaec4 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -7,8 +7,6 @@
  * A PubSub container that relies in google cloud sdk.
  *
  * Default port is 8085.
- *
- * @author Eddú Meléndez
  */
 public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorContainer> {
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index dc45b004c6c..a3f4a91db05 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -5,8 +5,6 @@
 
 /**
  * A Spanner container. Default ports: 9010 for GRPC and 9020 for HTTP.
- *
- * @author Eddú Meléndez
  */
 public class SpannerEmulatorContainer extends GenericContainer<SpannerEmulatorContainer> {
 
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 88c418e73cb..e9b34a1ad05 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -24,8 +24,6 @@
 
 /**
  * Base class for containers that expose a JDBC connection
- *
- * @author richardnorth
  */
 public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<SELF>>
     extends GenericContainer<SELF>
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index b4aef740da0..c5f2759f3b1 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -19,8 +19,6 @@
  * This is an Immutable class holding JDBC Connection Url and its parsed components, used by {@link ContainerDatabaseDriver}.
  * <p>
  * {@link ConnectionUrl#parseUrl()} method must be called after instantiating this class.
- *
- * @author manikmagar
  */
 @EqualsAndHashCode(of = "url")
 @Getter
@@ -203,8 +201,6 @@ public Map<String, String> getTmpfsOptions() {
 
     /**
      * This interface defines the Regex Patterns used by {@link ConnectionUrl}.
-     *
-     * @author manikmagar
      */
     public interface Patterns {
         Pattern URL_MATCHING_PATTERN = Pattern.compile(
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
index 7ed2f7ffde1..3c33eba8d5b 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
@@ -11,8 +11,6 @@
 
 /**
  * JDBC database delegate
- *
- * @author Eugeny Karpov
  */
 @Slf4j
 public class JdbcDatabaseDelegate extends AbstractDatabaseDelegate<Statement> {
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index 2ac8cf88b5d..da1268acdca 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -12,8 +12,6 @@
 
 /**
  * This Test class validates that all supported JDBC URL's can be parsed by ConnectionUrl class.
- *
- * @author ManikMagar
  */
 @RunWith(Parameterized.class)
 public class ConnectionUrlDriversTests {
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index b0944a6d3c0..8717d2ecda7 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -7,8 +7,6 @@
 
 /**
  * Container implementation for the MariaDB project.
- *
- * @author Miguel Gonzalez Sanchez
  */
 public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 8ab3c1113a2..b7356a0f81c 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -7,9 +7,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-/**
- * @author Stefan Hufschmidt
- */
 public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mcr.microsoft.com/mssql/server");
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
index 97904c6b7d1..27075d6a3fe 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -15,8 +15,6 @@
 /**
  * Tests if the password passed to the container satisfied the password policy described at
  * https://docs.microsoft.com/en-us/sql/relational-databases/security/password-policy?view=sql-server-2017
- *
- * @author Enrico Costanzi
  */
 @RunWith(Parameterized.class)
 public class CustomPasswordMSSQLServerTest {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 316e709995c..0851dafdbc2 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -5,9 +5,6 @@
 
 import java.util.Set;
 
-/**
- * @author richardnorth
- */
 public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     public static final String NAME = "mysql";
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 43904c8aa18..0593471d79f 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -23,7 +23,6 @@
  * Testcontainer for Neo4j.
  *
  * @param <S> "SELF" to be used in the <code>withXXX</code> methods.
- * @author Michael J. Simons
  */
 public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContainer<S> {
 
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
index 3a2df1f7d0c..b5f9c2ad867 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
@@ -14,8 +14,6 @@
 
 /**
  * Test for basic functionality when used as a <code>@ClassRule</code>.
- *
- * @author Michael J. Simons
  */
 public class Neo4jContainerJUnitIntegrationTest {
 
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 6e695b92ebe..5341b10c599 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -28,8 +28,6 @@
 
 /**
  * Tests of functionality special to the Neo4jContainer.
- *
- * @author Michael J. Simons
  */
 public class Neo4jContainerTest {
 
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 1bf951af7c8..98d49776be3 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -8,9 +8,6 @@
 import java.net.URL;
 import java.util.Set;
 
-/**
- * @author richardnorth
- */
 public class NginxContainer<SELF extends NginxContainer<SELF>>
     extends GenericContainer<SELF>
     implements LinkableContainer {
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index fab2f012996..6b1bcf55d5b 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -20,9 +20,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * @author richardnorth
- */
 public class SimpleNginxTest {
 
     private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.9.4");
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index 60207350f67..d51d7ee5dc1 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.Optional;
 
-/**
- * @author robfrank
- */
 public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OrientDBContainer.class);
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index afd7bcee246..d370dc71472 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -7,9 +7,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * @author robfrank
- */
 public class OrientDBContainerTest {
 
     private static final DockerImageName ORIENTDB_IMAGE = DockerImageName.parse("orientdb:3.2.0-tp3");
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index d3ff65ee351..d8f974ad2d5 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -8,9 +8,6 @@
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 
-/**
- * @author richardnorth
- */
 public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     public static final String NAME = "postgresql";
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
index 6dea67c9e26..0e9904a5f61 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
@@ -10,9 +10,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * @author richardnorth
- */
 public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     private static final String DB_NAME = "foo";
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
index 0e86b587c50..8f2aa15f21c 100644
--- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -14,9 +14,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * @author findepi
- */
 public class PrestoContainerTest {
 
     @Test
diff --git a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
index dd933dd6c95..c6ab1b79e91 100644
--- a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
+++ b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
@@ -6,9 +6,6 @@
 
 /**
  * Testcontainers implementation for QuestDB.
- *
- * @author vangreen
- * @author jerrinot
  */
 public class QuestDBContainer extends JdbcDatabaseContainer<QuestDBContainer> {
 
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index c13dfdf1a24..92eaa0dbd05 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -18,8 +18,6 @@
 
 /**
  * Testcontainer for RabbitMQ.
- *
- * @author Martin Greber
  */
 public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
index 7473f470f6f..e04ab616e66 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
@@ -7,8 +7,6 @@
 
 /**
  * Test for basic functionality when used as a <code>@ClassRule</code>.
- *
- * @author Mrtin Greber
  */
 public class RabbitMQContainerJUnitIntegrationTest {
 
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 6bc935b4e6c..d26b4d6e924 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -27,9 +27,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
-/**
- * @author Martin Greber
- */
 public class RabbitMQContainerTest {
 
     public static final int DEFAULT_AMQPS_PORT = 5671;
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
index f831cdd82e9..19f0c7c4a8c 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrClientUtils.java
@@ -21,8 +21,6 @@
 
 /**
  * Utils class which can create collections and configurations.
- *
- * @author Simon Schneider
  */
 public class SolrClientUtils {
 
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
index 698e956c8fe..24035c8f4a9 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainerConfiguration.java
@@ -4,9 +4,6 @@
 
 import java.net.URL;
 
-/**
- * @author Simon Schneider
- */
 @Data
 public class SolrContainerConfiguration {
 
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
index 94a02acf579..6bb4fabb1a4 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -12,9 +12,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * @author Simon Schneider
- */
 public class SolrContainerTest {
 
     private static final DockerImageName SOLR_IMAGE = DockerImageName.parse("solr:8.3.0");
diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
index c78590d8393..9d886dde0d6 100644
--- a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
+++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
@@ -10,8 +10,6 @@
 
 /**
  * Testcontainers implementation for TiDB.
- *
- * @author Icemap
  */
 public class TiDBContainer extends JdbcDatabaseContainer<TiDBContainer> {
 
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
index af20ef9e157..f129ce54020 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
@@ -14,7 +14,6 @@
 /**
  * Testcontainers implementation for YugabyteDB YCQL API.
  *
- * @author srinivasa-vasu
  * @see <a href="https://docs.yugabyte.com/stable/api/ycql/">YCQL API</a>
  */
 public class YugabyteDBYCQLContainer extends GenericContainer<YugabyteDBYCQLContainer> {
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
index 290269dfe79..53b04ff71e0 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
@@ -10,7 +10,6 @@
 /**
  * Testcontainers implementation for YugabyteDB YSQL API.
  *
- * @author srinivasa-vasu
  * @see <a href="https://docs.yugabyte.com/stable/api/ysql/">YSQL API</a>
  */
 
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java
index 71d8b583448..4f1d0419543 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainerProvider.java
@@ -5,8 +5,6 @@
 
 /**
  * YugabyteDB YSQL (Structured Query Language) JDBC container provider
- *
- * @author srinivasa-vasu
  */
 public class YugabyteDBYSQLContainerProvider extends JdbcDatabaseContainerProvider {
 
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java
index c0e566c7ecf..4f1f2b24d8f 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/AbstractYCQLDelegate.java
@@ -4,8 +4,6 @@
 
 /**
  * An abstract delegate do-nothing class
- *
- * @author srinivasa-vasu
  */
 public abstract class AbstractYCQLDelegate implements DatabaseDelegate {
 
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
index e324679713b..cadb83f66e0 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
@@ -16,7 +16,6 @@
  * this requirement. This functionality is kept to address the initialization requirements
  * from standalone services that can't leverage liquibase or something similar.
  *
- * @author srinivasa-vasu
  * @see YugabyteDBYCQLContainer
  */
 @RequiredArgsConstructor
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
index dd775564941..89d93a5cb84 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
@@ -22,8 +22,6 @@
  * check the DB status with this way with a smoke test query that uses the underlying
  * custom objects and wait for the operation to complete.
  * </p>
- *
- * @author srinivasa-vasu
  */
 @RequiredArgsConstructor
 @Slf4j
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
index 31fa52a4155..690f8a97bc9 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
@@ -22,8 +22,6 @@
  * check the DB status with this way with a smoke test query that uses the underlying
  * custom objects and wait for the operation to complete.
  * </p>
- *
- * @author srinivasa-vasu
  */
 @RequiredArgsConstructor
 @Slf4j
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
index 09c0240e7db..a7ecab34aba 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
@@ -9,8 +9,6 @@
 
 /**
  * YugabyteDB YSQL API JDBC connectivity driver test class
- *
- * @author srinivasa-vasu
  */
 @RunWith(Parameterized.class)
 public class YugabyteDBYSQLJDBCDriverTest extends AbstractJDBCDriverTest {
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
index f2154065c14..5026048ab85 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
@@ -10,8 +10,6 @@
 
 /**
  * YugabyteDB YCQL API unit test class
- *
- * @author srinivasa-vasu
  */
 public class YugabyteDBYCQLTest {
 
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
index 3061f2a1ace..2cf0b0b15c1 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
@@ -11,8 +11,6 @@
 
 /**
  * YugabyteDB YSQL API unit test class
- *
- * @author srinivasa-vasu
  */
 public class YugabyteDBYSQLTest extends AbstractContainerDatabaseTest {
 

From 2c4caadc3d88bea2e75f9b83cbfe122995ca9bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Feb 2023 12:05:17 -0600
Subject: [PATCH 2743/4969] Update docker-java version to 3.3.0 (#6645)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0ee4f3b4bac..bd8a7f6aebe 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -77,8 +77,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.2.14')
-    shaded platform('com.github.docker-java:docker-java-bom:3.2.14')
+    api platform('com.github.docker-java:docker-java-bom:3.3.0')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.0')
 
     api "com.github.docker-java:docker-java-api"
 

From 3ca5e674fbc594362ebb93266302967879c64c19 Mon Sep 17 00:00:00 2001
From: Silvio Giebl <silvio.giebl@hivemq.com>
Date: Thu, 16 Feb 2023 05:45:29 +0100
Subject: [PATCH 2744/4969] Log consumers are now called with exactly one
 complete log line (#5854)

Docker logs provide a stream, the frames provided are not necessarily split by newline characters. So, it might happen that a frame contains partial log lines.

Changes:
- Line splitting, partial log buffering and line merging independently of the stream type (RAW, STDOUT, STDERR)
- OutputFrame does consistently not contain newline characters (independent of TTY)
- ToStringConsumer now adds newlines
- Slf4jLogConsumer does not need to remove any newlines

Fixes #5843
---
 .../output/FrameConsumerResultCallback.java   | 171 ++++++++----------
 .../containers/output/OutputFrame.java        |  27 ++-
 .../containers/output/Slf4jLogConsumer.java   |   8 +-
 .../containers/output/ToStringConsumer.java   |   8 +-
 .../containers/output/WaitingConsumer.java    |   5 +-
 .../FrameConsumerResultCallbackTest.java      |  41 +++--
 6 files changed, 124 insertions(+), 136 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
index dfc146a8089..8b7767e2e51 100644
--- a/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
+++ b/core/src/main/java/org/testcontainers/containers/output/FrameConsumerResultCallback.java
@@ -2,16 +2,13 @@
 
 import com.github.dockerjava.api.async.ResultCallbackTemplate;
 import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Consumer;
@@ -24,27 +21,9 @@ public class FrameConsumerResultCallback extends ResultCallbackTemplate<FrameCon
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FrameConsumerResultCallback.class);
 
-    private static final byte[] EMPTY_LINE = new byte[0];
+    private final Map<OutputFrame.OutputType, LineConsumer> consumers = new HashMap<>();
 
-    private static final Pattern ANSI_COLOR_PATTERN = Pattern.compile("\u001B\\[[0-9;]+m");
-
-    private static final String LINE_BREAK_REGEX = "((\\r?\\n)|(\\r))";
-
-    private static final Pattern LINE_BREAK_PATTERN = Pattern.compile(LINE_BREAK_REGEX);
-
-    static final Pattern LINE_BREAK_AT_END_PATTERN = Pattern.compile(LINE_BREAK_REGEX + "$");
-
-    private Map<OutputFrame.OutputType, Consumer<OutputFrame>> consumers;
-
-    private CountDownLatch completionLatch = new CountDownLatch(1);
-
-    private StringBuilder logString = new StringBuilder();
-
-    private OutputFrame brokenFrame;
-
-    public FrameConsumerResultCallback() {
-        consumers = new HashMap<>();
-    }
+    private final CountDownLatch completionLatch = new CountDownLatch(1);
 
     /**
      * Set this callback to use the specified consumer for the given output type.
@@ -53,23 +32,19 @@ public FrameConsumerResultCallback() {
      * @param consumer the consumer to use for that output type
      */
     public void addConsumer(OutputFrame.OutputType outputType, Consumer<OutputFrame> consumer) {
-        consumers.put(outputType, consumer);
+        consumers.put(outputType, new LineConsumer(outputType, consumer));
     }
 
     @Override
     public void onNext(Frame frame) {
         if (frame != null) {
-            OutputFrame outputFrame = OutputFrame.forFrame(frame);
-            if (outputFrame != null) {
-                Consumer<OutputFrame> consumer = consumers.get(outputFrame.getType());
+            final OutputFrame.OutputType type = OutputFrame.OutputType.forStreamType(frame.getStreamType());
+            if (type != null) {
+                final LineConsumer consumer = consumers.get(type);
                 if (consumer == null) {
                     LOGGER.error("got frame with type {}, for which no handler is configured", frame.getStreamType());
-                } else if (outputFrame.getBytes() != null && outputFrame.getBytes().length > 0) {
-                    if (frame.getStreamType() == StreamType.RAW) {
-                        processRawFrame(outputFrame, consumer);
-                    } else {
-                        processOtherFrame(outputFrame, consumer);
-                    }
+                } else if (frame.getPayload() != null) {
+                    consumer.processFrame(frame.getPayload());
                 }
             }
         }
@@ -85,19 +60,12 @@ public void onError(Throwable throwable) {
 
     @Override
     public void close() throws IOException {
-        OutputFrame lastLine = null;
-
-        if (logString.length() > 0) {
-            lastLine = new OutputFrame(OutputFrame.OutputType.STDOUT, logString.toString().getBytes());
+        if (completionLatch.getCount() == 0) {
+            return;
         }
 
-        // send an END frame to every consumer... but only once per consumer.
-        for (Consumer<OutputFrame> consumer : new HashSet<>(consumers.values())) {
-            if (lastLine != null) {
-                consumer.accept(lastLine);
-            }
-            consumer.accept(OutputFrame.END);
-        }
+        consumers.values().forEach(LineConsumer::processBuffer);
+        consumers.values().forEach(LineConsumer::end);
         super.close();
 
         completionLatch.countDown();
@@ -110,70 +78,75 @@ public CountDownLatch getCompletionLatch() {
         return completionLatch;
     }
 
-    private synchronized void processRawFrame(OutputFrame outputFrame, Consumer<OutputFrame> consumer) {
-        String utf8String = outputFrame.getUtf8String();
-        byte[] bytes = outputFrame.getBytes();
+    private static class LineConsumer {
 
-        // Merging the strings by bytes to solve the problem breaking non-latin unicode symbols.
-        if (brokenFrame != null) {
-            bytes = merge(brokenFrame.getBytes(), bytes);
-            utf8String = new String(bytes);
-            brokenFrame = null;
-        }
-        // Logger chunks can break the string in middle of multibyte unicode character.
-        // Backup the bytes to reconstruct proper char sequence with bytes from next frame.
-        int lastCharacterType = Character.getType(utf8String.charAt(utf8String.length() - 1));
-        if (lastCharacterType == Character.OTHER_SYMBOL) {
-            brokenFrame = new OutputFrame(outputFrame.getType(), bytes);
-            return;
-        }
+        private static final Pattern ANSI_COLOR_PATTERN = Pattern.compile("\u001B\\[[0-9;]+m");
 
-        utf8String = processAnsiColorCodes(utf8String, consumer);
-        normalizeLogLines(utf8String, consumer);
-    }
+        private final OutputFrame.OutputType type;
 
-    private synchronized void processOtherFrame(OutputFrame outputFrame, Consumer<OutputFrame> consumer) {
-        String utf8String = outputFrame.getUtf8String();
+        private final Consumer<OutputFrame> consumer;
 
-        utf8String = processAnsiColorCodes(utf8String, consumer);
-        consumer.accept(new OutputFrame(outputFrame.getType(), utf8String.getBytes()));
-    }
+        private final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 
-    private void normalizeLogLines(String utf8String, Consumer<OutputFrame> consumer) {
-        // Reformat strings to normalize new lines.
-        List<String> lines = new ArrayList<>(Arrays.asList(LINE_BREAK_PATTERN.split(utf8String)));
-        if (lines.isEmpty()) {
-            consumer.accept(new OutputFrame(OutputFrame.OutputType.STDOUT, EMPTY_LINE));
-            return;
-        }
-        if (utf8String.startsWith("\n") || utf8String.startsWith("\r")) {
-            lines.add(0, "");
+        private boolean lastCR = false;
+
+        LineConsumer(final OutputFrame.OutputType type, final Consumer<OutputFrame> consumer) {
+            this.type = type;
+            this.consumer = consumer;
         }
-        if (utf8String.endsWith("\n") || utf8String.endsWith("\r")) {
-            lines.add("");
+
+        void processFrame(final byte[] b) {
+            int start = 0;
+            int i = 0;
+            while (i < b.length) {
+                switch (b[i]) {
+                    case '\n':
+                        buffer.write(b, start, i + 1 - start);
+                        start = i + 1;
+                        consume();
+                        lastCR = false;
+                        break;
+                    case '\r':
+                        if (lastCR) {
+                            consume();
+                        }
+                        buffer.write(b, start, i + 1 - start);
+                        start = i + 1;
+                        lastCR = true;
+                        break;
+                    default:
+                        if (lastCR) {
+                            consume();
+                        }
+                        lastCR = false;
+                }
+                i++;
+            }
+            buffer.write(b, start, b.length - start);
         }
-        for (int i = 0; i < lines.size() - 1; i++) {
-            String line = lines.get(i);
-            if (i == 0 && logString.length() > 0) {
-                line = logString.toString() + line;
-                logString.setLength(0);
+
+        void processBuffer() {
+            if (buffer.size() > 0) {
+                consume();
             }
-            consumer.accept(new OutputFrame(OutputFrame.OutputType.STDOUT, line.getBytes()));
         }
-        logString.append(lines.get(lines.size() - 1));
-    }
 
-    private String processAnsiColorCodes(String utf8String, Consumer<OutputFrame> consumer) {
-        if (!(consumer instanceof BaseConsumer) || ((BaseConsumer) consumer).isRemoveColorCodes()) {
-            return ANSI_COLOR_PATTERN.matcher(utf8String).replaceAll("");
+        void end() {
+            consumer.accept(OutputFrame.END);
         }
-        return utf8String;
-    }
 
-    private byte[] merge(byte[] str1, byte[] str2) {
-        byte[] mergedString = new byte[str1.length + str2.length];
-        System.arraycopy(str1, 0, mergedString, 0, str1.length);
-        System.arraycopy(str2, 0, mergedString, str1.length, str2.length);
-        return mergedString;
+        private void consume() {
+            final String string = new String(buffer.toByteArray(), StandardCharsets.UTF_8);
+            final byte[] bytes = processAnsiColorCodes(string).getBytes(StandardCharsets.UTF_8);
+            consumer.accept(new OutputFrame(type, bytes));
+            buffer.reset();
+        }
+
+        private String processAnsiColorCodes(final String utf8String) {
+            if (!(consumer instanceof BaseConsumer) || ((BaseConsumer<?>) consumer).isRemoveColorCodes()) {
+                return ANSI_COLOR_PATTERN.matcher(utf8String).replaceAll("");
+            }
+            return utf8String;
+        }
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java b/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java
index f6eb5c18cbc..ad0c920cbf8 100644
--- a/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java
+++ b/core/src/main/java/org/testcontainers/containers/output/OutputFrame.java
@@ -2,10 +2,11 @@
 
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
-import com.google.common.base.Charsets;
+
+import java.nio.charset.StandardCharsets;
 
 /**
- * Holds a frame of container output (usually one line, possibly more)
+ * Holds exactly one complete line of container output. Lines are split on newline characters (LF, CR LF).
  */
 public class OutputFrame {
 
@@ -15,7 +16,7 @@ public class OutputFrame {
 
     private final byte[] bytes;
 
-    public OutputFrame(OutputType type, byte[] bytes) {
+    public OutputFrame(final OutputType type, final byte[] bytes) {
         this.type = type;
         this.bytes = bytes;
     }
@@ -29,11 +30,26 @@ public byte[] getBytes() {
     }
 
     public String getUtf8String() {
+        return (bytes == null) ? "" : new String(bytes, StandardCharsets.UTF_8);
+    }
+
+    public String getUtf8StringWithoutLineEnding() {
         if (bytes == null) {
             return "";
         }
+        return new String(bytes, 0, bytes.length - determineLineEndingLength(bytes), StandardCharsets.UTF_8);
+    }
 
-        return new String(bytes, Charsets.UTF_8);
+    private static int determineLineEndingLength(final byte[] bytes) {
+        if (bytes.length > 0) {
+            switch (bytes[bytes.length - 1]) {
+                case '\r':
+                    return 1;
+                case '\n':
+                    return ((bytes.length > 1) && (bytes[bytes.length - 2] == '\r')) ? 2 : 1;
+            }
+        }
+        return 0;
     }
 
     public enum OutputType {
@@ -44,7 +60,6 @@ public enum OutputType {
         public static OutputType forStreamType(StreamType streamType) {
             switch (streamType) {
                 case RAW:
-                    return STDOUT;
                 case STDOUT:
                     return STDOUT;
                 case STDERR:
@@ -56,7 +71,7 @@ public static OutputType forStreamType(StreamType streamType) {
     }
 
     public static OutputFrame forFrame(Frame frame) {
-        OutputType outputType = OutputType.forStreamType(frame.getStreamType());
+        final OutputType outputType = OutputType.forStreamType(frame.getStreamType());
         if (outputType == null) {
             return null;
         }
diff --git a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
index 6eff93ae4c8..a683781f213 100644
--- a/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java
@@ -50,12 +50,10 @@ public Slf4jLogConsumer withSeparateOutputStreams() {
 
     @Override
     public void accept(OutputFrame outputFrame) {
-        OutputFrame.OutputType outputType = outputFrame.getType();
+        final OutputFrame.OutputType outputType = outputFrame.getType();
+        final String utf8String = outputFrame.getUtf8StringWithoutLineEnding();
 
-        String utf8String = outputFrame.getUtf8String();
-        utf8String = FrameConsumerResultCallback.LINE_BREAK_AT_END_PATTERN.matcher(utf8String).replaceAll("");
-
-        Map<String, String> originalMdc = MDC.getCopyOfContextMap();
+        final Map<String, String> originalMdc = MDC.getCopyOfContextMap();
         MDC.setContextMap(mdc);
         try {
             switch (outputType) {
diff --git a/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java b/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
index 444434fa702..490e8d70cba 100644
--- a/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/ToStringConsumer.java
@@ -11,14 +11,14 @@
  */
 public class ToStringConsumer extends BaseConsumer<ToStringConsumer> {
 
-    private ByteArrayOutputStream stringBuffer = new ByteArrayOutputStream();
+    private final ByteArrayOutputStream stringBuffer = new ByteArrayOutputStream();
 
     @Override
     public void accept(OutputFrame outputFrame) {
         try {
-            if (outputFrame.getBytes() != null) {
-                stringBuffer.write(outputFrame.getBytes());
-                stringBuffer.flush();
+            final byte[] bytes = outputFrame.getBytes();
+            if (bytes != null) {
+                stringBuffer.write(bytes);
             }
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
index e9b34692319..b7a12167597 100644
--- a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
@@ -82,11 +82,10 @@ private void waitUntil(Predicate<OutputFrame> predicate, long expiry, int times)
         int numberOfMatches = 0;
         while (System.currentTimeMillis() < expiry) {
             try {
-                OutputFrame frame = frames.pollLast(100, TimeUnit.MILLISECONDS);
+                final OutputFrame frame = frames.pollLast(100, TimeUnit.MILLISECONDS);
 
                 if (frame != null) {
-                    final String trimmedFrameText = frame.getUtf8String().replaceFirst("\n$", "");
-                    LOGGER.debug("{}: {}", frame.getType(), trimmedFrameText);
+                    LOGGER.debug("{}: {}", frame.getType(), frame.getUtf8StringWithoutLineEnding());
 
                     if (predicate.test(frame)) {
                         numberOfMatches++;
diff --git a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
index 298e7a981a0..f6e513c1fd8 100644
--- a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
@@ -20,86 +20,95 @@ public class FrameConsumerResultCallbackTest {
     private static final String LOG_RESULT = "Тест1\nTest2\nTest3";
 
     @Test
-    public void passStderrFrameWithoutColors() {
+    public void passStderrFrameWithoutColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
         callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo(LOG_RESULT);
     }
 
     @Test
-    public void passStderrFrameWithColors() {
+    public void passStderrFrameWithColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
         callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo(FRAME_PAYLOAD);
     }
 
     @Test
-    public void passStdoutFrameWithoutColors() {
+    public void passStdoutFrameWithoutColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo(LOG_RESULT);
     }
 
     @Test
-    public void passStdoutFrameWithColors() {
+    public void passStdoutFrameWithColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo(FRAME_PAYLOAD);
     }
 
     @Test
-    public void basicConsumer() {
+    public void basicConsumer() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         BasicConsumer consumer = new BasicConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
+        callback.close();
         assertThat(consumer.toString()).isEqualTo(LOG_RESULT);
     }
 
     @Test
-    public void passStdoutNull() {
+    public void passStdoutNull() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, null));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo("");
     }
 
     @Test
-    public void passStdoutEmptyLine() {
+    public void passStdoutEmptyLine() throws IOException {
         String payload = "";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo(payload);
     }
 
     @Test
-    public void passStdoutSingleLine() {
+    public void passStdoutSingleLine() throws IOException {
         String payload = "Test";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo(payload);
     }
 
     @Test
-    public void passStdoutSingleLineWithNewline() {
+    public void passStdoutSingleLineWithNewline() throws IOException {
         String payload = "Test\n";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
         callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
+        callback.close();
         assertThat(consumer.toUtf8String()).isEqualTo(payload);
     }
 
@@ -110,12 +119,12 @@ public void passRawFrameWithoutColors() throws TimeoutException, IOException {
         callback.addConsumer(OutputFrame.OutputType.STDOUT, waitConsumer);
         callback.onNext(new Frame(StreamType.RAW, FRAME_PAYLOAD.getBytes()));
         waitConsumer.waitUntil(
-            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Test2"),
+            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Test2\n"),
             1,
             TimeUnit.SECONDS
         );
         waitConsumer.waitUntil(
-            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Тест1"),
+            frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Тест1\n"),
             1,
             TimeUnit.SECONDS
         );
@@ -148,7 +157,7 @@ public void passRawFrameWithColors() throws TimeoutException, IOException {
             frame -> {
                 return (
                     frame.getType() == OutputFrame.OutputType.STDOUT &&
-                    frame.getUtf8String().equals("\u001B[1;33mTest2\u001B[0m")
+                    frame.getUtf8String().equals("\u001B[1;33mTest2\u001B[0m\n")
                 );
             },
             1,
@@ -158,7 +167,7 @@ public void passRawFrameWithColors() throws TimeoutException, IOException {
             frame -> {
                 return (
                     frame.getType() == OutputFrame.OutputType.STDOUT &&
-                    frame.getUtf8String().equals("\u001B[0;32mТест1\u001B[0m")
+                    frame.getUtf8String().equals("\u001B[0;32mТест1\u001B[0m\n")
                 );
             },
             1,
@@ -212,16 +221,10 @@ public void reconstructBreakedUnicode() throws IOException {
 
     private static class BasicConsumer implements Consumer<OutputFrame> {
 
-        private boolean firstLine = true;
-
         private StringBuilder input = new StringBuilder();
 
         @Override
         public void accept(OutputFrame outputFrame) {
-            if (!firstLine) {
-                input.append('\n');
-            }
-            firstLine = false;
             input.append(outputFrame.getUtf8String());
         }
 

From 68a9da5eaf41f5452a48b2b121f20cd909d0998c Mon Sep 17 00:00:00 2001
From: Falko Modler <famod@users.noreply.github.com>
Date: Thu, 16 Feb 2023 05:49:40 +0100
Subject: [PATCH 2745/4969] Ensure readability of MySQL and MariaDB config
 override (#6625)

---
 .../containers/JdbcDatabaseContainer.java     | 13 ++++-
 .../containers/MariaDBContainer.java          |  4 +-
 .../junit/mariadb/SimpleMariaDBTest.java      | 52 +++++++++++++++++--
 .../containers/MySQLContainer.java            |  4 +-
 .../junit/mysql/SimpleMySQLTest.java          | 49 +++++++++++++++--
 5 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index e9b34a1ad05..7ea5bcb3610 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -5,6 +5,7 @@
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.delegate.DatabaseDelegate;
 import org.testcontainers.ext.ScriptUtils;
@@ -300,15 +301,25 @@ protected String constructUrlParameters(String startCharacter, String delimiter,
         return urlParameters;
     }
 
+    @Deprecated
     protected void optionallyMapResourceParameterAsVolume(
         @NotNull String paramName,
         @NotNull String pathNameInContainer,
         @NotNull String defaultResource
+    ) {
+        optionallyMapResourceParameterAsVolume(paramName, pathNameInContainer, defaultResource, null);
+    }
+
+    protected void optionallyMapResourceParameterAsVolume(
+        @NotNull String paramName,
+        @NotNull String pathNameInContainer,
+        @NotNull String defaultResource,
+        @Nullable Integer fileMode
     ) {
         String resourceName = parameters.getOrDefault(paramName, defaultResource);
 
         if (resourceName != null) {
-            final MountableFile mountableFile = MountableFile.forClasspathResource(resourceName);
+            final MountableFile mountableFile = MountableFile.forClasspathResource(resourceName, fileMode);
             withCopyFileToContainer(mountableFile, pathNameInContainer);
         }
     }
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 8717d2ecda7..71cc76135cf 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.common.collect.Sets;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.Set;
@@ -65,7 +66,8 @@ protected void configure() {
         optionallyMapResourceParameterAsVolume(
             MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
             "/etc/mysql/conf.d",
-            "mariadb-default-conf"
+            "mariadb-default-conf",
+            Transferable.DEFAULT_DIR_MODE
         );
 
         addEnv("MYSQL_DATABASE", databaseName);
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index e403a09b382..fff2386a2df 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -6,10 +6,19 @@
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
+import java.io.File;
+import java.net.URL;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.attribute.PosixFilePermission;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.junit.Assume.assumeFalse;
 
 public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
@@ -56,10 +65,7 @@ public void testMariaDBWithCustomIniFile() throws SQLException {
         ) {
             mariadbCustomConfig.start();
 
-            ResultSet resultSet = performQuery(mariadbCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
-            String result = resultSet.getString(1);
-
-            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
+            assertThatCustomIniFileWasUsed(mariadbCustomConfig);
         }
     }
 
@@ -94,4 +100,42 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
             mariaDBContainer.stop();
         }
     }
+
+    @Test
+    public void testWithOnlyUserReadableCustomIniFile() throws Exception {
+        assumeThat(FileSystems.getDefault().supportedFileAttributeViews().contains("posix")).isTrue();
+
+        try (
+            MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(
+                MariaDBTestImages.MARIADB_IMAGE.withTag("10.1.16")
+            )
+                .withConfigurationOverride("somepath/mariadb_conf_override")
+        ) {
+            URL resource = this.getClass().getClassLoader().getResource("somepath/mariadb_conf_override");
+
+            File file = new File(resource.toURI());
+            assertThat(file.isDirectory()).isTrue();
+
+            Set<PosixFilePermission> permissions = new HashSet<>(
+                Arrays.asList(
+                    PosixFilePermission.OWNER_READ,
+                    PosixFilePermission.OWNER_WRITE,
+                    PosixFilePermission.OWNER_EXECUTE
+                )
+            );
+
+            Files.setPosixFilePermissions(file.toPath(), permissions);
+
+            mariadbCustomConfig.start();
+
+            assertThatCustomIniFileWasUsed(mariadbCustomConfig);
+        }
+    }
+
+    private void assertThatCustomIniFileWasUsed(MariaDBContainer<?> mariadb) throws SQLException {
+        try (ResultSet resultSet = performQuery(mariadb, "SELECT @@GLOBAL.innodb_file_format")) {
+            String result = resultSet.getString(1);
+            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
+        }
+    }
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 0851dafdbc2..44fcc2b8b1d 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.jetbrains.annotations.NotNull;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.Set;
@@ -68,7 +69,8 @@ protected void configure() {
         optionallyMapResourceParameterAsVolume(
             MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
             "/etc/mysql/conf.d",
-            "mysql-default-conf"
+            "mysql-default-conf",
+            Transferable.DEFAULT_DIR_MODE
         );
 
         addEnv("MYSQL_DATABASE", databaseName);
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index e39c55b85a9..b45585642a1 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -9,6 +9,11 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
+import java.io.File;
+import java.net.URL;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.attribute.PosixFilePermission;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -17,9 +22,13 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
@@ -84,10 +93,7 @@ public void testMySQLWithCustomIniFile() throws SQLException {
         ) {
             mysqlCustomConfig.start();
 
-            ResultSet resultSet = performQuery(mysqlCustomConfig, "SELECT @@GLOBAL.innodb_file_format");
-            String result = resultSet.getString(1);
-
-            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
+            assertThatCustomIniFileWasUsed(mysqlCustomConfig);
         }
     }
 
@@ -234,8 +240,43 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         }
     }
 
+    @Test
+    public void testWithOnlyUserReadableCustomIniFile() throws Exception {
+        assumeThat(FileSystems.getDefault().supportedFileAttributeViews().contains("posix")).isTrue();
+        try (
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+                .withConfigurationOverride("somepath/mysql_conf_override")
+                .withLogConsumer(new Slf4jLogConsumer(logger))
+        ) {
+            URL resource = this.getClass().getClassLoader().getResource("somepath/mysql_conf_override");
+
+            File file = new File(resource.toURI());
+            assertThat(file.isDirectory()).isTrue();
+
+            Set<PosixFilePermission> permissions = new HashSet<>(
+                Arrays.asList(
+                    PosixFilePermission.OWNER_READ,
+                    PosixFilePermission.OWNER_WRITE,
+                    PosixFilePermission.OWNER_EXECUTE
+                )
+            );
+
+            Files.setPosixFilePermissions(file.toPath(), permissions);
+
+            mysql.start();
+            assertThatCustomIniFileWasUsed(mysql);
+        }
+    }
+
     private void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer<?> mysql) {
         assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT);
         assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT));
     }
+
+    private void assertThatCustomIniFileWasUsed(MySQLContainer<?> mysql) throws SQLException {
+        try (ResultSet resultSet = performQuery(mysql, "SELECT @@GLOBAL.innodb_file_format")) {
+            String result = resultSet.getString(1);
+            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
+        }
+    }
 }

From 7d1cf6b4ce2c9f599d8ea0b3aecaafa42661dff1 Mon Sep 17 00:00:00 2001
From: Etienne Dysli Metref <edysli@users.noreply.github.com>
Date: Thu, 16 Feb 2023 19:10:34 +0100
Subject: [PATCH 2746/4969] Move junit-jupiter-api's dependency configuration
 to implementation (#5985)

Stop exposing `org.junit.jupiter:junit-jupiter-api` as a transitive
dependency of `org.testcontainers:junit-jupiter` by including it using
the `implementation` configuration instead of `api`. This should
prevent conflicts with dependencies on JUnit 5 declared by users of
`org.testcontainers:junit-jupiter`.

Also use JUnit's BOM to simplify version management of all included
JUnit artifacts. For running this module's tests, a
`testImplementation` dependency on `org.junit.jupiter:junit-jupiter`
is enough, as recommended in the [JUnit 5 User Guide][junit5guide].

Fixes: #5680
---
 examples/neo4j-container/build.gradle | 1 +
 modules/junit-jupiter/build.gradle    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 1c6795648e3..e571e0e9944 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,4 +11,5 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index afe3a278ad8..315b3c534d1 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,8 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.9.2'
+    implementation platform('org.junit:junit-bom:5.9.2')
+    implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
@@ -13,11 +14,10 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
 }
 
 test {

From 1f34c517f72a73eb98babb9dff61501f55894541 Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Thu, 16 Feb 2023 19:32:14 +0100
Subject: [PATCH 2747/4969] Removed deprecated methods and undeclared
 transitive dependency to AWS SDK v1 (#5827)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>

Fixes #4279
---
 modules/localstack/build.gradle               |  8 ++-
 .../localstack/LocalStackContainer.java       | 63 -------------------
 2 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index f97cb52a753..ee5a93f669d 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,10 +3,16 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.406'
     testImplementation 'software.amazon.awssdk:s3:2.20.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.containers.localstack.LocalStackContainer#getEndpointConfiguration(org.testcontainers.containers.localstack.LocalStackContainer\$Service)",
+        "org.testcontainers.containers.localstack.LocalStackContainer#getDefaultCredentialsProvider()"
+    ]
+}
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 52992011fbf..6da5857adaa 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -1,9 +1,5 @@
 package org.testcontainers.containers.localstack;
 
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
@@ -201,38 +197,6 @@ public LocalStackContainer withServices(EnabledService... services) {
         return self();
     }
 
-    /**
-     * Provides an endpoint configuration that is preconfigured to communicate with a given simulated service.
-     * The provided endpoint configuration should be set in the AWS Java SDK when building a client, e.g.:
-     * <pre><code>AmazonS3 s3 = AmazonS3ClientBuilder
-            .standard()
-            .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
-            .withCredentials(localstack.getDefaultCredentialsProvider())
-            .build();
-     </code></pre>
-     * or for AWS SDK v2
-     * <pre><code>S3Client s3 = S3Client
-             .builder()
-             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
-             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
-                localstack.getAccessKey(), localstack.getSecretKey()
-             )))
-             .region(Region.of(localstack.getRegion()))
-             .build()
-     </code></pre>
-     * <p><strong>Please note that this method is only intended to be used for configuring AWS SDK clients
-     * that are running on the test host. If other containers need to call this one, they should be configured
-     * specifically to do so using a Docker network and appropriate addressing.</strong></p>
-     *
-     * @param service the service that is to be accessed
-     * @return an {@link AwsClientBuilder.EndpointConfiguration}
-     * @deprecated {@link LocalStackContainer} will not depend on aws sdk.
-     */
-    @Deprecated
-    public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(Service service) {
-        return new AwsClientBuilder.EndpointConfiguration(getEndpointOverride(service).toString(), getRegion());
-    }
-
     public URI getEndpointOverride(Service service) {
         return getEndpointOverride((EnabledService) service);
     }
@@ -272,33 +236,6 @@ private int getServicePort(EnabledService service) {
         return legacyMode ? service.getPort() : PORT;
     }
 
-    /**
-     * Provides a {@link AWSCredentialsProvider} that is preconfigured to communicate with a given simulated service.
-     * The credentials provider should be set in the AWS Java SDK when building a client, e.g.:
-     * <pre><code>AmazonS3 s3 = AmazonS3ClientBuilder
-            .standard()
-            .withEndpointConfiguration(localstack.getEndpointConfiguration(S3))
-            .withCredentials(localstack.getDefaultCredentialsProvider())
-            .build();
-     </code></pre>
-     * or for AWS SDK v2 you can use {@link #getAccessKey()}, {@link #getSecretKey()} directly:
-     * <pre><code>S3Client s3 = S3Client
-             .builder()
-             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
-             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
-             localstack.getAccessKey(), localstack.getSecretKey()
-             )))
-             .region(Region.of(localstack.getRegion()))
-             .build()
-     </code></pre>
-     * @return an {@link AWSCredentialsProvider}
-     * @deprecated {@link LocalStackContainer} will not depend on aws sdk.
-     */
-    @Deprecated
-    public AWSCredentialsProvider getDefaultCredentialsProvider() {
-        return new AWSStaticCredentialsProvider(new BasicAWSCredentials(getAccessKey(), getSecretKey()));
-    }
-
     /**
      * Provides a default access key that is preconfigured to communicate with a given simulated service.
      * The access key can be used to construct AWS SDK v2 clients:

From 644c0583ecd1aced91cbeadc2a00b41f0f879a68 Mon Sep 17 00:00:00 2001
From: Daniel PETISME <daniel.petisme@gmail.com>
Date: Fri, 17 Feb 2023 03:15:47 +0100
Subject: [PATCH 2748/4969] [kafka] Add Kraft mode support (#6129)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/modules/kafka.md                         |  10 ++
 .../KafkaContainerClusterTest.java            |  12 ++
 .../KafkaContainerKraftCluster.java           | 106 ++++++++++++
 modules/kafka/build.gradle                    |   6 +
 .../containers/KafkaContainer.java            | 157 ++++++++++++++----
 .../containers/KafkaContainerTest.java        |  57 ++++++-
 6 files changed, 318 insertions(+), 30 deletions(-)
 create mode 100644 examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 9b222cef125..691c4f10bf8 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -32,6 +32,16 @@ If for some reason you want to use an externally running Zookeeper, then just pa
 [External Zookeeper](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withExternalZookeeper
 <!--/codeinclude-->
 
+### Using Kraft mode
+
+The self-managed (Kraft) mode is available as a preview feature since version 3.0 (confluentinc/cp-kafka:7.0.x) and 
+declared as a production ready in 3.3.1 (confluentinc/cp-kafka:7.3.x).
+
+<!--codeinclude-->
+[Kraft mode](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withKraftMode
+<!--/codeinclude-->
+
+See the [versions interoperability matrix](https://docs.confluent.io/platform/current/installation/versions-interoperability.html) for more details. 
 
 ## Multi-container usage
 
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
index 63253f4b309..60790514825 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
@@ -39,6 +39,18 @@ public void testKafkaContainerCluster() throws Exception {
         }
     }
 
+    @Test
+    public void testKafkaContainerKraftCluster() throws Exception {
+        try (KafkaContainerKraftCluster cluster = new KafkaContainerKraftCluster("7.0.0", 3, 2)) {
+            cluster.start();
+            String bootstrapServers = cluster.getBootstrapServers();
+
+            assertThat(cluster.getBrokers()).hasSize(3);
+
+            testKafkaFunctionality(bootstrapServers, 3, 2);
+        }
+    }
+
     protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
         try (
             AdminClient adminClient = AdminClient.create(
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
new file mode 100644
index 00000000000..4411cb14540
--- /dev/null
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
@@ -0,0 +1,106 @@
+package com.example.kafkacluster;
+
+import org.apache.kafka.common.Uuid;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class KafkaContainerKraftCluster implements Startable {
+
+    private final int brokersNum;
+
+    private final Network network;
+
+    private final Collection<KafkaContainer> brokers;
+
+    public KafkaContainerKraftCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) {
+        if (brokersNum < 0) {
+            throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
+        }
+        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+            throw new IllegalArgumentException(
+                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+            );
+        }
+
+        this.brokersNum = brokersNum;
+        this.network = Network.newNetwork();
+
+        String controllerQuorumVoters = IntStream
+            .range(0, brokersNum)
+            .mapToObj(brokerNum -> String.format("%d@broker-%d:9094", brokerNum, brokerNum))
+            .collect(Collectors.joining(","));
+
+        String clusterId = Uuid.randomUuid().toString();
+
+        this.brokers =
+            IntStream
+                .range(0, brokersNum)
+                .mapToObj(brokerNum -> {
+                    return new KafkaContainer(
+                        DockerImageName.parse("confluentinc/cp-kafka").withTag(confluentPlatformVersion)
+                    )
+                        .withNetwork(this.network)
+                        .withNetworkAliases("broker-" + brokerNum)
+                        .withKraft()
+                        .withClusterId(clusterId)
+                        .withEnv("KAFKA_BROKER_ID", brokerNum + "")
+                        .withEnv("KAFKA_NODE_ID", brokerNum + "")
+                        .withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters)
+                        .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
+                        .withStartupTimeout(Duration.ofMinutes(1));
+                })
+                .collect(Collectors.toList());
+    }
+
+    public Collection<KafkaContainer> getBrokers() {
+        return this.brokers;
+    }
+
+    public String getBootstrapServers() {
+        return brokers.stream().map(KafkaContainer::getBootstrapServers).collect(Collectors.joining(","));
+    }
+
+    @Override
+    public void start() {
+        // Needs to start all the brokers at once
+        brokers.parallelStream().forEach(GenericContainer::start);
+
+        Unreliables.retryUntilTrue(
+            30,
+            TimeUnit.SECONDS,
+            () -> {
+                Container.ExecResult result =
+                    this.brokers.stream()
+                        .findFirst()
+                        .get()
+                        .execInContainer(
+                            "sh",
+                            "-c",
+                            "kafka-metadata-shell --snapshot /var/lib/kafka/data/__cluster_metadata-0/00000000000000000000.log ls /brokers | wc -l"
+                        );
+                String brokers = result.getStdout().replace("\n", "");
+
+                return brokers != null && Integer.valueOf(brokers) == this.brokersNum;
+            }
+        );
+    }
+
+    @Override
+    public void stop() {
+        this.brokers.stream().parallel().forEach(GenericContainer::stop);
+    }
+}
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 9728203a87c..8bf0ae60617 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -7,3 +7,9 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.containers.KafkaContainer#containerIsStarted(com.github.dockerjava.api.command.InspectContainerResponse)"
+    ]
+}
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 02342351b83..32bfc366896 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -1,9 +1,13 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import lombok.SneakyThrows;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.IOException;
+
 /**
  * This container wraps Confluent Kafka and Zookeeper (optionally)
  *
@@ -20,8 +24,17 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
 
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
+    // https://docs.confluent.io/platform/7.0.0/release-notes/index.html#ak-raft-kraft
+    private static final String MIN_KRAFT_TAG = "7.0.0";
+
     protected String externalZookeeperConnect = null;
 
+    private boolean kraftEnabled = false;
+
+    private String clusterId;
+
     /**
      * @deprecated use {@link KafkaContainer(DockerImageName)} instead
      */
@@ -42,8 +55,6 @@ public KafkaContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        withExposedPorts(KAFKA_PORT);
-
         // Use two listeners with different names, it will force Kafka to communicate with itself via internal
         // listener when KAFKA_INTER_BROKER_LISTENER_NAME is set, otherwise Kafka will try to use the advertised listener
         withEnv("KAFKA_LISTENERS", "PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092");
@@ -57,67 +68,155 @@ public KafkaContainer(final DockerImageName dockerImageName) {
         withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", DEFAULT_INTERNAL_TOPIC_RF);
         withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
         withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
+
+        withExposedPorts(KAFKA_PORT);
+
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.withEntrypoint("sh");
+        });
+        withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
     }
 
     public KafkaContainer withEmbeddedZookeeper() {
+        if (this.kraftEnabled) {
+            throw new IllegalStateException("Cannot configure Zookeeper when using Kraft mode");
+        }
         externalZookeeperConnect = null;
         return self();
     }
 
     public KafkaContainer withExternalZookeeper(String connectString) {
+        if (this.kraftEnabled) {
+            throw new IllegalStateException("Cannot configure Zookeeper when using Kraft mode");
+        }
         externalZookeeperConnect = connectString;
         return self();
     }
 
+    public KafkaContainer withKraft() {
+        if (this.externalZookeeperConnect != null) {
+            throw new IllegalStateException("Cannot configure Kraft mode when Zookeeper configured");
+        }
+        verifyMinKraftVersion();
+        kraftEnabled = true;
+        return self();
+    }
+
+    private void verifyMinKraftVersion() {
+        String actualVersion = DockerImageName.parse(getDockerImageName()).getVersionPart();
+        if (new ComparableVersion(actualVersion).isLessThan(MIN_KRAFT_TAG)) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "Provided Confluent Platform's version %s is not supported in Kraft mode (must be %s or above)",
+                    actualVersion,
+                    MIN_KRAFT_TAG
+                )
+            );
+        }
+    }
+
+    public KafkaContainer withClusterId(String clusterId) {
+        this.clusterId = clusterId;
+        return self();
+    }
+
     public String getBootstrapServers() {
         return String.format("PLAINTEXT://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
     }
 
     @Override
     protected void configure() {
+        if (kraftEnabled) {
+            waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
+            configureKraft();
+        } else {
+            waitingFor(Wait.forLogMessage(".*\\[KafkaServer id=\\d+\\] started.*", 1));
+            configureZookeeper();
+        }
+    }
+
+    protected void configureKraft() {
+        withEnv(
+            "KAFKA_NODE_ID",
+            getEnvMap().computeIfAbsent("KAFKA_NODE_ID", key -> getEnvMap().get("KAFKA_BROKER_ID"))
+        );
         withEnv(
-            "KAFKA_ADVERTISED_LISTENERS",
-            String.format("BROKER://%s:9092", getNetwork() != null ? getNetworkAliases().get(0) : "localhost")
+            "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
+            String.format("%s,CONTROLLER:PLAINTEXT", getEnvMap().get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP"))
         );
+        withEnv("KAFKA_LISTENERS", String.format("%s,CONTROLLER://0.0.0.0:9094", getEnvMap().get("KAFKA_LISTENERS")));
 
-        String command = "#!/bin/bash\n";
+        withEnv("KAFKA_PROCESS_ROLES", "broker,controller");
+        withEnv(
+            "KAFKA_CONTROLLER_QUORUM_VOTERS",
+            getEnvMap()
+                .computeIfAbsent(
+                    "KAFKA_CONTROLLER_QUORUM_VOTERS",
+                    key -> {
+                        return String.format(
+                            "%s@%s:9094",
+                            getEnvMap().get("KAFKA_NODE_ID"),
+                            getNetwork() != null ? getNetworkAliases().get(0) : "localhost"
+                        );
+                    }
+                )
+        );
+        withEnv("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
+    }
+
+    protected void configureZookeeper() {
         if (externalZookeeperConnect != null) {
             withEnv("KAFKA_ZOOKEEPER_CONNECT", externalZookeeperConnect);
         } else {
             addExposedPort(ZOOKEEPER_PORT);
             withEnv("KAFKA_ZOOKEEPER_CONNECT", "localhost:" + ZOOKEEPER_PORT);
-            command += "echo 'clientPort=" + ZOOKEEPER_PORT + "' > zookeeper.properties\n";
-            command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n";
-            command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n";
-            command += "zookeeper-server-start zookeeper.properties &\n";
         }
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        super.containerIsStarting(containerInfo);
+
+        String command = "#!/bin/bash\n";
+        // exporting KAFKA_ADVERTISED_LISTENERS with the container hostname
+        command +=
+            String.format(
+                "export KAFKA_ADVERTISED_LISTENERS=%s,%s\n",
+                getBootstrapServers(),
+                brokerAdvertisedListener(containerInfo)
+            );
+
+        command += (kraftEnabled) ? commandKraft() : commandZookeeper();
 
         // Optimization: skip the checks
         command += "echo '' > /etc/confluent/docker/ensure \n";
         // Run the original command
         command += "/etc/confluent/docker/run \n";
-        withCommand("sh", "-c", command);
+        copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
     }
 
-    @Override
-    @SneakyThrows
-    protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        String brokerAdvertisedListener = brokerAdvertisedListener(containerInfo);
-        ExecResult result = execInContainer(
-            "kafka-configs",
-            "--alter",
-            "--bootstrap-server",
-            brokerAdvertisedListener,
-            "--entity-type",
-            "brokers",
-            "--entity-name",
-            getEnvMap().get("KAFKA_BROKER_ID"),
-            "--add-config",
-            "advertised.listeners=[" + String.join(",", getBootstrapServers(), brokerAdvertisedListener) + "]"
-        );
-        if (result.getExitCode() != 0) {
-            throw new IllegalStateException(result.toString());
+    protected String commandKraft() {
+        String command = "sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure\n";
+        try {
+            if (clusterId == null) {
+                clusterId = execInContainer("kafka-storage", "random-uuid").getStdout().trim();
+            }
+        } catch (IOException | InterruptedException e) {
+            logger().error("Failed to execute `kafka-storage random-uuid`. Exception message: {}", e.getMessage());
         }
+        command +=
+            "echo 'kafka-storage format --ignore-formatted -t \"" +
+            clusterId +
+            "\" -c /etc/kafka/kafka.properties' >> /etc/confluent/docker/configure\n";
+        return command;
+    }
+
+    protected String commandZookeeper() {
+        String command = "echo 'clientPort=" + ZOOKEEPER_PORT + "' > zookeeper.properties\n";
+        command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n";
+        command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n";
+        command += "zookeeper-server-start zookeeper.properties &\n";
+        return command;
     }
 
     protected String brokerAdvertisedListener(InspectContainerResponse containerInfo) {
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index baa857cde20..bad3c8d89ef 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -31,6 +31,8 @@ public class KafkaContainerTest {
 
     private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:6.2.1");
 
+    private static final DockerImageName KAFKA_KRAFT_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:7.0.1");
+
     private static final DockerImageName ZOOKEEPER_TEST_IMAGE = DockerImageName.parse(
         "confluentinc/cp-zookeeper:4.0.0"
     );
@@ -72,7 +74,7 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
         try (
             Network network = Network.newNetwork();
             // withExternalZookeeper {
-            KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
                 .withNetwork(network)
                 .withExternalZookeeper("zookeeper:2181");
             // }
@@ -130,6 +132,59 @@ public void testWithHostExposedPortAndExternalNetwork() throws Exception {
         }
     }
 
+    @Test
+    public void testUsageKraft() throws Exception {
+        try (
+            // withKraftMode {
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.0.1")).withKraft()
+            // }
+        ) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
+    @Test
+    public void testNotSupportedKraftVersion() {
+        try (
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1")).withKraft()
+        ) {} catch (IllegalArgumentException e) {
+            assertThat(e.getMessage())
+                .isEqualTo(
+                    "Provided Confluent Platform's version 6.2.1 is not supported in Kraft mode (must be 7.0.0 or above)"
+                );
+        }
+    }
+
+    @Test
+    public void testKraftZookeeperMutualExclusion() {
+        try (
+            KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE).withKraft().withExternalZookeeper("")
+        ) {} catch (IllegalStateException e) {
+            assertThat(e.getMessage()).isEqualTo("Cannot configure Zookeeper when using Kraft mode");
+        }
+
+        try (
+            KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE).withExternalZookeeper("").withKraft()
+        ) {} catch (IllegalStateException e) {
+            assertThat(e.getMessage()).isEqualTo("Cannot configure Kraft mode when Zookeeper configured");
+        }
+
+        try (
+            KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE).withKraft().withEmbeddedZookeeper()
+        ) {} catch (IllegalStateException e) {
+            assertThat(e.getMessage()).isEqualTo("Cannot configure Zookeeper when using Kraft mode");
+        }
+    }
+
+    @Test
+    public void testKraftPrecedenceOverEmbeddedZookeeper() throws Exception {
+        try (KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE).withEmbeddedZookeeper().withKraft()) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
     protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
         testKafkaFunctionality(bootstrapServers, 1, 1);
     }

From 15a209249429e1d90b6e118d69b69356e63de926 Mon Sep 17 00:00:00 2001
From: kuki <idkuki@gmail.com>
Date: Fri, 17 Feb 2023 03:56:04 +0100
Subject: [PATCH 2749/4969] Use type long to calculate memory (#6624)

---
 .../junit4/generic/src/test/java/generic/CmdModifierTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index a32f23ca8c2..a8ace490d82 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -25,9 +25,9 @@ public class CmdModifierTest {
 
     // spotless:off
     // memory {
-    private long memoryInBytes = 32 * 1024 * 1024;
+    private long memoryInBytes = 32l * 1024l * 1024l;
 
-    private long memorySwapInBytes = 64 * 1024 * 1024;
+    private long memorySwapInBytes = 64l * 1024l * 1024l;
 
     @Rule
     public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))

From 74e8954f55401aa4fea64aed8d63e4cc3e258316 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Feb 2023 21:09:13 -0600
Subject: [PATCH 2750/4969] Update Gradle Wrapper to 8.0 (#6626)

* Update Gradle Wrapper from 7.6 to 8.0.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 7.6 to 8.0.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

---------

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 61574 -> 61608 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 61574 -> 61608 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 5094
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

delta 5107
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
I6Xdi10eY*&F8}}l

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index adb6acbd81b..c9b0f7a0a4e 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 65dcd68d65c..79a61d421cc 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 5094
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

delta 5107
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
I6Xdi10eY*&F8}}l

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bc073f67610..74e2ced04e3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65c..79a61d421cc 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

From 5b738c2cfc3e1f1382926e993362ef4a878b09a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 17 Feb 2023 12:15:25 -0600
Subject: [PATCH 2751/4969] Revert "Update Gradle Wrapper to 8.0 (#6626)"

This reverts commit 74e8954f55401aa4fea64aed8d63e4cc3e258316.
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 61608 -> 61574 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 61608 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 5107
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
I6Xdi10eY*&F8}}l

delta 5094
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

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index c9b0f7a0a4e..adb6acbd81b 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 79a61d421cc..65dcd68d65c 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 5107
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
I6Xdi10eY*&F8}}l

delta 5094
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 74e2ced04e3..bc073f67610 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d421cc..65dcd68d65c 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

From f591ac7ef68119503473bd7d09b7b3a5cf4b3db8 Mon Sep 17 00:00:00 2001
From: Oliver Rose <45789938+roseo1@users.noreply.github.com>
Date: Sat, 18 Feb 2023 08:55:47 +0000
Subject: [PATCH 2752/4969] Support `DOCKER_AUTH_CONFIG` env var (#6238)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../utility/RegistryAuthLocator.java          |  47 +++++--
 .../utility/RegistryAuthLocatorTest.java      | 133 +++++++++++++++---
 docs/supported_docker_environment/index.md    |   9 ++
 3 files changed, 163 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index bd44750a545..af2db247eb8 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.lang3.StringUtils;
@@ -33,6 +34,8 @@ public class RegistryAuthLocator {
 
     private static final String DEFAULT_REGISTRY_NAME = "https://index.docker.io/v1/";
 
+    private static final String DOCKER_AUTH_ENV_VAR = "DOCKER_AUTH_CONFIG";
+
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     private static RegistryAuthLocator instance;
@@ -43,6 +46,8 @@ public class RegistryAuthLocator {
 
     private final File configFile;
 
+    private final String configEnv;
+
     private final Map<String, Optional<AuthConfig>> cache = new ConcurrentHashMap<>();
 
     /**
@@ -54,11 +59,13 @@ public class RegistryAuthLocator {
     @VisibleForTesting
     RegistryAuthLocator(
         File configFile,
+        String configEnv,
         String commandPathPrefix,
         String commandExtension,
         Map<String, String> notFoundMessageHolderReference
     ) {
         this.configFile = configFile;
+        this.configEnv = configEnv;
         this.commandPathPrefix = commandPathPrefix;
         this.commandExtension = commandExtension;
 
@@ -72,6 +79,7 @@ protected RegistryAuthLocator() {
             .getenv()
             .getOrDefault("DOCKER_CONFIG", System.getProperty("user.home") + "/.docker");
         this.configFile = new File(dockerConfigLocation + "/config.json");
+        this.configEnv = System.getenv(DOCKER_AUTH_ENV_VAR);
         this.commandPathPrefix = "";
         this.commandExtension = "";
 
@@ -131,15 +139,8 @@ public AuthConfig lookupAuthConfig(DockerImageName dockerImageName, AuthConfig d
     }
 
     private Optional<AuthConfig> lookupUncachedAuthConfig(String registryName, DockerImageName dockerImageName) {
-        log.debug(
-            "RegistryAuthLocator has configFile: {} ({}) and commandPathPrefix: {}",
-            configFile,
-            configFile.exists() ? "exists" : "does not exist",
-            commandPathPrefix
-        );
-
         try {
-            final JsonNode config = OBJECT_MAPPER.readTree(configFile);
+            final JsonNode config = getDockerAuthConfig();
             log.debug("registryName [{}] for dockerImageName [{}]", registryName, dockerImageName);
 
             // use helper preferentially (per https://docs.docker.com/engine/reference/commandline/cli/)
@@ -162,15 +163,43 @@ private Optional<AuthConfig> lookupUncachedAuthConfig(String registryName, Docke
             }
         } catch (Exception e) {
             log.info(
-                "Failure when attempting to lookup auth config. Please ignore if you don't have images in an authenticated registry. Details: (dockerImageName: {}, configFile: {}. Falling back to docker-java default behaviour. Exception message: {}",
+                "Failure when attempting to lookup auth config. Please ignore if you don't have images in an authenticated registry. Details: (dockerImageName: {}, configFile: {}, configEnv: {}). Falling back to docker-java default behaviour. Exception message: {}",
                 dockerImageName,
                 configFile,
+                DOCKER_AUTH_ENV_VAR,
                 e.getMessage()
             );
         }
         return Optional.empty();
     }
 
+    private JsonNode getDockerAuthConfig() throws Exception {
+        log.debug(
+            "RegistryAuthLocator has configFile: {} ({}) configEnv: {} ({}) and commandPathPrefix: {}",
+            configFile,
+            configFile.exists() ? "exists" : "does not exist",
+            DOCKER_AUTH_ENV_VAR,
+            configEnv != null ? "exists" : "does not exist",
+            commandPathPrefix
+        );
+
+        if (configEnv != null) {
+            log.debug("RegistryAuthLocator reading from environment variable: {}", DOCKER_AUTH_ENV_VAR);
+            return OBJECT_MAPPER.readTree(configEnv);
+        } else if (configFile.exists()) {
+            log.debug("RegistryAuthLocator reading from configFile: {}", configFile);
+            return OBJECT_MAPPER.readTree(configFile);
+        }
+
+        throw new NotFoundException(
+            "No config supplied. Checked in order: " +
+            configFile +
+            " (file not found), " +
+            DOCKER_AUTH_ENV_VAR +
+            " (not set)"
+        );
+    }
+
     private AuthConfig findExistingAuthConfig(final JsonNode config, final String reposName) throws Exception {
         final Map.Entry<String, JsonNode> entry = findAuthNode(config, reposName);
 
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index 36d535cc0b0..835c1dff101 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -2,12 +2,16 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.io.Resources;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -16,7 +20,7 @@
 public class RegistryAuthLocatorTest {
 
     @Test
-    public void lookupAuthConfigWithoutCredentials() throws URISyntaxException {
+    public void lookupAuthConfigWithoutCredentials() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -32,7 +36,7 @@ public void lookupAuthConfigWithoutCredentials() throws URISyntaxException {
     }
 
     @Test
-    public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException {
+    public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-basic-auth.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -48,7 +52,7 @@ public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException
     }
 
     @Test
-    public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
+    public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -64,7 +68,8 @@ public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
     }
 
     @Test
-    public void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult() throws URISyntaxException {
+    public void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult()
+        throws URISyntaxException, IOException {
         // contains entry for registry.example.com
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
 
@@ -78,7 +83,7 @@ public void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult
     }
 
     @Test
-    public void lookupAuthConfigUsingStore() throws URISyntaxException {
+    public void lookupAuthConfigUsingStore() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -98,7 +103,7 @@ public void lookupAuthConfigUsingStore() throws URISyntaxException {
     }
 
     @Test
-    public void lookupAuthConfigUsingHelper() throws URISyntaxException {
+    public void lookupAuthConfigUsingHelper() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -118,7 +123,7 @@ public void lookupAuthConfigUsingHelper() throws URISyntaxException {
     }
 
     @Test
-    public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException {
+    public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper-using-token.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -132,7 +137,7 @@ public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException {
     }
 
     @Test
-    public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
+    public void lookupUsingHelperEmptyAuth() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty-auth-with-helper.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -152,7 +157,7 @@ public void lookupUsingHelperEmptyAuth() throws URISyntaxException {
     }
 
     @Test
-    public void lookupNonEmptyAuthWithHelper() throws URISyntaxException {
+    public void lookupNonEmptyAuthWithHelper() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-existing-auth-with-helper.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -172,7 +177,7 @@ public void lookupNonEmptyAuthWithHelper() throws URISyntaxException {
     }
 
     @Test
-    public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException {
+    public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException, IOException {
         Map<String, String> notFoundMessagesReference = new HashMap<>();
         final RegistryAuthLocator authLocator = createTestAuthLocator(
             "config-with-store.json",
@@ -198,7 +203,7 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException
     }
 
     @Test
-    public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException {
+    public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store-empty.json");
 
         DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
@@ -207,18 +212,106 @@ public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException {
         assertThat(authConfig.getAuth()).as("CredStore field will be ignored, because value is blank").isNull();
     }
 
+    @Test
+    public void lookupAuthConfigFromEnvVarWithCredStoreEmpty() throws URISyntaxException, IOException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator(null, "config-with-store-empty.json");
+
+        DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(dockerImageName, new AuthConfig());
+
+        assertThat(authConfig.getAuth()).as("CredStore field will be ignored, because value is blank").isNull();
+    }
+
+    @Test
+    public void lookupAuthConfigWithoutConfigFile() throws URISyntaxException, IOException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator(null);
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("unauthenticated.registry.org/org/repo"),
+            new AuthConfig()
+        );
+
+        assertThat(authConfig.getRegistryAddress())
+            .as("Default docker registry URL is set on auth config")
+            .isEqualTo("https://index.docker.io/v1/");
+        assertThat(authConfig.getUsername()).as("No username is set").isNull();
+        assertThat(authConfig.getPassword()).as("No password is set").isNull();
+    }
+
+    @Test
+    public void lookupAuthConfigRespectsCheckOrderPreference() throws URISyntaxException, IOException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty.json", "config-basic-auth.json");
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
+
+        assertThat(authConfig.getRegistryAddress())
+            .as("Default docker registry URL is set on auth config")
+            .isEqualTo("https://registry.example.com");
+        assertThat(authConfig.getUsername()).as("Username is set").isEqualTo("user");
+        assertThat(authConfig.getPassword()).as("Password is set").isEqualTo("pass");
+    }
+
+    @Test
+    public void lookupAuthConfigFromEnvironmentVariable() throws URISyntaxException, IOException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator(null, "config-basic-auth.json");
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registry.example.com/org/repo"),
+            new AuthConfig()
+        );
+
+        assertThat(authConfig.getRegistryAddress())
+            .as("Default docker registry URL is set on auth config")
+            .isEqualTo("https://registry.example.com");
+        assertThat(authConfig.getUsername()).as("Username is set").isEqualTo("user");
+        assertThat(authConfig.getPassword()).as("Password is set").isEqualTo("pass");
+    }
+
+    @NotNull
+    private RegistryAuthLocator createTestAuthLocator(String configName, String envConfigName)
+        throws URISyntaxException, IOException {
+        return createTestAuthLocator(configName, envConfigName, new HashMap<>());
+    }
+
     @NotNull
-    private RegistryAuthLocator createTestAuthLocator(String configName) throws URISyntaxException {
-        return createTestAuthLocator(configName, new HashMap<>());
+    private RegistryAuthLocator createTestAuthLocator(String configName) throws URISyntaxException, IOException {
+        return createTestAuthLocator(configName, null, new HashMap<>());
     }
 
     @NotNull
     private RegistryAuthLocator createTestAuthLocator(String configName, Map<String, String> notFoundMessagesReference)
-        throws URISyntaxException {
-        final File configFile = new File(Resources.getResource("auth-config/" + configName).toURI());
+        throws URISyntaxException, IOException {
+        return createTestAuthLocator(configName, null, notFoundMessagesReference);
+    }
 
-        String commandPathPrefix = configFile.getParentFile().getAbsolutePath() + "/";
+    @NotNull
+    private RegistryAuthLocator createTestAuthLocator(
+        String configName,
+        String envConfigName,
+        Map<String, String> notFoundMessagesReference
+    ) throws URISyntaxException, IOException {
+        File configFile = null;
+        String commandPathPrefix = "";
         String commandExtension = "";
+        String configEnv = null;
+
+        if (configName != null) {
+            configFile = new File(Resources.getResource("auth-config/" + configName).toURI());
+
+            commandPathPrefix = configFile.getParentFile().getAbsolutePath() + "/";
+        } else {
+            configFile = new File(new URI("file:///not-exists.json"));
+        }
+
+        if (envConfigName != null) {
+            final File envConfigFile = new File(Resources.getResource("auth-config/" + envConfigName).toURI());
+            configEnv = FileUtils.readFileToString(envConfigFile, StandardCharsets.UTF_8);
+
+            commandPathPrefix = envConfigFile.getParentFile().getAbsolutePath() + "/";
+        }
 
         if (SystemUtils.IS_OS_WINDOWS) {
             commandPathPrefix += "win/";
@@ -228,6 +321,12 @@ private RegistryAuthLocator createTestAuthLocator(String configName, Map<String,
             commandExtension = ".bat";
         }
 
-        return new RegistryAuthLocator(configFile, commandPathPrefix, commandExtension, notFoundMessagesReference);
+        return new RegistryAuthLocator(
+            configFile,
+            configEnv,
+            commandPathPrefix,
+            commandExtension,
+            notFoundMessagesReference
+        );
     }
 }
diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 66a0932e0bd..250221e775f 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -45,3 +45,12 @@ Testcontainers will try to connect to a Docker daemon using the following strate
 	* `DOCKER_CERT_PATH=~/.docker`
 * If Docker Machine is installed, the docker machine environment for the *first* machine found. Docker Machine needs to be on the PATH for this to succeed.
 * If you're going to run your tests inside a container, please read [Patterns for running tests inside a docker container](continuous_integration/dind_patterns.md) first.
+
+## Docker registry authentication
+
+Testcontainers will try to authenticate to registries with supplied config using the following strategies in order:
+
+* Environment variables:
+    * `DOCKER_AUTH_CONFIG`
+* Docker config
+	* At location specified in `DOCKER_CONFIG` or at `{HOME}/.docker/config.json`

From 7f709cba3c7a4cf6ffa2e5b90296c799b1e91ff3 Mon Sep 17 00:00:00 2001
From: Josef Cacek <josef.cacek@gmail.com>
Date: Mon, 20 Feb 2023 16:58:37 +0100
Subject: [PATCH 2753/4969] Update Javadoc to highlight the potentially stale
 behavior of `getMappedPort` (#6303)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../containers/ContainerState.java              | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index b82b5448d2f..f355bf445fb 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -119,6 +119,12 @@ default boolean isHealthy() {
         }
     }
 
+    /**
+     * Inspects the container and returns up-to-date inspection response.
+     *
+     * @return up-to-date container inspect response
+     * @see #getContainerInfo()
+     */
     default InspectContainerResponse getCurrentContainerInfo() {
         return getDockerClient().inspectContainerCmd(getContainerId()).exec();
     }
@@ -140,10 +146,16 @@ default Integer getFirstMappedPort() {
 
     /**
      * Get the actual mapped port for a given port exposed by the container.
-     * Should be used in conjunction with {@link #getHost()}.
+     * It should be used in conjunction with {@link #getHost()}.
+     * <p>
+     * Note: The returned port number might be outdated (for instance, after disconnecting from a network and reconnecting
+     * again). If you always need up-to-date value, override the {@link #getContainerInfo()} to return the
+     * {@link #getCurrentContainerInfo()}.
      *
      * @param originalPort the original TCP port that is exposed
      * @return the port that the exposed port is mapped to, or null if it is not exposed
+     * @see #getContainerInfo()
+     * @see #getCurrentContainerInfo()
      */
     default Integer getMappedPort(int originalPort) {
         Preconditions.checkState(
@@ -222,7 +234,10 @@ default String getContainerId() {
     }
 
     /**
+     * Returns the container inspect response. The response might be cached/outdated.
+     *
      * @return the container info
+     * @see #getCurrentContainerInfo()
      */
     InspectContainerResponse getContainerInfo();
 

From 8b5119b49b189b47394060e3bdb9e759e8f8fdc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 20 Feb 2023 17:58:29 -0600
Subject: [PATCH 2754/4969] Upgrade gradle version to 8.0.1 (#6656)

* Update Gradle Wrapper from 7.6 to 8.0.1.
* Add foojay-toolchains plugin
* Remove test-support dependency
---
 core/build.gradle                             |   1 -
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 61574 -> 61608 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 61574 -> 61608 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   4 ++--
 modules/hivemq/build.gradle                   |   1 +
 modules/jdbc-test/build.gradle                |   1 -
 modules/jdbc/build.gradle                     |   1 -
 modules/postgresql/build.gradle               |   1 -
 modules/toxiproxy/build.gradle                |   2 --
 settings.gradle                               |   2 ++
 13 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index bd8a7f6aebe..782319ad7be 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,6 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 5094
zcmZu#c|6qH|DG9RA4`noBZNWrC2N)tSqjO%%aX0^O4dPAB*iC6_9R<`apl^#h-_oY
z)(k_0v8Fxp{fyi9-uwN%e)GpU&v~BrS>~KG^PF=MNmQjIDr&QHR7f-kM{%U_u*1=5
zGC}ae5(^Rrg9QY8$x^}oiJ0d2O9YW{J~$dD1ovlvh&0B4L)!4S=z;<uF&veQfHEXY
zH4@@u<^kLgdlVdk1PFR?=tB@!!Fh%TVs?1fpp-}gaG&{-sUSX9@FS&eh_E$O7uPRV
zh2TQNV03iQkaS=gC5-17XkoDHM_@2b(3OJ^WZ|a;hZcFUgSM+-Xe-WxmZxJAWoXuT
z58)Iu3Bf{KTD4feM+#hIgx)vjq8^aEDI~sP`Ko*kne(b6x(Ap9kd}I90y~b3BdH8X
zITw2EG-GzOws{X|SPYt9mPef9Q6qsa#K^021mYI)=O+2rR~D~R)FX*Oz?*6leRNx9
zwUfShT`=~^`n=$fZai)7t=s`M0arPMZl??|>Hac>K{#9q9cKq;>>BtKo1!+gw`yqE
zSK8x^jC|B!qmSW#uyb@T^CkB9qRd{N3V-rEi}AEgoU_J27lw_0X`}c0&m9JhxM;RK
z54_gdZ(u?R5`B3}NeVal2NTHqlktM`2eTF28%6BZCWW$-shf0l-BOVSm)hU58MTPy
zDcY-5777j;ccU!Yba8wH=X6OdPJ8O5Kp^3gUNo>!b=xb6T2F&LiC2eBJj8KuLPW!4
zw3V^NnAKZm^D?tmliCvzi>UtoDH%V#%SM0d*NS+m%4}qO<)M1E{OpQ(v&ZNc`vdi|
zEGlVi$Dgxy1p6+<ch};IJ}c-|s+zxw%bF%V{7j#qR*B5@XU2Vcns{yH3t=Wz_(Hjx
zwd1)jKJ^`QaQXMlJV>k0qGLQt(JwxZxLCZ4>wJ=sb0v%Ki?*+!ic_2exumn{%Co||
z-axdK#RUC;P|vqbe?L`K!j;sUo=uuR_#ZkRvBf%Txo6{OL&I(?dz?47Z(DcX3KTw>
zGY%A=kX;fBkq$F^sX|-)1Qkg##+n-Ci{qJVPj@P?<z;N=v_I6^&ygG=tSw#Y%UjZ@
z`#93m#lUYJ%x9`g1t(rEUT=uW?ue_*>l_<cEx0Hh)6uny*sYx)xX#Wv%LEZ4bUN<Z
z7GVqE(hQkJR)ue{H{&xJbUH-4kvuXRrfT$Wx01*@mNv*)6QdcMeFyW(imPkm3B~H=
zK7W>1Y`nD^v>fZ3HMX%(4p-TlD(>yWwJij!6Jw}l7h>CIm@Ou5B@$Wy`Ky*8<F2zj
z@@x^O2|m-ldu-3LMR+X(>14%Mdi1GfG1zDG9NogaoVHHr4gannv4?w6g&10!j=lKM
zFW;@=Z0}vAPAxA=R4)|`J??*$|Fh`5=ks*V7TapX`+=4n*{aXxRhh-EGX_Xrzjb4r
zn0vO7Cc~wtyeM_8{**~9y7>+}1JV8Buhg%*hy|PUc#!vw#W(HFTL|BpM)U0>JxG6S
zLnqn1!0++RyyJ>5VU<4mDv8>Q#{EtgS3mj7Hx}Zkr<T_0m+h5XsFNofwF!#;ng`~E
zO^<ryUPTxdRfL<wiQ<%$|9o4zg<j#?WmFQg&Kn<uhmGJS&TI%A;I%!Z(;f-uD(m_^
zNp3VSIN@{GlZWoALto(A5FZ!i%DoT<?3LVWj1B1ySxvKzSN7>0tz1}h8Kn6q`MiwC
z{Y#;D!-ndlImS<Z-?liBM7)gjSIe*GpflUKrcylTQcfOqcrDNGk&QHR*-m(VwkYlA
z?dN^niqZ5--O6qr!7Xa%Rh_7wYV(Zq#-!gj8q5Bu!!mkH=e%(37W2&kqQ65KNg7L2
zviMG8qeYEzpdWMpb|s4)CM)@Qi{sSj_0KxRE;1K>T(C@(*i5f0U(jD29G7g#nkiPX
zki6M$QYX_fNH=E4_eg9*FFZ3wF9YAKC}CP89Kl(<Uvh*;*RIYLMe<(ce(F8OErh4m
zlhRsR{U&nvjsSdt<3Z9xGjV43*6SQtr3E_9JCkOT&b`vzxY5ZJ=1>GNS(Ag994)<L
zz3x}`(haLy*Tzhy+Dg68vAmX)s(UKorq>0$OL4-fj_1EdR}ARB#-vP_$bWF`Qk58+
z4Jq*-YkcmCuo9U%oxGeYe7Be=?n}pX+x>ob(8oPLDUPiIryT8v*N4@0{s_<v!N&8y
zOPuX{$yCQ&=&>VYALi;lzj19ivLJKaXt7~UfU|mu9zjbhPnIhG2`uI34urWWA9IO{
z_1zJ)lwSs{qt3*UnD}3qB^kcRZ?``>IDn>qp8L96bRaZH)Zl`!neewt(wjSk1i#zf
zb8_{x_{WRBm9+0CF4+nE)NRe6K8d|wOWN)&-3jCDiK5mj>77=s+TonlH5j`nb@rB5
z5NX?Z1dk`E#$BF{`(D>zI<HZ+<>SrMo4&}^wmUIyYL-$PWmEEfEn-U0tx_vy$H6|+
zi{ytv2@JXBsot|%I5s74>W1K{-cvj0BYdNiRJz*&jrV9>ZXYZhEMULcM=fCmxkN&l
zEoi=)b)Vazc5TQC&Q$oEZETy@!`Gnj`qoXl7mcwdY@3a-!SpS2Mau|uK#++@>H8QC
zr2ld8;<_8We%@E?S=E?=e9c$BL^9X?bj*4W;<+B&OOe+3{<`6~*fC(=`TO>o^A(Y!
zA`Qc1ky?*6xjVfR?ugE~oY`Gt<vaLJTCo1nnmu8oFGg@mi9K)$+WByQ5A&CS?<@ki
z_7m?RV+9@F1GrWtGR0%dRaqd%1tpgN(1U~L&`Rf&XmCH&n<-wMwglitH0LRSHQHO0
ztWejI(n8BJfMd}YpqRCs(Gxa^iTMEF)*W_fA!gnkLupfL1;FunHByXz%6pX39CXS6
z+kJU{qitUdgko0#ob=^Vs((3rTlHvJBOC?;s9-Qza3qowWM1P1`2(1-+7A6i3H2kw
z_wB2h+;psj?=#*hkYUYE(lmJ%+=IW4(0Y}~WGM9wc8VcrT@P`Z%W2?UZ%)Y7&6eHW
z$*;#?d2U+mC;TfHuEnZ1klkl{HIJFZWq8eae|0Q)>zhw^{Z@E6vZ`mMRAp>Odpa!m
zzWmtjT|Lj^qiZMfj%%un-o$Eu>*v12qF{$kCKai^?DF=$^tfyV%m9;W@pm-BZn_6b
z{jsX<lUo~kJ_0QO>Y3!U`%9hzk6n7YyHY%48NhjI6jjuUn?Xfxe0`ARD_Q+T_QBZ{
zUK@!63_Wr`%9q_rh`N4=J=m;v>T{Y=ZL<K`_RkA>KN^m?(KZQ2J%|3`hV0iogMHJ}
zY6&-nXirq$Yhh*CHY<oG^-!;2AGGr2lqIlFeQPSK6|{ds{YBRHp>&Qf*b@@>LPTMf
z(cMorwW?M11RN{H#~ApKT)F!;R#fBHahZGhmy>Sox`rk>>q&Y)RG$-QwH$_TWk^hS
zTq2TC+D-cB21|$g4D=@T`-ATtJ?C=aXS4Q}^`~XjiIRszCB^cvW0OHe5;e~9D%D10
zl4yP4O=s-~HbL7*4>#W52e<y<<I(igFc=El3{=KC*s$B6e=!?9l0!KQG3dnE76`K%
z;%BT2Eboeq6l97ikIpdn38t8Oj%LxH4*23PI~=`TsnyYnw71@HXtKsy*w}o{G7_fW
zL0rzwnvTqGY1`kxeeKga*#E`dF1{y>iG7*^Hi)?@-#*7C^X5@kGwK+paI>_a2qxtW
zU=xV7>QQROWQqVfPcJ$4GSx`Y23Z&qnS?N;%mjHL*EVg3pBT{V7bQUI60jtBTS?i~
zycZ4xqJ<*3FSC6_^*6f)N|sgB5Bep(^%)$=0cczl>j&n~KR!7WC|3;Zoh_^GuOzRP
zo2Hxf50w9?_4Qe368fZ0=J|fR*jO_EwFB1I^g~i)roB|KWKf49-)!N%Ggb<tslF%Q
zJ$9p;TF7vfYfNt}@-L-#Qu>%w=kB8)(+_%kE~G!(73aF=yCmM3Cfb9l<q95>V$G!b
zoDIxqY{dH>`SILGHEJwq%rwh46_i`wkZS-NY95qdNE)O*y^+k#JlTEij8NT(Y_J!W
zFd+YFoZB|a<b&OD((3Dvwwgf>uOz~A@A{V*c)o7E(a=wHvb@8g5PnVJ&7D+Fp8ABV
z5`&LD-<$jPy{-y*V^SqM)9!#_Pj2-x{m$z+9Z*o|JTBGgXYYVM;g|VbitDUfnVn$o
zO)6?CZcDklDoODzj+ti@i#WcqPoZ!|IPB98LW!$-p+a4xBVM@%GEGZKmNjQMhh)zv
z7D){Gpe-Dv=~>c9f|1vANF&boD=Nb1Dv>4~eD636Lldh?#zD5{6JlcR_b*C_Enw&~
z5l2(w(`{+01xb1FCRfD2ap$u(h1U1B6e&8tQrnC}Cy0GR=i^Uue26Rc6Dx}!4#K*0
zaxt`a+px7-Z!^(U1WN2#kdN#OeR|2z+C@b@w+L67VEi&ZpAdg+8`HJT=wIMJqibhT
ztb3PFzsq&7jzQuod3xp7uL?h-7rYao&0MiT_Bux;U*N#ebGv92o(jM2?`1!N2W_M*
zeo9$%hEtIy;=`8z1c|kL&ZPn0y`N)i$Y1R9>K!el{moiy)<VnmBl>014448YC#9=K
zwO3weN|8!`5bU_#f(+ZrVd*9`7Uw?!q?yo&7sk&DJ;#-^tcCtqt5*A(V;&LdHq7Hg
zI6sC@!ly9p$^@v&XDsgIuv;9#w^!C1n5+10-tEw~ZdO1kqMDYyDl!5__o}f3hYe2M
zCeO)~m&&=JZn%cVH3HzPlcE`9^@``2u+!Y}Remn)DLMHc-h5A9AT<F^D$MM~w$XEp
z&d>gs;7F7=u2=vBlDRbjeYvyNby=TvpI{5nb2@J_YTEEEj4q<@zaGSC_i&xxD!6)d
zG{1??({Ma<=Wd4JL%b<NaY`!IkN451t@(>nE<J_STA>XoBOU_0bbNy3p%mFrMW>#c
zzPEvryBevZVUvT^2P&Zobk#9j>vSIW_t?AHy>(^x-Bx<hLWbr;;>~(mvNYb_%$<TG
zLWL(;LPZ33IC~#ud(ba-8#0DVEO12ZrsW$Mj|>ZFg(s5~oka+Kp(GU68I$h(Vq|fZ
zC_u1FM|S)=ldt#5q>&p4r%%p)*7<!{co)ArAk&$ZW;U#xTB83(b%*uFr<Lg2M7-0d
zOZ9jceGmCxTxtvV_S>|Rf0}B#-FwHDTo*|P6HB_rz%R;{==hpl#xTt@VLdSrrf~g^
z`IA8ZV1b`UazYpnkn28h&U)$(gdZ*f{n`&kH%Oy54&Z;ebjlh4x?JmnjFAALu}EG}
zfGmQ$5vEMJMH`a=+*src#dWK&N1^LFxK9Sa#q_rja$JWra09we<2oL9Q9Sx)?kZFW
z$jhOFGE~VcihYlkaZv8?uA7v$*}?2h6i%Qmgc4n~3E(O_`YCRGy~}`N<L&({)KE4u
ze38<j{Fo5svQM#aAA%s|r2qh*62yK}3k2TZ2u-B8Iwj16C<&o(q79VdiDri^0IJVv
z{?=3Hjzg$^&KXKM=DndbW}box^VU#W!3lsSBsB=_@B&~VNdrPe5+y2D5CAVO7(l3W
z!3Rp&7DL$opXUMa(V{J+?kr*u(<eZZ7zRA~9vU}v_`x71mB0>Faj@(?Wz;<o@lF*Y
zPJ-A)%6o+55(crZ4&v3-z_#}kA`K!|H4m$3FVir|xL<J%2{AhdN1&<DV2w5aGA=V9
z7PWr|P}(fi1sI{%io?&-xG^wpSsh|qmN5u1{ll@y>GS_?T+RqU{S)eD1j$1Gr;C^m
z7zDK=xaJ^6``=#Y-2ssNfdRqh0ntJrutGV5Nv&WI%3k1wmD5n+0aRe{0k^!>LFReN
zx1g*E>nbyx03KU~UT6->+rG%(owLF=beJxK&a0F;ie1GZ^eKg-VEZb&=s&ajKS#6w
zjvC6J#?b|U_(%@uq$c#Q@V_me0S1%)pKz9--{EKwyM}_gOj*Og-NEWLDF_oFtPjG;
zXCZ7%#=s}RKr&_5RFN@=H(015AGl4XRN9Bc51`;WWt%vzQvzexDI2BZ@xP~^2$I&7
zA(ndsgLsmA*su8p<!2C(_wT7s$vc#OmC=G_8_bZ5D*3l8Uh=oBRl@%FLa=XQ5L;!x
zC8ob=SBR!=JEXHWDQi;&5j7o$M0<zG-*M<I3?ifJH_Ze(Y*D^ed;h;XCiEZ5>-~IS
q+ZJUZM}`4#Zi@l2F-#HCw*??ha2ta#9s8?H3%YId(*zJG6aF78h1yF1

delta 5107
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
I6Xdi10eY*&F8}}l

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index adb6acbd81b..f396aaac2d3 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 65dcd68d65c..79a61d421cc 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 5094
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

delta 5107
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
I6Xdi10eY*&F8}}l

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bc073f67610..a82eb06ab6c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionSha256Sum=948d1e4ccc2f6ae36cbfa087d827aaca51403acae5411e664a6000bb47946f22
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65c..79a61d421cc 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 0844feba2bb..df3d792567f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -35,4 +35,5 @@ compileTestJava {
     javaCompiler = javaToolchains.compilerFor {
         languageVersion = JavaLanguageVersion.of(11)
     }
+    options.release.set(11)
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index c76c7c4cd2a..7ffb58a51a3 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,6 +1,5 @@
 dependencies {
     api project(':jdbc')
-    api project(':test-support')
 
     api 'com.google.guava:guava:31.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 3d60cad4116..e098fc5ee33 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -2,7 +2,6 @@ description = "Testcontainers :: JDBC"
 
 dependencies {
     api project(':database-commons')
-    testImplementation project(':test-support')
 
     compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 1285135c5ab..555000b08ab 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation project(':test-support')
     testImplementation 'org.postgresql:postgresql:42.5.3'
 
     testImplementation testFixtures(project(':r2dbc'))
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 9115a5593b8..8ec689de6be 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -6,6 +6,4 @@ dependencies {
 
     testImplementation 'redis.clients:jedis:3.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-
-    testImplementation project(':test-support')
 }
diff --git a/settings.gradle b/settings.gradle
index 9c9e9e29f15..9b44be57333 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,11 +7,13 @@ buildscript {
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
+        classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }
 }
 
 apply plugin: 'com.gradle.enterprise'
 apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
+apply plugin: "org.gradle.toolchains.foojay-resolver-convention"
 
 rootProject.name = 'testcontainers-java'
 

From d2fa66b31e8573262e168b924dff178b67c9b4aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 00:00:27 +0000
Subject: [PATCH 2755/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/solace

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 7388f2f801a..dc92cdd58ce 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.solacesystems:sol-jcsmp:10.18.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'

From cfb0c74e24b70e18e67e55d4b00ec4a0eb4df563 Mon Sep 17 00:00:00 2001
From: Leo <leocrossuk@gmail.com>
Date: Thu, 23 Feb 2023 16:04:07 +0000
Subject: [PATCH 2756/4969] Add community links to docs (#6664)

---
 docs/css/extra.css           | 67 +++++++++++++++++++++++++++++
 docs/icons/github.svg        |  4 ++
 docs/icons/slack.svg         | 10 +++++
 docs/icons/stackoverflow.svg |  5 +++
 docs/icons/twitter.svg       |  4 ++
 docs/theme/partials/nav.html | 83 ++++++++++++++++++++++++++++++++++++
 6 files changed, 173 insertions(+)
 create mode 100644 docs/icons/github.svg
 create mode 100644 docs/icons/slack.svg
 create mode 100644 docs/icons/stackoverflow.svg
 create mode 100644 docs/icons/twitter.svg
 create mode 100644 docs/theme/partials/nav.html

diff --git a/docs/css/extra.css b/docs/css/extra.css
index a89eebc9b24..e82da5797ae 100644
--- a/docs/css/extra.css
+++ b/docs/css/extra.css
@@ -47,4 +47,71 @@ body .card-grid-item:focus {
 .card-grid-item[href]:focus {
     background: #F2F4FE;
     color: var(--md-primary-fg-color);
+}
+
+.community-callout-wrapper {
+    padding: 30px 10px 0 10px;
+}
+
+.community-callout {
+    color: #F2F4FE;
+    background: linear-gradient(10.88deg, rgba(102, 56, 242, 0.4) 9.56%, #6638F2 100%), #291A3F;
+    box-shadow: 0px 20px 45px rgba(#9991B5, 0.75);
+    border-radius: 10px;
+    padding: 20px;
+}
+
+.community-callout h2 {
+    font-size: 1.15em;
+    margin: 0 0 20px 0;
+    color: #F2F4FE;
+    text-align: center;
+}
+
+.community-callout ul {
+    list-style: none;
+    padding: 0;
+    display: flex;
+    justify-content: space-between;
+    gap: 10px;
+    margin-top: 20px;
+    margin-bottom: 0;
+}
+
+.community-callout a {
+transition: opacity 0.2s ease;
+}
+
+.community-callout a:hover {
+    opacity: 0.5;
+}
+
+.community-callout a img {
+    height: 1.75em;
+    width: auto;
+    aspect-ratio: 1;
+}
+
+@media (min-width: 1220px) {
+    .community-callout-wrapper {
+       padding: 40px 0 0;
+    }
+
+    .community-callout h2 {
+        font-size: 1.25em;
+    }
+
+    .community-callout a img {
+        height: 2em;
+    }
+}
+
+@media (min-width: 1600px) {
+    .community-callout h2 {
+        font-size: 1.15em;
+    }
+
+    .community-callout a img {
+        height: 1.75em;
+    }
 }
\ No newline at end of file
diff --git a/docs/icons/github.svg b/docs/icons/github.svg
new file mode 100644
index 00000000000..d563c83aa0a
--- /dev/null
+++ b/docs/icons/github.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="31" viewBox="0 0 30 31">
+    <path fill="#fff"
+        d="M15 .568c-8.287 0-15 6.713-15 15C0 22.206 4.294 27.812 10.256 29.8c.75.132 1.031-.318 1.031-.712 0-.356-.018-1.538-.018-2.794-3.769.694-4.744-.919-5.044-1.762-.169-.432-.9-1.763-1.537-2.12-.526-.28-1.275-.974-.02-.993 1.182-.019 2.026 1.088 2.307 1.538 1.35 2.268 3.506 1.63 4.369 1.237.131-.975.525-1.631.956-2.006-3.338-.375-6.825-1.669-6.825-7.406 0-1.632.581-2.982 1.538-4.032-.15-.375-.675-1.912.15-3.975 0 0 1.256-.393 4.124 1.538 1.2-.338 2.475-.506 3.75-.506s2.55.168 3.75.506c2.87-1.95 4.126-1.538 4.126-1.538.825 2.063.3 3.6.15 3.975.956 1.05 1.537 2.382 1.537 4.032 0 5.756-3.506 7.03-6.844 7.406.544.469 1.013 1.369 1.013 2.775 0 2.006-.019 3.619-.019 4.125 0 .394.281.862 1.031.712C25.706 27.812 30 22.187 30 15.57c0-8.288-6.712-15-15-15Z"/>
+</svg>
\ No newline at end of file
diff --git a/docs/icons/slack.svg b/docs/icons/slack.svg
new file mode 100644
index 00000000000..942265e1d23
--- /dev/null
+++ b/docs/icons/slack.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="31" viewbox="0 0 30 31">
+    <path fill="#36C5F0"
+        d="M10.951.642a2.99 2.99 0 0 0-2.76 4.137 2.99 2.99 0 0 0 2.76 1.848h2.987V3.635A2.99 2.99 0 0 0 10.95.642Zm0 7.98H2.987a2.99 2.99 0 0 0-2.76 4.137 2.99 2.99 0 0 0 2.76 1.849h7.964a2.988 2.988 0 0 0 2.987-2.993 2.991 2.991 0 0 0-2.987-2.992Z" />
+    <path fill="#2EB67D"
+        d="M29.867 11.615a2.99 2.99 0 0 0-4.13-2.764 2.99 2.99 0 0 0-1.844 2.764v2.993h2.987a2.988 2.988 0 0 0 2.987-2.993Zm-7.965 0v-7.98A2.991 2.991 0 0 0 18.916.642a2.99 2.99 0 0 0-2.987 2.993v7.98a2.988 2.988 0 1 0 5.973 0Z" />
+    <path fill="#ECB22E"
+        d="M18.916 30.568a2.99 2.99 0 0 0 2.113-5.107 2.991 2.991 0 0 0-2.113-.878h-2.987v2.992a2.988 2.988 0 0 0 2.987 2.993Zm0-7.98h7.964a2.988 2.988 0 0 0 2.987-2.993 2.988 2.988 0 0 0-2.987-2.992h-7.964a2.99 2.99 0 0 0-2.76 4.136 2.987 2.987 0 0 0 2.76 1.848Z" />
+    <path fill="#E01E5A"
+        d="M0 19.595a2.99 2.99 0 0 0 4.13 2.764 2.99 2.99 0 0 0 1.843-2.764v-2.992H2.987A2.99 2.99 0 0 0 0 19.595m7.964 0v7.98a2.99 2.99 0 0 0 4.131 2.763 2.989 2.989 0 0 0 1.843-2.764v-7.98a2.99 2.99 0 0 0-4.13-2.763 2.99 2.99 0 0 0-1.844 2.764" />
+</svg>
\ No newline at end of file
diff --git a/docs/icons/stackoverflow.svg b/docs/icons/stackoverflow.svg
new file mode 100644
index 00000000000..c3307627c4e
--- /dev/null
+++ b/docs/icons/stackoverflow.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="26" height="31" viewBox="0 0 26 31">
+    <path fill="#BCBBBC" d="M21.398 27.891v-8.03h2.677v10.707H0V19.861h2.677v8.03h18.721Z" />
+    <path fill="#F48023"
+        d="M5.356 25.214H18.74v-2.676H5.356v2.676ZM17.351.568l-2.148 1.598 7.987 10.738 2.148-1.597L17.351.568ZM10.712 6.9l10.284 8.565 1.713-2.057-10.284-8.565L10.712 6.9Zm-3.357 5.952 12.132 5.65 1.13-2.426-12.132-5.65-1.13 2.426Zm-1.733 6.271 13.097 2.753.55-2.62-13.097-2.752-.55 2.62Z" />
+</svg>
\ No newline at end of file
diff --git a/docs/icons/twitter.svg b/docs/icons/twitter.svg
new file mode 100644
index 00000000000..ef3fbc6217e
--- /dev/null
+++ b/docs/icons/twitter.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="37" height="31" viewBox="0 0 37 31">
+    <path fill="#1D9BF0"
+        d="M32.978 8.11c.022.32.022.639.022.961 0 9.813-7.47 21.13-21.13 21.13v-.005a21.024 21.024 0 0 1-11.385-3.33 14.913 14.913 0 0 0 10.991-3.078 7.436 7.436 0 0 1-6.938-5.157c1.114.215 2.26.171 3.353-.128a7.427 7.427 0 0 1-5.957-7.279v-.094a7.38 7.38 0 0 0 3.37.93 7.436 7.436 0 0 1-2.298-9.917 21.079 21.079 0 0 0 15.306 7.759 7.435 7.435 0 0 1 12.656-6.774 14.903 14.903 0 0 0 4.716-1.803 7.454 7.454 0 0 1-3.265 4.108 14.77 14.77 0 0 0 4.265-1.17 15.089 15.089 0 0 1-3.706 3.848Z" />
+</svg>
\ No newline at end of file
diff --git a/docs/theme/partials/nav.html b/docs/theme/partials/nav.html
new file mode 100644
index 00000000000..4215f7b57f9
--- /dev/null
+++ b/docs/theme/partials/nav.html
@@ -0,0 +1,83 @@
+<!--
+  Copyright (c) 2016-2023 Martin Donath <martin.donath@squidfunk.com>
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+<!-- Determine class according to configuration -->
+{% set class = "md-nav md-nav--primary" %}
+{% if "navigation.tabs" in features %}
+{% set class = class ~ " md-nav--lifted" %}
+{% endif %}
+{% if "toc.integrate" in features %}
+{% set class = class ~ " md-nav--integrated" %}
+{% endif %}
+
+<!-- Main navigation -->
+<nav class="{{ class }}" aria-label="{{ lang.t('nav') }}" data-md-level="0">
+
+    <!-- Site title -->
+    <label class="md-nav__title" for="__drawer">
+        <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}"
+            class="md-nav__button md-logo" aria-label="{{ config.site_name }}" data-md-component="logo">
+            {% include "partials/logo.html" %}
+        </a>
+        {{ config.site_name }}
+    </label>
+
+    <!-- Repository information -->
+    {% if config.repo_url %}
+    <div class="md-nav__source">
+        {% include "partials/source.html" %}
+    </div>
+    {% endif %}
+
+    <!-- Render item list -->
+    <ul class="md-nav__list" data-md-scrollfix>
+        {% for nav_item in nav %}
+        {% set path = "__nav_" ~ loop.index %}
+        {% set level = 1 %}
+        {% include "partials/nav-item.html" %}
+        {% endfor %}
+        <li class="community-callout-wrapper">
+            <div class="community-callout">
+                <h2>Join the community</h2>
+                <ul>
+                    <li>
+                        <a href="https://slack.testcontainers.org/" target="_blank">
+                            <img src="/icons/slack.svg" alt="Slack" width="30" height="31">
+                        </a>
+                    </li>
+                    <li>
+                        <a href="https://github.com/testcontainers" target="_blank">
+                            <img src="/icons/github.svg" alt="GitHub" width="30" height="31">
+                        </a>
+                    </li>
+                    <li>
+                        <a href="https://stackoverflow.com/questions/tagged/testcontainers" target="_blank">
+                            <img src="/icons/stackoverflow.svg" alt="StackOverflow" width="26" height="31">
+                        </a>
+                    </li>
+                    <li>
+                        <a href="https://twitter.com/testcontainers" target="_blank">
+                            <img src="/icons/twitter.svg" alt="Twitter" width="37" height="31">
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </li>
+    </ul>
+</nav>
\ No newline at end of file

From e97c7043224dfcf7374127143b6ac489dec02d2f Mon Sep 17 00:00:00 2001
From: Cristian Greco <cristianrgreco@gmail.com>
Date: Mon, 27 Feb 2023 13:58:10 +0000
Subject: [PATCH 2757/4969] Update docs link for tc-node (#6671)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index f55329e134d..2638c3029a0 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,7 +9,7 @@
     <a href="https://golang.testcontainers.org/" class="card-grid-item"><img src="language-logos/go.svg"/>Go</a>
     <a href="https://dotnet.testcontainers.org/" class="card-grid-item"><img src="language-logos/dotnet.svg"/>.NET</a>
     <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
-    <a href="https://github.com/testcontainers/testcontainers-node" class="card-grid-item"><img src="language-logos/nodejs.svg"/>Node.js</a>
+    <a href="https://node.testcontainers.org/" class="card-grid-item"><img src="language-logos/nodejs.svg"/>Node.js</a>
     <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="language-logos/rust.svg"/>Rust</a>
 </div>
 

From 10df7a8b1166723975271a05a814d3071ee4a240 Mon Sep 17 00:00:00 2001
From: Cristian Greco <cristianrgreco@gmail.com>
Date: Mon, 27 Feb 2023 18:24:14 +0000
Subject: [PATCH 2758/4969] Add haskell language to docs (#6674)

---
 docs/index.md                   | 1 +
 docs/language-logos/haskell.svg | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 docs/language-logos/haskell.svg

diff --git a/docs/index.md b/docs/index.md
index 2638c3029a0..d835bb17f9d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -11,6 +11,7 @@
     <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
     <a href="https://node.testcontainers.org/" class="card-grid-item"><img src="language-logos/nodejs.svg"/>Node.js</a>
     <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="language-logos/rust.svg"/>Rust</a>
+    <a href="https://github.com/testcontainers/testcontainers-hs/" class="card-grid-item" ><img src="language-logos/haskell.svg"/>Haskell</a>
 </div>
 
 ## About Testcontainers for Java
diff --git a/docs/language-logos/haskell.svg b/docs/language-logos/haskell.svg
new file mode 100644
index 00000000000..eb6de3776ec
--- /dev/null
+++ b/docs/language-logos/haskell.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 25.1765L7.05882 14.5882L0 4H5.29412L12.3529 14.5882L5.29412 25.1765" fill="#453A62"/>
+<path d="M24.1177 19L21.7648 15.4706H30.0001V19" fill="#8F4E8B"/>
+<path d="M20.5883 13.7059L18.2354 10.1765H30.0001V13.7059" fill="#8F4E8B"/>
+<path d="M7.05884 25.1765L14.1177 14.5882L7.05884 4H12.353L26.4706 25.1765H21.1765L16.7647 18.5588L12.353 25.1765" fill="#5E5086"/>
+</svg>

From 27ae496ad967e09572bde2178963d365d2088636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 28 Feb 2023 12:49:37 -0600
Subject: [PATCH 2759/4969] Fix modules/jdbc path for labeler (#6676)

---
 .github/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0fe24f33658..55163e0d7c7 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -32,7 +32,7 @@
 "modules/influx":
   - modules/influxdb/**/*
 "modules/jdbc":
-  - modules/jdbc/*
+  - modules/jdbc/**/*
 "modules/jupiter":
   - modules/junit-jupiter/**/*
 "modules/k3s":

From 48083c1f833453b2f4fcfbd7c199c2389c46e80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yusuf=20U=C4=9Fur=20=C3=96ZBEK?=
 <yusufugurozbek@hotmail.com>
Date: Tue, 28 Feb 2023 20:04:12 +0100
Subject: [PATCH 2760/4969] Move log for JDBC URL to containerIsStarted (#6646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../org/testcontainers/containers/JdbcDatabaseContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 7ea5bcb3610..2fcba3789e0 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -158,7 +158,6 @@ protected void waitUntilContainerStarted() {
                 try (Connection connection = createConnection(""); Statement statement = connection.createStatement()) {
                     boolean testQuerySucceeded = statement.execute(this.getTestQueryString());
                     if (testQuerySucceeded) {
-                        logger().info("Container is started (JDBC URL: {})", this.getJdbcUrl());
                         return;
                     }
                 } catch (NoDriverFoundException e) {
@@ -184,6 +183,7 @@ protected void waitUntilContainerStarted() {
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        logger().info("Container is started (JDBC URL: {})", this.getJdbcUrl());
         runInitScriptIfRequired();
     }
 

From 8f4904644f3a8ffe6f23422982c75626daa17707 Mon Sep 17 00:00:00 2001
From: Mario Escobedo <marioer@inditex.com>
Date: Tue, 28 Feb 2023 21:14:38 +0100
Subject: [PATCH 2761/4969] Add ShellStrategy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`ShellStrategy` can also be used as `Wait.forSuccessfulCommand(...)`.

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../wait/strategy/ShellStrategy.java          | 32 ++++++++++++++
 .../containers/wait/strategy/Wait.java        | 10 +++++
 .../wait/strategy/ShellStrategyTest.java      | 42 +++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 core/src/main/java/org/testcontainers/containers/wait/strategy/ShellStrategy.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/ShellStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/ShellStrategy.java
new file mode 100644
index 00000000000..6c72daa6935
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/ShellStrategy.java
@@ -0,0 +1,32 @@
+package org.testcontainers.containers.wait.strategy;
+
+import org.rnorth.ducttape.TimeoutException;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.ContainerLaunchException;
+
+import java.util.concurrent.TimeUnit;
+
+public class ShellStrategy extends AbstractWaitStrategy {
+
+    private String command;
+
+    public ShellStrategy withCommand(String command) {
+        this.command = command;
+        return this;
+    }
+
+    @Override
+    protected void waitUntilReady() {
+        try {
+            Unreliables.retryUntilTrue(
+                (int) startupTimeout.getSeconds(),
+                TimeUnit.SECONDS,
+                () -> waitStrategyTarget.execInContainer("/bin/sh", "-c", this.command).getExitCode() == 0
+            );
+        } catch (TimeoutException e) {
+            throw new ContainerLaunchException(
+                "Timed out waiting for container to execute `" + this.command + "` successfully."
+            );
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
index 6c3b9e86aec..fce82c66c92 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
@@ -66,4 +66,14 @@ public static LogMessageWaitStrategy forLogMessage(String regex, int times) {
     public static DockerHealthcheckWaitStrategy forHealthcheck() {
         return new DockerHealthcheckWaitStrategy();
     }
+
+    /**
+     * Convenience method to return a WaitStrategy for a shell command.
+     *
+     * @param command the command to run
+     * @return ShellStrategy
+     */
+    public static ShellStrategy forSuccessfulCommand(String command) {
+        return new ShellStrategy().withCommand(command);
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java
new file mode 100644
index 00000000000..0a85037cc14
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java
@@ -0,0 +1,42 @@
+package org.testcontainers.junit.wait.strategy;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+import org.testcontainers.containers.wait.strategy.ShellStrategy;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Tests for {@link ShellStrategy}.
+ */
+public class ShellStrategyTest extends AbstractWaitStrategyTest<ShellStrategy> {
+
+    private static final String LOCK_FILE = "/tmp/ready.lock";
+
+    @Test
+    public void testWaitUntilReady_Success() {
+        waitUntilReadyAndSucceed(String.format("touch %s; sleep 300", LOCK_FILE));
+    }
+
+    @Test
+    public void testWaitUntilReady_Timeout() {
+        waitUntilReadyAndTimeout("sleep 300");
+    }
+
+    @NotNull
+    @Override
+    protected ShellStrategy buildWaitStrategy(AtomicBoolean ready) {
+        return createShellStrategy(ready).withCommand(String.format("stat %s", LOCK_FILE));
+    }
+
+    @NotNull
+    private static ShellStrategy createShellStrategy(AtomicBoolean ready) {
+        return new ShellStrategy() {
+            @Override
+            protected void waitUntilReady() {
+                super.waitUntilReady();
+                ready.set(true);
+            }
+        };
+    }
+}

From f9e69d2acc12d26f8990e1fcff968817aca1ff84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:25 +0000
Subject: [PATCH 2762/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.3 to 42.5.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.3...REL42.5.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 555000b08ab..218d3fe2d94 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.3'
+    testImplementation 'org.postgresql:postgresql:42.5.4'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 8153cf26adc0b7c9b61eb39cd293c10fdafe3984 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:27 +0000
Subject: [PATCH 2763/4969] Bump org.postgresql:postgresql from 42.5.3 to
 42.5.4 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.3 to 42.5.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.3...REL42.5.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 fc962208114..a4c09f5ffd8 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.4'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'

From 0ea98ea762bef448b40bf23b76ca13b186db053d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:29 +0000
Subject: [PATCH 2764/4969] Bump org.seleniumhq.selenium:selenium-edge-driver
 in /modules/selenium

Bumps [org.seleniumhq.selenium:selenium-edge-driver](https://github.com/SeleniumHQ/selenium) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.8.0...selenium-4.8.1)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-edge-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index fa2cc66509d..f98b6fc0cee 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.6.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.6.0'
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.8.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.8.1'
     testImplementation 'org.seleniumhq.selenium:selenium-support:4.6.0'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'

From 61ff6a1d3dff5e86602f19d8a915831a7fd7b116 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:29 +0000
Subject: [PATCH 2765/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.5 to 10.1.6.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index e098fc5ee33..2380dec6185 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.5'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.6'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 654b2464e598f6e1cd5bc3041928ec2a6e644950 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:29 +0000
Subject: [PATCH 2766/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.406 to 1.12.418.
- [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.12.406...1.12.418)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 3db1bfa578f..80d811edc9e 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.406'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.406'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.418'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.418'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 29b85e4235453dc53fc96d393842713881596b8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:31 +0000
Subject: [PATCH 2767/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.3 to 42.5.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.3...REL42.5.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 315b3c534d1..8b3988a9982 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.4'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
 }
 

From d7a459727f7d83e495c11116d549a6b9c296a93a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:32 +0000
Subject: [PATCH 2768/4969] Bump org.mariadb:r2dbc-mariadb from 1.0.2 to 1.0.3
 in /modules/mariadb

Bumps [org.mariadb:r2dbc-mariadb](https://github.com/mariadb-corporation/mariadb-connector-r2dbc) from 1.0.2 to 1.0.3.
- [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)

---
updated-dependencies:
- dependency-name: org.mariadb:r2dbc-mariadb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e268d0952c8..ac815efcf32 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.2'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'
+    testImplementation 'org.mariadb:r2dbc-mariadb:1.0.3'
 }

From 4df31a7bbb106c5b85eaefd36f044496d9aec233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:34 +0000
Subject: [PATCH 2769/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.6.1 to 8.6.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.6.1...v8.6.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index df9fcacce21..5d2132fe0d7 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.6.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.6.2"
     testImplementation "org.elasticsearch.client:transport:7.17.9"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 3e6533d977f4035f7930aa8dae22d0a3d4350a93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:44 +0000
Subject: [PATCH 2770/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.2.2.RELEASE to 6.2.3.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/lettuce-io/lettuce-core/blob/6.2.3.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.2.2.RELEASE...6.2.3.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index eceae0d720b..b8b66f2f090 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index eff2c569303..f463202f65f 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.2"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 69ac02c16fc..576f02b67d6 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'

From f59dbc331839dff14a945e3d2d1834ee7c10ca94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:53 +0000
Subject: [PATCH 2771/4969] Bump gradle/wrapper-validation-action from 1.0.5 to
 1.0.6

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/55e685c48d84285a5b0418cd094606e199cca3b6...8d49e559aae34d3e0eb16cde532684bc9702762b)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 46ecc90cfb1..585acaa904b 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -24,4 +24,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1.0.3
+      - uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # v1.0.3

From 278585bb1e8766b02d712d82811ba9b7cfe22e98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:54 +0000
Subject: [PATCH 2772/4969] Bump release-drafter/release-drafter from 5.22.0 to
 5.23.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.22.0 to 5.23.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/cfc5540ebc9d65a8731f02032e3d44db5e449fb6...569eb7ee3a85817ab916c8f8ff03a5bd96c9c83e)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index b664c4e8fa6..0e0440cefc3 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@cfc5540ebc9d65a8731f02032e3d44db5e449fb6 # v5.19.0
+      - uses: release-drafter/release-drafter@569eb7ee3a85817ab916c8f8ff03a5bd96c9c83e # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From bfe315d9f2001f01cc8269b7f5bbc519401e5c7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:54 +0000
Subject: [PATCH 2773/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.2 to 2.20.15.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ee5a93f669d..4ae037eee08 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.406'
-    testImplementation 'software.amazon.awssdk:s3:2.20.2'
+    testImplementation 'software.amazon.awssdk:s3:2.20.15'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From 04f34d857527961b40fae21329cfb1853ef92010 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:56:54 +0000
Subject: [PATCH 2774/4969] Bump com.github.johnrengelman.shadow from 7.1.2 to
 8.1.0 in /examples

Bumps com.github.johnrengelman.shadow from 7.1.2 to 8.1.0.

---
updated-dependencies:
- dependency-name: com.github.johnrengelman.shadow
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 07e1c95bce3..4737b5c043f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.0'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
     id 'com.diffplug.spotless' version '6.13.0' apply false
 }

From 28a6db7c633143d272618bd3b22381f5b6af630d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:00 +0000
Subject: [PATCH 2775/4969] Bump org.springframework.boot from 2.7.8 to 2.7.9
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.8 to 2.7.9.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.8...v2.7.9)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index bf9ed349fcd..5e8bb02a184 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.7.8'
+    id 'org.springframework.boot' version '2.7.9'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index 708bb28e86b..eca2ee2fd3f 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.8"
+    id("org.springframework.boot") version "2.7.9"
     id("org.jetbrains.kotlin.jvm") version "1.8.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.8.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 59c35cb3213..fb70124e81a 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.7.8'
+    id 'org.springframework.boot' version '2.7.9'
 }
 apply plugin: 'io.spring.dependency-management'
 

From dc37f2bdf2a26e8b500cb55029640c46d9102f94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:02 +0000
Subject: [PATCH 2776/4969] Bump com.amazonaws:aws-java-sdk-sqs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.405 to 1.12.418.
- [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.12.405...1.12.418)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ee5a93f669d..2224ad56598 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.405'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.405'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.418'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.406'
     testImplementation 'software.amazon.awssdk:s3:2.20.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 3b4062bd0578ee53b1ee64fb8727e6f5ed305522 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:06 +0000
Subject: [PATCH 2777/4969] Bump org.postgresql:postgresql from 42.5.3 to
 42.5.4 in /examples

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.3 to 42.5.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.3...REL42.5.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4ac00f9a6ef..9c9c5b650dd 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
-    testImplementation 'org.postgresql:postgresql:42.5.3'
+    testImplementation 'org.postgresql:postgresql:42.5.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 656e26d87130ed9ecec0a33510caf1382f606846 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:11 +0000
Subject: [PATCH 2778/4969] Bump org.junit.jupiter:junit-jupiter from 5.9.1 to
 5.9.2 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index e571e0e9944..1ff02bce505 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
 }

From 8ad5025a41bdec90db43e9c2886bf19bff085686 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:13 +0000
Subject: [PATCH 2779/4969] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2
 in /modules/r2dbc

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 27032f7a829..e03a234157b 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -16,5 +16,5 @@ dependencies {
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.5.2'
-    testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
+    testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 23c4d024af1b15ef733a65486e4a2d6d0e68890c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:16 +0000
Subject: [PATCH 2780/4969] Bump com.hazelcast:hazelcast from 5.2.1 to 5.2.2 in
 /examples

Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/compare/v5.2.1...v5.2.2)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index f48c72466b5..a13e16a23c6 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.hazelcast:hazelcast:5.2.1'
+    testImplementation 'com.hazelcast:hazelcast:5.2.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From eb996fb93ec537f51f9fdd691f1829ef363def09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:23 +0000
Subject: [PATCH 2781/4969] Bump com.google.cloud:google-cloud-pubsub in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.123.2 to 1.123.4.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.123.2...v1.123.4)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index d7273cb1f9b..7d1eadfbc87 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.10'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.2'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.4'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From fde0973540d837d91d12ca6e0e35c9e1fbfcb905 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:24 +0000
Subject: [PATCH 2782/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.3 to 42.5.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.3...REL42.5.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index d1c66cf0fee..c03157ba2f9 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.3'
+    testImplementation 'org.postgresql:postgresql:42.5.4'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 1fa28cfcbc5b42c70cef5ac374bc89eccee5b00e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:38 +0000
Subject: [PATCH 2783/4969] Bump com.google.cloud:google-cloud-datastore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.13.4 to 2.13.5.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.13.4...v2.13.5)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index d7273cb1f9b..f9b3649952b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.4'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.5'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.0'

From f0e98c3475aa215c23d571f677fd193cc7689cd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:44 +0000
Subject: [PATCH 2784/4969] Bump com.google.cloud:google-cloud-bigtable in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.19.0 to 2.19.2.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.19.0...v2.19.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index d7273cb1f9b..337b734a104 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.0'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 4f62677a46bf12a9bf4b33fc6bf391d3815c34b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:57:53 +0000
Subject: [PATCH 2785/4969] Bump net.lingala.zip4j:zip4j from 2.11.4 to 2.11.5
 in /modules/hivemq

Bumps [net.lingala.zip4j:zip4j](https://github.com/srikanth-lingala/zip4j) from 2.11.4 to 2.11.5.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases)
- [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.11.4...v2.11.5)

---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index df3d792567f..48d7b5ab25c 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
-    shaded("net.lingala.zip4j:zip4j:2.11.4")
+    shaded("net.lingala.zip4j:zip4j:2.11.5")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
     testImplementation(project(":junit-jupiter"))

From b5bb89acad7b04fdb3186d1d62644271cb1fc2d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:59:27 +0000
Subject: [PATCH 2786/4969] Bump org.postgresql:postgresql from 42.5.3 to
 42.5.4 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.3 to 42.5.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.3...REL42.5.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 891f0bbe77f..ba33d00a5cd 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testImplementation 'org.postgresql:postgresql:42.5.3'
+    testImplementation 'org.postgresql:postgresql:42.5.4'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.questdb:questdb:7.0.0-jdk8'

From 69816e80698173da03afe376eb65c19c138efc29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 22:59:32 +0000
Subject: [PATCH 2787/4969] Bump org.questdb:questdb in /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.0.0-jdk8 to 7.0.1-jdk8.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/commits)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 891f0bbe77f..3f05bd37f29 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.3'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.0.0-jdk8'
+    testImplementation 'org.questdb:questdb:7.0.1-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From d8f569f5cded020b0495705dbb3b43874a1afaac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 1 Mar 2023 21:35:55 -0600
Subject: [PATCH 2788/4969] Update auto-service version to 1.0.1 (#6721)

---
 modules/mariadb/build.gradle     | 2 +-
 modules/mssqlserver/build.gradle | 2 +-
 modules/mysql/build.gradle       | 2 +-
 modules/postgresql/build.gradle  | 2 +-
 modules/r2dbc/build.gradle       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index ac815efcf32..c9c14ea72d3 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0.1'
 
     api project(':jdbc')
 
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index a77da44e01a..4aa1ecd440d 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: MS SQL Server"
 
 dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0.1'
 
     api project(':jdbc')
 
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 4dae3cd28fd..395af69604a 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0.1'
 
     api project(':jdbc')
 
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 218d3fe2d94..b0ae02fd9b6 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0'
+    compileOnly 'com.google.auto.service:auto-service:1.0.1'
 
     api project(':jdbc')
 
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index e03a234157b..b36179da19c 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -6,7 +6,7 @@ description = "Testcontainers :: R2DBC"
 
 dependencies {
     annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc6'
+    compileOnly 'com.google.auto.service:auto-service:1.0.1'
 
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'

From a927ad08778b899e2b18f71d4dfa0ddf0feb3b05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:10 +0000
Subject: [PATCH 2789/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.2...v3.5.3)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index b36179da19c..8817850528e 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.2'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.3'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From a239ac67973100b14c23c9e5ae2851ba4e52d53e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:19 +0000
Subject: [PATCH 2790/4969] Bump com.amazonaws:aws-java-sdk-logs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.406 to 1.12.418.
- [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.12.406...1.12.418)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 f7933eeac9a..f8fe878db36 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.405'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.418'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.406'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.418'
     testImplementation 'software.amazon.awssdk:s3:2.20.15'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 5bfd533d7adf7ce7d6e33df33072e36efee6aa44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:22 +0000
Subject: [PATCH 2791/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.8.0...selenium-4.8.1)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index c4aa240c06a..6ea97fc2506 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testImplementation 'mysql:mysql-connector-java:8.0.32'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.8.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.8.1"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 09e8f089f7dde66fea357b0651e12c8335f62247 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:27 +0000
Subject: [PATCH 2792/4969] Bump com.amazonaws:aws-java-sdk-s3 in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.405 to 1.12.418.
- [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.12.405...1.12.418)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 f7933eeac9a..95cdcd511fb 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.405'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.418'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.418'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.406'
     testImplementation 'software.amazon.awssdk:s3:2.20.15'

From 75d113a1f162ab7ef9bd69f82469654e7d4409a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:27 +0000
Subject: [PATCH 2793/4969] Bump org.json:json from 20220924 to 20230227 in
 /examples

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20220924 to 20230227.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9c9c5b650dd..b27851a23cb 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'org.json:json:20220924'
+    implementation 'org.json:json:20230227'
     testImplementation 'org.postgresql:postgresql:42.5.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'

From e301a83ca9d7b3d6bbe554dd801e926cd6f42717 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:28 +0000
Subject: [PATCH 2794/4969] Bump com.google.cloud:google-cloud-spanner in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.36.0 to 6.36.1.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.36.0...v6.36.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9043ca897fa..9c48f26ee2a 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.5'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.10'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.4'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.36.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.36.1'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From ca53a96bdde4f9c2374c15b3baa60320c9dedb23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:28 +0000
Subject: [PATCH 2795/4969] Bump io.trino:trino-jdbc from 406 to 408 in
 /modules/trino

Bumps io.trino:trino-jdbc from 406 to 408.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index eb2efda5c8f..de022d95faf 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:406'
+    testImplementation 'io.trino:trino-jdbc:408'
     compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From a4e16bf46e13ce83bd57fc9fefb5584e93d3da6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:29 +0000
Subject: [PATCH 2796/4969] Bump com.azure:azure-cosmos from 4.40.0 to 4.41.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.40.0 to 4.41.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.40.0...azure-cosmos_4.41.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 9aa8961bebe..33a30b0ecb5 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.40.0'
+    testImplementation 'com.azure:azure-cosmos:4.41.0'
 }

From 16844be60b469c45da16c99388f3c60acb65130a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 03:36:29 +0000
Subject: [PATCH 2797/4969] Bump com.google.cloud:google-cloud-firestore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.7.10 to 3.8.1.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.7.10...v3.8.1)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9043ca897fa..f1d12f4c81d 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.5'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.10'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.8.1'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.4'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.2'

From fd1a6246ec75565be1b4ff1abd3fdb4411ac065b Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@redhat.com>
Date: Thu, 2 Mar 2023 16:43:43 +0000
Subject: [PATCH 2798/4969] Reset network creation state if network creation
 fails (#6668)

This allows any `startAttempts` that the user has applied to the container to retry the creation of the network too.

Fix #6667

Signed-off-by: kwall <kwall@apache.org>
---
 .../java/org/testcontainers/containers/Network.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
index fac7beff638..88ddd6dd906 100644
--- a/core/src/main/java/org/testcontainers/containers/Network.java
+++ b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -59,9 +59,16 @@ class NetworkImpl extends ExternalResource implements Network {
         @Override
         public synchronized String getId() {
             if (initialized.compareAndSet(false, true)) {
-                id = create();
+                boolean success = false;
+                try {
+                    id = create();
+                    success = true;
+                } finally {
+                    if (!success) {
+                        initialized.set(false);
+                    }
+                }
             }
-
             return id;
         }
 

From 000cba7b810eb35918a97e7db889e68f627c2b73 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 18:26:52 -0600
Subject: [PATCH 2799/4969] Update Gradle Wrapper to 8.0.2 (#6728)

* Update Gradle Wrapper from 8.0.1 to 8.0.2.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.0.1 to 8.0.2.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

---------

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 gradle/wrapper/gradle-wrapper.properties          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index f396aaac2d3..19acfb4ef2f 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a82eb06ab6c..a2efda8857b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=948d1e4ccc2f6ae36cbfa087d827aaca51403acae5411e664a6000bb47946f22
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 8ab585ce000a077512dbf68f3b9ba534ec2a76aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 7 Mar 2023 10:25:32 -0600
Subject: [PATCH 2800/4969] Update ubuntu images (#6732)

ubuntu-18.04 is deprecated. For that reason, `azure` module is
being deprecated from the CI.
---
 .github/workflows/ci-docker-wormhole.yml            | 2 +-
 .github/workflows/ci-examples.yml                   | 4 ++--
 .github/workflows/ci-rootless.yml                   | 2 +-
 .github/workflows/ci.yml                            | 6 +++---
 .github/workflows/release.yml                       | 2 +-
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 995c13a9615..126fc7feb8a 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   in-docker_test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Build with Gradle
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index ad2df508e61..cf24388ddd8 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   find_gradle_jobs:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index c8203fb7378..cbe7688eb08 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa4dcae6149..59099cd9b86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   find_gradle_jobs:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -36,7 +36,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
-          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":azure:check"))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c6fa99f2477..3ad9f765a0f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   release:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 0915afd3826..a511a8913de 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: github.repository == 'testcontainers/testcontainers-java'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index bf11d121eac..8c34789b25c 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: github.repository == 'testcontainers/testcontainers-java'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:

From 7da9824a15c45eb64bd0d793dae08f3508d6290c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 7 Mar 2023 11:46:13 -0600
Subject: [PATCH 2801/4969] Update java-version to 8 - latest (#6733)

---
 .github/workflows/ci-examples.yml | 4 ++--
 .github/workflows/ci.yml          | 4 ++--
 .github/workflows/release.yml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index cf24388ddd8..86d0c5e1c38 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '8.0.302'
+          java-version: '8'
           distribution: temurin
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '8.0.302'
+          java-version: '8'
           distribution: temurin
       - name: Clear existing docker image cache
         run: docker image prune -af
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59099cd9b86..685eaee9769 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '8.0.302'
+          java-version: '8'
           distribution: temurin
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '8.0.302'
+          java-version: '8'
           distribution: temurin
       - name: Clear existing docker image cache
         run: docker image prune -af
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ad9f765a0f..07d19ab0343 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '8.0.302'
+          java-version: '8'
           distribution: temurin
       - name: Clear existing docker image cache
         run: docker image prune -af

From c90daab5d80adb692f213fa5f02c108a329105d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 8 Mar 2023 18:49:03 -0600
Subject: [PATCH 2802/4969] Ignore snakeyaml major version update (#6735)

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3e781c82e7e..ecf473b2d65 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,6 +16,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.mockito:mockito-core"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.yaml:snakeyaml"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:

From 65b6aeb40922ea9d0e5e6fa9e607cfbde24512ae Mon Sep 17 00:00:00 2001
From: Cristian Greco <cristianrgreco@gmail.com>
Date: Fri, 10 Mar 2023 14:19:57 +0000
Subject: [PATCH 2803/4969] Use ubuntu-22.04 (#6771)

Use existing rootless-docker GHA for rootless CI which makes
test run in ubuntu-22.04
---
 .github/workflows/ci-docker-wormhole.yml |  2 +-
 .github/workflows/ci-examples.yml        |  4 ++--
 .github/workflows/ci-rootless.yml        | 27 +++++-------------------
 .github/workflows/ci.yml                 |  4 ++--
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 126fc7feb8a..39a70d1f2e2 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   in-docker_test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Build with Gradle
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 86d0c5e1c38..a1193951d09 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   find_gradle_jobs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index cbe7688eb08..13fd0202c54 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -13,30 +13,13 @@ permissions:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { XDG_RUNTIME_DIR: "" }
-          - { XDG_RUNTIME_DIR: "/tmp/docker-testcontainers/" }
-    env:
-      XDG_RUNTIME_DIR: ${{ matrix.XDG_RUNTIME_DIR }}
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - name: debug
-        run: id -u; whoami
-      - name: uninstall rootful Docker
-        run: sudo apt-get -q -y --purge remove moby-engine moby-buildx && sudo rm -rf /var/run/docker.sock
-      - name: install rootless Docker
-        run: |
-          mkdir -p $XDG_RUNTIME_DIR || true
-          curl -fsSL https://get.docker.com/rootless | sh > init.sh
-          cat init.sh
-          source <(grep '^export' init.sh)
-          PATH=$HOME/bin:$PATH dockerd-rootless.sh --experimental --storage-driver vfs &
-          sleep 1
-          DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock docker info || ls -la $XDG_RUNTIME_DIR
+      - name: Setup rootless Docker
+        uses: ScribeMD/rootless-docker@0.2.2
+      - name: Remove Docket root socket
+        run: sudo rm -rf /var/run/docker.sock
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
       - name: Build with Gradle
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 685eaee9769..db89ffaa7f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   find_gradle_jobs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3

From 74a523a915ee9ab6d9de9afc9214162b87dae2b1 Mon Sep 17 00:00:00 2001
From: Samed Bicer <15824212+samed-bicer@users.noreply.github.com>
Date: Mon, 13 Mar 2023 20:17:33 +0000
Subject: [PATCH 2804/4969] [junit-jupiter] Add parallel attribute to
 `@Testcontainers` (#6658)

Fixes #5037
---
 .../junit/jupiter/Testcontainers.java         |  5 ++
 .../jupiter/TestcontainersExtension.java      | 46 ++++++++++++++++---
 .../junit/jupiter/JUnitJupiterTestImages.java |  1 +
 .../junit/jupiter/ParallelExecutionTests.java | 28 +++++++++++
 4 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ParallelExecutionTests.java

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
index 730339f0fd5..9ae67e9e973 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
@@ -63,4 +63,9 @@
      * Whether tests should be disabled (rather than failing) when Docker is not available.
      */
     boolean disabledWithoutDocker() default false;
+
+    /**
+     * Whether containers should start in parallel
+     */
+    boolean parallel() default false;
 }
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 757083dc322..d841e5f38dd 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -18,6 +18,7 @@
 import org.junit.platform.commons.support.ReflectionSupport;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.lifecycle.Startables;
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
 
@@ -52,9 +53,7 @@ public void beforeAll(ExtensionContext context) {
         Store store = context.getStore(NAMESPACE);
         List<StoreAdapter> sharedContainersStoreAdapters = findSharedContainers(testClass);
 
-        sharedContainersStoreAdapters.forEach(adapter -> {
-            store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start());
-        });
+        startContainers(sharedContainersStoreAdapters, store, context);
 
         List<TestLifecycleAware> lifecycleAwareContainers = sharedContainersStoreAdapters
             .stream()
@@ -66,6 +65,18 @@ public void beforeAll(ExtensionContext context) {
         signalBeforeTestToContainers(lifecycleAwareContainers, testDescriptionFrom(context));
     }
 
+    private void startContainers(List<StoreAdapter> storeAdapters, Store store, ExtensionContext context) {
+        if (storeAdapters.isEmpty()) {
+            return;
+        }
+
+        if (isParallelExecutionEnabled(context)) {
+            Startables.deepStart(storeAdapters.stream().map(storeAdapter -> storeAdapter.container)).join();
+        } else {
+            storeAdapters.forEach(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()));
+        }
+    }
+
     @Override
     public void afterAll(ExtensionContext context) {
         signalAfterTestToContainersFor(SHARED_LIFECYCLE_AWARE_CONTAINERS, context);
@@ -75,18 +86,39 @@ public void afterAll(ExtensionContext context) {
     public void beforeEach(final ExtensionContext context) {
         Store store = context.getStore(NAMESPACE);
 
-        List<TestLifecycleAware> lifecycleAwareContainers = collectParentTestInstances(context)
+        List<StoreAdapter> restartContainers = collectParentTestInstances(context)
             .parallelStream()
             .flatMap(this::findRestartContainers)
-            .peek(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()))
-            .filter(this::isTestLifecycleAware)
-            .map(lifecycleAwareAdapter -> (TestLifecycleAware) lifecycleAwareAdapter.container)
             .collect(Collectors.toList());
 
+        List<TestLifecycleAware> lifecycleAwareContainers = findTestLifecycleAwareContainers(
+            restartContainers,
+            store,
+            context
+        );
+
         store.put(LOCAL_LIFECYCLE_AWARE_CONTAINERS, lifecycleAwareContainers);
         signalBeforeTestToContainers(lifecycleAwareContainers, testDescriptionFrom(context));
     }
 
+    private List<TestLifecycleAware> findTestLifecycleAwareContainers(
+        List<StoreAdapter> restartContainers,
+        Store store,
+        ExtensionContext context
+    ) {
+        startContainers(restartContainers, store, context);
+
+        return restartContainers
+            .stream()
+            .filter(this::isTestLifecycleAware)
+            .map(lifecycleAwareAdapter -> (TestLifecycleAware) lifecycleAwareAdapter.container)
+            .collect(Collectors.toList());
+    }
+
+    private boolean isParallelExecutionEnabled(ExtensionContext context) {
+        return findTestcontainers(context).map(Testcontainers::parallel).orElse(false);
+    }
+
     @Override
     public void afterEach(ExtensionContext context) {
         signalAfterTestToContainersFor(LOCAL_LIFECYCLE_AWARE_CONTAINERS, context);
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
index e99d1ec720c..9097c4d3457 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
@@ -5,4 +5,5 @@
 public interface JUnitJupiterTestImages {
     DockerImageName POSTGRES_IMAGE = DockerImageName.parse("postgres:9.6.12");
     DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine");
+    DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:8.0.32");
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ParallelExecutionTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ParallelExecutionTests.java
new file mode 100644
index 00000000000..84d11a8235b
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ParallelExecutionTests.java
@@ -0,0 +1,28 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.containers.PostgreSQLContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Testcontainers(parallel = true)
+public class ParallelExecutionTests {
+
+    @Container
+    private static final PostgreSQLContainer<?> POSTGRESQL_CONTAINER = new PostgreSQLContainer<>(
+        JUnitJupiterTestImages.POSTGRES_IMAGE
+    )
+        .withDatabaseName("foo")
+        .withUsername("foo")
+        .withPassword("secret");
+
+    @Container
+    private MySQLContainer<?> mySQLContainer = new MySQLContainer<>(JUnitJupiterTestImages.MYSQL_IMAGE);
+
+    @Test
+    void test() {
+        assertThat(POSTGRESQL_CONTAINER.isRunning()).isTrue();
+        assertThat(mySQLContainer.isRunning()).isTrue();
+    }
+}

From f78c0c320f2a8929bcdd03e9d5b003b069bf27ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 13 Mar 2023 15:33:24 -0600
Subject: [PATCH 2805/4969] Add support to build images using Jib (#5623)

[Jib](https://github.com/GoogleContainerTools/jib) is a java library to build container images.
`JibImage` is provided in order to be used along with `GenericContainer` and build images
using Jib API.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 core/build.gradle                             |  3 +
 .../testcontainers/jib/JibDockerClient.java   | 84 ++++++++++++++++++
 .../java/org/testcontainers/jib/JibImage.java | 59 +++++++++++++
 .../testcontainers/jib/JibImageDetails.java   | 42 +++++++++
 .../testcontainers/containers/JibTest.java    | 88 +++++++++++++++++++
 docs/features/jib.md                          | 11 +++
 mkdocs.yml                                    |  1 +
 7 files changed, 288 insertions(+)
 create mode 100644 core/src/main/java/org/testcontainers/jib/JibDockerClient.java
 create mode 100644 core/src/main/java/org/testcontainers/jib/JibImage.java
 create mode 100644 core/src/main/java/org/testcontainers/jib/JibImageDetails.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/JibTest.java
 create mode 100644 docs/features/jib.md

diff --git a/core/build.gradle b/core/build.gradle
index 782319ad7be..58c47a8f623 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -62,6 +62,7 @@ configurations.all {
     resolutionStrategy {
         // use lower Jackson version
         force 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
+        force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8'
     }
 }
 
@@ -75,6 +76,8 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
+    provided 'com.google.cloud.tools:jib-core:0.22.0'
+
     shaded 'org.awaitility:awaitility:4.2.0'
 
     api platform('com.github.docker-java:docker-java-bom:3.3.0')
diff --git a/core/src/main/java/org/testcontainers/jib/JibDockerClient.java b/core/src/main/java/org/testcontainers/jib/JibDockerClient.java
new file mode 100644
index 00000000000..ddcf5fdc0ea
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/jib/JibDockerClient.java
@@ -0,0 +1,84 @@
+package org.testcontainers.jib;
+
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.command.LoadImageCallback;
+import com.google.cloud.tools.jib.api.DockerClient;
+import com.google.cloud.tools.jib.api.ImageDetails;
+import com.google.cloud.tools.jib.api.ImageReference;
+import com.google.cloud.tools.jib.http.NotifyingOutputStream;
+import com.google.cloud.tools.jib.image.ImageTarball;
+import com.google.common.io.ByteStreams;
+import lombok.Cleanup;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.UnstableAPI;
+import org.testcontainers.images.RemoteDockerImage;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.function.Consumer;
+
+@UnstableAPI
+class JibDockerClient implements DockerClient {
+
+    private static JibDockerClient instance;
+
+    private final com.github.dockerjava.api.DockerClient dockerClient = DockerClientFactory.lazyClient();
+
+    public static JibDockerClient instance() {
+        if (instance == null) {
+            instance = new JibDockerClient();
+        }
+
+        return instance;
+    }
+
+    @Override
+    public boolean supported(Map<String, String> map) {
+        return false;
+    }
+
+    @Override
+    public String load(ImageTarball imageTarball, Consumer<Long> writtenByteCountListener) throws IOException {
+        @Cleanup
+        PipedInputStream in = new PipedInputStream();
+        @Cleanup
+        PipedOutputStream out = new PipedOutputStream(in);
+        LoadImageCallback loadImage = this.dockerClient.loadImageAsyncCmd(in).exec(new LoadImageCallback());
+
+        try (NotifyingOutputStream stdin = new NotifyingOutputStream(out, writtenByteCountListener)) {
+            imageTarball.writeTo(stdin);
+        }
+
+        return loadImage.awaitMessage();
+    }
+
+    @Override
+    public void save(ImageReference imageReference, Path outputPath, Consumer<Long> writtenByteCountListener)
+        throws IOException {
+        try (
+            InputStream inputStream = this.dockerClient.saveImageCmd(imageReference.toString()).exec();
+            InputStream stdout = new BufferedInputStream(inputStream);
+            OutputStream fileStream = new BufferedOutputStream(Files.newOutputStream(outputPath));
+            NotifyingOutputStream notifyingFileStream = new NotifyingOutputStream(fileStream, writtenByteCountListener)
+        ) {
+            ByteStreams.copy(stdout, notifyingFileStream);
+        }
+    }
+
+    @Override
+    public ImageDetails inspect(ImageReference imageReference) {
+        new RemoteDockerImage(DockerImageName.parse(imageReference.toString())).get();
+
+        InspectImageResponse response = this.dockerClient.inspectImageCmd(imageReference.toString()).exec();
+        return new JibImageDetails(response.getSize(), response.getId(), response.getRootFS().getLayers());
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/jib/JibImage.java b/core/src/main/java/org/testcontainers/jib/JibImage.java
new file mode 100644
index 00000000000..536d3fdf4e1
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/jib/JibImage.java
@@ -0,0 +1,59 @@
+package org.testcontainers.jib;
+
+import com.google.cloud.tools.jib.api.Containerizer;
+import com.google.cloud.tools.jib.api.DockerClient;
+import com.google.cloud.tools.jib.api.DockerDaemonImage;
+import com.google.cloud.tools.jib.api.Jib;
+import com.google.cloud.tools.jib.api.JibContainer;
+import com.google.cloud.tools.jib.api.JibContainerBuilder;
+import lombok.SneakyThrows;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.LazyFuture;
+import org.testcontainers.utility.ResourceReaper;
+
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class JibImage extends LazyFuture<String> {
+
+    private final DockerClient dockerClient = JibDockerClient.instance();
+
+    private static final Map<String, String> DEFAULT_LABELS = Stream
+        .of(
+            DockerClientFactory.DEFAULT_LABELS.entrySet().stream(),
+            ResourceReaper.instance().getLabels().entrySet().stream()
+        )
+        .flatMap(Function.identity())
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+    private final String baseImage;
+
+    private final Function<JibContainerBuilder, JibContainerBuilder> jibContainerBuilderFn;
+
+    public JibImage(String baseImage, Function<JibContainerBuilder, JibContainerBuilder> jibContainerBuilderFn) {
+        this.baseImage = baseImage;
+        this.jibContainerBuilderFn = jibContainerBuilderFn;
+    }
+
+    @SneakyThrows
+    @Override
+    protected String resolve() {
+        JibContainerBuilder containerBuilder = Jib.from(this.dockerClient, DockerDaemonImage.named(this.baseImage));
+        Function<JibContainerBuilder, JibContainerBuilder> applyLabelsFn = jibContainerBuilder -> {
+            for (Map.Entry<String, String> entry : DEFAULT_LABELS.entrySet()) {
+                jibContainerBuilder.addLabel(entry.getKey(), entry.getValue());
+            }
+            return jibContainerBuilder;
+        };
+        JibContainer jibContainer =
+            this.jibContainerBuilderFn.andThen(applyLabelsFn)
+                .apply(containerBuilder)
+                .containerize(
+                    Containerizer.to(this.dockerClient, DockerDaemonImage.named(Base58.randomString(8).toLowerCase()))
+                );
+        return jibContainer.getTargetImage().toString();
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/jib/JibImageDetails.java b/core/src/main/java/org/testcontainers/jib/JibImageDetails.java
new file mode 100644
index 00000000000..68ff6ba3f63
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/jib/JibImageDetails.java
@@ -0,0 +1,42 @@
+package org.testcontainers.jib;
+
+import com.google.cloud.tools.jib.api.DescriptorDigest;
+import com.google.cloud.tools.jib.api.ImageDetails;
+
+import java.security.DigestException;
+import java.util.ArrayList;
+import java.util.List;
+
+class JibImageDetails implements ImageDetails {
+
+    private long size;
+
+    private String imageId;
+
+    private List<String> layers;
+
+    public JibImageDetails(long size, String imageId, List<String> layers) {
+        this.size = size;
+        this.imageId = imageId;
+        this.layers = layers;
+    }
+
+    @Override
+    public long getSize() {
+        return this.size;
+    }
+
+    @Override
+    public DescriptorDigest getImageId() throws DigestException {
+        return DescriptorDigest.fromDigest(this.imageId);
+    }
+
+    @Override
+    public List<DescriptorDigest> getDiffIds() throws DigestException {
+        List<DescriptorDigest> processedDiffIds = new ArrayList<>(this.layers.size());
+        for (String diffId : this.layers) {
+            processedDiffIds.add(DescriptorDigest.fromDigest(diffId.trim()));
+        }
+        return processedDiffIds;
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/JibTest.java b/core/src/test/java/org/testcontainers/containers/JibTest.java
new file mode 100644
index 00000000000..1441ff00120
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/JibTest.java
@@ -0,0 +1,88 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.command.InspectImageResponse;
+import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.output.OutputFrame.OutputType;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.jib.JibImage;
+
+import java.time.Duration;
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JibTest {
+
+    @Test
+    public void buildImage() {
+        try (
+            // jibContainerUsage {
+            GenericContainer<?> busybox = new GenericContainer<>(
+                new JibImage(
+                    "busybox:1.35",
+                    jibContainerBuilder -> {
+                        return jibContainerBuilder.setEntrypoint("echo", "Hello World");
+                    }
+                )
+            )
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3)))
+            // }
+        ) {
+            busybox.start();
+            String logs = busybox.getLogs(OutputType.STDOUT);
+            assertThat(logs).contains("Hello World");
+        }
+    }
+
+    @Test
+    public void standardLabelsAreAddedWhenUsingJibSetLabels() {
+        try (
+            GenericContainer<?> busybox = new GenericContainer<>(
+                new JibImage(
+                    "busybox:1.35",
+                    jibContainerBuilder -> {
+                        return jibContainerBuilder
+                            .setEntrypoint("echo", "Hello World")
+                            .setLabels(Collections.singletonMap("foo", "bar"));
+                    }
+                )
+            )
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3)))
+        ) {
+            busybox.start();
+            assertImageLabels(busybox);
+        }
+    }
+
+    @Test
+    public void standardLabelsAreAddedWhenUsingJibAddLabel() {
+        try (
+            GenericContainer<?> busybox = new GenericContainer<>(
+                new JibImage(
+                    "busybox:1.35",
+                    jibContainerBuilder -> {
+                        return jibContainerBuilder.setEntrypoint("echo", "Hello World").addLabel("foo", "bar");
+                    }
+                )
+            )
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofSeconds(3)))
+        ) {
+            busybox.start();
+            assertImageLabels(busybox);
+        }
+    }
+
+    private static void assertImageLabels(GenericContainer<?> busybox) {
+        String image = busybox.getContainerInfo().getConfig().getImage();
+        InspectImageResponse imageResponse = DockerClientFactory.lazyClient().inspectImageCmd(image).exec();
+        assertThat(imageResponse.getConfig().getLabels())
+            .containsEntry("foo", "bar")
+            .containsKeys(
+                "org.testcontainers",
+                "org.testcontainers.sessionId",
+                "org.testcontainers.lang",
+                "org.testcontainers.version"
+            );
+    }
+}
diff --git a/docs/features/jib.md b/docs/features/jib.md
new file mode 100644
index 00000000000..c0be0188b07
--- /dev/null
+++ b/docs/features/jib.md
@@ -0,0 +1,11 @@
+# Using Jib
+
+[Jib](https://github.com/GoogleContainerTools/jib/tree/master/jib-core) is a library for building Docker images.
+You can use it as an alternative to Testcontainers default `DockerfileBuilder`.
+
+<!--codeinclude-->
+[GenericContainer with JibImage](../../core/src/test/java/org/testcontainers/containers/JibTest.java) inside_block:jibContainerUsage
+<!--/codeinclude-->
+
+!!! hint
+The Testcontainers library JAR will not automatically add a `jib-core` JAR to your project. Minimum version required is `com.google.cloud.tools:jib-core:0.22.0`.
diff --git a/mkdocs.yml b/mkdocs.yml
index 441607691ac..8da6fa584ac 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -39,6 +39,7 @@ nav:
           - features/startup_and_waits.md
           - features/container_logs.md
           - features/creating_images.md
+          - features/jib.md
           - features/configuration.md
           - features/image_name_substitution.md
           - features/advanced_options.md

From 34aa967c562acd578ae724d408ee4807897b9d27 Mon Sep 17 00:00:00 2001
From: Justin Lee <evanchooly@users.noreply.github.com>
Date: Tue, 14 Mar 2023 12:41:28 -0400
Subject: [PATCH 2806/4969] Add sharding support to MongoDBContainer (#6727)

---
 .../containers/MongoDBContainer.java          | 84 +++++++++++++------
 .../mongodb/src/main/resources/sharding.sh    | 68 +++++++++++++++
 .../containers/MongoDBContainerTest.java      | 28 +++++--
 3 files changed, 148 insertions(+), 32 deletions(-)
 create mode 100644 modules/mongodb/src/main/resources/sharding.sh

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index d6304ac8c5d..563985cb57b 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -6,6 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
 import java.io.IOException;
 
@@ -29,6 +30,10 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
 
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
+    private boolean shardingEnabled;
+
     /**
      * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
      */
@@ -46,8 +51,44 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(MONGODB_INTERNAL_PORT);
-        withCommand("--replSet", "docker-rs");
-        waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
+    }
+
+    @Override
+    public void configure() {
+        if (shardingEnabled) {
+            withCreateContainerCmdModifier(cmd -> {
+                cmd.withEntrypoint("sh");
+            });
+            withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+            waitingFor(Wait.forLogMessage("(?i).*mongos ready.*", 1));
+        } else {
+            withCommand("--replSet", "docker-rs");
+            waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
+        }
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        if (shardingEnabled) {
+            copyFileToContainer(MountableFile.forClasspathResource("/sharding.sh", 0777), STARTER_SCRIPT);
+        }
+    }
+
+    /**
+     * Enables sharding on the cluster
+     *
+     * @return this
+     */
+    public MongoDBContainer withSharding() {
+        this.shardingEnabled = true;
+        return this;
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+        if (!shardingEnabled) {
+            initReplicaSet(reused);
+        }
     }
 
     /**
@@ -81,15 +122,6 @@ public String getReplicaSetUrl(final String databaseName) {
         return getConnectionString() + "/" + databaseName;
     }
 
-    @Override
-    protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
-        if (reused && isReplicationSetAlreadyInitialized()) {
-            log.debug("Replica set already initialized.");
-        } else {
-            initReplicaSet();
-        }
-    }
-
     private String[] buildMongoEvalCommand(final String command) {
         return new String[] {
             "sh",
@@ -133,20 +165,24 @@ private void checkMongoNodeExitCodeAfterWaiting(final Container.ExecResult execR
     }
 
     @SneakyThrows(value = { IOException.class, InterruptedException.class })
-    private void initReplicaSet() {
-        log.debug("Initializing a single node node replica set...");
-        final ExecResult execResultInitRs = execInContainer(buildMongoEvalCommand("rs.initiate();"));
-        log.debug(execResultInitRs.getStdout());
-        checkMongoNodeExitCode(execResultInitRs);
-
-        log.debug(
-            "Awaiting for a single node replica set initialization up to {} attempts",
-            AWAIT_INIT_REPLICA_SET_ATTEMPTS
-        );
-        final ExecResult execResultWaitForMaster = execInContainer(buildMongoEvalCommand(buildMongoWaitCommand()));
-        log.debug(execResultWaitForMaster.getStdout());
+    private void initReplicaSet(boolean reused) {
+        if (reused && isReplicationSetAlreadyInitialized()) {
+            log.debug("Replica set already initialized.");
+        } else {
+            log.debug("Initializing a single node node replica set...");
+            final ExecResult execResultInitRs = execInContainer(buildMongoEvalCommand("rs.initiate();"));
+            log.debug(execResultInitRs.getStdout());
+            checkMongoNodeExitCode(execResultInitRs);
 
-        checkMongoNodeExitCodeAfterWaiting(execResultWaitForMaster);
+            log.debug(
+                "Awaiting for a single node replica set initialization up to {} attempts",
+                AWAIT_INIT_REPLICA_SET_ATTEMPTS
+            );
+            final ExecResult execResultWaitForMaster = execInContainer(buildMongoEvalCommand(buildMongoWaitCommand()));
+            log.debug(execResultWaitForMaster.getStdout());
+
+            checkMongoNodeExitCodeAfterWaiting(execResultWaitForMaster);
+        }
     }
 
     public static class ReplicaSetInitializationException extends RuntimeException {
diff --git a/modules/mongodb/src/main/resources/sharding.sh b/modules/mongodb/src/main/resources/sharding.sh
new file mode 100644
index 00000000000..931d62c4222
--- /dev/null
+++ b/modules/mongodb/src/main/resources/sharding.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+CONFIGSVR=/tmp/mongod/configsvr
+SHARDSVR=/tmp/mongod/shardsvr
+
+function retry() {
+    COUNT=${COUNT:-0}
+    if [ $COUNT == 5 ]
+    then
+        echo Failed $COUNT attempts
+        exit 1
+    fi
+
+    sleep $COUNT
+    echo "Attempt #$[ $COUNT  + 1 ] '$*' "
+    eval $*
+    if [ $? -ne 0 ]
+    then
+        COUNT=$[ $COUNT + 1 ]
+        retry $*
+    fi
+    unset COUNT
+}
+
+function initReplSet() {
+    PORT=$1
+    COUNT=${2:-1}
+
+    CMD="mongosh --quiet --port $PORT --eval \"if(db.adminCommand({replSetGetStatus: 1})['myState'] != 1) quit(900)\""
+    eval $CMD
+    retVal=$?
+    if [ $retVal -ne 0 -a $COUNT -ne 5 ]
+    then
+        echo "Initiating replSet (attempt $COUNT)"
+        mongosh --quiet --port $PORT --eval 'rs.initiate();'
+        if [ $? -ne 0 ]
+        then
+            sleep $COUNT
+            initReplSet $PORT $[ $COUNT + 1 ]
+        fi
+    fi
+    unset COUNT
+}
+
+rm -rf $CONFIGSVR $SHARDSVR
+mkdir -p $CONFIGSVR
+mkdir -p $SHARDSVR
+
+echo "Starting configsvr"
+mongod --bind_ip_all --configsvr --port 27019 --replSet configsvr-rs --dbpath $CONFIGSVR --logpath /tmp/configsvr.log &
+echo "Initiating configsvr replSet"
+initReplSet 27019
+
+echo "Starting shardsvr"
+mongod --bind_ip_all --shardsvr --port 27018 --replSet shardsvr-rs --dbpath $SHARDSVR --logpath /tmp/shardsvr.log &
+
+echo "Initiating shardsvr replSet"
+initReplSet 27018
+
+echo "Starting mongos"
+mongos --bind_ip_all --configdb configsvr-rs/localhost:27019 --logpath /tmp/mongos.log &
+
+echo "Adding a shard"
+retry "mongosh --eval 'sh.addShard(\"shardsvr-rs/`hostname`:27018\");'"
+
+echo "mongos ready"
+mongosh --quiet tctest --eval "db.testcollection.insertOne({});"
+sleep 36000
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index dd59420f937..8d176e75ea2 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -35,11 +35,8 @@ public void shouldExecuteTransactions() {
     }
 
     private void executeTx(MongoDBContainer mongoDBContainer) {
-        final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
-        assertThat(mongoRsUrl).isNotNull();
-        final String connectionString = mongoDBContainer.getConnectionString();
-        final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
-        final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
+        final MongoClient mongoSyncClientBase = MongoClients.create(mongoDBContainer.getConnectionString());
+        final MongoClient mongoSyncClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
         mongoSyncClient
             .getDatabase("mydb1")
             .getCollection("foo")
@@ -103,10 +100,25 @@ public void shouldTestDatabaseName() {
     }
 
     @Test
-    public void supportsMongoDB_6() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:6.0.1")) {
+    public void shouldSupportSharding() {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:6").withSharding()) {
             mongoDBContainer.start();
-            executeTx(mongoDBContainer);
+            final MongoClient mongoClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
+
+            mongoClient.getDatabase("mydb1").getCollection("foo").insertOne(new Document("abc", 0));
+
+            Document shards = mongoClient.getDatabase("config").getCollection("shards").find().first();
+            assertThat(shards).isNotNull();
+            assertThat(shards).isNotEmpty();
+            assertThat(isReplicaSet(mongoClient));
         }
     }
+
+    private boolean isReplicaSet(MongoClient mongoClient) {
+        return runIsMaster(mongoClient).get("setName") != null;
+    }
+
+    private Document runIsMaster(MongoClient mongoClient) {
+        return mongoClient.getDatabase("admin").runCommand(new Document("ismaster", 1));
+    }
 }

From 209e53b0cbf12cb4ddcda6ea78cbe8c67fe03cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Mar 2023 12:46:20 -0600
Subject: [PATCH 2807/4969] Add `tc.` prefix to container logger names (#6781)

Co-authored-by: Vitalii Chura <vcvitaly@yahoo.com>

Fixes #3016
---
 .../utility/DockerLoggerFactory.java          |  6 +---
 .../utility/DockerLoggerFactoryTest.java      | 31 +++++++++++++++++++
 core/src/test/resources/logback-test.xml      |  1 +
 .../logging_config.md                         |  2 ++
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java

diff --git a/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java b/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java
index c372c3cea3e..e45c5867dd9 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerLoggerFactory.java
@@ -16,10 +16,6 @@ public static Logger getLogger(String dockerImageName) {
             abbreviatedName = dockerImageName;
         }
 
-        if ("UTF-8".equals(System.getProperty("file.encoding"))) {
-            return LoggerFactory.getLogger("\uD83D\uDC33 [" + abbreviatedName + "]");
-        } else {
-            return LoggerFactory.getLogger("docker[" + abbreviatedName + "]");
-        }
+        return LoggerFactory.getLogger("tc." + abbreviatedName);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java b/core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java
new file mode 100644
index 00000000000..17f0f3d7160
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java
@@ -0,0 +1,31 @@
+package org.testcontainers.utility;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DockerLoggerFactoryTest {
+
+    private static final Logger LOGGER = (Logger) DockerLoggerFactory.getLogger("dockerImageName");
+
+    @Test
+    public void debugIsNotSwallowedForContainerLogs() {
+        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+        listAppender.start();
+        LOGGER.addAppender(listAppender);
+
+        LOGGER.debug("some text");
+
+        assertThat(listAppender.list).withFailMessage("Log message has been swallowed").hasSize(1);
+
+        ILoggingEvent event = listAppender.list.get(0);
+
+        assertThat(event.getFormattedMessage()).isEqualTo("some text");
+        assertThat(event.getLevel()).isEqualTo(Level.DEBUG);
+        assertThat(event.getLoggerName()).startsWith("tc");
+    }
+}
diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
index 40e32b54c36..7d4d9e8f4b4 100644
--- a/core/src/test/resources/logback-test.xml
+++ b/core/src/test/resources/logback-test.xml
@@ -13,6 +13,7 @@
     </root>
 
     <logger name="org.testcontainers" level="INFO"/>
+    <logger name="tc.dockerImageName" level="DEBUG"/>
 
     <logger name="com.github.dockerjava" level="WARN"/>
     <logger name="org.zeroturnaround.exec" level="WARN"/>
diff --git a/docs/supported_docker_environment/logging_config.md b/docs/supported_docker_environment/logging_config.md
index 3e4660e85ae..6bbe0584434 100644
--- a/docs/supported_docker_environment/logging_config.md
+++ b/docs/supported_docker_environment/logging_config.md
@@ -17,6 +17,8 @@ should be included in your classpath to show a reasonable level of log output:
     </root>
 
     <logger name="org.testcontainers" level="INFO"/>
+    <!-- The following logger can be used for containers logs since 1.18.0 -->
+    <logger name="tc" level="INFO"/>
     <logger name="com.github.dockerjava" level="WARN"/>
     <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
 </configuration>

From 9d061afb340dd2b372e82ad6bfdf403305386b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 14 Mar 2023 15:29:12 -0600
Subject: [PATCH 2808/4969] Fix assertion

---
 .../org/testcontainers/containers/MongoDBContainerTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index 8d176e75ea2..f5cb4dd5d90 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -110,7 +110,7 @@ public void shouldSupportSharding() {
             Document shards = mongoClient.getDatabase("config").getCollection("shards").find().first();
             assertThat(shards).isNotNull();
             assertThat(shards).isNotEmpty();
-            assertThat(isReplicaSet(mongoClient));
+            assertThat(isReplicaSet(mongoClient)).isFalse();
         }
     }
 

From 2cbb50094a1717621790afe86e04b9194696abeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Mar 2023 11:25:36 -0600
Subject: [PATCH 2809/4969] Update testcontainers/ryuk version to 0.4.0 (#6782)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index beed2e92c62..3c9dce5b1d0 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.3.4");
+        super("testcontainers/ryuk:0.4.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 3b0c1cbbf798f69ff18c22fdb9c2ce7fb0390d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 17 Mar 2023 13:28:52 -0600
Subject: [PATCH 2810/4969] Update Redpanda image (#6788)

Currently, `RedpandaContainer` uses `docker.redpanda.com/vectorized/redpanda`
but must use `docker.redpanda.com/redpandadata/redpanda` instead.
---
 docs/modules/redpanda.md                               |  4 ++--
 .../org/testcontainers/redpanda/RedpandaContainer.java | 10 ++++++++--
 .../testcontainers/redpanda/RedpandaContainerTest.java |  6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/docs/modules/redpanda.md b/docs/modules/redpanda.md
index 8cdcc1ee83d..51178788449 100644
--- a/docs/modules/redpanda.md
+++ b/docs/modules/redpanda.md
@@ -1,10 +1,10 @@
 # Redpanda
 
 Testcontainers can be used to automatically instantiate and manage [Redpanda](https://redpanda.com/) containers.
-More precisely Testcontainers uses the official Docker images for [Redpanda](https://hub.docker.com/r/vectorized/redpanda/)
+More precisely Testcontainers uses the official Docker images for [Redpanda](https://hub.docker.com/r/redpandadata/redpanda)
 
 !!! note
-    This module uses features provided in `docker.redpanda.com/vectorized/redpanda`.
+    This module uses features provided in `docker.redpanda.com/redpandadata/redpanda`.
 
 ## Example
 
diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index 32b2ae20857..61a36784766 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -12,10 +12,16 @@
  */
 public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
 
-    private static final String REDPANDA_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda";
+    private static final String REDPANDA_FULL_IMAGE_NAME = "docker.redpanda.com/redpandadata/redpanda";
+
+    @Deprecated
+    private static final String REDPANDA_OLD_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda";
 
     private static final DockerImageName REDPANDA_IMAGE = DockerImageName.parse(REDPANDA_FULL_IMAGE_NAME);
 
+    @Deprecated
+    private static final DockerImageName REDPANDA_OLD_IMAGE = DockerImageName.parse(REDPANDA_OLD_FULL_IMAGE_NAME);
+
     private static final int REDPANDA_PORT = 9092;
 
     private static final int SCHEMA_REGISTRY_PORT = 8081;
@@ -28,7 +34,7 @@ public RedpandaContainer(String image) {
 
     public RedpandaContainer(DockerImageName imageName) {
         super(imageName);
-        imageName.assertCompatibleWith(REDPANDA_IMAGE);
+        imageName.assertCompatibleWith(REDPANDA_OLD_IMAGE, REDPANDA_IMAGE);
 
         boolean isLessThanBaseVersion = new ComparableVersion(imageName.getVersionPart()).isLessThan("v22.2.1");
         if (REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) && isLessThanBaseVersion) {
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index 5ffccd63c62..a3dbbe56b80 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -31,7 +31,7 @@
 
 public class RedpandaContainerTest {
 
-    private static final String REDPANDA_IMAGE = "docker.redpanda.com/vectorized/redpanda:v22.2.1";
+    private static final String REDPANDA_IMAGE = "docker.redpanda.com/redpandadata/redpanda:v22.2.1";
 
     private static final DockerImageName REDPANDA_DOCKER_IMAGE = DockerImageName.parse(REDPANDA_IMAGE);
 
@@ -47,7 +47,7 @@ public void testUsage() throws Exception {
     public void testUsageWithStringImage() throws Exception {
         try (
             // constructorWithVersion {
-            RedpandaContainer container = new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v22.2.1")
+            RedpandaContainer container = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v22.2.1")
             // }
         ) {
             container.start();
@@ -61,7 +61,7 @@ public void testUsageWithStringImage() throws Exception {
 
     @Test
     public void testNotCompatibleVersion() {
-        assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v21.11.19"))
+        assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v21.11.19"))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessageContaining("Redpanda version must be >= v22.2.1");
     }

From c2443f28980c49e1eafbea1322a46267e22d97e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 21 Mar 2023 09:43:55 -0600
Subject: [PATCH 2811/4969] Use Redpanda version v23.1.2 (#6794)

---
 .../java/org/testcontainers/redpanda/RedpandaContainerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index a3dbbe56b80..9a0a0edd030 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -47,7 +47,7 @@ public void testUsage() throws Exception {
     public void testUsageWithStringImage() throws Exception {
         try (
             // constructorWithVersion {
-            RedpandaContainer container = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v22.2.1")
+            RedpandaContainer container = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.2")
             // }
         ) {
             container.start();

From ff9b6f2a4be378090b25c935560c2ff99856f065 Mon Sep 17 00:00:00 2001
From: Denilsson Montoya <dmontoyane@gmail.com>
Date: Tue, 21 Mar 2023 16:25:00 -0500
Subject: [PATCH 2812/4969] Fix typo in Streamlio description (#6791)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index d835bb17f9d..acd098030e4 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -187,7 +187,7 @@ A huge thank you to our sponsors:
 * [Playtika](https://github.com/Playtika/testcontainers-spring-boot) - Kafka, Couchbase, MariaDB, Redis, Neo4j, Aerospike, MemSQL
 * [JetBrains](https://www.jetbrains.com/) - Testing of the TeamCity plugin for HashiCorp Vault
 * [Plumbr](https://plumbr.io) - Integration testing of data processing pipeline micro-services
-* [Streamlio](https://streaml.io/) - Integration and Chaos Testing of our fast data platform based on Apache Puslar, Apache Bookeeper and Apache Heron.
+* [Streamlio](https://streaml.io/) - Integration and Chaos Testing of our fast data platform based on Apache Pulsar, Apache BookKeeper and Apache Heron.
 * [Spring Session](https://projects.spring.io/spring-session/) - Redis, PostgreSQL, MySQL and MariaDB integration testing
 * [Apache Camel](https://camel.apache.org) - Testing Camel against native services such as Consul, Etcd and so on
 * [Infinispan](https://infinispan.org) - Testing the Infinispan Server as well as integration tests with databases, LDAP and KeyCloak

From c41859808e532ae1e418c6bc8611d2e30461a822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 21 Mar 2023 16:06:39 -0600
Subject: [PATCH 2813/4969] Deprecate VaultContainer#withLogLevel (#6795)

Log level can be configured using env vars. E.g

```java
VaultContainer<?> vault = new VaultContainer<>("vault:1.6.1")
    .withEnv("VAULT_LOG_LEVEL", "info")
```
---
 .../src/main/java/org/testcontainers/vault/VaultContainer.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 4c44668d565..c256315d41a 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -154,7 +154,9 @@ public SELF withVaultPort(int port) {
      *
      * @param level the logging level to set for Vault.
      * @return this
+     * @deprecated use {@link #withEnv(String, String)} instead
      */
+    @Deprecated
     public SELF withLogLevel(VaultLogLevel level) {
         return withEnv("VAULT_LOG_LEVEL", level.config);
     }

From 9f82f59da891634ab685e43ec01135d1ff9d7f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 22 Mar 2023 10:39:01 -0600
Subject: [PATCH 2814/4969] Accept `hashicorp/vault` image (#6796)

Currently, `VaultContainer` accepts `vault` from Docker Official
Image. But, there is a deprecation notice and recommend to use
`hashicorp/vault` instead.

In order to keep backward compatibility, both `vault` and
`hashicorp/vault` are valid images.
---
 .../main/java/org/testcontainers/vault/VaultContainer.java  | 6 ++++--
 .../java/org/testcontainers/vault/VaultContainerTest.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index c256315d41a..c565ddbec26 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -24,7 +24,9 @@
  */
 public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericContainer<SELF> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("vault");
+    private static final DockerImageName DEFAULT_OLD_IMAGE_NAME = DockerImageName.parse("vault");
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("hashicorp/vault");
 
     private static final String DEFAULT_TAG = "1.1.3";
 
@@ -50,7 +52,7 @@ public VaultContainer(String dockerImageName) {
 
     public VaultContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_OLD_IMAGE_NAME, DEFAULT_IMAGE_NAME);
 
         // Use the vault healthcheck endpoint to check for readiness, per https://www.vaultproject.io/api/system/health.html
         setWaitStrategy(Wait.forHttp("/v1/sys/health").forStatusCode(200));
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index 608d8bbb8a7..63ecee4e598 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -24,7 +24,7 @@ public class VaultContainerTest {
 
     @ClassRule
     // vaultContainer {
-    public static VaultContainer<?> vaultContainer = new VaultContainer<>("vault:1.6.1")
+    public static VaultContainer<?> vaultContainer = new VaultContainer<>("hashicorp/vault:1.13")
         .withVaultToken(VAULT_TOKEN)
         .withSecretInVault("secret/testing1", "top_secret=password123")
         .withSecretInVault(

From 522f36f8507ee6ab97e951ca0580c4f419b0bb4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 22 Mar 2023 11:27:53 -0600
Subject: [PATCH 2815/4969] Accept `hashicorp/consul` image (#6797)

Currently, `ConsulContainer` accepts `consul` from Docker Official
Image. But, there is a deprecation notice and recommend to use
`hashicorp/consul` instead.

In order to keep backward compatibility, both `consul` and
`hashicorp/consul` are valid images.
---
 .../java/org/testcontainers/consul/ConsulContainer.java    | 6 ++++--
 .../org/testcontainers/consul/ConsulContainerTest.java     | 2 +-
 .../java/org/testcontainers/consul/ConsulTestImages.java   | 7 -------
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java

diff --git a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
index 0c9d2607072..597f004c206 100644
--- a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
+++ b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
@@ -17,7 +17,9 @@
  */
 public class ConsulContainer extends GenericContainer<ConsulContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("consul");
+    private static final DockerImageName DEFAULT_OLD_IMAGE_NAME = DockerImageName.parse("consul");
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("hashicorp/consul");
 
     private static final int CONSUL_HTTP_PORT = 8500;
 
@@ -33,7 +35,7 @@ public ConsulContainer(String dockerImageName) {
 
     public ConsulContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_OLD_IMAGE_NAME, DEFAULT_IMAGE_NAME);
 
         // Use the status leader endpoint to verify if consul is running.
         setWaitStrategy(Wait.forHttp("/v1/status/leader").forPort(CONSUL_HTTP_PORT).forStatusCode(200));
diff --git a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
index c0c022d31bb..7f1c6d1c207 100644
--- a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
+++ b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
@@ -23,7 +23,7 @@
 public class ConsulContainerTest {
 
     @ClassRule
-    public static ConsulContainer consulContainer = new ConsulContainer(ConsulTestImages.CONSUL_IMAGE)
+    public static ConsulContainer consulContainer = new ConsulContainer("hashicorp/consul:1.15")
         .withConsulCommand("kv put config/testing1 value123");
 
     @Test
diff --git a/modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java b/modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java
deleted file mode 100644
index de2b9702066..00000000000
--- a/modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.testcontainers.consul;
-
-import org.testcontainers.utility.DockerImageName;
-
-public interface ConsulTestImages {
-    DockerImageName CONSUL_IMAGE = DockerImageName.parse("consul:1.10.12");
-}

From 5ca6c5039161fcb3a3efc8d6d56a6b864e1843f2 Mon Sep 17 00:00:00 2001
From: Leo <leocrossuk@gmail.com>
Date: Mon, 27 Mar 2023 10:20:40 +0100
Subject: [PATCH 2816/4969] Reorder docs language links (#6806)

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index acd098030e4..3c19d2ee604 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -8,8 +8,8 @@
     <a class="card-grid-item"><img src="language-logos/java.svg"/>Java</a>
     <a href="https://golang.testcontainers.org/" class="card-grid-item"><img src="language-logos/go.svg"/>Go</a>
     <a href="https://dotnet.testcontainers.org/" class="card-grid-item"><img src="language-logos/dotnet.svg"/>.NET</a>
-    <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
     <a href="https://node.testcontainers.org/" class="card-grid-item"><img src="language-logos/nodejs.svg"/>Node.js</a>
+    <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
     <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="language-logos/rust.svg"/>Rust</a>
     <a href="https://github.com/testcontainers/testcontainers-hs/" class="card-grid-item" ><img src="language-logos/haskell.svg"/>Haskell</a>
 </div>

From 83f5dfc0987838e46adc604bc17368957fe50340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 28 Mar 2023 10:52:44 -0600
Subject: [PATCH 2817/4969] Do not trigger CI workflows when docs are modified
 (#6809)

Add `paths-ignore` to do not run CI when certain files are modified.
---
 .github/workflows/ci-docker-wormhole.yml | 15 +++++++++++++--
 .github/workflows/ci-examples.yml        | 15 +++++++++++++--
 .github/workflows/ci-rootless.yml        | 15 +++++++++++++--
 .github/workflows/ci.yml                 | 15 +++++++++++++--
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 39a70d1f2e2..4cac12201b3 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -1,8 +1,19 @@
 name: CI-Docker-Wormhole
 
 on:
-  pull_request: {}
-  push: { branches: [ main ] }
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index a1193951d09..6da1dcf5aa1 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -1,8 +1,19 @@
 name: CI-Examples
 
 on:
-  pull_request: {}
-  push: { branches: [ main ] }
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 13fd0202c54..45371c5b52b 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -1,8 +1,19 @@
 name: CI-Docker-Rootless
 
 on:
-  pull_request: {}
-  push: { branches: [ main ] }
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db89ffaa7f1..0ae7e7ce6e5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,19 @@
 name: CI
 
 on:
-  pull_request: {}
-  push: { branches: [ main ] }
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"

From 2d57f6105bcf096ee4562e34c23351e5b9e70897 Mon Sep 17 00:00:00 2001
From: DJ Gregor <dj@gregor.com>
Date: Tue, 28 Mar 2023 14:02:58 -0400
Subject: [PATCH 2818/4969] Improve startup wait checks (#6384)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Log a warning if the container image and server architectures do not match
* Make sure a container exiting successfully is properly handled
* We don't need to continue checking if the container stops running

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/GenericContainer.java          | 31 +++++++++++++++
 .../IsRunningStartupCheckStrategy.java        |  8 +++-
 .../wait/strategy/HostPortWaitStrategy.java   |  1 +
 .../containers/GenericContainerTest.java      | 38 +++++++++++++++++++
 .../IsRunningStartupCheckStrategyTest.java    | 37 ++++++++++++++++++
 docs/features/startup_and_waits.md            |  2 +-
 6 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 93c13505ef1..959b14414f0 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -470,6 +470,11 @@ private void tryStart(Instant startedAt) {
                         }
                     );
 
+            String emulationWarning = checkForEmulation();
+            if (emulationWarning != null) {
+                logger().warn(emulationWarning);
+            }
+
             // Tell subclasses that we're starting
             containerIsStarting(containerInfo, reused);
 
@@ -960,6 +965,32 @@ protected void waitUntilContainerStarted() {
         }
     }
 
+    private String checkForEmulation() {
+        try {
+            DockerClient dockerClient = DockerClientFactory.instance().client();
+            String imageId = getContainerInfo().getImageId();
+            String imageArch = dockerClient.inspectImageCmd(imageId).exec().getArch();
+            String serverArch = dockerClient.versionCmd().exec().getArch();
+
+            if (!serverArch.equals(imageArch)) {
+                return (
+                    "The architecture '" +
+                    imageArch +
+                    "' for image '" +
+                    getDockerImageName() +
+                    "' (ID " +
+                    imageId +
+                    ") does not match the Docker server architecture '" +
+                    serverArch +
+                    "'. This will cause the container to execute much more slowly due to emulation and may lead to timeout failures."
+                );
+            }
+        } catch (Exception archCheckException) {
+            // ignore any exceptions since this is just used for a log message
+        }
+        return null;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java b/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java
index b4b20aad897..f161a8e158e 100644
--- a/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategy.java
@@ -30,8 +30,12 @@ public StartupStatus checkStartupState(DockerClient dockerClient, String contain
     private StartupStatus checkState(InspectContainerResponse.ContainerState state) {
         if (Boolean.TRUE.equals(state.getRunning())) {
             return StartupStatus.SUCCESSFUL;
-        } else if (!DockerStatus.isContainerExitCodeSuccess(state)) {
-            return StartupStatus.FAILED;
+        } else if (DockerStatus.isContainerStopped(state)) {
+            if (DockerStatus.isContainerExitCodeSuccess(state)) {
+                return StartupStatus.SUCCESSFUL;
+            } else {
+                return StartupStatus.FAILED;
+            }
         } else {
             return StartupStatus.NOT_YET_KNOWN;
         }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index 74acd8f1beb..54f530241f5 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -74,6 +74,7 @@ protected void waitUntilReady() {
                             .pollInSameThread()
                             .pollInterval(Duration.ofMillis(100))
                             .pollDelay(Duration.ZERO)
+                            .failFast("container is no longer running", () -> !waitStrategyTarget.isRunning())
                             .ignoreExceptions()
                             .forever()
                             .until(externalCheck);
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 6a6f47c85c7..2d30fe98eeb 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse.ContainerState;
@@ -32,6 +34,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 public class GenericContainerTest {
 
@@ -180,6 +183,41 @@ public void shouldWaitUntilExposedPortIsMapped() {
         }
     }
 
+    @Test
+    public void testArchitectureCheck() {
+        assumeThat(DockerClientFactory.instance().client().versionCmd().exec().getArch()).isNotEqualTo("amd64");
+        // Choose an image that is *different* from the server architecture--this ensures we always get a warning.
+        final String image;
+        if (DockerClientFactory.instance().client().versionCmd().exec().getArch().equals("amd64")) {
+            // arm64 image
+            image = "testcontainers/sshd@sha256:f701fa4ae2cd25ad2b2ea2df1aad00980f67bacdd03958a2d7d52ee63d7fb3e8";
+        } else {
+            // amd64 image
+            image = "testcontainers/sshd@sha256:7879c6c99eeab01f1c6beb2c240d49a70430ef2d52f454765ec9707f547ef6f1";
+        }
+
+        try (GenericContainer container = new GenericContainer<>(image)) {
+            // Grab a copy of everything that is logged when we start the container
+            ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) container.logger();
+            ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+            listAppender.start();
+            logger.addAppender(listAppender);
+
+            container.start();
+
+            String regexMatch = "The architecture '\\S+' for image .*";
+            assertThat(listAppender.list)
+                .describedAs(
+                    "Received log list does not have a message matching '" +
+                    regexMatch +
+                    "': " +
+                    listAppender.list.toString()
+                )
+                .filteredOn(event -> event.getMessage().matches(regexMatch))
+                .isNotEmpty();
+        }
+    }
+
     static class NoopStartupCheckStrategy extends StartupCheckStrategy {
 
         @Override
diff --git a/core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java b/core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java
new file mode 100644
index 00000000000..7e3bf1d814f
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java
@@ -0,0 +1,37 @@
+package org.testcontainers.containers.startupcheck;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.testcontainers.TestImages;
+import org.testcontainers.containers.GenericContainer;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class IsRunningStartupCheckStrategyTest {
+
+    @Test
+    public void testCommandQuickExitSuccess() {
+        try (GenericContainer container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("/bin/true")) {
+            container.start(); // should start with no Exception
+        }
+    }
+
+    @Test
+    @Ignore("This test can fail to throw an AssertionError if the container doesn't fail quickly enough")
+    public void testCommandQuickExitFailure() {
+        try (GenericContainer container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("/bin/false")) {
+            assertThatThrownBy(container::start)
+                .hasStackTraceContaining("Container startup failed")
+                .hasStackTraceContaining("Container did not start correctly");
+        }
+    }
+
+    @Test
+    public void testCommandStaysRunning() {
+        try (
+            GenericContainer container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("/bin/sleep", "60")
+        ) {
+            container.start(); // should start with no Exception
+        }
+    }
+}
diff --git a/docs/features/startup_and_waits.md b/docs/features/startup_and_waits.md
index e092919d496..d760dfa93d0 100644
--- a/docs/features/startup_and_waits.md
+++ b/docs/features/startup_and_waits.md
@@ -116,7 +116,7 @@ Checks that the container is running and has been running for a defined minimum
 [Using minimum duration strategy](../examples/junit4/generic/src/test/java/org/testcontainers/containers/startupcheck/StartupCheckStrategyTest.java) inside_block:withMinimumDurationStrategy
 <!--/codeinclude-->
 
-### Other startup  strategies
+### Other startup strategies
 
 If none of these options meet your requirements, you can create your own subclass of 
 [`StartupCheckStrategy`](http://static.javadoc.io/org.testcontainers/testcontainers/{{ latest_version }}/org/testcontainers/containers

From 552264164e09c203f26cff1c663ee6e7093cc9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 29 Mar 2023 12:29:52 -0600
Subject: [PATCH 2819/4969] Add Oracle R2DBC support (#6810)

* Update r2dbc-spi version to 0.9.0.RELEASE
* Add `OracleR2DBCDatabaseContainer`
* Testcontainers R2DBC URL support

Fixes #4475
---
 docs/modules/databases/r2dbc.md               |  4 ++
 ...MariaDBR2DBCDatabaseContainerProvider.java |  2 +-
 .../MySQLR2DBCDatabaseContainerProvider.java  |  2 +-
 modules/oracle-xe/build.gradle                | 24 ++++++++++-
 .../containers/OracleContainer.java           |  4 +-
 .../OracleR2DBCDatabaseContainer.java         | 35 +++++++++++++++
 .../OracleR2DBCDatabaseContainerProvider.java | 43 +++++++++++++++++++
 .../OracleR2DBCDatabaseContainerTest.java     | 30 +++++++++++++
 ...tgreSQLR2DBCDatabaseContainerProvider.java |  2 +-
 modules/r2dbc/build.gradle                    |  2 +-
 .../java/org/testcontainers/r2dbc/Hidden.java |  2 +-
 .../AbstractR2DBCDatabaseContainerTest.java   |  6 ++-
 12 files changed, 147 insertions(+), 9 deletions(-)
 create mode 100644 modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainer.java
 create mode 100644 modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java
 create mode 100644 modules/oracle-xe/src/test/java/org/testcontainers/containers/r2dbc/OracleR2DBCDatabaseContainerTest.java

diff --git a/docs/modules/databases/r2dbc.md b/docs/modules/databases/r2dbc.md
index dba59b2d3d9..b3ae250ac0f 100644
--- a/docs/modules/databases/r2dbc.md
+++ b/docs/modules/databases/r2dbc.md
@@ -49,6 +49,10 @@ So that the URL becomes:
 
 `r2dbc:tc:sqlserver:///?TC_IMAGE_TAG=2017-CU12`
 
+#### Using Oracle:
+
+`r2dbc:tc:oracle:///?TC_IMAGE_TAG=21-slim-faststart`
+
 ## Obtaining `ConnectionFactoryOptions` from database container objects
 
 If you already have an instance of the database container, you can get an instance of `ConnectionFactoryOptions` from it:
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
index 36a201f85bb..6994ab44dff 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
@@ -23,7 +23,7 @@ public boolean supports(ConnectionFactoryOptions options) {
     public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
         String image = MariaDBContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
         MariaDBContainer<?> container = new MariaDBContainer<>(image)
-            .withDatabaseName(options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+            .withDatabaseName((String) options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
 
         if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
             container.withReuse(true);
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
index ec3b6a4e41f..a32fa96c9b8 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
@@ -23,7 +23,7 @@ public boolean supports(ConnectionFactoryOptions options) {
     public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
         String image = MySQLContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
         MySQLContainer<?> container = new MySQLContainer<>(image)
-            .withDatabaseName(options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+            .withDatabaseName((String) options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
 
         if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
             container.withReuse(true);
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index c4ded1af921..7eccc7972e6 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -1,10 +1,32 @@
 description = "Testcontainers :: JDBC :: Oracle XE"
 
 dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
+    compileOnly 'com.google.auto.service:auto-service:1.0'
+
     api project(':jdbc')
 
+    compileOnly project(':r2dbc')
+    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.0.0'
+
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:21.5.0.0'
 
     compileOnly 'org.jetbrains:annotations:24.0.0'
+
+    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation 'com.oracle.database.r2dbc:oracle-r2dbc:1.0.0'
+}
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
 }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index bd5d9aeb7ca..830bb692f8f 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -23,7 +23,7 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
-    private static final int ORACLE_PORT = 1521;
+    static final int ORACLE_PORT = 1521;
 
     private static final int APEX_HTTP_PORT = 8080;
 
@@ -103,7 +103,7 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     @Override
     public String getDriverClassName() {
-        return "oracle.jdbc.OracleDriver";
+        return "oracle.jdbc.driver.OracleDriver";
     }
 
     @Override
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..4268faf306b
--- /dev/null
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainer.java
@@ -0,0 +1,35 @@
+package org.testcontainers.containers;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+@RequiredArgsConstructor
+public class OracleR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    @Delegate(types = Startable.class)
+    private final OracleContainer container;
+
+    public static ConnectionFactoryOptions getOptions(OracleContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, OracleR2DBCDatabaseContainerProvider.DRIVER)
+            .build();
+
+        return new OracleR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(OracleContainer.ORACLE_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+}
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..4d6a03530c2
--- /dev/null
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java
@@ -0,0 +1,43 @@
+package org.testcontainers.containers;
+
+import com.google.auto.service.AutoService;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.jetbrains.annotations.Nullable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
+
+@AutoService(R2DBCDatabaseContainerProvider.class)
+public class OracleR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+
+    static final String DRIVER = "oracle";
+
+    @Override
+    public boolean supports(ConnectionFactoryOptions options) {
+        return DRIVER.equals(options.getRequiredValue(ConnectionFactoryOptions.DRIVER));
+    }
+
+    @Override
+    public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        String image = OracleContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        OracleContainer container = new OracleContainer(image)
+            .withDatabaseName((String) options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+        if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
+            container.withReuse(true);
+        }
+        return new OracleR2DBCDatabaseContainer(container);
+    }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, OracleContainer.APP_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, OracleContainer.APP_USER_PASSWORD);
+        }
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
+}
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/containers/r2dbc/OracleR2DBCDatabaseContainerTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/containers/r2dbc/OracleR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..cca5f38ee12
--- /dev/null
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/containers/r2dbc/OracleR2DBCDatabaseContainerTest.java
@@ -0,0 +1,30 @@
+package org.testcontainers.containers.r2dbc;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.containers.OracleContainer;
+import org.testcontainers.containers.OracleR2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class OracleR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<OracleContainer> {
+
+    @Override
+    protected OracleContainer createContainer() {
+        return new OracleContainer("gvenzl/oracle-xe:21-slim-faststart");
+    }
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(OracleContainer container) {
+        ConnectionFactoryOptions options = OracleR2DBCDatabaseContainer.getOptions(container);
+
+        return options;
+    }
+
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:oracle:///db?TC_IMAGE_TAG=21-slim-faststart";
+    }
+
+    @Override
+    protected String query() {
+        return "SELECT %s from dual";
+    }
+}
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
index 971b4cd3758..6b4a81c5e40 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
@@ -23,7 +23,7 @@ public boolean supports(ConnectionFactoryOptions options) {
     public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
         String image = PostgreSQLContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
         PostgreSQLContainer<?> container = new PostgreSQLContainer<>(image)
-            .withDatabaseName(options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+            .withDatabaseName((String) options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
 
         if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
             container.withReuse(true);
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 8817850528e..cd542677e43 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'com.google.auto.service:auto-service:1.0.1'
 
     api project(':testcontainers')
-    api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
+    api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
index 1eecb22a2c7..5d9de2025a0 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
@@ -42,7 +42,7 @@ private ConnectionFactoryOptions removeProxying(ConnectionFactoryOptions options
             //   | DRIVER   | tc              | postgres     |
             //   | PROTOCOL | postgres        | <empty>      |
 
-            String protocol = options.getRequiredValue(ConnectionFactoryOptions.PROTOCOL);
+            String protocol = (String) options.getRequiredValue(ConnectionFactoryOptions.PROTOCOL);
             if (protocol.trim().length() == 0) {
                 throw new IllegalArgumentException("Invalid protocol: " + protocol);
             }
diff --git a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
index 63603379e40..ca06e22d631 100644
--- a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
+++ b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
@@ -19,8 +19,12 @@ public abstract class AbstractR2DBCDatabaseContainerTest<T extends GenericContai
 
     protected abstract String createR2DBCUrl();
 
+    protected String query() {
+        return "SELECT %d";
+    }
+
     protected String createTestQuery(int result) {
-        return String.format("SELECT %d", result);
+        return String.format(query(), result);
     }
 
     @Test

From 11c765e8243a8d2cb7f9e72ed81428dda6add9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 29 Mar 2023 17:08:20 -0600
Subject: [PATCH 2820/4969] Allow jib-core dependency in checkPOMdependencies
 (#6811)

`jib-core` was added and when `publishToMavenLocal` is performed
`checkPOMdependencies` dependencies failed because of it.
---
 core/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/build.gradle b/core/build.gradle
index 58c47a8f623..040cd1809e0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -118,6 +118,7 @@ dependencies {
 tasks.generatePomFileForMavenJavaPublication.finalizedBy(
     tasks.register('checkPOMdependencies', org.testcontainers.build.ComparePOMWithLatestReleasedTask) {
         ignore = [
+            "com.google.cloud.tools:jib-core"
         ]
     }
 )

From cd7fbd74ea49c60e1666aad33ca2c3f0ace64b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 29 Mar 2023 20:02:47 -0600
Subject: [PATCH 2821/4969] Add combine-pr workflow (#6831)

---
 .github/workflows/combine-prs.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/combine-prs.yml

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
new file mode 100644
index 00000000000..d3d812b803c
--- /dev/null
+++ b/.github/workflows/combine-prs.yml
@@ -0,0 +1,17 @@
+name: Combine PRs
+
+on:
+  workflow_dispatch:
+
+jobs:
+  combine-prs:
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: combine-prs
+        id: combine-prs
+        uses: github/combine-prs@v2.1.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

From 9c5c352fbc6bc7497b611c2917585d7c2d384a89 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Thu, 30 Mar 2023 11:33:23 +0300
Subject: [PATCH 2822/4969] Add Quarkus to the list of projects using
 testcontainers (#6832)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 3c19d2ee604..8eee54769e3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -221,6 +221,7 @@ A huge thank you to our sponsors:
 * [Apache SeaTunnel](https://github.com/apache/incubator-seatunnel) - Integration testing with different datasource.
 * [Bucket4j](https://github.com/bucket4j/bucket4j) - Java rate-limiting library based on the token-bucket algorithm.
 * [Spark ClickHouse Connector](https://github.com/housepower/spark-clickhouse-connector) - Integration tests for Apache Spark with both single node ClickHouse instance and multi-node ClickHouse cluster.
+* [Quarkus](https://github.com/quarkusio/quarkus) - Testcontainers is used extensively for Quarkus' [DevServices](https://quarkus.io/guides/dev-services) feature.
 
 ## License
 

From 1bd177f01edcee893cd1a85dba2d88663c2885a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 30 Mar 2023 10:26:37 -0600
Subject: [PATCH 2823/4969] Add support for LocalStack v2 (#6808)

`HOSTNAME_EXTERNAL` env var is deprecated and will be replaced by
`LOCALSTACK_HOST` in the upcoming v2.

Fixes #6792
---
 .../localstack/LocalStackContainer.java       | 52 +++++++---
 .../localstack/LocalstackContainerTest.java   | 99 +++++++++++++++++--
 2 files changed, 126 insertions(+), 25 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 6da5857adaa..a4b2224e1d2 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -21,17 +21,18 @@
 import java.util.stream.Collectors;
 
 /**
- * <p>Container for LocalStack, 'A fully functional local AWS cloud stack'.</p>
- * <p>{@link LocalStackContainer#withServices(Service...)} should be used to select which services
- * are to be launched. See {@link Service} for available choices.
+ * Testcontainers implementation for LocalStack.
  */
 @Slf4j
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     static final int PORT = 4566;
 
+    @Deprecated
     private static final String HOSTNAME_EXTERNAL_ENV_VAR = "HOSTNAME_EXTERNAL";
 
+    private static final String LOCALSTACK_HOST_ENV_VAR = "LOCALSTACK_HOST";
+
     private final List<EnabledService> services = new ArrayList<>();
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("localstack/localstack");
@@ -66,6 +67,8 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
      */
     private final boolean servicesEnvVarRequired;
 
+    private final boolean isVersion2;
+
     /**
      * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
      */
@@ -92,18 +95,31 @@ public LocalStackContainer(final DockerImageName dockerImageName) {
     /**
      * @param dockerImageName    image name to use for Localstack
      * @param useLegacyMode      if true, each AWS service is exposed on a different port
+     * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
      */
+    @Deprecated
     public LocalStackContainer(final DockerImageName dockerImageName, boolean useLegacyMode) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         this.legacyMode = useLegacyMode;
-        this.servicesEnvVarRequired = isServicesEnvVarRequired(dockerImageName.getVersionPart());
+        String version = dockerImageName.getVersionPart();
+        this.servicesEnvVarRequired = isServicesEnvVarRequired(version);
+        this.isVersion2 = isVersion2(version);
 
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
     }
 
+    private static boolean isVersion2(String version) {
+        if (version.equals("latest")) {
+            return true;
+        }
+
+        ComparableVersion comparableVersion = new ComparableVersion(version);
+        return comparableVersion.isGreaterThanOrEqualTo("2.0.0");
+    }
+
     private static boolean isServicesEnvVarRequired(String version) {
         if (version.equals("latest")) {
             return false;
@@ -141,7 +157,7 @@ private static boolean shouldRunInLegacyMode(String version) {
     protected void configure() {
         super.configure();
 
-        if (servicesEnvVarRequired) {
+        if (this.servicesEnvVarRequired) {
             Preconditions.check("services list must not be empty", !services.isEmpty());
         }
 
@@ -152,26 +168,30 @@ protected void configure() {
             }
         }
 
+        if (this.isVersion2) {
+            resolveHostname(LOCALSTACK_HOST_ENV_VAR);
+        } else {
+            resolveHostname(HOSTNAME_EXTERNAL_ENV_VAR);
+        }
+
+        exposePorts();
+    }
+
+    private void resolveHostname(String envVar) {
         String hostnameExternalReason;
-        if (getEnvMap().containsKey(HOSTNAME_EXTERNAL_ENV_VAR)) {
+        if (getEnvMap().containsKey(envVar)) {
             // do nothing
             hostnameExternalReason = "explicitly as environment variable";
         } else if (getNetwork() != null && getNetworkAliases() != null && getNetworkAliases().size() >= 1) {
-            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getNetworkAliases().get(getNetworkAliases().size() - 1)); // use the last network alias set
+            withEnv(envVar, getNetworkAliases().get(getNetworkAliases().size() - 1)); // use the last network alias set
             hostnameExternalReason = "to match last network alias on container with non-default network";
         } else {
-            withEnv(HOSTNAME_EXTERNAL_ENV_VAR, getHost());
+            withEnv(envVar, getHost());
             hostnameExternalReason = "to match host-routable address for container";
         }
-        logger()
-            .info(
-                "{} environment variable set to {} ({})",
-                HOSTNAME_EXTERNAL_ENV_VAR,
-                getEnvMap().get(HOSTNAME_EXTERNAL_ENV_VAR),
-                hostnameExternalReason
-            );
 
-        exposePorts();
+        logger()
+            .info("{} environment variable set to {} ({})", envVar, getEnvMap().get(envVar), hostnameExternalReason);
     }
 
     private void exposePorts() {
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index b99c455ae19..30682388af5 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -30,6 +30,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.localstack.LocalStackContainer.Service;
+import org.testcontainers.utility.DockerImageName;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
@@ -265,6 +266,11 @@ public static class WithNetwork {
             .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
             .withEnv("AWS_REGION", "eu-west-1");
 
+        @Test
+        public void localstackHostEnVarIsSet() {
+            assertThat(localstackInDockerNetwork.getEnvMap().get("HOSTNAME_EXTERNAL")).isEqualTo("localstack");
+        }
+
         @Test
         public void s3TestOverDockerNetwork() throws Exception {
             runAwsCliAgainstDockerNetworkContainer(
@@ -357,17 +363,92 @@ public static class WithoutServices {
 
         @Test
         public void s3ServiceStartLazily() {
-            S3Client s3 = S3Client
-                .builder()
-                .endpointOverride(localstack.getEndpointOverride(Service.S3))
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+            try (
+                S3Client s3 = S3Client
+                    .builder()
+                    .endpointOverride(localstack.getEndpointOverride(Service.S3))
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
+                    .region(Region.of(localstack.getRegion()))
+                    .build()
+            ) {
+                assertThat(s3.listBuckets().buckets()).as("S3 Service is started lazily").isEmpty();
+            }
+        }
+    }
+
+    public static class WithVersion2 {
+
+        private static Network network = Network.newNetwork();
+
+        @ClassRule
+        public static LocalStackContainer localstack = new LocalStackContainer(
+            DockerImageName.parse("localstack/localstack:2.0")
+        )
+            .withNetwork(network)
+            .withNetworkAliases("localstack");
+
+        @ClassRule
+        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(
+            LocalstackTestImages.AWS_CLI_IMAGE
+        )
+            .withNetwork(network)
+            .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("tail"))
+            .withCommand(" -f /dev/null")
+            .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
+            .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
+            .withEnv("AWS_REGION", "eu-west-1");
+
+        @Test
+        public void localstackHostEnVarIsSet() {
+            assertThat(localstack.getEnvMap().get("LOCALSTACK_HOST")).isEqualTo("localstack");
+        }
+
+        @Test
+        public void sqsTestOverDockerNetwork() throws Exception {
+            final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer(
+                "sqs create-queue --queue-name baz"
+            );
+
+            assertThat(queueCreationResponse)
+                .as("Created queue has external hostname URL")
+                .contains("http://localstack:" + LocalStackContainer.PORT);
+
+            runAwsCliAgainstDockerNetworkContainer(
+                String.format(
+                    "sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test",
+                    LocalStackContainer.PORT,
+                    LocalStackContainer.PORT
                 )
-                .region(Region.of(localstack.getRegion()))
-                .build();
-            assertThat(s3.listBuckets().buckets()).as("S3 Service is started lazily").isEmpty();
+            );
+            final String message = runAwsCliAgainstDockerNetworkContainer(
+                String.format(
+                    "sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz",
+                    LocalStackContainer.PORT,
+                    LocalStackContainer.PORT
+                )
+            );
+
+            assertThat(message).as("the sent message can be received").contains("\"Body\": \"test\"");
+        }
+
+        private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exception {
+            final String[] commandParts = String
+                .format(
+                    "/usr/local/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl",
+                    command,
+                    LocalStackContainer.PORT
+                )
+                .split(" ");
+            final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);
+            assertThat(execResult.getExitCode()).isEqualTo(0);
+
+            final String logs = execResult.getStdout() + execResult.getStderr();
+            log.info(logs);
+            return logs;
         }
     }
 }

From a69260207584dca09cfb46e87ef571fbdc8675bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 31 Mar 2023 00:39:23 -0500
Subject: [PATCH 2824/4969] Accept localstack/localstack-pro image name (#6836)

---
 .../containers/localstack/LocalStackContainer.java            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index a4b2224e1d2..38bbeba6130 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -37,6 +37,8 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("localstack/localstack");
 
+    private static final DockerImageName LOCALSTACK_PRO_IMAGE_NAME = DockerImageName.parse("localstack/localstack-pro");
+
     private static final String DEFAULT_TAG = "0.11.2";
 
     private static final String DEFAULT_REGION = "us-east-1";
@@ -100,7 +102,7 @@ public LocalStackContainer(final DockerImageName dockerImageName) {
     @Deprecated
     public LocalStackContainer(final DockerImageName dockerImageName, boolean useLegacyMode) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, LOCALSTACK_PRO_IMAGE_NAME);
 
         this.legacyMode = useLegacyMode;
         String version = dockerImageName.getVersionPart();

From b221f3f3832295ad2344cf77fbaf2b64e1233b22 Mon Sep 17 00:00:00 2001
From: Marios Trivyzas <5058131+matriv@users.noreply.github.com>
Date: Sat, 1 Apr 2023 02:22:01 +0300
Subject: [PATCH 2825/4969] Add CrateDB module (#6790)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   2 +
 .github/settings.yml                          |   3 +
 docs/modules/databases/cratedb.md             |  25 ++++
 docs/modules/databases/jdbc.md                |   4 +
 mkdocs.yml                                    |   1 +
 modules/cratedb/build.gradle                  |  13 ++
 .../cratedb/CrateDBContainer.java             | 116 ++++++++++++++++++
 .../cratedb/CrateDBContainerProvider.java     |  36 ++++++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 .../org/testcontainers/CrateDBTestImages.java |   7 ++
 .../jdbc/cratedb/CrateDBJDBCDriverTest.java   |  21 ++++
 .../junit/cratedb/SimpleCrateDBTest.java      |  67 ++++++++++
 .../src/test/resources/logback-test.xml       |  16 +++
 .../test/resources/somepath/init_cratedb.sql  |   6 +
 18 files changed, 326 insertions(+)
 create mode 100644 docs/modules/databases/cratedb.md
 create mode 100644 modules/cratedb/build.gradle
 create mode 100644 modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
 create mode 100644 modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainerProvider.java
 create mode 100644 modules/cratedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/cratedb/src/test/java/org/testcontainers/CrateDBTestImages.java
 create mode 100644 modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
 create mode 100644 modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
 create mode 100644 modules/cratedb/src/test/resources/logback-test.xml
 create mode 100644 modules/cratedb/src/test/resources/somepath/init_cratedb.sql

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index ab1de00f6f8..033fd19c49d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -20,6 +20,7 @@ body:
         - CockroachDB
         - Consul
         - Couchbase
+        - CrateDB
         - DB2
         - Dynalite
         - Elasticsearch
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index b80fa9387da..b9d67bc7d52 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -20,6 +20,7 @@ body:
         - CockroachDB
         - Consul
         - Couchbase
+        - CrateDB
         - DB2
         - Dynalite
         - Elasticsearch
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 024d0414d2f..ffc1b19a6cb 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -18,6 +18,7 @@ body:
         - Cassandra
         - Clickhouse
         - CockroachDB
+        - CrateDB
         - Consul
         - Couchbase
         - DB2
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ecf473b2d65..e78603d163f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -62,6 +62,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/cratedb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/database-commons"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 55163e0d7c7..48238471563 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -19,6 +19,8 @@
   - modules/consul/**/*
 "modules/couchbase":
   - modules/couchbase/**/*
+"modules/cratedb":
+  - modules/cratedb/**/*
 "modules/db2":
   - modules/db2/**/*
 "modules/dynalite":
diff --git a/.github/settings.yml b/.github/settings.yml
index 7844182893b..7cc83a69524 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -124,6 +124,9 @@ labels:
   - name: modules/couchbase
     color: '#006b75'
 
+  - name: modules/cratedb
+    color: '#006b75'
+
   - name: modules/db2
     color: '#006b75'
 
diff --git a/docs/modules/databases/cratedb.md b/docs/modules/databases/cratedb.md
new file mode 100644
index 00000000000..74ec23dda00
--- /dev/null
+++ b/docs/modules/databases/cratedb.md
@@ -0,0 +1,25 @@
+# CrateDB Module
+
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:cratedb:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>cratedb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
+
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 6cf4977ad96..020a96ff941 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -51,6 +51,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:cockroach:v21.2.3:///databasename`
 
+#### Using CrateDB
+
+`jdbc:tc:cratedb:5.2.3//localhost:5432/crate`
+
 #### Using TiDB
 
 `jdbc:tc:tidb:v6.1.0:///databasename`
diff --git a/mkdocs.yml b/mkdocs.yml
index 8da6fa584ac..72c457b9d5f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -53,6 +53,7 @@ nav:
                 - modules/databases/cockroachdb.md
                 - modules/databases/couchbase.md
                 - modules/databases/clickhouse.md
+                - modules/databases/cratedb.md
                 - modules/databases/db2.md
                 - modules/databases/dynalite.md
                 - modules/databases/influxdb.md
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
new file mode 100644
index 00000000000..d53031542f5
--- /dev/null
+++ b/modules/cratedb/build.gradle
@@ -0,0 +1,13 @@
+description = "Testcontainers :: JDBC :: CrateDB"
+
+dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
+    compileOnly 'com.google.auto.service:auto-service:1.0.1'
+
+    api project(':jdbc')
+
+    testImplementation project(':jdbc-test')
+    testImplementation 'org.postgresql:postgresql:42.5.4'
+
+    compileOnly 'org.jetbrains:annotations:24.0.0'
+}
diff --git a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
new file mode 100644
index 00000000000..45cd03f460a
--- /dev/null
+++ b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
@@ -0,0 +1,116 @@
+package org.testcontainers.cratedb;
+
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.Set;
+
+public class CrateDBContainer extends JdbcDatabaseContainer<CrateDBContainer> {
+
+    static final String NAME = "cratedb";
+
+    static final String IMAGE = "crate";
+
+    static final String DEFAULT_TAG = "5.2.5";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("crate");
+
+    static final Integer CRATEDB_PG_PORT = 5432;
+
+    static final Integer CRATEDB_HTTP_PORT = 4200;
+
+    private String databaseName = "crate";
+
+    private String username = "crate";
+
+    private String password = "crate";
+
+    public CrateDBContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public CrateDBContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        this.waitStrategy = Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200);
+
+        addExposedPort(CRATEDB_PG_PORT);
+        addExposedPort(CRATEDB_HTTP_PORT);
+    }
+
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
+    @NotNull
+    @Override
+    @Deprecated
+    protected Set<Integer> getLivenessCheckPorts() {
+        return super.getLivenessCheckPorts();
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "org.postgresql.Driver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return (
+            "jdbc:postgresql://" +
+            getHost() +
+            ":" +
+            getMappedPort(CRATEDB_PG_PORT) +
+            "/" +
+            databaseName +
+            additionalUrlParams
+        );
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1";
+    }
+
+    @Override
+    public CrateDBContainer withDatabaseName(final String databaseName) {
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    @Override
+    public CrateDBContainer withUsername(final String username) {
+        this.username = username;
+        return self();
+    }
+
+    @Override
+    public CrateDBContainer withPassword(final String password) {
+        this.password = password;
+        return self();
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+}
diff --git a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainerProvider.java b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainerProvider.java
new file mode 100644
index 00000000000..0bf80f051ec
--- /dev/null
+++ b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainerProvider.java
@@ -0,0 +1,36 @@
+package org.testcontainers.cratedb;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+import org.testcontainers.jdbc.ConnectionUrl;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for CrateDB containers using PostgreSQL JDBC driver.
+ */
+public class CrateDBContainerProvider extends JdbcDatabaseContainerProvider {
+
+    public static final String USER_PARAM = "user";
+
+    public static final String PASSWORD_PARAM = "password";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(CrateDBContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(CrateDBContainer.DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new CrateDBContainer(DockerImageName.parse(CrateDBContainer.IMAGE).withTag(tag));
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+    }
+}
diff --git a/modules/cratedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/cratedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..ddd58ec8794
--- /dev/null
+++ b/modules/cratedb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.cratedb.CrateDBContainerProvider
diff --git a/modules/cratedb/src/test/java/org/testcontainers/CrateDBTestImages.java b/modules/cratedb/src/test/java/org/testcontainers/CrateDBTestImages.java
new file mode 100644
index 00000000000..5025d409839
--- /dev/null
+++ b/modules/cratedb/src/test/java/org/testcontainers/CrateDBTestImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface CrateDBTestImages {
+    DockerImageName CRATEDB_TEST_IMAGE = DockerImageName.parse("crate:5.2.5");
+}
diff --git a/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java b/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
new file mode 100644
index 00000000000..54ef9704ac5
--- /dev/null
+++ b/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.jdbc.cratedb;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+@RunWith(Parameterized.class)
+public class CrateDBJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] {
+                { "jdbc:tc:cratedb:5.2.3://hostname/crate?user=crate&password=somepwd", EnumSet.noneOf(Options.class) },
+            }
+        );
+    }
+}
diff --git a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
new file mode 100644
index 00000000000..ea7bb1a4f10
--- /dev/null
+++ b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
@@ -0,0 +1,67 @@
+package org.testcontainers.junit.cratedb;
+
+import org.junit.Test;
+import org.testcontainers.CrateDBTestImages;
+import org.testcontainers.cratedb.CrateDBContainer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SimpleCrateDBTest extends AbstractContainerDatabaseTest {
+    static {
+        // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
+        LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
+    }
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)) {
+            cratedb.start();
+
+            ResultSet resultSet = performQuery(cratedb, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(cratedb);
+        }
+    }
+
+    @Test
+    public void testCommandOverride() throws SQLException {
+        try (
+            CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
+                .withCommand("crate -C cluster.name=testcontainers")
+        ) {
+            cratedb.start();
+
+            ResultSet resultSet = performQuery(cratedb, "select name from sys.cluster");
+            String result = resultSet.getString(1);
+            assertThat(result).as("cluster name should be overriden").isEqualTo("testcontainers");
+        }
+    }
+
+    @Test
+    public void testExplicitInitScript() throws SQLException {
+        try (
+            CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
+                .withInitScript("somepath/init_cratedb.sql")
+        ) {
+            cratedb.start();
+
+            ResultSet resultSet = performQuery(cratedb, "SELECT foo FROM bar");
+
+            String firstColumnValue = resultSet.getString(1);
+            assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
+        }
+    }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(CrateDBContainer cratedb) {
+        assertThat(cratedb.getExposedPorts()).containsExactly(5432, 4200);
+        assertThat(cratedb.getLivenessCheckPortNumbers())
+            .containsExactlyInAnyOrder(cratedb.getMappedPort(5432), cratedb.getMappedPort(4200));
+    }
+}
diff --git a/modules/cratedb/src/test/resources/logback-test.xml b/modules/cratedb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/cratedb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/cratedb/src/test/resources/somepath/init_cratedb.sql b/modules/cratedb/src/test/resources/somepath/init_cratedb.sql
new file mode 100644
index 00000000000..4faa1ede65c
--- /dev/null
+++ b/modules/cratedb/src/test/resources/somepath/init_cratedb.sql
@@ -0,0 +1,6 @@
+CREATE TABLE bar (
+  foo STRING
+);
+
+INSERT INTO bar (foo) VALUES ('hello world');
+REFRESH TABLE bar;

From f50ddc00cb4c0bfbec36440b912e24da15f7ce1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sun, 2 Apr 2023 22:41:53 -0500
Subject: [PATCH 2826/4969] Add checks permission to combine-prs

---
 .github/workflows/combine-prs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index d3d812b803c..a12fc172f65 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -8,6 +8,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
+      checks: read
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs

From 6f2917d10d814a8db9e955814a6da18947590fb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 03:43:56 +0000
Subject: [PATCH 2827/4969] Bump peter-evans/create-pull-request from 4.2.3 to
 4.2.4

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.2.3 to 4.2.4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/2b011faafdcbc9ceb11414d64d0573f37c774b04...38e0b6e68b4c852a5500a94740f0e535e0d7ba54)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index a511a8913de..8d69726bef3 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v3.10.1
+        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 8c34789b25c..2a8f366e548 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v3.10.1
+        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v3.10.1
         with:
           title: Update testcontainers version to ${GITHUB_REF##*/}
           body: |

From 9bf2a7050bb6945c5fa9d9aedd02e49cceaeef25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 03:44:06 +0000
Subject: [PATCH 2828/4969] Bump github/combine-prs from 2.1.0 to 3.0.1

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 2.1.0 to 3.0.1.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v2.1.0...v3.0.1)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index a12fc172f65..2a634b34f22 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v2.1.0
+        uses: github/combine-prs@v3.0.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From b51b7ed5c7e27c2366583a3f04ec2caddf2e21ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 3 Apr 2023 12:26:55 -0400
Subject: [PATCH 2829/4969] Exclude guava, jackson-core, jackson-databind from
 jib-core (#6884)

Previous to introduce support for Jib in f78c0c32. The dependencies
mentioned were shaded. However, after introducing Jib, those
transitive dependencies became part of the API. For that reason,
currently, those are not shaded.
---
 core/build.gradle | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 040cd1809e0..a8417e69d37 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -76,7 +76,13 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    provided 'com.google.cloud.tools:jib-core:0.22.0'
+    provided('com.google.cloud.tools:jib-core:0.22.0') {
+        exclude group: 'com.google.guava', module: 'guava'
+        exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
+        exclude group: 'org.apache.commons', module: 'commons-compress'
+    }
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
@@ -95,6 +101,7 @@ dependencies {
 
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
+    testImplementation 'com.google.cloud.tools:jib-core:0.22.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'

From a2ac6fd7021347901f1b95ef72aea7973475df6b Mon Sep 17 00:00:00 2001
From: Samed Bicer <15824212+samed-bicer@users.noreply.github.com>
Date: Tue, 4 Apr 2023 07:13:40 +0100
Subject: [PATCH 2830/4969] Update junit5 documentation with
 disabledWithoutDocker and parallel attributes (#6783)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/quickstart/junit_5_quickstart.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
index 24e9dd71a74..3c126196845 100644
--- a/docs/quickstart/junit_5_quickstart.md
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -85,7 +85,16 @@ We can do this in our test `setUp` method, to set up our component under test:
     not work on your current or future CI environment. As such, **avoid hard-coding** the address, and use 
     `getHost()` instead.
 
-## 4. Run the tests!
+## 4. Additional attributes
+
+Additional attributes are available for the `@Testcontainers` annotation.
+Those attributes can be helpful when:
+
+* Tests should be skipped instead of failing because Docker is unavailable in the
+current environment. Set `disabledWithoutDocker` to `true`.
+* Enable parallel container initialization instead of sequential (by default). Set `parallel` to `true`.
+
+## 5. Run the tests!
 
 That's it!
 

From 33c442a33c3fb6f65c1e2a926594654c7f337c97 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 14:41:17 -0400
Subject: [PATCH 2831/4969] [create-pull-request] automated change (#6890)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index cc9c268c0d6..af72b6cbacf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.17.6
+testcontainers.version=1.18.0

From 9485b11fa4ab060627e805c669aa31a00fe18035 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 14:41:38 -0400
Subject: [PATCH 2832/4969] [create-pull-request] automated change (#6891)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 72c457b9d5f..1eefc186653 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -117,4 +117,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.17.6
+    latest_version: 1.18.0

From e8844eb04f5a497f485ebfb4daace7b495802ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 4 Apr 2023 15:53:54 -0400
Subject: [PATCH 2833/4969] Remove source compatibility check for kafka,
 localstack and mongodb (#6892)

---
 modules/kafka/build.gradle      | 6 ------
 modules/localstack/build.gradle | 7 -------
 modules/mongodb/build.gradle    | 6 ------
 3 files changed, 19 deletions(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 8bf0ae60617..9728203a87c 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -7,9 +7,3 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.containers.KafkaContainer#containerIsStarted(com.github.dockerjava.api.command.InspectContainerResponse)"
-    ]
-}
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 516cc7bb736..731b2b70fd9 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,10 +9,3 @@ dependencies {
     testImplementation 'software.amazon.awssdk:s3:2.20.15'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.containers.localstack.LocalStackContainer#getEndpointConfiguration(org.testcontainers.containers.localstack.LocalStackContainer\$Service)",
-        "org.testcontainers.containers.localstack.LocalStackContainer#getDefaultCredentialsProvider()"
-    ]
-}
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index db56db32977..ddc346dd90b 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -6,9 +6,3 @@ dependencies {
     testImplementation("org.mongodb:mongodb-driver-sync:4.9.0")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.containers.MongoDBContainer#containerIsStarted(com.github.dockerjava.api.command.InspectContainerResponse)"
-    ]
-}

From e56b869912986fa299254e1f26262d649ac337da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:32 +0000
Subject: [PATCH 2834/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/mysql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 395af69604a..bc2af87bcec 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 7caf4a3489969a785eb50b3fe99538a0fb316534 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:33 +0000
Subject: [PATCH 2835/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.6 to 10.1.7.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2380dec6185..c1cd1fe5022 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.6'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.7'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From edc4e9aacefa93367ba3b11870241b2a5b99be60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:35 +0000
Subject: [PATCH 2836/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/nginx

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 8a3e319b125..fa26b67237d 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 55b664fe8c6bc8e9f74720a2440a56ec2c52d993 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:36 +0000
Subject: [PATCH 2837/4969] Bump org.jetbrains:annotations in
 /modules/postgresql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b0ae02fd9b6..d754fa72df8 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 86a584e4c66c7f13dd6a34a9608c1794c4ca726f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:36 +0000
Subject: [PATCH 2838/4969] Bump org.jetbrains:annotations in /modules/rabbitmq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 0623e3e6982..e18d4492b25 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 329b387d0b09c7b53fed34f73e6ebf3ed200895b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:38 +0000
Subject: [PATCH 2839/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/presto

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 7d5bde5a64d..63441839eb0 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 540e9b7685d0ac3e43a55d6691b807991e29f16e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:40 +0000
Subject: [PATCH 2840/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/tidb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index dabcf3cba26..b1105a3e2b0 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'mysql:mysql-connector-java:8.0.32'
 
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 4b83c5958e84cdf2f73cea7e13aff327aabb5967 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:41 +0000
Subject: [PATCH 2841/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.12.0 to 4.14.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.12.0...4.14.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 48d7b5ab25c..65988aa75f7 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.12.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.14.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")

From d500fa6a4e56371208e23b391500d8db09c8d0de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:41 +0000
Subject: [PATCH 2842/4969] Bump org.jetbrains:annotations in /modules/selenium

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index f98b6fc0cee..28a52e2f54d 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.assertj:assertj-core:3.24.2'
 
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 3ed41aed0bc522daa23a286311440a60e3a528cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:43 +0000
Subject: [PATCH 2843/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/spock

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a4c09f5ffd8..db934a82a6d 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'
 
-    testCompileOnly 'org.jetbrains:annotations:24.0.0'
+    testCompileOnly 'org.jetbrains:annotations:24.0.1'
 }
 
 sourceJar {

From db2581862c1acbe3d95a77c132e7b5df5ee86450 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:43 +0000
Subject: [PATCH 2844/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.3 to 3.4.4.
- [Release notes](https://github.com/couchbase/couchbase-jvm-clients/releases)
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.4.3...java-client-3.4.4)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 31be992141d..3e8dca2c1ad 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.3'
+    testImplementation 'com.couchbase.client:java-client:3.4.4'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 408993fd027ab7a1523c1cc24a28e69e0baf261f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:44 +0000
Subject: [PATCH 2845/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/hivemq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 48d7b5ab25c..2f127635029 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:24.0.0")
+    api("org.jetbrains:annotations:24.0.1")
 
     shaded("org.apache.commons:commons-lang3:3.12.0")
     shaded("commons-io:commons-io:2.11.0")

From fbf518e35c5616881c7959f56d76029552f8b929 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:44 +0000
Subject: [PATCH 2846/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.16 to 3.2.17.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.16...3.2.17)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 04a1a09b805..0e3c576d7a0 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.16"
+    api "com.orientechnologies:orientdb-client:3.2.17"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'

From 7afce1599cb659cc9db5c8fb83b02f37143694de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:45 +0000
Subject: [PATCH 2847/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/jdbc

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2380dec6185..71fed61811e 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':database-commons')
 
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.6'

From fac3d653082b91bbd6c02c088633d86785e855cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:46 +0000
Subject: [PATCH 2848/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /core

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a8417e69d37..72b68e896c2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -69,8 +69,8 @@ configurations.all {
 dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:24.0.0'
-    testCompileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
+    testCompileOnly 'org.jetbrains:annotations:24.0.1'
     api 'org.apache.commons:commons-compress:1.22'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From 16f08e89b7efaf3aa63d306b6e2ab50db199da50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:50 +0000
Subject: [PATCH 2849/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin from 1.8.2 to 1.10

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.8.2 to 1.10.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 9b44be57333..ed6f9726c4a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }
 }

From 72e39d07b2ebebc8ca10ab00af4cb835a3b76db1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:53 +0000
Subject: [PATCH 2850/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.6.2 to 8.7.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.6.2...v8.7.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 5d2132fe0d7..ea966a763be 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.6.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.7.0"
     testImplementation "org.elasticsearch.client:transport:7.17.9"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 1fe6b7a8e08e9d9f559adca054a932b745c4f9d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:54 +0000
Subject: [PATCH 2851/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.18.0 to 10.19.0.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index dc92cdd58ce..3cfcaac8442 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.18.0'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.19.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From f03616da587c0feb679d321a207f4d2a20e1c7f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:55 +0000
Subject: [PATCH 2852/4969] Bump com.google.cloud:google-cloud-pubsub in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-pubsub](https://github.com/googleapis/java-pubsub) from 1.123.4 to 1.123.8.
- [Release notes](https://github.com/googleapis/java-pubsub/releases)
- [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-pubsub/compare/v1.123.4...v1.123.8)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index a8bb9c9f7f0..37bf1056589 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.13.5'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.8.1'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.4'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.8'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.1'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 3f9e87b14887c7bdb09389e8b21a2d82390fce96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:56 +0000
Subject: [PATCH 2853/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.4 to 42.6.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.4...REL42.6.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index c03157ba2f9..0e26a6f2a96 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.4'
+    testImplementation 'org.postgresql:postgresql:42.6.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From c4f2d9df2d7fd5287a5e8e30727ae5b1ec049cbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:54:56 +0000
Subject: [PATCH 2854/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin in /examples

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.8.2 to 1.10.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index bb3ce2952db..3e299136854 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 9b44be57333..ed6f9726c4a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }
 }

From b17b27a376b81e4cbe5b6cb5f695aa2b6ce77ca7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:00 +0000
Subject: [PATCH 2855/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.1.2 to 3.1.3.
- [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/3.1.2...3.1.3)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c9c14ea72d3..697544c9e4f 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.2'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.3'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.3'

From 1d5b919e5c1380ef8f05f81ea3243b5388f20461 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:00 +0000
Subject: [PATCH 2856/4969] Bump org.postgresql:postgresql from 42.5.4 to
 42.6.0 in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.4 to 42.6.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.4...REL42.6.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index d53031542f5..cecf9a67467 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.4'
+    testImplementation 'org.postgresql:postgresql:42.6.0'
 
     compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 03b827496352bc1c0beba8ea1f42dfa5fc898ff4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:00 +0000
Subject: [PATCH 2857/4969] Bump com.google.cloud:google-cloud-datastore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.13.5 to 2.14.2.
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.13.5...v2.14.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index a8bb9c9f7f0..b15f11face6 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.13.5'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.14.2'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.8.1'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.4'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.1'

From 1d66f48bce21340679c752daaefc071b5eb9efb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:01 +0000
Subject: [PATCH 2858/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.7.0 to 6.8.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v6.7.0...v6.8.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index bd37ae0ce50..457f29e660d 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.influxdb:influxdb-java:2.23'
-    testImplementation "com.influxdb:influxdb-client-java:6.7.0"
+    testImplementation "com.influxdb:influxdb-client-java:6.8.0"
 }

From d0ae93b2fa1d464d00318e38a036bb4ed1d7e0df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:04 +0000
Subject: [PATCH 2859/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.15 to 2.20.38.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 731b2b70fd9..33969a40c04 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.418'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.418'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.418'
-    testImplementation 'software.amazon.awssdk:s3:2.20.15'
+    testImplementation 'software.amazon.awssdk:s3:2.20.38'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 2733ff858d3494f45096fb4ce38dbf31e4487980 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:04 +0000
Subject: [PATCH 2860/4969] Bump io.fabric8:kubernetes-client from 6.4.1 to
 6.5.1 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.4.1 to 6.5.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.4.1...v6.5.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index b4dfd6903dd..a04a242b29e 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.4.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.5.1'
     testImplementation 'io.kubernetes:client-java:17.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 13612676c2078090a5e1e5e5710e9cf9b8d04968 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:06 +0000
Subject: [PATCH 2861/4969] Bump io.trino:trino-jdbc from 408 to 411 in
 /modules/trino

Bumps io.trino:trino-jdbc from 408 to 411.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index de022d95faf..2b3ccb11a87 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:408'
+    testImplementation 'io.trino:trino-jdbc:411'
     compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 567e3becc4f73d9fa3519b862f468e377ca5df4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:06 +0000
Subject: [PATCH 2862/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.4 to 42.6.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.4...REL42.6.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b0ae02fd9b6..70389a2e3a8 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.5.4'
+    testImplementation 'org.postgresql:postgresql:42.6.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 36d580f9e57d63665e0c168f1954753ee6204b56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:06 +0000
Subject: [PATCH 2863/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/cratedb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index d53031542f5..a5be645a923 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -9,5 +9,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'org.postgresql:postgresql:42.5.4'
 
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 30ee064a50fe7b6fdff7cb0e33bafa9b363e10f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:09 +0000
Subject: [PATCH 2864/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.3 to 3.5.4.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.3...v3.5.4)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index cd542677e43..5d8db9abec1 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.3'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.4'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 6ab836c2b043feb87e05c647cc443d7b2bd56242 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:09 +0000
Subject: [PATCH 2865/4969] Bump org.seleniumhq.selenium:selenium-edge-driver
 in /modules/selenium

Bumps [org.seleniumhq.selenium:selenium-edge-driver](https://github.com/SeleniumHQ/selenium) from 4.8.1 to 4.8.3.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-edge-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index f98b6fc0cee..a5b90f4d2ea 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.6.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.6.0'
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.8.1'
+    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.8.3'
     testImplementation 'org.seleniumhq.selenium:selenium-support:4.6.0'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'

From 54fe11c3ca05d61f50ebae27d2bb30eb22a00e7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:10 +0000
Subject: [PATCH 2866/4969] Bump org.postgresql:postgresql from 42.5.4 to
 42.6.0 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.4 to 42.6.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.4...REL42.6.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 3ff8525a340..88826ccb237 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testImplementation 'org.postgresql:postgresql:42.5.4'
+    testImplementation 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.questdb:questdb:7.0.1-jdk8'

From 628a1ea5578429c9a8afba4d5b69049c1b5cda9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:10 +0000
Subject: [PATCH 2867/4969] Bump redis.clients:jedis from 4.3.1 to 4.3.2 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.3.1...v4.3.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8b3988a9982..bc83bf9958a 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.3.1'
+    testImplementation 'redis.clients:jedis:4.3.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From d05f5113168d661e11e19cb91348a9ee34df1aac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:13 +0000
Subject: [PATCH 2868/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 21.5.0.0 to 21.9.0.0.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 7eccc7972e6..beee5cbf4e4 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.0.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:21.5.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:21.9.0.0'
 
     compileOnly 'org.jetbrains:annotations:24.0.0'
 

From 381733f83de7af7a0e51a897fa5187535d0a87e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:13 +0000
Subject: [PATCH 2869/4969] Bump com.yugabyte:java-driver-core in
 /modules/yugabytedb

Bumps [com.yugabyte:java-driver-core](https://github.com/yugabyte/cassandra-java-driver) from 4.6.0-yb-11 to 4.6.0-yb-12.
- [Release notes](https://github.com/yugabyte/cassandra-java-driver/releases)
- [Commits](https://github.com/yugabyte/cassandra-java-driver/compare/4.6.0-yb-11...4.6.0-yb-12)

---
updated-dependencies:
- dependency-name: com.yugabyte:java-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index fa68ba41241..a84b49c1a71 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
     testImplementation project(':jdbc-test')
     // YCQL driver
-    testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-11'
+    testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-12'
     // YSQL driver
     testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-2'
 }

From d6774ae02a0c4d2ba37b45e94b44cabdf444e112 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:15 +0000
Subject: [PATCH 2870/4969] Bump com.rabbitmq:amqp-client from 5.16.0 to 5.17.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.16.0 to 5.17.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.16.0...v5.17.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 0623e3e6982..fd1b6d92d86 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.16.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.17.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From 36361be145f342782039deff573a8692364104c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:16 +0000
Subject: [PATCH 2871/4969] Bump org.postgresql:postgresql from 42.5.4 to
 42.6.0 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.4 to 42.6.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.4...REL42.6.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a4c09f5ffd8..c8d708f5745 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'

From 6bb1dfa9a517f540793e2363b8883866154fe0e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:20 +0000
Subject: [PATCH 2872/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.4 to 42.6.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.4...REL42.6.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8b3988a9982..25d360f08ae 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
 }
 

From 54686775fd0683607e57b941c9b366e994195592 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:21 +0000
Subject: [PATCH 2873/4969] Bump com.azure:azure-cosmos from 4.41.0 to 4.42.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.41.0 to 4.42.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.41.0...azure-cosmos_4.42.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 33a30b0ecb5..83319057269 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.41.0'
+    testImplementation 'com.azure:azure-cosmos:4.42.0'
 }

From af15fe123a9cad3afd46c6cf5ebe5ef1a74f4d1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:22 +0000
Subject: [PATCH 2874/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.418 to 1.12.441.
- [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.12.418...1.12.441)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 80d811edc9e..c29e1a5cae8 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.418'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.418'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.441'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.441'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7f84db0753ba7b048b0accfd5705c96f16e4b39f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:22 +0000
Subject: [PATCH 2875/4969] Bump redis.clients:jedis from 4.3.1 to 4.3.2 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.3.1...v4.3.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 3a1e162c82a..0f284e3ffa7 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.3.1'
+    implementation 'redis.clients:jedis:4.3.2'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index c8286015285..d5807de0899 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.3.1'
+    implementation 'redis.clients:jedis:4.3.2'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index ad7d51c883a..a8319bddfa9 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.3.1'
+    implementation 'redis.clients:jedis:4.3.2'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 9951ce9e645c100dcabdadb092a1a267c8551673 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:26 +0000
Subject: [PATCH 2876/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.5...v_1.4.6)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 48d7b5ab25c..d0550bf148f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.12.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.4.5")
+    testImplementation("ch.qos.logback:logback-classic:1.4.6")
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
 }

From 925f0d5660cf7d4aa756efb38831487f6b803f3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:27 +0000
Subject: [PATCH 2877/4969] Bump com.hazelcast:hazelcast from 5.2.2 to 5.2.3 in
 /examples

Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/compare/v5.2.2...v5.2.3)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index a13e16a23c6..63f43c11143 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.hazelcast:hazelcast:5.2.2'
+    testImplementation 'com.hazelcast:hazelcast:5.2.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 1d29b7f82e8a925ab9d621de7a0bfe7129ff626a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:29 +0000
Subject: [PATCH 2878/4969] Bump com.google.cloud.tools:jib-core from 0.22.0 to
 0.23.0 in /core

Bumps [com.google.cloud.tools:jib-core](https://github.com/GoogleContainerTools/jib) from 0.22.0 to 0.23.0.
- [Release notes](https://github.com/GoogleContainerTools/jib/releases)
- [Commits](https://github.com/GoogleContainerTools/jib/commits)

---
updated-dependencies:
- dependency-name: com.google.cloud.tools:jib-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a8417e69d37..234608e2eac 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -76,7 +76,7 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    provided('com.google.cloud.tools:jib-core:0.22.0') {
+    provided('com.google.cloud.tools:jib-core:0.23.0') {
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
@@ -101,7 +101,7 @@ dependencies {
 
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
-    testImplementation 'com.google.cloud.tools:jib-core:0.22.0'
+    testImplementation 'com.google.cloud.tools:jib-core:0.23.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'

From 0524dbbecc7c0e5b371d365290e78b8055ed9b2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:30 +0000
Subject: [PATCH 2879/4969] Bump com.rabbitmq:amqp-client from 5.16.0 to 5.17.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.16.0 to 5.17.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.16.0...v5.17.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index a8417e69d37..8f4ea8b594a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,7 @@ dependencies {
     testImplementation 'com.google.cloud.tools:jib-core:0.22.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.3.1'
-    testImplementation 'com.rabbitmq:amqp-client:5.16.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.17.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.12'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From af271a59d252bacd91ace15102578f6af2804cbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:34 +0000
Subject: [PATCH 2880/4969] Bump org.jetbrains.kotlin.plugin.spring in
 /examples

Bumps [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin) from 1.8.10 to 1.8.20.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index eca2ee2fd3f..6368356e713 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.7.9"
     id("org.jetbrains.kotlin.jvm") version "1.8.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.8.10"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.8.20"
 }
 
 apply plugin: 'io.spring.dependency-management'

From e4b64c8a4ce2f3000be5efd4c0d7bb8a9b2462fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:35 +0000
Subject: [PATCH 2881/4969] Bump org.springframework.boot from 2.7.9 to 2.7.10
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.9...v2.7.10)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/selenium-container/build.gradle       | 2 +-
 examples/spring-boot-kotlin-redis/build.gradle | 2 +-
 examples/spring-boot/build.gradle              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 5e8bb02a184..820564255b2 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.7.9'
+    id 'org.springframework.boot' version '2.7.10'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
index eca2ee2fd3f..e10a8e7d4dc 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.9"
+    id("org.springframework.boot") version "2.7.10"
     id("org.jetbrains.kotlin.jvm") version "1.8.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.8.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index fb70124e81a..00edc4c78d3 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.7.9'
+    id 'org.springframework.boot' version '2.7.10'
 }
 apply plugin: 'io.spring.dependency-management'
 

From 3b0f6c5a53cfa95c816e77e589852c0ffdf298ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:40 +0000
Subject: [PATCH 2882/4969] Bump com.google.cloud:google-cloud-bigtable in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-bigtable](https://github.com/googleapis/java-bigtable) from 2.19.2 to 2.20.3.
- [Release notes](https://github.com/googleapis/java-bigtable/releases)
- [Changelog](https://github.com/googleapis/java-bigtable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-bigtable/compare/v2.19.2...v2.20.3)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-bigtable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index a8bb9c9f7f0..ca6c9e0ec35 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-firestore:3.8.1'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.4'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.1'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.19.2'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.20.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From f702240f372d4af77b9a08c0a7e60ad0daf166c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:40 +0000
Subject: [PATCH 2883/4969] Bump com.github.johnrengelman.shadow from 8.1.0 to
 8.1.1 in /examples

Bumps com.github.johnrengelman.shadow from 8.1.0 to 8.1.1.

---
updated-dependencies:
- dependency-name: com.github.johnrengelman.shadow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4737b5c043f..aaa5273ce36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
-    id 'com.github.johnrengelman.shadow' version '8.1.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
     id 'com.diffplug.spotless' version '6.13.0' apply false
 }

From edb0e3c8e85f1bf67a440557bca74146043ccb89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:55:41 +0000
Subject: [PATCH 2884/4969] Bump com.amazonaws:aws-java-sdk-sqs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.12.418 to 1.12.441.
- [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.12.418...1.12.441)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-sqs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 731b2b70fd9..5dfe8bc4696 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.418'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.418'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.441'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.418'
     testImplementation 'software.amazon.awssdk:s3:2.20.15'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From b4313b034236e491baec1f7f65a798ab28c1cd77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 20:54:35 +0000
Subject: [PATCH 2885/4969] Bump org.jetbrains:annotations in
 /modules/oracle-xe

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 7eccc7972e6..45aa444af8d 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:21.5.0.0'
 
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'com.oracle.database.r2dbc:oracle-r2dbc:1.0.0'

From a65a5e7423565d50f965bbb2ed77585a29972d8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 20:55:38 +0000
Subject: [PATCH 2886/4969] Bump org.postgresql:postgresql from 42.5.4 to
 42.6.0 in /examples

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.4 to 42.6.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.4...REL42.6.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b27851a23cb..1aa9dae1b23 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20230227'
-    testImplementation 'org.postgresql:postgresql:42.5.4'
+    testImplementation 'org.postgresql:postgresql:42.6.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From d0e7d233c1fc7a2c38841d1615a362d45db7f920 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 23:55:43 +0000
Subject: [PATCH 2887/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.16 to 3.2.17.
- [Release notes](https://github.com/orientechnologies/orientdb-gremlin/releases)
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.16...3.2.17)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 0e3c576d7a0..a2162787e3c 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.16"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.17"
 }

From f8298f4710aba35910c48fbd7b55e4de61166038 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 23:55:59 +0000
Subject: [PATCH 2888/4969] Bump io.kubernetes:client-java from 17.0.1 to
 18.0.0 in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 17.0.1 to 18.0.0.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v17.0.1...v18.0.0)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index a04a242b29e..e4fad44abfa 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.5.1'
-    testImplementation 'io.kubernetes:client-java:17.0.1'
+    testImplementation 'io.kubernetes:client-java:18.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From c438ad638f46acaf30a2dee9385d17678cdb4182 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 23:57:29 +0000
Subject: [PATCH 2889/4969] Bump io.nats:jnats from 2.16.8 to 2.16.10 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.16.8 to 2.16.10.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.16.8...2.16.10)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 263aebf59ca..feeccdb32a6 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.8'
+    testImplementation 'io.nats:jnats:2.16.10'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From edde55d9bc307c7c044e06cd822e9061e6c54bf4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 23:57:33 +0000
Subject: [PATCH 2890/4969] Bump com.amazonaws:aws-java-sdk-logs in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-logs](https://github.com/aws/aws-sdk-java) from 1.12.418 to 1.12.446.
- [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.12.418...1.12.446)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 63c32007251..2b1b67bb7b3 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.418'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.441'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.418'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.446'
     testImplementation 'software.amazon.awssdk:s3:2.20.38'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From b8017cce6e8b7d64b6a2d2275246e4cb3a23fb91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 23:59:46 +0000
Subject: [PATCH 2891/4969] Bump com.amazonaws:aws-java-sdk-s3 in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.418 to 1.12.446.
- [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.12.418...1.12.446)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 63c32007251..187e5c17cb1 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.418'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.446'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.441'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.418'
     testImplementation 'software.amazon.awssdk:s3:2.20.38'

From 71a84ecc554e05ab0500405d577deed0cfb7dd98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 00:04:36 +0000
Subject: [PATCH 2892/4969] Bump com.google.cloud:google-cloud-firestore in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-firestore](https://github.com/googleapis/java-firestore) from 3.8.1 to 3.9.3.
- [Release notes](https://github.com/googleapis/java-firestore/releases)
- [Changelog](https://github.com/googleapis/java-firestore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-firestore/compare/v3.8.1...v3.9.3)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-firestore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index e8077f34137..721703ddfda 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.14.2'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.8.1'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.9.3'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.8'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.36.1'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.20.3'

From 742dd2b1e6565a52ebf66fefea386d79c8686776 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 00:04:36 +0000
Subject: [PATCH 2893/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.12.3 to 3.12.6.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index ed6f9726c4a..f0e3769d92f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }

From 22a565885e5102981ef7e47820084867ebc66ac5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 00:04:37 +0000
Subject: [PATCH 2894/4969] Bump org.apache.commons:commons-compress from 1.22
 to 1.23.0 in /core

Bumps org.apache.commons:commons-compress from 1.22 to 1.23.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ff07f2ec454..27a8e64c9cb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -71,7 +71,7 @@ dependencies {
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testCompileOnly 'org.jetbrains:annotations:24.0.1'
-    api 'org.apache.commons:commons-compress:1.22'
+    api 'org.apache.commons:commons-compress:1.23.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From df0acc17be51bbc8f3921673269438d2cf78daed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 00:04:42 +0000
Subject: [PATCH 2895/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.12.3 to 3.12.6.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 3e299136854..e43084b6e6a 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index ed6f9726c4a..f0e3769d92f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.3"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }

From aa0d9a9734300d2e6c73bfef381eb69a43cc546b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 00:04:56 +0000
Subject: [PATCH 2896/4969] Bump com.google.cloud:google-cloud-spanner in
 /modules/gcloud

Bumps [com.google.cloud:google-cloud-spanner](https://github.com/googleapis/java-spanner) from 6.36.1 to 6.38.2.
- [Release notes](https://github.com/googleapis/java-spanner/releases)
- [Changelog](https://github.com/googleapis/java-spanner/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-spanner/compare/v6.36.1...v6.38.2)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-spanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index e8077f34137..906bd7d2767 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.14.2'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.8.1'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.8'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.36.1'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.38.2'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.20.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From c534efc27c62b8b36c7e47de50b76238a8d265b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 00:05:05 +0000
Subject: [PATCH 2897/4969] Bump redis.clients:jedis from 4.3.1 to 4.3.2 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.3.1...v4.3.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ff07f2ec454..c87d03238aa 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -103,7 +103,7 @@ dependencies {
 
     testImplementation 'com.google.cloud.tools:jib-core:0.23.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:4.3.1'
+    testImplementation 'redis.clients:jedis:4.3.2'
     testImplementation 'com.rabbitmq:amqp-client:5.17.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.12'
 

From 3d21747f1ecda32887bf3db88c0942b5fe9bee94 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 11 Apr 2023 13:25:37 +0200
Subject: [PATCH 2898/4969] Add real `on_failure` page (#6784)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Oleg Šelajev <shelajev@gmail.com>
---
 docs/_redirects                                  |  2 +-
 ...rror_missing_container_runtime_environment.md | 16 ++++++++++++++++
 mkdocs.yml                                       |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 docs/error_missing_container_runtime_environment.md

diff --git a/docs/_redirects b/docs/_redirects
index 5918fb853f2..d3c61aba618 100644
--- a/docs/_redirects
+++ b/docs/_redirects
@@ -12,7 +12,7 @@
 /usage/database_containers.html         /modules/databases/
 /usage/neo4j_container.html             /modules/databases/neo4j/
 /compatibility.html                     /supported_docker_environment/
-/on_failure.html                        /supported_docker_environment/
+/on_failure.html                        /error_missing_container_runtime_environment
 
 # No great 1:1 mapping exists for the following, so redirect to somewhere where at least a sensible sidebar will be shown
 
diff --git a/docs/error_missing_container_runtime_environment.md b/docs/error_missing_container_runtime_environment.md
new file mode 100644
index 00000000000..373d04fff38
--- /dev/null
+++ b/docs/error_missing_container_runtime_environment.md
@@ -0,0 +1,16 @@
+# Fixing Issues with Discovering A Supported Container Runtime Environment
+
+
+If you ended up on this page, 
+it seems that either Testcontainers was not able to find a supported container runtime in your environment,
+or you found this page while searching for information to deal with errors regarding the environment discovery mechanism of Testcontainers.
+
+Testcontainers requires a supported container runtime environment to be present in order to manage and run containers.
+Here is a list of supported container runtime environments:
+
+* [Docker Desktop](https://www.docker.com/products/docker-desktop/)
+* [Docker Engine on Linux](https://docs.docker.com/engine/install/)
+* [Testcontainers Cloud](https://www.testcontainers.cloud?utm_medium=direct&utm_source=testcontainers.com&utm_content=docs&utm_term=on-failure)
+
+For more extensive information on supported container runtime environments, as well as known limitations of alternative container runtime environments,
+please refer to [this page](https://www.testcontainers.org/supported_docker_environment/) in our documentation.
diff --git a/mkdocs.yml b/mkdocs.yml
index 1eefc186653..5e3f606a639 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -97,6 +97,7 @@ nav:
     - Examples: examples.md
     - System Requirements:
           - supported_docker_environment/index.md
+          - error_missing_container_runtime_environment.md
           - Continuous Integration:
                 - supported_docker_environment/continuous_integration/aws_codebuild.md
                 - supported_docker_environment/continuous_integration/dind_patterns.md

From 0bf52a95148ebc60a5b529d90dbbbf25390051f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 11 Apr 2023 10:07:38 -0500
Subject: [PATCH 2899/4969] Add docker rootless support for macOS and desktop
 for Linux (#6907)

Docker Desktop for Linux installs the socket path at
`/home/username/.docker/desktop/docker.sock`. In Docker Desktop
for Mac 4.18, there is an option to disable the default Docker socket
(/var/run/docker.sock) and rely on `/home/username/.docker/run/docker.sock`
instead.

Fixes #6426
---
 .../RootlessDockerClientProviderStrategy.java   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
index a032c2b324d..9c78677c135 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
@@ -34,8 +34,15 @@ private Path resolveSocketPath() {
                 Path homePath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("run");
                 return tryFolder(homePath)
                     .orElseGet(() -> {
-                        Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
-                        return tryFolder(implicitPath).orElse(null);
+                        Path dockerDesktopPath = Paths
+                            .get(System.getProperty("user.home"))
+                            .resolve(".docker")
+                            .resolve("desktop");
+                        return tryFolder(dockerDesktopPath)
+                            .orElseGet(() -> {
+                                Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
+                                return tryFolder(implicitPath).orElse(null);
+                            });
                     });
             });
     }
@@ -79,7 +86,11 @@ public TransportConfig getTransportConfig() throws InvalidConfigurationException
 
     @Override
     protected boolean isApplicable() {
-        return SystemUtils.IS_OS_LINUX && getSocketPath() != null && Files.exists(getSocketPath());
+        return (
+            (SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC) &&
+            getSocketPath() != null &&
+            Files.exists(getSocketPath())
+        );
     }
 
     @Override

From 2525748a3aca939387040ae5f2cfedbc8469caee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 11 Apr 2023 18:26:02 -0500
Subject: [PATCH 2900/4969] Allow `@Container` to be used as a meta-annotation
 (#6914)

Fixes #6913
---
 .../junit/jupiter/Container.java              |  2 +-
 .../junit/jupiter/MetaAnnotationTest.java     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MetaAnnotationTest.java

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Container.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Container.java
index a075786d0d5..a22c23e57a6 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Container.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Container.java
@@ -11,7 +11,7 @@
  *
  * @see Testcontainers
  */
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Container {
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MetaAnnotationTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MetaAnnotationTest.java
new file mode 100644
index 00000000000..627d778a93f
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MetaAnnotationTest.java
@@ -0,0 +1,28 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.PostgreSQLContainer;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Testcontainers
+class MetaAnnotationTest {
+
+    @TcContainer
+    private static final PostgreSQLContainer<?> POSTGRESQL = new PostgreSQLContainer<>(
+        JUnitJupiterTestImages.POSTGRES_IMAGE
+    );
+
+    @Test
+    void test() {
+        assertThat(POSTGRESQL.isRunning()).isTrue();
+    }
+}
+
+@Container
+@Retention(RetentionPolicy.RUNTIME)
+@interface TcContainer {
+}

From b448c9a25763da3d99e6f15aeba4941b85cc0215 Mon Sep 17 00:00:00 2001
From: Denilsson Montoya <dmontoyane@gmail.com>
Date: Tue, 18 Apr 2023 20:00:45 -0500
Subject: [PATCH 2901/4969] Fix typos in HiveMQ doc (#6925)

---
 docs/modules/hivemq.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/hivemq.md b/docs/modules/hivemq.md
index 66f9670648c..2ebdd7a9ad8 100644
--- a/docs/modules/hivemq.md
+++ b/docs/modules/hivemq.md
@@ -34,7 +34,7 @@ Using the Enterprise Edition:
 [Enterprise Edition HiveMQ image](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:hiveEEVersion
 <!--/codeinclude-->
 
-Using a specifc version is possible by using the tag:
+Using a specific version is possible by using the tag:
 <!--codeinclude-->
 [Specific HiveMQ Version](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java) inside_block:specificVersion
 <!--/codeinclude-->
@@ -151,7 +151,7 @@ If the extension folder contains a DISABLED file, the extension will be disabled
 
 ---
 
-We first load the extension from the filesytem:
+We first load the extension from the filesystem:
 <!--codeinclude-->
 [Extension from filesystem](../../modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java) inside_block:startFromFilesystem
 <!--/codeinclude-->

From 38fcf4699f4623fdc63a512b89147596265e9ad6 Mon Sep 17 00:00:00 2001
From: Leonardo Colman Lopes <dev@leonardo.colman.com.br>
Date: Fri, 21 Apr 2023 14:26:12 -0400
Subject: [PATCH 2902/4969] Add new section for test integrations (#6930)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/test_framework_integration/external.md | 9 +++++++++
 mkdocs.yml                                  | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 docs/test_framework_integration/external.md

diff --git a/docs/test_framework_integration/external.md b/docs/test_framework_integration/external.md
new file mode 100644
index 00000000000..2082af93bf0
--- /dev/null
+++ b/docs/test_framework_integration/external.md
@@ -0,0 +1,9 @@
+# External Integrations
+
+The following Open Source frameworks add direct integration to Testcontainers
+
+| Framework | Source Code | Documentation |
+| --- | --- | --- |
+| jqwik | [jqwik-testcontainers](https://github.com/jqwik-team/jqwik-testcontainers) | [README](https://github.com/jqwik-team/jqwik-testcontainers) |
+| Kotest | [Kotest Extensions Testcontainers](https://github.com/kotest/kotest-extensions-testcontainers) | [kotest.io](https://kotest.io/docs/extensions/test_containers.html) |
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 5e3f606a639..84d9bc0aa18 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -94,6 +94,7 @@ nav:
           - test_framework_integration/junit_5.md
           - test_framework_integration/spock.md
           - test_framework_integration/manual_lifecycle_control.md
+          - test_framework_integration/external.md
     - Examples: examples.md
     - System Requirements:
           - supported_docker_environment/index.md

From 933274985f71c1ff91576e6d856a185ff7839613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 21 Apr 2023 21:24:09 -0600
Subject: [PATCH 2903/4969] Fix generated pom with duplicated entries (#6931)

In d512ca5, a change was introduced which started generating pom.xml
with duplicated entries when a dependency is declared as `provided`.
The dependency is added with `compile` and `provided` scopes.
---
 core/build.gradle        |  1 -
 gradle/publishing.gradle | 13 +++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index fd2eef047ab..f5f5e14fb09 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -125,7 +125,6 @@ dependencies {
 tasks.generatePomFileForMavenJavaPublication.finalizedBy(
     tasks.register('checkPOMdependencies', org.testcontainers.build.ComparePOMWithLatestReleasedTask) {
         ignore = [
-            "com.google.cloud.tools:jib-core"
         ]
     }
 )
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index ffeb3cb38d4..3b2b3f22211 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -57,8 +57,12 @@ publishing {
 
                 def dependenciesNode = rootNode.appendNode('dependencies')
 
-                def addDependencies = { Configuration configuration, scope ->
-                    for (dependency in configuration.resolvedConfiguration.firstLevelModuleDependencies) {
+                def apiDeps= project.configurations.api.resolvedConfiguration.firstLevelModuleDependencies
+                def providedDeps = project.configurations.provided.resolvedConfiguration.firstLevelModuleDependencies
+                def newApiDeps = apiDeps - providedDeps
+
+                def addDependencies = { Set<ResolvedDependency> resolvedDependencies, scope ->
+                    for (dependency in resolvedDependencies) {
                         if (dependency.configuration.startsWith("platform-")) {
                             continue
                         }
@@ -66,6 +70,7 @@ publishing {
                             if (!dependency.moduleGroup || !dependency.moduleName || !dependency.moduleVersion) {
                                 throw new IllegalStateException("Wrong dependency: $dependency")
                             }
+
                             appendNode('groupId', dependency.moduleGroup)
                             appendNode('artifactId', dependency.moduleName)
                             appendNode('version', dependency.moduleVersion)
@@ -83,8 +88,8 @@ publishing {
                         }
                     }
                 }
-                addDependencies(project.configurations.api, 'compile')
-                addDependencies(project.configurations.provided, 'provided')
+                addDependencies(newApiDeps, 'compile')
+                addDependencies(providedDeps, 'provided')
             }
         }
     }

From d6a347817bab274ed0b51b5e2b4f708c0d167437 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 21:34:04 -0600
Subject: [PATCH 2904/4969] Update Gradle Wrapper to 8.1.1 (#6933)

* Update Gradle Wrapper from 8.0.2 to 8.1.1.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.0.2 to 8.1.1.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

---------

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 61608 -> 62076 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   7 ++++---
 gradle/wrapper/gradle-wrapper.jar             | Bin 61608 -> 62076 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   7 ++++---
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..c1962a79e29d3e0ab67b14947c167a862655af9b 100644
GIT binary patch
delta 8979
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
F{TFmrHLU;u

delta 8469
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

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 19acfb4ef2f..2c3425d49ec 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 79a61d421cc..aeb74cbb43e 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..c1962a79e29d3e0ab67b14947c167a862655af9b 100644
GIT binary patch
delta 8979
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
F{TFmrHLU;u

delta 8469
zcmY*<Q*;~v*KN?)cGB3k8oROWWF}5yPSn^F+qTshjWLZH+l`Ih{@=Ra{ntG&XC3Uf
z{jkqo=WQRhVh6S%D-VqozQ)8D5eh098w!dFyi-O7&c8$i<?8zQ<LZ+A?LFt5w1NRL
z6p{c)7~7OS>q~ZGqoW{=01$bgB@1Nex`%9%S2I04)5Jw9+UyLS&r+9O2bq{gY;dCa
zHW3WY0%Dem?S7n5JZO%*yiT9fb!XGk9^Q`o-EO{a^j%&)ZsxsSN@2k2eFx1*ps<i@
zi1cJ2WJmCTFydo%tY}D+um&5#in*+;yj^4aoX~b?Mfy^_Oh$($eFSEP9J!LczsEZD
zBuA_rZKL-@_nENn@pga}{v^Bdn~)5iW!&9U_5@r1P#?{{vf1=eqWv>qn0e*c<L^gn
z;VnnI>rIbAO}Rd~_BifMu*q7SUn{>WD$=7n_$uiQ0wGc$?u1hM%gf??nL?m22h!8{
zYmFMLvx6fjz*nwF^tAqx1uv0yEW9-tcIV5Q{HNh`9PMsuqD8VE%oAs5FsWa0mLV$L
zPAF5e^$tJ8_Kwp!$N1<nzfMQ}Ir;OsY%+tzCNtt*dQ>M<#Z154n!X6hFpk8)eMLu;
zaXS71<m+Zg$#@;1w0MVFQN2`iF-`+#Ct@9LM^_{&ZAKSKd5n5|Qpya6pAK0tFC$yz
z$Z#rlI-Riz7N+9H!bd1vXSzJ273SSIwf2L1bJWQx`ckjS-&*&z$+X$4`aLHiOGRbU
zWO2zSckQk@9Y!$%nCva3T+VA?!W&Ajlsygvi76DZXv?Lg(&^5NHnl;s^3m*o>&`24
zV`x~}yAxBw##Oj@qo_@DcBqc+2TB&=bJyZWTeR55zG<{Z@T^hSbMdm~Ikkr?4{7WT
zcjPyu>0sDjl<H}cGA~w=&7%%d3z}Xil)F*?R%oH=XcKTB(|EpGOrLXNK_9c(tvz)G
z{aTqr=RIhWe@Y3{#3ui2Pp_=1B*5z8^CiPc*6RVoj&n)0TuwEk3f!o$k#_P44qnY;
zn5(TeQ>7&?<mc(c3iYENk#L!h#Kciq)Hou~+Ej*lDUzZvk8OXn(o;(a0%w&OiIY|X
zRyMA~;f_y-!~nj7_FT9p+*%T?{`V?eP^@`+|DZ;s)AX^dQ8QlbUTjE&OWMtED>TL@
z)cW?lW@Pfwu#nm7E1%6*nBIzQrKhHl`t54$-m>j8f%0vVr?N0PTz`}VrYAl+8h^O~
zuWQj@aZSZmGPtcVjGq-EQ1V`)%x{HZ6pT-tZttJOQm?q-#KzchbH>>5-jEX*K~KDa
z#oO&Qf4$@}ZGQ7gxn<;D$ziphThbi6zL^YC;J#t0GCbjY)NHdqF=M4e(@|DUPY_=F
zLcX1HAJ+O-<snyWHUhAfVG5m;l?`o}72ZjN-@M+W2EZAZ71_}yUZd`JC47u2mNIPT
z`=8nKD)kin7;Qe)<zVr^EE`)yfeyiW_Qt>3VkU#LW`4;=6szwwo%^R4#UK}HdAXK`
z{m!VZj5q9tVYL=^TqPH*6?>*yr>VxyYF4tY{~?qJ*eIoIU0}-TLepzga4g}}D7#Qu
zn;6I;l!`xaL^8r*Tz*h`^(xJCnuVR_O@Gl*Q}y$lp%!kxD`%zN19WTIf`VX*M=cDp
z*s4<9wP|ev;PARRV`g$R*QV@rr%Ku~z(2-s>nt{JI$357vnFAz9!ZsiiH#4wOt+!1
zM;h;EN__zBn)*-A^l!`b?b*VI-?)Sj6&Ov3!j9k$5+#w)M>`AExCm0!#XL+E{B<uH
zJ-XtkM=-*yOPz~*46E~bK?MhH>p)s;Hochs+-@@)7_X<IK?a=g)C?|1wCpz5hcb_S
z*rpw-04FB1!l(VCMOrLocyxM7=~mVI-nF81YXyCLN%xE9Y~w+Z_iM}rdJ<E|k}Hud
z%qUr6HHh(V^;5?{NbU`MjU_Cxt!4km%|*A7*WHW4j$g&L0za7v=xjADn{6OXa@bUH
za*`Qf4oC8FY1_gaP5N7+>DMPby#p<9mLu+S{8e2Jn`1`1nrffBfy4u)p7FFQWzgYt
zXC}GypRdkTUS+mP!jSH$K<bxckZ_*rI@w(-1zsYcx6S;SL3$`!U5ke&esCG{Az^R}
z6Frt{4ii0|YJ~$HbOK#e(~kl`#TJu?pa5%1MU#V6+@b#v*cTzdi6I@w-aUn5nu+4^
z+G3sBdt>71PYI%QI-{m;DvlRb*|4GMPmvURv0uD2bvS%FOSe_$4zc--*>gfRMKN|D
ztP^WFfGEkcm?sqXoyRmuCgb?bSG17#QSv4~XsbPH>BE%;bZQ_HQb?q%CjykL7CWDf
z!rtrPk~46_!{V`V<;AjAza;w-F%t1^+b|r_um$#1cHZ1|WpVUS&1aq?Mnss|HVDRY
z*sVYNB+4#TJAh4#rGbr}oSnxjD6_LIkanNvZ9_#bm?$HKKdDdg4%vxbm-t@ZcKr#x
z6<$$VPNBpWM2S+bf5IBjY3-IY2-BwRfW_DonEaXa=h{xOH%oa~gPW6LTF26Y*M)$N
z=9i`Y8};Qgr#zvU)_^yU5yB;9@yJjrMvc4T%}a|jCze826soW-d`V~eo%RTh)&#XR
zRe<8$42S2oz|NVc<ch+2802`gSo)sO6N1x0plY5E(u@4kNd7vaLyEcP5+e{PMTHc{
zQ#mNx*FnMQitc)iC|WyfDK3I;ED|Mg&5jynYo_(dtn=v$Y9<dG6>B%rG(FP2U&X>3
z4M^}|K{v64>~rob;$GO55t;Nb&T+A3u(>P6;wtp6DBGWbX|3EZBDAM2DCo&4w|W<f
z=-V>Gpi;~qUY?Ofg$pX&`zR~)lr)8}z^U3U38Nrtnmf~e7$i=l>+*R%hQgDrj%P7F
zIjy<KY1I&PUFSkf+8%7_U#tphqPC46TC0jWA|W{lU<&}L%ZUeS*DWUMBMTDv2I|+G
z2})0&)9;JmH!(FO*iX1nP>BCj2$Td=Fp=0Dk{=8d6cIcW6zhK!$>k*uC^f}c6-NR$
zd<)oa+_fQDyY-}9DsPBvh@6EvLZ}c)C&O-+wY|}RYHbc2cdGuNcJ7#yE}9=!Vt-Q~
z<!)ZXP(<TVo}F6FeH6T0&D;<Jf!<)$1}tG+aji2{)fmPbK0{>4tOePK<O_-{GY0_P
z{$qITh7lp=O<l8FZj(TeK1n=t-rRTNKOJPM4#-<aXa-40IvqW$4R(&RKt4b!d7TA^
zDepU<*T%i5IYmVaV~<DrYws1&(v9unce_b@y<nuX(6NO0Fx&4b>!0IJ0cW*jOkCO?
zS-T!bE{5LD&u!I4tqy;dI*)#e^i)uIDxU?8wK1COP3Qk{$vM3Sm8(F2VwM?1A+dle
z6`M6bbZye|kew%w9l`GS74yhLluJU5R=#!&zGwB7lmTt}&eCt0g(-a;Mom-{lL6u~
zFgjyUs1$K*0R51qQTW_165~#WRrMxiUx{0F#+tvgtcjV$U|Z}G*JWo6)8f!+(4o>O
zuaA<EF{8Q>xLfUl;GHI}A}Kc>A8h<gR~*An{#yQ`TTCkDXOdty`9yRQWJ3gu82xmx
zkM1tXXc#QZ-TxHzgwGrp`k`ORrWrda?0~NeaDuOP(dI;5-Di+Yiu;VKf(65mwQ456
zQpBRThnt$uFq1FNoTh^LzA$7}@ktMf*ibx#)goCRITOtalrhRGK24KTnd!hMDdu})
zo=Lzn;a9n<3+OAf&o7WkIFWSkx3})MXZo~N3PMfVcT3Cb7p)?`s!1fEUTfSd%xi|t
zA^f9+9z|hx7@IMLD%LQ+OKKw*SxkT<c7EY)`bL&?JIqL%cjov|kdaG|{vcRy0S#<@
zy&I=Obo?bo`2UmCR>^v6<sWB3tl-TudXPSnzt-ZS7=3fk_|*ywbojJ7k`?Xw<flT)
zPe|cGVWq)cJv8j&KUrK4(P$QaM=$+ot!-sp+GulctgWCis{*uk7}|T)t{B)Go-JuR
zYWM!_bhhDAAcy(*BL64glFjx#-)*+r=PlIllD<grtuEj5Mh}QwN<=^H4W!#IMgqxm
ztDDe2SBBBsi;T#;#UQ-xA60UBCG$v#<xiE%yH(|vyC&t=9i1#p&2_A(T6Rh=rP~=D
z?tK&6n8qWXy@N>C-9bb}lw@rtA*4Q8)z>0oa6V1>N4GFyi&v69#x&CwK*^!w&$`dv
zQKRMKcN$^=$?4<UWBx|0@886huRzEY%M(+INgwX|9TTd1oik(ArD9ThzGAHVyu|!Z
zK+Y9&ms*~)5<$)5n)KSZFPopKNq9F)u5Bnl>to7X4I`?PKGi(=R}d8cv{74o|9FwS
zvvTg0D~O%bQpbp@{r49;r~5`mcE^P<9;Zi$?4LP-^P^kuY#uBz$F!u1d{Ens6~$Od
zf)dV+8-4!eURXZZ;lM4rJw{R3f1Ng<9nn2_RQUZDrOw5+DtdAIv*v<P#dY~R?!oNS
zGu0-os_n#S3~#UW-s}q_BMG*D<$2dvp5ArU%Sd*i5}%0rxhKWAdW(fK3x&x@X*;2*
zG{;k38#+5GSuP-5CJeKkE=b3@X3J$Jx@#2e>@3ZBU9G)sC&y!vM28daSH7(SKNGcV
z&5x#e#W2eY?XN@jyOQiSj$BlXkTG3uAL{D|PwoMp$}f3<dIwd)TCC=8a)Za`JUFTM
zcG$uJwbx{g^6LQWtkaeTCmCOp4tHW5IbP{lKDn?PMir8!gSvsTD3Fb=5=|<qGrw*)
zwT*{TOy<`*PK)s5+Jz{|3w8dW94`d{{I)c%T;n%N-+&IfG5l^T9B?<?rX5#Y4aV41
zxK_*RR|gIbM)JsZ!X#x`DwfL=iS|XT@FP0mZ*2i+C-1CCkcKI|osyB374^_*PmGAR
z?`xV!L&#&6+O%zuA<(sAV^l{Gtyf;<eusiYu}*_(ShnU(FDI5cu{k&)Q|Dmx-a}6#
zqr0SWD1#d$VaYVXBSckI|1<N~lN(_jg~$}oWrj{3pA~_C{h*JGKoVY+sjV^R7WSVM
zuN7<oPGM_9jlJ0+)(i&)8M95&U{ywP`O;xVU&7sQWDScsb|8Bky+cRinf+6aZVvKr
z=QZ4+9)=LBXywnqwi0af>h5o7b4Y+X#P)0jlolgLn9xC%<t{zj2^e}vq+$!N*U)RY
zHOE0{4=Xezj8cPDH#xGHgtgdujks8I=j)z5&qs)?AI}FBq~pSdYJDl!e&GIEAkky=
zb8Q6EMPxdU3aI?xkS>zr3jr$gl$8?II`DO6gIGm;O`R`bN{;DlXaY4b`>x6xH=Kl@
z!>mh~TLOo)#dTb~F<l4vRvO3)*{L2@jCMOBz|cO=h^B68t+?P37yvYC$VyAliV>;O
z8hpjW9Ga?AX&&J+T#RM6u*9x{&%I8m?vk4eDWz^l2N_k(TbeBpIwcV4FhL(S$4l5p
z@<OGQ02e)>{n7|sax){t!3t4O!`o(dYCNh90+hl|p%V_q&cwBzT*?Nu*D0wZ)fPXv
z@*;`TO7T0W<pT>KtFh8~mQx;49VG_`l`g|&VK}LysK%eU4})Cvvg3YN)%;zI?;_Nr
z)5zuU1^r3h;Y+mJov*->dOOj>RV^u2*|RraaQWsY5N?Uu)fKJOCSL2^G=RB%(4K{*
zx!^cB@I|kJR`b+5IK}(6)m=O{49P5E^)!XvD5zVuzJH{01<oAcpKO_P;M;FGS|jbX
zgf!8=Vi3im!_0m9N%pWoGYj3;3i5qeIehbX4#-s@S(2CKGfBQwJ6~FK)+)=T26oqX
z0Y0O|@vOZF<Ybk4w;TmlM&Ybu>^#$@Cn514w41BB;FAoS2SYl3SRrOBDLfl5MvgA3
zU6{T?BW}l~8vU;q@p9IOM(=;WdioeQmt?X|=L9kyM&ZsNc*-Knv8@U*O96T@4ZiJ$
zeFL2}pw_~Tm3d4#q!zZS0km@vYgym33C0h(6D)6|Y)*UXI^T`(QPQh$WF?&h(3QYh
zqGw@?BTk@VA<BiuEE9gsw39nr(OQV<iFPh|0fNU1?2i%%rLT1P>_VxK@z?a@UrMhY
zUD16oqx4$$6J_<M?r_GH5Nr3&QB#NyKghKHcKI1T&N(GL+r2l_dHz|a7moKhq9C9R
zvs?LS?U_W4Qdf#5YE*j>k0HnXgARm}N#(^yA1MLdbwmEqHnX*JdHN>$5k2E|^_bL<
zGf5Z+D!9dXR>^(5F&5gIew1%kJtFUwI5P1~I$4LL_6)3RPzw|@2vV;Q^MeQUK<mgw
zyRES<EP&yzMwZ|`K{i1bn+CoB9fVr%1~ht!x%0tB@)Pu#nYy#QD5g@=j@IcTbG@T?
zfAJ%~PSqodYvZrBWZIEDmo$3Aq4NoJ!84E7@5B_po}mL1f%lEP_{&5{lv#_S#|<bc
zpec+Kcan{|+o3m{T#SK|^+tsWP?<~2#O{E1He|^x8~Ug%&j^<}niqOK-o8lIt6^xx
z2|iny8^0wMP>zc=KxSTTX`}u%z?h~;qI#%dE@OZwehZyDBsWTc&tOC1c%HS#AyTJ=
zQixj=BNV<g1UVe6CQP{$I%#OFG$$|K;!ggl3%C33!OW0~{Chx+G!tVUs3E2^vq+Dl
zT^zlr7X>aRS*G!;B$}cJljeiVQabC25O+xr4A+32HVb;@+%r}$^u4-R?^3yij)0xb
z86i@aoVxa%?bfOE;Bgvm&8_8K(M-ZEj*u9ms_H<nyPn117HNFxo*tq|9MdiUZw1QT
zwwFnSm26%>k#2eL`PSnD#At!0l{f!v`&Kg}M$n(&R)?AigC5Z?T7Jv^lrDL!yYS{4
zq_H}oezX-Svu>dp)wE@khE@aR5vY=;{C-8Hws++5LDpArYd)U47jc-;f~07_TPa^1
zO`0+uIq)@?^!%JXCDid+nt|c@NG1+ce@ijUX&@rV9UiT|m+t-nqVB7?&UX*|{<r4V
z^r=2$(|kEysBZ!UdFBlyqph_hDuo!nh0i!gQ*Z6|*|La~crH9sBzOO<yzP6k&i%{!
zCr@OB$Q}VV6z3bn^-s#vj@WKmyN7T3NA<1nn{mPQaRd}3cCRKvEzq`%wnE)`M({e}
zCH69PvdP3c>yDBFw9x52&dTh@;CL)Q?6s1gL=CUQTX7#TJPs9cpw<4>GFMUKo|f{!
z&(%2hP6ghr%UFVO-N^v9l|tKy>&e%8us}wT0N*l(tezoctVtLmNdGPOF6oaAGJI5R
zZ*|k@z3H!~Mm9fXw{bbP6?lV-j#Rfgnjf++O7*|5vz2#XK;<m`kr?9DP4I(A9q>kk
ztJbi%r0{U5@QwHYfwdjtqJ6?;X{Ul3?W<M~pQv?_QXxY$B|8q(mBiZ?>0O0bZ$k*y
z4jWsNedRoCb7_|>nazmq{T3Y_{<5IO&zQ?9&uS@iL+|K|eXy^F>-60HDoVvovHelY
zy6p(}H^7b+$gu@7xLn_^oQryjVu#pRE5&-w5ZLCK&)WJ5jJF{B>y;-=)C;xbF#wig
zNxN^>TwzZbV+{+M?}UfbFSe#(x$c)|d_9fRLLHH?Xbn!PoM{(+S5IEFRe4$aHg~hP
zJYt`h&?WuNs4<lFKytVjp|M%h!;OnvLBDMHwSct~bZz0eN+f2=)~EAZ*Ps}BfYL4u
z%*@5hb`ETTQ7<Qd{lH?8mB=8b#!o1ejaylWW%lgwR-aGARf_58j6dzOUhpI|N4ZBp
zhsDbl%=GtH2_g0-5gvF>mVAmk$yeM;8?R6;YBMp8VilyM!RXWj<95=yp=4@y?`Ua8
znR^R?u&g%`$Wa~usp|pO$aMF-en!DrolPjD_g#{8X1f=#_7hH8i|WF+wMqmxUm*!G
z*4p980g{sgR9?{}B+a0yiOdR()tWE8u)vMPxAdK)?$M+O_S+;nB34@o<%lGJbXbP`
z5)<({mNpHp&45UvN`b&K5SD#W){}6Y_d4v~amZPGg|3GdlWDB;;?a=Z<Rcxrcuq3D
z?q)Qviylja#fU~i{mq)63D}aEDLKD+5a-nF{2TVYf%IFbPNsbYG=YcQP@gTr3>{dd
zELTfXnjCqq{Dgbh9c%LjK!Epi1TGI{A7AP|eg2@TFQiUd4Bo!JsCqsS-8ml`j{gM&
zEd7yU`djX!EX2I{WZq=qasFzdDWD`Z?ULFVIP!(KQP=fJ<agA*j4+8XGmvFE7}X8P
zG+nF-{9+uMsgX?=5Zo(Yk|#~4qe`Wn=ZoEGMEH(v9D|i)BlfHy)z?xJAzLTGT~&BT
zP8=LDPwCaaAq7X7;BF~t5{rT1{R#j%Xaf65u2Ryq?=;LY;{1X}w*=*9WaeBs8FVF<
zXnCSkiZub5$!@9BtjtFmFI>h5QC9D|$JGV95jv)!sYWY?irpvh06rw&O?iIvMMj=X
zr%`aa(|{Ad=Vr9%Q(61{PB-V_(3A%p&V#0zGKI1O(^;tkS{>Y<`Ql@_-b7IOT&@?l
zavh?#FW?5otMIjq+Bp?Lq)w7S(0Vp0o!J*~O1>av;)Cdok@h&JK<PyRm+gD9pE%aq
zZ+MK>aoHDV6IVtJ?N#XY=lknPN+SN8@3Gb+D-X*y5pQ)wnIpQlRR!Rd)@0LdA85}1
zu7W6tJ*p26ovz+`YCPePT>-+p@T_QsW$uE`McLlXb;k}!wwWuh$YC4qHRd=RS!s>2
zo39VCB-#Ew?PAYOx`x!@0qa5lZKrE?PJEwVfkww#aB_$CLKlkzHSIi4p3#IeyA@u@
z`x^!`0HJxe>#V7+Grku^in>Ppz|TD*`Ca4X%R3Yo|J=!)l$vYks|KhG{1CEfyuzK(
zLjCz{5l}9>$J=FC?59^85awK0$;^9t9UxwOU8kP7ReVCc*rPOr(9uMY*aCZi2=JBu
z(D0svsJRB&a9nY;6|4kMr1Er5kUVOh1TuBwa3B2C<+rS|xJo&Lnx3K-*P83eXQCJ=
z(htQSA3hgOMcs`#NdYB17#zP_1N_P0peHrNo1%NsYn=;PgLXTic6b#{Y0Z~x9Ffav
z^3eO+d<wp?Z72mate!NyC2*XTy>iquPfo1AXW*>G(JcGn{yN?segqKL$Wc9po(Kex
z#tw_};zd++we+MPhOOgaXSmguul67JOvBysmg?wRf=OUeh(XyRcyY@8RTV@xck_c~
zLFMWAWb4^7xwR)3iO1PIs1<}L3CMJ1L-}s=>_y!`!FvYf^pJO|&nII{!Dz+b?=bUd
zPJUUn))z)-Tcpq<Er{IT;owbqRsI_P3p-%sMNuTTKuj*dp48oyfKR<7nH*c?3Bh((
zA}+XJM|RzLM**E<vfQo9(knepH%eW$Y?P!Uw7|CTB%CJ-8+}<RMG*gMl0n3X8lM5h
zKNWsW0Fn6VPBD10Q=?=H0l)>KF(1tr-x1;lS?SB@mT#O7skl0sER{a|d?&>EKKaw*
zQ>D^m*pNgV`54BKv?knU-T5bcvBKnI@KZo^UYjKp{2hpCo?_6v(Sg77@nQa{tSKbn
zUgMtF>A3hndGocRY+Snm#)Q4%`|Qq3YTOU^uG}BGlz!B=zb?vB16sN&6J`L(k1r+$
z5G6E9tJ~Iwd!d!NH7Q%Z@BR@0e{p6#XF2))<rS&8>?FLAVG`npIjih*I+0!f6;+DM
zLOP-qDsm9=ZrI!lfSDn%XuF17$j~gZE@I}S(Ctw&Te75P5?Fj%FLT;p-tm33FaUQc
z5cR<i=I8*dcg^$pNfUXVyWx1Y;X(h?Bs+lQ9lQLpzVR;y!#n=TA3^T}jtbEPwRbYf
zJGkvr8K{@Xpi`xZ;@qG!n=B-|*@{GFm>;$SwV|N0xmjox3V~XL3sV?YN}<p|xEFG@
zhXv>U0kkfmygW@a5JOCGgce6JyzGmgN$?NM%4;wEhUMg0uTTB~L==1Fvc(6)KMLmU
z(12l^#g&9OpF7+Ll30F6(q=~>NIY=-YUJJ}@&;!RYnq*xA9h!iMi`t;B2SUqbyNGn
zye@*0#Uu`OQy%utS%IA%$M1f4B|bOH={!3K1=Tc7Ra|%qZgZ{mjAGKXb)}jUu1mQ_
zRW7<;tkHv(m7E0m>**8D;+2ddTL>EcH_1YqCaTTu_#6D<WarNi+xXQ)ejw5J$TVN|
z25rv38zSj^B$<T!pr{r76x<)|)u_0N#{L0fvcF+^Y3Az8@Dk|UEQg8v7}VT^OA>jm
z*64!w#=Hz<>Fi1n+P}l#-)0e0P4o+D8^^Mk&<rc|)WY6-D*J{My%HEL^&?T&L?}s>
zhHeJoh2paKlO+8r?$tx`qEcm|PSt6|1$1q?r@VvvMd1!*zAy3<`X9j?ZI|;jE-F(H
zIn1+sm(zAnoJArtytHC|0&F0`i*dy-PiwbD-+j`ezvd4C`%F1y^7t}2aww}ZlPk)t
z=Y`tm#jNM$d`pG%F42Xmg_pZnEnvC%avz=xNs!=6b%%JSuc(WObezkCeZ#C|3PpXj
zkR8hDPyTIUv~?<%*)6=8`WfPPyB9goi+p$1N2N<%!tS2wopT2x`2IZi?|_P{GA|I5
z?7DP*?Gi#2SJZ!x#W9Npm)T;=;~Swyeb*!P{I^s@o5m_3GS2Lg?VUeBdOeae7&s5$
zSL_VuTJih_fq7g8O8b0g+GbmE+xG}^Wx`g~{mWTyr@=<Uu39ipS}-m`bT9_O%^KBo
zL%%Mn8I@`Hz(^UDL7eAbq;w)sW+M)Edk)Z+-zasT^;3<`4Y*XNd_)nQkfZ2#^K@9W
zNY5cR020MJnu03NwOJHX5heVP;2p4dNU_@Hc{|8Gh8ZZjS90m}qf8D(l3j9<P9I>h
zKlAymoHeZa`DgR?Pj8Yc+I|MrSB>X*ts#wNFOJxs!3aGE)xeTHlF`fC5^g(DTacl$
zx!ezQJdwIyc$8RyNS~Wh{0pp>8NcW)*J=7AQYdT?(QhJuq4u`QniZ!%6l{KWp-0Xp
z4ZC6(E(_&c$$U_cmGFslsyX6(62~m*z8Yx2p+F5xmD%6A7eOnx`1lJA-Mrc#&xZWJ
zzXV{{OIgzYaq|D4k^j%z|8JB8GnRu3hw#8Z@({sSmsF(x>!w0Meg5y(zg!Z0S^0k#
z5x^g1@L;toCK$NB|Fn<?P{FzX%Ep0zr4X3p6cg+<f{FTHbV+dP(7yo{SpAv<W@F+%
jkc?|Nn2TBP&b2;_3gllR1sg1)gKcgw;hi`B2lsyfzNSt(

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2efda8857b..93eea3481ce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionSha256Sum=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d421cc..aeb74cbb43e 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

From b50cfee16ae15fea876a71b35f1c82d4d0cc51e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 24 Apr 2023 20:37:05 -0600
Subject: [PATCH 2905/4969] Update lombok version to 1.18.26 (#6935)

Fixes #6920
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index aaa5273ce36..4b6501a3520 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,7 @@ subprojects {
     }
 
     lombok {
-        version = '1.18.24'
+        version = '1.18.26'
     }
 
 

From 1a61543ea5925a1a960e34c470967370408cc912 Mon Sep 17 00:00:00 2001
From: Tyler Thrailkill <tylerbthrailkill@gmail.com>
Date: Wed, 26 Apr 2023 16:58:52 -0600
Subject: [PATCH 2906/4969] Use the current thread's classloader for classes
 (#6926)

Switch from using the caller's classloader to using the current thread's
classloader.
---
 .../org/testcontainers/utility/ImageNameSubstitutor.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
index dae3f178230..3f491e4c9b3 100644
--- a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
@@ -33,7 +33,12 @@ public static synchronized ImageNameSubstitutor instance() {
                 ImageNameSubstitutor configuredInstance;
                 try {
                     configuredInstance =
-                        (ImageNameSubstitutor) Class.forName(configuredClassName).getConstructor().newInstance();
+                        (ImageNameSubstitutor) Thread
+                            .currentThread()
+                            .getContextClassLoader()
+                            .loadClass(configuredClassName)
+                            .getConstructor()
+                            .newInstance();
                 } catch (Exception e) {
                     throw new IllegalArgumentException(
                         "Configured Image Substitutor could not be loaded: " + configuredClassName,

From 6442d27bda2389c8615e24c65aadf9c3f292c247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 28 Apr 2023 18:41:31 -0600
Subject: [PATCH 2907/4969] Lowercase identifier in DockerComposeContainer
 (#6944)

According to the [docs](https://docs.docker.com/compose/environment-variables/envvars/#compose_project_name), `COMPOSE_PROJECT_NAME` must be lowescase.

Fixes #6943
---
 .../containers/DockerComposeContainer.java    |  2 +-
 ...ckerComposeV2FormatWithIdentifierTest.java | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 683e9d9fdf5..fa5a6eba983 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -143,7 +143,7 @@ public DockerComposeContainer(String identifier, List<File> composeFiles) {
         this.dockerComposeFiles = new DockerComposeFiles(composeFiles);
 
         // Use a unique identifier so that containers created for this compose environment can be identified
-        this.identifier = identifier;
+        this.identifier = identifier.toLowerCase();
         this.project = randomProjectId();
 
         this.dockerClient = DockerClientFactory.lazyClient();
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
new file mode 100644
index 00000000000..90c041b53b6
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+
+public class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
+
+    @Rule
+    public DockerComposeContainer environment = new DockerComposeContainer(
+        "TEST",
+        new File("src/test/resources/v2-compose-test.yml")
+    )
+        .withExposedService("redis_1", REDIS_PORT);
+
+    @Override
+    protected DockerComposeContainer getEnvironment() {
+        return this.environment;
+    }
+}

From 2ea0969f8c97f5e4d10dcbdc1553953ff56498d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 28 Apr 2023 18:54:41 -0600
Subject: [PATCH 2908/4969] Favor copy compose file instead of mount (#6945)

It will enable to make docker compose with remote runtimes.
---
 .../org/testcontainers/containers/DockerComposeContainer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index fa5a6eba983..090215fcec3 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -689,7 +689,7 @@ public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
         final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPERATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
         logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
         addEnv(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
-        addFileSystemBind(pwd, containerPwd, BindMode.READ_WRITE);
+        withCopyFileToContainer(MountableFile.forHostPath(pwd), containerPwd);
 
         // Ensure that compose can access docker. Since the container is assumed to be running on the same machine
         //  as the docker daemon, just mapping the docker control socket is OK.

From ab90c0f3e7c99f742f4b4376d129b6e48147a673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oleg=20=C5=A0elajev?= <oleg@atomicjar.com>
Date: Sun, 30 Apr 2023 06:59:29 +0300
Subject: [PATCH 2909/4969] Update RedpandaContainer (#6939)

Add `--overprovisioned` and `--smp` flags to the default RedpandaContainer configuration to make it more resilient on systems with Docker having access to lots of resources.
---
 .../java/org/testcontainers/redpanda/RedpandaContainer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index 61a36784766..ac232aed4d3 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -55,7 +55,7 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
 
         String command = "#!/bin/bash\n";
 
-        command += "/usr/bin/rpk redpanda start --mode dev-container ";
+        command += "/usr/bin/rpk redpanda start --mode dev-container --overprovisioned --smp 1 ";
         command += "--kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 ";
         command +=
             "--advertise-kafka-addr PLAINTEXT://127.0.0.1:29092,OUTSIDE://" + getHost() + ":" + getMappedPort(9092);

From 756d8247682949f5c4c8da871d18f3a1301571bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 22:56:43 +0000
Subject: [PATCH 2910/4969] Bump github/combine-prs from 3.0.1 to 3.1.1

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 3.0.1 to 3.1.1.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v3.0.1...v3.1.1)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 2a634b34f22..55b5e76852b 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v3.0.1
+        uses: github/combine-prs@v3.1.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From cce90eb522e3117044e91537ad85804818bae8da Mon Sep 17 00:00:00 2001
From: Denilsson Montoya <dmontoyane@gmail.com>
Date: Mon, 1 May 2023 23:02:47 -0500
Subject: [PATCH 2911/4969] [Enhancement]: Update waiting strategy for
 Mockserver container (#6951)

Replace `Wait.forHttp` for `Wait.forLogMessage`. This change will allow Mockserver to work with HTTP and HTTPS requests.

Fixes #6647
---
 .../containers/MockServerContainer.java       |  6 ++-
 .../containers/MockServerContainerTest.java   | 47 +++++++++++++++++++
 .../containers/SimpleHttpClient.java          | 22 +++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 8b39d5d3763..374cf2d928d 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -36,7 +36,7 @@ public MockServerContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DockerImageName.parse("mockserver/mockserver"));
 
-        waitingFor(Wait.forHttp("/mockserver/status").withMethod("PUT").forStatusCode(200));
+        waitingFor(Wait.forLogMessage(".*started on port: " + PORT + ".*", 1));
 
         withCommand("-serverPort " + PORT);
         addExposedPorts(PORT);
@@ -46,6 +46,10 @@ public String getEndpoint() {
         return String.format("http://%s:%d", getHost(), getMappedPort(PORT));
     }
 
+    public String getSecureEndpoint() {
+        return String.format("https://%s:%d", getHost(), getMappedPort(PORT));
+    }
+
     public Integer getServerPort() {
         return getMappedPort(PORT);
     }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index c7225cfe1c2..3f4a8fef293 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -33,6 +33,53 @@ public void shouldCallActualMockserverVersion() throws Exception {
         }
     }
 
+    @Test
+    public void shouldCallMockserverUsingTlsProtocol() throws Exception {
+        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
+            mockServer.start();
+
+            String expectedBody = "Hello World!";
+
+            try (
+                MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
+                    .withSecure(true)
+            ) {
+                assertThat(client.hasStarted()).as("Mockserver running").isTrue();
+
+                client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
+
+                assertThat(SimpleHttpClient.secureResponseFromMockserver(mockServer, "/hello"))
+                    .as("MockServer returns correct result")
+                    .isEqualTo(expectedBody);
+            }
+        }
+    }
+
+    @Test
+    public void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
+        try (
+            MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)
+                .withEnv("MOCKSERVER_TLS_MUTUAL_AUTHENTICATION_REQUIRED", "true")
+        ) {
+            mockServer.start();
+
+            String expectedBody = "Hello World!";
+
+            try (
+                MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
+                    .withSecure(true)
+            ) {
+                assertThat(client.hasStarted()).as("Mockserver running").isTrue();
+
+                client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
+
+                assertThat(SimpleHttpClient.secureResponseFromMockserver(mockServer, "/hello"))
+                    .as("MockServer returns correct result")
+                    .isEqualTo(expectedBody);
+            }
+        }
+    }
+
     @Test
     public void newVersionStartsWithDefaultWaitStrategy() {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
index da60ca9396a..6c7e75c4622 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
@@ -1,6 +1,9 @@
 package org.testcontainers.containers;
 
 import lombok.Cleanup;
+import org.mockserver.configuration.Configuration;
+import org.mockserver.logging.MockServerLogger;
+import org.mockserver.socket.tls.KeyStoreFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -8,6 +11,8 @@
 import java.net.URL;
 import java.net.URLConnection;
 
+import javax.net.ssl.HttpsURLConnection;
+
 public class SimpleHttpClient {
 
     public static String responseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
@@ -16,4 +21,21 @@ public static String responseFromMockserver(MockServerContainer mockServer, Stri
         BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
         return reader.readLine();
     }
+
+    public static String secureResponseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
+        HttpsURLConnection httpUrlConnection = (HttpsURLConnection) new URL(mockServer.getSecureEndpoint() + path)
+            .openConnection();
+        try {
+            httpUrlConnection.setSSLSocketFactory(
+                new KeyStoreFactory(Configuration.configuration(), new MockServerLogger())
+                    .sslContext()
+                    .getSocketFactory()
+            );
+            @Cleanup
+            BufferedReader reader = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+            return reader.readLine();
+        } finally {
+            httpUrlConnection.disconnect();
+        }
+    }
 }

From 730f689aef771a3356246cd60b8efea655135da2 Mon Sep 17 00:00:00 2001
From: wakingrufus <wakingrufus@users.noreply.github.com>
Date: Mon, 8 May 2023 06:54:20 -0500
Subject: [PATCH 2912/4969] Add test against Apache Cassandra 4 (#7013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #7012


Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/CassandraContainer.java        |  2 +-
 .../containers/CassandraServer4Test.java      | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java

diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index dcebe165f73..51d94128509 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -21,7 +21,7 @@
 /**
  * Cassandra container
  *
- * Supports 2.x and 3.x Cassandra versions
+ * Testcontainers implementation for Apache Cassandra.
  */
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
 
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java
new file mode 100644
index 00000000000..1a8447e7036
--- /dev/null
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java
@@ -0,0 +1,35 @@
+package org.testcontainers.containers;
+
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CassandraServer4Test {
+
+    @Rule
+    public CassandraContainer<?> cassandra = new CassandraContainer<>("cassandra:4.1.1");
+
+    @Test
+    public void testCassandraGetContactPoint() {
+        try (
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(this.cassandra.getContactPoint())
+                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
+                .build()
+        ) {
+            session.execute(
+                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                "{'class':'SimpleStrategy','replication_factor':'1'};"
+            );
+
+            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
+
+            assertThat(keyspace).as("test keyspace created").isNotNull();
+        }
+    }
+}

From 6ef107e644043c6706a3d90018b0d7d8d43df4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 8 May 2023 17:55:17 -0400
Subject: [PATCH 2913/4969] Revert "Add docker rootless support for macOS and
 desktop for Linux (#6907)" (#7015)

This reverts commit 0bf52a95148ebc60a5b529d90dbbbf25390051f7.
---
 .../RootlessDockerClientProviderStrategy.java   | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
index 9c78677c135..a032c2b324d 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/RootlessDockerClientProviderStrategy.java
@@ -34,15 +34,8 @@ private Path resolveSocketPath() {
                 Path homePath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("run");
                 return tryFolder(homePath)
                     .orElseGet(() -> {
-                        Path dockerDesktopPath = Paths
-                            .get(System.getProperty("user.home"))
-                            .resolve(".docker")
-                            .resolve("desktop");
-                        return tryFolder(dockerDesktopPath)
-                            .orElseGet(() -> {
-                                Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
-                                return tryFolder(implicitPath).orElse(null);
-                            });
+                        Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
+                        return tryFolder(implicitPath).orElse(null);
                     });
             });
     }
@@ -86,11 +79,7 @@ public TransportConfig getTransportConfig() throws InvalidConfigurationException
 
     @Override
     protected boolean isApplicable() {
-        return (
-            (SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC) &&
-            getSocketPath() != null &&
-            Files.exists(getSocketPath())
-        );
+        return SystemUtils.IS_OS_LINUX && getSocketPath() != null && Files.exists(getSocketPath());
     }
 
     @Override

From 3616ebf95319ec421ce6290f3c84785848d128eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= <boschi1997@gmail.com>
Date: Tue, 9 May 2023 20:49:34 +0200
Subject: [PATCH 2914/4969] Bump Pulsar version to 3.0.0 (#7016)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 modules/pulsar/build.gradle                   |  4 +--
 .../containers/PulsarContainer.java           |  2 +-
 .../containers/PulsarContainerTest.java       | 29 +++++++++----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index c4419a523d3..9cd1ef66474 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.11.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.0.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.11.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.0.0'
 }
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 950149e3226..a47aa04447a 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -30,7 +30,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar");
 
     @Deprecated
-    private static final String DEFAULT_TAG = "2.10.0";
+    private static final String DEFAULT_TAG = "3.0.0";
 
     private final WaitAllStrategy waitAllStrategy = new WaitAllStrategy();
 
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index b054c30d0ac..29321afca82 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import org.apache.pulsar.client.admin.ListTopicsOptions;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.Consumer;
@@ -13,6 +14,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -23,14 +25,14 @@ public class PulsarContainerTest {
 
     public static final String TEST_TOPIC = "test_topic";
 
-    private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:2.10.0");
+    private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:3.0.0");
 
     @Test
     public void testUsage() throws Exception {
         try (
             // do not use PULSAR_IMAGE to make the doc looks easier
             // constructorWithVersion {
-            PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:2.10.0"));
+            PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:3.0.0"));
             // }
         ) {
             pulsar.start();
@@ -103,31 +105,26 @@ public void testTransactions() throws Exception {
             pulsar.start();
 
             try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build()) {
-                assertThat(
-                    pulsarAdmin
-                        .topics()
-                        .getList("pulsar/system")
-                        .contains("persistent://pulsar/system/transaction_coordinator_assign-partition-0")
-                )
-                    .isTrue();
+                assertTransactionsTopicCreated(pulsarAdmin);
             }
             testTransactionFunctionality(pulsar.getPulsarBrokerUrl());
         }
     }
 
+    private void assertTransactionsTopicCreated(PulsarAdmin pulsarAdmin) throws PulsarAdminException {
+        final List<String> topics = pulsarAdmin
+            .topics()
+            .getPartitionedTopicList("pulsar/system", ListTopicsOptions.builder().includeSystemTopic(true).build());
+        assertThat(topics).contains("persistent://pulsar/system/transaction_coordinator_assign");
+    }
+
     @Test
     public void testTransactionsAndFunctionsWorker() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withTransactions().withFunctionsWorker()) {
             pulsar.start();
 
             try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build();) {
-                assertThat(
-                    pulsarAdmin
-                        .topics()
-                        .getList("pulsar/system")
-                        .contains("persistent://pulsar/system/transaction_coordinator_assign-partition-0")
-                )
-                    .isTrue();
+                assertTransactionsTopicCreated(pulsarAdmin);
                 assertThat(pulsarAdmin.functions().getFunctions("public", "default")).hasSize(0);
             }
             testTransactionFunctionality(pulsar.getPulsarBrokerUrl());

From c64aab9fd5e3a452ee0faf793560327eb4da9841 Mon Sep 17 00:00:00 2001
From: Daniel PETISME <daniel.petisme@gmail.com>
Date: Wed, 10 May 2023 01:55:59 +0200
Subject: [PATCH 2915/4969] Support Kraft post Confluent Platform 7.4.0 (#7014)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #7010


Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/kafka.md                         |  3 +-
 .../KafkaContainerClusterTest.java            | 12 ++++
 .../containers/KafkaContainer.java            | 72 ++++++++++---------
 .../containers/KafkaContainerTest.java        | 14 +++-
 4 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 691c4f10bf8..13f8cf3b0a8 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -34,8 +34,7 @@ If for some reason you want to use an externally running Zookeeper, then just pa
 
 ### Using Kraft mode
 
-The self-managed (Kraft) mode is available as a preview feature since version 3.0 (confluentinc/cp-kafka:7.0.x) and 
-declared as a production ready in 3.3.1 (confluentinc/cp-kafka:7.3.x).
+KRaft mode was declared production ready in 3.3.1 (confluentinc/cp-kafka:7.3.x)" 
 
 <!--codeinclude-->
 [Kraft mode](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withKraftMode
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
index 60790514825..089d80fa080 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
@@ -51,6 +51,18 @@ public void testKafkaContainerKraftCluster() throws Exception {
         }
     }
 
+    @Test
+    public void testKafkaContainerKraftClusterAfterConfluentPlatform740() throws Exception {
+        try (KafkaContainerKraftCluster cluster = new KafkaContainerKraftCluster("7.4.0", 3, 2)) {
+            cluster.start();
+            String bootstrapServers = cluster.getBootstrapServers();
+
+            assertThat(cluster.getBrokers()).hasSize(3);
+
+            testKafkaFunctionality(bootstrapServers, 3, 2);
+        }
+    }
+
     protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
         try (
             AdminClient adminClient = AdminClient.create(
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 32bfc366896..d00b15a1030 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -6,11 +6,10 @@
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
-import java.io.IOException;
+import java.util.Objects;
 
 /**
  * This container wraps Confluent Kafka and Zookeeper (optionally)
- *
  */
 public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
@@ -29,11 +28,13 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
     // https://docs.confluent.io/platform/7.0.0/release-notes/index.html#ak-raft-kraft
     private static final String MIN_KRAFT_TAG = "7.0.0";
 
+    public static final String DEFAULT_CLUSTER_ID = "4L6g3nShT-eMCtK--X86sw";
+
     protected String externalZookeeperConnect = null;
 
     private boolean kraftEnabled = false;
 
-    private String clusterId;
+    private String clusterId = DEFAULT_CLUSTER_ID;
 
     /**
      * @deprecated use {@link KafkaContainer(DockerImageName)} instead
@@ -98,7 +99,7 @@ public KafkaContainer withKraft() {
             throw new IllegalStateException("Cannot configure Kraft mode when Zookeeper configured");
         }
         verifyMinKraftVersion();
-        kraftEnabled = true;
+        this.kraftEnabled = true;
         return self();
     }
 
@@ -115,7 +116,13 @@ private void verifyMinKraftVersion() {
         }
     }
 
+    private boolean isLessThanCP740() {
+        String actualVersion = DockerImageName.parse(getDockerImageName()).getVersionPart();
+        return new ComparableVersion(actualVersion).isLessThan("7.4.0");
+    }
+
     public KafkaContainer withClusterId(String clusterId) {
+        Objects.requireNonNull(clusterId, "clusterId cannot be null");
         this.clusterId = clusterId;
         return self();
     }
@@ -126,7 +133,7 @@ public String getBootstrapServers() {
 
     @Override
     protected void configure() {
-        if (kraftEnabled) {
+        if (this.kraftEnabled) {
             waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
             configureKraft();
         } else {
@@ -136,10 +143,9 @@ protected void configure() {
     }
 
     protected void configureKraft() {
-        withEnv(
-            "KAFKA_NODE_ID",
-            getEnvMap().computeIfAbsent("KAFKA_NODE_ID", key -> getEnvMap().get("KAFKA_BROKER_ID"))
-        );
+        //CP 7.4.0
+        getEnvMap().computeIfAbsent("CLUSTER_ID", key -> clusterId);
+        getEnvMap().computeIfAbsent("KAFKA_NODE_ID", key -> getEnvMap().get("KAFKA_BROKER_ID"));
         withEnv(
             "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
             String.format("%s,CONTROLLER:PLAINTEXT", getEnvMap().get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP"))
@@ -147,20 +153,17 @@ protected void configureKraft() {
         withEnv("KAFKA_LISTENERS", String.format("%s,CONTROLLER://0.0.0.0:9094", getEnvMap().get("KAFKA_LISTENERS")));
 
         withEnv("KAFKA_PROCESS_ROLES", "broker,controller");
-        withEnv(
-            "KAFKA_CONTROLLER_QUORUM_VOTERS",
-            getEnvMap()
-                .computeIfAbsent(
-                    "KAFKA_CONTROLLER_QUORUM_VOTERS",
-                    key -> {
-                        return String.format(
-                            "%s@%s:9094",
-                            getEnvMap().get("KAFKA_NODE_ID"),
-                            getNetwork() != null ? getNetworkAliases().get(0) : "localhost"
-                        );
-                    }
-                )
-        );
+        getEnvMap()
+            .computeIfAbsent(
+                "KAFKA_CONTROLLER_QUORUM_VOTERS",
+                key -> {
+                    return String.format(
+                        "%s@%s:9094",
+                        getEnvMap().get("KAFKA_NODE_ID"),
+                        getNetwork() != null ? getNetworkAliases().get(0) : "localhost"
+                    );
+                }
+            );
         withEnv("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
     }
 
@@ -186,10 +189,18 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
                 brokerAdvertisedListener(containerInfo)
             );
 
-        command += (kraftEnabled) ? commandKraft() : commandZookeeper();
+        if (this.kraftEnabled && isLessThanCP740()) {
+            // Optimization: skip the checks
+            command += "echo '' > /etc/confluent/docker/ensure \n";
+            command += commandKraft();
+        }
+
+        if (!this.kraftEnabled) {
+            // Optimization: skip the checks
+            command += "echo '' > /etc/confluent/docker/ensure \n";
+            command += commandZookeeper();
+        }
 
-        // Optimization: skip the checks
-        command += "echo '' > /etc/confluent/docker/ensure \n";
         // Run the original command
         command += "/etc/confluent/docker/run \n";
         copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
@@ -197,16 +208,9 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
 
     protected String commandKraft() {
         String command = "sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure\n";
-        try {
-            if (clusterId == null) {
-                clusterId = execInContainer("kafka-storage", "random-uuid").getStdout().trim();
-            }
-        } catch (IOException | InterruptedException e) {
-            logger().error("Failed to execute `kafka-storage random-uuid`. Exception message: {}", e.getMessage());
-        }
         command +=
             "echo 'kafka-storage format --ignore-formatted -t \"" +
-            clusterId +
+            this.clusterId +
             "\" -c /etc/kafka/kafka.properties' >> /etc/confluent/docker/configure\n";
         return command;
     }
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index bad3c8d89ef..860c990cb32 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -133,10 +133,20 @@ public void testWithHostExposedPortAndExternalNetwork() throws Exception {
     }
 
     @Test
-    public void testUsageKraft() throws Exception {
+    public void testUsageKraftBeforeConfluentPlatformVersion74() throws Exception {
         try (
-            // withKraftMode {
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.0.1")).withKraft()
+        ) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
+    @Test
+    public void testUsageKraftAfterConfluentPlatformVersion74() throws Exception {
+        try (
+            // withKraftMode {
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.4.0")).withKraft()
             // }
         ) {
             kafka.start();

From 4aed2583a15aaf66bc741a36e2cd2e2163aa8d98 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 May 2023 23:53:01 -0600
Subject: [PATCH 2916/4969] [create-pull-request] automated change (#7034)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 84d9bc0aa18..70773bc7e7b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -119,4 +119,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.18.0
+    latest_version: 1.18.1

From 7076b0bc427d7e9767483fb36b280bc7c3acde1f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 May 2023 23:53:33 -0600
Subject: [PATCH 2917/4969] [create-pull-request] automated change (#7033)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index af72b6cbacf..3437bfcef1b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.18.0
+testcontainers.version=1.18.1

From 31430f689b7d08c60f12f240b9d471bd1abe7197 Mon Sep 17 00:00:00 2001
From: Donnerbart <david.sondermann@hivemq.com>
Date: Fri, 12 May 2023 20:33:02 +0200
Subject: [PATCH 2918/4969] Fix typo in pull request template (#6120)

---
 .github/pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 643177f08a9..d2bc55851cb 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -6,7 +6,7 @@ New Modules:
 Make sure to add it to `bug_report.yaml`, `enhancement.yaml` and `feature.yaml`.
 Also, add it to `dependabot.yml` and `labeler.yml`.
 
-Before comitting, run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
+Before committing, please run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
 
 Describing Your Changes:
 

From 5b9c6391b706180cb12da3f3e3550c4f88004ba8 Mon Sep 17 00:00:00 2001
From: Daniel Odrinski <m4tr1xc0d3r@protonmail.com>
Date: Sat, 13 May 2023 00:05:28 +0100
Subject: [PATCH 2919/4969] DockerComposeContainer: add 'removeVolumes'
 parameter (#7009)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7008


Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/DockerComposeContainer.java    | 19 +++-
 ...ckerComposeContainerVolumeRemovalTest.java | 92 +++++++++++++++++++
 2 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 090215fcec3..0e2b8a34734 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -121,6 +121,8 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
 
     private RemoveImages removeImages;
 
+    private boolean removeVolumes = true;
+
     @Deprecated
     public DockerComposeContainer(File composeFile, String identifier) {
         this(identifier, composeFile);
@@ -368,7 +370,11 @@ public void stop() {
                 ambassadorContainer.stop();
 
                 // Kill the services using docker-compose
-                String cmd = "down -v";
+                String cmd = "down";
+
+                if (removeVolumes) {
+                    cmd += " -v";
+                }
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
@@ -600,6 +606,17 @@ public SELF withRemoveImages(RemoveImages removeImages) {
         return self();
     }
 
+    /**
+     * Remove volumes after containers shut down.
+     *
+     * @param removeVolumes whether volumes are to be removed.
+     * @return this instance, for chaining.
+     */
+    public SELF withRemoveVolumes(boolean removeVolumes) {
+        this.removeVolumes = removeVolumes;
+        return self();
+    }
+
     /**
      * Set the maximum startup timeout all the waits set are bounded to.
      *
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
new file mode 100644
index 00000000000..764000a3cae
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
@@ -0,0 +1,92 @@
+package org.testcontainers.junit;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+@RunWith(Parameterized.class)
+public class DockerComposeContainerVolumeRemovalTest {
+
+    public DockerComposeContainerVolumeRemovalTest(
+        final boolean removeVolumes,
+        final boolean shouldVolumesBePresentAfterRunning
+    ) {
+        this.removeVolumes = removeVolumes;
+        this.shouldVolumesBePresentAfterRunning = shouldVolumesBePresentAfterRunning;
+    }
+
+    public final boolean removeVolumes;
+
+    public final boolean shouldVolumesBePresentAfterRunning;
+
+    @Parameterized.Parameters(name = "removeVolumes = {0}")
+    public static Object[][] params() {
+        return new Object[][] { { true, false }, { false, true } };
+    }
+
+    @Test
+    public void performTest() {
+        final File composeFile = new File("src/test/resources/compose-test.yml");
+
+        final AtomicReference<String> volumeName = new AtomicReference<>("");
+        try (
+            DockerComposeContainer environment = new DockerComposeContainer<>(composeFile)
+                .withExposedService("redis", 6379)
+                .withRemoveVolumes(this.removeVolumes)
+                .withRemoveImages(DockerComposeContainer.RemoveImages.ALL)
+        ) {
+            environment.start();
+
+            volumeName.set(volumeNameForRunningContainer("_redis_1"));
+            final boolean isVolumePresentWhileRunning = isVolumePresent(volumeName.get());
+            assertThat(isVolumePresentWhileRunning).as("the container volume is present while running").isEqualTo(true);
+        }
+
+        await()
+            .untilAsserted(() -> {
+                final boolean isVolumePresentAfterRunning = isVolumePresent(volumeName.get());
+                assertThat(isVolumePresentAfterRunning)
+                    .as("the container volume is present after running")
+                    .isEqualTo(this.shouldVolumesBePresentAfterRunning);
+            });
+    }
+
+    private String volumeNameForRunningContainer(final String containerNameSuffix) {
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listContainersCmd()
+            .exec()
+            .stream()
+            .filter(it -> Stream.of(it.getNames()).anyMatch(name -> name.endsWith(containerNameSuffix)))
+            .findFirst()
+            .map(container -> container.getMounts().get(0).getName())
+            .orElseThrow(IllegalStateException::new);
+    }
+
+    private boolean isVolumePresent(final String volumeName) {
+        Set<String> nameFilter = new LinkedHashSet<>(1);
+        nameFilter.add(volumeName);
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listVolumesCmd()
+            .withFilter("name", nameFilter)
+            .exec()
+            .getVolumes()
+            .stream()
+            .findFirst()
+            .isPresent();
+    }
+}

From e023920a78f268457d51fcdb86bf4565801cd7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 12 May 2023 18:28:16 -0600
Subject: [PATCH 2920/4969] Add LocalStackContainer#getEndpoint() (#7037)

Most recent `localstack/localstack` image versions expose only one
port `4566` and services start lazily, no more `SERVICES` env var
is required. For that reason, `getEndpoint()` becomes handy.
---
 .../localstack/LocalStackContainer.java       | 29 +++++++++++++++++++
 .../localstack/LocalstackContainerTest.java   | 14 ++++-----
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 38bbeba6130..9c7d7298223 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -254,6 +254,35 @@ public URI getEndpointOverride(EnabledService service) {
         }
     }
 
+    /**
+     * Provides an endpoint to communicate with LocalStack service.
+     * The provided endpoint should be set in the AWS Java SDK v2 when building a client, e.g.:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpoint())
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+             </code></pre>
+     * <p><strong>Please note that this method is only intended to be used for configuring AWS SDK clients
+     * that are running on the test host. If other containers need to call this one, they should be configured
+     * specifically to do so using a Docker network and appropriate addressing.</strong></p>
+     *
+     * @return an {@link URI} endpoint
+     */
+    public URI getEndpoint() {
+        try {
+            final String address = getHost();
+            // resolve IP address and use that as the endpoint so that path-style access is automatically used for S3
+            String ipAddress = InetAddress.getByName(address).getHostAddress();
+            return new URI("http://" + ipAddress + ":" + getMappedPort(PORT));
+        } catch (UnknownHostException | URISyntaxException e) {
+            throw new IllegalStateException("Cannot obtain endpoint URL", e);
+        }
+    }
+
     private int getServicePort(EnabledService service) {
         return legacyMode ? service.getPort() : PORT;
     }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index 30682388af5..f9f1e1c372a 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -76,7 +76,7 @@ public void s3TestOverBridgeNetwork() throws IOException {
                 .standard()
                 .withEndpointConfiguration(
                     new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.S3).toString(),
+                        localstack.getEndpoint().toString(),
                         localstack.getRegion()
                     )
                 )
@@ -115,7 +115,7 @@ public void s3TestUsingAwsSdkV2() {
             // with_aws_sdk_v2 {
             S3Client s3 = S3Client
                 .builder()
-                .endpointOverride(localstack.getEndpointOverride(Service.S3))
+                .endpointOverride(localstack.getEndpoint())
                 .credentialsProvider(
                     StaticCredentialsProvider.create(
                         AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
@@ -138,7 +138,7 @@ public void sqsTestOverBridgeNetwork() {
                 .standard()
                 .withEndpointConfiguration(
                     new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.SQS).toString(),
+                        localstack.getEndpoint().toString(),
                         localstack.getRegion()
                     )
                 )
@@ -171,7 +171,7 @@ public void cloudWatchLogsTestOverBridgeNetwork() {
                 .standard()
                 .withEndpointConfiguration(
                     new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.CLOUDWATCHLOGS).toString(),
+                        localstack.getEndpoint().toString(),
                         localstack.getRegion()
                     )
                 )
@@ -195,7 +195,7 @@ public void kmsKeyCreationTest() {
                 .standard()
                 .withEndpointConfiguration(
                     new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.KMS).toString(),
+                        localstack.getEndpoint().toString(),
                         localstack.getRegion()
                     )
                 )
@@ -345,7 +345,7 @@ public static class WithRegion {
         @Test
         public void s3EndpointHasProperRegion() {
             final AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration(
-                localstack.getEndpointOverride(Service.S3).toString(),
+                localstack.getEndpoint().toString(),
                 localstack.getRegion()
             );
             assertThat(endpointConfiguration.getSigningRegion())
@@ -366,7 +366,7 @@ public void s3ServiceStartLazily() {
             try (
                 S3Client s3 = S3Client
                     .builder()
-                    .endpointOverride(localstack.getEndpointOverride(Service.S3))
+                    .endpointOverride(localstack.getEndpoint())
                     .credentialsProvider(
                         StaticCredentialsProvider.create(
                             AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())

From 993e98624a7a3f534946345ca241339e16d705a8 Mon Sep 17 00:00:00 2001
From: Bowen Liang <bowenliang@apache.org>
Date: Mon, 15 May 2023 14:16:47 +0800
Subject: [PATCH 2921/4969] Add Apache Kyuubi to who is using testcontainers
 (#7042)

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 8eee54769e3..9e52c42da13 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -222,6 +222,7 @@ A huge thank you to our sponsors:
 * [Bucket4j](https://github.com/bucket4j/bucket4j) - Java rate-limiting library based on the token-bucket algorithm.
 * [Spark ClickHouse Connector](https://github.com/housepower/spark-clickhouse-connector) - Integration tests for Apache Spark with both single node ClickHouse instance and multi-node ClickHouse cluster.
 * [Quarkus](https://github.com/quarkusio/quarkus) - Testcontainers is used extensively for Quarkus' [DevServices](https://quarkus.io/guides/dev-services) feature.
+* [Apache Kyuubi](https://kyuubi.apache.org) - Integration testing with Trino as data source engine, Kafka, etc.
 
 ## License
 

From be7cbe4c3ec141e69d6599ae51e155af5da62970 Mon Sep 17 00:00:00 2001
From: Marios Trivyzas <5058131+matriv@users.noreply.github.com>
Date: Mon, 15 May 2023 09:33:18 +0300
Subject: [PATCH 2922/4969] [cratedb] Enable single node by default (#7041)

Pass `discovery.type=single-node` to `CrateDBContainer` to disable
bootstrap checks and prevent errors regarding low limit for
max virtual memory.

Upgrade CrateDB docker image to latest stable: 5.3.1

Fixes #7038
---
 .../main/java/org/testcontainers/cratedb/CrateDBContainer.java | 3 ++-
 .../org/testcontainers/junit/cratedb/SimpleCrateDBTest.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
index 45cd03f460a..26e77d30436 100644
--- a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
+++ b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
@@ -13,7 +13,7 @@ public class CrateDBContainer extends JdbcDatabaseContainer<CrateDBContainer> {
 
     static final String IMAGE = "crate";
 
-    static final String DEFAULT_TAG = "5.2.5";
+    static final String DEFAULT_TAG = "5.3.1";
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("crate");
 
@@ -34,6 +34,7 @@ public CrateDBContainer(final String dockerImageName) {
     public CrateDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withCommand("crate -C discovery.type=single-node");
 
         this.waitStrategy = Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200);
 
diff --git a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
index ea7bb1a4f10..e696a3140c3 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
@@ -34,7 +34,7 @@ public void testSimple() throws SQLException {
     public void testCommandOverride() throws SQLException {
         try (
             CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
-                .withCommand("crate -C cluster.name=testcontainers")
+                .withCommand("crate -C discovery.type=single-node -C cluster.name=testcontainers")
         ) {
             cratedb.start();
 

From be5b4d593cce42c8aa438580c7e431aa870d4af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 19 May 2023 17:54:11 +0200
Subject: [PATCH 2923/4969] Fix Redpanda command (#7045)

Mode `dev-container` already configures

* --overprovisioned
* --reserve-memory 0M
* --check=false
* --unsafe-bypass-fsync

Also, set recommended memory
---
 .../java/org/testcontainers/redpanda/RedpandaContainer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index ac232aed4d3..d9fccadb30d 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -55,7 +55,7 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
 
         String command = "#!/bin/bash\n";
 
-        command += "/usr/bin/rpk redpanda start --mode dev-container --overprovisioned --smp 1 ";
+        command += "/usr/bin/rpk redpanda start --mode dev-container --smp 1 --memory 1G ";
         command += "--kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 ";
         command +=
             "--advertise-kafka-addr PLAINTEXT://127.0.0.1:29092,OUTSIDE://" + getHost() + ":" + getMappedPort(9092);

From fc770df9b5ea7aec42a0a5f128f52d537bbf321a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 24 May 2023 18:01:41 +0200
Subject: [PATCH 2924/4969] Update testcontainers/ryuk version to 0.5.1 (#7054)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 3c9dce5b1d0..04a815926e0 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.4.0");
+        super("testcontainers/ryuk:0.5.1");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From eb5eb8a6b3b59593e0376df7ae7f1c7f6562e533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 26 May 2023 16:42:24 +0200
Subject: [PATCH 2925/4969] Add TestcontainersHostPropertyClientStrategy
 (#7053)

New strategy to use `tc.host` in `~/.testcontainers.properties` to try and connect
to docker.

This strategy ensure that user-defined variables such as `DOCKER_HOST`,
`TESTCONTAINERS_HOST_OVERRIDE` and `TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE`
do not have an effect.

This strategy takes precedence over other strategies.
---
 .../testcontainers/DockerClientFactory.java   |  8 ++-
 .../DockerClientProviderStrategy.java         | 32 ++++++++--
 ...ersHostPropertyClientProviderStrategy.java | 63 +++++++++++++++++++
 .../utility/TestcontainersConfiguration.java  | 10 ++-
 ....dockerclient.DockerClientProviderStrategy |  1 +
 .../DockerClientConfigUtilsTest.java          | 12 ++--
 ...ostPropertyClientProviderStrategyTest.java | 61 ++++++++++++++++++
 7 files changed, 168 insertions(+), 19 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
 create mode 100644 core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 73bf24e511c..77ae311bb47 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -158,9 +158,11 @@ public TransportConfig getTransportConfig() {
 
     @UnstableAPI
     public String getRemoteDockerUnixSocketPath() {
-        String dockerSocketOverride = System.getenv("TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE");
-        if (!StringUtils.isBlank(dockerSocketOverride)) {
-            return dockerSocketOverride;
+        if (this.strategy != null && this.strategy.allowUserOverrides()) {
+            String dockerSocketOverride = System.getenv("TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE");
+            if (!StringUtils.isBlank(dockerSocketOverride)) {
+                return dockerSocketOverride;
+            }
         }
 
         URI dockerHost = getTransportConfig().getDockerHost();
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 01fb60e4b5d..8a959b443c8 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -57,6 +57,14 @@
 
 /**
  * Mechanism to find a viable Docker client configuration according to the host system environment.
+ * <p>
+ * The order is:
+ * <ul>
+ *     <li>{@code TestcontainersHostPropertyClientProviderStrategy}</li>
+ *     <li>{@code EnvironmentAndSystemPropertyClientProviderStrategy}</li>
+ *     <li>Persistable {@code DockerClientProviderStrategy} in <code>~/.testcontainers.properties</code></li>
+ *     <li>Other strategies order by priority</li>
+ * </ul>
  */
 @Slf4j
 public abstract class DockerClientProviderStrategy {
@@ -90,6 +98,10 @@ protected boolean isPersistable() {
         return true;
     }
 
+    public boolean allowUserOverrides() {
+        return true;
+    }
+
     /**
      * @return highest to lowest priority value
      */
@@ -217,7 +229,8 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
         List<String> configurationFailures = new ArrayList<>();
         List<DockerClientProviderStrategy> allStrategies = new ArrayList<>();
 
-        // The environment has the highest priority
+        // Manually enforce priority independent of priority property of strategy
+        allStrategies.add(new TestcontainersHostPropertyClientProviderStrategy());
         allStrategies.add(new EnvironmentAndSystemPropertyClientProviderStrategy());
 
         // Next strategy to try out is the one configured using the Testcontainers configuration mechanism
@@ -401,16 +414,23 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
 
     public synchronized String getDockerHostIpAddress() {
         if (dockerHostIpAddress == null) {
-            dockerHostIpAddress = resolveDockerHostIpAddress(getDockerClient(), getTransportConfig().getDockerHost());
+            dockerHostIpAddress =
+                resolveDockerHostIpAddress(
+                    getDockerClient(),
+                    getTransportConfig().getDockerHost(),
+                    allowUserOverrides()
+                );
         }
         return dockerHostIpAddress;
     }
 
     @VisibleForTesting
-    static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost) {
-        String hostOverride = System.getenv("TESTCONTAINERS_HOST_OVERRIDE");
-        if (!StringUtils.isBlank(hostOverride)) {
-            return hostOverride;
+    static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost, boolean allowUserOverrides) {
+        if (allowUserOverrides) {
+            String hostOverride = System.getenv("TESTCONTAINERS_HOST_OVERRIDE");
+            if (!StringUtils.isBlank(hostOverride)) {
+                return hostOverride;
+            }
         }
 
         switch (dockerHost.getScheme()) {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
new file mode 100644
index 00000000000..39cd61c9c12
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
@@ -0,0 +1,63 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.util.Optional;
+
+/**
+ * Use <code>tc.host</code> in <code>~/.testcontainers.properties</code>
+ * to try and locate a docker environment.
+ *
+ * @deprecated this class is used by the SPI and should not be used directly
+ */
+@Deprecated
+public final class TestcontainersHostPropertyClientProviderStrategy extends DockerClientProviderStrategy {
+
+    public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 10;
+
+    private final DockerClientConfig dockerClientConfig;
+
+    public TestcontainersHostPropertyClientProviderStrategy() {
+        this(DefaultDockerClientConfig.createDefaultConfigBuilder());
+    }
+
+    public TestcontainersHostPropertyClientProviderStrategy(DefaultDockerClientConfig.Builder configBuilder) {
+        Optional<String> tcHost = Optional.ofNullable(
+            TestcontainersConfiguration.getInstance().getUserProperty("tc.host", null)
+        );
+
+        tcHost.ifPresent(configBuilder::withDockerHost);
+        this.dockerClientConfig = configBuilder.build();
+    }
+
+    @Override
+    public String getDescription() {
+        return "Testcontainers Host with tc.host=" + this.dockerClientConfig.getDockerHost();
+    }
+
+    @Override
+    public TransportConfig getTransportConfig() throws InvalidConfigurationException {
+        return TransportConfig
+            .builder()
+            .dockerHost(dockerClientConfig.getDockerHost())
+            .sslConfig(dockerClientConfig.getSSLConfig())
+            .build();
+    }
+
+    @Override
+    protected int getPriority() {
+        return PRIORITY;
+    }
+
+    @Override
+    protected boolean isPersistable() {
+        return false;
+    }
+
+    @Override
+    public boolean allowUserOverrides() {
+        return false;
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index f3bb8f8319a..44af923bb9a 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -279,18 +279,16 @@ public String getEnvVarOrUserProperty(@NotNull final String propertyName, @Nulla
     }
 
     /**
-     * Gets a configured setting from an environment variable.
-     * <p>
-     * Note that when searching environment variables, the prefix `TESTCONTAINERS_` will usually be applied to the
-     * property name, which will be converted to upper-case with underscore separators. This prefix will not be added
-     * if the property name begins `docker.`.
+     * Gets a configured setting from <code>~/.testcontainers.properties</code>.
      *
      * @param propertyName name of configuration file property (dot-separated lower case)
      * @return the found value, or null if not set
      */
     @Contract("_, !null -> !null")
     public String getUserProperty(@NotNull final String propertyName, @Nullable final String defaultValue) {
-        return getConfigurable(propertyName, defaultValue);
+        return this.userProperties.get(propertyName) != null
+            ? (String) this.userProperties.get(propertyName)
+            : defaultValue;
     }
 
     /**
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
index d9cbad0ebff..62493d704a4 100644
--- a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
+++ b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
@@ -1,3 +1,4 @@
+org.testcontainers.dockerclient.TestcontainersHostPropertyClientProviderStrategy
 org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy
 org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
 org.testcontainers.dockerclient.DockerMachineClientProviderStrategy
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
index d14ffda42cc..757816cb189 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -19,7 +19,8 @@ public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
 
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
             client,
-            URI.create("unix:///var/run/docker.sock")
+            URI.create("unix:///var/run/docker.sock"),
+            true
         );
         assertThat(actual).isEqualTo("localhost");
     }
@@ -28,7 +29,8 @@ public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
             client,
-            URI.create("http://12.23.34.45")
+            URI.create("http://12.23.34.45"),
+            true
         );
         assertThat(actual).isEqualTo("12.23.34.45");
     }
@@ -37,7 +39,8 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
             client,
-            URI.create("tcp://12.23.34.45")
+            URI.create("tcp://12.23.34.45"),
+            true
         );
         assertThat(actual).isEqualTo("12.23.34.45");
     }
@@ -46,7 +49,8 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
     public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
             client,
-            URI.create("gopher://12.23.34.45")
+            URI.create("gopher://12.23.34.45"),
+            true
         );
         assertThat(actual).isNull();
     }
diff --git a/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
new file mode 100644
index 00000000000..dba14e34b51
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
@@ -0,0 +1,61 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.net.URI;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TestcontainersHostPropertyClientProviderStrategyTest {
+
+    @Rule
+    public MockTestcontainersConfigurationRule mockConfig = new MockTestcontainersConfigurationRule();
+
+    private URI defaultDockerHost;
+
+    private com.github.dockerjava.core.SSLConfig defaultSSLConfig;
+
+    @Before
+    public void checkEnvironmentClear() {
+        // If docker-java picks up non-default settings from the environment, our test needs to know to expect those
+        DefaultDockerClientConfig defaultConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
+        this.defaultDockerHost = defaultConfig.getDockerHost();
+        this.defaultSSLConfig = defaultConfig.getSSLConfig();
+    }
+
+    @Test
+    public void tcHostPropertyIsProvided() {
+        Mockito
+            .doReturn("tcp://127.0.0.1:9000")
+            .when(TestcontainersConfiguration.getInstance())
+            .getUserProperty(eq("tc.host"), isNull());
+
+        TestcontainersHostPropertyClientProviderStrategy strategy = new TestcontainersHostPropertyClientProviderStrategy();
+
+        TransportConfig transportConfig = strategy.getTransportConfig();
+        assertThat(transportConfig.getDockerHost().toString()).isEqualTo("tcp://127.0.0.1:9000");
+        assertThat(transportConfig.getSslConfig()).isEqualTo(this.defaultSSLConfig);
+    }
+
+    @Test
+    public void tcHostPropertyIsNotProvided() {
+        Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getUserProperty(eq("tc.host"), isNull());
+
+        TestcontainersHostPropertyClientProviderStrategy strategy = new TestcontainersHostPropertyClientProviderStrategy();
+
+        TransportConfig transportConfig = strategy.getTransportConfig();
+        assertThat(transportConfig.getDockerHost()).isEqualTo(this.defaultDockerHost);
+        assertThat(transportConfig.getSslConfig()).isEqualTo(this.defaultSSLConfig);
+    }
+}

From e69eeef3fef03a83f8bcc5f68f0145f4aec3876a Mon Sep 17 00:00:00 2001
From: Dakshin K <36289388+dakshin-k@users.noreply.github.com>
Date: Tue, 30 May 2023 14:05:04 +0530
Subject: [PATCH 2926/4969] Fix typo in gitlab_ci instruction docs (#7059)

---
 .../continuous_integration/gitlab_ci.md                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
index f2226f2d34f..5242e095b56 100644
--- a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
@@ -46,7 +46,7 @@ services:
     command: ["--tls=false"]
 
 variables:
-  # Instruct Testcontainers to use the daemon of DinD, use port 2735 for non-tls connections.
+  # Instruct Testcontainers to use the daemon of DinD, use port 2375 for non-tls connections.
   DOCKER_HOST: "tcp://docker:2375"
   # Instruct Docker not to start over TLS.
   DOCKER_TLS_CERTDIR: ""

From 86235b489ccd8d419267e99306018fb0bc747a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 30 May 2023 11:57:45 +0200
Subject: [PATCH 2927/4969] Support Docker Desktop paths for Linux and Mac
 (#7058)

Docker provides additional paths to support Docker Desktop.

* Linux: ~/.docker/desktop/docker.sock
* MacOS: ~/.docker/run/docker.sock

Also, `ryuk` should use `/var/run/docker.sock`.
---------

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../testcontainers/DockerClientFactory.java   |  3 +
 .../DockerClientProviderStrategy.java         |  7 ++
 .../DockerDesktopClientProviderStrategy.java  | 84 +++++++++++++++++++
 ....dockerclient.DockerClientProviderStrategy |  1 +
 4 files changed, 95 insertions(+)
 create mode 100644 core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 77ae311bb47..0d334f75cf6 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -164,6 +164,9 @@ public String getRemoteDockerUnixSocketPath() {
                 return dockerSocketOverride;
             }
         }
+        if (this.strategy != null && this.strategy.getRemoteDockerUnixSocketPath() != null) {
+            return this.strategy.getRemoteDockerUnixSocketPath();
+        }
 
         URI dockerHost = getTransportConfig().getDockerHost();
         String path = "unix".equals(dockerHost.getScheme()) ? dockerHost.getRawPath() : "/var/run/docker.sock";
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 8a959b443c8..1f22eb6f85e 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -102,6 +102,13 @@ public boolean allowUserOverrides() {
         return true;
     }
 
+    /**
+   /* @return the path under which the Docker unix socket is reachable relative to the Docker daemon
+    */
+    public String getRemoteDockerUnixSocketPath() {
+        return null;
+    }
+
     /**
      * @return highest to lowest priority value
      */
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java
new file mode 100644
index 00000000000..b056733cfd2
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java
@@ -0,0 +1,84 @@
+package org.testcontainers.dockerclient;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.SystemUtils;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+
+/**
+ * Look at the following paths:
+ * <ul>
+ *     <li>Linux: ~/.docker/desktop/docker.sock</li>
+ *     <li>MacOS: ~/.docker/run/docker.sock</li>
+ * </ul>
+ *
+ * @deprecated this class is used by the SPI and should not be used directly
+ */
+@Slf4j
+@Deprecated
+public class DockerDesktopClientProviderStrategy extends DockerClientProviderStrategy {
+
+    public static final int PRIORITY = UnixSocketClientProviderStrategy.PRIORITY - 1;
+
+    @Getter(lazy = true)
+    @Nullable
+    private final Path socketPath = resolveSocketPath();
+
+    private Path resolveSocketPath() {
+        Path linuxPath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("desktop");
+        return tryFolder(linuxPath)
+            .orElseGet(() -> {
+                Path macosPath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("run");
+                return tryFolder(macosPath).orElse(null);
+            });
+    }
+
+    @Override
+    public String getDescription() {
+        return "Rootless Docker accessed via Unix socket (" + getSocketPath() + ")";
+    }
+
+    @Override
+    public TransportConfig getTransportConfig() throws InvalidConfigurationException {
+        return TransportConfig.builder().dockerHost(URI.create("unix://" + getSocketPath().toString())).build();
+    }
+
+    @Override
+    protected int getPriority() {
+        return PRIORITY;
+    }
+
+    @Override
+    protected boolean isPersistable() {
+        return false;
+    }
+
+    @Override
+    public String getRemoteDockerUnixSocketPath() {
+        return "/var/run/docker.sock";
+    }
+
+    @Override
+    protected boolean isApplicable() {
+        return (SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC) && this.socketPath != null;
+    }
+
+    private Optional<Path> tryFolder(Path path) {
+        if (!Files.exists(path)) {
+            log.debug("'{}' does not exist.", path);
+            return Optional.empty();
+        }
+        Path socketPath = path.resolve("docker.sock");
+        if (!Files.exists(socketPath)) {
+            log.debug("'{}' does not exist.", socketPath);
+            return Optional.empty();
+        }
+        return Optional.of(socketPath);
+    }
+}
diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
index 62493d704a4..cae8bf53041 100644
--- a/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
+++ b/core/src/main/resources/META-INF/services/org.testcontainers.dockerclient.DockerClientProviderStrategy
@@ -4,3 +4,4 @@ org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
 org.testcontainers.dockerclient.DockerMachineClientProviderStrategy
 org.testcontainers.dockerclient.NpipeSocketClientProviderStrategy
 org.testcontainers.dockerclient.RootlessDockerClientProviderStrategy
+org.testcontainers.dockerclient.DockerDesktopClientProviderStrategy

From ca5824a5e4ae88534b03c2823162b8f1831b04ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 30 May 2023 12:39:16 +0200
Subject: [PATCH 2928/4969] Fix
 TestcontainersHostPropertyClientProviderStrategy(DefaultDockerClientConfig.Builder)

---
 .../TestcontainersHostPropertyClientProviderStrategy.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
index 39cd61c9c12..2e27b935b20 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
@@ -23,7 +23,7 @@ public TestcontainersHostPropertyClientProviderStrategy() {
         this(DefaultDockerClientConfig.createDefaultConfigBuilder());
     }
 
-    public TestcontainersHostPropertyClientProviderStrategy(DefaultDockerClientConfig.Builder configBuilder) {
+    TestcontainersHostPropertyClientProviderStrategy(DefaultDockerClientConfig.Builder configBuilder) {
         Optional<String> tcHost = Optional.ofNullable(
             TestcontainersConfiguration.getInstance().getUserProperty("tc.host", null)
         );

From d6665dce069f0c5f4c8eb93efb54688a40dc3a12 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 17:41:51 +0200
Subject: [PATCH 2929/4969] [create-pull-request] automated change (#7060)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3437bfcef1b..ff67bef3b29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.18.1
+testcontainers.version=1.18.2

From a90ccc0c4f7111d3a9bc36ecb4242e50f48ea38f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 17:42:03 +0200
Subject: [PATCH 2930/4969] [create-pull-request] automated change (#7061)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 70773bc7e7b..b607933ca06 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -119,4 +119,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.18.1
+    latest_version: 1.18.2

From d0ddcf87c9a3659315c64f3c7dc78dc8f5179969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 30 May 2023 18:24:12 +0200
Subject: [PATCH 2931/4969] Update docker-java version to 3.3.1 (#7063)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index f5f5e14fb09..f95c4f49e71 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,8 +86,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.0')
+    api platform('com.github.docker-java:docker-java-bom:3.3.1')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.1')
 
     api "com.github.docker-java:docker-java-api"
 

From 3a2ba5fb0833d727510b51d7f4443874e2300bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 30 May 2023 18:25:02 +0200
Subject: [PATCH 2932/4969] Switch r2dbc mysql driver to
 `io.asyncer:r2dbc-mysql` (#7043)

`dev.miku:r2dbc-mysql` is not maintained anymore and `io.asyncer:r2dbc-mysql`
has continued the work about reactive mysql driver providing support
for v1.0.0
---
 modules/mysql/build.gradle                                    | 4 ++--
 .../containers/MySQLR2DBCDatabaseContainerProvider.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index bc2af87bcec..68284c8e123 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
+    compileOnly 'io.asyncer:r2dbc-mysql:0.9.0'
 
     testImplementation project(':jdbc-test')
     testImplementation 'mysql:mysql-connector-java:8.0.32'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
+    testImplementation 'io.asyncer:r2dbc-mysql:0.9.0'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
index a32fa96c9b8..bf74e8ec27a 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.auto.service.AutoService;
-import dev.miku.r2dbc.mysql.MySqlConnectionFactoryProvider;
+import io.asyncer.r2dbc.mysql.MySqlConnectionFactoryProvider;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;

From 5c88064f99ff996d88138881f56e59f7530af59b Mon Sep 17 00:00:00 2001
From: Per Lundberg <perlun@gmail.com>
Date: Tue, 30 May 2023 19:26:41 +0300
Subject: [PATCH 2933/4969] Demote "testcontainers.properties not found"
 message to debug log level (#7035)

---
 .../testcontainers/utility/TestcontainersConfiguration.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 44af923bb9a..e1d70465378 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -365,13 +365,13 @@ private static Properties readProperties(URL url) {
         try (InputStream inputStream = url.openStream()) {
             properties.load(inputStream);
         } catch (FileNotFoundException e) {
-            log.warn(
+            log.debug(
                 "Attempted to read Testcontainers configuration file at {} but the file was not found. Exception message: {}",
                 url,
                 ExceptionUtils.getRootCauseMessage(e)
             );
         } catch (IOException e) {
-            log.warn(
+            log.debug(
                 "Attempted to read Testcontainers configuration file at {} but could it not be loaded. Exception message: {}",
                 url,
                 ExceptionUtils.getRootCauseMessage(e)

From e368f711c72dcfcab039b9e6491f67c3b4ff3997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 31 May 2023 16:08:03 +0200
Subject: [PATCH 2934/4969] Fixes for new strategies (#7085)

* Improve DockerDesktopClientProviderStrategy description
* Fix TestcontainersHostPropertyClientProviderStrategy only when tc.host is present

Fixes #7082
---
 .../DockerDesktopClientProviderStrategy.java   |  2 +-
 ...nersHostPropertyClientProviderStrategy.java | 13 ++++++++++---
 ...HostPropertyClientProviderStrategyTest.java | 18 ++----------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java
index b056733cfd2..56fd0b59ee4 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerDesktopClientProviderStrategy.java
@@ -41,7 +41,7 @@ private Path resolveSocketPath() {
 
     @Override
     public String getDescription() {
-        return "Rootless Docker accessed via Unix socket (" + getSocketPath() + ")";
+        return "Docker accessed via Unix socket (" + getSocketPath() + ")";
     }
 
     @Override
diff --git a/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
index 2e27b935b20..6e06367d5b6 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategy.java
@@ -17,7 +17,7 @@ public final class TestcontainersHostPropertyClientProviderStrategy extends Dock
 
     public static final int PRIORITY = EnvironmentAndSystemPropertyClientProviderStrategy.PRIORITY - 10;
 
-    private final DockerClientConfig dockerClientConfig;
+    private DockerClientConfig dockerClientConfig;
 
     public TestcontainersHostPropertyClientProviderStrategy() {
         this(DefaultDockerClientConfig.createDefaultConfigBuilder());
@@ -28,8 +28,10 @@ public TestcontainersHostPropertyClientProviderStrategy() {
             TestcontainersConfiguration.getInstance().getUserProperty("tc.host", null)
         );
 
-        tcHost.ifPresent(configBuilder::withDockerHost);
-        this.dockerClientConfig = configBuilder.build();
+        if (tcHost.isPresent()) {
+            configBuilder.withDockerHost(tcHost.get());
+            this.dockerClientConfig = configBuilder.build();
+        }
     }
 
     @Override
@@ -46,6 +48,11 @@ public TransportConfig getTransportConfig() throws InvalidConfigurationException
             .build();
     }
 
+    @Override
+    protected boolean isApplicable() {
+        return this.dockerClientConfig != null;
+    }
+
     @Override
     protected int getPriority() {
         return PRIORITY;
diff --git a/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
index dba14e34b51..4ebdb300a2f 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,16 +22,6 @@ public class TestcontainersHostPropertyClientProviderStrategyTest {
 
     private URI defaultDockerHost;
 
-    private com.github.dockerjava.core.SSLConfig defaultSSLConfig;
-
-    @Before
-    public void checkEnvironmentClear() {
-        // If docker-java picks up non-default settings from the environment, our test needs to know to expect those
-        DefaultDockerClientConfig defaultConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
-        this.defaultDockerHost = defaultConfig.getDockerHost();
-        this.defaultSSLConfig = defaultConfig.getSSLConfig();
-    }
-
     @Test
     public void tcHostPropertyIsProvided() {
         Mockito
@@ -43,9 +31,9 @@ public void tcHostPropertyIsProvided() {
 
         TestcontainersHostPropertyClientProviderStrategy strategy = new TestcontainersHostPropertyClientProviderStrategy();
 
+        assertThat(strategy.isApplicable()).isTrue();
         TransportConfig transportConfig = strategy.getTransportConfig();
         assertThat(transportConfig.getDockerHost().toString()).isEqualTo("tcp://127.0.0.1:9000");
-        assertThat(transportConfig.getSslConfig()).isEqualTo(this.defaultSSLConfig);
     }
 
     @Test
@@ -54,8 +42,6 @@ public void tcHostPropertyIsNotProvided() {
 
         TestcontainersHostPropertyClientProviderStrategy strategy = new TestcontainersHostPropertyClientProviderStrategy();
 
-        TransportConfig transportConfig = strategy.getTransportConfig();
-        assertThat(transportConfig.getDockerHost()).isEqualTo(this.defaultDockerHost);
-        assertThat(transportConfig.getSslConfig()).isEqualTo(this.defaultSSLConfig);
+        assertThat(strategy.isApplicable()).isFalse();
     }
 }

From c3b26caccde402232e020c93e867ab1d81a17c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 31 May 2023 16:23:39 +0200
Subject: [PATCH 2935/4969] Revert "Update docker-java version to 3.3.1
 (#7063)"

This reverts commit d0ddcf87c9a3659315c64f3c7dc78dc8f5179969.
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index f95c4f49e71..f5f5e14fb09 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,8 +86,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.1')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.1')
+    api platform('com.github.docker-java:docker-java-bom:3.3.0')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.0')
 
     api "com.github.docker-java:docker-java-api"
 

From b0902a95e7451e27e13815c48fe65314351d40e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 31 May 2023 16:23:48 +0200
Subject: [PATCH 2936/4969] Revert "Switch r2dbc mysql driver to
 `io.asyncer:r2dbc-mysql` (#7043)"

This reverts commit 3a2ba5fb0833d727510b51d7f4443874e2300bd0.
---
 modules/mysql/build.gradle                                    | 4 ++--
 .../containers/MySQLR2DBCDatabaseContainerProvider.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 68284c8e123..bc2af87bcec 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:0.9.0'
+    compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation 'mysql:mysql-connector-java:8.0.32'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'io.asyncer:r2dbc-mysql:0.9.0'
+    testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
index bf74e8ec27a..a32fa96c9b8 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.auto.service.AutoService;
-import io.asyncer.r2dbc.mysql.MySqlConnectionFactoryProvider;
+import dev.miku.r2dbc.mysql.MySqlConnectionFactoryProvider;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;

From f542e9006e025be59ab4336a0c240fe12e6f60bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:39 +0000
Subject: [PATCH 2937/4969] Bump mysql:mysql-connector-java from 8.0.32 to
 8.0.33 in /modules/mysql

Bumps mysql:mysql-connector-java from 8.0.32 to 8.0.33.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 bc2af87bcec..17a2819479b 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -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.32'
+    testImplementation 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

From a60a6452ca39df85c096919e0f063f5dff472cc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:41 +0000
Subject: [PATCH 2938/4969] Bump org.junit:junit-bom from 5.9.2 to 5.9.3 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d5adb84109d..93ad72f230c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.9.2')
+    implementation platform('org.junit:junit-bom:5.9.3')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')

From f6addcf4fbf11d749630ba5d5d6f7477f6cea877 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:42 +0000
Subject: [PATCH 2939/4969] Bump mysql:mysql-connector-java in
 /modules/jdbc-test

Bumps mysql:mysql-connector-java from 8.0.32 to 8.0.33.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7ffb58a51a3..ffebdd4e2e3 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -12,5 +12,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.32'
+    api 'mysql:mysql-connector-java:8.0.33'
 }

From 362b9b9d0a3458e03b515c46853d2149f6b1a0e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:45 +0000
Subject: [PATCH 2940/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.1.3 to 3.1.4.
- [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/3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 697544c9e4f..a5dc6006980 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.3'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.4'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.3'

From d8ce743006708262baa1140b550e7dab0081cd3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:46 +0000
Subject: [PATCH 2941/4969] Bump mysql:mysql-connector-java in
 /modules/junit-jupiter

Bumps mysql:mysql-connector-java from 8.0.32 to 8.0.33.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d5adb84109d..b7e404d3aac 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
 
 test {

From 2b87198d39f86e554d1feacc49a6f4dde2ff1c3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:48 +0000
Subject: [PATCH 2942/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit5) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3e3815198c8..20129b2be50 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.3'
 
     testCompileOnly 'org.jetbrains:annotations:24.0.1'
 }

From c9951ae5747cc3de6b5f08a1feb4d97ea0b4e76c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:49 +0000
Subject: [PATCH 2943/4969] Bump mysql:mysql-connector-java from 8.0.32 to
 8.0.33 in /modules/spock

Bumps mysql:mysql-connector-java from 8.0.32 to 8.0.33.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3e3815198c8..17a6074d794 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'
 

From caa6a5e581fb4e916527e603358def3fdeca852f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:52 +0000
Subject: [PATCH 2944/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 21.9.0.0 to 23.2.0.0.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index c1f44bb9427..535d7b082ac 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.0.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:21.9.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.2.0.0'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 

From 3baa0f89fde552fac00bb2ed28c331bd2774d4a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:53 +0000
Subject: [PATCH 2945/4969] Bump com.squareup.okhttp3:okhttp from 4.10.0 to
 4.11.0 in /examples

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1aa9dae1b23..fbd892269b5 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.36'
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'org.json:json:20230227'
     testImplementation 'org.postgresql:postgresql:42.6.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'

From 1cf40f67a72988de12a60aceafbcec5a09c4dc55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:54 +0000
Subject: [PATCH 2946/4969] Bump com.squareup.okhttp3:okhttp in
 /modules/couchbase

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 3e8dca2c1ad..6d2db73f833 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'com.couchbase.client:java-client:3.4.4'
     testImplementation 'org.awaitility:awaitility:4.2.0'

From 97d35d83096fff93610cf299f7064528c38d2b02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:59 +0000
Subject: [PATCH 2947/4969] Bump com.squareup.okhttp3:okhttp from 4.10.0 to
 4.11.0 in /modules/azure

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 83319057269..6f4e8243257 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Azure"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.azure:azure-cosmos:4.42.0'

From ae2000e39042bd67a593023d8fc8c662a6d4e208 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:24:59 +0000
Subject: [PATCH 2948/4969] Bump com.squareup.okhttp3:okhttp from 4.10.0 to
 4.11.0 in /modules/solr

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 857280d082b..85c6e02954e 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 97ef6330dd9be9d0b20a6f35925d8e83fcf4c75b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:25:00 +0000
Subject: [PATCH 2949/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1e37b848362..736c4f5c7d5 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.6")
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
 }
 
 test {

From ec768dae2fabee349054959fb64e9da2aabb7dbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:25:03 +0000
Subject: [PATCH 2950/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1e37b848362..9882ce61103 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.14.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")

From 6a8442ed2fa295e73d73d4e1e280745124f64800 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 14:25:07 +0000
Subject: [PATCH 2951/4969] Bump mysql:mysql-connector-java from 8.0.32 to
 8.0.33 in /modules/tidb

Bumps mysql:mysql-connector-java from 8.0.32 to 8.0.33.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index b1105a3e2b0..42f032c1329 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.32'
+    testImplementation 'mysql:mysql-connector-java:8.0.33'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 4b64c455600907f16031c250290686b81e1a9c16 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 23:57:25 +0200
Subject: [PATCH 2952/4969] [create-pull-request] automated change (#7095)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index b607933ca06..b03ad6e5575 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -119,4 +119,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.18.2
+    latest_version: 1.18.3

From cb684348ec0c6dda074310df4ffcc5ed4515c0f1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 23:57:36 +0200
Subject: [PATCH 2953/4969] [create-pull-request] automated change (#7096)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ff67bef3b29..7aa5a26a69a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.18.2
+testcontainers.version=1.18.3

From 0c4cf925bc1e7302282d52753dab81cbcac68094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 5 Jun 2023 09:39:57 +0200
Subject: [PATCH 2954/4969] Revert "Revert "Update docker-java version to 3.3.1
 (#7063)""

This reverts commit c3b26caccde402232e020c93e867ab1d81a17c7f.
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index f5f5e14fb09..f95c4f49e71 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,8 +86,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.0')
+    api platform('com.github.docker-java:docker-java-bom:3.3.1')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.1')
 
     api "com.github.docker-java:docker-java-api"
 

From 175423153cea64e5cc5423ec35b8ab19df1e1e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 5 Jun 2023 09:40:11 +0200
Subject: [PATCH 2955/4969] Revert "Revert "Switch r2dbc mysql driver to
 `io.asyncer:r2dbc-mysql` (#7043)""

This reverts commit b0902a95e7451e27e13815c48fe65314351d40e2.
---
 modules/mysql/build.gradle                                    | 4 ++--
 .../containers/MySQLR2DBCDatabaseContainerProvider.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index bc2af87bcec..68284c8e123 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
+    compileOnly 'io.asyncer:r2dbc-mysql:0.9.0'
 
     testImplementation project(':jdbc-test')
     testImplementation 'mysql:mysql-connector-java:8.0.32'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
+    testImplementation 'io.asyncer:r2dbc-mysql:0.9.0'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
index a32fa96c9b8..bf74e8ec27a 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.auto.service.AutoService;
-import dev.miku.r2dbc.mysql.MySqlConnectionFactoryProvider;
+import io.asyncer.r2dbc.mysql.MySqlConnectionFactoryProvider;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;

From 59cdf19bcdf70a1e5f97d1ed19aee098fa46a48d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 5 Jun 2023 18:54:13 +0200
Subject: [PATCH 2956/4969] Fix paths-ignore for ci-examples.yml (#7138)

Currently, `junit4`, `junit5`, `spock` at `docs/examples` don't run
because of the `paths-ignore: 'docs'`. It is important to run those
projects only when they are touched.
---
 .github/workflows/ci-examples.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 6da1dcf5aa1..20bf682abad 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -3,14 +3,25 @@ name: CI-Examples
 on:
   pull_request:
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
   push:
     branches: [ main ]
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
+      - 'docs/**/*.md'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'

From 652191cc013762a87b867d4b3047371703c845dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 5 Jun 2023 19:05:41 +0200
Subject: [PATCH 2957/4969] Fix paths-ignore for workflows

---
 .github/workflows/ci-docker-wormhole.yml | 14 ++++++++++++--
 .github/workflows/ci-rootless.yml        | 14 ++++++++++++--
 .github/workflows/ci.yml                 | 14 ++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 4cac12201b3..0bfdcee47e5 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -3,14 +3,24 @@ name: CI-Docker-Wormhole
 on:
   pull_request:
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
   push:
     branches: [ main ]
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 45371c5b52b..8c1d31a6a80 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -3,14 +3,24 @@ name: CI-Docker-Rootless
 on:
   pull_request:
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
   push:
     branches: [ main ]
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ae7e7ce6e5..9095565d83f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,14 +3,24 @@ name: CI
 on:
   pull_request:
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
   push:
     branches: [ main ]
     paths-ignore:
-      - 'docs/**'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'

From e8c1539a8ae214c770ea2f9443c0ad657fb3755e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 17:08:00 +0000
Subject: [PATCH 2958/4969] Bump gradle-update/update-gradle-wrapper-action
 from 1.0.18 to 1.0.20

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 1.0.18 to 1.0.20.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/981c551b17dbcf1940b1b4435afdb79babb7c13a...0407394b9d173dfc9cf5695f9f560fef6d61a5fe)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 585acaa904b..af8bc391d33 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@981c551b17dbcf1940b1b4435afdb79babb7c13a # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@0407394b9d173dfc9cf5695f9f560fef6d61a5fe # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From 0d384831217d4d6aa53420e142cbbf938d9fb310 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 18:05:37 +0000
Subject: [PATCH 2959/4969] Bump com.oracle.database.r2dbc:oracle-r2dbc in
 /modules/oracle-xe

Bumps com.oracle.database.r2dbc:oracle-r2dbc from 1.0.0 to 1.1.1.

---
updated-dependencies:
- dependency-name: com.oracle.database.r2dbc:oracle-r2dbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index c1f44bb9427..5251d9bce22 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.0.0'
+    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:21.9.0.0'
@@ -15,7 +15,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'com.oracle.database.r2dbc:oracle-r2dbc:1.0.0'
+    testImplementation 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
 }
 
 test {

From 8bb1c45528f6e849240ae80b431c65f8aab4c435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 6 Jun 2023 18:05:28 +0200
Subject: [PATCH 2960/4969] Ignore jackson-datatype-jsr310 in dependabot.yml
 (#7143)

`testcontainers` module declares `com.fasterxml.jackson.datatype:jackson-datatype-jsr310`
as a dependency and it should be aligned with `com.fasterxml.jackson.core:jackson-databind`.
---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e78603d163f..52d11753ca8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,6 +18,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.yaml:snakeyaml"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:

From d89ce98731ae66e12a894a8d07dc18689451a6d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 6 Jun 2023 18:12:00 +0200
Subject: [PATCH 2961/4969] Update cucumber version to 7.12.0 (#7144)

---
 examples/cucumber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 0b47630bbbe..e4eb9bbb3d6 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -10,8 +10,8 @@ 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:7.11.1'
-    testImplementation 'io.cucumber:cucumber-junit:7.11.1'
+    testImplementation 'io.cucumber:cucumber-java:7.12.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.12.0'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From cfab5af4664c52629f7773efa41633241de195f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 6 Jun 2023 18:17:25 +0200
Subject: [PATCH 2962/4969] Update questdb version to 7.1.3 (#7145)

Also, questdb version 7.1 requires java 11 and the test has been
configured to use it.
---
 modules/questdb/build.gradle | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 88826ccb237..83dee2eaadb 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,20 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.0.1-jdk8'
+    testImplementation 'org.questdb:questdb:7.1.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
+}

From 01bd9a0e1b9f0a493d1e8a38f336fe63d3b6f862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 8 Jun 2023 16:18:43 +0200
Subject: [PATCH 2963/4969] Update selenium version to 4.10.0 (#7163)

Also, update `selenium/selenium-firefox` image version to `4.10.0`
---
 modules/selenium/build.gradle                          | 10 +++++-----
 .../junit/SpecificImageNameWebDriverContainerTest.java |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 330ff3d937c..caaf36ca3ff 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -3,11 +3,11 @@ description = "Testcontainers :: Selenium"
 dependencies {
     api project(':testcontainers')
 
-    provided 'org.seleniumhq.selenium:selenium-remote-driver:4.6.0'
-    provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.8.3'
-    testImplementation 'org.seleniumhq.selenium:selenium-support:4.6.0'
+    provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
+    provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.10.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.10.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-support:4.10.0'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
index 82df577d249..9f0d9035f44 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
@@ -8,9 +8,7 @@
 
 public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
 
-    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse(
-        "selenium/standalone-firefox:2.53.1-beryllium"
-    );
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox:4.10.0");
 
     @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)

From 09b1e47cfda1f41fc44395cdb4711b81f1a04a0d Mon Sep 17 00:00:00 2001
From: Leo <leocrossuk@gmail.com>
Date: Fri, 9 Jun 2023 13:19:50 +0100
Subject: [PATCH 2964/4969] Update docs domain from www to java (#7179)

---
 README.md                                                       | 2 +-
 .../dockerclient/DockerClientProviderStrategy.java              | 2 +-
 docs/error_missing_container_runtime_environment.md             | 2 +-
 gradle/publishing.gradle                                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 535b21cbce9..bb3514e01e4 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ![Testcontainers logo](docs/logo.png)
 
-# [Read the documentation here](http://www.testcontainers.org)
+# [Read the documentation here](https://java.testcontainers.org)
 
 ## License
 
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 1f22eb6f85e..be2f1705df2 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -269,7 +269,7 @@ public boolean test(DockerClientProviderStrategy dockerClientProviderStrategy) {
                     "Could not find a valid Docker environment. Please check configuration. Attempted configurations were:\n" +
                     configurationFailures.stream().map(it -> "\t" + it).collect(Collectors.joining("\n")) +
                     "As no valid configuration was found, execution cannot continue.\n" +
-                    "See https://www.testcontainers.org/on_failure.html for more details."
+                    "See https://java.testcontainers.org/on_failure.html for more details."
                 );
 
                 FAIL_FAST_ALWAYS.set(true);
diff --git a/docs/error_missing_container_runtime_environment.md b/docs/error_missing_container_runtime_environment.md
index 373d04fff38..592eff7fd54 100644
--- a/docs/error_missing_container_runtime_environment.md
+++ b/docs/error_missing_container_runtime_environment.md
@@ -13,4 +13,4 @@ Here is a list of supported container runtime environments:
 * [Testcontainers Cloud](https://www.testcontainers.cloud?utm_medium=direct&utm_source=testcontainers.com&utm_content=docs&utm_term=on-failure)
 
 For more extensive information on supported container runtime environments, as well as known limitations of alternative container runtime environments,
-please refer to [this page](https://www.testcontainers.org/supported_docker_environment/) in our documentation.
+please refer to [this page](https://java.testcontainers.org/supported_docker_environment/) in our documentation.
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 3b2b3f22211..618ada345cc 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -30,7 +30,7 @@ publishing {
 
                     name project.description
                     description 'Isolated container management for Java code testing'
-                    url 'https://testcontainers.org'
+                    url 'https://java.testcontainers.org'
                     issueManagement {
                         system 'GitHub'
                         url 'https://github.com/testcontainers/testcontainers-java/issues'

From 19a3c14662ad333c189fe54d6111ebc96adca0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 13 Jun 2023 09:35:50 +0200
Subject: [PATCH 2965/4969] Use static import for assertThat (#7188)

---
 .../solace/SolaceContainerAMQPTest.java             |  9 +++++----
 .../solace/SolaceContainerMQTTTest.java             |  9 +++++----
 .../solace/SolaceContainerRESTTest.java             |  5 +++--
 .../solace/SolaceContainerSMFTest.java              | 13 +++++++------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
index 990a8107eb5..6c68d27d358 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.solace;
 
 import org.apache.qpid.jms.JmsConnectionFactory;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -19,6 +18,8 @@
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerAMQPTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerAMQPTest.class);
@@ -42,8 +43,8 @@ public void testSolaceContainer() throws JMSException {
                 solaceContainer.getOrigin(Service.AMQP)
             );
             // }
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.close();
         }
     }
@@ -86,7 +87,7 @@ private String consumeMessageFromSolace(Session session) {
                 }
             });
             publishMessageToSolace(session, topic);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             messageConsumer.close();
             return result[0];
         } catch (Exception e) {
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
index 621bb122a7b..ab7d5ed56bb 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.solace;
 
-import org.assertj.core.api.Assertions;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttClient;
@@ -15,6 +14,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerMQTTTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerMQTTTest.class);
@@ -36,8 +37,8 @@ public void testSolaceContainer() {
                 solaceContainer.getPassword(),
                 solaceContainer.getOrigin(Service.MQTT)
             );
-            Assertions.assertThat(client).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(client)).isEqualTo(MESSAGE);
+            assertThat(client).isNotNull();
+            assertThat(consumeMessageFromSolace(client)).isEqualTo(MESSAGE);
         }
     }
 
@@ -86,7 +87,7 @@ public void deliveryComplete(IMqttDeliveryToken token) {}
             );
             client.subscribe(TOPIC_NAME, 0);
             publishMessageToSolace(client);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             return result[0];
         } catch (Exception e) {
             throw new RuntimeException("Cannot receive message from solace", e);
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
index ee0cc849573..f2722b986ca 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
@@ -12,12 +12,13 @@
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerRESTTest {
 
     private static final String MESSAGE = "HelloWorld";
@@ -45,7 +46,7 @@ private void testPublishMessageToSolace(SolaceContainer solaceContainer, Service
         if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
             Assert.fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
         }
-        Assertions.assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
+        assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
     }
 
     private HttpClient createClient(SolaceContainer solaceContainer) {
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
index afc9639c32f..57dc7ac0c19 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -11,7 +11,6 @@
 import com.solacesystems.jcsmp.XMLMessageConsumer;
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
-import org.assertj.core.api.Assertions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -21,6 +20,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SolaceContainerSMFTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerSMFTest.class);
@@ -41,8 +42,8 @@ public void testSolaceContainerWithSimpleAuthentication() {
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithBasicAuth(solaceContainer);
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.closeSession();
         }
     }
@@ -61,8 +62,8 @@ public void testSolaceContainerWithCertificates() {
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithCertificates(solaceContainer);
-            Assertions.assertThat(session).isNotNull();
-            Assertions.assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            assertThat(session).isNotNull();
+            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
             session.closeSession();
         }
     }
@@ -157,7 +158,7 @@ public void onException(JCSMPException e) {
             session.addSubscription(TOPIC);
             cons.start();
             publishMessageToSolace(session);
-            Assertions.assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
             return result[0];
         } catch (Exception e) {
             throw new RuntimeException("Cannot receive message from solace", e);

From 81b07639eda930dd6163d4fa35c56602f4be6a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 16 Jun 2023 12:32:02 +0200
Subject: [PATCH 2966/4969] Deprecate `dynalite` module (#7191)

Nowdays, Testcontainers provides a LocalStack module which offers
DynamoDB integration.
---
 modules/dynalite/build.gradle                                   | 2 +-
 .../java/org/testcontainers/dynamodb/DynaliteContainer.java     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index c29e1a5cae8..75c8e9b5977 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -1,4 +1,4 @@
-description = "Testcontainers :: Dynalite"
+description = "Testcontainers :: Dynalite (deprecated)"
 
 dependencies {
     api project(':testcontainers')
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
index 401fa8782b1..2d2161a3d8a 100644
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
@@ -11,6 +11,8 @@
 
 /**
  * Container for Dynalite, a DynamoDB clone.
+ *
+ * @deprecated use localstack module instead
  */
 public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
 

From a7d36d6419cb9e68dae2021e6c347e01c2347f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 17 Jun 2023 11:44:42 +0200
Subject: [PATCH 2967/4969] Update captainhook plugin version to 0.1.5 (#7221)

Also, remove jitpack as a repository
---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b6501a3520..c5500440910 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,12 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven { url 'https://jitpack.io' }
     }
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
         classpath 'com.google.guava:guava:30.1.1-jre'
-        classpath 'com.github.kiview:captain-hook:76a1c11a16'
+        classpath 'com.github.tjni.captainhook:captain-hook:0.1.5'
     }
 }
 

From c244a080135cd38a17e76019b3d2df0b37f26b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 17 Jun 2023 22:47:42 +0200
Subject: [PATCH 2968/4969] Use com.google.cloud:libraries-bom (#7227)

---
 modules/gcloud/build.gradle | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index df60ae81dba..7ce58b3a43e 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,10 +3,11 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.14.2'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.9.3'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.123.8'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.38.2'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.20.3'
+    testImplementation platform("com.google.cloud:libraries-bom:26.17.0")
+    testImplementation 'com.google.cloud:google-cloud-datastore'
+    testImplementation 'com.google.cloud:google-cloud-firestore'
+    testImplementation 'com.google.cloud:google-cloud-pubsub'
+    testImplementation 'com.google.cloud:google-cloud-spanner'
+    testImplementation 'com.google.cloud:google-cloud-bigtable'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 2242802d24f8e1590ae2ab793ea12f998bb075ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 17 Jun 2023 23:32:30 +0200
Subject: [PATCH 2969/4969] Use com.amazonaws:aws-java-sdk-bom (#7228)

---
 modules/localstack/build.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 7965ece91ba..257439db218 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,9 +3,10 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.446'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.441'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.446'
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.489")
+    testImplementation 'com.amazonaws:aws-java-sdk-s3'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'software.amazon.awssdk:s3:2.20.38'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 3848a7f3297091fd29d8a8a335ab7c4c10095581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 19 Jun 2023 15:40:11 -0600
Subject: [PATCH 2970/4969] Remove unused com.google.auto.service:auto-service
 dependency (#7230)

---
 modules/cratedb/build.gradle | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 12013aa2c76..1885f79c14c 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -1,9 +1,6 @@
 description = "Testcontainers :: JDBC :: CrateDB"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0.1'
-
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')

From c82049b52858d9c531dd3d0fb2fe6dfc14c8ac77 Mon Sep 17 00:00:00 2001
From: Leo <leocrossuk@gmail.com>
Date: Tue, 20 Jun 2023 18:33:00 +0100
Subject: [PATCH 2971/4969] Fix locations set to None in sitemap (#7232)

---
 mkdocs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkdocs.yml b/mkdocs.yml
index b03ad6e5575..94bc3ddb38b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,5 @@
 site_name: Testcontainers for Java
+site_url: https://java.testcontainers.org
 plugins:
     - search
     - codeinclude

From 9220816be660050281ed79a1712489fa06e08bc2 Mon Sep 17 00:00:00 2001
From: jeroen-vd-nl <136333578+jeroen-vd-nl@users.noreply.github.com>
Date: Tue, 20 Jun 2023 20:30:07 +0200
Subject: [PATCH 2972/4969] Use `SelinuxContext.SHARED` by default for mounting
 (#7187)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: monosoul <Kloz.Klaud@gmail.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../java/org/testcontainers/containers/Container.java     | 4 ++--
 .../org/testcontainers/containers/GenericContainer.java   | 8 ++++----
 .../org/testcontainers/junit/CopyFileToContainerTest.java | 5 +----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index 7e6f492c284..b97f6dbfa35 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -79,7 +79,7 @@ class ExecResult {
      * @param mode          the bind mode
      */
     default void addFileSystemBind(final String hostPath, final String containerPath, final BindMode mode) {
-        addFileSystemBind(hostPath, containerPath, mode, SelinuxContext.NONE);
+        addFileSystemBind(hostPath, containerPath, mode, SelinuxContext.SHARED);
     }
 
     /**
@@ -303,7 +303,7 @@ default SELF withClasspathResourceMapping(
         final String containerPath,
         final BindMode mode
     ) {
-        withClasspathResourceMapping(resourcePath, containerPath, mode, SelinuxContext.NONE);
+        withClasspathResourceMapping(resourcePath, containerPath, mode, SelinuxContext.SHARED);
         return self();
     }
 
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 959b14414f0..92ad93aaf56 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1290,7 +1290,7 @@ public SELF withClasspathResourceMapping(
         final String containerPath,
         final BindMode mode
     ) {
-        return withClasspathResourceMapping(resourcePath, containerPath, mode, SelinuxContext.NONE);
+        return withClasspathResourceMapping(resourcePath, containerPath, mode, SelinuxContext.SHARED);
     }
 
     /**
@@ -1305,10 +1305,10 @@ public SELF withClasspathResourceMapping(
     ) {
         final MountableFile mountableFile = MountableFile.forClasspathResource(resourcePath);
 
-        if (mode == BindMode.READ_ONLY && selinuxContext == SelinuxContext.NONE) {
-            withCopyFileToContainer(mountableFile, containerPath);
-        } else {
+        if (mode == BindMode.READ_WRITE) {
             addFileSystemBind(mountableFile.getResolvedPath(), containerPath, mode, selinuxContext);
+        } else {
+            withCopyFileToContainer(mountableFile, containerPath);
         }
 
         return self();
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index b139ece5410..92cf5f72154 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -49,15 +49,12 @@ public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
         String resource = "/test_copy_to_container.txt";
         GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
             .withClasspathResourceMapping(resource, "/readOnly", BindMode.READ_ONLY)
-            .withClasspathResourceMapping(resource, "/readOnlyNoSelinux", BindMode.READ_ONLY)
             .withClasspathResourceMapping(resource, "/readOnlyShared", BindMode.READ_ONLY, SelinuxContext.SHARED)
             .withClasspathResourceMapping(resource, "/readWrite", BindMode.READ_WRITE);
 
         Map<MountableFile, String> copyMap = container.getCopyToFileContainerPathMap();
         assertThat(copyMap).as("uses copy for read-only").containsValue("/readOnly");
-        assertThat(copyMap).as("uses copy for read-only and no Selinux").containsValue("/readOnlyNoSelinux");
-
-        assertThat(copyMap).as("uses mount for read-only with Selinux").doesNotContainValue("/readOnlyShared");
+        assertThat(copyMap).as("uses copy for read-only with Selinux").containsValue("/readOnlyShared");
         assertThat(copyMap).as("uses mount for read-write").doesNotContainValue("/readWrite");
     }
 

From d106d3f828f3ee639154a1ea5b23a0a1808f4332 Mon Sep 17 00:00:00 2001
From: jito <pigberger70@gmail.com>
Date: Wed, 21 Jun 2023 06:24:12 +0900
Subject: [PATCH 2973/4969] Refactor spring-boot-kotlin-redis example to be
 more Kotlin idiomatic (#7185)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../{build.gradle => build.gradle.kts}            | 15 ++++++++++-----
 .../kotlin/com/example/redis/ExampleController.kt | 12 ++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)
 rename examples/spring-boot-kotlin-redis/{build.gradle => build.gradle.kts} (64%)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle.kts
similarity index 64%
rename from examples/spring-boot-kotlin-redis/build.gradle
rename to examples/spring-boot-kotlin-redis/build.gradle.kts
index e99b37485b9..49b253f647e 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle
+++ b/examples/spring-boot-kotlin-redis/build.gradle.kts
@@ -1,16 +1,19 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("org.springframework.boot") version "2.7.10"
-    id("org.jetbrains.kotlin.jvm") version "1.8.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.8.20"
+    kotlin("jvm") version "1.8.10"
+    kotlin("plugin.spring") version "1.8.20"
 }
 
-apply plugin: 'io.spring.dependency-management'
+java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
+    apply(plugin = "io.spring.dependency-management")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
@@ -18,11 +21,13 @@ dependencies {
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.testcontainers:testcontainers")
+
+
 }
 
-compileKotlin {
+tasks.withType<KotlinCompile> {
     kotlinOptions {
+        freeCompilerArgs = listOf("-Xjsr305=strict")
         jvmTarget = "1.8"
-        freeCompilerArgs = ["-Xjsr305=strict"]
     }
 }
diff --git a/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt b/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt
index bbe3083935e..b890c301242 100644
--- a/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt
+++ b/examples/spring-boot-kotlin-redis/src/main/kotlin/com/example/redis/ExampleController.kt
@@ -1,6 +1,5 @@
 package com.example.redis
 
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
@@ -8,12 +7,13 @@ import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
-class ExampleController {
+class ExampleController(
+    private val redisTemplate: RedisTemplate<String, String>
+) {
 
-    private val key = "testcontainers"
-
-    @Autowired
-    private lateinit var redisTemplate: RedisTemplate<String, String>
+    companion object {
+        const val key = "testcontainers"
+    }
 
     @PostMapping("/set-foo")
     fun setFoo(@RequestBody value: String) {

From 7112db5c6e493306360818d6bfc261df92c49255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 20 Jun 2023 21:24:54 -0600
Subject: [PATCH 2974/4969] Add support for compose v2 with ComposeContainer
 (#5608)

[Compose V2](https://www.docker.com/blog/announcing-compose-v2-general-availability/)
offers arm images to perform `docker compose` commands.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/labeler.yml                           |   2 +
 .../containers/ComposeContainer.java          | 384 ++++++++++++
 .../containers/ComposeDelegate.java           | 417 +++++++++++++
 .../ContainerisedDockerCompose.java           |  98 +++
 .../containers/DockerCompose.java             |  14 +
 .../containers/DockerComposeContainer.java    | 587 ++----------------
 .../containers/LocalDockerCompose.java        | 134 ++++
 .../testcontainers/ComposeOverridesTest.java  | 114 ++++
 .../ComposeContainerWithServicesTest.java     | 130 ++++
 .../DockerComposeOverridesTest.java           |   3 +-
 .../testcontainers/junit/BaseComposeTest.java |  85 +++
 .../junit/ComposeContainerScalingTest.java    |  54 ++
 .../junit/ComposeContainerTest.java           |  83 +++
 .../ComposeContainerVolumeRemovalTest.java    |  92 +++
 .../junit/ComposeContainerWithBuildTest.java  | 118 ++++
 .../ComposeContainerWithOptionsTest.java      |  89 +++
 .../junit/ComposeErrorHandlingTest.java       |  24 +
 .../junit/ComposePassthroughTest.java         |  60 ++
 .../junit/ComposeWaitStrategyTest.java        | 110 ++++
 .../junit/ComposeWithIdentifierTest.java      |  21 +
 .../junit/ComposeWithNetworkTest.java         |  20 +
 .../resources/compose-build-test/Dockerfile   |   2 +-
 .../compose-build-test/docker-compose.yml     |   2 +-
 .../compose-v2-build-test/Dockerfile          |   3 +
 .../compose-v2-build-test/docker-compose.yml  |   6 +
 .../test/resources/composev2/compose-test.yml |   7 +
 .../composev2/scaled-compose-test.yml         |   3 +
 docs/modules/docker_compose.md                |  16 +
 28 files changed, 2136 insertions(+), 542 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/containers/ComposeContainer.java
 create mode 100644 core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
 create mode 100644 core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
 create mode 100644 core/src/main/java/org/testcontainers/containers/DockerCompose.java
 create mode 100644 core/src/main/java/org/testcontainers/containers/LocalDockerCompose.java
 create mode 100644 core/src/test/java/org/testcontainers/ComposeOverridesTest.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
 create mode 100644 core/src/test/resources/compose-v2-build-test/Dockerfile
 create mode 100644 core/src/test/resources/compose-v2-build-test/docker-compose.yml
 create mode 100644 core/src/test/resources/composev2/compose-test.yml
 create mode 100644 core/src/test/resources/composev2/scaled-compose-test.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 48238471563..e6e922b4e11 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,4 +1,6 @@
 "area/docker-compose":
+  - core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+  - core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
   - core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
   - core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
 "github_actions":
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
new file mode 100644
index 00000000000..081c71b3338
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
@@ -0,0 +1,384 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.model.Container;
+import com.google.common.annotations.VisibleForTesting;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.SystemUtils;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.File;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+
+/**
+ * Testcontainers implementation for Docker Compose V2. <br>
+ * It uses either Compose V2 contained within the Docker binary, or a containerised version of Compose V2.
+ */
+@Slf4j
+public class ComposeContainer extends FailureDetectingExternalResource implements Startable {
+
+    private final Map<String, Integer> scalingPreferences = new HashMap<>();
+
+    private boolean localCompose;
+
+    private boolean pull = true;
+
+    private boolean build = false;
+
+    private Set<String> options = new HashSet<>();
+
+    private boolean tailChildContainers;
+
+    private static final Object MUTEX = new Object();
+
+    private List<String> services = new ArrayList<>();
+
+    /**
+     * Properties that should be passed through to all Compose and ambassador containers (not
+     * necessarily to containers that are spawned by Compose itself)
+     */
+    private Map<String, String> env = new HashMap<>();
+
+    private RemoveImages removeImages;
+
+    private boolean removeVolumes = true;
+
+    public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker:24.0.2");
+
+    private final ComposeDelegate composeDelegate;
+
+    private String project;
+
+    public ComposeContainer(File... composeFiles) {
+        this(Arrays.asList(composeFiles));
+    }
+
+    public ComposeContainer(List<File> composeFiles) {
+        this(Base58.randomString(6).toLowerCase(), composeFiles);
+    }
+
+    public ComposeContainer(String identifier, File... composeFiles) {
+        this(identifier, Arrays.asList(composeFiles));
+    }
+
+    public ComposeContainer(String identifier, List<File> composeFiles) {
+        this.composeDelegate =
+            new ComposeDelegate(
+                ComposeDelegate.ComposeVersion.V2,
+                composeFiles,
+                identifier,
+                COMPOSE_EXECUTABLE,
+                DEFAULT_IMAGE_NAME
+            );
+        this.project = this.composeDelegate.getProject();
+    }
+
+    @Override
+    @Deprecated
+    public Statement apply(Statement base, Description description) {
+        return super.apply(base, description);
+    }
+
+    @Override
+    @Deprecated
+    public void starting(Description description) {
+        start();
+    }
+
+    @Override
+    @Deprecated
+    protected void succeeded(Description description) {}
+
+    @Override
+    @Deprecated
+    protected void failed(Throwable e, Description description) {}
+
+    @Override
+    @Deprecated
+    public void finished(Description description) {
+        stop();
+    }
+
+    @Override
+    public void start() {
+        synchronized (MUTEX) {
+            this.composeDelegate.registerContainersForShutdown();
+            if (pull) {
+                try {
+                    this.composeDelegate.pullImages();
+                } catch (ContainerLaunchException e) {
+                    log.warn("Exception while pulling images, using local images if available", e);
+                }
+            }
+            this.composeDelegate.createServices(
+                    this.localCompose,
+                    this.build,
+                    this.options,
+                    this.services,
+                    this.scalingPreferences,
+                    this.env
+                );
+            this.composeDelegate.startAmbassadorContainer();
+            this.composeDelegate.waitUntilServiceStarted(this.tailChildContainers);
+        }
+    }
+
+    @VisibleForTesting
+    List<Container> listChildContainers() {
+        return this.composeDelegate.listChildContainers();
+    }
+
+    public ComposeContainer withServices(@NonNull String... services) {
+        this.services = Arrays.asList(services);
+        return this;
+    }
+
+    @Override
+    public void stop() {
+        synchronized (MUTEX) {
+            try {
+                this.composeDelegate.getAmbassadorContainer().stop();
+
+                // Kill the services using docker
+                String cmd = "compose down";
+                if (removeVolumes) {
+                    cmd += " -v";
+                }
+                if (removeImages != null) {
+                    cmd += " --rmi " + removeImages.dockerRemoveImagesType();
+                }
+                this.composeDelegate.runWithCompose(this.localCompose, cmd);
+            } finally {
+                this.project = this.composeDelegate.randomProjectId();
+            }
+        }
+    }
+
+    public ComposeContainer withExposedService(String serviceName, int servicePort) {
+        this.composeDelegate.withExposedService(serviceName, servicePort, Wait.defaultWaitStrategy());
+        return this;
+    }
+
+    public ComposeContainer withExposedService(String serviceName, int instance, int servicePort) {
+        return withExposedService(serviceName + "-" + instance, servicePort);
+    }
+
+    public ComposeContainer withExposedService(
+        String serviceName,
+        int instance,
+        int servicePort,
+        WaitStrategy waitStrategy
+    ) {
+        this.composeDelegate.withExposedService(serviceName + "-" + instance, servicePort, waitStrategy);
+        return this;
+    }
+
+    public ComposeContainer withExposedService(
+        String serviceName,
+        int servicePort,
+        @NonNull WaitStrategy waitStrategy
+    ) {
+        this.composeDelegate.withExposedService(serviceName, servicePort, waitStrategy);
+        return this;
+    }
+
+    /**
+     * Specify the {@link WaitStrategy} to use to determine if the container is ready.
+     *
+     * @param serviceName  the name of the service to wait for
+     * @param waitStrategy the WaitStrategy to use
+     * @return this
+     * @see org.testcontainers.containers.wait.strategy.Wait#defaultWaitStrategy()
+     */
+    public ComposeContainer waitingFor(String serviceName, @NonNull WaitStrategy waitStrategy) {
+        String serviceInstanceName = this.composeDelegate.getServiceInstanceName(serviceName);
+        this.composeDelegate.addWaitStrategy(serviceInstanceName, waitStrategy);
+        return this;
+    }
+
+    /**
+     * Get the host (e.g. IP address or hostname) that an exposed service can be found at, from the host machine
+     * (i.e. should be the machine that's running this Java process).
+     * <p>
+     * The service must have been declared using ComposeContainer#withExposedService.
+     *
+     * @param serviceName the name of the service as set in the docker-compose.yml file.
+     * @param servicePort the port exposed by the service container.
+     * @return a host IP address or hostname that can be used for accessing the service container.
+     */
+    public String getServiceHost(String serviceName, Integer servicePort) {
+        return this.composeDelegate.getServiceHost();
+    }
+
+    /**
+     * Get the port that an exposed service can be found at, from the host machine
+     * (i.e. should be the machine that's running this Java process).
+     * <p>
+     * The service must have been declared using ComposeContainer#withExposedService.
+     *
+     * @param serviceName the name of the service as set in the docker-compose.yml file.
+     * @param servicePort the port exposed by the service container.
+     * @return a port that can be used for accessing the service container.
+     */
+    public Integer getServicePort(String serviceName, Integer servicePort) {
+        return this.composeDelegate.getServicePort(serviceName, servicePort);
+    }
+
+    public ComposeContainer withScaledService(String serviceBaseName, int numInstances) {
+        scalingPreferences.put(serviceBaseName, numInstances);
+        return this;
+    }
+
+    public ComposeContainer withEnv(String key, String value) {
+        env.put(key, value);
+        return this;
+    }
+
+    public ComposeContainer withEnv(Map<String, String> env) {
+        env.forEach(this.env::put);
+        return this;
+    }
+
+    /**
+     * Use a local Docker Compose binary instead of a container.
+     *
+     * @return this instance, for chaining
+     */
+    public ComposeContainer withLocalCompose(boolean localCompose) {
+        this.localCompose = localCompose;
+        return this;
+    }
+
+    /**
+     * Whether to pull images first.
+     *
+     * @return this instance, for chaining
+     */
+    public ComposeContainer withPull(boolean pull) {
+        this.pull = pull;
+        return this;
+    }
+
+    /**
+     * Whether to tail child container logs.
+     *
+     * @return this instance, for chaining
+     */
+    public ComposeContainer withTailChildContainers(boolean tailChildContainers) {
+        this.tailChildContainers = tailChildContainers;
+        return this;
+    }
+
+    /**
+     * Attach an output consumer at container startup, enabling stdout and stderr to be followed, waited on, etc.
+     * <p>
+     * More than one consumer may be registered.
+     *
+     * @param serviceName the name of the service as set in the docker-compose.yml file
+     * @param consumer    consumer that output frames should be sent to
+     * @return this instance, for chaining
+     */
+    public ComposeContainer withLogConsumer(String serviceName, Consumer<OutputFrame> consumer) {
+        this.composeDelegate.withLogConsumer(serviceName, consumer);
+        return this;
+    }
+
+    /**
+     * Whether to always build images before starting containers.
+     *
+     * @return this instance, for chaining
+     */
+    public ComposeContainer withBuild(boolean build) {
+        this.build = build;
+        return this;
+    }
+
+    /**
+     * Adds options to the docker command, e.g. docker --compatibility.
+     *
+     * @return this instance, for chaining
+     */
+    public ComposeContainer withOptions(String... options) {
+        this.options = new HashSet<>(Arrays.asList(options));
+        return this;
+    }
+
+    /**
+     * Remove images after containers shutdown.
+     *
+     * @return this instance, for chaining
+     */
+    public ComposeContainer withRemoveImages(ComposeContainer.RemoveImages removeImages) {
+        this.removeImages = removeImages;
+        return this;
+    }
+
+    /**
+     * Remove volumes after containers shut down.
+     *
+     * @param removeVolumes whether volumes are to be removed.
+     * @return this instance, for chaining.
+     */
+    public ComposeContainer withRemoveVolumes(boolean removeVolumes) {
+        this.removeVolumes = removeVolumes;
+        return this;
+    }
+
+    /**
+     * Set the maximum startup timeout all the waits set are bounded to.
+     *
+     * @return this instance. for chaining
+     */
+    public ComposeContainer withStartupTimeout(Duration startupTimeout) {
+        this.composeDelegate.setStartupTimeout(startupTimeout);
+        return this;
+    }
+
+    public Optional<ContainerState> getContainerByServiceName(String serviceName) {
+        return this.composeDelegate.getContainerByServiceName(serviceName);
+    }
+
+    private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
+        this.followLogs(containerId, consumer);
+    }
+
+    public enum RemoveImages {
+        /**
+         * Remove all images used by any service.
+         */
+        ALL("all"),
+
+        /**
+         * Remove only images that don't have a custom tag set by the `image` field.
+         */
+        LOCAL("local");
+
+        private final String dockerRemoveImagesType;
+
+        RemoveImages(final String dockerRemoveImagesType) {
+            this.dockerRemoveImagesType = dockerRemoveImagesType;
+        }
+
+        public String dockerRemoveImagesType() {
+            return dockerRemoveImagesType;
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
new file mode 100644
index 00000000000..a5189c8efa3
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
@@ -0,0 +1,417 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Container;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import com.google.common.collect.Sets;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.images.RemoteDockerImage;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.ImageNameSubstitutor;
+import org.testcontainers.utility.LogUtils;
+import org.testcontainers.utility.ResourceReaper;
+
+import java.io.File;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Slf4j
+class ComposeDelegate {
+
+    private final ComposeVersion composeVersion;
+
+    private final String composeSeparator;
+
+    private final DockerClient dockerClient;
+
+    private final List<File> composeFiles;
+
+    private final DockerComposeFiles dockerComposeFiles;
+
+    private final String identifier;
+
+    @Getter
+    private final String project;
+
+    private final String executable;
+
+    private final DockerImageName defaultImageName;
+
+    private final AtomicInteger nextAmbassadorPort = new AtomicInteger(2000);
+
+    private final Map<String, Map<Integer, Integer>> ambassadorPortMappings = new ConcurrentHashMap<>();
+
+    private final Map<String, List<Consumer<OutputFrame>>> logConsumers = new ConcurrentHashMap<>();
+
+    @Getter
+    private final SocatContainer ambassadorContainer = new SocatContainer();
+
+    private final Map<String, ComposeServiceWaitStrategyTarget> serviceInstanceMap = new ConcurrentHashMap<>();
+
+    private final Map<String, WaitAllStrategy> waitStrategyMap = new ConcurrentHashMap<>();
+
+    @Setter
+    private Duration startupTimeout = Duration.ofMinutes(30);
+
+    ComposeDelegate(
+        ComposeVersion composeVersion,
+        List<File> composeFiles,
+        String identifier,
+        String executable,
+        DockerImageName defaultImageName
+    ) {
+        this.composeVersion = composeVersion;
+        this.composeSeparator = composeVersion.getSeparator();
+        this.dockerClient = DockerClientFactory.lazyClient();
+        this.composeFiles = composeFiles;
+        this.dockerComposeFiles = new DockerComposeFiles(this.composeFiles);
+        this.identifier = identifier.toLowerCase();
+        this.project = randomProjectId();
+        this.executable = executable;
+        this.defaultImageName = defaultImageName;
+    }
+
+    void pullImages() {
+        // Pull images using our docker client rather than compose itself,
+        // (a) as a workaround for https://github.com/docker/compose/issues/5854, which prevents authenticated image pulls being possible when credential helpers are in use
+        // (b) so that credential helper-based auth still works when compose is running from within a container
+        this.dockerComposeFiles.getDependencyImages()
+            .forEach(imageName -> {
+                try {
+                    log.info(
+                        "Preemptively checking local images for '{}', referenced via a compose file or transitive Dockerfile. If not available, it will be pulled.",
+                        imageName
+                    );
+                    new RemoteDockerImage(DockerImageName.parse(imageName))
+                        .withImageNameSubstitutor(ImageNameSubstitutor.noop())
+                        .get();
+                } catch (Exception e) {
+                    log.warn(
+                        "Unable to pre-fetch an image ({}) depended upon by Docker Compose build - startup will continue but may fail. Exception message was: {}",
+                        imageName,
+                        e.getMessage()
+                    );
+                }
+            });
+    }
+
+    void createServices(
+        boolean localCompose,
+        boolean build,
+        final Set<String> options,
+        final List<String> services,
+        final Map<String, Integer> scalingPreferences,
+        Map<String, String> env
+    ) {
+        // services that have been explicitly requested to be started. If empty, all services should be started.
+        final String serviceNameArgs = Stream
+            .concat(
+                services.stream(), // services that have been specified with `withServices`
+                scalingPreferences.keySet().stream() // services that are implicitly needed via `withScaledService`
+            )
+            .distinct()
+            .collect(Collectors.joining(" "));
+
+        // Apply scaling for the services specified using `withScaledService`
+        final String scalingOptions = scalingPreferences
+            .entrySet()
+            .stream()
+            .map(entry -> "--scale " + entry.getKey() + "=" + entry.getValue())
+            .distinct()
+            .collect(Collectors.joining(" "));
+
+        String command = getUpCommand(optionsAsString(options));
+
+        if (build) {
+            command += " --build";
+        }
+
+        if (!Strings.isNullOrEmpty(scalingOptions)) {
+            command += " " + scalingOptions;
+        }
+
+        if (!Strings.isNullOrEmpty(serviceNameArgs)) {
+            command += " " + serviceNameArgs;
+        }
+
+        // Run the docker compose container, which starts up the services
+        runWithCompose(localCompose, command, env);
+    }
+
+    private String getUpCommand(String options) {
+        if (options == null || options.equals("")) {
+            return this.composeVersion == ComposeVersion.V1 ? "up -d" : "compose up -d";
+        }
+        String cmd = this.composeVersion == ComposeVersion.V1 ? "%s up -d" : "compose %s up -d";
+        return String.format(cmd, options);
+    }
+
+    private String optionsAsString(final Set<String> options) {
+        String optionsString = options.stream().collect(Collectors.joining(" "));
+        if (optionsString.length() != 0) {
+            // ensures that there is a space between the options and 'up' if options are passed.
+            return optionsString;
+        } else {
+            // otherwise two spaces would appear between 'docker-compose' and 'up'
+            return StringUtils.EMPTY;
+        }
+    }
+
+    void waitUntilServiceStarted(boolean tailChildContainers) {
+        listChildContainers().forEach(container -> createServiceInstance(container, tailChildContainers));
+
+        Set<String> servicesToWaitFor = waitStrategyMap.keySet();
+        Set<String> instantiatedServices = serviceInstanceMap.keySet();
+        Sets.SetView<String> missingServiceInstances = Sets.difference(servicesToWaitFor, instantiatedServices);
+
+        if (!missingServiceInstances.isEmpty()) {
+            throw new IllegalStateException(
+                "Services named " +
+                missingServiceInstances +
+                " " +
+                "do not exist, but wait conditions have been defined " +
+                "for them. This might mean that you misspelled " +
+                "the service name when defining the wait condition."
+            );
+        }
+
+        serviceInstanceMap.forEach(this::waitUntilServiceStarted);
+    }
+
+    private void createServiceInstance(Container container, boolean tailChildContainers) {
+        String serviceName = getServiceNameFromContainer(container);
+        final ComposeServiceWaitStrategyTarget containerInstance = new ComposeServiceWaitStrategyTarget(
+            dockerClient,
+            container,
+            ambassadorContainer,
+            ambassadorPortMappings.getOrDefault(serviceName, new HashMap<>())
+        );
+
+        String containerId = containerInstance.getContainerId();
+        if (tailChildContainers) {
+            followLogs(containerId, new Slf4jLogConsumer(log).withPrefix(container.getNames()[0]));
+        }
+        //follow logs using registered consumers for this service
+        logConsumers
+            .getOrDefault(serviceName, Collections.emptyList())
+            .forEach(consumer -> followLogs(containerId, consumer));
+        serviceInstanceMap.putIfAbsent(serviceName, containerInstance);
+    }
+
+    private void waitUntilServiceStarted(String serviceName, ComposeServiceWaitStrategyTarget serviceInstance) {
+        final WaitAllStrategy waitAllStrategy = waitStrategyMap.get(serviceName);
+        if (waitAllStrategy != null) {
+            waitAllStrategy.waitUntilReady(serviceInstance);
+        }
+    }
+
+    private String getServiceNameFromContainer(com.github.dockerjava.api.model.Container container) {
+        final String containerName = container.getLabels().get("com.docker.compose.service");
+        final String containerNumber = container.getLabels().get("com.docker.compose.container-number");
+        return String.format("%s%s%s", containerName, this.composeSeparator, containerNumber);
+    }
+
+    public void runWithCompose(boolean localCompose, String cmd) {
+        runWithCompose(localCompose, cmd, Collections.emptyMap());
+    }
+
+    public void runWithCompose(boolean localCompose, String cmd, Map<String, String> env) {
+        Preconditions.checkNotNull(composeFiles);
+        Preconditions.checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
+
+        final DockerCompose dockerCompose;
+        if (localCompose) {
+            dockerCompose = new LocalDockerCompose(this.executable, composeFiles, project);
+        } else {
+            dockerCompose = new ContainerisedDockerCompose(this.defaultImageName, composeFiles, project);
+        }
+
+        dockerCompose.withCommand(cmd).withEnv(env).invoke();
+    }
+
+    void registerContainersForShutdown() {
+        ResourceReaper
+            .instance()
+            .registerLabelsFilterForCleanup(Collections.singletonMap("com.docker.compose.project", project));
+    }
+
+    @VisibleForTesting
+    List<Container> listChildContainers() {
+        return dockerClient
+            .listContainersCmd()
+            .withShowAll(true)
+            .exec()
+            .stream()
+            .filter(container -> Arrays.stream(container.getNames()).anyMatch(name -> name.startsWith("/" + project)))
+            .collect(Collectors.toList());
+    }
+
+    void startAmbassadorContainer() {
+        if (!this.ambassadorPortMappings.isEmpty()) {
+            this.ambassadorContainer.start();
+        }
+    }
+
+    public void withExposedService(String serviceName, int servicePort) {
+        withExposedService(serviceName, servicePort, Wait.defaultWaitStrategy());
+    }
+
+    public void withExposedService(String serviceName, int instance, int servicePort) {
+        withExposedService(serviceName + this.composeSeparator + instance, servicePort);
+    }
+
+    public void withExposedService(String serviceName, int instance, int servicePort, WaitStrategy waitStrategy) {
+        withExposedService(serviceName + this.composeSeparator + instance, servicePort, waitStrategy);
+    }
+
+    public void withExposedService(String serviceName, int servicePort, @NonNull WaitStrategy waitStrategy) {
+        String serviceInstanceName = getServiceInstanceName(serviceName);
+
+        /*
+         * For every service/port pair that needs to be exposed, we register a target on an 'ambassador container'.
+         *
+         * The ambassador container's role is to link (within the Docker network) to one of the
+         * compose services, and proxy TCP network I/O out to a port that the ambassador container
+         * exposes.
+         *
+         * This avoids the need for the docker compose file to explicitly expose ports on all the
+         * services.
+         *
+         * {@link GenericContainer} should ensure that the ambassador container is on the same network
+         * as the rest of the compose environment.
+         */
+
+        // Ambassador container will be started together after docker compose has started
+        int ambassadorPort = nextAmbassadorPort.getAndIncrement();
+        ambassadorPortMappings
+            .computeIfAbsent(serviceInstanceName, __ -> new ConcurrentHashMap<>())
+            .put(servicePort, ambassadorPort);
+        ambassadorContainer.withTarget(ambassadorPort, serviceInstanceName, servicePort);
+        ambassadorContainer.addLink(
+            new FutureContainer(this.project + this.composeSeparator + serviceInstanceName),
+            serviceInstanceName
+        );
+        addWaitStrategy(serviceInstanceName, waitStrategy);
+    }
+
+    String getServiceInstanceName(String serviceName) {
+        String serviceInstanceName = serviceName;
+        String regex = String.format(".*%s[0-9]+", this.composeSeparator);
+        if (!serviceInstanceName.matches(regex)) {
+            serviceInstanceName += String.format("%s1", this.composeSeparator); // implicit first instance of this service
+        }
+        return serviceInstanceName;
+    }
+
+    /*
+     * can have multiple wait strategies for a single container, e.g. if waiting on several ports
+     * if no wait strategy is defined, the WaitAllStrategy will return immediately.
+     * The WaitAllStrategy uses the startup timeout for everything as a global maximum, but we expect timeouts to be handled by the inner strategies.
+     */
+    void addWaitStrategy(String serviceInstanceName, @NonNull WaitStrategy waitStrategy) {
+        final WaitAllStrategy waitAllStrategy = waitStrategyMap.computeIfAbsent(
+            serviceInstanceName,
+            __ -> {
+                return new WaitAllStrategy(WaitAllStrategy.Mode.WITH_MAXIMUM_OUTER_TIMEOUT)
+                    .withStartupTimeout(startupTimeout);
+            }
+        );
+        waitAllStrategy.withStrategy(waitStrategy);
+    }
+
+    /**
+     * Get the port that an exposed service can be found at, from the host machine
+     * (i.e. should be the machine that's running this Java process).
+     * <p>
+     * The service must have been declared using DockerComposeContainer#withExposedService.
+     *
+     * @param serviceName the name of the service as set in the docker-compose.yml file.
+     * @param servicePort the port exposed by the service container.
+     * @return a port that can be used for accessing the service container.
+     */
+    public Integer getServicePort(String serviceName, Integer servicePort) {
+        Map<Integer, Integer> portMap = this.ambassadorPortMappings.get(getServiceInstanceName(serviceName));
+
+        if (portMap == null) {
+            throw new IllegalArgumentException(
+                "Could not get a port for '" +
+                serviceName +
+                "'. " +
+                "Testcontainers does not have an exposed port configured for '" +
+                serviceName +
+                "'. " +
+                "To fix, please ensure that the service '" +
+                serviceName +
+                "' has ports exposed using .withExposedService(...)"
+            );
+        } else {
+            return ambassadorContainer.getMappedPort(portMap.get(servicePort));
+        }
+    }
+
+    Optional<ContainerState> getContainerByServiceName(String serviceName) {
+        String serviceInstantName = getServiceInstanceName(serviceName);
+        return Optional.ofNullable(serviceInstanceMap.get(serviceInstantName));
+    }
+
+    private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
+        LogUtils.followOutput(dockerClient, containerId, consumer);
+    }
+
+    String randomProjectId() {
+        return this.identifier + Base58.randomString(6).toLowerCase();
+    }
+
+    void withLogConsumer(String serviceName, Consumer<OutputFrame> consumer) {
+        String serviceInstanceName = getServiceInstanceName(serviceName);
+        final List<Consumer<OutputFrame>> consumers =
+            this.logConsumers.getOrDefault(serviceInstanceName, new ArrayList<>());
+        consumers.add(consumer);
+        this.logConsumers.putIfAbsent(serviceInstanceName, consumers);
+    }
+
+    String getServiceHost() {
+        return this.ambassadorContainer.getHost();
+    }
+
+    enum ComposeVersion {
+        V1("_"),
+
+        V2("-");
+
+        private final String separator;
+
+        ComposeVersion(String separator) {
+            this.separator = separator;
+        }
+
+        public String getSeparator() {
+            return this.separator;
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java b/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
new file mode 100644
index 00000000000..e1b7aaa604b
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
@@ -0,0 +1,98 @@
+package org.testcontainers.containers;
+
+import com.google.common.base.Joiner;
+import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.startupcheck.IndefiniteWaitOneShotStartupCheckStrategy;
+import org.testcontainers.utility.AuditLogger;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+import org.testcontainers.utility.PathUtils;
+
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * Use Docker Compose container.
+ */
+class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
+
+    public static final char UNIX_PATH_SEPARATOR = ':';
+
+    public ContainerisedDockerCompose(DockerImageName dockerImageName, List<File> composeFiles, String identifier) {
+        super(dockerImageName);
+        addEnv(ENV_PROJECT_NAME, identifier);
+
+        // Map the docker compose file into the container
+        final File dockerComposeBaseFile = composeFiles.get(0);
+        final String pwd = dockerComposeBaseFile.getAbsoluteFile().getParentFile().getAbsolutePath();
+        final String containerPwd = convertToUnixFilesystemPath(pwd);
+
+        final List<String> absoluteDockerComposeFiles = composeFiles
+            .stream()
+            .map(File::getAbsolutePath)
+            .map(MountableFile::forHostPath)
+            .map(MountableFile::getFilesystemPath)
+            .map(this::convertToUnixFilesystemPath)
+            .collect(Collectors.toList());
+        final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPARATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
+        logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
+        addEnv(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
+        withCopyFileToContainer(MountableFile.forHostPath(pwd), containerPwd);
+
+        // Ensure that compose can access docker. Since the container is assumed to be running on the same machine
+        //  as the docker daemon, just mapping the docker control socket is OK.
+        // As there seems to be a problem with mapping to the /var/run directory in certain environments (e.g. CircleCI)
+        //  we map the socket file outside of /var/run, as just /docker.sock
+        addFileSystemBind(
+            DockerClientFactory.instance().getRemoteDockerUnixSocketPath(),
+            "/docker.sock",
+            BindMode.READ_WRITE
+        );
+        addEnv("DOCKER_HOST", "unix:///docker.sock");
+        setStartupCheckStrategy(new IndefiniteWaitOneShotStartupCheckStrategy());
+        setWorkingDirectory(containerPwd);
+    }
+
+    @Override
+    public void invoke() {
+        super.start();
+
+        this.followOutput(new Slf4jLogConsumer(logger()));
+
+        // wait for the compose container to stop, which should only happen after it has spawned all the service containers
+        logger()
+            .info("Docker Compose container is running for command: {}", Joiner.on(" ").join(this.getCommandParts()));
+        while (this.isRunning()) {
+            logger().trace("Compose container is still running");
+            Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+        }
+        logger().info("Docker Compose has finished running");
+
+        AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
+
+        final Integer exitCode = getDockerClient()
+            .inspectContainerCmd(getContainerId())
+            .exec()
+            .getState()
+            .getExitCode();
+
+        if (exitCode == null || exitCode != 0) {
+            throw new ContainerLaunchException(
+                "Containerised Docker Compose exited abnormally with code " +
+                exitCode +
+                " whilst running command: " +
+                StringUtils.join(this.getCommandParts(), ' ')
+            );
+        }
+    }
+
+    private String convertToUnixFilesystemPath(String path) {
+        return SystemUtils.IS_OS_WINDOWS ? PathUtils.createMinGWPath(path).substring(1) : path;
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/containers/DockerCompose.java b/core/src/main/java/org/testcontainers/containers/DockerCompose.java
new file mode 100644
index 00000000000..e1d2b3ead64
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/DockerCompose.java
@@ -0,0 +1,14 @@
+package org.testcontainers.containers;
+
+import java.util.Map;
+
+interface DockerCompose {
+    String ENV_PROJECT_NAME = "COMPOSE_PROJECT_NAME";
+    String ENV_COMPOSE_FILE = "COMPOSE_FILE";
+
+    DockerCompose withCommand(String cmd);
+
+    DockerCompose withEnv(Map<String, String> env);
+
+    void invoke();
+}
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 0e2b8a34734..3a8ab5b4ddc 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -1,66 +1,30 @@
 package org.testcontainers.containers;
 
-import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.core.LocalDirectorySSLConfig;
-import com.github.dockerjava.transport.SSLConfig;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.Uninterruptibles;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import org.slf4j.Logger;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.containers.startupcheck.IndefiniteWaitOneShotStartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
-import org.testcontainers.dockerclient.TransportConfig;
-import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.lifecycle.Startable;
-import org.testcontainers.utility.AuditLogger;
 import org.testcontainers.utility.Base58;
-import org.testcontainers.utility.CommandLine;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.DockerLoggerFactory;
-import org.testcontainers.utility.ImageNameSubstitutor;
-import org.testcontainers.utility.LogUtils;
-import org.testcontainers.utility.MountableFile;
-import org.testcontainers.utility.PathUtils;
-import org.testcontainers.utility.ResourceReaper;
-import org.zeroturnaround.exec.InvalidExitValueException;
-import org.zeroturnaround.exec.ProcessExecutor;
-import org.zeroturnaround.exec.stream.slf4j.Slf4jStream;
 
 import java.io.File;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Container which launches Docker Compose, for the purposes of launching a defined set of containers.
@@ -70,19 +34,8 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
     extends FailureDetectingExternalResource
     implements Startable {
 
-    /**
-     * Random identifier which will become part of spawned containers names, so we can shut them down
-     */
-    private final String identifier;
-
-    private final List<File> composeFiles;
-
-    private DockerComposeFiles dockerComposeFiles;
-
     private final Map<String, Integer> scalingPreferences = new HashMap<>();
 
-    private DockerClient dockerClient;
-
     private boolean localCompose;
 
     private boolean pull = true;
@@ -93,22 +46,6 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
 
     private boolean tailChildContainers;
 
-    private String project;
-
-    private final AtomicInteger nextAmbassadorPort = new AtomicInteger(2000);
-
-    private final Map<String, Map<Integer, Integer>> ambassadorPortMappings = new ConcurrentHashMap<>();
-
-    private final Map<String, ComposeServiceWaitStrategyTarget> serviceInstanceMap = new ConcurrentHashMap<>();
-
-    private final Map<String, WaitAllStrategy> waitStrategyMap = new ConcurrentHashMap<>();
-
-    private Duration startupTimeout = Duration.ofMinutes(30);
-
-    private final SocatContainer ambassadorContainer = new SocatContainer();
-
-    private final Map<String, List<Consumer<OutputFrame>>> logConsumers = new ConcurrentHashMap<>();
-
     private static final Object MUTEX = new Object();
 
     private List<String> services = new ArrayList<>();
@@ -123,6 +60,14 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
 
     private boolean removeVolumes = true;
 
+    public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker-compose.exe" : "docker-compose";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.29.2");
+
+    private final ComposeDelegate composeDelegate;
+
+    private String project;
+
     @Deprecated
     public DockerComposeContainer(File composeFile, String identifier) {
         this(identifier, composeFile);
@@ -141,14 +86,15 @@ public DockerComposeContainer(String identifier, File... composeFiles) {
     }
 
     public DockerComposeContainer(String identifier, List<File> composeFiles) {
-        this.composeFiles = composeFiles;
-        this.dockerComposeFiles = new DockerComposeFiles(composeFiles);
-
-        // Use a unique identifier so that containers created for this compose environment can be identified
-        this.identifier = identifier.toLowerCase();
-        this.project = randomProjectId();
-
-        this.dockerClient = DockerClientFactory.lazyClient();
+        this.composeDelegate =
+            new ComposeDelegate(
+                ComposeDelegate.ComposeVersion.V1,
+                composeFiles,
+                identifier,
+                COMPOSE_EXECUTABLE,
+                DEFAULT_IMAGE_NAME
+            );
+        this.project = this.composeDelegate.getProject();
     }
 
     @Override
@@ -180,43 +126,30 @@ public void finished(Description description) {
     @Override
     public void start() {
         synchronized (MUTEX) {
-            registerContainersForShutdown();
+            this.composeDelegate.registerContainersForShutdown();
             if (pull) {
                 try {
-                    pullImages();
+                    this.composeDelegate.pullImages();
                 } catch (ContainerLaunchException e) {
                     log.warn("Exception while pulling images, using local images if available", e);
                 }
             }
-            createServices();
-            startAmbassadorContainers();
-            waitUntilServiceStarted();
+            this.composeDelegate.createServices(
+                    this.localCompose,
+                    this.build,
+                    this.options,
+                    this.services,
+                    this.scalingPreferences,
+                    this.env
+                );
+            this.composeDelegate.startAmbassadorContainer();
+            this.composeDelegate.waitUntilServiceStarted(this.tailChildContainers);
         }
     }
 
-    private void pullImages() {
-        // Pull images using our docker client rather than compose itself,
-        // (a) as a workaround for https://github.com/docker/compose/issues/5854, which prevents authenticated image pulls being possible when credential helpers are in use
-        // (b) so that credential helper-based auth still works when compose is running from within a container
-        dockerComposeFiles
-            .getDependencyImages()
-            .forEach(imageName -> {
-                try {
-                    log.info(
-                        "Preemptively checking local images for '{}', referenced via a compose file or transitive Dockerfile. If not available, it will be pulled.",
-                        imageName
-                    );
-                    new RemoteDockerImage(DockerImageName.parse(imageName))
-                        .withImageNameSubstitutor(ImageNameSubstitutor.noop())
-                        .get();
-                } catch (Exception e) {
-                    log.warn(
-                        "Unable to pre-fetch an image ({}) depended upon by Docker Compose build - startup will continue but may fail. Exception message was: {}",
-                        imageName,
-                        e.getMessage()
-                    );
-                }
-            });
+    @VisibleForTesting
+    List<Container> listChildContainers() {
+        return this.composeDelegate.listChildContainers();
     }
 
     public SELF withServices(@NonNull String... services) {
@@ -224,150 +157,11 @@ public SELF withServices(@NonNull String... services) {
         return self();
     }
 
-    private void createServices() {
-        // services that have been explicitly requested to be started. If empty, all services should be started.
-        final String serviceNameArgs = Stream
-            .concat(
-                services.stream(), // services that have been specified with `withServices`
-                scalingPreferences.keySet().stream() // services that are implicitly needed via `withScaledService`
-            )
-            .distinct()
-            .collect(Collectors.joining(" "));
-
-        // Apply scaling for the services specified using `withScaledService`
-        final String scalingOptions = scalingPreferences
-            .entrySet()
-            .stream()
-            .map(entry -> "--scale " + entry.getKey() + "=" + entry.getValue())
-            .distinct()
-            .collect(Collectors.joining(" "));
-
-        String command = optionsAsString() + "up -d";
-
-        if (build) {
-            command += " --build";
-        }
-
-        if (!Strings.isNullOrEmpty(scalingOptions)) {
-            command += " " + scalingOptions;
-        }
-
-        if (!Strings.isNullOrEmpty(serviceNameArgs)) {
-            command += " " + serviceNameArgs;
-        }
-
-        // Run the docker-compose container, which starts up the services
-        runWithCompose(command);
-    }
-
-    private String optionsAsString() {
-        String optionsString = options.stream().collect(Collectors.joining(" "));
-        if (optionsString.length() != 0) {
-            // ensures that there is a space between the options and 'up' if options are passed.
-            return optionsString + " ";
-        } else {
-            // otherwise two spaces would appear between 'docker-compose' and 'up'
-            return StringUtils.EMPTY;
-        }
-    }
-
-    private void waitUntilServiceStarted() {
-        listChildContainers().forEach(this::createServiceInstance);
-
-        Set<String> servicesToWaitFor = waitStrategyMap.keySet();
-        Set<String> instantiatedServices = serviceInstanceMap.keySet();
-        Sets.SetView<String> missingServiceInstances = Sets.difference(servicesToWaitFor, instantiatedServices);
-
-        if (!missingServiceInstances.isEmpty()) {
-            throw new IllegalStateException(
-                "Services named " +
-                missingServiceInstances +
-                " " +
-                "do not exist, but wait conditions have been defined " +
-                "for them. This might mean that you misspelled " +
-                "the service name when defining the wait condition."
-            );
-        }
-
-        serviceInstanceMap.forEach(this::waitUntilServiceStarted);
-    }
-
-    private void createServiceInstance(Container container) {
-        String serviceName = getServiceNameFromContainer(container);
-        final ComposeServiceWaitStrategyTarget containerInstance = new ComposeServiceWaitStrategyTarget(
-            dockerClient,
-            container,
-            ambassadorContainer,
-            ambassadorPortMappings.getOrDefault(serviceName, new HashMap<>())
-        );
-
-        String containerId = containerInstance.getContainerId();
-        if (tailChildContainers) {
-            followLogs(containerId, new Slf4jLogConsumer(log).withPrefix(container.getNames()[0]));
-        }
-        //follow logs using registered consumers for this service
-        logConsumers
-            .getOrDefault(serviceName, Collections.emptyList())
-            .forEach(consumer -> followLogs(containerId, consumer));
-        serviceInstanceMap.putIfAbsent(serviceName, containerInstance);
-    }
-
-    private void waitUntilServiceStarted(String serviceName, ComposeServiceWaitStrategyTarget serviceInstance) {
-        final WaitAllStrategy waitAllStrategy = waitStrategyMap.get(serviceName);
-        if (waitAllStrategy != null) {
-            waitAllStrategy.waitUntilReady(serviceInstance);
-        }
-    }
-
-    private String getServiceNameFromContainer(Container container) {
-        final String containerName = container.getLabels().get("com.docker.compose.service");
-        final String containerNumber = container.getLabels().get("com.docker.compose.container-number");
-        return String.format("%s_%s", containerName, containerNumber);
-    }
-
-    private void runWithCompose(String cmd) {
-        Preconditions.checkNotNull(composeFiles);
-        Preconditions.checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
-
-        final DockerCompose dockerCompose;
-        if (localCompose) {
-            dockerCompose = new LocalDockerCompose(composeFiles, project);
-        } else {
-            dockerCompose = new ContainerisedDockerCompose(composeFiles, project);
-        }
-
-        dockerCompose.withCommand(cmd).withEnv(env).invoke();
-    }
-
-    private void registerContainersForShutdown() {
-        ResourceReaper
-            .instance()
-            .registerLabelsFilterForCleanup(Collections.singletonMap("com.docker.compose.project", project));
-    }
-
-    @VisibleForTesting
-    List<Container> listChildContainers() {
-        return dockerClient
-            .listContainersCmd()
-            .withShowAll(true)
-            .exec()
-            .stream()
-            .filter(container -> Arrays.stream(container.getNames()).anyMatch(name -> name.startsWith("/" + project)))
-            .collect(Collectors.toList());
-    }
-
-    private void startAmbassadorContainers() {
-        if (!ambassadorPortMappings.isEmpty()) {
-            ambassadorContainer.start();
-        }
-    }
-
     @Override
     public void stop() {
         synchronized (MUTEX) {
             try {
-                // shut down the ambassador container
-                ambassadorContainer.stop();
+                this.composeDelegate.getAmbassadorContainer().stop();
 
                 // Kill the services using docker-compose
                 String cmd = "down";
@@ -378,15 +172,16 @@ public void stop() {
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
-                runWithCompose(cmd);
+                this.composeDelegate.runWithCompose(this.localCompose, cmd);
             } finally {
-                project = randomProjectId();
+                this.project = this.composeDelegate.randomProjectId();
             }
         }
     }
 
     public SELF withExposedService(String serviceName, int servicePort) {
-        return withExposedService(serviceName, servicePort, Wait.defaultWaitStrategy());
+        this.composeDelegate.withExposedService(serviceName, servicePort, Wait.defaultWaitStrategy());
+        return self();
     }
 
     public DockerComposeContainer withExposedService(String serviceName, int instance, int servicePort) {
@@ -399,61 +194,15 @@ public DockerComposeContainer withExposedService(
         int servicePort,
         WaitStrategy waitStrategy
     ) {
-        return withExposedService(serviceName + "_" + instance, servicePort, waitStrategy);
+        this.composeDelegate.withExposedService(serviceName + "_" + instance, servicePort, waitStrategy);
+        return self();
     }
 
     public SELF withExposedService(String serviceName, int servicePort, @NonNull WaitStrategy waitStrategy) {
-        String serviceInstanceName = getServiceInstanceName(serviceName);
-
-        /*
-         * For every service/port pair that needs to be exposed, we register a target on an 'ambassador container'.
-         *
-         * The ambassador container's role is to link (within the Docker network) to one of the
-         * compose services, and proxy TCP network I/O out to a port that the ambassador container
-         * exposes.
-         *
-         * This avoids the need for the docker compose file to explicitly expose ports on all the
-         * services.
-         *
-         * {@link GenericContainer} should ensure that the ambassador container is on the same network
-         * as the rest of the compose environment.
-         */
-
-        // Ambassador container will be started together after docker compose has started
-        int ambassadorPort = nextAmbassadorPort.getAndIncrement();
-        ambassadorPortMappings
-            .computeIfAbsent(serviceInstanceName, __ -> new ConcurrentHashMap<>())
-            .put(servicePort, ambassadorPort);
-        ambassadorContainer.withTarget(ambassadorPort, serviceInstanceName, servicePort);
-        ambassadorContainer.addLink(new FutureContainer(this.project + "_" + serviceInstanceName), serviceInstanceName);
-        addWaitStrategy(serviceInstanceName, waitStrategy);
+        this.composeDelegate.withExposedService(serviceName, servicePort, waitStrategy);
         return self();
     }
 
-    private String getServiceInstanceName(String serviceName) {
-        String serviceInstanceName = serviceName;
-        if (!serviceInstanceName.matches(".*_[0-9]+")) {
-            serviceInstanceName += "_1"; // implicit first instance of this service
-        }
-        return serviceInstanceName;
-    }
-
-    /*
-     * can have multiple wait strategies for a single container, e.g. if waiting on several ports
-     * if no wait strategy is defined, the WaitAllStrategy will return immediately.
-     * The WaitAllStrategy uses the startup timeout for everything as a global maximum, but we expect timeouts to be handled by the inner strategies.
-     */
-    private void addWaitStrategy(String serviceInstanceName, @NonNull WaitStrategy waitStrategy) {
-        final WaitAllStrategy waitAllStrategy = waitStrategyMap.computeIfAbsent(
-            serviceInstanceName,
-            __ -> {
-                return new WaitAllStrategy(WaitAllStrategy.Mode.WITH_MAXIMUM_OUTER_TIMEOUT)
-                    .withStartupTimeout(startupTimeout);
-            }
-        );
-        waitAllStrategy.withStrategy(waitStrategy);
-    }
-
     /**
      * Specify the {@link WaitStrategy} to use to determine if the container is ready.
      *
@@ -463,8 +212,8 @@ private void addWaitStrategy(String serviceInstanceName, @NonNull WaitStrategy w
      * @see org.testcontainers.containers.wait.strategy.Wait#defaultWaitStrategy()
      */
     public SELF waitingFor(String serviceName, @NonNull WaitStrategy waitStrategy) {
-        String serviceInstanceName = getServiceInstanceName(serviceName);
-        addWaitStrategy(serviceInstanceName, waitStrategy);
+        String serviceInstanceName = this.composeDelegate.getServiceInstanceName(serviceName);
+        this.composeDelegate.addWaitStrategy(serviceInstanceName, waitStrategy);
         return self();
     }
 
@@ -479,7 +228,7 @@ public SELF waitingFor(String serviceName, @NonNull WaitStrategy waitStrategy) {
      * @return a host IP address or hostname that can be used for accessing the service container.
      */
     public String getServiceHost(String serviceName, Integer servicePort) {
-        return ambassadorContainer.getHost();
+        return this.composeDelegate.getServiceHost();
     }
 
     /**
@@ -493,28 +242,11 @@ public String getServiceHost(String serviceName, Integer servicePort) {
      * @return a port that can be used for accessing the service container.
      */
     public Integer getServicePort(String serviceName, Integer servicePort) {
-        Map<Integer, Integer> portMap = ambassadorPortMappings.get(getServiceInstanceName(serviceName));
-
-        if (portMap == null) {
-            throw new IllegalArgumentException(
-                "Could not get a port for '" +
-                serviceName +
-                "'. " +
-                "Testcontainers does not have an exposed port configured for '" +
-                serviceName +
-                "'. " +
-                "To fix, please ensure that the service '" +
-                serviceName +
-                "' has ports exposed using .withExposedService(...)"
-            );
-        } else {
-            return ambassadorContainer.getMappedPort(portMap.get(servicePort));
-        }
+        return this.composeDelegate.getServicePort(serviceName, servicePort);
     }
 
     public SELF withScaledService(String serviceBaseName, int numInstances) {
         scalingPreferences.put(serviceBaseName, numInstances);
-
         return self();
     }
 
@@ -568,11 +300,7 @@ public SELF withTailChildContainers(boolean tailChildContainers) {
      * @return this instance, for chaining
      */
     public SELF withLogConsumer(String serviceName, Consumer<OutputFrame> consumer) {
-        String serviceInstanceName = getServiceInstanceName(serviceName);
-        final List<Consumer<OutputFrame>> consumers =
-            this.logConsumers.getOrDefault(serviceInstanceName, new ArrayList<>());
-        consumers.add(consumer);
-        this.logConsumers.putIfAbsent(serviceInstanceName, consumers);
+        this.composeDelegate.withLogConsumer(serviceName, consumer);
         return self();
     }
 
@@ -623,27 +351,22 @@ public SELF withRemoveVolumes(boolean removeVolumes) {
      * @return this instance. for chaining
      */
     public SELF withStartupTimeout(Duration startupTimeout) {
-        this.startupTimeout = startupTimeout;
+        this.composeDelegate.setStartupTimeout(startupTimeout);
         return self();
     }
 
     public Optional<ContainerState> getContainerByServiceName(String serviceName) {
-        String serviceInstantName = getServiceInstanceName(serviceName);
-        return Optional.ofNullable(serviceInstanceMap.get(serviceInstantName));
+        return this.composeDelegate.getContainerByServiceName(serviceName);
     }
 
     private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
-        LogUtils.followOutput(dockerClient, containerId, consumer);
+        this.followLogs(containerId, consumer);
     }
 
     private SELF self() {
         return (SELF) this;
     }
 
-    private String randomProjectId() {
-        return identifier + Base58.randomString(6).toLowerCase();
-    }
-
     public enum RemoveImages {
         /**
          * Remove all images used by any service.
@@ -666,217 +389,3 @@ public String dockerRemoveImagesType() {
         }
     }
 }
-
-interface DockerCompose {
-    String ENV_PROJECT_NAME = "COMPOSE_PROJECT_NAME";
-    String ENV_COMPOSE_FILE = "COMPOSE_FILE";
-
-    DockerCompose withCommand(String cmd);
-
-    DockerCompose withEnv(Map<String, String> env);
-
-    void invoke();
-}
-
-/**
- * Use Docker Compose container.
- */
-class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
-
-    public static final char UNIX_PATH_SEPERATOR = ':';
-
-    public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.29.2");
-
-    public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
-        super(DEFAULT_IMAGE_NAME);
-        addEnv(ENV_PROJECT_NAME, identifier);
-
-        // Map the docker compose file into the container
-        final File dockerComposeBaseFile = composeFiles.get(0);
-        final String pwd = dockerComposeBaseFile.getAbsoluteFile().getParentFile().getAbsolutePath();
-        final String containerPwd = convertToUnixFilesystemPath(pwd);
-
-        final List<String> absoluteDockerComposeFiles = composeFiles
-            .stream()
-            .map(File::getAbsolutePath)
-            .map(MountableFile::forHostPath)
-            .map(MountableFile::getFilesystemPath)
-            .map(this::convertToUnixFilesystemPath)
-            .collect(Collectors.toList());
-        final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPERATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
-        logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
-        addEnv(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
-        withCopyFileToContainer(MountableFile.forHostPath(pwd), containerPwd);
-
-        // Ensure that compose can access docker. Since the container is assumed to be running on the same machine
-        //  as the docker daemon, just mapping the docker control socket is OK.
-        // As there seems to be a problem with mapping to the /var/run directory in certain environments (e.g. CircleCI)
-        //  we map the socket file outside of /var/run, as just /docker.sock
-        addFileSystemBind(
-            DockerClientFactory.instance().getRemoteDockerUnixSocketPath(),
-            "/docker.sock",
-            BindMode.READ_WRITE
-        );
-        addEnv("DOCKER_HOST", "unix:///docker.sock");
-        setStartupCheckStrategy(new IndefiniteWaitOneShotStartupCheckStrategy());
-        setWorkingDirectory(containerPwd);
-    }
-
-    @Override
-    public void invoke() {
-        super.start();
-
-        this.followOutput(new Slf4jLogConsumer(logger()));
-
-        // wait for the compose container to stop, which should only happen after it has spawned all the service containers
-        logger()
-            .info("Docker Compose container is running for command: {}", Joiner.on(" ").join(this.getCommandParts()));
-        while (this.isRunning()) {
-            logger().trace("Compose container is still running");
-            Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-        }
-        logger().info("Docker Compose has finished running");
-
-        AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
-
-        final Integer exitCode = getDockerClient()
-            .inspectContainerCmd(getContainerId())
-            .exec()
-            .getState()
-            .getExitCode();
-
-        if (exitCode == null || exitCode != 0) {
-            throw new ContainerLaunchException(
-                "Containerised Docker Compose exited abnormally with code " +
-                exitCode +
-                " whilst running command: " +
-                StringUtils.join(this.getCommandParts(), ' ')
-            );
-        }
-    }
-
-    private String convertToUnixFilesystemPath(String path) {
-        return SystemUtils.IS_OS_WINDOWS ? PathUtils.createMinGWPath(path).substring(1) : path;
-    }
-}
-
-/**
- * Use local Docker Compose binary, if present.
- */
-class LocalDockerCompose implements DockerCompose {
-
-    /**
-     * Executable name for Docker Compose.
-     */
-    private static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS
-        ? "docker-compose.exe"
-        : "docker-compose";
-
-    private final List<File> composeFiles;
-
-    private final String identifier;
-
-    private String cmd = "";
-
-    private Map<String, String> env = new HashMap<>();
-
-    public LocalDockerCompose(List<File> composeFiles, String identifier) {
-        this.composeFiles = composeFiles;
-        this.identifier = identifier;
-    }
-
-    @Override
-    public DockerCompose withCommand(String cmd) {
-        this.cmd = cmd;
-        return this;
-    }
-
-    @Override
-    public DockerCompose withEnv(Map<String, String> env) {
-        this.env = env;
-        return this;
-    }
-
-    @VisibleForTesting
-    static boolean executableExists() {
-        return CommandLine.executableExists(COMPOSE_EXECUTABLE);
-    }
-
-    @Override
-    public void invoke() {
-        // bail out early
-        if (!executableExists()) {
-            throw new ContainerLaunchException(
-                "Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?"
-            );
-        }
-
-        final Map<String, String> environment = Maps.newHashMap(env);
-        environment.put(ENV_PROJECT_NAME, identifier);
-
-        TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
-        SSLConfig sslConfig = transportConfig.getSslConfig();
-        if (sslConfig != null) {
-            if (sslConfig instanceof LocalDirectorySSLConfig) {
-                environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
-                environment.put("DOCKER_TLS_VERIFY", "true");
-            } else {
-                logger()
-                    .warn(
-                        "Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig."
-                    );
-            }
-        }
-        String dockerHost = transportConfig.getDockerHost().toString();
-        environment.put("DOCKER_HOST", dockerHost);
-
-        final Stream<String> absoluteDockerComposeFilePaths = composeFiles
-            .stream()
-            .map(File::getAbsolutePath)
-            .map(Objects::toString);
-
-        final String composeFileEnvVariableValue = absoluteDockerComposeFilePaths.collect(
-            Collectors.joining(File.pathSeparator + "")
-        );
-        logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
-
-        final File pwd = composeFiles.get(0).getAbsoluteFile().getParentFile().getAbsoluteFile();
-        environment.put(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
-
-        logger().info("Local Docker Compose is running command: {}", cmd);
-
-        final List<String> command = Splitter
-            .onPattern(" ")
-            .omitEmptyStrings()
-            .splitToList(COMPOSE_EXECUTABLE + " " + cmd);
-
-        try {
-            new ProcessExecutor()
-                .command(command)
-                .redirectOutput(Slf4jStream.of(logger()).asInfo())
-                .redirectError(Slf4jStream.of(logger()).asInfo()) // docker-compose will log pull information to stderr
-                .environment(environment)
-                .directory(pwd)
-                .exitValueNormal()
-                .executeNoTimeout();
-
-            logger().info("Docker Compose has finished running");
-        } catch (InvalidExitValueException e) {
-            throw new ContainerLaunchException(
-                "Local Docker Compose exited abnormally with code " +
-                e.getExitValue() +
-                " whilst running command: " +
-                cmd
-            );
-        } catch (Exception e) {
-            throw new ContainerLaunchException("Error running local Docker Compose command: " + cmd, e);
-        }
-    }
-
-    /**
-     * @return a logger
-     */
-    private Logger logger() {
-        return DockerLoggerFactory.getLogger(COMPOSE_EXECUTABLE);
-    }
-}
diff --git a/core/src/main/java/org/testcontainers/containers/LocalDockerCompose.java b/core/src/main/java/org/testcontainers/containers/LocalDockerCompose.java
new file mode 100644
index 00000000000..bcd14b3e97e
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/LocalDockerCompose.java
@@ -0,0 +1,134 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.core.LocalDirectorySSLConfig;
+import com.github.dockerjava.transport.SSLConfig;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Maps;
+import org.slf4j.Logger;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.dockerclient.TransportConfig;
+import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerLoggerFactory;
+import org.zeroturnaround.exec.InvalidExitValueException;
+import org.zeroturnaround.exec.ProcessExecutor;
+import org.zeroturnaround.exec.stream.slf4j.Slf4jStream;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Use local Docker Compose binary, if present.
+ */
+class LocalDockerCompose implements DockerCompose {
+
+    private final List<File> composeFiles;
+
+    private final String identifier;
+
+    private String cmd = "";
+
+    private Map<String, String> env = new HashMap<>();
+
+    private final String composeExecutable;
+
+    public LocalDockerCompose(String composeExecutable, List<File> composeFiles, String identifier) {
+        this.composeExecutable = composeExecutable;
+        this.composeFiles = composeFiles;
+        this.identifier = identifier;
+    }
+
+    @Override
+    public DockerCompose withCommand(String cmd) {
+        this.cmd = cmd;
+        return this;
+    }
+
+    @Override
+    public DockerCompose withEnv(Map<String, String> env) {
+        this.env = env;
+        return this;
+    }
+
+    @Override
+    public void invoke() {
+        // bail out early
+        if (!CommandLine.executableExists(this.composeExecutable)) {
+            throw new ContainerLaunchException(
+                "Local Docker Compose not found. Is " + this.composeExecutable + " on the PATH?"
+            );
+        }
+
+        final Map<String, String> environment = Maps.newHashMap(env);
+        environment.put(ENV_PROJECT_NAME, identifier);
+
+        TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
+        SSLConfig sslConfig = transportConfig.getSslConfig();
+        if (sslConfig != null) {
+            if (sslConfig instanceof LocalDirectorySSLConfig) {
+                environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
+                environment.put("DOCKER_TLS_VERIFY", "true");
+            } else {
+                logger()
+                    .warn(
+                        "Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig."
+                    );
+            }
+        }
+        String dockerHost = transportConfig.getDockerHost().toString();
+        environment.put("DOCKER_HOST", dockerHost);
+
+        final Stream<String> absoluteDockerComposeFilePaths = composeFiles
+            .stream()
+            .map(File::getAbsolutePath)
+            .map(Objects::toString);
+
+        final String composeFileEnvVariableValue = absoluteDockerComposeFilePaths.collect(
+            Collectors.joining(File.pathSeparator + "")
+        );
+        logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
+
+        final File pwd = composeFiles.get(0).getAbsoluteFile().getParentFile().getAbsoluteFile();
+        environment.put(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
+
+        logger().info("Local Docker Compose is running command: {}", cmd);
+
+        final List<String> command = Splitter
+            .onPattern(" ")
+            .omitEmptyStrings()
+            .splitToList(this.composeExecutable + " " + cmd);
+
+        try {
+            new ProcessExecutor()
+                .command(command)
+                .redirectOutput(Slf4jStream.of(logger()).asInfo())
+                .redirectError(Slf4jStream.of(logger()).asInfo()) // docker-compose will log pull information to stderr
+                .environment(environment)
+                .directory(pwd)
+                .exitValueNormal()
+                .executeNoTimeout();
+
+            logger().info("Docker Compose has finished running");
+        } catch (InvalidExitValueException e) {
+            throw new ContainerLaunchException(
+                "Local Docker Compose exited abnormally with code " +
+                e.getExitValue() +
+                " whilst running command: " +
+                cmd
+            );
+        } catch (Exception e) {
+            throw new ContainerLaunchException("Error running local Docker Compose command: " + cmd, e);
+        }
+    }
+
+    /**
+     * @return a logger
+     */
+    private Logger logger() {
+        return DockerLoggerFactory.getLogger(this.composeExecutable);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/ComposeOverridesTest.java b/core/src/test/java/org/testcontainers/ComposeOverridesTest.java
new file mode 100644
index 00000000000..f5a384a3c37
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/ComposeOverridesTest.java
@@ -0,0 +1,114 @@
+package org.testcontainers;
+
+import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.commons.lang3.SystemUtils;
+import org.assertj.core.api.Assumptions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.CommandLine;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(Parameterized.class)
+public class ComposeOverridesTest {
+
+    private static final String DOCKER_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
+
+    private static final File BASE_COMPOSE_FILE = new File("src/test/resources/docker-compose-base.yml");
+
+    private static final String BASE_ENV_VAR = "bar=base";
+
+    private static final File OVERRIDE_COMPOSE_FILE = new File(
+        "src/test/resources/docker-compose-non-default-override.yml"
+    );
+
+    private static final String OVERRIDE_ENV_VAR = "bar=overwritten";
+
+    private static final int SERVICE_PORT = 3000;
+
+    private static final String SERVICE_NAME = "alpine-1";
+
+    private final boolean localMode;
+
+    private final String expectedEnvVar;
+
+    private final File[] composeFiles;
+
+    public ComposeOverridesTest(boolean localMode, String expectedEnvVar, File... composeFiles) {
+        this.localMode = localMode;
+        this.expectedEnvVar = expectedEnvVar;
+        this.composeFiles = composeFiles;
+    }
+
+    @Parameters(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] {
+                { true, BASE_ENV_VAR, new File[] { BASE_COMPOSE_FILE } },
+                { true, OVERRIDE_ENV_VAR, new File[] { BASE_COMPOSE_FILE, OVERRIDE_COMPOSE_FILE } },
+                { false, BASE_ENV_VAR, new File[] { BASE_COMPOSE_FILE } },
+                { false, OVERRIDE_ENV_VAR, new File[] { BASE_COMPOSE_FILE, OVERRIDE_COMPOSE_FILE } },
+            }
+        );
+    }
+
+    @Before
+    public void setUp() {
+        if (localMode) {
+            Assumptions
+                .assumeThat(CommandLine.executableExists(DOCKER_EXECUTABLE))
+                .as("docker executable exists")
+                .isTrue();
+        }
+    }
+
+    @Test
+    public void test() {
+        try (
+            ComposeContainer compose = new ComposeContainer(composeFiles)
+                .withLocalCompose(localMode)
+                .withExposedService(SERVICE_NAME, SERVICE_PORT)
+        ) {
+            compose.start();
+
+            BufferedReader br = Unreliables.retryUntilSuccess(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+
+                    Socket socket = new Socket(
+                        compose.getServiceHost(SERVICE_NAME, SERVICE_PORT),
+                        compose.getServicePort(SERVICE_NAME, SERVICE_PORT)
+                    );
+                    return new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                }
+            );
+
+            Unreliables.retryUntilTrue(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    while (br.ready()) {
+                        String line = br.readLine();
+                        if (line.contains(expectedEnvVar)) {
+                            return true;
+                        }
+                    }
+                    Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+                    return false;
+                }
+            );
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
new file mode 100644
index 00000000000..8524f804444
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
@@ -0,0 +1,130 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+import org.rnorth.ducttape.TimeoutException;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import java.io.File;
+import java.time.Duration;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+public class ComposeContainerWithServicesTest {
+
+    public static final File SIMPLE_COMPOSE_FILE = new File(
+        "src/test/resources/compose-scaling-multiple-containers.yml"
+    );
+
+    public static final File COMPOSE_FILE_WITH_INLINE_SCALE = new File(
+        "src/test/resources/compose-with-inline-scale-test.yml"
+    );
+
+    @Test
+    public void testDesiredSubsetOfServicesAreStarted() {
+        try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withServices("redis")) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1");
+        }
+    }
+
+    @Test
+    public void testDesiredSubsetOfScaledServicesAreStarted() {
+        try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withScaledService("redis", 2)) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1", "redis-2");
+        }
+    }
+
+    @Test
+    public void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
+        try (
+            ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
+                .withServices("redis")
+                .withScaledService("redis", 2)
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1", "redis-2");
+        }
+    }
+
+    @Test
+    public void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
+        try (
+            ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
+                .withServices("other")
+                .withScaledService("redis", 2)
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1", "redis-2", "other-1");
+        }
+    }
+
+    @Test
+    public void testAllServicesAreStartedIfNotSpecified() {
+        try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1", "other-1");
+        }
+    }
+
+    @Test
+    public void testScaleInComposeFileIsRespected() {
+        try (ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_INLINE_SCALE)) {
+            compose.start();
+
+            // the compose file includes `scale: 3` for the redis container
+            verifyStartedContainers(compose, "redis-1", "redis-2", "redis-3");
+        }
+    }
+
+    @Test
+    public void testStartupTimeoutSetsTheHighestTimeout() {
+        assertThat(
+            catchThrowable(() -> {
+                try (
+                    ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
+                        .withServices("redis")
+                        .withStartupTimeout(Duration.ofMillis(1))
+                        .withExposedService(
+                            "redis",
+                            80,
+                            Wait.forListeningPort().withStartupTimeout(Duration.ofMinutes(1))
+                        );
+                ) {
+                    compose.start();
+                }
+            })
+        )
+            .as("We expect a timeout from the startup timeout")
+            .isInstanceOf(TimeoutException.class);
+    }
+
+    private void verifyStartedContainers(final ComposeContainer compose, final String... names) {
+        final List<String> containerNames = compose
+            .listChildContainers()
+            .stream()
+            .flatMap(container -> Stream.of(container.getNames()))
+            .collect(Collectors.toList());
+
+        assertThat(containerNames)
+            .as("number of running services of docker-compose is the same as length of listOfServices")
+            .hasSize(names.length);
+
+        for (final String expectedName : names) {
+            final long matches = containerNames.stream().filter(foundName -> foundName.endsWith(expectedName)).count();
+
+            assertThat(matches)
+                .as("container with name starting '" + expectedName + "' should be running")
+                .isEqualTo(1L);
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
index 50fedd3cf0f..494ddc5838f 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
@@ -8,6 +8,7 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.utility.CommandLine;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -61,7 +62,7 @@ public static Iterable<Object[]> data() {
     public void setUp() {
         if (localMode) {
             Assumptions
-                .assumeThat(LocalDockerCompose.executableExists())
+                .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
                 .isTrue();
         }
diff --git a/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java b/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
new file mode 100644
index 00000000000..4d919388eb7
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
@@ -0,0 +1,85 @@
+package org.testcontainers.junit;
+
+import com.github.dockerjava.api.model.Network;
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.TestEnvironment;
+import redis.clients.jedis.Jedis;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class BaseComposeTest {
+
+    protected static final int REDIS_PORT = 6379;
+
+    protected abstract ComposeContainer getEnvironment();
+
+    private List<String> existingNetworks = new ArrayList<>();
+
+    @BeforeClass
+    public static void checkVersion() {
+        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+    }
+
+    @Test
+    public void simpleTest() {
+        Jedis jedis = new Jedis(
+            getEnvironment().getServiceHost("redis-1", REDIS_PORT),
+            getEnvironment().getServicePort("redis-1", REDIS_PORT)
+        );
+
+        jedis.incr("test");
+        jedis.incr("test");
+        jedis.incr("test");
+
+        assertThat(jedis.get("test")).as("A redis instance defined in compose can be used in isolation").isEqualTo("3");
+    }
+
+    @Test
+    public void secondTest() {
+        // used in manual checking for cleanup in between tests
+        Jedis jedis = new Jedis(
+            getEnvironment().getServiceHost("redis-1", REDIS_PORT),
+            getEnvironment().getServicePort("redis-1", REDIS_PORT)
+        );
+
+        jedis.incr("test");
+        jedis.incr("test");
+        jedis.incr("test");
+
+        assertThat(jedis.get("test")).as("Tests use fresh container instances").isEqualTo("3");
+        // if these end up using the same container one of the test methods will fail.
+        // However, @Rule creates a separate DockerComposeContainer instance per test, so this just shouldn't happen
+    }
+
+    @Before
+    public void captureNetworks() {
+        existingNetworks.addAll(findAllNetworks());
+    }
+
+    @After
+    public void verifyNoNetworks() {
+        assertThat(findAllNetworks()).as("The networks").isEqualTo(existingNetworks);
+    }
+
+    private List<String> findAllNetworks() {
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listNetworksCmd()
+            .exec()
+            .stream()
+            .map(Network::getName)
+            .sorted()
+            .collect(Collectors.toList());
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
new file mode 100644
index 00000000000..83bc894b516
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
@@ -0,0 +1,54 @@
+package org.testcontainers.junit;
+
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.TestEnvironment;
+import redis.clients.jedis.Jedis;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ComposeContainerScalingTest {
+
+    private static final int REDIS_PORT = 6379;
+
+    private Jedis[] clients = new Jedis[3];
+
+    @BeforeClass
+    public static void checkVersion() {
+        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+    }
+
+    @Rule
+    public ComposeContainer environment = new ComposeContainer(
+        new File("src/test/resources/composev2/scaled-compose-test.yml")
+    )
+        .withScaledService("redis", 3)
+        .withExposedService("redis", REDIS_PORT) // implicit '-1'
+        .withExposedService("redis-2", REDIS_PORT) // explicit service index
+        .withExposedService("redis", 3, REDIS_PORT); // explicit service index via parameter
+
+    @Before
+    public void setupClients() {
+        for (int i = 0; i < 3; i++) {
+            String name = String.format("redis-%d", i + 1);
+
+            clients[i] =
+                new Jedis(environment.getServiceHost(name, REDIS_PORT), environment.getServicePort(name, REDIS_PORT));
+        }
+    }
+
+    @Test
+    public void simpleTest() {
+        for (int i = 0; i < 3; i++) {
+            clients[i].incr("somekey");
+
+            assertThat(clients[i].get("somekey")).as("Each redis instance is separate").isEqualTo("1");
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
new file mode 100644
index 00000000000..c101da6b6b3
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
@@ -0,0 +1,83 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Collections;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ComposeContainerTest extends BaseComposeTest {
+
+    @Rule
+    public ComposeContainer environment = new ComposeContainer(
+        new File("src/test/resources/composev2/compose-test.yml")
+    )
+        .withExposedService("redis-1", REDIS_PORT)
+        .withExposedService("db-1", 3306);
+
+    @Override
+    protected ComposeContainer getEnvironment() {
+        return environment;
+    }
+
+    @Test
+    public void testGetServicePort() {
+        int serviceWithInstancePort = environment.getServicePort("redis-1", REDIS_PORT);
+        assertThat(serviceWithInstancePort).as("Port is set for service with instance number").isNotNull();
+        int serviceWithoutInstancePort = environment.getServicePort("redis", REDIS_PORT);
+        assertThat(serviceWithoutInstancePort).as("Port is set for service with instance number").isNotNull();
+        assertThat(serviceWithoutInstancePort).as("Service ports are the same").isEqualTo(serviceWithInstancePort);
+    }
+
+    @Test
+    public void shouldRetrieveContainerByServiceName() {
+        String existingServiceName = "db-1";
+        Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
+        assertThat(result)
+            .as(String.format("Container should be found by service name %s", existingServiceName))
+            .isPresent();
+        assertThat(Collections.singletonList(3306))
+            .as("Mapped port for result container was wrong, probably wrong container found")
+            .isEqualTo(result.get().getExposedPorts());
+    }
+
+    @Test
+    public void shouldReturnEmptyResultOnNoneExistingService() {
+        String notExistingServiceName = "db-256";
+        Optional<ContainerState> result = environment.getContainerByServiceName(notExistingServiceName);
+        assertThat(result)
+            .as(String.format("No container should be found under service name %s", notExistingServiceName))
+            .isNotPresent();
+    }
+
+    @Test
+    public void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
+        String validYaml =
+            "version: '2.2'\n" +
+            "services:\n" +
+            "  http:\n" +
+            "    build: .\n" +
+            "    image: python:latest\n" +
+            "    ports:\n" +
+            "    - 8080:8080";
+
+        File filePathNotStartWithDotSlash = new File("docker-compose-test.yml");
+        filePathNotStartWithDotSlash.createNewFile();
+        filePathNotStartWithDotSlash.deleteOnExit();
+        Files.write(filePathNotStartWithDotSlash.toPath(), validYaml.getBytes(StandardCharsets.UTF_8));
+
+        final DockerComposeContainer<?> dockerComposeContainer = new DockerComposeContainer<>(
+            filePathNotStartWithDotSlash
+        );
+        assertThat(dockerComposeContainer).as("Container created using docker compose file").isNotNull();
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
new file mode 100644
index 00000000000..65cc7b92aa5
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
@@ -0,0 +1,92 @@
+package org.testcontainers.junit;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+@RunWith(Parameterized.class)
+public class ComposeContainerVolumeRemovalTest {
+
+    public ComposeContainerVolumeRemovalTest(
+        final boolean removeVolumes,
+        final boolean shouldVolumesBePresentAfterRunning
+    ) {
+        this.removeVolumes = removeVolumes;
+        this.shouldVolumesBePresentAfterRunning = shouldVolumesBePresentAfterRunning;
+    }
+
+    public final boolean removeVolumes;
+
+    public final boolean shouldVolumesBePresentAfterRunning;
+
+    @Parameterized.Parameters(name = "removeVolumes = {0}")
+    public static Object[][] params() {
+        return new Object[][] { { true, false }, { false, true } };
+    }
+
+    @Test
+    public void performTest() {
+        final File composeFile = new File("src/test/resources/v2-compose-test.yml");
+
+        final AtomicReference<String> volumeName = new AtomicReference<>("");
+        try (
+            ComposeContainer environment = new ComposeContainer(composeFile)
+                .withExposedService("redis", 6379)
+                .withRemoveVolumes(this.removeVolumes)
+                .withRemoveImages(ComposeContainer.RemoveImages.ALL)
+        ) {
+            environment.start();
+
+            volumeName.set(volumeNameForRunningContainer("-redis-1"));
+            final boolean isVolumePresentWhileRunning = isVolumePresent(volumeName.get());
+            assertThat(isVolumePresentWhileRunning).as("the container volume is present while running").isEqualTo(true);
+        }
+
+        await()
+            .untilAsserted(() -> {
+                final boolean isVolumePresentAfterRunning = isVolumePresent(volumeName.get());
+                assertThat(isVolumePresentAfterRunning)
+                    .as("the container volume is present after running")
+                    .isEqualTo(this.shouldVolumesBePresentAfterRunning);
+            });
+    }
+
+    private String volumeNameForRunningContainer(final String containerNameSuffix) {
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listContainersCmd()
+            .exec()
+            .stream()
+            .filter(it -> Stream.of(it.getNames()).anyMatch(name -> name.endsWith(containerNameSuffix)))
+            .findFirst()
+            .map(container -> container.getMounts().get(0).getName())
+            .orElseThrow(IllegalStateException::new);
+    }
+
+    private boolean isVolumePresent(final String volumeName) {
+        Set<String> nameFilter = new LinkedHashSet<>(1);
+        nameFilter.add(volumeName);
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listVolumesCmd()
+            .withFilter("name", nameFilter)
+            .exec()
+            .getVolumes()
+            .stream()
+            .findFirst()
+            .isPresent();
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
new file mode 100644
index 00000000000..7d13f72e300
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
@@ -0,0 +1,118 @@
+package org.testcontainers.junit;
+
+import com.github.dockerjava.api.model.Container;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(Parameterized.class)
+public class ComposeContainerWithBuildTest {
+
+    public ComposeContainerWithBuildTest(
+        final ComposeContainer.RemoveImages removeMode,
+        final boolean shouldBuiltImageBePresentAfterRunning,
+        final boolean shouldPulledImageBePresentAfterRunning
+    ) {
+        this.removeMode = removeMode;
+        this.shouldBuiltImageBePresentAfterRunning = shouldBuiltImageBePresentAfterRunning;
+        this.shouldPulledImageBePresentAfterRunning = shouldPulledImageBePresentAfterRunning;
+    }
+
+    public final ComposeContainer.RemoveImages removeMode;
+
+    public final boolean shouldBuiltImageBePresentAfterRunning;
+
+    public final boolean shouldPulledImageBePresentAfterRunning;
+
+    @Parameterized.Parameters(name = "removeMode = {0}")
+    public static Object[][] params() {
+        return new Object[][] {
+            { null, true, true },
+            { ComposeContainer.RemoveImages.LOCAL, false, true },
+            { ComposeContainer.RemoveImages.ALL, false, false },
+        };
+    }
+
+    @Test
+    public void performTest() {
+        final File composeFile = new File("src/test/resources/compose-v2-build-test/docker-compose.yml");
+
+        final AtomicReference<String> builtImageName = new AtomicReference<>("");
+        final AtomicReference<String> pulledImageName = new AtomicReference<>("");
+        try (
+            ComposeContainer environment = new ComposeContainer(composeFile)
+                .withExposedService("customredis", 6379)
+                .withBuild(true)
+                .withRemoveImages(removeMode)
+        ) {
+            environment.start();
+
+            builtImageName.set(imageNameForRunningContainer("-customredis-1"));
+            final boolean isBuiltImagePresentWhileRunning = isImagePresent(builtImageName.get());
+            assertThat(isBuiltImagePresentWhileRunning).as("the built image is present while running").isTrue();
+
+            pulledImageName.set(imageNameForRunningContainer("-normalredis-1"));
+            final boolean isPulledImagePresentWhileRunning = isImagePresent(pulledImageName.get());
+            assertThat(isPulledImagePresentWhileRunning).as("the pulled image is present while running").isTrue();
+        }
+
+        Unreliables.retryUntilSuccess(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                final boolean isBuiltImagePresentAfterRunning = isImagePresent(builtImageName.get());
+                assertThat(isBuiltImagePresentAfterRunning)
+                    .as("the built image is not present after running")
+                    .isEqualTo(shouldBuiltImageBePresentAfterRunning);
+                return null;
+            }
+        );
+
+        Unreliables.retryUntilSuccess(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                final boolean isPulledImagePresentAfterRunning = isImagePresent(pulledImageName.get());
+                assertThat(isPulledImagePresentAfterRunning)
+                    .as("the pulled image is present after running")
+                    .isEqualTo(shouldPulledImageBePresentAfterRunning);
+                return null;
+            }
+        );
+    }
+
+    private String imageNameForRunningContainer(final String containerNameSuffix) {
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listContainersCmd()
+            .exec()
+            .stream()
+            .filter(it -> Stream.of(it.getNames()).anyMatch(name -> name.endsWith(containerNameSuffix)))
+            .findFirst()
+            .map(Container::getImage)
+            .orElseThrow(IllegalStateException::new);
+    }
+
+    private boolean isImagePresent(final String imageName) {
+        return DockerClientFactory
+            .instance()
+            .client()
+            .listImagesCmd()
+            .withImageNameFilter(imageName)
+            .exec()
+            .stream()
+            .findFirst()
+            .isPresent();
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
new file mode 100644
index 00000000000..ef1315ae662
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
@@ -0,0 +1,89 @@
+package org.testcontainers.junit;
+
+import com.google.common.collect.ImmutableSet;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests the options associated with the docker-compose command.
+ */
+@RunWith(Parameterized.class)
+public class ComposeContainerWithOptionsTest {
+
+    public ComposeContainerWithOptionsTest(
+        final File composeFile,
+        final boolean local,
+        final Set<String> options,
+        final boolean expectError
+    ) {
+        this.composeFile = composeFile;
+        this.local = local;
+        this.options = options;
+        this.expectError = expectError;
+    }
+
+    private final File composeFile;
+
+    private final boolean local;
+
+    private final Set<String> options;
+
+    private final boolean expectError;
+
+    @Parameterized.Parameters(
+        name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]"
+    )
+    public static Object[][] params() {
+        return new Object[][] {
+            // Test the happy day case. THe compatibility option should be accepted by docker-compose.
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                false,
+                ImmutableSet.of("--compatibility"),
+                false,
+            },
+            // Test with flags absent. Docker compose will warn but continue, ignoring the deploy block.
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                false,
+                ImmutableSet.of(""),
+                false,
+            },
+            // Test with a bad option. Compose will complain.
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                false,
+                ImmutableSet.of("--bad-option"),
+                true,
+            },
+            // Local compose
+            {
+                new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
+                true,
+                ImmutableSet.of("--compatibility"),
+                false,
+            },
+        };
+    }
+
+    @Test
+    public void performTest() {
+        try (
+            ComposeContainer environment = new ComposeContainer(composeFile)
+                .withOptions(options.stream().toArray(String[]::new))
+                .withLocalCompose(local)
+        ) {
+            environment.start();
+            assertThat(expectError).isFalse();
+        } catch (Exception e) {
+            assertThat(expectError).isTrue();
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
new file mode 100644
index 00000000000..496ede74497
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
@@ -0,0 +1,24 @@
+package org.testcontainers.junit;
+
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+public class ComposeErrorHandlingTest {
+
+    @Test
+    public void simpleTest() {
+        assertThat(
+            catchThrowable(() -> {
+                ComposeContainer environment = new ComposeContainer(new File("src/test/resources/invalid-compose.yml"))
+                    .withExposedService("something", 123);
+            })
+        )
+            .as("starting with an invalid docker-compose file throws an exception")
+            .isInstanceOf(IllegalArgumentException.class);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
new file mode 100644
index 00000000000..d1724cb1e70
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
@@ -0,0 +1,60 @@
+package org.testcontainers.junit;
+
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
+import org.testcontainers.utility.TestEnvironment;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Objects;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ComposePassthroughTest {
+
+    private final TestWaitStrategy waitStrategy = new TestWaitStrategy();
+
+    @BeforeClass
+    public static void checkVersion() {
+        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+    }
+
+    @Rule
+    public ComposeContainer compose = new ComposeContainer(
+        new File("src/test/resources/v2-compose-test-passthrough.yml")
+    )
+        .withEnv("foo", "bar")
+        .withExposedService("alpine-1", 3000, waitStrategy);
+
+    @Test
+    public void testContainerInstanceProperties() {
+        final ContainerState container = waitStrategy.getContainer();
+
+        //check environment variable was set
+        assertThat(Arrays.asList(Objects.requireNonNull(container.getContainerInfo().getConfig().getEnv())))
+            .as("Environment variable set correctly")
+            .containsOnlyOnce("bar=bar");
+
+        //check other container properties
+        assertThat(container.getContainerId()).as("Container id is not null").isNotNull();
+        assertThat(container.getMappedPort(3000)).as("Port mapped").isNotNull();
+        assertThat(container.getExposedPorts()).containsExactly(3000);
+    }
+
+    /*
+     * WaitStrategy is the only class that has access to the DockerComposeServiceInstance reference
+     * Using a custom WaitStrategy to expose the reference for testability
+     */
+    class TestWaitStrategy extends HostPortWaitStrategy {
+
+        @SuppressWarnings("unchecked")
+        public ContainerState getContainer() {
+            return this.waitStrategyTarget;
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
new file mode 100644
index 00000000000..a77f80d227e
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
@@ -0,0 +1,110 @@
+package org.testcontainers.junit;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.mockito.Mockito;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+
+import java.io.File;
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.assertj.core.api.Assertions.fail;
+
+public class ComposeWaitStrategyTest {
+
+    private static final int REDIS_PORT = 6379;
+
+    private ComposeContainer environment;
+
+    @Before
+    public final void setUp() {
+        environment = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"));
+    }
+
+    @After
+    public final void cleanUp() {
+        environment.stop();
+    }
+
+    @Test
+    public void testWaitOnListeningPort() {
+        environment.withExposedService("redis-1", REDIS_PORT, Wait.forListeningPort());
+
+        try {
+            environment.starting(Description.createTestDescription(Object.class, "name"));
+        } catch (RuntimeException e) {
+            fail("Docker compose should start after waiting for listening port with failed with: " + e);
+        }
+    }
+
+    @Test
+    public void testWaitOnMultipleStrategiesPassing() {
+        environment
+            .withExposedService("redis-1", REDIS_PORT, Wait.forListeningPort())
+            .withExposedService("db-1", 3306, Wait.forLogMessage(".*ready for connections.*\\s", 1))
+            .withTailChildContainers(true);
+
+        try {
+            environment.starting(Description.createTestDescription(Object.class, "name"));
+        } catch (RuntimeException e) {
+            fail("Docker compose should start after waiting for listening port with failed with: " + e);
+        }
+    }
+
+    @Test
+    public void testWaitingFails() {
+        environment.withExposedService(
+            "redis-1",
+            REDIS_PORT,
+            Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10))
+        );
+        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+            .as("waiting on an invalid http path times out")
+            .isInstanceOf(RuntimeException.class);
+    }
+
+    @Test
+    public void testWaitOnOneOfMultipleStrategiesFailing() {
+        environment
+            .withExposedService(
+                "redis-1",
+                REDIS_PORT,
+                Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10))
+            )
+            .waitingFor(
+                "db-1",
+                Wait.forLogMessage(".*test test test.*\\s", 1).withStartupTimeout(Duration.ofSeconds(10))
+            )
+            .withTailChildContainers(true);
+
+        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+            .as("waiting on one failing strategy to time out")
+            .isInstanceOf(RuntimeException.class);
+    }
+
+    @Test
+    public void testWaitingForNonexistentServices() {
+        String existentServiceName = "db-1";
+        String nonexistentServiceName1 = "some-nonexistent_service-1";
+        String nonexistentServiceName2 = "some-nonexistent_service-2";
+        WaitStrategy someWaitStrategy = Mockito.mock(WaitStrategy.class);
+
+        environment
+            .waitingFor(existentServiceName, someWaitStrategy)
+            .waitingFor(nonexistentServiceName1, someWaitStrategy)
+            .waitingFor(nonexistentServiceName2, someWaitStrategy);
+
+        Throwable thrownWhenRequestedToWaitForNonexistentService = catchThrowable(environment::start);
+
+        assertThat(thrownWhenRequestedToWaitForNonexistentService)
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining(nonexistentServiceName1, nonexistentServiceName2)
+            .hasMessageNotContaining(existentServiceName);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
new file mode 100644
index 00000000000..f94449bb39f
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+
+public class ComposeWithIdentifierTest extends BaseComposeTest {
+
+    @Rule
+    public ComposeContainer environment = new ComposeContainer(
+        "TEST",
+        new File("src/test/resources/v2-compose-test.yml")
+    )
+        .withExposedService("redis-1", REDIS_PORT);
+
+    @Override
+    protected ComposeContainer getEnvironment() {
+        return this.environment;
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
new file mode 100644
index 00000000000..3ce63b2a5fe
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
@@ -0,0 +1,20 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+
+public class ComposeWithNetworkTest extends BaseComposeTest {
+
+    @Rule
+    public ComposeContainer environment = new ComposeContainer(
+        new File("src/test/resources/v2-compose-test-with-network.yml")
+    )
+        .withExposedService("redis-1", REDIS_PORT);
+
+    @Override
+    protected ComposeContainer getEnvironment() {
+        return environment;
+    }
+}
diff --git a/core/src/test/resources/compose-build-test/Dockerfile b/core/src/test/resources/compose-build-test/Dockerfile
index f5df49b0152..05896acf980 100644
--- a/core/src/test/resources/compose-build-test/Dockerfile
+++ b/core/src/test/resources/compose-build-test/Dockerfile
@@ -1,3 +1,3 @@
-FROM redis:2.6.17
+FROM redis:6.0-alpine
 
 CMD ["redis-server"]
diff --git a/core/src/test/resources/compose-build-test/docker-compose.yml b/core/src/test/resources/compose-build-test/docker-compose.yml
index 5b9f3e2c21b..f2b5460570c 100644
--- a/core/src/test/resources/compose-build-test/docker-compose.yml
+++ b/core/src/test/resources/compose-build-test/docker-compose.yml
@@ -3,4 +3,4 @@ services:
   customredis:
       build: .
   normalredis:
-      image: redis:2.6.17
+      image: redis:6.0-alpine
diff --git a/core/src/test/resources/compose-v2-build-test/Dockerfile b/core/src/test/resources/compose-v2-build-test/Dockerfile
new file mode 100644
index 00000000000..1ad866e9522
--- /dev/null
+++ b/core/src/test/resources/compose-v2-build-test/Dockerfile
@@ -0,0 +1,3 @@
+FROM redis:7.0-alpine
+
+CMD ["redis-server"]
diff --git a/core/src/test/resources/compose-v2-build-test/docker-compose.yml b/core/src/test/resources/compose-v2-build-test/docker-compose.yml
new file mode 100644
index 00000000000..2b4bec78d45
--- /dev/null
+++ b/core/src/test/resources/compose-v2-build-test/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '2.0'
+services:
+  customredis:
+      build: .
+  normalredis:
+      image: redis:7.0-alpine
diff --git a/core/src/test/resources/composev2/compose-test.yml b/core/src/test/resources/composev2/compose-test.yml
new file mode 100644
index 00000000000..181e7be1f32
--- /dev/null
+++ b/core/src/test/resources/composev2/compose-test.yml
@@ -0,0 +1,7 @@
+services:
+  redis:
+    image: redis
+  db:
+    image: mysql:8.0.33
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "true"
diff --git a/core/src/test/resources/composev2/scaled-compose-test.yml b/core/src/test/resources/composev2/scaled-compose-test.yml
new file mode 100644
index 00000000000..b1d6a2c9b76
--- /dev/null
+++ b/core/src/test/resources/composev2/scaled-compose-test.yml
@@ -0,0 +1,3 @@
+services:
+  redis:
+    image: redis
diff --git a/docs/modules/docker_compose.md b/docs/modules/docker_compose.md
index 50bb946f311..10f1aee61aa 100644
--- a/docs/modules/docker_compose.md
+++ b/docs/modules/docker_compose.md
@@ -119,6 +119,22 @@ public static DockerComposeContainer environment =
             .waitingFor("db_1", Wait.forLogMessage("started", 1))
             .withLocalCompose(true);
 ```
+
+## Compose V2
+
+[Compose V2 is GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) and it relies on the `docker` command itself instead of `docker-compose`.
+Testcontainers provides `ComposeContainer` if you want to use Compose V2.
+
+```java
+public static ComposeContainer environment =
+    new ComposeContainer(new File("src/test/resources/compose-test.yml"))
+            .withExposedService("redis-1", REDIS_PORT, Wait.forListeningPort())
+            .waitingFor("db-1", Wait.forLogMessage("started", 1));
+```
+
+!!! note
+    Make sure the service name use a `-` instead of `_` as separator using `ComposeContainer`.
+
 ## Using private repositories in Docker compose
 When Docker Compose is used in container mode (not local), it's needs to be made aware of Docker settings for private repositories. 
 By default, those setting are located in `$HOME/.docker/config.json`. 

From 92b4c90b9935d69eff9809c4e21f2819de7f4138 Mon Sep 17 00:00:00 2001
From: George McIntosh <george@georgemcintosh.com>
Date: Mon, 26 Jun 2023 20:21:04 +0100
Subject: [PATCH 2975/4969] Improve k3s docs (#5175)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/k3s.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/modules/k3s.md b/docs/modules/k3s.md
index 27d2f863122..2df695b1c1e 100644
--- a/docs/modules/k3s.md
+++ b/docs/modules/k3s.md
@@ -35,6 +35,9 @@ This may be used with Kubernetes clients - e.g. for the [official Java client](c
 
     * k3s containers may be unable to run on host machines where `/var/lib/docker` is on a BTRFS filesystem. See [k3s-io/k3s#4863](https://github.com/k3s-io/k3s/issues/4863) for an example.
 
+    * You may experience PKIX exceptions when trying to use a configured Fabric8 client. This is down to newer distributions of k3s issuing elliptic curve keys.
+    This can be fixed by adding [BouncyCastle PKI library](https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on) to your classpath.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:

From b69262e334221646c5663ab5c390726cb582136d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 28 Jun 2023 09:34:25 -0600
Subject: [PATCH 2976/4969] Add missing TC JDBC URLs (#7243)

---
 docs/modules/databases/jdbc.md | 50 +++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 020a96ff941..874583f72d3 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -27,38 +27,62 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 ### JDBC URL examples
 
-#### Using Testcontainers with a fixed version
+#### Using ClickHouse
+
+`jdbc:tc:clickhouse:18.10.3:///databasename`
+
+#### Using CockroachDB
+
+`jdbc:tc:cockroach:v21.2.3:///databasename`
+
+#### Using CrateDB
+
+`jdbc:tc:cratedb:5.2.3//localhost:5432/crate`
+
+#### Using DB2
+
+`jdbc:tc:db2:11.5.0.0a//localhost:5432/crate`
+
+#### Using MariaDB
+
+`jdbc:tc:mariadb:10.2.14:///databasename`
+
+#### Using MySQL
 
 `jdbc:tc:mysql:5.7.34:///databasename`
 
-#### Using PostgreSQL
+#### Using MSSQL Server
 
-`jdbc:tc:postgresql:9.6.8:///databasename`
+`jdbc:tc:sqlserver:2017-CU12:///databasename`
 
-#### Using PostGIS
+#### Using Oracle
 
-`jdbc:tc:postgis:9.6-2.5:///databasename`
+`jdbc:tc:oracle:21-slim-faststart:///databasename`
 
-#### Using TimescaleDB
+#### Using PostGIS
 
-`jdbc:tc:timescaledb:2.1.0-pg13:///databasename`
+`jdbc:tc:postgis:9.6-2.5:///databasename`
 
-#### Using Trino
+#### Using PostgreSQL
 
-`jdbc:tc:trino:352://localhost/memory/default`
+`jdbc:tc:postgresql:9.6.8:///databasename`
 
-#### Using CockroachDB
+#### Using QuestDB
 
-`jdbc:tc:cockroach:v21.2.3:///databasename`
+`jdbc:tc:postgresql:6.5.3:///databasename`
 
-#### Using CrateDB
+#### Using TimescaleDB
 
-`jdbc:tc:cratedb:5.2.3//localhost:5432/crate`
+`jdbc:tc:timescaledb:2.1.0-pg13:///databasename`
 
 #### Using TiDB
 
 `jdbc:tc:tidb:v6.1.0:///databasename`
 
+#### Using Trino
+
+`jdbc:tc:trino:352://localhost/memory/default`
+
 #### Using YugabyteDB
 
 `jdbc:tc:yugabyte:2.14.4.0-b26:///databasename`

From c5732a8e1ad75daae1a25c2edb181e638b5e6c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 28 Jun 2023 11:25:10 -0600
Subject: [PATCH 2977/4969] Add questdb as a database provider (#7244)

Previously, postgresql has been used as a database provider for
QuestDB along with Testcontainers JDBC URL. `postgresql` has been
deprecated and instead `questdb` has been added.
---
 docs/modules/databases/jdbc.md                    |  2 +-
 .../containers/LegacyQuestDBProvider.java         | 15 +++++++++++++++
 .../containers/QuestDBContainer.java              |  5 ++++-
 ...iners.containers.JdbcDatabaseContainerProvider |  1 +
 .../jdbc/questdb/QuestDBJDBCDriverTest.java       |  5 ++++-
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 modules/questdb/src/main/java/org/testcontainers/containers/LegacyQuestDBProvider.java

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 874583f72d3..ab4baa75e22 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -69,7 +69,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using QuestDB
 
-`jdbc:tc:postgresql:6.5.3:///databasename`
+`jdbc:tc:questdb:6.5.3:///databasename`
 
 #### Using TimescaleDB
 
diff --git a/modules/questdb/src/main/java/org/testcontainers/containers/LegacyQuestDBProvider.java b/modules/questdb/src/main/java/org/testcontainers/containers/LegacyQuestDBProvider.java
new file mode 100644
index 00000000000..138356f523b
--- /dev/null
+++ b/modules/questdb/src/main/java/org/testcontainers/containers/LegacyQuestDBProvider.java
@@ -0,0 +1,15 @@
+package org.testcontainers.containers;
+
+@Deprecated
+public class LegacyQuestDBProvider extends JdbcDatabaseContainerProvider {
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(QuestDBContainer.LEGACY_DATABASE_PROVIDER);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new QuestDBContainer(QuestDBContainer.DEFAULT_IMAGE_NAME.withTag(tag));
+    }
+}
diff --git a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
index c6ab1b79e91..f92135bfa59 100644
--- a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
+++ b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
@@ -9,7 +9,10 @@
  */
 public class QuestDBContainer extends JdbcDatabaseContainer<QuestDBContainer> {
 
-    static final String DATABASE_PROVIDER = "postgresql";
+    @Deprecated
+    static final String LEGACY_DATABASE_PROVIDER = "postgresql";
+
+    static final String DATABASE_PROVIDER = "questdb";
 
     private static final String DEFAULT_DATABASE_NAME = "qdb";
 
diff --git a/modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
index 922a12a1328..d92337b7ac2 100644
--- a/modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
+++ b/modules/questdb/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -1 +1,2 @@
+org.testcontainers.containers.LegacyQuestDBProvider
 org.testcontainers.containers.QuestDBProvider
diff --git a/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java b/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
index b19c2acc5fd..3144f8bfad3 100644
--- a/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
+++ b/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
@@ -13,7 +13,10 @@ public class QuestDBJDBCDriverTest extends AbstractJDBCDriverTest {
     @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
-            new Object[][] { { "jdbc:tc:postgresql://hostname/databasename", EnumSet.of(Options.PmdKnownBroken) } }
+            new Object[][] {
+                { "jdbc:tc:postgresql://hostname/databasename", EnumSet.of(Options.PmdKnownBroken) },
+                { "jdbc:tc:questdb://hostname/databasename", EnumSet.of(Options.PmdKnownBroken) },
+            }
         );
     }
 }

From 69555ee4a1b8e6f37ac809ed51e611f993b315f1 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:57:13 +0300
Subject: [PATCH 2978/4969] Disable default disk threshold check in
 ElasticsearchContainer (#7245)

---
 .../testcontainers/elasticsearch/ElasticsearchContainer.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 1cb43f68bb7..4f55e43581c 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -98,6 +98,8 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
 
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
         withEnv("discovery.type", "single-node");
+        // disable disk threshold checks
+        withEnv("cluster.routing.allocation.disk.threshold_enabled", "false");
         // Sets default memory of elasticsearch instance to 2GB
         // Spaces are deliberate to allow user to define additional jvm options as elasticsearch resolves option files lexicographically
         withClasspathResourceMapping(

From b8c4a6568abe36f1e45a4cf5c871e74288897d7a Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:58:15 +0300
Subject: [PATCH 2979/4969] Disable default geoip database downloading for
 Elasticsearch container (#7247)

---
 .../src/main/resources/elasticsearch-default-memory-vm.options   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options b/modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options
index 10db7b96157..62b4e57c6e1 100644
--- a/modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options
+++ b/modules/elasticsearch/src/main/resources/elasticsearch-default-memory-vm.options
@@ -1,2 +1,3 @@
 -Xms2147483648
 -Xmx2147483648
+-Dingest.geoip.downloader.enabled.default=false

From 96a3dfc28343c43cedb1545264d9d9c77a2ad4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 28 Jun 2023 13:55:27 -0600
Subject: [PATCH 2980/4969] Fix Testcontainers name (#7250)

---
 .../images/OutOfPackageImagePullPolicyTest.java               | 2 +-
 modules/cassandra/build.gradle                                | 2 +-
 modules/elasticsearch/build.gradle                            | 2 +-
 modules/hivemq/build.gradle                                   | 2 +-
 .../src/main/java/org/testcontainers/jdbc/ConnectionUrl.java  | 4 ++--
 modules/neo4j/build.gradle                                    | 2 +-
 modules/orientdb/build.gradle                                 | 2 +-
 modules/rabbitmq/build.gradle                                 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
index 168932106fb..6b7f7044994 100644
--- a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
+++ b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
@@ -11,7 +11,7 @@
 public class OutOfPackageImagePullPolicyTest {
 
     @Test
-    public void shouldSupportCustomPoliciesOutOfTestContainersPackage() {
+    public void shouldSupportCustomPoliciesOutOfTestcontainersPackage() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withImagePullPolicy(
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 52f528540ea..38f48887a12 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -1,4 +1,4 @@
-description = "TestContainers :: Cassandra"
+description = "Testcontainers :: Cassandra"
 
 configurations.all {
     resolutionStrategy {
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index ea966a763be..b9d626fb1ce 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -1,4 +1,4 @@
-description = "TestContainers :: elasticsearch"
+description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1e37b848362..1845bb6d195 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -1,4 +1,4 @@
-description = "TestContainers :: HiveMQ"
+description = "Testcontainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index c5f2759f3b1..e1309f66197 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -159,7 +159,7 @@ private Map<String, String> parseTmpfsOptions(Map<String, String> containerParam
     }
 
     /**
-     * Get the TestContainers Parameters such as Init Function, Init Script path etc.
+     * Get the Testcontainers Parameters such as Init Function, Init Script path etc.
      *
      * @return {@link Map}
      */
@@ -177,7 +177,7 @@ private Map<String, String> parseContainerParameters() {
     }
 
     /**
-     * Get all Query parameters specified in the Connection URL after ?. This DOES NOT include TestContainers (TC_*) parameters.
+     * Get all Query parameters specified in the Connection URL after ?. This DOES NOT include Testcontainers (TC_*) parameters.
      *
      * @return {@link Map}
      */
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index f9c2fff7f29..eb39de5912f 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -1,4 +1,4 @@
-description = "TestContainers :: Neo4j"
+description = "Testcontainers :: Neo4j"
 
 def generatedResourcesDir = new File(project.buildDir, "generated-resources")
 def customNeo4jPluginDestinationDir = new File(generatedResourcesDir, "custom-plugins")
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index a2162787e3c..6ce056d2601 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -1,4 +1,4 @@
-description = "TestContainers :: Orientdb"
+description = "Testcontainers :: Orientdb"
 
 dependencies {
     api project(":testcontainers")
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index bcbeb2bb39c..c9c63399d69 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -1,4 +1,4 @@
-description = "TestContainers :: RabbitMQ"
+description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")

From 3dccb4deda418ca8fd1d13f097b9cbd3f9d6b454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 28 Jun 2023 13:55:41 -0600
Subject: [PATCH 2981/4969] Use org.seleniumhq.selenium:selenium-bom (#7248)

---
 modules/selenium/build.gradle | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index caaf36ca3ff..e613fef33a9 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -5,9 +5,11 @@ dependencies {
 
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:4.10.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver:4.10.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-support:4.10.0'
+
+    testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.10.0')
+    testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver'
+    testImplementation 'org.seleniumhq.selenium:selenium-edge-driver'
+    testImplementation 'org.seleniumhq.selenium:selenium-support'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')

From ba368dd9e40477f7e025e179e820d03d48a396e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 28 Jun 2023 13:55:53 -0600
Subject: [PATCH 2982/4969] Use cucumber-bom and selenium-bom (#7249)

---
 examples/cucumber/build.gradle | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index e4eb9bbb3d6..4f940b0feed 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,11 +7,14 @@ repositories {
 }
 
 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:7.12.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.12.0'
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.10.0')
+    implementation 'org.seleniumhq.selenium:selenium-remote-driver'
+    implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
+    implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
+
+    testImplementation platform('io.cucumber:cucumber-bom:7.12.1')
+    testImplementation 'io.cucumber:cucumber-java'
+    testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From c63ae154b76f33fdc962d41dec811ed883f78b86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:32 +0000
Subject: [PATCH 2983/4969] Bump io.r2dbc:r2dbc-mssql in /modules/mssqlserver

Bumps [io.r2dbc:r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 1.0.0.RELEASE to 1.0.1.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v1.0.1.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v1.0.0.RELEASE...v1.0.1.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 4aa1ecd440d..42e620ed506 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre8'
 
     testImplementation project(':r2dbc')
-    testImplementation 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))

From 2748892bdff6fe183f3f7048f20921d4afe3780c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:34 +0000
Subject: [PATCH 2984/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.8.0 to 6.9.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v6.8.0...v6.9.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 457f29e660d..b275a189ada 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.influxdb:influxdb-java:2.23'
-    testImplementation "com.influxdb:influxdb-client-java:6.8.0"
+    testImplementation "com.influxdb:influxdb-client-java:6.9.0"
 }

From b58b6841d8862eaed0cdbbcf5d9d718ef90634e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:39 +0000
Subject: [PATCH 2985/4969] Bump com.yugabyte:jdbc-yugabytedb in
 /modules/yugabytedb

Bumps [com.yugabyte:jdbc-yugabytedb](https://github.com/yugabyte/pgjdbc) from 42.3.5-yb-2 to 42.3.5-yb-3.
- [Release notes](https://github.com/yugabyte/pgjdbc/releases)
- [Changelog](https://github.com/yugabyte/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yugabyte/pgjdbc/compare/v42.3.5-yb-2...v42.3.5-yb-3)

---
updated-dependencies:
- dependency-name: com.yugabyte:jdbc-yugabytedb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index a84b49c1a71..f02739b3ec8 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-12'
     // YSQL driver
-    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-2'
+    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-3'
 }

From 215bc849e715d75ba813bdc7578e330e8ec5e493 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:41 +0000
Subject: [PATCH 2986/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.14.0 to 4.16.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.14.0...4.16.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1845bb6d195..b975e7aae01 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.14.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.16.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.6")

From 051f9128a0e7671c45bf8382fbacfeaff397bf2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:43 +0000
Subject: [PATCH 2987/4969] Bump com.datastax.oss:java-driver-core in
 /modules/cassandra

Bumps [com.datastax.oss:java-driver-core](https://github.com/datastax/java-driver) from 4.15.0 to 4.16.0.
- [Release notes](https://github.com/datastax/java-driver/releases)
- [Commits](https://github.com/datastax/java-driver/compare/4.15.0...4.16.0)

---
updated-dependencies:
- dependency-name: com.datastax.oss:java-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 38f48887a12..1101a911bae 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     api project(":database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
-    testImplementation 'com.datastax.oss:java-driver-core:4.15.0'
+    testImplementation 'com.datastax.oss:java-driver-core:4.16.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 5a1da70effc8447665637da3f6e8ed225e1aa5ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:44 +0000
Subject: [PATCH 2988/4969] Bump io.asyncer:r2dbc-mysql from 0.9.0 to 1.0.2 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 0.9.0 to 1.0.2.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-0.9.0...r2dbc-mysql-1.0.2)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 68284c8e123..cd77e13d395 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:0.9.0'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.0.2'
 
     testImplementation project(':jdbc-test')
     testImplementation 'mysql:mysql-connector-java:8.0.32'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'io.asyncer:r2dbc-mysql:0.9.0'
+    testImplementation 'io.asyncer:r2dbc-mysql:1.0.2'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 07d5f1e1ed16581b9ac78c41e9bb9427d12ce7cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:46 +0000
Subject: [PATCH 2989/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.2.0.jre8 to 12.3.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4aa1ecd440d..8041e205a11 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.1.jre8-preview'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:1.0.0.RELEASE'

From 8a77e1266c3bfef0a1060f13535b0574c7ff2d01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:46 +0000
Subject: [PATCH 2990/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin from 1.10 to 1.11

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.10 to 1.11.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f0e3769d92f..b47efc2b98f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }
 }

From 47b14ff853c520df50c80577a50335ade49e6619 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:47 +0000
Subject: [PATCH 2991/4969] Bump io.trino:trino-jdbc from 411 to 420 in
 /modules/trino

Bumps io.trino:trino-jdbc from 411 to 420.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 2b3ccb11a87..00a59b76e52 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:411'
+    testImplementation 'io.trino:trino-jdbc:420'
     compileOnly 'org.jetbrains:annotations:24.0.0'
 }

From c2c21b5d71bca9b2400af269ef08a1e91cc86a67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:48 +0000
Subject: [PATCH 2992/4969] Bump commons-io:commons-io from 2.11.0 to 2.13.0 in
 /modules/hivemq

Bumps commons-io:commons-io from 2.11.0 to 2.13.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1845bb6d195..fe303307337 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.0.1")
 
     shaded("org.apache.commons:commons-lang3:3.12.0")
-    shaded("commons-io:commons-io:2.11.0")
+    shaded("commons-io:commons-io:2.13.0")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From 013d8b1848d7776cccf03aa912967e3471b7115b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:50 +0000
Subject: [PATCH 2993/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.17 to 3.2.20.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.17...3.2.20)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 6ce056d2601..f2cfaa3b248 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.17"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.20"
 }

From d709fc870b737a0c2ec210025e7ef7ce264b9d96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:51 +0000
Subject: [PATCH 2994/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.7 to 10.1.10.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index a3fb4c4dd89..6a7f46fb943 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.7'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.10'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From be3a0253681c923d66b74d8b7d3ae2f85813089f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:52 +0000
Subject: [PATCH 2995/4969] Bump org.springframework.boot from 2.7.10 to 2.7.13
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.10 to 2.7.13.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.10...v2.7.13)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 820564255b2..5b99b3c42dc 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.7.10'
+    id 'org.springframework.boot' version '2.7.13'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 00edc4c78d3..7452a492bb7 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.7.10'
+    id 'org.springframework.boot' version '2.7.13'
 }
 apply plugin: 'io.spring.dependency-management'
 

From cec4b1a2320d6b54649f61466b92b76bcdcb6015 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:52 +0000
Subject: [PATCH 2996/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.8.1 to 4.10.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.8.1...selenium-4.10.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 6ea97fc2506..f8e2ea02742 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testImplementation 'mysql:mysql-connector-java:8.0.32'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.8.1"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.10.0"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From bfe9b37d2ab2833e75ad2e3ac38d3e93cb5a3846 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:55 +0000
Subject: [PATCH 2997/4969] Bump com.google.auto.service:auto-service in
 /modules/postgresql

Bumps [com.google.auto.service:auto-service](https://github.com/google/auto) from 1.0.1 to 1.1.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-common-1.0.1...auto-service-1.1.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/postgresql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index b21f21d4e68..8ae6a09e3a9 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0.1'
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
     api project(':jdbc')
 

From 8d233c538eeb985db47fed794822b791b5d23299 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:56 +0000
Subject: [PATCH 2998/4969] Bump com.google.auto.service:auto-service in
 /modules/mariadb

Bumps [com.google.auto.service:auto-service](https://github.com/google/auto) from 1.0.1 to 1.1.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-common-1.0.1...auto-service-1.1.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 697544c9e4f..a5fc69ce69a 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0.1'
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
     api project(':jdbc')
 

From 9fc1bcb33047f6f2aad2992a1daf10b70c8632e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:57 +0000
Subject: [PATCH 2999/4969] Bump com.google.auto.service:auto-service in
 /modules/mysql

Bumps [com.google.auto.service:auto-service](https://github.com/google/auto) from 1.0.1 to 1.1.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-common-1.0.1...auto-service-1.1.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 68284c8e123..a1b9587761d 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0.1'
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
     api project(':jdbc')
 

From 6d98a972c9c3bf92ae94ee4990eea7435adbb23c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:58 +0000
Subject: [PATCH 3000/4969] Bump com.google.auto.service:auto-service in
 /modules/oracle-xe

Bumps [com.google.auto.service:auto-service](https://github.com/google/auto) from 1.0 to 1.1.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-value-1.0...auto-service-1.1.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index c1f44bb9427..f0c5b123cc4 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: Oracle XE"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0'
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
     api project(':jdbc')
 

From 73859112ecf6321df60352788654fcd20470296b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:56:59 +0000
Subject: [PATCH 3001/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.17 to 3.2.20.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.17...3.2.20)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 6ce056d2601..3c71072d77e 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.17"
+    api "com.orientechnologies:orientdb-client:3.2.20"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'

From 088a1c93847b108020e0c8e7f6c439ae3099e4b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:00 +0000
Subject: [PATCH 3002/4969] Bump com.google.auto.service:auto-service in
 /modules/mssqlserver

Bumps [com.google.auto.service:auto-service](https://github.com/google/auto) from 1.0.1 to 1.1.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-common-1.0.1...auto-service-1.1.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 4aa1ecd440d..9f2a3d2011c 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: MS SQL Server"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0.1'
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
     api project(':jdbc')
 

From 1e30f0fa4c4c8a0094844ccf795e04e9c6a42986 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:01 +0000
Subject: [PATCH 3003/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.4.0 to 3.5.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 9728203a87c..83dea92145f 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.5.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 3659d2e52dce36e93351908b2e80f2b4ea60db8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:02 +0000
Subject: [PATCH 3004/4969] Bump com.google.auto.service:auto-service in
 /modules/r2dbc

Bumps [com.google.auto.service:auto-service](https://github.com/google/auto) from 1.0.1 to 1.1.1.
- [Release notes](https://github.com/google/auto/releases)
- [Commits](https://github.com/google/auto/compare/auto-common-1.0.1...auto-service-1.1.1)

---
updated-dependencies:
- dependency-name: com.google.auto.service:auto-service
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 5d8db9abec1..98ac44d204b 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -5,8 +5,8 @@ plugins {
 description = "Testcontainers :: R2DBC"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0.1'
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'

From d12b4683ed5dddd49c19027edc722015179b7eed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:03 +0000
Subject: [PATCH 3005/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.4.0 to 3.5.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 52fe94d2ab1..bd8faafde64 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.5.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.0'
 }

From ac84330b0b7a89b493cd5e7b1a3199489c9c1447 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:05 +0000
Subject: [PATCH 3006/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.19.0 to 10.21.0.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 3cfcaac8442..d450525288d 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.19.0'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.21.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 9e814d83f4dac5edebeefec41cd9979b95257891 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:07 +0000
Subject: [PATCH 3007/4969] Bump io.fabric8:kubernetes-client from 6.5.1 to
 6.7.2 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.5.1 to 6.7.2.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.5.1...v6.7.2)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index e4fad44abfa..2e25b4089da 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.5.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.7.2'
     testImplementation 'io.kubernetes:client-java:18.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From eca4a8f463cee380ce34a95d64a3e8e7db11ea0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:08 +0000
Subject: [PATCH 3008/4969] Bump redis.clients:jedis from 4.3.2 to 4.4.3 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.3.2 to 4.4.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.3.2...v4.4.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d5adb84109d..d4f99df181e 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.3.2'
+    testImplementation 'redis.clients:jedis:4.4.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 07d30db7c1e25edab662ec78a38ff2216369264f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:57:11 +0000
Subject: [PATCH 3009/4969] Bump com.azure:azure-cosmos from 4.42.0 to 4.47.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.42.0 to 4.47.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.42.0...azure-cosmos_4.47.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 83319057269..f92097293cf 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.42.0'
+    testImplementation 'com.azure:azure-cosmos:4.47.0'
 }

From 63c237064ae9317d4ab5be78b191a5621a97715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 30 Jun 2023 10:23:52 -0600
Subject: [PATCH 3010/4969] Add Synthesized (#7258)

---
 docs/test_framework_integration/external.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/test_framework_integration/external.md b/docs/test_framework_integration/external.md
index 2082af93bf0..b3f55783123 100644
--- a/docs/test_framework_integration/external.md
+++ b/docs/test_framework_integration/external.md
@@ -6,4 +6,4 @@ The following Open Source frameworks add direct integration to Testcontainers
 | --- | --- | --- |
 | jqwik | [jqwik-testcontainers](https://github.com/jqwik-team/jqwik-testcontainers) | [README](https://github.com/jqwik-team/jqwik-testcontainers) |
 | Kotest | [Kotest Extensions Testcontainers](https://github.com/kotest/kotest-extensions-testcontainers) | [kotest.io](https://kotest.io/docs/extensions/test_containers.html) |
-
+| Synthesized | [Synthesized TDK-Testcontainers integration](https://github.com/synthesized-io/tdk-tc) | [synthesized.io](https://docs.synthesized.io/tdk/latest/user_guide/integrations/testcontainers) |

From c69ebca082e1aa382cda5a81de93dab1e6bfe426 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:05:24 +0000
Subject: [PATCH 3011/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.441 to 1.12.500.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.441...1.12.500)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 75c8e9b5977..52ba6750403 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.441'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.441'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From b7e1b692970f61e58214d1f3ccce83f9b4d270be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:19:47 +0000
Subject: [PATCH 3012/4969] Bump com.rabbitmq:amqp-client from 5.17.0 to 5.18.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.17.0 to 5.18.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.17.0...v5.18.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index c9c63399d69..06403818c22 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.17.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.18.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 94dec8fd3eb68614f2c97594383c4162140b38e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:19:49 +0000
Subject: [PATCH 3013/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /modules/neo4j

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.11 to 4.4.12.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.11...4.4.12)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index eb39de5912f..7ac0d5071d9 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.12'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 07dbe10c6cb96d644be885e3885706b56049b151 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:20:31 +0000
Subject: [PATCH 3014/4969] Bump org.questdb:questdb from 7.1.3 to 7.2 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.1.3 to 7.2.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.1.3...7.2)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 83dee2eaadb..5e272c6d82e 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.1.3'
+    testImplementation 'org.questdb:questdb:7.2'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 5e27d79e07c59c7ba9f61ff9a3710a893474f0d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:21:16 +0000
Subject: [PATCH 3015/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.17.0 to 26.18.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.17.0...v26.18.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 7ce58b3a43e..8815961168b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.17.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.18.0")
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'
     testImplementation 'com.google.cloud:google-cloud-pubsub'

From 9de13bd42cc5b42c99b2883810e050f06d26bae3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:21:28 +0000
Subject: [PATCH 3016/4969] Bump io.rest-assured:rest-assured in
 /modules/redpanda

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.0 to 5.3.1.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.3.0...rest-assured-5.3.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 52fe94d2ab1..6685e2f96ed 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'io.rest-assured:rest-assured:5.3.0'
+    testImplementation 'io.rest-assured:rest-assured:5.3.1'
 }

From 9057bce81ad8e430ab108f6f7c858afd91e4dd07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:21:47 +0000
Subject: [PATCH 3017/4969] Bump peter-evans/create-pull-request from 4.2.4 to
 5.0.2

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.2.4 to 5.0.2.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/38e0b6e68b4c852a5500a94740f0e535e0d7ba54...153407881ec5c347639a548ade7d8ad1d6740e38)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 8d69726bef3..6e93a5e307b 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v3.10.1
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 2a8f366e548..a98bb08a571 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v3.10.1
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
         with:
           title: Update testcontainers version to ${GITHUB_REF##*/}
           body: |

From 968ea1f306fbcaa2a15860240f6e5efeefeb58c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:21:51 +0000
Subject: [PATCH 3018/4969] Bump release-drafter/release-drafter from 5.23.0 to
 5.24.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.23.0 to 5.24.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/569eb7ee3a85817ab916c8f8ff03a5bd96c9c83e...65c5fb495d1e69aa8c08a3317bc44ff8aabe9772)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 0e0440cefc3..8d80a47f839 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@569eb7ee3a85817ab916c8f8ff03a5bd96c9c83e # v5.19.0
+      - uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 1030dd32ac2f44699d71bf8b8d57a17391120d8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:33:04 +0000
Subject: [PATCH 3019/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.9.0 to 4.10.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.9.0...r4.10.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index ddc346dd90b..2a97a302185 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.9.0")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.10.1")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 63e40a52e6bef2bf0aa301b67938d64e95b96f0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:38:59 +0000
Subject: [PATCH 3020/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.489 to 1.12.500.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.489...1.12.500)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 257439db218..bd6c7cbe439 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.489")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.500")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From 72dee56ed44123db07cd53b4b7f16746753498c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:39:01 +0000
Subject: [PATCH 3021/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.38 to 2.20.97.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 257439db218..e67e04a5594 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.38'
+    testImplementation 'software.amazon.awssdk:s3:2.20.97'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e5f8aa1027393dafe21844f26074897ff2582eb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:41:58 +0000
Subject: [PATCH 3022/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.4 to 3.5.7.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.4...v3.5.7)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 5d8db9abec1..e16ed1d5ae4 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.4'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.7'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 6026d86c0b32708e1f86a5275957208ded5e1be7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:43:51 +0000
Subject: [PATCH 3023/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.6 to 1.4.8.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.6...v_1.4.8)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1845bb6d195..28ef2f2b39b 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.14.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.4.6")
+    testImplementation("ch.qos.logback:logback-classic:1.4.8")
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
 }

From 90dba4c2faef79d83733a9f097e8d777dcfc43e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:46:00 +0000
Subject: [PATCH 3024/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.4 to 3.4.7.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.4.4...java-client-3.4.7)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 3e8dca2c1ad..0479c2f1b2d 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.4'
+    testImplementation 'com.couchbase.client:java-client:3.4.7'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From cf0c9181c908c17dbccac65f1d14e0e64e415f1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:47:48 +0000
Subject: [PATCH 3025/4969] Bump io.rest-assured:rest-assured from 5.3.0 to
 5.3.1 in /modules/vault

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.0 to 5.3.1.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.3.0...rest-assured-5.3.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 2ee8e29f1d7..05ff922e005 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.3.0'
+    testImplementation 'io.rest-assured:rest-assured:5.3.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 
 }

From 7eecd39cc8d3c805406924f99856ee7e77a434bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:50:08 +0000
Subject: [PATCH 3026/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.9 to 7.17.11.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.9...v7.17.11)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index b9d626fb1ce..75c12c78753 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.7.0"
-    testImplementation "org.elasticsearch.client:transport:7.17.9"
+    testImplementation "org.elasticsearch.client:transport:7.17.11"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From b66669d4ecda7b3a8b81c65317607daf6e98a80d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:54:56 +0000
Subject: [PATCH 3027/4969] Bump org.mongodb:mongo-java-driver from 3.12.12 to
 3.12.14 in /core

Bumps [org.mongodb:mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.12 to 3.12.14.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.12...r3.12.14)

---
updated-dependencies:
- dependency-name: org.mongodb:mongo-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index f95c4f49e71..8e7b15a3574 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -105,7 +105,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.3.2'
     testImplementation 'com.rabbitmq:amqp-client:5.17.0'
-    testImplementation 'org.mongodb:mongo-java-driver:3.12.12'
+    testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 54cda6ff89e4a2cab584d9dd2710384df48bbe9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:58:17 +0000
Subject: [PATCH 3028/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin in /examples

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.10 to 1.11.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index e43084b6e6a..aeb3de67bfe 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index f0e3769d92f..b47efc2b98f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }
 }

From 68bc46b71fb39e03fe534eb969639012e1942f24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:58:21 +0000
Subject: [PATCH 3029/4969] Bump org.projectlombok:lombok from 1.18.26 to
 1.18.28 in /examples

Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.26 to 1.18.28.
- [Release notes](https://github.com/projectlombok/lombok/releases)
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.26...v1.18.28)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle  | 4 ++--
 examples/solr-container/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 7086bc5b592..6136e8ca57a 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.26"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.26"
+    testCompileOnly "org.projectlombok:lombok:1.18.28"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index e4144a5b545..585c7696eaf 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.26"
-    annotationProcessor "org.projectlombok:lombok:1.18.26"
+    compileOnly "org.projectlombok:lombok:1.18.28"
+    annotationProcessor "org.projectlombok:lombok:1.18.28"
 
     implementation 'org.apache.solr:solr-solrj:8.11.2'
 

From c6a7a6f62319974befbd85389a4aec0d2b48556e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:58:25 +0000
Subject: [PATCH 3030/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index f463202f65f..027d5bc4919 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.3.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From a977680d449479736df222a086eefab215738775 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:58:49 +0000
Subject: [PATCH 3031/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 31.1-jre to 32.1.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7ffb58a51a3..1b2abd25070 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:31.1-jre'
+    api 'com.google.guava:guava:32.1.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.7'

From ad74a3a85bfb8c06dfcad6be348b3b4cfc0b3b34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:58:58 +0000
Subject: [PATCH 3032/4969] Bump ch.qos.logback:logback-classic from 1.3.5 to
 1.3.8 in /examples

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.3.5 to 1.3.8.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.5...v_1.3.8)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle                                    | 2 +-
 docs/examples/spock/redis/build.gradle          | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index c5500440910..6ea7008e9e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,7 +122,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     }
 
     checkstyle {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 576f02b67d6..4485fd733b6 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.3.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 63f43c11143..a47f4dc3bc2 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -9,6 +9,6 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.2.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index fdd4db1ccc8..4b02c761169 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 7086bc5b592..2ed4bf51719 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 1aa9dae1b23..a46914a6522 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20230227'
     testImplementation 'org.postgresql:postgresql:42.6.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index feeccdb32a6..3726e8ca670 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.10'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 0f284e3ffa7..10bea48d7c3 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index d5807de0899..f47dab71cb7 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 8a538a7d11f..0e7b08957eb 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index a8319bddfa9..0ef93d5151c 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index ddbe2ebcfc2..88037f53121 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.4.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }

From 6f0ea0bc2026553b268cfcdc0f7df333644e96b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 23:32:58 +0000
Subject: [PATCH 3033/4969] Bump io.rest-assured:rest-assured from 5.3.0 to
 5.3.1 in /modules/consul

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.0 to 5.3.1.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.3.0...rest-assured-5.3.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index e8123eb30c7..69bb253544b 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.3.0'
+    testImplementation 'io.rest-assured:rest-assured:5.3.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From ab4081a375ab7075538d5cb0c40a6021d498d511 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 16:58:50 +0000
Subject: [PATCH 3034/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.12.6 to 3.13.4.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index b47efc2b98f..0dd7acbde42 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.13.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }

From ccfe2288b09e4bdcebea3117613dec6dcf07fd7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 16:59:11 +0000
Subject: [PATCH 3035/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.7.0 to 8.8.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.7.0...v8.8.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 75c12c78753..3c7221a6fbb 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.7.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.8.2"
     testImplementation "org.elasticsearch.client:transport:7.17.11"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9a4abd59ada5e4af026f5f0b35570aa2a9605540 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 16:59:11 +0000
Subject: [PATCH 3036/4969] Bump com.rabbitmq:amqp-client from 5.17.0 to 5.18.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.17.0 to 5.18.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.17.0...v5.18.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 8e7b15a3574..13281eb988c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -104,7 +104,7 @@ dependencies {
     testImplementation 'com.google.cloud.tools:jib-core:0.23.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.3.2'
-    testImplementation 'com.rabbitmq:amqp-client:5.17.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.18.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From beccd29cdf4ee16368dde5287fb394da486cb74f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 19:48:13 +0000
Subject: [PATCH 3037/4969] Bump redis.clients:jedis from 4.3.2 to 4.4.3 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.3.2 to 4.4.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.3.2...v4.4.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 13281eb988c..ac5673e624e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -103,7 +103,7 @@ dependencies {
 
     testImplementation 'com.google.cloud.tools:jib-core:0.23.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:4.3.2'
+    testImplementation 'redis.clients:jedis:4.4.3'
     testImplementation 'com.rabbitmq:amqp-client:5.18.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From 06c591df4af0484dd0b4b4e231f0fa01b799ba05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 20:33:08 +0000
Subject: [PATCH 3038/4969] Bump org.testng:testng from 7.5 to 7.5.1 in
 /examples

Bumps [org.testng:testng](https://github.com/cbeust/testng) from 7.5 to 7.5.1.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/compare/7.5...7.5.1)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 10bea48d7c3..4eb0ed41442 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
-    testImplementation 'org.testng:testng:7.5'
+    testImplementation 'org.testng:testng:7.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From 1e317bd9056939c347edefc197e25e52dc6f30b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 20:34:17 +0000
Subject: [PATCH 3039/4969] Bump mysql:mysql-connector-java from 8.0.32 to
 8.0.33 in /examples

Bumps mysql:mysql-connector-java from 8.0.32 to 8.0.33.

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index f8e2ea02742..3adcde69769 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation project(":selenium")
     testImplementation project(":mysql")
 
-    testImplementation 'mysql:mysql-connector-java:8.0.32'
+    testImplementation 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.10.0"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From b6ef74dea95c55b6c97974357449b98fd2cbfc70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 20:34:18 +0000
Subject: [PATCH 3040/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/spock

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 18dfe9083b8..1371618d7af 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.3'
 
     testCompileOnly 'org.jetbrains:annotations:24.0.1'

From 6e4f50e462a1b73d905ce6a479b09363aa769637 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 20:34:23 +0000
Subject: [PATCH 3041/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/v1.3.0...v1.3.1)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 67141b924f6..06d437bc328 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.16.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.8")
     testImplementation 'org.assertj:assertj-core:3.24.2'

From f366b7171bf1b5fa9de774d2559155d7c3c37a75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Jul 2023 20:34:29 +0000
Subject: [PATCH 3042/4969] Bump org.jetbrains:annotations from 24.0.0 to
 24.0.1 in /modules/trino

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.0 to 24.0.1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.0...24.0.1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 00a59b76e52..4c204028132 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.trino:trino-jdbc:420'
-    compileOnly 'org.jetbrains:annotations:24.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 0ba2fc3173fd95f1830fc69b72a2f0638ff88491 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 01:21:28 +0000
Subject: [PATCH 3043/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.6.2 to 3.6.4.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.6.2...3.6.4)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index d6679a477d8..01a024a6a82 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     api "com.orientechnologies:orientdb-client:3.2.20"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.2'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.20"
 }

From 385e530c48292e0d244f053ef795a50a5990f42e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 01:22:18 +0000
Subject: [PATCH 3044/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 027d5bc4919..d6812ff3cb8 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.2.3.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")

From 7e779e50fda5794e4e607e71785bc68d47e8d3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 3 Jul 2023 14:06:14 -0600
Subject: [PATCH 3045/4969] Update lombok version to 1.18.28 (#7293)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6ea7008e9e7..105ff37ad8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ subprojects {
     }
 
     lombok {
-        version = '1.18.26'
+        version = '1.18.28'
     }
 
 

From 20f6067cdbae5e65cbcb95826e90237a24595892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 3 Jul 2023 17:12:13 -0600
Subject: [PATCH 3046/4969] Use testRuntimeOnly for JDBC/R2DBC drivers (#7295)

---
 docs/examples/junit4/generic/build.gradle | 2 +-
 examples/linked-container/build.gradle    | 2 +-
 modules/clickhouse/build.gradle           | 2 +-
 modules/cockroachdb/build.gradle          | 2 +-
 modules/cratedb/build.gradle              | 2 +-
 modules/db2/build.gradle                  | 2 +-
 modules/mariadb/build.gradle              | 2 +-
 modules/mssqlserver/build.gradle          | 2 +-
 modules/mysql/build.gradle                | 4 ++--
 modules/oracle-xe/build.gradle            | 2 +-
 modules/postgresql/build.gradle           | 4 ++--
 modules/presto/build.gradle               | 2 +-
 modules/questdb/build.gradle              | 2 +-
 modules/tidb/build.gradle                 | 2 +-
 modules/trino/build.gradle                | 2 +-
 modules/yugabytedb/build.gradle           | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 3adcde69769..5448a05328e 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation project(":selenium")
     testImplementation project(":mysql")
 
-    testImplementation 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.10.0"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 6aeb7073073..21f34e736e5 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'org.json:json:20230227'
-    testImplementation 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 2374186fd38..536e12c30cd 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
+    testRuntimeOnly 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 0e26a6f2a96..37c896fe889 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 1885f79c14c..80ad7beaed6 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 1055c261cdf..17360f6f976 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.ibm.db2:jcc:11.5.8.0'
+    testRuntimeOnly 'com.ibm.db2:jcc:11.5.8.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index 5363933fd1a..29002623e39 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.4'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'org.mariadb:r2dbc-mariadb:1.0.3'
+    testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 }
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 3a23be4155c..9805ad9643c 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.1.jre8-preview'
 
     testImplementation project(':r2dbc')
-    testImplementation 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
+    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 073e70c0865..454c179b7f8 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -10,10 +10,10 @@ dependencies {
     compileOnly 'io.asyncer:r2dbc-mysql:1.0.2'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'io.asyncer:r2dbc-mysql:1.0.2'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.2'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 97e7c9e29ec..f5704d93454 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
+    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
 }
 
 test {
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 8ae6a09e3a9..c49ea84ed9f 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -10,10 +10,10 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
+    testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 63441839eb0..ff190b0287a 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.prestosql:presto-jdbc:350'
+    testRuntimeOnly 'io.prestosql:presto-jdbc:350'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 5e272c6d82e..f706964354f 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testImplementation 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.questdb:questdb:7.2'
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 42f032c1329..d9851d7a7e2 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 4c204028132..942675e9020 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:420'
+    testRuntimeOnly 'io.trino:trino-jdbc:420'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index f02739b3ec8..2f04334ecb2 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-12'
     // YSQL driver
-    testImplementation 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-3'
+    testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-3'
 }

From a00d048d2a2795df7efeea6022b20440715acb94 Mon Sep 17 00:00:00 2001
From: Fouad Almalki <me@fouad.io>
Date: Wed, 5 Jul 2023 00:49:02 +0300
Subject: [PATCH 3047/4969] Fix MSSQL's default username (#7238)

According to the [docs](https://hub.docker.com/_/microsoft-mssql-server), the username is `sa`.
Default collation is `SQL_Latin1_General_CP1_CI_AS` which is case insensitive.
---
 .../org/testcontainers/containers/MSSQLServerContainer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index b7356a0f81c..6d4591490bd 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -20,7 +20,7 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
 
     public static final Integer MS_SQL_SERVER_PORT = 1433;
 
-    static final String DEFAULT_USER = "SA";
+    static final String DEFAULT_USER = "sa";
 
     static final String DEFAULT_PASSWORD = "A_Str0ng_Required_Password";
 

From 595076c21573b96b73c4d8b1c6808ad6134e99ee Mon Sep 17 00:00:00 2001
From: julianladisch <julianladisch@users.noreply.github.com>
Date: Wed, 5 Jul 2023 00:37:00 +0200
Subject: [PATCH 3048/4969] SnakeYaml SafeConstructor restricting
 deserialization (#6319)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ParsedDockerComposeFile is vulnerable to deserialization gadget chain attacks
that can lead to remote code execution when the file has untrusted content:
https://nvd.nist.gov/vuln/detail/CVE-2022-1471

This should be fixed by using SafeConstructor as suggested by the SnakeYaml
developers.

Deserialization of arbitrary Java types is not used by the Compose file spec
and therefore can be disabled without any loss of functionality:
https://docs.docker.com/compose/compose-file/

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/ParsedDockerComposeFile.java     |  4 +++-
 .../containers/ParsedDockerComposeFileBean.java | 10 ++++++++++
 .../ParsedDockerComposeFileValidationTest.java  | 17 +++++++++++++++++
 .../docker-compose-deserialization.yml          |  3 +++
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileBean.java
 create mode 100644 core/src/test/resources/docker-compose-deserialization.yml

diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index abb6deaab3d..c62eb8f9964 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -7,7 +7,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.testcontainers.images.ParsedDockerfile;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,7 +37,7 @@ class ParsedDockerComposeFile {
     private Map<String, Set<String>> serviceNameToImageNames = new HashMap<>();
 
     ParsedDockerComposeFile(File composeFile) {
-        Yaml yaml = new Yaml();
+        Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
         try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) {
             composeFileContent = yaml.load(fileInputStream);
         } catch (Exception e) {
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileBean.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileBean.java
new file mode 100644
index 00000000000..8edca5a580a
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileBean.java
@@ -0,0 +1,10 @@
+package org.testcontainers.containers;
+
+public class ParsedDockerComposeFileBean {
+
+    public String foo;
+
+    public ParsedDockerComposeFileBean(String foo) {
+        this.foo = foo;
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index 8a41ac8d8a4..c362cd28f8c 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
+import lombok.SneakyThrows;
 import org.junit.Test;
 
 import java.io.File;
@@ -61,6 +62,22 @@ public void shouldIgnoreUnknownStructure() {
         new ParsedDockerComposeFile(ImmutableMap.of("version", "9000"));
     }
 
+    @Test
+    @SneakyThrows
+    public void shouldRejectDeserializationOfArbitraryClasses() {
+        // Reject deserialization gadget chain attacks: https://nvd.nist.gov/vuln/detail/CVE-2022-1471
+        // https://raw.githubusercontent.com/mbechler/marshalsec/master/marshalsec.pdf
+
+        File file = new File("src/test/resources/docker-compose-deserialization.yml");
+
+        // ParsedDockerComposeFile should reject deserialization of ParsedDockerComposeFileBean
+        assertThatThrownBy(() -> {
+                new ParsedDockerComposeFile(file);
+            })
+            .hasMessageContaining(file.getAbsolutePath())
+            .hasMessageContaining("Unable to parse YAML file");
+    }
+
     @Test
     public void shouldObtainImageNamesV1() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml");
diff --git a/core/src/test/resources/docker-compose-deserialization.yml b/core/src/test/resources/docker-compose-deserialization.yml
new file mode 100644
index 00000000000..db7a22be665
--- /dev/null
+++ b/core/src/test/resources/docker-compose-deserialization.yml
@@ -0,0 +1,3 @@
+redis:
+    image: redis
+    key: !!org.testcontainers.containers.ParsedDockerComposeFileBean '{foo: bar}'

From 9fbbede63584701b075668317a97b6ebe3c9c768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 6 Jul 2023 15:19:48 -0600
Subject: [PATCH 3049/4969] Update java version in .sdkmanrc

---
 .sdkmanrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.sdkmanrc b/.sdkmanrc
index 95cd27dd1ad..c09dba9cac1 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.345-tem
+java=8.0.372-tem

From 8b9d4de224e0d195683a60d6580a92646f682775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 6 Jul 2023 15:21:07 -0600
Subject: [PATCH 3050/4969] Do not trigger CI when .sdkmanrc is updated

---
 .github/workflows/ci-docker-wormhole.yml | 2 ++
 .github/workflows/ci-examples.yml        | 2 ++
 .github/workflows/ci-rootless.yml        | 2 ++
 .github/workflows/ci.yml                 | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 0bfdcee47e5..2dd4c1f6d1f 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -12,6 +12,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
   push:
     branches: [ main ]
     paths-ignore:
@@ -24,6 +25,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index 20bf682abad..f37d71ebf73 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -12,6 +12,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
   push:
     branches: [ main ]
     paths-ignore:
@@ -25,6 +26,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 8c1d31a6a80..f948cc23ae5 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -12,6 +12,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
   push:
     branches: [ main ]
     paths-ignore:
@@ -24,6 +25,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9095565d83f..770a8e387c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
   push:
     branches: [ main ]
     paths-ignore:
@@ -24,6 +25,7 @@ on:
       - 'mkdocs.yml'
       - 'README.md'
       - 'RELEASING.md'
+      - '.sdkmanrc'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"

From 2f8c326d20783bf89722a17ba659aaeb1f720ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 6 Jul 2023 20:38:41 -0600
Subject: [PATCH 3051/4969] Update docker-java version to 3.3.2 (#7303)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index ac5673e624e..c5346dd2391 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,8 +86,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.1')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.1')
+    api platform('com.github.docker-java:docker-java-bom:3.3.2')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.2')
 
     api "com.github.docker-java:docker-java-api"
 

From 1835f976c1b63c2be4c77b3e6b2c3802356db978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 12 Jul 2023 16:14:31 -0600
Subject: [PATCH 3052/4969] Polish tests in hivemq module (#7308)

Test classes/methods in JUnit 5 don't need to be public.
---
 .../testcontainers/hivemq/ContainerWithControlCenterIT.java | 4 ++--
 .../testcontainers/hivemq/ContainerWithCustomConfigIT.java  | 2 +-
 .../hivemq/ContainerWithExtensionFromDirectoryIT.java       | 2 +-
 .../org/testcontainers/hivemq/ContainerWithExtensionIT.java | 2 +-
 .../hivemq/ContainerWithExtensionSubclassIT.java            | 2 +-
 .../hivemq/ContainerWithFileInExtensionHomeIT.java          | 2 +-
 .../testcontainers/hivemq/ContainerWithFileInHomeIT.java    | 2 +-
 .../org/testcontainers/hivemq/ContainerWithLicenseIT.java   | 2 +-
 .../hivemq/ContainerWithoutPlatformExtensionsIT.java        | 6 +++---
 .../hivemq/CreateFileInCopiedDirectoryIT.java               | 2 +-
 .../hivemq/CreateFileInExtensionDirectoryIT.java            | 2 +-
 .../hivemq/DisableEnableExtensionFromDirectoryIT.java       | 2 +-
 .../org/testcontainers/hivemq/DisableEnableExtensionIT.java | 2 +-
 .../testcontainers/hivemq/docs/DemoDisableExtensionsIT.java | 2 +-
 .../testcontainers/hivemq/docs/DemoExtensionTestsIT.java    | 4 ++--
 .../java/org/testcontainers/hivemq/docs/DemoFilesIT.java    | 4 ++--
 .../testcontainers/hivemq/docs/DemoHiveMQContainerIT.java   | 4 ++--
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
index a3e8a20216d..6d122d824fd 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithControlCenterIT.java
@@ -10,13 +10,13 @@
 
 import java.util.concurrent.TimeUnit;
 
-public class ContainerWithControlCenterIT {
+class ContainerWithControlCenterIT {
 
     public static final int CONTROL_CENTER_PORT = 8080;
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    public void test() throws Exception {
+    void test() throws Exception {
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
                 .withControlCenter()
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
index 3a3f2d13bb7..aed446db203 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
@@ -13,7 +13,7 @@
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class ContainerWithCustomConfigIT {
+class ContainerWithCustomConfigIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
index c1e6e72cc32..6fef56c0a2d 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
@@ -9,7 +9,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-public class ContainerWithExtensionFromDirectoryIT {
+class ContainerWithExtensionFromDirectoryIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
index 01a67e0dcfb..eda3f236e2c 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
@@ -9,7 +9,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-public class ContainerWithExtensionIT {
+class ContainerWithExtensionIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
index 1f3d9de4aeb..cd1df9ce8e7 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
@@ -10,7 +10,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-public class ContainerWithExtensionSubclassIT {
+class ContainerWithExtensionSubclassIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
index a5b5238ce25..dde5e677a15 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
@@ -20,7 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
 
-public class ContainerWithFileInExtensionHomeIT {
+class ContainerWithFileInExtensionHomeIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
index 2fd387f394c..78a51398bf3 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
@@ -20,7 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
 
-public class ContainerWithFileInHomeIT {
+class ContainerWithFileInHomeIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
index 9d82188c35c..f6aa6ed08f0 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
@@ -20,7 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
 
-public class ContainerWithLicenseIT {
+class ContainerWithLicenseIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
index fde18e09285..f29897e6a1e 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
@@ -26,7 +26,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ContainerWithoutPlatformExtensionsIT {
+class ContainerWithoutPlatformExtensionsIT {
 
     @NotNull
     private final HiveMQExtension hiveMQExtension = HiveMQExtension
@@ -39,7 +39,7 @@ public class ContainerWithoutPlatformExtensionsIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    public void removeAllPlatformExtensions() throws InterruptedException {
+    void removeAllPlatformExtensions() throws InterruptedException {
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
                 .withExtension(hiveMQExtension)
@@ -74,7 +74,7 @@ public void removeAllPlatformExtensions() throws InterruptedException {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    public void removeKafkaExtension() throws InterruptedException {
+    void removeKafkaExtension() throws InterruptedException {
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq4").withTag("4.7.4"))
                 .withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
index cd83cb8a10d..c0e95f61cf6 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -24,7 +24,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CreateFileInCopiedDirectoryIT {
+class CreateFileInCopiedDirectoryIT {
 
     private @NotNull MountableFile createDirectory() throws IOException {
         final File directory = new File(Files.createTempDirectory("").toFile(), "directory");
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
index 44f5f4f632d..3e7bec94e6e 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
@@ -21,7 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
 
-public class CreateFileInExtensionDirectoryIT {
+class CreateFileInExtensionDirectoryIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
index a2ee9edfbcf..b632bb45328 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
@@ -12,7 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class DisableEnableExtensionFromDirectoryIT {
+class DisableEnableExtensionFromDirectoryIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
index 361af190a57..189f34308a1 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
@@ -13,7 +13,7 @@
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class DisableEnableExtensionIT {
+class DisableEnableExtensionIT {
 
     @NotNull
     private final HiveMQExtension hiveMQExtension = HiveMQExtension
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
index 97a1365ac91..b2ac3acbbcb 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoDisableExtensionsIT.java
@@ -10,7 +10,7 @@
 import org.testcontainers.utility.MountableFile;
 
 @Testcontainers
-public class DemoDisableExtensionsIT {
+class DemoDisableExtensionsIT {
 
     // noExtensions {
     @Container
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
index e5385369d3a..f3289413a36 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
@@ -15,7 +15,7 @@
 import java.util.concurrent.TimeUnit;
 
 @Testcontainers
-public class DemoExtensionTestsIT {
+class DemoExtensionTestsIT {
 
     // waitStrategy {
     @Container
@@ -48,7 +48,7 @@ public class DemoExtensionTestsIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    public void test() throws Exception {
+    void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client
             .builder()
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
index d0bf6fc6b9c..a76fa60576f 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
@@ -15,7 +15,7 @@
 import java.util.concurrent.TimeUnit;
 
 @Testcontainers
-public class DemoFilesIT {
+class DemoFilesIT {
 
     // hivemqHome {
     final HiveMQContainer hivemqFileInHome = new HiveMQContainer(
@@ -60,7 +60,7 @@ public class DemoFilesIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    public void test() throws Exception {
+    void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client
             .builder()
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
index ea93ada572e..db6e3e58251 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -14,7 +14,7 @@
 import java.util.concurrent.TimeUnit;
 
 @Testcontainers
-public class DemoHiveMQContainerIT {
+class DemoHiveMQContainerIT {
 
     // ceVersion {
     @Container
@@ -49,7 +49,7 @@ public class DemoHiveMQContainerIT {
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    public void test() throws Exception {
+    void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client
             .builder()

From f9dabb6381963618b7133ae456e4e92f51ad47af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 19 Jul 2023 12:35:06 -0600
Subject: [PATCH 3053/4969] Polish reuse documentation (#7316)

---
 docs/features/reuse.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/features/reuse.md b/docs/features/reuse.md
index 517a4775cce..01eeee51376 100644
--- a/docs/features/reuse.md
+++ b/docs/features/reuse.md
@@ -4,10 +4,10 @@
     Reusable Containers is still an experimental feature and the behavior can change.
     Those containers won't stop after all tests are finished.
 
-The *Reusable Containers* feature keeps the containers running between test sessions. In order
-to use it, manual container lifecycle instrumentation should be used by calling the `start()` method
-and it needs to be manually enabled through an opt-in mechanism. In order to reuse a container, the
-configuration of the container *must not change*.
+The *Reusable* feature keeps the containers running and next executions with the same container configuration
+will reuse it. To use it, start the container manually by calling `start()` method, do not call `stop()` method
+directly or indirectly via `try-with-resources` or `JUnit integration`, and enable it manually through an
+opt-in mechanism per environment. To reuse a container, the container configuration **must be the same**.
 
 !!! note
     Reusable containers are not suited for CI usage and as an experimental feature
@@ -16,7 +16,8 @@ configuration of the container *must not change*.
 
 ## How to use it
 
-* Define a container with `withReuse(true)`
+* Enable `Reusable Containers` in `~/.testcontainers.properties`, by adding `testcontainers.reuse.enable=true`
+* Define a container and subscribe to reuse the container using `withReuse(true)`
 
 ```java
 GenericContainer container = new GenericContainer("redis:6-alpine")
@@ -24,10 +25,10 @@ GenericContainer container = new GenericContainer("redis:6-alpine")
     .withReuse(true)
 ```
 
-* Opt-in to Reusable Containers in `~/.testcontainers.properties`, by adding `testcontainers.reuse.enable=true`
-* Containers need to be started manually using `container.start()`. See [docs](../../test_framework_integration/manual_lifecycle_control)
+* Start the container manually by using `container.start()`
 
 ### Reusable Container with Testcontainers JDBC URL
 
 If using the [Testcontainers JDBC URL support](../../modules/databases/jdbc#database-containers-launched-via-jdbc-url-scheme)
-the URL **must** follow the pattern of `jdbc:tc:mysql:5.7.34:///databasename?TC_REUSABLE=true`. `TC_REUSABLE=true` is set as a parameter of the JDBC URL.
+the URL **must** follow the pattern of `jdbc:tc:mysql:5.7.34:///databasename?TC_REUSABLE=true`.
+`TC_REUSABLE=true` is set as a parameter of the JDBC URL.

From 4059d047abe5bd12a52e518e78a5b4e9de3598d8 Mon Sep 17 00:00:00 2001
From: winne42 <firmen@schoech.de>
Date: Wed, 19 Jul 2023 21:52:25 +0200
Subject: [PATCH 3054/4969] Add JavaDoc to Spock's Testcontainers annotation
 (#6802)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../spock/Testcontainers.groovy               | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
index 2e70b6d589f..632b129ec7a 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
@@ -8,6 +8,47 @@ import java.lang.annotation.Retention
 import java.lang.annotation.RetentionPolicy
 import java.lang.annotation.Target
 
+/**
+ * {@code @Testcontainers} is a Spock extension to activate automatic
+ * startup and stop of containers used in a test case.
+ *
+ * <p>The Testcontainers extension finds all fields that extend
+ * {@link org.testcontainers.containers.GenericContainer} or
+ * {@link org.testcontainers.containers.DockerComposeContainer} and calls their
+ * container lifecycle methods. Containers annotated with {@link spock.lang.Shared}
+ * will be shared between test methods. They will be
+ * started only once before any test method is executed and stopped after the
+ * last test method has executed. Containers without {@link spock.lang.Shared}
+ * annotation will be started and stopped for every test method.</p>
+ *
+ * <p>The annotation {@code @Testcontainers} can be used on a superclass in
+ * the test hierarchy as well. All subclasses will automatically inherit
+ * support for the extension.</p>
+ *
+ * <p>Example:</p>
+ *
+ * <pre>
+ * &#64;Testcontainers
+ * class MyTestcontainersTests extends Specification {
+ *
+ *     // will be started only once in setupSpec() and stopped after last test method
+ *     &#64;Shared
+ *     MySQLContainer MY_SQL_CONTAINER = new MySQLContainer()
+ *
+ *     // will be started before and stopped after each test method
+ *     PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer()
+ *             .withDatabaseName('foo')
+ *             .withUsername('foo')
+ *             .withPassword('secret')
+ *
+ *     def 'test'() {
+ *         expect:
+ *         MY_SQL_CONTAINER.running
+ *         postgresqlContainer.running
+ *     }
+ * }
+ * </pre>
+ */
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target([ElementType.TYPE, ElementType.METHOD])

From 8edcc18f178930d98fbd150b629e4ae8fcfc3469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 19 Jul 2023 14:01:46 -0600
Subject: [PATCH 3055/4969] Generate javadoc artifact for spock module (#7318)

---
 modules/spock/build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 1371618d7af..a7c22423b65 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -29,6 +29,12 @@ sourceJar {
     from sourceSets.main.allSource
 }
 
+javadocJar {
+    dependsOn groovydoc
+    archiveClassifier = 'javadoc'
+    from groovydoc.destinationDir
+}
+
 test {
     useJUnitPlatform()
     testLogging {

From da39e21b0b472f00dcb4f489f462acf0f7d7aba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 19 Jul 2023 14:34:35 -0600
Subject: [PATCH 3056/4969] Fix javadoc warnings (#7317)

---
 .../org/testcontainers/containers/GenericContainer.java  | 2 +-
 .../testcontainers/containers/ClickHouseContainer.java   | 2 +-
 .../testcontainers/containers/CockroachContainer.java    | 2 +-
 .../org/testcontainers/couchbase/CouchbaseContainer.java | 2 +-
 .../java/org/testcontainers/containers/Db2Container.java | 2 +-
 .../org/testcontainers/dynamodb/DynaliteContainer.java   | 2 +-
 .../elasticsearch/ElasticsearchContainer.java            | 2 +-
 .../org/testcontainers/containers/InfluxDBContainer.java | 4 ++--
 .../testcontainers/containers/JdbcDatabaseContainer.java | 2 +-
 .../org/testcontainers/junit/jupiter/Testcontainers.java | 9 ++++++---
 .../org/testcontainers/containers/KafkaContainer.java    | 4 ++--
 .../containers/localstack/LocalStackContainer.java       | 6 +++---
 .../org/testcontainers/containers/MariaDBContainer.java  | 2 +-
 .../testcontainers/containers/MockServerContainer.java   | 4 ++--
 .../org/testcontainers/containers/MongoDBContainer.java  | 2 +-
 .../testcontainers/containers/MSSQLServerContainer.java  | 2 +-
 .../org/testcontainers/containers/MySQLContainer.java    | 2 +-
 .../org/testcontainers/containers/Neo4jContainer.java    | 2 +-
 .../org/testcontainers/containers/NginxContainer.java    | 2 +-
 .../org/testcontainers/containers/OracleContainer.java   | 2 +-
 .../org/testcontainers/containers/OrientDBContainer.java | 2 +-
 .../org/testcontainers/containers/PrestoContainer.java   | 2 +-
 .../org/testcontainers/containers/PulsarContainer.java   | 4 ++--
 .../org/testcontainers/containers/RabbitMQContainer.java | 2 +-
 .../org/testcontainers/containers/SolrContainer.java     | 4 ++--
 .../testcontainers/containers/ToxiproxyContainer.java    | 2 +-
 .../java/org/testcontainers/vault/VaultContainer.java    | 2 +-
 27 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 92ad93aaf56..f5652938a47 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -247,7 +247,7 @@ public GenericContainer(@NonNull final RemoteDockerImage image) {
     }
 
     /**
-     * @deprecated use {@link GenericContainer(DockerImageName)} instead
+     * @deprecated use {@link #GenericContainer(DockerImageName)} instead
      */
     @Deprecated
     public GenericContainer() {
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index d9879402ebb..27ced8751cb 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -43,7 +43,7 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
     private boolean supportsNewDriver;
 
     /**
-     * @deprecated use {@link ClickHouseContainer(DockerImageName)} instead
+     * @deprecated use {@link #ClickHouseContainer(DockerImageName)} instead
      */
     @Deprecated
     public ClickHouseContainer() {
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 8d17e8f4107..bf2b981b160 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -41,7 +41,7 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
     private boolean isVersionGreaterThanOrEqualTo221;
 
     /**
-     * @deprecated use {@link CockroachContainer(DockerImageName)} instead
+     * @deprecated use {@link #CockroachContainer(DockerImageName)} instead
      */
     @Deprecated
     public CockroachContainer() {
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 2817b79d71f..edf613ad3f7 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -118,7 +118,7 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     /**
      * Creates a new couchbase container with the default image and version.
-     * @deprecated use {@link CouchbaseContainer(DockerImageName)} instead
+     * @deprecated use {@link #CouchbaseContainer(DockerImageName)} instead
      */
     @Deprecated
     public CouchbaseContainer() {
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 333a2e709c3..6ff5d2d47b5 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -29,7 +29,7 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
     private String password = "foobar1234";
 
     /**
-     * @deprecated use {@link Db2Container(DockerImageName)} instead
+     * @deprecated use {@link #Db2Container(DockerImageName)} instead
      */
     @Deprecated
     public Db2Container() {
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
index 2d2161a3d8a..2a73ce6f022 100644
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
@@ -23,7 +23,7 @@ public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
     private static final int MAPPED_PORT = 4567;
 
     /**
-     * @deprecated use {@link DynaliteContainer(DockerImageName)} instead
+     * @deprecated use {@link #DynaliteContainer(DockerImageName)} instead
      */
     @Deprecated
     public DynaliteContainer() {
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 4f55e43581c..e13673384fa 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -72,7 +72,7 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     private String certPath = "/usr/share/elasticsearch/config/certs/http_ca.crt";
 
     /**
-     * @deprecated use {@link ElasticsearchContainer(DockerImageName)} instead
+     * @deprecated use {@link #ElasticsearchContainer(DockerImageName)} instead
      */
     @Deprecated
     public ElasticsearchContainer() {
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index 2af4ed1254d..5786fed3671 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -63,7 +63,7 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
     private final boolean isAtLeastMajorVersion2;
 
     /**
-     * @deprecated use {@link InfluxDBContainer(DockerImageName)} instead
+     * @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
      */
     @Deprecated
     public InfluxDBContainer() {
@@ -71,7 +71,7 @@ public InfluxDBContainer() {
     }
 
     /**
-     * @deprecated use {@link InfluxDBContainer(DockerImageName)} instead
+     * @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
      */
     @Deprecated
     public InfluxDBContainer(final String version) {
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 2fcba3789e0..9533a4c7d10 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -47,7 +47,7 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
     private static final String QUERY_PARAM_SEPARATOR = "&";
 
     /**
-     * @deprecated use {@link JdbcDatabaseContainer(DockerImageName)} instead
+     * @deprecated use {@link #JdbcDatabaseContainer(DockerImageName)} instead
      */
     public JdbcDatabaseContainer(@NonNull final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
index 9ae67e9e973..8f9915ab334 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/Testcontainers.java
@@ -12,7 +12,7 @@
  * {@code @Testcontainers} is a JUnit Jupiter extension to activate automatic
  * startup and stop of containers used in a test case.
  *
- * <p>The test containers extension finds all fields that are annotated with
+ * <p>The Testcontainers extension finds all fields that are annotated with
  * {@link Container} and calls their container lifecycle methods. Containers
  * declared as static fields will be shared between test methods. They will be
  * started only once before any test method is executed and stopped after the
@@ -60,12 +60,15 @@
 @Inherited
 public @interface Testcontainers {
     /**
-     * Whether tests should be disabled (rather than failing) when Docker is not available.
+     * Whether tests should be disabled (rather than failing) when Docker is not available. Defaults to
+     * {@code false}.
+     * @return if the tests should be disabled when Docker is not available
      */
     boolean disabledWithoutDocker() default false;
 
     /**
-     * Whether containers should start in parallel
+     * Whether containers should start in parallel. Defaults to {@code false}.
+     * @return if the containers should start in parallel
      */
     boolean parallel() default false;
 }
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index d00b15a1030..443cdde2d87 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -37,7 +37,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
     private String clusterId = DEFAULT_CLUSTER_ID;
 
     /**
-     * @deprecated use {@link KafkaContainer(DockerImageName)} instead
+     * @deprecated use {@link #KafkaContainer(DockerImageName)} instead
      */
     @Deprecated
     public KafkaContainer() {
@@ -45,7 +45,7 @@ public KafkaContainer() {
     }
 
     /**
-     * @deprecated use {@link KafkaContainer(DockerImageName)} instead
+     * @deprecated use {@link #KafkaContainer(DockerImageName)} instead
      */
     @Deprecated
     public KafkaContainer(String confluentPlatformVersion) {
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 9c7d7298223..8e9dfa76a90 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -72,7 +72,7 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
     private final boolean isVersion2;
 
     /**
-     * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
+     * @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
      */
     @Deprecated
     public LocalStackContainer() {
@@ -80,7 +80,7 @@ public LocalStackContainer() {
     }
 
     /**
-     * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
+     * @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
      */
     @Deprecated
     public LocalStackContainer(String version) {
@@ -97,7 +97,7 @@ public LocalStackContainer(final DockerImageName dockerImageName) {
     /**
      * @param dockerImageName    image name to use for Localstack
      * @param useLegacyMode      if true, each AWS service is exposed on a different port
-     * @deprecated use {@link LocalStackContainer(DockerImageName)} instead
+     * @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
      */
     @Deprecated
     public LocalStackContainer(final DockerImageName dockerImageName, boolean useLegacyMode) {
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 71cc76135cf..36280ab4e42 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -38,7 +38,7 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
 
     /**
-     * @deprecated use {@link MariaDBContainer(DockerImageName)} instead
+     * @deprecated use {@link #MariaDBContainer(DockerImageName)} instead
      */
     @Deprecated
     public MariaDBContainer() {
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 374cf2d928d..9ca936d1656 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -17,7 +17,7 @@ public class MockServerContainer extends GenericContainer<MockServerContainer> {
     public static final int PORT = 1080;
 
     /**
-     * @deprecated use {@link MockServerContainer(DockerImageName)} instead
+     * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
      */
     @Deprecated
     public MockServerContainer() {
@@ -25,7 +25,7 @@ public MockServerContainer() {
     }
 
     /**
-     * @deprecated use {@link MockServerContainer(DockerImageName)} instead
+     * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
      */
     @Deprecated
     public MockServerContainer(String version) {
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 563985cb57b..6390368dea5 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -35,7 +35,7 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
     private boolean shardingEnabled;
 
     /**
-     * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
+     * @deprecated use {@link #MongoDBContainer(DockerImageName)} instead
      */
     @Deprecated
     public MongoDBContainer() {
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 6d4591490bd..b86f3366f23 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -38,7 +38,7 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
     };
 
     /**
-     * @deprecated use {@link MSSQLServerContainer(DockerImageName)} instead
+     * @deprecated use {@link #MSSQLServerContainer(DockerImageName)} instead
      */
     @Deprecated
     public MSSQLServerContainer() {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 44fcc2b8b1d..17a14a435a4 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -35,7 +35,7 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
     private static final String MYSQL_ROOT_USER = "root";
 
     /**
-     * @deprecated use {@link MySQLContainer(DockerImageName)} instead
+     * @deprecated use {@link #MySQLContainer(DockerImageName)} instead
      */
     @Deprecated
     public MySQLContainer() {
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 0593471d79f..c48590ac0f7 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -78,7 +78,7 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
 
     /**
      * Creates a Neo4jContainer using the official Neo4j docker image.
-     * @deprecated use {@link Neo4jContainer(DockerImageName)} instead
+     * @deprecated use {@link #Neo4jContainer(DockerImageName)} instead
      */
     @Deprecated
     public Neo4jContainer() {
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 98d49776be3..9a8687aaf8c 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -19,7 +19,7 @@ public class NginxContainer<SELF extends NginxContainer<SELF>>
     private static final String DEFAULT_TAG = "1.9.4";
 
     /**
-     * @deprecated use {@link NginxContainer(DockerImageName)} instead
+     * @deprecated use {@link #NginxContainer(DockerImageName)} instead
      */
     @Deprecated
     public NginxContainer() {
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 830bb692f8f..883e223f678 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -57,7 +57,7 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
     private boolean usingSid = false;
 
     /**
-     * @deprecated use {@link OracleContainer(DockerImageName)} instead
+     * @deprecated use {@link #OracleContainer(DockerImageName)} instead
      */
     @Deprecated
     public OracleContainer() {
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index d51d7ee5dc1..6064419a490 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -50,7 +50,7 @@ public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
     private ODatabaseSession session;
 
     /**
-     * @deprecated use {@link OrientDBContainer(DockerImageName)} instead
+     * @deprecated use {@link #OrientDBContainer(DockerImageName)} instead
      */
     @Deprecated
     public OrientDBContainer() {
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 5c89682643a..946f6a95c6d 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -32,7 +32,7 @@ public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDat
     private String catalog = null;
 
     /**
-     * @deprecated use {@link PrestoContainer(DockerImageName)} instead
+     * @deprecated use {@link #PrestoContainer(DockerImageName)} instead
      */
     @Deprecated
     public PrestoContainer() {
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index a47aa04447a..1cfcd935c31 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -39,7 +39,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
     private boolean transactionsEnabled = false;
 
     /**
-     * @deprecated use {@link PulsarContainer(DockerImageName)} instead
+     * @deprecated use {@link #PulsarContainer(DockerImageName)} instead
      */
     @Deprecated
     public PulsarContainer() {
@@ -47,7 +47,7 @@ public PulsarContainer() {
     }
 
     /**
-     * @deprecated use {@link PulsarContainer(DockerImageName)} instead
+     * @deprecated use {@link #PulsarContainer(DockerImageName)} instead
      */
     @Deprecated
     public PulsarContainer(String pulsarVersion) {
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 92eaa0dbd05..2d0a315f15c 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -44,7 +44,7 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
     /**
      * Creates a RabbitMQ container using the official RabbitMQ docker image.
-     * @deprecated use {@link RabbitMQContainer(DockerImageName)} instead
+     * @deprecated use {@link #RabbitMQContainer(DockerImageName)} instead
      */
     @Deprecated
     public RabbitMQContainer() {
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 5161bce2738..9fd716d37b4 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -32,7 +32,7 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
     private SolrContainerConfiguration configuration;
 
     /**
-     * @deprecated use {@link SolrContainer(DockerImageName)} instead
+     * @deprecated use {@link #SolrContainer(DockerImageName)} instead
      */
     @Deprecated
     public SolrContainer() {
@@ -40,7 +40,7 @@ public SolrContainer() {
     }
 
     /**
-     * @deprecated use {@link SolrContainer(DockerImageName)} instead
+     * @deprecated use {@link #SolrContainer(DockerImageName)} instead
      */
     public SolrContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index 0c5bdda9b79..872f2c2fdb4 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -40,7 +40,7 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
     private final AtomicInteger nextPort = new AtomicInteger(FIRST_PROXIED_PORT);
 
     /**
-     * @deprecated use {@link ToxiproxyContainer(DockerImageName)} instead
+     * @deprecated use {@link #ToxiproxyContainer(DockerImageName)} instead
      */
     @Deprecated
     public ToxiproxyContainer() {
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index c565ddbec26..8541bbc9090 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -39,7 +39,7 @@ public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericCo
     private int port = VAULT_PORT;
 
     /**
-     * @deprecated use {@link VaultContainer(DockerImageName)} instead
+     * @deprecated use {@link #VaultContainer(DockerImageName)} instead
      */
     @Deprecated
     public VaultContainer() {

From cc60cd2de6896721ac7d449d0277ec76ed65545a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 19 Jul 2023 22:42:10 -0600
Subject: [PATCH 3057/4969] Enable Ryuk as a privileged container by default
 (#7319)

---
 .../org/testcontainers/utility/TestcontainersConfiguration.java | 2 +-
 docs/features/configuration.md                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index e1d70465378..a96f373d454 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -138,7 +138,7 @@ public String getTinyImage() {
     }
 
     public boolean isRyukPrivileged() {
-        return Boolean.parseBoolean(getEnvVarOrProperty("ryuk.container.privileged", "false"));
+        return Boolean.parseBoolean(getEnvVarOrProperty("ryuk.container.privileged", "true"));
     }
 
     @Deprecated
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 8c33049260d..fe78e317120 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -76,7 +76,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **ryuk.container.image = testcontainers/ryuk:0.3.3**
 > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
 
-> **ryuk.container.privileged = false**
+> **ryuk.container.privileged = true**
 > In some environments ryuk must be started in privileged mode to work properly (--privileged flag)
 
 ### Disabling Ryuk

From a292a89fc16b9ef62c5844869d49d5694b4e3eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 24 Jul 2023 14:55:37 -0600
Subject: [PATCH 3058/4969] Support String image in Bigtable, Firestore,
 PubSub, Spanner (#7327)

---
 .../testcontainers/containers/BigtableEmulatorContainer.java  | 4 ++++
 .../testcontainers/containers/FirestoreEmulatorContainer.java | 4 ++++
 .../testcontainers/containers/PubSubEmulatorContainer.java    | 4 ++++
 .../testcontainers/containers/SpannerEmulatorContainer.java   | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index f96f0830510..9c5c5caa9f9 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -22,6 +22,10 @@ public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulator
 
     private static final int PORT = 9000;
 
+    public BigtableEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
     public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index 82d26339f90..db7546a7e7b 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -22,6 +22,10 @@ public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulat
 
     private static final int PORT = 8080;
 
+    public FirestoreEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
     public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index af4c62aaec4..1cf00dcab92 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -22,6 +22,10 @@ public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorCont
 
     private static final int PORT = 8085;
 
+    public PubSubEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
     public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index a3f4a91db05..f0ce5cf31de 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -16,6 +16,10 @@ public class SpannerEmulatorContainer extends GenericContainer<SpannerEmulatorCo
 
     private static final int HTTP_PORT = 9020;
 
+    public SpannerEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
     public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);

From bd70f5b7d20bb2d61ebe1b34046b315aff51c1ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 24 Jul 2023 15:05:59 -0600
Subject: [PATCH 3059/4969] Expose getProjectId in DatastoreEmulatorContainer
 (#7328)

---
 .../containers/DatastoreEmulatorContainer.java       | 12 ++++++++++--
 .../containers/DatastoreEmulatorContainerTest.java   |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index 38479193c3f..4e1ff5f3fba 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -18,8 +18,12 @@ public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulat
         "gcr.io/google.com/cloudsdktool/cloud-sdk"
     );
 
-    private static final String CMD =
-        "gcloud beta emulators datastore start --project test-project --host-port 0.0.0.0:8081";
+    private static final String PROJECT_ID = "test-project";
+
+    private static final String CMD = String.format(
+        "gcloud beta emulators datastore start --project %s --host-port 0.0.0.0:8081",
+        PROJECT_ID
+    );
 
     private static final int HTTP_PORT = 8081;
 
@@ -59,4 +63,8 @@ public DatastoreEmulatorContainer withFlags(String flags) {
     public String getEmulatorEndpoint() {
         return getHost() + ":" + getMappedPort(HTTP_PORT);
     }
+
+    public String getProjectId() {
+        return PROJECT_ID;
+    }
 }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index 864834bf85f..fa447f1e100 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -32,7 +32,7 @@ public void testSimple() {
             .setHost(emulator.getEmulatorEndpoint())
             .setCredentials(NoCredentials.getInstance())
             .setRetrySettings(ServiceOptions.getNoRetrySettings())
-            .setProjectId("test-project")
+            .setProjectId(emulator.getProjectId())
             .build();
         Datastore datastore = options.getService();
 

From 8465795ab9067447ca8b7d3e307cadcec8de377a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 24 Jul 2023 16:23:54 -0600
Subject: [PATCH 3060/4969] Add BigQueryEmulatorContainer (#7324)

---
 docs/modules/gcloud.md                        | 11 +++-
 modules/gcloud/build.gradle                   |  1 +
 .../containers/BigQueryEmulatorContainer.java | 36 +++++++++++++
 .../BigQueryEmulatorContainerTest.java        | 50 +++++++++++++++++++
 4 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
 create mode 100644 modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 807b81de433..de846bf48a2 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -5,10 +5,11 @@
 
 Testcontainers module for the Google Cloud Platform's [Cloud SDK](https://cloud.google.com/sdk/).
 
-Currently, the module supports `Bigtable`, `Datastore`, `Firestore`, `Spanner`, and `Pub/Sub` emulators. In order to use it, you should use the following classes:
+Currently, the module supports `BigQuery`, `Bigtable`, `Datastore`, `Firestore`, `Spanner`, and `Pub/Sub` emulators. In order to use it, you should use the following classes:
 
 Class | Container Image
 -|-
+BigQueryEmulatorContainer | ["ghcr.io/goccy/bigquery-emulator"]("ghcr.io/goccy/bigquery-emulator")
 BigtableEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
 DatastoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
 FirestoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
@@ -17,6 +18,14 @@ PubSubEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](h
 
 ## Usage example
 
+### BigQuery
+
+Start BigQuery Emulator during a test:
+
+<!--codeinclude-->
+[Starting a BigQuery Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
 ### Bigtable
 
 Start Bigtable Emulator during a test:
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 8815961168b..11e005a65d5 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -4,6 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation platform("com.google.cloud:libraries-bom:26.18.0")
+    testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'
     testImplementation 'com.google.cloud:google-cloud-pubsub'
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
new file mode 100644
index 00000000000..50153006b5e
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
@@ -0,0 +1,36 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for BigQuery.
+ */
+public class BigQueryEmulatorContainer extends GenericContainer<BigQueryEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/goccy/bigquery-emulator");
+
+    private static final int HTTP_PORT = 9050;
+
+    private static final int GRPC_PORT = 9060;
+
+    private static final String PROJECT_ID = "test-project";
+
+    public BigQueryEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public BigQueryEmulatorContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        addExposedPorts(HTTP_PORT, GRPC_PORT);
+        withCommand("--project", PROJECT_ID);
+    }
+
+    public String getEmulatorHttpEndpoint() {
+        return String.format("http://%s:%d", getHost(), getMappedPort(HTTP_PORT));
+    }
+
+    public String getProjectId() {
+        return PROJECT_ID;
+    }
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
new file mode 100644
index 00000000000..cd1dffde843
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
@@ -0,0 +1,50 @@
+package org.testcontainers.containers;
+
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.QueryJobConfiguration;
+import com.google.cloud.bigquery.TableResult;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class BigQueryEmulatorContainerTest {
+
+    @Test
+    public void test() throws Exception {
+        try (
+            // emulatorContainer {
+            BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.4.3")
+            // }
+        ) {
+            container.start();
+
+            String url = container.getEmulatorHttpEndpoint();
+            BigQueryOptions options = BigQueryOptions
+                .newBuilder()
+                .setProjectId(container.getProjectId())
+                .setHost(url)
+                .setLocation(url)
+                .build();
+            BigQuery bigQuery = options.getService();
+
+            String fn =
+                "CREATE FUNCTION testr(arr ARRAY<STRUCT<name STRING, val INT64>>) AS ((SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))";
+
+            bigQuery.query(QueryJobConfiguration.newBuilder(fn).build());
+
+            String sql =
+                "SELECT testr([STRUCT<name STRING, val INT64>(\"foo\", 10), STRUCT<name STRING, val INT64>(\"bar\", 40), STRUCT<name STRING, val INT64>(\"foo\", 20)])";
+            TableResult result = bigQuery.query(QueryJobConfiguration.newBuilder(sql).build());
+            List<BigDecimal> values = result
+                .streamValues()
+                .map(fieldValues -> fieldValues.get(0).getNumericValue())
+                .collect(Collectors.toList());
+            assertThat(values).containsOnly(BigDecimal.valueOf(30));
+        }
+    }
+}

From 1a60247004910c6be435f28166883450b03646ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 31 Jul 2023 13:50:27 -0600
Subject: [PATCH 3061/4969] Fix javadoc for RabbitMQContainer (#7339)

---
 .../java/org/testcontainers/containers/RabbitMQContainer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 2d0a315f15c..5bfa6dca798 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -17,12 +17,12 @@
 import java.util.Set;
 
 /**
- * Testcontainer for RabbitMQ.
+ * Testcontainers implementation for RabbitMQ.
  */
 public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
     /**
-     * The image defaults to the official RabbitmQ image: <a href="https://hub.docker.com/_/rabbitmq/">RabbitMQ</a>.
+     * The image defaults to the official RabbitMQ image: <a href="https://hub.docker.com/_/rabbitmq/">RabbitMQ</a>.
      */
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("rabbitmq");
 

From dd82dd712ca824402ad818592fea12e4a5457f5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:07:01 +0000
Subject: [PATCH 3062/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.7 to 3.5.8.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.7...v3.5.8)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index a5396f0caf9..87b4a4548eb 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.7'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.8'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 71b4c29f1bc359b92d17b00bb96ec44f1cfab331 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:11:08 +0000
Subject: [PATCH 3063/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.1-jre to 32.1.2-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 2d988c36d34..8e2cc31af63 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:32.1.1-jre'
+    api 'com.google.guava:guava:32.1.2-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.7'

From 4ee4d86a44ec7235d3178afb513eabee4202ce64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:11:10 +0000
Subject: [PATCH 3064/4969] Bump org.apache.commons:commons-lang3 in
 /modules/hivemq

Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.13.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 06d437bc328..cd6657600b7 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:24.0.1")
 
-    shaded("org.apache.commons:commons-lang3:3.12.0")
+    shaded("org.apache.commons:commons-lang3:3.13.0")
     shaded("commons-io:commons-io:2.13.0")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")

From 08c8050e0da3dd685742ff390bfad9b6af0948fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:11:12 +0000
Subject: [PATCH 3065/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 06d437bc328..f428a24db73 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.16.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")

From 0ac9c53c5a868d7c23e2b4c311f088bfe2847f6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:11:16 +0000
Subject: [PATCH 3066/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 06d437bc328..eb101035d30 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.8")
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
 }
 
 test {

From c9a561cb1b758a163a98a15c2d8aa71698caf135 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:11:35 +0000
Subject: [PATCH 3067/4969] Bump org.questdb:questdb from 7.2 to 7.2.1 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.2 to 7.2.1.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.2...7.2.1)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index f706964354f..a6cba1bc188 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.2'
+    testImplementation 'org.questdb:questdb:7.2.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From fee56dc7f2b0f3678dd5cbc67e70b58bf9189ef4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:11:40 +0000
Subject: [PATCH 3068/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.9.0 to 6.10.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v6.9.0...v6.10.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index b275a189ada..ee078e751b9 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.influxdb:influxdb-java:2.23'
-    testImplementation "com.influxdb:influxdb-client-java:6.9.0"
+    testImplementation "com.influxdb:influxdb-client-java:6.10.0"
 }

From ec586058fad06e25f610764c43ac6d7cc7ae7457 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:13:17 +0000
Subject: [PATCH 3069/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.20 to 3.2.21.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.20...3.2.21)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 01a024a6a82..c9403541bbb 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.20"
+    api "com.orientechnologies:orientdb-client:3.2.21"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'

From 61ff656f18f3f1dc3f9e69f9b94db598d2f3ced9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:13:20 +0000
Subject: [PATCH 3070/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.20 to 3.2.21.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.20...3.2.21)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 01a024a6a82..e3b3416093b 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.20"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.21"
 }

From 95fe4122a3a7158943c8a84b4f1d77e1e7bad739 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:14:22 +0000
Subject: [PATCH 3071/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.3.1.jre8-preview to 12.4.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9805ad9643c..ed0939184fd 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.1.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.0.jre8-preview'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'

From a524ec88021e984513e8db8c5efdb00af5a03b58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:14:56 +0000
Subject: [PATCH 3072/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit5) from 1.9.3 to 1.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a7c22423b65..f444dd9454f 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.3'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.0'
 
     testCompileOnly 'org.jetbrains:annotations:24.0.1'
 }

From a38aeeb87194528006a649cb7c5b24e7ef5794b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:18:30 +0000
Subject: [PATCH 3073/4969] Bump io.fabric8:kubernetes-client from 6.7.2 to
 6.8.0 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.7.2 to 6.8.0.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.7.2...v6.8.0)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 2e25b4089da..42500ac4c77 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.7.2'
+    testImplementation 'io.fabric8:kubernetes-client:6.8.0'
     testImplementation 'io.kubernetes:client-java:18.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From c8c5b57f59da5a0b9d1c07194d7d9b7163772aad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:25:05 +0000
Subject: [PATCH 3074/4969] Bump com.datastax.oss:java-driver-core in
 /modules/cassandra

Bumps [com.datastax.oss:java-driver-core](https://github.com/datastax/java-driver) from 4.16.0 to 4.17.0.
- [Release notes](https://github.com/datastax/java-driver/releases)
- [Commits](https://github.com/datastax/java-driver/compare/4.16.0...4.17.0)

---
updated-dependencies:
- dependency-name: com.datastax.oss:java-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 1101a911bae..005281fb366 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     api project(":database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
-    testImplementation 'com.datastax.oss:java-driver-core:4.16.0'
+    testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e0ae885c310653e25950441f4afa3969f402c4ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:26:11 +0000
Subject: [PATCH 3075/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.500 to 1.12.520.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.500...1.12.520)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 52ba6750403..6734752170b 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 358b22eecfa0a0fbbf022f812c4539da67a605d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:30:07 +0000
Subject: [PATCH 3076/4969] Bump org.junit:junit-bom from 5.9.3 to 5.10.0 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9872b1e9f54..9d9c4fd6f40 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.9.3')
+    implementation platform('org.junit:junit-bom:5.10.0')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')

From 4e703629b7dbeefb3c2a6ec77e924bb18e6af0de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:34:11 +0000
Subject: [PATCH 3077/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.7 to 3.4.8.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.4.7...java-client-3.4.8)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index d086c679b3e..98502cc528b 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.7'
+    testImplementation 'com.couchbase.client:java-client:3.4.8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From a4bb3c68dcc47ac798c3a17ecf1fe08fee7f359a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:35:47 +0000
Subject: [PATCH 3078/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.10 to 10.1.11.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 6a7f46fb943..8c3e17d5599 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.10'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.11'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 0b008e6ed5dbbb81ceb0432464d4e7468412619a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:36:21 +0000
Subject: [PATCH 3079/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.10.1 to 4.10.2.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.10.1...r4.10.2)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 2a97a302185..6b5e7998182 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.10.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.10.2")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 02186cd00ca4c6f60d64ac3a8952a2f41507e79c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:36:31 +0000
Subject: [PATCH 3080/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.8.2 to 8.9.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.8.2...v8.9.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 3c7221a6fbb..ad3af97c254 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.8.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.0"
     testImplementation "org.elasticsearch.client:transport:7.17.11"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9d794b2af985be2dea5c7a33901a1aeef97eaefe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:39:47 +0000
Subject: [PATCH 3081/4969] Bump io.nats:jnats from 2.16.10 to 2.16.13 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.16.10 to 2.16.13.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.16.10...2.16.13)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 3726e8ca670..383a94b2042 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.10'
+    testImplementation 'io.nats:jnats:2.16.13'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 83a70c3bfbe3071fff485cf1af1972fdb3b19b68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:39:56 +0000
Subject: [PATCH 3082/4969] Bump me.champeau.gradle.japicmp from 0.4.1 to 0.4.2
 in /examples

Bumps me.champeau.gradle.japicmp from 0.4.1 to 0.4.2.

---
updated-dependencies:
- dependency-name: me.champeau.gradle.japicmp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 105ff37ad8e..6e2c0fec169 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
+    id 'me.champeau.gradle.japicmp' version '0.4.2' apply false
     id 'com.diffplug.spotless' version '6.13.0' apply false
 }
 

From d8624b237c8d0537fecd51b0e4c3e9dfb693f7a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:39:59 +0000
Subject: [PATCH 3083/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index d6812ff3cb8..f3494f27c07 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 2c497eb270a6fd011dca11ecd8b6f0b2ab3b6c3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:40:04 +0000
Subject: [PATCH 3084/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index d6812ff3cb8..308348999d2 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.2.3.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")

From 7177abbd51664a122d10c5c8f63874d116e3c14a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:40:08 +0000
Subject: [PATCH 3085/4969] Bump io.cucumber:cucumber-bom from 7.12.1 to 7.13.0
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.12.1 to 7.13.0.
- [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/v7.12.1...v7.13.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 4f940b0feed..8028024c25b 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
-    testImplementation platform('io.cucumber:cucumber-bom:7.12.1')
+    testImplementation platform('io.cucumber:cucumber-bom:7.13.0')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'

From d1ad28967368c6aaaa5d978d794f3810524dded9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:40:13 +0000
Subject: [PATCH 3086/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin in /examples

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.11 to 1.11.1.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index aeb3de67bfe..4355a9080db 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 0dd7acbde42..548c5335857 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.13.4"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }
 }

From 35f21d74c44a3a6b8a6b8f8a92d4af9dbd5d2274 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:40:13 +0000
Subject: [PATCH 3087/4969] Bump org.apache.curator:curator-framework in
 /examples

Bumps [org.apache.curator:curator-framework](https://github.com/apache/curator) from 5.4.0 to 5.5.0.
- [Commits](https://github.com/apache/curator/compare/apache-curator-5.4.0...apache-curator-5.5.0)

---
updated-dependencies:
- dependency-name: org.apache.curator:curator-framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/zookeeper/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 88037f53121..b7dd7ced6ad 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.apache.curator:curator-framework:5.4.0'
+    testImplementation 'org.apache.curator:curator-framework:5.5.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'

From a93d2f7b39f9f1abab2511408d6441321c88e0dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:40:19 +0000
Subject: [PATCH 3088/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.10.0...selenium-4.11.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 4f940b0feed..cfbb11e0e74 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.10.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.11.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From e7578909d160ba321fb742135cb3c0cdb1c4efd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:41:42 +0000
Subject: [PATCH 3089/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /modules/selenium

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.10.0...selenium-4.11.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index e613fef33a9..5dab1a70853 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
 
-    testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.10.0')
+    testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.11.0')
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-edge-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-support'

From 5a43ea67abc0e7d553a4ced174961bea7efef281 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:44:36 +0000
Subject: [PATCH 3090/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.18.0 to 26.21.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.18.0...v26.21.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 11e005a65d5..15ccf6589e7 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.18.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.21.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From fec15c388b35ed95af24fe593e6c501211d64f45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:47:14 +0000
Subject: [PATCH 3091/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.5.0 to 3.5.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 2b97e8da6ae..3fbf9b7a8ab 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.5.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
 }

From 05f37e098008b756c297acc2fb7d70bf3562c030 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:48:22 +0000
Subject: [PATCH 3092/4969] Bump gradle/wrapper-validation-action from 1.0.6 to
 1.1.0

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.6 to 1.1.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/8d49e559aae34d3e0eb16cde532684bc9702762b...56b90f209b02bf6d1deae490e9ef18b21a389cd4)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index af8bc391d33..f8006957ac3 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -24,4 +24,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # v1.0.3
+      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.0.3

From c918794b254d65f2bfb544be92b3eec21d791e04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:53:01 +0000
Subject: [PATCH 3093/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.500 to 1.12.520.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.500...1.12.520)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5497fc0f343..58b04d8cafc 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.500")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.520")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From dc3a9c21982f0d332c963aa6898b148436de3df6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:53:03 +0000
Subject: [PATCH 3094/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.97 to 2.20.117.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5497fc0f343..4defeb8aa13 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.97'
+    testImplementation 'software.amazon.awssdk:s3:2.20.117'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e12dd01076448524815975c397235ea92b2035c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:53:38 +0000
Subject: [PATCH 3095/4969] Bump io.trino:trino-jdbc from 420 to 422 in
 /modules/trino

Bumps io.trino:trino-jdbc from 420 to 422.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 942675e9020..192d6add0f3 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:420'
+    testRuntimeOnly 'io.trino:trino-jdbc:422'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 52432bf856be3bfb583bd4f07a69561372ca46a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 22:54:58 +0000
Subject: [PATCH 3096/4969] Bump com.azure:azure-cosmos from 4.47.0 to 4.48.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.47.0 to 4.48.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.47.0...azure-cosmos_4.48.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 50dcf5c81fb..a0c0e067b0d 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.47.0'
+    testImplementation 'com.azure:azure-cosmos:4.48.0'
 }

From b533abae2b8212743d15c50e34886835bacf69b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:34:44 +0000
Subject: [PATCH 3097/4969] Bump org.apache.commons:commons-lang3 in
 /modules/jdbc-test

Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.13.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8e2cc31af63..9678c87cf01 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
 
     api 'com.google.guava:guava:32.1.2-jre'
-    api 'org.apache.commons:commons-lang3:3.12.0'
+    api 'org.apache.commons:commons-lang3:3.13.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.7'
 

From a4603f7c8d8ec3839a66ae5a2f493e31682d4d09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:34:44 +0000
Subject: [PATCH 3098/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.16.0 to 4.18.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.16.0...4.18.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 0501253c729..562f9d8b55a 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.16.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.18.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.8")

From e158d746a6cc905fb7582a6a362c714cf464de23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:34:45 +0000
Subject: [PATCH 3099/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.13.4 to 3.14.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 548c5335857..a6b4b213d29 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.13.4"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }

From 06b806954485afd77d8eb7512481ab537ccac266 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:34:55 +0000
Subject: [PATCH 3100/4969] Bump io.r2dbc:r2dbc-mssql in /modules/mssqlserver

Bumps [io.r2dbc:r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 1.0.1.RELEASE to 1.0.2.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v1.0.2.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v1.0.1.RELEASE...v1.0.2.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index ed0939184fd..b7ae484647b 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.0.jre8-preview'
 
     testImplementation project(':r2dbc')
-    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
+    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))

From b3ad42788bfc9bd7ee33cc75b6ee8cbc4ffa4913 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:34:56 +0000
Subject: [PATCH 3101/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/spock

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.9.3 to 1.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f444dd9454f..25243bc3011 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.0'
 
     testCompileOnly 'org.jetbrains:annotations:24.0.1'

From 5efaa4a02d3a4f1e1ffb562c22c13b494a456076 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:34:58 +0000
Subject: [PATCH 3102/4969] Bump io.kubernetes:client-java from 18.0.0 to
 18.0.1 in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 18.0.0 to 18.0.1.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v18.0.0...v18.0.1)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 42500ac4c77..8effb3e6a8d 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.8.0'
-    testImplementation 'io.kubernetes:client-java:18.0.0'
+    testImplementation 'io.kubernetes:client-java:18.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 5c32d5b0770b4335aa9f13ebb2ece1653193ded9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:34:59 +0000
Subject: [PATCH 3103/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.5.0 to 3.5.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 83dea92145f..a121eaaddac 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.5.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From f47a8acc9727b069c57cccca48d98a2c0e2800aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:35:07 +0000
Subject: [PATCH 3104/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.11 to 7.17.12.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.11...v7.17.12)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index ad3af97c254..011a6493d2e 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.0"
-    testImplementation "org.elasticsearch.client:transport:7.17.11"
+    testImplementation "org.elasticsearch.client:transport:7.17.12"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From dec26ae4324ed3a99250026c0297c16a3e4f8d6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:35:12 +0000
Subject: [PATCH 3105/4969] Bump org.gradle.toolchains:foojay-resolver in
 /examples

Bumps org.gradle.toolchains:foojay-resolver from 0.4.0 to 0.6.0.

---
updated-dependencies:
- dependency-name: org.gradle.toolchains:foojay-resolver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 548c5335857..72053eda0f0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.13.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
-        classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
+        classpath "org.gradle.toolchains:foojay-resolver:0.6.0"
     }
 }
 

From 6abfaef89e1f2a954a50e11d26fcccf35259fd70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:35:15 +0000
Subject: [PATCH 3106/4969] Bump org.junit.jupiter:junit-jupiter from 5.9.2 to
 5.10.0 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 1ff02bce505..96af42237bb 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }

From c490e3c886fd84b714f2c51d806c8868975cfa41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 04:35:21 +0000
Subject: [PATCH 3107/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.12.6 to 3.14.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 4355a9080db..e57cb285f22 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 548c5335857..a6b4b213d29 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.13.4"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
     }

From 9e568a9beef33ca38473fbb442b728ff5dab3874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 2 Aug 2023 08:40:34 -0600
Subject: [PATCH 3108/4969] Update google-cloud-cli image version to 441
 (#7389)

Fixes #7340
---
 docs/modules/gcloud.md                                    | 8 ++++----
 .../containers/BigtableEmulatorContainerTest.java         | 2 +-
 .../containers/DatastoreEmulatorContainerTest.java        | 6 +++---
 .../containers/FirestoreEmulatorContainerTest.java        | 2 +-
 .../containers/PubSubEmulatorContainerTest.java           | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index de846bf48a2..bfe34100ce2 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -10,11 +10,11 @@ Currently, the module supports `BigQuery`, `Bigtable`, `Datastore`, `Firestore`,
 Class | Container Image
 -|-
 BigQueryEmulatorContainer | ["ghcr.io/goccy/bigquery-emulator"]("ghcr.io/goccy/bigquery-emulator")
-BigtableEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
-DatastoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
-FirestoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
+BigtableEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators](https://gcr.io/google.com/cloudsdktool/google-cloud-cli)
+DatastoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators](https://gcr.io/google.com/cloudsdktool/google-cloud-cli)
+FirestoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators](https://gcr.io/google.com/cloudsdktool/google-cloud-cli)
 SpannerEmulatorContainer | [gcr.io/cloud-spanner-emulator/emulator](https://gcr.io/cloud-spanner-emulator/emulator)
-PubSubEmulatorContainer | [gcr.io/google.com/cloudsdktool/cloud-sdk:emulators](https://gcr.io/google.com/cloudsdktool/cloud-sdk)
+PubSubEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators](https://gcr.io/google.com/cloudsdktool/google-cloud-cli)
 
 ## Usage example
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
index fa611df800c..e68ecce405b 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -36,7 +36,7 @@ public class BigtableEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
     );
 
     // }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index fa447f1e100..7ea0ceb9a49 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -19,7 +19,7 @@ public class DatastoreEmulatorContainerTest {
     @Rule
     // creatingDatastoreEmulatorContainer {
     public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
     );
 
     // }
@@ -49,7 +49,7 @@ public void testSimple() {
     public void testWithFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-                "gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators"
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
             )
                 .withFlags("--consistency 1.0")
         ) {
@@ -64,7 +64,7 @@ public void testWithFlags() throws IOException, InterruptedException {
     public void testWithMultipleFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-                "gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators"
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
             )
                 .withFlags("--consistency 1.0 --data-dir /root/.config/test-gcloud")
         ) {
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index e59302e495d..0162085ea35 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -23,7 +23,7 @@ public class FirestoreEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
     );
 
     // }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index e1d1e74fb9c..b2f75f0f36a 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -37,7 +37,7 @@ public class PubSubEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:380.0.0-emulators")
+        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
     );
 
     // }

From add3711fb8769226193a27f96e7cd21f8239227d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 2 Aug 2023 15:21:42 -0600
Subject: [PATCH 3109/4969] Fix typos

---
 RELEASING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index 31a8217a227..d5c79b04ed2 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -15,8 +15,8 @@ Testcontainers' release process is semi-automated through GitHub Actions. This d
     * For TinSalver to correctly work with keybase on WSL on Windows, you might need to disable pinentry: `keybase config set -b pinentry.disabled true`.
 7. Close the release in Sonatype. This will evaluate the release based on given Sonatype rules.
 8. After successful closing, the release button needs to be clicked and afterwards it is automatically synced to Maven Central.
-9. Handcraft and polish some of the release notes (e.g. substitute combinded dependency PRs and highlight certain features).
-10. Rename existing milestone corresponding to new release and close it. Then create a new `next` milstestone.
+9. Handcraft and polish some of the release notes (e.g. substitute combined dependency PRs and highlight certain features).
+10. Rename existing milestone corresponding to new release and close it. Then create a new `next` milestone.
 11. When available through Maven Central, poke [Richard North](https://github.com/rnorth) to announce the release on Twitter!
 12. Merge automated version update PRs in order to update the reference version in `mkdocs.yml` and `gradle.properties`.
 
@@ -25,4 +25,4 @@ Testcontainers' release process is semi-automated through GitHub Actions. This d
 * The process is done with GitHub Actions, TinSalver and Sonatype.
 * Sonatype will automatically promote the staging release to Maven Central.
 * Keybase needs to be installed on the developer machine.
-* GPG key of signing developer needs to be uplodaed to the [Ubuntu keyserver](https://keyserver.ubuntu.com/) (or other server supported by Sonatype).
+* GPG key of signing developer needs to be uploaded to the [Ubuntu keyserver](https://keyserver.ubuntu.com/) (or other server supported by Sonatype).

From d1a37420efa26f1dc5f7e1ab0c51d03958f7815e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 3 Aug 2023 12:21:31 -0600
Subject: [PATCH 3110/4969] Fix call to stop containers when using parallel in
 JUnit Jupiter Extension (#7394)

Currently, containers are shutdown because of JVMHookResourceReaper instead
of Ryuk when enabling parallel using `@Testcontainers`. This commits,
register containers to be initialized so `stop()` is called.
---
 .../junit/jupiter/TestcontainersExtension.java            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index d841e5f38dd..ca99a2d2382 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -71,7 +71,13 @@ private void startContainers(List<StoreAdapter> storeAdapters, Store store, Exte
         }
 
         if (isParallelExecutionEnabled(context)) {
-            Startables.deepStart(storeAdapters.stream().map(storeAdapter -> storeAdapter.container)).join();
+            Stream<Startable> startables = storeAdapters
+                .stream()
+                .map(storeAdapter -> {
+                    store.getOrComputeIfAbsent(storeAdapter.getKey(), k -> storeAdapter);
+                    return storeAdapter.container;
+                });
+            Startables.deepStart(startables).join();
         } else {
             storeAdapters.forEach(adapter -> store.getOrComputeIfAbsent(adapter.getKey(), k -> adapter.start()));
         }

From d753f36bff016ee3cf38e0d58c559e5f66353706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 3 Aug 2023 13:24:54 -0600
Subject: [PATCH 3111/4969] Apply priority execution in CI (#7395)

Nowadays, around 84 jobs are executed. Core, Modules and examples
are executed in parallel which cause a bottleneck when many PRs are
raised. This commit introduces a priority to the execution

1. Core module
2. Modules
3. Examples
4. Docs examples

Although, the number of execution doesn't change at the end. It will
allow to do not take all runners at once.
---
 .github/workflows/ci-examples.yml |  88 ----------------------
 .github/workflows/ci.yml          | 119 +++++++++++++++++++++++++++++-
 2 files changed, 118 insertions(+), 89 deletions(-)
 delete mode 100644 .github/workflows/ci-examples.yml

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
deleted file mode 100644
index f37d71ebf73..00000000000
--- a/.github/workflows/ci-examples.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: CI-Examples
-
-on:
-  pull_request:
-    paths-ignore:
-      - 'docs/**/*.css'
-      - 'docs/**/*.html'
-      - 'docs/**/*.ico'
-      - 'docs/**/*.md'
-      - 'docs/**/*.png'
-      - 'docs/**/*.svg'
-      - 'mkdocs.yml'
-      - 'README.md'
-      - 'RELEASING.md'
-      - '.sdkmanrc'
-  push:
-    branches: [ main ]
-    paths-ignore:
-      - 'docs/**/*.css'
-      - 'docs/**/*.html'
-      - 'docs/**/*.ico'
-      - 'docs/**/*.md'
-      - 'docs/**/*.png'
-      - 'docs/**/*.svg'
-      - 'docs/**/*.md'
-      - 'mkdocs.yml'
-      - 'README.md'
-      - 'RELEASING.md'
-      - '.sdkmanrc'
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
-  cancel-in-progress: true
-
-env:
-  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-
-permissions:
-  contents: read
-
-jobs:
-  find_gradle_jobs:
-    runs-on: ubuntu-22.04
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
-      - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
-      - id: set-matrix
-        working-directory: ./examples/
-        env:
-          # Since we override the tests executor,
-          # we should not push empty results to the cache
-          READ_ONLY_REMOTE_GRADLE_CACHE: true
-        run: |
-          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
-          echo $TASKS
-          echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
-  check:
-    needs: find_gradle_jobs
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
-      - name: Clear existing docker image cache
-        run: docker image prune -af
-      - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-cleanup: true
-      - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
-        working-directory: ./examples/
-        run: |
-          ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 770a8e387c7..389d71a6877 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,30 @@ env:
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
 
 jobs:
+  core:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: temurin
+      - name: Clear existing docker image cache
+        run: docker image prune -af
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-includes: |
+            caches
+            notifications
+            jdks
+          gradle-home-cache-cleanup: true
+      - name: Build and test with Gradle
+        run: |
+          ./gradlew :testcontainers:check --no-daemon --continue --scan
+
   find_gradle_jobs:
+    needs: [core]
     runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -59,7 +82,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
-          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":azure:check"))' --compact-output)
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":azure:check" or . == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:
@@ -87,3 +110,97 @@ jobs:
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
+
+  find_examples_jobs:
+    needs: [check]
+    runs-on: ubuntu-22.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: temurin
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+      - id: set-matrix
+        working-directory: ./examples/
+        env:
+          # Since we override the tests executor,
+          # we should not push empty results to the cache
+          READ_ONLY_REMOTE_GRADLE_CACHE: true
+        run: |
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
+          echo $TASKS
+          echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
+  check_examples:
+    needs: [find_examples_jobs]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.find_examples_jobs.outputs.matrix) }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: temurin
+      - name: Clear existing docker image cache
+        run: docker image prune -af
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
+      - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
+        working-directory: ./examples/
+        run: |
+          ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+
+  find_docs_examples_jobs:
+    needs: [check_examples]
+    runs-on: ubuntu-22.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: temurin
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+      - id: set-matrix
+        env:
+          # Since we override the tests executor,
+          # we should not push empty results to the cache
+          READ_ONLY_REMOTE_GRADLE_CACHE: true
+        run: |
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'map(select(startswith(":docs:")))' --compact-output)
+          echo $TASKS
+          echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
+  check_docs_examples:
+    needs: [find_docs_examples_jobs]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.find_docs_examples_jobs.outputs.matrix) }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: temurin
+      - name: Clear existing docker image cache
+        run: docker image prune -af
+      - name: Setup Gradle Build Action
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-includes: |
+            caches
+            notifications
+            jdks
+          gradle-home-cache-cleanup: true
+      - name: Build and test with Gradle (${{matrix.gradle_args}})
+        run: |
+          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}

From f36f07f98feef2b12a5367a96738603b33852511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 3 Aug 2023 15:41:07 -0600
Subject: [PATCH 3112/4969] Move common configuration in workflows (#7396)

Create reusable actions to be used across the workflows.
---
 .github/actions/setup-build/action.yml  | 10 ++++
 .github/actions/setup-gradle/action.yml | 13 +++++
 .github/actions/setup-java/action.yml   |  9 ++++
 .github/workflows/ci.yml                | 71 +++----------------------
 .github/workflows/release.yml           |  5 +-
 5 files changed, 40 insertions(+), 68 deletions(-)
 create mode 100644 .github/actions/setup-build/action.yml
 create mode 100644 .github/actions/setup-gradle/action.yml
 create mode 100644 .github/actions/setup-java/action.yml

diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
new file mode 100644
index 00000000000..23204529408
--- /dev/null
+++ b/.github/actions/setup-build/action.yml
@@ -0,0 +1,10 @@
+name: Set up Build
+description: Sets up Build
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/setup-java
+    - name: Clear existing docker image cache
+      shell: bash
+      run: docker image prune -af
+    - uses: ./.github/actions/setup-gradle
diff --git a/.github/actions/setup-gradle/action.yml b/.github/actions/setup-gradle/action.yml
new file mode 100644
index 00000000000..58499f75e57
--- /dev/null
+++ b/.github/actions/setup-gradle/action.yml
@@ -0,0 +1,13 @@
+name: Set up Gradle Action
+description: Sets up Gradle Action
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Gradle Build Action
+      uses: gradle/gradle-build-action@v2
+      with:
+        gradle-home-cache-includes: |
+          caches
+          notifications
+          jdks
+        gradle-home-cache-cleanup: true
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
new file mode 100644
index 00000000000..8d9733f02ba
--- /dev/null
+++ b/.github/actions/setup-java/action.yml
@@ -0,0 +1,9 @@
+name: Set up Java
+description: Sets up Java version
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-java@v3
+      with:
+        java-version: '8'
+        distribution: temurin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 389d71a6877..aed86892eb5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,20 +45,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
-      - name: Clear existing docker image cache
-        run: docker image prune -af
-      - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-includes: |
-            caches
-            notifications
-            jdks
-          gradle-home-cache-cleanup: true
+      - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle
         run: |
           ./gradlew :testcontainers:check --no-daemon --continue --scan
@@ -70,10 +57,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
+      - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
       - id: set-matrix
@@ -93,20 +77,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
-      - name: Clear existing docker image cache
-        run: docker image prune -af
-      - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-includes: |
-            caches
-            notifications
-            jdks
-          gradle-home-cache-cleanup: true
+      - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
@@ -118,10 +89,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
+      - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
       - id: set-matrix
@@ -142,16 +110,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
-      - name: Clear existing docker image cache
-        run: docker image prune -af
-      - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-cleanup: true
+      - uses: ./.github/actions/setup-build
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
         working-directory: ./examples/
         run: |
@@ -164,10 +123,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
+      - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
       - id: set-matrix
@@ -187,20 +143,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
-      - name: Clear existing docker image cache
-        run: docker image prune -af
-      - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-includes: |
-            caches
-            notifications
-            jdks
-          gradle-home-cache-cleanup: true
+      - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 07d19ab0343..5857be84118 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,10 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: temurin
+      - uses: ./.github/actions/setup-java
       - name: Clear existing docker image cache
         run: docker image prune -af
 

From 9e8b18b72d9c8e61e737840b2db69fcceb9c2d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 4 Aug 2023 11:15:17 -0600
Subject: [PATCH 3113/4969] Support icr.io/db2_community/db2 as a compatible
 image (#7397)

`ibmcom/db2` is deprecated. New image location is `icr.io/db2_community/db2`
---
 .../org/testcontainers/containers/Db2Container.java |  5 ++++-
 .../org/testcontainers/junit/db2/SimpleDb2Test.java | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 6ff5d2d47b5..99a848f74fb 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -12,8 +12,11 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     public static final String NAME = "db2";
 
+    @Deprecated
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ibmcom/db2");
 
+    private static final DockerImageName DEFAULT_NEW_IMAGE_NAME = DockerImageName.parse("icr.io/db2_community/db2");
+
     @Deprecated
     public static final String DEFAULT_DB2_IMAGE_NAME = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
@@ -42,7 +45,7 @@ public Db2Container(String dockerImageName) {
 
     public Db2Container(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_NEW_IMAGE_NAME, DEFAULT_IMAGE_NAME);
 
         withPrivilegedMode(true);
         this.waitStrategy =
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index ae35a8ee77c..2cffbdb117a 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -25,6 +25,19 @@ public void testSimple() throws SQLException {
         }
     }
 
+    @Test
+    public void testSimpleWithNewImage() throws SQLException {
+        try (Db2Container db2 = new Db2Container("icr.io/db2_community/db2:11.5.8.0").acceptLicense()) {
+            db2.start();
+
+            ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(db2);
+        }
+    }
+
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
         try (

From e11c86fe86ab059eee8114b5da684f6973af7c98 Mon Sep 17 00:00:00 2001
From: Seonghyeon Cho <seonghyeoncho96@gmail.com>
Date: Sun, 6 Aug 2023 11:39:10 +0900
Subject: [PATCH 3114/4969] Fix consul docs (#7398)

---
 docs/modules/consul.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/docs/modules/consul.md b/docs/modules/consul.md
index d0eafd6b1a8..c400e8b4bcb 100644
--- a/docs/modules/consul.md
+++ b/docs/modules/consul.md
@@ -19,18 +19,20 @@ test how your application behaves with Consul by writing different test scenario
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
-```groovy tab='Gradle'
-testImplementation "org.testcontainers:consul:{{latest_version}}"
-```
-
-```xml tab='Maven'
-<dependency>
-    <groupId>org.testcontainers</groupId>
-    <artifactId>consul</artifactId>
-    <version>{{latest_version}}</version>
-    <scope>test</scope>
-</dependency>
-```
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:consul:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>consul</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
 
 See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/modules/consul/AUTHORS) for contributors.
 

From d08c3fa5ab291bb1e48f48b433cef7a62dd05d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sat, 5 Aug 2023 20:42:21 -0600
Subject: [PATCH 3115/4969] Remove non existing reference to authors in consul
 docs

---
 docs/modules/consul.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/modules/consul.md b/docs/modules/consul.md
index c400e8b4bcb..f9f21bfb541 100644
--- a/docs/modules/consul.md
+++ b/docs/modules/consul.md
@@ -33,6 +33,3 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
         <scope>test</scope>
     </dependency>
     ```
-
-See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/modules/consul/AUTHORS) for contributors.
-

From 8c496993151202160d3db984d5b19949e950f55a Mon Sep 17 00:00:00 2001
From: Leo <leocrossuk@gmail.com>
Date: Tue, 8 Aug 2023 16:00:20 +0100
Subject: [PATCH 3116/4969] Add global testcontainers header to docs (#7401)

---
 docs/css/extra.css                 |  25 +-
 docs/css/tc-header.css             | 375 +++++++++++++++++++++++++++++
 docs/index.md                      |   6 +-
 docs/js/tc-header.js               |  45 ++++
 docs/language-logos/ruby.svg       | 125 ++++++++++
 docs/testcontainers-logo.svg       |  22 ++
 docs/theme/main.html               |   5 +
 docs/theme/partials/header.html    | 150 ++++++++++++
 docs/theme/partials/nav.html       |   6 +-
 docs/theme/partials/tc-header.html | 157 ++++++++++++
 mkdocs.yml                         |   1 +
 11 files changed, 901 insertions(+), 16 deletions(-)
 create mode 100644 docs/css/tc-header.css
 create mode 100644 docs/js/tc-header.js
 create mode 100644 docs/language-logos/ruby.svg
 create mode 100644 docs/testcontainers-logo.svg
 create mode 100644 docs/theme/partials/header.html
 create mode 100644 docs/theme/partials/tc-header.html

diff --git a/docs/css/extra.css b/docs/css/extra.css
index e82da5797ae..ff780cb25ea 100644
--- a/docs/css/extra.css
+++ b/docs/css/extra.css
@@ -1,13 +1,18 @@
-@import url('https://fonts.googleapis.com/css?family=Rubik');
 h1, h2, h3, h4, h5, h6 {
     font-family: 'Rubik', sans-serif;
-
 }
 
 [data-md-color-scheme="testcontainers"] {
-    --md-primary-fg-color:       #291A3F;
-    --md-accent-fg-color:        #291A3F;
+    --md-primary-fg-color:       #00bac2;
+    --md-accent-fg-color:        #361E5B;
     --md-typeset-a-color:        #0C94AA;
+    --md-primary-fg-color--dark: #291A3F;
+    --md-default-fg-color--lightest: #F2F4FE;
+    --md-footer-fg-color: #361E5B;
+    --md-footer-fg-color--light: #746C8F;
+    --md-footer-fg-color--lighter: #C3BEDE;
+    --md-footer-bg-color: #F7F9FD;
+    --md-footer-bg-color--dark: #F7F9FD;
 }
 
 .card-grid {
@@ -15,6 +20,12 @@ h1, h2, h3, h4, h5, h6 {
     gap: 10px;
 }
 
+.tc-version {
+    font-size: 1.1em;
+    text-align: center;
+    margin: 0;
+}
+
 @media (min-width: 680px) {
     .card-grid {
         grid-template-columns: repeat(3, 1fr);
@@ -39,14 +50,14 @@ body .card-grid-item:focus {
 }
 
 .card-grid-item[href] {
-    color: var(--md-primary-fg-color);
+    color: var(--md-primary-fg-color--dark);
     background: transparent;
 }
 
 .card-grid-item[href]:hover,
 .card-grid-item[href]:focus {
     background: #F2F4FE;
-    color: var(--md-primary-fg-color);
+    color: var(--md-primary-fg-color--dark);
 }
 
 .community-callout-wrapper {
@@ -79,7 +90,7 @@ body .card-grid-item:focus {
 }
 
 .community-callout a {
-transition: opacity 0.2s ease;
+    transition: opacity 0.2s ease;
 }
 
 .community-callout a:hover {
diff --git a/docs/css/tc-header.css b/docs/css/tc-header.css
new file mode 100644
index 00000000000..122102bb4d9
--- /dev/null
+++ b/docs/css/tc-header.css
@@ -0,0 +1,375 @@
+
+:root {
+    --color-catskill: #F2F4FE;
+    --color-catskill-45: rgba(242, 244, 254, 0.45);
+    --color-mist: #E7EAFB;
+    --color-fog: #C3C7E6;
+    --color-smoke: #9991B5;
+    --color-smoke-75: rgba(153, 145, 181, 0.75);
+    --color-storm: #746C8F;
+    --color-topaz: #00BAC2;
+    --color-pacific: #17A6B2;
+    --color-teal: #027F9E;
+    --color-eggplant: #291A3F;
+    --color-plum: #361E5B;
+
+}
+
+#site-header {
+    color: var(--color-storm);
+    background: #fff;
+    font-family: 'Rubik', Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    line-height: 1.5;
+    position: relative;
+    width: 100%;
+    z-index: 4;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 20px;
+    padding: 20px;
+}
+
+body.tc-header-active #site-header {
+    z-index: 5;
+}
+
+#site-header .brand {
+    display: flex;
+    justify-content: space-between;
+    gap: 20px;
+    width: 100%;
+}
+
+#site-header .logo {
+    display: flex; 
+}
+
+#site-header .logo img,
+#site-header .logo svg {
+    height: 30px;
+    width: auto;
+    max-width: 100%;
+}
+
+#site-header #mobile-menu-toggle {
+    background: none;
+    border: none;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    cursor: pointer;
+    color: var(--color-eggplant);
+    padding: 0;
+    margin: 0;
+    font-weight: 500;
+}
+
+body.mobile-menu #site-header #mobile-menu-toggle {
+    color: var(--color-topaz);
+}
+
+#site-header ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+#site-header nav {
+    display: none;
+}
+
+#site-header .menu-item {
+    display: flex;
+}
+
+#site-header .menu-item button,
+#site-header .menu-item a {
+    min-height: 30px;
+    display: flex;
+    gap: 6px;
+    align-items: center;
+    border: none;
+    background: none;
+    cursor: pointer;
+    padding: 0;
+    font-weight: 500;
+    color: var(--color-eggplant);
+    text-decoration: none;
+    font-size: 14px;
+    transition: color 0.2s ease;
+    white-space: nowrap;
+}
+
+#site-header .menu-item button:hover,
+#site-header .menu-item a:hover {
+    color: var(--color-topaz);
+}
+
+#site-header .menu-item button .icon-external,
+#site-header .menu-item a .icon-externa {
+    margin-left: auto;
+    opacity: .3;
+    flex-shrink: 0;
+}
+
+#site-header .menu-item button .icon-caret,
+#site-header .menu-item a .icon-caret {
+    opacity: .3;
+    height: 8px;
+}
+
+#site-header .menu-item button .icon-slack,
+#site-header .menu-item a .icon-slack,
+#site-header .menu-item button .icon-github,
+#site-header .menu-item a .icon-github {
+    height: 18px;
+}
+
+#site-header .menu-item .menu-dropdown {
+    flex-direction: column;
+}
+
+body #site-header .menu-item .menu-dropdown {
+    display: none;
+}
+
+#site-header .menu-item.has-children.active .menu-dropdown {
+    display: flex;
+    z-index: 10;
+}
+
+#site-header .menu-dropdown-item + .menu-dropdown-item {
+    border-top: 1px solid var(--color-mist);
+}
+
+#site-header .menu-dropdown-item a {
+    display: flex;
+    gap: 10px;
+    align-items: center;
+    padding: 10px 20px;
+    font-weight: 500;
+    color: var(--color-eggplant);
+    text-decoration: none;
+    transition: 
+        color 0.2s ease,
+        background 0.2s ease;
+}
+
+#site-header .menu-dropdown-item a .icon-external {
+    margin-left: auto;
+    color: var(--color-fog);
+    flex-shrink: 0;
+    opacity: 1;
+}
+
+#site-header .menu-dropdown-item a:hover {
+    background-color: var(--color-catskill-45);
+}
+
+#site-header .menu-dropdown-item a:hover .icon-external {
+    color: var(--color-topaz);
+}
+
+#site-header .menu-dropdown-item a img {
+    height: 24px;
+}
+
+.md-header {
+    background-color: var(--color-catskill);
+    color: var(--color-eggplant);
+}
+
+.md-header.md-header--shadow {
+    box-shadow: none;
+}
+
+.md-header__inner.md-grid {
+    max-width: 100%;
+    padding: 1.5px 20px;
+}
+
+[dir=ltr] .md-header__title {
+    margin: 0;
+}
+
+.md-header__topic:first-child {
+    font-size: 16px;
+    font-weight: 500;
+    font-family: 'Rubik', Arial, Helvetica, sans-serif;
+}
+
+.md-header__title.md-header__title--active .md-header__topic,
+.md-header__title[data-md-state=active] .md-header__topic {
+    opacity: 1;
+    pointer-events: all;
+    transform: translateX(0);
+    transition: none;
+    z-index: 0;
+}
+
+.md-header__topic a {
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    transition: color .2s ease;
+}
+
+.md-header__topic a:hover {
+    color: var(--color-topaz);
+}
+
+div.md-header__source {
+    width: auto;
+}
+
+div.md-source__repository {
+    max-width: 100%;
+}
+
+.md-main {
+    padding: 0 12px;
+}
+
+@media screen and (min-width: 60em) {
+    form.md-search__form {
+        background-color: #FBFBFF;
+        color: var(--color-storm);
+    }
+
+    form.md-search__form:hover {
+        background-color: #fff;
+    }
+
+    .md-search__input + .md-search__icon {
+        color: var(--color-plum);
+    }
+
+    .md-search__input::placeholder {
+        color: var(--color-smoke);
+    }
+}
+
+@media (min-width: 500px) {
+    #site-header {
+        font-size: 16px;
+        padding: 20px 40px;
+    }
+    #site-header .logo img,
+    #site-header .logo svg {
+        height: 48px;
+    }
+
+    #site-header .menu-item button .icon-caret,
+    #site-header .menu-item a .icon-caret {
+        height: 10px;
+    }
+    
+    #site-header .menu-item button .icon-slack,
+    #site-header .menu-item a .icon-slack,
+    #site-header .menu-item button .icon-github,
+    #site-header .menu-item a .icon-github {
+        height: 24px;
+    }
+
+    .md-header__inner.md-grid {
+        padding: 5px 40px;
+    }
+
+    .md-main {
+        padding: 0 32px;
+    }
+}
+
+@media (min-width: 1024px) {
+    #site-header #mobile-menu-toggle {
+        display: none;
+    }
+
+    #site-header nav {
+        display: block;
+    }
+
+    #site-header .menu {
+        display: flex;
+        justify-content: center;
+        gap: 30px;
+    }
+
+    #site-header .menu-item {
+        align-items: center;
+        position: relative;
+    }
+
+    #site-header .menu-item button,
+    #site-header .menu-item a {
+        min-height: 48px;
+        gap: 8px;
+        font-size: 16px;
+    }
+
+    #site-header .menu-item .menu-dropdown {
+        position: absolute;
+        top: 100%;
+        right: -8px;
+        border: 1px solid var(--color-mist);
+        border-radius: 6px;
+        background: #fff;
+        box-shadow: 0px 30px 35px var(--color-smoke-75);
+        min-width: 200px;
+    }
+}
+
+
+@media (max-width: 1023px) {
+    #site-header {
+        flex-direction: column;
+    }
+
+    body.mobile-tc-header-active #site-header {
+        z-index: 5;
+    }
+
+    body.mobile-menu #site-header nav {
+        display: flex;
+    }
+
+    #site-header nav {
+        position: absolute;
+        top: calc(100% - 5px);
+        width: calc(100% - 80px);
+        flex-direction: column;
+        border: 1px solid var(--color-mist);
+        border-radius: 6px;
+        background: #fff;
+        box-shadow: 0px 30px 35px var(--color-smoke-75);
+        min-width: 200px;
+    }
+
+    #site-header .menu-item {
+        flex-direction: column;
+    }
+    #site-header .menu-item + .menu-item {
+        border-top: 1px solid var(--color-mist);
+    }
+
+    #site-header .menu-item button,
+    #site-header .menu-item a {
+        padding: 10px 20px;
+    }
+
+    #site-header .menu-item.has-children.active .menu-dropdown {
+        border-top: 1px solid var(--color-mist);
+    }
+
+    #site-header .menu-dropdown-item a {
+        padding: 10px 20px 10px 30px;
+    }
+}
+
+@media (max-width: 499px) {
+    #site-header nav {
+        width: calc(100% - 40px);
+    }
+}
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 9e52c42da13..90cb81bf3af 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,4 @@
-# Testcontainers
-
-<!-- allow aspect ratio computation to reduce layout shift. CSS enforces max-width: 100% -->
-<img src="logo.png" alt="Testcontainers logo" width="1024" height="512"/>
+# Testcontainers for Java
 
 <p align=center><strong>Not using Java? Here are other supported languages!</strong></p>
 <div class="card-grid">
@@ -12,6 +9,7 @@
     <a href="https://testcontainers-python.readthedocs.io/en/latest/" class="card-grid-item"><img src="language-logos/python.svg"/>Python</a>
     <a href="https://docs.rs/testcontainers/latest/testcontainers/" class="card-grid-item"><img src="language-logos/rust.svg"/>Rust</a>
     <a href="https://github.com/testcontainers/testcontainers-hs/" class="card-grid-item" ><img src="language-logos/haskell.svg"/>Haskell</a>
+    <a href="https://github.com/testcontainers/testcontainers-ruby/" class="card-grid-item" ><img src="language-logos/ruby.svg"/>Ruby</a>
 </div>
 
 ## About Testcontainers for Java
diff --git a/docs/js/tc-header.js b/docs/js/tc-header.js
new file mode 100644
index 00000000000..4186b6ca59b
--- /dev/null
+++ b/docs/js/tc-header.js
@@ -0,0 +1,45 @@
+const mobileToggle = document.getElementById("mobile-menu-toggle");
+const mobileSubToggle = document.getElementById("mobile-submenu-toggle");
+function toggleMobileMenu() {
+    document.body.classList.toggle('mobile-menu');
+    document.body.classList.toggle("mobile-tc-header-active");
+}
+function toggleMobileSubmenu() {
+    document.body.classList.toggle('mobile-submenu');
+}
+if (mobileToggle)
+    mobileToggle.addEventListener("click", toggleMobileMenu);
+if (mobileSubToggle)
+    mobileSubToggle.addEventListener("click", toggleMobileSubmenu);
+
+const allParentMenuItems = document.querySelectorAll("#site-header .menu-item.has-children");
+function clearActiveMenuItem() {
+    document.body.classList.remove("tc-header-active");
+    allParentMenuItems.forEach((item) => {
+        item.classList.remove("active");
+    });
+}
+function setActiveMenuItem(e) {
+    clearActiveMenuItem();
+    e.currentTarget.closest(".menu-item").classList.add("active");
+    document.body.classList.add("tc-header-active");
+}
+allParentMenuItems.forEach((item) => {
+    const trigger = item.querySelector(":scope > a, :scope > button");
+
+    trigger.addEventListener("click", (e) => {
+        if (e.currentTarget.closest(".menu-item").classList.contains("active")) {
+            clearActiveMenuItem();
+        }  else {
+            setActiveMenuItem(e);
+        }
+    });
+
+    trigger.addEventListener("mouseenter", (e) => {
+        setActiveMenuItem(e);
+    });
+
+    item.addEventListener("mouseleave", (e) => {
+        clearActiveMenuItem();
+    });
+});
\ No newline at end of file
diff --git a/docs/language-logos/ruby.svg b/docs/language-logos/ruby.svg
new file mode 100644
index 00000000000..05537cedf72
--- /dev/null
+++ b/docs/language-logos/ruby.svg
@@ -0,0 +1,125 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1089_68506)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.2423 19.7459L6.1142 29.9165L28.2919 28.4116L30 6.04883L23.2423 19.7459Z" fill="url(#paint0_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.3282 28.3967L26.4221 15.2402L21.2299 22.0963L28.3282 28.3967Z" fill="url(#paint1_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.354 28.3965L14.389 27.3003L6.18835 29.8881L28.354 28.3965Z" fill="url(#paint2_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.20806 29.8908L9.69668 18.4619L2.0199 20.1034L6.20806 29.8908Z" fill="url(#paint3_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.2285 22.1341L18.0185 9.56055L8.83209 18.1716L21.2285 22.1341Z" fill="url(#paint4_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.2717 9.73733L20.588 2.64502L18.1699 10.4626L29.2717 9.73733Z" fill="url(#paint5_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.2107 0.116467L20.1035 2.93886L16.8813 0.0786133L25.2107 0.116467Z" fill="url(#paint6_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 23.9372L2.1395 20.0352L0.408822 15.3867L0 23.9372Z" fill="url(#paint7_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.293762 15.24L2.03504 20.1792L9.60129 18.4817L18.2396 10.4536L20.6773 2.71034L16.8388 0L10.3128 2.44234C8.25672 4.35472 4.26691 8.1386 4.12307 8.20976C3.98074 8.28244 1.48843 12.993 0.293762 15.24Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.40792 6.36685C10.8641 1.94854 16.6088 -0.661867 18.8134 1.56243C21.0167 3.78673 18.6802 9.19227 14.224 13.6091C9.76783 18.0259 4.09429 20.7801 1.89119 18.5558C-0.313427 16.333 1.95175 10.7836 6.40792 6.36685Z" fill="url(#paint8_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.20804 29.9698L9.6694 18.4727L21.1649 22.176C17.0085 26.0843 12.3858 29.3882 6.20804 29.9698Z" fill="url(#paint9_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.2547 10.4603L21.2058 22.1821C24.6777 18.5213 27.7939 14.5857 29.32 9.71777L18.2547 10.4603Z" fill="url(#paint10_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.2899 9.77686C30.4709 6.20261 30.7435 1.07507 25.1742 0.123047L20.6045 2.65417L29.2899 9.77686Z" fill="url(#paint11_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 23.9522C0.163529 29.8512 4.40771 29.9391 6.21562 29.9909L2.03957 20.2109L0 23.9522Z" fill="#9E1209"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.2712 10.4785C20.9391 12.1229 26.316 15.4253 26.4251 15.4861C26.5945 15.5817 28.7432 11.8526 29.2308 9.74512L18.2712 10.4785Z" fill="url(#paint12_radial_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.66487 18.4727L14.2921 27.425C17.0282 25.937 19.1708 24.124 21.1331 22.182L9.66487 18.4727Z" fill="url(#paint13_radial_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.02141 20.2231L1.36578 28.0519C2.60285 29.7464 4.30476 29.8937 6.08995 29.7616C4.79838 26.5381 2.21825 20.0926 2.02141 20.2231Z" fill="url(#paint14_linear_1089_68506)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.5774 2.67364L29.7698 3.96729C29.2793 1.88257 27.7727 0.537288 25.2047 0.116699L20.5774 2.67364Z" fill="url(#paint15_linear_1089_68506)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1089_68506" x1="26.3575" y1="32.6373" x2="20.0287" y2="21.4635" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FB7655"/>
+<stop offset="0.41" stop-color="#E42B1E"/>
+<stop offset="0.99" stop-color="#990000"/>
+<stop offset="1" stop-color="#990000"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1089_68506" x1="29.5102" y1="23.2513" x2="21.3538" y2="17.7779" gradientUnits="userSpaceOnUse">
+<stop stop-color="#871101"/>
+<stop offset="0.99" stop-color="#911209"/>
+<stop offset="1" stop-color="#911209"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1089_68506" x1="22.9842" y1="32.9761" x2="14.8281" y2="27.5029" gradientUnits="userSpaceOnUse">
+<stop stop-color="#871101"/>
+<stop offset="0.99" stop-color="#911209"/>
+<stop offset="1" stop-color="#911209"/>
+</linearGradient>
+<linearGradient id="paint3_linear_1089_68506" x1="5.85924" y1="19.2887" x2="7.12365" y2="27.5062" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.23" stop-color="#E57252"/>
+<stop offset="0.46" stop-color="#DE3B20"/>
+<stop offset="0.99" stop-color="#A60003"/>
+<stop offset="1" stop-color="#A60003"/>
+</linearGradient>
+<linearGradient id="paint4_linear_1089_68506" x1="14.556" y1="11.6161" x2="15.0219" y2="20.0025" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.23" stop-color="#E4714E"/>
+<stop offset="0.56" stop-color="#BE1A0D"/>
+<stop offset="0.99" stop-color="#A80D00"/>
+<stop offset="1" stop-color="#A80D00"/>
+</linearGradient>
+<linearGradient id="paint5_linear_1089_68506" x1="22.2737" y1="3.86407" x2="23.6684" y2="9.87455" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.18" stop-color="#E46342"/>
+<stop offset="0.4" stop-color="#C82410"/>
+<stop offset="0.99" stop-color="#A80D00"/>
+<stop offset="1" stop-color="#A80D00"/>
+</linearGradient>
+<linearGradient id="paint6_linear_1089_68506" x1="18.0149" y1="1.74744" x2="24.0249" y2="-1.2576" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.54" stop-color="#C81F11"/>
+<stop offset="0.99" stop-color="#BF0905"/>
+<stop offset="1" stop-color="#BF0905"/>
+</linearGradient>
+<linearGradient id="paint7_linear_1089_68506" x1="0.591021" y1="17.1938" x2="1.08568" y2="22.1463" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.31" stop-color="#DE4024"/>
+<stop offset="0.99" stop-color="#BF190B"/>
+<stop offset="1" stop-color="#BF190B"/>
+</linearGradient>
+<linearGradient id="paint8_linear_1089_68506" x1="-2.80962" y1="23.4851" x2="20.4434" y2="-0.42555" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BD0012"/>
+<stop offset="0.07" stop-color="white"/>
+<stop offset="0.17" stop-color="white"/>
+<stop offset="0.27" stop-color="#C82F1C"/>
+<stop offset="0.33" stop-color="#820C01"/>
+<stop offset="0.46" stop-color="#A31601"/>
+<stop offset="0.72" stop-color="#B31301"/>
+<stop offset="0.99" stop-color="#E82609"/>
+<stop offset="1" stop-color="#E82609"/>
+</linearGradient>
+<linearGradient id="paint9_linear_1089_68506" x1="15.0015" y1="25.9693" x2="7.99519" y2="24.2449" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8C0C01"/>
+<stop offset="0.54" stop-color="#990C00"/>
+<stop offset="0.99" stop-color="#A80D0E"/>
+<stop offset="1" stop-color="#A80D0E"/>
+</linearGradient>
+<linearGradient id="paint10_linear_1089_68506" x1="27.0316" y1="17.5396" x2="20.7941" y2="11.9646" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7E110B"/>
+<stop offset="0.99" stop-color="#9E0C00"/>
+<stop offset="1" stop-color="#9E0C00"/>
+</linearGradient>
+<linearGradient id="paint11_linear_1089_68506" x1="29.3177" y1="7.27868" x2="26.2091" y2="3.96462" gradientUnits="userSpaceOnUse">
+<stop stop-color="#79130D"/>
+<stop offset="0.99" stop-color="#9E120B"/>
+<stop offset="1" stop-color="#9E120B"/>
+</linearGradient>
+<radialGradient id="paint12_radial_1089_68506" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(21.7783 12.0543) scale(7.62493 7.64616)">
+<stop stop-color="#A80D00"/>
+<stop offset="0.99" stop-color="#7E0E08"/>
+<stop offset="1" stop-color="#7E0E08"/>
+</radialGradient>
+<radialGradient id="paint13_radial_1089_68506" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(11.2187 22.1306) scale(10.1363 10.1645)">
+<stop stop-color="#A30C00"/>
+<stop offset="0.99" stop-color="#800E08"/>
+<stop offset="1" stop-color="#800E08"/>
+</radialGradient>
+<linearGradient id="paint14_linear_1089_68506" x1="4.03826" y1="29.9629" x2="1.49951" y2="21.3736" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8B2114"/>
+<stop offset="0.43" stop-color="#9E100A"/>
+<stop offset="0.99" stop-color="#B3100C"/>
+<stop offset="1" stop-color="#B3100C"/>
+</linearGradient>
+<linearGradient id="paint15_linear_1089_68506" x1="23.4151" y1="1.48747" x2="29.0828" y2="3.98236" gradientUnits="userSpaceOnUse">
+<stop stop-color="#B31000"/>
+<stop offset="0.44" stop-color="#910F08"/>
+<stop offset="0.99" stop-color="#791C12"/>
+<stop offset="1" stop-color="#791C12"/>
+</linearGradient>
+<clipPath id="clip0_1089_68506">
+<rect width="30" height="30" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/docs/testcontainers-logo.svg b/docs/testcontainers-logo.svg
new file mode 100644
index 00000000000..4b099f34a8e
--- /dev/null
+++ b/docs/testcontainers-logo.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 777.7092 204.1672" width="183" height="48">
+    <title>Testcontainers</title>
+    <path d="M178.2295,54.0101c.007-.1125,.0108-.2252,.0108-.3387-.0003-.3132-.0292-.6227-.0845-.9254-.2605-1.5138-1.198-2.8471-2.5561-3.6312-.1525-.088-.3085-.1677-.4676-.2389L91.7738,.6984c-1.6101-.9305-3.5944-.9312-5.2054-.0025L2.648,49.0976c-1.6107,.9292-2.6035,2.647-2.6044,4.5068L0,150.4826c-.0006,1.8598,.9906,3.5785,2.6006,4.5093l83.877,48.477c.7917,.4575,1.6901,.6983,2.6044,.6983h.1087c.9146,0,1.8131-.2408,2.6047-.6983l83.8767-48.477c1.6101-.9308,2.6016-2.6495,2.6006-4.5093l-.0432-96.4725Z" style="fill: #361e5b; fill-rule: evenodd;"/>
+    <polygon points="89.1362 11.187 10.4214 56.6396 10.4214 147.5275 89.1362 192.9799 167.8515 147.5275 167.8515 56.6396 89.1362 11.187" style="fill: #16d6c7;"/>
+    <polygon points="167.8514 56.6395 167.8514 147.5274 89.1364 192.98 89.1364 102.0921 167.8514 56.6395" style="fill: #027f9e;"/>
+    <polygon points="167.8514 56.6395 89.1364 102.0921 10.4215 56.6395 89.1364 11.187 167.8514 56.6395" style="fill: #17a6b2;"/>
+    <path d="M227.4234,130.5243c-.5731,0-1.0414-.1817-1.4048-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-41.8383h-14.2062c-.5207,0-.9636-.1817-1.327-.5464-.3647-.3634-.5464-.8063-.5464-1.327v-7.0251c0-.5718,.1817-1.0401,.5464-1.4048,.3634-.3634,.8063-.5464,1.327-.5464h40.9014c.5718,0,1.0401,.183,1.4048,.5464,.3634,.3647,.5464,.833,.5464,1.4048v7.0251c0,.5207-.183,.9636-.5464,1.327-.3647,.3647-.833,.5464-1.4048,.5464h-14.1283v41.8383c0,.5731-.183,1.0414-.5464,1.4048-.3644,.3647-.833,.5464-1.4048,.5464h-8.6644Z" style="fill: #361e5b;"/>
+    <path d="M271.056,131.3045c-5.9847,0-10.7329-1.6647-14.2452-4.9954-3.5124-3.3294-5.3737-8.1691-5.5809-14.5185v-3.3561c.2071-4.0067,1.1183-7.4543,2.7318-10.3427,1.6123-2.8881,3.8758-5.0993,6.791-6.635,2.9135-1.5341,6.3224-2.3026,10.2252-2.3026,4.3711,0,8.0265,.8978,10.967,2.6931,2.9393,1.7953,5.1517,4.2418,6.6347,7.3371,1.483,3.0972,2.2245,6.6483,2.2245,10.655v1.7956c0,.5204-.1951,.9632-.5855,1.3267-.3901,.3647-.8463,.5464-1.3658,.5464h-25.5242v.6246c.0511,1.666,.3768,3.1877,.9756,4.5658,.5976,1.3794,1.4563,2.4856,2.5758,3.3173,1.1183,.8336,2.4586,1.2492,4.0197,1.2492,1.3003,0,2.3674-.1817,3.2004-.5464,.8317-.3634,1.5221-.8063,2.0685-1.3267,.5464-.5197,.9489-.9626,1.2098-1.3273,.4683-.5191,.8454-.8451,1.1319-.9753,.2853-.1296,.7415-.1951,1.3661-.1951h8.1176c.5197,0,.9489,.1436,1.2879,.4289,.338,.2866,.4807,.6907,.4292,1.2098-.0524,.833-.4816,1.8617-1.2879,3.0835-.8073,1.2231-1.9903,2.4195-3.5515,3.5905-1.5611,1.171-3.5003,2.1463-5.815,2.9272-2.3163,.7802-4.9836,1.1704-8.0007,1.1704Zm-7.7275-24.9h15.2987v-.1557c0-1.8737-.2999-3.499-.8975-4.8785-.5988-1.3781-1.4709-2.4589-2.6149-3.2395-1.1453-.7806-2.5247-1.171-4.137-1.171-1.6136,0-2.993,.3904-4.137,1.171-1.1453,.7806-2.0173,1.8613-2.6149,3.2395-.5988,1.3794-.8975,3.0047-.8975,4.8785v.1557Z" style="fill: #361e5b;"/>
+    <path d="M313.4394,131.3045c-3.2271,0-5.998-.3781-8.313-1.1316-2.316-.7536-4.1894-1.678-5.6199-2.7709-1.4318-1.0929-2.4977-2.1978-3.2004-3.3173-.7024-1.1183-1.0805-2.0688-1.1316-2.849-.0524-.5718,.1293-1.0401,.5464-1.4048,.4159-.3634,.8317-.5464,1.2488-.5464h7.5712c.1563,0,.3123,.0267,.4686,.0782,.156,.0521,.312,.183,.4683,.3901,.6757,.4683,1.3781,1.0026,2.1076,1.5999,.7281,.5992,1.5732,1.1062,2.5368,1.5224,.9623,.4168,2.1721,.6246,3.6296,.6246,1.7171,0,3.1734-.3514,4.3711-1.0541,1.1964-.7021,1.7953-1.7035,1.7953-3.0054,0-.9366-.2732-1.7168-.8196-2.3414s-1.5745-1.1964-3.0832-1.7174c-1.51-.5191-3.7468-1.0929-6.7128-1.7168-2.81-.6246-5.2041-1.4563-7.1811-2.4977-1.9783-1.0408-3.4612-2.3541-4.4493-3.9425-.989-1.5865-1.483-3.499-1.483-5.7369,0-2.0294,.6367-3.981,1.9122-5.8544,1.2746-1.8734,3.1613-3.4209,5.659-4.6443,2.498-1.2218,5.6203-1.8343,9.3668-1.8343,2.8611,0,5.3725,.3514,7.5324,1.0538,2.1587,.7027,3.9673,1.5881,5.4249,2.654,1.4563,1.0671,2.5625,2.16,3.3173,3.2782,.7539,1.1195,1.1573,2.0955,1.2098,2.9272,.0515,.5207-.1048,.9636-.4683,1.327-.3647,.3647-.7806,.5464-1.2488,.5464h-6.9469c-.2611,0-.4953-.0388-.7024-.1169-.2087-.0782-.3904-.1951-.5464-.3514-.6246-.4162-1.2625-.8978-1.9125-1.4442-.6513-.5464-1.4185-1.0268-2.3026-1.4439-.8854-.4159-2.0294-.6246-3.4346-.6246-1.7171,0-3.0317,.3781-3.9416,1.1319-.9111,.7548-1.3661,1.7054-1.3661,2.849,0,.7294,.2341,1.4048,.7024,2.0294s1.4306,1.1977,2.8881,1.7174c1.4563,.5204,3.6687,1.0668,6.6347,1.6393,3.5381,.6239,6.3481,1.5611,8.4302,2.8097,2.0806,1.2492,3.5772,2.6934,4.488,4.3327,.9099,1.6386,1.3661,3.3948,1.3661,5.2686,0,2.4462-.7294,4.6186-2.1857,6.5177-1.4572,1.8998-3.5781,3.3828-6.3614,4.4489-2.7842,1.0662-6.2055,1.5999-10.2643,1.5999Z" style="fill: #361e5b;"/>
+    <path d="M358.4768,130.5243c-3.2271,0-5.9847-.5331-8.2739-1.5999-2.2902-1.0662-4.0197-2.7188-5.1907-4.9566-1.1707-2.2372-1.7562-5.0468-1.7562-8.4302v-16.3919h-6.0882c-.5731,0-1.0417-.1817-1.4051-.5464-.3647-.3634-.5464-.8317-.5464-1.4051v-5.3077c0-.5722,.1817-1.0404,.5464-1.4051,.3634-.3634,.832-.5464,1.4051-.5464h6.0882v-12.8792c0-.5718,.1954-1.0401,.5855-1.4048,.3904-.3634,.8451-.5464,1.3661-.5464h7.6494c.5722,0,1.0404,.183,1.4051,.5464,.3634,.3647,.5464,.833,.5464,1.4048v12.8792h9.7569c.5194,0,.9623,.183,1.327,.5464,.3634,.3647,.5461,.833,.5461,1.4051v5.3077c0,.5734-.1827,1.0417-.5461,1.4051-.3647,.3647-.8076,.5464-1.327,.5464h-9.7569v15.4553c0,1.9779,.351,3.5257,1.0535,4.644,.7027,1.1195,1.9382,1.6787,3.7078,1.6787h5.6981c.5194,0,.9623,.183,1.327,.5464,.3634,.3641,.5464,.8069,.5464,1.3267v5.7763c0,.5731-.183,1.0414-.5464,1.4048-.3647,.3647-.8076,.5464-1.327,.5464h-6.791Z" style="fill: #361e5b;"/>
+    <path d="M393.9142,131.3045c-3.7993,0-7.142-.7021-10.0301-2.1069-2.8881-1.4055-5.165-3.4469-6.83-6.1276-1.666-2.6794-2.5758-5.8932-2.7318-9.64-.0524-.8317-.0782-1.8852-.0782-3.161,0-1.2746,.0257-2.3287,.0782-3.1617,.156-3.7977,1.0538-7.0368,2.6931-9.7182,1.639-2.6794,3.9149-4.7222,6.8297-6.1273,2.9139-1.4048,6.2699-2.1076,10.0692-2.1076,3.4857,0,6.4517,.4819,8.8985,1.4442,2.4449,.9636,4.4489,2.1733,6.0101,3.6296,1.5611,1.4572,2.7188,2.9793,3.4736,4.5662,.7536,1.5881,1.1577,2.9796,1.2098,4.176,.0508,.521-.1169,.9759-.507,1.3661s-.8463,.5852-1.3661,.5852h-8.3521c-.521,0-.9245-.1423-1.2104-.4289-.2859-.2853-.5591-.6894-.819-1.2098-.7294-1.821-1.666-3.1223-2.8103-3.9031-1.145-.7806-2.5758-1.171-4.293-1.171-2.3417,0-4.1894,.7552-5.5418,2.2639-1.354,1.5097-2.0821,3.8517-2.1857,7.0248-.0524,2.0294-.0524,3.8777,0,5.5424,.156,3.2271,.8978,5.5685,2.2245,7.0248,1.327,1.4576,3.1613,2.1857,5.503,2.1857,1.821,0,3.2782-.3901,4.3711-1.171,1.0929-.7802,2.0027-2.0802,2.7321-3.9025,.2071-.5197,.4683-.9232,.7809-1.2098,.3113-.2853,.7275-.4295,1.2485-.4295h8.3521c.5197,0,.9759,.1951,1.3661,.5852,.3901,.3908,.5579,.847,.507,1.3661-.0521,.8857-.2999,1.9258-.7415,3.1223-.4429,1.1977-1.1456,2.4202-2.1076,3.6687-.9632,1.2492-2.1991,2.4075-3.7074,3.4736-1.5103,1.0668-3.344,1.9258-5.503,2.5758-2.1603,.65-4.6713,.9753-7.5324,.9753Z" style="fill: #361e5b;"/>
+    <path d="M438.9513,131.3045c-4.32,0-7.9365-.7154-10.8498-2.1463-2.9145-1.4302-5.1396-3.4736-6.6734-6.127-1.5357-2.654-2.3814-5.7496-2.5371-9.2886-.0527-1.0408-.0782-2.2251-.0782-3.5518s.0254-2.4843,.0782-3.4736c.1557-3.5905,1.0401-6.6995,2.654-9.328,1.6126-2.627,3.8758-4.6564,6.791-6.0882,2.9139-1.4306,6.4517-2.1466,10.6153-2.1466,4.1103,0,7.6227,.7161,10.5378,2.1466,2.9139,1.4318,5.1771,3.4612,6.791,6.0882,1.612,2.6286,2.497,5.7375,2.6534,9.328,.1042,.9893,.1563,2.1463,.1563,3.4736s-.0521,2.511-.1563,3.5518c-.1563,3.5391-1.0026,6.6347-2.5364,9.2886-1.5357,2.6534-3.7602,4.6967-6.674,6.127-2.9151,1.4309-6.505,2.1463-10.7716,2.1463Zm0-8.5859c2.5485,0,4.475-.793,5.7763-2.3808,1.3-1.5865,2.0027-3.9146,2.1069-6.986,.0521-.7802,.0788-1.821,.0788-3.1223,0-1.3-.0267-2.3414-.0788-3.1223-.1042-3.0174-.8069-5.3334-2.1069-6.9466-1.3013-1.6129-3.2277-2.4202-5.7763-2.4202s-4.4883,.8073-5.8156,2.4202c-1.3267,1.6132-2.0421,3.9292-2.1463,6.9466-.0521,.7809-.0775,1.8223-.0775,3.1223,0,1.3013,.0254,2.342,.0775,3.1223,.1042,3.0714,.8196,5.3995,2.1463,6.986,1.3273,1.5878,3.2659,2.3808,5.8156,2.3808Z" style="fill: #361e5b;"/>
+    <path d="M467.8319,130.5243c-.521,0-.9639-.1817-1.3273-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-36.6866c0-.5722,.1817-1.0404,.5464-1.4051,.3634-.3634,.8063-.5464,1.3273-.5464h7.6494c.5718,0,1.0408,.183,1.4055,.5464,.3634,.3647,.5458,.833,.5458,1.4051v3.0441c1.3527-1.6647,3.0956-3.0441,5.2298-4.137,2.1336-1.0929,4.7349-1.6393,7.8057-1.6393s5.7623,.6903,8.0789,2.0685c2.3147,1.3794,4.137,3.3834,5.4636,6.0104,1.3273,2.6283,1.9906,5.8153,1.9906,9.5622v21.7777c0,.5731-.1951,1.0414-.5858,1.4048-.3901,.3647-.8463,.5464-1.3661,.5464h-8.2739c-.5731,0-1.0408-.1817-1.4042-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-21.3094c0-2.7576-.6633-4.9045-1.9906-6.4396-1.3273-1.5344-3.2665-2.3029-5.8156-2.3029-2.4462,0-4.3975,.7685-5.8538,2.3029-1.4576,1.5351-2.1857,3.682-2.1857,6.4396v21.3094c0,.5731-.183,1.0414-.5464,1.4048-.3641,.3647-.8076,.5464-1.3267,.5464h-8.2739Z" style="fill: #361e5b;"/>
+    <path d="M534.1003,130.5243c-3.2265,0-5.984-.5331-8.2739-1.5999-2.2899-1.0662-4.0194-2.7188-5.1904-4.9566-1.171-2.2372-1.7562-5.0468-1.7562-8.4302v-16.3919h-6.0882c-.5731,0-1.0414-.1817-1.4048-.5464-.3647-.3634-.5464-.8317-.5464-1.4051v-5.3077c0-.5722,.1817-1.0404,.5464-1.4051,.3634-.3634,.8317-.5464,1.4048-.5464h6.0882v-12.8792c0-.5718,.1951-1.0401,.5852-1.4048,.3908-.3634,.8451-.5464,1.3661-.5464h7.65c.5718,0,1.0401,.183,1.4048,.5464,.3634,.3647,.5464,.833,.5464,1.4048v12.8792h9.7569c.5191,0,.9626,.183,1.3273,.5464,.3634,.3647,.5458,.833,.5458,1.4051v5.3077c0,.5734-.1824,1.0417-.5458,1.4051-.3647,.3647-.8082,.5464-1.3273,.5464h-9.7569v15.4553c0,1.9779,.3514,3.5257,1.0535,4.644,.7027,1.1195,1.9385,1.6787,3.7074,1.6787h5.6981c.5197,0,.9626,.183,1.3273,.5464,.3634,.3641,.5464,.8069,.5464,1.3267v5.7763c0,.5731-.183,1.0414-.5464,1.4048-.3647,.3647-.8076,.5464-1.3273,.5464h-6.791Z" style="fill: #361e5b;"/>
+    <path d="M562.2788,131.3045c-2.7588,0-5.2298-.5337-7.4155-1.5999-2.1857-1.0662-3.9292-2.5098-5.2292-4.332-1.3019-1.821-1.9519-3.8504-1.9519-6.0882,0-3.6941,1.4957-6.608,4.4883-8.7428,2.9914-2.133,6.9333-3.5905,11.8257-4.3708l10.2246-1.483v-1.4048c0-2.03-.4676-3.5905-1.4042-4.6837-.9372-1.0929-2.5758-1.6393-4.9179-1.6393-1.7168,0-3.0968,.339-4.137,1.0147-1.0414,.677-1.8477,1.5614-2.4202,2.6543-.4168,.6767-1.0141,1.0147-1.795,1.0147h-7.4155c-.5731,0-1.0141-.1684-1.3267-.5077-.3126-.338-.4422-.7415-.3901-1.2098,0-.8845,.338-1.9246,1.0147-3.1223,.6754-1.1964,1.7174-2.3808,3.1223-3.5518,1.4048-1.1707,3.2004-2.1463,5.3861-2.9269,2.1851-.7806,4.8645-1.171,8.0395-1.171,3.2779,0,6.0882,.3904,8.4296,1.171,2.342,.7806,4.2151,1.8734,5.6206,3.2782,1.4048,1.4051,2.4449,3.032,3.1223,4.8785,.6754,1.8477,1.0141,3.8383,1.0141,5.9713v24.1197c0,.5731-.183,1.0414-.5464,1.4048-.3647,.3647-.8323,.5464-1.4042,.5464h-7.65c-.521,0-.9632-.1817-1.3267-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-2.8884c-.6773,.9893-1.5885,1.9125-2.7321,2.7715-1.145,.8584-2.511,1.5484-4.0982,2.0682-1.5872,.5197-3.4476,.7802-5.5806,.7802Zm3.1223-8.1176c1.7174,0,3.2512-.3634,4.6052-1.0929,1.3527-.7281,2.4195-1.8464,3.2004-3.3561,.7802-1.509,1.1704-3.4075,1.1704-5.6981v-1.3273l-7.2586,1.171c-2.8103,.4683-4.867,1.171-6.167,2.1076-1.3013,.9366-1.9513,2.0821-1.9513,3.4342,0,.9893,.2993,1.8483,.8978,2.5758,.5973,.7294,1.3915,1.2758,2.3808,1.6393,.988,.3647,2.0294,.5464,3.1223,.5464Z" style="fill: #361e5b;"/>
+    <path d="M596.076,83.6907c-.521,0-.9639-.1817-1.3273-.5464-.3647-.3634-.5464-.832-.5464-1.4051v-6.2445c0-.5718,.1817-1.0538,.5464-1.4439,.3634-.3904,.8063-.5855,1.3273-.5855h8.1958c.5718,0,1.0535,.1951,1.4436,.5855,.3908,.3901,.5858,.8721,.5858,1.4439v6.2445c0,.5731-.1951,1.0417-.5858,1.4051-.3901,.3647-.8717,.5464-1.4436,.5464h-8.1958Zm.2345,46.8336c-.521,0-.9639-.1817-1.3273-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-36.6866c0-.5722,.1817-1.0404,.5464-1.4051,.3634-.3634,.8063-.5464,1.3273-.5464h7.805c.5718,0,1.0408,.183,1.4055,.5464,.3634,.3647,.5464,.833,.5464,1.4051v36.6866c0,.5731-.183,1.0414-.5464,1.4048-.3647,.3647-.8336,.5464-1.4055,.5464h-7.805Z" style="fill: #361e5b;"/>
+    <path d="M617.6961,130.5243c-.521,0-.9632-.1817-1.3267-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-36.6866c0-.5722,.1817-1.0404,.5464-1.4051,.3634-.3634,.8057-.5464,1.3267-.5464h7.65c.5718,0,1.0401,.183,1.4048,.5464,.3634,.3647,.5458,.833,.5458,1.4051v3.0441c1.3534-1.6647,3.0956-3.0441,5.2305-4.137,2.133-1.0929,4.7342-1.6393,7.805-1.6393s5.7629,.6903,8.0795,2.0685c2.3141,1.3794,4.1363,3.3834,5.463,6.0104,1.3273,2.6283,1.9913,5.8153,1.9913,9.5622v21.7777c0,.5731-.1957,1.0414-.5858,1.4048-.3901,.3647-.8463,.5464-1.3661,.5464h-8.2739c-.5731,0-1.0414-.1817-1.4048-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-21.3094c0-2.7576-.6633-4.9045-1.9906-6.4396-1.3267-1.5344-3.2659-2.3029-5.815-2.3029-2.4462,0-4.3981,.7685-5.8544,2.3029-1.4576,1.5351-2.1857,3.682-2.1857,6.4396v21.3094c0,.5731-.183,1.0414-.5464,1.4048-.3641,.3647-.8069,.5464-1.3267,.5464h-8.2739Z" style="fill: #361e5b;"/>
+    <path d="M682.1702,131.3045c-5.9847,0-10.7329-1.6647-14.2452-4.9954-3.5124-3.3294-5.3734-8.1691-5.5806-14.5185v-3.3561c.2071-4.0067,1.1183-7.4543,2.7315-10.3427,1.612-2.8881,3.8758-5.0993,6.791-6.635,2.9132-1.5341,6.3227-2.3026,10.2252-2.3026,4.3714,0,8.0261,.8978,10.9667,2.6931,2.9393,1.7953,5.1517,4.2418,6.6347,7.3371,1.483,3.0972,2.2251,6.6483,2.2251,10.655v1.7956c0,.5204-.1957,.9632-.5858,1.3267-.3901,.3647-.8463,.5464-1.3661,.5464h-25.5239v.6246c.0515,1.666,.3768,3.1877,.9753,4.5658,.5979,1.3794,1.4563,2.4856,2.5758,3.3173,1.1183,.8336,2.4589,1.2492,4.0201,1.2492,1.3006,0,2.3674-.1817,3.2004-.5464,.8317-.3634,1.5224-.8063,2.0688-1.3267,.5464-.5197,.9486-.9626,1.2098-1.3273,.4676-.5191,.8451-.8451,1.1316-.9753,.2853-.1296,.7415-.1951,1.3661-.1951h8.1176c.5197,0,.9486,.1436,1.2879,.4289,.338,.2866,.4803,.6907,.4295,1.2098-.0527,.833-.4816,1.8617-1.2886,3.0835-.8069,1.2231-1.99,2.4195-3.5511,3.5905-1.5611,1.171-3.5003,2.1463-5.815,2.9272-2.316,.7802-4.9833,1.1704-8.0007,1.1704Zm-7.7275-24.9h15.2987v-.1557c0-1.8737-.2999-3.499-.8978-4.8785-.5985-1.3781-1.4703-2.4589-2.6146-3.2395-1.1456-.7806-2.5244-1.171-4.137-1.171-1.6139,0-2.9926,.3904-4.137,1.171-1.1456,.7806-2.0173,1.8613-2.6146,3.2395-.5992,1.3794-.8978,3.0047-.8978,4.8785v.1557Z" style="fill: #361e5b;"/>
+    <path d="M710.8163,130.5243c-.521,0-.9639-.1817-1.3273-.5464-.3647-.3634-.5464-.8317-.5464-1.4048v-36.6866c0-.5197,.1817-.9756,.5464-1.3661,.3634-.3901,.8063-.5855,1.3273-.5855h7.6487c.5197,0,.9759,.1954,1.3661,.5855,.3901,.3904,.5858,.8463,.5858,1.3661v3.1223c1.3-1.6126,2.8999-2.8614,4.8003-3.7468,1.8992-.8841,4.0976-1.327,6.5959-1.327h3.3561c.5197,0,.962,.183,1.3267,.5464,.3634,.3647,.5464,.833,.5464,1.4051v6.7128c0,.5731-.183,1.0417-.5464,1.4051-.3647,.3647-.8069,.5464-1.3267,.5464h-6.8685c-2.2912,0-4.0861,.6379-5.3861,1.9125-1.3013,1.2752-1.9513,3.0829-1.9513,5.4249v20.6848c0,.5731-.183,1.0414-.5464,1.4048-.3647,.3647-.8336,.5464-1.4055,.5464h-8.1951Z" style="fill: #361e5b;"/>
+    <path d="M758.8981,131.3045c-3.2271,0-5.998-.3781-8.3133-1.1316s-4.1891-1.678-5.6193-2.7709c-1.4321-1.0929-2.4983-2.1978-3.2011-3.3173-.7021-1.1183-1.0801-2.0688-1.131-2.849-.0527-.5718,.129-1.0401,.5464-1.4048,.4155-.3634,.8311-.5464,1.2485-.5464h7.5712c.1563,0,.312,.0267,.4683,.0782,.1563,.0521,.3126,.183,.4689,.3901,.6754,.4683,1.3775,1.0026,2.1069,1.5999,.7281,.5992,1.5732,1.1062,2.5371,1.5224,.9626,.4168,2.1724,.6246,3.6299,.6246,1.7168,0,3.1731-.3514,4.3708-1.0541,1.1964-.7021,1.795-1.7035,1.795-3.0054,0-.9366-.2732-1.7168-.8196-2.3414s-1.5745-1.1964-3.0829-1.7174c-1.5097-.5191-3.7468-1.0929-6.7128-1.7168-2.8103-.6246-5.2044-1.4563-7.1811-2.4977-1.9779-1.0408-3.4609-2.3541-4.4496-3.9425-.9887-1.5865-1.483-3.499-1.483-5.7369,0-2.0294,.6367-3.981,1.9125-5.8544,1.2746-1.8734,3.1617-3.4209,5.6587-4.6443,2.4983-1.2218,5.6206-1.8343,9.3668-1.8343,2.8618,0,5.3728,.3514,7.5331,1.0538,2.1584,.7027,3.9673,1.5881,5.4249,2.654,1.4563,1.0671,2.5619,2.16,3.3167,3.2782,.7542,1.1195,1.1577,2.0955,1.2098,2.9272,.0521,.5207-.1042,.9636-.4676,1.327-.3647,.3647-.7809,.5464-1.2492,.5464h-6.9473c-.2605,0-.495-.0388-.7021-.1169-.209-.0782-.3908-.1951-.5464-.3514-.6246-.4162-1.2625-.8978-1.9125-1.4442-.6513-.5464-1.4188-1.0268-2.3026-1.4439-.8851-.4159-2.0294-.6246-3.4342-.6246-1.7174,0-3.032,.3781-3.9419,1.1319-.9111,.7548-1.3661,1.7054-1.3661,2.849,0,.7294,.2338,1.4048,.7027,2.0294,.4676,.6246,1.4302,1.1977,2.8878,1.7174,1.4563,.5204,3.6687,1.0668,6.6347,1.6393,3.5384,.6239,6.3481,1.5611,8.4302,2.8097,2.0809,1.2492,3.5772,2.6934,4.4877,4.3327,.9099,1.6386,1.3661,3.3948,1.3661,5.2686,0,2.4462-.7294,4.6186-2.1857,6.5177-1.4569,1.8998-3.5778,3.3828-6.3614,4.4489-2.7842,1.0662-6.2051,1.5999-10.2639,1.5999Z" style="fill: #361e5b;"/>
+</svg>
\ No newline at end of file
diff --git a/docs/theme/main.html b/docs/theme/main.html
index f96a2669e7e..b3c01a3a271 100644
--- a/docs/theme/main.html
+++ b/docs/theme/main.html
@@ -2,4 +2,9 @@
 
 {% block analytics %}
 <!-- Cloudflare Web Analytics --><script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "e44a95720257486eab94698a6b4c6ca6"}'></script><!-- End Cloudflare Web Analytics -->
+{% endblock %}
+
+{% block extrahead %}
+<link href="https://fonts.googleapis.com/css2?family=Rubik:wght@400;500;600&display=swap" rel="stylesheet">
+<script rel="text/javascript" src="/js/tc-header.js" defer></script>
 {% endblock %}
\ No newline at end of file
diff --git a/docs/theme/partials/header.html b/docs/theme/partials/header.html
new file mode 100644
index 00000000000..057ec4ae5e0
--- /dev/null
+++ b/docs/theme/partials/header.html
@@ -0,0 +1,150 @@
+<!--
+  Copyright (c) 2016-2023 Martin Donath <martin.donath@squidfunk.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+<!-- Determine base classes -->
+{% set class = "md-header" %}
+{% if "navigation.tabs.sticky" in features %}
+  {% set class = class ~ " md-header--shadow md-header--lifted" %}
+{% elif "navigation.tabs" not in features %}
+  {% set class = class ~ " md-header--shadow" %}
+{% endif %}
+
+{% include "partials/tc-header.html" %}
+
+<!-- Header -->
+<header class="{{ class }}" data-md-component="header">
+  <nav
+    class="md-header__inner md-grid"
+    aria-label="{{ lang.t('header') }}"
+  >
+  
+    <!-- Button to open drawer -->
+    <label class="md-header__button md-icon" for="__drawer">
+      {% include ".icons/material/menu" ~ ".svg" %}
+    </label>
+
+    <!-- Header title -->
+    <div class="md-header__title" data-md-component="header-title">
+      <div class="md-header__ellipsis">
+        <div class="md-header__topic">
+            <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}">
+                <span class="md-ellipsis">
+                    {{ config.site_name }}
+                </span>
+            </a>
+        </div>
+      </div>
+    </div>
+
+    <!-- Color palette -->
+    {% if config.theme.palette %}
+      {% if not config.theme.palette is mapping %}
+        <form class="md-header__option" data-md-component="palette">
+          {% for option in config.theme.palette %}
+            {% set scheme  = option.scheme  | d("default", true) %}
+            {% set primary = option.primary | d("indigo", true) %}
+            {% set accent  = option.accent  | d("indigo", true) %}
+            <input
+              class="md-option"
+              data-md-color-media="{{ option.media }}"
+              data-md-color-scheme="{{ scheme | replace(' ', '-') }}"
+              data-md-color-primary="{{ primary | replace(' ', '-') }}"
+              data-md-color-accent="{{ accent | replace(' ', '-') }}"
+              {% if option.toggle %}
+                aria-label="{{ option.toggle.name }}"
+              {% else  %}
+                aria-hidden="true"
+              {% endif %}
+              type="radio"
+              name="__palette"
+              id="__palette_{{ loop.index }}"
+            />
+            {% if option.toggle %}
+              <label
+                class="md-header__button md-icon"
+                title="{{ option.toggle.name }}"
+                for="__palette_{{ loop.index0 or loop.length }}"
+                hidden
+              >
+                {% include ".icons/" ~ option.toggle.icon ~ ".svg" %}
+              </label>
+            {% endif %}
+          {% endfor %}
+        </form>
+      {% endif %}
+    {% endif %}
+
+    <!-- Site language selector -->
+    {% if config.extra.alternate %}
+      <div class="md-header__option">
+        <div class="md-select">
+          {% set icon = config.theme.icon.alternate or "material/translate" %}
+          <button
+            class="md-header__button md-icon"
+            aria-label="{{ lang.t('select.language') }}"
+          >
+            {% include ".icons/" ~ icon ~ ".svg" %}
+          </button>
+          <div class="md-select__inner">
+            <ul class="md-select__list">
+              {% for alt in config.extra.alternate %}
+                <li class="md-select__item">
+                  <a
+                    href="{{ alt.link | url }}"
+                    hreflang="{{ alt.lang }}"
+                    class="md-select__link"
+                  >
+                    {{ alt.name }}
+                  </a>
+                </li>
+              {% endfor %}
+            </ul>
+          </div>
+        </div>
+      </div>
+    {% endif %}
+
+    <!-- Button to open search modal -->
+    {% if "search" in config.plugins %}
+      <label class="md-header__button md-icon" for="__search">
+        {% include ".icons/material/magnify.svg" %}
+      </label>
+
+      <!-- Search interface -->
+      {% include "partials/search.html" %}
+    {% endif %}
+
+    <!-- Repository information -->
+    {% if config.repo_url %}
+      <div class="md-header__source">
+        {% include "partials/source.html" %}
+      </div>
+    {% endif %}
+  </nav>
+
+  <!-- Navigation tabs (sticky) -->
+  {% if "navigation.tabs.sticky" in features %}
+    {% if "navigation.tabs" in features %}
+      {% include "partials/tabs.html" %}
+    {% endif %}
+  {% endif %}
+</header>
\ No newline at end of file
diff --git a/docs/theme/partials/nav.html b/docs/theme/partials/nav.html
index 4215f7b57f9..acf6c9565ea 100644
--- a/docs/theme/partials/nav.html
+++ b/docs/theme/partials/nav.html
@@ -31,11 +31,7 @@
 
     <!-- Site title -->
     <label class="md-nav__title" for="__drawer">
-        <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}"
-            class="md-nav__button md-logo" aria-label="{{ config.site_name }}" data-md-component="logo">
-            {% include "partials/logo.html" %}
-        </a>
-        {{ config.site_name }}
+        Content
     </label>
 
     <!-- Repository information -->
diff --git a/docs/theme/partials/tc-header.html b/docs/theme/partials/tc-header.html
new file mode 100644
index 00000000000..73500c640a0
--- /dev/null
+++ b/docs/theme/partials/tc-header.html
@@ -0,0 +1,157 @@
+{% set header = ({
+    "siteUrl": "https://testcontainers.com/",
+    "menuItems": [
+        {
+            "label": "Desktop",
+            "url": "https://testcontainers.com/desktop/"
+        },
+        {
+            "label": "Cloud",
+            "url": "https://testcontainers.com/cloud/"
+        },
+        {
+            "label": "Getting Started",
+            "url": "https://testcontainers.com/getting-started/"
+        },
+        {
+            "label": "Guides",
+            "url": "https://testcontainers.com/guides/"
+        },
+        {
+            "label": "Modules",
+            "url": "https://testcontainers.com/modules/"
+        },
+        {
+            "label": "Docs",
+            "children": [
+                {
+                    "label": "Testcontainers for Java",
+                    "url": "https://java.testcontainers.org/",
+                    "image": "/language-logos/java.svg",
+                },
+                {
+                    "label": "Testcontainers for Go",
+                    "url": "https://golang.testcontainers.org/",
+                    "image": "/language-logos/go.svg",
+                },
+                {
+                    "label": "Testcontainers for .NET",
+                    "url": "https://dotnet.testcontainers.org/",
+                    "image": "/language-logos/dotnet.svg",
+                },
+                {
+                    "label": "Testcontainers for Node.js",
+                    "url": "https://node.testcontainers.org/",
+                    "image": "/language-logos/nodejs.svg",
+                },
+                {
+                    "label": "Testcontainers for Python",
+                    "url": "https://testcontainers-python.readthedocs.io/en/latest/",
+                    "image": "/language-logos/python.svg",
+                    "external": true,
+                },
+                {
+                    "label": "Testcontainers for Rust",
+                    "url": "https://docs.rs/testcontainers/latest/testcontainers/",
+                    "image": "/language-logos/rust.svg",
+                    "external": true,
+                },
+                {
+                    "label": "Testcontainers for Haskell",
+                    "url": "https://github.com/testcontainers/testcontainers-hs",
+                    "image": "/language-logos/haskell.svg",
+                    "external": true,
+                },
+                {
+                    "label": "Testcontainers for Ruby",
+                    "url": "https://github.com/testcontainers/testcontainers-ruby",
+                    "image": "/language-logos/ruby.svg",
+                    "external": true,
+                },
+            ]
+        },
+        {
+            "label": "Slack",
+            "url": "https://slack.testcontainers.org/",
+            "icon": "icon-slack",
+        },
+        {
+            "label": "GitHub",
+            "url": "https://github.com/testcontainers",
+            "icon": "icon-github",
+        },
+    ]
+}) %}
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: none">
+    <symbol id="icon-external" viewBox="0 0 15 17" width="15" height="17" fill="currentColor">
+        <path  d="M9.334 1.254a.999.999 0 1 0 0 2h1.584l-5.29 5.293a1.002 1.002 0 0 0 1.415 1.416l5.29-5.294v1.585a.999.999 0 1 0 2 0v-4c0-.553-.446-1-1-1h-4Zm-6.5 1a2.5 2.5 0 0 0-2.5 2.5v8a2.5 2.5 0 0 0 2.5 2.5h8a2.5 2.5 0 0 0 2.5-2.5v-2.5a.999.999 0 1 0-2 0v2.5c0 .275-.226.5-.5.5h-8a.501.501 0 0 1-.5-.5v-8c0-.275.224-.5.5-.5h2.5a.999.999 0 1 0 0-2h-2.5Z" />
+    </symbol>
+    <symbol id="icon-caret" width="10" height="10" viewBox="0 0 10 10" fill="currentColor">
+        <path d="M.487 2.157a1.662 1.662 0 0 1 2.357 0L5 4.313l2.156-2.156a1.657 1.657 0 0 1 2.354 0 1.657 1.657 0 0 1 0 2.354L6.177 7.847a1.66 1.66 0 0 1-1.815.36 1.658 1.658 0 0 1-.54-.361L.487 4.51a1.66 1.66 0 0 1 .001-2.353Z" />
+    </symbol>
+    <symbol id="icon-slack" class="icon-slack" width="24" height="24" viewBox="0 0 24 24" aria-hidden="true" focusable="false" fill="currentColor">
+        <path d="M8.76.06a2.392 2.392 0 0 0-2.207 3.309A2.392 2.392 0 0 0 8.76 4.847h2.39V2.453A2.392 2.392 0 0 0 8.76.06Zm0 6.384H2.39A2.392 2.392 0 0 0 .18 9.753a2.392 2.392 0 0 0 2.208 1.479h6.372a2.391 2.391 0 0 0 2.208-3.31 2.39 2.39 0 0 0-2.208-1.478ZM23.893 8.837a2.392 2.392 0 0 0-3.304-2.21 2.392 2.392 0 0 0-1.474 2.21v2.395h2.39a2.391 2.391 0 0 0 2.388-2.395Zm-6.371 0V2.453a2.39 2.39 0 1 0-4.779 0v6.384a2.39 2.39 0 1 0 4.779 0ZM15.133 24a2.391 2.391 0 0 0 2.389-2.394 2.39 2.39 0 0 0-2.39-2.394h-2.389v2.394A2.39 2.39 0 0 0 15.133 24Zm0-6.384h6.371a2.39 2.39 0 0 0 2.39-2.394 2.392 2.392 0 0 0-2.39-2.394h-6.372a2.391 2.391 0 0 0-2.389 2.394 2.39 2.39 0 0 0 2.39 2.394ZM0 15.222a2.391 2.391 0 0 0 4.08 1.691 2.391 2.391 0 0 0 .699-1.691v-2.394h-2.39A2.392 2.392 0 0 0 0 15.222m6.372 0v6.384a2.391 2.391 0 0 0 3.304 2.211 2.39 2.39 0 0 0 1.474-2.211v-6.384a2.392 2.392 0 0 0-2.39-2.394 2.391 2.391 0 0 0-2.388 2.394" />
+    </symbol>
+    <symbol id="icon-github" class="icon-github" width="24" height="24" viewBox="0 0 24 24" aria-hidden="true" focusable="false" fill="currentColor">
+        <path d="M12 0C5.37 0 0 5.37 0 12c0 5.31 3.435 9.795 8.205 11.385.6.105.825-.255.825-.57 0-.285-.015-1.23-.015-2.235-3.015.555-3.795-.735-4.035-1.41-.135-.345-.72-1.41-1.23-1.695-.42-.225-1.02-.78-.015-.795.945-.015 1.62.87 1.845 1.23 1.08 1.815 2.805 1.305 3.495.99.105-.78.42-1.305.765-1.605-2.67-.3-5.46-1.335-5.46-5.925 0-1.305.465-2.385 1.23-3.225-.12-.3-.54-1.53.12-3.18 0 0 1.005-.315 3.3 1.23.96-.27 1.98-.405 3-.405s2.04.135 3 .405c2.295-1.56 3.3-1.23 3.3-1.23.66 1.65.24 2.88.12 3.18.765.84 1.23 1.905 1.23 3.225 0 4.605-2.805 5.625-5.475 5.925.435.375.81 1.095.81 2.22 0 1.605-.015 2.895-.015 3.3 0 .315.225.69.825.57C20.565 21.795 24 17.295 24 12c0-6.63-5.37-12-12-12Z" />
+    </symbol>
+</svg>
+<header id="site-header">
+    <div class="brand">
+        <a href="https://testcontainers.com/" class="logo">
+            <img src="/testcontainers-logo.svg" alt="Testcontainers" width="183" height="48"/>
+        </a>
+        <button id="mobile-menu-toggle">
+            Menu
+            <svg width="30" height="30" viewBox="0 0 30 30" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <rect y="22" width="30" height="4" rx="2"/>
+                <rect y="13" width="30" height="4" rx="2"/>
+                <rect y="4" width="30" height="4" rx="2"/>
+            </svg>        
+        </button>
+    </div>
+    <nav>
+        <ul class="menu">
+            {% for menuItem in header["menuItems"] %}
+                {% if menuItem.children %}
+                    <li class="menu-item has-children">
+                        <button>
+                            {{ menuItem.label }}
+                            <svg class="icon-caret" width="10" height="10" viewBox="0 0 10 10">
+                                <use href="#icon-caret"></use>
+                            </svg>
+                        </button>
+                        <ul class="menu-dropdown">
+                            {% for child in menuItem.children %}
+                                <li class="menu-dropdown-item">
+                                    <a href="{{ child.url }}" {% if child.external %}target="_blank"{% endif %}>
+                                        {% if child.image %}
+                                            <img src="{{ child.image }}" alt="" width="24" height="24"/>
+                                        {% endif %}
+                                        {{ child.label }}
+                                        {% if child.external %}
+                                            <svg class="icon-external" width="15" height="17" viewBox="0 0 15 17" aria-hidden="true" focusable="false">
+                                                <use href="#icon-external"></use>
+                                            </svg>
+                                        {% endif %}
+                                    </a>   
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </li>
+                {% else %}
+                    <li class="menu-item">
+                        <a href="{{ menuItem.url }}">
+                            {% if menuItem.icon %}
+                                <svg class="{{ menuItem.icon }}" width="24" height="24" viewBox="0 0 24 24">
+                                    <use href="#{{ menuItem.icon }}"></use>
+                                </svg>
+                            {% endif %}
+                            {{ menuItem.label }}
+                        </a>
+                    </li>
+                {% endif %}
+            {% endfor %}
+        </ul>
+    </nav>
+</header>
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 94bc3ddb38b..428048c8f8b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -16,6 +16,7 @@ theme:
     favicon: 'favicon.ico'
 extra_css:
     - 'css/extra.css'
+    - 'css/tc-header.css'
 repo_name: 'testcontainers-java'
 repo_url: 'https://github.com/testcontainers/testcontainers-java'
 markdown_extensions:

From fb2fbbcff5040b9eee35b2322ac63171081a84a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 9 Aug 2023 11:54:48 -0600
Subject: [PATCH 3117/4969] Add new ClickHouseContainer implementation (#7403)

New implementation supports `withUsername`, `withPassword`,
`withDatabaseName` and `withUrlParam()`.
---
 .../clickhouse/ClickHouseContainer.java       | 114 ++++++++++++++++++
 .../containers/ClickHouseContainer.java       |   5 +
 .../clickhouse/ClickHouseContainerTest.java   |  45 +++++++
 3 files changed, 164 insertions(+)
 create mode 100644 modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
 create mode 100644 modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
new file mode 100644
index 00000000000..e83df644eda
--- /dev/null
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -0,0 +1,114 @@
+package org.testcontainers.clickhouse;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for ClickHouse.
+ */
+public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
+
+    private static final String NAME = "clickhouse";
+
+    private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse("clickhouse/clickhouse-server");
+
+    private static final Integer HTTP_PORT = 8123;
+
+    private static final Integer NATIVE_PORT = 9000;
+
+    private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
+
+    private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+
+    private static final String TEST_QUERY = "SELECT 1";
+
+    private String databaseName = "default";
+
+    private String username = "default";
+
+    private String password = "";
+
+    public ClickHouseContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ClickHouseContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(CLICKHOUSE_IMAGE_NAME);
+
+        addExposedPorts(HTTP_PORT, NATIVE_PORT);
+        this.waitStrategy =
+            new HttpWaitStrategy()
+                .forStatusCode(200)
+                .forResponsePredicate("Ok."::equals)
+                .withStartupTimeout(Duration.ofMinutes(1));
+    }
+
+    @Override
+    protected void configure() {
+        withEnv("CLICKHOUSE_DB", this.databaseName);
+        withEnv("CLICKHOUSE_USER", this.username);
+        withEnv("CLICKHOUSE_PASSWORD", this.password);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return new HashSet<>(getMappedPort(HTTP_PORT));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return DRIVER_CLASS_NAME;
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return (
+            JDBC_URL_PREFIX +
+            getHost() +
+            ":" +
+            getMappedPort(HTTP_PORT) +
+            "/" +
+            this.databaseName +
+            constructUrlParameters("?", "&")
+        );
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return TEST_QUERY;
+    }
+
+    @Override
+    public ClickHouseContainer withUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public ClickHouseContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    @Override
+    public ClickHouseContainer withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+}
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 27ced8751cb..e9f10feb746 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -8,6 +8,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * Testcontainers implementation for ClickHouse.
+ *
+ * @deprecated use {@link org.testcontainers.clickhouse.ClickHouseContainer} instead
+ */
 public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
 
     public static final String NAME = "clickhouse";
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
new file mode 100644
index 00000000000..e440af648af
--- /dev/null
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
@@ -0,0 +1,45 @@
+package org.testcontainers.clickhouse;
+
+import org.junit.Test;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")) {
+            clickhouse.start();
+
+            ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void customCredentialsWithUrlParams() throws SQLException {
+        try (
+            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
+                .withUsername("test")
+                .withPassword("test")
+                .withDatabaseName("test")
+                .withUrlParam("max_result_rows", "5")
+        ) {
+            clickhouse.start();
+
+            ResultSet resultSet = performQuery(
+                clickhouse,
+                "SELECT value FROM system.settings where name='max_result_rows'"
+            );
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(5);
+        }
+    }
+}

From bf5605a2031d7f29f86a85430e3509a198c6e125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 9 Aug 2023 12:10:55 -0600
Subject: [PATCH 3118/4969] Add Wait.forListeningPort(port) (#7402)

Add utility method to check on specific ports.
---
 .../wait/strategy/HostPortWaitStrategy.java   | 32 ++++++++++++-----
 .../containers/wait/strategy/Wait.java        | 10 ++++++
 .../strategy/HostPortWaitStrategyTest.java    | 35 ++++++++++++++-----
 3 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index 54f530241f5..878eb10f132 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -26,18 +26,29 @@
 @Slf4j
 public class HostPortWaitStrategy extends AbstractWaitStrategy {
 
+    private int[] port;
+
     @Override
     @SneakyThrows(InterruptedException.class)
     protected void waitUntilReady() {
-        final Set<Integer> externalLivenessCheckPorts = getLivenessCheckPorts();
-        if (externalLivenessCheckPorts.isEmpty()) {
-            if (log.isDebugEnabled()) {
-                log.debug(
-                    "Liveness check ports of {} is empty. Not waiting.",
-                    waitStrategyTarget.getContainerInfo().getName()
-                );
+        final Set<Integer> externalLivenessCheckPorts;
+        if (this.port == null) {
+            externalLivenessCheckPorts = getLivenessCheckPorts();
+            if (externalLivenessCheckPorts.isEmpty()) {
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                        "Liveness check ports of {} is empty. Not waiting.",
+                        waitStrategyTarget.getContainerInfo().getName()
+                    );
+                }
+                return;
             }
-            return;
+        } else {
+            externalLivenessCheckPorts =
+                Arrays
+                    .stream(this.port)
+                    .mapToObj(port -> waitStrategyTarget.getMappedPort(port))
+                    .collect(Collectors.toSet());
         }
 
         List<Integer> exposedPorts = waitStrategyTarget.getExposedPorts();
@@ -112,4 +123,9 @@ private Set<Integer> getInternalPorts(Set<Integer> externalLivenessCheckPorts, L
             .filter(it -> externalLivenessCheckPorts.contains(waitStrategyTarget.getMappedPort(it)))
             .collect(Collectors.toSet());
     }
+
+    public HostPortWaitStrategy forPort(int... port) {
+        this.port = port;
+        return this;
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
index fce82c66c92..1ec858e3fbb 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
@@ -25,6 +25,16 @@ public static HostPortWaitStrategy forListeningPort() {
         return new HostPortWaitStrategy();
     }
 
+    /**
+     * Convenience method to return a WaitStrategy for an exposed or mapped port.
+     *
+     * @param port the port to check
+     * @return the WaitStrategy
+     */
+    public static HostPortWaitStrategy forListeningPort(int... port) {
+        return new HostPortWaitStrategy().forPort(port);
+    }
+
     /**
      * Convenience method to return a WaitStrategy for an HTTP endpoint.
      *
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
index d5a0ba6929d..79b40ee03b4 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -12,15 +14,32 @@
  * Test wait strategy with overloaded waitingFor methods.
  * Other implementations of WaitStrategy are tested through backwards compatible wait strategy tests
  */
+@RunWith(Enclosed.class)
 public class HostPortWaitStrategyTest {
 
-    @ClassRule
-    public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
-        .withExposedPorts()
-        .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
-        .withExposedPorts(8080)
-        .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)));
+    public static class DefaultHostPortWaitStrategyTest {
 
-    @Test
-    public void testWaiting() {}
+        @ClassRule
+        public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+            .withExposedPorts()
+            .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
+            .withExposedPorts(8080)
+            .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)));
+
+        @Test
+        public void testWaiting() {}
+    }
+
+    public static class ExplicitHostPortWaitStrategyTest {
+
+        @ClassRule
+        public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+            .withExposedPorts()
+            .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
+            .withExposedPorts(8080)
+            .waitingFor(Wait.forListeningPort(8080).withStartupTimeout(Duration.ofSeconds(10)));
+
+        @Test
+        public void testWaiting() {}
+    }
 }

From 5ecbb793b18e48caa5648093f07cf02ba2fb81f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 10 Aug 2023 17:48:34 -0600
Subject: [PATCH 3119/4969] Improve javadoc for Testcontainers implementations
 (#7408)

Add exposed ports in the documentation.
---
 .../containers/CosmosDBEmulatorContainer.java         |  4 +++-
 .../testcontainers/containers/CassandraContainer.java |  4 ++--
 .../clickhouse/ClickHouseContainer.java               |  6 ++++++
 .../testcontainers/containers/CockroachContainer.java |  9 +++++++++
 .../org/testcontainers/consul/ConsulContainer.java    |  6 ++++++
 .../testcontainers/couchbase/CouchbaseContainer.java  |  7 ++++++-
 .../org/testcontainers/cratedb/CrateDBContainer.java  |  9 +++++++++
 .../org/testcontainers/containers/Db2Container.java   |  8 ++++++++
 .../elasticsearch/ElasticsearchContainer.java         |  9 +++++++--
 .../org/testcontainers/hivemq/HiveMQContainer.java    | 10 ++++++++++
 .../testcontainers/containers/InfluxDBContainer.java  |  2 ++
 .../org/testcontainers/containers/KafkaContainer.java |  9 ++++++++-
 .../containers/localstack/LocalStackContainer.java    |  2 ++
 .../testcontainers/containers/MariaDBContainer.java   |  4 +++-
 .../testcontainers/containers/MongoDBContainer.java   |  6 +++---
 .../containers/MSSQLServerContainer.java              |  5 +++++
 .../org/testcontainers/containers/MySQLContainer.java |  5 +++++
 .../org/testcontainers/containers/Neo4jContainer.java | 11 ++++++++---
 .../testcontainers/containers/OracleContainer.java    |  5 +++++
 .../testcontainers/containers/OrientDBContainer.java  |  9 +++++++++
 .../containers/PostgreSQLContainer.java               |  5 +++++
 .../testcontainers/containers/PulsarContainer.java    |  8 +++++++-
 .../testcontainers/containers/QuestDBContainer.java   |  7 +++++++
 .../testcontainers/containers/RabbitMQContainer.java  |  8 ++++++++
 .../testcontainers/redpanda/RedpandaContainer.java    |  6 ++++++
 .../org/testcontainers/solace/SolaceContainer.java    | 11 ++++++++++-
 .../org/testcontainers/containers/SolrContainer.java  |  8 +++++++-
 .../java/org/testcontainers/tidb/TiDBContainer.java   |  6 ++++++
 .../testcontainers/containers/ToxiproxyContainer.java |  8 +++++++-
 .../org/testcontainers/containers/TrinoContainer.java |  5 +++++
 .../java/org/testcontainers/vault/VaultContainer.java |  6 ++----
 .../containers/YugabyteDBYCQLContainer.java           |  7 +++++++
 .../containers/YugabyteDBYSQLContainer.java           |  8 +++++++-
 33 files changed, 200 insertions(+), 23 deletions(-)

diff --git a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
index 57af95ef106..4b58267656c 100644
--- a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
@@ -6,7 +6,9 @@
 import java.security.KeyStore;
 
 /**
- * An Azure CosmosDB container
+ * Testcontainers implementation for CosmosDB Emulator.
+ * <p>
+ * Exposed ports: 8081
  */
 public class CosmosDBEmulatorContainer extends GenericContainer<CosmosDBEmulatorContainer> {
 
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index 51d94128509..bbe1f499b73 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -19,9 +19,9 @@
 import javax.script.ScriptException;
 
 /**
- * Cassandra container
- *
  * Testcontainers implementation for Apache Cassandra.
+ * <p>
+ * Exposed ports: 9042
  */
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
 
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index e83df644eda..8d7a00e820e 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -10,6 +10,12 @@
 
 /**
  * Testcontainers implementation for ClickHouse.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 8123</li>
+ *     <li>Console: 9000</li>
+ * </ul>
  */
 public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
 
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index bf2b981b160..dea1f543de7 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -6,6 +6,15 @@
 
 import java.time.Duration;
 
+/**
+ * Testcontainers implementation for CockroachDB.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 26257</li>
+ *     <li>Console: 8080</li>
+ * </ul>
+ */
 public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cockroachdb/cockroach");
diff --git a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
index 597f004c206..e35f6c79239 100644
--- a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
+++ b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
@@ -14,6 +14,12 @@
 
 /**
  * Testcontainers implementation for Consul.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>HTTP: 8500</li>
+ *     <li>gRPC: 8502</li>
+ * </ul>
  */
 public class ConsulContainer extends GenericContainer<ConsulContainer> {
 
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index edf613ad3f7..2e8f619b617 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -48,7 +48,12 @@
 import java.util.stream.Collectors;
 
 /**
- * The couchbase container initializes and configures a Couchbase Server single node cluster.
+ * Testcontainers implementation for Couchbase.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Console: 8091</li>
+ * </ul>
  * <p>
  * Note that it does not depend on a specific couchbase SDK, so it can be used with both the Java SDK 2 and 3 as well
  * as the Scala SDK 1 or newer. We recommend using the latest and greatest SDKs for the best experience.
diff --git a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
index 26e77d30436..ebc355c84bd 100644
--- a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
+++ b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
@@ -7,6 +7,15 @@
 
 import java.util.Set;
 
+/**
+ * Testcontainers implementation for CrateDB.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 5432</li>
+ *     <li>Console: 4200</li>
+ * </ul>
+ */
 public class CrateDBContainer extends JdbcDatabaseContainer<CrateDBContainer> {
 
     static final String NAME = "cratedb";
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 99a848f74fb..895bd9984cd 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -8,6 +8,14 @@
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 
+/**
+ * Testcontainers implementation for IBM DB2.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 50000</li>
+ * </ul>
+ */
 public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     public static final String NAME = "db2";
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index e13673384fa..3768559ee37 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -23,8 +23,13 @@
 import javax.net.ssl.TrustManagerFactory;
 
 /**
- * Represents an elasticsearch docker instance which exposes by default port 9200 and 9300 (transport.tcp.port)
- * The docker image is by default fetched from docker.elastic.co/elasticsearch/elasticsearch
+ * Testcontainers implementation for Elasticsearch.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>HTTP: 9200</li>
+ *     <li>TCP Transport: 9300</li>
+ * </ul>
  */
 @Slf4j
 public class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 8a2832f65bd..b6bb389efd7 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -29,6 +29,16 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+/**
+ * Testcontainers implementation for HiveMQ.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>MQTT: 1883</li>
+ *     <li>Control Center: 8080</li>
+ *     <li>Debug: 9000</li>
+ * </ul>
+ */
 public class HiveMQContainer extends GenericContainer<HiveMQContainer> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HiveMQContainer.class);
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index 5786fed3671..c616febb76f 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -13,6 +13,8 @@
 
 /**
  * Testcontainers implementation for InfluxDB.
+ * <p>
+ * Exposed ports: 8086
  */
 public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends GenericContainer<SELF> {
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 443cdde2d87..96ea9b5d628 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -9,7 +9,14 @@
 import java.util.Objects;
 
 /**
- * This container wraps Confluent Kafka and Zookeeper (optionally)
+ * Testcontainers implementation for Apache Kafka.
+ * Zookeeper can be optionally configured.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Kafka: 9093</li>
+ *     <li>Zookeeper: 2181</li>
+ * </ul>
  */
 public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 8e9dfa76a90..a7cb60c1f72 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -22,6 +22,8 @@
 
 /**
  * Testcontainers implementation for LocalStack.
+ * <p>
+ * Exposed ports: 4566
  */
 @Slf4j
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 36280ab4e42..731253e954e 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -7,7 +7,9 @@
 import java.util.Set;
 
 /**
- * Container implementation for the MariaDB project.
+ * Testcontainers implementation for MariaDB.
+ * <p>
+ * Exposed ports: 3306
  */
 public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 6390368dea5..7dfeebd2cd1 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -11,9 +11,9 @@
 import java.io.IOException;
 
 /**
- * Constructs a single node MongoDB replica set for testing transactions.
- * <p>To construct a multi-node MongoDB cluster, consider the <a href="https://github.com/silaev/mongodb-replica-set/">mongodb-replica-set project on GitHub</a>
- * <p>Tested on a MongoDB version 4.0.10+ (that is the default version if not specified).
+ * Testcontainers implementation for MongoDB.
+ * <p>
+ * Exposed ports: 27017
  */
 @Slf4j
 public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index b86f3366f23..6964574e523 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -7,6 +7,11 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
+/**
+ * Testcontainers implementation for Microsoft SQL Server.
+ * <p>
+ * Exposed ports: 1433
+ */
 public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mcr.microsoft.com/mssql/server");
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 17a14a435a4..6a56ec62cf4 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -6,6 +6,11 @@
 
 import java.util.Set;
 
+/**
+ * Testcontainers implementation for MySQL.
+ * <p>
+ * Exposed ports: 3306
+ */
 public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     public static final String NAME = "mysql";
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index c48590ac0f7..722eb0a8254 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -20,9 +20,14 @@
 import java.util.stream.Stream;
 
 /**
- * Testcontainer for Neo4j.
- *
- * @param <S> "SELF" to be used in the <code>withXXX</code> methods.
+ * Testcontainers implementation for Neo4j.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Bolt: 7687</li>
+ *     <li>HTTP: 7474</li>
+ *     <li>HTTPS: 7473</li>
+ * </ul>
  */
 public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContainer<S> {
 
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 883e223f678..7da0f7cf6d7 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -13,6 +13,11 @@
 import java.util.Set;
 import java.util.concurrent.Future;
 
+/**
+ * Testcontainers implementation for Oracle.
+ * <p>
+ * Exposed ports: 1521
+ */
 public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     public static final String NAME = "oracle";
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index 6064419a490..b7ba7a013d3 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -19,6 +19,15 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+/**
+ * Testcontainers implementation for OrientDB.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 2424</li>
+ *     <li>Studio: 2480</li>
+ * </ul>
+ */
 public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OrientDBContainer.class);
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index d8f974ad2d5..1bfae3ba10f 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -8,6 +8,11 @@
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 
+/**
+ * Testcontainers implementation for PostgreSQL.
+ * <p>
+ * Exposed ports: 5432
+ */
 public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     public static final String NAME = "postgresql";
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 1cfcd935c31..634b847ecc3 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -5,7 +5,13 @@
 import org.testcontainers.utility.DockerImageName;
 
 /**
- * This container wraps Apache Pulsar running in standalone mode
+ * Testcontainers implementation for Apache Pulsar.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Pulsar: 6650</li>
+ *     <li>HTTP: 8080</li>
+ * </ul>
  */
 public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
diff --git a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
index f92135bfa59..d45ac8e1fb3 100644
--- a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
+++ b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
@@ -6,6 +6,13 @@
 
 /**
  * Testcontainers implementation for QuestDB.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Postgres: 8812</li>
+ *     <li>HTTP: 9000</li>
+ *     <li>ILP: 9009</li>
+ * </ul>
  */
 public class QuestDBContainer extends JdbcDatabaseContainer<QuestDBContainer> {
 
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 5bfa6dca798..9feae14ad48 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -18,6 +18,14 @@
 
 /**
  * Testcontainers implementation for RabbitMQ.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>5671 (AMQPS)</li>
+ *     <li>5672 (AMQP)</li>
+ *     <li>15671 (HTTPS)</li>
+ *     <li>15672 (HTTP)</li>
+ * </ul>
  */
 public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index d9fccadb30d..3843c76d6d0 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -9,6 +9,12 @@
 
 /**
  * Testcontainers implementation for Redpanda.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Broker: 9092</li>
+ *     <li>Schema Registry: 8081</li>
+ * </ul>
  */
 public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
 
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
index 3418dfe6fbf..e972067d30c 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
@@ -16,7 +16,16 @@
 import java.util.List;
 
 /**
- * Testcontainers implementation of Solace PubSub+
+ * Testcontainers implementation of Solace PubSub+.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>AMQP: 5672</li>
+ *     <li>MQTT: 1883</li>
+ *     <li>HTTP: 9000</li>
+ *     <li>SMF: 55555</li>
+ *     <li>SMF SSL: 55443</li>
+ * </ul>
  */
 public class SolaceContainer extends GenericContainer<SolaceContainer> {
 
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 9fd716d37b4..0664d1f7e93 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -13,7 +13,13 @@
 import java.util.Set;
 
 /**
- * SolrContainer allows a solr container to be launched and controlled.
+ * Testcontainers implementation for Solr.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Solr: 8983</li>
+ *     <li>Zookeeper: 9983</li>
+ * </ul>
  */
 public class SolrContainer extends GenericContainer<SolrContainer> {
 
diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
index 9d886dde0d6..76d3333b292 100644
--- a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
+++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
@@ -10,6 +10,12 @@
 
 /**
  * Testcontainers implementation for TiDB.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 4000</li>
+ *     <li>HTTP: 10080</li>
+ * </ul>
  */
 public class TiDBContainer extends JdbcDatabaseContainer<TiDBContainer> {
 
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index 872f2c2fdb4..c420468caa6 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -17,7 +17,13 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * Container for resiliency testing using <a href="https://github.com/Shopify/toxiproxy">Toxiproxy</a>.
+ * Testcontainers implementation for Toxiproxy.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>HTTP: 8474</li>
+ *     <li>Proxied Ports: 8666-8697</li>
+ * </ul>
  */
 public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
index 21171fd2c15..2cd2cdaf480 100644
--- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
@@ -9,6 +9,11 @@
 import java.sql.SQLException;
 import java.util.Set;
 
+/**
+ * Testcontainers implementation for TrinoDB.
+ * <p>
+ * Exposed ports: 8080
+ */
 public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
 
     static final String NAME = "trino";
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 8541bbc9090..9442cae7701 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -16,11 +16,9 @@
 import java.util.stream.Collectors;
 
 /**
- * GenericContainer subclass for Vault specific configuration and features. The main feature is the
- * withSecretInVault method, where users can specify which secrets to be pre-loaded into Vault for
- * their specific test scenario.
+ * Testcontainers implementation for Vault.
  * <p>
- * Other helpful features include the withVaultPort, and withVaultToken methods for convenience.
+ * Exposure ports: 8200
  */
 public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericContainer<SELF> {
 
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
index f129ce54020..7ae329efd74 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
@@ -13,6 +13,13 @@
 
 /**
  * Testcontainers implementation for YugabyteDB YCQL API.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>YCQL: 5433</li>
+ *     <li>Master dashboard: 7000</li>
+ *     <li>Tserver dashboard: 9000</li>
+ * </ul>
  *
  * @see <a href="https://docs.yugabyte.com/stable/api/ycql/">YCQL API</a>
  */
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
index 53b04ff71e0..47fe988af11 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
@@ -9,10 +9,16 @@
 
 /**
  * Testcontainers implementation for YugabyteDB YSQL API.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>YSQL: 5433</li>
+ *     <li>Master dashboard: 7000</li>
+ *     <li>Tserver dashboard: 9000</li>
+ * </ul>
  *
  * @see <a href="https://docs.yugabyte.com/stable/api/ysql/">YSQL API</a>
  */
-
 public class YugabyteDBYSQLContainer extends JdbcDatabaseContainer<YugabyteDBYSQLContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yugabytedb/yugabyte");

From 6e2b091390e14e3b97407b4823605441f171fc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 11 Aug 2023 10:53:40 -0600
Subject: [PATCH 3120/4969] Add User-Agent to docker client (#7407)

User-Agent will contain `tc-java/<version>`
---
 .../java/org/testcontainers/DockerClientFactory.java |  6 ++++--
 .../dockerclient/DockerClientProviderStrategy.java   | 12 +++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 0d334f75cf6..dbdb13356ff 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -62,11 +62,13 @@ public class DockerClientFactory {
 
     public static final String SESSION_ID = UUID.randomUUID().toString();
 
+    public static final String TESTCONTAINERS_VERSION =
+        DockerClientFactory.class.getPackage().getImplementationVersion();
+
     public static final Map<String, String> DEFAULT_LABELS = markerLabels();
 
     static Map<String, String> markerLabels() {
-        String implementationVersion = DockerClientFactory.class.getPackage().getImplementationVersion();
-        String testcontainersVersion = implementationVersion == null ? "unspecified" : implementationVersion;
+        String testcontainersVersion = TESTCONTAINERS_VERSION == null ? "unspecified" : TESTCONTAINERS_VERSION;
 
         Map<String, String> labels = new HashMap<>();
         labels.put(TESTCONTAINERS_LABEL, "true");
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index be2f1705df2..557e8ba6cdf 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -39,10 +39,11 @@
 import java.security.UnrecoverableKeyException;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -408,14 +409,15 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
         if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
             configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32);
         }
+        Map<String, String> headers = new HashMap<>();
+        headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);
+        headers.put("User-Agent", String.format("tc-java/%s", DockerClientFactory.TESTCONTAINERS_VERSION));
+
         return DockerClientImpl.getInstance(
             new AuthDelegatingDockerClientConfig(
                 configBuilder.withDockerHost(transportConfig.getDockerHost().toString()).build()
             ),
-            new HeadersAddingDockerHttpClient(
-                dockerHttpClient,
-                Collections.singletonMap("x-tc-sid", DockerClientFactory.SESSION_ID)
-            )
+            new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
         );
     }
 

From 147a49a8dd35cc2e04d663cc748fa1453270422c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 11 Aug 2023 12:20:11 -0600
Subject: [PATCH 3121/4969] Fix colima documentation (#7412)

---
 docs/supported_docker_environment/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 250221e775f..dbf892eba0d 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -28,7 +28,7 @@ In order to run testcontainers against [colima](https://github.com/abiosoft/coli
 
 ```bash
 export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
-export DOCKER_HOST="unix://${HOME}/.colima/docker.sock"
+export DOCKER_HOST="unix://${HOME}/.colima/default/docker.sock"
 ```
 
 ## Docker environment discovery

From 104af18cc54834fa8d1260ff830c4640a6a6b411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 11 Aug 2023 12:27:42 -0600
Subject: [PATCH 3122/4969] Enable Solace PubSub+ Manager (#7411)

`PubSub+ Manager` is available in port 8080. Also, default credentials
have been set.
---
 .../main/java/org/testcontainers/solace/SolaceContainer.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
index e972067d30c..9a0fc72d0bd 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
@@ -20,6 +20,7 @@
  * <p>
  * Exposed ports:
  * <ul>
+ *     <li>Console: 8080</li>
  *     <li>AMQP: 5672</li>
  *     <li>MQTT: 1883</li>
  *     <li>HTTP: 9000</li>
@@ -69,6 +70,9 @@ public SolaceContainer(DockerImageName dockerImageName) {
             cmd.getHostConfig().withShmSize(SHM_SIZE).withUlimits(new Ulimit[] { new Ulimit("nofile", 2448L, 6592L) });
         });
         this.waitStrategy = Wait.forLogMessage(SOLACE_READY_MESSAGE, 1).withStartupTimeout(Duration.ofSeconds(60));
+        withExposedPorts(8080);
+        withEnv("username_admin_globalaccesslevel", "admin");
+        withEnv("username_admin_password", "admin");
     }
 
     @Override

From ea0b163a1415621a6243c0b419e84e847b63b616 Mon Sep 17 00:00:00 2001
From: Sebastian Bathke <sebastian.bathke@camunda.com>
Date: Tue, 15 Aug 2023 22:44:58 +0200
Subject: [PATCH 3123/4969] Allow to execute commands with a custom user
 (#7311)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 core/build.gradle                             |  2 +
 .../containers/ContainerState.java            | 30 ++++++++-
 .../containers/ExecInContainerPattern.java    | 67 ++++++++++++++++---
 .../junit/GenericContainerRuleTest.java       | 15 +++++
 4 files changed, 103 insertions(+), 11 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index c5346dd2391..883de155e9b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -53,6 +53,8 @@ tasks.japicmp {
     methodExcludes = [
         "org.testcontainers.containers.Container#getDockerClient()",
         "org.testcontainers.containers.ContainerState#getDockerClient()",
+        "org.testcontainers.containers.ContainerState#execInContainerWithUser(java.lang.String,java.lang.String[])",
+        "org.testcontainers.containers.ContainerState#execInContainerWithUser(java.nio.charset.Charset,java.lang.String,java.lang.String[])",
     ]
 
     fieldExcludes = []
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index f355bf445fb..13cf9437f06 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -245,7 +245,7 @@ default String getContainerId() {
      * Run a command inside a running container, as though using "docker exec", and interpreting
      * the output as UTF8.
      * <p>
-     * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, String...)
+     * @see #execInContainer(Charset, String...)
      */
     default Container.ExecResult execInContainer(String... command)
         throws UnsupportedOperationException, IOException, InterruptedException {
@@ -255,13 +255,39 @@ default Container.ExecResult execInContainer(String... command)
     /**
      * Run a command inside a running container, as though using "docker exec".
      * <p>
-     * @see ExecInContainerPattern#execInContainer(com.github.dockerjava.api.command.InspectContainerResponse, Charset, String...)
+     * @see ExecInContainerPattern#execInContainer(DockerClient, InspectContainerResponse, Charset, String...)
      */
     default Container.ExecResult execInContainer(Charset outputCharset, String... command)
         throws UnsupportedOperationException, IOException, InterruptedException {
         return ExecInContainerPattern.execInContainer(getDockerClient(), getContainerInfo(), outputCharset, command);
     }
 
+    /**
+     * Run a command inside a running container as a given user, as using "docker exec -u user".
+     * <p>
+     * @see ExecInContainerPattern#execInContainerWithUser(DockerClient, InspectContainerResponse, String, String...)
+     */
+    default Container.ExecResult execInContainerWithUser(String user, String... command)
+        throws UnsupportedOperationException, IOException, InterruptedException {
+        return ExecInContainerPattern.execInContainerWithUser(getDockerClient(), getContainerInfo(), user, command);
+    }
+
+    /**
+     * Run a command inside a running container as a given user, as using "docker exec -u user".
+     * <p>
+     * @see ExecInContainerPattern#execInContainerWithUser(DockerClient, InspectContainerResponse, Charset, String, String...)
+     */
+    default Container.ExecResult execInContainerWithUser(Charset outputCharset, String user, String... command)
+        throws UnsupportedOperationException, IOException, InterruptedException {
+        return ExecInContainerPattern.execInContainerWithUser(
+            getDockerClient(),
+            getContainerInfo(),
+            outputCharset,
+            user,
+            command
+        );
+    }
+
     /**
      *
      * Copies a file or directory to the container.
diff --git a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
index fe641618cc4..47ade1dabb9 100644
--- a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
+++ b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
@@ -45,7 +46,7 @@ public Container.ExecResult execInContainer(
         String... command
     ) throws UnsupportedOperationException, IOException, InterruptedException {
         DockerClient dockerClient = DockerClientFactory.instance().client();
-        return execInContainer(dockerClient, containerInfo, outputCharset, command);
+        return execInContainerWithUser(dockerClient, containerInfo, outputCharset, null, command);
     }
 
     /**
@@ -55,34 +56,77 @@ public Container.ExecResult execInContainer(
      * @param dockerClient the {@link DockerClient}
      * @param containerInfo the container info
      * @param command the command to execute
-     * @see #execInContainer(DockerClient, InspectContainerResponse, Charset, String...)
+     * @see #execInContainerWithUser(DockerClient, InspectContainerResponse, String, String...)
      */
     public Container.ExecResult execInContainer(
         DockerClient dockerClient,
         InspectContainerResponse containerInfo,
         String... command
     ) throws UnsupportedOperationException, IOException, InterruptedException {
-        return execInContainer(dockerClient, containerInfo, StandardCharsets.UTF_8, command);
+        return execInContainerWithUser(dockerClient, containerInfo, StandardCharsets.UTF_8, null, command);
     }
 
     /**
-     * Run a command inside a running container, as though using "docker exec".
+     * Run a command inside a running container, as though using "docker exec", and interpreting
+     * the output as UTF8.
+     * <p></p>
+     * @param dockerClient the {@link DockerClient}
+     * @param containerInfo the container info
+     * @param outputCharset the character set used to interpret the output.
+     * @param command the command to execute
+     * @see #execInContainerWithUser(DockerClient, InspectContainerResponse, Charset, String, String...)
+     */
+    public Container.ExecResult execInContainer(
+        DockerClient dockerClient,
+        InspectContainerResponse containerInfo,
+        Charset outputCharset,
+        String... command
+    ) throws UnsupportedOperationException, IOException, InterruptedException {
+        return execInContainerWithUser(dockerClient, containerInfo, outputCharset, null, command);
+    }
+
+    /**
+     * Run a command inside a running container as a given user, as using "docker exec -u user" and
+     * interpreting the output as UTF8.
      * <p>
      * This functionality is not available on a docker daemon running the older "lxc" execution driver. At
      * the time of writing, CircleCI was using this driver.
      * @param dockerClient the {@link DockerClient}
      * @param containerInfo the container info
+     * @param user the user to run the command with, optional
+     * @param command the command to execute
+     * @see #execInContainerWithUser(DockerClient, InspectContainerResponse, Charset, String,
+     *     String...)
+     */
+    public Container.ExecResult execInContainerWithUser(
+        DockerClient dockerClient,
+        InspectContainerResponse containerInfo,
+        String user,
+        String... command
+    ) throws UnsupportedOperationException, IOException, InterruptedException {
+        return execInContainerWithUser(dockerClient, containerInfo, StandardCharsets.UTF_8, user, command);
+    }
+
+    /**
+     * Run a command inside a running container as a given user, as using "docker exec -u user".
+     * <p>
+     * This functionality is not available on a docker daemon running the older "lxc" execution
+     * driver. At the time of writing, CircleCI was using this driver.
+     * @param dockerClient the {@link DockerClient}
+     * @param containerInfo the container info
      * @param outputCharset the character set used to interpret the output.
+     * @param user the user to run the command with, optional
      * @param command the parts of the command to run
      * @return the result of execution
      * @throws IOException if there's an issue communicating with Docker
      * @throws InterruptedException if the thread waiting for the response is interrupted
      * @throws UnsupportedOperationException if the docker daemon you're connecting to doesn't support "exec".
      */
-    public Container.ExecResult execInContainer(
+    public Container.ExecResult execInContainerWithUser(
         DockerClient dockerClient,
         InspectContainerResponse containerInfo,
         Charset outputCharset,
+        String user,
         String... command
     ) throws UnsupportedOperationException, IOException, InterruptedException {
         if (!TestEnvironment.dockerExecutionDriverSupportsExec()) {
@@ -100,12 +144,17 @@ public Container.ExecResult execInContainer(
         String containerName = containerInfo.getName();
 
         log.debug("{}: Running \"exec\" command: {}", containerName, String.join(" ", command));
-        final ExecCreateCmdResponse execCreateCmdResponse = dockerClient
+        final ExecCreateCmd execCreateCmd = dockerClient
             .execCreateCmd(containerId)
             .withAttachStdout(true)
             .withAttachStderr(true)
-            .withCmd(command)
-            .exec();
+            .withCmd(command);
+        if (user != null && !user.isEmpty()) {
+            log.debug("{}: Running \"exec\" command with user: {}", containerName, user);
+            execCreateCmd.withUser(user);
+        }
+
+        final ExecCreateCmdResponse execCreateCmdResponse = execCreateCmd.exec();
 
         final ToStringConsumer stdoutConsumer = new ToStringConsumer();
         final ToStringConsumer stderrConsumer = new ToStringConsumer();
@@ -116,7 +165,7 @@ public Container.ExecResult execInContainer(
 
             dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(callback).awaitCompletion();
         }
-        Integer exitCode = dockerClient.inspectExecCmd(execCreateCmdResponse.getId()).exec().getExitCode();
+        int exitCode = dockerClient.inspectExecCmd(execCreateCmdResponse.getId()).exec().getExitCodeLong().intValue();
 
         final Container.ExecResult result = new Container.ExecResult(
             exitCode,
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index a3628a9302f..a9a3e966543 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -369,6 +369,21 @@ public void testExecInContainer() throws Exception {
         // We expect to reach this point for modern Docker versions.
     }
 
+    @Test
+    public void testExecInContainerWithUser() throws Exception {
+        // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
+        // that's the case for CircleCI.
+        // Once they resolve the issue, this clause can be removed.
+        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+
+        final GenericContainer.ExecResult result = redis.execInContainerWithUser("redis", "whoami");
+        assertThat(result.getStdout())
+            .as("Output for \"whoami\" command should start with \"redis\"")
+            .startsWith("redis");
+        assertThat(result.getStderr()).as("Stderr for \"whoami\" command should be empty").isEmpty();
+        // We expect to reach this point for modern Docker versions.
+    }
+
     @Test
     public void extraHostTest() throws IOException {
         BufferedReader br = getReaderForContainerPort80(alpineExtrahost);

From d48bab700505d95da3792ecd2aab1e8df39c6a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Aug 2023 09:10:19 -0600
Subject: [PATCH 3124/4969] Allow KafkaContainer to register additional
 listeners (#7333)

Allow to register additional listeners. E.g. when using along with
Toxiproxy, Schema Registry, Kafka Connect, KCat.

Listeners's host will register as a network aliases.

---------

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/modules/kafka.md                         | 23 +++--
 .../containers/KafkaContainer.java            | 91 +++++++++++++++++--
 .../containers/KafkaContainerTest.java        | 39 ++++++--
 3 files changed, 129 insertions(+), 24 deletions(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 13f8cf3b0a8..41e6f2c03e9 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -42,18 +42,27 @@ KRaft mode was declared production ready in 3.3.1 (confluentinc/cp-kafka:7.3.x)"
 
 See the [versions interoperability matrix](https://docs.confluent.io/platform/current/installation/versions-interoperability.html) for more details. 
 
-## Multi-container usage
+## Register listeners
 
-If your test needs to run some other Docker container which needs access to Kafka, do the following:
+There are scenarios where additional listeners are needed because the consumer/producer can be in another
+container in the same network or a different process where the port to connect differs from the default 
+exposed port `9093`. E.g [Toxiproxy](../../docs/modules/toxiproxy.md).
 
-* Run your other container on the same network as Kafka container, e.g.:
 <!--codeinclude-->
-[Network](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withKafkaNetwork
+[Register additional listener](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:registerListener
 <!--/codeinclude-->
-* Use `kafka.getNetworkAliases().get(0)+":9092"` as bootstrap server location. 
-Or just give your Kafka container a network alias of your liking.
 
-You will need to explicitly create a network and set it on the Kafka container as well as on your other containers that need to communicate with Kafka.
+Container defined in the same network:
+
+<!--codeinclude-->
+[Create kcat container](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:createKCatContainer
+<!--/codeinclude-->
+
+Client using the new registered listener:
+
+<!--codeinclude-->
+[Produce/Consume via new listener](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:produceConsumeMessage
+<!--/codeinclude-->
 
 ## Adding this module to your project dependencies
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 96ea9b5d628..00d8e2998cc 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -6,7 +6,12 @@
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Objects;
+import java.util.Set;
+import java.util.function.Supplier;
 
 /**
  * Testcontainers implementation for Apache Kafka.
@@ -43,6 +48,10 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private String clusterId = DEFAULT_CLUSTER_ID;
 
+    private static final String PROTOCOL_PREFIX = "TC";
+
+    private final Set<Supplier<String>> listeners = new HashSet<>();
+
     /**
      * @deprecated use {@link #KafkaContainer(DockerImageName)} instead
      */
@@ -63,10 +72,6 @@ public KafkaContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        // Use two listeners with different names, it will force Kafka to communicate with itself via internal
-        // listener when KAFKA_INTER_BROKER_LISTENER_NAME is set, otherwise Kafka will try to use the advertised listener
-        withEnv("KAFKA_LISTENERS", "PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092");
-        withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT");
         withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
 
         withEnv("KAFKA_BROKER_ID", "1");
@@ -140,6 +145,37 @@ public String getBootstrapServers() {
 
     @Override
     protected void configure() {
+        // Use two listeners with different names, it will force Kafka to communicate with itself via internal
+        // listener when KAFKA_INTER_BROKER_LISTENER_NAME is set, otherwise Kafka will try to use the advertised listener
+        Set<String> listeners = new HashSet<>();
+        listeners.add("PLAINTEXT://0.0.0.0:" + KAFKA_PORT);
+        listeners.add("BROKER://0.0.0.0:9092");
+
+        Set<String> listenerSecurityProtocolMap = new HashSet<>();
+        listenerSecurityProtocolMap.add("BROKER:PLAINTEXT");
+        listenerSecurityProtocolMap.add("PLAINTEXT:PLAINTEXT");
+
+        List<Supplier<String>> listenersToTransform = new ArrayList<>(this.listeners);
+        for (int i = 0; i < listenersToTransform.size(); i++) {
+            Supplier<String> listenerSupplier = listenersToTransform.get(i);
+            String protocol = String.format("%s-%d", PROTOCOL_PREFIX, i);
+            String listener = listenerSupplier.get();
+            String listenerPort = listener.split(":")[1];
+            String listenerProtocol = String.format("%s://0.0.0.0:%s", protocol, listenerPort);
+            String protocolMap = String.format("%s:PLAINTEXT", protocol);
+            listeners.add(listenerProtocol);
+            listenerSecurityProtocolMap.add(protocolMap);
+
+            String host = listener.split(":")[0];
+            withNetworkAliases(host);
+        }
+
+        String kafkaListeners = String.join(",", listeners);
+        String kafkaListenerSecurityProtocolMap = String.join(",", listenerSecurityProtocolMap);
+
+        withEnv("KAFKA_LISTENERS", kafkaListeners);
+        withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", kafkaListenerSecurityProtocolMap);
+
         if (this.kraftEnabled) {
             waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
             configureKraft();
@@ -187,14 +223,24 @@ protected void configureZookeeper() {
     protected void containerIsStarting(InspectContainerResponse containerInfo) {
         super.containerIsStarting(containerInfo);
 
+        List<String> advertisedListeners = new ArrayList<>();
+        advertisedListeners.add(getBootstrapServers());
+        advertisedListeners.add(brokerAdvertisedListener(containerInfo));
+
+        List<Supplier<String>> listenersToTransform = new ArrayList<>(this.listeners);
+        for (int i = 0; i < listenersToTransform.size(); i++) {
+            Supplier<String> listenerSupplier = listenersToTransform.get(i);
+            String protocol = String.format("%s-%d", PROTOCOL_PREFIX, i);
+            String listener = listenerSupplier.get();
+            String listenerProtocol = String.format("%s://%s", protocol, listener);
+            advertisedListeners.add(listenerProtocol);
+        }
+
+        String kafkaAdvertisedListeners = String.join(",", advertisedListeners);
+
         String command = "#!/bin/bash\n";
         // exporting KAFKA_ADVERTISED_LISTENERS with the container hostname
-        command +=
-            String.format(
-                "export KAFKA_ADVERTISED_LISTENERS=%s,%s\n",
-                getBootstrapServers(),
-                brokerAdvertisedListener(containerInfo)
-            );
+        command += String.format("export KAFKA_ADVERTISED_LISTENERS=%s\n", kafkaAdvertisedListeners);
 
         if (this.kraftEnabled && isLessThanCP740()) {
             // Optimization: skip the checks
@@ -230,6 +276,31 @@ protected String commandZookeeper() {
         return command;
     }
 
+    /**
+     * Add a {@link Supplier} that will provide a listener with format {@code host:port}.
+     * Host will be added as a network alias.
+     * <p>
+     * The listener will be added to the list of default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     * </ul>
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     *      <li>{@code container.getConfig().getHostName():9092}</li>
+     * </ul>
+     * @param listenerSupplier a supplier that will provide a listener
+     * @return this {@link KafkaContainer} instance
+     */
+    public KafkaContainer withListener(Supplier<String> listenerSupplier) {
+        this.listeners.add(listenerSupplier);
+        return this;
+    }
+
     protected String brokerAdvertisedListener(InspectContainerResponse containerInfo) {
         return String.format("BROKER://%s:%s", containerInfo.getConfig().getHostName(), "9092");
     }
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 860c990cb32..fb7c9dacc6e 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -16,6 +16,7 @@
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.Testcontainers;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -83,16 +84,9 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
                 .withNetwork(network)
                 .withNetworkAliases("zookeeper")
                 .withEnv("ZOOKEEPER_CLIENT_PORT", "2181");
-            // withKafkaNetwork {
-            GenericContainer<?> application = new GenericContainer<>(DockerImageName.parse("alpine"))
-                .withNetwork(network)
-                // }
-                .withNetworkAliases("dummy")
-                .withCommand("sleep 10000")
         ) {
             zookeeper.start();
             kafka.start();
-            application.start();
 
             testKafkaFunctionality(kafka.getBootstrapServers());
         }
@@ -195,6 +189,37 @@ public void testKraftPrecedenceOverEmbeddedZookeeper() throws Exception {
         }
     }
 
+    @Test
+    public void testUsageWithListener() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            // registerListener {
+            KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE)
+                .withListener(() -> "kafka:19092")
+                .withNetwork(network);
+            // }
+            // createKCatContainer {
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+                .withCreateContainerCmdModifier(cmd -> {
+                    cmd.withEntrypoint("sh");
+                })
+                .withCopyToContainer(Transferable.of("Message produced by kcat"), "/data/msgs.txt")
+                .withNetwork(network)
+                .withCommand("-c", "tail -f /dev/null")
+            // }
+        ) {
+            kafka.start();
+            kcat.start();
+            // produceConsumeMessage {
+            kcat.execInContainer("kcat", "-b", "kafka:19092", "-t", "msgs", "-P", "-l", "/data/msgs.txt");
+            String stdout = kcat
+                .execInContainer("kcat", "-b", "kafka:19092", "-C", "-t", "msgs", "-c", "1")
+                .getStdout();
+            // }
+            assertThat(stdout).contains("Message produced by kcat");
+        }
+    }
+
     protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
         testKafkaFunctionality(bootstrapServers, 1, 1);
     }

From f5471c831d2163bcd2b525df3b67c6e1b2c76c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Aug 2023 09:12:56 -0600
Subject: [PATCH 3125/4969] Improve RedpandaContainer (#7320)

* Configure Redpanda via `.bootstrap.yml` and `redpanda.yml`
* Allow to enable authorization and authentication methods
* Allow to add additional listeners. E.g. using it with toxiproxy or redpanda console
* Enable rest proxy
* Configure rpk

Fixes #6395

---------

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/modules/redpanda.md                      |  38 +++
 modules/redpanda/build.gradle                 |   1 +
 .../redpanda/RedpandaContainer.java           | 222 +++++++++++++++++-
 .../testcontainers/bootstrap.yaml.ftl         |  18 ++
 .../resources/testcontainers/entrypoint-tc.sh |   8 +
 .../testcontainers/redpanda.yaml.ftl          |  73 ++++++
 .../redpanda/RedpandaContainerTest.java       | 214 +++++++++++++++++
 7 files changed, 562 insertions(+), 12 deletions(-)
 create mode 100644 modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl
 create mode 100644 modules/redpanda/src/main/resources/testcontainers/entrypoint-tc.sh
 create mode 100644 modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl

diff --git a/docs/modules/redpanda.md b/docs/modules/redpanda.md
index 51178788449..22545ffb026 100644
--- a/docs/modules/redpanda.md
+++ b/docs/modules/redpanda.md
@@ -25,6 +25,44 @@ Redpanda also provides a schema registry implementation. Like the Redpanda broke
 [Schema Registry](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:getSchemaRegistryAddress
 <!--/codeinclude-->
 
+It is also possible to enable security capabilities of Redpanda by using:
+
+<!--codeinclude-->
+[Enable security](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:security
+<!--/codeinclude-->
+
+Superusers can be created by using:
+
+<!--codeinclude-->
+[Register Superuser](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:createSuperUser
+<!--/codeinclude-->
+
+Below is an example of how to create the `AdminClient`:
+
+<!--codeinclude-->
+[Create Admin Client](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:createAdminClient
+<!--/codeinclude-->
+
+There are scenarios where additional listeners are needed because the consumer/producer can be another
+container in the same network or a different process where the port to connect differs from the default
+exposed port `9092`. E.g [Toxiproxy](../../docs/modules/toxiproxy.md).
+
+<!--codeinclude-->
+[Register additional listener](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:registerListener
+<!--/codeinclude-->
+
+Container defined in the same network:
+
+<!--codeinclude-->
+[Create kcat container](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:createKCatContainer
+<!--/codeinclude-->
+
+Client using the new registered listener:
+
+<!--codeinclude-->
+[Produce/Consume via new listener](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:produceConsumeMessage
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 3fbf9b7a8ab..0aa32791a9f 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Redpanda"
 
 dependencies {
     api project(':testcontainers')
+    shaded 'org.freemarker:freemarker:2.3.32'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index 3843c76d6d0..b4f5b94798b 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -1,11 +1,31 @@
 package org.testcontainers.redpanda;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import lombok.AllArgsConstructor;
+import lombok.Cleanup;
+import lombok.Data;
+import lombok.SneakyThrows;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * Testcontainers implementation for Redpanda.
@@ -14,6 +34,7 @@
  * <ul>
  *     <li>Broker: 9092</li>
  *     <li>Schema Registry: 8081</li>
+ *     <li>Proxy: 8082</li>
  * </ul>
  */
 public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
@@ -30,9 +51,21 @@ public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
 
     private static final int REDPANDA_PORT = 9092;
 
+    private static final int REDPANDA_ADMIN_PORT = 9644;
+
     private static final int SCHEMA_REGISTRY_PORT = 8081;
 
-    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+    private static final int REST_PROXY_PORT = 8082;
+
+    private boolean enableAuthorization;
+
+    private String authenticationMethod = "none";
+
+    private String schemaRegistryAuthenticationMethod = "none";
+
+    private final List<String> superusers = new ArrayList<>();
+
+    private final Set<Supplier<Listener>> listenersValueSupplier = new HashSet<>();
 
     public RedpandaContainer(String image) {
         this(DockerImageName.parse(image));
@@ -47,33 +80,198 @@ public RedpandaContainer(DockerImageName imageName) {
             throw new IllegalArgumentException("Redpanda version must be >= v22.2.1");
         }
 
-        withExposedPorts(REDPANDA_PORT, SCHEMA_REGISTRY_PORT);
+        withExposedPorts(REDPANDA_PORT, REDPANDA_ADMIN_PORT, SCHEMA_REGISTRY_PORT, REST_PROXY_PORT);
         withCreateContainerCmdModifier(cmd -> {
-            cmd.withEntrypoint("sh");
+            cmd.withEntrypoint();
+            cmd.withUser("root:root");
         });
-        waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1));
-        withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+        waitingFor(Wait.forLogMessage(".*Successfully started Redpanda!.*", 1));
+        withCopyFileToContainer(
+            MountableFile.forClasspathResource("testcontainers/entrypoint-tc.sh", 0700),
+            "/entrypoint-tc.sh"
+        );
+        withCommand("/entrypoint-tc.sh", "redpanda", "start", "--mode=dev-container", "--smp=1", "--memory=1G");
+    }
+
+    @Override
+    protected void configure() {
+        this.listenersValueSupplier.stream()
+            .map(Supplier::get)
+            .map(Listener::getAddress)
+            .forEach(this::withNetworkAliases);
     }
 
+    @SneakyThrows
     @Override
     protected void containerIsStarting(InspectContainerResponse containerInfo) {
         super.containerIsStarting(containerInfo);
 
-        String command = "#!/bin/bash\n";
-
-        command += "/usr/bin/rpk redpanda start --mode dev-container --smp 1 --memory 1G ";
-        command += "--kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 ";
-        command +=
-            "--advertise-kafka-addr PLAINTEXT://127.0.0.1:29092,OUTSIDE://" + getHost() + ":" + getMappedPort(9092);
+        Configuration cfg = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+        cfg.setClassLoaderForTemplateLoading(getClass().getClassLoader(), "testcontainers");
+        cfg.setDefaultEncoding("UTF-8");
 
-        copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
+        copyFileToContainer(getBootstrapFile(cfg), "/etc/redpanda/.bootstrap.yaml");
+        copyFileToContainer(getRedpandaFile(cfg), "/etc/redpanda/redpanda.yaml");
     }
 
+    /**
+     * Returns the bootstrap servers address.
+     * @return the bootstrap servers address
+     */
     public String getBootstrapServers() {
         return String.format("PLAINTEXT://%s:%s", getHost(), getMappedPort(REDPANDA_PORT));
     }
 
+    /**
+     * Returns the schema registry address.
+     * @return the schema registry address
+     */
     public String getSchemaRegistryAddress() {
         return String.format("http://%s:%s", getHost(), getMappedPort(SCHEMA_REGISTRY_PORT));
     }
+
+    /**
+     * Returns the admin address.
+     * @return the admin address
+     */
+    public String getAdminAddress() {
+        return String.format("http://%s:%s", getHost(), getMappedPort(REDPANDA_ADMIN_PORT));
+    }
+
+    /**
+     * Returns the rest proxy address.
+     * @return the rest proxy address
+     */
+    public String getRestProxyAddress() {
+        return String.format("http://%s:%s", getHost(), getMappedPort(REST_PROXY_PORT));
+    }
+
+    /**
+     * Enables authorization.
+     * @return this {@link RedpandaContainer} instance
+     */
+    public RedpandaContainer enableAuthorization() {
+        this.enableAuthorization = true;
+        return this;
+    }
+
+    /**
+     * Enables SASL.
+     * @return this {@link RedpandaContainer} instance
+     */
+    public RedpandaContainer enableSasl() {
+        this.authenticationMethod = "sasl";
+        return this;
+    }
+
+    /**
+     * Enables Http Basic Auth for Schema Registry.
+     * @return this {@link RedpandaContainer} instance
+     */
+    public RedpandaContainer enableSchemaRegistryHttpBasicAuth() {
+        this.schemaRegistryAuthenticationMethod = "http_basic";
+        return this;
+    }
+
+    /**
+     * Register username as a superuser.
+     * @param username username to register as a superuser
+     * @return this {@link RedpandaContainer} instance
+     */
+    public RedpandaContainer withSuperuser(String username) {
+        this.superusers.add(username);
+        return this;
+    }
+
+    /**
+     * Add a {@link Supplier} that will provide a listener with format {@code host:port}.
+     * Host will be added as a network alias.
+     * <p>
+     * The listener will be added to the default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     * </ul>
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getHost():container.getMappedPort(9092)}</li>
+     *      <li>127.0.0.1:9093</li>
+     * </ul>
+     * @param listenerSupplier a supplier that will provide a listener
+     * @return this {@link RedpandaContainer} instance
+     */
+    public RedpandaContainer withListener(Supplier<String> listenerSupplier) {
+        String[] parts = listenerSupplier.get().split(":");
+        this.listenersValueSupplier.add(() -> new Listener(parts[0], Integer.parseInt(parts[1])));
+        return this;
+    }
+
+    private Transferable getBootstrapFile(Configuration cfg) {
+        Map<String, Object> kafkaApi = new HashMap<>();
+        kafkaApi.put("enableAuthorization", this.enableAuthorization);
+        kafkaApi.put("superusers", this.superusers);
+
+        Map<String, Object> root = new HashMap<>();
+        root.put("kafkaApi", kafkaApi);
+
+        String file = resolveTemplate(cfg, "bootstrap.yaml.ftl", root);
+
+        return Transferable.of(file, 0700);
+    }
+
+    private Transferable getRedpandaFile(Configuration cfg) {
+        List<Map<String, Object>> listeners =
+            this.listenersValueSupplier.stream()
+                .map(Supplier::get)
+                .map(listener -> {
+                    Map<String, Object> listenerMap = new HashMap<>();
+                    listenerMap.put("address", listener.getAddress());
+                    listenerMap.put("port", listener.getPort());
+                    return listenerMap;
+                })
+                .collect(Collectors.toList());
+
+        Map<String, Object> kafkaApi = new HashMap<>();
+        kafkaApi.put("authenticationMethod", this.authenticationMethod);
+        kafkaApi.put("enableAuthorization", this.enableAuthorization);
+        kafkaApi.put("advertisedHost", getHost());
+        kafkaApi.put("advertisedPort", getMappedPort(9092));
+        kafkaApi.put("listeners", listeners);
+
+        Map<String, Object> schemaRegistry = new HashMap<>();
+        schemaRegistry.put("authenticationMethod", this.schemaRegistryAuthenticationMethod);
+
+        Map<String, Object> root = new HashMap<>();
+        root.put("kafkaApi", kafkaApi);
+        root.put("schemaRegistry", schemaRegistry);
+
+        String file = resolveTemplate(cfg, "redpanda.yaml.ftl", root);
+
+        return Transferable.of(file, 0700);
+    }
+
+    @SneakyThrows
+    private String resolveTemplate(Configuration cfg, String template, Map<String, Object> data) {
+        Template temp = cfg.getTemplate(template);
+
+        @Cleanup
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        @Cleanup
+        Writer out = new OutputStreamWriter(byteArrayOutputStream, StandardCharsets.UTF_8);
+        temp.process(data, out);
+
+        return new String(byteArrayOutputStream.toByteArray(), StandardCharsets.UTF_8);
+    }
+
+    @Data
+    @AllArgsConstructor
+    private static class Listener {
+
+        private String address;
+
+        private int port;
+    }
 }
diff --git a/modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl b/modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl
new file mode 100644
index 00000000000..f066cf428aa
--- /dev/null
+++ b/modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl
@@ -0,0 +1,18 @@
+# Injected by testcontainers
+# This file contains cluster properties which will only be considered when
+# starting the cluster for the first time. Afterwards, you can configure cluster
+# properties via the Redpanda Admi n API.
+superusers:
+<#if kafkaApi.superusers?has_content >
+    <#list kafkaApi.superusers as superuser>
+  - ${superuser}
+    </#list>
+<#else>
+  []
+</#if>
+
+<#if kafkaApi.enableAuthorization >
+kafka_enable_authorization: true
+</#if>
+
+auto_create_topics_enabled: true
diff --git a/modules/redpanda/src/main/resources/testcontainers/entrypoint-tc.sh b/modules/redpanda/src/main/resources/testcontainers/entrypoint-tc.sh
new file mode 100644
index 00000000000..36932d7a27c
--- /dev/null
+++ b/modules/redpanda/src/main/resources/testcontainers/entrypoint-tc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Wait for testcontainer's injected redpanda config with the port only known after docker start
+until grep -q "# Injected by testcontainers" "/etc/redpanda/redpanda.yaml"
+do
+  sleep 0.1
+done
+exec /entrypoint.sh $@
\ No newline at end of file
diff --git a/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl b/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
new file mode 100644
index 00000000000..6e0c124eb5c
--- /dev/null
+++ b/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
@@ -0,0 +1,73 @@
+# Injected by testcontainers
+<#setting boolean_format="c">
+<#setting number_format="c">
+redpanda:
+  admin:
+    address: 0.0.0.0
+    port: 9644
+
+  kafka_api:
+    - address: 0.0.0.0
+      name: external
+      port: 9092
+      authentication_method: ${ kafkaApi.authenticationMethod }
+
+    # This listener is required for the schema registry client. The schema
+    # registry client connects via an advertised listener like a normal Kafka
+    # client would do. It can't use the other listener because the mapped
+    # port is not accessible from within the Redpanda container.
+    - address: 0.0.0.0
+      name: internal
+      port: 9093
+      authentication_method: <#if kafkaApi.enableAuthorization >sasl<#else>none</#if>
+
+<#list kafkaApi.listeners as listener>
+    - address: 0.0.0.0
+      name: ${listener.address}
+      port: ${listener.port}
+</#list>
+
+  advertised_kafka_api:
+    - address: ${ kafkaApi.advertisedHost }
+      name: external
+      port: ${ kafkaApi.advertisedPort }
+    - address: 127.0.0.1
+      name: internal
+      port: 9093
+<#list kafkaApi.listeners as listener>
+    - address: ${listener.address}
+      name: ${listener.address}
+      port: ${listener.port}
+</#list>
+
+schema_registry:
+  schema_registry_api:
+  - address: "0.0.0.0"
+    name: main
+    port: 8081
+    authentication_method: ${ schemaRegistry.authenticationMethod }
+
+schema_registry_client:
+  brokers:
+    - address: localhost
+      port: 9093
+
+pandaproxy:
+  pandaproxy_api:
+    - address: 0.0.0.0
+      port: 8082
+      name: proxy-internal
+  advertised_pandaproxy_api:
+    - address: 127.0.0.1
+      port: 8082
+      name: proxy-internal
+
+pandaproxy_client:
+  brokers:
+    - address: localhost
+      port: 9093
+
+rpk:
+  kafka_api:
+    brokers:
+    - localhost:9093
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index 9a0a0edd030..d0f13d0952a 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -2,7 +2,9 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.restassured.RestAssured;
+import io.restassured.common.mapper.TypeRef;
 import io.restassured.response.Response;
+import lombok.SneakyThrows;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
@@ -13,15 +15,24 @@
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.config.SaslConfigs;
+import org.apache.kafka.common.errors.SaslAuthenticationException;
+import org.apache.kafka.common.errors.TopicAuthorizationException;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
+import org.awaitility.Awaitility;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -96,6 +107,179 @@ public void testSchemaRegistry() {
         }
     }
 
+    @Test
+    public void testUsageWithListener() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            // registerListener {
+            RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .withListener(() -> "redpanda:19092")
+                .withNetwork(network);
+            // }
+            // createKCatContainer {
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+                .withCreateContainerCmdModifier(cmd -> {
+                    cmd.withEntrypoint("sh");
+                })
+                .withCopyToContainer(Transferable.of("Message produced by kcat"), "/data/msgs.txt")
+                .withNetwork(network)
+                .withCommand("-c", "tail -f /dev/null")
+            // }
+        ) {
+            redpanda.start();
+            kcat.start();
+            // produceConsumeMessage {
+            kcat.execInContainer("kcat", "-b", "redpanda:19092", "-t", "msgs", "-P", "-l", "/data/msgs.txt");
+            String stdout = kcat
+                .execInContainer("kcat", "-b", "redpanda:19092", "-C", "-t", "msgs", "-c", "1")
+                .getStdout();
+            // }
+            assertThat(stdout).contains("Message produced by kcat");
+        }
+    }
+
+    @SneakyThrows
+    @Test
+    public void enableSaslWithSuccessfulTopicCreation() {
+        try (
+            // security {
+            RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .enableAuthorization()
+                .enableSasl()
+                .withSuperuser("superuser-1")
+            // }
+        ) {
+            redpanda.start();
+
+            createSuperUser(redpanda);
+
+            AdminClient adminClient = getAdminClient(redpanda);
+            String topicName = "messages-" + UUID.randomUUID();
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, 1, (short) 1));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
+            assertThat(adminClient.listTopics().names().get()).contains(topicName);
+        }
+    }
+
+    @Test
+    public void enableSaslWithUnsuccessfulTopicCreation() {
+        try (
+            RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .enableAuthorization()
+                .enableSasl()
+        ) {
+            redpanda.start();
+
+            createSuperUser(redpanda);
+
+            AdminClient adminClient = getAdminClient(redpanda);
+            String topicName = "messages-" + UUID.randomUUID();
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, 1, (short) 1));
+
+            Awaitility
+                .await()
+                .untilAsserted(() -> {
+                    assertThatThrownBy(() -> adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS))
+                        .hasCauseInstanceOf(TopicAuthorizationException.class);
+                });
+        }
+    }
+
+    @Test
+    public void enableSaslAndWithAuthenticationError() {
+        try (
+            RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .enableAuthorization()
+                .enableSasl()
+        ) {
+            redpanda.start();
+
+            AdminClient adminClient = getAdminClient(redpanda);
+            String topicName = "messages-" + UUID.randomUUID();
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, 1, (short) 1));
+
+            Awaitility
+                .await()
+                .untilAsserted(() -> {
+                    assertThatThrownBy(() -> adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS))
+                        .hasCauseInstanceOf(SaslAuthenticationException.class);
+                });
+        }
+    }
+
+    @Test
+    public void schemaRegistryWithHttpBasic() {
+        try (
+            RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .enableSchemaRegistryHttpBasicAuth()
+                .withSuperuser("superuser-1")
+        ) {
+            redpanda.start();
+
+            createSuperUser(redpanda);
+
+            String subjectsEndpoint = String.format("%s/subjects", redpanda.getSchemaRegistryAddress());
+
+            RestAssured.when().get(subjectsEndpoint).then().statusCode(401);
+
+            RestAssured
+                .given()
+                .auth()
+                .preemptive()
+                .basic("superuser-1", "test")
+                .get(subjectsEndpoint)
+                .then()
+                .statusCode(200);
+        }
+    }
+
+    @SneakyThrows
+    @Test
+    public void testRestProxy() {
+        try (RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")) {
+            redpanda.start();
+
+            redpanda.execInContainer("rpk", "topic", "create", "test_topic", "-p", "3");
+
+            String applicationKafkaJson = "application/vnd.kafka.json.v2+json";
+
+            String restProxy = redpanda.getRestProxyAddress();
+            RestAssured
+                .given()
+                .contentType(applicationKafkaJson)
+                .body(
+                    "{\"records\":[{\"value\":\"jsmith\",\"partition\":0},{\"value\":\"htanaka\",\"partition\":1},{\"value\":\"awalther\",\"partition\":2}]}"
+                )
+                .post(String.format("%s/topics/test_topic", restProxy))
+                .then()
+                .statusCode(200);
+
+            RestAssured
+                .given()
+                .contentType("application/vnd.kafka.v2+json")
+                .body("{\"name\": \"test_consumer\", \"format\": \"json\", \"auto.offset.reset\": \"earliest\"}")
+                .post(String.format("%s/consumers/test_group", restProxy))
+                .then()
+                .statusCode(200);
+            RestAssured
+                .given()
+                .contentType("application/vnd.kafka.v2+json")
+                .body("{\"topics\":[\"test_topic\"]}")
+                .post(String.format("%s/consumers/test_group/instances/test_consumer/subscription", restProxy))
+                .then()
+                .statusCode(204);
+
+            List<Map<String, String>> response = RestAssured
+                .given()
+                .accept(applicationKafkaJson)
+                .get(String.format("%s/consumers/test_group/instances/test_consumer/records", restProxy))
+                .getBody()
+                .as(new TypeRef<List<Map<String, String>>>() {});
+            assertThat(response).hasSize(3).extracting("value").containsExactly("jsmith", "htanaka", "awalther");
+        }
+    }
+
     private void testKafkaFunctionality(String bootstrapServers) throws Exception {
         testKafkaFunctionality(bootstrapServers, 1, 1);
     }
@@ -159,4 +343,34 @@ private void testKafkaFunctionality(String bootstrapServers, int partitions, int
             consumer.unsubscribe();
         }
     }
+
+    private AdminClient getAdminClient(RedpandaContainer redpanda) {
+        String bootstrapServer = String.format("%s:%s", redpanda.getHost(), redpanda.getMappedPort(9092));
+        // createAdminClient {
+        AdminClient adminClient = AdminClient.create(
+            ImmutableMap.of(
+                AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
+                bootstrapServer,
+                AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
+                "SASL_PLAINTEXT",
+                SaslConfigs.SASL_MECHANISM,
+                "SCRAM-SHA-256",
+                SaslConfigs.SASL_JAAS_CONFIG,
+                "org.apache.kafka.common.security.scram.ScramLoginModule required username=\"superuser-1\" password=\"test\";"
+            )
+        );
+        // }
+        return adminClient;
+    }
+
+    private void createSuperUser(RedpandaContainer redpanda) {
+        String adminUrl = String.format("%s/v1/security/users", redpanda.getAdminAddress());
+        RestAssured
+            .given()
+            .contentType("application/json")
+            .body("{\"username\": \"superuser-1\", \"password\": \"test\", \"algorithm\": \"SCRAM-SHA-256\"}")
+            .post(adminUrl)
+            .then()
+            .statusCode(200);
+    }
 }

From 5e88c3d9d76c231be04c7cf6dc192d5053882ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Aug 2023 09:39:21 -0600
Subject: [PATCH 3126/4969] Add tests using TCC (#7415)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .github/workflows/ci.yml                      |  15 ++
 smoke-test/build.gradle                       |  21 ++
 smoke-test/gradle/wrapper/gradle-wrapper.jar  | Bin 0 -> 62076 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +
 smoke-test/gradlew                            | 245 ++++++++++++++++++
 smoke-test/gradlew.bat                        |  92 +++++++
 smoke-test/settings.gradle                    |  50 ++++
 smoke-test/turbo-mode/build.gradle            |  16 ++
 .../example/AbstractRedisContainer.java       |  18 ++
 .../example/RedisContainer1Test.java          |  11 +
 .../example/RedisContainer2Test.java          |  11 +
 .../example/RedisContainer3Test.java          |  11 +
 .../example/RedisContainer4Test.java          |  11 +
 .../src/test/resources/logback-test.xml       |  16 ++
 14 files changed, 523 insertions(+)
 create mode 100644 smoke-test/build.gradle
 create mode 100644 smoke-test/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 smoke-test/gradle/wrapper/gradle-wrapper.properties
 create mode 100755 smoke-test/gradlew
 create mode 100644 smoke-test/gradlew.bat
 create mode 100644 smoke-test/settings.gradle
 create mode 100644 smoke-test/turbo-mode/build.gradle
 create mode 100644 smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java
 create mode 100644 smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer1Test.java
 create mode 100644 smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer2Test.java
 create mode 100644 smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer3Test.java
 create mode 100644 smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer4Test.java
 create mode 100644 smoke-test/turbo-mode/src/test/resources/logback-test.xml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aed86892eb5..7331cb2290d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,6 +50,21 @@ jobs:
         run: |
           ./gradlew :testcontainers:check --no-daemon --continue --scan
 
+  turbo-mode:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-build
+      - name: Setup Testcontainers Cloud Client
+        uses: atomicjar/testcontainers-cloud-setup-action@main
+        with:
+          token: ${{ secrets.TC_CLOUD_TOKEN }}
+          args: --max-concurrency=4
+      - name: Test using Testcontainers Cloud with Turbo Mode enabled
+        working-directory: ./smoke-test/
+        run: |
+          ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+
   find_gradle_jobs:
     needs: [core]
     runs-on: ubuntu-22.04
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
new file mode 100644
index 00000000000..830cfaf0b66
--- /dev/null
+++ b/smoke-test/build.gradle
@@ -0,0 +1,21 @@
+// empty build.gradle for dependabot
+plugins {
+    id 'com.diffplug.spotless' version '6.13.0' apply false
+}
+
+apply from: "$rootDir/../gradle/ci-support.gradle"
+
+subprojects {
+    apply plugin: "java"
+    apply from: "$rootDir/../gradle/spotless.gradle"
+    apply plugin: 'checkstyle'
+
+    repositories {
+        mavenCentral()
+    }
+
+    checkstyle {
+        toolVersion = "9.3"
+        configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
+    }
+}
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c1962a79e29d3e0ab67b14947c167a862655af9b
GIT binary patch
literal 62076
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

literal 0
HcmV?d00001

diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..37aef8d3f0c
--- /dev/null
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/smoke-test/gradlew b/smoke-test/gradlew
new file mode 100755
index 00000000000..aeb74cbb43e
--- /dev/null
+++ b/smoke-test/gradlew
@@ -0,0 +1,245 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/smoke-test/gradlew.bat b/smoke-test/gradlew.bat
new file mode 100644
index 00000000000..6689b85beec
--- /dev/null
+++ b/smoke-test/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle
new file mode 100644
index 00000000000..68ba54d2f13
--- /dev/null
+++ b/smoke-test/settings.gradle
@@ -0,0 +1,50 @@
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
+    }
+}
+
+apply plugin: 'com.gradle.enterprise'
+apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
+
+rootProject.name = 'testcontainers-smoke-tests'
+
+includeBuild '..'
+
+// explicit include to allow Dependabot to autodiscover subprojects
+include 'turbo-mode'
+
+ext.isCI = System.getenv("CI") != null
+
+buildCache {
+    local {
+        enabled = !isCI
+    }
+    remote(HttpBuildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
+        enabled = true
+        url = 'https://ge.testcontainers.org/cache/'
+        credentials {
+            username = 'ci'
+            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+        }
+    }
+}
+
+gradleEnterprise {
+    buildScan {
+        server = "https://ge.testcontainers.org/"
+        publishAlways()
+        publishIfAuthenticated()
+        uploadInBackground = !isCI
+        captureTaskInputFiles = true
+    }
+
+}
diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
new file mode 100644
index 00000000000..a84c1d5fb48
--- /dev/null
+++ b/smoke-test/turbo-mode/build.gradle
@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+dependencies {
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
+}
+
+test {
+    useJUnitPlatform()
+    forkEvery = 1
+    maxParallelForks = 4
+}
diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java
new file mode 100644
index 00000000000..8750d1c87f1
--- /dev/null
+++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java
@@ -0,0 +1,18 @@
+package org.testcontainers.example;
+
+import org.testcontainers.containers.GenericContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class AbstractRedisContainer {
+
+    private static final String REDIS_IMAGE = "redis:7.0.12-alpine";
+
+    void runRedisContainer() {
+        try (GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE).withExposedPorts(6379)
+            .withCreateContainerCmdModifier(cmd -> cmd.withName("tc-redis"))) {
+            redis.start();
+            assertThat(redis.isRunning()).isTrue();
+        }
+    }
+}
diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer1Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer1Test.java
new file mode 100644
index 00000000000..4271e6b6caa
--- /dev/null
+++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer1Test.java
@@ -0,0 +1,11 @@
+package org.testcontainers.example;
+
+import org.junit.jupiter.api.Test;
+
+class RedisContainer1Test extends AbstractRedisContainer {
+
+    @Test
+    void testSimple() {
+        runRedisContainer();
+    }
+}
diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer2Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer2Test.java
new file mode 100644
index 00000000000..930196af5c0
--- /dev/null
+++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer2Test.java
@@ -0,0 +1,11 @@
+package org.testcontainers.example;
+
+import org.junit.jupiter.api.Test;
+
+class RedisContainer2Test extends AbstractRedisContainer {
+
+    @Test
+    void testSimple() {
+        runRedisContainer();
+    }
+}
diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer3Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer3Test.java
new file mode 100644
index 00000000000..5afc93fd455
--- /dev/null
+++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer3Test.java
@@ -0,0 +1,11 @@
+package org.testcontainers.example;
+
+import org.junit.jupiter.api.Test;
+
+class RedisContainer3Test extends AbstractRedisContainer {
+
+    @Test
+    void testSimple() {
+        runRedisContainer();
+    }
+}
diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer4Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer4Test.java
new file mode 100644
index 00000000000..b5a021bf049
--- /dev/null
+++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer4Test.java
@@ -0,0 +1,11 @@
+package org.testcontainers.example;
+
+import org.junit.jupiter.api.Test;
+
+class RedisContainer4Test extends AbstractRedisContainer {
+
+    @Test
+    void testSimple() {
+        runRedisContainer();
+    }
+}
diff --git a/smoke-test/turbo-mode/src/test/resources/logback-test.xml b/smoke-test/turbo-mode/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/smoke-test/turbo-mode/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 7fe978e266574f589f96c21cf44a12c2c5a37d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 17 Aug 2023 17:52:49 -0600
Subject: [PATCH 3127/4969] Cleanup CODEOWNERS

---
 .github/CODEOWNERS | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index effc21c4f1e..6f0c579e964 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1 @@
-# Each line is a file pattern followed by one or more owners.
-
-# These owners will be the default reviewers for everything in
-# the repo.
-
-*                       @testcontainers/java-team
-
-# The last matching pattern takes the most
-# precedence.
-
-# Contributed modules can have different reviewers
-
-modules/mssqlserver/    @StefanHufschmidt @rnorth @bsideup @kiview
-modules/vault/          @mikeoswald @rnorth @bsideup @kiview
+* @testcontainers/java-team

From f1b0b07b29594b65bd555e136ac4776b040a8294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Aug 2023 10:07:11 -0600
Subject: [PATCH 3128/4969] Add javadoc for supported images (#7422)

---
 .../testcontainers/containers/CosmosDBEmulatorContainer.java | 2 ++
 .../org/testcontainers/containers/CassandraContainer.java    | 2 ++
 .../org/testcontainers/clickhouse/ClickHouseContainer.java   | 2 ++
 .../org/testcontainers/containers/CockroachContainer.java    | 2 ++
 .../main/java/org/testcontainers/consul/ConsulContainer.java | 2 ++
 .../org/testcontainers/couchbase/CouchbaseContainer.java     | 2 ++
 .../java/org/testcontainers/cratedb/CrateDBContainer.java    | 2 ++
 .../java/org/testcontainers/containers/Db2Container.java     | 2 ++
 .../testcontainers/elasticsearch/ElasticsearchContainer.java | 2 ++
 .../testcontainers/containers/BigQueryEmulatorContainer.java | 3 +++
 .../testcontainers/containers/BigtableEmulatorContainer.java | 4 +++-
 .../containers/DatastoreEmulatorContainer.java               | 4 +++-
 .../containers/FirestoreEmulatorContainer.java               | 4 +++-
 .../testcontainers/containers/PubSubEmulatorContainer.java   | 4 +++-
 .../testcontainers/containers/SpannerEmulatorContainer.java  | 2 ++
 .../main/java/org/testcontainers/hivemq/HiveMQContainer.java | 2 ++
 .../org/testcontainers/containers/InfluxDBContainer.java     | 2 ++
 .../src/main/java/org/testcontainers/k3s/K3sContainer.java   | 5 +++++
 .../java/org/testcontainers/containers/KafkaContainer.java   | 2 ++
 .../containers/localstack/LocalStackContainer.java           | 2 ++
 .../java/org/testcontainers/containers/MariaDBContainer.java | 2 ++
 .../java/org/testcontainers/containers/MongoDBContainer.java | 2 ++
 .../org/testcontainers/containers/MSSQLServerContainer.java  | 2 ++
 .../java/org/testcontainers/containers/MySQLContainer.java   | 2 ++
 .../java/org/testcontainers/containers/Neo4jContainer.java   | 2 ++
 .../java/org/testcontainers/containers/OracleContainer.java  | 2 ++
 .../org/testcontainers/containers/OrientDBContainer.java     | 2 ++
 .../org/testcontainers/containers/PostgreSQLContainer.java   | 2 ++
 .../java/org/testcontainers/containers/PulsarContainer.java  | 2 ++
 .../java/org/testcontainers/containers/QuestDBContainer.java | 2 ++
 .../org/testcontainers/containers/RabbitMQContainer.java     | 2 ++
 .../java/org/testcontainers/redpanda/RedpandaContainer.java  | 2 ++
 .../testcontainers/containers/BrowserWebDriverContainer.java | 5 ++++-
 .../main/java/org/testcontainers/solace/SolaceContainer.java | 2 ++
 .../java/org/testcontainers/containers/SolrContainer.java    | 2 ++
 .../src/main/java/org/testcontainers/tidb/TiDBContainer.java | 2 ++
 .../org/testcontainers/containers/ToxiproxyContainer.java    | 2 ++
 .../java/org/testcontainers/containers/TrinoContainer.java   | 2 ++
 .../main/java/org/testcontainers/vault/VaultContainer.java   | 2 ++
 .../testcontainers/containers/YugabyteDBYCQLContainer.java   | 2 ++
 .../testcontainers/containers/YugabyteDBYSQLContainer.java   | 2 ++
 41 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
index 4b58267656c..f5238a45d33 100644
--- a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
@@ -8,6 +8,8 @@
 /**
  * Testcontainers implementation for CosmosDB Emulator.
  * <p>
+ * Supported image: {@code mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator}
+ * <p>
  * Exposed ports: 8081
  */
 public class CosmosDBEmulatorContainer extends GenericContainer<CosmosDBEmulatorContainer> {
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index bbe1f499b73..bb291cd1f80 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -21,6 +21,8 @@
 /**
  * Testcontainers implementation for Apache Cassandra.
  * <p>
+ * Supported image: {@code cassandra}
+ * <p>
  * Exposed ports: 9042
  */
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index 8d7a00e820e..ffa1307204a 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -11,6 +11,8 @@
 /**
  * Testcontainers implementation for ClickHouse.
  * <p>
+ * Supported image: {@code clickhouse/clickhouse-server}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Database: 8123</li>
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index dea1f543de7..3a4ed8586c9 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -9,6 +9,8 @@
 /**
  * Testcontainers implementation for CockroachDB.
  * <p>
+ * Supported image: {@code cockroachdb/cockroach}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Database: 26257</li>
diff --git a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
index e35f6c79239..43bbada877f 100644
--- a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
+++ b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
@@ -15,6 +15,8 @@
 /**
  * Testcontainers implementation for Consul.
  * <p>
+ * Supported images: {@code hashicorp/consul}, {@code consul}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>HTTP: 8500</li>
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 2e8f619b617..5e9a4b45f4d 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -50,6 +50,8 @@
 /**
  * Testcontainers implementation for Couchbase.
  * <p>
+ * Supported image: {@code couchbase/server}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Console: 8091</li>
diff --git a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
index ebc355c84bd..039128174c1 100644
--- a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
+++ b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
@@ -10,6 +10,8 @@
 /**
  * Testcontainers implementation for CrateDB.
  * <p>
+ * Supported image: {@code crate}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Database: 5432</li>
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 895bd9984cd..0cde8f0dee3 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -11,6 +11,8 @@
 /**
  * Testcontainers implementation for IBM DB2.
  * <p>
+ * Supported images: {@code icr.io/db2_community/db2}, {@code ibmcom/db2}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Database: 50000</li>
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 3768559ee37..315b920f490 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -25,6 +25,8 @@
 /**
  * Testcontainers implementation for Elasticsearch.
  * <p>
+ * Supported image: {@code docker.elastic.co/elasticsearch/elasticsearch}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>HTTP: 9200</li>
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
index 50153006b5e..6c305a50537 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
@@ -4,6 +4,9 @@
 
 /**
  * Testcontainers implementation for BigQuery.
+ * <p>
+ * Supported image: {@code ghcr.io/goccy/bigquery-emulator}
+ * <p>
  */
 public class BigQueryEmulatorContainer extends GenericContainer<BigQueryEmulatorContainer> {
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index 9c5c5caa9f9..0325b58e745 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -5,7 +5,9 @@
 
 /**
  * A Bigtable container that relies in google cloud sdk.
- *
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
  * Default port is 9000.
  */
 public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulatorContainer> {
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index 4e1ff5f3fba..eb86fa3932f 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -5,7 +5,9 @@
 
 /**
  * A Datastore container that relies in google cloud sdk.
- *
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
  * Default port is 8081.
  */
 public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulatorContainer> {
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index db7546a7e7b..1d3ec4a01d1 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -5,7 +5,9 @@
 
 /**
  * A Firestore container that relies in google cloud sdk.
- *
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
  * Default port is 8080.
  */
 public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulatorContainer> {
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index 1cf00dcab92..cd75c3a07c5 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -5,7 +5,9 @@
 
 /**
  * A PubSub container that relies in google cloud sdk.
- *
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
  * Default port is 8085.
  */
 public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorContainer> {
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index f0ce5cf31de..ff36bddd1b2 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -5,6 +5,8 @@
 
 /**
  * A Spanner container. Default ports: 9010 for GRPC and 9020 for HTTP.
+ * <p>
+ * Supported image: {@code gcr.io/cloud-spanner-emulator/emulator}
  */
 public class SpannerEmulatorContainer extends GenericContainer<SpannerEmulatorContainer> {
 
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index b6bb389efd7..4638f758745 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -32,6 +32,8 @@
 /**
  * Testcontainers implementation for HiveMQ.
  * <p>
+ * Supported images: {@code hivemq/hivemq4}, {@code hivemq/hivemq-ce}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>MQTT: 1883</li>
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index c616febb76f..8e908e8e229 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -14,6 +14,8 @@
 /**
  * Testcontainers implementation for InfluxDB.
  * <p>
+ * Supported image: {@code influxdb}
+ * <p>
  * Exposed ports: 8086
  */
 public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends GenericContainer<SELF> {
diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index c9dad93a06e..0ee3db4b6e7 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -17,6 +17,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * Testcontainers implementation for K3S
+ * <p>
+ * Supported image: {@code rancher/k3s}
+ */
 public class K3sContainer extends GenericContainer<K3sContainer> {
 
     public static int KUBE_SECURE_PORT = 6443;
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 00d8e2998cc..60c04590901 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -17,6 +17,8 @@
  * Testcontainers implementation for Apache Kafka.
  * Zookeeper can be optionally configured.
  * <p>
+ * Supported image: {@code confluentinc/cp-kafka}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Kafka: 9093</li>
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index a7cb60c1f72..4cae1c19b1d 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -23,6 +23,8 @@
 /**
  * Testcontainers implementation for LocalStack.
  * <p>
+ * Supported images: {@code localstack/localstack}, {@code localstack/localstack-pro}
+ * <p>
  * Exposed ports: 4566
  */
 @Slf4j
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 731253e954e..1273ac4ec28 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -9,6 +9,8 @@
 /**
  * Testcontainers implementation for MariaDB.
  * <p>
+ * Supported image: {@code mariadb}
+ * <p>
  * Exposed ports: 3306
  */
 public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 7dfeebd2cd1..8511e35ec91 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -13,6 +13,8 @@
 /**
  * Testcontainers implementation for MongoDB.
  * <p>
+ * Supported image: {@code mongo}
+ * <p>
  * Exposed ports: 27017
  */
 @Slf4j
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 6964574e523..51ee7989f33 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -10,6 +10,8 @@
 /**
  * Testcontainers implementation for Microsoft SQL Server.
  * <p>
+ * Supported image: {@code mcr.microsoft.com/mssql/server}
+ * <p>
  * Exposed ports: 1433
  */
 public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 6a56ec62cf4..76ff754b616 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -9,6 +9,8 @@
 /**
  * Testcontainers implementation for MySQL.
  * <p>
+ * Supported image: {@code mysql}
+ * <p>
  * Exposed ports: 3306
  */
 public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 722eb0a8254..30fd6b8397c 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -22,6 +22,8 @@
 /**
  * Testcontainers implementation for Neo4j.
  * <p>
+ * Supported image: {@code neo4j}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Bolt: 7687</li>
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 7da0f7cf6d7..24dbdb37701 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -16,6 +16,8 @@
 /**
  * Testcontainers implementation for Oracle.
  * <p>
+ * Supported image: {@code gvenzl/oracle-xe}
+ * <p>
  * Exposed ports: 1521
  */
 public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index b7ba7a013d3..12a6e58e4a5 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -22,6 +22,8 @@
 /**
  * Testcontainers implementation for OrientDB.
  * <p>
+ * Supported image: {@code orientdb}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Database: 2424</li>
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 1bfae3ba10f..bc276f4cc1b 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -11,6 +11,8 @@
 /**
  * Testcontainers implementation for PostgreSQL.
  * <p>
+ * Supported image: {@code postgres}
+ * <p>
  * Exposed ports: 5432
  */
 public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 634b847ecc3..0181d7144d9 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -7,6 +7,8 @@
 /**
  * Testcontainers implementation for Apache Pulsar.
  * <p>
+ * Supported image: {@code apachepulsar/pulsar}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Pulsar: 6650</li>
diff --git a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
index d45ac8e1fb3..86a8854e498 100644
--- a/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
+++ b/modules/questdb/src/main/java/org/testcontainers/containers/QuestDBContainer.java
@@ -7,6 +7,8 @@
 /**
  * Testcontainers implementation for QuestDB.
  * <p>
+ * Supported image: {@code questdb/questdb}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Postgres: 8812</li>
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 9feae14ad48..6c1fa919316 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -19,6 +19,8 @@
 /**
  * Testcontainers implementation for RabbitMQ.
  * <p>
+ * Supported image: {@code rabbitmq}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>5671 (AMQPS)</li>
diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index b4f5b94798b..bc18d01fbda 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -30,6 +30,8 @@
 /**
  * Testcontainers implementation for Redpanda.
  * <p>
+ * Supported images: {@code docker.redpanda.com/redpandadata/redpanda}, {@code docker.redpanda.com/vectorized/redpanda}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Broker: 9092</li>
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index fc07186d576..a5525cb5bdf 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -42,7 +42,10 @@
 /**
  * A chrome/firefox/custom container based on SeleniumHQ's standalone container sets.
  * <p>
- * The container should expose Selenium remote control protocol and VNC.
+ * Supported images: {@code selenium/standalone-chrome}, {@code selenium/standalone-firefox},
+ * {@code selenium/standalone-edge}, {@code selenium/standalone-chrome-debug}, {@code selenium/standalone-firefox-debug}
+ * <p>
+ * Exposed ports: 4444
  */
 public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>>
     extends GenericContainer<SELF>
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
index 9a0fc72d0bd..64b4365081f 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
@@ -18,6 +18,8 @@
 /**
  * Testcontainers implementation of Solace PubSub+.
  * <p>
+ * Supported image: {@code solace/solace-pubsub-standard}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Console: 8080</li>
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 0664d1f7e93..691950f61dc 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -15,6 +15,8 @@
 /**
  * Testcontainers implementation for Solr.
  * <p>
+ * Supported image: {@code solr}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Solr: 8983</li>
diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
index 76d3333b292..893b2e538db 100644
--- a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
+++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java
@@ -11,6 +11,8 @@
 /**
  * Testcontainers implementation for TiDB.
  * <p>
+ * Supported image: {@code pingcap/tidb}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Database: 4000</li>
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index c420468caa6..a2a85a95d88 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -19,6 +19,8 @@
 /**
  * Testcontainers implementation for Toxiproxy.
  * <p>
+ * Supported images: {@code ghcr.io/shopify/toxiproxy}, {@code shopify/toxiproxy}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>HTTP: 8474</li>
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
index 2cd2cdaf480..19da8d9252a 100644
--- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
@@ -12,6 +12,8 @@
 /**
  * Testcontainers implementation for TrinoDB.
  * <p>
+ * Supported image: {@code trinodb/trino}
+ * <p>
  * Exposed ports: 8080
  */
 public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 9442cae7701..644ed87469b 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -18,6 +18,8 @@
 /**
  * Testcontainers implementation for Vault.
  * <p>
+ * Supported image: {@code hashicorp/vault}, {@code vault}
+ * <p>
  * Exposure ports: 8200
  */
 public class VaultContainer<SELF extends VaultContainer<SELF>> extends GenericContainer<SELF> {
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
index 7ae329efd74..d193d19eef1 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
@@ -14,6 +14,8 @@
 /**
  * Testcontainers implementation for YugabyteDB YCQL API.
  * <p>
+ * Supported image: {@code yugabytedb/yugabyte}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>YCQL: 5433</li>
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
index 47fe988af11..c988d842bd1 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
@@ -10,6 +10,8 @@
 /**
  * Testcontainers implementation for YugabyteDB YSQL API.
  * <p>
+ * Supported image: {@code yugabytedb/yugabyte}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>YSQL: 5433</li>

From f4856a039fba674ca0600aa9c914c2e80d75e609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Aug 2023 12:50:05 -0600
Subject: [PATCH 3129/4969] Rename forListeningPort(int... port) to
 forListeningPorts(int... ports) (#7425)

---
 .../containers/wait/strategy/HostPortWaitStrategy.java | 10 +++++-----
 .../testcontainers/containers/wait/strategy/Wait.java  |  8 ++++----
 .../junit/wait/strategy/HostPortWaitStrategyTest.java  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
index 878eb10f132..5f7eb92818c 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/HostPortWaitStrategy.java
@@ -26,13 +26,13 @@
 @Slf4j
 public class HostPortWaitStrategy extends AbstractWaitStrategy {
 
-    private int[] port;
+    private int[] ports;
 
     @Override
     @SneakyThrows(InterruptedException.class)
     protected void waitUntilReady() {
         final Set<Integer> externalLivenessCheckPorts;
-        if (this.port == null) {
+        if (this.ports == null || this.ports.length == 0) {
             externalLivenessCheckPorts = getLivenessCheckPorts();
             if (externalLivenessCheckPorts.isEmpty()) {
                 if (log.isDebugEnabled()) {
@@ -46,7 +46,7 @@ protected void waitUntilReady() {
         } else {
             externalLivenessCheckPorts =
                 Arrays
-                    .stream(this.port)
+                    .stream(this.ports)
                     .mapToObj(port -> waitStrategyTarget.getMappedPort(port))
                     .collect(Collectors.toSet());
         }
@@ -124,8 +124,8 @@ private Set<Integer> getInternalPorts(Set<Integer> externalLivenessCheckPorts, L
             .collect(Collectors.toSet());
     }
 
-    public HostPortWaitStrategy forPort(int... port) {
-        this.port = port;
+    public HostPortWaitStrategy forPorts(int... ports) {
+        this.ports = ports;
         return this;
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
index 1ec858e3fbb..5a70c7f2fbc 100644
--- a/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
+++ b/core/src/main/java/org/testcontainers/containers/wait/strategy/Wait.java
@@ -26,13 +26,13 @@ public static HostPortWaitStrategy forListeningPort() {
     }
 
     /**
-     * Convenience method to return a WaitStrategy for an exposed or mapped port.
+     * Convenience method to return a WaitStrategy for exposed or mapped ports.
      *
-     * @param port the port to check
+     * @param ports the port to check
      * @return the WaitStrategy
      */
-    public static HostPortWaitStrategy forListeningPort(int... port) {
-        return new HostPortWaitStrategy().forPort(port);
+    public static HostPortWaitStrategy forListeningPorts(int... ports) {
+        return new HostPortWaitStrategy().forPorts(ports);
     }
 
     /**
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
index 79b40ee03b4..bed23566899 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
@@ -37,7 +37,7 @@ public static class ExplicitHostPortWaitStrategyTest {
             .withExposedPorts()
             .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
             .withExposedPorts(8080)
-            .waitingFor(Wait.forListeningPort(8080).withStartupTimeout(Duration.ofSeconds(10)));
+            .waitingFor(Wait.forListeningPorts(8080).withStartupTimeout(Duration.ofSeconds(10)));
 
         @Test
         public void testWaiting() {}

From 7b69ca0fdc71c12a9ec6f23eff7ab6fedc19388d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Aug 2023 12:50:18 -0600
Subject: [PATCH 3130/4969] Update docker-java version to 3.3.3 (#7423)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 883de155e9b..7a6829c873d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.2')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.2')
+    api platform('com.github.docker-java:docker-java-bom:3.3.3')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.3')
 
     api "com.github.docker-java:docker-java-api"
 

From 06b915585ade7e17242cc04b7e4eb5730ddb1754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 21 Aug 2023 01:16:09 -0600
Subject: [PATCH 3131/4969] Add "new badge" in header (#7426)

---
 docs/css/tc-header.css             | 22 ++++++++++++++++++----
 docs/theme/partials/tc-header.html |  8 ++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/docs/css/tc-header.css b/docs/css/tc-header.css
index 122102bb4d9..de78d636e9c 100644
--- a/docs/css/tc-header.css
+++ b/docs/css/tc-header.css
@@ -43,7 +43,7 @@ body.tc-header-active #site-header {
 }
 
 #site-header .logo {
-    display: flex; 
+    display: flex;
 }
 
 #site-header .logo img,
@@ -102,6 +102,20 @@ body.mobile-menu #site-header #mobile-menu-toggle {
     white-space: nowrap;
 }
 
+#site-header .menu-item .badge {
+    color: white;
+    font-size: 10px;
+    padding: 2px 6px;
+    background-color: #0FD5C6; // somehow $topaz is too dark for me.
+text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    border-radius: 6px;
+    &:hover {
+
+    }
+}
+
 #site-header .menu-item button:hover,
 #site-header .menu-item a:hover {
     color: var(--color-topaz);
@@ -152,7 +166,7 @@ body #site-header .menu-item .menu-dropdown {
     font-weight: 500;
     color: var(--color-eggplant);
     text-decoration: none;
-    transition: 
+    transition:
         color 0.2s ease,
         background 0.2s ease;
 }
@@ -265,7 +279,7 @@ div.md-source__repository {
     #site-header .menu-item a .icon-caret {
         height: 10px;
     }
-    
+
     #site-header .menu-item button .icon-slack,
     #site-header .menu-item a .icon-slack,
     #site-header .menu-item button .icon-github,
@@ -372,4 +386,4 @@ div.md-source__repository {
     #site-header nav {
         width: calc(100% - 40px);
     }
-}
\ No newline at end of file
+}
diff --git a/docs/theme/partials/tc-header.html b/docs/theme/partials/tc-header.html
index 73500c640a0..246e9ff523a 100644
--- a/docs/theme/partials/tc-header.html
+++ b/docs/theme/partials/tc-header.html
@@ -2,7 +2,7 @@
     "siteUrl": "https://testcontainers.com/",
     "menuItems": [
         {
-            "label": "Desktop",
+            "label": "Desktop <span class=\"badge rounded-pill\">NEW</span>",
             "url": "https://testcontainers.com/desktop/"
         },
         {
@@ -107,7 +107,7 @@
                 <rect y="22" width="30" height="4" rx="2"/>
                 <rect y="13" width="30" height="4" rx="2"/>
                 <rect y="4" width="30" height="4" rx="2"/>
-            </svg>        
+            </svg>
         </button>
     </div>
     <nav>
@@ -134,7 +134,7 @@
                                                 <use href="#icon-external"></use>
                                             </svg>
                                         {% endif %}
-                                    </a>   
+                                    </a>
                                 </li>
                             {% endfor %}
                         </ul>
@@ -154,4 +154,4 @@
             {% endfor %}
         </ul>
     </nav>
-</header>
\ No newline at end of file
+</header>

From 6e817323b0dc664f0f6ae04b1a281d0d388811d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 21 Aug 2023 09:40:31 -0600
Subject: [PATCH 3132/4969] Replace R2DBC Host by docker host ip address
 (#7431)

---
 .../testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
index 9d3efc17ac7..ded7aaa9ffd 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/R2DBCDatabaseContainerProvider.java
@@ -5,6 +5,7 @@
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import io.r2dbc.spi.Option;
+import org.testcontainers.DockerClientFactory;
 
 import javax.annotation.Nullable;
 
@@ -21,7 +22,7 @@ public interface R2DBCDatabaseContainerProvider {
     default ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
         ConnectionFactoryOptions.Builder builder = options.mutate();
         if (!options.hasOption(ConnectionFactoryOptions.HOST)) {
-            builder.option(ConnectionFactoryOptions.HOST, "localhost");
+            builder.option(ConnectionFactoryOptions.HOST, DockerClientFactory.instance().dockerHostIpAddress());
         }
         if (!options.hasOption(ConnectionFactoryOptions.PORT)) {
             builder.option(ConnectionFactoryOptions.PORT, 65535);

From d9519f998bc81d6e3f11b459aab9bfe8776f42f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 21 Aug 2023 10:31:09 -0600
Subject: [PATCH 3133/4969] Add interface to customize CreateContainerCmd
 (#7421)

Add `CreateContainerCmdModifier` interface to customize
`CreateContainerCmd`. Customization is applied after Testcontainers
configuration is set.
---
 .../containers/GenericContainer.java          | 29 +++++++++++++++----
 .../core/CreateContainerCmdModifier.java      | 13 +++++++++
 .../TestCreateContainerCmdModifier.java       | 18 ++++++++++++
 .../junit/GenericContainerRuleTest.java       |  5 ++++
 ...containers.core.CreateContainerCmdModifier |  1 +
 docs/features/advanced_options.md             | 16 ++++++++++
 6 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/core/CreateContainerCmdModifier.java
 create mode 100644 core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java
 create mode 100644 core/src/test/resources/META-INF/services/org.testcontainers.core.CreateContainerCmdModifier

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index f5652938a47..b02b5274c89 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -48,6 +48,7 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
+import org.testcontainers.core.CreateContainerCmdModifier;
 import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.images.builder.Transferable;
@@ -88,6 +89,7 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -203,7 +205,6 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     /**
      * Set during container startup
-     *
      */
     @Setter(AccessLevel.NONE)
     @VisibleForTesting
@@ -220,8 +221,6 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     private List<Consumer<OutputFrame>> logConsumers = new ArrayList<>();
 
-    private final Set<Consumer<CreateContainerCmd>> createContainerCmdModifiers = new LinkedHashSet<>();
-
     private static final Set<String> AVAILABLE_IMAGE_NAME_CACHE = new HashSet<>();
 
     private static final RateLimiter DOCKER_CLIENT_RATE_LIMITER = RateLimiterBuilder
@@ -238,6 +237,19 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     private boolean hostAccessible = false;
 
+    private final Set<CreateContainerCmdModifier> createContainerCmdModifiers = loadCreateContainerCmdCustomizers();
+
+    private Set<CreateContainerCmdModifier> loadCreateContainerCmdCustomizers() {
+        ServiceLoader<CreateContainerCmdModifier> containerCmdCustomizers = ServiceLoader.load(
+            CreateContainerCmdModifier.class
+        );
+        Set<CreateContainerCmdModifier> loadedCustomizers = new LinkedHashSet<>();
+        for (CreateContainerCmdModifier customizer : containerCmdCustomizers) {
+            loadedCustomizers.add(customizer);
+        }
+        return loadedCustomizers;
+    }
+
     public GenericContainer(@NonNull final DockerImageName dockerImageName) {
         this.image = new RemoteDockerImage(dockerImageName);
     }
@@ -890,7 +902,9 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
             createCommand.withPrivileged(privilegedMode);
         }
 
-        createContainerCmdModifiers.forEach(hook -> hook.accept(createCommand));
+        for (CreateContainerCmdModifier createContainerCmdModifier : this.createContainerCmdModifiers) {
+            createCommand = createContainerCmdModifier.modify(createCommand);
+        }
 
         Map<String, String> combinedLabels = new HashMap<>();
         combinedLabels.putAll(labels);
@@ -1491,12 +1505,16 @@ public SELF withStartupAttempts(int attempts) {
      * @return this
      */
     public SELF withCreateContainerCmdModifier(Consumer<CreateContainerCmd> modifier) {
-        createContainerCmdModifiers.add(modifier);
+        this.createContainerCmdModifiers.add(cmd -> {
+                modifier.accept(cmd);
+                return cmd;
+            });
         return self();
     }
 
     /**
      * Size of /dev/shm
+     *
      * @param bytes The number of bytes to assign the shared memory. If null, it will apply the Docker default which is 64 MB.
      * @return this
      */
@@ -1507,6 +1525,7 @@ public SELF withSharedMemorySize(Long bytes) {
 
     /**
      * First class support for configuring tmpfs
+     *
      * @param mapping path and params of tmpfs/mount flag for container
      * @return this
      */
diff --git a/core/src/main/java/org/testcontainers/core/CreateContainerCmdModifier.java b/core/src/main/java/org/testcontainers/core/CreateContainerCmdModifier.java
new file mode 100644
index 00000000000..fb45da4bc30
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/core/CreateContainerCmdModifier.java
@@ -0,0 +1,13 @@
+package org.testcontainers.core;
+
+import com.github.dockerjava.api.command.CreateContainerCmd;
+
+/**
+ * Callback interface that can be used to customize a {@link CreateContainerCmd}.
+ */
+public interface CreateContainerCmdModifier {
+    /**
+     * Callback to modify a {@link CreateContainerCmd} instance.
+     */
+    CreateContainerCmd modify(CreateContainerCmd createContainerCmd);
+}
diff --git a/core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java b/core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java
new file mode 100644
index 00000000000..9657e57bd32
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java
@@ -0,0 +1,18 @@
+package org.testcontainers.custom;
+
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import org.testcontainers.core.CreateContainerCmdModifier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestCreateContainerCmdModifier implements CreateContainerCmdModifier {
+
+    @Override
+    public CreateContainerCmd modify(CreateContainerCmd createContainerCmd) {
+        Map<String, String> labels = new HashMap<>();
+        labels.put("project", "testcontainers-java");
+        labels.put("scope", "global");
+        return createContainerCmd.withLabels(labels);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index a9a3e966543..79465f192c4 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -264,6 +264,7 @@ public void customLabelTest() {
             final GenericContainer alpineCustomLabel = new GenericContainer<>(TestImages.ALPINE_IMAGE)
                 .withLabel("our.custom", "label")
                 .withCommand("top")
+                .withCreateContainerCmdModifier(cmd -> cmd.getLabels().put("scope", "local"))
         ) {
             alpineCustomLabel.start();
 
@@ -278,6 +279,10 @@ public void customLabelTest() {
                 .containsKey("org.testcontainers.version");
             assertThat(labels).as("our.custom label is present").containsKey("our.custom");
             assertThat(labels).as("our.custom label value is label").containsEntry("our.custom", "label");
+            assertThat(labels)
+                .as("project label value is testcontainers-java")
+                .containsEntry("project", "testcontainers-java");
+            assertThat(labels).as("scope label value is local").containsEntry("scope", "local");
         }
     }
 
diff --git a/core/src/test/resources/META-INF/services/org.testcontainers.core.CreateContainerCmdModifier b/core/src/test/resources/META-INF/services/org.testcontainers.core.CreateContainerCmdModifier
new file mode 100644
index 00000000000..c4eb86e2cbc
--- /dev/null
+++ b/core/src/test/resources/META-INF/services/org.testcontainers.core.CreateContainerCmdModifier
@@ -0,0 +1 @@
+org.testcontainers.custom.TestCreateContainerCmdModifier
diff --git a/docs/features/advanced_options.md b/docs/features/advanced_options.md
index 61b9112a03c..cd9c57f99eb 100644
--- a/docs/features/advanced_options.md
+++ b/docs/features/advanced_options.md
@@ -33,6 +33,8 @@ It is possible to specify an Image Pull Policy to determine at runtime whether a
 
 ## Customizing the container
 
+### Using docker-java
+
 It is possible to use the [`docker-java`](https://github.com/docker-java/docker-java) API directly to customize containers before creation. This is useful if there is a need to use advanced Docker features that are not exposed by the Testcontainers API. Any customizations you make using `withCreateContainerCmdModifier` will be applied _on top_ of the container definition that Testcontainers creates, but before it is created.
 
 For example, this can be used to change the container hostname:
@@ -53,6 +55,20 @@ For example, this can be used to change the container hostname:
 
 For what is possible, consult the [`docker-java CreateContainerCmd` source code](https://github.com/docker-java/docker-java/blob/3.2.1/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java).
 
+### Using CreateContainerCmdModifier
+
+Testcontainers provides a `CreateContainerCmdModifier` to customize [`docker-java CreateContainerCmd`](https://github.com/docker-java/docker-java/blob/3.2.1/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java)
+via Service Provider Interface (SPI) mechanism.
+
+<!--codeinclude-->
+[CreateContainerCmd example implementation](../../core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java)
+<!--/codeinclude-->
+
+The previous implementation should be registered in `META-INF/services/org.testcontainers.core.CreateContainerCmdModifier` file.
+
+!!! warning
+    `CreateContainerCmdModifier` implementation will apply to all containers created by Testcontainers.
+
 ## Parallel Container Startup
 
 Usually, containers are started sequentially when more than one container is used.

From 15dcb62b68efa9a2db4fd98e841b3739bc7dea09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 21 Aug 2023 11:25:51 -0600
Subject: [PATCH 3134/4969] Fix test

---
 .../jarFileTest/java/org/testcontainers/JarFileShadingTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index 99fd1359c85..a20eca729a7 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -20,7 +20,7 @@ public void testPackages() throws Exception {
 
     @Test
     public void testMetaInf() throws Exception {
-        assertThatFileList(root.resolve("META-INF")).containsOnly("MANIFEST.MF", "services");
+        assertThatFileList(root.resolve("META-INF")).containsOnly("MANIFEST.MF", "services", "versions");
     }
 
     @Test

From 52e4e8cd1b99dee5946cf34b5974b4c22ab9ae50 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:01:28 -0600
Subject: [PATCH 3135/4969] [create-pull-request] automated change (#7433)

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 428048c8f8b..48bece9ca95 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -121,4 +121,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.18.3
+    latest_version: 1.19.0

From a5669dd05dbcbb21ef2f6bb52ddb685cae8d64f4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:01:43 -0600
Subject: [PATCH 3136/4969] [create-pull-request] automated change (#7432)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7aa5a26a69a..d87e0f5ba84 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.18.3
+testcontainers.version=1.19.0

From eaeb40b15d7e14f6ad12d1d0cd73ec8f8159715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 23 Aug 2023 13:33:22 -0600
Subject: [PATCH 3137/4969] Fix turbo mode in smoke test (#7436)

---
 .github/workflows/ci.yml                                   | 2 +-
 .../org/testcontainers/example/AbstractRedisContainer.java | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7331cb2290d..3a3c00228b5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Test using Testcontainers Cloud with Turbo Mode enabled
         working-directory: ./smoke-test/
         run: |
-          ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+          ./gradlew check --no-daemon --continue --scan --info
 
   find_gradle_jobs:
     needs: [core]
diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java
index 8750d1c87f1..325660b34c4 100644
--- a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java
+++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java
@@ -9,8 +9,11 @@ class AbstractRedisContainer {
     private static final String REDIS_IMAGE = "redis:7.0.12-alpine";
 
     void runRedisContainer() {
-        try (GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE).withExposedPorts(6379)
-            .withCreateContainerCmdModifier(cmd -> cmd.withName("tc-redis"))) {
+        try (
+            GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
+                .withExposedPorts(6379)
+                .withCreateContainerCmdModifier(cmd -> cmd.withName("tc-redis"))
+        ) {
             redis.start();
             assertThat(redis.isRunning()).isTrue();
         }

From 1a1fddef9bef07b78e029556b6d36fae0edb4479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 30 Aug 2023 11:49:28 -0600
Subject: [PATCH 3138/4969] Add docs to run Testcontainers using Podman (#7447)

---
 docs/supported_docker_environment/index.md | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index dbf892eba0d..591be528e0e 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -31,6 +31,35 @@ export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
 export DOCKER_HOST="unix://${HOME}/.colima/default/docker.sock"
 ```
 
+## Podman
+
+In order to run testcontainers against [podman](https://podman.io/) the env vars bellow should be set
+
+MacOS:
+
+```bash
+{% raw %}
+export DOCKER_HOST=unix://$(podman machine inspect --format '{{.ConnectionInfo.PodmanSocket.Path}}')
+export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
+{% endraw %}
+```
+
+Linux:
+
+```bash
+export DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/podman/podman.sock
+```
+
+If you're running Podman in rootless mode, ensure to include the following line to disable Ryuk:
+
+```bash
+export TESTCONTAINERS_RYUK_DISABLED=true
+```
+
+!!! note
+    Previous to version 1.19.0, `export TESTCONTAINERS_RYUK_PRIVILEGED=true`
+    was required for rootful mode. Starting with 1.19.0, this is no longer required.
+
 ## Docker environment discovery
 
 Testcontainers will try to connect to a Docker daemon using the following strategies in order:

From 0fc30f68e9fa39029a22f2c1eeec507ebdba3803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 30 Aug 2023 15:13:36 -0600
Subject: [PATCH 3139/4969] Execute turbo-mode job in main branch

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a3c00228b5..4c2d5d3dcb0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,7 @@ jobs:
           ./gradlew :testcontainers:check --no-daemon --continue --scan
 
   turbo-mode:
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

From 1084b2000aa746a09b23b5fbe25644212deb4eee Mon Sep 17 00:00:00 2001
From: Samed Bicer <15824212+samed-bicer@users.noreply.github.com>
Date: Thu, 31 Aug 2023 01:40:36 +0300
Subject: [PATCH 3140/4969] Migrate examples to JUnit Jupiter (#7417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 examples/hazelcast/build.gradle               |  5 ++++
 .../examples/HazelcastTest.java               | 14 ++++-----
 examples/immudb/build.gradle                  |  6 ++++
 examples/immudb/src/test/java/ImmuDbTest.java | 30 ++++++++++---------
 examples/kafka-cluster/build.gradle           |  5 ++++
 .../KafkaContainerClusterTest.java            | 10 +++----
 examples/nats/build.gradle                    |  5 ++++
 .../java/com/example/NatsContainerTest.java   |  8 ++---
 examples/redis-backed-cache/build.gradle      |  7 ++++-
 .../src/test/java/RedisBackedCacheTest.java   | 20 +++++++------
 examples/selenium-container/build.gradle      |  6 ++++
 .../src/test/java/SeleniumContainerTest.java  | 19 ++++++------
 examples/sftp/build.gradle                    |  5 ++++
 .../java/org/example/SftpContainerTest.java   |  6 ++--
 examples/singleton-container/build.gradle     |  5 ++++
 .../com/example/BarConcreteTestClass.java     | 12 ++++----
 .../com/example/FooConcreteTestClass.java     | 12 ++++----
 examples/solr-container/build.gradle          |  4 +++
 .../test/java/com/example/SolrQueryTest.java  | 16 +++++-----
 .../spring-boot-kotlin-redis/build.gradle.kts |  5 ++++
 .../example/redis/AbstractIntegrationTest.kt  |  5 ++--
 .../example/redis/RedisApplicationTests.kt    |  2 +-
 .../kotlin/com/example/redis/RedisTest.kt     |  2 +-
 examples/spring-boot/build.gradle             |  5 ++++
 .../com/example/AbstractIntegrationTest.java  |  5 +---
 .../java/com/example/DemoControllerTest.java  |  8 ++---
 examples/zookeeper/build.gradle               |  5 ++++
 .../com/example/ZookeeperContainerTest.java   |  6 ++--
 28 files changed, 150 insertions(+), 88 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index a47f4dc3bc2..cfa6a05595d 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -11,4 +11,9 @@ dependencies {
     testImplementation 'com.hazelcast:hazelcast:5.2.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java b/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
index 18fc6df6455..f4306727cdd 100644
--- a/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
+++ b/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
@@ -3,8 +3,8 @@
 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
 import com.hazelcast.core.HazelcastInstance;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -18,7 +18,7 @@
 /**
  * Examples with Hazelcast using both a single container and a cluster with two containers.
  */
-public class HazelcastTest {
+class HazelcastTest {
 
     // Hazelcast values
     private static final String HZ_IMAGE_NAME = "hazelcast/hazelcast:5.2.0";
@@ -46,13 +46,13 @@ public class HazelcastTest {
 
     private static final String TRUE_VALUE = "true";
 
-    @After
-    public void cleanUp() {
+    @AfterEach
+    void cleanUp() {
         HazelcastClient.shutdownAll();
     }
 
     @Test
-    public void singleHazelcastContainer() {
+    void singleHazelcastContainer() {
         try (
             GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(HZ_IMAGE_NAME))
                 .withExposedPorts(DEFAULT_EXPOSED_PORT)
@@ -76,7 +76,7 @@ public void singleHazelcastContainer() {
     }
 
     @Test
-    public void hazelcastCluster() {
+    void hazelcastCluster() {
         Network network = Network.newNetwork();
         try (
             GenericContainer<?> container1 = new GenericContainer<>(DockerImageName.parse(HZ_IMAGE_NAME))
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 4b02c761169..f3e5689ecdb 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -9,7 +9,13 @@ repositories {
 dependencies {
     implementation 'io.codenotary:immudb4j:1.0.0'
     testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/immudb/src/test/java/ImmuDbTest.java b/examples/immudb/src/test/java/ImmuDbTest.java
index 64da774b2de..fc0c2ad9eca 100644
--- a/examples/immudb/src/test/java/ImmuDbTest.java
+++ b/examples/immudb/src/test/java/ImmuDbTest.java
@@ -1,20 +1,22 @@
 import io.codenotary.immudb4j.Entry;
 import io.codenotary.immudb4j.ImmuClient;
 import io.codenotary.immudb4j.exceptions.VerificationException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test class for the ImmuDbClient.
  */
-public class ImmuDbTest {
+@Testcontainers
+class ImmuDbTest {
 
     // Default port for the ImmuDb server
     private static final int IMMUDB_PORT = 3322;
@@ -29,7 +31,7 @@ public class ImmuDbTest {
     private final String IMMUDB_DATABASE = "defaultdb";
 
     // Test container for the ImmuDb database, with the latest version of the image and exposed port
-    @ClassRule
+    @Container
     public static final GenericContainer<?> immuDbContainer = new GenericContainer<>("codenotary/immudb:1.3")
         .withExposedPorts(IMMUDB_PORT)
         .waitingFor(Wait.forLogMessage(".*Web API server enabled.*", 1));
@@ -37,8 +39,8 @@ public class ImmuDbTest {
     // ImmuClient used to interact with the DB
     private ImmuClient immuClient;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         this.immuClient =
             ImmuClient
                 .newBuilder()
@@ -48,13 +50,13 @@ public void setUp() {
         this.immuClient.openSession(IMMUDB_DATABASE, IMMUDB_USER, IMMUDB_PASSWORD);
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
         this.immuClient.closeSession();
     }
 
     @Test
-    public void testGetValue() {
+    void testGetValue() {
         try {
             immuClient.set("test1", "test2".getBytes());
 
@@ -64,10 +66,10 @@ public void testGetValue() {
                 byte[] value = entry.getValue();
                 assertThat(new String(value)).isEqualTo("test2");
             } else {
-                Assert.fail();
+                Assertions.fail();
             }
         } catch (VerificationException e) {
-            Assert.fail();
+            Assertions.fail();
         }
     }
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index ff1579588f2..2a911a05d6f 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -14,4 +14,9 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
index 089d80fa080..51221b5d56f 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
@@ -13,7 +13,7 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 
 import java.time.Duration;
@@ -25,10 +25,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 
-public class KafkaContainerClusterTest {
+class KafkaContainerClusterTest {
 
     @Test
-    public void testKafkaContainerCluster() throws Exception {
+    void testKafkaContainerCluster() throws Exception {
         try (KafkaContainerCluster cluster = new KafkaContainerCluster("6.2.1", 3, 2)) {
             cluster.start();
             String bootstrapServers = cluster.getBootstrapServers();
@@ -40,7 +40,7 @@ public void testKafkaContainerCluster() throws Exception {
     }
 
     @Test
-    public void testKafkaContainerKraftCluster() throws Exception {
+    void testKafkaContainerKraftCluster() throws Exception {
         try (KafkaContainerKraftCluster cluster = new KafkaContainerKraftCluster("7.0.0", 3, 2)) {
             cluster.start();
             String bootstrapServers = cluster.getBootstrapServers();
@@ -52,7 +52,7 @@ public void testKafkaContainerKraftCluster() throws Exception {
     }
 
     @Test
-    public void testKafkaContainerKraftClusterAfterConfluentPlatform740() throws Exception {
+    void testKafkaContainerKraftClusterAfterConfluentPlatform740() throws Exception {
         try (KafkaContainerKraftCluster cluster = new KafkaContainerKraftCluster("7.4.0", 3, 2)) {
             cluster.start();
             String bootstrapServers = cluster.getBootstrapServers();
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 383a94b2042..00b10896e5b 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -12,4 +12,9 @@ dependencies {
     testImplementation 'io.nats:jnats:2.16.13'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/nats/src/test/java/com/example/NatsContainerTest.java b/examples/nats/src/test/java/com/example/NatsContainerTest.java
index 397b3a4f7b0..6b6cecb0bdc 100644
--- a/examples/nats/src/test/java/com/example/NatsContainerTest.java
+++ b/examples/nats/src/test/java/com/example/NatsContainerTest.java
@@ -8,21 +8,21 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class NatsContainerTest {
+class NatsContainerTest {
 
     public static final Integer NATS_PORT = 4222;
 
     public static final Integer NATS_MGMT_PORT = 8222;
 
     @Test
-    public void test() throws IOException, InterruptedException {
+    void test() throws IOException, InterruptedException {
         try (
             GenericContainer<?> nats = new GenericContainer<>("nats:2.9.8-alpine3.16")
                 .withExposedPorts(NATS_PORT, NATS_MGMT_PORT)
@@ -38,7 +38,7 @@ public void test() throws IOException, InterruptedException {
     }
 
     @Test
-    public void testServerStatus() throws IOException {
+    void testServerStatus() throws IOException {
         try (
             GenericContainer<?> nats = new GenericContainer<>("nats:2.9.8-alpine3.16")
                 .withExposedPorts(NATS_PORT, NATS_MGMT_PORT)
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f47dab71cb7..f44b78d07c0 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -12,7 +12,12 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
index e820646a0da..de33245eb01 100644
--- a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
@@ -1,9 +1,10 @@
 import com.mycompany.cache.Cache;
 import com.mycompany.cache.RedisBackedCache;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 import redis.clients.jedis.Jedis;
 
@@ -14,23 +15,24 @@
 /**
  * Integration test for Redis-backed cache implementation.
  */
-public class RedisBackedCacheTest {
+@Testcontainers
+class RedisBackedCacheTest {
 
-    @Rule
+    @Container
     public GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
         .withExposedPorts(6379);
 
     private Cache cache;
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    void setUp() throws Exception {
         Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "test");
     }
 
     @Test
-    public void testFindingAnInsertedValue() {
+    void testFindingAnInsertedValue() {
         cache.put("foo", "FOO");
         Optional<String> foundObject = cache.get("foo", String.class);
 
@@ -41,7 +43,7 @@ public void testFindingAnInsertedValue() {
     }
 
     @Test
-    public void testNotFindingAValueThatWasNotInserted() {
+    void testNotFindingAValueThatWasNotInserted() {
         Optional<String> foundObject = cache.get("bar", String.class);
 
         assertThat(foundObject.isPresent())
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 5b99b3c42dc..af23f1ea082 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -15,5 +15,11 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
+    testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/selenium-container/src/test/java/SeleniumContainerTest.java b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
index da687158c3d..985f2ef8966 100644
--- a/examples/selenium-container/src/test/java/SeleniumContainerTest.java
+++ b/examples/selenium-container/src/test/java/SeleniumContainerTest.java
@@ -1,7 +1,6 @@
 import com.example.DemoApplication;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeOptions;
@@ -13,10 +12,11 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode;
+import org.testcontainers.junit.jupiter.Container;
 
 import java.io.File;
 import java.time.Duration;
@@ -27,21 +27,22 @@
 /**
  * Simple example of plain Selenium usage.
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@org.testcontainers.junit.jupiter.Testcontainers
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = DemoApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(initializers = SeleniumContainerTest.Initializer.class)
-public class SeleniumContainerTest {
+class SeleniumContainerTest {
 
     @LocalServerPort
     private int port;
 
-    @Rule
+    @Container
     public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer()
         .withCapabilities(new ChromeOptions())
         .withRecordingMode(VncRecordingMode.RECORD_ALL, new File("build"));
 
     @Test
-    public void simplePlainSeleniumTest() {
+    void simplePlainSeleniumTest() {
         RemoteWebDriver driver = new RemoteWebDriver(chrome.getSeleniumAddress(), new ChromeOptions());
         driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
 
@@ -51,7 +52,7 @@ public void simplePlainSeleniumTest() {
         assertThat(hElement).as("The h element is found").isNotEmpty();
     }
 
-    public static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+    static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
         @Override
         public void initialize(ConfigurableApplicationContext applicationContext) {
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 0e7b08957eb..e007ea63985 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -11,4 +11,9 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/sftp/src/test/java/org/example/SftpContainerTest.java b/examples/sftp/src/test/java/org/example/SftpContainerTest.java
index ce69cf6b75d..e54b5b72036 100644
--- a/examples/sftp/src/test/java/org/example/SftpContainerTest.java
+++ b/examples/sftp/src/test/java/org/example/SftpContainerTest.java
@@ -3,7 +3,7 @@
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.Session;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.MountableFile;
 
@@ -14,10 +14,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SftpContainerTest {
+class SftpContainerTest {
 
     @Test
-    public void test() throws Exception {
+    void test() throws Exception {
         try (
             GenericContainer<?> sftp = new GenericContainer<>("atmoz/sftp:alpine-3.7")
                 .withCopyFileToContainer(
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 0ef93d5151c..ae866d773d4 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -16,4 +16,9 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
index 6b9050be277..da7b9a2e1cf 100644
--- a/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/BarConcreteTestClass.java
@@ -2,27 +2,27 @@
 
 import com.example.cache.Cache;
 import com.example.cache.RedisBackedCache;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;
 
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BarConcreteTestClass extends AbstractIntegrationTest {
+class BarConcreteTestClass extends AbstractIntegrationTest {
 
     private Cache cache;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "bar");
     }
 
     @Test
-    public void testInsertValue() {
+    void testInsertValue() {
         cache.put("bar", "BAR");
         Optional<String> foundObject = cache.get("bar", String.class);
 
diff --git a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
index ea071202dcd..cd17e3c4ae1 100644
--- a/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
+++ b/examples/singleton-container/src/test/java/com/example/FooConcreteTestClass.java
@@ -2,27 +2,27 @@
 
 import com.example.cache.Cache;
 import com.example.cache.RedisBackedCache;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;
 
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class FooConcreteTestClass extends AbstractIntegrationTest {
+class FooConcreteTestClass extends AbstractIntegrationTest {
 
     private Cache cache;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         Jedis jedis = new Jedis(redis.getHost(), redis.getMappedPort(6379));
 
         cache = new RedisBackedCache(jedis, "foo");
     }
 
     @Test
-    public void testInsertValue() {
+    void testInsertValue() {
         cache.put("foo", "FOO");
         Optional<String> foundObject = cache.get("foo", String.class);
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 585c7696eaf..342421aa416 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -15,5 +15,9 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
 
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
index e65504c0276..e8bb6876a92 100644
--- a/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
+++ b/examples/solr-container/src/test/java/com/example/SolrQueryTest.java
@@ -5,8 +5,8 @@
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.SolrInputField;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.SolrContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolrQueryTest {
+class SolrQueryTest {
 
     private static final DockerImageName SOLR_IMAGE = DockerImageName.parse("solr:8.3.0");
 
@@ -26,8 +26,8 @@ public class SolrQueryTest {
 
     private static SolrClient solrClient;
 
-    @BeforeClass
-    public static void setUp() throws IOException, SolrServerException {
+    @BeforeAll
+    static void setUp() throws IOException, SolrServerException {
         solrContainer.start();
         solrClient =
             new Http2SolrClient.Builder(
@@ -63,7 +63,7 @@ public static void setUp() throws IOException, SolrServerException {
     }
 
     @Test
-    public void testQueryForShoes() {
+    void testQueryForShoes() {
         SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
 
         SearchResult result = searchEngine.search("shoes");
@@ -72,7 +72,7 @@ public void testQueryForShoes() {
     }
 
     @Test
-    public void testQueryForTShirt() {
+    void testQueryForTShirt() {
         SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
 
         SearchResult result = searchEngine.search("t-shirt");
@@ -81,7 +81,7 @@ public void testQueryForTShirt() {
     }
 
     @Test
-    public void testQueryForAsterisk() {
+    void testQueryForAsterisk() {
         SolrSearchEngine searchEngine = new SolrSearchEngine(solrClient);
 
         SearchResult result = searchEngine.search("*");
diff --git a/examples/spring-boot-kotlin-redis/build.gradle.kts b/examples/spring-boot-kotlin-redis/build.gradle.kts
index 49b253f647e..a132efe1bba 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle.kts
+++ b/examples/spring-boot-kotlin-redis/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.testcontainers:testcontainers")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
 
 
 }
@@ -31,3 +32,7 @@ tasks.withType<KotlinCompile> {
         jvmTarget = "1.8"
     }
 }
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+}
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
index 98f56192087..045899ad721 100644
--- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
@@ -1,16 +1,15 @@
 package com.example.redis
 
-import org.junit.runner.RunWith
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.util.TestPropertyValues
 import org.springframework.context.ApplicationContextInitializer
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
+import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.testcontainers.containers.GenericContainer
 
-@RunWith(SpringRunner::class)
 @SpringBootTest
 @ContextConfiguration(initializers = [AbstractIntegrationTest.Initializer::class])
 @AutoConfigureMockMvc
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt
index aec5a486120..83ab75213ac 100644
--- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisApplicationTests.kt
@@ -1,6 +1,6 @@
 package com.example.redis
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 class RedisApplicationTests : AbstractIntegrationTest() {
 
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
index e95ea9ba0e3..908bbd41c9c 100644
--- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/RedisTest.kt
@@ -1,7 +1,7 @@
 package com.example.redis
 
 import org.hamcrest.CoreMatchers.containsString
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 7452a492bb7..af2c8f9e2b7 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,4 +17,9 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
index 8a1a508c0b3..d3d1621cda1 100644
--- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
@@ -1,23 +1,20 @@
 package com.example;
 
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(
     classes = DemoApplication.class,
     webEnvironment = WebEnvironment.RANDOM_PORT,
     properties = { "spring.datasource.url=jdbc:tc:postgresql:11-alpine:///databasename" }
 )
 @ActiveProfiles("test")
-public abstract class AbstractIntegrationTest {
+abstract class AbstractIntegrationTest {
 
     static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3-alpine"))
         .withExposedPorts(6379);
diff --git a/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java b/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
index 4282920b37c..9e96f1ab1e8 100644
--- a/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
+++ b/examples/spring-boot/src/test/java/com/example/DemoControllerTest.java
@@ -1,12 +1,12 @@
 package com.example;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DemoControllerTest extends AbstractIntegrationTest {
+class DemoControllerTest extends AbstractIntegrationTest {
 
     @Autowired
     TestRestTemplate restTemplate;
@@ -15,7 +15,7 @@ public class DemoControllerTest extends AbstractIntegrationTest {
     DemoRepository demoRepository;
 
     @Test
-    public void simpleTest() {
+    void simpleTest() {
         String fooResource = "/foo";
 
         restTemplate.put(fooResource, "bar");
@@ -24,7 +24,7 @@ public void simpleTest() {
     }
 
     @Test
-    public void simpleJPATest() {
+    void simpleJPATest() {
         DemoEntity demoEntity = new DemoEntity();
         demoEntity.setValue("Some value");
         demoRepository.save(demoEntity);
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index b7dd7ced6ad..448618b47cf 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -11,4 +11,9 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java b/examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java
index a8aad36d201..4518c354e6d 100644
--- a/examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java
+++ b/examples/zookeeper/src/test/java/com/example/ZookeeperContainerTest.java
@@ -3,19 +3,19 @@
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.RetryOneTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 import java.nio.charset.StandardCharsets;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ZookeeperContainerTest {
+class ZookeeperContainerTest {
 
     private static final int ZOOKEEPER_PORT = 2181;
 
     @Test
-    public void test() throws Exception {
+    void test() throws Exception {
         String path = "/messages/zk-tc";
         String content = "Running Zookeeper with Testcontainers";
         try (

From 693f8eac4b0217191d9eb6925da6e0a5fccd3009 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:05:34 +0000
Subject: [PATCH 3141/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.117 to 2.20.139.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 df3e671a203..a97c842a460 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.117'
+    testImplementation 'software.amazon.awssdk:s3:2.20.139'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From cab66e742c7f687bb3ec7fb91f7a7693d10c0413 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:05:43 +0000
Subject: [PATCH 3142/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.520 to 1.12.543.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.520...1.12.543)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 df3e671a203..4da1a26a761 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.520")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.543")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From ee392e707a4a671e15dc42762b3e7d74558ded54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:08:26 +0000
Subject: [PATCH 3143/4969] Bump org.questdb:questdb from 7.2.1 to 7.3.1 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.2.1 to 7.3.1.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.2.1...7.3.1)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index a6cba1bc188..eaaa68b6d43 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.2.1'
+    testImplementation 'org.questdb:questdb:7.3.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 877a819aec3e34a2ef9ba1a3630689ae504a15e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:10:47 +0000
Subject: [PATCH 3144/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.4.0.jre8-preview to 12.4.1.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b7ae484647b..db16851dd6e 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.1.jre8'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From 46a8fc209d01a61c0ce421c1c009efcde4935a73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:16:17 +0000
Subject: [PATCH 3145/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.21.0 to 26.22.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.21.0...v26.22.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 15ccf6589e7..9e271ed52d3 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.21.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.22.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From f6afbf6d397ac3d1bac31d81907f21c19dcc6bf9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:16:33 +0000
Subject: [PATCH 3146/4969] Bump com.azure:azure-cosmos from 4.48.0 to 4.49.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.48.0 to 4.49.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.48.0...azure-cosmos_4.49.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index a0c0e067b0d..69dc6612a1d 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.48.0'
+    testImplementation 'com.azure:azure-cosmos:4.49.0'
 }

From 9d9498df72165fd6fb2234d1e25ac5a6fa18e14c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:22:56 +0000
Subject: [PATCH 3147/4969] Bump org.apache.pulsar:pulsar-client in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client](https://github.com/apache/pulsar) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 9cd1ef66474..c669f9c172c 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.0.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.0.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.0'
 }

From 6c764a89338d4d1b210a5bcf8e22072414f1ea4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:23:08 +0000
Subject: [PATCH 3148/4969] Bump org.apache.pulsar:pulsar-client-admin in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client-admin](https://github.com/apache/pulsar) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 9cd1ef66474..acf61455f0e 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.0.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.0.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.0'
 }

From 8e778f4d2723f8e4d3a987ae1cd55d5548683f80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:32:31 +0000
Subject: [PATCH 3149/4969] Bump io.fabric8:kubernetes-client from 6.8.0 to
 6.8.1 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.8.0 to 6.8.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.8.0...v6.8.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 8effb3e6a8d..5a187355fe6 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.8.0'
+    testImplementation 'io.fabric8:kubernetes-client:6.8.1'
     testImplementation 'io.kubernetes:client-java:18.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 1f7ca7df2f7d7768039fa4a9154f8260c815eda6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:34:58 +0000
Subject: [PATCH 3150/4969] Bump github/combine-prs from 3.1.1 to 3.1.2

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v3.1.1...v3.1.2)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 55b5e76852b..0af9ac150a4 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v3.1.1
+        uses: github/combine-prs@v3.1.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From 45284404de137cfbd4598c66b5adbacba211d9d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:35:20 +0000
Subject: [PATCH 3151/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.11 to 10.1.13.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 8c3e17d5599..d9fa4556caa 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.11'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.13'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 06a05e00cd7f2791564e93ea917c66fb397b2b78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:36:35 +0000
Subject: [PATCH 3152/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.21 to 3.2.22.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.21...3.2.22)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index f620dc91635..2c18bdd0431 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.21"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.22"
 }

From 7220c53d12c2c6cc9b202a2f14bb2e9e8813a4c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:36:41 +0000
Subject: [PATCH 3153/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.21 to 3.2.22.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.21...3.2.22)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index f620dc91635..a4969918105 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.21"
+    api "com.orientechnologies:orientdb-client:3.2.22"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'

From 6bfdaf0da6f35bc412d70d946dcb4613f198da9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:38:51 +0000
Subject: [PATCH 3154/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.8 to 3.4.9.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/commits)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 98502cc528b..b036eacaecf 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.8'
+    testImplementation 'com.couchbase.client:java-client:3.4.9'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 684ce74146174fc66a2ddce4eadce23a9a770bd6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:39:15 +0000
Subject: [PATCH 3155/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.520 to 1.12.543.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.520...1.12.543)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 6734752170b..2856b247c65 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From d11ab7d35a235635ef95ca9770707ae09a9b5f6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:42:36 +0000
Subject: [PATCH 3156/4969] Bump commons-dbutils:commons-dbutils in
 /modules/jdbc-test

Bumps commons-dbutils:commons-dbutils from 1.7 to 1.8.0.

---
updated-dependencies:
- dependency-name: commons-dbutils:commons-dbutils
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9678c87cf01..aa7e9b6e97a 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api 'com.google.guava:guava:32.1.2-jre'
     api 'org.apache.commons:commons-lang3:3.13.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
-    api 'commons-dbutils:commons-dbutils:1.7'
+    api 'commons-dbutils:commons-dbutils:1.8.0'
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 

From 8585876a712853cd50f30e83b138470f3a4e8341 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:44:19 +0000
Subject: [PATCH 3157/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 562f9d8b55a..13f351607cd 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.18.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.2")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.8")
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 5befa4084a1260771b16c6292f17da68178c6d37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:44:25 +0000
Subject: [PATCH 3158/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.8 to 1.4.11.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.8...v_1.4.11)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 562f9d8b55a..7d206dd86fd 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.18.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.4.8")
+    testImplementation("ch.qos.logback:logback-classic:1.4.11")
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
 }

From b61ec1c7bbb3ace6ef39969401243d66b7b661e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:44:40 +0000
Subject: [PATCH 3159/4969] Bump io.trino:trino-jdbc from 422 to 425 in
 /modules/trino

Bumps io.trino:trino-jdbc from 422 to 425.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 192d6add0f3..51306485854 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:422'
+    testRuntimeOnly 'io.trino:trino-jdbc:425'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From e79a9e8d54f73e3ef2134c9d86731d38d532d8b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:45:21 +0000
Subject: [PATCH 3160/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.9.0 to 8.9.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.9.0...v8.9.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 011a6493d2e..30c7abaf9d2 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.1"
     testImplementation "org.elasticsearch.client:transport:7.17.12"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 8ceaac466bc4849d25ba3fbe1f9dca391ce2c674 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:47:53 +0000
Subject: [PATCH 3161/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.8 to 3.5.9.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.8...v3.5.9)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 87b4a4548eb..3c861742b04 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.8'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.9'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 3707eee618a5c3833391d97d96570d1f8249bd71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:51:27 +0000
Subject: [PATCH 3162/4969] Bump org.apache.kafka:kafka-clients from 3.4.0 to
 3.5.1 in /examples

Bumps org.apache.kafka:kafka-clients from 3.4.0 to 3.5.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 2a911a05d6f..84c68073248 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.28"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'

From 0518406e40d77a0467d56539c3259ecc78105492 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:51:35 +0000
Subject: [PATCH 3163/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.2.3.RELEASE to 6.2.6.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/lettuce-io/lettuce-core/blob/6.2.6.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.2.3.RELEASE...6.2.6.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index b8b66f2f090..00bc52b1214 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 9361ff028a7..a64fadf383f 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 4485fd733b6..d41e2dac28b 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'

From d4e977172ed0cd3cbb4aa078fd61e3674863b1fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:51:40 +0000
Subject: [PATCH 3164/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 9361ff028a7..631f0259c69 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.3.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.0"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From a2424fc31bf6a509336782fa6ead461f56f9c73d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:51:54 +0000
Subject: [PATCH 3165/4969] Bump io.nats:jnats from 2.16.13 to 2.16.14 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.16.13 to 2.16.14.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.16.13...2.16.14)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 00b10896e5b..783545b73bc 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.13'
+    testImplementation 'io.nats:jnats:2.16.14'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'

From 75ba9b9323f6dd5ee345c070c3f5ec16b0d6b764 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:52:00 +0000
Subject: [PATCH 3166/4969] Bump redis.clients:jedis from 4.3.2 to 4.4.3 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.3.2 to 4.4.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.3.2...v4.4.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 4eb0ed41442..642ceb8d039 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.3.2'
+    implementation 'redis.clients:jedis:4.4.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f44b78d07c0..dbb83f982fd 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.3.2'
+    implementation 'redis.clients:jedis:4.4.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index ae866d773d4..379d6e34a8b 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.3.2'
+    implementation 'redis.clients:jedis:4.4.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 94cca2a590c65ec0d154d34455891f15b702fa55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:52:04 +0000
Subject: [PATCH 3167/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /examples

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.11 to 4.4.12.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.11...4.4.12)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 96af42237bb..760a8b44e89 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.12'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'

From 73077cf2d763e919083f63c218e62ba1dcca1c3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:52:12 +0000
Subject: [PATCH 3168/4969] Bump org.springframework.boot from 2.7.13 to 2.7.15
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.13 to 2.7.15.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.13...v2.7.15)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 af23f1ea082..2401638b8ee 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.7.13'
+    id 'org.springframework.boot' version '2.7.15'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index af2c8f9e2b7..d0b2c2c8211 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.7.13'
+    id 'org.springframework.boot' version '2.7.15'
 }
 apply plugin: 'io.spring.dependency-management'
 

From ef5ae891441a4877005541bba3877b63b18b829a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:58:25 +0000
Subject: [PATCH 3169/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.1.4 to 3.2.0.
- [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/3.1.4...3.2.0)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 29002623e39..6b36b854b3a 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.4'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.2.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 2c6fd6f606304b8419d45e2c50a02288f5d65b38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Sep 2023 17:33:54 +0000
Subject: [PATCH 3170/4969] Bump commons-dbutils:commons-dbutils from 1.7 to
 1.8.0 in /modules/jdbc

Bumps commons-dbutils:commons-dbutils from 1.7 to 1.8.0.

---
updated-dependencies:
- dependency-name: commons-dbutils:commons-dbutils
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index d9fa4556caa..390d6589b34 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':database-commons')
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
-    testImplementation 'commons-dbutils:commons-dbutils:1.7'
+    testImplementation 'commons-dbutils:commons-dbutils:1.8.0'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.13'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'

From c0201e64ba2ecf752d9fd585db249abb056ffa9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Sep 2023 17:34:15 +0000
Subject: [PATCH 3171/4969] Bump ch.qos.logback:logback-classic from 1.3.8 to
 1.3.11 in /examples

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.3.8 to 1.3.11.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.8...v_1.3.11)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle                                    | 2 +-
 docs/examples/spock/redis/build.gradle          | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6e2c0fec169..4db6206f78d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,7 +122,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     }
 
     checkstyle {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index d41e2dac28b..a058c5313ea 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.6.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index cfa6a05595d..9e5adb352fa 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.2.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index f3e5689ecdb..26c92399935 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }
 
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 84c68073248..d730703dbdb 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }
 
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 21f34e736e5..d3dae77a2be 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'org.json:json:20230227'
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 783545b73bc..896d71af14e 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.14'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 642ceb8d039..0075367fa96 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.testng:testng:7.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index dbb83f982fd..bb112d0a367 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index e007ea63985..0ea936cec88 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 379d6e34a8b..5f5f3aca1a8 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 448618b47cf..5e5dfb7582e 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.5.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
 }
 

From 0343be6d6435b2e3d906870ce6a9914de3bd55a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:40:27 +0000
Subject: [PATCH 3172/4969] Bump com.hazelcast:hazelcast from 5.2.3 to 5.3.2 in
 /examples

Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.2.3 to 5.3.2.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/compare/v5.2.3...v5.3.2)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 9e5adb352fa..d6d5f9a0d27 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.hazelcast:hazelcast:5.2.3'
+    testImplementation 'com.hazelcast:hazelcast:5.3.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'

From 21dac1c12b485411e91f3f4cd00e14fed15fcccb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:40:27 +0000
Subject: [PATCH 3173/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.6.4 to 3.7.0.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.6.4...3.7.0)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 48d29c39f03..5163fd6a2d2 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     api "com.orientechnologies:orientdb-client:3.2.22"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.22"
 }

From add9ba4ffe6879d1dd8641c0dc9ec6c1acccc319 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:40:40 +0000
Subject: [PATCH 3174/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.11.0 to 4.12.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 627887f6f29..14bf52e469c 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.11.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.12.1')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From f09b1b7c876bfd08d4787f3bc29e996ee71bc9f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:40:40 +0000
Subject: [PATCH 3175/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.10.0 to 4.12.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 5448a05328e..5570b2e3167 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.10.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.12.1"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 2535247b60961ceb8e6ab7a972fe9ef1f36d2fab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:40:50 +0000
Subject: [PATCH 3176/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /modules/selenium

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.11.0 to 4.12.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 5dab1a70853..10053a60f09 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
 
-    testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.11.0')
+    testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.12.1')
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-edge-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-support'

From fcfe6f2553f4ffbab76376aea0a1e6a5389ab131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 6 Sep 2023 14:58:37 -0600
Subject: [PATCH 3177/4969] Log image pull and container startup time
 independently (#7455)

Currently, contianer startup is logged taking into account the
image pull. Logging those independently is accurate.
---
 .../org/testcontainers/containers/GenericContainer.java  | 9 ++++-----
 .../org/testcontainers/images/RemoteDockerImage.java     | 6 +++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index b02b5274c89..6d1a4ace0c1 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -338,8 +338,6 @@ protected void doStart() {
         try {
             configure();
 
-            Instant startedAt = Instant.now();
-
             logger().debug("Starting container: {}", getDockerImageName());
 
             AtomicInteger attempt = new AtomicInteger(0);
@@ -353,7 +351,7 @@ protected void doStart() {
                             attempt.incrementAndGet(),
                             startupAttempts
                         );
-                    tryStart(startedAt);
+                    tryStart();
                     return true;
                 }
             );
@@ -380,11 +378,12 @@ protected boolean canBeReused() {
         return true;
     }
 
-    private void tryStart(Instant startedAt) {
+    private void tryStart() {
         try {
             String dockerImageName = getDockerImageName();
             logger().debug("Starting container: {}", dockerImageName);
 
+            Instant startedAt = Instant.now();
             logger().info("Creating container for image: {}", dockerImageName);
             CreateContainerCmd createCommand = dockerClient.createContainerCmd(dockerImageName);
             applyConfiguration(createCommand);
@@ -1497,7 +1496,7 @@ public SELF withStartupAttempts(int attempts) {
     }
 
     /**
-     * Allow low level modifications of {@link CreateContainerCmd} after it was pre-configured in {@link #tryStart(Instant)}.
+     * Allow low level modifications of {@link CreateContainerCmd} after it was pre-configured in {@link #tryStart()}.
      * Invocation happens eagerly on a moment when container is created.
      * Warning: this does expose the underlying docker-java API so might change outside of our control.
      *
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 7dbd7adec0b..8e61ea58013 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -80,6 +80,7 @@ protected final String resolve() {
             Exception lastFailure = null;
             final Instant lastRetryAllowed = Instant.now().plus(PULL_RETRY_TIME_LIMIT);
 
+            Instant startedAt = Instant.now();
             while (Instant.now().isBefore(lastRetryAllowed)) {
                 try {
                     PullImageCmd pullImageCmd = dockerClient
@@ -95,10 +96,12 @@ protected final String resolve() {
                             .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
                             .awaitCompletion();
                     }
+                    String dockerImageName = imageName.asCanonicalNameString();
+                    logger.info("Image {} pull took {}", dockerImageName, Duration.between(startedAt, Instant.now()));
 
                     LocalImagesCache.INSTANCE.refreshCache(imageName);
 
-                    return imageName.asCanonicalNameString();
+                    return dockerImageName;
                 } catch (InterruptedException | InternalServerErrorException e) {
                     // these classes of exception often relate to timeout/connection errors so should be retried
                     lastFailure = e;
@@ -109,6 +112,7 @@ protected final String resolve() {
                     );
                 }
             }
+
             logger.error(
                 "Failed to pull image: {}. Please check output of `docker pull {}`",
                 imageName,

From ba9e3cc21f34bc89d8938c51ceaa7321349c6f1f Mon Sep 17 00:00:00 2001
From: frozenwizard <172203+frozenwizard@users.noreply.github.com>
Date: Wed, 6 Sep 2023 18:14:40 -0500
Subject: [PATCH 3178/4969] Add MinIO module (#7440)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   2 +
 docs/modules/minio.md                         |  39 ++++++
 mkdocs.yml                                    |   1 +
 modules/minio/build.gradle                    |   8 ++
 .../containers/MinIOContainer.java            | 120 ++++++++++++++++++
 .../containers/MinIOContainerTest.java        |  82 ++++++++++++
 .../minio/src/test/resources/logback-test.xml |  16 +++
 .../src/test/resources/object_to_upload.txt   |   1 +
 12 files changed, 277 insertions(+)
 create mode 100644 docs/modules/minio.md
 create mode 100644 modules/minio/build.gradle
 create mode 100644 modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
 create mode 100644 modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
 create mode 100644 modules/minio/src/test/resources/logback-test.xml
 create mode 100644 modules/minio/src/test/resources/object_to_upload.txt

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 033fd19c49d..8a8b92c6110 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -31,6 +31,7 @@ body:
         - Kafka
         - LocalStack
         - MariaDB
+        - MinIO
         - MockServer
         - MongoDB
         - MSSQLServer
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index b9d67bc7d52..56391755f2e 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -31,6 +31,7 @@ body:
         - Kafka
         - LocalStack
         - MariaDB
+        - MinIO
         - MockServer
         - MongoDB
         - MSSQLServer
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index ffc1b19a6cb..3d5e6bd44b6 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -31,6 +31,7 @@ body:
         - Kafka
         - LocalStack
         - MariaDB
+        - MinIO
         - MockServer
         - MongoDB
         - MSSQLServer
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 52d11753ca8..aa3e55cc62e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -154,6 +154,11 @@ updates:
     ignore:
       - dependency-name: "org.mariadb:r2dbc-mariadb"
         update-types: [ "version-update:semver-minor" ]
+  - package-ecosystem: "gradle"
+    directory: "/modules/minio"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mockserver"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index e6e922b4e11..748037f2d39 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -47,6 +47,8 @@
   - modules/localstack/**/*
 "modules/mariadb":
   - modules/mariadb/**/*
+"modules/minio":
+  - modules/minio/**/*
 "modules/mockserver":
   - modules/mockserver/**/*
 "modules/mongodb":
diff --git a/docs/modules/minio.md b/docs/modules/minio.md
new file mode 100644
index 00000000000..2b872682ebe
--- /dev/null
+++ b/docs/modules/minio.md
@@ -0,0 +1,39 @@
+# MinIO Containers
+
+Testcontainers can be used to automatically instantiate and manage [MinIO](https://min.io) containers.
+
+## Usage example
+
+Create a `MinIOContainer` to use it in your tests:
+<!--codeinclude-->
+[Starting a MinIO container](../../modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java) inside_block:minioContainer
+<!--/codeinclude-->
+
+The [MinIO Java client](https://min.io/docs/minio/linux/developers/java/API.html) can be configured with the container as such:
+<!--codeinclude-->
+[Configuring a MinIO client](../../modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java) inside_block:configuringClient
+<!--/codeinclude-->
+
+If needed the username and password can be overridden as such:
+<!--codeinclude-->
+[Overriding a MinIO container](../../modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java) inside_block:minioOverrides
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+     testImplementation "org.testcontainers:minio:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>minio</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 48bece9ca95..183685e8a18 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -81,6 +81,7 @@ nav:
           - modules/k3s.md
           - modules/kafka.md
           - modules/localstack.md
+          - modules/minio.md
           - modules/mockserver.md
           - modules/nginx.md
           - modules/pulsar.md
diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
new file mode 100644
index 00000000000..9c7e088ec4a
--- /dev/null
+++ b/modules/minio/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: MinIO"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation("io.minio:minio:8.5.5")
+    testImplementation 'org.assertj:assertj-core:3.24.2'
+}
diff --git a/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
new file mode 100644
index 00000000000..54238643c14
--- /dev/null
+++ b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
@@ -0,0 +1,120 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+/**
+ * Testcontainers implementation for MinIO.
+ * <p>
+ * Supported image: {@code minio/minio}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>S3: 9000</li>
+ *     <li>Console: 9001</li>
+ * </ul>
+ */
+public class MinIOContainer extends GenericContainer<MinIOContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("minio/minio");
+
+    private static final int MINIO_S3_PORT = 9000;
+
+    private static final int MINIO_UI_PORT = 9001;
+
+    private static final String DEFAULT_USER = "minioadmin";
+
+    private static final String DEFAULT_PASSWORD = "minioadmin";
+
+    private String userName;
+
+    private String password;
+
+    /**
+     * Constructs a MinIO container from the dockerImageName
+     * @param dockerImageName the full image name to use
+     */
+    public MinIOContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * Constructs a MinIO container from the dockerImageName
+     * @param dockerImageName the full image name to use
+     */
+    public MinIOContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+    }
+
+    /**
+     * Overrides the DEFAULT_USER
+     * @param userName the Root user to override
+     * @return this
+     */
+    public MinIOContainer withUserName(String userName) {
+        this.userName = userName;
+        return this;
+    }
+
+    /**
+     * Overrides the DEFAULT_PASSWORD
+     * @param password the Root user's password to override
+     * @return this
+     */
+    public MinIOContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Configures the MinIO container
+     */
+    @Override
+    public void configure() {
+        withExposedPorts(MinIOContainer.MINIO_S3_PORT, MinIOContainer.MINIO_UI_PORT);
+
+        if (this.userName != null) {
+            addEnv("MINIO_ROOT_USER", this.userName);
+        } else {
+            this.userName = DEFAULT_USER;
+        }
+        if (this.password != null) {
+            addEnv("MINIO_ROOT_PASSWORD", this.password);
+        } else {
+            this.password = DEFAULT_PASSWORD;
+        }
+
+        withCommand("server", "--console-address", ":" + MINIO_UI_PORT, "/data");
+
+        waitingFor(
+            Wait
+                .forLogMessage(".*Status:         1 Online, 0 Offline..*", 1)
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
+        );
+    }
+
+    /**
+     * @return the URL to upload/download objects from
+     */
+    public String getS3URL() {
+        return String.format("http://%s:%s", this.getHost(), getMappedPort(MINIO_S3_PORT));
+    }
+
+    /**
+     * @return the Username for the Root user
+     */
+    public String getUserName() {
+        return this.userName;
+    }
+
+    /**
+     * @return the password for the Root user
+     */
+    public String getPassword() {
+        return this.password;
+    }
+}
diff --git a/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java b/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
new file mode 100644
index 00000000000..563a77852c5
--- /dev/null
+++ b/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
@@ -0,0 +1,82 @@
+package org.testcontainers.containers;
+
+import io.minio.BucketExistsArgs;
+import io.minio.MakeBucketArgs;
+import io.minio.MinioClient;
+import io.minio.StatObjectArgs;
+import io.minio.StatObjectResponse;
+import io.minio.UploadObjectArgs;
+import org.junit.Test;
+
+import java.net.URL;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MinIOContainerTest {
+
+    @Test
+    public void testBasicUsage() throws Exception {
+        try (
+            // minioContainer {
+            MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z");
+            // }
+        ) {
+            container.start();
+
+            // configuringClient {
+            MinioClient minioClient = MinioClient
+                .builder()
+                .endpoint(container.getS3URL())
+                .credentials(container.getUserName(), container.getPassword())
+                .build();
+
+            // }
+            minioClient.makeBucket(MakeBucketArgs.builder().bucket("test-bucket").region("us-west-2").build());
+
+            BucketExistsArgs existsArgs = BucketExistsArgs.builder().bucket("test-bucket").build();
+
+            assertThat(minioClient.bucketExists(existsArgs)).isTrue();
+
+            URL file = this.getClass().getResource("/object_to_upload.txt");
+            assertThat(file).isNotNull();
+            minioClient.uploadObject(
+                UploadObjectArgs
+                    .builder()
+                    .bucket("test-bucket")
+                    .object("my-objectname")
+                    .filename(file.getPath())
+                    .build()
+            );
+
+            StatObjectResponse objectStat = minioClient.statObject(
+                StatObjectArgs.builder().bucket("test-bucket").object("my-objectname").build()
+            );
+
+            assertThat(objectStat.object()).isEqualTo("my-objectname");
+        }
+    }
+
+    @Test
+    public void testDefaultUserPassword() {
+        try (MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z")) {
+            container.start();
+            assertThat(container.getUserName()).isEqualTo("minioadmin");
+            assertThat(container.getPassword()).isEqualTo("minioadmin");
+        }
+    }
+
+    @Test
+    public void testOverwriteUserPassword() {
+        try (
+            // minioOverrides {
+            MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z")
+                .withUserName("testuser")
+                .withPassword("testpassword");
+            // }
+        ) {
+            container.start();
+            assertThat(container.getUserName()).isEqualTo("testuser");
+            assertThat(container.getPassword()).isEqualTo("testpassword");
+        }
+    }
+}
diff --git a/modules/minio/src/test/resources/logback-test.xml b/modules/minio/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/minio/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/minio/src/test/resources/object_to_upload.txt b/modules/minio/src/test/resources/object_to_upload.txt
new file mode 100644
index 00000000000..0637880d70d
--- /dev/null
+++ b/modules/minio/src/test/resources/object_to_upload.txt
@@ -0,0 +1 @@
+This is a file

From 0e97b2402a436bb0ef9fa02728ef16481c0dd22e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:04 +0000
Subject: [PATCH 3179/4969] Bump redis.clients:jedis from 4.4.3 to 5.0.0 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.4.3 to 5.0.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.4.3...v5.0.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 7a6829c873d..f8dad5e4c6e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -105,7 +105,7 @@ dependencies {
 
     testImplementation 'com.google.cloud.tools:jib-core:0.23.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:4.4.3'
+    testImplementation 'redis.clients:jedis:5.0.0'
     testImplementation 'com.rabbitmq:amqp-client:5.18.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From 4ee01b4d42bd3be46dc7672de4cb45a539cda8f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:11 +0000
Subject: [PATCH 3180/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.139 to 2.20.142.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9355c396521..44b75703f44 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.139'
+    testImplementation 'software.amazon.awssdk:s3:2.20.142'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9068e0f8f6c1ba0e70e4a22a38c82928133169c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:13 +0000
Subject: [PATCH 3181/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.18.0 to 4.19.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.18.0...4.19.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 9ee5f1258b1..5a7fd578602 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.18.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.19.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.2")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")

From d7bf81b760c1becf947c4fbea302a771abac456b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:13 +0000
Subject: [PATCH 3182/4969] Bump redis.clients:jedis from 4.4.3 to 5.0.0 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.4.3 to 5.0.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.4.3...v5.0.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9d9c4fd6f40..7fb5c262f49 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.4.3'
+    testImplementation 'redis.clients:jedis:5.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 91e05cc79fc632c9771bd5094c6305244492c625 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:15 +0000
Subject: [PATCH 3183/4969] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-docker-wormhole.yml         |  2 +-
 .github/workflows/ci-rootless.yml                |  2 +-
 .github/workflows/ci.yml                         | 16 ++++++++--------
 .github/workflows/release.yml                    |  2 +-
 .github/workflows/update-docs-version.yml        |  2 +-
 .github/workflows/update-gradle-wrapper.yml      |  2 +-
 .../workflows/update-testcontainers-version.yml  |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 2dd4c1f6d1f..f7d1cb0850a 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -38,7 +38,7 @@ jobs:
   in-docker_test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build with Gradle
         run: |
           docker run -i --rm \
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index f948cc23ae5..061cde6b83a 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -38,7 +38,7 @@ jobs:
   test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup rootless Docker
         uses: ScribeMD/rootless-docker@0.2.2
       - name: Remove Docket root socket
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c2d5d3dcb0..7bbfce9bbb0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
   core:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle
         run: |
@@ -54,7 +54,7 @@ jobs:
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Setup Testcontainers Cloud Client
         uses: atomicjar/testcontainers-cloud-setup-action@main
@@ -72,7 +72,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
@@ -92,7 +92,7 @@ jobs:
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
@@ -104,7 +104,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
@@ -125,7 +125,7 @@ jobs:
       matrix: ${{ fromJson(needs.find_examples_jobs.outputs.matrix) }}
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
         working-directory: ./examples/
@@ -138,7 +138,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/gradle-build-action@v2
@@ -158,7 +158,7 @@ jobs:
       matrix: ${{ fromJson(needs.find_docs_examples_jobs.outputs.matrix) }}
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5857be84118..0fbd63cdbd1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
   release:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Clear existing docker image cache
         run: docker image prune -af
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 6e93a5e307b..520a62c43e1 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
       - name: Update latest_version property in mkdocs.yml
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index f8006957ac3..f636e52b36a 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@0407394b9d173dfc9cf5695f9f560fef6d61a5fe # v1.0.13
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index a98bb08a571..c0fbc9fc066 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
       - name: Update testcontainers.version property in gradle.properties

From df81ab668146adca3234d5c30391dd0766cc9643 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:16 +0000
Subject: [PATCH 3184/4969] Bump org.json:json from 20230227 to 20230618 in
 /examples

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20230618.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d3dae77a2be..2d7ae56c9a7 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-    implementation 'org.json:json:20230227'
+    implementation 'org.json:json:20230618'
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.testcontainers:postgresql'

From 8a8aa96f781ac2000740747cf9e062a3caff97b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:18 +0000
Subject: [PATCH 3185/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.543 to 1.12.545.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.543...1.12.545)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 2856b247c65..abf1c2744bc 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.545'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.545'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 00a117558189b22900d89c333390d47cbbf2af8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:19 +0000
Subject: [PATCH 3186/4969] Bump org.gradle.toolchains:foojay-resolver in
 /examples

Bumps org.gradle.toolchains:foojay-resolver from 0.6.0 to 0.7.0.

---
updated-dependencies:
- dependency-name: org.gradle.toolchains:foojay-resolver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 82942a0f6c0..4099d39851a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
-        classpath "org.gradle.toolchains:foojay-resolver:0.6.0"
+        classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }
 

From a535e78a74decd62d5ee60f2493b7bc5130a69cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:22 +0000
Subject: [PATCH 3187/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.12 to 7.17.13.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.12...v7.17.13)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 30c7abaf9d2..0ddeaec8ef0 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.1"
-    testImplementation "org.elasticsearch.client:transport:7.17.12"
+    testImplementation "org.elasticsearch.client:transport:7.17.13"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9a20fc28525c4c4410dff5afe294b3b0405e43b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:24 +0000
Subject: [PATCH 3188/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.543 to 1.12.545.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.543...1.12.545)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9355c396521..63aa82cd79b 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.543")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.545")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From 610936bd1f06ba8f2713029e4bcc1cfc94bffe68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:15:24 +0000
Subject: [PATCH 3189/4969] Bump redis.clients:jedis from 4.4.3 to 5.0.0 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 4.4.3 to 5.0.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v4.4.3...v5.0.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 0075367fa96..00eca58b847 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.4.3'
+    implementation 'redis.clients:jedis:5.0.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index bb112d0a367..c212bd6833f 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.4.3'
+    implementation 'redis.clients:jedis:5.0.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 5f5f3aca1a8..909e58fe170 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.4.3'
+    implementation 'redis.clients:jedis:5.0.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From dc49b222e480bcebc6e05acc9d8308c6f3b85c0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Sep 2023 17:38:41 +0000
Subject: [PATCH 3190/4969] Bump io.trino:trino-jdbc from 425 to 426 in
 /modules/trino

Bumps io.trino:trino-jdbc from 425 to 426.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 51306485854..c6415477c1a 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:425'
+    testRuntimeOnly 'io.trino:trino-jdbc:426'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From e67fc7d087d38480c4cf51d2500e397ce87dfcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 12 Sep 2023 11:36:40 -0600
Subject: [PATCH 3191/4969] Add sshd feature to devcontainers.json

Allow to connect via ssh via gh cli.
---
 .devcontainer/devcontainer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2e7f2788b81..3a7ea347cb3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -43,7 +43,10 @@
             "installGradle": "false"
         },
         "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
-        "ghcr.io/devcontainers/features/node:1": {}
+        "ghcr.io/devcontainers/features/node:1": {},
+        "ghcr.io/devcontainers/features/sshd:1": {
+            "version": "latest"
+        }
 	},
 	"postStartCommand": ["./gradlew", "compileJava"]
 }

From 00cc0ea84b73642e3494e6b7a0384a5e3fa201bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 12 Sep 2023 20:27:07 -0600
Subject: [PATCH 3192/4969] Override ChainedImageNameSubstitutor toString
 (#7522)

Returns ChainedImageNameSubstitutor's getDescription

Fixes #7039
---
 .../utility/ImageNameSubstitutor.java           |  5 +++++
 .../utility/ImageNameSubstitutorTest.java       | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
index 3f491e4c9b3..54372cd726f 100644
--- a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
@@ -155,6 +155,11 @@ protected String getDescription() {
                 configuredInstance.getDescription()
             );
         }
+
+        @Override
+        public String toString() {
+            return getDescription();
+        }
     }
 
     private static class NoopImageNameSubstitutor extends ImageNameSubstitutor {
diff --git a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
index 5c65d9e5841..0f5a747c359 100644
--- a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
@@ -5,8 +5,10 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.testcontainers.containers.GenericContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.eq;
 
 public class ImageNameSubstitutorTest {
@@ -64,4 +66,19 @@ public void testWorksWithoutConfiguredImplementation() {
             .as("the image has been substituted by default then configured implementations")
             .isEqualTo("substituted-image:latest");
     }
+
+    @Test
+    public void testImageNameSubstitutorToString() {
+        Mockito
+            .doReturn(FakeImageSubstitutor.class.getCanonicalName())
+            .when(TestcontainersConfiguration.getInstance())
+            .getImageSubstitutorClassName();
+
+        try (GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("original"))) {
+            assertThatThrownBy(container::start)
+                .hasMessageContaining(
+                    "imageNameSubstitutor=Chained substitutor of 'default implementation' and then 'test implementation'"
+                );
+        }
+    }
 }

From d99b472caab6081ecb9570d340c4213cc51941cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 14 Sep 2023 17:17:45 -0600
Subject: [PATCH 3193/4969] Use small image hazelcast/hazelcast:5.2.0-slim
 (#7530)

---
 .../test/java/org/testcontainers/examples/HazelcastTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java b/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
index f4306727cdd..4825474fecc 100644
--- a/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
+++ b/examples/hazelcast/src/test/java/org/testcontainers/examples/HazelcastTest.java
@@ -21,7 +21,7 @@
 class HazelcastTest {
 
     // Hazelcast values
-    private static final String HZ_IMAGE_NAME = "hazelcast/hazelcast:5.2.0";
+    private static final String HZ_IMAGE_NAME = "hazelcast/hazelcast:5.2.0-slim";
 
     private static final String HZ_CLUSTERNAME_ENV_NAME = "HZ_CLUSTERNAME";
 
@@ -77,8 +77,8 @@ void singleHazelcastContainer() {
 
     @Test
     void hazelcastCluster() {
-        Network network = Network.newNetwork();
         try (
+            Network network = Network.newNetwork();
             GenericContainer<?> container1 = new GenericContainer<>(DockerImageName.parse(HZ_IMAGE_NAME))
                 .withExposedPorts(DEFAULT_EXPOSED_PORT)
                 .withEnv(HZ_CLUSTERNAME_ENV_NAME, TEST_CLUSTER_NAME)

From 1c8f3928c6890d038dd34a71d8ad9d2508128fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabr=C3=ADcio=20Yamamoto?= <fabriciorby@hotmail.com>
Date: Sat, 16 Sep 2023 01:12:47 +0200
Subject: [PATCH 3194/4969] Add docs for BigQuery Client creation (#7528)

---
 docs/modules/gcloud.md                                        | 4 ++++
 .../containers/BigQueryEmulatorContainerTest.java             | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index bfe34100ce2..1abc5ecc122 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -26,6 +26,10 @@ Start BigQuery Emulator during a test:
 [Starting a BigQuery Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
+<!--codeinclude-->
+[Creating BigQuery Client](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java) inside_block:bigQueryClient
+<!--/codeinclude-->
+
 ### Bigtable
 
 Start Bigtable Emulator during a test:
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
index cd1dffde843..01fcbe137a6 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import com.google.cloud.NoCredentials;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQueryOptions;
 import com.google.cloud.bigquery.QueryJobConfiguration;
@@ -23,14 +24,17 @@ public void test() throws Exception {
         ) {
             container.start();
 
+            // bigQueryClient {
             String url = container.getEmulatorHttpEndpoint();
             BigQueryOptions options = BigQueryOptions
                 .newBuilder()
                 .setProjectId(container.getProjectId())
                 .setHost(url)
                 .setLocation(url)
+                .setCredentials(NoCredentials.getInstance())
                 .build();
             BigQuery bigQuery = options.getService();
+            // }
 
             String fn =
                 "CREATE FUNCTION testr(arr ARRAY<STRUCT<name STRING, val INT64>>) AS ((SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))";

From e84ef4896740f4c8983dbf32c9602db89b626e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 25 Sep 2023 08:49:54 -0600
Subject: [PATCH 3195/4969] Switch dependabot to weekly (#7547)

---
 .github/dependabot.yml | 100 ++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index aa3e55cc62e..e44a6447c76 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,7 +9,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/core"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.slf4j:slf4j-api"
@@ -27,19 +27,19 @@ updates:
     registries:
       - gradle-plugin-portal
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"
     directory: "/modules/azure"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/cassandra"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "io.dropwizard.metrics:metrics-core"
@@ -47,67 +47,67 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/clickhouse"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/cockroachdb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/consul"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/couchbase"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/cratedb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/database-commons"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/db2"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/dynalite"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/elasticsearch"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/gcloud"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/hivemq"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/influxdb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.mockito:mockito-core"
@@ -115,7 +115,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc-test"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.apache.tomcat:tomcat-jdbc"
@@ -123,7 +123,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/junit-jupiter"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.mockito:mockito-core"
@@ -131,7 +131,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/k3s"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
@@ -139,17 +139,17 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/localstack"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mariadb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.mariadb:r2dbc-mariadb"
@@ -157,32 +157,32 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/minio"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mockserver"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mongodb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mssqlserver"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mysql"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/neo4j"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.neo4j.driver:neo4j-java-driver"
@@ -192,42 +192,42 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/nginx"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/oracle-xe"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/orientdb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/postgresql"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/presto"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/pulsar"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/questdb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/r2dbc"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "io.r2dbc:r2dbc-spi"
@@ -235,22 +235,22 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/rabbitmq"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/redpanda"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/selenium"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/solace"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.apache.qpid:qpid-jms-client"
@@ -258,7 +258,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/solr"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.apache.solr:solr-solrj"
@@ -266,39 +266,39 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/spock"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/tidb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/toxiproxy"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/trino"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/vault"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/yugabytedb"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
 
 # Examples
   - package-ecosystem: "gradle"
     directory: "/examples"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "ch.qos.logback:logback-classic"
@@ -320,5 +320,5 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     open-pull-requests-limit: 10

From 990d1beaddaccdc956b0c4dd7d0e6b54a50ffd5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:24 +0000
Subject: [PATCH 3196/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.9 to 3.4.10.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/commits)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index b036eacaecf..33c830612a9 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.9'
+    testImplementation 'com.couchbase.client:java-client:3.4.10'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 4b5c6c00c8368461f36a5229cbb2e46dd4e937bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:25 +0000
Subject: [PATCH 3197/4969] Bump org.apache.commons:commons-compress from
 1.23.0 to 1.24.0 in /core

Bumps org.apache.commons:commons-compress from 1.23.0 to 1.24.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index f8dad5e4c6e..d76f27c0f01 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testCompileOnly 'org.jetbrains:annotations:24.0.1'
-    api 'org.apache.commons:commons-compress:1.23.0'
+    api 'org.apache.commons:commons-compress:1.24.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From 61dbab9e85bdc671db51ee27344aa820bd5a68fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:27 +0000
Subject: [PATCH 3198/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.19.0 to 4.20.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.19.0...4.20.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 5a7fd578602..9e5c13e02ce 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.19.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.20.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.2")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")

From 3d61f11627ae42e024f6e736b7c885c1ce5e3856 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:27 +0000
Subject: [PATCH 3199/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.22.0 to 26.23.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.22.0...v26.23.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9e271ed52d3..e26a5ef6eee 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.22.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.23.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 6526663b7a77d74885b396853240dc7a5c7e5dd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:27 +0000
Subject: [PATCH 3200/4969] Bump io.rest-assured:rest-assured from 5.3.1 to
 5.3.2 in /modules/consul

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.1 to 5.3.2.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/commits)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index 69bb253544b..49188def442 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    testImplementation 'io.rest-assured:rest-assured:5.3.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From ea2d4d8aeeb9ff4e9dcd096b3216593d70e18f6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:28 +0000
Subject: [PATCH 3201/4969] Bump io.minio:minio from 8.5.5 to 8.5.6 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.5.5 to 8.5.6.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.5.5...8.5.6)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 9c7e088ec4a..6fc1d943cc8 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.5.5")
+    testImplementation("io.minio:minio:8.5.6")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9406f0439cf00529d15ba09baf5fc1d94c31ef40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:28 +0000
Subject: [PATCH 3202/4969] Bump io.rest-assured:rest-assured in
 /modules/redpanda

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.1 to 5.3.2.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/commits)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 0aa32791a9f..4a4f5247da0 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    testImplementation 'io.rest-assured:rest-assured:5.3.2'
 }

From 296c093bb32f35565d13cc1921c90a985052a8fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:29 +0000
Subject: [PATCH 3203/4969] Bump org.questdb:questdb from 7.3.1 to 7.3.2 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.3.1 to 7.3.2.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.3.1...7.3.2)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index eaaa68b6d43..396a926e832 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.3.1'
+    testImplementation 'org.questdb:questdb:7.3.2'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 75cf69e07e7908f285b11196e02d16b501cc0a41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:32 +0000
Subject: [PATCH 3204/4969] Bump commons-dbutils:commons-dbutils in
 /modules/jdbc

Bumps commons-dbutils:commons-dbutils from 1.8.0 to 1.8.1.

---
updated-dependencies:
- dependency-name: commons-dbutils:commons-dbutils
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 390d6589b34..9b8b003022b 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':database-commons')
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
-    testImplementation 'commons-dbutils:commons-dbutils:1.8.0'
+    testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.13'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'

From f0de084affb0bcfae493938614675de4ac504f9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:32 +0000
Subject: [PATCH 3205/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.22 to 3.2.23.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.22...3.2.23)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 5163fd6a2d2..50c47140d46 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.22"
+    api "com.orientechnologies:orientdb-client:3.2.23"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'

From 40e42f971f61008ef89384c193038ef9cd98a15e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:32 +0000
Subject: [PATCH 3206/4969] Bump commons-dbutils:commons-dbutils in
 /modules/jdbc-test

Bumps commons-dbutils:commons-dbutils from 1.8.0 to 1.8.1.

---
updated-dependencies:
- dependency-name: commons-dbutils:commons-dbutils
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 aa7e9b6e97a..e9350103766 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api 'com.google.guava:guava:32.1.2-jre'
     api 'org.apache.commons:commons-lang3:3.13.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
-    api 'commons-dbutils:commons-dbutils:1.8.0'
+    api 'commons-dbutils:commons-dbutils:1.8.1'
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 

From edbf9a126514bd081e1dbd329fee4a9c9bf54678 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:33 +0000
Subject: [PATCH 3207/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.9 to 3.5.10.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.9...v3.5.10)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 3c861742b04..c743941fd0d 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.9'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.10'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9d0eed62e8c3fe9fc37be00416f0890ce343172e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:35 +0000
Subject: [PATCH 3208/4969] Bump io.asyncer:r2dbc-mysql from 1.0.2 to 1.0.3 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-1.0.2...r2dbc-mysql-1.0.3)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 454c179b7f8..bf8ba2d8adb 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:1.0.2'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.0.3'
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.2'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.3'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From b5aa592054218b19e33ea2a82f6517b8146dcadb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:35 +0000
Subject: [PATCH 3209/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.9.1 to 8.10.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.9.1...v8.10.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 0ddeaec8ef0..420f5382d33 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.2"
     testImplementation "org.elasticsearch.client:transport:7.17.13"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From d68c54ef274c5b981613c1cd3108b04da0b80b4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:36 +0000
Subject: [PATCH 3210/4969] Bump github/combine-prs from 3.1.2 to 4.0.0

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 3.1.2 to 4.0.0.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v3.1.2...v4.0.0)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 0af9ac150a4..c53350d041f 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v3.1.2
+        uses: github/combine-prs@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From 16a03473d06662009fbef0e7e5b75fe99b06d37b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:36 +0000
Subject: [PATCH 3211/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.22 to 3.2.23.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.22...3.2.23)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 5163fd6a2d2..df9460246c6 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.22"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.23"
 }

From 9963bcbc34cd8ae7a19e0b57345054a71d692159 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:48 +0000
Subject: [PATCH 3212/4969] Bump io.cucumber:cucumber-bom from 7.13.0 to 7.14.0
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.13.0 to 7.14.0.
- [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/v7.13.0...v7.14.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 14bf52e469c..c5785090414 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
-    testImplementation platform('io.cucumber:cucumber-bom:7.13.0')
+    testImplementation platform('io.cucumber:cucumber-bom:7.14.0')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'

From 7c897bae6107a7dbfe1136f8a5ce7c320272bfc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:50 +0000
Subject: [PATCH 3213/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin in /examples

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.11.1 to 1.11.2.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index e57cb285f22..07fe8cb8daf 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 4099d39851a..65c568e33d0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

From 563bd90eb96c598e73df1236264580f2d205a1ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:50:54 +0000
Subject: [PATCH 3214/4969] Bump org.projectlombok:lombok from 1.18.28 to
 1.18.30 in /examples

Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.28 to 1.18.30.
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.28...v1.18.30)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle  | 4 ++--
 examples/solr-container/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index d730703dbdb..a7bfddbad2d 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.28"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
+    testCompileOnly "org.projectlombok:lombok:1.18.30"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 342421aa416..95e3d4cf602 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.28"
-    annotationProcessor "org.projectlombok:lombok:1.18.28"
+    compileOnly "org.projectlombok:lombok:1.18.30"
+    annotationProcessor "org.projectlombok:lombok:1.18.30"
 
     implementation 'org.apache.solr:solr-solrj:8.11.2'
 

From 55da164fd822392f3e41092b2cc5f9668933e588 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:51:03 +0000
Subject: [PATCH 3215/4969] Bump org.springframework.boot from 2.7.15 to 2.7.16
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.15 to 2.7.16.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.15...v2.7.16)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 2401638b8ee..8940bf75e2a 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.7.15'
+    id 'org.springframework.boot' version '2.7.16'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index d0b2c2c8211..194edcaeeeb 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.7.15'
+    id 'org.springframework.boot' version '2.7.16'
 }
 apply plugin: 'io.spring.dependency-management'
 

From c04c29a312b87f2d5ec90e49b53b4012b2561e60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:51:08 +0000
Subject: [PATCH 3216/4969] Bump io.rest-assured:rest-assured from 5.3.1 to
 5.3.2 in /modules/vault

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.1 to 5.3.2.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/commits)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 05ff922e005..e8cd0c5f3ce 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    testImplementation 'io.rest-assured:rest-assured:5.3.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 
 }

From 4a0784431ab79f4ba1669b7d6ba746bbb3fcb329 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:51:08 +0000
Subject: [PATCH 3217/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.11.1 to 1.11.2.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 4099d39851a..65c568e33d0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

From 5d0631fecc046a986519a2519d80700af292bf5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 25 Sep 2023 14:09:04 -0600
Subject: [PATCH 3218/4969] Deprecate withSecretInVault (#7576)

Use `withInitCommand`
---
 .../org/testcontainers/vault/VaultContainer.java |  2 ++
 .../testcontainers/vault/VaultContainerTest.java | 16 ++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 644ed87469b..2e6396f7b93 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -174,7 +174,9 @@ public SELF withLogLevel(VaultLogLevel level) {
      * @param firstSecret      first secret to add to specifed path
      * @param remainingSecrets var args list of secrets to add to specified path
      * @return this
+     * @deprecated use {@link #withInitCommand(String...)} instead
      */
+    @Deprecated
     public SELF withSecretInVault(String path, String firstSecret, String... remainingSecrets) {
         List<String> list = new ArrayList<>();
         list.add(firstSecret);
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index 63ecee4e598..fe578bfe83b 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -26,16 +26,12 @@ public class VaultContainerTest {
     // vaultContainer {
     public static VaultContainer<?> vaultContainer = new VaultContainer<>("hashicorp/vault:1.13")
         .withVaultToken(VAULT_TOKEN)
-        .withSecretInVault("secret/testing1", "top_secret=password123")
-        .withSecretInVault(
-            "secret/testing2",
-            "secret_one=password1",
-            "secret_two=password2",
-            "secret_three=password3",
-            "secret_three=password3",
-            "secret_four=password4"
-        )
-        .withInitCommand("secrets enable transit", "write -f transit/keys/my-key");
+        .withInitCommand(
+            "secrets enable transit",
+            "write -f transit/keys/my-key",
+            "kv put secret/testing1 top_secret=password123",
+            "kv put secret/testing2 secret_one=password1 secret_two=password2 secret_three=password3 secret_three=password3 secret_four=password4"
+        );
 
     // }
 

From 8b7c4d6b9cd4b82b89e1e6038e9e412329706a8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 22:37:15 +0000
Subject: [PATCH 3219/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.545 to 1.12.557.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.545...1.12.557)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 1bf454a61b9..31b01d7d250 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.545")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.557")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From 0b89eb13d68ebfb0b9baba2d9e1d11bd9544cb1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 22:37:16 +0000
Subject: [PATCH 3220/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.142 to 2.20.154.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 1bf454a61b9..efb622a1def 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.142'
+    testImplementation 'software.amazon.awssdk:s3:2.20.154'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From ce0c40417c2ca2db7ca682de1893904f64a9b188 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 22:37:32 +0000
Subject: [PATCH 3221/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.545 to 1.12.557.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.545...1.12.557)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 abf1c2744bc..b44eba88080 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.545'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.545'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e5df6ef2a5019c09e1b03bdae023eb76d2e014b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 26 Sep 2023 09:55:37 -0600
Subject: [PATCH 3222/4969] Update guava version to 32.1.2-jre (#7534)

Fixes #7525
---
 build.gradle      | 2 +-
 core/build.gradle | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4db6206f78d..83909bd65f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:30.1.1-jre'
+        classpath 'com.google.guava:guava:32.1.2-jre'
         classpath 'com.github.tjni.captainhook:captain-hook:0.1.5'
     }
 }
diff --git a/core/build.gradle b/core/build.gradle
index d76f27c0f01..b4ed66c2852 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -93,17 +93,22 @@ dependencies {
 
     api "com.github.docker-java:docker-java-api"
 
-    shaded 'com.github.docker-java:docker-java-core'
+    shaded('com.github.docker-java:docker-java-core') {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
+    shaded 'com.google.guava:guava:32.1.2-jre'
     shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
-    testImplementation 'com.google.cloud.tools:jib-core:0.23.0'
+    testImplementation('com.google.cloud.tools:jib-core:0.23.0')  {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:5.0.0'
     testImplementation 'com.rabbitmq:amqp-client:5.18.0'

From 5b2193a0dbf18d70a645031385052c98d5928147 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 15:56:16 +0000
Subject: [PATCH 3223/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.14.1 to 3.15.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 65c568e33d0..999509f1d48 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }

From da08236f843c35d9ba1833256e6f6962e7b96779 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 15:56:20 +0000
Subject: [PATCH 3224/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.12.1 to 4.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.13.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 c5785090414..e6da91066b2 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.12.1')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.13.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From 18202e44b370a906d5b334c4d4be3f338291b4aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 15:56:20 +0000
Subject: [PATCH 3225/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.12.1 to 4.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.13.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 5570b2e3167..c455882dc40 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.12.1"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.13.0"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 18a0948dbc14e15b4ee5c1395fcc9ec89edefd06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 15:56:22 +0000
Subject: [PATCH 3226/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /modules/selenium

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.12.1 to 4.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.13.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 10053a60f09..42f21362533 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
 
-    testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.12.1')
+    testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.13.0')
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-edge-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-support'

From 7d57568d2af1a03265d2eb14b13f95a697740c24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 15:56:33 +0000
Subject: [PATCH 3227/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.14.1 to 3.15.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 07fe8cb8daf..ff39bb04111 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 65c568e33d0..999509f1d48 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }

From de0463a8b286596429f626a4a313fac517d3d339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 26 Sep 2023 10:10:02 -0600
Subject: [PATCH 3228/4969] Add section for dependency upgrades in PR template
 (#7577)

Add a note about PR for dependency upgrades are not needed as
those are handled by dependabot in a weekly basis.
---
 .github/pull_request_template.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d2bc55851cb..8584eb39b45 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,6 +8,11 @@ Also, add it to `dependabot.yml` and `labeler.yml`.
 
 Before committing, please run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
 
+Dependency Upgrades:
+Please do not open a pull request to update only a version dependency. Existing process will perform
+the upgrade every week. However, if the upgrade involves more changes (changes for deprecated API) then
+your pull request is very welcome.
+
 Describing Your Changes:
 
 If, after having reviewed the notes above, you're ready to submit your pull request, please

From f64bea7d618a309bdfb7972e13870ad534b81978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 26 Sep 2023 11:49:19 -0600
Subject: [PATCH 3229/4969] Skip CI workflows when GH files are modified
 (#7586)

---
 .github/workflows/ci-docker-wormhole.yml | 6 ++++++
 .github/workflows/ci-rootless.yml        | 6 ++++++
 .github/workflows/ci.yml                 | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index f7d1cb0850a..23a491ba512 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -3,6 +3,9 @@ name: CI-Docker-Wormhole
 on:
   pull_request:
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
       - 'docs/**/*.css'
       - 'docs/**/*.html'
       - 'docs/**/*.ico'
@@ -16,6 +19,9 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
       - 'docs/**/*.css'
       - 'docs/**/*.html'
       - 'docs/**/*.ico'
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 061cde6b83a..f2ff80a2ca8 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -3,6 +3,9 @@ name: CI-Docker-Rootless
 on:
   pull_request:
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
       - 'docs/**/*.css'
       - 'docs/**/*.html'
       - 'docs/**/*.ico'
@@ -16,6 +19,9 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
       - 'docs/**/*.css'
       - 'docs/**/*.html'
       - 'docs/**/*.ico'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7bbfce9bbb0..25766d668fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,9 @@ name: CI
 on:
   pull_request:
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
       - 'docs/**/*.css'
       - 'docs/**/*.html'
       - 'docs/**/*.ico'
@@ -16,6 +19,9 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
       - 'docs/**/*.css'
       - 'docs/**/*.html'
       - 'docs/**/*.ico'

From 8b6776c97b9e59ba46f4568471dc9d8742a79f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 27 Sep 2023 11:06:52 -0600
Subject: [PATCH 3230/4969] Allow to define a custom ImagePullPolicy via
 configuration (#7520)

Use `pull.policy` in configuration file.
---
 .../org/testcontainers/images/PullPolicy.java | 46 +++++++++++++++-
 .../images/RemoteDockerImage.java             |  2 +-
 .../utility/TestcontainersConfiguration.java  |  4 ++
 .../images/OverrideImagePullPolicyTest.java   | 54 +++++++++++++++++++
 .../utility/FakeImagePullPolicy.java          | 12 +++++
 docs/features/advanced_options.md             |  9 ++++
 6 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
 create mode 100644 core/src/test/java/org/testcontainers/utility/FakeImagePullPolicy.java

diff --git a/core/src/main/java/org/testcontainers/images/PullPolicy.java b/core/src/main/java/org/testcontainers/images/PullPolicy.java
index a8b8344a8c2..12d05b6fe5a 100644
--- a/core/src/main/java/org/testcontainers/images/PullPolicy.java
+++ b/core/src/main/java/org/testcontainers/images/PullPolicy.java
@@ -1,6 +1,9 @@
 package org.testcontainers.images;
 
+import com.google.common.annotations.VisibleForTesting;
 import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.time.Duration;
 
@@ -8,15 +11,54 @@
  * Convenience class with logic for building common {@link ImagePullPolicy} instances.
  *
  */
+@Slf4j
 @UtilityClass
 public class PullPolicy {
 
+    @VisibleForTesting
+    static ImagePullPolicy instance;
+
+    @VisibleForTesting
+    static ImagePullPolicy defaultImplementation = new DefaultPullPolicy();
+
     /**
      * Convenience method for returning the {@link DefaultPullPolicy} default image pull policy
      * @return {@link ImagePullPolicy}
      */
-    public static ImagePullPolicy defaultPolicy() {
-        return new DefaultPullPolicy();
+    public static synchronized ImagePullPolicy defaultPolicy() {
+        if (instance != null) {
+            return instance;
+        }
+
+        String imagePullPolicyClassName = TestcontainersConfiguration.getInstance().getImagePullPolicy();
+        if (imagePullPolicyClassName != null) {
+            log.debug("Attempting to instantiate an ImagePullPolicy with class: {}", imagePullPolicyClassName);
+            ImagePullPolicy configuredInstance;
+            try {
+                configuredInstance =
+                    (ImagePullPolicy) Thread
+                        .currentThread()
+                        .getContextClassLoader()
+                        .loadClass(imagePullPolicyClassName)
+                        .getConstructor()
+                        .newInstance();
+            } catch (Exception e) {
+                throw new IllegalArgumentException(
+                    "Configured ImagePullPolicy could not be loaded: " + imagePullPolicyClassName,
+                    e
+                );
+            }
+
+            log.info("Found configured Image Pull Policy: {}", configuredInstance.getClass());
+
+            instance = configuredInstance;
+        } else {
+            instance = defaultImplementation;
+        }
+
+        log.info("Image pull policy will be performed by: {}", instance);
+
+        return instance;
     }
 
     /**
diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 8e61ea58013..78a0e2a583c 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -35,7 +35,7 @@ public class RemoteDockerImage extends LazyFuture<String> {
     private Future<DockerImageName> imageNameFuture;
 
     @With
-    private ImagePullPolicy imagePullPolicy = PullPolicy.defaultPolicy();
+    ImagePullPolicy imagePullPolicy = PullPolicy.defaultPolicy();
 
     @With
     private ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index a96f373d454..921e36f80cd 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -213,6 +213,10 @@ public String getImageSubstitutorClassName() {
         return getEnvVarOrProperty("image.substitutor", null);
     }
 
+    public String getImagePullPolicy() {
+        return getEnvVarOrProperty("pull.policy", null);
+    }
+
     public Integer getClientPingTimeout() {
         return Integer.parseInt(getEnvVarOrProperty("client.ping.timeout", "10"));
     }
diff --git a/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
new file mode 100644
index 00000000000..3b410fd5ab9
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
@@ -0,0 +1,54 @@
+package org.testcontainers.images;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.testcontainers.DockerRegistryContainer;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.FakeImagePullPolicy;
+import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class OverrideImagePullPolicyTest {
+
+    @Rule
+    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
+
+    private ImagePullPolicy originalInstance;
+
+    private ImagePullPolicy originalDefaultImplementation;
+
+    @Before
+    public void setUp() {
+        this.originalInstance = PullPolicy.instance;
+        this.originalDefaultImplementation = PullPolicy.defaultImplementation;
+        PullPolicy.instance = null;
+        PullPolicy.defaultImplementation = Mockito.mock(ImagePullPolicy.class);
+    }
+
+    @After
+    public void tearDown() {
+        PullPolicy.instance = originalInstance;
+        PullPolicy.defaultImplementation = originalDefaultImplementation;
+    }
+
+    @Test
+    public void simpleConfigurationTest() {
+        Mockito
+            .doReturn(FakeImagePullPolicy.class.getCanonicalName())
+            .when(TestcontainersConfiguration.getInstance())
+            .getImagePullPolicy();
+
+        try (DockerRegistryContainer registry = new DockerRegistryContainer()) {
+            registry.start();
+            GenericContainer<?> container = new GenericContainer<>(registry.createImage()).withExposedPorts(8080);
+            container.start();
+            assertThat(container.getImage().imagePullPolicy).isInstanceOf(FakeImagePullPolicy.class);
+            container.stop();
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/FakeImagePullPolicy.java b/core/src/test/java/org/testcontainers/utility/FakeImagePullPolicy.java
new file mode 100644
index 00000000000..5ecead64d4e
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/FakeImagePullPolicy.java
@@ -0,0 +1,12 @@
+package org.testcontainers.utility;
+
+import org.testcontainers.images.AbstractImagePullPolicy;
+import org.testcontainers.images.ImageData;
+
+public class FakeImagePullPolicy extends AbstractImagePullPolicy {
+
+    @Override
+    protected boolean shouldPullCached(DockerImageName imageName, ImageData localImageData) {
+        return false;
+    }
+}
diff --git a/docs/features/advanced_options.md b/docs/features/advanced_options.md
index cd9c57f99eb..9dd86edccd5 100644
--- a/docs/features/advanced_options.md
+++ b/docs/features/advanced_options.md
@@ -31,6 +31,15 @@ It is possible to specify an Image Pull Policy to determine at runtime whether a
 [Custom image pull policy](../../core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java) inside_block:custom_image_pull_policy
 <!--/codeinclude-->
 
+You can also configure Testcontainers to use your custom implementation by using `pull.policy`
+
+=== "`src/test/resources/testcontainers.properties`"
+    ```text
+    pull.policy=com.mycompany.testcontainers.ExampleImagePullPolicy
+    ```
+
+Please see [the documentation on configuration mechanisms](./configuration.md) for more information.
+
 ## Customizing the container
 
 ### Using docker-java

From 209ab2ee929772d9d6ccda2b0f91c69426c9e0cd Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 27 Sep 2023 22:12:16 +0200
Subject: [PATCH 3231/4969] Add docs for `copyFile` API (#4661)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sumit Anvekar <2293969+sumitanvekar@users.noreply.github.com>
Co-authored-by: Richard North <rich.north@gmail.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/GenericContainerTest.java      |  4 +++
 .../junit/CopyFileToContainerTest.java        | 31 +++++++++++++++---
 docs/features/files.md                        | 32 +++++++++++++++++++
 3 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 2d30fe98eeb..fb0b216bce2 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -82,11 +82,13 @@ public void shouldReportErrorAfterWait() {
     @Test
     public void shouldCopyTransferableAsFile() {
         try (
+            // transferableFile {
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
                 .withCopyToContainer(Transferable.of("test"), "/tmp/test")
                 .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
                 .withCommand("sh", "-c", "grep -q test /tmp/test && exit 100")
+            // }
         ) {
             assertThatThrownBy(container::start)
                 .hasStackTraceContaining("Wait strategy failed. Container exited with code 100")
@@ -97,11 +99,13 @@ public void shouldCopyTransferableAsFile() {
     @Test
     public void shouldCopyTransferableAsFileWithFileMode() {
         try (
+            // transferableWithFileMode {
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
                 .withCopyToContainer(Transferable.of("test", 0777), "/tmp/test")
                 .waitingFor(new WaitForExitedState(state -> state.getExitCodeLong() > 0))
                 .withCommand("sh", "-c", "ls -ll /tmp | grep '\\-rwxrwxrwx\\|test' && exit 100")
+            // }
         ) {
             assertThatThrownBy(container::start)
                 .hasStackTraceContaining("Wait strategy failed. Container exited with code 100")
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index 92cf5f72154..1aa017d6894 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -1,5 +1,8 @@
 package org.testcontainers.junit;
 
+import com.google.common.io.Files;
+import com.google.common.io.Resources;
+import org.junit.Before;
 import org.junit.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.BindMode;
@@ -7,6 +10,7 @@
 import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.utility.MountableFile;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
@@ -14,21 +18,40 @@
 
 public class CopyFileToContainerTest {
 
-    private static String containerPath = "/tmp/mappable-resource/";
+    private static String destinationOnHost;
+
+    private static String directoryInContainer = "/tmp/mappable-resource/";
 
     private static String fileName = "test-resource.txt";
 
+    @Before
+    public void setup() throws IOException {
+        destinationOnHost = File.createTempFile("testcontainers", null).getAbsolutePath();
+    }
+
     @Test
     public void checkFileCopied() throws IOException, InterruptedException {
         try (
+            // copyToContainer {
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("sleep", "3000")
-                .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("/mappable-resource/"),
+                    directoryInContainer
+                )
+            // }
         ) {
             container.start();
-            String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
+            String filesList = container.execInContainer("ls", directoryInContainer).getStdout();
             assertThat(filesList).as("file list contains the file").contains(fileName);
+
+            // copyFileFromContainer {
+            container.copyFileFromContainer(directoryInContainer + fileName, destinationOnHost);
+            // }
         }
+
+        assertThat(Files.toByteArray(new File(destinationOnHost)))
+            .isEqualTo(Resources.toByteArray(getClass().getResource("/mappable-resource/" + fileName)));
     }
 
     @Test
@@ -36,7 +59,7 @@ public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("sleep", "3000")
-                .withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
+                .withClasspathResourceMapping("/mappable-resource/", directoryInContainer, BindMode.READ_ONLY)
         ) {
             container.start();
             String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
diff --git a/docs/features/files.md b/docs/features/files.md
index 7e5f07b3059..43dd5d276d0 100644
--- a/docs/features/files.md
+++ b/docs/features/files.md
@@ -1,5 +1,36 @@
 # Files and volumes
 
+## Copying files
+
+Files can be copied into the container before startup, or can be copied from the container after the container has started.
+
+!!! note
+    This is the recommended approach for portability cross-docker environments.
+
+### Copying to a container before startup
+
+<!--codeinclude-->
+[Copying files using MountableFile](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyToContainer
+<!--/codeinclude-->
+
+Using `Transferable`, file content will be placed in the specified location.
+
+<!--codeinclude-->
+[Copying files using Transferable](../../core/src/test/java/org/testcontainers/containers/GenericContainerTest.java) inside_block:transferableFile
+<!--/codeinclude-->
+
+Setting file mode is also possible. 
+
+<!--codeinclude-->
+[Copying files using Transferable with file mode](../../core/src/test/java/org/testcontainers/containers/GenericContainerTest.java) inside_block:transferableWithFileMode
+<!--/codeinclude-->
+
+### Copying a file from a running container
+
+<!--codeinclude-->
+[Copying files from a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyFileFromContainer
+<!--/codeinclude-->
+
 ## File mapping
 
 It is possible to map a file or directory from your FileSystem into the container as a volume using `withFileSystemBind`:
@@ -18,3 +49,4 @@ new GenericContainer(...)
                                       "/etc/redis.conf",
                                       BindMode.READ_ONLY)
 ```
+

From 202680e8a8dfa42b550df508d4e001e0b01eedbb Mon Sep 17 00:00:00 2001
From: Sunil Singh <sunil.singh@suse.com>
Date: Thu, 28 Sep 2023 08:00:10 -0700
Subject: [PATCH 3232/4969] Proposing Update to index.md - Env Settings for
 Rancher Desktop (#7591)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/supported_docker_environment/index.md | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 591be528e0e..1dc816936c0 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -60,6 +60,34 @@ export TESTCONTAINERS_RYUK_DISABLED=true
     Previous to version 1.19.0, `export TESTCONTAINERS_RYUK_PRIVILEGED=true`
     was required for rootful mode. Starting with 1.19.0, this is no longer required.
 
+## Rancher Desktop
+
+In order to run testcontainers against [Rancher Desktop](https://rancherdesktop.io/) the env vars below should be set.
+
+If you're running Rancher Desktop as an administrator in a MacOS (M1) machine:
+
+Using QEMU emulation
+
+```bash
+export TESTCONTAINERS_HOST_OVERRIDE=$(rdctl shell ip a show rd0 | awk '/inet / {sub("/.*",""); print $2}')
+```
+
+Using VZ emulation
+
+```bash
+export TESTCONTAINERS_HOST_OVERRIDE=$(rdctl shell ip a show vznat | awk '/inet / {sub("/.*",""); print $2}')
+```
+
+If you're not running Rancher Desktop as an administrator in a MacOS (M1) machine:
+
+Using VZ emulation
+
+```bash
+export DOCKER_HOST=unix://$HOME/.rd/docker.sock
+export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
+export TESTCONTAINERS_HOST_OVERRIDE=$(rdctl shell ip a show vznat | awk '/inet / {sub("/.*",""); print $2}')
+```
+
 ## Docker environment discovery
 
 Testcontainers will try to connect to a Docker daemon using the following strategies in order:

From 4296b5beb6cb7e072f63a91b1b70f352e80f3ad9 Mon Sep 17 00:00:00 2001
From: Luca Burgazzoli <lburgazzoli@users.noreply.github.com>
Date: Thu, 28 Sep 2023 21:36:02 +0200
Subject: [PATCH 3233/4969] Additional listeners should inherit the configured
 authentication method (#7594)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../redpanda/RedpandaContainer.java           |  1 +
 .../testcontainers/redpanda.yaml.ftl          |  1 +
 .../redpanda/RedpandaContainerTest.java       | 79 +++++++++++++++++++
 3 files changed, 81 insertions(+)

diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index bc18d01fbda..f2cba1a1ba1 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -232,6 +232,7 @@ private Transferable getRedpandaFile(Configuration cfg) {
                     Map<String, Object> listenerMap = new HashMap<>();
                     listenerMap.put("address", listener.getAddress());
                     listenerMap.put("port", listener.getPort());
+                    listenerMap.put("authentication_method", this.authenticationMethod);
                     return listenerMap;
                 })
                 .collect(Collectors.toList());
diff --git a/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl b/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
index 6e0c124eb5c..457a3738652 100644
--- a/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
+++ b/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
@@ -25,6 +25,7 @@ redpanda:
     - address: 0.0.0.0
       name: ${listener.address}
       port: ${listener.port}
+      authentication_method: ${listener.authentication_method}
 </#list>
 
   advertised_kafka_api:
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index d0f13d0952a..d6555236003 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -31,6 +31,7 @@
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -138,6 +139,84 @@ public void testUsageWithListener() throws Exception {
         }
     }
 
+    @Test
+    public void testUsageWithListenerAndSasl() throws Exception {
+        final String username = "panda";
+        final String password = "pandapass";
+        final String algorithm = "SCRAM-SHA-256";
+
+        try (
+            Network network = Network.newNetwork();
+            RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .enableAuthorization()
+                .enableSasl()
+                .withSuperuser("panda")
+                .withListener(() -> "my-panda:29092")
+                .withNetwork(network);
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+                .withCreateContainerCmdModifier(cmd -> {
+                    cmd.withEntrypoint("sh");
+                })
+                .withCopyToContainer(Transferable.of("Message produced by kcat"), "/data/msgs.txt")
+                .withNetwork(network)
+                .withCommand("-c", "tail -f /dev/null")
+        ) {
+            redpanda.start();
+
+            String adminUrl = String.format("%s/v1/security/users", redpanda.getAdminAddress());
+            Map<String, String> params = new HashMap<>();
+            params.put("username", username);
+            params.put("password", password);
+            params.put("algorithm", algorithm);
+
+            RestAssured.given().contentType("application/json").body(params).post(adminUrl).then().statusCode(200);
+
+            kcat.start();
+
+            kcat.execInContainer(
+                "kcat",
+                "-b",
+                "my-panda:29092",
+                "-X",
+                "security.protocol=SASL_PLAINTEXT",
+                "-X",
+                "sasl.mechanisms=" + algorithm,
+                "-X",
+                "sasl.username=" + username,
+                "-X",
+                "sasl.password=" + password,
+                "-t",
+                "msgs",
+                "-P",
+                "-l",
+                "/data/msgs.txt"
+            );
+
+            String stdout = kcat
+                .execInContainer(
+                    "kcat",
+                    "-b",
+                    "my-panda:29092",
+                    "-X",
+                    "security.protocol=SASL_PLAINTEXT",
+                    "-X",
+                    "sasl.mechanisms=" + algorithm,
+                    "-X",
+                    "sasl.username=" + username,
+                    "-X",
+                    "sasl.password=" + password,
+                    "-C",
+                    "-t",
+                    "msgs",
+                    "-c",
+                    "1"
+                )
+                .getStdout();
+
+            assertThat(stdout).contains("Message produced by kcat");
+        }
+    }
+
     @SneakyThrows
     @Test
     public void enableSaslWithSuccessfulTopicCreation() {

From 4c83a54331a1de3c4c5a71a6a1e2b617cd704dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 28 Sep 2023 15:07:20 -0500
Subject: [PATCH 3234/4969] Deprecate CLI utility methods in RabbitMQ module
 (#7588)

---
 .../containers/RabbitMQContainer.java         | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 6c1fa919316..bac998b85ac 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -216,6 +216,10 @@ public RabbitMQContainer withSSL(
             .withCopyFileToContainer(keyFile, "/etc/rabbitmq/rabbitmq_key.pem");
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withPluginsEnabled(String... pluginNames) {
         List<String> command = new ArrayList<>(Arrays.asList("rabbitmq-plugins", "enable"));
         command.addAll(Arrays.asList(pluginNames));
@@ -223,6 +227,10 @@ public RabbitMQContainer withPluginsEnabled(String... pluginNames) {
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withBinding(String source, String destination) {
         values.add(
             Arrays.asList("rabbitmqadmin", "declare", "binding", "source=" + source, "destination=" + destination)
@@ -230,6 +238,10 @@ public RabbitMQContainer withBinding(String source, String destination) {
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withBinding(String vhost, String source, String destination) {
         values.add(
             Arrays.asList(
@@ -244,6 +256,10 @@ public RabbitMQContainer withBinding(String vhost, String source, String destina
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withBinding(
         String source,
         String destination,
@@ -266,6 +282,10 @@ public RabbitMQContainer withBinding(
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withBinding(
         String vhost,
         String source,
@@ -290,6 +310,10 @@ public RabbitMQContainer withBinding(
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withParameter(String component, String name, String value) {
         values.add(
             Arrays.asList(
@@ -304,6 +328,10 @@ public RabbitMQContainer withParameter(String component, String name, String val
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withPermission(String vhost, String user, String configure, String write, String read) {
         values.add(
             Arrays.asList(
@@ -320,11 +348,19 @@ public RabbitMQContainer withPermission(String vhost, String user, String config
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withUser(String name, String password) {
         values.add(Arrays.asList("rabbitmqadmin", "declare", "user", "name=" + name, "password=" + password, "tags="));
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withUser(String name, String password, Set<String> tags) {
         values.add(
             Arrays.asList(
@@ -339,6 +375,10 @@ public RabbitMQContainer withUser(String name, String password, Set<String> tags
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Object> definition) {
         values.add(
             Arrays.asList(
@@ -353,6 +393,10 @@ public RabbitMQContainer withPolicy(String name, String pattern, Map<String, Obj
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withPolicy(String vhost, String name, String pattern, Map<String, Object> definition) {
         values.add(
             Arrays.asList(
@@ -368,6 +412,10 @@ public RabbitMQContainer withPolicy(String vhost, String name, String pattern, M
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withPolicy(
         String name,
         String pattern,
@@ -390,6 +438,10 @@ public RabbitMQContainer withPolicy(
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withOperatorPolicy(String name, String pattern, Map<String, Object> definition) {
         values.add(
             new ArrayList<>(
@@ -406,6 +458,10 @@ public RabbitMQContainer withOperatorPolicy(String name, String pattern, Map<Str
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withOperatorPolicy(
         String name,
         String pattern,
@@ -428,16 +484,28 @@ public RabbitMQContainer withOperatorPolicy(
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withVhost(String name) {
         values.add(Arrays.asList("rabbitmqadmin", "declare", "vhost", "name=" + name));
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withVhost(String name, boolean tracing) {
         values.add(Arrays.asList("rabbitmqadmin", "declare", "vhost", "name=" + name, "tracing=" + tracing));
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withVhostLimit(String vhost, String name, int value) {
         values.add(
             Arrays.asList("rabbitmqadmin", "declare", "vhost_limit", "vhost=" + vhost, "name=" + name, "value=" + value)
@@ -445,16 +513,28 @@ public RabbitMQContainer withVhostLimit(String vhost, String name, int value) {
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withQueue(String name) {
         values.add(Arrays.asList("rabbitmqadmin", "declare", "queue", "name=" + name));
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withQueue(String vhost, String name) {
         values.add(Arrays.asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue", "name=" + name));
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withQueue(
         String name,
         boolean autoDelete,
@@ -475,6 +555,10 @@ public RabbitMQContainer withQueue(
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withQueue(
         String vhost,
         String name,
@@ -497,11 +581,19 @@ public RabbitMQContainer withQueue(
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withExchange(String name, String type) {
         values.add(Arrays.asList("rabbitmqadmin", "declare", "exchange", "name=" + name, "type=" + type));
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withExchange(String vhost, String name, String type) {
         values.add(
             Arrays.asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "exchange", "name=" + name, "type=" + type)
@@ -509,6 +601,10 @@ public RabbitMQContainer withExchange(String vhost, String name, String type) {
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withExchange(
         String name,
         String type,
@@ -533,6 +629,10 @@ public RabbitMQContainer withExchange(
         return self();
     }
 
+    /**
+     * @deprecated use {@link #execInContainer(String...)} instead
+     */
+    @Deprecated
     public RabbitMQContainer withExchange(
         String vhost,
         String name,

From dd1427ebd30bbaba7f32184f1376b7c21e725ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 29 Sep 2023 14:40:16 -0600
Subject: [PATCH 3235/4969] Add maven central badge in readme file

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index bb3514e01e4..521abac691c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Testcontainers
 
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.testcontainers/testcontainers/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.testcontainers/testcontainers)
+
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=33816473&machine=standardLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs)
 
 [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)

From a1b6508b79546071712bbdb87b08d3ef8cfe0a79 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:35:07 -0600
Subject: [PATCH 3236/4969] [create-pull-request] automated change (#7601)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d87e0f5ba84..6671acffc73 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.19.0
+testcontainers.version=1.19.1

From 375ece0eb62a1750c4f3b691384ec73fbdce9d32 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:35:22 -0600
Subject: [PATCH 3237/4969] [create-pull-request] automated change (#7600)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 183685e8a18..e6dd8dbb412 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -122,4 +122,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.0
+    latest_version: 1.19.1

From 524b1acf5d56756ebaba4739e132176491c871a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:06:26 +0000
Subject: [PATCH 3238/4969] Bump redis.clients:jedis from 5.0.0 to 5.0.1 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7fb5c262f49..d0fb3814d9c 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.0.0'
+    testImplementation 'redis.clients:jedis:5.0.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From d8c71beb6121dddaf53f3277914f874117b18f5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:13:38 +0000
Subject: [PATCH 3239/4969] Bump com.azure:azure-cosmos from 4.49.0 to 4.51.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.49.0 to 4.51.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.49.0...azure-cosmos_4.51.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 69dc6612a1d..15a69b8d53a 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.49.0'
+    testImplementation 'com.azure:azure-cosmos:4.51.0'
 }

From e982c700f45f032d21767dcbdff378f2b3767b63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:30:23 +0000
Subject: [PATCH 3240/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin in /examples

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.11.2 to 1.11.3.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index ff39bb04111..be16da3fb04 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 999509f1d48..bad7418a8ef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

From 0e1a82db13eebb3528744613a833c4b49612a5d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:30:31 +0000
Subject: [PATCH 3241/4969] Bump redis.clients:jedis from 5.0.0 to 5.0.1 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 00eca58b847..e549df89dd8 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.0'
+    implementation 'redis.clients:jedis:5.0.1'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index c212bd6833f..49447a483c9 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.0'
+    implementation 'redis.clients:jedis:5.0.1'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 909e58fe170..e56caac148b 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.0.0'
+    implementation 'redis.clients:jedis:5.0.1'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 38aa7a895db952ff75710705d20be452f8dc7170 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:31:33 +0000
Subject: [PATCH 3242/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.23.0 to 26.24.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.23.0...v26.24.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index e26a5ef6eee..b32e62293fc 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.23.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.24.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From df5705a92f9963fe4cd064ca8db061a59fc9ca85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:41:23 +0000
Subject: [PATCH 3243/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.11.2 to 1.11.3.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 999509f1d48..bad7418a8ef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

From 6ab1ff1ff651be7baa86e5196f91077a89cd1a9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:43:46 +0000
Subject: [PATCH 3244/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 23.2.0.0 to 23.3.0.23.09.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index f5704d93454..4bcf8adbfed 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.2.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 

From 1ebe67087f897b3b4b18b75c63f9f982171474b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:45:31 +0000
Subject: [PATCH 3245/4969] Bump commons-io:commons-io from 2.13.0 to 2.14.0 in
 /modules/hivemq

Bumps commons-io:commons-io from 2.13.0 to 2.14.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 9e5c13e02ce..d8372c30f1c 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.0.1")
 
     shaded("org.apache.commons:commons-lang3:3.13.0")
-    shaded("commons-io:commons-io:2.13.0")
+    shaded("commons-io:commons-io:2.14.0")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From a99208319be115649b3c7ae9deb66ff725fd4c10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:47:09 +0000
Subject: [PATCH 3246/4969] Bump io.trino:trino-jdbc from 426 to 427 in
 /modules/trino

Bumps io.trino:trino-jdbc from 426 to 427.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index c6415477c1a..0e166cc26b9 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:426'
+    testRuntimeOnly 'io.trino:trino-jdbc:427'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From c3e0b03130976d37e9e95a3d5b346c536cb8a3cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:48:27 +0000
Subject: [PATCH 3247/4969] Bump com.rabbitmq:amqp-client from 5.18.0 to 5.19.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.18.0 to 5.19.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.18.0...v5.19.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index b4ed66c2852..89012496b28 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:5.0.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.18.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.19.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 7b95ae75b6e78b81d8bc2defbc525b071bf5c8fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:49:51 +0000
Subject: [PATCH 3248/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.557 to 1.12.560.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.557...1.12.560)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 b44eba88080..adfbb37d5e2 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 2ee9d32818435576e8bc89621f684c6d16f2e976 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:56:40 +0000
Subject: [PATCH 3249/4969] Bump com.rabbitmq:amqp-client from 5.18.0 to 5.19.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.18.0 to 5.19.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.18.0...v5.19.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 06403818c22..d9efe94d263 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.18.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.19.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From aa1e051c8401a0d982525288adcd1e84023825bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:57:13 +0000
Subject: [PATCH 3250/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.154 to 2.20.157.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9290e01a1a7..b6db28b5553 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.154'
+    testImplementation 'software.amazon.awssdk:s3:2.20.157'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From d17a00b73a786f55e64eecad559cf785d603e05f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:57:24 +0000
Subject: [PATCH 3251/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.557 to 1.12.560.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.557...1.12.560)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 9290e01a1a7..a4f0fa41150 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.557")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.560")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From 2b3c215861226ebd8f56432b9d57bbfe783e9dac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:01:27 +0000
Subject: [PATCH 3252/4969] Bump redis.clients:jedis from 5.0.0 to 5.0.1 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 89012496b28..783ac07b28b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:5.0.0'
+    testImplementation 'redis.clients:jedis:5.0.1'
     testImplementation 'com.rabbitmq:amqp-client:5.19.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From f3ccf254f19140a716221c530ca6d31d4fe5a985 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:03:59 +0000
Subject: [PATCH 3253/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.157 to 2.20.162.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c1d546381ae..6db0b1bb2d8 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.157'
+    testImplementation 'software.amazon.awssdk:s3:2.20.162'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 6f506fcb81cce14a6d8069cbdb1013e42003dbb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:04:12 +0000
Subject: [PATCH 3254/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.560 to 1.12.565.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.560...1.12.565)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 c1d546381ae..17cad0a4315 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.560")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.565")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From b7deb73f70f6825e2fdb2c50ffd67a80ca4d46fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:08:18 +0000
Subject: [PATCH 3255/4969] Bump io.asyncer:r2dbc-mysql from 1.0.3 to 1.0.4 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-1.0.3...r2dbc-mysql-1.0.4)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index bf8ba2d8adb..9104d3cbba6 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:1.0.3'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.0.4'
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.3'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.4'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From a4604d875228a527ea50d81c1c8a3c987ca47a8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:10:09 +0000
Subject: [PATCH 3256/4969] Bump io.trino:trino-jdbc from 427 to 428 in
 /modules/trino

Bumps io.trino:trino-jdbc from 427 to 428.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 0e166cc26b9..87bc2d1cdd4 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:427'
+    testRuntimeOnly 'io.trino:trino-jdbc:428'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From a8d2e5d4ac57a668f2153f97d560d2af9231eed6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:22:03 +0000
Subject: [PATCH 3257/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.10 to 3.4.11.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/commits/java-client-3.4.11)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 33c830612a9..3c6d06136f8 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.10'
+    testImplementation 'com.couchbase.client:java-client:3.4.11'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From b008a33096f281a40bf873a1adc8354362e85b36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:25:38 +0000
Subject: [PATCH 3258/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.5.1 to 3.6.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index a121eaaddac..d536dbfd526 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.6.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From b6172f2175610b45aff4a023a56712a5d6bb65da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:28:02 +0000
Subject: [PATCH 3259/4969] Bump io.fabric8:kubernetes-client from 6.8.1 to
 6.9.0 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.8.1 to 6.9.0.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.8.1...v6.9.0)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 5a187355fe6..e68dead14ff 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.8.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.9.0'
     testImplementation 'io.kubernetes:client-java:18.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9e5dff2dc36ce1cced815a3f1c6bd28cd7511b27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:40:35 +0000
Subject: [PATCH 3260/4969] Bump io.codenotary:immudb4j from 1.0.0 to 1.0.1 in
 /examples

Bumps [io.codenotary:immudb4j](https://github.com/codenotary/immudb4j) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/codenotary/immudb4j/releases)
- [Commits](https://github.com/codenotary/immudb4j/compare/1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: io.codenotary:immudb4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/immudb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 26c92399935..a91e2b44102 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'io.codenotary:immudb4j:1.0.0'
+    implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From bba7cf5cea3a3dbe1558d91f58525f84b410f0b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:40:38 +0000
Subject: [PATCH 3261/4969] Bump org.apache.kafka:kafka-clients from 3.5.1 to
 3.6.0 in /examples

Bumps org.apache.kafka:kafka-clients from 3.5.1 to 3.6.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index a7bfddbad2d..7050040e2a9 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.30"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.6.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'

From cbb63d5a52e99ea97f170ec4a055a935cae38444 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:40:40 +0000
Subject: [PATCH 3262/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.15 to 3.15.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index be16da3fb04..0256f979f60 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index bad7418a8ef..7d4d9114d2e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }

From 5b2cf09c998f1554b5ebcec7ad048396f23f9d36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:40:46 +0000
Subject: [PATCH 3263/4969] Bump io.nats:jnats from 2.16.14 to 2.17.0 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.16.14 to 2.17.0.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.16.14...2.17.0)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 896d71af14e..5678aefab4d 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.14'
+    testImplementation 'io.nats:jnats:2.17.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'

From 1ea1cd7e98aa3289403671a4aba90de7d99f7bd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:42:33 +0000
Subject: [PATCH 3264/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.560 to 1.12.565.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.560...1.12.565)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 adfbb37d5e2..50c517b30b1 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.565'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.565'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7be52b673b946dbd27172ea615bb50bd2d28c570 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:44:56 +0000
Subject: [PATCH 3265/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/v1.3.2...v1.3.3)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index d8372c30f1c..fcbade04cac 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.20.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.2")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 76bc0b61140076718654bf69e203d95899e3ce71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:48:45 +0000
Subject: [PATCH 3266/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.5.1 to 3.6.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 4a4f5247da0..9a157ce27b9 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.32'
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.6.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.2'
 }

From 07771035c68dc97cb7980a5437a7ab35c00a455d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:53:04 +0000
Subject: [PATCH 3267/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.15 to 3.15.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index bad7418a8ef..7d4d9114d2e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }

From 798404fb121350dae42d075d53bd454a58d0d1ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 22:56:04 +0000
Subject: [PATCH 3268/4969] Bump org.questdb:questdb from 7.3.2 to 7.3.3 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.3.2 to 7.3.3.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.3.2...7.3.3)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 396a926e832..0fdc23da796 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.3.2'
+    testImplementation 'org.questdb:questdb:7.3.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From e55ba226fffbb8aacda0aca60b607099b5e6beb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 11 Oct 2023 13:37:07 -0600
Subject: [PATCH 3269/4969] Update lombok version to 1.18.30

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 83909bd65f0..0acf7a82cc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ subprojects {
     }
 
     lombok {
-        version = '1.18.28'
+        version = '1.18.30'
     }
 
 

From 474e992b1fecf2826ce37bac33859b943c96110c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 11 Oct 2023 13:39:34 -0600
Subject: [PATCH 3270/4969] Update Gradle Wrapper to 8.4 (#7619)

* Update Gradle Wrapper from 8.1.1 to 8.4.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.1.1 to 8.4.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.1.1 to 8.4.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

---------

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 62076 -> 63721 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 ++--
 examples/gradlew                              |  22 +++++++++++-------
 gradle/wrapper/gradle-wrapper.jar             | Bin 62076 -> 63721 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 ++--
 gradlew                                       |  22 +++++++++++-------
 smoke-test/gradle/wrapper/gradle-wrapper.jar  | Bin 62076 -> 63721 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +++-
 smoke-test/gradlew                            |  22 +++++++++++-------
 9 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29d3e0ab67b14947c167a862655af9b..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644
GIT binary patch
delta 37652
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

delta 36122
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
Q>rd#E<Y8bi{`_z2zvXbYu>b%7

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 2c3425d49ec..46671acb6e1 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index aeb74cbb43e..1aa94a42690 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29d3e0ab67b14947c167a862655af9b..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644
GIT binary patch
delta 37652
zcmZ6SQ*<R<@a2<^ZKGq`?v8ES_6=@)W81cE+crB^M;)6zJ?lR+Ykl*69?ru)b*lES
z_Qw&#*)2r<F%jf&1gUA#8Icl*mT(=Lh6d|89P13qOBj-&+#ir2vOos+r8}vEGs(2!
zFrs-w>jNdnQBE-m!q1z)J^6!8liD~E|8k;d@!RKqW+P+c{{A_w4h-Fct^jI*3f}}>
z2Q39vaxe&dYajQhot|R|okxP_$~ju*X0I0#4uyvp5Y5h!UbielGCB{+S&Y%+upGDb
zq|BVDT9Ed2QC(eCsVrrfln`c3G!v|}sr1Y<?p)jWa72*p*04xJWMXfpe&h@(P>02i
z%&LlPps4#Ty_mb$1n|@5Qfpv_+YV$Jdc936HIb{37?{S?l#NH+(Uw<@p6J%2p)un;
z8fSGPL>@VtAl4yv;Y<M~uy9=Hj3y(o_n239j<Qb7Th!TW7IVN|h&$To`!P!1H>O5e
z$ce51CS;`NGd!WVoXeA9vfJC?1>OLi=8DCWBC=^_)V|)E5|B~`jRg01sgJZg#H@DN
z(%3v>_-$+>k5p8l?YQWO0Xnm+Qg}U9W+}Al#c_RurG{H6IF}%vlMobp!nmIFL5{I#
zoF<RK`D0g3MDkd%Tw8+7-WsALl$;ec1HDl!VY^)PjfDX{EDsQ;xM2*O1vP4l#;eA>
z4ytIT@lBphb!xg@+~H<p0bxu<CYkeFVZjz~wh$w!pQ}(HsY$y;2^MjTMi$0~COTig
zR9tmNvZ7Kfgb0MD#Cw97R8ZD!TCBO2Qr!V+)f;Y*^1YC<a*Vs+v{Z^cmM>d9$f>Hh
zUWt4fdi9Gtx|Z%Qfqw2|q5|Nnxh|mer1*VKpI}@@YPdN?TtU6jE;@uhxp8=l?#DTW
z3?}F=_muS@5OK7^63G_i&I}D<?@?#uxthfxv_opqpM&@*OxtC4?3RHKflf;T*l%EK
z)a~SX%GZP391IV>lJCSXGU*&Kq^(h<If7F3-Z$03<js#ym-LxHhQ>gNE-=%%`BAo0
zBU#vb^C+2dcfe0`MDBTc%;9sY8a+%WNboJPY~n<&z)unXq5*0aZ&|aYVl1Am$Xp_c
zU6TBDJ)I1Czr9Fusl92Pkm{EaI=QRi&nIo%&vvPM$PW7gOATu2+6A9&#{E|R8_vZD
zo=}n<O=k*HVqND#CIbs+xpw{ZBHrWFFEAxp2uMsYFj!bHFfd`T4K4(}q!?0R&|d`%
zVbrlcZ^j+~V{<vlS1s%}%{?$I@#u)XxOg=V;Vh{_3+p+6*Eaj6=q;KL&fj=3%7tN=
zn}X=3wW93iqyBWNF7~FTyo`;U&9Ar5PilYdEslKC<)8Sb+Y~VuH26{`i~X1kL`!@Y
zxNKN;1}B9&fZ!PxwL7z!N@)W(kbTtw->NASfxDaaoMiy1+Z0+XD9hN4VaK<7I$rOt
z5^|1qXwt%WJ5}+eQ#RF<vTksjEiHCY)O2yz2_JETzs^Tj$m@bXSLwVFwN($`S!A4K
za~Ve%fk#0aR`gDL;gbW>YSZ*(`YcT-098L^_8q29iO=XfmXO;Z9NHp+;FxUbI$Fg;
zi510A`7H3>G6C##jBjc~Ixv7Rty}TthLu-u<1akLY7djP%xObB2KP!vAp?%YSbD^%
zu=YcbKXUUhzgC;^%P&GvnnDJ&9=Xg%dauiSajot%RIn@(gf);fn@&Ru4)KS47(OdJ
z$h)5lhgOh?n~P1R&)RcABS_Qia>NzjcvP`~C&VU6N2E8OL&X&1=1U2b&N`9o??Yn>
zF<;;DseXn1&2-S!d-L&Z@p7C>>z>}0fA`19kNzf@X6+?<hNdJau7bm{Vrh0pdI@fg
zKZBQa`I9}$FkziaU6eVdM{0id<kW=Os6K5x!9M>iRv;E4ptwF7<VQXKUF5_{!$9Xi
zH7bRSK#Ov4UI#ITff{0zWHvZDtU0KV{25}xQv4nPoo=Xh?%kgNynf!*9^8dgN!n6+
zQA#Kbfz*q&dP8aXfV+5Fu(Ciyi^!UatOB30ae?AQeIG}3NB>UwR@K58#?IR?)HVT8
zl~Dm+bfAIu3_Uc6J6a+zC+(~hEa^(RtRb#jVZn#5;_Fi`yR0K0?3LpaJTu+@7UsX&
z#qUh`Nb;vJ0R=JB!leZl^YGMQ=p^l!6|^I_CMO(I)y+$u>K3zK#wVX08}j>x3CZwp
zlk*ylL1!pfyq)Mh{n_|@TFPDddYx131Jmjk#j{Kh5*L*ig<T}%#Y3;196tymNp*@j
z>|AGXsfKOg#A9=C+CntSIZTb-d{G)j<>I+x8(cr40Xc1%<2LuzauvEDVt6i97SpA6
zsxGPO)MV;#UbwBSPiP{2*4l8o(o6o*tddwUFwx3;(g3Lsp<Oqh9b2^G7OT5RTJn%X
zX3cnMw_Q~n<4X^Es;b)RR;pvYrz)X4;Ynybgq4=;R_h>jtuwUQvC*_4iMDCj+7uNe
z>HNYl12vbCMsk!BRX&lF@neUQF46p|G{+&{RA1VANjF~C@9I6Br_$YAdX+rqwy7+|
zPf=TFt(2f#W6Zb>-7(K%c~P$-E5B%z+?{oOh@b%O6VJEKH^@I;y!78V5vYfx#vL|J
zte^#>+1NkFzOBEu6N-m!uO({kkWTY=oOtt5gF-!78Cb;LJH|+GW=czxXTyUDFBdbg
zw&;1{SfPq|#+>6wJ;@YCj^E*1Z{Wtt;APe=!aZ&)_P~Wq$346{9sl6}#we1s$o+9H
zH2@_Ct7gbH9Oqtdr=IDyUGFHc@}NPiXO$7%44}{^?+MTHPpFs}U1ktHWzj}Bmh7}}
z0r`~t6xa4x#>EyC{l!C;zpw){$b=O||F?$c0b<;(<3p_FLE)z)5kvMz%M$s$!kQ_@
zn7YaOX%*Syd%2nV(t`wfW^U1#TSeTnz~P(CuN9rh$N(BdqHmQpSlbru>&Qzp$!Wk%
z@i17nZv$pOU|V^^=Zs*wcArd+Ig@jr0zuo%Wd)iEO1x#u)m37$r7*KFW9)89oswQ#
zSYKZ^R5ka^d-_*@na|Ow8zNyJ708zX4N6j&jykXV7%hZ|j*C~=m!BN;4KHywBL@+J
zFMVY_D2@vrI@t{z&|1*KsUw>d1SRZ?V>}z7O@%r#Y@yFi4d#!`PKfi>SE6(y7$7?o
zh^&V1d)~1F!w62_{X|LVW2E~`cd+u_koSGZOL**qSQj;OFHOrag&04h*(pJdFN6hx
zh<`idoM?HedX~KoGce-)-;g^Xb;;7#SY~TY0~yH&G~!Kdm$7U4=b5|mk@Ktm{rke$
zRd_nDsKt3|h;WU(v78jFvhvoGaG=F!ZU7;=<enX@*q#sl^0zY?4wo=~_wns~mT7FF
zF;>mve%3PVm+Zsz!^ELnE&b8=*|m;?b*<qpjyjT`hAguCuc#%SD(JodY-gLWli&&^
zutG(Hkki1Xc8CQ<%iDybp%V@e>BQe}|1AK&i+{?<eglIByM_b<lSnegB1$rnfJst1
zrUaF!>MLRhV+uBX*Du$tfT}EnHNpBthR}_xDzZ#PB_ElYd?REZ#@GIbt4a63@b<^e
z0Roi}Zr-Q-sD~v`HAvj{K=fpGi}!iUTfwsL^W_7opUM5+Nom4Vf|-l>{5T=VEoa9`
z$wdiRKM}u~6cGK4Hyv}17PNx+9%x+42m!jaas7pL9uM@LO#WpY_b#a??K_*O@u4As
zNH0$up@AAflGq@Ck)t(XG>@nlrgzJuhUh>K8*K9?5DAIZZ53v-hlF|kK6vrENdAWw
z<*oCApq8wFPL+lLQGuCv0r!I762os)Fb@WTS)7ZCeFb|Zct|UBAa<1<9M|wVu@TfO
zAY@^rrg}Qu{e0z*!oHB!*>jZ}Zm^X;t)`1iOubj30>uC2dHBgCdTcn4*hIt&>mjgs
z@chLwLzCM3Jk`)6J@77;ave;*g27yps*!8eRuZLm<UBKiEr7FmgB#hW+L1mM2yyqg
z@%O7KZCzCu5kZsIL@VnGd&uWW0U0#3N&=fQ|A~iP=fVCKG99~sShaLIffUxuQd#IY
z8(835m?TRbM^<FDCN%IOMF0V%<HBdnqF2_F^^GMAUA&ZWIufgZF|y?CH`Mg!F-m>f
z+~W>kS#<_W3dbNz0z1PI5<%@gMRiLvo9RlIcyf{g<yLWyFnfD@$mVcUvV!FU5fi;o
z*%z?!OYwBJSgU-cZ*Zr07Yc9!LQ|I7#1ckku%u9=#m|8FV*@iuYa~z=<E>TTjZp>n
zCA6CO0>+*AiqzO8qo3-eITXeI1N^_bvwWZ^K!gDU^FT|w=A=#<J|+asXk7rYR<Qo&
z9Q~f1G3!UANKrDT3l7f0fn)aM;1o+9m#-g&CfC5bB1#O%%HUz=2G{+*yeg@iBBVBd
zhYqh(5twK+{H9aY+*0NKI`X%_<%2+v!R<PuqwZ)>{^cmmW%f^#;Yr)G(EHZ=8TYj>
zSU%DrTk1YIp0WUqaalA-#p+mWV?;DN3=)M8r7Oej=b#Z}Xs{p~wrO27JcTDGW`H(0
z!qD_Xd^F$s$C;GWMER%{<a>I%p#(W`>Mg=YV%ztG2Bf&VQByR5*<=W;(~&w450Sw-
z&v)+bPcx|8L2x+5rc-uwKl**(w@A)E_^BHgze1&B1!a?Kcro8Vf7s-=ujFiEi}=4W
zvQ80O;nlZ@sW?VZ$D}IQT1l~EunsL>ui8nrr5#Py;lRFQLppSXmNScPVcjw`_=j7P
zC6G&zna5UjbOxVD{Q?%G!F`(<@txVX)Rb&Ci&WIc+boK)Vx(P@Y8^%#E9tp2FzsL7
zN|ujIll!%^2cqT#x#Uyw0QsvnjnYFmnVc&9Ld&rvD|uMh`9B(k0+h;9@|U*z83Zc|
z^gDgyTIr>eE7P&o5`8o6Z-74$JA$Bv)q6&oCFFOj1RmC~f%)|`q|~|=VS@4ai}IRA
zrk`paX)_$nXpBX5HkEt<+QYcJn>9!<Wmz)~^LA~LyC;bt`fpPgmUb>r{#OpG*?**E
zF4DG7h+-+ilK6_$ewPrM*B&FEKdt7gB^xtmpUu&pu~YsM){ycr7!-yBp}ssn|2T<s
zY4h^bZgk{DsS#+ttq%-K(F<Fe|LOm%L(5;gYwToHRd&PS!bh|2|NZ_(GN5DQ{HosG
z{zn>*<EQihs79+QADj_BwMe~S3KSBUqE%#sVDb$~6G)u{ne{aCNK#23cv(tuS@p$O
zvAV+NW;3`*w9>4%vhs9ZX;FE0WM5iEo7Jrgyj(au+Q_^8*7aN%nC2v9BpOz6E;@Ae
z6`jsk$$MUJAA<`gSa8*9$LWW)G=q*z?}1lGb2_RIg8vFk4<rwl=Ao<ar1`ZSdZ@(o
z`YIxcTpQ>Kb@u0;H9#xQjVQLVD3rgP%9YxIfY>cZQp1Um8nZhx30;Bqg<gT4CrA|D
zVCVw=YgE|gT7gnOXp-4<MOo5KH;?Kk{7%0%6v)zOXIR%0{FYvNfH!u;vzu|B2)sp0
zpSIl}#2Uc4=BW?gEZ;PLAN(6LpL6DP6xAwQx&whBXNOUO+qD&}OK*EsZ>qHI=dBJ-
zdDdvni6NaU&Ju2^7K*hiXC33bnfox+8vbL>w;of20_c&+q)y&FWUtoFa-yRj_~F%*
z=t;#(7UlA4%Fm}#R5c575CsnOc(YVYm$s!TAdo@;(UJrBnhU)PuuD)E^o@HJN32XF
zYRqj+d$AM1tACioZZ8YvrXci@ELZr9ACNU$1_KXS?$MRCcwM*ZcE)&wi_#<?Sj_Ap
zqEWIi?kl!xW|G+(3@{;JW$Q4=q0X)aS0O>NLH;2<UVJA1nh$d}luwPm0SptdxNfci
zE#J5YEjcUXJ{jadSsbHD4X=h(C&-Df8qnKWcfaK?GN;je($I-w0i|`+or@kU&Qo^e
zE*G;ZQbdf1YGmt)jqxiWFiLW0V9q4f@MdI-4#;E*)0BRJ&<a?S#R*1HW4U65Be`No
z(Q_1s@9uMB^XA)8(Me(p<OqdJcw#+~4j^rYtF$N-3N^9^?UUwN@IfGcE~p(MYWnFF
z45F|PHf%i+aZn2S8;r$cnglb+);p7h;V{y7uIM7R9zn}<u9_))Dkb&6%VMi5-bJnR
zoWjs~e-ETYj~oFIgzSiRa}@Ui<<6ag(xvWPc0LSnPvOp<y+)KqyE%SUzn%WZz3fC#
zN%pDOdCLR$e&Y@@02DNo?gqE=8GVN`d(6+8701k!uM;g?;>%V268UW?OVFSIJ;C5d
zKnqu91}(Z4e^!Ki`q{xJp?Jd2guS*<X67gKR?<S>fpuaD+t{iW;&|>9^MF4nuNuEk
zeolrCT^Ek-YNOs`eZ&)69=31j{z1%<32I;=$`ub8Vi%T_1cDAB{f3dJi$)l~eK&Si
z6kXy;&3=8NH<Z7G9HE&4s%F;Jh7pmizOnE6Nl)D|blV4m509nO3k}fSD%xSE8Ha=R
z{a;W7TZBfWZw<4t{|=eo;t65=9XmO2LFu3=a7kus4<j>(oC@C8nADzKW@a<?L<Sy~
z2@5g&^jN{NO90hh!cS5@_{C(>D|L^|q~s^QYooSr7bh<w1DXpOto=^OhF_%%_>Xw!
zuUyO%6(tOngxFePj>!*q@_o!6ypM;f-s^+xlK1=+ujdy244_Jo>v1f6(Pe6ez09HD
z5S+aeYZ&4cxB^+feSt<su0`*F|M?`L!R+qOy2_INut|e<6_=DS$NGQ-+pAc3bm2cT
zFwB3%BZ>V~!Wj9^s=zT|6sU-^I-Plyy5(MeJAz~QV0bHxP85Oi1^%Tx>axi;rp2a}
z>Uy%3d(Zo0^Xv8fg4<u4;X;a}jyysnvA9sB%(d7_KS!Rv0&`4`un94<=~6p3{1AHR
z#>LQYpu`q5$r<NO6?7{Gt6ICh<tCqITzfFCQ$gjq!X>NQs;=XF?#5J!C7T|wJ4`yx
zCf;EWH`O&&AAbQ8Z)h1_!=pZFDTP<db)Hq~Gr?`o$E)q!+TJr;Qu1)a^1G*jW;?+$
z^+Kl*o8)>zM{C98nxWH6h4zf^Z@qOQRnH!=_=GxW=Z?srv7<a?RY2Nd>J=%JCXF*?
zw;&5KD3-^6{WS3O+hyH5tz<Qy$q%*jexGaLR1Yvc2z)Wtirtf@Qq7yGk9dr5=%SZu
zXVY?YH*);Fv2&V5j&LMI*w6(ZFy&)b!H6el#$J<YYy@lV)?xi~3=ZNRm%ZL!9OA@z
zpq~*GJ=QSHvb&4UDo0e-huAdcNFv$_<j19oW6926fScMjB-ze;YPGLqIo@h$6MxoS
zD9;)+9e)5wgzgwfd(|x@6_*MphK6UN<{&0Lr8mQVmciShB#7Kn7j_j(j1!s>Q_ev{
zuOquYA(x%naj=Y8C+^9@Pn`mxO-Ws8gKa<|CKwHljJXoe146CN&DfGd+S&KK&6K1k
zv?FDRELtxCRu~W?6;#dFMD2<~Oc=PWPC=v!(tOfriOePfkh^dga&#=mxYxmc4pXcf
zfmFJ@7EZikj4xi{g@lHmj(N3P8#ol}n%^xUL&2GlG6z#o@BA5xgomE`-T4y}?6Cw|
zx$OoWyAx{<G7T4suQQ4=0~ky=ve}~3-vU!uzde4^9ipFULrGD8{eOMlfIC`T(ix{N
zEM;;s)fJ_^Op+YePtds4JS!b=jngaIdYr6mpuas54vDT*?TB-jrKm99B$d>_EmPiM
zEi%=fEgF+Zd2S7=j&s_l#rQZ6u%Fqo@*|xxH2irHz`i6nPt^V-Ou8_YYVQfeCAJ9K
zAGqsa3u-)Hrr8K~wQJ7AQWZE%f%b%sR7l~T)YDpg%88Uq1Cc(OZ8i~ln};D7)*Ly<
z9lUkgXPLAN=&w<1i5R73?8rUTPEdh#StrnUghGvJbbUq)?|p(cAAKe;QuPfd1ubD+
zl+)mVP!*K1J^Sl0khkO$JJ;ek*|!TE@7Ai@Uej%#@Ya-Nl$F0TDPz>u&S)#j$peaG
zm(rIO;#Bz@Kqguv-Lbk_N)6?va8rmb0U6cZH*yUYaBK7}bbjf^^=Z15+ZO2p#3z0|
z<pEx0w7gbNzZKV2LnA;HHIZG2rUNdy8P;>o%K((lY-D_&bNsp$;_h2W=6i{$k14a1
zu8Pj(iv4aKPJM26ZuvHk2i#{Bg+HsHj=r&)8LzZopotENKxdgup)@{UDN)?ydnAe^
zz`+DYsE8;BSSY(0793hBr*-soAl@H(k<nqM!Mu;A{3c9G(|IjyxYQxkR~5`6_U2re
zU;GtlWU~mkPZ>B9spa9UUr>`_qP?&q162GTWMKkmdc%~F?0OQvPBw%M3DjAH$mP_0
zn;RX&9lJ$sP|i!6&4StDdL>Oz8svAEg<5wtY-|z(uu#pLh&n?=w*%|EQ=aHVisIDh
z3}DGGi|h6YYoJTe%1*Q?#aJOUF<<|(vPg&H)+|u~iu9vS9sg50!Jh21FtQ-Pz@-0q
zwA}x1tYtZcPJ%x{1*NEO1C}H(zgAPp#c4)(B19LzlLYI?m}EoBSY?;O{hq6FwvrbW
z)lHA7VJ(b2N-!(!IVHIH<{P-<v_w#*YQd-X9DvKmNHi-$CvS?jgy%hXwQ>D%)mF9p
z_v?`xOtzi+5CRLMJ^!E`ceH`wurLx)LoK<1?vNbHmJZX00c5H_f(EWqPZ}y~qOI(t
zJx<S7TR9HbL|8jj4quly{-P!!KZ+Dupgz?Q$Qjz~V8<$j)n?8{Sfd@QeSLM6zQfpS
znnb1PlC`ySkW0DRpaOrTD<taPgrQZd>I~%HIt;jAwNf8r?TMW6-K7}r$h>HgwU2AF
zYg%ruK{p0=fR@mW9RPFOJsCkllZXIzJ>`7cH&SG>sXL=!Wy(AU9z(NqV!IpoUa^)d
zok2QH@BZ(1i8DFw6=)u*OH7j9ka*UR-LIEOI}w|z^Und?K;rb7{H;3HO15)S52HBj
zse@>hT}GDaZn#Y2cH<TzVpnkt+q$Vz0xkEm-Pt;1ki#^7hX#Senr)^gqq0pe^N03+
z=KfJW2dCV=JyKTtMEyr7Lj-<bp5yBg(*8$v^c;szEHv8V-UiwwQCs;wcCS%7PrG-8
z?FM7QKDLAH3;HJh)gC>x1h(NJLFi+^t46z{2GOpo4}Cpx=4V76uK&CfJ`ly;RIQ_b
zhK1n^bnX3=S1Z<Rge!XhrJpg7O>WRULjo^?^Ech$&!N^3VmQy?d(I{oRCK*{r}(mJ
zPik|X+)CrZob_ZsN;}R=Tg{%3_|m&$wR0G;(5CCJZ$DAK_aF@U0mtHaS!*?8ifx64
z`H7aSSuvA*o+?b<;tSB*|K8ZkDZ1)Q-K3)yfg+*2`r?9&6MHexRSxdv&xv$Wq}UQO
zHUx`7rPA=%i#!y`fADsSI<Uc=zAaH?<ja{&V**l1w~IQ6i>b%$ngkI)zrE5Xzxm|Z
zh|~QJ^;QB6S5Wgb_P{Xe#Xa0;ph&uC<9qQuVHBJAszfF%v9hT=2(u?G!i!Ht&=ieG
zgDS!r#*!8Js!5pvrgN;5Uq1srr4>gEUjlkyZTY?*6RlBLSl;+)oseT%r4G{ch9L*}
zU>TXDTA=^70wFFUESu9j=$7?02#dN0b+UbLbIq_@q>!{Y$u;rG{SrL-{(bRR0!<9V
za2E#uYrGkqP@39Z#}Rpd6+WA5Izn^aD2GY7;b4bS?ig+2Qu1HO%iLlTaqu}hvjLiU
zOy8q3(};?+|Gws4jkLa`FMd}DOkbQPH-SKKDA@ej_R6FW!JnW@1q@|WLEwACWn;1m
zq?j^VRI}`q%CI78G$)k=BnD>CU#81a1_xl)_Q+|`3*=Xb7|H)Y7Z*ny$X}3FiyiDP
zmb2Lz9hZ51KR^)aBTXD$##R)i9A--B7Q7+WNZiJi=?nRV6k_7x8<<xS>%3SfY652A
z&V2*%x;wu?c^zj?ZN{}By_a0S@e&Q_n+4O7p*CBF#6u@UEcMFD+GkPgyxgJ+95>u+
zQgVKm9`_w)#ZuCFa$Z%t>|(ngMThCS_vhD52HNAY8FthjYZ4JdVsB?o<?gZ&2-WeY
zYP;AqopWYw)kL8?c6`_J`!W;ajJMX>N8q>O{kVV!IjZE)hnTcUc&~{Vyg!7tQ4nFp
z;i?p@^=jOv?>~mT3FR4z&q}<qk^j5DcIb!r9j=#0jRll&FB`Y$*~%bg*+Pr6{mkaA
z?W(LUgK;^8u}<;nsicM^GK7f0!a^7WD|4FLv}u6x3&Yht(Po8iZ)};?vNJ*vVsv1g
zsoDq#UG!C@8?W*2ttNL{jgH5p8z!gU7vfnB&hSeM$&nwfPyG;M=m1j|qhB%goG#;3
z4aT+uI8kl6CH~pErx=UGk3PgtS1f$$nZ)L7T-F@8GXgL{wMMS-$b}6{LNW`vOLB+g
zr-3K4^L)7|2!;qA)dUM#GcA14qwlt5#<*)Bu!;yaIh(?G5k7lzIt(cSEfznLTv<Yr
zSEQo8d<Q}@%4v>QJR+F+Uelw~!jt6@rsFY+vf_S|&ZB}hXL4fh(<+e+kGjS07#P=N
zWJZg$-!MkOAGQy#eo1{&$D`X9SD${kCwI%Z9e&$Lry~;C;7_U@cP%0U2%useF8ovz
z-%5Z$(;>zPH&<<snn1Q#KGU|Cq_sFi*AW(;B$GJu!_;~7)eDi}FHq!qMES3*W9y#p
zQosE(!Jz(`V2nvjLeNP}!swv?v0d4_E(aS!CMDII{j~~8##Mg8(vrsi^Ia>`m*Y=2
zmAK5EHz>RQ8Lt7<yFO=8%<)zx4=cN7(Li_lNO4=A)2%pOm+Ou)_V?q>_c*ZB`pTm3
zO?<8$R^ztmO9dtdOemZT<MxfEq2frCp+}*YzxJtu5}E(7m18-Ac1>_AH)<c7-I^_5
z=SFfxGxjsrP-kmz?D2q!HXcSWh#5JD^G{n|r<)E<2Sh{&hQYaWMr!(Ncl5Ea-=dr@
zIOiNQ<qiMvr*1geCDls~Zl}%U!u_cK*m_KvMARXVEI+gBb*E7XK7(zu9vue&OO;C4
z4b*BVHh|zvZD~@V;JyBP(ZPnaAKxZR&kL-&y~twumkg}Cn}AlFga7;ZN<C(PH?l6B
z?8NJZc<5GNKHl4f`x2J1?0NkyHCN5N`*hxcz3W`Bbjd^K+8x2FscvlQnN1rB3LZ;5
zTYWSZQXFop7oa-4zp^vn7~0(`Pivdoq!C8MJ)4as6cHr)2HZik{p%S}iy1Xyg4?6O
z7<#tz7g8U643M=i{9t!lD*wnAB<=;|!-YOgsoYc1iiD<Rn_z2<=s>su9yuW{WF|`s
z`E$HVAoe3gCz`9|&hF1C(V*Dj%oUV7=2tit&}H5CNmSW9VZNn%g+e-7&J}w{2LJj3
zdxYxxSqPFkHOq>mQ9guwv-2-w8HY(Y7ERx`K6+)5@qwK3VIXTp=e|Tu+>zgklyW%a
z^2{D*G$jO<TVV5UQ7TfRxbj)sHPo?ab)TQv<69Q8&*JZ6HCA*SP+Q$U@JkxLGiMf?
zz+2-fx<yte9TN#}JO)~r^i%$YyfV&w!rF?v;pGqr|AQzo9;@2>9SSjtn|A+9D6`a`
zY_t#Jzv}gvVn%@cr{4B|<bdt}wOCoFXrL5TeaA&3Og{x$OavEyw(Sp-aV}hfm2JFe
zDs*|daf`r>kt>6IWBtj^V|&YoAD)LXR0b~)AIhWmt#*yVfgILzl6m*pC)sVEpC>2G
zU@%r2Qbji8K{nWm_RIC=#$zHm@t$YW%wFPBD+FVZO&Ey!gEnhPSNkLF*OhUF*C3bD
zWhCgqAJ~&iw-nYAWd>5?zNmDr>dfe9)c4mVuIghr#;12v8r(|cmc_&Kz?^_<-W($V
zY(P0bg<DI-9ajMhw&5F-Bpn}LT=!4($;YdV7Yahd@r0$QWNOLFQ8?0zkhJ(@CGr{o
zw4@f?5oT5hbV2&dnrq&)HCx%`0m#{+U0akXJ}jUc^W9=cK=zt8UNycAU}c<EuWC4b
z-(3^;>*XU_>HRy$z!emZ&0g>QLq*+;k&aiU0D~Ev#;4o*x+5ne$NjqK!l00`W5$L@
zGia0dJg*}t+^PQK7u?FokiKmyA=DfT_QIYTs3%1n(INy?gZN-RFi#J*55ks2)-}o6
z`2;^C;D@&Jvv5tE9B;@|1hdlwPfE$h#YkDFqOh-J<8W(AenY;$K+1efw_psQ;AjBC
z0EOkWMnBU%hzPQ&1=>~CqD^}p={B=fB;d@2RfRG!dyQ=6Ml)%d6wjm$&!i7obBE1S
zaQh-Q?YQF)xHq*}?Q7RZ@daB^IJ@IN5&o-}Ypvn#BtD5?xE=yS1a60|Q<$bPiHdJX
zs84+OG3a1mbaY@~RR2du&`J5yupnzA-IbKDSjMx7Ip!=3YBV!6?eI$vxPbIw?HnkU
zVTFFu0d3gGPdj=I3i1hx(E8w?8?>?o@>*HgDm2Xu1JX`#Ean+1@aFldgU#mY8Emps
za>k3`BB`%ezKIMQ@LZn-!0WE(Y?nE~Dd3#1*Wvm-447Qnr>E6W+4*gT7wDrd!i$jY
zMiaw<knI-qvUPNW1KrEv#Pc2IHU$ntQtoKKJiwF+`p~2IC&hPf3Q0i#l5@s7lS7?{
z93svTYF&hK;t7^&&q-BS2@Q0{Y4U&pUZF&2<roX6%3jL;vbcmt$$WeQ71bfCW~y>%
zG?#L)sKISRO49P7*$AtIAZU~h{4jaz_IzK{%cfWL?zT}*35C_HFhVB7Y}^ck{a8)3
z6j#N}q!lx(JP}=-V<lb%<K7yImR-5Vg05sM9v&kqr60vCP_uM_4v?9dah0;PLTBk=
z9%@4`&#P)txx*k@dDoz4;cXsE>Y@(J)p6_9#HLxP>S<K!VP-RH07a}MGs=psCpDcy
zwKS~&8c8j^j|p2^@G;WHJ1T*>nyGXUE14?PQ*zo&C*H^3=tR?`dT8m7MCz*5lBy6p
zq>TO{HFsBK8q}x_)`4;J%UdG~z3*|*LyS>mS-&6_ehQ#-77MfZDU(>N1)I9_U`N9+
zH+f^gh4O8k`BXs_ftV57Lddg*W{>WEa#%=S90s)8kK@;R?7;nAg%35yGoYraMjAEI
z`;}1>+j>fSRnp1pAepm}PKtvdahlK+xS-YDYYOrB3lo-GxnHD<7rn(hhM-Z%-2Z$g
zpggDHiZbvcIsgnut}WH*rSX{FCUvEzuBukQ(a-ZS5=)k;9E9<b>VT++U49x4BZ{Tm
zHL|19Ab?t?vA>~a<}B~~I9MXPO3jmISbtQF?^V*j4+k~Kh!yLKj-oScKLWA;GWoN7
z=xGvqAU?clBP2(fD73gngTRVf*TA=)k}w=7W?ev;(d6>R)Wm^qUttviohjljZc3w-
zP(QP1wC>Ku5Ar59M@9%1NtkIFV02d<+>&$Y^lB%byWzGBRa9BPT5*gDYUmG*m#6ml
z4LLOMA|ULbd@B=Rt6V&x@#a#}87oil=M-MN+z!neF<1k-Q1~$y*L6fUC|O|NcG)dk
z+<g18lA5Q<N`Chf`#Cj#BXjXcNyN`|j=n8PJi1@65md6E5Nc3lWTA|&j`UfB`F$Ob
zs=;HdJ%IP=08q&jD8P&(axih2XXQi;lwwnPCC0>^eYd8FqDY-UqB%g@Xf7Sv^uEX#
zdD(a}u^AN$OnvT4nih<ne(<&QUi`Zeokf|cUX5H>KguQ1Wx*L-(B|6z2jXt+CD)E5
zlfr~j14MK+5hE?`3uzvuri!35s%A@U)oy{oUflp(^z$vHK<CH8QftqT3)iA*UEXwN
z%g*Ixvm`k+-Xj&Y!@}EA{utEC4`J?gjZ<rDV|UN-A!XA_Kujh=i{RQ=F!SOmlIeIV
z->%k=C&bGv-C8t~JImU%0HUKZse(<eB99fFgM1^Fuq_G?DFmzA$%ve>qO>{99Bvsl
zib(}khqWh+7ZGQbGABDko8dOM<O3K3BYG~=ITNWLf6c><TUc&NaFx$Z3Ksn(Cqu|1
zoe6EmU6irf!G&Yn`;A!wr-KO>@<)OQY{P^PA-faqW^(h4dcP5gfL2U6D>u5tXVDw!
z4Mbs4R*60r8vEPgID5etTc_M|88B0cJuXn~4LM7zoSKp6D`^Ap&w3lB&6$*ApI^5c
zGfA?L%c4rxTmAu$dCxJs!B!LIQhFfZOOowN7hW8$EfWkx-pCHxtd4UPBhZ$h6(in|
zROv`G-FMhB-{;zL*jHHTf_X+S@Ji*O2BF#>vxP!3ZqV3cUyU&Z^!-@BBoDGSm6qai
zhJve-6jR!`c1~(RRohZKRgo=3Z=zr#O4XyvilFJqv7EprbvjB;(FSzrk<wfMM;`Fi
z8Jkn;bv0UlA9P%l>HtbybpR=P_7j|qGl{n5`~^i;e$_m}tZm)Hi5Ev+;t!0nAcuGY
zxHvBZ`6_K67+`~ubaYA$J+tvv8MtO6sxEqrL}BVyaWe4=H)CJ{RSN5%?>0l57NBa&
zV&ZZVbvN}gb&C|J14!Gln%Hh%OS~QzOx>yydwkN((`r5Hx)WSg(l$~V8J%PQ=p?h*
ze5l%M2G{s0$c<wDi|D*zDe?UX^mRmqv5x1^l!YEJR!x|Hv-3<OOB@fw-l{?r1I>rU
z#!eygiTwrF*K|bMArB@?oO+F*<H|}L`FdE>nkO0lWAV@KPusDnKx5Fs1LJdEP0H=X
zBJJ-uH@onSH20f&74iUiE_<wd7?Uq4p5?PR7!&(H5^mI#gNgcg`J_MUK{vG@^NEsP
zw3&R^44!IGt+oI=01tUDQFV)1n_cUX<Q*=MLmOu3FnTS0w+@%#wL#{0!iMrnJT>NL
zQnlb>Bx9k4EXi<Zvnd95a%G0L7_Y>WVg_N>0SW+AP)=lZ{=j{!hO#MtEEAPS6ZW;7
zSf;k9&Ilhol+gZTemQv^)H)<P1ew_Sz|F_e%_V;LH8bE*1(MlF1|V?nNr>jQ9^rYe
z#tYKj@<G}{(=4$1m{Jg;%-aSidE1gqUy23Ae2r>&l`HdyGwthiYX2ztuvHy`V;9YB
zDwd^XE48}(sIlFwD@RtoO0iYxX?(npiDcZMf45rpD@q;t4D^ctz4a{3oofz9)c)I=
ztNxP)8hCK@JH~_E%G(<nhz=-l&%1_&5Rct4#DFZ>JtE_XH>JFn6?5QGp-T5MsbzrE
znukDnlPT``K~uzJew$MRJxj6_&&SiGBu^%bBGu@A4{0*HbrfAmqkM$*%(x@iX-9o>
zT6lo5;@gX%mUB)FVx@bJ$!52Qpox0xgM9*Z2+G%K%xfZ~st+X3NLtu2pCPyj+9C~~
z|6z3goCto*p|3WSz{IkoPYiQ_cXd$WzP1wZgkxZsRPn3T$b)CP+$&g)A~}OYUw&Yn
z-|h7cD)Tk1x--q?+dxOt)ly4pF(WPx<g-VpYO>pR?4Ys)eVVcHG^DdNez~&QgFQbP
z<S|4WwNLC6GTksaR7i9*QN6FqAqn##K_N7C{LZS)$>T{fIjOL%rOszhK21=6f{PT2
zyd5R4m~vOvSb=F<cV1N#JkL_N#A?LS@f2}yr`)L=N`@Yf3%(%RFNO%SnLOf3rTGNt
zVm4=IGCnnepxl|}ETI);ITjas>B?7WrRKaI%|%8wlE0Gp&=Punl6yX#@uJ{VA&2xr
zYo`-aamROVpiD^_p72LBu9@(!;v!M~Xl<!dglBKE^YoXvY2L`ePk?!rTZK+$-J;vE
za<BX9EU@m@^DDXkw=7(XK{Trwl^f;N8TJl-^uSC2GHs-EP-N)H5+!O_JsMb;@(_T5
z!Oe`YeXDjXwzZhHfcoLJzC2<)9Z}q@D>B;lhG{4MNZBblPloOD*vaSE%x-s7zs4um
z)Ff3aKS_{CCI5*cI&RfyI#9ly+*wlrdA%3BFn+qcc3C%Z#_*S853{*|*dK<v;#XQv
zk`smlD0C0|$;F8t)LnG{x%u{q{N<s)_SvP*@7mm{edmj6?Gbiz-{q4PruW37--uJ2
z=+I8^G<Z)4$X(6eJzO$FnD$3dUmwUlo;RhwGVO|4`-G7yFq<*2vbvWky$V`@x>ltn
zC7y9@#b#L~m4Q|2fw@IJ`EId0^7Q_(9jC7biWYI%4J3HQJUo{$5apf@O%xp8i1QgR
z(DG(2ZzTvKkdZNG4qcYtjw|TaZ1<`C#HCs%b*wZ9*rP<O1Ejrf>Ekwt=00>Fz<03#
zU_#wZ)q+fj^xJfa_v-5qs4x4aiyu0qeE>M4YMws1Owp7B8tBnWkjFyL^BwxQhG)(o
z8U*Qm&F0X#o7)+;h~I)Ca+XQfffjt?OPyPADv^&Jg0!8tb4CXWn2BEK6+p5+f~2!Z
zRYMAdh)MyQO`$nIxrqWaNjmM^;Yc0+?zDJ)b1NBg;f|VW0&z?=J*CBvibxL|92s@~
z(#eZ^_X0Z@c%Pjk_X>CijiF<=tI2NApn!Q}q<;E@{;mAwl%csrBnJlBO!D|$=f$1b
z^R1@4sgPTOs~g6B7i-6l9?XOaeXbgZ=LTzYeV&>JS|U=q++1PWyhq#^tn_dM<(L#6
zoT?Xhv~N~Mjnxv=t9v%p<~G%){f5z!^~Byza0XN(bq(NsqU1ti7(!t&hgPW|VXFjX
ztCR-V$nOLtxTL%oS;fT0+CkxV!zGKc<$4k6ThZ+Tk;tBb*K-A`exdY7oOUT~&M_Zw
zn@6g8%wbMJJ|S60xDFG_aFr&1;Sh@qh(Ex79NiN~mubW`KEsBdvIb>p&oa0<pCZ<B
zfj=O~MHmbDiNy-ov<T06bvPJ+3N@qq#!QRZ%Y%k4j%S624hiq`b#lkzHe9OgWGudW
zqo~lY9^F|AMC7q>Q%_31(B_(a3FgQF<sT8f=KyBNp~ORK5T4Mj1nVx4?1+fZd93Ek
zXqXK^OimyCQvs0}WYZmEiNiD=$`clWKc(g!5NdM`yCZt;dsfhrm@2p+%G#57-8(gA
z%+8?6-HcEX2@?X5=qWmpxA1@9{Az~Ggy6}zk6dJHt81X41>W(=#Ordovk@Ytc1s3W
z&^6x@RiSs9Yj8{}|NH2S*G!NcrmEJ3{pzn$=XZ8UH*;iIV>Rt>L3CJbDen8z+haeN
z&LWQC9?-1}nU$RgFWF;2_LR5RK3+~(zU`R{1rLHjnQ@}RgIOo{&jOvaL0+Zxu8e-A
z4a-w<9^f$Ths7v42{^okK0Ii(hlt{F0bCHwcpe#w1-!le#pE`wbH>r6OS}6gvC;s;
zV?eMm?|MuIlIpVwwsTvghd@`r4X-8h@70tNf6pJk7qGX}6*n0{<$x4x7d5mGbZAf2
zM|A949+S$H^bpJ<(qyFu8d@{f5C&2T+}LCRLj#dXnH5>1u8R4x!ABOVm+p;z>mRd)
z_1n0+?E34#x0fOz$AOJ^CuGe6cutu=w&QD!z(E?GGzccc+_|l|djQraM_yHay-~&e
z<f&4be9f=E#pNOpnW!zF!XtVneux7U0P9^z^UR`}Ce_?m`<E)iREqf1q0dY$7H>!M
z-nTV`a>sFX40^~%{r32*EcMK-O&N!(_<v*C9+_p(72+MVrbywC$A`wK+0asjM|Wg7
zB$+U=a=#=YjRm5-<rA~z5oCD2@$WwtzyI{eb%dpJ!r+F1zO!8U&Fzdu*DIEv85jOx
z?Ixo#psej>68aDs-9ys$H=I=Irk%Q>H`&l_Byybc^^n{d=(;1`NqW8|Ai8KXWjSUZ
zrH6lPKR5MASwyP!=Ki;v6#YAnHNpzW-tqxydW#_6mYpdun|<R%Buid8pw2W(;Gufl
zL@4(g&bx0Aq>Fed@XEPE_4{`}HS<1EZ9>#pBf;OFNP5dJP~Ec4ZWjzHuP0V_1~N&z
zsE65DUkRqM(KxDXezH-Oc3o&eaZO%;#!FuacDF$yv&?{(Zb*w=IEa+azX4QyfgQuk
zLp&L<UYMpFy~uNd3gjK$4d1eHa{8x_g#SgKx;|JeKr|1WE7X@_9q!>ZVV51-S~K<9
zsu!8uk8U3Dv-&!X-))yJXyg=@mDR5r_!BfI<8|69)pBNVstm5Wx5q$JxH`K**2nM+
zH$tDTN_D*HRmg|dx{)BNUSBbvcTI-=K4a3a@lR0pV4I3YSl`(9WxSF54^b7-XQ9QC
z+O&tiAQ6QYlo4OeH@uRwzvCL(J{)?ItkeBAyx&9#0wk*bCVKId&5jMfkKJCwb)zf-
zC(&U_S5t}8({#`1Tw}IFW=cY8&(s}|?ykgmk1s|kk)Q&^-a0OxjfV_48l_a7mXfpE
zyyt!dS(w+PGBsbx%|m)G>75*GIID8g5vV<OgK!9JWjPT`zf&Ggs{A}y^y-jF(t0SU
zjRmwk(rX_<fCgZFCYO%cr;F=w4(h67ge2Kn{pe3>M>L~v$pzly(0yZBL2+f>EZ=J0
zlAT@L<7dg;CJCi-*kI7hrY|2#CfklOObCNCzf(vm4S*4Wa54J)-)Z38IM^wuksl9!
zfNt_4k~#xx0NHHLR~S84@a&7TR@`5*HFCdy?9XYZyLcILG_r#d-OTa&C!@RnD(Gim
zpW^jv&aZ}`qCl@Xv;*=+h6Cl_QT?!Ie6JNm&k`+L+6ip~oNhoI6NdA%Pk>cFG|G57
zjV3@(vSt^}Chq2j-Ju=-x`Bjq)`o*I%jU!rAT5G^-QoD1rd6}CC-QP7Ss?wA)2^+d
zXEi10(yosD^U<!aB;k(4?`+~7)C8rch=TNemQ1eeA9{{}1_NVHGPWfIDH*$3sR4}L
z%>gdPcA{41rncq)CR00O7nc+@T}=XY%&$;L3s_NR)dna!39kUTO*}7Q*@EVDm6}po
zuAe31`e9C)+3su@bJ_j^uLpS~p#C(WauizGw707`K*t<KiFFJLm2J+{&ikM1&9>Kz
zYs0@_PEfmM^Knyn(T9<sh$`&bjP#j3QJ-XC__ast*+Hb9IbE%JcWy?8^LIwy4twK?
z!Lhg8Hm9+F$e{~cXkt%wi(uIDMXw4T`znhDA6E;tKq(4ZWvRmr;>@Rc28oa{JRXOj
zg^@{fL*plU8ET4l{cQ34b1X|uB^lQq4w?2XeWE?gmLm<?3z-^7FO=a%Grh7_rgg}C
zI?yL2EzgD5u|IZ0wbo5sgZ#%y8N%E;@;wB$#z$fzS@rbE7b96eO9RmBEL1i!C2!aA
z5xK*Z%m86`81F3Pe!bs=7aj}4*hf;zKqFy`zL7}TSVpWMKp5=@`o4QJ0kt;SyBw{}
zI9ne*$E;Nyu3!vEv@<M5DFWXRr-4L8))=>9n7#x5dKSM5p$|7?L;{szWu!Z1$zyJm
z0{~5BsM?DI**zFYscpUNQJ&gIfA5u5#O=nEI~mC%3#OgAVr-egpgDp(msqkjCBddk
zU8tQS9M^dN>msPe60<o1hD+lnB-GEUC^!llad))xw~-y_ms8RZ5`nE&o3rr6yTD!Y
zuLl8wxMr?n&#dORi1m9P2n$Sa{Dt8(E-t6lVN(LdpI5zuYsEXhDeJO-t3r16c9|$z
z?v|uh)7e<oil!Ce9bvY*hP+x~kwR$?j&<}em2XW)iVIVf)FD=@W(&OB`=&KB7;YU2
z1Q_m%M;M4f4!|8()!itpIy~G;rxvmzzBK#-`*<_b3_hF2-j+q<O(1RfO?)K$0#lkN
zHc(!rO+Jq27TlNitpN1N;@Y&pC(NDaE-Jg7#^P5h`hBO&jRY;0T()YPiv%aB8RY<R
z)}7d~U(OZd3jFQK`JB6$E8F!A_~2N)wFnMvF!%vl`ix*uiC80VhT!!&Mh}V7-=TIw
zKC#Y|v5Q%P6m6Ohc+HivF4As;s)|6UWnUL5jgVf$lR+*DcI4h~pLIfzd}8(SFM4NL
z`azcC<s2>~p$yJGzQ?984+J7=(x%!z<eizYZH}1v>+ri}@%@|=37bX<Gs`xGTonVI
zhg^UN9S5vch_f*w?1tTTq$yf2qA8MhsMv+2!D>~rU2q4#DI8EGXi=o=idpUdfX$FX
z$+2cH^!&pziAMg(f7R{npVYUfhEOz%TVTUcRF&<?)}5TZUewuE!ruSmzaF=;&d7l9
zKPH0rkBJEVO9wgvESdi`&9;~zO@OhJlQ}@l+Qk)MZQ|x??dYHmuoHE3_*WHN|8F_S
zQMLaUxj^-6W!BS;!<mXABP+>o^%opw9>vE9%uL7R$X>p2_ST;~XaIINz`a%7AW$T}
ztPKCdeobpS26iR~l-w@tbJOfi?A|~8d_SR$kQ4#q#ycXcVIWBCXsu?a-BTFe;@kP~
z#E`}i%Fu!n73t4FQf<05JQV_ARhH=0Vszb{q0sQ1`%uMPAI6(@!;=IK_qmM4_r{r<
zYHTsaGOXKD=Iq$iUh)*|goECD(gS0f!nDR3@(mIOCH{myv~u!);eZt5$qW275nK(~
z76`v#qP(iqLlAnY&PuH$^sMb!lud^%T|rLHCHFAruWp6Jzga<~O_Cd%!ufa-wQP$5
zzl5pp#J+cse0S%37IL_&2fl1onJNaCs%#FjZ8&6Gd*EXKb-sxtwM^f+qG3c4*Kegv
zsHMlUB35Oa*2|?sDQUtguZg{`3v0AFgtmiz2SkmwnSc(_=s^BE6?Q!3xUMUsrq!$h
zpSy0X(fZN%_J=<`I0iGO<lFO-e~*1mu*e~=7j{@}q|Vp2F(X@RVU*nEbIL!7ZYg;H
z6uquJ#Gr6wG}E}+f9k+2qqymHy34b~F?^EzmiEsOP9&t7BAt;cOPlTQ9ln8`C|Ku>
zQciT|1_PP4OY=nujM7e0fF$6h7e`zu+#^UjIslQ&!00^ko-VmvQOkOT1YT|4f^xIz
z>@q^52#?f=hQMzchjbxK7*s5HZQ8?_4$8+2rOsJ9kXP~C5KkCTQPp^jD#5!Y*BkBE
z-su-^24H^wAEoQ7U##c^2Wuj7<c5X%US<Exn4}HV0!>i`$1BnF=~{{AL$(ygx3(gQ
ziHcSP2U@LYCvMhXHb!M3Jvg2QDf*s83Gw>gmavnlSw6^HzDe@tdcy@MfR~xFbv*yh
z^`3q9J<0BQf6Lqb0=p6FT}kL4V?6C|#<duZU$Jh-9(5z)zLBO+Y^Qa1IBSp5qqkr!
zBdyz41ree7V0U&vzb+{EcjI1JY0dvjiI9noyH}}Su|8nx*JW0CS&aP7Ae!6ybzo3R
z6QdpK6tdZE^On6oDGg(}O*G~{GbuP%<JGM}ufv(gzxcS7I@ZS6W?-AUZ;-(+1VNAb
z#W~gRL4XKUu|)Nt9$&x;HJYtKU282ozUg|L0l8f<W?gVy4o5j`G;7Muq5mbw5(W)b
zvLa63g;{JrDMn2jVG?G#v}#v51KRzt>-PVKOH@c};I}3^zCG$V47pZz56&mh39+@!
zL=SyVf0l^2`x#g*PRocx8in^-TZAX;hXuZgU#Wc}P5u!G^25~=i$)cBy$$SGQOd^D
z1LX{<q^lbM?y2C^RAIDojyq2hjxRIeP9Qv{W-zf&a+6<E9XpU4P79|~FSy($bRF23
zQo2@vzDq*Ic>IMP?Imeje6L5018e|XOA#>q(-A?493IPjgl*{AqOpD~In*jRq&xyG
zk%@j-CcK9&pM2wue&1><Ev!^#ni}ePkOdDj&|b#ZqT=dhmC6wx>L4?e8ObLE2D*0?
z0%@1U?62gC^aI+?!5g_j>7VExQEzq{TIGT()jVvka^%V>mJKV42#L$%loz1eRkEl1
zL;8NI03$y6J9JOtwYEYEzT;-|h0iUix{x~0m4}mmHaayFd2Gd21&{t%1*4+}=qi>2
z)_Q?_D3CT&WP>9woR|(%423oeJEi6%I@>tjVF)su8FN^CZ2l1kM_$zB=L6D=aN~1f
z+^FAMo5DN%OvD4RmX{q)z{3kua&u$Up6nUtPg80&e<(CFI-UOol|X90SO`(3p@W49
z5A>7%7{ai;ZW9uh$(2A3(3*O)f%g+a^aX!r23wx}fcEq+Q2vIV9_$S6L8bB8b3|w}
z5D)zdZB>~6LQG6!WPF8i2!fR&S@lCBRuM#46baUj9u~(4OJbaLVw!bHc4^W}XiauA
zxQvu!H-k~K2IOi?o*SpN3MCQiply1-8kAo*DCc8(dSGY|Eiv8Rm{ODKb6g^3!K8os
zBl-mAq`D8CXvaogp*4WjbW)`(zChcI`a2?P-Rd5qf4-F9Q<#R)kZ}QFlF>^^?L#l?
z$0QrT6uU?ghLB|!Fvo_al&eH8O5`(CMip6luTA1TQ5fW#^72v?lPe)gk)py-rfzF6
zT1gk(5Di^Rq)K=vVijfR>A+Jrfwnxy-|wS+AMu}?r4NZ{?D8q4zS=-b;6sTPAZ5by
zBV3ekUb=ixB!&9FP)h>@6aWAS2mk;8K>!wxRf3+A>U%+d`)?CR5dQXTa`t6Sj2lQ(
z8c2%^wv*Tnr4JHb!6}s1d5~906DXVW$~k(ybI<37{6qbjR^YTns`!aY{Z}d>`arEz
z33c}3M79$-G;(%lcE6dO`DS+S*Ox#24B#wE299AgO2b(LeRx-?=c0HI?<?s810UkN
zfiaBhxL_cEssK@3jNp=*FL&b#CUjhlpb){Nj*krV;F^I1t}AaJ>$sug6NWB--Kr+@
z3<E{iE9c6dDA_W%;fYE`dbvq=!?9ga8Ykcd%dz}R41=kT$n+9JxZsu~Lr>9i<aF(;
zHR&ygHJervMb{MelJG30Hx|Px1lpVR-20moHGf@yI=*EJ-}M;y4abpQ!4}o3Buu{3
z(aF6IDDM8U^k>O@!}Ur{dzR}koJysO_ry0M=SV-dKZrcUD$4K9wn`$fv4vC4&HJ9^
zlnE3eknftV%@7Uni&aVS$L4)uemNy7L9RMJWw_j#zm6G>2J~w8^J*AnIC%h?!I*bz
zo++<?S&He{&Q?}s!0`r-bG(jzB^5cQFr#CZ<0j@f=CPn-kz)y;>A1zQjL#YR+B3ge
zv+R=eI99Mqhh=wD=eVs5?{Iv9yA1JmLx#iIHeNyb98e7ofi)Ga$#DuvhV1|A2Zm$2
zC$w!0bYzktlv32kshj5H*ELxsqlL|iBDGC_Pc=7H%OS}YBo!z5DmaEivvV`ImKjdJ
zs^6w4iR#6<A}uvXMJt5j%{oK3x+uF%+`EHsZS&(DSfct1)0EX}ax_m3nmyp1*mhs@
zEjvf|L%lEx;gFk=)ZU}_M$>3Lb@zOCr>SBsPN`~?6cN|#aAxhEH2oHbjV0p1cMI!(
z!kh3su}Ke8D!o#mrr#%=l|p(6gY*vf(Ob>padnGG3PDqsiaPmC($0~l(QIUf9zn}&
zA@m(-8U|?WA`I{wPSD5$*}zG>O><avcEiJ8q=jj&W$Fljk3-+WBB`qmy_k6j?FU32
zBf7i=W2lbq1gD{n*pE1@;R$-ChM!`8Y#&&>6*fKc3%U|VrXM4*JUmjzYg_1jK*1h;
z5G166JxyN};2DMZoIW7G(>Lf3oX4M7r2y~Z1x);n3jPg}$xy(n=*2r^6(aN<oFR#k
z%{WpdDMD(ERMYf-1lmiOI(oK$|A5Cq91b-Ym?VRc;wv+>1-3tbgWHIPQzZ>PQ#Dv1
zjUXFTAs1NY@fMW#5LIrB>@*6O{^Ah|uMg8#`u_t^O9KQH000OG0000%0MY{>(K-|W
z05mKB03nlMcOHK(V{Bn_bIn=_d{oudKPQ>Ydzrj!14IS^M+FR7l`2bu5fXw4BmpxC
zG@#N)@{){9X3|+$Y}ML|cC%uoi(0p~mM+p_D-#ea+C^Kt*?qT*TbHla?yJrBKli=a
zk}=Zn`+mQEK<?b-+<UhFIp^L9PyFk_hlywz|Gk(hxzvBdWnAt-uR@wiX}lWG@{pTn
zd+0%)Q^HkzS_vKJxzhMFo>xK!pYEXq&zIhU5<12UH9kXTX3Lp=Y0i}9ERE0hP!%td
z!D4Ba2!nHUu9jU(b*|C4)<X-q&cpTGAd8J2+Q#R4=qr4l#>;emm4_Db`Lc3>&dcR<
zh0Ls!W|e<5P0}=LyjtT6J=Dmvb#9T*i=<hj^IG|A)wxYR=X<Du*J<3Y^Lm{xmQja?
zp5{(zHpuB4HSW^5+e2%)$3ts)lZT!aZqEw0XL++Umq^p=q31Z@;Xdw{W{b{SJ+z9~
z6_Na@AS&Tk^MHq*;cYr^_wc2Bne4b+W-ixwht7Ym(b<$O9UAWxtp}wUlE#u|Seg-O
zMx_aAe1*=tM8=TLV;<VaVVxs7kL&zenT?7EVjddjxXuX={eySwyhr1`GPO_VD|LRI
zM&H%=^&Y;8uh#h*IpYl)U#syOb$*l1*Xg`p=j(O8L2UJA;rbSx->UQ5bbh<eH|qQj
zoo|2A`G9P^S>tzVd<&D&84g>~wvZW%Suv(F)>*@5A{1X2*%J;$%%RQE$Vk+R#kzvA
zxCKHcFQ)eHTbqcFTH$zb(2PegS>E5Xv1ilPo*i4-djp-DdO+57g}K{o44L7P#y~t8
z439K3m9|B~vA7wIZ!tp&OXq`3i`KQTU)z7*)wiRky>IKL-i<r@I=kC9_4n=Q?(FL7
z479gx>RA_H;?6>%b1IlhTKm_pZ|~g^=-k$hscK>>+uXb9;@<W^U`JaA<R}#PF}XvL
zkr5I2^sY#Bq;Vu_4u!17JyCOf+=@1KsYQsSVccVmSxg@Ewph_vFcM~}7@wwieZGHl
zUd~Q9xgxd?{V}Y7Fdh`^mfJ>2#Dk&6ZgU(&#ev{R*o-Hl5a5E`)z#B2IDMuCXOxAl
z_?}2~S6^_<iX`GteRVJ#jJGhgR?ndOsT{v_3zMrYGGvMD!LZen7~5$@`^=poOI#co
zG(%g=Xi&z^q$@regr*B-G8SZR``>>`)+wT$HW&%-hH(SaEPYOOmN7F6%}b|wpa?LI
z?!#xh{W&L>Vv(8#oo77j_^SM;!}I_F!bd1_jI(b%WuWGK=V$wR)6Ofb!FcoZ8S!;#
zAZ`xs!ajAH#_!Vj-5S4#sr%FvK4nl{J)?vEok%zpj#IoMzWv~TP=Hgkl8AqK&41EP
zDhTfV|8FQI=X?a~aBu{vZfXTl8Mm-nh{|JDc&NiNhkC8oCaf3&snP*9l3ZhdZ>OD-
za1^%8&#ZLB<Kz9kU8pZ%gbEG>gxN|*b1>4_xv72cpf&ES6(*uVWX{~9Q4M0|u+<+8
zO<C%~k^xhVqkLJC4mEx+GD3g)Kx71c$gwJF=oE?5BCHRFEG55Y4h@OrQO<^-WH9X5
zpe&aZH6(RvXE<&}!=?z9h*{CKBbHM{k#cq>hKHp<6>M+C(c#2cuO(uX#3OMt)MbT7
z;-gt7SwpEQ-T-^2>RekSAuO2Y<|v+H&@(ejfym%4EACXB9K)&#RF!{LWK$wOo`?ep
zmN|yyf?znuDdEhb#<yyGo5r_m{63BENIL_5S~wL0Q~kCeXCkmK95?r7OH~Dfx0<ow
z;8fHt&Fib_%8S=LgXuB+EpF%x4@ZEEoo38hetvs+P!-B0)p_b@zS~g6h!wXtMZ2x|
zXaqi+mqiz~hC|@iXs>?>0xd<HqSfqSH21FM)C%B4<}TP2Z8xK#pis@pqRO_7B3zM0
z=vFX6=d`RH>W0{*7T~En5tk@$gNcwCxBAnTI4i%Oa@AIr3#%)aK8{0ib%8eCoZ}R}
znPyk#J;5V$TaYN^>RDnBoO@ekW+^@Aj>PO6UU4LrJ-IeII4XbFzQIA@f6;m8p3Bsb
zH<zaGEz@rg1$(i}6Nn_DgO<cBDs+mvL1+!So9@y0E`#spdki{EA2;Y;dPtgw9ck_3
zI?UK8j+BK*4Sqj=K;sV@d@p~<;6wajgFnI_Wtx@e>R|B4_@f5j$87Ln>3y6(flKcU
zY8Z4I-EPqP=zxDgchCV`NoF8k^a>9G2+T(ex|8lQ=!107phxIYU}_ZkxM5uKytvcg
z`}vbdHZmK_OvBzYai0Fr5N4m!_yL2Da?+q*&@T<1;9~|K=LZoyFJBE%GCJDVt~2-q
z!}h<X|ANy*f_eos1Gx~^`!qjn@JW8e;77#=pW)A@&QyQ!>qUY@zDtJ=;$tc{TNA;M
ziku4J=8xJn%pZ^V4gMT|UYf^{Vg17<pfc3tPn8tE1hT(c)*pu~OGVFzQtr;JT}T5<
z>-=#$@%pQgaK~bb{tE_wk)JU5OF#>Ki=ISzOl@yf1;QH2&czTTyVhhc$!TAf<|_t&
zRm|}<e$s#7uk&XO{sw<j<8K-KZT^nI-{lW8`BLuk?=fTkpwy6PVmxjQHE8@jgTK!|
zF!+c3BPP=L#|A$I`}0o(B4@lpEkSgoj)rCZ!_ml?A88_OyDSqJ*-6LXpNcboCe6=9
z=BK6ij5N=pfm+WYJZ2~tu={$&L;N;wM&TYgmi~W9FX5G-AZ+mS{0pZ2Ti5pXboN~A
z?~jRy9esV9{i@3NbIXiBf=7zq48uGzYY-P8f2NWMlT>N;W0U`46%GC&#8))9Ga)n$
z{>>rFR4@t0f&iF5k!BcZK*|wzk!bKrr>MDYAq@I0y=d?+`Bw)2ngRI=(Yis>M?<SB
zSq6XqhF?G^WC{_2bV|-Q__zF`gO=>Qi_$yF>_XHRv4g<jlU<H9{++?U=Rd%H{eA1}
zR~r0B{!<QJYU`{#HHyhEvwIu%j)fX_2E#)Q>&&<r$CIkfe*TFNmE$-dZj0863za<O
zF3Sc`9=pc;dxG)N8T=NE`NNU8Kb9CDkAQ#8kRNmVkn8;$wsgbpUORI&IGM{%X;rzC
zo1F?LvHfR*|HAB)tcKlA0W+MDQ<%!_;aFxyi^Ll2dg(zgXWCRH?DWO4#>Fvz_2O8w
z`nNQzYw%zBZ^#9C5^d+Y^p$nNOnLY`q$E_i(wyQ0?K9&}xWN7*Xm-9wXl{gdrG|e_
z>Pc;ya#@5W^WVj?^I|xQJPSH~qtVD7`?)<Q?-eE&d+OT*D2On~7J6=VcD>Je=IiQ9
zgMg*pC)re(YR)m0qS1qC16Adarwk`gk5Mz$W9^Nrm(Vs8tgss7UV+lLJ2zzAXaVDT
zJRNpA=A1V{;kewwS5{BoI(;VZ`5S-#&mNU>b1obaD=f()PG060&3p@+X>rkcieUyi
zQ@*J5#H_e;qe0wcT~~AH)EPzbhyrUxb<T4`-hyR-LO2_d^QO?`Jew-O(|OLO?(TE)
zy%E6En;~`ZwlDKt)+>KiSBdQo>-3j_u4?uA)|`@q1T!K$GH+Q0xK2PyEE#`>aP_D3
zfN}0R%~R;}_;o7%d`L9Ia?Q-@rej-atYX%T!gF>iNjod^hIWtb8VW{ZnQs!ZU*f*Z
zT+T~X*2<JK%%QX?%fKur<(!tqE&C~JzwO`&gg`v?+;&CPv%IK!d#jkcB1a{)REoQS
zsFE7z#=bo(*(Dh3%-pk>YX5(Ya0K*Hw~YX5Xd>1&inHaESySF_8#bsQ*b_zW0(>BK
zrvj4iW%B}n6pA1Z6%B?WF?nvm27$p*ODdO!en&*U&yn6{R8yyCifJTsU6Qb*W|yG5
zK5CAPsR!WrDM3Hax5NLlZK9tW;b(?oQ(`m)>ut8Ms+5S$vK^!*n{9uX<kTA9bTa29
z4I_ywoZ}Y1Lg1wsh+$KiWKEtu+o$cxK4seX3Ugm>4aNwDcSm-?f2;BsWBbfupHAmu
zu-1KX^}TsM4drXA`PFSR<pe=R=4%G`a3nfr#-~V?NBNgcM$L34RZ@bO-bx<w(M@y!
z{hNuXfZmDmEp#wFeiwhuqjzVG--Gdcv&OfQS02>pd*w~7KJRco@hn!Kchfzff4`#t
z0LFMJqhF4>d+9@H4`H;O+~ktknp&=_KSl+|sBnT@_p41GM(e>R(fL$H7tlx0tFg)H
zqx3QLTg!4K2CJS3QlNSwN}*zOpTlT`G?L$QR%S7p<C>tNsjPoiQU$G2tj@PLq*+y_
zSyiT4RXVJsC;GW?%3=CA*1(htu_EGbK0)q*3DUZ1lB6G}Vy5o8<K$tOaXC6AOplP!
zQ(J$WN|};WhE6%t<9IzDBEueF_Bd4(($+(hkJlc-nJy)Bm6CBa>2x72rWV>r7f}zb
zQS$r2eK9SePtbq;O2W<bN%|B%b?Tr8ly8oz6AB!vB&h7Q4`6KqYi;CuiM$#e)9Cml
zEhU#m585M*3@T9FeUsRfyHIE^;NRb{W&_}a^2S59Vdz?T!)?30uHNVJ6;+;7;rOC3
z%NOh5_I9O9i%p)_?Si+0Gyn?I0I-1~C@fN%8V>#4(64{U5$n@RtcM-3p1`~&|J9&o
zg1j}gM`>0~{ZX1-<8vLQIW@kbqr^2QsA{0LZh}rbN^@)GxQ~(##Pc$eFQH<z7lV5T
zdY#Z<1I>nC=1~`&L)}yl|C~pglvW)!x3pHv(poJ`Yqcz`)v~l!%N(twC#Z90>9;IL
zzmxcRgdTr&g22LVp;=n<0I~P<<21hjD63SX1#0vdm7k!612sHBXB;DcMy)a>LNCpy
zKB}fIN_?B)Qb+s=1<Hc?C7AsTebxzq%P=Q`9<Dt`XC~>a?t+%OB%S>TEoyT4T;9b=
zT2fQ%Lm-}mQ8i4tG)b^GMDisG3rVVzroLrCC4GP4E~-004Fe~r5z%z6_q-%6!(p%T
zo{!FgBwgTLj!u$ROwh`chiG+^Yi8;ubZkZ!c$@8=BFXBL_d^8_jZ+Mnz*fHnxFH$<
zoVQ`+Qkq4V!K0TWqwb(OdJU43Nlmm9kv9n64`J^pb`K-ljvxgE(-@Y0pQF#iC<$5t
zYd?Rk{CPNyfW!0!`XadNK;;wkB^c2IZ+;m*E>s4F8(yMujlROI8m(GMUsXnDx)MKM
zqbD64_fw%A2hjJzB(-d<5yW1UNp-e2Ltrz8emI>jazpIvN)+jRgT9HK8D<6YWt+{c
za4*!7|9r59d$_5{adVUV1g(MT*A9Sj>jZzb_4wRydy~s?wm7;;6PNq6B&|z1ygk)f
zFHXO>si?A=9@3k18Fei86t5^LUQy~R^65$H99Ujla2H*6j5Z``<E>PBf>sT9yC$gn
zWL3$W;{E1|lB!bmSz1*(n|j8I58gormOT3p-bVA(oVB79?B>>DuBzlXZFW<=PcMI*
zQ=Ftr4o%*UrCHwIBn5m$kCE;xN>X3_W3;_KN&SbYuSpYzDR6BCd_==nd0(9eRN4d$
zoNOx3f1oA@`pQpAk}iW)UqE!>lh1&)U*I#<rwzi}kX(qOuzMUal>pTqS_p3}rq=_6
zS0VJTre?YZY4Z(8G}j_h--rTx9bkXCAEAFeAbA7rrZ<D)E%^I(l=2%<fo=lm4j_Tt
z3}7Av|6A$%;Pey{(bGsc&m$4NfUCfZ^d3lZE7#C%+(@_c`E&=bq&s;v-OU#v83}^k
z3#3Tm`Zmtfz&SzRq3;4?Q3T5OaCR{y3FGvG0JTNC=m+#eDuGm^^dt02p~rt0A;XV>
zu@|Wk!SR%&M_!XcBzg`a(X$a*z%BF>`Y9Dc26pxqaWnmlehv$j@iG-eZWTIDQpqG(
zm1<O}(Kd~q*610Hp4I3%gp(>)abg$3aT1|06BR3}v#TZ{yq1>^x1UMqn6pUE5^J;t
z0sQ<VszOCR0_P7%&`d(fm*ant6_2|7TEI#2SHaFwIO<Q(wgFr?wlkVb@pBn|F2~Of
z{Jds@%p+Zr9=(ILlJZob`;pIf<|O=&Vdg$M3lRB;b5}SET0cg=QuOsITiL1KO>An|
zT_C?{aPrV$I6?ATOAUAo_0%KV-S4$(AybluZzDqm#0UbS&O4flq@aJqPyGa4VaE=V
zL#7BVRQ2+c;Pok(_W?+fq|?CNPsefpc`)mO*pg0TE$KAYLcak(3b1=6Abr5es4&()
zsRW*#ownyH5d9VyRQBYMb62?$X4{pdP<NeoEJ<N+r0~-;o}}0I)On*aj=3-%DD=hy
zm~3*@Gu9JH+TBzn7aV^qCI$*?y?c_h7X-T>p?ycN^L4WG^|?EJF3v}7S2OQbc8P+B
zI&O5A!1=uh`)lxN+o%SXA^1fH^ydQn4X7Tg0GCUkUN3@R6!y3V;d3nlNbGefEHD=o
zzoXydga$gB{(znfGjr*W^e1?56gIZ!u0_fJGyMg<UL=~oq9=bCxiM|)8<kz9dhMsb
z(cdAXSh$u7Cc(Z?!59Jb4~c;*CxISUdP<WDrm4#EPkPBg@_iVIGuzY!<!W_7fhD@t
z@S4=Hr|vO219|jx2SKQL%PLUX-%xKO=m_w3?U6Kw>>Km<k*a<GJpB+U^+!O)Q(4$)
zOY76-RO52I1^$1fZu|?8q$bnY!ByuaYO$}n$VJ5LV5ZW!NZz7EePc@0E;W2pt|Hf^
z6;Z?esbP~#jjvCSi`4jr^w{lvbA_&ef`!?E0imB07y#S?18!eYU_kS^0|R<(V4%WX
zheoRp9HX}!NnZl&X!<#{dm8;`;E!h!MbDvhJdaz-FS37bsJA#4DW~hWKzVo}CGfft
zi`3IFyOc#Pq%B;eZm8X~p55pb;hg1g>j83C=&W<G<Jd-G6_HA#j6iNRxg_guS;QX2
zxPVJkYoKZoQjm+@CjP0=;m%6H&I5re=^Z%7pks8zUHsorO9KQH000OG0000%0C|B-
zqM-l)0LruelAH?-;iGqHLj?c;tP21DB9q~!9h0B$2!EAU=~ok16#oqb2F9l#ZpD=f
ztsw#dmsaZ1B1nw|L?R&C+D?*Z7@5qZGZWFacHj5KE}Zsrzx0b;2%LIO`^8WFlX}{o
z-aC^(f{`O|a^Ji6-TmHo-~9F8?|%R|fVq0?#c2jH24@&N!(d25D~45!Xi#xh#i)jQ
z3^Q_$cYkAbi1T`$DdP+#7)&y_pkWYG8hUY&!KHdUi|2TES;O;qfmw8BNoYtSr9t8f
zqiH^vR$*w^gR2_(Fr&g$kx^kOXuPJIZKj>n&5K5M&@iQf4MSJ;YkJhMql_O_u#S0B
zhU*O&j)F}^%rO!<&#<j=$6OM!q!%3@i;>VqW`9fC))gb2b9ClY&^}~4>1f)~Q>Kj0
zI(jxMo#<q+_Ls7fe62TaxNY4Ec2*LKS+1v>Ci5LLEW<mYzzMI$SRPX)tmyg!``A9A
zAk=TCC}j;ph9yUGnS^xC>j_R`(-7x$LU#<t3&aq|q(H<hi<FtV>q<g*ui|%G4}};a
zO@EZ)#&G+}$_OK1>z|fMs;celUZ&h9<3-)2tfWlK=+2CEf+koW_w?k<u%0cruARD`
zlv$43RgqP&x#*0kTj}W8#8sK}NJo9#NL#v>b4aA`UWR}|U1LV6HIg~Uk(L+jCnwm-
zvGVXvuupM2=Oks|Q!%zKW}~E^vXZ9l8h=)LSbEcTO2vx;4qSl_bP7CzM+NpV2%}vf
zg8c$r@JLOm6@eTcSFml_)i^b_l|Gp>%#?Hlu3=W-I&LVa?y_eDUShlpFAKban*y&g
zc#UbV;|+l~@s_~bct^#%0`K8{fe-MZijM?7#wP-wGWTcrT*VgxU*anjw*<as>3?tV
zt-yD<sbKrED`Pp!Gcs~1^=z25JjNdHT&-!SSytv=!LC)4uVCK;whE1aW#vo0k>mH5
zr$Qzjse5vO=7xgaidVJrC0p6@)nUGO>(kO3)j5EmHB`b!^o(5Dm_adlOt5Y%rJyr>
z@A177h4PbNoo5Fm1+C#qbE8ZVxqr6KaA{6b#%<?@@9ssiZn%M;4diEE!nMtuCr5Q}
zni8WYlhUP0*G;o7z2+HK9>y9jd%<iEo9$T5Y`G*yQ<OcxvXyIDS$1VDOPVx(!}Vl_
z@+BR5W40`Dj#6YE#V7SliPs0&^6@oWE^moV6>Lx^Wf?Q6pSM)%6e@6SN`IQtlgr*5
zVsF;|{46~<<!5Voes)w~9<XOE)7GigRad_v#~p*7m~gqt_LZ--D8=b|d3ImCKNc%?
zelgO+9BJnoBK7ZTaP>#zER)beUm&ee(1x1EMxN3Dt@{cq&1!$8aqX`(%ISluntok~
zl2kYC&Z7#ow6;X{&qIlH%zvXQ(m9XnNONc&p-6MhJZd5fsQsCEs?bBQmL!1z`Y;2w
z5{+bW5QhPO$2JuDr@2aJWI?%%8sFyKJ5Z-0zo9CRx;v<!T7VW{>+%py>j~tsVS%21
zqE_e8IEN$q^Vm3t9wI1A3=WzWv1zzt5u4{wN6VJmzhEn^+wypb_<x%x3*1%o3l*el
z7O}lVNoWx}^4Phor-ct$*CKY2j@^@iW6hJk{yW$+#ReA8@~59a&cX>a5FDf&KTTha
zr!j;W;y8l~7)AmkNaGy6XK~!341bSt{D=wsgh~8L9E-T*XD@;f$?d=q9QE^fw~)s$
ze!wxRp+eH#h126i-%X6_e{n&Ds-pLAZ1@MGv>{JGdK5g_*hg7^D#*HDU#?S4B#(!0
zS1g_g7z#$0)DZ0R`A?$XUk7l?KO3Y_57DlPXnPU-^%C_7X#WGV0i@Fc3N83v*!&p)
z08TcO-liyj2Y6f66+Y)_JXwAjw&NtqR6<M~&+HI6BsjK19Be1pSxzV*+t0Q@mW(7P
zF|%b9!YYMQ8faM^X$ys<Eq17xr3Fd{qqL=a(Y-g@{m*?*%T_|tuYB=)_uX;sng2QW
zis#<>(qlxlR6EN{#at(kdU-T>shv0Ie7b}9<tMy<<l>Ea=x&t9CV8A8k0viY&&^(L
z;muxpl()#^Or2Z3G@09E(N>+e$(-#v@9<I)?-bhY^4R62Z}Dzvsh!`W^V#w~N9S{O
z4ti-WZ}4!3ygTL5<zZ9a-Cml*J+ijf!y$Q}Cv?x3M_3+xI!APldZ~*0y;R8;$Rj3?
zxXuZG4-a^G5AXHxJ}(dQg&w}hOUw9T+4>TlFZJ+cLgc+3exH|Wtp3aM=@)!OKK+uf
zl*d&be!p~I?cr-=?tTwno6pzr_409pJZ|*x2fXwjzDef~dZ|VDc#UtCo?E09m)3{8
zd@Fz0OA)?J#QKQralpg3>wJfFe$-1J<&Q~!=bawDOWt>T`5wO4!ylKCPY45_l!>46
z@Ifzsnm;2Oe^%%Fywt-R<l}x>^*NdNfQKK{`H;?sJ^XnOe?dmS=%qe>NFGC8p3cKM
zACdRNUK-#p={(}4ePVz|<o&2Tx^;fc%a8LD@_5oqm+-|N{<4Rk^72>st9kr1KO_8q
zJnP}F$@@9k<m)<r!%O=`0sHxz`CQH4lE?Epzu=`CVK07>Uy|1SGW**)zpV3jy!0Vi
za0`D|R(($dc*V<$MQ!`>K<oQD|A5J8jKmYcaJa75>^xt6M$A}UI2ezcaVB4V!-m>z
zO<T{YZ*1Gz+PHq(*2c{(=WMCnx{;}Wu<5+uo?vx280o2QOT<Evo*JeJby1-gNo)^>
z2TTwDkV$XbSbNUW6)VwdZ2*ymHYRR#AY2?w?r^lH$BZ$}Y>LKus(WI=uCQ6XHx}&g
zH)GXJY7k^SUD3Ufa5UJ(G$+@@#(H~PSm+NXdTYUdUq@Id&(F1BOXeIbnqlsL>kJRX
zLwn2(p|Dxo*=fe(&A~`e@m8ISLc>uPfSh|xC=yDnWjed`7;+t3l6Pl&(RL<hU9`(&
zn$#4Em@NZ+9cFB65QAc#XlF3IJs1ngx83PX^oC&8SvhyM90A;WJ7Z=rVb+J@38vLK
zCD>uTVeRfv&p<4g2t^|`i!6_S2t}(!Ct`}u%yFhg$4v?nbz%EhsAE9Bx5dIt6D{%)
zGf};*wGmSa!XjdQ#yp*Wgzl!X-Av2hRhtXOt-=nvFi{_hr8ZB?W~j|~h5F?iI)gu$
z{jv=DE$B8AoxRx{Y%k5GkS)xZvE$Y_JYYh^G`r&UsQ}?!_%p@GiYB&y4_99p>aPZ?
zDIURpai)ITdV`42wt+slZg&tYfQ}wBF)k=Dp)C>YJij^Eue?a-AM5-Rgv>Z0GpL+#
z{9cnS`l4K@;!X7Rr!?(`b9PBsPEV~|KhWK6#>}o(H6p@gP{|b9=*n`IpMvy21j<pi
zXPTSSMk&^|rwF5~adRer;b~oF*i4v;&emvulex!)FU7<cO2<=ibcstDiL8l}Gwjs_
zHbHf2b_@^pC*#;ZX6~BoJ=WIf{4<?@4)MC9u}*V?Sn6ovC0$S$o1~n2YcSShCM<1F
zPMCfDN$0Y<3NfW~APj`aF!=njV&<|VBM#gh%2-U=?)A__uelF@{UJb8w<50f!S!Za
zi{obJKrECPtZoLl0$J-rJ*Lu&qgzlc!xoYLfdqCjgME@LItBq=!9<WL59F=gk;}$$
zw0<BI7Jt$C7drn^r$0jDd(2p<doa_hTcgp0a_Aho%M>psxY?k(AT!G<cgfhG-i&v~
zLj4v@IJ=ZHcr7}A8>4+@nkm}~ib!0PzM^zI8}G^{%$ygG4!|uGs^**f`pwRS*`>^w
z7wk+71jDMW_gQL(M#B~if-!$?J7;>WODu`0lXhoM)!Bm$+Cn{%U}7K!vWwq^);O<5
z%*V|{!#?;$LIPon8S4wh;}+;@;uG$8qANO(NI8e1wILdR>kB3l3K^VXBuY%~?*M{j
zXlF|-Dk(ha67b1>rlRo^YEr?cdK)7k8yo0{{xacUf@QwCXkTA20*5v*DH^lgSm#%v
zhfsV+D1x#EOgl;!0khrFcuP>soo8W*N;~7w0~7W5fGRg&m(E_W8#CcIMZ3qFT4z73
zp#TnVGm?mZ4W>{tD=o-~s<IGXR*V}^Vk)Kth>~1v&gho}DO6RGn3h4eAu`ZsrZTxh
z?e7%gSa4wy$ES^F#7?bCbCX(Ael*qv?|!B8ui<l@(f+{<IAE$O%?T5^1(M*<LQtne
zIgukQs`Unyx)&^7yqKvcXJSj%PXAAg(Dp5s#}aveEKPH<T)2pxFc<%aLPOiPOdiYA
zysQvjDo=nHA>(aR;A8ulJ+Dfp8Envx4EhRv)u1=%O@kif-+=xJ72mSxw+4NV9x&)2
zecGVU&}R+0kM1}4cl>*u{~+%_8vG~zv%!DiKch}MhDnwPxxX6xH~u?#%@oDpfABv6
zAxB?-Z1BH$hC#2=uMGMj<l=wxKMfiM9eRbnkEKU1&kTBjUQEtV{?j@TNrd{$)C`2r
zQL-7bXEITkUH;5G;}=}^8~h)BO&+f!to@<5KN9ut35G*mesH0tR2lq+u=*gsY4BSj
zrCt?Rncm>H`5l8tp*xM#6pcY8cNvC4AyZ+0RwtH-i67K7Lvw(F<`feb<*3$>u<N1&
z;V$r(@T*eO-y4kg`ccsMb<JgHZcPVDSLvF^(DL|Az!$cNM<W5hp?N`?=Zlt$a@1?6
zYSN??JYq?{2<r4FqR^0w-3Az(U}zIzLT!>Z8HDNum7!<oG=_v3jSXVvES?Q$t?Cbd
z#uA2Bz%yXor1oX1t`))qwIV~CB7}-%ww#A6MVZ=EZCcWfwvsXs%Fw23K0}+K%`~)G
z+H75$V`y_VFgj105A$g!8QKEb@7&Xs_hnmpVM%<Uzbk6Sm54ZnC4!-dKNuNIF%QhH
z@;BJ2U!?9vHu9VMkpIJj{v~N4tDvoaw0SmnoQG~hE749iw1rx!p)JzpGri}iOxSzJ
zu|?G1_rGyqXk}Wtu2mRXr3Q93y}QH`h{2c;P08-hu?m!{wZ#VgmVRewOSGlTz1yYK
z3Uw;f^GCaLt@2wZq<JNgl1MwSEa#lQ;2`{UkLm9)&4@n{?CY1v@b3*JdaFu*A_`n%
zef~smFoB2ZUzqbWw$R@ni(+A7&<_y?WiJbBDs8N(vd5uIE4mTSoza*m4%Y6HCH`Ox
ztY!G5Y-ca`cgLcAP)#B>5Emm@Wnq;F=FcpF{iqZJ{*rh}B<b9KIhn|i)txe9r(K%{
zltDnoU#kkraRa)x%+Qu=D-3OarM4;=rV0#eW3k|%lz)bHiUiGSZK=UNadmG;C}M*x
z>X@U|Zdv}CEdE`cy?s#>VvbcSuw}r)t{OvIqn&DKYsH0qIjRI3v$S>EX)?byi_cV5
z3D^)FNKoKJGw0aFp{~^#TD{g_Xd49i%F;lD$`;<AEN%V$>DpE>FMv{iPLIZ`A}A4c
z?Q}!is5R=^CPO<zYcjNEtp&q-t%B0fHfvi9?M$r|WpK_K%ivP2&Cs@rdbbI<P0d|c
z>DqQf+o3fY+D_5`tg%49IjcyVo{40cL!!HO(c&(Hm+(?U+pW!HT6mnL5UT0qumlN8
z&7~)Pmy^uib{Uj=_gs~KPgZi;+8c}RwNBs@vyUptWT!eB6H>88<yP|;=h)2Llv%JA
zjC1TPGiDUTOjB}IvFbp9Ld#X!*r*QmILv43Vsh!Cv3F_ychf1;IVW-x_&;5@6^`Ll
z9f4BJrtjXon3uW_I`LZgD3$Sv)WYtdeFUq`c`u+Wh13JP<8+pPsICJm;x}2>B33Sy
zL+u!`Gp<#pl;*rhafjlT@Dmcz+P1pJ#w5<Ug<m;wR_3@G7*8sF+|8PAb9Suxo<uac
zXK}8rpd%e(iOtnjVmun&W2Uc(a<G;5#R+PmD9#d62w6wtlivLn1{)WpXW2J`((93X
z!zOk5cXfuNalB`L<}i8sB2|wEyUlH}5HP)T%vIS~j(tbH<d;Kaw8wJU=Hz{fL}YCT
zR5Fk-Ee&}>Da@E!nt2bB#1c7cqyB9%_W?MZ5%tP;j+8sOt^0$coNUta%`H9F(NKB0
zxz9pe=uQ&P)+kdxcvry{>BJUGj&9GR-rhOI5CTuT*DnHp61xZbyMn^5jt&d4++8+8
zI!hPHEnx;EN={X3%}+!(rZ4x3OB-_s3Qq7nqF_KG_L@~%cPyvYL-B^b{=}f%f~)MV
ze*PFocK7jwN=^Ehyi$(Ir{>hu@m~ix<Dm<oBnQ+#PTZ8~b7i&l(P#qL66|kA9o&|{
zNk!B*NviFCrr<yXg;{J<FqU@mF}HCUsB4R}O2k<`Zuaqu;x;cpNf;l497#>?%1U>2
z(Qp{u))il#Db}&`ZE23H$2_^H++bZl7QlDLijW_Q*C&q^&}Fa-emEH#tqVq?5mfzQ
zD;lSk=D1B$DK#$o6UH;upS~K@_Xb0W4HCr@RhVRd<m71?X)OD`dV1~~D%o$%33=bR
z%g&5K7^RDfx(RklN`7Z!h}A2K3?*yV>~eY#=Y&2B1h&{m6Q+}oE7zp>u?!~ZUoK*|
zwWWSa&KRgs0p1kdi{u*=s7~&YIVa~Hp5%!W@Se$6U2ibf2FEjjTgu6tVdY1~DL2Wc
z<ID1Yuk0JmNkHP}Xv}N~n|;tFw#pYowm-A4tkiO)%}6k;YM`w#oC{;|pcM}ijD}<y
z8M3mRyYGDKR{&qyGsaz0R%a?C>o)Xge&*T>I5ue>6;nGA>Exrk=x$=V2VWZ9i|>zT
ze3#<;6ZFZ{_ot{(Zq(2&luI@BzK`x#@6XYH19%r<?t^p)&%^k7FS*Ex_kyxva+Zyd
ztG&=&K+g`7{t$V}${(V<vWkbuTUPlH<sVi%d>+pk<i>LqR<58abP9M_O>-zfCs7T3
z0V8D=P5L4|M5J266RVbRrKy(i<v{Nc4Wmb>-$Qwd@`~~yGMdZ2Ncm_?XsH~ci2)~n
zo|6JDbb5TQ5t`gy=5zU+73ITJFhqq<P|=|jds874(ONuDqlr`t7T1I2dd1pWYl9SP
zE9eM43?^K(n7%|KpfHgZ(j)XZSepVfJV8%Fm>D#azKoWOp28X@<}bs{uh3U5#`!bo
z%fracKIafk3Ah|9-R_k-n4fxpJjL#R1Ef0-lGCx$Q|vham6lfw)3mb6VVYhh3ydN1
zmHS-7G^4B>oinleAk_yv#k%_*D)70UAp`Ru>Fj{Zxzc^5K3c4Qj7}P%Iqf4fw|$uW
zh4Y4JKDIllZ~+=aR5DB_KVIy<ee|-!;B^9Rq%&w1BoghkLN1~pT&sh;)QQo5Zt_zP
zl~6C0)A`UtAFZP(HBdj+U5J$zP&377C&jU9fVyZ8X78mi?W61IBKja*tTfvVYJNE6
z)AS5^uworOOJ73^T1jd9W~D_|Elb<d5*<5KOKjl;XV=klaB>$YUPE68JvX?#ioO9y
z*Xf&>xtcuh&;*?#%=wPf_$@Mjc$DUnN2g+)igfyxdOoiv5bHGSEg6{g20Sy<fG^OC
zRvhpn*h~yKBA(Y$X{!}3w-EX)EVYz6M2iB>5h`l07@{(J3Yz5^Q--MmJ}RCG3y)AG
z3{=%FrmY^P#R0d^Jw!_ay1bV9^g{uU)$%+ZaKf?klGa=fVwFc|g&1^yWpeLTnKMp7
zuei?Y)F>Z<SZ9+7>k<B<>g}TQV5wzj?^SQh0|M}IEA%gihhKrnxQd$SYOLOm_19s|
zeyq5T60q-Hx`77iM!JJO0NdQ8EZqvL&ZF(hf=;YnMlY$@I2%ClZF(8j8briBOW#p2
zFp{$Vh#hOv5<k$eW{AFji!X<=>MGJkv9YeK_<YikmMtsAjNcoDk(`;s(kqsHg}!fN
z$nzj3+wN3R7C1;}wqz=9jTI=Tip|#IQDL`_u4XvFy3}Ch<A;?1ZZJ|~t8)&VlIX+e
zy92$q!D&ANOguo_=yuvcA59^m7eVnX{Xn_;&XiJirb1$;3It7msUnZGMxAQj#FC`L
z)?ny|^dlR%zX39Wa+}J43#T<#JWRDrEtL-wD)9rf5{)_ry`pT#s<++d)U>qXsSP_0
zjy`i(?URQ0yYRdlcD@IZd@pT4+G#|pNeVL$c=2O}jo=|A%qArQk|Vt0C-hTr{4?|#
zsh*$P;!Py&ZHeE1U+DD9H<V<r(ywd-zHFzY4vDn#bflHrk+vZfX_6RD-;pWbMzN?B
zI4NU#E1--<hb-O%G%lAlm3W@9Lw2)FIA7t^LA*Z=^#3e)y^l5{J#9zQ+>LY@M8Zrb
zwvLp%9rSD4cpWyL%}37pjlwgL(?h_f-Eh?m*zw3sww*VB?o?<;bVFg&5o&H4p_X<e
z;?2#DwFQ&u5l_H5Tf2*V6=Je2YiHj%`j2v-(=mI9&OA8!TX=5kK{5g^Y4}`^L!`DA
zTM+@|8dtHa^09lVx`0M2i(ShuJwjV80NUofoAQ0m$%}_*`wpK|y5{e=(!~cyUyzMT
z4uQEzU^JkApkj@BTWZ>ls)V2jHxw`lp<95=Jsm+k8)3Zw3MhpNmLYYnf*S<zJ`L|W
z`1eMLe<sr9ZY0cJB!~+D>4QiP??d0!aAi^LS@8J+sPFdxc?YP@q(9Ifp`KoV%Aeqf
zZrTdkf5xb|{SEXNC|Tn0YWgev4T_yam(t(qAK-m|BU0BtvDSe-*U-P{-=HGKSVH<J
z2)h(={70wPfE}+B{>|6`XhA}mjBlOh!ek4OIbKK3$xIe+(3^Jbje-SXqFcqD1l<k^
zx+#S_osUv`yQ8A*2<<vTyANUHEYz@fVdy<$ha3;n*_suhKIaiS=NU{ocg!Ri2p&qs
z<;g04MZEx_Uxc_XA=|zTkNghe=M_2~0Js_8axM@;)VbW^Fy*P;c4SKHEvQoim2>HB
z#Ha&n=h8bWmebKHV?VdOcoI3@B0r*ahSE$C7LPL7;rbFb61b?Ve1@Ed5qupe)x?iF
z56HJfTVa>3<SK7#cM9INwYw_Y+TA{<$Qf{dNgX38^5n-;j#dV+Byi&d4=!LsKG0zb
zVyzgFGXpNN5Qbik_i7kAUDeg4q^(2RzgtOLXJ;De)6nMtty9>6mJ_SJ>{NAz4Y{tj
zXc8=+X?FRU(GFHjP%zOdNOC*rN60*cW_NSNGuFol^&t3qTPnn)kFAs{u-IMfx|imE
z`JBb>rO5mG5QPqqQR&kkrt>t~aitqk_mj%BiL1aK(Q720nGc7X3}a1!DW*dfKZIHh
zA!@<?CbYMJv!tn4BX%Srbd{cyYG}2MJ{eg-XAk)I(^A{$NmE-rNmG}QD<9RA&UvFa
zG3a(Z#d!kNoQF+m&THgiv5v<1_%o7!8A-E}BGFSou=B<C3cm}(0P1E2F!i;&AEijU
zqc93LDC~z5z!xrP8>X13Ylz|jm(Mjsi37C3Dx3z|<$KRC?NznY2<?M*2d(O9NqfNa
zG)?pAg%?^e<MXr)(M8B(uZof{ZaGM^EVAp+EC?WwE*+xFq~pCUl~0pDGi$tmFI@*%
zS>rIIDMnFr4MI!ax6mcFWA4J?f*`&Q;XOQoig+Rw^JH4a1r*>y=(z}BFon+LsdPS1
zqs!PwSFxY2;hA(T&!U^qzJ+JgtvrYB;JI`U&!bQBeEKpkP`2!c)pt-8D8H<Nu!JY_
zBv`eVW@DGT;eX4hl?$+w69{{M1{Yy37hQ|FQdv0ZR@n4eE>>yksgxf)rNWyLxre~l
zlS;Y=z}?-p)f>p;8O6S-`WgQsI`!#19hH}kLLY882YrHk&df<f>rtj`(&>^3et3hA
zXV@5d1~!qXD=NJF2wm}cx^jrFYAP>${}5d*r%~&m=9MYD5Y>CBl76axwZ!JzfR<;f
zFxKQJe4FqSkX4|qrd-9+QoOEdu6UXjIo8guK)#z-ru?pA_EI<=N}H9=V(0DTa@>EV
z1F`l~N&ok!a7H02S74(`Fi}O5xf-Fim=^I87-1<b#`j8IoeHx>m^lZ@%ZcDvppuaT
zY?kp{m{nM>NvXU>RY$CU)H{J3Z&RVp^LX~_Afn0t^k8Gklj@K|bo~hJZ$~z{R%)8-
z#B(2}>m{j}(z-!Pxf=y3arTg)_`ngmNsbzB`S>6ZMPlM+c>i-FbPGb~L+w8IFx@&#
z9}ehcl``ozpFT_<k=QtJkS5^ZAuSv{4vyZ29dDOHB2OB=JXE-UPWXAZ7#Dy2>Yay!
z-sN~-PFJe8GkuigQz?(v(Il=VAFqeU*5feJK<jt|HSp=QkvGvUZlZ2(K}2lEiL8YN
z@ZQH;=pt@KgtXD+cwd9}b-Xooz$l?MJ_%9bLN!s#B~YdtT+QK=;V(K;QkYA5k@EBF
zQ%b*{%j_g~J(nwgKhL8pxB|va<DIp#%B~4&Nq<`~f4|PvZ__C{-3Y%P#paozAcNM3
z4&RV-$ZM4M25G8n$gI!hhf_N(ehhu$rX>YV6ml))(CwD?mCie8VnwB+7%+6l!O=g#
z8CwB72hxS8D!q9Jxp@~A@NSyLX9M@op#^+yMp`dPNnFBz%a96LwU$FOlGf*{%E^Hu
zdm68Ri&~Nzq`gIM<P{u+InDHB53l4^c5F3Zm7Gp=b#`*3Z&ciBiz>x}-<raw*evLX
z4@>Df2c)t9$r@f`>)|ZBR`P;mrJOai!#Sy1f_YO^y(y|*P_=Ffyl^$^rohW<)lESv
zQDe__e3~sTM!?1%x725xdp`?m+^PNC_I?`NSaREXx>K3MfdgDItm#D(wf=h)4*VG9
z{TH*@z@7vNSE<Lk69)hQK$C#QFn?bg*A+d3mJwoDB4ayXux0ETAqf<_aoZTj4HCr2
zLEy5b*h%n68pPPrj53RjyQg)xbWPf%O`A5|o9?8IB`37;_x??7e!X{QkbsCL`SRwz
zH+MPry!-BZ|9<!FcL1Eh{V+~rtsQZccvufZ#q}^rH+U%XP!XZ=vd)vLh<|6p=)fAU
z7%Z6~Sp2oa2;n9#-{N6I#O*M8@tH6_i_eAed3=HGzZk-o!gvl}4&xfW!qOcPU*+%D
z!WhKYdH9BiZ;E(6gl~m0gl~uN9ajD>58q=)-)HFs5if@D0~UW6!b>5%9Kw%S|HmR;
z5%9o_UXaU^s%aT&-nLX-6MrCOHBB)xW!W?pQ^4Vi^AnRZQ>#l0Q}e6SbGfP2g~j>o
z>_q{Qnd|aRIaQXmQfh%5Xr*xhof%y-Em^ac<+7~^=(;>VcWElK*s$s<8FI0#ESZWi
ztyfsXb))L3$JMezE_$kleqAY8ld3_ZZrm0SJg;i1bwR+f*lz9Jvwx9g0sf3$B(L2w
zs;11^mAqms%K5Uwa5>jy*-&}zE&8o>m69Bq(T!5dMV7i{$knQ1q%O<W`UH_sAx(pD
zb(a)tH&v^#R(4OiUm{{nE!l?5y5l478{y=8_JZjw?DQg_rJI%k1%&dlsm#jEai~ac
zU9rQ^b*9#xiTs0Ro_};jtqPcny?0|jM4l~*LbQ$Yv}~@EL>#)(sTNUM8h2I{)09if
zq*_u;OTeJ3WGV&QP_5gk+|J*mAIRUfxNzI9rUeL;<G~$Xr#1>o)#E2<Iw2^+f+ZJj
z<m9SX6y1hW(QhhK8<wJ(4()!;VM`!(ge-CBRf5amke7+3SbwRd`RqOvFuhAgxl!-i
z+T^@SWgy}w0>b1sO`GOy$k6@-HP4El_m~V9blWH>yhw$<tE|S@Lc%zHD&Z4&M8Y{d
zBH~pEY5YvWRXio(Nz6)^#uIe*ce<DGbG#-&MxMIBUMOi>Ef*C-!Y^3om-rPilalaj
zo{i%-5`N3l?|<-`fHNPy^4Z6E5x<x4I{qNyj}rdG?sAwF;LA;(74c^Yf5BfR{0*BD
z-oW1l^g0kL<T#a9OIgiQN{sIxtT2u@8QWa}2U^sEfd1y{yscSkMcMIlAfwymVpP+u
z=sJ~dRMo1s6?KbejD6QAcM|HjC*du;En$nnzQy69?|+v&wY$9yR>D8=FRB=?b5fyl
zO`MBT-9=S1YHK$%{gy+~J7nENK9}dNxoc^`t8ib8TjTHtJjCQ8HnO)$5A5lFX{Ydd
zV=b$FuQI1hd2lGLC}8vhoqeywxRY7>b|xoUUI4osExQMadYOySo46Q`wBTTp=q&3p
z0TWGmO@CQ3Q~^g@AL=F_(#|>c5KEs}$YitIIFJ0FCgnDetaDEm2;k}c>Daf+g}7C?
zjm{q%;Z_&4t3}x&cY)Z|G?Nf4deMThth;hBmTkFR@m3wbxw5!!=(o5vI^1^9%YeWa
zm5sSIcG&_u@zHMD`R)FCD3)y<mu~~FG?Zs;xqoc#@#j|b_{f!g;w<AhJ(f<>6U~o4
zJdCpt@G+XTAwlzx@0gDw!rhPL2sc3biu8|~42_S{Y=v}u^zDw<A;c4R(H2kMh3^f=
z_=02Rr|~F_$Iy-_x+wG~X(j5K;W11Aj>KUEN8&(jB&U(_!n}(B1qSZK6E*nj2;}0)
zI)8$*@zF#b;yM2oLM!~My^in}I#%kCXx3RnSEQSUK0ggL^wjadxxlt=WS8!NUAm5x
zY#If((7VzX=nK|yaI=wHKY}z4Q(iGbJ%YnTYKAD>K+?%^+Qr<+@eU?2MH#izoAq%b
zxs9xBTqMaywiVJpOFU&rJ4*}%$d80eB!2}-ldc($3zKHd>2RC?`tRXT4TtM^aJHF?
z3xCvw--H{cFYpirJ?+4YyKWlrh8-w^BQa2h_aJ5*cx`-#cmQ4}JGLB)^xZ>$jshN;
zO;WUhEex*s3DnU#j`f_ZA-b8{!q7_O1nt$y`;O=1^n^Z6{+jeXM&krM@YCp_)PIL4
z@(GH~_#P$-f*8OYE>rvtqUckYC)*PwFJRHhW~_mJ3`-9BWs-vs@*>4)<15-jeVr`1
z<a!g4kJNDL(ScVHNNgs212qgYN4_29dWkmf35qg<PO@*7Yi}c3FFx%=6G>wQS16Jf
z_dn>QCltRAytvPiCHw3ro?^KqZ-33H3xgCqxtSdFU#nrH8T}At49YP;`AL*v59Ji0
z9Gbh;-$2lhr|}HM2;d-Aonn&ca4{C2gQXq9e-ROJjp5K+#DnuZxnbhYCn5wW`3geu
zH_^74h>SL7zD?dWubd)dR7OrsrM8d5L-+RpzDmKKqTo-{7Cl27cFh5N$R3T;0DK;W
z#s(3Fu1@-2bc$2KN1gJdYmw4CgZBRcv$4z`1r0!7MVMs+003DD0Bv1oI9yv7X7oNr
zi&3IS^ftOEi5k&`3?anmT^NZnL^t|TBHCagL`y^qA$lizZuAl@2$RGmL40$4x%WQ4
z=R4=eIcx2At-b&3=Q(@tv)-3L6kl}94E%|Mq7u_ROefU9y@wJh^`y?>nUn(&7*UeA
zq9r17&|0BMTVa^=CN+bzNO+oru8?%7fbC`ihg0w}+5UBfF9PZVK0d*(gWk-aeGzZS
zI{A6JdWAs0O^bR(Lb%hK*haIEV;x}`+r}gM%^|Z-Wbma%Xoi0Hkeig76eGgY36oCK
zi>gbEc<N>;5K+JK>Q7_STl40~dddmvl|&rL@EGfZBL(x}ic<cBY^G~_iR+w_I<lS_
zNwsnPWhT4n;V1p_--O2o-g|T=ZDfYjc;tS*J&b6hq;67mH7~As^Qg6OH0f^lCTBz@
zYp2ZI9a6a(-ezj7W_betEIPW(Ytn%3K@iGHsq|6fbm8s!Dffu{h+F+CQtYI>nuArP
zOjg1c{s(i@BO?#2Lbi`J2T$&qxz=ml#nH?PH|4zZwZ!d^qpWvn3)1^+hPkH=s?t%=
zyDV!}`R>no^$Z-VH{$h<dj~)4BPXmqI}^qYoCTv_w4f<^a(l>BS6JwHeq9Igvdy6)
zeca_&BmGo(5LDlVR0L;enh8sLltx!icr^#U7-w7dzxWvQvqs(T9Y6God>$5r#3Z+e
zEoqD@4Jjps##{9EysCB|-ay|xR(kfV@^otWfS*LMkjjpD{P9*JoXHL@9<W*L&8VZ1
z1)6sl$L=yYf17@Dr>?dJ)PT_rw`oLGs(}<4by9i0709tX6c-;@Z+{iK*}?UTaOH?D
zPL095%bcO*@dglXNYbjbztzTz-k>K70bR;tn+Xk8Y!8VJ<vZlCtXkFLz*=kH<Z$rf
zz)g=?^DtC*4(FPYt(9B25_nwhb8c4a=#g}X_G(>q_h)0HDdgxXU15o7ZX`lAaz+QK
z-)B<ke(JY~IT&0l5?ydaMKu1XKDy=r!ihM_83%aQ(pF~aNO~d3VVyQn=><$?7^XZ9
z*a*+0KRAx8pIqHnLI{)^m|{Gc5EVAMUy6GIzOk-u#@$CG89NlAtThaPQyd7S#E4y1
z)$=LU%_Mc$=%f;#W`k4A2vA>*$RW$>>ycc^U0n2>4)m}e;FK=}4jSZ;HTBzgZ#S1Q
zrvnYF8=Ufh;485J374FzA6Je>%2jq&x^c9vG@XgYZ~!^^sd_0+I#7(jI54F_BZWmi
zgfO-v;_da}V=(w<l<_L7;kU2<Be;^~DM7SLf&YSyV<sRFJfDxIQ!FToU`8jVGsBvG
z_h?-%wzRZMpEF5yWVzJ`XrA5DND+NA<oTGwHFw7#Eqr(+ARv=q8g5lqCv;FX`DltL
z`2~ib4b50ycdw=T5zF3jYx2y`g`t<(^VG5LPNWtOTMk>#lv)oL4tMVxsvLpCU>aqy
z7O{;J$rgHo9pyLP!Zj#RNjhL}7E>GEmAcTk23_0y>^*FJ>C1@_=B3zJIbF+GUIgDm
zIn=^XLGfE0=dZU>$VK7h%0RZkmic7l{*l4@eD7=I51c3GVrRkOPoIR|L&@V)<>Ro+
zmp|b`e+Bm?(|tRl|HXc|N}PNd@i7^<L#S%-RlYM_<h`S2@LVz(>f@YgXz=3@#o?it
zBR_Z-D@D$}u7IkD9i(7Ir66;k{2K4FaW2C4z3!0+=jz7|zF<z<{Z%x`wIPOgEZn>I
zp3K|_B}MsBl^NC14~sA`2Qzqcp?t?;2BPO%Bx(<Z``V+!z8a`x%VuB|uzXT4!kU!B
zlK#}mqT(+2xX3w=+OikJtAYpACs*BR2$hlggLf%D)%(nuZ$@s^Ja%)1vEv{>6M0Cp
z15Jz$YWhi9EOvX>C<qxC6jbY0J8DH}GB9fT!p_wdu9mp#(=!S2I8{)5cvtdD-SwL(
zvrP5ak_OyUKE3;oe64f9qmz|v3?2;85W`ZBiRiSV5Rc|v6rSz7|5AL}mhOxhtcnfm
zR1KAGa3c-zU&VygCH`2-(%4bN^hnhvwgu-s$`!HtqmqAWVQBJ+>x~S_de~@XZ+cgX
zz4P0E*qw&rEPL$$`LI)xq)csn{`zWdU4>)423OtTIe~kK@Qj5*Hz<T_wBFT1%%3B+
z?CKTJH9wPLRGXZ2K6)+sMOTBH%fu*IVq{o%;w>8mc<N|I;Ja<>Q+V2w7g8D0krlL8
zOj#!cyy$WK^tL6XpWJVvk0?p}G+?43GnV*$aOS&4*=ED_?cow-RyQ;rUJ=H;!JX+6
z8P{23C3aorq!+oxu@WqHJj?ytqyB*YZ4(vB<H}1VC|66eWzz(Tc&&^WS}Bd!+$58>
zdfX%-Lqumh5BFRsqdqdvmKmnLrxFYvu`~W!?VRhCyTLtZpv$>qehE?B+d8NjU%sj*
z;8R#U704Bp(~;h5=e4dgK`yz4nm~M%SaFHO{}n%EL>EgX`0;&o?2!<nys+d!=g!!;
z3nT}fhGHC(*3z%L`M^iLuvY4A7~-rM+lNHbP&tdFG-Q?MBDSqr(s9ATiDp4eD&Ja1
z3RwD%NI9Ro-5Xg9*B_rOnY7NPaQ1Ph90@1u?SHZ~u(p-a-e@q0^(37lGK;P>bN90h
zxj)zD5X`V>@3B~t{~#N7h4*o3!nN;%fwZI!r6_kdY9H3ccBE#oVGsT|G2z=0p-VzD
zR4pd$HsU0OpKe8fRn@-kA>=e(;p%Fy2#&$=c5`;BZj{&?9Y?($LyrV2#7RQ;r|WPb
z4eg>CXz0kC?I%h1C0nUgi=k2stxP4`aS@}T%5|S3SZHUg+~ARDsI~?Fvs7ja{i*r3
zQk2KQkqW0%yOqNUAqpG1H1>4MTJb=i$Fn<s*2Q~f^$B&zfMUt*q_cw3yFFCq99`V3
z4Xfbn)e#wsy|qeICXVIAyk}9~3-SblL$aQ=scN3w?0JX7CY&u@r8gWja{`G*@)!$d
zk`x&6U|KBb;3N#W(?k7B*A6gw3R~$=)I<*q#yOdm-(%bNYMP3^?;XR}6-b`Ucb8*O
zF0kvT>1J%FOVv2@?eWmI)+B&t`(fq!3^@Zg;l29oI8aZrMJc{HXqJCze)>g=;?*so
zjnMK-uH&_C*O0}-Dvq*EpZkP7MRgOE%J{_0Ox5*_eReH&-7o@<@2U8RD_WiXP`N=H
zjMf!Y6HyIbi2JS7$EN1q+J1!euw7lzl(nZ%#obJ^82i>;vn;pJHGDI$qG#^@CNnKB
z6=WMbU$JC#Z4C=M3e#^kmFd6VID&TW1aNpjzgBtMmx#B2hb2j<ZH_mXi>+01SunTi
z{!nNS34c7c`2%Yomu9Kq^kG}<7Yc(h>e5+|ozOcP43QfigjavrJ0Re09#<}QdcNW3
zmS0>nW&5+|O-V<7-E9SJD$_Fkmk^Ym<oM*)5IWud$<{(LAq%@gictpNJLDy?hVPN=
z?dIS8ya`XiHev7wc4U?Lx5{}ciVqAvG-dwks5&r#FD}8!Tv`U}JTd+aZm5>DX_YGf
z*y)xke_>E?%eZozTm@`A@8*4y(@2gku<n-<^DBBTq?7rNC4wn6I}6o(m|IN+Sx1Uw
zsBn!Wht@x59^blDQtj^55leD6T1BCaB9^(DUxw&R#nP7&(Mi~kgi=MLuczMWyOUmE
zhbRo@=*~={goc|(j>SK!2taMQ;x(W1`GqGZ)acl)%Dh=T_UYGx1<{ls8=W?^L6Ov?
zFC^UPo30rQfNA5r{RTytV>r1Cn5S-(XLmD6TiP3g>Xe5tVrZu!%tDE1or?v$)@h~|
zbE`QXROe1=G22C&(>MpQwwt&;Q>%rZc9_tRtyDl~vR2f%RLWMOMA1{yfzy(c2XN!&
zo+P-mwud>h+xuKDWJDmb)2p7i4>S)d+F+kfC`G#9BJ~gt6<v=mU-u4D_Y#?z$Hwka
zac(|j^~*NaF{_RF-ij1u92=wIR|M}UOmk}}#z50hh5nF@!h6&&9obRsPkro}?p!gB
zD0)tTeKKNwBQ+L+;`{*4xa?=3MLiyWIF*_e-qyrgp-Od?(K4$$dVc!ltNjz?cy^4j
zX6E}mRNnnKzhCAlM`Jpp6)T=RxF6ywQMWoD)aC>|z1n28iQ1ObX;H4KDYDRlzVMr=
z!qyT#G}US~H+o21s`kRAqWD$*j^nQSV9_&!KXC~yPT1~C&r$Bk?!u?5ZR%jjexFgj
zS6PAA(iXJOzE}D3)I@9j+3!_wTo(na?_FzH#9669nqI#f{%G5AOeL56MmFn{>~rs8
zhH_#BvyM|t_jIerYcF%ZN-xq6d41d;dnF7c^VRqjI%C~-@4ks7Z&RBYhhQcLMh)_J
zdu4Vr`gVvIC2Ub*1a7g0UdFxQl{bWIK%*i@rSX&@e>k~Ryh8XwPXkk@mM?7ykhzd?
zGtKIV+UPWGgEx3_JKZwEH4<I{63A4U!K|34+fF_z=6fPDd*TEJ&0&LnZEFfkzM#-J
zqG0qD?--J~JLJkCtZm}{VP5`Wd&Nuzv~q<6b#(_hA$6!$ZDaVh(!y6kJ$RD1N_-9Y
zAeW{$>W#gX)<T3gfBd?J22Dyk%wY%8QQ7O!rMjc|BRW@<M!^c2yNTP8t%)~mr4@f|
z5H+Zwfdj~6<*iM$Od2*u-W5<LBd4rFJcHsUHljluP*YJii@3y)O}<6foNl(<M~7uu
zeMO$I7y*!Fw%4|cp~S>paoqQT<y8dnM_DRGK=0FCVrWz92~hsYk$4@erUx*sd6PJO
z=PRTJ;@2G6&(*o{WS`&hM8C@Til)CWZ1}7cuq?<6h_4G1p9>({tTTh=V8HVFRiI#9
zfbD`f?cY)OCpLT;SX$R3K9{=`+h7KbDWAu9ZE&-n3tr+otH;+$NneN=xpoc`yG9Kl
zSHbN6iV6}Cs9XT{tN#Z6B{K*H^f$pI=NfK+-6j*L>Bjkxb2hn&&xN|$Hkm=R+ULIG
zO)>ThB3&1<>geG?Jb1k>Qov(N2*i39;I<b0Yb3zf78E3az?(dPkpnd_v;qc%KSM!!
z&Vcr3M-ZngQ2iMJ!npy=+sYtrcOYk*4e;6qvtQs(zR(r?9K`tl=#&AURc7}8WncX}
z7#r^B{a1SC|4+gS*sNRzn7zQ%|Kf@KfWl5DK+T5{xaCC-aP0_zDE)uCpg<7bw0U%H
zF6@#6xdG(B&<^-FyXNu^6G%PipGFi?08rWmll+%C&uEtkG>rPE5gg14<n4mlFK~1H
zJqr928{QJ}8!Qi!eezEn7r+eM{2~Mr$Ub)^e9;4mV$NUba-aa&o)8FEbZ+YGU1q;f
zVRs?<Z1Fj$C7%v>j*qb^`)!f~`+Gd>{}zl85O7_H<E{7&Bm;hxkOD^gLZG`n=Pt^2
zY9J49QuO0ZMS$%ynEjta16sVi+l4f{19%V*V2qOh-55U)e}WTbzp!O;0dMvJSjMTc
p|927hdkuF1Ks<{FumkWZT4tl0B=}iLKp>C5a~bd&&})BL{{a~b{e%Dj

delta 36122
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
Q>rd#E<Y8bi{`_z2zvXbYu>b%7

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 93eea3481ce..01f330a93e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb43e..1aa94a42690 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29d3e0ab67b14947c167a862655af9b..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644
GIT binary patch
delta 37652
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

delta 36122
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
Q>rd#E<Y8bi{`_z2zvXbYu>b%7

diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f0c..46671acb6e1 100644
--- a/smoke-test/gradle/wrapper/gradle-wrapper.properties
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/smoke-test/gradlew b/smoke-test/gradlew
index aeb74cbb43e..1aa94a42690 100755
--- a/smoke-test/gradlew
+++ b/smoke-test/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

From 56e0d4bdd5e17f6516d55581892c56743dac84d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 11 Oct 2023 22:15:50 -0600
Subject: [PATCH 3271/4969] Update httpclient version to 4.5.14 (#7650)

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 783ac07b28b..ca9cbde42f0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     testImplementation('com.google.cloud.tools:jib-core:0.23.0')  {
         exclude group: 'com.google.guava', module: 'guava'
     }
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:5.0.1'
     testImplementation 'com.rabbitmq:amqp-client:5.19.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'

From 3b2676a248ebd92c3c176df7654096faebdb09e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 14 Oct 2023 15:21:32 -0600
Subject: [PATCH 3272/4969] Add Checkstyle's ModifierOrder rule (#7653)

---
 config/checkstyle/checkstyle.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 373327ad263..5163b69b18a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -57,6 +57,7 @@
             <property name="allowNoEmptyLineBetweenFields" value="false" />
         </module>
         <module name="OneStatementPerLineCheck"/>
+        <module name="ModifierOrder" />
     </module>
     <module name="RegexpSingleline">
         <property name="format" value="^\s*\*\s*@author"/>

From 57ca6ad4f0a6ee8bb5feaf428b5c66c7d25259c4 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:17:13 +0200
Subject: [PATCH 3273/4969] Update Docker requirements page to be more
 container runtime agnostic (#7655)

---
 docs/supported_docker_environment/index.md | 33 ++++++++++------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 1dc816936c0..1e90b36ee54 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -1,28 +1,25 @@
-# General Docker requirements
+# General Container runtime requirements
 
 ## Overview
 
-Testcontainers requires a Docker-API compatible container runtime. 
-During development, Testcontainers is actively tested against recent versions of Docker on Linux, as well as against Docker Desktop on Mac and Windows. 
+To run Testcontainers-based tests, 
+you need a Docker-API compatible container runtime, 
+such as using [Testcontainers Cloud](https://www.testcontainers.cloud/) or installing Docker locally.
+During development, Testcontainers is actively tested against recent versions of Docker on Linux,
+as well as against Docker Desktop on Mac and Windows.
 These Docker environments are automatically detected and used by Testcontainers without any additional configuration being necessary.
 
-It is possible to configure Testcontainers to work for other Docker setups, such as a remote Docker host or Docker alternatives. 
-However, these are not actively tested in the main development workflow, so not all Testcontainers features might be available and additional manual configuration might be necessary. 
-If you have further questions about configuration details for your setup or whether it supports running Testcontainers-based tests, 
+It is possible to configure Testcontainers to work with alternative container runtimes.
+Making use of the free [Testcontainers Desktop](https://testcontainers.com/desktop/) app will take care of most of the manual configuration.
+When using those alternatives without Testcontainers Desktop, 
+sometimes some manual configuration might be necessary 
+(see further down for specific runtimes, or [Customizing Docker host detection](/features/configuration/#customizing-docker-host-detection) for general configuration mechanisms).
+Alternative container runtimes are not actively tested in the main development workflow,
+so not all Testcontainers features might be available.
+If you have further questions about configuration details for your setup or whether it supports running Testcontainers-based tests,
 please contact the Testcontainers team and other users from the Testcontainers community on [Slack](https://slack.testcontainers.org/).
 
-| Host Operating System / Environment | Minimum recommended docker versions | Known issues / tips                                                                                                                                                                                                                                                                       |
-|-------------------------------------|-----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Linux - general                     | Docker v17.09              | After docker installation, follow [post-installation steps](https://docs.docker.com/engine/install/linux-postinstall/).                                                                                                                                                                   |
-| Linux - CircleCI (LXC driver)      | Docker v17.09               | The `exec` feature is not compatible with CircleCI. See CircleCI configuration [example](./continuous_integration/circle_ci.md)                                                                                                                                                           |
-| Linux - within a Docker container            | Docker v17.09              | See [Running inside Docker](continuous_integration/dind_patterns.md) for Docker-in-Docker and Docker wormhole patterns                                                                                                                                                                    |
-| Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                                                                                                           |
-| Mac OS X - Docker for Mac      | v17.09          | Starting 4.13, run `sudo ln -s $HOME/.docker/run/docker.sock /var/run/docker.sock`<br>Support is best-efforts at present<br>`getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
-| Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                                                                                                      |
-| Windows - Docker for Windows   |                             | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md)                                                                                                                                                         |
-| Windows - Windows Subsystem for Linux (WSL) | Docker v17.09                       | *Support is best-efforts at present.* Only Linux Containers (LCOW) are supported at the moment. See [Windows Support](windows.md).                                                                                                                                                        |
-
-## Using Colima?
+## Colima
 
 In order to run testcontainers against [colima](https://github.com/abiosoft/colima) the env vars bellow should be set
 

From e9d540f94cd05be10ef5a863a659b99c298d18c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=BDan=20Magerl?=
 <36709679+zanmagerl@users.noreply.github.com>
Date: Thu, 19 Oct 2023 17:52:26 +0200
Subject: [PATCH 3274/4969] Fix documentation for BigQuery in gcloud module
 (#7681)

---
 docs/modules/gcloud.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 1abc5ecc122..31542a5d387 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -9,7 +9,7 @@ Currently, the module supports `BigQuery`, `Bigtable`, `Datastore`, `Firestore`,
 
 Class | Container Image
 -|-
-BigQueryEmulatorContainer | ["ghcr.io/goccy/bigquery-emulator"]("ghcr.io/goccy/bigquery-emulator")
+BigQueryEmulatorContainer | [ghcr.io/goccy/bigquery-emulator](https://ghcr.io/goccy/bigquery-emulator)
 BigtableEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators](https://gcr.io/google.com/cloudsdktool/google-cloud-cli)
 DatastoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators](https://gcr.io/google.com/cloudsdktool/google-cloud-cli)
 FirestoreEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emulators](https://gcr.io/google.com/cloudsdktool/google-cloud-cli)

From f53c2ebd6c62ddfdc16efb909bf0fa0114839138 Mon Sep 17 00:00:00 2001
From: Alex Sherwin <alex-sherwin@users.noreply.github.com>
Date: Sat, 21 Oct 2023 11:17:47 -0400
Subject: [PATCH 3275/4969] Fix link to Toxiproxy docs from Kafka docs (#7684)

---
 docs/modules/kafka.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 41e6f2c03e9..fb953716225 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -46,7 +46,7 @@ See the [versions interoperability matrix](https://docs.confluent.io/platform/cu
 
 There are scenarios where additional listeners are needed because the consumer/producer can be in another
 container in the same network or a different process where the port to connect differs from the default 
-exposed port `9093`. E.g [Toxiproxy](../../docs/modules/toxiproxy.md).
+exposed port `9093`. E.g [Toxiproxy](../../modules/toxiproxy/).
 
 <!--codeinclude-->
 [Register additional listener](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:registerListener

From 1efb6db2738e44b53cc1f18ef964e42034e16239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sun, 22 Oct 2023 14:49:11 -0600
Subject: [PATCH 3276/4969] Add Checkstyle's SingleSpaceSeparator rule (#7686)

---
 config/checkstyle/checkstyle.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 5163b69b18a..e49662a0a0c 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -58,6 +58,7 @@
         </module>
         <module name="OneStatementPerLineCheck"/>
         <module name="ModifierOrder" />
+        <module name="SingleSpaceSeparator" />
     </module>
     <module name="RegexpSingleline">
         <property name="format" value="^\s*\*\s*@author"/>

From 3b8c869725dbceb25127c3ef8acc679002a9a6c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sun, 22 Oct 2023 21:19:15 -0600
Subject: [PATCH 3277/4969] Use Java 11 to execute Selenium's examples (#7688)

* [dependabot] Exclude update in selenium module
* Update Java toolchain to use Java 11 and execute tests
---
 .github/dependabot.yml                    |  3 +++
 docs/examples/junit4/generic/build.gradle | 15 ++++++++++++++-
 examples/cucumber/build.gradle            | 15 ++++++++++++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e44a6447c76..4eb1900e45e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -247,6 +247,9 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.seleniumhq.selenium:selenium-bom"
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/modules/solace"
     schedule:
diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index c455882dc40..ef5c0b1e01c 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,19 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.13.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.14.1"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
+}
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index e6da91066b2..a05eee00eef 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.13.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.14.1')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
@@ -18,3 +18,16 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
+}

From c0e9e400dffc70266324f39131e44561ff3be173 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:39 +0000
Subject: [PATCH 3278/4969] Bump com.squareup.okhttp3:okhttp from 4.11.0 to
 4.12.0 in /modules/azure

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 15a69b8d53a..d3e9927ee3a 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Azure"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.azure:azure-cosmos:4.51.0'

From 9a355ef51ed52f39dc54effc0cb4650ae7d9ccd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:42 +0000
Subject: [PATCH 3279/4969] Bump redis.clients:jedis from 5.0.1 to 5.0.2 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.1...v5.0.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ca9cbde42f0..84b26cb458a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:5.0.1'
+    testImplementation 'redis.clients:jedis:5.0.2'
     testImplementation 'com.rabbitmq:amqp-client:5.19.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From e4960ddc6f0444659f6d3bb3d1eae84536d2c945 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:43 +0000
Subject: [PATCH 3280/4969] Bump redis.clients:jedis from 5.0.1 to 5.0.2 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.1...v5.0.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d0fb3814d9c..ac7d6863dd0 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.0.1'
+    testImplementation 'redis.clients:jedis:5.0.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 69991a519cf86b93a7bda512957dfff7b60498e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:43 +0000
Subject: [PATCH 3281/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.10.2 to 8.10.4.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.10.2...v8.10.4)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 420f5382d33..6b75867fa21 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.4"
     testImplementation "org.elasticsearch.client:transport:7.17.13"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From c7aa76f5044add6c7420e15d8e14fed7cfeee5a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:47 +0000
Subject: [PATCH 3282/4969] Bump com.squareup.okhttp3:okhttp in
 /modules/couchbase

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 3c6d06136f8..8a881d12c36 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'com.couchbase.client:java-client:3.4.11'
     testImplementation 'org.awaitility:awaitility:4.2.0'

From b9b89b2de8437692bbfc6799e66ef35c0c2b18bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:47 +0000
Subject: [PATCH 3283/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.20.162 to 2.21.5.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 38384641515..47aced04f8c 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.162'
+    testImplementation 'software.amazon.awssdk:s3:2.21.5'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 99cdda607ae2d3dfc06a466935cef07c0d61bb2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:48 +0000
Subject: [PATCH 3284/4969] Bump com.squareup.okhttp3:okhttp from 4.11.0 to
 4.12.0 in /modules/solr

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 85c6e02954e..c3df3112379 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 45dbe1adbe2dce01106b0974653a1798eaf04388 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:50 +0000
Subject: [PATCH 3285/4969] Bump io.trino:trino-jdbc from 428 to 430 in
 /modules/trino

Bumps io.trino:trino-jdbc from 428 to 430.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 87bc2d1cdd4..de9f59e89ea 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:428'
+    testRuntimeOnly 'io.trino:trino-jdbc:430'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From a3b0ab394ff77f3ebac6e032572676217c24f127 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:52 +0000
Subject: [PATCH 3286/4969] Bump release-drafter/release-drafter from 5.24.0 to
 5.25.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.24.0 to 5.25.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/65c5fb495d1e69aa8c08a3317bc44ff8aabe9772...09c613e259eb8d4e7c81c2cb00618eb5fc4575a7)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 8d80a47f839..acbea174645 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 # v5.19.0
+      - uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 2fc99e1f776bbcfdc02ce5c447eafe09bf980495 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:53 +0000
Subject: [PATCH 3287/4969] Bump com.hazelcast:hazelcast from 5.3.2 to 5.3.4 in
 /examples

Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.3.2 to 5.3.4.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/commits)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index d6d5f9a0d27..4929c612bb5 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.hazelcast:hazelcast:5.3.2'
+    testImplementation 'com.hazelcast:hazelcast:5.3.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'

From 3fe69921e089e3c124c79933ddbb06deb0a8f83d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:19:58 +0000
Subject: [PATCH 3288/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.20.0 to 4.21.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.20.0...4.21.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index fcbade04cac..c3e511f4d99 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.20.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.21.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")

From f88db7df45f6ade84184648b6628efef891adb17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:00 +0000
Subject: [PATCH 3289/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.13 to 10.1.15.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 9b8b003022b..00af5f5b85d 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.13'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.15'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From d4f3a9af1de0e95a408d0a9bd2ff4c58d2e648ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:02 +0000
Subject: [PATCH 3290/4969] Bump org.springframework.boot from 2.7.16 to 2.7.17
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.16 to 2.7.17.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.16...v2.7.17)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8940bf75e2a..0fc50e1fadc 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.7.16'
+    id 'org.springframework.boot' version '2.7.17'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 194edcaeeeb..dad172a8000 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.7.16'
+    id 'org.springframework.boot' version '2.7.17'
 }
 apply plugin: 'io.spring.dependency-management'
 

From d048b8202e225c31197a3c78d2567a252d711753 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:03 +0000
Subject: [PATCH 3291/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.10 to 3.5.11.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.10...v3.5.11)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index c743941fd0d..5d77f148df1 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.10'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.11'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e5b0e7def04f6b5cf04313f6c9a57267f5fa3d32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:04 +0000
Subject: [PATCH 3292/4969] Bump com.google.guava:guava from 32.1.2-jre to
 32.1.3-jre in /core

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 32.1.3-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index ca9cbde42f0..8e6c5825dd0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -99,7 +99,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded 'com.google.guava:guava:32.1.2-jre'
+    shaded 'com.google.guava:guava:32.1.3-jre'
     shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

From d05ab8db2333ecfee394ceeba0a0b992f9099fa3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:05 +0000
Subject: [PATCH 3293/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.10.2 to 4.11.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.10.2...r4.11.0)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 6b5e7998182..b20a50652b6 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.10.2")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.11.0")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 0d08b69524c1d71df6883500368d3297d5e648b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:06 +0000
Subject: [PATCH 3294/4969] Bump com.squareup.okhttp3:okhttp from 4.11.0 to
 4.12.0 in /examples

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 2d7ae56c9a7..8ac90182bd0 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.36'
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'org.json:json:20230618'
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'

From d5e6abf69a708505cac68dba4e5837b969c99c2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:09 +0000
Subject: [PATCH 3295/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.24.0 to 26.25.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.24.0...v26.25.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index b32e62293fc..9591a4396c0 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.24.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.25.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From b305866115cd5c0757bf3102657ec8f4edee3b50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:10 +0000
Subject: [PATCH 3296/4969] Bump io.nats:jnats from 2.17.0 to 2.17.1 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.17.0 to 2.17.1.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.17.0...2.17.1)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 5678aefab4d..865b222631e 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.17.0'
+    testImplementation 'io.nats:jnats:2.17.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'

From 199274be95f0290ba9eaa8d96bb8938706859aa7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 03:20:14 +0000
Subject: [PATCH 3297/4969] Bump redis.clients:jedis from 5.0.1 to 5.0.2 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.1...v5.0.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index e549df89dd8..4a523e8d9b7 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.1'
+    implementation 'redis.clients:jedis:5.0.2'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 49447a483c9..3a20a79fb33 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.1'
+    implementation 'redis.clients:jedis:5.0.2'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index e56caac148b..7bafe279f32 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.0.1'
+    implementation 'redis.clients:jedis:5.0.2'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 34853fe1233c4a4387fe56bcbd61287d96fbbfc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 23 Oct 2023 08:16:10 -0600
Subject: [PATCH 3298/4969] Deprecate file/volume mapping APIs (#7652)

Using `Copy Files API` will make tests portable cross docker environments.
Docs are removed too.
---
 .../testcontainers/containers/Container.java  | 12 +++++++++++
 docs/features/files.md                        | 20 -------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/Container.java b/core/src/main/java/org/testcontainers/containers/Container.java
index b97f6dbfa35..abea7fef576 100644
--- a/core/src/main/java/org/testcontainers/containers/Container.java
+++ b/core/src/main/java/org/testcontainers/containers/Container.java
@@ -77,7 +77,9 @@ class ExecResult {
      * @param hostPath      the file system path on the host
      * @param containerPath the file system path inside the container
      * @param mode          the bind mode
+     * @deprecated use {@link GenericContainer#withCopyToContainer(Transferable, String)}
      */
+    @Deprecated
     default void addFileSystemBind(final String hostPath, final String containerPath, final BindMode mode) {
         addFileSystemBind(hostPath, containerPath, mode, SelinuxContext.SHARED);
     }
@@ -90,7 +92,9 @@ default void addFileSystemBind(final String hostPath, final String containerPath
      * @param containerPath the file system path inside the container
      * @param mode          the bind mode
      * @param selinuxContext selinux context argument to use for this file
+     * @deprecated use {@link GenericContainer#withCopyToContainer(Transferable, String)}
      */
+    @Deprecated
     void addFileSystemBind(String hostPath, String containerPath, BindMode mode, SelinuxContext selinuxContext);
 
     /**
@@ -134,7 +138,9 @@ default void addFileSystemBind(final String hostPath, final String containerPath
      * @param hostPath the file system path on the host
      * @param containerPath the file system path inside the container
      * @return this
+     * @deprecated use {@link GenericContainer#withCopyToContainer(Transferable, String)}
      */
+    @Deprecated
     default SELF withFileSystemBind(String hostPath, String containerPath) {
         return withFileSystemBind(hostPath, containerPath, BindMode.READ_WRITE);
     }
@@ -146,7 +152,9 @@ default SELF withFileSystemBind(String hostPath, String containerPath) {
      * @param containerPath the file system path inside the container
      * @param mode the bind mode
      * @return this
+     * @deprecated use {@link GenericContainer#withCopyToContainer(Transferable, String)}
      */
+    @Deprecated
     SELF withFileSystemBind(String hostPath, String containerPath, BindMode mode);
 
     /**
@@ -297,7 +305,9 @@ default SELF withEnv(String key, Function<Optional<String>, String> mapper) {
      * @param containerPath path this should be mapped to inside the container
      * @param mode          access mode for the file
      * @return this
+     * @deprecated use {@link GenericContainer#withCopyToContainer(Transferable, String)}
      */
+    @Deprecated
     default SELF withClasspathResourceMapping(
         final String resourcePath,
         final String containerPath,
@@ -316,7 +326,9 @@ default SELF withClasspathResourceMapping(
      * @param mode           access mode for the file
      * @param selinuxContext selinux context argument to use for this file
      * @return this
+     * @deprecated use {@link GenericContainer#withCopyToContainer(Transferable, String)}
      */
+    @Deprecated
     SELF withClasspathResourceMapping(
         String resourcePath,
         String containerPath,
diff --git a/docs/features/files.md b/docs/features/files.md
index 43dd5d276d0..d2c901678a6 100644
--- a/docs/features/files.md
+++ b/docs/features/files.md
@@ -30,23 +30,3 @@ Setting file mode is also possible.
 <!--codeinclude-->
 [Copying files from a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyFileFromContainer
 <!--/codeinclude-->
-
-## File mapping
-
-It is possible to map a file or directory from your FileSystem into the container as a volume using `withFileSystemBind`:
-```java
-String pathToFile = System.getProperty("user.home") + "/.aws";
-new GenericContainer(...)
-        .withFileSystemBind(pathToFile, "/home/user/.aws", BindMode.READ_ONLY)
-```
-
-## Volume mapping
-
-It is possible to map a file or directory **on the classpath** into the container as a volume using `withClasspathResourceMapping`:
-```java
-new GenericContainer(...)
-        .withClasspathResourceMapping("redis.conf",
-                                      "/etc/redis.conf",
-                                      BindMode.READ_ONLY)
-```
-

From 3b687cc5fce27c74e6342b34ed0bcbc047efb2b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 22:05:17 +0000
Subject: [PATCH 3299/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.11.3 to 1.12.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 7d4d9114d2e..dba81a72ddd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

From 72027c03a059ace518835cff8adaa0c4b5123ae4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 22:15:59 +0000
Subject: [PATCH 3300/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.565 to 1.12.572.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.565...1.12.572)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 50c517b30b1..45b13593cee 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.565'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.565'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.572'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.572'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7037fe17f96bc3b9eaa12808a672d8b664143452 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 22:22:58 +0000
Subject: [PATCH 3301/4969] Bump com.amazonaws:aws-java-sdk-bom in
 /modules/localstack

Bumps [com.amazonaws:aws-java-sdk-bom](https://github.com/aws/aws-sdk-java) from 1.12.565 to 1.12.572.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.565...1.12.572)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 38384641515..dd62996e1ad 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.565")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.572")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'

From 98f4de93633e86bf6befd2301c6308dfffb8ed60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 22:46:50 +0000
Subject: [PATCH 3302/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin in /examples

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.11.3 to 1.12.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 0256f979f60..0c221c70355 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 7d4d9114d2e..dba81a72ddd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

From d852091409dcdb721de125e61bcae15dfe9b940b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:58:29 +0000
Subject: [PATCH 3303/4969] Bump io.asyncer:r2dbc-mysql from 1.0.4 to 1.0.5 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-1.0.4...r2dbc-mysql-1.0.5)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 9104d3cbba6..377860b5145 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:1.0.4'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.0.5'
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.4'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.5'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 0647fbf49aad9d3d67b84a2f32bed7301b683408 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:58:32 +0000
Subject: [PATCH 3304/4969] Bump org.json:json from 20230618 to 20231013 in
 /examples

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230618 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8ac90182bd0..5152b6aecea 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    implementation 'org.json:json:20230618'
+    implementation 'org.json:json:20231013'
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.testcontainers:postgresql'

From d4d8faf8c687390aef9847e2e87d86d93c8db711 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:58:38 +0000
Subject: [PATCH 3305/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.13 to 7.17.14.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.13...v7.17.14)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 6b75867fa21..deffeb9f986 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.4"
-    testImplementation "org.elasticsearch.client:transport:7.17.13"
+    testImplementation "org.elasticsearch.client:transport:7.17.14"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 671deed2de7cdb5ec3e9d368a28ff41cfb6c891b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:58:40 +0000
Subject: [PATCH 3306/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 32.1.3-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e9350103766..c384b1863df 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:32.1.2-jre'
+    api 'com.google.guava:guava:32.1.3-jre'
     api 'org.apache.commons:commons-lang3:3.13.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'

From 886489552dfe574643f44628065199b840e84223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 23 Oct 2023 21:38:06 -0600
Subject: [PATCH 3307/4969] Update kubernetes client version to 19.0.0 (#7716)

---
 modules/k3s/build.gradle                                        | 2 +-
 .../org/testcontainers/k3s/OfficialClientK3sContainerTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index e68dead14ff..36618a1a88e 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.9.0'
-    testImplementation 'io.kubernetes:client-java:18.0.1'
+    testImplementation 'io.kubernetes:client-java:19.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
index c2504c27dbe..7edc286837b 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
@@ -35,7 +35,7 @@ public void shouldStartAndHaveListableNode() throws IOException, ApiException {
             CoreV1Api api = new CoreV1Api(client);
 
             // interact with the running K3s server, e.g.:
-            V1NodeList nodes = api.listNode(null, null, null, null, null, null, null, null, null, null);
+            V1NodeList nodes = api.listNode(null, null, null, null, null, null, null, null, null, null, null);
             // }
 
             assertThat(nodes.getItems()).hasSize(1);

From 0c52c4172c3058e72f1312ff1ac3a8c4cc75fbcd Mon Sep 17 00:00:00 2001
From: Toon Geens <toon.geens@xenit.eu>
Date: Tue, 24 Oct 2023 18:21:01 +0200
Subject: [PATCH 3308/4969] Fix K3S start command (#7677)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace `--no-deploy` and use `--disable` instead.

Fixes #6770

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../org/testcontainers/k3s/K3sContainer.java     |  2 +-
 .../k3s/OfficialClientK3sContainerTest.java      | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index 0ee3db4b6e7..b014c5b4ed6 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -46,7 +46,7 @@ public K3sContainer(DockerImageName dockerImageName) {
         tmpFsMapping.put("/var/run", "");
         setTmpFsMapping(tmpFsMapping);
 
-        setCommand("server", "--no-deploy=traefik", "--tls-san=" + this.getHost());
+        setCommand("server", "--disable=traefik", "--tls-san=" + this.getHost());
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
     }
 
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
index 7edc286837b..1c40e56fc2d 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
@@ -20,12 +20,16 @@ public class OfficialClientK3sContainerTest {
 
     @Test
     public void shouldStartAndHaveListableNode() throws IOException, ApiException {
-        try (
-            // starting_k3s {
-            K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
-            // }
-        ) {
+        runK3s(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"));
+    }
+
+    @Test
+    public void shouldStartAndHaveListableNodeUsingLowerVersion() throws IOException, ApiException {
+        runK3s(DockerImageName.parse("rancher/k3s:v1.20.15-k3s1"));
+    }
+
+    private void runK3s(DockerImageName k3sDockerImage) throws IOException, ApiException {
+        try (K3sContainer k3s = new K3sContainer(k3sDockerImage).withLogConsumer(new Slf4jLogConsumer(log))) {
             k3s.start();
 
             // connecting_with_k8sio {

From cc31ad1842ee30904c5f5b2c5cd5d791ccbba60c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Oct 2023 13:53:32 -0600
Subject: [PATCH 3309/4969] Remove execInContainerWithUser from japicmp method
 exclusion

---
 core/build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 0d2ef06650c..97ab8a7db1b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -52,9 +52,7 @@ tasks.japicmp {
 
     methodExcludes = [
         "org.testcontainers.containers.Container#getDockerClient()",
-        "org.testcontainers.containers.ContainerState#getDockerClient()",
-        "org.testcontainers.containers.ContainerState#execInContainerWithUser(java.lang.String,java.lang.String[])",
-        "org.testcontainers.containers.ContainerState#execInContainerWithUser(java.nio.charset.Charset,java.lang.String,java.lang.String[])",
+        "org.testcontainers.containers.ContainerState#getDockerClient()"
     ]
 
     fieldExcludes = []

From 9fccbb2a3e868800255824cd11e41dd4973ee4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Oct 2023 13:55:16 -0600
Subject: [PATCH 3310/4969] Relax assertion in cratedb tests

---
 .../org/testcontainers/junit/cratedb/SimpleCrateDBTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
index e696a3140c3..19ce83cd8ae 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
@@ -60,7 +60,7 @@ public void testExplicitInitScript() throws SQLException {
     }
 
     private void assertHasCorrectExposedAndLivenessCheckPorts(CrateDBContainer cratedb) {
-        assertThat(cratedb.getExposedPorts()).containsExactly(5432, 4200);
+        assertThat(cratedb.getExposedPorts()).containsExactlyInAnyOrder(5432, 4200);
         assertThat(cratedb.getLivenessCheckPortNumbers())
             .containsExactlyInAnyOrder(cratedb.getMappedPort(5432), cratedb.getMappedPort(4200));
     }

From 44847d8c8b4e352335ce0b6b0c9b94d48070ad9f Mon Sep 17 00:00:00 2001
From: TheHaf <darkdemon2001@gmx.de>
Date: Thu, 26 Oct 2023 16:11:21 +0200
Subject: [PATCH 3311/4969] Fix typo in Podman docs (#7722)

---
 docs/supported_docker_environment/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 1e90b36ee54..65de07d0762 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -21,7 +21,7 @@ please contact the Testcontainers team and other users from the Testcontainers c
 
 ## Colima
 
-In order to run testcontainers against [colima](https://github.com/abiosoft/colima) the env vars bellow should be set
+In order to run testcontainers against [colima](https://github.com/abiosoft/colima) the env vars below should be set
 
 ```bash
 export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock

From 95849a58c8a551f0cf3e52ef11f09923ccc8b24f Mon Sep 17 00:00:00 2001
From: Fokion Sotiropoulos <fokion.s@gmail.com>
Date: Thu, 26 Oct 2023 23:42:09 +0100
Subject: [PATCH 3312/4969] Fix default LocalStack credentials (#7718)

Fixes #7623
---
 .../localstack/LocalStackContainer.java       | 10 +++-
 .../localstack/LocalstackContainerTest.java   | 54 +++++++++++++++++++
 .../localstack/LocalstackTestImages.java      |  2 +
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 4cae1c19b1d..b3651aea9e5 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -47,6 +47,10 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     private static final String DEFAULT_REGION = "us-east-1";
 
+    private static final String DEFAULT_AWS_ACCESS_KEY_ID = "test";
+
+    private static final String DEFAULT_AWS_SECRET_ACCESS_KEY = "test";
+
     @Deprecated
     public static final String VERSION = DEFAULT_TAG;
 
@@ -293,6 +297,7 @@ private int getServicePort(EnabledService service) {
 
     /**
      * Provides a default access key that is preconfigured to communicate with a given simulated service.
+     * <a href="https://github.com/localstack/localstack/blob/master/doc/interaction/README.md?plain=1#L32">AWS Access Key</a>
      * The access key can be used to construct AWS SDK v2 clients:
      * <pre><code>S3Client s3 = S3Client
              .builder()
@@ -306,11 +311,12 @@ private int getServicePort(EnabledService service) {
      * @return a default access key
      */
     public String getAccessKey() {
-        return "accesskey";
+        return this.getEnvMap().getOrDefault("AWS_ACCESS_KEY_ID", DEFAULT_AWS_ACCESS_KEY_ID);
     }
 
     /**
      * Provides a default secret key that is preconfigured to communicate with a given simulated service.
+     * <a href="https://github.com/localstack/localstack/blob/master/doc/interaction/README.md?plain=1#L32">AWS Secret Key</a>
      * The secret key can be used to construct AWS SDK v2 clients:
      * <pre><code>S3Client s3 = S3Client
              .builder()
@@ -324,7 +330,7 @@ public String getAccessKey() {
      * @return a default secret key
      */
     public String getSecretKey() {
-        return "secretkey";
+        return this.getEnvMap().getOrDefault("AWS_SECRET_ACCESS_KEY", DEFAULT_AWS_SECRET_ACCESS_KEY);
     }
 
     /**
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index f9f1e1c372a..ef0c9b728c0 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -37,7 +37,11 @@
 import software.amazon.awssdk.services.s3.S3Client;
 
 import java.io.IOException;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -451,4 +455,54 @@ private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exc
             return logs;
         }
     }
+
+    public static class S3SkipSignatureValidation {
+
+        @ClassRule
+        public static LocalStackContainer localstack = new LocalStackContainer(
+            LocalstackTestImages.LOCALSTACK_2_3_IMAGE
+        )
+            .withEnv("S3_SKIP_SIGNATURE_VALIDATION", "0");
+
+        @Test
+        public void shouldBeAccessibleWithCredentials() throws IOException {
+            AmazonS3 s3 = AmazonS3ClientBuilder
+                .standard()
+                .withEndpointConfiguration(
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpoint().toString(),
+                        localstack.getRegion()
+                    )
+                )
+                .withCredentials(
+                    new AWSStaticCredentialsProvider(
+                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
+                .build();
+
+            final String bucketName = "foo";
+
+            s3.createBucket(bucketName);
+
+            s3.putObject(bucketName, "bar", "baz");
+
+            final List<Bucket> buckets = s3.listBuckets();
+            final Optional<Bucket> maybeBucket = buckets
+                .stream()
+                .filter(b -> b.getName().equals(bucketName))
+                .findFirst();
+            assertThat(maybeBucket).as("The created bucket is present").isPresent();
+
+            URL presignedUrl = s3.generatePresignedUrl(
+                bucketName,
+                "bar",
+                Date.from(Instant.now().plus(5, ChronoUnit.MINUTES))
+            );
+
+            assertThat(presignedUrl).as("The presigned url is valid").isNotNull();
+            final String content = IOUtils.toString(presignedUrl, StandardCharsets.UTF_8);
+            assertThat(content).as("The object can be retrieved").isEqualTo("baz");
+        }
+    }
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index f6a5cbf50e4..0a9be877f4d 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -9,5 +9,7 @@ public interface LocalstackTestImages {
     DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");
     DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");
     DockerImageName LOCALSTACK_0_13_IMAGE = LOCALSTACK_IMAGE.withTag("0.13.0");
+
+    DockerImageName LOCALSTACK_2_3_IMAGE = LOCALSTACK_IMAGE.withTag("2.3");
     DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("amazon/aws-cli:2.7.27");
 }

From 39f02190c01702fb3121b080f29c72bbdf7c78ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 27 Oct 2023 12:59:37 -0600
Subject: [PATCH 3313/4969] Add shutdownHook to send sigterm to ryuk (#7717)

Currently, `Ryuk` container finishes after around 10s. This commit register
a shutdown hook which will send a sigterm to the Ryuk container when JVM
is terminating causing Ryuk to finish sooner.
---
 .../testcontainers/utility/RyukResourceReaper.java  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
index 999b1cbbffb..7e1b7802fb0 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -77,6 +77,19 @@ private synchronized void maybeStart() {
 
         ryukContainer.start();
 
+        Runtime
+            .getRuntime()
+            .addShutdownHook(
+                new Thread(
+                    DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
+                    () -> {
+                        this.dockerClient.killContainerCmd(this.ryukContainer.getContainerId())
+                            .withSignal("SIGTERM")
+                            .exec();
+                    }
+                )
+            );
+
         CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
 
         String host = ryukContainer.getHost();

From 2597da2cd802af505aa47423ce5c576828e9b650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 27 Oct 2023 14:04:21 -0600
Subject: [PATCH 3314/4969] Resolve strategy to detect the remote docker socket
 (#7727)

Currently, if `DockerClientFactory.instance().getRemoteDockerUnixSocketPath()`
is called without resolving the strategy then the remote docker socket
can be invalid, for example, using Docker Desktop for Mac with unchecked
`Allow the default Docker socket to be used` option.

Fixes #7678
---
 .../main/java/org/testcontainers/DockerClientFactory.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index dbdb13356ff..6f0c744cedf 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -160,14 +160,15 @@ public TransportConfig getTransportConfig() {
 
     @UnstableAPI
     public String getRemoteDockerUnixSocketPath() {
-        if (this.strategy != null && this.strategy.allowUserOverrides()) {
+        DockerClientProviderStrategy strategy = getOrInitializeStrategy();
+        if (strategy.allowUserOverrides()) {
             String dockerSocketOverride = System.getenv("TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE");
             if (!StringUtils.isBlank(dockerSocketOverride)) {
                 return dockerSocketOverride;
             }
         }
-        if (this.strategy != null && this.strategy.getRemoteDockerUnixSocketPath() != null) {
-            return this.strategy.getRemoteDockerUnixSocketPath();
+        if (strategy.getRemoteDockerUnixSocketPath() != null) {
+            return strategy.getRemoteDockerUnixSocketPath();
         }
 
         URI dockerHost = getTransportConfig().getDockerHost();

From 3422ebba1f66a0575b63801aed8790f3b45a4c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Oct 2023 12:13:35 -0600
Subject: [PATCH 3315/4969] Update docker-java version to 3.3.4 (#7730)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 97ab8a7db1b..7b8ce4cfaf4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,8 +86,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.3')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.3')
+    api platform('com.github.docker-java:docker-java-bom:3.3.4')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.4')
 
     api "com.github.docker-java:docker-java-api"
 

From 9cfa1662d9e9fc3dae619a5250f8c8bb78d67668 Mon Sep 17 00:00:00 2001
From: Ivan Ponomarev <iponomarev@mail.ru>
Date: Mon, 30 Oct 2023 22:47:08 +0200
Subject: [PATCH 3316/4969] Enhance ScriptUtils: fix parser (#7646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .../org/testcontainers/ext/ScriptScanner.java | 151 +++++++++++
 .../testcontainers/ext/ScriptSplitter.java    | 127 +++++++++
 .../org/testcontainers/ext/ScriptUtils.java   | 250 +++++-------------
 .../ext/ScriptSplittingTest.java              | 185 ++++++++++++-
 4 files changed, 511 insertions(+), 202 deletions(-)
 create mode 100644 modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
 create mode 100644 modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
new file mode 100644
index 00000000000..528acd139c7
--- /dev/null
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
@@ -0,0 +1,151 @@
+package org.testcontainers.ext;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Rough lexical parser for SQL scripts.
+ */
+@RequiredArgsConstructor
+class ScriptScanner {
+
+    private final String resource;
+
+    private final String script;
+
+    private final String separator;
+
+    private final String commentPrefix;
+
+    private final String blockCommentStartDelimiter;
+
+    private final String blockCommentEndDelimiter;
+
+    private final Pattern eol = Pattern.compile("[\n\r]+");
+
+    private final Pattern whitespace = Pattern.compile("\\s+");
+
+    private final Pattern identifier = Pattern.compile("[a-z][a-z0-9_]*", Pattern.CASE_INSENSITIVE);
+
+    private final Pattern singleQuotedString = Pattern.compile("'(\\\\'|[^'])*'");
+
+    private final Pattern ansiQuotedString = Pattern.compile("\"(\\\\\"|[^\"])*\"");
+
+    private final Pattern dollarQuotedStringDelimiter = Pattern.compile("\\$\\w*\\$");
+
+    private int offset;
+
+    @Getter
+    private String currentMatch;
+
+    private boolean matches(String substring) {
+        if (script.startsWith(substring, offset)) {
+            currentMatch = substring;
+            offset += currentMatch.length();
+            return true;
+        } else {
+            currentMatch = "";
+            return false;
+        }
+    }
+
+    private boolean matches(Pattern regexp) {
+        Matcher m = regexp.matcher(script);
+        if (m.find(offset) && m.start() == offset) {
+            currentMatch = m.group();
+            offset = m.end();
+            return true;
+        } else {
+            currentMatch = "";
+            return false;
+        }
+    }
+
+    private boolean matchesSingleLineComment() {
+        /* Matches from commentPrefix to the EOL or end of script */
+        if (matches(commentPrefix)) {
+            Matcher m = eol.matcher(script);
+            if (m.find(offset)) {
+                currentMatch = commentPrefix + script.substring(offset, m.end());
+                offset = m.end();
+            } else {
+                currentMatch = commentPrefix + script.substring(offset);
+                offset = script.length();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private boolean matchesMultilineComment() {
+        /* Matches from blockCommentStartDelimiter to the next blockCommentEndDelimiter.
+         * Error, if blockCommentEndDelimiter is not found. */
+        if (matches(blockCommentStartDelimiter)) {
+            int end = script.indexOf(blockCommentEndDelimiter, offset);
+            if (end < 0) {
+                throw new ScriptUtils.ScriptParseException(
+                    String.format("Missing block comment end delimiter [%s].", blockCommentEndDelimiter),
+                    resource
+                );
+            }
+            end += blockCommentEndDelimiter.length();
+            currentMatch = blockCommentStartDelimiter + script.substring(offset, end);
+            offset = end;
+            return true;
+        }
+        return false;
+    }
+
+    private boolean matchesDollarQuotedString() {
+        //Matches $<tag>$ .... $<tag>$
+        if (matches(dollarQuotedStringDelimiter)) {
+            String delimiter = currentMatch;
+            int end = script.indexOf(delimiter, offset);
+            if (end < 0) {
+                throw new ScriptUtils.ScriptParseException(
+                    String.format("Unclosed dollar quoted string [%s].", delimiter),
+                    resource
+                );
+            }
+            end += delimiter.length();
+            currentMatch = delimiter + script.substring(offset, end);
+            offset = end;
+            return true;
+        }
+        return false;
+    }
+
+    Lexem next() {
+        if (offset < script.length()) {
+            if (matches(separator)) {
+                return Lexem.SEPARATOR;
+            } else if (matchesSingleLineComment() || matchesMultilineComment()) {
+                return Lexem.COMMENT;
+            } else if (matches(singleQuotedString) || matches(ansiQuotedString) || matchesDollarQuotedString()) {
+                return Lexem.QUOTED_STRING;
+            } else if (matches(identifier)) {
+                return Lexem.IDENTIFIER;
+            } else if (matches(whitespace)) {
+                return Lexem.WHITESPACE;
+            } else {
+                currentMatch = String.valueOf(script.charAt(offset++));
+                return Lexem.OTHER;
+            }
+        } else {
+            return Lexem.EOF;
+        }
+    }
+
+    enum Lexem {
+        SEPARATOR,
+        COMMENT,
+        QUOTED_STRING,
+        WHITESPACE,
+        IDENTIFIER,
+        OTHER,
+        EOF,
+    }
+}
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
new file mode 100644
index 00000000000..888bf4df420
--- /dev/null
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
@@ -0,0 +1,127 @@
+package org.testcontainers.ext;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.testcontainers.ext.ScriptScanner.Lexem;
+
+import java.util.List;
+
+/**
+ * Performs splitting of an SQL script into statements including
+ * basic clean-up.
+ */
+@RequiredArgsConstructor
+class ScriptSplitter {
+
+    private final ScriptScanner scanner;
+
+    private final List<String> statements;
+
+    private final StringBuilder sb = new StringBuilder();
+
+    /**
+     * Standard parsing:
+     * 1. Remove comments
+     * 2. Shrink whitespace and eols
+     * 3. Split on separator
+     */
+    void split() {
+        Lexem l;
+        while ((l = scanner.next()) != Lexem.EOF) {
+            switch (l) {
+                case SEPARATOR:
+                    flushStringBuilder();
+                    break;
+                case COMMENT:
+                    //skip
+                    break;
+                case WHITESPACE:
+                    if (!sb.toString().endsWith(" ")) {
+                        sb.append(' ');
+                    }
+                    break;
+                case IDENTIFIER:
+                    appendMatch();
+                    if ("begin".equalsIgnoreCase(scanner.getCurrentMatch())) {
+                        compoundStatement(false);
+                        flushStringBuilder();
+                    }
+                    break;
+                default:
+                    appendMatch();
+            }
+        }
+        flushStringBuilder();
+    }
+
+    /**
+     * Compound statement ('create procedure') mode:
+     * 1. Do not remove comments
+     * 2. Do not shrink whitespace
+     * 3. Do not split on separators
+     * 3. This mode can be recursive
+     */
+    private void compoundStatement(boolean recursive) {
+        Lexem l;
+        while ((l = scanner.next()) != Lexem.EOF) {
+            appendMatch();
+            if (Lexem.IDENTIFIER.equals(l)) {
+                if ("begin".equalsIgnoreCase(scanner.getCurrentMatch())) {
+                    compoundStatement(true);
+                } else if ("end".equalsIgnoreCase(scanner.getCurrentMatch())) {
+                    if (endOfBlock(recursive)) {
+                        return;
+                    }
+                }
+            }
+        }
+        flushStringBuilder();
+    }
+
+    private boolean endOfBlock(boolean recursive) {
+        Lexem l;
+        StringBuilder temporary = new StringBuilder();
+        while ((l = scanner.next()) != Lexem.EOF) {
+            switch (l) {
+                case COMMENT:
+                case WHITESPACE:
+                    temporary.append(scanner.getCurrentMatch());
+                    break;
+                case SEPARATOR:
+                    //Only whitespace and comments preceded the separator: true end of block
+                    //If it's an internal block, append everything
+                    if (recursive) {
+                        sb.append(temporary);
+                        appendMatch();
+                    }
+                    return true;
+                default:
+                    // Semicolon is not recognized as separator: this means that a custom
+                    // separator is used. Still, 'END;' should be a valid end of block
+                    if (";".equals(scanner.getCurrentMatch())) {
+                        if (recursive) {
+                            sb.append(temporary);
+                            appendMatch();
+                        }
+                        return true;
+                    }
+                    sb.append(temporary);
+                    appendMatch();
+                    return false;
+            }
+        }
+        return true;
+    }
+
+    private void appendMatch() {
+        sb.append(scanner.getCurrentMatch());
+    }
+
+    private void flushStringBuilder() {
+        final String s = sb.toString().trim();
+        if (StringUtils.isNotEmpty(s)) {
+            statements.add(s);
+        }
+        sb.setLength(0);
+    }
+}
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index 4aa91602342..419bcbf9e9a 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -119,191 +119,18 @@ public static void splitSqlScript(
             "blockCommentEndDelimiter must not be null or empty"
         );
 
-        StringBuilder sb = new StringBuilder();
-        boolean inEscape = false;
-        boolean inLineComment = false;
-        boolean inBlockComment = false;
-        Character currentLiteralDelimiter = null;
-
-        int compoundStatementDepth = 0;
-        final String lowerCaseScriptContent = script.toLowerCase();
-        char[] content = script.toCharArray();
-        for (int i = 0; i < script.length(); i++) {
-            char c = content[i];
-            if (inEscape) {
-                inEscape = false;
-                sb.append(c);
-                continue;
-            }
-            // MySQL style escapes
-            if (c == '\\') {
-                inEscape = true;
-                sb.append(c);
-                continue;
-            }
-            // Determine whether we're entering/leaving a string literal
-            if (!inBlockComment && !inLineComment && (c == '\'' || c == '"' || c == '`')) {
-                if (currentLiteralDelimiter == null) { // ignore delimiters within an existing string literal
-                    currentLiteralDelimiter = c;
-                } else if (currentLiteralDelimiter == c) { // find end of string literal
-                    currentLiteralDelimiter = null;
-                }
-            }
-            final boolean inLiteral = currentLiteralDelimiter != null;
-
-            if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, commentPrefix, i)) {
-                inLineComment = true;
-            }
-            if (inLineComment && c == '\n') {
-                inLineComment = false;
-            }
-            if (!inLiteral && containsSubstringAtOffset(lowerCaseScriptContent, blockCommentStartDelimiter, i)) {
-                inBlockComment = true;
-            }
-            if (
-                !inLiteral &&
-                inBlockComment &&
-                containsSubstringAtOffset(lowerCaseScriptContent, blockCommentEndDelimiter, i)
-            ) {
-                inBlockComment = false;
-            }
-            final boolean inComment = inLineComment || inBlockComment;
-
-            if (
-                !inLiteral &&
-                !inComment &&
-                containsKeywordsAtOffset(
-                    lowerCaseScriptContent,
-                    "BEGIN",
-                    i,
-                    separator,
-                    commentPrefix,
-                    blockCommentStartDelimiter
-                )
-            ) {
-                compoundStatementDepth++;
-            }
-            if (
-                !inLiteral &&
-                !inComment &&
-                containsKeywordsAtOffset(
-                    lowerCaseScriptContent,
-                    "END",
-                    i,
-                    separator,
-                    commentPrefix,
-                    blockCommentStartDelimiter
-                )
-            ) {
-                compoundStatementDepth--;
-            }
-            final boolean inCompoundStatement = compoundStatementDepth != 0;
-
-            if (!inLiteral && !inCompoundStatement) {
-                if (script.startsWith(separator, i)) {
-                    // we've reached the end of the current statement
-                    sb = flushStringBuilder(sb, statements);
-                    i += separator.length() - 1;
-                    continue;
-                } else if (script.startsWith(commentPrefix, i)) {
-                    // skip over any content from the start of the comment to the EOL
-                    int indexOfNextNewline = script.indexOf("\n", i);
-                    if (indexOfNextNewline > i) {
-                        i = indexOfNextNewline;
-                        continue;
-                    } else {
-                        // if there's no EOL, we must be at the end
-                        // of the script, so stop here.
-                        break;
-                    }
-                } else if (script.startsWith(blockCommentStartDelimiter, i)) {
-                    // skip over any block comments
-                    int indexOfCommentEnd = script.indexOf(blockCommentEndDelimiter, i);
-                    if (indexOfCommentEnd > i) {
-                        i = indexOfCommentEnd + blockCommentEndDelimiter.length() - 1;
-                        inBlockComment = false;
-                        continue;
-                    } else {
-                        throw new ScriptParseException(
-                            String.format("Missing block comment end delimiter [%s].", blockCommentEndDelimiter),
-                            resource
-                        );
-                    }
-                } else if (c == ' ' || c == '\n' || c == '\t' || c == '\r') {
-                    // avoid multiple adjacent whitespace characters
-                    if (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' ') {
-                        c = ' ';
-                    } else {
-                        continue;
-                    }
-                }
-            }
-            sb.append(c);
-        }
-        flushStringBuilder(sb, statements);
-    }
-
-    private static StringBuilder flushStringBuilder(StringBuilder sb, List<String> statements) {
-        if (sb.length() == 0) {
-            return sb;
-        }
-
-        final String s = sb.toString().trim();
-        if (StringUtils.isNotEmpty(s)) {
-            statements.add(s);
-        }
-
-        return new StringBuilder();
-    }
-
-    private static boolean isSeperator(
-        char c,
-        String separator,
-        String commentPrefix,
-        String blockCommentStartDelimiter
-    ) {
-        return (
-            c == ' ' ||
-            c == '\r' ||
-            c == '\n' ||
-            c == '\t' ||
-            c == separator.charAt(0) ||
-            c == separator.charAt(separator.length() - 1) ||
-            c == commentPrefix.charAt(0) ||
-            c == blockCommentStartDelimiter.charAt(0) ||
-            c == blockCommentStartDelimiter.charAt(blockCommentStartDelimiter.length() - 1)
-        );
-    }
-
-    private static boolean containsSubstringAtOffset(String lowercaseString, String substring, int offset) {
-        String lowercaseSubstring = substring.toLowerCase();
-
-        return lowercaseString.startsWith(lowercaseSubstring, offset);
-    }
-
-    private static boolean containsKeywordsAtOffset(
-        String lowercaseString,
-        String keywords,
-        int offset,
-        String separator,
-        String commentPrefix,
-        String blockCommentStartDelimiter
-    ) {
-        String lowercaseKeywords = keywords.toLowerCase();
-
-        boolean backSeperated =
-            (offset == 0) ||
-            isSeperator(lowercaseString.charAt(offset - 1), separator, commentPrefix, blockCommentStartDelimiter);
-        boolean frontSeperated =
-            (offset >= (lowercaseString.length() - keywords.length())) ||
-            isSeperator(
-                lowercaseString.charAt(offset + keywords.length()),
+        new ScriptSplitter(
+            new ScriptScanner(
+                resource,
+                script,
                 separator,
                 commentPrefix,
-                blockCommentStartDelimiter
-            );
-
-        return backSeperated && frontSeperated && lowercaseString.startsWith(lowercaseKeywords, offset);
+                blockCommentStartDelimiter,
+                blockCommentEndDelimiter
+            ),
+            statements
+        )
+            .split();
     }
 
     private static void checkArgument(boolean expression, String errorMessage) {
@@ -318,13 +145,45 @@ private static void checkArgument(boolean expression, String errorMessage) {
      * @param delim String delimiting each statement - typically a ';' character
      */
     public static boolean containsSqlScriptDelimiters(String script, String delim) {
-        boolean inLiteral = false;
-        char[] content = script.toCharArray();
-        for (int i = 0; i < script.length(); i++) {
-            if (content[i] == '\'') {
-                inLiteral = !inLiteral;
-            }
-            if (!inLiteral && script.startsWith(delim, i)) {
+        return containsSqlScriptDelimiters(
+            "",
+            script,
+            DEFAULT_COMMENT_PREFIX,
+            delim,
+            DEFAULT_BLOCK_COMMENT_START_DELIMITER,
+            DEFAULT_BLOCK_COMMENT_END_DELIMITER
+        );
+    }
+
+    /**
+     * Does the provided SQL script contain the specified delimiter?
+     *
+     * @param script                     the SQL script
+     * @param delim                      String delimiting each statement - typically a ';' character
+     * @param commentPrefix              the prefix that identifies comments in the SQL script,
+     *                                   typically "--"
+     * @param blockCommentStartDelimiter block comment start delimiter
+     * @param blockCommentEndDelimiter   block comment end delimiter
+     */
+    public static boolean containsSqlScriptDelimiters(
+        String scriptPath,
+        String script,
+        String commentPrefix,
+        String delim,
+        String blockCommentStartDelimiter,
+        String blockCommentEndDelimiter
+    ) {
+        ScriptScanner scanner = new ScriptScanner(
+            scriptPath,
+            script,
+            delim,
+            commentPrefix,
+            blockCommentStartDelimiter,
+            blockCommentEndDelimiter
+        );
+        ScriptScanner.Lexem l;
+        while ((l = scanner.next()) != ScriptScanner.Lexem.EOF) {
+            if (ScriptScanner.Lexem.SEPARATOR.equals(l)) {
                 return true;
             }
         }
@@ -420,7 +279,16 @@ public static void executeDatabaseScript(
             if (separator == null) {
                 separator = DEFAULT_STATEMENT_SEPARATOR;
             }
-            if (!containsSqlScriptDelimiters(script, separator)) {
+            if (
+                !containsSqlScriptDelimiters(
+                    scriptPath,
+                    script,
+                    commentPrefix,
+                    separator,
+                    blockCommentStartDelimiter,
+                    blockCommentEndDelimiter
+                )
+            ) {
                 separator = FALLBACK_STATEMENT_SEPARATOR;
             }
 
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index 99ebb69a1e8..7b2068df672 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -4,10 +4,11 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class ScriptSplittingTest {
 
@@ -256,13 +257,9 @@ public void testProcedureBlock() {
     @Test
     public void testUnclosedBlockComment() {
         String script = "SELECT 'foo `bar`'; /*";
-
-        try {
-            doSplit(script);
-            fail("Should have thrown!");
-        } catch (ScriptUtils.ScriptParseException expected) {
-            // ignore expected exception
-        }
+        assertThatThrownBy(() -> doSplit(script, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR))
+            .isInstanceOf(ScriptUtils.ScriptParseException.class)
+            .hasMessageContaining("*/");
     }
 
     @Test
@@ -281,17 +278,173 @@ public void testIssue1452Case() {
         splitAndCompare(script, expected);
     }
 
+    @Test
+    public void testIfLoopBlocks() {
+        String script =
+            "BEGIN\n" +
+            "    rec_loop: LOOP\n" +
+            "        FETCH blah;\n" +
+            "        IF something_wrong THEN LEAVE rec_loop; END IF;\n" +
+            "        do_something_else;\n" +
+            "    END LOOP;\n" +
+            "END /* final comment */;";
+        List<String> expected = Collections.singletonList(
+            "BEGIN\n" +
+            "    rec_loop: LOOP\n" +
+            "        FETCH blah;\n" +
+            "        IF something_wrong THEN LEAVE rec_loop; END IF;\n" +
+            "        do_something_else;\n" +
+            "    END LOOP;\n" +
+            "END"
+        );
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testIfLoopBlocksSpecificSeparator() {
+        String script =
+            "BEGIN\n" +
+            "    rec_loop: LOOP\n" +
+            "        FETCH blah;\n" +
+            "        IF something_wrong THEN LEAVE rec_loop; END IF;\n" +
+            "        do_something_else;\n" +
+            "    END LOOP;\n" +
+            "END;\n" +
+            "@\n" +
+            "CALL something();\n" +
+            "@\n";
+        List<String> expected = Arrays.asList(
+            "BEGIN\n" +
+            "    rec_loop: LOOP\n" +
+            "        FETCH blah;\n" +
+            "        IF something_wrong THEN LEAVE rec_loop; END IF;\n" +
+            "        do_something_else;\n" +
+            "    END LOOP;\n" +
+            "END",
+            "CALL something();"
+        );
+        splitAndCompare(script, expected, "@");
+    }
+
+    @Test
+    public void testMultiProcedureMySQLScript() {
+        String script =
+            "CREATE PROCEDURE doiterate(p1 INT)\n" +
+            "  BEGIN\n" +
+            "    label1: LOOP\n" +
+            "      SET p1 = p1 + 1;\n" +
+            "      IF p1 < 10 THEN\n" +
+            "        ITERATE label1;\n" +
+            "      END IF;\n" +
+            "      LEAVE label1;\n" +
+            "    END LOOP label1;\n" +
+            "  END;\n" +
+            "\n" +
+            "CREATE PROCEDURE dowhile()\n" +
+            "  BEGIN\n" +
+            "    DECLARE v1 INT DEFAULT 5;\n" +
+            "    WHILE v1 > 0 DO\n" +
+            "      SET v1 = v1 - 1;\n" +
+            "    END WHILE;\n" +
+            "  END;\n" +
+            "\n" +
+            "CREATE PROCEDURE dorepeat(p1 INT)\n" +
+            "  BEGIN\n" +
+            "    SET @x = 0;\n" +
+            "    REPEAT\n" +
+            "      SET @x = @x + 1;\n" +
+            "    UNTIL @x > p1 END REPEAT;\n" +
+            "  END;";
+        List<String> expected = Arrays.asList(
+            "CREATE PROCEDURE doiterate(p1 INT) BEGIN\n" +
+            "    label1: LOOP\n" +
+            "      SET p1 = p1 + 1;\n" +
+            "      IF p1 < 10 THEN\n" +
+            "        ITERATE label1;\n" +
+            "      END IF;\n" +
+            "      LEAVE label1;\n" +
+            "    END LOOP label1;\n" +
+            "  END",
+            "CREATE PROCEDURE dowhile() BEGIN\n" +
+            "    DECLARE v1 INT DEFAULT 5;\n" +
+            "    WHILE v1 > 0 DO\n" +
+            "      SET v1 = v1 - 1;\n" +
+            "    END WHILE;\n" +
+            "  END",
+            "CREATE PROCEDURE dorepeat(p1 INT) BEGIN\n" +
+            "    SET @x = 0;\n" +
+            "    REPEAT\n" +
+            "      SET @x = @x + 1;\n" +
+            "    UNTIL @x > p1 END REPEAT;\n" +
+            "  END"
+        );
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testDollarQuotedStrings() {
+        String script =
+            "CREATE FUNCTION f ()\n" +
+            "RETURNS INT\n" +
+            "AS $$\n" +
+            "BEGIN\n" +
+            "    RETURN 1;\n" +
+            "END;\n" +
+            "$$ LANGUAGE plpgsql;";
+        List<String> expected = Collections.singletonList(
+            "CREATE FUNCTION f () RETURNS INT AS $$\n" +
+            "BEGIN\n" +
+            "    RETURN 1;\n" +
+            "END;\n" +
+            "$$ LANGUAGE plpgsql"
+        );
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testNestedDollarQuotedString() {
+        //see https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING
+        String script =
+            "CREATE FUNCTION f() AS $function$\n" +
+            "BEGIN\n" +
+            "    RETURN ($1 ~ $q$[\\t\\r\\n\\v\\\\]$q$);\n" +
+            "END;\n" +
+            "$function$;" +
+            "create table foo ();";
+        List<String> expected = Arrays.asList(
+            "CREATE FUNCTION f() AS $function$\n" +
+            "BEGIN\n" +
+            "    RETURN ($1 ~ $q$[\\t\\r\\n\\v\\\\]$q$);\n" +
+            "END;\n" +
+            "$function$",
+            "create table foo ()"
+        );
+        splitAndCompare(script, expected);
+    }
+
+    @Test
+    public void testUnclosedDollarQuotedString() {
+        String script = "SELECT $tag$ ..... $";
+        assertThatThrownBy(() -> doSplit(script, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR))
+            .isInstanceOf(ScriptUtils.ScriptParseException.class)
+            .hasMessageContaining("$tag$");
+    }
+
     private void splitAndCompare(String script, List<String> expected) {
-        final List<String> statements = doSplit(script);
+        splitAndCompare(script, expected, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR);
+    }
+
+    private void splitAndCompare(String script, List<String> expected, String separator) {
+        final List<String> statements = doSplit(script, separator);
         assertThat(statements).isEqualTo(expected);
     }
 
-    private List<String> doSplit(String script) {
+    private List<String> doSplit(String script, String separator) {
         final List<String> statements = new ArrayList<>();
         ScriptUtils.splitSqlScript(
             "ignored",
             script,
-            ScriptUtils.DEFAULT_STATEMENT_SEPARATOR,
+            separator,
             ScriptUtils.DEFAULT_COMMENT_PREFIX,
             ScriptUtils.DEFAULT_BLOCK_COMMENT_START_DELIMITER,
             ScriptUtils.DEFAULT_BLOCK_COMMENT_END_DELIMITER,
@@ -299,4 +452,14 @@ private List<String> doSplit(String script) {
         );
         return statements;
     }
+
+    @Test
+    public void testIgnoreDelimitersInLiteralsAndComments() {
+        assertThat(ScriptUtils.containsSqlScriptDelimiters("'@' /*@*/ \"@\" $tag$@$tag$ --@", "@")).isFalse();
+    }
+
+    @Test
+    public void testContainsDelimiters() {
+        assertThat(ScriptUtils.containsSqlScriptDelimiters("'@' /*@*/ @ \"@\" --@", "@")).isTrue();
+    }
 }

From f1815cda881efef1c777a6663ed8b203e37a3ada Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:13:10 +0000
Subject: [PATCH 3317/4969] Bump com.azure:azure-cosmos from 4.51.0 to 4.52.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.51.0 to 4.52.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.51.0...azure-cosmos_4.52.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index d3e9927ee3a..560a904ca70 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.51.0'
+    testImplementation 'com.azure:azure-cosmos:4.52.0'
 }

From 470fa8039884fcc46ac230a63c9eefb0755b0ff6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:27:05 +0000
Subject: [PATCH 3318/4969] Bump commons-io:commons-io from 2.14.0 to 2.15.0 in
 /modules/hivemq

Bumps commons-io:commons-io from 2.14.0 to 2.15.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c3e511f4d99..e746815108a 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.0.1")
 
     shaded("org.apache.commons:commons-lang3:3.13.0")
-    shaded("commons-io:commons-io:2.14.0")
+    shaded("commons-io:commons-io:2.15.0")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From 57bd25bc2b68633b6dd0d45d3b6262a0685ef752 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:32:09 +0000
Subject: [PATCH 3319/4969] Bump com.rabbitmq:amqp-client from 5.19.0 to 5.20.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.19.0 to 5.20.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.19.0...v5.20.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 7b8ce4cfaf4..130572ab134 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:5.0.2'
-    testImplementation 'com.rabbitmq:amqp-client:5.19.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.20.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 60e2d38624f82ea4dfd591e3554a2a873fc7fe82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:35:06 +0000
Subject: [PATCH 3320/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.23 to 3.2.24.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.23...3.2.24)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 968d0de8621..e79a0e30849 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.23"
+    api "com.orientechnologies:orientdb-client:3.2.24"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'

From 58d3106e35c8013002700175500fc6a524eff594 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:35:08 +0000
Subject: [PATCH 3321/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.23 to 3.2.24.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.23...3.2.24)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 968d0de8621..73528fcbf82 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.23"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.24"
 }

From c69c2659be3109a6c9d2a169f39a6fe32c6ae90a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:38:01 +0000
Subject: [PATCH 3322/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.4.1.jre8 to 12.4.2.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 db16851dd6e..700360c3e30 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.1.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.2.jre8'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From 51fb4df2dcada0e07bc44e74b947da47f7fd7240 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:43:49 +0000
Subject: [PATCH 3323/4969] Bump org.apache.pulsar:pulsar-client in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client](https://github.com/apache/pulsar) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index c669f9c172c..d9bf6c7160b 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.1'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.1'
 }

From 433e53e49864e7d55534cc92fce9093c6d4d6835 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:43:55 +0000
Subject: [PATCH 3324/4969] Bump org.apache.pulsar:pulsar-client-admin in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client-admin](https://github.com/apache/pulsar) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index c669f9c172c..afd8d215847 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.1'
 }

From 6d5a4b412f2ae346ed0dd5d87931d1cee49fab55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:47:03 +0000
Subject: [PATCH 3325/4969] Bump com.rabbitmq:amqp-client from 5.19.0 to 5.20.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.19.0 to 5.20.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.19.0...v5.20.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index d9efe94d263..850331a796c 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.19.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.20.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 1dba8d12a8f8900f07d7ef97689aa247e61260fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 31 Oct 2023 10:39:11 -0600
Subject: [PATCH 3326/4969] Add Container definition API (#7714)

Introduce `ContainerDef` and apply it to `PortForwardingContainer`
and `MongoDBContainer`.

`ContainerDef` is an internal API used by `GenericContainer` to decouple
the state of container creation and the running state.

---------

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../containers/ContainerDef.java              | 304 +++++++++++++++++
 .../containers/GenericContainer.java          | 309 +++++++++---------
 .../containers/PortForwardingContainer.java   |  36 +-
 .../containers/ExposedHostTest.java           |  32 +-
 .../TestCreateContainerCmdModifier.java       |   3 +-
 modules/mongodb/build.gradle                  |   6 +
 .../containers/MongoDBContainer.java          |  44 ++-
 7 files changed, 540 insertions(+), 194 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/containers/ContainerDef.java

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerDef.java b/core/src/main/java/org/testcontainers/containers/ContainerDef.java
new file mode 100644
index 00000000000..df058945aef
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/ContainerDef.java
@@ -0,0 +1,304 @@
+package org.testcontainers.containers;
+
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.InternetProtocol;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.UnstableAPI;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.images.RemoteDockerImage;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@UnstableAPI
+@Slf4j
+class ContainerDef {
+
+    @Getter
+    private RemoteDockerImage image;
+
+    Set<ExposedPort> exposedPorts = new HashSet<>();
+
+    Set<PortBinding> portBindings = new HashSet<>();
+
+    Map<String, String> labels = new HashMap<>();
+
+    Map<String, String> envVars = new HashMap<>();
+
+    private String[] entrypoint;
+
+    private String[] command = new String[0];
+
+    @Getter
+    private Network network;
+
+    Set<String> networkAliases = new LinkedHashSet<>();
+
+    @Getter
+    private String networkMode;
+
+    List<Bind> binds = new ArrayList<>();
+
+    @Getter
+    private boolean privilegedMode;
+
+    @Getter
+    private WaitStrategy waitStrategy = GenericContainer.DEFAULT_WAIT_STRATEGY;
+
+    public ContainerDef() {}
+
+    protected void applyTo(CreateContainerCmd createCommand) {
+        HostConfig hostConfig = createCommand.getHostConfig();
+        if (hostConfig == null) {
+            hostConfig = new HostConfig();
+            createCommand.withHostConfig(hostConfig);
+        }
+        // PortBindings must contain:
+        //  * all exposed ports with a randomized host port (equivalent to -p CONTAINER_PORT)
+        //  * all exposed ports with a fixed host port (equivalent to -p HOST_PORT:CONTAINER_PORT)
+        Map<ExposedPort, PortBinding> allPortBindings = new HashMap<>();
+        // First, collect all the randomized host ports from our 'exposedPorts' field
+        for (ExposedPort exposedPort : this.exposedPorts) {
+            allPortBindings.put(exposedPort, new PortBinding(Ports.Binding.empty(), exposedPort));
+        }
+        // Next, collect all the fixed host ports from our 'portBindings' field, overwriting any randomized ports so that
+        // we don't create two bindings for the same container port.
+        for (PortBinding portBinding : this.portBindings) {
+            allPortBindings.put(portBinding.getExposedPort(), portBinding);
+        }
+        hostConfig.withPortBindings(new ArrayList<>(allPortBindings.values()));
+
+        // Next, ExposedPorts must be set up to publish all of the above ports, both randomized and fixed.
+        createCommand.withExposedPorts(new ArrayList<>(allPortBindings.keySet()));
+
+        createCommand.withEnv(
+            this.envVars.entrySet()
+                .stream()
+                .filter(it -> it.getValue() != null)
+                .map(it -> it.getKey() + "=" + it.getValue())
+                .toArray(String[]::new)
+        );
+
+        if (this.entrypoint != null) {
+            createCommand.withEntrypoint(this.entrypoint);
+        }
+
+        if (this.command != null) {
+            createCommand.withCmd(this.command);
+        }
+
+        if (this.network != null) {
+            hostConfig.withNetworkMode(this.network.getId());
+            createCommand.withAliases(this.networkAliases.toArray(new String[0]));
+        } else {
+            if (this.networkMode != null) {
+                createCommand.getHostConfig().withNetworkMode(this.networkMode);
+            }
+        }
+
+        boolean shouldCheckFileMountingSupport =
+            this.binds.size() > 0 && !TestcontainersConfiguration.getInstance().isDisableChecks();
+        if (shouldCheckFileMountingSupport) {
+            if (!DockerClientFactory.instance().isFileMountingSupported()) {
+                log.warn(
+                    "Unable to mount a file from test host into a running container. " +
+                    "This may be a misconfiguration or limitation of your Docker environment. " +
+                    "Some features might not work."
+                );
+            }
+        }
+
+        hostConfig.withBinds(this.binds.toArray(new Bind[0]));
+
+        if (this.privilegedMode) {
+            createCommand.getHostConfig().withPrivileged(this.privilegedMode);
+        }
+
+        Map<String, String> combinedLabels = new HashMap<>(this.labels);
+        if (createCommand.getLabels() != null) {
+            combinedLabels.putAll(createCommand.getLabels());
+        }
+
+        createCommand.withLabels(combinedLabels);
+    }
+
+    protected void setImage(RemoteDockerImage image) {
+        this.image = image;
+    }
+
+    protected void setImage(String image) {
+        setImage(DockerImageName.parse(image));
+    }
+
+    protected void setImage(DockerImageName image) {
+        setImage(new RemoteDockerImage(image));
+    }
+
+    public Set<ExposedPort> getExposedPorts() {
+        return new HashSet<>(this.exposedPorts);
+    }
+
+    protected void setExposedPorts(Set<ExposedPort> exposedPorts) {
+        this.exposedPorts.clear();
+        this.exposedPorts.addAll(exposedPorts);
+    }
+
+    protected void addExposedPorts(ExposedPort... exposedPorts) {
+        this.exposedPorts.addAll(Arrays.asList(exposedPorts));
+    }
+
+    protected void addExposedPort(ExposedPort exposedPort) {
+        this.exposedPorts.add(exposedPort);
+    }
+
+    protected void setExposedTcpPorts(Set<Integer> ports) {
+        this.exposedPorts.clear();
+        ports.forEach(port -> this.exposedPorts.add(ExposedPort.tcp(port)));
+    }
+
+    protected void addExposedTcpPorts(int... ports) {
+        for (int port : ports) {
+            this.exposedPorts.add(ExposedPort.tcp(port));
+        }
+    }
+
+    protected void addExposedTcpPort(int port) {
+        this.exposedPorts.add(ExposedPort.tcp(port));
+    }
+
+    protected void addExposedPort(int port, InternetProtocol protocol) {
+        this.exposedPorts.add(new ExposedPort(port, protocol));
+    }
+
+    public Set<PortBinding> getPortBindings() {
+        return new HashSet<>(this.portBindings);
+    }
+
+    protected void setPortBindings(Set<PortBinding> portBindings) {
+        this.portBindings.clear();
+        this.portBindings.addAll(portBindings);
+    }
+
+    protected void addPortBindings(PortBinding... portBindings) {
+        this.portBindings.addAll(Arrays.asList(portBindings));
+    }
+
+    protected void addPortBinding(PortBinding portBinding) {
+        this.portBindings.add(portBinding);
+    }
+
+    public Map<String, String> getLabels() {
+        return new HashMap<>(this.labels);
+    }
+
+    protected void setLabels(Map<String, String> labels) {
+        this.labels.clear();
+        this.labels.putAll(labels);
+    }
+
+    protected void addLabels(Map<String, String> labels) {
+        this.labels.putAll(labels);
+    }
+
+    protected void addLabel(String key, String value) {
+        this.labels.put(key, value);
+    }
+
+    public Map<String, String> getEnvVars() {
+        return new HashMap<>(this.envVars);
+    }
+
+    protected void setEnvVars(Map<String, String> envVars) {
+        this.envVars.clear();
+        this.envVars.putAll(envVars);
+    }
+
+    protected void addEnvVars(Map<String, String> envVars) {
+        this.envVars.putAll(envVars);
+    }
+
+    protected void addEnvVar(String key, String value) {
+        this.envVars.put(key, value);
+    }
+
+    public String[] getEntrypoint() {
+        return Arrays.copyOf(this.entrypoint, this.entrypoint.length);
+    }
+
+    protected void setEntrypoint(String... entrypoint) {
+        this.entrypoint = entrypoint;
+    }
+
+    public String[] getCommand() {
+        return Arrays.copyOf(this.command, this.command.length);
+    }
+
+    protected void setCommand(String... command) {
+        this.command = command;
+    }
+
+    protected void setNetwork(Network network) {
+        this.network = network;
+    }
+
+    public Set<String> getNetworkAliases() {
+        return new LinkedHashSet<>(this.networkAliases);
+    }
+
+    protected void setNetworkAliases(Set<String> aliases) {
+        this.networkAliases.clear();
+        this.networkAliases.addAll(aliases);
+    }
+
+    protected void addNetworkAliases(String... aliases) {
+        this.networkAliases.addAll(Arrays.asList(aliases));
+    }
+
+    protected void addNetworkAlias(String alias) {
+        this.networkAliases.add(alias);
+    }
+
+    protected void setNetworkMode(String networkMode) {
+        this.networkMode = networkMode;
+    }
+
+    protected void setPrivilegedMode(boolean privilegedMode) {
+        this.privilegedMode = privilegedMode;
+    }
+
+    public List<Bind> getBinds() {
+        return new ArrayList<>(this.binds);
+    }
+
+    protected void setBinds(List<Bind> binds) {
+        this.binds.clear();
+        this.binds.addAll(binds);
+    }
+
+    protected void addBinds(Bind... binds) {
+        this.binds.addAll(Arrays.asList(binds));
+    }
+
+    protected void addBind(Bind bind) {
+        this.binds.add(bind);
+    }
+
+    protected void setWaitStrategy(WaitStrategy waitStrategy) {
+        this.waitStrategy = waitStrategy;
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 6d1a4ace0c1..fdd36dd9f68 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -125,41 +125,12 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     /*
      * Default settings
      */
-    @NonNull
-    private LinkedHashSet<Integer> exposedPorts = new LinkedHashSet<>();
-
-    @NonNull
-    private List<String> portBindings = new ArrayList<>();
-
     @NonNull
     private List<String> extraHosts = new ArrayList<>();
 
-    @NonNull
-    private String networkMode;
-
-    @Nullable
-    private Network network;
-
-    @NonNull
-    private List<String> networkAliases = new ArrayList<>(Arrays.asList("tc-" + Base58.randomString(8)));
-
     @NonNull
     private RemoteDockerImage image;
 
-    @NonNull
-    private Map<String, String> env = new HashMap<>();
-
-    @NonNull
-    private Map<String, String> labels = new HashMap<>();
-
-    @NonNull
-    private String[] commandParts = new String[0];
-
-    @NonNull
-    private List<Bind> binds = new ArrayList<>();
-
-    private boolean privilegedMode;
-
     @NonNull
     private List<VolumesFrom> volumesFroms = new ArrayList<>();
 
@@ -213,11 +184,13 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Setter(AccessLevel.NONE)
     private InspectContainerResponse containerInfo;
 
+    static WaitStrategy DEFAULT_WAIT_STRATEGY = Wait.defaultWaitStrategy();
+
     /**
      * The approach to determine if the container is ready.
      */
     @NonNull
-    protected org.testcontainers.containers.wait.strategy.WaitStrategy waitStrategy = Wait.defaultWaitStrategy();
+    protected WaitStrategy waitStrategy = DEFAULT_WAIT_STRATEGY;
 
     private List<Consumer<OutputFrame>> logConsumers = new ArrayList<>();
 
@@ -239,6 +212,18 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     private final Set<CreateContainerCmdModifier> createContainerCmdModifiers = loadCreateContainerCmdCustomizers();
 
+    private ContainerDef containerDef;
+
+    ContainerDef createContainerDef() {
+        ContainerDef def = new ContainerDef();
+        def.addNetworkAlias("tc-" + Base58.randomString(8));
+        return def;
+    }
+
+    ContainerDef getContainerDef() {
+        return this.containerDef;
+    }
+
     private Set<CreateContainerCmdModifier> loadCreateContainerCmdCustomizers() {
         ServiceLoader<CreateContainerCmdModifier> containerCmdCustomizers = ServiceLoader.load(
             CreateContainerCmdModifier.class
@@ -251,11 +236,13 @@ private Set<CreateContainerCmdModifier> loadCreateContainerCmdCustomizers() {
     }
 
     public GenericContainer(@NonNull final DockerImageName dockerImageName) {
-        this.image = new RemoteDockerImage(dockerImageName);
+        this(new RemoteDockerImage(dockerImageName));
     }
 
     public GenericContainer(@NonNull final RemoteDockerImage image) {
         this.image = image;
+        this.containerDef = createContainerDef();
+        this.containerDef.setImage(image);
     }
 
     /**
@@ -267,25 +254,30 @@ public GenericContainer() {
     }
 
     public GenericContainer(@NonNull final String dockerImageName) {
-        this.setDockerImageName(dockerImageName);
+        this(new RemoteDockerImage(DockerImageName.parse(dockerImageName)));
     }
 
     public GenericContainer(@NonNull final Future<String> image) {
-        setImage(image);
+        this(new RemoteDockerImage(image));
+    }
+
+    GenericContainer(@NonNull final ContainerDef containerDef) {
+        this.image = containerDef.getImage();
+        this.containerDef = containerDef;
     }
 
     public void setImage(Future<String> image) {
-        this.image = new RemoteDockerImage(image);
+        this.containerDef.setImage(new RemoteDockerImage(image));
     }
 
     @Override
     public List<Integer> getExposedPorts() {
-        return new ArrayList<>(exposedPorts);
+        return this.containerDef.getExposedPorts().stream().map(ExposedPort::getPort).collect(Collectors.toList());
     }
 
     @Override
     public void setExposedPorts(List<Integer> exposedPorts) {
-        this.exposedPorts = new LinkedHashSet<>(exposedPorts);
+        this.containerDef.setExposedPorts(exposedPorts.stream().map(ExposedPort::tcp).collect(Collectors.toSet()));
     }
 
     /**
@@ -336,6 +328,10 @@ public void start() {
 
     protected void doStart() {
         try {
+            if (this.waitStrategy != DEFAULT_WAIT_STRATEGY) {
+                this.containerDef.setWaitStrategy(this.waitStrategy);
+            }
+
             configure();
 
             logger().debug("Starting container: {}", getDockerImageName());
@@ -466,7 +462,7 @@ private void tryStart() {
                     .until(
                         () -> dockerClient.inspectContainerCmd(containerId).exec(),
                         inspectContainerResponse -> {
-                            Set<Integer> exposedAndMappedPorts = inspectContainerResponse
+                            Set<ExposedPort> exposedAndMappedPorts = inspectContainerResponse
                                 .getNetworkSettings()
                                 .getPorts()
                                 .getBindings()
@@ -474,10 +470,9 @@ private void tryStart() {
                                 .stream()
                                 .filter(it -> Objects.nonNull(it.getValue())) // filter out exposed but not yet mapped
                                 .map(Entry::getKey)
-                                .map(ExposedPort::getPort)
                                 .collect(Collectors.toSet());
 
-                            return exposedAndMappedPorts.containsAll(exposedPorts);
+                            return exposedAndMappedPorts.containsAll(this.containerDef.getExposedPorts());
                         }
                     );
 
@@ -615,8 +610,7 @@ Optional<String> findContainerForReuse(String hash) {
     /**
      * Set any custom settings for the create command such as shared memory size.
      */
-    private HostConfig buildHostConfig() {
-        HostConfig config = new HostConfig();
+    private HostConfig buildHostConfig(HostConfig config) {
         if (shmSize != null) {
             config.withShmSize(shmSize);
         }
@@ -746,11 +740,13 @@ protected void containerIsStopped(InspectContainerResponse containerInfo) {}
     @Deprecated
     protected Integer getLivenessCheckPort() {
         // legacy implementation for backwards compatibility
-        Iterator<Integer> exposedPortsIterator = exposedPorts.iterator();
+        Iterator<ExposedPort> exposedPortsIterator = this.containerDef.getExposedPorts().iterator();
         if (exposedPortsIterator.hasNext()) {
-            return getMappedPort(exposedPortsIterator.next());
-        } else if (portBindings.size() > 0) {
-            return Integer.valueOf(PortBinding.parse(portBindings.get(0)).getBinding().getHostPortSpec());
+            return getMappedPort(exposedPortsIterator.next().getPort());
+        } else if (!this.containerDef.getPortBindings().isEmpty()) {
+            return Integer.valueOf(
+                this.containerDef.getPortBindings().iterator().next().getBinding().getHostPortSpec()
+            );
         } else {
             return null;
         }
@@ -780,57 +776,8 @@ public Set<Integer> getLivenessCheckPortNumbers() {
     }
 
     private void applyConfiguration(CreateContainerCmd createCommand) {
-        HostConfig hostConfig = buildHostConfig();
-
-        // PortBindings must contain:
-        //  * all exposed ports with a randomized host port (equivalent to -p CONTAINER_PORT)
-        //  * all exposed ports with a fixed host port (equivalent to -p HOST_PORT:CONTAINER_PORT)
-        Map<ExposedPort, PortBinding> allPortBindings = new HashMap<>();
-        // First collect all the randomized host ports from our 'exposedPorts' field
-        for (final Integer tcpPort : exposedPorts) {
-            ExposedPort exposedPort = ExposedPort.tcp(tcpPort);
-            allPortBindings.put(exposedPort, new PortBinding(Ports.Binding.empty(), exposedPort));
-        }
-        // Next collect all the fixed host ports from our 'portBindings' field, overwriting any randomized ports so that
-        // we don't create two bindings for the same container port.
-        for (final String portBinding : portBindings) {
-            PortBinding parsedBinding = PortBinding.parse(portBinding);
-            allPortBindings.put(parsedBinding.getExposedPort(), parsedBinding);
-        }
-        hostConfig.withPortBindings(new ArrayList<>(allPortBindings.values()));
-
-        // Next, ExposedPorts must be set up to publish all of the above ports, both randomized and fixed.
-        createCommand.withExposedPorts(new ArrayList<>(allPortBindings.keySet()));
-
-        createCommand.withHostConfig(hostConfig);
-
-        if (commandParts != null) {
-            createCommand.withCmd(commandParts);
-        }
-
-        String[] envArray = env
-            .entrySet()
-            .stream()
-            .filter(it -> it.getValue() != null)
-            .map(it -> it.getKey() + "=" + it.getValue())
-            .toArray(String[]::new);
-        createCommand.withEnv(envArray);
-
-        boolean shouldCheckFileMountingSupport =
-            binds.size() > 0 && !TestcontainersConfiguration.getInstance().isDisableChecks();
-        if (shouldCheckFileMountingSupport) {
-            if (!DockerClientFactory.instance().isFileMountingSupported()) {
-                logger()
-                    .warn(
-                        "Unable to mount a file from test host into a running container. " +
-                        "This may be a misconfiguration or limitation of your Docker environment. " +
-                        "Some features might not work."
-                    );
-            }
-        }
-
-        Bind[] bindsArray = binds.stream().toArray(Bind[]::new);
-        createCommand.withBinds(bindsArray);
+        this.containerDef.applyTo(createCommand);
+        buildHostConfig(createCommand.getHostConfig());
 
         VolumesFrom[] volumesFromsArray = volumesFroms.stream().toArray(VolumesFrom[]::new);
         createCommand.withVolumesFrom(volumesFromsArray);
@@ -886,32 +833,13 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
         String[] extraHostsArray = extraHosts.stream().toArray(String[]::new);
         createCommand.withExtraHosts(extraHostsArray);
 
-        if (network != null) {
-            createCommand.withNetworkMode(network.getId());
-            createCommand.withAliases(this.networkAliases);
-        } else if (networkMode != null) {
-            createCommand.withNetworkMode(networkMode);
-        }
-
         if (workingDirectory != null) {
             createCommand.withWorkingDir(workingDirectory);
         }
 
-        if (privilegedMode) {
-            createCommand.withPrivileged(privilegedMode);
-        }
-
         for (CreateContainerCmdModifier createContainerCmdModifier : this.createContainerCmdModifiers) {
             createCommand = createContainerCmdModifier.modify(createCommand);
         }
-
-        Map<String, String> combinedLabels = new HashMap<>();
-        combinedLabels.putAll(labels);
-        if (createCommand.getLabels() != null) {
-            combinedLabels.putAll(createCommand.getLabels());
-        }
-
-        createCommand.withLabels(combinedLabels);
     }
 
     private Set<Link> findLinksFromThisContainer(String alias, LinkableContainer linkableContainer) {
@@ -944,7 +872,7 @@ private Set<String> findAllNetworksForLinkedContainers(LinkableContainer linkabl
      * {@inheritDoc}
      */
     @Override
-    public SELF waitingFor(@NonNull org.testcontainers.containers.wait.strategy.WaitStrategy waitStrategy) {
+    public SELF waitingFor(@NonNull WaitStrategy waitStrategy) {
         this.waitStrategy = waitStrategy;
         return self();
     }
@@ -955,24 +883,24 @@ public SELF waitingFor(@NonNull org.testcontainers.containers.wait.strategy.Wait
      *
      * @return the {@link WaitStrategy} to use
      */
-    protected org.testcontainers.containers.wait.strategy.WaitStrategy getWaitStrategy() {
-        return waitStrategy;
+    protected WaitStrategy getWaitStrategy() {
+        return this.waitStrategy == DEFAULT_WAIT_STRATEGY ? this.containerDef.getWaitStrategy() : this.waitStrategy;
     }
 
     @Override
-    public void setWaitStrategy(org.testcontainers.containers.wait.strategy.WaitStrategy waitStrategy) {
-        this.waitStrategy = waitStrategy;
+    public void setWaitStrategy(WaitStrategy waitStrategy) {
+        this.containerDef.setWaitStrategy(waitStrategy);
     }
 
     /**
      * Wait until the container has started. The default implementation simply
      * waits for a port to start listening; other implementations are available
-     * as implementations of {@link org.testcontainers.containers.wait.strategy.WaitStrategy}
+     * as implementations of {@link WaitStrategy}
      *
-     * @see #waitingFor(org.testcontainers.containers.wait.strategy.WaitStrategy)
+     * @see #waitingFor(WaitStrategy)
      */
     protected void waitUntilContainerStarted() {
-        org.testcontainers.containers.wait.strategy.WaitStrategy waitStrategy = getWaitStrategy();
+        WaitStrategy waitStrategy = getWaitStrategy();
         if (waitStrategy != null) {
             waitStrategy.waitUntilReady(this);
         }
@@ -1009,7 +937,7 @@ private String checkForEmulation() {
      */
     @Override
     public void setCommand(@NonNull String command) {
-        this.commandParts = command.split(" ");
+        this.containerDef.setCommand(command.split(" "));
     }
 
     /**
@@ -1017,12 +945,12 @@ public void setCommand(@NonNull String command) {
      */
     @Override
     public void setCommand(@NonNull String... commandParts) {
-        this.commandParts = commandParts;
+        this.containerDef.setCommand(commandParts);
     }
 
     @Override
     public Map<String, String> getEnvMap() {
-        return env;
+        return this.containerDef.envVars;
     }
 
     /**
@@ -1030,12 +958,18 @@ public Map<String, String> getEnvMap() {
      */
     @Override
     public List<String> getEnv() {
-        return env.entrySet().stream().map(it -> it.getKey() + "=" + it.getValue()).collect(Collectors.toList());
+        return this.containerDef.getEnvVars()
+            .entrySet()
+            .stream()
+            .map(it -> it.getKey() + "=" + it.getValue())
+            .collect(Collectors.toList());
     }
 
     @Override
     public void setEnv(List<String> env) {
-        this.env = env.stream().map(it -> it.split("=")).collect(Collectors.toMap(it -> it[0], it -> it[1]));
+        this.containerDef.setEnvVars(
+                env.stream().map(it -> it.split("=")).collect(Collectors.toMap(it -> it[0], it -> it[1]))
+            );
     }
 
     /**
@@ -1043,7 +977,7 @@ public void setEnv(List<String> env) {
      */
     @Override
     public void addEnv(String key, String value) {
-        env.put(key, value);
+        this.containerDef.addEnvVar(key, value);
     }
 
     /**
@@ -1058,17 +992,19 @@ public void addFileSystemBind(
     ) {
         if (SystemUtils.IS_OS_WINDOWS && hostPath.startsWith("/")) {
             // e.g. Docker socket mount
-            binds.add(new Bind(hostPath, new Volume(containerPath), mode.accessMode, selinuxContext.selContext));
+            this.containerDef.addBinds(
+                    new Bind(hostPath, new Volume(containerPath), mode.accessMode, selinuxContext.selContext)
+                );
         } else {
             final MountableFile mountableFile = MountableFile.forHostPath(hostPath);
-            binds.add(
-                new Bind(
-                    mountableFile.getResolvedPath(),
-                    new Volume(containerPath),
-                    mode.accessMode,
-                    selinuxContext.selContext
-                )
-            );
+            this.containerDef.addBinds(
+                    new Bind(
+                        mountableFile.getResolvedPath(),
+                        new Volume(containerPath),
+                        mode.accessMode,
+                        selinuxContext.selContext
+                    )
+                );
         }
     }
 
@@ -1105,14 +1041,12 @@ public void addLink(LinkableContainer otherContainer, String alias) {
 
     @Override
     public void addExposedPort(Integer port) {
-        exposedPorts.add(port);
+        this.containerDef.addExposedTcpPort(port);
     }
 
     @Override
     public void addExposedPorts(int... ports) {
-        for (int port : ports) {
-            exposedPorts.add(port);
-        }
+        this.containerDef.addExposedTcpPorts(ports);
     }
 
     private TestDescription toDescription(Description description) {
@@ -1201,7 +1135,12 @@ protected void addFixedExposedPort(int hostPort, int containerPort) {
      * @param protocol
      */
     protected void addFixedExposedPort(int hostPort, int containerPort, InternetProtocol protocol) {
-        portBindings.add(String.format("%d:%d/%s", hostPort, containerPort, protocol.toDockerNotation()));
+        ExposedPort exposedPort = new ExposedPort(
+            containerPort,
+            com.github.dockerjava.api.model.InternetProtocol.parse(protocol.name())
+        );
+        PortBinding portBinding = new PortBinding(Ports.Binding.bindPort(hostPort), exposedPort);
+        this.containerDef.addPortBindings(portBinding);
     }
 
     /**
@@ -1218,7 +1157,7 @@ public SELF withEnv(String key, String value) {
      */
     @Override
     public SELF withEnv(Map<String, String> env) {
-        env.forEach(this::addEnv);
+        env.forEach(this.containerDef::addEnvVar);
         return self();
     }
 
@@ -1230,7 +1169,7 @@ public SELF withLabel(String key, String value) {
         if (key.startsWith("org.testcontainers")) {
             throw new IllegalArgumentException("The org.testcontainers namespace is reserved for interal use");
         }
-        labels.put(key, value);
+        this.containerDef.addLabel(key, value);
         return self();
     }
 
@@ -1272,19 +1211,19 @@ public SELF withExtraHost(String hostname, String ipAddress) {
 
     @Override
     public SELF withNetworkMode(String networkMode) {
-        this.networkMode = networkMode;
+        this.containerDef.setNetworkMode(networkMode);
         return self();
     }
 
     @Override
     public SELF withNetwork(Network network) {
-        this.network = network;
+        this.containerDef.setNetwork(network);
         return self();
     }
 
     @Override
     public SELF withNetworkAliases(String... aliases) {
-        Collections.addAll(this.networkAliases, aliases);
+        this.containerDef.addNetworkAliases(aliases);
         return self();
     }
 
@@ -1338,7 +1277,7 @@ public SELF withStartupTimeout(Duration startupTimeout) {
 
     @Override
     public SELF withPrivilegedMode(boolean mode) {
-        this.privilegedMode = mode;
+        this.containerDef.setPrivilegedMode(mode);
         return self();
     }
 
@@ -1565,4 +1504,76 @@ public int hashCode() {
     public String getContainerName() {
         return getContainerInfo().getName();
     }
+
+    public Network getNetwork() {
+        return this.containerDef.getNetwork();
+    }
+
+    @Override
+    public List<Bind> getBinds() {
+        return this.containerDef.binds;
+    }
+
+    @Override
+    public void setBinds(List<Bind> binds) {
+        this.containerDef.setBinds(binds);
+    }
+
+    @Override
+    public String[] getCommandParts() {
+        return this.containerDef.getCommand();
+    }
+
+    @Override
+    public void setCommandParts(String[] commandParts) {
+        this.containerDef.setCommand(commandParts);
+    }
+
+    public List<String> getNetworkAliases() {
+        return new ArrayList<>(this.containerDef.getNetworkAliases());
+    }
+
+    public void setNetworkAliases(List<String> aliases) {
+        this.containerDef.setNetworkAliases(new HashSet<>(aliases));
+    }
+
+    @Override
+    public List<String> getPortBindings() {
+        return this.containerDef.portBindings.stream()
+            .map(it -> String.format("%s:%s", it.getBinding(), it.getExposedPort()))
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public void setPortBindings(List<String> portBindings) {
+        this.containerDef.setPortBindings(portBindings.stream().map(PortBinding::parse).collect(Collectors.toSet()));
+    }
+
+    public void setPrivilegedMode(boolean mode) {
+        this.containerDef.setPrivilegedMode(mode);
+    }
+
+    public boolean isPrivilegedMode() {
+        return this.containerDef.isPrivilegedMode();
+    }
+
+    public Map<String, String> getLabels() {
+        return this.containerDef.labels;
+    }
+
+    public void setLabels(Map<String, String> labels) {
+        this.containerDef.setLabels(labels);
+    }
+
+    public String getNetworkMode() {
+        return this.containerDef.getNetworkMode();
+    }
+
+    public void setNetworkMode(String networkMode) {
+        this.containerDef.setNetworkMode(networkMode);
+    }
+
+    public void setNetwork(Network network) {
+        this.containerDef.setNetwork(network);
+    }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index 4a99ccacd91..0a99c48a367 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -20,6 +20,25 @@
 public enum PortForwardingContainer {
     INSTANCE;
 
+    private static String PASSWORD = UUID.randomUUID().toString();
+
+    private static ContainerDef DEFINITION = new ContainerDef() {
+        {
+            setImage(DockerImageName.parse("testcontainers/sshd:1.1.0"));
+            addExposedTcpPort(22);
+            addEnvVar("PASSWORD", PASSWORD);
+            setCommand(
+                "sh",
+                "-c",
+                // Disable ipv6 & Make it listen on all interfaces, not just localhost
+                // Enable algorithms supported by our ssh client library
+                "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes " +
+                "-o AddressFamily=inet -o GatewayPorts=yes -o AllowAgentForwarding=yes -o AllowTcpForwarding=yes " +
+                "-o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa "
+            );
+        }
+    };
+
     private GenericContainer<?> container;
 
     private final Set<Entry<Integer, Integer>> exposedPorts = Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -29,20 +48,7 @@ public enum PortForwardingContainer {
 
     @SneakyThrows
     private Connection createSSHSession() {
-        String password = UUID.randomUUID().toString();
-        container =
-            new GenericContainer<>(DockerImageName.parse("testcontainers/sshd:1.1.0"))
-                .withExposedPorts(22)
-                .withEnv("PASSWORD", password)
-                .withCommand(
-                    "sh",
-                    "-c",
-                    // Disable ipv6 & Make it listen on all interfaces, not just localhost
-                    // Enable algorithms supported by our ssh client library
-                    "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes " +
-                    "-o AddressFamily=inet -o GatewayPorts=yes -o AllowAgentForwarding=yes -o AllowTcpForwarding=yes " +
-                    "-o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa "
-                );
+        container = new GenericContainer<>(DEFINITION);
         container.start();
 
         Connection connection = new Connection(container.getHost(), container.getMappedPort(22));
@@ -54,7 +60,7 @@ private Connection createSSHSession() {
             (int) Duration.ofSeconds(30).toMillis()
         );
 
-        if (!connection.authenticateWithPassword("root", password)) {
+        if (!connection.authenticateWithPassword("root", PASSWORD)) {
             throw new IllegalStateException("Authentication failed.");
         }
 
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 5f88be90ad8..4a3142d9461 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -49,11 +49,7 @@ public void tearDown() {
 
     @Test
     public void testExposedHostAfterContainerIsStarted() {
-        try (
-            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
-                .withCommand("top")
-                .withAccessToHost(true)
-        ) {
+        try (GenericContainer<?> container = new GenericContainer<>(tinyContainerDef()).withAccessToHost(true)) {
             container.start();
             Testcontainers.exposeHostPorts(server.getAddress().getPort());
             assertResponse(container, server.getAddress().getPort());
@@ -61,29 +57,29 @@ public void testExposedHostAfterContainerIsStarted() {
     }
 
     @Test
-    public void testExposedHost() throws Exception {
+    public void testExposedHost() {
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
-        assertResponse(new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top"), server.getAddress().getPort());
+        assertResponse(new GenericContainer<>(tinyContainerDef()), server.getAddress().getPort());
     }
 
     @Test
-    public void testExposedHostWithNetwork() throws Exception {
+    public void testExposedHostWithNetwork() {
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
         try (Network network = Network.newNetwork()) {
             assertResponse(
-                new GenericContainer<>(TestImages.TINY_IMAGE).withNetwork(network).withCommand("top"),
+                new GenericContainer<>(tinyContainerDef()).withNetwork(network),
                 server.getAddress().getPort()
             );
         }
     }
 
     @Test
-    public void testExposedHostPortOnFixedInternalPorts() throws Exception {
+    public void testExposedHostPortOnFixedInternalPorts() {
         Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 80));
         Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));
 
-        assertResponse(new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top"), 80);
-        assertResponse(new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top"), 81);
+        assertResponse(new GenericContainer<>(tinyContainerDef()), 80);
+        assertResponse(new GenericContainer<>(tinyContainerDef()), 81);
     }
 
     @SneakyThrows
@@ -100,4 +96,16 @@ protected void assertResponse(GenericContainer<?> container, int port) {
             container.stop();
         }
     }
+
+    private ContainerDef tinyContainerDef() {
+        return new TinyContainerDef();
+    }
+
+    private static class TinyContainerDef extends ContainerDef {
+
+        TinyContainerDef() {
+            setImage(TestImages.TINY_IMAGE);
+            setCommand("top");
+        }
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java b/core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java
index 9657e57bd32..a09a92865ff 100644
--- a/core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java
+++ b/core/src/test/java/org/testcontainers/custom/TestCreateContainerCmdModifier.java
@@ -13,6 +13,7 @@ public CreateContainerCmd modify(CreateContainerCmd createContainerCmd) {
         Map<String, String> labels = new HashMap<>();
         labels.put("project", "testcontainers-java");
         labels.put("scope", "global");
-        return createContainerCmd.withLabels(labels);
+        createContainerCmd.getLabels().putAll(labels);
+        return createContainerCmd;
     }
 }
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index b20a50652b6..eb7d71397ff 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -6,3 +6,9 @@ dependencies {
     testImplementation("org.mongodb:mongodb-driver-sync:4.11.0")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.containers.MongoDBContainer#configure()"
+    ]
+}
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 8511e35ec91..1e6749f8aed 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -26,8 +26,6 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final int CONTAINER_EXIT_CODE_OK = 0;
 
-    private static final int MONGODB_INTERNAL_PORT = 27017;
-
     private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
 
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
@@ -51,27 +49,21 @@ public MongoDBContainer(@NonNull final String dockerImageName) {
     public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+    }
 
-        withExposedPorts(MONGODB_INTERNAL_PORT);
+    @Override
+    MongoDBContainerDef createContainerDef() {
+        return new MongoDBContainerDef();
     }
 
     @Override
-    public void configure() {
-        if (shardingEnabled) {
-            withCreateContainerCmdModifier(cmd -> {
-                cmd.withEntrypoint("sh");
-            });
-            withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
-            waitingFor(Wait.forLogMessage("(?i).*mongos ready.*", 1));
-        } else {
-            withCommand("--replSet", "docker-rs");
-            waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
-        }
+    MongoDBContainerDef getContainerDef() {
+        return (MongoDBContainerDef) super.getContainerDef();
     }
 
     @Override
     protected void containerIsStarting(InspectContainerResponse containerInfo) {
-        if (shardingEnabled) {
+        if (this.shardingEnabled) {
             copyFileToContainer(MountableFile.forClasspathResource("/sharding.sh", 0777), STARTER_SCRIPT);
         }
     }
@@ -83,12 +75,13 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
      */
     public MongoDBContainer withSharding() {
         this.shardingEnabled = true;
+        getContainerDef().withSharding();
         return this;
     }
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
-        if (!shardingEnabled) {
+        if (!this.shardingEnabled) {
             initReplicaSet(reused);
         }
     }
@@ -99,7 +92,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
      * @return a connection url pointing to a mongodb instance
      */
     public String getConnectionString() {
-        return String.format("mongodb://%s:%d", getHost(), getMappedPort(MONGODB_INTERNAL_PORT));
+        return String.format("mongodb://%s:%d", getHost(), getMappedPort(MongoDBContainerDef.MONGODB_INTERNAL_PORT));
     }
 
     /**
@@ -202,4 +195,21 @@ private boolean isReplicationSetAlreadyInitialized() {
         );
         return execCheckRsInit.getExitCode() == CONTAINER_EXIT_CODE_OK;
     }
+
+    private static class MongoDBContainerDef extends ContainerDef {
+
+        private static final int MONGODB_INTERNAL_PORT = 27017;
+
+        MongoDBContainerDef() {
+            addExposedTcpPort(MONGODB_INTERNAL_PORT);
+            setCommand("--replSet", "docker-rs");
+            setWaitStrategy(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
+        }
+
+        void withSharding() {
+            setCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+            setWaitStrategy(Wait.forLogMessage("(?i).*mongos ready.*", 1));
+            setEntrypoint("sh");
+        }
+    }
 }

From c6d720252a1dfc117b162affef32d874d4b10121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 31 Oct 2023 15:02:17 -0600
Subject: [PATCH 3327/4969] Create KafkaContainerDef (#7748)

Apply `ContainerDef` to `KafkaContainer`
---
 modules/kafka/build.gradle                    |   7 +
 .../containers/KafkaContainer.java            | 216 ++++++++++--------
 2 files changed, 128 insertions(+), 95 deletions(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index d536dbfd526..bfc6203af53 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -7,3 +7,10 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.containers.KafkaContainer#configureKraft()",
+        "org.testcontainers.containers.KafkaContainer#configureZookeeper()"
+    ]
+}
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 60c04590901..bb69540082a 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -48,12 +48,8 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private boolean kraftEnabled = false;
 
-    private String clusterId = DEFAULT_CLUSTER_ID;
-
     private static final String PROTOCOL_PREFIX = "TC";
 
-    private final Set<Supplier<String>> listeners = new HashSet<>();
-
     /**
      * @deprecated use {@link #KafkaContainer(DockerImageName)} instead
      */
@@ -73,30 +69,23 @@ public KafkaContainer(String confluentPlatformVersion) {
     public KafkaContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+    }
 
-        withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
-
-        withEnv("KAFKA_BROKER_ID", "1");
-        withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
-        withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
-
-        withExposedPorts(KAFKA_PORT);
+    @Override
+    KafkaContainerDef createContainerDef() {
+        return new KafkaContainerDef();
+    }
 
-        withCreateContainerCmdModifier(cmd -> {
-            cmd.withEntrypoint("sh");
-        });
-        withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+    @Override
+    KafkaContainerDef getContainerDef() {
+        return (KafkaContainerDef) super.getContainerDef();
     }
 
     public KafkaContainer withEmbeddedZookeeper() {
         if (this.kraftEnabled) {
             throw new IllegalStateException("Cannot configure Zookeeper when using Kraft mode");
         }
-        externalZookeeperConnect = null;
+        getContainerDef().withEmbeddedZookeeper();
         return self();
     }
 
@@ -104,7 +93,8 @@ public KafkaContainer withExternalZookeeper(String connectString) {
         if (this.kraftEnabled) {
             throw new IllegalStateException("Cannot configure Zookeeper when using Kraft mode");
         }
-        externalZookeeperConnect = connectString;
+        this.externalZookeeperConnect = connectString;
+        getContainerDef().withZookeeper(connectString);
         return self();
     }
 
@@ -114,6 +104,7 @@ public KafkaContainer withKraft() {
         }
         verifyMinKraftVersion();
         this.kraftEnabled = true;
+        getContainerDef().withRaft();
         return self();
     }
 
@@ -137,7 +128,7 @@ private boolean isLessThanCP740() {
 
     public KafkaContainer withClusterId(String clusterId) {
         Objects.requireNonNull(clusterId, "clusterId cannot be null");
-        this.clusterId = clusterId;
+        getContainerDef().withClusterId(clusterId);
         return self();
     }
 
@@ -147,77 +138,10 @@ public String getBootstrapServers() {
 
     @Override
     protected void configure() {
-        // Use two listeners with different names, it will force Kafka to communicate with itself via internal
-        // listener when KAFKA_INTER_BROKER_LISTENER_NAME is set, otherwise Kafka will try to use the advertised listener
-        Set<String> listeners = new HashSet<>();
-        listeners.add("PLAINTEXT://0.0.0.0:" + KAFKA_PORT);
-        listeners.add("BROKER://0.0.0.0:9092");
-
-        Set<String> listenerSecurityProtocolMap = new HashSet<>();
-        listenerSecurityProtocolMap.add("BROKER:PLAINTEXT");
-        listenerSecurityProtocolMap.add("PLAINTEXT:PLAINTEXT");
+        getContainerDef().resolveListeners();
 
-        List<Supplier<String>> listenersToTransform = new ArrayList<>(this.listeners);
-        for (int i = 0; i < listenersToTransform.size(); i++) {
-            Supplier<String> listenerSupplier = listenersToTransform.get(i);
-            String protocol = String.format("%s-%d", PROTOCOL_PREFIX, i);
-            String listener = listenerSupplier.get();
-            String listenerPort = listener.split(":")[1];
-            String listenerProtocol = String.format("%s://0.0.0.0:%s", protocol, listenerPort);
-            String protocolMap = String.format("%s:PLAINTEXT", protocol);
-            listeners.add(listenerProtocol);
-            listenerSecurityProtocolMap.add(protocolMap);
-
-            String host = listener.split(":")[0];
-            withNetworkAliases(host);
-        }
-
-        String kafkaListeners = String.join(",", listeners);
-        String kafkaListenerSecurityProtocolMap = String.join(",", listenerSecurityProtocolMap);
-
-        withEnv("KAFKA_LISTENERS", kafkaListeners);
-        withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", kafkaListenerSecurityProtocolMap);
-
-        if (this.kraftEnabled) {
-            waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
-            configureKraft();
-        } else {
-            waitingFor(Wait.forLogMessage(".*\\[KafkaServer id=\\d+\\] started.*", 1));
-            configureZookeeper();
-        }
-    }
-
-    protected void configureKraft() {
-        //CP 7.4.0
-        getEnvMap().computeIfAbsent("CLUSTER_ID", key -> clusterId);
-        getEnvMap().computeIfAbsent("KAFKA_NODE_ID", key -> getEnvMap().get("KAFKA_BROKER_ID"));
-        withEnv(
-            "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
-            String.format("%s,CONTROLLER:PLAINTEXT", getEnvMap().get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP"))
-        );
-        withEnv("KAFKA_LISTENERS", String.format("%s,CONTROLLER://0.0.0.0:9094", getEnvMap().get("KAFKA_LISTENERS")));
-
-        withEnv("KAFKA_PROCESS_ROLES", "broker,controller");
-        getEnvMap()
-            .computeIfAbsent(
-                "KAFKA_CONTROLLER_QUORUM_VOTERS",
-                key -> {
-                    return String.format(
-                        "%s@%s:9094",
-                        getEnvMap().get("KAFKA_NODE_ID"),
-                        getNetwork() != null ? getNetworkAliases().get(0) : "localhost"
-                    );
-                }
-            );
-        withEnv("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
-    }
-
-    protected void configureZookeeper() {
-        if (externalZookeeperConnect != null) {
-            withEnv("KAFKA_ZOOKEEPER_CONNECT", externalZookeeperConnect);
-        } else {
-            addExposedPort(ZOOKEEPER_PORT);
-            withEnv("KAFKA_ZOOKEEPER_CONNECT", "localhost:" + ZOOKEEPER_PORT);
+        if (!this.kraftEnabled && this.externalZookeeperConnect == null) {
+            getContainerDef().withEmbeddedZookeeper();
         }
     }
 
@@ -229,7 +153,7 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
         advertisedListeners.add(getBootstrapServers());
         advertisedListeners.add(brokerAdvertisedListener(containerInfo));
 
-        List<Supplier<String>> listenersToTransform = new ArrayList<>(this.listeners);
+        List<Supplier<String>> listenersToTransform = new ArrayList<>(getContainerDef().listeners);
         for (int i = 0; i < listenersToTransform.size(); i++) {
             Supplier<String> listenerSupplier = listenersToTransform.get(i);
             String protocol = String.format("%s-%d", PROTOCOL_PREFIX, i);
@@ -265,7 +189,7 @@ protected String commandKraft() {
         String command = "sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure\n";
         command +=
             "echo 'kafka-storage format --ignore-formatted -t \"" +
-            this.clusterId +
+            getContainerDef().getEnvVars().get("CLUSTER_ID") +
             "\" -c /etc/kafka/kafka.properties' >> /etc/confluent/docker/configure\n";
         return command;
     }
@@ -299,11 +223,113 @@ protected String commandZookeeper() {
      * @return this {@link KafkaContainer} instance
      */
     public KafkaContainer withListener(Supplier<String> listenerSupplier) {
-        this.listeners.add(listenerSupplier);
+        getContainerDef().withListener(listenerSupplier);
         return this;
     }
 
     protected String brokerAdvertisedListener(InspectContainerResponse containerInfo) {
         return String.format("BROKER://%s:%s", containerInfo.getConfig().getHostName(), "9092");
     }
+
+    private static class KafkaContainerDef extends ContainerDef {
+
+        private final Set<Supplier<String>> listeners = new HashSet<>();
+
+        private String clusterId = DEFAULT_CLUSTER_ID;
+
+        KafkaContainerDef() {
+            // Use two listeners with different names, it will force Kafka to communicate with itself via internal
+            // listener when KAFKA_INTER_BROKER_LISTENER_NAME is set, otherwise Kafka will try to use the advertised listener
+            addEnvVar("KAFKA_LISTENERS", "PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092");
+            addEnvVar("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT");
+            addEnvVar("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
+
+            addEnvVar("KAFKA_BROKER_ID", "1");
+            addEnvVar("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+            addEnvVar("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", DEFAULT_INTERNAL_TOPIC_RF);
+            addEnvVar("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+            addEnvVar("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", DEFAULT_INTERNAL_TOPIC_RF);
+            addEnvVar("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
+            addEnvVar("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
+
+            addExposedTcpPort(KAFKA_PORT);
+
+            setEntrypoint("sh");
+            setCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+
+            setWaitStrategy(Wait.forLogMessage(".*\\[KafkaServer id=\\d+\\] started.*", 1));
+        }
+
+        private void resolveListeners() {
+            Set<String> additionalKafkaListeners = new HashSet<>();
+            Set<String> additionalListenerSecurityProtocolMap = new HashSet<>();
+
+            List<Supplier<String>> listenersToTransform = new ArrayList<>(this.listeners);
+            for (int i = 0; i < listenersToTransform.size(); i++) {
+                Supplier<String> listenerSupplier = listenersToTransform.get(i);
+                String protocol = String.format("%s-%d", PROTOCOL_PREFIX, i);
+                String listener = listenerSupplier.get();
+                String listenerPort = listener.split(":")[1];
+                String listenerProtocol = String.format("%s://0.0.0.0:%s", protocol, listenerPort);
+                String protocolMap = String.format("%s:PLAINTEXT", protocol);
+                additionalKafkaListeners.add(listenerProtocol);
+                additionalListenerSecurityProtocolMap.add(protocolMap);
+
+                String host = listener.split(":")[0];
+                addNetworkAlias(host);
+            }
+
+            String kafkaListeners = String.join(",", additionalKafkaListeners);
+            String kafkaListenerSecurityProtocolMap = String.join(",", additionalListenerSecurityProtocolMap);
+
+            this.envVars.computeIfPresent("KAFKA_LISTENERS", (k, v) -> String.join(",", v, kafkaListeners));
+            this.envVars.computeIfPresent(
+                    "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
+                    (k, v) -> String.join(",", v, kafkaListenerSecurityProtocolMap)
+                );
+        }
+
+        void withListener(Supplier<String> listenerSupplier) {
+            this.listeners.add(listenerSupplier);
+        }
+
+        void withEmbeddedZookeeper() {
+            addExposedTcpPort(ZOOKEEPER_PORT);
+            addEnvVar("KAFKA_ZOOKEEPER_CONNECT", "localhost:" + ZOOKEEPER_PORT);
+        }
+
+        void withZookeeper(String connectionString) {
+            addEnvVar("KAFKA_ZOOKEEPER_CONNECT", connectionString);
+        }
+
+        void withClusterId(String clusterId) {
+            this.clusterId = clusterId;
+        }
+
+        void withRaft() {
+            this.envVars.computeIfAbsent("CLUSTER_ID", key -> clusterId);
+            this.envVars.computeIfAbsent("KAFKA_NODE_ID", key -> getEnvVars().get("KAFKA_BROKER_ID"));
+            addEnvVar(
+                "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
+                String.format("%s,CONTROLLER:PLAINTEXT", getEnvVars().get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP"))
+            );
+            addEnvVar(
+                "KAFKA_LISTENERS",
+                String.format("%s,CONTROLLER://0.0.0.0:9094", getEnvVars().get("KAFKA_LISTENERS"))
+            );
+            addEnvVar("KAFKA_PROCESS_ROLES", "broker,controller");
+
+            String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
+            String networkAlias = getNetwork() != null ? firstNetworkAlias : "localhost";
+            String controllerQuorumVoters = String.format(
+                "%s@%s:9094",
+                getEnvVars().get("KAFKA_NODE_ID"),
+                networkAlias
+            );
+            this.envVars.computeIfAbsent("KAFKA_CONTROLLER_QUORUM_VOTERS", key -> controllerQuorumVoters);
+            addEnvVar("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
+
+            setWaitStrategy(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
+        }
+    }
 }

From 66225bfb4d04f124b5561d762f9f2b8d514c644a Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nelson@osacky.com>
Date: Wed, 1 Nov 2023 16:40:19 +0100
Subject: [PATCH 3328/4969] Update Revved up by Develocity badge (#7750)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 521abac691c..ab001d6537b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=33816473&machine=standardLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs)
 
-[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)
+[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)
 
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 

From b596ae4e54fa473ff6738bf47379c17626b35473 Mon Sep 17 00:00:00 2001
From: Gerald Venzl <gerald.venzl@gmail.com>
Date: Wed, 1 Nov 2023 20:57:17 -0700
Subject: [PATCH 3329/4969] Update PR template with more specific wording
 (#7751)

Signed-off-by: gvenzl <gerald.venzl@gmail.com>
---
 .github/pull_request_template.md | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 8584eb39b45..31553ebfff1 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,10 +3,18 @@ Thanks for contributing to Testcontainers. Please review the following notes bef
 submitting a pull request.
 
 New Modules:
-Make sure to add it to `bug_report.yaml`, `enhancement.yaml` and `feature.yaml`.
-Also, add it to `dependabot.yml` and `labeler.yml`.
 
-Before committing, please run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
+If you are contributing a new module, please add your module name to the following files:
+
+* `./.github/ISSUE_TEMPLATE/bug_report.yaml`
+* `./.github/ISSUE_TEMPLATE/enhancement.yaml`
+* `./.github/ISSUE_TEMPLATE/feature.yaml`
+* `./.github/dependabot.yml`
+* `./.github/labeler.yml`
+
+Also make sure that your new module has the appropriate documentation under `./docs/modules/`
+
+Before committing any change, please run `./gradlew checkstyleMain checkstyleTest spotlessApply` and fix any issues that occur.
 
 Dependency Upgrades:
 Please do not open a pull request to update only a version dependency. Existing process will perform

From fa23ae4caac41c672710c6b5c3b6e2f3d70e82ea Mon Sep 17 00:00:00 2001
From: Gerald Venzl <gerald.venzl@gmail.com>
Date: Fri, 3 Nov 2023 09:15:49 -0700
Subject: [PATCH 3330/4969] Add Oracle Free module (#7749)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #7190

---------

Signed-off-by: gvenzl <gerald.venzl@gmail.com>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   3 +-
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   3 +-
 .github/ISSUE_TEMPLATE/feature.yaml           |   3 +-
 .github/dependabot.yml                        |   4 +
 .github/labeler.yml                           |   1 +
 docs/modules/databases/oraclefree.md          |  33 +++
 modules/oracle-free/build.gradle              |  32 +++
 .../oracle/OracleContainer.java               | 194 ++++++++++++++++++
 .../oracle/OracleContainerProvider.java       |  29 +++
 .../oracle/OracleR2DBCDatabaseContainer.java  |  35 ++++
 .../OracleR2DBCDatabaseContainerProvider.java |  43 ++++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 .../junit/oracle/SimpleOracleTest.java        | 145 +++++++++++++
 .../oracle/jdbc/OracleJDBCDriverTest.java     |  48 +++++
 .../OracleR2DBCDatabaseContainerTest.java     |  30 +++
 .../src/test/resources/logback-test.xml       |  16 ++
 16 files changed, 617 insertions(+), 3 deletions(-)
 create mode 100644 docs/modules/databases/oraclefree.md
 create mode 100644 modules/oracle-free/build.gradle
 create mode 100644 modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
 create mode 100644 modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainerProvider.java
 create mode 100644 modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java
 create mode 100644 modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java
 create mode 100644 modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
 create mode 100644 modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java
 create mode 100644 modules/oracle-free/src/test/java/org/testcontainers/oracle/r2dbc/OracleR2DBCDatabaseContainerTest.java
 create mode 100644 modules/oracle-free/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 8a8b92c6110..135c8323866 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -38,7 +38,8 @@ body:
         - MySQL
         - Neo4j
         - NGINX
-        - Oracle-XE
+        - Oracle Free
+        - Oracle XE
         - OrientDB
         - PostgreSQL
         - Presto
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 56391755f2e..d77b4ce07a2 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -38,7 +38,8 @@ body:
         - MySQL
         - Neo4j
         - NGINX
-        - Oracle-XE
+        - Oracle Free
+        - Oracle XE
         - OrientDB
         - PostgreSQL
         - Presto
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 3d5e6bd44b6..65a27e5f99a 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -38,7 +38,8 @@ body:
         - MySQL
         - Neo4j
         - NGINX
-        - Oracle-XE
+        - Oracle Free
+        - Oracle XE
         - OrientDB
         - PostgreSQL
         - QuestDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4eb1900e45e..3cb3e0fd222 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -194,6 +194,10 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/oracle-free"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gradle"
     directory: "/modules/oracle-xe"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 748037f2d39..3b4c1924df1 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -62,6 +62,7 @@
 "modules/nginx":
   - modules/nginx/**/*
 "modules/oracle":
+  - modules/oracle-free/**/*
   - modules/oracle-xe/**/*
 "modules/orientdb":
   - modules/orientdb/**/*
diff --git a/docs/modules/databases/oraclefree.md b/docs/modules/databases/oraclefree.md
new file mode 100644
index 00000000000..c85d672f140
--- /dev/null
+++ b/docs/modules/databases/oraclefree.md
@@ -0,0 +1,33 @@
+# Oracle Database Free Module
+
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
+## Usage example
+
+You can use `OracleContainer` like any other JDBC container:
+<!--codeinclude-->
+[Container creation](../../../modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java) inside_block:constructor
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:oracle-free:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>oracle-free</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
+
+
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
new file mode 100644
index 00000000000..cf572558307
--- /dev/null
+++ b/modules/oracle-free/build.gradle
@@ -0,0 +1,32 @@
+description = "Testcontainers :: JDBC :: Oracle Database Free"
+
+dependencies {
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
+
+    api project(':jdbc')
+
+    compileOnly project(':r2dbc')
+    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
+
+    testImplementation project(':jdbc-test')
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
+
+    compileOnly 'org.jetbrains:annotations:24.0.1'
+
+    testImplementation testFixtures(project(':r2dbc'))
+    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
+}
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
+}
diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
new file mode 100644
index 00000000000..1130072be12
--- /dev/null
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
@@ -0,0 +1,194 @@
+package org.testcontainers.oracle;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for Oracle Database Free.
+ * <p>
+ * Supported image: {@code gvenzl/oracle-free}
+ * <p>
+ * Exposed ports: 1521
+ */
+public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
+
+    static final String NAME = "oracle";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-free");
+
+    static final String DEFAULT_TAG = "slim";
+
+    static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
+    static final int ORACLE_PORT = 1521;
+
+    private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 60;
+
+    private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 60;
+
+    // Container defaults
+    static final String DEFAULT_DATABASE_NAME = "freepdb1";
+
+    static final String DEFAULT_SID = "free";
+
+    static final String DEFAULT_SYSTEM_USER = "system";
+
+    static final String DEFAULT_SYS_USER = "sys";
+
+    // Test container defaults
+    static final String APP_USER = "test";
+
+    static final String APP_USER_PASSWORD = "test";
+
+    // Restricted user and database names
+    private static final List<String> ORACLE_SYSTEM_USERS = Arrays.asList(DEFAULT_SYSTEM_USER, DEFAULT_SYS_USER);
+
+    private String databaseName = DEFAULT_DATABASE_NAME;
+
+    private String username = APP_USER;
+
+    private String password = APP_USER_PASSWORD;
+
+    private boolean usingSid = false;
+
+    public OracleContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public OracleContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        this.waitStrategy =
+            new LogMessageWaitStrategy()
+                .withRegEx(".*DATABASE IS READY TO USE!.*\\s")
+                .withTimes(1)
+                .withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, ChronoUnit.SECONDS));
+        withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
+        addExposedPorts(ORACLE_PORT);
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+
+    @NotNull
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Collections.singleton(getMappedPort(ORACLE_PORT));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "oracle.jdbc.driver.OracleDriver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return isUsingSid()
+            ? "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + ":" + getSid()
+            : "jdbc:oracle:thin:" + "@" + getHost() + ":" + getOraclePort() + "/" + getDatabaseName();
+    }
+
+    @Override
+    public String getUsername() {
+        // An application user is tied to the database, and therefore not authenticated to connect to SID.
+        return isUsingSid() ? DEFAULT_SYSTEM_USER : username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    protected boolean isUsingSid() {
+        return usingSid;
+    }
+
+    @Override
+    public OracleContainer withUsername(String username) {
+        if (StringUtils.isEmpty(username)) {
+            throw new IllegalArgumentException("Username cannot be null or empty");
+        }
+        if (ORACLE_SYSTEM_USERS.contains(username.toLowerCase())) {
+            throw new IllegalArgumentException("Username cannot be one of " + ORACLE_SYSTEM_USERS);
+        }
+        this.username = username;
+        return self();
+    }
+
+    @Override
+    public OracleContainer withPassword(String password) {
+        if (StringUtils.isEmpty(password)) {
+            throw new IllegalArgumentException("Password cannot be null or empty");
+        }
+        this.password = password;
+        return self();
+    }
+
+    @Override
+    public OracleContainer withDatabaseName(String databaseName) {
+        if (StringUtils.isEmpty(databaseName)) {
+            throw new IllegalArgumentException("Database name cannot be null or empty");
+        }
+
+        if (DEFAULT_DATABASE_NAME.equals(databaseName.toLowerCase())) {
+            throw new IllegalArgumentException("Database name cannot be set to " + DEFAULT_DATABASE_NAME);
+        }
+
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    public OracleContainer usingSid() {
+        this.usingSid = true;
+        return self();
+    }
+
+    @Override
+    public OracleContainer withUrlParam(String paramName, String paramValue) {
+        throw new UnsupportedOperationException("The Oracle Database driver does not support this");
+    }
+
+    @SuppressWarnings("SameReturnValue")
+    public String getSid() {
+        return DEFAULT_SID;
+    }
+
+    public Integer getOraclePort() {
+        return getMappedPort(ORACLE_PORT);
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1 FROM DUAL";
+    }
+
+    @Override
+    protected void configure() {
+        withEnv("ORACLE_PASSWORD", password);
+
+        // Only set ORACLE_DATABASE if different than the default.
+        if (databaseName != DEFAULT_DATABASE_NAME) {
+            withEnv("ORACLE_DATABASE", databaseName);
+        }
+
+        withEnv("APP_USER", username);
+        withEnv("APP_USER_PASSWORD", password);
+    }
+}
diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainerProvider.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainerProvider.java
new file mode 100644
index 00000000000..031d3471cc5
--- /dev/null
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainerProvider.java
@@ -0,0 +1,29 @@
+package org.testcontainers.oracle;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for Oracle containers.
+ */
+public class OracleContainerProvider extends JdbcDatabaseContainerProvider {
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(OracleContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(OracleContainer.DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        if (tag != null) {
+            return new OracleContainer(DockerImageName.parse(OracleContainer.IMAGE).withTag(tag));
+        }
+        return newInstance();
+    }
+}
diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..f9c12955653
--- /dev/null
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java
@@ -0,0 +1,35 @@
+package org.testcontainers.oracle;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+@RequiredArgsConstructor
+public class OracleR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    @Delegate(types = Startable.class)
+    private final OracleContainer container;
+
+    public static ConnectionFactoryOptions getOptions(OracleContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, OracleR2DBCDatabaseContainerProvider.DRIVER)
+            .build();
+
+        return new OracleR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(OracleContainer.ORACLE_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+}
diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..6fe809aa214
--- /dev/null
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java
@@ -0,0 +1,43 @@
+package org.testcontainers.oracle;
+
+import com.google.auto.service.AutoService;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.jetbrains.annotations.Nullable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
+
+@AutoService(R2DBCDatabaseContainerProvider.class)
+public class OracleR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+
+    static final String DRIVER = "oracle";
+
+    @Override
+    public boolean supports(ConnectionFactoryOptions options) {
+        return DRIVER.equals(options.getRequiredValue(ConnectionFactoryOptions.DRIVER));
+    }
+
+    @Override
+    public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        String image = OracleContainer.IMAGE + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        OracleContainer container = new OracleContainer(image)
+            .withDatabaseName((String) options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+        if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
+            container.withReuse(true);
+        }
+        return new OracleR2DBCDatabaseContainer(container);
+    }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, OracleContainer.APP_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, OracleContainer.APP_USER_PASSWORD);
+        }
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
+}
diff --git a/modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..fd3e21bca3d
--- /dev/null
+++ b/modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.oracle.OracleContainerProvider
diff --git a/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
new file mode 100644
index 00000000000..5ef276c0157
--- /dev/null
+++ b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -0,0 +1,145 @@
+package org.testcontainers.junit.oracle;
+
+import org.junit.Test;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.oracle.OracleContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+public class SimpleOracleTest extends AbstractContainerDatabaseTest {
+
+    public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
+        "gvenzl/oracle-free:slim-faststart"
+    );
+
+    private void runTest(OracleContainer container, String databaseName, String username, String password)
+        throws SQLException {
+        //Test config was honored
+        assertThat(container.getDatabaseName()).isEqualTo(databaseName);
+        assertThat(container.getUsername()).isEqualTo(username);
+        assertThat(container.getPassword()).isEqualTo(password);
+
+        //Test we can get a connection
+        container.start();
+        ResultSet resultSet = performQuery(container, "SELECT 1 FROM dual");
+        int resultSetInt = resultSet.getInt(1);
+        assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+    }
+
+    @Test
+    public void testDefaultSettings() throws SQLException {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);) {
+            runTest(oracle, "freepdb1", "test", "test");
+
+            // Match against the last '/'
+            String urlSuffix = oracle.getJdbcUrl().split("(\\/)(?!.*\\/)", 2)[1];
+            assertThat(urlSuffix).isEqualTo("freepdb1");
+        }
+    }
+
+    @Test
+    public void testPluggableDatabase() throws SQLException {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).withDatabaseName("testDB")) {
+            runTest(oracle, "testDB", "test", "test");
+        }
+    }
+
+    @Test
+    public void testPluggableDatabaseAndCustomUser() throws SQLException {
+        try (
+            // constructor {
+            OracleContainer oracle = new OracleContainer("gvenzl/oracle-free:slim-faststart")
+                .withDatabaseName("testDB")
+                .withUsername("testUser")
+                .withPassword("testPassword")
+            // }
+        ) {
+            runTest(oracle, "testDB", "testUser", "testPassword");
+        }
+    }
+
+    @Test
+    public void testCustomUser() throws SQLException {
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+                .withUsername("testUser")
+                .withPassword("testPassword")
+        ) {
+            runTest(oracle, "freepdb1", "testUser", "testPassword");
+        }
+    }
+
+    @Test
+    public void testSID() throws SQLException {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid();) {
+            runTest(oracle, "freepdb1", "system", "test");
+
+            // Match against the last ':'
+            String urlSuffix = oracle.getJdbcUrl().split("(\\:)(?!.*\\:)", 2)[1];
+            assertThat(urlSuffix).isEqualTo("free");
+        }
+    }
+
+    @Test
+    public void testSIDAndCustomPassword() throws SQLException {
+        try (
+            OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
+                .usingSid()
+                .withPassword("testPassword");
+        ) {
+            runTest(oracle, "freepdb1", "system", "testPassword");
+        }
+    }
+
+    @Test
+    public void testErrorPaths() throws SQLException {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) {
+            try {
+                oracle.withDatabaseName("FREEPDB1");
+                fail("Should not have been able to set database name to freepdb1.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withDatabaseName("");
+                fail("Should not have been able to set database name to nothing.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withUsername("SYSTEM");
+                fail("Should not have been able to set username to system.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withUsername("SYS");
+                fail("Should not have been able to set username to sys.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withUsername("");
+                fail("Should not have been able to set username to nothing.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+
+            try {
+                oracle.withPassword("");
+                fail("Should not have been able to set password to nothing.");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+        }
+    }
+}
diff --git a/modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java b/modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java
new file mode 100644
index 00000000000..6f6157c61c8
--- /dev/null
+++ b/modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java
@@ -0,0 +1,48 @@
+package org.testcontainers.oracle.jdbc;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.apache.commons.dbutils.QueryRunner;
+import org.apache.commons.dbutils.ResultSetHandler;
+import org.junit.Test;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class OracleJDBCDriverTest {
+
+    @Test
+    public void testOracleWithNoSpecifiedVersion() throws SQLException {
+        performSimpleTest("jdbc:tc:oracle://hostname/databasename");
+    }
+
+    private void performSimpleTest(String jdbcUrl) throws SQLException {
+        HikariDataSource dataSource = getDataSource(jdbcUrl, 1);
+        new QueryRunner(dataSource)
+            .query(
+                "SELECT 1 FROM dual",
+                new ResultSetHandler<Object>() {
+                    @Override
+                    public Object handle(ResultSet rs) throws SQLException {
+                        rs.next();
+                        int resultSetInt = rs.getInt(1);
+                        assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+                        return true;
+                    }
+                }
+            );
+        dataSource.close();
+    }
+
+    private HikariDataSource getDataSource(String jdbcUrl, int poolSize) {
+        HikariConfig hikariConfig = new HikariConfig();
+        hikariConfig.setJdbcUrl(jdbcUrl);
+        hikariConfig.setConnectionTestQuery("SELECT 1 FROM dual");
+        hikariConfig.setMinimumIdle(1);
+        hikariConfig.setMaximumPoolSize(poolSize);
+
+        return new HikariDataSource(hikariConfig);
+    }
+}
diff --git a/modules/oracle-free/src/test/java/org/testcontainers/oracle/r2dbc/OracleR2DBCDatabaseContainerTest.java b/modules/oracle-free/src/test/java/org/testcontainers/oracle/r2dbc/OracleR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..a3933cdfe39
--- /dev/null
+++ b/modules/oracle-free/src/test/java/org/testcontainers/oracle/r2dbc/OracleR2DBCDatabaseContainerTest.java
@@ -0,0 +1,30 @@
+package org.testcontainers.oracle.r2dbc;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.oracle.OracleContainer;
+import org.testcontainers.oracle.OracleR2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class OracleR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<OracleContainer> {
+
+    @Override
+    protected OracleContainer createContainer() {
+        return new OracleContainer("gvenzl/oracle-free:slim-faststart");
+    }
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(OracleContainer container) {
+        ConnectionFactoryOptions options = OracleR2DBCDatabaseContainer.getOptions(container);
+
+        return options;
+    }
+
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:oracle:///db?TC_IMAGE_TAG=slim-faststart";
+    }
+
+    @Override
+    protected String query() {
+        return "SELECT %s from dual";
+    }
+}
diff --git a/modules/oracle-free/src/test/resources/logback-test.xml b/modules/oracle-free/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/oracle-free/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 33da6e9158825691a67d4bec59f52435c92bd280 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:16:19 +0000
Subject: [PATCH 3331/4969] Bump io.fabric8:kubernetes-client from 6.9.0 to
 6.9.2 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.9.0 to 6.9.2.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.9.0...v6.9.2)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 36618a1a88e..04dc12f3391 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.9.0'
+    testImplementation 'io.fabric8:kubernetes-client:6.9.2'
     testImplementation 'io.kubernetes:client-java:19.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7eeaa795364dadc466b89fc627c9add4a8895108 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:16:27 +0000
Subject: [PATCH 3332/4969] Bump github/combine-prs from 4.0.0 to 4.1.0

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index c53350d041f..c2c0c70555f 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v4.0.0
+        uses: github/combine-prs@v4.1.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From fe8a1cd03611e950109fa2405e218cd596e48173 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:16:27 +0000
Subject: [PATCH 3333/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.14.1 to 4.15.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.15.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 a05eee00eef..b8045d4e94c 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.14.1')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.15.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From 666ec53e87ec8821ed64d93256ed012849aa28b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 6 Nov 2023 01:33:33 -0600
Subject: [PATCH 3334/4969] Add examples enabling SASL with JAAS in Kafka
 (#7763)

Fixes #7441
---
 .../containers/KafkaContainerTest.java        | 184 ++++++++++++++++--
 1 file changed, 166 insertions(+), 18 deletions(-)

diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index fb7c9dacc6e..e5d1617298b 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.common.collect.ImmutableMap;
+import lombok.SneakyThrows;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
@@ -11,8 +12,12 @@
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.config.SaslConfigs;
+import org.apache.kafka.common.errors.SaslAuthenticationException;
+import org.apache.kafka.common.errors.TopicAuthorizationException;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
+import org.awaitility.Awaitility;
 import org.junit.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.Testcontainers;
@@ -22,10 +27,12 @@
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Properties;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.tuple;
 
 public class KafkaContainerTest {
@@ -38,6 +45,15 @@ public class KafkaContainerTest {
         "confluentinc/cp-zookeeper:4.0.0"
     );
 
+    private final ImmutableMap<String, String> properties = ImmutableMap.of(
+        AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
+        "SASL_PLAINTEXT",
+        SaslConfigs.SASL_MECHANISM,
+        "PLAIN",
+        SaslConfigs.SASL_JAAS_CONFIG,
+        "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"admin\" password=\"admin\";"
+    );
+
     @Test
     public void testUsage() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)) {
@@ -220,34 +236,166 @@ public void testUsageWithListener() throws Exception {
         }
     }
 
-    protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
-        testKafkaFunctionality(bootstrapServers, 1, 1);
+    @SneakyThrows
+    @Test
+    public void shouldConfigureAuthenticationWithSaslUsingJaas() {
+        try (
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
+                .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT")
+                .withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_PLAIN_SASL_JAAS_CONFIG", getJaasConfig())
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_PLAIN_SASL_JAAS_CONFIG", getJaasConfig())
+        ) {
+            kafka.start();
+
+            testSecureKafkaFunctionality(kafka.getBootstrapServers());
+        }
     }
 
-    protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
+    @SneakyThrows
+    @Test
+    public void enableSaslWithUnsuccessfulTopicCreation() {
         try (
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
+                .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT")
+                .withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_PLAIN_SASL_JAAS_CONFIG", getJaasConfig())
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_PLAIN_SASL_JAAS_CONFIG", getJaasConfig())
+                .withEnv("KAFKA_AUTHORIZER_CLASS_NAME", "kafka.security.authorizer.AclAuthorizer")
+                .withEnv("KAFKA_SUPER_USERS", "User:admin")
+        ) {
+            kafka.start();
+
             AdminClient adminClient = AdminClient.create(
-                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
+                ImmutableMap.of(
+                    AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    kafka.getBootstrapServers(),
+                    AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
+                    "SASL_PLAINTEXT",
+                    SaslConfigs.SASL_MECHANISM,
+                    "PLAIN",
+                    SaslConfigs.SASL_JAAS_CONFIG,
+                    "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"test\" password=\"secret\";"
+                )
             );
-            KafkaProducer<String, String> producer = new KafkaProducer<>(
+
+            String topicName = "messages-" + UUID.randomUUID();
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, 1, (short) 1));
+
+            Awaitility
+                .await()
+                .untilAsserted(() -> {
+                    assertThatThrownBy(() -> adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS))
+                        .hasCauseInstanceOf(TopicAuthorizationException.class);
+                });
+        }
+    }
+
+    @SneakyThrows
+    @Test
+    public void enableSaslAndWithAuthenticationError() {
+        String jaasConfig = getJaasConfig();
+        try (
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
+                .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT")
+                .withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_PLAIN_SASL_JAAS_CONFIG", jaasConfig)
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_PLAIN_SASL_JAAS_CONFIG", jaasConfig)
+        ) {
+            kafka.start();
+
+            AdminClient adminClient = AdminClient.create(
                 ImmutableMap.of(
-                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
-                    bootstrapServers,
-                    ProducerConfig.CLIENT_ID_CONFIG,
-                    UUID.randomUUID().toString()
-                ),
+                    AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    kafka.getBootstrapServers(),
+                    AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
+                    "SASL_PLAINTEXT",
+                    SaslConfigs.SASL_MECHANISM,
+                    "PLAIN",
+                    SaslConfigs.SASL_JAAS_CONFIG,
+                    "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"test\" password=\"secretx\";"
+                )
+            );
+
+            String topicName = "messages-" + UUID.randomUUID();
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, 1, (short) 1));
+
+            Awaitility
+                .await()
+                .untilAsserted(() -> {
+                    assertThatThrownBy(() -> adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS))
+                        .hasCauseInstanceOf(SaslAuthenticationException.class);
+                });
+        }
+    }
+
+    private static String getJaasConfig() {
+        String jaasConfig =
+            "org.apache.kafka.common.security.plain.PlainLoginModule required " +
+            "username=\"admin\" " +
+            "password=\"admin\" " +
+            "user_admin=\"admin\" " +
+            "user_test=\"secret\";";
+        return jaasConfig;
+    }
+
+    private void testKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, false, 1, 1);
+    }
+
+    private void testSecureKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, true, 1, 1);
+    }
+
+    private void testKafkaFunctionality(String bootstrapServers, boolean authenticated, int partitions, int rf)
+        throws Exception {
+        ImmutableMap<String, String> adminClientDefaultProperties = ImmutableMap.of(
+            AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
+            bootstrapServers
+        );
+        Properties adminClientProperties = new Properties();
+        adminClientProperties.putAll(adminClientDefaultProperties);
+
+        ImmutableMap<String, String> consumerDefaultProperties = ImmutableMap.of(
+            ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+            bootstrapServers,
+            ConsumerConfig.GROUP_ID_CONFIG,
+            "tc-" + UUID.randomUUID(),
+            ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+            "earliest"
+        );
+        Properties consumerProperties = new Properties();
+        consumerProperties.putAll(consumerDefaultProperties);
+
+        ImmutableMap<String, String> producerDefaultProperties = ImmutableMap.of(
+            ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+            bootstrapServers,
+            ProducerConfig.CLIENT_ID_CONFIG,
+            UUID.randomUUID().toString()
+        );
+        Properties producerProperties = new Properties();
+        producerProperties.putAll(producerDefaultProperties);
+
+        if (authenticated) {
+            adminClientProperties.putAll(this.properties);
+            consumerProperties.putAll(this.properties);
+            producerProperties.putAll(this.properties);
+        }
+        try (
+            AdminClient adminClient = AdminClient.create(adminClientProperties);
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                producerProperties,
                 new StringSerializer(),
                 new StringSerializer()
             );
             KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
-                ImmutableMap.of(
-                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
-                    bootstrapServers,
-                    ConsumerConfig.GROUP_ID_CONFIG,
-                    "tc-" + UUID.randomUUID(),
-                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
-                    "earliest"
-                ),
+                consumerProperties,
                 new StringDeserializer(),
                 new StringDeserializer()
             );

From 903aab0904f561cf2e889533999885ff501e3d54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:24:07 +0000
Subject: [PATCH 3335/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit5) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 25243bc3011..476e217ba67 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.0'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.1'
 
     testCompileOnly 'org.jetbrains:annotations:24.0.1'
 }

From a31f3cf8ac8c9a1bfd9e66c78e8cdd80554803fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:33:52 +0000
Subject: [PATCH 3336/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 1b8397dc1fa..e087a8301a0 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.0"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.24.2'

From a8fd2fff2c128094ef4e661db571fbff9f37eb07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:33:59 +0000
Subject: [PATCH 3337/4969] Bump org.junit.jupiter:junit-jupiter from 5.10.0 to
 5.10.1 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle           | 2 +-
 examples/immudb/build.gradle              | 2 +-
 examples/kafka-cluster/build.gradle       | 2 +-
 examples/nats/build.gradle                | 2 +-
 examples/neo4j-container/build.gradle     | 2 +-
 examples/redis-backed-cache/build.gradle  | 2 +-
 examples/selenium-container/build.gradle  | 2 +-
 examples/sftp/build.gradle                | 2 +-
 examples/singleton-container/build.gradle | 2 +-
 examples/solr-container/build.gradle      | 2 +-
 examples/spring-boot/build.gradle         | 2 +-
 examples/zookeeper/build.gradle           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 4929c612bb5..7424883a798 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'com.hazelcast:hazelcast:5.3.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index a91e2b44102..b63f78ed8e8 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 7050040e2a9..660926dec29 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 865b222631e..3543fdb20bf 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'io.nats:jnats:2.17.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 760a8b44e89..0ed6609c203 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.12'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 3a20a79fb33..1b87e2bee6d 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 0fc50e1fadc..a1255d7e6d4 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 0ea936cec88..febedf2ec14 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 7bafe279f32..9ddfafad149 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 95e3d4cf602..cf95e2be051 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index dad172a8000..f1c8d4097fa 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 5e5dfb7582e..cf37650fee6 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
 test {

From 756e16ee4595456754efa7b287106cd1cf87e8c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:41:12 +0000
Subject: [PATCH 3338/4969] Bump org.junit:junit-bom from 5.10.0 to 5.10.1 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ac7d6863dd0..e2bdc856dea 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.10.0')
+    implementation platform('org.junit:junit-bom:5.10.1')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')

From 91de2b5042ca867e90a226ff81e5a83bf784f7e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:46:28 +0000
Subject: [PATCH 3339/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c3e511f4d99..cc211424e3d 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.21.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")

From 4591a4d779f1029e2db53120dbb7d9387fcf941a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:46:32 +0000
Subject: [PATCH 3340/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c3e511f4d99..ad0a8df1fb0 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 }
 
 test {

From dd24851117b00cb159fdc5593a37008d7d9ab67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 6 Nov 2023 19:35:52 -0600
Subject: [PATCH 3341/4969] Restore configureKraft and configureZookeeper
 (#7776)

In order to avoid breaking changes, those methods have been restored.
---
 modules/kafka/build.gradle                    |  7 ---
 .../containers/KafkaContainer.java            | 45 ++++++++++++-------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index bfc6203af53..d536dbfd526 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -7,10 +7,3 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.containers.KafkaContainer#configureKraft()",
-        "org.testcontainers.containers.KafkaContainer#configureZookeeper()"
-    ]
-}
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index bb69540082a..d76154505c2 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -7,11 +7,13 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * Testcontainers implementation for Apache Kafka.
@@ -85,7 +87,7 @@ public KafkaContainer withEmbeddedZookeeper() {
         if (this.kraftEnabled) {
             throw new IllegalStateException("Cannot configure Zookeeper when using Kraft mode");
         }
-        getContainerDef().withEmbeddedZookeeper();
+        this.externalZookeeperConnect = null;
         return self();
     }
 
@@ -94,7 +96,6 @@ public KafkaContainer withExternalZookeeper(String connectString) {
             throw new IllegalStateException("Cannot configure Zookeeper when using Kraft mode");
         }
         this.externalZookeeperConnect = connectString;
-        getContainerDef().withZookeeper(connectString);
         return self();
     }
 
@@ -104,7 +105,6 @@ public KafkaContainer withKraft() {
         }
         verifyMinKraftVersion();
         this.kraftEnabled = true;
-        getContainerDef().withRaft();
         return self();
     }
 
@@ -140,8 +140,22 @@ public String getBootstrapServers() {
     protected void configure() {
         getContainerDef().resolveListeners();
 
-        if (!this.kraftEnabled && this.externalZookeeperConnect == null) {
+        if (this.kraftEnabled) {
+            configureKraft();
+        } else {
+            configureZookeeper();
+        }
+    }
+
+    protected void configureKraft() {
+        getContainerDef().withRaft();
+    }
+
+    protected void configureZookeeper() {
+        if (this.externalZookeeperConnect == null) {
             getContainerDef().withEmbeddedZookeeper();
+        } else {
+            getContainerDef().withZookeeper(this.externalZookeeperConnect);
         }
     }
 
@@ -261,8 +275,12 @@ private static class KafkaContainerDef extends ContainerDef {
         }
 
         private void resolveListeners() {
-            Set<String> additionalKafkaListeners = new HashSet<>();
-            Set<String> additionalListenerSecurityProtocolMap = new HashSet<>();
+            Set<String> listeners = Arrays
+                .stream(this.envVars.get("KAFKA_LISTENERS").split(","))
+                .collect(Collectors.toSet());
+            Set<String> listenerSecurityProtocolMap = Arrays
+                .stream(this.envVars.get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP").split(","))
+                .collect(Collectors.toSet());
 
             List<Supplier<String>> listenersToTransform = new ArrayList<>(this.listeners);
             for (int i = 0; i < listenersToTransform.size(); i++) {
@@ -272,21 +290,18 @@ private void resolveListeners() {
                 String listenerPort = listener.split(":")[1];
                 String listenerProtocol = String.format("%s://0.0.0.0:%s", protocol, listenerPort);
                 String protocolMap = String.format("%s:PLAINTEXT", protocol);
-                additionalKafkaListeners.add(listenerProtocol);
-                additionalListenerSecurityProtocolMap.add(protocolMap);
+                listeners.add(listenerProtocol);
+                listenerSecurityProtocolMap.add(protocolMap);
 
                 String host = listener.split(":")[0];
                 addNetworkAlias(host);
             }
 
-            String kafkaListeners = String.join(",", additionalKafkaListeners);
-            String kafkaListenerSecurityProtocolMap = String.join(",", additionalListenerSecurityProtocolMap);
+            String kafkaListeners = String.join(",", listeners);
+            String kafkaListenerSecurityProtocolMap = String.join(",", listenerSecurityProtocolMap);
 
-            this.envVars.computeIfPresent("KAFKA_LISTENERS", (k, v) -> String.join(",", v, kafkaListeners));
-            this.envVars.computeIfPresent(
-                    "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
-                    (k, v) -> String.join(",", v, kafkaListenerSecurityProtocolMap)
-                );
+            this.envVars.put("KAFKA_LISTENERS", kafkaListeners);
+            this.envVars.put("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", kafkaListenerSecurityProtocolMap);
         }
 
         void withListener(Supplier<String> listenerSupplier) {

From 3b7c2ebca73988b484a0bcdb339e7f04df016a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 7 Nov 2023 20:13:55 -0600
Subject: [PATCH 3342/4969] Support Elastisearch image from DockerHub (#7777)

---
 .../elasticsearch/ElasticsearchContainer.java |  6 +++--
 .../ElasticsearchContainerTest.java           | 23 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 315b920f490..d93a144075f 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -25,7 +25,7 @@
 /**
  * Testcontainers implementation for Elasticsearch.
  * <p>
- * Supported image: {@code docker.elastic.co/elasticsearch/elasticsearch}
+ * Supported image: {@code docker.elastic.co/elasticsearch/elasticsearch}, {@code elasticsearch}
  * <p>
  * Exposed ports:
  * <ul>
@@ -64,6 +64,8 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
         "docker.elastic.co/elasticsearch/elasticsearch-oss"
     );
 
+    private static final DockerImageName ELASTICSEARCH_IMAGE_NAME = DockerImageName.parse("elasticsearch");
+
     /**
      * Elasticsearch Default version
      */
@@ -100,7 +102,7 @@ public ElasticsearchContainer(String dockerImageName) {
      */
     public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME, ELASTICSEARCH_IMAGE_NAME);
         this.isOss = dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME);
 
         withNetworkAliases("elasticsearch-" + Base58.randomString(6));
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 7ee81c82759..707b3fde269 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -304,9 +304,16 @@ public void testElasticsearch8SecureByDefault() throws Exception {
             // Start the container. This step might take some time...
             container.start();
 
-            Response response = getClusterHealth(container);
-            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
+            assertClusterHealthResponse(container);
+        }
+    }
+
+    @Test
+    public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
+        try (ElasticsearchContainer container = new ElasticsearchContainer("elasticsearch:8.1.2")) {
+            container.start();
+
+            assertClusterHealthResponse(container);
         }
     }
 
@@ -351,9 +358,7 @@ public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception
             // Start the container. This step might take some time...
             container.start();
 
-            Response response = getClusterHealth(container);
-            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
+            assertClusterHealthResponse(container);
         }
     }
 
@@ -488,4 +493,10 @@ private void assertElasticsearchContainerHasHeapSize(ElasticsearchContainer cont
         assertThat(responseBody).contains("\"heap_init_in_bytes\":" + heapSizeInBytes);
         assertThat(responseBody).contains("\"heap_max_in_bytes\":" + heapSizeInBytes);
     }
+
+    private void assertClusterHealthResponse(ElasticsearchContainer container) throws IOException {
+        Response response = getClusterHealth(container);
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+        assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
+    }
 }

From 350fa7a748be14b392d0fc9f72899b2e1c9b4d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 13 Nov 2023 14:56:07 -0600
Subject: [PATCH 3343/4969] Enable HTTP and HTTPS on native for
 HttpWaitStrategy (#7790)

---
 .../org.testcontainers/testcontainers/native-image.properties    | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 core/src/main/resources/META-INF/native-image/org.testcontainers/testcontainers/native-image.properties

diff --git a/core/src/main/resources/META-INF/native-image/org.testcontainers/testcontainers/native-image.properties b/core/src/main/resources/META-INF/native-image/org.testcontainers/testcontainers/native-image.properties
new file mode 100644
index 00000000000..c53eebbb546
--- /dev/null
+++ b/core/src/main/resources/META-INF/native-image/org.testcontainers/testcontainers/native-image.properties
@@ -0,0 +1 @@
+Args = --enable-http --enable-https

From bf084975bc498e3298c6843f38bbb816122c3c5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:10:10 +0000
Subject: [PATCH 3344/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.11.0 to 4.11.1.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.11.0...r4.11.1)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index eb7d71397ff..b085cdbc72d 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.11.0")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.11.1")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From 4f658a006dcfdb58dcaf711cadd9db817faadd28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:13:33 +0000
Subject: [PATCH 3345/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.21.0 to 4.22.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.21.0...4.22.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c3e511f4d99..5f1233d888b 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.21.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.22.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")

From 98e3f016455e7e6cc379d72cd801c6fd652e83e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:18:00 +0000
Subject: [PATCH 3346/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.572 to 1.12.587.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.572...1.12.587)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 45b13593cee..561f1c02400 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.572'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.572'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.587'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.587'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 868abd9001f36515a7728a7051fe3a9f4bcb4421 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:25:06 +0000
Subject: [PATCH 3347/4969] Bump com.oracle.database.r2dbc:oracle-r2dbc in
 /modules/oracle-free

Bumps [com.oracle.database.r2dbc:oracle-r2dbc](https://github.com/oracle/oracle-r2dbc) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/oracle/oracle-r2dbc/releases)
- [Commits](https://github.com/oracle/oracle-r2dbc/compare/1.1.1...1.2.0)

---
updated-dependencies:
- dependency-name: com.oracle.database.r2dbc:oracle-r2dbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index cf572558307..642458ebfb9 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
+    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
@@ -15,7 +15,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
+    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 }
 
 test {

From 0f34de265674758942b8ebd02baf9752fe01c77b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:34:56 +0000
Subject: [PATCH 3348/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.2.0 to 3.3.0.
- [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/3.2.0...3.3.0)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6b36b854b3a..5a6ce09191b 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.2.0'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.3.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 8b77e6642041baf801c2650f93a22ac123d85b7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:41:09 +0000
Subject: [PATCH 3349/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.25.0 to 26.27.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.25.0...v26.27.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9591a4396c0..5dce95ea96b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.25.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.27.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 80f36b87d4809772155b2f5e2cba87473bc11658 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:46:50 +0000
Subject: [PATCH 3350/4969] Bump io.minio:minio from 8.5.6 to 8.5.7 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.5.6 to 8.5.7.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.5.6...8.5.7)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 6fc1d943cc8..427fd4b32e6 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.5.6")
+    testImplementation("io.minio:minio:8.5.7")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From d7a2b3078677090c4b20d457acbc05e2941ae21f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:50:49 +0000
Subject: [PATCH 3351/4969] Bump org.questdb:questdb from 7.3.3 to 7.3.4 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.3.3 to 7.3.4.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.3.3...7.3.4)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 0fdc23da796..58712f3975b 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.3.3'
+    testImplementation 'org.questdb:questdb:7.3.4'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 9350910e3030f9dc06963d5a0c7d75005abf8f29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:53:18 +0000
Subject: [PATCH 3352/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.21.5 to 2.21.22.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 f7b2ad7f805..04f41b31e19 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.21.5'
+    testImplementation 'software.amazon.awssdk:s3:2.21.22'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 4793b0549e4247a8038976894512b7d136cfe3ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:54:32 +0000
Subject: [PATCH 3353/4969] Bump com.oracle.database.r2dbc:oracle-r2dbc in
 /modules/oracle-xe

Bumps [com.oracle.database.r2dbc:oracle-r2dbc](https://github.com/oracle/oracle-r2dbc) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/oracle/oracle-r2dbc/releases)
- [Commits](https://github.com/oracle/oracle-r2dbc/compare/1.1.1...1.2.0)

---
updated-dependencies:
- dependency-name: com.oracle.database.r2dbc:oracle-r2dbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 4bcf8adbfed..bb730191450 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
+    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
@@ -15,7 +15,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
+    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 }
 
 test {

From d24e9dbfcefd468ad803d743af07fab2d7c8efd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:55:51 +0000
Subject: [PATCH 3354/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.10.4 to 8.11.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.10.4...v8.11.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index deffeb9f986..b233fc850c1 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.10.4"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.1"
     testImplementation "org.elasticsearch.client:transport:7.17.14"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 45730840bcec4a046b625d2c5cb46cd3c3525567 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:57:12 +0000
Subject: [PATCH 3355/4969] Bump io.trino:trino-jdbc from 430 to 433 in
 /modules/trino

Bumps io.trino:trino-jdbc from 430 to 433.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index de9f59e89ea..96cce8b1ddd 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:430'
+    testRuntimeOnly 'io.trino:trino-jdbc:433'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 2a6d5a839f90dd5c11b383fd60a70d67443ada62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Nov 2023 08:27:05 -0600
Subject: [PATCH 3356/4969] Fix Oracle Free docs (#7806)

---
 mkdocs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkdocs.yml b/mkdocs.yml
index e6dd8dbb412..d3ead0ffa11 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -64,6 +64,7 @@ nav:
                 - modules/databases/mssqlserver.md
                 - modules/databases/mysql.md
                 - modules/databases/neo4j.md
+                - modules/databases/oraclefree.md
                 - modules/databases/oraclexe.md
                 - modules/databases/orientdb.md
                 - modules/databases/postgres.md

From ec5290cfb347adeeb4e563024b0d4410eff0a689 Mon Sep 17 00:00:00 2001
From: HarshDaryani896 <82017686+HarshDaryani896@users.noreply.github.com>
Date: Tue, 14 Nov 2023 23:50:06 +0530
Subject: [PATCH 3357/4969] [yugabytedb] Change SQL wait strategy (#7784)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/YugabyteDBYSQLContainer.java      |  5 +++++
 .../delegate/YugabyteDBYCQLDelegate.java         | 11 +++++++++++
 .../strategy/YugabyteDBYCQLWaitStrategy.java     | 11 +++++++++++
 .../strategy/YugabyteDBYSQLWaitStrategy.java     | 15 ++++++++++-----
 .../junit/yugabytedb/YugabyteDBYCQLTest.java     | 12 ++++++++++++
 .../junit/yugabytedb/YugabyteDBYSQLTest.java     | 16 ++++++++++++++++
 6 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
index c988d842bd1..e3b39e780f0 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
@@ -154,4 +154,9 @@ public YugabyteDBYSQLContainer withPassword(final String password) {
         this.password = password;
         return this;
     }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
 }
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
index cadb83f66e0..68998538fd4 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/delegate/YugabyteDBYCQLDelegate.java
@@ -33,9 +33,20 @@ public void execute(
         boolean continueOnError,
         boolean ignoreFailedDrops
     ) {
+        final String containerInterfaceIP = container
+            .getContainerInfo()
+            .getNetworkSettings()
+            .getNetworks()
+            .entrySet()
+            .stream()
+            .findFirst()
+            .get()
+            .getValue()
+            .getIpAddress();
         try {
             ExecResult result = container.execInContainer(
                 BIN_PATH,
+                containerInterfaceIP,
                 "-u",
                 container.getUsername(),
                 "-p",
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
index 89d93a5cb84..9b9d24a4c71 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYCQLWaitStrategy.java
@@ -37,6 +37,16 @@ public final class YugabyteDBYCQLWaitStrategy extends AbstractWaitStrategy {
     public void waitUntilReady(WaitStrategyTarget target) {
         YugabyteDBYCQLContainer container = (YugabyteDBYCQLContainer) target;
         AtomicBoolean status = new AtomicBoolean(true);
+        final String containerInterfaceIP = container
+            .getContainerInfo()
+            .getNetworkSettings()
+            .getNetworks()
+            .entrySet()
+            .stream()
+            .findFirst()
+            .get()
+            .getValue()
+            .getIpAddress();
         retryUntilSuccess(
             (int) startupTimeout.getSeconds(),
             TimeUnit.SECONDS,
@@ -46,6 +56,7 @@ public void waitUntilReady(WaitStrategyTarget target) {
                         try {
                             ExecResult result = container.execInContainer(
                                 BIN_PATH,
+                                containerInterfaceIP,
                                 "-u",
                                 container.getUsername(),
                                 "-p",
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
index 690f8a97bc9..4cb5349dc5b 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/strategy/YugabyteDBYSQLWaitStrategy.java
@@ -8,6 +8,7 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.concurrent.TimeUnit;
 
 import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;
@@ -27,10 +28,13 @@
 @Slf4j
 public final class YugabyteDBYSQLWaitStrategy extends AbstractWaitStrategy {
 
-    private static final String YSQL_TEST_QUERY = "SELECT 1";
-
     private final WaitStrategyTarget target;
 
+    private static final String YSQL_EXTENDED_PROBE =
+        "CREATE TABLE IF NOT EXISTS YB_SAMPLE(k int, v int, primary key(k, v))";
+
+    private static final String YSQL_EXTENDED_PROBE_DROP_TABLE = "DROP TABLE IF EXISTS YB_SAMPLE";
+
     @Override
     public void waitUntilReady(WaitStrategyTarget target) {
         YugabyteDBYSQLContainer container = (YugabyteDBYSQLContainer) target;
@@ -40,10 +44,11 @@ public void waitUntilReady(WaitStrategyTarget target) {
             () -> {
                 getRateLimiter()
                     .doWhenReady(() -> {
-                        try (Connection con = container.createConnection(container.getJdbcUrl())) {
-                            con.createStatement().execute(YSQL_TEST_QUERY);
+                        try (Connection con = container.createConnection(""); Statement stmt = con.createStatement()) {
+                            stmt.execute(YSQL_EXTENDED_PROBE);
+                            stmt.execute(YSQL_EXTENDED_PROBE_DROP_TABLE);
                         } catch (SQLException ex) {
-                            log.error("Error connecting to the database", ex);
+                            throw new RuntimeException(ex);
                         }
                     });
                 return true;
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
index 5026048ab85..62b299edea8 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
@@ -15,6 +15,8 @@ public class YugabyteDBYCQLTest {
 
     private static final String IMAGE_NAME = "yugabytedb/yugabyte:2.14.4.0-b26";
 
+    private static final String IMAGE_NAME_2_18 = "yugabytedb/yugabyte:2.18.3.0-b75";
+
     private static final DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);
 
     @Test
@@ -106,6 +108,16 @@ public void testInitScript() {
         }
     }
 
+    @Test
+    public void shouldStartWhenContainerIpIsUsedInWaitStrategy() {
+        try (final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(IMAGE_NAME_2_18)) {
+            ycqlContainer.start();
+            boolean isQueryExecuted = performQuery(ycqlContainer, "SELECT release_version FROM system.local")
+                .wasApplied();
+            assertThat(isQueryExecuted).isTrue();
+        }
+    }
+
     private ResultSet performQuery(YugabyteDBYCQLContainer ycqlContainer, String cql) {
         try (
             CqlSession session = CqlSession
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
index 2cf0b0b15c1..94cfaa7f2e4 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
@@ -95,4 +95,20 @@ public void testWithCustomRole() throws SQLException {
                 .isEqualTo(1);
         }
     }
+
+    @Test
+    public void testWaitStrategy() throws SQLException {
+        try (final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)) {
+            ysqlContainer.start();
+            assertThat(performQuery(ysqlContainer, "SELECT 1").getInt(1))
+                .as("A sample test query succeeds")
+                .isEqualTo(1);
+            boolean tableExists = performQuery(
+                ysqlContainer,
+                "SELECT EXISTS (SELECT FROM pg_tables WHERE tablename = 'YB_SAMPLE')"
+            )
+                .getBoolean(1);
+            assertThat(tableExists).as("yb_sample table does not exists").isFalse();
+        }
+    }
 }

From fb4eb91e6020be78786679ee918e1a1edf1c71cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 19:49:33 +0000
Subject: [PATCH 3358/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.14.1 to 4.15.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.15.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index ef5c0b1e01c..d2a85fc16d1 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.14.1"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.15.0"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From 103629b0307d0bdbb5405d1dee7695dc2cc98c48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 19:49:33 +0000
Subject: [PATCH 3359/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/spock

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 476e217ba67..d833e8cacf6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.1'
 
     testCompileOnly 'org.jetbrains:annotations:24.0.1'

From 6996cc41f6f5d62f64ff301e1fa08cbc6aa4ac08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 19:49:45 +0000
Subject: [PATCH 3360/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index e087a8301a0..f860edeaba7 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.6.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.0"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From 20be62b17f15600533df66559561cf0009661afb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 19:49:53 +0000
Subject: [PATCH 3361/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.14 to 7.17.15.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.14...v7.17.15)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index b233fc850c1..d1cab47c0b6 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.1"
-    testImplementation "org.elasticsearch.client:transport:7.17.14"
+    testImplementation "org.elasticsearch.client:transport:7.17.15"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From bf6bd4558f4db43d3f01f9192f8ba2b72ea41d0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 19:50:06 +0000
Subject: [PATCH 3362/4969] Bump com.hazelcast:hazelcast from 5.3.4 to 5.3.6 in
 /examples

Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.3.4 to 5.3.6.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/commits/v5.3.6)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 7424883a798..53f318aa79b 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.hazelcast:hazelcast:5.3.4'
+    testImplementation 'com.hazelcast:hazelcast:5.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

From 1556cfed22681fd4d8b8fda0dff4c570db34b880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Nov 2023 14:59:51 -0600
Subject: [PATCH 3363/4969] Include native-image in META-INF (#7808)

---
 .../java/org/testcontainers/JarFileShadingTest.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index a20eca729a7..6477e4b7625 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -20,7 +20,8 @@ public void testPackages() throws Exception {
 
     @Test
     public void testMetaInf() throws Exception {
-        assertThatFileList(root.resolve("META-INF")).containsOnly("MANIFEST.MF", "services", "versions");
+        assertThatFileList(root.resolve("META-INF"))
+            .containsOnly("MANIFEST.MF", "services", "versions", "native-image");
     }
 
     @Test

From f46627580a4267f7980f0430b41cb567ba4773d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 21:06:51 +0000
Subject: [PATCH 3364/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index f860edeaba7..03b009a7028 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.2.6.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
     testImplementation project(":testcontainers")

From 6d330559933ee409db940ed11844d1b766360f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Nov 2023 18:06:35 -0600
Subject: [PATCH 3365/4969] Keep exposed ports order in ContainerDef (#7811)

Order is lost and break modules with multiple ports defined.
---
 .../org/testcontainers/containers/ContainerDef.java   |  4 ++--
 .../testcontainers/containers/GenericContainer.java   | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerDef.java b/core/src/main/java/org/testcontainers/containers/ContainerDef.java
index df058945aef..5dd3abb37bd 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerDef.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerDef.java
@@ -32,7 +32,7 @@ class ContainerDef {
     @Getter
     private RemoteDockerImage image;
 
-    Set<ExposedPort> exposedPorts = new HashSet<>();
+    Set<ExposedPort> exposedPorts = new LinkedHashSet<>();
 
     Set<PortBinding> portBindings = new HashSet<>();
 
@@ -150,7 +150,7 @@ protected void setImage(DockerImageName image) {
     }
 
     public Set<ExposedPort> getExposedPorts() {
-        return new HashSet<>(this.exposedPorts);
+        return new LinkedHashSet<>(this.exposedPorts);
     }
 
     protected void setExposedPorts(Set<ExposedPort> exposedPorts) {
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index fdd36dd9f68..929ff41a9b4 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -272,12 +272,19 @@ public void setImage(Future<String> image) {
 
     @Override
     public List<Integer> getExposedPorts() {
-        return this.containerDef.getExposedPorts().stream().map(ExposedPort::getPort).collect(Collectors.toList());
+        List<Integer> exposedPorts = new ArrayList<>();
+        for (ExposedPort exposedPort : this.containerDef.getExposedPorts()) {
+            exposedPorts.add(exposedPort.getPort());
+        }
+        return exposedPorts;
     }
 
     @Override
     public void setExposedPorts(List<Integer> exposedPorts) {
-        this.containerDef.setExposedPorts(exposedPorts.stream().map(ExposedPort::tcp).collect(Collectors.toSet()));
+        this.containerDef.exposedPorts.clear();
+        for (Integer exposedPort : exposedPorts) {
+            this.containerDef.addExposedTcpPort(exposedPort);
+        }
     }
 
     /**

From ca036ae216144623d1f95885d75b0e7c5c115b9c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 20:58:00 -0600
Subject: [PATCH 3366/4969] [create-pull-request] automated change (#7812)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index d3ead0ffa11..90048c969d8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -123,4 +123,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.1
+    latest_version: 1.19.2

From d80ce6043fa4c4220532567490433d7824a2e77b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 20:58:18 -0600
Subject: [PATCH 3367/4969] [create-pull-request] automated change (#7813)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6671acffc73..2d17bfdd66e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.19.1
+testcontainers.version=1.19.2

From b59888a54117aef42f6ac2a9d375321e204177ff Mon Sep 17 00:00:00 2001
From: Ivan Ponomarev <iponomarev@mail.ru>
Date: Fri, 17 Nov 2023 22:57:44 +0000
Subject: [PATCH 3368/4969] Fix bugs in SQL`ScriptScanner` with big String
 literals and PostgreSQL identifiers (as introduced by #7646) (#7818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../org/testcontainers/ext/ScriptScanner.java | 31 ++++++++---
 .../testcontainers/ext/ScriptScannerTest.java | 54 +++++++++++++++++++
 2 files changed, 78 insertions(+), 7 deletions(-)
 create mode 100644 modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
index 528acd139c7..686527e9364 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
@@ -28,11 +28,7 @@ class ScriptScanner {
 
     private final Pattern whitespace = Pattern.compile("\\s+");
 
-    private final Pattern identifier = Pattern.compile("[a-z][a-z0-9_]*", Pattern.CASE_INSENSITIVE);
-
-    private final Pattern singleQuotedString = Pattern.compile("'(\\\\'|[^'])*'");
-
-    private final Pattern ansiQuotedString = Pattern.compile("\"(\\\\\"|[^\"])*\"");
+    private final Pattern identifier = Pattern.compile("[a-z][a-z0-9_$]*", Pattern.CASE_INSENSITIVE);
 
     private final Pattern dollarQuotedStringDelimiter = Pattern.compile("\\$\\w*\\$");
 
@@ -54,7 +50,8 @@ private boolean matches(String substring) {
 
     private boolean matches(Pattern regexp) {
         Matcher m = regexp.matcher(script);
-        if (m.find(offset) && m.start() == offset) {
+        m.region(offset, script.length());
+        if (m.lookingAt()) {
             currentMatch = m.group();
             offset = m.end();
             return true;
@@ -99,6 +96,26 @@ private boolean matchesMultilineComment() {
         return false;
     }
 
+    private boolean matchesQuotedString(final char quote) {
+        if (script.charAt(offset) == quote) {
+            boolean escaped = false;
+            for (int i = offset + 1; i < script.length(); i++) {
+                char c = script.charAt(i);
+                if (escaped) {
+                    //just skip the escaped character and drop the flag
+                    escaped = false;
+                } else if (c == '\\') {
+                    escaped = true;
+                } else if (c == quote) {
+                    currentMatch = script.substring(offset, i + 1);
+                    offset = i + 1;
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private boolean matchesDollarQuotedString() {
         //Matches $<tag>$ .... $<tag>$
         if (matches(dollarQuotedStringDelimiter)) {
@@ -124,7 +141,7 @@ Lexem next() {
                 return Lexem.SEPARATOR;
             } else if (matchesSingleLineComment() || matchesMultilineComment()) {
                 return Lexem.COMMENT;
-            } else if (matches(singleQuotedString) || matches(ansiQuotedString) || matchesDollarQuotedString()) {
+            } else if (matchesQuotedString('\'') || matchesQuotedString('"') || matchesDollarQuotedString()) {
                 return Lexem.QUOTED_STRING;
             } else if (matches(identifier)) {
                 return Lexem.IDENTIFIER;
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java
new file mode 100644
index 00000000000..7e24026c4ec
--- /dev/null
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java
@@ -0,0 +1,54 @@
+package org.testcontainers.ext;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import java.util.regex.Pattern;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ScriptScannerTest {
+
+    @Test
+    public void testHugeStringLiteral() {
+        String script = "/* a comment */    \"" + StringUtils.repeat('~', 10000) + "\";";
+        ScriptScanner scanner = scanner(script);
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.COMMENT);
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.WHITESPACE);
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.QUOTED_STRING);
+        assertThat(scanner.getCurrentMatch()).matches(Pattern.compile("\"~+\""));
+    }
+
+    @Test
+    public void testPgIdentifierWithDollarSigns() {
+        ScriptScanner scanner = scanner(
+            "this$is$a$valid$postgreSQL$identifier  " +
+            "$a$While this is a quoted string$a$$ --just followed by a dollar sign"
+        );
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.IDENTIFIER);
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.WHITESPACE);
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.QUOTED_STRING);
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.OTHER);
+    }
+
+    @Test
+    public void testQuotedLiterals() {
+        ScriptScanner scanner = scanner("'this \\'is a literal' \"this \\\" is a literal\"");
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.QUOTED_STRING);
+        assertThat(scanner.getCurrentMatch()).isEqualTo("'this \\'is a literal'");
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.WHITESPACE);
+        assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.QUOTED_STRING);
+        assertThat(scanner.getCurrentMatch()).isEqualTo("\"this \\\" is a literal\"");
+    }
+
+    private static ScriptScanner scanner(String script) {
+        return new ScriptScanner(
+            "dummy",
+            script,
+            ScriptUtils.DEFAULT_STATEMENT_SEPARATOR,
+            ScriptUtils.DEFAULT_COMMENT_PREFIX,
+            ScriptUtils.DEFAULT_BLOCK_COMMENT_START_DELIMITER,
+            ScriptUtils.DEFAULT_BLOCK_COMMENT_END_DELIMITER
+        );
+    }
+}

From f1f79dc4281f906d7b508b45a79dac28585778d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 17 Nov 2023 18:46:56 -0600
Subject: [PATCH 3369/4969] Fix regression using GenericContainer#setImage
 (#7820)

1dba8d1 introduced a breaking change. `GenericContainer#getImage`
returns the value of `ContainerDef#getImage` instead of `RemoteImageName`
because this is not set anymore when using `GenericContainer#setImage`.

Fixes #7819
---
 .../org/testcontainers/containers/GenericContainer.java  | 1 +
 .../testcontainers/containers/GenericContainerTest.java  | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 929ff41a9b4..4cae19864ea 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -267,6 +267,7 @@ public GenericContainer(@NonNull final Future<String> image) {
     }
 
     public void setImage(Future<String> image) {
+        this.image = new RemoteDockerImage(image);
         this.containerDef.setImage(new RemoteDockerImage(image));
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index fb0b216bce2..901f8a1eac1 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -20,6 +20,7 @@
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.MountableFile;
@@ -222,6 +223,14 @@ public void testArchitectureCheck() {
         }
     }
 
+    @Test
+    public void shouldReturnTheProvidedImage() {
+        GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE);
+        assertThat(container.getImage().get()).isEqualTo("redis:3.0.2");
+        container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE));
+        assertThat(container.getImage().get()).isEqualTo("alpine:3.16");
+    }
+
     static class NoopStartupCheckStrategy extends StartupCheckStrategy {
 
         @Override

From 696481e3dd345b9cc313dcc36c3553ab18562cd7 Mon Sep 17 00:00:00 2001
From: HarshDaryani896 <82017686+HarshDaryani896@users.noreply.github.com>
Date: Mon, 20 Nov 2023 20:30:22 +0530
Subject: [PATCH 3370/4969] Update Yugabyte CQL driver to 4.15.0-yb-1 (#7822)

---
 modules/yugabytedb/build.gradle                    |  2 +-
 .../junit/yugabytedb/YugabyteDBYCQLTest.java       | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index 2f04334ecb2..01c8b8d1928 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
     testImplementation project(':jdbc-test')
     // YCQL driver
-    testImplementation 'com.yugabyte:java-driver-core:4.6.0-yb-12'
+    testImplementation 'com.yugabyte:java-driver-core:4.15.0-yb-1'
     // YSQL driver
     testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-3'
 }
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
index 62b299edea8..fe4723b409f 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
@@ -26,6 +26,8 @@ public void testSmoke() {
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(
                 "yugabytedb/yugabyte:2.14.4.0-b26"
             )
+                .withUsername("cassandra")
+                .withPassword("cassandra")
             // }
         ) {
             // startingYCQLContainer {
@@ -43,6 +45,8 @@ public void testCustomKeyspace() {
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
                 .withKeyspaceName(key)
+                .withUsername("cassandra")
+                .withPassword("cassandra")
         ) {
             ycqlContainer.start();
             assertThat(
@@ -81,8 +85,8 @@ public void testAuthenticationEnabled() {
     public void testAuthenticationDisabled() {
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
-                .withPassword("")
-                .withUsername("")
+                .withPassword("cassandra")
+                .withUsername("cassandra")
         ) {
             ycqlContainer.start();
             assertThat(performQuery(ycqlContainer, "SELECT release_version FROM system.local").wasApplied())
@@ -110,7 +114,11 @@ public void testInitScript() {
 
     @Test
     public void shouldStartWhenContainerIpIsUsedInWaitStrategy() {
-        try (final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(IMAGE_NAME_2_18)) {
+        try (
+            final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(IMAGE_NAME_2_18)
+                .withUsername("cassandra")
+                .withPassword("cassandra")
+        ) {
             ycqlContainer.start();
             boolean isQueryExecuted = performQuery(ycqlContainer, "SELECT release_version FROM system.local")
                 .wasApplied();

From fb455f984b8a3bf51cde640bb0b2495542b83940 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:11:46 +0000
Subject: [PATCH 3371/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.4.2.jre8 to 12.5.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 700360c3e30..6f67d160245 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.2.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.5.0.jre8-preview'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From ae93557f355a04ce9784a0ff83666072405261f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:14:40 +0000
Subject: [PATCH 3372/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/cratedb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 80ad7beaed6..1dcab7e5052 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 982ca9dace8e106b25936831225352cfa470535f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:15:39 +0000
Subject: [PATCH 3373/4969] Bump org.jetbrains:annotations in
 /modules/oracle-xe

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index bb730191450..3cef70efc4c 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'

From 9366bc8b1bc1db0c403a67a9309c257e5f5da835 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:17:19 +0000
Subject: [PATCH 3374/4969] Bump org.jetbrains:annotations in
 /modules/postgresql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c49ea84ed9f..6256a596809 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 97da0d222b5b2d565bf03de2c03dfe400cf0819b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:20:38 +0000
Subject: [PATCH 3375/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/mysql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 377860b5145..4cdc977125d 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.5'
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 481568e9339afa52c4bc5aa9ac12abef3388ef2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:23:36 +0000
Subject: [PATCH 3376/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/nginx

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index fa26b67237d..363a6f08a96 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 9085c98d267b659ec64cbca35d694298e5948572 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:24:51 +0000
Subject: [PATCH 3377/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/presto

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index ff190b0287a..ad35cd6ec25 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From b32e4ac1ae1789b16d9832e5e1caa359db3c587f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:25:13 +0000
Subject: [PATCH 3378/4969] Bump org.jetbrains:annotations in /modules/rabbitmq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 850331a796c..77154dcf01f 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.20.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From bee51955355283cd323a78ea3ea0edbf24123285 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:27:57 +0000
Subject: [PATCH 3379/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/spock

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d833e8cacf6..e3a0fcd4947 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.1'
 
-    testCompileOnly 'org.jetbrains:annotations:24.0.1'
+    testCompileOnly 'org.jetbrains:annotations:24.1.0'
 }
 
 sourceJar {

From d6062ab468a4f815320ed1a29222785f5bbdd448 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:28:54 +0000
Subject: [PATCH 3380/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.2.6.RELEASE to 6.3.0.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/lettuce-io/lettuce-core/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.2.6.RELEASE...6.3.0.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 00bc52b1214..29e2e9e8cd0 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.0.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 03b009a7028..26ff4b9c974 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.0.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index a058c5313ea..44637071c6b 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'

From 0dfb5bc5e16e068b5ba739a6ecac43c10c4305a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:31:31 +0000
Subject: [PATCH 3381/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.11 to 3.6.0.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.5.11...v3.6.0)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 5d77f148df1..68cdb300de6 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.11'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.0'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 5d3b4ebcd9a9bd7a324778d81e67fdf5691ece1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:38:25 +0000
Subject: [PATCH 3382/4969] Bump com.yugabyte:jdbc-yugabytedb in
 /modules/yugabytedb

Bumps [com.yugabyte:jdbc-yugabytedb](https://github.com/yugabyte/pgjdbc) from 42.3.5-yb-3 to 42.3.5-yb-4.
- [Release notes](https://github.com/yugabyte/pgjdbc/releases)
- [Changelog](https://github.com/yugabyte/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yugabyte/pgjdbc/compare/v42.3.5-yb-3...v42.3.5-yb-4)

---
updated-dependencies:
- dependency-name: com.yugabyte:jdbc-yugabytedb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index 01c8b8d1928..100620ab6f9 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.15.0-yb-1'
     // YSQL driver
-    testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-3'
+    testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-4'
 }

From 6f66de8e79be8e2de305465582d79803d3f99364 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:48:54 +0000
Subject: [PATCH 3383/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.15 to 10.1.16.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 00af5f5b85d..8a965e4076e 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.15'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.16'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 553f547e853f0ec49481ee20dda8778a4d557327 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:54:19 +0000
Subject: [PATCH 3384/4969] Bump org.jetbrains:annotations in /modules/selenium

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 42f21362533..6fb4c6dd949 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.assertj:assertj-core:3.24.2'
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 3133273bb113b67a747e3b31683ece88c9727c0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:55:00 +0000
Subject: [PATCH 3385/4969] Bump org.jetbrains:annotations in
 /modules/oracle-free

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 642458ebfb9..d2123af02f3 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'

From bbc0634829a3fbdddf74a9436ba7f0ae822b405c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:57:37 +0000
Subject: [PATCH 3386/4969] Bump com.ibm.db2:jcc from 11.5.8.0 to 11.5.9.0 in
 /modules/db2

Bumps com.ibm.db2:jcc from 11.5.8.0 to 11.5.9.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 17360f6f976..ac34f2c04b3 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.ibm.db2:jcc:11.5.8.0'
+    testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From b2b983158eb47f80ad56d1f6109ad834c1434a32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:58:20 +0000
Subject: [PATCH 3387/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/tidb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index d9851d7a7e2..43ef0603e3b 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 2bdf0711a58e774ff7f37609dd7a65dd5f41297e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:00:27 +0000
Subject: [PATCH 3388/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/hivemq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 480e6c93864..3861ec45485 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:24.0.1")
+    api("org.jetbrains:annotations:24.1.0")
 
     shaded("org.apache.commons:commons-lang3:3.13.0")
     shaded("commons-io:commons-io:2.15.0")

From 832d9437fac7c92be635390714cb3cc40a6a3ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 21 Nov 2023 09:32:09 -0600
Subject: [PATCH 3389/4969] Register default network alias using ContainerDef
 (#7861)

Changes in 1dba8d1 doesn't register a default network alias
when implementing the new `ContainerDef`. This impacts to
kafka and mongodb modules.

Fixes #7823
---
 .../containers/GenericContainer.java          |  5 +-
 .../containers/GenericContainerTest.java      | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 4cae19864ea..2324b44b004 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -215,9 +215,7 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     private ContainerDef containerDef;
 
     ContainerDef createContainerDef() {
-        ContainerDef def = new ContainerDef();
-        def.addNetworkAlias("tc-" + Base58.randomString(8));
-        return def;
+        return new ContainerDef();
     }
 
     ContainerDef getContainerDef() {
@@ -242,6 +240,7 @@ public GenericContainer(@NonNull final DockerImageName dockerImageName) {
     public GenericContainer(@NonNull final RemoteDockerImage image) {
         this.image = image;
         this.containerDef = createContainerDef();
+        this.containerDef.addNetworkAlias("tc-" + Base58.randomString(8));
         this.containerDef.setImage(image);
     }
 
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 901f8a1eac1..8baf8d6e987 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -23,6 +23,7 @@
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Arrays;
@@ -231,6 +232,30 @@ public void shouldReturnTheProvidedImage() {
         assertThat(container.getImage().get()).isEqualTo("alpine:3.16");
     }
 
+    @Test
+    public void shouldContainDefaultNetworkAlias() {
+        try (GenericContainer<?> container = new GenericContainer<>("testcontainers/helloworld:1.1.0")) {
+            container.start();
+            assertThat(container.getNetworkAliases()).hasSize(1);
+        }
+    }
+
+    @Test
+    public void shouldContainDefaultNetworkAliasWhenUsingGenericContainer() {
+        try (HelloWorldContainer container = new HelloWorldContainer("testcontainers/helloworld:1.1.0")) {
+            container.start();
+            assertThat(container.getNetworkAliases()).hasSize(1);
+        }
+    }
+
+    @Test
+    public void shouldContainDefaultNetworkAliasWhenUsingContainerDef() {
+        try (TcHelloWorldContainer container = new TcHelloWorldContainer("testcontainers/helloworld:1.1.0")) {
+            container.start();
+            assertThat(container.getNetworkAliases()).hasSize(1);
+        }
+    }
+
     static class NoopStartupCheckStrategy extends StartupCheckStrategy {
 
         @Override
@@ -267,4 +292,31 @@ protected void waitUntilReady() {
             throw new IllegalStateException("Nope!");
         }
     }
+
+    static class HelloWorldContainer extends GenericContainer<HelloWorldContainer> {
+
+        public HelloWorldContainer(String image) {
+            super(DockerImageName.parse(image));
+            withExposedPorts(8080);
+        }
+    }
+
+    static class TcHelloWorldContainer extends GenericContainer<HelloWorldContainer> {
+
+        public TcHelloWorldContainer(String image) {
+            super(DockerImageName.parse(image));
+        }
+
+        @Override
+        ContainerDef createContainerDef() {
+            return new HelloWorldContainerDef();
+        }
+
+        class HelloWorldContainerDef extends ContainerDef {
+
+            HelloWorldContainerDef() {
+                addExposedTcpPort(8080);
+            }
+        }
+    }
 }

From 87494479e7ed2f9544fcfb65835e5d73baf5f475 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 10:27:00 -0600
Subject: [PATCH 3390/4969] [create-pull-request] automated change (#7863)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 2d17bfdd66e..b6bcf0805dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.19.2
+testcontainers.version=1.19.3

From 1a3b23385f9a595576246a4c7f5dc54d244dd69d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 10:27:16 -0600
Subject: [PATCH 3391/4969] [create-pull-request] automated change (#7862)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 90048c969d8..43645183075 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -123,4 +123,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.2
+    latest_version: 1.19.3

From e56beb1e47ca7dd2a0ca9dbb8780e67d9cffa7a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 22:08:07 +0000
Subject: [PATCH 3392/4969] Bump org.springframework.boot from 2.7.17 to 2.7.18
 in /examples

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.17 to 2.7.18.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.17...v2.7.18)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a1255d7e6d4..286c2376a5a 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.7.17'
+    id 'org.springframework.boot' version '2.7.18'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index f1c8d4097fa..08fb733e14d 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.7.17'
+    id 'org.springframework.boot' version '2.7.18'
 }
 apply plugin: 'io.spring.dependency-management'
 

From ece35dc63533409c809901396eae874d2c6cdddb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 22:23:32 +0000
Subject: [PATCH 3393/4969] Bump org.apache.commons:commons-lang3 in
 /modules/jdbc-test

Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c384b1863df..5f68463bebb 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
 
     api 'com.google.guava:guava:32.1.3-jre'
-    api 'org.apache.commons:commons-lang3:3.13.0'
+    api 'org.apache.commons:commons-lang3:3.14.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 

From dcaba02887a65006d520e2dbbef83967828aefd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 22:24:12 +0000
Subject: [PATCH 3394/4969] Bump redis.clients:jedis from 5.0.2 to 5.1.0 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.2...v5.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e2bdc856dea..1204848ecb1 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.0.2'
+    testImplementation 'redis.clients:jedis:5.1.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 101b6a7c96fa9d0a07523258fe51faf79c2e622a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 28 Nov 2023 14:48:27 -0600
Subject: [PATCH 3395/4969] Add mikepenz/action-junit-report (#7894)

Annotations with stacktraces is a nice feature to have in our own
pipeline. The `mikepenz/action-junit-report` has been added as a
custom action and reused in the workflow.
---
 .github/actions/setup-junit-report/action.yml | 11 +++++++++++
 .github/workflows/ci-rootless.yml             |  3 +++
 .github/workflows/ci.yml                      | 15 +++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 .github/actions/setup-junit-report/action.yml

diff --git a/.github/actions/setup-junit-report/action.yml b/.github/actions/setup-junit-report/action.yml
new file mode 100644
index 00000000000..4256799754c
--- /dev/null
+++ b/.github/actions/setup-junit-report/action.yml
@@ -0,0 +1,11 @@
+name: Set up JUnit Report
+description: Sets up JUnit Report
+runs:
+  using: "composite"
+  steps:
+    - name: Publish Test Report
+      uses: mikepenz/action-junit-report@v3
+      if: always() # always run even if the previous step fails
+      with:
+        report_paths: '**/build/test-results/test/TEST-*.xml'
+        detailed_summary: true
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index f2ff80a2ca8..fccaef5ede7 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -43,6 +43,8 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-22.04
+    permissions:
+      checks: write
     steps:
       - uses: actions/checkout@v4
       - name: Setup rootless Docker
@@ -53,3 +55,4 @@ jobs:
         uses: gradle/gradle-build-action@v2
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
+      - uses: ./.github/actions/setup-junit-report
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25766d668fb..15b1240904b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,16 +49,21 @@ env:
 jobs:
   core:
     runs-on: ubuntu-22.04
+    permissions:
+      checks: write
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle
         run: |
           ./gradlew :testcontainers:check --no-daemon --continue --scan
+      - uses: ./.github/actions/setup-junit-report
 
   turbo-mode:
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-22.04
+    permissions:
+      checks: write
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
@@ -71,6 +76,7 @@ jobs:
         working-directory: ./smoke-test/
         run: |
           ./gradlew check --no-daemon --continue --scan --info
+      - uses: ./.github/actions/setup-junit-report
 
   find_gradle_jobs:
     needs: [core]
@@ -97,12 +103,15 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
     runs-on: ubuntu-22.04
+    permissions:
+      checks: write
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
+      - uses: ./.github/actions/setup-junit-report
 
   find_examples_jobs:
     needs: [check]
@@ -130,6 +139,8 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_examples_jobs.outputs.matrix) }}
     runs-on: ubuntu-22.04
+    permissions:
+      checks: write
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
@@ -137,6 +148,7 @@ jobs:
         working-directory: ./examples/
         run: |
           ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}}
+      - uses: ./.github/actions/setup-junit-report
 
   find_docs_examples_jobs:
     needs: [check_examples]
@@ -163,9 +175,12 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_docs_examples_jobs.outputs.matrix) }}
     runs-on: ubuntu-22.04
+    permissions:
+      checks: write
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
           ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
+      - uses: ./.github/actions/setup-junit-report

From 110785d33eb751f14b10b73b2181d28c2b52c123 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2023 20:49:49 +0000
Subject: [PATCH 3396/4969] Bump github/combine-prs from 4.1.0 to 5.0.0

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v4.1.0...v5.0.0)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index c2c0c70555f..c5faddc0505 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v4.1.0
+        uses: github/combine-prs@v5.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From 77cd560471997158def71d60ba13baa46ea15dd8 Mon Sep 17 00:00:00 2001
From: Anastasiia Smirnova <zminyty@gmail.com>
Date: Tue, 28 Nov 2023 22:21:42 +0100
Subject: [PATCH 3397/4969] Selenium: increase default startup timeout to 60
 seconds (#4357)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/BrowserWebDriverContainer.java | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index a5525cb5bdf..8cdb6ca611c 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -103,17 +103,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 
     public BrowserWebDriverContainer() {
         super();
-        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(
-                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
-            )
-            .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
-
-        this.waitStrategy =
-            new WaitAllStrategy()
-                .withStrategy(logWaitStrategy)
-                .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
+        this.waitStrategy = getDefaultWaitStrategy();
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
     }
@@ -134,17 +124,7 @@ public BrowserWebDriverContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         // we assert compatibility with the chrome/firefox/edge image later, after capabilities are processed
 
-        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(
-                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
-            )
-            .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
-
-        this.waitStrategy =
-            new WaitAllStrategy()
-                .withStrategy(logWaitStrategy)
-                .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
+        this.waitStrategy = getDefaultWaitStrategy();
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
 
@@ -453,6 +433,19 @@ public SELF withRecordingFileFactory(RecordingFileFactory recordingFileFactory)
         return self();
     }
 
+    private WaitStrategy getDefaultWaitStrategy() {
+        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
+            .withRegEx(
+                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
+            )
+            .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
+
+        return new WaitAllStrategy()
+            .withStrategy(logWaitStrategy)
+            .withStrategy(new HostPortWaitStrategy())
+            .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
+    }
+
     public enum VncRecordingMode {
         SKIP,
         RECORD_ALL,

From 7bf5c49e32a3034d9596b8857aa4c212b08fe44c Mon Sep 17 00:00:00 2001
From: Andy Coates <8012398+big-andy-coates@users.noreply.github.com>
Date: Tue, 28 Nov 2023 21:44:34 +0000
Subject: [PATCH 3398/4969] Fix javadoc for stop method (#6834)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 2324b44b004..8e2b00d0adb 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -639,7 +639,7 @@ private void connectToPortForwardingNetwork(String networkMode) {
     }
 
     /**
-     * Stops the container.
+     * Kill and remove the container.
      */
     @Override
     public void stop() {

From 62e6062ef6dea1872a456749923eb92d2d39e3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 29 Nov 2023 15:08:11 -0600
Subject: [PATCH 3399/4969] Enable only annotations in junit report action

---
 .github/actions/setup-junit-report/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-junit-report/action.yml b/.github/actions/setup-junit-report/action.yml
index 4256799754c..86092d06bcc 100644
--- a/.github/actions/setup-junit-report/action.yml
+++ b/.github/actions/setup-junit-report/action.yml
@@ -8,4 +8,4 @@ runs:
       if: always() # always run even if the previous step fails
       with:
         report_paths: '**/build/test-results/test/TEST-*.xml'
-        detailed_summary: true
+        annotate_only: true

From d5dc4d3cfa572fd3163e16cf6bf181db71a27107 Mon Sep 17 00:00:00 2001
From: shawjef3 <shawjef3@gmail.com>
Date: Wed, 29 Nov 2023 16:54:32 -0500
Subject: [PATCH 3400/4969] Add support to ImageFromDockerfile  (#7313)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`withBuildImageCmdModifier` allows to customize the `BuildImageCmd`
created with `ImageFromDockerfile`.

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../images/builder/ImageFromDockerfile.java     | 17 +++++++++++++++++
 .../containers/MultiStageBuildTest.java         | 16 ++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index 2daed45b3fb..b35ef830c11 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -32,9 +32,11 @@
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.zip.GZIPOutputStream;
 
 @Slf4j
@@ -62,6 +64,8 @@ public class ImageFromDockerfile
 
     private Optional<String> target = Optional.empty();
 
+    private final Set<Consumer<BuildImageCmd>> buildImageCmdModifiers = new LinkedHashSet<>();
+
     private Set<String> dependencyImageNames = Collections.emptySet();
 
     public ImageFromDockerfile() {
@@ -180,6 +184,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
 
         this.buildArgs.forEach(buildImageCmd::withBuildArg);
         this.target.ifPresent(buildImageCmd::withTarget);
+        this.buildImageCmdModifiers.forEach(hook -> hook.accept(buildImageCmd));
     }
 
     private void prePullDependencyImages(Set<String> imagesToPull) {
@@ -248,4 +253,16 @@ public ImageFromDockerfile withDockerfile(Path dockerfile) {
         this.dockerfile = Optional.of(dockerfile);
         return this;
     }
+
+    /**
+     * Allow low level modifications of {@link BuildImageCmd}.
+     * Warning: this does expose the underlying docker-java API so might change outside of our control.
+     *
+     * @param modifier {@link Consumer} of {@link BuildImageCmd}.
+     * @return this
+     */
+    public ImageFromDockerfile withBuildImageCmdModifier(Consumer<BuildImageCmd> modifier) {
+        this.buildImageCmdModifiers.add(modifier);
+        return this;
+    }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java b/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
index 80ae37a0a07..f5bed1020c0 100644
--- a/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
+++ b/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
@@ -25,4 +25,20 @@ public void testDockerMultistageBuild() throws IOException, InterruptedException
             assertThat(container.execInContainer("ls").getStdout()).contains("hello.txt");
         }
     }
+
+    @Test
+    public void shouldBuildMultistageBuildWithBuildImageCmdModifier() throws IOException, InterruptedException {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(
+                new ImageFromDockerfile()
+                    .withDockerfile(Paths.get("src/test/resources/Dockerfile-multistage"))
+                    .withBuildImageCmdModifier(cmd -> cmd.withTarget("builder"))
+            )
+                .withCommand("/bin/sh", "-c", "sleep 10")
+        ) {
+            container.start();
+            assertThat(container.execInContainer("pwd").getStdout()).contains("/my-files");
+            assertThat(container.execInContainer("ls").getStdout()).contains("hello.txt");
+        }
+    }
 }

From 212cf54b0ce918943091b8ce4fbc7fcc96ff3ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 29 Nov 2023 15:57:28 -0600
Subject: [PATCH 3401/4969] Add support for workdir and env var in exec command
 (#7816)

Currently, only `user` and `command` can be used with `execInContainer`.
This commit introduces `ExecConfig`, which allows to set workdir and
env vars when running an exec process.

`execInContainerWithUser` is deprecated in favor of `execInContainer(ExecConfig)`
---
 core/build.gradle                             |  4 +-
 .../containers/ContainerState.java            | 31 +++++++-
 .../testcontainers/containers/ExecConfig.java | 34 +++++++++
 .../containers/ExecInContainerPattern.java    | 75 +++++++++++++++++++
 .../junit/ExecInContainerTest.java            | 73 ++++++++++++++++++
 .../junit/GenericContainerRuleTest.java       | 32 --------
 6 files changed, 212 insertions(+), 37 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/containers/ExecConfig.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java

diff --git a/core/build.gradle b/core/build.gradle
index 130572ab134..a9841c54746 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -52,7 +52,9 @@ tasks.japicmp {
 
     methodExcludes = [
         "org.testcontainers.containers.Container#getDockerClient()",
-        "org.testcontainers.containers.ContainerState#getDockerClient()"
+        "org.testcontainers.containers.ContainerState#getDockerClient()",
+        "org.testcontainers.containers.ContainerState#execInContainer(org.testcontainers.containers.ExecConfig)",
+        "org.testcontainers.containers.ContainerState#execInContainer(java.nio.charset.Charset,org.testcontainers.containers.ExecConfig)"
     ]
 
     fieldExcludes = []
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index 13cf9437f06..b3a38febf73 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -266,28 +266,51 @@ default Container.ExecResult execInContainer(Charset outputCharset, String... co
      * Run a command inside a running container as a given user, as using "docker exec -u user".
      * <p>
      * @see ExecInContainerPattern#execInContainerWithUser(DockerClient, InspectContainerResponse, String, String...)
+     * @deprecated use {@link #execInContainer(ExecConfig)}
      */
+    @Deprecated
     default Container.ExecResult execInContainerWithUser(String user, String... command)
         throws UnsupportedOperationException, IOException, InterruptedException {
-        return ExecInContainerPattern.execInContainerWithUser(getDockerClient(), getContainerInfo(), user, command);
+        return ExecInContainerPattern.execInContainer(
+            getDockerClient(),
+            getContainerInfo(),
+            ExecConfig.builder().user(user).command(command).build()
+        );
     }
 
     /**
      * Run a command inside a running container as a given user, as using "docker exec -u user".
      * <p>
      * @see ExecInContainerPattern#execInContainerWithUser(DockerClient, InspectContainerResponse, Charset, String, String...)
+     * @deprecated use {@link #execInContainer(Charset, ExecConfig)}
      */
+    @Deprecated
     default Container.ExecResult execInContainerWithUser(Charset outputCharset, String user, String... command)
         throws UnsupportedOperationException, IOException, InterruptedException {
-        return ExecInContainerPattern.execInContainerWithUser(
+        return ExecInContainerPattern.execInContainer(
             getDockerClient(),
             getContainerInfo(),
             outputCharset,
-            user,
-            command
+            ExecConfig.builder().user(user).command(command).build()
         );
     }
 
+    /**
+     * Run a command inside a running container, as though using "docker exec".
+     */
+    default Container.ExecResult execInContainer(ExecConfig execConfig)
+        throws UnsupportedOperationException, IOException, InterruptedException {
+        return ExecInContainerPattern.execInContainer(getDockerClient(), getContainerInfo(), execConfig);
+    }
+
+    /**
+     * Run a command inside a running container, as though using "docker exec".
+     */
+    default Container.ExecResult execInContainer(Charset outputCharset, ExecConfig execConfig)
+        throws UnsupportedOperationException, IOException, InterruptedException {
+        return ExecInContainerPattern.execInContainer(getDockerClient(), getContainerInfo(), outputCharset, execConfig);
+    }
+
     /**
      *
      * Copies a file or directory to the container.
diff --git a/core/src/main/java/org/testcontainers/containers/ExecConfig.java b/core/src/main/java/org/testcontainers/containers/ExecConfig.java
new file mode 100644
index 00000000000..935f242d369
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/ExecConfig.java
@@ -0,0 +1,34 @@
+package org.testcontainers.containers;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.Map;
+
+/**
+ * Exec configuration.
+ */
+@Builder
+@Getter
+public class ExecConfig {
+
+    /**
+     * The command to run.
+     */
+    private String[] command;
+
+    /**
+     * The user to run the exec process.
+     */
+    private String user;
+
+    /**
+     * Key-value pairs of environment variables.
+     */
+    private Map<String, String> envVars;
+
+    /**
+     * The working directory for the exec process.
+     */
+    private String workDir;
+}
diff --git a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
index 47ade1dabb9..1ed23224e5e 100644
--- a/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
+++ b/core/src/main/java/org/testcontainers/containers/ExecInContainerPattern.java
@@ -16,6 +16,9 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Provides utility methods for executing commands in containers
@@ -97,7 +100,9 @@ public Container.ExecResult execInContainer(
      * @param command the command to execute
      * @see #execInContainerWithUser(DockerClient, InspectContainerResponse, Charset, String,
      *     String...)
+     * @deprecated use {@link #execInContainer(DockerClient, InspectContainerResponse, ExecConfig)}
      */
+    @Deprecated
     public Container.ExecResult execInContainerWithUser(
         DockerClient dockerClient,
         InspectContainerResponse containerInfo,
@@ -121,13 +126,64 @@ public Container.ExecResult execInContainerWithUser(
      * @throws IOException if there's an issue communicating with Docker
      * @throws InterruptedException if the thread waiting for the response is interrupted
      * @throws UnsupportedOperationException if the docker daemon you're connecting to doesn't support "exec".
+     * @deprecated use {@link #execInContainer(DockerClient, InspectContainerResponse, Charset, ExecConfig)}
      */
+    @Deprecated
     public Container.ExecResult execInContainerWithUser(
         DockerClient dockerClient,
         InspectContainerResponse containerInfo,
         Charset outputCharset,
         String user,
         String... command
+    ) throws UnsupportedOperationException, IOException, InterruptedException {
+        return execInContainer(
+            dockerClient,
+            containerInfo,
+            outputCharset,
+            ExecConfig.builder().user(user).command(command).build()
+        );
+    }
+
+    /**
+     * Run a command inside a running container as a given user, as using "docker exec -u user".
+     * <p>
+     * This functionality is not available on a docker daemon running the older "lxc" execution
+     * driver. At the time of writing, CircleCI was using this driver.
+     * @param dockerClient the {@link DockerClient}
+     * @param containerInfo the container info
+     * @param execConfig the exec configuration
+     * @return the result of execution
+     * @throws IOException if there's an issue communicating with Docker
+     * @throws InterruptedException if the thread waiting for the response is interrupted
+     * @throws UnsupportedOperationException if the docker daemon you're connecting to doesn't support "exec".
+     */
+    public Container.ExecResult execInContainer(
+        DockerClient dockerClient,
+        InspectContainerResponse containerInfo,
+        ExecConfig execConfig
+    ) throws UnsupportedOperationException, IOException, InterruptedException {
+        return execInContainer(dockerClient, containerInfo, StandardCharsets.UTF_8, execConfig);
+    }
+
+    /**
+     * Run a command inside a running container as a given user, as using "docker exec -u user".
+     * <p>
+     * This functionality is not available on a docker daemon running the older "lxc" execution
+     * driver. At the time of writing, CircleCI was using this driver.
+     * @param dockerClient the {@link DockerClient}
+     * @param containerInfo the container info
+     * @param outputCharset the character set used to interpret the output.
+     * @param execConfig the exec configuration
+     * @return the result of execution
+     * @throws IOException if there's an issue communicating with Docker
+     * @throws InterruptedException if the thread waiting for the response is interrupted
+     * @throws UnsupportedOperationException if the docker daemon you're connecting to doesn't support "exec".
+     */
+    public Container.ExecResult execInContainer(
+        DockerClient dockerClient,
+        InspectContainerResponse containerInfo,
+        Charset outputCharset,
+        ExecConfig execConfig
     ) throws UnsupportedOperationException, IOException, InterruptedException {
         if (!TestEnvironment.dockerExecutionDriverSupportsExec()) {
             // at time of writing, this is the expected result in CircleCI.
@@ -143,17 +199,36 @@ public Container.ExecResult execInContainerWithUser(
         String containerId = containerInfo.getId();
         String containerName = containerInfo.getName();
 
+        String[] command = execConfig.getCommand();
         log.debug("{}: Running \"exec\" command: {}", containerName, String.join(" ", command));
         final ExecCreateCmd execCreateCmd = dockerClient
             .execCreateCmd(containerId)
             .withAttachStdout(true)
             .withAttachStderr(true)
             .withCmd(command);
+
+        String user = execConfig.getUser();
         if (user != null && !user.isEmpty()) {
             log.debug("{}: Running \"exec\" command with user: {}", containerName, user);
             execCreateCmd.withUser(user);
         }
 
+        String workDir = execConfig.getWorkDir();
+        if (workDir != null && !workDir.isEmpty()) {
+            log.debug("{}: Running \"exec\" command inside workingDir: {}", containerName, workDir);
+            execCreateCmd.withWorkingDir(workDir);
+        }
+
+        Map<String, String> envVars = execConfig.getEnvVars();
+        if (envVars != null && !envVars.isEmpty()) {
+            List<String> envVarList = envVars
+                .entrySet()
+                .stream()
+                .map(e -> e.getKey() + "=" + e.getValue())
+                .collect(Collectors.toList());
+            execCreateCmd.withEnv(envVarList);
+        }
+
         final ExecCreateCmdResponse execCreateCmdResponse = execCreateCmd.exec();
 
         final ToStringConsumer stdoutConsumer = new ToStringConsumer();
diff --git a/core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java b/core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java
new file mode 100644
index 00000000000..a3dd21318d2
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java
@@ -0,0 +1,73 @@
+package org.testcontainers.junit;
+
+import org.junit.Assume;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.testcontainers.TestImages;
+import org.testcontainers.containers.ExecConfig;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.TestEnvironment;
+
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ExecInContainerTest {
+
+    @ClassRule
+    public static GenericContainer<?> redis = new GenericContainer<>(TestImages.REDIS_IMAGE).withExposedPorts(6379);
+
+    @Test
+    public void shouldExecuteCommand() throws Exception {
+        // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
+        // that's the case for CircleCI.
+        // Once they resolve the issue, this clause can be removed.
+        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+
+        final GenericContainer.ExecResult result = redis.execInContainer("redis-cli", "role");
+        assertThat(result.getStdout())
+            .as("Output for \"redis-cli role\" command should start with \"master\"")
+            .startsWith("master");
+        assertThat(result.getStderr()).as("Stderr for \"redis-cli role\" command should be empty").isEmpty();
+        // We expect to reach this point for modern Docker versions.
+    }
+
+    @Test
+    public void shouldExecuteCommandWithUser() throws Exception {
+        // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
+        // that's the case for CircleCI.
+        // Once they resolve the issue, this clause can be removed.
+        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+
+        final GenericContainer.ExecResult result = redis.execInContainerWithUser("redis", "whoami");
+        assertThat(result.getStdout())
+            .as("Output for \"whoami\" command should start with \"redis\"")
+            .startsWith("redis");
+        assertThat(result.getStderr()).as("Stderr for \"whoami\" command should be empty").isEmpty();
+        // We expect to reach this point for modern Docker versions.
+    }
+
+    @Test
+    public void shouldExecuteCommandWithWorkdir() throws Exception {
+        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+
+        final GenericContainer.ExecResult result = redis.execInContainer(
+            ExecConfig.builder().workDir("/opt").command(new String[] { "pwd" }).build()
+        );
+        assertThat(result.getStdout()).startsWith("/opt");
+    }
+
+    @Test
+    public void shouldExecuteCommandWithEnvVars() throws Exception {
+        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+
+        final GenericContainer.ExecResult result = redis.execInContainer(
+            ExecConfig
+                .builder()
+                .envVars(Collections.singletonMap("TESTCONTAINERS", "JAVA"))
+                .command(new String[] { "env" })
+                .build()
+        );
+        assertThat(result.getStdout()).contains("TESTCONTAINERS=JAVA");
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index 79465f192c4..fc08e11107a 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -14,7 +14,6 @@
 import com.rabbitmq.client.Envelope;
 import org.apache.commons.io.FileUtils;
 import org.bson.Document;
-import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Ignore;
@@ -28,7 +27,6 @@
 import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.Base58;
-import org.testcontainers.utility.TestEnvironment;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -359,36 +357,6 @@ public void failFastWhenContainerHaltsImmediately() {
         }
     }
 
-    @Test
-    public void testExecInContainer() throws Exception {
-        // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
-        // that's the case for CircleCI.
-        // Once they resolve the issue, this clause can be removed.
-        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
-
-        final GenericContainer.ExecResult result = redis.execInContainer("redis-cli", "role");
-        assertThat(result.getStdout())
-            .as("Output for \"redis-cli role\" command should start with \"master\"")
-            .startsWith("master");
-        assertThat(result.getStderr()).as("Stderr for \"redis-cli role\" command should be empty").isEmpty();
-        // We expect to reach this point for modern Docker versions.
-    }
-
-    @Test
-    public void testExecInContainerWithUser() throws Exception {
-        // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
-        // that's the case for CircleCI.
-        // Once they resolve the issue, this clause can be removed.
-        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
-
-        final GenericContainer.ExecResult result = redis.execInContainerWithUser("redis", "whoami");
-        assertThat(result.getStdout())
-            .as("Output for \"whoami\" command should start with \"redis\"")
-            .startsWith("redis");
-        assertThat(result.getStderr()).as("Stderr for \"whoami\" command should be empty").isEmpty();
-        // We expect to reach this point for modern Docker versions.
-    }
-
     @Test
     public void extraHostTest() throws IOException {
         BufferedReader br = getReaderForContainerPort80(alpineExtrahost);

From 05b6f7e7228947b3751fcf23ea7f53df0468a1d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:58:34 +0000
Subject: [PATCH 3402/4969] Bump org.apache.commons:commons-compress from
 1.24.0 to 1.25.0 in /core

Bumps org.apache.commons:commons-compress from 1.24.0 to 1.25.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index a9841c54746..c24183c518b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testCompileOnly 'org.jetbrains:annotations:24.0.1'
-    api 'org.apache.commons:commons-compress:1.24.0'
+    api 'org.apache.commons:commons-compress:1.25.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From 0a4ad903b1a1e6787b03b8704981ba47356db7a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:59:04 +0000
Subject: [PATCH 3403/4969] Bump redis.clients:jedis from 5.0.2 to 5.1.0 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.2...v5.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index a9841c54746..4b32bd00338 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:5.0.2'
+    testImplementation 'redis.clients:jedis:5.1.0'
     testImplementation 'com.rabbitmq:amqp-client:5.20.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From 525d1e58125c873bd1329dd4c00310d1fe92efb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 29 Nov 2023 16:47:25 -0600
Subject: [PATCH 3404/4969] Add modules/minio in settings.yml

---
 .github/settings.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/settings.yml b/.github/settings.yml
index 7cc83a69524..53293ca6a03 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -163,6 +163,9 @@ labels:
   - name: modules/mariadb
     color: '#006b75'
 
+  - name: modules/minio
+    color: '#006b75'
+
   - name: modules/mockserver
     color: '#006b75'
 

From 89e7f2386fbc0bb09eaf2f79ec2af4e9ec02ad16 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:39:32 -0600
Subject: [PATCH 3405/4969] Update Gradle Wrapper to 8.5 (#7897)

---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 63721 -> 43462 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 63721 -> 43462 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 smoke-test/gradle/wrapper/gradle-wrapper.jar  | Bin 63721 -> 43462 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
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

literal 63721
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

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 46671acb6e1..db8c3baafe3 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
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

literal 63721
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 01f330a93e8..a7a990ab2a8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar
index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
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

literal 63721
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

diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
index 46671acb6e1..db8c3baafe3 100644
--- a/smoke-test/gradle/wrapper/gradle-wrapper.properties
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 1bfb966238a77fa1dd0cba033b6d8f9cca3fd260 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Thu, 30 Nov 2023 18:11:06 +0100
Subject: [PATCH 3406/4969] Deprecate support for
 docker.elastic.co/elasticsearch/elasticsearch-oss (#4574)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since version 7.11.0, there is no more `docker.elastic.co/elasticsearch/elasticsearch-oss`
artifact anymore.

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/elasticsearch.md                    |  9 ---------
 .../elasticsearch/ElasticsearchContainer.java    | 16 ++++++++++++----
 .../ElasticsearchContainerTest.java              | 10 ++--------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 845ee0d2d1a..3372d2fdea0 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -28,15 +28,6 @@ You can turn on security by providing a password:
 [HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientSecuredContainer
 <!--/codeinclude-->
 
-## Choose your Elasticsearch license
-
-If you prefer to start a Docker image with the pure OSS version (which means with no security in older versions or
-other new and advanced features), you can use this instead:
-
-<!--codeinclude-->
-[Elasticsearch OSS](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:ossContainer
-<!--/codeinclude-->
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index d93a144075f..940d6924c5e 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -8,7 +8,6 @@
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
@@ -60,6 +59,7 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
         "docker.elastic.co/elasticsearch/elasticsearch"
     );
 
+    @Deprecated
     private static final DockerImageName DEFAULT_OSS_IMAGE_NAME = DockerImageName.parse(
         "docker.elastic.co/elasticsearch/elasticsearch-oss"
     );
@@ -72,7 +72,8 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     @Deprecated
     protected static final String DEFAULT_TAG = "7.9.2";
 
-    private final boolean isOss;
+    @Deprecated
+    private boolean isOss = false;
 
     private final boolean isAtLeastMajorVersion8;
 
@@ -103,9 +104,16 @@ public ElasticsearchContainer(String dockerImageName) {
     public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME, ELASTICSEARCH_IMAGE_NAME);
-        this.isOss = dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME);
 
-        withNetworkAliases("elasticsearch-" + Base58.randomString(6));
+        if (dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME)) {
+            this.isOss = true;
+            log.warn(
+                "{} is not supported anymore after 7.10.2. Please switch to {}",
+                dockerImageName.getUnversionedPart(),
+                DEFAULT_IMAGE_NAME.getUnversionedPart()
+            );
+        }
+
         withEnv("discovery.type", "single-node");
         // disable disk threshold checks
         withEnv("cluster.routing.allocation.disk.threshold_enabled", "false");
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 707b3fde269..2b832f28a16 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -166,9 +166,7 @@ public void elasticsearchOssImage() throws IOException {
         try (
             // ossContainer {
             ElasticsearchContainer container = new ElasticsearchContainer(
-                DockerImageName
-                    .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                    .withTag(ELASTICSEARCH_VERSION)
+                "docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2"
             )
             // }
         ) {
@@ -282,11 +280,7 @@ public void incompatibleSettingsTest() {
         // The OSS image can not use security feature
         assertThat(
             catchThrowable(() -> {
-                new ElasticsearchContainer(
-                    DockerImageName
-                        .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                        .withTag(ELASTICSEARCH_VERSION)
-                )
+                new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2")
                     .withPassword("foo");
             })
         )

From 7a1bcd28dc0ad468b1f67f0ed3be416eb54b9f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 30 Nov 2023 11:38:18 -0600
Subject: [PATCH 3407/4969] Add modules/yugabytedb in settings.yml

---
 .github/settings.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/settings.yml b/.github/settings.yml
index 53293ca6a03..863590895a0 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -235,6 +235,9 @@ labels:
   - name: modules/vault
     color: '#006b75'
 
+  - name: modules/yugabytedb
+    color: '#006b75'
+
   - name: os/linux
     color: '#1d76db'
 

From 892b06bfd0b4f1ee9884f46938dfcad819659004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 30 Nov 2023 14:36:32 -0600
Subject: [PATCH 3408/4969] Add redpandadata/redpanda as a compatible image
 (#7898)

Test has been added for all compatible images.
---
 .../redpanda/RedpandaContainer.java           | 14 ++-
 .../redpanda/AbstractRedpanda.java            | 92 +++++++++++++++++++
 .../redpanda/CompatibleImageTest.java         | 28 ++++++
 .../redpanda/RedpandaContainerTest.java       | 92 +++----------------
 4 files changed, 146 insertions(+), 80 deletions(-)
 create mode 100644 modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java
 create mode 100644 modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java

diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index f2cba1a1ba1..cc1d07c883a 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -30,7 +30,7 @@
 /**
  * Testcontainers implementation for Redpanda.
  * <p>
- * Supported images: {@code docker.redpanda.com/redpandadata/redpanda}, {@code docker.redpanda.com/vectorized/redpanda}
+ * Supported images: {@code redpandadata/redpanda}, {@code docker.redpanda.com/redpandadata/redpanda}
  * <p>
  * Exposed ports:
  * <ul>
@@ -43,11 +43,15 @@ public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
 
     private static final String REDPANDA_FULL_IMAGE_NAME = "docker.redpanda.com/redpandadata/redpanda";
 
+    private static final String IMAGE_NAME = "redpandadata/redpanda";
+
     @Deprecated
     private static final String REDPANDA_OLD_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda";
 
     private static final DockerImageName REDPANDA_IMAGE = DockerImageName.parse(REDPANDA_FULL_IMAGE_NAME);
 
+    private static final DockerImageName IMAGE = DockerImageName.parse(IMAGE_NAME);
+
     @Deprecated
     private static final DockerImageName REDPANDA_OLD_IMAGE = DockerImageName.parse(REDPANDA_OLD_FULL_IMAGE_NAME);
 
@@ -75,10 +79,14 @@ public RedpandaContainer(String image) {
 
     public RedpandaContainer(DockerImageName imageName) {
         super(imageName);
-        imageName.assertCompatibleWith(REDPANDA_OLD_IMAGE, REDPANDA_IMAGE);
+        imageName.assertCompatibleWith(REDPANDA_OLD_IMAGE, REDPANDA_IMAGE, IMAGE);
 
         boolean isLessThanBaseVersion = new ComparableVersion(imageName.getVersionPart()).isLessThan("v22.2.1");
-        if (REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) && isLessThanBaseVersion) {
+        boolean isPublicCompatibleImage =
+            REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
+            IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
+            REDPANDA_OLD_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart());
+        if (isPublicCompatibleImage && isLessThanBaseVersion) {
             throw new IllegalArgumentException("Redpanda version must be >= v22.2.1");
         }
 
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java
new file mode 100644
index 00000000000..35998e8e8fa
--- /dev/null
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java
@@ -0,0 +1,92 @@
+package org.testcontainers.redpanda;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.rnorth.ducttape.unreliables.Unreliables;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+public class AbstractRedpanda {
+
+    protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, 1, 1);
+    }
+
+    protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
+        try (
+            AdminClient adminClient = AdminClient.create(
+                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
+            );
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                ImmutableMap.of(
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG,
+                    UUID.randomUUID().toString()
+                ),
+                new StringSerializer(),
+                new StringSerializer()
+            );
+            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
+                ImmutableMap.of(
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG,
+                    "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+                    "earliest"
+                ),
+                new StringDeserializer(),
+                new StringDeserializer()
+            );
+        ) {
+            String topicName = "messages-" + UUID.randomUUID();
+
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
+            consumer.subscribe(Collections.singletonList(topicName));
+
+            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
+
+            Unreliables.retryUntilTrue(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+
+                    if (records.isEmpty()) {
+                        return false;
+                    }
+
+                    assertThat(records)
+                        .hasSize(1)
+                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+
+                    return true;
+                }
+            );
+
+            consumer.unsubscribe();
+        }
+    }
+}
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
new file mode 100644
index 00000000000..cdb2af6a291
--- /dev/null
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
@@ -0,0 +1,28 @@
+package org.testcontainers.redpanda;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class CompatibleImageTest extends AbstractRedpanda {
+
+    private final String image;
+
+    public CompatibleImageTest(String image) {
+        this.image = image;
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] image() {
+        return new String[] { "docker.redpanda.com/vectorized/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" };
+    }
+
+    @Test
+    public void shouldProduceAndConsumeMessage() throws Exception {
+        try (RedpandaContainer container = new RedpandaContainer(this.image)) {
+            container.start();
+            testKafkaFunctionality(container.getBootstrapServers());
+        }
+    }
+}
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index d6555236003..d0df2d7c95b 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -8,27 +8,16 @@
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.errors.SaslAuthenticationException;
 import org.apache.kafka.common.errors.TopicAuthorizationException;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
 import org.awaitility.Awaitility;
 import org.junit.Test;
-import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
-import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -39,9 +28,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Assertions.tuple;
 
-public class RedpandaContainerTest {
+public class RedpandaContainerTest extends AbstractRedpanda {
 
     private static final String REDPANDA_IMAGE = "docker.redpanda.com/redpandadata/redpanda:v22.2.1";
 
@@ -78,6 +66,20 @@ public void testNotCompatibleVersion() {
             .hasMessageContaining("Redpanda version must be >= v22.2.1");
     }
 
+    @Test
+    public void vectorizedRedpandaImageVersion2221ShouldNotBeCompatible() {
+        assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v21.11.19"))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("Redpanda version must be >= v22.2.1");
+    }
+
+    @Test
+    public void redpandadataRedpandaImageVersion2221ShouldNotBeCompatible() {
+        assertThatThrownBy(() -> new RedpandaContainer("redpandadata/redpanda:v21.11.19"))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("Redpanda version must be >= v22.2.1");
+    }
+
     @Test
     public void testSchemaRegistry() {
         try (RedpandaContainer container = new RedpandaContainer(REDPANDA_DOCKER_IMAGE)) {
@@ -359,70 +361,6 @@ public void testRestProxy() {
         }
     }
 
-    private void testKafkaFunctionality(String bootstrapServers) throws Exception {
-        testKafkaFunctionality(bootstrapServers, 1, 1);
-    }
-
-    private void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
-        try (
-            AdminClient adminClient = AdminClient.create(
-                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
-            );
-            KafkaProducer<String, String> producer = new KafkaProducer<>(
-                ImmutableMap.of(
-                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
-                    bootstrapServers,
-                    ProducerConfig.CLIENT_ID_CONFIG,
-                    UUID.randomUUID().toString()
-                ),
-                new StringSerializer(),
-                new StringSerializer()
-            );
-            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
-                ImmutableMap.of(
-                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
-                    bootstrapServers,
-                    ConsumerConfig.GROUP_ID_CONFIG,
-                    "tc-" + UUID.randomUUID(),
-                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
-                    "earliest"
-                ),
-                new StringDeserializer(),
-                new StringDeserializer()
-            );
-        ) {
-            String topicName = "messages-" + UUID.randomUUID();
-
-            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
-            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
-
-            consumer.subscribe(Collections.singletonList(topicName));
-
-            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
-
-            Unreliables.retryUntilTrue(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
-
-                    if (records.isEmpty()) {
-                        return false;
-                    }
-
-                    assertThat(records)
-                        .hasSize(1)
-                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
-                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
-
-                    return true;
-                }
-            );
-
-            consumer.unsubscribe();
-        }
-    }
-
     private AdminClient getAdminClient(RedpandaContainer redpanda) {
         String bootstrapServer = String.format("%s:%s", redpanda.getHost(), redpanda.getMappedPort(9092));
         // createAdminClient {

From 1ff71011533d0ead6f6066e515d8f19a71395b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 1 Dec 2023 12:12:23 -0600
Subject: [PATCH 3409/4969] Fix MinIO wait strategy (#7901)

Currently, log strategy is defined. Switching to HTTP strategy to
`/minio/health/live` endpoint for reliability.

Fixes #7892
---
 .../containers/MinIOContainer.java             | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
index 54238643c14..dfd499194ef 100644
--- a/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
+++ b/modules/minio/src/main/java/org/testcontainers/containers/MinIOContainer.java
@@ -48,6 +48,14 @@ public MinIOContainer(final String dockerImageName) {
     public MinIOContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(MINIO_S3_PORT, MINIO_UI_PORT);
+        withCommand("server", "--console-address", ":" + MINIO_UI_PORT, "/data");
+        waitingFor(
+            Wait
+                .forHttp("/minio/health/live")
+                .forPort(MINIO_S3_PORT)
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
+        );
     }
 
     /**
@@ -75,8 +83,6 @@ public MinIOContainer withPassword(String password) {
      */
     @Override
     public void configure() {
-        withExposedPorts(MinIOContainer.MINIO_S3_PORT, MinIOContainer.MINIO_UI_PORT);
-
         if (this.userName != null) {
             addEnv("MINIO_ROOT_USER", this.userName);
         } else {
@@ -87,14 +93,6 @@ public void configure() {
         } else {
             this.password = DEFAULT_PASSWORD;
         }
-
-        withCommand("server", "--console-address", ":" + MINIO_UI_PORT, "/data");
-
-        waitingFor(
-            Wait
-                .forLogMessage(".*Status:         1 Online, 0 Offline..*", 1)
-                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
-        );
     }
 
     /**

From f0c5759c5d5cb63231d2f399762c83d85d7a89cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 2 Dec 2023 17:09:35 -0600
Subject: [PATCH 3410/4969] Fix colima docs (#7902)

---
 docs/supported_docker_environment/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/supported_docker_environment/index.md b/docs/supported_docker_environment/index.md
index 65de07d0762..0bdac109245 100644
--- a/docs/supported_docker_environment/index.md
+++ b/docs/supported_docker_environment/index.md
@@ -24,7 +24,9 @@ please contact the Testcontainers team and other users from the Testcontainers c
 In order to run testcontainers against [colima](https://github.com/abiosoft/colima) the env vars below should be set
 
 ```bash
+colima start --network-address
 export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
+export TESTCONTAINERS_HOST_OVERRIDE=$(colima ls -j | jq -r '.address')
 export DOCKER_HOST="unix://${HOME}/.colima/default/docker.sock"
 ```
 

From 5c48164b033de9b64f2802b21f70344f4e0db176 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:08:01 +0000
Subject: [PATCH 3411/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.3.0 to 3.3.1.
- [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/3.3.0...3.3.1)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5a6ce09191b..5ecb7fcd9d3 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.3.0'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.3.1'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 1b64027756870ed69e51c4e68ffe1985f56357c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:31:39 +0000
Subject: [PATCH 3412/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.11 to 1.4.14.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.11...v_1.4.14)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 480e6c93864..4911d9bd178 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.22.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.4.11")
+    testImplementation("ch.qos.logback:logback-classic:1.4.14")
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 }

From 13f6f289c375954fcbea5a2ad3ef5e6d23f6ac67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:31:42 +0000
Subject: [PATCH 3413/4969] Bump commons-io:commons-io from 2.15.0 to 2.15.1 in
 /modules/hivemq

Bumps commons-io:commons-io from 2.15.0 to 2.15.1.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 480e6c93864..9af7bc55154 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.0.1")
 
     shaded("org.apache.commons:commons-lang3:3.13.0")
-    shaded("commons-io:commons-io:2.15.0")
+    shaded("commons-io:commons-io:2.15.1")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From 221c84a1b013923f1b12ebbe351f3fa103dc532f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:33:25 +0000
Subject: [PATCH 3414/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.7.0 to 3.7.1.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.7.0...3.7.1)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 958ed86ce59..d17ffe1f587 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     api "com.orientechnologies:orientdb-client:3.2.24"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.24"
 }

From 7d92e0b8cde5de5a1bd4d59b5e2390f18215a116 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:33:29 +0000
Subject: [PATCH 3415/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.24 to 3.2.25.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.24...3.2.25)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 958ed86ce59..15144fc0503 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.24"
+    api "com.orientechnologies:orientdb-client:3.2.25"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'

From 5c46c96bd0aa63ea859f2dac2bfc0933d8c91e43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:50:11 +0000
Subject: [PATCH 3416/4969] Bump actions/labeler from 4 to 5

Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 057208eda32..0127be63320 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -9,6 +9,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

From 5e8e5e7404dd1d19a9d49b58b768e713f5fe23cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:54:21 +0000
Subject: [PATCH 3417/4969] Bump io.trino:trino-jdbc from 433 to 434 in
 /modules/trino

Bumps io.trino:trino-jdbc from 433 to 434.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 96cce8b1ddd..d06e22002b8 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:433'
+    testRuntimeOnly 'io.trino:trino-jdbc:434'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From 6cfbae906d5406d720bf919cbc6ce3406fccf98d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:01:37 +0000
Subject: [PATCH 3418/4969] Bump io.rest-assured:rest-assured from 5.3.2 to
 5.4.0 in /modules/vault

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.2 to 5.4.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/commits/rest-assured-5.4.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index e8cd0c5f3ce..1b2933a4817 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.3.2'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 
 }

From 497739e09a3ed7ef70f37bc2ba589c42ac4b2f1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:15:15 +0000
Subject: [PATCH 3419/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.587 to 1.12.609.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.587...1.12.609)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 561f1c02400..5dd58582b3e 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.587'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.587'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.609'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.609'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 95611bb59204fd42887c2a4dc8f91a566c0be23a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:16:09 +0000
Subject: [PATCH 3420/4969] Bump org.postgresql:postgresql from 42.6.0 to
 42.7.1 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 58712f3975b..1a44f906d4e 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.questdb:questdb:7.3.4'

From b12a159dbafb6fa75aa7f33b44d2318df901711b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:16:12 +0000
Subject: [PATCH 3421/4969] Bump org.questdb:questdb from 7.3.4 to 7.3.7 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.3.4 to 7.3.7.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.3.4...7.3.7)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 58712f3975b..449fc1762ff 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.3.4'
+    testImplementation 'org.questdb:questdb:7.3.7'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 7e2ea26056841a75801340d1f8d992f1b6996373 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:19:46 +0000
Subject: [PATCH 3422/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 37c896fe889..59d91bb5ecb 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From a0a6ca10eee35b830bf437a367315d5be632335b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:24:27 +0000
Subject: [PATCH 3423/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.6.0 to 3.6.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index d536dbfd526..0bdcee90f9f 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.6.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }

From c69b60d25207cb63d95b14a6ac55e1105681813b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:26:31 +0000
Subject: [PATCH 3424/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.11.1 to 8.11.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.11.1...v8.11.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index d1cab47c0b6..b880f570a18 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.2"
     testImplementation "org.elasticsearch.client:transport:7.17.15"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From e05bea0ccbd06a92a21ac25d6650676fb190137e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:28:07 +0000
Subject: [PATCH 3425/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.15.1 to 3.16.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index dba81a72ddd..8d73ca1828d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }

From 19d58cc74e3a7b1b08bb0fd08ca79d40dbf32849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:30:21 +0000
Subject: [PATCH 3426/4969] Bump io.rest-assured:rest-assured in
 /modules/redpanda

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.2 to 5.4.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/commits/rest-assured-5.4.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 9a157ce27b9..27447feab97 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:3.6.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'io.rest-assured:rest-assured:5.3.2'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From a17ad80d3edd2d34d8835b354ff73121b39b3d44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:30:21 +0000
Subject: [PATCH 3427/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.6.0 to 3.6.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 9a157ce27b9..88c2f391fb4 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.32'
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.6.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.2'
 }

From bc794d4a764b7f2e2f24f0cc4baa40055f0024fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:43:52 +0000
Subject: [PATCH 3428/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.10.0 to 6.11.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v6.10.0...v6.11.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index ee078e751b9..c8cd0dacfa5 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.influxdb:influxdb-java:2.23'
-    testImplementation "com.influxdb:influxdb-client-java:6.10.0"
+    testImplementation "com.influxdb:influxdb-client-java:6.11.0"
 }

From a5c691b810d1a8b7f07a730228afb28a476ae33b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:43:55 +0000
Subject: [PATCH 3429/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.27.0 to 26.28.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.27.0...v26.28.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 5dce95ea96b..bb82a316f5b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.27.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.28.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 3893b148f595898410165d6151688779054fa40e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:43:59 +0000
Subject: [PATCH 3430/4969] Bump org.postgresql:postgresql from 42.6.0 to
 42.7.1 in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 80ad7beaed6..9cca20c0b59 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

From e122109e4fe4b99bdc2d0cd06f43cd3dc47e6ced Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:47:51 +0000
Subject: [PATCH 3431/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e2bdc856dea..8f86cc316ff 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
 

From 48208e965117a8511e8995acdc4466d15c45b225 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:50:34 +0000
Subject: [PATCH 3432/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c49ea84ed9f..8f48f255f66 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 0614509b67e469849ec419e300f708afe9bfe4a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:50:34 +0000
Subject: [PATCH 3433/4969] Bump org.postgresql:postgresql from 42.6.0 to
 42.7.1 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d833e8cacf6..72e9f5326ed 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.1'

From 00182f7a4486de1e4f2de764dce5085a22b96f5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:50:38 +0000
Subject: [PATCH 3434/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.4.11 to 3.5.1.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.4.11...java-client-3.5.1)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 8a881d12c36..0f9fe2ec96a 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.11'
+    testImplementation 'com.couchbase.client:java-client:3.5.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 7506e0df1c1e30bae717ed7d5d3e6aff6186b661 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:51:14 +0000
Subject: [PATCH 3435/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.21.22 to 2.21.43.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 04f41b31e19..22d152b74b8 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.21.22'
+    testImplementation 'software.amazon.awssdk:s3:2.21.43'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 843f2a54b98273ae19bf788bebd3fc8a677e369f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:51:14 +0000
Subject: [PATCH 3436/4969] Bump com.azure:azure-cosmos from 4.52.0 to 4.53.1
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.52.0 to 4.53.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.52.0...azure-cosmos_4.53.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 560a904ca70..9fa8958303f 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.52.0'
+    testImplementation 'com.azure:azure-cosmos:4.53.1'
 }

From b12efb549db932f60bc744265964f1ffac9807d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:54:34 +0000
Subject: [PATCH 3437/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.22.0 to 4.23.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.22.0...4.23.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 480e6c93864..6caa0303e9c 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.22.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.23.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")

From 028ab487bb77a9a40a5fce5d4057539cedc37d6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:56:34 +0000
Subject: [PATCH 3438/4969] Bump io.rest-assured:rest-assured from 5.3.2 to
 5.4.0 in /modules/consul

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.2 to 5.4.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/commits/rest-assured-5.4.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index 49188def442..b3cc5130018 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.3.2'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 38e675b5f9539fcee39d85e444300a3ef6bbbd2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:56:35 +0000
Subject: [PATCH 3439/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.15.1 to 3.16.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 settings.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 0c221c70355..96b241bb59f 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
     }
 }
diff --git a/settings.gradle b/settings.gradle
index dba81a72ddd..8d73ca1828d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }

From 6466bfbe76cca01746670fc21976162d1d174279 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:56:39 +0000
Subject: [PATCH 3440/4969] Bump io.cucumber:cucumber-bom from 7.14.0 to 7.15.0
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.14.0 to 7.15.0.
- [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/v7.14.0...v7.15.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 b8045d4e94c..9835d151160 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
-    testImplementation platform('io.cucumber:cucumber-bom:7.14.0')
+    testImplementation platform('io.cucumber:cucumber-bom:7.15.0')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'

From 5851604755f925f6cf832d6d6742dc47d660c6a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:56:44 +0000
Subject: [PATCH 3441/4969] Bump org.postgresql:postgresql from 42.6.0 to
 42.7.1 in /examples

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5152b6aecea..88f2ec67a99 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'org.json:json:20231013'
-    testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'

From 14ed63839bbc75e403609ac599a52e75183437dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:56:49 +0000
Subject: [PATCH 3442/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.15.0 to 4.16.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index d2a85fc16d1..699f2e7f007 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.15.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.16.1"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From 50c6e6b6938ea54debe1cdc812ca3fd3c6f93e39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:56:50 +0000
Subject: [PATCH 3443/4969] Bump org.apache.kafka:kafka-clients from 3.6.0 to
 3.6.1 in /examples

Bumps org.apache.kafka:kafka-clients from 3.6.0 to 3.6.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 660926dec29..392c6642c5c 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.30"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.6.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.11'

From 044418b34e29b462be32ab6d1d717c8209b4fa9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:56:56 +0000
Subject: [PATCH 3444/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.15.0 to 4.16.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 b8045d4e94c..bfdca4981ae 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.15.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.16.1')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From 9d8de1f53879dccc17b591d128aad1ab396f13c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 12 Dec 2023 12:01:39 -0600
Subject: [PATCH 3445/4969] Fix labeler file to v5 structure (#7956)

See changes in https://github.com/actions/labeler?tab=readme-ov-file#breaking-changes-in-v5
---
 .github/labeler.yml | 204 ++++++++++++++++++++++++++++++++------------
 1 file changed, 150 insertions(+), 54 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 3b4c1924df1..eec54b67829 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,102 +1,198 @@
 "area/docker-compose":
-  - core/src/main/java/org/testcontainers/containers/ComposeContainer.java
-  - core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
-  - core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
-  - core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
+  - changed-files:
+    - any-glob-to-any-file:
+      - core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+      - core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
+      - core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+      - core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
 "github_actions":
-  - .github/workflows/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - .github/workflows/*
 "gradle-wrapper":
-  - gradle/wrapper/*
-  - gradlew
-  - gradlew.bat
+  - changed-files:
+    - any-glob-to-any-file:
+      - gradle/wrapper/*
+      - gradlew
+      - gradlew.bat
 "modules/azure":
-  - modules/azure/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/azure/**/*
 "modules/cassandra":
-  - modules/cassandra/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/cassandra/**/*
 "modules/clickhouse":
-  - modules/clickhouse/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/clickhouse/**/*
 "modules/cockroachdb":
-  - modules/cockroachdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/cockroachdb/**/*
 "modules/consul":
-  - modules/consul/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/consul/**/*
 "modules/couchbase":
-  - modules/couchbase/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/couchbase/**/*
 "modules/cratedb":
-  - modules/cratedb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/cratedb/**/*
 "modules/db2":
-  - modules/db2/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/db2/**/*
 "modules/dynalite":
-  - modules/dynalite/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/dynalite/**/*
 "modules/elasticsearch":
-  - modules/elasticsearch/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/elasticsearch/**/*
 "modules/gcloud":
-  - modules/gcloud/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/gcloud/**/*
 "modules/hivemq":
-  - modules/hivemq/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/hivemq/**/*
 "modules/influx":
-  - modules/influxdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/influxdb/**/*
 "modules/jdbc":
-  - modules/jdbc/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/jdbc/**/*
 "modules/jupiter":
-  - modules/junit-jupiter/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/junit-jupiter/**/*
 "modules/k3s":
-  - modules/k3s/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/k3s/**/*
 "modules/kafka":
-  - modules/kafka/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/kafka/**/*
 "modules/localstack":
-  - modules/localstack/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/localstack/**/*
 "modules/mariadb":
-  - modules/mariadb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mariadb/**/*
 "modules/minio":
-  - modules/minio/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/minio/**/*
 "modules/mockserver":
-  - modules/mockserver/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mockserver/**/*
 "modules/mongodb":
-  - modules/mongodb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mongodb/**/*
 "modules/sql-server":
-  - modules/mssqlserver/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mssqlserver/**/*
 "modules/mysql":
-  - modules/mysql/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/mysql/**/*
 "modules/neo4j":
-  - modules/neo4j/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/neo4j/**/*
 "modules/nginx":
-  - modules/nginx/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/nginx/**/*
 "modules/oracle":
-  - modules/oracle-free/**/*
-  - modules/oracle-xe/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/oracle-free/**/*
+      - modules/oracle-xe/**/*
 "modules/orientdb":
-  - modules/orientdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/orientdb/**/*
 "modules/postgres":
-  - modules/postgresql/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/postgresql/**/*
 "modules/presto":
-  - modules/presto/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/presto/**/*
 "modules/pulsar":
-  - modules/pulsar/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/pulsar/**/*
 "modules/questdb":
-  - modules/questdb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/questdb/**/*
 "modules/r2dbc":
-  - modules/r2dbc/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/r2dbc/**/*
 "modules/rabbitmq":
-  - modules/rabbitmq/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/rabbitmq/**/*
 "modules/redpanda":
-  - modules/redpanda/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/redpanda/**/*
 "modules/selenium":
-  - modules/selenium/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/selenium/**/*
 "modules/solace":
-  - modules/solace/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/solace/**/*
 "modules/solr":
-  - modules/solr/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/solr/**/*
 "modules/spock":
-  - modules/spock/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/spock/**/*
 "modules/tidb":
-  - modules/tidb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/tidb/**/*
 "modules/toxiproxy":
-  - modules/toxiproxy/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/toxiproxy/**/*
 "modules/trino":
-  - modules/trino/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/trino/**/*
 "modules/vault":
-  - modules/vault/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/vault/**/*
 "modules/yugabytedb":
-  - modules/yugabytedb/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/yugabytedb/**/*
 "type/docs":
-  - docs/**/*.md
+  - changed-files:
+    - any-glob-to-any-file:
+      - docs/**/*.md

From bd0a188413e4e66933ec538afa11f81a8dbc0ebb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 18:05:02 +0000
Subject: [PATCH 3446/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.12 to 1.12.1.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 8d73ca1828d..5b05dffbb97 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

From a2f5821162c69630ee084c78437c45b694aab733 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:05:19 +0000
Subject: [PATCH 3447/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.24 to 3.2.25.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.24...3.2.25)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index eb51d83c77f..a8b3e5c1387 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.24"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.25"
 }

From a58ad007543dba6869a373b2435df5ce23720466 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:05:29 +0000
Subject: [PATCH 3448/4969] Bump ch.qos.logback:logback-classic from 1.3.11 to
 1.3.14 in /examples

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.3.11 to 1.3.14.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.11...v_1.3.14)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle                                    | 2 +-
 docs/examples/spock/redis/build.gradle          | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0acf7a82cc2..c59ccf7549e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,7 +122,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     }
 
     checkstyle {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 44637071c6b..05feaabc0c0 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.3.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 53f318aa79b..e0d9ee1ce56 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.6'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index b63f78ed8e8..d62839464cb 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 392c6642c5c..170c14da9f8 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 88f2ec67a99..c5ea630be63 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'org.json:json:20231013'
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 3543fdb20bf..25bea188b68 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.17.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 4a523e8d9b7..25db56b4508 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testng:testng:7.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 1b87e2bee6d..039679e7eb5 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index febedf2ec14..0ad74df4e31 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 9ddfafad149..de7f1280abb 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index cf37650fee6..c7ae7143137 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.5.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 

From 57d173b8a23d33c6b9e967b4ce3b3650436bed30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:05:44 +0000
Subject: [PATCH 3449/4969] Bump org.apache.commons:commons-lang3 in
 /modules/hivemq

Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 44fd9ebe00e..c23e6820fe5 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:24.1.0")
 
-    shaded("org.apache.commons:commons-lang3:3.13.0")
+    shaded("org.apache.commons:commons-lang3:3.14.0")
     shaded("commons-io:commons-io:2.15.1")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")

From 6efb4b070c9e192a04b4df037fb270f6572dc7d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:06:36 +0000
Subject: [PATCH 3450/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /core

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index b9fd169b7a6..5617300b32a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -71,8 +71,8 @@ configurations.all {
 dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:24.0.1'
-    testCompileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
+    testCompileOnly 'org.jetbrains:annotations:24.1.0'
     api 'org.apache.commons:commons-compress:1.25.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From 40528e828de3153b9294fa71c3d3e37e548caacc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:06:41 +0000
Subject: [PATCH 3451/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/jdbc

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 8a965e4076e..fcfd162f269 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':database-commons')
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.16'

From 7da35f51d77610cb0fb0f211e7ae87407752a263 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:06:43 +0000
Subject: [PATCH 3452/4969] Bump redis.clients:jedis from 5.0.2 to 5.1.0 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.0.2...v5.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 4a523e8d9b7..47db61f3174 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.2'
+    implementation 'redis.clients:jedis:5.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 1b87e2bee6d..728a82f5af4 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.0.2'
+    implementation 'redis.clients:jedis:5.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 9ddfafad149..8672309585a 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.0.2'
+    implementation 'redis.clients:jedis:5.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From b97d8aad379d09d2277c550ea1f51988e247b8ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:06:44 +0000
Subject: [PATCH 3453/4969] Bump org.jetbrains:annotations from 24.0.1 to
 24.1.0 in /modules/trino

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index d06e22002b8..5f33621683f 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:434'
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 10ecdcee8eeb5ec3d9bc841c642b25f3823cb4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Kojek?= <gasper.kojek@gmail.com>
Date: Wed, 13 Dec 2023 14:58:24 +0100
Subject: [PATCH 3454/4969] Set remote build cache to push only if
 authenticated (#7924)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 examples/settings.gradle   | 2 +-
 settings.gradle            | 2 +-
 smoke-test/settings.gradle | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 96b241bb59f..5bc316e33f8 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -43,7 +43,7 @@ buildCache {
         enabled = !isCI
     }
     remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
         enabled = true
         url = 'https://ge.testcontainers.org/cache/'
         credentials {
diff --git a/settings.gradle b/settings.gradle
index 5b05dffbb97..a31f3a86530 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -41,7 +41,7 @@ buildCache {
         enabled = !isCI
     }
     remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
         enabled = true
         url = 'https://ge.testcontainers.org/cache/'
         credentials {
diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle
index 68ba54d2f13..b82f031e8ca 100644
--- a/smoke-test/settings.gradle
+++ b/smoke-test/settings.gradle
@@ -28,7 +28,7 @@ buildCache {
         enabled = !isCI
     }
     remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
         enabled = true
         url = 'https://ge.testcontainers.org/cache/'
         credentials {

From 93ab5987ad8bd1ec1c133439f7822959ae040d46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 22:35:28 +0000
Subject: [PATCH 3455/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.3-jre to 33.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5f68463bebb..18e231de6c6 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:32.1.3-jre'
+    api 'com.google.guava:guava:33.0.0-jre'
     api 'org.apache.commons:commons-lang3:3.14.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'

From 0e4a0df65ddd08d801782b9bc7c021e405f5efcf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 22:51:52 +0000
Subject: [PATCH 3456/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.16 to 3.16.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a31f3a86530..d062bb757d8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }

From 3a7b636a4714ac95243e8bf69ef1eb93ade18158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Przyby=C5=82?=
 <23506256+pioorg@users.noreply.github.com>
Date: Thu, 21 Dec 2023 17:52:38 +0100
Subject: [PATCH 3457/4969] Added note about node.js being required for
 ./gradlew spotlessApply (#7990)

---
 docs/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing.md b/docs/contributing.md
index 0edf9ffb05c..e771347bde9 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -8,7 +8,7 @@
     * follow the style, naming and structure conventions of the rest of the project.
     * make commits atomic and easy to merge.
     * when updating documentation, please see [our guidance for documentation contributions](contributing_docs.md).
-    * apply format running `./gradlew spotlessApply`
+    * apply format running `./gradlew spotlessApply` (this requires [Node.js](https://nodejs.org/) to be installed on your machine, one of the [package managers](https://nodejs.org/en/download/package-manager/) might be handy)
     * verify all tests are passing. Build the project with `./gradlew check` to do this.
     **N.B.** Gradle's Build Cache is enabled by default, but you can add `--no-build-cache` flag to disable it.
 

From 36c872749862918ddbf449f224aeadd8c87c0261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 21 Dec 2023 16:03:55 -0600
Subject: [PATCH 3458/4969] Update ryuk version to 0.6.0 (#7992)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 04a815926e0..01c68f4b8a3 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.5.1");
+        super("testcontainers/ryuk:0.6.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From b2de3d5cd282fc974e737eb9703237ec8121d301 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 22:05:39 +0000
Subject: [PATCH 3459/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /examples

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.12 to 4.4.13.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.12...4.4.13)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 0ed6609c203..181356ea8b3 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.12'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

From 6b261c263b5c9e314bf5655ffb0267e261f6dfc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 22:11:25 +0000
Subject: [PATCH 3460/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /modules/neo4j

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.12 to 4.4.13.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.12...4.4.13)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 7ac0d5071d9..0691e21ac9d 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.12'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From da0f9e07adb711e7b980ac1bc1e03dbe82f39466 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 22:13:13 +0000
Subject: [PATCH 3461/4969] Bump org.javassist:javassist in /modules/hivemq

Bumps [org.javassist:javassist](https://github.com/jboss-javassist/javassist) from 3.29.2-GA to 3.30.2-GA.
- [Release notes](https://github.com/jboss-javassist/javassist/releases)
- [Changelog](https://github.com/jboss-javassist/javassist/blob/master/Changes.md)
- [Commits](https://github.com/jboss-javassist/javassist/commits)

---
updated-dependencies:
- dependency-name: org.javassist:javassist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c23e6820fe5..885fea46995 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     shaded("org.apache.commons:commons-lang3:3.14.0")
     shaded("commons-io:commons-io:2.15.1")
-    shaded("org.javassist:javassist:3.29.2-GA")
+    shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")

From 1133e0eb5c7f43eed6d78ef27ebc0729c525dad1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 22:42:15 +0000
Subject: [PATCH 3462/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.3.1 to 3.3.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/3.3.1...3.3.2)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5ecb7fcd9d3..e3f33b0ca8a 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.3.1'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.3.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 36b8a2ed45c8e3127a0dd7f42ee3cdf9ae81cc23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:02:22 +0000
Subject: [PATCH 3463/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/db2

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index ac34f2c04b3..0d5532dd36c 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From fae5dcad5681ef674f6bc195c184eb51c2cf4e37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:09:49 +0000
Subject: [PATCH 3464/4969] Bump org.assertj:assertj-core in
 /modules/cockroachdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 59d91bb5ecb..82b55fd7e5e 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 4a5fd18c86b4b8e09e833a34491b9fbb953936d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:14:14 +0000
Subject: [PATCH 3465/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/rabbitmq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 77154dcf01f..020b8f5b449 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.20.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 40fcf820686b4758106d8a5e69beb5f605332e87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:14:19 +0000
Subject: [PATCH 3466/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/azure

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 9fa8958303f..87058e5727f 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'com.azure:azure-cosmos:4.53.1'
 }

From 15e641e1b49f5ea577c8689e22cd406bfc74a769 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:16:09 +0000
Subject: [PATCH 3467/4969] Bump org.assertj:assertj-core in
 /modules/database-commons

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 7382aa70333..9b125464596 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From c60c05b8c06f2a3f9c36f826e51ead41b0fcf7a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:17:09 +0000
Subject: [PATCH 3468/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/hivemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c23e6820fe5..94dccbde4ba 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.14")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 }
 

From c92e2e660789aa17da2a4224dd74653487960aef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:17:39 +0000
Subject: [PATCH 3469/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/kafka

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 0bdcee90f9f..01e3551e651 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From b9ac4a61110ca486248a3d2d324467aaccd366fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:20:49 +0000
Subject: [PATCH 3470/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/consul

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index b3cc5130018..9c1195525ff 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From b7bb4e040d01bf30fc6f73d5487b547e7418a134 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:23:52 +0000
Subject: [PATCH 3471/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/solace

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index d450525288d..eb40bab3989 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'com.solacesystems:sol-jcsmp:10.21.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'

From 1e2cad42244cb629cf69d85659fcd24039fa8dbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:27:09 +0000
Subject: [PATCH 3472/4969] Bump org.assertj:assertj-core in
 /modules/clickhouse

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 536e12c30cd..d013575def5 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 73b47e41c58193de41bc0fc24cba0aaa45d96ffc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:27:14 +0000
Subject: [PATCH 3473/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/solr

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index c3df3112379..d4305686141 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.2'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 737829b82e0b0dd59fcff7deaa5c0c2071cf9edb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:29:22 +0000
Subject: [PATCH 3474/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/nginx

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 363a6f08a96..406fc608f08 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:24.1.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 64ced1d3fac6aace8b20cc37de5c3e31170965ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:33:03 +0000
Subject: [PATCH 3475/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.5.1 to 3.5.2.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.5.1...java-client-3.5.2)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 0f9fe2ec96a..af32e530672 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.5.1'
+    testImplementation 'com.couchbase.client:java-client:3.5.2'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 045f12963b1df5fca0b9884c83ab1392b9784500 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:33:06 +0000
Subject: [PATCH 3476/4969] Bump org.assertj:assertj-core in /modules/couchbase

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 0f9fe2ec96a..9a9fbd28962 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'com.couchbase.client:java-client:3.5.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 41f9509edfed9af7959a4c71e656476e774b6b53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:38:33 +0000
Subject: [PATCH 3477/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/minio

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 427fd4b32e6..d53768d81e2 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("io.minio:minio:8.5.7")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 0d154080597b70afdc619754ff02865fde6145c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:38:57 +0000
Subject: [PATCH 3478/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/jdbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index fcfd162f269..da135935722 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.16'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }

From 7c933211401abaa0ce84d49b3e447478a977dce5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:39:12 +0000
Subject: [PATCH 3479/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/pulsar

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index d9bf6c7160b..47e82e964e4 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.1'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.1'
 }

From e75f4e5e20dcd538fc69f329d95c8818e5b6dcb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:39:15 +0000
Subject: [PATCH 3480/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/vault

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 1b2933a4817..5f8d85af7ec 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 
 }

From 9fc2347be0b39763782b74d9d28404f1431e74bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:40:42 +0000
Subject: [PATCH 3481/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/redpanda

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index effe156572c..0690bcde61c 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     shaded 'org.freemarker:freemarker:2.3.32'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From 913d44fc479996cdbf650f8121ed7d8ed4a1b444 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:42:57 +0000
Subject: [PATCH 3482/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/orientdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index a8b3e5c1387..af6c0172c6a 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.25"
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.25"
 }

From 365172c877a9024100aaa3cf64c66a546f3f797b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:44:42 +0000
Subject: [PATCH 3483/4969] Bump org.assertj:assertj-core in /modules/toxiproxy

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 8ec689de6be..36290b875a6 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,5 +5,5 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:3.0.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 1ca465663d7699d3feb37edb87ef9e2972c8d9bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:46:18 +0000
Subject: [PATCH 3484/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/selenium

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 6fb4c6dd949..af8d50cbb00 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 270001e674fd5c58d46fc643d501d0c9187ff2e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:52:23 +0000
Subject: [PATCH 3485/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/mongodb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index b085cdbc72d..c1b1f21b235 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:4.11.1")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }
 
 tasks.japicmp {

From 2aeb79166c00028d1a0959e78f0bbb9405c911e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:56:40 +0000
Subject: [PATCH 3486/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5f68463bebb..52efbb57b3b 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
-    api 'org.assertj:assertj-core:3.24.2'
+    api 'org.assertj:assertj-core:3.25.1'
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'

From b0395342c136889484235ac4ea06f376aa491898 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:58:06 +0000
Subject: [PATCH 3487/4969] Bump org.assertj:assertj-core in
 /modules/mockserver

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 6aabb760988..b12cae7ad4b 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 4ff8d1dc17d353b63ad5dda699f88acd78dfb763 Mon Sep 17 00:00:00 2001
From: Ivan Ponomarev <iponomarev@mail.ru>
Date: Mon, 15 Jan 2024 13:14:00 +0000
Subject: [PATCH 3488/4969] Keep semicolons after END when semicolon is not the
 separator (#8108)

---
 .../main/java/org/testcontainers/ext/ScriptSplitter.java | 2 +-
 .../java/org/testcontainers/ext/ScriptSplittingTest.java | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
index 888bf4df420..ba05b71e7bd 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
@@ -101,8 +101,8 @@ private boolean endOfBlock(boolean recursive) {
                     if (";".equals(scanner.getCurrentMatch())) {
                         if (recursive) {
                             sb.append(temporary);
-                            appendMatch();
                         }
+                        appendMatch();
                         return true;
                     }
                     sb.append(temporary);
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index 7b2068df672..baaf3bbd08c 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -320,12 +320,19 @@ public void testIfLoopBlocksSpecificSeparator() {
             "        IF something_wrong THEN LEAVE rec_loop; END IF;\n" +
             "        do_something_else;\n" +
             "    END LOOP;\n" +
-            "END",
+            "END;",
             "CALL something();"
         );
         splitAndCompare(script, expected, "@");
     }
 
+    @Test
+    public void oracleStyleBlocks() {
+        String script = "BEGIN END; /\n" + "BEGIN END;";
+        List<String> expected = Arrays.asList("BEGIN END;", "BEGIN END;");
+        splitAndCompare(script, expected, "/");
+    }
+
     @Test
     public void testMultiProcedureMySQLScript() {
         String script =

From c394ebf9b3902302d1bbfaa7d6c418792b8ce4bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:11:04 +0000
Subject: [PATCH 3489/4969] Bump io.asyncer:r2dbc-mysql from 1.0.5 to 1.0.6 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-1.0.5...r2dbc-mysql-1.0.6)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 4cdc977125d..a61819b1542 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:1.0.5'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.0.6'
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.5'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.6'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 775f52bff03fa461bf6ec07c58d8ac885629af73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:16:32 +0000
Subject: [PATCH 3490/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.23.0 to 4.24.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.23.0...4.24.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index c23e6820fe5..5ab5f15ab2f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.23.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.24.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.14")

From 20671313db3a7b8e75c52d8e2bd171841c63a9c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:16:52 +0000
Subject: [PATCH 3491/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.25 to 3.2.26.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.25...3.2.26)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index a8b3e5c1387..62602d8e8ab 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.25"
+    api "com.orientechnologies:orientdb-client:3.2.26"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'

From 2e86af8fac475a5bc97282909f9483ebdb336fff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:16:58 +0000
Subject: [PATCH 3492/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.25 to 3.2.26.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.25...3.2.26)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index a8b3e5c1387..ce81c2feeeb 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.25"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.26"
 }

From 07b66eb72bdb86fee8f41643787132d9ad916d16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:22:34 +0000
Subject: [PATCH 3493/4969] Bump org.questdb:questdb from 7.3.7 to 7.3.9 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 7.3.7 to 7.3.9.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/7.3.7...7.3.9)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 49ad003063d..770b1d05b46 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.3.7'
+    testImplementation 'org.questdb:questdb:7.3.9'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From f9dd2df2e79e352fc985e4d8d736a6f74dfff54c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:40:41 +0000
Subject: [PATCH 3494/4969] Bump io.trino:trino-jdbc from 434 to 436 in
 /modules/trino

Bumps io.trino:trino-jdbc from 434 to 436.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 5f33621683f..afa4e079663 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:434'
+    testRuntimeOnly 'io.trino:trino-jdbc:436'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From db5c36d3a8906bdfe0110b4c0705323290db9092 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:44:26 +0000
Subject: [PATCH 3495/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.16 to 10.1.18.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index fcfd162f269..6f4d73ce67b 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.16'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.18'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From b568db070aab03703bb419e9ef37adfd5eb57cb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:46:16 +0000
Subject: [PATCH 3496/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.3.0.RELEASE to 6.3.1.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/lettuce-io/lettuce-core/blob/6.3.1.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.3.0.RELEASE...6.3.1.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 29e2e9e8cd0..e588f8955dc 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.0.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.1.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 26ff4b9c974..36ddc9a28fe 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.0.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.1.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 05feaabc0c0..77991d80a99 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.0.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.1.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From fd2c9ae4534da7796dbce8e5f11b330e370fa128 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:53:24 +0000
Subject: [PATCH 3497/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.6.0...v3.6.2)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 68cdb300de6..48bd58551fe 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.0'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.2'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }

From cff1d577a83b1cfe894f91c155739fcd0e9b0701 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 22:58:44 +0000
Subject: [PATCH 3498/4969] Bump io.fabric8:kubernetes-client from 6.9.2 to
 6.10.0 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.9.2 to 6.10.0.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.9.2...v6.10.0)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 04dc12f3391..7699885e6b9 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.9.2'
+    testImplementation 'io.fabric8:kubernetes-client:6.10.0'
     testImplementation 'io.kubernetes:client-java:19.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 8881967a861c8688d27416b8ed773505edc15978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 23 Jan 2024 17:01:00 -0500
Subject: [PATCH 3499/4969] Disable testSolaceContainerWithCertificates

---
 .../org/testcontainers/solace/SolaceContainerSMFTest.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
index 57dc7ac0c19..8bfe27b2c4c 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -12,6 +12,7 @@
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,10 +50,11 @@ public void testSolaceContainerWithSimpleAuthentication() {
     }
 
     @Test
+    @Ignore("Generate new client certificates")
     public void testSolaceContainerWithCertificates() {
         try (
             // solaceContainerUsageSSL {
-            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.6")
                 .withClientCert(
                     MountableFile.forClasspathResource("solace.pem"),
                     MountableFile.forClasspathResource("rootCA.crt")

From 9de26f11b0904c376ae367db8c715ca2d9d12e9d Mon Sep 17 00:00:00 2001
From: Chad Wilson <chadw@thoughtworks.com>
Date: Wed, 24 Jan 2024 06:48:12 +0800
Subject: [PATCH 3500/4969] Fix default configuration file in mysql (#8131)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove use of deprecated (removed in 8.3) MySQL config option

* Update MySQL default images to latest

- 5.6 went EOL in Feb 2021. Stop testing against it.
- 5.7 went EOL in Oct 2023. Retain tests for a bit, but stop using it as the default.
- 8.0.34+ is now LTS rather than rolling - use this as the default for most tests
- Add 8.3.0 as a candidate "innovation" version which will eventually become LTS

* Updates various docs to use 8.0 in the examples rather than EOL 5.7.

* Update MariaDB images to latest 10.3 patch release

Fixes #8130

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 core/src/test/resources/compose-test.yml      |  2 +-
 .../test/resources/composev2/compose-test.yml |  2 +-
 .../generic/ImageNameSubstitutionTest.java    |  6 +--
 .../TestSpecificImageNameSubstitutor.java     |  2 +-
 docs/features/image_name_substitution.md      |  2 +-
 docs/features/reuse.md                        |  2 +-
 docs/modules/databases/jdbc.md                | 14 +++---
 docs/modules/databases/mysql.md               |  2 +-
 docs/modules/databases/r2dbc.md               |  6 +--
 .../jdbc/AbstractJDBCDriverTest.java          |  6 +--
 .../jdbc/ConnectionUrlDriversTests.java       |  2 +-
 .../jdbc/ConnectionUrlTest.java               | 10 ++--
 .../jdbc/MissingJdbcDriverTest.java           |  2 +-
 .../org/testcontainers/MariaDBTestImages.java |  2 +-
 .../MariaDBR2DBCDatabaseContainerTest.java    |  4 +-
 .../jdbc/mariadb/MariaDBJDBCDriverTest.java   | 14 +++---
 .../junit/mariadb/SimpleMariaDBTest.java      | 16 +++---
 .../somepath/mariadb_conf_override/my.cnf     | 12 ++---
 .../main/resources/mysql-default-conf/my.cnf  |  4 +-
 .../org/testcontainers/MySQLTestImages.java   |  6 +--
 .../containers/MySQLRootAccountTest.java      |  6 ++-
 .../jdbc/mysql/JDBCDriverWithPoolTest.java    |  2 +-
 .../MySQLDatabaseContainerDriverTest.java     |  2 +-
 .../jdbc/mysql/MySQLJDBCDriverTest.java       | 16 +++---
 .../junit/mysql/CustomizableMysqlTest.java    |  2 +-
 .../junit/mysql/MultiVersionMySQLTest.java    |  2 +-
 .../junit/mysql/SimpleMySQLTest.java          | 49 +++++++------------
 .../somepath/mysql_conf_override/my.cnf       | 14 +++---
 .../spock/SpockTestImages.groovy              |  2 +-
 29 files changed, 98 insertions(+), 113 deletions(-)

diff --git a/core/src/test/resources/compose-test.yml b/core/src/test/resources/compose-test.yml
index 9c5537e7cab..25c70940daa 100644
--- a/core/src/test/resources/compose-test.yml
+++ b/core/src/test/resources/compose-test.yml
@@ -1,6 +1,6 @@
 redis:
   image: redis
 db:
-  image: mysql:5.7.34
+  image: mysql:8.0.36
   environment:
     MYSQL_RANDOM_ROOT_PASSWORD: "true"
diff --git a/core/src/test/resources/composev2/compose-test.yml b/core/src/test/resources/composev2/compose-test.yml
index 181e7be1f32..9dab984e10e 100644
--- a/core/src/test/resources/composev2/compose-test.yml
+++ b/core/src/test/resources/composev2/compose-test.yml
@@ -2,6 +2,6 @@ services:
   redis:
     image: redis
   db:
-    image: mysql:8.0.33
+    image: mysql:8.0.36
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "true"
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
index afbe38fe835..ce17637cb83 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ImageNameSubstitutionTest.java
@@ -12,9 +12,9 @@ public void simpleExample() {
         try (
             // spotless:off
             // directDockerHubReference {
-            // Referring directly to an image on Docker Hub (mysql:8.0.24)
+            // Referring directly to an image on Docker Hub (mysql:8.0.36)
             final MySQLContainer<?> mysql = new MySQLContainer<>(
-                DockerImageName.parse("mysql:8.0.24")
+                DockerImageName.parse("mysql:8.0.36")
             )
             // start the container and use it for testing
             // }
@@ -36,7 +36,7 @@ public void substitutedExample() {
             // hardcodedMirror {
             // Referring directly to an image on a private registry - image name will vary
             final MySQLContainer<?> mysql = new MySQLContainer<>(
-                DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.24")
+                DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.36")
                     .asCompatibleSubstituteFor("mysql")
             )
             // start the container and use it for testing
diff --git a/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
index 01f6fdcb4f0..6955d49454b 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
@@ -12,7 +12,7 @@ public class TestSpecificImageNameSubstitutor extends ImageNameSubstitutor {
 
     @Override
     public DockerImageName apply(final DockerImageName original) {
-        if (original.equals(DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.24"))) {
+        if (original.equals(DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.36"))) {
             return DockerImageName.parse("mysql");
         } else {
             return original;
diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
index f3c78c1f309..cf2b09d3d8e 100644
--- a/docs/features/image_name_substitution.md
+++ b/docs/features/image_name_substitution.md
@@ -53,7 +53,7 @@ Consider this if:
 
 * Developers and CI machines need to use different image names. For example, developers are able to pull images from Docker Hub, but CI machines need to pull from a private registry
 * Your private registry has copies of images from Docker Hub where the names are predictable, and just adding a prefix is enough. 
-  For example, `registry.mycompany.com/mirror/mysql:8.0.24` can be derived from the original Docker Hub image name (`mysql:8.0.24`) with a consistent prefix string: `registry.mycompany.com/mirror/`
+  For example, `registry.mycompany.com/mirror/mysql:8.0.36` can be derived from the original Docker Hub image name (`mysql:8.0.36`) with a consistent prefix string: `registry.mycompany.com/mirror/`
 
 In this case, image name references in code are **unchanged**.
 i.e. you would leave as-is:
diff --git a/docs/features/reuse.md b/docs/features/reuse.md
index 01eeee51376..b36669876c2 100644
--- a/docs/features/reuse.md
+++ b/docs/features/reuse.md
@@ -30,5 +30,5 @@ GenericContainer container = new GenericContainer("redis:6-alpine")
 ### Reusable Container with Testcontainers JDBC URL
 
 If using the [Testcontainers JDBC URL support](../../modules/databases/jdbc#database-containers-launched-via-jdbc-url-scheme)
-the URL **must** follow the pattern of `jdbc:tc:mysql:5.7.34:///databasename?TC_REUSABLE=true`.
+the URL **must** follow the pattern of `jdbc:tc:mysql:8.0.36:///databasename?TC_REUSABLE=true`.
 `TC_REUSABLE=true` is set as a parameter of the JDBC URL.
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index ab4baa75e22..dc11954153a 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -20,7 +20,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 !!! note
     We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
-    From Testcontainers' perspective, `jdbc:mysql:5.7.34://localhost:3306/databasename` and `jdbc:mysql:5.7.34:///databasename` is the same URI.
+    From Testcontainers' perspective, `jdbc:mysql:8.0.36://localhost:3306/databasename` and `jdbc:mysql:8.0.36:///databasename` is the same URI.
 
 !!! warning
     If you're using the JDBC URL support, there is no need to instantiate an instance of the container - Testcontainers will do it automagically.
@@ -45,11 +45,11 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using MariaDB
 
-`jdbc:tc:mariadb:10.2.14:///databasename`
+`jdbc:tc:mariadb:10.3.39:///databasename`
 
 #### Using MySQL
 
-`jdbc:tc:mysql:5.7.34:///databasename`
+`jdbc:tc:mysql:8.0.36:///databasename`
 
 #### Using MSSQL Server
 
@@ -92,7 +92,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
 
-`jdbc:tc:mysql:5.7.34:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
+`jdbc:tc:mysql:8.0.36:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
 
 This is useful if you have a fixed script for setting up database schema, etc.
 
@@ -100,13 +100,13 @@ This is useful if you have a fixed script for setting up database schema, etc.
 
 If the init script path is prefixed `file:`, it will be loaded from a file (relative to the working directory, which will usually be the project root).
 
-`jdbc:tc:mysql:5.7.34:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
+`jdbc:tc:mysql:8.0.36:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
 
 ### Using an init function
 
 Instead of running a fixed script for DB setup, it may be useful to call a Java function that you define. This is intended to allow you to trigger database schema migration tools. To do this, add TC_INITFUNCTION to the URL as follows, passing a full path to the class name and method:
 
- `jdbc:tc:mysql:5.7.34:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
+ `jdbc:tc:mysql:8.0.36:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
 
 The init function must be a public static method which takes a `java.sql.Connection` as its only parameter, e.g.
 ```java
@@ -121,7 +121,7 @@ public class JDBCDriverTest {
 
 By default database container is being stopped as soon as last connection is closed. There are cases when you might need to start container and keep it running till you stop it explicitly or JVM is shutdown. To do this, add `TC_DAEMON` parameter to the URL as follows:
 
- `jdbc:tc:mysql:5.7.34:///databasename?TC_DAEMON=true`
+ `jdbc:tc:mysql:8.0.36:///databasename?TC_DAEMON=true`
 
 With this parameter database container will keep running even when there're no open connections.
 
diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index 6e6265e91ba..9d03d52b109 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -7,7 +7,7 @@ See [Database containers](./index.md) for documentation and usage that is common
 For MySQL databases, it is possible to override configuration settings using resources on the classpath. Assuming `somepath/mysql_conf_override`
 is a directory on the classpath containing .cnf files, the following URL can be used:
 
-  `jdbc:tc:mysql:5.7.34://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override`
+  `jdbc:tc:mysql:8.0.36://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override`
 
 Any .cnf files in this classpath directory will be mapped into the database container's /etc/mysql/conf.d directory,
 and will be able to override server settings when the container starts.
diff --git a/docs/modules/databases/r2dbc.md b/docs/modules/databases/r2dbc.md
index b3ae250ac0f..22c76e83dd8 100644
--- a/docs/modules/databases/r2dbc.md
+++ b/docs/modules/databases/r2dbc.md
@@ -22,7 +22,7 @@ The started container will be terminated when the `ConnectionFactory` is closed.
 **Note that, unlike Testcontainers' JDBC URL support, it is not possible to specify an image tag in the 'scheme' part of the URL, and it is always necessary to specify a tag using `TC_IMAGE_TAG`.**
 
 So that the URL becomes:  
-`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.7.34`
+`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=8.0.36`
 
 !!! note
     We will use `///` (host-less URIs) from now on to emphasis the unimportance of the `host:port` pair.  
@@ -35,11 +35,11 @@ So that the URL becomes:
 
 #### Using MySQL
 
-`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=5.7.34`
+`r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=8.0.36`
 
 #### Using MariaDB
 
-`r2dbc:tc:mariadb:///databasename?TC_IMAGE_TAG=10.3.6`
+`r2dbc:tc:mariadb:///databasename?TC_IMAGE_TAG=10.3.39`
 
 #### Using PostgreSQL
 
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index a152a1ae550..a22b4e24ed0 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -204,13 +204,13 @@ private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException
     private void performTestForCustomIniFile(HikariDataSource dataSource) throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
         Statement statement = dataSource.getConnection().createStatement();
-        statement.execute("SELECT @@GLOBAL.innodb_file_format");
+        statement.execute("SELECT @@GLOBAL.innodb_max_undo_log_size");
         ResultSet resultSet = statement.getResultSet();
 
         assertThat(resultSet.next()).as("The query returns a result").isTrue();
-        String result = resultSet.getString(1);
+        long result = resultSet.getLong(1);
 
-        assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
+        assertThat(result).as("The InnoDB max undo log size has been set by the ini file content").isEqualTo(20000000);
     }
 
     private HikariDataSource getDataSource(String jdbcUrl, int poolSize) {
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index da1268acdca..394451bc6a9 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -35,7 +35,7 @@ public class ConnectionUrlDriversTests {
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
-                { "jdbc:tc:mysql:5.7.34://hostname/test", "mysql", Optional.of("5.7.34"), "hostname/test", "test" },
+                { "jdbc:tc:mysql:8.0.36://hostname/test", "mysql", Optional.of("8.0.36"), "hostname/test", "test" },
                 { "jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test" },
                 {
                     "jdbc:tc:postgresql:1.2.3://hostname/test",
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index fa50dbbe76e..123690d95f6 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -13,11 +13,11 @@ public class ConnectionUrlTest {
 
     @Test
     public void testConnectionUrl1() {
-        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d";
+        String urlString = "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertThat(url.getDatabaseType()).as("Database Type value is as expected").isEqualTo("mysql");
-        assertThat(url.getImageTag()).as("Database Image tag value is as expected").contains("5.7.34");
+        assertThat(url.getImageTag()).as("Database Image tag value is as expected").contains("8.0.36");
         assertThat(url.getDbHostString())
             .as("Database Host String is as expected")
             .isEqualTo("somehostname:3306/databasename");
@@ -71,7 +71,7 @@ public void testTmpfsOption() {
     @Test
     public void testInitScriptPathCapture() {
         String urlString =
-            "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
+            "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertThat(url.getInitScriptPath())
@@ -91,7 +91,7 @@ public void testInitScriptPathCapture() {
     @Test
     public void testInitFunctionCapture() {
         String urlString =
-            "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
+            "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertThat(url.getInitFunction()).as("Init Function parameter exists").isPresent();
@@ -106,7 +106,7 @@ public void testInitFunctionCapture() {
 
     @Test
     public void testDaemonCapture() {
-        String urlString = "jdbc:tc:mysql:5.7.34://somehostname:3306/databasename?a=b&c=d&TC_DAEMON=true";
+        String urlString = "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_DAEMON=true";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
         assertThat(url.isInDaemonMode()).as("Daemon flag is set to true.").isTrue();
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
index 379b262aa3a..9f6b354818d 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -43,7 +43,7 @@ static class MissingDriverContainer extends JdbcDatabaseContainer {
         private final AtomicInteger connectionAttempts = new AtomicInteger();
 
         MissingDriverContainer() {
-            super(DockerImageName.parse("mysql:5.7.34"));
+            super(DockerImageName.parse("mysql:8.0.36"));
             withEnv("MYSQL_ROOT_PASSWORD", "test");
             withExposedPorts(3306);
         }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java b/modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java
index 7d18f2f8365..de5360cb57c 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/MariaDBTestImages.java
@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface MariaDBTestImages {
-    DockerImageName MARIADB_IMAGE = DockerImageName.parse("mariadb:10.3.6");
+    DockerImageName MARIADB_IMAGE = DockerImageName.parse("mariadb:10.3.39");
 }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
index f2339b0e5f9..0f4acd889d5 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java
@@ -13,11 +13,11 @@ protected ConnectionFactoryOptions getOptions(MariaDBContainer<?> container) {
 
     @Override
     protected String createR2DBCUrl() {
-        return "r2dbc:tc:mariadb:///db?TC_IMAGE_TAG=10.3.6";
+        return "r2dbc:tc:mariadb:///db?TC_IMAGE_TAG=10.3.39";
     }
 
     @Override
     protected MariaDBContainer<?> createContainer() {
-        return new MariaDBContainer<>(DockerImageName.parse("mariadb:10.3.6"));
+        return new MariaDBContainer<>(DockerImageName.parse("mariadb:10.3.39"));
     }
 }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
index ffb26f19734..9d903ab3965 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
@@ -19,29 +19,29 @@ public static Iterable<Object[]> data() {
                     "jdbc:tc:mariadb://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
-                { "jdbc:tc:mariadb:10.2.14://hostname/databasename", EnumSet.noneOf(Options.class) },
+                { "jdbc:tc:mariadb:10.3.39://hostname/databasename", EnumSet.noneOf(Options.class) },
                 {
-                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mariadb.sql&useUnicode=yes&characterEncoding=utf8",
+                    "jdbc:tc:mariadb:10.3.39://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mariadb.sql&useUnicode=yes&characterEncoding=utf8",
                     EnumSet.of(Options.CharacterSet),
                 },
                 {
-                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql",
+                    "jdbc:tc:mariadb:10.3.39://hostname/databasename?user=someuser&TC_INITSCRIPT=somepath/init_mariadb.sql",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    "jdbc:tc:mariadb:10.3.39://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mariadb.sql",
+                    "jdbc:tc:mariadb:10.3.39://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mariadb.sql",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    "jdbc:tc:mariadb:10.3.39://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mariadb:10.2.14://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override",
+                    "jdbc:tc:mariadb:10.3.39://hostname/databasename?TC_MY_CNF=somepath/mariadb_conf_override",
                     EnumSet.of(Options.CustomIniFile),
                 },
             }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index fff2386a2df..1b6996f5478 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -39,7 +39,7 @@ public void testSimple() throws SQLException {
     public void testSpecificVersion() throws SQLException {
         try (
             MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>(
-                MariaDBTestImages.MARIADB_IMAGE.withTag("5.5.51")
+                MariaDBTestImages.MARIADB_IMAGE.withTag("10.3.39")
             )
         ) {
             mariadbOldVersion.start();
@@ -49,7 +49,7 @@ public void testSpecificVersion() throws SQLException {
 
             assertThat(resultSetString)
                 .as("The database version can be set using a container rule parameter")
-                .startsWith("5.5.51");
+                .startsWith("10.3.39");
         }
     }
 
@@ -59,7 +59,7 @@ public void testMariaDBWithCustomIniFile() throws SQLException {
 
         try (
             MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(
-                MariaDBTestImages.MARIADB_IMAGE.withTag("10.1.16")
+                MariaDBTestImages.MARIADB_IMAGE.withTag("10.3.39")
             )
                 .withConfigurationOverride("somepath/mariadb_conf_override")
         ) {
@@ -107,7 +107,7 @@ public void testWithOnlyUserReadableCustomIniFile() throws Exception {
 
         try (
             MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(
-                MariaDBTestImages.MARIADB_IMAGE.withTag("10.1.16")
+                MariaDBTestImages.MARIADB_IMAGE.withTag("10.3.39")
             )
                 .withConfigurationOverride("somepath/mariadb_conf_override")
         ) {
@@ -133,9 +133,11 @@ public void testWithOnlyUserReadableCustomIniFile() throws Exception {
     }
 
     private void assertThatCustomIniFileWasUsed(MariaDBContainer<?> mariadb) throws SQLException {
-        try (ResultSet resultSet = performQuery(mariadb, "SELECT @@GLOBAL.innodb_file_format")) {
-            String result = resultSet.getString(1);
-            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
+        try (ResultSet resultSet = performQuery(mariadb, "SELECT @@GLOBAL.innodb_max_undo_log_size")) {
+            long result = resultSet.getLong(1);
+            assertThat(result)
+                .as("The InnoDB max undo log size has been set by the ini file content")
+                .isEqualTo(20000000);
         }
     }
 }
diff --git a/modules/mariadb/src/test/resources/somepath/mariadb_conf_override/my.cnf b/modules/mariadb/src/test/resources/somepath/mariadb_conf_override/my.cnf
index dcba17aff5c..c997afbfebc 100644
--- a/modules/mariadb/src/test/resources/somepath/mariadb_conf_override/my.cnf
+++ b/modules/mariadb/src/test/resources/somepath/mariadb_conf_override/my.cnf
@@ -9,16 +9,12 @@ sort_buffer_size = 64K
 read_buffer_size = 256K
 read_rnd_buffer_size = 256K
 net_buffer_length = 2K
-thread_stack = 128K
+thread_stack = 512K
 skip-host-cache
 skip-name-resolve
 
-
-innodb_file_format=Barracuda
-
-
-
-
+# This configuration is custom to test whether config override works
+innodb_max_undo_log_size = 20000000
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
@@ -52,4 +48,4 @@ innodb_buffer_pool_size = 16M
 innodb_log_file_size = 5M
 innodb_log_buffer_size = 8M
 innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
\ No newline at end of file
+innodb_lock_wait_timeout = 50
diff --git a/modules/mysql/src/main/resources/mysql-default-conf/my.cnf b/modules/mysql/src/main/resources/mysql-default-conf/my.cnf
index d608cb9c923..6fc2129357f 100644
--- a/modules/mysql/src/main/resources/mysql-default-conf/my.cnf
+++ b/modules/mysql/src/main/resources/mysql-default-conf/my.cnf
@@ -11,7 +11,7 @@ sort_buffer_size = 64K
 read_buffer_size = 256K
 read_rnd_buffer_size = 256K
 net_buffer_length = 2K
-skip-host-cache
+host_cache_size = 0
 skip-name-resolve
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
@@ -46,4 +46,4 @@ innodb_buffer_pool_size = 16M
 innodb_log_file_size = 5M
 innodb_log_buffer_size = 8M
 innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
\ No newline at end of file
+innodb_lock_wait_timeout = 50
diff --git a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
index 81de83be0b9..2254754f2c2 100644
--- a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
+++ b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
@@ -4,9 +4,9 @@
 
 public class MySQLTestImages {
 
-    public static final DockerImageName MYSQL_56_IMAGE = DockerImageName.parse("mysql:5.6.51");
+    public static final DockerImageName MYSQL_57_IMAGE = DockerImageName.parse("mysql:5.7.44");
 
-    public static final DockerImageName MYSQL_57_IMAGE = DockerImageName.parse("mysql:5.7.34");
+    public static final DockerImageName MYSQL_80_IMAGE = DockerImageName.parse("mysql:8.0.36");
 
-    public static final DockerImageName MYSQL_80_IMAGE = DockerImageName.parse("mysql:8.0.24");
+    public static final DockerImageName MYSQL_INNOVATION_IMAGE = DockerImageName.parse("mysql:8.3.0");
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
index 0320eee9255..51ba5257fa3 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
@@ -18,7 +18,11 @@ public class MySQLRootAccountTest {
 
     @Parameterized.Parameters(name = "{0}")
     public static DockerImageName[] params() {
-        return new DockerImageName[] { MySQLTestImages.MYSQL_80_IMAGE, MySQLTestImages.MYSQL_57_IMAGE };
+        return new DockerImageName[] {
+            MySQLTestImages.MYSQL_57_IMAGE,
+            MySQLTestImages.MYSQL_80_IMAGE,
+            MySQLTestImages.MYSQL_INNOVATION_IMAGE,
+        };
     }
 
     @Parameterized.Parameter
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
index 254f58807b7..be48f623183 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
@@ -33,7 +33,7 @@
 public class JDBCDriverWithPoolTest {
 
     public static final String URL =
-        "jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.mysql.JDBCDriverWithPoolTest::sampleInitFunction";
+        "jdbc:tc:mysql:8.0.36://hostname/databasename?TC_INITFUNCTION=org.testcontainers.jdbc.mysql.JDBCDriverWithPoolTest::sampleInitFunction";
 
     private final DataSource dataSource;
 
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
index 7155e49dd48..7f5cf5eae1d 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
@@ -16,7 +16,7 @@ public class MySQLDatabaseContainerDriverTest {
     @Test
     public void shouldRespectBothUrlPropertiesAndParameterProperties() throws SQLException {
         ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
-        String url = "jdbc:tc:mysql:5.7.22://hostname/databasename?padCharsWithSpace=true";
+        String url = "jdbc:tc:mysql:8.0.36://hostname/databasename?padCharsWithSpace=true";
         Properties properties = new Properties();
         properties.setProperty("maxRows", "1");
 
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
index 752fbca8e07..526c2ab522c 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
@@ -20,29 +20,29 @@ public static Iterable<Object[]> data() {
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    "jdbc:tc:mysql:8.0.36://hostname/databasename?user=someuser&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql",
+                    "jdbc:tc:mysql:8.0.36://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=somepath/init_mysql.sql",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql",
+                    "jdbc:tc:mysql:8.0.36://hostname/databasename?user=someuser&password=somepwd&TC_INITSCRIPT=file:sql/init_mysql.sql",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mysql:5.7.34://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
+                    "jdbc:tc:mysql:8.0.36://hostname/databasename?user=someuser&password=somepwd&TC_INITFUNCTION=org.testcontainers.jdbc.AbstractJDBCDriverTest::sampleInitFunction",
                     EnumSet.of(Options.ScriptedSchema, Options.JDBCParams),
                 },
                 {
-                    "jdbc:tc:mysql:5.7.34://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8",
+                    "jdbc:tc:mysql:8.0.36://hostname/databasename?TC_INITSCRIPT=somepath/init_unicode_mysql.sql&useUnicode=yes&characterEncoding=utf8",
                     EnumSet.of(Options.CharacterSet),
                 },
-                { "jdbc:tc:mysql:5.7.34://hostname/databasename", EnumSet.noneOf(Options.class) },
-                { "jdbc:tc:mysql:5.7.34://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class) },
+                { "jdbc:tc:mysql:8.0.36://hostname/databasename", EnumSet.noneOf(Options.class) },
+                { "jdbc:tc:mysql:8.0.36://hostname/databasename?useSSL=false", EnumSet.noneOf(Options.class) },
                 {
-                    "jdbc:tc:mysql:5.6.51://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override",
+                    "jdbc:tc:mysql:8.0.36://hostname/databasename?TC_MY_CNF=somepath/mysql_conf_override",
                     EnumSet.of(Options.CustomIniFile),
                 },
             }
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
index f0a4f5d24ea..e756631d8e1 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
@@ -22,7 +22,7 @@ public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
     public void testSimple() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
         try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withDatabaseName(DB_NAME)
                 .withUsername(USER)
                 .withPassword(PWD)
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index 8a6c17c538e..4c8516cc5cc 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -19,9 +19,9 @@ public class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
     @Parameterized.Parameters(name = "{0}")
     public static DockerImageName[] params() {
         return new DockerImageName[] {
-            MySQLTestImages.MYSQL_56_IMAGE,
             MySQLTestImages.MYSQL_57_IMAGE,
             MySQLTestImages.MYSQL_80_IMAGE,
+            MySQLTestImages.MYSQL_INNOVATION_IMAGE,
         };
     }
 
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index b45585642a1..3db8da76673 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -34,27 +34,10 @@ public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(SimpleMySQLTest.class);
 
-    /*
-     * Ordinarily you wouldn't try and run multiple containers simultaneously - this is just used for testing.
-     * To avoid memory issues with the default, low memory, docker machine setup, we instantiate only one container
-     * at a time, inside the test methods themselves.
-     */
-    /*
-    @ClassRule
-    public static MySQLContainer<?> mysql = new MySQLContainer<>(MYSQL_IMAGE);
-
-    @ClassRule
-    public static MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(DockerImageName.parse("mysql:5.5");)
-
-    @ClassRule
-    public static MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(DockerImageName.parse("mysql:5.6"))
-                                                            .withConfigurationOverride("somepath/mysql_conf_override");
-    */
-
     @Test
     public void testSimple() throws SQLException {
         try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
             mysql.start();
@@ -70,7 +53,7 @@ public void testSimple() throws SQLException {
     @Test
     public void testSpecificVersion() throws SQLException {
         try (
-            MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+            MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
@@ -81,14 +64,14 @@ public void testSpecificVersion() throws SQLException {
 
             assertThat(resultSetString)
                 .as("The database version can be set using a container rule parameter")
-                .startsWith("5.6");
+                .startsWith("8.0");
         }
     }
 
     @Test
     public void testMySQLWithCustomIniFile() throws SQLException {
         try (
-            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
         ) {
             mysqlCustomConfig.start();
@@ -100,7 +83,7 @@ public void testMySQLWithCustomIniFile() throws SQLException {
     @Test
     public void testCommandOverride() throws SQLException {
         try (
-            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withCommand("mysqld --auto_increment_increment=42")
         ) {
             mysqlCustomConfig.start();
@@ -115,7 +98,7 @@ public void testCommandOverride() throws SQLException {
     @Test
     public void testExplicitInitScript() throws SQLException {
         try (
-            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withInitScript("somepath/init_mysql.sql")
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
@@ -131,7 +114,7 @@ public void testExplicitInitScript() throws SQLException {
     @Test(expected = ContainerLaunchException.class)
     public void testEmptyPasswordWithNonRootUser() {
         try (
-            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withDatabaseName("TEST")
                 .withUsername("test")
                 .withPassword("")
@@ -146,7 +129,7 @@ public void testEmptyPasswordWithNonRootUser() {
     public void testEmptyPasswordWithRootUser() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
         try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withDatabaseName("foo")
                 .withUsername("root")
                 .withPassword("")
@@ -163,7 +146,7 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamTimeZone() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("serverTimezone", "Europe/Zurich")
             .withEnv("TZ", "Europe/Zurich")
             .withLogConsumer(new Slf4jLogConsumer(logger));
@@ -198,7 +181,7 @@ public void testWithAdditionalUrlParamTimeZone() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
         mysql.start();
@@ -223,7 +206,7 @@ public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE)
+        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withUrlParam("rewriteBatchedStatements", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
@@ -244,7 +227,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     public void testWithOnlyUserReadableCustomIniFile() throws Exception {
         assumeThat(FileSystems.getDefault().supportedFileAttributeViews().contains("posix")).isTrue();
         try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_56_IMAGE)
+            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
@@ -274,9 +257,11 @@ private void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer<?> mysq
     }
 
     private void assertThatCustomIniFileWasUsed(MySQLContainer<?> mysql) throws SQLException {
-        try (ResultSet resultSet = performQuery(mysql, "SELECT @@GLOBAL.innodb_file_format")) {
-            String result = resultSet.getString(1);
-            assertThat(result).as("The InnoDB file format has been set by the ini file content").isEqualTo("Barracuda");
+        try (ResultSet resultSet = performQuery(mysql, "SELECT @@GLOBAL.innodb_max_undo_log_size")) {
+            long result = resultSet.getLong(1);
+            assertThat(result)
+                .as("The InnoDB max undo log size has been set by the ini file content")
+                .isEqualTo(20000000);
         }
     }
 }
diff --git a/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf b/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
index 78012cc4bfe..5721bf52ccb 100644
--- a/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
+++ b/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
@@ -1,5 +1,6 @@
 [mysqld]
 user = mysql
+datadir = /var/lib/mysql
 port   		= 3306
 #socket 		= /tmp/mysql.sock
 skip-external-locking
@@ -10,14 +11,11 @@ sort_buffer_size = 64K
 read_buffer_size = 256K
 read_rnd_buffer_size = 256K
 net_buffer_length = 2K
-thread_stack = 128K
-
-
-innodb_file_format=Barracuda
-
-
-
+host_cache_size = 0
+skip-name-resolve
 
+# This configuration is custom to test whether config override works
+innodb_max_undo_log_size = 20000000
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
@@ -51,4 +49,4 @@ innodb_buffer_pool_size = 16M
 innodb_log_file_size = 5M
 innodb_log_buffer_size = 8M
 innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
\ No newline at end of file
+innodb_lock_wait_timeout = 50
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
index bea0a974c89..43cda0b3313 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -3,7 +3,7 @@ package org.testcontainers.spock
 import org.testcontainers.utility.DockerImageName
 
 interface SpockTestImages {
-	DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:5.7.34")
+	DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:8.0.36")
 	DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
 	DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
 	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16")

From afc94f158b431c78576440b5d777c674834daa22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 23 Jan 2024 18:52:33 -0500
Subject: [PATCH 3501/4969] Add support for ActiveMQ and Artemis (#7400)

The following implementations have been added:
* `ActiveMQContainer` supports [ActiveMQ](https://hub.docker.com/r/apache/activemq-classic)
* `ArtemisContainer` supports [Artemis](https://hub.docker.com/r/apache/activemq-artemis)
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  4 +
 .github/settings.yml                          |  3 +
 docs/modules/activemq.md                      | 57 ++++++++++++
 mkdocs.yml                                    |  1 +
 modules/activemq/build.gradle                 | 22 +++++
 .../activemq/ActiveMQContainer.java           | 85 ++++++++++++++++++
 .../activemq/ArtemisContainer.java            | 85 ++++++++++++++++++
 .../activemq/ActiveMQContainerTest.java       | 74 ++++++++++++++++
 .../activemq/ArtemisContainerTest.java        | 86 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 ++++
 14 files changed, 441 insertions(+)
 create mode 100644 docs/modules/activemq.md
 create mode 100644 modules/activemq/build.gradle
 create mode 100644 modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java
 create mode 100644 modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java
 create mode 100644 modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
 create mode 100644 modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
 create mode 100644 modules/activemq/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 135c8323866..81e3dbbd900 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -14,6 +14,7 @@ body:
       description: Which Testcontainers module are you using?
       options:
         - Core
+        - ActiveMQ
         - Azure
         - Cassandra
         - Clickhouse
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index d77b4ce07a2..d073f8f1674 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -14,6 +14,7 @@ body:
       description: For which Testcontainers module does the enhancement proposal apply?
       options:
         - Core
+        - ActiveMQ
         - Azure
         - Cassandra
         - Clickhouse
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 65a27e5f99a..dedccecd4e5 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -14,6 +14,7 @@ body:
       description: Is this feature related to any of the existing modules?
       options:
         - Core
+        - ActiveMQ
         - Azure
         - Cassandra
         - Clickhouse
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3cb3e0fd222..e3506109406 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -31,6 +31,11 @@ updates:
     open-pull-requests-limit: 10
 
 # Explicit entry for each module
+  - package-ecosystem: "gradle"
+    directory: "/modules/activemq"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/azure"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index eec54b67829..e3bce388744 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -15,6 +15,10 @@
       - gradle/wrapper/*
       - gradlew
       - gradlew.bat
+"modules/activemq":
+  - changed-files:
+      - any-glob-to-any-file:
+          - modules/activemq/**/*
 "modules/azure":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 863590895a0..3047612d756 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -106,6 +106,9 @@ labels:
   - name: help wanted
     color: '#fef2c0'
 
+  - name: modules/activemq
+    color: '#006b75'
+
   - name: modules/azure
     color: '#006b75'
 
diff --git a/docs/modules/activemq.md b/docs/modules/activemq.md
new file mode 100644
index 00000000000..6f1ef2e9252
--- /dev/null
+++ b/docs/modules/activemq.md
@@ -0,0 +1,57 @@
+# ActiveMQ
+
+Testcontainers module for [ActiveMQ](https://hub.docker.com/r/apache/activemq-classic) and
+[Artemis](https://hub.docker.com/r/apache/activemq-artemis).
+
+## ActiveMQContainer's usage examples
+
+You can start an ActiveMQ Classic container instance from any Java application by using:
+
+<!--codeinclude-->
+[Default ActiveMQ container](../../modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+With custom credentials:
+
+<!--codeinclude-->
+[Setting custom credentials](../../modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java) inside_block:settingCredentials
+<!--/codeinclude-->
+
+## ArtemisContainer's usage examples
+
+You can start an ActiveMQ Artemis container instance from any Java application by using:
+
+<!--codeinclude-->
+[Default Artemis container](../../modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+With custom credentials:
+
+<!--codeinclude-->
+[Setting custom credentials](../../modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java) inside_block:settingCredentials
+<!--/codeinclude-->
+
+With anonymous login:
+
+<!--codeinclude-->
+[Allow anonymous login](../../modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java) inside_block:enableAnonymousLogin
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:activemq:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>activemq</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 43645183075..0e93da9827b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -73,6 +73,7 @@ nav:
                 - modules/databases/tidb.md
                 - modules/databases/trino.md
                 - modules/databases/yugabytedb.md
+          - modules/activemq.md
           - modules/azure.md
           - modules/consul.md
           - modules/docker_compose.md
diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
new file mode 100644
index 00000000000..ebd2b2de0bc
--- /dev/null
+++ b/modules/activemq/build.gradle
@@ -0,0 +1,22 @@
+description = "Testcontainers :: ActiveMQ"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation "org.apache.activemq:activemq-client-jakarta:5.18.2"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.29.0"
+}
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
+}
diff --git a/modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java b/modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java
new file mode 100644
index 00000000000..14814d95da9
--- /dev/null
+++ b/modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java
@@ -0,0 +1,85 @@
+package org.testcontainers.activemq;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+
+/**
+ * Testcontainers implementation for Apache ActiveMQ.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Console: 8161</li>
+ *     <li>TCP: 61616</li>
+ *     <li>AMQP: 5672</li>
+ *     <li>STOMP: 61613</li>
+ *     <li>MQTT: 1883</li>
+ *     <li>WS: 61614</li>
+ * </ul>
+ */
+public class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("apache/activemq-classic");
+
+    private static final int WEB_CONSOLE_PORT = 8161;
+
+    private static final int TCP_PORT = 61616;
+
+    private static final int AMQP_PORT = 5672;
+
+    private static final int STOMP_PORT = 61613;
+
+    private static final int MQTT_PORT = 1883;
+
+    private static final int WS_PORT = 61614;
+
+    private String username;
+
+    private String password;
+
+    public ActiveMQContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public ActiveMQContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE);
+
+        withExposedPorts(WEB_CONSOLE_PORT, TCP_PORT, AMQP_PORT, STOMP_PORT, MQTT_PORT, WS_PORT);
+        waitingFor(Wait.forLogMessage(".*Apache ActiveMQ.*started.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
+    }
+
+    @Override
+    protected void configure() {
+        if (this.username != null) {
+            addEnv("ACTIVEMQ_CONNECTION_USER", this.username);
+        }
+        if (this.password != null) {
+            addEnv("ACTIVEMQ_CONNECTION_PASSWORD", this.password);
+        }
+    }
+
+    public ActiveMQContainer withUser(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public ActiveMQContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    public String getBrokerUrl() {
+        return String.format("tcp://%s:%s", getHost(), getMappedPort(TCP_PORT));
+    }
+
+    public String getUser() {
+        return this.username;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+}
diff --git a/modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java b/modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java
new file mode 100644
index 00000000000..7d4918a9306
--- /dev/null
+++ b/modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java
@@ -0,0 +1,85 @@
+package org.testcontainers.activemq;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+
+/**
+ * Testcontainers implementation for Apache ActiveMQ Artemis.
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Console: 8161</li>
+ *     <li>TCP: 61616</li>
+ *     <li>HORNETQ: 5445</li>
+ *     <li>AMQP: 5672</li>
+ *     <li>STOMP: 61613</li>
+ *     <li>MQTT: 1883</li>
+ *     <li>WS: 61614</li>
+ * </ul>
+ */
+public class ArtemisContainer extends GenericContainer<ArtemisContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("apache/activemq-artemis");
+
+    private static final int WEB_CONSOLE_PORT = 8161;
+
+    // CORE,MQTT,AMQP,HORNETQ,STOMP,OPENWIRE
+    private static final int TCP_PORT = 61616;
+
+    private static final int HORNETQ_STOMP_PORT = 5445;
+
+    private static final int AMQP_PORT = 5672;
+
+    private static final int STOMP_PORT = 61613;
+
+    private static final int MQTT_PORT = 1883;
+
+    private static final int WS_PORT = 61614;
+
+    private String username = "artemis";
+
+    private String password = "artemis";
+
+    public ArtemisContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public ArtemisContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE);
+
+        withExposedPorts(WEB_CONSOLE_PORT, TCP_PORT, HORNETQ_STOMP_PORT, AMQP_PORT, STOMP_PORT, MQTT_PORT, WS_PORT);
+        waitingFor(Wait.forLogMessage(".*HTTP Server started.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
+    }
+
+    @Override
+    protected void configure() {
+        withEnv("ARTEMIS_USER", this.username);
+        withEnv("ARTEMIS_PASSWORD", this.password);
+    }
+
+    public ArtemisContainer withUser(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public ArtemisContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    public String getBrokerUrl() {
+        return String.format("tcp://%s:%s", getHost(), getMappedPort(TCP_PORT));
+    }
+
+    public String getUser() {
+        return getEnvMap().get("ARTEMIS_USER");
+    }
+
+    public String getPassword() {
+        return getEnvMap().get("ARTEMIS_PASSWORD");
+    }
+}
diff --git a/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
new file mode 100644
index 00000000000..3ccd7acf2b1
--- /dev/null
+++ b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
@@ -0,0 +1,74 @@
+package org.testcontainers.activemq;
+
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
+import lombok.SneakyThrows;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ActiveMQContainerTest {
+
+    @Test
+    public void test() throws JMSException {
+        try ( // container {
+            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
+            // }
+        ) {
+            activemq.start();
+
+            assertThat(activemq.getUser()).isNull();
+            assertThat(activemq.getPassword()).isNull();
+            assertFunctionality(activemq, false);
+        }
+    }
+
+    @Test
+    public void customCredentials() {
+        try (
+            // settingCredentials {
+            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
+                .withUser("testcontainers")
+                .withPassword("testcontainers")
+            // }
+        ) {
+            activemq.start();
+
+            assertThat(activemq.getUser()).isEqualTo("testcontainers");
+            assertThat(activemq.getPassword()).isEqualTo("testcontainers");
+            assertFunctionality(activemq, true);
+        }
+    }
+
+    @SneakyThrows
+    private void assertFunctionality(ActiveMQContainer activemq, boolean useCredentials) {
+        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(activemq.getBrokerUrl());
+        Connection connection;
+        if (useCredentials) {
+            connection = connectionFactory.createConnection(activemq.getUser(), activemq.getPassword());
+        } else {
+            connection = connectionFactory.createConnection();
+        }
+        connection.start();
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        Destination destination = session.createQueue("test-queue");
+        MessageProducer producer = session.createProducer(destination);
+
+        String contentMessage = "Testcontainers";
+        TextMessage message = session.createTextMessage(contentMessage);
+        producer.send(message);
+
+        MessageConsumer consumer = session.createConsumer(destination);
+        TextMessage messageReceived = (TextMessage) consumer.receive();
+        assertThat(messageReceived.getText()).isEqualTo(contentMessage);
+    }
+}
diff --git a/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java b/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
new file mode 100644
index 00000000000..cce4b319afd
--- /dev/null
+++ b/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
@@ -0,0 +1,86 @@
+package org.testcontainers.activemq;
+
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
+import lombok.SneakyThrows;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ArtemisContainerTest {
+
+    @Test
+    public void defaultCredentials() {
+        try (
+            // container {
+            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
+            // }
+        ) {
+            artemis.start();
+
+            assertThat(artemis.getUser()).isEqualTo("artemis");
+            assertThat(artemis.getPassword()).isEqualTo("artemis");
+            assertFunctionality(artemis, false);
+        }
+    }
+
+    @Test
+    public void customCredentials() {
+        try (
+            // settingCredentials {
+            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
+                .withUser("testcontainers")
+                .withPassword("testcontainers")
+            // }
+        ) {
+            artemis.start();
+
+            assertThat(artemis.getUser()).isEqualTo("testcontainers");
+            assertThat(artemis.getPassword()).isEqualTo("testcontainers");
+            assertFunctionality(artemis, false);
+        }
+    }
+
+    @Test
+    public void allowAnonymousLogin() {
+        try (
+            // enableAnonymousLogin {
+            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
+                .withEnv("ANONYMOUS_LOGIN", "true")
+            // }
+        ) {
+            artemis.start();
+
+            assertFunctionality(artemis, true);
+        }
+    }
+
+    @SneakyThrows
+    private void assertFunctionality(ArtemisContainer artemis, boolean anonymousLogin) {
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(artemis.getBrokerUrl());
+        if (!anonymousLogin) {
+            connectionFactory.setUser(artemis.getUser());
+            connectionFactory.setPassword(artemis.getPassword());
+        }
+        Connection connection = connectionFactory.createConnection();
+        connection.start();
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        Destination destination = session.createQueue("test-queue");
+        MessageProducer producer = session.createProducer(destination);
+
+        String contentMessage = "Testcontainers";
+        TextMessage message = session.createTextMessage(contentMessage);
+        producer.send(message);
+
+        MessageConsumer consumer = session.createConsumer(destination);
+        TextMessage messageReceived = (TextMessage) consumer.receive();
+        assertThat(messageReceived.getText()).isEqualTo(contentMessage);
+    }
+}
diff --git a/modules/activemq/src/test/resources/logback-test.xml b/modules/activemq/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/activemq/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 4b12b32321fa026c1afb4ca7b0dd56bab4fd1538 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:53:11 +0000
Subject: [PATCH 3502/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.21.43 to 2.23.9.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 22d152b74b8..6f142803e99 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.21.43'
+    testImplementation 'software.amazon.awssdk:s3:2.23.9'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 4df81e776a0cbbb082883838f255c75e8dbd6ef7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:53:13 +0000
Subject: [PATCH 3503/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.15 to 7.17.17.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.15...v7.17.17)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index b880f570a18..16089172b6a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.2"
-    testImplementation "org.elasticsearch.client:transport:7.17.15"
+    testImplementation "org.elasticsearch.client:transport:7.17.17"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From d14f3b50b435f43bc7e801d746733fa8de3aba19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:53:17 +0000
Subject: [PATCH 3504/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps [org.apache.activemq:artemis-jakarta-client](https://github.com/apache/activemq-artemis) from 2.29.0 to 2.31.2.
- [Commits](https://github.com/apache/activemq-artemis/compare/2.29.0...2.31.2)

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index ebd2b2de0bc..e2d7abce04f 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation "org.apache.activemq:activemq-client-jakarta:5.18.2"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.29.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.31.2"
 }
 
 test {

From 8740fa9d46f14d7379bba6b5dbb85c2d17bf31bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:53:19 +0000
Subject: [PATCH 3505/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.609 to 1.12.643.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.609...1.12.643)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5dd58582b3e..0edd981bb61 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.609'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.609'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 1dc37d396aa6a2031826189bf6791a70a49d37d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:53:22 +0000
Subject: [PATCH 3506/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/activemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index ebd2b2de0bc..4e38e7af65d 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation "org.apache.activemq:activemq-client-jakarta:5.18.2"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.29.0"
 }

From 558b09343088b48c871bd7a5826fd00821dec443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:53:26 +0000
Subject: [PATCH 3507/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.16.1 to 4.17.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.17.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 699f2e7f007..ff0dee41b0c 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.16.1"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.17.0"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 

From 91a8238a95e7dd98a01843352c2533f263be66e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:53:33 +0000
Subject: [PATCH 3508/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.16.1 to 4.17.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.17.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 071a03c5973..785ab026b39 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.16.1')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.17.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From c7f200d1381f3856802c12208662bc67d017ff67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:55:44 +0000
Subject: [PATCH 3509/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 5617300b32a..2db5ab9373b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -120,12 +120,12 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.24.2'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.25.1'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 6a3beb3d0621117d02a384186fc69154545551cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:55:48 +0000
Subject: [PATCH 3510/4969] Bump org.gradle.toolchains:foojay-resolver in
 /examples

Bumps org.gradle.toolchains:foojay-resolver from 0.7.0 to 0.8.0.

---
updated-dependencies:
- dependency-name: org.gradle.toolchains:foojay-resolver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a31f3a86530..ba28de85ce2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
-        classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
+        classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }
 }
 

From 98da38c6fa30be2b2a9b74998bdaa36e920f3424 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:55:54 +0000
Subject: [PATCH 3511/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/gcloud

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index bb82a316f5b..78dede6cf51 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub'
     testImplementation 'com.google.cloud:google-cloud-spanner'
     testImplementation 'com.google.cloud:google-cloud-bigtable'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From e5848d07a2ed3b65a455cab00eb2f55a28e211b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:56:00 +0000
Subject: [PATCH 3512/4969] Bump org.assertj:assertj-core in
 /modules/junit-jupiter

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 646fde0b3dc..95e0e7b1223 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'

From 29e3f4fc78f4f02bd4024ca016f1af356e33c0f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:56:09 +0000
Subject: [PATCH 3513/4969] Bump org.assertj:assertj-core in /modules/cassandra

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 005281fb366..79492c044db 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
     testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From bdef933bec45cb28525d740dc45b2411b0c4327a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:56:18 +0000
Subject: [PATCH 3514/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
 in /modules/influxdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index c8cd0dacfa5..00eb0259d6d 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.23'
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'org.influxdb:influxdb-java:2.23'
     testImplementation "com.influxdb:influxdb-client-java:6.11.0"
 }

From 253b6b4a85f7ae52ef6a0d50ac419b7f9ed82d57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:56:28 +0000
Subject: [PATCH 3515/4969] Bump io.nats:jnats from 2.17.1 to 2.17.2 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.17.1 to 2.17.2.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.17.1...2.17.2)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 25bea188b68..b01288000dc 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.17.1'
+    testImplementation 'io.nats:jnats:2.17.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

From a23cf5dffb6a35995174e01f4070f748ec7f95f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:56:32 +0000
Subject: [PATCH 3516/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin in /examples

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.12 to 1.12.1.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 5bc316e33f8..041e9ac89c9 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
     }
 }
 

From 4a8738a9d204cf9797b8b96cbfecbc0fa6f03032 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:01:46 +0000
Subject: [PATCH 3517/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.11.0 to 6.12.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v6.11.0...v6.12.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index c8cd0dacfa5..3352f9be34a 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.influxdb:influxdb-java:2.23'
-    testImplementation "com.influxdb:influxdb-client-java:6.11.0"
+    testImplementation "com.influxdb:influxdb-client-java:6.12.0"
 }

From 2e829ba5db1f493b2c587545c2d9373d4fc7b2d5 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Wed, 24 Jan 2024 16:06:37 +0100
Subject: [PATCH 3518/4969] Clarify Neo4j enterprise edition definition in docs
 (#8149)

---
 docs/modules/databases/neo4j.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index dddf5c4e8f8..17c58c7edff 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -1,9 +1,12 @@
 # Neo4j Module
 
-This module helps running [Neo4j](https://neo4j.com/download/) using Testcontainers.
+This module helps to run [Neo4j](https://neo4j.com/download/) using Testcontainers.
 
 Note that it's based on the [official Docker image](https://hub.docker.com/_/neo4j/) provided by Neo4j, Inc.
 
+Even though the latest LTS version of Neo4j 4.4 is used in the examples of this documentation,
+the Testcontainers integration supports also newer 5.x images of Neo4j.
+
 ## Usage example
 
 Declare your Testcontainers as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
@@ -17,7 +20,7 @@ The following example uses the JUnit 5 extension `@Testcontainers` and demonstra
 [JUnit 5 example](../../../examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java) inside_block:junitExample
 <!--/codeinclude-->
 
-You are not limited to Unit tests and can of course use an instance of the Neo4j Testcontainers in vanilla Java code as well.
+You are not limited to Unit tests, and you can use an instance of the Neo4j Testcontainers in vanilla Java code as well.
 
 ## Additional features
 
@@ -102,9 +105,13 @@ If you need the Neo4j enterprise license, you can declare your Neo4j container l
 [Enterprise edition](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:enterpriseEdition
 <!--/codeinclude-->
 
-This creates a Testcontainers based on the Docker image build with the Enterprise version of Neo4j. 
+This creates a Testcontainers based on the Docker image build with the Enterprise version of Neo4j 4.4. 
 The call to `withEnterpriseEdition` adds the required environment variable that you accepted the terms and condition of the enterprise version.
-You accept those by adding a file named `container-license-acceptance.txt` to the root of your classpath containing the text `neo4j:3.5.0-enterprise` in one line.
+You accept those by adding a file named `container-license-acceptance.txt` to the root of your classpath containing the text `neo4j:4.4-enterprise` in one line.
+
+If you are planning to run a newer Neo4j 5.x enterprise edition image, you have to manually define the proper enterprise image (e.g. `neo4j:5-enterprise`)
+and set the environment variable `NEO4J_ACCEPT_LICENSE_AGREEMENT` by adding `.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes")` to your container definition.
+
 You'll find more information about licensing Neo4j here: [About Neo4j Licenses](https://neo4j.com/licensing/).
 
 
@@ -131,7 +138,7 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
     
     === "Gradle"
         ```groovy
-        compile "org.neo4j.driver:neo4j-java-driver:4.4.3"
+        compile "org.neo4j.driver:neo4j-java-driver:4.4.13"
         ```
     
     === "Maven"
@@ -139,6 +146,6 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>4.4.3</version>
+            <version>4.4.13</version>
         </dependency>
         ```

From 65a78d1628bba0311bbe22dc869152c628b5a752 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:58:17 +0000
Subject: [PATCH 3519/4969] Bump org.apache.pulsar:pulsar-client-admin in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client-admin](https://github.com/apache/pulsar) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.1.1...v3.1.2)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 47e82e964e4..e8c6b5c9a03 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.1'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.2'
 }

From 70252a5b96c64f492d3c576325e134257671bd22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:58:23 +0000
Subject: [PATCH 3520/4969] Bump org.apache.curator:curator-framework in
 /examples

Bumps [org.apache.curator:curator-framework](https://github.com/apache/curator) from 5.5.0 to 5.6.0.
- [Commits](https://github.com/apache/curator/compare/apache-curator-5.5.0...apache-curator-5.6.0)

---
updated-dependencies:
- dependency-name: org.apache.curator:curator-framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/zookeeper/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index c7ae7143137..e3f1b650554 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.apache.curator:curator-framework:5.5.0'
+    testImplementation 'org.apache.curator:curator-framework:5.6.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From 982d9c3179c7d9221a031651cd6d2bec55604c83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:58:33 +0000
Subject: [PATCH 3521/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.2
 in /modules/dynalite

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 0edd981bb61..be947cc349e 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From f98f831c3f27a2ae7c35a6aa4004001c5517c125 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:58:37 +0000
Subject: [PATCH 3522/4969] Bump org.apache.pulsar:pulsar-client in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client](https://github.com/apache/pulsar) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.1.1...v3.1.2)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 47e82e964e4..40edac13685 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.2'
 }

From 54c47e9fea415473493d869528ea96a67f423692 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:58:48 +0000
Subject: [PATCH 3523/4969] Bump org.assertj:assertj-core in
 /modules/localstack

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 6f142803e99..97c5ad9ce35 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'software.amazon.awssdk:s3:2.23.9'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From d6899ec526f382a2ca49ceb5a1e21bfca56dbff8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:58:50 +0000
Subject: [PATCH 3524/4969] Bump org.assertj:assertj-core in
 /modules/elasticsearch

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 16089172b6a..d5bbdd91053 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.2"
     testImplementation "org.elasticsearch.client:transport:7.17.17"
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 17c4701a85a20b2c12cda1ee60123dcd5b43e4a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:59:00 +0000
Subject: [PATCH 3525/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.2
 in /modules/neo4j

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 0691e21ac9d..8619cbc6940 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 24e2cb79a411d30e1f3a245d0a401aded2e96686 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:59:04 +0000
Subject: [PATCH 3526/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.2
 in /examples

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle       | 2 +-
 docs/examples/junit4/redis/build.gradle         | 2 +-
 docs/examples/junit5/redis/build.gradle         | 2 +-
 examples/cucumber/build.gradle                  | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/neo4j-container/build.gradle           | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/selenium-container/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/solr-container/build.gradle            | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 test-support/build.gradle                       | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index ff0dee41b0c..83bf6d2244f 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.17.0"
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index e588f8955dc..58862221c28 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 36ddc9a28fe..1ffa1c92648 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 785ab026b39..9164a44c9be 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index e0d9ee1ce56..74771e0e02b 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index d62839464cb..27d0bcea9e2 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 170c14da9f8..2653c2da0b4 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index c5ea630be63..7a3aa7156d9 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index b01288000dc..e4b73de63c4 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.17.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 181356ea8b3..ab4fcec66c1 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 2faa8d20238..1a3f717d506 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testng:testng:7.5.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 080a7812051..8ab9cac5ed9 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 286c2376a5a..d7b8c85510e 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 0ad74df4e31..c37b815e6cc 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index e01400ddcd2..11cb89351e9 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index cf95e2be051..739a418c995 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index c7ae7143137..42e64e170a6 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.5.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 9a1ed6ad774..857f0fdf681 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.36'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 2ecb2f0bf56c373207d78ce765d219cae8e02d3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:59:08 +0000
Subject: [PATCH 3527/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.2
 in /modules/k3s

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 7699885e6b9..70c8124fa6d 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -10,5 +10,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:6.10.0'
     testImplementation 'io.kubernetes:client-java:19.0.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 42e8286bc26ade49d9afc9762ef988525065744a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:59:11 +0000
Subject: [PATCH 3528/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.2
 in /modules/r2dbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 48bd58551fe..d6d5fcc267d 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,10 +11,10 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.6.2'
-    testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
+    testFixturesImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 55a4eb85778c78df661a3a17fe999ef1cfc0e079 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:59:11 +0000
Subject: [PATCH 3529/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.11.2 to 8.12.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.11.2...v8.12.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 16089172b6a..74b0345647f 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.12.0"
     testImplementation "org.elasticsearch.client:transport:7.17.17"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 5cb91b62033de0ea2cee8ae74dde78e059bac03c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:59:19 +0000
Subject: [PATCH 3530/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.28.0 to 26.30.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.28.0...v26.30.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 78dede6cf51..30f74c94b70 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.28.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.30.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 945d489a93bb6aec5e9781995d90c142056ee89f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:59:43 +0000
Subject: [PATCH 3531/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.25.2
 in /modules/questdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 770b1d05b46..1850ed0fe34 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation project(':jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.questdb:questdb:7.3.9'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From 34297b6bde715c9c8d02ab64fecc046ad9db601c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:08:37 +0000
Subject: [PATCH 3532/4969] Bump com.azure:azure-cosmos from 4.53.1 to 4.54.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.53.1 to 4.54.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.53.1...azure-cosmos_4.54.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 87058e5727f..7a3da191f05 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'com.azure:azure-cosmos:4.53.1'
+    testImplementation 'com.azure:azure-cosmos:4.54.0'
 }

From 2d37a36293ef594290d5e249c53cee2f93513642 Mon Sep 17 00:00:00 2001
From: InfoShare Devs <tomito14@interia.pl>
Date: Wed, 24 Jan 2024 22:04:30 +0100
Subject: [PATCH 3533/4969] New Solace certificates for integration test
 (#8160)

certificate valid until 2200

Co-authored-by: Tomasz Forys <tomasz.forys@contractors.roche.com>
---
 .../solace/SolaceContainerSMFTest.java        |   2 -
 modules/solace/src/test/resources/client.pfx  | Bin 3550 -> 3558 bytes
 modules/solace/src/test/resources/rootCA.crt  |  38 +++++++++---------
 modules/solace/src/test/resources/solace.pem  |  38 +++++++++---------
 modules/solace/src/test/resources/truststore  | Bin 987 -> 1287 bytes
 5 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
index 8bfe27b2c4c..d7ccd94998e 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -12,7 +12,6 @@
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,7 +49,6 @@ public void testSolaceContainerWithSimpleAuthentication() {
     }
 
     @Test
-    @Ignore("Generate new client certificates")
     public void testSolaceContainerWithCertificates() {
         try (
             // solaceContainerUsageSSL {
diff --git a/modules/solace/src/test/resources/client.pfx b/modules/solace/src/test/resources/client.pfx
index a9885184321701f63de7d9efdff6cebb0eb4f208..e4d0a8de4492d95a0dda0634285bd62f10ec93e9 100644
GIT binary patch
delta 3454
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

delta 3446
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
YF-PLhX<I}$1y?}?2u5pH^5`TwVkKshivR!s

diff --git a/modules/solace/src/test/resources/rootCA.crt b/modules/solace/src/test/resources/rootCA.crt
index c3a19fc580c..f30b3663471 100644
--- a/modules/solace/src/test/resources/rootCA.crt
+++ b/modules/solace/src/test/resources/rootCA.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDmDCCAoCgAwIBAgIIVP5+fnVAfbwwDQYJKoZIhvcNAQELBQAwRjELMAkGA1UE
+MIIDmjCCAoKgAwIBAgIIVP5+fnVAfbwwDQYJKoZIhvcNAQELBQAwRjELMAkGA1UE
 BhMCUEwxFzAVBgNVBAoTDnRlc3Rjb250YWluZXJzMR4wHAYDVQQDExV0ZXN0Y29u
-dGFpbmVycy1zb2xhY2UwHhcNMjMwMTIzMTgyMzAwWhcNMzMwMTIzMTgyMzAwWjBG
-MQswCQYDVQQGEwJQTDEXMBUGA1UEChMOdGVzdGNvbnRhaW5lcnMxHjAcBgNVBAMT
-FXRlc3Rjb250YWluZXJzLXNvbGFjZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAK9ujwg3eAuwbEodmjJ/3O2Sy1+OBZ0BNiampBhrfSRs5Fg0GkwCZPB5
-QZ0byQKtN0bDqtIWs4W1ujRjrf/0rjKktFsU/6fMMiGiDGcvB/5wiZuFMPPP4gBv
-axP5kCacDbnKwdxQVYoQwWUcrLWMju/NXYDiu/pZ1umClyd40Sv0CTpLibNxdY7Y
-HGSRzcAqMu4Uc1szyhI2+u2hg0VbOiKuky/eACBMOEHW/sfYO1bXYM4+jPbLSQCi
-XvUyUUwG1aCkcOkTjkm6WBXj0twyO9W0vOx6Nnq1wUUqL534qIeLu22R+Fz8LjCG
-b33klaCoiJNmp0Xg/rTPsyP4lOW5gsECAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTbxXlb6cfHBCCHI7w7UCDiD6/VvDALBgNVHQ8EBAMCAoww
-FAYDVR0RBA0wC4IJbG9jYWxob3N0MBEGCWCGSAGG+EIBAQQEAwIABzAeBglghkgB
-hvhCAQ0EERYPeGNhIGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBCwUAA4IBAQBbJUg2
-4+xZjswaJDCFR/pm54tzuTA1BIskXHY95P7sj7EtefzmHqXq79/uvpgjCBbQFzgR
-qbXd+S/s9qYu0Bn2VYx3ba2Ch9J2gyNfz3J3GWUbx51uRfgf2T3MZslq5jqCxjUR
-VWU7of8Imlg30JOMEi0Eseqi/I1mFfZb0dv4Vc7mAZOz6FWEkhwOhzQJcpY/9J7H
-g843lmbU//fNmsTytHgjNKbawdk3cDWawfjqdfoLVzwT8L5CyvPMZYIO1DT0nLFb
-wYQxMirrvH5dfKmHdgqE0orA3yTVFbtUEygRwuCKhZFNXisEO+gll0px4UYt+STl
-A4zogvmOijwjgwuo
+dGFpbmVycy1zb2xhY2UwIBcNMjQwMTI0MTYyNDAwWhgPMjIwMDAxMDEwMDAwMDBa
+MEYxCzAJBgNVBAYTAlBMMRcwFQYDVQQKEw50ZXN0Y29udGFpbmVyczEeMBwGA1UE
+AxMVdGVzdGNvbnRhaW5lcnMtc29sYWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr26PCDd4C7BsSh2aMn/c7ZLLX44FnQE2JqakGGt9JGzkWDQaTAJk
+8HlBnRvJAq03RsOq0hazhbW6NGOt//SuMqS0WxT/p8wyIaIMZy8H/nCJm4Uw88/i
+AG9rE/mQJpwNucrB3FBVihDBZRystYyO781dgOK7+lnW6YKXJ3jRK/QJOkuJs3F1
+jtgcZJHNwCoy7hRzWzPKEjb67aGDRVs6Iq6TL94AIEw4Qdb+x9g7Vtdgzj6M9stJ
+AKJe9TJRTAbVoKRw6ROOSbpYFePS3DI71bS87Ho2erXBRSovnfioh4u7bZH4XPwu
+MIZvfeSVoKiIk2anReD+tM+zI/iU5bmCwQIDAQABo4GJMIGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFNvFeVvpx8cEIIcjvDtQIOIPr9W8MAsGA1UdDwQEAwIC
+jDAUBgNVHREEDTALgglsb2NhbGhvc3QwEQYJYIZIAYb4QgEBBAQDAgAHMB4GCWCG
+SAGG+EIBDQQRFg94Y2EgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQELBQADggEBAGiI
+7qyjIx6ssKi04pKi0cuUZWI+JeY/+nkLEXN9dgbSchFcVJMpV8l9VVqINNFt9LMX
+aTzQLnjUYop6osHA16zF9WViVJ8LUzwec70A4J5gA3tiebLNWCoAp7v5+dRPUc8r
+0oi4QTP4Siu6kVjZFNWuuezUZyaVz+rZuEe+rVWyNakIiAzIacaK3FBAtcCYcF2L
+2CjHCCsrRgmmvkRydGsr0pJEub9wxY4kVzQS07CwB0OMxllZm65ZtVdpPWh4f3GG
+/bB6kL9InDfHfSleKG60HpEPGqwWFm6VQxQVIOoumyP1WDp3ix+u0u5Y/Mo6hakm
+LplIUWZWT4rv/NaB/Rw=
 -----END CERTIFICATE-----
diff --git a/modules/solace/src/test/resources/solace.pem b/modules/solace/src/test/resources/solace.pem
index 947c0102e45..08afbf7b45e 100644
--- a/modules/solace/src/test/resources/solace.pem
+++ b/modules/solace/src/test/resources/solace.pem
@@ -26,24 +26,24 @@ dfzJcdlJqMDfuHDFle+fO0Ahfp3j/BYSZFf7jAzo/jMVh32siYiq6C6MawzknwsS
 nUBfPFBD84Fkv5YaD0TT48p7YUANFL18Roq1PjezPdmkn7T8Nuaz2g==
 -----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIDpzCCAo+gAwIBAgIIIFE70OcBFc8wDQYJKoZIhvcNAQELBQAwRjELMAkGA1UE
+MIIDqTCCApGgAwIBAgIIIFE70OcBFc8wDQYJKoZIhvcNAQELBQAwRjELMAkGA1UE
 BhMCUEwxFzAVBgNVBAoTDnRlc3Rjb250YWluZXJzMR4wHAYDVQQDExV0ZXN0Y29u
-dGFpbmVycy1zb2xhY2UwHhcNMjMwMTIzMTgyODAwWhcNMjQwMTIzMTgyODAwWjA5
-MRcwFQYDVQQKEw50ZXN0Y29udGFpbmVyczEeMBwGA1UEAxMVdGVzdGNvbnRhaW5l
-cnMtc29sYWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA43Us+KsR
-Z218C8JAzB7LiF5dhx95F/spQzkiFgSNJ97215GoSIPzDWm1ac4wTGZR1YHiTk2P
-EFHk21TeJi5sODGHqR0G0Qr2IweSz52Zs5h0p+XwO3x55In/Dx+jIMdOR9HfuU05
-WlYSTWXdwFyq9VmmXK+ViJ0pZE9X18E1Qtm27S6vFIckdEKswh17DCKMQ6kRMDkL
-we7yOoBYPAFw0R46o3PXAuVHbkI/3ewn/aopOQ+4I0dqTxp7m7spdIanT+oSd5EN
-4G1a/oTYPO67qbcq/SIgWLHR/iT2dOE28ftAco64+N5ds5wz5a0JL7CwIdxcgSsn
-dsBSR+hM5cC5kwIDAQABo4GlMIGiMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFE+Q
-HiDtU9dHWo/dnPUdKgC2z7vnMAsGA1UdDwQEAwID6DAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwFAYDVR0RBA0wC4IJbG9jYWxob3N0MBEGCWCGSAGG+EIB
-AQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRlMA0GCSqGSIb3
-DQEBCwUAA4IBAQAb43HdEsj2hV8YrfKDjsRzs0AIwqhwsbeCr+uTXHGUoAV+yh38
-3Dmy6yj4H8OsqiAcQeOSAtORg7YcybcQky9puWd+26iaNGZQVe3qZ7Hx16ZJlywy
-pavx9W/n/EywIUUIfxuOp+KgmFs71OrVPzEBKfNckTTuLHskt1UCfpAuOexnOTV2
-Y79t3vwqrBqK3neZDFTvYQHAchTfr9KJWWZ8caAj+dTFrhjrjgfW+lDlj9489H6U
-Gq2yxL+nHjclGaTA02+qzSahPL8LaHpGiwWTdbWZzetrOoac/2RlWNjex8vbH37N
-pS6zTyCwVPd1WNTqJEPKsmw79nQKqg4O5LOs
+dGFpbmVycy1zb2xhY2UwIBcNMjQwMTI0MTYyNDAwWhgPMjIwMDAxMDEwMDAwMDBa
+MDkxFzAVBgNVBAoTDnRlc3Rjb250YWluZXJzMR4wHAYDVQQDExV0ZXN0Y29udGFp
+bmVycy1zb2xhY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjdSz4
+qxFnbXwLwkDMHsuIXl2HH3kX+ylDOSIWBI0n3vbXkahIg/MNabVpzjBMZlHVgeJO
+TY8QUeTbVN4mLmw4MYepHQbRCvYjB5LPnZmzmHSn5fA7fHnkif8PH6Mgx05H0d+5
+TTlaVhJNZd3AXKr1WaZcr5WInSlkT1fXwTVC2bbtLq8UhyR0QqzCHXsMIoxDqREw
+OQvB7vI6gFg8AXDRHjqjc9cC5UduQj/d7Cf9qik5D7gjR2pPGnubuyl0hqdP6hJ3
+kQ3gbVr+hNg87ruptyr9IiBYsdH+JPZ04Tbx+0Byjrj43l2znDPlrQkvsLAh3FyB
+Kyd2wFJH6EzlwLmTAgMBAAGjgaUwgaIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
+T5AeIO1T10daj92c9R0qALbPu+cwCwYDVR0PBAQDAgPoMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAUBgNVHREEDTALgglsb2NhbGhvc3QwEQYJYIZIAYb4
+QgEBBAQDAgZAMB4GCWCGSAGG+EIBDQQRFg94Y2EgY2VydGlmaWNhdGUwDQYJKoZI
+hvcNAQELBQADggEBADyiXuXEx/Cka/xDxUmluYprTMubhf2Tt840WtXODoqa6mK0
+L74M18fvOeRL6G1ufzyrOUg5kt+0vyS8LlNmPJ/F7RbFvJ7Ca+vFVChi6NLag5U7
+Xp6bdI7jwLKiP1Sh+AyucZafW9k+e3PO4beAJqYHmYxsLtXmnYlWFL/6VoYACpTu
+6qFYenAecqQAs49Ujs5y9l0IRC8Hj9ZcPVf63BTceAdiPqwUhIctD4vB6v1pTwjb
+CaQxJLY5P3sQNkvMMSK29p03EJOMZ4oVt09RBBEm1YwwUA5pp/JaxJvRlMgnTNHs
+h6xQyX9XEWS9cNUa2VktBEq1eoIg/njpnbiGvDo=
 -----END CERTIFICATE-----
diff --git a/modules/solace/src/test/resources/truststore b/modules/solace/src/test/resources/truststore
index 502cd12e5216545af75c8d93510dca183d9bafa8..153079a424223089629070e78a211a2628b0ff18 100644
GIT binary patch
literal 1287
zcmV+i1^D_ff&~Kt0Ru3C1iS_bDuzgg_YDCD0ic2etptJusW5^Br7(g7p#}*mhDe6@
z4FLxRpn?RFFoFb*0s#Opf&_;K2`Yw2hW8Bt2LUi<1_>&LNQU<f0R;^(Sui*T2`Yw2
zhW8Bt1q?7N1Qa_!nYmP{SPiL7fS#8Ef6itMtjq!eClCSwATSID2r7n1hW8Bu2?YQ!
z9R>+thDZTr0|Wso1Q4r%-rycYmaOQ4siJ^9svm%Y1P~~SK~|F%edK1o%yHCKTG}*0
z@t%r}K%OOtufAC^DR}9|LkcZ6Z>Hf2#2av4-d{n=g1&4P?al}QZ@f2TtE)p=Q~mCf
zy0OFDBon`srwalP4<UF5N`Dij$Jm5T^pg;XJBy!Y*EBAj6-RZ@;8QH!6FY{&Zu=Pq
zRtaTCmUgADEZ%2GZg>RS3EP4|?}BNt#S<{H20I!?!6D!%K;MIWK8#_pF`60cb<{3n
z1X*jGrait;gte|vsgurOHItvIdHW8GO9|JwRC{=py^>R;ec`+c@Agr&2TGZ9A3@Ki
z|1M$)Mg&m7aG_MM9Tz8Q?UoXdu#DeaDCGCt89v0i@9DV2emgcmKZ?xZfHkO&hHx{A
ze`SE|@p0&+5*W{nQ>w@Tbs1)3gSHRPCog6RMsp)d;lGw=PTv!bC<4m?6HHexQ*|!6
zRYlnh_9iP21Rk2ykTCPG|H;R}V4O41Tc;<OYO@SSMrZQXOZxmc?u{zC7E;m;Vq|Fx
z7MtD{{l3)Eb?<aN7+zB1Fpw$8TJeI@JD9Op*?MW4rY|l;o;|Gi5AiBaH4mu_#X|<B
zbs@FGXvAL>-Ak_tEwcWBcJ<KqI&Y?hhq3_v=(Z!BJcd8~5nRylzkx=s_vcwgnrmW1
zN<*khWzfRJV{5>S4+vrl(~Ujx!uMW}2JHm8d$3V2=iCej28mzV(3cmu{`(B_?Op_&
z|0uQA#wmjy`pR(A{Xsyzp$ph8E|)sCd*TI+vPN38P#FudMF)@2tl@hCOty?0XsIUc
zbx^YH#?7#(8s-ug6BN>tjY@ytJVz&YBF(-oP5>F@ClyKzgTUp!dro#n)nC#}^q$jV
z1uE?=?sHYnqgTN{NIsS&1ECGHpo%Ji8=6}zYP1_ePX1t=h&pz3XA2chRTkqBoH_(g
z+t-~1HF7})xnEBP_j*YqvB?7I3oD<1Z0CtkL5gewf-)b>dP;Zyc~AVGkJ<zrrrkwD
z@J`_~rt>I{u|05@@W)vDM&XWxUO|fHfssn`Ajo0Tpxd^znd~3_OY=8Y7(icVe!@NB
zf-VJ3`lW0Wl4<CEtmT~@?9qEh13Dyc8p&@}YM$9xxG?bJ7-7aDfi81Yse|e&s|-1G
zDnm#CGnZ$9Y_bK^OsbhmSkp-#<q!&@p~Vb?%_me`$NtLu6jd-78Y@I7LIb8aPWNiW
zOIAeB2lC<c`}Bkbj*PAa*w=jHLywpX9sHB>55=uF+BJwtSJ9s5ia2oI`8m#42S@3V
zG{33=gF_u912L%q2`Py;gZr^wzcXf0nNYTLE!ZOqYQVo1E+}dZ*Cwea^+bbnPKUo`
z45Wai6$A=s+&b*!2;rUr7{t1lLfG|AJQvo=lctHVtA8*)Fd;Ar1_dh)0|FWa00b0L
x7X!{aKP27GgTxs{-ZD!893Hp?6wf>Po?UJ*xLdqN(81o`Ri>HX!U6*UhM*83Hi-ZL

literal 987
zcmezO_TO6u1_mY|W(3o0Mfv$9$%#O2o3`85s|>6WdZq@J3=GV344Rl{7&I|8EMR70
zWMbk7`Bzt0>QKAKfR~L^tIebBJ1-+6H!FjIn<2LWCmVAp3!5-gfRCZLfhdT>CCpcn
zT3nKxpI4HYnU`8rY$#_S1Cn4C7DbiNEzZwLOineB6X!KDHZU|YHnafJ22tX?#>iZ%
z+0(?RgzN=IRtDxKMt%l^CPpr%CPqev^?Cgq<`vu<a=c_`8P(r;JLz<MAM0F3Gqq()
zB(iH&a-Kw(Nck|Oe5iDsD}9n_t-0IbRhPszw{G2KlDzi+mvu%<wnU5kUw+0&aS>0t
zKKs9d&e^R7pU*#H$j=u3IYDg>@6J;P?*xQ)2^>t7S+ljL@BP`>hDW=9MP7T^G+n*o
zqV^X~EAP(Dg{6HrWKt%cJ)mXuPNX>6_>_>@ueS@EU8Aj()=k#G$DrV2;dt%e@f+4*
z*Avd!^?W<+$*?Hyt5Kj2+tme23SJ8LdG3l3eSGPTk@eLrd)`!;Rc$@!s--{o$BOpu
z-MJHg#Qf1SXv?pCGIha<j>&1uT_610a(=V&k10=gHXUSQW@KPo+}LT**k-^Fj4@eZ
zM#ldvtOm?L%0Lz*z{euSB69m^W%SGA$5|BGmG@W&C_Lg{e|3)mH%OYFg@u`ksmDMB
z#1UlSHQ;XI%*jtq%*n_vE-?^f<4kDtU~K#0#K;Iz$iQwOhY;dr5ftOENKRBpPAw|Q
zOv_A8EJ;O<EntEJ#ug((w5o^M<2R9gXQWgNTHSx8J?}2wX<*9ItrAma`{du7{*Aho
zf1b%Lef9qSyL~g1Im9lATL`Y)diSUPn{UhXE=Yb0?J3V)+thxktXVn!d{Mb%s`T->
zd9FX?Z`z(oJDK&&s_B@iU}&oK!v7qzBFryL?h(>u+4ySFpWZalZ_yWT{|G(zjB)bj
z7ojbaWcb=mIE$v)f0=i@`JDN*v@8F=pPhB&)0PTllV!IK-ZU>ToptcXtI}WG;Wok_
z_BoyUd?vMt?~2KnIUA!7wip^|z1~w7TeGsgjH~5R*Ma*gS4DS+2x|x)deGH6(Kk+;
z#rlQnbg#mPZn{5Jo-+5mX!_aLWux58y`p|qLa@18aP_&jvQrjV=^5t~aB>0wIB9$9


From 490f8f8514329012a7f0222c63a37f1d370add44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 24 Jan 2024 16:45:55 -0500
Subject: [PATCH 3534/4969] Update activemq-client version to 6.0.1 (#8150)

---
 modules/activemq/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index f8497e26f5a..66bf306fd49 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -4,19 +4,19 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation "org.apache.activemq:activemq-client-jakarta:5.18.2"
+    testImplementation "org.apache.activemq:activemq-client:6.0.1"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.31.2"
 }
 
 test {
     javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
 compileTestJava {
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
     options.release.set(11)
 }

From f9116b150cc9abc7e178828bd194e6f3b77abed0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 03:20:02 +0000
Subject: [PATCH 3535/4969] Bump com.google.guava:guava from 32.1.3-jre to
 33.0.0-jre in /core

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.3-jre to 33.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2db5ab9373b..07cd1932d5a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -99,7 +99,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded 'com.google.guava:guava:32.1.3-jre'
+    shaded 'com.google.guava:guava:33.0.0-jre'
     shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

From 47400be43475a7e00dab827e389efe5d01c47665 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 03:20:09 +0000
Subject: [PATCH 3536/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.21.0 to 10.22.0.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index eb40bab3989..c4a231c4aec 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.0'
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.21.0'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.22.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 39641d3f334fd4d007d8af2bee005cc9a3a90572 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 03:21:05 +0000
Subject: [PATCH 3537/4969] Bump org.influxdb:influxdb-java from 2.23 to 2.24
 in /modules/influxdb

Bumps [org.influxdb:influxdb-java](https://github.com/influxdata/influxdb-java) from 2.23 to 2.24.
- [Release notes](https://github.com/influxdata/influxdb-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-java/compare/influxdb-java-2.23...influxdb-java-2.24)

---
updated-dependencies:
- dependency-name: org.influxdb:influxdb-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 52ad3ad0ddb..01f902d92e7 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,9 +3,9 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.23'
+    compileOnly 'org.influxdb:influxdb-java:2.24'
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'org.influxdb:influxdb-java:2.23'
+    testImplementation 'org.influxdb:influxdb-java:2.24'
     testImplementation "com.influxdb:influxdb-client-java:6.12.0"
 }

From 62ca5a084109a8d4f6749b691168f3eb2420120c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 11:32:56 -0500
Subject: [PATCH 3538/4969] [create-pull-request] automated change (#8166)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b6bcf0805dc..4fb587917e9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
-testcontainers.version=1.19.3
+testcontainers.version=1.19.4

From 78d17685359de57dd770d3dbf5e24433d40698fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 11:33:10 -0500
Subject: [PATCH 3539/4969] [create-pull-request] automated change (#8165)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 0e93da9827b..de6030812e6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -124,4 +124,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.3
+    latest_version: 1.19.4

From d3d10854a9b116f379dee63310d4dbaa9f36e0f2 Mon Sep 17 00:00:00 2001
From: Yonathan Negussie Mengesha <yonathan.neg@gmail.com>
Date: Thu, 1 Feb 2024 16:29:05 +0100
Subject: [PATCH 3540/4969] Fix HiveMQ logo (#8215)

---
 docs/modules/hivemq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/hivemq.md b/docs/modules/hivemq.md
index 2ebdd7a9ad8..c898d58fea8 100644
--- a/docs/modules/hivemq.md
+++ b/docs/modules/hivemq.md
@@ -1,6 +1,6 @@
 # HiveMQ Module
 
-<img src="../modules_logos/hivemq-module.png" alt="drawing" width="800"/>
+![hivemq logo](../modules_logos/hivemq-module.png)
 
 Automatic starting HiveMQ docker containers for JUnit4 and JUnit5 tests.
 This enables testing MQTT client applications and integration testing of custom HiveMQ extensions.

From 853f657be4c0b1b930b0c298cdc10288f0ac7521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 7 Feb 2024 14:25:31 -0500
Subject: [PATCH 3541/4969] Increase maximum heap size (#8283)

---
 gradle.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index 4fb587917e9..294a32b507d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,6 @@
 org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
+org.gradle.jvmargs=-Xmx2g
+
 testcontainers.version=1.19.4

From c210afb0b0944d1a96b7a760f93d6601a9058173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 7 Feb 2024 15:40:01 -0500
Subject: [PATCH 3542/4969] Downgrade commons-compress version to 1.24.0
 (#8284)

Fixes #8169
---
 .github/dependabot.yml | 2 ++
 core/build.gradle      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e3506109406..80a8780f6b2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -20,6 +20,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
+      - dependency-name: "org.apache.commons:commons-compress"
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
diff --git a/core/build.gradle b/core/build.gradle
index 07cd1932d5a..102d3997b8a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testCompileOnly 'org.jetbrains:annotations:24.1.0'
-    api 'org.apache.commons:commons-compress:1.25.0'
+    api 'org.apache.commons:commons-compress:1.24.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From 96f19edbd2f9431ca5303c12676f05b999f3c5f3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 10:12:34 -0500
Subject: [PATCH 3543/4969] [create-pull-request] automated change (#8301)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 294a32b507d..cbe03a25ae3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.19.4
+testcontainers.version=1.19.5

From e9cb44c32eb0e1e775fc1f40deeb79cd536177e0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 10:12:49 -0500
Subject: [PATCH 3544/4969] [create-pull-request] automated change (#8300)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index de6030812e6..548efdaf945 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -124,4 +124,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.4
+    latest_version: 1.19.5

From b1b27c3f7c0c1bfac7333eec1d17535aecb49948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 12 Feb 2024 12:21:50 -0500
Subject: [PATCH 3545/4969] Fix neo4j custom password docs

---
 .../java/org/testcontainers/containers/Neo4jContainerTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 5341b10c599..bdf3639a271 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -191,7 +191,7 @@ public void shouldRespectEnvironmentAuth() {
 
     @Test
     public void shouldSetCustomPasswordCorrectly() {
-        // withoutAuthentication {
+        // withAdminPassword {
         Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withAdminPassword("verySecret");
         // }
 

From a69750c3d796777770bec1920018917dac792e14 Mon Sep 17 00:00:00 2001
From: Christoph Dreis <dreis2211@users.noreply.github.com>
Date: Mon, 12 Feb 2024 21:30:21 +0100
Subject: [PATCH 3546/4969] Remove unused charset constant in GenericContainer
 (#8304)

---
 .../java/org/testcontainers/containers/GenericContainer.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 8e2b00d0adb..aff46f3b110 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -71,7 +71,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.UndeclaredThrowableException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Duration;
@@ -112,8 +111,6 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     extends FailureDetectingExternalResource
     implements Container<SELF>, AutoCloseable, WaitStrategyTarget, Startable {
 
-    private static final Charset UTF8 = Charset.forName("UTF-8");
-
     public static final int CONTAINER_RUNNING_TIMEOUT_SEC = 30;
 
     public static final String INTERNAL_HOST_HOSTNAME = "host.testcontainers.internal";

From a1ea7e07a3e65dfab113e590b7648d89a2424f8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 22:27:08 +0000
Subject: [PATCH 3547/4969] Bump org.apache.solr:solr-solrj from 8.11.2 to
 8.11.3 in /modules/solr

Bumps org.apache.solr:solr-solrj from 8.11.2 to 8.11.3.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index d4305686141..f4b3c4ac6b3 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'org.apache.solr:solr-solrj:8.11.2'
+    testImplementation 'org.apache.solr:solr-solrj:8.11.3'
     testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From bd532c30f21a3f1140870cce0e93ab0826da452c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 22:44:23 +0000
Subject: [PATCH 3548/4969] Bump org.apache.solr:solr-solrj from 8.11.2 to
 8.11.3 in /examples

Bumps org.apache.solr:solr-solrj from 8.11.2 to 8.11.3.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 739a418c995..22873b34a18 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.30"
     annotationProcessor "org.projectlombok:lombok:1.18.30"
 
-    implementation 'org.apache.solr:solr-solrj:8.11.2'
+    implementation 'org.apache.solr:solr-solrj:8.11.3'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 0623f1a04d8a32ccf96ca670f22a4bf3994f4da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 16 Feb 2024 23:49:53 -0500
Subject: [PATCH 3549/4969] Update Gradle GHA (#8322)

---
 .github/actions/setup-gradle/action.yml | 2 +-
 .github/workflows/ci-rootless.yml       | 2 +-
 .github/workflows/ci.yml                | 6 +++---
 .github/workflows/release.yml           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup-gradle/action.yml b/.github/actions/setup-gradle/action.yml
index 58499f75e57..3cb582c0cf8 100644
--- a/.github/actions/setup-gradle/action.yml
+++ b/.github/actions/setup-gradle/action.yml
@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup Gradle Build Action
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         gradle-home-cache-includes: |
           caches
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index fccaef5ede7..21ff4f793c6 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Remove Docket root socket
         run: sudo rm -rf /var/run/docker.sock
       - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
       - uses: ./.github/actions/setup-junit-report
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 15b1240904b..8e07cd76218 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -122,7 +122,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -159,7 +159,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - id: set-matrix
         env:
           # Since we override the tests executor,
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0fbd63cdbd1..79a0d6856b1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
         run: docker image prune -af
 
       - name: Setup Gradle Build Action
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Run Gradle Build
         run: ./gradlew build --scan --no-daemon -i -x test

From 40378973203b0971fea83d641d3c7e6ecb553b91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 17 Feb 2024 04:50:42 +0000
Subject: [PATCH 3550/4969] Bump release-drafter/release-drafter from 5.25.0 to
 6.0.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.25.0 to 6.0.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/09c613e259eb8d4e7c81c2cb00618eb5fc4575a7...3f0f87098bd6b5c5b9a36d49c41d998ea58f9348)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index acbea174645..43e9773f19e 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5.19.0
+      - uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From b06885fd89973ae7d9ff396737beeac27fddc06c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 19 Feb 2024 13:41:43 -0500
Subject: [PATCH 3551/4969] Update docker-java version to 3.3.5 (#8325)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 102d3997b8a..a318ff00b10 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.4')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.4')
+    api platform('com.github.docker-java:docker-java-bom:3.3.5')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.5')
 
     api "com.github.docker-java:docker-java-api"
 

From 329e972af94b642b286f201d42bf6f3fbe3aa0c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 20 Feb 2024 12:44:45 -0500
Subject: [PATCH 3552/4969] Improve postgres docs (#8340)

Display how to use other compatible images such as `pgvector`, `postgis`, `timescaledb`.
---
 docs/modules/databases/postgres.md            | 22 +++++++
 .../containers/CompatibleImageTest.java       | 64 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java

diff --git a/docs/modules/databases/postgres.md b/docs/modules/databases/postgres.md
index b7632d78293..d07e77937b9 100644
--- a/docs/modules/databases/postgres.md
+++ b/docs/modules/databases/postgres.md
@@ -2,6 +2,28 @@
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+## Compatible images
+
+`PostgreSQLContainer` can also be used with the following images:
+
+* [pgvector/pgvector](https://hub.docker.com/r/pgvector/pgvector)
+
+<!--codeinclude-->
+[Using pgvector](../../../modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java) inside_block:pgvectorContainer
+<!--/codeinclude-->
+
+* [postgis/postgis](https://registry.hub.docker.com/r/postgis/postgis)
+
+<!--codeinclude-->
+[Using PostGIS](../../../modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java) inside_block:postgisContainer
+<!--/codeinclude-->
+
+* [timescale/timescaledb](https://hub.docker.com/r/timescale/timescaledb)
+
+<!--codeinclude-->
+[Using TimescaleDB](../../../modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java) inside_block:timescaledbContainer
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
new file mode 100644
index 00000000000..2bb1c6c3d54
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
@@ -0,0 +1,64 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CompatibleImageTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void pgvector() throws SQLException {
+        try (
+            // pgvectorContainer {
+            PostgreSQLContainer<?> pgvector = new PostgreSQLContainer<>(
+                DockerImageName.parse("pgvector/pgvector:pg16").asCompatibleSubstituteFor("postgres")
+            )
+            // }
+        ) {
+            pgvector.start();
+
+            ResultSet resultSet = performQuery(pgvector, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void postgis() throws SQLException {
+        try (
+            // postgisContainer {
+            PostgreSQLContainer<?> postgis = new PostgreSQLContainer<>(
+                DockerImageName.parse("postgis/postgis:16-3.4-alpine").asCompatibleSubstituteFor("postgres")
+            )
+            // }
+        ) {
+            postgis.start();
+
+            ResultSet resultSet = performQuery(postgis, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void timescaledb() throws SQLException {
+        try (
+            // timescaledbContainer {
+            PostgreSQLContainer<?> timescaledb = new PostgreSQLContainer<>(
+                DockerImageName.parse("timescale/timescaledb:2.14.2-pg16").asCompatibleSubstituteFor("postgres")
+            )
+            // }
+        ) {
+            timescaledb.start();
+
+            ResultSet resultSet = performQuery(timescaledb, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+        }
+    }
+}

From f45bb444f0bbe54d791058bb015547ba2919beab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 20 Feb 2024 12:46:01 -0500
Subject: [PATCH 3553/4969] Add Weaviate module (#8337)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 +++
 .github/labeler.yml                           |  4 +++
 .github/settings.yml                          |  3 ++
 docs/modules/weaviate.md                      | 30 ++++++++++++++++
 mkdocs.yml                                    |  1 +
 modules/weaviate/build.gradle                 |  8 +++++
 .../weaviate/WeaviateContainer.java           | 36 +++++++++++++++++++
 .../weaviate/WeaviateContainerTest.java       | 25 +++++++++++++
 .../src/test/resources/logback-test.xml       | 16 +++++++++
 12 files changed, 131 insertions(+)
 create mode 100644 docs/modules/weaviate.md
 create mode 100644 modules/weaviate/build.gradle
 create mode 100644 modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
 create mode 100644 modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
 create mode 100644 modules/weaviate/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 81e3dbbd900..a140ad15285 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -55,6 +55,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - Weaviate
         - YugabyteDB
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index d073f8f1674..7c60044546f 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -55,6 +55,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - Weaviate
         - YugabyteDB
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index dedccecd4e5..91c750ef7f8 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -55,6 +55,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - Weaviate
         - YugabyteDB
         - New Module
   - type: textarea
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 80a8780f6b2..7111d36c2a6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -302,6 +302,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/weaviate"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/yugabytedb"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index e3bce388744..0960bf74461 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -192,6 +192,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/vault/**/*
+"modules/weaviate":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/weaviate/**/*
 "modules/yugabytedb":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 3047612d756..aa3b62b90fe 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -238,6 +238,9 @@ labels:
   - name: modules/vault
     color: '#006b75'
 
+  - name: modules/weaviate
+    color: '#006b75'
+
   - name: modules/yugabytedb
     color: '#006b75'
 
diff --git a/docs/modules/weaviate.md b/docs/modules/weaviate.md
new file mode 100644
index 00000000000..da028cf3ce1
--- /dev/null
+++ b/docs/modules/weaviate.md
@@ -0,0 +1,30 @@
+# Weaviate
+
+Testcontainers module for [Weaviate](https://hub.docker.com/r/semitechnologies/weaviate)
+
+## WeaviateContainer's usage examples
+
+You can start a Weaviate container instance from any Java application by using:
+
+<!--codeinclude-->
+[Default Weaviate container](../../modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+```groovy
+testImplementation "org.testcontainers:weaviate:{{latest_version}}"
+```
+
+=== "Maven"
+```xml
+<dependency>
+<groupId>org.testcontainers</groupId>
+<artifactId>weaviate</artifactId>
+<version>{{latest_version}}</version>
+<scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 548efdaf945..86cfd3a823a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -93,6 +93,7 @@ nav:
           - modules/solr.md
           - modules/toxiproxy.md
           - modules/vault.md
+          - modules/weaviate.md
           - modules/webdriver_containers.md
     - Test framework integration:
           - test_framework_integration/junit_4.md
diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
new file mode 100644
index 00000000000..06a77aa434a
--- /dev/null
+++ b/modules/weaviate/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: Weaviate"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'io.weaviate:client:4.5.1'
+}
diff --git a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
new file mode 100644
index 00000000000..bd217b13e75
--- /dev/null
+++ b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
@@ -0,0 +1,36 @@
+package org.testcontainers.weaviate;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation of Weaviate.
+ * <p>
+ * Supported image: {@code semitechnologies/weaviate}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>HTTP: 8080</li>
+ *     <li>gRPC: 50051</li>
+ * </ul>
+ */
+public class WeaviateContainer extends GenericContainer<WeaviateContainer> {
+
+    private static final String WEAVIATE_IMAGE = "semitechnologies/weaviate";
+
+    public WeaviateContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public WeaviateContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DockerImageName.parse(WEAVIATE_IMAGE));
+        withExposedPorts(8080, 50051);
+        withEnv("AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED", "true");
+        withEnv("PERSISTENCE_DATA_PATH", "/var/lib/weaviate");
+    }
+
+    public String getHttpHostAddress() {
+        return getHost() + ":" + getMappedPort(8080);
+    }
+}
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
new file mode 100644
index 00000000000..562fc36de51
--- /dev/null
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -0,0 +1,25 @@
+package org.testcontainers.weaviate;
+
+import io.weaviate.client.Config;
+import io.weaviate.client.WeaviateClient;
+import io.weaviate.client.base.Result;
+import io.weaviate.client.v1.misc.model.Meta;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class WeaviateContainerTest {
+
+    @Test
+    public void test() {
+        try ( // container {
+            WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.22.4")
+            // }
+        ) {
+            weaviate.start();
+            WeaviateClient client = new WeaviateClient(new Config("http", weaviate.getHttpHostAddress()));
+            Result<Meta> meta = client.misc().metaGetter().run();
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.22.4");
+        }
+    }
+}
diff --git a/modules/weaviate/src/test/resources/logback-test.xml b/modules/weaviate/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/weaviate/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 2c5244db397c7ec2ca03fcc5c7e8cff7211ce384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 20 Feb 2024 12:46:27 -0500
Subject: [PATCH 3554/4969] Add ChromaDB module (#8336)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 +++
 .github/labeler.yml                           |  4 +++
 .github/settings.yml                          |  3 ++
 docs/modules/chromadb.md                      | 30 ++++++++++++++++
 mkdocs.yml                                    |  1 +
 modules/chromadb/build.gradle                 |  8 +++++
 .../chromadb/ChromaDBContainer.java           | 34 +++++++++++++++++++
 .../chromadb/ChromaDBContainerTest.java       | 30 ++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 +++++++++
 12 files changed, 134 insertions(+)
 create mode 100644 docs/modules/chromadb.md
 create mode 100644 modules/chromadb/build.gradle
 create mode 100644 modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java
 create mode 100644 modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
 create mode 100644 modules/chromadb/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index a140ad15285..216076ee084 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -17,6 +17,7 @@ body:
         - ActiveMQ
         - Azure
         - Cassandra
+        - ChromaDB
         - Clickhouse
         - CockroachDB
         - Consul
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 7c60044546f..80b20178318 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -17,6 +17,7 @@ body:
         - ActiveMQ
         - Azure
         - Cassandra
+        - ChromaDB
         - Clickhouse
         - CockroachDB
         - Consul
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 91c750ef7f8..96af8c19ea7 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -17,6 +17,7 @@ body:
         - ActiveMQ
         - Azure
         - Cassandra
+        - ChromaDB
         - Clickhouse
         - CockroachDB
         - CrateDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7111d36c2a6..4f81e37b26b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -51,6 +51,11 @@ updates:
     ignore:
       - dependency-name: "io.dropwizard.metrics:metrics-core"
         update-types: [ "version-update:semver-major" ]
+  - package-ecosystem: "gradle"
+    directory: "/modules/chromadb"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/clickhouse"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0960bf74461..70e69146d25 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -27,6 +27,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/cassandra/**/*
+"modules/chromadb":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/chromadb/**/*
 "modules/clickhouse":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index aa3b62b90fe..12629f2f355 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -115,6 +115,9 @@ labels:
   - name: modules/cassandra
     color: '#006b75'
 
+  - name: modules/chromadb
+    color: '#006b75'
+
   - name: modules/clickhouse
     color: '#006b75'
 
diff --git a/docs/modules/chromadb.md b/docs/modules/chromadb.md
new file mode 100644
index 00000000000..9b14dfc2970
--- /dev/null
+++ b/docs/modules/chromadb.md
@@ -0,0 +1,30 @@
+# ChromaDB
+
+Testcontainers module for [ChromaDB](https://registry.hub.docker.com/r/chromadb/chroma)
+
+## ChromaDB's usage examples
+
+You can start a ChromaDB container instance from any Java application by using:
+
+<!--codeinclude-->
+[Default ChromaDB container](../../modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+```groovy
+testImplementation "org.testcontainers:chromadb:{{latest_version}}"
+```
+
+=== "Maven"
+```xml
+<dependency>
+<groupId>org.testcontainers</groupId>
+<artifactId>chromadb</artifactId>
+<version>{{latest_version}}</version>
+<scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 86cfd3a823a..cda56106885 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -75,6 +75,7 @@ nav:
                 - modules/databases/yugabytedb.md
           - modules/activemq.md
           - modules/azure.md
+          - modules/chromadb.md
           - modules/consul.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
new file mode 100644
index 00000000000..2b170c21570
--- /dev/null
+++ b/modules/chromadb/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: ChromaDB"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+}
diff --git a/modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java b/modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java
new file mode 100644
index 00000000000..a1bccf3904f
--- /dev/null
+++ b/modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java
@@ -0,0 +1,34 @@
+package org.testcontainers.chromadb;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation of ChromaDB.
+ * <p>
+ * Supported images: {@code chromadb/chroma}, {@code ghcr.io/chroma-core/chroma}
+ * <p>
+ * Exposed ports: 8000
+ */
+public class ChromaDBContainer extends GenericContainer<ChromaDBContainer> {
+
+    private static final DockerImageName DEFAULT_DOCKER_IMAGE = DockerImageName.parse("chromadb/chroma");
+
+    private static final DockerImageName GHCR_DOCKER_IMAGE = DockerImageName.parse("ghcr.io/chroma-core/chroma");
+
+    public ChromaDBContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ChromaDBContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_DOCKER_IMAGE, GHCR_DOCKER_IMAGE);
+        withExposedPorts(8000);
+        waitingFor(Wait.forHttp("/api/v1/heartbeat"));
+    }
+
+    public String getEndpoint() {
+        return "http://" + getHost() + ":" + getFirstMappedPort();
+    }
+}
diff --git a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
new file mode 100644
index 00000000000..945af0dcbff
--- /dev/null
+++ b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
@@ -0,0 +1,30 @@
+package org.testcontainers.chromadb;
+
+import io.restassured.http.ContentType;
+import org.junit.Test;
+
+import static io.restassured.RestAssured.given;
+
+public class ChromaDBContainerTest {
+
+    @Test
+    public void test() {
+        try ( // container {
+            ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.22")
+            // }
+        ) {
+            chroma.start();
+
+            given()
+                .baseUri(chroma.getEndpoint())
+                .when()
+                .body("{\"name\": \"test\"}")
+                .contentType(ContentType.JSON)
+                .post("/api/v1/databases")
+                .then()
+                .statusCode(200);
+
+            given().baseUri(chroma.getEndpoint()).when().get("/api/v1/databases/test").then().statusCode(200);
+        }
+    }
+}
diff --git a/modules/chromadb/src/test/resources/logback-test.xml b/modules/chromadb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/chromadb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From b7fb9456eb985e38208d8d2dfcd0f44ee9fddfaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 17:46:53 +0000
Subject: [PATCH 3555/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/chromadb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index 2b170c21570..f1642346871 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From 0c9833ba6c8a2eab1344fef9f25318b11f020ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 21 Feb 2024 11:39:58 -0500
Subject: [PATCH 3556/4969] Add Milvus module (#8352)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  4 ++
 .github/settings.yml                          |  3 +
 docs/modules/milvus.md                        | 36 ++++++++++
 mkdocs.yml                                    |  1 +
 modules/milvus/build.gradle                   |  8 +++
 .../milvus/MilvusContainer.java               | 61 +++++++++++++++++
 .../resources/testcontainers/embedEtcd.yaml   |  2 +
 .../milvus/MilvusContainerTest.java           | 66 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 +++++
 13 files changed, 205 insertions(+)
 create mode 100644 docs/modules/milvus.md
 create mode 100644 modules/milvus/build.gradle
 create mode 100644 modules/milvus/src/main/java/org/testcontainers/milvus/MilvusContainer.java
 create mode 100644 modules/milvus/src/main/resources/testcontainers/embedEtcd.yaml
 create mode 100644 modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java
 create mode 100644 modules/milvus/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 216076ee084..d7c304a2cd4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -33,6 +33,7 @@ body:
         - Kafka
         - LocalStack
         - MariaDB
+        - Milvus
         - MinIO
         - MockServer
         - MongoDB
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 80b20178318..2bc0e8a3e20 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -33,6 +33,7 @@ body:
         - Kafka
         - LocalStack
         - MariaDB
+        - Milvus
         - MinIO
         - MockServer
         - MongoDB
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 96af8c19ea7..02310b638e1 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -33,6 +33,7 @@ body:
         - Kafka
         - LocalStack
         - MariaDB
+        - Milvus
         - MinIO
         - MockServer
         - MongoDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4f81e37b26b..24ced388caf 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -166,6 +166,11 @@ updates:
     ignore:
       - dependency-name: "org.mariadb:r2dbc-mariadb"
         update-types: [ "version-update:semver-minor" ]
+  - package-ecosystem: "gradle"
+    directory: "/modules/milvus"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/minio"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 70e69146d25..b7c1aa2ac01 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -99,6 +99,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/mariadb/**/*
+"modules/milvus":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/milvus/**/*
 "modules/minio":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 12629f2f355..fdf582198d2 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -169,6 +169,9 @@ labels:
   - name: modules/mariadb
     color: '#006b75'
 
+  - name: modules/milvus
+    color: '#006b75'
+
   - name: modules/minio
     color: '#006b75'
 
diff --git a/docs/modules/milvus.md b/docs/modules/milvus.md
new file mode 100644
index 00000000000..2808f9d2199
--- /dev/null
+++ b/docs/modules/milvus.md
@@ -0,0 +1,36 @@
+# Milvus
+
+Testcontainers module for [Milvus](https://hub.docker.com/r/milvusdb/milvus).
+
+## Milvus's usage examples
+
+You can start a Milvus container instance from any Java application by using:
+
+<!--codeinclude-->
+[Default config](../../modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java) inside_block:milvusContainer
+<!--/codeinclude-->
+
+With external Etcd:
+
+<!--codeinclude-->
+[External Etcd](../../modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java) inside_block:externalEtcd
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:milvus:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>milvus</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index cda56106885..bcd53d294d9 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -84,6 +84,7 @@ nav:
           - modules/k3s.md
           - modules/kafka.md
           - modules/localstack.md
+          - modules/milvus.md
           - modules/minio.md
           - modules/mockserver.md
           - modules/nginx.md
diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
new file mode 100644
index 00000000000..8826e6764ba
--- /dev/null
+++ b/modules/milvus/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: ActiveMQ"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'io.milvus:milvus-sdk-java:2.3.4'
+}
diff --git a/modules/milvus/src/main/java/org/testcontainers/milvus/MilvusContainer.java b/modules/milvus/src/main/java/org/testcontainers/milvus/MilvusContainer.java
new file mode 100644
index 00000000000..57b1b483cf8
--- /dev/null
+++ b/modules/milvus/src/main/java/org/testcontainers/milvus/MilvusContainer.java
@@ -0,0 +1,61 @@
+package org.testcontainers.milvus;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+/**
+ * Testcontainers implementation for Milvus.
+ * <p>
+ * Supported image: {@code milvusdb/milvus}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Management port: 9091</li>
+ *     <li>HTTP: 19530</li>
+ * </ul>
+ */
+public class MilvusContainer extends GenericContainer<MilvusContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("milvusdb/milvus");
+
+    private String etcdEndpoint;
+
+    public MilvusContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public MilvusContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(9091, 19530);
+        waitingFor(Wait.forHttp("/healthz").forPort(9091));
+        withCommand("milvus", "run", "standalone");
+        withCopyFileToContainer(
+            MountableFile.forClasspathResource("testcontainers/embedEtcd.yaml"),
+            "/milvus/configs/embedEtcd.yaml"
+        );
+        withEnv("COMMON_STORAGETYPE", "local");
+    }
+
+    @Override
+    protected void configure() {
+        if (this.etcdEndpoint == null) {
+            withEnv("ETCD_USE_EMBED", "true");
+            withEnv("ETCD_DATA_DIR", "/var/lib/milvus/etcd");
+            withEnv("ETCD_CONFIG_PATH", "/milvus/configs/embedEtcd.yaml");
+        } else {
+            withEnv("ETCD_ENDPOINTS", this.etcdEndpoint);
+        }
+    }
+
+    public MilvusContainer withEtcdEndpoint(String etcdEndpoint) {
+        this.etcdEndpoint = etcdEndpoint;
+        return this;
+    }
+
+    public String getEndpoint() {
+        return "http://" + getHost() + ":" + getMappedPort(19530);
+    }
+}
diff --git a/modules/milvus/src/main/resources/testcontainers/embedEtcd.yaml b/modules/milvus/src/main/resources/testcontainers/embedEtcd.yaml
new file mode 100644
index 00000000000..2bd73bbd59f
--- /dev/null
+++ b/modules/milvus/src/main/resources/testcontainers/embedEtcd.yaml
@@ -0,0 +1,2 @@
+listen-client-urls: http://0.0.0.0:2379
+advertise-client-urls: http://0.0.0.0:2379
diff --git a/modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java b/modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java
new file mode 100644
index 00000000000..3a6d6275ec2
--- /dev/null
+++ b/modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java
@@ -0,0 +1,66 @@
+package org.testcontainers.milvus;
+
+import io.milvus.client.MilvusServiceClient;
+import io.milvus.param.ConnectParam;
+import org.junit.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MilvusContainerTest {
+
+    @Test
+    public void withDefaultConfig() {
+        try (
+            // milvusContainer {
+            MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.3.9")
+            // }
+        ) {
+            milvus.start();
+
+            assertThat(milvus.getEnvMap()).doesNotContainKey("ETCD_ENDPOINTS");
+            assertMilvusVersion(milvus);
+        }
+    }
+
+    @Test
+    public void withExternalEtcd() {
+        try (
+            // externalEtcd {
+            Network network = Network.newNetwork();
+            GenericContainer<?> etcd = new GenericContainer<>("quay.io/coreos/etcd:v3.5.5")
+                .withNetwork(network)
+                .withNetworkAliases("etcd")
+                .withCommand(
+                    "etcd",
+                    "-advertise-client-urls=http://127.0.0.1:2379",
+                    "-listen-client-urls=http://0.0.0.0:2379",
+                    "--data-dir=/etcd"
+                )
+                .withEnv("ETCD_AUTO_COMPACTION_MODE", "revision")
+                .withEnv("ETCD_AUTO_COMPACTION_RETENTION", "1000")
+                .withEnv("ETCD_QUOTA_BACKEND_BYTES", "4294967296")
+                .withEnv("ETCD_SNAPSHOT_COUNT", "50000")
+                .waitingFor(Wait.forLogMessage(".*ready to serve client requests.*", 1));
+            MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.3.9")
+                .withNetwork(network)
+                .withEtcdEndpoint("etcd:2379")
+                .dependsOn(etcd)
+            // }
+        ) {
+            milvus.start();
+
+            assertThat(milvus.getEnvMap()).doesNotContainKey("ETCD_USE_EMBED");
+            assertMilvusVersion(milvus);
+        }
+    }
+
+    private static void assertMilvusVersion(MilvusContainer milvus) {
+        MilvusServiceClient milvusClient = new MilvusServiceClient(
+            ConnectParam.newBuilder().withUri(milvus.getEndpoint()).build()
+        );
+        assertThat(milvusClient.getVersion().getData().getVersion()).isEqualTo("v2.3.9");
+    }
+}
diff --git a/modules/milvus/src/test/resources/logback-test.xml b/modules/milvus/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/milvus/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 2c987eec1bbae7eb4d7469dfa048bd4fae379a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 21 Feb 2024 13:52:04 -0500
Subject: [PATCH 3557/4969] Add Qdrant module (#8353)

Co-authored-by: Anush <anushshetty90@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 +++
 .github/labeler.yml                           |  4 +++
 .github/settings.yml                          |  3 ++
 docs/modules/qdrant.md                        | 30 ++++++++++++++++
 mkdocs.yml                                    |  1 +
 modules/qdrant/build.gradle                   | 12 +++++++
 .../qdrant/QdrantContainer.java               | 36 +++++++++++++++++++
 .../qdrant/QdrantContainerTest.java           | 36 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 +++++++++
 12 files changed, 146 insertions(+)
 create mode 100644 docs/modules/qdrant.md
 create mode 100644 modules/qdrant/build.gradle
 create mode 100644 modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java
 create mode 100644 modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
 create mode 100644 modules/qdrant/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index d7c304a2cd4..8d363cb978f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -47,6 +47,7 @@ body:
         - PostgreSQL
         - Presto
         - Pulsar
+        - Qdrant
         - QuestDB
         - RabbitMQ
         - Redpanda
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 2bc0e8a3e20..6ee160c982b 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -47,6 +47,7 @@ body:
         - PostgreSQL
         - Presto
         - Pulsar
+        - Qdrant
         - QuestDB
         - RabbitMQ
         - Redpanda
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 02310b638e1..3f8920b4059 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -45,6 +45,7 @@ body:
         - Oracle XE
         - OrientDB
         - PostgreSQL
+        - Qdrant
         - QuestDB
         - Presto
         - Pulsar
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 24ced388caf..bf9b145f2b3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -240,6 +240,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/qdrant"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/questdb"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index b7c1aa2ac01..0fd1ec90d29 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -152,6 +152,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/pulsar/**/*
+"modules/qdrant":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/qdrant/**/*
 "modules/questdb":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index fdf582198d2..a4589aab643 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -205,6 +205,9 @@ labels:
   - name: modules/pulsar
     color: '#006b75'
 
+  - name: modules/qdrant
+    color: '#006b75'
+
   - name: modules/questdb
     color: '#006b75'
 
diff --git a/docs/modules/qdrant.md b/docs/modules/qdrant.md
new file mode 100644
index 00000000000..25aef090c97
--- /dev/null
+++ b/docs/modules/qdrant.md
@@ -0,0 +1,30 @@
+# Qdrant
+
+Testcontainers module for [Qdrant](https://registry.hub.docker.com/r/qdrant/qdrant)
+
+## Qdrant's usage examples
+
+You can start a Qdrant container instance from any Java application by using:
+
+<!--codeinclude-->
+[Default QDrant container](../../modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java) inside_block:qdrantContainer
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:qdrant:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>qdrant</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index bcd53d294d9..67974735281 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -89,6 +89,7 @@ nav:
           - modules/mockserver.md
           - modules/nginx.md
           - modules/pulsar.md
+          - modules/qdrant.md
           - modules/rabbitmq.md
           - modules/redpanda.md
           - modules/solace.md
diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
new file mode 100644
index 00000000000..cc856e1d970
--- /dev/null
+++ b/modules/qdrant/build.gradle
@@ -0,0 +1,12 @@
+description = "Testcontainers :: Qdrant"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'io.qdrant:client:1.7.1'
+    testImplementation platform('io.grpc:grpc-bom:1.61.1')
+    testImplementation 'io.grpc:grpc-stub'
+    testImplementation 'io.grpc:grpc-protobuf'
+    testImplementation 'io.grpc:grpc-netty-shaded'
+}
diff --git a/modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java b/modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java
new file mode 100644
index 00000000000..341349fe18c
--- /dev/null
+++ b/modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java
@@ -0,0 +1,36 @@
+package org.testcontainers.qdrant;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Qdrant.
+ * <p>
+ * Supported image: {@code qdrant/qdrant}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>HTTP: 6333</li>
+ *     <li>Grpc: 6334</li>
+ * </ul>
+ */
+public class QdrantContainer extends GenericContainer<QdrantContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("qdrant/qdrant");
+
+    public QdrantContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public QdrantContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(6333, 6334);
+        waitingFor(Wait.forHttp("/readyz").forPort(6333));
+    }
+
+    public String getGrpcHostAddress() {
+        return getHost() + ":" + getMappedPort(6334);
+    }
+}
diff --git a/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java b/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
new file mode 100644
index 00000000000..e33582bf552
--- /dev/null
+++ b/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
@@ -0,0 +1,36 @@
+package org.testcontainers.qdrant;
+
+import io.grpc.Grpc;
+import io.grpc.InsecureChannelCredentials;
+import io.qdrant.client.QdrantGrpcClient;
+import io.qdrant.client.grpc.QdrantOuterClass;
+import org.junit.Test;
+
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class QdrantContainerTest {
+
+    @Test
+    public void test() throws ExecutionException, InterruptedException {
+        try (
+            // qdrantContainer {
+            QdrantContainer qdrant = new QdrantContainer("qdrant/qdrant:v1.7.4")
+            // }
+        ) {
+            qdrant.start();
+
+            QdrantGrpcClient client = QdrantGrpcClient
+                .newBuilder(
+                    Grpc.newChannelBuilder(qdrant.getGrpcHostAddress(), InsecureChannelCredentials.create()).build()
+                )
+                .build();
+            QdrantOuterClass.HealthCheckReply healthCheckReply = client
+                .qdrant()
+                .healthCheck(QdrantOuterClass.HealthCheckRequest.getDefaultInstance())
+                .get();
+            assertThat(healthCheckReply.getVersion()).isEqualTo("1.7.4");
+        }
+    }
+}
diff --git a/modules/qdrant/src/test/resources/logback-test.xml b/modules/qdrant/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/qdrant/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 0fd331a12bd14de7186ad8af062e4c5e7d265a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 21 Feb 2024 15:05:56 -0600
Subject: [PATCH 3558/4969] Fix Milvus description

---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 8826e6764ba..9da171def57 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -1,4 +1,4 @@
-description = "Testcontainers :: ActiveMQ"
+description = "Testcontainers :: Milvus"
 
 dependencies {
     api project(':testcontainers')

From 60aacca34a8b1ada84992b3ff9ff53683d6f196a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:07:38 -0500
Subject: [PATCH 3559/4969] [create-pull-request] automated change (#8364)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index cbe03a25ae3..26b4b4f0c26 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.19.5
+testcontainers.version=1.19.6

From ef43682bcda26dae644289bf81cea322a07999a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:07:52 -0500
Subject: [PATCH 3560/4969] [create-pull-request] automated change (#8365)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 67974735281..784159e8e57 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -128,4 +128,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.5
+    latest_version: 1.19.6

From 7bedef7ea7900a96448e3148757dc69067275228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sun, 25 Feb 2024 21:02:18 -0500
Subject: [PATCH 3561/4969] Add OpenFGA module (#8371)

Fixes #8367
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  4 ++
 .github/labeler.yml                           |  4 ++
 .github/settings.yml                          |  3 ++
 docs/modules/openfga.md                       | 30 +++++++++++++
 mkdocs.yml                                    |  1 +
 modules/openfga/build.gradle                  | 21 +++++++++
 .../openfga/OpenFGAContainer.java             | 45 +++++++++++++++++++
 .../openfga/OpenFGAContainerTest.java         | 33 ++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 +++++++
 12 files changed, 160 insertions(+)
 create mode 100644 docs/modules/openfga.md
 create mode 100644 modules/openfga/build.gradle
 create mode 100644 modules/openfga/src/main/java/org/testcontainers/openfga/OpenFGAContainer.java
 create mode 100644 modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
 create mode 100644 modules/openfga/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 8d363cb978f..027a7adc170 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -41,6 +41,7 @@ body:
         - MySQL
         - Neo4j
         - NGINX
+        - OpenFGA
         - Oracle Free
         - Oracle XE
         - OrientDB
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 6ee160c982b..c2f6d7504e8 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -41,6 +41,7 @@ body:
         - MySQL
         - Neo4j
         - NGINX
+        - OpenFGA
         - Oracle Free
         - Oracle XE
         - OrientDB
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 3f8920b4059..3a03aa09bdd 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -41,6 +41,7 @@ body:
         - MySQL
         - Neo4j
         - NGINX
+        - OpenFGA
         - Oracle Free
         - Oracle XE
         - OrientDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bf9b145f2b3..163bf2db040 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -211,6 +211,10 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/openfga"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gradle"
     directory: "/modules/oracle-free"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0fd1ec90d29..c7eec3b4a6a 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -131,6 +131,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/nginx/**/*
+"modules/openfga":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/openfga/**/*
 "modules/oracle":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index a4589aab643..c7458f63fc3 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -190,6 +190,9 @@ labels:
   - name: modules/nginx
     color: '#006b75'
 
+  - name: modules/openfga
+    color: '#006b75'
+
   - name: modules/oracle
     color: '#006b75'
 
diff --git a/docs/modules/openfga.md b/docs/modules/openfga.md
new file mode 100644
index 00000000000..e11cae3560a
--- /dev/null
+++ b/docs/modules/openfga.md
@@ -0,0 +1,30 @@
+# OpenFGA
+
+Testcontainers module for [OpenFGA](https://hub.docker.com/r/"openfga/openfga).
+
+## OpenFGAContainer's usage examples
+
+You can start an OpenFGA container instance from any Java application by using:
+
+<!--codeinclude-->
+[OpenFGA container](../../modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:openfga:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>openfga</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 784159e8e57..d51576a0bf6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -88,6 +88,7 @@ nav:
           - modules/minio.md
           - modules/mockserver.md
           - modules/nginx.md
+          - modules/openfga.md
           - modules/pulsar.md
           - modules/qdrant.md
           - modules/rabbitmq.md
diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
new file mode 100644
index 00000000000..9824603d5bd
--- /dev/null
+++ b/modules/openfga/build.gradle
@@ -0,0 +1,21 @@
+description = "Testcontainers :: OpenFGA"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'dev.openfga:openfga-sdk:0.3.2'
+}
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
+}
diff --git a/modules/openfga/src/main/java/org/testcontainers/openfga/OpenFGAContainer.java b/modules/openfga/src/main/java/org/testcontainers/openfga/OpenFGAContainer.java
new file mode 100644
index 00000000000..986e385c0d3
--- /dev/null
+++ b/modules/openfga/src/main/java/org/testcontainers/openfga/OpenFGAContainer.java
@@ -0,0 +1,45 @@
+package org.testcontainers.openfga;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for OpenFGA.
+ * <p>
+ * Supported image: {@code openfga/openfga}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Playground: 3000</li>
+ *     <li>HTTP: 8080</li>
+ *     <li>gRPC: 8081</li>
+ * </ul>
+ */
+public class OpenFGAContainer extends GenericContainer<OpenFGAContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("openfga/openfga");
+
+    public OpenFGAContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public OpenFGAContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(3000, 8080, 8081);
+        withCommand("run");
+        waitingFor(
+            Wait.forHttp("/healthz").forPort(8080).forResponsePredicate(response -> response.contains("SERVING"))
+        );
+    }
+
+    public String getHttpEndpoint() {
+        return "http://" + getHost() + ":" + getMappedPort(8080);
+    }
+
+    public String getGrpcEndpoint() {
+        return "http://" + getHost() + ":" + getMappedPort(8081);
+    }
+}
diff --git a/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java b/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
new file mode 100644
index 00000000000..688d4d31f10
--- /dev/null
+++ b/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
@@ -0,0 +1,33 @@
+package org.testcontainers.openfga;
+
+import dev.openfga.sdk.api.client.OpenFgaClient;
+import dev.openfga.sdk.api.client.model.ClientCreateStoreResponse;
+import dev.openfga.sdk.api.configuration.ClientConfiguration;
+import dev.openfga.sdk.api.model.CreateStoreRequest;
+import dev.openfga.sdk.errors.FgaInvalidParameterException;
+import org.junit.Test;
+
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class OpenFGAContainerTest {
+
+    @Test
+    public void withDefaultConfig() throws FgaInvalidParameterException, ExecutionException, InterruptedException {
+        try ( // container
+            OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.4.3")
+            // }
+        ) {
+            openfga.start();
+
+            ClientConfiguration config = new ClientConfiguration().apiUrl(openfga.getHttpEndpoint());
+            OpenFgaClient client = new OpenFgaClient(config);
+
+            assertThat(client.listStores().get().getStores()).isEmpty();
+            ClientCreateStoreResponse store = client.createStore(new CreateStoreRequest().name("test")).get();
+            assertThat(store.getId()).isNotNull();
+            assertThat(client.listStores().get().getStores()).hasSize(1);
+        }
+    }
+}
diff --git a/modules/openfga/src/test/resources/logback-test.xml b/modules/openfga/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/openfga/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From fdcc31c720e7704f6b0c69060c25941abc254739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 27 Feb 2024 18:55:15 -0500
Subject: [PATCH 3562/4969] Support mongodb/mongodb-community-server and
 mongodb/mongodb-enterprise-server (#8386)

---
 .../containers/MongoDBContainer.java          | 12 ++-
 .../containers/AbstractMongo.java             | 66 ++++++++++++++
 .../containers/CompatibleImageTest.java       | 66 ++++++++++++++
 .../containers/MongoDBContainerTest.java      | 91 +------------------
 4 files changed, 146 insertions(+), 89 deletions(-)
 create mode 100644 modules/mongodb/src/test/java/org/testcontainers/containers/AbstractMongo.java
 create mode 100644 modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 1e6749f8aed..17adc794530 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -13,7 +13,7 @@
 /**
  * Testcontainers implementation for MongoDB.
  * <p>
- * Supported image: {@code mongo}
+ * Supported images: {@code mongo}, {@code mongodb/mongodb-community-server}, {@code mongodb/mongodb-enterprise-server}
  * <p>
  * Exposed ports: 27017
  */
@@ -22,6 +22,14 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mongo");
 
+    private static final DockerImageName COMMUNITY_SERVER_IMAGE = DockerImageName.parse(
+        "mongodb/mongodb-community-server"
+    );
+
+    private static final DockerImageName ENTERPRISE_SERVER_IMAGE = DockerImageName.parse(
+        "mongodb/mongodb-enterprise-server"
+    );
+
     private static final String DEFAULT_TAG = "4.0.10";
 
     private static final int CONTAINER_EXIT_CODE_OK = 0;
@@ -48,7 +56,7 @@ public MongoDBContainer(@NonNull final String dockerImageName) {
 
     public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, COMMUNITY_SERVER_IMAGE, ENTERPRISE_SERVER_IMAGE);
     }
 
     @Override
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/AbstractMongo.java b/modules/mongodb/src/test/java/org/testcontainers/containers/AbstractMongo.java
new file mode 100644
index 00000000000..4fe23fbb50c
--- /dev/null
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/AbstractMongo.java
@@ -0,0 +1,66 @@
+package org.testcontainers.containers;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.TransactionBody;
+import org.bson.Document;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AbstractMongo {
+
+    protected void executeTx(MongoDBContainer mongoDBContainer) {
+        final MongoClient mongoSyncClientBase = MongoClients.create(mongoDBContainer.getConnectionString());
+        final MongoClient mongoSyncClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
+        mongoSyncClient
+            .getDatabase("mydb1")
+            .getCollection("foo")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("abc", 0));
+        mongoSyncClient
+            .getDatabase("mydb2")
+            .getCollection("bar")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("xyz", 0));
+        mongoSyncClientBase
+            .getDatabase("mydb3")
+            .getCollection("baz")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("def", 0));
+
+        final ClientSession clientSession = mongoSyncClient.startSession();
+        final TransactionOptions txnOptions = TransactionOptions
+            .builder()
+            .readPreference(ReadPreference.primary())
+            .readConcern(ReadConcern.LOCAL)
+            .writeConcern(WriteConcern.MAJORITY)
+            .build();
+
+        final String trxResult = "Inserted into collections in different databases";
+
+        TransactionBody<String> txnBody = () -> {
+            final MongoCollection<Document> coll1 = mongoSyncClient.getDatabase("mydb1").getCollection("foo");
+            final MongoCollection<Document> coll2 = mongoSyncClient.getDatabase("mydb2").getCollection("bar");
+
+            coll1.insertOne(clientSession, new Document("abc", 1));
+            coll2.insertOne(clientSession, new Document("xyz", 999));
+            return trxResult;
+        };
+
+        try {
+            final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
+            assertThat(trxResultActual).isEqualTo(trxResult);
+        } catch (RuntimeException re) {
+            throw new IllegalStateException(re.getMessage(), re);
+        } finally {
+            clientSession.close();
+            mongoSyncClient.close();
+        }
+    }
+}
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
new file mode 100644
index 00000000000..8113e508aee
--- /dev/null
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
@@ -0,0 +1,66 @@
+package org.testcontainers.containers;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import org.bson.Document;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(Parameterized.class)
+public class CompatibleImageTest extends AbstractMongo {
+
+    private final String image;
+
+    public CompatibleImageTest(String image) {
+        this.image = image;
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] image() {
+        return new String[] {
+            "mongo:7",
+            "mongodb/mongodb-community-server:7.0.2-ubi8",
+            "mongodb/mongodb-enterprise-server:7.0.0-ubi8",
+        };
+    }
+
+    @Test
+    public void shouldExecuteTransactions() {
+        try (
+            // creatingMongoDBContainer {
+            final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")
+            // }
+        ) {
+            // startingMongoDBContainer {
+            mongoDBContainer.start();
+            // }
+            executeTx(mongoDBContainer);
+        }
+    }
+
+    @Test
+    public void shouldSupportSharding() {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(this.image).withSharding()) {
+            mongoDBContainer.start();
+            final MongoClient mongoClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
+
+            mongoClient.getDatabase("mydb1").getCollection("foo").insertOne(new Document("abc", 0));
+
+            Document shards = mongoClient.getDatabase("config").getCollection("shards").find().first();
+            assertThat(shards).isNotNull();
+            assertThat(shards).isNotEmpty();
+            assertThat(isReplicaSet(mongoClient)).isFalse();
+        }
+    }
+
+    private boolean isReplicaSet(MongoClient mongoClient) {
+        return runIsMaster(mongoClient).get("setName") != null;
+    }
+
+    private Document runIsMaster(MongoClient mongoClient) {
+        return mongoClient.getDatabase("admin").runCommand(new Document("ismaster", 1));
+    }
+}
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index f5cb4dd5d90..c801dad5378 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -1,21 +1,10 @@
 package org.testcontainers.containers;
 
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.TransactionOptions;
-import com.mongodb.WriteConcern;
-import com.mongodb.client.ClientSession;
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.TransactionBody;
-import org.bson.Document;
 import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MongoDBContainerTest {
+public class MongoDBContainerTest extends AbstractMongo {
 
     /**
      * Taken from <a href="https://docs.mongodb.com/manual/core/transactions/">https://docs.mongodb.com</a>
@@ -24,7 +13,7 @@ public class MongoDBContainerTest {
     public void shouldExecuteTransactions() {
         try (
             // creatingMongoDBContainer {
-            final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))
+            final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")
             // }
         ) {
             // startingMongoDBContainer {
@@ -34,91 +23,19 @@ public void shouldExecuteTransactions() {
         }
     }
 
-    private void executeTx(MongoDBContainer mongoDBContainer) {
-        final MongoClient mongoSyncClientBase = MongoClients.create(mongoDBContainer.getConnectionString());
-        final MongoClient mongoSyncClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
-        mongoSyncClient
-            .getDatabase("mydb1")
-            .getCollection("foo")
-            .withWriteConcern(WriteConcern.MAJORITY)
-            .insertOne(new Document("abc", 0));
-        mongoSyncClient
-            .getDatabase("mydb2")
-            .getCollection("bar")
-            .withWriteConcern(WriteConcern.MAJORITY)
-            .insertOne(new Document("xyz", 0));
-        mongoSyncClientBase
-            .getDatabase("mydb3")
-            .getCollection("baz")
-            .withWriteConcern(WriteConcern.MAJORITY)
-            .insertOne(new Document("def", 0));
-
-        final ClientSession clientSession = mongoSyncClient.startSession();
-        final TransactionOptions txnOptions = TransactionOptions
-            .builder()
-            .readPreference(ReadPreference.primary())
-            .readConcern(ReadConcern.LOCAL)
-            .writeConcern(WriteConcern.MAJORITY)
-            .build();
-
-        final String trxResult = "Inserted into collections in different databases";
-
-        TransactionBody<String> txnBody = () -> {
-            final MongoCollection<Document> coll1 = mongoSyncClient.getDatabase("mydb1").getCollection("foo");
-            final MongoCollection<Document> coll2 = mongoSyncClient.getDatabase("mydb2").getCollection("bar");
-
-            coll1.insertOne(clientSession, new Document("abc", 1));
-            coll2.insertOne(clientSession, new Document("xyz", 999));
-            return trxResult;
-        };
-
-        try {
-            final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
-            assertThat(trxResultActual).isEqualTo(trxResult);
-        } catch (RuntimeException re) {
-            throw new IllegalStateException(re.getMessage(), re);
-        } finally {
-            clientSession.close();
-            mongoSyncClient.close();
-        }
-    }
-
     @Test
     public void supportsMongoDB_4_4() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.4"))) {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.4")) {
             mongoDBContainer.start();
         }
     }
 
     @Test
     public void shouldTestDatabaseName() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10"))) {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")) {
             mongoDBContainer.start();
             final String databaseName = "my-db";
             assertThat(mongoDBContainer.getReplicaSetUrl(databaseName)).endsWith(databaseName);
         }
     }
-
-    @Test
-    public void shouldSupportSharding() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:6").withSharding()) {
-            mongoDBContainer.start();
-            final MongoClient mongoClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
-
-            mongoClient.getDatabase("mydb1").getCollection("foo").insertOne(new Document("abc", 0));
-
-            Document shards = mongoClient.getDatabase("config").getCollection("shards").find().first();
-            assertThat(shards).isNotNull();
-            assertThat(shards).isNotEmpty();
-            assertThat(isReplicaSet(mongoClient)).isFalse();
-        }
-    }
-
-    private boolean isReplicaSet(MongoClient mongoClient) {
-        return runIsMaster(mongoClient).get("setName") != null;
-    }
-
-    private Document runIsMaster(MongoClient mongoClient) {
-        return mongoClient.getDatabase("admin").runCommand(new Document("ismaster", 1));
-    }
 }

From baa877033605e218c15f8a1ede1d58887eaf08e9 Mon Sep 17 00:00:00 2001
From: Paul Balogh <javaducky@gmail.com>
Date: Tue, 27 Feb 2024 18:19:07 -0600
Subject: [PATCH 3563/4969] Add k6 module (#8318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  8 ++
 .github/labeler.yml                           |  4 +
 .github/settings.yml                          |  3 +
 docs/modules/k6.md                            | 39 ++++++++
 mkdocs.yml                                    |  1 +
 modules/k6/build.gradle                       |  7 ++
 .../org/testcontainers/k6/K6Container.java    | 88 +++++++++++++++++++
 .../testcontainers/k6/K6ContainerTests.java   | 41 +++++++++
 .../k6/src/test/resources/logback-test.xml    | 16 ++++
 modules/k6/src/test/resources/scripts/test.js |  6 ++
 13 files changed, 216 insertions(+)
 create mode 100644 docs/modules/k6.md
 create mode 100644 modules/k6/build.gradle
 create mode 100644 modules/k6/src/main/java/org/testcontainers/k6/K6Container.java
 create mode 100644 modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
 create mode 100644 modules/k6/src/test/resources/logback-test.xml
 create mode 100644 modules/k6/src/test/resources/scripts/test.js

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 027a7adc170..abb8b0f7901 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -30,6 +30,7 @@ body:
         - HiveMQ
         - InfluxDB
         - K3S
+        - K6
         - Kafka
         - LocalStack
         - MariaDB
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index c2f6d7504e8..54868eea96d 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -30,6 +30,7 @@ body:
         - HiveMQ
         - InfluxDB
         - K3S
+        - K6
         - Kafka
         - LocalStack
         - MariaDB
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 3a03aa09bdd..2d28aca91d6 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -30,6 +30,7 @@ body:
         - HiveMQ
         - InfluxDB
         - K3S
+        - K6
         - Kafka
         - LocalStack
         - MariaDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 163bf2db040..ddf7a8b7d9a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -148,6 +148,14 @@ updates:
     ignore:
       - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
+  - package-ecosystem: "gradle"
+    directory: "/modules/k6"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index c7eec3b4a6a..8107870a59a 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -87,6 +87,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/k3s/**/*
+"modules/k6":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/k6/**/*
 "modules/kafka":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index c7458f63fc3..ad711b60307 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -160,6 +160,9 @@ labels:
   - name: modules/k3s
     color: '#006b75'
 
+  - name: modules/k6
+    color: '#006b75'
+
   - name: modules/kafka
     color: '#006b75'
 
diff --git a/docs/modules/k6.md b/docs/modules/k6.md
new file mode 100644
index 00000000000..7d14701aaa3
--- /dev/null
+++ b/docs/modules/k6.md
@@ -0,0 +1,39 @@
+# k6 Module
+
+!!! note 
+    This module is INCUBATING. 
+    While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. 
+    See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+Testcontainers module for [k6](https://registry.hub.docker.com/r/grafana/k6).
+
+[k6](https://k6.io/) is an extensible reliability testing tool built for developer happiness.
+
+## Basic script execution
+
+Execute a simple k6 test script, `test.js`, with commandline options and injected script variable.
+
+Create a simple k6 test script to be executed as part of your tests:
+
+<!--codeinclude-->
+[Setup the container](../../modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java) inside_block:standard_k6
+[Content of `scripts/test.js`](../../modules/k6/src/test/resources/scripts/test.js) inside_block:access_script_vars
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:k6:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>k6</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index d51576a0bf6..8c5a0a769f1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,6 +82,7 @@ nav:
           - modules/gcloud.md
           - modules/hivemq.md
           - modules/k3s.md
+          - modules/k6.md
           - modules/kafka.md
           - modules/localstack.md
           - modules/milvus.md
diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
new file mode 100644
index 00000000000..19945320d3b
--- /dev/null
+++ b/modules/k6/build.gradle
@@ -0,0 +1,7 @@
+description = "Testcontainers :: k6"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.2'
+}
diff --git a/modules/k6/src/main/java/org/testcontainers/k6/K6Container.java b/modules/k6/src/main/java/org/testcontainers/k6/K6Container.java
new file mode 100644
index 00000000000..04403ccb4cb
--- /dev/null
+++ b/modules/k6/src/main/java/org/testcontainers/k6/K6Container.java
@@ -0,0 +1,88 @@
+package org.testcontainers.k6;
+
+import org.apache.commons.io.FilenameUtils;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class K6Container extends GenericContainer<K6Container> {
+
+    /** Standard image for k6, as provided by Grafana. */
+    private static final DockerImageName K6_IMAGE = DockerImageName.parse("grafana/k6");
+
+    private String testScript;
+
+    private List<String> cmdOptions = new ArrayList<>();
+
+    private Map<String, String> scriptVars = new HashMap<>();
+
+    /**
+     * Creates a new container instance based upon the provided image name.
+     */
+    public K6Container(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * Creates a new container instance based upon the provided image.
+     */
+    public K6Container(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(K6_IMAGE);
+    }
+
+    /**
+     * Specifies the test script to be executed within the container.
+     * @param testScript file to be copied into the container
+     * @return the builder
+     */
+    public K6Container withTestScript(MountableFile testScript) {
+        this.testScript = "/home/k6/" + FilenameUtils.getName(testScript.getResolvedPath());
+        withCopyFileToContainer(testScript, this.testScript);
+        return self();
+    }
+
+    /**
+     * Specifies additional command line options to be provided to the k6 command.
+     * @param options command line options
+     * @return the builder
+     */
+    public K6Container withCmdOptions(String... options) {
+        cmdOptions.addAll(Arrays.asList(options));
+        return self();
+    }
+
+    /**
+     * Adds a key-value pair for access within test scripts as an environment variable.
+     * @param key   unique identifier for the variable
+     * @param value value of the variable
+     * @return the builder
+     */
+    public K6Container withScriptVar(String key, String value) {
+        scriptVars.put(key, value);
+        return self();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void configure() {
+        List<String> commandParts = new ArrayList<>();
+        commandParts.add("run");
+        commandParts.addAll(cmdOptions);
+        for (Map.Entry<String, String> entry : scriptVars.entrySet()) {
+            commandParts.add("--env");
+            commandParts.add(String.format("%s=%s", entry.getKey(), entry.getValue()));
+        }
+        commandParts.add(testScript);
+
+        setCommand(commandParts.toArray(new String[] {}));
+    }
+}
diff --git a/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java b/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
new file mode 100644
index 00000000000..f912fcd7dcf
--- /dev/null
+++ b/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
@@ -0,0 +1,41 @@
+package org.testcontainers.k6;
+
+import org.junit.Test;
+import org.testcontainers.containers.output.WaitingConsumer;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class K6ContainerTests {
+
+    @Test
+    public void k6StandardTest() throws Exception {
+        try (
+            // standard_k6 {
+            K6Container container = new K6Container("grafana/k6:0.49.0")
+                .withTestScript(MountableFile.forClasspathResource("scripts/test.js"))
+                .withScriptVar("MY_SCRIPT_VAR", "are cool!")
+                .withScriptVar("AN_UNUSED_VAR", "unused")
+                .withCmdOptions("--quiet", "--no-usage-report")
+            // }
+        ) {
+            container.start();
+
+            WaitingConsumer consumer = new WaitingConsumer();
+            container.followOutput(consumer);
+
+            // Wait for test script results to be collected
+            consumer.waitUntil(
+                frame -> {
+                    return frame.getUtf8String().contains("iteration_duration");
+                },
+                3,
+                TimeUnit.SECONDS
+            );
+
+            assertThat(container.getLogs()).contains("k6 tests are cool!");
+        }
+    }
+}
diff --git a/modules/k6/src/test/resources/logback-test.xml b/modules/k6/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/k6/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/k6/src/test/resources/scripts/test.js b/modules/k6/src/test/resources/scripts/test.js
new file mode 100644
index 00000000000..fad0c4b48df
--- /dev/null
+++ b/modules/k6/src/test/resources/scripts/test.js
@@ -0,0 +1,6 @@
+// access_script_vars {
+// The most basic of k6 scripts.
+export default function(){
+    console.log(`k6 tests ${__ENV.MY_SCRIPT_VAR}`)
+}
+// }

From 8b8d50d24b504eea6d9a2eeb862381a5f42866c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 00:19:33 +0000
Subject: [PATCH 3564/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.6.1 to 3.7.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 01e3551e651..581c1c8d397 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 86e340576795b8002af0cc74b5e5e68d91605089 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 00:19:35 +0000
Subject: [PATCH 3565/4969] Bump org.assertj:assertj-core from 3.25.2 to 3.25.3
 in /modules/k6

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k6/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
index 19945320d3b..e59c07d99e8 100644
--- a/modules/k6/build.gradle
+++ b/modules/k6/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: k6"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From c23eb7f3dde8bbb669a837ae8e8cafb7b72c7ca0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 00:19:36 +0000
Subject: [PATCH 3566/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.6.1 to 3.7.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 0690bcde61c..9e2bc69d139 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.32'
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From e9902d59e482f83edc4d6fdbdd6a18be5e84cb88 Mon Sep 17 00:00:00 2001
From: Roberto Perez Alcolea <rperezalcolea@netflix.com>
Date: Wed, 28 Feb 2024 10:47:25 -0800
Subject: [PATCH 3567/4969] openfga.md: fix typo in docker hub link (#8400)

---
 docs/modules/openfga.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/openfga.md b/docs/modules/openfga.md
index e11cae3560a..3df822468f4 100644
--- a/docs/modules/openfga.md
+++ b/docs/modules/openfga.md
@@ -1,6 +1,6 @@
 # OpenFGA
 
-Testcontainers module for [OpenFGA](https://hub.docker.com/r/"openfga/openfga).
+Testcontainers module for [OpenFGA](https://hub.docker.com/r/openfga/openfga).
 
 ## OpenFGAContainer's usage examples
 

From bfb837b22beca304dadd9b7cbe3f742c1523ce13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 28 Feb 2024 17:42:40 -0500
Subject: [PATCH 3568/4969] Add pgvector/pgvector as a compatible image (#7898)
 (#8401)

---
 .../org/testcontainers/containers/PostgreSQLContainer.java  | 6 ++++--
 .../org/testcontainers/containers/CompatibleImageTest.java  | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index bc276f4cc1b..27b3679b626 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -11,7 +11,7 @@
 /**
  * Testcontainers implementation for PostgreSQL.
  * <p>
- * Supported image: {@code postgres}
+ * Supported images: {@code postgres}, {@code pgvector/pgvector}
  * <p>
  * Exposed ports: 5432
  */
@@ -25,6 +25,8 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("postgres");
 
+    private static final DockerImageName PGVECTOR_IMAGE_NAME = DockerImageName.parse("pgvector/pgvector");
+
     public static final Integer POSTGRESQL_PORT = 5432;
 
     static final String DEFAULT_USER = "test";
@@ -53,7 +55,7 @@ public PostgreSQLContainer(final String dockerImageName) {
 
     public PostgreSQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, PGVECTOR_IMAGE_NAME);
 
         this.waitStrategy =
             new LogMessageWaitStrategy()
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
index 2bb1c6c3d54..76b4a8c1bda 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
@@ -15,9 +15,7 @@ public class CompatibleImageTest extends AbstractContainerDatabaseTest {
     public void pgvector() throws SQLException {
         try (
             // pgvectorContainer {
-            PostgreSQLContainer<?> pgvector = new PostgreSQLContainer<>(
-                DockerImageName.parse("pgvector/pgvector:pg16").asCompatibleSubstituteFor("postgres")
-            )
+            PostgreSQLContainer<?> pgvector = new PostgreSQLContainer<>("pgvector/pgvector:pg16")
             // }
         ) {
             pgvector.start();

From 8bec80c4dc1760d4ac6354c5e0400c5739d31eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 28 Feb 2024 16:46:37 -0600
Subject: [PATCH 3569/4969] Update check list in settings

---
 .github/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index ad711b60307..84f6cee242b 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -382,7 +382,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["check (:testcontainers:check)", "check (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
+        contexts: ["core", "check_docs_examples", "in-docker_test", "ci/circleci: minimal_core", "test"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches

From af5863cdf041536fb053019a2e0cfbd87be1b533 Mon Sep 17 00:00:00 2001
From: Silvio Giebl <gieblsilvio@outlook.com>
Date: Thu, 29 Feb 2024 00:54:09 +0100
Subject: [PATCH 3570/4969] Fix wrong permission setup for HiveMQ container
 (#8399)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 modules/hivemq/build.gradle                     |  3 +--
 .../testcontainers/hivemq/HiveMQContainer.java  |  6 +++---
 .../ContainerWithExtensionFromDirectoryIT.java  | 17 +++++++++++++----
 .../hivemq/ContainerWithExtensionIT.java        | 16 ++++++++++++----
 .../ContainerWithExtensionSubclassIT.java       |  2 +-
 .../ContainerWithFileInExtensionHomeIT.java     | 15 +++++++++++----
 .../hivemq/ContainerWithFileInHomeIT.java       |  2 +-
 .../hivemq/ContainerWithLicenseIT.java          |  2 +-
 .../hivemq/CreateFileInCopiedDirectoryIT.java   |  2 +-
 .../CreateFileInExtensionDirectoryIT.java       | 15 +++++++++++----
 .../hivemq/HiveMQTestContainerCore.java         |  2 +-
 .../hivemq/docs/DemoExtensionTestsIT.java       |  2 +-
 .../testcontainers/hivemq/docs/DemoFilesIT.java |  6 +++---
 .../hivemq/docs/DemoHiveMQContainerIT.java      |  4 ++--
 14 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 7aca932667b..6c03e07254d 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,14 +11,13 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.24.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.14")
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 }
 
 test {
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 4638f758745..29e78920917 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -134,9 +134,9 @@ protected void configure() {
         setCommand(
             "-c",
             removeCommand +
-            "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ " +
-            "; chmod -R 777 /opt/hivemq/extensions " +
-            "&& /opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
+            "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ ; " +
+            "chmod -R 777 /opt/hivemq/extensions ; " +
+            "/opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
         );
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
index 6fef56c0a2d..a5b6170a228 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
@@ -1,7 +1,10 @@
 package org.testcontainers.hivemq;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.slf4j.event.Level;
 import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
 import org.testcontainers.utility.DockerImageName;
@@ -11,12 +14,18 @@
 
 class ContainerWithExtensionFromDirectoryIT {
 
-    @Test
+    @ParameterizedTest
+    @ValueSource(
+        strings = {
+            "2020.1", // first version that provided a container image
+            "2024.3", // version that runs the image as a non-root user by default
+        }
+    )
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    void test() throws Exception {
+    void test(final @NotNull String hivemqCeTag) throws Exception {
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
             )
                 .withExtension(MountableFile.forClasspathResource("/modifier-extension"))
                 .waitForExtension("Modifier Extension")
@@ -33,7 +42,7 @@ void test() throws Exception {
     void test_wrongDirectoryName() throws Exception {
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
             )
                 .withExtension(MountableFile.forClasspathResource("/modifier-extension-wrong-name"))
                 .waitForExtension("Modifier Extension")
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
index eda3f236e2c..2b255912da9 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
@@ -1,7 +1,9 @@
 package org.testcontainers.hivemq;
 
-import org.junit.jupiter.api.Test;
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.testcontainers.hivemq.util.MyExtension;
 import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
 import org.testcontainers.utility.DockerImageName;
@@ -11,9 +13,15 @@
 
 class ContainerWithExtensionIT {
 
-    @Test
+    @ParameterizedTest
+    @ValueSource(
+        strings = {
+            "2020.1", // first version that provided a container image
+            "2024.3", // version that runs the image as a non-root user by default
+        }
+    )
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    void test() throws Exception {
+    void test(final @NotNull String hivemqCeTag) throws Exception {
         final HiveMQExtension hiveMQExtension = HiveMQExtension
             .builder()
             .id("extension-1")
@@ -24,7 +32,7 @@ void test() throws Exception {
 
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
             )
                 .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
                 .waitForExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
index cd1df9ce8e7..a907b8f2d2e 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
@@ -25,7 +25,7 @@ void test() throws Exception {
 
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
             )
                 .waitForExtension(hiveMQExtension)
                 .withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
index dde5e677a15..c3c74b0dce7 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
@@ -9,8 +9,9 @@
 import com.hivemq.extension.sdk.api.services.Services;
 import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -22,9 +23,15 @@
 
 class ContainerWithFileInExtensionHomeIT {
 
-    @Test
+    @ParameterizedTest
+    @ValueSource(
+        strings = {
+            "2020.1", // first version that provided a container image
+            "2024.3", // version that runs the image as a non-root user by default
+        }
+    )
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    void test() throws Exception {
+    void test(final @NotNull String hivemqCeTag) throws Exception {
         final HiveMQExtension hiveMQExtension = HiveMQExtension
             .builder()
             .id("extension-1")
@@ -35,7 +42,7 @@ void test() throws Exception {
 
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
             )
                 .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
                 .withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
index 78a51398bf3..c8e19316788 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
@@ -35,7 +35,7 @@ void test() throws Exception {
 
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
             )
                 .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
                 .withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
index f6aa6ed08f0..3973abddb0b 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
@@ -35,7 +35,7 @@ void test() throws Exception {
 
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
             )
                 .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
                 .withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
index c0e95f61cf6..df0f3ef3b9c 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -47,7 +47,7 @@ void test() throws Exception {
 
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
             )
                 .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
                 .withExtension(extension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
index 3e7bec94e6e..6f65ebb1e9f 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
@@ -9,8 +9,9 @@
 import com.hivemq.extension.sdk.api.services.Services;
 import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -23,9 +24,15 @@
 
 class CreateFileInExtensionDirectoryIT {
 
-    @Test
+    @ParameterizedTest
+    @ValueSource(
+        strings = {
+            "2020.1", // first version that provided a container image
+            "2024.3", // version that runs the image as a non-root user by default
+        }
+    )
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
-    void test() throws Exception {
+    void test(final @NotNull String hivemqCeTag) throws Exception {
         final HiveMQExtension hiveMQExtension = HiveMQExtension
             .builder()
             .id("extension-1")
@@ -36,7 +43,7 @@ void test() throws Exception {
 
         try (
             final HiveMQContainer hivemq = new HiveMQContainer(
-                DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+                DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
             )
                 .withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
                 .waitForExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
index 32097e52641..ede972e957d 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
@@ -16,7 +16,7 @@
 class HiveMQTestContainerCore {
 
     @NotNull
-    final HiveMQContainer container = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"));
+    final HiveMQContainer container = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3"));
 
     @TempDir
     File tempDir;
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
index f3289413a36..a1ff664649d 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
@@ -38,7 +38,7 @@ class DemoExtensionTestsIT {
 
     @Container
     final HiveMQContainer hivemqWithClasspathExtension = new HiveMQContainer(
-        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+        DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
     )
         .waitForExtension(hiveMQEClasspathxtension)
         .withExtension(hiveMQEClasspathxtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
index a76fa60576f..8fe08b24750 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
@@ -19,7 +19,7 @@ class DemoFilesIT {
 
     // hivemqHome {
     final HiveMQContainer hivemqFileInHome = new HiveMQContainer(
-        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+        DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
     )
         .withFileInHomeFolder(
             MountableFile.forHostPath("src/test/resources/additionalFile.txt"),
@@ -31,7 +31,7 @@ class DemoFilesIT {
     // extensionHome {
     @Container
     final HiveMQContainer hivemqFileInExtensionHome = new HiveMQContainer(
-        DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+        DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
     )
         .withExtension(
             HiveMQExtension
@@ -52,7 +52,7 @@ class DemoFilesIT {
 
     // withLicenses {
     @Container
-    final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+    final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3"))
         .withLicense(MountableFile.forHostPath("src/test/resources/myLicense.lic"))
         .withLicense(MountableFile.forHostPath("src/test/resources/myExtensionLicense.elic"));
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
index db6e3e58251..ed063617537 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -18,7 +18,7 @@ class DemoHiveMQContainerIT {
 
     // ceVersion {
     @Container
-    final HiveMQContainer hivemqCe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+    final HiveMQContainer hivemqCe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3"))
         .withLogLevel(Level.DEBUG);
 
     // }
@@ -43,7 +43,7 @@ class DemoHiveMQContainerIT {
 
     // specificVersion {
     @Container
-    final HiveMQContainer hivemqSpecificVersion = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce:2021.3"));
+    final HiveMQContainer hivemqSpecificVersion = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce:2024.3"));
 
     // }
 

From 87814115b63a58c5485929fae3a556ae2eee1d9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 23:54:52 +0000
Subject: [PATCH 3571/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/hivemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 6c03e07254d..f85842f8988 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.14")
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 
 test {

From f23c1ecd7c91ffdc0a0f476d64851fa39406d6fc Mon Sep 17 00:00:00 2001
From: He Wang <wanghechn@qq.com>
Date: Thu, 29 Feb 2024 07:59:32 +0800
Subject: [PATCH 3572/4969] Add oceanbase module (#7502)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  4 +
 .github/settings.yml                          |  3 +
 docs/modules/databases/jdbc.md                |  4 +
 docs/modules/databases/oceanbase.md           | 25 ++++++
 mkdocs.yml                                    |  1 +
 modules/oceanbase/build.gradle                |  8 ++
 .../oceanbase/OceanBaseCEContainer.java       | 82 +++++++++++++++++++
 .../OceanBaseCEContainerProvider.java         | 32 ++++++++
 .../oceanbase/OceanBaseJdbcUtils.java         | 45 ++++++++++
 ...s.containers.JdbcDatabaseContainerProvider |  1 +
 .../oceanbase/OceanBaseJdbcDriverTest.java    | 19 +++++
 .../oceanbase/SimpleOceanBaseCETest.java      | 69 ++++++++++++++++
 modules/oceanbase/src/test/resources/init.sql | 45 ++++++++++
 .../src/test/resources/logback-test.xml       | 16 ++++
 18 files changed, 362 insertions(+)
 create mode 100644 docs/modules/databases/oceanbase.md
 create mode 100644 modules/oceanbase/build.gradle
 create mode 100644 modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java
 create mode 100644 modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
 create mode 100644 modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseJdbcUtils.java
 create mode 100644 modules/oceanbase/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java
 create mode 100644 modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
 create mode 100644 modules/oceanbase/src/test/resources/init.sql
 create mode 100644 modules/oceanbase/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index abb8b0f7901..270f292dcf7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -42,6 +42,7 @@ body:
         - MySQL
         - Neo4j
         - NGINX
+        - OceanBase
         - OpenFGA
         - Oracle Free
         - Oracle XE
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 54868eea96d..97297c9ddb2 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -42,6 +42,7 @@ body:
         - MySQL
         - Neo4j
         - NGINX
+        - OceanBase
         - OpenFGA
         - Oracle Free
         - Oracle XE
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 2d28aca91d6..80048f00fb0 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -42,6 +42,7 @@ body:
         - MySQL
         - Neo4j
         - NGINX
+        - OceanBase
         - OpenFGA
         - Oracle Free
         - Oracle XE
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ddf7a8b7d9a..22cbe2c2748 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -219,6 +219,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/oceanbase"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/openfga"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8107870a59a..2b9dd3bc899 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -135,6 +135,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/nginx/**/*
+"modules/oceanbase":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/oceanbase/**/*
 "modules/openfga":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 84f6cee242b..6ac8714a40c 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -193,6 +193,9 @@ labels:
   - name: modules/nginx
     color: '#006b75'
 
+  - name: modules/oceanbase
+    color: '#006b75'
+
   - name: modules/openfga
     color: '#006b75'
 
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index dc11954153a..c1d0171c59e 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -55,6 +55,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:sqlserver:2017-CU12:///databasename`
 
+#### Using OceanBase
+
+`jdbc:tc:oceanbasece:4.2.2:///databasename`
+
 #### Using Oracle
 
 `jdbc:tc:oracle:21-slim-faststart:///databasename`
diff --git a/docs/modules/databases/oceanbase.md b/docs/modules/databases/oceanbase.md
new file mode 100644
index 00000000000..b90a492a6e4
--- /dev/null
+++ b/docs/modules/databases/oceanbase.md
@@ -0,0 +1,25 @@
+# OceanBase Module
+
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:oceanbase:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>oceanbase</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
+!!! hint
+Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
diff --git a/mkdocs.yml b/mkdocs.yml
index 8c5a0a769f1..ce0c33dcf16 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -64,6 +64,7 @@ nav:
                 - modules/databases/mssqlserver.md
                 - modules/databases/mysql.md
                 - modules/databases/neo4j.md
+                - modules/databases/oceanbase.md
                 - modules/databases/oraclefree.md
                 - modules/databases/oraclexe.md
                 - modules/databases/orientdb.md
diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
new file mode 100644
index 00000000000..e1f13a7a6a1
--- /dev/null
+++ b/modules/oceanbase/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: JDBC :: OceanBase"
+
+dependencies {
+    api project(':jdbc')
+
+    testImplementation project(':jdbc-test')
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
+}
diff --git a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java
new file mode 100644
index 00000000000..6c08ff165f2
--- /dev/null
+++ b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java
@@ -0,0 +1,82 @@
+package org.testcontainers.oceanbase;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for OceanBase Community Edition.
+ * <p>
+ * Supported image: {@code oceanbase/oceanbase-ce}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>SQL: 2881</li>
+ *     <li>RPC: 2882</li>
+ * </ul>
+ */
+public class OceanBaseCEContainer extends JdbcDatabaseContainer<OceanBaseCEContainer> {
+
+    static final String NAME = "oceanbasece";
+
+    static final String DOCKER_IMAGE_NAME = "oceanbase/oceanbase-ce";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_IMAGE_NAME);
+
+    private static final Integer SQL_PORT = 2881;
+
+    private static final Integer RPC_PORT = 2882;
+
+    private static final String DEFAULT_TEST_TENANT_NAME = "test";
+
+    private static final String DEFAULT_USERNAME = "root";
+
+    private static final String DEFAULT_PASSWORD = "";
+
+    private static final String DEFAULT_DATABASE_NAME = "test";
+
+    public OceanBaseCEContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public OceanBaseCEContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPorts(SQL_PORT, RPC_PORT);
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return OceanBaseJdbcUtils.getDriverClass();
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        String prefix = OceanBaseJdbcUtils.isMySQLDriver(getDriverClassName()) ? "jdbc:mysql://" : "jdbc:oceanbase://";
+        return prefix + getHost() + ":" + getMappedPort(SQL_PORT) + "/" + DEFAULT_DATABASE_NAME + additionalUrlParams;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return DEFAULT_DATABASE_NAME;
+    }
+
+    @Override
+    public String getUsername() {
+        // In OceanBase, the jdbc username is related to the name of user, tenant and cluster,
+        // if a tenant name other than the default value 'test' is used, you should manually
+        // construct the jdbc username by yourself.
+        return DEFAULT_USERNAME + "@" + DEFAULT_TEST_TENANT_NAME;
+    }
+
+    @Override
+    public String getPassword() {
+        return DEFAULT_PASSWORD;
+    }
+
+    @Override
+    protected String getTestQueryString() {
+        return "SELECT 1";
+    }
+}
diff --git a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
new file mode 100644
index 00000000000..d0f651bc338
--- /dev/null
+++ b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
@@ -0,0 +1,32 @@
+package org.testcontainers.oceanbase;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for OceanBase Community Edition containers.
+ */
+public class OceanBaseCEContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final String DEFAULT_TAG = "4.2.2";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(OceanBaseCEContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        if (tag != null) {
+            return new OceanBaseCEContainer(DockerImageName.parse(OceanBaseCEContainer.DOCKER_IMAGE_NAME).withTag(tag));
+        } else {
+            return newInstance();
+        }
+    }
+}
diff --git a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseJdbcUtils.java b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseJdbcUtils.java
new file mode 100644
index 00000000000..d2e90f48ee6
--- /dev/null
+++ b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseJdbcUtils.java
@@ -0,0 +1,45 @@
+package org.testcontainers.oceanbase;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Utils for OceanBase Jdbc Connection.
+ */
+class OceanBaseJdbcUtils {
+
+    static final String MYSQL_JDBC_DRIVER = "com.mysql.cj.jdbc.Driver";
+
+    static final String MYSQL_LEGACY_JDBC_DRIVER = "com.mysql.jdbc.Driver";
+
+    static final String OCEANBASE_JDBC_DRIVER = "com.oceanbase.jdbc.Driver";
+
+    static final String OCEANBASE_LEGACY_JDBC_DRIVER = "com.alipay.oceanbase.jdbc.Driver";
+
+    static final List<String> SUPPORTED_DRIVERS = Arrays.asList(
+        OCEANBASE_JDBC_DRIVER,
+        OCEANBASE_LEGACY_JDBC_DRIVER,
+        MYSQL_JDBC_DRIVER,
+        MYSQL_LEGACY_JDBC_DRIVER
+    );
+
+    static String getDriverClass() {
+        for (String driverClass : SUPPORTED_DRIVERS) {
+            try {
+                Class.forName(driverClass);
+                return driverClass;
+            } catch (ClassNotFoundException e) {
+                // try to load next driver
+            }
+        }
+        throw new RuntimeException("Can't find valid driver class for OceanBase");
+    }
+
+    static boolean isMySQLDriver(String driverClassName) {
+        return MYSQL_JDBC_DRIVER.equals(driverClassName) || MYSQL_LEGACY_JDBC_DRIVER.equals(driverClassName);
+    }
+
+    static boolean isOceanBaseDriver(String driverClassName) {
+        return OCEANBASE_JDBC_DRIVER.equals(driverClassName) || OCEANBASE_LEGACY_JDBC_DRIVER.equals(driverClassName);
+    }
+}
diff --git a/modules/oceanbase/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/oceanbase/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..505bfe5e088
--- /dev/null
+++ b/modules/oceanbase/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.oceanbase.OceanBaseCEContainerProvider
diff --git a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java
new file mode 100644
index 00000000000..a4f63b1eb90
--- /dev/null
+++ b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java
@@ -0,0 +1,19 @@
+package org.testcontainers.oceanbase;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+@RunWith(Parameterized.class)
+public class OceanBaseJdbcDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] { { "jdbc:tc:oceanbasece://hostname/databasename", EnumSet.noneOf(Options.class) } }
+        );
+    }
+}
diff --git a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
new file mode 100644
index 00000000000..7c4f20e4943
--- /dev/null
+++ b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
@@ -0,0 +1,69 @@
+package org.testcontainers.oceanbase;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SimpleOceanBaseCETest extends AbstractContainerDatabaseTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(SimpleOceanBaseCETest.class);
+
+    private final OceanBaseCEContainerProvider containerProvider = new OceanBaseCEContainerProvider();
+
+    @SuppressWarnings("resource")
+    private OceanBaseCEContainer testContainer() {
+        return ((OceanBaseCEContainer) containerProvider.newInstance()).withEnv("MODE", "slim")
+            .withEnv("FASTBOOT", "true")
+            .withLogConsumer(new Slf4jLogConsumer(logger));
+    }
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (OceanBaseCEContainer container = testContainer()) {
+            container.start();
+
+            ResultSet resultSet = performQuery(container, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(container);
+        }
+    }
+
+    @Test
+    public void testExplicitInitScript() throws SQLException {
+        try (OceanBaseCEContainer container = testContainer().withInitScript("init.sql")) {
+            container.start();
+
+            ResultSet resultSet = performQuery(container, "SELECT foo FROM bar");
+            String firstColumnValue = resultSet.getString(1);
+            assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
+        }
+    }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (OceanBaseCEContainer container = testContainer().withUrlParam("useSSL", "false")) {
+            container.start();
+
+            String jdbcUrl = container.getJdbcUrl();
+            assertThat(jdbcUrl).contains("?");
+            assertThat(jdbcUrl).contains("useSSL=false");
+        }
+    }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(OceanBaseCEContainer container) {
+        int sqlPort = 2881;
+        int rpcPort = 2882;
+
+        assertThat(container.getExposedPorts()).containsExactlyInAnyOrder(sqlPort, rpcPort);
+        assertThat(container.getLivenessCheckPortNumbers())
+            .containsExactlyInAnyOrder(container.getMappedPort(sqlPort), container.getMappedPort(rpcPort));
+    }
+}
diff --git a/modules/oceanbase/src/test/resources/init.sql b/modules/oceanbase/src/test/resources/init.sql
new file mode 100644
index 00000000000..98d6889b078
--- /dev/null
+++ b/modules/oceanbase/src/test/resources/init.sql
@@ -0,0 +1,45 @@
+CREATE TABLE bar (
+    foo VARCHAR(255)
+);
+
+DROP PROCEDURE IF EXISTS -- ;
+    count_foo;
+
+SELECT "a /* string literal containing comment characters like -- here";
+SELECT "a 'quoting' \"scenario ` involving BEGIN keyword\" here";
+SELECT * from `bar`;
+
+-- What about a line comment containing imbalanced string delimiters? "
+
+CREATE PROCEDURE count_foo()
+BEGIN
+
+    BEGIN
+        SELECT *
+        FROM bar;
+        SELECT 1
+        FROM dual;
+    END;
+
+    BEGIN
+        select * from bar;
+    END;
+
+    -- we can do comments
+
+    /* including block
+       comments
+     */
+
+    /* what if BEGIN appears inside a comment? */
+
+    select "or what if BEGIN appears inside a literal?";
+
+END /*; */;
+
+/* or a block comment
+    containing imbalanced string delimiters?
+    ' "
+    */
+
+INSERT INTO bar (foo) /* ; */ VALUES ('hello world');
diff --git a/modules/oceanbase/src/test/resources/logback-test.xml b/modules/oceanbase/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/oceanbase/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 33c904ed9c23088d725dd0b5f017cdab2384edae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 29 Feb 2024 18:07:13 -0500
Subject: [PATCH 3573/4969] Update docker-java version to 3.3.6 (#8410)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a318ff00b10..13152748815 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.5')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.5')
+    api platform('com.github.docker-java:docker-java-bom:3.3.6')
+    shaded platform('com.github.docker-java:docker-java-bom:3.3.6')
 
     api "com.github.docker-java:docker-java-api"
 

From cab8b2f79c4f80767b6923107a2c34a8ed3f972a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 23:08:58 +0000
Subject: [PATCH 3574/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 13152748815..a1c361030cb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -120,12 +120,12 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.25.1'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.25.3'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 93ca7cd7345145de315e1d3c60f8b1ad07442cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 1 Mar 2024 19:13:45 -0500
Subject: [PATCH 3575/4969] Add Ollama module (#8369)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  4 +
 .github/settings.yml                          |  3 +
 docs/modules/ollama.md                        | 30 +++++++
 mkdocs.yml                                    |  1 +
 modules/ollama/build.gradle                   |  8 ++
 .../ollama/OllamaContainer.java               | 80 +++++++++++++++++++
 .../ollama/OllamaContainerTest.java           | 56 +++++++++++++
 .../src/test/resources/logback-test.xml       | 16 ++++
 12 files changed, 206 insertions(+)
 create mode 100644 docs/modules/ollama.md
 create mode 100644 modules/ollama/build.gradle
 create mode 100644 modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java
 create mode 100644 modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
 create mode 100644 modules/ollama/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 270f292dcf7..1458b89d2f7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -43,6 +43,7 @@ body:
         - Neo4j
         - NGINX
         - OceanBase
+        - Ollama
         - OpenFGA
         - Oracle Free
         - Oracle XE
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 97297c9ddb2..2baf2be99eb 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -43,6 +43,7 @@ body:
         - Neo4j
         - NGINX
         - OceanBase
+        - Ollama
         - OpenFGA
         - Oracle Free
         - Oracle XE
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 80048f00fb0..fb5013a41d3 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -43,6 +43,7 @@ body:
         - Neo4j
         - NGINX
         - OceanBase
+        - Ollama
         - OpenFGA
         - Oracle Free
         - Oracle XE
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 22cbe2c2748..0bb82dce9f4 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -224,6 +224,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/ollama"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/openfga"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 2b9dd3bc899..387b1644801 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -139,6 +139,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/oceanbase/**/*
+"modules/ollama":
+  - changed-files:
+      - any-glob-to-any-file:
+          - modules/ollama/**/*
 "modules/openfga":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 6ac8714a40c..9cf3d27d5d4 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -196,6 +196,9 @@ labels:
   - name: modules/oceanbase
     color: '#006b75'
 
+  - name: modules/ollama
+    color: '#006b75'
+
   - name: modules/openfga
     color: '#006b75'
 
diff --git a/docs/modules/ollama.md b/docs/modules/ollama.md
new file mode 100644
index 00000000000..97e8865bdc1
--- /dev/null
+++ b/docs/modules/ollama.md
@@ -0,0 +1,30 @@
+# Ollama
+
+Testcontainers module for [Ollama](https://hub.docker.com/r/ollama/ollama) .
+
+## Ollama's usage examples
+
+You can start an Ollama container instance from any Java application by using:
+
+<!--codeinclude-->
+[Ollama container](../../modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:ollama:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>ollama</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index ce0c33dcf16..d5f5b275288 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -90,6 +90,7 @@ nav:
           - modules/minio.md
           - modules/mockserver.md
           - modules/nginx.md
+          - modules/ollama.md
           - modules/openfga.md
           - modules/pulsar.md
           - modules/qdrant.md
diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
new file mode 100644
index 00000000000..b64083062ec
--- /dev/null
+++ b/modules/ollama/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: Ollama"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+}
diff --git a/modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java b/modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java
new file mode 100644
index 00000000000..1c739b95a6b
--- /dev/null
+++ b/modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java
@@ -0,0 +1,80 @@
+package org.testcontainers.ollama;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.DeviceRequest;
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.RuntimeInfo;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Testcontainers implementation for Ollama.
+ * <p>
+ * Supported image: {@code ollama/ollama}
+ * <p>
+ * Exposed ports: 11434
+ */
+public class OllamaContainer extends GenericContainer<OllamaContainer> {
+
+    private static final DockerImageName DOCKER_IMAGE_NAME = DockerImageName.parse("ollama/ollama");
+
+    public OllamaContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public OllamaContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DOCKER_IMAGE_NAME);
+
+        Info info = this.dockerClient.infoCmd().exec();
+        Map<String, RuntimeInfo> runtimes = info.getRuntimes();
+        if (runtimes != null) {
+            if (runtimes.containsKey("nvidia")) {
+                withCreateContainerCmdModifier(cmd -> {
+                    cmd
+                        .getHostConfig()
+                        .withDeviceRequests(
+                            Collections.singletonList(
+                                new DeviceRequest()
+                                    .withCapabilities(Collections.singletonList(Collections.singletonList("gpu")))
+                                    .withCount(-1)
+                            )
+                        );
+                });
+            }
+        }
+        withExposedPorts(11434);
+    }
+
+    /**
+     * Commits the current file system changes in the container into a new image.
+     * Should be used for creating an image that contains a loaded model.
+     * @param imageName the name of the new image
+     */
+    public void commitToImage(String imageName) {
+        DockerImageName dockerImageName = DockerImageName.parse(getDockerImageName());
+        if (!dockerImageName.equals(DockerImageName.parse(imageName))) {
+            DockerClient dockerClient = DockerClientFactory.instance().client();
+            List<Image> images = dockerClient.listImagesCmd().withReferenceFilter(imageName).exec();
+            if (images.isEmpty()) {
+                DockerImageName imageModel = DockerImageName.parse(imageName);
+                dockerClient
+                    .commitCmd(getContainerId())
+                    .withRepository(imageModel.getUnversionedPart())
+                    .withLabels(Collections.singletonMap("org.testcontainers.sessionId", ""))
+                    .withTag(imageModel.getVersionPart())
+                    .exec();
+            }
+        }
+    }
+
+    public String getEndpoint() {
+        return "http://" + getHost() + ":" + getMappedPort(11434);
+    }
+}
diff --git a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
new file mode 100644
index 00000000000..d33660b40b0
--- /dev/null
+++ b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
@@ -0,0 +1,56 @@
+package org.testcontainers.ollama;
+
+import org.junit.Test;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class OllamaContainerTest {
+
+    @Test
+    public void withDefaultConfig() {
+        try ( // container {
+            OllamaContainer ollama = new OllamaContainer("ollama/ollama:0.1.26")
+            // }
+        ) {
+            ollama.start();
+
+            String version = given().baseUri(ollama.getEndpoint()).get("/api/version").jsonPath().get("version");
+            assertThat(version).isEqualTo("0.1.26");
+        }
+    }
+
+    @Test
+    public void downloadModelAndCommitToImage() throws IOException, InterruptedException {
+        String newImageName = "tc-ollama-allminilm-" + Base58.randomString(4).toLowerCase();
+        try (OllamaContainer ollama = new OllamaContainer("ollama/ollama:0.1.26")) {
+            ollama.start();
+            ollama.execInContainer("ollama", "pull", "all-minilm");
+
+            String modelName = given()
+                .baseUri(ollama.getEndpoint())
+                .get("/api/tags")
+                .jsonPath()
+                .getString("models[0].name");
+            assertThat(modelName).contains("all-minilm");
+            ollama.commitToImage(newImageName);
+        }
+        try (
+            OllamaContainer ollama = new OllamaContainer(
+                DockerImageName.parse(newImageName).asCompatibleSubstituteFor("ollama/ollama")
+            )
+        ) {
+            ollama.start();
+            String modelName = given()
+                .baseUri(ollama.getEndpoint())
+                .get("/api/tags")
+                .jsonPath()
+                .getString("models[0].name");
+            assertThat(modelName).contains("all-minilm");
+        }
+    }
+}
diff --git a/modules/ollama/src/test/resources/logback-test.xml b/modules/ollama/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/ollama/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 4a0d27edeb5749c2c6777ff08303d342eefb06c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 00:14:26 +0000
Subject: [PATCH 3576/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/ollama

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index b64083062ec..1f65324bf10 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Ollama"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From 198b7fa45e9954eae1ad861c7a23a822ce07f463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 4 Mar 2024 11:59:13 -0600
Subject: [PATCH 3577/4969] Fix openfga doc

---
 .../java/org/testcontainers/openfga/OpenFGAContainerTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java b/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
index 688d4d31f10..6f444b697f0 100644
--- a/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
+++ b/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
@@ -15,7 +15,7 @@ public class OpenFGAContainerTest {
 
     @Test
     public void withDefaultConfig() throws FgaInvalidParameterException, ExecutionException, InterruptedException {
-        try ( // container
+        try ( // container {
             OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.4.3")
             // }
         ) {

From 184680507f420922a2b18b86f5a07efeba7c589f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 4 Mar 2024 16:52:42 -0500
Subject: [PATCH 3578/4969] Improve Ollama docs (#8417)

---
 docs/modules/ollama.md                        | 22 +++++++++++++++++++
 .../ollama/OllamaContainerTest.java           |  6 +++++
 2 files changed, 28 insertions(+)

diff --git a/docs/modules/ollama.md b/docs/modules/ollama.md
index 97e8865bdc1..98d9c204966 100644
--- a/docs/modules/ollama.md
+++ b/docs/modules/ollama.md
@@ -10,6 +10,28 @@ You can start an Ollama container instance from any Java application by using:
 [Ollama container](../../modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
+### Pulling the model
+
+Testcontainers allows [executing commands in the container](../features/commands.md). So, pulling the model is as simple as: 
+
+<!--codeinclude-->
+[Pull model](../../modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java) inside_block:pullModel
+<!--/codeinclude-->
+
+### Create a new Image
+
+In order to create a new image that contains the model, you can use the following code:
+
+<!--codeinclude-->
+[Commit Image](../../modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java) inside_block:commitToImage
+<!--/codeinclude-->
+
+And use the new image along with [Image name Substitution](../features/image_name_substitution.md#manual-substitution)
+
+<!--codeinclude-->
+[Use new Image](../../modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java) inside_block:containerSubstitute
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
index d33660b40b0..cefd665b044 100644
--- a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
+++ b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
@@ -29,7 +29,9 @@ public void downloadModelAndCommitToImage() throws IOException, InterruptedExcep
         String newImageName = "tc-ollama-allminilm-" + Base58.randomString(4).toLowerCase();
         try (OllamaContainer ollama = new OllamaContainer("ollama/ollama:0.1.26")) {
             ollama.start();
+            // pullModel {
             ollama.execInContainer("ollama", "pull", "all-minilm");
+            // }
 
             String modelName = given()
                 .baseUri(ollama.getEndpoint())
@@ -37,12 +39,16 @@ public void downloadModelAndCommitToImage() throws IOException, InterruptedExcep
                 .jsonPath()
                 .getString("models[0].name");
             assertThat(modelName).contains("all-minilm");
+            // commitToImage {
             ollama.commitToImage(newImageName);
+            // }
         }
         try (
+            // containerSubstitute {
             OllamaContainer ollama = new OllamaContainer(
                 DockerImageName.parse(newImageName).asCompatibleSubstituteFor("ollama/ollama")
             )
+            // }
         ) {
             ollama.start();
             String modelName = given()

From 4b5b34a8ec1af9eee3a6a4f5e53fc4eda8e4bb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Przyby=C5=82?=
 <23506256+pioorg@users.noreply.github.com>
Date: Mon, 4 Mar 2024 23:18:40 +0100
Subject: [PATCH 3579/4969] Enable lazy certificates for Elasticsearch (#7991)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 modules/elasticsearch/build.gradle            |  6 ++
 .../elasticsearch/ElasticsearchContainer.java | 60 ++++++++++---------
 .../ElasticsearchContainerTest.java           | 44 ++++++++++++++
 3 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 56399a509d9..550e9a9b23a 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -6,3 +6,9 @@ dependencies {
     testImplementation "org.elasticsearch.client:transport:7.17.17"
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.elasticsearch.ElasticsearchContainer#containerIsStarted(com.github.dockerjava.api.command.InspectContainerResponse)",
+    ]
+}
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 940d6924c5e..e96ae26c02f 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -1,6 +1,5 @@
 package org.testcontainers.elasticsearch;
 
-import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -66,6 +65,9 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
 
     private static final DockerImageName ELASTICSEARCH_IMAGE_NAME = DockerImageName.parse("elasticsearch");
 
+    // default location of the automatically generated self-signed HTTP cert for versions >= 8
+    private static final String DEFAULT_CERT_PATH = "/usr/share/elasticsearch/config/certs/http_ca.crt";
+
     /**
      * Elasticsearch Default version
      */
@@ -77,9 +79,7 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
 
     private final boolean isAtLeastMajorVersion8;
 
-    private Optional<byte[]> caCertAsBytes = Optional.empty();
-
-    private String certPath = "/usr/share/elasticsearch/config/certs/http_ca.crt";
+    private String certPath = "";
 
     /**
      * @deprecated use {@link #ElasticsearchContainer(DockerImageName)} instead
@@ -91,6 +91,7 @@ public ElasticsearchContainer() {
 
     /**
      * Create an Elasticsearch Container by passing the full docker image name
+     *
      * @param dockerImageName Full docker image name as a {@link String}, like: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
      */
     public ElasticsearchContainer(String dockerImageName) {
@@ -99,6 +100,7 @@ public ElasticsearchContainer(String dockerImageName) {
 
     /**
      * Create an Elasticsearch Container by passing the full docker image name
+     *
      * @param dockerImageName Full docker image name as a {@link DockerImageName}, like: DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:7.9.2")
      */
     public ElasticsearchContainer(final DockerImageName dockerImageName) {
@@ -136,23 +138,7 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx(regex));
         if (isAtLeastMajorVersion8) {
             withPassword(ELASTICSEARCH_DEFAULT_PASSWORD);
-        }
-    }
-
-    @Override
-    protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        if (isAtLeastMajorVersion8 && StringUtils.isNotEmpty(certPath)) {
-            try {
-                byte[] bytes = copyFileFromContainer(certPath, IOUtils::toByteArray);
-                if (bytes.length > 0) {
-                    this.caCertAsBytes = Optional.of(bytes);
-                }
-            } catch (NotFoundException e) {
-                // just emit an error message, but do not throw an exception
-                // this might be ok, if the docker image is accidentally looking like version 8 or latest
-                // can happen if Elasticsearch is repackaged, i.e. with custom plugins
-                log.warn("CA cert under " + certPath + " not found.");
-            }
+            withCertPath(DEFAULT_CERT_PATH);
         }
     }
 
@@ -162,17 +148,36 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
      * @return byte array optional containing the CA cert extracted from the docker container
      */
     public Optional<byte[]> caCertAsBytes() {
-        return caCertAsBytes;
+        if (StringUtils.isBlank(certPath)) {
+            return Optional.empty();
+        }
+        try {
+            byte[] bytes = copyFileFromContainer(certPath, IOUtils::toByteArray);
+            if (bytes.length > 0) {
+                return Optional.of(bytes);
+            }
+        } catch (NotFoundException e) {
+            // just emit an error message, but do not throw an exception
+            // this might be ok, if the docker image is accidentally looking like version 8 or latest
+            // can happen if Elasticsearch is repackaged, i.e. with custom plugins
+            log.warn("CA cert under " + certPath + " not found.");
+        }
+        return Optional.empty();
     }
 
     /**
-     * A SSL context based on the self signed CA, so that using this SSL Context allows to connect to the Elasticsearch service
+     * A SSL context based on the self-signed CA, so that using this SSL Context allows to connect to the Elasticsearch service
      * @return a customized SSL Context
      */
     public SSLContext createSslContextFromCa() {
         try {
             CertificateFactory factory = CertificateFactory.getInstance("X.509");
-            Certificate trustedCa = factory.generateCertificate(new ByteArrayInputStream(caCertAsBytes.get()));
+            Certificate trustedCa = factory.generateCertificate(
+                new ByteArrayInputStream(
+                    caCertAsBytes()
+                        .orElseThrow(() -> new IllegalStateException("CA cert under " + certPath + " not found."))
+                )
+            );
             KeyStore trustStore = KeyStore.getInstance("pkcs12");
             trustStore.load(null, null);
             trustStore.setCertificateEntry("ca", trustedCa);
@@ -190,13 +195,13 @@ public SSLContext createSslContextFromCa() {
     /**
      * Define the Elasticsearch password to set. It enables security behind the scene for major version below 8.0.0.
      * It's not possible to use security with the oss image.
-     * @param password  Password to set
+     * @param password Password to set
      * @return this
      */
     public ElasticsearchContainer withPassword(String password) {
         if (isOss) {
             throw new IllegalArgumentException(
-                "You can not activate security on Elastic OSS Image. " + "Please switch to the default distribution"
+                "You can not activate security on Elastic OSS Image. Please switch to the default distribution"
             );
         }
         withEnv("ELASTIC_PASSWORD", password);
@@ -222,7 +227,8 @@ public String getHttpHostAddress() {
         return getHost() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
     }
 
-    @Deprecated // The TransportClient will be removed in Elasticsearch 8. No need to expose this port anymore in the future.
+    // The TransportClient will be removed in Elasticsearch 8. No need to expose this port anymore in the future.
+    @Deprecated
     public InetSocketAddress getTcpHost() {
         return new InetSocketAddress(getHost(), getMappedPort(ELASTICSEARCH_DEFAULT_TCP_PORT));
     }
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 2b832f28a16..555cec58083 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -23,6 +23,7 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.RemoteDockerImage;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
@@ -375,6 +376,49 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
         }
     }
 
+    @Test
+    public void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Exception {
+        String customizedCertPath = "/usr/share/elasticsearch/config/certs/http_ca_customized.crt";
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:7.17.15"
+            )
+                .withPassword(ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD)
+                .withEnv("xpack.security.enabled", "true")
+                .withEnv("xpack.security.http.ssl.enabled", "true")
+                .withEnv("xpack.security.http.ssl.key", "/usr/share/elasticsearch/config/certs/elasticsearch.key")
+                .withEnv(
+                    "xpack.security.http.ssl.certificate",
+                    "/usr/share/elasticsearch/config/certs/elasticsearch.crt"
+                )
+                .withEnv("xpack.security.http.ssl.certificate_authorities", customizedCertPath)
+                // these lines show how certificates can be created self-made way
+                // obviously this shouldn't be done in prod environment, where proper and officially signed keys should be present
+                .withCopyToContainer(
+                    Transferable.of(
+                        "#!/bin/bash\n" +
+                        "mkdir -p /usr/share/elasticsearch/config/certs;" +
+                        "openssl req -x509 -newkey rsa:4096 -keyout /usr/share/elasticsearch/config/certs/elasticsearch.key -out /usr/share/elasticsearch/config/certs/elasticsearch.crt -days 365 -nodes -subj \"/CN=localhost\";" +
+                        "openssl x509 -outform der -in /usr/share/elasticsearch/config/certs/elasticsearch.crt -out " +
+                        customizedCertPath +
+                        "; chown -R elasticsearch /usr/share/elasticsearch/config/certs/",
+                        555
+                    ),
+                    "/usr/share/elasticsearch/generate-certs.sh"
+                )
+                // because we need to generate the certificates before Elasticsearch starts, the entry command has to be tuned accordingly
+                .withCommand(
+                    "sh",
+                    "-c",
+                    "/usr/share/elasticsearch/generate-certs.sh && /usr/local/bin/docker-entrypoint.sh"
+                )
+                .withCertPath(customizedCertPath)
+        ) {
+            container.start();
+            assertClusterHealthResponse(container);
+        }
+    }
+
     @Test
     public void testElasticsearchDefaultMaxHeapSize() throws Exception {
         long defaultHeapSize = 2147483648L;

From 5eea807d1285b28a80f8cb2698dd9bb74cfad4ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:35:49 +0000
Subject: [PATCH 3580/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.26 to 3.2.29.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/3.2.29/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.26...3.2.29)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 09e47b14ce7..af3dd5c8890 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.26"
+    api "com.orientechnologies:orientdb-client:3.2.29"
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'

From ce3315d56c2975077c9c4e769d29534e262d93be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 5 Mar 2024 14:38:47 -0600
Subject: [PATCH 3581/4969] Fix ollama docs

---
 docs/modules/ollama.md                                          | 2 +-
 .../java/org/testcontainers/ollama/OllamaContainerTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/ollama.md b/docs/modules/ollama.md
index 98d9c204966..e54ee824938 100644
--- a/docs/modules/ollama.md
+++ b/docs/modules/ollama.md
@@ -29,7 +29,7 @@ In order to create a new image that contains the model, you can use the followin
 And use the new image along with [Image name Substitution](../features/image_name_substitution.md#manual-substitution)
 
 <!--codeinclude-->
-[Use new Image](../../modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java) inside_block:containerSubstitute
+[Use new Image](../../modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java) inside_block:substitute
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
index cefd665b044..96118f50be6 100644
--- a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
+++ b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
@@ -44,7 +44,7 @@ public void downloadModelAndCommitToImage() throws IOException, InterruptedExcep
             // }
         }
         try (
-            // containerSubstitute {
+            // substitute {
             OllamaContainer ollama = new OllamaContainer(
                 DockerImageName.parse(newImageName).asCompatibleSubstituteFor("ollama/ollama")
             )

From 57468bbec46bc62336bb522b98132ef2ed6eb0d4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 18:41:47 -0500
Subject: [PATCH 3582/4969] Update testcontainers version to 1.19.7 (#8429)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 26b4b4f0c26..a8d90824f3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.19.6
+testcontainers.version=1.19.7

From eb7af26593226d88be58c2d85e8411f82449b076 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 18:42:08 -0500
Subject: [PATCH 3583/4969] Update docs version to 1.19.7 (#8428)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index d5f5b275288..0beb5e182a3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -132,4 +132,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.6
+    latest_version: 1.19.7

From d3b0df2d89ee349890c94b0ce220a167c82ddf51 Mon Sep 17 00:00:00 2001
From: colin lee <39513055@qq.com>
Date: Thu, 7 Mar 2024 03:42:18 +0800
Subject: [PATCH 3584/4969] Add getDatabaseName() method to ClickHouseContainer
 (#8339)

---
 .../org/testcontainers/clickhouse/ClickHouseContainer.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index ffa1307204a..f65177ce68a 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -97,6 +97,11 @@ public String getPassword() {
         return password;
     }
 
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
     @Override
     public String getTestQueryString() {
         return TEST_QUERY;

From 5bb96072a1d469d96d273dc48db15db8ca8ab5b9 Mon Sep 17 00:00:00 2001
From: Marcin Antas <antas.marcin@gmail.com>
Date: Sat, 9 Mar 2024 23:50:38 +0100
Subject: [PATCH 3585/4969] Add method for getting Weaviate's gRPC port (#8431)

---
 modules/weaviate/build.gradle                             | 2 +-
 .../org/testcontainers/weaviate/WeaviateContainer.java    | 4 ++++
 .../testcontainers/weaviate/WeaviateContainerTest.java    | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 06a77aa434a..b96c4075d25 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'io.weaviate:client:4.5.1'
+    testImplementation 'io.weaviate:client:4.6.0'
 }
diff --git a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
index bd217b13e75..c8920a4cfb9 100644
--- a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
+++ b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
@@ -33,4 +33,8 @@ public WeaviateContainer(DockerImageName dockerImageName) {
     public String getHttpHostAddress() {
         return getHost() + ":" + getMappedPort(8080);
     }
+
+    public String getGrpcHostAddress() {
+        return getHost() + ":" + getMappedPort(50051);
+    }
 }
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index 562fc36de51..9aa8fe19f61 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -13,13 +13,15 @@ public class WeaviateContainerTest {
     @Test
     public void test() {
         try ( // container {
-            WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.22.4")
+            WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.24.1")
             // }
         ) {
             weaviate.start();
-            WeaviateClient client = new WeaviateClient(new Config("http", weaviate.getHttpHostAddress()));
+            Config config = new Config("http", weaviate.getHttpHostAddress());
+            config.setGRPCHost(weaviate.getGrpcHostAddress());
+            WeaviateClient client = new WeaviateClient(config);
             Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.22.4");
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.24.1");
         }
     }
 }

From 267d609cd839d9b84b1dbcd139f1326c329772ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:07:37 +0000
Subject: [PATCH 3586/4969] Bump redis.clients:jedis from 5.1.0 to 5.1.2 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.0 to 5.1.2.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.0...v5.1.2)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 95e0e7b1223..04a2f584acc 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.1.0'
+    testImplementation 'redis.clients:jedis:5.1.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 59267693e66da68e10a636f5752f5827c0725e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 13 Mar 2024 13:32:58 -0500
Subject: [PATCH 3587/4969] [redpanda] Override entrypoint (#8450)

Currently, cmd has declared the full command. Overriding the entrypoint
will fix the container execution with other container runtimes.

Fixes #8432
---
 .../java/org/testcontainers/redpanda/RedpandaContainer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index cc1d07c883a..8960487e39b 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -92,7 +92,7 @@ public RedpandaContainer(DockerImageName imageName) {
 
         withExposedPorts(REDPANDA_PORT, REDPANDA_ADMIN_PORT, SCHEMA_REGISTRY_PORT, REST_PROXY_PORT);
         withCreateContainerCmdModifier(cmd -> {
-            cmd.withEntrypoint();
+            cmd.withEntrypoint("/entrypoint-tc.sh");
             cmd.withUser("root:root");
         });
         waitingFor(Wait.forLogMessage(".*Successfully started Redpanda!.*", 1));
@@ -100,7 +100,7 @@ public RedpandaContainer(DockerImageName imageName) {
             MountableFile.forClasspathResource("testcontainers/entrypoint-tc.sh", 0700),
             "/entrypoint-tc.sh"
         );
-        withCommand("/entrypoint-tc.sh", "redpanda", "start", "--mode=dev-container", "--smp=1", "--memory=1G");
+        withCommand("redpanda", "start", "--mode=dev-container", "--smp=1", "--memory=1G");
     }
 
     @Override

From 358f68a63a8450ca22626071232b044824f93564 Mon Sep 17 00:00:00 2001
From: Silvio Giebl <gieblsilvio@outlook.com>
Date: Wed, 13 Mar 2024 20:50:45 +0100
Subject: [PATCH 3588/4969] Handle `Created` empty field from image inspect
 (#8302)

- For docker engine versions up to 24.0.x: Created="0001-01-01T00:00:00Z" for all API versions (max 1.43)
- For docker engine versions 25.0.0-25.0.3: Created="" for all API versions (max 1.44) => this is considered a bug
- For docker engine versions 25.0.4+:
  - Created="0001-01-01T00:00:00Z" for API versions up to 1.43 (backwards compatibility)
  - Created is absent for API versions 1.44+
---
 .../java/org/testcontainers/images/ImageData.java   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/ImageData.java b/core/src/main/java/org/testcontainers/images/ImageData.java
index 694b7ef6528..5b9f8227924 100644
--- a/core/src/main/java/org/testcontainers/images/ImageData.java
+++ b/core/src/main/java/org/testcontainers/images/ImageData.java
@@ -17,13 +17,16 @@ public class ImageData {
     Instant createdAt;
 
     static ImageData from(InspectImageResponse inspectImageResponse) {
-        return ImageData
-            .builder()
-            .createdAt(ZonedDateTime.parse(inspectImageResponse.getCreated()).toInstant())
-            .build();
+        final String created = inspectImageResponse.getCreated();
+        final Instant createdInstant = ((created == null) || created.isEmpty())
+            ? Instant.EPOCH
+            : ZonedDateTime.parse(created).toInstant();
+        return ImageData.builder().createdAt(createdInstant).build();
     }
 
     static ImageData from(Image image) {
-        return ImageData.builder().createdAt(Instant.ofEpochSecond(image.getCreated())).build();
+        final Long created = image.getCreated();
+        final Instant createdInstant = (created == null) ? Instant.EPOCH : Instant.ofEpochSecond(created);
+        return ImageData.builder().createdAt(createdInstant).build();
     }
 }

From 8c3cce2b2c38d555eeecfcd7f754d3231d7a6f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 14 Mar 2024 02:18:40 -0500
Subject: [PATCH 3589/4969] Update ryuk version to 0.7.0 (#8451)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 01c68f4b8a3..61bceb60b0b 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.6.0");
+        super("testcontainers/ryuk:0.7.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 6e5fbe62d5c52aac62d630f21652c59fbff50d3d Mon Sep 17 00:00:00 2001
From: Nateckert <nathan.eckert@polytechnique.edu>
Date: Fri, 15 Mar 2024 00:57:51 +0100
Subject: [PATCH 3590/4969] Avoid usage of the non monotonic clock
 System.currentTimeMillis() in favor of System.nanoTime() (#6392)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/output/WaitingConsumer.java     | 18 +++++++++++-------
 .../junit/GenericContainerRuleTest.java        |  8 ++++----
 .../org/testcontainers/ext/ScriptUtils.java    |  5 +++--
 .../containers/JdbcDatabaseContainer.java      |  9 +++++----
 .../containers/ToxiproxyTest.java              |  7 ++++---
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
index b7a12167597..e79c234058e 100644
--- a/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
+++ b/core/src/main/java/org/testcontainers/containers/output/WaitingConsumer.java
@@ -42,7 +42,7 @@ public LinkedBlockingDeque<OutputFrame> getFrames() {
      * @param predicate a predicate to test against each frame
      */
     public void waitUntil(Predicate<OutputFrame> predicate) throws TimeoutException {
-        // ~2.9 million centuries ought to be enough for anyone
+        // ~2.9 thousands centuries ought to be enough for anyone
         waitUntil(predicate, Long.MAX_VALUE, 1);
     }
 
@@ -73,14 +73,18 @@ public void waitUntil(Predicate<OutputFrame> predicate, int limit, TimeUnit limi
      */
     public void waitUntil(Predicate<OutputFrame> predicate, long limit, TimeUnit limitUnit, int times)
         throws TimeoutException {
-        long expiry = limitUnit.toMillis(limit) + System.currentTimeMillis();
+        long timeoutLimitInNanos = limitUnit.toNanos(limit);
 
-        waitUntil(predicate, expiry, times);
+        waitUntil(predicate, timeoutLimitInNanos, times);
     }
 
-    private void waitUntil(Predicate<OutputFrame> predicate, long expiry, int times) throws TimeoutException {
+    private void waitUntil(Predicate<OutputFrame> predicate, long timeoutLimitInNanos, int times)
+        throws TimeoutException {
         int numberOfMatches = 0;
-        while (System.currentTimeMillis() < expiry) {
+
+        final long startTime = System.nanoTime();
+
+        while (System.nanoTime() - startTime < timeoutLimitInNanos) {
             try {
                 final OutputFrame frame = frames.pollLast(100, TimeUnit.MILLISECONDS);
 
@@ -128,13 +132,13 @@ public void waitUntilEnd() {
      * @param limitUnit maximum time to wait (units)
      */
     public void waitUntilEnd(long limit, TimeUnit limitUnit) throws TimeoutException {
-        long expiry = limitUnit.toMillis(limit) + System.currentTimeMillis();
+        long expiry = limitUnit.toNanos(limit) + System.nanoTime();
 
         waitUntilEnd(expiry);
     }
 
     private void waitUntilEnd(Long expiry) throws TimeoutException {
-        while (System.currentTimeMillis() < expiry) {
+        while (System.nanoTime() < expiry) {
             try {
                 OutputFrame frame = frames.pollLast(100, TimeUnit.MILLISECONDS);
 
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index fc08e11107a..5a9d7c1616d 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -333,7 +333,7 @@ protected static void writeStringToFile(File contentFolder, String filename, Str
     @Test
     @Ignore //TODO investigate intermittent failures
     public void failFastWhenContainerHaltsImmediately() {
-        long startingTimeMs = System.currentTimeMillis();
+        long startingTimeNano = System.nanoTime();
         final GenericContainer failsImmediately = new GenericContainer<>(TestImages.ALPINE_IMAGE)
             .withCommand("/bin/sh", "-c", "return false")
             .withMinimumRunningDuration(Duration.ofMillis(100));
@@ -345,11 +345,11 @@ public void failFastWhenContainerHaltsImmediately() {
 
             // Check how long it took, to verify that we ARE bailing out early.
             // Want to strike a balance here; too short and this test will fail intermittently
-            // on slow systems and/or due to GC variation, too long and we won't properly test
+            // on slow systems and/or due to GC variation, too long, and we won't properly test
             // what we're intending to test.
             int allowedSecondsToFailure = GenericContainer.CONTAINER_RUNNING_TIMEOUT_SEC / 2;
-            long completedTimeMs = System.currentTimeMillis();
-            assertThat(completedTimeMs - startingTimeMs < 1000L * allowedSecondsToFailure)
+            long completedTimeNano = System.nanoTime();
+            assertThat(completedTimeNano - startingTimeNano < TimeUnit.SECONDS.toNanos(allowedSecondsToFailure))
                 .as("container should not take long to start up")
                 .isTrue();
         } finally {
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index 419bcbf9e9a..b78ac4d63c4 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -27,6 +27,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.script.ScriptException;
 
@@ -273,7 +274,7 @@ public static void executeDatabaseScript(
                 LOGGER.info("Executing database script from " + scriptPath);
             }
 
-            long startTime = System.currentTimeMillis();
+            long startTime = System.nanoTime();
             List<String> statements = new LinkedList<>();
 
             if (separator == null) {
@@ -306,7 +307,7 @@ public static void executeDatabaseScript(
                 closeableDelegate.execute(statements, scriptPath, continueOnError, ignoreFailedDrops);
             }
 
-            long elapsedTime = System.currentTimeMillis() - startTime;
+            long elapsedTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime);
             if (LOGGER.isInfoEnabled()) {
                 LOGGER.info("Executed database script from " + scriptPath + " in " + elapsedTime + " ms.");
             }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 9533a4c7d10..2247b2e867f 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -148,10 +149,10 @@ protected void waitUntilContainerStarted() {
             );
 
         // Repeatedly try and open a connection to the DB and execute a test query
-        long start = System.currentTimeMillis();
+        long start = System.nanoTime();
 
         Exception lastConnectionException = null;
-        while (System.currentTimeMillis() < start + (1000 * startupTimeoutSeconds)) {
+        while ((System.nanoTime() - start) < TimeUnit.SECONDS.toNanos(startupTimeoutSeconds)) {
             if (!isRunning()) {
                 Thread.sleep(100L);
             } else {
@@ -238,9 +239,9 @@ public Connection createConnection(String queryString, Properties info)
 
         SQLException lastException = null;
         try {
-            long start = System.currentTimeMillis();
+            long start = System.nanoTime();
             // give up if we hit the time limit or the container stops running for some reason
-            while (System.currentTimeMillis() < start + (1000 * connectTimeoutSeconds) && isRunning()) {
+            while ((System.nanoTime() - start < TimeUnit.SECONDS.toNanos(connectTimeoutSeconds)) && isRunning()) {
                 try {
                     logger()
                         .debug(
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index f1010758fba..34068e5e49e 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -10,6 +10,7 @@
 
 import java.io.IOException;
 import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
@@ -181,10 +182,10 @@ private void checkCallWithLatency(
         int expectedMinLatency,
         long expectedMaxLatency
     ) {
-        final long start = System.currentTimeMillis();
+        final long start = System.nanoTime();
         String s = jedis.get("somekey");
-        final long end = System.currentTimeMillis();
-        final long duration = end - start;
+        final long end = System.nanoTime();
+        final long duration = TimeUnit.NANOSECONDS.toMillis(end - start);
 
         assertThat(s).as(String.format("access to the container %s works OK", description)).isEqualTo("somevalue");
         assertThat(duration >= expectedMinLatency)

From 13c2641ff1ff8e74f37594bff96275811a7d809b Mon Sep 17 00:00:00 2001
From: Gabriel Luciano de Souza
 <66069864+gabrielluciano@users.noreply.github.com>
Date: Fri, 15 Mar 2024 03:14:36 -0300
Subject: [PATCH 3591/4969] [mongodb] Fix getConnectionString javadoc (#8129)

---
 .../java/org/testcontainers/containers/MongoDBContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 17adc794530..1dbf1fcc74e 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -95,7 +95,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
     }
 
     /**
-     * Gets a connection string url, unlike {@link #getReplicaSetUrl} this does point to a
+     * Gets a connection string url, unlike {@link #getReplicaSetUrl} this does not point to a
      * database
      * @return a connection url pointing to a mongodb instance
      */

From 285aac92c62542e7b99a0f04f65cb28e2d0606ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:04:02 +0000
Subject: [PATCH 3592/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.1...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 0177c8c6b0e..aa06a2d0249 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 8f9608b8f908d23b27e8fd6d6eaf8a3dd0a1ea40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:08:51 +0000
Subject: [PATCH 3593/4969] Bump org.postgresql:postgresql from 42.7.1 to
 42.7.3 in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.1...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 683b9c1a373..8240d805b13 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From bb6e87337eaf1ceb347e32745c798d7d0fa095f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:25:02 +0000
Subject: [PATCH 3594/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.2.1
 in /modules/solace

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.2.1)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index c4a231c4aec..e2597bc62fa 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solace"
 dependencies {
     api project(':testcontainers')
 
-    shaded 'org.awaitility:awaitility:4.2.0'
+    shaded 'org.awaitility:awaitility:4.2.1'
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'com.solacesystems:sol-jcsmp:10.22.0'

From 569892f41574c0e1968f9c914537a229e22bf898 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:33:11 +0000
Subject: [PATCH 3595/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.2.1
 in /modules/questdb

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.2.1)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 1850ed0fe34..7ebf29cb551 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.questdb:questdb:7.3.9'
-    testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.awaitility:awaitility:4.2.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
 

From ca1f973cda1c0344be4eb2613c02e38ff7ca87cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:33:15 +0000
Subject: [PATCH 3596/4969] Bump org.postgresql:postgresql from 42.7.1 to
 42.7.3 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.1...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 1850ed0fe34..54d6ff2233f 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.questdb:questdb:7.3.9'

From 2ea4a0dbd979a1a2b7f0a667742e4079a0b70e06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:37:38 +0000
Subject: [PATCH 3597/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.1...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 82b55fd7e5e..e7a4d963c51 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 5d97d9b30ab5fee9bceabcfc4787a04fc4c07a23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:39:58 +0000
Subject: [PATCH 3598/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.1...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 95e0e7b1223..723eef713e6 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
 

From b0befbfa433951fc44ea974291d611b69eacf343 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:42:30 +0000
Subject: [PATCH 3599/4969] Bump org.postgresql:postgresql from 42.7.1 to
 42.7.3 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.1...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 98ff9b6520b..5c9c6adabbc 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.1'

From c177fb2938a25b128338edcc83d96c779ff0af3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:56:46 +0000
Subject: [PATCH 3600/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.2.1
 in /core

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.2.1)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 13152748815..9ba4c6a8760 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,7 +86,7 @@ dependencies {
         exclude group: 'org.apache.commons', module: 'commons-compress'
     }
 
-    shaded 'org.awaitility:awaitility:4.2.0'
+    shaded 'org.awaitility:awaitility:4.2.1'
 
     api platform('com.github.docker-java:docker-java-bom:3.3.6')
     shaded platform('com.github.docker-java:docker-java-bom:3.3.6')

From c187c36d3753e82fb5d7f851f0673cd943388d18 Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Thu, 21 Mar 2024 09:38:30 -0700
Subject: [PATCH 3601/4969] Update actions/setup-java version to v4 (#8475)

---
 .github/actions/setup-java/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
index 8d9733f02ba..053b7ebe23b 100644
--- a/.github/actions/setup-java/action.yml
+++ b/.github/actions/setup-java/action.yml
@@ -3,7 +3,7 @@ description: Sets up Java version
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         java-version: '8'
         distribution: temurin

From 030ce5afaf12617c0db2eb1a4f064c25f3eb5c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 21 Mar 2024 15:25:28 -0600
Subject: [PATCH 3602/4969] Update check list in settings

---
 .github/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index 9cf3d27d5d4..bcf94d2d711 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -388,7 +388,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["core", "check_docs_examples", "in-docker_test", "ci/circleci: minimal_core", "test"]
+        contexts: ["core", "check_docs_examples (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches

From 021c71fb3b110526dc6be7b854757a0e4731e878 Mon Sep 17 00:00:00 2001
From: Jared Komoroski <JKomoroski@users.noreply.github.com>
Date: Thu, 21 Mar 2024 18:11:20 -0600
Subject: [PATCH 3603/4969] Add an interval for pull attempts (#8453)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without an interval attempt limit, thousands of docker pull requests can be attempted the default 2 minute time limit.

Fixes #8454

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../images/RemoteDockerImage.java             | 122 ++++++++++++------
 1 file changed, 80 insertions(+), 42 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 78a0e2a583c..af3ed08984a 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -11,6 +11,9 @@
 import lombok.SneakyThrows;
 import lombok.ToString;
 import lombok.With;
+import org.awaitility.Awaitility;
+import org.awaitility.pollinterval.IterativePollInterval;
+import org.awaitility.pollinterval.PollInterval;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ContainerFetchException;
@@ -21,9 +24,11 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicReference;
 
 @ToString
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
@@ -65,7 +70,7 @@ public RemoteDockerImage(@NonNull Future<String> imageFuture) {
     @SneakyThrows({ InterruptedException.class, ExecutionException.class })
     protected final String resolve() {
         final DockerImageName imageName = getImageName();
-        Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
+        final Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
         try {
             if (!imagePullPolicy.shouldPull(imageName)) {
                 return imageName.asCanonicalNameString();
@@ -77,55 +82,88 @@ protected final String resolve() {
                 imageName
             );
 
-            Exception lastFailure = null;
+            final Instant startedAt = Instant.now();
             final Instant lastRetryAllowed = Instant.now().plus(PULL_RETRY_TIME_LIMIT);
-
-            Instant startedAt = Instant.now();
-            while (Instant.now().isBefore(lastRetryAllowed)) {
-                try {
-                    PullImageCmd pullImageCmd = dockerClient
-                        .pullImageCmd(imageName.getUnversionedPart())
-                        .withTag(imageName.getVersionPart());
-
-                    try {
-                        pullImageCmd.exec(new TimeLimitedLoggedPullImageResultCallback(logger)).awaitCompletion();
-                    } catch (DockerClientException e) {
-                        // Try to fallback to x86
-                        pullImageCmd
-                            .withPlatform("linux/amd64")
-                            .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
-                            .awaitCompletion();
-                    }
-                    String dockerImageName = imageName.asCanonicalNameString();
-                    logger.info("Image {} pull took {}", dockerImageName, Duration.between(startedAt, Instant.now()));
-
-                    LocalImagesCache.INSTANCE.refreshCache(imageName);
-
-                    return dockerImageName;
-                } catch (InterruptedException | InternalServerErrorException e) {
-                    // these classes of exception often relate to timeout/connection errors so should be retried
-                    lastFailure = e;
-                    logger.warn(
-                        "Retrying pull for image: {} ({}s remaining)",
-                        imageName,
-                        Duration.between(Instant.now(), lastRetryAllowed).getSeconds()
-                    );
-                }
+            final AtomicReference<Exception> lastFailure = new AtomicReference<>();
+            final PullImageCmd pullImageCmd = dockerClient
+                .pullImageCmd(imageName.getUnversionedPart())
+                .withTag(imageName.getVersionPart());
+            final AtomicReference<String> dockerImageName = new AtomicReference<>();
+
+            // The following poll interval in ms: 50, 100, 200, 400, 800....
+            // Results in ~70 requests in over 2 minutes
+            final PollInterval interval = IterativePollInterval
+                .iterative(duration -> duration.multipliedBy(2))
+                .startDuration(Duration.ofMillis(50));
+
+            Awaitility
+                .await()
+                .pollInSameThread()
+                .pollDelay(Duration.ZERO) // start checking immediately
+                .atMost(PULL_RETRY_TIME_LIMIT)
+                .pollInterval(interval)
+                .until(
+                    tryImagePullCommand(pullImageCmd, logger, dockerImageName, imageName, lastFailure, lastRetryAllowed)
+                );
+
+            if (dockerImageName.get() == null) {
+                final Exception lastException = lastFailure.get();
+                logger.error(
+                    "Failed to pull image: {}. Please check output of `docker pull {}`",
+                    imageName,
+                    imageName,
+                    lastException
+                );
+                throw new ContainerFetchException("Failed to pull image: " + imageName, lastException);
             }
 
-            logger.error(
-                "Failed to pull image: {}. Please check output of `docker pull {}`",
-                imageName,
-                imageName,
-                lastFailure
-            );
-
-            throw new ContainerFetchException("Failed to pull image: " + imageName, lastFailure);
+            logger.info("Image {} pull took {}", dockerImageName.get(), Duration.between(startedAt, Instant.now()));
+            LocalImagesCache.INSTANCE.refreshCache(imageName);
+            return dockerImageName.get();
         } catch (DockerClientException e) {
             throw new ContainerFetchException("Failed to get Docker client for " + imageName, e);
         }
     }
 
+    private Callable<Boolean> tryImagePullCommand(
+        PullImageCmd pullImageCmd,
+        Logger logger,
+        AtomicReference<String> dockerImageName,
+        DockerImageName imageName,
+        AtomicReference<Exception> lastFailure,
+        Instant lastRetryAllowed
+    ) {
+        return () -> {
+            try {
+                pullImage(pullImageCmd, logger);
+                dockerImageName.set(imageName.asCanonicalNameString());
+                return true;
+            } catch (InterruptedException | InternalServerErrorException e) {
+                // these classes of exception often relate to timeout/connection errors so should be retried
+                lastFailure.set(e);
+                logger.warn(
+                    "Retrying pull for image: {} ({}s remaining)",
+                    imageName,
+                    Duration.between(Instant.now(), lastRetryAllowed).getSeconds()
+                );
+                return false;
+            }
+        };
+    }
+
+    private TimeLimitedLoggedPullImageResultCallback pullImage(PullImageCmd pullImageCmd, Logger logger)
+        throws InterruptedException {
+        try {
+            return pullImageCmd.exec(new TimeLimitedLoggedPullImageResultCallback(logger)).awaitCompletion();
+        } catch (DockerClientException e) {
+            // Try to fallback to x86
+            return pullImageCmd
+                .withPlatform("linux/amd64")
+                .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
+                .awaitCompletion();
+        }
+    }
+
     private DockerImageName getImageName() throws InterruptedException, ExecutionException {
         final DockerImageName specifiedImageName = imageNameFuture.get();
 

From a52eadb3adb580f8d0472f811576e29e8ac00e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 21 Mar 2024 21:00:47 -0500
Subject: [PATCH 3604/4969] Update alpine image version to 3.17 (#8476)

Fixes #8430
---
 .../main/java/org/testcontainers/DockerClientFactory.java | 2 +-
 core/src/test/java/org/testcontainers/TestImages.java     | 4 ++--
 .../testcontainers/containers/DockerComposeFilesTest.java | 2 +-
 .../testcontainers/containers/GenericContainerTest.java   | 2 +-
 .../containers/ParsedDockerComposeFileValidationTest.java | 8 ++++----
 .../containers/output/ToStringConsumerTest.java           | 8 ++++----
 .../org/testcontainers/dockerclient/ImagePullTest.java    | 2 +-
 .../java/org/testcontainers/junit/DockerfileTest.java     | 6 +++---
 .../testcontainers/junit/FixedHostPortContainerTest.java  | 2 +-
 .../testcontainers/utility/DirectoryTarResourceTest.java  | 6 +++---
 core/src/test/resources/compose-dockerfile/Dockerfile     | 2 +-
 .../resources/compose-scaling-multiple-containers.yml     | 2 +-
 .../src/test/java/generic/ContainerCreationTest.java      | 2 +-
 .../generic/src/test/java/generic/ContainerLabelTest.java | 4 ++--
 .../junit4/generic/src/test/java/generic/ExecTest.java    | 2 +-
 docs/features/configuration.md                            | 2 +-
 docs/features/creating_images.md                          | 2 +-
 .../org/testcontainers/spock/SpockTestImages.groovy       | 2 +-
 18 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 6f0c744cedf..c4707aad0b7 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -77,7 +77,7 @@ static Map<String, String> markerLabels() {
         return Collections.unmodifiableMap(labels);
     }
 
-    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
+    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 
     private static DockerClientFactory instance;
 
diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
index 5308f341100..21511a0d72f 100644
--- a/core/src/test/java/org/testcontainers/TestImages.java
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -6,7 +6,7 @@ public interface TestImages {
     DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
     DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3");
     DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
-    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
+    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
-    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
index 41870eb593d..9ae02a676c4 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -27,6 +27,6 @@ public void shouldGetDependencyImagesWhenOverriding() {
             )
         );
         assertThat(dockerComposeFiles.getDependencyImages())
-            .containsExactlyInAnyOrder("alpine:3.16", "redis:b", "mysql:b", "aservice:latest");
+            .containsExactlyInAnyOrder("alpine:3.17", "redis:b", "mysql:b", "aservice:latest");
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 8baf8d6e987..56a70e83c46 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -229,7 +229,7 @@ public void shouldReturnTheProvidedImage() {
         GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE);
         assertThat(container.getImage().get()).isEqualTo("redis:3.0.2");
         container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE));
-        assertThat(container.getImage().get()).isEqualTo("alpine:3.16");
+        assertThat(container.getImage().get()).isEqualTo("alpine:3.17");
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index c362cd28f8c..15bca203e31 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -113,8 +113,8 @@ public void shouldObtainImageFromDockerfileBuild() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.16"))
-            ); // r/ redis, mysql from compose file, alpine:3.16 from Dockerfile build
+                entry("custom", Sets.newHashSet("alpine:3.17"))
+            ); // r/ redis, mysql from compose file, alpine:3.17 from Dockerfile build
     }
 
     @Test
@@ -126,7 +126,7 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
             .contains(
                 entry("mysql", Sets.newHashSet("mysql")),
                 entry("redis", Sets.newHashSet("redis")),
-                entry("custom", Sets.newHashSet("alpine:3.16"))
-            ); // redis, mysql from compose file, alpine:3.16 from Dockerfile build
+                entry("custom", Sets.newHashSet("alpine:3.17"))
+            ); // redis, mysql from compose file, alpine:3.17 from Dockerfile build
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
index 2755f4142d4..eaab250141c 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -23,7 +23,7 @@ public class ToStringConsumerTest {
 
     @Test
     public void newlines_are_not_added_to_exec_output() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCommand("sleep", "2m");
             container.start();
 
@@ -34,7 +34,7 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
 
     @Test(timeout = 60_000L)
     public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withAttachStdin(true).withStdinOpen(true).withTty(true);
             });
@@ -48,7 +48,7 @@ public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
 
     @Test
     public void newlines_are_not_added_to_container_output() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCommand("echo", "-n", LARGE_PAYLOAD);
             container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
             container.start();
@@ -61,7 +61,7 @@ public void newlines_are_not_added_to_container_output() {
 
     @Test
     public void newlines_are_not_added_to_container_output_with_tty() {
-        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.16")) {
+        try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withTty(true);
             });
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index e1c2a56e8a9..db3f81d9b54 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -16,7 +16,7 @@ public class ImagePullTest {
     public static String[] parameters() {
         return new String[] {
             "alpine:latest",
-            "alpine:3.16",
+            "alpine:3.17",
             "alpine", // omitting the tag should work and default to latest
             "alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
             "quay.io/testcontainers/ryuk:latest",
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
index 86292bcf9ac..113fd7f4c63 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
@@ -38,7 +38,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
                 super.configure(buildImageCmd);
 
                 List<String> dockerfile = Arrays.asList(
-                    "FROM alpine:3.16",
+                    "FROM alpine:3.17",
                     "RUN echo 'hello from Docker build process'",
                     "CMD yes"
                 );
@@ -58,7 +58,7 @@ public void dockerfileBuilderWorks() {
             .withFileFromString("folder/someFile.txt", "hello")
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.16")
+                    .from("alpine:3.17")
                     .workDir("/app")
                     .add("test.txt", "test file.txt")
                     .run("ls", "-la", "/app/test file.txt")
@@ -101,7 +101,7 @@ public int getFileMode() {
             )
             .withDockerfileFromBuilder(builder -> {
                 builder
-                    .from("alpine:3.16") //
+                    .from("alpine:3.17") //
                     .copy("someFile.txt", "/someFile.txt")
                     .cmd("stat -c \"%a\" /someFile.txt");
             });
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index 45feb85b359..72fc4b70519 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -23,7 +23,7 @@
  */
 public class FixedHostPortContainerTest {
 
-    private static final String TEST_IMAGE = "alpine:3.16";
+    private static final String TEST_IMAGE = "alpine:3.17";
 
     /**
      * Default http server port (just something different from default)
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
index 6215f84520b..a56315085ae 100644
--- a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -22,7 +22,7 @@ public void simpleRecursiveFileTest() {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> {
                     builder
-                        .from("alpine:3.16")
+                        .from("alpine:3.17")
                         .copy("/tmp/foo", "/foo")
                         .cmd("cat /foo/test/resources/test-recursive-file.txt")
                         .build();
@@ -47,7 +47,7 @@ public void simpleRecursiveFileWithPermissionTest() {
                 new ImageFromDockerfile()
                     .withDockerfileFromBuilder(builder -> {
                         builder
-                            .from("alpine:3.16") //
+                            .from("alpine:3.17") //
                             .copy("/tmp/foo", "/foo")
                             .cmd("ls", "-al", "/")
                             .build();
@@ -75,7 +75,7 @@ public void simpleRecursiveClasspathResourceTest() {
                 new ImageFromDockerfile()
                     .withDockerfileFromBuilder(builder -> {
                         builder
-                            .from("alpine:3.16") //
+                            .from("alpine:3.17") //
                             .copy("/tmp/foo", "/foo")
                             .cmd("ls -lRt /foo")
                             .build();
diff --git a/core/src/test/resources/compose-dockerfile/Dockerfile b/core/src/test/resources/compose-dockerfile/Dockerfile
index 566428fa97f..7450ebde82c 100644
--- a/core/src/test/resources/compose-dockerfile/Dockerfile
+++ b/core/src/test/resources/compose-dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 
 ADD passthrough.sh /passthrough.sh
 
diff --git a/core/src/test/resources/compose-scaling-multiple-containers.yml b/core/src/test/resources/compose-scaling-multiple-containers.yml
index fc498a9fd42..ce3f002f1e8 100644
--- a/core/src/test/resources/compose-scaling-multiple-containers.yml
+++ b/core/src/test/resources/compose-scaling-multiple-containers.yml
@@ -3,5 +3,5 @@ services:
   redis:
     image: redis
   other:
-    image: alpine:3.16
+    image: alpine:3.17
     command: sleep 10000
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
index d98e09ff036..09149091c23 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -20,7 +20,7 @@ public class ContainerCreationTest {
     // }
     // spotless:on
 
-    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
+    public static final DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
 
     // spotless:off
     // withOptions {
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
index 868b8ec44f7..73dac2bda9b 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerLabelTest.java
@@ -9,7 +9,7 @@
 public class ContainerLabelTest {
 
     // single_label {
-    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.16"))
+    public GenericContainer containerWithLabel = new GenericContainer(DockerImageName.parse("alpine:3.17"))
         .withLabel("key", "value");
     // }
 
@@ -17,7 +17,7 @@ public class ContainerLabelTest {
     private Map<String, String> mapOfLabels = new HashMap<>();
     // populate map, e.g. mapOfLabels.put("key1", "value1");
 
-    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.16"))
+    public GenericContainer containerWithMultipleLabels = new GenericContainer(DockerImageName.parse("alpine:3.17"))
         .withLabels(mapOfLabels);
     // }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
index 7ccb0f2cc54..078e177242f 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ExecTest.java
@@ -13,7 +13,7 @@
 public class ExecTest {
 
     @Rule
-    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.16"))
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine:3.17"))
         .withCommand("top");
 
     @Test
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index fe78e317120..d874b16ad7b 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -49,7 +49,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **ryuk.container.image = testcontainers/ryuk:0.3.3**
 > Performs fail-safe cleanup of containers, and always required (unless [Ryuk is disabled](#disabling-ryuk))
 
-> **tinyimage.container.image = alpine:3.16**  
+> **tinyimage.container.image = alpine:3.17**  
 > Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))
 
 > **sshd.container.image = testcontainers/sshd:1.1.0**  
diff --git a/docs/features/creating_images.md b/docs/features/creating_images.md
index e4e6315a405..6f1988ed28e 100644
--- a/docs/features/creating_images.md
+++ b/docs/features/creating_images.md
@@ -51,7 +51,7 @@ new GenericContainer(
         new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder ->
                         builder
-                                .from("alpine:3.16")
+                                .from("alpine:3.17")
                                 .run("apk add --update nginx")
                                 .cmd("nginx", "-g", "daemon off;")
                                 .build()))
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
index 43cda0b3313..ce16e963548 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SpockTestImages.groovy
@@ -6,5 +6,5 @@ interface SpockTestImages {
 	DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:8.0.36")
 	DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12")
 	DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine")
-	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16")
+	DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17")
 }

From e4c533a00a6c41201f56207d10f7a44bd7c3c833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 22 Mar 2024 18:32:12 -0600
Subject: [PATCH 3605/4969] Polish oracle-free

---
 .../org/testcontainers/oracle/OracleContainer.java  | 13 ++++++-------
 .../junit/oracle/SimpleOracleTest.java              |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
index 1130072be12..90d772f0328 100644
--- a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
@@ -3,11 +3,10 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.JdbcDatabaseContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -68,11 +67,11 @@ public OracleContainer(String dockerImageName) {
     public OracleContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-        this.waitStrategy =
-            new LogMessageWaitStrategy()
-                .withRegEx(".*DATABASE IS READY TO USE!.*\\s")
-                .withTimes(1)
-                .withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, ChronoUnit.SECONDS));
+        waitingFor(
+            Wait
+                .forLogMessage(".*DATABASE IS READY TO USE!.*\\s", 1)
+                .withStartupTimeout(Duration.ofSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS))
+        );
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
         addExposedPorts(ORACLE_PORT);
     }
diff --git a/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 5ef276c0157..45ed72cb622 100644
--- a/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -33,7 +33,7 @@ private void runTest(OracleContainer container, String databaseName, String user
 
     @Test
     public void testDefaultSettings() throws SQLException {
-        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);) {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) {
             runTest(oracle, "freepdb1", "test", "test");
 
             // Match against the last '/'
@@ -76,7 +76,7 @@ public void testCustomUser() throws SQLException {
 
     @Test
     public void testSID() throws SQLException {
-        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid();) {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid()) {
             runTest(oracle, "freepdb1", "system", "test");
 
             // Match against the last ':'
@@ -90,7 +90,7 @@ public void testSIDAndCustomPassword() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .usingSid()
-                .withPassword("testPassword");
+                .withPassword("testPassword")
         ) {
             runTest(oracle, "freepdb1", "system", "testPassword");
         }

From 3b6517148c71c44c73863f8b178ebb1bed89eb6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 25 Mar 2024 18:52:42 -0600
Subject: [PATCH 3606/4969] Update mikepenz/action-junit-report verstion to v4

---
 .github/actions/setup-junit-report/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-junit-report/action.yml b/.github/actions/setup-junit-report/action.yml
index 86092d06bcc..538af9af21f 100644
--- a/.github/actions/setup-junit-report/action.yml
+++ b/.github/actions/setup-junit-report/action.yml
@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Publish Test Report
-      uses: mikepenz/action-junit-report@v3
+      uses: mikepenz/action-junit-report@v4
       if: always() # always run even if the previous step fails
       with:
         report_paths: '**/build/test-results/test/TEST-*.xml'

From eadc9d6ec7777562d3b335b0e3ecd655e803e8c8 Mon Sep 17 00:00:00 2001
From: Marcin Antas <antas.marcin@gmail.com>
Date: Tue, 26 Mar 2024 02:14:40 +0100
Subject: [PATCH 3607/4969] Add  tests with Weaviate modules (#8481)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../weaviate/WeaviateContainerTest.java       | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index 9aa8fe19f61..4acaa3b98fd 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -4,16 +4,22 @@
 import io.weaviate.client.WeaviateClient;
 import io.weaviate.client.base.Result;
 import io.weaviate.client.v1.misc.model.Meta;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.Test;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class WeaviateContainerTest {
 
     @Test
-    public void test() {
+    public void testWeaviate() {
         try ( // container {
-            WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.24.1")
+            WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.24.5")
             // }
         ) {
             weaviate.start();
@@ -21,7 +27,38 @@ public void test() {
             config.setGRPCHost(weaviate.getGrpcHostAddress());
             WeaviateClient client = new WeaviateClient(config);
             Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.24.1");
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.24.5");
+        }
+    }
+
+    @Test
+    public void testWeaviateWithModules() {
+        List<String> enableModules = Arrays.asList(
+            "backup-filesystem",
+            "text2vec-openai",
+            "text2vec-cohere",
+            "text2vec-huggingface",
+            "generative-openai"
+        );
+        Map<String, String> env = new HashMap<>();
+        env.put("ENABLE_MODULES", String.join(",", enableModules));
+        env.put("BACKUP_FILESYSTEM_PATH", "/tmp/backups");
+        try (WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.24.5").withEnv(env)) {
+            weaviate.start();
+            Config config = new Config("http", weaviate.getHttpHostAddress());
+            config.setGRPCHost(weaviate.getGrpcHostAddress());
+            WeaviateClient client = new WeaviateClient(config);
+            Result<Meta> meta = client.misc().metaGetter().run();
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.24.5");
+            Object modules = meta.getResult().getModules();
+            assertThat(modules)
+                .isNotNull()
+                .asInstanceOf(InstanceOfAssertFactories.map(String.class, Object.class))
+                .extracting(Map::keySet)
+                .satisfies(keys -> {
+                    assertThat(keys.size()).isEqualTo(enableModules.size());
+                    keys.forEach(key -> assertThat(enableModules.contains(key)).isTrue());
+                });
         }
     }
 }

From e2b2d85be79c120155089b789022a6ec659669dc Mon Sep 17 00:00:00 2001
From: Michael Musenbrock <michael.musenbrock@gmail.com>
Date: Fri, 29 Mar 2024 02:32:21 +0100
Subject: [PATCH 3608/4969] Fix Docker compose stop command by adding
 environment (#8493)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This issue was introduced in 7112db5. `DockerComposeContainer` and
`ComposeContainer` now passes the env to the stop command in both
implementations.

Fixes #8492

---------

Signed-off-by: Michael Musenbrock <michael.musenbrock@gmail.com>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/ComposeContainer.java          |  2 +-
 .../containers/DockerComposeContainer.java    |  2 +-
 .../junit/ComposeContainerPortViaEnvTest.java | 21 +++++++++++++++++++
 .../DockerComposeContainerPortViaEnvTest.java | 21 +++++++++++++++++++
 .../v2-compose-test-port-via-env.yml          |  5 +++++
 5 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
 create mode 100644 core/src/test/resources/v2-compose-test-port-via-env.yml

diff --git a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
index 081c71b3338..a865e744dd6 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
@@ -165,7 +165,7 @@ public void stop() {
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
-                this.composeDelegate.runWithCompose(this.localCompose, cmd);
+                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
             } finally {
                 this.project = this.composeDelegate.randomProjectId();
             }
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 3a8ab5b4ddc..68f9ec26ba6 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -172,7 +172,7 @@ public void stop() {
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
-                this.composeDelegate.runWithCompose(this.localCompose, cmd);
+                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
             } finally {
                 this.project = this.composeDelegate.randomProjectId();
             }
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
new file mode 100644
index 00000000000..b27f4b080da
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+
+public class ComposeContainerPortViaEnvTest extends BaseComposeTest {
+
+    @Rule
+    public ComposeContainer environment = new ComposeContainer(
+        new File("src/test/resources/v2-compose-test-port-via-env.yml")
+    )
+        .withExposedService("redis-1", REDIS_PORT)
+        .withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));
+
+    @Override
+    protected ComposeContainer getEnvironment() {
+        return environment;
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
new file mode 100644
index 00000000000..849e2a8e6a6
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+
+public class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
+
+    @Rule
+    public DockerComposeContainer environment = new DockerComposeContainer(
+        new File("src/test/resources/v2-compose-test-port-via-env.yml")
+    )
+        .withExposedService("redis_1", REDIS_PORT)
+        .withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));
+
+    @Override
+    protected DockerComposeContainer getEnvironment() {
+        return environment;
+    }
+}
diff --git a/core/src/test/resources/v2-compose-test-port-via-env.yml b/core/src/test/resources/v2-compose-test-port-via-env.yml
new file mode 100644
index 00000000000..2b4929594be
--- /dev/null
+++ b/core/src/test/resources/v2-compose-test-port-via-env.yml
@@ -0,0 +1,5 @@
+services:
+  redis:
+    image: redis
+    ports:
+      - ${REDIS_PORT}

From 04c2eb08f9381420b68eb99128905432f2468de9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 22:28:32 +0000
Subject: [PATCH 3609/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 6c03e07254d..7f18e867fef 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.24.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")

From 09d9dad7b4747fc76ae8b29cb73dcba4c001c0cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 22:30:02 +0000
Subject: [PATCH 3610/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/nginx

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 406fc608f08..3021ff03241 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:24.1.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From e74dd733231cff1150140c0034de48a9b9da8217 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 22:30:21 +0000
Subject: [PATCH 3611/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/consul

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index 9c1195525ff..81b449d6b7e 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From db75ec93a021d88654f08615089ef7782c087560 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 22:30:38 +0000
Subject: [PATCH 3612/4969] Bump com.yugabyte:java-driver-core in
 /modules/yugabytedb

Bumps [com.yugabyte:java-driver-core](https://github.com/yugabyte/cassandra-java-driver) from 4.15.0-yb-1 to 4.15.0-yb-2-TESTFIX.0.
- [Release notes](https://github.com/yugabyte/cassandra-java-driver/releases)
- [Commits](https://github.com/yugabyte/cassandra-java-driver/compare/4.15.0-yb-1...4.15.0-yb-2-TESTFIX.0)

---
updated-dependencies:
- dependency-name: com.yugabyte:java-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index 100620ab6f9..2ab71ef9cc6 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
     testImplementation project(':jdbc-test')
     // YCQL driver
-    testImplementation 'com.yugabyte:java-driver-core:4.15.0-yb-1'
+    testImplementation 'com.yugabyte:java-driver-core:4.15.0-yb-2-TESTFIX.0'
     // YSQL driver
     testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-4'
 }

From cda56090b749569b7aed288045bf921e5fc8de01 Mon Sep 17 00:00:00 2001
From: Ilia Beliaev <silhlol@gmail.com>
Date: Wed, 3 Apr 2024 03:42:55 +0200
Subject: [PATCH 3613/4969] Fix zookeeper initialization (#8433)

---
 .../org/testcontainers/containers/KafkaContainer.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index d76154505c2..a7144c0861b 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -182,15 +182,14 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
         // exporting KAFKA_ADVERTISED_LISTENERS with the container hostname
         command += String.format("export KAFKA_ADVERTISED_LISTENERS=%s\n", kafkaAdvertisedListeners);
 
-        if (this.kraftEnabled && isLessThanCP740()) {
+        if (!this.kraftEnabled || isLessThanCP740()) {
             // Optimization: skip the checks
             command += "echo '' > /etc/confluent/docker/ensure \n";
-            command += commandKraft();
         }
 
-        if (!this.kraftEnabled) {
-            // Optimization: skip the checks
-            command += "echo '' > /etc/confluent/docker/ensure \n";
+        if (this.kraftEnabled) {
+            command += commandKraft();
+        } else if (this.externalZookeeperConnect == null) {
             command += commandZookeeper();
         }
 

From 8db891a386782a682f64650f536aa2a18445a239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Apr 2024 21:52:15 -0500
Subject: [PATCH 3614/4969] Add support for apache/kafka (#8416)

Fixes #8398
---
 docs/modules/kafka.md                         |  12 +-
 .../testcontainers/kafka/KafkaContainer.java  |  93 +++++++++++++
 .../org/testcontainers/AbstractKafka.java     | 126 ++++++++++++++++++
 .../containers/KafkaContainerTest.java        | 112 +---------------
 .../kafka/KafkaContainerTest.java             |  15 +++
 5 files changed, 246 insertions(+), 112 deletions(-)
 create mode 100644 modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
 create mode 100644 modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
 create mode 100644 modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index fb953716225..6ec63126387 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -1,7 +1,12 @@
-# Kafka Containers
+# Kafka Module
 
 Testcontainers can be used to automatically instantiate and manage [Apache Kafka](https://kafka.apache.org) containers.
-More precisely Testcontainers uses the official Docker images for [Confluent OSS Platform](https://hub.docker.com/r/confluentinc/cp-kafka/)
+
+Currently, two different Kafka images are supported:
+
+* `org.testcontainers.containers.KafkaContainer` supports 
+[confluentinc/cp-kafka](https://hub.docker.com/r/confluentinc/cp-kafka/)
+* `org.testcontainers.kafka.KafkaContainer` supports [apache/kafka](https://hub.docker.com/r/apache/kafka/)
 
 ## Benefits
 
@@ -24,6 +29,9 @@ Now your tests or any other process running on your machine can get access to ru
 <!--/codeinclude-->
 
 ## Options
+
+!!! note 
+    The options below are only available for `org.testcontainers.containers.KafkaContainer`
         
 ### <a name="zookeeper"></a> Using external Zookeeper
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
new file mode 100644
index 00000000000..547a7dc7960
--- /dev/null
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -0,0 +1,93 @@
+package org.testcontainers.kafka;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Testcontainers implementation for Apache Kafka.
+ * <p>
+ * Supported image: {@code apache/kafka}
+ * <p>
+ * Exposed ports: 9092
+ */
+public class KafkaContainer extends GenericContainer<KafkaContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apache/kafka");
+
+    private static final int KAFKA_PORT = 9092;
+
+    private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
+
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
+    private static final String DEFAULT_CLUSTER_ID = "4L6g3nShT-eMCtK--X86sw";
+
+    public KafkaContainer(String imageName) {
+        this(DockerImageName.parse(imageName));
+    }
+
+    public KafkaContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(KAFKA_PORT);
+        withEnv("CLUSTER_ID", DEFAULT_CLUSTER_ID);
+
+        withEnv(
+            "KAFKA_LISTENERS",
+            "PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9093, CONTROLLER://0.0.0.0:9094"
+        );
+        withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT");
+        withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
+        withEnv("KAFKA_PROCESS_ROLES", "broker,controller");
+        withEnv("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
+
+        withEnv("KAFKA_NODE_ID", "1");
+        withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+        withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", DEFAULT_INTERNAL_TOPIC_RF);
+        withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+        withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", DEFAULT_INTERNAL_TOPIC_RF);
+        withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
+        withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
+
+        withCommand("sh", "-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+        waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
+    }
+
+    @Override
+    protected void configure() {
+        String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
+        String networkAlias = getNetwork() != null ? firstNetworkAlias : "localhost";
+        String controllerQuorumVoters = String.format("%s@%s:9094", getEnvMap().get("KAFKA_NODE_ID"), networkAlias);
+        withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters);
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        String brokerAdvertisedListener = String.format(
+            "BROKER://%s:%s",
+            containerInfo.getConfig().getHostName(),
+            "9093"
+        );
+        List<String> advertisedListeners = new ArrayList<>();
+        advertisedListeners.add("PLAINTEXT://" + getBootstrapServers());
+        advertisedListeners.add(brokerAdvertisedListener);
+        String kafkaAdvertisedListeners = String.join(",", advertisedListeners);
+        String command = "#!/bin/bash\n";
+        // exporting KAFKA_ADVERTISED_LISTENERS with the container hostname
+        command += String.format("export KAFKA_ADVERTISED_LISTENERS=%s\n", kafkaAdvertisedListeners);
+
+        command += "/etc/kafka/docker/run \n";
+        copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
+    }
+
+    public String getBootstrapServers() {
+        return String.format("%s:%s", getHost(), getMappedPort(KAFKA_PORT));
+    }
+}
diff --git a/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java b/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
new file mode 100644
index 00000000000..f7e9dcedb30
--- /dev/null
+++ b/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
@@ -0,0 +1,126 @@
+package org.testcontainers;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.config.SaslConfigs;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.rnorth.ducttape.unreliables.Unreliables;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+public class AbstractKafka {
+
+    private final ImmutableMap<String, String> properties = ImmutableMap.of(
+        AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
+        "SASL_PLAINTEXT",
+        SaslConfigs.SASL_MECHANISM,
+        "PLAIN",
+        SaslConfigs.SASL_JAAS_CONFIG,
+        "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"admin\" password=\"admin\";"
+    );
+
+    protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, false, 1, 1);
+    }
+
+    protected void testSecureKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, true, 1, 1);
+    }
+
+    protected void testKafkaFunctionality(String bootstrapServers, boolean authenticated, int partitions, int rf)
+        throws Exception {
+        ImmutableMap<String, String> adminClientDefaultProperties = ImmutableMap.of(
+            AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
+            bootstrapServers
+        );
+        Properties adminClientProperties = new Properties();
+        adminClientProperties.putAll(adminClientDefaultProperties);
+
+        ImmutableMap<String, String> consumerDefaultProperties = ImmutableMap.of(
+            ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+            bootstrapServers,
+            ConsumerConfig.GROUP_ID_CONFIG,
+            "tc-" + UUID.randomUUID(),
+            ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+            "earliest"
+        );
+        Properties consumerProperties = new Properties();
+        consumerProperties.putAll(consumerDefaultProperties);
+
+        ImmutableMap<String, String> producerDefaultProperties = ImmutableMap.of(
+            ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+            bootstrapServers,
+            ProducerConfig.CLIENT_ID_CONFIG,
+            UUID.randomUUID().toString()
+        );
+        Properties producerProperties = new Properties();
+        producerProperties.putAll(producerDefaultProperties);
+
+        if (authenticated) {
+            adminClientProperties.putAll(this.properties);
+            consumerProperties.putAll(this.properties);
+            producerProperties.putAll(this.properties);
+        }
+        try (
+            AdminClient adminClient = AdminClient.create(adminClientProperties);
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                producerProperties,
+                new StringSerializer(),
+                new StringSerializer()
+            );
+            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
+                consumerProperties,
+                new StringDeserializer(),
+                new StringDeserializer()
+            );
+        ) {
+            String topicName = "messages-" + UUID.randomUUID();
+
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
+            consumer.subscribe(Collections.singletonList(topicName));
+
+            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
+
+            Unreliables.retryUntilTrue(
+                10,
+                TimeUnit.SECONDS,
+                () -> {
+                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+
+                    if (records.isEmpty()) {
+                        return false;
+                    }
+
+                    assertThat(records)
+                        .hasSize(1)
+                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+
+                    return true;
+                }
+            );
+
+            consumer.unsubscribe();
+        }
+    }
+}
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index e5d1617298b..5284209a76d 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -5,37 +5,25 @@
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.errors.SaslAuthenticationException;
 import org.apache.kafka.common.errors.TopicAuthorizationException;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
 import org.awaitility.Awaitility;
 import org.junit.Test;
-import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.AbstractKafka;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
-import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Properties;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Assertions.tuple;
 
-public class KafkaContainerTest {
+public class KafkaContainerTest extends AbstractKafka {
 
     private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:6.2.1");
 
@@ -45,15 +33,6 @@ public class KafkaContainerTest {
         "confluentinc/cp-zookeeper:4.0.0"
     );
 
-    private final ImmutableMap<String, String> properties = ImmutableMap.of(
-        AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
-        "SASL_PLAINTEXT",
-        SaslConfigs.SASL_MECHANISM,
-        "PLAIN",
-        SaslConfigs.SASL_JAAS_CONFIG,
-        "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"admin\" password=\"admin\";"
-    );
-
     @Test
     public void testUsage() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)) {
@@ -344,91 +323,4 @@ private static String getJaasConfig() {
             "user_test=\"secret\";";
         return jaasConfig;
     }
-
-    private void testKafkaFunctionality(String bootstrapServers) throws Exception {
-        testKafkaFunctionality(bootstrapServers, false, 1, 1);
-    }
-
-    private void testSecureKafkaFunctionality(String bootstrapServers) throws Exception {
-        testKafkaFunctionality(bootstrapServers, true, 1, 1);
-    }
-
-    private void testKafkaFunctionality(String bootstrapServers, boolean authenticated, int partitions, int rf)
-        throws Exception {
-        ImmutableMap<String, String> adminClientDefaultProperties = ImmutableMap.of(
-            AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
-            bootstrapServers
-        );
-        Properties adminClientProperties = new Properties();
-        adminClientProperties.putAll(adminClientDefaultProperties);
-
-        ImmutableMap<String, String> consumerDefaultProperties = ImmutableMap.of(
-            ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
-            bootstrapServers,
-            ConsumerConfig.GROUP_ID_CONFIG,
-            "tc-" + UUID.randomUUID(),
-            ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
-            "earliest"
-        );
-        Properties consumerProperties = new Properties();
-        consumerProperties.putAll(consumerDefaultProperties);
-
-        ImmutableMap<String, String> producerDefaultProperties = ImmutableMap.of(
-            ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
-            bootstrapServers,
-            ProducerConfig.CLIENT_ID_CONFIG,
-            UUID.randomUUID().toString()
-        );
-        Properties producerProperties = new Properties();
-        producerProperties.putAll(producerDefaultProperties);
-
-        if (authenticated) {
-            adminClientProperties.putAll(this.properties);
-            consumerProperties.putAll(this.properties);
-            producerProperties.putAll(this.properties);
-        }
-        try (
-            AdminClient adminClient = AdminClient.create(adminClientProperties);
-            KafkaProducer<String, String> producer = new KafkaProducer<>(
-                producerProperties,
-                new StringSerializer(),
-                new StringSerializer()
-            );
-            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
-                consumerProperties,
-                new StringDeserializer(),
-                new StringDeserializer()
-            );
-        ) {
-            String topicName = "messages-" + UUID.randomUUID();
-
-            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
-            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
-
-            consumer.subscribe(Collections.singletonList(topicName));
-
-            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
-
-            Unreliables.retryUntilTrue(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
-
-                    if (records.isEmpty()) {
-                        return false;
-                    }
-
-                    assertThat(records)
-                        .hasSize(1)
-                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
-                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
-
-                    return true;
-                }
-            );
-
-            consumer.unsubscribe();
-        }
-    }
 }
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
new file mode 100644
index 00000000000..d520cf33f7c
--- /dev/null
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
@@ -0,0 +1,15 @@
+package org.testcontainers.kafka;
+
+import org.junit.Test;
+import org.testcontainers.AbstractKafka;
+
+public class KafkaContainerTest extends AbstractKafka {
+
+    @Test
+    public void testUsage() throws Exception {
+        try (KafkaContainer kafka = new KafkaContainer("apache/kafka:3.7.0")) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+}

From 9d6e7655a929abcc4db735e16642e4eb40e12155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 4 Apr 2024 10:02:11 -0600
Subject: [PATCH 3615/4969] Cleanup japicmp excludes

---
 modules/elasticsearch/build.gradle | 6 ------
 modules/mongodb/build.gradle       | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 550e9a9b23a..56399a509d9 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -6,9 +6,3 @@ dependencies {
     testImplementation "org.elasticsearch.client:transport:7.17.17"
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.elasticsearch.ElasticsearchContainer#containerIsStarted(com.github.dockerjava.api.command.InspectContainerResponse)",
-    ]
-}
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index c1b1f21b235..02e5cc6e71e 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -6,9 +6,3 @@ dependencies {
     testImplementation("org.mongodb:mongodb-driver-sync:4.11.1")
     testImplementation 'org.assertj:assertj-core:3.25.1'
 }
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.containers.MongoDBContainer#configure()"
-    ]
-}

From 5969b0f393b724c9ed2147272d87a24c8d9efe1c Mon Sep 17 00:00:00 2001
From: Thomas Vitale <ThomasVitale@users.noreply.github.com>
Date: Fri, 5 Apr 2024 07:53:50 +0200
Subject: [PATCH 3616/4969] Weaviate: Support new container registry (#8512)

Fixes gh-8511

Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
---
 .../org/testcontainers/weaviate/WeaviateContainer.java | 10 +++++++---
 .../testcontainers/weaviate/WeaviateContainerTest.java |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
index c8920a4cfb9..6225c79dd4a 100644
--- a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
+++ b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
@@ -6,7 +6,7 @@
 /**
  * Testcontainers implementation of Weaviate.
  * <p>
- * Supported image: {@code semitechnologies/weaviate}
+ * Supported images: {@code cr.weaviate.io/semitechnologies/weaviate}, {@code semitechnologies/weaviate}
  * <p>
  * Exposed ports:
  * <ul>
@@ -16,7 +16,11 @@
  */
 public class WeaviateContainer extends GenericContainer<WeaviateContainer> {
 
-    private static final String WEAVIATE_IMAGE = "semitechnologies/weaviate";
+    private static final DockerImageName DEFAULT_WEAVIATE_IMAGE = DockerImageName.parse(
+        "cr.weaviate.io/semitechnologies/weaviate"
+    );
+
+    private static final DockerImageName DOCKER_HUB_WEAVIATE_IMAGE = DockerImageName.parse("semitechnologies/weaviate");
 
     public WeaviateContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
@@ -24,7 +28,7 @@ public WeaviateContainer(String dockerImageName) {
 
     public WeaviateContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DockerImageName.parse(WEAVIATE_IMAGE));
+        dockerImageName.assertCompatibleWith(DEFAULT_WEAVIATE_IMAGE, DOCKER_HUB_WEAVIATE_IMAGE);
         withExposedPorts(8080, 50051);
         withEnv("AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED", "true");
         withEnv("PERSISTENCE_DATA_PATH", "/var/lib/weaviate");
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index 4acaa3b98fd..c74c6454d0d 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -19,7 +19,7 @@ public class WeaviateContainerTest {
     @Test
     public void testWeaviate() {
         try ( // container {
-            WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.24.5")
+            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.24.5")
             // }
         ) {
             weaviate.start();

From a910b7d2451e59dc330253a593f3dff0cbd0e1e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 22:30:07 +0000
Subject: [PATCH 3617/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.5.0.jre8-preview to 12.7.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6f67d160245..cd8574d6e0e 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.5.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.7.0.jre8-preview'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From d91a79c2a9d43f7f8d16e46acbd6c69ba9d17342 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 22:55:51 +0000
Subject: [PATCH 3618/4969] Bump io.asyncer:r2dbc-mysql from 1.0.6 to 1.1.3 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 1.0.6 to 1.1.3.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-1.0.6...r2dbc-mysql-1.1.3)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index a61819b1542..1c32ac4b4f4 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:1.0.6'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.1.3'
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.0.6'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.1.3'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 1f6b5cf1a123f30355aef0dffe6a29f0c58f8da5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 22:15:44 +0000
Subject: [PATCH 3619/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.7.1 to 3.7.2.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.7.1...3.7.2)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 09e47b14ce7..f56f520ad4e 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     api "com.orientechnologies:orientdb-client:3.2.26"
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.1'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.26"
 }

From 8d0cf9b312d2819fa0bea99b43552f9ed63a3844 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Thu, 18 Apr 2024 18:55:37 +0200
Subject: [PATCH 3620/4969] [neo4j] Deprecate withLabsPlugins (#8538)

This commit introduces a new method `withPlugins` to also get rid
of the _labs_ part and be in line with the `withPlugins(MountableFile plugins)`
method.
---
 docs/modules/databases/neo4j.md               |  9 ++--
 .../containers/Neo4jContainer.java            | 24 ++++++++--
 .../containers/Neo4jLabsPlugin.java           |  8 ++++
 .../containers/Neo4jContainerTest.java        | 46 +++++++++++++++----
 4 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index 17c58c7edff..18f7a957ea2 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -73,13 +73,12 @@ Whole directories work as well:
 
 ### Add Neo4j Docker Labs plugins
 
-Add any Neo4j Labs plugin from the [Neo4j Docker Labs plugin list](https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins).
+Add any Neo4j Labs plugin from the [Neo4j 4.4 Docker Labs plugin list](https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins)
+or [Neo4j 5 plugin list](https://neo4j.com/docs/operations-manual/5/configuration/plugins/).
 
 !!! note
-    At the moment only the plugins available from the list Neo4j Docker 4.4 are supported by type.
-    If you want to register another supported Neo4j Labs plugin, you have to add it manually
-    by using the method `withLabsPlugins(String... neo4jLabsPlugins)`.
-    Please refer to the list of [supported Docker image plugins](https://neo4j.com/docs/operations-manual/current/docker/operations/#docker-neo4jlabs-plugins).
+    The methods `withLabsPlugins(Neo4jLabsPlugin...)` and `withLabsPlugins(String... plugins)` are deprecated.
+    Please the method `withPlugins(String... plugins)`.
 
 <!--codeinclude-->
 [Configure Neo4j Labs Plugins](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:configureLabsPlugins
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 30fd6b8397c..e59e2ea2820 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -318,9 +318,11 @@ public String getAdminPassword() {
 
     /**
      * Registers one or more {@link Neo4jLabsPlugin} for download and server startup.
-
+     *
      * @param neo4jLabsPlugins The Neo4j plugins that should get started with the server.
      * @return This container.
+     * @deprecated {@link Neo4jLabsPlugin} were deprecated due to naming changes that cannot be solved by this enumeration.
+     * Please use the {@link Neo4jContainer#withPlugins(String...)} method.
      */
     public S withLabsPlugins(Neo4jLabsPlugin... neo4jLabsPlugins) {
         List<String> pluginNames = Arrays
@@ -333,13 +335,25 @@ public S withLabsPlugins(Neo4jLabsPlugin... neo4jLabsPlugins) {
     }
 
     /**
-     * Registers one or more {@link Neo4jLabsPlugin} for download and server startup.
+     * @deprecated Please use {@link Neo4jContainer#withPlugins(String...)} for named plugins.
+     */
+    public S withLabsPlugins(String... neo4jLabsPlugins) {
+        return this.withPlugins(neo4jLabsPlugins);
+    }
 
-     * @param neo4jLabsPlugins The Neo4j plugins that should get started with the server.
+    /**
+     * Registers one or more Neo4j plugins for server startup.
+     * The plugins are listed here
+     * <ul>
+     *     <li><a href="https://neo4j.com/docs/operations-manual/5/configuration/plugins/">Neo4j 5</a></li>
+     *     <li><a href="https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins">Neo4j 4.4</a></li>
+     * </ul>
+     *
+     * @param plugins The Neo4j plugins that should get started with the server.
      * @return This container.
      */
-    public S withLabsPlugins(String... neo4jLabsPlugins) {
-        this.labsPlugins.addAll(Arrays.asList(neo4jLabsPlugins));
+    public S withPlugins(String... plugins) {
+        this.labsPlugins.addAll(Arrays.asList(plugins));
         return self();
     }
 
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java
index 96c8e987c85..0e3bf634140 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java
@@ -4,6 +4,14 @@
  * Reflects a plugin from the official Neo4j 4.4.
  * <a href="https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins">Neo4j Labs Plugin list</a>.
  * There might be plugins not supported by your selected version of Neo4j.
+ *
+ * @deprecated Please use {@link Neo4jContainer#withLabsPlugins(String...)} with the matching plugin name for your Neo4j version.
+ * Due to some renaming of the (Docker image) plugin names, there is no naming consistency across versions.
+ * The plugins are listed here
+ * <ul>
+ *     <li><a href="https://neo4j.com/docs/operations-manual/5/configuration/plugins/">Neo4j 5</a></li>
+ *     <li><a href="https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins">Neo4j 4.4</a></li>
+ * </ul>
  */
 public enum Neo4jLabsPlugin {
     APOC("apoc"),
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index bdf3639a271..d2497cd900b 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -267,8 +267,9 @@ public void shouldRespectCustomWaitStrategy() {
         assertThat(neo4jContainer.getWaitStrategy()).isInstanceOf(CustomDummyWaitStrategy.class);
     }
 
+    // Test for deprecated functionality to be still alive, if `Neo4jLabsPlugin` gets removed, remove this test.
     @Test
-    public void shouldConfigureSingleLabsPlugin() {
+    public void shouldConfigureSingleLabsPluginByType() {
         try (
             Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins(Neo4jLabsPlugin.APOC)
         ) {
@@ -279,13 +280,12 @@ public void shouldConfigureSingleLabsPlugin() {
         }
     }
 
+    // Test for deprecated functionality to be still alive, if `Neo4jLabsPlugin` gets removed, remove this test.
     @Test
-    public void shouldConfigureMultipleLabsPlugins() {
+    public void shouldConfigureMultipleLabsPluginsByType() {
         try (
-            // configureLabsPlugins {
             Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
                 .withLabsPlugins(Neo4jLabsPlugin.APOC, Neo4jLabsPlugin.BLOOM);
-            // }
         ) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
@@ -295,26 +295,52 @@ public void shouldConfigureMultipleLabsPlugins() {
         }
     }
 
+    // Test for deprecated functionality to be still alive, if `Neo4jContainer#withLabsPlugins` gets removed, remove this test.
     @Test
-    public void shouldConfigureSingleLabsPluginWithString() {
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("myApoc")) {
+    public void shouldConfigureSingleLabsPlugin() {
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("apoc")) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
 
-            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"myApoc\"]");
+            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
         }
     }
 
+    // Test for deprecated functionality to be still alive, if `Neo4jContainer#withLabsPlugins` gets removed, remove this test.
     @Test
-    public void shouldConfigureMultipleLabsPluginsWithString() {
+    public void shouldConfigureMultipleLabsPlugins() {
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("apoc", "bloom");) {
+            // needs to get called explicitly for setup
+            neo4jContainer.configure();
+
+            assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
+                .containsAnyOf("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
+        }
+    }
+
+    @Test
+    public void shouldConfigureSinglePluginByName() {
+        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withPlugins("apoc")) {
+            // needs to get called explicitly for setup
+            neo4jContainer.configure();
+
+            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
+        }
+    }
+
+    @Test
+    public void shouldConfigureMultiplePluginsByName() {
         try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("myApoc", "myBloom")
+            // configureLabsPlugins {
+            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4") //
+                .withPlugins("apoc", "bloom");
+            // }
         ) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
 
             assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
-                .containsAnyOf("[\"myApoc\",\"myBloom\"]", "[\"myBloom\",\"myApoc\"]");
+                .containsAnyOf("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
         }
     }
 

From ba25e5d16bbc71b68a9760a0543c1318c671bb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 18 Apr 2024 15:19:31 -0500
Subject: [PATCH 3621/4969] [qdrant] Allow to set key and config file (#8556)

Co-authored-by: Anush008 <anushshetty90@gmail.com>
---
 .../qdrant/QdrantContainer.java               | 29 ++++++-
 .../qdrant/QdrantContainerTest.java           | 77 ++++++++++++++++---
 2 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java b/modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java
index 341349fe18c..e00ac541d48 100644
--- a/modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java
+++ b/modules/qdrant/src/main/java/org/testcontainers/qdrant/QdrantContainer.java
@@ -2,6 +2,7 @@
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -12,13 +13,21 @@
  * Exposed ports:
  * <ul>
  *     <li>HTTP: 6333</li>
- *     <li>Grpc: 6334</li>
+ *     <li>GRPC: 6334</li>
  * </ul>
  */
 public class QdrantContainer extends GenericContainer<QdrantContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("qdrant/qdrant");
 
+    private static final int QDRANT_REST_PORT = 6333;
+
+    private static final int QDRANT_GRPC_PORT = 6334;
+
+    private static final String CONFIG_FILE_PATH = "/qdrant/config/config.yaml";
+
+    private static final String API_KEY_ENV = "QDRANT__SERVICE__API_KEY";
+
     public QdrantContainer(String image) {
         this(DockerImageName.parse(image));
     }
@@ -26,11 +35,23 @@ public QdrantContainer(String image) {
     public QdrantContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-        withExposedPorts(6333, 6334);
-        waitingFor(Wait.forHttp("/readyz").forPort(6333));
+        withExposedPorts(QDRANT_REST_PORT, QDRANT_GRPC_PORT);
+        waitingFor(Wait.forHttp("/readyz").forPort(QDRANT_REST_PORT));
+    }
+
+    public QdrantContainer withApiKey(String apiKey) {
+        return withEnv(API_KEY_ENV, apiKey);
+    }
+
+    public QdrantContainer withConfigFile(Transferable configFile) {
+        return withCopyToContainer(configFile, CONFIG_FILE_PATH);
+    }
+
+    public int getGrpcPort() {
+        return getMappedPort(QDRANT_GRPC_PORT);
     }
 
     public String getGrpcHostAddress() {
-        return getHost() + ":" + getMappedPort(6334);
+        return getHost() + ":" + getGrpcPort();
     }
 }
diff --git a/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java b/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
index e33582bf552..d313a873d26 100644
--- a/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
+++ b/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
@@ -1,19 +1,21 @@
 package org.testcontainers.qdrant;
 
-import io.grpc.Grpc;
-import io.grpc.InsecureChannelCredentials;
+import io.qdrant.client.QdrantClient;
 import io.qdrant.client.QdrantGrpcClient;
 import io.qdrant.client.grpc.QdrantOuterClass;
 import org.junit.Test;
+import org.testcontainers.images.builder.Transferable;
 
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class QdrantContainerTest {
 
     @Test
-    public void test() throws ExecutionException, InterruptedException {
+    public void shouldReturnVersion() throws ExecutionException, InterruptedException {
         try (
             // qdrantContainer {
             QdrantContainer qdrant = new QdrantContainer("qdrant/qdrant:v1.7.4")
@@ -21,16 +23,67 @@ public void test() throws ExecutionException, InterruptedException {
         ) {
             qdrant.start();
 
-            QdrantGrpcClient client = QdrantGrpcClient
-                .newBuilder(
-                    Grpc.newChannelBuilder(qdrant.getGrpcHostAddress(), InsecureChannelCredentials.create()).build()
-                )
-                .build();
-            QdrantOuterClass.HealthCheckReply healthCheckReply = client
-                .qdrant()
-                .healthCheck(QdrantOuterClass.HealthCheckRequest.getDefaultInstance())
-                .get();
+            QdrantClient client = new QdrantClient(
+                QdrantGrpcClient.newBuilder(qdrant.getHost(), qdrant.getGrpcPort(), false).build()
+            );
+            QdrantOuterClass.HealthCheckReply healthCheckReply = client.healthCheckAsync().get();
             assertThat(healthCheckReply.getVersion()).isEqualTo("1.7.4");
+
+            client.close();
+        }
+    }
+
+    @Test
+    public void shouldSetApiKey() throws ExecutionException, InterruptedException {
+        String apiKey = UUID.randomUUID().toString();
+        try (QdrantContainer qdrant = new QdrantContainer("qdrant/qdrant:v1.7.4").withApiKey(apiKey)) {
+            qdrant.start();
+
+            final QdrantClient unauthClient = new QdrantClient(
+                QdrantGrpcClient.newBuilder(qdrant.getHost(), qdrant.getGrpcPort(), false).build()
+            );
+
+            assertThatThrownBy(() -> unauthClient.healthCheckAsync().get()).isInstanceOf(ExecutionException.class);
+
+            unauthClient.close();
+
+            final QdrantClient client = new QdrantClient(
+                QdrantGrpcClient.newBuilder(qdrant.getHost(), qdrant.getGrpcPort(), false).withApiKey(apiKey).build()
+            );
+
+            QdrantOuterClass.HealthCheckReply healthCheckReply = client.healthCheckAsync().get();
+            assertThat(healthCheckReply.getVersion()).isEqualTo("1.7.4");
+
+            client.close();
+        }
+    }
+
+    @Test
+    public void shouldSetApiKeyUsingConfigFile() throws ExecutionException, InterruptedException {
+        String apiKey = UUID.randomUUID().toString();
+        String configFile = "service:\n    api_key: " + apiKey;
+        try (
+            QdrantContainer qdrant = new QdrantContainer("qdrant/qdrant:v1.7.4")
+                .withConfigFile(Transferable.of(configFile))
+        ) {
+            qdrant.start();
+
+            final QdrantClient unauthClient = new QdrantClient(
+                QdrantGrpcClient.newBuilder(qdrant.getHost(), qdrant.getGrpcPort(), false).build()
+            );
+
+            assertThatThrownBy(() -> unauthClient.healthCheckAsync().get()).isInstanceOf(ExecutionException.class);
+
+            unauthClient.close();
+
+            final QdrantClient client = new QdrantClient(
+                QdrantGrpcClient.newBuilder(qdrant.getHost(), qdrant.getGrpcPort(), false).withApiKey(apiKey).build()
+            );
+
+            QdrantOuterClass.HealthCheckReply healthCheckReply = client.healthCheckAsync().get();
+            assertThat(healthCheckReply.getVersion()).isEqualTo("1.7.4");
+
+            client.close();
         }
     }
 }

From 3e2352c180defc9899e04e6e2ea2cda1e0130f14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 22:05:54 +0000
Subject: [PATCH 3622/4969] Bump io.fabric8:kubernetes-client from 6.10.0 to
 6.12.1 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.10.0 to 6.12.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.10.0...v6.12.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 70c8124fa6d..bf0fda84493 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.10.0'
+    testImplementation 'io.fabric8:kubernetes-client:6.12.1'
     testImplementation 'io.kubernetes:client-java:19.0.0'
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From e5c8b1a5e2c0835ad6574416daba9feac9c6824d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 22 Apr 2024 19:27:58 -0500
Subject: [PATCH 3623/4969] Move to gradle/actions/wrapper-validation (#8559)

---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index f636e52b36a..a6d7423d9c3 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -24,4 +24,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.0.3
+      - uses: gradle/actions/wrapper-validation@v3

From 994b385761dde7d832ab7b6c10bc62747fe4b340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <social.mdelapenya@gmail.com>
Date: Wed, 24 Apr 2024 15:42:16 +0200
Subject: [PATCH 3624/4969] Update testcontainers/sshd version to 1.2.0 (#8574)

---
 .../containers/PortForwardingContainer.java           | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index 0a99c48a367..a06e554a14c 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -24,18 +24,9 @@ public enum PortForwardingContainer {
 
     private static ContainerDef DEFINITION = new ContainerDef() {
         {
-            setImage(DockerImageName.parse("testcontainers/sshd:1.1.0"));
+            setImage(DockerImageName.parse("testcontainers/sshd:1.2.0"));
             addExposedTcpPort(22);
             addEnvVar("PASSWORD", PASSWORD);
-            setCommand(
-                "sh",
-                "-c",
-                // Disable ipv6 & Make it listen on all interfaces, not just localhost
-                // Enable algorithms supported by our ssh client library
-                "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes " +
-                "-o AddressFamily=inet -o GatewayPorts=yes -o AllowAgentForwarding=yes -o AllowTcpForwarding=yes " +
-                "-o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa "
-            );
         }
     };
 

From 003e85f1a2784cf6aac332f59ec0a16b0a61455b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 22:09:41 +0000
Subject: [PATCH 3625/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.5.2 to 3.6.2.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.5.2...java-client-3.6.2)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 032aacecfed..5e6979242a2 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.5.2'
+    testImplementation 'com.couchbase.client:java-client:3.6.2'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 1b46003589b6601520ded0ff17b9f4b50dbcc99f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 22:24:02 +0000
Subject: [PATCH 3626/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /modules/neo4j

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.13 to 4.4.16.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.13...4.4.16)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 8619cbc6940..0ae31547fb5 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.16'
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From e74751f48bd5985f71a1cf7b6704c992513e4c4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 22:24:27 +0000
Subject: [PATCH 3627/4969] Bump io.minio:minio from 8.5.7 to 8.5.10 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.5.7 to 8.5.10.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.5.7...8.5.10)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index d53768d81e2..51904985010 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.5.7")
+    testImplementation("io.minio:minio:8.5.10")
     testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From bc183cd135cdb5e9b102d4745cd474d6bc059673 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 22:56:46 +0000
Subject: [PATCH 3628/4969] Bump peter-evans/create-pull-request from 5.0.2 to
 6.0.5

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5.0.2 to 6.0.5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/153407881ec5c347639a548ade7d8ad1d6740e38...6d6857d36972b65feb161a90e484f2984215f83e)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 520a62c43e1..d39d9a35191 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
+        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index c0fbc9fc066..c7014b87d53 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
+        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v3.10.1
         with:
           title: Update testcontainers version to ${GITHUB_REF##*/}
           body: |

From 3209a1fc3b0e2aa543e4fbdf6786f4636afee1c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 May 2024 22:39:44 +0000
Subject: [PATCH 3629/4969] Bump org.apache.activemq:activemq-client in
 /modules/activemq

Bumps [org.apache.activemq:activemq-client](https://github.com/apache/activemq) from 6.0.1 to 6.1.2.
- [Commits](https://github.com/apache/activemq/compare/activemq-6.0.1...activemq-6.1.2)

---
updated-dependencies:
- dependency-name: org.apache.activemq:activemq-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 66bf306fd49..9906ecaa011 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation "org.apache.activemq:activemq-client:6.0.1"
+    testImplementation "org.apache.activemq:activemq-client:6.1.2"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.31.2"
 }
 

From 2195610f0d2a0864d1f9bd79bedf2c66e8386393 Mon Sep 17 00:00:00 2001
From: Daniel Fangl <daniel.fangl@gmail.com>
Date: Mon, 6 May 2024 19:15:21 +0200
Subject: [PATCH 3630/4969] Add LAMBDA_DOCKER_FLAGS with testcontainers labels
 (#8595)

---
 modules/localstack/build.gradle               |   2 +
 .../localstack/LocalStackContainer.java       |  31 ++++++
 .../localstack/LocalstackContainerTest.java   | 105 ++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 97c5ad9ce35..5f4534b7756 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -7,6 +7,8 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
+    testImplementation 'com.amazonaws:aws-java-sdk-lambda'
+    testImplementation 'com.amazonaws:aws-java-sdk-core'
     testImplementation 'software.amazon.awssdk:s3:2.23.9'
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index b3651aea9e5..f0525af8176 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -10,6 +10,7 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.ResourceReaper;
 
 import java.net.InetAddress;
 import java.net.URI;
@@ -19,6 +20,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Testcontainers implementation for LocalStack.
@@ -163,6 +165,34 @@ private static boolean shouldRunInLegacyMode(String version) {
         return true;
     }
 
+    /**
+     * Provides a docker argument string including all default labels set on testcontainer containers
+     * @return Argument string in the format `-l key1=value1 -l key2=value2`
+     */
+    private static String internalMarkerLabels() {
+        return Stream
+            .concat(
+                DockerClientFactory.DEFAULT_LABELS.entrySet().stream(),
+                ResourceReaper.instance().getLabels().entrySet().stream()
+            )
+            .map(entry -> String.format("-l %s=%s", entry.getKey(), entry.getValue()))
+            .collect(Collectors.joining(" "));
+    }
+
+    /**
+     * Configure the LocalStack container to include the default testcontainer labels on all spawned lambda containers
+     * Necessary to properly clean up lambda containers even if the LocalStack container is killed before it gets the
+     * chance.
+     */
+    private void configureLambdaContainerLabels() {
+        String lambdaDockerFlags = internalMarkerLabels();
+        String existingLambdaDockerFlags = getEnvMap().get("LAMBDA_DOCKER_FLAGS");
+        if (existingLambdaDockerFlags != null) {
+            lambdaDockerFlags = existingLambdaDockerFlags + " " + lambdaDockerFlags;
+        }
+        withEnv("LAMBDA_DOCKER_FLAGS", lambdaDockerFlags);
+    }
+
     @Override
     protected void configure() {
         super.configure();
@@ -185,6 +215,7 @@ protected void configure() {
         }
 
         exposePorts();
+        configureLambdaContainerLabels();
     }
 
     private void resolveHostname(String envVar) {
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index ef0c9b728c0..a1c36078840 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -8,6 +8,15 @@
 import com.amazonaws.services.kms.model.CreateKeyRequest;
 import com.amazonaws.services.kms.model.CreateKeyResult;
 import com.amazonaws.services.kms.model.Tag;
+import com.amazonaws.services.lambda.AWSLambda;
+import com.amazonaws.services.lambda.AWSLambdaClientBuilder;
+import com.amazonaws.services.lambda.model.CreateFunctionRequest;
+import com.amazonaws.services.lambda.model.CreateFunctionResult;
+import com.amazonaws.services.lambda.model.FunctionCode;
+import com.amazonaws.services.lambda.model.GetFunctionRequest;
+import com.amazonaws.services.lambda.model.InvokeRequest;
+import com.amazonaws.services.lambda.model.InvokeResult;
+import com.amazonaws.services.lambda.model.Runtime;
 import com.amazonaws.services.logs.AWSLogs;
 import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.model.CreateLogGroupRequest;
@@ -20,12 +29,15 @@
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
 import com.amazonaws.services.sqs.model.CreateQueueResult;
+import com.amazonaws.waiters.WaiterParameters;
+import com.github.dockerjava.api.DockerClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
@@ -36,14 +48,21 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -505,4 +524,90 @@ public void shouldBeAccessibleWithCredentials() throws IOException {
             assertThat(content).as("The object can be retrieved").isEqualTo("baz");
         }
     }
+
+    public static class LambdaContainerLabels {
+
+        @ClassRule
+        public static LocalStackContainer localstack = new LocalStackContainer(
+            LocalstackTestImages.LOCALSTACK_2_3_IMAGE
+        );
+
+        private static byte[] createLambdaHandlerZipFile() throws IOException {
+            StringBuilder sb = new StringBuilder();
+            sb.append("def handler(event, context):\n");
+            sb.append("    return event");
+
+            ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
+            ZipOutputStream out = new ZipOutputStream(byteOutput);
+            ZipEntry e = new ZipEntry("handler.py");
+            out.putNextEntry(e);
+
+            byte[] data = sb.toString().getBytes();
+            out.write(data, 0, data.length);
+            out.closeEntry();
+            out.close();
+            return byteOutput.toByteArray();
+        }
+
+        @Test
+        public void shouldLabelLambdaContainers() throws IOException {
+            AWSLambda lambda = AWSLambdaClientBuilder
+                .standard()
+                .withEndpointConfiguration(
+                    new AwsClientBuilder.EndpointConfiguration(
+                        localstack.getEndpoint().toString(),
+                        localstack.getRegion()
+                    )
+                )
+                .withCredentials(
+                    new AWSStaticCredentialsProvider(
+                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
+                .build();
+
+            // create function
+            byte[] handlerFile = createLambdaHandlerZipFile();
+            CreateFunctionRequest createFunctionRequest = new CreateFunctionRequest()
+                .withFunctionName("test-function")
+                .withRuntime(Runtime.Python311)
+                .withHandler("handler.handler")
+                .withRole("arn:aws:iam::000000000000:role/test-role")
+                .withCode(new FunctionCode().withZipFile(ByteBuffer.wrap(handlerFile)));
+            CreateFunctionResult createFunctionResult = lambda.createFunction(createFunctionRequest);
+            GetFunctionRequest getFunctionRequest = new GetFunctionRequest()
+                .withFunctionName(createFunctionResult.getFunctionName());
+            lambda
+                .waiters()
+                .functionActiveV2()
+                .run(new WaiterParameters<GetFunctionRequest>().withRequest(getFunctionRequest));
+
+            // invoke function once
+            String payload = "{\"test\": \"payload\"}";
+            InvokeRequest invokeRequest = new InvokeRequest()
+                .withFunctionName(createFunctionResult.getFunctionName())
+                .withPayload(payload);
+            InvokeResult invokeResult = lambda.invoke(invokeRequest);
+            assertThat(StandardCharsets.UTF_8.decode(invokeResult.getPayload()).toString())
+                .as("Invoke result not matching expected output")
+                .isEqualTo(payload);
+
+            // assert that the spawned lambda containers has the testcontainers labels set
+            DockerClient dockerClient = DockerClientFactory.instance().client();
+            Collection<String> nameFilter = Collections.singleton(localstack.getContainerName().replace("_", "-"));
+            com.github.dockerjava.api.model.Container lambdaContainer = dockerClient
+                .listContainersCmd()
+                .withNameFilter(nameFilter)
+                .exec()
+                .stream()
+                .findFirst()
+                .orElse(null);
+            assertThat(lambdaContainer).as("Lambda container not found").isNotNull();
+            Map<String, String> labels = lambdaContainer.getLabels();
+            assertThat(labels.get("org.testcontainers")).as("TestContainers label not present").isEqualTo("true");
+            assertThat(labels.get("org.testcontainers.sessionId"))
+                .as("TestContainers session id not present")
+                .isNotNull();
+        }
+    }
 }

From 8b9eb0cdd8c7b7d6b04ef68c21b89e771441a758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 6 May 2024 18:20:02 +0100
Subject: [PATCH 3631/4969] Fix Ollama code snippet

---
 .../java/org/testcontainers/ollama/OllamaContainerTest.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
index 96118f50be6..e4a1d61b790 100644
--- a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
+++ b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
@@ -44,11 +44,14 @@ public void downloadModelAndCommitToImage() throws IOException, InterruptedExcep
             // }
         }
         try (
+            // spotless:off
             // substitute {
             OllamaContainer ollama = new OllamaContainer(
-                DockerImageName.parse(newImageName).asCompatibleSubstituteFor("ollama/ollama")
+                DockerImageName.parse(newImageName)
+                    .asCompatibleSubstituteFor("ollama/ollama")
             )
             // }
+            // spotless:on
         ) {
             ollama.start();
             String modelName = given()

From 9b780dd8f27b7665f34c54ae738c41eccf73ad44 Mon Sep 17 00:00:00 2001
From: Peter Halicky <peto@halicky.sk>
Date: Mon, 6 May 2024 22:30:27 +0200
Subject: [PATCH 3632/4969] Add support for backtick enquoting in SQL script
 splitter (#8593)

---
 .../main/java/org/testcontainers/ext/ScriptScanner.java  | 7 ++++++-
 .../java/org/testcontainers/ext/ScriptSplittingTest.java | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
index 686527e9364..8350f7fbf38 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
@@ -141,7 +141,12 @@ Lexem next() {
                 return Lexem.SEPARATOR;
             } else if (matchesSingleLineComment() || matchesMultilineComment()) {
                 return Lexem.COMMENT;
-            } else if (matchesQuotedString('\'') || matchesQuotedString('"') || matchesDollarQuotedString()) {
+            } else if (
+                matchesQuotedString('\'') ||
+                matchesQuotedString('"') ||
+                matchesQuotedString('`') ||
+                matchesDollarQuotedString()
+            ) {
                 return Lexem.QUOTED_STRING;
             } else if (matches(identifier)) {
                 return Lexem.IDENTIFIER;
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index baaf3bbd08c..3f78e5c51db 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -68,6 +68,15 @@ public void testIssue1547Case2() {
         splitAndCompare(script, expected);
     }
 
+    @Test
+    public void testSplittingEnquotedSemicolon() {
+        String script = "CREATE TABLE `bar;bar` (\n" + "  end_time VARCHAR(255)\n" + ");";
+
+        List<String> expected = Arrays.asList("CREATE TABLE `bar;bar` ( end_time VARCHAR(255) )");
+
+        splitAndCompare(script, expected);
+    }
+
     @Test
     public void testUnusualSemicolonPlacement() {
         String script = "SELECT 1;;;;;SELECT 2;\n;SELECT 3\n; SELECT 4;\n SELECT 5";

From 1ebe16c64cf2bd2a1d9a00e421c5f68571064f7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 22:14:19 +0000
Subject: [PATCH 3633/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 4.11.1 to 5.1.0.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.11.1...r5.1.0)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 02e5cc6e71e..800c10a877f 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.11.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:5.1.0")
     testImplementation 'org.assertj:assertj-core:3.25.1'
 }

From 5424c7e70680165178cbee82590e4677c88754df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 22:16:28 +0000
Subject: [PATCH 3634/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-free

Bumps com.oracle.database.jdbc:ojdbc11 from 23.3.0.23.09 to 23.4.0.24.05.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index d2123af02f3..d9673126063 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.4.0.24.05'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 

From 669c05e9e631bea283fcabbc260a8a41527d6d1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 22:31:03 +0000
Subject: [PATCH 3635/4969] Bump dev.openfga:openfga-sdk from 0.3.2 to 0.4.2 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.3.2 to 0.4.2.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.3.2...v0.4.2)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 9824603d5bd..b05ab4cc1ba 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'dev.openfga:openfga-sdk:0.3.2'
+    testImplementation 'dev.openfga:openfga-sdk:0.4.2'
 }
 
 test {

From 40c76ef5b1c510166f56d821609f22534c66dee0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 22:39:01 +0000
Subject: [PATCH 3636/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.0.0-jre to 33.2.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 01f1b35632a..5ff3d0520a3 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:33.0.0-jre'
+    api 'com.google.guava:guava:33.2.0-jre'
     api 'org.apache.commons:commons-lang3:3.14.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'

From 647ab855313d79775f5ba5495de701c006ca8632 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 22:39:26 +0000
Subject: [PATCH 3637/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 23.3.0.23.09 to 23.4.0.24.05.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 3cef70efc4c..d9c27ca92fc 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.4.0.24.05'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 

From 131a625df7d7fdbaa6140e26f1f300d71d2a7a81 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 17:10:30 -0600
Subject: [PATCH 3638/4969] [create-pull-request] automated change (#8615)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a8d90824f3b..ad6298ca260 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.19.7
+testcontainers.version=1.19.8

From 1f291eb5eca5f7ad3cd8461bfbac2605afd45585 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 17:10:45 -0600
Subject: [PATCH 3639/4969] [create-pull-request] automated change (#8614)

Co-authored-by: eddumelendez <eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 0beb5e182a3..542778488fd 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -132,4 +132,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.7
+    latest_version: 1.19.8

From 18ea976a640e43e3fa1a1da7285c4630fd9cdbac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 13 May 2024 23:14:30 -0500
Subject: [PATCH 3640/4969] Update images using OCI format or Docker Image
 manifest v2, schema 2 (#8631)

* Update redis image
* Update rabbitmq image
* Update mongodb image
---
 core/src/test/java/org/testcontainers/TestImages.java       | 6 +++---
 .../org/testcontainers/containers/GenericContainerTest.java | 2 +-
 .../testcontainers/junit/DockerComposeLocalImageTest.java   | 2 +-
 .../resources/compose-options-test/with-deploy-block.yml    | 2 +-
 .../generic/src/test/java/generic/CmdModifierTest.java      | 4 ++--
 .../junit4/generic/src/test/java/generic/CommandsTest.java  | 2 +-
 .../src/test/java/generic/ContainerCreationTest.java        | 2 +-
 .../junit4/generic/src/test/java/generic/DependsOnTest.java | 2 +-
 .../generic/src/test/java/generic/WaitStrategiesTest.java   | 2 +-
 .../src/test/java/quickstart/RedisBackedCacheIntTest.java   | 2 +-
 .../src/test/java/quickstart/RedisBackedCacheIntTest.java   | 2 +-
 .../test/groovy/quickstart/RedisBackedCacheIntTest.groovy   | 2 +-
 .../src/test/java/RedisBackedCacheTest.java                 | 2 +-
 .../src/test/java/RedisBackedCacheTest.java                 | 2 +-
 .../src/test/java/com/example/AbstractIntegrationTest.java  | 2 +-
 .../kotlin/com/example/redis/AbstractIntegrationTest.kt     | 2 +-
 .../src/test/java/com/example/AbstractIntegrationTest.java  | 2 +-
 .../junit/jupiter/inheritance/RedisContainer.java           | 2 +-
 .../java/org/testcontainers/containers/ToxiproxyTest.java   | 4 ++--
 19 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
index 21511a0d72f..d8209e29507 100644
--- a/core/src/test/java/org/testcontainers/TestImages.java
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -3,9 +3,9 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface TestImages {
-    DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
-    DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3");
-    DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
+    DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine");
+    DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.7.25");
+    DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.4");
     DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
     DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 56a70e83c46..a5b7fe15441 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -227,7 +227,7 @@ public void testArchitectureCheck() {
     @Test
     public void shouldReturnTheProvidedImage() {
         GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE);
-        assertThat(container.getImage().get()).isEqualTo("redis:3.0.2");
+        assertThat(container.getImage().get()).isEqualTo("redis:6-alpine");
         container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE));
         assertThat(container.getImage().get()).isEqualTo("alpine:3.17");
     }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
index dd2054e1e2e..69b674bca71 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
@@ -12,7 +12,7 @@ public class DockerComposeLocalImageTest {
 
     @Test
     public void usesLocalImageEvenWhenPullFails() throws InterruptedException {
-        tagImage("redis:4.0.10", "redis-local", "latest");
+        tagImage("redis:6-alpine", "redis-local", "latest");
 
         DockerComposeContainer composeContainer = new DockerComposeContainer(
             new File("src/test/resources/local-compose-test.yml")
diff --git a/core/src/test/resources/compose-options-test/with-deploy-block.yml b/core/src/test/resources/compose-options-test/with-deploy-block.yml
index f52f6747122..b80c8677fb8 100644
--- a/core/src/test/resources/compose-options-test/with-deploy-block.yml
+++ b/core/src/test/resources/compose-options-test/with-deploy-block.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   redis:
-      image: redis:2.6.17
+      image: redis:6-alpine
       deploy:
         resources:
           limits:
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
index a8ace490d82..52c7f621d07 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -18,7 +18,7 @@ public class CmdModifierTest {
 
     // hostname {
     @Rule
-    public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
+    public GenericContainer theCache = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
         .withCreateContainerCmdModifier(cmd -> cmd.withHostName("the-cache"));
 
     // }
@@ -30,7 +30,7 @@ public class CmdModifierTest {
     private long memorySwapInBytes = 64l * 1024l * 1024l;
 
     @Rule
-    public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
+    public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
         .withCreateContainerCmdModifier(cmd -> {
             cmd.getHostConfig()
                 .withMemory(memoryInBytes)
diff --git a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
index 3cab77770dc..5b4df0dbb66 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/CommandsTest.java
@@ -11,7 +11,7 @@ public class CommandsTest {
 
     @Rule
     // startupCommand {
-    public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:5.0"))
+    public GenericContainer redisWithCustomPort = new GenericContainer(DockerImageName.parse("redis:6-alpine"))
         .withCommand("redis-server --port 7777")
         // }
         .withExposedPorts(7777);
diff --git a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
index 09149091c23..e202580c247 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java
@@ -11,7 +11,7 @@ public class ContainerCreationTest {
 
     // spotless:off
     // simple {
-    public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
+    public static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine");
 
     @ClassRule
     public static GenericContainer<?> redis = new GenericContainer<>(REDIS_IMAGE)
diff --git a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
index 7116f375283..d8e152fc847 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
@@ -10,7 +10,7 @@ public class DependsOnTest {
 
     @Rule
     // dependsOn {
-    public GenericContainer<?> redis = new GenericContainer<>("redis:3.0.2").withExposedPorts(6379);
+    public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine").withExposedPorts(6379);
 
     @Rule
     public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.9.4").dependsOn(redis).withExposedPorts(80);
diff --git a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
index 0b2b166d1d9..7d1876be591 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
@@ -29,7 +29,7 @@ public class WaitStrategiesTest {
 
     @Rule
     // logMessageWait {
-    public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:5.0.3"))
+    public GenericContainer containerWithLogWait = new GenericContainer(DockerImageName.parse("redis:6-alpine"))
         .withExposedPorts(6379)
         .waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\n", 1));
 
diff --git a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index 0f219397bdc..e4c4424315b 100644
--- a/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit4/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -14,7 +14,7 @@ public class RedisBackedCacheIntTest {
 
     // rule {
     @Rule
-    public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine"))
+    public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:6-alpine"))
         .withExposedPorts(6379);
 
     // }
diff --git a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
index 2c5f4baef67..b61763471f2 100644
--- a/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
+++ b/docs/examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java
@@ -17,7 +17,7 @@ public class RedisBackedCacheIntTest {
 
     // container {
     @Container
-    public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine"))
+    public GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:6-alpine"))
         .withExposedPorts(6379);
 
     // }
diff --git a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
index 5cc04dc6b9d..407e49cc638 100644
--- a/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
+++ b/docs/examples/spock/redis/src/test/groovy/quickstart/RedisBackedCacheIntTest.groovy
@@ -10,7 +10,7 @@ class RedisBackedCacheIntTest extends Specification {
 	private RedisBackedCache underTest
 
 	// init {
-	GenericContainer redis = new GenericContainer<>("redis:5.0.3-alpine")
+	GenericContainer redis = new GenericContainer<>("redis:6-alpine")
 	.withExposedPorts(6379)
 	// }
 
diff --git a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
index 45c482c098e..0f97be3c336 100644
--- a/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache-testng/src/test/java/RedisBackedCacheTest.java
@@ -17,7 +17,7 @@
  */
 public class RedisBackedCacheTest {
 
-    private static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
+    private static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
         .withExposedPorts(6379);
 
     private Cache cache;
diff --git a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
index de33245eb01..970fc0a58e5 100644
--- a/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
+++ b/examples/redis-backed-cache/src/test/java/RedisBackedCacheTest.java
@@ -19,7 +19,7 @@
 class RedisBackedCacheTest {
 
     @Container
-    public GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
+    public GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
         .withExposedPorts(6379);
 
     private Cache cache;
diff --git a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
index 729e9fb124d..654977d7a22 100644
--- a/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/singleton-container/src/test/java/com/example/AbstractIntegrationTest.java
@@ -5,7 +5,7 @@
 
 public abstract class AbstractIntegrationTest {
 
-    public static final GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3.0.6"))
+    public static final GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
         .withExposedPorts(6379);
 
     static {
diff --git a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
index 045899ad721..6df81f56262 100644
--- a/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
+++ b/examples/spring-boot-kotlin-redis/src/test/kotlin/com/example/redis/AbstractIntegrationTest.kt
@@ -16,7 +16,7 @@ import org.testcontainers.containers.GenericContainer
 abstract class AbstractIntegrationTest {
 
     companion object {
-        val redisContainer = GenericContainer<Nothing>("redis:3-alpine")
+        val redisContainer = GenericContainer<Nothing>("redis:6-alpine")
                 .apply { withExposedPorts(6379) }
     }
 
diff --git a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
index d3d1621cda1..806e63ed930 100644
--- a/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
+++ b/examples/spring-boot/src/test/java/com/example/AbstractIntegrationTest.java
@@ -16,7 +16,7 @@
 @ActiveProfiles("test")
 abstract class AbstractIntegrationTest {
 
-    static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:3-alpine"))
+    static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:6-alpine"))
         .withExposedPorts(6379);
 
     @DynamicPropertySource
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
index 0a9ec62fca2..f6ed39c483e 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/inheritance/RedisContainer.java
@@ -7,7 +7,7 @@
 public class RedisContainer extends GenericContainer<RedisContainer> {
 
     public RedisContainer() {
-        super(DockerImageName.parse("redis:3.2.11"));
+        super(DockerImageName.parse("redis:6-alpine"));
         withExposedPorts(6379);
     }
 
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index 34068e5e49e..b3caaf4f083 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -27,7 +27,7 @@ public class ToxiproxyTest {
 
     // The target container - this could be anything
     @Rule
-    public GenericContainer<?> redis = new GenericContainer<>("redis:5.0.4")
+    public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine")
         .withExposedPorts(6379)
         .withNetwork(network)
         .withNetworkAliases("redis");
@@ -114,7 +114,7 @@ public void testConnectionCut() throws IOException {
     @Test
     public void testMultipleProxiesCanBeCreated() throws IOException {
         try (
-            GenericContainer<?> secondRedis = new GenericContainer<>("redis:5.0.4")
+            GenericContainer<?> secondRedis = new GenericContainer<>("redis:6-alpine")
                 .withExposedPorts(6379)
                 .withNetwork(network)
                 .withNetworkAliases("redis2")

From ec9651e2217acef609c1a86df1b920eb7371e769 Mon Sep 17 00:00:00 2001
From: Thijs Lemmens <thijs.lemmens@gmail.com>
Date: Mon, 20 May 2024 18:15:00 +0200
Subject: [PATCH 3641/4969] Add support for pgvector using JDBC Testcontainers
 URL (#8638)

Fixes #8633
---
 docs/modules/databases/jdbc.md                |  4 ++
 .../jdbc/AbstractJDBCDriverTest.java          |  3 +-
 .../containers/PgVectorContainerProvider.java | 44 +++++++++++++++++++
 ...s.containers.JdbcDatabaseContainerProvider |  1 +
 .../jdbc/pgvector/PgVectorJDBCDriverTest.java | 28 ++++++++++++
 5 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index c1d0171c59e..947f4e1a810 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -79,6 +79,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:timescaledb:2.1.0-pg13:///databasename`
 
+#### Using PGVector
+
+`jdbc:tc:pgvector:pg16:///databasename`
+
 #### Using TiDB
 
 `jdbc:tc:tidb:v6.1.0:///databasename`
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index a22b4e24ed0..5a22e37ecfc 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -130,7 +130,8 @@ private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQ
         if (
             databaseType.equalsIgnoreCase("postgresql") ||
             databaseType.equalsIgnoreCase("postgis") ||
-            databaseType.equalsIgnoreCase("timescaledb")
+            databaseType.equalsIgnoreCase("timescaledb") ||
+            databaseType.equalsIgnoreCase("pgvector")
         ) {
             databaseQuery = "SELECT CURRENT_DATABASE()";
         }
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java
new file mode 100644
index 00000000000..5aebbbefbc3
--- /dev/null
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java
@@ -0,0 +1,44 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.jdbc.ConnectionUrl;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for PgVector containers.
+ *
+ * @see <a href="https://github.com/pgvector/pgvector">https://github.com/pgvector/pgvector</a>
+ */
+public class PgVectorContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final String NAME = "pgvector";
+
+    private static final String DEFAULT_TAG = "pg16";
+
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName
+        .parse("pgvector/pgvector")
+        .asCompatibleSubstituteFor("postgres");
+
+    public static final String USER_PARAM = "user";
+
+    public static final String PASSWORD_PARAM = "password";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new PostgreSQLContainer(DEFAULT_IMAGE.withTag(tag));
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(ConnectionUrl connectionUrl) {
+        return newInstanceFromConnectionUrl(connectionUrl, USER_PARAM, PASSWORD_PARAM);
+    }
+}
diff --git a/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
index 05df9054522..33429fa8b1e 100644
--- a/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
+++ b/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -1,3 +1,4 @@
 org.testcontainers.containers.PostgreSQLContainerProvider
 org.testcontainers.containers.PostgisContainerProvider
 org.testcontainers.containers.TimescaleDBContainerProvider
+org.testcontainers.containers.PgVectorContainerProvider
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java
new file mode 100644
index 00000000000..2d7e67f4923
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java
@@ -0,0 +1,28 @@
+package org.testcontainers.jdbc.pgvector;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+@RunWith(Parameterized.class)
+public class PgVectorJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] {
+                {
+                    "jdbc:tc:pgvector://hostname/databasename?user=someuser&password=somepwd",
+                    EnumSet.of(Options.JDBCParams),
+                },
+                {
+                    "jdbc:tc:pgvector:pg14://hostname/databasename?user=someuser&password=somepwd",
+                    EnumSet.of(Options.JDBCParams),
+                },
+            }
+        );
+    }
+}

From af6ca85ac4ccefc69daf403e5fbd03c58fb2107f Mon Sep 17 00:00:00 2001
From: Michael Prankl <eidottermihi@gmail.com>
Date: Mon, 20 May 2024 18:16:37 +0200
Subject: [PATCH 3642/4969] Add '@EnabledIfDockerAvailable' JUnit 5 annotation
 (#8636)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8613

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../jupiter/DockerAvailableDetector.java      | 15 ++++++
 .../jupiter/EnabledIfDockerAvailable.java     | 19 ++++++++
 .../EnabledIfDockerAvailableCondition.java    | 47 ++++++++++++++++++
 .../jupiter/TestcontainersExtension.java      | 10 ++--
 .../EnabledIfDockerAvailableTests.java        | 48 +++++++++++++++++++
 5 files changed, 132 insertions(+), 7 deletions(-)
 create mode 100644 modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/DockerAvailableDetector.java
 create mode 100644 modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailable.java
 create mode 100644 modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableTests.java

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/DockerAvailableDetector.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/DockerAvailableDetector.java
new file mode 100644
index 00000000000..804568e7dfc
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/DockerAvailableDetector.java
@@ -0,0 +1,15 @@
+package org.testcontainers.junit.jupiter;
+
+import org.testcontainers.DockerClientFactory;
+
+class DockerAvailableDetector {
+
+    public boolean isDockerAvailable() {
+        try {
+            DockerClientFactory.instance().client();
+            return true;
+        } catch (Throwable ex) {
+            return false;
+        }
+    }
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailable.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailable.java
new file mode 100644
index 00000000000..6c78cbb7759
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailable.java
@@ -0,0 +1,19 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * {@code EnabledIfDockerAvailable} is a JUnit Jupiter extension to enable tests only if Docker is available.
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@ExtendWith(EnabledIfDockerAvailableCondition.class)
+public @interface EnabledIfDockerAvailable {
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
new file mode 100644
index 00000000000..0e3731b8a06
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
@@ -0,0 +1,47 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+import java.util.Optional;
+
+public class EnabledIfDockerAvailableCondition implements ExecutionCondition {
+
+    private final DockerAvailableDetector dockerDetector = new DockerAvailableDetector();
+
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+        return findAnnotation(context)
+            .map(this::evaluate)
+            .orElseThrow(() -> new ExtensionConfigurationException("@EnabledIfDockerAvailable not found"));
+    }
+
+    boolean isDockerAvailable() {
+        return this.dockerDetector.isDockerAvailable();
+    }
+
+    private ConditionEvaluationResult evaluate(EnabledIfDockerAvailable testcontainers) {
+        if (isDockerAvailable()) {
+            return ConditionEvaluationResult.enabled("Docker is available");
+        }
+        return ConditionEvaluationResult.disabled("Docker is not available");
+    }
+
+    private Optional<EnabledIfDockerAvailable> findAnnotation(ExtensionContext context) {
+        Optional<ExtensionContext> current = Optional.of(context);
+        while (current.isPresent()) {
+            Optional<EnabledIfDockerAvailable> enabledIfDockerAvailable = AnnotationSupport.findAnnotation(
+                current.get().getRequiredTestClass(),
+                EnabledIfDockerAvailable.class
+            );
+            if (enabledIfDockerAvailable.isPresent()) {
+                return enabledIfDockerAvailable;
+            }
+            current = current.get().getParent();
+        }
+        return Optional.empty();
+    }
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index ca99a2d2382..6d482f8aab7 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -16,7 +16,6 @@
 import org.junit.platform.commons.support.HierarchyTraversalMode;
 import org.junit.platform.commons.support.ModifierSupport;
 import org.junit.platform.commons.support.ReflectionSupport;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.lifecycle.Startables;
 import org.testcontainers.lifecycle.TestDescription;
@@ -42,6 +41,8 @@ public class TestcontainersExtension
 
     private static final String LOCAL_LIFECYCLE_AWARE_CONTAINERS = "localLifecycleAwareContainers";
 
+    private final DockerAvailableDetector dockerDetector = new DockerAvailableDetector();
+
     @Override
     public void beforeAll(ExtensionContext context) {
         Class<?> testClass = context
@@ -192,12 +193,7 @@ private ConditionEvaluationResult evaluate(Testcontainers testcontainers) {
     }
 
     boolean isDockerAvailable() {
-        try {
-            DockerClientFactory.instance().client();
-            return true;
-        } catch (Throwable ex) {
-            return false;
-        }
+        return this.dockerDetector.isDockerAvailable();
     }
 
     private Set<Object> collectParentTestInstances(final ExtensionContext context) {
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableTests.java
new file mode 100644
index 00000000000..455e94788f9
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableTests.java
@@ -0,0 +1,48 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class EnabledIfDockerAvailableTests {
+
+    @Test
+    void whenDockerIsAvailableTestsAreEnabled() {
+        ConditionEvaluationResult result = new TestEnabledIfDockerAvailableCondition(true)
+            .evaluateExecutionCondition(extensionContext(DisabledWithoutDocker.class));
+        assertThat(result.isDisabled()).isFalse();
+    }
+
+    @Test
+    void whenDockerIsUnavailableTestsAreDisabled() {
+        ConditionEvaluationResult result = new TestEnabledIfDockerAvailableCondition(false)
+            .evaluateExecutionCondition(extensionContext(DisabledWithoutDocker.class));
+        assertThat(result.isDisabled()).isTrue();
+    }
+
+    private ExtensionContext extensionContext(Class clazz) {
+        ExtensionContext extensionContext = mock(ExtensionContext.class);
+        when(extensionContext.getRequiredTestClass()).thenReturn(clazz);
+        return extensionContext;
+    }
+
+    @EnabledIfDockerAvailable
+    static final class DisabledWithoutDocker {}
+
+    static final class TestEnabledIfDockerAvailableCondition extends EnabledIfDockerAvailableCondition {
+
+        private final boolean dockerAvailable;
+
+        private TestEnabledIfDockerAvailableCondition(boolean dockerAvailable) {
+            this.dockerAvailable = dockerAvailable;
+        }
+
+        boolean isDockerAvailable() {
+            return dockerAvailable;
+        }
+    }
+}

From 5102487c5cd69a23d7362c9abdfc2cf3fc6524cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 20 May 2024 10:21:43 -0600
Subject: [PATCH 3643/4969] Remove compatible substitution for pgvector

---
 .../testcontainers/containers/PgVectorContainerProvider.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java
index 5aebbbefbc3..29f6c3bf935 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PgVectorContainerProvider.java
@@ -14,9 +14,7 @@ public class PgVectorContainerProvider extends JdbcDatabaseContainerProvider {
 
     private static final String DEFAULT_TAG = "pg16";
 
-    private static final DockerImageName DEFAULT_IMAGE = DockerImageName
-        .parse("pgvector/pgvector")
-        .asCompatibleSubstituteFor("postgres");
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("pgvector/pgvector");
 
     public static final String USER_PARAM = "user";
 

From 83d37bc38a689a97f50dbb38ec8fc23392ff677b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 20 May 2024 10:27:44 -0600
Subject: [PATCH 3644/4969] Mark EnabledIfDockerAvailableCondition as
 non-public class

---
 .../junit/jupiter/EnabledIfDockerAvailableCondition.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
index 0e3731b8a06..6067a9b4f4e 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
@@ -8,7 +8,7 @@
 
 import java.util.Optional;
 
-public class EnabledIfDockerAvailableCondition implements ExecutionCondition {
+class EnabledIfDockerAvailableCondition implements ExecutionCondition {
 
     private final DockerAvailableDetector dockerDetector = new DockerAvailableDetector();
 

From ced5b7212a05ed0a3f7700cab478605450179603 Mon Sep 17 00:00:00 2001
From: Kevin Howell <kevin@kahowell.net>
Date: Mon, 20 May 2024 15:48:04 -0400
Subject: [PATCH 3645/4969] Use /tmp for startup scripts (#7524)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8637

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../org/testcontainers/containers/KafkaContainer.java  | 10 +++++-----
 .../java/org/testcontainers/kafka/KafkaContainer.java  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index a7144c0861b..209534fd3db 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -39,7 +39,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
 
-    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+    private static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
 
     // https://docs.confluent.io/platform/7.0.0/release-notes/index.html#ak-raft-kraft
     private static final String MIN_KRAFT_TAG = "7.0.0";
@@ -208,10 +208,10 @@ protected String commandKraft() {
     }
 
     protected String commandZookeeper() {
-        String command = "echo 'clientPort=" + ZOOKEEPER_PORT + "' > zookeeper.properties\n";
-        command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n";
-        command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n";
-        command += "zookeeper-server-start zookeeper.properties &\n";
+        String command = "echo 'clientPort=" + ZOOKEEPER_PORT + "' > /tmp/zookeeper.properties\n";
+        command += "echo 'dataDir=/var/lib/zookeeper/data' >> /tmp/zookeeper.properties\n";
+        command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> /tmp/zookeeper.properties\n";
+        command += "zookeeper-server-start /tmp/zookeeper.properties &\n";
         return command;
     }
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
index 547a7dc7960..86759979cf7 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -24,7 +24,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
 
-    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+    private static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
 
     private static final String DEFAULT_CLUSTER_ID = "4L6g3nShT-eMCtK--X86sw";
 

From f8832d18c2e6bc0c6a864c1c51c91fd0ee1d9b72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:12:09 +0000
Subject: [PATCH 3646/4969] --- updated-dependencies: - dependency-name:
 software.amazon.awssdk:s3   dependency-type: direct:production   update-type:
 version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@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 5f4534b7756..96f9edc2cec 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.23.9'
+    testImplementation 'software.amazon.awssdk:s3:2.25.56'
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 9ccca9b09e95b117d61db7f084dd50773d1995b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:12:48 +0000
Subject: [PATCH 3647/4969] --- updated-dependencies: - dependency-name:
 io.weaviate:client   dependency-type: direct:production   update-type:
 version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index b96c4075d25..e9287ed6bde 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'io.weaviate:client:4.6.0'
+    testImplementation 'io.weaviate:client:4.7.0'
 }

From 8eb87ab7cc875f99627fdaec62b1ca39d4d02342 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:13:29 +0000
Subject: [PATCH 3648/4969] --- updated-dependencies: - dependency-name:
 io.grpc:grpc-bom   dependency-type: direct:production   update-type:
 version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index cc856e1d970..2b58eeb6ddb 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'io.qdrant:client:1.7.1'
-    testImplementation platform('io.grpc:grpc-bom:1.61.1')
+    testImplementation platform('io.grpc:grpc-bom:1.64.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'

From e8f5af70c64ee06b0b40c7ec7a478c178a4ccd8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:16:16 +0000
Subject: [PATCH 3649/4969] --- updated-dependencies: - dependency-name:
 org.mariadb.jdbc:mariadb-java-client   dependency-type: direct:production  
 update-type: version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e3f33b0ca8a..89b6a2013af 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.3.2'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.4.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From e340f78ef5c9f49a953aa6b14effdba15db83a98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:19:47 +0000
Subject: [PATCH 3650/4969] --- updated-dependencies: - dependency-name:
 com.amazonaws:aws-java-sdk-dynamodb   dependency-type: direct:production  
 update-type: version-update:semver-patch ...

Signed-off-by: dependabot[bot] <support@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 be947cc349e..bd0ffa0b081 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 0c66a288bdaad380bd2752522376596bff9e8ec8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:36:34 +0000
Subject: [PATCH 3651/4969] --- updated-dependencies: - dependency-name:
 org.apache.pulsar:pulsar-client   dependency-type: direct:production  
 update-type: version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 40edac13685..9224b889d1a 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.2.3'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.2.3'
 }

From 9a7ad29f0099a34000eaf5ed2c0c6dd33214debb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:36:41 +0000
Subject: [PATCH 3652/4969] --- updated-dependencies: - dependency-name:
 org.apache.pulsar:pulsar-client-admin   dependency-type: direct:production  
 update-type: version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 40edac13685..b7cb6a73af6 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.2.3'
 }

From 664e45048c413246a74c15fff695e56a3806dddf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:38:12 +0000
Subject: [PATCH 3653/4969] --- updated-dependencies: - dependency-name:
 io.trino:trino-jdbc   dependency-type: direct:production   update-type:
 version-update:semver-major ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index afa4e079663..06ae2b2cffe 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:436'
+    testRuntimeOnly 'io.trino:trino-jdbc:448'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From c00ebecac9477cdd04da2017fd11078189b1c6dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:47:42 +0000
Subject: [PATCH 3654/4969] --- updated-dependencies: - dependency-name:
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin   dependency-type:
 direct:production   update-type: version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 9326635359e..42798b84468 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }

From 96d9db860ee20bb671f9708969d5187642b7d4e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:49:28 +0000
Subject: [PATCH 3655/4969] --- updated-dependencies: - dependency-name:
 org.seleniumhq.selenium:selenium-bom   dependency-type: direct:production  
 update-type: version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@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 9164a44c9be..88aae0a55ab 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.17.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.21.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From faf20f3a5133e1abcb3660f39c72d815220df385 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:49:37 +0000
Subject: [PATCH 3656/4969] --- updated-dependencies: - dependency-name:
 org.seleniumhq.selenium:selenium-api   dependency-type: direct:production  
 update-type: version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 83bf6d2244f..9b2b942c5e4 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.17.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.21.0"
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 

From ff75dc83fe3f4bed21baf1740d4020138b3d3bec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:49:59 +0000
Subject: [PATCH 3657/4969] --- updated-dependencies: - dependency-name:
 io.nats:jnats   dependency-type: direct:production   update-type:
 version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index e4b73de63c4..e640013abd9 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.17.2'
+    testImplementation 'io.nats:jnats:2.18.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

From 769844f90b484b45d0cc6e3add5da8e471ea2848 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 22:55:59 +0000
Subject: [PATCH 3658/4969] --- updated-dependencies: - dependency-name:
 io.projectreactor:reactor-core   dependency-type: direct:production  
 update-type: version-update:semver-patch ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index d6d5fcc267d..a11339269cf 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.2'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.6'
     testFixturesImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 367c6bf255d41d0c7c79e0fcdb62ff5cda7a56e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 23:34:45 +0000
Subject: [PATCH 3659/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.12.0 to 8.13.4.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/commits)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 56399a509d9..ddbe2ca3ed1 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.12.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.13.4"
     testImplementation "org.elasticsearch.client:transport:7.17.17"
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }

From 770b25558d4fe02f66bb1d5b9b8eda6cdf97a878 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 23:35:08 +0000
Subject: [PATCH 3660/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.30.0 to 26.39.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.30.0...v26.39.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 30f74c94b70..54f79715378 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.30.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.39.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From ee808895634c10fc52b32ac4e0f3f41529c62aea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 23:35:29 +0000
Subject: [PATCH 3661/4969] Bump io.milvus:milvus-sdk-java from 2.3.4 to 2.4.1
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.3.4 to 2.4.1.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/v2.4.1/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.3.4...v2.4.1)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 9da171def57..01f1895cf8e 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'io.milvus:milvus-sdk-java:2.3.4'
+    testImplementation 'io.milvus:milvus-sdk-java:2.4.1'
 }

From 6dddebb9bdeb3e452767734e5a548047fd807411 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 23:35:42 +0000
Subject: [PATCH 3662/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.24.0 to 4.28.1.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.24.0...4.28.1)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 6c03e07254d..67396edb683 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.24.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.28.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.14")

From d1b05da22f9bdc1dbb914dc8ace5651f6555c54c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 23:36:11 +0000
Subject: [PATCH 3663/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.18 to 10.1.24.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 927d275c312..2f1094c2e97 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.18'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.24'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 280e1f2d1deed3072b40f47bd74f618e5cc7f5bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 00:05:30 +0000
Subject: [PATCH 3664/4969] Bump com.rabbitmq:amqp-client from 5.20.0 to 5.21.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.20.0 to 5.21.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.20.0...v5.21.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 13152748815..d161f10387f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:5.1.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.20.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.21.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From f3766963f11b4a05252994836d73c42b02ce34fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 00:05:58 +0000
Subject: [PATCH 3665/4969] Bump com.rabbitmq:amqp-client from 5.20.0 to 5.21.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.20.0 to 5.21.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.20.0...v5.21.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 020b8f5b449..d01d59d2f8d 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.20.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.21.0'
     testImplementation 'org.assertj:assertj-core:3.25.1'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 4ef335eaed15ccc6ac02564d30b4c354190e1d6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 00:06:54 +0000
Subject: [PATCH 3666/4969] Bump org.assertj:assertj-core in
 /modules/database-commons

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 9b125464596..c7033d45a0b 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 7df52762b1b795a0162605f9e63d9a3f1adb566b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 00:07:46 +0000
Subject: [PATCH 3667/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit5) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 98ff9b6520b..7e9f1ee412e 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.1'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.1'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.2'
 
     testCompileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 70f03f283472eefe80cc0ec58450aeb7f6821bce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 00:07:56 +0000
Subject: [PATCH 3668/4969] Bump org.assertj:assertj-core in
 /modules/elasticsearch

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 56399a509d9..ebd3dca1102 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.12.0"
     testImplementation "org.elasticsearch.client:transport:7.17.17"
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 2d638f6a19913e7394f84ab2b3c314685275f3c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 01:58:11 +0000
Subject: [PATCH 3669/4969] Bump commons-io:commons-io from 2.15.1 to 2.16.1 in
 /modules/hivemq

Bumps commons-io:commons-io from 2.15.1 to 2.16.1.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 6c03e07254d..217ecd7196d 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.1.0")
 
     shaded("org.apache.commons:commons-lang3:3.14.0")
-    shaded("commons-io:commons-io:2.15.1")
+    shaded("commons-io:commons-io:2.16.1")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From d041702f83c6281f342392d6eba5555b0497ebb8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:17:06 +0000
Subject: [PATCH 3670/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/influxdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 01f902d92e7..f8b76c4945c 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.24'
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.influxdb:influxdb-java:2.24'
     testImplementation "com.influxdb:influxdb-client-java:6.12.0"
 }

From dbea29c913b420f0d07d718b3d9d6c6391c6fac6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:18:12 +0000
Subject: [PATCH 3671/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/selenium

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index af8d50cbb00..c84a0fd88eb 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From b50499733ed30e63180900fa8193b23f0e140e00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:18:17 +0000
Subject: [PATCH 3672/4969] Bump org.assertj:assertj-core in /modules/cassandra

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 79492c044db..b043f5bec92 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
     testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From b3449cfce4ea92c12ef39cac84e390df9673e097 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:18:23 +0000
Subject: [PATCH 3673/4969] Bump org.assertj:assertj-core in
 /modules/clickhouse

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index d013575def5..6745e1443c0 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 94fd7e02860a89fc49e1d43036f359b346885bf8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:18:28 +0000
Subject: [PATCH 3674/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 1ffa1c92648..fe5adba88e3 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.25.2'

From f407b5d9be3347ad59ec465a548f6ac3147286ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:18:34 +0000
Subject: [PATCH 3675/4969] Bump org.junit.jupiter:junit-jupiter from 5.10.1 to
 5.10.2 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle           | 2 +-
 examples/immudb/build.gradle              | 2 +-
 examples/kafka-cluster/build.gradle       | 2 +-
 examples/nats/build.gradle                | 2 +-
 examples/neo4j-container/build.gradle     | 2 +-
 examples/redis-backed-cache/build.gradle  | 2 +-
 examples/selenium-container/build.gradle  | 2 +-
 examples/sftp/build.gradle                | 2 +-
 examples/singleton-container/build.gradle | 2 +-
 examples/solr-container/build.gradle      | 2 +-
 examples/spring-boot/build.gradle         | 2 +-
 examples/zookeeper/build.gradle           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 74771e0e02b..f33181d8fbb 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'com.hazelcast:hazelcast:5.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.25.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 27d0bcea9e2..848d4724dbe 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 2653c2da0b4..96d536ebd3b 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index e4b73de63c4..24ab3f3f6fb 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'io.nats:jnats:2.17.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index ab4fcec66c1..53a773177ee 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 8ab9cac5ed9..31a24c080ff 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index d7b8c85510e..149d17d5b01 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.25.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index c37b815e6cc..d3b53872365 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 11cb89351e9..cf0cf76ab39 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.25.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 739a418c995..f4f0a5ee27e 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.25.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 08fb733e14d..95b21be5c6c 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 6a5ba605b19..86fb92e5016 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {

From 74c7394ef26e2d4225fceaf54455c4d0a4e75069 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:18:48 +0000
Subject: [PATCH 3676/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 1ffa1c92648..74d79977a8c 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.3.1.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
     testImplementation project(":testcontainers")

From 248aaff3786c339a7c948e3b9c76f0f8b2b49610 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:18:54 +0000
Subject: [PATCH 3677/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 01f1b35632a..c37e67965e8 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
-    api 'org.assertj:assertj-core:3.25.1'
+    api 'org.assertj:assertj-core:3.25.3'
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'

From 493b3cff003820c07cbdbaf72e23a7bffe3c05b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:19:11 +0000
Subject: [PATCH 3678/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/solace

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index c4a231c4aec..e756c44caee 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'com.solacesystems:sol-jcsmp:10.22.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'

From 47c7d00198a78b4bba5d965226d914209572c6e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:19:31 +0000
Subject: [PATCH 3679/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/jdbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 927d275c312..5df4d897112 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.18'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }

From 0f911a51f6c1b64728e3442134bbd28919460bb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:19:37 +0000
Subject: [PATCH 3680/4969] Bump org.assertj:assertj-core in /modules/couchbase

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 032aacecfed..4208f05f75a 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'com.couchbase.client:java-client:3.5.2'
     testImplementation 'org.awaitility:awaitility:4.2.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From d2493d010a9ebc7fd161045803ec6887f7211fcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:19:45 +0000
Subject: [PATCH 3681/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/azure

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 7a3da191f05..578a5230173 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'com.azure:azure-cosmos:4.54.0'
 }

From 2650fe64b64f6fed8a6f2ce469c17ca187f7c35f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:19:50 +0000
Subject: [PATCH 3682/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/db2

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 0d5532dd36c..65f2b953b68 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From d4c5ab15cf7f034cc936a6c5b59b4dfbd6a54063 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:19:56 +0000
Subject: [PATCH 3683/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/gcloud

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 30f74c94b70..c8108f71177 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub'
     testImplementation 'com.google.cloud:google-cloud-spanner'
     testImplementation 'com.google.cloud:google-cloud-bigtable'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 97e1b8109a30fd701157c61ab983bb7308d99f10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:20:05 +0000
Subject: [PATCH 3684/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/vault

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 5f8d85af7ec..eb9f3324605 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 
 }

From fce61e43286bfa461ddba611b2995aa8ca5d67b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:20:10 +0000
Subject: [PATCH 3685/4969] Bump org.assertj:assertj-core from 3.25.2 to 3.25.3
 in /modules/k3s

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 70c8124fa6d..a943a67dff4 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -10,5 +10,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:6.10.0'
     testImplementation 'io.kubernetes:client-java:19.0.0'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 79f9bd039671b2a3dc905e833820e3e0a01bded2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:20:14 +0000
Subject: [PATCH 3686/4969] Bump org.assertj:assertj-core from 3.25.2 to 3.25.3
 in /modules/questdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 1850ed0fe34..f75aefaf55c 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation project(':jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.questdb:questdb:7.3.9'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From c99c4ef30126e6a89335a44ad195a2b749410b5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:20:22 +0000
Subject: [PATCH 3687/4969] Bump org.junit:junit-bom from 5.10.1 to 5.10.2 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 95e0e7b1223..f03d72670a3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.10.1')
+    implementation platform('org.junit:junit-bom:5.10.2')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')

From bd5797d32f965ea88d1f07ff823fdeb31b4d70c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:20:28 +0000
Subject: [PATCH 3688/4969] Bump org.assertj:assertj-core in
 /modules/junit-jupiter

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 95e0e7b1223..4de312bb6b0 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'

From 6cb681a9ae6df03d32956339597b1ec5e5863744 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:20:41 +0000
Subject: [PATCH 3689/4969] Bump org.apache.pulsar:pulsar-client in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client](https://github.com/apache/pulsar) from 3.1.2 to 3.2.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.1.2...v3.2.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 40edac13685..9224b889d1a 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.2.3'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.2.3'
 }

From d1f1771ffd5ad0a955e1544094e2260b0e9a05f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:20:57 +0000
Subject: [PATCH 3690/4969] Bump org.assertj:assertj-core in
 /modules/mockserver

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index b12cae7ad4b..a189c1d54b9 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From da0b321e878d562a123085c3a3d5331db1de8e22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:21:08 +0000
Subject: [PATCH 3691/4969] Bump org.apache.pulsar:pulsar-client-admin in
 /modules/pulsar

Bumps [org.apache.pulsar:pulsar-client-admin](https://github.com/apache/pulsar) from 3.1.2 to 3.2.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.1.2...v3.2.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-client-admin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 40edac13685..b7cb6a73af6 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.2.3'
 }

From c526ea8ec3855bf6d5fa92b221d9c853614292f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:21:11 +0000
Subject: [PATCH 3692/4969] Bump org.assertj:assertj-core in /modules/toxiproxy

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 36290b875a6..a484d1018b5 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,5 +5,5 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:3.0.1'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From aa267ef67e4853f0878b0bdf38f30669b514031d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 19:32:06 +0000
Subject: [PATCH 3693/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.14 to 1.5.6.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.14...v_1.5.6)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 7a36783d109..225b26b3632 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.28.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.4.14")
+    testImplementation("ch.qos.logback:logback-classic:1.5.6")
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 

From 0a7957580322880f19078c7ba4edb7c4bef13197 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 19:32:11 +0000
Subject: [PATCH 3694/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.12.1 to 2.0.1.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 42798b84468..0c34aa7dc15 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.4"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }
 }

From 2c5a77cff060d59a91f45b577f4b10c9f68026bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 19:32:13 +0000
Subject: [PATCH 3695/4969] Bump io.qdrant:client from 1.7.1 to 1.9.1 in
 /modules/qdrant

Bumps [io.qdrant:client](https://github.com/qdrant/java-client) from 1.7.1 to 1.9.1.
- [Release notes](https://github.com/qdrant/java-client/releases)
- [Commits](https://github.com/qdrant/java-client/compare/v1.7.1...v1.9.1)

---
updated-dependencies:
- dependency-name: io.qdrant:client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 2b58eeb6ddb..635f2baec02 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'io.qdrant:client:1.7.1'
+    testImplementation 'io.qdrant:client:1.9.1'
     testImplementation platform('io.grpc:grpc-bom:1.64.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'

From d45d4e7692a6e9d9036450953b6d35bac9547577 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 19:32:22 +0000
Subject: [PATCH 3696/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.17 to 7.17.21.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.17...v7.17.21)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index e850902094a..0a9b990ab2e 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.13.4"
-    testImplementation "org.elasticsearch.client:transport:7.17.17"
+    testImplementation "org.elasticsearch.client:transport:7.17.21"
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From f1e64e601bcc2c29b9c7970dcaab577825b181ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 19:32:36 +0000
Subject: [PATCH 3697/4969] --- updated-dependencies: - dependency-name:
 com.azure:azure-cosmos   dependency-type: direct:production   update-type:
 version-update:semver-minor ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 578a5230173..e2609ca2461 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation 'com.azure:azure-cosmos:4.54.0'
+    testImplementation 'com.azure:azure-cosmos:4.60.0'
 }

From 021a5d38497d2dc2d379dd434b96005992aa22cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 19:32:38 +0000
Subject: [PATCH 3698/4969] Bump com.google.guava:guava from 33.0.0-jre to
 33.2.0-jre in /core

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.0.0-jre to 33.2.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 39a8a46d8e4..e12bea353e5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -99,7 +99,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded 'com.google.guava:guava:33.0.0-jre'
+    shaded 'com.google.guava:guava:33.2.0-jre'
     shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

From 50c9ef19d1daeb26eb4e536b602653342ba421f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:43:53 +0000
Subject: [PATCH 3699/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.31.2 to 2.33.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 9906ecaa011..c8790e1e787 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.31.2"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.33.0"
 }
 
 test {

From 51e2d784d9907dbdeec236c866161f6cea0f5175 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:44:01 +0000
Subject: [PATCH 3700/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.22.0 to 10.23.0.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 249c92601ca..7ef43a44b83 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.1'
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.22.0'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.23.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 49371533854a86dac6c9859ff21e554268299471 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:44:09 +0000
Subject: [PATCH 3701/4969] Bump io.kubernetes:client-java in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 19.0.0 to 20.0.1-legacy.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v19.0.0...v20.0.1-legacy)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 2890e2b2426..3d46e330847 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.12.1'
-    testImplementation 'io.kubernetes:client-java:19.0.0'
+    testImplementation 'io.kubernetes:client-java:20.0.1-legacy'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 463e55087abc9747ea5c2dae173ea4f56c8f0b07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:44:57 +0000
Subject: [PATCH 3702/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.2.1
 in /modules/couchbase

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.2.1)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 264408ef7e6..89dccfa7202 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'com.couchbase.client:java-client:3.6.2'
-    testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.awaitility:awaitility:4.2.1'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 1103fcd54de9ba40766afbc019c2ceeef50cd372 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:45:05 +0000
Subject: [PATCH 3703/4969] --- updated-dependencies: - dependency-name:
 redis.clients:jedis   dependency-type: direct:production   update-type:
 version-update:semver-patch ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index e12bea353e5..fdbd7297514 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:5.1.0'
+    testImplementation 'redis.clients:jedis:5.1.3'
     testImplementation 'com.rabbitmq:amqp-client:5.21.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From ecc9eabc176ba2320883d836f54bcff663843a6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:45:35 +0000
Subject: [PATCH 3704/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/openfga

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index b05ab4cc1ba..1e1fe7c93f0 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'dev.openfga:openfga-sdk:0.4.2'
 }
 

From 6b82efe6da2d6fd5a75b2abb107ea7e2604138a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:45:54 +0000
Subject: [PATCH 3705/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/milvus

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 01f1895cf8e..c24931be45f 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.milvus:milvus-sdk-java:2.4.1'
 }

From 43470ec4b0b4528da7ba35c273859ed9ff0a4c63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:46:02 +0000
Subject: [PATCH 3706/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/weaviate

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index e9287ed6bde..0a607187c79 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.weaviate:client:4.7.0'
 }

From 881a2ebb14041cfea9c874663b9e89c3e9f41cb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:46:09 +0000
Subject: [PATCH 3707/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/activemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 9906ecaa011..ed080f67ba3 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.31.2"
 }

From ba0ff6627ea36e402105ce476a5b29213d718fe7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:46:15 +0000
Subject: [PATCH 3708/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/minio

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 51904985010..83af1c868d0 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("io.minio:minio:8.5.10")
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From e9df83180313ba2b884d6fb6c2edcb0e630f64ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:46:21 +0000
Subject: [PATCH 3709/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/qdrant

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 635f2baec02..e98607f9e22 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.qdrant:client:1.9.1'
     testImplementation platform('io.grpc:grpc-bom:1.64.0')
     testImplementation 'io.grpc:grpc-stub'

From d82b4fca46fb1acc2eb3692e2856eb688c5d73b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:46:38 +0000
Subject: [PATCH 3710/4969] Bump org.assertj:assertj-core in
 /modules/localstack

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 96f9edc2cec..e434d84422a 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
     testImplementation 'software.amazon.awssdk:s3:2.25.56'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 9a4e0b8d74d6ebba3cb2c4d4ba75d1db3b2b8c11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:46:40 +0000
Subject: [PATCH 3711/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/solr

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index f4b3c4ac6b3..cb8ed2726a8 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.3'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 35e6329f7fb482136ce9e16347d6b0c8082a752f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:47:31 +0000
Subject: [PATCH 3712/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index aad0f0683a6..626c0926c98 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.3.1.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From 7a30bb39c1298693035f9cd73c00f883ea2c4e9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:47:48 +0000
Subject: [PATCH 3713/4969] Bump org.assertj:assertj-core from 3.25.2 to 3.25.3
 in /modules/dynalite

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index bd0ffa0b081..a0c132bc6f8 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From b565f919471008572a512e2970845ddea51be636 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:47:49 +0000
Subject: [PATCH 3714/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/redpanda

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 9e2bc69d139..895a4da4882 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     shaded 'org.freemarker:freemarker:2.3.32'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From 449f382724d72dda82a5c7aab9f381011c35785f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:47:51 +0000
Subject: [PATCH 3715/4969] Bump org.assertj:assertj-core from 3.25.2 to 3.25.3
 in /examples

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle       | 2 +-
 docs/examples/junit4/redis/build.gradle         | 2 +-
 docs/examples/junit5/redis/build.gradle         | 2 +-
 examples/cucumber/build.gradle                  | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/neo4j-container/build.gradle           | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/selenium-container/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/solr-container/build.gradle            | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 test-support/build.gradle                       | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 9b2b942c5e4..fa752256d29 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.21.0"
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 
 test {
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 58862221c28..73353512e03 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index aad0f0683a6..d24d134b752 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 
 test {
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 88aae0a55ab..9080bb647ae 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index f33181d8fbb..bdafe6e8857 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 848d4724dbe..41245b42428 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 96d536ebd3b..3444fce3251 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 7a3aa7156d9..1febab7cdc2 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index e6bb7ae5ffe..374c00c9b8b 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.18.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 53a773177ee..16544de2d02 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 1a3f717d506..383ba2b8d48 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testng:testng:7.5.1'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 31a24c080ff..79ebab4d131 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 
 test {
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 149d17d5b01..07ba6abd8d0 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index d3b53872365..16de7430814 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index cf0cf76ab39..37f68bb5f0f 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 0cf24e78a0c..61356829e52 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 86fb92e5016..fd0ec2a060b 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.6.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 857f0fdf681..d293570b0ad 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.36'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 23f41ebac2ba17a80dd915b1761af4b57f8d3ee7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:47:56 +0000
Subject: [PATCH 3716/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/orientdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index ef8724e9f7f..881186d91ef 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.29"
 
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.26"
 }

From 8e5a989ea7b8269125ec8df6f83eefccde134093 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:02 +0000
Subject: [PATCH 3717/4969] Bump org.assertj:assertj-core from 3.25.2 to 3.25.3
 in /modules/r2dbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index a11339269cf..8ce9c975b79 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,10 +11,10 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.6.6'
-    testFixturesImplementation 'org.assertj:assertj-core:3.25.2'
+    testFixturesImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 26cf30e669289a4a327e6afd9ecaa8463666f8bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:04 +0000
Subject: [PATCH 3718/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/spock

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 04d229b8cf1..af1b5aa1d15 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.1'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.2'
 
     testCompileOnly 'org.jetbrains:annotations:24.1.0'

From 1024536200d2684b55d2ea740a95d11800e113d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:06 +0000
Subject: [PATCH 3719/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/rabbitmq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index d01d59d2f8d..69d7ef6979f 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.21.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From c9fd75c4967b7e91d257f8a542e68312285f242c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:22 +0000
Subject: [PATCH 3720/4969] Bump org.assertj:assertj-core in
 /modules/cockroachdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index e7a4d963c51..376d742b76c 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From c4e850465b2a9df29c5bc5d3806049a0d9f8bf04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:22 +0000
Subject: [PATCH 3721/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/mongodb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 800c10a877f..ffcb89cebb5 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.0")
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 55e9d9da9f1569aa42e307fda34d656abb354d96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:23 +0000
Subject: [PATCH 3722/4969] Bump org.assertj:assertj-core from 3.25.2 to 3.25.3
 in /modules/neo4j

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 0ae31547fb5..ec1503e852e 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.16'
-    testImplementation 'org.assertj:assertj-core:3.25.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 1c13e959b0c7e4191e439071d121831b17b0b5e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:40 +0000
Subject: [PATCH 3723/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/pulsar

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 9224b889d1a..efcd24690ce 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.2.3'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.3'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.2.3'
 }

From 50fada03b3625369464b3f7ba80e8741cf3715f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 08:48:43 +0000
Subject: [PATCH 3724/4969] Bump org.assertj:assertj-core from 3.25.1 to 3.25.3
 in /modules/kafka

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 581c1c8d397..6dd12daa49e 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
-    testImplementation 'org.assertj:assertj-core:3.25.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'com.google.guava:guava:23.0'
 }

From fbbe94fc980e36533d5ab318b2a034321fac172d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 22 May 2024 22:26:44 -0500
Subject: [PATCH 3725/4969] Update gradle plugins in examples and smoke-test

---
 examples/settings.gradle   | 4 ++--
 smoke-test/settings.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 041e9ac89c9..7c1fac9d188 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -6,8 +6,8 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.12.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.4"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.1"
     }
 }
 
diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle
index b82f031e8ca..f1029d0b0f2 100644
--- a/smoke-test/settings.gradle
+++ b/smoke-test/settings.gradle
@@ -6,8 +6,8 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.4"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.1"
     }
 }
 

From 3586cdf1c1235bf1fc4bf8bcd91f1f39844dabba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 22 May 2024 23:38:21 -0500
Subject: [PATCH 3726/4969] Update kotlin plugins version to 1.8.22

---
 examples/spring-boot-kotlin-redis/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/spring-boot-kotlin-redis/build.gradle.kts b/examples/spring-boot-kotlin-redis/build.gradle.kts
index a132efe1bba..7a4aa917f35 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle.kts
+++ b/examples/spring-boot-kotlin-redis/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("org.springframework.boot") version "2.7.10"
-    kotlin("jvm") version "1.8.10"
-    kotlin("plugin.spring") version "1.8.20"
+    kotlin("jvm") version "1.8.22"
+    kotlin("plugin.spring") version "1.8.22"
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_1_8

From 635d5d48fc403fdacfa5260aa58727e8b2c94180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 23 May 2024 08:46:31 -0600
Subject: [PATCH 3727/4969] Restore azure module in CI (#8668)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e07cd76218..fccc9caab04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
-          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":azure:check" or . == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:

From 6658a2c0a880d01c6d402ea9a4cb5f72eb15083c Mon Sep 17 00:00:00 2001
From: Michel Davit <michel@davit.fr>
Date: Thu, 23 May 2024 17:46:25 +0200
Subject: [PATCH 3728/4969] Clean duplicate in regex for log message wait
 strategy (#7304)

---
 .../containers/CosmosDBEmulatorContainer.java               | 2 +-
 .../elasticsearch/ElasticsearchContainer.java               | 4 ++--
 .../containers/BigtableEmulatorContainer.java               | 4 ++--
 .../containers/FirestoreEmulatorContainer.java              | 4 ++--
 .../testcontainers/containers/PubSubEmulatorContainer.java  | 4 ++--
 .../testcontainers/containers/SpannerEmulatorContainer.java | 4 ++--
 .../java/org/testcontainers/hivemq/HiveMQContainer.java     | 6 +++---
 .../src/main/java/org/testcontainers/k3s/K3sContainer.java  | 4 ++--
 .../org/testcontainers/containers/OrientDBContainer.java    | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
index f5238a45d33..a1cfdeaf124 100644
--- a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
@@ -27,7 +27,7 @@ public CosmosDBEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withExposedPorts(PORT);
-        waitingFor(Wait.forLogMessage("(?s).*Started\\r\\n$", 1));
+        waitingFor(Wait.forLogMessage(".*Started\\r\\n$", 1));
     }
 
     /**
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index e96ae26c02f..99f8cd75b4f 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -6,7 +6,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
@@ -135,7 +135,7 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         //   matches 7.x JSON logging with whitespace between message field and content
         //   matches 6.x text logging with node name in brackets and just a 'started' message till the end of the line
         String regex = ".*(\"message\":\\s?\"started[\\s?|\"].*|] started\n$)";
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(regex));
+        setWaitStrategy(Wait.forLogMessage(regex, 1));
         if (isAtLeastMajorVersion8) {
             withPassword(ELASTICSEARCH_DEFAULT_PASSWORD);
             withCertPath(DEFAULT_CERT_PATH);
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index 0325b58e745..e9bff52b781 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -33,7 +33,7 @@ public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(PORT);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
+        setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index 1d3ec4a01d1..04a7f039be7 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -33,7 +33,7 @@ public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(PORT);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
+        setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index cd75c3a07c5..c9b53596ab7 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -33,7 +33,7 @@ public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(8085);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*started.*$"));
+        setWaitStrategy(Wait.forLogMessage(".*started.*$", 1));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index ff36bddd1b2..eff48a8777c 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -27,7 +27,7 @@ public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(GRPC_PORT, HTTP_PORT);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Cloud Spanner emulator running\\..*"));
+        setWaitStrategy(Wait.forLogMessage(".*Cloud Spanner emulator running\\..*", 1));
     }
 
     /**
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 29e78920917..241d5b18c9e 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -8,7 +8,7 @@
 import org.slf4j.event.Level;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -82,7 +82,7 @@ public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
 
         addExposedPort(MQTT_PORT);
 
-        waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx("(.*)Started HiveMQ in(.*)"));
+        waitStrategy.withStrategy(Wait.forLogMessage("(.*)Started HiveMQ in(.*)", 1));
         waitingFor(waitStrategy);
 
         withLogConsumer(outputFrame -> {
@@ -160,7 +160,7 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
      */
     public @NotNull HiveMQContainer waitForExtension(final @NotNull String extensionName) {
         final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) started successfully(.*)";
-        waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx(regEX));
+        waitStrategy.withStrategy(Wait.forLogMessage(regEX, 1));
         return self();
     }
 
diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index b014c5b4ed6..6dd6f06d85e 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -10,7 +10,7 @@
 import org.apache.commons.io.IOUtils;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.nio.charset.StandardCharsets;
@@ -47,7 +47,7 @@ public K3sContainer(DockerImageName dockerImageName) {
         setTmpFsMapping(tmpFsMapping);
 
         setCommand("server", "--disable=traefik", "--tls-san=" + this.getHost());
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
+        setWaitStrategy(Wait.forLogMessage(".*Node controller sync successful.*", 1));
     }
 
     @Override
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index 12a6e58e4a5..aeaf053ff0a 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -9,7 +9,7 @@
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
@@ -79,7 +79,7 @@ public OrientDBContainer(final DockerImageName dockerImageName) {
         serverPassword = DEFAULT_SERVER_PASSWORD;
         databaseName = DEFAULT_DATABASE_NAME;
 
-        waitStrategy = new LogMessageWaitStrategy().withRegEx(".*OrientDB Studio available.*");
+        waitStrategy = Wait.forLogMessage(".*OrientDB Studio available.*", 1);
 
         addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
     }

From c944effedc628b14348a89802486c2379b43a243 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 22:47:36 +0000
Subject: [PATCH 3729/4969] Bump redis.clients:jedis from 5.1.0 to 5.1.3 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.0 to 5.1.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.0...v5.1.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 383ba2b8d48..db211e021b3 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.1.0'
+    implementation 'redis.clients:jedis:5.1.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 79ebab4d131..edad61a7849 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.1.0'
+    implementation 'redis.clients:jedis:5.1.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 37f68bb5f0f..65655f004d1 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.1.0'
+    implementation 'redis.clients:jedis:5.1.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 172f65085f4859f57f11427da9f115b19c883263 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 22:47:39 +0000
Subject: [PATCH 3730/4969] Bump org.postgresql:postgresql from 42.7.1 to
 42.7.3 in /examples

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.1...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1febab7cdc2..6f4740da76c 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'org.json:json:20231013'
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.25.3'

From dd229a72ccc3e6b435cf84bcfa822f328b51305f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 22:47:56 +0000
Subject: [PATCH 3731/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.3.1.RELEASE to 6.3.2.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/redis/lettuce/blob/6.3.2.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.3.1.RELEASE...6.3.2.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 73353512e03..2d2b5b084cc 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index d6f3e3089bf..6b1f70a366e 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 77991d80a99..292d3786851 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From 079caa62a91a4ca1099428d3b7f5b507c248e5ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 22:21:47 +0000
Subject: [PATCH 3732/4969] Bump org.freemarker:freemarker in /modules/redpanda

Bumps org.freemarker:freemarker from 2.3.32 to 2.3.33.

---
updated-dependencies:
- dependency-name: org.freemarker:freemarker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 895a4da4882..3af8b5d9e7a 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Redpanda"
 
 dependencies {
     api project(':testcontainers')
-    shaded 'org.freemarker:freemarker:2.3.32'
+    shaded 'org.freemarker:freemarker:2.3.33'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
     testImplementation 'org.assertj:assertj-core:3.25.3'

From 7e5266dedebceb72e34e4cb9878234e93f45dc16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 24 Jun 2024 22:19:15 -0600
Subject: [PATCH 3733/4969] Fix build (#8801)

* Update Testcontainers non-compatible images
* Disable Jib tests
* Disable Dynalite tests
* Update Nginx non-compatible images
* Fix chromadb test by updating chromadb version to 0.4.23
* Remove non-compatible selenium image
* Fix example tests
---
 .../test/java/org/testcontainers/containers/JibTest.java   | 2 ++
 .../org/testcontainers/dockerclient/ImagePullTest.java     | 6 +++---
 .../generic/src/test/java/generic/DependsOnTest.java       | 4 +++-
 .../generic/src/test/java/generic/WaitStrategiesTest.java  | 6 ++++--
 .../org/testcontainers/chromadb/ChromaDBContainerTest.java | 2 +-
 .../org/testcontainers/dynamodb/DynaliteContainerTest.java | 2 ++
 .../java/org/testcontainers/junit/SimpleNginxTest.java     | 2 +-
 .../test/java/org/testcontainers/SeleniumTestImages.java   | 7 -------
 .../java/org/testcontainers/junit/SeleniumStartTest.java   | 2 +-
 9 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java

diff --git a/core/src/test/java/org/testcontainers/containers/JibTest.java b/core/src/test/java/org/testcontainers/containers/JibTest.java
index 1441ff00120..d784b08f2a8 100644
--- a/core/src/test/java/org/testcontainers/containers/JibTest.java
+++ b/core/src/test/java/org/testcontainers/containers/JibTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectImageResponse;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
@@ -12,6 +13,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Ignore("Jib doesn't work with latest Docker version provided by GH Actions. Jib should be updated")
 public class JibTest {
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index db3f81d9b54..42cff09c335 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -19,9 +19,9 @@ public static String[] parameters() {
             "alpine:3.17",
             "alpine", // omitting the tag should work and default to latest
             "alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
-            "quay.io/testcontainers/ryuk:latest",
-            "quay.io/testcontainers/ryuk:0.2.3",
-            "quay.io/testcontainers/ryuk@sha256:bb5a635cac4bd96c93cc476969ce11dc56436238ec7cd028d0524462f4739dd9",
+            "docker.io/testcontainers/ryuk:latest",
+            "docker.io/testcontainers/ryuk:0.7.0",
+            "docker.io/testcontainers/ryuk@sha256:bcbee39cd601396958ba1bd06ea14ad64ce0ea709de29a427d741d1f5262080a",
             //            "ibmcom/db2express-c", // Big image for testing with slow networks
         };
     }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
index d8e152fc847..c48d55899f0 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
@@ -13,7 +13,9 @@ public class DependsOnTest {
     public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine").withExposedPorts(6379);
 
     @Rule
-    public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.9.4").dependsOn(redis).withExposedPorts(80);
+    public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.27.0-alpine3.19-slim")
+        .dependsOn(redis)
+        .withExposedPorts(80);
 
     // }
 
diff --git a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
index 7d1876be591..c66fc9443d0 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
@@ -14,14 +14,16 @@ public class WaitStrategiesTest {
 
     @Rule
     // waitForNetworkListening {
-    public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.9.4")) //
+    public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.27.0-alpine3.19-slim")) //
         .withExposedPorts(80);
 
     // }
 
     @Rule
     // waitForSimpleHttp {
-    public GenericContainer nginxWithHttpWait = new GenericContainer(DockerImageName.parse("nginx:1.9.4"))
+    public GenericContainer nginxWithHttpWait = new GenericContainer(
+        DockerImageName.parse("nginx:1.27.0-alpine3.19-slim")
+    )
         .withExposedPorts(80)
         .waitingFor(Wait.forHttp("/"));
 
diff --git a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
index 945af0dcbff..6cc01ac4d59 100644
--- a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
+++ b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
@@ -10,7 +10,7 @@ public class ChromaDBContainerTest {
     @Test
     public void test() {
         try ( // container {
-            ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.22")
+            ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.23")
             // }
         ) {
             chroma.start();
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
index 10e02566d16..2a4e94e9516 100644
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
@@ -9,12 +9,14 @@
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
 import com.amazonaws.services.dynamodbv2.model.TableDescription;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Ignore("Image is not compatible with the latest Docker version provided by GH Actions")
 public class DynaliteContainerTest {
 
     private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse(
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index 6b1bcf55d5b..d520419b902 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -22,7 +22,7 @@
 
 public class SimpleNginxTest {
 
-    private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.9.4");
+    private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.27.0-alpine3.19-slim");
 
     private static String tmpDirectory = System.getProperty("user.home") + "/.tmp-test-container";
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java b/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java
deleted file mode 100644
index 82d19adf3b5..00000000000
--- a/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.testcontainers;
-
-import org.testcontainers.utility.DockerImageName;
-
-public interface SeleniumTestImages {
-    DockerImageName NGINX_TEST_IMAGE = DockerImageName.parse("nginx:1.9.4");
-}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
index 04a31662099..b399cabf9ed 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
@@ -15,7 +15,7 @@ public class SeleniumStartTest {
 
     @Parameterized.Parameters(name = "tag: {0}")
     public static String[] data() {
-        return new String[] { "4.0.0", "3.4.0", "2.53.0", "2.45.0" };
+        return new String[] { "4.0.0", "3.4.0", "2.53.0" };
     }
 
     @Parameterized.Parameter

From 39bcfab05f41125a3ee992d0f37a047d1f485a0c Mon Sep 17 00:00:00 2001
From: Marcin Antas <antas.marcin@gmail.com>
Date: Tue, 25 Jun 2024 07:51:02 +0200
Subject: [PATCH 3734/4969] [weaviate] Add wait strategy (#8800)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update image version to v1.25

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../org/testcontainers/weaviate/WeaviateContainer.java    | 2 ++
 .../testcontainers/weaviate/WeaviateContainerTest.java    | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
index 6225c79dd4a..86aff57ae5d 100644
--- a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
+++ b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.weaviate;
 
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -32,6 +33,7 @@ public WeaviateContainer(DockerImageName dockerImageName) {
         withExposedPorts(8080, 50051);
         withEnv("AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED", "true");
         withEnv("PERSISTENCE_DATA_PATH", "/var/lib/weaviate");
+        waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(8080).forStatusCode(200));
     }
 
     public String getHttpHostAddress() {
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index c74c6454d0d..53096182839 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -19,7 +19,7 @@ public class WeaviateContainerTest {
     @Test
     public void testWeaviate() {
         try ( // container {
-            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.24.5")
+            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.25.5")
             // }
         ) {
             weaviate.start();
@@ -27,7 +27,7 @@ public void testWeaviate() {
             config.setGRPCHost(weaviate.getGrpcHostAddress());
             WeaviateClient client = new WeaviateClient(config);
             Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.24.5");
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.25.5");
         }
     }
 
@@ -43,13 +43,13 @@ public void testWeaviateWithModules() {
         Map<String, String> env = new HashMap<>();
         env.put("ENABLE_MODULES", String.join(",", enableModules));
         env.put("BACKUP_FILESYSTEM_PATH", "/tmp/backups");
-        try (WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.24.5").withEnv(env)) {
+        try (WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.25.5").withEnv(env)) {
             weaviate.start();
             Config config = new Config("http", weaviate.getHttpHostAddress());
             config.setGRPCHost(weaviate.getGrpcHostAddress());
             WeaviateClient client = new WeaviateClient(config);
             Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.24.5");
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.25.5");
             Object modules = meta.getResult().getModules();
             assertThat(modules)
                 .isNotNull()

From 026449913931e2954478ac38a741a113658386e9 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 25 Jun 2024 22:25:27 +0200
Subject: [PATCH 3735/4969] Add CI for latest Moby (#8756)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .github/workflows/moby-latest.yml | 72 +++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .github/workflows/moby-latest.yml

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
new file mode 100644
index 00000000000..6cd65d80d07
--- /dev/null
+++ b/.github/workflows/moby-latest.yml
@@ -0,0 +1,72 @@
+name: Tests against recent Docker engine releases
+
+on:
+  schedule:
+    # nightly build, at 23:59 CEST
+    - cron:  '59 23 * * *'
+
+jobs:
+  test_stable_docker:
+    name: "Core tests using stable Docker-CE"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-build
+
+      - name: Install Stable Docker
+        run: curl https://get.docker.com
+
+      - name: Check Docker version
+        run: docker version
+
+      - name: Build with Gradle
+        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_STABLE testcontainers:test
+      - uses: ./.github/actions/setup-junit-report
+
+      - name: Notify to Slack on failures
+        if: failure()
+        id: slack
+        uses: slackapi/slack-github-action@v1.26.0
+        with:
+          payload: |
+            {
+              "tc_project": "testcontainers-java",
+              "tc_github_action_url": "https://github.com/testcontainers/testcontainers-java/actions/runs/${{ env.GITHUB_RUN_ID }}/job/${{ env.GITHUB_RUN_NUMBER }}",
+              "tc_github_action_status": "FAILED",
+              "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOCKER_LATEST_WEBHOOK }}
+
+  test_latest_docker:
+    name: "Core tests using latest Docker-CE"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-build
+
+      - name: Install Latest Docker
+        run: curl https://get.docker.com | CHANNEL=test sh
+
+      - name: Check Docker version
+        run: docker version
+
+      - name: Build with Gradle
+        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_LATEST testcontainers:test
+
+      - uses: ./.github/actions/setup-junit-report
+
+      - name: Notify to Slack on failures
+        if: failure()
+        id: slack
+        uses: slackapi/slack-github-action@v1.26.0
+        with:
+          payload: |
+            {
+              "tc_project": "testcontainers-java",
+              "tc_github_action_url": "https://github.com/testcontainers/testcontainers-java/actions/runs/${{ env.GITHUB_RUN_ID }}/job/${{ env.GITHUB_RUN_NUMBER }}",
+              "tc_github_action_status": "FAILED",
+              "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOCKER_LATEST_WEBHOOK }}

From 1305fee8871fec076f33792c150fa8889e4d053d Mon Sep 17 00:00:00 2001
From: Alexander Rashed <2796604+alexrashed@users.noreply.github.com>
Date: Wed, 26 Jun 2024 00:18:58 +0200
Subject: [PATCH 3736/4969] Fix LocalStack legacy mode detection for "latest"
 tag variations (#8774)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../localstack/LocalStackContainer.java       |  6 ++--
 .../containers/localstack/LegacyModeTest.java | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index f0525af8176..1aedc601ce9 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -147,8 +147,10 @@ private static boolean isServicesEnvVarRequired(String version) {
         return true;
     }
 
-    private static boolean shouldRunInLegacyMode(String version) {
-        if (version.equals("latest")) {
+    static boolean shouldRunInLegacyMode(String version) {
+        // assume that the latest images are up-to-date
+        // also consider images with extra packages (like latest-bigdata) and service-specific images (like s3-latest)
+        if (version.equals("latest") || version.startsWith("latest-") || version.endsWith("-latest")) {
             return false;
         }
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index a535699438f..bc513a20f26 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -139,4 +139,39 @@ public void differentPortsAreExposed() {
             }
         }
     }
+
+    @RunWith(Parameterized.class)
+    @AllArgsConstructor
+    public static class LegacyModeUnitTest {
+
+        private final String version;
+
+        private final boolean shouldUseLegacyMode;
+
+        @Parameterized.Parameters(name = "{0} - {1}")
+        public static Iterable<Object[]> constructors() {
+            return Arrays.asList(
+                new Object[][] {
+                    { "latest", false },
+                    { "s3-latest", false },
+                    { "latest-bigdata", false },
+                    { "3.4.0-bigdata", false },
+                    { "3.4.0@sha256:54fcf172f6ff70909e1e26652c3bb4587282890aff0d02c20aa7695469476ac0", false },
+                    { "1.4@sha256:7badf31c550f81151c485980e17542592942d7f05acc09723c5f276d41b5927d", false },
+                    { "3.4.0", false },
+                    { "0.12", false },
+                    { "0.11", false },
+                    { "sha256:8bf0d744fea26603f2b11ef7206edb38375ef954258afaeda96532a6c9c1ab8b", false },
+                    { "0.10.7@sha256:45ef287e29af7285c6e4013fafea1e3567c167cd22d12282f0a5f9c7894b1c5f", true },
+                    { "0.10.7", true },
+                    { "0.9.6", true },
+                }
+            );
+        }
+
+        @Test
+        public void samePortIsExposedForAllServices() {
+            assertThat(LocalStackContainer.shouldRunInLegacyMode(version)).isEqualTo(shouldUseLegacyMode);
+        }
+    }
 }

From ca4981eb09ae31fc295d4802194a407f1f4879d1 Mon Sep 17 00:00:00 2001
From: cdouillard <charles.douillard@outlook.fr>
Date: Thu, 27 Jun 2024 22:44:06 +0200
Subject: [PATCH 3737/4969] [oracle-free] Support oracle.jdbc.OracleDriver
 (#8796)

---
 .../java/org/testcontainers/oracle/OracleContainer.java    | 7 ++++++-
 .../org/testcontainers/containers/OracleContainer.java     | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
index 90d772f0328..2080c24283b 100644
--- a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java
@@ -89,7 +89,12 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     @Override
     public String getDriverClassName() {
-        return "oracle.jdbc.driver.OracleDriver";
+        try {
+            Class.forName("oracle.jdbc.OracleDriver");
+            return "oracle.jdbc.OracleDriver";
+        } catch (ClassNotFoundException e) {
+            return "oracle.jdbc.driver.OracleDriver";
+        }
     }
 
     @Override
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 24dbdb37701..75b16779f40 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -110,7 +110,12 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     @Override
     public String getDriverClassName() {
-        return "oracle.jdbc.driver.OracleDriver";
+        try {
+            Class.forName("oracle.jdbc.OracleDriver");
+            return "oracle.jdbc.OracleDriver";
+        } catch (ClassNotFoundException e) {
+            return "oracle.jdbc.driver.OracleDriver";
+        }
     }
 
     @Override

From 62a383bf2daefbfa8929271fc953eec1b58e3794 Mon Sep 17 00:00:00 2001
From: Ignasi <ignasi.lopez.luna@gmail.com>
Date: Sun, 30 Jun 2024 05:07:29 +0200
Subject: [PATCH 3738/4969] Add example to run Hugging Face models using Ollama
 (#8771)

---
 examples/ollama-hugging-face/build.gradle     | 19 +++++
 .../ollamahf/OllamaHuggingFaceContainer.java  | 70 ++++++++++++++++++
 .../ollamahf/OllamaHuggingFaceTest.java       | 74 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 ++++
 examples/settings.gradle                      |  1 +
 5 files changed, 180 insertions(+)
 create mode 100644 examples/ollama-hugging-face/build.gradle
 create mode 100644 examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java
 create mode 100644 examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceTest.java
 create mode 100644 examples/ollama-hugging-face/src/test/resources/logback-test.xml

diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
new file mode 100644
index 00000000000..e90846dfbc1
--- /dev/null
+++ b/examples/ollama-hugging-face/build.gradle
@@ -0,0 +1,19 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'org.testcontainers:ollama'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+}
+
+test {
+    useJUnitPlatform()
+}
diff --git a/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java b/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java
new file mode 100644
index 00000000000..55fd110fa13
--- /dev/null
+++ b/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java
@@ -0,0 +1,70 @@
+package com.example.ollamahf;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.ollama.OllamaContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+
+public class OllamaHuggingFaceContainer extends OllamaContainer {
+
+    private final HuggingFaceModel huggingFaceModel;
+
+    public OllamaHuggingFaceContainer(HuggingFaceModel model) {
+        super(DockerImageName.parse("ollama/ollama:0.1.47"));
+        this.huggingFaceModel = model;
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+        super.containerIsStarted(containerInfo, reused);
+        if (reused || huggingFaceModel == null) {
+            return;
+        }
+
+        try {
+            executeCommand("apt-get", "update");
+            executeCommand("apt-get", "upgrade", "-y");
+            executeCommand("apt-get", "install", "-y", "python3-pip");
+            executeCommand("pip", "install", "huggingface-hub");
+            executeCommand(
+                "huggingface-cli",
+                "download",
+                huggingFaceModel.repository,
+                huggingFaceModel.model,
+                "--local-dir",
+                "."
+            );
+            executeCommand("sh", "-c", String.format("echo '%s' > Modelfile", huggingFaceModel.modelfileContent));
+            executeCommand("ollama", "create", huggingFaceModel.model, "-f", "Modelfile");
+            executeCommand("rm", huggingFaceModel.model);
+        } catch (IOException | InterruptedException e) {
+            throw new ContainerLaunchException(e.getMessage());
+        }
+    }
+
+    private void executeCommand(String... command) throws ContainerLaunchException, IOException, InterruptedException {
+        ExecResult execResult = execInContainer(command);
+        if (execResult.getExitCode() > 0) {
+            throw new ContainerLaunchException(
+                "Failed to execute " + String.join(" ", command) + ": " + execResult.getStderr()
+            );
+        }
+    }
+
+    public static class HuggingFaceModel {
+
+        public final String repository;
+
+        public final String model;
+
+        public String modelfileContent;
+
+        public HuggingFaceModel(String repository, String model) {
+            this.repository = repository;
+            this.model = model;
+            this.modelfileContent = "FROM " + model;
+        }
+    }
+}
diff --git a/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceTest.java b/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceTest.java
new file mode 100644
index 00000000000..fa9d5f7d7e4
--- /dev/null
+++ b/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceTest.java
@@ -0,0 +1,74 @@
+package com.example.ollamahf;
+
+import io.restassured.http.Header;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.ollama.OllamaContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.List;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class OllamaHuggingFaceTest {
+
+    @Test
+    public void embeddingModelWithHuggingFace() {
+        String repository = "CompendiumLabs/bge-small-en-v1.5-gguf";
+        String model = "bge-small-en-v1.5-q4_k_m.gguf";
+        String imageName = "embedding-model-from-hugging-face";
+        OllamaContainer ollama = new OllamaContainer(
+            DockerImageName.parse(imageName).asCompatibleSubstituteFor("ollama/ollama:0.1.47")
+        );
+        boolean imageExists = ollama
+            .getDockerClient()
+            .listImagesCmd()
+            .exec()
+            .stream()
+            .anyMatch(image -> image.getRepoTags()[0].equals(imageName + ":latest"));
+        if (!imageExists) {
+            createImage(imageName, repository, model);
+        }
+        ollama.start();
+
+        String modelName = given()
+            .baseUri(ollama.getEndpoint())
+            .get("/api/tags")
+            .jsonPath()
+            .getString("models[0].name");
+        assertThat(modelName).contains(model + ":latest");
+
+        List<Float> embedding = given()
+            .baseUri(ollama.getEndpoint())
+            .header(new Header("Content-Type", "application/json"))
+            .body(new EmbeddingRequest(model + ":latest", "Hello from Testcontainers!"))
+            .post("/api/embeddings")
+            .jsonPath()
+            .getList("embedding");
+
+        assertThat(embedding).isNotNull();
+        assertThat(embedding.isEmpty()).isFalse();
+    }
+
+    private static void createImage(String imageName, String repository, String model) {
+        OllamaHuggingFaceContainer.HuggingFaceModel hfModel = new OllamaHuggingFaceContainer.HuggingFaceModel(
+            repository,
+            model
+        );
+        OllamaHuggingFaceContainer huggingFaceContainer = new OllamaHuggingFaceContainer(hfModel);
+        huggingFaceContainer.start();
+        huggingFaceContainer.commitToImage(imageName);
+    }
+
+    public static class EmbeddingRequest {
+
+        public final String model;
+
+        public final String prompt;
+
+        public EmbeddingRequest(String model, String prompt) {
+            this.model = model;
+            this.prompt = prompt;
+        }
+    }
+}
diff --git a/examples/ollama-hugging-face/src/test/resources/logback-test.xml b/examples/ollama-hugging-face/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/examples/ollama-hugging-face/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 7c1fac9d188..0a5ab5bffcc 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -35,6 +35,7 @@ include 'zookeeper'
 include 'hazelcast'
 include 'nats'
 include 'sftp'
+include 'ollama-hugging-face'
 
 ext.isCI = System.getenv("CI") != null
 

From e2941dcec9efca9aaaad9e07e52a979ff35a8f0d Mon Sep 17 00:00:00 2001
From: Henri Tremblay <henri.tremblay@gmail.com>
Date: Mon, 1 Jul 2024 15:00:25 -0400
Subject: [PATCH 3739/4969] Add support to read up to 1000 service aliases in
 compose file (#8816)

---
 .../containers/ParsedDockerComposeFile.java   | 37 ++++++++++++++-----
 ...ParsedDockerComposeFileValidationTest.java | 25 +++++++++++++
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index c62eb8f9964..23831d3f026 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -7,9 +7,12 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.testcontainers.images.ParsedDockerfile;
+import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
+import org.yaml.snakeyaml.representer.Representer;
+import org.yaml.snakeyaml.resolver.Resolver;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,10 +37,20 @@ class ParsedDockerComposeFile {
     private final File composeFile;
 
     @Getter
-    private Map<String, Set<String>> serviceNameToImageNames = new HashMap<>();
+    private final Map<String, Set<String>> serviceNameToImageNames = new HashMap<>();
 
     ParsedDockerComposeFile(File composeFile) {
-        Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
+        // The default is 50 and a big docker-compose.yml file can easily go above that number. 1,000 should give us some room
+        LoaderOptions options = new LoaderOptions();
+        options.setMaxAliasesForCollections(1_000);
+        DumperOptions dumperOptions = new DumperOptions();
+        Yaml yaml = new Yaml(
+            new SafeConstructor(options),
+            new Representer(dumperOptions),
+            dumperOptions,
+            options,
+            new Resolver()
+        );
         try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) {
             composeFileContent = yaml.load(fileInputStream);
         } catch (Exception e) {
@@ -82,7 +95,9 @@ private void parseAndValidate() {
                 return;
             }
 
-            servicesMap = (Map<String, ?>) servicesElement;
+            @SuppressWarnings("unchecked")
+            Map<String, ?> temp = (Map<String, ?>) servicesElement;
+            servicesMap = temp;
         } else {
             servicesMap = composeFileContent;
         }
@@ -99,7 +114,8 @@ private void parseAndValidate() {
                 break;
             }
 
-            final Map serviceDefinitionMap = (Map) serviceDefinition;
+            @SuppressWarnings("unchecked")
+            final Map<String, ?> serviceDefinitionMap = (Map<String, ?>) serviceDefinition;
 
             validateNoContainerNameSpecified(serviceName, serviceDefinitionMap);
             findServiceImageName(serviceName, serviceDefinitionMap);
@@ -107,7 +123,7 @@ private void parseAndValidate() {
         }
     }
 
-    private void validateNoContainerNameSpecified(String serviceName, Map serviceDefinitionMap) {
+    private void validateNoContainerNameSpecified(String serviceName, Map<String, ?> serviceDefinitionMap) {
         if (serviceDefinitionMap.containsKey("container_name")) {
             throw new IllegalStateException(
                 String.format(
@@ -119,20 +135,21 @@ private void validateNoContainerNameSpecified(String serviceName, Map serviceDef
         }
     }
 
-    private void findServiceImageName(String serviceName, Map serviceDefinitionMap) {
-        if (serviceDefinitionMap.containsKey("image") && serviceDefinitionMap.get("image") instanceof String) {
-            final String imageName = (String) serviceDefinitionMap.get("image");
+    private void findServiceImageName(String serviceName, Map<String, ?> serviceDefinitionMap) {
+        Object result = serviceDefinitionMap.get("image");
+        if (result instanceof String) {
+            final String imageName = (String) result;
             log.debug("Resolved dependency image for Docker Compose in {}: {}", composeFileName, imageName);
             serviceNameToImageNames.put(serviceName, Sets.newHashSet(imageName));
         }
     }
 
-    private void findImageNamesInDockerfile(String serviceName, Map serviceDefinitionMap) {
+    private void findImageNamesInDockerfile(String serviceName, Map<String, ?> serviceDefinitionMap) {
         final Object buildNode = serviceDefinitionMap.get("build");
         Path dockerfilePath = null;
 
         if (buildNode instanceof Map) {
-            final Map buildElement = (Map) buildNode;
+            final Map<?, ?> buildElement = (Map<?, ?>) buildNode;
             final Object dockerfileRelativePath = buildElement.get("dockerfile");
             final Object contextRelativePath = buildElement.get("context");
             if (dockerfileRelativePath instanceof String && contextRelativePath instanceof String) {
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index 15bca203e31..08b2746b386 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -3,17 +3,24 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import lombok.SneakyThrows;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
+import java.io.PrintWriter;
 import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 
 public class ParsedDockerComposeFileValidationTest {
 
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     @Test
     public void shouldValidate() {
         File file = new File("src/test/resources/docker-compose-container-name-v1.yml");
@@ -129,4 +136,22 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
                 entry("custom", Sets.newHashSet("alpine:3.17"))
             ); // redis, mysql from compose file, alpine:3.17 from Dockerfile build
     }
+
+    @Test
+    public void shouldSupportALotOfAliases() throws Exception {
+        File file = temporaryFolder.newFile();
+        try (PrintWriter writer = new PrintWriter(file)) {
+            writer.println("x-entry: &entry");
+            writer.println("  key: value");
+            writer.println();
+            writer.println("services:");
+            for (int i = 0; i < 1_000; i++) {
+                writer.println("  service" + i + ":");
+                writer.println("    image: busybox");
+                writer.println("    environment:");
+                writer.println("      <<: *entry");
+            }
+        }
+        assertThatNoException().isThrownBy(() -> new ParsedDockerComposeFile(file));
+    }
 }

From 6f0e6e4d83a037b6d53f499da5d52e04bce1dc76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Jul 2024 09:05:53 -0600
Subject: [PATCH 3740/4969] Move to develocity plugin (#8821)

---
 examples/settings.gradle   | 11 ++++++-----
 settings.gradle            | 11 ++++++-----
 smoke-test/settings.gradle | 11 ++++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 0a5ab5bffcc..577a4298c7b 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 }
 
-apply plugin: 'com.gradle.enterprise'
+apply plugin: 'com.gradle.develocity'
 apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
 
 rootProject.name = 'testcontainers-examples'
@@ -54,13 +54,14 @@ buildCache {
     }
 }
 
-gradleEnterprise {
+develocity {
     buildScan {
         server = "https://ge.testcontainers.org/"
-        publishAlways()
-        publishIfAuthenticated()
+        publishing.onlyIf {
+            it.authenticated
+        }
         uploadInBackground = !isCI
-        captureTaskInputFiles = true
+        capture.fileFingerprints = true
     }
 
 }
diff --git a/settings.gradle b/settings.gradle
index 0c34aa7dc15..69d0e489a9a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 }
 
-apply plugin: 'com.gradle.enterprise'
+apply plugin: 'com.gradle.develocity'
 apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
 apply plugin: "org.gradle.toolchains.foojay-resolver-convention"
 
@@ -51,13 +51,14 @@ buildCache {
     }
 }
 
-gradleEnterprise {
+develocity {
     buildScan {
         server = "https://ge.testcontainers.org/"
-        publishAlways()
-        publishIfAuthenticated()
+        publishing.onlyIf {
+            it.authenticated
+        }
         uploadInBackground = !isCI
-        captureTaskInputFiles = true
+        capture.fileFingerprints = true
     }
 
 }
diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle
index f1029d0b0f2..8642e528279 100644
--- a/smoke-test/settings.gradle
+++ b/smoke-test/settings.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 }
 
-apply plugin: 'com.gradle.enterprise'
+apply plugin: 'com.gradle.develocity'
 apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
 
 rootProject.name = 'testcontainers-smoke-tests'
@@ -38,13 +38,14 @@ buildCache {
     }
 }
 
-gradleEnterprise {
+develocity {
     buildScan {
         server = "https://ge.testcontainers.org/"
-        publishAlways()
-        publishIfAuthenticated()
+        publishing.onlyIf {
+            it.authenticated
+        }
         uploadInBackground = !isCI
-        captureTaskInputFiles = true
+        capture.fileFingerprints = true
     }
 
 }

From 6cfaf7b983047cdc52405873f02f8fae7706d668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Jul 2024 09:06:39 -0600
Subject: [PATCH 3741/4969] Log Testcontainers version (#8820)

---
 core/src/main/java/org/testcontainers/DockerClientFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index c4707aad0b7..7fc51c5c611 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -145,7 +145,7 @@ private DockerClientProviderStrategy getOrInitializeStrategy() {
         if (strategy != null) {
             return strategy;
         }
-
+        log.info("Testcontainers version: {}", DEFAULT_LABELS.get(TESTCONTAINERS_VERSION_LABEL));
         List<DockerClientProviderStrategy> configurationStrategies = new ArrayList<>();
         ServiceLoader.load(DockerClientProviderStrategy.class).forEach(configurationStrategies::add);
 

From e86eb40fc15e0d0d153a4db1053c85309400b554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Jul 2024 15:22:42 -0600
Subject: [PATCH 3742/4969] Avoid cache when running against latest moby
 (#8841)

---
 .github/workflows/moby-latest.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 6cd65d80d07..0da337d0d66 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -20,7 +20,7 @@ jobs:
         run: docker version
 
       - name: Build with Gradle
-        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_STABLE testcontainers:test
+        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_STABLE testcontainers:test -Dorg.gradle.caching=false
       - uses: ./.github/actions/setup-junit-report
 
       - name: Notify to Slack on failures
@@ -52,7 +52,7 @@ jobs:
         run: docker version
 
       - name: Build with Gradle
-        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_LATEST testcontainers:test
+        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_LATEST testcontainers:test -Dorg.gradle.caching=false
 
       - uses: ./.github/actions/setup-junit-report
 

From c491f6aa543a4657e53578e8a0581ab375f8c105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Jul 2024 18:36:26 -0600
Subject: [PATCH 3743/4969] Fix wait strategy definition (#8842)

Currently, `waitingFor` takes precedence over `setWaitStrategy`. This was introduced with
 ContainerDef in 1dba8d1. This commit  uses `waitStrategy` defined in GenericContainer for both
methods `waitingFor` and `setWaitStrategy`.

Fixes #8578
---
 .../containers/GenericContainer.java          |  2 +-
 .../containers/GenericContainerTest.java      | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index aff46f3b110..4246e620d5b 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -893,7 +893,7 @@ protected WaitStrategy getWaitStrategy() {
 
     @Override
     public void setWaitStrategy(WaitStrategy waitStrategy) {
-        this.containerDef.setWaitStrategy(waitStrategy);
+        this.waitStrategy = waitStrategy;
     }
 
     /**
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index a5b7fe15441..0ba06dd4ca8 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -20,6 +20,8 @@
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.images.builder.Transferable;
@@ -256,6 +258,21 @@ public void shouldContainDefaultNetworkAliasWhenUsingContainerDef() {
         }
     }
 
+    @Test
+    public void shouldRespectWaitStrategy() {
+        try (
+            HelloWorldLogStrategyContainer container = new HelloWorldLogStrategyContainer(
+                "testcontainers/helloworld:1.1.0"
+            )
+        ) {
+            container.setWaitStrategy(Wait.forLogMessage(".*Starting server on port.*", 1));
+            container.start();
+            assertThat((LogMessageWaitStrategy) container.getWaitStrategy())
+                .extracting("regEx", "times")
+                .containsExactly(".*Starting server on port.*", 1);
+        }
+    }
+
     static class NoopStartupCheckStrategy extends StartupCheckStrategy {
 
         @Override
@@ -319,4 +336,13 @@ class HelloWorldContainerDef extends ContainerDef {
             }
         }
     }
+
+    static class HelloWorldLogStrategyContainer extends GenericContainer<HelloWorldContainer> {
+
+        public HelloWorldLogStrategyContainer(String image) {
+            super(DockerImageName.parse(image));
+            withExposedPorts(8080);
+            waitingFor(Wait.forLogMessage(".*Starting server on port.*", 2));
+        }
+    }
 }

From 1f38f0d9604edb9e89fd3b3ee1eff6728e2d1e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <social.mdelapenya@gmail.com>
Date: Wed, 3 Jul 2024 14:30:11 +0200
Subject: [PATCH 3744/4969] chore(ci): add docker install type to the Slack
 payload (#8843)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/workflows/moby-latest.yml | 51 +++++++++++--------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 0da337d0d66..601c1b23cd5 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -6,54 +6,38 @@ on:
     - cron:  '59 23 * * *'
 
 jobs:
-  test_stable_docker:
-    name: "Core tests using stable Docker-CE"
+  test_docker:
+    strategy:
+      matrix:
+        install-docker-type: ["STABLE", "ROOTLESS", "ROOTFUL"]
+    name: "Core tests using Docker ${{ matrix.install-docker-type }}"
     runs-on: ubuntu-22.04
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
 
       - name: Install Stable Docker
+        if: ${{ matrix.install-docker-type == "STABLE" }}
         run: curl https://get.docker.com
 
-      - name: Check Docker version
-        run: docker version
-
-      - name: Build with Gradle
-        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_STABLE testcontainers:test -Dorg.gradle.caching=false
-      - uses: ./.github/actions/setup-junit-report
-
-      - name: Notify to Slack on failures
-        if: failure()
-        id: slack
-        uses: slackapi/slack-github-action@v1.26.0
-        with:
-          payload: |
-            {
-              "tc_project": "testcontainers-java",
-              "tc_github_action_url": "https://github.com/testcontainers/testcontainers-java/actions/runs/${{ env.GITHUB_RUN_ID }}/job/${{ env.GITHUB_RUN_NUMBER }}",
-              "tc_github_action_status": "FAILED",
-              "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOCKER_LATEST_WEBHOOK }}
+      - name: Install Docker from the TEST channel
+        if: ${{ matrix.install-docker-type == "ROOTFUL" }}
+        run: curl https://get.docker.com | CHANNEL=test sh
 
-  test_latest_docker:
-    name: "Core tests using latest Docker-CE"
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-build
+      - name: Setup rootless Docker
+        if: ${{ matrix.install-docker-type == "ROOTLESS" }}
+        uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886  # v0.2.2
 
-      - name: Install Latest Docker
-        run: curl https://get.docker.com | CHANNEL=test sh
+      - name: Remove Docker root socket
+        if: ${{ matrix.install-docker-type == "ROOTLESS" }}
+        run: sudo rm -rf /var/run/docker.sock
 
       - name: Check Docker version
         run: docker version
 
       - name: Build with Gradle
-        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_LATEST testcontainers:test -Dorg.gradle.caching=false
-
+        run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_${{ matrix.install-docker-type }} testcontainers:test -Dorg.gradle.caching=false
       - uses: ./.github/actions/setup-junit-report
 
       - name: Notify to Slack on failures
@@ -64,6 +48,7 @@ jobs:
           payload: |
             {
               "tc_project": "testcontainers-java",
+              "tc_docker_install_type": "${{ matrix.install-docker-type }}",
               "tc_github_action_url": "https://github.com/testcontainers/testcontainers-java/actions/runs/${{ env.GITHUB_RUN_ID }}/job/${{ env.GITHUB_RUN_NUMBER }}",
               "tc_github_action_status": "FAILED",
               "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"

From 055839e3d5320ebf347e683b20fd4777a3ced257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 3 Jul 2024 18:21:49 -0600
Subject: [PATCH 3745/4969] Fix moby-latest.yml workflow

---
 .github/workflows/moby-latest.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 601c1b23cd5..62ce85b1c9b 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -1,6 +1,7 @@
 name: Tests against recent Docker engine releases
 
 on:
+  workflow_dispatch:
   schedule:
     # nightly build, at 23:59 CEST
     - cron:  '59 23 * * *'
@@ -18,19 +19,19 @@ jobs:
       - uses: ./.github/actions/setup-build
 
       - name: Install Stable Docker
-        if: ${{ matrix.install-docker-type == "STABLE" }}
+        if: ${{ matrix.install-docker-type == 'STABLE' }}
         run: curl https://get.docker.com
 
       - name: Install Docker from the TEST channel
-        if: ${{ matrix.install-docker-type == "ROOTFUL" }}
+        if: ${{ matrix.install-docker-type == 'ROOTFUL' }}
         run: curl https://get.docker.com | CHANNEL=test sh
 
       - name: Setup rootless Docker
-        if: ${{ matrix.install-docker-type == "ROOTLESS" }}
+        if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
         uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886  # v0.2.2
 
       - name: Remove Docker root socket
-        if: ${{ matrix.install-docker-type == "ROOTLESS" }}
+        if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
         run: sudo rm -rf /var/run/docker.sock
 
       - name: Check Docker version

From 7989b20c4f0fb8bdfda0343a248bb254456486e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Jul 2024 18:53:53 -0600
Subject: [PATCH 3746/4969] [localstack] Fix reuse mode (#8844)

2195610 allows to copy all `org.testcontainers.*` labels to
`LAMBDA_DOCKER_FLAGS` and it generates a `session-id` breaking
reuse mode. This commit waits until the container is starting
with the right labels and then read the labels to set `LAMBDA_DOCKER_FLAGS`.

Fixes #8814
---
 .../localstack/LocalStackContainer.java       | 81 ++++++++++++-------
 .../containers/localstack/LegacyModeTest.java |  4 +-
 .../localstack/LocalstackTestImages.java      |  1 -
 3 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 1aedc601ce9..e63ee24cff7 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers.localstack;
 
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
@@ -8,9 +9,9 @@
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.ResourceReaper;
 
 import java.net.InetAddress;
 import java.net.URI;
@@ -20,7 +21,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Testcontainers implementation for LocalStack.
@@ -53,6 +53,8 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     private static final String DEFAULT_AWS_SECRET_ACCESS_KEY = "test";
 
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
     @Deprecated
     public static final String VERSION = DEFAULT_TAG;
 
@@ -121,6 +123,8 @@ public LocalStackContainer(final DockerImageName dockerImageName, boolean useLeg
 
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
+        withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("sh"));
+        setCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
     }
 
     private static boolean isVersion2(String version) {
@@ -167,34 +171,6 @@ static boolean shouldRunInLegacyMode(String version) {
         return true;
     }
 
-    /**
-     * Provides a docker argument string including all default labels set on testcontainer containers
-     * @return Argument string in the format `-l key1=value1 -l key2=value2`
-     */
-    private static String internalMarkerLabels() {
-        return Stream
-            .concat(
-                DockerClientFactory.DEFAULT_LABELS.entrySet().stream(),
-                ResourceReaper.instance().getLabels().entrySet().stream()
-            )
-            .map(entry -> String.format("-l %s=%s", entry.getKey(), entry.getValue()))
-            .collect(Collectors.joining(" "));
-    }
-
-    /**
-     * Configure the LocalStack container to include the default testcontainer labels on all spawned lambda containers
-     * Necessary to properly clean up lambda containers even if the LocalStack container is killed before it gets the
-     * chance.
-     */
-    private void configureLambdaContainerLabels() {
-        String lambdaDockerFlags = internalMarkerLabels();
-        String existingLambdaDockerFlags = getEnvMap().get("LAMBDA_DOCKER_FLAGS");
-        if (existingLambdaDockerFlags != null) {
-            lambdaDockerFlags = existingLambdaDockerFlags + " " + lambdaDockerFlags;
-        }
-        withEnv("LAMBDA_DOCKER_FLAGS", lambdaDockerFlags);
-    }
-
     @Override
     protected void configure() {
         super.configure();
@@ -217,7 +193,50 @@ protected void configure() {
         }
 
         exposePorts();
-        configureLambdaContainerLabels();
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        String command = "#!/bin/bash\n";
+        command += "export LAMBDA_DOCKER_FLAGS=" + configureLambdaContainerLabels() + "\n";
+        command += "/usr/local/bin/docker-entrypoint.sh\n";
+        copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
+    }
+
+    /**
+     * Configure the LocalStack container to include the default testcontainers labels on all spawned lambda containers
+     * Necessary to properly clean up lambda containers even if the LocalStack container is killed before it gets the
+     * chance.
+     * @return the lambda container labels as a string
+     */
+    private String configureLambdaContainerLabels() {
+        String lambdaDockerFlags = internalMarkerLabels();
+        String existingLambdaDockerFlags = getEnvMap().get("LAMBDA_DOCKER_FLAGS");
+        if (existingLambdaDockerFlags != null) {
+            lambdaDockerFlags = existingLambdaDockerFlags + " " + lambdaDockerFlags;
+        }
+        return "\"" + lambdaDockerFlags + "\"";
+    }
+
+    /**
+     * Provides a docker argument string including all default labels set on testcontainers containers (excluding reuse labels)
+     * @return Argument string in the format `-l key1=value1 -l key2=value2`
+     */
+    private String internalMarkerLabels() {
+        return getContainerInfo()
+            .getConfig()
+            .getLabels()
+            .entrySet()
+            .stream()
+            .filter(entry -> entry.getKey().startsWith(DockerClientFactory.TESTCONTAINERS_LABEL))
+            .filter(entry -> {
+                return (
+                    !entry.getKey().equals("org.testcontainers.hash") &&
+                    !entry.getKey().equals("org.testcontainers.copied_files.hash")
+                );
+            })
+            .map(entry -> String.format("-l %s=%s", entry.getKey(), entry.getValue()))
+            .collect(Collectors.joining(" "));
     }
 
     private void resolveHostname(String envVar) {
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index bc513a20f26..e66bd8c3e62 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -37,8 +37,8 @@ public static Iterable<Object[]> constructors() {
                     { "0.12", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_12_IMAGE) },
                     { "0.11", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE) },
                     {
-                        "0.7 with legacy = off",
-                        new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_7_IMAGE, false),
+                        "0.11 with legacy = off",
+                        new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE, false),
                     },
                 }
             );
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index 0a9be877f4d..d0f984f3388 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -4,7 +4,6 @@
 
 public interface LocalstackTestImages {
     DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.12.8");
-    DockerImageName LOCALSTACK_0_7_IMAGE = LOCALSTACK_IMAGE.withTag("0.7.0");
     DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
     DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");
     DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");

From a687e8a537ef3d313e2709c109dfa900824d273f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Jul 2024 13:16:17 -0600
Subject: [PATCH 3747/4969] Move to develocity testRetry plugin (#8845)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c59ccf7549e..0ff82406c5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ subprojects {
         }
         ext.isCI = System.getenv("CI") != null
         if (isCI) {
-            retry {
+            develocity.testRetry {
                 maxRetries = 2
                 maxFailures = 5
                 failOnPassedAfterRetry = false

From b4b1c2022d540177ada794b028c99fba5daeba1f Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Fri, 5 Jul 2024 00:03:53 +0200
Subject: [PATCH 3748/4969] Fix copy large files (#8409)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix `OutOfMemoryError` (out of heap memory) when copying large files into a container via `GenericContainer#withCopyFileToContainer()`.

Fixes #4203

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/ContainerState.java            | 30 +++++++++-----
 .../junit/FileOperationsTest.java             | 41 +++++++++++++++++++
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerState.java b/core/src/main/java/org/testcontainers/containers/ContainerState.java
index b3a38febf73..e19f7a85310 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerState.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerState.java
@@ -22,12 +22,12 @@
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.ThrowingFunction;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -339,27 +339,37 @@ default void copyFileToContainer(MountableFile mountableFile, String containerPa
      * @param transferable file which is copied into the container
      * @param containerPath destination path inside the container
      */
-    @SneakyThrows(IOException.class)
+    @SneakyThrows({ IOException.class, InterruptedException.class })
     default void copyFileToContainer(Transferable transferable, String containerPath) {
         if (getContainerId() == null) {
             throw new IllegalStateException("copyFileToContainer can only be used with created / running container");
         }
 
         try (
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(byteArrayOutputStream)
+            PipedOutputStream pipedOutputStream = new PipedOutputStream();
+            PipedInputStream pipedInputStream = new PipedInputStream(pipedOutputStream);
+            TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(pipedOutputStream)
         ) {
-            tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
-            tarArchive.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
+            Thread thread = new Thread(() -> {
+                try {
+                    tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+                    tarArchive.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
+
+                    transferable.transferTo(tarArchive, containerPath);
+                } finally {
+                    IOUtils.closeQuietly(tarArchive);
+                }
+            });
 
-            transferable.transferTo(tarArchive, containerPath);
-            tarArchive.finish();
+            thread.start();
 
             getDockerClient()
                 .copyArchiveToContainerCmd(getContainerId())
-                .withTarInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()))
+                .withTarInputStream(pipedInputStream)
                 .withRemotePath("/")
                 .exec();
+
+            thread.join();
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
index d9655443480..767deacfb00 100644
--- a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
@@ -3,15 +3,19 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.CountingOutputStream;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.testcontainers.TestImages;
+import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.MountableFile;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,6 +44,43 @@ public void copyFileToContainerFileTest() throws Exception {
         }
     }
 
+    @Test
+    public void copyLargeFilesToContainer() throws Exception {
+        File tempFile = temporaryFolder.newFile();
+        try (
+            GenericContainer<?> alpineCopyToContainer = new GenericContainer<>(TestImages.ALPINE_IMAGE) //
+                .withCommand("sleep", "infinity")
+        ) {
+            alpineCopyToContainer.start();
+            final long byteCount;
+            try (
+                FileOutputStream fos = new FileOutputStream(tempFile);
+                CountingOutputStream cos = new CountingOutputStream(fos);
+                BufferedOutputStream bos = new BufferedOutputStream(cos)
+            ) {
+                for (int i = 0; i < 0x4000; i++) {
+                    byte[] bytes = new byte[0xFFFF];
+                    bos.write(bytes);
+                }
+                bos.flush();
+                byteCount = cos.getByteCount();
+            }
+            final MountableFile mountableFile = MountableFile.forHostPath(tempFile.getPath());
+            final String containerPath = "/test.bin";
+            alpineCopyToContainer.copyFileToContainer(mountableFile, containerPath);
+
+            final Container.ExecResult execResult = alpineCopyToContainer.execInContainer( //
+                "stat",
+                "-c",
+                "%s",
+                containerPath
+            );
+            assertThat(execResult.getStdout()).isEqualToIgnoringNewLines(Long.toString(byteCount));
+        } finally {
+            tempFile.delete();
+        }
+    }
+
     @Test
     public void copyFileToContainerFolderTest() throws Exception {
         try (

From bd919df609a009575fdb0d529cbd7d1089e32675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 5 Jul 2024 13:13:01 -0600
Subject: [PATCH 3749/4969] Avoid duplicate values for listeners and
 listener_security_protocol_map in KafkaContainer (#8850)

Currently, when KafkaContainer is started more than one time then
`KAFKA_LISTENERS` and `KAFKA_LISTENER_SECURITY_PROTOCOL_MAP` registers
an additional entry, which is duplicated.

Fixes #8619
---
 .../containers/KafkaContainer.java            | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 209534fd3db..870ab03bd0e 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -323,14 +323,8 @@ void withClusterId(String clusterId) {
         void withRaft() {
             this.envVars.computeIfAbsent("CLUSTER_ID", key -> clusterId);
             this.envVars.computeIfAbsent("KAFKA_NODE_ID", key -> getEnvVars().get("KAFKA_BROKER_ID"));
-            addEnvVar(
-                "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
-                String.format("%s,CONTROLLER:PLAINTEXT", getEnvVars().get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP"))
-            );
-            addEnvVar(
-                "KAFKA_LISTENERS",
-                String.format("%s,CONTROLLER://0.0.0.0:9094", getEnvVars().get("KAFKA_LISTENERS"))
-            );
+            addEnvVar("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", kafkaListenerSecurityProtocolMap());
+            addEnvVar("KAFKA_LISTENERS", kafkaListeners());
             addEnvVar("KAFKA_PROCESS_ROLES", "broker,controller");
 
             String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
@@ -345,5 +339,24 @@ void withRaft() {
 
             setWaitStrategy(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
         }
+
+        private String kafkaListenerSecurityProtocolMap() {
+            String kafkaListenerSecurityProtocolMapEnvVar = getEnvVars().get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP");
+            String kafkaListenerSecurityProtocolMap = String.format(
+                "%s,CONTROLLER:PLAINTEXT",
+                kafkaListenerSecurityProtocolMapEnvVar
+            );
+            Set<String> listenerSecurityProtocolMap = new HashSet<>(
+                Arrays.asList(kafkaListenerSecurityProtocolMap.split(","))
+            );
+            return String.join(",", listenerSecurityProtocolMap);
+        }
+
+        private String kafkaListeners() {
+            String kafkaListenersEnvVar = getEnvVars().get("KAFKA_LISTENERS");
+            String kafkaListeners = String.format("%s,CONTROLLER://0.0.0.0:9094", kafkaListenersEnvVar);
+            Set<String> listeners = new HashSet<>(Arrays.asList(kafkaListeners.split(",")));
+            return String.join(",", listeners);
+        }
     }
 }

From 3a7dba000da647d8ed04af1272913dab52b72e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 10 Jul 2024 15:38:12 -0600
Subject: [PATCH 3750/4969] Add grafana module (#8851)

Add Grafana Otel LGTM container implementation.

Expose ports for Grafana (3000), OTLP GRPC (4317), OTLP HTTP (4318)
and Prometheus (9090). Also, utility methods to get URLs.

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  4 +
 .github/settings.yml                          |  3 +
 docs/modules/grafana.md                       | 28 +++++++
 mkdocs.yml                                    |  1 +
 modules/grafana/build.gradle                  | 23 ++++++
 .../grafana/LgtmStackContainer.java           | 64 ++++++++++++++++
 .../grafana/LgtmStackContainerTest.java       | 76 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 ++++
 12 files changed, 223 insertions(+)
 create mode 100644 docs/modules/grafana.md
 create mode 100644 modules/grafana/build.gradle
 create mode 100644 modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
 create mode 100644 modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
 create mode 100644 modules/grafana/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 1458b89d2f7..5a9cba69083 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -27,6 +27,7 @@ body:
         - Dynalite
         - Elasticsearch
         - GCloud
+        - Grafana
         - HiveMQ
         - InfluxDB
         - K3S
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 2baf2be99eb..c6fb9767f60 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -27,6 +27,7 @@ body:
         - Dynalite
         - Elasticsearch
         - GCloud
+        - Grafana
         - HiveMQ
         - InfluxDB
         - K3S
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index fb5013a41d3..a4fba6a649e 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -27,6 +27,7 @@ body:
         - Dynalite
         - Elasticsearch
         - GCloud
+        - Grafana
         - HiveMQ
         - InfluxDB
         - K3S
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0bb82dce9f4..4421aeefca4 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -106,6 +106,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/grafana"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/hivemq"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 387b1644801..0e33e98096e 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -67,6 +67,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/gcloud/**/*
+"modules/grafana":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/grafana/**/*
 "modules/hivemq":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index bcf94d2d711..2bd2289af79 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -145,6 +145,9 @@ labels:
   - name: modules/gcloud
     color: '#006b75'
 
+  - name: modules/grafana
+    color: '#006b75'
+
   - name: modules/hivemq
     color: '#006b75'
 
diff --git a/docs/modules/grafana.md b/docs/modules/grafana.md
new file mode 100644
index 00000000000..b1ec7f284ba
--- /dev/null
+++ b/docs/modules/grafana.md
@@ -0,0 +1,28 @@
+# Grafana
+
+Testcontainers module for [Grafana OTel LGTM](https://hub.docker.com/r/grafana/otel-lgtm).
+
+## LGTM's usage examples
+
+You can start a Grafana OTel LGTM container instance from any Java application by using:
+
+<!--codeinclude-->
+[Grafana Otel LGTM container](../../modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:grafana:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>grafana</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 542778488fd..b3e0e16d342 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -81,6 +81,7 @@ nav:
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/gcloud.md
+          - modules/grafana.md
           - modules/hivemq.md
           - modules/k3s.md
           - modules/k6.md
diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
new file mode 100644
index 00000000000..3e2676f4f3d
--- /dev/null
+++ b/modules/grafana/build.gradle
@@ -0,0 +1,23 @@
+description = "Testcontainers :: Grafana"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.1'
+    testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
+}
+
+test {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+    options.release.set(11)
+}
diff --git a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
new file mode 100644
index 00000000000..218b37c0da0
--- /dev/null
+++ b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
@@ -0,0 +1,64 @@
+package org.testcontainers.grafana;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Grafana OTel LGTM.
+ * <p>
+ * Supported image: {@code grafana/otel-lgtm}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Grafana: 3000</li>
+ *     <li>OTel Http: 4317</li>
+ *     <li>OTel Grpc: 4318</li>
+ *     <li>Prometheus: 9090</li>
+ * </ul>
+ */
+@Slf4j
+public class LgtmStackContainer extends GenericContainer<LgtmStackContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("grafana/otel-lgtm");
+
+    private static final int GRAFANA_PORT = 3000;
+
+    private static final int OTLP_GRPC_PORT = 4317;
+
+    private static final int OTLP_HTTP_PORT = 4318;
+
+    private static final int PROMETHEUS_PORT = 9090;
+
+    public LgtmStackContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public LgtmStackContainer(DockerImageName image) {
+        super(image);
+        image.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(GRAFANA_PORT, OTLP_GRPC_PORT, OTLP_HTTP_PORT, PROMETHEUS_PORT);
+        waitingFor(
+            Wait.forLogMessage(".*The OpenTelemetry collector and the Grafana LGTM stack are up and running.*\\s", 1)
+        );
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        log.info("Access to the Grafana dashboard: {}", getOtlpHttpUrl());
+    }
+
+    public String getOtlpGrpcUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(OTLP_GRPC_PORT);
+    }
+
+    public String getOtlpHttpUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(OTLP_HTTP_PORT);
+    }
+
+    public String getPromehteusHttpUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(PROMETHEUS_PORT);
+    }
+}
diff --git a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
new file mode 100644
index 00000000000..cb5dbaa630b
--- /dev/null
+++ b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
@@ -0,0 +1,76 @@
+package org.testcontainers.grafana;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.registry.otlp.OtlpConfig;
+import io.micrometer.registry.otlp.OtlpMeterRegistry;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import org.awaitility.Awaitility;
+import org.junit.Test;
+import uk.org.webcompere.systemstubs.SystemStubs;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class LgtmStackContainerTest {
+
+    @Test
+    public void shouldPublishMetric() throws Exception {
+        try ( // container {
+            LgtmStackContainer lgtm = new LgtmStackContainer("grafana/otel-lgtm:0.6.0")
+            // }
+        ) {
+            lgtm.start();
+
+            String version = RestAssured
+                .get(String.format("http://%s:%s/api/health", lgtm.getHost(), lgtm.getMappedPort(3000)))
+                .jsonPath()
+                .get("version");
+            assertThat(version).isEqualTo("11.0.0");
+
+            OtlpConfig otlpConfig = createOtlpConfig(lgtm);
+            MeterRegistry meterRegistry = SystemStubs
+                .withEnvironmentVariable("OTEL_SERVICE_NAME", "testcontainers")
+                .execute(() -> new OtlpMeterRegistry(otlpConfig, Clock.SYSTEM));
+            Counter.builder("test.counter").register(meterRegistry).increment(2);
+
+            Awaitility
+                .given()
+                .pollInterval(Duration.ofSeconds(2))
+                .atMost(Duration.ofSeconds(5))
+                .ignoreExceptions()
+                .untilAsserted(() -> {
+                    Response response = RestAssured
+                        .given()
+                        .queryParam("query", "test_counter_total{job=\"testcontainers\"}")
+                        .get(String.format("%s/api/v1/query", lgtm.getPromehteusHttpUrl()))
+                        .prettyPeek()
+                        .thenReturn();
+                    assertThat(response.getStatusCode()).isEqualTo(200);
+                    assertThat(response.body().jsonPath().getList("data.result[0].value")).contains("2");
+                });
+        }
+    }
+
+    private static OtlpConfig createOtlpConfig(LgtmStackContainer lgtm) {
+        return new OtlpConfig() {
+            @Override
+            public String url() {
+                return String.format("%s/v1/metrics", lgtm.getOtlpHttpUrl());
+            }
+
+            @Override
+            public Duration step() {
+                return Duration.ofSeconds(1);
+            }
+
+            @Override
+            public String get(String s) {
+                return null;
+            }
+        };
+    }
+}
diff --git a/modules/grafana/src/test/resources/logback-test.xml b/modules/grafana/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/grafana/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 62976814afdc18e332835abf5e8f1d05887a4dca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:38:58 +0000
Subject: [PATCH 3751/4969] Bump org.assertj:assertj-core in /modules/cassandra

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index b043f5bec92..3d27fe65cac 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
     testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From a05ffc333b4eb586b971d7e8dfa39d294cbdc114 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:38:58 +0000
Subject: [PATCH 3752/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/chromadb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index f1642346871..09ce354f1c0 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From f93efd76d9311a3e205b1c41221e5fd471120452 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:02 +0000
Subject: [PATCH 3753/4969] Bump org.assertj:assertj-core in
 /modules/cockroachdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 376d742b76c..603c9361065 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From e0a307e5de1b614f1a33eff2b8972cb2d5148d54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:02 +0000
Subject: [PATCH 3754/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.7.0.jre8-preview to 12.7.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 cd8574d6e0e..5249edf9781 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.7.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.7.1.jre8-preview'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From 6c21c11913aa5ef1daefe10235d634cde0d2b798 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:03 +0000
Subject: [PATCH 3755/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/neo4j

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index ec1503e852e..073c1f24b25 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.16'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 7fc77db18ab7c305f9cb6af353d5539090f7f845 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:04 +0000
Subject: [PATCH 3756/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/influxdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index f8b76c4945c..9cf1e8d5ab0 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.24'
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.influxdb:influxdb-java:2.24'
     testImplementation "com.influxdb:influxdb-client-java:6.12.0"
 }

From f47045d1a639b65b873b8bd2f832cf6465489f43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:06 +0000
Subject: [PATCH 3757/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/redpanda

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 895a4da4882..af8bea88c05 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     shaded 'org.freemarker:freemarker:2.3.32'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From 523f26290e81bb2c431eb02a264dd9fffadd8a97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:07 +0000
Subject: [PATCH 3758/4969] Bump org.assertj:assertj-core in /modules/toxiproxy

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index a484d1018b5..95cc199dca1 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,5 +5,5 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:3.0.1'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 43e09ec4fdd11589307005ed7d6a9f637b89e44d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:07 +0000
Subject: [PATCH 3759/4969] Bump org.assertj:assertj-core in
 /modules/mockserver

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index a189c1d54b9..31f4944a572 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 781c6a7eeddc438233a78e44b23de84194408b15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:08 +0000
Subject: [PATCH 3760/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/qdrant

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index e98607f9e22..605a935ceae 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.qdrant:client:1.9.1'
     testImplementation platform('io.grpc:grpc-bom:1.64.0')
     testImplementation 'io.grpc:grpc-stub'

From cb7e05e3082665a08e64f18f94fd70b46da043b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:09 +0000
Subject: [PATCH 3761/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/jdbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index bed25425fc2..ef0f675e5a1 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.24'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }

From c33902bcc9173543207a48e477748125bfb0d5d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:09 +0000
Subject: [PATCH 3762/4969] Bump io.rest-assured:rest-assured in
 /modules/grafana

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 3e2676f4f3d..5b914d086ec 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.1'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 }

From fd57f3d8a33105be02f4befbd1a8ed501fec987f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:11 +0000
Subject: [PATCH 3763/4969] Bump org.assertj:assertj-core in /modules/couchbase

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 89dccfa7202..c9c3d2f1bdc 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'com.couchbase.client:java-client:3.6.2'
     testImplementation 'org.awaitility:awaitility:4.2.1'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 8a6dab4c31bf249efcb8b58ea6bdf95b7bec01c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:12 +0000
Subject: [PATCH 3764/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/orientdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 881186d91ef..800fb62093e 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.29"
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.26"
 }

From f7f1835be5f52c4e6401efedacc3cd9a1c30deb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:13 +0000
Subject: [PATCH 3765/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/azure

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index e2609ca2461..c0306fbcadf 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.azure:azure-cosmos:4.60.0'
 }

From 55ef0e8c35829c0c37e75af748c37976b4caf606 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:15 +0000
Subject: [PATCH 3766/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/vault

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index eb9f3324605..88c83619783 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 
 }

From 7f9c3afe4aabb0365a90ac633f5b9987afb7585e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:15 +0000
Subject: [PATCH 3767/4969] Bump org.assertj:assertj-core in
 /modules/junit-jupiter

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3beaefa3cb5..0c2afa77dee 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'

From c9129465d3b664a48a9a507087adbd95b7d47be9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:15 +0000
Subject: [PATCH 3768/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/activemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 300a4d667ae..ef3e8063ebd 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.33.0"
 }

From 10851a02cca516d30459d102e308aab1c0539b0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:16 +0000
Subject: [PATCH 3769/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/solace

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 7ef43a44b83..f7ff8eec524 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.1'
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.solacesystems:sol-jcsmp:10.23.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'

From c78fb516787265bf45f03a42d834c782db5499f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:17 +0000
Subject: [PATCH 3770/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/db2

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 65f2b953b68..3a773f21534 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From ddb1f6e2ce3c316fade0fc4d073a6b178cc2cb00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:17 +0000
Subject: [PATCH 3771/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/kafka

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 6dd12daa49e..11f72fce54a 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 880b7c625c216ca6113ef3092ac1a80cab672a7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:18 +0000
Subject: [PATCH 3772/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/minio

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 83af1c868d0..7b73ebaae77 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("io.minio:minio:8.5.10")
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From e019854eb3a9c5caa508e27b590df42499d8f8b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:21 +0000
Subject: [PATCH 3773/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d6c455992cf..ce9476e4416 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
-    api 'org.assertj:assertj-core:3.25.3'
+    api 'org.assertj:assertj-core:3.26.3'
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'

From 6eefbf5266779a695987e18b693d50889d67d3dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:21 +0000
Subject: [PATCH 3774/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/consul

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index 81b449d6b7e..fcf57ac8082 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From a3da423a01d79bdcbefeb0f21104ba39a5f5d9cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:22 +0000
Subject: [PATCH 3775/4969] Bump org.assertj:assertj-core in
 /modules/database-commons

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index c7033d45a0b..2a1ead4c215 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 7cdd520a0bc7400ca21e9a4fde682a7bf2faeaf1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:23 +0000
Subject: [PATCH 3776/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/nginx

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 3021ff03241..13232b4bfce 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:24.1.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From c0fb4c92bbead24e30e90cc8a7d0ffc31198296e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:25 +0000
Subject: [PATCH 3777/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/questdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 574b6246f86..a2d138b9c30 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testImplementation project(':jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.questdb:questdb:7.3.9'
     testImplementation 'org.awaitility:awaitility:4.2.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From 653b0c0fc60e3ddde589d0908c3ce055dc28fa3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:25 +0000
Subject: [PATCH 3778/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/openfga

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 1e1fe7c93f0..5bece5f3b9c 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'dev.openfga:openfga-sdk:0.4.2'
 }
 

From d1775e0bf504dafd29322ea1b7269093078b7e97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:26 +0000
Subject: [PATCH 3779/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/ollama

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index 1f65324bf10..7c2c940633d 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Ollama"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From 6641d44b2a7e61cca4746cd907412778342856a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:29 +0000
Subject: [PATCH 3780/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/k6

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k6/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
index e59c07d99e8..5bf8d773da0 100644
--- a/modules/k6/build.gradle
+++ b/modules/k6/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: k6"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 734d25e2b3678f9458146745c8f051c65e592681 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:30 +0000
Subject: [PATCH 3781/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/k3s

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 3d46e330847..0bd9db8a0d5 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -10,5 +10,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:6.12.1'
     testImplementation 'io.kubernetes:client-java:20.0.1-legacy'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 158fe0fbe21d7b57a755a38083c1a1e623a69e97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:34 +0000
Subject: [PATCH 3782/4969] Bump org.assertj:assertj-core in
 /modules/elasticsearch

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 0a9b990ab2e..fe2b32e679d 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.13.4"
     testImplementation "org.elasticsearch.client:transport:7.17.21"
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 93a6a5f3e847fa148d698dd231e66677aff4cf15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:35 +0000
Subject: [PATCH 3783/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/pulsar

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index efcd24690ce..7e7e4e533b5 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.2.3'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.3'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.26.3'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.2.3'
 }

From 78e3aad5678046f041c023f0f7ab2c81a31a441a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:35 +0000
Subject: [PATCH 3784/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/rabbitmq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 69d7ef6979f..f8959b6c5ea 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.21.0'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 4046769250341fff64025309c14410fc5dbd1c04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:39 +0000
Subject: [PATCH 3785/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/solr

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index cb8ed2726a8..d8ff7aeba39 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.3'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From ee12fc7a20309a1ba13e0e86a99d5888d17fb995 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:43 +0000
Subject: [PATCH 3786/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/gcloud

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index daa9da34a0f..ff8b723418f 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub'
     testImplementation 'com.google.cloud:google-cloud-spanner'
     testImplementation 'com.google.cloud:google-cloud-bigtable'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 5adcb0dded41913a925072466e923914323dcea2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:46 +0000
Subject: [PATCH 3787/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/r2dbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 8ce9c975b79..f2debc68648 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,10 +11,10 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.6.6'
-    testFixturesImplementation 'org.assertj:assertj-core:3.25.3'
+    testFixturesImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 5fd14bc6fa01b968206d13b0df4c00eb8fc861ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:46 +0000
Subject: [PATCH 3788/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 5.1.0 to 5.1.2.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.1.0...r5.1.2)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index ffcb89cebb5..10f63aeae07 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:5.1.0")
+    testImplementation("org.mongodb:mongodb-driver-sync:5.1.2")
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 00fec0843fab2cb64acd42eb43c56eab71a51592 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:39:53 +0000
Subject: [PATCH 3789/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/selenium

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index c84a0fd88eb..da8ad97f933 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From a9db0a9968ac8f76d17173fa881465c5668fbd15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 10 Jul 2024 15:42:31 -0600
Subject: [PATCH 3790/4969] Remove unused ImageNameSubstitutor service (#8873)

---
 .../services/org.testcontainers.utility.ImageNameSubstitutor     | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor

diff --git a/core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor b/core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor
deleted file mode 100644
index 069dc7ee710..00000000000
--- a/core/src/main/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor
+++ /dev/null
@@ -1 +0,0 @@
-org.testcontainers.utility.DefaultImageNameSubstitutor

From e1520a0a2b46032a3eb34ced18d59547a9782fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 10 Jul 2024 16:30:13 -0600
Subject: [PATCH 3791/4969] Add smoke test to dependabot (#8928)

---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4421aeefca4..0eea5afdd43 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -376,6 +376,13 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-minor" ]
+  
+  # Smoke test
+  - package-ecosystem: "gradle"
+    directory: "/smoke-test"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From d94fec3dcfbe387564457fd7af2571b1411c8833 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 22:31:24 +0000
Subject: [PATCH 3792/4969] Bump org.seleniumhq.selenium:selenium-api in
 /smoke-test

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.21.0 to 4.22.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.21.0...selenium-4.22.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index fa752256d29..d900109b1c9 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.21.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.22.0"
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }
 

From 5fbffbd59d66a4653282ec43ede8a2895f0b4b9c Mon Sep 17 00:00:00 2001
From: Maarten Vercruysse <67873169+MV-GH@users.noreply.github.com>
Date: Thu, 11 Jul 2024 11:41:58 +0200
Subject: [PATCH 3793/4969] Clarify reuse property setting in docs (#8872)

---
 .../testcontainers/utility/TestcontainersConfiguration.java | 1 -
 docs/features/reuse.md                                      | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index 921e36f80cd..e67a0b83ee2 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -181,7 +181,6 @@ public boolean isDisableChecks() {
 
     @UnstableAPI
     public boolean environmentSupportsReuse() {
-        // specifically not supported as an environment variable or classpath property
         return Boolean.parseBoolean(getEnvVarOrUserProperty("testcontainers.reuse.enable", "false"));
     }
 
diff --git a/docs/features/reuse.md b/docs/features/reuse.md
index b36669876c2..f7d8062138c 100644
--- a/docs/features/reuse.md
+++ b/docs/features/reuse.md
@@ -16,7 +16,11 @@ opt-in mechanism per environment. To reuse a container, the container configurat
 
 ## How to use it
 
-* Enable `Reusable Containers` in `~/.testcontainers.properties`, by adding `testcontainers.reuse.enable=true`
+* Enable `Reusable Containers` 
+  * through environment variable `TESTCONTAINERS_REUSE_ENABLE=true` 
+  * through user property file `~/.testcontainers.properties`, by adding `testcontainers.reuse.enable=true` 
+  * **not** through classpath properties file [see this comment](https://github.com/testcontainers/testcontainers-java/issues/5364#issuecomment-1125907734)
+
 * Define a container and subscribe to reuse the container using `withReuse(true)`
 
 ```java

From 242e7287ada39cb32c75c476c53f155645165e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 11 Jul 2024 13:02:45 -0600
Subject: [PATCH 3794/4969] Update docker-java version to 3.4.0 (#8942)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 41f6a8279fe..ddc4c5ffacb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.1'
 
-    api platform('com.github.docker-java:docker-java-bom:3.3.6')
-    shaded platform('com.github.docker-java:docker-java-bom:3.3.6')
+    api platform('com.github.docker-java:docker-java-bom:3.4.0')
+    shaded platform('com.github.docker-java:docker-java-bom:3.4.0')
 
     api "com.github.docker-java:docker-java-api"
 

From 90b098bca5eb2e4260167783535907f076df7b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 11 Jul 2024 16:14:13 -0500
Subject: [PATCH 3795/4969] Exclude testcontainers from milvus dependency

---
 modules/milvus/build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index c24931be45f..8f1a4a5f804 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,5 +4,8 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation 'io.milvus:milvus-sdk-java:2.4.1'
+    testImplementation('io.milvus:milvus-sdk-java:2.4.1') {
+        exclude(group: 'org.testcontainers', module: 'milvus')
+        exclude(group: 'org.testcontainers', module: 'junit-jupiter')
+    }
 }

From 18a7c277bc749057bf5783a50ee3d1a052fab022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 11 Jul 2024 17:18:01 -0600
Subject: [PATCH 3796/4969] Load `ImageNameSubstitutor` from Service Loaders
 mechanism (#8866)

Add additional mechanism to load `ImageNameSubstitutor`.
---
 .../utility/ImageNameSubstitutor.java         | 53 +++++++++++-------
 .../utility/ImageNameSubstitutorTest.java     | 55 +++++++++++++++++++
 docs/features/image_name_substitution.md      |  7 +++
 3 files changed, 96 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
index 54372cd726f..e46d091d657 100644
--- a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
+++ b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
@@ -4,7 +4,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.UnstableAPI;
 
+import java.util.ServiceLoader;
 import java.util.function.Function;
+import java.util.stream.StreamSupport;
 
 /**
  * An image name substitutor converts a Docker image name, as may be specified in code, to an alternative name.
@@ -25,26 +27,19 @@ public abstract class ImageNameSubstitutor implements Function<DockerImageName,
     static ImageNameSubstitutor defaultImplementation = new DefaultImageNameSubstitutor();
 
     public static synchronized ImageNameSubstitutor instance() {
+        return instance(Thread.currentThread().getContextClassLoader());
+    }
+
+    @VisibleForTesting
+    static synchronized ImageNameSubstitutor instance(ClassLoader classLoader) {
         if (instance == null) {
-            final String configuredClassName = TestcontainersConfiguration.getInstance().getImageSubstitutorClassName();
-
-            if (configuredClassName != null) {
-                log.debug("Attempting to instantiate an ImageNameSubstitutor with class: {}", configuredClassName);
-                ImageNameSubstitutor configuredInstance;
-                try {
-                    configuredInstance =
-                        (ImageNameSubstitutor) Thread
-                            .currentThread()
-                            .getContextClassLoader()
-                            .loadClass(configuredClassName)
-                            .getConstructor()
-                            .newInstance();
-                } catch (Exception e) {
-                    throw new IllegalArgumentException(
-                        "Configured Image Substitutor could not be loaded: " + configuredClassName,
-                        e
-                    );
-                }
+            ImageNameSubstitutor configuredInstance = getImageNameSubstitutor(classLoader);
+
+            if (configuredInstance != null) {
+                log.debug(
+                    "Attempting to instantiate an ImageNameSubstitutor with class: {}",
+                    configuredInstance.getClass().getCanonicalName()
+                );
 
                 log.info("Found configured ImageNameSubstitutor: {}", configuredInstance.getDescription());
 
@@ -63,6 +58,26 @@ public static synchronized ImageNameSubstitutor instance() {
         return instance;
     }
 
+    private static ImageNameSubstitutor getImageNameSubstitutor(ClassLoader classLoader) {
+        final String configuredClassName = TestcontainersConfiguration.getInstance().getImageSubstitutorClassName();
+
+        if (configuredClassName != null) {
+            try {
+                return (ImageNameSubstitutor) classLoader.loadClass(configuredClassName).getConstructor().newInstance();
+            } catch (Exception e) {
+                throw new IllegalArgumentException(
+                    "Configured Image Substitutor could not be loaded: " + configuredClassName,
+                    e
+                );
+            }
+        }
+
+        return StreamSupport
+            .stream(ServiceLoader.load(ImageNameSubstitutor.class, classLoader).spliterator(), false)
+            .findFirst()
+            .orElse(null);
+    }
+
     public static ImageNameSubstitutor noop() {
         return new NoopImageNameSubstitutor();
     }
diff --git a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
index 0f5a747c359..6c29e26c58f 100644
--- a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
@@ -4,15 +4,27 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
 import org.testcontainers.containers.GenericContainer;
 
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.eq;
 
 public class ImageNameSubstitutorTest {
 
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
     @Rule
     public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
 
@@ -81,4 +93,47 @@ public void testImageNameSubstitutorToString() {
                 );
         }
     }
+
+    @Test
+    public void testImageNameSubstitutorFromServiceLoader() throws IOException {
+        Path tempDir = this.tempFolder.newFolder("image-name-substitutor-test").toPath();
+        Path metaInfDir = Paths.get(tempDir.toString(), "META-INF", "services");
+        Files.createDirectories(metaInfDir);
+
+        createClassFile(tempDir, "org/testcontainers/utility/ImageNameSubstitutor.class", ImageNameSubstitutor.class);
+        createClassFile(tempDir, "org/testcontainers/utility/FakeImageSubstitutor.class", FakeImageSubstitutor.class);
+
+        // Create service provider configuration file
+        createServiceProviderFile(
+            metaInfDir,
+            "org.testcontainers.utility.ImageNameSubstitutor",
+            "org.testcontainers.utility.FakeImageSubstitutor"
+        );
+
+        URL[] urls = { tempDir.toUri().toURL() };
+        URLClassLoader classLoader = new URLClassLoader(urls, ImageNameSubstitutorTest.class.getClassLoader());
+
+        final ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance(classLoader);
+
+        DockerImageName result = imageNameSubstitutor.apply(DockerImageName.parse("original"));
+        assertThat(result.asCanonicalNameString())
+            .as("the image has been substituted by default then configured implementations")
+            .isEqualTo("transformed-substituted-image:latest");
+    }
+
+    private void createClassFile(Path tempDir, String classFilePath, Class<?> clazz) throws IOException {
+        Path classFile = Paths.get(tempDir.toString(), classFilePath);
+        Files.createDirectories(classFile.getParent());
+        Files.copy(clazz.getResourceAsStream("/" + classFilePath), classFile);
+    }
+
+    private void createServiceProviderFile(Path metaInfDir, String serviceInterface, String... implementations)
+        throws IOException {
+        Path serviceFile = Paths.get(metaInfDir.toString(), serviceInterface);
+        try (FileWriter writer = new FileWriter(serviceFile.toFile())) {
+            for (String impl : implementations) {
+                writer.write(impl + "\n");
+            }
+        }
+    }
 }
diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
index cf2b09d3d8e..0948e9fa2c7 100644
--- a/docs/features/image_name_substitution.md
+++ b/docs/features/image_name_substitution.md
@@ -125,6 +125,13 @@ Note that it is also possible to provide this same configuration property:
 
 Please see [the documentation on configuration mechanisms](./configuration.md) for more information.
 
+Also, you can use the `ServiceLoader` mechanism to provide the fully qualified class name of the `ImageNameSubstitutor` implementation:
+
+=== "`src/test/resources/META-INF/services/org.testcontainers.utility.ImageNameSubstitutor`"
+    ```text
+    com.mycompany.testcontainers.ExampleImageNameSubstitutor
+    ```
+
 
 ## Overriding image names individually in configuration
 

From 01469c3bb3db7ea6fa90b8d68c7471e9a9eb0bf1 Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:14:34 +0200
Subject: [PATCH 3797/4969] [Docs] Add TCI to external integrations (#8947)

---
 docs/test_framework_integration/external.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/test_framework_integration/external.md b/docs/test_framework_integration/external.md
index b3f55783123..3f97b9f64cb 100644
--- a/docs/test_framework_integration/external.md
+++ b/docs/test_framework_integration/external.md
@@ -7,3 +7,4 @@ The following Open Source frameworks add direct integration to Testcontainers
 | jqwik | [jqwik-testcontainers](https://github.com/jqwik-team/jqwik-testcontainers) | [README](https://github.com/jqwik-team/jqwik-testcontainers) |
 | Kotest | [Kotest Extensions Testcontainers](https://github.com/kotest/kotest-extensions-testcontainers) | [kotest.io](https://kotest.io/docs/extensions/test_containers.html) |
 | Synthesized | [Synthesized TDK-Testcontainers integration](https://github.com/synthesized-io/tdk-tc) | [synthesized.io](https://docs.synthesized.io/tdk/latest/user_guide/integrations/testcontainers) |
+| TCI | [Testcontainers Infrastructure (TCI) Framework](https://github.com/xdev-software/tci-base) | [README](https://github.com/xdev-software/tci-base) |

From d3bb876c40b50520c8a6d31acd04a4a192d10464 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:22:40 +0000
Subject: [PATCH 3798/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.24 to 10.1.26.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index bed25425fc2..934df08ae73 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.24'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.26'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 95f07f7ca09a084f68cf381edde5cfecb8c8c62c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:23:58 +0000
Subject: [PATCH 3799/4969] Bump io.trino:trino-jdbc from 448 to 452 in
 /modules/trino

Bumps io.trino:trino-jdbc from 448 to 452.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 06ae2b2cffe..1bfb93e4c37 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:448'
+    testRuntimeOnly 'io.trino:trino-jdbc:452'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From cc64e46e9f26dc40809b86b718feab574e461494 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:30:50 +0000
Subject: [PATCH 3800/4969] Bump io.grpc:grpc-bom from 1.64.0 to 1.65.1 in
 /modules/qdrant

Bumps [io.grpc:grpc-bom](https://github.com/grpc/grpc-java) from 1.64.0 to 1.65.1.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.64.0...v1.65.1)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index e98607f9e22..4273430ca58 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.qdrant:client:1.9.1'
-    testImplementation platform('io.grpc:grpc-bom:1.64.0')
+    testImplementation platform('io.grpc:grpc-bom:1.65.1')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'

From 0b13f4cec5546d1127e67323e21c77792ae44293 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:32:04 +0000
Subject: [PATCH 3801/4969] Bump io.milvus:milvus-sdk-java from 2.4.1 to 2.4.2
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.4.1...v2.4.2)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 8f1a4a5f804..76406164e7a 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation('io.milvus:milvus-sdk-java:2.4.1') {
+    testImplementation('io.milvus:milvus-sdk-java:2.4.2') {
         exclude(group: 'org.testcontainers', module: 'milvus')
         exclude(group: 'org.testcontainers', module: 'junit-jupiter')
     }

From 7f296f2ff50b8f137fe388b2c71a0b382aa47648 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:56:48 +0000
Subject: [PATCH 3802/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.13.4 to 8.14.3.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.13.4...v8.14.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 0a9b990ab2e..c435b67be16 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.13.4"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.14.3"
     testImplementation "org.elasticsearch.client:transport:7.17.21"
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From ae7a94937a4ef7a89aa735c8e294aa48994fc373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 16 Jul 2024 09:44:03 -0600
Subject: [PATCH 3803/4969] Update ryuk version to 0.8.1 (#8957)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 61bceb60b0b..a4032619ae2 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.7.0");
+        super("testcontainers/ryuk:0.8.1");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 1442b1ce682a39670b9110f1df78c93db17b63e1 Mon Sep 17 00:00:00 2001
From: aasawariMongoDB <103485554+aasawariMongoDB@users.noreply.github.com>
Date: Wed, 17 Jul 2024 09:42:32 +0530
Subject: [PATCH 3804/4969] Add test compatibility against MongoDB 7 (#8868)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../org/testcontainers/containers/MongoDBContainerTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index c801dad5378..8952c6802e6 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -24,8 +24,8 @@ public void shouldExecuteTransactions() {
     }
 
     @Test
-    public void supportsMongoDB_4_4() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.4")) {
+    public void supportsMongoDB_7_0() {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0")) {
             mongoDBContainer.start();
         }
     }

From 6a0765097ae77b81255aaf845874d170d5473654 Mon Sep 17 00:00:00 2001
From: Guram Savinov <guram.savinov@gmail.com>
Date: Wed, 17 Jul 2024 07:22:29 +0300
Subject: [PATCH 3805/4969] Support multiple init scripts in
 JdbcDatabaseContainer (#7680)

Fixes #2232
---
 .../containers/JdbcDatabaseContainer.java     | 40 ++++++++++++++++---
 .../postgresql/SimplePostgreSQLTest.java      | 21 ++++++++++
 .../resources/somepath/init_postgresql_2.sql  |  5 +++
 3 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 modules/postgresql/src/test/resources/somepath/init_postgresql_2.sql

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 2247b2e867f..713cb81bb62 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -17,7 +17,10 @@
 import java.sql.Driver;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Future;
@@ -35,7 +38,7 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
 
     private Driver driver;
 
-    private String initScriptPath;
+    private List<String> initScriptPaths = new ArrayList<>();
 
     protected Map<String, String> parameters = new HashMap<>();
 
@@ -133,8 +136,37 @@ public SELF withConnectTimeoutSeconds(int connectTimeoutSeconds) {
         return self();
     }
 
+    /**
+     * Sets a script for initialization.
+     *
+     * @param initScriptPath path to the script file
+     * @return self
+     */
     public SELF withInitScript(String initScriptPath) {
-        this.initScriptPath = initScriptPath;
+        this.initScriptPaths = new ArrayList<>();
+        this.initScriptPaths.add(initScriptPath);
+        return self();
+    }
+
+    /**
+     * Sets an ordered array of scripts for initialization.
+     *
+     * @param initScriptPaths paths to the script files
+     * @return self
+     */
+    public SELF withInitScripts(String... initScriptPaths) {
+        return withInitScripts(Arrays.asList(initScriptPaths));
+    }
+
+    /**
+     * Sets an ordered collection of scripts for initialization.
+     *
+     * @param initScriptPaths paths to the script files
+     * @return self
+     */
+    public SELF withInitScripts(Iterable<String> initScriptPaths) {
+        this.initScriptPaths = new ArrayList<>();
+        initScriptPaths.forEach(this.initScriptPaths::add);
         return self();
     }
 
@@ -329,9 +361,7 @@ protected void optionallyMapResourceParameterAsVolume(
      * Load init script content and apply it to the database if initScriptPath is set
      */
     protected void runInitScriptIfRequired() {
-        if (initScriptPath != null) {
-            ScriptUtils.runInitScript(getDatabaseDelegate(), initScriptPath);
-        }
+        initScriptPaths.forEach(path -> ScriptUtils.runInitScript(getDatabaseDelegate(), path));
     }
 
     public void setParameters(Map<String, String> parameters) {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 84beb779fa4..bc2fb0289e3 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -74,6 +74,27 @@ public void testExplicitInitScript() throws SQLException {
         }
     }
 
+    @Test
+    public void testExplicitInitScripts() throws SQLException {
+        try (
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+                .withInitScripts("somepath/init_postgresql.sql", "somepath/init_postgresql_2.sql")
+        ) {
+            postgres.start();
+
+            ResultSet resultSet = performQuery(
+                postgres,
+                "SELECT foo AS value FROM bar UNION SELECT bar AS value FROM foo"
+            );
+
+            String columnValue1 = resultSet.getString(1);
+            resultSet.next();
+            String columnValue2 = resultSet.getString(1);
+            assertThat(columnValue1).as("Value from init script 1 should equal real value").isEqualTo("hello world");
+            assertThat(columnValue2).as("Value from init script 2 should equal real value").isEqualTo("hello world 2");
+        }
+    }
+
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
         try (
diff --git a/modules/postgresql/src/test/resources/somepath/init_postgresql_2.sql b/modules/postgresql/src/test/resources/somepath/init_postgresql_2.sql
new file mode 100644
index 00000000000..f4ecf9bbfad
--- /dev/null
+++ b/modules/postgresql/src/test/resources/somepath/init_postgresql_2.sql
@@ -0,0 +1,5 @@
+CREATE TABLE foo (
+  bar VARCHAR(255)
+);
+
+INSERT INTO foo (bar) VALUES ('hello world 2');

From a321cfad77362924d154fdf53b080c03cc156790 Mon Sep 17 00:00:00 2001
From: Wim Deblauwe <wim.deblauwe@gmail.com>
Date: Wed, 17 Jul 2024 07:40:56 +0200
Subject: [PATCH 3806/4969] Allow copy specific files to docker compose (#8848)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds support for a `withCopyFilesInContainer` method on `ComposeContainer` and `DockerComposeContainer`. It allows to specify what files or directories should be copied, instead of just copying all files. If not used, the current behavior is preserved.

Fixes #8847

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 core/build.gradle                             |  1 +
 .../containers/ComposeContainer.java          | 12 ++-
 .../containers/ComposeDelegate.java           | 17 ++--
 .../ContainerisedDockerCompose.java           | 24 ++++-
 .../containers/DockerComposeContainer.java    | 12 ++-
 .../ComposeContainerWithCopyFilesTest.java    | 87 +++++++++++++++++++
 ...ckerComposeContainerWithCopyFilesTest.java | 70 +++++++++++++++
 .../compose-file-copy-inclusions/.env         |  1 +
 .../compose-file-copy-inclusions/Dockerfile   |  9 ++
 .../EnvVariableRestEndpoint.java              | 45 ++++++++++
 .../compose-root-only.yml                     |  7 ++
 .../compose-test-only.yml                     |  7 ++
 .../compose-file-copy-inclusions/compose.yml  |  8 ++
 .../compose-file-copy-inclusions/test/.env    |  1 +
 docs/modules/docker_compose.md                | 20 +++++
 15 files changed, 310 insertions(+), 11 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
 create mode 100644 core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
 create mode 100644 core/src/test/resources/compose-file-copy-inclusions/.env
 create mode 100644 core/src/test/resources/compose-file-copy-inclusions/Dockerfile
 create mode 100644 core/src/test/resources/compose-file-copy-inclusions/EnvVariableRestEndpoint.java
 create mode 100644 core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml
 create mode 100644 core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml
 create mode 100644 core/src/test/resources/compose-file-copy-inclusions/compose.yml
 create mode 100644 core/src/test/resources/compose-file-copy-inclusions/test/.env

diff --git a/core/build.gradle b/core/build.gradle
index ddc4c5ffacb..6d8b637af0e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -121,6 +121,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'io.rest-assured:rest-assured:5.4.0'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
index a865e744dd6..5add02183ae 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
@@ -67,6 +67,8 @@ public class ComposeContainer extends FailureDetectingExternalResource implement
 
     private String project;
 
+    private List<String> filesInDirectory = new ArrayList<>();
+
     public ComposeContainer(File... composeFiles) {
         this(Arrays.asList(composeFiles));
     }
@@ -134,7 +136,8 @@ public void start() {
                     this.options,
                     this.services,
                     this.scalingPreferences,
-                    this.env
+                    this.env,
+                    this.filesInDirectory
                 );
             this.composeDelegate.startAmbassadorContainer();
             this.composeDelegate.waitUntilServiceStarted(this.tailChildContainers);
@@ -165,7 +168,7 @@ public void stop() {
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
-                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
+                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env, this.filesInDirectory);
             } finally {
                 this.project = this.composeDelegate.randomProjectId();
             }
@@ -352,6 +355,11 @@ public ComposeContainer withStartupTimeout(Duration startupTimeout) {
         return this;
     }
 
+    public ComposeContainer withCopyFilesInContainer(String... fileCopyInclusions) {
+        this.filesInDirectory = Arrays.asList(fileCopyInclusions);
+        return this;
+    }
+
     public Optional<ContainerState> getContainerByServiceName(String serviceName) {
         return this.composeDelegate.getContainerByServiceName(serviceName);
     }
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
index a5189c8efa3..0b09e9c2683 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
@@ -126,7 +126,8 @@ void createServices(
         final Set<String> options,
         final List<String> services,
         final Map<String, Integer> scalingPreferences,
-        Map<String, String> env
+        Map<String, String> env,
+        List<String> fileCopyInclusions
     ) {
         // services that have been explicitly requested to be started. If empty, all services should be started.
         final String serviceNameArgs = Stream
@@ -160,7 +161,7 @@ void createServices(
         }
 
         // Run the docker compose container, which starts up the services
-        runWithCompose(localCompose, command, env);
+        runWithCompose(localCompose, command, env, fileCopyInclusions);
     }
 
     private String getUpCommand(String options) {
@@ -237,10 +238,15 @@ private String getServiceNameFromContainer(com.github.dockerjava.api.model.Conta
     }
 
     public void runWithCompose(boolean localCompose, String cmd) {
-        runWithCompose(localCompose, cmd, Collections.emptyMap());
+        runWithCompose(localCompose, cmd, Collections.emptyMap(), Collections.emptyList());
     }
 
-    public void runWithCompose(boolean localCompose, String cmd, Map<String, String> env) {
+    public void runWithCompose(
+        boolean localCompose,
+        String cmd,
+        Map<String, String> env,
+        List<String> fileCopyInclusions
+    ) {
         Preconditions.checkNotNull(composeFiles);
         Preconditions.checkArgument(!composeFiles.isEmpty(), "No docker compose file have been provided");
 
@@ -248,7 +254,8 @@ public void runWithCompose(boolean localCompose, String cmd, Map<String, String>
         if (localCompose) {
             dockerCompose = new LocalDockerCompose(this.executable, composeFiles, project);
         } else {
-            dockerCompose = new ContainerisedDockerCompose(this.defaultImageName, composeFiles, project);
+            dockerCompose =
+                new ContainerisedDockerCompose(this.defaultImageName, composeFiles, project, fileCopyInclusions);
         }
 
         dockerCompose.withCommand(cmd).withEnv(env).invoke();
diff --git a/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java b/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
index e1b7aaa604b..7cff2c77271 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
@@ -24,7 +24,12 @@ class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCom
 
     public static final char UNIX_PATH_SEPARATOR = ':';
 
-    public ContainerisedDockerCompose(DockerImageName dockerImageName, List<File> composeFiles, String identifier) {
+    public ContainerisedDockerCompose(
+        DockerImageName dockerImageName,
+        List<File> composeFiles,
+        String identifier,
+        List<String> fileCopyInclusions
+    ) {
         super(dockerImageName);
         addEnv(ENV_PROJECT_NAME, identifier);
 
@@ -43,7 +48,22 @@ public ContainerisedDockerCompose(DockerImageName dockerImageName, List<File> co
         final String composeFileEnvVariableValue = Joiner.on(UNIX_PATH_SEPARATOR).join(absoluteDockerComposeFiles); // we always need the UNIX path separator
         logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
         addEnv(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
-        withCopyFileToContainer(MountableFile.forHostPath(pwd), containerPwd);
+        if (fileCopyInclusions.isEmpty()) {
+            logger().info("Copying all files in {} into the container", pwd);
+            withCopyFileToContainer(MountableFile.forHostPath(pwd), containerPwd);
+        } else {
+            // Always copy the compose file itself
+            logger().info("Copying docker compose file: {}", dockerComposeBaseFile.getAbsolutePath());
+            withCopyFileToContainer(
+                MountableFile.forHostPath(dockerComposeBaseFile.getAbsolutePath()),
+                convertToUnixFilesystemPath(dockerComposeBaseFile.getAbsolutePath())
+            );
+            for (String pathToCopy : fileCopyInclusions) {
+                String hostPath = pwd + "/" + pathToCopy;
+                logger().info("Copying inclusion file: {}", hostPath);
+                withCopyFileToContainer(MountableFile.forHostPath(hostPath), convertToUnixFilesystemPath(hostPath));
+            }
+        }
 
         // Ensure that compose can access docker. Since the container is assumed to be running on the same machine
         //  as the docker daemon, just mapping the docker control socket is OK.
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 68f9ec26ba6..748c0c59174 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -68,6 +68,8 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
 
     private String project;
 
+    private List<String> filesInDirectory = new ArrayList<>();
+
     @Deprecated
     public DockerComposeContainer(File composeFile, String identifier) {
         this(identifier, composeFile);
@@ -140,7 +142,8 @@ public void start() {
                     this.options,
                     this.services,
                     this.scalingPreferences,
-                    this.env
+                    this.env,
+                    this.filesInDirectory
                 );
             this.composeDelegate.startAmbassadorContainer();
             this.composeDelegate.waitUntilServiceStarted(this.tailChildContainers);
@@ -172,7 +175,7 @@ public void stop() {
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
-                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
+                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env, this.filesInDirectory);
             } finally {
                 this.project = this.composeDelegate.randomProjectId();
             }
@@ -355,6 +358,11 @@ public SELF withStartupTimeout(Duration startupTimeout) {
         return self();
     }
 
+    public SELF withCopyFilesInContainer(String... fileCopyInclusions) {
+        this.filesInDirectory = Arrays.asList(fileCopyInclusions);
+        return self();
+    }
+
     public Optional<ContainerState> getContainerByServiceName(String serviceName) {
         return this.composeDelegate.getContainerByServiceName(serviceName);
     }
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
new file mode 100644
index 00000000000..390ddd505fb
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
@@ -0,0 +1,87 @@
+package org.testcontainers.junit;
+
+import io.restassured.RestAssured;
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.ContainerLaunchException;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+public class ComposeContainerWithCopyFilesTest {
+
+    @Test
+    public void testShouldCopyAllFilesByDefault() throws IOException {
+        try (
+            ComposeContainer environment = new ComposeContainer(
+                new File("src/test/resources/compose-file-copy-inclusions/compose.yml")
+            )
+                .withExposedService("app", 8080)
+        ) {
+            environment.start();
+
+            String response = readStringFromURL(environment);
+            assertThat(response).isEqualTo("MY_ENV_VARIABLE: override");
+        }
+    }
+
+    @Test
+    public void testWithFileCopyInclusionUsingFilePath() throws IOException {
+        try (
+            ComposeContainer environment = new ComposeContainer(
+                new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml")
+            )
+                .withExposedService("app", 8080)
+                .withCopyFilesInContainer("Dockerfile", "EnvVariableRestEndpoint.java", ".env")
+        ) {
+            environment.start();
+
+            String response = readStringFromURL(environment);
+
+            // The `test/.env` file is not copied, now so we get the original value
+            assertThat(response).isEqualTo("MY_ENV_VARIABLE: original");
+        }
+    }
+
+    @Test
+    public void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
+        try (
+            ComposeContainer environment = new ComposeContainer(
+                new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
+            )
+                .withExposedService("app", 8080)
+                .withCopyFilesInContainer("Dockerfile", "EnvVariableRestEndpoint.java", "test")
+        ) {
+            environment.start();
+
+            String response = readStringFromURL(environment);
+            // The test directory (with its contents) is copied, so we get the override
+            assertThat(response).isEqualTo("MY_ENV_VARIABLE: override");
+        }
+    }
+
+    @Test
+    public void testShouldNotBeAbleToStartIfNeededEnvFileIsNotCopied() {
+        try (
+            ComposeContainer environment = new ComposeContainer(
+                new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
+            )
+                .withExposedService("app", 8080)
+                .withCopyFilesInContainer("Dockerfile", "EnvVariableRestEndpoint.java")
+        ) {
+            assertThatExceptionOfType(ContainerLaunchException.class)
+                .isThrownBy(environment::start)
+                .withMessageContaining("Container startup failed for image docker");
+        }
+    }
+
+    private static String readStringFromURL(ComposeContainer container) throws IOException {
+        Integer servicePort = container.getServicePort("app-1", 8080);
+        String serviceHost = container.getServiceHost("app-1", 8080);
+        String requestURL = "http://" + serviceHost + ":" + servicePort + "/env";
+        return RestAssured.get(requestURL).thenReturn().body().asString();
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
new file mode 100644
index 00000000000..46dd4c65b3c
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
@@ -0,0 +1,70 @@
+package org.testcontainers.junit;
+
+import io.restassured.RestAssured;
+import org.junit.Test;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DockerComposeContainerWithCopyFilesTest {
+
+    @Test
+    public void testShouldCopyAllFilesByDefault() throws IOException {
+        try (
+            DockerComposeContainer environment = new DockerComposeContainer(
+                new File("src/test/resources/compose-file-copy-inclusions/compose.yml")
+            )
+                .withExposedService("app", 8080)
+        ) {
+            environment.start();
+
+            String response = readStringFromURL(environment);
+            assertThat(response).isEqualTo("MY_ENV_VARIABLE: override");
+        }
+    }
+
+    @Test
+    public void testWithFileCopyInclusionUsingFilePath() throws IOException {
+        try (
+            DockerComposeContainer environment = new DockerComposeContainer(
+                new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml")
+            )
+                .withExposedService("app", 8080)
+                .withCopyFilesInContainer("Dockerfile", "EnvVariableRestEndpoint.java", ".env")
+        ) {
+            environment.start();
+
+            String response = readStringFromURL(environment);
+
+            // The `test/.env` file is not copied, now so we get the original value
+            assertThat(response).isEqualTo("MY_ENV_VARIABLE: original");
+        }
+    }
+
+    @Test
+    public void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
+        try (
+            DockerComposeContainer environment = new DockerComposeContainer(
+                new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
+            )
+                .withExposedService("app", 8080)
+                .withCopyFilesInContainer("Dockerfile", "EnvVariableRestEndpoint.java", "test")
+        ) {
+            environment.start();
+
+            String response = readStringFromURL(environment);
+            // The test directory (with its contents) is copied, so we get the override
+            assertThat(response).isEqualTo("MY_ENV_VARIABLE: override");
+        }
+    }
+
+    private static String readStringFromURL(DockerComposeContainer container) throws IOException {
+        Integer servicePort = container.getServicePort("app_1", 8080);
+        String serviceHost = container.getServiceHost("app_1", 8080);
+        String requestURL = "http://" + serviceHost + ":" + servicePort + "/env";
+        return RestAssured.get(requestURL).thenReturn().body().asString();
+    }
+}
diff --git a/core/src/test/resources/compose-file-copy-inclusions/.env b/core/src/test/resources/compose-file-copy-inclusions/.env
new file mode 100644
index 00000000000..bb5b5beb3e2
--- /dev/null
+++ b/core/src/test/resources/compose-file-copy-inclusions/.env
@@ -0,0 +1 @@
+MY_ENV_VARIABLE=original
diff --git a/core/src/test/resources/compose-file-copy-inclusions/Dockerfile b/core/src/test/resources/compose-file-copy-inclusions/Dockerfile
new file mode 100644
index 00000000000..851086d68c2
--- /dev/null
+++ b/core/src/test/resources/compose-file-copy-inclusions/Dockerfile
@@ -0,0 +1,9 @@
+FROM jbangdev/jbang-action
+
+WORKDIR /app
+COPY EnvVariableRestEndpoint.java .
+
+RUN jbang export portable --force EnvVariableRestEndpoint.java
+
+EXPOSE 8080
+CMD ["./EnvVariableRestEndpoint.java"]
diff --git a/core/src/test/resources/compose-file-copy-inclusions/EnvVariableRestEndpoint.java b/core/src/test/resources/compose-file-copy-inclusions/EnvVariableRestEndpoint.java
new file mode 100644
index 00000000000..ead172bbb35
--- /dev/null
+++ b/core/src/test/resources/compose-file-copy-inclusions/EnvVariableRestEndpoint.java
@@ -0,0 +1,45 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpExchange;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+
+public class EnvVariableRestEndpoint {
+    private static final String ENV_VARIABLE_NAME = "MY_ENV_VARIABLE";
+    private static final int PORT = 8080;
+
+    public static void main(String[] args) throws IOException {
+        HttpServer server = HttpServer.create(new InetSocketAddress(PORT), 0);
+        server.createContext("/env", new EnvVariableHandler());
+        server.setExecutor(null);
+        server.start();
+        System.out.println("Server started on port " + PORT);
+    }
+
+    static class EnvVariableHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange exchange) throws IOException {
+            if ("GET".equals(exchange.getRequestMethod())) {
+                String envValue = System.getenv(ENV_VARIABLE_NAME);
+                String response = envValue != null
+                    ? ENV_VARIABLE_NAME + ": " + envValue
+                    : "Environment variable " + ENV_VARIABLE_NAME + " not found";
+
+                exchange.sendResponseHeaders(200, response.length());
+                try (OutputStream os = exchange.getResponseBody()) {
+                    os.write(response.getBytes());
+                }
+            } else {
+                String response = "Method not allowed";
+                exchange.sendResponseHeaders(405, response.length());
+                try (OutputStream os = exchange.getResponseBody()) {
+                    os.write(response.getBytes());
+                }
+            }
+        }
+    }
+}
diff --git a/core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml b/core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml
new file mode 100644
index 00000000000..fa17d5f472d
--- /dev/null
+++ b/core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml
@@ -0,0 +1,7 @@
+services:
+  app:
+    build: .
+    ports:
+      - "8080:8080"
+    env_file:
+      - '.env'
diff --git a/core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml b/core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml
new file mode 100644
index 00000000000..943f908ce20
--- /dev/null
+++ b/core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml
@@ -0,0 +1,7 @@
+services:
+  app:
+    build: .
+    ports:
+      - "8080:8080"
+    env_file:
+      - './test/.env'
diff --git a/core/src/test/resources/compose-file-copy-inclusions/compose.yml b/core/src/test/resources/compose-file-copy-inclusions/compose.yml
new file mode 100644
index 00000000000..2a9334d7980
--- /dev/null
+++ b/core/src/test/resources/compose-file-copy-inclusions/compose.yml
@@ -0,0 +1,8 @@
+services:
+  app:
+    build: .
+    ports:
+      - "8080:8080"
+    env_file:
+      - '.env'
+      - './test/.env'
diff --git a/core/src/test/resources/compose-file-copy-inclusions/test/.env b/core/src/test/resources/compose-file-copy-inclusions/test/.env
new file mode 100644
index 00000000000..09867ae6d5d
--- /dev/null
+++ b/core/src/test/resources/compose-file-copy-inclusions/test/.env
@@ -0,0 +1 @@
+MY_ENV_VARIABLE=override
diff --git a/docs/modules/docker_compose.md b/docs/modules/docker_compose.md
index 10f1aee61aa..9032e7c6ee2 100644
--- a/docs/modules/docker_compose.md
+++ b/docs/modules/docker_compose.md
@@ -135,6 +135,26 @@ public static ComposeContainer environment =
 !!! note
     Make sure the service name use a `-` instead of `_` as separator using `ComposeContainer`.
 
+## Build working directory
+
+You can select what files should be copied only via `withCopyFilesInContainer`:
+
+```java
+public static ComposeContainer environment =
+    new ComposeContainer(new File("compose.yml"))
+        .withCopyFilesInContainer(".env");
+```
+
+In this example, only `compose.yml` and `.env` are copied over into the container that will run the Docker Compose file.  
+By default, all files in the same directory as the compose file are copied over.
+
+This can be used with `DockerComposeContainer` and `ComposeContainer`.
+You can use file and directory references.
+They are always resolved relative to the directory where the compose file resides.
+
+!!! note
+    This only work with containarized Compose, not with `Local Compose` mode.
+
 ## Using private repositories in Docker compose
 When Docker Compose is used in container mode (not local), it's needs to be made aware of Docker settings for private repositories. 
 By default, those setting are located in `$HOME/.docker/config.json`. 

From 181b56eaefa90ed186329e553bd6b3b1cc416a62 Mon Sep 17 00:00:00 2001
From: Donnerbart <david.sondermann@hivemq.com>
Date: Wed, 17 Jul 2024 07:42:04 +0200
Subject: [PATCH 3807/4969] Support build args in FROM statement (#6119)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #3238

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../images/ParsedDockerfile.java              | 26 ++++++++--------
 .../images/builder/ImageFromDockerfile.java   | 31 ++++++++++++++-----
 .../images/builder/DockerfileBuildTest.java   | 21 +++++++++++--
 .../builder/ImageFromDockerfileTest.java      |  1 +
 .../Dockerfile-from-buildarg                  |  9 ++++++
 5 files changed, 65 insertions(+), 23 deletions(-)
 create mode 100644 core/src/test/resources/dockerfile-build-test/Dockerfile-from-buildarg

diff --git a/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
index ed88c1a85ff..8c4d7866ff4 100644
--- a/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/ParsedDockerfile.java
@@ -29,17 +29,17 @@ public class ParsedDockerfile {
     private final Path dockerFilePath;
 
     @Getter
-    private Set<String> dependencyImageNames = Collections.emptySet();
+    private final Set<String> dependencyImageNames;
 
     public ParsedDockerfile(Path dockerFilePath) {
         this.dockerFilePath = dockerFilePath;
-        parse(read());
+        this.dependencyImageNames = parse(read());
     }
 
     @VisibleForTesting
     ParsedDockerfile(List<String> lines) {
         this.dockerFilePath = Paths.get("dummy.Dockerfile");
-        parse(lines);
+        this.dependencyImageNames = parse(lines);
     }
 
     private List<String> read() {
@@ -56,17 +56,17 @@ private List<String> read() {
         }
     }
 
-    private void parse(List<String> lines) {
-        dependencyImageNames =
-            lines
-                .stream()
-                .map(FROM_LINE_PATTERN::matcher)
-                .filter(Matcher::matches)
-                .map(matcher -> matcher.group("image"))
-                .collect(Collectors.toSet());
+    private Set<String> parse(List<String> lines) {
+        Set<String> imageNames = lines
+            .stream()
+            .map(FROM_LINE_PATTERN::matcher)
+            .filter(Matcher::matches)
+            .map(matcher -> matcher.group("image"))
+            .collect(Collectors.toSet());
 
-        if (!dependencyImageNames.isEmpty()) {
-            log.debug("Found dependency images in Dockerfile {}: {}", dockerFilePath, dependencyImageNames);
+        if (!imageNames.isEmpty()) {
+            log.debug("Found dependency images in Dockerfile {}: {}", dockerFilePath, imageNames);
         }
+        return imageNames;
     }
 }
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index b35ef830c11..ced612bfefa 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -37,6 +37,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.regex.Matcher;
 import java.util.zip.GZIPOutputStream;
 
 @Slf4j
@@ -96,6 +97,7 @@ public ImageFromDockerfile withFileFromTransferable(String path, Transferable tr
     protected final String resolve() {
         Logger logger = DockerLoggerFactory.getLogger(dockerImageName);
 
+        //noinspection resource
         DockerClient dockerClient = DockerClientFactory.instance().client();
 
         try {
@@ -107,12 +109,12 @@ public void onNext(BuildResponseItem item) {
                     if (item.isErrorIndicated()) {
                         logger.error(item.getErrorDetail().getMessage());
                     } else {
-                        logger.debug(StringUtils.chomp(item.getStream(), "\n"));
+                        logger.debug(StringUtils.removeEnd(item.getStream(), "\n"));
                     }
                 }
             };
 
-            // We have to use pipes to avoid high memory consumption since users might want to build really big images
+            // We have to use pipes to avoid high memory consumption since users might want to build huge images
             @Cleanup
             PipedInputStream in = new PipedInputStream();
             @Cleanup
@@ -169,7 +171,7 @@ public void onNext(BuildResponseItem item) {
     }
 
     protected void configure(BuildImageCmd buildImageCmd) {
-        buildImageCmd.withTag(this.getDockerImageName());
+        buildImageCmd.withTags(Collections.singleton(getDockerImageName()));
         this.dockerFilePath.ifPresent(buildImageCmd::withDockerfilePath);
         this.dockerfile.ifPresent(p -> {
                 buildImageCmd.withDockerfile(p.toFile());
@@ -188,27 +190,40 @@ protected void configure(BuildImageCmd buildImageCmd) {
     }
 
     private void prePullDependencyImages(Set<String> imagesToPull) {
-        final DockerClient dockerClient = DockerClientFactory.instance().client();
-
         imagesToPull.forEach(imageName -> {
+            String resolvedImageName = applyBuildArgsToImageName(imageName);
             try {
                 log.info(
                     "Pre-emptively checking local images for '{}', referenced via a Dockerfile. If not available, it will be pulled.",
-                    imageName
+                    resolvedImageName
                 );
-                new RemoteDockerImage(DockerImageName.parse(imageName))
+                new RemoteDockerImage(DockerImageName.parse(resolvedImageName))
                     .withImageNameSubstitutor(ImageNameSubstitutor.noop())
                     .get();
             } catch (Exception e) {
                 log.warn(
                     "Unable to pre-fetch an image ({}) depended upon by Dockerfile - image build will continue but may fail. Exception message was: {}",
-                    imageName,
+                    resolvedImageName,
                     e.getMessage()
                 );
             }
         });
     }
 
+    /**
+     * See {@code filterForEnvironmentVars()} in {@link com.github.dockerjava.core.dockerfile.DockerfileStatement}.
+     */
+    private String applyBuildArgsToImageName(String imageName) {
+        for (Map.Entry<String, String> entry : buildArgs.entrySet()) {
+            String value = Matcher.quoteReplacement(entry.getValue());
+            // handle: $VARIABLE case
+            imageName = imageName.replace("$" + entry.getKey(), value);
+            // handle ${VARIABLE} case
+            imageName = imageName.replace("${" + entry.getKey() + "}", value);
+        }
+        return imageName;
+    }
+
     public ImageFromDockerfile withBuildArg(final String key, final String value) {
         this.buildArgs.put(key, value);
         return this;
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
index c45233ea390..b2c7075f4d2 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
@@ -8,6 +8,8 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,6 +24,13 @@ public class DockerfileBuildTest {
 
     @Parameterized.Parameters
     public static Object[][] parameters() {
+        Map<String, String> buildArgs = new HashMap<>(4);
+        buildArgs.put("BUILD_IMAGE", "alpine:3.16");
+        buildArgs.put("BASE_IMAGE", "alpine");
+        buildArgs.put("BASE_IMAGE_TAG", "3.12");
+        buildArgs.put("UNUSED", "ignored");
+
+        //noinspection deprecation
         return new Object[][] {
             // Dockerfile build without explicit per-file inclusion
             new Object[] {
@@ -38,7 +47,7 @@ public static Object[][] parameters() {
                 "test4567",
                 new ImageFromDockerfile().withFileFromPath(".", RESOURCE_PATH).withDockerfilePath("./Dockerfile-alt"),
             },
-            // Dockerfile build using build args
+            // Dockerfile build using withBuildArg()
             new Object[] {
                 "test7890",
                 new ImageFromDockerfile()
@@ -46,6 +55,14 @@ public static Object[][] parameters() {
                     .withDockerfilePath("./Dockerfile-buildarg")
                     .withBuildArg("CUSTOM_ARG", "test7890"),
             },
+            // Dockerfile build using withBuildArgs() with build args in FROM statement
+            new Object[] {
+                "test1234",
+                new ImageFromDockerfile()
+                    .withFileFromPath(".", RESOURCE_PATH)
+                    .withDockerfile(RESOURCE_PATH.resolve("Dockerfile-from-buildarg"))
+                    .withBuildArgs(buildArgs),
+            },
             // Dockerfile build using withDockerfile(File)
             new Object[] {
                 "test4567",
@@ -64,7 +81,7 @@ public DockerfileBuildTest(String expectedFileContent, ImageFromDockerfile image
     @Test
     public void performTest() {
         try (
-            final GenericContainer container = new GenericContainer(image)
+            final GenericContainer<?> container = new GenericContainer<>(image)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
                 .withCommand("cat", "/test.txt")
         ) {
diff --git a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
index abc05eb567c..b761d984187 100644
--- a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
@@ -32,6 +32,7 @@ public void shouldNotAddSessionLabelIfDeleteOnExitIsFalse() {
         )
             .withDockerfileFromBuilder(it -> it.from("scratch"));
         String imageId = image.resolve();
+
         DockerClient dockerClient = DockerClientFactory.instance().client();
 
         try {
diff --git a/core/src/test/resources/dockerfile-build-test/Dockerfile-from-buildarg b/core/src/test/resources/dockerfile-build-test/Dockerfile-from-buildarg
new file mode 100644
index 00000000000..16934b374e8
--- /dev/null
+++ b/core/src/test/resources/dockerfile-build-test/Dockerfile-from-buildarg
@@ -0,0 +1,9 @@
+ARG BUILD_IMAGE
+ARG BASE_IMAGE
+ARG BASE_IMAGE_TAG
+
+FROM ${BUILD_IMAGE} AS build
+COPY localfile.txt /test-build.txt
+
+FROM $BASE_IMAGE:${BASE_IMAGE_TAG} AS base
+COPY --from=build /test-build.txt /test.txt

From be5966e0363b016489ed8757fbea10582bd89dac Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 11:38:09 -0500
Subject: [PATCH 3808/4969] [create-pull-request] automated change (#8958)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index b3e0e16d342..5fd93a9fee6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -133,4 +133,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.19.8
+    latest_version: 1.20.0

From 7713224ab6bf6f50c90447da1b184d76e754c5d9 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <121591679+tylerbertrand@users.noreply.github.com>
Date: Mon, 22 Jul 2024 15:33:03 -0500
Subject: [PATCH 3809/4969] Use Develocity build cache configuration and access
 key authentication (#8964)

---
 .github/workflows/ci.yml   | 3 +--
 examples/settings.gradle   | 9 ++-------
 settings.gradle            | 9 ++-------
 smoke-test/settings.gradle | 9 ++-------
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fccc9caab04..fcdebaee5cc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,8 +43,7 @@ permissions:
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   core:
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 577a4298c7b..8aed2430fb5 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -43,14 +43,9 @@ buildCache {
     local {
         enabled = !isCI
     }
-    remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+    remote(develocity.buildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
         enabled = true
-        url = 'https://ge.testcontainers.org/cache/'
-        credentials {
-            username = 'ci'
-            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
-        }
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 69d0e489a9a..d60d222c079 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -40,14 +40,9 @@ buildCache {
     local {
         enabled = !isCI
     }
-    remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+    remote(develocity.buildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
         enabled = true
-        url = 'https://ge.testcontainers.org/cache/'
-        credentials {
-            username = 'ci'
-            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
-        }
     }
 }
 
diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle
index 8642e528279..e79fb0d5c94 100644
--- a/smoke-test/settings.gradle
+++ b/smoke-test/settings.gradle
@@ -27,14 +27,9 @@ buildCache {
     local {
         enabled = !isCI
     }
-    remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+    remote(develocity.buildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
         enabled = true
-        url = 'https://ge.testcontainers.org/cache/'
-        credentials {
-            username = 'ci'
-            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
-        }
     }
 }
 

From ad0fa5b43b14d0499051fe1e91dd3ecdb17aa86d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:36:50 +0000
Subject: [PATCH 3810/4969] Bump org.junit.jupiter:junit-jupiter in /smoke-test

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 smoke-test/turbo-mode/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index a84c1d5fb48..af0f5d84e4d 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

From 6aca9c701fd43c4bd810a7d2821985c73bc9f3c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:36:55 +0000
Subject: [PATCH 3811/4969] Bump com.google.guava:guava from 32.1.2-jre to
 33.2.1-jre in /smoke-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 33.2.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0ff82406c5c..acdb53fab4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:32.1.2-jre'
+        classpath 'com.google.guava:guava:33.2.1-jre'
         classpath 'com.github.tjni.captainhook:captain-hook:0.1.5'
     }
 }

From 00b7a0fbff74a431dc0309325c650a7f2346b386 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:36:57 +0000
Subject: [PATCH 3812/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /smoke-test

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index d6f3e3089bf..817d803fd53 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.25.3'

From be7b5d5a5bcb310b118bc9dc5ff1e64db76864d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:05:11 +0000
Subject: [PATCH 3813/4969] Bump io.cucumber:cucumber-bom from 7.15.0 to 7.18.1
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.15.0 to 7.18.1.
- [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/v7.15.0...v7.18.1)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 9080bb647ae..546e06f841d 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
-    testImplementation platform('io.cucumber:cucumber-bom:7.15.0')
+    testImplementation platform('io.cucumber:cucumber-bom:7.18.1')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'

From 8a08cf88c121829f6f9e597f2bcec4c2c1346a4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:08:55 +0000
Subject: [PATCH 3814/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.4.0 to 3.4.1.
- [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/3.4.0...3.4.1)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 89b6a2013af..fa47370764e 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.4.0'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.4.1'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 00cea77de0c6a172db882a80ce4537e1724dddab Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 16:20:22 -0600
Subject: [PATCH 3815/4969] [create-pull-request] automated change (#8959)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ad6298ca260..0ce8bd1df0a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.19.8
+testcontainers.version=1.20.0

From 8491ffda8f641a7bd81cbfef68eb90045d25992b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:25:16 +0000
Subject: [PATCH 3816/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.726 to 1.12.763.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.726...1.12.763)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 a0c132bc6f8..0d512955cf2 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.763'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.763'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From bd06a882b50426e69508176acacb5f265ef15391 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:28:50 +0000
Subject: [PATCH 3817/4969] Bump github/combine-prs from 5.0.0 to 5.1.0

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index c5faddc0505..e8f34878405 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v5.0.0
+        uses: github/combine-prs@v5.1.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From bb8e3c69d900c2f5ed9a124683e8320c83273180 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:30:16 +0000
Subject: [PATCH 3818/4969] Bump org.apache.commons:commons-lang3 in
 /modules/hivemq

Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 225b26b3632..739cc4101dd 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:24.1.0")
 
-    shaded("org.apache.commons:commons-lang3:3.14.0")
+    shaded("org.apache.commons:commons-lang3:3.15.0")
     shaded("commons-io:commons-io:2.16.1")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")

From 6744a6f464cb1687d52a55e72f8a47ba7d734317 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:30:59 +0000
Subject: [PATCH 3819/4969] Bump io.rest-assured:rest-assured from 5.4.0 to
 5.5.0 in /core

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 6d8b637af0e..2a18522f437 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -121,7 +121,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"

From 098d6270d4fecc8cab0ad55efa3f1d42b9fa9ed9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:37:13 +0000
Subject: [PATCH 3820/4969] Bump com.yugabyte:jdbc-yugabytedb in
 /modules/yugabytedb

Bumps [com.yugabyte:jdbc-yugabytedb](https://github.com/yugabyte/pgjdbc) from 42.3.5-yb-4 to 42.3.5-yb-6.
- [Release notes](https://github.com/yugabyte/pgjdbc/releases)
- [Changelog](https://github.com/yugabyte/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yugabyte/pgjdbc/compare/v42.3.5-yb-4...v42.3.5-yb-6)

---
updated-dependencies:
- dependency-name: com.yugabyte:jdbc-yugabytedb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index 2ab71ef9cc6..cb5d583b4ca 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.15.0-yb-2-TESTFIX.0'
     // YSQL driver
-    testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-4'
+    testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-6'
 }

From 2a4fd21cc5e42761c8ea4403ac00cd4fa0f49e49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:42:54 +0000
Subject: [PATCH 3821/4969] Bump org.apache.commons:commons-lang3 in
 /modules/jdbc-test

Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d6c455992cf..16f3b5d8d4f 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
 
     api 'com.google.guava:guava:33.2.0-jre'
-    api 'org.apache.commons:commons-lang3:3.14.0'
+    api 'org.apache.commons:commons-lang3:3.15.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 

From 5b425cc36d7f680eba072d79b66ffc61a81d03d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:43:08 +0000
Subject: [PATCH 3822/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.17.4 to 3.17.6.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d60d222c079..ba107a86f7a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.4"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.6"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.1"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }

From b83cf140408feea8650bf5bcc2dabef982d6df4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:59:14 +0000
Subject: [PATCH 3823/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.29 to 3.2.32.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.29...3.2.32)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 881186d91ef..cbd894304d4 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.29"
+    api "com.orientechnologies:orientdb-client:3.2.32"
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'

From 84f4175ffdd89ed10ec09e0c379c48703362a1a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:59:19 +0000
Subject: [PATCH 3824/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.26 to 3.2.32.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.26...3.2.32)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 881186d91ef..2d3967c4c50 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.26"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.32"
 }

From aa0502ad9d974f26f54c8e3a9f9759e2fef12886 Mon Sep 17 00:00:00 2001
From: He Wang <wanghechn@qq.com>
Date: Wed, 24 Jul 2024 04:42:08 +0800
Subject: [PATCH 3825/4969] Support tenant name, password and mode in OceanBase
 module (#8737)

---
 docs/modules/databases/jdbc.md                |  2 +-
 .../oceanbase/OceanBaseCEContainer.java       | 74 +++++++++++++++++--
 .../OceanBaseCEContainerProvider.java         |  2 +-
 .../oceanbase/SimpleOceanBaseCETest.java      |  4 +-
 4 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 947f4e1a810..3c92e8a99ad 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -57,7 +57,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using OceanBase
 
-`jdbc:tc:oceanbasece:4.2.2:///databasename`
+`jdbc:tc:oceanbasece:4.2.1-lts:///databasename`
 
 #### Using Oracle
 
diff --git a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java
index 6c08ff165f2..fae9190ceb0 100644
--- a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java
+++ b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.oceanbase;
 
 import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -26,14 +27,20 @@ public class OceanBaseCEContainer extends JdbcDatabaseContainer<OceanBaseCEConta
 
     private static final Integer RPC_PORT = 2882;
 
-    private static final String DEFAULT_TEST_TENANT_NAME = "test";
+    private static final String DEFAULT_TENANT_NAME = "test";
 
-    private static final String DEFAULT_USERNAME = "root";
+    private static final String DEFAULT_USER = "root";
 
     private static final String DEFAULT_PASSWORD = "";
 
     private static final String DEFAULT_DATABASE_NAME = "test";
 
+    private Mode mode = Mode.SLIM;
+
+    private String tenantName = DEFAULT_TENANT_NAME;
+
+    private String password = DEFAULT_PASSWORD;
+
     public OceanBaseCEContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -43,6 +50,29 @@ public OceanBaseCEContainer(DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPorts(SQL_PORT, RPC_PORT);
+        setWaitStrategy(Wait.forLogMessage(".*boot success!.*", 1));
+    }
+
+    @Override
+    protected void configure() {
+        addEnv("MODE", mode.name().toLowerCase());
+
+        if (!DEFAULT_TENANT_NAME.equals(tenantName)) {
+            if (mode == Mode.SLIM) {
+                logger().warn("The tenant name is not configurable on slim mode, so this option will be ignored.");
+                // reset the tenant name to ensure the constructed username is correct
+                tenantName = DEFAULT_TENANT_NAME;
+            } else {
+                addEnv("OB_TENANT_NAME", tenantName);
+            }
+        }
+
+        addEnv("OB_TENANT_PASSWORD", password);
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
     }
 
     @Override
@@ -64,19 +94,49 @@ public String getDatabaseName() {
 
     @Override
     public String getUsername() {
-        // In OceanBase, the jdbc username is related to the name of user, tenant and cluster,
-        // if a tenant name other than the default value 'test' is used, you should manually
-        // construct the jdbc username by yourself.
-        return DEFAULT_USERNAME + "@" + DEFAULT_TEST_TENANT_NAME;
+        return DEFAULT_USER + "@" + tenantName;
     }
 
     @Override
     public String getPassword() {
-        return DEFAULT_PASSWORD;
+        return password;
     }
 
     @Override
     protected String getTestQueryString() {
         return "SELECT 1";
     }
+
+    public OceanBaseCEContainer withMode(Mode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    public OceanBaseCEContainer withTenantName(String tenantName) {
+        this.tenantName = tenantName;
+        return this;
+    }
+
+    public OceanBaseCEContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    public enum Mode {
+        /**
+         * Use as much hardware resources as possible for deployment by default,
+         * and all environment variables are available.
+         */
+        NORMAL,
+        /**
+         * Use the minimum hardware resources for deployment by default,
+         * and all environment variables are available.
+         */
+        MINI,
+        /**
+         * Use minimal hardware resources and pre-built deployment files for quick startup,
+         * and password of user tenant is the only available environment variable.
+         */
+        SLIM,
+    }
 }
diff --git a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
index d0f651bc338..36c260ead37 100644
--- a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
+++ b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
@@ -9,7 +9,7 @@
  */
 public class OceanBaseCEContainerProvider extends JdbcDatabaseContainerProvider {
 
-    private static final String DEFAULT_TAG = "4.2.2";
+    private static final String DEFAULT_TAG = "4.2.1-lts";
 
     @Override
     public boolean supports(String databaseType) {
diff --git a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
index 7c4f20e4943..efe7ead90bd 100644
--- a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
+++ b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
@@ -19,9 +19,7 @@ public class SimpleOceanBaseCETest extends AbstractContainerDatabaseTest {
 
     @SuppressWarnings("resource")
     private OceanBaseCEContainer testContainer() {
-        return ((OceanBaseCEContainer) containerProvider.newInstance()).withEnv("MODE", "slim")
-            .withEnv("FASTBOOT", "true")
-            .withLogConsumer(new Slf4jLogConsumer(logger));
+        return ((OceanBaseCEContainer) containerProvider.newInstance()).withLogConsumer(new Slf4jLogConsumer(logger));
     }
 
     @Test

From fa10d00f163071e4a7664966805fc2b554331432 Mon Sep 17 00:00:00 2001
From: Raja Kolli <rajadilipkolli@gmail.com>
Date: Wed, 24 Jul 2024 06:54:52 +0530
Subject: [PATCH 3826/4969] Fix log for Grafana URL (#8961)

---
 .../java/org/testcontainers/grafana/LgtmStackContainer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
index 218b37c0da0..080be6d6eaf 100644
--- a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
+++ b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
@@ -47,7 +47,7 @@ public LgtmStackContainer(DockerImageName image) {
 
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        log.info("Access to the Grafana dashboard: {}", getOtlpHttpUrl());
+        log.info("Access to the Grafana dashboard: {}", getGrafanaHttpUrl());
     }
 
     public String getOtlpGrpcUrl() {
@@ -61,4 +61,8 @@ public String getOtlpHttpUrl() {
     public String getPromehteusHttpUrl() {
         return "http://" + getHost() + ":" + getMappedPort(PROMETHEUS_PORT);
     }
+
+    public String getGrafanaHttpUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(GRAFANA_PORT);
+    }
 }

From 4e10c9a6df3845f2c0a4f5d08650d780288a92ae Mon Sep 17 00:00:00 2001
From: Maarten Vercruysse <67873169+MV-GH@users.noreply.github.com>
Date: Wed, 24 Jul 2024 03:27:37 +0200
Subject: [PATCH 3827/4969] Fix list indentation in reuse doc (#8980)

---
 docs/features/reuse.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/features/reuse.md b/docs/features/reuse.md
index f7d8062138c..884f3d5ac33 100644
--- a/docs/features/reuse.md
+++ b/docs/features/reuse.md
@@ -17,10 +17,9 @@ opt-in mechanism per environment. To reuse a container, the container configurat
 ## How to use it
 
 * Enable `Reusable Containers` 
-  * through environment variable `TESTCONTAINERS_REUSE_ENABLE=true` 
-  * through user property file `~/.testcontainers.properties`, by adding `testcontainers.reuse.enable=true` 
-  * **not** through classpath properties file [see this comment](https://github.com/testcontainers/testcontainers-java/issues/5364#issuecomment-1125907734)
-
+    * through environment variable `TESTCONTAINERS_REUSE_ENABLE=true` 
+    * through user property file `~/.testcontainers.properties`, by adding `testcontainers.reuse.enable=true` 
+    * **not** through classpath properties file [see this comment](https://github.com/testcontainers/testcontainers-java/issues/5364#issuecomment-1125907734)
 * Define a container and subscribe to reuse the container using `withReuse(true)`
 
 ```java

From e072601b3ad46b815c7af4593f3898056d6e863f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 23 Jul 2024 21:45:39 -0500
Subject: [PATCH 3828/4969] Ignore logback-classic and spotless updates in
 smoke-test

---
 .github/dependabot.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0eea5afdd43..93157606024 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -376,13 +376,18 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-minor" ]
-  
+
   # Smoke test
   - package-ecosystem: "gradle"
     directory: "/smoke-test"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "ch.qos.logback:logback-classic"
+        update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "com.diffplug.spotless"
+        update-types: [ "version-update:semver-minor" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From d2f382615ca3dfb715268e20527e0c6ce3e62c3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 02:47:15 +0000
Subject: [PATCH 3829/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.6.2 to 3.7.1.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.6.2...java-client-3.7.1)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 89dccfa7202..aaa12f01fb0 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.6.2'
+    testImplementation 'com.couchbase.client:java-client:3.7.1'
     testImplementation 'org.awaitility:awaitility:4.2.1'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 83b75014a34481dd84eb687e8a2d89bfd7d2efff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 02:47:22 +0000
Subject: [PATCH 3830/4969] Bump io.weaviate:client from 4.7.0 to 4.8.1 in
 /modules/weaviate

Bumps [io.weaviate:client](https://github.com/weaviate/java-client) from 4.7.0 to 4.8.1.
- [Release notes](https://github.com/weaviate/java-client/releases)
- [Commits](https://github.com/weaviate/java-client/compare/4.7.0...4.8.1)

---
updated-dependencies:
- dependency-name: io.weaviate:client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 0a607187c79..40d1b89b96d 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation 'io.weaviate:client:4.7.0'
+    testImplementation 'io.weaviate:client:4.8.1'
 }

From 67c1f1be67d16d471ae4543c695232a5cfdc1e3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 02:54:30 +0000
Subject: [PATCH 3831/4969] Bump org.assertj:assertj-core in
 /modules/clickhouse

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 6745e1443c0..fadec21f17e 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 606fa4a8b3666e57c94e991ded00fbcfab3c4a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 24 Jul 2024 01:54:29 -0500
Subject: [PATCH 3832/4969] Fix labels for compose

---
 .github/labeler.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0e33e98096e..f449a11685d 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -5,6 +5,10 @@
       - core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
       - core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
       - core/src/main/java/org/testcontainers/containers/DockerComposeFiles.java
+      - core/src/test/java/org/testcontainers/containers/Compose*Test.java
+      - core/src/test/java/org/testcontainers/containers/DockerCompose*Test.java
+      - core/src/test/java/org/testcontainers/junit/Compose*Test.java
+      - core/src/test/java/org/testcontainers/junit/DockerCompose*Test.java
 "github_actions":
   - changed-files:
     - any-glob-to-any-file:

From 6f303a87eb4ed1dbc046fd70c9e5b2d0f277ada6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 24 Jul 2024 00:58:24 -0600
Subject: [PATCH 3833/4969] Move ComposeOverridesTest (#8985)

---
 .../testcontainers/{ => containers}/ComposeOverridesTest.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename core/src/test/java/org/testcontainers/{ => containers}/ComposeOverridesTest.java (97%)

diff --git a/core/src/test/java/org/testcontainers/ComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
similarity index 97%
rename from core/src/test/java/org/testcontainers/ComposeOverridesTest.java
rename to core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
index f5a384a3c37..553ac21a8a0 100644
--- a/core/src/test/java/org/testcontainers/ComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers;
+package org.testcontainers.containers;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.apache.commons.lang3.SystemUtils;
@@ -9,7 +9,6 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.utility.CommandLine;
 
 import java.io.BufferedReader;

From 5bd94ab7dcae2c9fbde784d4d9795dfbad5c993b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 24 Jul 2024 00:59:52 -0600
Subject: [PATCH 3834/4969] Fix log order after checking containerised compose
 exit code (#8984)

Fixes #7963
---
 .../containers/ContainerisedDockerCompose.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java b/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
index 7cff2c77271..7d6e60df29f 100644
--- a/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
+++ b/core/src/main/java/org/testcontainers/containers/ContainerisedDockerCompose.java
@@ -83,18 +83,16 @@ public ContainerisedDockerCompose(
     public void invoke() {
         super.start();
 
-        this.followOutput(new Slf4jLogConsumer(logger()));
+        followOutput(new Slf4jLogConsumer(logger()));
 
         // wait for the compose container to stop, which should only happen after it has spawned all the service containers
-        logger()
-            .info("Docker Compose container is running for command: {}", Joiner.on(" ").join(this.getCommandParts()));
-        while (this.isRunning()) {
+        logger().info("Docker Compose container is running for command: {}", Joiner.on(" ").join(getCommandParts()));
+        while (isRunning()) {
             logger().trace("Compose container is still running");
             Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
         }
-        logger().info("Docker Compose has finished running");
 
-        AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
+        AuditLogger.doComposeLog(getCommandParts(), getEnv());
 
         final Integer exitCode = getDockerClient()
             .inspectContainerCmd(getContainerId())
@@ -107,9 +105,11 @@ public void invoke() {
                 "Containerised Docker Compose exited abnormally with code " +
                 exitCode +
                 " whilst running command: " +
-                StringUtils.join(this.getCommandParts(), ' ')
+                StringUtils.join(getCommandParts(), ' ')
             );
         }
+
+        logger().info("Docker Compose has finished running");
     }
 
     private String convertToUnixFilesystemPath(String path) {

From daf44c454ef6b0507b2138c1bbfcab83cb35c11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jedli=C4=8Dka?= <jakub.jedla.jedlicka@gmail.com>
Date: Thu, 25 Jul 2024 00:50:30 +0200
Subject: [PATCH 3835/4969] Rename SA_PASSWORD to MSSQL_SA_PASSWORD as
 SA_PASSWORD is deprecated (#8987)

---
 .../org/testcontainers/containers/MSSQLServerContainer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 51ee7989f33..6e902656bb2 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -78,7 +78,7 @@ protected void configure() {
             acceptLicense();
         }
 
-        addEnv("SA_PASSWORD", password);
+        addEnv("MSSQL_SA_PASSWORD", password);
     }
 
     /**

From 835ae9bfd2196b73aeb0655d1891e695ab271ce5 Mon Sep 17 00:00:00 2001
From: David Nault <dnault@users.noreply.github.com>
Date: Wed, 24 Jul 2024 22:09:21 -0700
Subject: [PATCH 3836/4969] Couchbase: Don't configure external TLS ports if
 they're not supported (#8990)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8989

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../couchbase/CouchbaseContainer.java         | 54 ++++++++++++++---
 .../couchbase/CouchbaseContainerTest.java     | 59 ++++++++-----------
 2 files changed, 72 insertions(+), 41 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 5e9a4b45f4d..25e7637bbaf 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -123,6 +123,8 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private boolean isEnterprise = false;
 
+    private boolean hasTlsPorts = false;
+
     /**
      * Creates a new couchbase container with the default image and version.
      * @deprecated use {@link #CouchbaseContainer(DockerImageName)} instead
@@ -345,6 +347,7 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo)
 
         timePhase("waitUntilNodeIsOnline", this::waitUntilNodeIsOnline);
         timePhase("initializeIsEnterprise", this::initializeIsEnterprise);
+        timePhase("initializeHasTlsPorts", this::initializeHasTlsPorts);
         timePhase("renameNode", this::renameNode);
         timePhase("initializeServices", this::initializeServices);
         timePhase("setMemoryQuotas", this::setMemoryQuotas);
@@ -394,6 +397,31 @@ private void initializeIsEnterprise() {
         }
     }
 
+    /**
+     * Initializes the {@link #hasTlsPorts} flag.
+     * <p>
+     * Community Edition might support TLS one happy day, so use a "supports TLS" flag separate from
+     * the "enterprise edition" flag.
+     */
+    private void initializeHasTlsPorts() {
+        @Cleanup
+        Response response = doHttpRequest(MGMT_PORT, "/pools/default/nodeServices", "GET", null, true);
+
+        try {
+            String clusterTopology = response.body().string();
+            hasTlsPorts =
+                !MAPPER
+                    .readTree(clusterTopology)
+                    .path("nodesExt")
+                    .path(0)
+                    .path("services")
+                    .path("mgmtSSL")
+                    .isMissingNode();
+        } catch (IOException e) {
+            throw new IllegalStateException("Couchbase /pools/default/nodeServices did not return valid JSON");
+        }
+    }
+
     /**
      * Rebinds/renames the internal hostname.
      * <p>
@@ -503,33 +531,45 @@ private void configureExternalPorts() {
         final FormBody.Builder builder = new FormBody.Builder();
         builder.add("hostname", getHost());
         builder.add("mgmt", Integer.toString(getMappedPort(MGMT_PORT)));
-        builder.add("mgmtSSL", Integer.toString(getMappedPort(MGMT_SSL_PORT)));
+        if (hasTlsPorts) {
+            builder.add("mgmtSSL", Integer.toString(getMappedPort(MGMT_SSL_PORT)));
+        }
 
         if (enabledServices.contains(CouchbaseService.KV)) {
             builder.add("kv", Integer.toString(getMappedPort(KV_PORT)));
-            builder.add("kvSSL", Integer.toString(getMappedPort(KV_SSL_PORT)));
             builder.add("capi", Integer.toString(getMappedPort(VIEW_PORT)));
-            builder.add("capiSSL", Integer.toString(getMappedPort(VIEW_SSL_PORT)));
+            if (hasTlsPorts) {
+                builder.add("kvSSL", Integer.toString(getMappedPort(KV_SSL_PORT)));
+                builder.add("capiSSL", Integer.toString(getMappedPort(VIEW_SSL_PORT)));
+            }
         }
 
         if (enabledServices.contains(CouchbaseService.QUERY)) {
             builder.add("n1ql", Integer.toString(getMappedPort(QUERY_PORT)));
-            builder.add("n1qlSSL", Integer.toString(getMappedPort(QUERY_SSL_PORT)));
+            if (hasTlsPorts) {
+                builder.add("n1qlSSL", Integer.toString(getMappedPort(QUERY_SSL_PORT)));
+            }
         }
 
         if (enabledServices.contains(CouchbaseService.SEARCH)) {
             builder.add("fts", Integer.toString(getMappedPort(SEARCH_PORT)));
-            builder.add("ftsSSL", Integer.toString(getMappedPort(SEARCH_SSL_PORT)));
+            if (hasTlsPorts) {
+                builder.add("ftsSSL", Integer.toString(getMappedPort(SEARCH_SSL_PORT)));
+            }
         }
 
         if (enabledServices.contains(CouchbaseService.ANALYTICS)) {
             builder.add("cbas", Integer.toString(getMappedPort(ANALYTICS_PORT)));
-            builder.add("cbasSSL", Integer.toString(getMappedPort(ANALYTICS_SSL_PORT)));
+            if (hasTlsPorts) {
+                builder.add("cbasSSL", Integer.toString(getMappedPort(ANALYTICS_SSL_PORT)));
+            }
         }
 
         if (enabledServices.contains(CouchbaseService.EVENTING)) {
             builder.add("eventingAdminPort", Integer.toString(getMappedPort(EVENTING_PORT)));
-            builder.add("eventingSSL", Integer.toString(getMappedPort(EVENTING_SSL_PORT)));
+            if (hasTlsPorts) {
+                builder.add("eventingSSL", Integer.toString(getMappedPort(EVENTING_SSL_PORT)));
+            }
         }
 
         @Cleanup
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 691dc1307ef..b78e3666f31 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -22,7 +22,6 @@
 import com.couchbase.client.java.json.JsonObject;
 import org.junit.Test;
 import org.testcontainers.containers.ContainerLaunchException;
-import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.util.function.Consumer;
@@ -33,51 +32,43 @@
 
 public class CouchbaseContainerTest {
 
-    private static final DockerImageName COUCHBASE_IMAGE_ENTERPRISE = DockerImageName.parse(
-        "couchbase/server:enterprise-7.0.3"
-    );
+    private static final String COUCHBASE_IMAGE_ENTERPRISE = "couchbase/server:enterprise-7.0.3";
 
-    private static final DockerImageName COUCHBASE_IMAGE_COMMUNITY = DockerImageName.parse(
-        "couchbase/server:community-7.0.2"
-    );
+    private static final String COUCHBASE_IMAGE_ENTERPRISE_RECENT = "couchbase/server:enterprise-7.6.2";
 
-    @Test
-    public void testBasicContainerUsageForEnterpriseContainer() {
-        // bucket_definition {
-        BucketDefinition bucketDefinition = new BucketDefinition("mybucket");
-        // }
-
-        try (
-            // container_definition {
-            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_ENTERPRISE)
-                .withBucket(bucketDefinition)
-            // }
-        ) {
-            setUpClient(
-                container,
-                cluster -> {
-                    Bucket bucket = cluster.bucket(bucketDefinition.getName());
-                    bucket.waitUntilReady(Duration.ofSeconds(10L));
+    private static final String COUCHBASE_IMAGE_COMMUNITY = "couchbase/server:community-7.0.2";
 
-                    Collection collection = bucket.defaultCollection();
-
-                    collection.upsert("foo", JsonObject.create().put("key", "value"));
+    private static final String COUCHBASE_IMAGE_COMMUNITY_RECENT = "couchbase/server:community-7.6.2";
 
-                    JsonObject fooObject = collection.get("foo").contentAsObject();
+    @Test
+    public void testBasicContainerUsageForEnterpriseContainer() {
+        testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE);
+    }
 
-                    assertThat(fooObject.getString("key")).isEqualTo("value");
-                }
-            );
-        }
+    @Test
+    public void testBasicContainerUsageForEnterpriseContainerRecent() {
+        testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE_RECENT);
     }
 
     @Test
     public void testBasicContainerUsageForCommunityContainer() {
+        testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY);
+    }
+
+    @Test
+    public void testBasicContainerUsageForCommunityContainerRecent() {
+        testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY_RECENT);
+    }
+
+    private void testBasicContainerUsage(String couchbaseImage) {
+        // bucket_definition {
         BucketDefinition bucketDefinition = new BucketDefinition("mybucket");
+        // }
 
         try (
-            CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
-                .withBucket(bucketDefinition)
+            // container_definition {
+            CouchbaseContainer container = new CouchbaseContainer(couchbaseImage).withBucket(bucketDefinition)
+            // }
         ) {
             setUpClient(
                 container,

From 107bc61c1c07e1b7c528062eb346d90eddd8e8fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 06:26:01 +0000
Subject: [PATCH 3837/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit5) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 af1b5aa1d15..399accd7f2b 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.3'
 
     testCompileOnly 'org.jetbrains:annotations:24.1.0'
 }

From c4232bf958be877ee8b236b4c2d897c8cd0fb682 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 06:29:07 +0000
Subject: [PATCH 3838/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.25.56 to 2.26.24.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 e434d84422a..e727d5d5d44 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.25.56'
+    testImplementation 'software.amazon.awssdk:s3:2.26.24'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From d061a0374965986ec0b56b4e2c3ec7c011937bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 25 Jul 2024 00:54:59 -0600
Subject: [PATCH 3839/4969] Do not override LocalStack command (#8991)

---
 .../containers/localstack/LocalStackContainer.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index e63ee24cff7..b9a88e96102 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -123,8 +123,13 @@ public LocalStackContainer(final DockerImageName dockerImageName, boolean useLeg
 
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
-        withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("sh"));
-        setCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.withEntrypoint(
+                "sh",
+                "-c",
+                "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT
+            );
+        });
     }
 
     private static boolean isVersion2(String version) {

From b08a23291b8686071b049a8b26eb7dc6014d9bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 25 Jul 2024 08:37:23 -0600
Subject: [PATCH 3840/4969] Add support for Apache Kafka native image (#8993)

---
 .../org/testcontainers/kafka/KafkaContainer.java    |  6 ++++--
 .../testcontainers/kafka/KafkaContainerTest.java    | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
index 86759979cf7..7eb8fa18c8b 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -12,7 +12,7 @@
 /**
  * Testcontainers implementation for Apache Kafka.
  * <p>
- * Supported image: {@code apache/kafka}
+ * Supported image: {@code apache/kafka}, {@code apache/kafka-native}
  * <p>
  * Exposed ports: 9092
  */
@@ -20,6 +20,8 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apache/kafka");
 
+    private static final DockerImageName APACHE_KAFKA_NATIVE_IMAGE_NAME = DockerImageName.parse("apache/kafka-native");
+
     private static final int KAFKA_PORT = 9092;
 
     private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
@@ -34,7 +36,7 @@ public KafkaContainer(String imageName) {
 
     public KafkaContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, APACHE_KAFKA_NATIVE_IMAGE_NAME);
 
         withExposedPorts(KAFKA_PORT);
         withEnv("CLUSTER_ID", DEFAULT_CLUSTER_ID);
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
index d520cf33f7c..93cb4e6138d 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
@@ -1,13 +1,24 @@
 package org.testcontainers.kafka;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.testcontainers.AbstractKafka;
 
+@RunWith(Parameterized.class)
 public class KafkaContainerTest extends AbstractKafka {
 
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[] { "apache/kafka:3.7.0", "apache/kafka-native:3.8.0-rc3" };
+    }
+
+    @Parameterized.Parameter
+    public String imageName;
+
     @Test
     public void testUsage() throws Exception {
-        try (KafkaContainer kafka = new KafkaContainer("apache/kafka:3.7.0")) {
+        try (KafkaContainer kafka = new KafkaContainer(imageName)) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
         }

From d175c5c6a93d368183cb49df1ecfeb7745ad3e81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 15:11:44 +0000
Subject: [PATCH 3841/4969] Bump io.fabric8:kubernetes-client from 6.12.1 to
 6.13.0 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.12.1 to 6.13.0.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.12.1...v6.13.0)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 3d46e330847..c2d288c8b32 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.12.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.13.1'
     testImplementation 'io.kubernetes:client-java:20.0.1-legacy'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From df6d7c624511fd7b51b410d7dce45d26d10b604b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 15:44:02 +0000
Subject: [PATCH 3842/4969] Bump redis.clients:jedis from 5.1.2 to 5.1.3 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.2 to 5.1.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.2...v5.1.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3beaefa3cb5..f263bd958f2 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.1.2'
+    testImplementation 'redis.clients:jedis:5.1.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From ad7c6f29ad5247517c305bad2c8b6d98a3edf527 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:44 +0000
Subject: [PATCH 3843/4969] Bump io.minio:minio from 8.5.10 to 8.5.11 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.5.10 to 8.5.11.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.5.10...8.5.11)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 7b73ebaae77..21886053173 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.5.10")
+    testImplementation("io.minio:minio:8.5.11")
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From d33c39a6222b5d0fefa673404787ea7c0e2e726f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:46 +0000
Subject: [PATCH 3844/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /modules/neo4j

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.16 to 4.4.18.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.16...4.4.18)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 073c1f24b25..d70292361d1 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.16'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From eece120e9e4749cc1fa7ee05812a997a08e4bf89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:47 +0000
Subject: [PATCH 3845/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.7.0 to 3.7.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index af8bea88c05..36adc9ac65c 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.32'
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.7.1'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 }

From 81016b6f33c8b4e62f81d88aabab167fc34dbae4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:50 +0000
Subject: [PATCH 3846/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.7.0 to 3.7.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 11f72fce54a..97139db839b 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.7.1'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
 }

From d1750d864202e37f949e599f4b7b482ae661eac1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:53 +0000
Subject: [PATCH 3847/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.28.1 to 4.30.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.28.1...4.30.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 739cc4101dd..6cd30686f88 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.28.1")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.30.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.6")

From 84650462a04df4c2ad7ce67b0d86e43a53fc40b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:55 +0000
Subject: [PATCH 3848/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 739cc4101dd..e2d24dcde7f 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.28.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")

From 54693c312cfb68db7ddd3dc234d02c8d753a93e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:58 +0000
Subject: [PATCH 3849/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.26.24 to 2.26.25.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 e727d5d5d44..9d439ee8712 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.26.24'
+    testImplementation 'software.amazon.awssdk:s3:2.26.25'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

From 625c94f65dea02979c4f886d56c8502269cc1e4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:14:58 +0000
Subject: [PATCH 3850/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.33.0 to 2.35.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index ef3e8063ebd..49842bd274c 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.33.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.35.0"
 }
 
 test {

From d2acbe89e5aaa7be57992747d612d12d7f8df194 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:04 +0000
Subject: [PATCH 3851/4969] Bump io.qdrant:client from 1.9.1 to 1.10.0 in
 /modules/qdrant

Bumps [io.qdrant:client](https://github.com/qdrant/java-client) from 1.9.1 to 1.10.0.
- [Release notes](https://github.com/qdrant/java-client/releases)
- [Commits](https://github.com/qdrant/java-client/compare/v1.9.1...v1.10.0)

---
updated-dependencies:
- dependency-name: io.qdrant:client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 211efbb585f..8f7ddcfab2a 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'io.qdrant:client:1.9.1'
+    testImplementation 'io.qdrant:client:1.10.0'
     testImplementation platform('io.grpc:grpc-bom:1.65.1')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'

From f61f9672771b5d00aa773a0b8134a01751c1c552 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:07 +0000
Subject: [PATCH 3852/4969] Bump io.rest-assured:rest-assured from 5.4.0 to
 5.5.0 in /modules/consul

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index fcf57ac8082..b2e99d5578e 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 1929772e3601c627f4edf10069e9bc4a63903adf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:07 +0000
Subject: [PATCH 3853/4969] Bump com.azure:azure-cosmos from 4.60.0 to 4.62.0
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.60.0 to 4.62.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.60.0...azure-cosmos_4.62.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index c0306fbcadf..81931707562 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'com.azure:azure-cosmos:4.60.0'
+    testImplementation 'com.azure:azure-cosmos:4.62.0'
 }

From 118c39f0c58b479416f4dd4f80f9dadf0ce9b5b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:08 +0000
Subject: [PATCH 3854/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.23.0 to 10.24.1.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index f7ff8eec524..f2fb5bc0a39 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.2.1'
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.23.0'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.24.1'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From d87cf849865c3abdf28a79f52d2d9c656c20a7e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:09 +0000
Subject: [PATCH 3855/4969] Bump io.rest-assured:rest-assured in
 /modules/chromadb

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index 09ce354f1c0..bd6ae52d90f 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }

From cd51e2c17c3131e34fe78c17a05a99e5f3843792 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:10 +0000
Subject: [PATCH 3856/4969] Bump io.rest-assured:rest-assured from 5.4.0 to
 5.5.0 in /modules/vault

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 88c83619783..263dff37fbf 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 
 }

From 0ec08e59a2a6d57bb5763e358f888fa7a724c209 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:14 +0000
Subject: [PATCH 3857/4969] Bump io.rest-assured:rest-assured in
 /modules/redpanda

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index af8bea88c05..4072af434a5 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }

From 94e7f6f3e0d21d5b9e5a4dd091f06e1f3f630852 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:17 +0000
Subject: [PATCH 3858/4969] Bump io.rest-assured:rest-assured from 5.4.0 to
 5.5.0 in /modules/ollama

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index 7c2c940633d..b6054a1d3c2 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }

From 37f721be8e67a3e8d5f5edf819d9338d1e1bcacf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:17 +0000
Subject: [PATCH 3859/4969] Bump org.junit:junit-bom from 5.10.2 to 5.10.3 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 0c2afa77dee..46657aa7408 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.10.2')
+    implementation platform('org.junit:junit-bom:5.10.3')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')

From 5d7ae0dc79cb5cd37d5a9c58875f5dce618f1ec7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:19 +0000
Subject: [PATCH 3860/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.39.0 to 26.43.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.39.0...v26.43.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index ff8b723418f..cb55e466e22 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.39.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.43.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 1f249e2842c55152ac2ff256ca3dec1afbc977f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:22 +0000
Subject: [PATCH 3861/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.13.1 to 1.13.2.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.1...v1.13.2)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 5b914d086ec..41c900db9b5 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.1'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.2'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 }
 

From 8c7e8aa476000de690e1f699a852c175796a1d84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:32 +0000
Subject: [PATCH 3862/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/grafana

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 5b914d086ec..cc0dc5ace15 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Grafana"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.1'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'

From 6897b391699919446ec4d454f7bc82651a929ad1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:34 +0000
Subject: [PATCH 3863/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/milvus

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 76406164e7a..2f4c25b055a 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation('io.milvus:milvus-sdk-java:2.4.2') {
         exclude(group: 'org.testcontainers', module: 'milvus')
         exclude(group: 'org.testcontainers', module: 'junit-jupiter')

From 5d1e28e560cfad93146a28dd4eab59ac65bf669f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:39 +0000
Subject: [PATCH 3864/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/weaviate

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 40d1b89b96d..28bde7bbc44 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.weaviate:client:4.8.1'
 }

From 078feffb6085168b56b203259881f5c48927fc2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:47 +0000
Subject: [PATCH 3865/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/dynalite

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/dynalite/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
index 0d512955cf2..ef3689feb02 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.763'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.763'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From bffcb225db188b115a2311f677f0829506a83d88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:50 +0000
Subject: [PATCH 3866/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /examples

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle       | 2 +-
 docs/examples/junit4/redis/build.gradle         | 2 +-
 docs/examples/junit5/redis/build.gradle         | 2 +-
 examples/cucumber/build.gradle                  | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/linked-container/build.gradle          | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/neo4j-container/build.gradle           | 2 +-
 examples/ollama-hugging-face/build.gradle       | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/selenium-container/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/solr-container/build.gradle            | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 test-support/build.gradle                       | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index d900109b1c9..14fa146ed89 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.22.0"
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 73353512e03..f63c03c835f 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 817d803fd53..8b59fd296f7 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 546e06f841d..96da350b888 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index bdafe6e8857..62dd4347f84 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 41245b42428..82e3912fdc8 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 3444fce3251..58bb2053574 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
index 1febab7cdc2..327ffc270a2 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 374c00c9b8b..45f19e28300 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.18.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 16544de2d02..be39a73653f 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index e90846dfbc1..b086e18d9f4 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:ollama'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 383ba2b8d48..deaebcfe386 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testng:testng:7.5.1'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 79ebab4d131..f77f6d0c915 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 07ba6abd8d0..2f6d8efa901 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 16de7430814..f8374f71a8b 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 37f68bb5f0f..8f1ac850d47 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 61356829e52..b2edf66a582 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index fd0ec2a060b..881b645c5d9 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.6.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
diff --git a/test-support/build.gradle b/test-support/build.gradle
index d293570b0ad..6908ad63ace 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.36'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From eb46d1485497d576f0351f6c87078875a89b2571 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:50 +0000
Subject: [PATCH 3867/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2a18522f437..592377dc7d4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -120,13 +120,13 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.25.3'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.26.3'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 609abf0bef59236c2b904d950ddca20d576a22e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:16:05 +0000
Subject: [PATCH 3868/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/mongodb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 10f63aeae07..2a4c0b67063 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.2")
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From fbec66bc5e0931078bb4eb9d6309351187d8e1a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:16:07 +0000
Subject: [PATCH 3869/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.6 to 3.6.8.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.6.6...v3.6.8)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index f2debc68648..a1c68855d55 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.6'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.8'
     testFixturesImplementation 'org.assertj:assertj-core:3.26.3'
 }

From c1646e67d44f54189c76bb8c21e4ce46c118f60c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:16:07 +0000
Subject: [PATCH 3870/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.3
 in /modules/hivemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 739cc4101dd..3449d0598cb 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.6")
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {

From e54d9d3d81589b3cb5cec2535f28ad6663c1e758 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:16:17 +0000
Subject: [PATCH 3871/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /smoke-test

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 817d803fd53..b78c2e44ec3 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.3.1.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
     testImplementation project(":testcontainers")

From b6c5cb248812ff3f7f5d0d8f4523146f70668527 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:16:18 +0000
Subject: [PATCH 3872/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.26.3
 in /smoke-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 docs/examples/junit4/redis/build.gradle   | 2 +-
 docs/examples/junit5/redis/build.gradle   | 2 +-
 smoke-test/turbo-mode/build.gradle        | 2 +-
 test-support/build.gradle                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index d900109b1c9..14fa146ed89 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.22.0"
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 73353512e03..f63c03c835f 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 817d803fd53..8b59fd296f7 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index af0f5d84e4d..733b39a5a79 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 
 test {
diff --git a/test-support/build.gradle b/test-support/build.gradle
index d293570b0ad..6908ad63ace 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.36'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 57fb8aa27e268c7a0e6df7ae616b9ebb68f79947 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:16:22 +0000
Subject: [PATCH 3873/4969] Bump me.champeau.gradle.japicmp from 0.4.2 to 0.4.3
 in /smoke-test

Bumps me.champeau.gradle.japicmp from 0.4.2 to 0.4.3.

---
updated-dependencies:
- dependency-name: me.champeau.gradle.japicmp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index acdb53fab4f..2c1f63426d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id 'me.champeau.gradle.japicmp' version '0.4.2' apply false
+    id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
     id 'com.diffplug.spotless' version '6.13.0' apply false
 }
 

From 178b4cf44a713274091559e1f05fcfa90eb4f958 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:34:27 +0000
Subject: [PATCH 3874/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /examples

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.13 to 4.4.18.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.13...4.4.18)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index be39a73653f..4b25bc00d84 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'

From c749f948a3b690f2ebb7c662681d9dbef83efce3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:34:35 +0000
Subject: [PATCH 3875/4969] Bump org.projectlombok:lombok from 1.18.30 to
 1.18.34 in /examples

Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.30 to 1.18.34.
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.30...v1.18.34)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle  | 4 ++--
 examples/solr-container/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 58bb2053574..14892be5ff0 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.30"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
+    testCompileOnly "org.projectlombok:lombok:1.18.34"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.34"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index b2edf66a582..ea7a1dd8c8e 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.30"
-    annotationProcessor "org.projectlombok:lombok:1.18.30"
+    compileOnly "org.projectlombok:lombok:1.18.34"
+    annotationProcessor "org.projectlombok:lombok:1.18.34"
 
     implementation 'org.apache.solr:solr-solrj:8.11.3'
 

From fa33a8c806f0804fbc40f11f82095b8dfdbed2b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:34:37 +0000
Subject: [PATCH 3876/4969] Bump org.apache.kafka:kafka-clients from 3.6.1 to
 3.7.1 in /examples

Bumps org.apache.kafka:kafka-clients from 3.6.1 to 3.7.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 58bb2053574..04c05992ca9 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.30"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.7.1'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From 3ba40abc3e62579a0eca4de637d92c7f8042bf46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:34:38 +0000
Subject: [PATCH 3877/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/spock

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 399accd7f2b..eebf30e2e2e 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.3'
 
     testCompileOnly 'org.jetbrains:annotations:24.1.0'

From 68361a3ea5cee6f832eaa5e390581f062210212c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:34:57 +0000
Subject: [PATCH 3878/4969] Bump org.assertj:assertj-core in
 /modules/localstack

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 9d439ee8712..6fef28f27c2 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
     testImplementation 'software.amazon.awssdk:s3:2.26.25'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From ba5db14a0b17f3e7228c093813717d8d743f990f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:35:19 +0000
Subject: [PATCH 3879/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.763 to 1.12.765.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.763...1.12.765)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 ef3689feb02..0c7c0c67793 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.763'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.763'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.765'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.765'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From b68e3ed1c1fd7b9618c660752abc36fd3213e8e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:57:56 +0000
Subject: [PATCH 3880/4969] Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
 in /modules/milvus

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.0.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 76406164e7a..2f4c25b055a 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation('io.milvus:milvus-sdk-java:2.4.2') {
         exclude(group: 'org.testcontainers', module: 'milvus')
         exclude(group: 'org.testcontainers', module: 'junit-jupiter')

From b52809bf792d4d9f4b0a3da95b7460347f3e7430 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:58:10 +0000
Subject: [PATCH 3881/4969] Bump org.assertj:assertj-core in
 /modules/localstack

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.0.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 9d439ee8712..6fef28f27c2 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
     testImplementation 'software.amazon.awssdk:s3:2.26.25'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 5268d5faf3e2fa262f6624814dd93d2ec9009e98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 06:04:38 +0000
Subject: [PATCH 3882/4969] Bump io.trino:trino-jdbc from 452 to 453 in
 /modules/trino

Bumps io.trino:trino-jdbc from 452 to 453.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 1bfb93e4c37..8b146c07e8c 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:452'
+    testRuntimeOnly 'io.trino:trino-jdbc:453'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 14c77264d4243d4f2a7f675272129915357d000b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 06:08:31 +0000
Subject: [PATCH 3883/4969] Bump peter-evans/create-pull-request from 6.0.5 to
 6.1.0

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.5 to 6.1.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/6d6857d36972b65feb161a90e484f2984215f83e...c5a7806660adbe173f04e3e038b0ccdcd758773c)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index d39d9a35191..6cc431d3a52 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v3.10.1
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index c7014b87d53..7f3faa0e92d 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v3.10.1
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v3.10.1
         with:
           title: Update testcontainers version to ${GITHUB_REF##*/}
           body: |

From 9b7e37b03c9b4d7670616bfb059ce28adc63e390 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 06:10:48 +0000
Subject: [PATCH 3884/4969] Bump dev.openfga:openfga-sdk from 0.4.2 to 0.5.0 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.4.2 to 0.5.0.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.4.2...v0.5.0)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 5bece5f3b9c..e7db231db18 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'dev.openfga:openfga-sdk:0.4.2'
+    testImplementation 'dev.openfga:openfga-sdk:0.5.0'
 }
 
 test {

From 7b2bc36ae2f6559fee132c3ed2f829c2117e06fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 06:12:37 +0000
Subject: [PATCH 3885/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /examples

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.13 to 4.4.17.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.13...4.4.17)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index be39a73653f..4b25bc00d84 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'

From 9ebac532ca48fb63653b55ef40660da10b564591 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 06:13:31 +0000
Subject: [PATCH 3886/4969] Bump com.google.guava:guava from 33.2.0-jre to
 33.2.1-jre in /core

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.0-jre to 33.2.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 592377dc7d4..07fb70774df 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -99,7 +99,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded 'com.google.guava:guava:33.2.0-jre'
+    shaded 'com.google.guava:guava:33.2.1-jre'
     shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

From e6158f65144c07da4986b9e9ce32250040548cca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 15:33:42 +0000
Subject: [PATCH 3887/4969] Bump org.json:json from 20231013 to 20240303 in
 /examples

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20231013 to 20240303.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 45b400ed758..a78c362113a 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    implementation 'org.json:json:20231013'
+    implementation 'org.json:json:20240303'
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'

From e20114e4287945f0b92c03970fb64afe439c67cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 15:34:40 +0000
Subject: [PATCH 3888/4969] Bump com.google.code.gson:gson from 2.10.1 to
 2.11.0 in /examples

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.10.1...gson-parent-2.11.0)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 013ed283c10..dc07bf0f8c3 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:5.1.3'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index fecea48a902..6992a716663 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:5.1.3'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 8aabef6f4ed..4a9182374b2 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:5.1.3'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 

From d7982611c7fcb712b2c308b796229b97c5db2b43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 15:37:08 +0000
Subject: [PATCH 3889/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.21 to 7.17.22.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.21...v7.17.22)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 76a3e585bed..a6ad2e8ed3f 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.14.3"
-    testImplementation "org.elasticsearch.client:transport:7.17.21"
+    testImplementation "org.elasticsearch.client:transport:7.17.22"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 5f194e9a564f0c665fea77824c5edc575aa86ce8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 15:37:27 +0000
Subject: [PATCH 3890/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin

Bumps com.gradle:common-custom-user-data-gradle-plugin from 2.0.1 to 2.0.2.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index ba107a86f7a..5838b93507b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.6"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }
 }

From f1965361f9acf2238fdb15f08314a27f8541e704 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 15:37:36 +0000
Subject: [PATCH 3891/4969] Bump io.kubernetes:client-java in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 20.0.1-legacy to 21.0.0-legacy.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v20.0.1-legacy...v21.0.0-legacy)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index b6fe982fd9f..f0e0f8a9fa1 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.13.1'
-    testImplementation 'io.kubernetes:client-java:20.0.1-legacy'
+    testImplementation 'io.kubernetes:client-java:21.0.0-legacy'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From ac0e1119658086cb3f00188f93bd19b3435c891b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 26 Jul 2024 10:21:08 -0600
Subject: [PATCH 3892/4969] Use pulsar-bom (#9006)

---
 modules/pulsar/build.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 7e7e4e533b5..b86e4713cce 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,8 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.2.3'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.26.3'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.2.3'
+    testImplementation platform("org.apache.pulsar:pulsar-bom:3.2.3")
+    testImplementation 'org.apache.pulsar:pulsar-client'
+    testImplementation 'org.apache.pulsar:pulsar-client-admin'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 793fdea5b6e4b92b4e56e1abae0326ddcfc845b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:55:18 +0000
Subject: [PATCH 3893/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.0-jre to 33.2.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7f74ab7944f..b841865a7a8 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:33.2.0-jre'
+    api 'com.google.guava:guava:33.2.1-jre'
     api 'org.apache.commons:commons-lang3:3.15.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'

From 646e5e7a810f74af3815d748766aedd6cc014e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 26 Jul 2024 13:15:45 -0500
Subject: [PATCH 3894/4969] Ignore hazelcast and influxdb updates

---
 .github/dependabot.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 93157606024..a293058729c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -121,6 +121,9 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "com.influxdb:influxdb-java-client"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc"
     schedule:
@@ -376,6 +379,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "com.hazelcast:hazelcast"
+        update-types: [ "version-update:semver-minor" ]
 
   # Smoke test
   - package-ecosystem: "gradle"

From 800159e28bd84a53cea85f35443209ffa465e349 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:17:51 +0000
Subject: [PATCH 3895/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.7.1 to 3.8.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 97139db839b..554275a2037 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.7.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
 }

From 08066934349c6547a67577ac569755a3fe8a87c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:17:52 +0000
Subject: [PATCH 3896/4969] Bump com.hazelcast:hazelcast from 5.3.6 to 5.3.8 in
 /examples

Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.3.6 to 5.3.8.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/compare/v5.3.6...v5.3.8)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 62dd4347f84..b9671c8261a 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.hazelcast:hazelcast:5.3.6'
+    testImplementation 'com.hazelcast:hazelcast:5.3.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'

From 8f4cbb165152ff86185a9cfcc35f55b053c1b807 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:17:56 +0000
Subject: [PATCH 3897/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index b71aba53896..08a3e32bb88 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.3.2.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.3"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From 581539448637192139d26fb30ad58f4f97e44f5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:00 +0000
Subject: [PATCH 3898/4969] Bump org.apache.curator:curator-framework in
 /examples

Bumps [org.apache.curator:curator-framework](https://github.com/apache/curator) from 5.6.0 to 5.7.0.
- [Commits](https://github.com/apache/curator/compare/apache-curator-5.6.0...apache-curator-5.7.0)

---
updated-dependencies:
- dependency-name: org.apache.curator:curator-framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/zookeeper/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 881b645c5d9..e5112a75858 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.apache.curator:curator-framework:5.6.0'
+    testImplementation 'org.apache.curator:curator-framework:5.7.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From af4a6b16f601e689d8be74f5f574f098224c1e9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:00 +0000
Subject: [PATCH 3899/4969] Bump io.weaviate:client from 4.8.1 to 4.8.2 in
 /modules/weaviate

Bumps [io.weaviate:client](https://github.com/weaviate/java-client) from 4.8.1 to 4.8.2.
- [Release notes](https://github.com/weaviate/java-client/releases)
- [Commits](https://github.com/weaviate/java-client/compare/4.8.1...4.8.2)

---
updated-dependencies:
- dependency-name: io.weaviate:client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 28bde7bbc44..f110cdcb17f 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'io.weaviate:client:4.8.1'
+    testImplementation 'io.weaviate:client:4.8.2'
 }

From 44a29db89b6c4e4b3a78fbaa9341a97c8b47ec1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:02 +0000
Subject: [PATCH 3900/4969] Bump org.apache.pulsar:pulsar-bom from 3.2.3 to
 3.3.0 in /modules/pulsar

Bumps [org.apache.pulsar:pulsar-bom](https://github.com/apache/pulsar) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.2.3...v3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index b86e4713cce..e0484c80113 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("org.apache.pulsar:pulsar-bom:3.2.3")
+    testImplementation platform("org.apache.pulsar:pulsar-bom:3.3.0")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
     testImplementation 'org.assertj:assertj-core:3.26.3'

From cbe9c20d1cbc25521bb1aaba4839c398432af31f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:05 +0000
Subject: [PATCH 3901/4969] Bump org.apache.kafka:kafka-clients from 3.7.1 to
 3.8.0 in /examples

Bumps org.apache.kafka:kafka-clients from 3.7.1 to 3.8.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 38efd2d0112..31815faa57c 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.34"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.34"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.7.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From 93ce044307c9b999a187719883b621e3050faba7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:08 +0000
Subject: [PATCH 3902/4969] Bump io.rest-assured:rest-assured from 5.4.0 to
 5.5.0 in /examples

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.4.0 to 5.5.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.4.0...rest-assured-5.5.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/ollama-hugging-face/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index b086e18d9f4..685594cfe2b 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
-    testImplementation 'io.rest-assured:rest-assured:5.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }
 
 test {

From 1848a2c16712d4197095ec8c8b3fd75694071f71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:11 +0000
Subject: [PATCH 3903/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.7.1 to 3.8.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index d70c8a0d45b..1ca439c538e 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.32'
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.7.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }

From a145b18a5e51ce0579911822854962977a3d6c17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:18 +0000
Subject: [PATCH 3904/4969] Bump io.nats:jnats from 2.18.1 to 2.19.1 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.18.1 to 2.19.1.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.18.1...2.19.1)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 45f19e28300..4707b6afcf1 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.18.1'
+    testImplementation 'io.nats:jnats:2.19.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'

From f42521dc00986efc0ba92ce24606a5bb10e698d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:18:24 +0000
Subject: [PATCH 3905/4969] Bump ch.qos.logback:logback-classic from 1.3.8 to
 1.3.14 in /smoke-test

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.3.8 to 1.3.14.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.8...v_1.3.14)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 smoke-test/turbo-mode/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index 733b39a5a79..5b2f6ab9625 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 

From 75ca75c91466928f3a1cf5a89f9b0211c444f61a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Jul 2024 04:53:18 +0000
Subject: [PATCH 3906/4969] Bump org.junit.jupiter:junit-jupiter from 5.10.2 to
 5.10.3 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle           | 2 +-
 examples/immudb/build.gradle              | 2 +-
 examples/kafka-cluster/build.gradle       | 2 +-
 examples/nats/build.gradle                | 2 +-
 examples/neo4j-container/build.gradle     | 2 +-
 examples/ollama-hugging-face/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle  | 2 +-
 examples/selenium-container/build.gradle  | 2 +-
 examples/sftp/build.gradle                | 2 +-
 examples/singleton-container/build.gradle | 2 +-
 examples/solr-container/build.gradle      | 2 +-
 examples/spring-boot/build.gradle         | 2 +-
 examples/zookeeper/build.gradle           | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index b9671c8261a..84a54bce45f 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 82e3912fdc8..ebf209b5e7a 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 31815faa57c..283e24f3229 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 4707b6afcf1..2854790e0a3 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'io.nats:jnats:2.19.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 4b25bc00d84..7b2225e850e 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 685594cfe2b..0143eb66423 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:ollama'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }
 
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 6992a716663..f41e7524a83 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 2f6d8efa901..244e9bdc7eb 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index f8374f71a8b..786f0e2d4a9 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 4a9182374b2..e6b8cfaa142 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index ea7a1dd8c8e..8f87c69c546 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 95b21be5c6c..8249b18eddc 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index e5112a75858..35bef8255d9 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 }
 
 test {

From d26eacaf6af9cf81b98c285e6336d2350ad0cbc0 Mon Sep 17 00:00:00 2001
From: Krunoslav Magazin <krunoslav.magazin@gmail.com>
Date: Mon, 29 Jul 2024 19:14:00 +0200
Subject: [PATCH 3907/4969] Fix URI decode (#9026)

---
 .../java/org/testcontainers/AbstractJarFileTest.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java b/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java
index ae92aa371b0..3c0e056d903 100644
--- a/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/AbstractJarFileTest.java
@@ -1,6 +1,8 @@
 package org.testcontainers;
 
 import java.net.URI;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
@@ -14,7 +16,8 @@ public abstract class AbstractJarFileTest {
     static {
         try {
             Path jarFilePath = Paths.get(System.getProperty("jarFile"));
-            URI jarFileUri = new URI("jar", jarFilePath.toUri().toString(), null);
+            String decodedPath = URLDecoder.decode(jarFilePath.toUri().toString(), StandardCharsets.UTF_8.name());
+            URI jarFileUri = new URI("jar", decodedPath, null);
             FileSystem fileSystem = FileSystems.newFileSystem(jarFileUri, Collections.emptyMap());
             root = fileSystem.getPath("/");
         } catch (Exception e) {

From 33e9f6480395b775c789812d6b61c13c8bd95063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 30 Jul 2024 14:31:37 -0500
Subject: [PATCH 3908/4969] Pass options to compose down command (#9040)

Currently, setting options are supported for the `up` command. But,
the same are not passed to the `down` command. Support for this has been added.
Also, adding an example using `--profiles`.

Fixes #5041
---
 .../containers/ComposeCommand.java            | 37 +++++++++++++++++++
 .../containers/ComposeContainer.java          |  3 +-
 .../containers/ComposeDelegate.java           | 22 +----------
 .../containers/DockerComposeContainer.java    |  2 +-
 .../containers/ComposeProfilesOptionTest.java | 35 ++++++++++++++++++
 .../DockerComposeProfilesOptionTest.java      | 35 ++++++++++++++++++
 .../compose-profile-option/compose-test.yml   | 11 ++++++
 7 files changed, 122 insertions(+), 23 deletions(-)
 create mode 100644 core/src/main/java/org/testcontainers/containers/ComposeCommand.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
 create mode 100644 core/src/test/resources/compose-profile-option/compose-test.yml

diff --git a/core/src/main/java/org/testcontainers/containers/ComposeCommand.java b/core/src/main/java/org/testcontainers/containers/ComposeCommand.java
new file mode 100644
index 00000000000..d85f093578e
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/ComposeCommand.java
@@ -0,0 +1,37 @@
+package org.testcontainers.containers;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Set;
+
+class ComposeCommand {
+
+    static String getDownCommand(ComposeDelegate.ComposeVersion composeVersion, Set<String> options) {
+        String composeOptions = optionsAsString(options);
+        if (composeOptions == null || composeOptions.equals("")) {
+            return composeVersion == ComposeDelegate.ComposeVersion.V1 ? "down" : "compose down";
+        }
+        String cmd = composeVersion == ComposeDelegate.ComposeVersion.V1 ? "%s down" : "compose %s down";
+        return String.format(cmd, composeOptions);
+    }
+
+    static String getUpCommand(ComposeDelegate.ComposeVersion composeVersion, Set<String> options) {
+        String composeOptions = optionsAsString(options);
+        if (composeOptions == null || composeOptions.equals("")) {
+            return composeVersion == ComposeDelegate.ComposeVersion.V1 ? "up -d" : "compose up -d";
+        }
+        String cmd = composeVersion == ComposeDelegate.ComposeVersion.V1 ? "%s up -d" : "compose %s up -d";
+        return String.format(cmd, composeOptions);
+    }
+
+    private static String optionsAsString(final Set<String> options) {
+        String optionsString = String.join(" ", options);
+        if (!optionsString.isEmpty()) {
+            // ensures that there is a space between the options and 'up' if options are passed.
+            return optionsString;
+        } else {
+            // otherwise two spaces would appear between 'docker-compose' and 'up'
+            return StringUtils.EMPTY;
+        }
+    }
+}
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
index 5add02183ae..0a804cfddb2 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
@@ -161,7 +161,8 @@ public void stop() {
                 this.composeDelegate.getAmbassadorContainer().stop();
 
                 // Kill the services using docker
-                String cmd = "compose down";
+                String cmd = ComposeCommand.getDownCommand(ComposeDelegate.ComposeVersion.V2, this.options);
+
                 if (removeVolumes) {
                     cmd += " -v";
                 }
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
index 0b09e9c2683..4dc396a6922 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
@@ -10,7 +10,6 @@
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -146,7 +145,7 @@ void createServices(
             .distinct()
             .collect(Collectors.joining(" "));
 
-        String command = getUpCommand(optionsAsString(options));
+        String command = ComposeCommand.getUpCommand(this.composeVersion, options);
 
         if (build) {
             command += " --build";
@@ -164,25 +163,6 @@ void createServices(
         runWithCompose(localCompose, command, env, fileCopyInclusions);
     }
 
-    private String getUpCommand(String options) {
-        if (options == null || options.equals("")) {
-            return this.composeVersion == ComposeVersion.V1 ? "up -d" : "compose up -d";
-        }
-        String cmd = this.composeVersion == ComposeVersion.V1 ? "%s up -d" : "compose %s up -d";
-        return String.format(cmd, options);
-    }
-
-    private String optionsAsString(final Set<String> options) {
-        String optionsString = options.stream().collect(Collectors.joining(" "));
-        if (optionsString.length() != 0) {
-            // ensures that there is a space between the options and 'up' if options are passed.
-            return optionsString;
-        } else {
-            // otherwise two spaces would appear between 'docker-compose' and 'up'
-            return StringUtils.EMPTY;
-        }
-    }
-
     void waitUntilServiceStarted(boolean tailChildContainers) {
         listChildContainers().forEach(container -> createServiceInstance(container, tailChildContainers));
 
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 748c0c59174..cf78cfa4be2 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -167,7 +167,7 @@ public void stop() {
                 this.composeDelegate.getAmbassadorContainer().stop();
 
                 // Kill the services using docker-compose
-                String cmd = "down";
+                String cmd = ComposeCommand.getDownCommand(ComposeDelegate.ComposeVersion.V1, this.options);
 
                 if (removeVolumes) {
                     cmd += " -v";
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
new file mode 100644
index 00000000000..4c22024aee8
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
@@ -0,0 +1,35 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(Parameterized.class)
+public class ComposeProfilesOptionTest {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Boolean[] local() {
+        return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+    }
+
+    @Parameterized.Parameter
+    public boolean local;
+
+    public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
+
+    @Test
+    public void testProfileOption() {
+        try (
+            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE)
+                .withOptions("--profile=cache")
+                .withLocalCompose(true)
+        ) {
+            compose.start();
+            assertThat(compose.listChildContainers()).hasSize(1);
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
new file mode 100644
index 00000000000..371525432bf
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
@@ -0,0 +1,35 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(Parameterized.class)
+public class DockerComposeProfilesOptionTest {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Boolean[] local() {
+        return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+    }
+
+    @Parameterized.Parameter
+    public boolean local;
+
+    public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
+
+    @Test
+    public void testProfileOption() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE)
+                .withOptions("--profile=cache")
+                .withLocalCompose(this.local)
+        ) {
+            compose.start();
+            assertThat(compose.listChildContainers()).hasSize(1);
+        }
+    }
+}
diff --git a/core/src/test/resources/compose-profile-option/compose-test.yml b/core/src/test/resources/compose-profile-option/compose-test.yml
new file mode 100644
index 00000000000..8d85bf49967
--- /dev/null
+++ b/core/src/test/resources/compose-profile-option/compose-test.yml
@@ -0,0 +1,11 @@
+services:
+  redis:
+    image: redis
+    profiles:
+      - cache
+  db:
+    image: mysql:8.0.36
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "true"
+    profiles:
+      - db

From 49523377363496390bcb52422e71c8eda77652a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 30 Jul 2024 17:12:35 -0500
Subject: [PATCH 3909/4969] Update Apache Kafka images to 3.8.0

---
 .../test/java/org/testcontainers/kafka/KafkaContainerTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
index 93cb4e6138d..233ee1cd2d4 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
@@ -10,7 +10,7 @@ public class KafkaContainerTest extends AbstractKafka {
 
     @Parameterized.Parameters(name = "{0}")
     public static String[] params() {
-        return new String[] { "apache/kafka:3.7.0", "apache/kafka-native:3.8.0-rc3" };
+        return new String[] { "apache/kafka:3.8.0", "apache/kafka-native:3.8.0" };
     }
 
     @Parameterized.Parameter

From 1877849e9ac558b7fec05f8ce4586bebc69ca1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 31 Jul 2024 01:01:29 -0500
Subject: [PATCH 3910/4969] Downgrade awaitility version to 4.2.0 (#9041)

Fixes #8986
---
 .github/dependabot.yml         | 10 ++++++++++
 core/build.gradle              |  2 +-
 modules/couchbase/build.gradle |  2 +-
 modules/questdb/build.gradle   |  2 +-
 modules/solace/build.gradle    |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a293058729c..6bdca459fab 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,6 +22,8 @@ updates:
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
       - dependency-name: "org.apache.commons:commons-compress"
         update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "org.awaitility:awaitility"
+        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
@@ -76,6 +78,9 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.awaitility:awaitility"
+        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/cratedb"
     schedule:
@@ -280,6 +285,9 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.awaitility:awaitility"
+        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/r2dbc"
     schedule:
@@ -314,6 +322,8 @@ updates:
     ignore:
       - dependency-name: "org.apache.qpid:qpid-jms-client"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.awaitility:awaitility"
+        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/solr"
     schedule:
diff --git a/core/build.gradle b/core/build.gradle
index 07fb70774df..7ab2408fe05 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,7 +86,7 @@ dependencies {
         exclude group: 'org.apache.commons', module: 'commons-compress'
     }
 
-    shaded 'org.awaitility:awaitility:4.2.1'
+    shaded 'org.awaitility:awaitility:4.2.0'
 
     api platform('com.github.docker-java:docker-java-bom:3.4.0')
     shaded platform('com.github.docker-java:docker-java-bom:3.4.0')
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 49302203871..4ecab1d0f6b 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'com.couchbase.client:java-client:3.7.1'
-    testImplementation 'org.awaitility:awaitility:4.2.1'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index a2d138b9c30..b2ccaa9dc38 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.questdb:questdb:7.3.9'
-    testImplementation 'org.awaitility:awaitility:4.2.1'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
 
diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index f2fb5bc0a39..fb83eede28c 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solace"
 dependencies {
     api project(':testcontainers')
 
-    shaded 'org.awaitility:awaitility:4.2.1'
+    shaded 'org.awaitility:awaitility:4.2.0'
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.solacesystems:sol-jcsmp:10.24.1'

From 358d06179a3cc186ecb6ce4a4a7ea34a49c93f41 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 11:28:34 -0500
Subject: [PATCH 3911/4969] [create-pull-request] automated change (#9051)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 5fd93a9fee6..8aed24d20f6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -133,4 +133,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.0
+    latest_version: 1.20.1

From bb1077f98211a06571e009ce62452ab15fce9796 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 11:28:49 -0500
Subject: [PATCH 3912/4969] [create-pull-request] automated change (#9052)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 0ce8bd1df0a..270386ac997 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.0
+testcontainers.version=1.20.1

From e8bd9b9c7077ece496e31eece0b2e25ddda57a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 5 Aug 2024 10:01:58 -0500
Subject: [PATCH 3913/4969] Log docker daemon labels (#9054)

---
 .../testcontainers/DockerClientFactory.java   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
index 7fc51c5c611..989aaf36be3 100644
--- a/core/src/main/java/org/testcontainers/DockerClientFactory.java
+++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -33,6 +33,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -41,6 +42,7 @@
 import java.util.UUID;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * Singleton class that provides initialized Docker clients.
@@ -210,7 +212,8 @@ public void close() {
         Version version = client.versionCmd().exec();
         log.debug("Docker version: {}", version.getRawValues());
         activeApiVersion = version.getApiVersion();
-        log.info(
+
+        String serverInfo =
             "Connected to docker: \n" +
             "  Server Version: " +
             dockerInfo.getServerVersion() +
@@ -224,8 +227,18 @@ public void close() {
             "  Total Memory: " +
             dockerInfo.getMemTotal() /
             (1024 * 1024) +
-            " MB"
-        );
+            " MB";
+
+        String[] labels = dockerInfo.getLabels();
+        boolean hasLabels = labels != null && labels.length > 0;
+        if (hasLabels) {
+            String formattedLabels = Arrays
+                .stream(labels)
+                .map(label -> "    " + label)
+                .collect(Collectors.joining("\n"));
+            serverInfo += "\n  Labels: \n" + formattedLabels;
+        }
+        log.info(serverInfo);
 
         try {
             //noinspection deprecation

From 2758b51d6ac69bb56360a83a90a859af0e4352e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 5 Aug 2024 13:07:06 -0500
Subject: [PATCH 3914/4969] Add support for apache/kafka-native image in docs

---
 docs/modules/kafka.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 6ec63126387..091aac0ec72 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -6,7 +6,7 @@ Currently, two different Kafka images are supported:
 
 * `org.testcontainers.containers.KafkaContainer` supports 
 [confluentinc/cp-kafka](https://hub.docker.com/r/confluentinc/cp-kafka/)
-* `org.testcontainers.kafka.KafkaContainer` supports [apache/kafka](https://hub.docker.com/r/apache/kafka/)
+* `org.testcontainers.kafka.KafkaContainer` supports [apache/kafka](https://hub.docker.com/r/apache/kafka/) and [apache/kafka-native](https://hub.docker.com/r/apache/kafka-native/)
 
 ## Benefits
 

From 1ce0b1d7ba9e2c4ac2e896799678cf7be620d34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 5 Aug 2024 14:55:24 -0500
Subject: [PATCH 3915/4969] Check if docker-compose is available (#9060)

---
 .../DockerComposeProfilesOptionTest.java      | 17 +++++++++++++--
 ...DockerComposeContainerWithOptionsTest.java | 21 +++++++++++++++----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
index 371525432bf..0f7e41a8454 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
@@ -1,8 +1,11 @@
 package org.testcontainers.containers;
 
+import org.assertj.core.api.Assumptions;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 
@@ -17,16 +20,26 @@ public static Boolean[] local() {
     }
 
     @Parameterized.Parameter
-    public boolean local;
+    public boolean localMode;
 
     public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
 
+    @Before
+    public void setUp() {
+        if (this.localMode) {
+            Assumptions
+                .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
+                .as("docker-compose executable exists")
+                .isTrue();
+        }
+    }
+
     @Test
     public void testProfileOption() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE)
                 .withOptions("--profile=cache")
-                .withLocalCompose(this.local)
+                .withLocalCompose(this.localMode)
         ) {
             compose.start();
             assertThat(compose.listChildContainers()).hasSize(1);
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
index 77e60580b39..0de25fa2946 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
@@ -1,10 +1,13 @@
 package org.testcontainers.junit;
 
 import com.google.common.collect.ImmutableSet;
+import org.assertj.core.api.Assumptions;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 import java.util.Set;
@@ -19,19 +22,19 @@ public class DockerComposeContainerWithOptionsTest {
 
     public DockerComposeContainerWithOptionsTest(
         final File composeFile,
-        final boolean local,
+        final boolean localMode,
         final Set<String> options,
         final boolean expectError
     ) {
         this.composeFile = composeFile;
-        this.local = local;
+        this.localMode = localMode;
         this.options = options;
         this.expectError = expectError;
     }
 
     private final File composeFile;
 
-    private final boolean local;
+    private final boolean localMode;
 
     private final Set<String> options;
 
@@ -73,12 +76,22 @@ public static Object[][] params() {
         };
     }
 
+    @Before
+    public void setUp() {
+        if (this.localMode) {
+            Assumptions
+                .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
+                .as("docker-compose executable exists")
+                .isTrue();
+        }
+    }
+
     @Test
     public void performTest() {
         try (
             DockerComposeContainer<?> environment = new DockerComposeContainer<>(composeFile)
                 .withOptions(options.stream().toArray(String[]::new))
-                .withLocalCompose(local)
+                .withLocalCompose(localMode)
         ) {
             environment.start();
             assertThat(expectError).isEqualTo(false);

From c3b015c6fb5568256f0786f772cb3f5a34daa010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 5 Aug 2024 16:16:10 -0500
Subject: [PATCH 3916/4969] Fix typo

---
 .github/ISSUE_TEMPLATE/feature.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index a4fba6a649e..485e1477a06 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -84,7 +84,7 @@ body:
     id: benefit
     attributes:
       label: Benefit
-      description: What's the benefit of addng this feature to the project?
+      description: What's the benefit of adding this feature to the project?
     validations:
       required: true
   - type: textarea

From 170761cd3cdbdec5f7ea0a710cc6f027391bbe60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 22:10:44 +0000
Subject: [PATCH 3917/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-free

Bumps com.oracle.database.jdbc:ojdbc11 from 23.4.0.24.05 to 23.5.0.24.07.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index d9673126063..2765c99fd92 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.4.0.24.05'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 

From 88553e6c8b3241b5bd65b1c3093f549248d7903f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 22:11:16 +0000
Subject: [PATCH 3918/4969] Bump org.apache.pulsar:pulsar-bom from 3.3.0 to
 3.3.1 in /modules/pulsar

Bumps [org.apache.pulsar:pulsar-bom](https://github.com/apache/pulsar) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.3.0...v3.3.1)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index e0484c80113..7af1bc777e2 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("org.apache.pulsar:pulsar-bom:3.3.0")
+    testImplementation platform("org.apache.pulsar:pulsar-bom:3.3.1")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
     testImplementation 'org.assertj:assertj-core:3.26.3'

From 80904ada2250045974a040b7487e806a99e35593 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 22:32:09 +0000
Subject: [PATCH 3919/4969] Bump io.asyncer:r2dbc-mysql from 1.1.3 to 1.3.0 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 1.1.3 to 1.3.0.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-1.1.3...r2dbc-mysql-1.3.0)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 1c32ac4b4f4..beef298197d 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:1.1.3'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.3.0'
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.1.3'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.3.0'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From e6e2cf0fd82dc8d867d910f0f3a36634123cb97b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 22:53:55 +0000
Subject: [PATCH 3920/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 23.4.0.24.05 to 23.5.0.24.07.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index d9c27ca92fc..d3caec05e86 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.4.0.24.05'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 

From e3ad4ff55bbbbcc997782868b3dedb46231c5d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 6 Aug 2024 11:19:02 -0500
Subject: [PATCH 3921/4969] Check if docker is available (#9069)

---
 .../containers/ComposeProfilesOptionTest.java | 15 ++++++++++++-
 .../ComposeContainerWithOptionsTest.java      | 21 +++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
index 4c22024aee8..71aba726dda 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
@@ -1,8 +1,11 @@
 package org.testcontainers.containers;
 
+import org.assertj.core.api.Assumptions;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 
@@ -17,10 +20,20 @@ public static Boolean[] local() {
     }
 
     @Parameterized.Parameter
-    public boolean local;
+    public boolean localMode;
 
     public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
 
+    @Before
+    public void setUp() {
+        if (this.localMode) {
+            Assumptions
+                .assumeThat(CommandLine.executableExists(ComposeContainer.COMPOSE_EXECUTABLE))
+                .as("docker executable exists")
+                .isTrue();
+        }
+    }
+
     @Test
     public void testProfileOption() {
         try (
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
index ef1315ae662..9a6c581eb3b 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
@@ -1,10 +1,13 @@
 package org.testcontainers.junit;
 
 import com.google.common.collect.ImmutableSet;
+import org.assertj.core.api.Assumptions;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 import java.util.Set;
@@ -19,19 +22,19 @@ public class ComposeContainerWithOptionsTest {
 
     public ComposeContainerWithOptionsTest(
         final File composeFile,
-        final boolean local,
+        final boolean localMode,
         final Set<String> options,
         final boolean expectError
     ) {
         this.composeFile = composeFile;
-        this.local = local;
+        this.localMode = localMode;
         this.options = options;
         this.expectError = expectError;
     }
 
     private final File composeFile;
 
-    private final boolean local;
+    private final boolean localMode;
 
     private final Set<String> options;
 
@@ -73,12 +76,22 @@ public static Object[][] params() {
         };
     }
 
+    @Before
+    public void setUp() {
+        if (this.localMode) {
+            Assumptions
+                .assumeThat(CommandLine.executableExists(ComposeContainer.COMPOSE_EXECUTABLE))
+                .as("docker executable exists")
+                .isTrue();
+        }
+    }
+
     @Test
     public void performTest() {
         try (
             ComposeContainer environment = new ComposeContainer(composeFile)
                 .withOptions(options.stream().toArray(String[]::new))
-                .withLocalCompose(local)
+                .withLocalCompose(localMode)
         ) {
             environment.start();
             assertThat(expectError).isFalse();

From 4b3d08ecff0923e37caac83e58807076c0aa9d44 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp@schirmer-online.de>
Date: Wed, 7 Aug 2024 17:37:06 +0200
Subject: [PATCH 3922/4969] Improve docs for Elasticsearch (#8870)

---
 docs/modules/elasticsearch.md                 |  4 +-
 .../ElasticsearchContainerTest.java           | 97 ++++++++++++++++---
 2 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 3372d2fdea0..3834081f2c6 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -10,7 +10,9 @@ Note that it's based on the [official Docker image](https://www.elastic.co/guide
 You can start an elasticsearch container instance from any Java application by using:
 
 <!--codeinclude-->
-[HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientContainer
+[HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientContainer7
+[HttpClient with Elasticsearch 8](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientContainer8
+[HttpClient with Elasticsearch 8 and SSL disabled](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientContainerNoSSL8
 [TransportClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:transportClientContainer
 <!--/codeinclude-->
 
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 555cec58083..18fc0fc9fde 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -183,7 +183,7 @@ public void elasticsearchOssImage() throws IOException {
 
     @Test
     public void restClientClusterHealth() throws IOException {
-        // httpClientContainer {
+        // httpClientContainer7 {
         // Create the elasticsearch container.
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
             // Start the container. This step might take some time...
@@ -208,7 +208,86 @@ public void restClientClusterHealth() throws IOException {
             // }}
             assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
             assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
-            // httpClientContainer {{
+            // httpClientContainer7 {{
+        }
+        // }
+    }
+
+    @Test
+    public void restClientClusterHealthElasticsearch8() throws IOException {
+        // httpClientContainer8 {
+        // Create the elasticsearch container.
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+            )
+        ) {
+            // Start the container. This step might take some time...
+            container.start();
+
+            // Do whatever you want with the rest client ...
+            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(
+                AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+            );
+
+            client =
+                RestClient
+                    // use HTTPS for Elasticsearch 8
+                    .builder(HttpHost.create("https://" + container.getHttpHostAddress()))
+                    .setHttpClientConfigCallback(httpClientBuilder -> {
+                        httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                        // SSL is activated by default in Elasticsearch 8
+                        httpClientBuilder.setSSLContext(container.createSslContextFromCa());
+                        return httpClientBuilder;
+                    })
+                    .build();
+
+            Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+            // }}
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
+            // httpClientContainer8 {{
+        }
+        // }
+    }
+
+    @Test
+    public void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException {
+        // httpClientContainerNoSSL8 {
+        // Create the elasticsearch container.
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+            )
+                // disable SSL
+                .withEnv("xpack.security.transport.ssl.enabled", "false")
+                .withEnv("xpack.security.http.ssl.enabled", "false")
+        ) {
+            // Start the container. This step might take some time...
+            container.start();
+
+            // Do whatever you want with the rest client ...
+            final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(
+                AuthScope.ANY,
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+            );
+
+            client =
+                RestClient
+                    .builder(HttpHost.create(container.getHttpHostAddress()))
+                    .setHttpClientConfigCallback(httpClientBuilder -> {
+                        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    })
+                    .build();
+
+            Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+            // }}
+            assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+            assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
+            // httpClientContainerNoSSL8 {{
         }
         // }
     }
@@ -289,20 +368,6 @@ public void incompatibleSettingsTest() {
             .isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test
-    public void testElasticsearch8SecureByDefault() throws Exception {
-        try (
-            ElasticsearchContainer container = new ElasticsearchContainer(
-                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
-            )
-        ) {
-            // Start the container. This step might take some time...
-            container.start();
-
-            assertClusterHealthResponse(container);
-        }
-    }
-
     @Test
     public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
         try (ElasticsearchContainer container = new ElasticsearchContainer("elasticsearch:8.1.2")) {

From 6ef052a802065bd8cbe516f6d07fc9aa461bc5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 12 Aug 2024 13:24:36 -0500
Subject: [PATCH 3923/4969] Add workflow to test Docker Desktop for Windows
 (#9076)

---
 .github/workflows/ci-windows.yml              | 52 +++++++++++++++++++
 .../DockerComposeOverridesTest.java           |  3 ++
 2 files changed, 55 insertions(+)
 create mode 100644 .github/workflows/ci-windows.yml

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
new file mode 100644
index 00000000000..e6775faf870
--- /dev/null
+++ b/.github/workflows/ci-windows.yml
@@ -0,0 +1,52 @@
+name: CI - Windows
+
+on:
+  pull_request:
+    paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
+      - '.sdkmanrc'
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*.yaml'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - 'docs/**/*.css'
+      - 'docs/**/*.html'
+      - 'docs/**/*.ico'
+      - 'docs/**/*.md'
+      - 'docs/**/*.png'
+      - 'docs/**/*.svg'
+      - 'mkdocs.yml'
+      - 'README.md'
+      - 'RELEASING.md'
+      - '.sdkmanrc'
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  core:
+    runs-on: self-hosted
+    permissions:
+      checks: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build with Gradle
+        run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
+      - uses: ./.github/actions/setup-junit-report
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
index 494ddc5838f..036134e32d8 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
@@ -65,6 +65,9 @@ public void setUp() {
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
                 .isTrue();
+            Assumptions
+                .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
+                .doesNotStartWith("Docker Compose version v2");
         }
     }
 

From b27316d40f0cd853fdd208bdc22b42b568d214d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 12 Aug 2024 16:04:15 -0500
Subject: [PATCH 3924/4969] Set MariaDB user when is not root (#9077)

Currently, setting MYSQL_USER with root won't start the container.

Fixes #8846
---
 .../testcontainers/containers/MariaDBContainer.java  |  5 ++++-
 .../junit/mariadb/SimpleMariaDBTest.java             | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index 1273ac4ec28..fccfde6e4dc 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -75,7 +75,10 @@ protected void configure() {
         );
 
         addEnv("MYSQL_DATABASE", databaseName);
-        addEnv("MYSQL_USER", username);
+
+        if (!MARIADB_ROOT_USER.equalsIgnoreCase(this.username)) {
+            addEnv("MYSQL_USER", username);
+        }
         if (password != null && !password.isEmpty()) {
             addEnv("MYSQL_PASSWORD", password);
             addEnv("MYSQL_ROOT_PASSWORD", password);
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 1b6996f5478..dedfb06cf55 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -132,6 +132,18 @@ public void testWithOnlyUserReadableCustomIniFile() throws Exception {
         }
     }
 
+    @Test
+    public void testEmptyPasswordWithRootUser() throws SQLException {
+        try (MariaDBContainer<?> mysql = new MariaDBContainer<>("mariadb:11.2.4").withUsername("root")) {
+            mysql.start();
+
+            ResultSet resultSet = performQuery(mysql, "SELECT 1");
+            int resultSetInt = resultSet.getInt(1);
+
+            assertThat(resultSetInt).isEqualTo(1);
+        }
+    }
+
     private void assertThatCustomIniFileWasUsed(MariaDBContainer<?> mariadb) throws SQLException {
         try (ResultSet resultSet = performQuery(mariadb, "SELECT @@GLOBAL.innodb_max_undo_log_size")) {
             long result = resultSet.getLong(1);

From 88e4ac59f1cb89e280be47afe8c703aba71c5344 Mon Sep 17 00:00:00 2001
From: Maxime Wiewiora <48218208+maximevw@users.noreply.github.com>
Date: Tue, 13 Aug 2024 20:50:49 +0200
Subject: [PATCH 3925/4969] Add new CassandraContainer implementation (#8616)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Current implementation under `org.testcontainers.containers` relies on some
types from the cassandra client. The new implementation is under `org.testcontainers.cassandra`
and remove the dependency from the cassandra client.

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/databases/cassandra.md           |   25 +-
 .../cassandra/CassandraContainer.java         |  176 +++
 .../delegate/CassandraDatabaseDelegate.java   |   83 ++
 .../wait/CassandraQueryWaitStrategy.java      |   47 +
 .../containers/CassandraContainer.java        |    3 +
 .../delegate/CassandraDatabaseDelegate.java   |    3 +
 .../wait/CassandraQueryWaitStrategy.java      |    3 +
 .../cassandra/CassandraContainerTest.java     |  150 ++
 .../cassandra/CassandraDriver4Test.java       |   40 +
 .../cassandra/CassandraServer4Test.java       |   35 +
 .../cassandra/CassandraServer5Test.java       |   35 +
 .../cassandra.yaml                            | 1233 +++++++++++++++++
 .../src/test/resources/initial-with-error.cql |    6 +
 13 files changed, 1831 insertions(+), 8 deletions(-)
 create mode 100644 modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
 create mode 100644 modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java
 create mode 100644 modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java
 create mode 100644 modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
 create mode 100644 modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java
 create mode 100644 modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java
 create mode 100644 modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java
 create mode 100644 modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml
 create mode 100644 modules/cassandra/src/test/resources/initial-with-error.cql

diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index 73f93bf203a..72213dad4a7 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -2,14 +2,23 @@
 
 ## Usage example
 
-This example connects to the Cassandra Cluster, creates a keyspaces and asserts that is has been created.
-
-<!--codeinclude-->
-[Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java) inside_block:cassandra
-<!--/codeinclude-->
-
-!!! warning
-    All methods returning instances of the Cassandra Driver's Cluster object in `CassandraContainer` have been deprecated. Providing these methods unnecessarily couples the Container to the Driver and creates potential breaking changes if the driver is updated.
+This example connects to the Cassandra cluster:
+
+1. Define a container:
+    <!--codeinclude-->
+    [Container definition](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:container-definition
+    <!--/codeinclude-->
+
+2. Build a `CqlSession`:
+    <!--codeinclude-->
+    [Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:cql-session
+    <!--/codeinclude-->
+
+3. Define a container with custom `cassandra.yaml` located in a directory `cassandra-auth-required-configuration`:
+    
+    <!--codeinclude-->
+    [Running init script with required authentication](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:init-with-auth
+    <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
 
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
new file mode 100644
index 00000000000..f8fc5d58dbb
--- /dev/null
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
@@ -0,0 +1,176 @@
+package org.testcontainers.cassandra;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate;
+import org.testcontainers.cassandra.wait.CassandraQueryWaitStrategy;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.ext.ScriptUtils;
+import org.testcontainers.ext.ScriptUtils.ScriptLoadException;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.File;
+import java.net.InetSocketAddress;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Optional;
+
+/**
+ * Testcontainers implementation for Apache Cassandra.
+ * <p>
+ * Supported image: {@code cassandra}
+ * <p>
+ * Exposed ports: 9042
+ */
+public class CassandraContainer extends GenericContainer<CassandraContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cassandra");
+
+    private static final Integer CQL_PORT = 9042;
+
+    private static final String DEFAULT_LOCAL_DATACENTER = "datacenter1";
+
+    private static final String CONTAINER_CONFIG_LOCATION = "/etc/cassandra";
+
+    private static final String USERNAME = "cassandra";
+
+    private static final String PASSWORD = "cassandra";
+
+    private String configLocation;
+
+    private String initScriptPath;
+
+    public CassandraContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public CassandraContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPort(CQL_PORT);
+
+        withEnv("CASSANDRA_SNITCH", "GossipingPropertyFileSnitch");
+        withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0");
+        withEnv("HEAP_NEWSIZE", "128M");
+        withEnv("MAX_HEAP_SIZE", "1024M");
+        withEnv("CASSANDRA_ENDPOINT_SNITCH", "GossipingPropertyFileSnitch");
+        withEnv("CASSANDRA_DC", DEFAULT_LOCAL_DATACENTER);
+
+        // Use the CassandraQueryWaitStrategy by default to avoid potential issues when the authentication is enabled.
+        waitingFor(new CassandraQueryWaitStrategy());
+    }
+
+    @Override
+    protected void configure() {
+        // Map (effectively replace) directory in Docker with the content of resourceLocation if resource location is
+        // not null.
+        Optional
+            .ofNullable(configLocation)
+            .map(MountableFile::forClasspathResource)
+            .ifPresent(mountableFile -> withCopyFileToContainer(mountableFile, CONTAINER_CONFIG_LOCATION));
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        runInitScriptIfRequired();
+    }
+
+    /**
+     * Load init script content and apply it to the database if initScriptPath is set
+     */
+    private void runInitScriptIfRequired() {
+        if (initScriptPath != null) {
+            try {
+                URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
+                if (resource == null) {
+                    logger().warn("Could not load classpath init script: {}", initScriptPath);
+                    throw new ScriptLoadException(
+                        "Could not load classpath init script: " + initScriptPath + ". Resource not found."
+                    );
+                }
+                // The init script is executed as is by the cqlsh command, so copy it into the container.
+                String targetInitScriptName = new File(resource.toURI()).getName();
+                copyFileToContainer(MountableFile.forClasspathResource(initScriptPath), targetInitScriptName);
+                new CassandraDatabaseDelegate(this).execute(null, targetInitScriptName, -1, false, false);
+            } catch (URISyntaxException e) {
+                logger().warn("Could not copy init script into container: {}", initScriptPath);
+                throw new ScriptLoadException("Could not copy init script into container: " + initScriptPath, e);
+            } catch (ScriptUtils.ScriptStatementFailedException e) {
+                logger().error("Error while executing init script: {}", initScriptPath, e);
+                throw new ScriptUtils.UncategorizedScriptException(
+                    "Error while executing init script: " + initScriptPath,
+                    e
+                );
+            }
+        }
+    }
+
+    /**
+     * Initialize Cassandra with the custom overridden Cassandra configuration
+     * <p>
+     * Be aware, that Docker effectively replaces all /etc/cassandra content with the content of config location, so if
+     * Cassandra.yaml in configLocation is absent or corrupted, then Cassandra just won't launch
+     *
+     * @param configLocation relative classpath with the directory that contains cassandra.yaml and other configuration files
+     */
+    public CassandraContainer withConfigurationOverride(String configLocation) {
+        this.configLocation = configLocation;
+        return self();
+    }
+
+    /**
+     * Initialize Cassandra with init CQL script
+     * <p>
+     *     CQL script will be applied after container is started (see using WaitStrategy).
+     * </p>
+     *
+     * @param initScriptPath relative classpath resource
+     */
+    public CassandraContainer withInitScript(String initScriptPath) {
+        this.initScriptPath = initScriptPath;
+        return self();
+    }
+
+    /**
+     * Get username
+     *
+     * By default, Cassandra has authenticator: AllowAllAuthenticator in cassandra.yaml
+     * If username and password need to be used, then authenticator should be set as PasswordAuthenticator
+     * (through custom Cassandra configuration) and through CQL with default cassandra-cassandra credentials
+     * user management should be modified
+     */
+    public String getUsername() {
+        return USERNAME;
+    }
+
+    /**
+     * Get password
+     *
+     * By default, Cassandra has authenticator: AllowAllAuthenticator in cassandra.yaml
+     * If username and password need to be used, then authenticator should be set as PasswordAuthenticator
+     * (through custom Cassandra configuration) and through CQL with default cassandra-cassandra credentials
+     * user management should be modified
+     */
+    public String getPassword() {
+        return PASSWORD;
+    }
+
+    /**
+     * Retrieve an {@link InetSocketAddress} for connecting to the Cassandra container via the driver.
+     *
+     * @return A InetSocketAddrss representation of this Cassandra container's host and port.
+     */
+    public InetSocketAddress getContactPoint() {
+        return new InetSocketAddress(getHost(), getMappedPort(CQL_PORT));
+    }
+
+    /**
+     * Retrieve the Local Datacenter for connecting to the Cassandra container via the driver.
+     *
+     * @return The configured local Datacenter name.
+     */
+    public String getLocalDatacenter() {
+        return getEnvMap().getOrDefault("CASSANDRA_DC", DEFAULT_LOCAL_DATACENTER);
+    }
+}
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java
new file mode 100644
index 00000000000..47b92958ea5
--- /dev/null
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java
@@ -0,0 +1,83 @@
+package org.testcontainers.cassandra.delegate;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.testcontainers.cassandra.CassandraContainer;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.containers.ExecConfig;
+import org.testcontainers.delegate.AbstractDatabaseDelegate;
+import org.testcontainers.ext.ScriptUtils.ScriptStatementFailedException;
+
+import java.io.IOException;
+
+/**
+ * Cassandra database delegate
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class CassandraDatabaseDelegate extends AbstractDatabaseDelegate<Void> {
+
+    private final ContainerState container;
+
+    @Override
+    protected Void createNewConnection() {
+        // Return null here, because we run scripts using cqlsh command directly in the container.
+        // So, we don't use connection object in the execute() method.
+        return null;
+    }
+
+    @Override
+    public void execute(
+        String statement,
+        String scriptPath,
+        int lineNumber,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    ) {
+        try {
+            // Use cqlsh command directly inside the container to execute statements
+            // See documentation here: https://cassandra.apache.org/doc/stable/cassandra/tools/cqlsh.html
+            String[] cqlshCommand = new String[] { "cqlsh" };
+
+            if (this.container instanceof CassandraContainer) {
+                CassandraContainer cassandraContainer = (CassandraContainer) this.container;
+                String username = cassandraContainer.getUsername();
+                String password = cassandraContainer.getPassword();
+                cqlshCommand = ArrayUtils.addAll(cqlshCommand, "-u", username, "-p", password);
+            }
+
+            // If no statement specified, directly execute the script specified into scriptPath (using -f argument),
+            // otherwise execute the given statement (using -e argument).
+            String executeArg = "-e";
+            String executeArgValue = statement;
+            if (StringUtils.isBlank(statement)) {
+                executeArg = "-f";
+                executeArgValue = scriptPath;
+            }
+            cqlshCommand = ArrayUtils.addAll(cqlshCommand, executeArg, executeArgValue);
+
+            Container.ExecResult result =
+                this.container.execInContainer(ExecConfig.builder().command(cqlshCommand).build());
+            if (result.getExitCode() == 0) {
+                if (StringUtils.isBlank(statement)) {
+                    log.info("CQL script {} successfully executed", scriptPath);
+                } else {
+                    log.info("CQL statement {} was applied", statement);
+                }
+            } else {
+                log.error("CQL script execution failed with error: \n{}", result.getStderr());
+                throw new ScriptStatementFailedException(statement, lineNumber, scriptPath);
+            }
+        } catch (IOException | InterruptedException e) {
+            throw new ScriptStatementFailedException(statement, lineNumber, scriptPath, e);
+        }
+    }
+
+    @Override
+    protected void closeConnectionQuietly(Void session) {
+        // Nothing to do here, because we run scripts using cqlsh command directly in the container.
+    }
+}
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java
new file mode 100644
index 00000000000..1d1004eb3df
--- /dev/null
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java
@@ -0,0 +1,47 @@
+package org.testcontainers.cassandra.wait;
+
+import org.rnorth.ducttape.TimeoutException;
+import org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.delegate.DatabaseDelegate;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;
+
+/**
+ * Waits until Cassandra returns its version
+ */
+public class CassandraQueryWaitStrategy extends AbstractWaitStrategy {
+
+    private static final String SELECT_VERSION_QUERY = "SELECT release_version FROM system.local";
+
+    private static final String TIMEOUT_ERROR = "Timed out waiting for Cassandra to be accessible for query execution";
+
+    @Override
+    protected void waitUntilReady() {
+        // execute select version query until success or timeout
+        try {
+            retryUntilSuccess(
+                (int) startupTimeout.getSeconds(),
+                TimeUnit.SECONDS,
+                () -> {
+                    getRateLimiter()
+                        .doWhenReady(() -> {
+                            try (DatabaseDelegate databaseDelegate = getDatabaseDelegate()) {
+                                databaseDelegate.execute(SELECT_VERSION_QUERY, "", 1, false, false);
+                            }
+                        });
+                    return true;
+                }
+            );
+        } catch (TimeoutException e) {
+            throw new ContainerLaunchException(TIMEOUT_ERROR);
+        }
+    }
+
+    private DatabaseDelegate getDatabaseDelegate() {
+        return new CassandraDatabaseDelegate(waitStrategyTarget);
+    }
+}
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index bb291cd1f80..0f5c67992c6 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -24,7 +24,10 @@
  * Supported image: {@code cassandra}
  * <p>
  * Exposed ports: 9042
+ *
+ * @deprecated use {@link org.testcontainers.cassandra.CassandraContainer} instead.
  */
+@Deprecated
 public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends GenericContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cassandra");
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
index 8d604822083..33372ca6c78 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
@@ -13,9 +13,12 @@
 
 /**
  * Cassandra database delegate
+ *
+ * @deprecated use {@link org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate} instead.
  */
 @Slf4j
 @RequiredArgsConstructor
+@Deprecated
 public class CassandraDatabaseDelegate extends AbstractDatabaseDelegate<Session> {
 
     private final ContainerState container;
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
index cffb1ba757e..362e33e3543 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
@@ -12,7 +12,10 @@
 
 /**
  * Waits until Cassandra returns its version
+ *
+ * @deprecated use {@link org.testcontainers.cassandra.wait.CassandraQueryWaitStrategy} instead.
  */
+@Deprecated
 public class CassandraQueryWaitStrategy extends AbstractWaitStrategy {
 
     private static final String SELECT_VERSION_QUERY = "SELECT release_version FROM system.local";
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
new file mode 100644
index 00000000000..4bf776b96c8
--- /dev/null
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
@@ -0,0 +1,150 @@
+package org.testcontainers.cassandra;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.CqlSessionBuilder;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import org.junit.Test;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CassandraContainerTest {
+
+    private static final String CASSANDRA_IMAGE = "cassandra:3.11.2";
+
+    private static final String TEST_CLUSTER_NAME_IN_CONF = "Test Cluster Integration Test";
+
+    private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
+
+    @Test
+    public void testSimple() {
+        try (CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)) {
+            cassandraContainer.start();
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+            assertThat(resultSet.one().getString(0)).as("Result set has release_version").isNotNull();
+        }
+    }
+
+    @Test
+    public void testSpecificVersion() {
+        String cassandraVersion = "3.0.15";
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer(
+                DockerImageName.parse("cassandra").withTag(cassandraVersion)
+            )
+        ) {
+            cassandraContainer.start();
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+            assertThat(resultSet.one().getString(0)).as("Cassandra has right version").isEqualTo(cassandraVersion);
+        }
+    }
+
+    @Test
+    public void testConfigurationOverride() {
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withConfigurationOverride("cassandra-test-configuration-example")
+        ) {
+            cassandraContainer.start();
+            ResultSet resultSet = performQuery(cassandraContainer, "SELECT cluster_name FROM system.local");
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+            assertThat(resultSet.one().getString(0))
+                .as("Cassandra configuration is overridden")
+                .isEqualTo(TEST_CLUSTER_NAME_IN_CONF);
+        }
+    }
+
+    @Test(expected = ContainerLaunchException.class)
+    public void testEmptyConfigurationOverride() {
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withConfigurationOverride("cassandra-empty-configuration")
+        ) {
+            cassandraContainer.start();
+        }
+    }
+
+    @Test
+    public void testInitScript() {
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withInitScript("initial.cql")
+        ) {
+            cassandraContainer.start();
+            testInitScript(cassandraContainer, false);
+        }
+    }
+
+    @Test
+    public void testInitScriptWithRequiredAuthentication() {
+        try (
+            // init-with-auth {
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withConfigurationOverride("cassandra-auth-required-configuration")
+                .withInitScript("initial.cql")
+            // }
+        ) {
+            cassandraContainer.start();
+            testInitScript(cassandraContainer, true);
+        }
+    }
+
+    @Test(expected = ContainerLaunchException.class)
+    public void testInitScriptWithError() {
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withInitScript("initial-with-error.cql")
+        ) {
+            cassandraContainer.start();
+        }
+    }
+
+    @Test
+    public void testInitScriptWithLegacyCassandra() {
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer("cassandra:2.2.11")
+                .withInitScript("initial.cql")
+        ) {
+            cassandraContainer.start();
+            testInitScript(cassandraContainer, false);
+        }
+    }
+
+    private void testInitScript(CassandraContainer cassandraContainer, boolean withCredentials) {
+        ResultSet resultSet = performQuery(
+            cassandraContainer,
+            "SELECT * FROM keySpaceTest.catalog_category",
+            withCredentials
+        );
+        assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+        Row row = resultSet.one();
+        assertThat(row.getLong(0)).as("Inserted row is in expected state").isEqualTo(1);
+        assertThat(row.getString(1)).as("Inserted row is in expected state").isEqualTo("test_category");
+    }
+
+    private ResultSet performQuery(CassandraContainer cassandraContainer, String cql) {
+        return performQuery(cassandraContainer, cql, false);
+    }
+
+    private ResultSet performQuery(CassandraContainer cassandraContainer, String cql, boolean withCredentials) {
+        final CqlSessionBuilder cqlSessionBuilder = CqlSession
+            .builder()
+            .addContactPoint(cassandraContainer.getContactPoint())
+            .withLocalDatacenter(cassandraContainer.getLocalDatacenter());
+        if (withCredentials) {
+            cqlSessionBuilder.withAuthCredentials(cassandraContainer.getUsername(), cassandraContainer.getPassword());
+        }
+        final CqlSession cqlSession = cqlSessionBuilder.build();
+        return performQuery(cqlSession, cql);
+    }
+
+    private ResultSet performQuery(CqlSession session, String cql) {
+        final ResultSet rs = session.execute(cql);
+        session.close();
+        return rs;
+    }
+}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java
new file mode 100644
index 00000000000..5e1b682e878
--- /dev/null
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java
@@ -0,0 +1,40 @@
+package org.testcontainers.cassandra;
+
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CassandraDriver4Test {
+
+    @Rule
+    // container-definition {
+    public CassandraContainer cassandra = new CassandraContainer("cassandra:3.11.2");
+
+    // }
+
+    @Test
+    public void testCassandraGetContactPoint() {
+        try (
+            // cql-session {
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(cassandra.getContactPoint())
+                .withLocalDatacenter(cassandra.getLocalDatacenter())
+                .build()
+            // }
+        ) {
+            session.execute(
+                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                "{'class':'SimpleStrategy','replication_factor':'1'};"
+            );
+
+            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
+
+            assertThat(keyspace).as("test keyspace created").isNotNull();
+        }
+    }
+}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java
new file mode 100644
index 00000000000..b509a77e9e8
--- /dev/null
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java
@@ -0,0 +1,35 @@
+package org.testcontainers.cassandra;
+
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CassandraServer4Test {
+
+    @Rule
+    public CassandraContainer cassandra = new CassandraContainer("cassandra:4.1.1");
+
+    @Test
+    public void testCassandraGetContactPoint() {
+        try (
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(this.cassandra.getContactPoint())
+                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
+                .build()
+        ) {
+            session.execute(
+                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                "{'class':'SimpleStrategy','replication_factor':'1'};"
+            );
+
+            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
+
+            assertThat(keyspace).as("test keyspace created").isNotNull();
+        }
+    }
+}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java
new file mode 100644
index 00000000000..d4e1c858382
--- /dev/null
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java
@@ -0,0 +1,35 @@
+package org.testcontainers.cassandra;
+
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CassandraServer5Test {
+
+    @Rule
+    public CassandraContainer cassandra = new CassandraContainer("cassandra:5");
+
+    @Test
+    public void testCassandraGetContactPoint() {
+        try (
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(this.cassandra.getContactPoint())
+                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
+                .build()
+        ) {
+            session.execute(
+                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
+                "{'class':'SimpleStrategy','replication_factor':'1'};"
+            );
+
+            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
+
+            assertThat(keyspace).as("test keyspace created").isNotNull();
+        }
+    }
+}
diff --git a/modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml b/modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml
new file mode 100644
index 00000000000..14095d4c627
--- /dev/null
+++ b/modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml
@@ -0,0 +1,1233 @@
+# Cassandra storage config YAML
+
+# NOTE:
+#   See http://wiki.apache.org/cassandra/StorageConfiguration for
+#   full explanations of configuration directives
+# /NOTE
+
+# The name of the cluster. This is mainly used to prevent machines in
+# one logical cluster from joining another.
+cluster_name: 'Test Cluster Integration Test'
+
+# This defines the number of tokens randomly assigned to this node on the ring
+# The more tokens, relative to other nodes, the larger the proportion of data
+# that this node will store. You probably want all nodes to have the same number
+# of tokens assuming they have equal hardware capability.
+#
+# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility,
+# and will use the initial_token as described below.
+#
+# Specifying initial_token will override this setting on the node's initial start,
+# on subsequent starts, this setting will apply even if initial token is set.
+#
+# If you already have a cluster with 1 token per node, and wish to migrate to
+# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations
+num_tokens: 256
+
+# Triggers automatic allocation of num_tokens tokens for this node. The allocation
+# algorithm attempts to choose tokens in a way that optimizes replicated load over
+# the nodes in the datacenter for the replication strategy used by the specified
+# keyspace.
+#
+# The load assigned to each node will be close to proportional to its number of
+# vnodes.
+#
+# Only supported with the Murmur3Partitioner.
+# allocate_tokens_for_keyspace: KEYSPACE
+
+# initial_token allows you to specify tokens manually.  While you can use it with
+# vnodes (num_tokens > 1, above) -- in which case you should provide a
+# comma-separated list -- it's primarily used when adding nodes to legacy clusters
+# that do not have vnodes enabled.
+# initial_token:
+
+# See http://wiki.apache.org/cassandra/HintedHandoff
+# May either be "true" or "false" to enable globally
+hinted_handoff_enabled: true
+
+# When hinted_handoff_enabled is true, a black list of data centers that will not
+# perform hinted handoff
+# hinted_handoff_disabled_datacenters:
+#    - DC1
+#    - DC2
+
+# this defines the maximum amount of time a dead host will have hints
+# generated.  After it has been dead this long, new hints for it will not be
+# created until it has been seen alive and gone down again.
+max_hint_window_in_ms: 10800000 # 3 hours
+
+# Maximum throttle in KBs per second, per delivery thread.  This will be
+# reduced proportionally to the number of nodes in the cluster.  (If there
+# are two nodes in the cluster, each delivery thread will use the maximum
+# rate; if there are three, each will throttle to half of the maximum,
+# since we expect two nodes to be delivering hints simultaneously.)
+hinted_handoff_throttle_in_kb: 1024
+
+# Number of threads with which to deliver hints;
+# Consider increasing this number when you have multi-dc deployments, since
+# cross-dc handoff tends to be slower
+max_hints_delivery_threads: 2
+
+# Directory where Cassandra should store hints.
+# If not set, the default directory is $CASSANDRA_HOME/data/hints.
+# hints_directory: /var/lib/cassandra/hints
+
+# How often hints should be flushed from the internal buffers to disk.
+# Will *not* trigger fsync.
+hints_flush_period_in_ms: 10000
+
+# Maximum size for a single hints file, in megabytes.
+max_hints_file_size_in_mb: 128
+
+# Compression to apply to the hint files. If omitted, hints files
+# will be written uncompressed. LZ4, Snappy, and Deflate compressors
+# are supported.
+#hints_compression:
+#   - class_name: LZ4Compressor
+#     parameters:
+#         -
+
+# Maximum throttle in KBs per second, total. This will be
+# reduced proportionally to the number of nodes in the cluster.
+batchlog_replay_throttle_in_kb: 1024
+
+# Authentication backend, implementing IAuthenticator; used to identify users
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator,
+# PasswordAuthenticator}.
+#
+# - AllowAllAuthenticator performs no checks - set it to disable authentication.
+# - PasswordAuthenticator relies on username/password pairs to authenticate
+#   users. It keeps usernames and hashed passwords in system_auth.roles table.
+#   Please increase system_auth keyspace replication factor if you use this authenticator.
+#   If using PasswordAuthenticator, CassandraRoleManager must also be used (see below)
+authenticator: PasswordAuthenticator
+
+# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer,
+# CassandraAuthorizer}.
+#
+# - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
+# - CassandraAuthorizer stores permissions in system_auth.role_permissions table. Please
+#   increase system_auth keyspace replication factor if you use this authorizer.
+authorizer: AllowAllAuthorizer
+
+# Part of the Authentication & Authorization backend, implementing IRoleManager; used
+# to maintain grants and memberships between roles.
+# Out of the box, Cassandra provides org.apache.cassandra.auth.CassandraRoleManager,
+# which stores role information in the system_auth keyspace. Most functions of the
+# IRoleManager require an authenticated login, so unless the configured IAuthenticator
+# actually implements authentication, most of this functionality will be unavailable.
+#
+# - CassandraRoleManager stores role data in the system_auth keyspace. Please
+#   increase system_auth keyspace replication factor if you use this role manager.
+role_manager: CassandraRoleManager
+
+# Validity period for roles cache (fetching granted roles can be an expensive
+# operation depending on the role manager, CassandraRoleManager is one example)
+# Granted roles are cached for authenticated sessions in AuthenticatedUser and
+# after the period specified here, become eligible for (async) reload.
+# Defaults to 2000, set to 0 to disable caching entirely.
+# Will be disabled automatically for AllowAllAuthenticator.
+roles_validity_in_ms: 2000
+
+# Refresh interval for roles cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If roles_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as roles_validity_in_ms.
+# roles_update_interval_in_ms: 2000
+
+# Validity period for permissions cache (fetching permissions can be an
+# expensive operation depending on the authorizer, CassandraAuthorizer is
+# one example). Defaults to 2000, set to 0 to disable.
+# Will be disabled automatically for AllowAllAuthorizer.
+permissions_validity_in_ms: 2000
+
+# Refresh interval for permissions cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If permissions_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as permissions_validity_in_ms.
+# permissions_update_interval_in_ms: 2000
+
+# Validity period for credentials cache. This cache is tightly coupled to
+# the provided PasswordAuthenticator implementation of IAuthenticator. If
+# another IAuthenticator implementation is configured, this cache will not
+# be automatically used and so the following settings will have no effect.
+# Please note, credentials are cached in their encrypted form, so while
+# activating this cache may reduce the number of queries made to the
+# underlying table, it may not  bring a significant reduction in the
+# latency of individual authentication attempts.
+# Defaults to 2000, set to 0 to disable credentials caching.
+credentials_validity_in_ms: 2000
+
+# Refresh interval for credentials cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If credentials_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as credentials_validity_in_ms.
+# credentials_update_interval_in_ms: 2000
+
+# The partitioner is responsible for distributing groups of rows (by
+# partition key) across nodes in the cluster.  You should leave this
+# alone for new clusters.  The partitioner can NOT be changed without
+# reloading all data, so when upgrading you should set this to the
+# same partitioner you were already using.
+#
+# Besides Murmur3Partitioner, partitioners included for backwards
+# compatibility include RandomPartitioner, ByteOrderedPartitioner, and
+# OrderPreservingPartitioner.
+#
+partitioner: org.apache.cassandra.dht.Murmur3Partitioner
+
+# Directories where Cassandra should store data on disk.  Cassandra
+# will spread data evenly across them, subject to the granularity of
+# the configured compaction strategy.
+# If not set, the default directory is $CASSANDRA_HOME/data/data.
+data_file_directories:
+    - /var/lib/cassandra/data
+
+# commit log.  when running on magnetic HDD, this should be a
+# separate spindle than the data directories.
+# If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
+commitlog_directory: /var/lib/cassandra/commitlog
+
+# Enable / disable CDC functionality on a per-node basis. This modifies the logic used
+# for write path allocation rejection (standard: never reject. cdc: reject Mutation
+# containing a CDC-enabled table if at space limit in cdc_raw_directory).
+cdc_enabled: false
+
+# CommitLogSegments are moved to this directory on flush if cdc_enabled: true and the
+# segment contains mutations for a CDC-enabled table. This should be placed on a
+# separate spindle than the data directories. If not set, the default directory is
+# $CASSANDRA_HOME/data/cdc_raw.
+# cdc_raw_directory: /var/lib/cassandra/cdc_raw
+
+# Policy for data disk failures:
+#
+# die
+#   shut down gossip and client transports and kill the JVM for any fs errors or
+#   single-sstable errors, so the node can be replaced.
+#
+# stop_paranoid
+#   shut down gossip and client transports even for single-sstable errors,
+#   kill the JVM for errors during startup.
+#
+# stop
+#   shut down gossip and client transports, leaving the node effectively dead, but
+#   can still be inspected via JMX, kill the JVM for errors during startup.
+#
+# best_effort
+#    stop using the failed disk and respond to requests based on
+#    remaining available sstables.  This means you WILL see obsolete
+#    data at CL.ONE!
+#
+# ignore
+#    ignore fatal errors and let requests fail, as in pre-1.2 Cassandra
+disk_failure_policy: stop
+
+# Policy for commit disk failures:
+#
+# die
+#   shut down gossip and Thrift and kill the JVM, so the node can be replaced.
+#
+# stop
+#   shut down gossip and Thrift, leaving the node effectively dead, but
+#   can still be inspected via JMX.
+#
+# stop_commit
+#   shutdown the commit log, letting writes collect but
+#   continuing to service reads, as in pre-2.0.5 Cassandra
+#
+# ignore
+#   ignore fatal errors and let the batches fail
+commit_failure_policy: stop
+
+# Maximum size of the native protocol prepared statement cache
+#
+# Valid values are either "auto" (omitting the value) or a value greater 0.
+#
+# Note that specifying a too large value will result in long running GCs and possbily
+# out-of-memory errors. Keep the value at a small fraction of the heap.
+#
+# If you constantly see "prepared statements discarded in the last minute because
+# cache limit reached" messages, the first step is to investigate the root cause
+# of these messages and check whether prepared statements are used correctly -
+# i.e. use bind markers for variable parts.
+#
+# Do only change the default value, if you really have more prepared statements than
+# fit in the cache. In most cases it is not neccessary to change this value.
+# Constantly re-preparing statements is a performance penalty.
+#
+# Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
+prepared_statements_cache_size_mb:
+
+# Maximum size of the Thrift prepared statement cache
+#
+# If you do not use Thrift at all, it is safe to leave this value at "auto".
+#
+# See description of 'prepared_statements_cache_size_mb' above for more information.
+#
+# Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
+thrift_prepared_statements_cache_size_mb:
+
+# Maximum size of the key cache in memory.
+#
+# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the
+# minimum, sometimes more. The key cache is fairly tiny for the amount of
+# time it saves, so it's worthwhile to use it at large numbers.
+# The row cache saves even more time, but must contain the entire row,
+# so it is extremely space-intensive. It's best to only use the
+# row cache if you have hot rows or static rows.
+#
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache.
+key_cache_size_in_mb:
+
+# Duration in seconds after which Cassandra should
+# save the key cache. Caches are saved to saved_caches_directory as
+# specified in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 14400 or 4 hours.
+key_cache_save_period: 14400
+
+# Number of keys from the key cache to save
+# Disabled by default, meaning all keys are going to be saved
+# key_cache_keys_to_save: 100
+
+# Row cache implementation class name. Available implementations:
+#
+# org.apache.cassandra.cache.OHCProvider
+#   Fully off-heap row cache implementation (default).
+#
+# org.apache.cassandra.cache.SerializingCacheProvider
+#   This is the row cache implementation availabile
+#   in previous releases of Cassandra.
+# row_cache_class_name: org.apache.cassandra.cache.OHCProvider
+
+# Maximum size of the row cache in memory.
+# Please note that OHC cache implementation requires some additional off-heap memory to manage
+# the map structures and some in-flight memory during operations before/after cache entries can be
+# accounted against the cache capacity. This overhead is usually small compared to the whole capacity.
+# Do not specify more memory that the system can afford in the worst usual situation and leave some
+# headroom for OS block level cache. Do never allow your system to swap.
+#
+# Default value is 0, to disable row caching.
+row_cache_size_in_mb: 0
+
+# Duration in seconds after which Cassandra should save the row cache.
+# Caches are saved to saved_caches_directory as specified in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 0 to disable saving the row cache.
+row_cache_save_period: 0
+
+# Number of keys from the row cache to save.
+# Specify 0 (which is the default), meaning all keys are going to be saved
+# row_cache_keys_to_save: 100
+
+# Maximum size of the counter cache in memory.
+#
+# Counter cache helps to reduce counter locks' contention for hot counter cells.
+# In case of RF = 1 a counter cache hit will cause Cassandra to skip the read before
+# write entirely. With RF > 1 a counter cache hit will still help to reduce the duration
+# of the lock hold, helping with hot counter cell updates, but will not allow skipping
+# the read entirely. Only the local (clock, count) tuple of a counter cell is kept
+# in memory, not the whole counter, so it's relatively cheap.
+#
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is empty to make it "auto" (min(2.5% of Heap (in MB), 50MB)). Set to 0 to disable counter cache.
+# NOTE: if you perform counter deletes and rely on low gcgs, you should disable the counter cache.
+counter_cache_size_in_mb:
+
+# Duration in seconds after which Cassandra should
+# save the counter cache (keys only). Caches are saved to saved_caches_directory as
+# specified in this configuration file.
+#
+# Default is 7200 or 2 hours.
+counter_cache_save_period: 7200
+
+# Number of keys from the counter cache to save
+# Disabled by default, meaning all keys are going to be saved
+# counter_cache_keys_to_save: 100
+
+# saved caches
+# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
+saved_caches_directory: /var/lib/cassandra/saved_caches
+
+# commitlog_sync may be either "periodic" or "batch."
+#
+# When in batch mode, Cassandra won't ack writes until the commit log
+# has been fsynced to disk.  It will wait
+# commitlog_sync_batch_window_in_ms milliseconds between fsyncs.
+# This window should be kept short because the writer threads will
+# be unable to do extra work while waiting.  (You may need to increase
+# concurrent_writes for the same reason.)
+#
+# commitlog_sync: batch
+# commitlog_sync_batch_window_in_ms: 2
+#
+# the other option is "periodic" where writes may be acked immediately
+# and the CommitLog is simply synced every commitlog_sync_period_in_ms
+# milliseconds.
+commitlog_sync: periodic
+commitlog_sync_period_in_ms: 10000
+
+# The size of the individual commitlog file segments.  A commitlog
+# segment may be archived, deleted, or recycled once all the data
+# in it (potentially from each columnfamily in the system) has been
+# flushed to sstables.
+#
+# The default size is 32, which is almost always fine, but if you are
+# archiving commitlog segments (see commitlog_archiving.properties),
+# then you probably want a finer granularity of archiving; 8 or 16 MB
+# is reasonable.
+# Max mutation size is also configurable via max_mutation_size_in_kb setting in
+# cassandra.yaml. The default is half the size commitlog_segment_size_in_mb * 1024.
+# This should be positive and less than 2048.
+#
+# NOTE: If max_mutation_size_in_kb is set explicitly then commitlog_segment_size_in_mb must
+# be set to at least twice the size of max_mutation_size_in_kb / 1024
+#
+commitlog_segment_size_in_mb: 32
+
+# Compression to apply to the commit log. If omitted, the commit log
+# will be written uncompressed.  LZ4, Snappy, and Deflate compressors
+# are supported.
+# commitlog_compression:
+#   - class_name: LZ4Compressor
+#     parameters:
+#         -
+
+# any class that implements the SeedProvider interface and has a
+# constructor that takes a Map<String, String> of parameters will do.
+seed_provider:
+    # Addresses of hosts that are deemed contact points.
+    # Cassandra nodes use this list of hosts to find each other and learn
+    # the topology of the ring.  You must change this if you are running
+    # multiple nodes!
+    - class_name: org.apache.cassandra.locator.SimpleSeedProvider
+      parameters:
+          # seeds is actually a comma-delimited list of addresses.
+          # Ex: "<ip1>,<ip2>,<ip3>"
+          - seeds: "172.17.0.2"
+
+# For workloads with more data than can fit in memory, Cassandra's
+# bottleneck will be reads that need to fetch data from
+# disk. "concurrent_reads" should be set to (16 * number_of_drives) in
+# order to allow the operations to enqueue low enough in the stack
+# that the OS and drives can reorder them. Same applies to
+# "concurrent_counter_writes", since counter writes read the current
+# values before incrementing and writing them back.
+#
+# On the other hand, since writes are almost never IO bound, the ideal
+# number of "concurrent_writes" is dependent on the number of cores in
+# your system; (8 * number_of_cores) is a good rule of thumb.
+concurrent_reads: 32
+concurrent_writes: 32
+concurrent_counter_writes: 32
+
+# For materialized view writes, as there is a read involved, so this should
+# be limited by the less of concurrent reads or concurrent writes.
+concurrent_materialized_view_writes: 32
+
+# Maximum memory to use for sstable chunk cache and buffer pooling.
+# 32MB of this are reserved for pooling buffers, the rest is used as an
+# cache that holds uncompressed sstable chunks.
+# Defaults to the smaller of 1/4 of heap or 512MB. This pool is allocated off-heap,
+# so is in addition to the memory allocated for heap. The cache also has on-heap
+# overhead which is roughly 128 bytes per chunk (i.e. 0.2% of the reserved size
+# if the default 64k chunk size is used).
+# Memory is only allocated when needed.
+# file_cache_size_in_mb: 512
+
+# Flag indicating whether to allocate on or off heap when the sstable buffer
+# pool is exhausted, that is when it has exceeded the maximum memory
+# file_cache_size_in_mb, beyond which it will not cache buffers but allocate on request.
+
+# buffer_pool_use_heap_if_exhausted: true
+
+# The strategy for optimizing disk read
+# Possible values are:
+# ssd (for solid state disks, the default)
+# spinning (for spinning disks)
+# disk_optimization_strategy: ssd
+
+# Total permitted memory to use for memtables. Cassandra will stop
+# accepting writes when the limit is exceeded until a flush completes,
+# and will trigger a flush based on memtable_cleanup_threshold
+# If omitted, Cassandra will set both to 1/4 the size of the heap.
+# memtable_heap_space_in_mb: 2048
+# memtable_offheap_space_in_mb: 2048
+
+# memtable_cleanup_threshold is deprecated. The default calculation
+# is the only reasonable choice. See the comments on  memtable_flush_writers
+# for more information.
+#
+# Ratio of occupied non-flushing memtable size to total permitted size
+# that will trigger a flush of the largest memtable. Larger mct will
+# mean larger flushes and hence less compaction, but also less concurrent
+# flush activity which can make it difficult to keep your disks fed
+# under heavy write load.
+#
+# memtable_cleanup_threshold defaults to 1 / (memtable_flush_writers + 1)
+# memtable_cleanup_threshold: 0.11
+
+# Specify the way Cassandra allocates and manages memtable memory.
+# Options are:
+#
+# heap_buffers
+#   on heap nio buffers
+#
+# offheap_buffers
+#   off heap (direct) nio buffers
+#
+# offheap_objects
+#    off heap objects
+memtable_allocation_type: heap_buffers
+
+# Total space to use for commit logs on disk.
+#
+# If space gets above this value, Cassandra will flush every dirty CF
+# in the oldest segment and remove it.  So a small total commitlog space
+# will tend to cause more flush activity on less-active columnfamilies.
+#
+# The default value is the smaller of 8192, and 1/4 of the total space
+# of the commitlog volume.
+#
+# commitlog_total_space_in_mb: 8192
+
+# This sets the number of memtable flush writer threads per disk
+# as well as the total number of memtables that can be flushed concurrently.
+# These are generally a combination of compute and IO bound.
+#
+# Memtable flushing is more CPU efficient than memtable ingest and a single thread
+# can keep up with the ingest rate of a whole server on a single fast disk
+# until it temporarily becomes IO bound under contention typically with compaction.
+# At that point you need multiple flush threads. At some point in the future
+# it may become CPU bound all the time.
+#
+# You can tell if flushing is falling behind using the MemtablePool.BlockedOnAllocation
+# metric which should be 0, but will be non-zero if threads are blocked waiting on flushing
+# to free memory.
+#
+# memtable_flush_writers defaults to two for a single data directory.
+# This means that two  memtables can be flushed concurrently to the single data directory.
+# If you have multiple data directories the default is one memtable flushing at a time
+# but the flush will use a thread per data directory so you will get two or more writers.
+#
+# Two is generally enough to flush on a fast disk [array] mounted as a single data directory.
+# Adding more flush writers will result in smaller more frequent flushes that introduce more
+# compaction overhead.
+#
+# There is a direct tradeoff between number of memtables that can be flushed concurrently
+# and flush size and frequency. More is not better you just need enough flush writers
+# to never stall waiting for flushing to free memory.
+#
+#memtable_flush_writers: 2
+
+# Total space to use for change-data-capture logs on disk.
+#
+# If space gets above this value, Cassandra will throw WriteTimeoutException
+# on Mutations including tables with CDC enabled. A CDCCompactor is responsible
+# for parsing the raw CDC logs and deleting them when parsing is completed.
+#
+# The default value is the min of 4096 mb and 1/8th of the total space
+# of the drive where cdc_raw_directory resides.
+# cdc_total_space_in_mb: 4096
+
+# When we hit our cdc_raw limit and the CDCCompactor is either running behind
+# or experiencing backpressure, we check at the following interval to see if any
+# new space for cdc-tracked tables has been made available. Default to 250ms
+# cdc_free_space_check_interval_ms: 250
+
+# A fixed memory pool size in MB for for SSTable index summaries. If left
+# empty, this will default to 5% of the heap size. If the memory usage of
+# all index summaries exceeds this limit, SSTables with low read rates will
+# shrink their index summaries in order to meet this limit.  However, this
+# is a best-effort process. In extreme conditions Cassandra may need to use
+# more than this amount of memory.
+index_summary_capacity_in_mb:
+
+# How frequently index summaries should be resampled.  This is done
+# periodically to redistribute memory from the fixed-size pool to sstables
+# proportional their recent read rates.  Setting to -1 will disable this
+# process, leaving existing index summaries at their current sampling level.
+index_summary_resize_interval_in_minutes: 60
+
+# Whether to, when doing sequential writing, fsync() at intervals in
+# order to force the operating system to flush the dirty
+# buffers. Enable this to avoid sudden dirty buffer flushing from
+# impacting read latencies. Almost always a good idea on SSDs; not
+# necessarily on platters.
+trickle_fsync: false
+trickle_fsync_interval_in_kb: 10240
+
+# TCP port, for commands and data
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+storage_port: 7000
+
+# SSL port, for encrypted communication.  Unused unless enabled in
+# encryption_options
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+ssl_storage_port: 7001
+
+# Address or interface to bind to and tell other Cassandra nodes to connect to.
+# You _must_ change this if you want multiple nodes to be able to communicate!
+#
+# Set listen_address OR listen_interface, not both.
+#
+# Leaving it blank leaves it up to InetAddress.getLocalHost(). This
+# will always do the Right Thing _if_ the node is properly configured
+# (hostname, name resolution, etc), and the Right Thing is to use the
+# address associated with the hostname (it might not be).
+#
+# Setting listen_address to 0.0.0.0 is always wrong.
+#
+listen_address: 172.17.0.2
+
+# Set listen_address OR listen_interface, not both. Interfaces must correspond
+# to a single address, IP aliasing is not supported.
+# listen_interface: eth0
+
+# If you choose to specify the interface by name and the interface has an ipv4 and an ipv6 address
+# you can specify which should be chosen using listen_interface_prefer_ipv6. If false the first ipv4
+# address will be used. If true the first ipv6 address will be used. Defaults to false preferring
+# ipv4. If there is only one address it will be selected regardless of ipv4/ipv6.
+# listen_interface_prefer_ipv6: false
+
+# Address to broadcast to other Cassandra nodes
+# Leaving this blank will set it to the same value as listen_address
+broadcast_address: 172.17.0.2
+
+# When using multiple physical network interfaces, set this
+# to true to listen on broadcast_address in addition to
+# the listen_address, allowing nodes to communicate in both
+# interfaces.
+# Ignore this property if the network configuration automatically
+# routes  between the public and private networks such as EC2.
+# listen_on_broadcast_address: false
+
+# Internode authentication backend, implementing IInternodeAuthenticator;
+# used to allow/disallow connections from peer nodes.
+# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator
+
+# Whether to start the native transport server.
+# Please note that the address on which the native transport is bound is the
+# same as the rpc_address. The port however is different and specified below.
+start_native_transport: true
+# port for the CQL native transport to listen for clients on
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+native_transport_port: 9042
+# Enabling native transport encryption in client_encryption_options allows you to either use
+# encryption for the standard port or to use a dedicated, additional port along with the unencrypted
+# standard native_transport_port.
+# Enabling client encryption and keeping native_transport_port_ssl disabled will use encryption
+# for native_transport_port. Setting native_transport_port_ssl to a different value
+# from native_transport_port will use encryption for native_transport_port_ssl while
+# keeping native_transport_port unencrypted.
+# native_transport_port_ssl: 9142
+# The maximum threads for handling requests when the native transport is used.
+# This is similar to rpc_max_threads though the default differs slightly (and
+# there is no native_transport_min_threads, idle threads will always be stopped
+# after 30 seconds).
+# native_transport_max_threads: 128
+#
+# The maximum size of allowed frame. Frame (requests) larger than this will
+# be rejected as invalid. The default is 256MB. If you're changing this parameter,
+# you may want to adjust max_value_size_in_mb accordingly. This should be positive and less than 2048.
+# native_transport_max_frame_size_in_mb: 256
+
+# The maximum number of concurrent client connections.
+# The default is -1, which means unlimited.
+# native_transport_max_concurrent_connections: -1
+
+# The maximum number of concurrent client connections per source ip.
+# The default is -1, which means unlimited.
+# native_transport_max_concurrent_connections_per_ip: -1
+
+# Whether to start the thrift rpc server.
+start_rpc: false
+
+# The address or interface to bind the Thrift RPC service and native transport
+# server to.
+#
+# Set rpc_address OR rpc_interface, not both.
+#
+# Leaving rpc_address blank has the same effect as on listen_address
+# (i.e. it will be based on the configured hostname of the node).
+#
+# Note that unlike listen_address, you can specify 0.0.0.0, but you must also
+# set broadcast_rpc_address to a value other than 0.0.0.0.
+#
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+rpc_address: 0.0.0.0
+
+# Set rpc_address OR rpc_interface, not both. Interfaces must correspond
+# to a single address, IP aliasing is not supported.
+# rpc_interface: eth1
+
+# If you choose to specify the interface by name and the interface has an ipv4 and an ipv6 address
+# you can specify which should be chosen using rpc_interface_prefer_ipv6. If false the first ipv4
+# address will be used. If true the first ipv6 address will be used. Defaults to false preferring
+# ipv4. If there is only one address it will be selected regardless of ipv4/ipv6.
+# rpc_interface_prefer_ipv6: false
+
+# port for Thrift to listen for clients on
+rpc_port: 9160
+
+# RPC address to broadcast to drivers and other Cassandra nodes. This cannot
+# be set to 0.0.0.0. If left blank, this will be set to the value of
+# rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must
+# be set.
+broadcast_rpc_address: 172.17.0.2
+
+# enable or disable keepalive on rpc/native connections
+rpc_keepalive: true
+
+# Cassandra provides two out-of-the-box options for the RPC Server:
+#
+# sync
+#   One thread per thrift connection. For a very large number of clients, memory
+#   will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size
+#   per thread, and that will correspond to your use of virtual memory (but physical memory
+#   may be limited depending on use of stack space).
+#
+# hsha
+#   Stands for "half synchronous, half asynchronous." All thrift clients are handled
+#   asynchronously using a small number of threads that does not vary with the amount
+#   of thrift clients (and thus scales well to many clients). The rpc requests are still
+#   synchronous (one thread per active request). If hsha is selected then it is essential
+#   that rpc_max_threads is changed from the default value of unlimited.
+#
+# The default is sync because on Windows hsha is about 30% slower.  On Linux,
+# sync/hsha performance is about the same, with hsha of course using less memory.
+#
+# Alternatively,  can provide your own RPC server by providing the fully-qualified class name
+# of an o.a.c.t.TServerFactory that can create an instance of it.
+rpc_server_type: sync
+
+# Uncomment rpc_min|max_thread to set request pool size limits.
+#
+# Regardless of your choice of RPC server (see above), the number of maximum requests in the
+# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync
+# RPC server, it also dictates the number of clients that can be connected at all).
+#
+# The default is unlimited and thus provides no protection against clients overwhelming the server. You are
+# encouraged to set a maximum that makes sense for you in production, but do keep in mind that
+# rpc_max_threads represents the maximum number of client requests this server may execute concurrently.
+#
+# rpc_min_threads: 16
+# rpc_max_threads: 2048
+
+# uncomment to set socket buffer sizes on rpc connections
+# rpc_send_buff_size_in_bytes:
+# rpc_recv_buff_size_in_bytes:
+
+# Uncomment to set socket buffer size for internode communication
+# Note that when setting this, the buffer size is limited by net.core.wmem_max
+# and when not setting it it is defined by net.ipv4.tcp_wmem
+# See also:
+# /proc/sys/net/core/wmem_max
+# /proc/sys/net/core/rmem_max
+# /proc/sys/net/ipv4/tcp_wmem
+# /proc/sys/net/ipv4/tcp_wmem
+# and 'man tcp'
+# internode_send_buff_size_in_bytes:
+
+# Uncomment to set socket buffer size for internode communication
+# Note that when setting this, the buffer size is limited by net.core.wmem_max
+# and when not setting it it is defined by net.ipv4.tcp_wmem
+# internode_recv_buff_size_in_bytes:
+
+# Frame size for thrift (maximum message length).
+thrift_framed_transport_size_in_mb: 15
+
+# Set to true to have Cassandra create a hard link to each sstable
+# flushed or streamed locally in a backups/ subdirectory of the
+# keyspace data.  Removing these links is the operator's
+# responsibility.
+incremental_backups: false
+
+# Whether or not to take a snapshot before each compaction.  Be
+# careful using this option, since Cassandra won't clean up the
+# snapshots for you.  Mostly useful if you're paranoid when there
+# is a data format change.
+snapshot_before_compaction: false
+
+# Whether or not a snapshot is taken of the data before keyspace truncation
+# or dropping of column families. The STRONGLY advised default of true
+# should be used to provide data safety. If you set this flag to false, you will
+# lose data on truncation or drop.
+auto_snapshot: true
+
+# Granularity of the collation index of rows within a partition.
+# Increase if your rows are large, or if you have a very large
+# number of rows per partition.  The competing goals are these:
+#
+# - a smaller granularity means more index entries are generated
+#   and looking up rows withing the partition by collation column
+#   is faster
+# - but, Cassandra will keep the collation index in memory for hot
+#   rows (as part of the key cache), so a larger granularity means
+#   you can cache more hot rows
+column_index_size_in_kb: 64
+
+# Per sstable indexed key cache entries (the collation index in memory
+# mentioned above) exceeding this size will not be held on heap.
+# This means that only partition information is held on heap and the
+# index entries are read from disk.
+#
+# Note that this size refers to the size of the
+# serialized index information and not the size of the partition.
+column_index_cache_size_in_kb: 2
+
+# Number of simultaneous compactions to allow, NOT including
+# validation "compactions" for anti-entropy repair.  Simultaneous
+# compactions can help preserve read performance in a mixed read/write
+# workload, by mitigating the tendency of small sstables to accumulate
+# during a single long running compactions. The default is usually
+# fine and if you experience problems with compaction running too
+# slowly or too fast, you should look at
+# compaction_throughput_mb_per_sec first.
+#
+# concurrent_compactors defaults to the smaller of (number of disks,
+# number of cores), with a minimum of 2 and a maximum of 8.
+#
+# If your data directories are backed by SSD, you should increase this
+# to the number of cores.
+#concurrent_compactors: 1
+
+# Throttles compaction to the given total throughput across the entire
+# system. The faster you insert data, the faster you need to compact in
+# order to keep the sstable count down, but in general, setting this to
+# 16 to 32 times the rate you are inserting data is more than sufficient.
+# Setting this to 0 disables throttling. Note that this account for all types
+# of compaction, including validation compaction.
+compaction_throughput_mb_per_sec: 16
+
+# When compacting, the replacement sstable(s) can be opened before they
+# are completely written, and used in place of the prior sstables for
+# any range that has been written. This helps to smoothly transfer reads
+# between the sstables, reducing page cache churn and keeping hot rows hot
+sstable_preemptive_open_interval_in_mb: 50
+
+# Throttles all outbound streaming file transfers on this node to the
+# given total throughput in Mbps. This is necessary because Cassandra does
+# mostly sequential IO when streaming data during bootstrap or repair, which
+# can lead to saturating the network connection and degrading rpc performance.
+# When unset, the default is 200 Mbps or 25 MB/s.
+# stream_throughput_outbound_megabits_per_sec: 200
+
+# Throttles all streaming file transfer between the datacenters,
+# this setting allows users to throttle inter dc stream throughput in addition
+# to throttling all network stream traffic as configured with
+# stream_throughput_outbound_megabits_per_sec
+# When unset, the default is 200 Mbps or 25 MB/s
+# inter_dc_stream_throughput_outbound_megabits_per_sec: 200
+
+# How long the coordinator should wait for read operations to complete
+read_request_timeout_in_ms: 5000
+# How long the coordinator should wait for seq or index scans to complete
+range_request_timeout_in_ms: 10000
+# How long the coordinator should wait for writes to complete
+write_request_timeout_in_ms: 2000
+# How long the coordinator should wait for counter writes to complete
+counter_write_request_timeout_in_ms: 5000
+# How long a coordinator should continue to retry a CAS operation
+# that contends with other proposals for the same row
+cas_contention_timeout_in_ms: 1000
+# How long the coordinator should wait for truncates to complete
+# (This can be much longer, because unless auto_snapshot is disabled
+# we need to flush first so we can snapshot before removing the data.)
+truncate_request_timeout_in_ms: 60000
+# The default timeout for other, miscellaneous operations
+request_timeout_in_ms: 10000
+
+# How long before a node logs slow queries. Select queries that take longer than
+# this timeout to execute, will generate an aggregated log message, so that slow queries
+# can be identified. Set this value to zero to disable slow query logging.
+slow_query_log_timeout_in_ms: 500
+
+# Enable operation timeout information exchange between nodes to accurately
+# measure request timeouts.  If disabled, replicas will assume that requests
+# were forwarded to them instantly by the coordinator, which means that
+# under overload conditions we will waste that much extra time processing
+# already-timed-out requests.
+#
+# Warning: before enabling this property make sure to ntp is installed
+# and the times are synchronized between the nodes.
+cross_node_timeout: false
+
+# Set keep-alive period for streaming
+# This node will send a keep-alive message periodically with this period.
+# If the node does not receive a keep-alive message from the peer for
+# 2 keep-alive cycles the stream session times out and fail
+# Default value is 300s (5 minutes), which means stalled stream
+# times out in 10 minutes by default
+# streaming_keep_alive_period_in_secs: 300
+
+# phi value that must be reached for a host to be marked down.
+# most users should never need to adjust this.
+# phi_convict_threshold: 8
+
+# endpoint_snitch -- Set this to a class that implements
+# IEndpointSnitch.  The snitch has two functions:
+#
+# - it teaches Cassandra enough about your network topology to route
+#   requests efficiently
+# - it allows Cassandra to spread replicas around your cluster to avoid
+#   correlated failures. It does this by grouping machines into
+#   "datacenters" and "racks."  Cassandra will do its best not to have
+#   more than one replica on the same "rack" (which may not actually
+#   be a physical location)
+#
+# CASSANDRA WILL NOT ALLOW YOU TO SWITCH TO AN INCOMPATIBLE SNITCH
+# ONCE DATA IS INSERTED INTO THE CLUSTER.  This would cause data loss.
+# This means that if you start with the default SimpleSnitch, which
+# locates every node on "rack1" in "datacenter1", your only options
+# if you need to add another datacenter are GossipingPropertyFileSnitch
+# (and the older PFS).  From there, if you want to migrate to an
+# incompatible snitch like Ec2Snitch you can do it by adding new nodes
+# under Ec2Snitch (which will locate them in a new "datacenter") and
+# decommissioning the old ones.
+#
+# Out of the box, Cassandra provides:
+#
+# SimpleSnitch:
+#    Treats Strategy order as proximity. This can improve cache
+#    locality when disabling read repair.  Only appropriate for
+#    single-datacenter deployments.
+#
+# GossipingPropertyFileSnitch
+#    This should be your go-to snitch for production use.  The rack
+#    and datacenter for the local node are defined in
+#    cassandra-rackdc.properties and propagated to other nodes via
+#    gossip.  If cassandra-topology.properties exists, it is used as a
+#    fallback, allowing migration from the PropertyFileSnitch.
+#
+# PropertyFileSnitch:
+#    Proximity is determined by rack and data center, which are
+#    explicitly configured in cassandra-topology.properties.
+#
+# Ec2Snitch:
+#    Appropriate for EC2 deployments in a single Region. Loads Region
+#    and Availability Zone information from the EC2 API. The Region is
+#    treated as the datacenter, and the Availability Zone as the rack.
+#    Only private IPs are used, so this will not work across multiple
+#    Regions.
+#
+# Ec2MultiRegionSnitch:
+#    Uses public IPs as broadcast_address to allow cross-region
+#    connectivity.  (Thus, you should set seed addresses to the public
+#    IP as well.) You will need to open the storage_port or
+#    ssl_storage_port on the public IP firewall.  (For intra-Region
+#    traffic, Cassandra will switch to the private IP after
+#    establishing a connection.)
+#
+# RackInferringSnitch:
+#    Proximity is determined by rack and data center, which are
+#    assumed to correspond to the 3rd and 2nd octet of each node's IP
+#    address, respectively.  Unless this happens to match your
+#    deployment conventions, this is best used as an example of
+#    writing a custom Snitch class and is provided in that spirit.
+#
+# You can use a custom Snitch by setting this to the full class name
+# of the snitch, which will be assumed to be on your classpath.
+endpoint_snitch: SimpleSnitch
+
+# controls how often to perform the more expensive part of host score
+# calculation
+dynamic_snitch_update_interval_in_ms: 100
+# controls how often to reset all host scores, allowing a bad host to
+# possibly recover
+dynamic_snitch_reset_interval_in_ms: 600000
+# if set greater than zero and read_repair_chance is < 1.0, this will allow
+# 'pinning' of replicas to hosts in order to increase cache capacity.
+# The badness threshold will control how much worse the pinned host has to be
+# before the dynamic snitch will prefer other replicas over it.  This is
+# expressed as a double which represents a percentage.  Thus, a value of
+# 0.2 means Cassandra would continue to prefer the static snitch values
+# until the pinned host was 20% worse than the fastest.
+dynamic_snitch_badness_threshold: 0.1
+
+# request_scheduler -- Set this to a class that implements
+# RequestScheduler, which will schedule incoming client requests
+# according to the specific policy. This is useful for multi-tenancy
+# with a single Cassandra cluster.
+# NOTE: This is specifically for requests from the client and does
+# not affect inter node communication.
+# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place
+# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of
+# client requests to a node with a separate queue for each
+# request_scheduler_id. The scheduler is further customized by
+# request_scheduler_options as described below.
+request_scheduler: org.apache.cassandra.scheduler.NoScheduler
+
+# Scheduler Options vary based on the type of scheduler
+#
+# NoScheduler
+#   Has no options
+#
+# RoundRobin
+#   throttle_limit
+#     The throttle_limit is the number of in-flight
+#     requests per client.  Requests beyond
+#     that limit are queued up until
+#     running requests can complete.
+#     The value of 80 here is twice the number of
+#     concurrent_reads + concurrent_writes.
+#   default_weight
+#     default_weight is optional and allows for
+#     overriding the default which is 1.
+#   weights
+#     Weights are optional and will default to 1 or the
+#     overridden default_weight. The weight translates into how
+#     many requests are handled during each turn of the
+#     RoundRobin, based on the scheduler id.
+#
+# request_scheduler_options:
+#    throttle_limit: 80
+#    default_weight: 5
+#    weights:
+#      Keyspace1: 1
+#      Keyspace2: 5
+
+# request_scheduler_id -- An identifier based on which to perform
+# the request scheduling. Currently the only valid option is keyspace.
+# request_scheduler_id: keyspace
+
+# Enable or disable inter-node encryption
+# JVM defaults for supported SSL socket protocols and cipher suites can
+# be replaced using custom encryption options. This is not recommended
+# unless you have policies in place that dictate certain settings, or
+# need to disable vulnerable ciphers or protocols in case the JVM cannot
+# be updated.
+# FIPS compliant settings can be configured at JVM level and should not
+# involve changing encryption settings here:
+# https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/FIPS.html
+# *NOTE* No custom encryption options are enabled at the moment
+# The available internode options are : all, none, dc, rack
+#
+# If set to dc cassandra will encrypt the traffic between the DCs
+# If set to rack cassandra will encrypt the traffic between the racks
+#
+# The passwords used in these options must match the passwords used when generating
+# the keystore and truststore.  For instructions on generating these files, see:
+# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
+#
+server_encryption_options:
+    internode_encryption: none
+    keystore: conf/.keystore
+    keystore_password: cassandra
+    truststore: conf/.truststore
+    truststore_password: cassandra
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA]
+    # require_client_auth: false
+    # require_endpoint_verification: false
+
+# enable or disable client/server encryption.
+client_encryption_options:
+    enabled: false
+    # If enabled and optional is set to true encrypted and unencrypted connections are handled.
+    optional: false
+    keystore: conf/.keystore
+    keystore_password: cassandra
+    # require_client_auth: false
+    # Set trustore and truststore_password if require_client_auth is true
+    # truststore: conf/.truststore
+    # truststore_password: cassandra
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA]
+
+# internode_compression controls whether traffic between nodes is
+# compressed.
+# Can be:
+#
+# all
+#   all traffic is compressed
+#
+# dc
+#   traffic between different datacenters is compressed
+#
+# none
+#   nothing is compressed.
+internode_compression: dc
+
+# Enable or disable tcp_nodelay for inter-dc communication.
+# Disabling it will result in larger (but fewer) network packets being sent,
+# reducing overhead from the TCP protocol itself, at the cost of increasing
+# latency if you block for cross-datacenter responses.
+inter_dc_tcp_nodelay: false
+
+# TTL for different trace types used during logging of the repair process.
+tracetype_query_ttl: 86400
+tracetype_repair_ttl: 604800
+
+# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+# This threshold can be adjusted to minimize logging if necessary
+# gc_log_threshold_in_ms: 200
+
+# If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+# INFO level
+# UDFs (user defined functions) are disabled by default.
+# As of Cassandra 3.0 there is a sandbox in place that should prevent execution of evil code.
+enable_user_defined_functions: false
+
+# Enables scripted UDFs (JavaScript UDFs).
+# Java UDFs are always enabled, if enable_user_defined_functions is true.
+# Enable this option to be able to use UDFs with "language javascript" or any custom JSR-223 provider.
+# This option has no effect, if enable_user_defined_functions is false.
+enable_scripted_user_defined_functions: false
+
+# The default Windows kernel timer and scheduling resolution is 15.6ms for power conservation.
+# Lowering this value on Windows can provide much tighter latency and better throughput, however
+# some virtualized environments may see a negative performance impact from changing this setting
+# below their system default. The sysinternals 'clockres' tool can confirm your system's default
+# setting.
+windows_timer_interval: 1
+
+
+# Enables encrypting data at-rest (on disk). Different key providers can be plugged in, but the default reads from
+# a JCE-style keystore. A single keystore can hold multiple keys, but the one referenced by
+# the "key_alias" is the only key that will be used for encrypt opertaions; previously used keys
+# can still (and should!) be in the keystore and will be used on decrypt operations
+# (to handle the case of key rotation).
+#
+# It is strongly recommended to download and install Java Cryptography Extension (JCE)
+# Unlimited Strength Jurisdiction Policy Files for your version of the JDK.
+# (current link: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html)
+#
+# Currently, only the following file types are supported for transparent data encryption, although
+# more are coming in future cassandra releases: commitlog, hints
+transparent_data_encryption_options:
+    enabled: false
+    chunk_length_kb: 64
+    cipher: AES/CBC/PKCS5Padding
+    key_alias: testing:1
+    # CBC IV length for AES needs to be 16 bytes (which is also the default size)
+    # iv_length: 16
+    key_provider:
+      - class_name: org.apache.cassandra.security.JKSKeyProvider
+        parameters:
+          - keystore: conf/.keystore
+            keystore_password: cassandra
+            store_type: JCEKS
+            key_password: cassandra
+
+
+#####################
+# SAFETY THRESHOLDS #
+#####################
+
+# When executing a scan, within or across a partition, we need to keep the
+# tombstones seen in memory so we can return them to the coordinator, which
+# will use them to make sure other replicas also know about the deleted rows.
+# With workloads that generate a lot of tombstones, this can cause performance
+# problems and even exaust the server heap.
+# (http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets)
+# Adjust the thresholds here if you understand the dangers and want to
+# scan more tombstones anyway.  These thresholds may also be adjusted at runtime
+# using the StorageService mbean.
+tombstone_warn_threshold: 1000
+tombstone_failure_threshold: 100000
+
+# Log WARN on any multiple-partition batch size exceeding this value. 5kb per batch by default.
+# Caution should be taken on increasing the size of this threshold as it can lead to node instability.
+batch_size_warn_threshold_in_kb: 5
+
+# Fail any multiple-partition batch exceeding this value. 50kb (10x warn threshold) by default.
+batch_size_fail_threshold_in_kb: 50
+
+# Log WARN on any batches not of type LOGGED than span across more partitions than this limit
+unlogged_batch_across_partitions_warn_threshold: 10
+
+# Log a warning when compacting partitions larger than this value
+compaction_large_partition_warning_threshold_mb: 100
+
+# GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+# Adjust the threshold based on your application throughput requirement
+# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+gc_warn_threshold_in_ms: 1000
+
+# Maximum size of any value in SSTables. Safety measure to detect SSTable corruption
+# early. Any value size larger than this threshold will result into marking an SSTable
+# as corrupted. This should be positive and less than 2048.
+# max_value_size_in_mb: 256
+
+# Back-pressure settings #
+# If enabled, the coordinator will apply the back-pressure strategy specified below to each mutation
+# sent to replicas, with the aim of reducing pressure on overloaded replicas.
+back_pressure_enabled: false
+# The back-pressure strategy applied.
+# The default implementation, RateBasedBackPressure, takes three arguments:
+# high ratio, factor, and flow type, and uses the ratio between incoming mutation responses and outgoing mutation requests.
+# If below high ratio, outgoing mutations are rate limited according to the incoming rate decreased by the given factor;
+# if above high ratio, the rate limiting is increased by the given factor;
+# such factor is usually best configured between 1 and 10, use larger values for a faster recovery
+# at the expense of potentially more dropped mutations;
+# the rate limiting is applied according to the flow type: if FAST, it's rate limited at the speed of the fastest replica,
+# if SLOW at the speed of the slowest one.
+# New strategies can be added. Implementors need to implement org.apache.cassandra.net.BackpressureStrategy and
+# provide a public constructor accepting a Map<String, Object>.
+back_pressure_strategy:
+    - class_name: org.apache.cassandra.net.RateBasedBackPressure
+      parameters:
+        - high_ratio: 0.90
+          factor: 5
+          flow: FAST
+
+# Coalescing Strategies #
+# Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more).
+# On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in
+# virtualized environments, the point at which an application can be bound by network packet processing can be
+# surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal
+# doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process
+# is sufficient for many applications such that no load starvation is experienced even without coalescing.
+# There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages
+# per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
+# trip to read from a socket, and all the task submission work can be done at the same time reducing context switching
+# and increasing cache friendliness of network message processing.
+# See CASSANDRA-8692 for details.
+
+# Strategy to use for coalescing messages in OutboundTcpConnection.
+# Can be fixed, movingaverage, timehorizon, disabled (default).
+# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name.
+# otc_coalescing_strategy: DISABLED
+
+# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first
+# message is received before it will be sent with any accompanying messages. For moving average this is the
+# maximum amount of time that will be waited as well as the interval at which messages must arrive on average
+# for coalescing to be enabled.
+# otc_coalescing_window_us: 200
+
+# Do not try to coalesce messages if we already got that many messages. This should be more than 2 and less than 128.
+# otc_coalescing_enough_coalesced_messages: 8
+
+# How many milliseconds to wait between two expiration runs on the backlog (queue) of the OutboundTcpConnection.
+# Expiration is done if messages are piling up in the backlog. Droppable messages are expired to free the memory
+# taken by expired messages. The interval should be between 0 and 1000, and in most installations the default value
+# will be appropriate. A smaller value could potentially expire messages slightly sooner at the expense of more CPU
+# time and queue contention while iterating the backlog of messages.
+# An interval of 0 disables any wait time, which is the behavior of former Cassandra versions.
+#
+# otc_backlog_expiration_interval_ms: 200
diff --git a/modules/cassandra/src/test/resources/initial-with-error.cql b/modules/cassandra/src/test/resources/initial-with-error.cql
new file mode 100644
index 00000000000..4f0e11d721b
--- /dev/null
+++ b/modules/cassandra/src/test/resources/initial-with-error.cql
@@ -0,0 +1,6 @@
+CREATE KEYSPACE keySpaceTest WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 1};
+
+USE keySpaceTest;
+
+/* The following statement contains an error (missing primary key) on purpose, do not fix it! */
+CREATE TABLE catalog_category (id bigint);

From e7f8af5ce4c5e476ae17dc886663752039941a40 Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Tue, 13 Aug 2024 18:23:04 -0700
Subject: [PATCH 3926/4969] [docs] Update localstack version (#8515)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/localstack.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index b6c82ccf67a..827ed4a6534 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -7,7 +7,7 @@ Testcontainers module for [LocalStack](http://localstack.cloud/), 'a fully funct
 Running LocalStack as a stand-in for AWS S3 during a test:
 
 ```java
-DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:0.11.3");
+DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:3.5.0");
 
 @Rule
 public LocalStackContainer localstack = new LocalStackContainer(localstackImage)

From 0f9956af805ceb08ae5f26dab0933cc8877afd54 Mon Sep 17 00:00:00 2001
From: lizhou1111 <142761624+lizhou1111@users.noreply.github.com>
Date: Thu, 15 Aug 2024 03:04:31 +0800
Subject: [PATCH 3927/4969] Add Timeplus module (#8779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: lizhou1111 <jianan.li@timeplus.com>
Co-authored-by: Jasmine-ge <jasmine.ge@timeplus.io>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   4 +
 .github/settings.yml                          |   3 +
 docs/modules/databases/jdbc.md                |   4 +
 docs/modules/databases/timeplus.md            |  24 ++++
 mkdocs.yml                                    |   1 +
 modules/timeplus/build.gradle                 |  10 ++
 .../timeplus/TimeplusContainer.java           | 125 ++++++++++++++++++
 .../timeplus/TimeplusContainerProvider.java   |  32 +++++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 .../org/testcontainers/TimeplusImages.java    |   7 +
 .../timeplus/TimeplusJDBCDriverTest.java      |  19 +++
 .../timeplus/TimeplusContainerTest.java       |  46 +++++++
 .../src/test/resources/logback-test.xml       |  16 +++
 17 files changed, 300 insertions(+)
 create mode 100644 docs/modules/databases/timeplus.md
 create mode 100644 modules/timeplus/build.gradle
 create mode 100644 modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java
 create mode 100644 modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainerProvider.java
 create mode 100644 modules/timeplus/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/timeplus/src/test/java/org/testcontainers/TimeplusImages.java
 create mode 100644 modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java
 create mode 100644 modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
 create mode 100644 modules/timeplus/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 5a9cba69083..284e2c561fb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -60,6 +60,7 @@ body:
         - Solace
         - Solr
         - TiDB
+        - Timeplus
         - ToxiProxy
         - Trino
         - Vault
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index c6fb9767f60..2ca7de6bc3c 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -60,6 +60,7 @@ body:
         - Solace
         - Solr
         - TiDB
+        - Timeplus
         - ToxiProxy
         - Trino
         - Vault
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 485e1477a06..311ec8ca2c6 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -60,6 +60,7 @@ body:
         - Solace
         - Solr
         - TiDB
+        - Timeplus
         - ToxiProxy
         - Trino
         - Vault
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6bdca459fab..0239be10168 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -342,6 +342,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/timeplus"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/toxiproxy"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index f449a11685d..875e996c428 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -216,6 +216,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/tidb/**/*
+"modules/timeplus":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/timeplus/**/*
 "modules/toxiproxy":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 2bd2289af79..06b1c06e72f 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -253,6 +253,9 @@ labels:
   - name: modules/tidb
     color: '#006b75'
 
+  - name: modules/timeplus
+    color: '#006b75'
+
   - name: modules/toxiproxy
     color: '#006b75'
 
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 3c92e8a99ad..90183228bd5 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -87,6 +87,10 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:tidb:v6.1.0:///databasename`
 
+#### Using Timeplus
+
+`jdbc:tc:timeplus:2.3.21:///databasename`
+
 #### Using Trino
 
 `jdbc:tc:trino:352://localhost/memory/default`
diff --git a/docs/modules/databases/timeplus.md b/docs/modules/databases/timeplus.md
new file mode 100644
index 00000000000..4f5cd4106a3
--- /dev/null
+++ b/docs/modules/databases/timeplus.md
@@ -0,0 +1,24 @@
+# Timeplus Module
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:timeplus:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>timeplus</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 8aed24d20f6..2e1c60c7dcc 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -72,6 +72,7 @@ nav:
                 - modules/databases/presto.md
                 - modules/databases/questdb.md
                 - modules/databases/tidb.md
+                - modules/databases/timeplus.md
                 - modules/databases/trino.md
                 - modules/databases/yugabytedb.md
           - modules/activemq.md
diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
new file mode 100644
index 00000000000..74570d821c2
--- /dev/null
+++ b/modules/timeplus/build.gradle
@@ -0,0 +1,10 @@
+description = "Testcontainers :: JDBC :: Timeplus"
+
+dependencies {
+    api project(':testcontainers')
+    api project(':jdbc')
+
+    testImplementation project(':jdbc-test')
+    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.4'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
+}
diff --git a/modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java b/modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java
new file mode 100644
index 00000000000..0ba28c8f10a
--- /dev/null
+++ b/modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java
@@ -0,0 +1,125 @@
+package org.testcontainers.timeplus;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for Timeplus.
+ * <p>
+ * Supported image: {@code timeplus/timeplusd}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 8463</li>
+ *     <li>HTTP: 3218</li>
+ * </ul>
+ */
+public class TimeplusContainer extends JdbcDatabaseContainer<TimeplusContainer> {
+
+    static final String NAME = "timeplus";
+
+    static final String DOCKER_IMAGE_NAME = "timeplus/timeplusd";
+
+    private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse(DOCKER_IMAGE_NAME);
+
+    private static final Integer HTTP_PORT = 3218;
+
+    private static final Integer NATIVE_PORT = 8463;
+
+    private static final String DRIVER_CLASS_NAME = "com.timeplus.jdbc.TimeplusDriver";
+
+    private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+
+    private static final String TEST_QUERY = "SELECT 1";
+
+    private String databaseName = "default";
+
+    private String username = "default";
+
+    private String password = "";
+
+    public TimeplusContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public TimeplusContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(TIMEPLUS_IMAGE_NAME);
+
+        addExposedPorts(HTTP_PORT, NATIVE_PORT);
+        waitingFor(Wait.forHttp("/timeplusd/v1/ping").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1)));
+    }
+
+    @Override
+    protected void configure() {
+        withEnv("TIMEPLUS_DB", this.databaseName);
+        withEnv("TIMEPLUS_USER", this.username);
+        withEnv("TIMEPLUS_PASSWORD", this.password);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return new HashSet<>(getMappedPort(HTTP_PORT));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return DRIVER_CLASS_NAME;
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return (
+            JDBC_URL_PREFIX +
+            getHost() +
+            ":" +
+            getMappedPort(NATIVE_PORT) +
+            "/" +
+            this.databaseName +
+            constructUrlParameters("?", "&")
+        );
+    }
+
+    @Override
+    public String getUsername() {
+        return this.username;
+    }
+
+    @Override
+    public String getPassword() {
+        return this.password;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return this.databaseName;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return TEST_QUERY;
+    }
+
+    @Override
+    public TimeplusContainer withUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public TimeplusContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    @Override
+    public TimeplusContainer withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+}
diff --git a/modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainerProvider.java b/modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainerProvider.java
new file mode 100644
index 00000000000..1d71e654a45
--- /dev/null
+++ b/modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainerProvider.java
@@ -0,0 +1,32 @@
+package org.testcontainers.timeplus;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for Timeplus containers.
+ */
+public class TimeplusContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final String DEFAULT_TAG = "2.3.21";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(TimeplusContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        if (tag != null) {
+            return new TimeplusContainer(DockerImageName.parse(TimeplusContainer.DOCKER_IMAGE_NAME).withTag(tag));
+        } else {
+            return newInstance();
+        }
+    }
+}
diff --git a/modules/timeplus/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/timeplus/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..f3122d3d73b
--- /dev/null
+++ b/modules/timeplus/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.timeplus.TimeplusContainerProvider
diff --git a/modules/timeplus/src/test/java/org/testcontainers/TimeplusImages.java b/modules/timeplus/src/test/java/org/testcontainers/TimeplusImages.java
new file mode 100644
index 00000000000..4079e0b4524
--- /dev/null
+++ b/modules/timeplus/src/test/java/org/testcontainers/TimeplusImages.java
@@ -0,0 +1,7 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface TimeplusImages {
+    DockerImageName TIMEPLUS_IMAGE = DockerImageName.parse("timeplus/timeplusd:2.3.21");
+}
diff --git a/modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java b/modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java
new file mode 100644
index 00000000000..3f3a7ac8136
--- /dev/null
+++ b/modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java
@@ -0,0 +1,19 @@
+package org.testcontainers.junit.timeplus;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+@RunWith(Parameterized.class)
+public class TimeplusJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] { { "jdbc:tc:timeplus:2.3.21://hostname", EnumSet.noneOf(Options.class) } }
+        );
+    }
+}
diff --git a/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java b/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
new file mode 100644
index 00000000000..95ecc1c6ef7
--- /dev/null
+++ b/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
@@ -0,0 +1,46 @@
+package org.testcontainers.timeplus;
+
+import org.junit.Test;
+import org.testcontainers.TimeplusImages;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TimeplusContainerTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (TimeplusContainer timeplus = new TimeplusContainer(TimeplusImages.TIMEPLUS_IMAGE)) {
+            timeplus.start();
+
+            ResultSet resultSet = performQuery(timeplus, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void customCredentialsWithUrlParams() throws SQLException {
+        try (
+            TimeplusContainer timeplus = new TimeplusContainer(TimeplusImages.TIMEPLUS_IMAGE)
+                .withUsername("system")
+                .withPassword("sys@t+")
+                .withDatabaseName("system")
+                .withUrlParam("interactive_delay", "5")
+        ) {
+            timeplus.start();
+
+            ResultSet resultSet = performQuery(
+                timeplus,
+                "SELECT to_int(value) FROM system.settings where name='interactive_delay'"
+            );
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(5);
+        }
+    }
+}
diff --git a/modules/timeplus/src/test/resources/logback-test.xml b/modules/timeplus/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/timeplus/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 0b3b773c2e0986c283c7f280543ba4c08724c9f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:05:05 +0000
Subject: [PATCH 3928/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit5) from 1.10.3 to 1.11.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 eebf30e2e2e..0e20e710b94 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.11.0'
 
     testCompileOnly 'org.jetbrains:annotations:24.1.0'
 }

From cb7a793aa695e31345aa906c9dd5283bb98e4d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 15 Aug 2024 10:24:23 -0600
Subject: [PATCH 3929/4969] Run on windows only in main branch

---
 .github/workflows/ci-windows.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index e6775faf870..8d324b0d9f3 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -42,6 +42,7 @@ permissions:
 
 jobs:
   core:
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
     runs-on: self-hosted
     permissions:
       checks: write

From 5f52583c9cda3f75281585df9b20f7a39081fe39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 22:17:49 +0000
Subject: [PATCH 3930/4969] Bump io.minio:minio from 8.5.11 to 8.5.12 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.5.11 to 8.5.12.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.5.11...8.5.12)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 21886053173..e4ebe5d0b43 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.5.11")
+    testImplementation("io.minio:minio:8.5.12")
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 251bca51f4d047d8275b04477273f36de1da7326 Mon Sep 17 00:00:00 2001
From: Reza Morshedi <reza@tradeshift.com>
Date: Tue, 20 Aug 2024 17:35:52 +0200
Subject: [PATCH 3931/4969] Fix missing null check for JDBC init script (#9118)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In 6a07650, a new feature was introduced to support multiple init scripts in JdbcDatabaseContainer. However, during this update, a critical null check was inadvertently removed from the `JdbcDatabaseContainer.runInitScriptIfRequired` method. This check was responsible for ignoring null values for the `initScript` parameter.

As a result, when no init script is defined, a null value is passed to `ScriptUtils.runInitScript`, leading to an exception being thrown and preventing the database container from starting.

This commit reinstates the missing null check, ensuring that undefined init scripts are properly handled. Additionally, a test has been added to verify that the issue is resolved and the database container can start without an init script.

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/JdbcDatabaseContainer.java             |  6 +++++-
 .../junit/postgresql/SimplePostgreSQLTest.java        | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 713cb81bb62..cf6c995528f 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -22,6 +22,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -361,7 +362,10 @@ protected void optionallyMapResourceParameterAsVolume(
      * Load init script content and apply it to the database if initScriptPath is set
      */
     protected void runInitScriptIfRequired() {
-        initScriptPaths.forEach(path -> ScriptUtils.runInitScript(getDatabaseDelegate(), path));
+        initScriptPaths
+            .stream()
+            .filter(Objects::nonNull)
+            .forEach(path -> ScriptUtils.runInitScript(getDatabaseDelegate(), path));
     }
 
     public void setParameters(Map<String, String> parameters) {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index bc2fb0289e3..93e49d2d24c 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -11,6 +11,7 @@
 import java.util.logging.LogManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
     static {
@@ -59,6 +60,16 @@ public void testUnsetCommand() throws SQLException {
         }
     }
 
+    @Test
+    public void testMissingInitScript() {
+        try (
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+                .withInitScript(null)
+        ) {
+            assertThatNoException().isThrownBy(postgres::start);
+        }
+    }
+
     @Test
     public void testExplicitInitScript() throws SQLException {
         try (

From a85d57a1a530129e64bca2aab24865ffcef4d8dd Mon Sep 17 00:00:00 2001
From: "Marvin K." <JapuDCret@users.noreply.github.com>
Date: Wed, 21 Aug 2024 21:09:55 +0200
Subject: [PATCH 3932/4969] Improve GitLab docs (#8775)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../continuous_integration/gitlab_ci.md                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
index 5242e095b56..ccc73f58078 100644
--- a/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/gitlab_ci.md
@@ -24,10 +24,10 @@ See below for an example runner configuration:
 Please also include the following in your GitlabCI pipeline definitions (`.gitlab-ci.yml`) that use Testcontainers:
 ```yml
 variables:
-  TESTCONTAINERS_HOST_OVERRIDE: "host.docker.internal"
+  TESTCONTAINERS_HOST_OVERRIDE: "<ip-docker-host>"
 ```
 
-The environment variable `TESTCONTAINERS_HOST_OVERRIDE` needs to be configured, otherwise, a wrong IP address would be used to resolve the Docker host, which will likely lead to failing tests.
+The environment variable `TESTCONTAINERS_HOST_OVERRIDE` needs to be configured, otherwise, a wrong IP address would be used to resolve the Docker host, which will likely lead to failing tests. For Windows and MacOS, use `host.docker.internal`.
 
 ## Example using DinD (Docker-in-Docker)
 

From c1f4796b45ce45851d56bbf5cff20ee4ff88ca80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 22 Aug 2024 01:59:54 -0500
Subject: [PATCH 3933/4969] Add on-demand execution on windows (#9138)

Test should execute on `main` branch or in PRs if `/windows-test`
is added in comments.
---
 .github/workflows/ci-windows-trigger.yml | 27 ++++++++++++++++++++++++
 .github/workflows/ci-windows.yml         |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/ci-windows-trigger.yml

diff --git a/.github/workflows/ci-windows-trigger.yml b/.github/workflows/ci-windows-trigger.yml
new file mode 100644
index 00000000000..540ab221dbf
--- /dev/null
+++ b/.github/workflows/ci-windows-trigger.yml
@@ -0,0 +1,27 @@
+name: windows-test command dispatch
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: read
+
+jobs:
+  windows-test-command-trigger:
+    permissions:
+      pull-requests: write  # for peter-evans/slash-command-dispatch to create PR reaction
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger windows-test command
+        uses: peter-evans/slash-command-dispatch@13bc09769d122a64f75aa5037256f6f2d78be8c4 # v4.0.0
+        with:
+          token: ${{ secrets.WINDOWS_WORKERS_TOKEN }}
+          # The command to trigger the pipeline: e.g. /windows-test
+          # The command name must match the name of the repository_dispatch.type in 'ci-windows.yml' workflow, using '-command' as suffix. E.g. 'windows-test-command'
+          commands: windows-test
+          issue-type: pull-request
+          # The user that owns the above token must belong to the elevated role of 'Maintainers'
+          permission: maintain
+          reactions: false
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 8d324b0d9f3..4f11c59c082 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -32,6 +32,8 @@ on:
       - 'README.md'
       - 'RELEASING.md'
       - '.sdkmanrc'
+  repository_dispatch:
+    types: [windows-test-command]
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
@@ -42,7 +44,7 @@ permissions:
 
 jobs:
   core:
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+    if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event.client_payload.slash_command.command == 'windows-test' }}
     runs-on: self-hosted
     permissions:
       checks: write

From ba22a7b4c47be3216242335b94ef28f6aa1da73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 23 Aug 2024 13:03:24 -0500
Subject: [PATCH 3934/4969] Add ConfluentKafkaContainer (#9139)

* Deprecate `org.testcontainers.containers.KafkaContainer`
* Add `org.testcontainers.kafka.ConfluentKafkaContainer` which works with `confluentinc/cp-kafka` images with version `7.4.0` or later.
* `KafkaHelper` container common env vars, command, wait strategy to be shared with `org.testcontainers.kafka.KafkaContainer`

---------

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/modules/kafka.md                         |  38 +++--
 .../containers/KafkaContainer.java            |   4 +
 .../kafka/ConfluentKafkaContainer.java        | 142 ++++++++++++++++++
 .../org/testcontainers/kafka/KafkaHelper.java | 104 +++++++++++++
 .../org/testcontainers/KCatContainer.java     |  16 ++
 .../kafka/ConfluentKafkaContainerTest.java    |  65 ++++++++
 6 files changed, 360 insertions(+), 9 deletions(-)
 create mode 100644 modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
 create mode 100644 modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java
 create mode 100644 modules/kafka/src/test/java/org/testcontainers/KCatContainer.java
 create mode 100644 modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 091aac0ec72..cf3a5a27df6 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -4,10 +4,14 @@ Testcontainers can be used to automatically instantiate and manage [Apache Kafka
 
 Currently, two different Kafka images are supported:
 
-* `org.testcontainers.containers.KafkaContainer` supports 
+* `org.testcontainers.kafka.ConfluentKafkaContainer` supports 
 [confluentinc/cp-kafka](https://hub.docker.com/r/confluentinc/cp-kafka/)
 * `org.testcontainers.kafka.KafkaContainer` supports [apache/kafka](https://hub.docker.com/r/apache/kafka/) and [apache/kafka-native](https://hub.docker.com/r/apache/kafka-native/)
 
+!!! note
+    `org.testcontainers.containers.KafkaContainer` is deprecated.
+    Please use `org.testcontainers.kafka.ConfluentKafkaContainer` or `org.testcontainers.kafka.KafkaContainer` instead, depending on the used image.
+
 ## Benefits
 
 * Running a single node Kafka installation with just one line of code
@@ -15,7 +19,10 @@ Currently, two different Kafka images are supported:
 
 ## Example
 
+### Using org.testcontainers.containers.KafkaContainer
+
 Create a `KafkaContainer` to use it in your tests:
+
 <!--codeinclude-->
 [Creating a KafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
@@ -28,13 +35,24 @@ Now your tests or any other process running on your machine can get access to ru
 [Bootstrap Servers](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:getBootstrapServers
 <!--/codeinclude-->
 
-## Options
+### Using org.testcontainers.kafka.ConfluentKafkaContainer
+
+!!! note
+    Compatible with `confluentinc/cp-kafka` images version `7.4.0` and later.
+
+Create a `ConfluentKafkaContainer` to use it in your tests:
 
-!!! note 
-    The options below are only available for `org.testcontainers.containers.KafkaContainer`
+<!--codeinclude-->
+[Creating a ConlfuentKafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java) inside_block:constructorWithVersion
+<!--/codeinclude-->
+
+## Options
         
 ### <a name="zookeeper"></a> Using external Zookeeper
 
+!!! note
+    Only available for `org.testcontainers.containers.KafkaContainer`
+
 If for some reason you want to use an externally running Zookeeper, then just pass its location during construction:
 <!--codeinclude-->
 [External Zookeeper](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withExternalZookeeper
@@ -42,19 +60,21 @@ If for some reason you want to use an externally running Zookeeper, then just pa
 
 ### Using Kraft mode
 
-KRaft mode was declared production ready in 3.3.1 (confluentinc/cp-kafka:7.3.x)" 
+!!! note
+    Only available for `org.testcontainers.containers.KafkaContainer`
+
+KRaft mode was declared production ready in 3.3.1 (confluentinc/cp-kafka:7.3.x) 
 
 <!--codeinclude-->
 [Kraft mode](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withKraftMode
 <!--/codeinclude-->
 
-See the [versions interoperability matrix](https://docs.confluent.io/platform/current/installation/versions-interoperability.html) for more details. 
+See the [versions interoperability matrix](https://docs.confluent.io/platform/current/installation/versions-interoperability.html) for more details.
 
-## Register listeners
+### Register listeners
 
 There are scenarios where additional listeners are needed because the consumer/producer can be in another
-container in the same network or a different process where the port to connect differs from the default 
-exposed port `9093`. E.g [Toxiproxy](../../modules/toxiproxy/).
+container in the same network or a different process where the port to connect differs from the default exposed port. E.g [Toxiproxy](../../modules/toxiproxy/).
 
 <!--codeinclude-->
 [Register additional listener](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:registerListener
diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index 870ab03bd0e..f2831514477 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -26,7 +26,11 @@
  *     <li>Kafka: 9093</li>
  *     <li>Zookeeper: 2181</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.kafka.ConfluentKafkaContainer} or
+ * {@link org.testcontainers.kafka.KafkaContainer} instead
  */
+@Deprecated
 public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
new file mode 100644
index 00000000000..0a3c1c2dcb3
--- /dev/null
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
@@ -0,0 +1,142 @@
+package org.testcontainers.kafka;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+
+/**
+ * Testcontainers implementation for Confluent Kafka.
+ * <p>
+ * Supported image: {@code confluentinc/cp-kafka}
+ * <p>
+ * Exposed ports: 9092
+ */
+public class ConfluentKafkaContainer extends GenericContainer<ConfluentKafkaContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
+
+    private final Set<String> listeners = new HashSet<>();
+
+    private final Set<Supplier<String>> advertisedListeners = new HashSet<>();
+
+    public ConfluentKafkaContainer(String imageName) {
+        this(DockerImageName.parse(imageName));
+    }
+
+    public ConfluentKafkaContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(KafkaHelper.KAFKA_PORT);
+        withEnv(KafkaHelper.envVars());
+
+        withCommand(KafkaHelper.COMMAND);
+        waitingFor(KafkaHelper.WAIT_STRATEGY);
+    }
+
+    @Override
+    protected void configure() {
+        KafkaHelper.resolveListeners(this, this.listeners);
+
+        String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
+        String networkAlias = getNetwork() != null ? firstNetworkAlias : "localhost";
+        String controllerQuorumVoters = String.format("%s@%s:9094", getEnvMap().get("KAFKA_NODE_ID"), networkAlias);
+        withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters);
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        String brokerAdvertisedListener = String.format(
+            "BROKER://%s:%s",
+            containerInfo.getConfig().getHostName(),
+            "9093"
+        );
+        List<String> advertisedListeners = new ArrayList<>();
+        advertisedListeners.add("PLAINTEXT://" + getBootstrapServers());
+        advertisedListeners.add(brokerAdvertisedListener);
+
+        advertisedListeners.addAll(KafkaHelper.resolveAdvertisedListeners(this.advertisedListeners));
+        String kafkaAdvertisedListeners = String.join(",", advertisedListeners);
+
+        String command = "#!/bin/bash\n";
+        // exporting KAFKA_ADVERTISED_LISTENERS with the container hostname
+        command += String.format("export KAFKA_ADVERTISED_LISTENERS=%s\n", kafkaAdvertisedListeners);
+
+        command += "/etc/confluent/docker/run \n";
+        copyFileToContainer(Transferable.of(command, 0777), KafkaHelper.STARTER_SCRIPT);
+    }
+
+    /**
+     * Add a listener in the format {@code host:port}.
+     * Host will be included as a network alias.
+     * <p>
+     * Use it to register additional connections to the Kafka broker within the same container network.
+     * <p>
+     * The listener will be added to the list of default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     *     <li>0.0.0.0:9094</li>
+     * </ul>
+     * <p>
+     * The listener will be added to the list of default advertised listeners.
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getConfig().getHostName():9092}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     * </ul>
+     * @param listener a listener with format {@code host:port}
+     * @return this {@link ConfluentKafkaContainer} instance
+     */
+    public ConfluentKafkaContainer withListener(String listener) {
+        this.listeners.add(listener);
+        this.advertisedListeners.add(() -> listener);
+        return this;
+    }
+
+    /**
+     * Add a listener in the format {@code host:port} and a {@link Supplier} for the advertised listener.
+     * Host from listener will be included as a network alias.
+     * <p>
+     * Use it to register additional connections to the Kafka broker from outside the container network
+     * <p>
+     * The listener will be added to the list of default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     *     <li>0.0.0.0:9094</li>
+     * </ul>
+     * <p>
+     * The {@link Supplier} will be added to the list of default advertised listeners.
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getConfig().getHostName():9092}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     * </ul>
+     * @param listener a supplier that will provide a listener
+     * @param advertisedListener a supplier that will provide a listener
+     * @return this {@link ConfluentKafkaContainer} instance
+     */
+    public ConfluentKafkaContainer withListener(String listener, Supplier<String> advertisedListener) {
+        this.listeners.add(listener);
+        this.advertisedListeners.add(advertisedListener);
+        return this;
+    }
+
+    public String getBootstrapServers() {
+        return String.format("%s:%s", getHost(), getMappedPort(KafkaHelper.KAFKA_PORT));
+    }
+}
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java
new file mode 100644
index 00000000000..00b10a4d519
--- /dev/null
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java
@@ -0,0 +1,104 @@
+package org.testcontainers.kafka;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+class KafkaHelper {
+
+    private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
+
+    private static final String DEFAULT_CLUSTER_ID = "4L6g3nShT-eMCtK--X86sw";
+
+    private static final String PROTOCOL_PREFIX = "TC";
+
+    static final int KAFKA_PORT = 9092;
+
+    static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
+
+    static final String[] COMMAND = {
+        "sh",
+        "-c",
+        "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT,
+    };
+
+    static final WaitStrategy WAIT_STRATEGY = Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1);
+
+    static Map<String, String> envVars() {
+        Map<String, String> envVars = new HashMap<>();
+        envVars.put("CLUSTER_ID", DEFAULT_CLUSTER_ID);
+
+        envVars.put(
+            "KAFKA_LISTENERS",
+            "PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9093,CONTROLLER://0.0.0.0:9094"
+        );
+        envVars.put(
+            "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
+            "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT"
+        );
+        envVars.put("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
+        envVars.put("KAFKA_PROCESS_ROLES", "broker,controller");
+        envVars.put("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
+
+        envVars.put("KAFKA_NODE_ID", "1");
+        envVars.put("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+        envVars.put("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", DEFAULT_INTERNAL_TOPIC_RF);
+        envVars.put("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
+        envVars.put("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", DEFAULT_INTERNAL_TOPIC_RF);
+        envVars.put("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
+        envVars.put("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
+        return envVars;
+    }
+
+    static void resolveListeners(GenericContainer<?> kafkaContainer, Set<String> listenersSuppliers) {
+        Set<String> listeners = Arrays
+            .stream(kafkaContainer.getEnvMap().get("KAFKA_LISTENERS").split(","))
+            .collect(Collectors.toSet());
+        Set<String> listenerSecurityProtocolMap = Arrays
+            .stream(kafkaContainer.getEnvMap().get("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP").split(","))
+            .collect(Collectors.toSet());
+
+        List<String> listenersToTransform = new ArrayList<>(listenersSuppliers);
+        for (int i = 0; i < listenersToTransform.size(); i++) {
+            String protocol = String.format("%s-%d", PROTOCOL_PREFIX, i);
+            String listener = listenersToTransform.get(i);
+            String listenerHost = listener.split(":")[0];
+            String listenerPort = listener.split(":")[1];
+            String listenerProtocol = String.format("%s://%s:%s", protocol, listenerHost, listenerPort);
+            String protocolMap = String.format("%s:PLAINTEXT", protocol);
+            listeners.add(listenerProtocol);
+            listenerSecurityProtocolMap.add(protocolMap);
+
+            String host = listener.split(":")[0];
+            kafkaContainer.withNetworkAliases(host);
+        }
+
+        String kafkaListeners = String.join(",", listeners);
+        String kafkaListenerSecurityProtocolMap = String.join(",", listenerSecurityProtocolMap);
+
+        kafkaContainer.getEnvMap().put("KAFKA_LISTENERS", kafkaListeners);
+        kafkaContainer.getEnvMap().put("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", kafkaListenerSecurityProtocolMap);
+    }
+
+    static List<String> resolveAdvertisedListeners(Set<Supplier<String>> listenerSuppliers) {
+        List<String> advertisedListeners = new ArrayList<>();
+        List<Supplier<String>> listenersToTransform = new ArrayList<>(listenerSuppliers);
+        for (int i = 0; i < listenersToTransform.size(); i++) {
+            Supplier<String> listenerSupplier = listenersToTransform.get(i);
+            String protocol = String.format("%s-%d", PROTOCOL_PREFIX, i);
+            String listener = listenerSupplier.get();
+            String listenerProtocol = String.format("%s://%s", protocol, listener);
+            advertisedListeners.add(listenerProtocol);
+        }
+        return advertisedListeners;
+    }
+}
diff --git a/modules/kafka/src/test/java/org/testcontainers/KCatContainer.java b/modules/kafka/src/test/java/org/testcontainers/KCatContainer.java
new file mode 100644
index 00000000000..84ad97b52b7
--- /dev/null
+++ b/modules/kafka/src/test/java/org/testcontainers/KCatContainer.java
@@ -0,0 +1,16 @@
+package org.testcontainers;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.Transferable;
+
+public class KCatContainer extends GenericContainer<KCatContainer> {
+
+    public KCatContainer() {
+        super("confluentinc/cp-kcat:7.4.1");
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.withEntrypoint("sh");
+        });
+        withCopyToContainer(Transferable.of("Message produced by kcat"), "/data/msgs.txt");
+        withCommand("-c", "tail -f /dev/null");
+    }
+}
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
new file mode 100644
index 00000000000..45bc846c021
--- /dev/null
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
@@ -0,0 +1,65 @@
+package org.testcontainers.kafka;
+
+import org.junit.Test;
+import org.testcontainers.AbstractKafka;
+import org.testcontainers.KCatContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.SocatContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ConfluentKafkaContainerTest extends AbstractKafka {
+
+    @Test
+    public void testUsage() throws Exception {
+        try ( // constructorWithVersion {
+            ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.4.0")
+            // }
+        ) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
+    @Test
+    public void testUsageWithListener() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            // registerListener {
+            ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.4.0")
+                .withListener("kafka:19092")
+                .withNetwork(network);
+            // }
+            KCatContainer kcat = new KCatContainer().withNetwork(network)
+        ) {
+            kafka.start();
+            kcat.start();
+
+            kcat.execInContainer("kcat", "-b", "kafka:19092", "-t", "msgs", "-P", "-l", "/data/msgs.txt");
+            String stdout = kcat
+                .execInContainer("kcat", "-b", "kafka:19092", "-C", "-t", "msgs", "-c", "1")
+                .getStdout();
+
+            assertThat(stdout).contains("Message produced by kcat");
+        }
+    }
+
+    @Test
+    public void testUsageWithListenerFromProxy() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            // registerListenerFromProxy {
+            SocatContainer socat = new SocatContainer().withNetwork(network).withTarget(2000, "kafka", 19092);
+            ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.4.0")
+                .withListener("kafka:19092", () -> socat.getHost() + ":" + socat.getMappedPort(2000))
+                .withNetwork(network)
+            // }
+        ) {
+            socat.start();
+            kafka.start();
+
+            String bootstrapServers = String.format("%s:%s", socat.getHost(), socat.getMappedPort(2000));
+            testKafkaFunctionality(bootstrapServers);
+        }
+    }
+}

From e60b1ac78417989f4c0a04711d2432ff7af574f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 23 Aug 2024 19:32:17 -0500
Subject: [PATCH 3935/4969] Support adding new listeners to Apache Kafka
 (#9142)

Fixes #8669
---
 docs/modules/kafka.md                         |  8 ++
 .../testcontainers/kafka/KafkaContainer.java  | 96 +++++++++++++++----
 .../kafka/CompatibleApacheKafkaImageTest.java | 26 +++++
 .../kafka/KafkaContainerTest.java             | 57 ++++++++---
 4 files changed, 155 insertions(+), 32 deletions(-)
 create mode 100644 modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index cf3a5a27df6..a284163248a 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -46,6 +46,14 @@ Create a `ConfluentKafkaContainer` to use it in your tests:
 [Creating a ConlfuentKafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
 
+### Using org.testcontainers.kafka.KafkaContainer
+
+Create a `KafkaContainer` to use it in your tests:
+
+<!--codeinclude-->
+[Creating a KafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java) inside_block:constructorWithVersion
+<!--/codeinclude-->
+
 ## Options
         
 ### <a name="zookeeper"></a> Using external Zookeeper
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
index 7eb8fa18c8b..e6f58474404 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -7,7 +7,10 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
 
 /**
  * Testcontainers implementation for Apache Kafka.
@@ -24,11 +27,11 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final int KAFKA_PORT = 9092;
 
-    private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";
-
     private static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
 
-    private static final String DEFAULT_CLUSTER_ID = "4L6g3nShT-eMCtK--X86sw";
+    private final Set<String> listeners = new HashSet<>();
+
+    private final Set<Supplier<String>> advertisedListeners = new HashSet<>();
 
     public KafkaContainer(String imageName) {
         this(DockerImageName.parse(imageName));
@@ -39,24 +42,7 @@ public KafkaContainer(DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, APACHE_KAFKA_NATIVE_IMAGE_NAME);
 
         withExposedPorts(KAFKA_PORT);
-        withEnv("CLUSTER_ID", DEFAULT_CLUSTER_ID);
-
-        withEnv(
-            "KAFKA_LISTENERS",
-            "PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9093, CONTROLLER://0.0.0.0:9094"
-        );
-        withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT");
-        withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
-        withEnv("KAFKA_PROCESS_ROLES", "broker,controller");
-        withEnv("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
-
-        withEnv("KAFKA_NODE_ID", "1");
-        withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", DEFAULT_INTERNAL_TOPIC_RF);
-        withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
-        withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
+        withEnv(KafkaHelper.envVars());
 
         withCommand("sh", "-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
         waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
@@ -64,6 +50,8 @@ public KafkaContainer(DockerImageName dockerImageName) {
 
     @Override
     protected void configure() {
+        KafkaHelper.resolveListeners(this, this.listeners);
+
         String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
         String networkAlias = getNetwork() != null ? firstNetworkAlias : "localhost";
         String controllerQuorumVoters = String.format("%s@%s:9094", getEnvMap().get("KAFKA_NODE_ID"), networkAlias);
@@ -80,7 +68,10 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
         List<String> advertisedListeners = new ArrayList<>();
         advertisedListeners.add("PLAINTEXT://" + getBootstrapServers());
         advertisedListeners.add(brokerAdvertisedListener);
+
+        advertisedListeners.addAll(KafkaHelper.resolveAdvertisedListeners(this.advertisedListeners));
         String kafkaAdvertisedListeners = String.join(",", advertisedListeners);
+
         String command = "#!/bin/bash\n";
         // exporting KAFKA_ADVERTISED_LISTENERS with the container hostname
         command += String.format("export KAFKA_ADVERTISED_LISTENERS=%s\n", kafkaAdvertisedListeners);
@@ -89,6 +80,69 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
         copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
     }
 
+    /**
+     * Add a listener in the format {@code host:port}.
+     * Host will be included as a network alias.
+     * <p>
+     * Use it to register additional connections to the Kafka broker within the same container network.
+     * <p>
+     * The listener will be added to the list of default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     *     <li>0.0.0.0:9094</li>
+     * </ul>
+     * <p>
+     * The listener will be added to the list of default advertised listeners.
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getConfig().getHostName():9092}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     * </ul>
+     * @param listener a listener with format {@code host:port}
+     * @return this {@link KafkaContainer} instance
+     */
+    public KafkaContainer withListener(String listener) {
+        this.listeners.add(listener);
+        this.advertisedListeners.add(() -> listener);
+        return this;
+    }
+
+    /**
+     * Add a listener in the format {@code host:port} and a {@link Supplier} for the advertised listener.
+     * Host from listener will be included as a network alias.
+     * <p>
+     * Use it to register additional connections to the Kafka broker from outside the container network
+     * <p>
+     * The listener will be added to the list of default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     *     <li>0.0.0.0:9094</li>
+     * </ul>
+     * <p>
+     * The {@link Supplier} will be added to the list of default advertised listeners.
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getConfig().getHostName():9092}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     * </ul>
+     * @param listener a supplier that will provide a listener
+     * @param advertisedListener a supplier that will provide a listener
+     * @return this {@link KafkaContainer} instance
+     */
+    public KafkaContainer withListener(String listener, Supplier<String> advertisedListener) {
+        this.listeners.add(listener);
+        this.advertisedListeners.add(advertisedListener);
+        return this;
+    }
+
     public String getBootstrapServers() {
         return String.format("%s:%s", getHost(), getMappedPort(KAFKA_PORT));
     }
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java
new file mode 100644
index 00000000000..b2bb31ae502
--- /dev/null
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java
@@ -0,0 +1,26 @@
+package org.testcontainers.kafka;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.AbstractKafka;
+
+@RunWith(Parameterized.class)
+public class CompatibleApacheKafkaImageTest extends AbstractKafka {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[] { "apache/kafka:3.8.0", "apache/kafka-native:3.8.0" };
+    }
+
+    @Parameterized.Parameter
+    public String imageName;
+
+    @Test
+    public void testUsage() throws Exception {
+        try (KafkaContainer kafka = new KafkaContainer(this.imageName)) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+}
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
index 233ee1cd2d4..b1764d3b522 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
@@ -1,26 +1,61 @@
 package org.testcontainers.kafka;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.AbstractKafka;
+import org.testcontainers.KCatContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.SocatContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
 public class KafkaContainerTest extends AbstractKafka {
 
-    @Parameterized.Parameters(name = "{0}")
-    public static String[] params() {
-        return new String[] { "apache/kafka:3.8.0", "apache/kafka-native:3.8.0" };
+    @Test
+    public void testUsage() throws Exception {
+        try ( // constructorWithVersion {
+            KafkaContainer kafka = new KafkaContainer("apache/kafka-native:3.8.0")
+            // }
+        ) {
+            kafka.start();
+            testKafkaFunctionality(kafka.getBootstrapServers());
+        }
     }
 
-    @Parameterized.Parameter
-    public String imageName;
+    @Test
+    public void testUsageWithListener() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            KafkaContainer kafka = new KafkaContainer("apache/kafka-native:3.8.0")
+                .withListener("kafka:19092")
+                .withNetwork(network);
+            KCatContainer kcat = new KCatContainer().withNetwork(network)
+        ) {
+            kafka.start();
+            kcat.start();
+
+            kcat.execInContainer("kcat", "-b", "kafka:19092", "-t", "msgs", "-P", "-l", "/data/msgs.txt");
+            String stdout = kcat
+                .execInContainer("kcat", "-b", "kafka:19092", "-C", "-t", "msgs", "-c", "1")
+                .getStdout();
+
+            assertThat(stdout).contains("Message produced by kcat");
+        }
+    }
 
     @Test
-    public void testUsage() throws Exception {
-        try (KafkaContainer kafka = new KafkaContainer(imageName)) {
+    public void testUsageWithListenerFromProxy() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            SocatContainer socat = new SocatContainer().withNetwork(network).withTarget(2000, "kafka", 19092);
+            KafkaContainer kafka = new KafkaContainer("apache/kafka-native:3.8.0")
+                .withListener("kafka:19092", () -> socat.getHost() + ":" + socat.getMappedPort(2000))
+                .withNetwork(network)
+        ) {
+            socat.start();
             kafka.start();
-            testKafkaFunctionality(kafka.getBootstrapServers());
+
+            String bootstrapServers = String.format("%s:%s", socat.getHost(), socat.getMappedPort(2000));
+            testKafkaFunctionality(bootstrapServers);
         }
     }
 }

From c08d0039739c38a9ce83bcf09b07a5c59814acd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 23 Aug 2024 22:24:07 -0500
Subject: [PATCH 3936/4969] Do not use network aliases in
 KAFKA_CONTROLLER_QUORUM_VOTERS (#9144)

Fixes #9143
---
 .../org/testcontainers/containers/KafkaContainer.java     | 8 +-------
 .../org/testcontainers/kafka/ConfluentKafkaContainer.java | 4 +---
 .../java/org/testcontainers/kafka/KafkaContainer.java     | 4 +---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
index f2831514477..7eb836ade18 100644
--- a/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
@@ -331,13 +331,7 @@ void withRaft() {
             addEnvVar("KAFKA_LISTENERS", kafkaListeners());
             addEnvVar("KAFKA_PROCESS_ROLES", "broker,controller");
 
-            String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
-            String networkAlias = getNetwork() != null ? firstNetworkAlias : "localhost";
-            String controllerQuorumVoters = String.format(
-                "%s@%s:9094",
-                getEnvVars().get("KAFKA_NODE_ID"),
-                networkAlias
-            );
+            String controllerQuorumVoters = String.format("%s@localhost:9094", getEnvVars().get("KAFKA_NODE_ID"));
             this.envVars.computeIfAbsent("KAFKA_CONTROLLER_QUORUM_VOTERS", key -> controllerQuorumVoters);
             addEnvVar("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
index 0a3c1c2dcb3..8c2cce855bc 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
@@ -45,9 +45,7 @@ public ConfluentKafkaContainer(DockerImageName dockerImageName) {
     protected void configure() {
         KafkaHelper.resolveListeners(this, this.listeners);
 
-        String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
-        String networkAlias = getNetwork() != null ? firstNetworkAlias : "localhost";
-        String controllerQuorumVoters = String.format("%s@%s:9094", getEnvMap().get("KAFKA_NODE_ID"), networkAlias);
+        String controllerQuorumVoters = String.format("%s@localhost:9094", getEnvMap().get("KAFKA_NODE_ID"));
         withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters);
     }
 
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
index e6f58474404..63e3a0d35cf 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -52,9 +52,7 @@ public KafkaContainer(DockerImageName dockerImageName) {
     protected void configure() {
         KafkaHelper.resolveListeners(this, this.listeners);
 
-        String firstNetworkAlias = getNetworkAliases().stream().findFirst().orElse(null);
-        String networkAlias = getNetwork() != null ? firstNetworkAlias : "localhost";
-        String controllerQuorumVoters = String.format("%s@%s:9094", getEnvMap().get("KAFKA_NODE_ID"), networkAlias);
+        String controllerQuorumVoters = String.format("%s@localhost:9094", getEnvMap().get("KAFKA_NODE_ID"));
         withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters);
     }
 

From ce83c36797a627a84b393c8cf909eda5a820fccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 23 Aug 2024 22:24:49 -0500
Subject: [PATCH 3937/4969] Improve test logging in examples and smoke-test
 (#9145)

---
 examples/build.gradle   | 10 ++++++++++
 smoke-test/build.gradle | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/examples/build.gradle b/examples/build.gradle
index a83df2bedce..6eaf2f73e49 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -14,6 +14,16 @@ subprojects {
         mavenCentral()
     }
 
+    test {
+        defaultCharacterEncoding = "UTF-8"
+        testLogging {
+            displayGranularity 1
+            showStackTraces = true
+            exceptionFormat = 'full'
+            events "STARTED", "PASSED", "FAILED", "SKIPPED"
+        }
+    }
+
     checkstyle {
         toolVersion = "9.3"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
index 830cfaf0b66..d0998b5f9f2 100644
--- a/smoke-test/build.gradle
+++ b/smoke-test/build.gradle
@@ -14,6 +14,16 @@ subprojects {
         mavenCentral()
     }
 
+    test {
+        defaultCharacterEncoding = "UTF-8"
+        testLogging {
+            displayGranularity 1
+            showStackTraces = true
+            exceptionFormat = 'full'
+            events "STARTED", "PASSED", "FAILED", "SKIPPED"
+        }
+    }
+
     checkstyle {
         toolVersion = "9.3"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')

From fb511a6511caaa6fa410407908bdf85ba422d930 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:25:52 +0000
Subject: [PATCH 3938/4969] Bump io.lettuce:lettuce-core in /smoke-test

Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.3.2.RELEASE to 6.4.0.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/redis/lettuce/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.3.2.RELEASE...6.4.0.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 87f43b7c3b0..2a0bfb73e7c 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 08a3e32bb88..12779709f10 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.3"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 292d3786851..2f6cf78a6ce 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From afb35a405d1890577fbfe93579df205e6b4ee104 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:02 +0000
Subject: [PATCH 3939/4969] Bump org.slf4j:slf4j-api from 1.7.36 to 2.0.16 in
 /smoke-test

Bumps org.slf4j:slf4j-api from 1.7.36 to 2.0.16.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test-support/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-support/build.gradle b/test-support/build.gradle
index 6908ad63ace..1df20ae6fba 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
-    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'org.slf4j:slf4j-api:2.0.16'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 192dbbfed22dd920415992122cf0ef5f2a41787b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:04 +0000
Subject: [PATCH 3940/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.3.2.RELEASE to 6.4.0.RELEASE.
- [Release notes](https://github.com/lettuce-io/lettuce-core/releases)
- [Changelog](https://github.com/redis/lettuce/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.3.2.RELEASE...6.4.0.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 87f43b7c3b0..2a0bfb73e7c 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 08a3e32bb88..12779709f10 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.3"
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 292d3786851..2f6cf78a6ce 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.3.2.RELEASE"
+    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From a313f35be9898b379df8a1eef54697abb9ec71bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:12 +0000
Subject: [PATCH 3941/4969] Bump org.junit.jupiter:junit-jupiter from 5.10.3 to
 5.11.0 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle           | 2 +-
 examples/immudb/build.gradle              | 2 +-
 examples/kafka-cluster/build.gradle       | 2 +-
 examples/nats/build.gradle                | 2 +-
 examples/neo4j-container/build.gradle     | 2 +-
 examples/ollama-hugging-face/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle  | 2 +-
 examples/selenium-container/build.gradle  | 2 +-
 examples/sftp/build.gradle                | 2 +-
 examples/singleton-container/build.gradle | 2 +-
 examples/solr-container/build.gradle      | 2 +-
 examples/spring-boot/build.gradle         | 2 +-
 examples/zookeeper/build.gradle           | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 84a54bce45f..5b3789480ad 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index ebf209b5e7a..c99dceac836 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 283e24f3229..54ae4eee8ff 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 2854790e0a3..6f37a47fde2 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'io.nats:jnats:2.19.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 7b2225e850e..186a910be2f 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 0143eb66423..77fe23ea1c2 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:ollama'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }
 
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f41e7524a83..b7d50f16c39 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 244e9bdc7eb..b7528880ca3 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 786f0e2d4a9..d8ed52d255f 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index e6b8cfaa142..384c792dc98 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 8f87c69c546..3b61202818e 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 8249b18eddc..657b544e119 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 35bef8255d9..50555fe8f85 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
 }
 
 test {

From c7a056b309228e82a9d236d581e5f59430a02c8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:15 +0000
Subject: [PATCH 3942/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 08a3e32bb88..df80970335c 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.3.2.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.3"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
     testImplementation project(":testcontainers")

From dad4d9feb5dcccf6f02b4da22daa696cf75aea67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:17 +0000
Subject: [PATCH 3943/4969] Bump org.junit.jupiter:junit-jupiter in /smoke-test

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 smoke-test/turbo-mode/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index 5b2f6ab9625..8a47c80aeee 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 50f43a0c6994a6421e2217641e68d797def9531b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:22 +0000
Subject: [PATCH 3944/4969] Bump redis.clients:jedis from 5.1.3 to 5.1.5 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.3 to 5.1.5.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.3...v5.1.5)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index dc07bf0f8c3..d28b2a0cc66 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.1.3'
+    implementation 'redis.clients:jedis:5.1.5'
     implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f41e7524a83..2c3c8f72a80 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.1.3'
+    implementation 'redis.clients:jedis:5.1.5'
     implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index e6b8cfaa142..28805d881cc 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.1.3'
+    implementation 'redis.clients:jedis:5.1.5'
     implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 7ccd076bd7379b4e30862f3c62eace30fb93b02a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:23 +0000
Subject: [PATCH 3945/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /smoke-test

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 08a3e32bb88..df80970335c 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.3.2.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.3"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
     testImplementation project(":testcontainers")

From 23fb2495087f71d4e8b7fe22e4ad945d17b8fb39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 03:26:24 +0000
Subject: [PATCH 3946/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 08a3e32bb88..84e8d6deff7 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.3"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.3"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.26.3'

From 73c1488fc03538bc6ca03a2aa45adeff1744ae87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:10:11 +0000
Subject: [PATCH 3947/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b13343e30b4..74d22babcd3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
 

From 1dabb2ca2be7e31a300d5e38296cb803eec60913 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:10:16 +0000
Subject: [PATCH 3948/4969] Bump redis.clients:jedis from 5.1.3 to 5.1.5 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.3 to 5.1.5.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.3...v5.1.5)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b13343e30b4..efe0db354ba 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.1.3'
+    testImplementation 'redis.clients:jedis:5.1.5'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From de200bd9e072e56eb73e41b01798ff5b5395bafb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:13:59 +0000
Subject: [PATCH 3949/4969] Bump org.postgresql:postgresql from 42.7.3 to
 42.7.4 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 eebf30e2e2e..87e33355e17 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.3'

From a30c3b755c45df030dd8353b2bdbf9406863d29e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:20:05 +0000
Subject: [PATCH 3950/4969] Bump io.kubernetes:client-java in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 21.0.0-legacy to 21.0.1-legacy.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/commits)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index f0e0f8a9fa1..3f795d99743 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.13.1'
-    testImplementation 'io.kubernetes:client-java:21.0.0-legacy'
+    testImplementation 'io.kubernetes:client-java:21.0.1-legacy'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 8c2b193cac4856a9ac21f3940fa65cac6efbdac2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:23:32 +0000
Subject: [PATCH 3951/4969] Bump org.postgresql:postgresql from 42.7.3 to
 42.7.4 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index b2ccaa9dc38..98adb9c40a3 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.questdb:questdb:7.3.9'

From 5f1fc146c514c9167d6333fa8255214f24796498 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:27:27 +0000
Subject: [PATCH 3952/4969] Bump io.nats:jnats from 2.19.1 to 2.20.2 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.19.1 to 2.20.2.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.19.1...2.20.2)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 2854790e0a3..e5376e754b0 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.19.1'
+    testImplementation 'io.nats:jnats:2.20.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'

From 42b4bad15e4d83c5afb3c3a7144c554358a951ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:35:59 +0000
Subject: [PATCH 3953/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.7.1.jre8-preview to 12.8.1.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5249edf9781..257d8954709 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.7.1.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre8'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From c67bfa8b4a01337d0064d08161e8624d66359a1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:38:56 +0000
Subject: [PATCH 3954/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 603c9361065..fa1e7f06839 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From d971b9dfc7f544f321318e9f7a9145fb725d98c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:46:15 +0000
Subject: [PATCH 3955/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 aa06a2d0249..834656a3dac 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 658fd9d32b2a037d5aecf51363996189c333d3e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:57:16 +0000
Subject: [PATCH 3956/4969] Bump org.postgresql:postgresql from 42.7.3 to
 42.7.4 in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 8240d805b13..9e269731b4b 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 0217e78eb986da4e73402288959d05f34b37546f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 27 Aug 2024 16:46:33 -0500
Subject: [PATCH 3957/4969] Update ryuk version to 0.9.0 (#9169)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index a4032619ae2..a39b276e56f 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.8.1");
+        super("testcontainers/ryuk:0.9.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 8e74ac60c9e3ae862967276458ceead7105a26a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 22:16:37 +0000
Subject: [PATCH 3958/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.35.0 to 2.37.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 49842bd274c..7ee0971b251 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.35.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.37.0"
 }
 
 test {

From 2f34af252799a7bebc85b966d3c68552d7541fe7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 22:26:24 +0000
Subject: [PATCH 3959/4969] Bump org.postgresql:postgresql from 42.7.3 to
 42.7.4 in /examples

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a78c362113a..028e457fc5d 100644
--- a/examples/linked-container/build.gradle
+++ b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'org.json:json:20240303'
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.26.3'

From 6e32062ddb38fb772079306aed8e3d2a53512db5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 22:28:28 +0000
Subject: [PATCH 3960/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.32 to 3.2.33.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.32...3.2.33)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index dbe1714cfc5..8c5671a9669 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.32"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.33"
 }

From c2400b00832d480c49166c0d357663253c2a0b20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 22:28:32 +0000
Subject: [PATCH 3961/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.32 to 3.2.33.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/3.2.33/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.32...3.2.33)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index dbe1714cfc5..3cb0de7ca46 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.32"
+    api "com.orientechnologies:orientdb-client:3.2.33"
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'

From 92ac644b82aeece34d2e0c72443310c8428eac6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 22:41:01 +0000
Subject: [PATCH 3962/4969] Bump slackapi/slack-github-action from 1.26.0 to
 1.27.0

Bumps [slackapi/slack-github-action](https://github.com/slackapi/slack-github-action) from 1.26.0 to 1.27.0.
- [Release notes](https://github.com/slackapi/slack-github-action/releases)
- [Commits](https://github.com/slackapi/slack-github-action/compare/v1.26.0...v1.27.0)

---
updated-dependencies:
- dependency-name: slackapi/slack-github-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/moby-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 62ce85b1c9b..7ef7a1c7ff8 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Notify to Slack on failures
         if: failure()
         id: slack
-        uses: slackapi/slack-github-action@v1.26.0
+        uses: slackapi/slack-github-action@v1.27.0
         with:
           payload: |
             {

From 9ac65272d9741e1a0dc9be49565e4fe5bd28b079 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 22:47:23 +0000
Subject: [PATCH 3963/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.30.0 to 4.32.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.30.0...4.32.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b19333fa14f..043bc5ec1e6 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.30.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.32.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.6")

From f29f8288b2d286ad0b538fd2f9e15db7f22c28a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 22:53:05 +0000
Subject: [PATCH 3964/4969] Bump dev.openfga:openfga-sdk from 0.5.0 to 0.7.0 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.5.0...v0.7.0)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index e7db231db18..c2e9f67c43d 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'dev.openfga:openfga-sdk:0.5.0'
+    testImplementation 'dev.openfga:openfga-sdk:0.7.0'
 }
 
 test {

From baf3870cefadcf51d280bc75ddcca1b8210283c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:01:53 +0000
Subject: [PATCH 3965/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.6 to 1.5.8.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.6...v_1.5.8)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b19333fa14f..9c27cc84933 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.30.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.5.6")
+    testImplementation("ch.qos.logback:logback-classic:1.5.8")
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 

From fc2486d804f8de3ed2360ced97a412056e725a33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:10:46 +0000
Subject: [PATCH 3966/4969] Bump com.timeplus:timeplus-native-jdbc in
 /modules/timeplus

Bumps [com.timeplus:timeplus-native-jdbc](https://github.com/timeplus-io/timeplus-native-jdbc) from 2.0.4 to 2.0.5.
- [Release notes](https://github.com/timeplus-io/timeplus-native-jdbc/releases)
- [Commits](https://github.com/timeplus-io/timeplus-native-jdbc/compare/v2.0.4...v2.0.5)

---
updated-dependencies:
- dependency-name: com.timeplus:timeplus-native-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/timeplus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index 74570d821c2..007b46e23e4 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.4'
+    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.5'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From a56b412ecfbb129cdf7d2398384a8beb8f1d54f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:27:23 +0000
Subject: [PATCH 3967/4969] Bump org.mongodb:mongodb-driver-sync in
 /modules/mongodb

Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 5.1.2 to 5.1.4.
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.1.2...r5.1.4)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 2a4c0b67063..0904df92824 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:5.1.2")
+    testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 3d97ff762099721476f93f5d966087dfb42f91ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:52:35 +0000
Subject: [PATCH 3968/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.13.2 to 1.13.4.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.2...v1.13.4)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 565a1ee60e8..550779c4d55 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.2'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 }
 

From e3653fd7211acccd82eddcb36c71705e18a550a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:05:12 +0000
Subject: [PATCH 3969/4969] Bump gradle-update/update-gradle-wrapper-action
 from 1.0.20 to 2.0.0

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 1.0.20 to 2.0.0.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/0407394b9d173dfc9cf5695f9f560fef6d61a5fe...9268373d69bd0974b6318eb3b512b8e025060bbe)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index a6d7423d9c3..b69353a6ab5 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@0407394b9d173dfc9cf5695f9f560fef6d61a5fe # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@9268373d69bd0974b6318eb3b512b8e025060bbe # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From ca29e2079d4294ee4e195c632b6b652c7d221958 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:11:07 +0000
Subject: [PATCH 3970/4969] Bump com.rabbitmq:amqp-client from 5.21.0 to 5.22.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.21.0 to 5.22.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.21.0...v5.22.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 7ab2408fe05..633e40ee64b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:5.1.3'
-    testImplementation 'com.rabbitmq:amqp-client:5.21.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.22.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From c15da3910ceca9199bd6cc78c5a47d3b4226be48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:12:37 +0000
Subject: [PATCH 3971/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.22 to 7.17.24.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.22...v7.17.24)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index a6ad2e8ed3f..65c3b08ef0b 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.14.3"
-    testImplementation "org.elasticsearch.client:transport:7.17.22"
+    testImplementation "org.elasticsearch.client:transport:7.17.24"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 9e2f7ec743182f64c29deebcd4bacc83dd07b940 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:19:21 +0000
Subject: [PATCH 3972/4969] Bump com.rabbitmq:amqp-client from 5.21.0 to 5.22.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.21.0 to 5.22.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.21.0...v5.22.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index f8959b6c5ea..42a12d68759 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.21.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.22.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From d24832a1b954671df33887b9b26cf310376aa7dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:38:38 +0000
Subject: [PATCH 3973/4969] Bump com.amazonaws:aws-java-sdk-dynamodb in
 /modules/dynalite

Bumps [com.amazonaws:aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.12.765 to 1.12.772.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.765...1.12.772)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 0c7c0c67793..d8fe2377b76 100644
--- a/modules/dynalite/build.gradle
+++ b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.765'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.765'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.772'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.772'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 9c2ef47a425cac54b0ead2c3a91db396b87cc8d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:42:01 +0000
Subject: [PATCH 3974/4969] Bump com.azure:azure-cosmos from 4.62.0 to 4.63.3
 in /modules/azure

Bumps [com.azure:azure-cosmos](https://github.com/Azure/azure-sdk-for-java) from 4.62.0 to 4.63.3.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.62.0...azure-cosmos_4.63.3)

---
updated-dependencies:
- dependency-name: com.azure:azure-cosmos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 81931707562..d31a549abe5 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'com.azure:azure-cosmos:4.62.0'
+    testImplementation 'com.azure:azure-cosmos:4.63.3'
 }

From a74291525677b1a0ac562f259c87069bc46282a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:51:03 +0000
Subject: [PATCH 3975/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.17.6 to 3.18.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 5838b93507b..5d8ea6e2d76 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.6"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.1"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }

From 85fc33c29047e7c1c3377cc29d0326c4b5ab8e07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:54:31 +0000
Subject: [PATCH 3976/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.8 to 3.6.10.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.6.8...v3.6.10)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index a1c68855d55..a440af1dc97 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.8'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.10'
     testFixturesImplementation 'org.assertj:assertj-core:3.26.3'
 }

From f2ed9e06773e8f8894f9691cf52a94277276d9cb Mon Sep 17 00:00:00 2001
From: Andrei Nevedomskii <kloz.klaud@gmail.com>
Date: Tue, 17 Sep 2024 19:26:21 +0200
Subject: [PATCH 3977/4969] Fix no match for platform in manifest when
 containerd is enabled using Docker Desktop (#9200)

---
 .../main/java/org/testcontainers/images/RemoteDockerImage.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index af3ed08984a..e97b4afad23 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.google.common.util.concurrent.Futures;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -155,7 +156,7 @@ private TimeLimitedLoggedPullImageResultCallback pullImage(PullImageCmd pullImag
         throws InterruptedException {
         try {
             return pullImageCmd.exec(new TimeLimitedLoggedPullImageResultCallback(logger)).awaitCompletion();
-        } catch (DockerClientException e) {
+        } catch (DockerClientException | NotFoundException e) {
             // Try to fallback to x86
             return pullImageCmd
                 .withPlatform("linux/amd64")

From bd0b75fa0f1011d3251f53c902eef02addc4b0ee Mon Sep 17 00:00:00 2001
From: Jeremy <hantmac@outlook.com>
Date: Wed, 18 Sep 2024 04:39:58 +0800
Subject: [PATCH 3978/4969] Add module for Databend (#9148)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   4 +
 .github/labeler.yml                           |   4 +
 .github/settings.yml                          |   3 +
 docs/modules/databases/databend.md            |  24 ++++
 mkdocs.yml                                    |   1 +
 modules/databend/build.gradle                 |   9 ++
 .../databend/DatabendContainer.java           | 112 ++++++++++++++++++
 .../databend/DatabendContainerProvider.java   |  28 +++++
 ...s.containers.JdbcDatabaseContainerProvider |   1 +
 .../databend/DatabendContainerTest.java       |  41 +++++++
 .../databend/DatabendJDBCDriverTest.java      |  21 ++++
 .../src/test/resources/logback-test.xml       |  16 +++
 15 files changed, 267 insertions(+)
 create mode 100644 docs/modules/databases/databend.md
 create mode 100644 modules/databend/build.gradle
 create mode 100644 modules/databend/src/main/java/org/testcontainers/databend/DatabendContainer.java
 create mode 100644 modules/databend/src/main/java/org/testcontainers/databend/DatabendContainerProvider.java
 create mode 100644 modules/databend/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
 create mode 100644 modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
 create mode 100644 modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
 create mode 100644 modules/databend/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 284e2c561fb..4251a2db853 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -23,6 +23,7 @@ body:
         - Consul
         - Couchbase
         - CrateDB
+        - Databend
         - DB2
         - Dynalite
         - Elasticsearch
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 2ca7de6bc3c..24d6b33ffdd 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -23,6 +23,7 @@ body:
         - Consul
         - Couchbase
         - CrateDB
+        - Databend
         - DB2
         - Dynalite
         - Elasticsearch
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 311ec8ca2c6..d36532b7d9d 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -23,6 +23,7 @@ body:
         - CrateDB
         - Consul
         - Couchbase
+        - Databend
         - DB2
         - Dynalite
         - Elasticsearch
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0239be10168..22977397e03 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -90,6 +90,10 @@ updates:
     directory: "/modules/database-commons"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gradle"
+    directory: "/modules/databend"
+    schedule:
+      interval: "weekly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/db2"
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 875e996c428..e88811fd50a 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -55,6 +55,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/cratedb/**/*
+"modules/databend":
+  - changed-files:
+      - any-glob-to-any-file:
+          - modules/databend/**/*
 "modules/db2":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 06b1c06e72f..d02aee1c7da 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -271,6 +271,9 @@ labels:
   - name: modules/yugabytedb
     color: '#006b75'
 
+  - name: modules/databend
+    color: '#006b75'
+
   - name: os/linux
     color: '#1d76db'
 
diff --git a/docs/modules/databases/databend.md b/docs/modules/databases/databend.md
new file mode 100644
index 00000000000..c399dc2bb51
--- /dev/null
+++ b/docs/modules/databases/databend.md
@@ -0,0 +1,24 @@
+# Databend Module
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:databend:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>databend</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
+!!! hint
+Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency.
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 2e1c60c7dcc..f3cd49bab30 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -56,6 +56,7 @@ nav:
                 - modules/databases/couchbase.md
                 - modules/databases/clickhouse.md
                 - modules/databases/cratedb.md
+                - modules/databases/databend.md
                 - modules/databases/db2.md
                 - modules/databases/dynalite.md
                 - modules/databases/influxdb.md
diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
new file mode 100644
index 00000000000..81cc9ef2cbe
--- /dev/null
+++ b/modules/databend/build.gradle
@@ -0,0 +1,9 @@
+description = "Testcontainers :: JDBC :: Databend"
+
+dependencies {
+    api project(':jdbc')
+
+    testImplementation project(':jdbc-test')
+    testRuntimeOnly 'com.databend:databend-jdbc:0.2.9'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
+}
diff --git a/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainer.java b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainer.java
new file mode 100644
index 00000000000..389c8c44963
--- /dev/null
+++ b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainer.java
@@ -0,0 +1,112 @@
+package org.testcontainers.databend;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for Databend.
+ * <p>
+ * Supported image: {@code datafuselabs/databend}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 8000</li>
+ * </ul>
+ */
+public class DatabendContainer extends JdbcDatabaseContainer<DatabendContainer> {
+
+    static final String NAME = "databend";
+
+    static final DockerImageName DOCKER_IMAGE_NAME = DockerImageName.parse("datafuselabs/databend");
+
+    private static final Integer HTTP_PORT = 8000;
+
+    private static final String DRIVER_CLASS_NAME = "com.databend.jdbc.DatabendDriver";
+
+    private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+
+    private static final String TEST_QUERY = "SELECT 1";
+
+    private String databaseName = "default";
+
+    private String username = "databend";
+
+    private String password = "databend";
+
+    public DatabendContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public DatabendContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DOCKER_IMAGE_NAME);
+
+        addExposedPorts(HTTP_PORT);
+        waitingFor(Wait.forHttp("/").forResponsePredicate(response -> response.equals("Ok.")));
+    }
+
+    @Override
+    protected void configure() {
+        withEnv("QUERY_DEFAULT_USER", this.username);
+        withEnv("QUERY_DEFAULT_PASSWORD", this.password);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return new HashSet<>(getMappedPort(HTTP_PORT));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return DRIVER_CLASS_NAME;
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return (
+            JDBC_URL_PREFIX +
+            getHost() +
+            ":" +
+            getMappedPort(HTTP_PORT) +
+            "/" +
+            this.databaseName +
+            constructUrlParameters("?", "&")
+        );
+    }
+
+    @Override
+    public String getUsername() {
+        return this.username;
+    }
+
+    @Override
+    public String getPassword() {
+        return this.password;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return this.databaseName;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return TEST_QUERY;
+    }
+
+    @Override
+    public DatabendContainer withUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public DatabendContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+}
diff --git a/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainerProvider.java b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainerProvider.java
new file mode 100644
index 00000000000..9142bebcfd3
--- /dev/null
+++ b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainerProvider.java
@@ -0,0 +1,28 @@
+package org.testcontainers.databend;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+
+public class DatabendContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final String DEFAULT_TAG = "v1.2.615";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(DatabendContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        if (tag != null) {
+            return new DatabendContainer(DatabendContainer.DOCKER_IMAGE_NAME.withTag(tag));
+        } else {
+            return newInstance();
+        }
+    }
+}
diff --git a/modules/databend/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/databend/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..ead69e77bee
--- /dev/null
+++ b/modules/databend/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.databend.DatabendContainerProvider
diff --git a/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
new file mode 100644
index 00000000000..92f4842d119
--- /dev/null
+++ b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
@@ -0,0 +1,41 @@
+package org.testcontainers.databend;
+
+import org.junit.Test;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DatabendContainerTest extends AbstractContainerDatabaseTest {
+
+    @Test
+    public void testSimple() throws SQLException {
+        try (DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")) {
+            databend.start();
+
+            ResultSet resultSet = performQuery(databend, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void customCredentialsWithUrlParams() throws SQLException {
+        try (
+            DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
+                .withUsername("test")
+                .withPassword("test")
+                .withUrlParam("ssl", "false")
+        ) {
+            databend.start();
+
+            ResultSet resultSet = performQuery(databend, "SELECT 1;");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(1);
+        }
+    }
+}
diff --git a/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java b/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
new file mode 100644
index 00000000000..a36039dc8d1
--- /dev/null
+++ b/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
@@ -0,0 +1,21 @@
+package org.testcontainers.databend;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+@RunWith(Parameterized.class)
+public class DatabendJDBCDriverTest extends AbstractJDBCDriverTest {
+
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(
+            new Object[][] { //
+                { "jdbc:tc:databend://hostname/databasename", EnumSet.of(Options.PmdKnownBroken) },
+            }
+        );
+    }
+}
diff --git a/modules/databend/src/test/resources/logback-test.xml b/modules/databend/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/databend/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From c4807805f4281e26e1874858ae8e5b5474569363 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:40:25 +0000
Subject: [PATCH 3979/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.26 to 10.1.30.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 36d832aefa5..2b2868ebbc6 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.26'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.30'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 031fd06a20cc6cfb3e9a428e7adc038f5abfda96 Mon Sep 17 00:00:00 2001
From: Jake W <delight.wjk@gmail.com>
Date: Thu, 19 Sep 2024 22:22:54 +0800
Subject: [PATCH 3980/4969] Fix gcloud docs (#9246)

---
 docs/modules/gcloud.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 31542a5d387..049931b3be1 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -111,7 +111,7 @@ Create a test Database in the Emulator:
 And test against the Emulator:
 
 <!--codeinclude-->
-[Testing with a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+[Testing with a Spanner Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
 <!--/codeinclude-->
 
 See more examples:

From f763945ad79b5c3f64865ce19755361250d82832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 19 Sep 2024 11:04:26 -0500
Subject: [PATCH 3981/4969] Fix register listeners in RedpandaContainer (#9247)

Previously, RedpandaContainer allowed to register a new listener
using a Supplier and the new listener's host was also added as a network
alias. However, if the listener's host was an IP the listener configuration
was wrong and didn't allow to connect to the broker.
---
 docs/modules/redpanda.md                      |  20 ++++
 modules/redpanda/build.gradle                 |   1 +
 .../redpanda/RedpandaContainer.java           | 108 +++++++++++++++++-
 .../testcontainers/redpanda.yaml.ftl          |  11 ++
 .../redpanda/AbstractRedpanda.java            |  19 +--
 .../redpanda/RedpandaContainerTest.java       |  62 +++++++++-
 6 files changed, 197 insertions(+), 24 deletions(-)

diff --git a/docs/modules/redpanda.md b/docs/modules/redpanda.md
index 22545ffb026..2ce4a284836 100644
--- a/docs/modules/redpanda.md
+++ b/docs/modules/redpanda.md
@@ -63,6 +63,26 @@ Client using the new registered listener:
 [Produce/Consume via new listener](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:produceConsumeMessage
 <!--/codeinclude-->
 
+The following examples shows how to register a proxy as a new listener in `RedpandaContainer`:
+
+Use `SocatContainer` to create the proxy
+
+<!--codeinclude-->
+[Create Proxy](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:createProxy
+<!--/codeinclude-->
+
+Register the listener and advertised listener
+
+<!--codeinclude-->
+[Register Listener](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:registerListenerAndAdvertisedListener
+<!--/codeinclude-->
+
+Client using the new registered listener:
+
+<!--codeinclude-->
+[Produce/Consume via new listener](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:produceConsumeMessageFromProxy
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index bffcc8b133a..56bf81761b4 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -7,4 +7,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
 }
diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index 8960487e39b..a7cfc245d95 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -71,8 +71,11 @@ public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
 
     private final List<String> superusers = new ArrayList<>();
 
+    @Deprecated
     private final Set<Supplier<Listener>> listenersValueSupplier = new HashSet<>();
 
+    private final Map<String, Supplier<String>> listeners = new HashMap<>();
+
     public RedpandaContainer(String image) {
         this(DockerImageName.parse(image));
     }
@@ -109,6 +112,7 @@ protected void configure() {
             .map(Supplier::get)
             .map(Listener::getAddress)
             .forEach(this::withNetworkAliases);
+        this.listeners.keySet().stream().map(listener -> listener.split(":")[0]).forEach(this::withNetworkAliases);
     }
 
     @SneakyThrows
@@ -212,13 +216,74 @@ public RedpandaContainer withSuperuser(String username) {
      * </ul>
      * @param listenerSupplier a supplier that will provide a listener
      * @return this {@link RedpandaContainer} instance
+     * @deprecated use {@link #withListener(String, Supplier)} instead
      */
+    @Deprecated
     public RedpandaContainer withListener(Supplier<String> listenerSupplier) {
         String[] parts = listenerSupplier.get().split(":");
         this.listenersValueSupplier.add(() -> new Listener(parts[0], Integer.parseInt(parts[1])));
         return this;
     }
 
+    /**
+     * Add a listener in the format {@code host:port}.
+     * Host will be included as a network alias.
+     * <p>
+     * Use it to register additional connections to the Kafka broker within the same container network.
+     * <p>
+     * The listener will be added to the list of default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     * </ul>
+     * <p>
+     * The listener will be added to the list of default advertised listeners.
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getConfig().getHostName():9092}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     * </ul>
+     * @param listener a listener with format {@code host:port}
+     * @return this {@link RedpandaContainer} instance
+     */
+    public RedpandaContainer withListener(String listener) {
+        this.listeners.put(listener, () -> listener);
+        return this;
+    }
+
+    /**
+     * Add a listener in the format {@code host:port} and a {@link Supplier} for the advertised listener.
+     * Host from listener will be included as a network alias.
+     * <p>
+     * Use it to register additional connections to the Kafka broker from outside the container network
+     * <p>
+     * The listener will be added to the list of default listeners.
+     * <p>
+     * Default listeners:
+     * <ul>
+     *     <li>0.0.0.0:9092</li>
+     *     <li>0.0.0.0:9093</li>
+     * </ul>
+     * <p>
+     * The {@link Supplier} will be added to the list of default advertised listeners.
+     * <p>
+     * Default advertised listeners:
+     * <ul>
+     *      <li>{@code container.getConfig().getHostName():9092}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     * </ul>
+     * @param listener a supplier that will provide a listener
+     * @param advertisedListener a supplier that will provide a listener
+     * @return this {@link RedpandaContainer} instance
+     */
+    public RedpandaContainer withListener(String listener, Supplier<String> advertisedListener) {
+        this.listeners.put(listener, advertisedListener);
+        return this;
+    }
+
     private Transferable getBootstrapFile(Configuration cfg) {
         Map<String, Object> kafkaApi = new HashMap<>();
         kafkaApi.put("enableAuthorization", this.enableAuthorization);
@@ -233,6 +298,12 @@ private Transferable getBootstrapFile(Configuration cfg) {
     }
 
     private Transferable getRedpandaFile(Configuration cfg) {
+        Map<String, Object> kafkaApi = new HashMap<>();
+        kafkaApi.put("authenticationMethod", this.authenticationMethod);
+        kafkaApi.put("enableAuthorization", this.enableAuthorization);
+        kafkaApi.put("advertisedHost", getHost());
+        kafkaApi.put("advertisedPort", getMappedPort(9092));
+
         List<Map<String, Object>> listeners =
             this.listenersValueSupplier.stream()
                 .map(Supplier::get)
@@ -244,19 +315,44 @@ private Transferable getRedpandaFile(Configuration cfg) {
                     return listenerMap;
                 })
                 .collect(Collectors.toList());
-
-        Map<String, Object> kafkaApi = new HashMap<>();
-        kafkaApi.put("authenticationMethod", this.authenticationMethod);
-        kafkaApi.put("enableAuthorization", this.enableAuthorization);
-        kafkaApi.put("advertisedHost", getHost());
-        kafkaApi.put("advertisedPort", getMappedPort(9092));
         kafkaApi.put("listeners", listeners);
 
+        List<Map<String, Object>> kafkaListeners =
+            this.listeners.keySet()
+                .stream()
+                .map(listener -> {
+                    Map<String, Object> listenerMap = new HashMap<>();
+                    listenerMap.put("name", listener.split(":")[0]);
+                    listenerMap.put("address", listener.split(":")[0]);
+                    listenerMap.put("port", listener.split(":")[1]);
+                    listenerMap.put("authentication_method", this.authenticationMethod);
+                    return listenerMap;
+                })
+                .collect(Collectors.toList());
+
+        List<Map<String, Object>> kafkaAdvertisedListeners =
+            this.listeners.entrySet()
+                .stream()
+                .map(entry -> {
+                    String advertisedListener = entry.getValue().get();
+                    Map<String, Object> listenerMap = new HashMap<>();
+                    listenerMap.put("name", entry.getKey().split(":")[0]);
+                    listenerMap.put("address", advertisedListener.split(":")[0]);
+                    listenerMap.put("port", advertisedListener.split(":")[1]);
+                    return listenerMap;
+                })
+                .collect(Collectors.toList());
+
+        Map<String, Object> kafka = new HashMap<>();
+        kafka.put("listeners", kafkaListeners);
+        kafka.put("advertisedListeners", kafkaAdvertisedListeners);
+
         Map<String, Object> schemaRegistry = new HashMap<>();
         schemaRegistry.put("authenticationMethod", this.schemaRegistryAuthenticationMethod);
 
         Map<String, Object> root = new HashMap<>();
         root.put("kafkaApi", kafkaApi);
+        root.put("kafka", kafka);
         root.put("schemaRegistry", schemaRegistry);
 
         String file = resolveTemplate(cfg, "redpanda.yaml.ftl", root);
diff --git a/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl b/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
index 457a3738652..80fb3c09418 100644
--- a/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
+++ b/modules/redpanda/src/main/resources/testcontainers/redpanda.yaml.ftl
@@ -27,6 +27,12 @@ redpanda:
       port: ${listener.port}
       authentication_method: ${listener.authentication_method}
 </#list>
+<#list kafka.listeners as listener>
+    - address: ${listener.address}
+      name: ${listener.name}
+      port: ${listener.port}
+      authentication_method: ${listener.authentication_method}
+</#list>
 
   advertised_kafka_api:
     - address: ${ kafkaApi.advertisedHost }
@@ -40,6 +46,11 @@ redpanda:
       name: ${listener.address}
       port: ${listener.port}
 </#list>
+<#list kafka.advertisedListeners as listener>
+    - address: ${listener.address}
+      name: ${listener.name}
+      port: ${listener.port}
+</#list>
 
 schema_registry:
   schema_registry_api:
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java
index 35998e8e8fa..ce985a59fdb 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/AbstractRedpanda.java
@@ -13,7 +13,7 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.rnorth.ducttape.unreliables.Unreliables;
+import org.awaitility.Awaitility;
 
 import java.time.Duration;
 import java.util.Collection;
@@ -67,24 +67,17 @@ protected void testKafkaFunctionality(String bootstrapServers, int partitions, i
 
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
 
-            Unreliables.retryUntilTrue(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
+            Awaitility
+                .await()
+                .atMost(Duration.ofSeconds(10))
+                .untilAsserted(() -> {
                     ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
 
-                    if (records.isEmpty()) {
-                        return false;
-                    }
-
                     assertThat(records)
                         .hasSize(1)
                         .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
                         .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
-
-                    return true;
-                }
-            );
+                });
 
             consumer.unsubscribe();
         }
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index d0df2d7c95b..dcdaad4da28 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -15,6 +15,7 @@
 import org.junit.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
+import org.testcontainers.containers.SocatContainer;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
@@ -114,10 +115,37 @@ public void testSchemaRegistry() {
     public void testUsageWithListener() throws Exception {
         try (
             Network network = Network.newNetwork();
-            // registerListener {
             RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
                 .withListener(() -> "redpanda:19092")
                 .withNetwork(network);
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+                .withCreateContainerCmdModifier(cmd -> {
+                    cmd.withEntrypoint("sh");
+                })
+                .withCopyToContainer(Transferable.of("Message produced by kcat"), "/data/msgs.txt")
+                .withNetwork(network)
+                .withCommand("-c", "tail -f /dev/null")
+        ) {
+            redpanda.start();
+            kcat.start();
+
+            kcat.execInContainer("kcat", "-b", "redpanda:19092", "-t", "msgs", "-P", "-l", "/data/msgs.txt");
+            String stdout = kcat
+                .execInContainer("kcat", "-b", "redpanda:19092", "-C", "-t", "msgs", "-c", "1")
+                .getStdout();
+
+            assertThat(stdout).contains("Message produced by kcat");
+        }
+    }
+
+    @Test
+    public void testUsageWithListenerInTheSameNetwork() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            // registerListener {
+            RedpandaContainer kafka = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .withListener("kafka:19092")
+                .withNetwork(network);
             // }
             // createKCatContainer {
             GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
@@ -129,18 +157,42 @@ public void testUsageWithListener() throws Exception {
                 .withCommand("-c", "tail -f /dev/null")
             // }
         ) {
-            redpanda.start();
+            kafka.start();
             kcat.start();
+
             // produceConsumeMessage {
-            kcat.execInContainer("kcat", "-b", "redpanda:19092", "-t", "msgs", "-P", "-l", "/data/msgs.txt");
+            kcat.execInContainer("kcat", "-b", "kafka:19092", "-t", "msgs", "-P", "-l", "/data/msgs.txt");
             String stdout = kcat
-                .execInContainer("kcat", "-b", "redpanda:19092", "-C", "-t", "msgs", "-c", "1")
+                .execInContainer("kcat", "-b", "kafka:19092", "-C", "-t", "msgs", "-c", "1")
                 .getStdout();
             // }
+
             assertThat(stdout).contains("Message produced by kcat");
         }
     }
 
+    @Test
+    public void testUsageWithListenerFromProxy() throws Exception {
+        try (
+            Network network = Network.newNetwork();
+            // createProxy {
+            SocatContainer socat = new SocatContainer().withNetwork(network).withTarget(2000, "kafka", 19092);
+            // }
+            // registerListenerAndAdvertisedListener {
+            RedpandaContainer kafka = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
+                .withListener("kafka:19092", () -> socat.getHost() + ":" + socat.getMappedPort(2000))
+                .withNetwork(network)
+            // }
+        ) {
+            socat.start();
+            kafka.start();
+            // produceConsumeMessageFromProxy {
+            String bootstrapServers = String.format("%s:%s", socat.getHost(), socat.getMappedPort(2000));
+            testKafkaFunctionality(bootstrapServers);
+            // }
+        }
+    }
+
     @Test
     public void testUsageWithListenerAndSasl() throws Exception {
         final String username = "panda";
@@ -153,7 +205,7 @@ public void testUsageWithListenerAndSasl() throws Exception {
                 .enableAuthorization()
                 .enableSasl()
                 .withSuperuser("panda")
-                .withListener(() -> "my-panda:29092")
+                .withListener("my-panda:29092")
                 .withNetwork(network);
             GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
                 .withCreateContainerCmdModifier(cmd -> {

From 1231a1269c77c41587364dd727e80c9c0b55fcea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 19 Sep 2024 12:10:42 -0500
Subject: [PATCH 3982/4969] Use awaitility in Kafka module (#9248)

Remove usage of `Unreliables` from `duct-tape` lib.
---
 modules/kafka/build.gradle                    |  1 +
 .../org/testcontainers/AbstractKafka.java     | 19 ++++++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 554275a2037..176fe253375 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -6,4 +6,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
 }
diff --git a/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java b/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
index f7e9dcedb30..7fc5bb3851e 100644
--- a/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
+++ b/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
@@ -14,7 +14,7 @@
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.rnorth.ducttape.unreliables.Unreliables;
+import org.awaitility.Awaitility;
 
 import java.time.Duration;
 import java.util.Collection;
@@ -101,24 +101,17 @@ protected void testKafkaFunctionality(String bootstrapServers, boolean authentic
 
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
 
-            Unreliables.retryUntilTrue(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
+            Awaitility
+                .await()
+                .atMost(Duration.ofSeconds(10))
+                .untilAsserted(() -> {
                     ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
 
-                    if (records.isEmpty()) {
-                        return false;
-                    }
-
                     assertThat(records)
                         .hasSize(1)
                         .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
                         .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
-
-                    return true;
-                }
-            );
+                });
 
             consumer.unsubscribe();
         }

From d90623da2160b60379e718e5c073914201cb2a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 19 Sep 2024 12:54:40 -0500
Subject: [PATCH 3983/4969] Update redis version to 5.1.3 (#9250)

---
 modules/toxiproxy/build.gradle                                  | 2 +-
 .../test/java/org/testcontainers/containers/ToxiproxyTest.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 95cc199dca1..84eeb74603d 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
-    testImplementation 'redis.clients:jedis:3.0.1'
+    testImplementation 'redis.clients:jedis:5.1.3'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index b3caaf4f083..bb941640055 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -104,6 +104,7 @@ public void testConnectionCut() throws IOException {
         proxy.toxics().get("CUT_CONNECTION_DOWNSTREAM").remove();
         proxy.toxics().get("CUT_CONNECTION_UPSTREAM").remove();
 
+        jedis.close();
         // and with the connection re-established, expect success
         assertThat(jedis.get("somekey"))
             .as("access to the container works OK after re-establishing the connection")

From d2beecb9176835a0aa70e41c7b72e81b09316432 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:55:59 +0000
Subject: [PATCH 3984/4969] Bump redis.clients:jedis from 3.0.1 to 5.1.5 in
 /modules/toxiproxy

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 3.0.1 to 5.1.5.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/jedis-3.0.1...v5.1.5)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 84eeb74603d..211d5e38ae3 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
-    testImplementation 'redis.clients:jedis:5.1.3'
+    testImplementation 'redis.clients:jedis:5.1.5'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 751aa4eee75aa135d365647d8b0b32347f98151d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 19 Sep 2024 18:40:51 -0500
Subject: [PATCH 3985/4969] Update MSSQL images to execute in ubuntu-22.04
 (#9254)

---
 .../src/test/java/org/testcontainers/MSSQLServerTestImages.java | 2 +-
 .../containers/MSSQLR2DBCDatabaseContainerTest.java             | 2 +-
 .../jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java             | 2 +-
 .../junit/mssqlserver/CustomizableMSSQLServerTest.java          | 2 +-
 .../src/test/resources/container-license-acceptance.txt         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java b/modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java
index 0cec042e19f..804691e2baf 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/MSSQLServerTestImages.java
@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface MSSQLServerTestImages {
-    DockerImageName MSSQL_SERVER_IMAGE = DockerImageName.parse("mcr.microsoft.com/mssql/server:2017-CU12");
+    DockerImageName MSSQL_SERVER_IMAGE = DockerImageName.parse("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
 }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
index 8c0c9ab1c2b..a0d3106f9c6 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java
@@ -13,7 +13,7 @@ protected ConnectionFactoryOptions getOptions(MSSQLServerContainer<?> container)
 
     @Override
     protected String createR2DBCUrl() {
-        return "r2dbc:tc:sqlserver:///?TC_IMAGE_TAG=2017-CU12";
+        return "r2dbc:tc:sqlserver:///?TC_IMAGE_TAG=2022-CU14-ubuntu-22.04";
     }
 
     @Override
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
index bdb623136fb..4ed4db9e8ab 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
@@ -15,7 +15,7 @@ public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
                 {
-                    "jdbc:tc:sqlserver:2017-CU12://hostname:hostport;databaseName=databasename",
+                    "jdbc:tc:sqlserver:2022-CU14-ubuntu-22.04://hostname:hostport;databaseName=databasename",
                     EnumSet.noneOf(Options.class),
                 },
             }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
index 4cfc34f9e73..03e0affa00c 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
@@ -18,7 +18,7 @@ public class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
     public void testSqlServerConnection() throws SQLException {
         try (
             MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
-                DockerImageName.parse("mcr.microsoft.com/mssql/server:2017-CU12")
+                DockerImageName.parse("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
             )
                 .withPassword(STRONG_PASSWORD)
         ) {
diff --git a/modules/mssqlserver/src/test/resources/container-license-acceptance.txt b/modules/mssqlserver/src/test/resources/container-license-acceptance.txt
index 8a704b9c066..5ae6ecbd4d1 100644
--- a/modules/mssqlserver/src/test/resources/container-license-acceptance.txt
+++ b/modules/mssqlserver/src/test/resources/container-license-acceptance.txt
@@ -1 +1 @@
-mcr.microsoft.com/mssql/server:2017-CU12
+mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04

From 47716a7fb597cf46a78857a6270b7e7cf4c8196a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:06:01 +0000
Subject: [PATCH 3986/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.2.2
 in /modules/redpanda

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.2.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.2.2)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 56bf81761b4..2db469936f6 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
-    testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.awaitility:awaitility:4.2.2'
 }

From 8d2705fb14b22e17f888103fa45ee88925bcc9d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:06:21 +0000
Subject: [PATCH 3987/4969] Bump io.grpc:grpc-bom from 1.65.1 to 1.68.0 in
 /modules/qdrant

Bumps [io.grpc:grpc-bom](https://github.com/grpc/grpc-java) from 1.65.1 to 1.68.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/commits)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 8f7ddcfab2a..790b22520ae 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.qdrant:client:1.10.0'
-    testImplementation platform('io.grpc:grpc-bom:1.65.1')
+    testImplementation platform('io.grpc:grpc-bom:1.68.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'

From e7fd353a4c3c9618c83d593425aa5e3adfc19030 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:08:45 +0000
Subject: [PATCH 3988/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.7.1 to 3.7.3.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/java-client-3.7.1...core-io-3.7.3)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 4ecab1d0f6b..973af4b2ffb 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.7.1'
+    testImplementation 'com.couchbase.client:java-client:3.7.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 44d37ecf5c4387996562529bd1500a344e488a08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:11:14 +0000
Subject: [PATCH 3989/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.21.0 to 4.25.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.21.0...selenium-4.25.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 96da350b888..3ee4054ce71 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.21.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.25.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From 51f92bd448862a5774e779efe26996cbc1e75e1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:11:33 +0000
Subject: [PATCH 3990/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.22.0 to 4.25.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.22.0...selenium-4.25.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 14fa146ed89..296e936953f 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.22.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.25.0"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 

From 7108657ee8c5946181b78e0ecacfb8674c437414 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:12:43 +0000
Subject: [PATCH 3991/4969] Bump org.seleniumhq.selenium:selenium-api in
 /smoke-test

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.22.0 to 4.25.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.22.0...selenium-4.25.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 14fa146ed89..296e936953f 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.22.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.25.0"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 

From 1135bf00ea7089a5bba046859bf80459f4c333fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:12:52 +0000
Subject: [PATCH 3992/4969] Bump com.google.guava:guava from 33.2.1-jre to
 33.3.1-jre in /smoke-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.1-jre to 33.3.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2c1f63426d6..af1f408b35e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:33.2.1-jre'
+        classpath 'com.google.guava:guava:33.3.1-jre'
         classpath 'com.github.tjni.captainhook:captain-hook:0.1.5'
     }
 }

From 2d20f73a37d8d14008c5f35a48be335f3c87655f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:14:01 +0000
Subject: [PATCH 3993/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.1-jre to 33.3.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b841865a7a8..6cf8d682d0d 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:33.2.1-jre'
+    api 'com.google.guava:guava:33.3.1-jre'
     api 'org.apache.commons:commons-lang3:3.15.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'

From 350d541982f8ef2f0922881339e39556529fc710 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:17:36 +0000
Subject: [PATCH 3994/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.26.25 to 2.28.6.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 6fef28f27c2..2994bb7d2f2 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.26.25'
+    testImplementation 'software.amazon.awssdk:s3:2.28.6'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 49b55530832c6ca40e9c74694564b8ed92f218d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:24:27 +0000
Subject: [PATCH 3995/4969] Bump io.trino:trino-jdbc from 453 to 458 in
 /modules/trino

Bumps io.trino:trino-jdbc from 453 to 458.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 8b146c07e8c..ce37aa68718 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:453'
+    testRuntimeOnly 'io.trino:trino-jdbc:458'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 5c2bba50cc163a7531d69196de731dadc9560b04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:35:46 +0000
Subject: [PATCH 3996/4969] Bump peter-evans/create-pull-request from 6.1.0 to
 7.0.5

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.1.0 to 7.0.5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/c5a7806660adbe173f04e3e038b0ccdcd758773c...5e914681df9dc83aa4e4905692ca88beb2f9e91f)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 6cc431d3a52..b6501902995 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v3.10.1
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 7f3faa0e92d..7623b3dff69 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v3.10.1
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v3.10.1
         with:
           title: Update testcontainers version to ${GITHUB_REF##*/}
           body: |

From 3905646f9b0b1b668f330099f8fb9baedc2b2256 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:35:53 +0000
Subject: [PATCH 3997/4969] Bump com.databend:databend-jdbc from 0.2.9 to 0.3.2
 in /modules/databend

Bumps [com.databend:databend-jdbc](https://github.com/databendcloud/databend-jdbc) from 0.2.9 to 0.3.2.
- [Release notes](https://github.com/databendcloud/databend-jdbc/releases)
- [Commits](https://github.com/databendcloud/databend-jdbc/commits/v0.3.2)

---
updated-dependencies:
- dependency-name: com.databend:databend-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 81cc9ef2cbe..d3daa5575a2 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.databend:databend-jdbc:0.2.9'
+    testRuntimeOnly 'com.databend:databend-jdbc:0.3.2'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From dd730f2c881757406be9ad8decee1ee4e88330cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:39:09 +0000
Subject: [PATCH 3998/4969] Bump com.google.guava:guava from 33.2.1-jre to
 33.3.1-jre in /core

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.1-jre to 33.3.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 7ab2408fe05..60249e8d3dd 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -99,7 +99,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded 'com.google.guava:guava:33.2.1-jre'
+    shaded 'com.google.guava:guava:33.3.1-jre'
     shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

From 47f5b0183d32b727ba476cf89420b488709cbc2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:46:59 +0000
Subject: [PATCH 3999/4969] Bump io.milvus:milvus-sdk-java from 2.4.2 to 2.4.4
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.4.2 to 2.4.4.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.4.2...v2.4.4)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 2f4c25b055a..45e7df4e927 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation('io.milvus:milvus-sdk-java:2.4.2') {
+    testImplementation('io.milvus:milvus-sdk-java:2.4.4') {
         exclude(group: 'org.testcontainers', module: 'milvus')
         exclude(group: 'org.testcontainers', module: 'junit-jupiter')
     }

From 241990701133350463a2fa8366f5dbe0d68576de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:49:53 +0000
Subject: [PATCH 4000/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.2.2
 in /modules/kafka

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.2.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.2.2)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 176fe253375..5f0658a51d0 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.awaitility:awaitility:4.2.2'
 }

From 9648210046f8b47074bfbb7f8a62eeec10dc8f2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:50:29 +0000
Subject: [PATCH 4001/4969] Bump commons-io:commons-io from 2.16.1 to 2.17.0 in
 /modules/hivemq

Bumps commons-io:commons-io from 2.16.1 to 2.17.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b19333fa14f..44882a3e96a 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.1.0")
 
     shaded("org.apache.commons:commons-lang3:3.15.0")
-    shaded("commons-io:commons-io:2.16.1")
+    shaded("commons-io:commons-io:2.17.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From 231c8b52a0f447130d7a8baeff0e48c7d0bd1ee3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:00:36 +0000
Subject: [PATCH 4002/4969] Bump io.weaviate:client from 4.8.2 to 4.8.3 in
 /modules/weaviate

Bumps [io.weaviate:client](https://github.com/weaviate/java-client) from 4.8.2 to 4.8.3.
- [Release notes](https://github.com/weaviate/java-client/releases)
- [Commits](https://github.com/weaviate/java-client/compare/4.8.2...4.8.3)

---
updated-dependencies:
- dependency-name: io.weaviate:client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index f110cdcb17f..1281fa120d0 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'io.weaviate:client:4.8.2'
+    testImplementation 'io.weaviate:client:4.8.3'
 }

From b8a710a61eb469f1a4b9580c844893a4560edccc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:50:53 +0000
Subject: [PATCH 4003/4969] Bump redis.clients:jedis from 5.1.3 to 5.1.5 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.3 to 5.1.5.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.3...v5.1.5)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 36e6aaed65e..10368b59f1f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:5.1.3'
+    testImplementation 'redis.clients:jedis:5.1.5'
     testImplementation 'com.rabbitmq:amqp-client:5.22.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From 3790b89541b7c959d717e6a8b48ef88d5295e45a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:50:59 +0000
Subject: [PATCH 4004/4969] Bump org.apache.commons:commons-lang3 in
 /modules/jdbc-test

Bumps org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6cf8d682d0d..a4c42db38ce 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
 
     api 'com.google.guava:guava:33.3.1-jre'
-    api 'org.apache.commons:commons-lang3:3.15.0'
+    api 'org.apache.commons:commons-lang3:3.17.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 

From 667cefda14edc97a4368ee68928dd228b4bfbc16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:51:02 +0000
Subject: [PATCH 4005/4969] Bump org.apache.commons:commons-lang3 in
 /modules/hivemq

Bumps org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index f043ea20fdc..1c748a8d2e3 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:24.1.0")
 
-    shaded("org.apache.commons:commons-lang3:3.15.0")
+    shaded("org.apache.commons:commons-lang3:3.17.0")
     shaded("commons-io:commons-io:2.17.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")

From 61b8ff73bb313aa23c6a7d55165b7ee0a0bac719 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:51:08 +0000
Subject: [PATCH 4006/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.14.3 to 8.15.1.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.14.3...v8.15.1)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 65c3b08ef0b..79faefdde24 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.14.3"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.15.1"
     testImplementation "org.elasticsearch.client:transport:7.17.24"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }

From 04206d9dff440e875906f01151f09ad04da3c68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Sep 2024 15:31:08 -0600
Subject: [PATCH 4007/4969] Remove exclusions from milvus-sdk-java dependency

---
 modules/milvus/build.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 45e7df4e927..a15d24bbbe5 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,8 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation('io.milvus:milvus-sdk-java:2.4.4') {
-        exclude(group: 'org.testcontainers', module: 'milvus')
-        exclude(group: 'org.testcontainers', module: 'junit-jupiter')
-    }
+    testImplementation 'io.milvus:milvus-sdk-java:2.4.4'
 }

From 8921a5a8645fa63e824eef027465b9fd8166d5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Sep 2024 17:06:59 -0500
Subject: [PATCH 4008/4969] Add MongoDB Atlas implementation (#9290)

Co-authored-by: Luke Thompson <endeavour9@gmail.com>
---
 docs/modules/databases/mongodb.md             |  42 ++++-
 .../mongodb/MongoDBAtlasLocalContainer.java   |  38 ++++
 .../mongodb/AtlasLocalDataAccess.java         | 177 ++++++++++++++++++
 .../MongoDBAtlasLocalContainerTest.java       |  79 ++++++++
 .../src/test/resources/atlas-local-index.json |  18 ++
 5 files changed, 352 insertions(+), 2 deletions(-)
 create mode 100644 modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java
 create mode 100644 modules/mongodb/src/test/java/org/testcontainers/mongodb/AtlasLocalDataAccess.java
 create mode 100644 modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
 create mode 100644 modules/mongodb/src/test/resources/atlas-local-index.json

diff --git a/docs/modules/databases/mongodb.md b/docs/modules/databases/mongodb.md
index 9e81e28c39f..441025a8d92 100644
--- a/docs/modules/databases/mongodb.md
+++ b/docs/modules/databases/mongodb.md
@@ -3,7 +3,14 @@
 !!! note
     This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
 
-## Usage example
+The MongoDB module provides two Testcontainers for MongoDB unit testing:
+
+* [MongoDBContainer](#mongodbcontainer) - the core MongoDB database
+* [MongoDBAtlasLocalContainer](#mongodbatlaslocalcontainer) - the core MongoDB database combined with MongoDB Atlas Search + Atlas Vector Search
+
+## MongoDBContainer
+
+### Usage example
 
 The following example shows how to create a MongoDBContainer:
 
@@ -36,6 +43,37 @@ For instance, to initialize a single node replica set on fixed ports via Docker,
 As we can see, there is a lot of operations to execute and we even haven't touched a non-fixed port approach.
 That's where the MongoDBContainer might come in handy. 
 
+## MongoDBAtlasLocalContainer
+
+### Usage example
+
+The following example shows how to create a MongoDBAtlasLocalContainer:
+
+<!--codeinclude-->
+[Creating a MongoDB Atlas Local Container](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java) inside_block:creatingAtlasLocalContainer
+<!--/codeinclude-->
+
+And how to start it:
+
+<!--codeinclude-->
+[Start the Container](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java) inside_block:startingAtlasLocalContainer
+<!--/codeinclude-->
+
+The connection string provided by the MongoDBAtlasLocalContainer's getConnectionString() method includes the dynamically allocated port:
+
+<!--codeinclude-->
+[Get the Connection String](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java) inside_block:getConnectionStringAtlasLocalContainer
+<!--/codeinclude-->
+
+e.g. `mongodb://localhost:12345/?directConnection=true`
+
+### References
+MongoDB Atlas Local combines the MongoDB database engine with MongoT, a sidecar process for advanced searching capabilities built by MongoDB and powered by [Apache Lucene](https://lucene.apache.org/). 
+
+The container (mongodb/mongodb-atlas-local) documentation can be found [here](https://www.mongodb.com/docs/atlas/cli/current/atlas-cli-deploy-docker/).
+
+General information about Atlas Search can be found [here](https://www.mongodb.com/docs/atlas/atlas-search/).
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
@@ -55,7 +93,7 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
     ```
 
 !!! hint
-Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency
     
 #### Copyright
 Copyright (c) 2019 Konstantin Silaev <silaev256@gmail.com>
diff --git a/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java b/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java
new file mode 100644
index 00000000000..52067c01ff2
--- /dev/null
+++ b/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java
@@ -0,0 +1,38 @@
+package org.testcontainers.mongodb;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for MongoDB Atlas.
+ * <p>
+ * Supported images: {@code mongodb/mongodb-atlas-local}
+ * <p>
+ * Exposed ports: 27017
+ */
+public class MongoDBAtlasLocalContainer extends GenericContainer<MongoDBAtlasLocalContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mongodb/mongodb-atlas-local");
+
+    private static final int MONGODB_INTERNAL_PORT = 27017;
+
+    public MongoDBAtlasLocalContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MongoDBAtlasLocalContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(MONGODB_INTERNAL_PORT);
+        waitingFor(Wait.forSuccessfulCommand("runner healthcheck"));
+    }
+
+    /**
+     * Get the connection string to MongoDB.
+     */
+    public String getConnectionString() {
+        return String.format("mongodb://%s:%d/?directConnection=true", getHost(), getMappedPort(MONGODB_INTERNAL_PORT));
+    }
+}
diff --git a/modules/mongodb/src/test/java/org/testcontainers/mongodb/AtlasLocalDataAccess.java b/modules/mongodb/src/test/java/org/testcontainers/mongodb/AtlasLocalDataAccess.java
new file mode 100644
index 00000000000..c3e6aff41f9
--- /dev/null
+++ b/modules/mongodb/src/test/java/org/testcontainers/mongodb/AtlasLocalDataAccess.java
@@ -0,0 +1,177 @@
+package org.testcontainers.mongodb;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.ListSearchIndexesIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.search.SearchOperator;
+import com.mongodb.client.model.search.SearchOptions;
+import com.mongodb.client.model.search.SearchPath;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistries;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+import org.bson.conversions.Bson;
+import org.bson.json.JsonWriterSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+
+public class AtlasLocalDataAccess implements AutoCloseable {
+
+    private static final Logger log = LoggerFactory.getLogger(AtlasLocalDataAccess.class);
+
+    private final MongoClient mongoClient;
+
+    private final MongoDatabase testDB;
+
+    private final MongoCollection<TestData> testCollection;
+
+    private final String collectionName;
+
+    public AtlasLocalDataAccess(String connectionString, String databaseName, String collectionName) {
+        this.collectionName = collectionName;
+        log.info("DataAccess connecting to {}", connectionString);
+
+        CodecRegistry pojoCodecRegistry = CodecRegistries.fromProviders(
+            PojoCodecProvider.builder().automatic(true).build()
+        );
+        CodecRegistry codecRegistry = CodecRegistries.fromRegistries(
+            MongoClientSettings.getDefaultCodecRegistry(),
+            pojoCodecRegistry
+        );
+        MongoClientSettings clientSettings = MongoClientSettings
+            .builder()
+            .applyConnectionString(new ConnectionString(connectionString))
+            .codecRegistry(codecRegistry)
+            .build();
+        mongoClient = MongoClients.create(clientSettings);
+        testDB = mongoClient.getDatabase(databaseName);
+        testCollection = testDB.getCollection(collectionName, TestData.class);
+    }
+
+    @Override
+    public void close() {
+        mongoClient.close();
+    }
+
+    public void initAtlasSearchIndex() throws URISyntaxException, IOException, InterruptedException {
+        //Create the collection (if it doesn't exist). Required because unlike other database operations, createSearchIndex will fail if the collection doesn't exist yet
+        testDB.createCollection(collectionName);
+
+        //Read the atlas search index JSON from a resource file
+        String atlasSearchIndexJson = new String(
+            Files.readAllBytes(Paths.get(getClass().getResource("/atlas-local-index.json").toURI())),
+            StandardCharsets.UTF_8
+        );
+        log.info(
+            "Creating Atlas Search index AtlasSearchIndex on collection {}:\n{}",
+            collectionName,
+            atlasSearchIndexJson
+        );
+        testCollection.createSearchIndex("AtlasSearchIndex", BsonDocument.parse(atlasSearchIndexJson));
+
+        //wait for the atlas search index to be ready
+        Instant start = Instant.now();
+        await()
+            .atMost(5, TimeUnit.SECONDS)
+            .pollInterval(10, TimeUnit.MILLISECONDS)
+            .pollInSameThread()
+            .until(this::getIndexStatus, "READY"::equalsIgnoreCase);
+
+        log.info(
+            "Atlas Search index AtlasSearchIndex on collection {} is ready (took {} milliseconds) to create.",
+            collectionName,
+            start.until(Instant.now(), ChronoUnit.MILLIS)
+        );
+    }
+
+    private String getIndexStatus() {
+        ListSearchIndexesIterable<Document> searchIndexes = testCollection.listSearchIndexes();
+        for (Document searchIndex : searchIndexes) {
+            if (searchIndex.get("name").equals("AtlasSearchIndex")) {
+                return searchIndex.getString("status");
+            }
+        }
+        return null;
+    }
+
+    public void insertData(TestData data) {
+        log.info("Inserting document {}", data);
+        testCollection.insertOne(data);
+    }
+
+    public TestData findAtlasSearch(String test) {
+        Bson searchClause = Aggregates.search(
+            SearchOperator.of(SearchOperator.text(SearchPath.fieldPath("test"), test).fuzzy()),
+            SearchOptions.searchOptions().index("AtlasSearchIndex")
+        );
+        log.trace(
+            "Searching for document using Atlas Search:\n{}",
+            searchClause.toBsonDocument().toJson(JsonWriterSettings.builder().indent(true).build())
+        );
+        return testCollection.aggregate(Collections.singletonList(searchClause)).first();
+    }
+
+    public static class TestData {
+
+        String test;
+
+        int test2;
+
+        boolean test3;
+
+        public TestData() {}
+
+        public TestData(String test, int test2, boolean test3) {
+            this.test = test;
+            this.test2 = test2;
+            this.test3 = test3;
+        }
+
+        public String getTest() {
+            return test;
+        }
+
+        public void setTest(String test) {
+            this.test = test;
+        }
+
+        public int getTest2() {
+            return test2;
+        }
+
+        public void setTest2(int test2) {
+            this.test2 = test2;
+        }
+
+        public boolean isTest3() {
+            return test3;
+        }
+
+        public void setTest3(boolean test3) {
+            this.test3 = test3;
+        }
+
+        @Override
+        public String toString() {
+            return "TestData{" + "test='" + test + '\'' + ", test2=" + test2 + ", test3=" + test3 + '}';
+        }
+    }
+}
diff --git a/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
new file mode 100644
index 00000000000..2d7664d51fa
--- /dev/null
+++ b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
@@ -0,0 +1,79 @@
+package org.testcontainers.mongodb;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class MongoDBAtlasLocalContainerTest {
+
+    private static final Logger log = LoggerFactory.getLogger(MongoDBAtlasLocalContainerTest.class);
+
+    @Test
+    public void getConnectionString() {
+        try (
+            MongoDBAtlasLocalContainer container = new MongoDBAtlasLocalContainer("mongodb/mongodb-atlas-local:7.0.9")
+        ) {
+            container.start();
+            String connectionString = container.getConnectionString();
+            assertThat(connectionString).isNotNull();
+            assertThat(connectionString).startsWith("mongodb://");
+            assertThat(connectionString)
+                .isEqualTo(
+                    String.format(
+                        "mongodb://%s:%d/?directConnection=true",
+                        container.getHost(),
+                        container.getFirstMappedPort()
+                    )
+                );
+        }
+    }
+
+    @Test
+    public void createAtlasIndexAndSearchIt() throws Exception {
+        try (
+            // creatingAtlasLocalContainer {
+            MongoDBAtlasLocalContainer atlasLocalContainer = new MongoDBAtlasLocalContainer(
+                "mongodb/mongodb-atlas-local:7.0.9"
+            );
+            // }
+        ) {
+            // startingAtlasLocalContainer {
+            atlasLocalContainer.start();
+            // }
+
+            // getConnectionStringAtlasLocalContainer {
+            String connectionString = atlasLocalContainer.getConnectionString();
+            // }
+
+            try (
+                AtlasLocalDataAccess atlasLocalDataAccess = new AtlasLocalDataAccess(connectionString, "test", "test")
+            ) {
+                atlasLocalDataAccess.initAtlasSearchIndex();
+
+                atlasLocalDataAccess.insertData(new AtlasLocalDataAccess.TestData("tests", 123, true));
+
+                Instant start = Instant.now();
+                log.info(
+                    "Waiting for Atlas Search to index the data by polling atlas search query (Atlas Search is eventually consistent)"
+                );
+                await()
+                    .atMost(5, TimeUnit.SECONDS)
+                    .pollInterval(10, TimeUnit.MILLISECONDS)
+                    .pollInSameThread()
+                    .until(() -> atlasLocalDataAccess.findAtlasSearch("test"), Objects::nonNull);
+                log.info(
+                    "Atlas Search indexed the new data and was searchable after {}ms.",
+                    start.until(Instant.now(), ChronoUnit.MILLIS)
+                );
+            }
+        }
+    }
+}
diff --git a/modules/mongodb/src/test/resources/atlas-local-index.json b/modules/mongodb/src/test/resources/atlas-local-index.json
new file mode 100644
index 00000000000..1bca016025f
--- /dev/null
+++ b/modules/mongodb/src/test/resources/atlas-local-index.json
@@ -0,0 +1,18 @@
+{
+    "mappings": {
+        "dynamic": false,
+        "fields": {
+            "test": {
+                "type": "string"
+            },
+            "test2": {
+                "type": "number",
+                "representation": "int64",
+                "indexDoubles": false
+            },
+            "test3": {
+                "type": "boolean"
+            }
+        }
+    }
+}

From 8b363914284f5c1267b112e4fe90ae9283fa75ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 30 Sep 2024 16:07:51 -0600
Subject: [PATCH 4009/4969] [mongodb] Remove incubating note

---
 docs/modules/databases/mongodb.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/modules/databases/mongodb.md b/docs/modules/databases/mongodb.md
index 441025a8d92..0d410d115d5 100644
--- a/docs/modules/databases/mongodb.md
+++ b/docs/modules/databases/mongodb.md
@@ -1,8 +1,5 @@
 # MongoDB Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
-
 The MongoDB module provides two Testcontainers for MongoDB unit testing:
 
 * [MongoDBContainer](#mongodbcontainer) - the core MongoDB database

From 6550a5c19172ef22eeb12f669acaf5b4ae5c2dec Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 18:58:43 -0500
Subject: [PATCH 4010/4969] [create-pull-request] automated change (#9308)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index f3cd49bab30..3823455b0db 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -135,4 +135,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.1
+    latest_version: 1.20.2

From b1f8ada00b27e51d3f629a0beb9978e2ecd0817a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 18:58:54 -0500
Subject: [PATCH 4011/4969] [create-pull-request] automated change (#9307)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 270386ac997..01c18a4c987 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.1
+testcontainers.version=1.20.2

From 5c56011799852119d2000311147dfe279a7c5411 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 2 Oct 2024 22:14:32 -0400
Subject: [PATCH 4012/4969] Add "integration-testing" topic (#9338)

---
 .github/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index d02aee1c7da..7571d82d55f 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -13,7 +13,7 @@ repository:
   homepage: https://testcontainers.org
 
   # A comma-separated list of topics to set on the repository
-  topics: java,testing,docker,docker-compose,jvm,test-automation,junit,hacktoberfest
+  topics: java,testing,docker,docker-compose,jvm,test-automation,junit,hacktoberfest,integration-testing
 
   # Either `true` to make the repository private, or `false` to make it public.
   private: false

From 49b5a161bc9465d340cbf3e2c4803275f9b2ce3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 3 Oct 2024 13:01:22 -0500
Subject: [PATCH 4013/4969] Polish Cassandra tests (#9339)

---
 docs/modules/databases/cassandra.md           |  4 +-
 .../cassandra/CassandraContainerTest.java     | 41 ++++++++++++-------
 .../cassandra/CassandraServer4Test.java       | 35 ----------------
 .../cassandra/CassandraServer5Test.java       | 35 ----------------
 ...java => CompatibleCassandraImageTest.java} | 25 +++++++----
 .../containers/CassandraDriver3Test.java      | 37 -----------------
 .../containers/CassandraDriver4Test.java      | 35 ----------------
 ...java => CompatibleCassandraImageTest.java} | 26 +++++++++---
 8 files changed, 65 insertions(+), 173 deletions(-)
 delete mode 100644 modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java
 delete mode 100644 modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java
 rename modules/cassandra/src/test/java/org/testcontainers/cassandra/{CassandraDriver4Test.java => CompatibleCassandraImageTest.java} (61%)
 delete mode 100644 modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
 delete mode 100644 modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
 rename modules/cassandra/src/test/java/org/testcontainers/containers/{CassandraServer4Test.java => CompatibleCassandraImageTest.java} (53%)

diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index 72213dad4a7..5a062e4a059 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -6,12 +6,12 @@ This example connects to the Cassandra cluster:
 
 1. Define a container:
     <!--codeinclude-->
-    [Container definition](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:container-definition
+    [Container definition](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:container-definition
     <!--/codeinclude-->
 
 2. Build a `CqlSession`:
     <!--codeinclude-->
-    [Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:cql-session
+    [Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:cql-session
     <!--/codeinclude-->
 
 3. Define a container with custom `cassandra.yaml` located in a directory `cassandra-auth-required-configuration`:
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
index 4bf776b96c8..632966d1bb3 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.cassandra;
 
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.CqlSessionBuilder;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
 import org.junit.Test;
@@ -20,7 +19,10 @@ public class CassandraContainerTest {
 
     @Test
     public void testSimple() {
-        try (CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)) {
+        try ( // container-definition {
+            CassandraContainer cassandraContainer = new CassandraContainer("cassandra:3.11.2")
+            // }
+        ) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
@@ -115,11 +117,15 @@ public void testInitScriptWithLegacyCassandra() {
     }
 
     private void testInitScript(CassandraContainer cassandraContainer, boolean withCredentials) {
-        ResultSet resultSet = performQuery(
-            cassandraContainer,
-            "SELECT * FROM keySpaceTest.catalog_category",
-            withCredentials
-        );
+        String query = "SELECT * FROM keySpaceTest.catalog_category";
+        ResultSet resultSet;
+
+        if (withCredentials) {
+            resultSet = performQueryWithAuth(cassandraContainer, query);
+        } else {
+            resultSet = performQuery(cassandraContainer, query);
+        }
+
         assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
         Row row = resultSet.one();
         assertThat(row.getLong(0)).as("Inserted row is in expected state").isEqualTo(1);
@@ -127,18 +133,23 @@ private void testInitScript(CassandraContainer cassandraContainer, boolean withC
     }
 
     private ResultSet performQuery(CassandraContainer cassandraContainer, String cql) {
-        return performQuery(cassandraContainer, cql, false);
+        // cql-session {
+        final CqlSession cqlSession = CqlSession
+            .builder()
+            .addContactPoint(cassandraContainer.getContactPoint())
+            .withLocalDatacenter(cassandraContainer.getLocalDatacenter())
+            .build();
+        // }
+        return performQuery(cqlSession, cql);
     }
 
-    private ResultSet performQuery(CassandraContainer cassandraContainer, String cql, boolean withCredentials) {
-        final CqlSessionBuilder cqlSessionBuilder = CqlSession
+    private ResultSet performQueryWithAuth(CassandraContainer cassandraContainer, String cql) {
+        final CqlSession cqlSession = CqlSession
             .builder()
             .addContactPoint(cassandraContainer.getContactPoint())
-            .withLocalDatacenter(cassandraContainer.getLocalDatacenter());
-        if (withCredentials) {
-            cqlSessionBuilder.withAuthCredentials(cassandraContainer.getUsername(), cassandraContainer.getPassword());
-        }
-        final CqlSession cqlSession = cqlSessionBuilder.build();
+            .withLocalDatacenter(cassandraContainer.getLocalDatacenter())
+            .withAuthCredentials(cassandraContainer.getUsername(), cassandraContainer.getPassword())
+            .build();
         return performQuery(cqlSession, cql);
     }
 
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java
deleted file mode 100644
index b509a77e9e8..00000000000
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer4Test.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.testcontainers.cassandra;
-
-import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class CassandraServer4Test {
-
-    @Rule
-    public CassandraContainer cassandra = new CassandraContainer("cassandra:4.1.1");
-
-    @Test
-    public void testCassandraGetContactPoint() {
-        try (
-            CqlSession session = CqlSession
-                .builder()
-                .addContactPoint(this.cassandra.getContactPoint())
-                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
-                .build()
-        ) {
-            session.execute(
-                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
-                "{'class':'SimpleStrategy','replication_factor':'1'};"
-            );
-
-            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
-
-            assertThat(keyspace).as("test keyspace created").isNotNull();
-        }
-    }
-}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java
deleted file mode 100644
index d4e1c858382..00000000000
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraServer5Test.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.testcontainers.cassandra;
-
-import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class CassandraServer5Test {
-
-    @Rule
-    public CassandraContainer cassandra = new CassandraContainer("cassandra:5");
-
-    @Test
-    public void testCassandraGetContactPoint() {
-        try (
-            CqlSession session = CqlSession
-                .builder()
-                .addContactPoint(this.cassandra.getContactPoint())
-                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
-                .build()
-        ) {
-            session.execute(
-                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
-                "{'class':'SimpleStrategy','replication_factor':'1'};"
-            );
-
-            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
-
-            assertThat(keyspace).as("test keyspace created").isNotNull();
-        }
-    }
-}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java
similarity index 61%
rename from modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java
rename to modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java
index 5e1b682e878..868e11c881e 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java
@@ -3,29 +3,38 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CassandraDriver4Test {
+@RunWith(Parameterized.class)
+public class CompatibleCassandraImageTest {
 
-    @Rule
-    // container-definition {
-    public CassandraContainer cassandra = new CassandraContainer("cassandra:3.11.2");
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[] { "cassandra:3.11.2", "cassandra:4.1.1", "cassandra:5" };
+    }
 
-    // }
+    @Parameterized.Parameter
+    public String imageName;
 
     @Test
     public void testCassandraGetContactPoint() {
+        try (CassandraContainer cassandra = new CassandraContainer(this.imageName)) {
+            cassandra.start();
+            assertCassandraFunctionality(cassandra);
+        }
+    }
+
+    private void assertCassandraFunctionality(CassandraContainer cassandra) {
         try (
-            // cql-session {
             CqlSession session = CqlSession
                 .builder()
                 .addContactPoint(cassandra.getContactPoint())
                 .withLocalDatacenter(cassandra.getLocalDatacenter())
                 .build()
-            // }
         ) {
             session.execute(
                 "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
deleted file mode 100644
index 502f2ca8e67..00000000000
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver3Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.testcontainers.containers;
-
-import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class CassandraDriver3Test {
-
-    @Rule
-    public CassandraContainer<?> cassandra = new CassandraContainer<>("cassandra:3.11.2");
-
-    @Test
-    public void testCassandraGetContactPoint() {
-        try (
-            // cassandra {
-            CqlSession session = CqlSession
-                .builder()
-                .addContactPoint(this.cassandra.getContactPoint())
-                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
-                .build()
-            // }
-        ) {
-            session.execute(
-                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
-                "{'class':'SimpleStrategy','replication_factor':'1'};"
-            );
-
-            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
-
-            assertThat(keyspace).as("keyspace created").isNotNull();
-        }
-    }
-}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
deleted file mode 100644
index a4fb8c87b8e..00000000000
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraDriver4Test.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.testcontainers.containers;
-
-import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class CassandraDriver4Test {
-
-    @Rule
-    public CassandraContainer<?> cassandra = new CassandraContainer<>("cassandra:3.11.2");
-
-    @Test
-    public void testCassandraGetContactPoint() {
-        try (
-            CqlSession session = CqlSession
-                .builder()
-                .addContactPoint(this.cassandra.getContactPoint())
-                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
-                .build()
-        ) {
-            session.execute(
-                "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +
-                "{'class':'SimpleStrategy','replication_factor':'1'};"
-            );
-
-            KeyspaceMetadata keyspace = session.getMetadata().getKeyspaces().get(CqlIdentifier.fromCql("test"));
-
-            assertThat(keyspace).as("test keyspace created").isNotNull();
-        }
-    }
-}
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java
similarity index 53%
rename from modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java
rename to modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java
index 1a8447e7036..dc5e830f79a 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java
@@ -3,23 +3,37 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CassandraServer4Test {
+@RunWith(Parameterized.class)
+public class CompatibleCassandraImageTest {
 
-    @Rule
-    public CassandraContainer<?> cassandra = new CassandraContainer<>("cassandra:4.1.1");
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[] { "cassandra:3.11.2", "cassandra:4.1.1" };
+    }
+
+    @Parameterized.Parameter
+    public String imageName;
 
     @Test
     public void testCassandraGetContactPoint() {
+        try (CassandraContainer<?> cassandra = new CassandraContainer<>(this.imageName)) {
+            cassandra.start();
+            assertCassandraFunctionality(cassandra);
+        }
+    }
+
+    private void assertCassandraFunctionality(CassandraContainer<?> cassandra) {
         try (
             CqlSession session = CqlSession
                 .builder()
-                .addContactPoint(this.cassandra.getContactPoint())
-                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
+                .addContactPoint(cassandra.getContactPoint())
+                .withLocalDatacenter(cassandra.getLocalDatacenter())
                 .build()
         ) {
             session.execute(

From 35cf6d323ae87482f5ef40b87b7bd0709c934318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 3 Oct 2024 13:35:25 -0500
Subject: [PATCH 4014/4969] Polish Kafka examples (#9340)

---
 examples/kafka-cluster/build.gradle           |  1 +
 .../kafkacluster/KafkaContainerCluster.java   | 18 +++++++++---------
 .../KafkaContainerClusterTest.java            | 19 ++++++-------------
 .../KafkaContainerKraftCluster.java           | 18 +++++++++---------
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 54ae4eee8ff..623fcd66175 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -15,6 +15,7 @@ dependencies {
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.awaitility:awaitility:4.2.2'
 }
 
 test {
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
index 9ab3f25e0ff..403d087af3e 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
@@ -1,7 +1,7 @@
 package com.example.kafkacluster;
 
 import lombok.SneakyThrows;
-import org.rnorth.ducttape.unreliables.Unreliables;
+import org.awaitility.Awaitility;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.KafkaContainer;
@@ -11,11 +11,12 @@
 
 import java.time.Duration;
 import java.util.Collection;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Provides an easy way to launch a Kafka cluster with multiple brokers.
  */
@@ -87,10 +88,10 @@ public void start() {
         // sequential start to avoid resource contention on CI systems with weaker hardware
         brokers.forEach(GenericContainer::start);
 
-        Unreliables.retryUntilTrue(
-            30,
-            TimeUnit.SECONDS,
-            () -> {
+        Awaitility
+            .await()
+            .atMost(Duration.ofSeconds(30))
+            .untilAsserted(() -> {
                 Container.ExecResult result =
                     this.zookeeper.execInContainer(
                             "sh",
@@ -101,9 +102,8 @@ public void start() {
                         );
                 String brokers = result.getStdout();
 
-                return brokers != null && brokers.split(",").length == this.brokersNum;
-            }
-        );
+                assertThat(brokers.split(",")).hasSize(this.brokersNum);
+            });
     }
 
     @Override
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
index 51221b5d56f..6a66cf0ca2e 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
@@ -13,8 +13,8 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Test;
-import org.rnorth.ducttape.unreliables.Unreliables;
 
 import java.time.Duration;
 import java.util.Collection;
@@ -100,24 +100,17 @@ protected void testKafkaFunctionality(String bootstrapServers, int partitions, i
 
             producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
 
-            Unreliables.retryUntilTrue(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
+            Awaitility
+                .await()
+                .atMost(Duration.ofSeconds(10))
+                .untilAsserted(() -> {
                     ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
 
-                    if (records.isEmpty()) {
-                        return false;
-                    }
-
                     assertThat(records)
                         .hasSize(1)
                         .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
                         .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
-
-                    return true;
-                }
-            );
+                });
 
             consumer.unsubscribe();
         }
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
index 4411cb14540..f42e3c5b1ba 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
@@ -1,7 +1,7 @@
 package com.example.kafkacluster;
 
 import org.apache.kafka.common.Uuid;
-import org.rnorth.ducttape.unreliables.Unreliables;
+import org.awaitility.Awaitility;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.KafkaContainer;
@@ -11,10 +11,11 @@
 
 import java.time.Duration;
 import java.util.Collection;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class KafkaContainerKraftCluster implements Startable {
 
     private final int brokersNum;
@@ -79,10 +80,10 @@ public void start() {
         // Needs to start all the brokers at once
         brokers.parallelStream().forEach(GenericContainer::start);
 
-        Unreliables.retryUntilTrue(
-            30,
-            TimeUnit.SECONDS,
-            () -> {
+        Awaitility
+            .await()
+            .atMost(Duration.ofSeconds(30))
+            .untilAsserted(() -> {
                 Container.ExecResult result =
                     this.brokers.stream()
                         .findFirst()
@@ -94,9 +95,8 @@ public void start() {
                         );
                 String brokers = result.getStdout().replace("\n", "");
 
-                return brokers != null && Integer.valueOf(brokers) == this.brokersNum;
-            }
-        );
+                assertThat(brokers).asInt().isEqualTo(this.brokersNum);
+            });
     }
 
     @Override

From dee4cbe83a63034a597db8bce2417d2c4d6b6cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 3 Oct 2024 19:15:35 -0500
Subject: [PATCH 4015/4969] Use Awaitility in FixedHostPortContainerTest
 (#9341)

---
 .../junit/FixedHostPortContainerTest.java     | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index 72fc4b70519..a123b800f3a 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -1,8 +1,7 @@
 package org.testcontainers.junit;
 
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.awaitility.Awaitility;
 import org.junit.Test;
-import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.GenericContainer;
@@ -11,7 +10,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Socket;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -71,7 +70,7 @@ public void testFixedHostPortMapping() throws IOException {
                 .as("Port mapping does not seem to match given fixed port")
                 .isEqualTo(unusedHostPort);
 
-            final String content = this.readResponse(echoServer, unusedHostPort);
+            final String content = readResponse(echoServer, unusedHostPort);
             assertThat(content).as("Returned echo from fixed port does not match expected").isEqualTo(TEST_RESPONSE);
         }
     }
@@ -86,15 +85,11 @@ public void testFixedHostPortMapping() throws IOException {
      */
     private String readResponse(GenericContainer container, Integer port) throws IOException {
         try (
-            final BufferedReader reader = Unreliables.retryUntilSuccess(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
-                    final Socket socket = new Socket(container.getHost(), port);
-                    return new BufferedReader(new InputStreamReader(socket.getInputStream()));
-                }
-            )
+            Socket socket = Awaitility
+                .await()
+                .pollDelay(Duration.ofSeconds(1))
+                .until(() -> new Socket(container.getHost(), port), Socket::isConnected);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()))
         ) {
             return reader.readLine();
         }

From b2aa06279f14c59b9dc1dafc979c5017cf8c7c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 4 Oct 2024 15:30:49 -0500
Subject: [PATCH 4016/4969] Check docker compose version (#9342)

---
 .../containers/DockerComposeProfilesOptionTest.java            | 3 +++
 .../junit/DockerComposeContainerWithOptionsTest.java           | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
index 0f7e41a8454..72f80cc877e 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
@@ -31,6 +31,9 @@ public void setUp() {
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
                 .isTrue();
+            Assumptions
+                .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
+                .doesNotStartWith("Docker Compose version v2");
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
index 0de25fa2946..ae5dbc1d0b4 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
@@ -83,6 +83,9 @@ public void setUp() {
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
                 .isTrue();
+            Assumptions
+                .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
+                .doesNotStartWith("Docker Compose version v2");
         }
     }
 

From 49b13d8400e73abcb225f98f641db5c4123d2038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 4 Oct 2024 19:21:45 -0500
Subject: [PATCH 4017/4969] Support reset value in Docker Compose (#9343)

Fixes #7919
---
 .../containers/ParsedDockerComposeFile.java   | 20 +++++----
 .../junit/ComposeContainerOverrideTest.java   | 41 +++++++++++++++++++
 .../compose-override/compose-override.yml     |  7 ++++
 .../resources/compose-override/compose.yml    |  7 ++++
 4 files changed, 68 insertions(+), 7 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
 create mode 100644 core/src/test/resources/compose-override/compose-override.yml
 create mode 100644 core/src/test/resources/compose-override/compose.yml

diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index 23831d3f026..b5b11686491 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -11,6 +11,8 @@
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Representer;
 import org.yaml.snakeyaml.resolver.Resolver;
 
@@ -44,13 +46,17 @@ class ParsedDockerComposeFile {
         LoaderOptions options = new LoaderOptions();
         options.setMaxAliasesForCollections(1_000);
         DumperOptions dumperOptions = new DumperOptions();
-        Yaml yaml = new Yaml(
-            new SafeConstructor(options),
-            new Representer(dumperOptions),
-            dumperOptions,
-            options,
-            new Resolver()
-        );
+
+        SafeConstructor constructor = new SafeConstructor(options) {
+            @Override
+            protected Object constructObject(Node node) {
+                if (node.getTag().equals(new Tag("!reset"))) {
+                    return null;
+                }
+                return super.constructObject(node);
+            }
+        };
+        Yaml yaml = new Yaml(constructor, new Representer(dumperOptions), dumperOptions, options, new Resolver());
         try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) {
             composeFileContent = yaml.load(fileInputStream);
         } catch (Exception e) {
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
new file mode 100644
index 00000000000..453fe9207ad
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
@@ -0,0 +1,41 @@
+package org.testcontainers.junit;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.ContainerState;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ComposeContainerOverrideTest {
+
+    private static final File BASE = new File("src/test/resources/compose-override/compose.yml");
+
+    private static final File OVERRIDE = new File("src/test/resources/compose-override/compose-override.yml");
+
+    @Test
+    public void readEnvironment() {
+        try (ComposeContainer compose = new ComposeContainer(BASE).withExposedService("redis", 6379)) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getEnv()).contains("foo=bar");
+        }
+    }
+
+    @Test
+    public void resetEnvironment() {
+        try (ComposeContainer compose = new ComposeContainer(BASE, OVERRIDE).withExposedService("redis", 6379)) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getEnv()).doesNotContain("foo=bar");
+        }
+    }
+}
diff --git a/core/src/test/resources/compose-override/compose-override.yml b/core/src/test/resources/compose-override/compose-override.yml
new file mode 100644
index 00000000000..f5f457a6236
--- /dev/null
+++ b/core/src/test/resources/compose-override/compose-override.yml
@@ -0,0 +1,7 @@
+services:
+  redis:
+    image: redis:6-alpine
+    ports:
+      - 6379
+    environment:
+      foo: !reset null
diff --git a/core/src/test/resources/compose-override/compose.yml b/core/src/test/resources/compose-override/compose.yml
new file mode 100644
index 00000000000..a304ae82273
--- /dev/null
+++ b/core/src/test/resources/compose-override/compose.yml
@@ -0,0 +1,7 @@
+services:
+  redis:
+    image: redis:6-alpine
+    ports:
+      - 6379
+    environment:
+      foo: bar

From 94e4c8532a6f87e9b978f6c256681c41508ca2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 9 Oct 2024 21:09:03 -0500
Subject: [PATCH 4018/4969] Clear docker compose initialization (#9370)

Currently, an instance of `DockerComposeContainer` and `ComposeContainer`
keep information from previous initialization which causes issues when
running the instance more than once.

Fixes #7443

---------

Co-authored-by: jenodekeyzer <jenodekeyzer@gmail.com>
---
 .../containers/ComposeCommand.java            |  8 ++---
 .../containers/ComposeContainer.java          |  1 +
 .../containers/ComposeDelegate.java           |  7 +++++
 .../containers/DockerComposeContainer.java    |  1 +
 .../ComposeContainerWithServicesTest.java     | 30 +++++++++++++++++++
 ...ockerComposeContainerWithServicesTest.java | 30 +++++++++++++++++++
 .../resources/docker-compose-healthcheck.yml  |  6 ++++
 7 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 core/src/test/resources/docker-compose-healthcheck.yml

diff --git a/core/src/main/java/org/testcontainers/containers/ComposeCommand.java b/core/src/main/java/org/testcontainers/containers/ComposeCommand.java
index d85f093578e..f603761e3ce 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeCommand.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeCommand.java
@@ -1,14 +1,12 @@
 package org.testcontainers.containers;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Set;
 
 class ComposeCommand {
 
     static String getDownCommand(ComposeDelegate.ComposeVersion composeVersion, Set<String> options) {
         String composeOptions = optionsAsString(options);
-        if (composeOptions == null || composeOptions.equals("")) {
+        if (composeOptions.isEmpty()) {
             return composeVersion == ComposeDelegate.ComposeVersion.V1 ? "down" : "compose down";
         }
         String cmd = composeVersion == ComposeDelegate.ComposeVersion.V1 ? "%s down" : "compose %s down";
@@ -17,7 +15,7 @@ static String getDownCommand(ComposeDelegate.ComposeVersion composeVersion, Set<
 
     static String getUpCommand(ComposeDelegate.ComposeVersion composeVersion, Set<String> options) {
         String composeOptions = optionsAsString(options);
-        if (composeOptions == null || composeOptions.equals("")) {
+        if (composeOptions.isEmpty()) {
             return composeVersion == ComposeDelegate.ComposeVersion.V1 ? "up -d" : "compose up -d";
         }
         String cmd = composeVersion == ComposeDelegate.ComposeVersion.V1 ? "%s up -d" : "compose %s up -d";
@@ -31,7 +29,7 @@ private static String optionsAsString(final Set<String> options) {
             return optionsString;
         } else {
             // otherwise two spaces would appear between 'docker-compose' and 'up'
-            return StringUtils.EMPTY;
+            return "";
         }
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
index 0a804cfddb2..79d706d3b6a 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
@@ -171,6 +171,7 @@ public void stop() {
                 }
                 this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env, this.filesInDirectory);
             } finally {
+                this.composeDelegate.clear();
                 this.project = this.composeDelegate.randomProjectId();
             }
         }
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
index 4dc396a6922..3365a0b0681 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
@@ -386,6 +386,13 @@ String getServiceHost() {
         return this.ambassadorContainer.getHost();
     }
 
+    void clear() {
+        this.logConsumers.clear();
+        this.ambassadorPortMappings.clear();
+        this.serviceInstanceMap.clear();
+        this.waitStrategyMap.clear();
+    }
+
     enum ComposeVersion {
         V1("_"),
 
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index cf78cfa4be2..92dc75b6cde 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -177,6 +177,7 @@ public void stop() {
                 }
                 this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env, this.filesInDirectory);
             } finally {
+                this.composeDelegate.clear();
                 this.project = this.composeDelegate.randomProjectId();
             }
         }
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
index 8524f804444..9a73c83981b 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
@@ -23,6 +23,10 @@ public class ComposeContainerWithServicesTest {
         "src/test/resources/compose-with-inline-scale-test.yml"
     );
 
+    public static final File COMPOSE_FILE_WITH_HEALTHCHECK = new File(
+        "src/test/resources/docker-compose-healthcheck.yml"
+    );
+
     @Test
     public void testDesiredSubsetOfServicesAreStarted() {
         try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withServices("redis")) {
@@ -108,6 +112,32 @@ public void testStartupTimeoutSetsTheHighestTimeout() {
             .isInstanceOf(TimeoutException.class);
     }
 
+    @Test
+    public void testWaitingForHealthcheck() {
+        try (
+            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1");
+        }
+    }
+
+    @Test
+    public void testWaitingForHealthcheckWithRestartDoesNotCrash() {
+        try (
+            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
+        ) {
+            compose.start();
+            compose.stop();
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1");
+        }
+    }
+
     private void verifyStartedContainers(final ComposeContainer compose, final String... names) {
         final List<String> containerNames = compose
             .listChildContainers()
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
index 029e8447a81..f92c4727921 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -23,6 +23,10 @@ public class DockerComposeContainerWithServicesTest {
         "src/test/resources/compose-with-inline-scale-test.yml"
     );
 
+    public static final File COMPOSE_FILE_WITH_HEALTHCHECK = new File(
+        "src/test/resources/docker-compose-healthcheck.yml"
+    );
+
     @Test
     public void testDesiredSubsetOfServicesAreStarted() {
         try (
@@ -113,6 +117,32 @@ public void testStartupTimeoutSetsTheHighestTimeout() {
             .isInstanceOf(TimeoutException.class);
     }
 
+    @Test
+    public void testWaitingForHealthcheck() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1");
+        }
+    }
+
+    @Test
+    public void testWaitingForHealthcheckWithRestartDoesNotCrash() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
+        ) {
+            compose.start();
+            compose.stop();
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1");
+        }
+    }
+
     private void verifyStartedContainers(final DockerComposeContainer<?> compose, final String... names) {
         final List<String> containerNames = compose
             .listChildContainers()
diff --git a/core/src/test/resources/docker-compose-healthcheck.yml b/core/src/test/resources/docker-compose-healthcheck.yml
new file mode 100644
index 00000000000..f4d6ed65386
--- /dev/null
+++ b/core/src/test/resources/docker-compose-healthcheck.yml
@@ -0,0 +1,6 @@
+version: "3.9"
+services:
+  redis:
+    image: redis:alpine
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]

From bcca9f37c1d5c07d77e2b4e1d94c67b78b254449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 14 Oct 2024 23:17:12 -0500
Subject: [PATCH 4019/4969] Add ComposeContainer test to junit-jupiter module
 (#9407)

---
 .../junit/jupiter/ComposeContainerTests.java  | 22 ++++--------
 .../jupiter/DockerComposeContainerTests.java  | 35 +++++++++++++++++++
 2 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java

diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
index 866b76df301..a60b24a23d2 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java
@@ -4,9 +4,8 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.io.File;
@@ -17,25 +16,16 @@
 class ComposeContainerTests {
 
     @Container
-    private DockerComposeContainer composeContainer = new DockerComposeContainer(
-        new File("src/test/resources/docker-compose.yml")
-    )
-        .withExposedService("whoami_1", 80, Wait.forHttp("/"));
-
-    private String host;
-
-    private int port;
-
-    @BeforeEach
-    void setup() {
-        host = composeContainer.getServiceHost("whoami_1", 80);
-        port = composeContainer.getServicePort("whoami_1", 80);
-    }
+    private ComposeContainer composeContainer = new ComposeContainer(new File("src/test/resources/docker-compose.yml"))
+        .withExposedService("whoami-1", 80, Wait.forHttp("/"));
 
     @Test
     void running_compose_defined_container_is_accessible_on_configured_port() throws Exception {
         HttpClient client = HttpClientBuilder.create().build();
 
+        String host = composeContainer.getServiceHost("whoami-1", 80);
+        int port = composeContainer.getServicePort("whoami-1", 80);
+
         HttpResponse response = client.execute(new HttpGet("http://" + host + ":" + port));
 
         assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java
new file mode 100644
index 00000000000..7a43ed67a7d
--- /dev/null
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java
@@ -0,0 +1,35 @@
+package org.testcontainers.junit.jupiter;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Testcontainers
+class DockerComposeContainerTests {
+
+    @Container
+    private DockerComposeContainer composeContainer = new DockerComposeContainer(
+        new File("src/test/resources/docker-compose.yml")
+    )
+        .withExposedService("whoami_1", 80, Wait.forHttp("/"));
+
+    @Test
+    void running_compose_defined_container_is_accessible_on_configured_port() throws Exception {
+        HttpClient client = HttpClientBuilder.create().build();
+
+        String host = composeContainer.getServiceHost("whoami_1", 80);
+        int port = composeContainer.getServicePort("whoami_1", 80);
+
+        HttpResponse response = client.execute(new HttpGet("http://" + host + ":" + port));
+
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+    }
+}

From 51374723726945edbd2552db1bea6f6f4cce7787 Mon Sep 17 00:00:00 2001
From: Chris Eager <79161849+eager-signal@users.noreply.github.com>
Date: Tue, 15 Oct 2024 00:35:41 -0500
Subject: [PATCH 4020/4969] Use server URL from auth query if helper does not
 return one (#9056)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../utility/RegistryAuthLocator.java          |  9 ++--
 .../utility/RegistryAuthLocatorTest.java      | 42 +++++++++++++++++++
 ...with-helper-no-server-url-using-token.json | 11 +++++
 .../config-with-helper-no-server-url.json     | 11 +++++
 .../auth-config/docker-credential-fake        | 14 +++++++
 5 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 core/src/test/resources/auth-config/config-with-helper-no-server-url-using-token.json
 create mode 100644 core/src/test/resources/auth-config/config-with-helper-no-server-url.json

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index af2db247eb8..600a800c0df 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -318,13 +318,12 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
 
         final String username = helperResponse.at("/Username").asText();
         final String password = helperResponse.at("/Secret").asText();
+        final String serverUrl = helperResponse.at("/ServerURL").asText();
+        final AuthConfig authConfig = new AuthConfig().withRegistryAddress(serverUrl.isEmpty() ? hostName : serverUrl);
         if ("<token>".equals(username)) {
-            return new AuthConfig().withIdentityToken(password);
+            return authConfig.withIdentityToken(password);
         } else {
-            return new AuthConfig()
-                .withRegistryAddress(helperResponse.at("/ServerURL").asText())
-                .withUsername(username)
-                .withPassword(password);
+            return authConfig.withUsername(username).withPassword(password);
         }
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index 835c1dff101..2e6f87d08b7 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -131,6 +131,9 @@ public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException, IO
             new AuthConfig()
         );
 
+        assertThat(authConfig.getRegistryAddress())
+            .as("Correct server URL is obtained from a credential store")
+            .isEqualTo("url");
         assertThat(authConfig.getIdentitytoken())
             .as("Correct identitytoken is obtained from a credential store")
             .isEqualTo("secret");
@@ -176,6 +179,45 @@ public void lookupNonEmptyAuthWithHelper() throws URISyntaxException, IOExceptio
             .isEqualTo("secret");
     }
 
+    @Test
+    public void lookupAuthConfigUsingHelperNoServerUrl() throws URISyntaxException, IOException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper-no-server-url.json");
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registrynoserverurl.example.com/org/repo"),
+            new AuthConfig()
+        );
+
+        assertThat(authConfig.getRegistryAddress())
+            .as("Fallback (registry) server URL is used")
+            .isEqualTo("registrynoserverurl.example.com");
+        assertThat(authConfig.getUsername())
+            .as("Correct username is obtained from a credential store")
+            .isEqualTo("username");
+        assertThat(authConfig.getPassword())
+            .as("Correct secret is obtained from a credential store")
+            .isEqualTo("secret");
+    }
+
+    @Test
+    public void lookupAuthConfigUsingHelperNoServerUrlWithToken() throws URISyntaxException, IOException {
+        final RegistryAuthLocator authLocator = createTestAuthLocator(
+            "config-with-helper-no-server-url-using-token.json"
+        );
+
+        final AuthConfig authConfig = authLocator.lookupAuthConfig(
+            DockerImageName.parse("registrynoserverurltoken.example.com/org/repo"),
+            new AuthConfig()
+        );
+
+        assertThat(authConfig.getRegistryAddress())
+            .as("Fallback (registry) server URL is used")
+            .isEqualTo("registrynoserverurltoken.example.com");
+        assertThat(authConfig.getIdentitytoken())
+            .as("Correct identitytoken is obtained from a credential store")
+            .isEqualTo("secret");
+    }
+
     @Test
     public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException, IOException {
         Map<String, String> notFoundMessagesReference = new HashMap<>();
diff --git a/core/src/test/resources/auth-config/config-with-helper-no-server-url-using-token.json b/core/src/test/resources/auth-config/config-with-helper-no-server-url-using-token.json
new file mode 100644
index 00000000000..836204cd7fb
--- /dev/null
+++ b/core/src/test/resources/auth-config/config-with-helper-no-server-url-using-token.json
@@ -0,0 +1,11 @@
+{
+    "auths": {
+        "registrynoserverurltoken.example.com": {}
+    },
+    "HttpHeaders": {
+        "User-Agent": "Docker-Client/18.03.0-ce (darwin)"
+    },
+    "credHelpers": {
+        "registrynoserverurltoken.example.com": "fake"
+    }
+}
diff --git a/core/src/test/resources/auth-config/config-with-helper-no-server-url.json b/core/src/test/resources/auth-config/config-with-helper-no-server-url.json
new file mode 100644
index 00000000000..2ebe514d547
--- /dev/null
+++ b/core/src/test/resources/auth-config/config-with-helper-no-server-url.json
@@ -0,0 +1,11 @@
+{
+    "auths": {
+        "registrynoserverurl.example.com": {}
+    },
+    "HttpHeaders": {
+        "User-Agent": "Docker-Client/18.03.0-ce (darwin)"
+    },
+    "credHelpers": {
+        "registrynoserverurl.example.com": "fake"
+    }
+}
diff --git a/core/src/test/resources/auth-config/docker-credential-fake b/core/src/test/resources/auth-config/docker-credential-fake
index 753e62ca347..4a851d93322 100755
--- a/core/src/test/resources/auth-config/docker-credential-fake
+++ b/core/src/test/resources/auth-config/docker-credential-fake
@@ -31,5 +31,19 @@ if [ "$inputLine" = "registrytoken.example.com" ]; then
         '}'
     exit 0
 fi
+if [ "$inputLine" = "registrynoserverurl.example.com" ]; then
+    echo '{' \
+        '  "Username": "username",' \
+        '  "Secret": "secret"' \
+        '}'
+    exit 0
+fi
+if [ "$inputLine" = "registrynoserverurltoken.example.com" ]; then
+    echo '{' \
+        '  "Username": "<token>",' \
+        '  "Secret": "secret"' \
+        '}'
+    exit 0
+fi
 
 exit 1

From a3a0464da38e240ea4f293ba0ff2022d999b0016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 15 Oct 2024 11:51:26 -0500
Subject: [PATCH 4021/4969] Fix windows test (#9409)

---
 .../auth-config/win/docker-credential-fake.bat     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/src/test/resources/auth-config/win/docker-credential-fake.bat b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
index 4b248973b48..c1095f0908c 100644
--- a/core/src/test/resources/auth-config/win/docker-credential-fake.bat
+++ b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
@@ -30,5 +30,19 @@ if "%inputLine%" == "registrytoken.example.com" (
      echo }
      exit 0
 )
+if "%inputLine%" == "registrynoserverurl.example.com" (
+     echo {
+     echo   "Username": "username",
+     echo   "Secret": "secret"
+     echo }
+     exit 0
+)
+if "%inputLine%" == "registrynoserverurltoken.example.com" (
+     echo {
+     echo   "Username": "<token>",
+     echo   "Secret": "secret"
+     echo }
+     exit 0
+)
 
 exit 1

From 3c7714e5f2b27bcbe73e9b38943218605c81775d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 15 Oct 2024 15:14:34 -0600
Subject: [PATCH 4022/4969] Fix javadoc

---
 .../java/org/testcontainers/cassandra/CassandraContainer.java   | 2 +-
 .../java/org/testcontainers/containers/CassandraContainer.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
index f8fc5d58dbb..c687c63eaa3 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
@@ -159,7 +159,7 @@ public String getPassword() {
     /**
      * Retrieve an {@link InetSocketAddress} for connecting to the Cassandra container via the driver.
      *
-     * @return A InetSocketAddrss representation of this Cassandra container's host and port.
+     * @return A InetSocketAddress representation of this Cassandra container's host and port.
      */
     public InetSocketAddress getContactPoint() {
         return new InetSocketAddress(getHost(), getMappedPort(CQL_PORT));
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
index 0f5c67992c6..fcaada177ce 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -228,7 +228,7 @@ public static Cluster getCluster(ContainerState containerState) {
     /**
      * Retrieve an {@link InetSocketAddress} for connecting to the Cassandra container via the driver.
      *
-     * @return A InetSocketAddrss representation of this Cassandra container's host and port.
+     * @return A InetSocketAddress representation of this Cassandra container's host and port.
      */
     public InetSocketAddress getContactPoint() {
         return new InetSocketAddress(getHost(), getMappedPort(CQL_PORT));

From e35705bd373bed4c9dd54643e89f71af1ef20e48 Mon Sep 17 00:00:00 2001
From: Ben <bryves@gmail.com>
Date: Wed, 16 Oct 2024 04:28:14 +0200
Subject: [PATCH 4023/4969] Read docker credentials stdout and stderr
 independently (#8007)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8006

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../utility/RegistryAuthLocator.java          | 142 +++++++++++-------
 1 file changed, 85 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index 600a800c0df..00dd8184f51 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -12,6 +12,7 @@
 import org.testcontainers.DockerClientFactory;
 import org.zeroturnaround.exec.InvalidResultException;
 import org.zeroturnaround.exec.ProcessExecutor;
+import org.zeroturnaround.exec.stream.LogOutputStream;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -273,7 +274,7 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
         }
 
         final String credentialProgramName = getCredentialProgramName(helperOrStoreName);
-        final String data;
+        final CredentialOutput data;
 
         log.debug(
             "Executing docker credential provider: {} to locate auth config for: {}",
@@ -283,37 +284,38 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
 
         try {
             data = runCredentialProgram(hostName, credentialProgramName);
-        } catch (InvalidResultException e) {
-            final String responseErrorMsg = extractCredentialProviderErrorMessage(e);
-
-            if (!StringUtils.isBlank(responseErrorMsg)) {
-                String credentialsNotFoundMsg = getGenericCredentialsNotFoundMsg(credentialProgramName);
-                if (credentialsNotFoundMsg != null && credentialsNotFoundMsg.equals(responseErrorMsg)) {
-                    log.info(
-                        "Credential helper/store ({}) does not have credentials for {}",
+            if (data.getStderr() != null && !data.getStderr().isEmpty()) {
+                final String responseErrorMsg = data.getStderr();
+
+                if (!StringUtils.isBlank(responseErrorMsg)) {
+                    String credentialsNotFoundMsg = getGenericCredentialsNotFoundMsg(credentialProgramName);
+                    if (credentialsNotFoundMsg != null && credentialsNotFoundMsg.equals(responseErrorMsg)) {
+                        log.info(
+                            "Credential helper/store ({}) does not have credentials for {}",
+                            credentialProgramName,
+                            hostName
+                        );
+
+                        return null;
+                    }
+
+                    log.debug(
+                        "Failure running docker credential helper/store ({}) with output '{}'",
                         credentialProgramName,
-                        hostName
+                        responseErrorMsg
                     );
-
-                    return null;
+                } else {
+                    log.debug("Failure running docker credential helper/store ({})", credentialProgramName);
                 }
 
-                log.debug(
-                    "Failure running docker credential helper/store ({}) with output '{}'",
-                    credentialProgramName,
-                    responseErrorMsg
-                );
-            } else {
-                log.debug("Failure running docker credential helper/store ({})", credentialProgramName);
+                throw new InvalidResultException(data.getStderr(), null);
             }
-
-            throw e;
         } catch (Exception e) {
             log.debug("Failure running docker credential helper/store ({})", credentialProgramName);
             throw e;
         }
 
-        final JsonNode helperResponse = OBJECT_MAPPER.readTree(data);
+        final JsonNode helperResponse = OBJECT_MAPPER.readTree(data.getStdout());
         log.debug("Credential helper/store provided auth config for: {}", hostName);
 
         final String username = helperResponse.at("/Username").asText();
@@ -363,55 +365,81 @@ private String discoverCredentialsHelperNotFoundMessage(String credentialHelperN
 
         String credentialsNotFoundMsg = null;
         try {
-            runCredentialProgram(notExistentFakeHostName, credentialHelperName);
+            CredentialOutput data = runCredentialProgram(notExistentFakeHostName, credentialHelperName);
 
-            // should not reach here
-            log.warn(
-                "Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response",
-                credentialHelperName
-            );
-        } catch (Exception e) {
-            if (e instanceof InvalidResultException) {
-                credentialsNotFoundMsg = extractCredentialProviderErrorMessage((InvalidResultException) e);
-            }
+            if (data.getStderr() != null && !data.getStderr().isEmpty()) {
+                credentialsNotFoundMsg = data.getStderr();
 
-            if (StringUtils.isBlank(credentialsNotFoundMsg)) {
-                log.warn(
-                    "Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response. Exception message: {}",
-                    credentialHelperName,
-                    e.getMessage()
-                );
-            } else {
                 log.debug(
                     "Got credentials not found error message from docker credential helper - {}",
                     credentialsNotFoundMsg
                 );
             }
+        } catch (Exception e) {
+            log.warn(
+                "Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response. Exception message: {}",
+                credentialHelperName,
+                e.getMessage()
+            );
         }
 
         return credentialsNotFoundMsg;
     }
 
-    private String extractCredentialProviderErrorMessage(InvalidResultException invalidResultEx) {
-        if (invalidResultEx.getResult() != null && invalidResultEx.getResult().hasOutput()) {
-            return invalidResultEx.getResult().outputString().trim();
-        }
-        return null;
-    }
-
-    private String runCredentialProgram(String hostName, String credentialHelperName)
-        throws InvalidResultException, InterruptedException, TimeoutException, IOException {
+    private CredentialOutput runCredentialProgram(String hostName, String credentialHelperName)
+        throws InterruptedException, TimeoutException, IOException {
         String[] command = SystemUtils.IS_OS_WINDOWS
             ? new String[] { "cmd", "/c", credentialHelperName, "get" }
             : new String[] { credentialHelperName, "get" };
-        return new ProcessExecutor()
-            .command(command)
-            .redirectInput(new ByteArrayInputStream(hostName.getBytes()))
-            .readOutput(true)
-            .exitValueNormal()
-            .timeout(30, TimeUnit.SECONDS)
-            .execute()
-            .outputUTF8()
-            .trim();
+
+        StringBuffer stdout = new StringBuffer();
+        StringBuffer stderr = new StringBuffer();
+
+        try {
+            new ProcessExecutor()
+                .command(command)
+                .redirectInput(new ByteArrayInputStream(hostName.getBytes()))
+                .redirectOutput(
+                    new LogOutputStream() {
+                        @Override
+                        protected void processLine(String line) {
+                            stdout.append(line).append(System.lineSeparator());
+                        }
+                    }
+                )
+                .redirectError(
+                    new LogOutputStream() {
+                        @Override
+                        protected void processLine(String line) {
+                            stderr.append(line).append(System.lineSeparator());
+                        }
+                    }
+                )
+                .exitValueNormal()
+                .timeout(30, TimeUnit.SECONDS)
+                .execute();
+        } catch (InvalidResultException e) {}
+
+        return new CredentialOutput(stdout.toString(), stderr.toString());
+    }
+
+    static class CredentialOutput {
+
+        private final String stdout;
+
+        private final String stderr;
+
+        public CredentialOutput(String stdout, String stderr) {
+            this.stdout = stdout.trim();
+            this.stderr = stderr.trim();
+        }
+
+        public String getStdout() {
+            return this.stdout;
+        }
+
+        public String getStderr() {
+            return this.stderr;
+        }
     }
 }

From fc73325f3790def63084ccb98a9e7708a9dfa7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 16 Oct 2024 16:10:03 -0500
Subject: [PATCH 4024/4969] Fix execution in windows runner (#9413)

Currently, when `/windows-test` command is added the workflow run
tests with `main` branch and status is not updated, always listed as
skipped.
---
 .github/workflows/ci-windows.yml | 62 ++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 4f11c59c082..6174a084ef8 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -43,8 +43,8 @@ permissions:
   contents: read
 
 jobs:
-  core:
-    if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event.client_payload.slash_command.command == 'windows-test' }}
+  main:
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
     runs-on: self-hosted
     permissions:
       checks: write
@@ -53,3 +53,61 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
       - uses: ./.github/actions/setup-junit-report
+
+  pr:
+    if: ${{ github.event.client_payload.slash_command.command == 'windows-test' }}
+    runs-on: self-hosted
+    permissions:
+      checks: write
+    steps:
+      - name: Create pending status
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            github.repos.createStatus({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              sha: context.payload.client_payload.pull_request.head.sha,
+              state: 'pending',
+              target_url: `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
+              context: 'CI - Windows',
+            })
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.client_payload.pull_request.head.ref }}
+      - name: Build with Gradle
+        run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
+      - uses: ./.github/actions/setup-junit-report
+
+      - name: Create success status
+        uses: actions/github-script@v7
+        if: success()
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            github.repos.createStatus({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              sha: context.payload.client_payload.pull_request.head.sha,
+              state: 'success',
+              target_url: `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
+              context: 'CI - Windows',
+            })
+
+      - name: Create failure status
+        uses: actions/github-script@v7
+        if: failure()
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            github.repos.createStatus({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              sha: context.payload.client_payload.pull_request.head.sha,
+              state: 'failure',
+              target_url: `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
+              context: 'CI - Windows',
+            })

From 593a7d93701b8ec2312a0f4a6fce31a7f9868a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 16 Oct 2024 15:24:07 -0600
Subject: [PATCH 4025/4969] Fix actions/github-script version to 0.9.0

---
 .github/workflows/ci-windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 6174a084ef8..0a7e674a050 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -61,7 +61,7 @@ jobs:
       checks: write
     steps:
       - name: Create pending status
-        uses: actions/github-script@v7
+        uses: actions/github-script@0.9.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -83,7 +83,7 @@ jobs:
       - uses: ./.github/actions/setup-junit-report
 
       - name: Create success status
-        uses: actions/github-script@v7
+        uses: actions/github-script@0.9.0
         if: success()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -98,7 +98,7 @@ jobs:
             })
 
       - name: Create failure status
-        uses: actions/github-script@v7
+        uses: actions/github-script@0.9.0
         if: failure()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

From a8eadcefbeb722b9328c51dbf5c958519f98d979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 16 Oct 2024 15:38:04 -0600
Subject: [PATCH 4026/4969] Update actions/github-script version to v7

---
 .github/workflows/ci-windows.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 0a7e674a050..e330d6d9511 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -61,11 +61,11 @@ jobs:
       checks: write
     steps:
       - name: Create pending status
-        uses: actions/github-script@0.9.0
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            github.repos.createStatus({
+            github.rest.repos.createCommitStatus({
               owner: context.repo.owner,
               repo: context.repo.repo,
               sha: context.payload.client_payload.pull_request.head.sha,
@@ -83,12 +83,12 @@ jobs:
       - uses: ./.github/actions/setup-junit-report
 
       - name: Create success status
-        uses: actions/github-script@0.9.0
+        uses: actions/github-script@v7
         if: success()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            github.repos.createStatus({
+            github.rest.repos.createCommitStatus({
               owner: context.repo.owner,
               repo: context.repo.repo,
               sha: context.payload.client_payload.pull_request.head.sha,
@@ -98,12 +98,12 @@ jobs:
             })
 
       - name: Create failure status
-        uses: actions/github-script@0.9.0
+        uses: actions/github-script@v7
         if: failure()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            github.repos.createStatus({
+            github.rest.repos.createCommitStatus({
               owner: context.repo.owner,
               repo: context.repo.repo,
               sha: context.payload.client_payload.pull_request.head.sha,

From 631a4c03efea310cf614e5def442aef56ceca692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 16 Oct 2024 16:03:05 -0600
Subject: [PATCH 4027/4969] Give write permission to statuses in windows
 workflow

---
 .github/workflows/ci-windows.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index e330d6d9511..f8b89b4ab0c 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -59,6 +59,7 @@ jobs:
     runs-on: self-hosted
     permissions:
       checks: write
+      statuses: write
     steps:
       - name: Create pending status
         uses: actions/github-script@v7

From 351516c0c2f398b01cfb014941254ee918fccf79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 16 Oct 2024 18:46:55 -0600
Subject: [PATCH 4028/4969] Fix github action url in slack payload

---
 .github/workflows/moby-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 7ef7a1c7ff8..b31294b98d1 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -50,7 +50,7 @@ jobs:
             {
               "tc_project": "testcontainers-java",
               "tc_docker_install_type": "${{ matrix.install-docker-type }}",
-              "tc_github_action_url": "https://github.com/testcontainers/testcontainers-java/actions/runs/${{ env.GITHUB_RUN_ID }}/job/${{ env.GITHUB_RUN_NUMBER }}",
+              "tc_github_action_url": "${{ GITHUB_SERVER_URL }}/${{ GITHUB_REPOSITORY }}/actions/runs/${{ GITHUB_RUN_ID }}/job/${{ GITHUB_RUN_NUMBER }}",
               "tc_github_action_status": "FAILED",
               "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
             }

From b78514f9907a73c393468f99ea967d03bac81887 Mon Sep 17 00:00:00 2001
From: livk <50291874+livk-cloud@users.noreply.github.com>
Date: Fri, 18 Oct 2024 03:28:18 +0800
Subject: [PATCH 4029/4969] Add r2dbc support for Clickhouse (#8434)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8427

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/databases/r2dbc.md               |  4 ++
 modules/clickhouse/build.gradle               |  7 ++-
 .../clickhouse/ClickHouseContainer.java       | 16 +++++--
 .../ClickHouseR2DBCDatabaseContainer.java     | 48 +++++++++++++++++++
 ...ckHouseR2DBCDatabaseContainerProvider.java | 46 ++++++++++++++++++
 ...iners.r2dbc.R2DBCDatabaseContainerProvider |  1 +
 .../testcontainers/ClickhouseTestImages.java  |  1 -
 .../ClickHouseR2DBCDatabaseContainerTest.java | 22 +++++++++
 .../clickhouse/SimpleClickhouseTest.java      |  1 -
 9 files changed, 138 insertions(+), 8 deletions(-)
 create mode 100644 modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainer.java
 create mode 100644 modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerProvider.java
 create mode 100644 modules/clickhouse/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
 create mode 100644 modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java

diff --git a/docs/modules/databases/r2dbc.md b/docs/modules/databases/r2dbc.md
index 22c76e83dd8..055d4ad7b0f 100644
--- a/docs/modules/databases/r2dbc.md
+++ b/docs/modules/databases/r2dbc.md
@@ -33,6 +33,10 @@ So that the URL becomes:
 
 ### R2DBC URL examples
 
+#### Using ClickHouse
+
+`r2dbc:tc:clickhouse:///databasename?TC_IMAGE_TAG=21.9.2-alpine`
+
 #### Using MySQL
 
 `r2dbc:tc:mysql:///databasename?TC_IMAGE_TAG=8.0.36`
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index fadec21f17e..6dec2131bde 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -4,7 +4,12 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
+    compileOnly project(':r2dbc')
+    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.0', classifier: 'http')
+
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.0', classifier: 'http')
     testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation testFixtures(project(':r2dbc'))
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.0', classifier: 'http')
 }
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index f65177ce68a..f8e4826932c 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -23,11 +23,13 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private static final String NAME = "clickhouse";
 
-    private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse("clickhouse/clickhouse-server");
+    static final String CLICKHOUSE_CLICKHOUSE_SERVER = "clickhouse/clickhouse-server";
 
-    private static final Integer HTTP_PORT = 8123;
+    private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse(CLICKHOUSE_CLICKHOUSE_SERVER);
 
-    private static final Integer NATIVE_PORT = 9000;
+    static final Integer HTTP_PORT = 8123;
+
+    static final Integer NATIVE_PORT = 9000;
 
     private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
 
@@ -35,11 +37,15 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private static final String TEST_QUERY = "SELECT 1";
 
+    static final String DEFAULT_USER = "default";
+
+    static final String DEFAULT_PASSWORD = "";
+
     private String databaseName = "default";
 
-    private String username = "default";
+    private String username = DEFAULT_USER;
 
-    private String password = "";
+    private String password = DEFAULT_PASSWORD;
 
     public ClickHouseContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..be6d8af67c2
--- /dev/null
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainer.java
@@ -0,0 +1,48 @@
+package org.testcontainers.clickhouse;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+/**
+ * ClickHouse R2DBC support
+ */
+public class ClickHouseR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    private final ClickHouseContainer container;
+
+    public ClickHouseR2DBCDatabaseContainer(ClickHouseContainer container) {
+        this.container = container;
+    }
+
+    public static ConnectionFactoryOptions getOptions(ClickHouseContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, ClickHouseR2DBCDatabaseContainerProvider.DRIVER)
+            .build();
+
+        return new ClickHouseR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public void start() {
+        this.container.start();
+    }
+
+    @Override
+    public void stop() {
+        this.container.stop();
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(ClickHouseContainer.HTTP_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .option(ConnectionFactoryOptions.PROTOCOL, "http")
+            .build();
+    }
+}
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerProvider.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerProvider.java
new file mode 100644
index 00000000000..d2005f15bb1
--- /dev/null
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerProvider.java
@@ -0,0 +1,46 @@
+package org.testcontainers.clickhouse;
+
+import com.clickhouse.r2dbc.connection.ClickHouseConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
+
+import javax.annotation.Nullable;
+
+public class ClickHouseR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+
+    static final String DRIVER = ClickHouseConnectionFactoryProvider.CLICKHOUSE_DRIVER;
+
+    @Override
+    public boolean supports(ConnectionFactoryOptions options) {
+        return DRIVER.equals(options.getRequiredValue(ConnectionFactoryOptions.DRIVER));
+    }
+
+    @Override
+    public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
+        String image =
+            ClickHouseContainer.CLICKHOUSE_CLICKHOUSE_SERVER + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        ClickHouseContainer container = new ClickHouseContainer(image)
+            .withDatabaseName((String) options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
+
+        if (Boolean.TRUE.equals(options.getValue(REUSABLE_OPTION))) {
+            container.withReuse(true);
+        }
+        return new ClickHouseR2DBCDatabaseContainer(container);
+    }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, ClickHouseContainer.DEFAULT_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, ClickHouseContainer.DEFAULT_PASSWORD);
+        }
+        builder.option(ConnectionFactoryOptions.PROTOCOL, "http");
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
+}
diff --git a/modules/clickhouse/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider b/modules/clickhouse/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
new file mode 100644
index 00000000000..4898be97d99
--- /dev/null
+++ b/modules/clickhouse/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.clickhouse.ClickHouseR2DBCDatabaseContainerProvider
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
index a6707705ff8..f79fb24c7b4 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
@@ -3,6 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface ClickhouseTestImages {
-    DockerImageName YANDEX_CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server:18.10.3");
     DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..a0333e44f5c
--- /dev/null
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java
@@ -0,0 +1,22 @@
+package org.testcontainers.clickhouse;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class ClickHouseR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<ClickHouseContainer> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(ClickHouseContainer container) {
+        return ClickHouseR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=21.9.2-alpine";
+    }
+
+    @Override
+    protected ClickHouseContainer createContainer() {
+        return new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine");
+    }
+}
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
index 8f81c88bfc0..eb33274ce6b 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -26,7 +26,6 @@ public SimpleClickhouseTest(DockerImageName imageName) {
     public static Object[][] data() {
         return new Object[][] { //
             { ClickhouseTestImages.CLICKHOUSE_IMAGE },
-            { ClickhouseTestImages.YANDEX_CLICKHOUSE_IMAGE },
         };
     }
 

From e219477088df17f1616a60b61cb226318421a1b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Oct 2024 16:20:15 -0500
Subject: [PATCH 4030/4969] Update ryuk version to 0.10.2 (#9372)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index a39b276e56f..8d00ec15189 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.9.0");
+        super("testcontainers/ryuk:0.10.2");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 29b0c5fbea772a60ece684433e9e219ec0384740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 18 Oct 2024 00:55:27 -0600
Subject: [PATCH 4031/4969] Remove unused constant

---
 .../org/testcontainers/containers/GenericContainer.java   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 4246e620d5b..52dede8792e 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -34,8 +34,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import org.rnorth.ducttape.ratelimits.RateLimiter;
-import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
@@ -193,12 +191,6 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     private static final Set<String> AVAILABLE_IMAGE_NAME_CACHE = new HashSet<>();
 
-    private static final RateLimiter DOCKER_CLIENT_RATE_LIMITER = RateLimiterBuilder
-        .newBuilder()
-        .withRate(1, TimeUnit.SECONDS)
-        .withConstantThroughput()
-        .build();
-
     @Nullable
     private Map<String, String> tmpFsMapping;
 

From cdf44665ec0a2196cbd21932cfc4dd102c979a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Oct 2024 18:52:42 -0500
Subject: [PATCH 4032/4969] Pin OceanBase image (#9416)

Current version 4.2.1-lts is a mutable image and it has been failing in CI.
We are pinning to tag 4.2.1.8-108000022024072217.
---
 .../testcontainers/oceanbase/OceanBaseCEContainerProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
index 36c260ead37..2a62558b6c4 100644
--- a/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
+++ b/modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java
@@ -9,7 +9,7 @@
  */
 public class OceanBaseCEContainerProvider extends JdbcDatabaseContainerProvider {
 
-    private static final String DEFAULT_TAG = "4.2.1-lts";
+    private static final String DEFAULT_TAG = "4.2.1.8-108000022024072217";
 
     @Override
     public boolean supports(String databaseType) {

From cd29df97aa06e744ed4d8c17ca33b7983ef7f338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Oct 2024 19:25:11 -0500
Subject: [PATCH 4033/4969] Introduce new property to configure pull.timeout
 (#9417)

Currently, the pull timeout is set to 2 minutes. This commit introduces
a new property `pull.timeout` to be configured in seconds.

Fixes #9191
---
 .../java/org/testcontainers/images/RemoteDockerImage.java    | 5 ++++-
 .../testcontainers/utility/TestcontainersConfiguration.java  | 4 ++++
 docs/features/configuration.md                               | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index e97b4afad23..9d669e46b07 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -22,6 +22,7 @@
 import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.ImageNameSubstitutor;
 import org.testcontainers.utility.LazyFuture;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -35,7 +36,9 @@
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
 public class RemoteDockerImage extends LazyFuture<String> {
 
-    private static final Duration PULL_RETRY_TIME_LIMIT = Duration.ofMinutes(2);
+    private static final Duration PULL_RETRY_TIME_LIMIT = Duration.ofSeconds(
+        TestcontainersConfiguration.getInstance().getImagePullTimeout()
+    );
 
     @ToString.Exclude
     private Future<DockerImageName> imageNameFuture;
diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
index e67a0b83ee2..5c80b82ba9c 100644
--- a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
+++ b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -208,6 +208,10 @@ public Integer getImagePullPauseTimeout() {
         return Integer.parseInt(getEnvVarOrProperty("pull.pause.timeout", "30"));
     }
 
+    public Integer getImagePullTimeout() {
+        return Integer.parseInt(getEnvVarOrProperty("pull.timeout", "120"));
+    }
+
     public String getImageSubstitutorClassName() {
         return getEnvVarOrProperty("image.substitutor", null);
     }
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index d874b16ad7b..3350c6018e7 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -90,6 +90,9 @@ but does not allow starting privileged containers, you can turn off the Ryuk con
 
 ## Customizing image pull behaviour
 
+> **pull.timeout = 120**
+> By default Testcontainers will timeout if pull takes more than this duration (in seconds)
+
 > **pull.pause.timeout = 30**
 > By default Testcontainers will abort the pull of an image if the pull appears stalled (no data transferred) for longer than this duration (in seconds).
 

From f52169fa9502fb28aa236f9874ef333c3348dacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 21 Oct 2024 14:12:19 -0500
Subject: [PATCH 4034/4969] Parse docker compose file correctly when version is
 not declared (#9420)

`version` is optional in compose file.

Fixes #8109
---
 .../containers/ParsedDockerComposeFile.java    | 18 +++++++++---------
 .../ParsedDockerComposeFileValidationTest.java | 13 +++++++++++++
 ...compose-imagename-parsing-v2-no-version.yml |  9 +++++++++
 3 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 core/src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml

diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index b5b11686491..d797a86bfbf 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -78,16 +78,16 @@ protected Object constructObject(Node node) {
 
     private void parseAndValidate() {
         final Map<String, ?> servicesMap;
-        if (composeFileContent.containsKey("version")) {
-            if ("2.0".equals(composeFileContent.get("version"))) {
-                log.warn(
-                    "Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " +
-                    "Please see https://github.com/testcontainers/moby-ryuk/issues/2, and specify 'version: \"2.1\"' or " +
-                    "higher in {}",
-                    composeFileName
-                );
-            }
+        if (composeFileContent.containsKey("version") && "2.0".equals(composeFileContent.get("version"))) {
+            log.warn(
+                "Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " +
+                "Please see https://github.com/testcontainers/moby-ryuk/issues/2, and specify 'version: \"2.1\"' or " +
+                "higher in {}",
+                composeFileName
+            );
+        }
 
+        if (composeFileContent.containsKey("services")) {
             final Object servicesElement = composeFileContent.get("services");
             if (servicesElement == null) {
                 log.debug(
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index 08b2746b386..9067d77d825 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -111,6 +111,19 @@ public void shouldObtainImageNamesV2() {
             );
     }
 
+    @Test
+    public void shouldObtainImageNamesV2WithNoVersionTag() {
+        File file = new File("src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml");
+        ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
+        assertThat(parsedFile.getServiceNameToImageNames())
+            .as("all defined images are found")
+            .contains(
+                entry("mysql", Sets.newHashSet("mysql")),
+                entry("redis", Sets.newHashSet("redis")),
+                entry("custom", Sets.newHashSet("postgres"))
+            );
+    }
+
     @Test
     public void shouldObtainImageFromDockerfileBuild() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile.yml");
diff --git a/core/src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml b/core/src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml
new file mode 100644
index 00000000000..0b48ad3eb05
--- /dev/null
+++ b/core/src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml
@@ -0,0 +1,9 @@
+services:
+    redis:
+        image: redis
+    mysql:
+        image: mysql
+    custom:
+        build: .
+networks:
+    custom_network: {}

From e7fc11364ba82d817d3761395ccc6e92178e6cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 21 Oct 2024 18:07:33 -0600
Subject: [PATCH 4035/4969] Switch to github context property

---
 .github/workflows/moby-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index b31294b98d1..e6030c865a4 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -50,7 +50,7 @@ jobs:
             {
               "tc_project": "testcontainers-java",
               "tc_docker_install_type": "${{ matrix.install-docker-type }}",
-              "tc_github_action_url": "${{ GITHUB_SERVER_URL }}/${{ GITHUB_REPOSITORY }}/actions/runs/${{ GITHUB_RUN_ID }}/job/${{ GITHUB_RUN_NUMBER }}",
+              "tc_github_action_url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.run_number }}",
               "tc_github_action_status": "FAILED",
               "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
             }

From 7c024edb1bf26ce8fb1a884e9ea862b455878774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 21 Oct 2024 19:55:10 -0500
Subject: [PATCH 4036/4969] Declarative R2DBC SPI implementation (#9447)

Avoid usage of `com.google.auto.service:auto-service`.
---
 modules/mariadb/build.gradle                                   | 3 ---
 .../containers/MariaDBR2DBCDatabaseContainerProvider.java      | 2 --
 .../org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider    | 1 +
 modules/mssqlserver/build.gradle                               | 3 ---
 .../containers/MSSQLR2DBCDatabaseContainerProvider.java        | 2 --
 .../org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider    | 1 +
 modules/mysql/build.gradle                                     | 3 ---
 .../containers/MySQLR2DBCDatabaseContainerProvider.java        | 2 --
 .../org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider    | 1 +
 modules/oracle-free/build.gradle                               | 3 ---
 .../oracle/OracleR2DBCDatabaseContainerProvider.java           | 2 --
 .../org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider    | 1 +
 modules/oracle-xe/build.gradle                                 | 3 ---
 .../containers/OracleR2DBCDatabaseContainerProvider.java       | 2 --
 .../org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider    | 1 +
 modules/postgresql/build.gradle                                | 3 ---
 .../containers/PostgreSQLR2DBCDatabaseContainerProvider.java   | 2 --
 .../org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider    | 1 +
 modules/r2dbc/build.gradle                                     | 3 ---
 .../r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java   | 2 --
 .../META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider   | 1 +
 21 files changed, 7 insertions(+), 35 deletions(-)
 create mode 100644 modules/mariadb/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
 create mode 100644 modules/mssqlserver/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
 create mode 100644 modules/mysql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
 create mode 100644 modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
 create mode 100644 modules/oracle-xe/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
 create mode 100644 modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
 create mode 100644 modules/r2dbc/src/main/resources/META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider

diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index fa47370764e..88734091907 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -1,9 +1,6 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
index 6994ab44dff..34635ac239f 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import com.google.auto.service.AutoService;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.mariadb.r2dbc.MariadbConnectionFactoryProvider;
@@ -9,7 +8,6 @@
 
 import javax.annotation.Nullable;
 
-@AutoService(R2DBCDatabaseContainerProvider.class)
 public class MariaDBR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
     static final String DRIVER = MariadbConnectionFactoryProvider.MARIADB_DRIVER;
diff --git a/modules/mariadb/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider b/modules/mariadb/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
new file mode 100644
index 00000000000..0c312685de9
--- /dev/null
+++ b/modules/mariadb/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.MariaDBR2DBCDatabaseContainerProvider
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 257d8954709..e7541434291 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -1,9 +1,6 @@
 description = "Testcontainers :: MS SQL Server"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
index fe7ada669bd..f829ddb8f1f 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import com.google.auto.service.AutoService;
 import io.r2dbc.mssql.MssqlConnectionFactoryProvider;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
@@ -9,7 +8,6 @@
 
 import javax.annotation.Nullable;
 
-@AutoService(R2DBCDatabaseContainerProvider.class)
 public class MSSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
     static final String DRIVER = MssqlConnectionFactoryProvider.MSSQL_DRIVER;
diff --git a/modules/mssqlserver/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider b/modules/mssqlserver/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
new file mode 100644
index 00000000000..0ec6b22ddf6
--- /dev/null
+++ b/modules/mssqlserver/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.MSSQLR2DBCDatabaseContainerProvider
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index beef298197d..d31fbcce266 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -1,9 +1,6 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
index bf74e8ec27a..97f7f4a243d 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import com.google.auto.service.AutoService;
 import io.asyncer.r2dbc.mysql.MySqlConnectionFactoryProvider;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
@@ -9,7 +8,6 @@
 
 import javax.annotation.Nullable;
 
-@AutoService(R2DBCDatabaseContainerProvider.class)
 public class MySQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
     static final String DRIVER = MySqlConnectionFactoryProvider.MYSQL_DRIVER;
diff --git a/modules/mysql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider b/modules/mysql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
new file mode 100644
index 00000000000..88cab78dc2e
--- /dev/null
+++ b/modules/mysql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.MySQLR2DBCDatabaseContainerProvider
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 2765c99fd92..9f1cebf0132 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -1,9 +1,6 @@
 description = "Testcontainers :: JDBC :: Oracle Database Free"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java
index 6fe809aa214..d8fe1ee7084 100644
--- a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java
@@ -1,13 +1,11 @@
 package org.testcontainers.oracle;
 
-import com.google.auto.service.AutoService;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.jetbrains.annotations.Nullable;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
 
-@AutoService(R2DBCDatabaseContainerProvider.class)
 public class OracleR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
     static final String DRIVER = "oracle";
diff --git a/modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider b/modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
new file mode 100644
index 00000000000..20465a3e57b
--- /dev/null
+++ b/modules/oracle-free/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.oracle.OracleR2DBCDatabaseContainerProvider
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index d3caec05e86..43506725f82 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -1,9 +1,6 @@
 description = "Testcontainers :: JDBC :: Oracle XE"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java
index 4d6a03530c2..35a98fda77d 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java
@@ -1,13 +1,11 @@
 package org.testcontainers.containers;
 
-import com.google.auto.service.AutoService;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.jetbrains.annotations.Nullable;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
 
-@AutoService(R2DBCDatabaseContainerProvider.class)
 public class OracleR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
     static final String DRIVER = "oracle";
diff --git a/modules/oracle-xe/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider b/modules/oracle-xe/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
new file mode 100644
index 00000000000..cd1df0b4488
--- /dev/null
+++ b/modules/oracle-xe/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.OracleR2DBCDatabaseContainerProvider
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 834656a3dac..23ad800186b 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -1,9 +1,6 @@
 description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
index 6b4a81c5e40..f1bdf67ee5c 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import com.google.auto.service.AutoService;
 import io.r2dbc.postgresql.PostgresqlConnectionFactoryProvider;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
@@ -9,7 +8,6 @@
 
 import javax.annotation.Nullable;
 
-@AutoService(R2DBCDatabaseContainerProvider.class)
 public final class PostgreSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
     static final String DRIVER = PostgresqlConnectionFactoryProvider.POSTGRESQL_DRIVER;
diff --git a/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider b/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
new file mode 100644
index 00000000000..6224c0e6093
--- /dev/null
+++ b/modules/postgresql/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.containers.PostgreSQLR2DBCDatabaseContainerProvider
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index a440af1dc97..1415df161fa 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -5,9 +5,6 @@ plugins {
 description = "Testcontainers :: R2DBC"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
-    compileOnly 'com.google.auto.service:auto-service:1.1.1'
-
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
index 5d9de2025a0..327ad6ab9ca 100644
--- a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
+++ b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java
@@ -1,6 +1,5 @@
 package org.testcontainers.r2dbc;
 
-import com.google.auto.service.AutoService;
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import io.r2dbc.spi.ConnectionFactoryProvider;
@@ -10,7 +9,6 @@
  */
 class Hidden {
 
-    @AutoService(ConnectionFactoryProvider.class)
     public static final class TestcontainersR2DBCConnectionFactoryProvider implements ConnectionFactoryProvider {
 
         public static final String DRIVER = "tc";
diff --git a/modules/r2dbc/src/main/resources/META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider b/modules/r2dbc/src/main/resources/META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider
new file mode 100644
index 00000000000..23f1702c57a
--- /dev/null
+++ b/modules/r2dbc/src/main/resources/META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider
@@ -0,0 +1 @@
+org.testcontainers.r2dbc.Hidden$TestcontainersR2DBCConnectionFactoryProvider

From 4f9594d5c1df72851ec174f75679726f6b892ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 21 Oct 2024 20:49:19 -0500
Subject: [PATCH 4037/4969] Add support for apachepulsar/pulsar-all image
 (#9448)

`apachepulsar/pulsar-all` brings connectors in the image.
---
 .../containers/PulsarContainer.java           |  4 +-
 .../containers/AbstractPulsar.java            | 67 +++++++++++++++++++
 .../CompatibleApachePulsarImageTest.java      | 41 ++++++++++++
 .../containers/PulsarContainerTest.java       | 62 +----------------
 4 files changed, 113 insertions(+), 61 deletions(-)
 create mode 100644 modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
 create mode 100644 modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java

diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 0181d7144d9..36485ad76a0 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -7,7 +7,7 @@
 /**
  * Testcontainers implementation for Apache Pulsar.
  * <p>
- * Supported image: {@code apachepulsar/pulsar}
+ * Supported images: {@code apachepulsar/pulsar}, {@code apachepulsar/pulsar-all}
  * <p>
  * Exposed ports:
  * <ul>
@@ -64,7 +64,7 @@ public PulsarContainer(String pulsarVersion) {
 
     public PulsarContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DockerImageName.parse("apachepulsar/pulsar"));
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DockerImageName.parse("apachepulsar/pulsar-all"));
         withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT);
         setWaitStrategy(waitAllStrategy);
     }
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java b/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
new file mode 100644
index 00000000000..5246fc6b8ad
--- /dev/null
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
@@ -0,0 +1,67 @@
+package org.testcontainers.containers;
+
+import org.apache.pulsar.client.admin.ListTopicsOptions;
+import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.apache.pulsar.client.api.transaction.Transaction;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AbstractPulsar {
+
+    public static final String TEST_TOPIC = "test_topic";
+
+    protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception {
+        try (
+            PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).build();
+            Consumer consumer = client.newConsumer().topic(TEST_TOPIC).subscriptionName("test-subs").subscribe();
+            Producer<byte[]> producer = client.newProducer().topic(TEST_TOPIC).create()
+        ) {
+            producer.send("test containers".getBytes());
+            CompletableFuture<Message> future = consumer.receiveAsync();
+            Message message = future.get(5, TimeUnit.SECONDS);
+
+            assertThat(new String(message.getData())).isEqualTo("test containers");
+        }
+    }
+
+    protected void testTransactionFunctionality(String pulsarBrokerUrl) throws Exception {
+        try (
+            PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).enableTransaction(true).build();
+            Consumer<String> consumer = client
+                .newConsumer(Schema.STRING)
+                .topic("transaction-topic")
+                .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+                .subscriptionName("test-transaction-sub")
+                .subscribe();
+            Producer<String> producer = client
+                .newProducer(Schema.STRING)
+                .sendTimeout(0, TimeUnit.SECONDS)
+                .topic("transaction-topic")
+                .create()
+        ) {
+            final Transaction transaction = client.newTransaction().build().get();
+            producer.newMessage(transaction).value("first").send();
+            transaction.commit();
+            Message<String> message = consumer.receive();
+            assertThat(message.getValue()).isEqualTo("first");
+        }
+    }
+
+    protected void assertTransactionsTopicCreated(PulsarAdmin pulsarAdmin) throws PulsarAdminException {
+        final List<String> topics = pulsarAdmin
+            .topics()
+            .getPartitionedTopicList("pulsar/system", ListTopicsOptions.builder().includeSystemTopic(true).build());
+        assertThat(topics).contains("persistent://pulsar/system/transaction_coordinator_assign");
+    }
+}
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java
new file mode 100644
index 00000000000..b7a9cd3ff4c
--- /dev/null
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java
@@ -0,0 +1,41 @@
+package org.testcontainers.containers;
+
+import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.utility.DockerImageName;
+
+@RunWith(Parameterized.class)
+public class CompatibleApachePulsarImageTest extends AbstractPulsar {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[] { "apachepulsar/pulsar:3.0.0", "apachepulsar/pulsar-all:3.0.0" };
+    }
+
+    @Parameterized.Parameter
+    public String imageName;
+
+    @Test
+    public void testUsage() throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse(this.imageName));) {
+            pulsar.start();
+            final String pulsarBrokerUrl = pulsar.getPulsarBrokerUrl();
+
+            testPulsarFunctionality(pulsarBrokerUrl);
+        }
+    }
+
+    @Test
+    public void testTransactions() throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse(this.imageName)).withTransactions();) {
+            pulsar.start();
+
+            try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build()) {
+                assertTransactionsTopicCreated(pulsarAdmin);
+            }
+            testTransactionFunctionality(pulsar.getPulsarBrokerUrl());
+        }
+    }
+}
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index 29321afca82..779a3a6114a 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -1,29 +1,16 @@
 package org.testcontainers.containers;
 
-import org.apache.pulsar.client.admin.ListTopicsOptions;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.Schema;
-import org.apache.pulsar.client.api.SubscriptionInitialPosition;
-import org.apache.pulsar.client.api.transaction.Transaction;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class PulsarContainerTest {
-
-    public static final String TEST_TOPIC = "test_topic";
+public class PulsarContainerTest extends AbstractPulsar {
 
     private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:3.0.0");
 
@@ -84,7 +71,8 @@ public void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
     public void shouldWaitForFunctionsWorkerStarted() throws Exception {
         try (
             // constructorWithFunctionsWorker {
-            PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withFunctionsWorker();
+            PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:3.0.0"))
+                .withFunctionsWorker();
             // }
         ) {
             pulsar.start();
@@ -111,13 +99,6 @@ public void testTransactions() throws Exception {
         }
     }
 
-    private void assertTransactionsTopicCreated(PulsarAdmin pulsarAdmin) throws PulsarAdminException {
-        final List<String> topics = pulsarAdmin
-            .topics()
-            .getPartitionedTopicList("pulsar/system", ListTopicsOptions.builder().includeSystemTopic(true).build());
-        assertThat(topics).contains("persistent://pulsar/system/transaction_coordinator_assign");
-    }
-
     @Test
     public void testTransactionsAndFunctionsWorker() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withTransactions().withFunctionsWorker()) {
@@ -149,41 +130,4 @@ public void testStartupTimeoutIsHonored() {
                 .hasRootCauseMessage("Precondition failed: timeout must be greater than zero");
         }
     }
-
-    protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception {
-        try (
-            PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).build();
-            Consumer consumer = client.newConsumer().topic(TEST_TOPIC).subscriptionName("test-subs").subscribe();
-            Producer<byte[]> producer = client.newProducer().topic(TEST_TOPIC).create()
-        ) {
-            producer.send("test containers".getBytes());
-            CompletableFuture<Message> future = consumer.receiveAsync();
-            Message message = future.get(5, TimeUnit.SECONDS);
-
-            assertThat(new String(message.getData())).isEqualTo("test containers");
-        }
-    }
-
-    protected void testTransactionFunctionality(String pulsarBrokerUrl) throws Exception {
-        try (
-            PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).enableTransaction(true).build();
-            Consumer<String> consumer = client
-                .newConsumer(Schema.STRING)
-                .topic("transaction-topic")
-                .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
-                .subscriptionName("test-transaction-sub")
-                .subscribe();
-            Producer<String> producer = client
-                .newProducer(Schema.STRING)
-                .sendTimeout(0, TimeUnit.SECONDS)
-                .topic("transaction-topic")
-                .create()
-        ) {
-            final Transaction transaction = client.newTransaction().build().get();
-            producer.newMessage(transaction).value("first").send();
-            transaction.commit();
-            Message<String> message = consumer.receive();
-            assertThat(message.getValue()).isEqualTo("first");
-        }
-    }
 }

From f50e5c352d84c5ad284ff094d168e4df39b49bad Mon Sep 17 00:00:00 2001
From: Christoph Schulz <christoph.2.schulz@atos.net>
Date: Tue, 22 Oct 2024 19:12:41 +0200
Subject: [PATCH 4038/4969] Log exception on socket problems (#8055)

Fixes #8054
---
 .../dockerclient/DockerClientProviderStrategy.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 557e8ba6cdf..8269646bbb4 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -217,7 +217,7 @@ protected boolean test() {
                 .untilAsserted(() -> socket.connect(socketAddress, (int) timeout.toMillis()));
             return true;
         } catch (Exception e) {
-            log.warn("DOCKER_HOST {} is not listening", dockerHost);
+            log.warn("DOCKER_HOST {} is not listening", dockerHost, e);
             return false;
         }
     }

From 8a50d01bb9b208d4cc265d1714ebafb073c16b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 22 Oct 2024 15:12:22 -0500
Subject: [PATCH 4039/4969] Revert "Update ryuk version to 0.10.2 (#9372)"
 (#9451)

This reverts commit e219477088df17f1616a60b61cb226318421a1b4.
---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 8d00ec15189..a39b276e56f 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.10.2");
+        super("testcontainers/ryuk:0.9.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 119627f5fe0ea25ba21a3b203ce801cf273d1eaa Mon Sep 17 00:00:00 2001
From: Kyle Aure <KyleJAure@gmail.com>
Date: Tue, 22 Oct 2024 15:58:26 -0500
Subject: [PATCH 4040/4969] Fix await during DockerClientProviderStrategy test
 method (#9412)

---
 .../dockerclient/DockerClientProviderStrategy.java       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 8269646bbb4..33f59c78ddb 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -31,7 +31,6 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
@@ -207,14 +206,12 @@ protected boolean test() {
         }
 
         try (Socket socket = socketProvider.call()) {
-            Duration timeout = Duration.ofMillis(200);
             Awaitility
                 .await()
-                .atMost(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS)
-                .pollInterval(timeout)
+                .atMost(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS) // timeout after configured duration
+                .pollInterval(Duration.ofMillis(200)) // check state every 200ms
                 .pollDelay(Duration.ofSeconds(0)) // start checking immediately
-                .ignoreExceptionsInstanceOf(SocketTimeoutException.class)
-                .untilAsserted(() -> socket.connect(socketAddress, (int) timeout.toMillis()));
+                .untilAsserted(() -> socket.connect(socketAddress));
             return true;
         } catch (Exception e) {
             log.warn("DOCKER_HOST {} is not listening", dockerHost, e);

From 4e636b246e6a56e9cb4aeff778db288f638b3562 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:01:59 -0500
Subject: [PATCH 4041/4969] [create-pull-request] automated change (#9449)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 01c18a4c987..ea875d07cf2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.2
+testcontainers.version=1.20.3

From 15874ff48241fef3802b1fa091720410d379e6fd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:02:11 -0500
Subject: [PATCH 4042/4969] [create-pull-request] automated change (#9450)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 3823455b0db..4689f6ee9fa 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -135,4 +135,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.2
+    latest_version: 1.20.3

From c1ad4b86d6abd5337a45036753d97b02cbd3848c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 23 Oct 2024 11:41:10 -0500
Subject: [PATCH 4043/4969] Update ryuk version to 0.11.0 (#9453)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index a39b276e56f..7175790bb6c 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.9.0");
+        super("testcontainers/ryuk:0.11.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From e0321d9bf8bd1eb4cf35181e049168700d942216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 23 Oct 2024 12:42:01 -0500
Subject: [PATCH 4044/4969] Add container implementation for Typesense (#9454)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  4 ++
 .github/settings.yml                          |  3 +
 docs/modules/typesense.md                     | 30 ++++++++++
 mkdocs.yml                                    |  1 +
 modules/typesense/build.gradle                |  8 +++
 .../typesense/TypesenseContainer.java         | 58 +++++++++++++++++++
 .../typesense/TypesenseContainerTest.java     | 49 ++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 +++++
 12 files changed, 177 insertions(+)
 create mode 100644 docs/modules/typesense.md
 create mode 100644 modules/typesense/build.gradle
 create mode 100644 modules/typesense/src/main/java/org/testcontainers/typesense/TypesenseContainer.java
 create mode 100644 modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java
 create mode 100644 modules/typesense/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 4251a2db853..fed1e5d8766 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -64,6 +64,7 @@ body:
         - Timeplus
         - ToxiProxy
         - Trino
+        - Typesense
         - Vault
         - Weaviate
         - YugabyteDB
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 24d6b33ffdd..c89fc29208c 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -64,6 +64,7 @@ body:
         - Timeplus
         - ToxiProxy
         - Trino
+        - Typesense
         - Vault
         - Weaviate
         - YugabyteDB
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index d36532b7d9d..aa9bf4e7777 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -64,6 +64,7 @@ body:
         - Timeplus
         - ToxiProxy
         - Trino
+        - Typesense
         - Vault
         - Weaviate
         - YugabyteDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 22977397e03..17dd0e2aa05 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -361,6 +361,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/typesense"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/vault"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index e88811fd50a..537f40a944b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -232,6 +232,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/trino/**/*
+"modules/typesense":
+  - changed-files:
+      - any-glob-to-any-file:
+          - modules/typesense/**/*
 "modules/vault":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 7571d82d55f..b10394a894a 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -262,6 +262,9 @@ labels:
   - name: modules/trino
     color: '#006b75'
 
+  - name: modules/typesense
+    color: '#006b75'
+
   - name: modules/vault
     color: '#006b75'
 
diff --git a/docs/modules/typesense.md b/docs/modules/typesense.md
new file mode 100644
index 00000000000..b9828e40f33
--- /dev/null
+++ b/docs/modules/typesense.md
@@ -0,0 +1,30 @@
+# Typesense
+
+Testcontainers module for [Typesense](https://hub.docker.com/r/typesense/typesense).
+
+## TypesenseContainer's usage examples
+
+You can start an Typesense container instance from any Java application by using:
+
+<!--codeinclude-->
+[Typesense container](../../modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:typesense:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>typesense</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 4689f6ee9fa..5c051c5565c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -102,6 +102,7 @@ nav:
           - modules/solace.md
           - modules/solr.md
           - modules/toxiproxy.md
+          - modules/typesense.md
           - modules/vault.md
           - modules/weaviate.md
           - modules/webdriver_containers.md
diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
new file mode 100644
index 00000000000..1a639ba2677
--- /dev/null
+++ b/modules/typesense/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: Typesense"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.typesense:typesense-java:0.9.0'
+}
diff --git a/modules/typesense/src/main/java/org/testcontainers/typesense/TypesenseContainer.java b/modules/typesense/src/main/java/org/testcontainers/typesense/TypesenseContainer.java
new file mode 100644
index 00000000000..f5ba92aee02
--- /dev/null
+++ b/modules/typesense/src/main/java/org/testcontainers/typesense/TypesenseContainer.java
@@ -0,0 +1,58 @@
+package org.testcontainers.typesense;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Typesense.
+ * <p>
+ * Supported image: {@code typesense/typesense}
+ * <p>
+ * Exposed ports: 8108
+ */
+public class TypesenseContainer extends GenericContainer<TypesenseContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("typesense/typesense");
+
+    private static final int PORT = 8108;
+
+    private static final String DEFAULT_API_KEY = "testcontainers";
+
+    private String apiKey = DEFAULT_API_KEY;
+
+    public TypesenseContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public TypesenseContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(PORT);
+        withEnv("TYPESENSE_DATA_DIR", "/tmp");
+        waitingFor(
+            Wait
+                .forHttp("/health")
+                .forStatusCode(200)
+                .forResponsePredicate(response -> response.contains("\"ok\":true"))
+        );
+    }
+
+    @Override
+    protected void configure() {
+        withEnv("TYPESENSE_API_KEY", this.apiKey);
+    }
+
+    public TypesenseContainer withApiKey(String apiKey) {
+        this.apiKey = apiKey;
+        return this;
+    }
+
+    public String getHttpPort() {
+        return String.valueOf(getMappedPort(PORT));
+    }
+
+    public String getApiKey() {
+        return this.apiKey;
+    }
+}
diff --git a/modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java b/modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java
new file mode 100644
index 00000000000..8f39a05dd33
--- /dev/null
+++ b/modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java
@@ -0,0 +1,49 @@
+package org.testcontainers.typesense;
+
+import org.junit.Test;
+import org.typesense.api.Client;
+import org.typesense.api.Configuration;
+import org.typesense.resources.Node;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TypesenseContainerTest {
+
+    @Test
+    public void query() throws Exception {
+        try ( // container {
+            TypesenseContainer typesense = new TypesenseContainer("typesense/typesense:27.1")
+            // }
+        ) {
+            typesense.start();
+            List<Node> nodes = Collections.singletonList(
+                new Node("http", typesense.getHost(), typesense.getHttpPort())
+            );
+
+            assertThat(typesense.getApiKey()).isEqualTo("testcontainers");
+            Configuration configuration = new Configuration(nodes, Duration.ofSeconds(5), typesense.getApiKey());
+            Client client = new Client(configuration);
+            System.out.println(client.health.retrieve());
+            assertThat(client.health.retrieve()).containsEntry("ok", true);
+        }
+    }
+
+    @Test
+    public void withCustomApiKey() throws Exception {
+        try (TypesenseContainer typesense = new TypesenseContainer("typesense/typesense:27.1").withApiKey("s3cr3t")) {
+            typesense.start();
+            List<Node> nodes = Collections.singletonList(
+                new Node("http", typesense.getHost(), typesense.getHttpPort())
+            );
+
+            assertThat(typesense.getApiKey()).isEqualTo("s3cr3t");
+            Configuration configuration = new Configuration(nodes, Duration.ofSeconds(5), typesense.getApiKey());
+            Client client = new Client(configuration);
+            assertThat(client.health.retrieve()).containsEntry("ok", true);
+        }
+    }
+}
diff --git a/modules/typesense/src/test/resources/logback-test.xml b/modules/typesense/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/typesense/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 7351b66899fdf1a45e1d31e75727652880a304f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 24 Oct 2024 21:48:05 -0600
Subject: [PATCH 4045/4969] Fix GHA url pointing to attempts

---
 .github/workflows/moby-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index e6030c865a4..75d50c00ccb 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -50,7 +50,7 @@ jobs:
             {
               "tc_project": "testcontainers-java",
               "tc_docker_install_type": "${{ matrix.install-docker-type }}",
-              "tc_github_action_url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.run_number }}",
+              "tc_github_action_url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}",
               "tc_github_action_status": "FAILED",
               "tc_slack_channel_id": "${{ secrets.SLACK_DOCKER_LATEST_CHANNEL_ID }}"
             }

From 77a423c812ad044c0a2076b7495eb298eb72f85b Mon Sep 17 00:00:00 2001
From: Kyle Aure <KyleJAure@gmail.com>
Date: Fri, 25 Oct 2024 17:23:34 -0500
Subject: [PATCH 4046/4969] Fix default client.ping.timeout value in docs
 (#9464)

---
 docs/features/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index 3350c6018e7..c13c0a659e3 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -98,7 +98,7 @@ but does not allow starting privileged containers, you can turn off the Ryuk con
 
 ## Customizing client ping behaviour
 
-> **client.ping.timeout = 5**
+> **client.ping.timeout = 10**
 > Specifies for how long Testcontainers will try to connect to the Docker client to obtain valid info about the client before giving up and trying next strategy, if applicable (in seconds).
 
 ## Customizing Docker host detection

From 803b258ec0acbe660e60172e0e3c1c1aa63f9925 Mon Sep 17 00:00:00 2001
From: Philip Wedemann <22521688+hfhbd@users.noreply.github.com>
Date: Thu, 31 Oct 2024 02:25:11 +0100
Subject: [PATCH 4047/4969] Remove privilegedMode in Db2Container (#9460)

Switch to capabilities IPC_LOCK and IPC_OWNER.
---
 .../main/java/org/testcontainers/containers/Db2Container.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 0cde8f0dee3..d04835cbc02 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import com.github.dockerjava.api.model.Capability;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
@@ -57,7 +58,7 @@ public Db2Container(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_NEW_IMAGE_NAME, DEFAULT_IMAGE_NAME);
 
-        withPrivilegedMode(true);
+        withCreateContainerCmdModifier(cmd -> cmd.withCapAdd(Capability.IPC_LOCK).withCapAdd(Capability.IPC_OWNER));
         this.waitStrategy =
             new LogMessageWaitStrategy()
                 .withRegEx(".*Setup has completed\\..*")

From b3ef3d2cd4c484d583dbae9f82e81b0f26f0f5e5 Mon Sep 17 00:00:00 2001
From: livk <50291874+livk-cloud@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:00:50 +0800
Subject: [PATCH 4048/4969] Fix ClickHouse wait strategy (#9466)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../clickhouse/ClickHouseContainer.java          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index f8e4826932c..65cb2db5738 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -1,7 +1,7 @@
 package org.testcontainers.clickhouse;
 
 import org.testcontainers.containers.JdbcDatabaseContainer;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -56,11 +56,14 @@ public ClickHouseContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(CLICKHOUSE_IMAGE_NAME);
 
         addExposedPorts(HTTP_PORT, NATIVE_PORT);
-        this.waitStrategy =
-            new HttpWaitStrategy()
+        waitingFor(
+            Wait
+                .forHttp("/")
+                .forPort(HTTP_PORT)
                 .forStatusCode(200)
                 .forResponsePredicate("Ok."::equals)
-                .withStartupTimeout(Duration.ofMinutes(1));
+                .withStartupTimeout(Duration.ofMinutes(1))
+        );
     }
 
     @Override
@@ -130,4 +133,9 @@ public ClickHouseContainer withDatabaseName(String databaseName) {
         this.databaseName = databaseName;
         return this;
     }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
 }

From 4aa1b6c758f10c63eecdb75a3d1ade99fbd629a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 31 Oct 2024 11:23:33 -0600
Subject: [PATCH 4049/4969] Add develocity access key to enable build scan on
 windows and moby-latest workflows

---
 .github/workflows/ci-windows.yml  | 3 +++
 .github/workflows/moby-latest.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index f8b89b4ab0c..45b47f364ad 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -42,6 +42,9 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+
 jobs:
   main:
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 75d50c00ccb..3ebfce168c6 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -6,6 +6,9 @@ on:
     # nightly build, at 23:59 CEST
     - cron:  '59 23 * * *'
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+
 jobs:
   test_docker:
     strategy:

From cd53c64290ee199531c1eb909b75ff86ca1d88d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 17:27:40 +0000
Subject: [PATCH 4050/4969] Bump github/combine-prs from 5.1.0 to 5.2.0

Bumps [github/combine-prs](https://github.com/github/combine-prs) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/github/combine-prs/releases)
- [Commits](https://github.com/github/combine-prs/compare/v5.1.0...v5.2.0)

---
updated-dependencies:
- dependency-name: github/combine-prs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index e8f34878405..ed43d6ceed0 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v5.1.0
+        uses: github/combine-prs@v5.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

From 10f32af918423028be447f6c0520af45888f3348 Mon Sep 17 00:00:00 2001
From: Sasha Sheikin <myminitrue@gmail.com>
Date: Wed, 6 Nov 2024 05:33:37 +0100
Subject: [PATCH 4051/4969] Stop container that doesn't match wait strategy
 (#9474)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #2877

---------

Co-authored-by: Piotr Findeisen <piotr.findeisen@gmail.com>
Co-authored-by: Jan Waś <jan.was@starburstdata.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/GenericContainer.java          |  1 +
 .../containers/GenericContainerTest.java      | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 52dede8792e..b2436b77286 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -550,6 +550,7 @@ private void tryStart() {
                 } else {
                     logger().error("There are no stdout/stderr logs available for the failed container");
                 }
+                stop();
             }
 
             throw new ContainerLaunchException("Could not create/start container", e);
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index 0ba06dd4ca8..acb24cf0d68 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -5,9 +5,12 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse.ContainerState;
+import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.Ports;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
@@ -28,9 +31,12 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
+import java.time.Duration;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -273,6 +279,63 @@ public void shouldRespectWaitStrategy() {
         }
     }
 
+    @Test
+    public void testStartupAttemptsDoesNotLeaveContainersRunningWhenWrongWaitStrategyIsUsed() {
+        try (
+            GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
+                .withLabel("waitstrategy", "wrong")
+                .withStartupAttempts(3)
+                .waitingFor(
+                    Wait.forLogMessage("this text does not exist in logs", 1).withStartupTimeout(Duration.ofMillis(1))
+                )
+                .withCommand("tail", "-f", "/dev/null");
+        ) {
+            assertThatThrownBy(container::start).hasStackTraceContaining("Retry limit hit with exception");
+        }
+        assertThat(reportLeakedContainers()).isEmpty();
+    }
+
+    private static Optional<String> reportLeakedContainers() {
+        @SuppressWarnings("resource") // Throws when close is attempted, as this is a global instance.
+        DockerClient dockerClient = DockerClientFactory.lazyClient();
+
+        List<Container> containers = dockerClient
+            .listContainersCmd()
+            .withAncestorFilter(Collections.singletonList("alpine:3.17"))
+            .withLabelFilter(
+                Arrays.asList(
+                    DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL + "=" + DockerClientFactory.SESSION_ID,
+                    "waitstrategy=wrong"
+                )
+            )
+            // ignore status "exited" - for example, failed containers after using `withStartupAttempts()`
+            .withStatusFilter(Arrays.asList("created", "restarting", "running", "paused"))
+            .exec()
+            .stream()
+            .collect(ImmutableList.toImmutableList());
+
+        if (containers.isEmpty()) {
+            return Optional.empty();
+        }
+
+        return Optional.of(
+            String.format(
+                "Leaked containers: %s",
+                containers
+                    .stream()
+                    .map(container -> {
+                        return MoreObjects
+                            .toStringHelper("container")
+                            .add("id", container.getId())
+                            .add("image", container.getImage())
+                            .add("imageId", container.getImageId())
+                            .toString();
+                    })
+                    .collect(Collectors.joining(", ", "[", "]"))
+            )
+        );
+    }
+
     static class NoopStartupCheckStrategy extends StartupCheckStrategy {
 
         @Override

From 78ba31592f86d42d9a78930bb8209304097955b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 6 Nov 2024 18:53:45 -0500
Subject: [PATCH 4052/4969] Revert "Add shutdownHook to send sigterm to ryuk
 (#7717)" (#9504)

This reverts commit 39f02190c01702fb3121b080f29c72bbdf7c78ea.

Fixes #8558
---
 .../testcontainers/utility/RyukResourceReaper.java  | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
index 7e1b7802fb0..999b1cbbffb 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -77,19 +77,6 @@ private synchronized void maybeStart() {
 
         ryukContainer.start();
 
-        Runtime
-            .getRuntime()
-            .addShutdownHook(
-                new Thread(
-                    DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
-                    () -> {
-                        this.dockerClient.killContainerCmd(this.ryukContainer.getContainerId())
-                            .withSignal("SIGTERM")
-                            .exec();
-                    }
-                )
-            );
-
         CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
 
         String host = ryukContainer.getHost();

From be7251b5414363c968916d101d6411b556d5b283 Mon Sep 17 00:00:00 2001
From: Joplek99 <TomDeBacker@users.noreply.github.com>
Date: Thu, 7 Nov 2024 03:14:41 +0100
Subject: [PATCH 4053/4969] Check if container belongs to a network when using
 exposeHostPorts (#8298)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #7335

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/GenericContainer.java          |  11 +-
 .../containers/ExposedHostTest.java           | 100 +++++++++++++++++-
 2 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index b2436b77286..acd70f69cab 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -623,7 +623,14 @@ private void connectToPortForwardingNetwork(String networkMode) {
             .map(ContainerNetwork::getNetworkID)
             .ifPresent(networkId -> {
                 if (!Arrays.asList(networkId, "none", "host").contains(networkMode)) {
-                    dockerClient.connectToNetworkCmd().withContainerId(containerId).withNetworkId(networkId).exec();
+                    com.github.dockerjava.api.model.Network network =
+                        this.dockerClient.inspectNetworkCmd().withNetworkId(networkId).exec();
+                    if (!network.getContainers().containsKey(this.containerId)) {
+                        this.dockerClient.connectToNetworkCmd()
+                            .withContainerId(this.containerId)
+                            .withNetworkId(networkId)
+                            .exec();
+                    }
                 }
             });
     }
@@ -827,7 +834,7 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
                 withExtraHost(INTERNAL_HOST_HOSTNAME, it.getIpAddress());
             });
 
-        String[] extraHostsArray = extraHosts.stream().toArray(String[]::new);
+        String[] extraHostsArray = extraHosts.stream().distinct().toArray(String[]::new);
         createCommand.withExtraHosts(extraHostsArray);
 
         if (workingDirectory != null) {
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 4a3142d9461..4ce316fcf80 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -7,13 +7,21 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
 import org.testcontainers.Testcontainers;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 public class ExposedHostTest {
 
@@ -33,7 +41,6 @@ public static void setUpClass() throws Exception {
                 }
             }
         );
-
         server.start();
     }
 
@@ -82,6 +89,61 @@ public void testExposedHostPortOnFixedInternalPorts() {
         assertResponse(new GenericContainer<>(tinyContainerDef()), 81);
     }
 
+    @Test
+    public void testExposedHostWithReusableContainerAndFixedNetworkName() throws IOException, InterruptedException {
+        assumeThat(TestcontainersConfiguration.getInstance().environmentSupportsReuse()).isTrue();
+        Network network = createReusableNetwork(UUID.randomUUID());
+        Testcontainers.exposeHostPorts(server.getAddress().getPort());
+
+        GenericContainer<?> container = new GenericContainer<>(tinyContainerDef()).withReuse(true).withNetwork(network);
+        container.start();
+
+        assertHttpResponseFromHost(container, server.getAddress().getPort());
+
+        PortForwardingContainer.INSTANCE.reset();
+        Testcontainers.exposeHostPorts(server.getAddress().getPort());
+
+        GenericContainer<?> reusedContainer = new GenericContainer<>(tinyContainerDef())
+            .withReuse(true)
+            .withNetwork(network);
+        reusedContainer.start();
+
+        assertThat(reusedContainer.getContainerId()).isEqualTo(container.getContainerId());
+        assertHttpResponseFromHost(reusedContainer, server.getAddress().getPort());
+
+        container.stop();
+        reusedContainer.stop();
+        DockerClientFactory.lazyClient().removeNetworkCmd(network.getId()).exec();
+    }
+
+    @Test
+    public void testExposedHostOnFixedInternalPortsWithReusableContainerAndFixedNetworkName()
+        throws IOException, InterruptedException {
+        assumeThat(TestcontainersConfiguration.getInstance().environmentSupportsReuse()).isTrue();
+        Network network = createReusableNetwork(UUID.randomUUID());
+        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 1234));
+
+        GenericContainer<?> container = new GenericContainer<>(tinyContainerDef()).withReuse(true).withNetwork(network);
+        container.start();
+
+        assertHttpResponseFromHost(container, 1234);
+
+        PortForwardingContainer.INSTANCE.reset();
+        Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 1234));
+
+        GenericContainer<?> reusedContainer = new GenericContainer<>(tinyContainerDef())
+            .withReuse(true)
+            .withNetwork(network);
+        reusedContainer.start();
+
+        assertThat(reusedContainer.getContainerId()).isEqualTo(container.getContainerId());
+        assertHttpResponseFromHost(reusedContainer, 1234);
+
+        container.stop();
+        reusedContainer.stop();
+        DockerClientFactory.lazyClient().removeNetworkCmd(network.getId()).exec();
+    }
+
     @SneakyThrows
     protected void assertResponse(GenericContainer<?> container, int port) {
         try {
@@ -108,4 +170,40 @@ private static class TinyContainerDef extends ContainerDef {
             setCommand("top");
         }
     }
+
+    private void assertHttpResponseFromHost(GenericContainer<?> container, int port)
+        throws IOException, InterruptedException {
+        String httpResponseFromHost = container
+            .execInContainer("wget", "-O", "-", "http://host.testcontainers.internal:" + port)
+            .getStdout();
+        assertThat(httpResponseFromHost).isEqualTo("Hello World!");
+    }
+
+    private static Network createReusableNetwork(UUID name) {
+        String networkName = name.toString();
+        Network network = new Network() {
+            @Override
+            public String getId() {
+                return networkName;
+            }
+
+            @Override
+            public void close() {}
+
+            @Override
+            public Statement apply(Statement base, Description description) {
+                return null;
+            }
+        };
+
+        List<com.github.dockerjava.api.model.Network> networks = DockerClientFactory
+            .lazyClient()
+            .listNetworksCmd()
+            .withNameFilter(networkName)
+            .exec();
+        if (networks.isEmpty()) {
+            Network.builder().createNetworkCmdModifier(cmd -> cmd.withName(networkName)).build().getId();
+        }
+        return network;
+    }
 }

From 0200a5d43979d246f43759da25c14ab8c71a5671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 7 Nov 2024 16:08:17 -0500
Subject: [PATCH 4054/4969] Fix cockroachdb wait strategy with version >=
 22.1.0 (#9505)

Starting with version 22.1.0, wait strategy can rely on `/cockroach/init_success`
file created when scripts are executed.

Fixes #8555
---
 .../containers/CockroachContainer.java        | 42 +++++++++++++------
 .../cockroachdb/SimpleCockroachDBTest.java    | 22 ++++++++++
 2 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 3a4ed8586c9..a7bb1fef7ed 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
@@ -66,19 +67,31 @@ public CockroachContainer(final String dockerImageName) {
     public CockroachContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-        isVersionGreaterThanOrEqualTo221 = isVersionGreaterThanOrEqualTo221(dockerImageName);
+        this.isVersionGreaterThanOrEqualTo221 = isVersionGreaterThanOrEqualTo221(dockerImageName);
 
-        withExposedPorts(REST_API_PORT, DB_PORT);
-        waitingFor(
-            new HttpWaitStrategy()
-                .forPath("/health")
-                .forPort(REST_API_PORT)
-                .forStatusCode(200)
-                .withStartupTimeout(Duration.ofMinutes(1))
+        WaitAllStrategy waitStrategy = new WaitAllStrategy();
+        waitStrategy.withStrategy(
+            Wait.forHttp("/health").forPort(REST_API_PORT).forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1))
         );
+        if (this.isVersionGreaterThanOrEqualTo221) {
+            waitStrategy.withStrategy(Wait.forSuccessfulCommand("[ -f ./init_success ] || { exit 1; }"));
+        }
+
+        withExposedPorts(REST_API_PORT, DB_PORT);
+        waitingFor(waitStrategy);
         withCommand("start-single-node --insecure");
     }
 
+    @Override
+    protected void configure() {
+        withEnv("COCKROACH_USER", this.username);
+        withEnv("COCKROACH_PASSWORD", this.password);
+        if (this.password != null && !this.password.isEmpty()) {
+            withCommand("start-single-node");
+        }
+        withEnv("COCKROACH_DATABASE", this.databaseName);
+    }
+
     @Override
     public String getDriverClassName() {
         return JDBC_DRIVER_CLASS_NAME;
@@ -123,21 +136,21 @@ public String getTestQueryString() {
     public CockroachContainer withUsername(String username) {
         validateIfVersionSupportsUsernameOrPasswordOrDatabase("username");
         this.username = username;
-        return withEnv("COCKROACH_USER", username);
+        return this;
     }
 
     @Override
     public CockroachContainer withPassword(String password) {
         validateIfVersionSupportsUsernameOrPasswordOrDatabase("password");
         this.password = password;
-        return withEnv("COCKROACH_PASSWORD", password).withCommand("start-single-node");
+        return this;
     }
 
     @Override
     public CockroachContainer withDatabaseName(final String databaseName) {
         validateIfVersionSupportsUsernameOrPasswordOrDatabase("databaseName");
         this.databaseName = databaseName;
-        return withEnv("COCKROACH_DATABASE", databaseName);
+        return this;
     }
 
     private boolean isVersionGreaterThanOrEqualTo221(DockerImageName dockerImageName) {
@@ -152,4 +165,9 @@ private void validateIfVersionSupportsUsernameOrPasswordOrDatabase(String parame
             );
         }
     }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index fe9ef5fb81c..9ea8dd6c770 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -4,6 +4,7 @@
 import org.testcontainers.CockroachDBTestImages;
 import org.testcontainers.containers.CockroachContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.images.builder.Transferable;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -105,4 +106,25 @@ public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
             .isInstanceOf(UnsupportedOperationException.class)
             .withFailMessage("Setting a databaseName in not supported in the versions below 22.1.0");
     }
+
+    @Test
+    public void testInitializationScript() throws SQLException {
+        String sql =
+            "USE postgres; \n" +
+            "CREATE TABLE bar (foo VARCHAR(255)); \n" +
+            "INSERT INTO bar (foo) VALUES ('hello world');";
+
+        try (
+            CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
+                .withCopyToContainer(Transferable.of(sql), "/docker-entrypoint-initdb.d/init.sql")
+                .withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
+        ) { // CockroachDB is expected to be compatible with Postgres
+            cockroach.start();
+
+            ResultSet resultSet = performQuery(cockroach, "SELECT foo FROM bar");
+
+            String firstColumnValue = resultSet.getString(1);
+            assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
+        }
+    }
 }

From c01fc1b874083bcba8958d2a17bc7e1088c34eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Nov 2024 13:35:05 -0600
Subject: [PATCH 4055/4969] Use cockroachdb version in testcontainers jdbc url
 test

---
 .../jdbc/cockroachdb/CockroachDBJDBCDriverTest.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
index 86aaf6b4f63..b5e147ce553 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
@@ -14,7 +14,7 @@ public class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
-                { "jdbc:tc:cockroach://hostname/databasename", EnumSet.noneOf(Options.class) },
+                { "jdbc:tc:cockroach:v21.2.17://hostname/databasename", EnumSet.noneOf(Options.class) },
             }
         );
     }

From 964c6e6da1c7614fd887245542986bfbe924a4c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 19 Nov 2024 16:06:52 -0500
Subject: [PATCH 4056/4969] Fix docker credentials output (#9544)

In #8007, docker credentials stdout and stderr are separated and
stderr has been used to display error messages. However, docker
credentials writes error messages to stdout. This commit, read the
process execution exit value for better handling and read stdout
for error messages.

Fixes #9478
---
 .../utility/RegistryAuthLocator.java          | 73 ++++++++++---------
 .../auth-config/docker-credential-fake        |  4 +-
 .../win/docker-credential-fake.bat            |  4 +-
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index 00dd8184f51..ff29206cc30 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -12,6 +12,7 @@
 import org.testcontainers.DockerClientFactory;
 import org.zeroturnaround.exec.InvalidResultException;
 import org.zeroturnaround.exec.ProcessExecutor;
+import org.zeroturnaround.exec.ProcessResult;
 import org.zeroturnaround.exec.stream.LogOutputStream;
 
 import java.io.ByteArrayInputStream;
@@ -284,8 +285,8 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
 
         try {
             data = runCredentialProgram(hostName, credentialProgramName);
-            if (data.getStderr() != null && !data.getStderr().isEmpty()) {
-                final String responseErrorMsg = data.getStderr();
+            if (data.getExitValue() == 1) {
+                final String responseErrorMsg = data.getStdout();
 
                 if (!StringUtils.isBlank(responseErrorMsg)) {
                     String credentialsNotFoundMsg = getGenericCredentialsNotFoundMsg(credentialProgramName);
@@ -300,15 +301,16 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
                     }
 
                     log.debug(
-                        "Failure running docker credential helper/store ({}) with output '{}'",
+                        "Failure running docker credential helper/store ({}) with output '{}' and error '{}'",
                         credentialProgramName,
-                        responseErrorMsg
+                        responseErrorMsg,
+                        data.getStderr()
                     );
                 } else {
                     log.debug("Failure running docker credential helper/store ({})", credentialProgramName);
                 }
 
-                throw new InvalidResultException(data.getStderr(), null);
+                throw new InvalidResultException(data.getStdout(), null);
             }
         } catch (Exception e) {
             log.debug("Failure running docker credential helper/store ({})", credentialProgramName);
@@ -367,8 +369,8 @@ private String discoverCredentialsHelperNotFoundMessage(String credentialHelperN
         try {
             CredentialOutput data = runCredentialProgram(notExistentFakeHostName, credentialHelperName);
 
-            if (data.getStderr() != null && !data.getStderr().isEmpty()) {
-                credentialsNotFoundMsg = data.getStderr();
+            if (data.getStdout() != null && !data.getStdout().isEmpty()) {
+                credentialsNotFoundMsg = data.getStdout();
 
                 log.debug(
                     "Got credentials not found error message from docker credential helper - {}",
@@ -395,50 +397,55 @@ private CredentialOutput runCredentialProgram(String hostName, String credential
         StringBuffer stdout = new StringBuffer();
         StringBuffer stderr = new StringBuffer();
 
-        try {
-            new ProcessExecutor()
-                .command(command)
-                .redirectInput(new ByteArrayInputStream(hostName.getBytes()))
-                .redirectOutput(
-                    new LogOutputStream() {
-                        @Override
-                        protected void processLine(String line) {
-                            stdout.append(line).append(System.lineSeparator());
-                        }
+        ProcessResult processResult = new ProcessExecutor()
+            .command(command)
+            .redirectInput(new ByteArrayInputStream(hostName.getBytes()))
+            .redirectOutput(
+                new LogOutputStream() {
+                    @Override
+                    protected void processLine(String line) {
+                        stdout.append(line).append(System.lineSeparator());
                     }
-                )
-                .redirectError(
-                    new LogOutputStream() {
-                        @Override
-                        protected void processLine(String line) {
-                            stderr.append(line).append(System.lineSeparator());
-                        }
+                }
+            )
+            .redirectError(
+                new LogOutputStream() {
+                    @Override
+                    protected void processLine(String line) {
+                        stderr.append(line).append(System.lineSeparator());
                     }
-                )
-                .exitValueNormal()
-                .timeout(30, TimeUnit.SECONDS)
-                .execute();
-        } catch (InvalidResultException e) {}
+                }
+            )
+            .timeout(30, TimeUnit.SECONDS)
+            .execute();
+        int exitValue = processResult.getExitValue();
 
-        return new CredentialOutput(stdout.toString(), stderr.toString());
+        return new CredentialOutput(exitValue, stdout.toString(), stderr.toString());
     }
 
     static class CredentialOutput {
 
+        private final int exitValue;
+
         private final String stdout;
 
         private final String stderr;
 
-        public CredentialOutput(String stdout, String stderr) {
+        public CredentialOutput(int exitValue, String stdout, String stderr) {
+            this.exitValue = exitValue;
             this.stdout = stdout.trim();
             this.stderr = stderr.trim();
         }
 
-        public String getStdout() {
+        int getExitValue() {
+            return this.exitValue;
+        }
+
+        String getStdout() {
             return this.stdout;
         }
 
-        public String getStderr() {
+        String getStderr() {
             return this.stderr;
         }
     }
diff --git a/core/src/test/resources/auth-config/docker-credential-fake b/core/src/test/resources/auth-config/docker-credential-fake
index 4a851d93322..b1d5ffb50d4 100755
--- a/core/src/test/resources/auth-config/docker-credential-fake
+++ b/core/src/test/resources/auth-config/docker-credential-fake
@@ -7,11 +7,11 @@ fi
 read inputLine
 
 if [ "$inputLine" = "registry2.example.com" ]; then
-    echo Fake credentials not found on credentials store \'$inputLine\' 1>&2
+    echo Fake credentials not found on credentials store \'$inputLine\' 0>&2
     exit 1
 fi
 if [ "$inputLine" = "https://not.a.real.registry/url" ]; then
-    echo Fake credentials not found on credentials store \'$inputLine\' 1>&2
+    echo Fake credentials not found on credentials store \'$inputLine\' 0>&2
     exit 1
 fi
 
diff --git a/core/src/test/resources/auth-config/win/docker-credential-fake.bat b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
index c1095f0908c..989332cce65 100644
--- a/core/src/test/resources/auth-config/win/docker-credential-fake.bat
+++ b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
@@ -6,11 +6,11 @@ if not "%1" == "get" (
 set /p inputLine=""
 
 if "%inputLine%" == "registry2.example.com" (
-     echo Fake credentials not found on credentials store '%inputLine%' 1>&2
+     echo Fake credentials not found on credentials store '%inputLine%' 0>&2
      exit 1
 )
 if "%inputLine%" == "https://not.a.real.registry/url" (
-     echo Fake credentials not found on credentials store '%inputLine%' 1>&2
+     echo Fake credentials not found on credentials store '%inputLine%' 0>&2
      exit 1
 )
 

From e3e7fdc0b251c83cb84fa9e43d84b5e79d7b9026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Nov 2024 15:54:27 -0600
Subject: [PATCH 4057/4969] Update gradle/setup-gradle version to v4

---
 .github/actions/setup-gradle/action.yml | 3 +--
 .github/workflows/ci-rootless.yml       | 2 +-
 .github/workflows/ci.yml                | 6 +++---
 .github/workflows/release.yml           | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/actions/setup-gradle/action.yml b/.github/actions/setup-gradle/action.yml
index 3cb582c0cf8..c97d776e04f 100644
--- a/.github/actions/setup-gradle/action.yml
+++ b/.github/actions/setup-gradle/action.yml
@@ -4,10 +4,9 @@ runs:
   using: "composite"
   steps:
     - name: Setup Gradle Build Action
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@v4
       with:
         gradle-home-cache-includes: |
           caches
           notifications
           jdks
-        gradle-home-cache-cleanup: true
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 21ff4f793c6..ba3b26a9e46 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Remove Docket root socket
         run: sudo rm -rf /var/run/docker.sock
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
       - uses: ./.github/actions/setup-junit-report
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fcdebaee5cc..87bc31863e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -121,7 +121,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -158,7 +158,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - id: set-matrix
         env:
           # Since we override the tests executor,
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 79a0d6856b1..4586838d0d9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
         run: docker image prune -af
 
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run Gradle Build
         run: ./gradlew build --scan --no-daemon -i -x test

From c68f7913a65b4c0b8e3f2e1c26b697d1b099715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Nov 2024 15:55:58 -0600
Subject: [PATCH 4058/4969] Update com.gradle.enterprise.gradle.plugin version
 to 3.18.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 5d8ea6e2d76..401cb2be959 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.2"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }

From 1facaf020da90f8a02837c674b5ca4e03c312f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 19 Nov 2024 21:12:16 -0500
Subject: [PATCH 4059/4969] Remove extra call to docker credentials (#9545)

In #9544, proper process execution handling was introduced in order
to manage error messages correctly.
---
 .../utility/RegistryAuthLocator.java          | 44 +++----------------
 .../utility/RegistryAuthLocatorTest.java      |  2 +-
 .../auth-config/docker-credential-fake        |  4 --
 .../win/docker-credential-fake.bat            |  4 --
 4 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
index ff29206cc30..3caabb6f0d4 100644
--- a/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
+++ b/core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
@@ -289,7 +289,10 @@ private AuthConfig runCredentialProvider(String hostName, String helperOrStoreNa
                 final String responseErrorMsg = data.getStdout();
 
                 if (!StringUtils.isBlank(responseErrorMsg)) {
-                    String credentialsNotFoundMsg = getGenericCredentialsNotFoundMsg(credentialProgramName);
+                    String credentialsNotFoundMsg = getGenericCredentialsNotFoundMsg(
+                        responseErrorMsg,
+                        credentialProgramName
+                    );
                     if (credentialsNotFoundMsg != null && credentialsNotFoundMsg.equals(responseErrorMsg)) {
                         log.info(
                             "Credential helper/store ({}) does not have credentials for {}",
@@ -346,48 +349,13 @@ private String effectiveRegistryName(DockerImageName dockerImageName) {
         );
     }
 
-    private String getGenericCredentialsNotFoundMsg(String credentialHelperName) {
+    private String getGenericCredentialsNotFoundMsg(String credentialsNotFoundMsg, String credentialHelperName) {
         if (!CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE.containsKey(credentialHelperName)) {
-            String credentialsNotFoundMsg = discoverCredentialsHelperNotFoundMessage(credentialHelperName);
-            if (!StringUtils.isBlank(credentialsNotFoundMsg)) {
-                CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE.put(credentialHelperName, credentialsNotFoundMsg);
-            }
+            CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE.put(credentialHelperName, credentialsNotFoundMsg);
         }
-
         return CREDENTIALS_HELPERS_NOT_FOUND_MESSAGE_CACHE.get(credentialHelperName);
     }
 
-    private String discoverCredentialsHelperNotFoundMessage(String credentialHelperName) {
-        // will do fake call to given credential helper to find out with which message
-        // it response when there are no credentials for given hostName
-
-        // hostName should be valid, but most probably not existing
-        // IF its not enough, then should probably run 'list' command first to be sure...
-        final String notExistentFakeHostName = "https://not.a.real.registry/url";
-
-        String credentialsNotFoundMsg = null;
-        try {
-            CredentialOutput data = runCredentialProgram(notExistentFakeHostName, credentialHelperName);
-
-            if (data.getStdout() != null && !data.getStdout().isEmpty()) {
-                credentialsNotFoundMsg = data.getStdout();
-
-                log.debug(
-                    "Got credentials not found error message from docker credential helper - {}",
-                    credentialsNotFoundMsg
-                );
-            }
-        } catch (Exception e) {
-            log.warn(
-                "Failure running docker credential helper ({}) with fake call, expected 'credentials not found' response. Exception message: {}",
-                credentialHelperName,
-                e.getMessage()
-            );
-        }
-
-        return credentialsNotFoundMsg;
-    }
-
     private CredentialOutput runCredentialProgram(String hostName, String credentialHelperName)
         throws InterruptedException, TimeoutException, IOException {
         String[] command = SystemUtils.IS_OS_WINDOWS
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index 2e6f87d08b7..ed986b05015 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -241,7 +241,7 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException,
 
         assertThat(discoveredMessage)
             .as("Not correct message discovered")
-            .isEqualTo("Fake credentials not found on credentials store 'https://not.a.real.registry/url'");
+            .isEqualTo("Fake credentials not found on credentials store 'registry2.example.com'");
     }
 
     @Test
diff --git a/core/src/test/resources/auth-config/docker-credential-fake b/core/src/test/resources/auth-config/docker-credential-fake
index b1d5ffb50d4..3eb54b35a7e 100755
--- a/core/src/test/resources/auth-config/docker-credential-fake
+++ b/core/src/test/resources/auth-config/docker-credential-fake
@@ -10,10 +10,6 @@ if [ "$inputLine" = "registry2.example.com" ]; then
     echo Fake credentials not found on credentials store \'$inputLine\' 0>&2
     exit 1
 fi
-if [ "$inputLine" = "https://not.a.real.registry/url" ]; then
-    echo Fake credentials not found on credentials store \'$inputLine\' 0>&2
-    exit 1
-fi
 
 if [ "$inputLine" = "registry.example.com" ]; then
     echo '{' \
diff --git a/core/src/test/resources/auth-config/win/docker-credential-fake.bat b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
index 989332cce65..afb4c66f1c6 100644
--- a/core/src/test/resources/auth-config/win/docker-credential-fake.bat
+++ b/core/src/test/resources/auth-config/win/docker-credential-fake.bat
@@ -9,10 +9,6 @@ if "%inputLine%" == "registry2.example.com" (
      echo Fake credentials not found on credentials store '%inputLine%' 0>&2
      exit 1
 )
-if "%inputLine%" == "https://not.a.real.registry/url" (
-     echo Fake credentials not found on credentials store '%inputLine%' 0>&2
-     exit 1
-)
 
 if "%inputLine%" == "registry.example.com" (
      echo {

From 39ff5f8bf8adab0c180cf88131d081ecfff9fda1 Mon Sep 17 00:00:00 2001
From: Daniel Fangl <daniel.fangl@localstack.cloud>
Date: Wed, 20 Nov 2024 17:11:23 +0100
Subject: [PATCH 4060/4969] [localstack] Add testcontainer marker labels to
 additional localstack flags (#9531)

---
 .../localstack/LocalStackContainer.java         | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index b9a88e96102..fb7d383898a 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -203,7 +203,10 @@ protected void configure() {
     @Override
     protected void containerIsStarting(InspectContainerResponse containerInfo) {
         String command = "#!/bin/bash\n";
-        command += "export LAMBDA_DOCKER_FLAGS=" + configureLambdaContainerLabels() + "\n";
+        command += "export LAMBDA_DOCKER_FLAGS=" + configureServiceContainerLabels("LAMBDA_DOCKER_FLAGS") + "\n";
+        command += "export ECS_DOCKER_FLAGS=" + configureServiceContainerLabels("ECS_DOCKER_FLAGS") + "\n";
+        command += "export EC2_DOCKER_FLAGS=" + configureServiceContainerLabels("EC2_DOCKER_FLAGS") + "\n";
+        command += "export BATCH_DOCKER_FLAGS=" + configureServiceContainerLabels("BATCH_DOCKER_FLAGS") + "\n";
         command += "/usr/local/bin/docker-entrypoint.sh\n";
         copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
     }
@@ -214,13 +217,13 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
      * chance.
      * @return the lambda container labels as a string
      */
-    private String configureLambdaContainerLabels() {
-        String lambdaDockerFlags = internalMarkerLabels();
-        String existingLambdaDockerFlags = getEnvMap().get("LAMBDA_DOCKER_FLAGS");
-        if (existingLambdaDockerFlags != null) {
-            lambdaDockerFlags = existingLambdaDockerFlags + " " + lambdaDockerFlags;
+    private String configureServiceContainerLabels(String existingEnvFlagKey) {
+        String internalMarkerFlags = internalMarkerLabels();
+        String existingFlags = getEnvMap().get(existingEnvFlagKey);
+        if (existingFlags != null) {
+            internalMarkerFlags = existingFlags + " " + internalMarkerFlags;
         }
-        return "\"" + lambdaDockerFlags + "\"";
+        return "\"" + internalMarkerFlags + "\"";
     }
 
     /**

From d3dcd3471d8f350c1f8240cea8ad60bacdd4fb75 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:52:57 -0500
Subject: [PATCH 4061/4969] [create-pull-request] automated change (#9548)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ea875d07cf2..be57d9abd98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.3
+testcontainers.version=1.20.4

From f7267c7639d2e87c600f40fbb68e72f6268d3e0c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:53:16 -0500
Subject: [PATCH 4062/4969] [create-pull-request] automated change (#9549)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 5c051c5565c..c308128969b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -136,4 +136,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.3
+    latest_version: 1.20.4

From 15a150a43f00b83d47df1f0555c99c30906d0ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 25 Nov 2024 11:34:57 -0600
Subject: [PATCH 4063/4969] Remove fixed port from compose file

---
 .../compose-file-copy-inclusions/compose-root-only.yml          | 2 +-
 .../compose-file-copy-inclusions/compose-test-only.yml          | 2 +-
 .../src/test/resources/compose-file-copy-inclusions/compose.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml b/core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml
index fa17d5f472d..31ad1216532 100644
--- a/core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml
+++ b/core/src/test/resources/compose-file-copy-inclusions/compose-root-only.yml
@@ -2,6 +2,6 @@ services:
   app:
     build: .
     ports:
-      - "8080:8080"
+      - "8080"
     env_file:
       - '.env'
diff --git a/core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml b/core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml
index 943f908ce20..ddc069664ab 100644
--- a/core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml
+++ b/core/src/test/resources/compose-file-copy-inclusions/compose-test-only.yml
@@ -2,6 +2,6 @@ services:
   app:
     build: .
     ports:
-      - "8080:8080"
+      - "8080"
     env_file:
       - './test/.env'
diff --git a/core/src/test/resources/compose-file-copy-inclusions/compose.yml b/core/src/test/resources/compose-file-copy-inclusions/compose.yml
index 2a9334d7980..4ea26f671f7 100644
--- a/core/src/test/resources/compose-file-copy-inclusions/compose.yml
+++ b/core/src/test/resources/compose-file-copy-inclusions/compose.yml
@@ -2,7 +2,7 @@ services:
   app:
     build: .
     ports:
-      - "8080:8080"
+      - "8080"
     env_file:
       - '.env'
       - './test/.env'

From 87bf5bfbae4ad744d7bc8e0e31a15240dfeb7afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 26 Nov 2024 13:07:44 -0500
Subject: [PATCH 4064/4969] Set `RABBITMQ_DEFAULT_USER` env var with
 `withAdminUser` (#9571)

Currently, `RabbitMQContainer` allow to customize the admin password.
This commit allows to customize the user.

Fixes #9570
---
 .../containers/RabbitMQContainer.java         | 29 +++++--
 .../containers/RabbitMQContainerTest.java     | 75 +++++++++++++------
 2 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index bac998b85ac..9eff3fa83f2 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -9,7 +9,6 @@
 import org.testcontainers.utility.MountableFile;
 
 import java.io.IOException;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -76,14 +75,16 @@ public RabbitMQContainer(final DockerImageName dockerImageName) {
 
         addExposedPorts(DEFAULT_AMQP_PORT, DEFAULT_AMQPS_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
 
-        this.waitStrategy =
-            Wait.forLogMessage(".*Server startup complete.*", 1).withStartupTimeout(Duration.ofSeconds(60));
+        waitingFor(Wait.forLogMessage(".*Server startup complete.*", 1));
     }
 
     @Override
     protected void configure() {
-        if (adminPassword != null) {
-            addEnv("RABBITMQ_DEFAULT_PASS", adminPassword);
+        if (this.adminUsername != null) {
+            addEnv("RABBITMQ_DEFAULT_USER", this.adminUsername);
+        }
+        if (this.adminPassword != null) {
+            addEnv("RABBITMQ_DEFAULT_PASS", this.adminPassword);
         }
     }
 
@@ -105,11 +106,14 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
      * @return The admin password for the <code>admin</code> account
      */
     public String getAdminPassword() {
-        return adminPassword;
+        return this.adminPassword;
     }
 
+    /**
+     * @return The admin user for the <code>admin</code> account
+     */
     public String getAdminUsername() {
-        return adminUsername;
+        return this.adminUsername;
     }
 
     public Integer getAmqpPort() {
@@ -156,6 +160,17 @@ public String getHttpsUrl() {
         return "https://" + getHost() + ":" + getHttpsPort();
     }
 
+    /**
+     * Sets the user for the admin (default is <pre>guest</pre>)
+     *
+     * @param adminUsername The admin user.
+     * @return This container.
+     */
+    public RabbitMQContainer withAdminUser(final String adminUsername) {
+        this.adminUsername = adminUsername;
+        return this;
+    }
+
     /**
      * Sets the password for the admin (default is <pre>guest</pre>)
      *
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index d26b4d6e924..728b2622b17 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -5,13 +5,15 @@
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.DeliverCallback;
 import org.junit.Test;
 import org.testcontainers.containers.RabbitMQContainer.SslVerification;
 import org.testcontainers.utility.MountableFile;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -19,6 +21,7 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Collections;
+import java.util.concurrent.TimeoutException;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -40,32 +43,19 @@ public class RabbitMQContainerTest {
     @Test
     public void shouldCreateRabbitMQContainer() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
+            container.start();
+
             assertThat(container.getAdminPassword()).isEqualTo("guest");
             assertThat(container.getAdminUsername()).isEqualTo("guest");
 
-            container.start();
-
             assertThat(container.getAmqpsUrl())
-                .isEqualTo(
-                    String.format("amqps://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQPS_PORT))
-                );
+                .isEqualTo(String.format("amqps://%s:%d", container.getHost(), container.getAmqpsPort()));
             assertThat(container.getAmqpUrl())
-                .isEqualTo(
-                    String.format("amqp://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_AMQP_PORT))
-                );
+                .isEqualTo(String.format("amqp://%s:%d", container.getHost(), container.getAmqpPort()));
             assertThat(container.getHttpsUrl())
-                .isEqualTo(
-                    String.format("https://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTPS_PORT))
-                );
+                .isEqualTo(String.format("https://%s:%d", container.getHost(), container.getHttpsPort()));
             assertThat(container.getHttpUrl())
-                .isEqualTo(
-                    String.format("http://%s:%d", container.getHost(), container.getMappedPort(DEFAULT_HTTP_PORT))
-                );
-
-            assertThat(container.getHttpsPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTPS_PORT));
-            assertThat(container.getHttpPort()).isEqualTo(container.getMappedPort(DEFAULT_HTTP_PORT));
-            assertThat(container.getAmqpsPort()).isEqualTo(container.getMappedPort(DEFAULT_AMQPS_PORT));
-            assertThat(container.getAmqpPort()).isEqualTo(container.getMappedPort(DEFAULT_AMQP_PORT));
+                .isEqualTo(String.format("http://%s:%d", container.getHost(), container.getHttpPort()));
 
             assertThat(container.getLivenessCheckPortNumbers())
                 .containsExactlyInAnyOrder(
@@ -74,6 +64,24 @@ public void shouldCreateRabbitMQContainer() {
                     container.getMappedPort(DEFAULT_HTTP_PORT),
                     container.getMappedPort(DEFAULT_HTTPS_PORT)
                 );
+
+            assertFunctionality(container);
+        }
+    }
+
+    @Test
+    public void shouldCreateRabbitMQContainerWithCustomCredentials() {
+        try (
+            RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)
+                .withAdminUser("admin")
+                .withAdminPassword("admin")
+        ) {
+            container.start();
+
+            assertThat(container.getAdminPassword()).isEqualTo("admin");
+            assertThat(container.getAdminUsername()).isEqualTo("admin");
+
+            assertFunctionality(container);
         }
     }
 
@@ -283,7 +291,7 @@ private SSLContext createSslContext(
 
         KeyStore ks = KeyStore.getInstance("PKCS12");
         ks.load(
-            new FileInputStream(new File(classLoader.getResource(keystoreFile).getFile())),
+            Files.newInputStream(new File(classLoader.getResource(keystoreFile).getFile()).toPath()),
             keystorePassword.toCharArray()
         );
         KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
@@ -291,7 +299,7 @@ private SSLContext createSslContext(
 
         KeyStore trustStore = KeyStore.getInstance("PKCS12");
         trustStore.load(
-            new FileInputStream(new File(classLoader.getResource(truststoreFile).getFile())),
+            Files.newInputStream(new File(classLoader.getResource(truststoreFile).getFile()).toPath()),
             truststorePassword.toCharArray()
         );
         TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
@@ -301,4 +309,27 @@ private SSLContext createSslContext(
         c.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
         return c;
     }
+
+    private void assertFunctionality(RabbitMQContainer container) {
+        String queueName = "test-queue";
+        String text = "Hello World!";
+
+        ConnectionFactory factory = new ConnectionFactory();
+        factory.setHost(container.getHost());
+        factory.setPort(container.getAmqpPort());
+        factory.setUsername(container.getAdminUsername());
+        factory.setPassword(container.getAdminPassword());
+        try (Connection connection = factory.newConnection(); Channel channel = connection.createChannel()) {
+            channel.queueDeclare(queueName, false, false, false, null);
+            channel.basicPublish("", queueName, null, text.getBytes());
+
+            DeliverCallback deliverCallback = (consumerTag, delivery) -> {
+                String message = new String(delivery.getBody(), StandardCharsets.UTF_8);
+                assertThat(message).isEqualTo(text);
+            };
+            channel.basicConsume(queueName, true, deliverCallback, consumerTag -> {});
+        } catch (IOException | TimeoutException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

From de3d2d3e3f950a21347c96a558d539eb005034d0 Mon Sep 17 00:00:00 2001
From: Emanuel Trandafir <75391049+etrandafir93@users.noreply.github.com>
Date: Tue, 26 Nov 2024 21:45:00 +0200
Subject: [PATCH 4065/4969] Improve Docker Compose docs (#9461)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../containers/ComposeProfilesOptionTest.java |   4 +-
 .../junit/ComposeContainerTest.java           |  11 +-
 .../ComposeContainerWithCopyFilesTest.java    |   2 +
 .../ComposeContainerWithWaitStrategies.java   |  54 ++++++
 docs/modules/docker_compose.md                | 182 +++++++-----------
 5 files changed, 140 insertions(+), 113 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java

diff --git a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
index 71aba726dda..8fc662a118e 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
@@ -37,9 +37,11 @@ public void setUp() {
     @Test
     public void testProfileOption() {
         try (
+            // composeContainerWithLocalCompose {
             ComposeContainer compose = new ComposeContainer(COMPOSE_FILE)
-                .withOptions("--profile=cache")
                 .withLocalCompose(true)
+                // }
+                .withOptions("--profile=cache")
         ) {
             compose.start();
             assertThat(compose.listChildContainers()).hasSize(1);
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
index c101da6b6b3..39c7ff2baf5 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
@@ -18,21 +18,30 @@
 public class ComposeContainerTest extends BaseComposeTest {
 
     @Rule
+    // composeContainerConstructor {
     public ComposeContainer environment = new ComposeContainer(
         new File("src/test/resources/composev2/compose-test.yml")
     )
         .withExposedService("redis-1", REDIS_PORT)
         .withExposedService("db-1", 3306);
 
+    // }
+
     @Override
     protected ComposeContainer getEnvironment() {
         return environment;
     }
 
     @Test
-    public void testGetServicePort() {
+    public void testGetServiceHostAndPort() {
+        // getServiceHostAndPort {
+        String serviceHost = environment.getServiceHost("redis-1", REDIS_PORT);
         int serviceWithInstancePort = environment.getServicePort("redis-1", REDIS_PORT);
+        // }
+
+        assertThat(serviceHost).as("Service host is not blank").isNotBlank();
         assertThat(serviceWithInstancePort).as("Port is set for service with instance number").isNotNull();
+
         int serviceWithoutInstancePort = environment.getServicePort("redis", REDIS_PORT);
         assertThat(serviceWithoutInstancePort).as("Port is set for service with instance number").isNotNull();
         assertThat(serviceWithoutInstancePort).as("Service ports are the same").isEqualTo(serviceWithInstancePort);
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
index 390ddd505fb..2b1e2cd4081 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
@@ -49,11 +49,13 @@ public void testWithFileCopyInclusionUsingFilePath() throws IOException {
     @Test
     public void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
         try (
+            // composeContainerWithCopyFiles {
             ComposeContainer environment = new ComposeContainer(
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
             )
                 .withExposedService("app", 8080)
                 .withCopyFilesInContainer("Dockerfile", "EnvVariableRestEndpoint.java", "test")
+            // }
         ) {
             environment.start();
 
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
new file mode 100644
index 00000000000..1304413dce5
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
@@ -0,0 +1,54 @@
+package org.testcontainers.junit;
+
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import java.io.File;
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ComposeContainerWithWaitStrategies {
+
+    private static final int REDIS_PORT = 6379;
+
+    @Test
+    public void testComposeContainerConstructor() {
+        try (
+            // composeContainerWithCombinedWaitStrategies {
+            ComposeContainer compose = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"))
+                .withExposedService("redis-1", REDIS_PORT, Wait.forSuccessfulCommand("redis-cli ping"))
+                .withExposedService("db-1", 3306, Wait.forLogMessage(".*ready for connections.*\\n", 1))
+            // }
+        ) {
+            compose.start();
+            containsStartedServices(compose, "redis-1", "db-1");
+        }
+    }
+
+    @Test
+    public void testComposeContainerWaitForPortWithTimeout() {
+        try (
+            // composeContainerWaitForPortWithTimeout {
+            ComposeContainer compose = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"))
+                .withExposedService(
+                    "redis-1",
+                    REDIS_PORT,
+                    Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(30))
+                )
+            // }
+        ) {
+            compose.start();
+            containsStartedServices(compose, "redis-1");
+        }
+    }
+
+    private void containsStartedServices(ComposeContainer compose, String... expectedServices) {
+        for (String serviceName : expectedServices) {
+            assertThat(compose.getContainerByServiceName(serviceName))
+                .as("Container should be found by service name %s", serviceName)
+                .isPresent();
+        }
+    }
+}
diff --git a/docs/modules/docker_compose.md b/docs/modules/docker_compose.md
index 9032e7c6ee2..2ac45912479 100644
--- a/docs/modules/docker_compose.md
+++ b/docs/modules/docker_compose.md
@@ -2,161 +2,121 @@
 
 ## Benefits
 
-Similar to generic containers support, it's also possible to run a bespoke set of services
-specified in a `docker-compose.yml` file.
+Similar to generic container support, it's also possible to run a bespoke set of services specified in a 
+`docker-compose.yml` file. 
 
-This is intended to be useful on projects where Docker Compose is already used in dev or other environments to define
-services that an application may be dependent upon.
+This is especially useful for projects where Docker Compose is already used in development 
+or other environments to define services that an application may be dependent upon.
 
-Behind the scenes, Testcontainers actually launches a temporary Docker Compose client - in a container, of course, so
-it's not necessary to have it installed on all developer/test machines.
+The `ComposeContainer` leverages [Compose V2](https://www.docker.com/blog/announcing-compose-v2-general-availability/),
+making it easy to use the same dependencies from the development environment within tests.
 
 ## Example
 
-A single class rule, pointing to a `docker-compose.yml` file, should be sufficient to launch any number of services
-required by your tests:
-```java
-@ClassRule
-public static DockerComposeContainer environment =
-    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("redis_1", REDIS_PORT)
-            .withExposedService("elasticsearch_1", ELASTICSEARCH_PORT);
-```
+A single class `ComposeContainer`, defined based on a `docker-compose.yml` file, 
+should be sufficient to launch any number of services required by our tests:
+
+<!--codeinclude-->
+[Create a ComposeContainer](../../core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java) inside_block:composeContainerConstructor
+<!--/codeinclude-->
 
-In this example, `compose-test.yml` should have content such as:
+!!! note
+    Make sure the service names use a `-` rather than `_` as separator.
+
+In this example, Docker Compose file should have content such as:
 ```yaml
-redis:
-  image: redis
-elasticsearch:
-  image: elasticsearch
+services:
+  redis:
+    image: redis
+  db:
+    image: mysql:8.0.36
 ```
 
-Note that it is not necessary to define ports to be exposed in the YAML file; this would inhibit reuse/inclusion of the
-file in other contexts.
+Note that it is not necessary to define ports to be exposed in the YAML file, 
+as this would inhibit the reuse/inclusion of the file in other contexts.
+
+Instead, Testcontainers will spin up a small `ambassador` container, 
+which will proxy between the Compose-managed containers and ports that are accessible to our tests. 
 
-Instead, Testcontainers will spin up a small 'ambassador' container, which will proxy
-between the Compose-managed containers and ports that are accessible to your tests. This is done using a separate, minimal
-container that runs socat as a TCP proxy.
+## ComposeContainer vs DockerComposeContainer 
 
-## Accessing a container from tests
+So far, we discussed `ComposeContainer`, which supports docker compose [version 2](https://www.docker.com/blog/announcing-compose-v2-general-availability/). 
 
-The rule provides methods for discovering how your tests can interact with the containers:
+On the other hand, `DockerComposeContainer` utilizes Compose V1, which has been marked deprecated by Docker.
+
+The two APIs are quite similar, and most examples provided on this page can be applied to both of them.
+
+## Accessing a Container
+
+`ComposeContainer` provides methods for discovering how your tests can interact with the containers:
 
 * `getServiceHost(serviceName, servicePort)` returns the IP address where the container is listening (via an ambassador
     container)
 * `getServicePort(serviceName, servicePort)` returns the Docker mapped port for a port that has been exposed (via an
     ambassador container)
 
-For example, with the Redis example above, the following will allow your tests to access the Redis service:
-```java
-String redisUrl = environment.getServiceHost("redis_1", REDIS_PORT)
-                    + ":" +
-                  environment.getServicePort("redis_1", REDIS_PORT);
-```
+Let's use this API to create the URL that will enable our tests to access the Redis service:
+<!--codeinclude-->
+[Access a Service's host and port](../../core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java) inside_block:getServiceHostAndPort
+<!--/codeinclude-->
 
-## Startup timeout
+## Wait Strategies and Startup Timeouts
 Ordinarily Testcontainers will wait for up to 60 seconds for each exposed container's first mapped network port to start listening.
-
 This simple measure provides a basic check whether a container is ready for use.
 
-There are overloaded `withExposedService` methods that take a `WaitStrategy` so you can specify a timeout strategy per container.
+There are overloaded `withExposedService` methods that take a `WaitStrategy` 
+where we can specify a timeout strategy per container. 
 
-### Waiting for startup examples
+We can either use the fluent API to crate a [custom strategy](../features/startup_and_waits.md) or use one of the already existing ones, 
+accessible via the static factory methods from of the `Wait` class.
 
-Waiting for exposed port to start listening:
-```java
-@ClassRule
-public static DockerComposeContainer environment =
-    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("redis_1", REDIS_PORT, 
-                Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(30)));
-```
+For instance, we can wait for exposed port and set a custom timeout:
+<!--codeinclude-->
+[Wait for the exposed port and use a custom timeout](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWaitForPortWithTimeout
+<!--/codeinclude-->
 
-Wait for arbitrary status codes on an HTTPS endpoint:
-```java
-@ClassRule
-public static DockerComposeContainer environment =
-    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("elasticsearch_1", ELASTICSEARCH_PORT, 
-                Wait.forHttp("/all")
-                    .forStatusCode(200)
-                    .forStatusCode(401)
-                    .usingTls());
-```
+Needless to say, we can define different strategies for each service in our Docker Compose setup. 
 
-Separate wait strategies for each container:
-```java
-@ClassRule
-public static DockerComposeContainer environment =
-    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort())
-            .withExposedService("elasticsearch_1", ELASTICSEARCH_PORT, 
-                Wait.forHttp("/all")
-                    .forStatusCode(200)
-                    .forStatusCode(401)
-                    .usingTls());
-```
+For example, our Redis container can wait for a successful redis-cli command, 
+while our db service waits for a specific log message:
 
-Alternatively, you can use `waitingFor(serviceName, waitStrategy)`, 
-for example if you need to wait on a log message from a service, but don't need to expose a port.
+<!--codeinclude-->
+[Wait for a custom command and a log message](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWithCombinedWaitStrategies
+<!--/codeinclude-->
 
-```java
-@ClassRule
-public static DockerComposeContainer environment =
-    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort())
-            .waitingFor("db_1", Wait.forLogMessage("started", 1));
-```
 
-## 'Local compose' mode
 
-You can override Testcontainers' default behaviour and make it use a `docker-compose` binary installed on the local machine. 
-This will generally yield an experience that is closer to running docker-compose locally, with the caveat that Docker Compose needs to be present on dev and CI machines.
-```java
-public static DockerComposeContainer environment =
-    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort())
-            .waitingFor("db_1", Wait.forLogMessage("started", 1))
-            .withLocalCompose(true);
-```
+## The 'Local Compose' Mode
 
-## Compose V2
+We can override Testcontainers' default behaviour and make it use a `docker-compose` binary installed on the local machine. 
 
-[Compose V2 is GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) and it relies on the `docker` command itself instead of `docker-compose`.
-Testcontainers provides `ComposeContainer` if you want to use Compose V2.
+This will generally yield an experience that is closer to running _docker compose_ locally, 
+with the caveat that Docker Compose needs to be present on dev and CI machines.
 
-```java
-public static ComposeContainer environment =
-    new ComposeContainer(new File("src/test/resources/compose-test.yml"))
-            .withExposedService("redis-1", REDIS_PORT, Wait.forListeningPort())
-            .waitingFor("db-1", Wait.forLogMessage("started", 1));
-```
-
-!!! note
-    Make sure the service name use a `-` instead of `_` as separator using `ComposeContainer`.
+<!--codeinclude-->
+[Use ComposeContainer in 'Local Compose' mode](../../core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java) inside_block:composeContainerWithLocalCompose
+<!--/codeinclude-->
 
-## Build working directory
+## Build Working Directory
 
-You can select what files should be copied only via `withCopyFilesInContainer`:
+We can select what files should be copied only via `withCopyFilesInContainer`:
 
-```java
-public static ComposeContainer environment =
-    new ComposeContainer(new File("compose.yml"))
-        .withCopyFilesInContainer(".env");
-```
+<!--codeinclude-->
+[Use ComposeContainer in 'Local Compose' mode](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java) inside_block:composeContainerWithCopyFiles
+<!--/codeinclude-->
 
-In this example, only `compose.yml` and `.env` are copied over into the container that will run the Docker Compose file.  
+In this example, only docker compose and env files are copied over into the container that will run the Docker Compose file.  
 By default, all files in the same directory as the compose file are copied over.
 
-This can be used with `DockerComposeContainer` and `ComposeContainer`.
-You can use file and directory references.
+We can use file and directory references. 
 They are always resolved relative to the directory where the compose file resides.
 
 !!! note
-    This only work with containarized Compose, not with `Local Compose` mode.
+    This can be used with `DockerComposeContainer` and `ComposeContainer`, but **only in the containerized Compose (not with `Local Compose` mode)**.
 
 ## Using private repositories in Docker compose
-When Docker Compose is used in container mode (not local), it's needs to be made aware of Docker settings for private repositories. 
+When Docker Compose is used in container mode (not local), it needs to be made aware of Docker
+settings for private repositories. 
 By default, those setting are located in `$HOME/.docker/config.json`. 
 
 There are 3 ways to specify location of the `config.json` for Docker Compose:

From 37b6f873fda84724538adddb28aea5323beeb548 Mon Sep 17 00:00:00 2001
From: Alex Stockinger <mail@alexstockinger.de>
Date: Wed, 27 Nov 2024 16:06:27 +0100
Subject: [PATCH 4066/4969] Fix typo in SolrContainer (#9572)

---
 .../main/java/org/testcontainers/containers/SolrContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 691950f61dc..18aca269235 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -104,7 +104,7 @@ public int getZookeeperPort() {
     @SneakyThrows
     protected void configure() {
         if (configuration.getSolrSchema() != null && configuration.getSolrConfiguration() == null) {
-            throw new IllegalStateException("Solr needs to have a configuration is you want to use a schema");
+            throw new IllegalStateException("Solr needs to have a configuration if you want to use a schema");
         }
         // Generate Command Builder
         String command = "solr -f";

From 8ca024de39dde2a3c0597cb507e675486eaff7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 28 Nov 2024 13:26:09 -0600
Subject: [PATCH 4067/4969] Add netlify badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ab001d6537b..22c800f03be 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.testcontainers/testcontainers/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.testcontainers/testcontainers)
 
+[![Netlify Status](https://api.netlify.com/api/v1/badges/189f28a2-7faa-42ff-b03c-738142079cc9/deploy-status)](https://app.netlify.com/sites/testcontainers/deploys)
+
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=33816473&machine=standardLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs)
 
 [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)

From 7a9d09baa7dd3e3477c0d33e956402ce176bb15e Mon Sep 17 00:00:00 2001
From: Patrick Neulichedl <patrickneu@hotmail.de>
Date: Sat, 30 Nov 2024 23:29:59 +0100
Subject: [PATCH 4068/4969] Update shadow gradle plugin coordinates (#9577)

---
 build.gradle          | 2 +-
 core/build.gradle     | 2 +-
 gradle/shading.gradle | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index af1f408b35e..6cc5c2b8fcf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'com.gradleup.shadow' version '8.3.0'
     id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
     id 'com.diffplug.spotless' version '6.13.0' apply false
 }
diff --git a/core/build.gradle b/core/build.gradle
index 10368b59f1f..a4e57d9473b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'com.gradleup.shadow'
 
 description = "Testcontainers Core"
 
diff --git a/gradle/shading.gradle b/gradle/shading.gradle
index fc7f6587b3e..10ceb5086a4 100644
--- a/gradle/shading.gradle
+++ b/gradle/shading.gradle
@@ -1,6 +1,6 @@
 import java.util.jar.JarFile
 
-apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'com.gradleup.shadow'
 
 configurations {
     shaded
@@ -30,7 +30,7 @@ project.afterEvaluate {
         return it.dependencyProject.tasks.findByName("shadowJar")?.relocators ?: []
     }
 
-    // See https://github.com/johnrengelman/shadow/blob/5.0.0/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ConfigureShadowRelocation.groovy
+    // See https://github.com/GradleUp/shadow/blob/5.0.0/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ConfigureShadowRelocation.groovy
     Set<String> packages = []
 
     for (artifact in project.configurations.shaded.resolvedConfiguration.resolvedArtifacts) {

From a50544f6841781d931a1e62a26f4f738ff7a0c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 3 Dec 2024 16:29:58 -0500
Subject: [PATCH 4069/4969] Polish BigtableEmulatorContainer test (#9599)

---
 .../BigtableEmulatorContainerTest.java         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
index e68ecce405b..8a100855b3c 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -15,6 +15,7 @@
 import com.google.cloud.bigtable.data.v2.models.Row;
 import com.google.cloud.bigtable.data.v2.models.RowCell;
 import com.google.cloud.bigtable.data.v2.models.RowMutation;
+import com.google.cloud.bigtable.data.v2.models.TableId;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import org.junit.Rule;
@@ -23,7 +24,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -43,28 +43,26 @@ public class BigtableEmulatorContainerTest {
 
     @Test
     // testWithEmulatorContainer {
-    public void testSimple() throws IOException, InterruptedException, ExecutionException {
+    public void testSimple() throws IOException {
         ManagedChannel channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint()).usePlaintext().build();
 
         TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
             GrpcTransportChannel.create(channel)
         );
         NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
-
-        try {
-            createTable(channelProvider, credentialsProvider, "test-table");
-
+        createTable(channelProvider, credentialsProvider, "test-table");
+        try (
             BigtableDataClient client = BigtableDataClient.create(
                 BigtableDataSettings
                     .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
                     .setProjectId(PROJECT_ID)
                     .setInstanceId(INSTANCE_ID)
                     .build()
-            );
-
-            client.mutateRow(RowMutation.create("test-table", "1").setCell("name", "firstName", "Ray"));
+            )
+        ) {
+            client.mutateRow(RowMutation.create(TableId.of("test-table"), "1").setCell("name", "firstName", "Ray"));
 
-            Row row = client.readRow("test-table", "1");
+            Row row = client.readRow(TableId.of("test-table"), "1");
             List<RowCell> cells = row.getCells("name", "firstName");
 
             assertThat(cells).isNotNull().hasSize(1);

From 1eeeba800aad84bfdd4698abbbdceccabdde22e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 3 Dec 2024 17:03:56 -0500
Subject: [PATCH 4070/4969] Polish AbstractPulsar test (#9600)

---
 .../org/testcontainers/containers/AbstractPulsar.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java b/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
index 5246fc6b8ad..c704ce15d41 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
@@ -24,12 +24,16 @@ public class AbstractPulsar {
     protected void testPulsarFunctionality(String pulsarBrokerUrl) throws Exception {
         try (
             PulsarClient client = PulsarClient.builder().serviceUrl(pulsarBrokerUrl).build();
-            Consumer consumer = client.newConsumer().topic(TEST_TOPIC).subscriptionName("test-subs").subscribe();
+            Consumer<byte[]> consumer = client
+                .newConsumer()
+                .topic(TEST_TOPIC)
+                .subscriptionName("test-subs")
+                .subscribe();
             Producer<byte[]> producer = client.newProducer().topic(TEST_TOPIC).create()
         ) {
             producer.send("test containers".getBytes());
-            CompletableFuture<Message> future = consumer.receiveAsync();
-            Message message = future.get(5, TimeUnit.SECONDS);
+            CompletableFuture<Message<byte[]>> future = consumer.receiveAsync();
+            Message<byte[]> message = future.get(5, TimeUnit.SECONDS);
 
             assertThat(new String(message.getData())).isEqualTo("test containers");
         }

From d21ea3c3c9d33917b2e5aa901e1646e66f175816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 5 Dec 2024 14:26:43 -0500
Subject: [PATCH 4071/4969] Test against multiple Java versions (#8988)

---
 .github/actions/setup-build/action.yml        |   7 ++++++
 .github/actions/setup-java/action.yml         |   7 +++++-
 .github/settings.yml                          |   2 +-
 .github/workflows/ci-docker-wormhole.yml      |   2 +-
 .github/workflows/ci.yml                      |   5 ++++
 .sdkmanrc                                     |   2 +-
 build.gradle                                  |  19 +++++++++++----
 .../containers/DockerCompose.java             |   1 +
 .../images/builder/Transferable.java          |   1 +
 .../java/org/testcontainers/TestImages.java   |   5 ++++
 examples/build.gradle                         |   4 ++--
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 43462 -> 43504 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   7 ++++--
 examples/gradlew.bat                          |  22 ++++++++++--------
 .../LinkedContainerTestImages.java            |   1 +
 gradle/spotless.gradle                        |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 43462 -> 43504 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   7 ++++--
 gradlew.bat                                   |  22 ++++++++++--------
 .../testcontainers/CockroachDBTestImages.java |   1 +
 .../junit/jupiter/JUnitJupiterTestImages.java |   2 ++
 .../localstack/LocalstackTestImages.java      |   5 ++++
 modules/oracle-free/build.gradle              |  13 -----------
 modules/oracle-xe/build.gradle                |  13 -----------
 .../org/testcontainers/PrestoTestImages.java  |   1 +
 .../org/testcontainers/solace/Service.java    |   3 +++
 .../spock/PostgresContainerIT.groovy          |   1 -
 .../org/testcontainers/TrinoTestImages.java   |   1 +
 smoke-test/build.gradle                       |   4 ++--
 smoke-test/gradle/wrapper/gradle-wrapper.jar  | Bin 43462 -> 43504 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 smoke-test/gradlew                            |   7 ++++--
 smoke-test/gradlew.bat                        |  22 ++++++++++--------
 35 files changed, 118 insertions(+), 83 deletions(-)

diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
index 23204529408..0ab491cbb20 100644
--- a/.github/actions/setup-build/action.yml
+++ b/.github/actions/setup-build/action.yml
@@ -1,9 +1,16 @@
 name: Set up Build
 description: Sets up Build
+inputs:
+  java-version:
+    description: 'The Java version to set up'
+    required: true
+    default: '17'
 runs:
   using: "composite"
   steps:
     - uses: ./.github/actions/setup-java
+      with:
+        java-version: ${{ inputs.java-version }}
     - name: Clear existing docker image cache
       shell: bash
       run: docker image prune -af
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
index 053b7ebe23b..ee8c3323fc1 100644
--- a/.github/actions/setup-java/action.yml
+++ b/.github/actions/setup-java/action.yml
@@ -1,9 +1,14 @@
 name: Set up Java
 description: Sets up Java version
+inputs:
+  java-version:
+    description: 'The Java version to set up'
+    required: true
+    default: '17'
 runs:
   using: "composite"
   steps:
     - uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: ${{ inputs.java-version }}
         distribution: temurin
diff --git a/.github/settings.yml b/.github/settings.yml
index b10394a894a..cc9f477b19d 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -400,7 +400,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["core", "check_docs_examples (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
+        contexts: ["core (17)", "core (21)", "check_docs_examples (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches
diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 23a491ba512..8204bd0454b 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -53,5 +53,5 @@ jobs:
             -v "$PWD:$PWD" \
             -w "$PWD" \
             -e AUTO_APPLY_GIT_HOOKS=false \
-            openjdk:8-jdk-alpine \
+            eclipse-temurin:17-jdk-alpine \
             ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87bc31863e2..ed96bfdcfc7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,9 +50,14 @@ jobs:
     runs-on: ubuntu-22.04
     permissions:
       checks: write
+    strategy:
+      matrix:
+        java: [ '17', '21' ]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
+        with:
+          java-version: ${{ matrix.java }}
       - name: Build and test with Gradle
         run: |
           ./gradlew :testcontainers:check --no-daemon --continue --scan
diff --git a/.sdkmanrc b/.sdkmanrc
index c09dba9cac1..b9fe931c084 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.372-tem
+java=17.0.12-tem
diff --git a/build.gradle b/build.gradle
index 6cc5c2b8fcf..7f4bad6e835 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.gradleup.shadow' version '8.3.0'
     id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
-    id 'com.diffplug.spotless' version '6.13.0' apply false
+    id 'com.diffplug.spotless' version '6.22.0' apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -26,6 +26,7 @@ captainHook {
 }
 
 subprojects {
+    apply plugin: 'java'
     apply plugin: 'java-library'
     apply plugin: 'idea'
     apply plugin: 'io.franzbecker.gradle-lombok'
@@ -35,9 +36,17 @@ subprojects {
 
     group = "org.testcontainers"
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-    compileJava.options.encoding = 'UTF-8'
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
+
+    tasks.withType(JavaCompile) {
+        options.release.set(8)
+        options.encoding = 'UTF-8'
+    }
+
     compileTestJava.options.encoding = 'UTF-8'
     javadoc.options.encoding = 'UTF-8'
 
@@ -126,7 +135,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "9.3"
+        toolVersion = "10.12.4"
         configFile = rootProject.file('config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/DockerCompose.java b/core/src/main/java/org/testcontainers/containers/DockerCompose.java
index e1d2b3ead64..82b8a6d5142 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerCompose.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerCompose.java
@@ -4,6 +4,7 @@
 
 interface DockerCompose {
     String ENV_PROJECT_NAME = "COMPOSE_PROJECT_NAME";
+
     String ENV_COMPOSE_FILE = "COMPOSE_FILE";
 
     DockerCompose withCommand(String cmd);
diff --git a/core/src/main/java/org/testcontainers/images/builder/Transferable.java b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
index 292a70d6ac7..32bf199b8a8 100644
--- a/core/src/main/java/org/testcontainers/images/builder/Transferable.java
+++ b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
@@ -10,6 +10,7 @@
 
 public interface Transferable {
     int DEFAULT_FILE_MODE = 0100644;
+
     int DEFAULT_DIR_MODE = 040755;
 
     static Transferable of(String string) {
diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
index d8209e29507..0d052f8e963 100644
--- a/core/src/test/java/org/testcontainers/TestImages.java
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -4,9 +4,14 @@
 
 public interface TestImages {
     DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine");
+
     DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.7.25");
+
     DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.4");
+
     DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
+
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
+
     DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 }
diff --git a/examples/build.gradle b/examples/build.gradle
index 6eaf2f73e49..821f2b4a1fc 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.13.0' apply false
+    id 'com.diffplug.spotless' version '6.22.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"
@@ -25,7 +25,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "9.3"
+        toolVersion = "10.12.4"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 34463
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
SXRcJ{65?fGI57uQ5&!`B?F@7P

delta 34554
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

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index db8c3baafe3..68e8816d71c 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/gradlew b/examples/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index 6689b85beec..9b42019c791 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
index 8bbbafd189f..af8a823c1de 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
@@ -4,5 +4,6 @@
 
 public interface LinkedContainerTestImages {
     DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12");
+
     DockerImageName REDMINE_TEST_IMAGE = DockerImageName.parse("redmine:3.3.2");
 }
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index ce71829331e..59b834dbad7 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -18,6 +18,6 @@ spotless {
     }
     groovyGradle {
         target '**/*.groovy'
-        greclipse('4.19.0')
+        greclipse('4.19')
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 34463
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
SXRcJ{65?fGI57uQ5&!`B?F@7P

delta 34554
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a7a990ab2a8..efe2ff34492 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85beec..9b42019c791 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
index 6e18781f2c4..a410f77e8c8 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
@@ -4,6 +4,7 @@
 
 public interface CockroachDBTestImages {
     DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v22.2.3");
+
     DockerImageName FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT = DockerImageName.parse(
         "cockroachdb/cockroach:v22.1.0"
     );
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
index 9097c4d3457..4343b5dffc8 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
@@ -4,6 +4,8 @@
 
 public interface JUnitJupiterTestImages {
     DockerImageName POSTGRES_IMAGE = DockerImageName.parse("postgres:9.6.12");
+
     DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine");
+
     DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:8.0.32");
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index d0f984f3388..08e50cc1d2a 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -4,11 +4,16 @@
 
 public interface LocalstackTestImages {
     DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.12.8");
+
     DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
+
     DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");
+
     DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");
+
     DockerImageName LOCALSTACK_0_13_IMAGE = LOCALSTACK_IMAGE.withTag("0.13.0");
 
     DockerImageName LOCALSTACK_2_3_IMAGE = LOCALSTACK_IMAGE.withTag("2.3");
+
     DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("amazon/aws-cli:2.7.27");
 }
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 9f1cebf0132..ac81dc66f6e 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -14,16 +14,3 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 43506725f82..3de6202e869 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -14,16 +14,3 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}
diff --git a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
index 174cb7b4d4a..498e09f0be4 100644
--- a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
+++ b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
@@ -4,5 +4,6 @@
 
 public interface PrestoTestImages {
     DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:344");
+
     DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:343");
 }
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/Service.java b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
index de9366a0e31..6ec7de44d08 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/Service.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
@@ -11,8 +11,11 @@ public enum Service {
     SMF_SSL("smf", 55443, "tcps", true);
 
     private final String name;
+
     private final Integer port;
+
     private final String protocol;
+
     private final boolean supportSSL;
 
     Service(String name, Integer port, String protocol, boolean supportSSL) {
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
index 19edca4b459..4b28dbef5c2 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
@@ -41,6 +41,5 @@ class PostgresContainerIT extends Specification {
 		cleanup:
 		ds.close()
 	}
-
 }
 // }
diff --git a/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java b/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
index 0ac56e54129..e6770bd8993 100644
--- a/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
+++ b/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
@@ -4,5 +4,6 @@
 
 public interface TrinoTestImages {
     DockerImageName TRINO_TEST_IMAGE = DockerImageName.parse("trinodb/trino:352");
+
     DockerImageName TRINO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("trinodb/trino:351");
 }
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
index d0998b5f9f2..197452e43c5 100644
--- a/smoke-test/build.gradle
+++ b/smoke-test/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.13.0' apply false
+    id 'com.diffplug.spotless' version '6.22.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"
@@ -25,7 +25,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "9.3"
+        toolVersion = "10.12.4"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 34463
zcmY(qRX`kF)3u#IAjsf0xCD212@LM;?(PI<f(@>NyAue(f;$XO2=4Cg1P$=#e%|lo
zKk1`B>Q#GH)wNd-&cI#Hz}3=WfYndTeo)CyX{fOHsQjGa<{e=jamMNwjda<PyWE6-
zP~B#x7leo3nD`qQ)CqpqLwL&Nv*c_uf@6ZzDxH4Kk*=_Q!1=S4w`ejm#xafRiVQ9K
zD|NMG<SxpdU<&W$m3qe4z`XCn(ZbVn07Ju^@)#`N!0VN6<~T~KDoO4tX0Wnd#9^aG
zzw_kBWvKv8AX+m002<gC-eNM-rZnBB9F6nP%6MQjX4aHBE}ky4v9DAk%X3G|ZVInC
z0sH3o9G@FVA`%%F8RyEFms&lE|8}H=IL>tD={CN3>GNchOE9OGPIqr)3v>RcKWR3Z
zF-guIMjE2UF0Wqk1)21791y#}ciBI*bAenY*B<S7Lsj7;64caBml7(9sSP$#!4bz5
zfe$Y|L&2pF$!`g2EFBw-(C>MW_)AeSuM5}vz_~`+1i!Lo?XAEq{TlK5-efNFgHr6o
zD>^vB&%3ZGEWMS>`?tu!@66|uiDvS5`?bF=gIq3rkK(j<_TybyoaDHg8;Y#`;>tXI
z=tXo~e9{U!*hqTe#nZjW4z0mP8A9UUv1}C#R*@yu9G3k;`Me0-BA2&Aw6f`{Ozan2
z8c8Cs#dA-7V)ZwcGKH}jW!Ja&VaUc@mu5a@CObzNot?b{f+~+212lwF;!QKI16FDS
zodx>XN$sk9;t;)maB^s6sr^L32EbMV(uvW%or=|0@U6cU<cnXKOZI@-_2b|FP!$}s
zAe;S8Mg2+heB}qk71p?*lsuXu#LR?_0T)ujf|bz~>kE`_!<=LHLlRGJx@gQI=B(nn
z-GEjDE}*8>3U$n(t^(b^C$q<Dz5^v_5fDC=_*60>STI;}6q&ypp?-2rGpqg7b}pyT
zOARu2x><t9J4jOACSe7Cla*>0HB{&D(d3sp`+}ka+Pca5glh|c=M)Ujn_$ly^X6&u
z%Q4Y*LtB_>i6(YR!?{Os-(^J`(70lZ&Hp1I^?t@~SFL1!m0x6j|NM!-JTDk)%Q^R<
z@e?23FD&9_W{Bgtr&CG&*Oer3Z(Bu2EbV3T9FeQ|-vo5pwzwQ%g&=zFS7b{n6T2ZQ
z*!H(=z<{D9@c`K<z${~)Mo?=i!8kgh3^kh#gZ+tgX&gTG!eX0?^?c|0?IsnpYDup`
zE@9&nF#>mHO&DbUIzpg`+r5207}4D=_P$ONIc5lsFgn)UB-oUE#{r+|uHc^hzv_df
zV`n<Uy?gf){vC8%ni$H6BLQ|&nNh_JVuc@V<M{j`fPiV3mmYOH;{D(UIYmW$_M(id
zfz>8&qry%jXQ33}Bjqcim~BY1?KZ}x453Oh7G@fA(}+m(f$)TY%7n=MeLi{jJ7LMB
zt(mE*vFnep?YpkT_&WPV9*f>uSi#n#@STJmV&SLZnlLsWYI@y+Bs=gzcqche=&<e&
zH!*BfX&4XuI(sK|M6EWNz&xj!)?<o^!;`2$ksx0>cBH2WL)dkR!a95*Ri)JH_4c*-
zl4pPLl^as5_y&6RDE@@7342DNyF&GLJez#eMJjI}#pZN{Y8io{l*D+|f_Y&RQPia@
zNDL;SBERA|B#cjlNC@V<BMj^PW+*!uB6Kia#Q_k#D<Kdw%NW0h5PShX-Ateg=^YLq
zPqOC>U{2csOvB8$HzU$01Q?y)KEfos>W46VMh>P~oQC8k=26-Ku)@C|n^zDP!hO}Y
z_tF}0@*Ds!JMt>?4y|l3?`v#5*oV-=vL7}zehMON^=s1%q+n=^^Z{^mTs7}*->#YL
z)x-~SWE{e?YCarwU$=cS>VzmUh?Q&7?#Xrcce+jeZ|%0!l|H_=D_`77hBfd4Zqk&!
zq-Dnt_?5*$Wsw8zGd@?woEtfYZ2|9L8b>TO6>oMh%`B7iBb)-aCefM~q|S2Cc0t9T
zlu-ZXmM0wd$!gd-dTtik{bqyx32%f;`XUvbUWWJmpHfk8^PQIEsByJm+@+-aj4J#D
z4#Br3pO6z1eIC>X^yKk|<Bgti^oqrbEGF$Jw^;w14UYT$*kTROuXlF!RjFMV72W^U
zoMllbg+6ow&xKMI7=%s{uAdU)(;XWPXi7!aAo)eS$$~Y>PeVwX_4B+IYJyJyc3B`4
zPrM#raacGIzVOexcVB;fcsxS=s<vwC^XKnl?x{xO@E;np^jTyr6HSfEb6qXiZr9dg
z)?Uhot!j3J`wuMIE#*geg>1e&V;Xe$tw&KQ`YaCkHTKe*Al#velxV{3wxx}`7@isG
zp6{+s)CG%HF#JBAQ_jM%zCX5X;J%-*%&jVI?6KpYyzGbq7qf;&hFprh?E5Wyo=bZ)
z8YNycvMNGp1836!-?nihm6jI`^C`EeGryoNZO1AFTQhzFJOA%Q{X(sMYlzABt!&f{
zoDENSuoJQIg5Q#@BUsNJX2h>jkdx4<+ipUymWKFr;w+s>$laIIkfP6nU}r+?J9bZg
zUIxz>RX$kX=C4m(zh-Eg$BsJ4OL&_J38PbHW&7JmR27%efAkqqdvf)Am)VF$+U3WR
z-E#I9H6^)zHLKCs7|Zs<7Bo9VCS3@CDQ;{UTczoEprCKL3ZZW!ffmZFkcWU-V|_M2
zUA9~8tE9<5`59W-UgUmDFp11YlORl3mS3*2#ZHjv{*-1#uMV_oVTy{PY(}AqZv#wF
zJVks)%N6LaHF$$<6p8S8Lqn+5&t}DmLKiC~lE{jPZ39oj{wR&fe*LX-z0m}9ZnZ{U
z>3-5Bh{KKN^n5i!M79Aw5eY=`6fG#aW1_ZG;fw7JM69qk^*(rmO{|Z6rXy?l=K=#_
zE-zd*P|(sskasO(cZ5L~_{Mz&Y@@@Q)5_8l<6vB$<SnmTz>@226O+pDvkFaK8b>%2
zfMtgJ@+cN@w>3)(_uR;s8$sGONbYvoEZ3-)zZk4!`tNzd<0lwt{RAgplo*f@Z)uO`
zzd`ljSqKfHJOLx<Pf6T=jN-Y)-G`fh^*;28D6YUz?Jn$Qe<sb8Bqa)nI_IHAx#i9Y
z$j}`a&gQX1Vaa!Ea{Z|{=AEw)&>ya4_}T`k5Ok1Mpo#MSqf~&ia3uIy{zyuaF}pV6
z)@$ZG5LYh8Gge*LqM_|GiT1*J*uKes=Oku_gMj&;FS`*sfpM+ygN&yOla-^WtIU#$
zuw(_-?DS?6DY7IbON7J)p^IM?N>7x^3)(7wR4PZJu(teex%l>zKAUSNL@~{czc}bR
z)I{Xz<Lxhu3=iQUmF>XqZBU3a;7UQ~PvAx8g-3q-9AEd}1JrlfS8NdPc+!=HJ6Bs(
zCG!0;e0z-22(Uzw>hkEmC&<fdEY_MO4!XLJs6(n80jtDO!nnCLqs#Y_I0IE~UCPp@
zM_JDqY7&S(Y&QK^-o&47T#3E|`NAlIxvHf3kny;RvvXG3GAWOcnn~MYcAb70=&uwJ
zkt37-cyED3`=cXw-}?~Jre&#~t1kA3Jz_#Bn#jD975Ham#lXmn@!Xe|z!$O^A|8Ja
zxE40Kw#qS@4?x}td&6F5(NIU<?GmP1&i-wkqanUS(~JutQ=}J2g$roe>xj?{0p|kc
zM}MMXCF%RLLa#5jG`+}{pDL3M&|%3BlwOi?dq!)KUdv5__zR>u^o|QkYiqr(m3HxF
z6J*DyN#Jpooc$ok=b7{UAVM@<lCUruKn!C)jTs?G3tF=X?02t9ti$}%_-&Apkmnno
z%fbj!k#YwEr={VibqP-VP5rAcB3fluUzRfi(z01WI?#!N!mLc);E?^+GEin57qXIO
zg8kNfR~-pWXV>nwGsr6kozSddwulf5g1{B=0#2)zv!zLXQup^BZ4sv*sEsn)+MA?t
zEL<g?Ek3W6nR6!O+b*MM+O~eGu_sDZwCnE-jqq7Mvt4JiAYMi&B_$Kb75}|i#Oq?4
z^@)_zxi_9dEszN`mdX;tu;@!Yj!NQXjGcs`B*6!}Q`Xp8$`LBVWzdw?k{MZ=kF0i6
z0u$CdmQDt$g$6JM?JyEA2oW1N)I#|wQ>)}3*R?4(J~CpeSJPM!oZ~8<cg4cY=X|VM
z=^|PC37b4k-X|34t*R-GX&L@u*U|J4q?K3(MG@qFTXx0}+s2jwB%hz+*7-k{2(QHj
zQmM#6vaQDzB)m!b_6aC`nE*p#lagJ>;8s_=@6o`IA%{aEA9!GELRvOuncE`s7sH91
zmF=+T!Q6%){?lJn3`5}oW31(^Of|$r%`~gT{eimT7R~*Mg@x+tWM3KE>=Q>nkMG$U
za7r>Yz2LEaA|PsMafvJ(Y>Xzha?=>#B!sYfVob4k5Orb$INFdL@U0(J8Hj&kgWUlO
zPm+R07E+oq^4f4#HvEPANGWLL_!uF{nkHYE&BCH%l1FL_r(Nj@M)*VOD5S42Gk-yT
z^23oAMvpA57H(fkDGMx86Z}rtQhR^L!T2iS!<mO!Z%ty;Vm%l(OCwBkU1^sK>788E
z+^${W1V}J_NwdwdxpXAW8}#6o1(Uu|vhJvubFvQIH1bDl4J4iDJ+181KuDuHwvM?`
z%1@Tnq+7>p{O&p=@QT}4wT;HCb@i)&7int<0#bj8j0sfN3s6|a(l7Bj#7$hxX@~iP
z1HF8RFH}irky&eCN4T94VyK<n?6cO6O!>qGywEGY{Gt0Xl-`|dOU&{Q;Ao;sL>C6N
zXx1y^RZSaL-pG|JN;j9ADjo^XR}gce#seM4QB1?S`L*aB&QlbBIRegMnTkTCks7JU
z<0(b+^Q?HN1&$M1l&I@>HMS;!&bb()a}hhJzsmB?I`poqTrSoO>m_JE5U4=?o;OV6
zBZjt;*%1P>%2{UL=;a4(aI>PRk|mr&F^=v6Fr&xMj8fRCXE5Z2qdre&;$_RNid5!S
zm^XiLK25G6_j4dWkFqjtU7#s;b8h?BYFxV?OE?c~&ME`n`$ix_`mb^AWr+{<eR?ie
zu^n7F<r|0}4&z!1h-oy{4Bz+F69}Q`VpCh(8k$5~F}&!BM0MdLg4qhh@bV;%4Rw1m
zzqF@FV8+w9w|_OPDgrx*NZebP^m@hq4m*)5tuF1+`%o#G^#zx@w5ZsxZaUE7jzw;N
zhD*<Wl`rn3nq7+Ag+JpPe%(D1QRTS`qM+;}+_^&I$1>M9{^^Rl;~KREplwy2q;&xe
zUR0SjHzKVYzuqQ84w$NKVPGVHL_4I)Uw<$uL2-Ml#+5r2X{LLqc*p13<F6YTV#kWf
zqG&w9QQdWL4?_d~CQnBI;?0D)Qg}{>{;w#E*Kwb*1D|v?e;(<>vl@VjnFB^^Y;;b3
z=R@(uRj6D}-h6CCOxAdqn~_SG=bN%^9(Ac?zfRkO5x2VM0+@_qk?MDXvf<z0O)%s7
zMAFU0$m3HcbC#~2Hc64da@3O%^-=j9undudUI{}zbhknzUL#akDQiL_v_tyrinjEO
zI(3QAK0&1x_y)uNn}57R#|)d${jFV)^rH-I`D9H?s`)o)uI9hKceIT0a|7|+J9G4R
z?^G4wKj6MYf*wobKriuVpvC#r;9ThcHk6^a^xn2ODvRhy6<dTeve8{i!Cu=iTXW7{
z{?H_E?=z!{hGvD8B;Y6V{)tUgB~RL}OZbPv*z!^?TUpHIl7qWjaL~c+st5S>=@q_*
z3IM@)er6-OXyE1Z4sU3{8$Y$>8NcnU-nkyWD&2ZaqX1JF_JYL8y}>@V8A5%lX#U3E
zet5PJM`z79q9u5v(OE~{by|Jzlw2<0h`hKpOefhw=fgLTY9M8h+?37k@TWpzAb2Fc
zQMf^aVf!yXlK?@5d-re}!fuAWu0t57ZKSSacwRGJ$0uC}ZgxCTw>cjRk*xCt%w&hh
zoeiIgdz__&u~8s|_TZsGvJ7sjvBW<(C@}Y%#l_ID2&C`0;Eg2Z+pk;IK}4T@W6X5H
z`s?ayU-iF+aNr5--T-^~K~p;}D<LJ~4Vm)-6?_|)BF5gW4JSY7&(G|Av&E;#AyyV$
zSunlmXPqL`WNNYmTNMzV20flD83AxG;E^Ec8R;(;vdTi$02nI6(4u&=rI7r^2x}@}
zb^h(s^Hv9AwRzcBrk1j8D%Js|d7yM)>(*GWOAYDV9JEw!w8ZYzS3;W6*_`#aZw&9J
ziXhBKU3~zd$kKzCAP-=t&cFDeQR*_e*(excIUxKuD@;-twSlP6>wWQU)$|H3Cy+`=
z-#7OW!ZlYzZxkdQpfqVDFU3V2B_-eJS)Fi{fLtRz!K{~7TR~XilNCu=Z;{GIf9KYz
zf3h=Jo+1#_s>z$lc~e)l93h&RqW1VHYN;Yjwg#Qi0yzjN^M4cuL>Ew`_-_wRhi*!f
zLK6vTpgo^Bz?8AsU%#n}^EGigkG3FXen3M;hm#C38P@Zs4{!QZPAU=m7ZV&xKI<yS
zef9C7IM#)bKApw^nm2P0xPH)?)BN&sFvRw*IK$#0AfO}b<r{uW7o8y}SN)F@&yQm%
zn~nNb7d)eJ2BHvG2FG3z@j=payQlcc`;O$D3XPT3JFukw8Xr%@g@bkhB?@#$+AOw(
z(|@nqsNM;#gS0yC1MWhDA!W&4Ru~!5ks5Q~Pml#jZyfXEak(Em<WRqk+Ush$9swq)
zmPM%H4#Ov0YvR0-8rrI^layyN^pm(_yZ9(@AnNKHRrR<^fYJvzs{G9-d<-PIeZxic
zI!fz70I#*sa*eAVT<99Vxgy-<y1w@xbY}slZ7CHAcKSW+wgZc7BMb2FfqhW}?;;BY
zP!O(w$5_aUKLF$CVvI<PnooNWjt084FOTmh7FT(=9D-a~XGZP;^5(x4>_HWNt90Ef
zxClm)ZY?S|n**2cNYy-xBlLAVZ=~+!|7y`(fh+M$#4zl&T^gV8ZaG(RBD!`3?9xcK
zp2+aD(T%QIgrLx5au&TjG1AazI;`8m{K7^!@m>uGCSR;Ut{&?t%3AsF{>0Cm(Kf)2
z?4?|J+!BUg*P~C{?m<lX{_VAm$p$7Sy5n4)MhYq@8YJpQU2G)^4Cs_N!H_NDI5wLC
zuxU!+I__)7xJYF^Pf|zP9)c{~jt|)Y(3ss;D?4|k?Aspv4X!02;`uMjy{H&7#%Q@o
z<nV(d4I5h&#m8g~O!r&@N38SW3XQ`EjZh!<u+JXC85$B2rn?)m6Y00}q3o2FWUH%+
zxkU_~@oBdV%UzT$+qN=8G&dY}bCZ=N#`=O2mzStcgw{uTG7hdoSCO(-*C<hlyRW_D
zI1Ra`6kd?oLFBA13(Fk<4zU<VtAK2o$FG2w@>wPQ#)gDMmro20YVNsVx5oWQMkzQ?
zsQ<ZZLyAH1!oNzFM}TfglR)=rWx*=M9GIjB?ZFULc>%Y>%7_wkJqnSMuZjB9lBM(o
zWut|B7w48cn}4buUBbdPBW_J@H7g=szrKEpb|aE>!4rLm+sO9K%iI75y~2HkUo^iw
zJ3se$8$|W>3}?JU@3h@M^HEFNmvCp|+$-0M?RQ8SMoZ@38%!tz8f8-Ptb@106heiJ
z^Bx!`0=I<O1KwEC{Zqa_WBh?i$W#4Fd46V<qLHAqFT^%K_=ff(6##B-Ub(l(@oz>m
z1!NUhO=9ICM*+||b3a7w*Y#5*Q}K^ar+oMMtekF0JnO>hzHqZKH0&PZ^^M(j;vwf_
z@^|VMBpcw8;4E-9J{<clOdQ-gLs}yNpT|>(u7sHSyZpQbS&N{VQ%ZCh{c1UA5;?R}
z+52*X_tkDQ(s~#-6`z4|Y}3N#a&dgP4S_^tsV=oZ<Y0d)Rr;arA(GJ}DlJV*pmcys
z*Mk;Dg{B7HD(oM1AgV$?pZ(feakO5tAV~SCs_W%F(?;(4m+NEoby{|2mc0XI>r4A1
zaSoPN1czE(UIBrC_r$0HM?RyBGe#lTBL4~JW#A`P^#0wuK)C-2$B6TvM<GJr3h=;Q
z>i@@%K@JAT_IB^T7Zfqc8?<ppV&KJMBtJ-oMFyu3aJ37qp`YqlHwSWDi``;8R3fKH
z;())3jrugRTov;`f2|96Ol0~`tdom%2YtK*BEp7dW){Z1+eUuiY^^+%IXC`kb4D<x
zHzFJB;p^zZ4`bRwAwzCEy&SFu3-$>{wHcSVG_?{(wUG%zhCm=%qP~EqeqKI$9UivF
zv+5IUOs|%@ypo6b+i=xsZ=^G1yeWe)z6IX-EC`F=(|_GCNbHbNp(CZ*lpSu5n`FRA
zhnrc4w+Vh?r>her@Ba_jv0Omp#-H7avZb=j_A~B%V0&FNi#!S8cwn0(Gg-Gi_LMI{
zCg=<XfJ{>g@m{W@u?GQ|yp^yENd;M=W2s-k7Gw2Z(tsD5fTGF{iZ%Ccgjy6O!AB4x
z%&=6jB7^}pyftW2YQpOY1w@%wZy%}-l0qJlOSKZXnN2wo3|hujU+-U~blRF!^;Tan
z0w;Srh0|Q~6*tXf!5-rCD)OYE(%S|^WTpa1KHtpHZ{!;KdcM^#g8Z^+LkbiBHt85m
z;2xv#83lWB(kplfgqv@ZNDcHizwi4-8+WHA$U-HBN<XXr0~J?$Lai#_;trL)VA8+1
zU!;TqE~}9XS7A@|JfNqKkGav_MPU#1&?e(-M~ysHg+5_(nK1v-W}9=?Zer5AMLpDA
zz5CzT^brYv;fMsP%wz!?lZWTP?W}8@vv2IuVI?tan0C9Y`-Wjik0PN~x7}xCz5j)1
zoSKG<CGs%hfuQ;WLC{xnn)TVIkPvvNhsVT7>qsZ`hKcUI3zV3d1ngJP-AMRET*A{>
zb2A>Fk|L|WYV;Eu4>{a6ESi2r3aZL7x}eRc?cf|~bP)6b7%BnsR{Sa>K^0obn?yiJ
zCVvaZ&;d_6WEk${F1SN0{_`(#TuOOH1as&#&xN~+JDzX(D-WU_nLEI}T_VaeLA=bc
zl_UZS$nu#C1yH}YV>N2^9^zye{rDrn(rS99>Fh&jtNY7PP15q%g=RGnxACdCov47=
zwf^<OLlg}xVjt0)p-rbBn7T~vS^5_Drk~dEL?fU{>9zfJaL{y`R#~tvVL#*<`=`Qe
zj_@Me$6sIK=LMFbBrJps7vdaf_HeX?eC+P^{AgSvbEn?n<}NDWiQGQG4^ZOc|GskK
z$Ve2_n8gQ-KZ=s(f`_X!+vM5)4+QmOP()2Fe#IL2toZBf+)8gTVgDSTN1CkP<}!j7
z0SEl>PBg{MnPHkj4wj$mZ?m5x!1ePVEYI(L_sb0OZ*=M%yQb?L{UL(2_*CTVbRxBe
z@{)COwTK1}!*CK0Vi4~AB;HF(MmQf|dsoy(eiQ><S&flYs}X=qI6%JhOL}c}8ReE6
z>WTKcEQlnKOri5xYsqi61Y=I4kzAjn5~{IWrz_l))|<ryzIgBfLDnKw3JSt*BE7Yk
z@<X1~%_3&{c@EWKT@&!_5{hgsv0*uWq^Ag5&!#`hO30t*Ey!ZHlK~#2TL+u093@m<
zmh@mPLF@+cbRf2&AOJqqsB1zg;bVL&+4p#cS%+M6!rPy}l*roS@+s2E+JcG2%rRTv
z2!(JA6$64oDKq`kHYO({m<UUf<`TtSFw}vw1zYukXby+c34(E)w*pi_qs3N7vw>Ls
zvq7xgQs?Xx@`N?f7+3XKLyD~6DRJw*uj*j?yvT3}a;(j_?YOe%hUFcPGWRVBXzpMJ
zM43g6DLFqS9tcTLSg=^&N-y0dXL816v&-nqC0iXdg7kV|PY+js`<tQ)jQ;9->F8dm
z2PuHw&k+8*&9SPQ6f!^5q0&AH(i+z3I7a?8O+S5`g)>}fG|BM&ZnmL;rk)|u{1!aZ
zEZHpAMmK_v$GbrrWNP|^2^s*!0waLW=-h5PZa-4jWYUt(<b#|Bsx3P3#+uA4`mmgX
z9Kz|`zO$@)@d{sIynMxFy0ta)_!*pZfTlj%)9Ee4zRt~F_6}gJArZ1%_&ds}7FnKN
zT=p-*f9G3aBCWvVUn3v-@ZXvQrHP}1zTx3P<Jhsl2HrSYxUcBQibO?|u3Wl@z}_;u
z86>Hr@EA(m3Mc3^uDxwt-me^55FMA9^>hpp26MhqjLg#^Y7OIJ5%ZLdNx&uDgIIqc
zZRZl|n6TyV)0^DDyVtw*jlWkDY&Gw4q;k!UwqSL6&sW$B*5Rc?&)dt29bDB*b6IBY
z6SY6Unsf6AOQdEf=P1inu6(6hVZ0~v-<>;LAlcQ2u?wRWj5VczBT$Op#8IhppP-1t
zfz5H59Aa~yh7EN;BXJsLyjkjqARS5iIhDVPj<=4AJb}m6M@n{xYj3qsR*Q8;h<IbJ
zd)uk&8m`?q_q1NS{$84>VxDyC4vLI;;?^eENOb5QARj#nII5l$MtBCI@5u~(ylFi$
zw6-+$<K_|-Wlyt+M0?(Bv&pcNNg0svOYzThtqKx!i*Dc5NZvH&F*N23|J~!vMN;d~
z^=H()7fOiv1)6`d`Xlx->$XQ}Ca>FWT>q{k)g{Ml(Yv=6aDfe?m<nPFf#(N8Laf1%
zeJ4>|5|kbGtWS}fKWI+})F6`x@||0oJ<?@*&=4(53;s&f1=p}VJ=CsEx0>^(g|+xi
zqlPdy5;`g*i*C=Q(aGeDw!eQg&w>UUj^{o?PrlFI=34qAU2u@BgwrBiaM8zoDTFJ<
zh7nWpv>dr?q;4ZA?}V}|7qWz4W?6#S&m>hs4IwvCBe@-C>+oohsQZ^JC*RfDRm!?y
zS4$7oxcI|##ga*y5hV>J4a%HHl^t$pjY%caL%-FlRb<$A$E!ws?8hf0@(4HdgQ!@>
zds{&g$ocr9W4I84TMa9-(&^_B*&R%^=@?Ntxi|Ejnh;z=!|uVj&3fiTngDPg=0=P2
zB)3#%HetD84ayj??qrxsd<YW&s^_fNRPJu1Lu~ooseFw$wVknfo;k}<f4``0v~+Y_
zKU_m+@|S(3^pR^^<>9nqrBem(8^_u_UY{1@R_vK-0H9N7lBX5K(^O2=0#TtUUGSz{
z%g>qU8#a$DyZ~EMa|8*@`GOhCW3%DN%xuS91T7~iXRr)SG`%=Lfu%U~Z_<B8YLfje
zenkDPv?7UMn^wh-#5zYOX60}ftn+_;r9>`1b=lSi?qpD4$vLh$?HU6t0MydaowUpb
zQr{>_${AMesCEffZo`}K0^~x>RY_ZIG{(r39MP>@=aiM@C;K)jUcfQV8#?SDvq>9D
zI{XeKM%$$XP5`7p3K0T}x;qn)VMo>2t}Ib(6zui;k}<<~KibAb%p)**e>ln<=qyWU
zrRDy|UXFi9y~PdEFIAXejLA{K)6<)Q`?;Q5!KsuEw({!#Rl8*5_F{TP?u|5(Hijv(
ztAA^I5+$A*+*e0V0R~fc{ET-RAS3suZ}TRk3r)xqj~g_hxB`qIK5z(5wxYboz%46G
zq{izIz^5xW1Vq#%lhXaZL&)FJWp0VZNO%2&ADd?+J%K$fM#T_Eke1{dQsx48dUPUY
zLS+DWMJeUSjYL453f@HpRGU6Dv)rw+-c6xB>(=p4U%}<qNSa;?l%-Qbgo6H=D;<Ac
z37*~61%G;Rk9zKyD{WraYx|9VK1aeUEagvgL(r)WImH;+hu8m^8fk3iQO!R?vp|AU
z#xX(31o5DGMHtXZ9zytcGdR#e9xm`5)!T;H26%a+**oa@WGMf=BFxg~`r&GAS7$4y
z^2|*EV<Mt4fFFPU)O>_p>z^I@Ow9`nkUG21?cMIh9}hN?R-d)*6%pr6d@mcb*ixr7
z)>Lo<&2F}~>WT1ybm^9UO{6P9;m+fU^06_$o9gBWL9_}EMZFD=rLJ~&e?fhDnJNBI
zKM=-WR6g7HY5tHf=V~6~QIQ~rakNv<yXlZw2~R->csamU8m28YE=z8+G7K=h%)l6k
zmCpiDInKL6*e#)#Pt;ANmjf`8h-nEt&d}(SBZMI_A{BI#ck-_V7nx)K9_D9K<wX2&
ztb`!H<{xu+%$XOK7#l;ig9boZT>-p@?Zh81#b@{wS?wCcJ%og)8RF*-0z+~)6f#T`
zWqF7_CBcnn=S-1QykC*F0YTsKMVG49BuKQBH%WuDkEy%E?*x&tt%0m>>5^HCOq|ux
zuvFB)JPR-<R9*qK#QvOEy<g2y->W|%$24eEC^AtG3Gp4qdK%pjRijF5Sg3X}uaKEE
z-L5p5aVR!NTM8T`4|2QA@hXiLXRcJveWZ%YeFfV%mO5q#($TJ`*U>hicS+CMj%Ip#
zivoL;dd*araeJK9EA<(tihD50FHWbITBgF9<S1F59NBB@-km2xgxh^jmVKRZHCzb@
zldh9O@Tx{jgxfxH#W4wy6M0z_-aTt2G@3|Yp>E<33A+eMr2;cgI3Gg6<-2o|_g9|>
zv5}i93<J?21Jwu60De+%9&8yD$M-==IBwP;d{BC=F44-LGWWplT_ESz4ovU#BL|G}
zcmR56^)_SYTt?AM`r&<V0_9alA|EwbVwM(BT3!TE$hsCu`Gm;Rg~8}C&9f4B^0>2(
zYf<!;V`YfO6gj*4fZkUAr?-F@aA9;z9|jbBgt=33h^ojL5J7|FUPfqa-W2^EN+IwG
zyucPVo58FAeHt$Nq*Z0Lz|^v35)f<vIMOX%n{Czoseg>TE9?4#nQhP@a|zm#9FST2
z!y+p3B;p>KkUzH!K;GkBW}bWssz)9b>Ulg^)EDca;jDl+q=243BddS$hY^fC6lbpM
z(q_bo4V8~e<Zs<b7cyyni#U}G!!KTEURDqc{bMpk?5mA1@g$Y$Wx|caEJ@!TvSwmW
zqw6$6_V9}M--vO-=^ZBsJr^(lCyvX*KI4W@0G*bBPEKAYRH$kkkjj{cPznS-d|ZUy
zJ?>VeA?0LFD6ZtKcmOH^75#q$E<Zzyhezvuj?3@d%!~X4ws-!zRzAK#UFhVU?-K@7
z2G)}Z&^k%kMrWcDJ1~9s%Y7B4b*Q5pIQJtR#E8_m=dCI`iz(ByzI1@)w#x&yV;Dmb
zBR*c4ZqzdV6%u1E<qjcp>o%a&qvE8Zsqg=$p}u^|>DSWUP5i{6)LAYF4E2DfGZuMJ
zMwxxmkxQf}Q$V3&2w|$`9_SQS^2NVbTHh;atB>=A%!}k-f4*i$X8m}Ni^ppZXk<vI
zv4b?e{$fL=4CN|)0GXH{ZZE#0qrw?r2yJZjI_c{zf+uDL9gwdN)`!v>5_oYF>Gq(&
z0wy{LjJOu}69}~#UFPc;$7ka+=gl(FZCy4xEsk);+he>Nnl>hb5Ud-lj!CNicgd^2
z_Qgr_-&S7*#nLAI7r()P$`x~fy)+y=W~6aNh_humoZr7MWGSWJPLk}$#<b0qDKzby
zfsF}6hSD25(h&SI*1V<_%OA=AVAytldFr(qeYf$b2GB9jc!!oXb+YO|A>w_1n%(@?
z3FnHf1lbxKJbQ9c&i<$(wd{tUTX6DAKs@cXIOBv~!9i{wD@*|kwfX~sjKASrNFGvN
zrFc=!0Bb^OhR2f`%hrp2ibv#KUxl)Np1aixD9{^o=)*U%n%rTHX?FSWL^UGpHpY@7
z<FJKJ-x}kSNUZ~J=(sQmm|=Hgx6NDTIwxW%&M+qtaTFkwf2nmoB#ib#d`3q#i8x4D
z8SO1)?2${?@9$aGnmIq+`mJ>74U}KoIRwxI#>)Pn4($A`nw1%-D}`sGRZD8Z#lF$6
zOeA5)+W2qvA%m^|$WluUU-O+KtMqd;Pd58?qZj})MbxYGO<{z9U&t4D{S2G>e+J9K
ztFZ?}ya>SVOLp9hpW)}G%kTrg*KXXXsLkGdgHb+R-ZXqdkdQC0_)`?6mqo8(EU#d(
zy;u&aVPe6C=YgCRPV!mJ6R6kdY*`e+VGM~`VtC>{k27!9vAZT)x2~AiX5|m1Rq}_=
z;A9LX^nd$l-9&2%4s~p5r6ad-siV`HtxKF}l&xGSYJmP=z!?Mlwmwef$EQq~7;#OE
z)U5eS6dB~~1pkj#9(}T3j!((8Uf%!W49FfUAozijoxInUE7z`~U3Y^}xc3xp){#9D
z<^Tz2xw}@o@fdUZ@hnW#dX6gDOj4R8dV}Dw`u!h@*K)-NrxT8%2`T}EvOImNF_N1S
zy?uo6_ZS>Qga4Xme3j#aX+1qdFFE{NT0Wfusa$^;eL5xGE_66!5_N8!Z~jCAH2=${
z*goHjl|z|kbmIE{cl-PloSTtD+2=CDm~ZHRgXJ8~1(g4W=1c3=2eF#3tah7ho`zm4
z05P&?nyqq$nC?iJ-nK_iBo=u5l#|Ka3H7{UZ&O`~t-=triw=SE7ynzMAE{Mv-{7E_
zViZtA(0^wD{iCCcg@c{54Ro@U5p1QZq_XlEGtdBAQ9@nT?(zLO0#)q55G8_Ug~Xnu
zR-^1~hp|cy&52iogG@o?-^AD8Jb^;@&Ea5jEicDlze6%>?u$-eE};bQ`T6@(bED0J
zKYtdc?%9*<<$2LCBzVx9CA4<AoGdF)iT9-BV}&@WMK}bKMAdQBHB9zIg~33D9XqBR
zD>YV|q-qg*-{yQ;|0=KIgI6~z0DKTtajw2Oms3<u6JfE3d!7x4=<@msnH0k~j9dW|
zZtZ80d$e)`WiYJI%5C4$o_@ZG+NLyWNO7P{Rii0d%$QNbSHy)#lwN8boUCoV3)k>L
zn{C%{P`duw!(F@*P)lFy11|Z&x`E2<=$Ln38>UR~z6~za(3r;45k<v>QK_^QTX%!s
zNzoIFFH8|Y>YVrUL5#mgA-Jh>j7)n<Zx96$&fzU>)5}iVM4%_@^GSwEIBA2g-;43*
z*)i7u*xc8jo2z8&=8t7qo|B-rsGw)b8UXnu`RgE4u!(J8yIJi(5m3~aYsADcfZ!GG
zzqa7p=sg<o&$HnFk3_PIDT7^R*l|Uy*ErkWh5p!iw%95SEqgx*(#2u}$;yHXwBY|t
z$vJDd#N!Akn_xau{*4y#!iM@tZOc&Rc)@cg)>`V_KjiqI*LA-=T;uiNRB;BZZ)~88
z`C%p8%hIev2rxS12@doqsrjgMg3{<L-IS7j<nG-26~xHYI&`%4j=)ZUR_2Nwyo&s*
zJ_0X{=sXdnBCoNzt%@LBIlEx@{+A&hsZt3nyF&Gtc)9fXv28Q&PU0uzxK5QDQ^0tT
z@ll2`vK+vydWK?7I0;u%diXOvNZ*YxV6uZ=wi~x}imLLs*Slf$SL&G~13D2Praj;n
z{D>A&N8A?%Ui5vSHh7!iC^ltF&HqG~;=16=h0{ygy^@HxixUb1XYcR36SB}}o3nxu
z_IpEmGh_CK<+sUh@2zbK9MqO!S5cao=8LSQg0Zv4?ju%ww^mvc0WU$q@!oo#2bv24
z+?c}14L2vlDn%Y0!t*z=$*a!`*|uAVu&NO!z_arim$=btpUPR5XGCG0U3YU`v>yMr
z^zmTdcEa<e${0lJ(<4$dGj^YwOU!gy-6u%trv^j}K^#M&{&D1UGEa2nS)OMS>!APX
zYF>^Q-TP11;{VgtMqC}7>B^2gN-3KYl33gS-p%f!X<_Hr?`rG8{jb9jmuQA9U;BeG
zHj6Pk(UB5c6zwX%SNi*Py*)gk^?+729$bAN-EUd*RKN7{CM4`Q65a1qF*-QWACA&m
zrT)B(M}yih{2r!Tiv5Y&O&=H_OtaHUz96Npo_k0eN|!*s2mLe!Zkuv>^E8Xa43ZwH
zO<I&Nur7C^JWb9`H||S7lnGT!zTpho2vN69_#Qs?kjYy$`Q0!HKi(a7WFX@;&MNY~
zax>I058AZznYGrRJ+`*GmZzMi6yliFmGMge6^j?|PN%ARns!Eg$ufpcLc#1Ns!1@1
zvC7N8M$mRgnixwEtX{ypBS^n`k@t2cCh#_6L6WtQb8E~*Vu+Rr)YsKZRX~hzLG*BE
zaeU#LPo?RLm(Wzltk79Jd1Y$|6<Tz#Ab3VOQL!oqnu8!3Ev#T)CDpRjo9fjjgw)N!
zErQj*AF93?w7h)pV7lh%{nq{Sh43S}4qRhV$tBKz2Q3F#YC0?apCV-cr-&g)Ta?xA
zc-})no|s-UajuvdSqa3zR2cl82_%nvGFwn23tfy0+-dPTJzZ8#!t6MWix9bj!?+yg
zn$~Be?akwbUV?z=Y{qc>aWz1)wf1K1RtqS;qyQMy@H@B805vQ%wfSJB?m&&=^m4i*
z<RSh9mC|UV(AH!)v4!3^(;(w}isKaD1$r>YVH`zTTFbFtNFkAI`Khe4e^CdGZw;O0
zqkQe2|NG_y6D%h(|EZNf&77_!NU%0y={^E=*gKGQ=)LdKPM3zUlM@otH2X07Awv8o
zY8Y7a1^&Yy%b%m{mNQ5sWNMTIq96Wtr>a(hL>Qi&F(ckgKkyvM0IH<_<ah`2Jtc4H
zzJ5Z$n<rF%>}v~Fv-GqDa<PYPnU!!je;%S69V23AFX{jR^q$cSK5eU!uzK5~_gTvx
z=xC#ygr;Z7l0l}tE!ut;$3u!G=k}WM8nnSovw+>pig=3*ZMOx!%cYY)SKzo7ECyem
z9Mj3C)tCYM?C9YIlt1?zTJXNOo&oVxu&uXKJs7i+j8p*Qvu2PAnY}b`KStdpi`trk
ztAO}T8eOC%x)mu+4ps8sYZ=vYJp16SVWEEgQyFKSfWQ@O5id6GfL`|2<}hMXLPszS
zgK><z_7D{#_0cM38i3?q!q=1kU*<f=E!5q~OGR+n-!$_a1@<av6z8(-tT0T>NWOoR
zBRyKeUPevpqKKShD|MZ`R;~#PdNMB3LWjqFKNvH9k+;(`;-pyXM55?qaji#nl~K8m
z_MifoM*W*X9CQiXAOH{cZcP0;Bn10E1)T@62Um>et2ci!J2$5-_HPy(AGif+BJpJ^
ziHWynC_%-NlrFY+(f7HyVvbDIM$5ci_i3?22ZkF>Y8RPBhgx-7k3M2>6m5R24C|~I
z&RPh9xpMGzhN4b<n_$TKj6;x$6eSY#J<6z8-<<eXD{YGtPeh(eK>ii*ryWaN^d(`0
zTOADlU)g`1p+SVMNLztd)c+;XjXox(VHQwqzu>FROvf0`s&|NEv26}(TAe;@=FpZq
zaVs6mp>W0rM3Qg*6x5f_bPJd!6dQGmh?&v0rpBNfS$DW-{4L7#_~-eA@7<2BsZV=X
zo<jFL%Bl|~iN=_%v|5Y<#Gpc-_nu`zPSa3B)eyzNRYkS_S7#Vl4Sx`|M*FHkF=-_)
z(qT@$sP8*6(;+2_2GrUtq?WVOz@%!47omewB^Cj*+)_Y7c8o#IQ%W|Wg+5PNnR*6U
zqsrE$&lE5UYNkcwa9IkWJQ`K6q;9o~nXTNNt4ypA@SdwPa*k(~yPsQD9A`rvY6hIQ
zbB3Wq3J(Ip%Spgn<@)Zq04$gB8>w){3aATmLZOQrs>uzDkXOD=IiX;Ue*B(^4RF%H
zeaZ^*MWn4tBDj(wj114r(`)P96EHq4th-;tWiHhkp2rDlrklX}I@ib-nel0slFoQO
zOeTc<hn5|jpM}{BL^>;Rh7sMIebO`1%u)=GlEj+7HU;c|Nj>2j)J-kpR)s3#+9AiB
zd$hAk6;3pu9(GCR#)#>aCGPYq%r&i02$<m+xZvsp>0L9=7Al<uiMgWi00$%C&<=p;
z&DJ&!X-+7DOQ<NGx053X=x&OTuveGw;P#7I963O-cntp%n;x3upG6$bSZdIscXKZz
zE26w-ESTe#dx<IxxgOyxd~k92x!}?e7=&}7EIUABcs@v7J^4#tE1Z2`vYo|Zfx#?M
zXxRQAUwIpnrd%x;d2(+0wHKQb5LXCF5FM|~=&cF?)N_xB4Bl|JpPd+>IGY<wi6MrB
zwuAQco(edmX)&f$!qgzbDk@I5RR!7e{<pl6;0q^D9rH)D+xQ^qUHFjiVuuZ(dNLoE
zk610d0D=8c-t>dlUO5%eH&M!ZWD&6^NBAj0Y<LF!W8hneCvn#&X!jeuMxFNL9R6gV
ziYL0E$zuPwu-dNyWbfxdM|kfI7dtb9QzzTE{}sJ=aTD#{Kb((+@c&OeMaT<*ofYbx
z;1%phK@uKkWduA*1(PK@!{WoV6$&w4_0RR0*51~cnd9Q6WRU~~+iD70xHZv5yb^q9
zSl{&Z2jJC&)zq%KFf=>9ZDcPg@r@8Y&-}e!aq0S(`}NuQ({;aigCPnq75U9cBH&Y7
ze)W0aD>muAepOKgm7uPg3Dz7G%)nEqTUm_&^^3(>+eEI;$ia`m<pPp!PnmJ$ax-Ni
zriP82FsWaes>>m0QHEkTt^<h|Kl{fGlDwG;CQ*b4lzdo-V$nC8<LA?4QJ%$e&M1jF
zj4MPd95jth&|E!zZ*d9v(}1-nH2c9uw}SWz(o)!u-C;JXs?Old?KmR?ZVapLr)~kt
z-!pxZ2T4qAqb;DH9;hiuAcN#25{6pE|B@nn@LY@;@6X}9ZRu6|3F2X?Musq<a_n+z
zJMV<b3!3d+o(r5xln5wq$mvr`E9}w25J;Qi>=cx^JsBC68#H(3zc~Z$E9I)oSrF$3
zUClHXhMBZ|^1ikm3nL$Z@v|JRhud*IhOvx!6X<(YSX(9LG#yYuZeB{=7-MyPF;?_8
zy2i3iVKG2q!=JHN>~!#Bl{cwa6-yB@b<;8LSj}`f9pw7#x3yTD>C=>1S@H)~(n_K4
z2-yr{2?|1b#lS`qG@+823j;&UE5|2+EdU4nVw5=m>o_gj#K>>(*t=xI7{R)lJhLU{
z4IO6!x@1f$aDVIE@1a0lraN9!(j~_uGlks)!&davUFRNYHflp<|ENwAxsp~4Hun$Q
z$w>@YzXp#VX~)ZP8`_b_sTg(Gt7?oXJW%^Pf0UW%YM+OGjKS}X`yO~{7WH6nX8S6Z
ztl!5AnM2Lo*_}ZLvo%?iV;D2z>#qdpMx*xY2*GGlRzmHCom`VedAoR=(A1nO)Y>;5
zCK-~a;#g5yDgf7_phlkM@)C8s!xOu)N2UnQhif-v5kL$*t=X}L9EyBRq$V(sI{90>
z=ghTPGswRVbTW@dS2H|)QYTY&I$ljbpNPTc_T|FEJkSW7MV!JM4I(ksRqQ8)V5>}v
z2Sf^Z9_v;dKSp_orZm09jb8;C(vzFFJgoYuWRc|Tt_&3k({wPKiD|*m!<X$9n>+<d
zfwbu(US!ljdxEAm@8L<A)Zh;j$1@#3i1Hba7~+=OxccBV?z(KQ^KiX-VG5F8{s<bz
zFTJ%sXJxQmw1gpd<`@dDaxW+0z@mAqX^!9bM3;Rg{vJ$y`jrFPf<taTjgOUiGo`tq
zU8^ynJ_vtmGeduy1>za$(l*!gNRo{xtmqjy1=kGzFkTH=Nc>EL@1Um0BiN1)wBO$i
z6rG={bRcT|%A3s3xh!Bw?=L&_-X+6}L9i~xRj2}-)7fsoq0|;;PS%mcn%_#oV#kAp
zGw^23c8<Fs8D%<c4(Nre;Oy43eq_*f8CVI6Y}O$7=4|A%Bh)_#+dgnF@9B?PZV+FK
z@D@b4V?}Hxb;mfT&3=fp%aQ_W<BpQFv8~7WceKD?ShRTE&*xP)Rp+|r%gOH<b#|`R
zpMk-?U*1{fo}21TS!!|lrVyo(<X*MXXY2ANSehq$FQcbg%rc;PQLx;F?K=D0V>_0~
ze}v9(p};6HM0+qF5^^>BBEI3<e#!JG>d=2<KmW5$FDhY04Ol??L%ZUPasCO+Pj|h!
zL*;#e7cVT$<F2gg5E8<=1=Y;hH6lJKfJK6P>DW&O#|(;wg}?3?uO=w+{*)+^l_-gE
zSw8GV=4_%U4*OU^hibDV38{Qb7P#Y8zh@BM9pEM_o2FuFc2LWrW2jRRB<+IE)G=Vx
zuu?cp2-`hgqlsn|$nx@I%TC!`>bX^G00_oKboOGGXLgyLKXoo$^@L7v;GWqfUFw3<
zekKMWo0LR;TaFY}T<F_}BWybmURg`OY9TP`)1kkA_VfNgEb>t4!O$3MU@pqcw!0w0
zA}SnJ6Lb597|P5W8$OsEHTku2Kw<?~p>9y4V=hx*K%iSn!#LW9W#~OiWf^dXEP$^2
zaok=UyGwy3GRp)bm6Gqr>8-4h@3=2`Eto2|JE6Sufh?%U6;ut1v1d@#EfcQP2chCt
z+mB{Bk5~()7G>wM3KYf7Xh?LGbwg1uWLotmc_}Z_o;XOUDyfU?{9atAT$={v82^w9
z(MW$gINHt4xB3{bdbhRR%T}L?M<kc`={1@bX$@c}pX`50EN?1djSoIxW|Rhd4u^_G
z>cK?!zkLK3(e>zKyei(yq%Nsijm~LV|9mll-XHavFcc$teX7v);H>=oN-+E_Q{c|!
zp<Ol>JV~-9AH}jxf6IF!PxrB9is{_9s@PYth^`pb%DkwghLdAyDREz(csf9)HcVRq
z+2Vn~>{(S&_;bq_qA{v7XbU?yR7;~JrLfo;g$Lkm#ufO1P`QW_`zWW+4+7xzQZnO$
z5&GyJs4-VGb5MEDBc5=zxZh9xEVoY(|2yRv&!T7LAlIs@tw+4n?v1T8M>;hBv}2n)
zcqi+>M*U@uY>4N3eDSAH2Rg@dsl!1py>kO39GMP#qOHipL~*cCac2_vH^6x@xmO|E
zkWeyvl@P$2Iy*mCgVF+b{&|FY*5Ygi82<omgvyGTqv|QTz=sN}TZ6>37i)9YW#Fp&
z?TJTQW+7U)xCE*`Nsx^yaiJ0KSW}}jc-ub)8Z8x(|K7G>`&l<bpFP+cS)jO`N_V-8
zyz*&criMW3Tge5_hcWP_V8=SvD0*^&JQ8c;z^ZkOK$H-b5$|gm$@;EfT;;o$;h7dL
z>{Y&~W=q#^4Gf{}aJ%6kLXsmv6cr=Hi*uB`V26;dr<aSR^xo%$9+~>4C$WrPnHO>g
zg1@A%DvIWPDtXzll39kY6#%j;aN7grYJP9AlJgs3FnC?crv$wC7S4_Z?<_s0j;MmE
z75yQGul2=bY%`l__1X3jxju2$Ws%hNv75ywfAqjgFO7wFsFDOW^)q2%VIF~WhwEW0
z45z^+r+}sJ{q+>X-w(}OiD(!*&cy4X&yM`!L0Fe+_RUfs@=J{AH#K~gArqT=#DcGE
z<spTPWq%oqdho$J0xh~6Q=^v}j=vBe*gL+|ud>!FwY(h&+&811rVCVoOuK)Z<-$EX
zp`TzcUQC256@YWZ*GkE@P_et4D@qpM92fWA6c$MV=^qTu7&g)U?O~-fUR&xFqNiY1
zRd=|zUs_rmFZhKI|H}dcKhy%Okl(#y#QuMi81zsY56Y@757xBQqDNkd+XhLQhp2BB
zBF^aJ<Yyh7pM5zBvii~t`R`{~RErSl{}-#Xjol7q<MNou@wjO9-e0+&FnPZ^6y4Ll
zv-4#qZasZI63$>__D676wLu|yYo6jNJNw^B+Ce;DYK!f$!dNs1*?D^97u^jKS++7S
z5qE%zG#HY-SMUn^_yru=T6v`)CM%K<>_Z>tPe|js`c<|y7<QPU`KuA=GRt?21}m$3
z)egm^_v+KsYdG<vt|ej|@=R$E;WS|)lq&hvDYqCWcNQVq*yoxejj)Sgjj^Yjl?NcX
zDFDlAtM@eY^eKCIx3Bn3tvI+`G-P!;moJ^4fysp(P&5s?@p7p>?qol&)C=>uLWkg5
zmzNcSAG_sL)E9or;i+O}tY^70@h7+=bG1;YDlX{<4zF_?{)K5B&?^tKZ6<$SD%@>F
zY0cl2H7)%zKeDX%Eo7`ky^mzS)s;842cP{_;dzFuyd~Npb4u!bwkkhf8-^C2e3`<?
zuCMcKb49Z{nlgrGOONk{-i&aq@>q8>MuPhgiv0VxHxvrN9_`rJv&GX0fWz-L-Jg^B
zrTsm>)-~j0F1sV=^V?UUi{L2cp%YwpvHwwLaSsCIrGI#({{QfbgDxMqR1Z0TcrO*~
z;`z(A$}o+TN+QHHSvsC2`@?YICZ>s8&hY;SlR#|0PKaZIauCMS*cOpAMn@6@g@rZ+
z+GT--(uT6#mL8^*mMf7BE`(AVj?zLY-2$aI%TjtREu}5AWdGlcWLvfz(%<HnWJcfj
z-uvEteDlov4?jvo%cNeW+poNG>wn72tGczwUOgGD3RXpWs%onuMxs9!*D^698AupW
z9qTDQu4`!>n|)e35b4t+d(+uOx+>VC#nXCiRex_Fq4fu1f`;C`>g;IuS%6KgEa3NK
z<8dsc`?SDP0g~*EC3QU&OZH-QpPowNEUd4rJF9MGAgb@H`mjRGq;?wFRDVQY7mMpm
z3yoB7eQ!#O#`XIBDXqU>Pt~tCe{Q#awQI4YOm?Q3muUO6`nZ<tt>4^zi5|(w<YclZ
zu+KExzcVzp-<c6itggO*X~x)Ub6iWOWm1_uy?SO#%E*8SSZpyY8dd&ki$+?HWK*%s
zK>b9R)oyarG?mI|I@A0U!+**&lW7_bYKF2biJ4BDbi~*$h?kQ`rCC(LG-oO(nPxMU
zfo#Z#n8t)+3Ph87roL-y2!!U4SEW<vR3`WM9hpvJa%7CIt!<Og+JH8nPFHCj`HIon
zWU69v;ml6>NCIM16i~-&+f55;kxC2bL$FE@jH{5p$Z8gxOiP%Y`hTTa_!v{AKQz&-
ztE+dosg?pN)leO5WpNTS>IKdEEn21zMm&?r28Q52{$e2tGL44^Ys=^?m6p=kOy!gJ
zWm*oFGKS@mqj~{|SONA*T2)3XC|J--en+NrnPlNhAmXMqmiXs^*154{EVE{Uc%xqF
zrbcQ~sezg;wQkW;dVezGrdC0qf!0|>JG6xErVZ8_?B(25cZrr-sL&=jKwW>zKyYMY
zdRn1&@Rid0<C+MnR2o`YS>oIhoRl)+X4)b&e?HUVlOtk^(<zwTW;whij!=-BE}&In
zXFHQ`T%bqdF}QRhp(UdsqzoXW^^{Cu7}aml+o{qH+6C)t@qf6nzbm;nY3xsK?iUUZ
zuVHw|MYP8Sn2YhNSD|j$%_1Jif>xl<NWlN1(3;V2Mahbi86q?_SJr9JNDuW2Zu(9r
zg9R<qC9s8->dhvgf^7r+@TXa!2`LC9<CJjGUIJTusY3k-%1g5`J)=+xD=iAagk|Z0
zbVg4EgrODM$A2{4B$Lg=;`O0e8rkmvgzD5YJ`2#7_lN<X(c{bX>AsB@wEO&eU2mN)
z(2^JsyA6qfeOf%LSJx?Y8BU1m=}0P;*H3vVXSjksEcm>#5Xa`}jj5D2fEfH2Xje-M
zUYHgYX}1u_p<<Rn@EZDvN>|fIC+pI5g6KGn%JeZPZ-0!!1})tOab>y=S>3W~x@o{-
z6^;@rhHTgRaoor06T(UUbrK<L%k*y$z*GoaYL0(Ax6MX8ZY6UNxruI8=|=i@Ca=FV
zjODYps&qYlQq-c*B(C!ypHk^s`ZUw>4+@5bO?r=!vckDD+nwK+>2{{|{u4N@g}r(r
z#3beB`G2`XrO(iR6q2H8yS9v;(z-=*`%fk%CVpj%l#pt?g4*)yP|xS-&NBKOeW5_5
zXkVr;A)BGS=+F;j%<x9&4$@s^^kw=A>O|69F0Lne?{U*t=^g?1HKy7R)R*<>%xD>K
zelPqrp$&BF_?^mZ&U<*tWDIuhrw3HJj~--_0)GL8jxYs2@VLev2$;`DG7X6UI9Z)P
zq|z`w46OtLJ1=V3U8B%9@FSsRP+Ze)dQ@;zLq|~>(%J5G-n}dRZ6&kyH|cQ!{Vil(
zBUvQvj*~0_A1JCtaGZW|?6>KdP}!4A%l>(MnVv>A%d;!|qA>*t&-9-JFU4GZhn`jG
z8GrgNsQJ%JSLgNFP`5;(=b+M9GO8cg+ygIz^4i?=eR@IY>IcG?+on?I4+Y47p-DB8
zjrlar)KtoI{#kBcqL&4?ub@Df+zMt*USCD_T8O$J$~oMrC6*TP7j@H5trGV$r0P6I
zV7EZ{MWH`5`DrX*wx&`d;C`jjYoc_PMSqNB290QXlRn_4*F{5hBmEE4DHBC$%EsbR
zQGb7p;)4MAjY@Bd*2F3L?<8typrrUykb$JXr#}c1|BL*QF|18D{ZTYBZ_=M&Ec6IS
ziv{(%>CbeR(9Aog)}hA!xSm1p@K?*ce*-6R%odqGGk?I4@6q3dmHq)4jbw+B?|%#2
zbX;ioJ_tcGO*#d0v?il&mPAi+AKQvsQnPf*?8tX6qfOPsf-ttT+RZX6Dm&RF6beP3
zdotcJDI1Kn7wkq=;Au=BIyoGfXCNVjCKTj+fxU@mxp*d*7aHec0GTUPt`xbN8x%fe
zikv87g)u<XFa`)x7(;`tKRdCl%zvlpDa(FQF6a4-(c(tNXi-s0t1@H6aN>~0cpQaf
zd<7Mi9GR0B@*<TNFs6&?{V6>S&l&9pCl-HEaNX?ZY8MoXaYHGDf}733;(88<{E%)<
z^k)X#To3=_O2$lKPsc9P-MkDAhJ~{x<=xTJw2aRY5SSZIA6Gij5cFzsGk@S)4@C65
zwN^6CwOI9`5c(3?cqRrH_gSq+ox(wtSBZc-Jr5N%^t3N&WB|TT_i4!i3lxwI=*p)Y
zn7fb%HlXhf8OGjhzswj!=Crh~YwQYb+p~UaV@s%YPgiH_);$|Gx3{{v5v?7s<)+cb
zxlT0Bb!OwtE!K>gx6c4v^M9mL0F=It*NfQL0J0O$RCpt746=H1pPNG#AZC|Y`SZt(
zG`yK<fxmbRn_~3f^D$uXR;DE-6l2Brn44`tAjOgDc$;+zFmZqKsnw<WO1^-%tK7vG
zq9rVGYRKsA6^HB)rDuo5<t~+X@@_Ht9zYzz5%-9s*T9%xs!EW^Uw?kI9?&CM(MEAM
zd|xD+#U-^eF-KWv>MBPV_0I|S?}?$t7G<RgM>U%;*_39bCGO*x3+R|<=9WNe!8jH-
zw5ZJS(k@wws?6w1rejjyZ>08aizReJBo%IRb3b3|VuR6Uo&sL?L5j(isqs%CYe@@b
zIID7kF*hyqmy+7D(SPa^xNVm54hVF3{;4I9+mh)F22+_YFP>ux`{F)8l;uRX>1-cH
zXqPnGsFRr|UZwJtjG=1x2^l_tF-mS0@sdC38kMi$kDw8W#zceJowZuV=@agQ_#l5w
znB`g+sb1mhkrXh$X4<U2%FUm!iUg)BMsC71C8xC>y(<-CntwmVwah5#oA_p-U<_5$
zGDc%(b6Z=!QQ%w6YZS&HWovIaN8wMw1B-9N+Vyl=>(yIgy}BrAhpc2}8YL-i*_KY7
ztV+`WKcC?{RKA@t3pu*BtqZJFSd2d)+cc07-Z#4x&7Dnd{yg6)lz@`z%=Sl-`9Z<I
zvq@B}FY%WJ&40l{%|nmhSKk!tZA)f!GeKYiaz;%KM5ZvweU<MKIGA~y{x*{g>~*io
zck_Lshk9JRJs=t><bs*w&DW%*QMrzYtZr})w%D?D^TyWZZ3+)hfHZHb_+blj1dx}-
z`Yr57thGn2H4E-BYweqe1pPoHo=wO0nOC=skqA`Su74$=MZ|5xc;Aabz*JI;TUTsx
zBeECjs&AbV9s2(kKjDH?ew*pEsRM4|QkgMxq)r%2#hz9wB=Xcs?v>1jmKB~>`6+(J
z@(S}J2Q{Q<aLwQD@U#3~m1O=Nj9M3u>{a-ASTnIViecW(FIagWQ%G41y?zS)gpooM
z@<VGKqkqS#V-&Y$lNsd6am~a_n3S50Y&>c<2$7TykMs4LH*UUYfts(!Ncn`?eZl}f
zg)wx@0N0J(X(OJ^=$2()HLn)=Cn~=zx(_9(B@L04%{F_Zn}5!~5Ec5D4ibN6G_AD}
zzxY^T_JF##qM8~B%aZ1OC}X^kQu`JDwaRaZnt!YcRrP7fq>eIihJW1UY{Xhkn>NdX
zKy|<6-wD*;GtE08sLYry<V<QH1Sv(jnToX72i-sNpHzN}-)36<|L{|pF{8{fZx)*4
zMp{2#T-wD4#<BxWH#fupXEv>W<-e)?7k;;B>e$u?v!QhU9jPK6*Y$o8{Tl`N`+QvG
ze}71rVC)fis9TZ<>EJ2JR`80F^2rkB7dihm$1Ta2bR?&wz>e`)w<4)1{3SfS$uKfV
z3R=JT!eY+i7+IIfl3SIgiR|KvBWH*s;OEuF5tq~wLOB^xP<BqZESF|TGvQX!tiq(3
z|Mp-8M+j94YLq<UQrMUO77=nwv&Hv{1%HwlNG60+0mF+VI@+*}+Yy&?lVZ@?0xxr=
z(^TnHX`Y)}t+&&KEIW%omrQ|e2EBBKDpg3BO{Sr4h#<3UH}T5KTE&42rA5Mk7*Z<J
z;?oZt>_Dc7-BbNjpC|dHYJrZCWj-ucmv4;YS~eN!LvwER`NCd`R4Xh5%zP$V^nU>j
zdOkNvbyB_117;mhiTiL_TBcy&Grvl->zO_SlCCX5dFLd`<IhUzJ>q7x-lBj*&ykj^
zR3@z`y0<8XlBHEhlCk7IV=ofWsuF|d)ECS}qnWf?I#-o~5=JFQM8u+7I!^>dg|wEb
zbu4wp#rHGayeYTT>MN+(x3O`nFMpOSERQdpzQv2ui|Z5#Q<D=p76p9*uO;+Tg4e>d
zB(+GbXda|>C<gg{Slr$#(gyLVu*4PBxH}eUBf0=-6H~npz6ZXezWrJ(10XZ|kJf6R
zW@a#7#xRRP5Y#bqIYq%2?-;boe6h4IYkgu-r1Np~n3gcG_CXgI%zf5XB!7hO#H@AV
z%SD8PvA>W55ky@mG13K0wfXAm8yoek3MJG!Hujn$5)Q(6wWb-l4ogu?jj2Q|srw?r
z-TG0$OfmDx%(qcX`Fc`D!WS{3dN*V%SZas3$vFXQy98^y3oT~8Yv>$EX0!uiRae?m
z_}pvK=rBy5Z_#_!8QEmix_@_*w8E8(2{R5kf^056;GzbLOPr2uqFYaG6Fkrv<RIBB
zuZTHP@Q)>($n_51%7~QN<&GT9$WdjE=H}>(a41KM%d2x#e@K3{W|+=-h*mR&2C01e
z2sMP;YjU)9h+1kxOKJ+g*W=&D@=$q4j<ya_SB@^U{)R?qM|jt+j(;KAZ9hVq;}NO}
zhi&DNPJ6lDnWI>F%@HyRtCwOmEmpS|R<c;xFIK|k0{|?){0Ln&Ob18k+HlZ5Lf3}_
zhv|kK-7-YC4bh<y`b;?J2zc#7^x22#i%dbM*ZC0L&2)&5c^%^Y>r9V<bWqOG;Y0i-
zuUwuJV$!S;8V0UF9e)`-{w&rX$<bqn$O|+X%6Y;o@5#|qIr?7EF?jqQ>_2br*NOd^
z4LN#oxd5yL=#MPWN{9Vo^X-Wo{a7IF2hvYWB%eUCkAZq+=NQ<Q2k7Uw(;NW*(gb!6
zQrQT-79OJiJ{kZTAcG2|_9{7g;}BH{TH?LH+sr_ocF-lDTz@9iN4$;^dNb^G?J585
z5dAJkZ{_H1vG){&&e2~Ek*6T2#m4(jd-3Dlpu@3TsZ_jB*ZX(Af5hvkRO}ZENh=jo
z)SzOLRf@=3%)A=}h*t@Mz~J$tu#;BI?7QNW$dr8L0h$Cxj#<1f_u9b}+lN{07@-@%
z`4E?tXLCILFn@b;JbTRA)K+9`56{W*-0*Vc4w@zCd3auq&)7bA`~|NmidVK(Dnc6B
zesSK^=JtbLdpIDDTwERzdgAHZ4|9!Js5?ZRUN~Sw&`}=2dN}Abd01+{M)-vF<81pE
z=oI00_+`uS3NVAH86<s#SA{*idWg?GYQ3%zuMcqZc7G4I4s#pMI!2Wuv>=iLI9?~@
zr+|ky4Rgm7yEDuc2dIe941~qc8V_$7;?7|XLk6+nbrh}e&Tt20EWZ@dRFDoYbwhkn
zj<rL!Cr3CE4%d$Gg76SWhq(7J?`<F91i%BehdB*P4D<dyLwwl?UlDFc<c;u^AnB+X
z;;REg{C`ovhdU1Qb%H*v1;ZZxc#dxfFPHBSjy>J$th974Z0F${3wtVLk_Ty;*J-Pi
zP0IwrAT!Lj<oLFr;^9vZ^Jl|Bmlv;}%kdX;eAfuy4L`CkS91LIN(DUKKXYM@A2i)d
z#?QlWE^#`&wa0R^pe*dC9OfYqf@;k?pn4ra*MA_~1S=1T73q^TL07=5cwK^0KoC02
z-x#GOB0~^^P6ajBVLloTss(B;uOlR+R13rw*Lqzw;|M)oOep{A9Hn`fkB#tC;gA=S
zdhNAP>34GcoSB8g?IKPt%!iLD-$s+f_eZg@9q!2Si?`F#fUqY`!{bM0O7V^G%VB|A
zyMM>SKNg|KKP}+>>?n6|5MlPK3Vto&;nxppD;yk@z4DXPm0z9hxb+U&Fv4$y&G>q=
z799L0$A2&#>CfSgCuu$+9W>s<-&yq3!C{F9N!{d?I|g|+Qd9@*d;GplgY5Fk$LOV+
zoMealKns!!80PWsJ%(}L61B!7l?j1_5P#LRrVv%NBhs{R`;aufHYb&b+mF%A+DGl5
zBemAHtbLFi++KT(wv9*?;awp>ROX~P?e<4#Uf5RKIV{c3NxmUz!LYO#Cxdz*CoRQp
zSvX|#NN06=q_eTU5-T!RmUJ?Ht=XQF8t)f+GnY5nY5>-}WLR1+R5pou?l@Y|F@KEX
zk=jh-yq=Rn9;riE*;S<SC4qvrM$x?L9*?xeN{b$8>lo}PfNKhXO#;FrZCf%VZ9h7W
z<63YWE^s_SlAVQh6B(En9i<9%4AT|2bTQ4Ph2)pI?f2S`$j?bp`>_3(`Fz&?ig-FJ
zoO7KAh@4BDOU>sBXV84Eajr9;>wlbW&OSUt&dug?oAV;`+3oBzpI18%%1wA4blzmb
z-{QPYJmn_2-F$A5JI!a8+-p8Bk*^U?^f5j7uZ}jEz0E3;XbahB2iZwS&l4jj4WRS6
z3O&!w=ymQSl~7LUE99noXd2y1)9E>yK`+ouR%sTOQ@Qjt@<<O;g>;lErGLk1wrw7r
zV)M})+amJXs_9hQa++&vrqgU&Xr8T)=G&5Vy6vOnvt37L*nU7&ws&ZO-9`)TGA**t
zpby#0X|df;etRud+s~#Y_7zlPZ=_oLg%q&wraF6s>g@;VO#2sUseO=^+3%&Z?61(-
z_IKzU`+Kw;Blil&LR#qv&{rzQnG|%i(Q3zLI@gh)2FE^H;~1dx9G|AOj(e%mSwT(C
z71Zp!jar<yQ>*i3S|_ik_3{n0L4Kav<X35<{5EujksbPy$o79wO9u!wto+&^6#xLx
zDU;zw9Fxm!Ie(jbdz(GluHDkTx^9E6ZQ4Cp*}@o%j!C7Iv2K*GVYy9i)4L_PCHH3C
zKoAuX5d;y`ZOBWcqNspfS}0>YWWZ2x3MhyU!66E$h=L+A&-s$9X_w9Q_e;+`-{ZW#
z^Zn2H_I~`}!vGeFRRY^DyKK#pORBr{&?X}ut`1a(x__(dt3y_-*Np0pX~q39D{Rns
z!iXBWZO~+oZu>($Mrf0rjM>$JZar!n_0_!*e@yT7n=HfVT6#jbYZ0wYEXnTgPDZ0N
zVE5?$1-v94G2@1jFyj##-E1Um(naG-8WuGy@rRAg)t9Oe0$RJ3OoWV8X4DXvW+ftx
zk%S(O8h?#_3B9-1NHn&@ZAXtr=PXcAATV*GzFBXK>hVb9*<BlrkfXpOFkOx&9W&Y(
zvf`m+B4Nax#%9{4cSQ{aDs9}XN9RPXkRCnX>`iMM-zvA6RwMH#2^901uxUFh&4fT%
zmP?pjNsiRIMD)<6xZyOeThl_DN_ZJ*?KUIHgnx{vz`WKxj&!7HbM8{w?{Rued(M1v
zKHsK{_q=YI88@Bf0*RW@cIV@=<{eGsG21xrTrWycT7*KBd!eD2zb1R(O@H~k7>Duv
zHPwp=n8;t#1>7~fuM9IaD5w%BpwLtNCe_Sq9eal4oj2DB1#<+(MGR-P&Ig%3t%=!<
zS$|KxI1a~an2Q>L$s;1$9nQJal4dk)Box$YsAKgCiEGni##jr|%So6Y4J@pYBF!;~
zhXwpKhc7&QZ$=e~Sb&ABZ4o)&U~N*dSU`2G^eQh-WCe9tA}~Ae369btLl<C!I4@0`
zGLiyiCAP}Ip6|uUSkAMjkh!MKQoLA^9)CJbU;;V2qRY0TNyk{NJ3U^kOnY~_K;@BB
zLcu5KLh7NAVN*uVr<{z`95sXfpBG2jJSRh&8E7bWE%>B{GjOKB@yEDH!C7Q&df^#X
zi~?{rCuAE|kAjKzt+r#t6s)1h840@A<%i5(O;$Q&tD(opg0)yzgm#=ucf4CSqkqYS
zaTdivk5I~#=1Z9K5M*uV6H??6s9*ynT`vzr2@%Tkr4k+Tr_ib40$fPP7$yLA$cwJ@
zF@`94=op)$x^0t+QAsNY$pi!4e7hp~gO=|yD=^8JTvTiC(HAamYEQ<z*u)-f1l>}t
z+hR~QoKTOz%)IHEg&6iC4vP=3mw&u4wvcSwi$vNBGQE5RoSUs^l+u{A+6s~aMMkXG
z+1g4wD8^Y2<w_nS2m7!^!)8#{7e#4=)sw`MntAKTV!<W&H0!%Gdm2*8ibO(};uU;G
z!{v+vZao|xa~v5E;#>7Oe4f``K{+tm76n(*d6<qtVYDcTDn?n`k{KsEu7ARpit$BU
zO%5GCuizR=3aYPd#umqmuV8sGuEli(j&V8gRm|pr8z_!ZD-tnC(bRl*s8vpqwi|I%
z5e5G1<n>BUA4;pLa26`6RD6?Rq?2K1yMXVAk`&xbks*~{+``Mhg<C1&>4cQEuw+aM
zaI9{}9en8DCh*S9CojIk)qh|k?#iNiCQ}rAmr&iYR<t*_v}8f?dyGqW<NFj*>JiND
ztt+j*c+}Fv&6x&7U~!(Sb1eAz1N@Nf`w?YxGJdhy+seiNNZEYIG1_<^?&pm^P8W?d
ze(p@$nWC`<TizHIL&PKuLfOp(5!FYo71^8O#e*1TDG!miS*@ofyMMclgb`k2=(1it
zOy`uHYl-(JGjNifek5D#G6v@?QSexvgOY{hCmJ5d69R?n)~@m|QSqce?a0C$8AmKd
zPiuG-dl`ogZA+V!ng6MV-S`<@5t0&arOwZb=Qw1$@pDoeidr^}{DPZ--S{QB*lZ=E
z;i|ahRCP1RRMDO2sedBSp`3kzl0HwSW)nlfuPE-e-fgT)5SGoT83RXSWBw9e*6?fm
zW=uKHUizb!^WXB#`JI4hQ1L1`M=sk|JU~Ximc<#lb8Sz;>Pxqpf8d&AIGNJn#Ty)j
z1NbA^Y}pNQ>OfTdiAp+WR>C6390IrFj;YZglitGH8r7(GvVRpWjZd7|r24M{u66B)
zs#VS$?R*!1FT&sO-ssvW<tq3m8RS^4Rv%RhdIO9Ylq(~zK_B2>8s5jh$-O=^9=7^y
z75||~QA6zLW}Lu!YOZh1J$j<uxF~7FLunBCFFxk|2PtY@W;}D|s-TC#l#yK&C~irz
zJ)LlKO7+mYLw^;8gj**rUaSg*9OH7S$E~<Y_R4E3ie%d(GzRSTN62mA)kJ|9M>46m
zNH|;^a$U_RKgla5h>5(igl^ek(~2nL5a_0}ipvA_Xf0k*E-ExJNld0{LZ;<hGrGh%
z-E8jt^9rA+<V{mY6*3YU(;bJMpRS1+vY(!7&yA~szJEO3a#mnjo-|s2#GD^3m^4?5
z*(6)cVFgP@<q73CU28=gPXL~IU8RS{cGKxmk~L4%YNAHeQ5m5Qi2AN%uj3Vd0stCq
zAov*p0NZe?j4ehe>F^DzqAL+IZGJ7<3<z}D#C%puf*qsH=##y!SSZ^IL9KS>i1szf
zxMRkQ(|@;wj9%I7h{c*{;?g%giylU}Dz{iwb(1vGK<-vlnKs!|Mb9}iTt)Rl&NZka
zkkugrMiY(ng3QseY!npaOf1jo3|r35nK+eTYh*`DHa<o;XAO1n1<mxbre>buv@IFy
zG7@V!LWE0&)bvqgQ8=-L-(vt#Z-&xaOj3G@Nq<T&HvleLUxrEa;$BHyE$#OZolzUy
zu)$Zb6BTtkF{OSdD*Zb#%~!Y+GX^p1KJZ@&sxdpguW$$HB<b$!YKJj5*jhV)DJjew
zMqRMBa}f2Cou9%9rA_oNg{6a7Hh{_$PThvZbtyD&Lj&!ppkHM$g;hgn4W2cCbAoMq
z;D70NkFUEQ9VBFZ3VI6Rj@n>w1FfbNQ`!bFEl@z)0)+#Z5e#_hQ|Rd!KrEoRn^aFz
zkzYzz%hher>ixcg6fW`=rr>Nx@enQ!sQqYR{<2^|eUfw?e8;B_<MLoY8^mWHZYp*+
zdCR@!#dlz)Pc8Q@3<kzYql<l-kG{UpaeswZ^dEfHrv+4>`T)Kxkp8${U>g?k*VhCd
zp^yYLvi}<#5TDjrx@{0U$jx*tQn+mhcXsq2e46a@44^-Sd;C6S2=}sK1LQ_OUhgO`
z^4yN+e9Dv9TQ64y1Bw)<aDY=7<mf(-mAEUQ4oj^*)u;J0N8wMeoS(Cj&Vd3ljDOw1
z4ZP#g;4mI13kR{M^r=BSGl*wX*cVV!c;2T5lzy~vz>0i4u)98(^+@R~eUUsG!Ye84
zFa7-?x3cqUXX)$G<2MgYiGWhjq?Q-CE(|sm-68_z>h_O2vME5nX;RodIf)=No(={I
z_<&3QJcPg8kAI}_Vd+OH4z{NsFMmjv3;kunMSh94VNnqD?85uOps%nq=q?kU_JT5@
zwih;eQlhxr)7d^K#-~InWlc&<*#?{A(8f^+C_WmRR{B&Yh3pxhLU9-toLz%rCPi}}
zE!cw^pQlXB3aACUpacU&ZlBUl(Jo4fxpbDVwDn^m{VG||ar9B)9}@K`(SJxmAWro&
z_3yzfUqLoXg`H($!I;FTudPdo6FTJm2@^S|&42H(XbSRW7!)V&=I`{;mWicu@BT7z
zQs!)F9t-K|aFaMsoJ_6z-ICrzjW5#yJRs>~)bugki)ST$8T%!D4F@EBliCNSA5!fl
zN;OuKbR3m0rj=rrq}5`nq<<%iHIl|euXt6QA}$hFNqV)oR?_Rm4oPnoLy|ru_DQ-=
zJTDFa;zjY2<PV6qn7XcU-RK@CR!CYTnq50ww@RKV^S8O~lsr@B`&|Q)XUhDb>p{sg
zWqz0I5y>-U{xR1Rl4r{NQ?6Ge&y@N7t~Vsll=-(^?@FF2^Y6JnkbgW==09{7N}eh4
z?h<ze^O6!zfO$HB=SEZ#@Cuws0NepL)}w%){Dt(+^x#SY;TxdhE&|n$potYICXn@t
z2*!yR#=Dkdf@>`%x-LM8D}+*41ZA#EG0D9K<?ahm;SOQ4y9ZO;o8WU>Qjc2#z59Pq
zO9u!y^MeiK3jhHB6_epc9Fs0q7m}w4lLmSnf6Gb(F%*XXShZTmYQ1gTje=G?4qg`Z
zf*U~;6hT37na-R}qnQiIv@S#+#J6xEf(swOhZ4_JMMMtdob%^9e?s#9@%jc}19Jk8
z4-e<fJGUi+8%jcV#|_$U!wu3nQ(ERKO}sb_iFHGoq$S?$Nb3b13T|vSw(d?_YD*0_
zEsMNZW}YfMsI|Qnwl<kH&7b*pS8En*M|$f8l0+&YGAfB!?UAv37VFKm&9#%ydPIM(
zdeUc9>KFdIEVQN4T|=j2t&EtMI{9_E$cx)DHN2-1mG28IEdMq557#dRO3U?22M($g
zlriC81f!!ELd`)1V?{MBFnGYPgmrGp{4)cn6%<#sg5fMU9E|fi%iTOm9KgiN)zu3o
zSD!J}c*e{V&__#si_#}hO9u$51d|3zY5@QM=aUgu9h0?tNPn1w)HWnB7LQ^GRUjeP
z(zSg-y4St;3UIQ}ZX?^;ZtL2n4`>^*Y>Trk?aBtSQ(D-o$(D8Px^?ZI-PUB?*1fv!
z{YdHme3Fc8%cR@*@zc5A_nq&2=R4<r9-m+R&Zn;t(I(C@T{wI8;I=1PhV;xy!^*aF
zw`7J}+FLSqet*o&>7Hp@$-JF4Fz*;SLw5}<j_PhQGiqc`x`n*k(mkx_T%)~ZY$Tc2
z$C9SVFow3@ogLZ?UT0fn|8OCf!-PAkCpQX<HDX$Z;h5G4W=|Q8i?cAltz&b?wq({g
z)$(MBm`NM73r@zk-^>|ID{W__bHvfJIivHmqmPXlPJd^=<$8K97bHK^(i8eAy)&m<
zBc1z)P8b<4NOeqgIeTQpaF|x5YV1#`#T`tctbN+b*?N{~O)bV<<z=w0G|psl1=l>K
z^y<lE4A<SOTe>>s-s;V!<r$8p=Q@YM*qO64CvoA<-ScjT@Va|U%k*|KJrcWxzPHq{
z*5U!(8-ML_T_Zn~!}hj^n0&Fehr+a&mTDBF2BsbV550rbq|q{J2ve9A)l-0$hbct$
z@^xF7G+HQME8$LE?OL~C!v?02niniPbVo`#)3iI~u<}T`cF+^l>}b2i=5=M-ComP?
zju>8FPIq0VrdV5*EH$|!Ot;e=VudJExcb;2wST}N#u?M~TxGC_!?ccCHCjt|F*PgJ
zf@kJB`|Ml}cmsyrAjO#Kjr^E5p29w+#>$C`Q|54BoDv$fQ9D?3n32P9LPM<W=*)YE
zse?M@JlL!0rj#DX(UtfhZPIA7xNo89?lK)HVLRht+EUVTE40?LfOK;#H9I(V$ZfXK
zc7NI5&9r!?jzPMIDQLR8<sxC)Nv#X%Ub>Izu?LjNqggOH=1@T{9bMn*u8(GI!;M<D
z7tPp~r<+z(x5mL%(#bU3j_B?)V;C6OsAorqO)DEU&gdC0Hy+(M%{Sf=qMjL{T=I92
z`rwLT+sW&&>Gs%MKpd@c!?|2x+D-Rsw10~pU|Rn@A}C1xOlxCribxes0~+n26qDaI
zA2$?e`opx3_KW!rAgbpzU)gFdjAKXh|5w``#F0R|c)Y)Du0_Ihhz^S?k^pk%P>9|p
zIDx)xHH^_~+aA=^$M!<8K~Hy(71nJG(ov0$3Fg{n+QicHk{UcoFg0-esGM}1X@Ad~
zBS?<d9l7c>mZCLw;l4W4a+D8qc)XJS`pUJ5X-f^1ytxwr`@si$lAE?{4G|o;O0l>`
zrr?;~c;{ZEFJ!!3=7=FdGJ?Q^xfNQh4A?i;IJ4}B+A?4olTK(fN++3CRBP97jTJnI
zF!X$o@{%29Dqq5zt&v4zmF$4E8GqYQko@>U1_;EC_6ig|Drn@=DMV9YEUSCaIf$kH
zei3(u#zm9I!Jf(4t`Vm1lltJ&lVHy(eIXE8sy9sUpmz%I_gA#8x^Zv8%w?r2{GdkX
z1SkzRIr>prRK@rqn9j2wG|rUv%t7pQ!2SrmOQRpAcS|Wp-{6gg=|^e5#DDOQVM?H4
z;eM-QeRFr06@ifV(ocvk?_)~N@1c2ien56UjWXid6<wFbYO4An`mpeRM5@Ny3+Rl(
zbU`xgF8Zh#5IvL!n|{2MoS$J@0_^k*xpuDL8B(Fc^sGo&OFzjx`jEid%&0ajY7f^6
zfatIeBxLVwwOXw-I;EOCd4GL8I;x*CqC<vZMLj)_&_*6PZF-{}tyZ6H4Vz9r>W%6i
zevIh)>dk|rIs##^kY67ib8Kw%#-oVFaXG7$ERyA9(NSJUvWiOA5H(!{uOpcWg&-?i
zqPhds%3%tFspHDqqr;A!N0fU`!IdoMs=lv7E*9NYeVfBht~=W5wtrfcc#o#+l8s8!
z(|NMeqjsy@0x{8^j0d00SqRZjp{Kj)&4UHYGxG+z9b-)72I*&J70?+8e?p_@=>-(>
zl6z5vYlP~<2%DU02b!mA{7mS)NS_eLe=<xzM?bHjUHTM)uwXrIBDU|SS$l5gff>CB
zc62^$j+OeC%Nkvg?0*n6EKlkPQ)EUvvfC=;4M&*|I!w}(@V_)eUKLA_t^%`o0PM9L
zV|UKTLn<KtS!oVFL)Q?{mT|@_FU$^-=?e7A^ee*ttH|7QwB8Lh$Ak3i&={ey4+SMm
zFH1;#j$T3N&fB6&@Eme<c}VD`qAe-rH_^|z`mhQuk;Qb^_kR@pQ1Z9v^BTQMzbz-D
zi>k|?M3u!|f2S0?UqZsEIH9*NJS-8lzu;A6-rr-ot=dg9SASoluZUkFH$7X;P=?kY
zX!K?JL-b~<#7wU;b;eS)O;@?h%sPPk{4xEBxb{!sm0AY|>CXVS(<o0c_+LmB_;dQY
z{5&bUko`3UMSlskT$p~5en}AeSLoCF>_RT9YPMpChUjl310o*$Qocj<cT9{r{SUb7
zyw8~+eM{OAdn8QXmU#Ln`e$U@gLrUCREOwaE9Fi3=+LNRpVo&2-v188V4HG54by)L
zRQ`khtGXQSuL|V<0Y7?3JSYt>Gdf>jS%%kn_+Y;Ztbauie*k&Q@=9;erLneIoel2C
zfCMiPTmYnjjxjV!Ar1h1yQ-31h=b@RZt-play?)#cs=ZxOt;5oX)|*e=7k*ASmQ;r
zO4_`=Z&gX-C2$fitvq+iGK1U*^*#IW!Bo{nON%KSxQv@MZsO%Lx21x78z740FSW!f
zJ%f-?XMgR#xdurqd6mWyUX2uh=Si>bnwg#gssR#jDVN{uEi3n(PZ%PFZ|6J25_rBf
z0-u>e4sFe0*Km49ATi7>Kn0f9!uc|rRMR1Dtt6m1LW8^>qFlo}h$@br=Rmpi;mI&>
zOF64Ba2v-pj&TB}f&A09bMg?1id{fn<o+-xxqqV`I(4E};GFW&(;WVov}3%HH;IhR
zkfD^(vt^DjZz(MyHLZxv8}qzPc(%itBkBwf_fC~sDBgh<3XAv5cxxfF3<2U!03Xe&
zz`is!JDHbe;mNmfkH+_LFE*I2^mdL@7(@9D^Dbmctn3bu{98(dlh7lKI0#mGVH(z)
zKYy3Zj)--;jA6Zy^D5&5v$o^>e%>Q?9GLm{i~p^lAn!%ZtF$I~>39XVZxk0bROh^B
zk9cE0AJBLozZIEmy7xG(yHWGztvf<IsL>nr0(2ro1%>zsGMS^EMu+S$r=_;9WwZkg
z)ww}6KOsH_)RkMh?x<ICbu<>@N2R^3(SICQNAzP7(RdB{@@`v*GfeSYLv=cfmTC<f
z(3^*m5~o9A&_)%lVDe@XW#mnNpPfZAT#_;^V_zXZWH^UJ6m3LR2*TSwYLLJG;HyFY
z`lD!=7J&u<gT=H2Ir9WY>%s2_T@_Cso2168v@AU^NzL&qv?6hZBJEdb)g=X=dVg9?
zYf78=0c@!QU6_a$>CPiXT7QAGDM}7Z(0z#_ZA=fmLUj{2z7@Ypo71UDy8GHr-&TLK
zf6a5WCf@Adl<p1`sp~vxi3mP+969Ibi5ssa2I4Q#TbRyM)c;uurU!iOgN?oMDSB|=
zD(y+9I6g^xC+NfA0s{OOtJwzUuz!ukeJ|0G1?Y9wVt#Epor*W6C+T4*d!Awmb^e`+
zt8`2hd<5gi(y5neN#dISS*lO?HcgP9U#UJ~XwDIf)F93nBt8WbF`vY59QLk*jStWQ
zJkES{3dVXbto#gSCt&^8;FoX1oHxK%PZ`RVjar9w@!S{MUm^dc#^EW-?SH#UR=V4t
zn54HiETzwcx&slvSnPCqYuz){n2ZE`&2>e3VglBt4>Z>;xF}}-S~B7<(%B;Y0QR55
z{z-buw>8ilNM3u6I+D$S%?)(p>=eBx-HpvZj{7c*_?K=d()*7<Jf=Q)<Xiv_`BJ;c
zIiKEFq>r74N{MulF2dQ*rGJ8Al=QJ~zb`)MPYedy2kVl9jXxdnmn`&r8ut0w>q?93
zus}1dq%FAFYLsW8ZTQ_XZLh`P2*6(NgS}qGcfGXVWpwsp#Rs}IuKbk*`2}&)I^Vsk
z6S&Q4@oYS?dJ`NwMVBs6!1v<01<?I<a9(_|3|urzWgBlTN5^wl>3>Q(y%%a0i}Y#1
z-F3m;Ieh#Y12UgW?-R)|eX>ZuF-2cc!1>~NS|XSF-6In>zBoZg+ml!6%fk7Uw0LHc
zz8VQk(jOJ+Yu)|^|15ufl$KQd_1eUZZzj`aC%umU6F1&D5XVWcUvDqcUtW@*>xfVd
z@!G2_v`o<z6jii^T2vK{(N;yb(@sTq(;h`rv|rJKbWG7>bR5<t(rH-HQL+^+(0de>
zU*UT{eMHfcUo`jw*u?4r<c@DtY>2s_$`}U{?NjvEm(u&<>B|%mq$Q3weshzrh!=m4
zH~yPq{qO0O>o|+xpE_i3$yVP%gs2l20HBh&_;PzZtwMPqQDk4~L}0tfu;d4uxUM8h
zx$5GP@<Hv#n>d7%rg(9Y8!9@i+9&2l=3<|?le_)g9Z)PQ5ESCo?x4680QstTl-CH_
z5m)j*Epfqj7I|G0-*vpm?U#8&k?((2zg<P{?hZ7>;QYNszIUs?zAIGUr9}em3I$<A
zs5ixZMZW(6J+@q19%>Fhb*w9-ci~gV$1;8(U;p&SDZE^3_CNLX1zM3@E|W%A=rX4;
zwOlLm!AP*(*Bl0rL_(L=6`Hv5>_8;g?VljGOuMhr8|fxKG|7jrCnCW}AbEe8A8O*a
z;rbQWArFQUVyZaIdGyF7WbZ8lvQ6v;yEgG7uqYA&H#G5ad?wWuhnhHBvUGfsN3K^(
zewji7_p=ede8DTP$FEa_M(6|&v8m{z@NJ&XsIgEPpP?ss9mYaeWBd+!UX6vy_yzie
z8Vi;2C+U(J3ze}%uZ)Gt_+?D`yc!FY@z?1aYAjU7Z=eB`u~3ZJ#|<)8RL1SxrN%;K
zoZ+XHo~5{G1p40!tUgK$I7L3rV9Y8@Eg;`_0Z>Z^2tPilXQ&PU0NNXq;YJ*jtBNjv
zYflqF6o%gs=t3z%xd|2&*IQdyR=^LH8WYpRgrrep4Mx6Aw}<V*UdmoD#>fxhSE$jN
z_`x6Gk20R2MM&C)-R$h{nfE#GnVgwFe}DZ3unAM(^yK7C>62cU)*<-~eOtHo^)=lJ
zyq4q2*a>{Y3mU}nkX(`x@nlm*hSem0>o7{ZNZ;O<ZbWN(%QigOG8~nI>Q5dw>RYT0
zOXvK4;<_A&n$p-%65n=wqR{bejviAOu@}cn>s#w3qd~{|=TQiObS+3ii(WV`2`mPo
zZQ7x1xMY3^WvfM@Sq*HPLJh+LQwQ=`ny&P1^Hu$TtXM-zVD=*VoC&`n>n>@37!?>f
zN*sy>#GXLvspC8GGlAj!USU^YC|}skAcN~^Xqe0(jqx#zAj>muU<=IUs~34|v06u2
zahGbSeT-uAG|Vv*B<wTSL7c#R&H9)rl3qE38(0{_JQf9J`Uo`S1hke4xPAu9m`!5|
zx42|^wj6;+musmsWmu!5gnWyC%7tpb#g_%ltB{@|SD-83y8@d7*`1w%h8tHyeJmd+
z%ZJ?fd}Uzfh5vJX5)@T}RqkqqccH*!l{ekX#H&;IR^iy-o@x*n<0q?{%;#c+zcZNN
z(cr&%T;m%^7vKNHRPG0+zd~JE%wV>w$#pf8#qXFtMfw|VuC{UeT)2WpJ6&O+E6jF;
z;~n9>cf~Ip6j<jm#c!}kVfVY(Du($6W;)n}!j_iX$oGOnXJBElU#^X{UW^X`qsn*a
zA5cpN2wnEIZ#$D5jcI?ahqQ_yf+s;y=zX)9CfjZ{VK=P@u@B-~coIDL06vsB5j{8y
z^YQ)mn_2er>-_@&PGFD0%Vu*QJ@Ht`C7Og!xt#L>mqlJGEh<%*ATJUmZc(FfNSB##
zfy_`Y-70r{Iv3jEfR|~Ii!xC44vZ(KNj#>kjsE86E3FB*Oay<UI$}~~5UnyP(KT8}
zZxN4%<6#sexaQA3Fb186Vr3;>D~$|}3Y&(h6^X|1(TcJ}8{Ua3yL1loSfg!2gTekn
ztVO7WNyFQCfwF2ti$UvL8C6{{IPBg01XK~$ThIQx{)~aw>(9F2L#G36*kRDPqA$P*
znq=!@bbQ#RzDpVIfYc*x9=}2N^*2z1E%3epP)i30>M4^xlbnuWe_MAGRTTb?O*?TC
zw6v5$6bS)qZqo=w4J~*9i;eVx4NwO!crrOjhE8U(&P-ZZU9$We^ubqNd73QDTJqqV
z55D;u{1?`JQre~$mu9WZ%=z|x?{A;q|NiAy0GH5U*nIM2xww(4aBEe#)zoy#s-^NN
z%WJl5hX=Oj8cnY%e+ZYt5!@FfY;fPO8p2xj+f6?;UE_`~@~KwcX!4d}D<7hA<#M$$
zMY^)MV_$1K4gr3H8yA&|Ten>yr0v!TT@%u$ScDfRrzVR=Rjj3cjDj)fWv?wQanp7L
zL)Me^LS6EzBMR%1w^~9L%8&g(G;d3f4uLKFIqs5JYKSlle?R1Fyx?%RURbI;6jq>N
zh+(uYf`e8J=hO2&ZQCoTU^AKRV>_^&!W{P-3%oVMaQqOcL1!4cYP)vuF~dMQb1#lK
zj_HWu4TgBXPYuJQYWv&8km~(7Mlh=5I8HE}*mJ#?mxhx%#+9e>eorO0)eg#m6uhb7
zG^KSg`Cbxlf9XizZH9>B@hZcqJ*7VTp6)w1tHLB11}(?)MI0$rLIUS0;Z^atECLmz
zzb6FE#PKdBl;L{}$M%UdWEi4$AS4ew$#8O?ZRr(G4syuHkcGi8a#*gRz@QP|7R93=
zj*A$L;eA}9id+JyWjkK`Mod00;{&DlA!QJFR3&ljf1vI*O1ec{(V=0QA?ELLVls-W
z``ELsu7M`3`vI4MzhVcpJ!9#^KGjq|#b-J`!F7h${dUEFmBLuMbYu>nV^(S3q+UC;
z7s@e_qZG#+N=oo0o$G1>6Y0a{9@&9;EU2+8k|7P6p?HMh|8#X5UnwpxGbHw;%WXHX
zn_~8ne<fP#lF)ExhoOC?U2oe?RjuMZTCZ6tJ(*l@2sf$dNaAE`m*&YDvG!UNU;j%>
zdvw09V+G$(lhoq7L}=qb+OaPSD&;$TuUtG(4;py(h)8|Nord(*d1ZH-Dmw1MqU&RK
ziI)26r-hE(pqnmo4uixe^`qe<N`Hnro&LZOe@TGNY!@+ezJoVIjBR2t_q>a7(_HA_
zR2K<zF>jdJ4$g!)7ve&Q^b1Tf+{(Vd6vI<Y)5k{)=3<DMk!vAtJl*=spzq;Wh%e0P
zNQhfMZ~d7&9mx~AM1m0Im1kSO<(|(!LzJ)!FT1#FcClh+AB>nCd>i725IomG^(Ez(
zD8L!4qlUAX=)EV9!3JfWLB4n1z)!ums&0UuuVLUHP)i30*5f6tnv<ZCa(|(K<w1}q
zl?27Kf`O2bZM(f5T<@B@Ye_WnLHrE9(8R{X7k&UglySCqr=>k?lbhL{|8I78X7|_c
zA3p(L9<~X5y1L3{K8Sf*xL|5gToDT;aYig?m8z^zQ`XdEMJqC#*O|ho!7x~+MzT<5
zg$turF~pS;RSY&GR;6TxR)3Q+&%yG`3&ngIwR*<kOEpEo38PGtb6lcIvdWk)s}j!E
znQq`(IG>qK&t{TERu@0|fDrKKw3=RE&t-)Xh-$i&l5|>BSn5)z)hg3d?<~8msU=ye
z>CHWR!9yT;PU|$KP*qAD<j+~b^g=HIp(q=sF6V1pM<B4@RH@8N9e-x`R*`CrZ{dLn
zg!lht%9(t}?YcMAEE5=RoywKz{NhrsRw3YhFITNh+_SU+T=7!VFW$-(rqxUWWRJi|
zohovXnrx>f(V?zj^n^g~nykv^I)Uz3{78Ty81{n~ZsS&7WH)#Ach3%UyV<js2d{R0
zFe-o_ZuLPAj1lN}N`J-oXZYZ*0D={~FF?TZ9tbdCd7=P82yySB0AU#9-Xj771~YfA
zl`a&!UOT=iAM|m3g2143U2hd&C>D1s=Ahvw9*%Wt<42vTt%|niux3Zww13+oK)-d~
zG>VKHM0ov>KXKaUH(Cc)#9GFVSc4EoUbnRudxi}T8J!VNY=4g*Y7C*Ho7#^wUVt&<
zKN3&ugs1Ur<7<OCJeL<=IKCj>67&ea4^1oBw%@h^+YZ<ko8Pq9dbC0G@TTE+3rA_p
zO3+3V$H%9q-(e(trvZ`hy#|bPZ-RT1p=huHQ=SGyzXJb-AO>+eK^VI5573*KZosq?
zpMj(u5257?^lBu&LF9`ao`sYf9&zx;uK2iv&$;8{4nFUSFF5$3JHFuHORo5YgFkV{
zCmcNEicdQDvO7NM;484|f=_+6!)x%g1CL;L9DE%%T=1xaKZ8v-+-@x1OZ;|0_a9J8
z2MFd71j+6K002-1li@}jlN6Rde_awnSQ^R>8l%uQO&WF!6qOdxN;eu7Q-nHAUeckH
znK(0P3kdECiu+2%6$MdLP?%OK@`LB_gMXCA`(~0RX;Tm9<mAqK?|ygr?tAyWfBwDo
z7k~}8%`kTQbZ_&?z<?AV;%XwWEf7xzLV>uJ&d7>n%9<KZYY9&CI#;-4e{fnHl#FnE
zkjICNY}yEHOG=8tLxD^xoR%_SS=itMTQ?;JHj=L1oX01#ib4~{pcGy&RMeELa<0p2
zie`toZjdjUZ*JPy)ErLm;lL?37=tIOW%W4UBP*OCpy{bdN|zD}kBsP2Cd2i}AxG{W
z<?*bk=`K_<EIcL+OA$p<e^Zg}fnz*wx=>A~GP*{Zrpyh7B^|a-)|8b<&(!>OhWQ08
z$LV}WQ`RD4Od8d3O-;%vhK7#W<7u;XvbxQo0JX@fY(C0RS6^zcd>jo287k@<4tg;k
z3q5e5hLHE@&4ooC)S|`<FXqib6_$A6#vJjr%nJ|Zimw$6-r_i1e^^C9@=@6^4cm2}
z7x&`<4_3oZ94MNUD1_%l01G^1<spW7I+qf=2&QWXbcLa|zM-Q)f7BEe-tNU3tQCMd
z0;IUvBk5c<9ex+)0eMEeXh2XnZe(aK%Gu^fR!y#}l9JEd_AC!%MdIY2h@ibhDlUYn
z$Z=;lO^IP$*&-B2f1Ha+<!0nSZ#%^l!8#9`u%2Oo!AmSM)YO-1i@I&ZCQ*gWlwhJr
zxs}e48;>w7N|jm>3tns$G}U4o!(2g=!}xLHp?+qFvj$ztd<%96=4tCKGG@ADSX{=m
zNZ@ho6rr?EOQ1(G2i@2;GXb&S#U3YtCuVwc*4rJcPm$kZf2+|!X~X6%(QMj{4u)mZ
zOi!(P(dF3hX4ra9l=RKQ$v(kJFS#;ib+z9K^#Gle6LKa>&4oMFJ4C&NBJ7hhPSIjc
zOno$M6iq+l;ExpH9rF68@D3-EgCCf}JJSgVPbI1$?JjPPX!_88InA}KX&=#cFH#s3
zIx<6LeY==wf5DK*jP`hqF%u+|sI)3HfyywfAj=0OMNUX2pLR;T(8c+$g&}Z#q9L>(
zD~t~l&X^VFXp@&w92f8tq+KXMZ&o!an%$#uo^hJh^9-RjEvqE_s%H8{qw(juo4?SC
z{YhO*`|H*ibxm%ZF6r=2QC)bE`d3oZ(~?<!ZyfHJe|{^JKQAxi6%Ss*s|>;a-(mX)
zb!|i%p!VVP>DN6tg*Ry97gUPUJj<}OxaYL1nXE}hxs-O{twImUw<O2r+a8?5JJeOn
z-4ZUmM`R1eXdf5gMV4(VAK*g|-p5Dz$VydQ_=KS<u4rP*ekLxPPjQ}_T%xq9ZhX$L
zwp^<ye}BHd5H7!D*x9A|hb1M;{UfqD=pW+8?JD|>43Eo6nJ4_RTDIQALB8H!3nq37
zcE6>oNG;jZZhXh!vORPsMKfzJ8_*?O7DfGmcrL8A(_NAhSH+JE?u?`xR1|ZThDb;2
zDt`9hC;UQ%94^20-MA*;<$KO0{3b&9y(ENIe@&xj6>X23)Ftc?ax=4pL5FZ06CPOj
zgG%2<Pb(@_2fd`avgrY??-$z<>*<WT=z&*(8gcQ{SB<##ZAni8k}eRDSU~@i0CQml
zDrxrb#$aPG6pW3-H;LL<tZN*LZ(`|9EWe4B79Kp0i{W56HuFcg&;%Z~P~T}GM4uZh
ze{AtJ(_nk3-@;=S+I+id^ki<d*Vjp-o=|^<g{XytzNcw;IJbDz_biR#xlz)>F$-x6
z&si`nj955%8LK)caVl1M8?IPaMPt<WLU;mO-+HX@*|}0L-G;E3gR?W7x9e6H9GT{B
znBvW<o>M85o>MvPUn@(X=!wZq0)at}MK|kJ&K<Rqc0O3RM|#tTjjbDBs~mqf;a<$8
zIF=hnE-|aOzi~Bvr@T|Og86i<xK2%}_`L=1nN}~!S>JggGx6y?Ey21qiw~76MoISk
z+LyUR=2+oJK1IoYOX~R}S1x>iblZ|_oAmqhyU+NpxvjQb;Ht{pO_xn4T+UO<73|gD
zaq0Wtdz^7GoZq-Fu+;61dX%|tud0myO`{vHTlP*oes5OaTBV$=y?3V{mRnFLdQ!Hj
z)lErp+uBchtEPv?ao=?feR1oRVaUdpIVC}+xkgTxPYSGDyR2Zw++VdTe(-~Oh=P%c
zFD5UUvx;?cLREy~<lwo<(ny!wGpI2DPxgQVm&q6BI>~@9BnQ?{+kh7j7^BGZ3r}vC
zuRPgbSbFk<c>*%f8<`nm*%=sYP!wJk1uNV$&qN0K`bt|AMMaWeMf&qirQ!Dt0<A<f
z>FDJ8`4KXRTiO^HPz`BO1{-ofSrz0YR`9K0lLHorGM!h0O0Z3yut19ieErkD1!7DO
zG~nX@7pO{uE-YFOTtaXT=wTxi=Y>zUU+BjIx>jcL#D!u^>AGNjXBL{vAZ}$~KnuVC
z1E3-$;H5MCAlFEP4~z$T=^-$HP(wOqa`hr78Te`EKnLicSpL~^a?K*8$-ft=N<+?q
zW?-0u5gn^0TQByPK^#BKz~G2th_L-+o5j*dCr4Ycg3q*_+`m|qNyu^Xvc-|obKpm+
zGBD_)==PZ0utaRK!4gv$&;gX1%nS@qfG$9_!NzrR<B}K|<iq+*Pz<^20aPG2S=L<<
zoMMpAl2JrasOtk%C_8zX7dYftKu3{G=36Gl^ePl6E;@PsGPcRyz!Tv?$quoM9(X7X
ziXrL|P{jr^h&4703`!`9mgj;LO<JxY16)4>Sv~>`eq9tbPbwj5K&x^fX&o_o$H1U~
zqIOd?L@oQ|Bg^Gwz#}riv?K=%D|r-k8@s@c6Ir1u0~(i50a^-LyMmf7oO;2EvR3Fw
zgF8gPQ1=7g{c3<>(&5P)SNO;vnvv+PKQakyh~7$L8Bq2Q1{!dbhk-!@#SpP+P(|#M
SXRcJ{65?fGI57uQ5&!`B?F@7P

delta 34554
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

diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
index db8c3baafe3..68e8816d71c 100644
--- a/smoke-test/gradle/wrapper/gradle-wrapper.properties
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smoke-test/gradlew b/smoke-test/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/smoke-test/gradlew
+++ b/smoke-test/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/smoke-test/gradlew.bat b/smoke-test/gradlew.bat
index 6689b85beec..9b42019c791 100644
--- a/smoke-test/gradlew.bat
+++ b/smoke-test/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

From 5628192b6ad620d5dfbcd5b362be5fa227ab531e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 5 Dec 2024 15:52:48 -0500
Subject: [PATCH 4072/4969] Declare Java action in windows workflow (#9604)

---
 .github/workflows/ci-windows.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 45b47f364ad..3dd919bc919 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -53,6 +53,7 @@ jobs:
       checks: write
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-build
       - name: Build with Gradle
         run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
       - uses: ./.github/actions/setup-junit-report
@@ -82,6 +83,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
           ref: ${{ github.event.client_payload.pull_request.head.ref }}
+      - uses: ./.github/actions/setup-build
       - name: Build with Gradle
         run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
       - uses: ./.github/actions/setup-junit-report

From 8ce2045440100b4e585b2b941d423fd353e99f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 6 Dec 2024 11:57:51 -0600
Subject: [PATCH 4073/4969] Update devcontainer to use Java 17

---
 .devcontainer/devcontainer.json | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3a7ea347cb3..9131ce06da3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,23 +1,13 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/java-8
 {
-	"name": "Java 8",
-    "image": "mcr.microsoft.com/devcontainers/java:1-8-bullseye",
+	"name": "Java 17",
+    "image": "mcr.microsoft.com/devcontainers/java:0-17",
 
 	// Configure tool-specific properties.
 	"customizations": {
 		// Configure properties specific to VS Code.
 		"vscode": {
-			// Set *default* container specific settings.json values on container create.
-			"settings": {
-				"java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current",
-				"java.configuration.runtimes": [{
-					"default": true,
-					"name": "JavaSE-1.8",
-					"path": "/usr/local/sdkman/candidates/java/current"
-				}]
-			},
-
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
 				"vscjava.vscode-java-pack"

From ee885f9703e8f8e789df04507f4239d62beba460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 10 Dec 2024 13:26:15 -0500
Subject: [PATCH 4074/4969] Drop references to vectorized/redpanda image
 (#9624)

Image is no longer available.

Fixes #9621
---
 .../testcontainers/redpanda/RedpandaContainer.java    | 11 ++---------
 .../testcontainers/redpanda/CompatibleImageTest.java  |  2 +-
 .../redpanda/RedpandaContainerTest.java               |  7 -------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
index a7cfc245d95..e8655beec45 100644
--- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
+++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
@@ -45,16 +45,10 @@ public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
 
     private static final String IMAGE_NAME = "redpandadata/redpanda";
 
-    @Deprecated
-    private static final String REDPANDA_OLD_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda";
-
     private static final DockerImageName REDPANDA_IMAGE = DockerImageName.parse(REDPANDA_FULL_IMAGE_NAME);
 
     private static final DockerImageName IMAGE = DockerImageName.parse(IMAGE_NAME);
 
-    @Deprecated
-    private static final DockerImageName REDPANDA_OLD_IMAGE = DockerImageName.parse(REDPANDA_OLD_FULL_IMAGE_NAME);
-
     private static final int REDPANDA_PORT = 9092;
 
     private static final int REDPANDA_ADMIN_PORT = 9644;
@@ -82,13 +76,12 @@ public RedpandaContainer(String image) {
 
     public RedpandaContainer(DockerImageName imageName) {
         super(imageName);
-        imageName.assertCompatibleWith(REDPANDA_OLD_IMAGE, REDPANDA_IMAGE, IMAGE);
+        imageName.assertCompatibleWith(REDPANDA_IMAGE, IMAGE);
 
         boolean isLessThanBaseVersion = new ComparableVersion(imageName.getVersionPart()).isLessThan("v22.2.1");
         boolean isPublicCompatibleImage =
             REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
-            IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
-            REDPANDA_OLD_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart());
+            IMAGE_NAME.equals(imageName.getUnversionedPart());
         if (isPublicCompatibleImage && isLessThanBaseVersion) {
             throw new IllegalArgumentException("Redpanda version must be >= v22.2.1");
         }
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
index cdb2af6a291..478d6e7efbc 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
@@ -15,7 +15,7 @@ public CompatibleImageTest(String image) {
 
     @Parameterized.Parameters(name = "{0}")
     public static String[] image() {
-        return new String[] { "docker.redpanda.com/vectorized/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" };
+        return new String[] { "docker.redpanda.com/redpandadata/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" };
     }
 
     @Test
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index dcdaad4da28..605ad76510a 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -67,13 +67,6 @@ public void testNotCompatibleVersion() {
             .hasMessageContaining("Redpanda version must be >= v22.2.1");
     }
 
-    @Test
-    public void vectorizedRedpandaImageVersion2221ShouldNotBeCompatible() {
-        assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v21.11.19"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Redpanda version must be >= v22.2.1");
-    }
-
     @Test
     public void redpandadataRedpandaImageVersion2221ShouldNotBeCompatible() {
         assertThatThrownBy(() -> new RedpandaContainer("redpandadata/redpanda:v21.11.19"))

From 16397b4582596a738c49a905e03f07c467a21202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 10 Dec 2024 13:52:00 -0500
Subject: [PATCH 4075/4969] Use docker/setup-docker-action (#9625)

---
 .github/workflows/ci-rootless.yml |  6 +++---
 .github/workflows/moby-latest.yml | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index ba3b26a9e46..e5c9afd1dbc 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -48,9 +48,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup rootless Docker
-        uses: ScribeMD/rootless-docker@0.2.2
-      - name: Remove Docket root socket
-        run: sudo rm -rf /var/run/docker.sock
+        uses: docker/setup-docker-action@v4
+        with:
+          rootless: true
       - name: Setup Gradle Build Action
         uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 3ebfce168c6..8a0b7d2fe88 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -23,19 +23,21 @@ jobs:
 
       - name: Install Stable Docker
         if: ${{ matrix.install-docker-type == 'STABLE' }}
-        run: curl https://get.docker.com
+        uses: docker/setup-docker-action@v4
+        with:
+          channel: stable
 
       - name: Install Docker from the TEST channel
         if: ${{ matrix.install-docker-type == 'ROOTFUL' }}
-        run: curl https://get.docker.com | CHANNEL=test sh
+        uses: docker/setup-docker-action@v4
+        with:
+          channel: test
 
       - name: Setup rootless Docker
         if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
-        uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886  # v0.2.2
-
-      - name: Remove Docker root socket
-        if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
-        run: sudo rm -rf /var/run/docker.sock
+        uses: docker/setup-docker-action@v4
+        with:
+          rootless: true
 
       - name: Check Docker version
         run: docker version

From 037b03ca3a7442257ac4bd39fbd9f83f64277220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 10 Dec 2024 15:06:58 -0600
Subject: [PATCH 4076/4969] Polish ActiveMQContainerTest

---
 .../org/testcontainers/activemq/ActiveMQContainerTest.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
index 3ccd7acf2b1..842701fa376 100644
--- a/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
+++ b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
@@ -3,7 +3,6 @@
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.Destination;
-import jakarta.jms.JMSException;
 import jakarta.jms.MessageConsumer;
 import jakarta.jms.MessageProducer;
 import jakarta.jms.Session;
@@ -17,7 +16,7 @@
 public class ActiveMQContainerTest {
 
     @Test
-    public void test() throws JMSException {
+    public void test() {
         try ( // container {
             ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
             // }

From 426e3366a8d70b9d025e09855083bb8335b388a7 Mon Sep 17 00:00:00 2001
From: Eric Deandrea <eric@ericdeandrea.dev>
Date: Tue, 10 Dec 2024 16:12:27 -0500
Subject: [PATCH 4077/4969] Move ollama port to a constant and provide new
 `getPort` method (#9623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../org/testcontainers/ollama/OllamaContainer.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java b/modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java
index 1c739b95a6b..db611a34a39 100644
--- a/modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java
+++ b/modules/ollama/src/main/java/org/testcontainers/ollama/OllamaContainer.java
@@ -24,6 +24,8 @@ public class OllamaContainer extends GenericContainer<OllamaContainer> {
 
     private static final DockerImageName DOCKER_IMAGE_NAME = DockerImageName.parse("ollama/ollama");
 
+    private static final int OLLAMA_PORT = 11434;
+
     public OllamaContainer(String image) {
         this(DockerImageName.parse(image));
     }
@@ -49,7 +51,7 @@ public OllamaContainer(DockerImageName dockerImageName) {
                 });
             }
         }
-        withExposedPorts(11434);
+        withExposedPorts(OLLAMA_PORT);
     }
 
     /**
@@ -74,7 +76,11 @@ public void commitToImage(String imageName) {
         }
     }
 
+    public int getPort() {
+        return getMappedPort(OLLAMA_PORT);
+    }
+
     public String getEndpoint() {
-        return "http://" + getHost() + ":" + getMappedPort(11434);
+        return "http://" + getHost() + ":" + getPort();
     }
 }

From 172dc4af2bba5a2035e9dbc1d81168102b097c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 11 Dec 2024 15:58:14 -0500
Subject: [PATCH 4078/4969] Update docker-java version to 3.4.1 (#9627)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a4e57d9473b..a7b600f041f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.4.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.4.0')
+    api platform('com.github.docker-java:docker-java-bom:3.4.1')
+    shaded platform('com.github.docker-java:docker-java-bom:3.4.1')
 
     api "com.github.docker-java:docker-java-api"
 

From 165c7241abf0c3344b915bbeac6eed9355774fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 11 Dec 2024 16:35:03 -0500
Subject: [PATCH 4079/4969] Remove specific Java version for testing in gradle
 files (#9626)

HiveMQ and OpenFGA module are keeping the configuration.
---
 docs/examples/junit4/generic/build.gradle | 13 -------------
 examples/cucumber/build.gradle            | 13 -------------
 modules/activemq/build.gradle             | 13 -------------
 modules/grafana/build.gradle              | 13 -------------
 modules/openfga/build.gradle              |  6 +++---
 modules/questdb/build.gradle              | 13 -------------
 6 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 296e936953f..5a276cf6a7f 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -10,16 +10,3 @@ dependencies {
     testImplementation "org.seleniumhq.selenium:selenium-api:4.25.0"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 3ee4054ce71..2710e259e9b 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -18,16 +18,3 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}
diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 7ee0971b251..dc20113a84b 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -7,16 +7,3 @@ dependencies {
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.37.0"
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-    options.release.set(11)
-}
diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 550779c4d55..72082e4cfec 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -8,16 +8,3 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}
diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index c2e9f67c43d..6cbbaa91e68 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -9,13 +9,13 @@ dependencies {
 
 test {
     javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
 compileTestJava {
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
-    options.release.set(11)
+    options.release.set(17)
 }
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 98adb9c40a3..01bc5473247 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -11,16 +11,3 @@ dependencies {
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}

From 598237063828bba0d78be98dcef531e301966459 Mon Sep 17 00:00:00 2001
From: Fabian Lange <lange.fabian@gmail.com>
Date: Mon, 16 Dec 2024 14:38:33 +0100
Subject: [PATCH 4080/4969] Added Dash0 as Adoptor (#9630)

---
 docs/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 90cb81bf3af..a3b499dfa0c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -221,6 +221,8 @@ A huge thank you to our sponsors:
 * [Spark ClickHouse Connector](https://github.com/housepower/spark-clickhouse-connector) - Integration tests for Apache Spark with both single node ClickHouse instance and multi-node ClickHouse cluster.
 * [Quarkus](https://github.com/quarkusio/quarkus) - Testcontainers is used extensively for Quarkus' [DevServices](https://quarkus.io/guides/dev-services) feature.
 * [Apache Kyuubi](https://kyuubi.apache.org) - Integration testing with Trino as data source engine, Kafka, etc.
+* [Dash0](https://www.dash0.com) - Integration testing for OpenTelemetry Observability product.
+
 
 ## License
 

From 7250955177dacbe7c76834ced296e0cf9c4a04ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 16 Dec 2024 10:41:03 -0600
Subject: [PATCH 4081/4969] Use docker socket from docker/setup-docker-action

---
 .github/workflows/moby-latest.yml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 8a0b7d2fe88..28529f882c6 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -13,8 +13,11 @@ jobs:
   test_docker:
     strategy:
       matrix:
-        install-docker-type: ["STABLE", "ROOTLESS", "ROOTFUL"]
-    name: "Core tests using Docker ${{ matrix.install-docker-type }}"
+        include:
+          - { install-docker-type: "STABLE", channel: stable, rootless: false }
+          - { install-docker-type: "ROOTLESS", channel: stable, rootless: true }
+          - { install-docker-type: "ROOTFUL", channel: test, rootless: false }
+    name: "Core tests using Docker ${{ matrix.install-docker-type }} (channel ${{ matrix.channel }})"
     runs-on: ubuntu-22.04
     continue-on-error: true
     steps:
@@ -22,28 +25,19 @@ jobs:
       - uses: ./.github/actions/setup-build
 
       - name: Install Stable Docker
-        if: ${{ matrix.install-docker-type == 'STABLE' }}
+        id: setup_docker
         uses: docker/setup-docker-action@v4
         with:
-          channel: stable
-
-      - name: Install Docker from the TEST channel
-        if: ${{ matrix.install-docker-type == 'ROOTFUL' }}
-        uses: docker/setup-docker-action@v4
-        with:
-          channel: test
-
-      - name: Setup rootless Docker
-        if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
-        uses: docker/setup-docker-action@v4
-        with:
-          rootless: true
+          channel: ${{ matrix.channel }}
+          rootless: ${{ matrix.rootless }}
 
       - name: Check Docker version
         run: docker version
 
       - name: Build with Gradle
         run: ./gradlew cleanTest --no-daemon --continue --scan -Dscan.tag.DOCKER_${{ matrix.install-docker-type }} testcontainers:test -Dorg.gradle.caching=false
+        env:
+          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - uses: ./.github/actions/setup-junit-report
 
       - name: Notify to Slack on failures

From a74ca4df43cf6e9a0b49130ffa16a98f968a93fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 16 Dec 2024 11:02:56 -0600
Subject: [PATCH 4082/4969] Fix build

---
 ...EnvironmentAndSystemPropertyClientProviderStrategyTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
index 062c3d793a5..58bd6984401 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
@@ -18,6 +18,7 @@
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
@@ -147,6 +148,8 @@ public void applicableWhenIgnoringUserPropertiesAndConfigured() {
 
     @Test
     public void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {
+        assumeThat(System.getenv("DOCKER_HOST")).isNull();
+
         Mockito
             .doReturn("autoIgnoringUserProperties")
             .when(TestcontainersConfiguration.getInstance())

From f7973aa659d5f871c6ee4830d1a786a22b2ee876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 16 Dec 2024 11:40:29 -0600
Subject: [PATCH 4083/4969] Fix rootless build

---
 .../org/testcontainers/containers/GenericContainerTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index acb24cf0d68..c1c4ff3818e 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -52,7 +52,7 @@ public class GenericContainerTest {
     public void shouldReportOOMAfterWait() {
         Info info = DockerClientFactory.instance().client().infoCmd().exec();
         // Poor man's rootless Docker detection :D
-        Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("rootless");
+        Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("name=rootless");
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())

From 04e5518135f3c55a8abddaf6f7ae918a47ae17fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 22:40:28 +0000
Subject: [PATCH 4084/4969] Bump org.freemarker:freemarker in /modules/redpanda

Bumps org.freemarker:freemarker from 2.3.33 to 2.3.34.

---
updated-dependencies:
- dependency-name: org.freemarker:freemarker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 2db469936f6..a52ddd34778 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Redpanda"
 
 dependencies {
     api project(':testcontainers')
-    shaded 'org.freemarker:freemarker:2.3.33'
+    shaded 'org.freemarker:freemarker:2.3.34'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'

From 2707f3143d3cfa8351f727bfd5752c1155818bd6 Mon Sep 17 00:00:00 2001
From: Esta Nagy <nagyesta@gmail.com>
Date: Thu, 9 Jan 2025 17:29:50 +0100
Subject: [PATCH 4085/4969] Add AzuriteContainer to Azure module (#9661)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Esta Nagy <nagyesta@gmail.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/azure.md                         |  61 +++-
 modules/azure/build.gradle                    |   3 +
 .../azure/AzuriteContainer.java               | 167 +++++++++++
 .../azure/AzuriteContainerTest.java           | 266 ++++++++++++++++++
 .../azure/src/test/resources/certificate.pem  |  23 ++
 modules/azure/src/test/resources/key.pem      |  32 +++
 modules/azure/src/test/resources/keystore.pfx | Bin 0 -> 2606 bytes
 7 files changed, 551 insertions(+), 1 deletion(-)
 create mode 100644 modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java
 create mode 100644 modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java
 create mode 100644 modules/azure/src/test/resources/certificate.pem
 create mode 100644 modules/azure/src/test/resources/key.pem
 create mode 100644 modules/azure/src/test/resources/keystore.pfx

diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 5e80270e90c..19c141c7639 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -5,14 +5,73 @@ This module is INCUBATING. While it is ready for use and operational in the curr
 
 Testcontainers module for the Microsoft Azure's [SDK](https://github.com/Azure/azure-sdk-for-java).
 
-Currently, the module supports `CosmosDB` emulator. In order to use it, you should use the following class:
+Currently, the module supports `Azurite` and `CosmosDB` emulators. In order to use them, you should use the following classes:
 
 Class | Container Image
 -|-
+AzuriteContainer | [mcr.microsoft.com/azure-storage/azurite](https://github.com/microsoft/containerregistry)
 CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
 
 ## Usage example
 
+### Azurite Storage Emulator
+
+Start Azurite Emulator during a test:
+
+<!--codeinclude-->
+[Starting a Azurite container](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+!!! note
+    SSL configuration is possible using the `withSsl(MountableFile, String)` and  `withSsl(MountableFile, MountableFile)` methods.
+
+If the tested application needs to use more than one set of credentials, the container can be configured to use custom credentials.
+Please see some examples below.
+
+<!--codeinclude-->
+[Starting a Azurite Blob container with one account and two keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withTwoAccountKeys
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Starting a Azurite Blob container with more accounts and keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withMoreAccounts
+<!--/codeinclude-->
+
+#### Using with Blob
+
+Build Azure Blob client:
+
+<!--codeinclude-->
+[Build Azure Blob Service client](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:createBlobClient
+<!--/codeinclude-->
+
+In case the application needs to use custom credentials, we can obtain them with a different method:
+
+<!--codeinclude-->
+[Obtain connection string with non-default credentials](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:useNonDefaultCredentials
+<!--/codeinclude-->
+
+#### Using with Queue
+
+Build Azure Queue client:
+
+<!--codeinclude-->
+[Build Azure Queue Service client](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:createQueueClient
+<!--/codeinclude-->
+
+!!! note
+    We can use custom credentials the same way as defined in the Blob section.
+
+#### Using with Table
+
+Build Azure Table client:
+
+<!--codeinclude-->
+[Build Azure Table Service client](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:createTableClient
+<!--/codeinclude-->
+
+!!! note
+    We can use custom credentials the same way as defined in the Blob section.
+
 ### CosmosDB
 
 Start Azure CosmosDB Emulator during a test:
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index d31a549abe5..c6cfb6738d0 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -7,4 +7,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.azure:azure-cosmos:4.63.3'
+    testImplementation 'com.azure:azure-storage-blob:12.29.0'
+    testImplementation 'com.azure:azure-storage-queue:12.24.0'
+    testImplementation 'com.azure:azure-data-tables:12.5.0'
 }
diff --git a/modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java
new file mode 100644
index 00000000000..56c58df1f1d
--- /dev/null
+++ b/modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java
@@ -0,0 +1,167 @@
+package org.testcontainers.azure;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+/**
+ * Testcontainers implementation for Azurite Emulator.
+ * <p>
+ * Supported image: {@code mcr.microsoft.com/azure-storage/azurite}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Blob: 10000</li>
+ *     <li>Queue: 10001</li>
+ *     <li>Table: 10002</li>
+ * </ul>
+ */
+public class AzuriteContainer extends GenericContainer<AzuriteContainer> {
+
+    private static final String ALLOW_ALL_CONNECTIONS = "0.0.0.0";
+
+    private static final int DEFAULT_BLOB_PORT = 10000;
+
+    private static final int DEFAULT_QUEUE_PORT = 10001;
+
+    private static final int DEFAULT_TABLE_PORT = 10002;
+
+    private static final String CONNECTION_STRING_FORMAT =
+        "DefaultEndpointsProtocol=%s;AccountName=%s;AccountKey=%s;BlobEndpoint=%s://%s:%d/%s;QueueEndpoint=%s://%s:%d/%s;TableEndpoint=%s://%s:%d/%s;";
+
+    /**
+     * The account name of the default credentials.
+     */
+    private static final String WELL_KNOWN_ACCOUNT_NAME = "devstoreaccount1";
+
+    /**
+     * The account key of the default credentials.
+     */
+    private static final String WELL_KNOWN_ACCOUNT_KEY =
+        "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "mcr.microsoft.com/azure-storage/azurite"
+    );
+
+    private MountableFile cert = null;
+
+    private String certExtension = null;
+
+    private MountableFile key = null;
+
+    private String pwd = null;
+
+    /**
+     * @param dockerImageName specified docker image name to run
+     */
+    public AzuriteContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * @param dockerImageName specified docker image name to run
+     */
+    public AzuriteContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(DEFAULT_BLOB_PORT, DEFAULT_QUEUE_PORT, DEFAULT_TABLE_PORT);
+    }
+
+    /**
+     * Configure SSL with a custom certificate and password.
+     *
+     * @param pfxCert  The PFX certificate file
+     * @param password The password securing the certificate
+     * @return this
+     */
+    public AzuriteContainer withSsl(final MountableFile pfxCert, final String password) {
+        this.cert = pfxCert;
+        this.pwd = password;
+        this.certExtension = ".pfx";
+        return this;
+    }
+
+    /**
+     * Configure SSL with a custom certificate and private key.
+     *
+     * @param pemCert The PEM certificate file
+     * @param pemKey  The PEM key file
+     * @return this
+     */
+    public AzuriteContainer withSsl(final MountableFile pemCert, final MountableFile pemKey) {
+        this.cert = pemCert;
+        this.key = pemKey;
+        this.certExtension = ".pem";
+        return this;
+    }
+
+    @Override
+    protected void configure() {
+        withCommand(getCommandLine());
+        if (this.cert != null) {
+            logger().info("Using path for cert file: '{}'", this.cert);
+            withCopyFileToContainer(this.cert, "/cert" + this.certExtension);
+            if (this.key != null) {
+                logger().info("Using path for key file: '{}'", this.key);
+                withCopyFileToContainer(this.key, "/key.pem");
+            }
+        }
+    }
+
+    /**
+     * Returns the connection string for the default credentials.
+     *
+     * @return connection string
+     */
+    public String getConnectionString() {
+        return getConnectionString(WELL_KNOWN_ACCOUNT_NAME, WELL_KNOWN_ACCOUNT_KEY);
+    }
+
+    /**
+     * Returns the connection string for the account name and key specified.
+     *
+     * @param accountName The name of the account
+     * @param accountKey  The account key
+     * @return connection string
+     */
+    public String getConnectionString(final String accountName, final String accountKey) {
+        final String protocol = cert != null ? "https" : "http";
+        return String.format(
+            CONNECTION_STRING_FORMAT,
+            protocol,
+            accountName,
+            accountKey,
+            protocol,
+            getHost(),
+            getMappedPort(DEFAULT_BLOB_PORT),
+            accountName,
+            protocol,
+            getHost(),
+            getMappedPort(DEFAULT_QUEUE_PORT),
+            accountName,
+            protocol,
+            getHost(),
+            getMappedPort(DEFAULT_TABLE_PORT),
+            accountName
+        );
+    }
+
+    String getCommandLine() {
+        final StringBuilder args = new StringBuilder("azurite");
+        args.append(" --blobHost ").append(ALLOW_ALL_CONNECTIONS);
+        args.append(" --queueHost ").append(ALLOW_ALL_CONNECTIONS);
+        args.append(" --tableHost ").append(ALLOW_ALL_CONNECTIONS);
+        if (this.cert != null) {
+            args.append(" --cert ").append("/cert").append(this.certExtension);
+            if (this.pwd != null) {
+                args.append(" --pwd ").append(this.pwd);
+            } else {
+                args.append(" --key ").append("/key.pem");
+            }
+        }
+        final String cmd = args.toString();
+        logger().debug("Using command line: '{}'", cmd);
+        return cmd;
+    }
+}
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java
new file mode 100644
index 00000000000..2bf0ad856d3
--- /dev/null
+++ b/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java
@@ -0,0 +1,266 @@
+package org.testcontainers.azure;
+
+import com.azure.core.util.BinaryData;
+import com.azure.data.tables.TableClient;
+import com.azure.data.tables.TableServiceClient;
+import com.azure.data.tables.TableServiceClientBuilder;
+import com.azure.storage.blob.BlobClient;
+import com.azure.storage.blob.BlobContainerClient;
+import com.azure.storage.blob.BlobServiceClient;
+import com.azure.storage.blob.BlobServiceClientBuilder;
+import com.azure.storage.queue.QueueClient;
+import com.azure.storage.queue.QueueServiceClient;
+import com.azure.storage.queue.QueueServiceClientBuilder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AzuriteContainerTest {
+
+    private static final String PASSWORD = "changeit";
+
+    private static Properties originalSystemProperties;
+
+    @BeforeClass
+    public static void captureOriginalSystemProperties() {
+        originalSystemProperties = (Properties) System.getProperties().clone();
+        System.setProperty(
+            "javax.net.ssl.trustStore",
+            MountableFile.forClasspathResource("/keystore.pfx").getFilesystemPath()
+        );
+        System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
+        System.setProperty("javax.net.ssl.trustStoreType", "PKCS12");
+    }
+
+    @AfterClass
+    public static void restoreOriginalSystemProperties() {
+        System.setProperties(originalSystemProperties);
+    }
+
+    @Test
+    public void testWithBlobServiceClient() {
+        try (
+            // emulatorContainer {
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+            // }
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("BlobEndpoint=http://");
+            testBlob(emulator);
+        }
+    }
+
+    @Test
+    public void testWithQueueServiceClient() {
+        try (AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("QueueEndpoint=http://");
+            testQueue(emulator);
+        }
+    }
+
+    @Test
+    public void testWithTableServiceClient() {
+        try (AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("TableEndpoint=http://");
+            testTable(emulator);
+        }
+    }
+
+    @Test
+    public void testWithBlobServiceClientWithSslUsingPfx() {
+        try (
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withSsl(MountableFile.forClasspathResource("/keystore.pfx"), PASSWORD)
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("BlobEndpoint=https://");
+            testBlob(emulator);
+        }
+    }
+
+    @Test
+    public void testWithQueueServiceClientWithSslUsingPfx() {
+        try (
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withSsl(MountableFile.forClasspathResource("/keystore.pfx"), PASSWORD)
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("QueueEndpoint=https://");
+            testQueue(emulator);
+        }
+    }
+
+    @Test
+    public void testWithTableServiceClientWithSslUsingPfx() {
+        try (
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withSsl(MountableFile.forClasspathResource("/keystore.pfx"), PASSWORD)
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("TableEndpoint=https://");
+            testTable(emulator);
+        }
+    }
+
+    @Test
+    public void testWithBlobServiceClientWithSslUsingPem() {
+        try (
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withSsl(
+                    MountableFile.forClasspathResource("/certificate.pem"),
+                    MountableFile.forClasspathResource("/key.pem")
+                )
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("BlobEndpoint=https://");
+            testBlob(emulator);
+        }
+    }
+
+    @Test
+    public void testWithQueueServiceClientWithSslUsingPem() {
+        try (
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withSsl(
+                    MountableFile.forClasspathResource("/certificate.pem"),
+                    MountableFile.forClasspathResource("/key.pem")
+                )
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("QueueEndpoint=https://");
+            testQueue(emulator);
+        }
+    }
+
+    @Test
+    public void testWithTableServiceClientWithSslUsingPem() {
+        try (
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withSsl(
+                    MountableFile.forClasspathResource("/certificate.pem"),
+                    MountableFile.forClasspathResource("/key.pem")
+                )
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).contains("TableEndpoint=https://");
+            testTable(emulator);
+        }
+    }
+
+    @Test
+    public void testTwoAccountKeysWithBlobServiceClient() {
+        try (
+            // withTwoAccountKeys {
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withEnv("AZURITE_ACCOUNTS", "account1:key1:key2")
+            // }
+        ) {
+            emulator.start();
+
+            String connectionString1 = emulator.getConnectionString("account1", "key1");
+            // the second account will have access to the same container using a different key
+            String connectionString2 = emulator.getConnectionString("account1", "key2");
+
+            BlobServiceClient blobServiceClient1 = new BlobServiceClientBuilder()
+                .connectionString(connectionString1)
+                .buildClient();
+
+            BlobContainerClient containerClient1 = blobServiceClient1.createBlobContainer("test-container");
+            BlobClient blobClient1 = containerClient1.getBlobClient("test-blob.txt");
+            blobClient1.upload(BinaryData.fromString("content"));
+            boolean existsWithAccount1 = blobClient1.exists();
+            String contentWithAccount1 = blobClient1.downloadContent().toString();
+
+            BlobServiceClient blobServiceClient2 = new BlobServiceClientBuilder()
+                .connectionString(connectionString2)
+                .buildClient();
+            BlobContainerClient containerClient2 = blobServiceClient2.getBlobContainerClient("test-container");
+            BlobClient blobClient2 = containerClient2.getBlobClient("test-blob.txt");
+            boolean existsWithAccount2 = blobClient2.exists();
+            String contentWithAccount2 = blobClient2.downloadContent().toString();
+
+            assertThat(existsWithAccount1).isTrue();
+            assertThat(contentWithAccount1).isEqualTo("content");
+            assertThat(existsWithAccount2).isTrue();
+            assertThat(contentWithAccount2).isEqualTo("content");
+        }
+    }
+
+    @Test
+    public void testMultipleAccountsWithBlobServiceClient() {
+        try (
+            // withMoreAccounts {
+            AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withEnv("AZURITE_ACCOUNTS", "account1:key1;account2:key2")
+            // }
+        ) {
+            emulator.start();
+
+            // useNonDefaultCredentials {
+            String connectionString1 = emulator.getConnectionString("account1", "key1");
+            // the second account will not have access to the same container
+            String connectionString2 = emulator.getConnectionString("account2", "key2");
+            // }
+            BlobServiceClient blobServiceClient1 = new BlobServiceClientBuilder()
+                .connectionString(connectionString1)
+                .buildClient();
+
+            BlobContainerClient containerClient1 = blobServiceClient1.createBlobContainer("test-container");
+            BlobClient blobClient1 = containerClient1.getBlobClient("test-blob.txt");
+            blobClient1.upload(BinaryData.fromString("content"));
+            boolean existsWithAccount1 = blobClient1.exists();
+            String contentWithAccount1 = blobClient1.downloadContent().toString();
+
+            BlobServiceClient blobServiceClient2 = new BlobServiceClientBuilder()
+                .connectionString(connectionString2)
+                .buildClient();
+            BlobContainerClient containerClient2 = blobServiceClient2.createBlobContainer("test-container");
+            BlobClient blobClient2 = containerClient2.getBlobClient("test-blob.txt");
+            boolean existsWithAccount2 = blobClient2.exists();
+
+            assertThat(existsWithAccount1).isTrue();
+            assertThat(contentWithAccount1).isEqualTo("content");
+            assertThat(existsWithAccount2).isFalse();
+        }
+    }
+
+    private void testBlob(AzuriteContainer container) {
+        // createBlobClient {
+        BlobServiceClient blobServiceClient = new BlobServiceClientBuilder()
+            .connectionString(container.getConnectionString())
+            .buildClient();
+        // }
+        BlobContainerClient containerClient = blobServiceClient.createBlobContainer("test-container");
+
+        assertThat(containerClient.exists()).isTrue();
+    }
+
+    private void testQueue(AzuriteContainer container) {
+        // createQueueClient {
+        QueueServiceClient queueServiceClient = new QueueServiceClientBuilder()
+            .connectionString(container.getConnectionString())
+            .buildClient();
+        // }
+        QueueClient queueClient = queueServiceClient.createQueue("test-queue");
+
+        assertThat(queueClient.getQueueUrl()).isNotNull();
+    }
+
+    private void testTable(AzuriteContainer container) {
+        // createTableClient {
+        TableServiceClient tableServiceClient = new TableServiceClientBuilder()
+            .connectionString(container.getConnectionString())
+            .buildClient();
+        // }
+        TableClient tableClient = tableServiceClient.createTable("testtable");
+
+        assertThat(tableClient.getTableEndpoint()).isNotNull();
+    }
+}
diff --git a/modules/azure/src/test/resources/certificate.pem b/modules/azure/src/test/resources/certificate.pem
new file mode 100644
index 00000000000..30bedc29f45
--- /dev/null
+++ b/modules/azure/src/test/resources/certificate.pem
@@ -0,0 +1,23 @@
+Bag Attributes
+    friendlyName: localhost
+    localKeyID: 54 69 6D 65 20 31 37 33 34 37 32 32 33 32 31 33 31 39 
+subject=CN = localhost
+issuer=CN = localhost
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAc+gAwIBAgIILe7i2bhRE5cwDQYJKoZIhvcNAQEMBQAwFDESMBAGA1UE
+AxMJbG9jYWxob3N0MB4XDTI0MTIyMDE5MTg0MVoXDTQ0MTIxNTE5MTg0MVowFDES
+MBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAoqYNmLl8IiIoYrXdcoWiMQaM0lOHcV9v3A/THMremHxsR+JPm3FIOAuilFcy
+my16kuXIWHfisPxUWr9Vbf8wP/WwZutoOofJrqmruZoorQcNLCs8mQweguRmL1ju
+/lDh/9bP626vP9OjwStC4UO4f8Jga8ENoH1U+j1RsIAswYnkk3YIN6YrYv66UvtH
+IfR0ERgid2LMBIM+2KD2zw4QRyqXH7Qvo7sCsxdYYHGa6GXfza4vgvce9kJwGqn5
+wiF0Uw9XQbr/LarnR2GCy020OB81KweQJNIh27FZSRLtT+XpsjDRcC2aLBd8CRHd
+hwO2zAPI04dLbLM5XAHlEdfT7wIDAQABoz0wOzAdBgNVHQ4EFgQUPqY5isb6Q11Q
+t6dbXYHEupxADdMwGgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3
+DQEBDAUAA4IBAQA2katMXrTJBukiNh9yceLO/MewsxvU3KOO/O89ngfjhKXm9T8E
+RtENCmp7hLbj1Aj4PRZx3AbmUt9+tRu8fmrRXJQWgUDSHJWjDwSTBOaHcC5LDWSU
+Ex4co5Mnxvrimg7tqQg82Hw/yLH9j6gyTyh6v45QETP7IUkTZe4fg75/kPjng7Xg
+wp/QXFUx/f0dbvGRl2Fdgg0SnYFqHS3MFIjjFjv8SQlV7rZe+CD1Lxqy/Z6Fd/Fa
+33TzTuJeSAG43vdkGAvsNK/KdnxAW03T4l3pVHpNPcvsIvJUMeKOwYOjwHF/eowk
+tGrKbpUYFxUr9iKHTfu14t1oExhAsnda2Fcs
+-----END CERTIFICATE-----
diff --git a/modules/azure/src/test/resources/key.pem b/modules/azure/src/test/resources/key.pem
new file mode 100644
index 00000000000..7c635f5a278
--- /dev/null
+++ b/modules/azure/src/test/resources/key.pem
@@ -0,0 +1,32 @@
+Bag Attributes
+    friendlyName: localhost
+    localKeyID: 54 69 6D 65 20 31 37 33 34 37 32 32 33 32 31 33 31 39 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCipg2YuXwiIihi
+td1yhaIxBozSU4dxX2/cD9Mcyt6YfGxH4k+bcUg4C6KUVzKbLXqS5chYd+Kw/FRa
+v1Vt/zA/9bBm62g6h8muqau5miitBw0sKzyZDB6C5GYvWO7+UOH/1s/rbq8/06PB
+K0LhQ7h/wmBrwQ2gfVT6PVGwgCzBieSTdgg3piti/rpS+0ch9HQRGCJ3YswEgz7Y
+oPbPDhBHKpcftC+juwKzF1hgcZroZd/Nri+C9x72QnAaqfnCIXRTD1dBuv8tqudH
+YYLLTbQ4HzUrB5Ak0iHbsVlJEu1P5emyMNFwLZosF3wJEd2HA7bMA8jTh0tsszlc
+AeUR19PvAgMBAAECggEAFT8dzZKFTawqnGJncBtWyZKyeJMiwUOXSCblDADQPRkb
+x/QfNA4DQhb7AOe3G6BAP8o2dqAKg9YiasxNq5XHRsOgbIFZ1zN/vAo7/X3OzHN8
+XAW138Q+hBiz5IF4js4gB5yXAokt6WeLH6O4E9cV1dKdZ9YLIqjcnee+sRC9R/a3
+CexqLfC6b77JFbtePfq+5cn2RiK540tO/4k+F+kfJtTg78Wf2RB3A0pBAunhPSd5
+eyjiSvOZtTcvl4GdYw9nKf24I1/WUvt9FH/r1XG0CM5iwuGodbBz1iSUDaQGi5Lf
+hFWofXt7eebgsPEKciG4xTyk51p9fy9y8asY+jCbkQKBgQDG2UqJToR8G4Fk6uaO
+/XJa15TibIwQDEota0OdlXg2ZR4864fkIBv+UTbymZEM/EBuSdMM1CUBDvYHcFQX
+Aj8p1LUyKP2QYwxV/OoPfJ5fBqxqONNR1fLFg7xCxnf9kSvsni2WFneQUrTDl8+7
+qnHm4IKPkAxZ4Orxl5qIBmlpGQKBgQDRZUL3cHIVLLg/aZACpo6SYDYg2bztXmz4
+lRk9j17q1uS83Umzd2lPFmSt/Nr85EKraxXZ/lYPKrP/r1pf1/35eXOWqmYBWgo/
+Hh7OzL12bhvv9UWEY/TvW+wNJNtXlJSjEFRN4tjoG2amYumyhwMO1lIulplUWvtw
+ymm8hDjeRwKBgCq7n60KVqZlMtWBNbMc/GpRUgmm0iLQwVApcQp4iLEH4gutgjKg
+Q+PPiENyhR2JSD9rVhO3s4warvzCQw/+x5wxvg7diEBzSL9h7tsNKOu6/2qEc8Vu
+eRHBUb/37ulrPUlIZPuQMHmvjHFMOrRV2MyJCwXXKxBVqafpsKfy2MxhAoGBAIHH
+Cswk6u/ouYDDwjeCVxatfp65lHhhb5RZhD09IIzYBwhu9gC+34veyyNydZ8LMa7g
+PbjQAzJ/OvQbEB4a1hPKjDMzBOmNjpAz8NAm4L4H3FTKZP16nhHDnPdAgpkzQzQV
+KMrk755bbTFuWH0HZIPLnT+2ou0/PltXeFUYdc59AoGBAIGfWgSOiw7aXbSQZFrO
+4S0v3VTwTaiGDVS4pkNRLlhEJUhy8+gbLv/zYDmFmGtqVhXTb/nd6DOdylp+W/HS
+8xNWBMWdlX/hVdSK7M0TdJvAaCaMidlquf5qZ2tGNNDeTUN1qbRH26pm8vdNZ3gr
+Y/WWJGo0iEmwyB8RcFhvNmuJ
+-----END PRIVATE KEY-----
diff --git a/modules/azure/src/test/resources/keystore.pfx b/modules/azure/src/test/resources/keystore.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..3fd2975d3e84b093f213e0813d99e304c1c5c852
GIT binary patch
literal 2606
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

literal 0
HcmV?d00001


From 0e131c726be71dc6f0eea280478943b961fa4a6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:04:54 +0000
Subject: [PATCH 4086/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/consul

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index b2e99d5578e..daa61b1766a 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From f7c266cf9dc61b80c626ab25341a9c20c290604e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:04:56 +0000
Subject: [PATCH 4087/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/orientdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index d353be80783..f2fe2116f3e 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.33"
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.33"
 }

From d99961f9e8b4b9d4755901a954137bfec4e7376d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:06:34 +0000
Subject: [PATCH 4088/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/redpanda

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 2db469936f6..c8d01c68ed2 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     shaded 'org.freemarker:freemarker:2.3.33'
 
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'org.awaitility:awaitility:4.2.2'
 }

From f375fa0c8f1dfdc346066424597111087469b73a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:06:57 +0000
Subject: [PATCH 4089/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/questdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 01bc5473247..2e9f90acb27 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testImplementation project(':jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.questdb:questdb:7.3.9'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From d9f307a8d12cd3053fbe85d684b156e03d9d3bf5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:07:28 +0000
Subject: [PATCH 4090/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/nginx

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 13232b4bfce..57954fac5cd 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:24.1.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From daef42a6fd39d527d3da5dece33047d103649283 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:07:32 +0000
Subject: [PATCH 4091/4969] Bump org.assertj:assertj-core in /modules/cassandra

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 3d27fe65cac..e146c26e69e 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
     testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From c0eb435ad23e06e58ae07124a38e254701dab162 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:08:05 +0000
Subject: [PATCH 4092/4969] Bump org.assertj:assertj-core in /modules/toxiproxy

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 211d5e38ae3..c34932cc30b 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,5 +5,5 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:5.1.5'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From c7d37f4a041d0be74f4ff6ee7f5dc431ddd8d2e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:08:36 +0000
Subject: [PATCH 4093/4969] Bump org.assertj:assertj-core in
 /modules/localstack

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 2994bb7d2f2..ae85172d30e 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
     testImplementation 'software.amazon.awssdk:s3:2.28.6'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From f6a7608ac78b239f0b253727d2de22e3e46fbde0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:09:31 +0000
Subject: [PATCH 4094/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a4c42db38ce..52467ad8582 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
-    api 'org.assertj:assertj-core:3.26.3'
+    api 'org.assertj:assertj-core:3.27.3'
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'

From 2843ee9dc407617f6f098250302639cc7f1f56ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:09:33 +0000
Subject: [PATCH 4095/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/k3s

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 3f795d99743..e1454505c7e 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -10,5 +10,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:6.13.1'
     testImplementation 'io.kubernetes:client-java:21.0.1-legacy'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From a00f9464b0a7d42362530f238634bc6970a147bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:10:26 +0000
Subject: [PATCH 4096/4969] Bump org.assertj:assertj-core in
 /modules/database-commons

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 2a1ead4c215..e6bb0697252 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From b0d6d40a43a38262cb5eb01c0bd8eacc681b89fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:10:49 +0000
Subject: [PATCH 4097/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/solace

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index fb83eede28c..607387fa866 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.solacesystems:sol-jcsmp:10.24.1'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'

From d401e868dd89010831c75ead0c1a28355d805ee2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:12:01 +0000
Subject: [PATCH 4098/4969] Bump org.assertj:assertj-core in
 /modules/elasticsearch

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 79faefdde24..1724c9f7195 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.15.1"
     testImplementation "org.elasticsearch.client:transport:7.17.24"
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From e6a38012d2a641968bccb64085aef48dd0069e6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:19:13 +0000
Subject: [PATCH 4099/4969] Bump release-drafter/release-drafter from 6.0.0 to
 6.1.0

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/3f0f87098bd6b5c5b9a36d49c41d998ea58f9348...b1476f6e6eb133afa41ed8589daba6dc69b4d3f5)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 43e9773f19e..d57159f44ca 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 # v5.19.0
+      - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From f9664530a37576ca254dd8f8bda01a2c8fd8c07b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:22:16 +0000
Subject: [PATCH 4100/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/databend

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index d3daa5575a2..65b014314a3 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'com.databend:databend-jdbc:0.3.2'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 7bf11780ccec96ffeb69a108d1ea54eb933059f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:22:39 +0000
Subject: [PATCH 4101/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/influxdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 9cf1e8d5ab0..89ab4c3018a 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.24'
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.influxdb:influxdb-java:2.24'
     testImplementation "com.influxdb:influxdb-client-java:6.12.0"
 }

From 1e87581d6206f3d354bef25daeb9e74d3bc757dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:24:24 +0000
Subject: [PATCH 4102/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/weaviate

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 1281fa120d0..d4808e93a2b 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.weaviate:client:4.8.3'
 }

From 00b6b04a53ed8ab2666496fc1b76475c5c3307df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:25:49 +0000
Subject: [PATCH 4103/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/gcloud

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index cb55e466e22..d1ba980fc8c 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub'
     testImplementation 'com.google.cloud:google-cloud-spanner'
     testImplementation 'com.google.cloud:google-cloud-bigtable'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 62dd43ec3fafd27e0d833563e3e3fe2bd5dda658 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:26:00 +0000
Subject: [PATCH 4104/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/db2

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 3a773f21534..93713d8a270 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 6d8ad5b2375a62b7fd480e80c56c4c1359523c65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:27:20 +0000
Subject: [PATCH 4105/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/ollama

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index b6054a1d3c2..4785420ee0e 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Ollama"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }

From 5f60f04280e2a869c98275fb0dba6f8a63643cc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:29:30 +0000
Subject: [PATCH 4106/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/chromadb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index bd6ae52d90f..b6821a87e3e 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
 }

From 918e3df3d740fe17443ad186fa6c7ac8600c26d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:29:59 +0000
Subject: [PATCH 4107/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/kafka

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 5f0658a51d0..57eef43c9c4 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.awaitility:awaitility:4.2.2'
 }

From 450083ef3897330da73cba43a089ea545fa42857 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:31:01 +0000
Subject: [PATCH 4108/4969] Bump org.assertj:assertj-core in
 /modules/junit-jupiter

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 0351a065c34..a08951228b8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'

From b4966029dc7caa8a9eee64c4d9953f03f8668803 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:31:26 +0000
Subject: [PATCH 4109/4969] Bump org.assertj:assertj-core in
 /modules/cockroachdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index fa1e7f06839..fa591a5bd6a 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 718270667d4b1e06cf07a41c071719f87547357c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:31:26 +0000
Subject: [PATCH 4110/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/k6

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k6/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
index 5bf8d773da0..0a027d12d55 100644
--- a/modules/k6/build.gradle
+++ b/modules/k6/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: k6"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 71a96f5012fc5b5221ea7307fa4baea9f87255ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:35:31 +0000
Subject: [PATCH 4111/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/minio

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index e4ebe5d0b43..bbce75f2c47 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("io.minio:minio:8.5.12")
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 0cddd05e49fc5e7e63f4ce88d7ae17037053c3c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:35:46 +0000
Subject: [PATCH 4112/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/qdrant

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 790b22520ae..6c222885579 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.qdrant:client:1.10.0'
     testImplementation platform('io.grpc:grpc-bom:1.68.0')
     testImplementation 'io.grpc:grpc-stub'

From 5c0fa07a60e2816cdbc5f50a6508c7eb438346ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:36:41 +0000
Subject: [PATCH 4113/4969] Bump org.assertj:assertj-core in /modules/couchbase

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 973af4b2ffb..2d9afee7c45 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'com.couchbase.client:java-client:3.7.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From c29fb77702193f59ab9f7500f3ba2667d3bc7492 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:37:09 +0000
Subject: [PATCH 4114/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/r2dbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 1415df161fa..0c2bde505b1 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -8,10 +8,10 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.6.10'
-    testFixturesImplementation 'org.assertj:assertj-core:3.26.3'
+    testFixturesImplementation 'org.assertj:assertj-core:3.27.3'
 }

From f546f509a39cca38f0791f703aa557d5af391991 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:37:18 +0000
Subject: [PATCH 4115/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/hivemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1c748a8d2e3..7288b802164 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.8")
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
 test {

From 3fa669e9c4705043af441997c2b71be3a9799aa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:39:02 +0000
Subject: [PATCH 4116/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /smoke-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 docs/examples/junit4/redis/build.gradle   | 2 +-
 docs/examples/junit5/redis/build.gradle   | 2 +-
 smoke-test/turbo-mode/build.gradle        | 2 +-
 test-support/build.gradle                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 5a276cf6a7f..5b955531fb9 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.25.0"
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 2a0bfb73e7c..f2e492fa7df 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 2fc21e92237..a5c9fb19810 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
 test {
diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index 8a47c80aeee..552f568be91 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
 test {
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 1df20ae6fba..5c39ac72ac9 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:2.0.16'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 55d7f4320d592bf822053d3b24494417cef4210c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:39:14 +0000
Subject: [PATCH 4117/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/neo4j

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index d70292361d1..ec57585216e 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 67f7c22905c19b65fb5bbb3035272f3f97babe5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:41:41 +0000
Subject: [PATCH 4118/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/solr

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index d8ff7aeba39..6949c3e855d 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.3'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From dc9f111eb208733296e3ab50678af56890b4c099 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:42:49 +0000
Subject: [PATCH 4119/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/mongodb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 0904df92824..c4e674fb0ba 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From a944b8dc0003eb30322a13ea832012426c5a4f83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:44:33 +0000
Subject: [PATCH 4120/4969] Bump org.assertj:assertj-core in
 /modules/mockserver

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 31f4944a572..7c3588e873b 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 5d990c66c8f758a7579296fa22a4197204bf71db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:46:10 +0000
Subject: [PATCH 4121/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/timeplus

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/timeplus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index 007b46e23e4..a4656822de5 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.5'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 38781124f58c0afb9d4e33080fa7a0a59a2617e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:50:27 +0000
Subject: [PATCH 4122/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a7b600f041f..62330bb0966 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -120,13 +120,13 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.26.3'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.27.3'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 31b887bb7c0bd7afa2cd15834d614a56e5839b23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:51:33 +0000
Subject: [PATCH 4123/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/milvus

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index a15d24bbbe5..6ca4ffda5ed 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.milvus:milvus-sdk-java:2.4.4'
 }

From aff684bc24af45000eb8814f62bfc0646dba6c01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:52:17 +0000
Subject: [PATCH 4124/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/vault

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 263dff37fbf..1fe9eec0e6f 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 
 }

From 5a917f8db7c18de5d25578db51885a9d2e4d6bd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:53:04 +0000
Subject: [PATCH 4125/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/pulsar

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 7af1bc777e2..154a8e2b6dc 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation platform("org.apache.pulsar:pulsar-bom:3.3.1")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From da321ac82871ac23be3fde2245452870f830d5bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:56:50 +0000
Subject: [PATCH 4126/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/selenium

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index da8ad97f933..176a03cf705 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':nginx')
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From 7d14b2b81e1cb31ba4ff4a963841dd0a5e5dc9d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:57:00 +0000
Subject: [PATCH 4127/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/rabbitmq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 42a12d68759..c72b6687563 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.22.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }

From ec59089a0cbb33e7aa8573c3dd0791e0523b6644 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:58:01 +0000
Subject: [PATCH 4128/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/jdbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2b2868ebbc6..9221c1167a2 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.30'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }

From bb6586a987645e552ce97d80fca182e72e5b0014 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:58:55 +0000
Subject: [PATCH 4129/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/grafana

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 72082e4cfec..d0025ec0f21 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Grafana"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'

From 92a475d5efa32d21a0d208032d844c9a22964d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 21 Jan 2025 18:55:16 -0500
Subject: [PATCH 4130/4969] Add Confluent Kafka examples using SASL/SCRAM auth

---
 .../org/testcontainers/AbstractKafka.java     | 46 +++++++++++++--
 .../containers/KafkaContainerTest.java        | 44 ++++++++++----
 .../kafka/ConfluentKafkaContainerTest.java    | 59 +++++++++++++++++++
 .../src/test/resources/kafka_server_jaas.conf |  5 ++
 4 files changed, 137 insertions(+), 17 deletions(-)
 create mode 100644 modules/kafka/src/test/resources/kafka_server_jaas.conf

diff --git a/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java b/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
index 7fc5bb3851e..90977e61c18 100644
--- a/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
+++ b/modules/kafka/src/test/java/org/testcontainers/AbstractKafka.java
@@ -19,6 +19,7 @@
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -28,7 +29,7 @@
 
 public class AbstractKafka {
 
-    private final ImmutableMap<String, String> properties = ImmutableMap.of(
+    private static final ImmutableMap<String, String> PLAIN_PROPERTIES = ImmutableMap.of(
         AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
         "SASL_PLAINTEXT",
         SaslConfigs.SASL_MECHANISM,
@@ -37,16 +38,39 @@ public class AbstractKafka {
         "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"admin\" password=\"admin\";"
     );
 
+    private static final ImmutableMap<String, String> SCRAM_PROPERTIES = ImmutableMap.of(
+        AdminClientConfig.SECURITY_PROTOCOL_CONFIG,
+        "SASL_PLAINTEXT",
+        SaslConfigs.SASL_MECHANISM,
+        "SCRAM-SHA-256",
+        SaslConfigs.SASL_JAAS_CONFIG,
+        "org.apache.kafka.common.security.scram.ScramLoginModule required username=\"admin\" password=\"admin\";"
+    );
+
     protected void testKafkaFunctionality(String bootstrapServers) throws Exception {
         testKafkaFunctionality(bootstrapServers, false, 1, 1);
     }
 
-    protected void testSecureKafkaFunctionality(String bootstrapServers) throws Exception {
-        testKafkaFunctionality(bootstrapServers, true, 1, 1);
+    protected void testSecurePlainKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, true, PLAIN_PROPERTIES, 1, 1);
+    }
+
+    protected void testSecureScramKafkaFunctionality(String bootstrapServers) throws Exception {
+        testKafkaFunctionality(bootstrapServers, true, SCRAM_PROPERTIES, 1, 1);
     }
 
     protected void testKafkaFunctionality(String bootstrapServers, boolean authenticated, int partitions, int rf)
         throws Exception {
+        testKafkaFunctionality(bootstrapServers, authenticated, Collections.emptyMap(), partitions, rf);
+    }
+
+    protected void testKafkaFunctionality(
+        String bootstrapServers,
+        boolean authenticated,
+        Map<String, String> authProperties,
+        int partitions,
+        int rf
+    ) throws Exception {
         ImmutableMap<String, String> adminClientDefaultProperties = ImmutableMap.of(
             AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
             bootstrapServers
@@ -75,9 +99,9 @@ protected void testKafkaFunctionality(String bootstrapServers, boolean authentic
         producerProperties.putAll(producerDefaultProperties);
 
         if (authenticated) {
-            adminClientProperties.putAll(this.properties);
-            consumerProperties.putAll(this.properties);
-            producerProperties.putAll(this.properties);
+            adminClientProperties.putAll(authProperties);
+            consumerProperties.putAll(authProperties);
+            producerProperties.putAll(authProperties);
         }
         try (
             AdminClient adminClient = AdminClient.create(adminClientProperties);
@@ -116,4 +140,14 @@ protected void testKafkaFunctionality(String bootstrapServers, boolean authentic
             consumer.unsubscribe();
         }
     }
+
+    protected static String getJaasConfig() {
+        String jaasConfig =
+            "org.apache.kafka.common.security.plain.PlainLoginModule required " +
+            "username=\"admin\" " +
+            "password=\"admin\" " +
+            "user_admin=\"admin\" " +
+            "user_test=\"secret\";";
+        return jaasConfig;
+    }
 }
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 5284209a76d..6d3578f7833 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -14,6 +14,7 @@
 import org.testcontainers.Testcontainers;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -229,7 +230,38 @@ public void shouldConfigureAuthenticationWithSaslUsingJaas() {
         ) {
             kafka.start();
 
-            testSecureKafkaFunctionality(kafka.getBootstrapServers());
+            testSecurePlainKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
+    @SneakyThrows
+    @Test
+    public void shouldConfigureAuthenticationWithSaslScramUsingJaas() {
+        try (
+            KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) {
+                protected String commandKraft() {
+                    String command = "sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure\n";
+                    command +=
+                        "echo 'kafka-storage format --ignore-formatted -t \"" +
+                        "$CLUSTER_ID" +
+                        "\" --add-scram SCRAM-SHA-256=[name=admin,password=admin] -c /etc/kafka/kafka.properties' >> /etc/confluent/docker/configure\n";
+                    return command;
+                }
+            }
+                .withKraft()
+                .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT")
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_SASL_ENABLED_MECHANISMS", "SCRAM-SHA-256")
+                .withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "SCRAM-SHA-256")
+                .withEnv("KAFKA_SASL_ENABLED_MECHANISMS", "SCRAM-SHA-256")
+                .withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/secrets/kafka_server_jaas.conf")
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("kafka_server_jaas.conf"),
+                    "/etc/kafka/secrets/kafka_server_jaas.conf"
+                )
+        ) {
+            kafka.start();
+
+            testSecureScramKafkaFunctionality(kafka.getBootstrapServers());
         }
     }
 
@@ -313,14 +345,4 @@ public void enableSaslAndWithAuthenticationError() {
                 });
         }
     }
-
-    private static String getJaasConfig() {
-        String jaasConfig =
-            "org.apache.kafka.common.security.plain.PlainLoginModule required " +
-            "username=\"admin\" " +
-            "password=\"admin\" " +
-            "user_admin=\"admin\" " +
-            "user_test=\"secret\";";
-        return jaasConfig;
-    }
 }
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
index 45bc846c021..725dc2d2a62 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
@@ -1,10 +1,13 @@
 package org.testcontainers.kafka;
 
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.SneakyThrows;
 import org.junit.Test;
 import org.testcontainers.AbstractKafka;
 import org.testcontainers.KCatContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.SocatContainer;
+import org.testcontainers.utility.MountableFile;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -62,4 +65,60 @@ public void testUsageWithListenerFromProxy() throws Exception {
             testKafkaFunctionality(bootstrapServers);
         }
     }
+
+    @SneakyThrows
+    @Test
+    public void shouldConfigureAuthenticationWithSaslUsingJaas() {
+        try (
+            ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.7.0")
+                .withEnv(
+                    "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
+                    "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT,CONTROLLER:PLAINTEXT"
+                )
+                .withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_SASL_ENABLED_MECHANISMS", "PLAIN")
+                .withEnv("KAFKA_LISTENER_NAME_BROKER_PLAIN_SASL_JAAS_CONFIG", getJaasConfig())
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_PLAIN_SASL_JAAS_CONFIG", getJaasConfig())
+        ) {
+            kafka.start();
+
+            testSecurePlainKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
+
+    @SneakyThrows
+    @Test
+    public void shouldConfigureAuthenticationWithSaslScramUsingJaas() {
+        try (
+            ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.7.0") {
+                @SneakyThrows
+                @Override
+                protected void containerIsStarting(InspectContainerResponse containerInfo) {
+                    String command =
+                        "echo 'kafka-storage format --ignore-formatted -t \"" +
+                        "$CLUSTER_ID" +
+                        "\" --add-scram SCRAM-SHA-256=[name=admin,password=admin] -c /etc/kafka/kafka.properties' >> /etc/confluent/docker/configure";
+                    execInContainer("bash", "-c", command);
+                    super.containerIsStarting(containerInfo);
+                }
+            }
+                .withEnv(
+                    "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
+                    "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT,CONTROLLER:PLAINTEXT"
+                )
+                .withEnv("KAFKA_LISTENER_NAME_PLAINTEXT_SASL_ENABLED_MECHANISMS", "SCRAM-SHA-256")
+                .withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "SCRAM-SHA-256")
+                .withEnv("KAFKA_SASL_ENABLED_MECHANISMS", "SCRAM-SHA-256")
+                .withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/secrets/kafka_server_jaas.conf")
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("kafka_server_jaas.conf"),
+                    "/etc/kafka/secrets/kafka_server_jaas.conf"
+                )
+        ) {
+            kafka.start();
+
+            testSecureScramKafkaFunctionality(kafka.getBootstrapServers());
+        }
+    }
 }
diff --git a/modules/kafka/src/test/resources/kafka_server_jaas.conf b/modules/kafka/src/test/resources/kafka_server_jaas.conf
new file mode 100644
index 00000000000..89c88ed0522
--- /dev/null
+++ b/modules/kafka/src/test/resources/kafka_server_jaas.conf
@@ -0,0 +1,5 @@
+KafkaServer {
+  org.apache.kafka.common.security.scram.ScramLoginModule required
+  username="admin"
+  password="admin";
+};

From e1dc19f85627233e4135b1bd52bf8ee8788fed07 Mon Sep 17 00:00:00 2001
From: Esta Nagy <nagyesta@gmail.com>
Date: Mon, 27 Jan 2025 18:00:19 +0100
Subject: [PATCH 4131/4969] Add AzureEventHubsContainer (#9665)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Esta Nagy <nagyesta@gmail.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/azure.md                         |  31 ++++-
 modules/azure/build.gradle                    |   1 +
 .../azure/AzureEventHubsContainer.java        | 109 ++++++++++++++++++
 .../azure/AzureEventHubsContainerTest.java    |  83 +++++++++++++
 .../src/test/resources/eventhubs_config.json  |  24 ++++
 5 files changed, 247 insertions(+), 1 deletion(-)
 create mode 100644 modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java
 create mode 100644 modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java
 create mode 100644 modules/azure/src/test/resources/eventhubs_config.json

diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 19c141c7639..e09634b09c4 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -5,11 +5,12 @@ This module is INCUBATING. While it is ready for use and operational in the curr
 
 Testcontainers module for the Microsoft Azure's [SDK](https://github.com/Azure/azure-sdk-for-java).
 
-Currently, the module supports `Azurite` and `CosmosDB` emulators. In order to use them, you should use the following classes:
+Currently, the module supports `Azurite`, `Azure Event Hubs` and `CosmosDB` emulators. In order to use them, you should use the following classes:
 
 Class | Container Image
 -|-
 AzuriteContainer | [mcr.microsoft.com/azure-storage/azurite](https://github.com/microsoft/containerregistry)
+AzureEventHubsContainer | [mcr.microsoft.com/azure-messaging/eventhubs-emulator](https://github.com/microsoft/containerregistry)
 CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
 
 ## Usage example
@@ -72,6 +73,34 @@ Build Azure Table client:
 !!! note
     We can use custom credentials the same way as defined in the Blob section.
 
+### Azure Event Hubs Emulator
+
+<!--codeinclude-->
+[Configuring the Azure Event Hubs Emulator container](../../modules/azure/src/test/resources/eventhubs_config.json)
+<!--/codeinclude-->
+
+Start Azure Event Hubs Emulator during a test:
+
+<!--codeinclude-->
+[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:network
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Starting an Azurite container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:azuriteContainer
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Starting an Azure Event Hubs Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+#### Using Azure Event Hubs clients
+
+Configure the consumer and the producer clients:
+
+<!--codeinclude-->
+[Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:createProducerAndConsumer
+<!--/codeinclude-->
+
 ### CosmosDB
 
 Start Azure CosmosDB Emulator during a test:
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index c6cfb6738d0..3dc97d03fce 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -10,4 +10,5 @@ dependencies {
     testImplementation 'com.azure:azure-storage-blob:12.29.0'
     testImplementation 'com.azure:azure-storage-queue:12.24.0'
     testImplementation 'com.azure:azure-data-tables:12.5.0'
+    testImplementation 'com.azure:azure-messaging-eventhubs:5.19.2'
 }
diff --git a/modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java
new file mode 100644
index 00000000000..d611a2442cc
--- /dev/null
+++ b/modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java
@@ -0,0 +1,109 @@
+package org.testcontainers.azure;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.LicenseAcceptance;
+
+/**
+ * Testcontainers implementation for Azure Eventhubs Emulator.
+ * <p>
+ * Supported image: {@code "mcr.microsoft.com/azure-messaging/eventhubs-emulator"}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>AMQP: 5672</li>
+ * </ul>
+ */
+public class AzureEventHubsContainer extends GenericContainer<AzureEventHubsContainer> {
+
+    private static final int DEFAULT_AMQP_PORT = 5672;
+
+    private static final String CONNECTION_STRING_FORMAT =
+        "Endpoint=sb://%s:%d;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "mcr.microsoft.com/azure-messaging/eventhubs-emulator"
+    );
+
+    private AzuriteContainer azuriteContainer;
+
+    /**
+     * @param dockerImageName specified docker image name to run
+     */
+    public AzureEventHubsContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * @param dockerImageName specified docker image name to run
+     */
+    public AzureEventHubsContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        waitingFor(Wait.forLogMessage(".*Emulator Service is Successfully Up!.*", 1));
+        withExposedPorts(DEFAULT_AMQP_PORT);
+    }
+
+    /**
+     * * Sets the Azurite dependency needed by the Event Hubs Container,
+     *
+     * @param azuriteContainer The Azurite container used by Event HUbs as a dependency
+     * @return this
+     */
+    public AzureEventHubsContainer withAzuriteContainer(final AzuriteContainer azuriteContainer) {
+        this.azuriteContainer = azuriteContainer;
+        dependsOn(this.azuriteContainer);
+        return this;
+    }
+
+    /**
+     * Provide the broker configuration to the container.
+     *
+     * @param config The file containing the broker configuration
+     * @return this
+     */
+    public AzureEventHubsContainer withConfig(final Transferable config) {
+        withCopyToContainer(config, "/Eventhubs_Emulator/ConfigFiles/Config.json");
+        return this;
+    }
+
+    /**
+     * Accepts the EULA of the container.
+     *
+     * @return this
+     */
+    public AzureEventHubsContainer acceptLicense() {
+        withEnv("ACCEPT_EULA", "Y");
+        return this;
+    }
+
+    @Override
+    protected void configure() {
+        if (azuriteContainer == null) {
+            throw new IllegalStateException(
+                "The image " +
+                getDockerImageName() +
+                " requires an Azurite container. Please provide one with the withAzuriteContainer method!"
+            );
+        }
+        final String azuriteHost = azuriteContainer.getNetworkAliases().get(0);
+        withEnv("BLOB_SERVER", azuriteHost);
+        withEnv("METADATA_SERVER", azuriteHost);
+        // If license was not accepted programmatically, check if it was accepted via resource file
+        if (!getEnvMap().containsKey("ACCEPT_EULA")) {
+            LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+            acceptLicense();
+        }
+    }
+
+    /**
+     * Returns the connection string.
+     *
+     * @return connection string
+     */
+    public String getConnectionString() {
+        return String.format(CONNECTION_STRING_FORMAT, getHost(), getMappedPort(DEFAULT_AMQP_PORT));
+    }
+}
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java
new file mode 100644
index 00000000000..c0febc2ed86
--- /dev/null
+++ b/modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java
@@ -0,0 +1,83 @@
+package org.testcontainers.azure;
+
+import com.azure.core.util.IterableStream;
+import com.azure.messaging.eventhubs.EventData;
+import com.azure.messaging.eventhubs.EventHubClientBuilder;
+import com.azure.messaging.eventhubs.EventHubConsumerClient;
+import com.azure.messaging.eventhubs.EventHubProducerClient;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import com.azure.messaging.eventhubs.models.PartitionEvent;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.Network;
+import org.testcontainers.utility.MountableFile;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+
+public class AzureEventHubsContainerTest {
+
+    @Rule
+    // network {
+    public Network network = Network.newNetwork();
+
+    // }
+
+    @Rule
+    // azuriteContainer {
+    public AzuriteContainer azuriteContainer = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+        .withNetwork(network);
+
+    // }
+
+    @Rule
+    // emulatorContainer {
+    public AzureEventHubsContainer emulator = new AzureEventHubsContainer(
+        "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1"
+    )
+        .acceptLicense()
+        .withNetwork(network)
+        .withConfig(MountableFile.forClasspathResource("/eventhubs_config.json"))
+        .withAzuriteContainer(azuriteContainer);
+
+    // }
+
+    @Test
+    public void testWithEventHubsClient() {
+        try (
+            // createProducerAndConsumer {
+            EventHubProducerClient producer = new EventHubClientBuilder()
+                .connectionString(emulator.getConnectionString())
+                .fullyQualifiedNamespace("emulatorNs1")
+                .eventHubName("eh1")
+                .buildProducerClient();
+            EventHubConsumerClient consumer = new EventHubClientBuilder()
+                .connectionString(emulator.getConnectionString())
+                .fullyQualifiedNamespace("emulatorNs1")
+                .eventHubName("eh1")
+                .consumerGroup("cg1")
+                .buildConsumerClient()
+            // }
+        ) {
+            producer.send(Collections.singletonList(new EventData("test")));
+
+            waitAtMost(Duration.ofSeconds(30))
+                .pollDelay(Duration.ofSeconds(5))
+                .untilAsserted(() -> {
+                    IterableStream<PartitionEvent> events = consumer.receiveFromPartition(
+                        "0",
+                        1,
+                        EventPosition.earliest(),
+                        Duration.ofSeconds(2)
+                    );
+                    Optional<PartitionEvent> event = events.stream().findFirst();
+                    assertThat(event).isPresent();
+                    assertThat(event.get().getData().getBodyAsString()).isEqualTo("test");
+                });
+        }
+    }
+}
diff --git a/modules/azure/src/test/resources/eventhubs_config.json b/modules/azure/src/test/resources/eventhubs_config.json
new file mode 100644
index 00000000000..554be9d7cbf
--- /dev/null
+++ b/modules/azure/src/test/resources/eventhubs_config.json
@@ -0,0 +1,24 @@
+{
+    "UserConfig": {
+        "NamespaceConfig": [
+            {
+                "Type": "EventHub",
+                "Name": "emulatorNs1",
+                "Entities": [
+                    {
+                        "Name": "eh1",
+                        "PartitionCount": "1",
+                        "ConsumerGroups": [
+                            {
+                                "Name": "cg1"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        "LoggingConfig": {
+            "Type": "File"
+        }
+    }
+}

From cac1d1cccca9f63eca8c29cb5d44a32ca04f4fcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:05:23 +0000
Subject: [PATCH 4132/4969] Bump org.jetbrains:annotations in /modules/selenium

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index da8ad97f933..c565b30be8a 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     testImplementation project(':nginx')
     testImplementation 'org.assertj:assertj-core:3.26.3'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From a0473b387e77ef2e0d26ada9cbe751d07d257df1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:07:30 +0000
Subject: [PATCH 4133/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/jdbc

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 2b2868ebbc6..7b099fc491e 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':database-commons')
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.30'

From c62c98b38d73f44f46f1b44009c782319be87e36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:23:56 +0000
Subject: [PATCH 4134/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/mysql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d31fbcce266..5e0ef28fd59 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -12,5 +12,5 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.3.0'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From b986c4788dd8b819a2946c5e78be8f7342b97b3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:24:00 +0000
Subject: [PATCH 4135/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/trino

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index ce37aa68718..0977b0306b4 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:458'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 5056a556ec5b8b903201e69f5a02ec55b4b96f0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:29:26 +0000
Subject: [PATCH 4136/4969] Bump org.jetbrains:annotations in
 /modules/oracle-free

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index ac81dc66f6e..cc19ce93d54 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'

From 5a1fefab3342fc3746037876dec68df8344cc39e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:29:29 +0000
Subject: [PATCH 4137/4969] Bump org.jetbrains:annotations in
 /modules/oracle-xe

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 3de6202e869..8cc75e0ccf0 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'

From cef9427be4d5261a5d10bd3b0d0cd99610b68049 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:29:36 +0000
Subject: [PATCH 4138/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/cratedb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 9e269731b4b..3c4b19e2dea 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From c7ac38a0ab57a8fe7c373a835fb5355b6b26c50b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:30:14 +0000
Subject: [PATCH 4139/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/spock

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d6af49fecbe..1f0ce7ea3b6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.11.0'
 
-    testCompileOnly 'org.jetbrains:annotations:24.1.0'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
 sourceJar {

From 650d67b2205ed09605752960e5ecc85ec2013c25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:45:43 +0000
Subject: [PATCH 4140/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/hivemq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1c748a8d2e3..bf6f6adf693 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:24.1.0")
+    api("org.jetbrains:annotations:26.0.2")
 
     shaded("org.apache.commons:commons-lang3:3.17.0")
     shaded("commons-io:commons-io:2.17.0")

From 82ad92205270341ce0d3d8fac476b8fbf80a194b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:58:15 +0000
Subject: [PATCH 4141/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /core

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a7b600f041f..7f1fedfc390 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -71,8 +71,8 @@ configurations.all {
 dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
-    testCompileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2'
     api 'org.apache.commons:commons-compress:1.24.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From 765f91c22e61079cb4545ce7cf72c87d042ea426 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:59:50 +0000
Subject: [PATCH 4142/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/presto

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index ad35cd6ec25..988b00630d8 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 4eeec15cb1a3b7d817b33705ac09017563e18485 Mon Sep 17 00:00:00 2001
From: Esta Nagy <nagyesta@gmail.com>
Date: Tue, 28 Jan 2025 16:40:09 +0100
Subject: [PATCH 4143/4969] Add AzureServiceBusContainer (#9795)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Esta Nagy <nagyesta@gmail.com>
Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/azure.md                         |  36 +++++-
 modules/azure/build.gradle                    |   3 +
 .../azure/AzureServiceBusContainer.java       | 106 ++++++++++++++++++
 .../azure/AzureServiceBusContainerTest.java   | 105 +++++++++++++++++
 .../test/resources/service-bus-config.json    |  29 +++++
 5 files changed, 278 insertions(+), 1 deletion(-)
 create mode 100644 modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusContainer.java
 create mode 100644 modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java
 create mode 100644 modules/azure/src/test/resources/service-bus-config.json

diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index e09634b09c4..507a7e3699b 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -5,12 +5,14 @@ This module is INCUBATING. While it is ready for use and operational in the curr
 
 Testcontainers module for the Microsoft Azure's [SDK](https://github.com/Azure/azure-sdk-for-java).
 
-Currently, the module supports `Azurite`, `Azure Event Hubs` and `CosmosDB` emulators. In order to use them, you should use the following classes:
+Currently, the module supports `Azurite`, `Azure Event Hubs`, `Azure Service Bus` and `CosmosDB` emulators. In order to use them, you should use the following classes:
 
 Class | Container Image
 -|-
 AzuriteContainer | [mcr.microsoft.com/azure-storage/azurite](https://github.com/microsoft/containerregistry)
 AzureEventHubsContainer | [mcr.microsoft.com/azure-messaging/eventhubs-emulator](https://github.com/microsoft/containerregistry)
+AzureServiceBusEmulatorContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
+AzureServiceBusContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
 CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
 
 ## Usage example
@@ -101,6 +103,38 @@ Configure the consumer and the producer clients:
 [Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:createProducerAndConsumer
 <!--/codeinclude-->
 
+### Azure Service Bus Emulator
+
+<!--codeinclude-->
+[Configuring the Azure Service Bus Emulator container](../../modules/azure/src/test/resources/service-bus-config.json)
+<!--/codeinclude-->
+
+Start Azure Service Bus Emulator during a test:
+
+<!--codeinclude-->
+[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:network
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Starting a SQL Server container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:sqlContainer
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Starting a Service Bus Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:emulatorContainer
+<!--/codeinclude-->
+
+#### Using Azure Service Bus clients
+
+Configure the sender and the processor clients:
+
+<!--codeinclude-->
+[Configuring the sender client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:senderClient
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Configuring the processor client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:processorClient
+<!--/codeinclude-->
+
 ### CosmosDB
 
 Start Azure CosmosDB Emulator during a test:
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 3dc97d03fce..1b4242b4eb6 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -2,6 +2,7 @@ description = "Testcontainers :: Azure"
 
 dependencies {
     api project(':testcontainers')
+    api project(':mssqlserver')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
@@ -11,4 +12,6 @@ dependencies {
     testImplementation 'com.azure:azure-storage-queue:12.24.0'
     testImplementation 'com.azure:azure-data-tables:12.5.0'
     testImplementation 'com.azure:azure-messaging-eventhubs:5.19.2'
+    testImplementation 'com.azure:azure-messaging-servicebus:7.17.8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre8'
 }
diff --git a/modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusContainer.java
new file mode 100644
index 00000000000..f587d43648c
--- /dev/null
+++ b/modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusContainer.java
@@ -0,0 +1,106 @@
+package org.testcontainers.azure;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.MSSQLServerContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.LicenseAcceptance;
+
+/**
+ * Testcontainers implementation for Azure Service Bus Emulator.
+ * <p>
+ * Supported image: {@code mcr.microsoft.com/azure-messaging/servicebus-emulator}
+ * <p>
+ * Exposed port: 5672
+ */
+public class AzureServiceBusContainer extends GenericContainer<AzureServiceBusContainer> {
+
+    private static final String CONNECTION_STRING_FORMAT =
+        "Endpoint=sb://%s:%d;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
+
+    private static final int DEFAULT_PORT = 5672;
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "mcr.microsoft.com/azure-messaging/servicebus-emulator"
+    );
+
+    private MSSQLServerContainer<?> msSqlServerContainer;
+
+    /**
+     * @param dockerImageName The specified docker image name to run
+     */
+    public AzureServiceBusContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * @param dockerImageName The specified docker image name to run
+     */
+    public AzureServiceBusContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(DEFAULT_PORT);
+        waitingFor(Wait.forLogMessage(".*Emulator Service is Successfully Up!.*", 1));
+    }
+
+    /**
+     * Sets the MS SQL Server dependency needed by the Service Bus Container,
+     *
+     * @param msSqlServerContainer The MS SQL Server container used by Service Bus as a dependency
+     * @return this
+     */
+    public AzureServiceBusContainer withMsSqlServerContainer(final MSSQLServerContainer<?> msSqlServerContainer) {
+        dependsOn(msSqlServerContainer);
+        this.msSqlServerContainer = msSqlServerContainer;
+        return this;
+    }
+
+    /**
+     * Provide the Service Bus configuration JSON.
+     *
+     * @param config The configuration
+     * @return this
+     */
+    public AzureServiceBusContainer withConfig(final Transferable config) {
+        withCopyToContainer(config, "/ServiceBus_Emulator/ConfigFiles/Config.json");
+        return this;
+    }
+
+    /**
+     * Accepts the EULA of the container.
+     *
+     * @return this
+     */
+    public AzureServiceBusContainer acceptLicense() {
+        withEnv("ACCEPT_EULA", "Y");
+        return this;
+    }
+
+    @Override
+    protected void configure() {
+        if (msSqlServerContainer == null) {
+            throw new IllegalStateException(
+                "The image " +
+                getDockerImageName() +
+                " requires a Microsoft SQL Server container. Please provide one with the withMsSqlServerContainer method!"
+            );
+        }
+        withEnv("SQL_SERVER", msSqlServerContainer.getNetworkAliases().get(0));
+        withEnv("MSSQL_SA_PASSWORD", msSqlServerContainer.getPassword());
+        // If license was not accepted programmatically, check if it was accepted via resource file
+        if (!getEnvMap().containsKey("ACCEPT_EULA")) {
+            LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+            acceptLicense();
+        }
+    }
+
+    /**
+     * Returns the connection string.
+     *
+     * @return connection string
+     */
+    public String getConnectionString() {
+        return String.format(CONNECTION_STRING_FORMAT, getHost(), getMappedPort(DEFAULT_PORT));
+    }
+}
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java
new file mode 100644
index 00000000000..f581de19ab8
--- /dev/null
+++ b/modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java
@@ -0,0 +1,105 @@
+package org.testcontainers.azure;
+
+import com.azure.messaging.servicebus.ServiceBusClientBuilder;
+import com.azure.messaging.servicebus.ServiceBusErrorContext;
+import com.azure.messaging.servicebus.ServiceBusException;
+import com.azure.messaging.servicebus.ServiceBusMessage;
+import com.azure.messaging.servicebus.ServiceBusProcessorClient;
+import com.azure.messaging.servicebus.ServiceBusReceivedMessageContext;
+import com.azure.messaging.servicebus.ServiceBusSenderClient;
+import com.github.dockerjava.api.model.Capability;
+import org.assertj.core.api.Assertions;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.MSSQLServerContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.utility.MountableFile;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class AzureServiceBusContainerTest {
+
+    @Rule
+    // network {
+    public Network network = Network.newNetwork();
+
+    // }
+
+    @Rule
+    // sqlContainer {
+    public MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
+        "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04"
+    )
+        .acceptLicense()
+        .withPassword("yourStrong(!)Password")
+        .withCreateContainerCmdModifier(cmd -> {
+            cmd.getHostConfig().withCapAdd(Capability.SYS_PTRACE);
+        })
+        .withNetwork(network);
+
+    // }
+
+    @Rule
+    // emulatorContainer {
+    public AzureServiceBusContainer emulator = new AzureServiceBusContainer(
+        "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1"
+    )
+        .acceptLicense()
+        .withConfig(MountableFile.forClasspathResource("/service-bus-config.json"))
+        .withNetwork(network)
+        .withMsSqlServerContainer(mssqlServerContainer);
+
+    // }
+
+    @Test
+    public void testWithClient() {
+        assertThat(emulator.getConnectionString()).startsWith("Endpoint=sb://");
+
+        // senderClient {
+        ServiceBusSenderClient senderClient = new ServiceBusClientBuilder()
+            .connectionString(emulator.getConnectionString())
+            .sender()
+            .queueName("queue.1")
+            .buildClient();
+        // }
+
+        await()
+            .atMost(20, TimeUnit.SECONDS)
+            .ignoreException(ServiceBusException.class)
+            .until(() -> {
+                senderClient.sendMessage(new ServiceBusMessage("Hello, Testcontainers!"));
+                return true;
+            });
+        senderClient.close();
+
+        final List<String> received = new CopyOnWriteArrayList<>();
+        Consumer<ServiceBusReceivedMessageContext> messageConsumer = m -> {
+            received.add(m.getMessage().getBody().toString());
+            m.complete();
+        };
+        Consumer<ServiceBusErrorContext> errorConsumer = e -> Assertions.fail("Unexpected error: " + e);
+        // processorClient {
+        ServiceBusProcessorClient processorClient = new ServiceBusClientBuilder()
+            .connectionString(emulator.getConnectionString())
+            .processor()
+            .queueName("queue.1")
+            .processMessage(messageConsumer)
+            .processError(errorConsumer)
+            .buildProcessorClient();
+        // }
+        processorClient.start();
+
+        await()
+            .atMost(20, TimeUnit.SECONDS)
+            .untilAsserted(() -> {
+                assertThat(received).hasSize(1).containsExactlyInAnyOrder("Hello, Testcontainers!");
+            });
+        processorClient.close();
+    }
+}
diff --git a/modules/azure/src/test/resources/service-bus-config.json b/modules/azure/src/test/resources/service-bus-config.json
new file mode 100644
index 00000000000..18ac2e69c7b
--- /dev/null
+++ b/modules/azure/src/test/resources/service-bus-config.json
@@ -0,0 +1,29 @@
+{
+    "UserConfig": {
+        "Namespaces": [
+            {
+                "Name": "sbemulatorns",
+                "Queues": [
+                    {
+                        "Name": "queue.1",
+                        "Properties": {
+                            "DeadLetteringOnMessageExpiration": false,
+                            "DefaultMessageTimeToLive": "PT1H",
+                            "DuplicateDetectionHistoryTimeWindow": "PT20S",
+                            "ForwardDeadLetteredMessagesTo": "",
+                            "ForwardTo": "",
+                            "LockDuration": "PT1M",
+                            "MaxDeliveryCount": 3,
+                            "RequiresDuplicateDetection": false,
+                            "RequiresSession": false
+                        }
+                    }
+                ],
+                "Topics": []
+            }
+        ],
+        "Logging": {
+            "Type": "File"
+        }
+    }
+}

From e8237b141df21c9867025522406d973a4dc4f41c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 15:43:04 +0000
Subject: [PATCH 4144/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/azure

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 1b4242b4eb6..03cdcdd15d0 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.azure:azure-cosmos:4.63.3'
     testImplementation 'com.azure:azure-storage-blob:12.29.0'
     testImplementation 'com.azure:azure-storage-queue:12.24.0'

From 1404c4429c0cb98fe46534bf33632d25dc5309e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 29 Jan 2025 18:05:07 -0600
Subject: [PATCH 4145/4969] Fix cluster creation with ConfluentKafkaContainer
 and KafkaContainer (#9910)

`KAFKA_CONTROLLER_QUORUM_VOTERS` must be overridden.

Fixes #9873
---
 .../ApacheKafkaContainerCluster.java          | 104 +++++++++++++++++
 .../ApacheKafkaContainerClusterTest.java      |  94 ++++++++++++++++
 .../ConfluentKafkaContainerCluster.java       | 105 ++++++++++++++++++
 .../ConfluentKafkaContainerClusterTest.java   |  94 ++++++++++++++++
 .../kafka/ConfluentKafkaContainer.java        |   3 -
 .../testcontainers/kafka/KafkaContainer.java  |   8 +-
 .../org/testcontainers/kafka/KafkaHelper.java |   4 +
 7 files changed, 403 insertions(+), 9 deletions(-)
 create mode 100644 examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java
 create mode 100644 examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerClusterTest.java
 create mode 100644 examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java
 create mode 100644 examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerClusterTest.java

diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java
new file mode 100644
index 00000000000..a8616d2d4bb
--- /dev/null
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java
@@ -0,0 +1,104 @@
+package com.example.kafkacluster;
+
+import org.apache.kafka.common.Uuid;
+import org.awaitility.Awaitility;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.kafka.KafkaContainer;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ApacheKafkaContainerCluster implements Startable {
+
+    private final int brokersNum;
+
+    private final Network network;
+
+    private final Collection<KafkaContainer> brokers;
+
+    public ApacheKafkaContainerCluster(String version, int brokersNum, int internalTopicsRf) {
+        if (brokersNum < 0) {
+            throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
+        }
+        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+            throw new IllegalArgumentException(
+                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+            );
+        }
+
+        this.brokersNum = brokersNum;
+        this.network = Network.newNetwork();
+
+        String controllerQuorumVoters = IntStream
+            .range(0, brokersNum)
+            .mapToObj(brokerNum -> String.format("%d@broker-%d:9094", brokerNum, brokerNum))
+            .collect(Collectors.joining(","));
+
+        String clusterId = Uuid.randomUuid().toString();
+
+        this.brokers =
+            IntStream
+                .range(0, brokersNum)
+                .mapToObj(brokerNum -> {
+                    return new KafkaContainer(DockerImageName.parse("apache/kafka").withTag(version))
+                        .withNetwork(this.network)
+                        .withNetworkAliases("broker-" + brokerNum)
+                        .withEnv("CLUSTER_ID", clusterId)
+                        .withEnv("KAFKA_BROKER_ID", brokerNum + "")
+                        .withEnv("KAFKA_NODE_ID", brokerNum + "")
+                        .withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters)
+                        .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0")
+                        .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
+                        .withStartupTimeout(Duration.ofMinutes(1));
+                })
+                .collect(Collectors.toList());
+    }
+
+    public Collection<KafkaContainer> getBrokers() {
+        return this.brokers;
+    }
+
+    public String getBootstrapServers() {
+        return brokers.stream().map(KafkaContainer::getBootstrapServers).collect(Collectors.joining(","));
+    }
+
+    @Override
+    public void start() {
+        // Needs to start all the brokers at once
+        brokers.parallelStream().forEach(GenericContainer::start);
+
+        Awaitility
+            .await()
+            .atMost(Duration.ofSeconds(30))
+            .untilAsserted(() -> {
+                Container.ExecResult result =
+                    this.brokers.stream()
+                        .findFirst()
+                        .get()
+                        .execInContainer(
+                            "sh",
+                            "-c",
+                            "/opt/kafka/bin/kafka-log-dirs.sh --bootstrap-server localhost:9093 --describe | grep -o '\"broker\"' | wc -l"
+                        );
+                String brokers = result.getStdout().replace("\n", "");
+
+                assertThat(brokers).asInt().isEqualTo(this.brokersNum);
+            });
+    }
+
+    @Override
+    public void stop() {
+        this.brokers.stream().parallel().forEach(GenericContainer::stop);
+    }
+}
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerClusterTest.java
new file mode 100644
index 00000000000..38ac274706b
--- /dev/null
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerClusterTest.java
@@ -0,0 +1,94 @@
+package com.example.kafkacluster;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+class ApacheKafkaContainerClusterTest {
+
+    @Test
+    void testKafkaContainerCluster() throws Exception {
+        try (ApacheKafkaContainerCluster cluster = new ApacheKafkaContainerCluster("3.8.0", 3, 2)) {
+            cluster.start();
+            String bootstrapServers = cluster.getBootstrapServers();
+
+            assertThat(cluster.getBrokers()).hasSize(3);
+
+            testKafkaFunctionality(bootstrapServers, 3, 2);
+        }
+    }
+
+    protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
+        try (
+            AdminClient adminClient = AdminClient.create(
+                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
+            );
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                ImmutableMap.of(
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG,
+                    UUID.randomUUID().toString()
+                ),
+                new StringSerializer(),
+                new StringSerializer()
+            );
+            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
+                ImmutableMap.of(
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG,
+                    "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+                    "earliest"
+                ),
+                new StringDeserializer(),
+                new StringDeserializer()
+            );
+        ) {
+            String topicName = "messages";
+
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
+            consumer.subscribe(Collections.singletonList(topicName));
+
+            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
+
+            Awaitility
+                .await()
+                .atMost(Duration.ofSeconds(10))
+                .untilAsserted(() -> {
+                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+
+                    assertThat(records)
+                        .hasSize(1)
+                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+                });
+
+            consumer.unsubscribe();
+        }
+    }
+}
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java
new file mode 100644
index 00000000000..222050c76c0
--- /dev/null
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java
@@ -0,0 +1,105 @@
+package com.example.kafkacluster;
+
+import org.apache.kafka.common.Uuid;
+import org.awaitility.Awaitility;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.kafka.ConfluentKafkaContainer;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ConfluentKafkaContainerCluster implements Startable {
+
+    private final int brokersNum;
+
+    private final Network network;
+
+    private final Collection<ConfluentKafkaContainer> brokers;
+
+    public ConfluentKafkaContainerCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) {
+        if (brokersNum < 0) {
+            throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
+        }
+        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+            throw new IllegalArgumentException(
+                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+            );
+        }
+
+        this.brokersNum = brokersNum;
+        this.network = Network.newNetwork();
+
+        String controllerQuorumVoters = IntStream
+            .range(0, brokersNum)
+            .mapToObj(brokerNum -> String.format("%d@broker-%d:9094", brokerNum, brokerNum))
+            .collect(Collectors.joining(","));
+
+        String clusterId = Uuid.randomUuid().toString();
+
+        this.brokers =
+            IntStream
+                .range(0, brokersNum)
+                .mapToObj(brokerNum -> {
+                    return new ConfluentKafkaContainer(
+                        DockerImageName.parse("confluentinc/cp-kafka").withTag(confluentPlatformVersion)
+                    )
+                        .withNetwork(this.network)
+                        .withNetworkAliases("broker-" + brokerNum)
+                        .withEnv("CLUSTER_ID", clusterId)
+                        .withEnv("KAFKA_BROKER_ID", brokerNum + "")
+                        .withEnv("KAFKA_NODE_ID", brokerNum + "")
+                        .withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters)
+                        .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
+                        .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
+                        .withStartupTimeout(Duration.ofMinutes(1));
+                })
+                .collect(Collectors.toList());
+    }
+
+    public Collection<ConfluentKafkaContainer> getBrokers() {
+        return this.brokers;
+    }
+
+    public String getBootstrapServers() {
+        return brokers.stream().map(ConfluentKafkaContainer::getBootstrapServers).collect(Collectors.joining(","));
+    }
+
+    @Override
+    public void start() {
+        // Needs to start all the brokers at once
+        brokers.parallelStream().forEach(GenericContainer::start);
+
+        Awaitility
+            .await()
+            .atMost(Duration.ofSeconds(30))
+            .untilAsserted(() -> {
+                Container.ExecResult result =
+                    this.brokers.stream()
+                        .findFirst()
+                        .get()
+                        .execInContainer(
+                            "sh",
+                            "-c",
+                            "kafka-metadata-shell --snapshot /var/lib/kafka/data/__cluster_metadata-0/00000000000000000000.log ls /brokers | wc -l"
+                        );
+                String brokers = result.getStdout().replace("\n", "");
+
+                assertThat(brokers).asInt().isEqualTo(this.brokersNum);
+            });
+    }
+
+    @Override
+    public void stop() {
+        this.brokers.stream().parallel().forEach(GenericContainer::stop);
+    }
+}
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerClusterTest.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerClusterTest.java
new file mode 100644
index 00000000000..3bb38cb7152
--- /dev/null
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerClusterTest.java
@@ -0,0 +1,94 @@
+package com.example.kafkacluster;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+class ConfluentKafkaContainerClusterTest {
+
+    @Test
+    void testKafkaContainerCluster() throws Exception {
+        try (ConfluentKafkaContainerCluster cluster = new ConfluentKafkaContainerCluster("7.4.0", 3, 2)) {
+            cluster.start();
+            String bootstrapServers = cluster.getBootstrapServers();
+
+            assertThat(cluster.getBrokers()).hasSize(3);
+
+            testKafkaFunctionality(bootstrapServers, 3, 2);
+        }
+    }
+
+    protected void testKafkaFunctionality(String bootstrapServers, int partitions, int rf) throws Exception {
+        try (
+            AdminClient adminClient = AdminClient.create(
+                ImmutableMap.of(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers)
+            );
+            KafkaProducer<String, String> producer = new KafkaProducer<>(
+                ImmutableMap.of(
+                    ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ProducerConfig.CLIENT_ID_CONFIG,
+                    UUID.randomUUID().toString()
+                ),
+                new StringSerializer(),
+                new StringSerializer()
+            );
+            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(
+                ImmutableMap.of(
+                    ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+                    bootstrapServers,
+                    ConsumerConfig.GROUP_ID_CONFIG,
+                    "tc-" + UUID.randomUUID(),
+                    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG,
+                    "earliest"
+                ),
+                new StringDeserializer(),
+                new StringDeserializer()
+            );
+        ) {
+            String topicName = "messages";
+
+            Collection<NewTopic> topics = Collections.singletonList(new NewTopic(topicName, partitions, (short) rf));
+            adminClient.createTopics(topics).all().get(30, TimeUnit.SECONDS);
+
+            consumer.subscribe(Collections.singletonList(topicName));
+
+            producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();
+
+            Awaitility
+                .await()
+                .atMost(Duration.ofSeconds(10))
+                .untilAsserted(() -> {
+                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+
+                    assertThat(records)
+                        .hasSize(1)
+                        .extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
+                        .containsExactly(tuple(topicName, "testcontainers", "rulezzz"));
+                });
+
+            consumer.unsubscribe();
+        }
+    }
+}
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
index 8c2cce855bc..42942cdd3a5 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
@@ -44,9 +44,6 @@ public ConfluentKafkaContainer(DockerImageName dockerImageName) {
     @Override
     protected void configure() {
         KafkaHelper.resolveListeners(this, this.listeners);
-
-        String controllerQuorumVoters = String.format("%s@localhost:9094", getEnvMap().get("KAFKA_NODE_ID"));
-        withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters);
     }
 
     @Override
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
index 63e3a0d35cf..e946e0a8992 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
 
@@ -44,16 +43,13 @@ public KafkaContainer(DockerImageName dockerImageName) {
         withExposedPorts(KAFKA_PORT);
         withEnv(KafkaHelper.envVars());
 
-        withCommand("sh", "-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
-        waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
+        withCommand(KafkaHelper.COMMAND);
+        waitingFor(KafkaHelper.WAIT_STRATEGY);
     }
 
     @Override
     protected void configure() {
         KafkaHelper.resolveListeners(this, this.listeners);
-
-        String controllerQuorumVoters = String.format("%s@localhost:9094", getEnvMap().get("KAFKA_NODE_ID"));
-        withEnv("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters);
     }
 
     @Override
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java
index 00b10a4d519..61e790d474f 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaHelper.java
@@ -50,6 +50,10 @@ static Map<String, String> envVars() {
         envVars.put("KAFKA_CONTROLLER_LISTENER_NAMES", "CONTROLLER");
 
         envVars.put("KAFKA_NODE_ID", "1");
+
+        String controllerQuorumVoters = String.format("%s@localhost:9094", envVars.get("KAFKA_NODE_ID"));
+        envVars.put("KAFKA_CONTROLLER_QUORUM_VOTERS", controllerQuorumVoters);
+
         envVars.put("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);
         envVars.put("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", DEFAULT_INTERNAL_TOPIC_RF);
         envVars.put("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", DEFAULT_INTERNAL_TOPIC_RF);

From 847bb1a5672bfb37ad02691bdad856dc948eef6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 30 Jan 2025 14:22:42 -0600
Subject: [PATCH 4146/4969] Add pinecone module (#9911)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 +++
 .github/labeler.yml                           |  4 +++
 .github/settings.yml                          |  3 ++
 docs/modules/pinecone.md                      | 30 ++++++++++++++++
 mkdocs.yml                                    |  1 +
 modules/pinecone/build.gradle                 |  8 +++++
 .../pinecone/PineconeContainer.java           | 34 +++++++++++++++++++
 .../pinecone/PineconeContainerTest.java       | 33 ++++++++++++++++++
 .../src/test/resources/logback-test.xml       | 16 +++++++++
 12 files changed, 137 insertions(+)
 create mode 100644 docs/modules/pinecone.md
 create mode 100644 modules/pinecone/build.gradle
 create mode 100644 modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeContainer.java
 create mode 100644 modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java
 create mode 100644 modules/pinecone/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index fed1e5d8766..9ee3683f331 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -50,6 +50,7 @@ body:
         - Oracle Free
         - Oracle XE
         - OrientDB
+        - Pinecone
         - PostgreSQL
         - Presto
         - Pulsar
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index c89fc29208c..5dcbcc35cbd 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -50,6 +50,7 @@ body:
         - Oracle Free
         - Oracle XE
         - OrientDB
+        - Pinecone
         - PostgreSQL
         - Presto
         - Pulsar
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index aa9bf4e7777..9975d31f51e 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -50,6 +50,7 @@ body:
         - Oracle Free
         - Oracle XE
         - OrientDB
+        - Pinecone
         - PostgreSQL
         - Qdrant
         - QuestDB
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 17dd0e2aa05..e845f9bdc6c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -274,6 +274,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/pinecone"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/pulsar"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 537f40a944b..613da38298c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -168,6 +168,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/orientdb/**/*
+"modules/pinecone":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/pinecone/**/*
 "modules/postgres":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index cc9f477b19d..35266397a60 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -211,6 +211,9 @@ labels:
   - name: modules/orientdb
     color: '#006b75'
 
+  - name: modules/pinecone
+    color: '#006b75'
+
   - name: modules/postgres
     color: '#006b75'
 
diff --git a/docs/modules/pinecone.md b/docs/modules/pinecone.md
new file mode 100644
index 00000000000..77feaadcf4c
--- /dev/null
+++ b/docs/modules/pinecone.md
@@ -0,0 +1,30 @@
+# Pinecone
+
+Testcontainers module for [Pinecone](https://github.com/orgs/pinecone-io/packages/container/package/pinecone-local).
+
+## PineconeContainer's usage examples
+
+You can start an Pinecone container instance from any Java application by using:
+
+<!--codeinclude-->
+[Pinecone container](../../modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+```groovy
+testImplementation "org.testcontainers:pinecone:{{latest_version}}"
+```
+
+=== "Maven"
+```xml
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>pinecone</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index c308128969b..0e7597b62e5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -95,6 +95,7 @@ nav:
           - modules/nginx.md
           - modules/ollama.md
           - modules/openfga.md
+          - modules/pinecone.md
           - modules/pulsar.md
           - modules/qdrant.md
           - modules/rabbitmq.md
diff --git a/modules/pinecone/build.gradle b/modules/pinecone/build.gradle
new file mode 100644
index 00000000000..a78b81a3902
--- /dev/null
+++ b/modules/pinecone/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: ActiveMQ"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'io.pinecone:pinecone-client:3.1.0'
+}
diff --git a/modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeContainer.java b/modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeContainer.java
new file mode 100644
index 00000000000..845b62aa075
--- /dev/null
+++ b/modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeContainer.java
@@ -0,0 +1,34 @@
+package org.testcontainers.pinecone;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Pinecone.
+ * <p>
+ * Exposed port: 5080
+ */
+public class PineconeContainer extends GenericContainer<PineconeContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "ghcr.io/pinecone-io/pinecone-local"
+    );
+
+    private static final int PORT = 5080;
+
+    public PineconeContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public PineconeContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withEnv("PORT", String.valueOf(5080));
+        withExposedPorts(5080);
+    }
+
+    public String getEndpoint() {
+        return "http://" + getHost() + ":" + getMappedPort(PORT);
+    }
+}
diff --git a/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java b/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java
new file mode 100644
index 00000000000..0e8f2778605
--- /dev/null
+++ b/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java
@@ -0,0 +1,33 @@
+package org.testcontainers.pinecone;
+
+import io.pinecone.clients.Pinecone;
+import org.junit.Test;
+import org.openapitools.db_control.client.model.DeletionProtection;
+import org.openapitools.db_control.client.model.IndexModel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class PineconeContainerTest {
+
+    @Test
+    public void testSimple() {
+        try ( // container {
+            PineconeContainer container = new PineconeContainer("ghcr.io/pinecone-io/pinecone-local:v0.7.0")
+            // }
+        ) {
+            container.start();
+
+            // client {
+            Pinecone pinecone = new Pinecone.Builder("pclocal")
+                .withHost(container.getEndpoint())
+                .withTlsEnabled(false)
+                .build();
+            // }
+
+            String indexName = "example-index";
+            pinecone.createServerlessIndex(indexName, "cosine", 2, "aws", "us-east-1", DeletionProtection.DISABLED);
+            IndexModel indexModel = pinecone.describeIndex(indexName);
+            assertThat(indexModel.getDeletionProtection()).isEqualTo(DeletionProtection.DISABLED);
+        }
+    }
+}
diff --git a/modules/pinecone/src/test/resources/logback-test.xml b/modules/pinecone/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/pinecone/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From c5ed9c36f7a1d681b66b17c19a2f698fc4ae422c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 20:23:27 +0000
Subject: [PATCH 4147/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/activemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index dc20113a84b..2d2440827ef 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.2"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.37.0"
 }

From 442a74e85ef8be447ba1c3c5fab0277e9e75cec3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 20:24:37 +0000
Subject: [PATCH 4148/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/pinecone

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pinecone/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pinecone/build.gradle b/modules/pinecone/build.gradle
index a78b81a3902..d293456d91a 100644
--- a/modules/pinecone/build.gradle
+++ b/modules/pinecone/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.pinecone:pinecone-client:3.1.0'
 }

From 46fe67029112790b74fa694aa782a5e19277b09d Mon Sep 17 00:00:00 2001
From: Maxim Korolyov <korolyov.maxim@gmail.com>
Date: Fri, 31 Jan 2025 21:12:52 +0100
Subject: [PATCH 4149/4969] Add scylladb module (#8002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |   1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |   1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |   1 +
 .github/dependabot.yml                        |   5 +
 .github/labeler.yml                           |   4 +
 docs/modules/databases/scylladb.md            |  58 ++
 mkdocs.yml                                    |   1 +
 modules/scylladb/build.gradle                 |   9 +
 .../scylladb/ScyllaDBContainer.java           | 109 +++
 .../scylladb/ScyllaDBContainerTest.java       | 203 ++++++
 .../src/test/resources/keys/node0.cer         |   0
 .../src/test/resources/keys/node0.p12         |   0
 .../src/test/resources/keys/scylla.cer.pem    |  30 +
 .../src/test/resources/keys/scylla.key.pem    |  44 ++
 .../src/test/resources/keys/scylla.keystore   | Bin 0 -> 3510 bytes
 .../src/test/resources/keys/scylla.truststore | Bin 0 -> 1462 bytes
 .../src/test/resources/logback-test.xml       |  16 +
 .../resources/scylla-test-ssl/scylla.yaml     | 662 ++++++++++++++++++
 18 files changed, 1144 insertions(+)
 create mode 100644 docs/modules/databases/scylladb.md
 create mode 100644 modules/scylladb/build.gradle
 create mode 100644 modules/scylladb/src/main/java/org/testcontainers/scylladb/ScyllaDBContainer.java
 create mode 100644 modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java
 create mode 100644 modules/scylladb/src/test/resources/keys/node0.cer
 create mode 100644 modules/scylladb/src/test/resources/keys/node0.p12
 create mode 100644 modules/scylladb/src/test/resources/keys/scylla.cer.pem
 create mode 100644 modules/scylladb/src/test/resources/keys/scylla.key.pem
 create mode 100644 modules/scylladb/src/test/resources/keys/scylla.keystore
 create mode 100644 modules/scylladb/src/test/resources/keys/scylla.truststore
 create mode 100644 modules/scylladb/src/test/resources/logback-test.xml
 create mode 100644 modules/scylladb/src/test/resources/scylla-test-ssl/scylla.yaml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 9ee3683f331..8017aad8f8c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -58,6 +58,7 @@ body:
         - QuestDB
         - RabbitMQ
         - Redpanda
+        - ScyllaDB
         - Selenium
         - Solace
         - Solr
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 5dcbcc35cbd..f0545bed3e3 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -58,6 +58,7 @@ body:
         - QuestDB
         - RabbitMQ
         - Redpanda
+        - ScyllaDB
         - Selenium
         - Solace
         - Solr
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 9975d31f51e..cf3a2ac0620 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -58,6 +58,7 @@ body:
         - Pulsar
         - RabbitMQ
         - Redpanda
+        - ScyllaDB
         - Selenium
         - Solace
         - Solr
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e845f9bdc6c..11ccc33e3de 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -315,6 +315,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/scylladb"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/selenium"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 613da38298c..3c8eace8229 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -204,6 +204,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/redpanda/**/*
+"modules/scylladb":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/scylladb/**/*
 "modules/selenium":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/docs/modules/databases/scylladb.md b/docs/modules/databases/scylladb.md
new file mode 100644
index 00000000000..186f5097d39
--- /dev/null
+++ b/docs/modules/databases/scylladb.md
@@ -0,0 +1,58 @@
+# ScyllaDB
+
+Testcontainers module for [ScyllaDB](https://hub.docker.com/r/scylladb/scylla)
+
+## ScyllaDB's usage examples
+
+You can start a ScyllaDB container instance from any Java application by using:
+
+<!--codeinclude-->
+[Create container](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Custom config file](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:customConfiguration
+<!--/codeinclude-->
+
+### Building CqlSession
+
+<!--codeinclude-->
+[Using CQL port](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:session
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Using SSL](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:sslContext
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[Using Shard Awareness port](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:shardAwarenessSession
+<!--/codeinclude-->
+
+### Alternator
+
+<!--codeinclude-->
+[Enabling Alternator](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:alternator
+<!--/codeinclude-->
+
+<!--codeinclude-->
+[DynamoDbClient with Alternator](../../../modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java) inside_block:dynamodDbClient
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:scylladb:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>scylladb</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 0e7597b62e5..f1b894a158a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -72,6 +72,7 @@ nav:
                 - modules/databases/postgres.md
                 - modules/databases/presto.md
                 - modules/databases/questdb.md
+                - modules/databases/scylladb.md
                 - modules/databases/tidb.md
                 - modules/databases/timeplus.md
                 - modules/databases/trino.md
diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
new file mode 100644
index 00000000000..6d92489ef30
--- /dev/null
+++ b/modules/scylladb/build.gradle
@@ -0,0 +1,9 @@
+description = "Testcontainers :: ScyllaDB"
+
+dependencies {
+    api project(":testcontainers")
+
+    testImplementation 'com.scylladb:java-driver-core:4.15.0.0'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.28.6'
+}
diff --git a/modules/scylladb/src/main/java/org/testcontainers/scylladb/ScyllaDBContainer.java b/modules/scylladb/src/main/java/org/testcontainers/scylladb/ScyllaDBContainer.java
new file mode 100644
index 00000000000..f181b8b9f00
--- /dev/null
+++ b/modules/scylladb/src/main/java/org/testcontainers/scylladb/ScyllaDBContainer.java
@@ -0,0 +1,109 @@
+package org.testcontainers.scylladb;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.net.InetSocketAddress;
+import java.util.Optional;
+
+/**
+ * Testcontainers implementation for ScyllaDB.
+ * <p>
+ * Supported image: {@code scylladb/scylla}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>CQL Port: 9042</li>
+ *     <li>Shard Aware Port: 19042</li>
+ *     <li>Alternator Port: 8000</li>
+ * </ul>
+ */
+public class ScyllaDBContainer extends GenericContainer<ScyllaDBContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("scylladb/scylla");
+
+    private static final Integer CQL_PORT = 9042;
+
+    private static final Integer SHARD_AWARE_PORT = 19042;
+
+    private static final Integer ALTERNATOR_PORT = 8000;
+
+    private static final String COMMAND = "--developer-mode=1 --overprovisioned=1";
+
+    private static final String CONTAINER_CONFIG_LOCATION = "/etc/scylla";
+
+    private boolean alternatorEnabled = false;
+
+    private String configLocation;
+
+    public ScyllaDBContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ScyllaDBContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(CQL_PORT, SHARD_AWARE_PORT);
+
+        withCommand(COMMAND);
+        waitingFor(Wait.forLogMessage(".*initialization completed..*", 1));
+    }
+
+    @Override
+    protected void configure() {
+        if (this.alternatorEnabled) {
+            addExposedPort(8000);
+            String newCommand =
+                COMMAND + " --alternator-port=" + ALTERNATOR_PORT + " --alternator-write-isolation=always";
+            withCommand(newCommand);
+        }
+
+        // Map (effectively replace) directory in Docker with the content of resourceLocation if resource location is
+        // not null.
+        Optional
+            .ofNullable(configLocation)
+            .map(MountableFile::forClasspathResource)
+            .ifPresent(mountableFile -> withCopyFileToContainer(mountableFile, CONTAINER_CONFIG_LOCATION));
+    }
+
+    public ScyllaDBContainer withConfigurationOverride(String configLocation) {
+        this.configLocation = configLocation;
+        return this;
+    }
+
+    public ScyllaDBContainer withSsl(MountableFile certificate, MountableFile keyfile, MountableFile truststore) {
+        withCopyFileToContainer(certificate, "/etc/scylla/scylla.cer.pem");
+        withCopyFileToContainer(keyfile, "/etc/scylla/scylla.key.pem");
+        withCopyFileToContainer(truststore, "/etc/scylla/scylla.truststore");
+        withEnv("SSL_CERTFILE", "/etc/scylla/scylla.cer.pem");
+        return this;
+    }
+
+    public ScyllaDBContainer withAlternator() {
+        this.alternatorEnabled = true;
+        return this;
+    }
+
+    /**
+     * Retrieve an {@link InetSocketAddress} for connecting to the ScyllaDB container via the driver.
+     *
+     * @return A InetSocketAddress representation of this ScyllaDB container's host and port.
+     */
+    public InetSocketAddress getContactPoint() {
+        return new InetSocketAddress(getHost(), getMappedPort(CQL_PORT));
+    }
+
+    public InetSocketAddress getShardAwareContactPoint() {
+        return new InetSocketAddress(getHost(), getMappedPort(SHARD_AWARE_PORT));
+    }
+
+    public String getAlternatorEndpoint() {
+        if (!this.alternatorEnabled) {
+            throw new IllegalStateException("Alternator is not enabled");
+        }
+        return "http://" + getHost() + ":" + getMappedPort(ALTERNATOR_PORT);
+    }
+}
diff --git a/modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java b/modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java
new file mode 100644
index 00000000000..d151424fd20
--- /dev/null
+++ b/modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java
@@ -0,0 +1,203 @@
+package org.testcontainers.scylladb;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import org.junit.Test;
+import org.testcontainers.containers.Container;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
+import software.amazon.awssdk.services.dynamodb.model.BillingMode;
+import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
+import software.amazon.awssdk.services.dynamodb.model.KeyType;
+import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class ScyllaDBContainerTest {
+
+    private static final DockerImageName SCYLLADB_IMAGE = DockerImageName.parse("scylladb/scylla:6.2");
+
+    private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
+
+    @Test
+    public void testSimple() {
+        try ( // container {
+            ScyllaDBContainer scylladb = new ScyllaDBContainer("scylladb/scylla:6.2")
+            // }
+        ) {
+            scylladb.start();
+            // session {
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(scylladb.getContactPoint())
+                .withLocalDatacenter("datacenter1")
+                .build();
+            // }
+            ResultSet resultSet = session.execute(BASIC_QUERY);
+            assertThat(resultSet.wasApplied()).isTrue();
+            assertThat(resultSet.one().getString(0)).isNotNull();
+            assertThat(session.getMetadata().getNodes().values()).hasSize(1);
+        }
+    }
+
+    @Test
+    public void testSimpleSsl()
+        throws NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException, UnrecoverableKeyException, KeyManagementException {
+        try (
+            // customConfiguration {
+            ScyllaDBContainer scylladb = new ScyllaDBContainer("scylladb/scylla:6.2")
+                .withConfigurationOverride("scylla-test-ssl")
+                .withSsl(
+                    MountableFile.forClasspathResource("keys/scylla.cer.pem"),
+                    MountableFile.forClasspathResource("keys/scylla.key.pem"),
+                    MountableFile.forClasspathResource("keys/scylla.truststore")
+                )
+            // }
+        ) {
+            // sslContext {
+            String testResourcesDir = getClass().getClassLoader().getResource("keys/").getPath();
+
+            KeyStore keyStore = KeyStore.getInstance("PKCS12");
+            keyStore.load(
+                Files.newInputStream(Paths.get(testResourcesDir + "scylla.keystore")),
+                "scylla".toCharArray()
+            );
+
+            KeyStore trustStore = KeyStore.getInstance("PKCS12");
+            trustStore.load(
+                Files.newInputStream(Paths.get(testResourcesDir + "scylla.truststore")),
+                "scylla".toCharArray()
+            );
+
+            KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(
+                KeyManagerFactory.getDefaultAlgorithm()
+            );
+            keyManagerFactory.init(keyStore, "scylla".toCharArray());
+
+            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+                TrustManagerFactory.getDefaultAlgorithm()
+            );
+            trustManagerFactory.init(trustStore);
+
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
+            // }
+
+            scylladb.start();
+
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(scylladb.getContactPoint())
+                .withLocalDatacenter("datacenter1")
+                .withSslContext(sslContext)
+                .build();
+            ResultSet resultSet = session.execute(BASIC_QUERY);
+            assertThat(resultSet.wasApplied()).isTrue();
+            assertThat(resultSet.one().getString(0)).isNotNull();
+            assertThat(session.getMetadata().getNodes().values()).hasSize(1);
+        }
+    }
+
+    @Test
+    public void testSimpleSslCqlsh() throws IllegalStateException, InterruptedException, IOException {
+        try (
+            ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)
+                .withConfigurationOverride("scylla-test-ssl")
+                .withSsl(
+                    MountableFile.forClasspathResource("keys/scylla.cer.pem"),
+                    MountableFile.forClasspathResource("keys/scylla.key.pem"),
+                    MountableFile.forClasspathResource("keys/scylla.truststore")
+                )
+        ) {
+            scylladb.start();
+
+            Container.ExecResult execResult = scylladb.execInContainer(
+                "cqlsh",
+                "--ssl",
+                "-e",
+                "select * from system_schema.keyspaces;"
+            );
+            assertThat(execResult.getStdout()).contains("keyspace_name");
+        }
+    }
+
+    @Test
+    public void testShardAwareness() {
+        try (ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)) {
+            scylladb.start();
+            // shardAwarenessSession {
+            CqlSession session = CqlSession
+                .builder()
+                .addContactPoint(scylladb.getShardAwareContactPoint())
+                .withLocalDatacenter("datacenter1")
+                .build();
+            // }
+            ResultSet resultSet = session.execute("SELECT driver_name FROM system.clients");
+            assertThat(resultSet.one().getString(0)).isNotNull();
+            assertThat(session.getMetadata().getNodes().values()).hasSize(1);
+        }
+    }
+
+    @Test
+    public void testAlternator() {
+        try ( // alternator {
+            ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE).withAlternator()
+            // }
+        ) {
+            scylladb.start();
+
+            // dynamodDbClient {
+            DynamoDbClient client = DynamoDbClient
+                .builder()
+                .endpointOverride(URI.create(scylladb.getAlternatorEndpoint()))
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("test", "test")))
+                .region(Region.US_EAST_1)
+                .build();
+            // }
+            client.createTable(
+                CreateTableRequest
+                    .builder()
+                    .tableName("demo_table")
+                    .keySchema(KeySchemaElement.builder().attributeName("id").keyType(KeyType.HASH).build())
+                    .attributeDefinitions(
+                        AttributeDefinition.builder().attributeName("id").attributeType(ScalarAttributeType.S).build()
+                    )
+                    .billingMode(BillingMode.PAY_PER_REQUEST)
+                    .build()
+            );
+            assertThat(client.listTables().tableNames()).containsExactly(("demo_table"));
+        }
+    }
+
+    @Test
+    public void throwExceptionWhenAlternatorDisabled() {
+        try (ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)) {
+            scylladb.start();
+            assertThatThrownBy(scylladb::getAlternatorEndpoint)
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessageContaining("Alternator is not enabled");
+        }
+    }
+}
diff --git a/modules/scylladb/src/test/resources/keys/node0.cer b/modules/scylladb/src/test/resources/keys/node0.cer
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/modules/scylladb/src/test/resources/keys/node0.p12 b/modules/scylladb/src/test/resources/keys/node0.p12
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/modules/scylladb/src/test/resources/keys/scylla.cer.pem b/modules/scylladb/src/test/resources/keys/scylla.cer.pem
new file mode 100644
index 00000000000..8f538448288
--- /dev/null
+++ b/modules/scylladb/src/test/resources/keys/scylla.cer.pem
@@ -0,0 +1,30 @@
+Bag Attributes
+    friendlyName: node0
+    localKeyID: 54 69 6D 65 20 31 37 33 35 39 34 30 37 38 39 31 39 34 
+subject=C=None, L=None, O=None, OU=None, CN=None
+issuer=C=None, L=None, O=None, OU=None, CN=None
+-----BEGIN CERTIFICATE-----
+MIIEOzCCAqOgAwIBAgIIY4iVNsJSWiEwDQYJKoZIhvcNAQEMBQAwSzENMAsGA1UE
+BhMETm9uZTENMAsGA1UEBxMETm9uZTENMAsGA1UEChMETm9uZTENMAsGA1UECxME
+Tm9uZTENMAsGA1UEAxMETm9uZTAgFw0yNTAxMDMyMTM5MzFaGA8yMTI0MTIxMDIx
+MzkzMVowSzENMAsGA1UEBhMETm9uZTENMAsGA1UEBxMETm9uZTENMAsGA1UEChME
+Tm9uZTENMAsGA1UECxMETm9uZTENMAsGA1UEAxMETm9uZTCCAaIwDQYJKoZIhvcN
+AQEBBQADggGPADCCAYoCggGBAJuC18n+jlDcmR8CWxSK3fR2t1Am8P7IK5FY3ky8
+vEJSCMh+GoiqXVq67zhpOJnlgvEEZIDJGzBmJ/nIZvQwIAMxs792fHIEpEI2GTpf
+oaMf/9AAuPXuscg+5i4us1eVyVbrq3sREJ2NXHIPylcjtbwLjuepvmXTLp1d7oOJ
+Ad0X0W3UN/uwrlV3NPBuVLjJiCvJijWrCv1lFTuIcclqs478ozllp8UfcwJ57OH2
+Hq1ee9Ex9y7HouDPfFzmMRp1/jEcb0xbefpdW3Am6P9AXQuw2JMempwt5KbrAE+Z
+V1JnZCjSYSkspwid2bt5To/o60ypZUUswElasgAV/k8AxxDOkJGZusEqqVH7EFvk
+h3FiY/jb9cM1t5eLcpjx0wA+GOuErW3dgH5/WYugY2iiYjP1IQTb8Pk+gfAvq+2p
+SX3wISDCAh53j+aceUvNf+lItXsz66V9e+VH1xcOZcyO4gAMUVNYQFv/2wZ9knK4
+o30Aiqir1g2Hd5F/rWYNum+UbQIDAQABoyEwHzAdBgNVHQ4EFgQUqAWcYa3l/OHI
+JACasy+bZUwHP9kwDQYJKoZIhvcNAQEMBQADggGBAJQo55VJd8aEv6uiC5bKdACo
+M1GMvxWXUFzTdh2XKTOMF5GWwGJ3WRuW9o9wMZwXjvRihPfnx+DnfCCgZBOTGLXB
+3ObsogR9rij4uquUIkGJsshggY2gO82NVD7dRwGClncwTI+/RU7qGUym4SEdg6GP
+yfad3eTvqscQU1mNTxkaH0IDzPm0SWF8lcgGnrdHWlN+Nb8MJSHL5NFc9DA9pZck
+5/4MG1X8Hsk/UT04ln+8VrhYFkxkDv4fSKlr65slrst5721J0j+VLEwnuEl1onpW
+WHTTTIcOTDR5asrN9ZACCUsBxST8yfoJQ5G4HMO+UI1/1d928Ug6kHNWw2WR5FGG
+pJVu9vpTdA01MNkSeCuZhaPe2XgZcNPyHXcVxslNvFFZ0FVt6pSIhtmZ+4a8dRsm
+eU4NQ+PJ24En/8dErxaPqmi31wRZBg5Y9YlugJV4GQszCKHr0OYNK+Lpdq9dboUj
+6lxX7+gshUgKMzunUl/rTvddG7e/WuZbi9IvmJ4MYw==
+-----END CERTIFICATE-----
diff --git a/modules/scylladb/src/test/resources/keys/scylla.key.pem b/modules/scylladb/src/test/resources/keys/scylla.key.pem
new file mode 100644
index 00000000000..26ff1a8b80d
--- /dev/null
+++ b/modules/scylladb/src/test/resources/keys/scylla.key.pem
@@ -0,0 +1,44 @@
+Bag Attributes
+    friendlyName: node0
+    localKeyID: 54 69 6D 65 20 31 37 33 35 39 34 30 37 38 39 31 39 34 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+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
+fMq1U6czbhYvEjp3Y42Exw==
+-----END PRIVATE KEY-----
diff --git a/modules/scylladb/src/test/resources/keys/scylla.keystore b/modules/scylladb/src/test/resources/keys/scylla.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..7f027beaf649e0f2292788888336994807b5cd75
GIT binary patch
literal 3510
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
O2N1-5y7TqFEc8E(25$}k

literal 0
HcmV?d00001

diff --git a/modules/scylladb/src/test/resources/keys/scylla.truststore b/modules/scylladb/src/test/resources/keys/scylla.truststore
new file mode 100644
index 0000000000000000000000000000000000000000..a798f8dcce44d3c329d6195ba3af64ed4a53a50a
GIT binary patch
literal 1462
zcmV;n1xflaf(5by0Ru3C1zZLRDuzgg_YDCD0ic2fO$34kNic#1MKFQ|K?VsbhDe6@
z4FLxRpn?T5FoFdx0s#Opf(0iA2`Yw2hW8Bt2LUi<1_>&LNQU<f0R;^(Sui*T2`Yw2
zhW8Bt1q?7N1Qf{&iy>5-gZ~153!C`mHv|RJqkRGbClCSwATSID2r7n1hW8Bu2?YQ!
z9R>+thDZTr0|Wso1Q2DPC;#aGeKa6bP33KLOmBdK1hAHP;qn_}1BXg}MP%07z!J29
zFu@r!$kn9y6|W%ZHC5^Vm^lbFlTfC7XiZz++R@**rg>V5_V*g!C?R`e=(VMP+9(ps
zn%UD;=da#Ufs|o1<jg-SZR+Krpj*+%LQ7PTW98fYQ6^q!xyoCgSqFj|7*?8_0`~ce
z>Sxn<-`>1Xmz5t8upK_822W2hJFHEu_UVBLWSQP947cRx$nEUSX&38@wjN9~-Whhd
zgYjxS5H39viu2k=YBGS$Wq~3dX9Z$LSZj;O4uoK=2{f<$rEo8KAT79D9{D0KOh|D4
zt$x7SGzs%WDrX)X^fDHbAioXb=O^gc&OFj7;E{K^iP8<Ujlhw;0xMS8JBQCQR%*#1
z;qlJ_2mcKu6duOC$OSh>pEMN{D5+>=Td4o^D4W7G1UEN!M-GGx2;4`4?-_Zx>Rsw!
zuG^iH57<=S-JADMCWZ=<h+${pgkq!b|At@KJmFqjtaMN6-+?yUy1(kPL$5MLmUPWl
z*3bmCr{b7q<QZ1uD}9xC+x=U63$2gu@yX`IMJa<5+@MUu?DPtxV9-NT^B&Hc>dF$z
zaU9F1_t7oZOq>k&7)b=X?GZ+zy#_vc&ArughWgk4W)O>nlJ2IR%qkXs$F>f+u&78u
zAWfp2)|lS={~L1u(`-RdM(6K5gHFM_vZ3*Y<NQ-iW(s*)D=PmD2Aewi=}WmY1Sf#=
zBr+R&wbkz}cxB>~*ll61wagf(EJK}fKeX_vHtaEW`$xmNi}0x@cO>s9#QdG#9a%B2
zs}VLWw^F2K{kR)OutJ;;WWlCx4!b72t%8|4vVFRwbHs3)!POOL5D4_wT0A7*X5M#I
zC*1kPy+I*e&;#7aG>I7Jpy?xT#;Sb4D8L0yfGvh#_AeY66GMQssfMXL*`;1AJI;s@
zKomECt#Cx|Ve!ibEqz^g91TydEg9oi1_{PJA&BHbM3|xa$d~Q`r|-*OEbbjFpJO5s
z$A|ZP2_DWs{DeQ1iW_nKYBxgGTs&j;7~9m$l4rf){J}0yY`0I;GGrMB%s1fo>X?gy
z_!1Eob)3WJ)KI?f-`x)#-f*hi5rkb<X<I4!w2nM`spz_Oz2v;3^quiaO-;xYVf(cb
z<zH}GVq12_CJyV2;E5*TLP|nzZ#r^Dd}6{zWLly1w1v~H>Q&+V2a0UIK4M=2##eo#
zBQ$=_IHmJHu(taY;|=Bt@Xsf`-Iv@KX{waxst>^0(N%St|J#-)|MeTwbu<A)J%f8h
zts4UYhh46RgSv%zLDG-=-Qr%)#oh+ijso(3XQ$;)7eodo8=|O`UgK!Q?AYOR=2kTr
z3vqoGsVXkr#2Bzn@BY-<7RE<~&=Qu8&@^;+jxIa%K9A_h29}dR#qdC+zqvJx2B3r8
zl}`BwwNj@(D?h4w_?s>0_Ot<%cc3Z@blgj343RkISjLS`z~0!!qRb%Qvy=B;ZgdgK
zD`>4$Jq&Ho^wP*jve&n$sgFkB?T}LuA3nh|2bEcHx<d&~@J?lp``{Lcf|$5Y2_40<
z;T`}{gAad?B1-+yhMn&BQPN!shOGQ5nkaGr;^Js(@0KZP<kK)sFflL<1_@w>NC9O7
z1OfpC00baJ_x}tCC{h-ATwLUNtcqciVtnQq0najyZYDmrr=G|J6n11P0&KFjY9D>$
Qm&0GUI!}BEy#fL!5K#57VgLXD

literal 0
HcmV?d00001

diff --git a/modules/scylladb/src/test/resources/logback-test.xml b/modules/scylladb/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/scylladb/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>
diff --git a/modules/scylladb/src/test/resources/scylla-test-ssl/scylla.yaml b/modules/scylladb/src/test/resources/scylla-test-ssl/scylla.yaml
new file mode 100644
index 00000000000..7d79fabb70e
--- /dev/null
+++ b/modules/scylladb/src/test/resources/scylla-test-ssl/scylla.yaml
@@ -0,0 +1,662 @@
+# Scylla storage config YAML
+
+#######################################
+# This file is split to two sections:
+# 1. Supported parameters
+# 2. Unsupported parameters: reserved for future use or backwards
+#    compatibility.
+# Scylla will only read and use the first segment
+#######################################
+
+### Supported Parameters
+
+# The name of the cluster. This is mainly used to prevent machines in
+# one logical cluster from joining another.
+# It is recommended to change the default value when creating a new cluster.
+# You can NOT modify this value for an existing cluster
+#cluster_name: 'Test Cluster'
+
+# This defines the number of tokens randomly assigned to this node on the ring
+# The more tokens, relative to other nodes, the larger the proportion of data
+# that this node will store. You probably want all nodes to have the same number
+# of tokens assuming they have equal hardware capability.
+num_tokens: 256
+
+# Directory where Scylla should store all its files, which are commitlog,
+# data, hints, view_hints and saved_caches subdirectories. All of these
+# subs can be overridden by the respective options below.
+# If unset, the value defaults to /var/lib/scylla
+# workdir: /var/lib/scylla
+
+# Directory where Scylla should store data on disk.
+# data_file_directories:
+#    - /var/lib/scylla/data
+
+# commit log.  when running on magnetic HDD, this should be a
+# separate spindle than the data directories.
+# commitlog_directory: /var/lib/scylla/commitlog
+
+# schema commit log. A special commitlog instance
+# used for schema and system tables.
+# When running on magnetic HDD, this should be a
+# separate spindle than the data directories.
+# schema_commitlog_directory: /var/lib/scylla/commitlog/schema
+
+# commitlog_sync may be either "periodic" or "batch."
+#
+# When in batch mode, Scylla won't ack writes until the commit log
+# has been fsynced to disk.  It will wait
+# commitlog_sync_batch_window_in_ms milliseconds between fsyncs.
+# This window should be kept short because the writer threads will
+# be unable to do extra work while waiting.  (You may need to increase
+# concurrent_writes for the same reason.)
+#
+# commitlog_sync: batch
+# commitlog_sync_batch_window_in_ms: 2
+#
+# the other option is "periodic" where writes may be acked immediately
+# and the CommitLog is simply synced every commitlog_sync_period_in_ms
+# milliseconds.
+commitlog_sync: periodic
+commitlog_sync_period_in_ms: 10000
+
+# The size of the individual commitlog file segments.  A commitlog
+# segment may be archived, deleted, or recycled once all the data
+# in it (potentially from each columnfamily in the system) has been
+# flushed to sstables.
+#
+# The default size is 32, which is almost always fine, but if you are
+# archiving commitlog segments (see commitlog_archiving.properties),
+# then you probably want a finer granularity of archiving; 8 or 16 MB
+# is reasonable.
+commitlog_segment_size_in_mb: 32
+
+# The size of the individual schema commitlog file segments.
+#
+# The default size is 128, which is 4 times larger than the default
+# size of the data commitlog. It's because the segment size puts
+# a limit on the mutation size that can be written at once, and some
+# schema mutation writes are much larger than average.
+schema_commitlog_segment_size_in_mb: 128
+
+# any class that implements the SeedProvider interface and has a
+# constructor that takes a Map<String, String> of parameters will do.
+seed_provider:
+    # Addresses of hosts that are deemed contact points.
+    # Cassandra nodes use this list of hosts to find each other and learn
+    # the topology of the ring.  You must change this if you are running
+    # multiple nodes!
+    - class_name: org.apache.cassandra.locator.SimpleSeedProvider
+      parameters:
+          # seeds is actually a comma-delimited list of addresses.
+          # Ex: "<ip1>,<ip2>,<ip3>"
+          - seeds: "172.17.0.3,127.0.0.1,172.17.0.2,172.17.0.4,172.17.0.5"
+
+
+# Address to bind to and tell other Scylla nodes to connect to.
+# You _must_ change this if you want multiple nodes to be able to communicate!
+#
+# If you leave broadcast_address (below) empty, then setting listen_address
+# to 0.0.0.0 is wrong as other nodes will not know how to reach this node.
+# If you set broadcast_address, then you can set listen_address to 0.0.0.0.
+listen_address: localhost
+
+# Address to broadcast to other Scylla nodes
+# Leaving this blank will set it to the same value as listen_address
+# broadcast_address: 1.2.3.4
+
+
+# When using multiple physical network interfaces, set this to true to listen on broadcast_address
+# in addition to the listen_address, allowing nodes to communicate in both interfaces.
+# Ignore this property if the network configuration automatically routes between the public and private networks such as EC2.
+#
+# listen_on_broadcast_address: false
+
+# port for the CQL native transport to listen for clients on
+# For security reasons, you should not expose this port to the internet. Firewall it if needed.
+# To disable the CQL native transport, remove this option and configure native_transport_port_ssl.
+native_transport_port: 9042
+
+# Like native_transport_port, but clients are forwarded to specific shards, based on the
+# client-side port numbers.
+native_shard_aware_transport_port: 19042
+
+# Enabling native transport encryption in client_encryption_options allows you to either use
+# encryption for the standard port or to use a dedicated, additional port along with the unencrypted
+# standard native_transport_port.
+# Enabling client encryption and keeping native_transport_port_ssl disabled will use encryption
+# for native_transport_port. Setting native_transport_port_ssl to a different value
+# from native_transport_port will use encryption for native_transport_port_ssl while
+# keeping native_transport_port unencrypted.
+#native_transport_port_ssl: 9142
+
+# Like native_transport_port_ssl, but clients are forwarded to specific shards, based on the
+# client-side port numbers.
+#native_shard_aware_transport_port_ssl: 19142
+
+# How long the coordinator should wait for read operations to complete
+read_request_timeout_in_ms: 5000
+
+# How long the coordinator should wait for writes to complete
+write_request_timeout_in_ms: 2000
+# how long a coordinator should continue to retry a CAS operation
+# that contends with other proposals for the same row
+cas_contention_timeout_in_ms: 1000
+
+# phi value that must be reached for a host to be marked down.
+# most users should never need to adjust this.
+# phi_convict_threshold: 8
+
+# IEndpointSnitch.  The snitch has two functions:
+# - it teaches Scylla enough about your network topology to route
+#   requests efficiently
+# - it allows Scylla to spread replicas around your cluster to avoid
+#   correlated failures. It does this by grouping machines into
+#   "datacenters" and "racks."  Scylla will do its best not to have
+#   more than one replica on the same "rack" (which may not actually
+#   be a physical location)
+#
+# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
+# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
+# ARE PLACED.
+#
+# Out of the box, Scylla provides
+#  - SimpleSnitch:
+#    Treats Strategy order as proximity. This can improve cache
+#    locality when disabling read repair.  Only appropriate for
+#    single-datacenter deployments.
+#  - GossipingPropertyFileSnitch
+#    This should be your go-to snitch for production use.  The rack
+#    and datacenter for the local node are defined in
+#    cassandra-rackdc.properties and propagated to other nodes via
+#    gossip.  If cassandra-topology.properties exists, it is used as a
+#    fallback, allowing migration from the PropertyFileSnitch.
+#  - PropertyFileSnitch:
+#    Proximity is determined by rack and data center, which are
+#    explicitly configured in cassandra-topology.properties.
+#  - Ec2Snitch:
+#    Appropriate for EC2 deployments in a single Region. Loads Region
+#    and Availability Zone information from the EC2 API. The Region is
+#    treated as the datacenter, and the Availability Zone as the rack.
+#    Only private IPs are used, so this will not work across multiple
+#    Regions.
+#  - Ec2MultiRegionSnitch:
+#    Uses public IPs as broadcast_address to allow cross-region
+#    connectivity.  (Thus, you should set seed addresses to the public
+#    IP as well.) You will need to open the storage_port or
+#    ssl_storage_port on the public IP firewall.  (For intra-Region
+#    traffic, Scylla will switch to the private IP after
+#    establishing a connection.)
+#  - RackInferringSnitch:
+#    Proximity is determined by rack and data center, which are
+#    assumed to correspond to the 3rd and 2nd octet of each node's IP
+#    address, respectively.  Unless this happens to match your
+#    deployment conventions, this is best used as an example of
+#    writing a custom Snitch class and is provided in that spirit.
+#
+# You can use a custom Snitch by setting this to the full class name
+# of the snitch, which will be assumed to be on your classpath.
+endpoint_snitch: SimpleSnitch
+
+# The address or interface to bind the native transport server to.
+#
+# Set rpc_address OR rpc_interface, not both. Interfaces must correspond
+# to a single address, IP aliasing is not supported.
+#
+# Leaving rpc_address blank has the same effect as on listen_address
+# (i.e. it will be based on the configured hostname of the node).
+#
+# Note that unlike listen_address, you can specify 0.0.0.0, but you must also
+# set broadcast_rpc_address to a value other than 0.0.0.0.
+#
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+#
+# If you choose to specify the interface by name and the interface has an ipv4 and an ipv6 address
+# you can specify which should be chosen using rpc_interface_prefer_ipv6. If false the first ipv4
+# address will be used. If true the first ipv6 address will be used. Defaults to false preferring
+# ipv4. If there is only one address it will be selected regardless of ipv4/ipv6.
+rpc_address: localhost
+# rpc_interface: eth1
+# rpc_interface_prefer_ipv6: false
+
+# port for REST API server
+api_port: 10000
+
+# IP for the REST API server
+api_address: 127.0.0.1
+
+# Log WARN on any batch size exceeding this value. 128 kiB per batch by default.
+# Caution should be taken on increasing the size of this threshold as it can lead to node instability.
+batch_size_warn_threshold_in_kb: 128
+
+# Fail any multiple-partition batch exceeding this value. 1 MiB (8x warn threshold) by default.
+batch_size_fail_threshold_in_kb: 1024
+
+  # Authentication backend, identifying users
+  # Out of the box, Scylla provides org.apache.cassandra.auth.{AllowAllAuthenticator,
+  # PasswordAuthenticator}.
+  #
+  # - AllowAllAuthenticator performs no checks - set it to disable authentication.
+  # - PasswordAuthenticator relies on username/password pairs to authenticate
+  #   users. It keeps usernames and hashed passwords in system_auth.credentials table.
+  #   Please increase system_auth keyspace replication factor if you use this authenticator.
+  # - com.scylladb.auth.TransitionalAuthenticator requires username/password pair
+  #   to authenticate in the same manner as PasswordAuthenticator, but improper credentials
+  #   result in being logged in as an anonymous user. Use for upgrading clusters' auth.
+  # authenticator: AllowAllAuthenticator
+
+  # Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
+  # Out of the box, Scylla provides org.apache.cassandra.auth.{AllowAllAuthorizer,
+  # CassandraAuthorizer}.
+  #
+  # - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
+  # - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
+  #   increase system_auth keyspace replication factor if you use this authorizer.
+  # - com.scylladb.auth.TransitionalAuthorizer wraps around the CassandraAuthorizer, using it for
+  #   authorizing permission management. Otherwise, it allows all. Use for upgrading
+  #   clusters' auth.
+  # authorizer: AllowAllAuthorizer
+
+  # initial_token allows you to specify tokens manually.  While you can use # it with
+  # vnodes (num_tokens > 1, above) -- in which case you should provide a
+  # comma-separated list -- it's primarily used when adding nodes # to legacy clusters
+  # that do not have vnodes enabled.
+  # initial_token:
+
+  # RPC address to broadcast to drivers and other Scylla nodes. This cannot
+  # be set to 0.0.0.0. If left blank, this will be set to the value of
+  # rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must
+  # be set.
+  # broadcast_rpc_address: 1.2.3.4
+
+  # Uncomment to enable experimental features
+  # experimental_features:
+  #     - udf
+  #     - alternator-streams
+  #     - broadcast-tables
+  #     - keyspace-storage-options
+
+  # The directory where hints files are stored if hinted handoff is enabled.
+  # hints_directory: /var/lib/scylla/hints
+
+# The directory where hints files are stored for materialized-view updates
+# view_hints_directory: /var/lib/scylla/view_hints
+
+# See https://docs.scylladb.com/architecture/anti-entropy/hinted-handoff
+# May either be "true" or "false" to enable globally, or contain a list
+# of data centers to enable per-datacenter.
+# hinted_handoff_enabled: DC1,DC2
+# hinted_handoff_enabled: true
+
+# this defines the maximum amount of time a dead host will have hints
+# generated.  After it has been dead this long, new hints for it will not be
+# created until it has been seen alive and gone down again.
+# max_hint_window_in_ms: 10800000 # 3 hours
+
+
+# Validity period for permissions cache (fetching permissions can be an
+# expensive operation depending on the authorizer, CassandraAuthorizer is
+# one example). Defaults to 10000, set to 0 to disable.
+# Will be disabled automatically for AllowAllAuthorizer.
+# permissions_validity_in_ms: 10000
+
+# Refresh interval for permissions cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If permissions_validity_in_ms is non-zero, then this also must have
+# a non-zero value. Defaults to 2000. It's recommended to set this value to
+# be at least 3 times smaller than the permissions_validity_in_ms.
+# permissions_update_interval_in_ms: 2000
+
+# The partitioner is responsible for distributing groups of rows (by
+# partition key) across nodes in the cluster.  You should leave this
+# alone for new clusters.  The partitioner can NOT be changed without
+# reloading all data, so when upgrading you should set this to the
+# same partitioner you were already using.
+#
+# Murmur3Partitioner is currently the only supported partitioner,
+#
+partitioner: org.apache.cassandra.dht.Murmur3Partitioner
+
+# Total space to use for commitlogs.
+#
+# If space gets above this value (it will round up to the next nearest
+# segment multiple), Scylla will flush every dirty CF in the oldest
+# segment and remove it.  So a small total commitlog space will tend
+# to cause more flush activity on less-active columnfamilies.
+#
+# A value of -1 (default) will automatically equate it to the total amount of memory
+# available for Scylla.
+commitlog_total_space_in_mb: -1
+
+# TCP port, for commands and data
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+# storage_port: 7000
+
+# SSL port, for encrypted communication.  Unused unless enabled in
+# encryption_options
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+# ssl_storage_port: 7001
+
+# listen_interface: eth0
+# listen_interface_prefer_ipv6: false
+
+# Whether to start the native transport server.
+# Please note that the address on which the native transport is bound is the
+# same as the rpc_address. The port however is different and specified below.
+# start_native_transport: true
+
+# The maximum size of allowed frame. Frame (requests) larger than this will
+# be rejected as invalid. The default is 256MB.
+# native_transport_max_frame_size_in_mb: 256
+
+# enable or disable keepalive on rpc/native connections
+# rpc_keepalive: true
+
+# Set to true to have Scylla create a hard link to each sstable
+# flushed or streamed locally in a backups/ subdirectory of the
+# keyspace data.  Removing these links is the operator's
+# responsibility.
+# incremental_backups: false
+
+# Whether or not to take a snapshot before each compaction.  Be
+# careful using this option, since Scylla won't clean up the
+# snapshots for you.  Mostly useful if you're paranoid when there
+# is a data format change.
+# snapshot_before_compaction: false
+
+# Whether or not a snapshot is taken of the data before keyspace truncation
+# or dropping of column families. The STRONGLY advised default of true
+# should be used to provide data safety. If you set this flag to false, you will
+# lose data on truncation or drop.
+# auto_snapshot: true
+
+# When executing a scan, within or across a partition, we need to keep the
+# tombstones seen in memory so we can return them to the coordinator, which
+# will use them to make sure other replicas also know about the deleted rows.
+# With workloads that generate a lot of tombstones, this can cause performance
+# problems and even exhaust the server heap.
+# (http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets)
+# Adjust the thresholds here if you understand the dangers and want to
+# scan more tombstones anyway.  These thresholds may also be adjusted at runtime
+# using the StorageService mbean.
+# tombstone_warn_threshold: 1000
+# tombstone_failure_threshold: 100000
+
+# Granularity of the collation index of rows within a partition.
+# Increase if your rows are large, or if you have a very large
+# number of rows per partition.  The competing goals are these:
+#   1) a smaller granularity means more index entries are generated
+#      and looking up rows within the partition by collation column
+#      is faster
+#   2) but, Scylla will keep the collation index in memory for hot
+#      rows (as part of the key cache), so a larger granularity means
+#      you can cache more hot rows
+# column_index_size_in_kb: 64
+
+# Auto-scaling of the promoted index prevents running out of memory
+# when the promoted index grows too large (due to partitions with many rows
+# vs. too small column_index_size_in_kb).  When the serialized representation
+# of the promoted index grows by this threshold, the desired block size
+# for this partition (initialized to column_index_size_in_kb)
+# is doubled, to decrease the sampling resolution by half.
+#
+# To disable promoted index auto-scaling, set the threshold to 0.
+# column_index_auto_scale_threshold_in_kb: 10240
+
+# Log a warning when writing partitions larger than this value
+# compaction_large_partition_warning_threshold_mb: 1000
+
+# Log a warning when writing rows larger than this value
+# compaction_large_row_warning_threshold_mb: 10
+
+# Log a warning when writing cells larger than this value
+# compaction_large_cell_warning_threshold_mb: 1
+
+# Log a warning when row number is larger than this value
+# compaction_rows_count_warning_threshold: 100000
+
+# Log a warning when writing a collection containing more elements than this value
+# compaction_collection_elements_count_warning_threshold: 10000
+
+# How long the coordinator should wait for seq or index scans to complete
+# range_request_timeout_in_ms: 10000
+# How long the coordinator should wait for writes to complete
+# counter_write_request_timeout_in_ms: 5000
+# How long a coordinator should continue to retry a CAS operation
+# that contends with other proposals for the same row
+# cas_contention_timeout_in_ms: 1000
+# How long the coordinator should wait for truncates to complete
+# (This can be much longer, because unless auto_snapshot is disabled
+# we need to flush first so we can snapshot before removing the data.)
+# truncate_request_timeout_in_ms: 60000
+# The default timeout for other, miscellaneous operations
+# request_timeout_in_ms: 10000
+
+# Enable or disable inter-node encryption.
+# You must also generate keys and provide the appropriate key and trust store locations and passwords.
+#
+# The available internode options are : all, none, dc, rack
+# If set to dc scylla  will encrypt the traffic between the DCs
+# If set to rack scylla  will encrypt the traffic between the racks
+#
+# SSL/TLS algorithm and ciphers used can be controlled by
+# the priority_string parameter. Info on priority string
+# syntax and values is available at:
+#   https://gnutls.org/manual/html_node/Priority-Strings.html
+#
+# The require_client_auth parameter allows you to
+# restrict access to service based on certificate
+# validation. Client must provide a certificate
+# accepted by the used trust store to connect.
+#
+# server_encryption_options:
+#    internode_encryption: none
+#    certificate: conf/scylla.crt
+#    keyfile: conf/scylla.key
+#    truststore: <not set, use system trust>
+#    certficate_revocation_list: <not set>
+#    require_client_auth: False
+#    priority_string: <not set, use default>
+
+# enable or disable client/server encryption.
+client_encryption_options:
+    enabled: true
+    certificate: /etc/scylla/scylla.cer.pem
+    keyfile: /etc/scylla/scylla.key.pem
+    truststore: /etc/scylla/scylla.truststore
+    truststore_password: scylla
+#    certficate_revocation_list: <not set>
+#    require_client_auth: False
+#    priority_string: <not set, use default>
+
+# internode_compression controls whether traffic between nodes is
+# compressed.
+# can be:  all  - all traffic is compressed
+#          dc   - traffic between different datacenters is compressed
+#          none - nothing is compressed.
+# internode_compression: none
+
+# Enables inter-node traffic compression metrics (`scylla_rpc_compression_...`)
+# and enables a new implementation of inter-node traffic compressors,
+# capable of using zstd (in addition to the default lz4)
+# and shared dictionaries.
+# (Those features must still be enabled by other settings).
+# Has minor CPU cost.
+#
+# internode_compression_enable_advanced: false
+
+# Enables training of shared compression dictionaries on inter-node traffic.
+# New dictionaries are distributed throughout the cluster via Raft,
+# and used to improve the effectiveness of inter-node traffic compression
+# when `internode_compression_enable_advanced` is enabled.
+#
+# WARNING: this may leak unencrypted data to disk. The trained dictionaries
+# contain randomly-selected pieces of data written to the cluster.
+# When the Raft log is unencrypted, those pieces of data will be
+# written to disk unencrypted. At the moment of writing, there is no
+# way to encrypt the Raft log.
+# This problem is tracked by https://github.com/scylladb/scylla-enterprise/issues/4717.
+#
+# Can be:  never       - Dictionaries aren't trained by this node.
+#          when_leader - New dictionaries are trained by this node only if
+#                        it's the current Raft leader.
+#          always      - Dictionaries are trained by this node unconditionally.
+#
+# For efficiency reasons, training shouldn't be enabled on more than one node.
+# To enable it on a single node, one can let the cluster pick the trainer
+# by setting `when_leader` on all nodes, or specify one manually by setting `always`
+# on one node and `never` on others.
+#
+# rpc_dict_training_when: never
+
+# A number in range [0.0, 1.0] specifying the share of CPU which can be spent
+# by this node on compressing inter-node traffic with zstd.
+#
+# Depending on the workload, enabling zstd might have a drastic negative
+# effect on performance, so it shouldn't be done lightly.
+#
+# internode_compression_zstd_max_cpu_fraction: 0.0
+
+# Enable or disable tcp_nodelay for inter-dc communication.
+# Disabling it will result in larger (but fewer) network packets being sent,
+# reducing overhead from the TCP protocol itself, at the cost of increasing
+# latency if you block for cross-datacenter responses.
+# inter_dc_tcp_nodelay: false
+
+# Relaxation of environment checks.
+#
+# Scylla places certain requirements on its environment.  If these requirements are
+# not met, performance and reliability can be degraded.
+#
+# These requirements include:
+#    - A filesystem with good support for asynchronous I/O (AIO). Currently,
+#      this means XFS.
+#
+# false: strict environment checks are in place; do not start if they are not met.
+# true: relaxed environment checks; performance and reliability may degraade.
+#
+# developer_mode: false
+
+
+# Idle-time background processing
+#
+# Scylla can perform certain jobs in the background while the system is otherwise idle,
+# freeing processor resources when there is other work to be done.
+#
+# defragment_memory_on_idle: true
+#
+# prometheus port
+# By default, Scylla opens prometheus API port on port 9180
+# setting the port to 0 will disable the prometheus API.
+# prometheus_port: 9180
+#
+# prometheus address
+# Leaving this blank will set it to the same value as listen_address.
+# This means that by default, Scylla listens to the prometheus API on the same
+# listening address (and therefore network interface) used to listen for
+# internal communication. If the monitoring node is not in this internal
+# network, you can override prometheus_address explicitly - e.g., setting
+# it to 0.0.0.0 to listen on all interfaces.
+# prometheus_address: 1.2.3.4
+
+# Distribution of data among cores (shards) within a node
+#
+# Scylla distributes data within a node among shards, using a round-robin
+# strategy:
+#  [shard0] [shard1] ... [shardN-1] [shard0] [shard1] ... [shardN-1] ...
+#
+# Scylla versions 1.6 and below used just one repetition of the pattern;
+# this interfered with data placement among nodes (vnodes).
+#
+# Scylla versions 1.7 and above use 4096 repetitions of the pattern; this
+# provides for better data distribution.
+#
+# the value below is log (base 2) of the number of repetitions.
+#
+# Set to 0 to avoid rewriting all data when upgrading from Scylla 1.6 and
+# below.
+#
+# Keep at 12 for new clusters.
+murmur3_partitioner_ignore_msb_bits: 12
+
+# Use on a new, parallel algorithm for performing aggregate queries.
+# Set to `false` to fall-back to the old algorithm.
+# enable_parallelized_aggregation: true
+
+# Time for which task manager task started internally is kept in memory after it completes.
+# task_ttl_in_seconds: 0
+
+# Time for which task manager task started by user is kept in memory after it completes.
+# user_task_ttl_in_seconds: 3600
+
+# In materialized views, restrictions are allowed only on the view's primary key columns.
+# In old versions Scylla mistakenly allowed IS NOT NULL restrictions on columns which were not part
+# of the view's primary key. These invalid restrictions were ignored.
+# This option controls the behavior when someone tries to create a view with such invalid IS NOT NULL restrictions.
+#
+# Can be true, false, or warn.
+# * `true`: IS NOT NULL is allowed only on the view's primary key columns,
+#           trying to use it on other columns will cause an error, as it should.
+# * `false`: Scylla accepts IS NOT NULL restrictions on regular columns, but they're silently ignored.
+#            It's useful for backwards compatibility.
+# * `warn`: The same as false, but there's a warning about invalid view restrictions.
+#
+# To preserve backwards compatibility on old clusters, Scylla's default setting is `warn`.
+# New clusters have this option set to `true` by scylla.yaml (which overrides the default `warn`)
+# to make sure that trying to create an invalid view causes an error.
+strict_is_not_null_in_views: true
+
+# The Unix Domain Socket the node uses for maintenance socket.
+# The possible options are:
+# * ignore: the node will not open the maintenance socket,
+# * workdir: the node will open the maintenance socket on the path <scylla's workdir>/cql.m,
+#            where <scylla's workdir> is a path defined by the workdir configuration option,
+# * <socket path>: the node will open the maintenance socket on the path <socket path>.
+maintenance_socket: ignore
+
+# If set to true, configuration parameters defined with LiveUpdate option can be updated in runtime with CQL
+# by updating system.config virtual table. If we don't want any configuration parameter to be changed in runtime
+# via CQL, this option should be set to false. This parameter doesn't impose any limits on other mechanisms updating
+# configuration parameters in runtime, e.g. sending SIGHUP or using API. This option should be set to false
+# e.g. for cloud users, for whom scylla's configuration should be changed only by support engineers.
+# live_updatable_config_params_changeable_via_cql: true
+
+# ****************
+# *  GUARDRAILS  *
+# ****************
+
+# Guardrails to warn or fail when Replication Factor is smaller/greater than the threshold.
+# Please note that the value of 0 is always allowed,
+# which means that having no replication at all, i.e. RF = 0, is always valid.
+# A guardrail value smaller than 0, e.g. -1, means that the guardrail is disabled.
+# Commenting out a guardrail also means it is disabled.
+# minimum_replication_factor_fail_threshold: -1
+# minimum_replication_factor_warn_threshold:  3
+# maximum_replication_factor_warn_threshold: -1
+# maximum_replication_factor_fail_threshold: -1
+
+# Guardrails to warn about or disallow creating a keyspace with specific replication strategy.
+# Each of these 2 settings is a list storing replication strategies considered harmful.
+# The replication strategies to choose from are:
+# 1) SimpleStrategy,
+# 2) NetworkTopologyStrategy,
+# 3) LocalStrategy,
+# 4) EverywhereStrategy
+#
+# replication_strategy_warn_list:
+#  - SimpleStrategy
+# replication_strategy_fail_list:
+
+# Enable tablets for new keyspaces.
+# When enabled, newly created keyspaces will have tablets enabled by default.
+# That can be explicitly disabled in the CREATE KEYSPACE query
+# by using the `tablets = {'enabled': false}` replication option.
+#
+# Correspondingly, when disabled, newly created keyspaces will use vnodes
+# unless tablets are explicitly enabled in the CREATE KEYSPACE query
+# by using the `tablets = {'enabled': true}` replication option.
+#
+# Note that creating keyspaces with tablets enabled or disabled is irreversible.
+# The `tablets` option cannot be changed using `ALTER KEYSPACE`.
+enable_tablets: true

From 827a62b3fdefd373cb824d25bef6abff7637bf6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:15:43 +0000
Subject: [PATCH 4150/4969] Bump org.assertj:assertj-core from 3.24.2 to 3.27.3
 in /modules/scylladb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index 6d92489ef30..c2cd82ebf0f 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'com.scylladb:java-driver-core:4.15.0.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'software.amazon.awssdk:dynamodb:2.28.6'
 }

From 6139e5ef8563166bb54391da56f5e0474abe2778 Mon Sep 17 00:00:00 2001
From: livk <livk.cloud@gmail.com>
Date: Tue, 11 Feb 2025 01:07:04 +0800
Subject: [PATCH 4151/4969] Fix clickhouse authentication (#9942)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9939

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../clickhouse/ClickHouseContainer.java         |  8 +++-----
 .../testcontainers/ClickhouseTestImages.java    |  2 ++
 .../clickhouse/ClickHouseContainerTest.java     | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index 65cb2db5738..78610454728 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -21,8 +21,6 @@
  */
 public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
 
-    private static final String NAME = "clickhouse";
-
     static final String CLICKHOUSE_CLICKHOUSE_SERVER = "clickhouse/clickhouse-server";
 
     private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse(CLICKHOUSE_CLICKHOUSE_SERVER);
@@ -33,13 +31,13 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
 
-    private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+    private static final String JDBC_URL_PREFIX = "jdbc:clickhouse://";
 
     private static final String TEST_QUERY = "SELECT 1";
 
-    static final String DEFAULT_USER = "default";
+    static final String DEFAULT_USER = "test";
 
-    static final String DEFAULT_PASSWORD = "";
+    static final String DEFAULT_PASSWORD = "test";
 
     private String databaseName = "default";
 
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
index f79fb24c7b4..76a8ac87c94 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
@@ -4,4 +4,6 @@
 
 public interface ClickhouseTestImages {
     DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
+
+    DockerImageName CLICKHOUSE_24_12_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:24.12-alpine");
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
index e440af648af..85fe361233f 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.clickhouse;
 
 import org.junit.Test;
+import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -26,8 +27,8 @@ public void testSimple() throws SQLException {
     public void customCredentialsWithUrlParams() throws SQLException {
         try (
             ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
-                .withUsername("test")
-                .withPassword("test")
+                .withUsername("default")
+                .withPassword("")
                 .withDatabaseName("test")
                 .withUrlParam("max_result_rows", "5")
         ) {
@@ -42,4 +43,16 @@ public void customCredentialsWithUrlParams() throws SQLException {
             assertThat(resultSetInt).isEqualTo(5);
         }
     }
+
+    @Test
+    public void testNewAuth() throws SQLException {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
+            clickhouse.start();
+
+            ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(1);
+        }
+    }
 }

From df40cd8ba35cc0fdf4a05bebaff053c97b00b7d7 Mon Sep 17 00:00:00 2001
From: Matthias Krueger <matthi@gmail.com>
Date: Thu, 13 Feb 2025 22:57:17 +0100
Subject: [PATCH 4152/4969] Fix SolrContainer start parameters for version >=
 9.7.0 (#9926)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9601

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/SolrContainer.java              | 10 +++++++++-
 .../containers/SolrContainerTest.java          | 18 +++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 18aca269235..6463fa60743 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -4,6 +4,7 @@
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.net.URL;
@@ -39,6 +40,8 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
 
     private SolrContainerConfiguration configuration;
 
+    private final ComparableVersion imageVersion;
+
     /**
      * @deprecated use {@link #SolrContainer(DockerImageName)} instead
      */
@@ -63,6 +66,7 @@ public SolrContainer(final DockerImageName dockerImageName) {
                 .withRegEx(".*o\\.e\\.j\\.s\\.Server Started.*")
                 .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
         this.configuration = new SolrContainerConfiguration();
+        this.imageVersion = new ComparableVersion(dockerImageName.getVersionPart());
     }
 
     public SolrContainer withZookeeper(boolean zookeeper) {
@@ -114,7 +118,11 @@ protected void configure() {
         // Configure Zookeeper
         if (configuration.isZookeeper()) {
             this.addExposedPort(ZOOKEEPER_PORT);
-            command = "-DzkRun -h localhost";
+            if (this.imageVersion.isGreaterThanOrEqualTo("9.7.0")) {
+                command = "-DzkRun --host localhost";
+            } else {
+                command = "-DzkRun -h localhost";
+            }
         }
 
         // Apply generated Command
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
index 6bb4fabb1a4..f678155b3c1 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -6,15 +6,23 @@
 import org.apache.solr.client.solrj.response.SolrPingResponse;
 import org.junit.After;
 import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@RunWith(Parameterized.class)
 public class SolrContainerTest {
 
-    private static final DockerImageName SOLR_IMAGE = DockerImageName.parse("solr:8.3.0");
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] getVersionsToTest() {
+        return new String[] { "solr:8.11.4", "solr:9.8.0" };
+    }
+
+    @Parameterized.Parameter
+    public String solrImage;
 
     private SolrClient client = null;
 
@@ -28,7 +36,7 @@ public void stopRestClient() throws IOException {
 
     @Test
     public void solrCloudTest() throws IOException, SolrServerException {
-        try (SolrContainer container = new SolrContainer(SOLR_IMAGE)) {
+        try (SolrContainer container = new SolrContainer(solrImage)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
             assertThat(response.getStatus()).isZero();
@@ -38,7 +46,7 @@ public void solrCloudTest() throws IOException, SolrServerException {
 
     @Test
     public void solrStandaloneTest() throws IOException, SolrServerException {
-        try (SolrContainer container = new SolrContainer(SOLR_IMAGE).withZookeeper(false)) {
+        try (SolrContainer container = new SolrContainer(solrImage).withZookeeper(false)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
             assertThat(response.getStatus()).isZero();
@@ -50,7 +58,7 @@ public void solrStandaloneTest() throws IOException, SolrServerException {
     public void solrCloudPingTest() throws IOException, SolrServerException {
         // solrContainerUsage {
         // Create the solr container.
-        SolrContainer container = new SolrContainer(SOLR_IMAGE);
+        SolrContainer container = new SolrContainer(solrImage);
 
         // Start the container. This step might take some time...
         container.start();

From 99981f84cbb9d1229f24589c0f7c32b8c44feec5 Mon Sep 17 00:00:00 2001
From: Nathan Baulch <nathan.baulch@gmail.com>
Date: Wed, 19 Feb 2025 02:12:18 +1100
Subject: [PATCH 4153/4969] Fix typos (#9783)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 CHANGELOG.md                                     |  2 +-
 .../testcontainers/utility/ResourceReaper.java   |  2 +-
 .../testcontainers/junit/DependenciesTest.java   |  2 +-
 .../testcontainers/utility/LazyFutureTest.java   |  2 +-
 docs/contributing.md                             |  4 ++--
 docs/contributing_docs.md                        |  2 +-
 docs/modules/azure.md                            |  8 ++++----
 docs/modules/databases/jdbc.md                   |  2 +-
 docs/modules/kafka.md                            |  2 +-
 docs/modules/typesense.md                        |  2 +-
 docs/test_framework_integration/junit_5.md       |  2 +-
 .../cassandra.yaml                               | 16 ++++++++--------
 .../cassandra.yaml                               | 16 ++++++++--------
 .../testcontainers/consul/ConsulContainer.java   |  2 +-
 .../junit/cratedb/SimpleCrateDBTest.java         |  2 +-
 .../testcontainers/containers/Db2Container.java  |  2 +-
 .../junit/mariadb/SimpleMariaDBTest.java         |  2 +-
 .../containers/MSSQLServerContainer.java         |  2 +-
 .../junit/mysql/SimpleMySQLTest.java             |  2 +-
 .../containers/TimescaleDBContainerTest.java     |  4 ++--
 .../junit/postgresql/SimplePostgreSQLTest.java   |  4 ++--
 .../resources/testcontainers/bootstrap.yaml.ftl  |  2 +-
 .../testcontainers/solace/SolaceContainer.java   |  2 +-
 .../org/testcontainers/vault/VaultContainer.java |  2 +-
 .../containers/YugabyteDBYCQLContainer.java      |  4 ++--
 .../containers/YugabyteDBYSQLContainer.java      |  2 +-
 26 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aac8c306777..cef3d65e346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -281,7 +281,7 @@
 ## [1.1.8] - 2017-01-22
 ### Fixed
 - Compatibility fixes for Docker for Mac v1.13.0 ([\#272](https://github.com/testcontainers/testcontainers-java/issues/272))
-- Relax docker environment disk space check to accomodate unusual empty `df` output observed on Docker for Mac with OverlayFS ([\#273](https://github.com/testcontainers/testcontainers-java/issues/273), [\#278](https://github.com/testcontainers/testcontainers-java/issues/278))
+- Relax docker environment disk space check to accommodate unusual empty `df` output observed on Docker for Mac with OverlayFS ([\#273](https://github.com/testcontainers/testcontainers-java/issues/273), [\#278](https://github.com/testcontainers/testcontainers-java/issues/278))
 - Fix inadvertent private-scoping of startup checks' `StartupStatus`, which made implementation of custom startup checks impossible ([\#266](https://github.com/testcontainers/testcontainers-java/issues/266))
 - Fix potential resource lead/deadlock when errors are encountered building images from a Dockerfile ([\#274](https://github.com/testcontainers/testcontainers-java/issues/274))
 
diff --git a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
index 1b99cd2abb4..ccea407ed3b 100644
--- a/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
+++ b/core/src/main/java/org/testcontainers/utility/ResourceReaper.java
@@ -368,7 +368,7 @@ static class FilterRegistry {
          * Registers the given filters with Ryuk
          *
          * @param filters the filter to register
-         * @return true if the filters have been registered successfuly, false otherwise
+         * @return true if the filters have been registered successfully, false otherwise
          * @throws IOException if communication with Ryuk fails
          */
         protected boolean register(List<Map.Entry<String, String>> filters) throws IOException {
diff --git a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
index fd58dc4335f..effa9b06447 100644
--- a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
@@ -37,7 +37,7 @@ public void shouldWorkWithSimpleDependency() {
     }
 
     @Test
-    public void shouldWorkWithMutlipleDependencies() {
+    public void shouldWorkWithMultipleDependencies() {
         InvocationCountingStartable startable1 = new InvocationCountingStartable();
         InvocationCountingStartable startable2 = new InvocationCountingStartable();
 
diff --git a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
index dc1a1b803df..822109ff9cd 100644
--- a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
+++ b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
@@ -21,7 +21,7 @@
 public class LazyFutureTest {
 
     @Test
-    public void testLazyness() throws Exception {
+    public void testLaziness() throws Exception {
         AtomicInteger counter = new AtomicInteger();
 
         Future<Integer> lazyFuture = new LazyFuture<Integer>() {
diff --git a/docs/contributing.md b/docs/contributing.md
index e771347bde9..1cad43877cf 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -1,6 +1,6 @@
 # Contributing
 
-* Star the project on [Github](https://github.com/testcontainers/testcontainers-java) and help spread the word :)
+* Star the project on [GitHub](https://github.com/testcontainers/testcontainers-java) and help spread the word :)
 * Join our [Slack workspace](http://slack.testcontainers.org)
 * [Start a discussion](https://github.com/testcontainers/testcontainers-java/discussions) if you have an idea, find a possible bug or have a general question.
 * Contribute improvements or fixes using a [Pull Request](https://github.com/testcontainers/testcontainers-java/pulls). If you're going to contribute, thank you! Please just be sure to:
@@ -97,7 +97,7 @@ We will evaluate incubating modules periodically, and remove the label when appr
 Since we generally get a lot of Dependabot PRs, we regularly combine them into single commits.
 For this, we are using the [gh-combine-prs](https://github.com/rnorth/gh-combine-prs) extension for [GitHub CLI](https://cli.github.com/).
 
-The whole process is as follow:
+The whole process is as follows:
 
 1. Check that all open Dependabot PRs did succeed their build. If they did not succeed, trigger a rerun if the cause were external factors or else document the reason if obvious.
 2. Run the extension from an up-to-date local `main` branch: `gh combine-prs --query "author:app/dependabot"`
diff --git a/docs/contributing_docs.md b/docs/contributing_docs.md
index aa195cf4546..51cb5aae780 100644
--- a/docs/contributing_docs.md
+++ b/docs/contributing_docs.md
@@ -84,7 +84,7 @@ foo.doSomething();
 
 Note that:
 
-* Any code included will be have its indentation reduced
+* Any code included will have its indentation reduced
 * Every line in the source file will be searched for an instance of the token (e.g. `doFoo`). If more than one line
   includes that token, then potentially more than one block could be targeted for inclusion. It is advisable to use a
   specific, unique token to avoid unexpected behaviour.
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 507a7e3699b..1730fce97d2 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -22,7 +22,7 @@ CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emula
 Start Azurite Emulator during a test:
 
 <!--codeinclude-->
-[Starting a Azurite container](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:emulatorContainer
+[Starting an Azurite container](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 !!! note
@@ -32,11 +32,11 @@ If the tested application needs to use more than one set of credentials, the con
 Please see some examples below.
 
 <!--codeinclude-->
-[Starting a Azurite Blob container with one account and two keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withTwoAccountKeys
+[Starting an Azurite Blob container with one account and two keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withTwoAccountKeys
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting a Azurite Blob container with more accounts and keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withMoreAccounts
+[Starting an Azurite Blob container with more accounts and keys](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java) inside_block:withMoreAccounts
 <!--/codeinclude-->
 
 #### Using with Blob
@@ -140,7 +140,7 @@ Configure the sender and the processor clients:
 Start Azure CosmosDB Emulator during a test:
 
 <!--codeinclude-->
-[Starting a Azure CosmosDB Emulator container](../../modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java) inside_block:emulatorContainer
+[Starting an Azure CosmosDB Emulator container](../../modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 Prepare KeyStore to use for SSL.
diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 90183228bd5..05229db4ec0 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -135,7 +135,7 @@ By default database container is being stopped as soon as last connection is clo
 
  `jdbc:tc:mysql:8.0.36:///databasename?TC_DAEMON=true`
 
-With this parameter database container will keep running even when there're no open connections.
+With this parameter database container will keep running even when there's no open connections.
 
 
 ### Running container with tmpfs options
diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index a284163248a..6e33cc76b2d 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -43,7 +43,7 @@ Now your tests or any other process running on your machine can get access to ru
 Create a `ConfluentKafkaContainer` to use it in your tests:
 
 <!--codeinclude-->
-[Creating a ConlfuentKafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java) inside_block:constructorWithVersion
+[Creating a ConfluentKafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
 
 ### Using org.testcontainers.kafka.KafkaContainer
diff --git a/docs/modules/typesense.md b/docs/modules/typesense.md
index b9828e40f33..e7c332884c7 100644
--- a/docs/modules/typesense.md
+++ b/docs/modules/typesense.md
@@ -4,7 +4,7 @@ Testcontainers module for [Typesense](https://hub.docker.com/r/typesense/typesen
 
 ## TypesenseContainer's usage examples
 
-You can start an Typesense container instance from any Java application by using:
+You can start a Typesense container instance from any Java application by using:
 
 <!--codeinclude-->
 [Typesense container](../../modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java) inside_block:container
diff --git a/docs/test_framework_integration/junit_5.md b/docs/test_framework_integration/junit_5.md
index 15597f90cdb..8f3c21372dd 100644
--- a/docs/test_framework_integration/junit_5.md
+++ b/docs/test_framework_integration/junit_5.md
@@ -62,7 +62,7 @@ Since this module has a dependency onto JUnit Jupiter and on Testcontainers core
 has a dependency onto JUnit 4.x, projects using this module will end up with both, JUnit Jupiter
 and JUnit 4.x in the test classpath.
 
-This extension has only be tested with sequential test execution. Using it with parallel test execution is unsupported and may have unintended side effects.
+This extension has only been tested with sequential test execution. Using it with parallel test execution is unsupported and may have unintended side effects.
 
 ## Adding Testcontainers JUnit 5 support to your project dependencies
 
diff --git a/modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml b/modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml
index 14095d4c627..7425881b8fe 100644
--- a/modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml
+++ b/modules/cassandra/src/test/resources/cassandra-auth-required-configuration/cassandra.yaml
@@ -250,7 +250,7 @@ commit_failure_policy: stop
 #
 # Valid values are either "auto" (omitting the value) or a value greater 0.
 #
-# Note that specifying a too large value will result in long running GCs and possbily
+# Note that specifying a too large value will result in long running GCs and possibly
 # out-of-memory errors. Keep the value at a small fraction of the heap.
 #
 # If you constantly see "prepared statements discarded in the last minute because
@@ -259,7 +259,7 @@ commit_failure_policy: stop
 # i.e. use bind markers for variable parts.
 #
 # Do only change the default value, if you really have more prepared statements than
-# fit in the cache. In most cases it is not neccessary to change this value.
+# fit in the cache. In most cases it is not necessary to change this value.
 # Constantly re-preparing statements is a performance penalty.
 #
 # Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
@@ -309,7 +309,7 @@ key_cache_save_period: 14400
 #   Fully off-heap row cache implementation (default).
 #
 # org.apache.cassandra.cache.SerializingCacheProvider
-#   This is the row cache implementation availabile
+#   This is the row cache implementation available
 #   in previous releases of Cassandra.
 # row_cache_class_name: org.apache.cassandra.cache.OHCProvider
 
@@ -444,7 +444,7 @@ concurrent_counter_writes: 32
 concurrent_materialized_view_writes: 32
 
 # Maximum memory to use for sstable chunk cache and buffer pooling.
-# 32MB of this are reserved for pooling buffers, the rest is used as an
+# 32MB of this are reserved for pooling buffers, the rest is used as a
 # cache that holds uncompressed sstable chunks.
 # Defaults to the smaller of 1/4 of heap or 512MB. This pool is allocated off-heap,
 # so is in addition to the memory allocated for heap. The cache also has on-heap
@@ -553,7 +553,7 @@ memtable_allocation_type: heap_buffers
 # new space for cdc-tracked tables has been made available. Default to 250ms
 # cdc_free_space_check_interval_ms: 250
 
-# A fixed memory pool size in MB for for SSTable index summaries. If left
+# A fixed memory pool size in MB for SSTable index summaries. If left
 # empty, this will default to 5% of the heap size. If the memory usage of
 # all index summaries exceeds this limit, SSTables with low read rates will
 # shrink their index summaries in order to meet this limit.  However, this
@@ -778,7 +778,7 @@ auto_snapshot: true
 # number of rows per partition.  The competing goals are these:
 #
 # - a smaller granularity means more index entries are generated
-#   and looking up rows withing the partition by collation column
+#   and looking up rows within the partition by collation column
 #   is faster
 # - but, Cassandra will keep the collation index in memory for hot
 #   rows (as part of the key cache), so a larger granularity means
@@ -1109,7 +1109,7 @@ windows_timer_interval: 1
 
 # Enables encrypting data at-rest (on disk). Different key providers can be plugged in, but the default reads from
 # a JCE-style keystore. A single keystore can hold multiple keys, but the one referenced by
-# the "key_alias" is the only key that will be used for encrypt opertaions; previously used keys
+# the "key_alias" is the only key that will be used for encrypt operations; previously used keys
 # can still (and should!) be in the keystore and will be used on decrypt operations
 # (to handle the case of key rotation).
 #
@@ -1143,7 +1143,7 @@ transparent_data_encryption_options:
 # tombstones seen in memory so we can return them to the coordinator, which
 # will use them to make sure other replicas also know about the deleted rows.
 # With workloads that generate a lot of tombstones, this can cause performance
-# problems and even exaust the server heap.
+# problems and even exhaust the server heap.
 # (http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets)
 # Adjust the thresholds here if you understand the dangers and want to
 # scan more tombstones anyway.  These thresholds may also be adjusted at runtime
diff --git a/modules/cassandra/src/test/resources/cassandra-test-configuration-example/cassandra.yaml b/modules/cassandra/src/test/resources/cassandra-test-configuration-example/cassandra.yaml
index 5b57b2a8e58..426dea64771 100644
--- a/modules/cassandra/src/test/resources/cassandra-test-configuration-example/cassandra.yaml
+++ b/modules/cassandra/src/test/resources/cassandra-test-configuration-example/cassandra.yaml
@@ -250,7 +250,7 @@ commit_failure_policy: stop
 #
 # Valid values are either "auto" (omitting the value) or a value greater 0.
 #
-# Note that specifying a too large value will result in long running GCs and possbily
+# Note that specifying a too large value will result in long running GCs and possibly
 # out-of-memory errors. Keep the value at a small fraction of the heap.
 #
 # If you constantly see "prepared statements discarded in the last minute because
@@ -259,7 +259,7 @@ commit_failure_policy: stop
 # i.e. use bind markers for variable parts.
 #
 # Do only change the default value, if you really have more prepared statements than
-# fit in the cache. In most cases it is not neccessary to change this value.
+# fit in the cache. In most cases it is not necessary to change this value.
 # Constantly re-preparing statements is a performance penalty.
 #
 # Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
@@ -309,7 +309,7 @@ key_cache_save_period: 14400
 #   Fully off-heap row cache implementation (default).
 #
 # org.apache.cassandra.cache.SerializingCacheProvider
-#   This is the row cache implementation availabile
+#   This is the row cache implementation available
 #   in previous releases of Cassandra.
 # row_cache_class_name: org.apache.cassandra.cache.OHCProvider
 
@@ -444,7 +444,7 @@ concurrent_counter_writes: 32
 concurrent_materialized_view_writes: 32
 
 # Maximum memory to use for sstable chunk cache and buffer pooling.
-# 32MB of this are reserved for pooling buffers, the rest is used as an
+# 32MB of this are reserved for pooling buffers, the rest is used as a
 # cache that holds uncompressed sstable chunks.
 # Defaults to the smaller of 1/4 of heap or 512MB. This pool is allocated off-heap,
 # so is in addition to the memory allocated for heap. The cache also has on-heap
@@ -553,7 +553,7 @@ memtable_allocation_type: heap_buffers
 # new space for cdc-tracked tables has been made available. Default to 250ms
 # cdc_free_space_check_interval_ms: 250
 
-# A fixed memory pool size in MB for for SSTable index summaries. If left
+# A fixed memory pool size in MB for SSTable index summaries. If left
 # empty, this will default to 5% of the heap size. If the memory usage of
 # all index summaries exceeds this limit, SSTables with low read rates will
 # shrink their index summaries in order to meet this limit.  However, this
@@ -778,7 +778,7 @@ auto_snapshot: true
 # number of rows per partition.  The competing goals are these:
 #
 # - a smaller granularity means more index entries are generated
-#   and looking up rows withing the partition by collation column
+#   and looking up rows within the partition by collation column
 #   is faster
 # - but, Cassandra will keep the collation index in memory for hot
 #   rows (as part of the key cache), so a larger granularity means
@@ -1109,7 +1109,7 @@ windows_timer_interval: 1
 
 # Enables encrypting data at-rest (on disk). Different key providers can be plugged in, but the default reads from
 # a JCE-style keystore. A single keystore can hold multiple keys, but the one referenced by
-# the "key_alias" is the only key that will be used for encrypt opertaions; previously used keys
+# the "key_alias" is the only key that will be used for encrypt operations; previously used keys
 # can still (and should!) be in the keystore and will be used on decrypt operations
 # (to handle the case of key rotation).
 #
@@ -1143,7 +1143,7 @@ transparent_data_encryption_options:
 # tombstones seen in memory so we can return them to the coordinator, which
 # will use them to make sure other replicas also know about the deleted rows.
 # With workloads that generate a lot of tombstones, this can cause performance
-# problems and even exaust the server heap.
+# problems and even exhaust the server heap.
 # (http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets)
 # Adjust the thresholds here if you understand the dangers and want to
 # scan more tombstones anyway.  These thresholds may also be adjusted at runtime
diff --git a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
index 43bbada877f..2922d9711ae 100644
--- a/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
+++ b/modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java
@@ -91,7 +91,7 @@ private void runConsulCommands() {
     /**
      * Run consul commands using the consul cli.
      *
-     * Useful for enableing more secret engines like:
+     * Useful for enabling more secret engines like:
      * <pre>
      *     .withConsulCommand("secrets enable pki")
      *     .withConsulCommand("secrets enable transit")
diff --git a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
index 19ce83cd8ae..c36b1432100 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
@@ -40,7 +40,7 @@ public void testCommandOverride() throws SQLException {
 
             ResultSet resultSet = performQuery(cratedb, "select name from sys.cluster");
             String result = resultSet.getString(1);
-            assertThat(result).as("cluster name should be overriden").isEqualTo("testcontainers");
+            assertThat(result).as("cluster name should be overridden").isEqualTo("testcontainers");
         }
     }
 
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index d04835cbc02..81f26014b90 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -79,7 +79,7 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-        // If license was not accepted programatically, check if it was accepted via resource file
+        // If license was not accepted programmatically, check if it was accepted via resource file
         if (!getEnvMap().containsKey("LICENSE")) {
             LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
             acceptLicense();
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index dedfb06cf55..d4bcc529cbc 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -79,7 +79,7 @@ public void testMariaDBWithCommandOverride() throws SQLException {
             ResultSet resultSet = performQuery(mariadbCustomConfig, "show variables like 'auto_increment_increment'");
             String result = resultSet.getString("Value");
 
-            assertThat(result).as("Auto increment increment should be overriden by command line").isEqualTo("10");
+            assertThat(result).as("Auto increment increment should be overridden by command line").isEqualTo("10");
         }
     }
 
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 6e902656bb2..dab6c34fa16 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -72,7 +72,7 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     @Override
     protected void configure() {
-        // If license was not accepted programatically, check if it was accepted via resource file
+        // If license was not accepted programmatically, check if it was accepted via resource file
         if (!getEnvMap().containsKey("ACCEPT_EULA")) {
             LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
             acceptLicense();
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 3db8da76673..5de23504584 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -91,7 +91,7 @@ public void testCommandOverride() throws SQLException {
             ResultSet resultSet = performQuery(mysqlCustomConfig, "show variables like 'auto_increment_increment'");
             String result = resultSet.getString("Value");
 
-            assertThat(result).as("Auto increment increment should be overriden by command line").isEqualTo("42");
+            assertThat(result).as("Auto increment increment should be overridden by command line").isEqualTo("42");
         }
     }
 
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
index f49c7dc6aa7..90f3113c7c0 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
@@ -35,7 +35,7 @@ public void testCommandOverride() throws SQLException {
                 "SELECT current_setting('max_connections')"
             );
             String result = resultSet.getString(1);
-            assertThat(result).as("max_connections should be overriden").isEqualTo("42");
+            assertThat(result).as("max_connections should be overridden").isEqualTo("42");
         }
     }
 
@@ -54,7 +54,7 @@ public void testUnsetCommand() throws SQLException {
                 "SELECT current_setting('max_connections')"
             );
             String result = resultSet.getString(1);
-            assertThat(result).as("max_connections should not be overriden").isNotEqualTo("42");
+            assertThat(result).as("max_connections should not be overridden").isNotEqualTo("42");
         }
     }
 
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 93e49d2d24c..250f19d87a0 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -41,7 +41,7 @@ public void testCommandOverride() throws SQLException {
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
             String result = resultSet.getString(1);
-            assertThat(result).as("max_connections should be overriden").isEqualTo("42");
+            assertThat(result).as("max_connections should be overridden").isEqualTo("42");
         }
     }
 
@@ -56,7 +56,7 @@ public void testUnsetCommand() throws SQLException {
 
             ResultSet resultSet = performQuery(postgres, "SELECT current_setting('max_connections')");
             String result = resultSet.getString(1);
-            assertThat(result).as("max_connections should not be overriden").isNotEqualTo("42");
+            assertThat(result).as("max_connections should not be overridden").isNotEqualTo("42");
         }
     }
 
diff --git a/modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl b/modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl
index f066cf428aa..616415c359e 100644
--- a/modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl
+++ b/modules/redpanda/src/main/resources/testcontainers/bootstrap.yaml.ftl
@@ -1,7 +1,7 @@
 # Injected by testcontainers
 # This file contains cluster properties which will only be considered when
 # starting the cluster for the first time. Afterwards, you can configure cluster
-# properties via the Redpanda Admi n API.
+# properties via the Redpanda Admin API.
 superusers:
 <#if kafkaApi.superusers?has_content >
     <#list kafkaApi.superusers as superuser>
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
index 64b4365081f..b2a00b32f31 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
@@ -260,7 +260,7 @@ public SolaceContainer withVpn(String vpn) {
      * Sets the solace server ceritificates
      *
      * @param certFile Server certificate
-     * @param caFile Certified Authority ceritificate
+     * @param caFile Certified Authority certificate
      * @return This container.
      */
     public SolaceContainer withClientCert(final MountableFile certFile, final MountableFile caFile) {
diff --git a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
index 2e6396f7b93..f29595b7ebb 100644
--- a/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
+++ b/modules/vault/src/main/java/org/testcontainers/vault/VaultContainer.java
@@ -171,7 +171,7 @@ public SELF withLogLevel(VaultLogLevel level) {
      * {@link #addSecrets() addSecrets}, called from {@link #containerIsStarted(InspectContainerResponse) containerIsStarted}
      *
      * @param path             specific Vault path to store specified secrets
-     * @param firstSecret      first secret to add to specifed path
+     * @param firstSecret      first secret to add to specified path
      * @param remainingSecrets var args list of secrets to add to specified path
      * @return this
      * @deprecated use {@link #withInitCommand(String...)} instead
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
index d193d19eef1..d79812f247f 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
@@ -74,7 +74,7 @@ public Set<Integer> getLivenessCheckPortNumbers() {
      * Configures the environment variables. Setting up these variables would create the
      * custom objects. Setting {@link #withKeyspaceName(String)},
      * {@link #withUsername(String)}, {@link #withPassword(String)} these parameters will
-     * initilaize the database with those custom values
+     * initialize the database with those custom values
      */
     @Override
     protected void configure() {
@@ -123,7 +123,7 @@ public YugabyteDBYCQLContainer withPassword(final String password) {
     }
 
     /**
-     * Executes the initilization script
+     * Executes the initialization script
      * @param containerInfo containerInfo
      */
     @Override
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
index e3b39e780f0..aae3f67b313 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
@@ -70,7 +70,7 @@ public Set<Integer> getLivenessCheckPortNumbers() {
      * Configures the environment variables. Setting up these variables would create the
      * custom objects. Setting {@link #withDatabaseName(String)},
      * {@link #withUsername(String)}, {@link #withPassword(String)} these parameters will
-     * initilaize the database with those custom values
+     * initialize the database with those custom values
      */
 
     @Override

From 2fa7f65f2df8f872b8e1c882bd5690a5bc00ac13 Mon Sep 17 00:00:00 2001
From: Patrick Neulichedl <patrickneu@hotmail.de>
Date: Tue, 18 Feb 2025 16:48:53 +0100
Subject: [PATCH 4154/4969] Don't extend configuration compileOnly and
 testCompile from shaded (#9579)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don't extend configuration testCompile from shaded

* using testCompile has been discouraged since Gradle 3.4
* made sure dependencies on all other configurations are unchanged
* no need to change it to testImplementation since testCompileClasspath
  and testRuntimeClasspath extend from implementation

Don't extend configuration compileOnly from shaded

* compileClasspath already extends from implementation

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 gradle/shading.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/shading.gradle b/gradle/shading.gradle
index 10ceb5086a4..88f25cc3f22 100644
--- a/gradle/shading.gradle
+++ b/gradle/shading.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.gradleup.shadow'
 
 configurations {
     shaded
-    [apiElements, implementation, compileOnly, testCompile]*.extendsFrom shaded
+    [apiElements, implementation]*.extendsFrom shaded
 }
 configurations.api.canBeResolved = true
 

From aa7ddc0fdfaa6a6ed3b5f8f9895216b67d400252 Mon Sep 17 00:00:00 2001
From: albihnf <albihnf@gmail.com>
Date: Tue, 18 Feb 2025 19:56:33 +0100
Subject: [PATCH 4155/4969] Fix reuse support for CouchbaseContainer (#9957)

Fixes #2794
---
 .../couchbase/CouchbaseContainer.java              | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 25e7637bbaf..1681de30853 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -341,6 +341,13 @@ private void exposePorts() {
         }
     }
 
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
+        if (!reused) {
+            containerIsStarting(containerInfo);
+        }
+    }
+
     @Override
     protected void containerIsStarting(final InspectContainerResponse containerInfo) {
         logger().debug("Couchbase container is starting, performing configuration.");
@@ -359,6 +366,13 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo)
         }
     }
 
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+        if (!reused) {
+            this.containerIsStarted(containerInfo);
+        }
+    }
+
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         timePhase("createBuckets", this::createBuckets);

From 2ac4ed6bed5368a279a2dae0ec2afbd51deffae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 18 Feb 2025 21:13:51 -0600
Subject: [PATCH 4156/4969] Add ldap module (#9987)

Provide LLdapContainer supporting `lldap/lldap` image.

Fixes #9960
---
 .github/ISSUE_TEMPLATE/bug_report.yaml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.yaml       |  1 +
 .github/ISSUE_TEMPLATE/feature.yaml           |  1 +
 .github/dependabot.yml                        |  5 ++
 .github/labeler.yml                           |  4 ++
 .github/settings.yml                          |  3 ++
 docs/modules/ldap.md                          | 30 +++++++++++
 mkdocs.yml                                    |  1 +
 modules/ldap/build.gradle                     |  8 +++
 .../testcontainers/ldap/LLdapContainer.java   | 51 +++++++++++++++++++
 .../ldap/LLdapContainerTest.java              | 24 +++++++++
 .../ldap/src/test/resources/logback-test.xml  | 16 ++++++
 12 files changed, 145 insertions(+)
 create mode 100644 docs/modules/ldap.md
 create mode 100644 modules/ldap/build.gradle
 create mode 100644 modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
 create mode 100644 modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
 create mode 100644 modules/ldap/src/test/resources/logback-test.xml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 8017aad8f8c..c31dd05e048 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -34,6 +34,7 @@ body:
         - K3S
         - K6
         - Kafka
+        - LDAP
         - LocalStack
         - MariaDB
         - Milvus
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index f0545bed3e3..9b9a06ecf6a 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -34,6 +34,7 @@ body:
         - K3S
         - K6
         - Kafka
+        - LDAP
         - LocalStack
         - MariaDB
         - Milvus
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index cf3a2ac0620..b655b4ac505 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -34,6 +34,7 @@ body:
         - K3S
         - K6
         - Kafka
+        - LDAP
         - LocalStack
         - MariaDB
         - Milvus
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 11ccc33e3de..bffc5623611 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -178,6 +178,11 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/ldap"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/localstack"
     schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 3c8eace8229..f4649bd7f99 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -107,6 +107,10 @@
   - changed-files:
     - any-glob-to-any-file:
       - modules/kafka/**/*
+"modules/ldap":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/ldap/**/*
 "modules/localstack":
   - changed-files:
     - any-glob-to-any-file:
diff --git a/.github/settings.yml b/.github/settings.yml
index 35266397a60..63c8afacb90 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -169,6 +169,9 @@ labels:
   - name: modules/kafka
     color: '#006b75'
 
+  - name: modules/ldap
+    color: '#006b75'
+
   - name: modules/localstack
     color: '#006b75'
 
diff --git a/docs/modules/ldap.md b/docs/modules/ldap.md
new file mode 100644
index 00000000000..771975d6346
--- /dev/null
+++ b/docs/modules/ldap.md
@@ -0,0 +1,30 @@
+# LDAP
+
+Testcontainers module for [LLDAP](https://hub.docker.com/r/lldap/lldap).
+
+## LLdapContainer's usage examples
+
+You can start a LLDAP container instance from any Java application by using:
+
+<!--codeinclude-->
+[LLDAP container](../../modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:ldap:{{latest_version}}"
+    ```
+
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>ldap</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
diff --git a/mkdocs.yml b/mkdocs.yml
index f1b894a158a..0245c2f1419 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -89,6 +89,7 @@ nav:
           - modules/k3s.md
           - modules/k6.md
           - modules/kafka.md
+          - modules/ldap.md
           - modules/localstack.md
           - modules/milvus.md
           - modules/minio.md
diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
new file mode 100644
index 00000000000..52366d06737
--- /dev/null
+++ b/modules/ldap/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: LDAP"
+
+dependencies {
+    api project(':testcontainers')
+
+    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.2'
+}
diff --git a/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
new file mode 100644
index 00000000000..a70a51e215b
--- /dev/null
+++ b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
@@ -0,0 +1,51 @@
+package org.testcontainers.ldap;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for LLDAP.
+ * <p>
+ * Supported image: {@code lldap/lldap}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>LDAP: 3890</li>
+ *     <li>UI: 17170</li>
+ * </ul>
+ */
+@Slf4j
+public class LLdapContainer extends GenericContainer<LLdapContainer> {
+
+    private static final String IMAGE_VERSION = "lldap/lldap";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(IMAGE_VERSION);
+
+    private static final int LDAP_PORT = 3890;
+
+    private static final int UI_PORT = 17170;
+
+    public LLdapContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public LLdapContainer(DockerImageName image) {
+        super(image);
+        image.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        addExposedPorts(LDAP_PORT, UI_PORT);
+
+        waitingFor(Wait.forHttp("/health").forPort(UI_PORT).forStatusCode(200));
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        log.info("LLDAP container is ready! UI available at http://{}:{}", getHost(), getMappedPort(UI_PORT));
+    }
+
+    public int getLdapPort() {
+        return getMappedPort(LDAP_PORT);
+    }
+}
diff --git a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
new file mode 100644
index 00000000000..c6d490219fd
--- /dev/null
+++ b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
@@ -0,0 +1,24 @@
+package org.testcontainers.ldap;
+
+import com.unboundid.ldap.sdk.BindResult;
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.LDAPException;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class LLdapContainerTest {
+
+    @Test
+    public void test() throws LDAPException {
+        try ( // container {
+            LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine")
+            // }
+        ) {
+            lldap.start();
+            LDAPConnection connection = new LDAPConnection(lldap.getHost(), lldap.getLdapPort());
+            BindResult result = connection.bind("cn=admin,ou=people,dc=example,dc=com", "password");
+            assertThat(result).isNotNull();
+        }
+    }
+}
diff --git a/modules/ldap/src/test/resources/logback-test.xml b/modules/ldap/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/ldap/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+</configuration>

From 9dc9f843f1974f9b54d12b25e54a06b86365f4cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 03:46:09 +0000
Subject: [PATCH 4157/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/ldap

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ldap/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
index 52366d06737..327b81491e9 100644
--- a/modules/ldap/build.gradle
+++ b/modules/ldap/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: LDAP"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.2'
 }

From e474ab88b68681be4e283bcd3f8f57ceab0987d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 03:47:21 +0000
Subject: [PATCH 4158/4969] Bump org.typesense:typesense-java in
 /modules/typesense

Bumps [org.typesense:typesense-java](https://github.com/typesense/typesense-java) from 0.9.0 to 1.3.0.
- [Release notes](https://github.com/typesense/typesense-java/releases)
- [Commits](https://github.com/typesense/typesense-java/compare/v0.9.0...v1.3.0)

---
updated-dependencies:
- dependency-name: org.typesense:typesense-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/typesense/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
index 1a639ba2677..b82022ed9ab 100644
--- a/modules/typesense/build.gradle
+++ b/modules/typesense/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.typesense:typesense-java:0.9.0'
+    testImplementation 'org.typesense:typesense-java:1.3.0'
 }

From 85697fdb8b6a838758febcf44c030dd6e0073ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 19 Feb 2025 09:50:16 -0600
Subject: [PATCH 4159/4969] Add method to return LDAP URL to LLdapContainer

---
 .../org/testcontainers/ldap/LLdapContainer.java  |  4 ++++
 .../testcontainers/ldap/LLdapContainerTest.java  | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
index a70a51e215b..d3ecfef45ff 100644
--- a/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
+++ b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
@@ -48,4 +48,8 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
     public int getLdapPort() {
         return getMappedPort(LDAP_PORT);
     }
+
+    public String getLdapUrl() {
+        return String.format("ldap://%s:%d", getHost(), getLdapPort());
+    }
 }
diff --git a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
index c6d490219fd..46715f288bb 100644
--- a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
+++ b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
@@ -3,6 +3,7 @@
 import com.unboundid.ldap.sdk.BindResult;
 import com.unboundid.ldap.sdk.LDAPConnection;
 import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.LDAPURL;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -21,4 +22,19 @@ public void test() throws LDAPException {
             assertThat(result).isNotNull();
         }
     }
+
+    @Test
+    public void testUsingLdapUrl() throws LDAPException {
+        try ( // container {
+            LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine")
+            // }
+        ) {
+            lldap.start();
+
+            LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
+            LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
+            BindResult result = connection.bind("cn=admin,ou=people,dc=example,dc=com", "password");
+            assertThat(result).isNotNull();
+        }
+    }
 }

From aad1ee587c5861c108e42a5778edbf783f08d497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 19 Feb 2025 13:00:06 -0600
Subject: [PATCH 4160/4969] Add more configuration for LLdapContainer

---
 .../testcontainers/ldap/LLdapContainer.java   | 34 +++++++++++++++++--
 .../ldap/LLdapContainerTest.java              | 34 ++++++++++++++++---
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
index d3ecfef45ff..6a8193e8106 100644
--- a/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
+++ b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
@@ -26,6 +26,8 @@ public class LLdapContainer extends GenericContainer<LLdapContainer> {
 
     private static final int LDAP_PORT = 3890;
 
+    private static final int LDAPS_PORT = 6360;
+
     private static final int UI_PORT = 17170;
 
     public LLdapContainer(String image) {
@@ -45,11 +47,39 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
         log.info("LLDAP container is ready! UI available at http://{}:{}", getHost(), getMappedPort(UI_PORT));
     }
 
+    public LLdapContainer withBaseDn(String baseDn) {
+        withEnv("LLDAP_LDAP_BASE_DN", baseDn);
+        return this;
+    }
+
+    public LLdapContainer withUserPass(String userPass) {
+        withEnv("LLDAP_LDAP_USER_PASS", userPass);
+        return this;
+    }
+
     public int getLdapPort() {
-        return getMappedPort(LDAP_PORT);
+        int port = getEnvMap().getOrDefault("LLDAP_LDAPS_OPTIONS__ENABLED", "false").equals("true")
+            ? LDAPS_PORT
+            : LDAP_PORT;
+        return getMappedPort(port);
     }
 
     public String getLdapUrl() {
-        return String.format("ldap://%s:%d", getHost(), getLdapPort());
+        String protocol = getEnvMap().getOrDefault("LLDAP_LDAPS_OPTIONS__ENABLED", "false").equals("true")
+            ? "ldaps"
+            : "ldap";
+        return String.format("%s://%s:%d", protocol, getHost(), getLdapPort());
+    }
+
+    public String getBaseDn() {
+        return getEnvMap().getOrDefault("LLDAP_LDAP_BASE_DN", "dc=example,dc=com");
+    }
+
+    public String getUser() {
+        return String.format("cn=admin,ou=people,%s", getBaseDn());
+    }
+
+    public String getUserPass() {
+        return getEnvMap().getOrDefault("LLDAP_LDAP_USER_PASS", "password");
     }
 }
diff --git a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
index 46715f288bb..399dd83bbf9 100644
--- a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
+++ b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
@@ -18,22 +18,48 @@ public void test() throws LDAPException {
         ) {
             lldap.start();
             LDAPConnection connection = new LDAPConnection(lldap.getHost(), lldap.getLdapPort());
-            BindResult result = connection.bind("cn=admin,ou=people,dc=example,dc=com", "password");
+            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
             assertThat(result).isNotNull();
         }
     }
 
     @Test
     public void testUsingLdapUrl() throws LDAPException {
-        try ( // container {
+        try (LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine")) {
+            lldap.start();
+
+            LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
+            LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
+            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
+            assertThat(result).isNotNull();
+        }
+    }
+
+    @Test
+    public void testWithCustomBaseDn() throws LDAPException {
+        try (
             LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine")
-            // }
+                .withBaseDn("dc=testcontainers,dc=org")
         ) {
             lldap.start();
 
+            assertThat(lldap.getBaseDn()).isEqualTo("dc=testcontainers,dc=org");
+
+            LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
+            LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
+            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
+            assertThat(result).isNotNull();
+        }
+    }
+
+    @Test
+    public void testWithCustomUserPass() throws LDAPException {
+        try (LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine").withUserPass("adminPas$word")) {
+            lldap.start();
+
             LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
             LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
-            BindResult result = connection.bind("cn=admin,ou=people,dc=example,dc=com", "password");
+            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
             assertThat(result).isNotNull();
         }
     }

From c34ed905cb5aad4f22e8906c6fb86bbbe342e2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 19 Feb 2025 14:38:13 -0600
Subject: [PATCH 4161/4969] Rename EventHubs and ServiceBus implementations

---
 docs/modules/azure.md                         | 23 +++++++++----------
 ...r.java => EventHubsEmulatorContainer.java} | 12 +++++-----
 ....java => ServiceBusEmulatorContainer.java} | 12 +++++-----
 ...va => EventHubsEmulatorContainerTest.java} |  4 ++--
 ...a => ServiceBusEmulatorContainerTest.java} |  4 ++--
 5 files changed, 27 insertions(+), 28 deletions(-)
 rename modules/azure/src/main/java/org/testcontainers/azure/{AzureEventHubsContainer.java => EventHubsEmulatorContainer.java} (87%)
 rename modules/azure/src/main/java/org/testcontainers/azure/{AzureServiceBusContainer.java => ServiceBusEmulatorContainer.java} (86%)
 rename modules/azure/src/test/java/org/testcontainers/azure/{AzureEventHubsContainerTest.java => EventHubsEmulatorContainerTest.java} (95%)
 rename modules/azure/src/test/java/org/testcontainers/azure/{AzureServiceBusContainerTest.java => ServiceBusEmulatorContainerTest.java} (96%)

diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 1730fce97d2..e0e9419bf70 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -10,9 +10,8 @@ Currently, the module supports `Azurite`, `Azure Event Hubs`, `Azure Service Bus
 Class | Container Image
 -|-
 AzuriteContainer | [mcr.microsoft.com/azure-storage/azurite](https://github.com/microsoft/containerregistry)
-AzureEventHubsContainer | [mcr.microsoft.com/azure-messaging/eventhubs-emulator](https://github.com/microsoft/containerregistry)
-AzureServiceBusEmulatorContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
-AzureServiceBusContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
+EventHubsEmulatorContainer | [mcr.microsoft.com/azure-messaging/eventhubs-emulator](https://github.com/microsoft/containerregistry)
+ServiceBusEmulatorContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
 CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
 
 ## Usage example
@@ -84,15 +83,15 @@ Build Azure Table client:
 Start Azure Event Hubs Emulator during a test:
 
 <!--codeinclude-->
-[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:network
+[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:network
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting an Azurite container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:azuriteContainer
+[Starting an Azurite container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:azuriteContainer
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting an Azure Event Hubs Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:emulatorContainer
+[Starting an Azure Event Hubs Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 #### Using Azure Event Hubs clients
@@ -100,7 +99,7 @@ Start Azure Event Hubs Emulator during a test:
 Configure the consumer and the producer clients:
 
 <!--codeinclude-->
-[Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:createProducerAndConsumer
+[Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:createProducerAndConsumer
 <!--/codeinclude-->
 
 ### Azure Service Bus Emulator
@@ -112,15 +111,15 @@ Configure the consumer and the producer clients:
 Start Azure Service Bus Emulator during a test:
 
 <!--codeinclude-->
-[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:network
+[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:network
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting a SQL Server container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:sqlContainer
+[Starting a SQL Server container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:sqlContainer
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting a Service Bus Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:emulatorContainer
+[Starting a Service Bus Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 #### Using Azure Service Bus clients
@@ -128,11 +127,11 @@ Start Azure Service Bus Emulator during a test:
 Configure the sender and the processor clients:
 
 <!--codeinclude-->
-[Configuring the sender client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:senderClient
+[Configuring the sender client](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:senderClient
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Configuring the processor client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:processorClient
+[Configuring the processor client](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:processorClient
 <!--/codeinclude-->
 
 ### CosmosDB
diff --git a/modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/EventHubsEmulatorContainer.java
similarity index 87%
rename from modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java
rename to modules/azure/src/main/java/org/testcontainers/azure/EventHubsEmulatorContainer.java
index d611a2442cc..257f71a1424 100644
--- a/modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/azure/EventHubsEmulatorContainer.java
@@ -16,7 +16,7 @@
  *     <li>AMQP: 5672</li>
  * </ul>
  */
-public class AzureEventHubsContainer extends GenericContainer<AzureEventHubsContainer> {
+public class EventHubsEmulatorContainer extends GenericContainer<EventHubsEmulatorContainer> {
 
     private static final int DEFAULT_AMQP_PORT = 5672;
 
@@ -32,14 +32,14 @@ public class AzureEventHubsContainer extends GenericContainer<AzureEventHubsCont
     /**
      * @param dockerImageName specified docker image name to run
      */
-    public AzureEventHubsContainer(final String dockerImageName) {
+    public EventHubsEmulatorContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     /**
      * @param dockerImageName specified docker image name to run
      */
-    public AzureEventHubsContainer(final DockerImageName dockerImageName) {
+    public EventHubsEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         waitingFor(Wait.forLogMessage(".*Emulator Service is Successfully Up!.*", 1));
@@ -52,7 +52,7 @@ public AzureEventHubsContainer(final DockerImageName dockerImageName) {
      * @param azuriteContainer The Azurite container used by Event HUbs as a dependency
      * @return this
      */
-    public AzureEventHubsContainer withAzuriteContainer(final AzuriteContainer azuriteContainer) {
+    public EventHubsEmulatorContainer withAzuriteContainer(final AzuriteContainer azuriteContainer) {
         this.azuriteContainer = azuriteContainer;
         dependsOn(this.azuriteContainer);
         return this;
@@ -64,7 +64,7 @@ public AzureEventHubsContainer withAzuriteContainer(final AzuriteContainer azuri
      * @param config The file containing the broker configuration
      * @return this
      */
-    public AzureEventHubsContainer withConfig(final Transferable config) {
+    public EventHubsEmulatorContainer withConfig(final Transferable config) {
         withCopyToContainer(config, "/Eventhubs_Emulator/ConfigFiles/Config.json");
         return this;
     }
@@ -74,7 +74,7 @@ public AzureEventHubsContainer withConfig(final Transferable config) {
      *
      * @return this
      */
-    public AzureEventHubsContainer acceptLicense() {
+    public EventHubsEmulatorContainer acceptLicense() {
         withEnv("ACCEPT_EULA", "Y");
         return this;
     }
diff --git a/modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
similarity index 86%
rename from modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusContainer.java
rename to modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
index f587d43648c..270ec27b2e0 100644
--- a/modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
@@ -14,7 +14,7 @@
  * <p>
  * Exposed port: 5672
  */
-public class AzureServiceBusContainer extends GenericContainer<AzureServiceBusContainer> {
+public class ServiceBusEmulatorContainer extends GenericContainer<ServiceBusEmulatorContainer> {
 
     private static final String CONNECTION_STRING_FORMAT =
         "Endpoint=sb://%s:%d;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
@@ -30,14 +30,14 @@ public class AzureServiceBusContainer extends GenericContainer<AzureServiceBusCo
     /**
      * @param dockerImageName The specified docker image name to run
      */
-    public AzureServiceBusContainer(final String dockerImageName) {
+    public ServiceBusEmulatorContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     /**
      * @param dockerImageName The specified docker image name to run
      */
-    public AzureServiceBusContainer(final DockerImageName dockerImageName) {
+    public ServiceBusEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withExposedPorts(DEFAULT_PORT);
@@ -50,7 +50,7 @@ public AzureServiceBusContainer(final DockerImageName dockerImageName) {
      * @param msSqlServerContainer The MS SQL Server container used by Service Bus as a dependency
      * @return this
      */
-    public AzureServiceBusContainer withMsSqlServerContainer(final MSSQLServerContainer<?> msSqlServerContainer) {
+    public ServiceBusEmulatorContainer withMsSqlServerContainer(final MSSQLServerContainer<?> msSqlServerContainer) {
         dependsOn(msSqlServerContainer);
         this.msSqlServerContainer = msSqlServerContainer;
         return this;
@@ -62,7 +62,7 @@ public AzureServiceBusContainer withMsSqlServerContainer(final MSSQLServerContai
      * @param config The configuration
      * @return this
      */
-    public AzureServiceBusContainer withConfig(final Transferable config) {
+    public ServiceBusEmulatorContainer withConfig(final Transferable config) {
         withCopyToContainer(config, "/ServiceBus_Emulator/ConfigFiles/Config.json");
         return this;
     }
@@ -72,7 +72,7 @@ public AzureServiceBusContainer withConfig(final Transferable config) {
      *
      * @return this
      */
-    public AzureServiceBusContainer acceptLicense() {
+    public ServiceBusEmulatorContainer acceptLicense() {
         withEnv("ACCEPT_EULA", "Y");
         return this;
     }
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java
similarity index 95%
rename from modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java
rename to modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java
index c0febc2ed86..58d1d7ad59c 100644
--- a/modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java
@@ -19,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.waitAtMost;
 
-public class AzureEventHubsContainerTest {
+public class EventHubsEmulatorContainerTest {
 
     @Rule
     // network {
@@ -36,7 +36,7 @@ public class AzureEventHubsContainerTest {
 
     @Rule
     // emulatorContainer {
-    public AzureEventHubsContainer emulator = new AzureEventHubsContainer(
+    public EventHubsEmulatorContainer emulator = new EventHubsEmulatorContainer(
         "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1"
     )
         .acceptLicense()
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
similarity index 96%
rename from modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java
rename to modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
index f581de19ab8..781a2d24566 100644
--- a/modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
@@ -23,7 +23,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-public class AzureServiceBusContainerTest {
+public class ServiceBusEmulatorContainerTest {
 
     @Rule
     // network {
@@ -47,7 +47,7 @@ public class AzureServiceBusContainerTest {
 
     @Rule
     // emulatorContainer {
-    public AzureServiceBusContainer emulator = new AzureServiceBusContainer(
+    public ServiceBusEmulatorContainer emulator = new ServiceBusEmulatorContainer(
         "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1"
     )
         .acceptLicense()

From 13b6365182293bd107f221d9f9358e1a635042a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 19 Feb 2025 14:40:11 -0600
Subject: [PATCH 4162/4969] Rename Picone implementation

---
 docs/modules/pinecone.md                                  | 8 ++++----
 ...PineconeContainer.java => PineconeLocalContainer.java} | 6 +++---
 ...ContainerTest.java => PineconeLocalContainerTest.java} | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename modules/pinecone/src/main/java/org/testcontainers/pinecone/{PineconeContainer.java => PineconeLocalContainer.java} (77%)
 rename modules/pinecone/src/test/java/org/testcontainers/pinecone/{PineconeContainerTest.java => PineconeLocalContainerTest.java} (86%)

diff --git a/docs/modules/pinecone.md b/docs/modules/pinecone.md
index 77feaadcf4c..b4eac925c51 100644
--- a/docs/modules/pinecone.md
+++ b/docs/modules/pinecone.md
@@ -1,13 +1,13 @@
 # Pinecone
 
-Testcontainers module for [Pinecone](https://github.com/orgs/pinecone-io/packages/container/package/pinecone-local).
+Testcontainers module for [Pinecone Local](https://github.com/orgs/pinecone-io/packages/container/package/pinecone-local).
 
-## PineconeContainer's usage examples
+## PineconeLocalContainer's usage examples
 
-You can start an Pinecone container instance from any Java application by using:
+You can start a Pinecone container instance from any Java application by using:
 
 <!--codeinclude-->
-[Pinecone container](../../modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java) inside_block:container
+[Pinecone container](../../modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeContainer.java b/modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeLocalContainer.java
similarity index 77%
rename from modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeContainer.java
rename to modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeLocalContainer.java
index 845b62aa075..56c846872de 100644
--- a/modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeContainer.java
+++ b/modules/pinecone/src/main/java/org/testcontainers/pinecone/PineconeLocalContainer.java
@@ -8,7 +8,7 @@
  * <p>
  * Exposed port: 5080
  */
-public class PineconeContainer extends GenericContainer<PineconeContainer> {
+public class PineconeLocalContainer extends GenericContainer<PineconeLocalContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
         "ghcr.io/pinecone-io/pinecone-local"
@@ -16,11 +16,11 @@ public class PineconeContainer extends GenericContainer<PineconeContainer> {
 
     private static final int PORT = 5080;
 
-    public PineconeContainer(String dockerImageName) {
+    public PineconeLocalContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
-    public PineconeContainer(DockerImageName dockerImageName) {
+    public PineconeLocalContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
diff --git a/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java b/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java
similarity index 86%
rename from modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java
rename to modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java
index 0e8f2778605..5843dfef81c 100644
--- a/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeContainerTest.java
+++ b/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java
@@ -7,12 +7,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PineconeContainerTest {
+public class PineconeLocalContainerTest {
 
     @Test
     public void testSimple() {
         try ( // container {
-            PineconeContainer container = new PineconeContainer("ghcr.io/pinecone-io/pinecone-local:v0.7.0")
+            PineconeLocalContainer container = new PineconeLocalContainer("ghcr.io/pinecone-io/pinecone-local:v0.7.0")
             // }
         ) {
             container.start();

From 6ed48215dda976ecafc70f1d37332c6b76ee7f51 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 16:11:27 -0600
Subject: [PATCH 4163/4969] [create-pull-request] automated change (#9995)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 0245c2f1419..03dfdd7f9e3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -139,4 +139,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.4
+    latest_version: 1.20.5

From 5af66d700e942474afabd8e550bf089196fdb5f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 16:11:45 -0600
Subject: [PATCH 4164/4969] [create-pull-request] automated change (#9996)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index be57d9abd98..37cf8aeb3de 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.4
+testcontainers.version=1.20.5

From 6e104da1d6e8a4188451f556e9c7cb4ce8eb3164 Mon Sep 17 00:00:00 2001
From: julianladisch <julianladisch@users.noreply.github.com>
Date: Fri, 21 Feb 2025 14:51:07 +0100
Subject: [PATCH 4165/4969] Bump confluentinc/cp-kcat from 7.4.1 to 7.9.0
 (#10000)

---
 .../src/test/java/org/testcontainers/KCatContainer.java     | 2 +-
 .../org/testcontainers/containers/KafkaContainerTest.java   | 2 +-
 .../org/testcontainers/redpanda/RedpandaContainerTest.java  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/kafka/src/test/java/org/testcontainers/KCatContainer.java b/modules/kafka/src/test/java/org/testcontainers/KCatContainer.java
index 84ad97b52b7..79532ae9f22 100644
--- a/modules/kafka/src/test/java/org/testcontainers/KCatContainer.java
+++ b/modules/kafka/src/test/java/org/testcontainers/KCatContainer.java
@@ -6,7 +6,7 @@
 public class KCatContainer extends GenericContainer<KCatContainer> {
 
     public KCatContainer() {
-        super("confluentinc/cp-kcat:7.4.1");
+        super("confluentinc/cp-kcat:7.9.0");
         withCreateContainerCmdModifier(cmd -> {
             cmd.withEntrypoint("sh");
         });
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 6d3578f7833..f2a86020701 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -195,7 +195,7 @@ public void testUsageWithListener() throws Exception {
                 .withNetwork(network);
             // }
             // createKCatContainer {
-            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.9.0")
                 .withCreateContainerCmdModifier(cmd -> {
                     cmd.withEntrypoint("sh");
                 })
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index 605ad76510a..d07f33d8b00 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -111,7 +111,7 @@ public void testUsageWithListener() throws Exception {
             RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
                 .withListener(() -> "redpanda:19092")
                 .withNetwork(network);
-            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.9.0")
                 .withCreateContainerCmdModifier(cmd -> {
                     cmd.withEntrypoint("sh");
                 })
@@ -141,7 +141,7 @@ public void testUsageWithListenerInTheSameNetwork() throws Exception {
                 .withNetwork(network);
             // }
             // createKCatContainer {
-            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.9.0")
                 .withCreateContainerCmdModifier(cmd -> {
                     cmd.withEntrypoint("sh");
                 })
@@ -200,7 +200,7 @@ public void testUsageWithListenerAndSasl() throws Exception {
                 .withSuperuser("panda")
                 .withListener("my-panda:29092")
                 .withNetwork(network);
-            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.4.1")
+            GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.9.0")
                 .withCreateContainerCmdModifier(cmd -> {
                     cmd.withEntrypoint("sh");
                 })

From 2ee1ad5595215b6e41a1a5367107567633d737cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 23:07:26 +0000
Subject: [PATCH 4166/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.3.0
 in /modules/solace

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index fb83eede28c..bf118e88b4e 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solace"
 dependencies {
     api project(':testcontainers')
 
-    shaded 'org.awaitility:awaitility:4.2.0'
+    shaded 'org.awaitility:awaitility:4.3.0'
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.solacesystems:sol-jcsmp:10.24.1'

From 82357281478493d74f3ca10fd1fb564e44b80579 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 23:24:18 +0000
Subject: [PATCH 4167/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.3.0
 in /modules/questdb

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 01bc5473247..e369c1464d5 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -8,6 +8,6 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.questdb:questdb:7.3.9'
-    testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From da27d34006d570380abfe539249354ea447b3a9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 23:28:26 +0000
Subject: [PATCH 4168/4969] Bump org.awaitility:awaitility from 4.2.2 to 4.3.0
 in /modules/kafka

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.2 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.2...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 5f0658a51d0..6b39a0574e7 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'org.awaitility:awaitility:4.2.2'
+    testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 576e65a5d0a2636bfa21fed42be8b1a7df93ec25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 27 Feb 2025 11:37:45 -0600
Subject: [PATCH 4169/4969] Fix spock module to compile using Java 8

Fixes #10036
---
 modules/spock/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index d6af49fecbe..f016e5624d6 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -23,6 +23,11 @@ dependencies {
     testCompileOnly 'org.jetbrains:annotations:24.1.0'
 }
 
+tasks.withType(GroovyCompile) {
+    options.release.set(8)
+    options.encoding = 'UTF-8'
+}
+
 sourceJar {
     /* allJava is default (see gradle/publishing.gradle:sourceJar)
        allSource contains both .java and .groovy files */

From 93a2edadcdcc2640d4344f75dfbf0215b15f669a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 4 Mar 2025 11:06:38 -0600
Subject: [PATCH 4170/4969] Update ubuntu version to 22.04

---
 .github/workflows/release.yml                       | 2 +-
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4586838d0d9..7adfda8a4c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index b6501902995..96a4d6050a9 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: github.repository == 'testcontainers/testcontainers-java'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 7623b3dff69..d28a966ad1d 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: github.repository == 'testcontainers/testcontainers-java'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:

From fa4d2706fd6661e7deca97199d2050aef44a8f9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 17:12:41 +0000
Subject: [PATCH 4171/4969] Bump peter-evans/create-pull-request from 7.0.5 to
 7.0.8

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.5 to 7.0.8.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/5e914681df9dc83aa4e4905692ca88beb2f9e91f...271a8d0340265f705b14b6d32b9829c1cb33d45e)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 96a4d6050a9..0248fa1d93a 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v3.10.1
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index d28a966ad1d..13837626c06 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v3.10.1
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
         with:
           title: Update testcontainers version to ${GITHUB_REF##*/}
           body: |

From cc1c13af22dc54988a875b0e3540bee1d6329d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 4 Mar 2025 13:12:39 -0600
Subject: [PATCH 4172/4969] Replace release by sourceCompatibility and
 targetCompatibility in spock

---
 modules/spock/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index f016e5624d6..6e329b2a78c 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -24,7 +24,8 @@ dependencies {
 }
 
 tasks.withType(GroovyCompile) {
-    options.release.set(8)
+    sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
     options.encoding = 'UTF-8'
 }
 

From 36032e91e0b690d54fd3b3ce41f01ad325069166 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 14:06:09 -0600
Subject: [PATCH 4173/4969] [create-pull-request] automated change (#10062)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 37cf8aeb3de..45f25ec96f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.5
+testcontainers.version=1.20.6

From 09a8819b44271225d3d80dded1c491d87f43e01f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 14:06:20 -0600
Subject: [PATCH 4174/4969] [create-pull-request] automated change (#10063)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 03dfdd7f9e3..536f73a0603 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -139,4 +139,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.5
+    latest_version: 1.20.6

From f0d46c860ed21260e9fc26956d589b1f003c49e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 4 Mar 2025 14:24:36 -0600
Subject: [PATCH 4175/4969] Deprecate getUserPass and add getPassword (#10064)

---
 .../main/java/org/testcontainers/ldap/LLdapContainer.java | 5 +++++
 .../java/org/testcontainers/ldap/LLdapContainerTest.java  | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
index 6a8193e8106..c811bffa1ec 100644
--- a/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
+++ b/modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
@@ -79,7 +79,12 @@ public String getUser() {
         return String.format("cn=admin,ou=people,%s", getBaseDn());
     }
 
+    @Deprecated
     public String getUserPass() {
         return getEnvMap().getOrDefault("LLDAP_LDAP_USER_PASS", "password");
     }
+
+    public String getPassword() {
+        return getEnvMap().getOrDefault("LLDAP_LDAP_USER_PASS", "password");
+    }
 }
diff --git a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
index 399dd83bbf9..d8914c793c2 100644
--- a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
+++ b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
@@ -18,7 +18,7 @@ public void test() throws LDAPException {
         ) {
             lldap.start();
             LDAPConnection connection = new LDAPConnection(lldap.getHost(), lldap.getLdapPort());
-            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
+            BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
             assertThat(result).isNotNull();
         }
     }
@@ -30,7 +30,7 @@ public void testUsingLdapUrl() throws LDAPException {
 
             LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
             LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
-            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
+            BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
             assertThat(result).isNotNull();
         }
     }
@@ -47,7 +47,7 @@ public void testWithCustomBaseDn() throws LDAPException {
 
             LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
             LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
-            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
+            BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
             assertThat(result).isNotNull();
         }
     }
@@ -59,7 +59,7 @@ public void testWithCustomUserPass() throws LDAPException {
 
             LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
             LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
-            BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
+            BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
             assertThat(result).isNotNull();
         }
     }

From cf176748ca1a93b588869a5ce2f815568045698f Mon Sep 17 00:00:00 2001
From: Ling Hengqian <linghengqian@outlook.com>
Date: Wed, 5 Mar 2025 04:30:16 +0800
Subject: [PATCH 4176/4969] Use `clickhouse/clickhouse-server` as Docker Image
 in ClickHouseProvider (#8738)

Fixes #8736
---
 modules/clickhouse/build.gradle                    |  1 +
 .../containers/ClickHouseProvider.java             | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 6dec2131bde..4bec350d6ef 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.0', classifier: 'http')
+    testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.0', classifier: 'http')
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
index 80fb71bd5da..250631c1500 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
@@ -1,16 +1,24 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.utility.DockerImageName;
 
 public class ClickHouseProvider extends JdbcDatabaseContainerProvider {
 
+    private static final String DEFAULT_TAG = "24.12-alpine";
+
     @Override
     public boolean supports(String databaseType) {
-        return databaseType.equals(ClickHouseContainer.NAME);
+        return databaseType.equals("clickhouse");
+    }
+
+    @Override
+    public JdbcDatabaseContainer<?> newInstance() {
+        return newInstance(DEFAULT_TAG);
     }
 
     @Override
-    public JdbcDatabaseContainer newInstance(String tag) {
-        return new ClickHouseContainer(DockerImageName.parse(ClickHouseContainer.IMAGE).withTag(tag));
+    public JdbcDatabaseContainer<?> newInstance(String tag) {
+        return new ClickHouseContainer(DockerImageName.parse("clickhouse/clickhouse-server").withTag(tag));
     }
 }

From b7336e9435b3db6facf925aecf2672cf822e502f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 4 Mar 2025 14:38:21 -0600
Subject: [PATCH 4177/4969] Remove linked-container (#10065)

---
 docs/examples.md                              |  1 -
 examples/linked-container/build.gradle        | 17 --------
 .../linkedcontainer/RedmineClient.java        | 31 ---------------
 .../LinkedContainerTestImages.java            |  9 -----
 .../linkedcontainer/RedmineClientTest.java    | 39 -------------------
 .../linkedcontainer/RedmineContainer.java     | 33 ----------------
 .../src/test/resources/logback-test.xml       | 16 --------
 examples/settings.gradle                      |  1 -
 8 files changed, 147 deletions(-)
 delete mode 100644 examples/linked-container/build.gradle
 delete mode 100644 examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java
 delete mode 100644 examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
 delete mode 100644 examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
 delete mode 100644 examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
 delete mode 100644 examples/linked-container/src/test/resources/logback-test.xml

diff --git a/docs/examples.md b/docs/examples.md
index 05638d00d43..c63fa739817 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -4,7 +4,6 @@ Examples of different use cases provided by Testcontainers can be found below:
 
 - [Hazelcast](https://github.com/testcontainers/testcontainers-java/tree/main/examples/hazelcast)
 - [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/kafka-cluster)
-- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/linked-container)
 - [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/main/examples/neo4j-container)
 - [Redis](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache)
 - [Selenium](https://github.com/testcontainers/testcontainers-java/tree/main/examples/selenium-container)
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
deleted file mode 100644
index 028e457fc5d..00000000000
--- a/examples/linked-container/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-plugins {
-    id 'java'
-}
-
-repositories {
-    mavenCentral()
-}
-dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    implementation 'org.json:json:20240303'
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
-}
-
diff --git a/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java b/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java
deleted file mode 100644
index c95ec133e2f..00000000000
--- a/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.example.linkedcontainer;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-/**
- * A crude, partially implemented Redmine client.
- */
-public class RedmineClient {
-
-    private String url;
-
-    private OkHttpClient client;
-
-    public RedmineClient(String url) {
-        this.url = url;
-        client = new OkHttpClient();
-    }
-
-    public int getIssueCount() throws IOException {
-        Request request = new Request.Builder().url(url + "/issues.json").build();
-
-        Response response = client.newCall(request).execute();
-        JSONObject jsonObject = new JSONObject(response.body().string());
-        return jsonObject.getInt("total_count");
-    }
-}
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
deleted file mode 100644
index af8a823c1de..00000000000
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.linkedcontainer;
-
-import org.testcontainers.utility.DockerImageName;
-
-public interface LinkedContainerTestImages {
-    DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12");
-
-    DockerImageName REDMINE_TEST_IMAGE = DockerImageName.parse("redmine:3.3.2");
-}
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
deleted file mode 100644
index 721c00835c9..00000000000
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.example.linkedcontainer;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.testcontainers.containers.PostgreSQLContainer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for RedmineClient.
- */
-public class RedmineClientTest {
-
-    private static final String POSTGRES_USERNAME = "redmine";
-
-    private static final String POSTGRES_PASSWORD = "secret";
-
-    private PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>(
-        LinkedContainerTestImages.POSTGRES_TEST_IMAGE
-    )
-        .withUsername(POSTGRES_USERNAME)
-        .withPassword(POSTGRES_PASSWORD);
-
-    private RedmineContainer redmineContainer = new RedmineContainer(LinkedContainerTestImages.REDMINE_TEST_IMAGE)
-        .withLinkToContainer(postgreSQLContainer, "postgres")
-        .withEnv("POSTGRES_ENV_POSTGRES_USER", POSTGRES_USERNAME)
-        .withEnv("POSTGRES_ENV_POSTGRES_PASSWORD", POSTGRES_PASSWORD);
-
-    @Rule
-    public RuleChain chain = RuleChain.outerRule(postgreSQLContainer).around(redmineContainer);
-
-    @Test
-    public void canGetIssueCount() throws Exception {
-        RedmineClient redmineClient = new RedmineClient(redmineContainer.getRedmineUrl());
-
-        assertThat(redmineClient.getIssueCount()).as("The issue count can be retrieved.").isZero();
-    }
-}
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
deleted file mode 100644
index 0f0bea36c1a..00000000000
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.example.linkedcontainer;
-
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.traits.LinkableContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.DockerImageName;
-
-/**
- * A Redmine container.
- */
-public class RedmineContainer extends GenericContainer<RedmineContainer> {
-
-    private static final int REDMINE_PORT = 3000;
-
-    public RedmineContainer(DockerImageName dockerImageName) {
-        super(dockerImageName);
-    }
-
-    @Override
-    protected void configure() {
-        addExposedPort(REDMINE_PORT);
-        waitingFor(Wait.forHttp("/"));
-    }
-
-    public RedmineContainer withLinkToContainer(LinkableContainer otherContainer, String alias) {
-        addLink(otherContainer, alias);
-        return this;
-    }
-
-    public String getRedmineUrl() {
-        return String.format("http://%s:%d", this.getHost(), this.getMappedPort(REDMINE_PORT));
-    }
-}
diff --git a/examples/linked-container/src/test/resources/logback-test.xml b/examples/linked-container/src/test/resources/logback-test.xml
deleted file mode 100644
index 83ef7a1a3ef..00000000000
--- a/examples/linked-container/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-    <logger name="org.testcontainers" level="INFO"/>
-</configuration>
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 8aed2430fb5..8d144867bbd 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -20,7 +20,6 @@ includeBuild '..'
 
 // explicit include to allow Dependabot to autodiscover subprojects
 include 'kafka-cluster'
-include 'linked-container'
 include 'neo4j-container'
 include 'redis-backed-cache'
 include 'redis-backed-cache-testng'

From d1933b75bbacb93509f8e06ecea71aea5820ef23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 4 Mar 2025 19:24:47 -0600
Subject: [PATCH 4178/4969] Support additional flags in
 FirestoreEmulatorContainer (#10067)

Fixes #10060
---
 .../containers/FirestoreEmulatorContainer.java  | 17 ++++++++++++++++-
 .../FirestoreEmulatorContainerTest.java         | 15 +++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index 04a7f039be7..db703cda5b4 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -24,6 +24,8 @@ public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulat
 
     private static final int PORT = 8080;
 
+    private String flags;
+
     public FirestoreEmulatorContainer(String image) {
         this(DockerImageName.parse(image));
     }
@@ -34,7 +36,20 @@ public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
 
         withExposedPorts(PORT);
         setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
-        withCommand("/bin/sh", "-c", CMD);
+    }
+
+    @Override
+    protected void configure() {
+        String command = CMD;
+        if (this.flags != null && !this.flags.isEmpty()) {
+            command += " " + this.flags;
+        }
+        withCommand("/bin/sh", "-c", command);
+    }
+
+    public FirestoreEmulatorContainer withFlags(String flags) {
+        this.flags = flags;
+        return this;
     }
 
     /**
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index 0162085ea35..0d9773ce87a 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -53,6 +53,21 @@ public void testSimple() throws ExecutionException, InterruptedException {
 
         assertThat(querySnapshot.getDocuments().get(0).getData()).containsEntry("first", "Ada");
     }
+
     // }
 
+    @Test
+    public void testWithFlags() {
+        try (
+            FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
+                "gcr.io/google.com/cloudsdktool/google-cloud-cli:465.0.0-emulators"
+            )
+                .withFlags("--database-mode datastore-mode")
+        ) {
+            emulator.start();
+
+            assertThat(emulator.getContainerInfo().getConfig().getCmd())
+                .anyMatch(e -> e.contains("--database-mode datastore-mode"));
+        }
+    }
 }

From 2cc64fcdb5711692f38f0e907ea39bf89f045169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 4 Mar 2025 20:25:36 -0600
Subject: [PATCH 4179/4969] Remove spock-core from spock module (#10069)

---
 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 6e329b2a78c..5924c93b3b2 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -6,7 +6,7 @@ description = "Testcontainers :: Spock-Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.spockframework:spock-core:2.3-groovy-4.0'
+    implementation 'org.spockframework:spock-core:2.3-groovy-4.0'
 
     testImplementation project(':selenium')
     testImplementation project(':mysql')

From 485ef1d21559e9ee6a167c31bc7ffd26eabf130f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 6 Mar 2025 13:19:17 -0600
Subject: [PATCH 4180/4969] Update docker-java version to 3.4.2 (#10071)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a7b600f041f..4dad6c61131 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -88,8 +88,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.2.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.4.1')
-    shaded platform('com.github.docker-java:docker-java-bom:3.4.1')
+    api platform('com.github.docker-java:docker-java-bom:3.4.2')
+    shaded platform('com.github.docker-java:docker-java-bom:3.4.2')
 
     api "com.github.docker-java:docker-java-api"
 

From ad2e8b1415b00a4b984e8efecdf2ca787aceb7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 12 Mar 2025 22:36:52 -0600
Subject: [PATCH 4181/4969] [servicebus] Skip waiting for sql to be ready
 (#10092)

By default, Azure ServiceBus emulator waits 15 seconds for sql to
be ready. Testcontainers is in charge of service readiness, so,
the emulator should skip waiting for sql.
---
 .../org/testcontainers/azure/ServiceBusEmulatorContainer.java   | 1 +
 .../testcontainers/azure/ServiceBusEmulatorContainerTest.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
index 270ec27b2e0..fd055a0d39b 100644
--- a/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
@@ -41,6 +41,7 @@ public ServiceBusEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withExposedPorts(DEFAULT_PORT);
+        withEnv("SQL_WAIT_INTERVAL", "0");
         waitingFor(Wait.forLogMessage(".*Emulator Service is Successfully Up!.*", 1));
     }
 
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
index 781a2d24566..4676e41784a 100644
--- a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
@@ -48,7 +48,7 @@ public class ServiceBusEmulatorContainerTest {
     @Rule
     // emulatorContainer {
     public ServiceBusEmulatorContainer emulator = new ServiceBusEmulatorContainer(
-        "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1"
+        "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2"
     )
         .acceptLicense()
         .withConfig(MountableFile.forClasspathResource("/service-bus-config.json"))

From 55f23470eb760fd9f22c886dd8ec490e6151dc6e Mon Sep 17 00:00:00 2001
From: julianladisch <julianladisch@users.noreply.github.com>
Date: Mon, 24 Mar 2025 22:50:48 +0100
Subject: [PATCH 4182/4969] Add SFTP host key check example (#10127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Demonstrates how to upload a private host key into the SFTP server allowing host key checking.

It avoids the unsecure ("StrictHostKeyChecking", "no") of SftpContainerTest.

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../java/org/example/SftpContainerTest.java   | 53 +++++++++++++++++++
 .../sftp/src/test/resources/ssh_host_rsa_key  | 38 +++++++++++++
 .../src/test/resources/ssh_host_rsa_key.pub   |  1 +
 3 files changed, 92 insertions(+)
 create mode 100644 examples/sftp/src/test/resources/ssh_host_rsa_key
 create mode 100644 examples/sftp/src/test/resources/ssh_host_rsa_key.pub

diff --git a/examples/sftp/src/test/java/org/example/SftpContainerTest.java b/examples/sftp/src/test/java/org/example/SftpContainerTest.java
index e54b5b72036..3a6593ea736 100644
--- a/examples/sftp/src/test/java/org/example/SftpContainerTest.java
+++ b/examples/sftp/src/test/java/org/example/SftpContainerTest.java
@@ -1,6 +1,7 @@
 package org.example;
 
 import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.HostKey;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.Session;
 import org.junit.jupiter.api.Test;
@@ -10,6 +11,7 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -49,4 +51,55 @@ void test() throws Exception {
                 .noneMatch(item -> item.toString().contains("testcontainers/file.txt"));
         }
     }
+
+    @Test
+    void testHostKeyCheck() throws Exception {
+        try (
+            GenericContainer<?> sftp = new GenericContainer<>("atmoz/sftp:alpine-3.7")
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("testcontainers/", 0777),
+                    "/home/foo/upload/testcontainers"
+                )
+                .withCopyFileToContainer(
+                    MountableFile.forClasspathResource("./ssh_host_rsa_key", 0400),
+                    "/etc/ssh/ssh_host_rsa_key"
+                )
+                .withExposedPorts(22)
+                .withCommand("foo:pass:::upload")
+        ) {
+            sftp.start();
+            JSch jsch = new JSch();
+            Session jschSession = jsch.getSession("foo", sftp.getHost(), sftp.getMappedPort(22));
+            jschSession.setPassword("pass");
+            // hostKeyString is string starting with AAAA from file known_hosts or ssh_host_*_key.pub
+            // generate the files with:
+            // ssh-keygen -t rsa -b 3072 -f ssh_host_rsa_key < /dev/null
+            String hostKeyString =
+                "AAAAB3NzaC1yc2EAAAADAQABAAABgQCXMxVRzmFWxfrRB9XiZ/3HNM+xkYYE+IMGuOZD" +
+                "04M2ezU25XjT6cPajzpFmzTxR2qEpRCKHeVnSG5nT6UXQp7760brTN7m5sDasbMnHgYh" +
+                "fC/3of2k6qTR9X/JHRpgwzq5+6FtEe41w1H1dXoNIr4YTKnLijSp8MKqBtPPNUpzEVb9" +
+                "5YKZGdCDoCbbYOyS/Dc8azUDo0mqM542J3nA2Sq9HCP0BAv43hrTAtCZodkB5wo18exb" +
+                "fPKsjGtA3de2npybFoSRbavZmT8L/b2iHZX6FRaqLsbYGKtszCWu5OU7WBX5g5QVlLfO" +
+                "nGQ+LsF6d6pX5LlMwEU14uu4gNPvZFOaZXtHNHZqnBcjd/sMaw5N/atFsPgtQ0vYnrEA" +
+                "D6oDjj0uXMsnmgUWTZBi3q2GBWWPqhE+0ASb2xBQGa+tWWTVYbuuYlA7hUX0URK8FcLw" +
+                "4UOYJjscDjnjlvQkghd2esP5NxV1NXkG2XYNHnf1E/tH4+AHJzy+qOQom7ehda96FZ8=";
+            HostKey hostKey = new HostKey(sftp.getHost(), Base64.getDecoder().decode(hostKeyString));
+            jschSession.getHostKeyRepository().add(hostKey, null);
+            jschSession.connect();
+            ChannelSftp channel = (ChannelSftp) jschSession.openChannel("sftp");
+            channel.connect();
+            assertThat(channel.ls("/upload/testcontainers")).anyMatch(item -> item.toString().contains("file.txt"));
+            assertThat(
+                new BufferedReader(
+                    new InputStreamReader(channel.get("/upload/testcontainers/file.txt"), StandardCharsets.UTF_8)
+                )
+                    .lines()
+                    .collect(Collectors.joining("\n"))
+            )
+                .contains("Testcontainers");
+            channel.rm("/upload/testcontainers/file.txt");
+            assertThat(channel.ls("/upload/testcontainers/"))
+                .noneMatch(item -> item.toString().contains("testcontainers/file.txt"));
+        }
+    }
 }
diff --git a/examples/sftp/src/test/resources/ssh_host_rsa_key b/examples/sftp/src/test/resources/ssh_host_rsa_key
new file mode 100644
index 00000000000..9987990b63d
--- /dev/null
+++ b/examples/sftp/src/test/resources/ssh_host_rsa_key
@@ -0,0 +1,38 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+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
+-----END OPENSSH PRIVATE KEY-----
diff --git a/examples/sftp/src/test/resources/ssh_host_rsa_key.pub b/examples/sftp/src/test/resources/ssh_host_rsa_key.pub
new file mode 100644
index 00000000000..57b3aebb050
--- /dev/null
+++ b/examples/sftp/src/test/resources/ssh_host_rsa_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCXMxVRzmFWxfrRB9XiZ/3HNM+xkYYE+IMGuOZD04M2ezU25XjT6cPajzpFmzTxR2qEpRCKHeVnSG5nT6UXQp7760brTN7m5sDasbMnHgYhfC/3of2k6qTR9X/JHRpgwzq5+6FtEe41w1H1dXoNIr4YTKnLijSp8MKqBtPPNUpzEVb95YKZGdCDoCbbYOyS/Dc8azUDo0mqM542J3nA2Sq9HCP0BAv43hrTAtCZodkB5wo18exbfPKsjGtA3de2npybFoSRbavZmT8L/b2iHZX6FRaqLsbYGKtszCWu5OU7WBX5g5QVlLfOnGQ+LsF6d6pX5LlMwEU14uu4gNPvZFOaZXtHNHZqnBcjd/sMaw5N/atFsPgtQ0vYnrEAD6oDjj0uXMsnmgUWTZBi3q2GBWWPqhE+0ASb2xBQGa+tWWTVYbuuYlA7hUX0URK8FcLw4UOYJjscDjnjlvQkghd2esP5NxV1NXkG2XYNHnf1E/tH4+AHJzy+qOQom7ehda96FZ8= someone@localhost

From 0b7f6fc14f990d09113e082b86e7dae13935e5ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 00:09:39 +0000
Subject: [PATCH 4183/4969] Bump com.zaxxer:HikariCP from 4.0.3 to 6.3.0 in
 /modules/spock

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.3 to 6.3.0.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.3...HikariCP-6.3.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5924c93b3b2..c3cece021eb 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
 
-    testImplementation 'com.zaxxer:HikariCP:4.0.3'
+    testImplementation 'com.zaxxer:HikariCP:6.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'

From 05e5eab65be4dbade38c3771aa2a3e349001f5cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 00:40:47 +0000
Subject: [PATCH 4184/4969] Bump org.apache.kafka:kafka-clients from 3.8.0 to
 4.0.0 in /examples

Bumps org.apache.kafka:kafka-clients from 3.8.0 to 4.0.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 623fcd66175..afe7755f3c1 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.34"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.34"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
+    testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From e5625684c87c5bc04e18dd4d6e23ea00f8d585b8 Mon Sep 17 00:00:00 2001
From: Wouter Blancquaert <wouter@blancquaert.org>
Date: Thu, 3 Apr 2025 22:54:37 +0200
Subject: [PATCH 4185/4969] Add default database name to MongoDB Atlas (#10034)

Co-authored-by: Wouter Blancquaert <wouter.blancquaert@aclvb.be>
---
 .../mongodb/MongoDBAtlasLocalContainer.java   | 32 ++++++++++++++++++-
 .../MongoDBAtlasLocalContainerTest.java       | 20 ++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java b/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java
index 52067c01ff2..79e44d3ffb0 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainer.java
@@ -17,6 +17,10 @@ public class MongoDBAtlasLocalContainer extends GenericContainer<MongoDBAtlasLoc
 
     private static final int MONGODB_INTERNAL_PORT = 27017;
 
+    private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
+
+    private static final String DIRECT_CONNECTION = "directConnection=true";
+
     public MongoDBAtlasLocalContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -33,6 +37,32 @@ public MongoDBAtlasLocalContainer(final DockerImageName dockerImageName) {
      * Get the connection string to MongoDB.
      */
     public String getConnectionString() {
-        return String.format("mongodb://%s:%d/?directConnection=true", getHost(), getMappedPort(MONGODB_INTERNAL_PORT));
+        return baseConnectionString() + "/?" + DIRECT_CONNECTION;
+    }
+
+    private String baseConnectionString() {
+        return String.format("mongodb://%s:%d", getHost(), getMappedPort(MONGODB_INTERNAL_PORT));
+    }
+
+    /**
+     * Gets a database specific connection string for the default {@value #MONGODB_DATABASE_NAME_DEFAULT} database.
+     *
+     * @return a database specific connection string.
+     */
+    public String getDatabaseConnectionString() {
+        return getDatabaseConnectionString(MONGODB_DATABASE_NAME_DEFAULT);
+    }
+
+    /**
+     * Gets a database specific connection string for a provided <code>databaseName</code>.
+     *
+     * @param databaseName a database name.
+     * @return a database specific connection string.
+     */
+    public String getDatabaseConnectionString(final String databaseName) {
+        if (!isRunning()) {
+            throw new IllegalStateException("MongoDBContainer should be started first");
+        }
+        return baseConnectionString() + "/" + databaseName + "?" + DIRECT_CONNECTION;
     }
 }
diff --git a/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
index 2d7664d51fa..720629d214c 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
@@ -36,6 +36,26 @@ public void getConnectionString() {
         }
     }
 
+    @Test
+    public void getDatabaseConnectionString() {
+        try (
+            MongoDBAtlasLocalContainer container = new MongoDBAtlasLocalContainer("mongodb/mongodb-atlas-local:7.0.9")
+        ) {
+            container.start();
+            String databaseConnectionString = container.getDatabaseConnectionString();
+            assertThat(databaseConnectionString).isNotNull();
+            assertThat(databaseConnectionString).startsWith("mongodb://");
+            assertThat(databaseConnectionString)
+                .isEqualTo(
+                    String.format(
+                        "mongodb://%s:%d/test?directConnection=true",
+                        container.getHost(),
+                        container.getFirstMappedPort()
+                    )
+                );
+        }
+    }
+
     @Test
     public void createAtlasIndexAndSearchIt() throws Exception {
         try (

From 3e5bda696b0877e59e9747099d6a2cc57a7c3b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 3 Apr 2025 15:06:24 -0600
Subject: [PATCH 4186/4969] Update module dependabot schedule internal to
 monthly

---
 .github/dependabot.yml | 130 ++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bffc5623611..75582a50c91 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -43,12 +43,12 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/azure"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/cassandra"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "io.dropwizard.metrics:metrics-core"
@@ -56,27 +56,27 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/chromadb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/clickhouse"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/cockroachdb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/consul"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/couchbase"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.awaitility:awaitility"
@@ -84,51 +84,51 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/cratedb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/database-commons"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "gradle"
     directory: "/modules/databend"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/db2"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/dynalite"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/elasticsearch"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/gcloud"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/grafana"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/hivemq"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/influxdb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "com.influxdb:influxdb-java-client"
@@ -136,7 +136,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.mockito:mockito-core"
@@ -144,7 +144,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/jdbc-test"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.apache.tomcat:tomcat-jdbc"
@@ -152,7 +152,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/junit-jupiter"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.mockito:mockito-core"
@@ -160,7 +160,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/k3s"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
@@ -168,7 +168,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/k6"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
@@ -176,22 +176,22 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/ldap"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/localstack"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mariadb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.mariadb:r2dbc-mariadb"
@@ -199,37 +199,37 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/milvus"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/minio"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mockserver"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mongodb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mssqlserver"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/mysql"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/neo4j"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.neo4j.driver:neo4j-java-driver"
@@ -239,65 +239,65 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/nginx"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/oceanbase"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/ollama"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/openfga"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "gradle"
     directory: "/modules/oracle-free"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "gradle"
     directory: "/modules/oracle-xe"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/orientdb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/postgresql"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/presto"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/pinecone"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/pulsar"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/qdrant"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/questdb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.awaitility:awaitility"
@@ -305,7 +305,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/r2dbc"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "io.r2dbc:r2dbc-spi"
@@ -313,22 +313,22 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/rabbitmq"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/redpanda"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/scylladb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/selenium"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.seleniumhq.selenium:selenium-bom"
@@ -336,7 +336,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/solace"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.apache.qpid:qpid-jms-client"
@@ -346,7 +346,7 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/solr"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "org.apache.solr:solr-solrj"
@@ -354,54 +354,54 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/modules/spock"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/tidb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/timeplus"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/toxiproxy"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/trino"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/typesense"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/vault"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/weaviate"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/yugabytedb"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
 
 # Examples
   - package-ecosystem: "gradle"
     directory: "/examples"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "ch.qos.logback:logback-classic"
@@ -421,11 +421,11 @@ updates:
       - dependency-name: "com.hazelcast:hazelcast"
         update-types: [ "version-update:semver-minor" ]
 
-  # Smoke test
+# Smoke test
   - package-ecosystem: "gradle"
     directory: "/smoke-test"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "ch.qos.logback:logback-classic"

From 037eedbd9111f8be4a49ddf949581a67bde21ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 3 Apr 2025 15:08:37 -0600
Subject: [PATCH 4187/4969] Allow update awaitility

---
 .github/dependabot.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 75582a50c91..fe7a57a8603 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,8 +22,6 @@ updates:
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
       - dependency-name: "org.apache.commons:commons-compress"
         update-types: [ "version-update:semver-minor" ]
-      - dependency-name: "org.awaitility:awaitility"
-        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
@@ -78,9 +76,6 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: "org.awaitility:awaitility"
-        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/cratedb"
     schedule:
@@ -299,9 +294,6 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: "org.awaitility:awaitility"
-        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/r2dbc"
     schedule:
@@ -341,8 +333,6 @@ updates:
     ignore:
       - dependency-name: "org.apache.qpid:qpid-jms-client"
         update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.awaitility:awaitility"
-        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/solr"
     schedule:

From 1a71125022ec612cefaa9263d880930dd390be13 Mon Sep 17 00:00:00 2001
From: jonghoonpark <dev@jonghoonpark.com>
Date: Sat, 5 Apr 2025 02:30:13 +0900
Subject: [PATCH 4188/4969] Support new chromadb api version (#10170)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../chromadb/ChromaDBContainer.java           | 24 ++++++++++++++++++-
 .../chromadb/ChromaDBContainerTest.java       | 18 ++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java b/modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java
index a1bccf3904f..af6c3df33fc 100644
--- a/modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java
+++ b/modules/chromadb/src/main/java/org/testcontainers/chromadb/ChromaDBContainer.java
@@ -1,7 +1,9 @@
 package org.testcontainers.chromadb;
 
+import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -11,6 +13,7 @@
  * <p>
  * Exposed ports: 8000
  */
+@Slf4j
 public class ChromaDBContainer extends GenericContainer<ChromaDBContainer> {
 
     private static final DockerImageName DEFAULT_DOCKER_IMAGE = DockerImageName.parse("chromadb/chroma");
@@ -22,13 +25,32 @@ public ChromaDBContainer(String dockerImageName) {
     }
 
     public ChromaDBContainer(DockerImageName dockerImageName) {
+        this(dockerImageName, isVersion2(dockerImageName.getVersionPart()));
+    }
+
+    public ChromaDBContainer(DockerImageName dockerImageName, boolean isVersion2) {
         super(dockerImageName);
+        String apiPath = isVersion2 ? "/api/v2/heartbeat" : "/api/v1/heartbeat";
         dockerImageName.assertCompatibleWith(DEFAULT_DOCKER_IMAGE, GHCR_DOCKER_IMAGE);
         withExposedPorts(8000);
-        waitingFor(Wait.forHttp("/api/v1/heartbeat"));
+        waitingFor(Wait.forHttp(apiPath));
     }
 
     public String getEndpoint() {
         return "http://" + getHost() + ":" + getFirstMappedPort();
     }
+
+    private static boolean isVersion2(String version) {
+        if (version.equals("latest")) {
+            return true;
+        }
+
+        ComparableVersion comparableVersion = new ComparableVersion(version);
+        if (comparableVersion.isGreaterThanOrEqualTo("1.0.0")) {
+            return true;
+        }
+
+        log.warn("Version {} is less than 1.0.0 or not a semantic version.", version);
+        return false;
+    }
 }
diff --git a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
index 6cc01ac4d59..0ec6b00601c 100644
--- a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
+++ b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
@@ -27,4 +27,22 @@ public void test() {
             given().baseUri(chroma.getEndpoint()).when().get("/api/v1/databases/test").then().statusCode(200);
         }
     }
+
+    @Test
+    public void testVersion2() {
+        try (ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:1.0.0")) {
+            chroma.start();
+
+            given()
+                .baseUri(chroma.getEndpoint())
+                .when()
+                .body("{\"name\": \"test\"}")
+                .contentType(ContentType.JSON)
+                .post("/api/v2/tenants")
+                .then()
+                .statusCode(200);
+
+            given().baseUri(chroma.getEndpoint()).when().get("/api/v2/tenants/test").then().statusCode(200);
+        }
+    }
 }

From c970a05c71f58558e80334b41ce0c1bfa910682e Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Mon, 7 Apr 2025 12:54:53 -0400
Subject: [PATCH 4189/4969] Remove incubator note from Solr docs (#10173)

---
 docs/modules/solr.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/modules/solr.md b/docs/modules/solr.md
index 44be46c1a1a..f4030c300d6 100644
--- a/docs/modules/solr.md
+++ b/docs/modules/solr.md
@@ -1,9 +1,5 @@
 # Solr Container
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
-
-
 This module helps running [solr](https://lucene.apache.org/solr/) using Testcontainers.
 
 Note that it's based on the [official Docker image](https://hub.docker.com/_/solr/).

From c5bcaab0a32a3d863efe3e1ff3e80f8c273c4673 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Mon, 7 Apr 2025 12:58:59 -0400
Subject: [PATCH 4190/4969] Fix Apache Solr link (#10171)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/solr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/solr.md b/docs/modules/solr.md
index f4030c300d6..a332c7cbcbe 100644
--- a/docs/modules/solr.md
+++ b/docs/modules/solr.md
@@ -1,6 +1,6 @@
 # Solr Container
 
-This module helps running [solr](https://lucene.apache.org/solr/) using Testcontainers.
+This module helps running [solr](https://solr.apache.org/) using Testcontainers.
 
 Note that it's based on the [official Docker image](https://hub.docker.com/_/solr/).
 

From e8bb83fc753f7bfdde283780afb268918561a47f Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Mon, 7 Apr 2025 18:37:02 -0400
Subject: [PATCH 4191/4969] [solr] Replace "create_core" with "create" command
 (#10172)

---
 .../main/java/org/testcontainers/containers/SolrContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 6463fa60743..2c3e1b5c634 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -143,7 +143,7 @@ protected void waitUntilContainerStarted() {
     @SneakyThrows
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         if (!configuration.isZookeeper()) {
-            ExecResult result = execInContainer("solr", "create_core", "-c", configuration.getCollectionName());
+            ExecResult result = execInContainer("solr", "create", "-c", configuration.getCollectionName());
             if (result.getExitCode() != 0) {
                 throw new IllegalStateException(
                     "Unable to create solr core:\nStdout: " + result.getStdout() + "\nStderr:" + result.getStderr()

From 80ae5d7b1b7abca38657d037a3bba91c0f3e9250 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Mon, 7 Apr 2025 19:42:05 -0400
Subject: [PATCH 4192/4969] Pass start command required in Solr 10 (#10174)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../main/java/org/testcontainers/containers/SolrContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 2c3e1b5c634..b5d8d6abf8d 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -111,7 +111,7 @@ protected void configure() {
             throw new IllegalStateException("Solr needs to have a configuration if you want to use a schema");
         }
         // Generate Command Builder
-        String command = "solr -f";
+        String command = "solr start -f";
         // Add Default Ports
         this.addExposedPort(SOLR_PORT);
 

From e730674537dfa297a60311a7c13b953b8b82a67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 11 Apr 2025 17:11:50 -0600
Subject: [PATCH 4193/4969] Allow spock tests to be skipped when Docker is
 unavailable (#10180)

Fixes #10178
---
 .../spock/DockerAvailableDetector.groovy      | 15 +++++++
 .../spock/Testcontainers.groovy               |  7 ++++
 .../spock/TestcontainersExtension.groovy      | 15 +++++++
 .../spock/TestcontainersExtensionTest.groovy  | 39 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy
 create mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersExtensionTest.groovy

diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy
new file mode 100644
index 00000000000..b64299ffa87
--- /dev/null
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy
@@ -0,0 +1,15 @@
+package org.testcontainers.spock
+
+import org.testcontainers.DockerClientFactory
+
+class DockerAvailableDetector {
+
+	boolean isDockerAvailable() {
+		try {
+			DockerClientFactory.instance().client();
+			return true;
+		} catch (Throwable ex) {
+			return false;
+		}
+	}
+}
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
index 632b129ec7a..98c2223904b 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/Testcontainers.groovy
@@ -54,4 +54,11 @@ import java.lang.annotation.Target
 @Target([ElementType.TYPE, ElementType.METHOD])
 @ExtensionAnnotation(TestcontainersExtension)
 @interface Testcontainers {
+
+	/**
+	 * Whether tests should be disabled (rather than failing) when Docker is not available. Defaults to
+	 * {@code false}.
+	 * @return if the tests should be disabled when Docker is not available
+	 */
+	boolean disabledWithoutDocker() default false;
 }
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
index 40392210f3a..2654408e901 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
@@ -7,8 +7,23 @@ import org.spockframework.runtime.model.SpecInfo
 
 class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcontainers> {
 
+	private final DockerAvailableDetector dockerDetector
+
+	TestcontainersExtension() {
+		this(new DockerAvailableDetector())
+	}
+
+	TestcontainersExtension(DockerAvailableDetector dockerDetector) {
+		this.dockerDetector = dockerDetector
+	}
+
 	@Override
 	void visitSpecAnnotation(Testcontainers annotation, SpecInfo spec) {
+		if (annotation.disabledWithoutDocker()) {
+			if (!dockerDetector.isDockerAvailable()) {
+				spec.skip("disabledWithoutDocker is true and Docker is not available")
+			}
+		}
 		def listener = new ErrorListener()
 		def interceptor = new TestcontainersMethodInterceptor(spec, listener)
 		spec.addSetupSpecInterceptor(interceptor)
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersExtensionTest.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersExtensionTest.groovy
new file mode 100644
index 00000000000..d8cbdf2e497
--- /dev/null
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/TestcontainersExtensionTest.groovy
@@ -0,0 +1,39 @@
+package org.testcontainers.spock
+
+import org.spockframework.runtime.model.SpecInfo
+import spock.lang.Specification
+import spock.lang.Unroll
+
+class TestcontainersExtensionTest extends Specification {
+
+	@Unroll
+	def "should handle disabledWithoutDocker=#disabledWithoutDocker and dockerAvailable=#dockerAvailable correctly"() {
+		given:
+		def dockerDetector = Mock(DockerAvailableDetector)
+		dockerDetector.isDockerAvailable() >> dockerAvailable
+		def extension = new TestcontainersExtension(dockerDetector)
+		def specInfo = Mock(SpecInfo)
+		def annotation = disabledWithoutDocker ?
+				TestDisabledWithoutDocker.getAnnotation(Testcontainers) :
+				TestEnabledWithoutDocker.getAnnotation(Testcontainers)
+
+		when:
+		extension.visitSpecAnnotation(annotation, specInfo)
+
+		then:
+		skipCalls * specInfo.skip("disabledWithoutDocker is true and Docker is not available")
+
+		where:
+		disabledWithoutDocker | dockerAvailable | skipCalls
+		true                  | true            | 0
+		true                  | false           | 1
+		false                 | true            | 0
+		false                 | false           | 0
+	}
+
+	@Testcontainers(disabledWithoutDocker = true)
+	static class TestDisabledWithoutDocker {}
+
+	@Testcontainers
+	static class TestEnabledWithoutDocker {}
+}

From 910e7f5d9e8476f8b0d39ac2b7faded3648e9746 Mon Sep 17 00:00:00 2001
From: Jay DeLuca <jaydeluca4@gmail.com>
Date: Mon, 21 Apr 2025 17:50:30 -0400
Subject: [PATCH 4194/4969] Fix typo in LGTM container method (#10189)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 modules/grafana/build.gradle                                | 6 ++++++
 .../java/org/testcontainers/grafana/LgtmStackContainer.java | 2 +-
 .../org/testcontainers/grafana/LgtmStackContainerTest.java  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 72082e4cfec..34a45cc404b 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -8,3 +8,9 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.grafana.LgtmStackContainer#getPromehteusHttpUrl()"
+    ]
+}
diff --git a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
index 080be6d6eaf..595d016772a 100644
--- a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
+++ b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
@@ -58,7 +58,7 @@ public String getOtlpHttpUrl() {
         return "http://" + getHost() + ":" + getMappedPort(OTLP_HTTP_PORT);
     }
 
-    public String getPromehteusHttpUrl() {
+    public String getPrometheusHttpUrl() {
         return "http://" + getHost() + ":" + getMappedPort(PROMETHEUS_PORT);
     }
 
diff --git a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
index cb5dbaa630b..f5efe628f3c 100644
--- a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
+++ b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
@@ -46,7 +46,7 @@ public void shouldPublishMetric() throws Exception {
                     Response response = RestAssured
                         .given()
                         .queryParam("query", "test_counter_total{job=\"testcontainers\"}")
-                        .get(String.format("%s/api/v1/query", lgtm.getPromehteusHttpUrl()))
+                        .get(String.format("%s/api/v1/query", lgtm.getPrometheusHttpUrl()))
                         .prettyPeek()
                         .thenReturn();
                     assertThat(response.getStatusCode()).isEqualTo(200);

From d6ff41c7dc7cd8573337830a1a2f1642c62be377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 21 Apr 2025 17:02:27 -0500
Subject: [PATCH 4195/4969] Fix ImageNameSubstitutionTest

---
 .../java/generic/support/TestSpecificImageNameSubstitutor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
index 6955d49454b..0850c7c7a50 100644
--- a/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
+++ b/docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java
@@ -13,7 +13,7 @@ public class TestSpecificImageNameSubstitutor extends ImageNameSubstitutor {
     @Override
     public DockerImageName apply(final DockerImageName original) {
         if (original.equals(DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.36"))) {
-            return DockerImageName.parse("mysql");
+            return DockerImageName.parse("mysql:8.0.36");
         } else {
             return original;
         }

From 57b340201007d327b878dda5c2302a274612301f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Apr 2025 21:57:13 -0600
Subject: [PATCH 4196/4969] Update Gradle Wrapper from undefined to 8.13
 (#10033)

* Update Gradle Wrapper from 8.9 to 8.13

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.9 to 8.13

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.9 to 8.13

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

---------

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 43504 -> 43705 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   5 ++---
 gradle/wrapper/gradle-wrapper.jar             | Bin 43504 -> 43705 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   5 ++---
 smoke-test/gradle/wrapper/gradle-wrapper.jar  | Bin 43504 -> 43705 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 smoke-test/gradlew                            |   5 ++---
 9 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 2c3521197d7c4586c843d1d3e9090525f1898cde..9bbc975c742b298b441bfb90dbc124400a3751b9 100644
GIT binary patch
delta 34884
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

delta 34740
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

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 68e8816d71c..36e4933e1da 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/gradlew b/examples/gradlew
index f5feea6d6b1..faf93008b77 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 2c3521197d7c4586c843d1d3e9090525f1898cde..9bbc975c742b298b441bfb90dbc124400a3751b9 100644
GIT binary patch
delta 34884
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

delta 34740
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index efe2ff34492..2a6e21b2ba8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b1..faf93008b77 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar
index 2c3521197d7c4586c843d1d3e9090525f1898cde..9bbc975c742b298b441bfb90dbc124400a3751b9 100644
GIT binary patch
delta 34884
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

delta 34740
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

diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
index 68e8816d71c..36e4933e1da 100644
--- a/smoke-test/gradle/wrapper/gradle-wrapper.properties
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smoke-test/gradlew b/smoke-test/gradlew
index f5feea6d6b1..faf93008b77 100755
--- a/smoke-test/gradlew
+++ b/smoke-test/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

From 73e063746ac3b958eced6988005a8e8997dadbe6 Mon Sep 17 00:00:00 2001
From: Sebastian Steiner <sebastian.steiner@tuta.io>
Date: Tue, 22 Apr 2025 06:58:16 +0200
Subject: [PATCH 4197/4969] Allow configuring the AlwaysPullPolicy (#10188)

---
 .../org/testcontainers/images/PullPolicy.java    |  2 +-
 .../images/OverrideImagePullPolicyTest.java      | 16 ++++++++++++++++
 docs/features/advanced_options.md                |  8 ++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/images/PullPolicy.java b/core/src/main/java/org/testcontainers/images/PullPolicy.java
index 12d05b6fe5a..8c3a067cc15 100644
--- a/core/src/main/java/org/testcontainers/images/PullPolicy.java
+++ b/core/src/main/java/org/testcontainers/images/PullPolicy.java
@@ -40,7 +40,7 @@ public static synchronized ImagePullPolicy defaultPolicy() {
                         .currentThread()
                         .getContextClassLoader()
                         .loadClass(imagePullPolicyClassName)
-                        .getConstructor()
+                        .getDeclaredConstructor()
                         .newInstance();
             } catch (Exception e) {
                 throw new IllegalArgumentException(
diff --git a/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
index 3b410fd5ab9..43c026ea294 100644
--- a/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
@@ -51,4 +51,20 @@ public void simpleConfigurationTest() {
             container.stop();
         }
     }
+
+    @Test
+    public void alwaysPullConfigurationTest() {
+        Mockito
+            .doReturn(AlwaysPullPolicy.class.getCanonicalName())
+            .when(TestcontainersConfiguration.getInstance())
+            .getImagePullPolicy();
+
+        try (DockerRegistryContainer registry = new DockerRegistryContainer()) {
+            registry.start();
+            GenericContainer<?> container = new GenericContainer<>(registry.createImage()).withExposedPorts(8080);
+            container.start();
+            assertThat(container.getImage().imagePullPolicy).isInstanceOf(AlwaysPullPolicy.class);
+            container.stop();
+        }
+    }
 }
diff --git a/docs/features/advanced_options.md b/docs/features/advanced_options.md
index 9dd86edccd5..e979da9ecdf 100644
--- a/docs/features/advanced_options.md
+++ b/docs/features/advanced_options.md
@@ -38,6 +38,14 @@ You can also configure Testcontainers to use your custom implementation by using
     pull.policy=com.mycompany.testcontainers.ExampleImagePullPolicy
     ```
 
+You can also use the provided implementation to always pull images
+
+=== "`src/test/resources/testcontainers.properties`"
+    ```text
+    pull.policy=org.testcontainers.images.AlwaysPullPolicy
+    ```
+
+
 Please see [the documentation on configuration mechanisms](./configuration.md) for more information.
 
 ## Customizing the container

From 4e8c421fa3e270598a425be4a8f999923bb5b7ac Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 22 Apr 2025 20:51:54 +0200
Subject: [PATCH 4198/4969] Add DockerModelRunnerContainer to core (#10183)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../DockerModelRunnerContainer.java           | 35 ++++++++++++++++
 .../DockerModelRunnerContainerTest.java       | 41 +++++++++++++++++++
 docs/modules/docker_model_runner.md           | 41 +++++++++++++++++++
 mkdocs.yml                                    |  1 +
 4 files changed, 118 insertions(+)
 create mode 100644 core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
 create mode 100644 docs/modules/docker_model_runner.md

diff --git a/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
new file mode 100644
index 00000000000..8ce2adbc319
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
@@ -0,0 +1,35 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers proxy container for the Docker Model Runner service
+ * provided by Docker Desktop.
+ * <p>
+ * Supported images: {@code alpine/socat}
+ * <p>
+ * Exposed ports: 80
+ */
+public class DockerModelRunnerContainer extends SocatContainer {
+
+    private static final String MODEL_RUNNER_ENDPOINT = "model-runner.docker.internal";
+
+    public DockerModelRunnerContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public DockerModelRunnerContainer(DockerImageName image) {
+        super(image);
+        withTarget(80, MODEL_RUNNER_ENDPOINT);
+        waitingFor(Wait.forHttp("/").forResponsePredicate(res -> res.contains("The service is running")));
+    }
+
+    public String getBaseEndpoint() {
+        return "http://" + getHost() + ":" + getMappedPort(80);
+    }
+
+    public String getOpenAIEndpoint() {
+        return getBaseEndpoint() + "/engines";
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java b/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
new file mode 100644
index 00000000000..dfe9df9e905
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
@@ -0,0 +1,41 @@
+package org.testcontainers.containers;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
+public class DockerModelRunnerContainerTest {
+
+    @Test
+    public void pullsModelAndExposesInference() {
+        assumeThat(System.getenv("CI")).isNull();
+
+        String modelName = "ai/smollm2:360M-Q4_K_M";
+
+        try (
+            // container {
+            DockerModelRunnerContainer dmr = new DockerModelRunnerContainer("alpine/socat:1.7.4.3-r0")
+            // }
+        ) {
+            dmr.start();
+
+            // pullModel {
+            RestAssured
+                .given()
+                .body(String.format("{\"from\":\"%s\"}", modelName))
+                .post(dmr.getBaseEndpoint() + "/models/create")
+                .then()
+                .statusCode(200);
+            // }
+
+            Response modelResponse = RestAssured.get(dmr.getBaseEndpoint() + "/models").thenReturn();
+            assertThat(modelResponse.body().jsonPath().getList("tags.flatten()")).contains(modelName);
+
+            Response openAiResponse = RestAssured.get(dmr.getOpenAIEndpoint() + "/v1/models").prettyPeek().thenReturn();
+            assertThat(openAiResponse.body().jsonPath().getList("data.id")).contains(modelName);
+        }
+    }
+}
diff --git a/docs/modules/docker_model_runner.md b/docs/modules/docker_model_runner.md
new file mode 100644
index 00000000000..b610279e93b
--- /dev/null
+++ b/docs/modules/docker_model_runner.md
@@ -0,0 +1,41 @@
+# Docker Model Runner
+
+This module helps connect to [Docker Model Runner](https://docs.docker.com/desktop/features/model-runner/)
+provided by Docker Desktop 4.40.0.
+
+## DockerModelRunner's usage examples
+
+You can start a Docker Model Runner proxy container instance from any Java application by using:
+
+<!--codeinclude-->
+[Create a DockerModelRunnerContainer](../../core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+### Pulling the model
+
+Pulling the model is as simple as:
+
+<!--codeinclude-->
+[Pull model](../../core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java) inside_block:pullModel
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+*Docker Model Runner support is part of the core Testcontainers library.*
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 536f73a0603..88aa92efbe8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,6 +82,7 @@ nav:
           - modules/chromadb.md
           - modules/consul.md
           - modules/docker_compose.md
+          - modules/docker_model_runner.md
           - modules/elasticsearch.md
           - modules/gcloud.md
           - modules/grafana.md

From 3d5e7ff5ffe498408d7c1ee11a807e9d8d048276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 22 Apr 2025 14:04:47 -0500
Subject: [PATCH 4199/4969] Polish DockerModelRunnerContainer

---
 .../containers/DockerModelRunnerContainer.java              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
index 8ce2adbc319..43b0239eee7 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
@@ -15,18 +15,20 @@ public class DockerModelRunnerContainer extends SocatContainer {
 
     private static final String MODEL_RUNNER_ENDPOINT = "model-runner.docker.internal";
 
+    private static final int PORT = 80;
+
     public DockerModelRunnerContainer(String image) {
         this(DockerImageName.parse(image));
     }
 
     public DockerModelRunnerContainer(DockerImageName image) {
         super(image);
-        withTarget(80, MODEL_RUNNER_ENDPOINT);
+        withTarget(PORT, MODEL_RUNNER_ENDPOINT);
         waitingFor(Wait.forHttp("/").forResponsePredicate(res -> res.contains("The service is running")));
     }
 
     public String getBaseEndpoint() {
-        return "http://" + getHost() + ":" + getMappedPort(80);
+        return "http://" + getHost() + ":" + getMappedPort(PORT);
     }
 
     public String getOpenAIEndpoint() {

From 705d59b7042c2a7a8e69a2c1584c513d1dd0eba4 Mon Sep 17 00:00:00 2001
From: Jay DeLuca <jaydeluca4@gmail.com>
Date: Wed, 23 Apr 2025 08:13:05 -0400
Subject: [PATCH 4200/4969] Expose Tempo in LgtmContainer (#10192)

---
 modules/grafana/build.gradle                  |  5 ++
 .../grafana/LgtmStackContainer.java           |  9 ++-
 .../grafana/LgtmStackContainerTest.java       | 61 ++++++++++++++++++-
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 34a45cc404b..dbbcb7e1ded 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -7,6 +7,11 @@ dependencies {
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
+
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.49.0')
+    testImplementation 'io.opentelemetry:opentelemetry-api'
+    testImplementation 'io.opentelemetry:opentelemetry-sdk'
+    testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
 }
 
 tasks.japicmp {
diff --git a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
index 595d016772a..00299ac27f2 100644
--- a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
+++ b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
@@ -14,6 +14,7 @@
  * Exposed ports:
  * <ul>
  *     <li>Grafana: 3000</li>
+ *     <li>Tempo: 3200</li>
  *     <li>OTel Http: 4317</li>
  *     <li>OTel Grpc: 4318</li>
  *     <li>Prometheus: 9090</li>
@@ -30,6 +31,8 @@ public class LgtmStackContainer extends GenericContainer<LgtmStackContainer> {
 
     private static final int OTLP_HTTP_PORT = 4318;
 
+    private static final int TEMPO_PORT = 3200;
+
     private static final int PROMETHEUS_PORT = 9090;
 
     public LgtmStackContainer(String image) {
@@ -39,7 +42,7 @@ public LgtmStackContainer(String image) {
     public LgtmStackContainer(DockerImageName image) {
         super(image);
         image.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-        withExposedPorts(GRAFANA_PORT, OTLP_GRPC_PORT, OTLP_HTTP_PORT, PROMETHEUS_PORT);
+        withExposedPorts(GRAFANA_PORT, TEMPO_PORT, OTLP_GRPC_PORT, OTLP_HTTP_PORT, PROMETHEUS_PORT);
         waitingFor(
             Wait.forLogMessage(".*The OpenTelemetry collector and the Grafana LGTM stack are up and running.*\\s", 1)
         );
@@ -54,6 +57,10 @@ public String getOtlpGrpcUrl() {
         return "http://" + getHost() + ":" + getMappedPort(OTLP_GRPC_PORT);
     }
 
+    public String getTempoUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(TEMPO_PORT);
+    }
+
     public String getOtlpHttpUrl() {
         return "http://" + getHost() + ":" + getMappedPort(OTLP_HTTP_PORT);
     }
diff --git a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
index f5efe628f3c..a2b4f5a221a 100644
--- a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
+++ b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
@@ -5,6 +5,15 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.registry.otlp.OtlpConfig;
 import io.micrometer.registry.otlp.OtlpMeterRegistry;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
 import org.awaitility.Awaitility;
@@ -12,15 +21,16 @@
 import uk.org.webcompere.systemstubs.SystemStubs;
 
 import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class LgtmStackContainerTest {
 
     @Test
-    public void shouldPublishMetric() throws Exception {
+    public void shouldPublishMetricAndTrace() throws Exception {
         try ( // container {
-            LgtmStackContainer lgtm = new LgtmStackContainer("grafana/otel-lgtm:0.6.0")
+            LgtmStackContainer lgtm = new LgtmStackContainer("grafana/otel-lgtm:0.11.0")
             // }
         ) {
             lgtm.start();
@@ -29,7 +39,9 @@ public void shouldPublishMetric() throws Exception {
                 .get(String.format("http://%s:%s/api/health", lgtm.getHost(), lgtm.getMappedPort(3000)))
                 .jsonPath()
                 .get("version");
-            assertThat(version).isEqualTo("11.0.0");
+            assertThat(version).isEqualTo("11.6.0");
+
+            generateTrace(lgtm);
 
             OtlpConfig otlpConfig = createOtlpConfig(lgtm);
             MeterRegistry meterRegistry = SystemStubs
@@ -52,9 +64,52 @@ public void shouldPublishMetric() throws Exception {
                     assertThat(response.getStatusCode()).isEqualTo(200);
                     assertThat(response.body().jsonPath().getList("data.result[0].value")).contains("2");
                 });
+
+            Awaitility
+                .given()
+                .pollInterval(Duration.ofSeconds(2))
+                .atMost(Duration.ofSeconds(5))
+                .ignoreExceptions()
+                .untilAsserted(() -> {
+                    Response response = RestAssured
+                        .given()
+                        .get(String.format("%s/api/search", lgtm.getTempoUrl()))
+                        .prettyPeek()
+                        .thenReturn();
+                    assertThat(response.getStatusCode()).isEqualTo(200);
+                    assertThat(response.body().jsonPath().getString("traces[0].rootServiceName"))
+                        .isEqualTo("test-service");
+                });
         }
     }
 
+    private void generateTrace(LgtmStackContainer lgtm) {
+        OtlpGrpcSpanExporter exporter = OtlpGrpcSpanExporter
+            .builder()
+            .setTimeout(Duration.ofSeconds(1))
+            .setEndpoint(lgtm.getOtlpGrpcUrl())
+            .build();
+
+        BatchSpanProcessor spanProcessor = BatchSpanProcessor
+            .builder(exporter)
+            .setScheduleDelay(500, TimeUnit.MILLISECONDS)
+            .build();
+
+        SdkTracerProvider tracerProvider = SdkTracerProvider
+            .builder()
+            .addSpanProcessor(spanProcessor)
+            .setResource(Resource.create(Attributes.of(AttributeKey.stringKey("service.name"), "test-service")))
+            .build();
+
+        OpenTelemetrySdk openTelemetry = OpenTelemetrySdk.builder().setTracerProvider(tracerProvider).build();
+
+        Tracer tracer = openTelemetry.getTracer("test");
+        Span span = tracer.spanBuilder("test").startSpan();
+        span.end();
+
+        openTelemetry.shutdown();
+    }
+
     private static OtlpConfig createOtlpConfig(LgtmStackContainer lgtm) {
         return new OtlpConfig() {
             @Override

From 8d954b5f64ccb01798c0e0e8d43bd3e034d36f46 Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Thu, 24 Apr 2025 00:09:56 +0100
Subject: [PATCH 4201/4969] Fix connection leak in JdbcDatabaseDelegate (#9662)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../jdbc/JdbcDatabaseDelegate.java            |  7 +-
 .../jdbc/JdbcDatabaseDelegateTest.java        | 87 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java

diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
index 3c33eba8d5b..24c18944292 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
@@ -6,6 +6,7 @@
 import org.testcontainers.exception.ConnectionCreationException;
 import org.testcontainers.ext.ScriptUtils;
 
+import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
@@ -17,6 +18,8 @@ public class JdbcDatabaseDelegate extends AbstractDatabaseDelegate<Statement> {
 
     private JdbcDatabaseContainer container;
 
+    private Connection connection;
+
     private String queryString;
 
     public JdbcDatabaseDelegate(JdbcDatabaseContainer container, String queryString) {
@@ -27,7 +30,8 @@ public JdbcDatabaseDelegate(JdbcDatabaseContainer container, String queryString)
     @Override
     protected Statement createNewConnection() {
         try {
-            return container.createConnection(queryString).createStatement();
+            connection = container.createConnection(queryString);
+            return connection.createStatement();
         } catch (SQLException e) {
             log.error("Could not obtain JDBC connection");
             throw new ConnectionCreationException("Could not obtain JDBC connection", e);
@@ -65,6 +69,7 @@ public void execute(
     protected void closeConnectionQuietly(Statement statement) {
         try {
             statement.close();
+            connection.close();
         } catch (Exception e) {
             log.error("Could not close JDBC connection", e);
         }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java
new file mode 100644
index 00000000000..f3cf2d01d40
--- /dev/null
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java
@@ -0,0 +1,87 @@
+package org.testcontainers.jdbc;
+
+import lombok.NonNull;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class JdbcDatabaseDelegateTest {
+
+    @Test
+    public void testLeakedConnections() {
+        final JdbcDatabaseContainerStub stub = new JdbcDatabaseContainerStub(DockerImageName.parse("something"));
+        try (JdbcDatabaseDelegate delegate = new JdbcDatabaseDelegate(stub, "")) {
+            delegate.execute("foo", null, 0, false, false);
+        }
+        Assert.assertEquals(0, stub.openConnectionsList.size());
+    }
+
+    static class JdbcDatabaseContainerStub extends JdbcDatabaseContainer {
+
+        List<Connection> openConnectionsList = new ArrayList<>();
+
+        public JdbcDatabaseContainerStub(@NonNull DockerImageName dockerImageName) {
+            super(dockerImageName);
+        }
+
+        @Override
+        public String getDriverClassName() {
+            return null;
+        }
+
+        @Override
+        public String getJdbcUrl() {
+            return null;
+        }
+
+        @Override
+        public String getUsername() {
+            return null;
+        }
+
+        @Override
+        public String getPassword() {
+            return null;
+        }
+
+        @Override
+        protected String getTestQueryString() {
+            return null;
+        }
+
+        @Override
+        public boolean isRunning() {
+            return true;
+        }
+
+        @Override
+        public Connection createConnection(String queryString) throws NoDriverFoundException, SQLException {
+            final Connection connection = mock(Connection.class);
+            openConnectionsList.add(connection);
+            when(connection.createStatement()).thenReturn(mock(Statement.class));
+            connection.close();
+            Mockito.doAnswer(ignore -> openConnectionsList.remove(connection)).when(connection).close();
+            return connection;
+        }
+
+        @Override
+        protected Logger logger() {
+            return mock(Logger.class);
+        }
+
+        @Override
+        public void setDockerImageName(@NonNull String dockerImageName) {}
+    }
+}

From 116089376c7ee76725b8ee856db9a51ae31a78cf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 23 Apr 2025 18:27:14 -0600
Subject: [PATCH 4202/4969] [create-pull-request] automated change (#10194)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 45f25ec96f2..493f5a165ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.6
+testcontainers.version=1.21.0

From 76a6917b845abf533a841e5bd7c3b50d6475f307 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 23 Apr 2025 18:27:40 -0600
Subject: [PATCH 4203/4969] [create-pull-request] automated change (#10193)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 88aa92efbe8..993d4cd219c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -140,4 +140,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.6
+    latest_version: 1.21.0

From 1cf350cd244fa62f5a4358a2da74c558f1b86909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 23 Apr 2025 18:32:42 -0600
Subject: [PATCH 4204/4969] Cleanup japicmp excludes

---
 modules/grafana/build.gradle | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index dbbcb7e1ded..d5c815018d0 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -13,9 +13,3 @@ dependencies {
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
 }
-
-tasks.japicmp {
-    methodExcludes = [
-        "org.testcontainers.grafana.LgtmStackContainer#getPromehteusHttpUrl()"
-    ]
-}

From 77154e15ddde950565ab358f763917c4007c1be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 24 Apr 2025 15:11:34 -0600
Subject: [PATCH 4205/4969] Update checkstyle version to 10.23.0 (#10196)

---
 build.gradle            | 2 +-
 examples/build.gradle   | 2 +-
 smoke-test/build.gradle | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f4bad6e835..e52732e8a82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,7 +135,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "10.12.4"
+        toolVersion = "10.23.0"
         configFile = rootProject.file('config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/examples/build.gradle b/examples/build.gradle
index 821f2b4a1fc..e80815cdae6 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -25,7 +25,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "10.12.4"
+        toolVersion = "10.23.0"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
index 197452e43c5..781d6e87792 100644
--- a/smoke-test/build.gradle
+++ b/smoke-test/build.gradle
@@ -25,7 +25,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "10.12.4"
+        toolVersion = "10.23.0"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
     }
 }

From 81851bf2522c1516e8187cf8babf9bd53a36d2a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 May 2025 22:19:25 +0000
Subject: [PATCH 4206/4969] Bump redis.clients:jedis from 5.1.5 to 6.0.0 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.5 to 6.0.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.5...v6.0.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index d28b2a0cc66..3fda7078fa4 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.1.5'
+    implementation 'redis.clients:jedis:6.0.0'
     implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 782416a239b..aad82b6ba06 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:5.1.5'
+    implementation 'redis.clients:jedis:6.0.0'
     implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 4b73e1125c6..62a341de003 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.1.5'
+    implementation 'redis.clients:jedis:6.0.0'
     implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From f28fc173fe59f151b4048ca7ee1531c22bcbafb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 May 2025 22:28:23 +0000
Subject: [PATCH 4207/4969] Bump commons-io:commons-io from 2.17.0 to 2.19.0 in
 /modules/hivemq

Bumps commons-io:commons-io from 2.17.0 to 2.19.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-version: 2.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1c748a8d2e3..4e2c482b7f8 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.1.0")
 
     shaded("org.apache.commons:commons-lang3:3.17.0")
-    shaded("commons-io:commons-io:2.17.0")
+    shaded("commons-io:commons-io:2.19.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From 59b4c5939262afd125866cf67ea868860e3c6660 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 22:56:49 +0000
Subject: [PATCH 4208/4969] Bump redis.clients:jedis from 5.1.5 to 6.0.0 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.5 to 6.0.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.5...v6.0.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 4dad6c61131..b4459af76ed 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:5.1.5'
+    testImplementation 'redis.clients:jedis:6.0.0'
     testImplementation 'com.rabbitmq:amqp-client:5.22.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From a2197e102cd042243d7b2cc210470f3fa6ed15eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 5 May 2025 20:55:00 -0600
Subject: [PATCH 4209/4969] Add support to pull model for
 DockerModelRunnerContainer (#10253)

---
 .../DockerModelRunnerContainer.java           | 52 +++++++++++++++++++
 .../DockerModelRunnerContainerTest.java       | 26 ++++++----
 2 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
index 43b0239eee7..145b4e609ad 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
@@ -1,8 +1,18 @@
 package org.testcontainers.containers;
 
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
 /**
  * Testcontainers proxy container for the Docker Model Runner service
  * provided by Docker Desktop.
@@ -11,12 +21,15 @@
  * <p>
  * Exposed ports: 80
  */
+@Slf4j
 public class DockerModelRunnerContainer extends SocatContainer {
 
     private static final String MODEL_RUNNER_ENDPOINT = "model-runner.docker.internal";
 
     private static final int PORT = 80;
 
+    private String model;
+
     public DockerModelRunnerContainer(String image) {
         this(DockerImageName.parse(image));
     }
@@ -27,6 +40,45 @@ public DockerModelRunnerContainer(DockerImageName image) {
         waitingFor(Wait.forHttp("/").forResponsePredicate(res -> res.contains("The service is running")));
     }
 
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        if (this.model != null) {
+            logger().info("Pulling model: {}. Please be patient.", this.model);
+
+            String url = getBaseEndpoint() + "/models/create";
+            String payload = String.format("{\"from\": \"%s\"}", this.model);
+
+            try {
+                HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+                connection.setRequestMethod("POST");
+                connection.setRequestProperty("Content-Type", "application/json");
+                connection.setDoOutput(true);
+
+                try (OutputStream os = connection.getOutputStream()) {
+                    os.write(payload.getBytes());
+                    os.flush();
+                }
+
+                try (
+                    BufferedReader br = new BufferedReader(
+                        new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)
+                    )
+                ) {
+                    while (br.readLine() != null) {}
+                }
+                connection.disconnect();
+            } catch (IOException e) {
+                logger().error("Failed to pull model {}: {}", this.model, e);
+            }
+            logger().info("Finished pulling model: {}", this.model);
+        }
+    }
+
+    public DockerModelRunnerContainer withModel(String model) {
+        this.model = model;
+        return this;
+    }
+
     public String getBaseEndpoint() {
         return "http://" + getHost() + ":" + getMappedPort(PORT);
     }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java b/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
index dfe9df9e905..c04c0159e51 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
@@ -10,11 +10,9 @@
 public class DockerModelRunnerContainerTest {
 
     @Test
-    public void pullsModelAndExposesInference() {
+    public void checkStatus() {
         assumeThat(System.getenv("CI")).isNull();
 
-        String modelName = "ai/smollm2:360M-Q4_K_M";
-
         try (
             // container {
             DockerModelRunnerContainer dmr = new DockerModelRunnerContainer("alpine/socat:1.7.4.3-r0")
@@ -22,14 +20,24 @@ public void pullsModelAndExposesInference() {
         ) {
             dmr.start();
 
+            Response modelResponse = RestAssured.get(dmr.getBaseEndpoint() + "/status").thenReturn();
+            assertThat(modelResponse.body().asString()).contains("The service is running");
+        }
+    }
+
+    @Test
+    public void pullsModelAndExposesInference() {
+        assumeThat(System.getenv("CI")).isNull();
+
+        String modelName = "ai/smollm2:360M-Q4_K_M";
+
+        try (
             // pullModel {
-            RestAssured
-                .given()
-                .body(String.format("{\"from\":\"%s\"}", modelName))
-                .post(dmr.getBaseEndpoint() + "/models/create")
-                .then()
-                .statusCode(200);
+            DockerModelRunnerContainer dmr = new DockerModelRunnerContainer("alpine/socat:1.7.4.3-r0")
+                .withModel(modelName)
             // }
+        ) {
+            dmr.start();
 
             Response modelResponse = RestAssured.get(dmr.getBaseEndpoint() + "/models").thenReturn();
             assertThat(modelResponse.body().jsonPath().getList("tags.flatten()")).contains(modelName);

From 8ad5c413ab961667d600e0ea3727c9368358c495 Mon Sep 17 00:00:00 2001
From: Jay DeLuca <jaydeluca4@gmail.com>
Date: Wed, 7 May 2025 11:02:03 -0400
Subject: [PATCH 4210/4969] Expose Loki in LgtmContainer (#10256)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../grafana/LgtmStackContainer.java           |   8 +-
 .../grafana/LgtmStackContainerTest.java       | 115 +++++++++++-------
 2 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
index 00299ac27f2..52443d7ba8a 100644
--- a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
+++ b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
@@ -31,6 +31,8 @@ public class LgtmStackContainer extends GenericContainer<LgtmStackContainer> {
 
     private static final int OTLP_HTTP_PORT = 4318;
 
+    private static final int LOKI_PORT = 3100;
+
     private static final int TEMPO_PORT = 3200;
 
     private static final int PROMETHEUS_PORT = 9090;
@@ -42,7 +44,7 @@ public LgtmStackContainer(String image) {
     public LgtmStackContainer(DockerImageName image) {
         super(image);
         image.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-        withExposedPorts(GRAFANA_PORT, TEMPO_PORT, OTLP_GRPC_PORT, OTLP_HTTP_PORT, PROMETHEUS_PORT);
+        withExposedPorts(GRAFANA_PORT, TEMPO_PORT, LOKI_PORT, OTLP_GRPC_PORT, OTLP_HTTP_PORT, PROMETHEUS_PORT);
         waitingFor(
             Wait.forLogMessage(".*The OpenTelemetry collector and the Grafana LGTM stack are up and running.*\\s", 1)
         );
@@ -61,6 +63,10 @@ public String getTempoUrl() {
         return "http://" + getHost() + ":" + getMappedPort(TEMPO_PORT);
     }
 
+    public String getLokiUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(LOKI_PORT);
+    }
+
     public String getOtlpHttpUrl() {
         return "http://" + getHost() + ":" + getMappedPort(OTLP_HTTP_PORT);
     }
diff --git a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
index a2b4f5a221a..ba4fb94856c 100644
--- a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
+++ b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
@@ -7,10 +7,14 @@
 import io.micrometer.registry.otlp.OtlpMeterRegistry;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter;
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.logs.SdkLoggerProvider;
+import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
@@ -28,20 +32,52 @@
 public class LgtmStackContainerTest {
 
     @Test
-    public void shouldPublishMetricAndTrace() throws Exception {
+    public void shouldPublishMetricsTracesAndLogs() throws Exception {
         try ( // container {
-            LgtmStackContainer lgtm = new LgtmStackContainer("grafana/otel-lgtm:0.11.0")
+            LgtmStackContainer lgtm = new LgtmStackContainer("grafana/otel-lgtm:0.11.1")
             // }
         ) {
             lgtm.start();
 
+            OtlpGrpcSpanExporter spanExporter = OtlpGrpcSpanExporter
+                .builder()
+                .setTimeout(Duration.ofSeconds(1))
+                .setEndpoint(lgtm.getOtlpGrpcUrl())
+                .build();
+
+            OtlpGrpcLogRecordExporter logExporter = OtlpGrpcLogRecordExporter
+                .builder()
+                .setTimeout(Duration.ofSeconds(1))
+                .setEndpoint(lgtm.getOtlpGrpcUrl())
+                .build();
+
+            BatchSpanProcessor spanProcessor = BatchSpanProcessor
+                .builder(spanExporter)
+                .setScheduleDelay(500, TimeUnit.MILLISECONDS)
+                .build();
+
+            SdkTracerProvider tracerProvider = SdkTracerProvider
+                .builder()
+                .addSpanProcessor(spanProcessor)
+                .setResource(Resource.create(Attributes.of(AttributeKey.stringKey("service.name"), "test-service")))
+                .build();
+
+            SdkLoggerProvider loggerProvider = SdkLoggerProvider
+                .builder()
+                .addLogRecordProcessor(SimpleLogRecordProcessor.create(logExporter))
+                .build();
+
+            OpenTelemetrySdk openTelemetry = OpenTelemetrySdk
+                .builder()
+                .setTracerProvider(tracerProvider)
+                .setLoggerProvider(loggerProvider)
+                .build();
+
             String version = RestAssured
                 .get(String.format("http://%s:%s/api/health", lgtm.getHost(), lgtm.getMappedPort(3000)))
                 .jsonPath()
                 .get("version");
-            assertThat(version).isEqualTo("11.6.0");
-
-            generateTrace(lgtm);
+            assertThat(version).isEqualTo("12.0.0");
 
             OtlpConfig otlpConfig = createOtlpConfig(lgtm);
             MeterRegistry meterRegistry = SystemStubs
@@ -49,65 +85,54 @@ public void shouldPublishMetricAndTrace() throws Exception {
                 .execute(() -> new OtlpMeterRegistry(otlpConfig, Clock.SYSTEM));
             Counter.builder("test.counter").register(meterRegistry).increment(2);
 
+            Logger logger = openTelemetry.getSdkLoggerProvider().loggerBuilder("test").build();
+            logger
+                .logRecordBuilder()
+                .setBody("Test log!")
+                .setAttribute(AttributeKey.stringKey("job"), "test-job")
+                .emit();
+
+            Tracer tracer = openTelemetry.getTracer("test");
+            Span span = tracer.spanBuilder("test").startSpan();
+            span.end();
+
             Awaitility
                 .given()
                 .pollInterval(Duration.ofSeconds(2))
                 .atMost(Duration.ofSeconds(5))
                 .ignoreExceptions()
                 .untilAsserted(() -> {
-                    Response response = RestAssured
+                    Response metricResponse = RestAssured
                         .given()
                         .queryParam("query", "test_counter_total{job=\"testcontainers\"}")
                         .get(String.format("%s/api/v1/query", lgtm.getPrometheusHttpUrl()))
                         .prettyPeek()
                         .thenReturn();
-                    assertThat(response.getStatusCode()).isEqualTo(200);
-                    assertThat(response.body().jsonPath().getList("data.result[0].value")).contains("2");
-                });
+                    assertThat(metricResponse.getStatusCode()).isEqualTo(200);
+                    assertThat(metricResponse.body().jsonPath().getList("data.result[0].value")).contains("2");
 
-            Awaitility
-                .given()
-                .pollInterval(Duration.ofSeconds(2))
-                .atMost(Duration.ofSeconds(5))
-                .ignoreExceptions()
-                .untilAsserted(() -> {
-                    Response response = RestAssured
+                    Response logResponse = RestAssured
+                        .given()
+                        .queryParam("query", "{service_name=\"unknown_service:java\"}")
+                        .get(String.format("%s/loki/api/v1/query_range", lgtm.getLokiUrl()))
+                        .prettyPeek()
+                        .thenReturn();
+                    assertThat(logResponse.getStatusCode()).isEqualTo(200);
+                    assertThat(logResponse.body().jsonPath().getString("data.result[0].values[0][1]"))
+                        .isEqualTo("Test log!");
+
+                    Response traceResponse = RestAssured
                         .given()
                         .get(String.format("%s/api/search", lgtm.getTempoUrl()))
                         .prettyPeek()
                         .thenReturn();
-                    assertThat(response.getStatusCode()).isEqualTo(200);
-                    assertThat(response.body().jsonPath().getString("traces[0].rootServiceName"))
+                    assertThat(traceResponse.getStatusCode()).isEqualTo(200);
+                    assertThat(traceResponse.body().jsonPath().getString("traces[0].rootServiceName"))
                         .isEqualTo("test-service");
                 });
-        }
-    }
-
-    private void generateTrace(LgtmStackContainer lgtm) {
-        OtlpGrpcSpanExporter exporter = OtlpGrpcSpanExporter
-            .builder()
-            .setTimeout(Duration.ofSeconds(1))
-            .setEndpoint(lgtm.getOtlpGrpcUrl())
-            .build();
 
-        BatchSpanProcessor spanProcessor = BatchSpanProcessor
-            .builder(exporter)
-            .setScheduleDelay(500, TimeUnit.MILLISECONDS)
-            .build();
-
-        SdkTracerProvider tracerProvider = SdkTracerProvider
-            .builder()
-            .addSpanProcessor(spanProcessor)
-            .setResource(Resource.create(Attributes.of(AttributeKey.stringKey("service.name"), "test-service")))
-            .build();
-
-        OpenTelemetrySdk openTelemetry = OpenTelemetrySdk.builder().setTracerProvider(tracerProvider).build();
-
-        Tracer tracer = openTelemetry.getTracer("test");
-        Span span = tracer.spanBuilder("test").startSpan();
-        span.end();
-
-        openTelemetry.shutdown();
+            openTelemetry.close();
+        }
     }
 
     private static OtlpConfig createOtlpConfig(LgtmStackContainer lgtm) {

From b3bcf36f564e44a5d3e8f9700272cf8517740bd3 Mon Sep 17 00:00:00 2001
From: Maxime Wiewiora <48218208+maximevw@users.noreply.github.com>
Date: Mon, 12 May 2025 19:18:30 +0200
Subject: [PATCH 4211/4969] Use generic init script filename when copying it
 into a CassandraContainer (#9606)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9574

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../cassandra/CassandraContainer.java         | 38 +++++++++----------
 .../cassandra/CassandraContainerTest.java     | 11 ++++++
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
index c687c63eaa3..73a0c83443e 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
@@ -9,10 +9,7 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
-import java.io.File;
 import java.net.InetSocketAddress;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.Optional;
 
 /**
@@ -30,6 +27,8 @@ public class CassandraContainer extends GenericContainer<CassandraContainer> {
 
     private static final String DEFAULT_LOCAL_DATACENTER = "datacenter1";
 
+    private static final String DEFAULT_INIT_SCRIPT_FILENAME = "init.cql";
+
     private static final String CONTAINER_CONFIG_LOCATION = "/etc/cassandra";
 
     private static final String USERNAME = "cassandra";
@@ -80,26 +79,25 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
      * Load init script content and apply it to the database if initScriptPath is set
      */
     private void runInitScriptIfRequired() {
-        if (initScriptPath != null) {
+        if (this.initScriptPath != null) {
             try {
-                URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
-                if (resource == null) {
-                    logger().warn("Could not load classpath init script: {}", initScriptPath);
-                    throw new ScriptLoadException(
-                        "Could not load classpath init script: " + initScriptPath + ". Resource not found."
-                    );
-                }
-                // The init script is executed as is by the cqlsh command, so copy it into the container.
-                String targetInitScriptName = new File(resource.toURI()).getName();
-                copyFileToContainer(MountableFile.forClasspathResource(initScriptPath), targetInitScriptName);
-                new CassandraDatabaseDelegate(this).execute(null, targetInitScriptName, -1, false, false);
-            } catch (URISyntaxException e) {
-                logger().warn("Could not copy init script into container: {}", initScriptPath);
-                throw new ScriptLoadException("Could not copy init script into container: " + initScriptPath, e);
+                final MountableFile originalInitScript = MountableFile.forClasspathResource(this.initScriptPath);
+                // The init script is executed as is by the cqlsh command, so copy it into the container. The name
+                // of the script is generic since it's not important to keep the original name.
+                copyFileToContainer(originalInitScript, DEFAULT_INIT_SCRIPT_FILENAME);
+                new CassandraDatabaseDelegate(this).execute(null, DEFAULT_INIT_SCRIPT_FILENAME, -1, false, false);
+            } catch (IllegalArgumentException e) {
+                // MountableFile.forClasspathResource will throw an IllegalArgumentException if the resource cannot
+                // be found.
+                logger().warn("Could not load classpath init script: {}", this.initScriptPath);
+                throw new ScriptLoadException(
+                    "Could not load classpath init script: " + this.initScriptPath + ". Resource not found.",
+                    e
+                );
             } catch (ScriptUtils.ScriptStatementFailedException e) {
-                logger().error("Error while executing init script: {}", initScriptPath, e);
+                logger().error("Error while executing init script: {}", this.initScriptPath, e);
                 throw new ScriptUtils.UncategorizedScriptException(
-                    "Error while executing init script: " + initScriptPath,
+                    "Error while executing init script: " + this.initScriptPath,
                     e
                 );
             }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
index 632966d1bb3..d156a28ef0c 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
@@ -8,6 +8,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 public class CassandraContainerTest {
 
@@ -81,6 +82,16 @@ public void testInitScript() {
         }
     }
 
+    @Test
+    public void testNonexistentInitScript() {
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withInitScript("unknown_script.cql")
+        ) {
+            assertThat(catchThrowable(cassandraContainer::start)).isInstanceOf(ContainerLaunchException.class);
+        }
+    }
+
     @Test
     public void testInitScriptWithRequiredAuthentication() {
         try (

From 460a1a5b84c2cfa7851b23b16469ae91ee066cc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 22:44:48 +0000
Subject: [PATCH 4212/4969] Bump slackapi/slack-github-action from 1.27.0 to
 2.1.0

Bumps [slackapi/slack-github-action](https://github.com/slackapi/slack-github-action) from 1.27.0 to 2.1.0.
- [Release notes](https://github.com/slackapi/slack-github-action/releases)
- [Commits](https://github.com/slackapi/slack-github-action/compare/v1.27.0...v2.1.0)

---
updated-dependencies:
- dependency-name: slackapi/slack-github-action
  dependency-version: 2.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/moby-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 28529f882c6..7c25a3bb8cf 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Notify to Slack on failures
         if: failure()
         id: slack
-        uses: slackapi/slack-github-action@v1.27.0
+        uses: slackapi/slack-github-action@v2.1.0
         with:
           payload: |
             {

From 2e0ef57b77d74ca25b01d7c18a7c0445ac743049 Mon Sep 17 00:00:00 2001
From: julianladisch <julianladisch@users.noreply.github.com>
Date: Tue, 20 May 2025 19:39:23 +0200
Subject: [PATCH 4213/4969] Fix register listener for kafka docs (#10268)

---
 docs/modules/kafka.md                                           | 2 +-
 .../java/org/testcontainers/containers/KafkaContainerTest.java  | 2 --
 .../test/java/org/testcontainers/kafka/KafkaContainerTest.java  | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 6e33cc76b2d..cd2a660c8e0 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -85,7 +85,7 @@ There are scenarios where additional listeners are needed because the consumer/p
 container in the same network or a different process where the port to connect differs from the default exposed port. E.g [Toxiproxy](../../modules/toxiproxy/).
 
 <!--codeinclude-->
-[Register additional listener](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:registerListener
+[Register additional listener](../../modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java) inside_block:registerListener
 <!--/codeinclude-->
 
 Container defined in the same network:
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index f2a86020701..49b21108da8 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -189,11 +189,9 @@ public void testKraftPrecedenceOverEmbeddedZookeeper() throws Exception {
     public void testUsageWithListener() throws Exception {
         try (
             Network network = Network.newNetwork();
-            // registerListener {
             KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE)
                 .withListener(() -> "kafka:19092")
                 .withNetwork(network);
-            // }
             // createKCatContainer {
             GenericContainer<?> kcat = new GenericContainer<>("confluentinc/cp-kcat:7.9.0")
                 .withCreateContainerCmdModifier(cmd -> {
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
index b1764d3b522..e81b52574ef 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
@@ -25,9 +25,11 @@ public void testUsage() throws Exception {
     public void testUsageWithListener() throws Exception {
         try (
             Network network = Network.newNetwork();
+            // registerListener {
             KafkaContainer kafka = new KafkaContainer("apache/kafka-native:3.8.0")
                 .withListener("kafka:19092")
                 .withNetwork(network);
+            // }
             KCatContainer kcat = new KCatContainer().withNetwork(network)
         ) {
             kafka.start();

From df3ed30a8770d6ccbaf2a017d2e4ade11c0a84dd Mon Sep 17 00:00:00 2001
From: Thiago dos Santos Hora <thiago.santos.hora@gmail.com>
Date: Thu, 29 May 2025 21:46:58 +0200
Subject: [PATCH 4214/4969] Add support to clickhouse JDBC V2 (#10280)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #10279

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/databases/r2dbc.md                       |  2 +-
 modules/clickhouse/build.gradle                       |  8 +++++---
 .../clickhouse/ClickHouseContainer.java               | 11 +++++++++--
 .../java/org/testcontainers/ClickhouseTestImages.java |  2 +-
 .../clickhouse/ClickHouseContainerTest.java           |  7 ++++---
 .../ClickHouseR2DBCDatabaseContainerTest.java         |  4 ++--
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/docs/modules/databases/r2dbc.md b/docs/modules/databases/r2dbc.md
index 055d4ad7b0f..5aded5431ca 100644
--- a/docs/modules/databases/r2dbc.md
+++ b/docs/modules/databases/r2dbc.md
@@ -35,7 +35,7 @@ So that the URL becomes:
 
 #### Using ClickHouse
 
-`r2dbc:tc:clickhouse:///databasename?TC_IMAGE_TAG=21.9.2-alpine`
+`r2dbc:tc:clickhouse:///databasename?TC_IMAGE_TAG=21.11.11-alpine`
 
 #### Using MySQL
 
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 4bec350d6ef..97b8d00d92c 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,12 +5,14 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.0', classifier: 'http')
+    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.0', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.2', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'jdbc-v2', version: '0.7.2', classifier: 'http')
+
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.0', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
 }
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index 78610454728..d3256124de1 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -29,7 +29,9 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     static final Integer NATIVE_PORT = 9000;
 
-    private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
+    private static final String LEGACY_V1_DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
+
+    private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.Driver";
 
     private static final String JDBC_URL_PREFIX = "jdbc:clickhouse://";
 
@@ -78,7 +80,12 @@ public Set<Integer> getLivenessCheckPortNumbers() {
 
     @Override
     public String getDriverClassName() {
-        return DRIVER_CLASS_NAME;
+        try {
+            Class.forName(DRIVER_CLASS_NAME);
+            return DRIVER_CLASS_NAME;
+        } catch (ClassNotFoundException e) {
+            return LEGACY_V1_DRIVER_CLASS_NAME;
+        }
     }
 
     @Override
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
index 76a8ac87c94..eff4e19f70b 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
@@ -3,7 +3,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface ClickhouseTestImages {
-    DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
+    DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.11.11-alpine");
 
     DockerImageName CLICKHOUSE_24_12_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:24.12-alpine");
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
index 85fe361233f..d5389b610c4 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
@@ -13,7 +13,7 @@ public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")) {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11-alpine")) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
@@ -26,11 +26,12 @@ public void testSimple() throws SQLException {
     @Test
     public void customCredentialsWithUrlParams() throws SQLException {
         try (
-            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
+            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11.2-alpine")
                 .withUsername("default")
                 .withPassword("")
                 .withDatabaseName("test")
-                .withUrlParam("max_result_rows", "5")
+                // The new driver uses the prefix `clickhouse_setting_` for session settings
+                .withUrlParam("clickhouse_setting_max_result_rows", "5")
         ) {
             clickhouse.start();
 
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java
index a0333e44f5c..000fff8983a 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java
@@ -12,11 +12,11 @@ protected ConnectionFactoryOptions getOptions(ClickHouseContainer container) {
 
     @Override
     protected String createR2DBCUrl() {
-        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=21.9.2-alpine";
+        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=21.11.11-alpine";
     }
 
     @Override
     protected ClickHouseContainer createContainer() {
-        return new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine");
+        return new ClickHouseContainer("clickhouse/clickhouse-server:21.11.11-alpine");
     }
 }

From 71f4e2e3fc877c5a5a39149b2dbeab3e6aa8f965 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 May 2025 14:46:05 -0600
Subject: [PATCH 4215/4969] [create-pull-request] automated change (#10282)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 493f5a165ed..001fa818184 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.21.0
+testcontainers.version=1.21.1

From 63189c8678f81c8ef4c431e4468ee74640682654 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 May 2025 14:46:28 -0600
Subject: [PATCH 4216/4969] [create-pull-request] automated change (#10281)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 993d4cd219c..65235b7964f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -140,4 +140,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.21.0
+    latest_version: 1.21.1

From ca0a9c2106d3d2162c4f2668203e396ae819f0db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jun 2025 22:47:40 +0000
Subject: [PATCH 4217/4969] Bump com.yugabyte:java-driver-core in
 /modules/yugabytedb

Bumps [com.yugabyte:java-driver-core](https://github.com/yugabyte/cassandra-java-driver) from 4.15.0-yb-2-TESTFIX.0 to 4.19.0-yb-1.
- [Release notes](https://github.com/yugabyte/cassandra-java-driver/releases)
- [Commits](https://github.com/yugabyte/cassandra-java-driver/compare/4.15.0-yb-2-TESTFIX.0...4.19.0-yb-1)

---
updated-dependencies:
- dependency-name: com.yugabyte:java-driver-core
  dependency-version: 4.19.0-yb-1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index cb5d583b4ca..4bf72e46479 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
     testImplementation project(':jdbc-test')
     // YCQL driver
-    testImplementation 'com.yugabyte:java-driver-core:4.15.0-yb-2-TESTFIX.0'
+    testImplementation 'com.yugabyte:java-driver-core:4.19.0-yb-1'
     // YSQL driver
     testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-6'
 }

From a520c6baecaff721fa3635d1d6f6381b8393bb25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:01:12 +0000
Subject: [PATCH 4218/4969] Bump io.grpc:grpc-bom from 1.68.0 to 1.73.0 in
 /modules/qdrant

Bumps [io.grpc:grpc-bom](https://github.com/grpc/grpc-java) from 1.68.0 to 1.73.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.68.0...v1.73.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-bom
  dependency-version: 1.73.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 790b22520ae..00735eae370 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'io.qdrant:client:1.10.0'
-    testImplementation platform('io.grpc:grpc-bom:1.68.0')
+    testImplementation platform('io.grpc:grpc-bom:1.73.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'

From 415a2f42a40cad787549b0ee5b1ea9e369332f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 10 Jun 2025 07:53:20 -0600
Subject: [PATCH 4219/4969] Update ryuk version to 0.12.0 (#10357)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 7175790bb6c..7c75a12b109 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.11.0");
+        super("testcontainers/ryuk:0.12.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 7d8301903a6b45591605fd376702d24fc878a61d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 21:40:04 -0600
Subject: [PATCH 4220/4969] Update Gradle Wrapper from undefined to 8.14.2
 (#10352)

* Update Gradle Wrapper from 8.13 to 8.14.2

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.13 to 8.14.2

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.13 to 8.14.2

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

---------

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 43705 -> 43764 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |   4 ++--
 examples/gradlew.bat                          |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 43705 -> 43764 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |   4 ++--
 gradlew.bat                                   |   4 ++--
 smoke-test/gradle/wrapper/gradle-wrapper.jar  | Bin 43705 -> 43764 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 smoke-test/gradlew                            |   4 ++--
 smoke-test/gradlew.bat                        |   4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644
GIT binary patch
delta 642
zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|**
z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$
z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O%
zFic^X{7^$?^Ho04eona9<j-?s7{5&pn3vAfATT*_p3LN00ny11Rtil1HBXAkTNo_F
zzkq$Rzpyk|IAy*RlYkgpSVT+(EPNd(yipP=9LB_`2v^ayz>n#mGMxKhA=~8B%JN`M
zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n
zVkxF2rjrjWR+_xr6e6@_u@s~2<o%12m_J)HOm?uBn*82c8LYT)i4=33JxI(O%zp{w
z$2u}hws-UZ^W&CEF->uv{9vi*<o>1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v
z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^
z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK
I1x7am0No)LiU0rr

delta 584
zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe
z+ES)HSrVnWLtJ&)lO<X$;;LdIOT<1FeJo;R2=Hd-$lYjX>%hRkV9zl5qqWRt0e;bb
zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ
zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT
z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR
z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN
zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N
z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b
zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts
AA^-pY

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 36e4933e1da..3735f265b95 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/gradlew b/examples/gradlew
index faf93008b77..23d15a93670 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index 9b42019c791..5eed7ee8452 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644
GIT binary patch
delta 642
zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|**
z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$
z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O%
zFic^X{7^$?^Ho04eona9<j-?s7{5&pn3vAfATT*_p3LN00ny11Rtil1HBXAkTNo_F
zzkq$Rzpyk|IAy*RlYkgpSVT+(EPNd(yipP=9LB_`2v^ayz>n#mGMxKhA=~8B%JN`M
zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n
zVkxF2rjrjWR+_xr6e6@_u@s~2<o%12m_J)HOm?uBn*82c8LYT)i4=33JxI(O%zp{w
z$2u}hws-UZ^W&CEF->uv{9vi*<o>1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v
z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^
z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK
I1x7am0No)LiU0rr

delta 584
zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe
z+ES)HSrVnWLtJ&)lO<X$;;LdIOT<1FeJo;R2=Hd-$lYjX>%hRkV9zl5qqWRt0e;bb
zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ
zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT
z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR
z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN
zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N
z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b
zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts
AA^-pY

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a6e21b2ba8..c4a852da571 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionSha256Sum=443c9c8ee2ac1ee0e11881a40f2376d79c66386264a44b24a9f8ca67e633375f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index faf93008b77..23d15a93670 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9b42019c791..5eed7ee8452 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644
GIT binary patch
delta 642
zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|**
z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$
z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O%
zFic^X{7^$?^Ho04eona9<j-?s7{5&pn3vAfATT*_p3LN00ny11Rtil1HBXAkTNo_F
zzkq$Rzpyk|IAy*RlYkgpSVT+(EPNd(yipP=9LB_`2v^ayz>n#mGMxKhA=~8B%JN`M
zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n
zVkxF2rjrjWR+_xr6e6@_u@s~2<o%12m_J)HOm?uBn*82c8LYT)i4=33JxI(O%zp{w
z$2u}hws-UZ^W&CEF->uv{9vi*<o>1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v
z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^
z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK
I1x7am0No)LiU0rr

delta 584
zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe
z+ES)HSrVnWLtJ&)lO<X$;;LdIOT<1FeJo;R2=Hd-$lYjX>%hRkV9zl5qqWRt0e;bb
zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ
zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT
z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR
z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN
zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N
z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b
zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts
AA^-pY

diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
index 36e4933e1da..3735f265b95 100644
--- a/smoke-test/gradle/wrapper/gradle-wrapper.properties
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smoke-test/gradlew b/smoke-test/gradlew
index faf93008b77..23d15a93670 100755
--- a/smoke-test/gradlew
+++ b/smoke-test/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/smoke-test/gradlew.bat b/smoke-test/gradlew.bat
index 9b42019c791..5eed7ee8452 100644
--- a/smoke-test/gradlew.bat
+++ b/smoke-test/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 2bdd2998eaba978496b811090482b3a2193438c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 18 Jun 2025 16:20:24 -0600
Subject: [PATCH 4221/4969] Add DockerMcpGatewayContainer (#10364)

---
 .../containers/DockerMcpGatewayContainer.java | 105 ++++++++++++++++++
 .../DockerMcpGatewayContainerTest.java        |  37 ++++++
 docs/modules/docker_mcp_gateway.md            |  32 ++++++
 mkdocs.yml                                    |   1 +
 4 files changed, 175 insertions(+)
 create mode 100644 core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
 create mode 100644 docs/modules/docker_mcp_gateway.md

diff --git a/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
new file mode 100644
index 00000000000..592b02cb0ad
--- /dev/null
+++ b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
@@ -0,0 +1,105 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Testcontainers implementation of the Docker MCP Gateway container.
+ * <p>
+ * Supported images: {@code docker/agents_gateway}
+ * <p>
+ * Exposed ports: 8811
+ */
+public class DockerMcpGatewayContainer extends GenericContainer<DockerMcpGatewayContainer> {
+
+    private static final String DOCKER_AGENT_GATEWAY_IMAGE = "docker/agents_gateway";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_AGENT_GATEWAY_IMAGE);
+
+    private static final int DEFAULT_PORT = 8811;
+
+    private static final String SECRETS_PATH = "/testcontainers/app/secrets";
+
+    private final List<String> servers = new ArrayList<>();
+
+    private final List<String> tools = new ArrayList<>();
+
+    private final Map<String, String> secrets = new HashMap<>();
+
+    public DockerMcpGatewayContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public DockerMcpGatewayContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        withExposedPorts(DEFAULT_PORT);
+        withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
+        waitingFor(Wait.forLogMessage(".*Start sse server on port.*", 1));
+    }
+
+    @Override
+    protected void configure() {
+        List<String> command = new ArrayList<>();
+        command.add("--transport=sse");
+        for (String server : this.servers) {
+            if (!server.isEmpty()) {
+                command.add("--servers=" + server);
+            }
+        }
+        for (String tool : this.tools) {
+            if (!tool.isEmpty()) {
+                command.add("--tools=" + tool);
+            }
+        }
+        if (this.secrets != null && !this.secrets.isEmpty()) {
+            command.add("--secrets=" + SECRETS_PATH);
+        }
+        withCommand(String.join(" ", command));
+    }
+
+    @Override
+    protected void containerIsCreated(String containerId) {
+        if (this.secrets != null && !this.secrets.isEmpty()) {
+            StringBuilder secretsFile = new StringBuilder();
+            for (Map.Entry<String, String> entry : this.secrets.entrySet()) {
+                secretsFile.append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
+            }
+            copyFileToContainer(Transferable.of(secretsFile.toString()), SECRETS_PATH);
+        }
+    }
+
+    public DockerMcpGatewayContainer withServer(String server, List<String> tools) {
+        this.servers.add(server);
+        this.tools.addAll(tools);
+        return this;
+    }
+
+    public DockerMcpGatewayContainer withServer(String server, String... tools) {
+        this.servers.add(server);
+        this.tools.addAll(Arrays.asList(tools));
+        return this;
+    }
+
+    public DockerMcpGatewayContainer withSecrets(Map<String, String> secrets) {
+        this.secrets.putAll(secrets);
+        return this;
+    }
+
+    public DockerMcpGatewayContainer withSecret(String secretKey, String secretValue) {
+        this.secrets.put(secretKey, secretValue);
+        return this;
+    }
+
+    public String getEndpoint() {
+        return "http://" + getHost() + ":" + getMappedPort(DEFAULT_PORT);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
new file mode 100644
index 00000000000..ab9305cdcfd
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
@@ -0,0 +1,37 @@
+package org.testcontainers.containers;
+
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DockerMcpGatewayContainerTest {
+
+    @Test
+    public void serviceSuccessfullyStarts() {
+        try (DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/agents_gateway:v2")) {
+            gateway.start();
+
+            assertThat(gateway.isRunning()).isTrue();
+        }
+    }
+
+    @Test
+    public void gatewayStartsWithServers() {
+        try (
+            // container {
+            DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/agents_gateway:v2")
+                .withServer("curl", "curl")
+                .withServer("brave", "brave_local_search", "brave_web_search")
+                .withServer("github-official", Collections.singletonList("add_issue_comment"))
+                .withSecret("brave.api_key", "test_key")
+                .withSecrets(Collections.singletonMap("github.personal_access_token", "test_token"))
+            // }
+        ) {
+            gateway.start();
+
+            assertThat(gateway.getLogs()).contains("4 tools listed");
+        }
+    }
+}
diff --git a/docs/modules/docker_mcp_gateway.md b/docs/modules/docker_mcp_gateway.md
new file mode 100644
index 00000000000..da0b2e55c09
--- /dev/null
+++ b/docs/modules/docker_mcp_gateway.md
@@ -0,0 +1,32 @@
+# Docker MCP Gateway
+
+Testcontainers module for [Docker MCP Gateway](https://hub.docker.com/r/docker/agents_gateway).
+
+## DockerMcpGatewayContainer's usage examples
+
+You can start a Docker MCP Gateway container instance from any Java application by using:
+
+<!--codeinclude-->
+[Create a DockerMcpGatewayContainer](../../core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+*Docker MCP Gateway support is part of the core Testcontainers library.*
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+=== "Gradle"
+    ```groovy
+    testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
+    ```
+=== "Maven"
+    ```xml
+    <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>{{latest_version}}</version>
+        <scope>test</scope>
+    </dependency>
+    ```
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 65235b7964f..c0e5054706e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,6 +82,7 @@ nav:
           - modules/chromadb.md
           - modules/consul.md
           - modules/docker_compose.md
+          - modules/docker_mcp_gateway.md
           - modules/docker_model_runner.md
           - modules/elasticsearch.md
           - modules/gcloud.md

From c47afa829fe8fdbad28ac22d5a186f51b944aaa9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 20 Jun 2025 10:34:06 -0600
Subject: [PATCH 4222/4969] [create-pull-request] automated change (#10368)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index c0e5054706e..34ed4bba0c3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -141,4 +141,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.21.1
+    latest_version: 1.21.2

From b2b404a9a87ed70d0672fe5bb9ac1e3a463af94f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 20 Jun 2025 10:34:25 -0600
Subject: [PATCH 4223/4969] [create-pull-request] automated change (#10369)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 001fa818184..14649ee508e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.21.1
+testcontainers.version=1.21.2

From 2f64a4431a3e743ead728111e46754015af5f117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 28 Jun 2025 11:05:29 -0600
Subject: [PATCH 4224/4969] Support docker/mcp-gateway image (#10378)

---
 .../containers/DockerMcpGatewayContainer.java          | 10 +++++++---
 .../containers/DockerMcpGatewayContainerTest.java      |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
index 592b02cb0ad..8a91f9e651e 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
@@ -20,9 +20,13 @@
  */
 public class DockerMcpGatewayContainer extends GenericContainer<DockerMcpGatewayContainer> {
 
-    private static final String DOCKER_AGENT_GATEWAY_IMAGE = "docker/agents_gateway";
+    private static final String DOCKER_MCP_GATEWAY_IMAGE = "docker/mcp-gateway";
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_AGENT_GATEWAY_IMAGE);
+    private static final String DOCKER_AGENTS_GATEWAY_IMAGE = "docker/agents_gateway";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_MCP_GATEWAY_IMAGE);
+
+    private static final DockerImageName DOCKER_AGENTS_IMAGE_NAME = DockerImageName.parse(DOCKER_AGENTS_GATEWAY_IMAGE);
 
     private static final int DEFAULT_PORT = 8811;
 
@@ -40,7 +44,7 @@ public DockerMcpGatewayContainer(String dockerImageName) {
 
     public DockerMcpGatewayContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DOCKER_AGENTS_IMAGE_NAME);
         withExposedPorts(DEFAULT_PORT);
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Start sse server on port.*", 1));
diff --git a/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
index ab9305cdcfd..28e4cf6fb6a 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
@@ -10,7 +10,7 @@ public class DockerMcpGatewayContainerTest {
 
     @Test
     public void serviceSuccessfullyStarts() {
-        try (DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/agents_gateway:v2")) {
+        try (DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/mcp-gateway:latest")) {
             gateway.start();
 
             assertThat(gateway.isRunning()).isTrue();
@@ -21,7 +21,7 @@ public void serviceSuccessfullyStarts() {
     public void gatewayStartsWithServers() {
         try (
             // container {
-            DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/agents_gateway:v2")
+            DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/mcp-gateway:latest")
                 .withServer("curl", "curl")
                 .withServer("brave", "brave_local_search", "brave_web_search")
                 .withServer("github-official", Collections.singletonList("add_issue_comment"))

From bebbb2c373e15e41e2faaa78632c85dc0f87b899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sat, 28 Jun 2025 12:37:12 -0600
Subject: [PATCH 4225/4969] Update testcontainers/sshd version to 1.3.0
 (#10377)

---
 .../org/testcontainers/containers/PortForwardingContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index a06e554a14c..a5f7c29a8b4 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -24,7 +24,7 @@ public enum PortForwardingContainer {
 
     private static ContainerDef DEFINITION = new ContainerDef() {
         {
-            setImage(DockerImageName.parse("testcontainers/sshd:1.2.0"));
+            setImage(DockerImageName.parse("testcontainers/sshd:1.3.0"));
             addExposedTcpPort(22);
             addEnvVar("PASSWORD", PASSWORD);
         }

From 99a6a3e67628543be62dacb020e40c3705b99b2c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 28 Jun 2025 22:27:23 -0600
Subject: [PATCH 4226/4969] [create-pull-request] automated change (#10380)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 34ed4bba0c3..3e39a67f959 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -141,4 +141,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.21.2
+    latest_version: 1.21.3

From 4b904eefdb0cb6139d4b6ae53e52f9488b0ee2f1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 28 Jun 2025 22:27:47 -0600
Subject: [PATCH 4227/4969] [create-pull-request] automated change (#10379)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 14649ee508e..d83ed4b9998 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.21.2
+testcontainers.version=1.21.3

From 16804a5b4f85c539c5b604586b41560c89fcf7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 30 Jun 2025 12:41:22 -0600
Subject: [PATCH 4228/4969] Add JReleaser to deploy to Portal Publisher API

---
 .github/workflows/release.yml | 11 +++++++++--
 build.gradle                  |  1 +
 gradle/publishing.gradle      | 26 ++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7adfda8a4c8..32847a43bb5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,13 @@ jobs:
         run: |
           ./gradlew publish \
             -Pversion="${{github.event.release.tag_name}}" --scan --no-daemon -i
+
+      - name: Run Gradle Deploy
+        run: |
+          ./gradlew jreleaserDeploy --scan --no-daemon -i
         env:
-          OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}}
-          OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ vars.GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }}
diff --git a/build.gradle b/build.gradle
index e52732e8a82..1d2a749c166 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,7 @@ plugins {
     id 'com.gradleup.shadow' version '8.3.0'
     id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
     id 'com.diffplug.spotless' version '6.22.0' apply false
+    id 'org.jreleaser' version '1.18.0' apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 618ada345cc..9ecd231d3e1 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'maven-publish'
+apply plugin: 'org.jreleaser'
 
 task sourceJar(type: Jar) {
     archiveClassifier.set( 'sources')
@@ -95,10 +96,27 @@ publishing {
     }
     repositories {
         maven {
-            url("https://oss.sonatype.org/service/local/staging/deploy/maven2")
-            credentials {
-                username = System.getenv("OSSRH_USERNAME")
-                password = System.getenv("OSSRH_PASSWORD")
+            url = layout.buildDirectory.dir('staging-deploy')
+        }
+    }
+}
+
+jreleaser {
+    signing {
+        active = 'ALWAYS'
+        armored = true
+    }
+    deploy {
+        maven {
+            mavenCentral {
+                central {
+                    active = 'ALWAYS'
+                    url = 'https://central.sonatype.com/api/v1/publisher'
+                    stagingRepository(layout.buildDirectory.dir("staging-deploy").get().toString())
+                    stage = 'UPLOAD'
+                    applyMavenCentralRules = true
+                    namespace = 'org.testcontainers'
+                }
             }
         }
     }

From e39afc4d80fe348cba4f8fde2964ca3584d072df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Jun 2025 15:20:41 -0600
Subject: [PATCH 4229/4969] Move cucumber example to junit5 (#10383)

---
 examples/cucumber/build.gradle                       |  8 +++++++-
 .../org/testcontainers/examples/CucumberTest.java    | 12 +++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 2710e259e9b..176fb35ee8d 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -12,9 +12,15 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
+    testImplementation platform('org.junit:junit-bom:5.10.3')
+    testImplementation 'org.junit.platform:junit-platform-suite'
     testImplementation platform('io.cucumber:cucumber-bom:7.18.1')
     testImplementation 'io.cucumber:cucumber-java'
-    testImplementation 'io.cucumber:cucumber-junit'
+    testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java b/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
index 717c42351a8..5d6fe8c3f9c 100644
--- a/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
+++ b/examples/cucumber/src/test/java/org/testcontainers/examples/CucumberTest.java
@@ -1,9 +1,11 @@
 package org.testcontainers.examples;
 
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
+import io.cucumber.junit.platform.engine.Constants;
+import org.junit.platform.suite.api.ConfigurationParameter;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Cucumber.class)
-@CucumberOptions(plugin = { "pretty" })
+@Suite
+@SelectPackages("org.testcontainers.examples")
+@ConfigurationParameter(key = Constants.PLUGIN_PROPERTY_NAME, value = "pretty")
 public class CucumberTest {}

From dc661213a94418f56fd0f7133934b9ec27f7b4c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 21:27:11 +0000
Subject: [PATCH 4230/4969] Bump io.cucumber:cucumber-bom from 7.18.1 to 7.23.0
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.18.1 to 7.23.0.
- [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/v7.18.1...v7.23.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-version: 7.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 176fb35ee8d..009c8e77606 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation platform('org.junit:junit-bom:5.10.3')
     testImplementation 'org.junit.platform:junit-platform-suite'
-    testImplementation platform('io.cucumber:cucumber-bom:7.18.1')
+    testImplementation platform('io.cucumber:cucumber-bom:7.23.0')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:selenium'

From 4366c0cb22b63ac56c5fa1311e7acb08d14e05d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Jun 2025 15:36:22 -0600
Subject: [PATCH 4231/4969] Remove dynalite module (#10384)

---
 modules/dynalite/build.gradle                 |  9 ---
 .../dynamodb/DynaliteContainer.java           | 79 -------------------
 .../dynamodb/DynaliteContainerTest.java       | 64 ---------------
 .../src/test/resources/logback-test.xml       | 16 ----
 4 files changed, 168 deletions(-)
 delete mode 100644 modules/dynalite/build.gradle
 delete mode 100644 modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
 delete mode 100644 modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
 delete mode 100644 modules/dynalite/src/test/resources/logback-test.xml

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
deleted file mode 100644
index d8fe2377b76..00000000000
--- a/modules/dynalite/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-description = "Testcontainers :: Dynalite (deprecated)"
-
-dependencies {
-    api project(':testcontainers')
-
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.772'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.772'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
-}
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
deleted file mode 100644
index 2a73ce6f022..00000000000
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.testcontainers.dynamodb;
-
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
-/**
- * Container for Dynalite, a DynamoDB clone.
- *
- * @deprecated use localstack module instead
- */
-public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
-
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("quay.io/testcontainers/dynalite");
-
-    private static final String DEFAULT_TAG = "v1.2.1-1";
-
-    private static final int MAPPED_PORT = 4567;
-
-    /**
-     * @deprecated use {@link #DynaliteContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public DynaliteContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
-    public DynaliteContainer(String dockerImageName) {
-        this(DockerImageName.parse(dockerImageName));
-    }
-
-    public DynaliteContainer(final DockerImageName dockerImageName) {
-        super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-
-        withExposedPorts(MAPPED_PORT);
-    }
-
-    /**
-     * Gets a preconfigured {@link AmazonDynamoDB} client object for connecting to this
-     * container.
-     *
-     * @return preconfigured client
-     */
-    public AmazonDynamoDB getClient() {
-        return AmazonDynamoDBClientBuilder
-            .standard()
-            .withEndpointConfiguration(getEndpointConfiguration())
-            .withCredentials(getCredentials())
-            .build();
-    }
-
-    /**
-     * Gets {@link AwsClientBuilder.EndpointConfiguration}
-     * that may be used to connect to this container.
-     *
-     * @return endpoint configuration
-     */
-    public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration() {
-        return new AwsClientBuilder.EndpointConfiguration(
-            "http://" + this.getHost() + ":" + this.getMappedPort(MAPPED_PORT),
-            null
-        );
-    }
-
-    /**
-     * Gets an {@link AWSCredentialsProvider} that may be used to connect to this container.
-     *
-     * @return dummy AWS credentials
-     */
-    public AWSCredentialsProvider getCredentials() {
-        return new AWSStaticCredentialsProvider(new BasicAWSCredentials("dummy", "dummy"));
-    }
-}
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
deleted file mode 100644
index 2a4e94e9516..00000000000
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.testcontainers.dynamodb;
-
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
-import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;
-import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
-import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
-import com.amazonaws.services.dynamodbv2.model.KeyType;
-import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
-import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
-import com.amazonaws.services.dynamodbv2.model.TableDescription;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@Ignore("Image is not compatible with the latest Docker version provided by GH Actions")
-public class DynaliteContainerTest {
-
-    private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse(
-        "quay.io/testcontainers/dynalite:v1.2.1-1"
-    );
-
-    @Rule
-    public DynaliteContainer dynamoDB = new DynaliteContainer(DYNALITE_IMAGE);
-
-    @Test
-    public void simpleTestWithManualClientCreation() {
-        final AmazonDynamoDB client = AmazonDynamoDBClientBuilder
-            .standard()
-            .withEndpointConfiguration(dynamoDB.getEndpointConfiguration())
-            .withCredentials(dynamoDB.getCredentials())
-            .build();
-
-        runTest(client);
-    }
-
-    @Test
-    public void simpleTestWithProvidedClient() {
-        final AmazonDynamoDB client = dynamoDB.getClient();
-
-        runTest(client);
-    }
-
-    private void runTest(AmazonDynamoDB client) {
-        CreateTableRequest request = new CreateTableRequest()
-            .withAttributeDefinitions(new AttributeDefinition("Name", ScalarAttributeType.S))
-            .withKeySchema(new KeySchemaElement("Name", KeyType.HASH))
-            .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L))
-            .withTableName("foo");
-
-        client.createTable(request);
-
-        final TableDescription tableDescription = client.describeTable("foo").getTable();
-
-        assertThat(tableDescription).as("the description is not null").isNotNull();
-        assertThat(tableDescription.getTableName()).as("the table has the right name").isEqualTo("foo");
-        assertThat(tableDescription.getKeySchema().get(0).getAttributeName())
-            .as("the name has the right primary key")
-            .isEqualTo("Name");
-    }
-}
diff --git a/modules/dynalite/src/test/resources/logback-test.xml b/modules/dynalite/src/test/resources/logback-test.xml
deleted file mode 100644
index 83ef7a1a3ef..00000000000
--- a/modules/dynalite/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-    <logger name="org.testcontainers" level="INFO"/>
-</configuration>

From e14ea8421096148a97adbc4dcf7adf52dc30d4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Jun 2025 16:26:08 -0600
Subject: [PATCH 4232/4969] Remove LinkableContainer from NginxContainer
 (#10386)

Link containers is deprecated.
---
 .../java/org/testcontainers/containers/NginxContainer.java | 7 ++-----
 .../java/org/testcontainers/junit/SimpleNginxTest.java     | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 9a8687aaf8c..92eee56a7b1 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -1,16 +1,13 @@
 package org.testcontainers.containers;
 
 import org.jetbrains.annotations.NotNull;
-import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Set;
 
-public class NginxContainer<SELF extends NginxContainer<SELF>>
-    extends GenericContainer<SELF>
-    implements LinkableContainer {
+public class NginxContainer extends GenericContainer<NginxContainer> {
 
     private static final int NGINX_DEFAULT_PORT = 80;
 
@@ -59,7 +56,7 @@ public void setCustomContent(String htmlContentPath) {
     }
 
     @Deprecated
-    public SELF withCustomContent(String htmlContentPath) {
+    public NginxContainer withCustomContent(String htmlContentPath) {
         this.setCustomContent(htmlContentPath);
         return self();
     }
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index d520419b902..05a5f5767f1 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -28,7 +28,7 @@ public class SimpleNginxTest {
 
     // creatingContainer {
     @Rule
-    public NginxContainer<?> nginx = new NginxContainer<>(NGINX_IMAGE)
+    public NginxContainer nginx = new NginxContainer(NGINX_IMAGE)
         .withCopyFileToContainer(MountableFile.forHostPath(tmpDirectory), "/usr/share/nginx/html")
         .waitingFor(new HttpWaitStrategy());
 
@@ -64,7 +64,7 @@ public void testSimple() throws Exception {
         assertHasCorrectExposedAndLivenessCheckPorts(nginx);
     }
 
-    private void assertHasCorrectExposedAndLivenessCheckPorts(NginxContainer<?> nginxContainer) throws Exception {
+    private void assertHasCorrectExposedAndLivenessCheckPorts(NginxContainer nginxContainer) {
         assertThat(nginxContainer.getExposedPorts()).containsExactly(80);
         assertThat(nginxContainer.getLivenessCheckPortNumbers()).containsExactly(nginxContainer.getMappedPort(80));
     }

From cfe90d50ee4baa2e3c4df7fddb404bda663cf172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Jun 2025 19:19:24 -0600
Subject: [PATCH 4233/4969] Drop module's default constructors (#10385)

Specify a docker image will be required.
---
 modules/cockroachdb/build.gradle                |  6 ++++++
 .../containers/CockroachContainer.java          |  8 --------
 modules/couchbase/build.gradle                  |  6 ++++++
 .../couchbase/CouchbaseContainer.java           | 11 -----------
 modules/db2/build.gradle                        |  6 ++++++
 .../testcontainers/containers/Db2Container.java |  8 --------
 modules/elasticsearch/build.gradle              |  6 ++++++
 .../elasticsearch/ElasticsearchContainer.java   | 14 --------------
 .../ElasticsearchContainerTest.java             |  2 +-
 modules/influxdb/build.gradle                   |  6 ++++++
 .../containers/InfluxDBContainer.java           | 13 -------------
 .../junit/jupiter/MixedLifecycleTests.java      |  4 ++--
 modules/localstack/build.gradle                 |  6 ++++++
 .../localstack/LocalStackContainer.java         |  8 --------
 modules/mariadb/build.gradle                    |  6 ++++++
 .../containers/MariaDBContainer.java            |  8 --------
 modules/mockserver/build.gradle                 |  6 ++++++
 .../containers/MockServerContainer.java         |  8 --------
 modules/mongodb/build.gradle                    |  6 ++++++
 .../containers/MongoDBContainer.java            | 10 ----------
 modules/mssqlserver/build.gradle                |  6 ++++++
 .../containers/MSSQLServerContainer.java        |  8 --------
 modules/mysql/build.gradle                      |  6 ++++++
 .../containers/MySQLContainer.java              |  8 --------
 modules/neo4j/build.gradle                      |  6 ++++++
 .../containers/Neo4jContainer.java              |  9 ---------
 .../containers/Neo4jContainerTest.java          |  4 +++-
 modules/nginx/build.gradle                      |  6 ++++++
 .../containers/NginxContainer.java              | 10 ----------
 modules/oracle-xe/build.gradle                  |  6 ++++++
 .../containers/OracleContainer.java             |  8 --------
 modules/orientdb/build.gradle                   |  6 ++++++
 .../containers/OrientDBContainer.java           | 10 ----------
 modules/postgresql/build.gradle                 |  6 ++++++
 .../containers/PostgreSQLContainer.java         |  8 --------
 modules/pulsar/build.gradle                     |  6 ++++++
 .../containers/PulsarContainer.java             | 17 -----------------
 modules/rabbitmq/build.gradle                   |  6 ++++++
 .../containers/RabbitMQContainer.java           | 11 -----------
 modules/solr/build.gradle                       |  6 ++++++
 .../containers/SolrContainer.java               | 17 -----------------
 modules/toxiproxy/build.gradle                  |  6 ++++++
 .../containers/ToxiproxyContainer.java          | 10 ----------
 43 files changed, 126 insertions(+), 208 deletions(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index fa1e7f06839..3cfe02ee1db 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -7,3 +7,9 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.CockroachContainer"
+    ]
+}
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index a7bb1fef7ed..f0c0cf123fb 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -52,14 +52,6 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
 
     private boolean isVersionGreaterThanOrEqualTo221;
 
-    /**
-     * @deprecated use {@link #CockroachContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public CockroachContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public CockroachContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 973af4b2ffb..529eaec061e 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -9,3 +9,9 @@ dependencies {
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.couchbase.CouchbaseContainer"
+    ]
+}
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 1681de30853..14997d253af 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -92,8 +92,6 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("couchbase/server");
 
-    private static final String DEFAULT_TAG = "6.5.1";
-
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private static final OkHttpClient HTTP_CLIENT = new OkHttpClient();
@@ -125,15 +123,6 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
 
     private boolean hasTlsPorts = false;
 
-    /**
-     * Creates a new couchbase container with the default image and version.
-     * @deprecated use {@link #CouchbaseContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public CouchbaseContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * Creates a new couchbase container with the specified image name.
      *
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 3a773f21534..37dd3955764 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -7,3 +7,9 @@ dependencies {
     testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.Db2Container"
+    ]
+}
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 81f26014b90..18fb4aac0e6 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -42,14 +42,6 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     private String password = "foobar1234";
 
-    /**
-     * @deprecated use {@link #Db2Container(DockerImageName)} instead
-     */
-    @Deprecated
-    public Db2Container() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public Db2Container(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 79faefdde24..2a076837d1f 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -6,3 +6,9 @@ dependencies {
     testImplementation "org.elasticsearch.client:transport:7.17.24"
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.elasticsearch.ElasticsearchContainer"
+    ]
+}
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 99f8cd75b4f..54f1a4c17f8 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -68,12 +68,6 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     // default location of the automatically generated self-signed HTTP cert for versions >= 8
     private static final String DEFAULT_CERT_PATH = "/usr/share/elasticsearch/config/certs/http_ca.crt";
 
-    /**
-     * Elasticsearch Default version
-     */
-    @Deprecated
-    protected static final String DEFAULT_TAG = "7.9.2";
-
     @Deprecated
     private boolean isOss = false;
 
@@ -81,14 +75,6 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
 
     private String certPath = "";
 
-    /**
-     * @deprecated use {@link #ElasticsearchContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public ElasticsearchContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * Create an Elasticsearch Container by passing the full docker image name
      *
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 18fc0fc9fde..4c308169bc6 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -77,7 +77,7 @@ public void stopRestClient() throws IOException {
     public void elasticsearchDeprecatedCtorTest() throws IOException {
         // Create the elasticsearch container.
         try (
-            ElasticsearchContainer container = new ElasticsearchContainer().withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
+            ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
         ) {
             // Start the container. This step might take some time...
             container.start();
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 9cf1e8d5ab0..30046d8bc3a 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -9,3 +9,9 @@ dependencies {
     testImplementation 'org.influxdb:influxdb-java:2.24'
     testImplementation "com.influxdb:influxdb-client-java:6.12.0"
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.InfluxDBContainer"
+    ]
+}
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index 8e908e8e229..f54971dfc7a 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -24,11 +24,6 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb");
 
-    private static final String DEFAULT_TAG = "1.4.3";
-
-    @Deprecated
-    public static final String VERSION = DEFAULT_TAG;
-
     private static final int NO_CONTENT_STATUS_CODE = 204;
 
     @Getter
@@ -66,14 +61,6 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
 
     private final boolean isAtLeastMajorVersion2;
 
-    /**
-     * @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public InfluxDBContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
      */
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
index e8ce714ab28..7dcd769bf08 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java
@@ -12,11 +12,11 @@ class MixedLifecycleTests {
 
     // will be shared between test methods
     @Container
-    private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer();
+    private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer("mysql:8.0.36");
 
     // will be started before and stopped after each test method
     @Container
-    private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer()
+    private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer("postgres:9.6.12")
         .withDatabaseName("foo")
         .withUsername("foo")
         .withPassword("secret");
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 2994bb7d2f2..fb1be0f66f7 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -12,3 +12,9 @@ dependencies {
     testImplementation 'software.amazon.awssdk:s3:2.28.6'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.localstack.LocalStackContainer"
+    ]
+}
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index fb7d383898a..c38d5a34728 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -83,14 +83,6 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     private final boolean isVersion2;
 
-    /**
-     * @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public LocalStackContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
      */
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index 88734091907..7492300b4b6 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -12,3 +12,9 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.MariaDBContainer"
+    ]
+}
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index fccfde6e4dc..bff0faf9d03 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -41,14 +41,6 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
 
     private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
 
-    /**
-     * @deprecated use {@link #MariaDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public MariaDBContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public MariaDBContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 31f4944a572..ef38d025669 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -6,3 +6,9 @@ dependencies {
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.MockServerContainer"
+    ]
+}
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 9ca936d1656..00937214445 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -16,14 +16,6 @@ public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
     public static final int PORT = 1080;
 
-    /**
-     * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public MockServerContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
      */
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 0904df92824..eb3137c205c 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -6,3 +6,9 @@ dependencies {
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.MongoDBContainer"
+    ]
+}
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index 1dbf1fcc74e..e0bb04bb166 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -30,8 +30,6 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
         "mongodb/mongodb-enterprise-server"
     );
 
-    private static final String DEFAULT_TAG = "4.0.10";
-
     private static final int CONTAINER_EXIT_CODE_OK = 0;
 
     private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
@@ -42,14 +40,6 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private boolean shardingEnabled;
 
-    /**
-     * @deprecated use {@link #MongoDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public MongoDBContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public MongoDBContainer(@NonNull final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index e7541434291..006c5d38031 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -15,3 +15,9 @@ dependencies {
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.MSSQLServerContainer"
+    ]
+}
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index dab6c34fa16..10ccbff2c36 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -44,14 +44,6 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
         Pattern.compile("[^a-zA-Z0-9]+", Pattern.CASE_INSENSITIVE),
     };
 
-    /**
-     * @deprecated use {@link #MSSQLServerContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public MSSQLServerContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public MSSQLServerContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index d31fbcce266..f9d07cdab1c 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -14,3 +14,9 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.MySQLContainer"
+    ]
+}
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 76ff754b616..54f3952b6a2 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -41,14 +41,6 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
 
     private static final String MYSQL_ROOT_USER = "root";
 
-    /**
-     * @deprecated use {@link #MySQLContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public MySQLContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public MySQLContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index d70292361d1..f8529beb3ac 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -36,3 +36,9 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.Neo4jContainer"
+    ]
+}
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index e59e2ea2820..bb6f437f193 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -83,15 +83,6 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
         .forPort(DEFAULT_HTTP_PORT)
         .forStatusCodeMatching(response -> response == HttpURLConnection.HTTP_OK);
 
-    /**
-     * Creates a Neo4jContainer using the official Neo4j docker image.
-     * @deprecated use {@link #Neo4jContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public Neo4jContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * Creates a Neo4jContainer using a specific docker image.
      *
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index d2497cd900b..334aa155eac 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -74,7 +74,9 @@ public void shouldCopyDatabase() {
     @Test
     public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
         assertThatIllegalArgumentException()
-            .isThrownBy(() -> new Neo4jContainer<>().withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
+            .isThrownBy(() -> {
+                new Neo4jContainer<>("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
+            })
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
 
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 13232b4bfce..a746f0bd1ca 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -5,3 +5,9 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.1.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.NginxContainer"
+    ]
+}
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 92eee56a7b1..7f6b5b0f74c 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -13,16 +13,6 @@ public class NginxContainer extends GenericContainer<NginxContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("nginx");
 
-    private static final String DEFAULT_TAG = "1.9.4";
-
-    /**
-     * @deprecated use {@link #NginxContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public NginxContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public NginxContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 3de6202e869..2621e2a261f 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -14,3 +14,9 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.OracleContainer"
+    ]
+}
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 75b16779f40..07db62a7b2e 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -63,14 +63,6 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     private boolean usingSid = false;
 
-    /**
-     * @deprecated use {@link #OracleContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public OracleContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public OracleContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index d353be80783..cece637545d 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -9,3 +9,9 @@ dependencies {
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.33"
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.OrientDBContainer"
+    ]
+}
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index aeaf053ff0a..67c81be7e90 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -36,8 +36,6 @@ public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("orientdb");
 
-    private static final String DEFAULT_TAG = "3.0.24-tp3";
-
     private static final String DEFAULT_USERNAME = "admin";
 
     private static final String DEFAULT_PASSWORD = "admin";
@@ -60,14 +58,6 @@ public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
 
     private ODatabaseSession session;
 
-    /**
-     * @deprecated use {@link #OrientDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public OrientDBContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public OrientDBContainer(@NonNull String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 23ad800186b..5dc899ba2b8 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -14,3 +14,9 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.PostgreSQLContainer"
+    ]
+}
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index 27b3679b626..d96f30864d9 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -41,14 +41,6 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
 
     private static final String FSYNC_OFF_OPTION = "fsync=off";
 
-    /**
-     * @deprecated use {@link #PostgreSQLContainer(DockerImageName)} or {@link #PostgreSQLContainer(String)} instead
-     */
-    @Deprecated
-    public PostgreSQLContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public PostgreSQLContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 7af1bc777e2..5be1b67ce7b 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -8,3 +8,9 @@ dependencies {
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.PulsarContainer"
+    ]
+}
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 36485ad76a0..027e030c0de 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -21,12 +21,6 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     public static final int BROKER_HTTP_PORT = 8080;
 
-    /**
-     * @deprecated The metrics endpoint is no longer being used for the WaitStrategy.
-     */
-    @Deprecated
-    public static final String METRICS_ENDPOINT = "/metrics";
-
     private static final String ADMIN_CLUSTERS_ENDPOINT = "/admin/v2/clusters";
 
     /**
@@ -37,23 +31,12 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar");
 
-    @Deprecated
-    private static final String DEFAULT_TAG = "3.0.0";
-
     private final WaitAllStrategy waitAllStrategy = new WaitAllStrategy();
 
     private boolean functionsWorkerEnabled = false;
 
     private boolean transactionsEnabled = false;
 
-    /**
-     * @deprecated use {@link #PulsarContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public PulsarContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * @deprecated use {@link #PulsarContainer(DockerImageName)} instead
      */
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 42a12d68759..3aae4584008 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -6,3 +6,9 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.RabbitMQContainer"
+    ]
+}
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 9eff3fa83f2..3bb45632c54 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -35,8 +35,6 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
      */
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("rabbitmq");
 
-    private static final String DEFAULT_TAG = "3.7.25-management-alpine";
-
     private static final int DEFAULT_AMQP_PORT = 5672;
 
     private static final int DEFAULT_AMQPS_PORT = 5671;
@@ -51,15 +49,6 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
     private final List<List<String>> values = new ArrayList<>();
 
-    /**
-     * Creates a RabbitMQ container using the official RabbitMQ docker image.
-     * @deprecated use {@link #RabbitMQContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public RabbitMQContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     /**
      * Creates a RabbitMQ container using a specific docker image.
      *
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index d8ff7aeba39..fcf7fd7c71b 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -8,3 +8,9 @@ dependencies {
     testImplementation 'org.apache.solr:solr-solrj:8.11.3'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.SolrContainer"
+    ]
+}
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index b5d8d6abf8d..16c3a0d62d4 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -28,12 +28,6 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("solr");
 
-    @Deprecated
-    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
-
-    @Deprecated
-    public static final String DEFAULT_TAG = "8.3.0";
-
     public static final Integer ZOOKEEPER_PORT = 9983;
 
     public static final Integer SOLR_PORT = 8983;
@@ -42,17 +36,6 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
 
     private final ComparableVersion imageVersion;
 
-    /**
-     * @deprecated use {@link #SolrContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public SolrContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
-    /**
-     * @deprecated use {@link #SolrContainer(DockerImageName)} instead
-     */
     public SolrContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 211d5e38ae3..2545e0a271a 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -7,3 +7,9 @@ dependencies {
     testImplementation 'redis.clients:jedis:5.1.5'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
+
+tasks.japicmp {
+    classExcludes = [
+        "org.testcontainers.containers.ToxiproxyContainer"
+    ]
+}
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index a2a85a95d88..c28c4e93ddf 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -31,8 +31,6 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy");
 
-    private static final String DEFAULT_TAG = "2.1.0";
-
     private static final DockerImageName GHCR_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy");
 
     private static final int TOXIPROXY_CONTROL_PORT = 8474;
@@ -47,14 +45,6 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
     private final AtomicInteger nextPort = new AtomicInteger(FIRST_PROXIED_PORT);
 
-    /**
-     * @deprecated use {@link #ToxiproxyContainer(DockerImageName)} instead
-     */
-    @Deprecated
-    public ToxiproxyContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
-    }
-
     public ToxiproxyContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }

From b00585bb95b2b306e1cb3b558db22ab9f0201e62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 01:28:46 +0000
Subject: [PATCH 4234/4969] Bump org.apache.pulsar:pulsar-bom from 3.3.1 to
 4.0.5 in /modules/pulsar

Bumps [org.apache.pulsar:pulsar-bom](https://github.com/apache/pulsar) from 3.3.1 to 4.0.5.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v3.3.1...v4.0.5)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-bom
  dependency-version: 4.0.5
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 5be1b67ce7b..1c5a77436fe 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("org.apache.pulsar:pulsar-bom:3.3.1")
+    testImplementation platform("org.apache.pulsar:pulsar-bom:4.0.5")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
     testImplementation 'org.assertj:assertj-core:3.26.3'

From 71cc7293332d30a1495713cfe4d75259599602d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Jun 2025 20:46:06 -0600
Subject: [PATCH 4235/4969] Make Neo4jContainer generic and drop deprecated
 method (#10388)

---
 .../containers/Neo4jExampleTest.java          |  2 +-
 modules/neo4j/build.gradle                    |  3 +-
 .../containers/Neo4jContainer.java            | 43 ++------
 .../containers/Neo4jLabsPlugin.java           | 29 ------
 .../Neo4jContainerJUnitIntegrationTest.java   |  2 +-
 .../containers/Neo4jContainerTest.java        | 99 +++++--------------
 6 files changed, 37 insertions(+), 141 deletions(-)
 delete mode 100644 modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java

diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
index 38c22a0ff45..abf42a115de 100644
--- a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -27,7 +27,7 @@
 class Neo4jExampleTest {
 
     @Container
-    private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(DockerImageName.parse("neo4j:4.4"))
+    private static Neo4jContainer neo4jContainer = new Neo4jContainer(DockerImageName.parse("neo4j:4.4"))
         .withoutAuthentication(); // Disable password
 
     @Test
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index f8529beb3ac..0f2f645931d 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -39,6 +39,7 @@ dependencies {
 
 tasks.japicmp {
     classExcludes = [
-        "org.testcontainers.containers.Neo4jContainer"
+        "org.testcontainers.containers.Neo4jContainer",
+        "org.testcontainers.containers.Neo4jLabsPlugin"
     ]
 }
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index bb6f437f193..bd3499567d4 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -31,7 +31,7 @@
  *     <li>HTTPS: 7473</li>
  * </ul>
  */
-public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContainer<S> {
+public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
 
     /**
      * The image defaults to the official Neo4j image: <a href="https://hub.docker.com/_/neo4j/">Neo4j</a>.
@@ -205,7 +205,7 @@ public String getHttpsUrl() {
      *
      * @return This container.
      */
-    public S withEnterpriseEdition() {
+    public Neo4jContainer withEnterpriseEdition() {
         if (!standardImage) {
             throw new IllegalStateException(
                 String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName())
@@ -227,7 +227,7 @@ public S withEnterpriseEdition() {
      * @param adminPassword The admin password for the default database account.
      * @return This container.
      */
-    public S withAdminPassword(final String adminPassword) {
+    public Neo4jContainer withAdminPassword(final String adminPassword) {
         if (adminPassword != null && adminPassword.length() < 8) {
             logger().warn("Your provided admin password is too short and will not work with Neo4j 5.3+.");
         }
@@ -240,7 +240,7 @@ public S withAdminPassword(final String adminPassword) {
      *
      * @return This container.
      */
-    public S withoutAuthentication() {
+    public Neo4jContainer withoutAuthentication() {
         return withAdminPassword(null);
     }
 
@@ -264,7 +264,7 @@ public S withoutAuthentication() {
      * @throws IllegalArgumentException If the database version is not 3.5.
      * @return This container.
      */
-    public S withDatabase(MountableFile graphDb) {
+    public Neo4jContainer withDatabase(MountableFile graphDb) {
         if (!isNeo4jDatabaseVersionSupportingDbCopy()) {
             throw new IllegalArgumentException(
                 "Copying database folder is not supported for Neo4j instances with version 4.0 or higher."
@@ -283,7 +283,7 @@ public S withDatabase(MountableFile graphDb) {
      * @param plugins
      * @return This container.
      */
-    public S withPlugins(MountableFile plugins) {
+    public Neo4jContainer withPlugins(MountableFile plugins) {
         return withCopyFileToContainer(plugins, "/var/lib/neo4j/plugins/");
     }
 
@@ -295,7 +295,7 @@ public S withPlugins(MountableFile plugins) {
      * @param value The value to set
      * @return This container.
      */
-    public S withNeo4jConfig(String key, String value) {
+    public Neo4jContainer withNeo4jConfig(String key, String value) {
         addEnv(formatConfigurationKey(key), value);
         return self();
     }
@@ -307,31 +307,6 @@ public String getAdminPassword() {
         return adminPassword;
     }
 
-    /**
-     * Registers one or more {@link Neo4jLabsPlugin} for download and server startup.
-     *
-     * @param neo4jLabsPlugins The Neo4j plugins that should get started with the server.
-     * @return This container.
-     * @deprecated {@link Neo4jLabsPlugin} were deprecated due to naming changes that cannot be solved by this enumeration.
-     * Please use the {@link Neo4jContainer#withPlugins(String...)} method.
-     */
-    public S withLabsPlugins(Neo4jLabsPlugin... neo4jLabsPlugins) {
-        List<String> pluginNames = Arrays
-            .stream(neo4jLabsPlugins)
-            .map(plugin -> plugin.pluginName)
-            .collect(Collectors.toList());
-
-        this.labsPlugins.addAll(pluginNames);
-        return self();
-    }
-
-    /**
-     * @deprecated Please use {@link Neo4jContainer#withPlugins(String...)} for named plugins.
-     */
-    public S withLabsPlugins(String... neo4jLabsPlugins) {
-        return this.withPlugins(neo4jLabsPlugins);
-    }
-
     /**
      * Registers one or more Neo4j plugins for server startup.
      * The plugins are listed here
@@ -343,7 +318,7 @@ public S withLabsPlugins(String... neo4jLabsPlugins) {
      * @param plugins The Neo4j plugins that should get started with the server.
      * @return This container.
      */
-    public S withPlugins(String... plugins) {
+    public Neo4jContainer withPlugins(String... plugins) {
         this.labsPlugins.addAll(Arrays.asList(plugins));
         return self();
     }
@@ -376,7 +351,7 @@ private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
         return false;
     }
 
-    public S withRandomPassword() {
+    public Neo4jContainer withRandomPassword() {
         return withAdminPassword(UUID.randomUUID().toString());
     }
 }
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java
deleted file mode 100644
index 0e3bf634140..00000000000
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jLabsPlugin.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.testcontainers.containers;
-
-/**
- * Reflects a plugin from the official Neo4j 4.4.
- * <a href="https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins">Neo4j Labs Plugin list</a>.
- * There might be plugins not supported by your selected version of Neo4j.
- *
- * @deprecated Please use {@link Neo4jContainer#withLabsPlugins(String...)} with the matching plugin name for your Neo4j version.
- * Due to some renaming of the (Docker image) plugin names, there is no naming consistency across versions.
- * The plugins are listed here
- * <ul>
- *     <li><a href="https://neo4j.com/docs/operations-manual/5/configuration/plugins/">Neo4j 5</a></li>
- *     <li><a href="https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins">Neo4j 4.4</a></li>
- * </ul>
- */
-public enum Neo4jLabsPlugin {
-    APOC("apoc"),
-    APOC_CORE("apoc-core"),
-    BLOOM("bloom"),
-    STREAMS("streams"),
-    GRAPH_DATA_SCIENCE("graph-data-science"),
-    NEO_SEMANTICS("n10s");
-
-    final String pluginName;
-
-    Neo4jLabsPlugin(String pluginName) {
-        this.pluginName = pluginName;
-    }
-}
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
index b5f9c2ad867..868d7e29f2d 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
@@ -18,7 +18,7 @@
 public class Neo4jContainerJUnitIntegrationTest {
 
     @ClassRule
-    public static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4");
+    public static Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");
 
     @Test
     public void shouldStart() {
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 334aa155eac..9827eb09900 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -39,7 +39,7 @@ public void shouldDisableAuthentication() {
         try (
             // spotless:off
             // withoutAuthentication {
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
                 .withoutAuthentication()
             // }
             // spotless:on
@@ -58,7 +58,7 @@ public void shouldCopyDatabase() {
         assumeThat(DockerClientFactory.instance().getInfo().getArchitecture()).isNotEqualTo("aarch64");
         try (
             // copyDatabase {
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:3.5.30")
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:3.5.30")
                 .withDatabase(MountableFile.forClasspathResource("/test-graph.db"))
             // }
         ) {
@@ -75,7 +75,7 @@ public void shouldCopyDatabase() {
     public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
         assertThatIllegalArgumentException()
             .isThrownBy(() -> {
-                new Neo4jContainer<>("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
+                new Neo4jContainer("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
             })
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
@@ -84,7 +84,7 @@ public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
     public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
         assertThatIllegalArgumentException()
             .isThrownBy(() -> {
-                new Neo4jContainer<>("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
+                new Neo4jContainer("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
             })
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
@@ -93,7 +93,7 @@ public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
     public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
         assertThatIllegalArgumentException()
             .isThrownBy(() -> {
-                new Neo4jContainer<>("neo4j:latest").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
+                new Neo4jContainer("neo4j:latest").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
             })
             .withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
     }
@@ -102,7 +102,7 @@ public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
     public void shouldCopyPlugins() {
         try (
             // registerPluginsPath {
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
                 .withPlugins(MountableFile.forClasspathResource("/custom-plugins"))
             // }
         ) {
@@ -117,7 +117,7 @@ public void shouldCopyPlugins() {
     public void shouldCopyPlugin() {
         try (
             // registerPluginsJar {
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
                 .withPlugins(MountableFile.forClasspathResource("/custom-plugins/hello-world.jar"))
             // }
         ) {
@@ -142,7 +142,7 @@ public void shouldCheckEnterpriseLicense() {
         String expectedImageName = "neo4j:4.4-enterprise";
 
         assertThatExceptionOfType(IllegalStateException.class)
-            .isThrownBy(() -> new Neo4jContainer<>("neo4j:4.4").withEnterpriseEdition())
+            .isThrownBy(() -> new Neo4jContainer("neo4j:4.4").withEnterpriseEdition())
             .withMessageContaining("The image " + expectedImageName + " requires you to accept a license agreement.");
     }
 
@@ -152,7 +152,7 @@ public void shouldRunEnterprise() {
 
         try (
             // enterpriseEdition {
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
                 .withEnterpriseEdition()
                 // }
                 .withAdminPassword("Picard123")
@@ -172,7 +172,7 @@ public void shouldRunEnterprise() {
     @Test
     public void shouldAddConfigToEnvironment() {
         // neo4jConfiguration {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
             .withNeo4jConfig("dbms.security.procedures.unrestricted", "apoc.*,algo.*")
             .withNeo4jConfig("dbms.tx_log.rotation.size", "42M");
         // }
@@ -184,7 +184,7 @@ public void shouldAddConfigToEnvironment() {
 
     @Test
     public void shouldRespectEnvironmentAuth() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret");
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret");
 
         neo4jContainer.configure();
 
@@ -194,7 +194,7 @@ public void shouldRespectEnvironmentAuth() {
     @Test
     public void shouldSetCustomPasswordCorrectly() {
         // withAdminPassword {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withAdminPassword("verySecret");
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withAdminPassword("verySecret");
         // }
 
         neo4jContainer.configure();
@@ -204,7 +204,7 @@ public void shouldSetCustomPasswordCorrectly() {
 
     @Test
     public void containerAdminPasswordOverrulesEnvironmentAuth() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
             .withEnv("NEO4J_AUTH", "neo4j/secret")
             .withAdminPassword("anotherSecret");
 
@@ -215,7 +215,7 @@ public void containerAdminPasswordOverrulesEnvironmentAuth() {
 
     @Test
     public void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
             .withEnv("NEO4J_AUTH", "neo4j/secret")
             .withoutAuthentication();
 
@@ -226,7 +226,7 @@ public void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
 
     @Test
     public void shouldRespectAlreadyDefinedPortMappingsBolt() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withExposedPorts(7687);
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687);
 
         neo4jContainer.configure();
 
@@ -235,7 +235,7 @@ public void shouldRespectAlreadyDefinedPortMappingsBolt() {
 
     @Test
     public void shouldRespectAlreadyDefinedPortMappingsHttp() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withExposedPorts(7474);
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7474);
 
         neo4jContainer.configure();
 
@@ -244,7 +244,7 @@ public void shouldRespectAlreadyDefinedPortMappingsHttp() {
 
     @Test
     public void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withExposedPorts(7687, 7474);
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687, 7474);
 
         neo4jContainer.configure();
 
@@ -253,7 +253,7 @@ public void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
 
     @Test
     public void shouldDefaultExportBoltHttpAndHttps() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4");
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");
 
         neo4jContainer.configure();
 
@@ -262,67 +262,16 @@ public void shouldDefaultExportBoltHttpAndHttps() {
 
     @Test
     public void shouldRespectCustomWaitStrategy() {
-        Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy());
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy());
 
         neo4jContainer.configure();
 
         assertThat(neo4jContainer.getWaitStrategy()).isInstanceOf(CustomDummyWaitStrategy.class);
     }
 
-    // Test for deprecated functionality to be still alive, if `Neo4jLabsPlugin` gets removed, remove this test.
-    @Test
-    public void shouldConfigureSingleLabsPluginByType() {
-        try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins(Neo4jLabsPlugin.APOC)
-        ) {
-            // needs to get called explicitly for setup
-            neo4jContainer.configure();
-
-            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
-        }
-    }
-
-    // Test for deprecated functionality to be still alive, if `Neo4jLabsPlugin` gets removed, remove this test.
-    @Test
-    public void shouldConfigureMultipleLabsPluginsByType() {
-        try (
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4")
-                .withLabsPlugins(Neo4jLabsPlugin.APOC, Neo4jLabsPlugin.BLOOM);
-        ) {
-            // needs to get called explicitly for setup
-            neo4jContainer.configure();
-
-            assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
-                .containsAnyOf("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
-        }
-    }
-
-    // Test for deprecated functionality to be still alive, if `Neo4jContainer#withLabsPlugins` gets removed, remove this test.
-    @Test
-    public void shouldConfigureSingleLabsPlugin() {
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("apoc")) {
-            // needs to get called explicitly for setup
-            neo4jContainer.configure();
-
-            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
-        }
-    }
-
-    // Test for deprecated functionality to be still alive, if `Neo4jContainer#withLabsPlugins` gets removed, remove this test.
-    @Test
-    public void shouldConfigureMultipleLabsPlugins() {
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withLabsPlugins("apoc", "bloom");) {
-            // needs to get called explicitly for setup
-            neo4jContainer.configure();
-
-            assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
-                .containsAnyOf("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
-        }
-    }
-
     @Test
     public void shouldConfigureSinglePluginByName() {
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withPlugins("apoc")) {
+        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withPlugins("apoc")) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
 
@@ -334,7 +283,7 @@ public void shouldConfigureSinglePluginByName() {
     public void shouldConfigureMultiplePluginsByName() {
         try (
             // configureLabsPlugins {
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4") //
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4") //
                 .withPlugins("apoc", "bloom");
             // }
         ) {
@@ -350,7 +299,7 @@ public void shouldConfigureMultiplePluginsByName() {
     public void shouldCreateRandomUuidBasedPasswords() {
         try (
             // withRandomPassword {
-            Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4").withRandomPassword();
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withRandomPassword();
             // }
         ) {
             // It will throw an exception if it's not UUID parsable.
@@ -363,7 +312,7 @@ public void shouldCreateRandomUuidBasedPasswords() {
 
     @Test
     public void shouldWarnOnPasswordTooShort() {
-        try (Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:4.4");) {
+        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");) {
             Logger logger = (Logger) DockerLoggerFactory.getLogger("neo4j:4.4");
             TestLogAppender testLogAppender = new TestLogAppender();
             logger.addAppender(testLogAppender);
@@ -403,7 +352,7 @@ protected void append(ILoggingEvent eventObject) {
         }
     }
 
-    private static Driver getDriver(Neo4jContainer<?> container) {
+    private static Driver getDriver(Neo4jContainer container) {
         AuthToken authToken = AuthTokens.none();
         if (container.getAdminPassword() != null) {
             authToken = AuthTokens.basic("neo4j", container.getAdminPassword());

From b64d3bbf5c2db8c7c87484f6a1f92aba6202d692 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Jul 2025 19:58:05 -0600
Subject: [PATCH 4236/4969] Update Gradle Wrapper from undefined to 8.14.3
 (#10452)

* Update Gradle Wrapper from 8.14.2 to 8.14.3

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.14.2 to 8.14.3

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

* Update Gradle Wrapper from 8.14.2 to 8.14.3

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

---------

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 examples/gradle/wrapper/gradle-wrapper.properties   | 4 ++--
 gradle/wrapper/gradle-wrapper.properties            | 4 ++--
 smoke-test/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 3735f265b95..78cb6e16a49 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c4a852da571..dbc089ed3d7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=443c9c8ee2ac1ee0e11881a40f2376d79c66386264a44b24a9f8ca67e633375f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
+distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
index 3735f265b95..78cb6e16a49 100644
--- a/smoke-test/gradle/wrapper/gradle-wrapper.properties
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 283899f96026bf4c7de1b904a74cf32c56d13b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 7 Jul 2025 12:14:33 -0600
Subject: [PATCH 4237/4969] Set version during jreleaserDeploy task

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 32847a43bb5..77128657b0e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Run Gradle Deploy
         run: |
-          ./gradlew jreleaserDeploy --scan --no-daemon -i
+          ./gradlew jreleaserDeploy -Pversion="${{github.event.release.tag_name}}" --scan --no-daemon -i
         env:
           JRELEASER_GPG_PUBLIC_KEY: ${{ vars.GPG_PUBLIC_KEY }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SIGNING_KEY }}

From 19f11d6f95c1c57d43c41948c8508a74914a38b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:56:13 +0000
Subject: [PATCH 4238/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.4 to 42.7.7.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.4...REL42.7.7)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 33da6f67a72..6340d918e7e 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From e2f17ab455ac6e08dab1518d8d4403dabc1d78d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:56:14 +0000
Subject: [PATCH 4239/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.28.6 to 2.31.75.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.31.75
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index c2cd82ebf0f..f69b6e8f36d 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.scylladb:java-driver-core:4.15.0.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.28.6'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.31.77'
 }

From 057141c2b98e5f9739acbb6673473fc6325de6bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:56:16 +0000
Subject: [PATCH 4240/4969] Bump io.milvus:milvus-sdk-java from 2.4.4 to 2.6.0
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.4.4 to 2.6.0.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.4.4...v2.6.0)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-version: 2.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 6ca4ffda5ed..bb7167babfa 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.milvus:milvus-sdk-java:2.4.4'
+    testImplementation 'io.milvus:milvus-sdk-java:2.6.0'
 }

From 26e6f3fab9ef31839f891e5c0c3781a376b42939 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:56:19 +0000
Subject: [PATCH 4241/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.33 to 3.2.41.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/develop/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.33...3.2.41)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-version: 3.2.41
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 58d6b80210b..5ed2e137a3d 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,11 +3,11 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.33"
+    api "com.orientechnologies:orientdb-client:3.2.42"
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.33"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.42"
 }
 
 tasks.japicmp {

From 794d4f53d900f7d8fb323ff3777cecd2b60aa3ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:56:20 +0000
Subject: [PATCH 4242/4969] Bump io.weaviate:client from 4.8.3 to 5.3.0 in
 /modules/weaviate

Bumps [io.weaviate:client](https://github.com/weaviate/java-client) from 4.8.3 to 5.3.0.
- [Release notes](https://github.com/weaviate/java-client/releases)
- [Commits](https://github.com/weaviate/java-client/compare/4.8.3...5.3.0)

---
updated-dependencies:
- dependency-name: io.weaviate:client
  dependency-version: 5.3.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index d4808e93a2b..0a2be01a079 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.weaviate:client:4.8.3'
+    testImplementation 'io.weaviate:client:5.3.0'
 }

From 61aedaaec3b72f3e5a376a33094cf85e3e977c59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:56:27 +0000
Subject: [PATCH 4243/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.33 to 3.2.41.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.33...3.2.41)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-version: 3.2.41
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 58d6b80210b..5ed2e137a3d 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,11 +3,11 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.33"
+    api "com.orientechnologies:orientdb-client:3.2.42"
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.33"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.42"
 }
 
 tasks.japicmp {

From c69abe835d60f3a89fafdf32abb7c901ab6d7387 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:56:32 +0000
Subject: [PATCH 4244/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.28.6 to 2.31.75.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-version: 2.31.75
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 c56221cb97f..f104d08e63c 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.28.6'
+    testImplementation 'software.amazon.awssdk:s3:2.31.77'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 399f6b709f6afc8451a683a0abd64be86d6ba481 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 00:05:15 +0000
Subject: [PATCH 4245/4969] Bump com.ibm.db2:jcc from 11.5.9.0 to 12.1.2.0 in
 /modules/db2

Bumps com.ibm.db2:jcc from 11.5.9.0 to 12.1.2.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-version: 12.1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 9542ab75f65..0163eb17bd6 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
+    testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From e71a6c85191e98066844fbf36f61582480612ce4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 00:06:34 +0000
Subject: [PATCH 4246/4969] Bump io.qdrant:client from 1.10.0 to 1.14.1 in
 /modules/qdrant

Bumps [io.qdrant:client](https://github.com/qdrant/java-client) from 1.10.0 to 1.14.1.
- [Release notes](https://github.com/qdrant/java-client/releases)
- [Commits](https://github.com/qdrant/java-client/compare/v1.10.0...v1.14.1)

---
updated-dependencies:
- dependency-name: io.qdrant:client
  dependency-version: 1.14.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 6c222885579..dad2c38d3a1 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.qdrant:client:1.10.0'
+    testImplementation 'io.qdrant:client:1.14.1'
     testImplementation platform('io.grpc:grpc-bom:1.68.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'

From 2fce94723eebe735be0d69243a6742fc2832c6c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 00:10:47 +0000
Subject: [PATCH 4247/4969] Bump org.elasticsearch.client:transport in
 /modules/elasticsearch

Bumps [org.elasticsearch.client:transport](https://github.com/elastic/elasticsearch) from 7.17.24 to 7.17.29.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.24...v7.17.29)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:transport
  dependency-version: 7.17.29
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 91b344091bc..f0f260c5fb0 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.15.1"
-    testImplementation "org.elasticsearch.client:transport:7.17.24"
+    testImplementation "org.elasticsearch.client:transport:7.17.29"
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 21d98783622309835de091db4f395f86e2faedc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 00:13:43 +0000
Subject: [PATCH 4248/4969] Bump com.unboundid:unboundid-ldapsdk in
 /modules/ldap

Bumps [com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/pingidentity/ldapsdk/releases)
- [Changelog](https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html)
- [Commits](https://github.com/pingidentity/ldapsdk/compare/7.0.2...7.0.3)

---
updated-dependencies:
- dependency-name: com.unboundid:unboundid-ldapsdk
  dependency-version: 7.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ldap/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
index 327b81491e9..5045bf79266 100644
--- a/modules/ldap/build.gradle
+++ b/modules/ldap/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.2'
+    testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.3'
 }

From 6718285b0961ee415c5b466d9f1ce6acc3ee443e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 13:12:21 +0000
Subject: [PATCH 4249/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.3.0
 in /modules/couchbase

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 7ea3f816e0e..1d73edc3396 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'com.couchbase.client:java-client:3.7.3'
-    testImplementation 'org.awaitility:awaitility:4.2.0'
+    testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 3447a2270060ecc616136066b8e93dd57ba637e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 13:12:27 +0000
Subject: [PATCH 4250/4969] Bump org.awaitility:awaitility from 4.2.2 to 4.3.0
 in /modules/redpanda

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.2 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.2...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index c8d01c68ed2..95971f9f561 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
-    testImplementation 'org.awaitility:awaitility:4.2.2'
+    testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From ac7d3a83296ed95e50c381b6155fdaa8388e7d76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 13:12:45 +0000
Subject: [PATCH 4251/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /modules/openfga

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 6cbbaa91e68..82341045efb 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'dev.openfga:openfga-sdk:0.7.0'
 }
 

From f9c0e20871563345d87e5945c1cc50966502bfb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 13:12:58 +0000
Subject: [PATCH 4252/4969] Bump org.assertj:assertj-core in
 /modules/clickhouse

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 97b8d00d92c..d366825e261 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testRuntimeOnly(group: 'com.clickhouse', name: 'jdbc-v2', version: '0.7.2', classifier: 'http')
 
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
 }

From c46aec2ac64b7c52e8c4a4eda34bd268879b14ee Mon Sep 17 00:00:00 2001
From: InfoShare Devs <tomito14@interia.pl>
Date: Wed, 9 Jul 2025 15:59:01 +0200
Subject: [PATCH 4253/4969] Add support for queue in solace (#10450)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #10370

---------

Co-authored-by: Tomasz Forys <tomasz.forys@contractors.roche.com>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../org/testcontainers/solace/Service.java    |  15 +++
 .../solace/SolaceContainer.java               |  21 +++-
 .../solace/SolaceContainerAMQPTest.java       |   2 +-
 .../solace/SolaceContainerMQTTTest.java       |   2 +-
 .../solace/SolaceContainerRESTTest.java       |   2 +-
 .../solace/SolaceContainerSMFTest.java        | 118 +++++++++++++-----
 6 files changed, 122 insertions(+), 38 deletions(-)

diff --git a/modules/solace/src/main/java/org/testcontainers/solace/Service.java b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
index 6ec7de44d08..9c9342ef789 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/Service.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
@@ -4,10 +4,25 @@
  * Services that are supported by Testcontainers implementation
  */
 public enum Service {
+    /**
+     * Advanced Message Queuing Protocol
+     */
     AMQP("amqp", 5672, "amqp", false),
+    /**
+     * Message Queuing Telemetry Transport
+     */
     MQTT("mqtt", 1883, "tcp", false),
+    /**
+     * Representational State Transfer
+     */
     REST("rest", 9000, "http", false),
+    /**
+     * Solace Message Format
+     */
     SMF("smf", 55555, "tcp", true),
+    /**
+     * Solace Message Format with SSL
+     */
     SMF_SSL("smf", 55443, "tcps", true);
 
     private final String name;
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
index b2a00b32f31..00db0606536 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
@@ -65,11 +65,19 @@ public SolaceContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
+    /**
+     * Create a new solace container with the specified docker image.
+     *
+     * @param dockerImageName the image name that should be used.
+     */
     public SolaceContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withCreateContainerCmdModifier(cmd -> {
-            cmd.getHostConfig().withShmSize(SHM_SIZE).withUlimits(new Ulimit[] { new Ulimit("nofile", 2448L, 6592L) });
+            cmd
+                .getHostConfig()
+                .withShmSize(SHM_SIZE)
+                .withUlimits(new Ulimit[] { new Ulimit("nofile", 2448L, 1048576L) });
         });
         this.waitStrategy = Wait.forLogMessage(SOLACE_READY_MESSAGE, 1).withStartupTimeout(Duration.ofSeconds(60));
         withExposedPorts(8080);
@@ -103,6 +111,17 @@ private Transferable createConfigurationScript() {
             updateConfigScript(scriptBuilder, "create message-vpn " + vpn);
             updateConfigScript(scriptBuilder, "no shutdown");
             updateConfigScript(scriptBuilder, "exit");
+            updateConfigScript(scriptBuilder, "client-profile default message-vpn " + vpn);
+            updateConfigScript(scriptBuilder, "message-spool");
+            updateConfigScript(scriptBuilder, "allow-guaranteed-message-send");
+            updateConfigScript(scriptBuilder, "allow-guaranteed-message-receive");
+            updateConfigScript(scriptBuilder, "allow-guaranteed-endpoint-create");
+            updateConfigScript(scriptBuilder, "allow-guaranteed-endpoint-create-durability all");
+            updateConfigScript(scriptBuilder, "exit");
+            updateConfigScript(scriptBuilder, "exit");
+            updateConfigScript(scriptBuilder, "message-spool message-vpn " + vpn);
+            updateConfigScript(scriptBuilder, "max-spool-usage 60000");
+            updateConfigScript(scriptBuilder, "exit");
         }
 
         // Configure username and password
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
index 6c68d27d358..f7266fe8212 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
@@ -31,7 +31,7 @@ public class SolaceContainerAMQPTest {
     @Test
     public void testSolaceContainer() throws JMSException {
         try (
-            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.AMQP)
                 .withVpn("amqp-vpn")
         ) {
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
index ab7d5ed56bb..07c08d32416 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
@@ -27,7 +27,7 @@ public class SolaceContainerMQTTTest {
     @Test
     public void testSolaceContainer() {
         try (
-            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.MQTT)
                 .withVpn("mqtt-vpn")
         ) {
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
index f2722b986ca..7f54cec3f74 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
@@ -28,7 +28,7 @@ public class SolaceContainerRESTTest {
     @Test
     public void testSolaceContainer() throws IOException {
         try (
-            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.REST)
                 .withVpn("rest-vpn")
         ) {
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
index d7ccd94998e..d7e0e8ea981 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -1,11 +1,14 @@
 package org.testcontainers.solace;
 
 import com.solacesystems.jcsmp.BytesXMLMessage;
+import com.solacesystems.jcsmp.ConsumerFlowProperties;
+import com.solacesystems.jcsmp.EndpointProperties;
 import com.solacesystems.jcsmp.JCSMPException;
 import com.solacesystems.jcsmp.JCSMPFactory;
 import com.solacesystems.jcsmp.JCSMPProperties;
 import com.solacesystems.jcsmp.JCSMPSession;
 import com.solacesystems.jcsmp.JCSMPStreamingPublishCorrelatingEventHandler;
+import com.solacesystems.jcsmp.Queue;
 import com.solacesystems.jcsmp.TextMessage;
 import com.solacesystems.jcsmp.Topic;
 import com.solacesystems.jcsmp.XMLMessageConsumer;
@@ -30,40 +33,75 @@ public class SolaceContainerSMFTest {
 
     private static final Topic TOPIC = JCSMPFactory.onlyInstance().createTopic("Topic/ActualTopic");
 
+    private static final Queue QUEUE = JCSMPFactory.onlyInstance().createQueue("Queue");
+
     @Test
     public void testSolaceContainerWithSimpleAuthentication() {
         try (
             // solaceContainerSetup {
-            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.2")
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withCredentials("user", "pass")
-                .withTopic("Topic/ActualTopic", Service.SMF)
+                .withTopic(TOPIC.getName(), Service.SMF)
                 .withVpn("test_vpn")
             // }
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithBasicAuth(solaceContainer);
             assertThat(session).isNotNull();
-            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            consumeMessageFromTopics(session);
             session.closeSession();
         }
     }
 
+    @Test
+    public void testSolaceContainerWithCreateFlow() {
+        try (
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
+                .withCredentials("user", "pass")
+                .withTopic(TOPIC.getName(), Service.SMF)
+                .withVpn("test_vpn")
+        ) {
+            solaceContainer.start();
+            JCSMPSession session = createSessionWithBasicAuth(solaceContainer);
+            assertThat(session).isNotNull();
+            testCreateFlow(session);
+            session.closeSession();
+        }
+    }
+
+    private static void testCreateFlow(JCSMPSession session) {
+        try {
+            EndpointProperties endpointProperties = new EndpointProperties();
+            endpointProperties.setAccessType(EndpointProperties.ACCESSTYPE_NONEXCLUSIVE);
+            endpointProperties.setQuota(1000);
+            session.provision(QUEUE, endpointProperties, JCSMPSession.FLAG_IGNORE_ALREADY_EXISTS);
+            session.addSubscription(QUEUE, TOPIC, JCSMPSession.WAIT_FOR_CONFIRM);
+            ConsumerFlowProperties flowProperties = new ConsumerFlowProperties().setEndpoint(QUEUE);
+            TestConsumer listener = new TestConsumer();
+            session.createFlow(listener, flowProperties).start();
+            publishMessageToSolaceTopic(session);
+            listener.waitForMessage();
+        } catch (Exception e) {
+            throw new RuntimeException("Cannot process message using solace topic/queue: " + e.getMessage(), e);
+        }
+    }
+
     @Test
     public void testSolaceContainerWithCertificates() {
         try (
             // solaceContainerUsageSSL {
-            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.6")
+            SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withClientCert(
                     MountableFile.forClasspathResource("solace.pem"),
                     MountableFile.forClasspathResource("rootCA.crt")
                 )
-                .withTopic("Topic/ActualTopic", Service.SMF_SSL)
+                .withTopic(TOPIC.getName(), Service.SMF_SSL)
             // }
         ) {
             solaceContainer.start();
             JCSMPSession session = createSessionWithCertificates(solaceContainer);
             assertThat(session).isNotNull();
-            assertThat(consumeMessageFromSolace(session)).isEqualTo(MESSAGE);
+            consumeMessageFromTopics(session);
             session.closeSession();
         }
     }
@@ -112,7 +150,7 @@ private static JCSMPSession createSession(JCSMPProperties properties) {
         }
     }
 
-    private void publishMessageToSolace(JCSMPSession session) throws JCSMPException {
+    private static void publishMessageToSolaceTopic(JCSMPSession session) throws JCSMPException {
         XMLMessageProducer producer = session.getMessageProducer(
             new JCSMPStreamingPublishCorrelatingEventHandler() {
                 @Override
@@ -131,37 +169,49 @@ public void handleErrorEx(Object o, JCSMPException e, long l) {
         producer.send(msg, TOPIC);
     }
 
-    private String consumeMessageFromSolace(JCSMPSession session) {
-        CountDownLatch latch = new CountDownLatch(1);
+    private static void consumeMessageFromTopics(JCSMPSession session) {
         try {
-            String[] result = new String[1];
-            XMLMessageConsumer cons = session.getMessageConsumer(
-                new XMLMessageListener() {
-                    @Override
-                    public void onReceive(BytesXMLMessage msg) {
-                        if (msg instanceof TextMessage) {
-                            TextMessage textMessage = (TextMessage) msg;
-                            String message = textMessage.getText();
-                            result[0] = message;
-                            LOGGER.info("TextMessage received: " + message);
-                        }
-                        latch.countDown();
-                    }
-
-                    @Override
-                    public void onException(JCSMPException e) {
-                        LOGGER.error("Exception received: " + e.getMessage());
-                        latch.countDown();
-                    }
-                }
-            );
+            TestConsumer listener = new TestConsumer();
+            XMLMessageConsumer cons = session.getMessageConsumer(listener);
             session.addSubscription(TOPIC);
             cons.start();
-            publishMessageToSolace(session);
-            assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
-            return result[0];
+            publishMessageToSolaceTopic(session);
+            listener.waitForMessage();
         } catch (Exception e) {
-            throw new RuntimeException("Cannot receive message from solace", e);
+            throw new RuntimeException("Cannot process message using solace: " + e.getMessage(), e);
+        }
+    }
+
+    static class TestConsumer implements XMLMessageListener {
+
+        private final CountDownLatch latch = new CountDownLatch(1);
+
+        private String result;
+
+        @Override
+        public void onReceive(BytesXMLMessage msg) {
+            if (msg instanceof TextMessage) {
+                TextMessage textMessage = (TextMessage) msg;
+                String message = textMessage.getText();
+                result = message;
+                LOGGER.info("Message received: " + message);
+            }
+            latch.countDown();
+        }
+
+        @Override
+        public void onException(JCSMPException e) {
+            LOGGER.error("Exception received: " + e.getMessage());
+            latch.countDown();
+        }
+
+        private void waitForMessage() {
+            try {
+                assertThat(latch.await(10L, TimeUnit.SECONDS)).isTrue();
+                assertThat(result).isEqualTo(MESSAGE);
+            } catch (Exception e) {
+                throw new RuntimeException("Cannot receive message from solace: " + e.getMessage(), e);
+            }
         }
     }
 }

From c9026d4ffe44e2f75a35791641a88171e04735ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 15:13:16 +0000
Subject: [PATCH 4254/4969] Bump org.postgresql:postgresql from 42.7.4 to
 42.7.7 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.4 to 42.7.7.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.4...REL42.7.7)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 28a5a097189..05d6b3bc873 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.questdb:questdb:7.3.9'

From f39073d50e53c48ecc33afe59c6ad15750f0a081 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 15:13:19 +0000
Subject: [PATCH 4255/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.24.1 to 10.27.2.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-version: 10.27.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 3b8747d41f2..aae6c28eefd 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.3.0'
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.24.1'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.27.2'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 793c78409b0aae4dc700802d267b8fdda2925ac3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:10:07 +0000
Subject: [PATCH 4256/4969] Bump org.jetbrains:annotations in /modules/rabbitmq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 4993360a01e..751baaf15f8 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.22.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
 tasks.japicmp {

From 934c7791afc1188fa3780bcfca667369b15393ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:11:05 +0000
Subject: [PATCH 4257/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/nginx

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index f83aa158c9d..c05010c45e9 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From a32aad4cbb56a065a0aa231ce5e0d25abb692e5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:11:15 +0000
Subject: [PATCH 4258/4969] Bump org.jetbrains:annotations from 24.1.0 to
 26.0.2 in /modules/tidb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 43ef0603e3b..37a528a41ff 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From f0d8664a07274d57951d0d4ff61ad68edefaa188 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:11:17 +0000
Subject: [PATCH 4259/4969] Bump org.jetbrains:annotations in
 /modules/postgresql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.2.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/24.1.0...26.0.2)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5dc899ba2b8..885cbafabf5 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
 tasks.japicmp {

From 84a7fb3f9f0ef9fa603c050e1b642b9661dd9e7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 18:14:50 +0000
Subject: [PATCH 4260/4969] Bump org.postgresql:postgresql from 42.7.4 to
 42.7.7 in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.4 to 42.7.7.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.4...REL42.7.7)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 3c4b19e2dea..79ca4864f46 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 9f58cec3cdf22120e7cede77d5c79087e6c6e613 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 18:15:15 +0000
Subject: [PATCH 4261/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.4 to 42.7.7.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.4...REL42.7.7)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 885cbafabf5..bbe8e596b95 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 510da7d24001a308ce743d56ba318f7ecf9a83de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 18:15:46 +0000
Subject: [PATCH 4262/4969] Bump org.junit.platform:junit-platform-testkit in
 /modules/spock

Bumps [org.junit.platform:junit-platform-testkit](https://github.com/junit-team/junit-framework) from 1.11.0 to 1.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-testkit
  dependency-version: 1.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 04a26fa4bef..13be69af580 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.13.3'
 
     testCompileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 3c8e85518fd247b9729306d22d335789824389f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:24:15 +0000
Subject: [PATCH 4263/4969] Bump io.rest-assured:rest-assured in
 /modules/grafana

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index eb56136aa5c..5bc95949f2c 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 

From 2d94d62d061f69cb642eac4a35bfbbaeba80f008 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:24:19 +0000
Subject: [PATCH 4264/4969] Bump io.rest-assured:rest-assured from 5.5.0 to
 5.5.5 in /modules/consul

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index daa61b1766a..f62c74e96aa 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 1782fe8ecde25406746ad6c7264b57c8184f9310 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:24:26 +0000
Subject: [PATCH 4265/4969] Bump io.rest-assured:rest-assured in
 /modules/chromadb

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index b6821a87e3e..5017c481ee2 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
 }

From 583c333f9e83529cdc1a45c4185a39abab2a7788 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:24:42 +0000
Subject: [PATCH 4266/4969] Bump io.rest-assured:rest-assured from 5.5.0 to
 5.5.5 in /modules/ollama

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index 4785420ee0e..eda3bf5bb7a 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
 }

From f4996b3d730900b40da3991ada8205f0304fe92a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:24:52 +0000
Subject: [PATCH 4267/4969] Bump io.rest-assured:rest-assured from 5.5.0 to
 5.5.5 in /core

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 7f50ab1d4a5..219934586cd 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -121,7 +121,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"

From cb3474c052f718e882c439b8788e619a955b7528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:25:16 +0000
Subject: [PATCH 4268/4969] Bump io.rest-assured:rest-assured in
 /modules/redpanda

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 95971f9f561..11e674f5665 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -6,6 +6,6 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 97f82b6aca929eefc9b1fba07190444f2807ca17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:25:53 +0000
Subject: [PATCH 4269/4969] Bump io.rest-assured:rest-assured from 5.5.0 to
 5.5.5 in /modules/vault

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 1fe9eec0e6f..af9f27c505f 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 
 }

From 8034c9fd987054b967c101fa79c7bcc952b3dffe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 20:29:24 +0000
Subject: [PATCH 4270/4969] Bump gradle-update/update-gradle-wrapper-action
 from 2.0.0 to 2.1.0

Bumps [gradle-update/update-gradle-wrapper-action](https://github.com/gradle-update/update-gradle-wrapper-action) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/gradle-update/update-gradle-wrapper-action/releases)
- [Changelog](https://github.com/gradle-update/update-gradle-wrapper-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gradle-update/update-gradle-wrapper-action/compare/9268373d69bd0974b6318eb3b512b8e025060bbe...512b1875f3b6270828abfe77b247d5895a2da1e5)

---
updated-dependencies:
- dependency-name: gradle-update/update-gradle-wrapper-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index b69353a6ab5..659ceea134d 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@9268373d69bd0974b6318eb3b512b8e025060bbe # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies

From aa02da9fa7428490d1135b1415fb1500514d386f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 20:31:09 +0000
Subject: [PATCH 4271/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.13.4 to 1.15.1.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.4...v1.15.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-version: 1.15.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 5bc95949f2c..11f9e4de6ce 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.1'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.49.0')

From af4f5c2be4b7183e781d390855b04beb01537336 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 20:32:53 +0000
Subject: [PATCH 4272/4969] Bump io.opentelemetry:opentelemetry-bom in
 /modules/grafana

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.49.0 to 1.51.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.49.0...v1.51.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-version: 1.51.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 5bc95949f2c..8d3942fd147 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 
-    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.49.0')
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.51.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

From 49894a171a11c89c45e9e786f2b087e45f5f9a10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 22:05:48 +0000
Subject: [PATCH 4273/4969] Bump gradle/actions from 3 to 4

Bumps [gradle/actions](https://github.com/gradle/actions) from 3 to 4.
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/v3...v4)

---
updated-dependencies:
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index b69353a6ab5..85a42ad4da4 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -24,4 +24,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/actions/wrapper-validation@v3
+      - uses: gradle/actions/wrapper-validation@v4

From ecd354bce359bcbbe67a04519e9b7efbc7337cdd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 23:09:16 +0000
Subject: [PATCH 4274/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin from 2.0.2 to 2.3

Bumps [com.gradle:common-custom-user-data-gradle-plugin](https://github.com/gradle/common-custom-user-data-gradle-plugin) from 2.0.2 to 2.3.
- [Release notes](https://github.com/gradle/common-custom-user-data-gradle-plugin/releases)
- [Commits](https://github.com/gradle/common-custom-user-data-gradle-plugin/compare/v2.0.2...v2.3)

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-version: '2.3'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 401cb2be959..5f5bb6c46a8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.2"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.3"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }
 }

From 88e51c7505e9852d012582346e697ff71a574021 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 23:09:18 +0000
Subject: [PATCH 4275/4969] Bump
 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin

Bumps com.gradle.enterprise:com.gradle.enterprise.gradle.plugin from 3.18.2 to 3.19.2.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise:com.gradle.enterprise.gradle.plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 401cb2be959..f4f04e95558 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.19.2"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.2"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }

From 55163faa8ccb4477446066e3fc8708460549fe82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 10 Jul 2025 13:49:20 -0600
Subject: [PATCH 4276/4969] Add org.junit.platform:junit-platform-launcher

---
 docs/examples/junit5/redis/build.gradle | 7 ++++---
 modules/hivemq/build.gradle             | 3 ++-
 modules/junit-jupiter/build.gradle      | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index a5c9fb19810..b155797a7ad 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,10 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.3"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0"
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.27.3'
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index e006e84ca3b..46fb3e757a7 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,8 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.32.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index a08951228b8..8fdfb973427 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }

From c99eed60449595c1bbfd0b3c7439b76f816c6414 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 19:51:37 +0000
Subject: [PATCH 4277/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.10.3 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.10.3...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 46fb3e757a7..55919cb4fa5 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.32.0")

From 61959bea6da9bd282f902d775e45113f5fdf4a94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 19:51:55 +0000
Subject: [PATCH 4278/4969] Bump org.junit.jupiter:junit-jupiter in /smoke-test

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.11.0 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.11.0...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 smoke-test/turbo-mode/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index 552f568be91..0c456b18880 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 8fbb4be56dd78bb9c0b09c9088e1a768d4372d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 10 Jul 2025 21:06:17 -0600
Subject: [PATCH 4279/4969] Add org.junit.platform:junit-platform-launcher to
 examples

---
 examples/cucumber/build.gradle                     | 1 +
 examples/hazelcast/build.gradle                    | 1 +
 examples/immudb/build.gradle                       | 2 ++
 examples/kafka-cluster/build.gradle                | 1 +
 examples/nats/build.gradle                         | 1 +
 examples/neo4j-container/build.gradle              | 1 +
 examples/ollama-hugging-face/build.gradle          | 1 +
 examples/redis-backed-cache/build.gradle           | 1 +
 examples/selenium-container/build.gradle           | 2 +-
 examples/sftp/build.gradle                         | 1 +
 examples/singleton-container/build.gradle          | 1 +
 examples/solr-container/build.gradle               | 1 +
 examples/spring-boot-kotlin-redis/build.gradle.kts | 6 ++----
 examples/spring-boot/build.gradle                  | 2 +-
 examples/zookeeper/build.gradle                    | 1 +
 15 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 176fb35ee8d..257a2d3d897 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -19,6 +19,7 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.26.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 5b3789480ad..2a5404bf5c9 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index c99dceac836..f64d56c28c9 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -14,6 +14,8 @@ dependencies {
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 623fcd66175..e7ba6e83cad 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation 'org.awaitility:awaitility:4.2.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 5814d592c20..0932e961df9 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -13,6 +13,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 186a910be2f..af05a7cad82 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -12,4 +12,5 @@ dependencies {
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 77fe23ea1c2..87331d7a1ed 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 782416a239b..17aa2d9e06f 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index b7528880ca3..823a7ccfc41 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
 }
 
 test {
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index d8ed52d255f..639136e2afe 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 4b73e1125c6..02f17969fa9 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -17,6 +17,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 3b61202818e..2ab9db8f33e 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {
diff --git a/examples/spring-boot-kotlin-redis/build.gradle.kts b/examples/spring-boot-kotlin-redis/build.gradle.kts
index 7a4aa917f35..2d5d6bf9640 100644
--- a/examples/spring-boot-kotlin-redis/build.gradle.kts
+++ b/examples/spring-boot-kotlin-redis/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.7.10"
+    id("org.springframework.boot") version "2.7.18"
     kotlin("jvm") version "1.8.22"
     kotlin("plugin.spring") version "1.8.22"
 }
@@ -21,9 +21,7 @@ dependencies {
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.testcontainers:testcontainers")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
-
-
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.8.2")
 }
 
 tasks.withType<KotlinCompile> {
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 657b544e119..2001c393afa 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
 }
 
 test {
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 50555fe8f85..f58ce18e423 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {

From f05f9461a8e53616edcf14923797065a80ea7f6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 03:08:51 +0000
Subject: [PATCH 4280/4969] Bump org.junit.jupiter:junit-jupiter-engine in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit-framework) from 5.11.0 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.11.0...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index b155797a7ad..4419bc3216b 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,9 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From bcbe50b961097cb4f4a7b3ef064ac96a68bb4248 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 03:08:54 +0000
Subject: [PATCH 4281/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit-framework) from 5.10.3 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.10.3...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index b155797a7ad..4419bc3216b 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,9 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From 226b1351e1cca73f39b9b45a0aff1a6e217e61c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 03:08:54 +0000
Subject: [PATCH 4282/4969] Bump org.junit.jupiter:junit-jupiter-api in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit-framework) from 5.11.0 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.11.0...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index b155797a7ad..4419bc3216b 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,9 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.4.0.RELEASE"
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From c64c3c1128de73dac98e9004b7cea08e7bf474e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 03:08:57 +0000
Subject: [PATCH 4283/4969] Bump org.junit.jupiter:junit-jupiter from 5.11.0 to
 5.13.2 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.11.0 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.11.0...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle           | 2 +-
 examples/immudb/build.gradle              | 2 +-
 examples/kafka-cluster/build.gradle       | 2 +-
 examples/nats/build.gradle                | 2 +-
 examples/neo4j-container/build.gradle     | 2 +-
 examples/ollama-hugging-face/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle  | 2 +-
 examples/sftp/build.gradle                | 2 +-
 examples/singleton-container/build.gradle | 2 +-
 examples/solr-container/build.gradle      | 2 +-
 examples/zookeeper/build.gradle           | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 2a5404bf5c9..0a33949201e 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index f64d56c28c9..ee39cf51865 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index e7ba6e83cad..88d7539a732 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'org.awaitility:awaitility:4.2.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 0932e961df9..21b0baa3a3a 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'io.nats:jnats:2.20.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index af05a7cad82..7f85f5162a1 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 87331d7a1ed..4bfe199e62b 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:ollama'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 17aa2d9e06f..512045ef3e3 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 639136e2afe..fbb5f6cbe40 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 02f17969fa9..12449babc4a 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 2ab9db8f33e..8e479b04ee2 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index f58ce18e423..cd062e2b459 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 

From fcd9215cde8656a91e035075516dba7d8061c4db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 03:38:51 +0000
Subject: [PATCH 4284/4969] Bump org.junit:junit-bom from 5.10.3 to 5.13.2 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.10.3 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.10.3...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8fdfb973427..4c93a4e6b59 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.10.3')
+    implementation platform('org.junit:junit-bom:5.13.3')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')

From 30e7a10c7e2f1abdad226229178b35d44fd8f7b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 17:32:35 +0000
Subject: [PATCH 4285/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.3 to 1.3.7.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/v1.3.3...v1.3.7)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-version: 1.3.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 55919cb4fa5..2c25ae44855 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.32.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.8")
     testImplementation 'org.assertj:assertj-core:3.27.3'

From 5205e52c79d0caea4ba1119a7268d7155ca22064 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 17:33:05 +0000
Subject: [PATCH 4286/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.4 to 42.7.7.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.4...REL42.7.7)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4c93a4e6b59..1338385c863 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
 

From 94d21499582f352fbe047b6098eeefa2f8c58d3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 17:33:20 +0000
Subject: [PATCH 4287/4969] Bump org.postgresql:postgresql from 42.7.4 to
 42.7.7 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.4 to 42.7.7.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.4...REL42.7.7)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 13be69af580..7d50cdf02f0 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.13.3'

From 8e1da05b9cd629494675c3ed9cab5846fd428cba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 17:33:26 +0000
Subject: [PATCH 4288/4969] Bump com.gradleup.shadow from 8.3.0 to 8.3.8

Bumps com.gradleup.shadow from 8.3.0 to 8.3.8.

---
updated-dependencies:
- dependency-name: com.gradleup.shadow
  dependency-version: 8.3.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1d2a749c166..488f005147d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
-    id 'com.gradleup.shadow' version '8.3.0'
+    id 'com.gradleup.shadow' version '8.3.8'
     id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
     id 'com.diffplug.spotless' version '6.22.0' apply false
     id 'org.jreleaser' version '1.18.0' apply false

From b8e7a28f59746bd884d3f874dea9d5533bcf2fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 11 Jul 2025 12:43:49 -0600
Subject: [PATCH 4289/4969] Add org.junit.platform:junit-platform-launcher to
 smoke-test

---
 smoke-test/turbo-mode/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index 0c456b18880..1408842ee00 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -7,6 +7,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.assertj:assertj-core:3.27.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
 }
 
 test {

From 83423de681a05d2040e589c155d66b897f7cfcb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 18:46:22 +0000
Subject: [PATCH 4290/4969] Bump org.seleniumhq.selenium:selenium-api in
 /smoke-test

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.25.0 to 4.34.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.25.0...selenium-4.34.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-version: 4.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 5b955531fb9..50b7d9caf32 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.25.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0"
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 24411063432278643553140a17e89c44f8752c63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 20:01:22 +0000
Subject: [PATCH 4291/4969] Bump redis.clients:jedis from 5.1.5 to 6.0.0 in
 /modules/toxiproxy

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.5 to 6.0.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.5...v6.0.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 665587a50c4..fecefb33421 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
-    testImplementation 'redis.clients:jedis:5.1.5'
+    testImplementation 'redis.clients:jedis:6.0.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 26cb26c51b0b7168036480cf037692ecef004ca2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 20:02:03 +0000
Subject: [PATCH 4292/4969] Bump redis.clients:jedis from 5.1.5 to 6.0.0 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 5.1.5 to 6.0.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v5.1.5...v6.0.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1338385c863..121e949dbe2 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.1.5'
+    testImplementation 'redis.clients:jedis:6.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 527c75023ee39ce8f0d918b149028a789a9841ae Mon Sep 17 00:00:00 2001
From: Marcin Antas <antas.marcin@gmail.com>
Date: Sat, 12 Jul 2025 04:46:35 +0200
Subject: [PATCH 4293/4969] Update Weaviate to v1.29.0 (#10066)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../testcontainers/weaviate/WeaviateContainerTest.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index 53096182839..535b81126fd 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -19,7 +19,7 @@ public class WeaviateContainerTest {
     @Test
     public void testWeaviate() {
         try ( // container {
-            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.25.5")
+            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.29.0")
             // }
         ) {
             weaviate.start();
@@ -27,7 +27,7 @@ public void testWeaviate() {
             config.setGRPCHost(weaviate.getGrpcHostAddress());
             WeaviateClient client = new WeaviateClient(config);
             Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.25.5");
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.29.0");
         }
     }
 
@@ -43,13 +43,13 @@ public void testWeaviateWithModules() {
         Map<String, String> env = new HashMap<>();
         env.put("ENABLE_MODULES", String.join(",", enableModules));
         env.put("BACKUP_FILESYSTEM_PATH", "/tmp/backups");
-        try (WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.25.5").withEnv(env)) {
+        try (WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.29.0").withEnv(env)) {
             weaviate.start();
             Config config = new Config("http", weaviate.getHttpHostAddress());
             config.setGRPCHost(weaviate.getGrpcHostAddress());
             WeaviateClient client = new WeaviateClient(config);
             Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.25.5");
+            assertThat(meta.getResult().getVersion()).isEqualTo("1.29.0");
             Object modules = meta.getResult().getModules();
             assertThat(modules)
                 .isNotNull()

From 3d1c1b34887832fa76587d1029e6499802c70e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 14 Jul 2025 08:36:18 -0600
Subject: [PATCH 4294/4969] Remove support for docker/agents_gateway (#10473)

---
 .../containers/DockerMcpGatewayContainer.java             | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
index 8a91f9e651e..40e80ae2061 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
@@ -14,7 +14,7 @@
 /**
  * Testcontainers implementation of the Docker MCP Gateway container.
  * <p>
- * Supported images: {@code docker/agents_gateway}
+ * Supported images: {@code docker/mcp-gateway}
  * <p>
  * Exposed ports: 8811
  */
@@ -22,12 +22,8 @@ public class DockerMcpGatewayContainer extends GenericContainer<DockerMcpGateway
 
     private static final String DOCKER_MCP_GATEWAY_IMAGE = "docker/mcp-gateway";
 
-    private static final String DOCKER_AGENTS_GATEWAY_IMAGE = "docker/agents_gateway";
-
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_MCP_GATEWAY_IMAGE);
 
-    private static final DockerImageName DOCKER_AGENTS_IMAGE_NAME = DockerImageName.parse(DOCKER_AGENTS_GATEWAY_IMAGE);
-
     private static final int DEFAULT_PORT = 8811;
 
     private static final String SECRETS_PATH = "/testcontainers/app/secrets";
@@ -44,7 +40,7 @@ public DockerMcpGatewayContainer(String dockerImageName) {
 
     public DockerMcpGatewayContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DOCKER_AGENTS_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withExposedPorts(DEFAULT_PORT);
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Start sse server on port.*", 1));

From 97345730110edeff1d834e6d1a379e364f44c23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 14 Jul 2025 08:47:29 -0600
Subject: [PATCH 4295/4969] Fix docs for Docker MCP Gateway

---
 docs/modules/docker_mcp_gateway.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/docker_mcp_gateway.md b/docs/modules/docker_mcp_gateway.md
index da0b2e55c09..af526bab3fe 100644
--- a/docs/modules/docker_mcp_gateway.md
+++ b/docs/modules/docker_mcp_gateway.md
@@ -1,6 +1,6 @@
 # Docker MCP Gateway
 
-Testcontainers module for [Docker MCP Gateway](https://hub.docker.com/r/docker/agents_gateway).
+Testcontainers module for [Docker MCP Gateway](https://hub.docker.com/r/docker/mcp-gateway).
 
 ## DockerMcpGatewayContainer's usage examples
 

From e4c072de45063e3f229ced484d1e6863af4ba499 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 16:39:02 +0000
Subject: [PATCH 4296/4969] Bump org.apache.tomcat:tomcat-jdbc in
 /modules/jdbc-test

Bumps org.apache.tomcat:tomcat-jdbc from 10.0.27 to 11.0.8.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.8
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 52467ad8582..6712d720a47 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.27.3'
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
+    api 'org.apache.tomcat:tomcat-jdbc:11.0.9'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.33'
 }

From 29ddb31dcbd47953cabed36a6bd21aa590fa28de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 16:39:56 +0000
Subject: [PATCH 4297/4969] Bump com.google.cloud.tools:jib-core from 0.23.0 to
 0.27.3 in /core

Bumps [com.google.cloud.tools:jib-core](https://github.com/GoogleContainerTools/jib) from 0.23.0 to 0.27.3.
- [Release notes](https://github.com/GoogleContainerTools/jib/releases)
- [Commits](https://github.com/GoogleContainerTools/jib/commits)

---
updated-dependencies:
- dependency-name: com.google.cloud.tools:jib-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 423c4d4b612..ad8405fc906 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -78,7 +78,7 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    provided('com.google.cloud.tools:jib-core:0.23.0') {
+    provided('com.google.cloud.tools:jib-core:0.27.3') {
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
@@ -106,7 +106,7 @@ dependencies {
 
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
-    testImplementation('com.google.cloud.tools:jib-core:0.23.0')  {
+    testImplementation('com.google.cloud.tools:jib-core:0.27.3')  {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From 5f22d70b24cff0216f6dca5f236a6f32a268292c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:08:37 +0000
Subject: [PATCH 4298/4969] Bump io.kubernetes:client-java in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 21.0.1-legacy to 24.0.0-legacy.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/commits/v24.0.0-legacy)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-version: 24.0.0-legacy
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index e1454505c7e..17dab8a4537 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
     testImplementation 'io.fabric8:kubernetes-client:6.13.1'
-    testImplementation 'io.kubernetes:client-java:21.0.1-legacy'
+    testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 8e9100ca73fd88efb28529f4adb80cb3c2eac286 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:09:04 +0000
Subject: [PATCH 4299/4969] Bump com.timeplus:timeplus-native-jdbc in
 /modules/timeplus

Bumps [com.timeplus:timeplus-native-jdbc](https://github.com/timeplus-io/timeplus-native-jdbc) from 2.0.5 to 2.0.10.
- [Release notes](https://github.com/timeplus-io/timeplus-native-jdbc/releases)
- [Commits](https://github.com/timeplus-io/timeplus-native-jdbc/compare/v2.0.5...v2.0.10)

---
updated-dependencies:
- dependency-name: com.timeplus:timeplus-native-jdbc
  dependency-version: 2.0.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/timeplus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index a4656822de5..72da2ed182f 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.5'
+    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.10'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 91142a74648cde955c9a3e9a6b387161fbf4aca6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:26:15 +0000
Subject: [PATCH 4300/4969] Bump com.scylladb:java-driver-core in
 /modules/scylladb

Bumps [com.scylladb:java-driver-core](https://github.com/scylladb/java-driver) from 4.15.0.0 to 4.19.0.1.
- [Release notes](https://github.com/scylladb/java-driver/releases)
- [Commits](https://github.com/scylladb/java-driver/compare/4.15.0...4.19.0.1)

---
updated-dependencies:
- dependency-name: com.scylladb:java-driver-core
  dependency-version: 4.19.0.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index c2cd82ebf0f..a2dcc57fb0e 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: ScyllaDB"
 dependencies {
     api project(":testcontainers")
 
-    testImplementation 'com.scylladb:java-driver-core:4.15.0.0'
+    testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'software.amazon.awssdk:dynamodb:2.28.6'
 }

From e128465790d1fb65b2efd9b6af7da7c1f32eda1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:33:54 +0000
Subject: [PATCH 4301/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 3.8.0 to 4.0.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 11e674f5665..752ae5aa98e 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.33'
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
+    testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'org.awaitility:awaitility:4.3.0'

From e889988f2fd15269eaf3f4c508d6752f9c9656bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:34:03 +0000
Subject: [PATCH 4302/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.8 to 1.5.18.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.8...v_1.5.18)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 55919cb4fa5..b7cc6bf43c5 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.32.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.5.8")
+    testImplementation("ch.qos.logback:logback-classic:1.5.18")
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 678702c31f074f66cd463ae0a8b4080e0be84c0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:35:40 +0000
Subject: [PATCH 4303/4969] Bump dev.openfga:openfga-sdk from 0.7.0 to 0.8.1 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.7.0 to 0.8.1.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.7.0...v0.8.1)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 82341045efb..45f4cf1244c 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'dev.openfga:openfga-sdk:0.7.0'
+    testImplementation 'dev.openfga:openfga-sdk:0.8.2'
 }
 
 test {

From e8a7a82b918139f9e94a3dd2e0ba0e89e370e42c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:37:20 +0000
Subject: [PATCH 4304/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /modules/neo4j

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.18 to 4.4.20.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.18...4.4.20)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index ed9a07b8ec4..9c7a70454ff 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 11818c491d42b95a58a7cfc4c7a31c50d9aea0c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 19:44:45 +0000
Subject: [PATCH 4305/4969] Bump com.yugabyte:jdbc-yugabytedb in
 /modules/yugabytedb

Bumps [com.yugabyte:jdbc-yugabytedb](https://github.com/yugabyte/pgjdbc) from 42.3.5-yb-6 to 42.7.3-yb-4.
- [Release notes](https://github.com/yugabyte/pgjdbc/releases)
- [Changelog](https://github.com/yugabyte/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yugabyte/pgjdbc/compare/v42.3.5-yb-6...v42.7.3-yb-4)

---
updated-dependencies:
- dependency-name: com.yugabyte:jdbc-yugabytedb
  dependency-version: 42.7.3-yb-4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/yugabytedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index cb5d583b4ca..7d124651a64 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.15.0-yb-2-TESTFIX.0'
     // YSQL driver
-    testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.3.5-yb-6'
+    testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.7.3-yb-4'
 }

From c0cc69b792cd457eda6e3e902de8c2105daa52dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:17:24 +0000
Subject: [PATCH 4306/4969] Bump com.databend:databend-jdbc from 0.3.2 to 0.3.9
 in /modules/databend

Bumps [com.databend:databend-jdbc](https://github.com/databendcloud/databend-jdbc) from 0.3.2 to 0.3.9.
- [Release notes](https://github.com/databendcloud/databend-jdbc/releases)
- [Commits](https://github.com/databendcloud/databend-jdbc/compare/v0.3.2...v0.3.9)

---
updated-dependencies:
- dependency-name: com.databend:databend-jdbc
  dependency-version: 0.3.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 65b014314a3..8eac99519c4 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.databend:databend-jdbc:0.3.2'
+    testRuntimeOnly 'com.databend:databend-jdbc:0.3.9'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From ae89f6e8c4da8d61ceeb981e6670f5576de2dec0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:18:20 +0000
Subject: [PATCH 4307/4969] Bump com.timeplus:timeplus-native-jdbc in
 /modules/timeplus

Bumps [com.timeplus:timeplus-native-jdbc](https://github.com/timeplus-io/timeplus-native-jdbc) from 2.0.5 to 2.0.7.
- [Release notes](https://github.com/timeplus-io/timeplus-native-jdbc/releases)
- [Commits](https://github.com/timeplus-io/timeplus-native-jdbc/compare/v2.0.5...v2.0.7)

---
updated-dependencies:
- dependency-name: com.timeplus:timeplus-native-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/timeplus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index a4656822de5..72da2ed182f 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.5'
+    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.10'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From f87692f46be1a197124101eb66a83b343146a5dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:18:44 +0000
Subject: [PATCH 4308/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.1-jre to 33.4.8-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.4.8-jre
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 52467ad8582..29dbc9e8897 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:33.3.1-jre'
+    api 'com.google.guava:guava:33.4.8-jre'
     api 'org.apache.commons:commons-lang3:3.17.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'

From 9ddbedae4240c0efe536537822742bc41d79527c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:18:53 +0000
Subject: [PATCH 4309/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-free

Bumps com.oracle.database.jdbc:ojdbc11 from 23.5.0.24.07 to 23.8.0.25.04.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.8.0.25.04
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index cc19ce93d54..8ce9ace6b46 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.8.0.25.04'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 

From fb365d884b6e016db4522238d70ce013fdaf0a64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:18:54 +0000
Subject: [PATCH 4310/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 23.5.0.24.07 to 23.8.0.25.04.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.8.0.25.04
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index c509b3bf431..e61c4ea9abe 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.5.0.24.07'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.8.0.25.04'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 

From e81d15101fec7388a7a6242832cfb37ef831931a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:18:56 +0000
Subject: [PATCH 4311/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.4.1 to 3.5.4.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.4.1...3.5.4)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-version: 3.5.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7492300b4b6..416ae4f2707 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.4.1'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.4'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 03087b423b7519a1805c76fd9117fbe09893a3f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:19:00 +0000
Subject: [PATCH 4312/4969] Bump org.apache.tomcat:tomcat-jdbc in
 /modules/jdbc-test

Bumps org.apache.tomcat:tomcat-jdbc from 10.0.27 to 11.0.2.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 52467ad8582..6712d720a47 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.27.3'
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
+    api 'org.apache.tomcat:tomcat-jdbc:11.0.9'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.33'
 }

From 0c041476eb8c5e2953481b715929b9316c693855 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:19:21 +0000
Subject: [PATCH 4313/4969] Bump io.trino:trino-jdbc from 458 to 476 in
 /modules/trino

Bumps io.trino:trino-jdbc from 458 to 476.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-version: '476'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 0977b0306b4..f8d3a4f1307 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:458'
+    testRuntimeOnly 'io.trino:trino-jdbc:476'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 26acfc1f1c0003a95268e2d425ee43c413a0ed2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:19:25 +0000
Subject: [PATCH 4314/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 10.1.30 to 11.0.8.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.8
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 009533503bc..de68d8816d0 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.30'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.9'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 8ecdf31277a92bc49e03ea0475148a634407c897 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:19:26 +0000
Subject: [PATCH 4315/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/azure

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.8.1.jre8 to 13.1.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.1.0.jre8-preview
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 03cdcdd15d0..31699f62ad6 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'com.azure:azure-data-tables:12.5.0'
     testImplementation 'com.azure:azure-messaging-eventhubs:5.19.2'
     testImplementation 'com.azure:azure-messaging-servicebus:7.17.8'
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.0.jre8-preview'
 }

From 77dd4fc0fe56b8be7ef86d158e32cd157641200e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 20:19:33 +0000
Subject: [PATCH 4316/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 12.8.1.jre8 to 13.1.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.1.0.jre8-preview
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 006c5d38031..899bbcc88db 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.0.jre8-preview'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From b1c6297bd5690c6ec7a8c3c39fd4673d58dee0fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 01:51:24 +0000
Subject: [PATCH 4317/4969] Bump slackapi/slack-github-action from 2.1.0 to
 2.1.1

Bumps [slackapi/slack-github-action](https://github.com/slackapi/slack-github-action) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/slackapi/slack-github-action/releases)
- [Commits](https://github.com/slackapi/slack-github-action/compare/v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: slackapi/slack-github-action
  dependency-version: 2.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/moby-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 7c25a3bb8cf..dbb717757b3 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Notify to Slack on failures
         if: failure()
         id: slack
-        uses: slackapi/slack-github-action@v2.1.0
+        uses: slackapi/slack-github-action@v2.1.1
         with:
           payload: |
             {

From fa2553da83c5c004e40d252e4967ddbf798b93e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 02:06:26 +0000
Subject: [PATCH 4318/4969] Bump org.awaitility:awaitility from 4.2.0 to 4.3.0
 in /core

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 423c4d4b612..ba3475859f6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -86,7 +86,7 @@ dependencies {
         exclude group: 'org.apache.commons', module: 'commons-compress'
     }
 
-    shaded 'org.awaitility:awaitility:4.2.0'
+    shaded 'org.awaitility:awaitility:4.3.0'
 
     api platform('com.github.docker-java:docker-java-bom:3.4.2')
     shaded platform('com.github.docker-java:docker-java-bom:3.4.2')

From 985383c1a913eac91479f43cd4a7b8611261135f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 15 Jul 2025 09:30:04 -0600
Subject: [PATCH 4319/4969] Use azure-sdk-bom (#10480)

---
 modules/azure/build.gradle | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 31699f62ad6..d3baf572321 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -7,11 +7,12 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'com.azure:azure-cosmos:4.63.3'
-    testImplementation 'com.azure:azure-storage-blob:12.29.0'
-    testImplementation 'com.azure:azure-storage-queue:12.24.0'
-    testImplementation 'com.azure:azure-data-tables:12.5.0'
-    testImplementation 'com.azure:azure-messaging-eventhubs:5.19.2'
-    testImplementation 'com.azure:azure-messaging-servicebus:7.17.8'
+    testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
+    testImplementation 'com.azure:azure-cosmos'
+    testImplementation 'com.azure:azure-storage-blob'
+    testImplementation 'com.azure:azure-storage-queue'
+    testImplementation 'com.azure:azure-data-tables'
+    testImplementation 'com.azure:azure-messaging-eventhubs'
+    testImplementation 'com.azure:azure-messaging-servicebus'
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.0.jre8-preview'
 }

From 72ab602589ecd9c0840a590704e16aed49c65379 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:38:51 +0000
Subject: [PATCH 4320/4969] Bump com.oracle.database.r2dbc:oracle-r2dbc in
 /modules/oracle-free

Bumps [com.oracle.database.r2dbc:oracle-r2dbc](https://github.com/oracle/oracle-r2dbc) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/oracle/oracle-r2dbc/releases)
- [Commits](https://github.com/oracle/oracle-r2dbc/compare/1.2.0...1.3.0)

---
updated-dependencies:
- dependency-name: com.oracle.database.r2dbc:oracle-r2dbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 8ce9ace6b46..424f6c48616 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
+    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.8.0.25.04'
@@ -12,5 +12,5 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:26.0.2'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
+    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 }

From fa83c47e29940a81de65751ad331856607b2a5bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:38:58 +0000
Subject: [PATCH 4321/4969] Bump com.oracle.database.r2dbc:oracle-r2dbc in
 /modules/oracle-xe

Bumps [com.oracle.database.r2dbc:oracle-r2dbc](https://github.com/oracle/oracle-r2dbc) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/oracle/oracle-r2dbc/releases)
- [Commits](https://github.com/oracle/oracle-r2dbc/compare/1.2.0...1.3.0)

---
updated-dependencies:
- dependency-name: com.oracle.database.r2dbc:oracle-r2dbc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index e61c4ea9abe..ff04ca864d1 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
+    compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.8.0.25.04'
@@ -12,7 +12,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:26.0.2'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
+    testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 }
 
 tasks.japicmp {

From 4c7b73cdca04b3280f7c528ee5cea6b33be614bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:06:12 +0000
Subject: [PATCH 4322/4969] Bump org.vibur:vibur-dbcp from 25.0 to 26.0 in
 /modules/jdbc-test

Bumps [org.vibur:vibur-dbcp](https://github.com/vibur/vibur-dbcp) from 25.0 to 26.0.
- [Changelog](https://github.com/vibur/vibur-dbcp/blob/master/CHANGELOG)
- [Commits](https://github.com/vibur/vibur-dbcp/compare/25.0...26.0)

---
updated-dependencies:
- dependency-name: org.vibur:vibur-dbcp
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 aff78b9efdf..507313e9ad2 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     api 'org.assertj:assertj-core:3.27.3'
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.9'
-    api 'org.vibur:vibur-dbcp:25.0'
+    api 'org.vibur:vibur-dbcp:26.0'
     api 'mysql:mysql-connector-java:8.0.33'
 }

From 4dc82f49361609cb1b29ff24b948360e1f81dff8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:06:17 +0000
Subject: [PATCH 4323/4969] Bump org.vibur:vibur-dbcp from 25.0 to 26.0 in
 /modules/jdbc

Bumps [org.vibur:vibur-dbcp](https://github.com/vibur/vibur-dbcp) from 25.0 to 26.0.
- [Changelog](https://github.com/vibur/vibur-dbcp/blob/master/CHANGELOG)
- [Commits](https://github.com/vibur/vibur-dbcp/compare/25.0...26.0)

---
updated-dependencies:
- dependency-name: org.vibur:vibur-dbcp
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index de68d8816d0..c343cd17a4a 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
-    testImplementation 'org.vibur:vibur-dbcp:25.0'
+    testImplementation 'org.vibur:vibur-dbcp:26.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.9'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.27.3'

From 6531e902532b3d57143168aea402e5c88abd531a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:06:37 +0000
Subject: [PATCH 4324/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.10 to 3.7.7.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.6.10...v3.7.7)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-version: 3.7.7
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 0c2bde505b1..b506f5a2515 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.6.10'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.7.8'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.3'
 }

From a8ef0f3d5f2715b7338f8f08f7b0705abfda1c4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:06:40 +0000
Subject: [PATCH 4325/4969] Bump io.asyncer:r2dbc-mysql from 1.3.0 to 1.4.1 in
 /modules/mysql

Bumps [io.asyncer:r2dbc-mysql](https://github.com/asyncer-io/r2dbc-mysql) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/asyncer-io/r2dbc-mysql/releases)
- [Commits](https://github.com/asyncer-io/r2dbc-mysql/compare/r2dbc-mysql-1.3.0...r2dbc-mysql-1.4.1)

---
updated-dependencies:
- dependency-name: io.asyncer:r2dbc-mysql
  dependency-version: 1.4.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mysql/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 4858aa20ff5..3055cd141fc 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -4,13 +4,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.asyncer:r2dbc-mysql:1.3.0'
+    compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.3.0'
+    testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 4334f84f23213afb5c65f1b6f8bc48071cf5cbf8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:00:03 +0000
Subject: [PATCH 4326/4969] Bump org.apache.solr:solr-solrj from 8.11.3 to
 8.11.4 in /examples

Bumps org.apache.solr:solr-solrj from 8.11.3 to 8.11.4.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/solr-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 8e479b04ee2..58c380676d2 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.34"
     annotationProcessor "org.projectlombok:lombok:1.18.34"
 
-    implementation 'org.apache.solr:solr-solrj:8.11.3'
+    implementation 'org.apache.solr:solr-solrj:8.11.4'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

From 40c765a8be4dd3c3cc21f2bd04d7ca982da77cd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:00:23 +0000
Subject: [PATCH 4327/4969] Bump org.apache.curator:curator-framework in
 /examples

Bumps [org.apache.curator:curator-framework](https://github.com/apache/curator) from 5.7.0 to 5.8.0.
- [Release notes](https://github.com/apache/curator/releases)
- [Commits](https://github.com/apache/curator/compare/apache-curator-5.7.0...apache-curator-5.8.0)

---
updated-dependencies:
- dependency-name: org.apache.curator:curator-framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/zookeeper/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index cd062e2b459..835280cdfc0 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.apache.curator:curator-framework:5.7.0'
+    testImplementation 'org.apache.curator:curator-framework:5.8.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From b1cfe22dccac09173645ed68d11dec441047732a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:53:27 +0000
Subject: [PATCH 4328/4969] Bump com.rabbitmq:amqp-client from 5.22.0 to 5.25.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.22.0 to 5.25.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.22.0...v5.25.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 751baaf15f8..3137ec7f7e1 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.22.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.25.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 20a33803d6f83209ddd657ce1894fdf0131ba66a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:53:27 +0000
Subject: [PATCH 4329/4969] Bump com.rabbitmq:amqp-client from 5.22.0 to 5.25.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.22.0 to 5.25.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.22.0...v5.25.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 423c4d4b612..c7cc63cc630 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:6.0.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.22.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.25.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 546a007489464f249c8d98869827a4e5fed7cb0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 17:53:30 +0000
Subject: [PATCH 4330/4969] Bump io.minio:minio from 8.5.12 to 8.5.17 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.5.12 to 8.5.17.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.5.12...8.5.17)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index bbce75f2c47..8fae8536fb0 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.5.12")
+    testImplementation("io.minio:minio:8.5.17")
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 0dd3a76052bd322fade3cb8c236f9e57fc2c387e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 19:14:37 +0000
Subject: [PATCH 4331/4969] Bump org.influxdb:influxdb-java from 2.24 to 2.25
 in /modules/influxdb

Bumps [org.influxdb:influxdb-java](https://github.com/influxdata/influxdb-java) from 2.24 to 2.25.
- [Release notes](https://github.com/influxdata/influxdb-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-java/compare/influxdb-java-2.24...influxdb-java-2.25)

---
updated-dependencies:
- dependency-name: org.influxdb:influxdb-java
  dependency-version: '2.25'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 4964fbac33e..fb463aaecff 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.24'
+    compileOnly 'org.influxdb:influxdb-java:2.25'
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'org.influxdb:influxdb-java:2.24'
+    testImplementation 'org.influxdb:influxdb-java:2.25'
     testImplementation "com.influxdb:influxdb-client-java:6.12.0"
 }
 

From 9ece57b4f2d15af445b68d7976fc8b7f55687166 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 19:14:41 +0000
Subject: [PATCH 4332/4969] Bump com.zaxxer:HikariCP from 4.0.3 to 6.3.0 in
 /modules/junit-jupiter

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.3 to 6.3.0.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.3...HikariCP-6.3.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 121e949dbe2..99ac3119075 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
-    testImplementation 'com.zaxxer:HikariCP:4.0.3'
+    testImplementation 'com.zaxxer:HikariCP:6.3.0'
     testImplementation 'redis.clients:jedis:6.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 4374688c6e7400fac12f2b6c338f23ccb0143949 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 19:17:43 +0000
Subject: [PATCH 4333/4969] Bump org.apache.activemq:activemq-client in
 /modules/activemq

Bumps [org.apache.activemq:activemq-client](https://github.com/apache/activemq) from 6.1.2 to 6.1.7.
- [Commits](https://github.com/apache/activemq/compare/activemq-6.1.2...activemq-6.1.7)

---
updated-dependencies:
- dependency-name: org.apache.activemq:activemq-client
  dependency-version: 6.1.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 2d2440827ef..89637555670 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation "org.apache.activemq:activemq-client:6.1.2"
+    testImplementation "org.apache.activemq:activemq-client:6.1.7"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.37.0"
 }

From c935f7f392c306fe2bb64fdb6f2e8014f3b942e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 20:40:03 +0000
Subject: [PATCH 4334/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.32.0 to 4.41.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.32.0...4.41.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-version: 4.41.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 40791439aa4..898f0ba5639 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.32.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.41.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.18")

From c4920b1a903e7aba1a2c2bb5c70d8cd114d793a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 20:40:22 +0000
Subject: [PATCH 4335/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/spock

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.10.3 to 1.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 1.13.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1b2f5b98a49..7a5c6e0e0fc 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.13.3'
 
     testCompileOnly 'org.jetbrains:annotations:26.0.2'

From 329b8885e5fcd8e182f4ce93f2ab7be291d180a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 20:40:24 +0000
Subject: [PATCH 4336/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 8.15.1 to 9.0.3.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v8.15.1...v9.0.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index f0f260c5fb0..0370bab602f 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.15.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.0.3"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 1ebf422042bd4f3e0ceb69e2f373d16e5c410b55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:41:17 +0000
Subject: [PATCH 4337/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.7.3 to 3.8.2.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/core-io-3.7.3...core-io-3.8.2)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-version: 3.8.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 1d73edc3396..47b8a28b8fa 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.7.3'
+    testImplementation 'com.couchbase.client:java-client:3.8.3'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From e85d0ea81892a4354decbe830933f9e5c8a42149 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:41:20 +0000
Subject: [PATCH 4338/4969] Bump io.fabric8:kubernetes-client from 6.13.1 to
 7.3.1 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.13.1 to 7.3.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.13.1...v7.3.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-version: 7.3.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 17dab8a4537..d82683a4370 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.13.1'
+    testImplementation 'io.fabric8:kubernetes-client:7.3.1'
     testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 193021764e40bf4c27b18efd61d5d27348546040 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:41:30 +0000
Subject: [PATCH 4339/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.12.0 to 7.3.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v6.12.0...v7.3.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-version: 7.3.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index fb463aaecff..7a5aa985beb 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.influxdb:influxdb-java:2.25'
-    testImplementation "com.influxdb:influxdb-client-java:6.12.0"
+    testImplementation "com.influxdb:influxdb-client-java:7.3.0"
 }
 
 tasks.japicmp {

From 69c4161a2e8cb32d7fc48f6506a417232be7ff81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:41:35 +0000
Subject: [PATCH 4340/4969] Bump uk.org.webcompere:system-stubs-junit4 in
 /modules/grafana

Bumps [uk.org.webcompere:system-stubs-junit4](https://github.com/webcompere/system-stubs) from 2.1.6 to 2.1.8.
- [Release notes](https://github.com/webcompere/system-stubs/releases)
- [Changelog](https://github.com/webcompere/system-stubs/blob/main/History.md)
- [Commits](https://github.com/webcompere/system-stubs/compare/system-stubs-parent-2.1.6...system-stubs-parent-2.1.8)

---
updated-dependencies:
- dependency-name: uk.org.webcompere:system-stubs-junit4
  dependency-version: 2.1.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 7ab23016b14..d4dbe68355d 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.1'
-    testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
+    testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.51.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'

From 90aa23928ed38efea7a01bbae5d91f37173728b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:41:42 +0000
Subject: [PATCH 4341/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.37.0 to 2.41.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-version: 2.41.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 89637555670..da683e0ad13 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.7"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.37.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.41.0"
 }

From 871680fde8f8b5c5f203b759b53095a1051169f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:41:46 +0000
Subject: [PATCH 4342/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.7.2 to 3.7.3.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.7.2...3.7.3)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 5ed2e137a3d..587ee684b68 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     api "com.orientechnologies:orientdb-client:3.2.42"
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.3'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.42"
 }
 

From f2dacfbd4c71179b4ebc32b29b270fd1e605792f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:41:48 +0000
Subject: [PATCH 4343/4969] Bump org.apache.solr:solr-solrj from 8.11.3 to
 8.11.4 in /modules/solr

Bumps org.apache.solr:solr-solrj from 8.11.3 to 8.11.4.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 8d9397cd299..f4ac079772d 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    testImplementation 'org.apache.solr:solr-solrj:8.11.3'
+    testImplementation 'org.apache.solr:solr-solrj:8.11.4'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 5b321b033da74f865ec81f2fa3405c03e9e2dd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 15 Jul 2025 19:03:25 -0600
Subject: [PATCH 4344/4969] Update com.google.cloud:libraries-bom version to
 26.63.0 (#10485)

---
 modules/gcloud/build.gradle                                  | 2 +-
 .../containers/BigtableEmulatorContainerTest.java            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index d1ba980fc8c..4221cbc078f 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.43.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.63.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
index 8a100855b3c..a532d5e70af 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -12,6 +12,7 @@
 import com.google.cloud.bigtable.admin.v2.stub.EnhancedBigtableTableAdminStub;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
+import com.google.cloud.bigtable.data.v2.internal.TableAdminRequestContext;
 import com.google.cloud.bigtable.data.v2.models.Row;
 import com.google.cloud.bigtable.data.v2.models.RowCell;
 import com.google.cloud.bigtable.data.v2.models.RowMutation;
@@ -80,12 +81,14 @@ private void createTable(
         CredentialsProvider credentialsProvider,
         String tableName
     ) throws IOException {
+        TableAdminRequestContext requestContext = TableAdminRequestContext.create(PROJECT_ID, INSTANCE_ID);
         EnhancedBigtableTableAdminStub stub = EnhancedBigtableTableAdminStub.createEnhanced(
             BigtableTableAdminStubSettings
                 .newBuilder()
                 .setTransportChannelProvider(channelProvider)
                 .setCredentialsProvider(credentialsProvider)
-                .build()
+                .build(),
+            requestContext
         );
 
         try (BigtableTableAdminClient client = BigtableTableAdminClient.create(PROJECT_ID, INSTANCE_ID, stub)) {

From ef4aa7e8f1bb94250c941f14dc82ee5bec74d108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 15 Jul 2025 19:08:33 -0600
Subject: [PATCH 4345/4969] Update org.questdb:questdb version to 9.0.0
 (#10486)

---
 modules/questdb/build.gradle                                    | 2 +-
 .../org/testcontainers/junit/questdb/SimpleQuestDBTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 05d6b3bc873..7364293bbcc 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'org.questdb:questdb:7.3.9'
+    testImplementation 'org.questdb:questdb:9.0.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
diff --git a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
index c38524018c3..16198740c0e 100644
--- a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
+++ b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
@@ -57,7 +57,7 @@ public void testRest() throws IOException {
     }
 
     private static void populateByInfluxLineProtocol(QuestDBContainer questdb, int rowCount) {
-        try (Sender sender = Sender.builder().address(questdb.getIlpUrl()).build()) {
+        try (Sender sender = Sender.builder(Sender.Transport.TCP).address(questdb.getIlpUrl()).build()) {
             for (int i = 0; i < rowCount; i++) {
                 sender
                     .table(TABLE_NAME)

From 9efe8f3731795ab58140b841447fe70d3ccae803 Mon Sep 17 00:00:00 2001
From: ZachChuba <49295341+ZachChuba@users.noreply.github.com>
Date: Tue, 15 Jul 2025 23:25:55 -0400
Subject: [PATCH 4346/4969] Update jackson, snakeyaml and docker-java versions
 (#10258)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update jackson version to 2.18.4
* Update docker-java version to 3.5.3
* Update snakeyaml version to 2.4

Fixes #9289

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 core/build.gradle        | 11 +++++------
 modules/k3s/build.gradle |  6 ++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2d3f6ff96c8..138c0548f0f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -62,9 +62,8 @@ tasks.japicmp {
 
 configurations.all {
     resolutionStrategy {
-        // use lower Jackson version
-        force 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
-        force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8'
+        force 'com.fasterxml.jackson.core:jackson-databind:2.18.4'
+        force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.4'
     }
 }
 
@@ -88,8 +87,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.4.2')
-    shaded platform('com.github.docker-java:docker-java-bom:3.4.2')
+    api platform('com.github.docker-java:docker-java-bom:3.5.3')
+    shaded platform('com.github.docker-java:docker-java-bom:3.5.3')
 
     api "com.github.docker-java:docker-java-api"
 
@@ -100,7 +99,7 @@ dependencies {
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
     shaded 'com.google.guava:guava:33.3.1-jre'
-    shaded "org.yaml:snakeyaml:1.33"
+    shaded "org.yaml:snakeyaml:2.4"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index d82683a4370..fd52f632cae 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -3,10 +3,8 @@ description = "Testcontainers :: K3S"
 dependencies {
     api project(":testcontainers")
 
-    // https://youtu.be/otCpCn0l4Wo
-    // The core module depends on jackson-databind 2.8.x for backward compatibility.
-    // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
-    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
+    // Synchronize with the jackson version, must match major and minor version
+    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'
 
     testImplementation 'io.fabric8:kubernetes-client:7.3.1'
     testImplementation 'io.kubernetes:client-java:24.0.0-legacy'

From 8547d5b428ee4a70796dc04a736d20cb6d36494a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 15 Jul 2025 21:36:20 -0600
Subject: [PATCH 4347/4969] Allow dependabot updates for snakeyaml and
 commons-compress

---
 .github/dependabot.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fe7a57a8603..fe70c0cec98 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,12 +16,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.mockito:mockito-core"
         update-types: [ "version-update:semver-major" ]
-      - dependency-name: "org.yaml:snakeyaml"
-        update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
-      - dependency-name: "org.apache.commons:commons-compress"
-        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:

From dd7362a0421275c12afed1189a9ba9adb8feb582 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:14 +0000
Subject: [PATCH 4348/4969] Bump com.squareup.okhttp3:okhttp in
 /modules/couchbase

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.12.0 to 5.1.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.12.0...parent-5.1.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 47b8a28b8fa..08636089467 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.12.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
     testImplementation 'com.couchbase.client:java-client:3.8.3'
     testImplementation 'org.awaitility:awaitility:4.3.0'

From 854a5351f26c8fbc06b6356c17d34b8a75ffd3fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:16 +0000
Subject: [PATCH 4349/4969] Bump com.databend:databend-jdbc from 0.3.9 to 0.4.0
 in /modules/databend

Bumps [com.databend:databend-jdbc](https://github.com/databendcloud/databend-jdbc) from 0.3.9 to 0.4.0.
- [Release notes](https://github.com/databendcloud/databend-jdbc/releases)
- [Commits](https://github.com/databendcloud/databend-jdbc/compare/v0.3.9...v0.4.0)

---
updated-dependencies:
- dependency-name: com.databend:databend-jdbc
  dependency-version: 0.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 8eac99519c4..392c2b51eb0 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.databend:databend-jdbc:0.3.9'
+    testRuntimeOnly 'com.databend:databend-jdbc:0.4.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 457e94d3da5252cf769e4aae78e695840df09109 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:30 +0000
Subject: [PATCH 4350/4969] Bump com.squareup.okhttp3:okhttp from 4.12.0 to
 5.1.0 in /modules/azure

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.12.0 to 5.1.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.12.0...parent-5.1.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index d3baf572321..b0878d7e0d8 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':mssqlserver')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.12.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")

From 91d27f3e27c43059584036332f550517b5d26be9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:48 +0000
Subject: [PATCH 4351/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/hivemq

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.10.3 to 1.13.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 1.13.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 898f0ba5639..e2373eb1e7b 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.41.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")

From 5ba6c8c2eb8ef6965fc1c4aaed2b062882fbd942 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:49 +0000
Subject: [PATCH 4352/4969] Bump org.junit.platform:junit-platform-launcher

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.10.3 to 1.13.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 1.13.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 99ac3119075..3ff102a8ece 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }

From aec04511f817474ba9270ceab9e5b1eeb9b8f94b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:50 +0000
Subject: [PATCH 4353/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.15.1 to 1.15.2.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.15.1...v1.15.2)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-version: 1.15.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index d4dbe68355d..82efbf7f824 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.1'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.2'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.51.0')

From 7a13a2ee246605f863f67615b238c1eeaee94bb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:53 +0000
Subject: [PATCH 4354/4969] Bump io.opentelemetry:opentelemetry-bom in
 /modules/grafana

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.51.0 to 1.52.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.51.0...v1.52.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-version: 1.52.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index d4dbe68355d..0f88bf3e13f 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.1'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'
 
-    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.51.0')
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.52.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

From e53019483763a59ecd7c53f8a8a84989250bbd4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:55 +0000
Subject: [PATCH 4355/4969] Bump org.apache.commons:commons-lang3 in
 /modules/jdbc-test

Bumps org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 507313e9ad2..1e44b84947a 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
 
     api 'com.google.guava:guava:33.4.8-jre'
-    api 'org.apache.commons:commons-lang3:3.17.0'
+    api 'org.apache.commons:commons-lang3:3.18.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 

From b6b0bed9902e1a211293b867e1f4ab46d9937f7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:37:55 +0000
Subject: [PATCH 4356/4969] Bump io.milvus:milvus-sdk-java from 2.6.0 to 2.6.1
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.6.0...v2.6.1)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-version: 2.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index bb7167babfa..b79edac49aa 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.milvus:milvus-sdk-java:2.6.0'
+    testImplementation 'io.milvus:milvus-sdk-java:2.6.1'
 }

From 98e6b6e7d8728bb044fc90ad6ce09fa0ab04c52d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:38:01 +0000
Subject: [PATCH 4357/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.31.77 to 2.32.0.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-version: 2.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 f104d08e63c..5d2fe749f7e 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.31.77'
+    testImplementation 'software.amazon.awssdk:s3:2.32.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 4018cffa9435f82138bc4d93fbed6ead97f6c1bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:43:23 +0000
Subject: [PATCH 4358/4969] Bump dev.openfga:openfga-sdk from 0.8.2 to 0.8.3 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.8.2 to 0.8.3.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.8.2...v0.8.3)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-version: 0.8.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 45f4cf1244c..14d7179f7df 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'dev.openfga:openfga-sdk:0.8.2'
+    testImplementation 'dev.openfga:openfga-sdk:0.8.3'
 }
 
 test {

From 141dbadbc2894245748e7a4e5b66fe3be37cf229 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:47:26 +0000
Subject: [PATCH 4359/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.31.77 to 2.32.0.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index 4136702010d..cdd7526dc62 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.31.77'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.32.0'
 }

From 41d526d42616fb8a44b2a6753941b6f79e3db984 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:48:17 +0000
Subject: [PATCH 4360/4969] Bump com.squareup.okhttp3:okhttp from 4.12.0 to
 5.1.0 in /modules/solr

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.12.0 to 5.1.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.12.0...parent-5.1.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index f4ac079772d..d2cdc0083eb 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.12.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.4'
     testImplementation 'org.assertj:assertj-core:3.27.3'

From e1e743aa9a144cbd7e0ab2f8b67b997f582d74d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:49:37 +0000
Subject: [PATCH 4361/4969] Bump ch.qos.logback:logback-classic from 1.3.14 to
 1.3.15 in /smoke-test

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.3.14 to 1.3.15.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.14...v_1.3.15)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.3.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle                           | 2 +-
 docs/examples/spock/redis/build.gradle | 2 +-
 smoke-test/turbo-mode/build.gradle     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 488f005147d..825d240ddf1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -132,7 +132,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     }
 
     checkstyle {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 2f6cf78a6ce..9bc4c158c45 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.4.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
 }
 
 test {
diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index 1408842ee00..0e67df25a20 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
 }

From 0f32b1392cbde766abf7c938c1757073b7386cbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:49:46 +0000
Subject: [PATCH 4362/4969] Bump org.slf4j:slf4j-api from 2.0.16 to 2.0.17 in
 /smoke-test

Bumps org.slf4j:slf4j-api from 2.0.16 to 2.0.17.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-version: 2.0.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test-support/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-support/build.gradle b/test-support/build.gradle
index 5c39ac72ac9..344366da1eb 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
-    implementation 'org.slf4j:slf4j-api:2.0.16'
+    implementation 'org.slf4j:slf4j-api:2.0.17'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 1c7e5ad33efffeec510cada11b1b89f50c398c40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:50:35 +0000
Subject: [PATCH 4363/4969] Bump org.junit:junit-bom from 5.10.3 to 5.13.3 in
 /examples

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.10.3 to 5.13.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.10.3...r5.13.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 530cf60616c..1be708da810 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
-    testImplementation platform('org.junit:junit-bom:5.10.3')
+    testImplementation platform('org.junit:junit-bom:5.13.3')
     testImplementation 'org.junit.platform:junit-platform-suite'
     testImplementation platform('io.cucumber:cucumber-bom:7.23.0')
     testImplementation 'io.cucumber:cucumber-java'

From fbbc5933723016fcc830feb426d9b1da51e59c48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:57:21 +0000
Subject: [PATCH 4364/4969] Bump org.apache.commons:commons-lang3 in
 /modules/hivemq

Bumps org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index e2373eb1e7b..019f8f5f1e3 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:26.0.2")
 
-    shaded("org.apache.commons:commons-lang3:3.17.0")
+    shaded("org.apache.commons:commons-lang3:3.18.0")
     shaded("commons-io:commons-io:2.19.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")

From 13c802c5813576503febd865bae4b9069fcc8fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 16 Jul 2025 11:21:46 -0600
Subject: [PATCH 4365/4969] Restore JibTest (#10520)

---
 core/src/test/java/org/testcontainers/containers/JibTest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/JibTest.java b/core/src/test/java/org/testcontainers/containers/JibTest.java
index d784b08f2a8..1441ff00120 100644
--- a/core/src/test/java/org/testcontainers/containers/JibTest.java
+++ b/core/src/test/java/org/testcontainers/containers/JibTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectImageResponse;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
@@ -13,7 +12,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Ignore("Jib doesn't work with latest Docker version provided by GH Actions. Jib should be updated")
 public class JibTest {
 
     @Test

From fd1b08204556959e1f14a90cc5bc6aa8549daab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 16 Jul 2025 11:54:46 -0600
Subject: [PATCH 4366/4969] Fix testMetaInf

---
 .../java/org/testcontainers/JarFileShadingTest.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index 6477e4b7625..6b9ebc32efc 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -21,7 +21,15 @@ public void testPackages() throws Exception {
     @Test
     public void testMetaInf() throws Exception {
         assertThatFileList(root.resolve("META-INF"))
-            .containsOnly("MANIFEST.MF", "services", "versions", "native-image");
+            .containsOnly(
+                "MANIFEST.MF",
+                "services",
+                "versions",
+                "native-image",
+                "thirdparty-LICENSE",
+                "FastDoubleParser-NOTICE",
+                "FastDoubleParser-LICENSE"
+            );
     }
 
     @Test

From 29822555efe388a40d0892e47381b5798c8bea8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 18:58:23 +0000
Subject: [PATCH 4367/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/redis/lettuce) from 6.4.0.RELEASE to 6.7.1.RELEASE.
- [Release notes](https://github.com/redis/lettuce/releases)
- [Changelog](https://github.com/redis/lettuce/blob/6.7.1.RELEASE/RELEASE-NOTES.md)
- [Commits](https://github.com/redis/lettuce/compare/6.4.0.RELEASE...6.7.1.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-version: 6.7.1.RELEASE
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index f2e492fa7df..08bcb4d0580 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
+    api "io.lettuce:lettuce-core:6.7.1.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 4419bc3216b..c0c7a3c2054 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
+    api "io.lettuce:lettuce-core:6.7.1.RELEASE"
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.3'
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 2f6cf78a6ce..0d786f0363c 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.4.0.RELEASE"
+    api "io.lettuce:lettuce-core:6.7.1.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From 2a4181fb6aeaada91999faf02efc8d63b4c162a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 18:59:00 +0000
Subject: [PATCH 4368/4969] Bump io.nats:jnats from 2.20.2 to 2.21.4 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.20.2 to 2.21.4.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.20.2...2.21.4)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-version: 2.21.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 21b0baa3a3a..705fd41e04f 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.20.2'
+    testImplementation 'io.nats:jnats:2.21.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'

From b26bacaaaa0e93edda9048fc0e2a9a9ed1d83cf2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 18:59:02 +0000
Subject: [PATCH 4369/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.25.0 to 4.34.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.25.0...selenium-4.34.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-version: 4.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 1be708da810..0e73bac9195 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.25.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.34.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From da2f61a10a854a137f18f50a5e7f41afa709b5df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 18:59:43 +0000
Subject: [PATCH 4370/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /examples

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.18 to 4.4.20.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.18...4.4.20)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-version: 4.4.20
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/neo4j-container/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 7f85f5162a1..0bede32a835 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'

From ac454368adc7a4b44fc13443f62b3286b703be53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 19:00:00 +0000
Subject: [PATCH 4371/4969] Bump org.projectlombok:lombok from 1.18.34 to
 1.18.38 in /examples

Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.34 to 1.18.38.
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.34...v1.18.38)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-version: 1.18.38
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle  | 4 ++--
 examples/solr-container/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 2efabca33a3..ce4c44041fa 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.34"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.34"
+    testCompileOnly "org.projectlombok:lombok:1.18.38"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.38"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 58c380676d2..75ddcd62d67 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.34"
-    annotationProcessor "org.projectlombok:lombok:1.18.34"
+    compileOnly "org.projectlombok:lombok:1.18.38"
+    annotationProcessor "org.projectlombok:lombok:1.18.38"
 
     implementation 'org.apache.solr:solr-solrj:8.11.4'
 

From 35577878c7f0a5e308c74377c5e3fecb1f40adc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 17 Jul 2025 10:13:24 -0600
Subject: [PATCH 4372/4969] Remove junit-toolbox dependency (#10522)

---
 modules/jdbc-test/build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 1e44b84947a..1051af04383 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -6,8 +6,6 @@ dependencies {
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 
-    api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
-
     api 'org.assertj:assertj-core:3.27.3'
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.9'

From 8d37207cff74a63b17a9de4a031d3017a3891a16 Mon Sep 17 00:00:00 2001
From: julianladisch <julianladisch@users.noreply.github.com>
Date: Fri, 18 Jul 2025 07:08:41 +0200
Subject: [PATCH 4373/4969] Move from com.jcraft:jsch to com.github.mwiede:jsch
 (#10275)

Upgrade testImplementation dependency from
`com.jcraft:jsch:0.1.55` to `com.github.mwiede:jsch:2.27.0`
---
 examples/sftp/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index fbb5f6cbe40..53515e58b0a 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'com.jcraft:jsch:0.1.55'
+    testImplementation 'com.github.mwiede:jsch:2.27.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From e36c9e773c757d318f09d25807640cfa32e47333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 18 Jul 2025 00:11:13 -0600
Subject: [PATCH 4374/4969] Use rest-assured in mockserver module (#10523)

---
 modules/mockserver/build.gradle               |  1 +
 .../MockServerContainerRuleTest.java          |  5 ++-
 .../containers/MockServerContainerTest.java   | 35 ++++++++++++++--
 .../containers/SimpleHttpClient.java          | 41 -------------------
 4 files changed, 37 insertions(+), 45 deletions(-)
 delete mode 100644 modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index a41957cf57a..054944d2eb8 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -5,6 +5,7 @@ dependencies {
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
 }
 
 tasks.japicmp {
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index eaf240f0fe2..066b86b05fd 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -5,6 +5,7 @@
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
+import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
@@ -33,7 +34,9 @@ public void shouldReturnExpectation() throws Exception {
 
             // ...a GET request to '/person?name=peter' returns "Peter the person!"
 
-            assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"))
+            assertThat(
+                given().baseUri(mockServer.getEndpoint()).get("/person?name=peter").then().extract().body().asString()
+            )
                 .as("Expectation returns expected response body")
                 .contains("Peter the person");
         }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index 3f4a8fef293..a06ea3e7e63 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -1,9 +1,16 @@
 package org.testcontainers.containers;
 
+import io.restassured.config.RestAssuredConfig;
+import io.restassured.config.SSLConfig;
+import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.junit.Test;
 import org.mockserver.client.MockServerClient;
+import org.mockserver.configuration.Configuration;
+import org.mockserver.logging.MockServerLogger;
+import org.mockserver.socket.tls.KeyStoreFactory;
 import org.testcontainers.utility.DockerImageName;
 
+import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
@@ -26,7 +33,7 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
                 client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-                assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/hello"))
+                assertThat(given().when().get(mockServer.getEndpoint() + "/hello").then().extract().body().asString())
                     .as("MockServer returns correct result")
                     .isEqualTo(expectedBody);
             }
@@ -48,7 +55,7 @@ public void shouldCallMockserverUsingTlsProtocol() throws Exception {
 
                 client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-                assertThat(SimpleHttpClient.secureResponseFromMockserver(mockServer, "/hello"))
+                assertThat(secureResponseFromMockserver(mockServer))
                     .as("MockServer returns correct result")
                     .isEqualTo(expectedBody);
             }
@@ -73,7 +80,7 @@ public void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
 
                 client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-                assertThat(SimpleHttpClient.secureResponseFromMockserver(mockServer, "/hello"))
+                assertThat(secureResponseFromMockserver(mockServer))
                     .as("MockServer returns correct result")
                     .isEqualTo(expectedBody);
             }
@@ -86,4 +93,26 @@ public void newVersionStartsWithDefaultWaitStrategy() {
             mockServer.start();
         }
     }
+
+    private static String secureResponseFromMockserver(MockServerContainer mockServer) {
+        return given()
+            .config(
+                RestAssuredConfig
+                    .config()
+                    .sslConfig(
+                        SSLConfig
+                            .sslConfig()
+                            .sslSocketFactory(
+                                new SSLSocketFactory(
+                                    new KeyStoreFactory(Configuration.configuration(), new MockServerLogger())
+                                        .sslContext()
+                                )
+                            )
+                    )
+            )
+            .baseUri(mockServer.getSecureEndpoint())
+            .get("/hello")
+            .body()
+            .asString();
+    }
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
deleted file mode 100644
index 6c7e75c4622..00000000000
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.testcontainers.containers;
-
-import lombok.Cleanup;
-import org.mockserver.configuration.Configuration;
-import org.mockserver.logging.MockServerLogger;
-import org.mockserver.socket.tls.KeyStoreFactory;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.net.ssl.HttpsURLConnection;
-
-public class SimpleHttpClient {
-
-    public static String responseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
-        URLConnection urlConnection = new URL(mockServer.getEndpoint() + path).openConnection();
-        @Cleanup
-        BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
-        return reader.readLine();
-    }
-
-    public static String secureResponseFromMockserver(MockServerContainer mockServer, String path) throws IOException {
-        HttpsURLConnection httpUrlConnection = (HttpsURLConnection) new URL(mockServer.getSecureEndpoint() + path)
-            .openConnection();
-        try {
-            httpUrlConnection.setSSLSocketFactory(
-                new KeyStoreFactory(Configuration.configuration(), new MockServerLogger())
-                    .sslContext()
-                    .getSocketFactory()
-            );
-            @Cleanup
-            BufferedReader reader = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
-            return reader.readLine();
-        } finally {
-            httpUrlConnection.disconnect();
-        }
-    }
-}

From 048c6fa60dffc4b06beff71592877480759fd1f3 Mon Sep 17 00:00:00 2001
From: Ling Hengqian <linghengqian@outlook.com>
Date: Tue, 29 Jul 2025 03:09:42 +0800
Subject: [PATCH 4375/4969] Implement `AutoCloseable` for
 `TestcontainersExtension$StoreAdapter` (#10529)

Fixes #10525
---
 .../testcontainers/junit/jupiter/TestcontainersExtension.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 6d482f8aab7..89adba6033f 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -260,7 +260,7 @@ private static StoreAdapter getContainerInstance(final Object testInstance, fina
      * thereby letting the JUnit automatically stop containers once the current
      * {@link ExtensionContext} is closed.
      */
-    private static class StoreAdapter implements CloseableResource {
+    private static class StoreAdapter implements CloseableResource, AutoCloseable {
 
         @Getter
         private String key;

From 00a813390be988ddfc509bd04a48cfe1d547d9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 28 Jul 2025 16:50:19 -0500
Subject: [PATCH 4376/4969] Clean up dependabot.yml

---
 .github/dependabot.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fe70c0cec98..b42e02fe2b6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -161,9 +161,6 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
-        update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:

From df8c3915af1fcf64b5a460f91695a2122ee12fd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:34:24 +0000
Subject: [PATCH 4377/4969] Bump org.junit:junit-bom from 5.13.3 to 5.13.4 in
 /examples

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 0e73bac9195..c0e916c652c 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
-    testImplementation platform('org.junit:junit-bom:5.13.3')
+    testImplementation platform('org.junit:junit-bom:5.13.4')
     testImplementation 'org.junit.platform:junit-platform-suite'
     testImplementation platform('io.cucumber:cucumber-bom:7.23.0')
     testImplementation 'io.cucumber:cucumber-java'

From 8daef1c8ecb8527290eb186567edec0e0acfa112 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:37:08 +0000
Subject: [PATCH 4378/4969] Bump com.rabbitmq:amqp-client from 5.25.0 to 5.26.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.25.0 to 5.26.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.25.0...v5.26.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-version: 5.26.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 138c0548f0f..6fd325f78c0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:6.0.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.25.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From e7a5b50e96c34c73423c1dc7edd3e14c4d400474 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:44:07 +0000
Subject: [PATCH 4379/4969] Bump com.rabbitmq:amqp-client from 5.25.0 to 5.26.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.25.0 to 5.26.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.25.0...v5.26.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-version: 5.26.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 3137ec7f7e1..0b6d8f90487 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.25.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From fa6dcfe80429ccc5bb62ee109e8b9cbb8a2933b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:44:44 +0000
Subject: [PATCH 4380/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.32.0 to 2.32.9.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.32.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index cdd7526dc62..f531ef94eaf 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.32.0'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.32.9'
 }

From e1d76cf532dc4d1a983c55cb1b8752e67caa2b48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:47:18 +0000
Subject: [PATCH 4381/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.1.0.jre8-preview to 13.1.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.1.1.jre8-preview
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 899bbcc88db..c1174c84b15 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From b65a2e83393a43c838e63e5adb4f7be6f3470c97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:47:20 +0000
Subject: [PATCH 4382/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.0.3 to 9.0.4.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v9.0.3...v9.0.4)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 0370bab602f..5425bf784d0 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.0.3"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.0.4"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 97b1b199a1a027dbbb79acef31cc6474e57d3677 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:47:25 +0000
Subject: [PATCH 4383/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/hivemq

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 019f8f5f1e3..5bebeacdc0b 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.41.0")

From 27888788ea896bc50d6abebb760f9e64fcd5c87c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:48:05 +0000
Subject: [PATCH 4384/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.27.2 to 10.27.3.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-version: 10.27.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index aae6c28eefd..d9e5c17e94e 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.3.0'
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.27.2'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.27.3'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From bf57d659d161a0c6ab8940f8c99c81e1b96e067a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:50:17 +0000
Subject: [PATCH 4385/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/azure

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.1.0.jre8-preview to 13.1.1.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.1.1.jre8-preview
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index b0878d7e0d8..18cf96527b3 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'com.azure:azure-data-tables'
     testImplementation 'com.azure:azure-messaging-eventhubs'
     testImplementation 'com.azure:azure-messaging-servicebus'
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview'
 }

From 82b0888fa2f84707fad7a4f68189f8762482b08c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:51:16 +0000
Subject: [PATCH 4386/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.63.0 to 26.64.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.63.0...v26.64.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.64.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 4221cbc078f..73783e22089 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.63.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.64.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 0eb868fb106d33e55a7d6205f7075c8955ce6ce9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:52:06 +0000
Subject: [PATCH 4387/4969] Bump org.junit.platform:junit-platform-launcher in
 /modules/hivemq

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 1.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 019f8f5f1e3..59d8153c9cf 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.41.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")

From e4abbf44e6864b0606ba4bec9c76314ca1a13222 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 23:00:51 +0000
Subject: [PATCH 4388/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.41.0 to 2.42.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-version: 2.42.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index da683e0ad13..34217bf1f1a 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.7"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.41.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
 }

From 1413e442fa7e1d8feb11fdd1dbdb8175eb57f9d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 23:04:57 +0000
Subject: [PATCH 4389/4969] Bump io.rest-assured:rest-assured from 5.5.0 to
 5.5.5 in /examples

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.0 to 5.5.5.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.0...rest-assured-5.5.5)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/ollama-hugging-face/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 4bfe199e62b..3e18514afec 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 

From b39944758634af3ea72f83bb6b23f078c2939a4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 23:13:28 +0000
Subject: [PATCH 4390/4969] Bump org.junit.jupiter:junit-jupiter-params in
 /examples

Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit5/redis/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index c0c7a3c2054..60e78fc589d 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,9 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.7.1.RELEASE"
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.3'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

From 84138c0fd1deccf4c6f06088d8d84b92c3a8baee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 28 Jul 2025 21:03:38 -0500
Subject: [PATCH 4391/4969] Use junit-bom in spock module

---
 modules/spock/build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 7a5c6e0e0fc..4e013aa65a9 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,8 +17,9 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.13.3'
+    testRuntimeOnly platform('org.junit:junit-bom:5.13.3')
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 
     testCompileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 78aa5f4603124b4da13ebcc2994fda6b0166998c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 02:18:56 +0000
Subject: [PATCH 4392/4969] Bump com.zaxxer:HikariCP from 6.3.0 to 7.0.0 in
 /modules/spock

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 6.3.0 to 7.0.0.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-6.3.0...HikariCP-7.0.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4e013aa65a9..9cf47997203 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
 
-    testImplementation 'com.zaxxer:HikariCP:6.3.0'
+    testImplementation 'com.zaxxer:HikariCP:7.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'

From f1c5822fd87a6b4152bc093f31d2b5646ad4613f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 02:37:14 +0000
Subject: [PATCH 4393/4969] Bump com.github.mwiede:jsch from 2.27.0 to 2.27.2
 in /examples

Bumps [com.github.mwiede:jsch](https://github.com/mwiede/jsch) from 2.27.0 to 2.27.2.
- [Release notes](https://github.com/mwiede/jsch/releases)
- [Changelog](https://github.com/mwiede/jsch/blob/master/ChangeLog)
- [Commits](https://github.com/mwiede/jsch/compare/jsch-2.27.0...jsch-2.27.2)

---
updated-dependencies:
- dependency-name: com.github.mwiede:jsch
  dependency-version: 2.27.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/sftp/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 53515e58b0a..a0b615e8226 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'com.github.mwiede:jsch:2.27.0'
+    testImplementation 'com.github.mwiede:jsch:2.27.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'

From 98ab332325bf745d968ccba7d885d0ca7e3cc70d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 02:38:10 +0000
Subject: [PATCH 4394/4969] Bump com.google.code.gson:gson from 2.11.0 to
 2.13.1 in /examples

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.11.0 to 2.13.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.11.0...gson-parent-2.13.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-version: 2.13.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 3fda7078fa4..e94529d507d 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:6.0.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 26dd05f170d..dd2c73ed1b7 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:6.0.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index fecaa3d0499..4e264fd2d2a 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:6.0.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 

From c883515a2f603052b9ddfd5ac735f562d0d3111f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 02:38:19 +0000
Subject: [PATCH 4395/4969] Bump ch.qos.logback:logback-classic from 1.3.14 to
 1.3.15 in /examples

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.3.14 to 1.3.15.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.14...v_1.3.15)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.3.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/ollama-hugging-face/build.gradle       | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 0a33949201e..fcbc30049ee 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index ee39cf51865..55abe166f88 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index ce4c44041fa..fbb098c72a5 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'org.awaitility:awaitility:4.2.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 705fd41e04f..90f0643a7bc 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.21.4'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 4bfe199e62b..d1bb5ddbaa2 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:ollama'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 3fda7078fa4..09093e808ef 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testng:testng:7.5.1'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 26dd05f170d..c2628599388 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 53515e58b0a..8ee6c68a473 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'com.github.mwiede:jsch:2.27.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index fecaa3d0499..d0a9846b576 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 835280cdfc0..a9f41e76c07 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.8.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }

From 2c579eae54f74bd249cabcc50ebf223e042b5ac0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 02:39:32 +0000
Subject: [PATCH 4396/4969] Bump commons-io:commons-io from 2.19.0 to 2.20.0 in
 /modules/hivemq

Bumps [commons-io:commons-io](https://github.com/apache/commons-io) from 2.19.0 to 2.20.0.
- [Changelog](https://github.com/apache/commons-io/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-io/compare/rel/commons-io-2.19.0...rel/commons-io-2.20.0)

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-version: 2.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 98011ef3dbd..5c1f6b7c8e3 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:26.0.2")
 
     shaded("org.apache.commons:commons-lang3:3.18.0")
-    shaded("commons-io:commons-io:2.19.0")
+    shaded("commons-io:commons-io:2.20.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From 2a013c6fa5a519f4a5d307e9ec6e0177465b1933 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:12:20 +0000
Subject: [PATCH 4397/4969] Bump org.questdb:questdb from 9.0.0 to 9.0.1 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/9.0.0...9.0.1)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-version: 9.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 7364293bbcc..66355d19d61 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'org.questdb:questdb:9.0.0'
+    testImplementation 'org.questdb:questdb:9.0.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From dd523ed0483bc7fc37212b01fe2bd1024ee69296 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:13:04 +0000
Subject: [PATCH 4398/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 23.8.0.25.04 to 23.9.0.25.07.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.9.0.25.07
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index ff04ca864d1..012ba002e49 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.8.0.25.04'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 

From e8479f5b1b79f0330c6562ca880c5b75b75ee2b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:15:38 +0000
Subject: [PATCH 4399/4969] Bump org.junit:junit-bom from 5.13.3 to 5.13.4 in
 /modules/spock

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 9cf47997203..0e361b5c793 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testRuntimeOnly platform('org.junit:junit-bom:5.13.3')
+    testRuntimeOnly platform('org.junit:junit-bom:5.13.4')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 

From d7bf143395bab0a0fcca97f6e0fb35e62781a67e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:15:42 +0000
Subject: [PATCH 4400/4969] Bump software.amazon.awssdk:s3 in
 /modules/localstack

Bumps software.amazon.awssdk:s3 from 2.32.0 to 2.32.14.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-version: 2.32.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5d2fe749f7e..cddaeeaf432 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'com.amazonaws:aws-java-sdk-lambda'
     testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.32.0'
+    testImplementation 'software.amazon.awssdk:s3:2.32.14'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

From 535745db56d6d13dc1f42842e7d13a9713b62be3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:16:41 +0000
Subject: [PATCH 4401/4969] Bump org.junit.jupiter:junit-jupiter from 5.13.3 to
 5.13.4 in /examples

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/hazelcast/build.gradle           | 2 +-
 examples/immudb/build.gradle              | 2 +-
 examples/kafka-cluster/build.gradle       | 2 +-
 examples/nats/build.gradle                | 2 +-
 examples/neo4j-container/build.gradle     | 2 +-
 examples/ollama-hugging-face/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle  | 2 +-
 examples/sftp/build.gradle                | 2 +-
 examples/singleton-container/build.gradle | 2 +-
 examples/solr-container/build.gradle      | 2 +-
 examples/zookeeper/build.gradle           | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index fcbc30049ee..0b2d1a2ddd7 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 55abe166f88..80c4f962bf2 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index fbb098c72a5..a5be0be25ac 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.awaitility:awaitility:4.2.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 90f0643a7bc..3d90b1b1912 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'io.nats:jnats:2.21.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 0bede32a835..c4305469e36 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index aae4e4353bc..440d6d4a773 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:ollama'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index a67d83de4e3..f77102ac307 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 3a07bc675c4..b02e0a4728b 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 05a344a845f..a732fd284f4 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 75ddcd62d67..cd087543cda 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index a9f41e76c07..8f81d89334e 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 

From e05532d48b8afe36a6d35540cca65f171e944f1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:21:51 +0000
Subject: [PATCH 4402/4969] Bump io.qdrant:client from 1.14.1 to 1.15.0 in
 /modules/qdrant

Bumps [io.qdrant:client](https://github.com/qdrant/java-client) from 1.14.1 to 1.15.0.
- [Release notes](https://github.com/qdrant/java-client/releases)
- [Commits](https://github.com/qdrant/java-client/compare/v1.14.1...v1.15.0)

---
updated-dependencies:
- dependency-name: io.qdrant:client
  dependency-version: 1.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 479928a5e0e..470004c16ec 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.qdrant:client:1.14.1'
+    testImplementation 'io.qdrant:client:1.15.0'
     testImplementation platform('io.grpc:grpc-bom:1.73.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'

From f3f53b329fdf2e1caedd7fb1bd07bbd1aa0b1fcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:22:20 +0000
Subject: [PATCH 4403/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.0.4 to 9.1.0.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v9.0.4...v9.1.0)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 5425bf784d0..5dea480e20b 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.0.4"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.0"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }

From 9b705a886c0b6919992f802707f84d175e195e46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:26:15 +0000
Subject: [PATCH 4404/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-free

Bumps com.oracle.database.jdbc:ojdbc11 from 23.8.0.25.04 to 23.9.0.25.07.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.9.0.25.07
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 424f6c48616..e671376497d 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.8.0.25.04'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 

From bd754c89b0f515829e367cbb150ab01bd2865b3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:43:21 +0000
Subject: [PATCH 4405/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.64.0 to 26.65.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.64.0...v26.65.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.65.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 73783e22089..9d4c3ecfa8b 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.64.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.65.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 65197759897df17a1e2104c635a9a4cbdb7eb673 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:43:59 +0000
Subject: [PATCH 4406/4969] Bump io.weaviate:client from 5.3.0 to 5.4.0 in
 /modules/weaviate

Bumps [io.weaviate:client](https://github.com/weaviate/java-client) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/weaviate/java-client/releases)
- [Commits](https://github.com/weaviate/java-client/compare/5.3.0...5.4.0)

---
updated-dependencies:
- dependency-name: io.weaviate:client
  dependency-version: 5.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 0a2be01a079..6c0140a64d1 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'io.weaviate:client:5.3.0'
+    testImplementation 'io.weaviate:client:5.4.0'
 }

From cd733ba6be2cfdc0662f7e7c2cf87fba9bcfeb01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:55:33 +0000
Subject: [PATCH 4407/4969] Bump com.zaxxer:HikariCP from 6.3.0 to 7.0.0 in
 /modules/junit-jupiter

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 6.3.0 to 7.0.0.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-6.3.0...HikariCP-7.0.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3ff102a8ece..7d9faa499db 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
-    testImplementation 'com.zaxxer:HikariCP:6.3.0'
+    testImplementation 'com.zaxxer:HikariCP:7.0.0'
     testImplementation 'redis.clients:jedis:6.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 04d85db34b94cd27a3f3b0d5246254ab07617fad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:55:38 +0000
Subject: [PATCH 4408/4969] Bump org.junit:junit-bom from 5.13.3 to 5.13.4 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3ff102a8ece..806697193b8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.13.3')
+    implementation platform('org.junit:junit-bom:5.13.4')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')

From 4f3afaece2392c035277ef799dfacf3d7b8f0724 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:55:40 +0000
Subject: [PATCH 4409/4969] Bump org.junit.platform:junit-platform-launcher

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 1.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 3ff102a8ece..9c5b8111db5 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }

From 7062e7de77dee96ef1161a5436bdbf86d81e973b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 23:00:21 +0000
Subject: [PATCH 4410/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.41.0 to 4.42.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.41.0...4.42.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-version: 4.42.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 5c1f6b7c8e3..77c1bdba8aa 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.41.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.42.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.18")

From fb25a78190b909ec7f8cf7289117553ef0682ad2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 23:23:50 +0000
Subject: [PATCH 4411/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.32.9 to 2.32.14.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.32.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index f531ef94eaf..a1b9c150746 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.32.9'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.32.14'
 }

From 7a0cf2e0c135bc6384af9de6ecb98d2a0625a9f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 17:13:16 +0000
Subject: [PATCH 4412/4969] Bump org.junit.jupiter:junit-jupiter in /smoke-test

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 smoke-test/turbo-mode/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index 0e67df25a20..d6578e3db69 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'

From 4a68e3e7aeee418dea14a1832b98e23b70a910dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 18:03:23 +0000
Subject: [PATCH 4413/4969] Bump io.cucumber:cucumber-bom from 7.23.0 to 7.27.0
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.23.0 to 7.27.0.
- [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/v7.23.0...v7.27.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-version: 7.27.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 c0e916c652c..0e397c0644c 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation platform('org.junit:junit-bom:5.13.4')
     testImplementation 'org.junit.platform:junit-platform-suite'
-    testImplementation platform('io.cucumber:cucumber-bom:7.23.0')
+    testImplementation platform('io.cucumber:cucumber-bom:7.27.0')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:selenium'

From 473259c44ed59758b17054a763775e2c05a84cf6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 18:08:24 +0000
Subject: [PATCH 4414/4969] Bump org.assertj:assertj-core from 3.26.3 to 3.27.3
 in /examples

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/cucumber/build.gradle                  | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/neo4j-container/build.gradle           | 2 +-
 examples/ollama-hugging-face/build.gradle       | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/selenium-container/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/solr-container/build.gradle            | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index c0e916c652c..e2a27023094 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
 }
 
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 0b2d1a2ddd7..9dc09c80253 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 80c4f962bf2..02f161b224a 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index a5be0be25ac..98faa06472e 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.38"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 3d90b1b1912..3d8c808a9d7 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.21.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index c4305469e36..ebcd5462bbf 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 440d6d4a773..c8f478b2eb4 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:ollama'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 99e1b6247e3..4a7e1896f51 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testng:testng:7.5.1'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index f77102ac307..abd647930e1 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 823a7ccfc41..f78ecc536ac 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index b02e0a4728b..31b5cfb7171 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'com.github.mwiede:jsch:2.27.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index a732fd284f4..55e77b67388 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index cd087543cda..7c0ee785318 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 8f81d89334e..34e13b5e7ed 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.8.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'

From 98bdd8fbaa7c6b9af687f47b27137c9f9278d148 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 18:08:35 +0000
Subject: [PATCH 4415/4969] Bump org.apache.curator:curator-framework in
 /examples

Bumps [org.apache.curator:curator-framework](https://github.com/apache/curator) from 5.8.0 to 5.9.0.
- [Release notes](https://github.com/apache/curator/releases)
- [Commits](https://github.com/apache/curator/compare/apache-curator-5.8.0...apache-curator-5.9.0)

---
updated-dependencies:
- dependency-name: org.apache.curator:curator-framework
  dependency-version: 5.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/zookeeper/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index 8f81d89334e..516b24c9c33 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.apache.curator:curator-framework:5.8.0'
+    testImplementation 'org.apache.curator:curator-framework:5.9.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'

From e81ad90e053efa5f4da239162fa65b517923b3e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 18:10:37 +0000
Subject: [PATCH 4416/4969] Bump org.awaitility:awaitility from 4.2.2 to 4.3.0
 in /examples

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.2 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.2...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index a5be0be25ac..a1c1b7120ad 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.awaitility:awaitility:4.2.2'
+    testImplementation 'org.awaitility:awaitility:4.3.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 

From 5bd0b6df1f861c874992e8c30782efa605f7614f Mon Sep 17 00:00:00 2001
From: Sergei Bushmelev <77979972+sbushmelev@users.noreply.github.com>
Date: Tue, 5 Aug 2025 00:41:30 +0400
Subject: [PATCH 4417/4969] Add method getHttpUrl for ClickHouseContainer
 (#10526)

---
 modules/clickhouse/build.gradle               |  1 +
 .../clickhouse/ClickHouseContainer.java       |  4 +++
 .../clickhouse/ClickHouseContainerTest.java   | 30 +++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index d366825e261..8fabc3a3397 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -13,6 +13,7 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'com.clickhouse:client-v2:0.9.0'
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
 }
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index d3256124de1..02a02267ec5 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -101,6 +101,10 @@ public String getJdbcUrl() {
         );
     }
 
+    public String getHttpUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(HTTP_PORT);
+    }
+
     @Override
     public String getUsername() {
         return username;
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
index d5389b610c4..0e7a3d1c119 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
@@ -1,13 +1,20 @@
 package org.testcontainers.clickhouse;
 
+import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
+import com.clickhouse.client.api.query.QueryResponse;
 import org.junit.Test;
 import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
@@ -56,4 +63,27 @@ public void testNewAuth() throws SQLException {
             assertThat(resultSetInt).isEqualTo(1);
         }
     }
+
+    @Test
+    public void testGetHttpMethodWithHttpClient() {
+        ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE);
+        clickhouse.start();
+        Client client = new Client.Builder()
+            .addEndpoint(clickhouse.getHttpUrl())
+            .setUsername(clickhouse.getUsername())
+            .setPassword(clickhouse.getPassword())
+            .build();
+        try {
+            QueryResponse queryResponse = client.query("SELECT 1").get(1, TimeUnit.MINUTES);
+            ClickHouseBinaryFormatReader reader = client.newBinaryFormatReader(queryResponse);
+            reader.next();
+            int result = reader.getInteger(1);
+            assertThat(result).isEqualTo(1);
+        } catch (ExecutionException | InterruptedException | TimeoutException e) {
+            fail("Cannot get sql result:" + e);
+        } finally {
+            clickhouse.close();
+            client.close();
+        }
+    }
 }

From a26d58fecc6be3a747cebf31de1446f0fef82e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 5 Aug 2025 16:17:03 -0600
Subject: [PATCH 4418/4969] Add testcontainers prefix to modules (#10591)

---
 docs/examples/junit4/generic/build.gradle |  4 ++--
 docs/examples/junit5/redis/build.gradle   |  2 +-
 docs/examples/spock/redis/build.gradle    |  2 +-
 examples/cucumber/build.gradle            |  2 +-
 examples/immudb/build.gradle              |  2 +-
 examples/kafka-cluster/build.gradle       |  2 +-
 examples/neo4j-container/build.gradle     |  4 ++--
 examples/ollama-hugging-face/build.gradle |  2 +-
 examples/redis-backed-cache/build.gradle  |  2 +-
 examples/selenium-container/build.gradle  |  4 ++--
 examples/solr-container/build.gradle      |  2 +-
 examples/spring-boot/build.gradle         |  2 +-
 modules/azure/build.gradle                |  2 +-
 modules/cassandra/build.gradle            |  2 +-
 modules/clickhouse/build.gradle           |  8 ++++----
 modules/cockroachdb/build.gradle          |  4 ++--
 modules/cratedb/build.gradle              |  4 ++--
 modules/databend/build.gradle             |  4 ++--
 modules/db2/build.gradle                  |  4 ++--
 modules/hivemq/build.gradle               |  2 +-
 modules/jdbc-test/build.gradle            |  2 +-
 modules/jdbc/build.gradle                 |  2 +-
 modules/junit-jupiter/build.gradle        |  4 ++--
 modules/mariadb/build.gradle              |  8 ++++----
 modules/mssqlserver/build.gradle          | 10 +++++-----
 modules/mysql/build.gradle                |  8 ++++----
 modules/oceanbase/build.gradle            |  4 ++--
 modules/oracle-free/build.gradle          |  8 ++++----
 modules/oracle-xe/build.gradle            |  8 ++++----
 modules/postgresql/build.gradle           |  8 ++++----
 modules/presto/build.gradle               |  4 ++--
 modules/questdb/build.gradle              |  4 ++--
 modules/r2dbc/build.gradle                |  2 +-
 modules/selenium/build.gradle             |  2 +-
 modules/spock/build.gradle                |  6 +++---
 modules/tidb/build.gradle                 |  4 ++--
 modules/timeplus/build.gradle             |  4 ++--
 modules/trino/build.gradle                |  4 ++--
 modules/yugabytedb/build.gradle           |  4 ++--
 settings.gradle                           |  4 ++--
 40 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 50b7d9caf32..d5bdd39e3f9 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -3,8 +3,8 @@ description = "Examples for docs"
 dependencies {
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation project(":selenium")
-    testImplementation project(":mysql")
+    testImplementation project(":testcontainers-selenium")
+    testImplementation project(":testcontainers-mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0"
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 60e78fc589d..f03bc7cdf4c 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
-    testImplementation project(":junit-jupiter")
+    testImplementation project(":testcontainers-junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index d6fd81a8370..2b82febefb6 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api "io.lettuce:lettuce-core:6.7.1.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
-    testImplementation project(":spock")
+    testImplementation project(":testcontainers-spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
 }
 
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index 79ce094b656..e671b26d454 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     testImplementation platform('io.cucumber:cucumber-bom:7.27.0')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
-    testImplementation 'org.testcontainers:selenium'
+    testImplementation 'org.testcontainers:testcontainers-selenium'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 02f161b224a..1d349ba33ec 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index e5c09635a89..4483b006709 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.38"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.38"
-    testImplementation 'org.testcontainers:kafka'
+    testImplementation 'org.testcontainers:testcontainers-kafka'
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.google.guava:guava:23.0'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index ebcd5462bbf..cb7a334b712 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -9,8 +9,8 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
-    testImplementation 'org.testcontainers:neo4j'
-    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:testcontainers-neo4j'
+    testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index c8f478b2eb4..800136bc628 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.testcontainers:ollama'
+    testImplementation 'org.testcontainers:testcontainers-ollama'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index abd647930e1..b6a4e47f094 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.27.3'
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index f78ecc536ac..3629b3de78e 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -14,8 +14,8 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:testcontainers-selenium'
+    testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 7c0ee785318..8cef396fe61 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'org.apache.solr:solr-solrj:8.11.4'
 
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.testcontainers:solr'
+    testImplementation 'org.testcontainers:testcontainers-solr'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 2001c393afa..e3a40d27f06 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.testcontainers:testcontainers-postgresql'
     testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
 }
 
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 18cf96527b3..13f3f353ba9 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Azure"
 
 dependencies {
     api project(':testcontainers')
-    api project(':mssqlserver')
+    api project(':testcontainers-mssqlserver')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index e146c26e69e..42c503f6752 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -7,7 +7,7 @@ configurations.all {
 }
 
 dependencies {
-    api project(":database-commons")
+    api project(":testcontainers-database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
     testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 8fabc3a3397..f0c57fe8c36 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -2,18 +2,18 @@ description = "Testcontainers :: JDBC :: ClickHouse"
 
 dependencies {
     api project(':testcontainers')
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    compileOnly project(':r2dbc')
+    compileOnly project(':testcontainers-r2dbc')
     compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.2', classifier: 'http')
     testRuntimeOnly(group: 'com.clickhouse', name: 'jdbc-v2', version: '0.7.2', classifier: 'http')
 
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.clickhouse:client-v2:0.9.0'
-    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
 }
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 6340d918e7e..a1967c94fbd 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: CockroachDB"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 79ca4864f46..b74d9c5f949 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: CrateDB"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 392c2b51eb0..2770b2ccff3 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: Databend"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.databend:databend-jdbc:0.4.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 0163eb17bd6..15600ec3856 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: DB2"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 77c1bdba8aa..9a0fda05afe 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
-    testImplementation(project(":junit-jupiter"))
+    testImplementation(project(":testcontainers-junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.42.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 1051af04383..b5774ce794d 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
     api 'com.google.guava:guava:33.4.8-jre'
     api 'org.apache.commons:commons-lang3:3.18.0'
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index c343cd17a4a..c45f1bf65d3 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -1,7 +1,7 @@
 description = "Testcontainers :: JDBC"
 
 dependencies {
-    api project(':database-commons')
+    api project(':testcontainers-database-commons')
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index 20546c873cb..13652ef111b 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -5,8 +5,8 @@ dependencies {
     implementation platform('org.junit:junit-bom:5.13.4')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
-    testImplementation project(':mysql')
-    testImplementation project(':postgresql')
+    testImplementation project(':testcontainers-mysql')
+    testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.0'
     testImplementation 'redis.clients:jedis:6.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index 416ae4f2707..cf0b92dd5fe 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -1,15 +1,15 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    compileOnly project(':r2dbc')
+    compileOnly project(':testcontainers-r2dbc')
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.4'
 
-    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 }
 
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index c1174c84b15..793f5b48c99 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -1,19 +1,19 @@
 description = "Testcontainers :: MS SQL Server"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    compileOnly project(':r2dbc')
+    compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview'
 
-    testImplementation project(':r2dbc')
+    testImplementation project(':testcontainers-r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
-    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation testFixtures(project(':testcontainers-r2dbc'))
 }
 
 tasks.japicmp {
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 3055cd141fc..ddacc0fdc50 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -1,15 +1,15 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    compileOnly project(':r2dbc')
+    compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
-    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
index e1f13a7a6a1..d4278ddc0bc 100644
--- a/modules/oceanbase/build.gradle
+++ b/modules/oceanbase/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: OceanBase"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index e671376497d..a55c9f26518 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -1,16 +1,16 @@
 description = "Testcontainers :: JDBC :: Oracle Database Free"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    compileOnly project(':r2dbc')
+    compileOnly project(':testcontainers-r2dbc')
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 
-    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 }
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 012ba002e49..a384fcb7221 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -1,17 +1,17 @@
 description = "Testcontainers :: JDBC :: Oracle XE"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    compileOnly project(':r2dbc')
+    compileOnly project(':testcontainers-r2dbc')
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 
-    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 }
 
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index bbe8e596b95..8af61c5f3e2 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -1,15 +1,15 @@
 description = "Testcontainers :: JDBC :: PostgreSQL"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    compileOnly project(':r2dbc')
+    compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
-    testImplementation testFixtures(project(':r2dbc'))
+    testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 988b00630d8..194b413c10f 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: Presto"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 66355d19d61..954b0300ad5 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -2,10 +2,10 @@ description = "Testcontainers :: QuestDB"
 
 dependencies {
     api project(':testcontainers')
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'org.questdb:questdb:9.0.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index b506f5a2515..49f7672bd18 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
-    testImplementation project(':postgresql')
+    testImplementation project(':testcontainers-postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.7.8'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.3'
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 10dbcd6752d..1b9312d6187 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'org.seleniumhq.selenium:selenium-support'
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
-    testImplementation project(':nginx')
+    testImplementation project(':testcontainers-nginx')
     testImplementation 'org.assertj:assertj-core:3.27.3'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 0e361b5c793..ae7f37050ba 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -8,9 +8,9 @@ dependencies {
     api project(':testcontainers')
     implementation 'org.spockframework:spock-core:2.3-groovy-4.0'
 
-    testImplementation project(':selenium')
-    testImplementation project(':mysql')
-    testImplementation project(':postgresql')
+    testImplementation project(':testcontainers-selenium')
+    testImplementation project(':testcontainers-mysql')
+    testImplementation project(':testcontainers-postgresql')
 
     testImplementation 'com.zaxxer:HikariCP:7.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 37a528a41ff..47dd9d01027 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: TiDB"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index 72da2ed182f..188edeeb677 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -2,9 +2,9 @@ description = "Testcontainers :: JDBC :: Timeplus"
 
 dependencies {
     api project(':testcontainers')
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.10'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index f8d3a4f1307..08e3c0c2982 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -1,9 +1,9 @@
 description = "Testcontainers :: JDBC :: Trino"
 
 dependencies {
-    api project(':jdbc')
+    api project(':testcontainers-jdbc')
 
-    testImplementation project(':jdbc-test')
+    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:476'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index 15540f0020a..d81dd3e0648 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -1,8 +1,8 @@
 description = "Testcontainers :: JDBC :: YugabyteDB"
 
 dependencies {
-    api project(':jdbc')
-    testImplementation project(':jdbc-test')
+    api project(':testcontainers-jdbc')
+    testImplementation project(':testcontainers-jdbc-test')
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.19.0-yb-1'
     // YSQL driver
diff --git a/settings.gradle b/settings.gradle
index 0099b899082..2076cb71c86 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,8 +23,8 @@ include "testcontainers"
 project(':testcontainers').projectDir = "$rootDir/core" as File
 
 file('modules').eachDir { dir ->
-    include dir.name
-    project(":${dir.name}").projectDir = dir
+    include "testcontainers-${dir.name}"
+    project(":testcontainers-${dir.name}").projectDir = dir
 }
 
 include ':docs:examples:junit4:generic'

From 0218c2040d15c951747ca020d793c4bd11169891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 6 Aug 2025 08:26:13 -0600
Subject: [PATCH 4419/4969] Move localstack's tests to aws sdk v2 (#10592)

---
 docs/modules/localstack.md                    |   4 -
 modules/localstack/build.gradle               |  13 +-
 .../containers/localstack/LegacyModeTest.java |  37 +-
 .../localstack/LocalstackContainerTest.java   | 352 ++++++++----------
 .../localstack/LocalstackTestImages.java      |   6 +-
 5 files changed, 172 insertions(+), 240 deletions(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 827ed4a6534..5527416e854 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -16,10 +16,6 @@ public LocalStackContainer localstack = new LocalStackContainer(localstackImage)
 
 ## Creating a client using AWS SDK
 
-<!--codeinclude-->
-[AWS SDK V1](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v1
-<!--/codeinclude-->
-
 <!--codeinclude-->
 [AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v2
 <!--/codeinclude-->
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index cddaeeaf432..5390d190282 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,13 +3,12 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.572")
-    testImplementation 'com.amazonaws:aws-java-sdk-s3'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'com.amazonaws:aws-java-sdk-lambda'
-    testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.32.14'
+    testImplementation platform("software.amazon.awssdk:bom:2.32.14")
+    testImplementation 'software.amazon.awssdk:s3'
+    testImplementation 'software.amazon.awssdk:sqs'
+    testImplementation 'software.amazon.awssdk:cloudwatchlogs'
+    testImplementation 'software.amazon.awssdk:lambda'
+    testImplementation 'software.amazon.awssdk:kms'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index e66bd8c3e62..f888c53afeb 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.containers.localstack;
 
-import com.amazonaws.client.builder.AwsClientBuilder;
 import com.github.dockerjava.api.DockerClient;
 import lombok.AllArgsConstructor;
 import org.junit.BeforeClass;
@@ -20,7 +19,9 @@
 @RunWith(Enclosed.class)
 public class LegacyModeTest {
 
-    private static DockerImageName LOCALSTACK_CUSTOM_TAG = LocalstackTestImages.LOCALSTACK_IMAGE.withTag("custom");
+    private static DockerImageName LOCALSTACK_CUSTOM_TAG = DockerImageName
+        .parse("localstack/localstack:0.12.8")
+        .withTag("custom");
 
     @RunWith(Parameterized.class)
     @AllArgsConstructor
@@ -54,21 +55,9 @@ public void samePortIsExposedForAllServices() {
                 assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint overrides are different")
                     .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-                assertThat(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.SQS).toString(),
-                        localstack.getRegion()
-                    )
-                        .getServiceEndpoint()
-                )
+                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint configuration have different endpoints")
-                    .isEqualTo(
-                        new AwsClientBuilder.EndpointConfiguration(
-                            localstack.getEndpointOverride(Service.S3).toString(),
-                            localstack.getRegion()
-                        )
-                            .getServiceEndpoint()
-                    );
+                    .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
             } finally {
                 localstack.stop();
             }
@@ -119,21 +108,9 @@ public void differentPortsAreExposed() {
                 assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint overrides are different")
                     .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-                assertThat(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.SQS).toString(),
-                        localstack.getRegion()
-                    )
-                        .getServiceEndpoint()
-                )
+                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint configuration have different endpoints")
-                    .isNotEqualTo(
-                        new AwsClientBuilder.EndpointConfiguration(
-                            localstack.getEndpointOverride(Service.S3).toString(),
-                            localstack.getRegion()
-                        )
-                            .getServiceEndpoint()
-                    );
+                    .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
             } finally {
                 localstack.stop();
             }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index a1c36078840..cf729a48a32 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,35 +1,5 @@
 package org.testcontainers.containers.localstack;
 
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.kms.AWSKMS;
-import com.amazonaws.services.kms.AWSKMSClientBuilder;
-import com.amazonaws.services.kms.model.CreateKeyRequest;
-import com.amazonaws.services.kms.model.CreateKeyResult;
-import com.amazonaws.services.kms.model.Tag;
-import com.amazonaws.services.lambda.AWSLambda;
-import com.amazonaws.services.lambda.AWSLambdaClientBuilder;
-import com.amazonaws.services.lambda.model.CreateFunctionRequest;
-import com.amazonaws.services.lambda.model.CreateFunctionResult;
-import com.amazonaws.services.lambda.model.FunctionCode;
-import com.amazonaws.services.lambda.model.GetFunctionRequest;
-import com.amazonaws.services.lambda.model.InvokeRequest;
-import com.amazonaws.services.lambda.model.InvokeResult;
-import com.amazonaws.services.lambda.model.Runtime;
-import com.amazonaws.services.logs.AWSLogs;
-import com.amazonaws.services.logs.AWSLogsClientBuilder;
-import com.amazonaws.services.logs.model.CreateLogGroupRequest;
-import com.amazonaws.services.logs.model.LogGroup;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.Bucket;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
-import com.amazonaws.services.sqs.model.CreateQueueResult;
-import com.amazonaws.waiters.WaiterParameters;
 import com.github.dockerjava.api.DockerClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -45,19 +15,46 @@
 import org.testcontainers.utility.DockerImageName;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
+import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogGroupRequest;
+import software.amazon.awssdk.services.cloudwatchlogs.model.DescribeLogGroupsResponse;
+import software.amazon.awssdk.services.kms.KmsClient;
+import software.amazon.awssdk.services.kms.model.CreateKeyRequest;
+import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
+import software.amazon.awssdk.services.kms.model.Tag;
+import software.amazon.awssdk.services.lambda.LambdaClient;
+import software.amazon.awssdk.services.lambda.model.CreateFunctionRequest;
+import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
+import software.amazon.awssdk.services.lambda.model.FunctionCode;
+import software.amazon.awssdk.services.lambda.model.GetFunctionConfigurationRequest;
+import software.amazon.awssdk.services.lambda.model.InvokeRequest;
+import software.amazon.awssdk.services.lambda.model.InvokeResponse;
+import software.amazon.awssdk.services.lambda.model.Runtime;
+import software.amazon.awssdk.services.lambda.waiters.LambdaWaiter;
 import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.Bucket;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
+import software.amazon.awssdk.services.sqs.SqsClient;
+import software.amazon.awssdk.services.sqs.model.CreateQueueRequest;
+import software.amazon.awssdk.services.sqs.model.CreateQueueResponse;
+import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
+import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
-import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -82,6 +79,7 @@ public static class WithoutNetwork {
         // without_network {
         @ClassRule
         public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+            .withEnv("SQS_ENDPOINT_STRATEGY", "dynamic")
             .withServices(
                 Service.S3,
                 Service.SQS,
@@ -94,42 +92,39 @@ public static class WithoutNetwork {
 
         @Test
         public void s3TestOverBridgeNetwork() throws IOException {
-            // with_aws_sdk_v1 {
-            AmazonS3 s3 = AmazonS3ClientBuilder
-                .standard()
-                .withEndpointConfiguration(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpoint().toString(),
-                        localstack.getRegion()
-                    )
-                )
-                .withCredentials(
-                    new AWSStaticCredentialsProvider(
-                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+            S3Client s3 = S3Client
+                .builder()
+                .endpointOverride(localstack.getEndpoint())
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
                     )
                 )
+                .region(Region.of(localstack.getRegion()))
                 .build();
-            // }
 
             final String bucketName = "foo";
-            s3.createBucket(bucketName);
-            s3.putObject(bucketName, "bar", "baz");
+            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+            s3.putObject(
+                PutObjectRequest.builder().bucket(bucketName).key("bar").build(),
+                software.amazon.awssdk.core.sync.RequestBody.fromString("baz")
+            );
 
-            final List<Bucket> buckets = s3.listBuckets();
-            final Optional<Bucket> maybeBucket = buckets
-                .stream()
-                .filter(b -> b.getName().equals(bucketName))
-                .findFirst();
+            final List<Bucket> buckets = s3.listBuckets().buckets();
+            final Optional<Bucket> maybeBucket = buckets.stream().filter(b -> b.name().equals(bucketName)).findFirst();
             assertThat(maybeBucket).as("The created bucket is present").isPresent();
             final Bucket bucket = maybeBucket.get();
 
-            assertThat(bucket.getName()).as("The created bucket has the right name").isEqualTo(bucketName);
+            assertThat(bucket.name()).as("The created bucket has the right name").isEqualTo(bucketName);
 
-            final ObjectListing objectListing = s3.listObjects(bucketName);
-            assertThat(objectListing.getObjectSummaries()).as("The created bucket has 1 item in it").hasSize(1);
+            final ListObjectsV2Response objectListing = s3.listObjectsV2(
+                ListObjectsV2Request.builder().bucket(bucketName).build()
+            );
+            assertThat(objectListing.contents()).as("The created bucket has 1 item in it").hasSize(1);
 
-            final S3Object object = s3.getObject(bucketName, "bar");
-            final String content = IOUtils.toString(object.getObjectContent(), StandardCharsets.UTF_8);
+            final String content = s3
+                .getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key("bar").build())
+                .asString(StandardCharsets.UTF_8);
             assertThat(content).as("The object can be retrieved").isEqualTo("baz");
         }
 
@@ -157,86 +152,73 @@ public void s3TestUsingAwsSdkV2() {
 
         @Test
         public void sqsTestOverBridgeNetwork() {
-            AmazonSQS sqs = AmazonSQSClientBuilder
-                .standard()
-                .withEndpointConfiguration(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpoint().toString(),
-                        localstack.getRegion()
-                    )
-                )
-                .withCredentials(
-                    new AWSStaticCredentialsProvider(
-                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+            SqsClient sqs = SqsClient
+                .builder()
+                .endpointOverride(localstack.getEndpoint())
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
                     )
                 )
+                .region(Region.of(localstack.getRegion()))
                 .build();
 
-            CreateQueueResult queueResult = sqs.createQueue("baz");
-            String fooQueueUrl = queueResult.getQueueUrl();
-            assertThat(fooQueueUrl)
-                .as("Created queue has external hostname URL")
-                .contains("http://" + localstack.getHost() + ":" + localstack.getMappedPort(LocalStackContainer.PORT));
+            CreateQueueResponse queueResult = sqs.createQueue(CreateQueueRequest.builder().queueName("baz").build());
+            String fooQueueUrl = queueResult.queueUrl();
 
-            sqs.sendMessage(fooQueueUrl, "test");
+            sqs.sendMessage(SendMessageRequest.builder().queueUrl(fooQueueUrl).messageBody("test").build());
             final long messageCount = sqs
-                .receiveMessage(fooQueueUrl)
-                .getMessages()
+                .receiveMessage(ReceiveMessageRequest.builder().queueUrl(fooQueueUrl).build())
+                .messages()
                 .stream()
-                .filter(message -> message.getBody().equals("test"))
+                .filter(message -> message.body().equals("test"))
                 .count();
             assertThat(messageCount).as("the sent message can be received").isEqualTo(1L);
         }
 
         @Test
         public void cloudWatchLogsTestOverBridgeNetwork() {
-            AWSLogs logs = AWSLogsClientBuilder
-                .standard()
-                .withEndpointConfiguration(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpoint().toString(),
-                        localstack.getRegion()
-                    )
-                )
-                .withCredentials(
-                    new AWSStaticCredentialsProvider(
-                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+            CloudWatchLogsClient logs = CloudWatchLogsClient
+                .builder()
+                .endpointOverride(localstack.getEndpoint())
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
                     )
                 )
+                .region(Region.of(localstack.getRegion()))
                 .build();
 
-            logs.createLogGroup(new CreateLogGroupRequest("foo"));
+            logs.createLogGroup(CreateLogGroupRequest.builder().logGroupName("foo").build());
 
-            List<LogGroup> groups = logs.describeLogGroups().getLogGroups();
-            assertThat(groups).as("One log group should be created").hasSize(1);
-            assertThat(groups.get(0).getLogGroupName()).as("Name of created log group is [foo]").isEqualTo("foo");
+            DescribeLogGroupsResponse response = logs.describeLogGroups();
+            assertThat(response.logGroups()).as("One log group should be created").hasSize(1);
+            assertThat(response.logGroups().get(0).logGroupName())
+                .as("Name of created log group is [foo]")
+                .isEqualTo("foo");
         }
 
         @Test
         public void kmsKeyCreationTest() {
-            AWSKMS awskms = AWSKMSClientBuilder
-                .standard()
-                .withEndpointConfiguration(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpoint().toString(),
-                        localstack.getRegion()
-                    )
-                )
-                .withCredentials(
-                    new AWSStaticCredentialsProvider(
-                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+            KmsClient kms = KmsClient
+                .builder()
+                .endpointOverride(localstack.getEndpoint())
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
                     )
                 )
+                .region(Region.of(localstack.getRegion()))
                 .build();
 
-            String desc = String.format("AWS CMK Description");
-            Tag createdByTag = new Tag().withTagKey("CreatedBy").withTagValue("StorageService");
-            CreateKeyRequest req = new CreateKeyRequest().withDescription(desc).withTags(createdByTag);
-            CreateKeyResult key = awskms.createKey(req);
+            String desc = "AWS CMK Description";
+            Tag createdByTag = Tag.builder().tagKey("CreatedBy").tagValue("StorageService").build();
+            CreateKeyRequest req = CreateKeyRequest.builder().description(desc).tags(createdByTag).build();
+            CreateKeyResponse key = kms.createKey(req);
 
             assertThat(desc)
                 .as("AWS KMS Customer Managed Key should be created ")
-                .isEqualTo(key.getKeyMetadata().getDescription());
+                .isEqualTo(key.keyMetadata().description());
         }
 
         @Test
@@ -245,21 +227,6 @@ public void samePortIsExposedForAllServices() {
             assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                 .as("Endpoint overrides are different")
                 .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-            assertThat(
-                new AwsClientBuilder.EndpointConfiguration(
-                    localstack.getEndpointOverride(Service.SQS).toString(),
-                    localstack.getRegion()
-                )
-                    .getServiceEndpoint()
-            )
-                .as("Endpoint configuration have different endpoints")
-                .isEqualTo(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.S3).toString(),
-                        localstack.getRegion()
-                    )
-                        .getServiceEndpoint()
-                );
         }
     }
 
@@ -270,7 +237,7 @@ public static class WithNetwork {
 
         @ClassRule
         public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(
-            LocalstackTestImages.LOCALSTACK_IMAGE
+            DockerImageName.parse("localstack/localstack:0.12.8")
         )
             .withNetwork(network)
             .withNetworkAliases("notthis", "localstack") // the last alias is used for HOSTNAME_EXTERNAL
@@ -367,22 +334,14 @@ public static class WithRegion {
 
         @Test
         public void s3EndpointHasProperRegion() {
-            final AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration(
-                localstack.getEndpoint().toString(),
-                localstack.getRegion()
-            );
-            assertThat(endpointConfiguration.getSigningRegion())
-                .as("The endpoint configuration has right region")
-                .isEqualTo(region);
+            assertThat(localstack.getRegion()).as("The endpoint configuration has right region").isEqualTo(region);
         }
     }
 
     public static class WithoutServices {
 
         @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(
-            LocalstackTestImages.LOCALSTACK_0_13_IMAGE
-        );
+        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE);
 
         @Test
         public void s3ServiceStartLazily() {
@@ -478,46 +437,53 @@ private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exc
     public static class S3SkipSignatureValidation {
 
         @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(
-            LocalstackTestImages.LOCALSTACK_2_3_IMAGE
-        )
+        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
             .withEnv("S3_SKIP_SIGNATURE_VALIDATION", "0");
 
         @Test
         public void shouldBeAccessibleWithCredentials() throws IOException {
-            AmazonS3 s3 = AmazonS3ClientBuilder
-                .standard()
-                .withEndpointConfiguration(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpoint().toString(),
-                        localstack.getRegion()
-                    )
-                )
-                .withCredentials(
-                    new AWSStaticCredentialsProvider(
-                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+            S3Client s3 = S3Client
+                .builder()
+                .endpointOverride(localstack.getEndpoint())
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
                     )
                 )
+                .region(Region.of(localstack.getRegion()))
                 .build();
 
             final String bucketName = "foo";
 
-            s3.createBucket(bucketName);
+            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
 
-            s3.putObject(bucketName, "bar", "baz");
+            s3.putObject(
+                PutObjectRequest.builder().bucket(bucketName).key("bar").build(),
+                software.amazon.awssdk.core.sync.RequestBody.fromString("baz")
+            );
 
-            final List<Bucket> buckets = s3.listBuckets();
-            final Optional<Bucket> maybeBucket = buckets
-                .stream()
-                .filter(b -> b.getName().equals(bucketName))
-                .findFirst();
+            final List<Bucket> buckets = s3.listBuckets().buckets();
+            final Optional<Bucket> maybeBucket = buckets.stream().filter(b -> b.name().equals(bucketName)).findFirst();
             assertThat(maybeBucket).as("The created bucket is present").isPresent();
 
-            URL presignedUrl = s3.generatePresignedUrl(
-                bucketName,
-                "bar",
-                Date.from(Instant.now().plus(5, ChronoUnit.MINUTES))
-            );
+            S3Presigner presigner = S3Presigner
+                .builder()
+                .endpointOverride(localstack.getEndpoint())
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                    )
+                )
+                .region(Region.of(localstack.getRegion()))
+                .build();
+
+            GetObjectPresignRequest presignRequest = GetObjectPresignRequest
+                .builder()
+                .signatureDuration(Duration.ofMinutes(5))
+                .getObjectRequest(GetObjectRequest.builder().bucket(bucketName).key("bar").build())
+                .build();
+
+            URL presignedUrl = presigner.presignGetObject(presignRequest).url();
 
             assertThat(presignedUrl).as("The presigned url is valid").isNotNull();
             final String content = IOUtils.toString(presignedUrl, StandardCharsets.UTF_8);
@@ -528,9 +494,7 @@ public void shouldBeAccessibleWithCredentials() throws IOException {
     public static class LambdaContainerLabels {
 
         @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(
-            LocalstackTestImages.LOCALSTACK_2_3_IMAGE
-        );
+        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE);
 
         private static byte[] createLambdaHandlerZipFile() throws IOException {
             StringBuilder sb = new StringBuilder();
@@ -551,44 +515,44 @@ private static byte[] createLambdaHandlerZipFile() throws IOException {
 
         @Test
         public void shouldLabelLambdaContainers() throws IOException {
-            AWSLambda lambda = AWSLambdaClientBuilder
-                .standard()
-                .withEndpointConfiguration(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpoint().toString(),
-                        localstack.getRegion()
-                    )
-                )
-                .withCredentials(
-                    new AWSStaticCredentialsProvider(
-                        new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey())
+            LambdaClient lambda = LambdaClient
+                .builder()
+                .endpointOverride(localstack.getEndpoint())
+                .credentialsProvider(
+                    StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
                     )
                 )
+                .region(Region.of(localstack.getRegion()))
                 .build();
 
             // create function
             byte[] handlerFile = createLambdaHandlerZipFile();
-            CreateFunctionRequest createFunctionRequest = new CreateFunctionRequest()
-                .withFunctionName("test-function")
-                .withRuntime(Runtime.Python311)
-                .withHandler("handler.handler")
-                .withRole("arn:aws:iam::000000000000:role/test-role")
-                .withCode(new FunctionCode().withZipFile(ByteBuffer.wrap(handlerFile)));
-            CreateFunctionResult createFunctionResult = lambda.createFunction(createFunctionRequest);
-            GetFunctionRequest getFunctionRequest = new GetFunctionRequest()
-                .withFunctionName(createFunctionResult.getFunctionName());
-            lambda
-                .waiters()
-                .functionActiveV2()
-                .run(new WaiterParameters<GetFunctionRequest>().withRequest(getFunctionRequest));
+            CreateFunctionRequest createFunctionRequest = CreateFunctionRequest
+                .builder()
+                .functionName("test-function")
+                .runtime(Runtime.PYTHON3_11)
+                .handler("handler.handler")
+                .role("arn:aws:iam::000000000000:role/test-role")
+                .code(FunctionCode.builder().zipFile(SdkBytes.fromByteArray(handlerFile)).build())
+                .build();
+            CreateFunctionResponse createFunctionResult = lambda.createFunction(createFunctionRequest);
+
+            try (LambdaWaiter waiter = lambda.waiter()) {
+                waiter.waitUntilFunctionActive(
+                    GetFunctionConfigurationRequest.builder().functionName(createFunctionResult.functionName()).build()
+                );
+            }
 
             // invoke function once
             String payload = "{\"test\": \"payload\"}";
-            InvokeRequest invokeRequest = new InvokeRequest()
-                .withFunctionName(createFunctionResult.getFunctionName())
-                .withPayload(payload);
-            InvokeResult invokeResult = lambda.invoke(invokeRequest);
-            assertThat(StandardCharsets.UTF_8.decode(invokeResult.getPayload()).toString())
+            InvokeRequest invokeRequest = InvokeRequest
+                .builder()
+                .functionName(createFunctionResult.functionName())
+                .payload(SdkBytes.fromUtf8String(payload))
+                .build();
+            InvokeResponse invokeResult = lambda.invoke(invokeRequest);
+            assertThat(invokeResult.payload().asUtf8String())
                 .as("Invoke result not matching expected output")
                 .isEqualTo(payload);
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index 08e50cc1d2a..bb9366c435b 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -3,7 +3,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface LocalstackTestImages {
-    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.12.8");
+    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:4.7.0");
 
     DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
 
@@ -11,9 +11,5 @@ public interface LocalstackTestImages {
 
     DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");
 
-    DockerImageName LOCALSTACK_0_13_IMAGE = LOCALSTACK_IMAGE.withTag("0.13.0");
-
-    DockerImageName LOCALSTACK_2_3_IMAGE = LOCALSTACK_IMAGE.withTag("2.3");
-
     DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("amazon/aws-cli:2.7.27");
 }

From 1aec92b8d11cb9b56c0ce3d50bbd008265c7eb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 6 Aug 2025 09:49:34 -0600
Subject: [PATCH 4420/4969] Update clickhouse version to 0.9.1 (#10593)

---
 modules/clickhouse/build.gradle | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index f0c57fe8c36..0b67f29ef2b 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,15 +5,14 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
+    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.2', classifier: 'http')
-    testRuntimeOnly(group: 'com.clickhouse', name: 'jdbc-v2', version: '0.7.2', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.1', classifier: 'all')
 
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'com.clickhouse:client-v2:0.9.0'
+    testImplementation 'com.clickhouse:client-v2:0.9.1'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')
 }

From 51ad2bc96a2bc75b138ee67eab6df21faee41427 Mon Sep 17 00:00:00 2001
From: livk <livk.cloud@gmail.com>
Date: Tue, 12 Aug 2025 00:09:51 +0800
Subject: [PATCH 4421/4969] Make MySQLContainer compatible with mysql:9.3.0
 (#10185)

Fixes #10184
---
 modules/mysql/src/main/resources/mysql-default-conf/my.cnf      | 1 -
 .../mysql/src/test/java/org/testcontainers/MySQLTestImages.java | 2 ++
 .../org/testcontainers/containers/MySQLRootAccountTest.java     | 1 +
 .../org/testcontainers/junit/mysql/MultiVersionMySQLTest.java   | 1 +
 .../src/test/resources/somepath/mysql_conf_override/my.cnf      | 1 -
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/src/main/resources/mysql-default-conf/my.cnf b/modules/mysql/src/main/resources/mysql-default-conf/my.cnf
index 6fc2129357f..b22aa7d9e93 100644
--- a/modules/mysql/src/main/resources/mysql-default-conf/my.cnf
+++ b/modules/mysql/src/main/resources/mysql-default-conf/my.cnf
@@ -43,7 +43,6 @@ innodb_data_file_path = ibdata1:10M:autoextend
 innodb_buffer_pool_size = 16M
 #innodb_additional_mem_pool_size = 2M
 # Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 5M
 innodb_log_buffer_size = 8M
 innodb_flush_log_at_trx_commit = 1
 innodb_lock_wait_timeout = 50
diff --git a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
index 2254754f2c2..6b3fe80ce4a 100644
--- a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
+++ b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java
@@ -9,4 +9,6 @@ public class MySQLTestImages {
     public static final DockerImageName MYSQL_80_IMAGE = DockerImageName.parse("mysql:8.0.36");
 
     public static final DockerImageName MYSQL_INNOVATION_IMAGE = DockerImageName.parse("mysql:8.3.0");
+
+    public static final DockerImageName MYSQL_93_IMAGE = DockerImageName.parse("mysql:9.3.0");
 }
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
index 51ba5257fa3..e9a3c862143 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
@@ -22,6 +22,7 @@ public static DockerImageName[] params() {
             MySQLTestImages.MYSQL_57_IMAGE,
             MySQLTestImages.MYSQL_80_IMAGE,
             MySQLTestImages.MYSQL_INNOVATION_IMAGE,
+            MySQLTestImages.MYSQL_93_IMAGE,
         };
     }
 
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index 4c8516cc5cc..25085289ba7 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -22,6 +22,7 @@ public static DockerImageName[] params() {
             MySQLTestImages.MYSQL_57_IMAGE,
             MySQLTestImages.MYSQL_80_IMAGE,
             MySQLTestImages.MYSQL_INNOVATION_IMAGE,
+            MySQLTestImages.MYSQL_93_IMAGE,
         };
     }
 
diff --git a/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf b/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
index 5721bf52ccb..6e6dcd28ad1 100644
--- a/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
+++ b/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf
@@ -46,7 +46,6 @@ innodb_data_file_path = ibdata1:10M:autoextend
 innodb_buffer_pool_size = 16M
 #innodb_additional_mem_pool_size = 2M
 # Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 5M
 innodb_log_buffer_size = 8M
 innodb_flush_log_at_trx_commit = 1
 innodb_lock_wait_timeout = 50

From f555bdecabc8bfa5d68f67229566fee653e227ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 06:16:55 +0000
Subject: [PATCH 4422/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 6fd325f78c0..f38d301c389 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -119,13 +119,13 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.27.3'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.27.4'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 1c2db714f52cfd2dd5515c09855db5ec7b2544ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 07:24:22 +0000
Subject: [PATCH 4423/4969] Bump actions/checkout from 4 to 5

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-docker-wormhole.yml         |  2 +-
 .github/workflows/ci-rootless.yml                |  2 +-
 .github/workflows/ci-windows.yml                 |  4 ++--
 .github/workflows/ci.yml                         | 16 ++++++++--------
 .github/workflows/moby-latest.yml                |  2 +-
 .github/workflows/release.yml                    |  2 +-
 .github/workflows/update-docs-version.yml        |  2 +-
 .github/workflows/update-gradle-wrapper.yml      |  2 +-
 .../workflows/update-testcontainers-version.yml  |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 8204bd0454b..9359316a924 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -44,7 +44,7 @@ jobs:
   in-docker_test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build with Gradle
         run: |
           docker run -i --rm \
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index e5c9afd1dbc..d13c0437112 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -46,7 +46,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup rootless Docker
         uses: docker/setup-docker-action@v4
         with:
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 3dd919bc919..57b2d117894 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -52,7 +52,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-build
       - name: Build with Gradle
         run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
@@ -78,7 +78,7 @@ jobs:
               target_url: `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
               context: 'CI - Windows',
             })
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed96bfdcfc7..66b364c6bfa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
       matrix:
         java: [ '17', '21' ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-build
         with:
           java-version: ${{ matrix.java }}
@@ -69,7 +69,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-build
       - name: Setup Testcontainers Cloud Client
         uses: atomicjar/testcontainers-cloud-setup-action@main
@@ -88,7 +88,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/actions/setup-gradle@v4
@@ -110,7 +110,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
@@ -123,7 +123,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/actions/setup-gradle@v4
@@ -146,7 +146,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-build
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
         working-directory: ./examples/
@@ -160,7 +160,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
         uses: gradle/actions/setup-gradle@v4
@@ -182,7 +182,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index dbb717757b3..b6af77feb2a 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-build
 
       - name: Install Stable Docker
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 77128657b0e..ca009b1dc8b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
   release:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Clear existing docker image cache
         run: docker image prune -af
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 0248fa1d93a..5bbf47c3484 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
       - name: Update latest_version property in mkdocs.yml
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 8740b7a3e4f..da9c77c1b5e 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # v1.0.13
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 13837626c06..90d249c7d3f 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
       - name: Update testcontainers.version property in gradle.properties

From 3603f6ca3a3c09f0cfa547e24f226aeeea6811f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 07:27:08 +0000
Subject: [PATCH 4424/4969] Bump redis.clients:jedis from 6.0.0 to 6.1.0 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 6fd325f78c0..043faffa4ee 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:6.0.0'
+    testImplementation 'redis.clients:jedis:6.1.0'
     testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From 911ef5eea3116effbf67b5a24d042f7592391279 Mon Sep 17 00:00:00 2001
From: winfriedgerlach <158032591+winfriedgerlach@users.noreply.github.com>
Date: Tue, 12 Aug 2025 23:46:41 +0200
Subject: [PATCH 4425/4969] Fix parameter check in Kafka cluster examples
 (#10361)

---
 .../kafkacluster/ApacheKafkaContainerCluster.java      | 10 ++++++----
 .../kafkacluster/ConfluentKafkaContainerCluster.java   | 10 ++++++----
 .../example/kafkacluster/KafkaContainerCluster.java    |  8 +++++---
 .../kafkacluster/KafkaContainerKraftCluster.java       | 10 ++++++----
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java
index a8616d2d4bb..0e56bd9d758 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java
@@ -25,12 +25,14 @@ public class ApacheKafkaContainerCluster implements Startable {
     private final Collection<KafkaContainer> brokers;
 
     public ApacheKafkaContainerCluster(String version, int brokersNum, int internalTopicsRf) {
-        if (brokersNum < 0) {
+        if (brokersNum <= 0) {
             throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
         }
-        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+        if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) {
             throw new IllegalArgumentException(
-                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+                "internalTopicsRf '" +
+                internalTopicsRf +
+                "' must be less than or equal to brokersNum and greater than 0"
             );
         }
 
@@ -99,6 +101,6 @@ public void start() {
 
     @Override
     public void stop() {
-        this.brokers.stream().parallel().forEach(GenericContainer::stop);
+        this.brokers.parallelStream().forEach(GenericContainer::stop);
     }
 }
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java
index 222050c76c0..f09c3072ea3 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java
@@ -25,12 +25,14 @@ public class ConfluentKafkaContainerCluster implements Startable {
     private final Collection<ConfluentKafkaContainer> brokers;
 
     public ConfluentKafkaContainerCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) {
-        if (brokersNum < 0) {
+        if (brokersNum <= 0) {
             throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
         }
-        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+        if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) {
             throw new IllegalArgumentException(
-                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+                "internalTopicsRf '" +
+                internalTopicsRf +
+                "' must be less than or equal to brokersNum and greater than 0"
             );
         }
 
@@ -100,6 +102,6 @@ public void start() {
 
     @Override
     public void stop() {
-        this.brokers.stream().parallel().forEach(GenericContainer::stop);
+        this.brokers.parallelStream().forEach(GenericContainer::stop);
     }
 }
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
index 403d087af3e..aa22cceadb0 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
@@ -31,12 +31,14 @@ public class KafkaContainerCluster implements Startable {
     private final Collection<KafkaContainer> brokers;
 
     public KafkaContainerCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) {
-        if (brokersNum < 0) {
+        if (brokersNum <= 0) {
             throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
         }
-        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+        if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) {
             throw new IllegalArgumentException(
-                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+                "internalTopicsRf '" +
+                internalTopicsRf +
+                "' must be less than or equal to brokersNum and greater than 0"
             );
         }
 
diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
index f42e3c5b1ba..264f751ecc6 100644
--- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
+++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
@@ -25,12 +25,14 @@ public class KafkaContainerKraftCluster implements Startable {
     private final Collection<KafkaContainer> brokers;
 
     public KafkaContainerKraftCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) {
-        if (brokersNum < 0) {
+        if (brokersNum <= 0) {
             throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0");
         }
-        if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) {
+        if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) {
             throw new IllegalArgumentException(
-                "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0"
+                "internalTopicsRf '" +
+                internalTopicsRf +
+                "' must be less than or equal to brokersNum and greater than 0"
             );
         }
 
@@ -101,6 +103,6 @@ public void start() {
 
     @Override
     public void stop() {
-        this.brokers.stream().parallel().forEach(GenericContainer::stop);
+        this.brokers.parallelStream().forEach(GenericContainer::stop);
     }
 }

From 860f58d4d0542a90061872a1f9045227e2962d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 14 Aug 2025 15:10:25 -0600
Subject: [PATCH 4426/4969] Fix grafana docs (#10605)

---
 docs/modules/grafana.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/modules/grafana.md b/docs/modules/grafana.md
index b1ec7f284ba..f31984ea7ce 100644
--- a/docs/modules/grafana.md
+++ b/docs/modules/grafana.md
@@ -10,6 +10,8 @@ You can start a Grafana OTel LGTM container instance from any Java application b
 [Grafana Otel LGTM container](../../modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
+## Adding this module to your project dependencies
+
 Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"

From 615332fdf28645baa2b2373b9339a8d89f0a54fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 14 Aug 2025 16:18:19 -0600
Subject: [PATCH 4427/4969] Fix redpanda docs link (#10606)

---
 docs/modules/redpanda.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/redpanda.md b/docs/modules/redpanda.md
index 2ce4a284836..9c7b7b3fb86 100644
--- a/docs/modules/redpanda.md
+++ b/docs/modules/redpanda.md
@@ -45,7 +45,7 @@ Below is an example of how to create the `AdminClient`:
 
 There are scenarios where additional listeners are needed because the consumer/producer can be another
 container in the same network or a different process where the port to connect differs from the default
-exposed port `9092`. E.g [Toxiproxy](../../docs/modules/toxiproxy.md).
+exposed port `9092`. E.g [Toxiproxy](../modules/toxiproxy.md).
 
 <!--codeinclude-->
 [Register additional listener](../../modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java) inside_block:registerListener

From efb858457e050d84a83af2775c1f4ae3815a6456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 14 Aug 2025 17:06:09 -0600
Subject: [PATCH 4428/4969] Improve database docs (#10607)

---
 docs/modules/databases/clickhouse.md          | 10 +++
 docs/modules/databases/cockroachdb.md         | 10 +++
 docs/modules/databases/cratedb.md             | 10 +++
 docs/modules/databases/databend.md            | 10 +++
 docs/modules/databases/db2.md                 | 26 +++-----
 docs/modules/databases/mariadb.md             | 10 +++
 docs/modules/databases/mssqlserver.md         | 22 +++----
 docs/modules/databases/mysql.md               | 10 +++
 docs/modules/databases/oceanbase.md           | 10 +++
 docs/modules/databases/oraclefree.md          |  9 ++-
 docs/modules/databases/oraclexe.md            |  9 ++-
 docs/modules/databases/orientdb.md            | 42 ++-----------
 docs/modules/databases/postgres.md            | 10 +++
 docs/modules/databases/questdb.md             | 11 +++-
 docs/modules/databases/tidb.md                | 10 +++
 docs/modules/databases/timeplus.md            | 10 +++
 docs/modules/databases/trino.md               | 63 ++-----------------
 docs/modules/databases/yugabytedb.md          | 17 +----
 .../clickhouse/ClickHouseContainerTest.java   |  5 +-
 .../cockroachdb/SimpleCockroachDBTest.java    |  5 +-
 .../junit/cratedb/SimpleCrateDBTest.java      |  5 +-
 .../databend/DatabendContainerTest.java       |  5 +-
 .../junit/db2/SimpleDb2Test.java              |  5 +-
 .../junit/mariadb/SimpleMariaDBTest.java      |  5 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    |  8 ++-
 .../junit/mysql/SimpleMySQLTest.java          |  6 +-
 .../oceanbase/SimpleOceanBaseCETest.java      | 47 +++++++-------
 .../junit/oracle/SimpleOracleTest.java        |  9 +--
 .../junit/oracle/SimpleOracleTest.java        |  7 ++-
 .../containers/OrientDBContainerTest.java     | 33 +++++-----
 .../postgresql/SimplePostgreSQLTest.java      |  5 +-
 .../junit/questdb/SimpleQuestDBTest.java      |  5 +-
 .../junit/tidb/SimpleTiDBTest.java            |  5 +-
 .../timeplus/TimeplusContainerTest.java       |  5 +-
 .../containers/TrinoContainerTest.java        |  5 +-
 .../junit/yugabytedb/YugabyteDBYCQLTest.java  |  2 -
 .../junit/yugabytedb/YugabyteDBYSQLTest.java  |  2 -
 37 files changed, 250 insertions(+), 218 deletions(-)

diff --git a/docs/modules/databases/clickhouse.md b/docs/modules/databases/clickhouse.md
index b3494867edf..204e8434b90 100644
--- a/docs/modules/databases/clickhouse.md
+++ b/docs/modules/databases/clickhouse.md
@@ -1,5 +1,15 @@
 # Clickhouse Module
 
+Testcontainers module for [ClickHouse](https://hub.docker.com/r/clickhouse/clickhouse-server)
+
+## Usage example
+
+You can start a ClickHouse container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container definition](../../../modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
index 45e3f75b86c..ce25ab016d5 100644
--- a/docs/modules/databases/cockroachdb.md
+++ b/docs/modules/databases/cockroachdb.md
@@ -1,5 +1,15 @@
 # CockroachDB Module
 
+Testcontainers module for [CockroachDB](https://hub.docker.com/r/cockroachdb/cockroach)
+
+## Usage example
+
+You can start a CockroachDB container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container definition](../../../modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java) inside_block:container
+<!--/codeinclude-->
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Adding this module to your project dependencies
diff --git a/docs/modules/databases/cratedb.md b/docs/modules/databases/cratedb.md
index 74ec23dda00..520f476c178 100644
--- a/docs/modules/databases/cratedb.md
+++ b/docs/modules/databases/cratedb.md
@@ -1,5 +1,15 @@
 # CrateDB Module
 
+Testcontainers module for [CrateDB](https://hub.docker.com/_/crate)
+
+## Usage example
+
+You can start a CrateDB container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container definition](../../../modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java) inside_block:container
+<!--/codeinclude-->
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Adding this module to your project dependencies
diff --git a/docs/modules/databases/databend.md b/docs/modules/databases/databend.md
index c399dc2bb51..3dae2740796 100644
--- a/docs/modules/databases/databend.md
+++ b/docs/modules/databases/databend.md
@@ -1,5 +1,15 @@
 # Databend Module
 
+Testcontainers module for [Databend](https://hub.docker.com/r/datafuselabs/databend)
+
+## Usage example
+
+You can start a Databend container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container definition](../../../modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
index 945536cac05..4017cbf7408 100644
--- a/docs/modules/databases/db2.md
+++ b/docs/modules/databases/db2.md
@@ -1,34 +1,22 @@
 # DB2 Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
-
-See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+Testcontainers module for [DB2](https://hub.docker.com/r/ibmcom/db2)
 
 ## Usage example
 
-Running DB2 as a stand-in for in a test:
+You can start a DB2 container instance from any Java application by using:
 
-```java
-public class SomeTest {
-
-    @ClassRule
-    public Db2Container db2 = new Db2Container()
-        .acceptLicense();
-    
-    @Test
-    public void someTestMethod() {
-        String url = db2.getJdbcUrl();
-
-        ... create a connection and run test as normal
-    }
-```
+<!--codeinclude-->
+[Container definition](../../../modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java) inside_block:container
+<!--/codeinclude-->
 
 !!! warning "EULA Acceptance"
     Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the DB2 image EULA, call the `acceptLicense()` method, or place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `ibmcom/db2:11.5.0.0a` (or, if you are overriding the docker image name/tag, update accordingly).
     
     Please see the [`ibmcom/db2` image documentation](https://hub.docker.com/r/ibmcom/db2) for a link to the EULA document.
 
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/mariadb.md b/docs/modules/databases/mariadb.md
index 25367d629bd..48058d187f6 100644
--- a/docs/modules/databases/mariadb.md
+++ b/docs/modules/databases/mariadb.md
@@ -1,5 +1,15 @@
 # MariaDB Module
 
+Testcontainers module for [MariaDB](https://hub.docker.com/_/mariadb)
+
+## Usage example
+
+You can start a MySQL container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container definition](../../../modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java) inside_block:container
+<!--/codeinclude-->
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## MariaDB `root` user password
diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index 9d0912f2563..1bc71def3b8 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -1,30 +1,22 @@
 # MS SQL Server Module
 
-See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+Testcontainers module for [MS SQL Server](https://mcr.microsoft.com/en-us/artifact/mar/mssql/server/)
 
 ## Usage example
 
-Running MS SQL Server as a stand-in for in a test:
-
-```java
-public class SomeTest {
-
-    @Rule
-    public MSSQLServerContainer mssqlserver = new MSSQLServerContainer()
-        .acceptLicense();
-    
-    @Test
-    public void someTestMethod() {
-        String url = mssqlserver.getJdbcUrl();
+You can start a MS SQL Server container instance from any Java application by using:
 
-        ... create a connection and run test as normal
-```
+<!--codeinclude-->
+[Container definition](../../../modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java) inside_block:container
+<!--/codeinclude-->
 
 !!! warning "EULA Acceptance"
     Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the MS SQL Server image EULA, call the `acceptLicense()` method, or place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `mcr.microsoft.com/mssql/server:2017-CU12` (or, if you are overriding the docker image name/tag, update accordingly).
     
     Please see the [`microsoft-mssql-server` image documentation](https://hub.docker.com/_/microsoft-mssql-server#environment-variables) for a link to the EULA document.
 
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index 9d03d52b109..a6af2eef735 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -1,5 +1,15 @@
 # MySQL Module
 
+Testcontainers module for [MySQL](https://hub.docker.com/_/mysql)
+
+## Usage example
+
+You can start a MySQL container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container definition](../../../modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java) inside_block:container
+<!--/codeinclude-->
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Overriding MySQL my.cnf settings
diff --git a/docs/modules/databases/oceanbase.md b/docs/modules/databases/oceanbase.md
index b90a492a6e4..7715f0d90fc 100644
--- a/docs/modules/databases/oceanbase.md
+++ b/docs/modules/databases/oceanbase.md
@@ -1,5 +1,15 @@
 # OceanBase Module
 
+Testcontainers module for [OceanBase](https://hub.docker.com/r/oceanbase/oceanbase-ce)
+
+## Usage example
+
+You can start an OceanBase container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container definition](../../../modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java) inside_block:container
+<!--/codeinclude-->
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Adding this module to your project dependencies
diff --git a/docs/modules/databases/oraclefree.md b/docs/modules/databases/oraclefree.md
index c85d672f140..63e7f8391fd 100644
--- a/docs/modules/databases/oraclefree.md
+++ b/docs/modules/databases/oraclefree.md
@@ -1,14 +1,17 @@
 # Oracle Database Free Module
 
-See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+Testcontainers module for [Oracle Free](https://hub.docker.com/r/gvenzl/oracle-free)
 
 ## Usage example
 
-You can use `OracleContainer` like any other JDBC container:
+You can start an Oracle-Free container instance from any Java application by using:
+
 <!--codeinclude-->
-[Container creation](../../../modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java) inside_block:constructor
+[Container creation](../../../modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java) inside_block:container
 <!--/codeinclude-->
 
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/oraclexe.md b/docs/modules/databases/oraclexe.md
index bfc06d9a106..fe6176a5bb1 100644
--- a/docs/modules/databases/oraclexe.md
+++ b/docs/modules/databases/oraclexe.md
@@ -1,14 +1,17 @@
 # Oracle-XE Module
 
-See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+Testcontainers module for [Oracle XE](https://hub.docker.com/r/gvenzl/oracle-xe)
 
 ## Usage example
 
-You can use `OracleContainer` like any other JDBC container:
+You can start an Oracle-XE container instance from any Java application by using:
+
 <!--codeinclude-->
-[Container creation](../../../modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java) inside_block:constructor
+[Container creation](../../../modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java) inside_block:container
 <!--/codeinclude-->
 
+See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/orientdb.md b/docs/modules/databases/orientdb.md
index 57839cd99f0..40a26100ae1 100644
--- a/docs/modules/databases/orientdb.md
+++ b/docs/modules/databases/orientdb.md
@@ -1,46 +1,14 @@
 # OrientDB Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
-
-
-This module helps running [OrientDB](https://orientdb.org/download) using Testcontainers.
-
-Note that it's based on the [official Docker image](https://hub.docker.com/_/orientdb/) provided by OrientDB.
+Testcontainers module for [OrientDB](https://hub.docker.com/_/orientdb/)
 
 ## Usage example
 
-Declare your Testcontainers instance as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
-You can call `getDbUrl()` OrientDB container and build the `ODatabaseSession` by your own, but a more useful `getSession()` method is provided.
-On the JVM you would most likely use the [Java driver](https://github.com/).
-
-The following example uses the JUnit 5 extension `@Testcontainers` and demonstrates both the usage of the Java Client:
-
-=== "JUnit 5 example"
-    ```java
-    @Testcontainers
-    public class ExampleTest {
-    
-        @Container
-        private static OrientDBContainer container = new OrientDBContainer();
-    
-        @Test
-        void testDbCreation() {
-    
-            final ODatabaseSession session = container.getSession();
-    
-            session.command("CREATE CLASS Person EXTENDS V");
-            session.command("INSERT INTO Person set name='john'");
-            session.command("INSERT INTO Person set name='jane'");
-    
-            assertThat(session.query("SELECT FROM Person").stream()).hasSize(2);
-        }
-    
-    }
-    ```
-
-You are not limited to Unit tests and can of course use an instance of the OrientDB Testcontainers implementation in vanilla Java code as well.
+You can start an OrientDB container instance from any Java application by using:
 
+<!--codeinclude-->
+[Container creation](../../../modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java) inside_block:container
+<!--/codeinclude-->
 
 ## Adding this module to your project dependencies
 
diff --git a/docs/modules/databases/postgres.md b/docs/modules/databases/postgres.md
index d07e77937b9..e936205d4cb 100644
--- a/docs/modules/databases/postgres.md
+++ b/docs/modules/databases/postgres.md
@@ -1,5 +1,15 @@
 # Postgres Module
 
+Testcontainers module for [PostgresSQL](https://hub.docker.com/_/postgres)
+
+## Usage example
+
+You can start a PostgreSQL container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container creation](../../../modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java) inside_block:container
+<!--/codeinclude-->
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Compatible images
diff --git a/docs/modules/databases/questdb.md b/docs/modules/databases/questdb.md
index 8783dd4b757..f1a436fc26d 100644
--- a/docs/modules/databases/questdb.md
+++ b/docs/modules/databases/questdb.md
@@ -1,7 +1,14 @@
 # QuestDB Module
 
-Testcontainers module for [QuestDB](https://github.com/questdb/questdb). QuestDB is a high-performance, open-source SQL
-database for applications in financial services, IoT, machine learning, DevOps and observability.
+Testcontainers module for [QuestDB](https://hub.docker.com/r/questdb/questdb)
+
+## Usage example
+
+You can start a QuestDB container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container creation](../../../modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java) inside_block:container
+<!--/codeinclude-->
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container
 types.
diff --git a/docs/modules/databases/tidb.md b/docs/modules/databases/tidb.md
index 01c6b4cfcd4..c203f3155bb 100644
--- a/docs/modules/databases/tidb.md
+++ b/docs/modules/databases/tidb.md
@@ -1,5 +1,15 @@
 # TiDB Module
 
+Testcontainers module for [TiDB](https://hub.docker.com/r/pingcap/tidb)
+
+## Usage example
+
+You can start a TiDB container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container creation](../../../modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java) inside_block:container
+<!--/codeinclude-->
+
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
 ## Adding this module to your project dependencies
diff --git a/docs/modules/databases/timeplus.md b/docs/modules/databases/timeplus.md
index 4f5cd4106a3..fd94da043ff 100644
--- a/docs/modules/databases/timeplus.md
+++ b/docs/modules/databases/timeplus.md
@@ -1,5 +1,15 @@
 # Timeplus Module
 
+Testcontainers module for [Timeplus](https://hub.docker.com/r/timeplus/timeplusd)
+
+## Usage example
+
+You can start a Timeplus container instance from any Java application by using:
+
+<!--codeinclude-->
+[Container creation](../../../modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java) inside_block:container
+<!--/codeinclude-->
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/trino.md b/docs/modules/databases/trino.md
index b6aeddafb40..5ea9b2d8ab3 100644
--- a/docs/modules/databases/trino.md
+++ b/docs/modules/databases/trino.md
@@ -1,67 +1,16 @@
 # Trino Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
-
-See [Database containers](./index.md) for documentation and usage that is common to all database container types.
+Testcontainers module for [Trino](https://hub.docker.com/r/trinodb/trino)
 
 ## Usage example
 
-Running Trino as a stand-in for in a test:
-
-```java
-public class SomeTest {
-
-    @Rule
-    public TrinoContainer trino = new TrinoContainer();
-    
-    @Test
-    public void someTestMethod() {
-        String url = trino.getJdbcUrl();
-
-        ... create a connection and run test as normal
-```
+You can start a Trino container instance from any Java application by using:
 
-Trino comes with several catalogs preconfigured. Most useful ones for testing are
+<!--codeinclude-->
+[Container creation](../../../modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java) inside_block:container
+<!--/codeinclude-->
 
-* `tpch` catalog using the [Trino TPCH Connector](https://trino.io/docs/current/connector/tpch.html).
-  This is a read-only catalog that defines standard TPCH schema, so is available for querying without a need
-  to create any tables.
-* `memory` catalog using the [Trino Memory Connector](https://trino.io/docs/current/connector/memory.html).
-  This catalog can be used for creating schemas and tables and does not require any storage, as everything
-  is stored fully in-memory.
-
-Example test using the `tpch` and `memory` catalogs:
-
-```java
-public class SomeTest {
-    @Rule
-    public TrinoContainer trino = new TrinoContainer();
-
-    @Test
-    public void queryMemoryAndTpchConnectors() throws SQLException {
-        try (Connection connection = trino.createConnection();
-             Statement statement = connection.createStatement()) {
-            // Prepare data
-            statement.execute("CREATE TABLE memory.default.table_with_array AS SELECT 1 id, ARRAY[1, 42, 2, 42, 4, 42] my_array");
-
-            // Query Trino using newly created table and a builtin connector
-            try (ResultSet resultSet = statement.executeQuery("" +
-                "SELECT nationkey, element " +
-                "FROM tpch.tiny.nation " +
-                "JOIN memory.default.table_with_array twa ON nationkey = twa.id " +
-                "LEFT JOIN UNNEST(my_array) a(element) ON true " +
-                "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES ")) {
-                List<Integer> actualElements = new ArrayList<>();
-                while (resultSet.next()) {
-                    actualElements.add(resultSet.getInt("element"));
-                }
-                Assert.assertEquals(Arrays.asList(2, 4, 42, 42, 42), actualElements);
-            }
-        }
-    }
-}
-```
+See [Database containers](./index.md) for documentation and usage that is common to all database container types.
 
 ## Adding this module to your project dependencies
 
diff --git a/docs/modules/databases/yugabytedb.md b/docs/modules/databases/yugabytedb.md
index 4ab3436b57c..3b7130a2958 100644
--- a/docs/modules/databases/yugabytedb.md
+++ b/docs/modules/databases/yugabytedb.md
@@ -1,11 +1,11 @@
 # YugabyteDB Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+Testcontainers module for [YugabyteDB](https://hub.docker.com/r/yugabytedb/yugabyte)
 
 See [Database containers](./index.md) for documentation and usage that is common to all database container types.
 
-YugabyteDB supports two APIs. 
+YugabyteDB supports two APIs.
+
 - Yugabyte Structured Query Language [YSQL](https://docs.yugabyte.com/latest/api/ysql/) is a fully-relational API that is built by the PostgreSQL code
 - Yugabyte Cloud Query Language [YCQL](https://docs.yugabyte.com/latest/api/ycql/) is a semi-relational SQL API that has its roots in the Cassandra Query Language
 
@@ -17,12 +17,6 @@ YugabyteDB supports two APIs.
 [Creating a YSQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java) inside_block:creatingYSQLContainer
 <!--/codeinclude-->
 
-
-<!--codeinclude-->
-[Starting a YSQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java) inside_block:startingYSQLContainer
-<!--/codeinclude-->
-
-
 ### YCQL API
 
 <!--codeinclude-->
@@ -30,11 +24,6 @@ YugabyteDB supports two APIs.
 <!--/codeinclude-->
 
 
-<!--codeinclude-->
-[Starting a YCQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java) inside_block:startingYCQLContainer
-<!--/codeinclude-->
-
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
index 0e7a3d1c119..ff20917e009 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
@@ -20,7 +20,10 @@ public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11-alpine")) {
+        try ( // container {
+            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11-alpine")
+            // }
+        ) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 9ea8dd6c770..12c25738e45 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -22,7 +22,10 @@ public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)) {
+        try ( // container {
+            CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v22.2.3")
+            // }
+        ) {
             cockroach.start();
 
             ResultSet resultSet = performQuery(cockroach, "SELECT 1");
diff --git a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
index c36b1432100..40f2c667711 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
@@ -20,7 +20,10 @@ public class SimpleCrateDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)) {
+        try ( // container {
+            CrateDBContainer cratedb = new CrateDBContainer("crate:5.2.5")
+            // }
+        ) {
             cratedb.start();
 
             ResultSet resultSet = performQuery(cratedb, "SELECT 1");
diff --git a/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
index 92f4842d119..66f3504e725 100644
--- a/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
+++ b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
@@ -12,7 +12,10 @@ public class DatabendContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")) {
+        try ( // container {
+            DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
+            // }
+        ) {
             databend.start();
 
             ResultSet resultSet = performQuery(databend, "SELECT 1");
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 2cffbdb117a..5f8763b1e19 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -14,7 +14,10 @@ public class SimpleDb2Test extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) {
+        try ( // container {
+            Db2Container db2 = new Db2Container("ibmcom/db2:11.5.0.0a").acceptLicense()
+            // }
+        ) {
             db2.start();
 
             ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index d4bcc529cbc..2651615928c 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -25,7 +25,10 @@ public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (MariaDBContainer<?> mariadb = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)) {
+        try ( // container {
+            MariaDBContainer<?> mariadb = new MariaDBContainer<>("mariadb:10.3.39")
+            // }
+        ) {
             mariadb.start();
 
             ResultSet resultSet = performQuery(mariadb, "SELECT 1");
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 2827544cade..943eff30a53 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -17,8 +17,12 @@ public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (
-            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
+        try ( // container {
+            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(
+                "mcr.microsoft.com/mssql/server:2022-CU20-ubuntu-22.04"
+            )
+                .acceptLicense()
+            // }
         ) {
             mssqlServer.start();
             ResultSet resultSet = performQuery(mssqlServer, "SELECT 1");
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 5de23504584..085fdf074cb 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -36,9 +36,9 @@ public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
-                .withLogConsumer(new Slf4jLogConsumer(logger))
+        try ( // container {
+            MySQLContainer<?> mysql = new MySQLContainer<>("mysql:8.0.36")
+            // }
         ) {
             mysql.start();
 
diff --git a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
index efe7ead90bd..46619f328be 100644
--- a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
+++ b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
@@ -1,9 +1,6 @@
 package org.testcontainers.oceanbase;
 
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -13,33 +10,31 @@
 
 public class SimpleOceanBaseCETest extends AbstractContainerDatabaseTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(SimpleOceanBaseCETest.class);
-
-    private final OceanBaseCEContainerProvider containerProvider = new OceanBaseCEContainerProvider();
-
-    @SuppressWarnings("resource")
-    private OceanBaseCEContainer testContainer() {
-        return ((OceanBaseCEContainer) containerProvider.newInstance()).withLogConsumer(new Slf4jLogConsumer(logger));
-    }
+    private static final String IMAGE = "oceanbase/oceanbase-ce:4.2.1.8-108000022024072217";
 
     @Test
     public void testSimple() throws SQLException {
-        try (OceanBaseCEContainer container = testContainer()) {
-            container.start();
-
-            ResultSet resultSet = performQuery(container, "SELECT 1");
+        try ( // container {
+            OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(
+                "oceanbase/oceanbase-ce:4.2.1.8-108000022024072217"
+            )
+            // }
+        ) {
+            oceanbase.start();
+
+            ResultSet resultSet = performQuery(oceanbase, "SELECT 1");
             int resultSetInt = resultSet.getInt(1);
             assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
-            assertHasCorrectExposedAndLivenessCheckPorts(container);
+            assertHasCorrectExposedAndLivenessCheckPorts(oceanbase);
         }
     }
 
     @Test
     public void testExplicitInitScript() throws SQLException {
-        try (OceanBaseCEContainer container = testContainer().withInitScript("init.sql")) {
-            container.start();
+        try (OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(IMAGE).withInitScript("init.sql")) {
+            oceanbase.start();
 
-            ResultSet resultSet = performQuery(container, "SELECT foo FROM bar");
+            ResultSet resultSet = performQuery(oceanbase, "SELECT foo FROM bar");
             String firstColumnValue = resultSet.getString(1);
             assertThat(firstColumnValue).as("Value from init script should equal real value").isEqualTo("hello world");
         }
@@ -47,21 +42,21 @@ public void testExplicitInitScript() throws SQLException {
 
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
-        try (OceanBaseCEContainer container = testContainer().withUrlParam("useSSL", "false")) {
-            container.start();
+        try (OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(IMAGE).withUrlParam("useSSL", "false")) {
+            oceanbase.start();
 
-            String jdbcUrl = container.getJdbcUrl();
+            String jdbcUrl = oceanbase.getJdbcUrl();
             assertThat(jdbcUrl).contains("?");
             assertThat(jdbcUrl).contains("useSSL=false");
         }
     }
 
-    private void assertHasCorrectExposedAndLivenessCheckPorts(OceanBaseCEContainer container) {
+    private void assertHasCorrectExposedAndLivenessCheckPorts(OceanBaseCEContainer oceanbase) {
         int sqlPort = 2881;
         int rpcPort = 2882;
 
-        assertThat(container.getExposedPorts()).containsExactlyInAnyOrder(sqlPort, rpcPort);
-        assertThat(container.getLivenessCheckPortNumbers())
-            .containsExactlyInAnyOrder(container.getMappedPort(sqlPort), container.getMappedPort(rpcPort));
+        assertThat(oceanbase.getExposedPorts()).containsExactlyInAnyOrder(sqlPort, rpcPort);
+        assertThat(oceanbase.getLivenessCheckPortNumbers())
+            .containsExactlyInAnyOrder(oceanbase.getMappedPort(sqlPort), oceanbase.getMappedPort(rpcPort));
     }
 }
diff --git a/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 45ed72cb622..a9c3bce593a 100644
--- a/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -13,7 +13,7 @@
 
 public class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
-    public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
+    private static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
         "gvenzl/oracle-free:slim-faststart"
     );
 
@@ -33,7 +33,10 @@ private void runTest(OracleContainer container, String databaseName, String user
 
     @Test
     public void testDefaultSettings() throws SQLException {
-        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) {
+        try ( // container {
+            OracleContainer oracle = new OracleContainer("gvenzl/oracle-free:slim-faststart")
+            // }
+        ) {
             runTest(oracle, "freepdb1", "test", "test");
 
             // Match against the last '/'
@@ -52,12 +55,10 @@ public void testPluggableDatabase() throws SQLException {
     @Test
     public void testPluggableDatabaseAndCustomUser() throws SQLException {
         try (
-            // constructor {
             OracleContainer oracle = new OracleContainer("gvenzl/oracle-free:slim-faststart")
                 .withDatabaseName("testDB")
                 .withUsername("testUser")
                 .withPassword("testPassword")
-            // }
         ) {
             runTest(oracle, "testDB", "testUser", "testPassword");
         }
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index 82ef9846ab2..eb63442c06e 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -33,7 +33,10 @@ private void runTest(OracleContainer container, String databaseName, String user
 
     @Test
     public void testDefaultSettings() throws SQLException {
-        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);) {
+        try ( // container {
+            OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:21-slim-faststart")
+            // }
+        ) {
             runTest(oracle, "xepdb1", "test", "test");
 
             // Match against the last '/'
@@ -52,12 +55,10 @@ public void testPluggableDatabase() throws SQLException {
     @Test
     public void testPluggableDatabaseAndCustomUser() throws SQLException {
         try (
-            // constructor {
             OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:21-slim-faststart")
                 .withDatabaseName("testDB")
                 .withUsername("testUser")
                 .withPassword("testPassword")
-            // }
         ) {
             runTest(oracle, "testDB", "testUser", "testPassword");
         }
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index d370dc71472..ca520983e71 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -13,11 +13,14 @@ public class OrientDBContainerTest {
 
     @Test
     public void shouldReturnTheSameSession() {
-        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)) {
-            container.start();
+        try ( // container {
+            OrientDBContainer orientdb = new OrientDBContainer("orientdb:3.2.0-tp3")
+            // }
+        ) {
+            orientdb.start();
 
-            final ODatabaseSession session = container.getSession();
-            final ODatabaseSession session2 = container.getSession();
+            final ODatabaseSession session = orientdb.getSession();
+            final ODatabaseSession session2 = orientdb.getSession();
 
             assertThat(session).isSameAs(session2);
         }
@@ -25,10 +28,10 @@ public void shouldReturnTheSameSession() {
 
     @Test
     public void shouldInitializeWithCommands() {
-        try (OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)) {
-            container.start();
+        try (OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)) {
+            orientdb.start();
 
-            final ODatabaseSession session = container.getSession();
+            final ODatabaseSession session = orientdb.getSession();
 
             session.command("CREATE CLASS Person EXTENDS V");
             session.command("INSERT INTO Person set name='john'");
@@ -41,15 +44,15 @@ public void shouldInitializeWithCommands() {
     @Test
     public void shouldQueryWithGremlin() {
         try (
-            OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)
+            OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)
                 .withCopyFileToContainer(
                     MountableFile.forClasspathResource("orientdb-server-config.xml"),
                     "/orientdb/config/orientdb-server-config.xml"
                 )
         ) {
-            container.start();
+            orientdb.start();
 
-            final ODatabaseSession session = container.getSession("admin", "admin");
+            final ODatabaseSession session = orientdb.getSession("admin", "admin");
 
             session.command("CREATE CLASS Person EXTENDS V");
             session.command("INSERT INTO Person set name='john'");
@@ -62,16 +65,16 @@ public void shouldQueryWithGremlin() {
     @Test
     public void shouldInitializeDatabaseFromScript() {
         try (
-            OrientDBContainer container = new OrientDBContainer(ORIENTDB_IMAGE)
+            OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)
                 .withScriptPath("initscript.osql")
                 .withDatabaseName("persons")
         ) {
-            container.start();
+            orientdb.start();
 
-            assertThat(container.getDbUrl())
-                .isEqualTo("remote:" + container.getHost() + ":" + container.getMappedPort(2424) + "/persons");
+            assertThat(orientdb.getDbUrl())
+                .isEqualTo("remote:" + orientdb.getHost() + ":" + orientdb.getMappedPort(2424) + "/persons");
 
-            final ODatabaseSession session = container.getSession();
+            final ODatabaseSession session = orientdb.getSession();
 
             assertThat(session.query("SELECT FROM Person").stream()).hasSize(4);
         }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 250f19d87a0..53585fec327 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -21,7 +21,10 @@ public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)) {
+        try ( // container {
+            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:9.6.12")
+            // }
+        ) {
             postgres.start();
 
             ResultSet resultSet = performQuery(postgres, "SELECT 1");
diff --git a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
index 16198740c0e..f91f17f14b4 100644
--- a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
+++ b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
@@ -26,7 +26,10 @@ public class SimpleQuestDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (QuestDBContainer questDB = new QuestDBContainer(QuestDBTestImages.QUESTDB_IMAGE)) {
+        try ( // container {
+            QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:6.5.3")
+            // }
+        ) {
             questDB.start();
 
             ResultSet resultSet = performQuery(questDB, questDB.getTestQueryString());
diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
index 6b4429afe75..c010e4298fe 100644
--- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
+++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
@@ -14,7 +14,10 @@ public class SimpleTiDBTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE)) {
+        try ( // container {
+            TiDBContainer tidb = new TiDBContainer("pingcap/tidb:v6.1.0")
+            // }
+        ) {
             tidb.start();
 
             ResultSet resultSet = performQuery(tidb, "SELECT 1");
diff --git a/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java b/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
index 95ecc1c6ef7..5e00f945555 100644
--- a/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
+++ b/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
@@ -13,7 +13,10 @@ public class TimeplusContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (TimeplusContainer timeplus = new TimeplusContainer(TimeplusImages.TIMEPLUS_IMAGE)) {
+        try ( // container {
+            TimeplusContainer timeplus = new TimeplusContainer("timeplus/timeplusd:2.3.21")
+            // }
+        ) {
             timeplus.start();
 
             ResultSet resultSet = performQuery(timeplus, "SELECT 1");
diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
index 6ef733ca972..ea25f39dbef 100644
--- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
@@ -13,7 +13,10 @@ public class TrinoContainerTest {
 
     @Test
     public void testSimple() throws Exception {
-        try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) {
+        try ( // container {
+            TrinoContainer trino = new TrinoContainer("trinodb/trino:352")
+            // }
+        ) {
             trino.start();
             try (
                 Connection connection = trino.createConnection();
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
index fe4723b409f..bf8ec2be1ea 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
@@ -30,9 +30,7 @@ public void testSmoke() {
                 .withPassword("cassandra")
             // }
         ) {
-            // startingYCQLContainer {
             ycqlContainer.start();
-            // }
             assertThat(performQuery(ycqlContainer, "SELECT release_version FROM system.local").wasApplied())
                 .as("A sample test query succeeds")
                 .isTrue();
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
index 94cfaa7f2e4..47a36f4f784 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
@@ -27,9 +27,7 @@ public void testSmoke() throws SQLException {
             )
             // }
         ) {
-            // startingYSQLContainer {
             ysqlContainer.start();
-            // }
             assertThat(performQuery(ysqlContainer, "SELECT 1").getInt(1))
                 .as("A sample test query succeeds")
                 .isEqualTo(1);

From a72adadd38076cb5080c119d294427346051b495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 15 Aug 2025 11:20:40 -0600
Subject: [PATCH 4429/4969] Fix JDBC docs (#10608)

---
 docs/modules/databases/jdbc.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/databases/jdbc.md b/docs/modules/databases/jdbc.md
index 05229db4ec0..72539aef44e 100644
--- a/docs/modules/databases/jdbc.md
+++ b/docs/modules/databases/jdbc.md
@@ -37,11 +37,11 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using CrateDB
 
-`jdbc:tc:cratedb:5.2.3//localhost:5432/crate`
+`jdbc:tc:cratedb:5.2.3:///databasename`
 
 #### Using DB2
 
-`jdbc:tc:db2:11.5.0.0a//localhost:5432/crate`
+`jdbc:tc:db2:11.5.0.0a:///databasename`
 
 #### Using MariaDB
 

From d3e22489d3be6750c7ea090ddb4c2f418ad94a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 15 Aug 2025 11:36:49 -0600
Subject: [PATCH 4430/4969] Add Testcontainers JDBC URL section to modules
 (#10609)

---
 docs/modules/databases/clickhouse.md  | 6 ++++++
 docs/modules/databases/cockroachdb.md | 6 ++++++
 docs/modules/databases/cratedb.md     | 6 ++++++
 docs/modules/databases/databend.md    | 6 ++++++
 docs/modules/databases/db2.md         | 6 ++++++
 docs/modules/databases/mariadb.md     | 6 ++++++
 docs/modules/databases/mssqlserver.md | 6 ++++++
 docs/modules/databases/mysql.md       | 6 ++++++
 docs/modules/databases/oceanbase.md   | 6 ++++++
 docs/modules/databases/oraclefree.md  | 6 ++++++
 docs/modules/databases/oraclexe.md    | 6 ++++++
 docs/modules/databases/postgres.md    | 9 +++++++++
 docs/modules/databases/questdb.md     | 6 ++++++
 docs/modules/databases/tidb.md        | 6 ++++++
 docs/modules/databases/timeplus.md    | 6 ++++++
 docs/modules/databases/trino.md       | 6 ++++++
 docs/modules/databases/yugabytedb.md  | 6 ++++++
 17 files changed, 105 insertions(+)

diff --git a/docs/modules/databases/clickhouse.md b/docs/modules/databases/clickhouse.md
index 204e8434b90..1ba8a1ff0aa 100644
--- a/docs/modules/databases/clickhouse.md
+++ b/docs/modules/databases/clickhouse.md
@@ -10,6 +10,12 @@ You can start a ClickHouse container instance from any Java application by using
 [Container definition](../../../modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:clickhouse:18.10.3:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
index ce25ab016d5..258a51ea74c 100644
--- a/docs/modules/databases/cockroachdb.md
+++ b/docs/modules/databases/cockroachdb.md
@@ -12,6 +12,12 @@ You can start a CockroachDB container instance from any Java application by usin
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:cockroach:v21.2.3:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/cratedb.md b/docs/modules/databases/cratedb.md
index 520f476c178..14c15608904 100644
--- a/docs/modules/databases/cratedb.md
+++ b/docs/modules/databases/cratedb.md
@@ -12,6 +12,12 @@ You can start a CrateDB container instance from any Java application by using:
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:cratedb:5.2.3:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/databend.md b/docs/modules/databases/databend.md
index 3dae2740796..97b92729241 100644
--- a/docs/modules/databases/databend.md
+++ b/docs/modules/databases/databend.md
@@ -10,6 +10,12 @@ You can start a Databend container instance from any Java application by using:
 [Container definition](../../../modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:databend:v1.2.615:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
index 4017cbf7408..fde68a77afe 100644
--- a/docs/modules/databases/db2.md
+++ b/docs/modules/databases/db2.md
@@ -17,6 +17,12 @@ You can start a DB2 container instance from any Java application by using:
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:db2:11.5.0.0a:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/mariadb.md b/docs/modules/databases/mariadb.md
index 48058d187f6..2968c7a7e13 100644
--- a/docs/modules/databases/mariadb.md
+++ b/docs/modules/databases/mariadb.md
@@ -12,6 +12,12 @@ You can start a MySQL container instance from any Java application by using:
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:mariadb:10.3.39:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## MariaDB `root` user password
 
 If no custom password is specified, the container will use the default user password `test` for the `root` user as well.
diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index 1bc71def3b8..f12365aaa18 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -17,6 +17,12 @@ You can start a MS SQL Server container instance from any Java application by us
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:sqlserver:2017-CU12:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index a6af2eef735..825ab42f60c 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -12,6 +12,12 @@ You can start a MySQL container instance from any Java application by using:
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:mysql:8.0.36:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Overriding MySQL my.cnf settings
 
 For MySQL databases, it is possible to override configuration settings using resources on the classpath. Assuming `somepath/mysql_conf_override`
diff --git a/docs/modules/databases/oceanbase.md b/docs/modules/databases/oceanbase.md
index 7715f0d90fc..c5c82a091fd 100644
--- a/docs/modules/databases/oceanbase.md
+++ b/docs/modules/databases/oceanbase.md
@@ -12,6 +12,12 @@ You can start an OceanBase container instance from any Java application by using
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:oceanbasece:4.2.1-lts:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/oraclefree.md b/docs/modules/databases/oraclefree.md
index 63e7f8391fd..b9ade460a20 100644
--- a/docs/modules/databases/oraclefree.md
+++ b/docs/modules/databases/oraclefree.md
@@ -12,6 +12,12 @@ You can start an Oracle-Free container instance from any Java application by usi
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:oracle:21-slim-faststart:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/oraclexe.md b/docs/modules/databases/oraclexe.md
index fe6176a5bb1..0f018a045fb 100644
--- a/docs/modules/databases/oraclexe.md
+++ b/docs/modules/databases/oraclexe.md
@@ -12,6 +12,12 @@ You can start an Oracle-XE container instance from any Java application by using
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:oracle:21-slim-faststart:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/postgres.md b/docs/modules/databases/postgres.md
index e936205d4cb..043a01bb93e 100644
--- a/docs/modules/databases/postgres.md
+++ b/docs/modules/databases/postgres.md
@@ -12,6 +12,15 @@ You can start a PostgreSQL container instance from any Java application by using
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+* PostgreSQL: `jdbc:tc:postgresql:9.6.8:///databasename`
+* PostGIS: `jdbc:tc:postgis:9.6-2.5:///databasename`
+* TimescaleDB: `jdbc:tc:timescaledb:2.1.0-pg13:///databasename`
+* PGvector: `jdbc:tc:pgvector:pg16:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Compatible images
 
 `PostgreSQLContainer` can also be used with the following images:
diff --git a/docs/modules/databases/questdb.md b/docs/modules/databases/questdb.md
index f1a436fc26d..6c99e32df2e 100644
--- a/docs/modules/databases/questdb.md
+++ b/docs/modules/databases/questdb.md
@@ -13,6 +13,12 @@ You can start a QuestDB container instance from any Java application by using:
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container
 types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:questdb:6.5.3:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/tidb.md b/docs/modules/databases/tidb.md
index c203f3155bb..6ecc12de05b 100644
--- a/docs/modules/databases/tidb.md
+++ b/docs/modules/databases/tidb.md
@@ -12,6 +12,12 @@ You can start a TiDB container instance from any Java application by using:
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:tidb:v6.1.0:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/timeplus.md b/docs/modules/databases/timeplus.md
index fd94da043ff..3364f97d509 100644
--- a/docs/modules/databases/timeplus.md
+++ b/docs/modules/databases/timeplus.md
@@ -10,6 +10,12 @@ You can start a Timeplus container instance from any Java application by using:
 [Container creation](../../../modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:timeplus:2.3.21:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/trino.md b/docs/modules/databases/trino.md
index 5ea9b2d8ab3..a7ab7495de8 100644
--- a/docs/modules/databases/trino.md
+++ b/docs/modules/databases/trino.md
@@ -12,6 +12,12 @@ You can start a Trino container instance from any Java application by using:
 
 See [Database containers](./index.md) for documentation and usage that is common to all database container types.
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:trino:352:///defaultname`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/docs/modules/databases/yugabytedb.md b/docs/modules/databases/yugabytedb.md
index 3b7130a2958..0824227c937 100644
--- a/docs/modules/databases/yugabytedb.md
+++ b/docs/modules/databases/yugabytedb.md
@@ -17,6 +17,12 @@ YugabyteDB supports two APIs.
 [Creating a YSQL container](../../../modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java) inside_block:creatingYSQLContainer
 <!--/codeinclude-->
 
+### Testcontainers JDBC URL
+
+`jdbc:tc:yugabyte:2.14.4.0-b26:///databasename`
+
+See [JDBC](./jdbc.md) for documentation.
+
 ### YCQL API
 
 <!--codeinclude-->

From 00336f01d2d4bbf9f4eee2e84e0c8a7e0dbe2acc Mon Sep 17 00:00:00 2001
From: Max Hovens <14804474+maxhov@users.noreply.github.com>
Date: Sat, 16 Aug 2025 02:13:08 +0200
Subject: [PATCH 4431/4969] Fix support to set a custom database name in
 Host-less JDBC urls (#10603)

Fixes #8319
---
 .../org/testcontainers/jdbc/ConnectionUrl.java   |  4 ++--
 .../testcontainers/jdbc/ConnectionUrlTest.java   | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index e1309f66197..ec606f3ed32 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -107,7 +107,7 @@ private void parseUrl() {
         //In case it matches to the default pattern
         Matcher dbInstanceMatcher = Patterns.DB_INSTANCE_MATCHING_PATTERN.matcher(dbHostString);
         if (dbInstanceMatcher.matches()) {
-            databaseHost = Optional.of(dbInstanceMatcher.group("databaseHost"));
+            databaseHost = Optional.ofNullable(dbInstanceMatcher.group("databaseHost"));
             databasePort = Optional.ofNullable(dbInstanceMatcher.group("databasePort")).map(Integer::valueOf);
             databaseName = Optional.of(dbInstanceMatcher.group("databaseName"));
         }
@@ -227,7 +227,7 @@ public interface Patterns {
 
         //Matches to part of string - hostname:port/databasename
         Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile(
-            "(?<databaseHost>[^:]+)" +
+            "(?<databaseHost>[^:]+)?" +
             "(:(?<databasePort>[0-9]+))?" +
             "(" +
             "(?<sidOrServiceName>[:/])" +
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index 123690d95f6..b6de810e06c 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -111,4 +111,20 @@ public void testDaemonCapture() {
 
         assertThat(url.isInDaemonMode()).as("Daemon flag is set to true.").isTrue();
     }
+
+    @Test
+    public void testHostLessConnectionUrl() {
+        String urlString = "jdbc:tc:mysql:8.0.36:///databasename?a=b&c=d";
+        ConnectionUrl url = ConnectionUrl.newInstance(urlString);
+
+        assertThat(url.getDatabaseType()).as("Database Type value is as expected").isEqualTo("mysql");
+        assertThat(url.getImageTag()).as("Database Image tag value is as expected").contains("8.0.36");
+        assertThat(url.getQueryString()).as("Query String value is as expected").contains("?a=b&c=d");
+        assertThat(url.getDatabaseHost()).as("Database Host value is as expected").isEmpty();
+        assertThat(url.getDatabasePort()).as("Database Port value is as expected").isEmpty();
+        assertThat(url.getDatabaseName()).as("Database Name value is as expected").contains("databasename");
+
+        assertThat(url.getQueryParameters()).as("Parameter a is captured").containsEntry("a", "b");
+        assertThat(url.getQueryParameters()).as("Parameter c is captured").containsEntry("c", "d");
+    }
 }

From c4784534c89f0c5e3bde436f4651bb8692096324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 15 Aug 2025 18:13:23 -0600
Subject: [PATCH 4432/4969] Remove httpclient5 dependency from clickhouse
 (#10610)

---
 modules/clickhouse/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 0b67f29ef2b..039d178fde2 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.1', classifier: 'all')
 
-    testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'com.clickhouse:client-v2:0.9.1'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))

From ad1cf42ffda880ec97b904b42dcc19261e6632f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 07:12:58 +0000
Subject: [PATCH 4433/4969] Bump io.rest-assured:rest-assured from 5.5.5 to
 5.5.6 in /core

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index a4ff15bac01..9b94f587a79 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -120,7 +120,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"

From 9bf04f4d53ad9a50bb11e92434cc399ac3a764bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Aug 2025 10:46:58 -0600
Subject: [PATCH 4434/4969] Ignore dependencies update

---
 .github/dependabot.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b42e02fe2b6..72a6d9110b6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -27,6 +27,9 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "com.gradleup.shadow"
+        update-types: [ "version-update:semver-major" ]
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"
@@ -272,11 +275,17 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.pinecone:pinecone-client"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/pulsar"
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "org.apache.pulsar:pulsar-bom"
+        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/qdrant"
     schedule:
@@ -400,7 +409,7 @@ updates:
       - dependency-name: "org.springframework.boot"
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.diffplug.spotless"
-        update-types: [ "version-update:semver-minor" ]
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
       - dependency-name: "com.hazelcast:hazelcast"
         update-types: [ "version-update:semver-minor" ]
 
@@ -414,7 +423,7 @@ updates:
       - dependency-name: "ch.qos.logback:logback-classic"
         update-types: [ "version-update:semver-minor" ]
       - dependency-name: "com.diffplug.spotless"
-        update-types: [ "version-update:semver-minor" ]
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From 26f99f5348c4853cb1b6a325a268b6d52d1807c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 00:07:15 +0000
Subject: [PATCH 4435/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/hivemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 9a0fda05afe..5581e6f0a39 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.18")
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 test {

From 4a0cf43edac704ad6427ca0eaecbf7ab20851da8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 00:28:11 +0000
Subject: [PATCH 4436/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/milvus

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index b79edac49aa..e8a8939b813 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.milvus:milvus-sdk-java:2.6.1'
 }

From e0bcd3d76540a9591ab87fc00bfb3b7cb679faba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 04:04:05 +0000
Subject: [PATCH 4437/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/r2dbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 49f7672bd18..c738f3b6f26 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -8,10 +8,10 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.7.8'
-    testFixturesImplementation 'org.assertj:assertj-core:3.27.3'
+    testFixturesImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 8cebd06d120775dde55dd466529ecb5534631b4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:26:38 +0000
Subject: [PATCH 4438/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/mongodb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mongodb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index ad05dbb2e97..d7af71b9f75 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 2f6a5139aef7276fbccc889b9b8438feffdbc89d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:28:34 +0000
Subject: [PATCH 4439/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/azure

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 13f3f353ba9..4dbffa9ac20 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
     testImplementation 'com.azure:azure-cosmos'
     testImplementation 'com.azure:azure-storage-blob'

From 3575dc669b217bcb57885ef311c3311f3b94f528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:29:06 +0000
Subject: [PATCH 4440/4969] Bump org.assertj:assertj-core in
 /modules/clickhouse

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 039d178fde2..b840e70763b 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.1', classifier: 'all')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.clickhouse:client-v2:0.9.1'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')

From 5ded174cedc8b61c8d7a30b1184475d50126c541 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:29:45 +0000
Subject: [PATCH 4441/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/kafka

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index d4fb383c3f3..ebfcca345a4 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From bc2490feaa1bc2f41d4d9b82a8a3c24131d9d64c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:35:07 +0000
Subject: [PATCH 4442/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/nginx

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index c05010c45e9..f4c5280d4c2 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:26.0.2'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 6ec9eb1c60edbd10187e74bf86a97522e6a6fbe8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:35:38 +0000
Subject: [PATCH 4443/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/gcloud

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 9d4c3ecfa8b..f77e46180d6 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub'
     testImplementation 'com.google.cloud:google-cloud-spanner'
     testImplementation 'com.google.cloud:google-cloud-bigtable'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 2b7e015479aec5a115f997ff6fdf73f751812c92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:36:38 +0000
Subject: [PATCH 4444/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/db2

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 15600ec3856..b50291c201d 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 745900f2702742252490b0f86ca18c9aec4767b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:36:38 +0000
Subject: [PATCH 4445/4969] Bump org.assertj:assertj-core in /modules/cassandra

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cassandra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index 42c503f6752..cc3b9e81df5 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
     testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 8e80936d239aed787cb778d981a1ef17c22ec36c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:37:05 +0000
Subject: [PATCH 4446/4969] Bump org.assertj:assertj-core in
 /modules/mockserver

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 054944d2eb8..fdd75b9f153 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
 }
 

From fdb3326f72b322e53dcf2a4f67c481df6c5281c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:37:18 +0000
Subject: [PATCH 4447/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/orientdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 587ee684b68..174342606fc 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.42"
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.3'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.42"
 }

From 74bd1dd5fcc38799e9c5f6c05b43e1f0683fd30c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:37:20 +0000
Subject: [PATCH 4448/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/grafana

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 483016aa055..19f3fd3df51 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Grafana"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.2'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'

From 096fbcf2d9cab2232e85241dd0a493f09970300e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:37:52 +0000
Subject: [PATCH 4449/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b5774ce794d..6f98d6a9f24 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 
-    api 'org.assertj:assertj-core:3.27.3'
+    api 'org.assertj:assertj-core:3.27.4'
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.9'
     api 'org.vibur:vibur-dbcp:26.0'

From 560665b90c546ec021308d380c612a6c80d32fd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:38:00 +0000
Subject: [PATCH 4450/4969] Bump org.assertj:assertj-core in
 /modules/elasticsearch

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 5dea480e20b..de679721cf7 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.0"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From c6e535e04c80076be17356cba8b6415340b6aa9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:38:14 +0000
Subject: [PATCH 4451/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/databend

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 2770b2ccff3..6e57f4bd198 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.databend:databend-jdbc:0.4.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 1edb0e6c14b499122cf49e193f7f5d04cccf1131 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:38:17 +0000
Subject: [PATCH 4452/4969] Bump org.assertj:assertj-core in
 /modules/database-commons

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/database-commons/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index e6bb0697252..47b433e7b2f 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From e86fdc342198d3373372bd2903b73a06b997f14b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:38:37 +0000
Subject: [PATCH 4453/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/activemq

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 34217bf1f1a..6ca5e6af78a 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation "org.apache.activemq:activemq-client:6.1.7"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
 }

From 5e1fabb2fca69260746177bffd7235fee7657bec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:38:38 +0000
Subject: [PATCH 4454/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/neo4j

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 9c7a70454ff..9f347a9e34b 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 155e261590c365e707544676bed1c246e77892e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:39:06 +0000
Subject: [PATCH 4455/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/ldap

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ldap/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
index 5045bf79266..fa255990be8 100644
--- a/modules/ldap/build.gradle
+++ b/modules/ldap/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: LDAP"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.3'
 }

From 69c275a9b63ba438cf6fe594992e83fa43ea4b82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:39:20 +0000
Subject: [PATCH 4456/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/consul

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index f62c74e96aa..a8cb1a0d4ae 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 46bc77d6bebfb13398dd15db0b438679ea2ccdff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:39:26 +0000
Subject: [PATCH 4457/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/vault

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index af9f27c505f..b4d1e4dbe46 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 
 }

From 409fafd2eb3ad17808986f4c57a6f127f81465b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:39:46 +0000
Subject: [PATCH 4458/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/k6

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k6/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
index 0a027d12d55..943208029c6 100644
--- a/modules/k6/build.gradle
+++ b/modules/k6/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: k6"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From d84b99d93589b34bc2b6c7ec7c968afb456fa27c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:39:58 +0000
Subject: [PATCH 4459/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/qdrant

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 470004c16ec..0507698069a 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.qdrant:client:1.15.0'
     testImplementation platform('io.grpc:grpc-bom:1.73.0')
     testImplementation 'io.grpc:grpc-stub'

From cddf9d28dc3dd85344b503f47fb6b3a2ce636d24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:40:05 +0000
Subject: [PATCH 4460/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/selenium

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 1b9312d6187..d324b0d7d39 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':testcontainers-nginx')
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 4bbb5e475c384c6462fcbf09768db05783ae7076 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:40:31 +0000
Subject: [PATCH 4461/4969] Bump org.assertj:assertj-core in /modules/typesense

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/typesense/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
index b82022ed9ab..41bb4322a9a 100644
--- a/modules/typesense/build.gradle
+++ b/modules/typesense/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Typesense"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.26.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.typesense:typesense-java:1.3.0'
 }

From 6ae038922c43de021379a27c470b6a7f4a731558 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:40:38 +0000
Subject: [PATCH 4462/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/questdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 954b0300ad5..e57309a6bf3 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.questdb:questdb:9.0.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From abb11af867d245ca35de2a41fef89929558d1bba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:40:47 +0000
Subject: [PATCH 4463/4969] Bump org.assertj:assertj-core in
 /modules/cockroachdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index a1967c94fbd..264c22eff9e 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 144bf31a8a16a37955b552484c061dcfa89f17c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:41:18 +0000
Subject: [PATCH 4464/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/influxdb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 7a5aa985beb..208ae171ec2 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.25'
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.influxdb:influxdb-java:2.25'
     testImplementation "com.influxdb:influxdb-client-java:7.3.0"
 }

From e1f1a0206c325a5c094b7eaa3be6cd9103ef1d70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:41:20 +0000
Subject: [PATCH 4465/4969] Bump org.assertj:assertj-core in /modules/toxiproxy

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index fecefb33421..4a0f055db8c 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:6.0.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 01fbf019dc24a4df9f24e1ce3461e6d3c1cb8c6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:41:20 +0000
Subject: [PATCH 4466/4969] Bump org.assertj:assertj-core in
 /modules/localstack

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 5390d190282..b869e470a89 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation 'software.amazon.awssdk:cloudwatchlogs'
     testImplementation 'software.amazon.awssdk:lambda'
     testImplementation 'software.amazon.awssdk:kms'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 78ae99b07bf195519aaf8518c35a04c743cc53b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:41:36 +0000
Subject: [PATCH 4467/4969] Bump org.assertj:assertj-core in /modules/couchbase

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 08636089467..89736e47f81 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
     testImplementation 'com.couchbase.client:java-client:3.8.3'
     testImplementation 'org.awaitility:awaitility:4.3.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 33dacb3c0d06f92ae555405f0583b07a575058a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:41:45 +0000
Subject: [PATCH 4468/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/solace

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index d9e5c17e94e..5e023b07a67 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.solacesystems:sol-jcsmp:10.27.3'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'

From 409c702fc092821f3f4c15bcd7ce85277bc627cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:41:50 +0000
Subject: [PATCH 4469/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/chromadb

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index 5017c481ee2..965872b126f 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
 }

From 15b472744c63c490ee14c762f0268d3f84ca5e37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:43:53 +0000
Subject: [PATCH 4470/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /examples

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle       | 2 +-
 docs/examples/junit4/redis/build.gradle         | 2 +-
 docs/examples/junit5/redis/build.gradle         | 2 +-
 examples/cucumber/build.gradle                  | 2 +-
 examples/hazelcast/build.gradle                 | 2 +-
 examples/immudb/build.gradle                    | 2 +-
 examples/kafka-cluster/build.gradle             | 2 +-
 examples/nats/build.gradle                      | 2 +-
 examples/neo4j-container/build.gradle           | 2 +-
 examples/ollama-hugging-face/build.gradle       | 2 +-
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/selenium-container/build.gradle        | 2 +-
 examples/sftp/build.gradle                      | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 examples/solr-container/build.gradle            | 2 +-
 examples/zookeeper/build.gradle                 | 2 +-
 test-support/build.gradle                       | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index d5bdd39e3f9..84a6b453811 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0"
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 08bcb4d0580..a9a8452987c 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index f03bc7cdf4c..c0ebfc3e491 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":testcontainers-junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 test {
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
index e671b26d454..42da5c4c162 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:testcontainers-selenium'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
 }
 
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
index 9dc09c80253..c5086cc4d20 100644
--- a/examples/hazelcast/build.gradle
+++ b/examples/hazelcast/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 1d349ba33ec..4c2256983eb 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 4483b006709..41dffd5a543 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.38"
     testImplementation 'org.testcontainers:testcontainers-kafka'
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 3d8c808a9d7..552d5bc33a4 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.21.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index cb7a334b712..5ba6faf08af 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
     testImplementation 'org.testcontainers:testcontainers-neo4j'
     testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index 800136bc628..e47ebf744ab 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers-ollama'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 4a7e1896f51..b526c66f241 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testng:testng:7.5.1'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index b6a4e47f094..03a5ac6a88b 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index 3629b3de78e..f2234e604e6 100644
--- a/examples/selenium-container/build.gradle
+++ b/examples/selenium-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:testcontainers-selenium'
     testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
index 31b5cfb7171..d7e2dee0f45 100644
--- a/examples/sftp/build.gradle
+++ b/examples/sftp/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'com.github.mwiede:jsch:2.27.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 55e77b67388..9c658ca974c 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
index 8cef396fe61..d0d3944cc0a 100644
--- a/examples/solr-container/build.gradle
+++ b/examples/solr-container/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:testcontainers-solr'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
index eb5e0ce45d9..4208f4ac266 100644
--- a/examples/zookeeper/build.gradle
+++ b/examples/zookeeper/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.9.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 344366da1eb..56fcbd98a92 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:2.0.17'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 36441c259a813aca3df6978ff4109583ce53b9cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:43:57 +0000
Subject: [PATCH 4471/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/pulsar

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 9aed0587d84..957b210ec86 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation platform("org.apache.pulsar:pulsar-bom:4.0.5")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {

From 46c4507ab518ec92ecde9983454e7cefe116cbb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:44:02 +0000
Subject: [PATCH 4472/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/redpanda

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index e3795d93656..157643fade3 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     shaded 'org.freemarker:freemarker:2.3.34'
 
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 80e6e384cc9855e2d86ff592a878398b48811191 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:44:10 +0000
Subject: [PATCH 4473/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/ollama

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index eda3bf5bb7a..ece97e4a389 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Ollama"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.5'
 }

From 023a91ea8ff9e75b2097584d4bac1149d31707fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:44:16 +0000
Subject: [PATCH 4474/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/jdbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index c45f1bf65d3..08b6b707922 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'org.vibur:vibur-dbcp:26.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.9'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }

From 3afb16090028e94aa0abd56b9c070feecf392e20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:44:24 +0000
Subject: [PATCH 4475/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /smoke-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 docs/examples/junit4/redis/build.gradle   | 2 +-
 docs/examples/junit5/redis/build.gradle   | 2 +-
 smoke-test/turbo-mode/build.gradle        | 2 +-
 test-support/build.gradle                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index d5bdd39e3f9..84a6b453811 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0"
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index 08bcb4d0580..a9a8452987c 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index f03bc7cdf4c..c0ebfc3e491 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":testcontainers-junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 test {
diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle
index d6578e3db69..fb3f09244fd 100644
--- a/smoke-test/turbo-mode/build.gradle
+++ b/smoke-test/turbo-mode/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
 }
 
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 344366da1eb..56fcbd98a92 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:2.0.17'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 84fd64adde74179039e40c85c990157b0ab406a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:44:36 +0000
Subject: [PATCH 4476/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/timeplus

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/timeplus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index 188edeeb677..5816772e300 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.10'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From a33475f943d91f31599b7b1c6cf963b653725957 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:45:19 +0000
Subject: [PATCH 4477/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/k3s

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index fd52f632cae..ee5ed626dc1 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:7.3.1'
     testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 56fa474b80d78982234896b6f7722fd93626f8fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:46:17 +0000
Subject: [PATCH 4478/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/minio

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 8fae8536fb0..cf0798d879a 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("io.minio:minio:8.5.17")
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 4b9ebdfb31c463e96596ccdbe800632ff9a65246 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 19:24:32 +0000
Subject: [PATCH 4479/4969] Bump io.rest-assured:rest-assured from 5.5.5 to
 5.5.6 in /modules/ollama

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index ece97e4a389..a0256ba7150 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }

From dea4b984e85346891cc18c45fc685a94b80e0002 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 19:48:20 +0000
Subject: [PATCH 4480/4969] Bump io.rest-assured:rest-assured in
 /modules/mockserver

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index fdd75b9f153..49aad5f08a1 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
 
 tasks.japicmp {

From ee75e8f1e2ebac14aba28ab146d899b5f8571e7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 19:48:41 +0000
Subject: [PATCH 4481/4969] Bump io.rest-assured:rest-assured in
 /modules/chromadb

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index 965872b126f..fca8a86e410 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }

From c46a4dd0d520c330d3246c0a9cd766470d63972e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 19:51:40 +0000
Subject: [PATCH 4482/4969] Bump io.rest-assured:rest-assured from 5.5.5 to
 5.5.6 in /modules/consul

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index a8cb1a0d4ae..b1e2b19c212 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From fdb9fc88ff0de16b8a2f93f88fbf10b51ec2a8eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 19:59:11 +0000
Subject: [PATCH 4483/4969] Bump io.rest-assured:rest-assured from 5.5.5 to
 5.5.6 in /modules/vault

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index b4d1e4dbe46..84d02ebfa9a 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 
 }

From 9a4cb4440d43f68bfdd898c795f80482ea4799ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 20:10:22 +0000
Subject: [PATCH 4484/4969] Bump io.rest-assured:rest-assured in
 /modules/grafana

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 19f3fd3df51..3da855e8043 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.2'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'
 

From 734e696de58c990bd54e2e63f3bb7aa20bdb0887 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 20:28:19 +0000
Subject: [PATCH 4485/4969] Bump io.rest-assured:rest-assured in
 /modules/redpanda

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 157643fade3..ec254add76f 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -6,6 +6,6 @@ dependencies {
 
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 0244fb2bd60e447acd707daf0fd1b3634bab0e9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 20:55:42 +0000
Subject: [PATCH 4486/4969] Bump io.rest-assured:rest-assured from 5.5.5 to
 5.5.6 in /examples

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.5 to 5.5.6.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.5...rest-assured-5.5.6)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/ollama-hugging-face/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
index e47ebf744ab..1d747834acc 100644
--- a/examples/ollama-hugging-face/build.gradle
+++ b/examples/ollama-hugging-face/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'io.rest-assured:rest-assured:5.5.5'
+    testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 

From 9ba8f48bb570b304619713ecc02e936cb36b6927 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:23:29 +0000
Subject: [PATCH 4487/4969] Bump org.seleniumhq.selenium:selenium-bom in
 /examples

Bumps [org.seleniumhq.selenium:selenium-bom](https://github.com/SeleniumHQ/selenium) from 4.34.0 to 4.35.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.34.0...selenium-4.35.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-bom
  dependency-version: 4.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 42da5c4c162..57baf68a490 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.seleniumhq.selenium:selenium-bom:4.34.0')
+    implementation platform('org.seleniumhq.selenium:selenium-bom:4.35.0')
     implementation 'org.seleniumhq.selenium:selenium-remote-driver'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

From 9fe5c3cd2c2a1de5fa9522c0844ef6c53f29f6a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:23:41 +0000
Subject: [PATCH 4488/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.15.2 to 1.15.3.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.15.2...v1.15.3)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-version: 1.15.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 3da855e8043..d53d0f80750 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.2'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.3'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.52.0')

From 414e704155bfed5945cef8fb543d7b0230eef952 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:24:07 +0000
Subject: [PATCH 4489/4969] Bump org.seleniumhq.selenium:selenium-api in
 /examples

Bumps [org.seleniumhq.selenium:selenium-api](https://github.com/SeleniumHQ/selenium) from 4.34.0 to 4.35.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.34.0...selenium-4.35.0)

---
updated-dependencies:
- dependency-name: org.seleniumhq.selenium:selenium-api
  dependency-version: 4.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 84a6b453811..2844f1a19b3 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":testcontainers-mysql")
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.35.0"
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 07ee87bc46d6803b67d00ffd188cecc82fc8a3ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:25:24 +0000
Subject: [PATCH 4490/4969] Bump io.nats:jnats from 2.21.4 to 2.21.5 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.21.4 to 2.21.5.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.21.4...2.21.5)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-version: 2.21.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 552d5bc33a4..765fefd7491 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.21.4'
+    testImplementation 'io.nats:jnats:2.21.5'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'

From fe38a2dff2d609b56329ee93b3207994739f6555 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:36:48 +0000
Subject: [PATCH 4491/4969] Bump io.lettuce:lettuce-core in /examples

Bumps [io.lettuce:lettuce-core](https://github.com/redis/lettuce) from 6.7.1.RELEASE to 6.8.0.RELEASE.
- [Release notes](https://github.com/redis/lettuce/releases)
- [Changelog](https://github.com/redis/lettuce/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/redis/lettuce/compare/6.7.1.RELEASE...6.8.0.RELEASE)

---
updated-dependencies:
- dependency-name: io.lettuce:lettuce-core
  dependency-version: 6.8.0.RELEASE
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/examples/junit4/redis/build.gradle | 2 +-
 docs/examples/junit5/redis/build.gradle | 2 +-
 docs/examples/spock/redis/build.gradle  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
index a9a8452987c..8af186d16bb 100644
--- a/docs/examples/junit4/redis/build.gradle
+++ b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.7.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.8.0.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index c0ebfc3e491..3404178b957 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.7.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.8.0.RELEASE"
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
index 2b82febefb6..30a5509929e 100644
--- a/docs/examples/spock/redis/build.gradle
+++ b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.7.1.RELEASE"
+    api "io.lettuce:lettuce-core:6.8.0.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":testcontainers-spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'

From fe5002f2772734b42abae206a45c9b997f04b0ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:53:12 +0000
Subject: [PATCH 4492/4969] Bump io.opentelemetry:opentelemetry-bom in
 /modules/grafana

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.52.0 to 1.53.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.52.0...v1.53.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-version: 1.53.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 3da855e8043..295a6c617d8 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.2'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'
 
-    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.52.0')
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.53.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

From 3b958e292db8ef4f08a264a859a3e2b30d62c17c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:53:16 +0000
Subject: [PATCH 4493/4969] Bump redis.clients:jedis from 6.0.0 to 6.1.0 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index b526c66f241..52c574e182d 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:6.0.0'
+    implementation 'redis.clients:jedis:6.1.0'
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index 03a5ac6a88b..da92871a0df 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:6.0.0'
+    implementation 'redis.clients:jedis:6.1.0'
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 9c658ca974c..4e8faa7a1b9 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:6.0.0'
+    implementation 'redis.clients:jedis:6.1.0'
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 35d17991b235eff08c939f26aadabd7cb7e13946 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:53:22 +0000
Subject: [PATCH 4494/4969] Bump io.cucumber:cucumber-bom from 7.27.0 to 7.27.2
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.27.0 to 7.27.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/v7.27.0...v7.27.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-version: 7.27.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 42da5c4c162..38db64972e1 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation platform('org.junit:junit-bom:5.13.4')
     testImplementation 'org.junit.platform:junit-platform-suite'
-    testImplementation platform('io.cucumber:cucumber-bom:7.27.0')
+    testImplementation platform('io.cucumber:cucumber-bom:7.27.2')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:testcontainers-selenium'

From 17dbbfd744e4ce570297117ebd3c86ffa07016c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:10:09 +0000
Subject: [PATCH 4495/4969] Bump com.zaxxer:HikariCP from 7.0.0 to 7.0.2 in
 /modules/spock

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 7.0.0 to 7.0.2.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-7.0.0...HikariCP-7.0.2)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ae7f37050ba..ec7fed6ec36 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
 
-    testImplementation 'com.zaxxer:HikariCP:7.0.0'
+    testImplementation 'com.zaxxer:HikariCP:7.0.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'

From 828552631923ba68b7e34d66b0331b31c51381cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:17:49 +0000
Subject: [PATCH 4496/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/v1.3.7...v1.3.8)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-version: 1.3.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 5581e6f0a39..b5fbcac0a32 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
     testImplementation(project(":testcontainers-junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.42.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.8")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.18")
     testImplementation 'org.assertj:assertj-core:3.27.4'

From ee4172a132241310dfc74096a8516b67b502ee8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:17:56 +0000
Subject: [PATCH 4497/4969] Bump org.apache.tomcat:tomcat-jdbc in
 /modules/jdbc-test

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.9 to 11.0.10.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6f98d6a9f24..f4f762ae43a 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.27.4'
 
-    api 'org.apache.tomcat:tomcat-jdbc:11.0.9'
+    api 'org.apache.tomcat:tomcat-jdbc:11.0.10'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'mysql:mysql-connector-java:8.0.33'
 }

From 494ed20f9f5bc0b72874eb6fee08421046be182a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:17:58 +0000
Subject: [PATCH 4498/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.65.0 to 26.66.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.65.0...v26.66.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.66.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index f77e46180d6..4deec14af03 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.65.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.66.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 0377d9214822fd3f39b873498ea489a8c8578884 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:18:19 +0000
Subject: [PATCH 4499/4969] Bump redis.clients:jedis from 6.0.0 to 6.1.0 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 13652ef111b..312d41ee13f 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.0'
-    testImplementation 'redis.clients:jedis:6.0.0'
+    testImplementation 'redis.clients:jedis:6.1.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 2a4c44d2b4b9eaa56b7537225abe807310c46160 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:18:35 +0000
Subject: [PATCH 4500/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.1.0 to 9.1.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v9.1.0...v9.1.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.1.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index de679721cf7..075e0e39533 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.2"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From 7f8acddbb7c4c9d578db72a31e9b5be198db5aac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:20:44 +0000
Subject: [PATCH 4501/4969] Bump dev.openfga:openfga-sdk from 0.8.3 to 0.9.0 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.8.3 to 0.9.0.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.8.3...v0.9.0)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-version: 0.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 14d7179f7df..5d1addfbe9a 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'dev.openfga:openfga-sdk:0.8.3'
+    testImplementation 'dev.openfga:openfga-sdk:0.9.0'
 }
 
 test {

From 78ee0108b87023e82c6973cf676b3e64a4507f74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:21:41 +0000
Subject: [PATCH 4502/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.7.8 to 3.7.9.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.7.8...v3.7.9)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-version: 3.7.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index c738f3b6f26..8837813426c 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.7.8'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.7.9'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.4'
 }

From d98a3283bf91a65299b2f21b1fb5557a17bf90ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:21:43 +0000
Subject: [PATCH 4503/4969] Bump redis.clients:jedis from 6.0.0 to 6.1.0 in
 /modules/toxiproxy

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 4a0f055db8c..f97193c730a 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
-    testImplementation 'redis.clients:jedis:6.0.0'
+    testImplementation 'redis.clients:jedis:6.1.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 

From eec95b9dc0e65fca441f00ace6ee8c49f0c9a0a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:21:59 +0000
Subject: [PATCH 4504/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.8.3 to 3.9.0.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/core-io-3.8.3...3.9.0)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-version: 3.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 89736e47f81..d4b481d41ec 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.8.3'
+    testImplementation 'com.couchbase.client:java-client:3.9.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }

From aec0af0d908cc33e23ca7e18ad0fa50a371746ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:22:02 +0000
Subject: [PATCH 4505/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.5.4 to 3.5.5.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.5.4...3.5.5)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-version: 3.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 cf0b92dd5fe..d68f122f4dc 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.4'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.5'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 83c6910af895a33685ada73a5df70153d02d0227 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:22:07 +0000
Subject: [PATCH 4506/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.1.1.jre8-preview to 13.2.0.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.2.0.jre8
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 793f5b48c99..3ba79559b58 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
 
     testImplementation project(':testcontainers-r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'

From 809ffdfe9883d57796b75c3398ecff161142c1ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:22:10 +0000
Subject: [PATCH 4507/4969] Bump org.questdb:questdb from 9.0.1 to 9.0.2 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 9.0.1 to 9.0.2.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/9.0.1...9.0.2)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-version: 9.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index e57309a6bf3..665b2473b0a 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'org.questdb:questdb:9.0.1'
+    testImplementation 'org.questdb:questdb:9.0.2'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 0dc66f0b9dd5dbc47052ffe2e0ec3d43aa2da44b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:23:23 +0000
Subject: [PATCH 4508/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.9 to 11.0.10.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 08b6b707922..30d2cb539c4 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.9'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.10'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From f009964acbf0efbc33612055459d7f4df17af6ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:25:33 +0000
Subject: [PATCH 4509/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/azure

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.1.1.jre8-preview to 13.2.0.jre8.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.2.0.jre8
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 4dbffa9ac20..90770150162 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'com.azure:azure-data-tables'
     testImplementation 'com.azure:azure-messaging-eventhubs'
     testImplementation 'com.azure:azure-messaging-servicebus'
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
 }

From f00dd7b3c86b68f66431d83c763c2807fc9c41fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 03:25:43 +0000
Subject: [PATCH 4510/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.32.14 to 2.32.25.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.32.25
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index a1b9c150746..7aa6376fd54 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.32.14'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.32.30'
 }

From 664ccb1492062cf1101fb7cdcbd33d29e6ffdbc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 05:58:22 +0000
Subject: [PATCH 4511/4969] Bump com.gradleup.shadow from 8.3.8 to 8.3.9

Bumps com.gradleup.shadow from 8.3.8 to 8.3.9.

---
updated-dependencies:
- dependency-name: com.gradleup.shadow
  dependency-version: 8.3.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 825d240ddf1..b4f97c3eaa5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
-    id 'com.gradleup.shadow' version '8.3.8'
+    id 'com.gradleup.shadow' version '8.3.9'
     id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
     id 'com.diffplug.spotless' version '6.22.0' apply false
     id 'org.jreleaser' version '1.18.0' apply false

From 20ca76649c14cb03841b3c373dbc26be0fb83467 Mon Sep 17 00:00:00 2001
From: Emanuel Trandafir <75391049+etrandafir93@users.noreply.github.com>
Date: Tue, 26 Aug 2025 09:03:05 +0300
Subject: [PATCH 4512/4969] Remove deprecated kafka container examples from
 docs (#10712)

---
 docs/modules/kafka.md | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index cd2a660c8e0..4311be61b5a 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -15,20 +15,18 @@ Currently, two different Kafka images are supported:
 ## Benefits
 
 * Running a single node Kafka installation with just one line of code
-* No need to manage external Zookeeper installation, required by Kafka. But see [below](#zookeeper)
+* No need to manage external Zookeeper installation, required by Kafka. 
 
 ## Example
 
-### Using org.testcontainers.containers.KafkaContainer
+### Using org.testcontainers.kafka.KafkaContainer
 
 Create a `KafkaContainer` to use it in your tests:
 
 <!--codeinclude-->
-[Creating a KafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:constructorWithVersion
+[Creating a KafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
 
-The correspondence between Confluent Platform versions and Kafka versions can be seen [in Confluent documentation](https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility)
-
 Now your tests or any other process running on your machine can get access to running Kafka broker by using the following bootstrap server location:
 
 <!--codeinclude-->
@@ -46,26 +44,8 @@ Create a `ConfluentKafkaContainer` to use it in your tests:
 [Creating a ConfluentKafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
 
-### Using org.testcontainers.kafka.KafkaContainer
-
-Create a `KafkaContainer` to use it in your tests:
-
-<!--codeinclude-->
-[Creating a KafkaContainer](../../modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java) inside_block:constructorWithVersion
-<!--/codeinclude-->
-
 ## Options
         
-### <a name="zookeeper"></a> Using external Zookeeper
-
-!!! note
-    Only available for `org.testcontainers.containers.KafkaContainer`
-
-If for some reason you want to use an externally running Zookeeper, then just pass its location during construction:
-<!--codeinclude-->
-[External Zookeeper](../../modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java) inside_block:withExternalZookeeper
-<!--/codeinclude-->
-
 ### Using Kraft mode
 
 !!! note

From 9c65f4776a9e859ca258319211fb88ef2061d9c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 08:07:05 +0000
Subject: [PATCH 4513/4969] Bump software.amazon.awssdk:bom in
 /modules/localstack

Bumps software.amazon.awssdk:bom from 2.32.14 to 2.32.25.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-version: 2.32.25
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 b869e470a89..f939b4804cf 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("software.amazon.awssdk:bom:2.32.14")
+    testImplementation platform("software.amazon.awssdk:bom:2.32.29")
     testImplementation 'software.amazon.awssdk:s3'
     testImplementation 'software.amazon.awssdk:sqs'
     testImplementation 'software.amazon.awssdk:cloudwatchlogs'

From 844d7e4b54afbbe5686cc54971741143af935bdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 09:56:33 +0000
Subject: [PATCH 4514/4969] Bump io.milvus:milvus-sdk-java from 2.6.1 to 2.6.2
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.6.1...v2.6.2)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-version: 2.6.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index e8a8939b813..6addaaabbd0 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'io.milvus:milvus-sdk-java:2.6.1'
+    testImplementation 'io.milvus:milvus-sdk-java:2.6.3'
 }

From d39f5b99283e6bc8ed881ae27f46932e16a0dc21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 19:29:58 +0000
Subject: [PATCH 4515/4969] Bump com.zaxxer:HikariCP from 7.0.0 to 7.0.2 in
 /modules/junit-jupiter

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 7.0.0 to 7.0.2.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-7.0.0...HikariCP-7.0.2)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 312d41ee13f..fd06bba5bb7 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
-    testImplementation 'com.zaxxer:HikariCP:7.0.0'
+    testImplementation 'com.zaxxer:HikariCP:7.0.2'
     testImplementation 'redis.clients:jedis:6.1.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 45888471c931976190eef9b29dac3f196b0aa9dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 20:21:47 +0000
Subject: [PATCH 4516/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.42 to 3.2.43.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/3.2.43/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.42...3.2.43)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-version: 3.2.43
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 174342606fc..9973e1519d3 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,11 +3,11 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.42"
+    api "com.orientechnologies:orientdb-client:3.2.43"
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.3'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.42"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
 }
 
 tasks.japicmp {

From 46434dcb623de6f92542bc503fd13cecf13fe288 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 20:21:54 +0000
Subject: [PATCH 4517/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.42 to 3.2.43.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.42...3.2.43)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-version: 3.2.43
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 174342606fc..9973e1519d3 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,11 +3,11 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.42"
+    api "com.orientechnologies:orientdb-client:3.2.43"
 
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.3'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.42"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
 }
 
 tasks.japicmp {

From 19dcc5eb1219fc97dc5ccdc1946ef7e7a16dfd28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 1 Sep 2025 17:23:00 -0500
Subject: [PATCH 4518/4969] Move ActiveMQ tests to JUnit Jupiter (#10726)

---
 modules/activemq/build.gradle                          |  7 +++++++
 .../testcontainers/activemq/ActiveMQContainerTest.java |  8 ++++----
 .../testcontainers/activemq/ArtemisContainerTest.java  | 10 +++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 6ca5e6af78a..8c209d2dd49 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,7 +3,14 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
     testImplementation 'org.assertj:assertj-core:3.27.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation "org.apache.activemq:activemq-client:6.1.7"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
index 842701fa376..564ee5382e7 100644
--- a/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
+++ b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
@@ -9,14 +9,14 @@
 import jakarta.jms.TextMessage;
 import lombok.SneakyThrows;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ActiveMQContainerTest {
+class ActiveMQContainerTest {
 
     @Test
-    public void test() {
+    void test() {
         try ( // container {
             ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
             // }
@@ -30,7 +30,7 @@ public void test() {
     }
 
     @Test
-    public void customCredentials() {
+    void customCredentials() {
         try (
             // settingCredentials {
             ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
diff --git a/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java b/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
index cce4b319afd..6a3c3ecc19c 100644
--- a/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
+++ b/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
@@ -8,14 +8,14 @@
 import jakarta.jms.TextMessage;
 import lombok.SneakyThrows;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ArtemisContainerTest {
+class ArtemisContainerTest {
 
     @Test
-    public void defaultCredentials() {
+    void defaultCredentials() {
         try (
             // container {
             ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
@@ -30,7 +30,7 @@ public void defaultCredentials() {
     }
 
     @Test
-    public void customCredentials() {
+    void customCredentials() {
         try (
             // settingCredentials {
             ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
@@ -47,7 +47,7 @@ public void customCredentials() {
     }
 
     @Test
-    public void allowAnonymousLogin() {
+    void allowAnonymousLogin() {
         try (
             // enableAnonymousLogin {
             ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")

From 1cba0c5331a372ab445ecdb0da96a426c95fb4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 1 Sep 2025 17:57:45 -0500
Subject: [PATCH 4519/4969] Move Azure tests to JUnit Jupiter (#10727)

---
 modules/azure/build.gradle                    |   7 +
 .../azure/AzuriteContainerTest.java           |  34 ++---
 .../azure/EventHubsEmulatorContainerTest.java |  51 +++----
 .../ServiceBusEmulatorContainerTest.java      | 142 +++++++++---------
 .../CosmosDBEmulatorContainerTest.java        |  92 ++++++------
 5 files changed, 159 insertions(+), 167 deletions(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 90770150162..226f668e954 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,7 +6,10 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
     testImplementation 'org.assertj:assertj-core:3.27.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
     testImplementation 'com.azure:azure-cosmos'
     testImplementation 'com.azure:azure-storage-blob'
@@ -16,3 +19,7 @@ dependencies {
     testImplementation 'com.azure:azure-messaging-servicebus'
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java
index 2bf0ad856d3..5acf2fe5ad5 100644
--- a/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerTest.java
@@ -11,22 +11,22 @@
 import com.azure.storage.queue.QueueClient;
 import com.azure.storage.queue.QueueServiceClient;
 import com.azure.storage.queue.QueueServiceClientBuilder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AzuriteContainerTest {
+class AzuriteContainerTest {
 
     private static final String PASSWORD = "changeit";
 
     private static Properties originalSystemProperties;
 
-    @BeforeClass
+    @BeforeAll
     public static void captureOriginalSystemProperties() {
         originalSystemProperties = (Properties) System.getProperties().clone();
         System.setProperty(
@@ -37,13 +37,13 @@ public static void captureOriginalSystemProperties() {
         System.setProperty("javax.net.ssl.trustStoreType", "PKCS12");
     }
 
-    @AfterClass
+    @AfterAll
     public static void restoreOriginalSystemProperties() {
         System.setProperties(originalSystemProperties);
     }
 
     @Test
-    public void testWithBlobServiceClient() {
+    void testWithBlobServiceClient() {
         try (
             // emulatorContainer {
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
@@ -56,7 +56,7 @@ public void testWithBlobServiceClient() {
     }
 
     @Test
-    public void testWithQueueServiceClient() {
+    void testWithQueueServiceClient() {
         try (AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")) {
             emulator.start();
             assertThat(emulator.getConnectionString()).contains("QueueEndpoint=http://");
@@ -65,7 +65,7 @@ public void testWithQueueServiceClient() {
     }
 
     @Test
-    public void testWithTableServiceClient() {
+    void testWithTableServiceClient() {
         try (AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")) {
             emulator.start();
             assertThat(emulator.getConnectionString()).contains("TableEndpoint=http://");
@@ -74,7 +74,7 @@ public void testWithTableServiceClient() {
     }
 
     @Test
-    public void testWithBlobServiceClientWithSslUsingPfx() {
+    void testWithBlobServiceClientWithSslUsingPfx() {
         try (
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
                 .withSsl(MountableFile.forClasspathResource("/keystore.pfx"), PASSWORD)
@@ -86,7 +86,7 @@ public void testWithBlobServiceClientWithSslUsingPfx() {
     }
 
     @Test
-    public void testWithQueueServiceClientWithSslUsingPfx() {
+    void testWithQueueServiceClientWithSslUsingPfx() {
         try (
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
                 .withSsl(MountableFile.forClasspathResource("/keystore.pfx"), PASSWORD)
@@ -98,7 +98,7 @@ public void testWithQueueServiceClientWithSslUsingPfx() {
     }
 
     @Test
-    public void testWithTableServiceClientWithSslUsingPfx() {
+    void testWithTableServiceClientWithSslUsingPfx() {
         try (
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
                 .withSsl(MountableFile.forClasspathResource("/keystore.pfx"), PASSWORD)
@@ -110,7 +110,7 @@ public void testWithTableServiceClientWithSslUsingPfx() {
     }
 
     @Test
-    public void testWithBlobServiceClientWithSslUsingPem() {
+    void testWithBlobServiceClientWithSslUsingPem() {
         try (
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
                 .withSsl(
@@ -125,7 +125,7 @@ public void testWithBlobServiceClientWithSslUsingPem() {
     }
 
     @Test
-    public void testWithQueueServiceClientWithSslUsingPem() {
+    void testWithQueueServiceClientWithSslUsingPem() {
         try (
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
                 .withSsl(
@@ -140,7 +140,7 @@ public void testWithQueueServiceClientWithSslUsingPem() {
     }
 
     @Test
-    public void testWithTableServiceClientWithSslUsingPem() {
+    void testWithTableServiceClientWithSslUsingPem() {
         try (
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
                 .withSsl(
@@ -155,7 +155,7 @@ public void testWithTableServiceClientWithSslUsingPem() {
     }
 
     @Test
-    public void testTwoAccountKeysWithBlobServiceClient() {
+    void testTwoAccountKeysWithBlobServiceClient() {
         try (
             // withTwoAccountKeys {
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
@@ -194,7 +194,7 @@ public void testTwoAccountKeysWithBlobServiceClient() {
     }
 
     @Test
-    public void testMultipleAccountsWithBlobServiceClient() {
+    void testMultipleAccountsWithBlobServiceClient() {
         try (
             // withMoreAccounts {
             AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java
index 58d1d7ad59c..1191c980edd 100644
--- a/modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java
@@ -7,8 +7,7 @@
 import com.azure.messaging.eventhubs.EventHubProducerClient;
 import com.azure.messaging.eventhubs.models.EventPosition;
 import com.azure.messaging.eventhubs.models.PartitionEvent;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.Network;
 import org.testcontainers.utility.MountableFile;
 
@@ -19,36 +18,29 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.waitAtMost;
 
-public class EventHubsEmulatorContainerTest {
-
-    @Rule
-    // network {
-    public Network network = Network.newNetwork();
-
-    // }
-
-    @Rule
-    // azuriteContainer {
-    public AzuriteContainer azuriteContainer = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
-        .withNetwork(network);
-
-    // }
-
-    @Rule
-    // emulatorContainer {
-    public EventHubsEmulatorContainer emulator = new EventHubsEmulatorContainer(
-        "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1"
-    )
-        .acceptLicense()
-        .withNetwork(network)
-        .withConfig(MountableFile.forClasspathResource("/eventhubs_config.json"))
-        .withAzuriteContainer(azuriteContainer);
-
-    // }
+class EventHubsEmulatorContainerTest {
 
     @Test
     public void testWithEventHubsClient() {
         try (
+            // network {
+            Network network = Network.newNetwork();
+            // }
+            // azuriteContainer {
+            AzuriteContainer azuriteContainer = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+                .withNetwork(network);
+            // }
+            // emulatorContainer {
+            EventHubsEmulatorContainer emulator = new EventHubsEmulatorContainer(
+                "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1"
+            )
+                .acceptLicense()
+                .withNetwork(network)
+                .withConfig(MountableFile.forClasspathResource("/eventhubs_config.json"))
+                .withAzuriteContainer(azuriteContainer);
+            // }
+        ) {
+            emulator.start();
             // createProducerAndConsumer {
             EventHubProducerClient producer = new EventHubClientBuilder()
                 .connectionString(emulator.getConnectionString())
@@ -60,9 +52,8 @@ public void testWithEventHubsClient() {
                 .fullyQualifiedNamespace("emulatorNs1")
                 .eventHubName("eh1")
                 .consumerGroup("cg1")
-                .buildConsumerClient()
+                .buildConsumerClient();
             // }
-        ) {
             producer.send(Collections.singletonList(new EventData("test")));
 
             waitAtMost(Duration.ofSeconds(30))
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
index 4676e41784a..6bf6ac80fae 100644
--- a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
@@ -9,8 +9,7 @@
 import com.azure.messaging.servicebus.ServiceBusSenderClient;
 import com.github.dockerjava.api.model.Capability;
 import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.utility.MountableFile;
@@ -23,83 +22,78 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-public class ServiceBusEmulatorContainerTest {
-
-    @Rule
-    // network {
-    public Network network = Network.newNetwork();
-
-    // }
-
-    @Rule
-    // sqlContainer {
-    public MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
-        "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04"
-    )
-        .acceptLicense()
-        .withPassword("yourStrong(!)Password")
-        .withCreateContainerCmdModifier(cmd -> {
-            cmd.getHostConfig().withCapAdd(Capability.SYS_PTRACE);
-        })
-        .withNetwork(network);
-
-    // }
-
-    @Rule
-    // emulatorContainer {
-    public ServiceBusEmulatorContainer emulator = new ServiceBusEmulatorContainer(
-        "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2"
-    )
-        .acceptLicense()
-        .withConfig(MountableFile.forClasspathResource("/service-bus-config.json"))
-        .withNetwork(network)
-        .withMsSqlServerContainer(mssqlServerContainer);
-
-    // }
+class ServiceBusEmulatorContainerTest {
 
     @Test
-    public void testWithClient() {
-        assertThat(emulator.getConnectionString()).startsWith("Endpoint=sb://");
+    void testWithClient() {
+        try (
+            // network {
+            Network network = Network.newNetwork();
+            // }
+            // sqlContainer {
+            MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
+                "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04"
+            )
+                .acceptLicense()
+                .withPassword("yourStrong(!)Password")
+                .withCreateContainerCmdModifier(cmd -> {
+                    cmd.getHostConfig().withCapAdd(Capability.SYS_PTRACE);
+                })
+                .withNetwork(network);
+            // }
+            // emulatorContainer {
+            ServiceBusEmulatorContainer emulator = new ServiceBusEmulatorContainer(
+                "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2"
+            )
+                .acceptLicense()
+                .withConfig(MountableFile.forClasspathResource("/service-bus-config.json"))
+                .withNetwork(network)
+                .withMsSqlServerContainer(mssqlServerContainer);
+            // }
+        ) {
+            emulator.start();
+            assertThat(emulator.getConnectionString()).startsWith("Endpoint=sb://");
 
-        // senderClient {
-        ServiceBusSenderClient senderClient = new ServiceBusClientBuilder()
-            .connectionString(emulator.getConnectionString())
-            .sender()
-            .queueName("queue.1")
-            .buildClient();
-        // }
+            // senderClient {
+            ServiceBusSenderClient senderClient = new ServiceBusClientBuilder()
+                .connectionString(emulator.getConnectionString())
+                .sender()
+                .queueName("queue.1")
+                .buildClient();
+            // }
 
-        await()
-            .atMost(20, TimeUnit.SECONDS)
-            .ignoreException(ServiceBusException.class)
-            .until(() -> {
-                senderClient.sendMessage(new ServiceBusMessage("Hello, Testcontainers!"));
-                return true;
-            });
-        senderClient.close();
+            await()
+                .atMost(20, TimeUnit.SECONDS)
+                .ignoreException(ServiceBusException.class)
+                .until(() -> {
+                    senderClient.sendMessage(new ServiceBusMessage("Hello, Testcontainers!"));
+                    return true;
+                });
+            senderClient.close();
 
-        final List<String> received = new CopyOnWriteArrayList<>();
-        Consumer<ServiceBusReceivedMessageContext> messageConsumer = m -> {
-            received.add(m.getMessage().getBody().toString());
-            m.complete();
-        };
-        Consumer<ServiceBusErrorContext> errorConsumer = e -> Assertions.fail("Unexpected error: " + e);
-        // processorClient {
-        ServiceBusProcessorClient processorClient = new ServiceBusClientBuilder()
-            .connectionString(emulator.getConnectionString())
-            .processor()
-            .queueName("queue.1")
-            .processMessage(messageConsumer)
-            .processError(errorConsumer)
-            .buildProcessorClient();
-        // }
-        processorClient.start();
+            final List<String> received = new CopyOnWriteArrayList<>();
+            Consumer<ServiceBusReceivedMessageContext> messageConsumer = m -> {
+                received.add(m.getMessage().getBody().toString());
+                m.complete();
+            };
+            Consumer<ServiceBusErrorContext> errorConsumer = e -> Assertions.fail("Unexpected error: " + e);
+            // processorClient {
+            ServiceBusProcessorClient processorClient = new ServiceBusClientBuilder()
+                .connectionString(emulator.getConnectionString())
+                .processor()
+                .queueName("queue.1")
+                .processMessage(messageConsumer)
+                .processError(errorConsumer)
+                .buildProcessorClient();
+            // }
+            processorClient.start();
 
-        await()
-            .atMost(20, TimeUnit.SECONDS)
-            .untilAsserted(() -> {
-                assertThat(received).hasSize(1).containsExactlyInAnyOrder("Hello, Testcontainers!");
-            });
-        processorClient.close();
+            await()
+                .atMost(20, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    assertThat(received).hasSize(1).containsExactlyInAnyOrder("Hello, Testcontainers!");
+                });
+            processorClient.close();
+        }
     }
 }
diff --git a/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
index 140bd64c39a..92b5814641e 100644
--- a/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/containers/CosmosDBEmulatorContainerTest.java
@@ -4,11 +4,10 @@
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.models.CosmosContainerResponse;
 import com.azure.cosmos.models.CosmosDatabaseResponse;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.FileOutputStream;
@@ -18,59 +17,60 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CosmosDBEmulatorContainerTest {
+class CosmosDBEmulatorContainerTest {
 
     private static Properties originalSystemProperties;
 
-    @BeforeClass
+    @BeforeAll
     public static void captureOriginalSystemProperties() {
         originalSystemProperties = (Properties) System.getProperties().clone();
     }
 
-    @AfterClass
+    @AfterAll
     public static void restoreOriginalSystemProperties() {
         System.setProperties(originalSystemProperties);
     }
 
-    @Rule
-    public TemporaryFolder tempFolder = TemporaryFolder.builder().assureDeletion().build();
-
-    @Rule
-    // emulatorContainer {
-    public CosmosDBEmulatorContainer emulator = new CosmosDBEmulatorContainer(
-        DockerImageName.parse("mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest")
-    );
-
-    // }
+    @TempDir
+    public Path tempFolder;
 
     @Test
-    public void testWithCosmosClient() throws Exception {
-        // buildAndSaveNewKeyStore {
-        Path keyStoreFile = tempFolder.newFile("azure-cosmos-emulator.keystore").toPath();
-        KeyStore keyStore = emulator.buildNewKeyStore();
-        keyStore.store(new FileOutputStream(keyStoreFile.toFile()), emulator.getEmulatorKey().toCharArray());
-        // }
-        // setSystemTrustStoreParameters {
-        System.setProperty("javax.net.ssl.trustStore", keyStoreFile.toString());
-        System.setProperty("javax.net.ssl.trustStorePassword", emulator.getEmulatorKey());
-        System.setProperty("javax.net.ssl.trustStoreType", "PKCS12");
-        // }
-        // buildClient {
-        CosmosAsyncClient client = new CosmosClientBuilder()
-            .gatewayMode()
-            .endpointDiscoveryEnabled(false)
-            .endpoint(emulator.getEmulatorEndpoint())
-            .key(emulator.getEmulatorKey())
-            .buildAsyncClient();
-        // }
-        // testWithClientAgainstEmulatorContainer {
-        CosmosDatabaseResponse databaseResponse = client.createDatabaseIfNotExists("Azure").block();
-        assertThat(databaseResponse.getStatusCode()).isEqualTo(201);
-        CosmosContainerResponse containerResponse = client
-            .getDatabase("Azure")
-            .createContainerIfNotExists("ServiceContainer", "/name")
-            .block();
-        assertThat(containerResponse.getStatusCode()).isEqualTo(201);
-        // }
+    void testWithCosmosClient() throws Exception {
+        try (
+            // emulatorContainer {
+            CosmosDBEmulatorContainer emulator = new CosmosDBEmulatorContainer(
+                DockerImageName.parse("mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest")
+            );
+            // }
+        ) {
+            emulator.start();
+            // buildAndSaveNewKeyStore {
+            Path keyStoreFile = tempFolder.resolve("azure-cosmos-emulator.keystore");
+            KeyStore keyStore = emulator.buildNewKeyStore();
+            keyStore.store(new FileOutputStream(keyStoreFile.toFile()), emulator.getEmulatorKey().toCharArray());
+            // }
+            // setSystemTrustStoreParameters {
+            System.setProperty("javax.net.ssl.trustStore", keyStoreFile.toString());
+            System.setProperty("javax.net.ssl.trustStorePassword", emulator.getEmulatorKey());
+            System.setProperty("javax.net.ssl.trustStoreType", "PKCS12");
+            // }
+            // buildClient {
+            CosmosAsyncClient client = new CosmosClientBuilder()
+                .gatewayMode()
+                .endpointDiscoveryEnabled(false)
+                .endpoint(emulator.getEmulatorEndpoint())
+                .key(emulator.getEmulatorKey())
+                .buildAsyncClient();
+            // }
+            // testWithClientAgainstEmulatorContainer {
+            CosmosDatabaseResponse databaseResponse = client.createDatabaseIfNotExists("Azure").block();
+            assertThat(databaseResponse.getStatusCode()).isEqualTo(201);
+            CosmosContainerResponse containerResponse = client
+                .getDatabase("Azure")
+                .createContainerIfNotExists("ServiceContainer", "/name")
+                .block();
+            assertThat(containerResponse.getStatusCode()).isEqualTo(201);
+            // }
+        }
     }
 }

From 17145606e17accfe1bb8e7d5a2b3c4503874ea29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 1 Sep 2025 18:46:08 -0500
Subject: [PATCH 4520/4969] Move Cassandra tests to JUnit Jupiter (#10728)

---
 modules/cassandra/build.gradle                | 10 +++++-
 .../cassandra/CassandraContainerTest.java     | 34 +++++++++----------
 .../CompatibleCassandraImageTest.java         | 19 ++++-------
 .../containers/CassandraContainerTest.java    | 25 +++++++-------
 .../CompatibleCassandraImageTest.java         | 17 ++++------
 5 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index cc3b9e81df5..de228376595 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -10,6 +10,14 @@ dependencies {
     api project(":testcontainers-database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
-    testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
     testImplementation 'org.assertj:assertj-core:3.27.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
+    testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
index d156a28ef0c..c4368dc8065 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
@@ -3,14 +3,14 @@
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class CassandraContainerTest {
+class CassandraContainerTest {
 
     private static final String CASSANDRA_IMAGE = "cassandra:3.11.2";
 
@@ -19,7 +19,7 @@ public class CassandraContainerTest {
     private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
 
     @Test
-    public void testSimple() {
+    void testSimple() {
         try ( // container-definition {
             CassandraContainer cassandraContainer = new CassandraContainer("cassandra:3.11.2")
             // }
@@ -32,7 +32,7 @@ public void testSimple() {
     }
 
     @Test
-    public void testSpecificVersion() {
+    void testSpecificVersion() {
         String cassandraVersion = "3.0.15";
         try (
             CassandraContainer cassandraContainer = new CassandraContainer(
@@ -47,7 +47,7 @@ public void testSpecificVersion() {
     }
 
     @Test
-    public void testConfigurationOverride() {
+    void testConfigurationOverride() {
         try (
             CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
                 .withConfigurationOverride("cassandra-test-configuration-example")
@@ -61,18 +61,18 @@ public void testConfigurationOverride() {
         }
     }
 
-    @Test(expected = ContainerLaunchException.class)
-    public void testEmptyConfigurationOverride() {
+    @Test
+    void testEmptyConfigurationOverride() {
         try (
             CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
                 .withConfigurationOverride("cassandra-empty-configuration")
         ) {
-            cassandraContainer.start();
+            assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
         }
     }
 
     @Test
-    public void testInitScript() {
+    void testInitScript() {
         try (
             CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
                 .withInitScript("initial.cql")
@@ -83,17 +83,17 @@ public void testInitScript() {
     }
 
     @Test
-    public void testNonexistentInitScript() {
+    void testNonexistentInitScript() {
         try (
             CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
                 .withInitScript("unknown_script.cql")
         ) {
-            assertThat(catchThrowable(cassandraContainer::start)).isInstanceOf(ContainerLaunchException.class);
+            assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
         }
     }
 
     @Test
-    public void testInitScriptWithRequiredAuthentication() {
+    void testInitScriptWithRequiredAuthentication() {
         try (
             // init-with-auth {
             CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
@@ -106,18 +106,18 @@ public void testInitScriptWithRequiredAuthentication() {
         }
     }
 
-    @Test(expected = ContainerLaunchException.class)
-    public void testInitScriptWithError() {
+    @Test
+    void testInitScriptWithError() {
         try (
             CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
                 .withInitScript("initial-with-error.cql")
         ) {
-            cassandraContainer.start();
+            assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
         }
     }
 
     @Test
-    public void testInitScriptWithLegacyCassandra() {
+    void testInitScriptWithLegacyCassandra() {
         try (
             CassandraContainer cassandraContainer = new CassandraContainer("cassandra:2.2.11")
                 .withInitScript("initial.cql")
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java
index 868e11c881e..15d8e209911 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java
@@ -3,26 +3,21 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class CompatibleCassandraImageTest {
+class CompatibleCassandraImageTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static String[] params() {
         return new String[] { "cassandra:3.11.2", "cassandra:4.1.1", "cassandra:5" };
     }
 
-    @Parameterized.Parameter
-    public String imageName;
-
-    @Test
-    public void testCassandraGetContactPoint() {
-        try (CassandraContainer cassandra = new CassandraContainer(this.imageName)) {
+    @ParameterizedTest
+    @MethodSource("params")
+    void testCassandraGetContactPoint(String imageName) {
+        try (CassandraContainer cassandra = new CassandraContainer(imageName)) {
             cassandra.start();
             assertCassandraFunctionality(cassandra);
         }
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
index eb3a8b068ea..2d534bccc81 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -5,14 +5,15 @@
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.wait.CassandraQueryWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @Slf4j
-public class CassandraContainerTest {
+class CassandraContainerTest {
 
     private static final DockerImageName CASSANDRA_IMAGE = DockerImageName.parse("cassandra:3.11.2");
 
@@ -21,7 +22,7 @@ public class CassandraContainerTest {
     private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
 
     @Test
-    public void testSimple() {
+    void testSimple() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
@@ -31,7 +32,7 @@ public void testSimple() {
     }
 
     @Test
-    public void testSpecificVersion() {
+    void testSpecificVersion() {
         String cassandraVersion = "3.0.15";
         try (
             CassandraContainer<?> cassandraContainer = new CassandraContainer<>(
@@ -46,7 +47,7 @@ public void testSpecificVersion() {
     }
 
     @Test
-    public void testConfigurationOverride() {
+    void testConfigurationOverride() {
         try (
             CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
                 .withConfigurationOverride("cassandra-test-configuration-example")
@@ -60,18 +61,18 @@ public void testConfigurationOverride() {
         }
     }
 
-    @Test(expected = ContainerLaunchException.class)
-    public void testEmptyConfigurationOverride() {
+    @Test
+    void testEmptyConfigurationOverride() {
         try (
             CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
                 .withConfigurationOverride("cassandra-empty-configuration")
         ) {
-            cassandraContainer.start();
+            assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
         }
     }
 
     @Test
-    public void testInitScript() {
+    void testInitScript() {
         try (
             CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
                 .withInitScript("initial.cql")
@@ -82,7 +83,7 @@ public void testInitScript() {
     }
 
     @Test
-    public void testInitScriptWithLegacyCassandra() {
+    void testInitScriptWithLegacyCassandra() {
         try (
             CassandraContainer<?> cassandraContainer = new CassandraContainer<>(
                 DockerImageName.parse("cassandra:2.2.11")
@@ -96,7 +97,7 @@ public void testInitScriptWithLegacyCassandra() {
 
     @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
-    public void testCassandraQueryWaitStrategy() {
+    void testCassandraQueryWaitStrategy() {
         try (
             CassandraContainer<?> cassandraContainer = new CassandraContainer<>()
                 .waitingFor(new CassandraQueryWaitStrategy())
@@ -109,7 +110,7 @@ public void testCassandraQueryWaitStrategy() {
 
     @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
-    public void testCassandraGetCluster() {
+    void testCassandraGetCluster() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>()) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer.getCluster(), BASIC_QUERY);
diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java
index dc5e830f79a..aec27566beb 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java
@@ -3,26 +3,21 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
 public class CompatibleCassandraImageTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static String[] params() {
         return new String[] { "cassandra:3.11.2", "cassandra:4.1.1" };
     }
 
-    @Parameterized.Parameter
-    public String imageName;
-
-    @Test
-    public void testCassandraGetContactPoint() {
-        try (CassandraContainer<?> cassandra = new CassandraContainer<>(this.imageName)) {
+    @ParameterizedTest
+    @MethodSource("params")
+    void testCassandraGetContactPoint(String imageName) {
+        try (CassandraContainer<?> cassandra = new CassandraContainer<>(imageName)) {
             cassandra.start();
             assertCassandraFunctionality(cassandra);
         }

From 8c8da7a26ea0787fb43d40458098c423e85a63df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Sep 2025 10:31:05 -0500
Subject: [PATCH 4521/4969] Move ChromaDB tests to JUnit Jupiter (#10730)

---
 modules/chromadb/build.gradle                             | 7 +++++++
 .../testcontainers/chromadb/ChromaDBContainerTest.java    | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index fca8a86e410..def6310b420 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
     testImplementation 'org.assertj:assertj-core:3.27.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
index 0ec6b00601c..579c75f9f36 100644
--- a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
+++ b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
@@ -1,14 +1,14 @@
 package org.testcontainers.chromadb;
 
 import io.restassured.http.ContentType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
 
-public class ChromaDBContainerTest {
+class ChromaDBContainerTest {
 
     @Test
-    public void test() {
+    void test() {
         try ( // container {
             ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.23")
             // }
@@ -29,7 +29,7 @@ public void test() {
     }
 
     @Test
-    public void testVersion2() {
+    void testVersion2() {
         try (ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:1.0.0")) {
             chroma.start();
 

From 7836f169114b4113d4d09ec3b7a5c90833e76be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Sep 2025 11:03:08 -0500
Subject: [PATCH 4522/4969] Move Consul tests to JUnit Jupiter (#10732)

---
 modules/consul/build.gradle                   |  7 ++++
 .../consul/ConsulContainerTest.java           | 39 ++++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index b1e2b19c212..a3f6d93dbe2 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -3,7 +3,14 @@ description = "Testcontainers :: Consul"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
index 7f1c6d1c207..6e02bff51e8 100644
--- a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
+++ b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
@@ -4,8 +4,9 @@
 import com.ecwid.consul.v1.Response;
 import com.ecwid.consul.v1.kv.model.GetValue;
 import io.restassured.RestAssured;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.IOException;
@@ -16,25 +17,30 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * This test shows the pattern to use the ConsulContainer @ClassRule for a junit test. It also has tests that ensure
- * the properties were added correctly by reading from Consul with the CLI and over HTTP.
- */
-public class ConsulContainerTest {
+class ConsulContainerTest {
 
-    @ClassRule
-    public static ConsulContainer consulContainer = new ConsulContainer("hashicorp/consul:1.15")
+    private static ConsulContainer consul = new ConsulContainer("hashicorp/consul:1.15")
         .withConsulCommand("kv put config/testing1 value123");
 
+    @BeforeAll
+    static void setup() {
+        consul.start();
+    }
+
+    @AfterAll
+    static void teardown() {
+        consul.stop();
+    }
+
     @Test
-    public void readFirstPropertyPathWithCli() throws IOException, InterruptedException {
-        GenericContainer.ExecResult result = consulContainer.execInContainer("consul", "kv", "get", "config/testing1");
+    void readFirstPropertyPathWithCli() throws IOException, InterruptedException {
+        GenericContainer.ExecResult result = consul.execInContainer("consul", "kv", "get", "config/testing1");
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
         assertThat(output).contains("value123");
     }
 
     @Test
-    public void readFirstSecretPathOverHttpApi() {
+    void readFirstSecretPathOverHttpApi() {
         io.restassured.response.Response response = RestAssured
             .given()
             .when()
@@ -46,11 +52,8 @@ public void readFirstSecretPathOverHttpApi() {
     }
 
     @Test
-    public void writeAndReadMultipleValuesUsingClient() {
-        final ConsulClient consulClient = new ConsulClient(
-            consulContainer.getHost(),
-            consulContainer.getFirstMappedPort()
-        );
+    void writeAndReadMultipleValuesUsingClient() {
+        final ConsulClient consulClient = new ConsulClient(consul.getHost(), consul.getFirstMappedPort());
 
         final Map<String, String> properties = new HashMap<>();
         properties.put("value", "world");
@@ -70,6 +73,6 @@ public void writeAndReadMultipleValuesUsingClient() {
     }
 
     private String getHostAndPort() {
-        return consulContainer.getHost() + ":" + consulContainer.getMappedPort(8500);
+        return consul.getHost() + ":" + consul.getMappedPort(8500);
     }
 }

From 32536adca8f03b6d03dee9bebea07a98f8c4c527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Sep 2025 11:27:58 -0500
Subject: [PATCH 4523/4969] Move Couchbase tests to JUnit Jupiter (#10734)

---
 modules/couchbase/build.gradle                 |  7 +++++++
 .../couchbase/CouchbaseContainerTest.java      | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index d4b481d41ec..b686c581dcf 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,9 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.couchbase.client:java-client:3.9.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
@@ -15,3 +18,7 @@ tasks.japicmp {
         "org.testcontainers.couchbase.CouchbaseContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index b78e3666f31..b973d5eff2a 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -20,7 +20,7 @@
 import com.couchbase.client.java.Cluster;
 import com.couchbase.client.java.Collection;
 import com.couchbase.client.java.json.JsonObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ContainerLaunchException;
 
 import java.time.Duration;
@@ -30,7 +30,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.awaitility.Awaitility.await;
 
-public class CouchbaseContainerTest {
+class CouchbaseContainerTest {
 
     private static final String COUCHBASE_IMAGE_ENTERPRISE = "couchbase/server:enterprise-7.0.3";
 
@@ -41,22 +41,22 @@ public class CouchbaseContainerTest {
     private static final String COUCHBASE_IMAGE_COMMUNITY_RECENT = "couchbase/server:community-7.6.2";
 
     @Test
-    public void testBasicContainerUsageForEnterpriseContainer() {
+    void testBasicContainerUsageForEnterpriseContainer() {
         testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE);
     }
 
     @Test
-    public void testBasicContainerUsageForEnterpriseContainerRecent() {
+    void testBasicContainerUsageForEnterpriseContainerRecent() {
         testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE_RECENT);
     }
 
     @Test
-    public void testBasicContainerUsageForCommunityContainer() {
+    void testBasicContainerUsageForCommunityContainer() {
         testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY);
     }
 
     @Test
-    public void testBasicContainerUsageForCommunityContainerRecent() {
+    void testBasicContainerUsageForCommunityContainerRecent() {
         testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY_RECENT);
     }
 
@@ -89,7 +89,7 @@ private void testBasicContainerUsage(String couchbaseImage) {
     }
 
     @Test
-    public void testBucketIsFlushableIfEnabled() {
+    void testBucketIsFlushableIfEnabled() {
         BucketDefinition bucketDefinition = new BucketDefinition("mybucket").withFlushEnabled(true);
 
         try (
@@ -119,7 +119,7 @@ public void testBucketIsFlushableIfEnabled() {
      * edition which is not supported.
      */
     @Test
-    public void testFailureIfCommunityUsedWithAnalytics() {
+    void testFailureIfCommunityUsedWithAnalytics() {
         try (
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.ANALYTICS)
@@ -136,7 +136,7 @@ public void testFailureIfCommunityUsedWithAnalytics() {
      * edition which is not supported.
      */
     @Test
-    public void testFailureIfCommunityUsedWithEventing() {
+    void testFailureIfCommunityUsedWithEventing() {
         try (
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.EVENTING)

From b22686663581849f7768214f9c2872ce1ded3e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Sep 2025 12:21:06 -0500
Subject: [PATCH 4524/4969] Move Elasticsearch tests to JUnit Jupiter (#10735)

---
 modules/elasticsearch/build.gradle            |  8 ++++
 .../ElasticsearchContainerTest.java           | 48 +++++++++----------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 075e0e39533..31b7e66705f 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,6 +2,10 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
+
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.2"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
     testImplementation 'org.assertj:assertj-core:3.27.4'
@@ -12,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.elasticsearch.ElasticsearchContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 4c308169bc6..f0219713751 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -16,8 +16,8 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
@@ -34,7 +34,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class ElasticsearchContainerTest {
+class ElasticsearchContainerTest {
 
     /**
      * Elasticsearch version which should be used for the Tests
@@ -59,7 +59,7 @@ public class ElasticsearchContainerTest {
 
     private RestClient anonymousClient = null;
 
-    @After
+    @AfterEach
     public void stopRestClient() throws IOException {
         if (client != null) {
             client.close();
@@ -74,7 +74,7 @@ public void stopRestClient() throws IOException {
     @SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
     @Test
     @Deprecated // We will remove this test in the future
-    public void elasticsearchDeprecatedCtorTest() throws IOException {
+    void elasticsearchDeprecatedCtorTest() throws IOException {
         // Create the elasticsearch container.
         try (
             ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
@@ -96,7 +96,7 @@ public void elasticsearchDeprecatedCtorTest() throws IOException {
     }
 
     @Test
-    public void elasticsearchDefaultTest() throws IOException {
+    void elasticsearchDefaultTest() throws IOException {
         // Create the elasticsearch container.
         try (
             ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
@@ -118,7 +118,7 @@ public void elasticsearchDefaultTest() throws IOException {
     }
 
     @Test
-    public void elasticsearchSecuredTest() throws IOException {
+    void elasticsearchSecuredTest() throws IOException {
         try (
             ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
                 .withPassword(ELASTICSEARCH_PASSWORD)
@@ -138,7 +138,7 @@ public void elasticsearchSecuredTest() throws IOException {
     }
 
     @Test
-    public void elasticsearchVersion() throws IOException {
+    void elasticsearchVersion() throws IOException {
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
@@ -149,7 +149,7 @@ public void elasticsearchVersion() throws IOException {
     }
 
     @Test
-    public void elasticsearchVersion83() throws IOException {
+    void elasticsearchVersion83() throws IOException {
         try (
             ElasticsearchContainer container = new ElasticsearchContainer(
                 "docker.elastic.co/elasticsearch/elasticsearch:8.3.0"
@@ -163,7 +163,7 @@ public void elasticsearchVersion83() throws IOException {
     }
 
     @Test
-    public void elasticsearchOssImage() throws IOException {
+    void elasticsearchOssImage() throws IOException {
         try (
             // ossContainer {
             ElasticsearchContainer container = new ElasticsearchContainer(
@@ -182,7 +182,7 @@ public void elasticsearchOssImage() throws IOException {
     }
 
     @Test
-    public void restClientClusterHealth() throws IOException {
+    void restClientClusterHealth() throws IOException {
         // httpClientContainer7 {
         // Create the elasticsearch container.
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
@@ -214,7 +214,7 @@ public void restClientClusterHealth() throws IOException {
     }
 
     @Test
-    public void restClientClusterHealthElasticsearch8() throws IOException {
+    void restClientClusterHealthElasticsearch8() throws IOException {
         // httpClientContainer8 {
         // Create the elasticsearch container.
         try (
@@ -254,7 +254,7 @@ public void restClientClusterHealthElasticsearch8() throws IOException {
     }
 
     @Test
-    public void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException {
+    void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException {
         // httpClientContainerNoSSL8 {
         // Create the elasticsearch container.
         try (
@@ -293,7 +293,7 @@ public void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException
     }
 
     @Test
-    public void restClientSecuredClusterHealth() throws IOException {
+    void restClientSecuredClusterHealth() throws IOException {
         // httpClientSecuredContainer {
         // Create the elasticsearch container.
         try (
@@ -330,7 +330,7 @@ public void restClientSecuredClusterHealth() throws IOException {
 
     @SuppressWarnings("deprecation") // The TransportClient will be removed in Elasticsearch 8.
     @Test
-    public void transportClientClusterHealth() {
+    void transportClientClusterHealth() {
         // transportClientContainer {
         // Create the elasticsearch container.
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
@@ -356,7 +356,7 @@ public void transportClientClusterHealth() {
     }
 
     @Test
-    public void incompatibleSettingsTest() {
+    void incompatibleSettingsTest() {
         // The OSS image can not use security feature
         assertThat(
             catchThrowable(() -> {
@@ -369,7 +369,7 @@ public void incompatibleSettingsTest() {
     }
 
     @Test
-    public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
+    void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
         try (ElasticsearchContainer container = new ElasticsearchContainer("elasticsearch:8.1.2")) {
             container.start();
 
@@ -378,7 +378,7 @@ public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
     }
 
     @Test
-    public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
+    void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("http_ca.crt");
         String caPath = "/tmp/http_ca.crt";
         try (
@@ -400,7 +400,7 @@ public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exceptio
     }
 
     @Test
-    public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
+    void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
         final HttpWaitStrategy httpsWaitStrategy = Wait
             .forHttps("/")
             .forPort(9200)
@@ -423,7 +423,7 @@ public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception
     }
 
     @Test
-    public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
+    void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
         // this test exists for custom images by users that use the `latest` tag
         // even though the version might be older than version 8
         // this tags an old 7.x version as :latest
@@ -442,7 +442,7 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
     }
 
     @Test
-    public void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Exception {
+    void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Exception {
         String customizedCertPath = "/usr/share/elasticsearch/config/certs/http_ca_customized.crt";
         try (
             ElasticsearchContainer container = new ElasticsearchContainer(
@@ -485,7 +485,7 @@ public void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Ex
     }
 
     @Test
-    public void testElasticsearchDefaultMaxHeapSize() throws Exception {
+    void testElasticsearchDefaultMaxHeapSize() throws Exception {
         long defaultHeapSize = 2147483648L;
 
         try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
@@ -495,7 +495,7 @@ public void testElasticsearchDefaultMaxHeapSize() throws Exception {
     }
 
     @Test
-    public void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exception {
+    void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exception {
         long customHeapSize = 1574961152;
 
         try (
@@ -508,7 +508,7 @@ public void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exc
     }
 
     @Test
-    public void testElasticsearchCustomMaxHeapSizeInJvmOptionsFile() throws Exception {
+    void testElasticsearchCustomMaxHeapSizeInJvmOptionsFile() throws Exception {
         long customHeapSize = 1574961152;
 
         try (

From 5b8fdbc1816ac99d665ffb601e7dd1cd893b9674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Sep 2025 15:35:42 -0500
Subject: [PATCH 4525/4969] Move GCloud tests to JUnit Jupiter (#10736)

---
 modules/gcloud/build.gradle                   |   7 ++
 .../BigQueryEmulatorContainerTest.java        |   6 +-
 .../BigtableEmulatorContainerTest.java        |  73 +++++++------
 .../DatastoreEmulatorContainerTest.java       |  48 ++++-----
 .../FirestoreEmulatorContainerTest.java       |  62 +++++------
 .../PubSubEmulatorContainerTest.java          | 101 +++++++++---------
 .../SpannerEmulatorContainerTest.java         |  86 +++++++--------
 7 files changed, 198 insertions(+), 185 deletions(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 4deec14af03..5fabdf773df 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,6 +3,9 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform("com.google.cloud:libraries-bom:26.66.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
@@ -12,3 +15,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-bigtable'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
index 01fcbe137a6..7f06a67c26c 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
@@ -5,7 +5,7 @@
 import com.google.cloud.bigquery.BigQueryOptions;
 import com.google.cloud.bigquery.QueryJobConfiguration;
 import com.google.cloud.bigquery.TableResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,10 +13,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BigQueryEmulatorContainerTest {
+class BigQueryEmulatorContainerTest {
 
     @Test
-    public void test() throws Exception {
+    void test() throws Exception {
         try (
             // emulatorContainer {
             BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.4.3")
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
index a532d5e70af..8c84cfa79db 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
@@ -19,8 +19,7 @@
 import com.google.cloud.bigtable.data.v2.models.TableId;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
@@ -28,48 +27,52 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BigtableEmulatorContainerTest {
+class BigtableEmulatorContainerTest {
 
-    public static final String PROJECT_ID = "test-project";
+    private static final String PROJECT_ID = "test-project";
 
-    public static final String INSTANCE_ID = "test-instance";
-
-    @Rule
-    // emulatorContainer {
-    public BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
-    );
-
-    // }
+    private static final String INSTANCE_ID = "test-instance";
 
     @Test
     // testWithEmulatorContainer {
-    public void testSimple() throws IOException {
-        ManagedChannel channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint()).usePlaintext().build();
-
-        TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
-            GrpcTransportChannel.create(channel)
-        );
-        NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
-        createTable(channelProvider, credentialsProvider, "test-table");
+    void testSimple() throws IOException {
         try (
-            BigtableDataClient client = BigtableDataClient.create(
-                BigtableDataSettings
-                    .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
-                    .setProjectId(PROJECT_ID)
-                    .setInstanceId(INSTANCE_ID)
-                    .build()
-            )
+            // emulatorContainer {
+            BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+            );
+            // }
         ) {
-            client.mutateRow(RowMutation.create(TableId.of("test-table"), "1").setCell("name", "firstName", "Ray"));
+            emulator.start();
+            ManagedChannel channel = ManagedChannelBuilder
+                .forTarget(emulator.getEmulatorEndpoint())
+                .usePlaintext()
+                .build();
+
+            TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
+                GrpcTransportChannel.create(channel)
+            );
+            NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
+            createTable(channelProvider, credentialsProvider, "test-table");
+            try (
+                BigtableDataClient client = BigtableDataClient.create(
+                    BigtableDataSettings
+                        .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
+                        .setProjectId(PROJECT_ID)
+                        .setInstanceId(INSTANCE_ID)
+                        .build()
+                )
+            ) {
+                client.mutateRow(RowMutation.create(TableId.of("test-table"), "1").setCell("name", "firstName", "Ray"));
 
-            Row row = client.readRow(TableId.of("test-table"), "1");
-            List<RowCell> cells = row.getCells("name", "firstName");
+                Row row = client.readRow(TableId.of("test-table"), "1");
+                List<RowCell> cells = row.getCells("name", "firstName");
 
-            assertThat(cells).isNotNull().hasSize(1);
-            assertThat(cells.get(0).getValue().toStringUtf8()).isEqualTo("Ray");
-        } finally {
-            channel.shutdown();
+                assertThat(cells).isNotNull().hasSize(1);
+                assertThat(cells.get(0).getValue().toStringUtf8()).isEqualTo("Ray");
+            } finally {
+                channel.shutdown();
+            }
         }
     }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
index 7ea0ceb9a49..1b743f1e3cd 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
@@ -6,8 +6,7 @@
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Key;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
@@ -16,37 +15,38 @@
 
 public class DatastoreEmulatorContainerTest {
 
-    @Rule
-    // creatingDatastoreEmulatorContainer {
-    public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
-    );
-
-    // }
-
     //  startingDatastoreEmulatorContainer {
     @Test
     public void testSimple() {
-        DatastoreOptions options = DatastoreOptions
-            .newBuilder()
-            .setHost(emulator.getEmulatorEndpoint())
-            .setCredentials(NoCredentials.getInstance())
-            .setRetrySettings(ServiceOptions.getNoRetrySettings())
-            .setProjectId(emulator.getProjectId())
-            .build();
-        Datastore datastore = options.getService();
+        try (
+            // creatingDatastoreEmulatorContainer {
+            DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+            );
+            // }
+        ) {
+            emulator.start();
+            DatastoreOptions options = DatastoreOptions
+                .newBuilder()
+                .setHost(emulator.getEmulatorEndpoint())
+                .setCredentials(NoCredentials.getInstance())
+                .setRetrySettings(ServiceOptions.getNoRetrySettings())
+                .setProjectId(emulator.getProjectId())
+                .build();
+            Datastore datastore = options.getService();
 
-        Key key = datastore.newKeyFactory().setKind("Task").newKey("sample");
-        Entity entity = Entity.newBuilder(key).set("description", "my description").build();
-        datastore.put(entity);
+            Key key = datastore.newKeyFactory().setKind("Task").newKey("sample");
+            Entity entity = Entity.newBuilder(key).set("description", "my description").build();
+            datastore.put(entity);
 
-        assertThat(datastore.get(key).getString("description")).isEqualTo("my description");
+            assertThat(datastore.get(key).getString("description")).isEqualTo("my description");
+        }
     }
 
     // }
 
     @Test
-    public void testWithFlags() throws IOException, InterruptedException {
+    void testWithFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
                 "gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
@@ -61,7 +61,7 @@ public void testWithFlags() throws IOException, InterruptedException {
     }
 
     @Test
-    public void testWithMultipleFlags() throws IOException, InterruptedException {
+    void testWithMultipleFlags() throws IOException, InterruptedException {
         try (
             DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
                 "gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
index 0d9773ce87a..57494ef5535 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
@@ -8,8 +8,7 @@
 import com.google.cloud.firestore.FirestoreOptions;
 import com.google.cloud.firestore.QuerySnapshot;
 import com.google.cloud.firestore.WriteResult;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.HashMap;
@@ -18,46 +17,47 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class FirestoreEmulatorContainerTest {
-
-    @Rule
-    // emulatorContainer {
-    public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
-    );
-
-    // }
+class FirestoreEmulatorContainerTest {
 
     // testWithEmulatorContainer {
     @Test
-    public void testSimple() throws ExecutionException, InterruptedException {
-        FirestoreOptions options = FirestoreOptions
-            .getDefaultInstance()
-            .toBuilder()
-            .setHost(emulator.getEmulatorEndpoint())
-            .setCredentials(NoCredentials.getInstance())
-            .setProjectId("test-project")
-            .build();
-        Firestore firestore = options.getService();
+    void testSimple() throws ExecutionException, InterruptedException {
+        try (
+            // emulatorContainer {
+            FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+            );
+            // }
+        ) {
+            emulator.start();
+            FirestoreOptions options = FirestoreOptions
+                .getDefaultInstance()
+                .toBuilder()
+                .setHost(emulator.getEmulatorEndpoint())
+                .setCredentials(NoCredentials.getInstance())
+                .setProjectId("test-project")
+                .build();
+            Firestore firestore = options.getService();
 
-        CollectionReference users = firestore.collection("users");
-        DocumentReference docRef = users.document("alovelace");
-        Map<String, Object> data = new HashMap<>();
-        data.put("first", "Ada");
-        data.put("last", "Lovelace");
-        ApiFuture<WriteResult> result = docRef.set(data);
-        result.get();
+            CollectionReference users = firestore.collection("users");
+            DocumentReference docRef = users.document("alovelace");
+            Map<String, Object> data = new HashMap<>();
+            data.put("first", "Ada");
+            data.put("last", "Lovelace");
+            ApiFuture<WriteResult> result = docRef.set(data);
+            result.get();
 
-        ApiFuture<QuerySnapshot> query = users.get();
-        QuerySnapshot querySnapshot = query.get();
+            ApiFuture<QuerySnapshot> query = users.get();
+            QuerySnapshot querySnapshot = query.get();
 
-        assertThat(querySnapshot.getDocuments().get(0).getData()).containsEntry("first", "Ada");
+            assertThat(querySnapshot.getDocuments().get(0).getData()).containsEntry("first", "Ada");
+        }
     }
 
     // }
 
     @Test
-    public void testWithFlags() {
+    void testWithFlags() {
         try (
             FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
                 "gcr.io/google.com/cloudsdktool/google-cloud-cli:465.0.0-emulators"
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
index b2f75f0f36a..7d92c50a775 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
@@ -22,70 +22,73 @@
 import com.google.pubsub.v1.TopicName;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PubSubEmulatorContainerTest {
+class PubSubEmulatorContainerTest {
 
-    public static final String PROJECT_ID = "my-project-id";
-
-    @Rule
-    // emulatorContainer {
-    public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
-        DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
-    );
-
-    // }
+    private static final String PROJECT_ID = "my-project-id";
 
     @Test
     // testWithEmulatorContainer {
-    public void testSimple() throws IOException {
-        String hostport = emulator.getEmulatorEndpoint();
-        ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
-        try {
-            TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
-                GrpcTransportChannel.create(channel)
+    void testSimple() throws IOException {
+        try (
+            // emulatorContainer {
+            PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
+                DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
             );
-            NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
-
-            String topicId = "my-topic-id";
-            createTopic(topicId, channelProvider, credentialsProvider);
-
-            String subscriptionId = "my-subscription-id";
-            createSubscription(subscriptionId, topicId, channelProvider, credentialsProvider);
-
-            Publisher publisher = Publisher
-                .newBuilder(TopicName.of(PROJECT_ID, topicId))
-                .setChannelProvider(channelProvider)
-                .setCredentialsProvider(credentialsProvider)
-                .build();
-            PubsubMessage message = PubsubMessage.newBuilder().setData(ByteString.copyFromUtf8("test message")).build();
-            publisher.publish(message);
-
-            SubscriberStubSettings subscriberStubSettings = SubscriberStubSettings
-                .newBuilder()
-                .setTransportChannelProvider(channelProvider)
-                .setCredentialsProvider(credentialsProvider)
-                .build();
-            try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
-                PullRequest pullRequest = PullRequest
+            // }
+        ) {
+            emulator.start();
+            String hostport = emulator.getEmulatorEndpoint();
+            ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
+            try {
+                TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
+                    GrpcTransportChannel.create(channel)
+                );
+                NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
+
+                String topicId = "my-topic-id";
+                createTopic(topicId, channelProvider, credentialsProvider);
+
+                String subscriptionId = "my-subscription-id";
+                createSubscription(subscriptionId, topicId, channelProvider, credentialsProvider);
+
+                Publisher publisher = Publisher
+                    .newBuilder(TopicName.of(PROJECT_ID, topicId))
+                    .setChannelProvider(channelProvider)
+                    .setCredentialsProvider(credentialsProvider)
+                    .build();
+                PubsubMessage message = PubsubMessage
                     .newBuilder()
-                    .setMaxMessages(1)
-                    .setSubscription(ProjectSubscriptionName.format(PROJECT_ID, subscriptionId))
+                    .setData(ByteString.copyFromUtf8("test message"))
                     .build();
-                PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
+                publisher.publish(message);
 
-                assertThat(pullResponse.getReceivedMessagesList()).hasSize(1);
-                assertThat(pullResponse.getReceivedMessages(0).getMessage().getData().toStringUtf8())
-                    .isEqualTo("test message");
+                SubscriberStubSettings subscriberStubSettings = SubscriberStubSettings
+                    .newBuilder()
+                    .setTransportChannelProvider(channelProvider)
+                    .setCredentialsProvider(credentialsProvider)
+                    .build();
+                try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
+                    PullRequest pullRequest = PullRequest
+                        .newBuilder()
+                        .setMaxMessages(1)
+                        .setSubscription(ProjectSubscriptionName.format(PROJECT_ID, subscriptionId))
+                        .build();
+                    PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
+
+                    assertThat(pullResponse.getReceivedMessagesList()).hasSize(1);
+                    assertThat(pullResponse.getReceivedMessages(0).getMessage().getData().toStringUtf8())
+                        .isEqualTo("test message");
+                }
+            } finally {
+                channel.shutdown();
             }
-        } finally {
-            channel.shutdown();
         }
     }
 
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
index b246e7e1f0d..3d651ad6a53 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
@@ -14,8 +14,7 @@
 import com.google.cloud.spanner.Spanner;
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.Statement;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.Arrays;
@@ -23,15 +22,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SpannerEmulatorContainerTest {
-
-    @Rule
-    // emulatorContainer {
-    public SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(
-        DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.4.0")
-    );
-
-    // }
+class SpannerEmulatorContainerTest {
 
     private static final String PROJECT_NAME = "test-project";
 
@@ -41,38 +32,47 @@ public class SpannerEmulatorContainerTest {
 
     // testWithEmulatorContainer {
     @Test
-    public void testSimple() throws ExecutionException, InterruptedException {
-        SpannerOptions options = SpannerOptions
-            .newBuilder()
-            .setEmulatorHost(emulator.getEmulatorGrpcEndpoint())
-            .setCredentials(NoCredentials.getInstance())
-            .setProjectId(PROJECT_NAME)
-            .build();
-
-        Spanner spanner = options.getService();
-
-        InstanceId instanceId = createInstance(spanner);
-
-        createDatabase(spanner);
-
-        DatabaseId databaseId = DatabaseId.of(instanceId, DATABASE_NAME);
-        DatabaseClient dbClient = spanner.getDatabaseClient(databaseId);
-        dbClient
-            .readWriteTransaction()
-            .run(tx -> {
-                String sql1 = "Delete from TestTable where 1=1";
-                tx.executeUpdate(Statement.of(sql1));
-                String sql = "INSERT INTO TestTable (Key, Value) VALUES (1, 'Java'), (2, 'Go')";
-                tx.executeUpdate(Statement.of(sql));
-                return null;
-            });
-
-        ResultSet resultSet = dbClient
-            .readOnlyTransaction()
-            .executeQuery(Statement.of("select * from TestTable order by Key"));
-        resultSet.next();
-        assertThat(resultSet.getLong(0)).isEqualTo(1);
-        assertThat(resultSet.getString(1)).isEqualTo("Java");
+    void testSimple() throws ExecutionException, InterruptedException {
+        try (
+            // emulatorContainer {
+            SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(
+                DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.4.0")
+            );
+            // }
+        ) {
+            emulator.start();
+            SpannerOptions options = SpannerOptions
+                .newBuilder()
+                .setEmulatorHost(emulator.getEmulatorGrpcEndpoint())
+                .setCredentials(NoCredentials.getInstance())
+                .setProjectId(PROJECT_NAME)
+                .build();
+
+            Spanner spanner = options.getService();
+
+            InstanceId instanceId = createInstance(spanner);
+
+            createDatabase(spanner);
+
+            DatabaseId databaseId = DatabaseId.of(instanceId, DATABASE_NAME);
+            DatabaseClient dbClient = spanner.getDatabaseClient(databaseId);
+            dbClient
+                .readWriteTransaction()
+                .run(tx -> {
+                    String sql1 = "Delete from TestTable where 1=1";
+                    tx.executeUpdate(Statement.of(sql1));
+                    String sql = "INSERT INTO TestTable (Key, Value) VALUES (1, 'Java'), (2, 'Go')";
+                    tx.executeUpdate(Statement.of(sql));
+                    return null;
+                });
+
+            ResultSet resultSet = dbClient
+                .readOnlyTransaction()
+                .executeQuery(Statement.of("select * from TestTable order by Key"));
+            resultSet.next();
+            assertThat(resultSet.getLong(0)).isEqualTo(1);
+            assertThat(resultSet.getString(1)).isEqualTo("Java");
+        }
     }
 
     // }

From b5869ab0be991e2e389ae0c26c7d4d785aff7921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 2 Sep 2025 16:05:01 -0500
Subject: [PATCH 4526/4969] Move Grafana tests to JUnit Jupiter (#10737)

---
 modules/grafana/build.gradle                             | 9 ++++++++-
 .../testcontainers/grafana/LgtmStackContainerTest.java   | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 1bb588498d8..bd69ea40170 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -3,13 +3,20 @@ description = "Testcontainers :: Grafana"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.3'
-    testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.8'
+    testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.53.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
index ba4fb94856c..ff8d5cb6609 100644
--- a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
+++ b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
@@ -21,7 +21,7 @@
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
 import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import uk.org.webcompere.systemstubs.SystemStubs;
 
 import java.time.Duration;
@@ -29,10 +29,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class LgtmStackContainerTest {
+class LgtmStackContainerTest {
 
     @Test
-    public void shouldPublishMetricsTracesAndLogs() throws Exception {
+    void shouldPublishMetricsTracesAndLogs() throws Exception {
         try ( // container {
             LgtmStackContainer lgtm = new LgtmStackContainer("grafana/otel-lgtm:0.11.1")
             // }

From ad84679a7463bcf34eb57630ec993251f06decf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 10:17:14 -0600
Subject: [PATCH 4527/4969] Move InfluxDB tests to JUnit Jupiter (#10738)

---
 modules/influxdb/build.gradle                        |  7 +++++++
 .../containers/InfluxDBContainerTest.java            | 12 ++++++------
 .../containers/InfluxDBContainerV1Test.java          | 12 ++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 208ae171ec2..3fcb2925e13 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,6 +5,9 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.25'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.influxdb:influxdb-java:2.25'
     testImplementation "com.influxdb:influxdb-client-java:7.3.0"
@@ -15,3 +18,7 @@ tasks.japicmp {
         "org.testcontainers.containers.InfluxDBContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
index a3862fb7242..53678fa6dce 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
@@ -11,7 +11,7 @@
 import com.influxdb.client.write.Point;
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Instant;
@@ -20,7 +20,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class InfluxDBContainerTest {
+class InfluxDBContainerTest {
 
     private static final String USERNAME = "new-test-user";
 
@@ -37,7 +37,7 @@ public class InfluxDBContainerTest {
     private static final int SECONDS_IN_WEEK = 604800;
 
     @Test
-    public void getInfluxDBClient() {
+    void getInfluxDBClient() {
         try (
             // constructorWithDefaultVariables {
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -55,7 +55,7 @@ public void getInfluxDBClient() {
     }
 
     @Test
-    public void getInfluxDBClientWithAdminToken() {
+    void getInfluxDBClientWithAdminToken() {
         try (
             // constructorWithAdminToken {
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -81,7 +81,7 @@ public void getInfluxDBClientWithAdminToken() {
     }
 
     @Test
-    public void getBucket() {
+    void getBucket() {
         try (
             // constructorWithCustomVariables {
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -111,7 +111,7 @@ public void getBucket() {
     }
 
     @Test
-    public void queryForWriteAndRead() {
+    void queryForWriteAndRead() {
         try (
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
                 InfluxDBTestUtils.INFLUXDB_V2_TEST_IMAGE
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
index c9e292c5675..ea074cee68e 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
@@ -5,14 +5,14 @@
 import org.influxdb.dto.Point;
 import org.influxdb.dto.Query;
 import org.influxdb.dto.QueryResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class InfluxDBContainerV1Test {
+class InfluxDBContainerV1Test {
 
     private static final String TEST_VERSION = InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE.getVersionPart();
 
@@ -23,7 +23,7 @@ public class InfluxDBContainerV1Test {
     private static final String PASSWORD = "new-test-password";
 
     @Test
-    public void createInfluxDBOnlyWithUrlAndCorrectVersion() {
+    void createInfluxDBOnlyWithUrlAndCorrectVersion() {
         try (
             // constructorWithDefaultVariables {
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -43,7 +43,7 @@ public void createInfluxDBOnlyWithUrlAndCorrectVersion() {
     }
 
     @Test
-    public void getNewInfluxDBWithCorrectVersion() {
+    void getNewInfluxDBWithCorrectVersion() {
         try (
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
                 InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE
@@ -61,7 +61,7 @@ public void getNewInfluxDBWithCorrectVersion() {
     }
 
     @Test
-    public void describeDatabases() {
+    void describeDatabases() {
         try (
             // constructorWithUserPassword {
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -82,7 +82,7 @@ public void describeDatabases() {
     }
 
     @Test
-    public void queryForWriteAndRead() {
+    void queryForWriteAndRead() {
         try (
             final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
                 InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE

From 3f517a19d3626bbfe0db283d13f538b7db6c5b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 11:01:03 -0600
Subject: [PATCH 4528/4969] Move K3s tests to JUnit Jupiter (#10741)

---
 modules/k3s/build.gradle                      |  7 +++++
 .../k3s/Fabric8K3sContainerTest.java          |  6 ++--
 .../k3s/KubectlContainerTest.java             | 28 +++++++++++++------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index ee5ed626dc1..88e3c2ffa44 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -6,7 +6,14 @@ dependencies {
     // Synchronize with the jackson version, must match major and minor version
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.fabric8:kubernetes-client:7.3.1'
     testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
index 42b08444555..50b2e17f1fc 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
@@ -12,7 +12,7 @@
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -22,10 +22,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Slf4j
-public class Fabric8K3sContainerTest {
+class Fabric8K3sContainerTest {
 
     @Test
-    public void shouldStartAndHaveListableNode() {
+    void shouldStartAndHaveListableNode() {
         try (
             // starting_k3s {
             K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java
index 5c0d44ff0f1..6dcd7421363 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java
@@ -1,7 +1,8 @@
 package org.testcontainers.k3s;
 
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -11,16 +12,26 @@
 import java.time.Duration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class KubectlContainerTest {
+class KubectlContainerTest {
 
-    public static Network network = Network.SHARED;
+    private static final Network network = Network.SHARED;
 
-    @ClassRule
-    public static K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
+    private static final K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
         .withNetwork(network)
         .withNetworkAliases("k3s");
 
+    @BeforeAll
+    static void setup() {
+        k3s.start();
+    }
+
+    @AfterAll
+    static void teardown() {
+        k3s.stop();
+    }
+
     @Test
     public void shouldExposeKubeConfigForNetworkAlias() throws Exception {
         String kubeConfigYaml = k3s.generateInternalKubeConfigYaml("k3s");
@@ -38,8 +49,9 @@ public void shouldExposeKubeConfigForNetworkAlias() throws Exception {
         }
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void shouldThrowAnExceptionForUnknownNetworkAlias() {
-        k3s.generateInternalKubeConfigYaml("not-set-network-alias");
+        assertThatThrownBy(() -> k3s.generateInternalKubeConfigYaml("not-set-network-alias"))
+            .isInstanceOf(IllegalArgumentException.class);
     }
 }

From 1f8e37c989879bbf25e4db5cec313b81aac3190f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 11:26:09 -0600
Subject: [PATCH 4529/4969] Move K6 tests to JUnit Jupiter (#10742)

---
 modules/k6/build.gradle                                    | 7 +++++++
 .../test/java/org/testcontainers/k6/K6ContainerTests.java  | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
index 943208029c6..369f35a6c9a 100644
--- a/modules/k6/build.gradle
+++ b/modules/k6/build.gradle
@@ -3,5 +3,12 @@ description = "Testcontainers :: k6"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java b/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
index f912fcd7dcf..255cb376b4f 100644
--- a/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
+++ b/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
@@ -1,6 +1,6 @@
 package org.testcontainers.k6;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.output.WaitingConsumer;
 import org.testcontainers.utility.MountableFile;
 
@@ -8,10 +8,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class K6ContainerTests {
+class K6ContainerTests {
 
     @Test
-    public void k6StandardTest() throws Exception {
+    void k6StandardTest() throws Exception {
         try (
             // standard_k6 {
             K6Container container = new K6Container("grafana/k6:0.49.0")

From 899a2a84d3fdadf2429b7bed74e4c2b80b5b9c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 11:57:52 -0600
Subject: [PATCH 4530/4969] Move Kafka tests to JUnit Jupiter (#10743)

---
 modules/kafka/build.gradle                    |  8 ++++
 .../containers/KafkaContainerTest.java        | 40 +++++++++----------
 .../kafka/CompatibleApacheKafkaImageTest.java | 17 +++-----
 .../kafka/ConfluentKafkaContainerTest.java    | 14 +++----
 .../kafka/KafkaContainerTest.java             | 10 ++---
 5 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index ebfcca345a4..baee466d59e 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,8 +3,16 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
index 49b21108da8..e244d7a2e26 100644
--- a/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/containers/KafkaContainerTest.java
@@ -9,7 +9,7 @@
 import org.apache.kafka.common.errors.SaslAuthenticationException;
 import org.apache.kafka.common.errors.TopicAuthorizationException;
 import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.AbstractKafka;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.images.builder.Transferable;
@@ -24,7 +24,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class KafkaContainerTest extends AbstractKafka {
+class KafkaContainerTest extends AbstractKafka {
 
     private static final DockerImageName KAFKA_TEST_IMAGE = DockerImageName.parse("confluentinc/cp-kafka:6.2.1");
 
@@ -35,7 +35,7 @@ public class KafkaContainerTest extends AbstractKafka {
     );
 
     @Test
-    public void testUsage() throws Exception {
+    void testUsage() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
@@ -43,7 +43,7 @@ public void testUsage() throws Exception {
     }
 
     @Test
-    public void testUsageWithSpecificImage() throws Exception {
+    void testUsageWithSpecificImage() throws Exception {
         try (
             // constructorWithVersion {
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
@@ -59,7 +59,7 @@ public void testUsageWithSpecificImage() throws Exception {
     }
 
     @Test
-    public void testUsageWithVersion() throws Exception {
+    void testUsageWithVersion() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer("6.2.1")) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
@@ -67,7 +67,7 @@ public void testUsageWithVersion() throws Exception {
     }
 
     @Test
-    public void testExternalZookeeperWithExternalNetwork() throws Exception {
+    void testExternalZookeeperWithExternalNetwork() throws Exception {
         try (
             Network network = Network.newNetwork();
             // withExternalZookeeper {
@@ -89,7 +89,7 @@ public void testExternalZookeeperWithExternalNetwork() throws Exception {
     }
 
     @Test
-    public void testConfluentPlatformVersion7() throws Exception {
+    void testConfluentPlatformVersion7() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.2.2"))) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
@@ -97,7 +97,7 @@ public void testConfluentPlatformVersion7() throws Exception {
     }
 
     @Test
-    public void testConfluentPlatformVersion5() throws Exception {
+    void testConfluentPlatformVersion5() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
@@ -105,7 +105,7 @@ public void testConfluentPlatformVersion5() throws Exception {
     }
 
     @Test
-    public void testWithHostExposedPort() throws Exception {
+    void testWithHostExposedPort() throws Exception {
         Testcontainers.exposeHostPorts(12345);
         try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE)) {
             kafka.start();
@@ -114,7 +114,7 @@ public void testWithHostExposedPort() throws Exception {
     }
 
     @Test
-    public void testWithHostExposedPortAndExternalNetwork() throws Exception {
+    void testWithHostExposedPortAndExternalNetwork() throws Exception {
         Testcontainers.exposeHostPorts(12345);
         try (KafkaContainer kafka = new KafkaContainer(KAFKA_TEST_IMAGE).withNetwork(Network.newNetwork())) {
             kafka.start();
@@ -123,7 +123,7 @@ public void testWithHostExposedPortAndExternalNetwork() throws Exception {
     }
 
     @Test
-    public void testUsageKraftBeforeConfluentPlatformVersion74() throws Exception {
+    void testUsageKraftBeforeConfluentPlatformVersion74() throws Exception {
         try (
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.0.1")).withKraft()
         ) {
@@ -133,7 +133,7 @@ public void testUsageKraftBeforeConfluentPlatformVersion74() throws Exception {
     }
 
     @Test
-    public void testUsageKraftAfterConfluentPlatformVersion74() throws Exception {
+    void testUsageKraftAfterConfluentPlatformVersion74() throws Exception {
         try (
             // withKraftMode {
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.4.0")).withKraft()
@@ -145,7 +145,7 @@ public void testUsageKraftAfterConfluentPlatformVersion74() throws Exception {
     }
 
     @Test
-    public void testNotSupportedKraftVersion() {
+    void testNotSupportedKraftVersion() {
         try (
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1")).withKraft()
         ) {} catch (IllegalArgumentException e) {
@@ -157,7 +157,7 @@ public void testNotSupportedKraftVersion() {
     }
 
     @Test
-    public void testKraftZookeeperMutualExclusion() {
+    void testKraftZookeeperMutualExclusion() {
         try (
             KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE).withKraft().withExternalZookeeper("")
         ) {} catch (IllegalStateException e) {
@@ -178,7 +178,7 @@ public void testKraftZookeeperMutualExclusion() {
     }
 
     @Test
-    public void testKraftPrecedenceOverEmbeddedZookeeper() throws Exception {
+    void testKraftPrecedenceOverEmbeddedZookeeper() throws Exception {
         try (KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE).withEmbeddedZookeeper().withKraft()) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
@@ -186,7 +186,7 @@ public void testKraftPrecedenceOverEmbeddedZookeeper() throws Exception {
     }
 
     @Test
-    public void testUsageWithListener() throws Exception {
+    void testUsageWithListener() throws Exception {
         try (
             Network network = Network.newNetwork();
             KafkaContainer kafka = new KafkaContainer(KAFKA_KRAFT_TEST_IMAGE)
@@ -216,7 +216,7 @@ public void testUsageWithListener() throws Exception {
 
     @SneakyThrows
     @Test
-    public void shouldConfigureAuthenticationWithSaslUsingJaas() {
+    void shouldConfigureAuthenticationWithSaslUsingJaas() {
         try (
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
                 .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT")
@@ -234,7 +234,7 @@ public void shouldConfigureAuthenticationWithSaslUsingJaas() {
 
     @SneakyThrows
     @Test
-    public void shouldConfigureAuthenticationWithSaslScramUsingJaas() {
+    void shouldConfigureAuthenticationWithSaslScramUsingJaas() {
         try (
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) {
                 protected String commandKraft() {
@@ -265,7 +265,7 @@ protected String commandKraft() {
 
     @SneakyThrows
     @Test
-    public void enableSaslWithUnsuccessfulTopicCreation() {
+    void enableSaslWithUnsuccessfulTopicCreation() {
         try (
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
                 .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT")
@@ -306,7 +306,7 @@ public void enableSaslWithUnsuccessfulTopicCreation() {
 
     @SneakyThrows
     @Test
-    public void enableSaslAndWithAuthenticationError() {
+    void enableSaslAndWithAuthenticationError() {
         String jaasConfig = getJaasConfig();
         try (
             KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.1"))
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java
index b2bb31ae502..33916978acf 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/CompatibleApacheKafkaImageTest.java
@@ -1,24 +1,19 @@
 package org.testcontainers.kafka;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.AbstractKafka;
 
-@RunWith(Parameterized.class)
 public class CompatibleApacheKafkaImageTest extends AbstractKafka {
 
-    @Parameterized.Parameters(name = "{0}")
     public static String[] params() {
         return new String[] { "apache/kafka:3.8.0", "apache/kafka-native:3.8.0" };
     }
 
-    @Parameterized.Parameter
-    public String imageName;
-
-    @Test
-    public void testUsage() throws Exception {
-        try (KafkaContainer kafka = new KafkaContainer(this.imageName)) {
+    @ParameterizedTest
+    @MethodSource("params")
+    public void testUsage(String imageName) throws Exception {
+        try (KafkaContainer kafka = new KafkaContainer(imageName)) {
             kafka.start();
             testKafkaFunctionality(kafka.getBootstrapServers());
         }
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
index 725dc2d2a62..1c95bf95e02 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/ConfluentKafkaContainerTest.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import lombok.SneakyThrows;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.AbstractKafka;
 import org.testcontainers.KCatContainer;
 import org.testcontainers.containers.Network;
@@ -11,10 +11,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ConfluentKafkaContainerTest extends AbstractKafka {
+class ConfluentKafkaContainerTest extends AbstractKafka {
 
     @Test
-    public void testUsage() throws Exception {
+    void testUsage() throws Exception {
         try ( // constructorWithVersion {
             ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.4.0")
             // }
@@ -25,7 +25,7 @@ public void testUsage() throws Exception {
     }
 
     @Test
-    public void testUsageWithListener() throws Exception {
+    void testUsageWithListener() throws Exception {
         try (
             Network network = Network.newNetwork();
             // registerListener {
@@ -48,7 +48,7 @@ public void testUsageWithListener() throws Exception {
     }
 
     @Test
-    public void testUsageWithListenerFromProxy() throws Exception {
+    void testUsageWithListenerFromProxy() throws Exception {
         try (
             Network network = Network.newNetwork();
             // registerListenerFromProxy {
@@ -68,7 +68,7 @@ public void testUsageWithListenerFromProxy() throws Exception {
 
     @SneakyThrows
     @Test
-    public void shouldConfigureAuthenticationWithSaslUsingJaas() {
+    void shouldConfigureAuthenticationWithSaslUsingJaas() {
         try (
             ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.7.0")
                 .withEnv(
@@ -89,7 +89,7 @@ public void shouldConfigureAuthenticationWithSaslUsingJaas() {
 
     @SneakyThrows
     @Test
-    public void shouldConfigureAuthenticationWithSaslScramUsingJaas() {
+    void shouldConfigureAuthenticationWithSaslScramUsingJaas() {
         try (
             ConfluentKafkaContainer kafka = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.7.0") {
                 @SneakyThrows
diff --git a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
index e81b52574ef..34af2e1784d 100644
--- a/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
+++ b/modules/kafka/src/test/java/org/testcontainers/kafka/KafkaContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.kafka;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.AbstractKafka;
 import org.testcontainers.KCatContainer;
 import org.testcontainers.containers.Network;
@@ -8,10 +8,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class KafkaContainerTest extends AbstractKafka {
+class KafkaContainerTest extends AbstractKafka {
 
     @Test
-    public void testUsage() throws Exception {
+    void testUsage() throws Exception {
         try ( // constructorWithVersion {
             KafkaContainer kafka = new KafkaContainer("apache/kafka-native:3.8.0")
             // }
@@ -22,7 +22,7 @@ public void testUsage() throws Exception {
     }
 
     @Test
-    public void testUsageWithListener() throws Exception {
+    void testUsageWithListener() throws Exception {
         try (
             Network network = Network.newNetwork();
             // registerListener {
@@ -45,7 +45,7 @@ public void testUsageWithListener() throws Exception {
     }
 
     @Test
-    public void testUsageWithListenerFromProxy() throws Exception {
+    void testUsageWithListenerFromProxy() throws Exception {
         try (
             Network network = Network.newNetwork();
             SocatContainer socat = new SocatContainer().withNetwork(network).withTarget(2000, "kafka", 19092);

From 56c39bd09c4aef4d03ff9f80c2c48e525e034346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 12:22:14 -0600
Subject: [PATCH 4531/4969] Move LDAP tests to JUnit Jupiter (#10744)

---
 modules/ldap/build.gradle                            |  8 ++++++++
 .../org/testcontainers/ldap/LLdapContainerTest.java  | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
index fa255990be8..4722de4d317 100644
--- a/modules/ldap/build.gradle
+++ b/modules/ldap/build.gradle
@@ -3,6 +3,14 @@ description = "Testcontainers :: LDAP"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.3'
 }
+
+test {
+    useJUnitPlatform()
+}
+
diff --git a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
index d8914c793c2..96e77c9a3f0 100644
--- a/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
+++ b/modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
@@ -4,14 +4,14 @@
 import com.unboundid.ldap.sdk.LDAPConnection;
 import com.unboundid.ldap.sdk.LDAPException;
 import com.unboundid.ldap.sdk.LDAPURL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class LLdapContainerTest {
+class LLdapContainerTest {
 
     @Test
-    public void test() throws LDAPException {
+    void test() throws LDAPException {
         try ( // container {
             LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine")
             // }
@@ -24,7 +24,7 @@ public void test() throws LDAPException {
     }
 
     @Test
-    public void testUsingLdapUrl() throws LDAPException {
+    void testUsingLdapUrl() throws LDAPException {
         try (LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine")) {
             lldap.start();
 
@@ -36,7 +36,7 @@ public void testUsingLdapUrl() throws LDAPException {
     }
 
     @Test
-    public void testWithCustomBaseDn() throws LDAPException {
+    void testWithCustomBaseDn() throws LDAPException {
         try (
             LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine")
                 .withBaseDn("dc=testcontainers,dc=org")
@@ -53,7 +53,7 @@ public void testWithCustomBaseDn() throws LDAPException {
     }
 
     @Test
-    public void testWithCustomUserPass() throws LDAPException {
+    void testWithCustomUserPass() throws LDAPException {
         try (LLdapContainer lldap = new LLdapContainer("lldap/lldap:v0.6.1-alpine").withUserPass("adminPas$word")) {
             lldap.start();
 

From 00ad686028ca66b4044055929eccb13acc3a5672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 13:01:14 -0600
Subject: [PATCH 4532/4969] Update ryuk version to 0.13.0 (#10745)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 7c75a12b109..475a957f344 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.12.0");
+        super("testcontainers/ryuk:0.13.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From c41e9f5395d1e36536a94c7a652721369a73deed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 19:18:33 -0600
Subject: [PATCH 4533/4969] Move LocalStack tests to JUnit Jupiter (#10746)

---
 modules/localstack/build.gradle               |   7 +
 .../containers/localstack/LegacyModeTest.java | 218 +++---
 .../localstack/LocalstackContainerTest.java   | 673 +++++++++---------
 3 files changed, 445 insertions(+), 453 deletions(-)

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index f939b4804cf..f4f827faccc 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,6 +3,9 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform("software.amazon.awssdk:bom:2.32.29")
     testImplementation 'software.amazon.awssdk:s3'
     testImplementation 'software.amazon.awssdk:sqs'
@@ -17,3 +20,7 @@ tasks.japicmp {
         "org.testcontainers.containers.localstack.LocalStackContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
index f888c53afeb..b2537d70b77 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java
@@ -1,154 +1,118 @@
 package org.testcontainers.containers.localstack;
 
 import com.github.dockerjava.api.DockerClient;
-import lombok.AllArgsConstructor;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.localstack.LocalStackContainer.Service;
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.Arrays;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Enclosed.class)
-public class LegacyModeTest {
+class LegacyModeTest {
 
-    private static DockerImageName LOCALSTACK_CUSTOM_TAG = DockerImageName
+    private static final DockerImageName LOCALSTACK_CUSTOM_TAG = DockerImageName
         .parse("localstack/localstack:0.12.8")
         .withTag("custom");
 
-    @RunWith(Parameterized.class)
-    @AllArgsConstructor
-    public static class Off {
-
-        private final String description;
-
-        private final LocalStackContainer localstack;
-
-        @Parameterized.Parameters(name = "{0}")
-        public static Iterable<Object[]> constructors() {
-            return Arrays.asList(
-                new Object[][] {
-                    { "0.12", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_12_IMAGE) },
-                    { "0.11", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE) },
-                    {
-                        "0.11 with legacy = off",
-                        new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE, false),
-                    },
-                }
-            );
-        }
-
-        @Test
-        public void samePortIsExposedForAllServices() {
-            localstack.withServices(Service.S3, Service.SQS);
-            localstack.start();
-
-            try {
-                assertThat(localstack.getExposedPorts()).as("A single port is exposed").hasSize(1);
-                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
-                    .as("Endpoint overrides are different")
-                    .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
-                    .as("Endpoint configuration have different endpoints")
-                    .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-            } finally {
-                localstack.stop();
-            }
-        }
+    @BeforeAll
+    static void setup() {
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+        dockerClient
+            .tagImageCmd(
+                new RemoteDockerImage(LocalstackTestImages.LOCALSTACK_0_12_IMAGE).get(),
+                LOCALSTACK_CUSTOM_TAG.getRepository(),
+                LOCALSTACK_CUSTOM_TAG.getVersionPart()
+            )
+            .exec();
     }
 
-    @RunWith(Parameterized.class)
-    @AllArgsConstructor
-    public static class On {
-
-        private final String description;
-
-        private final LocalStackContainer localstack;
-
-        @BeforeClass
-        public static void createCustomTag() {
-            DockerClient dockerClient = DockerClientFactory.instance().client();
-            dockerClient
-                .tagImageCmd(
-                    new RemoteDockerImage(LocalstackTestImages.LOCALSTACK_0_12_IMAGE).get(),
-                    LOCALSTACK_CUSTOM_TAG.getRepository(),
-                    LOCALSTACK_CUSTOM_TAG.getVersionPart()
-                )
-                .exec();
-        }
+    static Stream<Arguments> localstackVersionWithLegacyOff() {
+        return Stream.of(
+            Arguments.arguments("0.12", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_12_IMAGE)),
+            Arguments.arguments("0.11", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE)),
+            Arguments.arguments(
+                "0.11 with legacy = off",
+                new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE, false)
+            )
+        );
+    }
 
-        @Parameterized.Parameters(name = "{0}")
-        public static Iterable<Object[]> constructors() {
-            return Arrays.asList(
-                new Object[][] {
-                    { "0.10", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_10_IMAGE) },
-                    { "custom", new LocalStackContainer(LOCALSTACK_CUSTOM_TAG) },
-                    {
-                        "0.11 with legacy = on",
-                        new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE, true),
-                    },
-                }
-            );
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("localstackVersionWithLegacyOff")
+    void samePortIsExposedForAllServices(String description, LocalStackContainer localstack) {
+        localstack.withServices(Service.S3, Service.SQS);
+        localstack.start();
+
+        try {
+            assertThat(localstack.getExposedPorts()).as("A single port is exposed").hasSize(1);
+            assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                .as("Endpoint overrides are different")
+                .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+            assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                .as("Endpoint configuration have different endpoints")
+                .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+        } finally {
+            localstack.stop();
         }
+    }
 
-        @Test
-        public void differentPortsAreExposed() {
-            localstack.withServices(Service.S3, Service.SQS);
-            localstack.start();
+    public static Stream<Arguments> localstackVersionWithLegacyOn() {
+        return Stream.of(
+            Arguments.arguments("0.10", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_10_IMAGE)),
+            Arguments.arguments("custom", new LocalStackContainer(LOCALSTACK_CUSTOM_TAG)),
+            Arguments.arguments(
+                "0.11 with legacy = on",
+                new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE, true)
+            )
+        );
+    }
 
-            try {
-                assertThat(localstack.getExposedPorts()).as("Multiple ports are exposed").hasSizeGreaterThan(1);
-                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
-                    .as("Endpoint overrides are different")
-                    .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
-                    .as("Endpoint configuration have different endpoints")
-                    .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-            } finally {
-                localstack.stop();
-            }
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("localstackVersionWithLegacyOn")
+    void differentPortsAreExposed(String description, LocalStackContainer localstack) {
+        localstack.withServices(Service.S3, Service.SQS);
+        localstack.start();
+
+        try {
+            assertThat(localstack.getExposedPorts()).as("Multiple ports are exposed").hasSizeGreaterThan(1);
+            assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                .as("Endpoint overrides are different")
+                .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+            assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                .as("Endpoint configuration have different endpoints")
+                .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+        } finally {
+            localstack.stop();
         }
     }
 
-    @RunWith(Parameterized.class)
-    @AllArgsConstructor
-    public static class LegacyModeUnitTest {
-
-        private final String version;
-
-        private final boolean shouldUseLegacyMode;
-
-        @Parameterized.Parameters(name = "{0} - {1}")
-        public static Iterable<Object[]> constructors() {
-            return Arrays.asList(
-                new Object[][] {
-                    { "latest", false },
-                    { "s3-latest", false },
-                    { "latest-bigdata", false },
-                    { "3.4.0-bigdata", false },
-                    { "3.4.0@sha256:54fcf172f6ff70909e1e26652c3bb4587282890aff0d02c20aa7695469476ac0", false },
-                    { "1.4@sha256:7badf31c550f81151c485980e17542592942d7f05acc09723c5f276d41b5927d", false },
-                    { "3.4.0", false },
-                    { "0.12", false },
-                    { "0.11", false },
-                    { "sha256:8bf0d744fea26603f2b11ef7206edb38375ef954258afaeda96532a6c9c1ab8b", false },
-                    { "0.10.7@sha256:45ef287e29af7285c6e4013fafea1e3567c167cd22d12282f0a5f9c7894b1c5f", true },
-                    { "0.10.7", true },
-                    { "0.9.6", true },
-                }
-            );
-        }
+    public static Stream<Arguments> constructors() {
+        return Stream.of(
+            Arguments.arguments("latest", false),
+            Arguments.arguments("s3-latest", false),
+            Arguments.arguments("latest-bigdata", false),
+            Arguments.arguments("3.4.0-bigdata", false),
+            Arguments.arguments("3.4.0@sha256:54fcf172f6ff70909e1e26652c3bb4587282890aff0d02c20aa7695469476ac0", false),
+            Arguments.arguments("1.4@sha256:7badf31c550f81151c485980e17542592942d7f05acc09723c5f276d41b5927d", false),
+            Arguments.arguments("3.4.0", false),
+            Arguments.arguments("0.12", false),
+            Arguments.arguments("0.11", false),
+            Arguments.arguments("sha256:8bf0d744fea26603f2b11ef7206edb38375ef954258afaeda96532a6c9c1ab8b", false),
+            Arguments.arguments("0.10.7@sha256:45ef287e29af7285c6e4013fafea1e3567c167cd22d12282f0a5f9c7894b1c5f", true),
+            Arguments.arguments("0.10.7", true),
+            Arguments.arguments("0.9.6", true)
+        );
+    }
 
-        @Test
-        public void samePortIsExposedForAllServices() {
-            assertThat(LocalStackContainer.shouldRunInLegacyMode(version)).isEqualTo(shouldUseLegacyMode);
-        }
+    @ParameterizedTest
+    @MethodSource("constructors")
+    void testLegacyMode(String version, boolean shouldUseLegacyMode) {
+        assertThat(LocalStackContainer.shouldRunInLegacyMode(version)).isEqualTo(shouldUseLegacyMode);
     }
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
index cf729a48a32..fa102bbc13d 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -3,10 +3,10 @@
 import com.github.dockerjava.api.DockerClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
@@ -63,192 +63,186 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
- * <p>
- * These tests attempt simple interactions with the container to verify behaviour. The bridge network tests use the
- * Java AWS SDK, whereas the docker network tests use an AWS CLI container within the network, to simulate usage of
- * Localstack from within a Docker network.
- */
 @Slf4j
-@RunWith(Enclosed.class)
-public class LocalstackContainerTest {
-
-    public static class WithoutNetwork {
-
-        // without_network {
-        @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
-            .withEnv("SQS_ENDPOINT_STRATEGY", "dynamic")
-            .withServices(
-                Service.S3,
-                Service.SQS,
-                Service.CLOUDWATCHLOGS,
-                Service.KMS,
-                LocalStackContainer.EnabledService.named("events")
-            );
+class LocalstackContainerTest {
 
-        // }
+    @Nested
+    class WithoutNetwork {
 
         @Test
-        public void s3TestOverBridgeNetwork() throws IOException {
-            S3Client s3 = S3Client
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+        void s3TestOverBridgeNetwork() throws IOException {
+            try (
+                // without_network {
+                LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+                    .withServices(Service.S3)
+                // }
+            ) {
+                localstack.start();
+
+                // with_aws_sdk_v2 {
+                S3Client s3 = S3Client
+                    .builder()
+                    .endpointOverride(localstack.getEndpoint())
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
-
-            final String bucketName = "foo";
-            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
-            s3.putObject(
-                PutObjectRequest.builder().bucket(bucketName).key("bar").build(),
-                software.amazon.awssdk.core.sync.RequestBody.fromString("baz")
-            );
+                    .region(Region.of(localstack.getRegion()))
+                    .build();
+                // }
+
+                final String bucketName = "foo";
+                s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+                s3.putObject(
+                    PutObjectRequest.builder().bucket(bucketName).key("bar").build(),
+                    software.amazon.awssdk.core.sync.RequestBody.fromString("baz")
+                );
 
-            final List<Bucket> buckets = s3.listBuckets().buckets();
-            final Optional<Bucket> maybeBucket = buckets.stream().filter(b -> b.name().equals(bucketName)).findFirst();
-            assertThat(maybeBucket).as("The created bucket is present").isPresent();
-            final Bucket bucket = maybeBucket.get();
+                final List<Bucket> buckets = s3.listBuckets().buckets();
+                final Optional<Bucket> maybeBucket = buckets
+                    .stream()
+                    .filter(b -> b.name().equals(bucketName))
+                    .findFirst();
+                assertThat(maybeBucket).as("The created bucket is present").isPresent();
+                final Bucket bucket = maybeBucket.get();
 
-            assertThat(bucket.name()).as("The created bucket has the right name").isEqualTo(bucketName);
+                assertThat(bucket.name()).as("The created bucket has the right name").isEqualTo(bucketName);
 
-            final ListObjectsV2Response objectListing = s3.listObjectsV2(
-                ListObjectsV2Request.builder().bucket(bucketName).build()
-            );
-            assertThat(objectListing.contents()).as("The created bucket has 1 item in it").hasSize(1);
+                final ListObjectsV2Response objectListing = s3.listObjectsV2(
+                    ListObjectsV2Request.builder().bucket(bucketName).build()
+                );
+                assertThat(objectListing.contents()).as("The created bucket has 1 item in it").hasSize(1);
 
-            final String content = s3
-                .getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key("bar").build())
-                .asString(StandardCharsets.UTF_8);
-            assertThat(content).as("The object can be retrieved").isEqualTo("baz");
+                final String content = s3
+                    .getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key("bar").build())
+                    .asString(StandardCharsets.UTF_8);
+                assertThat(content).as("The object can be retrieved").isEqualTo("baz");
+            }
         }
 
         @Test
-        public void s3TestUsingAwsSdkV2() {
-            // with_aws_sdk_v2 {
-            S3Client s3 = S3Client
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
-                    )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
-            // }
-
-            final String bucketName = "foov2";
-            s3.createBucket(b -> b.bucket(bucketName));
-            assertThat(s3.listBuckets().buckets().stream().anyMatch(b -> b.name().equals(bucketName)))
-                .as("New bucket was created")
-                .isTrue();
-        }
+        void sqsTestOverBridgeNetwork() {
+            try (
+                LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+                    .withEnv("SQS_ENDPOINT_STRATEGY", "dynamic")
+                    .withServices(Service.SQS)
+            ) {
+                localstack.start();
 
-        @Test
-        public void sqsTestOverBridgeNetwork() {
-            SqsClient sqs = SqsClient
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                SqsClient sqs = SqsClient
+                    .builder()
+                    .endpointOverride(localstack.getEndpoint())
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
-
-            CreateQueueResponse queueResult = sqs.createQueue(CreateQueueRequest.builder().queueName("baz").build());
-            String fooQueueUrl = queueResult.queueUrl();
-
-            sqs.sendMessage(SendMessageRequest.builder().queueUrl(fooQueueUrl).messageBody("test").build());
-            final long messageCount = sqs
-                .receiveMessage(ReceiveMessageRequest.builder().queueUrl(fooQueueUrl).build())
-                .messages()
-                .stream()
-                .filter(message -> message.body().equals("test"))
-                .count();
-            assertThat(messageCount).as("the sent message can be received").isEqualTo(1L);
+                    .region(Region.of(localstack.getRegion()))
+                    .build();
+
+                CreateQueueResponse queueResult = sqs.createQueue(
+                    CreateQueueRequest.builder().queueName("baz").build()
+                );
+                String fooQueueUrl = queueResult.queueUrl();
+
+                sqs.sendMessage(SendMessageRequest.builder().queueUrl(fooQueueUrl).messageBody("test").build());
+                final long messageCount = sqs
+                    .receiveMessage(ReceiveMessageRequest.builder().queueUrl(fooQueueUrl).build())
+                    .messages()
+                    .stream()
+                    .filter(message -> message.body().equals("test"))
+                    .count();
+                assertThat(messageCount).as("the sent message can be received").isEqualTo(1L);
+            }
         }
 
         @Test
-        public void cloudWatchLogsTestOverBridgeNetwork() {
-            CloudWatchLogsClient logs = CloudWatchLogsClient
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+        void cloudWatchLogsTestOverBridgeNetwork() {
+            try (
+                LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+                    .withServices(Service.CLOUDWATCHLOGS)
+            ) {
+                localstack.start();
+
+                CloudWatchLogsClient logs = CloudWatchLogsClient
+                    .builder()
+                    .endpointOverride(localstack.getEndpoint())
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
+                    .region(Region.of(localstack.getRegion()))
+                    .build();
 
-            logs.createLogGroup(CreateLogGroupRequest.builder().logGroupName("foo").build());
+                logs.createLogGroup(CreateLogGroupRequest.builder().logGroupName("foo").build());
 
-            DescribeLogGroupsResponse response = logs.describeLogGroups();
-            assertThat(response.logGroups()).as("One log group should be created").hasSize(1);
-            assertThat(response.logGroups().get(0).logGroupName())
-                .as("Name of created log group is [foo]")
-                .isEqualTo("foo");
+                DescribeLogGroupsResponse response = logs.describeLogGroups();
+                assertThat(response.logGroups()).as("One log group should be created").hasSize(1);
+                assertThat(response.logGroups().get(0).logGroupName())
+                    .as("Name of created log group is [foo]")
+                    .isEqualTo("foo");
+            }
         }
 
         @Test
-        public void kmsKeyCreationTest() {
-            KmsClient kms = KmsClient
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+        void kmsKeyCreationTest() {
+            try (
+                LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+                    .withServices(Service.KMS)
+            ) {
+                localstack.start();
+                KmsClient kms = KmsClient
+                    .builder()
+                    .endpointOverride(localstack.getEndpoint())
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
+                    .region(Region.of(localstack.getRegion()))
+                    .build();
 
-            String desc = "AWS CMK Description";
-            Tag createdByTag = Tag.builder().tagKey("CreatedBy").tagValue("StorageService").build();
-            CreateKeyRequest req = CreateKeyRequest.builder().description(desc).tags(createdByTag).build();
-            CreateKeyResponse key = kms.createKey(req);
+                String desc = "AWS CMK Description";
+                Tag createdByTag = Tag.builder().tagKey("CreatedBy").tagValue("StorageService").build();
+                CreateKeyRequest req = CreateKeyRequest.builder().description(desc).tags(createdByTag).build();
+                CreateKeyResponse key = kms.createKey(req);
 
-            assertThat(desc)
-                .as("AWS KMS Customer Managed Key should be created ")
-                .isEqualTo(key.keyMetadata().description());
+                assertThat(desc)
+                    .as("AWS KMS Customer Managed Key should be created ")
+                    .isEqualTo(key.keyMetadata().description());
+            }
         }
 
         @Test
-        public void samePortIsExposedForAllServices() {
-            assertThat(localstack.getExposedPorts()).as("A single port is exposed").hasSize(1);
-            assertThat(localstack.getEndpointOverride(Service.SQS).toString())
-                .as("Endpoint overrides are different")
-                .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+        void samePortIsExposedForAllServices() {
+            try (LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)) {
+                localstack.start();
+
+                assertThat(localstack.getExposedPorts()).as("A single port is exposed").hasSize(1);
+                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                    .as("Endpoint overrides are different")
+                    .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+            }
         }
     }
 
-    public static class WithNetwork {
+    @Nested
+    class WithNetwork {
 
         // with_network {
-        private static Network network = Network.newNetwork();
+        Network network = Network.newNetwork();
 
-        @ClassRule
-        public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(
+        LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(
             DockerImageName.parse("localstack/localstack:0.12.8")
         )
             .withNetwork(network)
             .withNetworkAliases("notthis", "localstack") // the last alias is used for HOSTNAME_EXTERNAL
             .withServices(Service.S3, Service.SQS, Service.CLOUDWATCHLOGS);
-
         // }
 
-        @ClassRule
-        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(
-            LocalstackTestImages.AWS_CLI_IMAGE
-        )
+        GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(LocalstackTestImages.AWS_CLI_IMAGE)
             .withNetwork(network)
             .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("tail"))
             .withCommand(" -f /dev/null")
@@ -256,13 +250,28 @@ public static class WithNetwork {
             .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
             .withEnv("AWS_REGION", "eu-west-1");
 
+        @BeforeEach
+        void setup() {
+            localstackInDockerNetwork.start();
+            awsCliInDockerNetwork.start();
+        }
+
+        @AfterEach
+        void tearDown() {
+            awsCliInDockerNetwork.stop();
+            localstackInDockerNetwork.stop();
+        }
+
         @Test
-        public void localstackHostEnVarIsSet() {
+        void localstackHostEnVarIsSet() {
+            localstackInDockerNetwork.start();
+            awsCliInDockerNetwork.start();
+
             assertThat(localstackInDockerNetwork.getEnvMap().get("HOSTNAME_EXTERNAL")).isEqualTo("localstack");
         }
 
         @Test
-        public void s3TestOverDockerNetwork() throws Exception {
+        void s3TestOverDockerNetwork() throws Exception {
             runAwsCliAgainstDockerNetworkContainer(
                 "s3api create-bucket --bucket foo --create-bucket-configuration LocationConstraint=eu-west-1"
             );
@@ -271,7 +280,7 @@ public void s3TestOverDockerNetwork() throws Exception {
         }
 
         @Test
-        public void sqsTestOverDockerNetwork() throws Exception {
+        void sqsTestOverDockerNetwork() throws Exception {
             final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer(
                 "sqs create-queue --queue-name baz"
             );
@@ -299,7 +308,7 @@ public void sqsTestOverDockerNetwork() throws Exception {
         }
 
         @Test
-        public void cloudWatchLogsTestOverDockerNetwork() throws Exception {
+        void cloudWatchLogsTestOverDockerNetwork() throws Exception {
             runAwsCliAgainstDockerNetworkContainer("logs create-log-group --log-group-name foo");
         }
 
@@ -320,32 +329,34 @@ private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exc
         }
     }
 
-    public static class WithRegion {
-
-        // with_region {
-        private static String region = "eu-west-1";
-
-        @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
-            .withEnv("DEFAULT_REGION", region)
-            .withServices(Service.S3);
-
-        // }
+    @Nested
+    class WithRegion {
 
         @Test
-        public void s3EndpointHasProperRegion() {
-            assertThat(localstack.getRegion()).as("The endpoint configuration has right region").isEqualTo(region);
+        void s3EndpointHasProperRegion() {
+            try (
+                // with_region {
+                LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+                    .withEnv("DEFAULT_REGION", "eu-west-1")
+                    .withServices(Service.S3);
+                // }
+            ) {
+                localstack.start();
+                assertThat(localstack.getRegion())
+                    .as("The endpoint configuration has right region")
+                    .isEqualTo("eu-west-1");
+            }
         }
     }
 
-    public static class WithoutServices {
-
-        @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE);
+    @Nested
+    class WithoutServices {
 
         @Test
-        public void s3ServiceStartLazily() {
-            try (
+        void s3ServiceStartLazily() {
+            try (LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE);) {
+                localstack.start();
+
                 S3Client s3 = S3Client
                     .builder()
                     .endpointOverride(localstack.getEndpoint())
@@ -355,69 +366,67 @@ public void s3ServiceStartLazily() {
                         )
                     )
                     .region(Region.of(localstack.getRegion()))
-                    .build()
-            ) {
+                    .build();
                 assertThat(s3.listBuckets().buckets()).as("S3 Service is started lazily").isEmpty();
             }
         }
-    }
-
-    public static class WithVersion2 {
-
-        private static Network network = Network.newNetwork();
-
-        @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(
-            DockerImageName.parse("localstack/localstack:2.0")
-        )
-            .withNetwork(network)
-            .withNetworkAliases("localstack");
-
-        @ClassRule
-        public static GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(
-            LocalstackTestImages.AWS_CLI_IMAGE
-        )
-            .withNetwork(network)
-            .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("tail"))
-            .withCommand(" -f /dev/null")
-            .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
-            .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
-            .withEnv("AWS_REGION", "eu-west-1");
 
         @Test
-        public void localstackHostEnVarIsSet() {
-            assertThat(localstack.getEnvMap().get("LOCALSTACK_HOST")).isEqualTo("localstack");
-        }
+        void sqsTestOverDockerNetwork() throws Exception {
+            try (
+                Network network = Network.newNetwork();
+                LocalStackContainer localstack = new LocalStackContainer(
+                    DockerImageName.parse("localstack/localstack:2.0")
+                )
+                    .withNetwork(network)
+                    .withNetworkAliases("localstack");
+                GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(LocalstackTestImages.AWS_CLI_IMAGE)
+                    .withNetwork(network)
+                    .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("tail"))
+                    .withCommand(" -f /dev/null")
+                    .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
+                    .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
+                    .withEnv("AWS_REGION", "eu-west-1")
+            ) {
+                localstack.start();
+                awsCliInDockerNetwork.start();
 
-        @Test
-        public void sqsTestOverDockerNetwork() throws Exception {
-            final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer(
-                "sqs create-queue --queue-name baz"
-            );
+                assertThat(localstack.getEnvMap().get("LOCALSTACK_HOST")).isEqualTo("localstack");
 
-            assertThat(queueCreationResponse)
-                .as("Created queue has external hostname URL")
-                .contains("http://localstack:" + LocalStackContainer.PORT);
+                final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer(
+                    "sqs create-queue --queue-name baz",
+                    awsCliInDockerNetwork
+                );
 
-            runAwsCliAgainstDockerNetworkContainer(
-                String.format(
-                    "sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test",
-                    LocalStackContainer.PORT,
-                    LocalStackContainer.PORT
-                )
-            );
-            final String message = runAwsCliAgainstDockerNetworkContainer(
-                String.format(
-                    "sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz",
-                    LocalStackContainer.PORT,
-                    LocalStackContainer.PORT
-                )
-            );
+                assertThat(queueCreationResponse)
+                    .as("Created queue has external hostname URL")
+                    .contains("http://localstack:" + LocalStackContainer.PORT);
+
+                runAwsCliAgainstDockerNetworkContainer(
+                    String.format(
+                        "sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test",
+                        LocalStackContainer.PORT,
+                        LocalStackContainer.PORT
+                    ),
+                    awsCliInDockerNetwork
+                );
+                final String message = runAwsCliAgainstDockerNetworkContainer(
+                    String.format(
+                        "sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz",
+                        LocalStackContainer.PORT,
+                        LocalStackContainer.PORT
+                    ),
+                    awsCliInDockerNetwork
+                );
 
-            assertThat(message).as("the sent message can be received").contains("\"Body\": \"test\"");
+                assertThat(message).as("the sent message can be received").contains("\"Body\": \"test\"");
+            }
         }
 
-        private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exception {
+        private String runAwsCliAgainstDockerNetworkContainer(
+            String command,
+            GenericContainer<?> awsCliInDockerNetwork
+        ) throws Exception {
             final String[] commandParts = String
                 .format(
                     "/usr/local/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl",
@@ -434,69 +443,74 @@ private String runAwsCliAgainstDockerNetworkContainer(String command) throws Exc
         }
     }
 
-    public static class S3SkipSignatureValidation {
-
-        @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
-            .withEnv("S3_SKIP_SIGNATURE_VALIDATION", "0");
+    @Nested
+    class S3SkipSignatureValidation {
 
         @Test
-        public void shouldBeAccessibleWithCredentials() throws IOException {
-            S3Client s3 = S3Client
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+        void shouldBeAccessibleWithCredentials() throws IOException {
+            try (
+                LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
+                    .withEnv("S3_SKIP_SIGNATURE_VALIDATION", "0")
+            ) {
+                localstack.start();
+
+                S3Client s3 = S3Client
+                    .builder()
+                    .endpointOverride(localstack.getEndpoint())
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
+                    .region(Region.of(localstack.getRegion()))
+                    .build();
 
-            final String bucketName = "foo";
+                final String bucketName = "foo";
 
-            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+                s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
 
-            s3.putObject(
-                PutObjectRequest.builder().bucket(bucketName).key("bar").build(),
-                software.amazon.awssdk.core.sync.RequestBody.fromString("baz")
-            );
+                s3.putObject(
+                    PutObjectRequest.builder().bucket(bucketName).key("bar").build(),
+                    software.amazon.awssdk.core.sync.RequestBody.fromString("baz")
+                );
 
-            final List<Bucket> buckets = s3.listBuckets().buckets();
-            final Optional<Bucket> maybeBucket = buckets.stream().filter(b -> b.name().equals(bucketName)).findFirst();
-            assertThat(maybeBucket).as("The created bucket is present").isPresent();
+                final List<Bucket> buckets = s3.listBuckets().buckets();
+                final Optional<Bucket> maybeBucket = buckets
+                    .stream()
+                    .filter(b -> b.name().equals(bucketName))
+                    .findFirst();
+                assertThat(maybeBucket).as("The created bucket is present").isPresent();
 
-            S3Presigner presigner = S3Presigner
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                S3Presigner presigner = S3Presigner
+                    .builder()
+                    .endpointOverride(localstack.getEndpoint())
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
+                    .region(Region.of(localstack.getRegion()))
+                    .build();
 
-            GetObjectPresignRequest presignRequest = GetObjectPresignRequest
-                .builder()
-                .signatureDuration(Duration.ofMinutes(5))
-                .getObjectRequest(GetObjectRequest.builder().bucket(bucketName).key("bar").build())
-                .build();
+                GetObjectPresignRequest presignRequest = GetObjectPresignRequest
+                    .builder()
+                    .signatureDuration(Duration.ofMinutes(5))
+                    .getObjectRequest(GetObjectRequest.builder().bucket(bucketName).key("bar").build())
+                    .build();
 
-            URL presignedUrl = presigner.presignGetObject(presignRequest).url();
+                URL presignedUrl = presigner.presignGetObject(presignRequest).url();
 
-            assertThat(presignedUrl).as("The presigned url is valid").isNotNull();
-            final String content = IOUtils.toString(presignedUrl, StandardCharsets.UTF_8);
-            assertThat(content).as("The object can be retrieved").isEqualTo("baz");
+                assertThat(presignedUrl).as("The presigned url is valid").isNotNull();
+                final String content = IOUtils.toString(presignedUrl, StandardCharsets.UTF_8);
+                assertThat(content).as("The object can be retrieved").isEqualTo("baz");
+            }
         }
     }
 
-    public static class LambdaContainerLabels {
+    @Nested
+    class LambdaContainerLabels {
 
-        @ClassRule
-        public static LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE);
-
-        private static byte[] createLambdaHandlerZipFile() throws IOException {
+        private byte[] createLambdaHandlerZipFile() throws IOException {
             StringBuilder sb = new StringBuilder();
             sb.append("def handler(event, context):\n");
             sb.append("    return event");
@@ -514,64 +528,71 @@ private static byte[] createLambdaHandlerZipFile() throws IOException {
         }
 
         @Test
-        public void shouldLabelLambdaContainers() throws IOException {
-            LambdaClient lambda = LambdaClient
-                .builder()
-                .endpointOverride(localstack.getEndpoint())
-                .credentialsProvider(
-                    StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+        void shouldLabelLambdaContainers() throws IOException {
+            try (LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)) {
+                localstack.start();
+
+                LambdaClient lambda = LambdaClient
+                    .builder()
+                    .endpointOverride(localstack.getEndpoint())
+                    .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+                        )
                     )
-                )
-                .region(Region.of(localstack.getRegion()))
-                .build();
-
-            // create function
-            byte[] handlerFile = createLambdaHandlerZipFile();
-            CreateFunctionRequest createFunctionRequest = CreateFunctionRequest
-                .builder()
-                .functionName("test-function")
-                .runtime(Runtime.PYTHON3_11)
-                .handler("handler.handler")
-                .role("arn:aws:iam::000000000000:role/test-role")
-                .code(FunctionCode.builder().zipFile(SdkBytes.fromByteArray(handlerFile)).build())
-                .build();
-            CreateFunctionResponse createFunctionResult = lambda.createFunction(createFunctionRequest);
-
-            try (LambdaWaiter waiter = lambda.waiter()) {
-                waiter.waitUntilFunctionActive(
-                    GetFunctionConfigurationRequest.builder().functionName(createFunctionResult.functionName()).build()
-                );
-            }
+                    .region(Region.of(localstack.getRegion()))
+                    .build();
 
-            // invoke function once
-            String payload = "{\"test\": \"payload\"}";
-            InvokeRequest invokeRequest = InvokeRequest
-                .builder()
-                .functionName(createFunctionResult.functionName())
-                .payload(SdkBytes.fromUtf8String(payload))
-                .build();
-            InvokeResponse invokeResult = lambda.invoke(invokeRequest);
-            assertThat(invokeResult.payload().asUtf8String())
-                .as("Invoke result not matching expected output")
-                .isEqualTo(payload);
-
-            // assert that the spawned lambda containers has the testcontainers labels set
-            DockerClient dockerClient = DockerClientFactory.instance().client();
-            Collection<String> nameFilter = Collections.singleton(localstack.getContainerName().replace("_", "-"));
-            com.github.dockerjava.api.model.Container lambdaContainer = dockerClient
-                .listContainersCmd()
-                .withNameFilter(nameFilter)
-                .exec()
-                .stream()
-                .findFirst()
-                .orElse(null);
-            assertThat(lambdaContainer).as("Lambda container not found").isNotNull();
-            Map<String, String> labels = lambdaContainer.getLabels();
-            assertThat(labels.get("org.testcontainers")).as("TestContainers label not present").isEqualTo("true");
-            assertThat(labels.get("org.testcontainers.sessionId"))
-                .as("TestContainers session id not present")
-                .isNotNull();
+                // create function
+                byte[] handlerFile = createLambdaHandlerZipFile();
+                CreateFunctionRequest createFunctionRequest = CreateFunctionRequest
+                    .builder()
+                    .functionName("test-function")
+                    .runtime(Runtime.PYTHON3_11)
+                    .handler("handler.handler")
+                    .role("arn:aws:iam::000000000000:role/test-role")
+                    .code(FunctionCode.builder().zipFile(SdkBytes.fromByteArray(handlerFile)).build())
+                    .build();
+                CreateFunctionResponse createFunctionResult = lambda.createFunction(createFunctionRequest);
+
+                try (LambdaWaiter waiter = lambda.waiter()) {
+                    waiter.waitUntilFunctionActive(
+                        GetFunctionConfigurationRequest
+                            .builder()
+                            .functionName(createFunctionResult.functionName())
+                            .build()
+                    );
+                }
+
+                // invoke function once
+                String payload = "{\"test\": \"payload\"}";
+                InvokeRequest invokeRequest = InvokeRequest
+                    .builder()
+                    .functionName(createFunctionResult.functionName())
+                    .payload(SdkBytes.fromUtf8String(payload))
+                    .build();
+                InvokeResponse invokeResult = lambda.invoke(invokeRequest);
+                assertThat(invokeResult.payload().asUtf8String())
+                    .as("Invoke result not matching expected output")
+                    .isEqualTo(payload);
+
+                // assert that the spawned lambda containers has the testcontainers labels set
+                DockerClient dockerClient = DockerClientFactory.instance().client();
+                Collection<String> nameFilter = Collections.singleton(localstack.getContainerName().replace("_", "-"));
+                com.github.dockerjava.api.model.Container lambdaContainer = dockerClient
+                    .listContainersCmd()
+                    .withNameFilter(nameFilter)
+                    .exec()
+                    .stream()
+                    .findFirst()
+                    .orElse(null);
+                assertThat(lambdaContainer).as("Lambda container not found").isNotNull();
+                Map<String, String> labels = lambdaContainer.getLabels();
+                assertThat(labels.get("org.testcontainers")).as("TestContainers label not present").isEqualTo("true");
+                assertThat(labels.get("org.testcontainers.sessionId"))
+                    .as("TestContainers session id not present")
+                    .isNotNull();
+            }
         }
     }
 }

From fee54cd5d95af2ea4c4daa67b48f4f11384474ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 19:23:03 -0600
Subject: [PATCH 4534/4969] Move Milvus tests to JUnit Jupiter (#10747)

---
 modules/milvus/build.gradle                               | 7 +++++++
 .../org/testcontainers/milvus/MilvusContainerTest.java    | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 6addaaabbd0..ed176e3394d 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.milvus:milvus-sdk-java:2.6.3'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java b/modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java
index 3a6d6275ec2..71ce05655f2 100644
--- a/modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java
+++ b/modules/milvus/src/test/java/org/testcontainers/milvus/MilvusContainerTest.java
@@ -2,17 +2,17 @@
 
 import io.milvus.client.MilvusServiceClient;
 import io.milvus.param.ConnectParam;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MilvusContainerTest {
+class MilvusContainerTest {
 
     @Test
-    public void withDefaultConfig() {
+    void withDefaultConfig() {
         try (
             // milvusContainer {
             MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.3.9")
@@ -26,7 +26,7 @@ public void withDefaultConfig() {
     }
 
     @Test
-    public void withExternalEtcd() {
+    void withExternalEtcd() {
         try (
             // externalEtcd {
             Network network = Network.newNetwork();

From a3cff711d4120077ed1b4c8c641b71ccbe7368e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 19:23:26 -0600
Subject: [PATCH 4535/4969] Move MinIO tests to JUnit Jupiter (#10748)

---
 modules/minio/build.gradle                             |  7 +++++++
 .../testcontainers/containers/MinIOContainerTest.java  | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index cf0798d879a..45ef78d7315 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation("io.minio:minio:8.5.17")
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java b/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
index 563a77852c5..0998243de8e 100644
--- a/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
+++ b/modules/minio/src/test/java/org/testcontainers/containers/MinIOContainerTest.java
@@ -6,16 +6,16 @@
 import io.minio.StatObjectArgs;
 import io.minio.StatObjectResponse;
 import io.minio.UploadObjectArgs;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URL;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MinIOContainerTest {
+class MinIOContainerTest {
 
     @Test
-    public void testBasicUsage() throws Exception {
+    void testBasicUsage() throws Exception {
         try (
             // minioContainer {
             MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z");
@@ -57,7 +57,7 @@ public void testBasicUsage() throws Exception {
     }
 
     @Test
-    public void testDefaultUserPassword() {
+    void testDefaultUserPassword() {
         try (MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z")) {
             container.start();
             assertThat(container.getUserName()).isEqualTo("minioadmin");
@@ -66,7 +66,7 @@ public void testDefaultUserPassword() {
     }
 
     @Test
-    public void testOverwriteUserPassword() {
+    void testOverwriteUserPassword() {
         try (
             // minioOverrides {
             MinIOContainer container = new MinIOContainer("minio/minio:RELEASE.2023-09-04T19-57-37Z")

From aae4f643a99ed3b0bcf01c680728b08c96cf0f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 3 Sep 2025 20:42:23 -0600
Subject: [PATCH 4536/4969] Move MockServer tests to JUnit Jupiter (#10749)

---
 modules/mockserver/build.gradle               |  7 ++++++
 .../MockServerContainerRuleTest.java          | 24 +++++++++++++------
 .../containers/MockServerContainerTest.java   | 12 +++++-----
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 49aad5f08a1..032d4a79e0a 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -3,6 +3,9 @@ description = "Testcontainers :: MockServer"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
@@ -13,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.MockServerContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index 066b86b05fd..c01cad49479 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -1,7 +1,8 @@
 package org.testcontainers.containers;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
@@ -10,20 +11,29 @@
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 
-public class MockServerContainerRuleTest {
+class MockServerContainerRuleTest {
 
     // creatingProxy {
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
+    private static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
         .parse("mockserver/mockserver")
         .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
-    @Rule
-    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
+    private static MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
 
     // }
 
+    @BeforeAll
+    static void setup() {
+        mockServer.start();
+    }
+
+    @AfterAll
+    static void tearDown() {
+        mockServer.stop();
+    }
+
     @Test
-    public void shouldReturnExpectation() throws Exception {
+    void shouldReturnExpectation() {
         // testSimpleExpectation {
         try (
             MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index a06ea3e7e63..b1fca9ce514 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -3,7 +3,7 @@
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.config.SSLConfig;
 import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.configuration.Configuration;
 import org.mockserver.logging.MockServerLogger;
@@ -15,14 +15,14 @@
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 
-public class MockServerContainerTest {
+class MockServerContainerTest {
 
     public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
         .parse("mockserver/mockserver")
         .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
     @Test
-    public void shouldCallActualMockserverVersion() throws Exception {
+    void shouldCallActualMockserverVersion() throws Exception {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
@@ -41,7 +41,7 @@ public void shouldCallActualMockserverVersion() throws Exception {
     }
 
     @Test
-    public void shouldCallMockserverUsingTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingTlsProtocol() throws Exception {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
@@ -63,7 +63,7 @@ public void shouldCallMockserverUsingTlsProtocol() throws Exception {
     }
 
     @Test
-    public void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
         try (
             MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)
                 .withEnv("MOCKSERVER_TLS_MUTUAL_AUTHENTICATION_REQUIRED", "true")
@@ -88,7 +88,7 @@ public void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
     }
 
     @Test
-    public void newVersionStartsWithDefaultWaitStrategy() {
+    void newVersionStartsWithDefaultWaitStrategy() {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
         }

From 67a4701315c449deb54655a1d771397cf2cb3aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 09:42:56 -0600
Subject: [PATCH 4537/4969] Move MongoDB tests to JUnit Jupiter (#10750)

---
 modules/mongodb/build.gradle                  |  8 ++++++
 .../containers/CompatibleImageTest.java       | 27 +++++++------------
 .../containers/MongoDBContainerTest.java      | 10 +++----
 .../MongoDBAtlasLocalContainerTest.java       | 10 +++----
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index d7af71b9f75..813b1c60890 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,6 +3,10 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
@@ -12,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.MongoDBContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
index 8113e508aee..7cd7296c14a 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
@@ -3,23 +3,15 @@
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 import org.bson.Document;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class CompatibleImageTest extends AbstractMongo {
+class CompatibleImageTest extends AbstractMongo {
 
-    private final String image;
-
-    public CompatibleImageTest(String image) {
-        this.image = image;
-    }
-
-    @Parameterized.Parameters(name = "{0}")
-    public static String[] image() {
+    static String[] image() {
         return new String[] {
             "mongo:7",
             "mongodb/mongodb-community-server:7.0.2-ubi8",
@@ -28,7 +20,7 @@ public static String[] image() {
     }
 
     @Test
-    public void shouldExecuteTransactions() {
+    void shouldExecuteTransactions() {
         try (
             // creatingMongoDBContainer {
             final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")
@@ -41,9 +33,10 @@ public void shouldExecuteTransactions() {
         }
     }
 
-    @Test
-    public void shouldSupportSharding() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(this.image).withSharding()) {
+    @ParameterizedTest
+    @MethodSource("image")
+    void shouldSupportSharding(String image) {
+        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(image).withSharding()) {
             mongoDBContainer.start();
             final MongoClient mongoClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
 
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
index 8952c6802e6..29d75f80640 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
@@ -1,16 +1,16 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MongoDBContainerTest extends AbstractMongo {
+class MongoDBContainerTest extends AbstractMongo {
 
     /**
      * Taken from <a href="https://docs.mongodb.com/manual/core/transactions/">https://docs.mongodb.com</a>
      */
     @Test
-    public void shouldExecuteTransactions() {
+    void shouldExecuteTransactions() {
         try (
             // creatingMongoDBContainer {
             final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")
@@ -24,14 +24,14 @@ public void shouldExecuteTransactions() {
     }
 
     @Test
-    public void supportsMongoDB_7_0() {
+    void supportsMongoDB_7_0() {
         try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0")) {
             mongoDBContainer.start();
         }
     }
 
     @Test
-    public void shouldTestDatabaseName() {
+    void shouldTestDatabaseName() {
         try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")) {
             mongoDBContainer.start();
             final String databaseName = "my-db";
diff --git a/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
index 720629d214c..7bc7a39808b 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.mongodb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,12 +12,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-public class MongoDBAtlasLocalContainerTest {
+class MongoDBAtlasLocalContainerTest {
 
     private static final Logger log = LoggerFactory.getLogger(MongoDBAtlasLocalContainerTest.class);
 
     @Test
-    public void getConnectionString() {
+    void getConnectionString() {
         try (
             MongoDBAtlasLocalContainer container = new MongoDBAtlasLocalContainer("mongodb/mongodb-atlas-local:7.0.9")
         ) {
@@ -37,7 +37,7 @@ public void getConnectionString() {
     }
 
     @Test
-    public void getDatabaseConnectionString() {
+    void getDatabaseConnectionString() {
         try (
             MongoDBAtlasLocalContainer container = new MongoDBAtlasLocalContainer("mongodb/mongodb-atlas-local:7.0.9")
         ) {
@@ -57,7 +57,7 @@ public void getDatabaseConnectionString() {
     }
 
     @Test
-    public void createAtlasIndexAndSearchIt() throws Exception {
+    void createAtlasIndexAndSearchIt() throws Exception {
         try (
             // creatingAtlasLocalContainer {
             MongoDBAtlasLocalContainer atlasLocalContainer = new MongoDBAtlasLocalContainer(

From dbf1f40a910465b2b4c3fde42a3b902207351e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 10:02:34 -0600
Subject: [PATCH 4538/4969] Move Neo4j tests to JUnit Jupiter (#10751)

---
 modules/neo4j/build.gradle                    |  7 +++
 .../Neo4jContainerJUnitIntegrationTest.java   | 54 -------------------
 .../containers/Neo4jContainerTest.java        | 53 +++++++++---------
 3 files changed, 32 insertions(+), 82 deletions(-)
 delete mode 100644 modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 9f347a9e34b..a1b49eac532 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,6 +33,9 @@ dependencies {
 
     api project(":testcontainers")
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
@@ -43,3 +46,7 @@ tasks.japicmp {
         "org.testcontainers.containers.Neo4jLabsPlugin"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
deleted file mode 100644
index 868d7e29f2d..00000000000
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerJUnitIntegrationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.testcontainers.containers;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.neo4j.driver.AuthTokens;
-import org.neo4j.driver.Driver;
-import org.neo4j.driver.GraphDatabase;
-import org.neo4j.driver.Session;
-
-import java.util.Collections;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Test for basic functionality when used as a <code>@ClassRule</code>.
- */
-public class Neo4jContainerJUnitIntegrationTest {
-
-    @ClassRule
-    public static Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");
-
-    @Test
-    public void shouldStart() {
-        boolean actual = neo4jContainer.isRunning();
-        assertThat(actual).isTrue();
-
-        try (
-            Driver driver = GraphDatabase.driver(neo4jContainer.getBoltUrl(), AuthTokens.basic("neo4j", "password"));
-            Session session = driver.session()
-        ) {
-            long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
-            assertThat(one).isEqualTo(1L);
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void shouldReturnBoltUrl() {
-        String actual = neo4jContainer.getBoltUrl();
-
-        assertThat(actual).isNotNull();
-        assertThat(actual).startsWith("bolt://");
-    }
-
-    @Test
-    public void shouldReturnHttpUrl() {
-        String actual = neo4jContainer.getHttpUrl();
-
-        assertThat(actual).isNotNull();
-        assertThat(actual).startsWith("http://");
-    }
-}
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
index 9827eb09900..997e90c4788 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
@@ -4,7 +4,7 @@
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.AuthTokens;
 import org.neo4j.driver.Driver;
@@ -26,16 +26,13 @@
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-/**
- * Tests of functionality special to the Neo4jContainer.
- */
-public class Neo4jContainerTest {
+class Neo4jContainerTest {
 
     // See org.testcontainers.utility.LicenseAcceptance#ACCEPTANCE_FILE_NAME
     private static final String ACCEPTANCE_FILE_LOCATION = "/container-license-acceptance.txt";
 
     @Test
-    public void shouldDisableAuthentication() {
+    void shouldDisableAuthentication() {
         try (
             // spotless:off
             // withoutAuthentication {
@@ -53,7 +50,7 @@ public void shouldDisableAuthentication() {
     }
 
     @Test
-    public void shouldCopyDatabase() {
+    void shouldCopyDatabase() {
         // no aarch64 image available for Neo4j 3.5
         assumeThat(DockerClientFactory.instance().getInfo().getArchitecture()).isNotEqualTo("aarch64");
         try (
@@ -72,7 +69,7 @@ public void shouldCopyDatabase() {
     }
 
     @Test
-    public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
+    void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
         assertThatIllegalArgumentException()
             .isThrownBy(() -> {
                 new Neo4jContainer("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
@@ -81,7 +78,7 @@ public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
     }
 
     @Test
-    public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
+    void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
         assertThatIllegalArgumentException()
             .isThrownBy(() -> {
                 new Neo4jContainer("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
@@ -90,7 +87,7 @@ public void shouldFailOnCopyDatabaseForCustomNeo4j4Image() {
     }
 
     @Test
-    public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
+    void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
         assertThatIllegalArgumentException()
             .isThrownBy(() -> {
                 new Neo4jContainer("neo4j:latest").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
@@ -99,7 +96,7 @@ public void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
     }
 
     @Test
-    public void shouldCopyPlugins() {
+    void shouldCopyPlugins() {
         try (
             // registerPluginsPath {
             Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
@@ -114,7 +111,7 @@ public void shouldCopyPlugins() {
     }
 
     @Test
-    public void shouldCopyPlugin() {
+    void shouldCopyPlugin() {
         try (
             // registerPluginsJar {
             Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
@@ -136,7 +133,7 @@ private static void assertThatCustomPluginWasCopied(Session session) {
     }
 
     @Test
-    public void shouldCheckEnterpriseLicense() {
+    void shouldCheckEnterpriseLicense() {
         assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNull();
 
         String expectedImageName = "neo4j:4.4-enterprise";
@@ -147,7 +144,7 @@ public void shouldCheckEnterpriseLicense() {
     }
 
     @Test
-    public void shouldRunEnterprise() {
+    void shouldRunEnterprise() {
         assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNotNull();
 
         try (
@@ -170,7 +167,7 @@ public void shouldRunEnterprise() {
     }
 
     @Test
-    public void shouldAddConfigToEnvironment() {
+    void shouldAddConfigToEnvironment() {
         // neo4jConfiguration {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
             .withNeo4jConfig("dbms.security.procedures.unrestricted", "apoc.*,algo.*")
@@ -183,7 +180,7 @@ public void shouldAddConfigToEnvironment() {
     }
 
     @Test
-    public void shouldRespectEnvironmentAuth() {
+    void shouldRespectEnvironmentAuth() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret");
 
         neo4jContainer.configure();
@@ -192,7 +189,7 @@ public void shouldRespectEnvironmentAuth() {
     }
 
     @Test
-    public void shouldSetCustomPasswordCorrectly() {
+    void shouldSetCustomPasswordCorrectly() {
         // withAdminPassword {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withAdminPassword("verySecret");
         // }
@@ -203,7 +200,7 @@ public void shouldSetCustomPasswordCorrectly() {
     }
 
     @Test
-    public void containerAdminPasswordOverrulesEnvironmentAuth() {
+    void containerAdminPasswordOverrulesEnvironmentAuth() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
             .withEnv("NEO4J_AUTH", "neo4j/secret")
             .withAdminPassword("anotherSecret");
@@ -214,7 +211,7 @@ public void containerAdminPasswordOverrulesEnvironmentAuth() {
     }
 
     @Test
-    public void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
+    void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
             .withEnv("NEO4J_AUTH", "neo4j/secret")
             .withoutAuthentication();
@@ -225,7 +222,7 @@ public void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
     }
 
     @Test
-    public void shouldRespectAlreadyDefinedPortMappingsBolt() {
+    void shouldRespectAlreadyDefinedPortMappingsBolt() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687);
 
         neo4jContainer.configure();
@@ -234,7 +231,7 @@ public void shouldRespectAlreadyDefinedPortMappingsBolt() {
     }
 
     @Test
-    public void shouldRespectAlreadyDefinedPortMappingsHttp() {
+    void shouldRespectAlreadyDefinedPortMappingsHttp() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7474);
 
         neo4jContainer.configure();
@@ -243,7 +240,7 @@ public void shouldRespectAlreadyDefinedPortMappingsHttp() {
     }
 
     @Test
-    public void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
+    void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687, 7474);
 
         neo4jContainer.configure();
@@ -252,7 +249,7 @@ public void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
     }
 
     @Test
-    public void shouldDefaultExportBoltHttpAndHttps() {
+    void shouldDefaultExportBoltHttpAndHttps() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");
 
         neo4jContainer.configure();
@@ -261,7 +258,7 @@ public void shouldDefaultExportBoltHttpAndHttps() {
     }
 
     @Test
-    public void shouldRespectCustomWaitStrategy() {
+    void shouldRespectCustomWaitStrategy() {
         Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy());
 
         neo4jContainer.configure();
@@ -270,7 +267,7 @@ public void shouldRespectCustomWaitStrategy() {
     }
 
     @Test
-    public void shouldConfigureSinglePluginByName() {
+    void shouldConfigureSinglePluginByName() {
         try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withPlugins("apoc")) {
             // needs to get called explicitly for setup
             neo4jContainer.configure();
@@ -280,7 +277,7 @@ public void shouldConfigureSinglePluginByName() {
     }
 
     @Test
-    public void shouldConfigureMultiplePluginsByName() {
+    void shouldConfigureMultiplePluginsByName() {
         try (
             // configureLabsPlugins {
             Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4") //
@@ -296,7 +293,7 @@ public void shouldConfigureMultiplePluginsByName() {
     }
 
     @Test
-    public void shouldCreateRandomUuidBasedPasswords() {
+    void shouldCreateRandomUuidBasedPasswords() {
         try (
             // withRandomPassword {
             Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withRandomPassword();
@@ -311,7 +308,7 @@ public void shouldCreateRandomUuidBasedPasswords() {
     }
 
     @Test
-    public void shouldWarnOnPasswordTooShort() {
+    void shouldWarnOnPasswordTooShort() {
         try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");) {
             Logger logger = (Logger) DockerLoggerFactory.getLogger("neo4j:4.4");
             TestLogAppender testLogAppender = new TestLogAppender();

From a8c52686c3774cdbe8fd6ede10550dd2f98ca401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 10:55:51 -0600
Subject: [PATCH 4539/4969] Move Nginx tests to JUnit Jupiter (#10752)

---
 modules/nginx/build.gradle                    |  8 ++++
 .../testcontainers/junit/SimpleNginxTest.java | 44 +++++++++----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index f4c5280d4c2..b179ad33845 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,6 +3,10 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:26.0.2'
+
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
@@ -11,3 +15,7 @@ tasks.japicmp {
         "org.testcontainers.containers.NginxContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
index 05a5f5767f1..1c527c27a63 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -1,9 +1,8 @@
 package org.testcontainers.junit;
 
 import lombok.Cleanup;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.NginxContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
@@ -20,23 +19,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleNginxTest {
+class SimpleNginxTest {
 
     private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.27.0-alpine3.19-slim");
 
     private static String tmpDirectory = System.getProperty("user.home") + "/.tmp-test-container";
 
-    // creatingContainer {
-    @Rule
-    public NginxContainer nginx = new NginxContainer(NGINX_IMAGE)
-        .withCopyFileToContainer(MountableFile.forHostPath(tmpDirectory), "/usr/share/nginx/html")
-        .waitingFor(new HttpWaitStrategy());
-
-    // }
-
     @SuppressWarnings({ "Duplicates", "ResultOfMethodCallIgnored" })
-    @BeforeClass
-    public static void setupContent() throws Exception {
+    @BeforeAll
+    static void setupContent() throws Exception {
         // addCustomContent {
         // Create a temporary dir
         File contentFolder = new File(tmpDirectory);
@@ -53,15 +44,24 @@ public static void setupContent() throws Exception {
     }
 
     @Test
-    public void testSimple() throws Exception {
-        // getFromNginxServer {
-        URL baseUrl = nginx.getBaseUrl("http", 80);
+    void testSimple() throws Exception {
+        try (
+            // creatingContainer {
+            NginxContainer nginx = new NginxContainer(NGINX_IMAGE)
+                .withCopyFileToContainer(MountableFile.forHostPath(tmpDirectory), "/usr/share/nginx/html")
+                .waitingFor(new HttpWaitStrategy());
+            // }
+        ) {
+            nginx.start();
+            // getFromNginxServer {
+            URL baseUrl = nginx.getBaseUrl("http", 80);
 
-        assertThat(responseFromNginx(baseUrl))
-            .as("An HTTP GET from the Nginx server returns the index.html from the custom content directory")
-            .contains("Hello World!");
-        // }
-        assertHasCorrectExposedAndLivenessCheckPorts(nginx);
+            assertThat(responseFromNginx(baseUrl))
+                .as("An HTTP GET from the Nginx server returns the index.html from the custom content directory")
+                .contains("Hello World!");
+            // }
+            assertHasCorrectExposedAndLivenessCheckPorts(nginx);
+        }
     }
 
     private void assertHasCorrectExposedAndLivenessCheckPorts(NginxContainer nginxContainer) {

From a2d4965d7bc58d6f342ad4402bd9c40aabe74325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 10:56:12 -0600
Subject: [PATCH 4540/4969] Move Ollama tests to JUnit Jupiter (#10753)

---
 modules/ollama/build.gradle                               | 7 +++++++
 .../org/testcontainers/ollama/OllamaContainerTest.java    | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index a0256ba7150..62a34a0f05a 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: Ollama"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
index e4a1d61b790..dcd61cad9c4 100644
--- a/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
+++ b/modules/ollama/src/test/java/org/testcontainers/ollama/OllamaContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.ollama;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerImageName;
 
@@ -9,10 +9,10 @@
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OllamaContainerTest {
+class OllamaContainerTest {
 
     @Test
-    public void withDefaultConfig() {
+    void withDefaultConfig() {
         try ( // container {
             OllamaContainer ollama = new OllamaContainer("ollama/ollama:0.1.26")
             // }
@@ -25,7 +25,7 @@ public void withDefaultConfig() {
     }
 
     @Test
-    public void downloadModelAndCommitToImage() throws IOException, InterruptedException {
+    void downloadModelAndCommitToImage() throws IOException, InterruptedException {
         String newImageName = "tc-ollama-allminilm-" + Base58.randomString(4).toLowerCase();
         try (OllamaContainer ollama = new OllamaContainer("ollama/ollama:0.1.26")) {
             ollama.start();

From f2f12b9cdc598f27ef49cbc3016fe93387a7cccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 10:56:30 -0600
Subject: [PATCH 4541/4969] Move OpenFGA tests to JUnit Jupiter (#10754)

---
 modules/openfga/build.gradle                                | 4 ++++
 .../org/testcontainers/openfga/OpenFGAContainerTest.java    | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 5d1addfbe9a..628d940826f 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,11 +3,15 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'dev.openfga:openfga-sdk:0.9.0'
 }
 
 test {
+    useJUnitPlatform()
     javaLauncher = javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(17)
     }
diff --git a/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java b/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
index 6f444b697f0..be68bdee71a 100644
--- a/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
+++ b/modules/openfga/src/test/java/org/testcontainers/openfga/OpenFGAContainerTest.java
@@ -5,16 +5,16 @@
 import dev.openfga.sdk.api.configuration.ClientConfiguration;
 import dev.openfga.sdk.api.model.CreateStoreRequest;
 import dev.openfga.sdk.errors.FgaInvalidParameterException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ExecutionException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OpenFGAContainerTest {
+class OpenFGAContainerTest {
 
     @Test
-    public void withDefaultConfig() throws FgaInvalidParameterException, ExecutionException, InterruptedException {
+    void withDefaultConfig() throws FgaInvalidParameterException, ExecutionException, InterruptedException {
         try ( // container {
             OpenFGAContainer openfga = new OpenFGAContainer("openfga/openfga:v1.4.3")
             // }

From b54170b9030b88ab7333dbd7e242ae71e45eeecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 10:56:57 -0600
Subject: [PATCH 4542/4969] Move OrientDB tests to JUnit Jupiter (#10755)

---
 modules/orientdb/build.gradle                        |  7 +++++++
 .../containers/OrientDBContainerTest.java            | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 9973e1519d3..ea70b65c3b3 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,6 +5,9 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.43"
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.3'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
@@ -15,3 +18,7 @@ tasks.japicmp {
         "org.testcontainers.containers.OrientDBContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
index ca520983e71..af6778505ec 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
@@ -1,18 +1,18 @@
 package org.testcontainers.containers;
 
 import com.orientechnologies.orient.core.db.ODatabaseSession;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OrientDBContainerTest {
+class OrientDBContainerTest {
 
     private static final DockerImageName ORIENTDB_IMAGE = DockerImageName.parse("orientdb:3.2.0-tp3");
 
     @Test
-    public void shouldReturnTheSameSession() {
+    void shouldReturnTheSameSession() {
         try ( // container {
             OrientDBContainer orientdb = new OrientDBContainer("orientdb:3.2.0-tp3")
             // }
@@ -27,7 +27,7 @@ public void shouldReturnTheSameSession() {
     }
 
     @Test
-    public void shouldInitializeWithCommands() {
+    void shouldInitializeWithCommands() {
         try (OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)) {
             orientdb.start();
 
@@ -42,7 +42,7 @@ public void shouldInitializeWithCommands() {
     }
 
     @Test
-    public void shouldQueryWithGremlin() {
+    void shouldQueryWithGremlin() {
         try (
             OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)
                 .withCopyFileToContainer(
@@ -63,7 +63,7 @@ public void shouldQueryWithGremlin() {
     }
 
     @Test
-    public void shouldInitializeDatabaseFromScript() {
+    void shouldInitializeDatabaseFromScript() {
         try (
             OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)
                 .withScriptPath("initscript.osql")

From 3e033709df2293fc605e53f915ccafbf10dc3cdd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 16:58:21 +0000
Subject: [PATCH 4543/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.7.3 to 3.7.4.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.7.3...3.7.4)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-version: 3.7.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index ea70b65c3b3..a6ab87a0d03 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.3'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
 }
 

From d8c9f9ff539a9ba18361d68b3c13a2ec5dc1d593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 12:05:25 -0600
Subject: [PATCH 4544/4969] Move Pinecone tests to JUnit Jupiter (#10758)

---
 modules/pinecone/build.gradle                              | 7 +++++++
 .../pinecone/PineconeLocalContainerTest.java               | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/pinecone/build.gradle b/modules/pinecone/build.gradle
index d293456d91a..4c2f15e4682 100644
--- a/modules/pinecone/build.gradle
+++ b/modules/pinecone/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.pinecone:pinecone-client:3.1.0'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java b/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java
index 5843dfef81c..6303e069423 100644
--- a/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java
+++ b/modules/pinecone/src/test/java/org/testcontainers/pinecone/PineconeLocalContainerTest.java
@@ -1,16 +1,16 @@
 package org.testcontainers.pinecone;
 
 import io.pinecone.clients.Pinecone;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openapitools.db_control.client.model.DeletionProtection;
 import org.openapitools.db_control.client.model.IndexModel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PineconeLocalContainerTest {
+class PineconeLocalContainerTest {
 
     @Test
-    public void testSimple() {
+    void testSimple() {
         try ( // container {
             PineconeLocalContainer container = new PineconeLocalContainer("ghcr.io/pinecone-io/pinecone-local:v0.7.0")
             // }

From 2d2c1bd05813ad2bec98fa05c2709fb7b807babb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 18:06:27 +0000
Subject: [PATCH 4545/4969] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 in /modules/pinecone

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pinecone/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pinecone/build.gradle b/modules/pinecone/build.gradle
index 4c2f15e4682..20101b9b5d9 100644
--- a/modules/pinecone/build.gradle
+++ b/modules/pinecone/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.pinecone:pinecone-client:3.1.0'
 }
 

From 9e7aa3cd49da8f9e1f28b43f365b010789302544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 12:43:35 -0600
Subject: [PATCH 4546/4969] Move Pulsar tests to JUnit Jupiter (#10759)

---
 modules/pulsar/build.gradle                   |  8 ++++++
 .../CompatibleApachePulsarImageTest.java      | 26 ++++++++-----------
 .../containers/PulsarContainerTest.java       | 22 ++++++++--------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 957b210ec86..c9309daa24a 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,6 +3,10 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation platform("org.apache.pulsar:pulsar-bom:4.0.5")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
@@ -14,3 +18,7 @@ tasks.japicmp {
         "org.testcontainers.containers.PulsarContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java
index b7a9cd3ff4c..702a7223151 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java
@@ -1,25 +1,20 @@
 package org.testcontainers.containers;
 
 import org.apache.pulsar.client.admin.PulsarAdmin;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.utility.DockerImageName;
 
-@RunWith(Parameterized.class)
-public class CompatibleApachePulsarImageTest extends AbstractPulsar {
+class CompatibleApachePulsarImageTest extends AbstractPulsar {
 
-    @Parameterized.Parameters(name = "{0}")
     public static String[] params() {
         return new String[] { "apachepulsar/pulsar:3.0.0", "apachepulsar/pulsar-all:3.0.0" };
     }
 
-    @Parameterized.Parameter
-    public String imageName;
-
-    @Test
-    public void testUsage() throws Exception {
-        try (PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse(this.imageName));) {
+    @ParameterizedTest
+    @MethodSource("params")
+    void testUsage(String imageName) throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse(imageName));) {
             pulsar.start();
             final String pulsarBrokerUrl = pulsar.getPulsarBrokerUrl();
 
@@ -27,9 +22,10 @@ public void testUsage() throws Exception {
         }
     }
 
-    @Test
-    public void testTransactions() throws Exception {
-        try (PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse(this.imageName)).withTransactions();) {
+    @ParameterizedTest
+    @MethodSource("params")
+    void testTransactions(String imageName) throws Exception {
+        try (PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse(imageName)).withTransactions();) {
             pulsar.start();
 
             try (PulsarAdmin pulsarAdmin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build()) {
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
index 779a3a6114a..93e9410ada8 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
@@ -2,7 +2,7 @@
 
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -10,12 +10,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class PulsarContainerTest extends AbstractPulsar {
+class PulsarContainerTest extends AbstractPulsar {
 
     private static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:3.0.0");
 
     @Test
-    public void testUsage() throws Exception {
+    void testUsage() throws Exception {
         try (
             // do not use PULSAR_IMAGE to make the doc looks easier
             // constructorWithVersion {
@@ -32,7 +32,7 @@ public void testUsage() throws Exception {
     }
 
     @Test
-    public void envVarsUsage() throws Exception {
+    void envVarsUsage() throws Exception {
         try (
             // constructorWithEnv {
             PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)
@@ -45,7 +45,7 @@ public void envVarsUsage() throws Exception {
     }
 
     @Test
-    public void customClusterName() throws Exception {
+    void customClusterName() throws Exception {
         try (
             PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)
                 .withEnv("PULSAR_PREFIX_clusterName", "tc-cluster");
@@ -56,7 +56,7 @@ public void customClusterName() throws Exception {
     }
 
     @Test
-    public void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
+    void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)) {
             pulsar.start();
 
@@ -68,7 +68,7 @@ public void shouldNotEnableFunctionsWorkerByDefault() throws Exception {
     }
 
     @Test
-    public void shouldWaitForFunctionsWorkerStarted() throws Exception {
+    void shouldWaitForFunctionsWorkerStarted() throws Exception {
         try (
             // constructorWithFunctionsWorker {
             PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:3.0.0"))
@@ -84,7 +84,7 @@ public void shouldWaitForFunctionsWorkerStarted() throws Exception {
     }
 
     @Test
-    public void testTransactions() throws Exception {
+    void testTransactions() throws Exception {
         try (
             // constructorWithTransactions {
             PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withTransactions();
@@ -100,7 +100,7 @@ public void testTransactions() throws Exception {
     }
 
     @Test
-    public void testTransactionsAndFunctionsWorker() throws Exception {
+    void testTransactionsAndFunctionsWorker() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withTransactions().withFunctionsWorker()) {
             pulsar.start();
 
@@ -113,7 +113,7 @@ public void testTransactionsAndFunctionsWorker() throws Exception {
     }
 
     @Test
-    public void testClusterFullyInitialized() throws Exception {
+    void testClusterFullyInitialized() throws Exception {
         try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE)) {
             pulsar.start();
 
@@ -124,7 +124,7 @@ public void testClusterFullyInitialized() throws Exception {
     }
 
     @Test
-    public void testStartupTimeoutIsHonored() {
+    void testStartupTimeoutIsHonored() {
         try (PulsarContainer pulsar = new PulsarContainer(PULSAR_IMAGE).withStartupTimeout(Duration.ZERO)) {
             assertThatThrownBy(pulsar::start)
                 .hasRootCauseMessage("Precondition failed: timeout must be greater than zero");

From 8822b9187995977ba78b93738a7d7be5fde9d23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 12:51:52 -0600
Subject: [PATCH 4547/4969] Move Qdrant tests to JUnit Jupiter (#10760)

---
 modules/qdrant/build.gradle                            |  7 +++++++
 .../org/testcontainers/qdrant/QdrantContainerTest.java | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 0507698069a..4148f09d50a 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,6 +3,9 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.qdrant:client:1.15.0'
     testImplementation platform('io.grpc:grpc-bom:1.73.0')
@@ -10,3 +13,7 @@ dependencies {
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java b/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
index d313a873d26..724edf8555c 100644
--- a/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
+++ b/modules/qdrant/src/test/java/org/testcontainers/qdrant/QdrantContainerTest.java
@@ -3,7 +3,7 @@
 import io.qdrant.client.QdrantClient;
 import io.qdrant.client.QdrantGrpcClient;
 import io.qdrant.client.grpc.QdrantOuterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.images.builder.Transferable;
 
 import java.util.UUID;
@@ -12,10 +12,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class QdrantContainerTest {
+class QdrantContainerTest {
 
     @Test
-    public void shouldReturnVersion() throws ExecutionException, InterruptedException {
+    void shouldReturnVersion() throws ExecutionException, InterruptedException {
         try (
             // qdrantContainer {
             QdrantContainer qdrant = new QdrantContainer("qdrant/qdrant:v1.7.4")
@@ -34,7 +34,7 @@ public void shouldReturnVersion() throws ExecutionException, InterruptedExceptio
     }
 
     @Test
-    public void shouldSetApiKey() throws ExecutionException, InterruptedException {
+    void shouldSetApiKey() throws ExecutionException, InterruptedException {
         String apiKey = UUID.randomUUID().toString();
         try (QdrantContainer qdrant = new QdrantContainer("qdrant/qdrant:v1.7.4").withApiKey(apiKey)) {
             qdrant.start();
@@ -59,7 +59,7 @@ public void shouldSetApiKey() throws ExecutionException, InterruptedException {
     }
 
     @Test
-    public void shouldSetApiKeyUsingConfigFile() throws ExecutionException, InterruptedException {
+    void shouldSetApiKeyUsingConfigFile() throws ExecutionException, InterruptedException {
         String apiKey = UUID.randomUUID().toString();
         String configFile = "service:\n    api_key: " + apiKey;
         try (

From d697dae5f4e7da039f747abf277f22c2020ae7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 14:15:17 -0600
Subject: [PATCH 4548/4969] Move Redpanda tests to JUnit Jupiter (#10762)

---
 modules/redpanda/build.gradle                 |  8 +++++
 .../redpanda/CompatibleImageTest.java         | 22 ++++---------
 .../redpanda/RedpandaContainerTest.java       | 32 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index ec254add76f..d930155291e 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,8 +4,16 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.34'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
index 478d6e7efbc..1167642615f 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
@@ -1,26 +1,18 @@
 package org.testcontainers.redpanda;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
-public class CompatibleImageTest extends AbstractRedpanda {
+class CompatibleImageTest extends AbstractRedpanda {
 
-    private final String image;
-
-    public CompatibleImageTest(String image) {
-        this.image = image;
-    }
-
-    @Parameterized.Parameters(name = "{0}")
     public static String[] image() {
         return new String[] { "docker.redpanda.com/redpandadata/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" };
     }
 
-    @Test
-    public void shouldProduceAndConsumeMessage() throws Exception {
-        try (RedpandaContainer container = new RedpandaContainer(this.image)) {
+    @ParameterizedTest
+    @MethodSource("image")
+    void shouldProduceAndConsumeMessage(String image) throws Exception {
+        try (RedpandaContainer container = new RedpandaContainer(image)) {
             container.start();
             testKafkaFunctionality(container.getBootstrapServers());
         }
diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
index d07f33d8b00..6d1f35da0f2 100644
--- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
+++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
@@ -12,7 +12,7 @@
 import org.apache.kafka.common.errors.SaslAuthenticationException;
 import org.apache.kafka.common.errors.TopicAuthorizationException;
 import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.SocatContainer;
@@ -30,14 +30,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class RedpandaContainerTest extends AbstractRedpanda {
+class RedpandaContainerTest extends AbstractRedpanda {
 
     private static final String REDPANDA_IMAGE = "docker.redpanda.com/redpandadata/redpanda:v22.2.1";
 
     private static final DockerImageName REDPANDA_DOCKER_IMAGE = DockerImageName.parse(REDPANDA_IMAGE);
 
     @Test
-    public void testUsage() throws Exception {
+    void testUsage() throws Exception {
         try (RedpandaContainer container = new RedpandaContainer(REDPANDA_DOCKER_IMAGE)) {
             container.start();
             testKafkaFunctionality(container.getBootstrapServers());
@@ -45,7 +45,7 @@ public void testUsage() throws Exception {
     }
 
     @Test
-    public void testUsageWithStringImage() throws Exception {
+    void testUsageWithStringImage() throws Exception {
         try (
             // constructorWithVersion {
             RedpandaContainer container = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.2")
@@ -61,21 +61,21 @@ public void testUsageWithStringImage() throws Exception {
     }
 
     @Test
-    public void testNotCompatibleVersion() {
+    void testNotCompatibleVersion() {
         assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v21.11.19"))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessageContaining("Redpanda version must be >= v22.2.1");
     }
 
     @Test
-    public void redpandadataRedpandaImageVersion2221ShouldNotBeCompatible() {
+    void redpandadataRedpandaImageVersion2221ShouldNotBeCompatible() {
         assertThatThrownBy(() -> new RedpandaContainer("redpandadata/redpanda:v21.11.19"))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessageContaining("Redpanda version must be >= v22.2.1");
     }
 
     @Test
-    public void testSchemaRegistry() {
+    void testSchemaRegistry() {
         try (RedpandaContainer container = new RedpandaContainer(REDPANDA_DOCKER_IMAGE)) {
             container.start();
 
@@ -105,7 +105,7 @@ public void testSchemaRegistry() {
     }
 
     @Test
-    public void testUsageWithListener() throws Exception {
+    void testUsageWithListener() throws Exception {
         try (
             Network network = Network.newNetwork();
             RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
@@ -132,7 +132,7 @@ public void testUsageWithListener() throws Exception {
     }
 
     @Test
-    public void testUsageWithListenerInTheSameNetwork() throws Exception {
+    void testUsageWithListenerInTheSameNetwork() throws Exception {
         try (
             Network network = Network.newNetwork();
             // registerListener {
@@ -165,7 +165,7 @@ public void testUsageWithListenerInTheSameNetwork() throws Exception {
     }
 
     @Test
-    public void testUsageWithListenerFromProxy() throws Exception {
+    void testUsageWithListenerFromProxy() throws Exception {
         try (
             Network network = Network.newNetwork();
             // createProxy {
@@ -187,7 +187,7 @@ public void testUsageWithListenerFromProxy() throws Exception {
     }
 
     @Test
-    public void testUsageWithListenerAndSasl() throws Exception {
+    void testUsageWithListenerAndSasl() throws Exception {
         final String username = "panda";
         final String password = "pandapass";
         final String algorithm = "SCRAM-SHA-256";
@@ -266,7 +266,7 @@ public void testUsageWithListenerAndSasl() throws Exception {
 
     @SneakyThrows
     @Test
-    public void enableSaslWithSuccessfulTopicCreation() {
+    void enableSaslWithSuccessfulTopicCreation() {
         try (
             // security {
             RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
@@ -289,7 +289,7 @@ public void enableSaslWithSuccessfulTopicCreation() {
     }
 
     @Test
-    public void enableSaslWithUnsuccessfulTopicCreation() {
+    void enableSaslWithUnsuccessfulTopicCreation() {
         try (
             RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
                 .enableAuthorization()
@@ -313,7 +313,7 @@ public void enableSaslWithUnsuccessfulTopicCreation() {
     }
 
     @Test
-    public void enableSaslAndWithAuthenticationError() {
+    void enableSaslAndWithAuthenticationError() {
         try (
             RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
                 .enableAuthorization()
@@ -335,7 +335,7 @@ public void enableSaslAndWithAuthenticationError() {
     }
 
     @Test
-    public void schemaRegistryWithHttpBasic() {
+    void schemaRegistryWithHttpBasic() {
         try (
             RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")
                 .enableSchemaRegistryHttpBasicAuth()
@@ -362,7 +362,7 @@ public void schemaRegistryWithHttpBasic() {
 
     @SneakyThrows
     @Test
-    public void testRestProxy() {
+    void testRestProxy() {
         try (RedpandaContainer redpanda = new RedpandaContainer("docker.redpanda.com/redpandadata/redpanda:v23.1.7")) {
             redpanda.start();
 

From dc008e3e4532df2305795eb870bf4033c99438b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 14:26:56 -0600
Subject: [PATCH 4549/4969] Move RabbitMQ tests to JUnit Jupiter (#10761)

---
 modules/rabbitmq/build.gradle                 |  8 ++++++
 ...RabbitMQContainerJUnitIntegrationTest.java | 20 --------------
 .../containers/RabbitMQContainerTest.java     | 26 +++++++++----------
 3 files changed, 21 insertions(+), 33 deletions(-)
 delete mode 100644 modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 0b6d8f90487..7e9b2587709 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -2,6 +2,10 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
+
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     compileOnly 'org.jetbrains:annotations:26.0.2'
@@ -12,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.RabbitMQContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
deleted file mode 100644
index e04ab616e66..00000000000
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerJUnitIntegrationTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.testcontainers.containers;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Test for basic functionality when used as a <code>@ClassRule</code>.
- */
-public class RabbitMQContainerJUnitIntegrationTest {
-
-    @ClassRule
-    public static RabbitMQContainer rabbitMQContainer = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE);
-
-    @Test
-    public void shouldStart() {
-        assertThat(rabbitMQContainer.isRunning()).isTrue();
-    }
-}
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 728b2622b17..2893e812f09 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -6,7 +6,7 @@
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.DeliverCallback;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.RabbitMQContainer.SslVerification;
 import org.testcontainers.utility.MountableFile;
 
@@ -30,7 +30,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
-public class RabbitMQContainerTest {
+class RabbitMQContainerTest {
 
     public static final int DEFAULT_AMQPS_PORT = 5671;
 
@@ -41,7 +41,7 @@ public class RabbitMQContainerTest {
     public static final int DEFAULT_HTTP_PORT = 15672;
 
     @Test
-    public void shouldCreateRabbitMQContainer() {
+    void shouldCreateRabbitMQContainer() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.start();
 
@@ -70,7 +70,7 @@ public void shouldCreateRabbitMQContainer() {
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithCustomCredentials() {
+    void shouldCreateRabbitMQContainerWithCustomCredentials() {
         try (
             RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)
                 .withAdminUser("admin")
@@ -86,7 +86,7 @@ public void shouldCreateRabbitMQContainerWithCustomCredentials() {
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException {
+    void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withExchange("test-exchange", "direct");
 
@@ -98,7 +98,7 @@ public void shouldCreateRabbitMQContainerWithExchange() throws IOException, Inte
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOException, InterruptedException {
+    void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withVhost("test-vhost");
             container.withExchange(
@@ -119,7 +119,7 @@ public void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOExceptio
     }
 
     @Test
-    public void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException {
+    void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container
                 .withQueue("queue-one")
@@ -135,7 +135,7 @@ public void shouldCreateRabbitMQContainerWithQueues() throws IOException, Interr
     }
 
     @Test
-    public void shouldMountConfigurationFile() {
+    void shouldMountConfigurationFile() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
@@ -145,7 +145,7 @@ public void shouldMountConfigurationFile() {
     }
 
     @Test
-    public void shouldMountConfigurationFileErlang() {
+    void shouldMountConfigurationFileErlang() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
             container.start();
@@ -155,7 +155,7 @@ public void shouldMountConfigurationFileErlang() {
     }
 
     @Test
-    public void shouldMountConfigurationFileSysctl() {
+    void shouldMountConfigurationFileSysctl() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
@@ -165,7 +165,7 @@ public void shouldMountConfigurationFileSysctl() {
     }
 
     @Test
-    public void shouldStartTheWholeEnchilada() throws IOException, InterruptedException {
+    void shouldStartTheWholeEnchilada() throws IOException, InterruptedException {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container
                 .withVhost("vhost1")
@@ -240,7 +240,7 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
     }
 
     @Test
-    public void shouldThrowExceptionForDodgyJson() {
+    void shouldThrowExceptionForDodgyJson() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             assertThatCode(() -> container.withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", container))
                 )
@@ -249,7 +249,7 @@ public void shouldThrowExceptionForDodgyJson() {
     }
 
     @Test
-    public void shouldWorkWithSSL() {
+    void shouldWorkWithSSL() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
             container.withSSL(
                 MountableFile.forClasspathResource("/certs/server_key.pem", 0644),

From 7593a30391e8e5b8e4a3c95a8d6fc0dffa260720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 15:00:58 -0600
Subject: [PATCH 4550/4969] Move ScyllaDB tests to JUnit Jupiter (#10763)

---
 modules/scylladb/build.gradle                    |  7 +++++++
 .../scylladb/ScyllaDBContainerTest.java          | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index 7aa6376fd54..b0551714a3a 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -3,7 +3,14 @@ description = "Testcontainers :: ScyllaDB"
 dependencies {
     api project(":testcontainers")
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'software.amazon.awssdk:dynamodb:2.32.30'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java b/modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java
index d151424fd20..d500aa74868 100644
--- a/modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java
+++ b/modules/scylladb/src/test/java/org/testcontainers/scylladb/ScyllaDBContainerTest.java
@@ -2,7 +2,7 @@
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.Container;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -35,14 +35,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class ScyllaDBContainerTest {
+class ScyllaDBContainerTest {
 
     private static final DockerImageName SCYLLADB_IMAGE = DockerImageName.parse("scylladb/scylla:6.2");
 
     private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
 
     @Test
-    public void testSimple() {
+    void testSimple() {
         try ( // container {
             ScyllaDBContainer scylladb = new ScyllaDBContainer("scylladb/scylla:6.2")
             // }
@@ -63,7 +63,7 @@ public void testSimple() {
     }
 
     @Test
-    public void testSimpleSsl()
+    void testSimpleSsl()
         throws NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException, UnrecoverableKeyException, KeyManagementException {
         try (
             // customConfiguration {
@@ -121,7 +121,7 @@ public void testSimpleSsl()
     }
 
     @Test
-    public void testSimpleSslCqlsh() throws IllegalStateException, InterruptedException, IOException {
+    void testSimpleSslCqlsh() throws IllegalStateException, InterruptedException, IOException {
         try (
             ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)
                 .withConfigurationOverride("scylla-test-ssl")
@@ -144,7 +144,7 @@ public void testSimpleSslCqlsh() throws IllegalStateException, InterruptedExcept
     }
 
     @Test
-    public void testShardAwareness() {
+    void testShardAwareness() {
         try (ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)) {
             scylladb.start();
             // shardAwarenessSession {
@@ -161,7 +161,7 @@ public void testShardAwareness() {
     }
 
     @Test
-    public void testAlternator() {
+    void testAlternator() {
         try ( // alternator {
             ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE).withAlternator()
             // }
@@ -192,7 +192,7 @@ public void testAlternator() {
     }
 
     @Test
-    public void throwExceptionWhenAlternatorDisabled() {
+    void throwExceptionWhenAlternatorDisabled() {
         try (ScyllaDBContainer scylladb = new ScyllaDBContainer(SCYLLADB_IMAGE)) {
             scylladb.start();
             assertThatThrownBy(scylladb::getAlternatorEndpoint)

From 64ccba8c7e842278f536fde0f2cf1b60ad498fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 16:16:05 -0600
Subject: [PATCH 4551/4969] Move Solace tests to JUnit Jupiter (#10764)

---
 modules/solace/build.gradle                            |  7 +++++++
 .../testcontainers/solace/SolaceContainerAMQPTest.java |  6 +++---
 .../testcontainers/solace/SolaceContainerMQTTTest.java |  6 +++---
 .../testcontainers/solace/SolaceContainerRESTTest.java |  6 +++---
 .../testcontainers/solace/SolaceContainerSMFTest.java  | 10 +++++-----
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 5e023b07a67..8dd48e68f28 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,6 +5,9 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.solacesystems:sol-jcsmp:10.27.3'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
@@ -12,3 +15,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'
 
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
index f7266fe8212..bb32b8abb57 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
@@ -2,7 +2,7 @@
 
 import org.apache.qpid.jms.JmsConnectionFactory;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +20,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerAMQPTest {
+class SolaceContainerAMQPTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerAMQPTest.class);
 
@@ -29,7 +29,7 @@ public class SolaceContainerAMQPTest {
     private static final String TOPIC_NAME = "Topic/ActualTopic";
 
     @Test
-    public void testSolaceContainer() throws JMSException {
+    void testSolaceContainer() throws JMSException {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.AMQP)
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
index 07c08d32416..a9990ab24f0 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
@@ -7,7 +7,7 @@
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerMQTTTest {
+class SolaceContainerMQTTTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerMQTTTest.class);
 
@@ -25,7 +25,7 @@ public class SolaceContainerMQTTTest {
     private static final String TOPIC_NAME = "Topic/ActualTopic";
 
     @Test
-    public void testSolaceContainer() {
+    void testSolaceContainer() {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.MQTT)
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
index 7f54cec3f74..b23c24aa65d 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
@@ -13,20 +13,20 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerRESTTest {
+class SolaceContainerRESTTest {
 
     private static final String MESSAGE = "HelloWorld";
 
     private static final String TOPIC_NAME = "Topic/ActualTopic";
 
     @Test
-    public void testSolaceContainer() throws IOException {
+    void testSolaceContainer() throws IOException {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.REST)
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
index d7e0e8ea981..1036e8efb0a 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -15,7 +15,7 @@
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.utility.MountableFile;
@@ -25,7 +25,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerSMFTest {
+class SolaceContainerSMFTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerSMFTest.class);
 
@@ -36,7 +36,7 @@ public class SolaceContainerSMFTest {
     private static final Queue QUEUE = JCSMPFactory.onlyInstance().createQueue("Queue");
 
     @Test
-    public void testSolaceContainerWithSimpleAuthentication() {
+    void testSolaceContainerWithSimpleAuthentication() {
         try (
             // solaceContainerSetup {
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
@@ -54,7 +54,7 @@ public void testSolaceContainerWithSimpleAuthentication() {
     }
 
     @Test
-    public void testSolaceContainerWithCreateFlow() {
+    void testSolaceContainerWithCreateFlow() {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withCredentials("user", "pass")
@@ -87,7 +87,7 @@ private static void testCreateFlow(JCSMPSession session) {
     }
 
     @Test
-    public void testSolaceContainerWithCertificates() {
+    void testSolaceContainerWithCertificates() {
         try (
             // solaceContainerUsageSSL {
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")

From 69b368954748439b57ac4b10182030ebd8bce743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 16:41:58 -0600
Subject: [PATCH 4552/4969] Move Solace assertions to assertj (#10765)

---
 .../org/testcontainers/solace/SolaceContainerAMQPTest.java    | 4 ++--
 .../org/testcontainers/solace/SolaceContainerMQTTTest.java    | 4 ++--
 .../org/testcontainers/solace/SolaceContainerRESTTest.java    | 4 ++--
 .../org/testcontainers/solace/SolaceContainerSMFTest.java     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
index bb32b8abb57..e120534559b 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.solace;
 
 import org.apache.qpid.jms.JmsConnectionFactory;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +18,7 @@
 import javax.jms.Topic;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 class SolaceContainerAMQPTest {
 
@@ -57,7 +57,7 @@ private static Session createSession(String username, String password, String ho
             connection.start();
             return session;
         } catch (Exception e) {
-            Assert.fail("Error connecting and setting up session! " + e.getMessage());
+            fail("Error connecting and setting up session! " + e.getMessage());
             return null;
         }
     }
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
index a9990ab24f0..652f216f6d2 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
@@ -6,7 +6,6 @@
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,6 +14,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 class SolaceContainerMQTTTest {
 
@@ -52,7 +52,7 @@ private static MqttClient createClient(String username, String password, String
             mqttClient.connect(connOpts);
             return mqttClient;
         } catch (Exception e) {
-            Assert.fail("Error connecting and setting up session! " + e.getMessage());
+            fail("Error connecting and setting up session! " + e.getMessage());
             return null;
         }
     }
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
index b23c24aa65d..3d6914027c1 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
@@ -12,12 +12,12 @@
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 class SolaceContainerRESTTest {
 
@@ -44,7 +44,7 @@ private void testPublishMessageToSolace(SolaceContainer solaceContainer, Service
         request.addHeader(HttpHeaders.CONTENT_TYPE, "text/plain");
         HttpResponse response = client.execute(request);
         if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-            Assert.fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
+            fail("Cannot send message to solace - " + EntityUtils.toString(response.getEntity()));
         }
         assertThat(EntityUtils.toString(response.getEntity())).isEmpty();
     }
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
index 1036e8efb0a..f4d73ea08f0 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -14,7 +14,6 @@
 import com.solacesystems.jcsmp.XMLMessageConsumer;
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,6 +23,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 class SolaceContainerSMFTest {
 
@@ -145,7 +145,7 @@ private static JCSMPSession createSession(JCSMPProperties properties) {
             session.connect();
             return session;
         } catch (Exception e) {
-            Assert.fail("Error connecting and setting up session! " + e.getMessage());
+            fail("Error connecting and setting up session! " + e.getMessage());
             return null;
         }
     }

From f37f2633d1f1d990876c85782a3cddb2755960ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 17:13:15 -0600
Subject: [PATCH 4553/4969] Move Solr tests to JUnit Jupiter (#10766)

---
 modules/solr/build.gradle                     |  8 +++++
 .../containers/SolrContainerTest.java         | 35 +++++++++----------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index d2cdc0083eb..30fc1d9b833 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -5,6 +5,10 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation 'org.apache.solr:solr-solrj:8.11.4'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
@@ -14,3 +18,7 @@ tasks.japicmp {
         "org.testcontainers.containers.SolrContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
index f678155b3c1..0e463d11111 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
@@ -4,38 +4,33 @@
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.response.SolrPingResponse;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
 public class SolrContainerTest {
 
-    @Parameterized.Parameters(name = "{0}")
+    private SolrClient client = null;
+
     public static String[] getVersionsToTest() {
         return new String[] { "solr:8.11.4", "solr:9.8.0" };
     }
 
-    @Parameterized.Parameter
-    public String solrImage;
-
-    private SolrClient client = null;
-
-    @After
-    public void stopRestClient() throws IOException {
+    @AfterEach
+    void stopRestClient() throws IOException {
         if (client != null) {
             client.close();
             client = null;
         }
     }
 
-    @Test
-    public void solrCloudTest() throws IOException, SolrServerException {
+    @ParameterizedTest
+    @MethodSource("getVersionsToTest")
+    void solrCloudTest(String solrImage) throws IOException, SolrServerException {
         try (SolrContainer container = new SolrContainer(solrImage)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
@@ -44,8 +39,9 @@ public void solrCloudTest() throws IOException, SolrServerException {
         }
     }
 
-    @Test
-    public void solrStandaloneTest() throws IOException, SolrServerException {
+    @ParameterizedTest
+    @MethodSource("getVersionsToTest")
+    void solrStandaloneTest(String solrImage) throws IOException, SolrServerException {
         try (SolrContainer container = new SolrContainer(solrImage).withZookeeper(false)) {
             container.start();
             SolrPingResponse response = getClient(container).ping("dummy");
@@ -54,8 +50,9 @@ public void solrStandaloneTest() throws IOException, SolrServerException {
         }
     }
 
-    @Test
-    public void solrCloudPingTest() throws IOException, SolrServerException {
+    @ParameterizedTest
+    @MethodSource("getVersionsToTest")
+    void solrCloudPingTest(String solrImage) throws IOException, SolrServerException {
         // solrContainerUsage {
         // Create the solr container.
         SolrContainer container = new SolrContainer(solrImage);

From 13d688b352c5731cd75f8abf3167593b2c949ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 4 Sep 2025 17:39:36 -0600
Subject: [PATCH 4554/4969] Move Typesense assertions to assertj (#10767)

---
 modules/typesense/build.gradle                            | 7 +++++++
 .../testcontainers/typesense/TypesenseContainerTest.java  | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
index 41bb4322a9a..ded834121f0 100644
--- a/modules/typesense/build.gradle
+++ b/modules/typesense/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: Typesense"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.typesense:typesense-java:1.3.0'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java b/modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java
index 8f39a05dd33..f833814a077 100644
--- a/modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java
+++ b/modules/typesense/src/test/java/org/testcontainers/typesense/TypesenseContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.typesense;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.typesense.api.Client;
 import org.typesense.api.Configuration;
 import org.typesense.resources.Node;
@@ -11,10 +11,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TypesenseContainerTest {
+class TypesenseContainerTest {
 
     @Test
-    public void query() throws Exception {
+    void query() throws Exception {
         try ( // container {
             TypesenseContainer typesense = new TypesenseContainer("typesense/typesense:27.1")
             // }
@@ -33,7 +33,7 @@ public void query() throws Exception {
     }
 
     @Test
-    public void withCustomApiKey() throws Exception {
+    void withCustomApiKey() throws Exception {
         try (TypesenseContainer typesense = new TypesenseContainer("typesense/typesense:27.1").withApiKey("s3cr3t")) {
             typesense.start();
             List<Node> nodes = Collections.singletonList(

From 65255671b4395d145d293b15618cf1d83c6a225a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 5 Sep 2025 11:11:21 -0600
Subject: [PATCH 4555/4969] Move Vault tests to JUnit Jupiter (#10768)

---
 modules/vault/build.gradle                    |  7 ++++
 .../testcontainers/vault/VaultClientTest.java |  6 ++--
 .../vault/VaultContainerTest.java             | 34 ++++++++++++-------
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 84d02ebfa9a..f492962b964 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,8 +3,15 @@ description = "Testcontainers :: Vault"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
index eebf73a5e62..92f4a6632b9 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultClientTest.java
@@ -4,19 +4,19 @@
 import com.bettercloud.vault.VaultConfig;
 import com.bettercloud.vault.VaultException;
 import com.bettercloud.vault.response.LogicalResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class VaultClientTest {
+class VaultClientTest {
 
     private static final String VAULT_TOKEN = "my-root-token";
 
     @Test
-    public void writeAndReadMultipleValues() throws VaultException {
+    void writeAndReadMultipleValues() throws VaultException {
         try (VaultContainer<?> vaultContainer = new VaultContainer<>("vault:1.1.3").withVaultToken(VAULT_TOKEN)) {
             vaultContainer.start();
 
diff --git a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
index fe578bfe83b..cc2d8b37d73 100644
--- a/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
+++ b/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java
@@ -4,8 +4,9 @@
 import com.bettercloud.vault.VaultConfig;
 import com.bettercloud.vault.response.LogicalResponse;
 import io.restassured.response.Response;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 import java.util.HashMap;
@@ -18,11 +19,10 @@
  * This test shows the pattern to use the VaultContainer @ClassRule for a junit test. It also has tests that ensure
  * the secrets were added correctly by reading from Vault with the CLI, over HTTP and over Client Library.
  */
-public class VaultContainerTest {
+class VaultContainerTest {
 
     private static final String VAULT_TOKEN = "my-root-token";
 
-    @ClassRule
     // vaultContainer {
     public static VaultContainer<?> vaultContainer = new VaultContainer<>("hashicorp/vault:1.13")
         .withVaultToken(VAULT_TOKEN)
@@ -35,8 +35,18 @@ public class VaultContainerTest {
 
     // }
 
+    @BeforeAll
+    static void setUp() {
+        vaultContainer.start();
+    }
+
+    @AfterAll
+    static void tearDown() {
+        vaultContainer.stop();
+    }
+
     @Test
-    public void readFirstSecretPathWithCli() throws Exception {
+    void readFirstSecretPathWithCli() throws Exception {
         GenericContainer.ExecResult result = vaultContainer.execInContainer(
             "vault",
             "kv",
@@ -48,7 +58,7 @@ public void readFirstSecretPathWithCli() throws Exception {
     }
 
     @Test
-    public void readSecondSecretPathWithCli() throws Exception {
+    void readSecondSecretPathWithCli() throws Exception {
         GenericContainer.ExecResult result = vaultContainer.execInContainer(
             "vault",
             "kv",
@@ -66,7 +76,7 @@ public void readSecondSecretPathWithCli() throws Exception {
     }
 
     @Test
-    public void readFirstSecretPathOverHttpApi() {
+    void readFirstSecretPathOverHttpApi() {
         Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
@@ -76,7 +86,7 @@ public void readFirstSecretPathOverHttpApi() {
     }
 
     @Test
-    public void readSecondSecretPathOverHttpApi() throws InterruptedException {
+    void readSecondSecretPathOverHttpApi() throws InterruptedException {
         Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
@@ -90,7 +100,7 @@ public void readSecondSecretPathOverHttpApi() throws InterruptedException {
     }
 
     @Test
-    public void readTransitKeyOverHttpApi() throws InterruptedException {
+    void readTransitKeyOverHttpApi() throws InterruptedException {
         Response response = given()
             .header("X-Vault-Token", VAULT_TOKEN)
             .when()
@@ -102,7 +112,7 @@ public void readTransitKeyOverHttpApi() throws InterruptedException {
 
     @Test
     // readWithLibrary {
-    public void readFirstSecretPathOverClientLibrary() throws Exception {
+    void readFirstSecretPathOverClientLibrary() throws Exception {
         final VaultConfig config = new VaultConfig()
             .address(vaultContainer.getHttpHostAddress())
             .token(VAULT_TOKEN)
@@ -118,7 +128,7 @@ public void readFirstSecretPathOverClientLibrary() throws Exception {
     // }
 
     @Test
-    public void readSecondSecretPathOverClientLibrary() throws Exception {
+    void readSecondSecretPathOverClientLibrary() throws Exception {
         final VaultConfig config = new VaultConfig()
             .address(vaultContainer.getHttpHostAddress())
             .token(VAULT_TOKEN)
@@ -135,7 +145,7 @@ public void readSecondSecretPathOverClientLibrary() throws Exception {
     }
 
     @Test
-    public void writeSecretOverClientLibrary() throws Exception {
+    void writeSecretOverClientLibrary() throws Exception {
         final VaultConfig config = new VaultConfig()
             .address(vaultContainer.getHttpHostAddress())
             .token(VAULT_TOKEN)

From 33018cfd3926ec94699d9f45b477940d7e2eeccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 5 Sep 2025 13:01:28 -0600
Subject: [PATCH 4556/4969] Move Weaviate tests to JUnit Jupiter (#10769)

---
 modules/weaviate/build.gradle                             | 7 +++++++
 .../testcontainers/weaviate/WeaviateContainerTest.java    | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 6c0140a64d1..04235749e3b 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.weaviate:client:5.4.0'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index 535b81126fd..9a1ad47d5af 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -5,7 +5,7 @@
 import io.weaviate.client.base.Result;
 import io.weaviate.client.v1.misc.model.Meta;
 import org.assertj.core.api.InstanceOfAssertFactories;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -14,10 +14,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class WeaviateContainerTest {
+class WeaviateContainerTest {
 
     @Test
-    public void testWeaviate() {
+    void testWeaviate() {
         try ( // container {
             WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.29.0")
             // }
@@ -32,7 +32,7 @@ public void testWeaviate() {
     }
 
     @Test
-    public void testWeaviateWithModules() {
+    void testWeaviateWithModules() {
         List<String> enableModules = Arrays.asList(
             "backup-filesystem",
             "text2vec-openai",

From 60309387e1c180540aea628ae04383cc88d3b1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 5 Sep 2025 14:02:59 -0600
Subject: [PATCH 4557/4969] Move JDBC tests to JUnit Jupiter (#10770)

---
 modules/jdbc/build.gradle                     |   7 +
 .../containers/JdbcDatabaseContainerTest.java |   6 +-
 .../jdbc/ConnectionUrlDriversTests.java       | 219 +++++++++---------
 .../jdbc/ConnectionUrlTest.java               |  33 ++-
 .../jdbc/ContainerDatabaseDriverTest.java     |  21 +-
 .../jdbc/JdbcDatabaseDelegateTest.java        |  10 +-
 .../jdbc/MissingJdbcDriverTest.java           |   6 +-
 7 files changed, 150 insertions(+), 152 deletions(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 30d2cb539c4..f1deb59c41d 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -3,6 +3,9 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':testcontainers-database-commons')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
@@ -13,3 +16,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
index 1dc6646bd17..ca41c3f5d1c 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers;
 
 import lombok.NonNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 
 import java.sql.Connection;
@@ -10,10 +10,10 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.mock;
 
-public class JdbcDatabaseContainerTest {
+class JdbcDatabaseContainerTest {
 
     @Test
-    public void anExceptionIsThrownIfJdbcIsNotAvailable() {
+    void anExceptionIsThrownIfJdbcIsNotAvailable() {
         JdbcDatabaseContainer<?> jdbcContainer = new JdbcDatabaseContainerStub("mysql:latest")
             .withStartupTimeoutSeconds(1);
 
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index 394451bc6a9..5797ee0083c 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -1,127 +1,126 @@
 package org.testcontainers.jdbc;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.Arrays;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * This Test class validates that all supported JDBC URL's can be parsed by ConnectionUrl class.
  */
-@RunWith(Parameterized.class)
-public class ConnectionUrlDriversTests {
+class ConnectionUrlDriversTests {
 
-    @Parameter
-    public String jdbcUrl;
-
-    @Parameter(1)
-    public String databaseType;
-
-    @Parameter(2)
-    public Optional<String> tag;
-
-    @Parameter(3)
-    public String dbHostString;
-
-    @Parameter(4)
-    public String databaseName;
-
-    @Parameterized.Parameters(name = "{index} - {0}")
-    public static Iterable<Object[]> data() {
-        return Arrays.asList(
-            new Object[][] {
-                { "jdbc:tc:mysql:8.0.36://hostname/test", "mysql", Optional.of("8.0.36"), "hostname/test", "test" },
-                { "jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test" },
-                {
-                    "jdbc:tc:postgresql:1.2.3://hostname/test",
-                    "postgresql",
-                    Optional.of("1.2.3"),
-                    "hostname/test",
-                    "test",
-                },
-                { "jdbc:tc:postgresql://hostname/test", "postgresql", Optional.empty(), "hostname/test", "test" },
-                {
-                    "jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test",
-                    "sqlserver",
-                    Optional.of("1.2.3"),
-                    "localhost;instance=SQLEXPRESS:1433;databaseName=test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test",
-                    "sqlserver",
-                    Optional.empty(),
-                    "localhost;instance=SQLEXPRESS:1433;databaseName=test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:mariadb:1.2.3://localhost:3306/test",
-                    "mariadb",
-                    Optional.of("1.2.3"),
-                    "localhost:3306/test",
-                    "test",
-                },
-                { "jdbc:tc:mariadb://localhost:3306/test", "mariadb", Optional.empty(), "localhost:3306/test", "test" },
-                {
-                    "jdbc:tc:oracle:1.2.3:thin://@localhost:1521/test",
-                    "oracle",
-                    Optional.of("1.2.3"),
-                    "localhost:1521/test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:oracle:1.2.3:thin:@localhost:1521/test",
-                    "oracle",
-                    Optional.of("1.2.3"),
-                    "localhost:1521/test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:oracle:thin:@localhost:1521/test",
-                    "oracle",
-                    Optional.empty(),
-                    "localhost:1521/test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:oracle:1.2.3:thin:@localhost:1521:test",
-                    "oracle",
-                    Optional.of("1.2.3"),
-                    "localhost:1521:test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:oracle:1.2.3:thin://@localhost:1521:test",
-                    "oracle",
-                    Optional.of("1.2.3"),
-                    "localhost:1521:test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:oracle:1.2.3-anything:thin://@localhost:1521:test",
-                    "oracle",
-                    Optional.of("1.2.3-anything"),
-                    "localhost:1521:test",
-                    "test",
-                },
-                {
-                    "jdbc:tc:oracle:thin:@localhost:1521:test",
-                    "oracle",
-                    Optional.empty(),
-                    "localhost:1521:test",
-                    "test",
-                },
-            }
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.arguments(
+                "jdbc:tc:mysql:8.0.36://hostname/test",
+                "mysql",
+                Optional.of("8.0.36"),
+                "hostname/test",
+                "test"
+            ),
+            Arguments.arguments("jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test"),
+            Arguments.arguments(
+                "jdbc:tc:postgresql:1.2.3://hostname/test",
+                "postgresql",
+                Optional.of("1.2.3"),
+                "hostname/test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:postgresql://hostname/test",
+                "postgresql",
+                Optional.empty(),
+                "hostname/test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                "sqlserver",
+                Optional.of("1.2.3"),
+                "localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                "sqlserver",
+                Optional.empty(),
+                "localhost;instance=SQLEXPRESS:1433;databaseName=test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:mariadb:1.2.3://localhost:3306/test",
+                "mariadb",
+                Optional.of("1.2.3"),
+                "localhost:3306/test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:mariadb://localhost:3306/test",
+                "mariadb",
+                Optional.empty(),
+                "localhost:3306/test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:oracle:1.2.3:thin://@localhost:1521/test",
+                "oracle",
+                Optional.of("1.2.3"),
+                "localhost:1521/test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:oracle:1.2.3:thin:@localhost:1521/test",
+                "oracle",
+                Optional.of("1.2.3"),
+                "localhost:1521/test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:oracle:thin:@localhost:1521/test",
+                "oracle",
+                Optional.empty(),
+                "localhost:1521/test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:oracle:1.2.3:thin:@localhost:1521:test",
+                "oracle",
+                Optional.of("1.2.3"),
+                "localhost:1521:test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:oracle:1.2.3:thin://@localhost:1521:test",
+                "oracle",
+                Optional.of("1.2.3"),
+                "localhost:1521:test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:oracle:1.2.3-anything:thin://@localhost:1521:test",
+                "oracle",
+                Optional.of("1.2.3-anything"),
+                "localhost:1521:test",
+                "test"
+            ),
+            Arguments.arguments(
+                "jdbc:tc:oracle:thin:@localhost:1521:test",
+                "oracle",
+                Optional.empty(),
+                "localhost:1521:test",
+                "test"
+            )
         );
     }
 
-    @Test
-    public void test() {
+    @ParameterizedTest(name = "{index} - {0}")
+    @MethodSource("data")
+    void test(String jdbcUrl, String databaseType, Optional<String> tag, String dbHostString, String databaseName) {
         ConnectionUrl url = ConnectionUrl.newInstance(jdbcUrl);
         assertThat(url.getDatabaseType()).as("Database Type is as expected").isEqualTo(databaseType);
         assertThat(url.getImageTag()).as("Image tag is as expected").isEqualTo(tag);
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index b6de810e06c..16abff74ec9 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -1,18 +1,14 @@
 package org.testcontainers.jdbc;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class ConnectionUrlTest {
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
+class ConnectionUrlTest {
 
     @Test
-    public void testConnectionUrl1() {
+    void testConnectionUrl1() {
         String urlString = "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
@@ -31,7 +27,7 @@ public void testConnectionUrl1() {
     }
 
     @Test
-    public void testConnectionUrl2() {
+    void testConnectionUrl2() {
         String urlString = "jdbc:tc:mysql://somehostname/databasename";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
@@ -49,13 +45,13 @@ public void testConnectionUrl2() {
     }
 
     @Test
-    public void testEmptyQueryParameter() {
+    void testEmptyQueryParameter() {
         ConnectionUrl url = ConnectionUrl.newInstance("jdbc:tc:mysql://somehostname/databasename?key=");
         assertThat(url.getQueryParameters().get("key")).as("'key' property value").isEqualTo("");
     }
 
     @Test
-    public void testTmpfsOption() {
+    void testTmpfsOption() {
         String urlString = "jdbc:tc:mysql://somehostname/databasename?TC_TMPFS=key:value,key1:value1";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
@@ -69,7 +65,7 @@ public void testTmpfsOption() {
     }
 
     @Test
-    public void testInitScriptPathCapture() {
+    void testInitScriptPathCapture() {
         String urlString =
             "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
@@ -83,13 +79,14 @@ public void testInitScriptPathCapture() {
             .containsEntry("TC_INITSCRIPT", "somepath/init_mysql.sql");
 
         //Parameter sets are unmodifiable
-        thrown.expect(UnsupportedOperationException.class);
-        url.getContainerParameters().remove("TC_INITSCRIPT");
-        url.getQueryParameters().remove("a");
+        assertThatThrownBy(() -> url.getContainerParameters().remove("TC_INITSCRIPT"))
+            .isInstanceOf(UnsupportedOperationException.class);
+        assertThatThrownBy(() -> url.getQueryParameters().remove("a"))
+            .isInstanceOf(UnsupportedOperationException.class);
     }
 
     @Test
-    public void testInitFunctionCapture() {
+    void testInitFunctionCapture() {
         String urlString =
             "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
@@ -105,7 +102,7 @@ public void testInitFunctionCapture() {
     }
 
     @Test
-    public void testDaemonCapture() {
+    void testDaemonCapture() {
         String urlString = "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_DAEMON=true";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
@@ -113,7 +110,7 @@ public void testDaemonCapture() {
     }
 
     @Test
-    public void testHostLessConnectionUrl() {
+    void testHostLessConnectionUrl() {
         String urlString = "jdbc:tc:mysql:8.0.36:///databasename?a=b&c=d";
         ConnectionUrl url = ConnectionUrl.newInstance(urlString);
 
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
index 4edd5d449ba..767258e19a1 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
@@ -1,9 +1,6 @@
 package org.testcontainers.jdbc;
 
-import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -11,25 +8,23 @@
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class ContainerDatabaseDriverTest {
+class ContainerDatabaseDriverTest {
 
     private static final String PLAIN_POSTGRESQL_JDBC_URL = "jdbc:postgresql://localhost:5432/test";
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
-    public void shouldNotTryToConnectToNonMatchingJdbcUrlDirectly() throws SQLException {
+    void shouldNotTryToConnectToNonMatchingJdbcUrlDirectly() throws SQLException {
         ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
         Connection connection = driver.connect(PLAIN_POSTGRESQL_JDBC_URL, new Properties());
         assertThat(connection).isNull();
     }
 
     @Test
-    public void shouldNotTryToConnectToNonMatchingJdbcUrlViaDriverManager() throws SQLException {
-        thrown.expect(SQLException.class);
-        thrown.expectMessage(CoreMatchers.startsWith("No suitable driver found for "));
-        DriverManager.getConnection(PLAIN_POSTGRESQL_JDBC_URL);
+    void shouldNotTryToConnectToNonMatchingJdbcUrlViaDriverManager() throws SQLException {
+        assertThatThrownBy(() -> DriverManager.getConnection(PLAIN_POSTGRESQL_JDBC_URL))
+            .isInstanceOf(SQLException.class)
+            .hasMessageStartingWith("No suitable driver found for ");
     }
 }
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java
index f3cf2d01d40..e6233e14b9f 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java
@@ -1,8 +1,7 @@
 package org.testcontainers.jdbc;
 
 import lombok.NonNull;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.testcontainers.containers.JdbcDatabaseContainer;
@@ -14,18 +13,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class JdbcDatabaseDelegateTest {
+class JdbcDatabaseDelegateTest {
 
     @Test
-    public void testLeakedConnections() {
+    void testLeakedConnections() {
         final JdbcDatabaseContainerStub stub = new JdbcDatabaseContainerStub(DockerImageName.parse("something"));
         try (JdbcDatabaseDelegate delegate = new JdbcDatabaseDelegate(stub, "")) {
             delegate.execute("foo", null, 0, false, false);
         }
-        Assert.assertEquals(0, stub.openConnectionsList.size());
+        assertThat(stub.openConnectionsList.size()).isZero();
     }
 
     static class JdbcDatabaseContainerStub extends JdbcDatabaseContainer {
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
index 9f6b354818d..469234e15a6 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.jdbc;
 
 import com.google.common.base.Throwables;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -12,10 +12,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class MissingJdbcDriverTest {
+class MissingJdbcDriverTest {
 
     @Test
-    public void shouldFailFastIfNoDriverFound() {
+    void shouldFailFastIfNoDriverFound() {
         final MissingDriverContainer container = new MissingDriverContainer();
 
         try {

From cb2568f199fa067bb0c0cc3f005768ad11f6bb7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 5 Sep 2025 14:55:32 -0600
Subject: [PATCH 4558/4969] Move R2DBC tests to JUnit Jupiter (#10771)

---
 modules/r2dbc/build.gradle                                | 7 +++++++
 .../r2dbc/TestcontainersR2DBCConnectionFactoryTest.java   | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 8837813426c..143deb8828e 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -8,6 +8,9 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
@@ -15,3 +18,7 @@ dependencies {
     testFixturesImplementation 'io.projectreactor:reactor-core:3.7.9'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
index 9ae49b00bd1..7a76b436e22 100644
--- a/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
+++ b/modules/r2dbc/src/test/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactoryTest.java
@@ -6,7 +6,7 @@
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.Result;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -15,10 +15,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class TestcontainersR2DBCConnectionFactoryTest {
+class TestcontainersR2DBCConnectionFactoryTest {
 
     @Test
-    public void failsOnUnknownProvider() {
+    void failsOnUnknownProvider() {
         String nonExistingProvider = UUID.randomUUID().toString();
         assertThatThrownBy(() -> {
                 ConnectionFactories.get(String.format("r2dbc:tc:%s:///db", nonExistingProvider));
@@ -28,7 +28,7 @@ public void failsOnUnknownProvider() {
     }
 
     @Test
-    public void reusesUntilConnectionFactoryIsClosed() {
+    void reusesUntilConnectionFactoryIsClosed() {
         String url = "r2dbc:tc:postgresql:///db?TC_IMAGE_TAG=10-alpine";
         ConnectionFactory connectionFactory = ConnectionFactories.get(url);
 

From 4eca3bdaa3178b99c42c7ecc4ce29ff37ad20896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 5 Sep 2025 16:26:35 -0600
Subject: [PATCH 4559/4969] Move database-commons tests to JUnit Jupiter
 (#10772)

---
 modules/database-commons/build.gradle         |  7 +++
 .../testcontainers/ext/ScriptScannerTest.java | 10 ++--
 .../ext/ScriptSplittingTest.java              | 50 +++++++++----------
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 47b433e7b2f..5193e6dfcf7 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -3,5 +3,12 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java
index 7e24026c4ec..a82305a0a6e 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java
@@ -1,16 +1,16 @@
 package org.testcontainers.ext;
 
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.regex.Pattern;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ScriptScannerTest {
+class ScriptScannerTest {
 
     @Test
-    public void testHugeStringLiteral() {
+    void testHugeStringLiteral() {
         String script = "/* a comment */    \"" + StringUtils.repeat('~', 10000) + "\";";
         ScriptScanner scanner = scanner(script);
         assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.COMMENT);
@@ -20,7 +20,7 @@ public void testHugeStringLiteral() {
     }
 
     @Test
-    public void testPgIdentifierWithDollarSigns() {
+    void testPgIdentifierWithDollarSigns() {
         ScriptScanner scanner = scanner(
             "this$is$a$valid$postgreSQL$identifier  " +
             "$a$While this is a quoted string$a$$ --just followed by a dollar sign"
@@ -32,7 +32,7 @@ public void testPgIdentifierWithDollarSigns() {
     }
 
     @Test
-    public void testQuotedLiterals() {
+    void testQuotedLiterals() {
         ScriptScanner scanner = scanner("'this \\'is a literal' \"this \\\" is a literal\"");
         assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.QUOTED_STRING);
         assertThat(scanner.getCurrentMatch()).isEqualTo("'this \\'is a literal'");
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index 3f78e5c51db..cb0e33162f4 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.ext;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,10 +10,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class ScriptSplittingTest {
+class ScriptSplittingTest {
 
     @Test
-    public void testStringDemarcation() {
+    void testStringDemarcation() {
         String script = "SELECT 'foo `bar`'; SELECT 'foo -- `bar`'; SELECT 'foo /* `bar`';";
 
         List<String> expected = Arrays.asList("SELECT 'foo `bar`'", "SELECT 'foo -- `bar`'", "SELECT 'foo /* `bar`'");
@@ -22,7 +22,7 @@ public void testStringDemarcation() {
     }
 
     @Test
-    public void testIssue1547Case1() {
+    void testIssue1547Case1() {
         String script =
             "create database if not exists ttt;\n" +
             "\n" +
@@ -51,7 +51,7 @@ public void testIssue1547Case1() {
     }
 
     @Test
-    public void testIssue1547Case2() {
+    void testIssue1547Case2() {
         String script =
             "CREATE TABLE bar (\n" +
             "  end_time VARCHAR(255)\n" +
@@ -69,7 +69,7 @@ public void testIssue1547Case2() {
     }
 
     @Test
-    public void testSplittingEnquotedSemicolon() {
+    void testSplittingEnquotedSemicolon() {
         String script = "CREATE TABLE `bar;bar` (\n" + "  end_time VARCHAR(255)\n" + ");";
 
         List<String> expected = Arrays.asList("CREATE TABLE `bar;bar` ( end_time VARCHAR(255) )");
@@ -78,7 +78,7 @@ public void testSplittingEnquotedSemicolon() {
     }
 
     @Test
-    public void testUnusualSemicolonPlacement() {
+    void testUnusualSemicolonPlacement() {
         String script = "SELECT 1;;;;;SELECT 2;\n;SELECT 3\n; SELECT 4;\n SELECT 5";
 
         List<String> expected = Arrays.asList("SELECT 1", "SELECT 2", "SELECT 3", "SELECT 4", "SELECT 5");
@@ -87,7 +87,7 @@ public void testUnusualSemicolonPlacement() {
     }
 
     @Test
-    public void testCommentedSemicolon() {
+    void testCommentedSemicolon() {
         String script =
             "CREATE TABLE bar (\n" + "  foo VARCHAR(255)\n" + "); \nDROP PROCEDURE IF EXISTS -- ;\n" + "    count_foo";
 
@@ -100,7 +100,7 @@ public void testCommentedSemicolon() {
     }
 
     @Test
-    public void testStringEscaping() {
+    void testStringEscaping() {
         String script =
             "SELECT \"a /* string literal containing comment characters like -- here\";\n" +
             "SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\";\n" +
@@ -116,7 +116,7 @@ public void testStringEscaping() {
     }
 
     @Test
-    public void testBlockCommentExclusion() {
+    void testBlockCommentExclusion() {
         String script = "INSERT INTO bar (foo) /* ; */ VALUES ('hello world');";
 
         List<String> expected = Arrays.asList("INSERT INTO bar (foo) VALUES ('hello world')");
@@ -125,7 +125,7 @@ public void testBlockCommentExclusion() {
     }
 
     @Test
-    public void testBeginEndKeywordCorrectDetection() {
+    void testBeginEndKeywordCorrectDetection() {
         String script =
             "INSERT INTO something_end (begin_with_the_token, another_field) /*end*/ VALUES /* end */ (' begin ', `end`)-- begin\n;";
 
@@ -137,7 +137,7 @@ public void testBeginEndKeywordCorrectDetection() {
     }
 
     @Test
-    public void testCommentInStrings() {
+    void testCommentInStrings() {
         String script =
             "CREATE TABLE bar (foo VARCHAR(255));\n" +
             "\n" +
@@ -161,7 +161,7 @@ public void testCommentInStrings() {
     }
 
     @Test
-    public void testMultipleBeginEndDetection() {
+    void testMultipleBeginEndDetection() {
         String script =
             "CREATE TABLE bar (foo VARCHAR(255));\n" +
             "\n" +
@@ -205,7 +205,7 @@ public void testMultipleBeginEndDetection() {
     }
 
     @Test
-    public void testProcedureBlock() {
+    void testProcedureBlock() {
         String script =
             "CREATE PROCEDURE count_foo()\n" +
             "  BEGIN\n" +
@@ -264,7 +264,7 @@ public void testProcedureBlock() {
     }
 
     @Test
-    public void testUnclosedBlockComment() {
+    void testUnclosedBlockComment() {
         String script = "SELECT 'foo `bar`'; /*";
         assertThatThrownBy(() -> doSplit(script, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR))
             .isInstanceOf(ScriptUtils.ScriptParseException.class)
@@ -272,7 +272,7 @@ public void testUnclosedBlockComment() {
     }
 
     @Test
-    public void testIssue1452Case() {
+    void testIssue1452Case() {
         String script =
             "create table test (text VARCHAR(255));\n" +
             "\n" +
@@ -288,7 +288,7 @@ public void testIssue1452Case() {
     }
 
     @Test
-    public void testIfLoopBlocks() {
+    void testIfLoopBlocks() {
         String script =
             "BEGIN\n" +
             "    rec_loop: LOOP\n" +
@@ -310,7 +310,7 @@ public void testIfLoopBlocks() {
     }
 
     @Test
-    public void testIfLoopBlocksSpecificSeparator() {
+    void testIfLoopBlocksSpecificSeparator() {
         String script =
             "BEGIN\n" +
             "    rec_loop: LOOP\n" +
@@ -336,14 +336,14 @@ public void testIfLoopBlocksSpecificSeparator() {
     }
 
     @Test
-    public void oracleStyleBlocks() {
+    void oracleStyleBlocks() {
         String script = "BEGIN END; /\n" + "BEGIN END;";
         List<String> expected = Arrays.asList("BEGIN END;", "BEGIN END;");
         splitAndCompare(script, expected, "/");
     }
 
     @Test
-    public void testMultiProcedureMySQLScript() {
+    void testMultiProcedureMySQLScript() {
         String script =
             "CREATE PROCEDURE doiterate(p1 INT)\n" +
             "  BEGIN\n" +
@@ -398,7 +398,7 @@ public void testMultiProcedureMySQLScript() {
     }
 
     @Test
-    public void testDollarQuotedStrings() {
+    void testDollarQuotedStrings() {
         String script =
             "CREATE FUNCTION f ()\n" +
             "RETURNS INT\n" +
@@ -418,7 +418,7 @@ public void testDollarQuotedStrings() {
     }
 
     @Test
-    public void testNestedDollarQuotedString() {
+    void testNestedDollarQuotedString() {
         //see https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING
         String script =
             "CREATE FUNCTION f() AS $function$\n" +
@@ -439,7 +439,7 @@ public void testNestedDollarQuotedString() {
     }
 
     @Test
-    public void testUnclosedDollarQuotedString() {
+    void testUnclosedDollarQuotedString() {
         String script = "SELECT $tag$ ..... $";
         assertThatThrownBy(() -> doSplit(script, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR))
             .isInstanceOf(ScriptUtils.ScriptParseException.class)
@@ -470,12 +470,12 @@ private List<String> doSplit(String script, String separator) {
     }
 
     @Test
-    public void testIgnoreDelimitersInLiteralsAndComments() {
+    void testIgnoreDelimitersInLiteralsAndComments() {
         assertThat(ScriptUtils.containsSqlScriptDelimiters("'@' /*@*/ \"@\" $tag$@$tag$ --@", "@")).isFalse();
     }
 
     @Test
-    public void testContainsDelimiters() {
+    void testContainsDelimiters() {
         assertThat(ScriptUtils.containsSqlScriptDelimiters("'@' /*@*/ @ \"@\" --@", "@")).isTrue();
     }
 }

From 88d85566c85c45d5e100616ba0571a3275f118c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 22:01:02 +0000
Subject: [PATCH 4560/4969] Bump actions/labeler from 5 to 6

Bumps [actions/labeler](https://github.com/actions/labeler) from 5 to 6.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 0127be63320..178ba299670 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -9,6 +9,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

From cbab3249b6d1df9fcea750633210377960ed0261 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 22:01:05 +0000
Subject: [PATCH 4561/4969] Bump actions/github-script from 7 to 8

Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 57b2d117894..f039f6597b7 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -66,7 +66,7 @@ jobs:
       statuses: write
     steps:
       - name: Create pending status
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -89,7 +89,7 @@ jobs:
       - uses: ./.github/actions/setup-junit-report
 
       - name: Create success status
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         if: success()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -104,7 +104,7 @@ jobs:
             })
 
       - name: Create failure status
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         if: failure()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

From a70dbddd75641f922d5b584a6714a83308ab5afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 11 Sep 2025 09:54:34 -0600
Subject: [PATCH 4562/4969] Move missing K3s tests to JUnit Jupiter (#10785)

---
 .../k3s/OfficialClientK3sContainerTest.java               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
index 1c40e56fc2d..f71cbae558b 100644
--- a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
+++ b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
@@ -6,7 +6,7 @@
 import io.kubernetes.client.openapi.models.V1NodeList;
 import io.kubernetes.client.util.Config;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -16,15 +16,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Slf4j
-public class OfficialClientK3sContainerTest {
+class OfficialClientK3sContainerTest {
 
     @Test
-    public void shouldStartAndHaveListableNode() throws IOException, ApiException {
+    void shouldStartAndHaveListableNode() throws IOException, ApiException {
         runK3s(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"));
     }
 
     @Test
-    public void shouldStartAndHaveListableNodeUsingLowerVersion() throws IOException, ApiException {
+    void shouldStartAndHaveListableNodeUsingLowerVersion() throws IOException, ApiException {
         runK3s(DockerImageName.parse("rancher/k3s:v1.20.15-k3s1"));
     }
 

From 51219646dca72ad267e575bf25d0b60208c60b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 11 Sep 2025 10:53:45 -0600
Subject: [PATCH 4563/4969] Move database tests to JUnit Jupiter (#10786)

* Move jdbc-test tests to JUnit Jupiter

* Move r2dbc tests to JUnit Jupiter

* Move ClickHouse tests to JUnit Jupiter

* Move CockroachDB tests to JUnit Jupiter

* Move CrateDB tests to JUnit Jupiter

* Move Databend tests to JUnit Jupiter

* Move DB2 tests to JUnit Jupiter

* Move MariaDB tests to JUnit Jupiter

* Move MSSQL Server tests to JUnit Jupiter

* Move MySQL tests to JUnit Jupiter

* Move OceanBase tests to JUnit Jupiter

* Move Oracle Free tests to JUnit Jupiter

* Move Oracle XE tests to JUnit Jupiter

* Move PostgreSQL tests to JUnit Jupiter

* Move Presto tests to JUnit Jupiter

* Move QuestDB tests to JUnit Jupiter

* Move TiDB tests to JUnit Jupiter

* Move Timeplus tests to JUnit Jupiter

* Move Trino tests to JUnit Jupiter

* Move YugabyteDB tests to JUnit Jupiter
---
 modules/clickhouse/build.gradle               |  7 ++
 .../clickhouse/ClickHouseContainerTest.java   | 12 +--
 .../clickhouse/ClickhouseJDBCDriverTest.java  |  6 +-
 .../clickhouse/SimpleClickhouseTest.java      | 23 +-----
 modules/cockroachdb/build.gradle              |  9 ++-
 .../CockroachDBJDBCDriverTest.java            |  6 +-
 .../cockroachdb/SimpleCockroachDBTest.java    | 16 ++--
 modules/cratedb/build.gradle                  |  9 ++-
 .../jdbc/cratedb/CrateDBJDBCDriverTest.java   |  6 +-
 .../junit/cratedb/SimpleCrateDBTest.java      | 10 +--
 modules/databend/build.gradle                 |  7 ++
 .../databend/DatabendContainerTest.java       |  8 +-
 .../databend/DatabendJDBCDriverTest.java      |  6 +-
 modules/db2/build.gradle                      |  7 ++
 .../jdbc/db2/DB2JDBCDriverTest.java           |  6 +-
 .../junit/db2/SimpleDb2Test.java              | 10 +--
 modules/jdbc-test/build.gradle                |  1 +
 .../jdbc/AbstractJDBCDriverTest.java          | 16 ++--
 modules/mariadb/build.gradle                  |  7 ++
 .../jdbc/mariadb/MariaDBJDBCDriverTest.java   |  6 +-
 .../junit/mariadb/SimpleMariaDBTest.java      | 18 ++---
 modules/mssqlserver/build.gradle              |  7 ++
 .../MSSQLServerJDBCDriverTest.java            |  6 +-
 .../CustomPasswordMSSQLServerTest.java        | 73 ++++++++-----------
 .../CustomizableMSSQLServerTest.java          |  6 +-
 .../mssqlserver/SimpleMSSQLServerTest.java    | 10 +--
 modules/mysql/build.gradle                    |  7 ++
 .../containers/MySQLRootAccountTest.java      | 27 +++----
 .../jdbc/mysql/JDBCDriverWithPoolTest.java    | 18 ++---
 .../MySQLDatabaseContainerDriverTest.java     |  6 +-
 .../jdbc/mysql/MySQLJDBCDriverTest.java       |  6 +-
 .../junit/mysql/CustomizableMysqlTest.java    |  6 +-
 .../junit/mysql/MultiVersionMySQLTest.java    | 17 ++---
 .../junit/mysql/SimpleMySQLTest.java          | 35 ++++-----
 modules/oceanbase/build.gradle                |  7 ++
 .../oceanbase/OceanBaseJdbcDriverTest.java    |  6 +-
 .../oceanbase/SimpleOceanBaseCETest.java      | 10 +--
 modules/oracle-free/build.gradle              |  7 ++
 .../junit/oracle/SimpleOracleTest.java        | 18 ++---
 .../oracle/jdbc/OracleJDBCDriverTest.java     |  6 +-
 modules/oracle-xe/build.gradle                |  7 ++
 .../containers/jdbc/OracleJDBCDriverTest.java |  6 +-
 .../junit/oracle/SimpleOracleTest.java        | 18 ++---
 modules/postgresql/build.gradle               |  7 ++
 .../containers/CompatibleImageTest.java       | 10 +--
 .../PostgreSQLConnectionURLTest.java          | 12 +--
 .../containers/TimescaleDBContainerTest.java  | 12 +--
 .../jdbc/DatabaseDriverShutdownTest.java      | 12 +--
 .../jdbc/DatabaseDriverTmpfsTest.java         |  6 +-
 .../jdbc/pgvector/PgVectorJDBCDriverTest.java |  6 +-
 .../jdbc/postgis/PostgisJDBCDriverTest.java   |  6 +-
 .../postgresql/PostgreSQLJDBCDriverTest.java  |  4 -
 .../TimescaleDBJDBCDriverTest.java            |  4 -
 .../CustomizablePostgreSQLTest.java           |  6 +-
 .../postgresql/SimplePostgreSQLTest.java      | 18 ++---
 modules/presto/build.gradle                   |  7 ++
 .../containers/PrestoContainerTest.java       | 14 ++--
 .../jdbc/presto/PrestoJDBCDriverTest.java     |  6 +-
 modules/questdb/build.gradle                  |  7 ++
 .../jdbc/questdb/QuestDBJDBCDriverTest.java   |  6 +-
 .../junit/questdb/SimpleQuestDBTest.java      |  8 +-
 modules/r2dbc/build.gradle                    |  1 +
 .../AbstractR2DBCDatabaseContainerTest.java   |  8 +-
 modules/tidb/build.gradle                     |  7 ++
 .../jdbc/tidb/TiDBJDBCDriverTest.java         |  4 -
 .../junit/tidb/SimpleTiDBTest.java            | 10 +--
 modules/timeplus/build.gradle                 |  7 ++
 .../timeplus/TimeplusJDBCDriverTest.java      |  6 +-
 .../timeplus/TimeplusContainerTest.java       |  8 +-
 modules/trino/build.gradle                    |  7 ++
 .../containers/TrinoContainerTest.java        | 10 +--
 .../jdbc/trino/TrinoJDBCDriverTest.java       |  6 +-
 modules/yugabytedb/build.gradle               |  8 ++
 .../YugabyteDBYSQLJDBCDriverTest.java         |  6 +-
 .../junit/yugabytedb/YugabyteDBYCQLTest.java  | 16 ++--
 .../junit/yugabytedb/YugabyteDBYSQLTest.java  | 16 ++--
 76 files changed, 398 insertions(+), 378 deletions(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index b840e70763b..3fc372b2891 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -10,8 +10,15 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.1', classifier: 'all')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.clickhouse:client-v2:0.9.1'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
index ff20917e009..0f9eb3ef6a3 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
@@ -3,7 +3,7 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.query.QueryResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -16,10 +16,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
+class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11-alpine")
             // }
@@ -34,7 +34,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void customCredentialsWithUrlParams() throws SQLException {
+    void customCredentialsWithUrlParams() throws SQLException {
         try (
             ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11.2-alpine")
                 .withUsername("default")
@@ -56,7 +56,7 @@ public void customCredentialsWithUrlParams() throws SQLException {
     }
 
     @Test
-    public void testNewAuth() throws SQLException {
+    void testNewAuth() throws SQLException {
         try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
             clickhouse.start();
 
@@ -68,7 +68,7 @@ public void testNewAuth() throws SQLException {
     }
 
     @Test
-    public void testGetHttpMethodWithHttpClient() {
+    void testGetHttpMethodWithHttpClient() {
         ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE);
         clickhouse.start();
         Client client = new Client.Builder()
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java b/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
index 056aace7772..0a85a26899a 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.clickhouse;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class ClickhouseJDBCDriverTest extends AbstractJDBCDriverTest {
+class ClickhouseJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
index eb33274ce6b..c9bd9e917f5 100644
--- a/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
+++ b/modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -1,37 +1,20 @@
 package org.testcontainers.junit.clickhouse;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
-import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
-
-    private final DockerImageName imageName;
-
-    public SimpleClickhouseTest(DockerImageName imageName) {
-        this.imageName = imageName;
-    }
-
-    @Parameterized.Parameters(name = "{0}")
-    public static Object[][] data() {
-        return new Object[][] { //
-            { ClickhouseTestImages.CLICKHOUSE_IMAGE },
-        };
-    }
+class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer(this.imageName)) {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_IMAGE)) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 264c22eff9e..8107fc92f6a 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -3,8 +3,11 @@ description = "Testcontainers :: JDBC :: CockroachDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
@@ -13,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.CockroachContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
index b5e147ce553..dc4915aac3e 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.cockroachdb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
+class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
index 12c25738e45..5846c22a5db 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.cockroachdb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.CockroachDBTestImages;
 import org.testcontainers.containers.CockroachContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -14,14 +14,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
+class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
     }
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v22.2.3")
             // }
@@ -36,7 +36,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
                 .withInitScript("somepath/init_postgresql.sql")
@@ -51,7 +51,7 @@ public void testExplicitInitScript() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
             .withUrlParam("sslmode", "disable")
             .withUrlParam("application_name", "cockroach");
@@ -70,7 +70,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     }
 
     @Test
-    public void testWithUsernamePasswordDatabase() throws SQLException {
+    void testWithUsernamePasswordDatabase() throws SQLException {
         try (
             CockroachContainer cockroach = new CockroachContainer(
                 CockroachDBTestImages.FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT
@@ -92,7 +92,7 @@ public void testWithUsernamePasswordDatabase() throws SQLException {
     }
 
     @Test
-    public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
+    void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
         CockroachContainer cockroachContainer = new CockroachContainer(
             CockroachDBTestImages.COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED
         );
@@ -111,7 +111,7 @@ public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
     }
 
     @Test
-    public void testInitializationScript() throws SQLException {
+    void testInitializationScript() throws SQLException {
         String sql =
             "USE postgres; \n" +
             "CREATE TABLE bar (foo VARCHAR(255)); \n" +
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index b74d9c5f949..f7bc059ced3 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -3,8 +3,15 @@ description = "Testcontainers :: JDBC :: CrateDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation project(':testcontainers-jdbc-test')
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java b/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
index 54ef9704ac5..2c20afe6680 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.cratedb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class CrateDBJDBCDriverTest extends AbstractJDBCDriverTest {
+class CrateDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
index 40f2c667711..803b9173218 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.cratedb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.CrateDBTestImages;
 import org.testcontainers.cratedb.CrateDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -12,14 +12,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleCrateDBTest extends AbstractContainerDatabaseTest {
+class SimpleCrateDBTest extends AbstractContainerDatabaseTest {
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
     }
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             CrateDBContainer cratedb = new CrateDBContainer("crate:5.2.5")
             // }
@@ -34,7 +34,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testCommandOverride() throws SQLException {
+    void testCommandOverride() throws SQLException {
         try (
             CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
                 .withCommand("crate -C discovery.type=single-node -C cluster.name=testcontainers")
@@ -48,7 +48,7 @@ public void testCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
                 .withInitScript("somepath/init_cratedb.sql")
diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 6e57f4bd198..1535441e925 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -5,5 +5,12 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.databend:databend-jdbc:0.4.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
index 66f3504e725..984f42979c4 100644
--- a/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
+++ b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.databend;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -8,10 +8,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DatabendContainerTest extends AbstractContainerDatabaseTest {
+class DatabendContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
             // }
@@ -26,7 +26,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void customCredentialsWithUrlParams() throws SQLException {
+    void customCredentialsWithUrlParams() throws SQLException {
         try (
             DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
                 .withUsername("test")
diff --git a/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java b/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
index a36039dc8d1..2f3a030919f 100644
--- a/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
+++ b/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.databend;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class DatabendJDBCDriverTest extends AbstractJDBCDriverTest {
+class DatabendJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index b50291c201d..49fb4c72e28 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -3,6 +3,9 @@ description = "Testcontainers :: JDBC :: DB2"
 dependencies {
     api project(':testcontainers-jdbc')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
@@ -13,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.Db2Container"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
index 4a03f824a28..cfa74c8017a 100644
--- a/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
+++ b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.db2;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class DB2JDBCDriverTest extends AbstractJDBCDriverTest {
+class DB2JDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
index 5f8763b1e19..95222330e09 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.db2;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.Db2TestImages;
 import org.testcontainers.containers.Db2Container;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -10,10 +10,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleDb2Test extends AbstractContainerDatabaseTest {
+class SimpleDb2Test extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             Db2Container db2 = new Db2Container("ibmcom/db2:11.5.0.0a").acceptLicense()
             // }
@@ -29,7 +29,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testSimpleWithNewImage() throws SQLException {
+    void testSimpleWithNewImage() throws SQLException {
         try (Db2Container db2 = new Db2Container("icr.io/db2_community/db2:11.5.8.0").acceptLicense()) {
             db2.start();
 
@@ -42,7 +42,7 @@ public void testSimpleWithNewImage() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         try (
             Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE)
                 .withUrlParam("sslConnection", "false")
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index f4f762ae43a..1136c2b44b0 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -11,4 +11,5 @@ dependencies {
     api 'org.apache.tomcat:tomcat-jdbc:11.0.10'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'mysql:mysql-connector-java:8.0.33'
+    api 'org.junit.jupiter:junit-jupiter:5.13.4'
 }
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index 5a22e37ecfc..ff844b8988b 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -4,9 +4,11 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.lang3.SystemUtils;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runners.Parameterized.Parameter;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -17,6 +19,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeFalse;
 
+@ParameterizedClass
+@MethodSource("data")
 public class AbstractJDBCDriverTest {
 
     protected enum Options {
@@ -27,7 +31,7 @@ protected enum Options {
         PmdKnownBroken,
     }
 
-    @Parameter
+    @Parameter(0)
     public String jdbcUrl;
 
     @Parameter(1)
@@ -39,13 +43,13 @@ public static void sampleInitFunction(Connection connection) throws SQLException
         connection.createStatement().execute("CREATE TABLE my_counter (\n" + "  n INT\n" + ");");
     }
 
-    @AfterClass
+    @AfterAll
     public static void testCleanup() {
         ContainerDatabaseDriver.killContainers();
     }
 
     @Test
-    public void test() throws SQLException {
+    void test() throws SQLException {
         try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
             performSimpleTest(dataSource);
 
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index d68f122f4dc..2bb703099aa 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.5'
 
@@ -18,3 +21,7 @@ tasks.japicmp {
         "org.testcontainers.containers.MariaDBContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
index 9d903ab3965..5d3b799f0ff 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/jdbc/mariadb/MariaDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.mariadb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class MariaDBJDBCDriverTest extends AbstractJDBCDriverTest {
+class MariaDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 2651615928c..9b7fab4daaf 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit.mariadb;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.MariaDBTestImages;
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -21,10 +21,10 @@
 import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.junit.Assume.assumeFalse;
 
-public class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
+class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             MariaDBContainer<?> mariadb = new MariaDBContainer<>("mariadb:10.3.39")
             // }
@@ -39,7 +39,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testSpecificVersion() throws SQLException {
+    void testSpecificVersion() throws SQLException {
         try (
             MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>(
                 MariaDBTestImages.MARIADB_IMAGE.withTag("10.3.39")
@@ -57,7 +57,7 @@ public void testSpecificVersion() throws SQLException {
     }
 
     @Test
-    public void testMariaDBWithCustomIniFile() throws SQLException {
+    void testMariaDBWithCustomIniFile() throws SQLException {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
 
         try (
@@ -73,7 +73,7 @@ public void testMariaDBWithCustomIniFile() throws SQLException {
     }
 
     @Test
-    public void testMariaDBWithCommandOverride() throws SQLException {
+    void testMariaDBWithCommandOverride() throws SQLException {
         try (
             MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)
                 .withCommand("mysqld --auto_increment_increment=10")
@@ -87,7 +87,7 @@ public void testMariaDBWithCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)
             .withUrlParam("connectTimeout", "40000")
             .withUrlParam("rewriteBatchedStatements", "true");
@@ -105,7 +105,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     }
 
     @Test
-    public void testWithOnlyUserReadableCustomIniFile() throws Exception {
+    void testWithOnlyUserReadableCustomIniFile() throws Exception {
         assumeThat(FileSystems.getDefault().supportedFileAttributeViews().contains("posix")).isTrue();
 
         try (
@@ -136,7 +136,7 @@ public void testWithOnlyUserReadableCustomIniFile() throws Exception {
     }
 
     @Test
-    public void testEmptyPasswordWithRootUser() throws SQLException {
+    void testEmptyPasswordWithRootUser() throws SQLException {
         try (MariaDBContainer<?> mysql = new MariaDBContainer<>("mariadb:11.2.4").withUsername("root")) {
             mysql.start();
 
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 3ba79559b58..da8318ffa84 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
 
@@ -21,3 +24,7 @@ tasks.japicmp {
         "org.testcontainers.containers.MSSQLServerContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
index 4ed4db9e8ab..9f616ab10f8 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/jdbc/mssqlserver/MSSQLServerJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.mssqlserver;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class MSSQLServerJDBCDriverTest extends AbstractJDBCDriverTest {
+class MSSQLServerJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
index 27075d6a3fe..06aa1dc4a61 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -1,14 +1,13 @@
 package org.testcontainers.junit.mssqlserver;
 
 import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.MSSQLServerTestImages;
 import org.testcontainers.containers.MSSQLServerContainer;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.fail;
 
@@ -16,7 +15,6 @@
  * Tests if the password passed to the container satisfied the password policy described at
  * https://docs.microsoft.com/en-us/sql/relational-databases/security/password-policy?view=sql-server-2017
  */
-@RunWith(Parameterized.class)
 public class CustomPasswordMSSQLServerTest {
 
     private static String UPPER_CASE_LETTERS = "ABCDE";
@@ -27,51 +25,40 @@ public class CustomPasswordMSSQLServerTest {
 
     private static String SPECIAL_CHARS = "_(!)_";
 
-    private String password;
-
-    private Boolean valid;
-
-    public CustomPasswordMSSQLServerTest(String password, Boolean valid) {
-        this.password = password;
-        this.valid = valid;
-    }
-
-    @Parameterized.Parameters
-    public static Collection<Object[]> data() {
-        return Arrays.asList(
-            new Object[][] {
-                new Object[] { null, false },
-                // too short
-                { "abc123", false },
-                // too long
-                { RandomStringUtils.randomAlphabetic(129), false },
-                // only 2 categories
-                { UPPER_CASE_LETTERS + NUMBERS, false },
-                { UPPER_CASE_LETTERS + SPECIAL_CHARS, false },
-                { LOWER_CASE_LETTERS + NUMBERS, false },
-                { LOWER_CASE_LETTERS + SPECIAL_CHARS, false },
-                { NUMBERS + SPECIAL_CHARS, false },
-                // 3 categories
-                { UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS, true },
-                { UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + SPECIAL_CHARS, true },
-                { UPPER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true },
-                { LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true },
-                // 4 categories
-                { UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true },
-            }
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.arguments(null, false),
+            // too short
+            Arguments.arguments("abc123", false),
+            // too long
+            Arguments.arguments(RandomStringUtils.randomAlphabetic(129), false),
+            // only 2 categories
+            Arguments.arguments(UPPER_CASE_LETTERS + NUMBERS, false),
+            Arguments.arguments(UPPER_CASE_LETTERS + SPECIAL_CHARS, false),
+            Arguments.arguments(LOWER_CASE_LETTERS + NUMBERS, false),
+            Arguments.arguments(LOWER_CASE_LETTERS + SPECIAL_CHARS, false),
+            Arguments.arguments(NUMBERS + SPECIAL_CHARS, false),
+            // 3 categories
+            Arguments.arguments(UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS, true),
+            Arguments.arguments(UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + SPECIAL_CHARS, true),
+            Arguments.arguments(UPPER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true),
+            Arguments.arguments(LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true),
+            // 4 categories
+            Arguments.arguments(UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + NUMBERS + SPECIAL_CHARS, true)
         );
     }
 
-    @Test
-    public void runPasswordTests() {
+    @ParameterizedTest
+    @MethodSource("data")
+    public void runPasswordTests(String password, boolean valid) {
         try {
-            new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE).withPassword(this.password);
+            new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE).withPassword(password);
             if (!valid) {
-                fail("Password " + this.password + " is not valid. Expected exception");
+                fail("Password " + password + " is not valid. Expected exception");
             }
         } catch (IllegalArgumentException e) {
             if (valid) {
-                fail("Password " + this.password + " should have been validated");
+                fail("Password " + password + " should have been validated");
             }
         }
     }
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
index 03e0affa00c..630b6c5356c 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.mssqlserver;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
@@ -10,12 +10,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
+class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     private static final String STRONG_PASSWORD = "myStrong(!)Password";
 
     @Test
-    public void testSqlServerConnection() throws SQLException {
+    void testSqlServerConnection() throws SQLException {
         try (
             MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
                 DockerImageName.parse("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
index 943eff30a53..0d995911893 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.mssqlserver;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.MSSQLServerTestImages;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -13,10 +13,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
+class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(
                 "mcr.microsoft.com/mssql/server:2022-CU20-ubuntu-22.04"
@@ -34,7 +34,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         try (
             MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
                 .withUrlParam("integratedSecurity", "false")
@@ -48,7 +48,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     }
 
     @Test
-    public void testSetupDatabase() throws SQLException {
+    void testSetupDatabase() throws SQLException {
         try (
             MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
         ) {
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index ddacc0fdc50..32573799f70 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
@@ -20,3 +23,7 @@ tasks.japicmp {
         "org.testcontainers.containers.MySQLContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
index e9a3c862143..a8737c4c74f 100644
--- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java
@@ -1,9 +1,8 @@
 package org.testcontainers.containers;
 
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
@@ -13,10 +12,8 @@
 import java.sql.SQLException;
 
 @Slf4j
-@RunWith(Parameterized.class)
-public class MySQLRootAccountTest {
+class MySQLRootAccountTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static DockerImageName[] params() {
         return new DockerImageName[] {
             MySQLTestImages.MYSQL_57_IMAGE,
@@ -26,21 +23,21 @@ public static DockerImageName[] params() {
         };
     }
 
-    @Parameterized.Parameter
-    public DockerImageName image;
-
-    @Test
-    public void testRootAccountUsageWithDefaultPassword() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("params")
+    void testRootAccountUsageWithDefaultPassword(DockerImageName image) throws SQLException {
         testWithDB(new MySQLContainer<>(image).withUsername("root"));
     }
 
-    @Test
-    public void testRootAccountUsageWithEmptyPassword() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("params")
+    void testRootAccountUsageWithEmptyPassword(DockerImageName image) throws SQLException {
         testWithDB(new MySQLContainer<>(image).withUsername("root").withPassword(""));
     }
 
-    @Test
-    public void testRootAccountUsageWithCustomPassword() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("params")
+    void testRootAccountUsageWithCustomPassword(DockerImageName image) throws SQLException {
         testWithDB(new MySQLContainer<>(image).withUsername("root").withPassword("not-default"));
     }
 
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
index be48f623183..0075b2ebf7f 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/JDBCDriverWithPoolTest.java
@@ -5,19 +5,19 @@
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.jdbc.ContainerDatabaseDriver;
 import org.vibur.dbcp.ViburDBCPDataSource;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 import javax.sql.DataSource;
 
@@ -29,7 +29,8 @@
  * the mysql module, to avoid circular dependencies.
  * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("dataSourceSuppliers")
 public class JDBCDriverWithPoolTest {
 
     public static final String URL =
@@ -37,9 +38,8 @@ public class JDBCDriverWithPoolTest {
 
     private final DataSource dataSource;
 
-    @Parameterized.Parameters
-    public static Iterable<Supplier<DataSource>> dataSourceSuppliers() {
-        return Arrays.asList(
+    public static Stream<Supplier<DataSource>> dataSourceSuppliers() {
+        return Stream.of(
             JDBCDriverWithPoolTest::getTomcatDataSourceWithDriverClassName,
             JDBCDriverWithPoolTest::getTomcatDataSource,
             JDBCDriverWithPoolTest::getHikariDataSourceWithDriverClassName,
@@ -56,7 +56,7 @@ public JDBCDriverWithPoolTest(Supplier<DataSource> dataSourceSupplier) {
     private ExecutorService executorService = Executors.newFixedThreadPool(5);
 
     @Test
-    public void testMySQLWithConnectionPoolUsingSameContainer() throws SQLException, InterruptedException {
+    void testMySQLWithConnectionPoolUsingSameContainer() throws SQLException, InterruptedException {
         // Populate the database with some data in multiple threads, so that multiple connections from the pool will be used
         for (int i = 0; i < 100; i++) {
             executorService.submit(() -> {
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
index 7f5cf5eae1d..da73f21ae2e 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLDatabaseContainerDriverTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.jdbc.mysql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.jdbc.ContainerDatabaseDriver;
 
 import java.sql.Connection;
@@ -11,10 +11,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MySQLDatabaseContainerDriverTest {
+class MySQLDatabaseContainerDriverTest {
 
     @Test
-    public void shouldRespectBothUrlPropertiesAndParameterProperties() throws SQLException {
+    void shouldRespectBothUrlPropertiesAndParameterProperties() throws SQLException {
         ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
         String url = "jdbc:tc:mysql:8.0.36://hostname/databasename?padCharsWithSpace=true";
         Properties properties = new Properties();
diff --git a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
index 526c2ab522c..b069e5fd0c8 100644
--- a/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/jdbc/mysql/MySQLJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.mysql;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class MySQLJDBCDriverTest extends AbstractJDBCDriverTest {
+class MySQLJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
index e756631d8e1..9e9d97dc54e 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.mysql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
+class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
 
     private static final String DB_NAME = "foo";
 
@@ -19,7 +19,7 @@ public class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
     private static final String PWD = "baz";
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
         try (
             MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
index 25085289ba7..d8e8b52dc56 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
@@ -1,8 +1,7 @@
 package org.testcontainers.junit.mysql;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -13,10 +12,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
+class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static DockerImageName[] params() {
         return new DockerImageName[] {
             MySQLTestImages.MYSQL_57_IMAGE,
@@ -26,11 +23,9 @@ public static DockerImageName[] params() {
         };
     }
 
-    @Parameterized.Parameter
-    public DockerImageName dockerImageName;
-
-    @Test
-    public void versionCheckTest() throws SQLException {
+    @ParameterizedTest
+    @MethodSource("params")
+    void versionCheckTest(DockerImageName dockerImageName) throws SQLException {
         try (MySQLContainer<?> mysql = new MySQLContainer<>(dockerImageName)) {
             mysql.start();
             final ResultSet resultSet = performQuery(mysql, "SELECT VERSION()");
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
index 085fdf074cb..b3eac503c57 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.mysql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.MySQLTestImages;
@@ -27,15 +27,15 @@
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-public class SimpleMySQLTest extends AbstractContainerDatabaseTest {
+class SimpleMySQLTest extends AbstractContainerDatabaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(SimpleMySQLTest.class);
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             MySQLContainer<?> mysql = new MySQLContainer<>("mysql:8.0.36")
             // }
@@ -51,7 +51,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testSpecificVersion() throws SQLException {
+    void testSpecificVersion() throws SQLException {
         try (
             MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
@@ -69,7 +69,7 @@ public void testSpecificVersion() throws SQLException {
     }
 
     @Test
-    public void testMySQLWithCustomIniFile() throws SQLException {
+    void testMySQLWithCustomIniFile() throws SQLException {
         try (
             MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
@@ -81,7 +81,7 @@ public void testMySQLWithCustomIniFile() throws SQLException {
     }
 
     @Test
-    public void testCommandOverride() throws SQLException {
+    void testCommandOverride() throws SQLException {
         try (
             MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withCommand("mysqld --auto_increment_increment=42")
@@ -96,7 +96,7 @@ public void testCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withInitScript("somepath/init_mysql.sql")
@@ -111,8 +111,8 @@ public void testExplicitInitScript() throws SQLException {
         }
     }
 
-    @Test(expected = ContainerLaunchException.class)
-    public void testEmptyPasswordWithNonRootUser() {
+    @Test
+    void testEmptyPasswordWithNonRootUser() {
         try (
             MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
                 .withDatabaseName("TEST")
@@ -120,13 +120,14 @@ public void testEmptyPasswordWithNonRootUser() {
                 .withPassword("")
                 .withEnv("MYSQL_ROOT_HOST", "%")
         ) {
-            container.start();
-            fail("ContainerLaunchException expected to be thrown");
+            assertThatThrownBy(container::start)
+                .isInstanceOf(ContainerLaunchException.class)
+                .hasMessageStartingWith("Container startup failed for image mysql");
         }
     }
 
     @Test
-    public void testEmptyPasswordWithRootUser() throws SQLException {
+    void testEmptyPasswordWithRootUser() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
         try (
             MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
@@ -145,7 +146,7 @@ public void testEmptyPasswordWithRootUser() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamTimeZone() throws SQLException {
+    void testWithAdditionalUrlParamTimeZone() throws SQLException {
         MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("serverTimezone", "Europe/Zurich")
             .withEnv("TZ", "Europe/Zurich")
@@ -180,7 +181,7 @@ public void testWithAdditionalUrlParamTimeZone() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
+    void testWithAdditionalUrlParamMultiQueries() throws SQLException {
         MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
@@ -205,7 +206,7 @@ public void testWithAdditionalUrlParamMultiQueries() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withUrlParam("rewriteBatchedStatements", "true")
@@ -224,7 +225,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     }
 
     @Test
-    public void testWithOnlyUserReadableCustomIniFile() throws Exception {
+    void testWithOnlyUserReadableCustomIniFile() throws Exception {
         assumeThat(FileSystems.getDefault().supportedFileAttributeViews().contains("posix")).isTrue();
         try (
             MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
index d4278ddc0bc..c577c65b260 100644
--- a/modules/oceanbase/build.gradle
+++ b/modules/oceanbase/build.gradle
@@ -3,6 +3,13 @@ description = "Testcontainers :: JDBC :: OceanBase"
 dependencies {
     api project(':testcontainers-jdbc')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java
index a4f63b1eb90..b701d953e9a 100644
--- a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java
+++ b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/OceanBaseJdbcDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.oceanbase;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class OceanBaseJdbcDriverTest extends AbstractJDBCDriverTest {
+class OceanBaseJdbcDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { { "jdbc:tc:oceanbasece://hostname/databasename", EnumSet.noneOf(Options.class) } }
diff --git a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
index 46619f328be..ee2d8196718 100644
--- a/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
+++ b/modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.oceanbase;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -8,12 +8,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleOceanBaseCETest extends AbstractContainerDatabaseTest {
+class SimpleOceanBaseCETest extends AbstractContainerDatabaseTest {
 
     private static final String IMAGE = "oceanbase/oceanbase-ce:4.2.1.8-108000022024072217";
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(
                 "oceanbase/oceanbase-ce:4.2.1.8-108000022024072217"
@@ -30,7 +30,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(IMAGE).withInitScript("init.sql")) {
             oceanbase.start();
 
@@ -41,7 +41,7 @@ public void testExplicitInitScript() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         try (OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(IMAGE).withUrlParam("useSSL", "false")) {
             oceanbase.start();
 
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index a55c9f26518..3f85086074f 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
@@ -14,3 +17,7 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index a9c3bce593a..f46539bac89 100644
--- a/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.oracle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.oracle.OracleContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -11,7 +11,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class SimpleOracleTest extends AbstractContainerDatabaseTest {
+class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
     private static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
         "gvenzl/oracle-free:slim-faststart"
@@ -32,7 +32,7 @@ private void runTest(OracleContainer container, String databaseName, String user
     }
 
     @Test
-    public void testDefaultSettings() throws SQLException {
+    void testDefaultSettings() throws SQLException {
         try ( // container {
             OracleContainer oracle = new OracleContainer("gvenzl/oracle-free:slim-faststart")
             // }
@@ -46,14 +46,14 @@ public void testDefaultSettings() throws SQLException {
     }
 
     @Test
-    public void testPluggableDatabase() throws SQLException {
+    void testPluggableDatabase() throws SQLException {
         try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).withDatabaseName("testDB")) {
             runTest(oracle, "testDB", "test", "test");
         }
     }
 
     @Test
-    public void testPluggableDatabaseAndCustomUser() throws SQLException {
+    void testPluggableDatabaseAndCustomUser() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer("gvenzl/oracle-free:slim-faststart")
                 .withDatabaseName("testDB")
@@ -65,7 +65,7 @@ public void testPluggableDatabaseAndCustomUser() throws SQLException {
     }
 
     @Test
-    public void testCustomUser() throws SQLException {
+    void testCustomUser() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .withUsername("testUser")
@@ -76,7 +76,7 @@ public void testCustomUser() throws SQLException {
     }
 
     @Test
-    public void testSID() throws SQLException {
+    void testSID() throws SQLException {
         try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid()) {
             runTest(oracle, "freepdb1", "system", "test");
 
@@ -87,7 +87,7 @@ public void testSID() throws SQLException {
     }
 
     @Test
-    public void testSIDAndCustomPassword() throws SQLException {
+    void testSIDAndCustomPassword() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .usingSid()
@@ -98,7 +98,7 @@ public void testSIDAndCustomPassword() throws SQLException {
     }
 
     @Test
-    public void testErrorPaths() throws SQLException {
+    void testErrorPaths() throws SQLException {
         try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) {
             try {
                 oracle.withDatabaseName("FREEPDB1");
diff --git a/modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java b/modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java
index 6f6157c61c8..a4982e966c1 100644
--- a/modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java
+++ b/modules/oracle-free/src/test/java/org/testcontainers/oracle/jdbc/OracleJDBCDriverTest.java
@@ -4,17 +4,17 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OracleJDBCDriverTest {
+class OracleJDBCDriverTest {
 
     @Test
-    public void testOracleWithNoSpecifiedVersion() throws SQLException {
+    void testOracleWithNoSpecifiedVersion() throws SQLException {
         performSimpleTest("jdbc:tc:oracle://hostname/databasename");
     }
 
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index a384fcb7221..edc86cef19c 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
@@ -20,3 +23,7 @@ tasks.japicmp {
         "org.testcontainers.containers.OracleContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
index 5e44f0d368c..4b672827fe6 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/containers/jdbc/OracleJDBCDriverTest.java
@@ -4,17 +4,17 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OracleJDBCDriverTest {
+class OracleJDBCDriverTest {
 
     @Test
-    public void testOracleWithNoSpecifiedVersion() throws SQLException {
+    void testOracleWithNoSpecifiedVersion() throws SQLException {
         performSimpleTest("jdbc:tc:oracle://hostname/databasename");
     }
 
diff --git a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
index eb63442c06e..17ee85944a7 100644
--- a/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
+++ b/modules/oracle-xe/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.oracle;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
@@ -11,7 +11,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class SimpleOracleTest extends AbstractContainerDatabaseTest {
+class SimpleOracleTest extends AbstractContainerDatabaseTest {
 
     public static final DockerImageName ORACLE_DOCKER_IMAGE_NAME = DockerImageName.parse(
         "gvenzl/oracle-xe:21-slim-faststart"
@@ -32,7 +32,7 @@ private void runTest(OracleContainer container, String databaseName, String user
     }
 
     @Test
-    public void testDefaultSettings() throws SQLException {
+    void testDefaultSettings() throws SQLException {
         try ( // container {
             OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:21-slim-faststart")
             // }
@@ -46,14 +46,14 @@ public void testDefaultSettings() throws SQLException {
     }
 
     @Test
-    public void testPluggableDatabase() throws SQLException {
+    void testPluggableDatabase() throws SQLException {
         try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).withDatabaseName("testDB")) {
             runTest(oracle, "testDB", "test", "test");
         }
     }
 
     @Test
-    public void testPluggableDatabaseAndCustomUser() throws SQLException {
+    void testPluggableDatabaseAndCustomUser() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer("gvenzl/oracle-xe:21-slim-faststart")
                 .withDatabaseName("testDB")
@@ -65,7 +65,7 @@ public void testPluggableDatabaseAndCustomUser() throws SQLException {
     }
 
     @Test
-    public void testCustomUser() throws SQLException {
+    void testCustomUser() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .withUsername("testUser")
@@ -76,7 +76,7 @@ public void testCustomUser() throws SQLException {
     }
 
     @Test
-    public void testSID() throws SQLException {
+    void testSID() throws SQLException {
         try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid();) {
             runTest(oracle, "xepdb1", "system", "test");
 
@@ -87,7 +87,7 @@ public void testSID() throws SQLException {
     }
 
     @Test
-    public void testSIDAndCustomPassword() throws SQLException {
+    void testSIDAndCustomPassword() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .usingSid()
@@ -98,7 +98,7 @@ public void testSIDAndCustomPassword() throws SQLException {
     }
 
     @Test
-    public void testErrorPaths() throws SQLException {
+    void testErrorPaths() throws SQLException {
         try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) {
             try {
                 oracle.withDatabaseName("XEPDB1");
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 8af61c5f3e2..dd5e441477a 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
@@ -20,3 +23,7 @@ tasks.japicmp {
         "org.testcontainers.containers.PostgreSQLContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
index 76b4a8c1bda..7101f4a9fb1 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
 
@@ -9,10 +9,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CompatibleImageTest extends AbstractContainerDatabaseTest {
+class CompatibleImageTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void pgvector() throws SQLException {
+    void pgvector() throws SQLException {
         try (
             // pgvectorContainer {
             PostgreSQLContainer<?> pgvector = new PostgreSQLContainer<>("pgvector/pgvector:pg16")
@@ -27,7 +27,7 @@ public void pgvector() throws SQLException {
     }
 
     @Test
-    public void postgis() throws SQLException {
+    void postgis() throws SQLException {
         try (
             // postgisContainer {
             PostgreSQLContainer<?> postgis = new PostgreSQLContainer<>(
@@ -44,7 +44,7 @@ public void postgis() throws SQLException {
     }
 
     @Test
-    public void timescaledb() throws SQLException {
+    void timescaledb() throws SQLException {
         try (
             // timescaledbContainer {
             PostgreSQLContainer<?> timescaledb = new PostgreSQLContainer<>(
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
index 275517250b6..3ed0b7030b1 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -1,15 +1,15 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.PostgreSQLTestImages;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class PostgreSQLConnectionURLTest {
+class PostgreSQLConnectionURLTest {
 
     @Test
-    public void shouldCorrectlyAppendQueryString() {
+    void shouldCorrectlyAppendQueryString() {
         PostgreSQLContainer<?> postgres = new FixedJdbcUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
@@ -22,7 +22,7 @@ public void shouldCorrectlyAppendQueryString() {
     }
 
     @Test
-    public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
+    void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
         PostgreSQLContainer<?> postgres = new NoParamsUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
@@ -35,7 +35,7 @@ public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
     }
 
     @Test
-    public void shouldReturnOriginalURLWhenEmptyQueryString() {
+    void shouldReturnOriginalURLWhenEmptyQueryString() {
         PostgreSQLContainer<?> postgres = new FixedJdbcUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("");
 
@@ -43,7 +43,7 @@ public void shouldReturnOriginalURLWhenEmptyQueryString() {
     }
 
     @Test
-    public void shouldRejectInvalidQueryString() {
+    void shouldRejectInvalidQueryString() {
         assertThat(
             catchThrowable(() -> {
                 new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified");
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
index 90f3113c7c0..3991f4c2b1c 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -8,10 +8,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TimescaleDBContainerTest extends AbstractContainerDatabaseTest {
+class TimescaleDBContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try (JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider().newInstance()) {
             postgres.start();
 
@@ -22,7 +22,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testCommandOverride() throws SQLException {
+    void testCommandOverride() throws SQLException {
         try (
             GenericContainer<?> postgres = new TimescaleDBContainerProvider()
                 .newInstance()
@@ -40,7 +40,7 @@ public void testCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testUnsetCommand() throws SQLException {
+    void testUnsetCommand() throws SQLException {
         try (
             GenericContainer<?> postgres = new TimescaleDBContainerProvider()
                 .newInstance()
@@ -59,7 +59,7 @@ public void testUnsetCommand() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider()
                 .newInstance()
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
index ed519ed2e4b..ab4d6f03d2e 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.jdbc;
 
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
 import java.sql.Connection;
@@ -16,15 +16,15 @@
  * the mysql module, to avoid circular dependencies.
  * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
-public class DatabaseDriverShutdownTest {
+class DatabaseDriverShutdownTest {
 
-    @AfterClass
+    @BeforeAll
     public static void testCleanup() {
         ContainerDatabaseDriver.killContainers();
     }
 
     @Test
-    public void shouldStopContainerWhenAllConnectionsClosed() throws SQLException {
+    void shouldStopContainerWhenAllConnectionsClosed() throws SQLException {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename";
 
         getConnectionAndClose(jdbcUrl);
@@ -34,7 +34,7 @@ public void shouldStopContainerWhenAllConnectionsClosed() throws SQLException {
     }
 
     @Test
-    public void shouldNotStopDaemonContainerWhenAllConnectionsClosed() throws SQLException {
+    void shouldNotStopDaemonContainerWhenAllConnectionsClosed() throws SQLException {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_DAEMON=true";
 
         getConnectionAndClose(jdbcUrl);
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
index 463981d2d59..12a6f2216cf 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.jdbc;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
@@ -15,10 +15,10 @@
  * the mysql module, to avoid circular dependencies.
  * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
-public class DatabaseDriverTmpfsTest {
+class DatabaseDriverTmpfsTest {
 
     @Test
-    public void testDatabaseHasTmpFsViaConnectionString() throws Exception {
+    void testDatabaseHasTmpFsViaConnectionString() throws Exception {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
         try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
             JdbcDatabaseContainer<?> container = ContainerDatabaseDriver.getContainer(jdbcUrl);
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java
index 2d7e67f4923..e94986e7875 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.pgvector;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class PgVectorJDBCDriverTest extends AbstractJDBCDriverTest {
+class PgVectorJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
index abc0a3b76bc..d6a0047a23c 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.postgis;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class PostgisJDBCDriverTest extends AbstractJDBCDriverTest {
+class PostgisJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
index d42f17f3ec2..b47af39f54b 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.postgresql;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
 public class PostgreSQLJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
index 2a50b46c901..8befb01bfb1 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.timescaledb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
 public class TimescaleDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
index 0e9904a5f61..fb09530913b 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.postgresql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.PostgreSQLTestImages;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
+class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     private static final String DB_NAME = "foo";
 
@@ -19,7 +19,7 @@ public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
     private static final String PWD = "baz";
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withDatabaseName(DB_NAME)
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
index 53585fec327..7227f3bdd60 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.postgresql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.PostgreSQLTestImages;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -13,14 +13,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
-public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
+class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
     }
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:9.6.12")
             // }
@@ -35,7 +35,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testCommandOverride() throws SQLException {
+    void testCommandOverride() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withCommand("postgres -c max_connections=42")
@@ -49,7 +49,7 @@ public void testCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testUnsetCommand() throws SQLException {
+    void testUnsetCommand() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withCommand("postgres -c max_connections=42")
@@ -64,7 +64,7 @@ public void testUnsetCommand() throws SQLException {
     }
 
     @Test
-    public void testMissingInitScript() {
+    void testMissingInitScript() {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScript(null)
@@ -74,7 +74,7 @@ public void testMissingInitScript() {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScript("somepath/init_postgresql.sql")
@@ -89,7 +89,7 @@ public void testExplicitInitScript() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScripts() throws SQLException {
+    void testExplicitInitScripts() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScripts("somepath/init_postgresql.sql", "somepath/init_postgresql_2.sql")
@@ -110,7 +110,7 @@ public void testExplicitInitScripts() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withUrlParam("charSet", "UNICODE")
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 194b413c10f..452e8cc271d 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -3,7 +3,14 @@ description = "Testcontainers :: JDBC :: Presto"
 dependencies {
     api project(':testcontainers-jdbc')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
index 8f2aa15f21c..9a46309f9e9 100644
--- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.PrestoTestImages;
 
 import java.sql.Connection;
@@ -14,10 +14,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PrestoContainerTest {
+class PrestoContainerTest {
 
     @Test
-    public void testSimple() throws Exception {
+    void testSimple() throws Exception {
         try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.start();
             try (
@@ -35,7 +35,7 @@ public void testSimple() throws Exception {
     }
 
     @Test
-    public void testSpecificVersion() throws Exception {
+    void testSpecificVersion() throws Exception {
         try (
             PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE)
         ) {
@@ -54,7 +54,7 @@ public void testSpecificVersion() throws Exception {
     }
 
     @Test
-    public void testQueryMemoryAndTpch() throws SQLException {
+    void testQueryMemoryAndTpch() throws SQLException {
         try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.start();
             try (
@@ -88,7 +88,7 @@ public void testQueryMemoryAndTpch() throws SQLException {
     }
 
     @Test
-    public void testInitScript() throws Exception {
+    void testInitScript() throws Exception {
         try (PrestoContainer<?> prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) {
             prestoSql.withInitScript("initial.sql");
             prestoSql.start();
@@ -105,7 +105,7 @@ public void testInitScript() throws Exception {
     }
 
     @Test
-    public void testTcJdbcUri() throws Exception {
+    void testTcJdbcUri() throws Exception {
         try (
             Connection connection = DriverManager.getConnection(
                 String.format("jdbc:tc:presto:%s://hostname/", PrestoContainer.DEFAULT_TAG)
diff --git a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
index 9c5dd712104..02e5b2a0485 100644
--- a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
+++ b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.presto;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class PrestoJDBCDriverTest extends AbstractJDBCDriverTest {
+class PrestoJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 665b2473b0a..f2b69777ab2 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -5,9 +5,16 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.questdb:questdb:9.0.2'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java b/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
index 3144f8bfad3..40612f05680 100644
--- a/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
+++ b/modules/questdb/src/test/java/org/testcontainers/jdbc/questdb/QuestDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.questdb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class QuestDBJDBCDriverTest extends AbstractJDBCDriverTest {
+class QuestDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
index f91f17f14b4..aad4df70c2c 100644
--- a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
+++ b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
@@ -6,7 +6,7 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.QuestDBTestImages;
 import org.testcontainers.containers.QuestDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -20,12 +20,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-public class SimpleQuestDBTest extends AbstractContainerDatabaseTest {
+class SimpleQuestDBTest extends AbstractContainerDatabaseTest {
 
     private static final String TABLE_NAME = "mytable";
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:6.5.3")
             // }
@@ -40,7 +40,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testRest() throws IOException {
+    void testRest() throws IOException {
         try (QuestDBContainer questdb = new QuestDBContainer(QuestDBTestImages.QUESTDB_IMAGE)) {
             questdb.start();
             populateByInfluxLineProtocol(questdb, 1_000);
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 143deb8828e..87c0e927048 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -17,6 +17,7 @@ dependencies {
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.7.9'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.4'
+    testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
 }
 
 test {
diff --git a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
index ca06e22d631..ed0a7fba70f 100644
--- a/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
+++ b/modules/r2dbc/src/testFixtures/java/org/testcontainers/r2dbc/AbstractR2DBCDatabaseContainerTest.java
@@ -6,7 +6,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -28,7 +28,7 @@ protected String createTestQuery(int result) {
     }
 
     @Test
-    public final void testGetOptions() {
+    void testGetOptions() {
         try (T container = createContainer()) {
             container.start();
 
@@ -38,13 +38,13 @@ public final void testGetOptions() {
     }
 
     @Test
-    public final void testUrlSupport() {
+    void testUrlSupport() {
         ConnectionFactory connectionFactory = ConnectionFactories.get(createR2DBCUrl());
         runTestQuery(connectionFactory);
     }
 
     @Test
-    public final void testGetMetadata() {
+    void testGetMetadata() {
         ConnectionFactory connectionFactory = ConnectionFactories.get(createR2DBCUrl());
         ConnectionFactoryMetadata metadata = connectionFactory.getMetadata();
         assertThat(metadata).isNotNull();
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 47dd9d01027..61d21063af0 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -3,8 +3,15 @@ description = "Testcontainers :: JDBC :: TiDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java b/modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java
index 566850fa629..4b3d60a013c 100644
--- a/modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java
+++ b/modules/tidb/src/test/java/org/testcontainers/jdbc/tidb/TiDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.tidb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
 public class TiDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { { "jdbc:tc:tidb://hostname/databasename", EnumSet.noneOf(Options.class) } }
diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
index c010e4298fe..9323e7d21ac 100644
--- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
+++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.tidb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TiDBTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.tidb.TiDBContainer;
@@ -10,10 +10,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleTiDBTest extends AbstractContainerDatabaseTest {
+class SimpleTiDBTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             TiDBContainer tidb = new TiDBContainer("pingcap/tidb:v6.1.0")
             // }
@@ -29,7 +29,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withInitScript("somepath/init_tidb.sql")
         ) { // TiDB is expected to be compatible with MySQL
@@ -43,7 +43,7 @@ public void testExplicitInitScript() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withUrlParam("sslmode", "disable");
 
         try {
diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index 5816772e300..681efb5cf7a 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -4,7 +4,14 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-jdbc')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.10'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java b/modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java
index 3f3a7ac8136..1427f33e5a4 100644
--- a/modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java
+++ b/modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/TimeplusJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.junit.timeplus;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class TimeplusJDBCDriverTest extends AbstractJDBCDriverTest {
+class TimeplusJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { { "jdbc:tc:timeplus:2.3.21://hostname", EnumSet.noneOf(Options.class) } }
diff --git a/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java b/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
index 5e00f945555..7ab38c03f87 100644
--- a/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
+++ b/modules/timeplus/src/test/java/org/testcontainers/timeplus/TimeplusContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.timeplus;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TimeplusImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -9,10 +9,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TimeplusContainerTest extends AbstractContainerDatabaseTest {
+class TimeplusContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             TimeplusContainer timeplus = new TimeplusContainer("timeplus/timeplusd:2.3.21")
             // }
@@ -27,7 +27,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void customCredentialsWithUrlParams() throws SQLException {
+    void customCredentialsWithUrlParams() throws SQLException {
         try (
             TimeplusContainer timeplus = new TimeplusContainer(TimeplusImages.TIMEPLUS_IMAGE)
                 .withUsername("system")
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 08e3c0c2982..04c5ffb73b7 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -3,7 +3,14 @@ description = "Testcontainers :: JDBC :: Trino"
 dependencies {
     api project(':testcontainers-jdbc')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:476'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
index ea25f39dbef..a12df1bcda7 100644
--- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TrinoTestImages;
 
 import java.sql.Connection;
@@ -9,10 +9,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TrinoContainerTest {
+class TrinoContainerTest {
 
     @Test
-    public void testSimple() throws Exception {
+    void testSimple() throws Exception {
         try ( // container {
             TrinoContainer trino = new TrinoContainer("trinodb/trino:352")
             // }
@@ -33,7 +33,7 @@ public void testSimple() throws Exception {
     }
 
     @Test
-    public void testSpecificVersion() throws Exception {
+    void testSpecificVersion() throws Exception {
         try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_PREVIOUS_VERSION_TEST_IMAGE)) {
             trino.start();
             try (
@@ -50,7 +50,7 @@ public void testSpecificVersion() throws Exception {
     }
 
     @Test
-    public void testInitScript() throws Exception {
+    void testInitScript() throws Exception {
         try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) {
             trino.withInitScript("initial.sql");
             trino.start();
diff --git a/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java b/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
index 9ec98c2e6d7..7674d1bc459 100644
--- a/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/jdbc/trino/TrinoJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.trino;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class TrinoJDBCDriverTest extends AbstractJDBCDriverTest {
+class TrinoJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index d81dd3e0648..b867b42a603 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -2,9 +2,17 @@ description = "Testcontainers :: JDBC :: YugabyteDB"
 
 dependencies {
     api project(':testcontainers-jdbc')
+
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.19.0-yb-1'
     // YSQL driver
     testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.7.3-yb-4'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
index a7ecab34aba..37129e8f899 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java
@@ -1,7 +1,5 @@
 package org.testcontainers.jdbc.yugabytedb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
@@ -10,10 +8,8 @@
 /**
  * YugabyteDB YSQL API JDBC connectivity driver test class
  */
-@RunWith(Parameterized.class)
-public class YugabyteDBYSQLJDBCDriverTest extends AbstractJDBCDriverTest {
+class YugabyteDBYSQLJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
index bf8ec2be1ea..24e6b2c24dd 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java
@@ -2,7 +2,7 @@
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.YugabyteDBYCQLContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -11,7 +11,7 @@
 /**
  * YugabyteDB YCQL API unit test class
  */
-public class YugabyteDBYCQLTest {
+class YugabyteDBYCQLTest {
 
     private static final String IMAGE_NAME = "yugabytedb/yugabyte:2.14.4.0-b26";
 
@@ -20,7 +20,7 @@ public class YugabyteDBYCQLTest {
     private static final DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);
 
     @Test
-    public void testSmoke() {
+    void testSmoke() {
         try (
             // creatingYCQLContainer {
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(
@@ -38,7 +38,7 @@ public void testSmoke() {
     }
 
     @Test
-    public void testCustomKeyspace() {
+    void testCustomKeyspace() {
         String key = "random";
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
@@ -61,7 +61,7 @@ public void testCustomKeyspace() {
     }
 
     @Test
-    public void testAuthenticationEnabled() {
+    void testAuthenticationEnabled() {
         String role = "random";
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
@@ -80,7 +80,7 @@ public void testAuthenticationEnabled() {
     }
 
     @Test
-    public void testAuthenticationDisabled() {
+    void testAuthenticationDisabled() {
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
                 .withPassword("cassandra")
@@ -94,7 +94,7 @@ public void testAuthenticationDisabled() {
     }
 
     @Test
-    public void testInitScript() {
+    void testInitScript() {
         String key = "random";
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
@@ -111,7 +111,7 @@ public void testInitScript() {
     }
 
     @Test
-    public void shouldStartWhenContainerIpIsUsedInWaitStrategy() {
+    void shouldStartWhenContainerIpIsUsedInWaitStrategy() {
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(IMAGE_NAME_2_18)
                 .withUsername("cassandra")
diff --git a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
index 47a36f4f784..04d1448cfba 100644
--- a/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
+++ b/modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.yugabytedb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.YugabyteDBYSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
@@ -12,14 +12,14 @@
 /**
  * YugabyteDB YSQL API unit test class
  */
-public class YugabyteDBYSQLTest extends AbstractContainerDatabaseTest {
+class YugabyteDBYSQLTest extends AbstractContainerDatabaseTest {
 
     private static final String IMAGE_NAME = "yugabytedb/yugabyte:2.14.4.0-b26";
 
     private static final DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);
 
     @Test
-    public void testSmoke() throws SQLException {
+    void testSmoke() throws SQLException {
         try (
             // creatingYSQLContainer {
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(
@@ -35,7 +35,7 @@ public void testSmoke() throws SQLException {
     }
 
     @Test
-    public void testCustomDatabase() throws SQLException {
+    void testCustomDatabase() throws SQLException {
         String key = "random";
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
@@ -49,7 +49,7 @@ public void testCustomDatabase() throws SQLException {
     }
 
     @Test
-    public void testInitScript() throws SQLException {
+    void testInitScript() throws SQLException {
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
                 .withInitScript("init/init_yql.sql")
@@ -62,7 +62,7 @@ public void testInitScript() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
                 .withUrlParam("sslmode", "disable")
@@ -80,7 +80,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     }
 
     @Test
-    public void testWithCustomRole() throws SQLException {
+    void testWithCustomRole() throws SQLException {
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
                 .withDatabaseName("yugabyte")
@@ -95,7 +95,7 @@ public void testWithCustomRole() throws SQLException {
     }
 
     @Test
-    public void testWaitStrategy() throws SQLException {
+    void testWaitStrategy() throws SQLException {
         try (final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)) {
             ysqlContainer.start();
             assertThat(performQuery(ysqlContainer, "SELECT 1").getInt(1))

From 3c41660cdff0426719ea1f2d13ba55b2f16580a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 22:03:12 +0000
Subject: [PATCH 4564/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin from 2.3 to 2.4.0

Bumps [com.gradle:common-custom-user-data-gradle-plugin](https://github.com/gradle/common-custom-user-data-gradle-plugin) from 2.3 to 2.4.0.
- [Release notes](https://github.com/gradle/common-custom-user-data-gradle-plugin/releases)
- [Commits](https://github.com/gradle/common-custom-user-data-gradle-plugin/compare/v2.3...v2.4.0)

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-version: 2.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 2076cb71c86..0d13ebcc3fe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.19.2"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.3"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.4.0"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }
 }

From 15f3c0da97deef1e08593fa40a906873faebd84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 22 Sep 2025 15:36:40 -0600
Subject: [PATCH 4565/4969] Skip databend module in CI (#10793)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66b364c6bfa..b0d4721fd12 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,7 +98,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
-          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers-databend:check" or . == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:

From 851f8ffa3dc98ff10143156ca788893f32d51f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 23 Sep 2025 16:28:31 -0600
Subject: [PATCH 4566/4969] Update spring boot version to 3.5.6 in selenium
 example (#10797)

---
 examples/selenium-container/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
index f2234e604e6..f1a8058e304 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.7.18'
+    id 'org.springframework.boot' version '3.5.6'
 }
 apply plugin: 'io.spring.dependency-management'
 
@@ -17,7 +17,6 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers-selenium'
     testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2"
 }
 
 test {

From d42e9d70393c4c01d7a9435f0942aad80c334140 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Sep 2025 22:29:40 +0000
Subject: [PATCH 4567/4969] Bump com.github.docker-java:docker-java-bom from
 3.5.3 to 3.6.0 in /core

Bumps [com.github.docker-java:docker-java-bom](https://github.com/docker-java/docker-java) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/docker-java/docker-java/releases)
- [Changelog](https://github.com/docker-java/docker-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/docker-java/docker-java/compare/3.5.3...3.6.0)

---
updated-dependencies:
- dependency-name: com.github.docker-java:docker-java-bom
  dependency-version: 3.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9b94f587a79..14bac3806fa 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -87,8 +87,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.5.3')
-    shaded platform('com.github.docker-java:docker-java-bom:3.5.3')
+    api platform('com.github.docker-java:docker-java-bom:3.6.0')
+    shaded platform('com.github.docker-java:docker-java-bom:3.6.0')
 
     api "com.github.docker-java:docker-java-api"
 

From d3721efef7c35b2f196e727ba581c7436f69bfdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:12:44 +0000
Subject: [PATCH 4568/4969] Bump org.jetbrains:annotations from 26.0.2 to
 26.0.2-1 in /core

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/commits)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9b94f587a79..0b6077c30f8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -70,8 +70,8 @@ configurations.all {
 dependencies {
     api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
-    testCompileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
     api 'org.apache.commons:commons-compress:1.24.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From e1354258c1c0c90f42d9687e8e69c7a30da6a6e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:13:08 +0000
Subject: [PATCH 4569/4969] Bump org.yaml:snakeyaml from 2.4 to 2.5 in /core

Bumps [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 2.4 to 2.5.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.5..snakeyaml-2.4)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-version: '2.5'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9b94f587a79..4cbbd8373c2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -99,7 +99,7 @@ dependencies {
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
     shaded 'com.google.guava:guava:33.3.1-jre'
-    shaded "org.yaml:snakeyaml:2.4"
+    shaded "org.yaml:snakeyaml:2.5"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From 284a1ea7576ad44a3773cfa60a96701169cfac34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Sep 2025 01:01:59 +0000
Subject: [PATCH 4570/4969] Bump redis.clients:jedis from 6.1.0 to 6.2.0 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1b0ef50a729..83fad3fac80 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -109,7 +109,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:6.1.0'
+    testImplementation 'redis.clients:jedis:6.2.0'
     testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From 2ba03ecfa4054e38ee666dc1b2107da30ce6d9f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Sep 2025 01:02:09 +0000
Subject: [PATCH 4571/4969] Bump org.assertj:assertj-core from 3.27.4 to 3.27.6
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.4 to 3.27.6.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.4...assertj-build-3.27.6)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1b0ef50a729..f53781ce029 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -119,13 +119,13 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.27.4'
+    testImplementation 'org.assertj:assertj-core:3.27.6'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.27.4'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.27.6'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From dee4d4bb11c62854b0a6a3a0db5a92668e584381 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Sep 2025 01:05:40 +0000
Subject: [PATCH 4572/4969] Bump org.apache.commons:commons-compress from
 1.24.0 to 1.28.0 in /core

Bumps [org.apache.commons:commons-compress](https://github.com/apache/commons-compress) from 1.24.0 to 1.28.0.
- [Changelog](https://github.com/apache/commons-compress/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-compress/compare/rel/commons-compress-1.24.0...rel/commons-compress-1.28.0)

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-version: 1.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1b0ef50a729..5349681f200 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -72,7 +72,7 @@ dependencies {
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
     testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
-    api 'org.apache.commons:commons-compress:1.24.0'
+    api 'org.apache.commons:commons-compress:1.28.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }

From c81554bb137770da5af76ba6da382b3132cf61b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Sep 2025 01:05:45 +0000
Subject: [PATCH 4573/4969] Bump io.grpc:grpc-bom from 1.73.0 to 1.74.0 in
 /modules/qdrant

Bumps [io.grpc:grpc-bom](https://github.com/grpc/grpc-java) from 1.73.0 to 1.74.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-bom
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 4148f09d50a..304d76f9251 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.qdrant:client:1.15.0'
-    testImplementation platform('io.grpc:grpc-bom:1.73.0')
+    testImplementation platform('io.grpc:grpc-bom:1.75.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'

From 9654cf1c4743447750c1686b9cceec6f9f2f3075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 23 Sep 2025 20:57:56 -0600
Subject: [PATCH 4574/4969] Replace deprecated XmlSlurper with
 groovy.xml.XmlSlurper (#10801)

---
 .../testcontainers/build/ComparePOMWithLatestReleasedTask.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy b/buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy
index 1bb71ca8f52..287f934c1e7 100644
--- a/buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy
+++ b/buildSrc/src/main/groovy/org/testcontainers/build/ComparePOMWithLatestReleasedTask.groovy
@@ -1,5 +1,6 @@
 package org.testcontainers.build
 
+import groovy.xml.XmlSlurper
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction

From 2a57f383266f1b976a507ff837940eba8176dbf6 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 24 Sep 2025 21:04:11 +0300
Subject: [PATCH 4575/4969] Move Toxiproxy tests to JUnit Jupiter (#10757)

---
 modules/toxiproxy/build.gradle                  |  7 +++++++
 .../containers/ToxiproxyTest.java               | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index f97193c730a..6fe7062a045 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -6,6 +6,9 @@ dependencies {
 
     testImplementation 'redis.clients:jedis:6.1.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
+    testImplementation platform('org.junit:junit-bom:5.13.4')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.japicmp {
@@ -13,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.ToxiproxyContainer"
     ]
 }
+
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+}
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
index bb941640055..1e35c2d7206 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
@@ -3,8 +3,9 @@
 import eu.rekawek.toxiproxy.Proxy;
 import eu.rekawek.toxiproxy.ToxiproxyClient;
 import eu.rekawek.toxiproxy.model.ToxicDirection;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
@@ -22,23 +23,29 @@ public class ToxiproxyTest {
     // spotless:off
     // creatingProxy {
     // Create a common docker network so that containers can communicate
-    @Rule
+    @AutoClose
     public Network network = Network.newNetwork();
 
     // The target container - this could be anything
-    @Rule
+    @AutoClose
     public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine")
         .withExposedPorts(6379)
         .withNetwork(network)
         .withNetworkAliases("redis");
 
     // Toxiproxy container, which will be used as a TCP proxy
-    @Rule
+    @AutoClose
     public ToxiproxyContainer toxiproxy = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.5.0")
         .withNetwork(network);
     // }
     // spotless:on
 
+    @BeforeEach
+    public void setUp() {
+        redis.start();
+        toxiproxy.start();
+    }
+
     @Test
     public void testDirect() {
         final Jedis jedis = createJedis(redis.getHost(), redis.getFirstMappedPort());

From 7209ff67f85fa7ef80f3e2e7f9c08db57769fe1d Mon Sep 17 00:00:00 2001
From: Eliassen-Steinar <steinar.eliassen@entur.org>
Date: Wed, 24 Sep 2025 21:33:18 +0200
Subject: [PATCH 4576/4969] Expose gRPC endpoint from BigQueryEmulator (#10779)

---
 .../containers/BigQueryEmulatorContainer.java |   4 +
 .../BigQueryEmulatorContainerTest.java        | 152 +++++++++++++++++-
 2 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
index 6c305a50537..6831785b0a5 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
@@ -33,6 +33,10 @@ public String getEmulatorHttpEndpoint() {
         return String.format("http://%s:%d", getHost(), getMappedPort(HTTP_PORT));
     }
 
+    public Integer getEmulatorGrpcPort() {
+        return getMappedPort(GRPC_PORT);
+    }
+
     public String getProjectId() {
         return PROJECT_ID;
     }
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
index 7f06a67c26c..0337cd563b9 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
@@ -1,11 +1,39 @@
 package org.testcontainers.containers;
 
+import com.google.api.core.ApiFuture;
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.rpc.FixedTransportChannelProvider;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.DatasetId;
+import com.google.cloud.bigquery.DatasetInfo;
+import com.google.cloud.bigquery.Field;
 import com.google.cloud.bigquery.QueryJobConfiguration;
+import com.google.cloud.bigquery.Schema;
+import com.google.cloud.bigquery.StandardSQLTypeName;
+import com.google.cloud.bigquery.StandardTableDefinition;
+import com.google.cloud.bigquery.TableDefinition;
+import com.google.cloud.bigquery.TableId;
+import com.google.cloud.bigquery.TableInfo;
 import com.google.cloud.bigquery.TableResult;
+import com.google.cloud.bigquery.storage.v1.AppendRowsResponse;
+import com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest;
+import com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse;
+import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient;
+import com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings;
+import com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest;
+import com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamRequest;
+import com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamResponse;
+import com.google.cloud.bigquery.storage.v1.JsonStreamWriter;
+import com.google.cloud.bigquery.storage.v1.TableName;
+import com.google.cloud.bigquery.storage.v1.WriteStream;
+import io.grpc.ManagedChannelBuilder;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
+import org.threeten.bp.Duration;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -16,7 +44,7 @@
 class BigQueryEmulatorContainerTest {
 
     @Test
-    void test() throws Exception {
+    void testHttpEndpoint() throws Exception {
         try (
             // emulatorContainer {
             BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.4.3")
@@ -51,4 +79,126 @@ void test() throws Exception {
             assertThat(values).containsOnly(BigDecimal.valueOf(30));
         }
     }
+
+    @Test
+    void testGrcpEndpoint() throws Exception {
+        try (
+            BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.6.5")
+        ) {
+            container.start();
+
+            BigQuery bigQuery = getBigQuery(container);
+            String tableName = "test-table";
+            String datasetName = "test-dataset";
+
+            bigQuery.create(DatasetInfo.of(DatasetId.of(container.getProjectId(), datasetName)));
+
+            Schema schema = Schema.of(Field.of("name", StandardSQLTypeName.STRING));
+
+            TableId tableId = TableId.of(datasetName, tableName);
+            TableDefinition tableDefinition = StandardTableDefinition.of(schema);
+            TableInfo tableInfo = TableInfo.newBuilder(tableId, tableDefinition).build();
+
+            bigQuery.create(tableInfo);
+
+            BigQueryWriteSettings.Builder bigQueryWriteSettingsBuilder = BigQueryWriteSettings.newBuilder();
+
+            bigQueryWriteSettingsBuilder
+                .createWriteStreamSettings()
+                .setRetrySettings(
+                    bigQueryWriteSettingsBuilder
+                        .createWriteStreamSettings()
+                        .getRetrySettings()
+                        .toBuilder()
+                        .setTotalTimeout(Duration.ofSeconds(60))
+                        .build()
+                );
+
+            BigQueryWriteClient bigQueryWriteClient = BigQueryWriteClient.create(
+                bigQueryWriteSettingsBuilder
+                    .setTransportChannelProvider(
+                        FixedTransportChannelProvider.create(
+                            GrpcTransportChannel.create(
+                                ManagedChannelBuilder
+                                    .forAddress(container.getHost(), container.getEmulatorGrpcPort())
+                                    .usePlaintext()
+                                    .build()
+                            )
+                        )
+                    )
+                    .setCredentialsProvider(NoCredentialsProvider.create())
+                    .build()
+            );
+
+            TableName parentTable = TableName.of(container.getProjectId(), datasetName, tableName);
+            CreateWriteStreamRequest createWriteStreamRequest = CreateWriteStreamRequest
+                .newBuilder()
+                .setParent(parentTable.toString())
+                .setWriteStream(WriteStream.newBuilder().setType(WriteStream.Type.PENDING))
+                .build();
+
+            WriteStream writeStream = bigQueryWriteClient.createWriteStream(createWriteStreamRequest);
+
+            JsonStreamWriter writer = JsonStreamWriter
+                .newBuilder(writeStream.getName(), writeStream.getTableSchema(), bigQueryWriteClient)
+                .build();
+
+            JSONArray jsonArray = new JSONArray();
+            JSONObject record1 = new JSONObject();
+            record1.put("name", "Alice");
+            jsonArray.put(record1);
+
+            JSONObject record2 = new JSONObject();
+            record2.put("name", "Bob");
+            jsonArray.put(record2);
+
+            ApiFuture<AppendRowsResponse> future = writer.append(jsonArray);
+            AppendRowsResponse response = future.get();
+
+            FinalizeWriteStreamRequest finalizeRequest = FinalizeWriteStreamRequest
+                .newBuilder()
+                .setName(writeStream.getName())
+                .build();
+            FinalizeWriteStreamResponse finalizeResponse = bigQueryWriteClient.finalizeWriteStream(finalizeRequest);
+
+            BatchCommitWriteStreamsRequest commitRequest = BatchCommitWriteStreamsRequest
+                .newBuilder()
+                .setParent(parentTable.toString())
+                .addWriteStreams(writeStream.getName())
+                .build();
+            BatchCommitWriteStreamsResponse commitResponse = bigQueryWriteClient.batchCommitWriteStreams(commitRequest);
+
+            writer.close();
+
+            String sql = String.format(
+                "SELECT name FROM `%s.%s.%s` ORDER BY name",
+                container.getProjectId(),
+                datasetName,
+                tableName
+            );
+            TableResult result = bigQuery.query(QueryJobConfiguration.newBuilder(sql).build());
+
+            List<String> names = result
+                .streamValues()
+                .map(row -> row.get("name").getStringValue())
+                .collect(Collectors.toList());
+
+            assertThat(names).containsExactly("Alice", "Bob");
+
+            bigQueryWriteClient.shutdown();
+            bigQueryWriteClient.close();
+        }
+    }
+
+    private BigQuery getBigQuery(BigQueryEmulatorContainer container) {
+        String url = container.getEmulatorHttpEndpoint();
+        return BigQueryOptions
+            .newBuilder()
+            .setProjectId(container.getProjectId())
+            .setHost(url)
+            .setLocation(url)
+            .setCredentials(NoCredentials.getInstance())
+            .build()
+            .getService();
+    }
 }

From c5e48b9835979815388db9616e00683eca903b63 Mon Sep 17 00:00:00 2001
From: Gasan Guseinov <465806+gusega@users.noreply.github.com>
Date: Wed, 24 Sep 2025 22:07:20 +0200
Subject: [PATCH 4577/4969] Fix javadoc ConfluentKafkaContainer.java (#10714)

---
 .../org/testcontainers/kafka/ConfluentKafkaContainer.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
index 42942cdd3a5..abbd2bfd908 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
@@ -87,8 +87,8 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
      * <p>
      * Default advertised listeners:
      * <ul>
-     *      <li>{@code container.getConfig().getHostName():9092}</li>
-     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9092)}</li>
+     *      <li>{@code containerInfo.getConfig().getHostName():9093}</li>
      * </ul>
      * @param listener a listener with format {@code host:port}
      * @return this {@link ConfluentKafkaContainer} instance
@@ -118,8 +118,8 @@ public ConfluentKafkaContainer withListener(String listener) {
      * <p>
      * Default advertised listeners:
      * <ul>
-     *      <li>{@code container.getConfig().getHostName():9092}</li>
-     *      <li>{@code container.getHost():container.getMappedPort(9093)}</li>
+     *      <li>{@code container.getHost():container.getMappedPort(9092)}</li>
+     *      <li>{@code containerInfo.getConfig().getHostName():9093}</li>
      * </ul>
      * @param listener a supplier that will provide a listener
      * @param advertisedListener a supplier that will provide a listener

From 7369dd9605e2faa7edc77917b9e9fe7b41b117e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 24 Sep 2025 15:34:39 -0600
Subject: [PATCH 4578/4969] Move Testcontainers tests to JUnit Jupiter (#10803)

---
 core/build.gradle                             |  20 ++-
 .../testcontainers/JarFileShadingTest.java    |  10 +-
 .../testcontainers/PublicBinaryAPITest.java   |  41 +++---
 .../OutOfPackageImagePullPolicyTest.java      |   6 +-
 .../java/org/testcontainers/DaemonTest.java   |   6 +-
 .../DockerClientFactoryTest.java              |  18 ++-
 .../ComposeContainerWithServicesTest.java     |  22 +--
 .../containers/ComposeOverridesTest.java      |  32 +----
 .../containers/ComposeProfilesOptionTest.java |  24 +---
 .../containers/ContainerStateTest.java        |  23 +---
 ...ockerComposeContainerWithServicesTest.java |  22 +--
 .../containers/DockerComposeFilesTest.java    |   8 +-
 .../DockerComposeOverridesTest.java           |  32 +----
 .../DockerComposeProfilesOptionTest.java      |  20 +--
 .../DockerMcpGatewayContainerTest.java        |   8 +-
 .../DockerModelRunnerContainerTest.java       |   8 +-
 .../containers/ExposedHostTest.java           |  28 ++--
 .../FailureDetectingExternalResourceTest.java |   6 +-
 .../containers/GenericContainerTest.java      |  32 ++---
 .../testcontainers/containers/JibTest.java    |  10 +-
 .../containers/MultiStageBuildTest.java       |   8 +-
 .../containers/NetworkTest.java               |  31 ++---
 ...ParsedDockerComposeFileValidationTest.java |  36 ++---
 .../containers/ReusabilityUnitTests.java      |  96 ++++++-------
 .../containers/output/ContainerLogsTest.java  |  18 +--
 .../FrameConsumerResultCallbackTest.java      |  28 ++--
 .../output/ToStringConsumerTest.java          |  16 ++-
 .../IsRunningStartupCheckStrategyTest.java    |  14 +-
 .../ExternalPortListeningCheckTest.java       |  18 +--
 ...InternalCommandPortListeningCheckTest.java |  36 +++--
 .../DockerHealthcheckWaitStrategyTest.java    |  12 +-
 .../wait/strategy/WaitAllStrategyTest.java    |  24 ++--
 .../dockerclient/AmbiguousImagePullTest.java  |  10 +-
 .../DockerClientConfigUtilsTest.java          |  18 +--
 ...temPropertyClientProviderStrategyTest.java |  29 ++--
 .../dockerclient/EventStreamTest.java         |  13 +-
 .../dockerclient/ImagePullTest.java           |  20 +--
 ...ostPropertyClientProviderStrategyTest.java |  23 +---
 .../images/AgeBasedPullPolicyTest.java        |   6 +-
 .../testcontainers/images/ImageDataTest.java  |   8 +-
 .../images/ImagePullPolicyTest.java           |  22 +--
 .../images/OverrideImagePullPolicyTest.java   |  24 ++--
 .../images/ParsedDockerfileTest.java          |  24 ++--
 .../images/RemoteDockerImageTest.java         |  19 +--
 .../images/builder/DockerfileBuildTest.java   |  60 ++++----
 .../images/builder/DockerignoreTest.java      |   8 +-
 .../builder/ImageFromDockerfileTest.java      |   8 +-
 .../statement/AbstractStatementTest.java      |  15 +-
 .../statement/KeyValuesStatementTest.java     |  19 ++-
 .../statement/MultiArgsStatementTest.java     |  13 +-
 .../statement/RawStatementTest.java           |  11 +-
 .../SingleArgumentStatementTest.java          |  13 +-
 .../testcontainers/junit/BaseComposeTest.java |  22 +--
 .../junit/BaseDockerComposeTest.java          |  22 +--
 .../junit/ComposeContainerOverrideTest.java   |   8 +-
 .../junit/ComposeContainerPortViaEnvTest.java |  10 +-
 .../junit/ComposeContainerScalingTest.java    |  26 ++--
 .../junit/ComposeContainerTest.java           |  18 +--
 .../ComposeContainerVolumeRemovalTest.java    |  35 ++---
 .../junit/ComposeContainerWithBuildTest.java  |  47 +++----
 .../ComposeContainerWithCopyFilesTest.java    |  12 +-
 .../ComposeContainerWithOptionsTest.java      |  75 ++++------
 .../ComposeContainerWithWaitStrategies.java   |   8 +-
 .../junit/ComposeErrorHandlingTest.java       |   6 +-
 .../junit/ComposePassthroughTest.java         |  22 +--
 .../junit/ComposeWaitStrategyTest.java        |  31 ++---
 .../junit/ComposeWithIdentifierTest.java      |  10 +-
 .../junit/ComposeWithNetworkTest.java         |  10 +-
 .../junit/CopyFileToContainerTest.java        |  16 +--
 .../junit/DependenciesTest.java               |  16 +--
 .../DockerComposeContainerPortViaEnvTest.java |  10 +-
 .../DockerComposeContainerScalingTest.java    |  23 ++--
 .../junit/DockerComposeContainerTest.java     |  22 +--
 ...ckerComposeContainerVolumeRemovalTest.java |  30 ++--
 .../DockerComposeContainerWithBuildTest.java  |  47 +++----
 ...ckerComposeContainerWithCopyFilesTest.java |  10 +-
 ...DockerComposeContainerWithOptionsTest.java |  75 ++++------
 .../junit/DockerComposeErrorHandlingTest.java |   6 +-
 .../junit/DockerComposeLocalImageTest.java    |   6 +-
 .../junit/DockerComposeLogConsumerTest.java   |   6 +-
 .../junit/DockerComposePassthroughTest.java   |  59 ++++----
 .../junit/DockerComposeServiceTest.java       |  24 ++--
 .../junit/DockerComposeV2FormatTest.java      |  10 +-
 ...ckerComposeV2FormatWithIdentifierTest.java |  10 +-
 .../junit/DockerComposeV2WithNetworkTest.java |  10 +-
 .../junit/DockerComposeWaitStrategyTest.java  |  31 ++---
 .../junit/DockerNetworkModeTest.java          |   8 +-
 .../junit/DockerfileContainerTest.java        |  12 +-
 .../testcontainers/junit/DockerfileTest.java  |  12 +-
 .../junit/ExecInContainerTest.java            |  30 ++--
 .../junit/FileOperationsTest.java             |  60 ++++----
 .../junit/FixedHostPortContainerTest.java     |   6 +-
 .../junit/GenericContainerRuleTest.java       |  66 ++++-----
 .../junit/NonExistentImagePullTest.java       |  10 +-
 .../junit/OutputStreamTest.java               |  46 +++++--
 .../junit/OutputStreamWithTTYTest.java        |  28 ++--
 .../ParameterizedDockerfileContainerTest.java |  36 ++---
 .../junit/WorkingDirectoryTest.java           |  12 +-
 .../strategy/AbstractWaitStrategyTest.java    |   4 +-
 .../strategy/HostPortWaitStrategyTest.java    |  29 ++--
 .../wait/strategy/HttpWaitStrategyTest.java   |  30 ++--
 .../strategy/LogMessageWaitStrategyTest.java  |  16 +--
 .../wait/strategy/ShellStrategyTest.java      |   8 +-
 .../utility/AuthenticatedImagePullTest.java   |  20 +--
 .../utility/ClasspathScannerTest.java         |  16 +--
 .../utility/ComparableVersionTest.java        |  24 +---
 .../DefaultImageNameSubstitutorTest.java      |  16 +--
 .../utility/DirectoryTarResourceTest.java     |  10 +-
 .../DockerImageNameCompatibilityTest.java     |  24 ++--
 .../utility/DockerImageNameTest.java          | 130 +++++++++---------
 .../utility/DockerLoggerFactoryTest.java      |   6 +-
 .../utility/DockerStatusTest.java             |  32 ++---
 .../utility/FilterRegistryTest.java           |  10 +-
 .../utility/ImageNameSubstitutorTest.java     |  34 +++--
 .../utility/LazyFutureTest.java               |  17 ++-
 .../utility/LicenseAcceptanceTest.java        |  15 +-
 ...kTestcontainersConfigurationExtension.java |  39 ++++++
 .../MockTestcontainersConfigurationRule.java  |  39 ------
 .../utility/MountableFileTest.java            |  26 ++--
 .../PrefixingImageNameSubstitutorTest.java    |  26 ++--
 .../utility/RegistryAuthLocatorTest.java      |  39 +++---
 .../utility/ResourceReaperTest.java           |   8 +-
 .../utility/TestEnvironmentTest.java          |  12 +-
 .../TestcontainersConfigurationTest.java      |  46 +++----
 124 files changed, 1368 insertions(+), 1483 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationExtension.java
 delete mode 100644 core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java

diff --git a/core/build.gradle b/core/build.gradle
index ac868c2f928..b4eeae7b0c5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -30,6 +30,7 @@ shadowJar {
 }
 
 task jarFileTest(type: Test) {
+    useJUnitPlatform()
     testClassesDirs = sourceSets.jarFileTest.output.classesDirs
     classpath = sourceSets.jarFileTest.runtimeClasspath
 
@@ -105,6 +106,9 @@ dependencies {
 
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation('com.google.cloud.tools:jib-core:0.27.3')  {
         exclude group: 'com.google.guava', module: 'guava'
     }
@@ -124,8 +128,9 @@ dependencies {
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
-    jarFileTestImplementation 'junit:junit:4.13.2'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.27.6'
+    jarFileTestRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+    jarFileTestImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.27.4'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 
@@ -135,3 +140,14 @@ tasks.generatePomFileForMavenJavaPublication.finalizedBy(
         ]
     }
 )
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+    options.release.set(17)
+}
+
+test {
+    useJUnitPlatform()
+}
diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
index 6b9ebc32efc..8b6f380f6eb 100644
--- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers;
 
 import org.assertj.core.api.ListAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,17 +9,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JarFileShadingTest extends AbstractJarFileTest {
+class JarFileShadingTest extends AbstractJarFileTest {
 
     @Test
-    public void testPackages() throws Exception {
+    void testPackages() throws Exception {
         assertThatFileList(root).containsOnly("org", "META-INF");
 
         assertThatFileList(root.resolve("org")).containsOnly("testcontainers");
     }
 
     @Test
-    public void testMetaInf() throws Exception {
+    void testMetaInf() throws Exception {
         assertThatFileList(root.resolve("META-INF"))
             .containsOnly(
                 "MANIFEST.MF",
@@ -33,7 +33,7 @@ public void testMetaInf() throws Exception {
     }
 
     @Test
-    public void testMetaInfServices() throws Exception {
+    void testMetaInfServices() throws Exception {
         assertThatFileList(root.resolve("META-INF").resolve("services"))
             .allMatch(it -> it.startsWith("org.testcontainers."));
     }
diff --git a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
index 77156e77636..6f8a1c46941 100644
--- a/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
+++ b/core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java
@@ -2,12 +2,12 @@
 
 import lombok.RequiredArgsConstructor;
 import org.assertj.core.api.Assertions;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -30,15 +30,15 @@
 
 /**
  * This test checks that we don't expose any shaded class in our public API.
- * We use {@link Parameterized} runner here to create a test per public class in Testcontainers' JAR file.
  */
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("data")
 @RequiredArgsConstructor
 public class PublicBinaryAPITest extends AbstractJarFileTest {
 
-    private static String SHADED_PACKAGE = "org.testcontainers.shaded.";
+    private static final String SHADED_PACKAGE = "org.testcontainers.shaded.";
 
-    private static String SHADED_PACKAGE_PATH = SHADED_PACKAGE.replaceAll("\\.", "/");
+    private static final String SHADED_PACKAGE_PATH = SHADED_PACKAGE.replaceAll("\\.", "/");
 
     static {
         Assertions.registerFormatterForType(ClassNode.class, it -> it.name);
@@ -46,7 +46,6 @@ public class PublicBinaryAPITest extends AbstractJarFileTest {
         Assertions.registerFormatterForType(MethodNode.class, it -> it.name + it.desc);
     }
 
-    @Parameters(name = "{0}")
     public static List<Object[]> data() throws Exception {
         List<Object[]> result = new ArrayList<>();
 
@@ -85,11 +84,13 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IO
         return result;
     }
 
-    private final String fileName;
+    @Parameter(0)
+    private String fileName;
 
-    private final ClassNode classNode;
+    @Parameter(1)
+    private ClassNode classNode;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         switch (classNode.name) {
             // Necessary evil
@@ -97,29 +98,29 @@ public void setUp() {
             case "org/testcontainers/dockerclient/DockerClientProviderStrategy":
             case "org/testcontainers/dockerclient/WindowsClientProviderStrategy":
             case "org/testcontainers/utility/DynamicPollInterval":
-                Assume.assumeTrue(false);
+                Assumptions.assumeTrue(false);
         }
     }
 
     @Test
-    public void testSuperClass() {
+    void testSuperClass() {
         assertThat(classNode.superName).doesNotStartWith(SHADED_PACKAGE_PATH);
     }
 
     @Test
-    public void testInterfaces() {
+    void testInterfaces() {
         assertThat(classNode.interfaces).allSatisfy(it -> assertThat(it).doesNotStartWith(SHADED_PACKAGE_PATH));
     }
 
     @Test
-    public void testMethodReturnTypes() {
+    void testMethodReturnTypes() {
         assertThat(classNode.methods)
             .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
             .allSatisfy(it -> assertThat(Type.getReturnType(it.desc).getClassName()).doesNotStartWith(SHADED_PACKAGE));
     }
 
     @Test
-    public void testMethodArguments() {
+    void testMethodArguments() {
         assertThat(classNode.methods)
             .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
             .allSatisfy(method -> {
@@ -130,7 +131,7 @@ public void testMethodArguments() {
     }
 
     @Test
-    public void testFields() {
+    void testFields() {
         assertThat(classNode.fields)
             .filteredOn(it -> (it.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) != 0)
             .allSatisfy(it -> assertThat(Type.getType(it.desc).getClassName()).doesNotStartWith(SHADED_PACKAGE));
diff --git a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
index 6b7f7044994..5b13d172386 100644
--- a/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
+++ b/core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java
@@ -1,6 +1,6 @@
 package alt.testcontainers.images;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -8,10 +8,10 @@
 import org.testcontainers.images.ImageData;
 import org.testcontainers.utility.DockerImageName;
 
-public class OutOfPackageImagePullPolicyTest {
+class OutOfPackageImagePullPolicyTest {
 
     @Test
-    public void shouldSupportCustomPoliciesOutOfTestcontainersPackage() {
+    void shouldSupportCustomPoliciesOutOfTestcontainersPackage() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withImagePullPolicy(
diff --git a/core/src/test/java/org/testcontainers/DaemonTest.java b/core/src/test/java/org/testcontainers/DaemonTest.java
index dd35112f781..01f4a1c5475 100644
--- a/core/src/test/java/org/testcontainers/DaemonTest.java
+++ b/core/src/test/java/org/testcontainers/DaemonTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.File;
@@ -14,7 +14,7 @@
 /**
  * This test forks a new JVM, otherwise it's not possible to reliably diff the threads
  */
-public class DaemonTest {
+class DaemonTest {
 
     public static void main(String[] args) {
         Thread mainThread = Thread.currentThread();
@@ -46,7 +46,7 @@ public static void main(String[] args) {
     }
 
     @Test
-    public void testThatAllThreadsAreDaemons() throws Exception {
+    void testThatAllThreadsAreDaemons() throws Exception {
         ProcessBuilder processBuilder = new ProcessBuilder(
             new File(System.getProperty("java.home")).toPath().resolve("bin").resolve("java").toString(),
             "-ea",
diff --git a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
index 794bbbc37c9..56c68d4fd5d 100644
--- a/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/DockerClientFactoryTest.java
@@ -1,10 +1,10 @@
 package org.testcontainers;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -12,13 +12,11 @@
 /**
  * Test for {@link DockerClientFactory}.
  */
-public class DockerClientFactoryTest {
-
-    @Rule
-    public MockTestcontainersConfigurationRule configurationMock = new MockTestcontainersConfigurationRule();
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
+class DockerClientFactoryTest {
 
     @Test
-    public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
+    void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
         try (DockerRegistryContainer registryContainer = new DockerRegistryContainer()) {
             registryContainer.start();
             DockerImageName imageName = registryContainer.createImage();
@@ -40,14 +38,14 @@ public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
     }
 
     @Test
-    public void dockerHostIpAddress() {
+    void dockerHostIpAddress() {
         DockerClientFactory instance = new DockerClientFactory();
         instance.strategy = null;
         assertThat(instance.dockerHostIpAddress()).isNotNull();
     }
 
     @Test
-    public void failedChecksFailFast() {
+    void failedChecksFailFast() {
         DockerClientFactory instance = DockerClientFactory.instance();
         assertThat(instance.client()).isNotNull();
         assertThat(instance.cachedClientFailure).isNull();
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
index 9a73c83981b..6d141ac08f1 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -13,7 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class ComposeContainerWithServicesTest {
+class ComposeContainerWithServicesTest {
 
     public static final File SIMPLE_COMPOSE_FILE = new File(
         "src/test/resources/compose-scaling-multiple-containers.yml"
@@ -28,7 +28,7 @@ public class ComposeContainerWithServicesTest {
     );
 
     @Test
-    public void testDesiredSubsetOfServicesAreStarted() {
+    void testDesiredSubsetOfServicesAreStarted() {
         try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withServices("redis")) {
             compose.start();
 
@@ -37,7 +37,7 @@ public void testDesiredSubsetOfServicesAreStarted() {
     }
 
     @Test
-    public void testDesiredSubsetOfScaledServicesAreStarted() {
+    void testDesiredSubsetOfScaledServicesAreStarted() {
         try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withScaledService("redis", 2)) {
             compose.start();
 
@@ -46,7 +46,7 @@ public void testDesiredSubsetOfScaledServicesAreStarted() {
     }
 
     @Test
-    public void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
+    void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
         try (
             ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
                 .withServices("redis")
@@ -59,7 +59,7 @@ public void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
     }
 
     @Test
-    public void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
+    void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
         try (
             ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
                 .withServices("other")
@@ -72,7 +72,7 @@ public void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
     }
 
     @Test
-    public void testAllServicesAreStartedIfNotSpecified() {
+    void testAllServicesAreStartedIfNotSpecified() {
         try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)) {
             compose.start();
 
@@ -81,7 +81,7 @@ public void testAllServicesAreStartedIfNotSpecified() {
     }
 
     @Test
-    public void testScaleInComposeFileIsRespected() {
+    void testScaleInComposeFileIsRespected() {
         try (ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_INLINE_SCALE)) {
             compose.start();
 
@@ -91,7 +91,7 @@ public void testScaleInComposeFileIsRespected() {
     }
 
     @Test
-    public void testStartupTimeoutSetsTheHighestTimeout() {
+    void testStartupTimeoutSetsTheHighestTimeout() {
         assertThat(
             catchThrowable(() -> {
                 try (
@@ -113,7 +113,7 @@ public void testStartupTimeoutSetsTheHighestTimeout() {
     }
 
     @Test
-    public void testWaitingForHealthcheck() {
+    void testWaitingForHealthcheck() {
         try (
             ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
@@ -125,7 +125,7 @@ public void testWaitingForHealthcheck() {
     }
 
     @Test
-    public void testWaitingForHealthcheckWithRestartDoesNotCrash() {
+    void testWaitingForHealthcheckWithRestartDoesNotCrash() {
         try (
             ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
index 553ac21a8a0..1ed03ae9315 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
@@ -3,11 +3,8 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.apache.commons.lang3.SystemUtils;
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.utility.CommandLine;
 
@@ -18,8 +15,7 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-@RunWith(Parameterized.class)
-public class ComposeOverridesTest {
+class ComposeOverridesTest {
 
     private static final String DOCKER_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
 
@@ -37,19 +33,6 @@ public class ComposeOverridesTest {
 
     private static final String SERVICE_NAME = "alpine-1";
 
-    private final boolean localMode;
-
-    private final String expectedEnvVar;
-
-    private final File[] composeFiles;
-
-    public ComposeOverridesTest(boolean localMode, String expectedEnvVar, File... composeFiles) {
-        this.localMode = localMode;
-        this.expectedEnvVar = expectedEnvVar;
-        this.composeFiles = composeFiles;
-    }
-
-    @Parameters(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
@@ -61,18 +44,15 @@ public static Iterable<Object[]> data() {
         );
     }
 
-    @Before
-    public void setUp() {
+    @ParameterizedTest(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
+    @MethodSource("data")
+    void test(boolean localMode, String expectedEnvVar, File... composeFiles) {
         if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DOCKER_EXECUTABLE))
                 .as("docker executable exists")
                 .isTrue();
         }
-    }
-
-    @Test
-    public void test() {
         try (
             ComposeContainer compose = new ComposeContainer(composeFiles)
                 .withLocalCompose(localMode)
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
index 8fc662a118e..8a176fdcddb 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
@@ -1,41 +1,31 @@
 package org.testcontainers.containers;
 
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class ComposeProfilesOptionTest {
+class ComposeProfilesOptionTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static Boolean[] local() {
         return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
     }
 
-    @Parameterized.Parameter
-    public boolean localMode;
-
     public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
 
-    @Before
-    public void setUp() {
-        if (this.localMode) {
+    @ParameterizedTest
+    @MethodSource("local")
+    void testProfileOption(boolean localMode) {
+        if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(ComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker executable exists")
                 .isTrue();
         }
-    }
-
-    @Test
-    public void testProfileOption() {
         try (
             // composeContainerWithLocalCompose {
             ComposeContainer compose = new ComposeContainer(COMPOSE_FILE)
diff --git a/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
index d3cedc11464..7b37bc1926f 100644
--- a/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ContainerStateTest.java
@@ -1,8 +1,7 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Collections;
 import java.util.List;
@@ -12,10 +11,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(Parameterized.class)
-public class ContainerStateTest {
+class ContainerStateTest {
 
-    @Parameterized.Parameters(name = "{0} ({1} -> {2})")
     public static Object[][] params() {
         return new Object[][] {
             new Object[] { "regular mapping", "80:8080/tcp", Collections.singletonList(80) },
@@ -27,17 +24,9 @@ public static Object[][] params() {
         };
     }
 
-    @Parameterized.Parameter(0)
-    public String name;
-
-    @Parameterized.Parameter(1)
-    public String testSet;
-
-    @Parameterized.Parameter(2)
-    public List<Integer> expectedResult;
-
-    @Test
-    public void test() {
+    @ParameterizedTest(name = "{0} ({1} -> {2})")
+    @MethodSource("params")
+    void test(String name, String testSet, List<Integer> expectedResult) {
         ContainerState containerState = mock(ContainerState.class);
         doCallRealMethod().when(containerState).getBoundPortNumbers();
 
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
index f92c4727921..cc6c124fde0 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -13,7 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class DockerComposeContainerWithServicesTest {
+class DockerComposeContainerWithServicesTest {
 
     public static final File SIMPLE_COMPOSE_FILE = new File(
         "src/test/resources/compose-scaling-multiple-containers.yml"
@@ -28,7 +28,7 @@ public class DockerComposeContainerWithServicesTest {
     );
 
     @Test
-    public void testDesiredSubsetOfServicesAreStarted() {
+    void testDesiredSubsetOfServicesAreStarted() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE).withServices("redis")
         ) {
@@ -39,7 +39,7 @@ public void testDesiredSubsetOfServicesAreStarted() {
     }
 
     @Test
-    public void testDesiredSubsetOfScaledServicesAreStarted() {
+    void testDesiredSubsetOfScaledServicesAreStarted() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
                 .withScaledService("redis", 2)
@@ -51,7 +51,7 @@ public void testDesiredSubsetOfScaledServicesAreStarted() {
     }
 
     @Test
-    public void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
+    void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
                 .withServices("redis")
@@ -64,7 +64,7 @@ public void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
     }
 
     @Test
-    public void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
+    void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
                 .withServices("other")
@@ -77,7 +77,7 @@ public void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
     }
 
     @Test
-    public void testAllServicesAreStartedIfNotSpecified() {
+    void testAllServicesAreStartedIfNotSpecified() {
         try (DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)) {
             compose.start();
 
@@ -86,7 +86,7 @@ public void testAllServicesAreStartedIfNotSpecified() {
     }
 
     @Test
-    public void testScaleInComposeFileIsRespected() {
+    void testScaleInComposeFileIsRespected() {
         try (DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_INLINE_SCALE)) {
             compose.start();
 
@@ -96,7 +96,7 @@ public void testScaleInComposeFileIsRespected() {
     }
 
     @Test
-    public void testStartupTimeoutSetsTheHighestTimeout() {
+    void testStartupTimeoutSetsTheHighestTimeout() {
         assertThat(
             catchThrowable(() -> {
                 try (
@@ -118,7 +118,7 @@ public void testStartupTimeoutSetsTheHighestTimeout() {
     }
 
     @Test
-    public void testWaitingForHealthcheck() {
+    void testWaitingForHealthcheck() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
@@ -130,7 +130,7 @@ public void testWaitingForHealthcheck() {
     }
 
     @Test
-    public void testWaitingForHealthcheckWithRestartDoesNotCrash() {
+    void testWaitingForHealthcheckWithRestartDoesNotCrash() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
index 9ae02a676c4..4704817c0e0 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java
@@ -1,16 +1,16 @@
 package org.testcontainers.containers;
 
 import com.google.common.collect.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DockerComposeFilesTest {
+class DockerComposeFilesTest {
 
     @Test
-    public void shouldGetDependencyImages() {
+    void shouldGetDependencyImages() {
         DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(
             Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-parsing-v2.yml"))
         );
@@ -19,7 +19,7 @@ public void shouldGetDependencyImages() {
     }
 
     @Test
-    public void shouldGetDependencyImagesWhenOverriding() {
+    void shouldGetDependencyImagesWhenOverriding() {
         DockerComposeFiles dockerComposeFiles = new DockerComposeFiles(
             Lists.newArrayList(
                 new File("src/test/resources/docker-compose-imagename-overriding-a.yml"),
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
index 036134e32d8..eb66fbabc38 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
@@ -2,11 +2,8 @@
 
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.utility.CommandLine;
 
@@ -17,8 +14,7 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-@RunWith(Parameterized.class)
-public class DockerComposeOverridesTest {
+class DockerComposeOverridesTest {
 
     private static final File BASE_COMPOSE_FILE = new File("src/test/resources/docker-compose-base.yml");
 
@@ -34,19 +30,6 @@ public class DockerComposeOverridesTest {
 
     private static final String SERVICE_NAME = "alpine_1";
 
-    private final boolean localMode;
-
-    private final String expectedEnvVar;
-
-    private final File[] composeFiles;
-
-    public DockerComposeOverridesTest(boolean localMode, String expectedEnvVar, File... composeFiles) {
-        this.localMode = localMode;
-        this.expectedEnvVar = expectedEnvVar;
-        this.composeFiles = composeFiles;
-    }
-
-    @Parameters(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
@@ -58,8 +41,9 @@ public static Iterable<Object[]> data() {
         );
     }
 
-    @Before
-    public void setUp() {
+    @ParameterizedTest(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
+    @MethodSource("data")
+    void test(boolean localMode, String expectedEnvVar, File... composeFiles) {
         if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
@@ -69,10 +53,6 @@ public void setUp() {
                 .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
                 .doesNotStartWith("Docker Compose version v2");
         }
-    }
-
-    @Test
-    public void test() {
         try (
             DockerComposeContainer compose = new DockerComposeContainer(composeFiles)
                 .withLocalCompose(localMode)
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
index 72f80cc877e..20a52566201 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
@@ -1,31 +1,27 @@
 package org.testcontainers.containers;
 
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class DockerComposeProfilesOptionTest {
+class DockerComposeProfilesOptionTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static Boolean[] local() {
         return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
     }
 
-    @Parameterized.Parameter
     public boolean localMode;
 
     public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
 
-    @Before
-    public void setUp() {
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("local")
+    void testProfileOption() {
         if (this.localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
@@ -35,10 +31,6 @@ public void setUp() {
                 .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
                 .doesNotStartWith("Docker Compose version v2");
         }
-    }
-
-    @Test
-    public void testProfileOption() {
         try (
             DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE)
                 .withOptions("--profile=cache")
diff --git a/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
index 28e4cf6fb6a..cecd9f4da6f 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
@@ -1,15 +1,15 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DockerMcpGatewayContainerTest {
+class DockerMcpGatewayContainerTest {
 
     @Test
-    public void serviceSuccessfullyStarts() {
+    void serviceSuccessfullyStarts() {
         try (DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/mcp-gateway:latest")) {
             gateway.start();
 
@@ -18,7 +18,7 @@ public void serviceSuccessfullyStarts() {
     }
 
     @Test
-    public void gatewayStartsWithServers() {
+    void gatewayStartsWithServers() {
         try (
             // container {
             DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/mcp-gateway:latest")
diff --git a/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java b/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
index c04c0159e51..b215a373cf5 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java
@@ -2,15 +2,15 @@
 
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-public class DockerModelRunnerContainerTest {
+class DockerModelRunnerContainerTest {
 
     @Test
-    public void checkStatus() {
+    void checkStatus() {
         assumeThat(System.getenv("CI")).isNull();
 
         try (
@@ -26,7 +26,7 @@ public void checkStatus() {
     }
 
     @Test
-    public void pullsModelAndExposesInference() {
+    void pullsModelAndExposesInference() {
         assumeThat(System.getenv("CI")).isNull();
 
         String modelName = "ai/smollm2:360M-Q4_K_M";
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 4ce316fcf80..39c986d1f8a 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -3,10 +3,10 @@
 import com.google.common.collect.ImmutableMap;
 import com.sun.net.httpserver.HttpServer;
 import lombok.SneakyThrows;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.testcontainers.DockerClientFactory;
@@ -23,11 +23,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-public class ExposedHostTest {
+class ExposedHostTest {
 
     private static HttpServer server;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
         server = HttpServer.create(new InetSocketAddress(0), 0);
         server.createContext(
@@ -44,18 +44,18 @@ public static void setUpClass() throws Exception {
         server.start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         server.stop(0);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         PortForwardingContainer.INSTANCE.reset();
     }
 
     @Test
-    public void testExposedHostAfterContainerIsStarted() {
+    void testExposedHostAfterContainerIsStarted() {
         try (GenericContainer<?> container = new GenericContainer<>(tinyContainerDef()).withAccessToHost(true)) {
             container.start();
             Testcontainers.exposeHostPorts(server.getAddress().getPort());
@@ -64,13 +64,13 @@ public void testExposedHostAfterContainerIsStarted() {
     }
 
     @Test
-    public void testExposedHost() {
+    void testExposedHost() {
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
         assertResponse(new GenericContainer<>(tinyContainerDef()), server.getAddress().getPort());
     }
 
     @Test
-    public void testExposedHostWithNetwork() {
+    void testExposedHostWithNetwork() {
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
         try (Network network = Network.newNetwork()) {
             assertResponse(
@@ -81,7 +81,7 @@ public void testExposedHostWithNetwork() {
     }
 
     @Test
-    public void testExposedHostPortOnFixedInternalPorts() {
+    void testExposedHostPortOnFixedInternalPorts() {
         Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 80));
         Testcontainers.exposeHostPorts(ImmutableMap.of(server.getAddress().getPort(), 81));
 
@@ -90,7 +90,7 @@ public void testExposedHostPortOnFixedInternalPorts() {
     }
 
     @Test
-    public void testExposedHostWithReusableContainerAndFixedNetworkName() throws IOException, InterruptedException {
+    void testExposedHostWithReusableContainerAndFixedNetworkName() throws IOException, InterruptedException {
         assumeThat(TestcontainersConfiguration.getInstance().environmentSupportsReuse()).isTrue();
         Network network = createReusableNetwork(UUID.randomUUID());
         Testcontainers.exposeHostPorts(server.getAddress().getPort());
@@ -117,7 +117,7 @@ public void testExposedHostWithReusableContainerAndFixedNetworkName() throws IOE
     }
 
     @Test
-    public void testExposedHostOnFixedInternalPortsWithReusableContainerAndFixedNetworkName()
+    void testExposedHostOnFixedInternalPortsWithReusableContainerAndFixedNetworkName()
         throws IOException, InterruptedException {
         assumeThat(TestcontainersConfiguration.getInstance().environmentSupportsReuse()).isTrue();
         Network network = createReusableNetwork(UUID.randomUUID());
diff --git a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
index c743fcf6a43..b2abf02bce5 100644
--- a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
+++ b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
@@ -10,10 +10,10 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-public class FailureDetectingExternalResourceTest {
+class FailureDetectingExternalResourceTest {
 
     @Test
-    public void finishedIsCalledForCleanupIfStartingThrows() throws Throwable {
+    void finishedIsCalledForCleanupIfStartingThrows() {
         FailureDetectingExternalResource res = spy(FailureDetectingExternalResource.class);
         Statement stmt = res.apply(mock(Statement.class), Description.EMPTY);
         doThrow(new RuntimeException()).when(res).starting(any());
diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
index c1c4ff3818e..37aac1b0af9 100644
--- a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -17,7 +17,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.assertj.core.api.Assumptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
@@ -46,10 +46,10 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-public class GenericContainerTest {
+class GenericContainerTest {
 
     @Test
-    public void shouldReportOOMAfterWait() {
+    void shouldReportOOMAfterWait() {
         Info info = DockerClientFactory.instance().client().infoCmd().exec();
         // Poor man's rootless Docker detection :D
         Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("name=rootless");
@@ -75,7 +75,7 @@ public void shouldReportOOMAfterWait() {
     }
 
     @Test
-    public void shouldReportErrorAfterWait() {
+    void shouldReportErrorAfterWait() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
@@ -90,7 +90,7 @@ public void shouldReportErrorAfterWait() {
     }
 
     @Test
-    public void shouldCopyTransferableAsFile() {
+    void shouldCopyTransferableAsFile() {
         try (
             // transferableFile {
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
@@ -107,7 +107,7 @@ public void shouldCopyTransferableAsFile() {
     }
 
     @Test
-    public void shouldCopyTransferableAsFileWithFileMode() {
+    void shouldCopyTransferableAsFileWithFileMode() {
         try (
             // transferableWithFileMode {
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
@@ -124,7 +124,7 @@ public void shouldCopyTransferableAsFileWithFileMode() {
     }
 
     @Test
-    public void shouldCopyTransferableAfterMountableFile() {
+    void shouldCopyTransferableAfterMountableFile() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())
@@ -140,7 +140,7 @@ public void shouldCopyTransferableAfterMountableFile() {
     }
 
     @Test
-    public void shouldOnlyPublishExposedPorts() {
+    void shouldOnlyPublishExposedPorts() {
         ImageFromDockerfile image = new ImageFromDockerfile("publish-multiple")
             .withDockerfileFromBuilder(builder -> {
                 builder
@@ -176,7 +176,7 @@ public void shouldOnlyPublishExposedPorts() {
     }
 
     @Test
-    public void shouldWaitUntilExposedPortIsMapped() {
+    void shouldWaitUntilExposedPortIsMapped() {
         ImageFromDockerfile image = new ImageFromDockerfile("publish-multiple")
             .withDockerfileFromBuilder(builder -> {
                 builder
@@ -198,7 +198,7 @@ public void shouldWaitUntilExposedPortIsMapped() {
     }
 
     @Test
-    public void testArchitectureCheck() {
+    void testArchitectureCheck() {
         assumeThat(DockerClientFactory.instance().client().versionCmd().exec().getArch()).isNotEqualTo("amd64");
         // Choose an image that is *different* from the server architecture--this ensures we always get a warning.
         final String image;
@@ -233,7 +233,7 @@ public void testArchitectureCheck() {
     }
 
     @Test
-    public void shouldReturnTheProvidedImage() {
+    void shouldReturnTheProvidedImage() {
         GenericContainer container = new GenericContainer(TestImages.REDIS_IMAGE);
         assertThat(container.getImage().get()).isEqualTo("redis:6-alpine");
         container.setImage(new RemoteDockerImage(TestImages.ALPINE_IMAGE));
@@ -241,7 +241,7 @@ public void shouldReturnTheProvidedImage() {
     }
 
     @Test
-    public void shouldContainDefaultNetworkAlias() {
+    void shouldContainDefaultNetworkAlias() {
         try (GenericContainer<?> container = new GenericContainer<>("testcontainers/helloworld:1.1.0")) {
             container.start();
             assertThat(container.getNetworkAliases()).hasSize(1);
@@ -249,7 +249,7 @@ public void shouldContainDefaultNetworkAlias() {
     }
 
     @Test
-    public void shouldContainDefaultNetworkAliasWhenUsingGenericContainer() {
+    void shouldContainDefaultNetworkAliasWhenUsingGenericContainer() {
         try (HelloWorldContainer container = new HelloWorldContainer("testcontainers/helloworld:1.1.0")) {
             container.start();
             assertThat(container.getNetworkAliases()).hasSize(1);
@@ -257,7 +257,7 @@ public void shouldContainDefaultNetworkAliasWhenUsingGenericContainer() {
     }
 
     @Test
-    public void shouldContainDefaultNetworkAliasWhenUsingContainerDef() {
+    void shouldContainDefaultNetworkAliasWhenUsingContainerDef() {
         try (TcHelloWorldContainer container = new TcHelloWorldContainer("testcontainers/helloworld:1.1.0")) {
             container.start();
             assertThat(container.getNetworkAliases()).hasSize(1);
@@ -265,7 +265,7 @@ public void shouldContainDefaultNetworkAliasWhenUsingContainerDef() {
     }
 
     @Test
-    public void shouldRespectWaitStrategy() {
+    void shouldRespectWaitStrategy() {
         try (
             HelloWorldLogStrategyContainer container = new HelloWorldLogStrategyContainer(
                 "testcontainers/helloworld:1.1.0"
@@ -280,7 +280,7 @@ public void shouldRespectWaitStrategy() {
     }
 
     @Test
-    public void testStartupAttemptsDoesNotLeaveContainersRunningWhenWrongWaitStrategyIsUsed() {
+    void testStartupAttemptsDoesNotLeaveContainersRunningWhenWrongWaitStrategyIsUsed() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withLabel("waitstrategy", "wrong")
diff --git a/core/src/test/java/org/testcontainers/containers/JibTest.java b/core/src/test/java/org/testcontainers/containers/JibTest.java
index 1441ff00120..df045052bc3 100644
--- a/core/src/test/java/org/testcontainers/containers/JibTest.java
+++ b/core/src/test/java/org/testcontainers/containers/JibTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectImageResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -12,10 +12,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JibTest {
+class JibTest {
 
     @Test
-    public void buildImage() {
+    void buildImage() {
         try (
             // jibContainerUsage {
             GenericContainer<?> busybox = new GenericContainer<>(
@@ -36,7 +36,7 @@ public void buildImage() {
     }
 
     @Test
-    public void standardLabelsAreAddedWhenUsingJibSetLabels() {
+    void standardLabelsAreAddedWhenUsingJibSetLabels() {
         try (
             GenericContainer<?> busybox = new GenericContainer<>(
                 new JibImage(
@@ -56,7 +56,7 @@ public void standardLabelsAreAddedWhenUsingJibSetLabels() {
     }
 
     @Test
-    public void standardLabelsAreAddedWhenUsingJibAddLabel() {
+    void standardLabelsAreAddedWhenUsingJibAddLabel() {
         try (
             GenericContainer<?> busybox = new GenericContainer<>(
                 new JibImage(
diff --git a/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java b/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
index f5bed1020c0..b1ec1c707d5 100644
--- a/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
+++ b/core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.IOException;
@@ -8,10 +8,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MultiStageBuildTest {
+class MultiStageBuildTest {
 
     @Test
-    public void testDockerMultistageBuild() throws IOException, InterruptedException {
+    void testDockerMultistageBuild() throws IOException, InterruptedException {
         try (
             GenericContainer<?> container = new GenericContainer<>(
                 new ImageFromDockerfile()
@@ -27,7 +27,7 @@ public void testDockerMultistageBuild() throws IOException, InterruptedException
     }
 
     @Test
-    public void shouldBuildMultistageBuildWithBuildImageCmdModifier() throws IOException, InterruptedException {
+    void shouldBuildMultistageBuildWithBuildImageCmdModifier() throws IOException, InterruptedException {
         try (
             GenericContainer<?> container = new GenericContainer<>(
                 new ImageFromDockerfile()
diff --git a/core/src/test/java/org/testcontainers/containers/NetworkTest.java b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
index 099bef20ed7..675658b353a 100644
--- a/core/src/test/java/org/testcontainers/containers/NetworkTest.java
+++ b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
@@ -1,44 +1,41 @@
 package org.testcontainers.containers;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Enclosed.class)
-public class NetworkTest {
+class NetworkTest {
 
-    public static class WithRules {
+    @Nested
+    class WithRules {
 
-        @Rule
         public Network network = Network.newNetwork();
 
-        @Rule
         public GenericContainer<?> foo = new GenericContainer<>(TestImages.TINY_IMAGE)
             .withNetwork(network)
             .withNetworkAliases("foo")
             .withCommand("/bin/sh", "-c", "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done");
 
-        @Rule
         public GenericContainer<?> bar = new GenericContainer<>(TestImages.TINY_IMAGE)
             .withNetwork(network)
             .withCommand("top");
 
-        @Test
-        public void testNetworkSupport() throws Exception {
+        void testNetworkSupport() throws Exception {
+            foo.start();
+            bar.start();
             String response = bar.execInContainer("wget", "-O", "-", "http://foo:8080").getStdout();
             assertThat(response).as("received response").isEqualTo("yay");
         }
     }
 
-    public static class WithoutRules {
+    @Nested
+    class WithoutRules {
 
         @Test
-        public void testNetworkSupport() throws Exception {
+        void testNetworkSupport() throws Exception {
             // useCustomNetwork {
             try (
                 Network network = Network.newNetwork();
@@ -64,7 +61,7 @@ public void testNetworkSupport() throws Exception {
         }
 
         @Test
-        public void testBuilder() {
+        void testBuilder() {
             try (Network network = Network.builder().driver("macvlan").build()) {
                 String id = network.getId();
                 assertThat(
@@ -76,7 +73,7 @@ public void testBuilder() {
         }
 
         @Test
-        public void testModifiers() {
+        void testModifiers() {
             try (
                 Network network = Network.builder().createNetworkCmdModifier(cmd -> cmd.withDriver("macvlan")).build()
             ) {
@@ -90,7 +87,7 @@ public void testModifiers() {
         }
 
         @Test
-        public void testReusability() {
+        void testReusability() {
             try (Network network = Network.newNetwork()) {
                 String firstId = network.getId();
                 assertThat(DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(firstId).exec())
diff --git a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
index 9067d77d825..36126df6a38 100644
--- a/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ParsedDockerComposeFileValidationTest.java
@@ -3,12 +3,12 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import lombok.SneakyThrows;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
 import java.io.PrintWriter;
+import java.nio.file.Path;
 import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,13 +16,13 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 
-public class ParsedDockerComposeFileValidationTest {
+class ParsedDockerComposeFileValidationTest {
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+    @TempDir
+    public Path temporaryFolder;
 
     @Test
-    public void shouldValidate() {
+    void shouldValidate() {
         File file = new File("src/test/resources/docker-compose-container-name-v1.yml");
         assertThatThrownBy(() -> {
                 new ParsedDockerComposeFile(file);
@@ -32,7 +32,7 @@ public void shouldValidate() {
     }
 
     @Test
-    public void shouldRejectContainerNameV1() {
+    void shouldRejectContainerNameV1() {
         assertThatThrownBy(() -> {
                 new ParsedDockerComposeFile(ImmutableMap.of("redis", ImmutableMap.of("container_name", "redis")));
             })
@@ -40,7 +40,7 @@ public void shouldRejectContainerNameV1() {
     }
 
     @Test
-    public void shouldRejectContainerNameV2() {
+    void shouldRejectContainerNameV2() {
         assertThatThrownBy(() -> {
                 new ParsedDockerComposeFile(
                     ImmutableMap.of(
@@ -55,7 +55,7 @@ public void shouldRejectContainerNameV2() {
     }
 
     @Test
-    public void shouldIgnoreUnknownStructure() {
+    void shouldIgnoreUnknownStructure() {
         // Everything is a list
         new ParsedDockerComposeFile(Collections.emptyMap());
 
@@ -71,7 +71,7 @@ public void shouldIgnoreUnknownStructure() {
 
     @Test
     @SneakyThrows
-    public void shouldRejectDeserializationOfArbitraryClasses() {
+    void shouldRejectDeserializationOfArbitraryClasses() {
         // Reject deserialization gadget chain attacks: https://nvd.nist.gov/vuln/detail/CVE-2022-1471
         // https://raw.githubusercontent.com/mbechler/marshalsec/master/marshalsec.pdf
 
@@ -86,7 +86,7 @@ public void shouldRejectDeserializationOfArbitraryClasses() {
     }
 
     @Test
-    public void shouldObtainImageNamesV1() {
+    void shouldObtainImageNamesV1() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v1.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
         assertThat(parsedFile.getServiceNameToImageNames())
@@ -99,7 +99,7 @@ public void shouldObtainImageNamesV1() {
     }
 
     @Test
-    public void shouldObtainImageNamesV2() {
+    void shouldObtainImageNamesV2() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v2.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
         assertThat(parsedFile.getServiceNameToImageNames())
@@ -112,7 +112,7 @@ public void shouldObtainImageNamesV2() {
     }
 
     @Test
-    public void shouldObtainImageNamesV2WithNoVersionTag() {
+    void shouldObtainImageNamesV2WithNoVersionTag() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-v2-no-version.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
         assertThat(parsedFile.getServiceNameToImageNames())
@@ -125,7 +125,7 @@ public void shouldObtainImageNamesV2WithNoVersionTag() {
     }
 
     @Test
-    public void shouldObtainImageFromDockerfileBuild() {
+    void shouldObtainImageFromDockerfileBuild() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
         assertThat(parsedFile.getServiceNameToImageNames())
@@ -138,7 +138,7 @@ public void shouldObtainImageFromDockerfileBuild() {
     }
 
     @Test
-    public void shouldObtainImageFromDockerfileBuildWithContext() {
+    void shouldObtainImageFromDockerfileBuildWithContext() {
         File file = new File("src/test/resources/docker-compose-imagename-parsing-dockerfile-with-context.yml");
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
         assertThat(parsedFile.getServiceNameToImageNames())
@@ -151,8 +151,8 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
     }
 
     @Test
-    public void shouldSupportALotOfAliases() throws Exception {
-        File file = temporaryFolder.newFile();
+    void shouldSupportALotOfAliases() throws Exception {
+        File file = temporaryFolder.resolve("tmp-docker-compose.yml").toFile();
         try (PrintWriter writer = new PrintWriter(file)) {
             writer.println("x-entry: &entry");
             writer.println("  key: value");
diff --git a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
index 04f97fef514..2c70a3f894f 100644
--- a/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
+++ b/core/src/test/java/org/testcontainers/containers/ReusabilityUnitTests.java
@@ -14,14 +14,12 @@
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.StartContainerCmdImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
@@ -29,7 +27,7 @@
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.startupcheck.StartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
-import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
@@ -53,15 +51,11 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-@RunWith(Enclosed.class)
-public class ReusabilityUnitTests {
+class ReusabilityUnitTests {
 
-    @RunWith(Parameterized.class)
-    @RequiredArgsConstructor
-    @FieldDefaults(makeFinal = true)
-    public static class CanBeReusedTest {
+    @Nested
+    class CanBeReusedTest {
 
-        @Parameterized.Parameters(name = "{0}")
         public static Object[][] data() {
             return new Object[][] {
                 { "generic", new GenericContainer<>(TestImages.TINY_IMAGE), true },
@@ -72,14 +66,9 @@ public static Object[][] data() {
             };
         }
 
-        String name;
-
-        GenericContainer container;
-
-        boolean reusable;
-
-        @Test
-        public void shouldBeReusable() {
+        @ParameterizedTest(name = "{0}")
+        @MethodSource("data")
+        void shouldBeReusable(String name, GenericContainer container, boolean reusable) {
             if (reusable) {
                 assertThat(container.canBeReused()).as("Is reusable").isTrue();
             } else {
@@ -108,9 +97,8 @@ protected void containerIsCreated(String containerId) {
         }
     }
 
-    @RunWith(BlockJUnit4ClassRunner.class)
-    @FieldDefaults(makeFinal = true)
-    public static class HooksTest extends AbstractReusabilityTest {
+    @Nested
+    class HooksTest extends AbstractReusabilityTest {
 
         List<String> script = new ArrayList<>();
 
@@ -140,7 +128,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
         );
 
         @Test
-        public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
+        void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
             Mockito.doReturn(false).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
 
             String containerId = randomContainerId();
@@ -159,7 +147,7 @@ public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
         }
 
         @Test
-        public void shouldCallHookIfReused() {
+        void shouldCallHookIfReused() {
             Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
@@ -172,7 +160,7 @@ public void shouldCallHookIfReused() {
         }
 
         @Test
-        public void shouldNotCallHookIfNotReused() {
+        void shouldNotCallHookIfNotReused() {
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
             when(client.listContainersCmd()).then(listContainersAnswer());
@@ -189,9 +177,8 @@ public void shouldNotCallHookIfNotReused() {
         }
     }
 
-    @RunWith(BlockJUnit4ClassRunner.class)
-    @FieldDefaults(makeFinal = true)
-    public static class HashTest extends AbstractReusabilityTest {
+    @Nested
+    class HashTest extends AbstractReusabilityTest {
 
         protected GenericContainer<?> container = makeReusable(
             new GenericContainer(TestImages.TINY_IMAGE) {
@@ -203,7 +190,7 @@ public void copyFileToContainer(MountableFile mountableFile, String containerPat
         );
 
         @Test
-        public void shouldStartIfListReturnsEmpty() {
+        void shouldStartIfListReturnsEmpty() {
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
             when(client.listContainersCmd()).then(listContainersAnswer());
@@ -216,7 +203,7 @@ public void shouldStartIfListReturnsEmpty() {
         }
 
         @Test
-        public void shouldReuseIfListReturnsID() {
+        void shouldReuseIfListReturnsID() {
             Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             String containerId = randomContainerId();
             when(client.createContainerCmd(any())).then(createContainerAnswer(containerId));
@@ -231,7 +218,7 @@ public void shouldReuseIfListReturnsID() {
         }
 
         @Test
-        public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
+        void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
             Mockito.doReturn(false).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
             String containerId = randomContainerId();
@@ -250,7 +237,7 @@ public void shouldSetLabelsIfEnvironmentDoesNotSupportReuse() {
         }
 
         @Test
-        public void shouldSetCopiedFilesHashLabel() {
+        void shouldSetCopiedFilesHashLabel() {
             Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
             String containerId = randomContainerId();
@@ -266,7 +253,7 @@ public void shouldSetCopiedFilesHashLabel() {
         }
 
         @Test
-        public void shouldHashCopiedFiles() {
+        void shouldHashCopiedFiles() {
             Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).environmentSupportsReuse();
             AtomicReference<CreateContainerCmd> commandRef = new AtomicReference<>();
             String containerId = randomContainerId();
@@ -303,9 +290,10 @@ public void shouldHashCopiedFiles() {
         }
     }
 
-    @RunWith(Parameterized.class)
-    @FieldDefaults(makeFinal = true)
-    public static class CopyFilesHashTest {
+    @Nested
+    @ParameterizedClass
+    @MethodSource("strategies")
+    class CopyFilesHashTest {
 
         private final TestStrategy strategy;
 
@@ -353,7 +341,6 @@ public void clear() {
             }
         }
 
-        @Parameterized.Parameters
         public static List<Function<GenericContainer<?>, TestStrategy>> strategies() {
             return Arrays.asList(MountableFileTestStrategy::new, TransferableTestStrategy::new);
         }
@@ -365,12 +352,12 @@ public CopyFilesHashTest(Function<GenericContainer<?>, TestStrategy> strategyFac
         }
 
         @Test
-        public void empty() {
+        void empty() {
             assertThat(container.hashCopiedFiles()).isNotNull();
         }
 
         @Test
-        public void oneFile() {
+        void oneFile() {
             long emptyHash = container.hashCopiedFiles().getValue();
 
             strategy.withCopyFileToContainer(
@@ -382,7 +369,7 @@ public void oneFile() {
         }
 
         @Test
-        public void differentPath() {
+        void differentPath() {
             MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
             strategy.withCopyFileToContainer(mountableFile, "/foo/bar");
 
@@ -396,7 +383,7 @@ public void differentPath() {
         }
 
         @Test
-        public void detectsChangesInFile() throws Exception {
+        void detectsChangesInFile() throws Exception {
             Path path = File.createTempFile("reusable_test", ".txt").toPath();
             MountableFile mountableFile = MountableFile.forHostPath(path);
             strategy.withCopyFileToContainer(mountableFile, "/foo/bar");
@@ -409,7 +396,7 @@ public void detectsChangesInFile() throws Exception {
         }
 
         @Test
-        public void multipleFiles() {
+        void multipleFiles() {
             strategy.withCopyFileToContainer(
                 MountableFile.forClasspathResource("test_copy_to_container.txt"),
                 "/foo/bar"
@@ -425,7 +412,7 @@ public void multipleFiles() {
         }
 
         @Test
-        public void folder() throws Exception {
+        void folder() throws Exception {
             long emptyHash = container.hashCopiedFiles().getValue();
 
             Path tempDirectory = Files.createTempDirectory("reusable_test");
@@ -436,7 +423,7 @@ public void folder() throws Exception {
         }
 
         @Test
-        public void changesInFolder() throws Exception {
+        void changesInFolder() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
             assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
@@ -455,7 +442,7 @@ public void changesInFolder() throws Exception {
         }
 
         @Test
-        public void folderAndFile() throws Exception {
+        void folderAndFile() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
             assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
@@ -472,7 +459,7 @@ public void folderAndFile() throws Exception {
         }
 
         @Test
-        public void filePermissions() throws Exception {
+        void filePermissions() throws Exception {
             Path path = File.createTempFile("reusable_test", ".txt").toPath();
             path.toFile().setExecutable(false);
             MountableFile mountableFile = MountableFile.forHostPath(path);
@@ -487,7 +474,7 @@ public void filePermissions() throws Exception {
         }
 
         @Test
-        public void folderPermissions() throws Exception {
+        void folderPermissions() throws Exception {
             Path tempDirectory = Files.createTempDirectory("reusable_test");
             MountableFile mountableFile = MountableFile.forHostPath(tempDirectory);
             assertThat(new File(mountableFile.getResolvedPath())).isDirectory();
@@ -505,12 +492,9 @@ public void folderPermissions() throws Exception {
         }
     }
 
-    @FieldDefaults(makeFinal = true)
+    @ExtendWith(MockTestcontainersConfigurationExtension.class)
     public abstract static class AbstractReusabilityTest {
 
-        @Rule
-        public MockTestcontainersConfigurationRule configurationMock = new MockTestcontainersConfigurationRule();
-
         protected DockerClient client = Mockito.mock(DockerClient.class);
 
         protected <T extends GenericContainer<?>> T makeReusable(T container) {
diff --git a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
index cc3a98dba47..f742b29890b 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ContainerLogsTest.java
@@ -1,18 +1,18 @@
 package org.testcontainers.containers.output;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ContainerLogsTest {
+class ContainerLogsTest {
 
     @Test
-    @Ignore("fails due to the timing of the shell's decision to flush")
-    public void getLogsReturnsAllLogsToDate() {
+    @Disabled("fails due to the timing of the shell's decision to flush")
+    void getLogsReturnsAllLogsToDate() {
         try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
@@ -22,7 +22,7 @@ public void getLogsReturnsAllLogsToDate() {
     }
 
     @Test
-    public void getLogsContainsBothOutputTypes() {
+    void getLogsContainsBothOutputTypes() {
         try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
@@ -35,7 +35,7 @@ public void getLogsContainsBothOutputTypes() {
     }
 
     @Test
-    public void getLogsReturnsStdOutToDate() {
+    void getLogsReturnsStdOutToDate() {
         try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
@@ -47,7 +47,7 @@ public void getLogsReturnsStdOutToDate() {
     }
 
     @Test
-    public void getLogsReturnsStdErrToDate() {
+    void getLogsReturnsStdErrToDate() {
         try (GenericContainer<?> container = shortLivedContainer()) {
             container.start();
 
@@ -59,7 +59,7 @@ public void getLogsReturnsStdErrToDate() {
     }
 
     @Test
-    public void getLogsForLongRunningContainer() throws InterruptedException {
+    void getLogsForLongRunningContainer() throws InterruptedException {
         try (GenericContainer<?> container = longRunningContainer()) {
             container.start();
 
diff --git a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
index f6e513c1fd8..33ae9fd17f5 100644
--- a/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -12,7 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class FrameConsumerResultCallbackTest {
+class FrameConsumerResultCallbackTest {
 
     private static final String FRAME_PAYLOAD =
         "\u001B[0;32mТест1\u001B[0m\n\u001B[1;33mTest2\u001B[0m\n\u001B[0;31mTest3\u001B[0m";
@@ -20,7 +20,7 @@ public class FrameConsumerResultCallbackTest {
     private static final String LOG_RESULT = "Тест1\nTest2\nTest3";
 
     @Test
-    public void passStderrFrameWithoutColors() throws IOException {
+    void passStderrFrameWithoutColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
@@ -30,7 +30,7 @@ public void passStderrFrameWithoutColors() throws IOException {
     }
 
     @Test
-    public void passStderrFrameWithColors() throws IOException {
+    void passStderrFrameWithColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
@@ -40,7 +40,7 @@ public void passStderrFrameWithColors() throws IOException {
     }
 
     @Test
-    public void passStdoutFrameWithoutColors() throws IOException {
+    void passStdoutFrameWithoutColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
@@ -50,7 +50,7 @@ public void passStdoutFrameWithoutColors() throws IOException {
     }
 
     @Test
-    public void passStdoutFrameWithColors() throws IOException {
+    void passStdoutFrameWithColors() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
@@ -60,7 +60,7 @@ public void passStdoutFrameWithColors() throws IOException {
     }
 
     @Test
-    public void basicConsumer() throws IOException {
+    void basicConsumer() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         BasicConsumer consumer = new BasicConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
@@ -70,7 +70,7 @@ public void basicConsumer() throws IOException {
     }
 
     @Test
-    public void passStdoutNull() throws IOException {
+    void passStdoutNull() throws IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
@@ -80,7 +80,7 @@ public void passStdoutNull() throws IOException {
     }
 
     @Test
-    public void passStdoutEmptyLine() throws IOException {
+    void passStdoutEmptyLine() throws IOException {
         String payload = "";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
@@ -91,7 +91,7 @@ public void passStdoutEmptyLine() throws IOException {
     }
 
     @Test
-    public void passStdoutSingleLine() throws IOException {
+    void passStdoutSingleLine() throws IOException {
         String payload = "Test";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
@@ -102,7 +102,7 @@ public void passStdoutSingleLine() throws IOException {
     }
 
     @Test
-    public void passStdoutSingleLineWithNewline() throws IOException {
+    void passStdoutSingleLineWithNewline() throws IOException {
         String payload = "Test\n";
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
@@ -113,7 +113,7 @@ public void passStdoutSingleLineWithNewline() throws IOException {
     }
 
     @Test
-    public void passRawFrameWithoutColors() throws TimeoutException, IOException {
+    void passRawFrameWithoutColors() throws TimeoutException, IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         WaitingConsumer waitConsumer = new WaitingConsumer();
         callback.addConsumer(OutputFrame.OutputType.STDOUT, waitConsumer);
@@ -148,7 +148,7 @@ public void passRawFrameWithoutColors() throws TimeoutException, IOException {
     }
 
     @Test
-    public void passRawFrameWithColors() throws TimeoutException, IOException {
+    void passRawFrameWithColors() throws TimeoutException, IOException {
         FrameConsumerResultCallback callback = new FrameConsumerResultCallback();
         WaitingConsumer waitConsumer = new WaitingConsumer().withRemoveAnsiCodes(false);
         callback.addConsumer(OutputFrame.OutputType.STDOUT, waitConsumer);
@@ -203,7 +203,7 @@ public void passRawFrameWithColors() throws TimeoutException, IOException {
     }
 
     @Test
-    public void reconstructBreakedUnicode() throws IOException {
+    void reconstructBreakedUnicode() throws IOException {
         String payload = "Тест";
         byte[] payloadBytes = payload.getBytes(StandardCharsets.UTF_8);
         byte[] bytes1 = new byte[(int) (payloadBytes.length * 0.6)];
diff --git a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
index eaab250141c..45472771168 100644
--- a/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/output/ToStringConsumerTest.java
@@ -1,14 +1,15 @@
 package org.testcontainers.containers.output;
 
 import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ToStringConsumerTest {
+class ToStringConsumerTest {
 
     private static final String LARGE_PAYLOAD;
 
@@ -22,7 +23,7 @@ public class ToStringConsumerTest {
     }
 
     @Test
-    public void newlines_are_not_added_to_exec_output() throws Exception {
+    void newlines_are_not_added_to_exec_output() throws Exception {
         try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCommand("sleep", "2m");
             container.start();
@@ -32,8 +33,9 @@ public void newlines_are_not_added_to_exec_output() throws Exception {
         }
     }
 
-    @Test(timeout = 60_000L)
-    public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
+    @Test
+    @Timeout(60)
+    void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
         try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withAttachStdin(true).withStdinOpen(true).withTty(true);
@@ -47,7 +49,7 @@ public void newlines_are_not_added_to_exec_output_with_tty() throws Exception {
     }
 
     @Test
-    public void newlines_are_not_added_to_container_output() {
+    void newlines_are_not_added_to_container_output() {
         try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCommand("echo", "-n", LARGE_PAYLOAD);
             container.setStartupCheckStrategy(new OneShotStartupCheckStrategy());
@@ -60,7 +62,7 @@ public void newlines_are_not_added_to_container_output() {
     }
 
     @Test
-    public void newlines_are_not_added_to_container_output_with_tty() {
+    void newlines_are_not_added_to_container_output_with_tty() {
         try (GenericContainer<?> container = new GenericContainer<>("alpine:3.17")) {
             container.withCreateContainerCmdModifier(cmd -> {
                 cmd.withTty(true);
diff --git a/core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java b/core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java
index 7e3bf1d814f..fc7a60c2115 100644
--- a/core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/startupcheck/IsRunningStartupCheckStrategyTest.java
@@ -1,24 +1,24 @@
 package org.testcontainers.containers.startupcheck;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class IsRunningStartupCheckStrategyTest {
+class IsRunningStartupCheckStrategyTest {
 
     @Test
-    public void testCommandQuickExitSuccess() {
+    void testCommandQuickExitSuccess() {
         try (GenericContainer container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("/bin/true")) {
             container.start(); // should start with no Exception
         }
     }
 
     @Test
-    @Ignore("This test can fail to throw an AssertionError if the container doesn't fail quickly enough")
-    public void testCommandQuickExitFailure() {
+    @Disabled("This test can fail to throw an AssertionError if the container doesn't fail quickly enough")
+    void testCommandQuickExitFailure() {
         try (GenericContainer container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("/bin/false")) {
             assertThatThrownBy(container::start)
                 .hasStackTraceContaining("Container startup failed")
@@ -27,7 +27,7 @@ public void testCommandQuickExitFailure() {
     }
 
     @Test
-    public void testCommandStaysRunning() {
+    void testCommandStaysRunning() {
         try (
             GenericContainer container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("/bin/sleep", "60")
         ) {
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
index b7d9fd5a6fa..c494100544f 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/ExternalPortListeningCheckTest.java
@@ -1,9 +1,9 @@
 package org.testcontainers.containers.wait.internal;
 
 import com.google.common.collect.ImmutableSet;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget;
 
 import java.net.ServerSocket;
@@ -13,7 +13,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ExternalPortListeningCheckTest {
+class ExternalPortListeningCheckTest {
 
     private ServerSocket listeningSocket1;
 
@@ -23,7 +23,7 @@ public class ExternalPortListeningCheckTest {
 
     private WaitStrategyTarget mockContainer;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         listeningSocket1 = new ServerSocket(0);
         listeningSocket2 = new ServerSocket(0);
@@ -36,7 +36,7 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void singleListening() {
+    void singleListening() {
         final ExternalPortListeningCheck check = new ExternalPortListeningCheck(
             mockContainer,
             ImmutableSet.of(listeningSocket1.getLocalPort())
@@ -48,7 +48,7 @@ public void singleListening() {
     }
 
     @Test
-    public void multipleListening() {
+    void multipleListening() {
         final ExternalPortListeningCheck check = new ExternalPortListeningCheck(
             mockContainer,
             ImmutableSet.of(listeningSocket1.getLocalPort(), listeningSocket2.getLocalPort())
@@ -60,7 +60,7 @@ public void multipleListening() {
     }
 
     @Test
-    public void oneNotListening() {
+    void oneNotListening() {
         final ExternalPortListeningCheck check = new ExternalPortListeningCheck(
             mockContainer,
             ImmutableSet.of(listeningSocket1.getLocalPort(), nonListeningSocket.getLocalPort())
@@ -71,7 +71,7 @@ public void oneNotListening() {
             .isInstanceOf(IllegalStateException.class);
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         listeningSocket1.close();
         listeningSocket2.close();
diff --git a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
index d93eb90c339..936be73fd3e 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/internal/InternalCommandPortListeningCheckTest.java
@@ -1,48 +1,46 @@
 package org.testcontainers.containers.wait.internal;
 
 import com.google.common.collect.ImmutableSet;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.fail;
 
-@RunWith(Parameterized.class)
-public class InternalCommandPortListeningCheckTest {
+@ParameterizedClass(name = "{index} - {0}")
+@MethodSource("data")
+class InternalCommandPortListeningCheckTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
-    public static Iterable<Object[]> data() {
+    public static List<String> data() {
         return Arrays.asList(
-            new Object[][] {
-                { "internal-port-check-dockerfile/Dockerfile-tcp" },
-                { "internal-port-check-dockerfile/Dockerfile-nc" },
-                { "internal-port-check-dockerfile/Dockerfile-bash" },
-            }
+            "internal-port-check-dockerfile/Dockerfile-tcp",
+            "internal-port-check-dockerfile/Dockerfile-nc",
+            "internal-port-check-dockerfile/Dockerfile-bash"
         );
     }
 
-    @Rule
-    public GenericContainer container;
+    public GenericContainer<?> container;
 
     public InternalCommandPortListeningCheckTest(String dockerfile) {
         container =
-            new GenericContainer(
+            new GenericContainer<>(
                 new ImageFromDockerfile()
                     .withFileFromClasspath("Dockerfile", dockerfile)
                     .withFileFromClasspath("nginx.conf", "internal-port-check-dockerfile/nginx.conf")
             );
+        container.start();
     }
 
     @Test
-    public void singleListening() {
+    void singleListening() {
         final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(
             container,
             ImmutableSet.of(8080)
@@ -52,7 +50,7 @@ public void singleListening() {
     }
 
     @Test
-    public void nonListening() {
+    void nonListening() {
         final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(
             container,
             ImmutableSet.of(8080, 1234)
@@ -65,7 +63,7 @@ public void nonListening() {
     }
 
     @Test
-    public void lowAndHighPortListening() {
+    void lowAndHighPortListening() {
         final InternalCommandPortListeningCheck check = new InternalCommandPortListeningCheck(
             container,
             ImmutableSet.of(100, 8080)
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
index 0cbf257e9b5..653bbca2e33 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/DockerHealthcheckWaitStrategyTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers.wait.strategy;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -11,11 +11,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class DockerHealthcheckWaitStrategyTest {
+class DockerHealthcheckWaitStrategyTest {
 
     private GenericContainer container;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         // Using a Dockerfile here, since Dockerfile builder DSL doesn't support HEALTHCHECK
         container =
@@ -31,12 +31,12 @@ public void setUp() {
     }
 
     @Test
-    public void startsOnceHealthy() {
+    void startsOnceHealthy() {
         container.start();
     }
 
     @Test
-    public void containerStartFailsIfContainerIsUnhealthy() {
+    void containerStartFailsIfContainerIsUnhealthy() {
         container.withCommand("tail", "-f", "/dev/null");
         assertThat(catchThrowable(container::start))
             .as("Container launch fails when unhealthy")
diff --git a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
index 8b69553e5ab..aeebe425776 100644
--- a/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.containers.wait.strategy;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-public class WaitAllStrategyTest {
+class WaitAllStrategyTest {
 
     @Mock
     private GenericContainer container;
@@ -34,7 +34,7 @@ public class WaitAllStrategyTest {
     @Mock
     private WaitStrategy strategy3;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         MockitoAnnotations.initMocks(this);
     }
@@ -43,7 +43,7 @@ public void setUp() {
      * Dummy-based tests, to check that timeout values are propagated correctly, without involving actual timing-sensitive code
      */
     @Test
-    public void parentTimeoutApplies() {
+    void parentTimeoutApplies() {
         DummyStrategy child1 = new DummyStrategy(Duration.ofMillis(10));
         child1.withStartupTimeout(Duration.ofMillis(20));
 
@@ -55,7 +55,7 @@ public void parentTimeoutApplies() {
     }
 
     @Test
-    public void parentTimeoutAppliesToMultipleChildren() {
+    void parentTimeoutAppliesToMultipleChildren() {
         Duration defaultInnerWait = Duration.ofMillis(2);
         Duration outerWait = Duration.ofMillis(6);
 
@@ -73,7 +73,7 @@ public void parentTimeoutAppliesToMultipleChildren() {
     }
 
     @Test
-    public void parentTimeoutAppliesToAdditionalChildren() {
+    void parentTimeoutAppliesToAdditionalChildren() {
         Duration defaultInnerWait = Duration.ofMillis(2);
         Duration outerWait = Duration.ofMillis(20);
 
@@ -94,7 +94,7 @@ public void parentTimeoutAppliesToAdditionalChildren() {
      * Mock-based tests to check overall behaviour, without involving timing-sensitive code
      */
     @Test
-    public void childExecutionTest() {
+    void childExecutionTest() {
         final WaitStrategy underTest = new WaitAllStrategy().withStrategy(strategy1).withStrategy(strategy2);
 
         doNothing().when(strategy1).waitUntilReady(eq(container));
@@ -108,7 +108,7 @@ public void childExecutionTest() {
     }
 
     @Test
-    public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
+    void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
         final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
             .withStrategy(strategy1)
             .withStrategy(strategy2)
@@ -132,7 +132,7 @@ public void withoutOuterTimeoutShouldRelyOnInnerStrategies() {
     }
 
     @Test
-    public void timeoutChangeShouldNotBePossibleWithIndividualTimeoutMode() {
+    void timeoutChangeShouldNotBePossibleWithIndividualTimeoutMode() {
         final WaitStrategy underTest = new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY);
 
         assertThat(
@@ -145,7 +145,7 @@ public void timeoutChangeShouldNotBePossibleWithIndividualTimeoutMode() {
     }
 
     @Test
-    public void shouldNotMessWithIndividualTimeouts() {
+    void shouldNotMessWithIndividualTimeouts() {
         new WaitAllStrategy(WaitAllStrategy.Mode.WITH_INDIVIDUAL_TIMEOUTS_ONLY)
             .withStrategy(strategy1)
             .withStrategy(strategy2);
@@ -155,7 +155,7 @@ public void shouldNotMessWithIndividualTimeouts() {
     }
 
     @Test
-    public void shouldOverwriteIndividualTimeouts() {
+    void shouldOverwriteIndividualTimeouts() {
         Duration someSeconds = Duration.ofSeconds(23);
         new WaitAllStrategy().withStartupTimeout(someSeconds).withStrategy(strategy1).withStrategy(strategy2);
 
diff --git a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
index f67ad212d77..df351b9fd74 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
@@ -1,14 +1,16 @@
 package org.testcontainers.dockerclient;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
-public class AmbiguousImagePullTest {
+class AmbiguousImagePullTest {
 
-    @Test(timeout = 30_000)
-    public void testNotUsingParse() {
+    @Test
+    @Timeout(30)
+    void testNotUsingParse() {
         try (DockerRegistryContainer registryContainer = new DockerRegistryContainer()) {
             registryContainer.start();
             DockerImageName imageName = registryContainer.createImage("latest");
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
index 757816cb189..f3bc15d2c22 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -2,19 +2,20 @@
 
 import com.github.dockerjava.api.DockerClient;
 import org.assertj.core.api.Assumptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.DockerClientFactory;
 
 import java.net.URI;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DockerClientConfigUtilsTest {
+class DockerClientConfigUtilsTest {
 
     DockerClient client = DockerClientFactory.lazyClient();
 
     @Test
-    public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
+    void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
         Assumptions.assumeThat(DockerClientConfigUtils.IN_A_CONTAINER).as("in a container").isFalse();
 
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
@@ -26,7 +27,7 @@ public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
     }
 
     @Test
-    public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
+    void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
             client,
             URI.create("http://12.23.34.45"),
@@ -36,7 +37,7 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
     }
 
     @Test
-    public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
+    void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
             client,
             URI.create("tcp://12.23.34.45"),
@@ -46,7 +47,7 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
     }
 
     @Test
-    public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
+    void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
         String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(
             client,
             URI.create("gopher://12.23.34.45"),
@@ -55,8 +56,9 @@ public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
         assertThat(actual).isNull();
     }
 
-    @Test(timeout = 5_000)
-    public void getDefaultGateway() {
+    @Test
+    @Timeout(5)
+    void getDefaultGateway() {
         assertThat(DockerClientConfigUtils.getDefaultGateway()).isNotNull();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
index 58bd6984401..be4dcd446a8 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
@@ -2,13 +2,11 @@
 
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.transport.SSLConfig;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.IOException;
@@ -27,17 +25,14 @@
  * Test that we can use Testcontainers configuration file to override settings. We assume that docker-java has test
  * coverage for detection of environment variables (e.g. DOCKER_HOST) and its own properties config file.
  */
-@RunWith(MockitoJUnitRunner.class)
-public class EnvironmentAndSystemPropertyClientProviderStrategyTest {
-
-    @Rule
-    public MockTestcontainersConfigurationRule mockConfig = new MockTestcontainersConfigurationRule();
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
+class EnvironmentAndSystemPropertyClientProviderStrategyTest {
 
     private URI defaultDockerHost;
 
     private com.github.dockerjava.core.SSLConfig defaultSSLConfig;
 
-    @Before
+    @BeforeEach
     public void checkEnvironmentClear() {
         // If docker-java picks up non-default settings from the environment, our test needs to know to expect those
         DefaultDockerClientConfig defaultConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
@@ -46,7 +41,7 @@ public void checkEnvironmentClear() {
     }
 
     @Test
-    public void testWhenConfigAbsent() {
+    void testWhenConfigAbsent() {
         Mockito
             .doReturn("auto")
             .when(TestcontainersConfiguration.getInstance())
@@ -72,7 +67,7 @@ public void testWhenConfigAbsent() {
     }
 
     @Test
-    public void testWhenDockerHostPresent() {
+    void testWhenDockerHostPresent() {
         Mockito
             .doReturn("auto")
             .when(TestcontainersConfiguration.getInstance())
@@ -98,7 +93,7 @@ public void testWhenDockerHostPresent() {
     }
 
     @Test
-    public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
+    void testWhenDockerHostAndSSLConfigPresent() throws IOException {
         Path tempDir = Files.createTempDirectory("testcontainers-test");
         String tempDirPath = tempDir.toAbsolutePath().toString();
 
@@ -129,7 +124,7 @@ public void testWhenDockerHostAndSSLConfigPresent() throws IOException {
     }
 
     @Test
-    public void applicableWhenIgnoringUserPropertiesAndConfigured() {
+    void applicableWhenIgnoringUserPropertiesAndConfigured() {
         Mockito
             .doReturn("autoIgnoringUserProperties")
             .when(TestcontainersConfiguration.getInstance())
@@ -147,7 +142,7 @@ public void applicableWhenIgnoringUserPropertiesAndConfigured() {
     }
 
     @Test
-    public void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {
+    void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {
         assumeThat(System.getenv("DOCKER_HOST")).isNull();
 
         Mockito
diff --git a/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
index 642eb6d7390..2976c56c7a9 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/EventStreamTest.java
@@ -4,9 +4,8 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.command.EventsResultCallback;
 import org.jetbrains.annotations.NotNull;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
@@ -20,16 +19,14 @@
 /**
  * Test that event streaming from the {@link DockerClient} works correctly
  */
-public class EventStreamTest {
-
-    @Rule
-    public Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
+@Timeout(10)
+class EventStreamTest {
 
     /**
      * Test that docker events can be streamed from the client.
      */
     @Test
-    public void test() throws IOException, InterruptedException {
+    void test() throws IOException, InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
 
         try (
diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
index 42cff09c335..d5329430e71 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -1,18 +1,13 @@
 package org.testcontainers.dockerclient;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-@RunWith(Parameterized.class)
-public class ImagePullTest {
+class ImagePullTest {
 
-    private final String image;
-
-    @Parameterized.Parameters(name = "{0}")
     public static String[] parameters() {
         return new String[] {
             "alpine:latest",
@@ -26,12 +21,9 @@ public static String[] parameters() {
         };
     }
 
-    public ImagePullTest(String image) {
-        this.image = image;
-    }
-
-    @Test
-    public void test() {
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("parameters")
+    void test(String image) {
         try (
             final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse(image))
                 .withCommand("/bin/sh", "-c", "sleep 0")
diff --git a/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java b/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
index 4ebdb300a2f..2c3d3ac40de 100644
--- a/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/dockerclient/TestcontainersHostPropertyClientProviderStrategyTest.java
@@ -1,29 +1,20 @@
 package org.testcontainers.dockerclient;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
-import java.net.URI;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 
-@RunWith(MockitoJUnitRunner.class)
-public class TestcontainersHostPropertyClientProviderStrategyTest {
-
-    @Rule
-    public MockTestcontainersConfigurationRule mockConfig = new MockTestcontainersConfigurationRule();
-
-    private URI defaultDockerHost;
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
+class TestcontainersHostPropertyClientProviderStrategyTest {
 
     @Test
-    public void tcHostPropertyIsProvided() {
+    void tcHostPropertyIsProvided() {
         Mockito
             .doReturn("tcp://127.0.0.1:9000")
             .when(TestcontainersConfiguration.getInstance())
@@ -37,7 +28,7 @@ public void tcHostPropertyIsProvided() {
     }
 
     @Test
-    public void tcHostPropertyIsNotProvided() {
+    void tcHostPropertyIsNotProvided() {
         Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getUserProperty(eq("tc.host"), isNull());
 
         TestcontainersHostPropertyClientProviderStrategy strategy = new TestcontainersHostPropertyClientProviderStrategy();
diff --git a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
index 0bdf969688b..254633ea6e7 100644
--- a/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.images;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -10,12 +10,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AgeBasedPullPolicyTest {
+class AgeBasedPullPolicyTest {
 
     final DockerImageName imageName = DockerImageName.parse(UUID.randomUUID().toString());
 
     @Test
-    public void shouldPull() {
+    void shouldPull() {
         ImageData imageData = ImageData.builder().createdAt(Instant.now().minus(2, ChronoUnit.HOURS)).build();
 
         AgeBasedPullPolicy oneHour = new AgeBasedPullPolicy(Duration.of(1L, ChronoUnit.HOURS));
diff --git a/core/src/test/java/org/testcontainers/images/ImageDataTest.java b/core/src/test/java/org/testcontainers/images/ImageDataTest.java
index 6ff75e9e355..b9fe0ae3c42 100644
--- a/core/src/test/java/org/testcontainers/images/ImageDataTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImageDataTest.java
@@ -1,23 +1,23 @@
 package org.testcontainers.images;
 
 import com.github.dockerjava.api.command.InspectImageResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ImageDataTest {
+class ImageDataTest {
 
     @Test
-    public void shouldReadTimestampWithoutOffsetFromInspectImageResponse() {
+    void shouldReadTimestampWithoutOffsetFromInspectImageResponse() {
         final String timestamp = "2020-07-27T18:23:31.365190246Z";
         final ImageData imageData = ImageData.from(new InspectImageResponse().withCreated(timestamp));
         assertThat(imageData.getCreatedAt()).isEqualTo(Instant.parse(timestamp));
     }
 
     @Test
-    public void shouldReadTimestampWithOffsetFromInspectImageResponse() {
+    void shouldReadTimestampWithOffsetFromInspectImageResponse() {
         final String timestamp = "2020-07-27T18:23:31.365190246+02:00";
         final ImageData imageData = ImageData.from(new InspectImageResponse().withCreated(timestamp));
         assertThat(imageData.getCreatedAt()).isEqualTo(Instant.parse("2020-07-27T16:23:31.365190246Z"));
diff --git a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
index a885c035e5c..6c763de2962 100644
--- a/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/ImagePullPolicyTest.java
@@ -1,8 +1,8 @@
 package org.testcontainers.images;
 
 import com.github.dockerjava.api.exception.NotFoundException;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.DockerRegistryContainer;
@@ -14,22 +14,26 @@
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 
-public class ImagePullPolicyTest {
+class ImagePullPolicyTest {
 
-    @ClassRule
+    @AutoClose
     public static DockerRegistryContainer registry = new DockerRegistryContainer();
 
     private final DockerImageName imageName = registry.createImage();
 
+    static {
+        registry.start();
+    }
+
     @Test
-    public void pullsByDefault() {
+    void pullsByDefault() {
         try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {
             container.start();
         }
     }
 
     @Test
-    public void shouldAlwaysPull() {
+    void shouldAlwaysPull() {
         try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {
             container.start();
         }
@@ -52,7 +56,7 @@ public void shouldAlwaysPull() {
     }
 
     @Test
-    public void shouldSupportCustomPolicies() {
+    void shouldSupportCustomPolicies() {
         try (
             // custom_image_pull_policy {
             GenericContainer<?> container = new GenericContainer<>(imageName)
@@ -72,7 +76,7 @@ protected boolean shouldPullCached(DockerImageName imageName, ImageData localIma
     }
 
     @Test
-    public void shouldCheckPolicy() {
+    void shouldCheckPolicy() {
         ImagePullPolicy policy = Mockito.spy(
             new AbstractImagePullPolicy() {
                 @Override
@@ -93,7 +97,7 @@ protected boolean shouldPullCached(DockerImageName imageName, ImageData localIma
     }
 
     @Test
-    public void shouldNotForcePulling() {
+    void shouldNotForcePulling() {
         try (
             GenericContainer<?> container = new GenericContainer<>(imageName)
                 .withImagePullPolicy(__ -> false)
diff --git a/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java b/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
index 43c026ea294..a18d0130383 100644
--- a/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
+++ b/core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java
@@ -1,28 +1,26 @@
 package org.testcontainers.images;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.FakeImagePullPolicy;
-import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OverrideImagePullPolicyTest {
-
-    @Rule
-    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
+class OverrideImagePullPolicyTest {
 
     private ImagePullPolicy originalInstance;
 
     private ImagePullPolicy originalDefaultImplementation;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         this.originalInstance = PullPolicy.instance;
         this.originalDefaultImplementation = PullPolicy.defaultImplementation;
@@ -30,14 +28,14 @@ public void setUp() {
         PullPolicy.defaultImplementation = Mockito.mock(ImagePullPolicy.class);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         PullPolicy.instance = originalInstance;
         PullPolicy.defaultImplementation = originalDefaultImplementation;
     }
 
     @Test
-    public void simpleConfigurationTest() {
+    void simpleConfigurationTest() {
         Mockito
             .doReturn(FakeImagePullPolicy.class.getCanonicalName())
             .when(TestcontainersConfiguration.getInstance())
@@ -53,7 +51,7 @@ public void simpleConfigurationTest() {
     }
 
     @Test
-    public void alwaysPullConfigurationTest() {
+    void alwaysPullConfigurationTest() {
         Mockito
             .doReturn(AlwaysPullPolicy.class.getCanonicalName())
             .when(TestcontainersConfiguration.getInstance())
diff --git a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
index f8c66860022..e881f0167e2 100644
--- a/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java
@@ -1,17 +1,17 @@
 package org.testcontainers.images;
 
 import com.google.common.collect.Sets;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Paths;
 import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ParsedDockerfileTest {
+class ParsedDockerfileTest {
 
     @Test
-    public void doesSimpleParsing() {
+    void doesSimpleParsing() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage", "RUN something")
         );
@@ -21,7 +21,7 @@ public void doesSimpleParsing() {
     }
 
     @Test
-    public void isCaseInsensitive() {
+    void isCaseInsensitive() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("from someimage", "RUN something")
         );
@@ -31,7 +31,7 @@ public void isCaseInsensitive() {
     }
 
     @Test
-    public void handlesTags() {
+    void handlesTags() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage:tag", "RUN something")
         );
@@ -41,7 +41,7 @@ public void handlesTags() {
     }
 
     @Test
-    public void handlesDigests() {
+    void handlesDigests() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage@sha256:abc123", "RUN something")
         );
@@ -51,7 +51,7 @@ public void handlesDigests() {
     }
 
     @Test
-    public void ignoringCommentedFromLines() {
+    void ignoringCommentedFromLines() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage", "#FROM somethingelse")
         );
@@ -61,7 +61,7 @@ public void ignoringCommentedFromLines() {
     }
 
     @Test
-    public void ignoringBuildStageNames() {
+    void ignoringBuildStageNames() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM someimage --as=base", "RUN something", "FROM nextimage", "RUN something")
         );
@@ -71,7 +71,7 @@ public void ignoringBuildStageNames() {
     }
 
     @Test
-    public void ignoringPlatformArgs() {
+    void ignoringPlatformArgs() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM --platform=linux/amd64 someimage", "RUN something")
         );
@@ -81,7 +81,7 @@ public void ignoringPlatformArgs() {
     }
 
     @Test
-    public void ignoringExtraPlatformArgs() {
+    void ignoringExtraPlatformArgs() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("FROM --platform=linux/amd64 --somethingelse=value someimage", "RUN something")
         );
@@ -91,7 +91,7 @@ public void ignoringExtraPlatformArgs() {
     }
 
     @Test
-    public void handlesGracefullyIfNoFromLine() {
+    void handlesGracefullyIfNoFromLine() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
             Arrays.asList("RUN something", "# is this even a valid Dockerfile?")
         );
@@ -101,7 +101,7 @@ public void handlesGracefullyIfNoFromLine() {
     }
 
     @Test
-    public void handlesGracefullyIfDockerfileNotFound() {
+    void handlesGracefullyIfDockerfileNotFound() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(Paths.get("nonexistent.Dockerfile"));
         assertThat(parsedDockerfile.getDependencyImageNames())
             .as("handles missing Dockerfiles gracefully")
diff --git a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
index 9e4ac66fb53..156df3ae7d3 100644
--- a/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
+++ b/core/src/test/java/org/testcontainers/images/RemoteDockerImageTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.images;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LazyFuture;
@@ -11,17 +12,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class RemoteDockerImageTest {
+class RemoteDockerImageTest {
 
     @Test
-    public void toStringContainsOnlyImageName() {
+    void toStringContainsOnlyImageName() {
         String imageName = Base58.randomString(8).toLowerCase();
         RemoteDockerImage remoteDockerImage = new RemoteDockerImage(DockerImageName.parse(imageName));
         assertThat(remoteDockerImage.toString()).contains("imageName=" + imageName);
     }
 
     @Test
-    public void toStringWithExceptionContainsOnlyImageNameFuture() {
+    void toStringWithExceptionContainsOnlyImageNameFuture() {
         CompletableFuture<String> imageNameFuture = new CompletableFuture<>();
         imageNameFuture.completeExceptionally(new RuntimeException("arbitrary"));
 
@@ -29,8 +30,9 @@ public void toStringWithExceptionContainsOnlyImageNameFuture() {
         assertThat(remoteDockerImage.toString()).contains("imageName=java.lang.RuntimeException: arbitrary");
     }
 
-    @Test(timeout = 5000L)
-    public void toStringDoesntResolveImageNameFuture() {
+    @Test
+    @Timeout(5)
+    void toStringDoesntResolveImageNameFuture() {
         CompletableFuture<String> imageNameFuture = new CompletableFuture<>();
 
         // verify that we've set up the test properly
@@ -47,8 +49,9 @@ public void toStringDoesntResolveImageNameFuture() {
         assertThat(remoteDockerImage.toString()).contains("imageName=" + imageName);
     }
 
-    @Test(timeout = 5000L)
-    public void toStringDoesntResolveLazyFuture() throws Exception {
+    @Test
+    @Timeout(5)
+    void toStringDoesntResolveLazyFuture() throws Exception {
         String imageName = Base58.randomString(8).toLowerCase();
         AtomicBoolean resolved = new AtomicBoolean(false);
         Future<String> imageNameFuture = new LazyFuture<String>() {
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
index b2c7075f4d2..fae6fc3193d 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerfileBuildTest.java
@@ -1,8 +1,8 @@
 package org.testcontainers.images.builder;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 
@@ -10,20 +10,15 @@
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class DockerfileBuildTest {
+class DockerfileBuildTest {
 
     static final Path RESOURCE_PATH = Paths.get("src/test/resources/dockerfile-build-test");
 
-    public String expectedFileContent;
-
-    public ImageFromDockerfile image;
-
-    @Parameterized.Parameters
-    public static Object[][] parameters() {
+    public static Stream<Arguments> parameters() {
         Map<String, String> buildArgs = new HashMap<>(4);
         buildArgs.put("BUILD_IMAGE", "alpine:3.16");
         buildArgs.put("BASE_IMAGE", "alpine");
@@ -31,55 +26,50 @@ public static Object[][] parameters() {
         buildArgs.put("UNUSED", "ignored");
 
         //noinspection deprecation
-        return new Object[][] {
+        return Stream.of(
             // Dockerfile build without explicit per-file inclusion
-            new Object[] {
+            Arguments.of(
                 "test1234",
                 // spotless:off
                 // docsShowRecursiveFileInclusion {
                 new ImageFromDockerfile()
-                    .withFileFromPath(".", RESOURCE_PATH),
+                    .withFileFromPath(".", RESOURCE_PATH)),
                 // }
                 // spotless:on
-            },
             // Dockerfile build using a non-standard Dockerfile
-            new Object[] {
+            Arguments.of(
                 "test4567",
-                new ImageFromDockerfile().withFileFromPath(".", RESOURCE_PATH).withDockerfilePath("./Dockerfile-alt"),
-            },
+                new ImageFromDockerfile().withFileFromPath(".", RESOURCE_PATH).withDockerfilePath("./Dockerfile-alt")
+            ),
             // Dockerfile build using withBuildArg()
-            new Object[] {
+            Arguments.of(
                 "test7890",
                 new ImageFromDockerfile()
                     .withFileFromPath(".", RESOURCE_PATH)
                     .withDockerfilePath("./Dockerfile-buildarg")
-                    .withBuildArg("CUSTOM_ARG", "test7890"),
-            },
+                    .withBuildArg("CUSTOM_ARG", "test7890")
+            ),
             // Dockerfile build using withBuildArgs() with build args in FROM statement
-            new Object[] {
+            Arguments.of(
                 "test1234",
                 new ImageFromDockerfile()
                     .withFileFromPath(".", RESOURCE_PATH)
                     .withDockerfile(RESOURCE_PATH.resolve("Dockerfile-from-buildarg"))
-                    .withBuildArgs(buildArgs),
-            },
+                    .withBuildArgs(buildArgs)
+            ),
             // Dockerfile build using withDockerfile(File)
-            new Object[] {
+            Arguments.of(
                 "test4567",
                 new ImageFromDockerfile()
                     .withFileFromPath(".", RESOURCE_PATH)
-                    .withDockerfile(RESOURCE_PATH.resolve("Dockerfile-alt")),
-            },
-        };
-    }
-
-    public DockerfileBuildTest(String expectedFileContent, ImageFromDockerfile image) {
-        this.expectedFileContent = expectedFileContent;
-        this.image = image;
+                    .withDockerfile(RESOURCE_PATH.resolve("Dockerfile-alt"))
+            )
+        );
     }
 
-    @Test
-    public void performTest() {
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void performTest(String expectedFileContent, ImageFromDockerfile image) {
         try (
             final GenericContainer<?> container = new GenericContainer<>(image)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
diff --git a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
index 8c6d288da99..6f7329f9dd2 100644
--- a/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/DockerignoreTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.images.builder;
 
 import com.github.dockerjava.api.exception.DockerClientException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.utility.DockerImageName;
@@ -12,12 +12,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class DockerignoreTest {
+class DockerignoreTest {
 
     private static final Path INVALID_DOCKERIGNORE_PATH = Paths.get("src/test/resources/dockerfile-build-invalid");
 
     @Test
-    public void testInvalidDockerignore() throws Exception {
+    void testInvalidDockerignore() throws Exception {
         try {
             new ImageFromDockerfile()
                 .withFileFromPath(".", INVALID_DOCKERIGNORE_PATH)
@@ -33,7 +33,7 @@ public void testInvalidDockerignore() throws Exception {
 
     @SuppressWarnings("resource")
     @Test
-    public void testValidDockerignore() throws Exception {
+    void testValidDockerignore() throws Exception {
         ImageFromDockerfile img = new ImageFromDockerfile()
             .withFileFromPath(".", DockerfileBuildTest.RESOURCE_PATH)
             .withDockerfile(DockerfileBuildTest.RESOURCE_PATH.resolve("Dockerfile-currentdir"));
diff --git a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
index b761d984187..0ce8ec041bf 100644
--- a/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
@@ -2,16 +2,16 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectImageResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.utility.Base58;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ImageFromDockerfileTest {
+class ImageFromDockerfileTest {
 
     @Test
-    public void shouldAddDefaultLabels() {
+    void shouldAddDefaultLabels() {
         ImageFromDockerfile image = new ImageFromDockerfile().withDockerfileFromBuilder(it -> it.from("scratch"));
 
         String imageId = image.resolve();
@@ -25,7 +25,7 @@ public void shouldAddDefaultLabels() {
     }
 
     @Test
-    public void shouldNotAddSessionLabelIfDeleteOnExitIsFalse() {
+    void shouldNotAddSessionLabelIfDeleteOnExitIsFalse() {
         ImageFromDockerfile image = new ImageFromDockerfile(
             "localhost/testcontainers/" + Base58.randomString(16).toLowerCase(),
             false
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
index 0c47d556137..28cb0407f25 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/AbstractStatementTest.java
@@ -3,8 +3,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.junit.Rule;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.TestInfo;
 import org.rnorth.ducttape.Preconditions;
 
 import java.io.InputStream;
@@ -14,13 +13,17 @@
 
 public abstract class AbstractStatementTest {
 
-    @Rule
-    public TestName testName = new TestName();
+    private final TestInfo testInfo;
+
+    AbstractStatementTest(TestInfo testInfo) {
+        this.testInfo = testInfo;
+    }
 
     protected void assertStatement(Statement statement) {
+        String testName = testInfo.getTestMethod().get().getName();
         String[] expectedLines = new String[0];
         try {
-            String path = "fixtures/statements/" + getClass().getSimpleName() + "/" + testName.getMethodName();
+            String path = "fixtures/statements/" + getClass().getSimpleName() + "/" + testName;
             InputStream inputStream = getClass().getClassLoader().getResourceAsStream(path);
 
             Preconditions.check("inputStream is null for path " + path, inputStream != null);
@@ -29,7 +32,7 @@ protected void assertStatement(Statement statement) {
             IOUtils.closeQuietly(inputStream);
             expectedLines = StringUtils.chomp(content.replaceAll("\r\n", "\n").trim()).split("\n");
         } catch (Exception e) {
-            fail("can't load fixture '" + testName.getMethodName() + "'\n" + ExceptionUtils.getStackTrace(e));
+            fail("can't load fixture '" + testName + "'\n" + ExceptionUtils.getStackTrace(e));
         }
 
         StringBuilder builder = new StringBuilder();
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java
index f446e48b42c..3ccd78faf7f 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/KeyValuesStatementTest.java
@@ -1,14 +1,19 @@
 package org.testcontainers.images.builder.dockerfile.statement;
 
 import com.google.common.collect.ImmutableMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
 import java.util.Collections;
 
-public class KeyValuesStatementTest extends AbstractStatementTest {
+class KeyValuesStatementTest extends AbstractStatementTest {
+
+    KeyValuesStatementTest(TestInfo testInfo) {
+        super(testInfo);
+    }
 
     @Test
-    public void multilineTest() throws Exception {
+    void multilineTest() throws Exception {
         ImmutableMap<String, String> pairs = ImmutableMap
             .<String, String>builder()
             .put("line1", "1")
@@ -20,22 +25,22 @@ public void multilineTest() throws Exception {
     }
 
     @Test
-    public void keyWithSpacesTest() throws Exception {
+    void keyWithSpacesTest() throws Exception {
         assertStatement(new KeyValuesStatement("TEST", Collections.singletonMap("key with spaces", "1")));
     }
 
     @Test
-    public void keyWithNewLinesTest() throws Exception {
+    void keyWithNewLinesTest() throws Exception {
         assertStatement(new KeyValuesStatement("TEST", Collections.singletonMap("key\nwith\nnewlines", "1")));
     }
 
     @Test
-    public void keyWithTabsTest() throws Exception {
+    void keyWithTabsTest() throws Exception {
         assertStatement(new KeyValuesStatement("TEST", Collections.singletonMap("key\twith\ttab", "1")));
     }
 
     @Test
-    public void valueIsEscapedTest() throws Exception {
+    void valueIsEscapedTest() throws Exception {
         ImmutableMap<String, String> pairs = ImmutableMap
             .<String, String>builder()
             .put("1", "value with spaces")
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java
index 50bc8bedd96..06d8fccccc0 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/MultiArgsStatementTest.java
@@ -1,16 +1,21 @@
 package org.testcontainers.images.builder.dockerfile.statement;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
-public class MultiArgsStatementTest extends AbstractStatementTest {
+class MultiArgsStatementTest extends AbstractStatementTest {
+
+    MultiArgsStatementTest(TestInfo testInfo) {
+        super(testInfo);
+    }
 
     @Test
-    public void simpleTest() throws Exception {
+    void simpleTest() {
         assertStatement(new MultiArgsStatement("TEST", "a", "b", "c"));
     }
 
     @Test
-    public void multilineTest() throws Exception {
+    void multilineTest() {
         assertStatement(new MultiArgsStatement("TEST", "some\nmultiline\nargument"));
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java
index 70724a03f09..d6964e0e5d7 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/RawStatementTest.java
@@ -1,11 +1,16 @@
 package org.testcontainers.images.builder.dockerfile.statement;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
-public class RawStatementTest extends AbstractStatementTest {
+class RawStatementTest extends AbstractStatementTest {
+
+    RawStatementTest(TestInfo testInfo) {
+        super(testInfo);
+    }
 
     @Test
-    public void simpleTest() throws Exception {
+    void simpleTest() throws Exception {
         assertStatement(new RawStatement("TEST", "value\nas\t\\\nis"));
     }
 }
diff --git a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java
index dbdabab9fff..cf446ef1018 100644
--- a/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java
+++ b/core/src/test/java/org/testcontainers/images/builder/dockerfile/statement/SingleArgumentStatementTest.java
@@ -1,16 +1,21 @@
 package org.testcontainers.images.builder.dockerfile.statement;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
-public class SingleArgumentStatementTest extends AbstractStatementTest {
+class SingleArgumentStatementTest extends AbstractStatementTest {
+
+    SingleArgumentStatementTest(TestInfo testInfo) {
+        super(testInfo);
+    }
 
     @Test
-    public void simpleTest() throws Exception {
+    void simpleTest() throws Exception {
         assertStatement(new SingleArgumentStatement("TEST", "hello"));
     }
 
     @Test
-    public void multilineTest() throws Exception {
+    void multilineTest() throws Exception {
         assertStatement(new SingleArgumentStatement("TEST", "hello\nworld"));
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java b/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
index 4d919388eb7..fc28f771749 100644
--- a/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
@@ -1,11 +1,11 @@
 package org.testcontainers.junit;
 
 import com.github.dockerjava.api.model.Network;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.utility.TestEnvironment;
@@ -25,13 +25,13 @@ public abstract class BaseComposeTest {
 
     private List<String> existingNetworks = new ArrayList<>();
 
-    @BeforeClass
+    @BeforeAll
     public static void checkVersion() {
-        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+        Assumptions.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
     }
 
     @Test
-    public void simpleTest() {
+    void simpleTest() {
         Jedis jedis = new Jedis(
             getEnvironment().getServiceHost("redis-1", REDIS_PORT),
             getEnvironment().getServicePort("redis-1", REDIS_PORT)
@@ -45,7 +45,7 @@ public void simpleTest() {
     }
 
     @Test
-    public void secondTest() {
+    void secondTest() {
         // used in manual checking for cleanup in between tests
         Jedis jedis = new Jedis(
             getEnvironment().getServiceHost("redis-1", REDIS_PORT),
@@ -61,12 +61,12 @@ public void secondTest() {
         // However, @Rule creates a separate DockerComposeContainer instance per test, so this just shouldn't happen
     }
 
-    @Before
+    @BeforeEach
     public void captureNetworks() {
         existingNetworks.addAll(findAllNetworks());
     }
 
-    @After
+    @AfterEach
     public void verifyNoNetworks() {
         assertThat(findAllNetworks()).as("The networks").isEqualTo(existingNetworks);
     }
diff --git a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
index c1aee4d7f2b..926fa301836 100644
--- a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
@@ -1,11 +1,11 @@
 package org.testcontainers.junit;
 
 import com.github.dockerjava.api.model.Network;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.utility.TestEnvironment;
@@ -28,13 +28,13 @@ public abstract class BaseDockerComposeTest {
 
     private List<String> existingNetworks = new ArrayList<>();
 
-    @BeforeClass
+    @BeforeAll
     public static void checkVersion() {
-        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+        Assumptions.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
     }
 
     @Test
-    public void simpleTest() {
+    void simpleTest() {
         Jedis jedis = new Jedis(
             getEnvironment().getServiceHost("redis_1", REDIS_PORT),
             getEnvironment().getServicePort("redis_1", REDIS_PORT)
@@ -48,7 +48,7 @@ public void simpleTest() {
     }
 
     @Test
-    public void secondTest() {
+    void secondTest() {
         // used in manual checking for cleanup in between tests
         Jedis jedis = new Jedis(
             getEnvironment().getServiceHost("redis_1", REDIS_PORT),
@@ -64,12 +64,12 @@ public void secondTest() {
         // However, @Rule creates a separate DockerComposeContainer instance per test, so this just shouldn't happen
     }
 
-    @Before
+    @BeforeEach
     public void captureNetworks() {
         existingNetworks.addAll(findAllNetworks());
     }
 
-    @After
+    @AfterEach
     public void verifyNoNetworks() {
         assertThat(findAllNetworks()).as("The networks").isEqualTo(existingNetworks);
     }
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
index 453fe9207ad..8e5651903f6 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerState;
 
@@ -9,14 +9,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ComposeContainerOverrideTest {
+class ComposeContainerOverrideTest {
 
     private static final File BASE = new File("src/test/resources/compose-override/compose.yml");
 
     private static final File OVERRIDE = new File("src/test/resources/compose-override/compose-override.yml");
 
     @Test
-    public void readEnvironment() {
+    void readEnvironment() {
         try (ComposeContainer compose = new ComposeContainer(BASE).withExposedService("redis", 6379)) {
             compose.start();
             InspectContainerResponse container = compose
@@ -28,7 +28,7 @@ public void readEnvironment() {
     }
 
     @Test
-    public void resetEnvironment() {
+    void resetEnvironment() {
         try (ComposeContainer compose = new ComposeContainer(BASE, OVERRIDE).withExposedService("redis", 6379)) {
             compose.start();
             InspectContainerResponse container = compose
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
index b27f4b080da..dfe51acbebb 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
@@ -1,19 +1,23 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.ComposeContainer;
 
 import java.io.File;
 
-public class ComposeContainerPortViaEnvTest extends BaseComposeTest {
+class ComposeContainerPortViaEnvTest extends BaseComposeTest {
 
-    @Rule
+    @AutoClose
     public ComposeContainer environment = new ComposeContainer(
         new File("src/test/resources/v2-compose-test-port-via-env.yml")
     )
         .withExposedService("redis-1", REDIS_PORT)
         .withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));
 
+    ComposeContainerPortViaEnvTest() {
+        this.environment.start();
+    }
+
     @Override
     protected ComposeContainer getEnvironment() {
         return environment;
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
index 83bc894b516..7614b49e303 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
@@ -1,10 +1,10 @@
 package org.testcontainers.junit;
 
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.utility.TestEnvironment;
 import redis.clients.jedis.Jedis;
@@ -13,18 +13,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ComposeContainerScalingTest {
+class ComposeContainerScalingTest {
 
     private static final int REDIS_PORT = 6379;
 
     private Jedis[] clients = new Jedis[3];
 
-    @BeforeClass
+    @BeforeAll
     public static void checkVersion() {
-        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+        Assumptions.assumeThat(TestEnvironment.dockerApiAtLeast("1.22")).isTrue();
     }
 
-    @Rule
+    @AutoClose
     public ComposeContainer environment = new ComposeContainer(
         new File("src/test/resources/composev2/scaled-compose-test.yml")
     )
@@ -33,7 +33,11 @@ public static void checkVersion() {
         .withExposedService("redis-2", REDIS_PORT) // explicit service index
         .withExposedService("redis", 3, REDIS_PORT); // explicit service index via parameter
 
-    @Before
+    ComposeContainerScalingTest() {
+        environment.start();
+    }
+
+    @BeforeEach
     public void setupClients() {
         for (int i = 0; i < 3; i++) {
             String name = String.format("redis-%d", i + 1);
@@ -44,7 +48,7 @@ public void setupClients() {
     }
 
     @Test
-    public void simpleTest() {
+    void simpleTest() {
         for (int i = 0; i < 3; i++) {
             clients[i].incr("somekey");
 
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
index 39c7ff2baf5..2d87cd3aa49 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
@@ -15,9 +14,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ComposeContainerTest extends BaseComposeTest {
+class ComposeContainerTest extends BaseComposeTest {
 
-    @Rule
     // composeContainerConstructor {
     public ComposeContainer environment = new ComposeContainer(
         new File("src/test/resources/composev2/compose-test.yml")
@@ -27,13 +25,17 @@ public class ComposeContainerTest extends BaseComposeTest {
 
     // }
 
+    ComposeContainerTest() {
+        environment.start();
+    }
+
     @Override
     protected ComposeContainer getEnvironment() {
         return environment;
     }
 
     @Test
-    public void testGetServiceHostAndPort() {
+    void testGetServiceHostAndPort() {
         // getServiceHostAndPort {
         String serviceHost = environment.getServiceHost("redis-1", REDIS_PORT);
         int serviceWithInstancePort = environment.getServicePort("redis-1", REDIS_PORT);
@@ -48,7 +50,7 @@ public void testGetServiceHostAndPort() {
     }
 
     @Test
-    public void shouldRetrieveContainerByServiceName() {
+    void shouldRetrieveContainerByServiceName() {
         String existingServiceName = "db-1";
         Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
         assertThat(result)
@@ -60,7 +62,7 @@ public void shouldRetrieveContainerByServiceName() {
     }
 
     @Test
-    public void shouldReturnEmptyResultOnNoneExistingService() {
+    void shouldReturnEmptyResultOnNoneExistingService() {
         String notExistingServiceName = "db-256";
         Optional<ContainerState> result = environment.getContainerByServiceName(notExistingServiceName);
         assertThat(result)
@@ -69,7 +71,7 @@ public void shouldReturnEmptyResultOnNoneExistingService() {
     }
 
     @Test
-    public void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
+    void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
         String validYaml =
             "version: '2.2'\n" +
             "services:\n" +
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
index 65cc7b92aa5..1898f5d580b 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
@@ -1,8 +1,8 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ComposeContainer;
 
@@ -15,35 +15,22 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-@RunWith(Parameterized.class)
-public class ComposeContainerVolumeRemovalTest {
+class ComposeContainerVolumeRemovalTest {
 
-    public ComposeContainerVolumeRemovalTest(
-        final boolean removeVolumes,
-        final boolean shouldVolumesBePresentAfterRunning
-    ) {
-        this.removeVolumes = removeVolumes;
-        this.shouldVolumesBePresentAfterRunning = shouldVolumesBePresentAfterRunning;
+    public static Stream<Arguments> params() {
+        return Stream.of(Arguments.of(true, false), Arguments.of(false, true));
     }
 
-    public final boolean removeVolumes;
-
-    public final boolean shouldVolumesBePresentAfterRunning;
-
-    @Parameterized.Parameters(name = "removeVolumes = {0}")
-    public static Object[][] params() {
-        return new Object[][] { { true, false }, { false, true } };
-    }
-
-    @Test
-    public void performTest() {
+    @ParameterizedTest
+    @MethodSource("params")
+    void performTest(boolean removeVolumes, boolean shouldVolumesBePresentAfterRunning) {
         final File composeFile = new File("src/test/resources/v2-compose-test.yml");
 
         final AtomicReference<String> volumeName = new AtomicReference<>("");
         try (
             ComposeContainer environment = new ComposeContainer(composeFile)
                 .withExposedService("redis", 6379)
-                .withRemoveVolumes(this.removeVolumes)
+                .withRemoveVolumes(removeVolumes)
                 .withRemoveImages(ComposeContainer.RemoveImages.ALL)
         ) {
             environment.start();
@@ -58,7 +45,7 @@ public void performTest() {
                 final boolean isVolumePresentAfterRunning = isVolumePresent(volumeName.get());
                 assertThat(isVolumePresentAfterRunning)
                     .as("the container volume is present after running")
-                    .isEqualTo(this.shouldVolumesBePresentAfterRunning);
+                    .isEqualTo(shouldVolumesBePresentAfterRunning);
             });
     }
 
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
index 7d13f72e300..589766f9184 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
@@ -1,9 +1,9 @@
 package org.testcontainers.junit;
 
 import com.github.dockerjava.api.model.Container;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ComposeContainer;
@@ -15,36 +15,23 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class ComposeContainerWithBuildTest {
+class ComposeContainerWithBuildTest {
 
-    public ComposeContainerWithBuildTest(
-        final ComposeContainer.RemoveImages removeMode,
-        final boolean shouldBuiltImageBePresentAfterRunning,
-        final boolean shouldPulledImageBePresentAfterRunning
-    ) {
-        this.removeMode = removeMode;
-        this.shouldBuiltImageBePresentAfterRunning = shouldBuiltImageBePresentAfterRunning;
-        this.shouldPulledImageBePresentAfterRunning = shouldPulledImageBePresentAfterRunning;
-    }
-
-    public final ComposeContainer.RemoveImages removeMode;
-
-    public final boolean shouldBuiltImageBePresentAfterRunning;
-
-    public final boolean shouldPulledImageBePresentAfterRunning;
-
-    @Parameterized.Parameters(name = "removeMode = {0}")
-    public static Object[][] params() {
-        return new Object[][] {
-            { null, true, true },
-            { ComposeContainer.RemoveImages.LOCAL, false, true },
-            { ComposeContainer.RemoveImages.ALL, false, false },
-        };
+    public static Stream<Arguments> params() {
+        return Stream.of(
+            Arguments.of(null, true, true),
+            Arguments.of(ComposeContainer.RemoveImages.LOCAL, false, true),
+            Arguments.of(ComposeContainer.RemoveImages.ALL, false, false)
+        );
     }
 
-    @Test
-    public void performTest() {
+    @ParameterizedTest
+    @MethodSource("params")
+    void performTest(
+        ComposeContainer.RemoveImages removeMode,
+        boolean shouldBuiltImageBePresentAfterRunning,
+        boolean shouldPulledImageBePresentAfterRunning
+    ) {
         final File composeFile = new File("src/test/resources/compose-v2-build-test/docker-compose.yml");
 
         final AtomicReference<String> builtImageName = new AtomicReference<>("");
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
index 2b1e2cd4081..33dc092cc51 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit;
 
 import io.restassured.RestAssured;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerLaunchException;
 
@@ -11,10 +11,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class ComposeContainerWithCopyFilesTest {
+class ComposeContainerWithCopyFilesTest {
 
     @Test
-    public void testShouldCopyAllFilesByDefault() throws IOException {
+    void testShouldCopyAllFilesByDefault() throws IOException {
         try (
             ComposeContainer environment = new ComposeContainer(
                 new File("src/test/resources/compose-file-copy-inclusions/compose.yml")
@@ -29,7 +29,7 @@ public void testShouldCopyAllFilesByDefault() throws IOException {
     }
 
     @Test
-    public void testWithFileCopyInclusionUsingFilePath() throws IOException {
+    void testWithFileCopyInclusionUsingFilePath() throws IOException {
         try (
             ComposeContainer environment = new ComposeContainer(
                 new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml")
@@ -47,7 +47,7 @@ public void testWithFileCopyInclusionUsingFilePath() throws IOException {
     }
 
     @Test
-    public void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
+    void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
         try (
             // composeContainerWithCopyFiles {
             ComposeContainer environment = new ComposeContainer(
@@ -66,7 +66,7 @@ public void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
     }
 
     @Test
-    public void testShouldNotBeAbleToStartIfNeededEnvFileIsNotCopied() {
+    void testShouldNotBeAbleToStartIfNeededEnvFileIsNotCopied() {
         try (
             ComposeContainer environment = new ComposeContainer(
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
index 9a6c581eb3b..e8bca173a54 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
@@ -2,92 +2,65 @@
 
 import com.google.common.collect.ImmutableSet;
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests the options associated with the docker-compose command.
  */
-@RunWith(Parameterized.class)
-public class ComposeContainerWithOptionsTest {
+class ComposeContainerWithOptionsTest {
 
-    public ComposeContainerWithOptionsTest(
-        final File composeFile,
-        final boolean localMode,
-        final Set<String> options,
-        final boolean expectError
-    ) {
-        this.composeFile = composeFile;
-        this.localMode = localMode;
-        this.options = options;
-        this.expectError = expectError;
-    }
-
-    private final File composeFile;
-
-    private final boolean localMode;
-
-    private final Set<String> options;
-
-    private final boolean expectError;
-
-    @Parameterized.Parameters(
-        name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]"
-    )
-    public static Object[][] params() {
-        return new Object[][] {
+    public static Stream<Arguments> params() {
+        return Stream.of(
             // Test the happy day case. THe compatibility option should be accepted by docker-compose.
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
                 ImmutableSet.of("--compatibility"),
-                false,
-            },
+                false
+            ),
             // Test with flags absent. Docker compose will warn but continue, ignoring the deploy block.
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
                 ImmutableSet.of(""),
-                false,
-            },
+                false
+            ),
             // Test with a bad option. Compose will complain.
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
                 ImmutableSet.of("--bad-option"),
-                true,
-            },
+                true
+            ),
             // Local compose
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 true,
                 ImmutableSet.of("--compatibility"),
-                false,
-            },
-        };
+                false
+            )
+        );
     }
 
-    @Before
-    public void setUp() {
-        if (this.localMode) {
+    @ParameterizedTest(name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]")
+    @MethodSource("params")
+    void performTest(File composeFile, boolean localMode, Set<String> options, boolean expectError) {
+        if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(ComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker executable exists")
                 .isTrue();
         }
-    }
-
-    @Test
-    public void performTest() {
         try (
             ComposeContainer environment = new ComposeContainer(composeFile)
                 .withOptions(options.stream().toArray(String[]::new))
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
index 1304413dce5..82a1a5e57ad 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -9,12 +9,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ComposeContainerWithWaitStrategies {
+class ComposeContainerWithWaitStrategies {
 
     private static final int REDIS_PORT = 6379;
 
     @Test
-    public void testComposeContainerConstructor() {
+    void testComposeContainerConstructor() {
         try (
             // composeContainerWithCombinedWaitStrategies {
             ComposeContainer compose = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"))
@@ -28,7 +28,7 @@ public void testComposeContainerConstructor() {
     }
 
     @Test
-    public void testComposeContainerWaitForPortWithTimeout() {
+    void testComposeContainerWaitForPortWithTimeout() {
         try (
             // composeContainerWaitForPortWithTimeout {
             ComposeContainer compose = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"))
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
index 496ede74497..a5e8e77c12f 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 
 import java.io.File;
@@ -8,10 +8,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class ComposeErrorHandlingTest {
+class ComposeErrorHandlingTest {
 
     @Test
-    public void simpleTest() {
+    void simpleTest() {
         assertThat(
             catchThrowable(() -> {
                 ComposeContainer environment = new ComposeContainer(new File("src/test/resources/invalid-compose.yml"))
diff --git a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
index d1724cb1e70..97ea43d38c9 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
@@ -1,9 +1,9 @@
 package org.testcontainers.junit;
 
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
@@ -15,24 +15,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ComposePassthroughTest {
+class ComposePassthroughTest {
 
     private final TestWaitStrategy waitStrategy = new TestWaitStrategy();
 
-    @BeforeClass
+    @BeforeAll
     public static void checkVersion() {
-        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+        Assumptions.assumeThat(TestEnvironment.dockerApiAtLeast("1.22")).isTrue();
     }
 
-    @Rule
+    @AutoClose
     public ComposeContainer compose = new ComposeContainer(
         new File("src/test/resources/v2-compose-test-passthrough.yml")
     )
         .withEnv("foo", "bar")
         .withExposedService("alpine-1", 3000, waitStrategy);
 
+    ComposePassthroughTest() {
+        compose.start();
+    }
+
     @Test
-    public void testContainerInstanceProperties() {
+    void testContainerInstanceProperties() {
         final ContainerState container = waitStrategy.getContainer();
 
         //check environment variable was set
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
index a77f80d227e..73553f70fdf 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
@@ -1,9 +1,8 @@
 package org.testcontainers.junit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -16,61 +15,61 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.assertj.core.api.Assertions.fail;
 
-public class ComposeWaitStrategyTest {
+class ComposeWaitStrategyTest {
 
     private static final int REDIS_PORT = 6379;
 
     private ComposeContainer environment;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         environment = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"));
     }
 
-    @After
+    @AfterEach
     public final void cleanUp() {
         environment.stop();
     }
 
     @Test
-    public void testWaitOnListeningPort() {
+    void testWaitOnListeningPort() {
         environment.withExposedService("redis-1", REDIS_PORT, Wait.forListeningPort());
 
         try {
-            environment.starting(Description.createTestDescription(Object.class, "name"));
+            environment.start();
         } catch (RuntimeException e) {
             fail("Docker compose should start after waiting for listening port with failed with: " + e);
         }
     }
 
     @Test
-    public void testWaitOnMultipleStrategiesPassing() {
+    void testWaitOnMultipleStrategiesPassing() {
         environment
             .withExposedService("redis-1", REDIS_PORT, Wait.forListeningPort())
             .withExposedService("db-1", 3306, Wait.forLogMessage(".*ready for connections.*\\s", 1))
             .withTailChildContainers(true);
 
         try {
-            environment.starting(Description.createTestDescription(Object.class, "name"));
+            environment.start();
         } catch (RuntimeException e) {
             fail("Docker compose should start after waiting for listening port with failed with: " + e);
         }
     }
 
     @Test
-    public void testWaitingFails() {
+    void testWaitingFails() {
         environment.withExposedService(
             "redis-1",
             REDIS_PORT,
             Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10))
         );
-        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+        assertThat(catchThrowable(() -> environment.start()))
             .as("waiting on an invalid http path times out")
             .isInstanceOf(RuntimeException.class);
     }
 
     @Test
-    public void testWaitOnOneOfMultipleStrategiesFailing() {
+    void testWaitOnOneOfMultipleStrategiesFailing() {
         environment
             .withExposedService(
                 "redis-1",
@@ -83,13 +82,13 @@ public void testWaitOnOneOfMultipleStrategiesFailing() {
             )
             .withTailChildContainers(true);
 
-        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+        assertThat(catchThrowable(() -> environment.start()))
             .as("waiting on one failing strategy to time out")
             .isInstanceOf(RuntimeException.class);
     }
 
     @Test
-    public void testWaitingForNonexistentServices() {
+    void testWaitingForNonexistentServices() {
         String existentServiceName = "db-1";
         String nonexistentServiceName1 = "some-nonexistent_service-1";
         String nonexistentServiceName2 = "some-nonexistent_service-2";
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
index f94449bb39f..71d80918d7c 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
@@ -1,19 +1,23 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.ComposeContainer;
 
 import java.io.File;
 
-public class ComposeWithIdentifierTest extends BaseComposeTest {
+class ComposeWithIdentifierTest extends BaseComposeTest {
 
-    @Rule
+    @AutoClose
     public ComposeContainer environment = new ComposeContainer(
         "TEST",
         new File("src/test/resources/v2-compose-test.yml")
     )
         .withExposedService("redis-1", REDIS_PORT);
 
+    ComposeWithIdentifierTest() {
+        environment.start();
+    }
+
     @Override
     protected ComposeContainer getEnvironment() {
         return this.environment;
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
index 3ce63b2a5fe..cfda1971600 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
@@ -1,18 +1,22 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.ComposeContainer;
 
 import java.io.File;
 
-public class ComposeWithNetworkTest extends BaseComposeTest {
+class ComposeWithNetworkTest extends BaseComposeTest {
 
-    @Rule
+    @AutoClose
     public ComposeContainer environment = new ComposeContainer(
         new File("src/test/resources/v2-compose-test-with-network.yml")
     )
         .withExposedService("redis-1", REDIS_PORT);
 
+    ComposeWithNetworkTest() {
+        environment.start();
+    }
+
     @Override
     protected ComposeContainer getEnvironment() {
         return environment;
diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
index 1aa017d6894..1acac36e6ad 100644
--- a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -2,8 +2,8 @@
 
 import com.google.common.io.Files;
 import com.google.common.io.Resources;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CopyFileToContainerTest {
+class CopyFileToContainerTest {
 
     private static String destinationOnHost;
 
@@ -24,13 +24,13 @@ public class CopyFileToContainerTest {
 
     private static String fileName = "test-resource.txt";
 
-    @Before
+    @BeforeEach
     public void setup() throws IOException {
         destinationOnHost = File.createTempFile("testcontainers", null).getAbsolutePath();
     }
 
     @Test
-    public void checkFileCopied() throws IOException, InterruptedException {
+    void checkFileCopied() throws IOException, InterruptedException {
         try (
             // copyToContainer {
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
@@ -55,7 +55,7 @@ public void checkFileCopied() throws IOException, InterruptedException {
     }
 
     @Test
-    public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
+    void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("sleep", "3000")
@@ -68,7 +68,7 @@ public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
     }
 
     @Test
-    public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
+    void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
         String resource = "/test_copy_to_container.txt";
         GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
             .withClasspathResourceMapping(resource, "/readOnly", BindMode.READ_ONLY)
@@ -82,7 +82,7 @@ public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
     }
 
     @Test
-    public void shouldCreateFoldersStructureWithCopy() throws Exception {
+    void shouldCreateFoldersStructureWithCopy() throws Exception {
         String resource = "/test_copy_to_container.txt";
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
diff --git a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
index effa9b06447..cbb305c30f8 100644
--- a/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DependenciesTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit;
 
 import lombok.Getter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -18,10 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DependenciesTest {
+class DependenciesTest {
 
     @Test
-    public void shouldWorkWithSimpleDependency() {
+    void shouldWorkWithSimpleDependency() {
         InvocationCountingStartable startable = new InvocationCountingStartable();
 
         try (
@@ -37,7 +37,7 @@ public void shouldWorkWithSimpleDependency() {
     }
 
     @Test
-    public void shouldWorkWithMultipleDependencies() {
+    void shouldWorkWithMultipleDependencies() {
         InvocationCountingStartable startable1 = new InvocationCountingStartable();
         InvocationCountingStartable startable2 = new InvocationCountingStartable();
 
@@ -54,7 +54,7 @@ public void shouldWorkWithMultipleDependencies() {
     }
 
     @Test
-    public void shouldStartEveryTime() {
+    void shouldStartEveryTime() {
         InvocationCountingStartable startable = new InvocationCountingStartable();
 
         try (
@@ -76,7 +76,7 @@ public void shouldStartEveryTime() {
     }
 
     @Test
-    public void shouldStartTransitiveDependencies() {
+    void shouldStartTransitiveDependencies() {
         InvocationCountingStartable transitiveOfTransitiveStartable = new InvocationCountingStartable();
         InvocationCountingStartable transitiveStartable = new InvocationCountingStartable();
         transitiveStartable.getDependencies().add(transitiveOfTransitiveStartable);
@@ -101,7 +101,7 @@ public void shouldStartTransitiveDependencies() {
     }
 
     @Test
-    public void shouldHandleDiamondDependencies() throws Exception {
+    void shouldHandleDiamondDependencies() throws Exception {
         InvocationCountingStartable a = new InvocationCountingStartable();
         InvocationCountingStartable b = new InvocationCountingStartable();
         InvocationCountingStartable c = new InvocationCountingStartable();
@@ -124,7 +124,7 @@ public void shouldHandleDiamondDependencies() throws Exception {
     }
 
     @Test
-    public void shouldHandleParallelStream() throws Exception {
+    void shouldHandleParallelStream() throws Exception {
         List<Startable> startables = Stream
             .generate(InvocationCountingStartable::new)
             .limit(10)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
index 849e2a8e6a6..0cf523836a5 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
@@ -1,19 +1,23 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
 
-public class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
+class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
 
-    @Rule
+    @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
         new File("src/test/resources/v2-compose-test-port-via-env.yml")
     )
         .withExposedService("redis_1", REDIS_PORT)
         .withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));
 
+    DockerComposeContainerPortViaEnvTest() {
+        environment.start();
+    }
+
     @Override
     protected DockerComposeContainer getEnvironment() {
         return environment;
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
index 5571e42dcf7..90256bb0f37 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
@@ -1,10 +1,10 @@
 package org.testcontainers.junit;
 
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.utility.TestEnvironment;
 import redis.clients.jedis.Jedis;
@@ -16,18 +16,18 @@
 /**
  * Created by rnorth on 08/08/2015.
  */
-public class DockerComposeContainerScalingTest {
+class DockerComposeContainerScalingTest {
 
     private static final int REDIS_PORT = 6379;
 
     private Jedis[] clients = new Jedis[3];
 
-    @BeforeClass
+    @BeforeAll
     public static void checkVersion() {
-        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+        Assumptions.assumeThat(TestEnvironment.dockerApiAtLeast("1.22")).isTrue();
     }
 
-    @Rule
+    @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
         new File("src/test/resources/scaled-compose-test.yml")
     )
@@ -36,8 +36,9 @@ public static void checkVersion() {
         .withExposedService("redis_2", REDIS_PORT) // explicit service index
         .withExposedService("redis", 3, REDIS_PORT); // explicit service index via parameter
 
-    @Before
+    @BeforeEach
     public void setupClients() {
+        this.environment.start();
         for (int i = 0; i < 3; i++) {
             String name = String.format("redis_%d", i + 1);
 
@@ -47,7 +48,7 @@ public void setupClients() {
     }
 
     @Test
-    public void simpleTest() {
+    void simpleTest() {
         for (int i = 0; i < 3; i++) {
             clients[i].incr("somekey");
 
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
index 96989af90a4..568eaae53cf 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 
@@ -17,22 +17,26 @@
 /**
  * Created by rnorth on 08/08/2015.
  */
-public class DockerComposeContainerTest extends BaseDockerComposeTest {
+class DockerComposeContainerTest extends BaseDockerComposeTest {
 
-    @Rule
+    @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
         new File("src/test/resources/compose-test.yml")
     )
         .withExposedService("redis_1", REDIS_PORT)
         .withExposedService("db_1", 3306);
 
+    DockerComposeContainerTest() {
+        environment.start();
+    }
+
     @Override
     protected DockerComposeContainer getEnvironment() {
         return environment;
     }
 
     @Test
-    public void testGetServicePort() {
+    void testGetServicePort() {
         int serviceWithInstancePort = environment.getServicePort("redis_1", REDIS_PORT);
         assertThat(serviceWithInstancePort).as("Port is set for service with instance number").isNotNull();
         int serviceWithoutInstancePort = environment.getServicePort("redis", REDIS_PORT);
@@ -41,7 +45,7 @@ public void testGetServicePort() {
     }
 
     @Test
-    public void shouldRetrieveContainerByServiceName() {
+    void shouldRetrieveContainerByServiceName() {
         String existingServiceName = "db_1";
         Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
 
@@ -54,7 +58,7 @@ public void shouldRetrieveContainerByServiceName() {
     }
 
     @Test
-    public void shouldRetrieveContainerByServiceNameWithoutNumberedSuffix() {
+    void shouldRetrieveContainerByServiceNameWithoutNumberedSuffix() {
         String existingServiceName = "db";
         Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);
 
@@ -67,7 +71,7 @@ public void shouldRetrieveContainerByServiceNameWithoutNumberedSuffix() {
     }
 
     @Test
-    public void shouldReturnEmptyResultOnNoneExistingService() {
+    void shouldReturnEmptyResultOnNoneExistingService() {
         String notExistingServiceName = "db_256";
         Optional<ContainerState> result = environment.getContainerByServiceName(notExistingServiceName);
         assertThat(result)
@@ -76,7 +80,7 @@ public void shouldReturnEmptyResultOnNoneExistingService() {
     }
 
     @Test
-    public void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
+    void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
         String validYaml =
             "version: '2.2'\n" +
             "services:\n" +
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
index 764000a3cae..557cc7e27db 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
@@ -1,8 +1,7 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.DockerComposeContainer;
 
@@ -15,35 +14,22 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-@RunWith(Parameterized.class)
-public class DockerComposeContainerVolumeRemovalTest {
+class DockerComposeContainerVolumeRemovalTest {
 
-    public DockerComposeContainerVolumeRemovalTest(
-        final boolean removeVolumes,
-        final boolean shouldVolumesBePresentAfterRunning
-    ) {
-        this.removeVolumes = removeVolumes;
-        this.shouldVolumesBePresentAfterRunning = shouldVolumesBePresentAfterRunning;
-    }
-
-    public final boolean removeVolumes;
-
-    public final boolean shouldVolumesBePresentAfterRunning;
-
-    @Parameterized.Parameters(name = "removeVolumes = {0}")
     public static Object[][] params() {
         return new Object[][] { { true, false }, { false, true } };
     }
 
-    @Test
-    public void performTest() {
+    @ParameterizedTest
+    @MethodSource("params")
+    void performTest(boolean removeVolumes, boolean shouldVolumesBePresentAfterRunning) {
         final File composeFile = new File("src/test/resources/compose-test.yml");
 
         final AtomicReference<String> volumeName = new AtomicReference<>("");
         try (
             DockerComposeContainer environment = new DockerComposeContainer<>(composeFile)
                 .withExposedService("redis", 6379)
-                .withRemoveVolumes(this.removeVolumes)
+                .withRemoveVolumes(removeVolumes)
                 .withRemoveImages(DockerComposeContainer.RemoveImages.ALL)
         ) {
             environment.start();
@@ -58,7 +44,7 @@ public void performTest() {
                 final boolean isVolumePresentAfterRunning = isVolumePresent(volumeName.get());
                 assertThat(isVolumePresentAfterRunning)
                     .as("the container volume is present after running")
-                    .isEqualTo(this.shouldVolumesBePresentAfterRunning);
+                    .isEqualTo(shouldVolumesBePresentAfterRunning);
             });
     }
 
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
index ea7e35689d0..8f8da1e6450 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
@@ -1,9 +1,9 @@
 package org.testcontainers.junit;
 
 import com.github.dockerjava.api.model.Container;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.DockerComposeContainer;
@@ -15,36 +15,23 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class DockerComposeContainerWithBuildTest {
+class DockerComposeContainerWithBuildTest {
 
-    public DockerComposeContainerWithBuildTest(
-        final DockerComposeContainer.RemoveImages removeMode,
-        final boolean shouldBuiltImageBePresentAfterRunning,
-        final boolean shouldPulledImageBePresentAfterRunning
-    ) {
-        this.removeMode = removeMode;
-        this.shouldBuiltImageBePresentAfterRunning = shouldBuiltImageBePresentAfterRunning;
-        this.shouldPulledImageBePresentAfterRunning = shouldPulledImageBePresentAfterRunning;
-    }
-
-    public final DockerComposeContainer.RemoveImages removeMode;
-
-    public final boolean shouldBuiltImageBePresentAfterRunning;
-
-    public final boolean shouldPulledImageBePresentAfterRunning;
-
-    @Parameterized.Parameters(name = "removeMode = {0}")
-    public static Object[][] params() {
-        return new Object[][] {
-            { null, true, true },
-            { DockerComposeContainer.RemoveImages.LOCAL, false, true },
-            { DockerComposeContainer.RemoveImages.ALL, false, false },
-        };
+    public static Stream<Arguments> params() {
+        return Stream.of(
+            Arguments.of(null, true, true),
+            Arguments.of(DockerComposeContainer.RemoveImages.LOCAL, false, true),
+            Arguments.of(DockerComposeContainer.RemoveImages.ALL, false, false)
+        );
     }
 
-    @Test
-    public void performTest() {
+    @ParameterizedTest
+    @MethodSource("params")
+    void performTest(
+        DockerComposeContainer.RemoveImages removeMode,
+        boolean shouldBuiltImageBePresentAfterRunning,
+        boolean shouldPulledImageBePresentAfterRunning
+    ) {
         final File composeFile = new File("src/test/resources/compose-build-test/docker-compose.yml");
 
         final AtomicReference<String> builtImageName = new AtomicReference<>("");
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
index 46dd4c65b3c..69853a4e0d3 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit;
 
 import io.restassured.RestAssured;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
@@ -9,10 +9,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DockerComposeContainerWithCopyFilesTest {
+class DockerComposeContainerWithCopyFilesTest {
 
     @Test
-    public void testShouldCopyAllFilesByDefault() throws IOException {
+    void testShouldCopyAllFilesByDefault() throws IOException {
         try (
             DockerComposeContainer environment = new DockerComposeContainer(
                 new File("src/test/resources/compose-file-copy-inclusions/compose.yml")
@@ -27,7 +27,7 @@ public void testShouldCopyAllFilesByDefault() throws IOException {
     }
 
     @Test
-    public void testWithFileCopyInclusionUsingFilePath() throws IOException {
+    void testWithFileCopyInclusionUsingFilePath() throws IOException {
         try (
             DockerComposeContainer environment = new DockerComposeContainer(
                 new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml")
@@ -45,7 +45,7 @@ public void testWithFileCopyInclusionUsingFilePath() throws IOException {
     }
 
     @Test
-    public void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
+    void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
         try (
             DockerComposeContainer environment = new DockerComposeContainer(
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
index ae5dbc1d0b4..d4b684ef010 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
@@ -2,83 +2,60 @@
 
 import com.google.common.collect.ImmutableSet;
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests the options associated with the docker-compose command.
  */
-@RunWith(Parameterized.class)
-public class DockerComposeContainerWithOptionsTest {
+class DockerComposeContainerWithOptionsTest {
 
-    public DockerComposeContainerWithOptionsTest(
-        final File composeFile,
-        final boolean localMode,
-        final Set<String> options,
-        final boolean expectError
-    ) {
-        this.composeFile = composeFile;
-        this.localMode = localMode;
-        this.options = options;
-        this.expectError = expectError;
-    }
-
-    private final File composeFile;
-
-    private final boolean localMode;
-
-    private final Set<String> options;
-
-    private final boolean expectError;
-
-    @Parameterized.Parameters(
-        name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]"
-    )
-    public static Object[][] params() {
-        return new Object[][] {
+    public static Stream<Arguments> params() {
+        return Stream.of(
             // Test the happy day case. THe compatibility option should be accepted by docker-compose.
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
                 ImmutableSet.of("--compatibility"),
-                false,
-            },
+                false
+            ),
             // Test with flags absent. Docker compose will warn but continue, ignoring the deploy block.
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
                 ImmutableSet.of(""),
-                false,
-            },
+                false
+            ),
             // Test with a bad option. Compose will complain.
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
                 ImmutableSet.of("--bad-option"),
-                true,
-            },
+                true
+            ),
             // Local compose
-            {
+            Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 true,
                 ImmutableSet.of("--compatibility"),
-                false,
-            },
-        };
+                false
+            )
+        );
     }
 
-    @Before
-    public void setUp() {
-        if (this.localMode) {
+    @ParameterizedTest(name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]")
+    @MethodSource("params")
+    void performTest(File composeFile, boolean localMode, Set<String> options, boolean expectError) {
+        if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
@@ -87,10 +64,6 @@ public void setUp() {
                 .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
                 .doesNotStartWith("Docker Compose version v2");
         }
-    }
-
-    @Test
-    public void performTest() {
         try (
             DockerComposeContainer<?> environment = new DockerComposeContainer<>(composeFile)
                 .withOptions(options.stream().toArray(String[]::new))
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
index 63383bb7175..9d0f4a19f1e 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
@@ -8,10 +8,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class DockerComposeErrorHandlingTest {
+class DockerComposeErrorHandlingTest {
 
     @Test
-    public void simpleTest() {
+    void simpleTest() {
         assertThat(
             catchThrowable(() -> {
                 DockerComposeContainer environment = new DockerComposeContainer(
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
index 69b674bca71..2c77092e1bd 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
@@ -2,16 +2,16 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.core.command.PullImageResultCallback;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
 
-public class DockerComposeLocalImageTest {
+class DockerComposeLocalImageTest {
 
     @Test
-    public void usesLocalImageEvenWhenPullFails() throws InterruptedException {
+    void usesLocalImageEvenWhenPullFails() throws InterruptedException {
         tagImage("redis:6-alpine", "redis-local", "latest");
 
         DockerComposeContainer composeContainer = new DockerComposeContainer(
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
index 97e686a9b92..a712fb19664 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.Description;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
@@ -10,10 +10,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public class DockerComposeLogConsumerTest {
+class DockerComposeLogConsumerTest {
 
     @Test
-    public void testLogConsumer() throws TimeoutException {
+    void testLogConsumer() throws TimeoutException {
         WaitingConsumer logConsumer = new WaitingConsumer();
         DockerComposeContainer environment = new DockerComposeContainer(
             new File("src/test/resources/v2-compose-test.yml")
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
index 10a26306248..0bc8ace7ab7 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
@@ -1,9 +1,7 @@
 package org.testcontainers.junit;
 
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
@@ -18,35 +16,34 @@
 /**
  * Created by rnorth on 11/06/2016.
  */
-public class DockerComposePassthroughTest {
-
-    private final TestWaitStrategy waitStrategy = new TestWaitStrategy();
-
-    @BeforeClass
-    public static void checkVersion() {
-        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
-    }
-
-    @Rule
-    public DockerComposeContainer compose = new DockerComposeContainer(
-        new File("src/test/resources/v2-compose-test-passthrough.yml")
-    )
-        .withEnv("foo", "bar")
-        .withExposedService("alpine_1", 3000, waitStrategy);
+class DockerComposePassthroughTest {
 
     @Test
-    public void testContainerInstanceProperties() {
-        final ContainerState container = waitStrategy.getContainer();
-
-        //check environment variable was set
-        assertThat(Arrays.asList(Objects.requireNonNull(container.getContainerInfo().getConfig().getEnv())))
-            .as("Environment variable set correctly")
-            .containsOnlyOnce("bar=bar");
-
-        //check other container properties
-        assertThat(container.getContainerId()).as("Container id is not null").isNotNull();
-        assertThat(container.getMappedPort(3000)).as("Port mapped").isNotNull();
-        assertThat(container.getExposedPorts()).containsExactly(3000);
+    void testContainerInstanceProperties() {
+        Assumptions.assumeThat(TestEnvironment.dockerApiAtLeast("1.22")).isTrue();
+
+        TestWaitStrategy waitStrategy = new TestWaitStrategy();
+        try (
+            DockerComposeContainer compose = new DockerComposeContainer(
+                new File("src/test/resources/v2-compose-test-passthrough.yml")
+            )
+                .withEnv("foo", "bar")
+                .withExposedService("alpine_1", 3000, waitStrategy)
+        ) {
+            compose.start();
+
+            final ContainerState container = waitStrategy.getContainer();
+
+            //check environment variable was set
+            assertThat(Arrays.asList(Objects.requireNonNull(container.getContainerInfo().getConfig().getEnv())))
+                .as("Environment variable set correctly")
+                .containsOnlyOnce("bar=bar");
+
+            //check other container properties
+            assertThat(container.getContainerId()).as("Container id is not null").isNotNull();
+            assertThat(container.getMappedPort(3000)).as("Port mapped").isNotNull();
+            assertThat(container.getExposedPorts()).containsExactly(3000);
+        }
     }
 
     /*
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
index ccca85407f3..2496b7ee0bc 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
@@ -1,34 +1,42 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class DockerComposeServiceTest extends BaseDockerComposeTest {
+class DockerComposeServiceTest extends BaseDockerComposeTest {
 
-    @Rule
+    @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
         new File("src/test/resources/compose-test.yml")
     )
         .withServices("redis")
         .withExposedService("redis_1", REDIS_PORT);
 
+    DockerComposeServiceTest() {
+        environment.start();
+    }
+
     @Override
     protected DockerComposeContainer getEnvironment() {
         return environment;
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testDbIsNotStarting() {
-        environment.getServicePort("db_1", 10001);
+    @Test
+    void testDbIsNotStarting() {
+        assertThatThrownBy(() -> {
+                environment.getServicePort("db_1", 10001);
+            })
+            .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void testRedisIsStarting() {
+    void testRedisIsStarting() {
         assertThat(environment.getServicePort("redis_1", REDIS_PORT)).as("Redis server started").isNotNull();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
index f3dc2ee3cc8..c7b066b39b8 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
@@ -8,14 +8,18 @@
 /**
  * Created by rnorth on 21/05/2016.
  */
-public class DockerComposeV2FormatTest extends BaseDockerComposeTest {
+class DockerComposeV2FormatTest extends BaseDockerComposeTest {
 
-    @Rule
+    @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
         new File("src/test/resources/v2-compose-test.yml")
     )
         .withExposedService("redis_1", REDIS_PORT);
 
+    DockerComposeV2FormatTest() {
+        environment.start();
+    }
+
     @Override
     protected DockerComposeContainer getEnvironment() {
         return environment;
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
index 90c041b53b6..d8f4e57dbd9 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
@@ -1,19 +1,23 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
 
-public class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
+class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
 
-    @Rule
+    @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
         "TEST",
         new File("src/test/resources/v2-compose-test.yml")
     )
         .withExposedService("redis_1", REDIS_PORT);
 
+    DockerComposeV2FormatWithIdentifierTest() {
+        environment.start();
+    }
+
     @Override
     protected DockerComposeContainer getEnvironment() {
         return this.environment;
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
index b28dfc3ee51..bc95f0229b7 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
@@ -1,18 +1,22 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.DockerComposeContainer;
 
 import java.io.File;
 
-public class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
+class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
 
-    @Rule
+    @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
         new File("src/test/resources/v2-compose-test-with-network.yml")
     )
         .withExposedService("redis_1", REDIS_PORT);
 
+    DockerComposeV2WithNetworkTest() {
+        environment.start();
+    }
+
     @Override
     protected DockerComposeContainer getEnvironment() {
         return environment;
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
index b110e776285..9f8c2c9ab49 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
@@ -1,9 +1,8 @@
 package org.testcontainers.junit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -16,61 +15,61 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.assertj.core.api.Assertions.fail;
 
-public class DockerComposeWaitStrategyTest {
+class DockerComposeWaitStrategyTest {
 
     private static final int REDIS_PORT = 6379;
 
     private DockerComposeContainer<?> environment;
 
-    @Before
+    @BeforeEach
     public final void setUp() {
         environment = new DockerComposeContainer<>(new File("src/test/resources/compose-test.yml"));
     }
 
-    @After
+    @AfterEach
     public final void cleanUp() {
         environment.stop();
     }
 
     @Test
-    public void testWaitOnListeningPort() {
+    void testWaitOnListeningPort() {
         environment.withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort());
 
         try {
-            environment.starting(Description.createTestDescription(Object.class, "name"));
+            environment.start();
         } catch (RuntimeException e) {
             fail("Docker compose should start after waiting for listening port with failed with: " + e);
         }
     }
 
     @Test
-    public void testWaitOnMultipleStrategiesPassing() {
+    void testWaitOnMultipleStrategiesPassing() {
         environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort())
             .withExposedService("db_1", 3306, Wait.forLogMessage(".*ready for connections.*\\s", 1))
             .withTailChildContainers(true);
 
         try {
-            environment.starting(Description.createTestDescription(Object.class, "name"));
+            environment.start();
         } catch (RuntimeException e) {
             fail("Docker compose should start after waiting for listening port with failed with: " + e);
         }
     }
 
     @Test
-    public void testWaitingFails() {
+    void testWaitingFails() {
         environment.withExposedService(
             "redis_1",
             REDIS_PORT,
             Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10))
         );
-        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+        assertThat(catchThrowable(() -> environment.start()))
             .as("waiting on an invalid http path times out")
             .isInstanceOf(RuntimeException.class);
     }
 
     @Test
-    public void testWaitOnOneOfMultipleStrategiesFailing() {
+    void testWaitOnOneOfMultipleStrategiesFailing() {
         environment
             .withExposedService(
                 "redis_1",
@@ -83,13 +82,13 @@ public void testWaitOnOneOfMultipleStrategiesFailing() {
             )
             .withTailChildContainers(true);
 
-        assertThat(catchThrowable(() -> environment.starting(Description.createTestDescription(Object.class, "name"))))
+        assertThat(catchThrowable(() -> environment.start()))
             .as("waiting on one failing strategy to time out")
             .isInstanceOf(RuntimeException.class);
     }
 
     @Test
-    public void testWaitingForNonexistentServices() {
+    void testWaitingForNonexistentServices() {
         String existentServiceName = "db_1";
         String nonexistentServiceName1 = "some_nonexistent_service_1";
         String nonexistentServiceName2 = "some_nonexistent_service_2";
diff --git a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
index b048e4716fd..c35809f74e9 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerNetworkModeTest.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.model.NetworkSettings;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -14,10 +14,10 @@
  * without other setup steps.
  */
 @Slf4j
-public class DockerNetworkModeTest {
+class DockerNetworkModeTest {
 
     @Test
-    public void testNoNetworkContainer() {
+    void testNoNetworkContainer() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
@@ -33,7 +33,7 @@ public void testNoNetworkContainer() {
     }
 
     @Test
-    public void testHostNetworkContainer() {
+    void testHostNetworkContainer() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
index 9ed143aca9c..61500ca7993 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileContainerTest.java
@@ -4,8 +4,8 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
@@ -16,9 +16,9 @@
 /**
  * Simple test case / demonstration of creating a fresh container image from a Dockerfile DSL
  */
-public class DockerfileContainerTest {
+class DockerfileContainerTest {
 
-    @Rule
+    @AutoClose
     public GenericContainer dslContainer = new GenericContainer(
         new ImageFromDockerfile("tcdockerfile/nginx", false)
             .withDockerfileFromBuilder(builder -> {
@@ -32,7 +32,9 @@ public class DockerfileContainerTest {
         .withExposedPorts(80);
 
     @Test
-    public void simpleDslTest() throws IOException {
+    void simpleDslTest() throws IOException {
+        dslContainer.start();
+
         String address = String.format("http://%s:%s", dslContainer.getHost(), dslContainer.getMappedPort(80));
 
         CloseableHttpClient httpClient = HttpClientBuilder.create().build();
diff --git a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
index 113fd7f4c63..9f85af8d209 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerfileTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit;
 
 import com.github.dockerjava.api.command.BuildImageCmd;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -16,12 +16,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public class DockerfileTest {
+class DockerfileTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DockerfileTest.class);
 
     @Test
-    public void simpleDockerfileWorks() {
+    void simpleDockerfileWorks() {
         ImageFromDockerfile image = new ImageFromDockerfile()
             .withFileFromString("folder/someFile.txt", "hello")
             .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
@@ -31,7 +31,7 @@ public void simpleDockerfileWorks() {
     }
 
     @Test
-    public void customizableImage() {
+    void customizableImage() {
         ImageFromDockerfile image = new ImageFromDockerfile() {
             @Override
             protected void configure(BuildImageCmd buildImageCmd) {
@@ -52,7 +52,7 @@ protected void configure(BuildImageCmd buildImageCmd) {
     }
 
     @Test
-    public void dockerfileBuilderWorks() {
+    void dockerfileBuilderWorks() {
         ImageFromDockerfile image = new ImageFromDockerfile()
             .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
             .withFileFromString("folder/someFile.txt", "hello")
@@ -71,7 +71,7 @@ public void dockerfileBuilderWorks() {
     }
 
     @Test
-    public void filePermissions() throws TimeoutException {
+    void filePermissions() throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
 
         ImageFromDockerfile image = new ImageFromDockerfile()
diff --git a/core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java b/core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java
index a3dd21318d2..365229e5909 100644
--- a/core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ExecInContainerTest.java
@@ -1,8 +1,8 @@
 package org.testcontainers.junit;
 
-import org.junit.Assume;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.ExecConfig;
 import org.testcontainers.containers.GenericContainer;
@@ -12,17 +12,21 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ExecInContainerTest {
+class ExecInContainerTest {
 
-    @ClassRule
+    @AutoClose
     public static GenericContainer<?> redis = new GenericContainer<>(TestImages.REDIS_IMAGE).withExposedPorts(6379);
 
+    static {
+        redis.start();
+    }
+
     @Test
-    public void shouldExecuteCommand() throws Exception {
+    void shouldExecuteCommand() throws Exception {
         // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
         // that's the case for CircleCI.
         // Once they resolve the issue, this clause can be removed.
-        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+        Assumptions.assumeThat(TestEnvironment.dockerExecutionDriverSupportsExec()).isTrue();
 
         final GenericContainer.ExecResult result = redis.execInContainer("redis-cli", "role");
         assertThat(result.getStdout())
@@ -33,11 +37,11 @@ public void shouldExecuteCommand() throws Exception {
     }
 
     @Test
-    public void shouldExecuteCommandWithUser() throws Exception {
+    void shouldExecuteCommandWithUser() throws Exception {
         // The older "lxc" execution driver doesn't support "exec". At the time of writing (2016/03/29),
         // that's the case for CircleCI.
         // Once they resolve the issue, this clause can be removed.
-        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+        Assumptions.assumeThat(TestEnvironment.dockerExecutionDriverSupportsExec()).isTrue();
 
         final GenericContainer.ExecResult result = redis.execInContainerWithUser("redis", "whoami");
         assertThat(result.getStdout())
@@ -48,8 +52,8 @@ public void shouldExecuteCommandWithUser() throws Exception {
     }
 
     @Test
-    public void shouldExecuteCommandWithWorkdir() throws Exception {
-        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+    void shouldExecuteCommandWithWorkdir() throws Exception {
+        Assumptions.assumeThat(TestEnvironment.dockerExecutionDriverSupportsExec()).isTrue();
 
         final GenericContainer.ExecResult result = redis.execInContainer(
             ExecConfig.builder().workDir("/opt").command(new String[] { "pwd" }).build()
@@ -58,8 +62,8 @@ public void shouldExecuteCommandWithWorkdir() throws Exception {
     }
 
     @Test
-    public void shouldExecuteCommandWithEnvVars() throws Exception {
-        Assume.assumeTrue(TestEnvironment.dockerExecutionDriverSupportsExec());
+    void shouldExecuteCommandWithEnvVars() throws Exception {
+        Assumptions.assumeThat(TestEnvironment.dockerExecutionDriverSupportsExec()).isTrue();
 
         final GenericContainer.ExecResult result = redis.execInContainer(
             ExecConfig
diff --git a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
index 767deacfb00..f2c8117a905 100644
--- a/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FileOperationsTest.java
@@ -4,9 +4,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.CountingOutputStream;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
@@ -17,17 +16,18 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class FileOperationsTest {
+class FileOperationsTest {
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+    @TempDir
+    public Path temporaryFolder;
 
     @Test
-    public void copyFileToContainerFileTest() throws Exception {
+    void copyFileToContainerFileTest() throws Exception {
         try (
             GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
@@ -36,7 +36,7 @@ public void copyFileToContainerFileTest() throws Exception {
             final MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
             alpineCopyToContainer.copyFileToContainer(mountableFile, "/test.txt");
 
-            File actualFile = new File(temporaryFolder.getRoot().getAbsolutePath() + "/test_copy_to_container.txt");
+            File actualFile = new File(temporaryFolder.toFile().getAbsolutePath() + "/test_copy_to_container.txt");
             alpineCopyToContainer.copyFileFromContainer("/test.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath());
@@ -45,8 +45,8 @@ public void copyFileToContainerFileTest() throws Exception {
     }
 
     @Test
-    public void copyLargeFilesToContainer() throws Exception {
-        File tempFile = temporaryFolder.newFile();
+    void copyLargeFilesToContainer() throws Exception {
+        File tempFile = temporaryFolder.resolve("large-file").toFile();
         try (
             GenericContainer<?> alpineCopyToContainer = new GenericContainer<>(TestImages.ALPINE_IMAGE) //
                 .withCommand("sleep", "infinity")
@@ -82,7 +82,7 @@ public void copyLargeFilesToContainer() throws Exception {
     }
 
     @Test
-    public void copyFileToContainerFolderTest() throws Exception {
+    void copyFileToContainerFolderTest() throws Exception {
         try (
             GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
@@ -91,7 +91,7 @@ public void copyFileToContainerFolderTest() throws Exception {
             final MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
             alpineCopyToContainer.copyFileToContainer(mountableFile, "/home/");
 
-            File actualFile = new File(temporaryFolder.getRoot().getAbsolutePath() + "/test_copy_to_container.txt");
+            File actualFile = new File(temporaryFolder.toFile().getAbsolutePath() + "/test_copy_to_container.txt");
             alpineCopyToContainer.copyFileFromContainer("/home/test_copy_to_container.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath());
@@ -100,7 +100,7 @@ public void copyFileToContainerFolderTest() throws Exception {
     }
 
     @Test
-    public void copyFolderToContainerFolderTest() throws Exception {
+    void copyFolderToContainerFolderTest() throws Exception {
         try (
             GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
@@ -109,7 +109,7 @@ public void copyFolderToContainerFolderTest() throws Exception {
             final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/");
             alpineCopyToContainer.copyFileToContainer(mountableFile, "/home/test/");
 
-            File actualFile = new File(temporaryFolder.getRoot().getAbsolutePath() + "/test_copy_to_container.txt");
+            File actualFile = new File(temporaryFolder.toFile().getAbsolutePath() + "/test_copy_to_container.txt");
             alpineCopyToContainer.copyFileFromContainer("/home/test/test-resource.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath() + "/test-resource.txt");
@@ -117,19 +117,25 @@ public void copyFolderToContainerFolderTest() throws Exception {
         }
     }
 
-    @Test(expected = NotFoundException.class)
-    public void copyFromContainerShouldFailBecauseNoFileTest() throws NotFoundException {
-        try (
-            GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
-                .withCommand("top")
-        ) {
-            alpineCopyToContainer.start();
-            alpineCopyToContainer.copyFileFromContainer("/home/test.txt", "src/test/resources/copy-from/test.txt");
-        }
+    @Test
+    void copyFromContainerShouldFailBecauseNoFileTest() {
+        assertThatThrownBy(() -> {
+                try (
+                    GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
+                        .withCommand("top")
+                ) {
+                    alpineCopyToContainer.start();
+                    alpineCopyToContainer.copyFileFromContainer(
+                        "/home/test.txt",
+                        "src/test/resources/copy-from/test.txt"
+                    );
+                }
+            })
+            .isInstanceOf(NotFoundException.class);
     }
 
     @Test
-    public void shouldCopyFileFromContainerTest() throws IOException {
+    void shouldCopyFileFromContainerTest() throws IOException {
         try (
             GenericContainer alpineCopyToContainer = new GenericContainer(TestImages.ALPINE_IMAGE) //
                 .withCommand("top")
@@ -138,7 +144,7 @@ public void shouldCopyFileFromContainerTest() throws IOException {
             final MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
             alpineCopyToContainer.copyFileToContainer(mountableFile, "/home/");
 
-            File actualFile = new File(temporaryFolder.getRoot().getAbsolutePath() + "/test_copy_from_container.txt");
+            File actualFile = new File(temporaryFolder.toFile().getAbsolutePath() + "/test_copy_from_container.txt");
             alpineCopyToContainer.copyFileFromContainer("/home/test_copy_to_container.txt", actualFile.getPath());
 
             File expectedFile = new File(mountableFile.getResolvedPath());
@@ -147,7 +153,7 @@ public void shouldCopyFileFromContainerTest() throws IOException {
     }
 
     @Test
-    public void copyFileOperationsShouldFailWhenNotStartedTest() {
+    void copyFileOperationsShouldFailWhenNotStartedTest() {
         try (GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE).withCommand("top")) {
             assertThatThrownBy(() -> {
                     MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
@@ -165,7 +171,7 @@ public void copyFileOperationsShouldFailWhenNotStartedTest() {
     }
 
     @Test
-    public void shouldCopyFileFromExitedContainerTest() throws IOException {
+    void shouldCopyFileFromExitedContainerTest() {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
                 .withCommand("sh", "-c", "echo -n 'Hello!' > /home/file_in_container.txt")
diff --git a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
index a123b800f3a..38f1f5c9a6f 100644
--- a/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit;
 
 import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.GenericContainer;
@@ -20,7 +20,7 @@
  * is managed completely within the test method to allow a free port to be found and assigned before the container
  * is started.
  */
-public class FixedHostPortContainerTest {
+class FixedHostPortContainerTest {
 
     private static final String TEST_IMAGE = "alpine:3.17";
 
@@ -44,7 +44,7 @@ public class FixedHostPortContainerTest {
     );
 
     @Test
-    public void testFixedHostPortMapping() throws IOException {
+    void testFixedHostPortMapping() throws IOException {
         // first find a free port on the docker host that will work for testing
         final Integer unusedHostPort;
         try (
diff --git a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
index 5a9d7c1616d..5719f3e0268 100644
--- a/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
+++ b/core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java
@@ -14,10 +14,9 @@
 import com.rabbitmq.client.Envelope;
 import org.apache.commons.io.FileUtils;
 import org.bson.Document;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.TestImages;
@@ -51,7 +50,7 @@
 /**
  * Tests for GenericContainerRules
  */
-public class GenericContainerRuleTest {
+class GenericContainerRuleTest {
 
     private static final int REDIS_PORT = 6379;
 
@@ -68,7 +67,7 @@ public class GenericContainerRuleTest {
     /*
      * Test data setup
      */
-    @BeforeClass
+    @BeforeAll
     public static void setupContent() throws FileNotFoundException {
         File contentFolder = new File(System.getProperty("user.home") + "/.tmp-test-container");
         contentFolder.mkdir();
@@ -78,21 +77,18 @@ public static void setupContent() throws FileNotFoundException {
     /**
      * Redis
      */
-    @ClassRule
     public static GenericContainer<?> redis = new GenericContainer<>(TestImages.REDIS_IMAGE)
         .withExposedPorts(REDIS_PORT);
 
     /**
      * RabbitMQ
      */
-    @ClassRule
     public static GenericContainer<?> rabbitMq = new GenericContainer<>(TestImages.RABBITMQ_IMAGE)
         .withExposedPorts(RABBITMQ_PORT);
 
     /**
      * MongoDB
      */
-    @ClassRule
     public static GenericContainer<?> mongo = new GenericContainer<>(TestImages.MONGODB_IMAGE)
         .withExposedPorts(MONGO_PORT);
 
@@ -100,7 +96,6 @@ public static void setupContent() throws FileNotFoundException {
      * Pass an environment variable to the container, then run a shell script that exposes the variable in a quick and
      * dirty way for testing.
      */
-    @ClassRule
     public static GenericContainer<?> alpineEnvVar = new GenericContainer<>(TestImages.ALPINE_IMAGE)
         .withExposedPorts(80)
         .withEnv("MAGIC_NUMBER", "4")
@@ -111,7 +106,6 @@ public static void setupContent() throws FileNotFoundException {
      * Pass environment variables to the container, then run a shell script that exposes the variables in a quick and
      * dirty way for testing.
      */
-    @ClassRule
     public static GenericContainer<?> alpineEnvVarFromMap = new GenericContainer<>(TestImages.ALPINE_IMAGE)
         .withExposedPorts(80)
         .withEnv(ImmutableMap.of("FIRST", "42", "SECOND", "50"))
@@ -120,7 +114,6 @@ public static void setupContent() throws FileNotFoundException {
     /**
      * Map a file on the classpath to a file in the container, and then expose the content for testing.
      */
-    @ClassRule
     public static GenericContainer<?> alpineClasspathResource = new GenericContainer<>(TestImages.ALPINE_IMAGE)
         .withExposedPorts(80)
         .withClasspathResourceMapping("mappable-resource/test-resource.txt", "/content.txt", BindMode.READ_ONLY)
@@ -129,7 +122,6 @@ public static void setupContent() throws FileNotFoundException {
     /**
      * Map a file on the classpath to a file in the container, and then expose the content for testing.
      */
-    @ClassRule
     public static GenericContainer<?> alpineClasspathResourceSelinux = new GenericContainer<>(TestImages.ALPINE_IMAGE)
         .withExposedPorts(80)
         .withClasspathResourceMapping(
@@ -143,14 +135,24 @@ public static void setupContent() throws FileNotFoundException {
     /**
      * Create a container with an extra host entry and expose the content of /etc/hosts for testing.
      */
-    @ClassRule
     public static GenericContainer<?> alpineExtrahost = new GenericContainer<>(TestImages.ALPINE_IMAGE)
         .withExposedPorts(80)
         .withExtraHost("somehost", "192.168.1.10")
         .withCommand("/bin/sh", "-c", "while true; do cat /etc/hosts | nc -l -p 80; done");
 
+    static {
+        redis.start();
+        rabbitMq.start();
+        mongo.start();
+        alpineEnvVar.start();
+        alpineEnvVarFromMap.start();
+        alpineClasspathResource.start();
+        alpineClasspathResourceSelinux.start();
+        alpineExtrahost.start();
+    }
+
     @Test
-    public void testIsRunning() {
+    void testIsRunning() {
         try (GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE).withCommand("top")) {
             assertThat(container.isRunning()).as("Container is not started and not running").isFalse();
             container.start();
@@ -159,7 +161,7 @@ public void testIsRunning() {
     }
 
     @Test
-    public void withTmpFsTest() throws Exception {
+    void withTmpFsTest() throws Exception {
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withCommand("top")
@@ -180,7 +182,7 @@ public void withTmpFsTest() throws Exception {
     }
 
     @Test
-    public void simpleRabbitMqTest() throws IOException, TimeoutException {
+    void simpleRabbitMqTest() throws IOException, TimeoutException {
         ConnectionFactory factory = new ConnectionFactory();
         factory.setHost(rabbitMq.getHost());
         factory.setPort(rabbitMq.getMappedPort(RABBITMQ_PORT));
@@ -230,7 +232,7 @@ public void handleDelivery(
     }
 
     @Test
-    public void simpleMongoDbTest() {
+    void simpleMongoDbTest() {
         MongoClient mongoClient = new MongoClient(mongo.getHost(), mongo.getMappedPort(MONGO_PORT));
         MongoDatabase database = mongoClient.getDatabase("test");
         MongoCollection<Document> collection = database.getCollection("testCollection");
@@ -243,21 +245,21 @@ public void simpleMongoDbTest() {
     }
 
     @Test
-    public void environmentAndCustomCommandTest() throws IOException {
+    void environmentAndCustomCommandTest() throws IOException {
         String line = getReaderForContainerPort80(alpineEnvVar).readLine();
 
         assertThat(line).as("An environment variable can be passed into a command").isEqualTo("42");
     }
 
     @Test
-    public void environmentFromMapTest() throws IOException {
+    void environmentFromMapTest() throws IOException {
         String line = getReaderForContainerPort80(alpineEnvVarFromMap).readLine();
 
         assertThat(line).as("Environment variables can be passed into a command from a map").isEqualTo("42 and 50");
     }
 
     @Test
-    public void customLabelTest() {
+    void customLabelTest() {
         try (
             final GenericContainer alpineCustomLabel = new GenericContainer<>(TestImages.ALPINE_IMAGE)
                 .withLabel("our.custom", "label")
@@ -285,7 +287,7 @@ public void customLabelTest() {
     }
 
     @Test
-    public void exceptionThrownWhenTryingToOverrideTestcontainersLabels() {
+    void exceptionThrownWhenTryingToOverrideTestcontainersLabels() {
         assertThat(
             catchThrowable(() -> {
                 new GenericContainer<>(TestImages.ALPINE_IMAGE).withLabel("org.testcontainers.foo", "false");
@@ -296,7 +298,7 @@ public void exceptionThrownWhenTryingToOverrideTestcontainersLabels() {
     }
 
     @Test
-    public void customClasspathResourceMappingTest() throws IOException {
+    void customClasspathResourceMappingTest() throws IOException {
         // Note: This functionality doesn't work if you are running your build inside a Docker container;
         // in that case this test will fail.
         String line = getReaderForContainerPort80(alpineClasspathResource).readLine();
@@ -307,7 +309,7 @@ public void customClasspathResourceMappingTest() throws IOException {
     }
 
     @Test
-    public void customClasspathResourceMappingWithSelinuxTest() throws IOException {
+    void customClasspathResourceMappingWithSelinuxTest() throws IOException {
         String line = getReaderForContainerPort80(alpineClasspathResourceSelinux).readLine();
         assertThat(line)
             .as("Resource on the classpath can be mapped using calls to withClasspathResourceMappingSelinux")
@@ -315,7 +317,7 @@ public void customClasspathResourceMappingWithSelinuxTest() throws IOException {
     }
 
     @Test
-    public void exceptionThrownWhenMappedPortNotFound() {
+    void exceptionThrownWhenMappedPortNotFound() {
         assertThat(catchThrowable(() -> redis.getMappedPort(666)))
             .as("When the requested port is not mapped, getMappedPort() throws an exception")
             .isInstanceOf(IllegalArgumentException.class);
@@ -331,8 +333,8 @@ protected static void writeStringToFile(File contentFolder, String filename, Str
     }
 
     @Test
-    @Ignore //TODO investigate intermittent failures
-    public void failFastWhenContainerHaltsImmediately() {
+    @Disabled //TODO investigate intermittent failures
+    void failFastWhenContainerHaltsImmediately() {
         long startingTimeNano = System.nanoTime();
         final GenericContainer failsImmediately = new GenericContainer<>(TestImages.ALPINE_IMAGE)
             .withCommand("/bin/sh", "-c", "return false")
@@ -358,7 +360,7 @@ public void failFastWhenContainerHaltsImmediately() {
     }
 
     @Test
-    public void extraHostTest() throws IOException {
+    void extraHostTest() throws IOException {
         BufferedReader br = getReaderForContainerPort80(alpineExtrahost);
 
         // read hosts file from container
@@ -375,7 +377,7 @@ public void extraHostTest() throws IOException {
     }
 
     @Test
-    public void createContainerCmdHookTest() {
+    void createContainerCmdHookTest() {
         // Use random name to avoid the conflicts between the tests
         String randomName = Base58.randomString(5);
         try (
@@ -410,7 +412,7 @@ private BufferedReader getReaderForContainerPort80(GenericContainer container) {
     }
 
     @Test
-    public void addExposedPortAfterWithExposedPortsTest() {
+    void addExposedPortAfterWithExposedPortsTest() {
         redis.addExposedPort(8987);
         assertThat(redis.getExposedPorts()).as("Both ports should be exposed").hasSize(2);
         assertThat(redis.getExposedPorts()).as("withExposedPort should be exposed").contains(REDIS_PORT);
@@ -418,7 +420,7 @@ public void addExposedPortAfterWithExposedPortsTest() {
     }
 
     @Test
-    public void addingExposedPortTwiceShouldNotFail() {
+    void addingExposedPortTwiceShouldNotFail() {
         redis.addExposedPort(8987);
         redis.addExposedPort(8987);
         assertThat(redis.getExposedPorts()).as("Both ports should be exposed").hasSize(2); // 2 ports = de-duplicated port 8897 and original port 6379
@@ -427,7 +429,7 @@ public void addingExposedPortTwiceShouldNotFail() {
     }
 
     @Test
-    public void sharedMemorySetTest() {
+    void sharedMemorySetTest() {
         try (
             GenericContainer containerWithSharedMemory = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withSharedMemorySize(42L * FileUtils.ONE_MB)
diff --git a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
index aff9b29cbe7..2978777aae7 100644
--- a/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/junit/NonExistentImagePullTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.containers.ContainerFetchException;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -11,10 +12,11 @@
 /**
  * Created by rnorth on 20/03/2016.
  */
-public class NonExistentImagePullTest {
+class NonExistentImagePullTest {
 
-    @Test(timeout = 60_000L)
-    public void pullingNonExistentImageFailsGracefully() {
+    @Test
+    @Timeout(60)
+    void pullingNonExistentImageFailsGracefully() {
         assertThat(
             catchThrowable(() -> {
                 new GenericContainer<>(DockerImageName.parse("testcontainers/nonexistent:latest")).getDockerImageName();
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
index 17b1d247cbb..42fc7ff584b 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamTest.java
@@ -1,7 +1,9 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.TestImages;
@@ -21,16 +23,26 @@
 /**
  * Simple test for following container output.
  */
-public class OutputStreamTest {
+class OutputStreamTest {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OutputStreamTest.class);
 
-    @Rule
     public GenericContainer container = new GenericContainer(TestImages.ALPINE_IMAGE)
         .withCommand("ping -c 5 127.0.0.1");
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OutputStreamTest.class);
+    @BeforeEach
+    void setUp() {
+        container.start();
+    }
+
+    @AfterEach
+    void tearDown() {
+        container.stop();
+    }
 
-    @Test(timeout = 60_000L)
-    public void testFetchStdout() throws TimeoutException {
+    @Test
+    @Timeout(value = 60)
+    void testFetchStdout() throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
@@ -42,8 +54,9 @@ public void testFetchStdout() throws TimeoutException {
         );
     }
 
-    @Test(timeout = 60_000L)
-    public void testFetchStdoutWithTimeout() {
+    @Test
+    @Timeout(value = 60)
+    void testFetchStdoutWithTimeout() {
         WaitingConsumer consumer = new WaitingConsumer();
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
@@ -65,8 +78,9 @@ public void testFetchStdoutWithTimeout() {
             .isInstanceOf(TimeoutException.class);
     }
 
-    @Test(timeout = 60_000L)
-    public void testFetchStdoutWithNoLimit() throws TimeoutException {
+    @Test
+    @Timeout(value = 60)
+    void testFetchStdoutWithNoLimit() throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
@@ -76,8 +90,9 @@ public void testFetchStdoutWithNoLimit() throws TimeoutException {
         });
     }
 
-    @Test(timeout = 60_000L)
-    public void testLogConsumer() throws TimeoutException {
+    @Test
+    @Timeout(value = 60)
+    void testLogConsumer() throws TimeoutException {
         WaitingConsumer waitingConsumer = new WaitingConsumer();
         Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
 
@@ -89,8 +104,9 @@ public void testLogConsumer() throws TimeoutException {
         });
     }
 
-    @Test(timeout = 60_000L)
-    public void testToStringConsumer() throws TimeoutException {
+    @Test
+    @Timeout(value = 60)
+    void testToStringConsumer() throws TimeoutException {
         WaitingConsumer waitingConsumer = new WaitingConsumer();
         ToStringConsumer toStringConsumer = new ToStringConsumer();
 
diff --git a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
index c340f26d3fb..a6dbfa06343 100644
--- a/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
+++ b/core/src/test/java/org/testcontainers/junit/OutputStreamWithTTYTest.java
@@ -1,9 +1,10 @@
 package org.testcontainers.junit;
 
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.OutputFrame;
@@ -20,19 +21,22 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 
 @Slf4j
-public class OutputStreamWithTTYTest {
+@Timeout(10)
+class OutputStreamWithTTYTest {
 
-    @Rule
+    @AutoClose
     public GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
         .withCommand("ls -1")
         .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
         .withCreateContainerCmdModifier(command -> command.withTty(true));
 
-    @Rule
-    public Timeout globalTimeout = Timeout.seconds(10);
+    @BeforeEach
+    void setUp() {
+        container.start();
+    }
 
     @Test
-    public void testFetchStdout() throws TimeoutException {
+    void testFetchStdout() throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
@@ -47,7 +51,7 @@ public void testFetchStdout() throws TimeoutException {
     }
 
     @Test
-    public void testFetchStdoutWithTimeout() {
+    void testFetchStdoutWithTimeout() {
         WaitingConsumer consumer = new WaitingConsumer();
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
@@ -70,7 +74,7 @@ public void testFetchStdoutWithTimeout() {
     }
 
     @Test
-    public void testFetchStdoutWithNoLimit() throws TimeoutException {
+    void testFetchStdoutWithNoLimit() throws TimeoutException {
         WaitingConsumer consumer = new WaitingConsumer();
 
         container.followOutput(consumer, OutputFrame.OutputType.STDOUT);
@@ -81,7 +85,7 @@ public void testFetchStdoutWithNoLimit() throws TimeoutException {
     }
 
     @Test
-    public void testLogConsumer() throws TimeoutException {
+    void testLogConsumer() throws TimeoutException {
         WaitingConsumer waitingConsumer = new WaitingConsumer();
         Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log);
 
@@ -94,7 +98,7 @@ public void testLogConsumer() throws TimeoutException {
     }
 
     @Test
-    public void testToStringConsumer() throws TimeoutException {
+    void testToStringConsumer() throws TimeoutException {
         WaitingConsumer waitingConsumer = new WaitingConsumer();
         ToStringConsumer toStringConsumer = new ToStringConsumer();
 
diff --git a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
index 8437123f97a..0f98a35893b 100644
--- a/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ParameterizedDockerfileContainerTest.java
@@ -1,24 +1,26 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
+import java.util.stream.Stream;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Simple test case / demonstration of creating a fresh container image from a Dockerfile DSL when the test
  * is parameterized.
  */
-@RunWith(Parameterized.class)
-public class ParameterizedDockerfileContainerTest {
+@ParameterizedClass(name = "{0}")
+@MethodSource("data")
+class ParameterizedDockerfileContainerTest {
 
     private final String expectedVersion;
 
-    @Rule
     public GenericContainer container;
 
     public ParameterizedDockerfileContainerTest(String baseImage, String expectedVersion) {
@@ -34,22 +36,22 @@ public ParameterizedDockerfileContainerTest(String baseImage, String expectedVer
                     })
             )
                 .withCommand("top");
+        container.start();
         this.expectedVersion = expectedVersion;
     }
 
-    @Parameterized.Parameters(name = "{0}")
-    public static Object[][] data() {
-        return new Object[][] { //
-            { "alpine:3.12", "3.12" },
-            { "alpine:3.13", "3.13" },
-            { "alpine:3.14", "3.14" },
-            { "alpine:3.15", "3.15" },
-            { "alpine:3.16", "3.16" },
-        };
+    public static Stream<Arguments> data() {
+        return Stream.of(
+            Arguments.of("alpine:3.12", "3.12"),
+            Arguments.of("alpine:3.13", "3.13"),
+            Arguments.of("alpine:3.14", "3.14"),
+            Arguments.of("alpine:3.15", "3.15"),
+            Arguments.of("alpine:3.16", "3.16")
+        );
     }
 
     @Test
-    public void simpleTest() throws Exception {
+    void simpleTest() throws Exception {
         final String release = container.execInContainer("cat", "/etc/alpine-release").getStdout();
 
         assertThat(release).as("/etc/alpine-release starts with " + expectedVersion).startsWith(expectedVersion);
diff --git a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
index 05f65e1f493..a31b38e06ed 100644
--- a/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
+++ b/core/src/test/java/org/testcontainers/junit/WorkingDirectoryTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -11,16 +10,19 @@
 /**
  * Created by rnorth on 26/07/2016.
  */
-public class WorkingDirectoryTest {
+class WorkingDirectoryTest {
 
-    @ClassRule
     public static GenericContainer container = new GenericContainer(TestImages.ALPINE_IMAGE)
         .withWorkingDirectory("/etc")
         .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
         .withCommand("ls", "-al");
 
+    static {
+        container.start();
+    }
+
     @Test
-    public void checkOutput() {
+    void checkOutput() {
         String listing = container.getLogs();
 
         assertThat(listing).as("Directory listing contains expected /etc content").contains("hostname");
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
index 6c2dbb50244..fa97bbc25c3 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/AbstractWaitStrategyTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit.wait.strategy;
 
 import org.jetbrains.annotations.NotNull;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.ContainerLaunchException;
@@ -36,7 +36,7 @@ public abstract class AbstractWaitStrategyTest<W extends WaitStrategy> {
     @NotNull
     protected abstract W buildWaitStrategy(final AtomicBoolean ready);
 
-    @Before
+    @BeforeEach
     public void setUp() {
         ready = new AtomicBoolean(false);
     }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
index bed23566899..15b6aa74961 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HostPortWaitStrategyTest.java
@@ -1,9 +1,7 @@
 package org.testcontainers.junit.wait.strategy;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -14,32 +12,35 @@
  * Test wait strategy with overloaded waitingFor methods.
  * Other implementations of WaitStrategy are tested through backwards compatible wait strategy tests
  */
-@RunWith(Enclosed.class)
-public class HostPortWaitStrategyTest {
+class HostPortWaitStrategyTest {
 
-    public static class DefaultHostPortWaitStrategyTest {
+    @Nested
+    class DefaultHostPortWaitStrategyTest {
 
-        @ClassRule
-        public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        public GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
             .withExposedPorts()
             .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
             .withExposedPorts(8080)
             .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)));
 
         @Test
-        public void testWaiting() {}
+        void testWaiting() {
+            container.start();
+        }
     }
 
-    public static class ExplicitHostPortWaitStrategyTest {
+    @Nested
+    class ExplicitHostPortWaitStrategyTest {
 
-        @ClassRule
-        public static GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
+        public GenericContainer<?> container = new GenericContainer<>(TestImages.ALPINE_IMAGE)
             .withExposedPorts()
             .withCommand("sh", "-c", "while true; do nc -lp 8080; done")
             .withExposedPorts(8080)
             .waitingFor(Wait.forListeningPorts(8080).withStartupTimeout(Duration.ofSeconds(10)));
 
         @Test
-        public void testWaiting() {}
+        void testWaiting() {
+            container.start();
+        }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index 91c94009086..89a12ec3aea 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -2,7 +2,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.RetryCountExceededException;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
@@ -18,7 +18,7 @@
 /**
  * Tests for {@link HttpWaitStrategy}.
  */
-public class HttpWaitStrategyTest extends AbstractWaitStrategyTest<HttpWaitStrategy> {
+class HttpWaitStrategyTest extends AbstractWaitStrategyTest<HttpWaitStrategy> {
 
     /**
      * newline sequence indicating end of the HTTP header.
@@ -31,7 +31,7 @@ public class HttpWaitStrategyTest extends AbstractWaitStrategyTest<HttpWaitStrat
      * Expects that the WaitStrategy returns successfully after receiving an HTTP 200 response from the container.
      */
     @Test
-    public void testWaitUntilReadyWithSuccess() {
+    void testWaitUntilReadyWithSuccess() {
         waitUntilReadyAndSucceed(createShellCommand("200 OK", GOOD_RESPONSE_BODY));
     }
 
@@ -41,7 +41,7 @@ public void testWaitUntilReadyWithSuccess() {
      * logs we can ensure the HTTP request was correctly sent.
      */
     @Test
-    public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
+    void testWaitUntilReadyWithSuccessWithCustomHeaders() {
         HashMap<String, String> headers = new HashMap<>();
         headers.put("baz", "boo");
         try (
@@ -64,7 +64,7 @@ public void testWaitUntilReadyWithSuccessWithCustomHeaders() {
      * certificate validation chains (to support self-signed certificates for example).
      */
     @Test
-    public void testWaitUntilReadyWithTlsAndAllowUnsecure() {
+    void testWaitUntilReadyWithTlsAndAllowUnsecure() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createHttpsShellCommand("200 OK", GOOD_RESPONSE_BODY, 8080),
@@ -80,7 +80,7 @@ public void testWaitUntilReadyWithTlsAndAllowUnsecure() {
      * This 401 response is checked with a lambda using {@link HttpWaitStrategy#forStatusCodeMatching(Predicate)}
      */
     @Test
-    public void testWaitUntilReadyWithUnauthorizedWithLambda() {
+    void testWaitUntilReadyWithUnauthorizedWithLambda() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
@@ -96,7 +96,7 @@ public void testWaitUntilReadyWithUnauthorizedWithLambda() {
      * This 401 response is checked with many status codes using {@link HttpWaitStrategy#forStatusCode(int)}
      */
     @Test
-    public void testWaitUntilReadyWithManyStatusCodes() {
+    void testWaitUntilReadyWithManyStatusCodes() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
@@ -113,7 +113,7 @@ public void testWaitUntilReadyWithManyStatusCodes() {
      * and a lambda using {@link HttpWaitStrategy#forStatusCodeMatching(Predicate)}
      */
     @Test
-    public void testWaitUntilReadyWithManyStatusCodesAndLambda() {
+    void testWaitUntilReadyWithManyStatusCodesAndLambda() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
@@ -133,7 +133,7 @@ public void testWaitUntilReadyWithManyStatusCodesAndLambda() {
      * and {@link HttpWaitStrategy#forStatusCodeMatching(Predicate)}
      */
     @Test
-    public void testWaitUntilReadyWithTimeoutAndWithManyStatusCodesAndLambda() {
+    void testWaitUntilReadyWithTimeoutAndWithManyStatusCodesAndLambda() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("401 UNAUTHORIZED", GOOD_RESPONSE_BODY),
@@ -152,7 +152,7 @@ public void testWaitUntilReadyWithTimeoutAndWithManyStatusCodesAndLambda() {
      * Test case for: https://github.com/testcontainers/testcontainers-java/issues/880
      */
     @Test
-    public void testWaitUntilReadyWithTimeoutAndWithLambdaShouldNotMatchOk() {
+    void testWaitUntilReadyWithTimeoutAndWithLambdaShouldNotMatchOk() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("200 OK", GOOD_RESPONSE_BODY),
@@ -168,7 +168,7 @@ public void testWaitUntilReadyWithTimeoutAndWithLambdaShouldNotMatchOk() {
      * response from the container within the timeout period.
      */
     @Test
-    public void testWaitUntilReadyWithTimeout() {
+    void testWaitUntilReadyWithTimeout() {
         waitUntilReadyAndTimeout(createShellCommand("400 Bad Request", GOOD_RESPONSE_BODY));
     }
 
@@ -177,7 +177,7 @@ public void testWaitUntilReadyWithTimeout() {
      * from the container within the timeout period.
      */
     @Test
-    public void testWaitUntilReadyWithTimeoutAndBadResponseBody() {
+    void testWaitUntilReadyWithTimeoutAndBadResponseBody() {
         waitUntilReadyAndTimeout(createShellCommand("200 OK", "Bad Response"));
     }
 
@@ -185,7 +185,7 @@ public void testWaitUntilReadyWithTimeoutAndBadResponseBody() {
      * Expects the WaitStrategy probing the right port.
      */
     @Test
-    public void testWaitUntilReadyWithSpecificPort() {
+    void testWaitUntilReadyWithSpecificPort() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("200 OK", GOOD_RESPONSE_BODY, 9090),
@@ -200,7 +200,7 @@ public void testWaitUntilReadyWithSpecificPort() {
     }
 
     @Test
-    public void testWaitUntilReadyWithTimeoutCausedByReadTimeout() {
+    void testWaitUntilReadyWithTimeoutCausedByReadTimeout() {
         try (
             GenericContainer<?> container = startContainerWithCommand(
                 createShellCommand("0 Connection Refused", GOOD_RESPONSE_BODY, 9090),
@@ -217,7 +217,7 @@ public void testWaitUntilReadyWithTimeoutCausedByReadTimeout() {
      * The exceptions we should see in the stacktrace ('/' means 'caused by'): ContainerLaunchException / TimeoutException / RuntimeException / SSLHandshakeException / ValidatorException (in sun.* package so not accessible) / SunCertPathBuilderException (in sun.* package so not accessible).
      */
     @Test
-    public void testWaitUntilReadyWithTimeoutCausedBySslHandshakeError() {
+    void testWaitUntilReadyWithTimeoutCausedBySslHandshakeError() {
         try (
             GenericContainer<?> container = new GenericContainer<>(
                 new ImageFromDockerfile()
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java
index 5dd9623107b..537254a60a1 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/LogMessageWaitStrategyTest.java
@@ -1,9 +1,9 @@
 package org.testcontainers.junit.wait.strategy;
 
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -11,12 +11,12 @@
 /**
  * Tests for {@link LogMessageWaitStrategy}.
  */
-@RunWith(Parameterized.class)
-public class LogMessageWaitStrategyTest extends AbstractWaitStrategyTest<LogMessageWaitStrategy> {
+@ParameterizedClass(name = "{0}")
+@MethodSource("parameters")
+class LogMessageWaitStrategyTest extends AbstractWaitStrategyTest<LogMessageWaitStrategy> {
 
     private final String pattern;
 
-    @Parameterized.Parameters(name = "{0}")
     public static Object[] parameters() {
         return new String[] {
             ".*ready.*\\s", // previous recommended style (explicit line ending)
@@ -32,7 +32,7 @@ public LogMessageWaitStrategyTest(String pattern) {
     private static final String READY_MESSAGE = "I'm ready!";
 
     @Test
-    public void testWaitUntilReady_Success() {
+    void testWaitUntilReady_Success() {
         waitUntilReadyAndSucceed(
             "echo -e \"" +
             READY_MESSAGE +
@@ -46,7 +46,7 @@ public void testWaitUntilReady_Success() {
     }
 
     @Test
-    public void testWaitUntilReady_Timeout() {
+    void testWaitUntilReady_Timeout() {
         waitUntilReadyAndTimeout("echo -e \"" + READY_MESSAGE + "\";" + "echo -e \"foobar\";" + "sleep 300");
     }
 
diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java
index 0a85037cc14..20b08a5f396 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/ShellStrategyTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.junit.wait.strategy;
 
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.wait.strategy.ShellStrategy;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -9,17 +9,17 @@
 /**
  * Tests for {@link ShellStrategy}.
  */
-public class ShellStrategyTest extends AbstractWaitStrategyTest<ShellStrategy> {
+class ShellStrategyTest extends AbstractWaitStrategyTest<ShellStrategy> {
 
     private static final String LOCK_FILE = "/tmp/ready.lock";
 
     @Test
-    public void testWaitUntilReady_Success() {
+    void testWaitUntilReady_Success() {
         waitUntilReadyAndSucceed(String.format("touch %s; sleep 300", LOCK_FILE));
     }
 
     @Test
-    public void testWaitUntilReady_Timeout() {
+    void testWaitUntilReady_Timeout() {
         waitUntilReadyAndTimeout("sleep 300");
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 0e00dd87bf7..1f6fbc1551a 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -2,10 +2,9 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import org.intellij.lang.annotations.Language;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.TestImages;
@@ -37,7 +36,6 @@ public class AuthenticatedImagePullTest {
     /**
      * Containerised docker image registry, with simple hardcoded credentials
      */
-    @ClassRule
     public static DockerRegistryContainer authenticatedRegistry = new DockerRegistryContainer(
         new ImageFromDockerfile()
             .withDockerfileFromBuilder(builder -> {
@@ -54,8 +52,10 @@ public class AuthenticatedImagePullTest {
 
     private final DockerImageName testImageName = authenticatedRegistry.createImage();
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws Exception {
+        authenticatedRegistry.start();
+
         originalAuthLocatorSingleton = RegistryAuthLocator.instance();
 
         String testRegistryAddress = authenticatedRegistry.getEndpoint();
@@ -77,13 +77,13 @@ public static void beforeClass() throws Exception {
             .thenReturn(authConfig);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         RegistryAuthLocator.setInstance(originalAuthLocatorSingleton);
     }
 
     @Test
-    public void testThatAuthLocatorIsUsedForContainerCreation() {
+    void testThatAuthLocatorIsUsedForContainerCreation() {
         // actually start a container, which will require an authenticated pull
         try (
             final GenericContainer<?> container = new GenericContainer<>(testImageName)
@@ -96,7 +96,7 @@ public void testThatAuthLocatorIsUsedForContainerCreation() {
     }
 
     @Test
-    public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
+    void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
         // Prepare a simple temporary Dockerfile which requires our custom private image
         Path tempFile = getLocalTempFile(".Dockerfile");
         String dockerFileContent = "FROM " + testImageName.asCanonicalNameString();
@@ -116,7 +116,7 @@ public void testThatAuthLocatorIsUsedForDockerfileBuild() throws IOException {
     }
 
     @Test
-    public void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
+    void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
         // Prepare a simple temporary Docker Compose manifest which requires our custom private image
         Path tempFile = getLocalTempFile(".docker-compose.yml");
         @Language("yaml")
diff --git a/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
index e775a2cd492..63812c998e3 100644
--- a/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ClasspathScannerTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.utility;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URL;
@@ -15,7 +15,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ClasspathScannerTest {
+class ClasspathScannerTest {
 
     private static URL FILE_A;
 
@@ -27,7 +27,7 @@ public class ClasspathScannerTest {
 
     private static URL FILE_C;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() throws Exception {
         FILE_A = new URL("file:///a/someName");
         FILE_B = new URL("file:///b/someName");
@@ -37,7 +37,7 @@ public static void setUp() throws Exception {
     }
 
     @Test
-    public void realClassLoaderLookupOccurs() {
+    void realClassLoaderLookupOccurs() {
         // look for a resource that we know exists only once
         final List<URL> foundURLs = ClasspathScanner.scanFor("expectedClasspathFile.txt").collect(Collectors.toList());
 
@@ -45,7 +45,7 @@ public void realClassLoaderLookupOccurs() {
     }
 
     @Test
-    public void multipleResultsOnOneClassLoaderAreFound() throws IOException {
+    void multipleResultsOnOneClassLoaderAreFound() throws IOException {
         final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
         when(firstMockClassLoader.getResources(eq("someName")))
             .thenReturn(Collections.enumeration(Arrays.asList(FILE_A, FILE_B)));
@@ -57,7 +57,7 @@ public void multipleResultsOnOneClassLoaderAreFound() throws IOException {
     }
 
     @Test
-    public void orderIsAlphabeticalForDeterminism() throws IOException {
+    void orderIsAlphabeticalForDeterminism() throws IOException {
         final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
         when(firstMockClassLoader.getResources(eq("someName")))
             .thenReturn(Collections.enumeration(Arrays.asList(FILE_B, JAR_A, JAR_B, FILE_A)));
@@ -71,7 +71,7 @@ public void orderIsAlphabeticalForDeterminism() throws IOException {
     }
 
     @Test
-    public void multipleClassLoadersAreQueried() throws IOException {
+    void multipleClassLoadersAreQueried() throws IOException {
         final ClassLoader firstMockClassLoader = mock(ClassLoader.class);
         when(firstMockClassLoader.getResources(eq("someName")))
             .thenReturn(Collections.enumeration(Arrays.asList(FILE_A, FILE_B)));
diff --git a/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java b/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
index cd95d8a5f3d..dadf3983926 100644
--- a/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ComparableVersionTest.java
@@ -1,32 +1,20 @@
 package org.testcontainers.utility;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class ComparableVersionTest {
+class ComparableVersionTest {
 
-    private final int[] expected;
-
-    private final String given;
-
-    public ComparableVersionTest(final String given, final int[] expected) {
-        this.given = given;
-        this.expected = expected;
-    }
-
-    @Test
-    public void shouldParseVersions() {
+    @ParameterizedTest(name = "Parsed version: {0}={1}")
+    @MethodSource("data")
+    void shouldParseVersions(String given, int[] expected) {
         assertThat(ComparableVersion.parseVersion(given)).containsExactly(expected);
     }
 
-    @Parameters(name = "Parsed version: {0}={1}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
index 90f7745edd7..143455d5b16 100644
--- a/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java
@@ -1,14 +1,15 @@
 package org.testcontainers.utility;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 
-public class DefaultImageNameSubstitutorTest {
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
+class DefaultImageNameSubstitutorTest {
 
     public static final DockerImageName ORIGINAL_IMAGE = DockerImageName.parse("foo");
 
@@ -16,16 +17,13 @@ public class DefaultImageNameSubstitutorTest {
 
     private ConfigurationFileImageNameSubstitutor underTest;
 
-    @Rule
-    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
-
-    @Before
+    @BeforeEach
     public void setUp() {
         underTest = new ConfigurationFileImageNameSubstitutor(TestcontainersConfiguration.getInstance());
     }
 
     @Test
-    public void testConfigurationLookup() {
+    void testConfigurationLookup() {
         Mockito
             .doReturn(SUBSTITUTE_IMAGE)
             .when(TestcontainersConfiguration.getInstance())
diff --git a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
index a56315085ae..bfd3641adeb 100644
--- a/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.utility;
 
 import org.assertj.core.api.Condition;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -11,10 +11,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DirectoryTarResourceTest {
+class DirectoryTarResourceTest {
 
     @Test
-    public void simpleRecursiveFileTest() {
+    void simpleRecursiveFileTest() {
         // 'src' is expected to be the project base directory, so all source code/resources should be copied in
         File directory = new File("src");
 
@@ -41,7 +41,7 @@ public void simpleRecursiveFileTest() {
     }
 
     @Test
-    public void simpleRecursiveFileWithPermissionTest() {
+    void simpleRecursiveFileWithPermissionTest() {
         try (
             GenericContainer container = new GenericContainer(
                 new ImageFromDockerfile()
@@ -67,7 +67,7 @@ public void simpleRecursiveFileWithPermissionTest() {
     }
 
     @Test
-    public void simpleRecursiveClasspathResourceTest() {
+    void simpleRecursiveClasspathResourceTest() {
         // This test combines the copying of classpath resources from JAR files with the recursive TAR approach, to allow JARed classpath resources to be copied in to an image
 
         try (
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index dd17981111f..dc7bf9ba1ab 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -1,21 +1,21 @@
 package org.testcontainers.utility;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class DockerImageNameCompatibilityTest {
+class DockerImageNameCompatibilityTest {
 
     @Test
-    public void testPlainImage() {
+    void testPlainImage() {
         DockerImageName subject = DockerImageName.parse("foo");
 
         assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("image name foo != bar").isFalse();
     }
 
     @Test
-    public void testNoTagTreatedAsWildcard() {
+    void testNoTagTreatedAsWildcard() {
         final DockerImageName subject = DockerImageName.parse("foo:4.5.6");
         /*
         foo:1.2.3 != foo:4.5.6
@@ -28,7 +28,7 @@ public void testNoTagTreatedAsWildcard() {
     }
 
     @Test
-    public void testImageWithAutomaticCompatibilityForFullPath() {
+    void testImageWithAutomaticCompatibilityForFullPath() {
         DockerImageName subject = DockerImageName.parse("repo/foo:1.2.3");
 
         assertThat(subject.isCompatibleWith(DockerImageName.parse("repo/foo")))
@@ -37,7 +37,7 @@ public void testImageWithAutomaticCompatibilityForFullPath() {
     }
 
     @Test
-    public void testImageWithClaimedCompatibility() {
+    void testImageWithClaimedCompatibility() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar");
 
         assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("foo(bar) ~= bar").isTrue();
@@ -45,14 +45,14 @@ public void testImageWithClaimedCompatibility() {
     }
 
     @Test
-    public void testImageWithClaimedCompatibilityAndVersion() {
+    void testImageWithClaimedCompatibilityAndVersion() {
         DockerImageName subject = DockerImageName.parse("foo:1.2.3").asCompatibleSubstituteFor("bar");
 
         assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("foo:1.2.3(bar) ~= bar").isTrue();
     }
 
     @Test
-    public void testImageWithClaimedCompatibilityForFullPath() {
+    void testImageWithClaimedCompatibilityForFullPath() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("registry/repo/bar");
 
         assertThat(subject.isCompatibleWith(DockerImageName.parse("registry/repo/bar")))
@@ -67,7 +67,7 @@ public void testImageWithClaimedCompatibilityForFullPath() {
     }
 
     @Test
-    public void testImageWithClaimedCompatibilityForVersion() {
+    void testImageWithClaimedCompatibilityForVersion() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar:1.2.3");
 
         assertThat(subject.isCompatibleWith(DockerImageName.parse("bar"))).as("foo(bar:1.2.3) ~= bar").isTrue();
@@ -86,19 +86,19 @@ public void testImageWithClaimedCompatibilityForVersion() {
     }
 
     @Test
-    public void testAssertMethodAcceptsCompatible() {
+    void testAssertMethodAcceptsCompatible() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar");
         subject.assertCompatibleWith(DockerImageName.parse("bar"));
     }
 
     @Test
-    public void testAssertMethodAcceptsCompatibleLibraryPrefix() {
+    void testAssertMethodAcceptsCompatibleLibraryPrefix() {
         DockerImageName subject = DockerImageName.parse("library/foo");
         subject.assertCompatibleWith(DockerImageName.parse("foo"));
     }
 
     @Test
-    public void testAssertMethodRejectsIncompatible() {
+    void testAssertMethodRejectsIncompatible() {
         DockerImageName subject = DockerImageName.parse("foo");
         assertThatThrownBy(() -> subject.assertCompatibleWith(DockerImageName.parse("bar")))
             .isInstanceOf(IllegalStateException.class)
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index b1a0cbc980f..7d6f8cd2633 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -1,19 +1,20 @@
 package org.testcontainers.utility;
 
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@RunWith(Enclosed.class)
-public class DockerImageNameTest {
+class DockerImageNameTest {
 
-    @RunWith(Parameterized.class)
-    public static class ValidNames {
+    @Nested
+    class ValidNames {
 
-        @Parameterized.Parameters(name = "{0}")
         public static String[] getNames() {
             return new String[] {
                 "myname:latest",
@@ -30,19 +31,16 @@ public static String[] getNames() {
             };
         }
 
-        @Parameterized.Parameter
-        public String imageName;
-
-        @Test
-        public void testValidNameAccepted() {
+        @ParameterizedTest
+        @MethodSource("getNames")
+        void testValidNameAccepted(String imageName) {
             DockerImageName.parse(imageName).assertValid();
         }
     }
 
-    @RunWith(Parameterized.class)
-    public static class InvalidNames {
+    @Nested
+    class InvalidNames {
 
-        @Parameterized.Parameters(name = "{0}")
         public static String[] getNames() {
             return new String[] {
                 ":latest",
@@ -53,62 +51,58 @@ public static String[] getNames() {
             };
         }
 
-        @Parameterized.Parameter
-        public String imageName;
-
-        @Test(expected = IllegalArgumentException.class)
-        public void testInvalidNameRejected() {
-            DockerImageName.parse(imageName).assertValid();
+        @ParameterizedTest
+        @MethodSource("getNames")
+        void testInvalidNameRejected(String imageName) {
+            assertThatThrownBy(() -> DockerImageName.parse(imageName).assertValid())
+                .isInstanceOf(IllegalArgumentException.class);
         }
     }
 
-    @RunWith(Parameterized.class)
-    public static class Parsing {
-
-        @Parameterized.Parameters(name = "{0}{1}{2}{3}{4}")
-        public static String[][] getNames() {
-            return new String[][] {
-                { "", "", "myname", ":", null },
-                { "", "", "myname", ":", "latest" },
-                { "", "", "repo/myname", ":", null },
-                { "", "", "repo/myname", ":", "latest" },
-                { "registry.foo.com:1234", "/", "my-name", ":", null },
-                { "registry.foo.com:1234", "/", "my-name", ":", "1.0" },
-                { "registry.foo.com", "/", "my-name", ":", "1.0" },
-                { "registry.foo.com:1234", "/", "repo_here/my-name", ":", null },
-                { "registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0" },
-                { "1.2.3.4:1234", "/", "repo_here/my-name", ":", null },
-                { "1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0" },
-                { "1.2.3.4:1234", "/", "my-name", ":", null },
-                { "1.2.3.4:1234", "/", "my-name", ":", "1.0" },
-                { "", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-                { "", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-                { "registry.foo.com:1234", "/", "repo-here/my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-                { "registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-                { "1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-                { "1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-                { "1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-                { "1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd" },
-            };
+    @Nested
+    class Parsing {
+
+        public static Stream<Arguments> getNames() {
+            return Stream.of(
+                Arguments.of("", "", "myname", ":", null),
+                Arguments.of("", "", "myname", ":", "latest"),
+                Arguments.of("", "", "repo/myname", ":", null),
+                Arguments.of("", "", "repo/myname", ":", "latest"),
+                Arguments.of("registry.foo.com:1234", "/", "my-name", ":", null),
+                Arguments.of("registry.foo.com:1234", "/", "my-name", ":", "1.0"),
+                Arguments.of("registry.foo.com", "/", "my-name", ":", "1.0"),
+                Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", null),
+                Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"),
+                Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", null),
+                Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"),
+                Arguments.of("1.2.3.4:1234", "/", "my-name", ":", null),
+                Arguments.of("1.2.3.4:1234", "/", "my-name", ":", "1.0"),
+                Arguments.of("", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
+                Arguments.of("", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
+                Arguments.of(
+                    "registry.foo.com:1234",
+                    "/",
+                    "repo-here/my-name",
+                    "@",
+                    "sha256:1234abcd1234abcd1234abcd1234abcd"
+                ),
+                Arguments.of("registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
+                Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
+                Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
+                Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
+                Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd")
+            );
         }
 
-        @Parameterized.Parameter(0)
-        public String registry;
-
-        @Parameterized.Parameter(1)
-        public String registrySeparator;
-
-        @Parameterized.Parameter(2)
-        public String repo;
-
-        @Parameterized.Parameter(3)
-        public String versionSeparator;
-
-        @Parameterized.Parameter(4)
-        public String version;
-
-        @Test
-        public void testParsing() {
+        @ParameterizedTest
+        @MethodSource("getNames")
+        void testParsing(
+            String registry,
+            String registrySeparator,
+            String repo,
+            String versionSeparator,
+            String version
+        ) {
             final String unversionedPart = registry + registrySeparator + repo;
 
             String combined;
diff --git a/core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java b/core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java
index 17f0f3d7160..cf3352902ec 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerLoggerFactoryTest.java
@@ -4,16 +4,16 @@
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DockerLoggerFactoryTest {
+class DockerLoggerFactoryTest {
 
     private static final Logger LOGGER = (Logger) DockerLoggerFactory.getLogger("dockerImageName");
 
     @Test
-    public void debugIsNotSwallowedForContainerLogs() {
+    void debugIsNotSwallowedForContainerLogs() {
         ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
         listAppender.start();
         LOGGER.addAppender(listAppender);
diff --git a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
index 304bbc4190d..543cbdfeba1 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
@@ -1,26 +1,25 @@
 package org.testcontainers.utility;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
-/**
- *
- */
-@RunWith(Parameterized.class)
-public class DockerStatusTest {
+@ParameterizedClass
+@MethodSource("parameters")
+class DockerStatusTest {
 
-    private final DateTimeFormatter dateTimeFormatter;
+    private DateTimeFormatter dateTimeFormatter;
 
     private static final Instant now = Instant.now();
 
@@ -52,16 +51,15 @@ public DockerStatusTest(DateTimeFormatter dateTimeFormatter) {
         paused = buildState(false, true, buildTimestamp(now.minusMillis(100)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
     }
 
-    @Parameterized.Parameters
-    public static Object[][] parameters() {
-        return new Object[][] {
-            { DateTimeFormatter.ISO_INSTANT },
-            { DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("America/New_York")) },
-        };
+    public static Stream<DateTimeFormatter> parameters() {
+        return Stream.of(
+            DateTimeFormatter.ISO_INSTANT,
+            DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("America/New_York"))
+        );
     }
 
     @Test
-    public void testRunning() throws Exception {
+    void testRunning() {
         assertThat(DockerStatus.isContainerRunning(running, minimumDuration, now)).isTrue();
         assertThat(DockerStatus.isContainerRunning(runningVariant, minimumDuration, now)).isTrue();
         assertThat(DockerStatus.isContainerRunning(shortRunning, minimumDuration, now)).isFalse();
@@ -72,7 +70,7 @@ public void testRunning() throws Exception {
     }
 
     @Test
-    public void testStopped() throws Exception {
+    void testStopped() {
         assertThat(DockerStatus.isContainerStopped(running)).isFalse();
         assertThat(DockerStatus.isContainerStopped(runningVariant)).isFalse();
         assertThat(DockerStatus.isContainerStopped(shortRunning)).isFalse();
diff --git a/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java b/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
index 2741edb5cee..af71e49664e 100644
--- a/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
+++ b/core/src/test/java/org/testcontainers/utility/FilterRegistryTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.utility;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.ResourceReaper.FilterRegistry;
 
 import java.io.ByteArrayInputStream;
@@ -15,7 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class FilterRegistryTest {
+class FilterRegistryTest {
 
     private static final List<Entry<String, String>> FILTERS = Arrays.asList(
         new SimpleEntry<>("key1!", "value2?"),
@@ -31,7 +31,7 @@ public class FilterRegistryTest {
     private static final String NEW_LINE = "\n";
 
     @Test
-    public void registerReturnsTrueIfAcknowledgementIsReadFromInputStream() throws IOException {
+    void registerReturnsTrueIfAcknowledgementIsReadFromInputStream() throws IOException {
         FilterRegistry registry = new FilterRegistry(inputStream(ACKNOWLEDGEMENT), anyOutputStream());
 
         boolean successful = registry.register(FILTERS);
@@ -40,7 +40,7 @@ public void registerReturnsTrueIfAcknowledgementIsReadFromInputStream() throws I
     }
 
     @Test
-    public void registerReturnsFalseIfNoAcknowledgementIsReadFromInputStream() throws IOException {
+    void registerReturnsFalseIfNoAcknowledgementIsReadFromInputStream() throws IOException {
         FilterRegistry registry = new FilterRegistry(inputStream(NO_ACKNOWLEDGEMENT), anyOutputStream());
 
         boolean successful = registry.register(FILTERS);
@@ -49,7 +49,7 @@ public void registerReturnsFalseIfNoAcknowledgementIsReadFromInputStream() throw
     }
 
     @Test
-    public void registerWritesUrlEncodedFiltersAndNewlineToOutputStream() throws IOException {
+    void registerWritesUrlEncodedFiltersAndNewlineToOutputStream() throws IOException {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         FilterRegistry registry = new FilterRegistry(anyInputStream(), outputStream);
 
diff --git a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
index 6c29e26c58f..e6a0c294c77 100644
--- a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
@@ -1,10 +1,10 @@
 package org.testcontainers.utility;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 import org.testcontainers.containers.GenericContainer;
 
@@ -20,19 +20,17 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.eq;
 
-public class ImageNameSubstitutorTest {
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
+class ImageNameSubstitutorTest {
 
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
-
-    @Rule
-    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
+    @TempDir
+    public Path tempFolder;
 
     private ImageNameSubstitutor originalInstance;
 
     private ImageNameSubstitutor originalDefaultImplementation;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         originalInstance = ImageNameSubstitutor.instance;
         originalDefaultImplementation = ImageNameSubstitutor.defaultImplementation;
@@ -46,14 +44,14 @@ public void setUp() throws Exception {
         Mockito.doReturn("default implementation").when(ImageNameSubstitutor.defaultImplementation).getDescription();
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         ImageNameSubstitutor.instance = originalInstance;
         ImageNameSubstitutor.defaultImplementation = originalDefaultImplementation;
     }
 
     @Test
-    public void simpleConfigurationTest() {
+    void simpleConfigurationTest() {
         Mockito
             .doReturn(FakeImageSubstitutor.class.getCanonicalName())
             .when(TestcontainersConfiguration.getInstance())
@@ -68,7 +66,7 @@ public void simpleConfigurationTest() {
     }
 
     @Test
-    public void testWorksWithoutConfiguredImplementation() {
+    void testWorksWithoutConfiguredImplementation() {
         Mockito.doReturn(null).when(TestcontainersConfiguration.getInstance()).getImageSubstitutorClassName();
 
         final ImageNameSubstitutor imageNameSubstitutor = ImageNameSubstitutor.instance();
@@ -80,7 +78,7 @@ public void testWorksWithoutConfiguredImplementation() {
     }
 
     @Test
-    public void testImageNameSubstitutorToString() {
+    void testImageNameSubstitutorToString() {
         Mockito
             .doReturn(FakeImageSubstitutor.class.getCanonicalName())
             .when(TestcontainersConfiguration.getInstance())
@@ -95,8 +93,8 @@ public void testImageNameSubstitutorToString() {
     }
 
     @Test
-    public void testImageNameSubstitutorFromServiceLoader() throws IOException {
-        Path tempDir = this.tempFolder.newFolder("image-name-substitutor-test").toPath();
+    void testImageNameSubstitutorFromServiceLoader() throws IOException {
+        Path tempDir = this.tempFolder.resolve("image-name-substitutor-test");
         Path metaInfDir = Paths.get(tempDir.toString(), "META-INF", "services");
         Files.createDirectories(metaInfDir);
 
diff --git a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
index 822109ff9cd..afc78076b43 100644
--- a/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
+++ b/core/src/test/java/org/testcontainers/utility/LazyFutureTest.java
@@ -2,7 +2,8 @@
 
 import com.google.common.util.concurrent.Futures;
 import lombok.SneakyThrows;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.Collections;
 import java.util.List;
@@ -18,10 +19,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class LazyFutureTest {
+class LazyFutureTest {
 
     @Test
-    public void testLaziness() throws Exception {
+    void testLaziness() throws Exception {
         AtomicInteger counter = new AtomicInteger();
 
         Future<Integer> lazyFuture = new LazyFuture<Integer>() {
@@ -39,8 +40,9 @@ protected Integer resolve() {
         assertThat(lazyFuture.get()).as("result of resolve() must be cached").isEqualTo(1);
     }
 
-    @Test(timeout = 5_000)
-    public void timeoutWorks() {
+    @Test
+    @Timeout(5)
+    void timeoutWorks() {
         Future<Void> lazyFuture = new LazyFuture<Void>() {
             @Override
             @SneakyThrows(InterruptedException.class)
@@ -55,8 +57,9 @@ protected Void resolve() {
             .isInstanceOf(TimeoutException.class);
     }
 
-    @Test(timeout = 5_000)
-    public void testThreadSafety() throws Exception {
+    @Test
+    @Timeout(5)
+    void testThreadSafety() throws Exception {
         final int numOfThreads = 3;
         CountDownLatch latch = new CountDownLatch(numOfThreads);
         AtomicInteger counter = new AtomicInteger();
diff --git a/core/src/test/java/org/testcontainers/utility/LicenseAcceptanceTest.java b/core/src/test/java/org/testcontainers/utility/LicenseAcceptanceTest.java
index 63da017c88e..c0ca63c06bc 100644
--- a/core/src/test/java/org/testcontainers/utility/LicenseAcceptanceTest.java
+++ b/core/src/test/java/org/testcontainers/utility/LicenseAcceptanceTest.java
@@ -1,17 +1,20 @@
 package org.testcontainers.utility;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class LicenseAcceptanceTest {
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class LicenseAcceptanceTest {
 
     @Test
-    public void testForExistingNames() {
+    void testForExistingNames() {
         LicenseAcceptance.assertLicenseAccepted("a");
         LicenseAcceptance.assertLicenseAccepted("b");
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void testForMissingNames() {
-        LicenseAcceptance.assertLicenseAccepted("c");
+    @Test
+    void testForMissingNames() {
+        assertThatThrownBy(() -> LicenseAcceptance.assertLicenseAccepted("c"))
+            .isInstanceOf(IllegalStateException.class);
     }
 }
diff --git a/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationExtension.java b/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationExtension.java
new file mode 100644
index 00000000000..a94e6b7772e
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationExtension.java
@@ -0,0 +1,39 @@
+package org.testcontainers.utility;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.mockito.Mockito;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * This {@link org.junit.jupiter.api.extension.Extension} applies a spy on {@link TestcontainersConfiguration}
+ * for testing features that depend on the global configuration.
+ */
+public class MockTestcontainersConfigurationExtension implements BeforeEachCallback, AfterEachCallback {
+
+    private static final ExtensionContext.Namespace NS = ExtensionContext.Namespace.create(
+        MockTestcontainersConfigurationExtension.class
+    );
+
+    static AtomicReference<TestcontainersConfiguration> REF = TestcontainersConfiguration.getInstanceField();
+
+    @Override
+    public void beforeEach(ExtensionContext context) throws Exception {
+        TestcontainersConfiguration previous = REF.get();
+        if (previous == null) {
+            previous = TestcontainersConfiguration.getInstance();
+        }
+        REF.set(Mockito.spy(previous));
+        context.getStore(NS).put(context.getUniqueId(), previous);
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) throws Exception {
+        TestcontainersConfiguration previous = context
+            .getStore(NS)
+            .remove(context.getUniqueId(), TestcontainersConfiguration.class);
+        REF.set(previous);
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java b/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java
deleted file mode 100644
index ba467f13897..00000000000
--- a/core/src/test/java/org/testcontainers/utility/MockTestcontainersConfigurationRule.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.testcontainers.utility;
-
-import org.jetbrains.annotations.NotNull;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-import org.mockito.Mockito;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * This {@link TestRule} applies a spy on {@link TestcontainersConfiguration}
- * for testing features that depend on the global configuration.
- */
-public class MockTestcontainersConfigurationRule implements TestRule {
-
-    static AtomicReference<TestcontainersConfiguration> REF = TestcontainersConfiguration.getInstanceField();
-
-    @NotNull
-    @Override
-    public Statement apply(@NotNull Statement base, @NotNull Description description) {
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                TestcontainersConfiguration previous = REF.get();
-                if (previous == null) {
-                    previous = TestcontainersConfiguration.getInstance();
-                }
-                REF.set(Mockito.spy(previous));
-
-                try {
-                    base.evaluate();
-                } finally {
-                    REF.set(previous);
-                }
-            }
-        };
-    }
-}
diff --git a/core/src/test/java/org/testcontainers/utility/MountableFileTest.java b/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
index fbfb537ef87..72db429c263 100644
--- a/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
+++ b/core/src/test/java/org/testcontainers/utility/MountableFileTest.java
@@ -5,7 +5,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MountableFileTest {
+class MountableFileTest {
 
     private static final int TEST_FILE_MODE = 0532;
 
@@ -26,35 +26,35 @@ public class MountableFileTest {
     private static final int BASE_DIR_MODE = 0040000;
 
     @Test
-    public void forClasspathResource() throws Exception {
+    void forClasspathResource() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/test-resource.txt");
 
         performChecks(mountableFile);
     }
 
     @Test
-    public void forClasspathResourceWithAbsolutePath() throws Exception {
+    void forClasspathResourceWithAbsolutePath() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("/mappable-resource/test-resource.txt");
 
         performChecks(mountableFile);
     }
 
     @Test
-    public void forClasspathResourceFromJar() throws Exception {
+    void forClasspathResourceFromJar() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("META-INF/dummy_unique_name.txt");
 
         performChecks(mountableFile);
     }
 
     @Test
-    public void forClasspathResourceFromJarWithAbsolutePath() throws Exception {
+    void forClasspathResourceFromJarWithAbsolutePath() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("/META-INF/dummy_unique_name.txt");
 
         performChecks(mountableFile);
     }
 
     @Test
-    public void forHostPath() throws Exception {
+    void forHostPath() throws Exception {
         final Path file = createTempFile("somepath");
         final MountableFile mountableFile = MountableFile.forHostPath(file.toString());
 
@@ -62,7 +62,7 @@ public void forHostPath() throws Exception {
     }
 
     @Test
-    public void forHostPathWithSpaces() throws Exception {
+    void forHostPathWithSpaces() throws Exception {
         final Path file = createTempFile("some path");
         final MountableFile mountableFile = MountableFile.forHostPath(file.toString());
 
@@ -75,7 +75,7 @@ public void forHostPathWithSpaces() throws Exception {
     }
 
     @Test
-    public void forHostPathWithPlus() throws Exception {
+    void forHostPathWithPlus() throws Exception {
         final Path file = createTempFile("some+path");
         final MountableFile mountableFile = MountableFile.forHostPath(file.toString());
 
@@ -88,7 +88,7 @@ public void forHostPathWithPlus() throws Exception {
     }
 
     @Test
-    public void forClasspathResourceWithPermission() throws Exception {
+    void forClasspathResourceWithPermission() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource(
             "mappable-resource/test-resource.txt",
             TEST_FILE_MODE
@@ -99,7 +99,7 @@ public void forClasspathResourceWithPermission() throws Exception {
     }
 
     @Test
-    public void forHostFilePathWithPermission() throws Exception {
+    void forHostFilePathWithPermission() throws Exception {
         final Path file = createTempFile("somepath");
         final MountableFile mountableFile = MountableFile.forHostPath(file.toString(), TEST_FILE_MODE);
         performChecks(mountableFile);
@@ -107,7 +107,7 @@ public void forHostFilePathWithPermission() throws Exception {
     }
 
     @Test
-    public void forHostDirPathWithPermission() throws Exception {
+    void forHostDirPathWithPermission() throws Exception {
         final Path dir = createTempDir();
         final MountableFile mountableFile = MountableFile.forHostPath(dir.toString(), TEST_FILE_MODE);
         performChecks(mountableFile);
@@ -115,7 +115,7 @@ public void forHostDirPathWithPermission() throws Exception {
     }
 
     @Test
-    public void noTrailingSlashesInTarEntryNames() throws Exception {
+    void noTrailingSlashesInTarEntryNames() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/test-resource.txt");
 
         @Cleanup
diff --git a/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
index 04786119e36..6eb6c62905c 100644
--- a/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/PrefixingImageNameSubstitutorTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.utility;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -9,20 +9,20 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class PrefixingImageNameSubstitutorTest {
+class PrefixingImageNameSubstitutorTest {
 
     private TestcontainersConfiguration mockConfiguration;
 
     private PrefixingImageNameSubstitutor underTest;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         mockConfiguration = mock(TestcontainersConfiguration.class);
         underTest = new PrefixingImageNameSubstitutor(mockConfiguration);
     }
 
     @Test
-    public void testHappyPath() {
+    void testHappyPath() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com/our-mirror/");
 
@@ -34,7 +34,7 @@ public void testHappyPath() {
     }
 
     @Test
-    public void hubIoRegistryIsNotChanged() {
+    void hubIoRegistryIsNotChanged() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com/our-mirror/");
 
@@ -44,7 +44,7 @@ public void hubIoRegistryIsNotChanged() {
     }
 
     @Test
-    public void hubComRegistryIsNotChanged() {
+    void hubComRegistryIsNotChanged() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com/our-mirror/");
 
@@ -56,7 +56,7 @@ public void hubComRegistryIsNotChanged() {
     }
 
     @Test
-    public void thirdPartyRegistriesNotAffected() {
+    void thirdPartyRegistriesNotAffected() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com/our-mirror/");
 
@@ -68,7 +68,7 @@ public void thirdPartyRegistriesNotAffected() {
     }
 
     @Test
-    public void testNoDoublePrefixing() {
+    void testNoDoublePrefixing() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com/our-mirror/");
 
@@ -80,7 +80,7 @@ public void testNoDoublePrefixing() {
     }
 
     @Test
-    public void testHandlesEmptyValue() {
+    void testHandlesEmptyValue() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("");
 
@@ -92,7 +92,7 @@ public void testHandlesEmptyValue() {
     }
 
     @Test
-    public void testHandlesRegistryOnlyWithTrailingSlash() {
+    void testHandlesRegistryOnlyWithTrailingSlash() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com/");
 
@@ -104,7 +104,7 @@ public void testHandlesRegistryOnlyWithTrailingSlash() {
     }
 
     @Test
-    public void testCombinesLiterallyForRegistryOnlyWithoutTrailingSlash() {
+    void testCombinesLiterallyForRegistryOnlyWithoutTrailingSlash() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com");
 
@@ -116,7 +116,7 @@ public void testCombinesLiterallyForRegistryOnlyWithoutTrailingSlash() {
     }
 
     @Test
-    public void testCombinesLiterallyForBothPartsWithoutTrailingSlash() {
+    void testCombinesLiterallyForBothPartsWithoutTrailingSlash() {
         when(mockConfiguration.getEnvVarOrProperty(eq(PrefixingImageNameSubstitutor.PREFIX_PROPERTY_KEY), any()))
             .thenReturn("someregistry.com/our-mirror");
 
diff --git a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
index ed986b05015..6988cfd86a8 100644
--- a/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
+++ b/core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
@@ -5,7 +5,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,10 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class RegistryAuthLocatorTest {
+class RegistryAuthLocatorTest {
 
     @Test
-    public void lookupAuthConfigWithoutCredentials() throws URISyntaxException, IOException {
+    void lookupAuthConfigWithoutCredentials() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -36,7 +36,7 @@ public void lookupAuthConfigWithoutCredentials() throws URISyntaxException, IOEx
     }
 
     @Test
-    public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException, IOException {
+    void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-basic-auth.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -52,7 +52,7 @@ public void lookupAuthConfigWithBasicAuthCredentials() throws URISyntaxException
     }
 
     @Test
-    public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException, IOException {
+    void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -68,8 +68,7 @@ public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException,
     }
 
     @Test
-    public void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult()
-        throws URISyntaxException, IOException {
+    void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult() throws URISyntaxException, IOException {
         // contains entry for registry.example.com
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");
 
@@ -83,7 +82,7 @@ public void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult
     }
 
     @Test
-    public void lookupAuthConfigUsingStore() throws URISyntaxException, IOException {
+    void lookupAuthConfigUsingStore() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -103,7 +102,7 @@ public void lookupAuthConfigUsingStore() throws URISyntaxException, IOException
     }
 
     @Test
-    public void lookupAuthConfigUsingHelper() throws URISyntaxException, IOException {
+    void lookupAuthConfigUsingHelper() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -123,7 +122,7 @@ public void lookupAuthConfigUsingHelper() throws URISyntaxException, IOException
     }
 
     @Test
-    public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException, IOException {
+    void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper-using-token.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -140,7 +139,7 @@ public void lookupAuthConfigUsingHelperWithToken() throws URISyntaxException, IO
     }
 
     @Test
-    public void lookupUsingHelperEmptyAuth() throws URISyntaxException, IOException {
+    void lookupUsingHelperEmptyAuth() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty-auth-with-helper.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -160,7 +159,7 @@ public void lookupUsingHelperEmptyAuth() throws URISyntaxException, IOException
     }
 
     @Test
-    public void lookupNonEmptyAuthWithHelper() throws URISyntaxException, IOException {
+    void lookupNonEmptyAuthWithHelper() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-existing-auth-with-helper.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -180,7 +179,7 @@ public void lookupNonEmptyAuthWithHelper() throws URISyntaxException, IOExceptio
     }
 
     @Test
-    public void lookupAuthConfigUsingHelperNoServerUrl() throws URISyntaxException, IOException {
+    void lookupAuthConfigUsingHelperNoServerUrl() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-helper-no-server-url.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -200,7 +199,7 @@ public void lookupAuthConfigUsingHelperNoServerUrl() throws URISyntaxException,
     }
 
     @Test
-    public void lookupAuthConfigUsingHelperNoServerUrlWithToken() throws URISyntaxException, IOException {
+    void lookupAuthConfigUsingHelperNoServerUrlWithToken() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator(
             "config-with-helper-no-server-url-using-token.json"
         );
@@ -219,7 +218,7 @@ public void lookupAuthConfigUsingHelperNoServerUrlWithToken() throws URISyntaxEx
     }
 
     @Test
-    public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException, IOException {
+    void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException, IOException {
         Map<String, String> notFoundMessagesReference = new HashMap<>();
         final RegistryAuthLocator authLocator = createTestAuthLocator(
             "config-with-store.json",
@@ -245,7 +244,7 @@ public void lookupAuthConfigWithCredentialsNotFound() throws URISyntaxException,
     }
 
     @Test
-    public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException, IOException {
+    void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store-empty.json");
 
         DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
@@ -255,7 +254,7 @@ public void lookupAuthConfigWithCredStoreEmpty() throws URISyntaxException, IOEx
     }
 
     @Test
-    public void lookupAuthConfigFromEnvVarWithCredStoreEmpty() throws URISyntaxException, IOException {
+    void lookupAuthConfigFromEnvVarWithCredStoreEmpty() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator(null, "config-with-store-empty.json");
 
         DockerImageName dockerImageName = DockerImageName.parse("registry2.example.com/org/repo");
@@ -265,7 +264,7 @@ public void lookupAuthConfigFromEnvVarWithCredStoreEmpty() throws URISyntaxExcep
     }
 
     @Test
-    public void lookupAuthConfigWithoutConfigFile() throws URISyntaxException, IOException {
+    void lookupAuthConfigWithoutConfigFile() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator(null);
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -281,7 +280,7 @@ public void lookupAuthConfigWithoutConfigFile() throws URISyntaxException, IOExc
     }
 
     @Test
-    public void lookupAuthConfigRespectsCheckOrderPreference() throws URISyntaxException, IOException {
+    void lookupAuthConfigRespectsCheckOrderPreference() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator("config-empty.json", "config-basic-auth.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
@@ -297,7 +296,7 @@ public void lookupAuthConfigRespectsCheckOrderPreference() throws URISyntaxExcep
     }
 
     @Test
-    public void lookupAuthConfigFromEnvironmentVariable() throws URISyntaxException, IOException {
+    void lookupAuthConfigFromEnvironmentVariable() throws URISyntaxException, IOException {
         final RegistryAuthLocator authLocator = createTestAuthLocator(null, "config-basic-auth.json");
 
         final AuthConfig authConfig = authLocator.lookupAuthConfig(
diff --git a/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
index 77c5d528ba4..7b0c463d056 100644
--- a/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
+++ b/core/src/test/java/org/testcontainers/utility/ResourceReaperTest.java
@@ -5,7 +5,7 @@
 import lombok.SneakyThrows;
 import org.awaitility.Awaitility;
 import org.awaitility.core.ConditionFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.zeroturnaround.exec.ProcessExecutor;
@@ -21,17 +21,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ResourceReaperTest {
+class ResourceReaperTest {
 
     @Test
-    public void shouldCleanupWithRyuk() {
+    void shouldCleanupWithRyuk() {
         Map<String, String> labels = runProcess(processExecutor -> {});
 
         assertCleanup(labels);
     }
 
     @Test
-    public void shouldCleanupWithJVM() {
+    void shouldCleanupWithJVM() {
         Map<String, String> labels = runProcess(processExecutor -> {
             processExecutor.environment("TESTCONTAINERS_RYUK_DISABLED", "true");
         });
diff --git a/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java b/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
index 4bd9e1b8edb..874f623cc08 100644
--- a/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestEnvironmentTest.java
@@ -1,37 +1,37 @@
 package org.testcontainers.utility;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Created by rnorth on 03/07/2016.
  */
-public class TestEnvironmentTest {
+class TestEnvironmentTest {
 
     @Test
-    public void testCompareVersionGreaterThanSameMajor() {
+    void testCompareVersionGreaterThanSameMajor() {
         assertThat(new ComparableVersion("1.22").compareTo(new ComparableVersion("1.20")) > 0)
             .as("1.22 > 1.20")
             .isTrue();
     }
 
     @Test
-    public void testCompareVersionEqual() {
+    void testCompareVersionEqual() {
         assertThat(new ComparableVersion("1.20"))
             .as("1.20 == 1.20")
             .isEqualByComparingTo(new ComparableVersion("1.20"));
     }
 
     @Test
-    public void testCompareVersionGreaterThan() {
+    void testCompareVersionGreaterThan() {
         assertThat(new ComparableVersion("2.10").compareTo(new ComparableVersion("1.20")) > 0)
             .as("2.10 > 1.20")
             .isTrue();
     }
 
     @Test
-    public void testCompareVersionIgnoresExcessLength() {
+    void testCompareVersionIgnoresExcessLength() {
         assertThat(new ComparableVersion("1.20"))
             .as("1.20 == 1.20.3")
             .isEqualByComparingTo(new ComparableVersion("1.20.3"));
diff --git a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
index fcc0a654ef5..4e0520af5ba 100644
--- a/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
+++ b/core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.utility;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestcontainersConfigurationTest {
+class TestcontainersConfigurationTest {
 
     private Properties userProperties;
 
@@ -18,7 +18,7 @@ public class TestcontainersConfigurationTest {
 
     private Map<String, String> environment;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         userProperties = new Properties();
         classpathProperties = new Properties();
@@ -26,7 +26,7 @@ public void setUp() {
     }
 
     @Test
-    public void shouldSubstituteImageNamesFromClasspathProperties() {
+    void shouldSubstituteImageNamesFromClasspathProperties() {
         classpathProperties.setProperty("ryuk.container.image", "foo:version");
         assertThat(newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any")))
             .as("an image name can be pulled from classpath properties")
@@ -34,7 +34,7 @@ public void shouldSubstituteImageNamesFromClasspathProperties() {
     }
 
     @Test
-    public void shouldSubstituteImageNamesFromUserProperties() {
+    void shouldSubstituteImageNamesFromUserProperties() {
         userProperties.setProperty("ryuk.container.image", "foo:version");
         assertThat(newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any")))
             .as("an image name can be pulled from user properties")
@@ -42,7 +42,7 @@ public void shouldSubstituteImageNamesFromUserProperties() {
     }
 
     @Test
-    public void shouldSubstituteImageNamesFromEnvironmentVariables() {
+    void shouldSubstituteImageNamesFromEnvironmentVariables() {
         environment.put("TESTCONTAINERS_RYUK_CONTAINER_IMAGE", "foo:version");
         assertThat(newConfig().getConfiguredSubstituteImage(DockerImageName.parse("testcontainers/ryuk:any")))
             .as("an image name can be pulled from an environment variable")
@@ -50,7 +50,7 @@ public void shouldSubstituteImageNamesFromEnvironmentVariables() {
     }
 
     @Test
-    public void shouldApplySettingsInOrder() {
+    void shouldApplySettingsInOrder() {
         assertThat(newConfig().getEnvVarOrProperty("key", "default"))
             .as("precedence order for multiple sources of the same value is correct")
             .isEqualTo("default");
@@ -75,7 +75,7 @@ public void shouldApplySettingsInOrder() {
     }
 
     @Test
-    public void shouldNotReadChecksFromClasspathProperties() {
+    void shouldNotReadChecksFromClasspathProperties() {
         assertThat(newConfig().isDisableChecks()).as("checks enabled by default").isFalse();
 
         classpathProperties.setProperty("checks.disable", "true");
@@ -83,7 +83,7 @@ public void shouldNotReadChecksFromClasspathProperties() {
     }
 
     @Test
-    public void shouldReadChecksFromUserProperties() {
+    void shouldReadChecksFromUserProperties() {
         assertThat(newConfig().isDisableChecks()).as("checks enabled by default").isFalse();
 
         userProperties.setProperty("checks.disable", "true");
@@ -91,7 +91,7 @@ public void shouldReadChecksFromUserProperties() {
     }
 
     @Test
-    public void shouldReadChecksFromEnvironment() {
+    void shouldReadChecksFromEnvironment() {
         assertThat(newConfig().isDisableChecks()).as("checks enabled by default").isFalse();
 
         userProperties.remove("checks.disable");
@@ -100,7 +100,7 @@ public void shouldReadChecksFromEnvironment() {
     }
 
     @Test
-    public void shouldReadDockerSettingsFromEnvironmentWithoutTestcontainersPrefix() {
+    void shouldReadDockerSettingsFromEnvironmentWithoutTestcontainersPrefix() {
         userProperties.remove("docker.foo");
         environment.put("DOCKER_FOO", "some value");
         assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
@@ -109,7 +109,7 @@ public void shouldReadDockerSettingsFromEnvironmentWithoutTestcontainersPrefix()
     }
 
     @Test
-    public void shouldNotReadDockerSettingsFromEnvironmentWithTestcontainersPrefix() {
+    void shouldNotReadDockerSettingsFromEnvironmentWithTestcontainersPrefix() {
         userProperties.remove("docker.foo");
         environment.put("TESTCONTAINERS_DOCKER_FOO", "some value");
         assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
@@ -118,7 +118,7 @@ public void shouldNotReadDockerSettingsFromEnvironmentWithTestcontainersPrefix()
     }
 
     @Test
-    public void shouldReadDockerSettingsFromUserProperties() {
+    void shouldReadDockerSettingsFromUserProperties() {
         environment.remove("DOCKER_FOO");
         userProperties.put("docker.foo", "some value");
         assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
@@ -127,7 +127,7 @@ public void shouldReadDockerSettingsFromUserProperties() {
     }
 
     @Test
-    public void shouldNotReadSettingIfCorrespondingEnvironmentVarIsEmptyString() {
+    void shouldNotReadSettingIfCorrespondingEnvironmentVarIsEmptyString() {
         environment.put("DOCKER_FOO", "");
         assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
             .as("reads unprefixed env vars for docker. settings")
@@ -135,7 +135,7 @@ public void shouldNotReadSettingIfCorrespondingEnvironmentVarIsEmptyString() {
     }
 
     @Test
-    public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
+    void shouldNotReadDockerClientStrategyFromClasspathProperties() {
         String currentValue = newConfig().getDockerClientStrategyClassName();
 
         classpathProperties.setProperty("docker.client.strategy", UUID.randomUUID().toString());
@@ -145,7 +145,7 @@ public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
     }
 
     @Test
-    public void shouldReadDockerClientStrategyFromUserProperties() {
+    void shouldReadDockerClientStrategyFromUserProperties() {
         userProperties.setProperty("docker.client.strategy", "foo");
         assertThat(newConfig().getDockerClientStrategyClassName())
             .as("Docker client strategy is changed by user property")
@@ -153,7 +153,7 @@ public void shouldReadDockerClientStrategyFromUserProperties() {
     }
 
     @Test
-    public void shouldReadDockerClientStrategyFromEnvironment() {
+    void shouldReadDockerClientStrategyFromEnvironment() {
         userProperties.remove("docker.client.strategy");
         environment.put("TESTCONTAINERS_DOCKER_CLIENT_STRATEGY", "foo");
         assertThat(newConfig().getDockerClientStrategyClassName())
@@ -162,7 +162,7 @@ public void shouldReadDockerClientStrategyFromEnvironment() {
     }
 
     @Test
-    public void shouldNotUseImplicitDockerClientStrategyWhenDockerHostAndStrategyAreBothSet() {
+    void shouldNotUseImplicitDockerClientStrategyWhenDockerHostAndStrategyAreBothSet() {
         userProperties.put("docker.client.strategy", "foo");
         userProperties.put("docker.host", "tcp://1.2.3.4:5678");
         assertThat(newConfig().getDockerClientStrategyClassName())
@@ -191,7 +191,7 @@ public void shouldNotUseImplicitDockerClientStrategyWhenDockerHostAndStrategyAre
     }
 
     @Test
-    public void shouldNotReadReuseFromClasspathProperties() {
+    void shouldNotReadReuseFromClasspathProperties() {
         assertThat(newConfig().environmentSupportsReuse()).as("no reuse by default").isFalse();
 
         classpathProperties.setProperty("testcontainers.reuse.enable", "true");
@@ -201,7 +201,7 @@ public void shouldNotReadReuseFromClasspathProperties() {
     }
 
     @Test
-    public void shouldReadReuseFromUserProperties() {
+    void shouldReadReuseFromUserProperties() {
         assertThat(newConfig().environmentSupportsReuse()).as("no reuse by default").isFalse();
 
         userProperties.setProperty("testcontainers.reuse.enable", "true");
@@ -209,7 +209,7 @@ public void shouldReadReuseFromUserProperties() {
     }
 
     @Test
-    public void shouldReadReuseFromEnvironment() {
+    void shouldReadReuseFromEnvironment() {
         assertThat(newConfig().environmentSupportsReuse()).as("no reuse by default").isFalse();
 
         userProperties.remove("testcontainers.reuse.enable");
@@ -218,7 +218,7 @@ public void shouldReadReuseFromEnvironment() {
     }
 
     @Test
-    public void shouldTrimImageNames() {
+    void shouldTrimImageNames() {
         userProperties.setProperty("ryuk.container.image", " testcontainers/ryuk:0.3.2 ");
         assertThat(newConfig().getRyukImage())
             .as("trailing whitespace was not removed from image name property")

From 2d15014fc6f5357071e58d91a93901ef6f59059c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 24 Sep 2025 16:47:01 -0600
Subject: [PATCH 4579/4969] Move Selenium tests to JUnit Jupiter (#10804)

---
 modules/selenium/build.gradle                 |  7 +++
 .../junit/BaseWebDriverContainerTest.java     | 10 ++--
 .../junit/BrowserWebDriverContainerTest.java  | 16 +++---
 ...ChromeRecordingWebDriverContainerTest.java | 54 +++++++++----------
 .../junit/ChromeWebDriverContainerTest.java   | 16 +++---
 .../ContainerWithoutCapabilitiesTest.java     | 18 ++++---
 ...stomWaitTimeoutWebDriverContainerTest.java | 12 ++---
 .../junit/EdgeWebDriverContainerTest.java     | 13 +++--
 .../junit/FirefoxWebDriverContainerTest.java  | 16 +++---
 .../LocalServerWebDriverContainerTest.java    | 13 +++--
 .../junit/SeleniumStartTest.java              | 15 +++---
 .../junit/SeleniumUtilsTest.java              |  8 +--
 ...ecificImageNameWebDriverContainerTest.java |  9 ++--
 13 files changed, 102 insertions(+), 105 deletions(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index d324b0d7d39..b4eff2f2656 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.13.0')
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-edge-driver'
@@ -17,3 +20,7 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
index 97124802de1..bb35b664301 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
@@ -1,6 +1,5 @@
 package org.testcontainers.junit;
 
-import org.junit.ClassRule;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebElement;
@@ -15,15 +14,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- *
- */
 public class BaseWebDriverContainerTest {
 
-    @ClassRule
     public static Network NETWORK = Network.newNetwork();
 
-    @ClassRule
     public static GenericContainer<?> HELLO_WORLD = new GenericContainer<>(
         DockerImageName.parse("testcontainers/helloworld:1.1.0")
     )
@@ -32,6 +26,10 @@ public class BaseWebDriverContainerTest {
         .withExposedPorts(8080, 8081)
         .waitingFor(new HttpWaitStrategy());
 
+    static {
+        HELLO_WORLD.start();
+    }
+
     protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule, Capabilities capabilities) {
         RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
         driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
index 370d9cffedb..d41b59fe7ed 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
@@ -3,8 +3,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
@@ -14,15 +13,16 @@
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
-public class BrowserWebDriverContainerTest {
+class BrowserWebDriverContainerTest {
 
     private static final String NO_PROXY_KEY = "no_proxy";
 
     private static final String NO_PROXY_VALUE = "localhost,.noproxy-domain.com";
 
     @Test
-    public void honorPresetNoProxyEnvironment() {
+    void honorPresetNoProxyEnvironment() {
         try (
             BrowserWebDriverContainer chromeWithNoProxySet = (BrowserWebDriverContainer) new BrowserWebDriverContainer()
                 .withCapabilities(new ChromeOptions())
@@ -36,7 +36,7 @@ public void honorPresetNoProxyEnvironment() {
     }
 
     @Test
-    public void provideDefaultNoProxyEnvironmentIfNotSet() {
+    void provideDefaultNoProxyEnvironmentIfNotSet() {
         try (
             BrowserWebDriverContainer chromeWithoutNoProxySet = new BrowserWebDriverContainer()
                 .withCapabilities(new ChromeOptions())
@@ -49,8 +49,8 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
     }
 
     @Test
-    public void createContainerWithShmVolume() {
-        Assume.assumeFalse("SHM isn't mounted on Windows", SystemUtils.IS_OS_WINDOWS);
+    void createContainerWithShmVolume() {
+        assumeThat(SystemUtils.IS_OS_WINDOWS).isTrue();
         try (
             BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer()
                 .withCapabilities(new FirefoxOptions())
@@ -66,7 +66,7 @@ public void createContainerWithShmVolume() {
     }
 
     @Test
-    public void createContainerWithoutShmVolume() {
+    void createContainerWithoutShmVolume() {
         try (
             BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer<>()
                 .withSharedMemorySize(512 * FileUtils.ONE_MB)
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index 8723d951d3e..2c6fa241469 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -1,11 +1,9 @@
 package org.testcontainers.junit;
 
 import com.google.common.io.PatternFilenameFilter;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode;
@@ -20,6 +18,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.Optional;
@@ -27,8 +26,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Enclosed.class)
-public class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContainerTest {
+class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     /**
      * Guaranty a minimum video length for FFmpeg re-encoding.
@@ -36,14 +34,15 @@ public class ChromeRecordingWebDriverContainerTest extends BaseWebDriverContaine
      */
     private static final int MINIMUM_VIDEO_DURATION_MILLISECONDS = 200;
 
-    public static class ChromeThatRecordsAllTests {
+    @Nested
+    class ChromeThatRecordsAllTests {
 
-        @Rule
-        public TemporaryFolder vncRecordingDirectory = new TemporaryFolder();
+        @TempDir
+        public Path vncRecordingDirectory;
 
         @Test
-        public void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() throws InterruptedException {
-            File target = vncRecordingDirectory.getRoot();
+        void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() throws InterruptedException {
+            File target = vncRecordingDirectory.toFile();
             try (
                 // recordAll {
                 // To do this, simply add extra parameters to the rule constructor, so video will default to FLV format:
@@ -80,12 +79,12 @@ public String getFilesystemFriendlyName() {
                 Optional.empty()
             );
 
-            return vncRecordingDirectory.getRoot().listFiles(new PatternFilenameFilter(fileNamePattern));
+            return vncRecordingDirectory.toFile().listFiles(new PatternFilenameFilter(fileNamePattern));
         }
 
         @Test
-        public void recordingTestShouldHaveFlvExtension() throws InterruptedException {
-            File target = vncRecordingDirectory.getRoot();
+        void recordingTestShouldHaveFlvExtension() throws InterruptedException {
+            File target = vncRecordingDirectory.toFile();
             try (
                 // recordFlv {
                 // Set (explicitly) FLV format for recorded video:
@@ -102,8 +101,8 @@ public void recordingTestShouldHaveFlvExtension() throws InterruptedException {
         }
 
         @Test
-        public void recordingTestShouldHaveMp4Extension() throws InterruptedException {
-            File target = vncRecordingDirectory.getRoot();
+        void recordingTestShouldHaveMp4Extension() throws InterruptedException {
+            File target = vncRecordingDirectory.toFile();
             try (
                 // recordMp4 {
                 // Set MP4 format for recorded video:
@@ -120,12 +119,12 @@ public void recordingTestShouldHaveMp4Extension() throws InterruptedException {
         }
 
         @Test
-        public void recordingTestThatShouldHaveCorrectDuration() throws IOException, InterruptedException {
+        void recordingTestThatShouldHaveCorrectDuration() throws IOException, InterruptedException {
             MountableFile mountableFile;
             try (
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
                     .withCapabilities(new ChromeOptions())
-                    .withRecordingMode(VncRecordingMode.RECORD_ALL, vncRecordingDirectory.getRoot())
+                    .withRecordingMode(VncRecordingMode.RECORD_ALL, vncRecordingDirectory.toFile())
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
             ) {
@@ -159,13 +158,14 @@ public void recordingTestThatShouldHaveCorrectDuration() throws IOException, Int
         }
     }
 
-    public static class ChromeThatRecordsFailingTests {
+    @Nested
+    class ChromeThatRecordsFailingTests {
 
-        @Rule
-        public TemporaryFolder vncRecordingDirectory = new TemporaryFolder();
+        @TempDir
+        public Path vncRecordingDirectory;
 
         @Test
-        public void recordingTestThatShouldBeRecordedButNotPersisted() {
+        void recordingTestThatShouldBeRecordedButNotPersisted() {
             try (
                 // withRecordingFileFactory {
                 BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
@@ -183,8 +183,8 @@ public void recordingTestThatShouldBeRecordedButNotPersisted() {
         }
 
         @Test
-        public void recordingTestThatShouldBeRecordedAndRetained() throws InterruptedException {
-            File target = vncRecordingDirectory.getRoot();
+        void recordingTestThatShouldBeRecordedAndRetained() throws InterruptedException {
+            File target = vncRecordingDirectory.toFile();
             try (
                 // recordFailing {
                 // or if you only want videos for test failures:
@@ -214,11 +214,11 @@ public String getFilesystemFriendlyName() {
                     Optional.of(new RuntimeException("Force writing of video file."))
                 );
 
-                String[] files = vncRecordingDirectory.getRoot().list(new PatternFilenameFilter("FAILED-.*\\.flv"));
+                String[] files = vncRecordingDirectory.toFile().list(new PatternFilenameFilter("FAILED-.*\\.flv"));
                 assertThat(files).as("recorded file count").hasSize(1);
             }
         }
 
-        private static class CustomRecordingFileFactory extends DefaultRecordingFileFactory {}
+        class CustomRecordingFileFactory extends DefaultRecordingFileFactory {}
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
index 2f0bfc27b0d..33809568aa6 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
@@ -1,30 +1,26 @@
 package org.testcontainers.junit;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
-/**
- *
- */
-public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest {
+class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
-    @Rule
     public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
         .withCapabilities(new ChromeOptions())
         // }
         .withNetwork(NETWORK);
 
-    @Before
+    @BeforeEach
     public void checkBrowserIsIndeedChrome() {
+        chrome.start();
         assertBrowserNameIs(chrome, "chrome", new ChromeOptions());
     }
 
     @Test
-    public void simpleExploreTest() {
+    void simpleExploreTest() {
         doSimpleExplore(chrome, new ChromeOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
index f5c03fb32d1..2ffc407a9e4 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
@@ -1,22 +1,28 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
-public class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest {
+class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest {
 
-    @Rule
+    @AutoClose
     public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>().withNetwork(NETWORK);
 
+    @BeforeEach
+    public void setUp() {
+        chrome.start();
+    }
+
     @Test
-    public void chromeIsStartedIfNoCapabilitiesProvided() {
+    void chromeIsStartedIfNoCapabilitiesProvided() {
         assertBrowserNameIs(chrome, "chrome", new ChromeOptions());
     }
 
     @Test
-    public void simpleExploreTestWhenNoCapabilitiesProvided() {
+    void simpleExploreTestWhenNoCapabilitiesProvided() {
         doSimpleExplore(chrome, new ChromeOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
index 43639010e59..757be9a3a3d 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
@@ -1,26 +1,22 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 
-/**
- *
- */
-public class CustomWaitTimeoutWebDriverContainerTest extends BaseWebDriverContainerTest {
+class CustomWaitTimeoutWebDriverContainerTest extends BaseWebDriverContainerTest {
 
-    @Rule
     public BrowserWebDriverContainer<?> chromeWithCustomTimeout = new BrowserWebDriverContainer<>()
         .withCapabilities(new ChromeOptions())
         .withStartupTimeout(Duration.of(30, ChronoUnit.SECONDS))
         .withNetwork(NETWORK);
 
     @Test
-    public void simpleExploreTest() {
+    void simpleExploreTest() {
+        chromeWithCustomTimeout.start();
         doSimpleExplore(chromeWithCustomTimeout, new ChromeOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java
index f1935fa84ee..40904cff369 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java
@@ -1,27 +1,26 @@
 package org.testcontainers.junit;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.edge.EdgeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
-public class EdgeWebDriverContainerTest extends BaseWebDriverContainerTest {
+class EdgeWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
-    @Rule
     public BrowserWebDriverContainer<?> edge = new BrowserWebDriverContainer<>()
         .withCapabilities(new EdgeOptions())
         // }
         .withNetwork(NETWORK);
 
-    @Before
+    @BeforeEach
     public void checkBrowserIsIndeedMSEdge() {
+        edge.start();
         assertBrowserNameIs(edge, "msedge", new EdgeOptions());
     }
 
     @Test
-    public void simpleExploreTest() {
+    void simpleExploreTest() {
         doSimpleExplore(edge, new EdgeOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
index 211800b8fad..e5003f6ae12 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
@@ -1,30 +1,26 @@
 package org.testcontainers.junit;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
-/**
- *
- */
-public class FirefoxWebDriverContainerTest extends BaseWebDriverContainerTest {
+class FirefoxWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
-    @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>()
         .withCapabilities(new FirefoxOptions())
         // }
         .withNetwork(NETWORK);
 
-    @Before
+    @BeforeEach
     public void checkBrowserIsIndeedFirefox() {
+        firefox.start();
         assertBrowserNameIs(firefox, "firefox", new FirefoxOptions());
     }
 
     @Test
-    public void simpleExploreTest() {
+    void simpleExploreTest() {
         doSimpleExplore(firefox, new FirefoxOptions());
     }
 }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
index 8d29cb57310..0c93fde97dc 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
@@ -1,8 +1,7 @@
 package org.testcontainers.junit;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.bio.SocketConnector;
 import org.mortbay.jetty.handler.ResourceHandler;
@@ -18,17 +17,17 @@
  * Test that a browser running in a container can access a web server hosted on the host machine (i.e. the one running
  * the tests)
  */
-public class LocalServerWebDriverContainerTest {
+class LocalServerWebDriverContainerTest {
 
-    @Rule
     public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
         .withAccessToHost(true)
         .withCapabilities(new ChromeOptions());
 
     private int localPort;
 
-    @Before
+    @BeforeEach
     public void setupLocalServer() throws Exception {
+        chrome.start();
         // Set up a local Jetty HTTP server
         Server server = new Server();
         server.addConnector(new SocketConnector());
@@ -42,7 +41,7 @@ public void setupLocalServer() throws Exception {
     }
 
     @Test
-    public void testConnection() {
+    void testConnection() {
         // getWebDriver {
         RemoteWebDriver driver = new RemoteWebDriver(chrome.getSeleniumAddress(), new ChromeOptions());
         // }
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
index b399cabf9ed..a1923b0264e 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
@@ -1,8 +1,9 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -10,19 +11,19 @@
 /**
  * Simple test to check that readiness detection works correctly across major versions of the containers.
  */
-@RunWith(Parameterized.class)
+@ParameterizedClass(name = "tag: {0}")
+@MethodSource("data")
 public class SeleniumStartTest {
 
-    @Parameterized.Parameters(name = "tag: {0}")
     public static String[] data() {
         return new String[] { "4.0.0", "3.4.0", "2.53.0" };
     }
 
-    @Parameterized.Parameter
+    @Parameter
     public String tag;
 
     @Test
-    public void testAdditionalStartupString() {
+    void testAdditionalStartupString() {
         final DockerImageName imageName = DockerImageName.parse("selenium/standalone-chrome").withTag(tag);
         try (
             BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>(imageName)
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
index 6208cb3a5bb..b9c2125f93b 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumUtilsTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.SeleniumUtils;
 
 import java.io.IOException;
@@ -11,15 +11,15 @@
 /**
  * Created by Julien LAMY
  */
-public class SeleniumUtilsTest {
+class SeleniumUtilsTest {
 
     @Test
-    public void detectSeleniumVersionUnder3() throws IOException {
+    void detectSeleniumVersionUnder3() throws IOException {
         checkSeleniumVersionDetected("manifests/MANIFEST-2.45.0.MF", "2.45.0");
     }
 
     @Test
-    public void detectSeleniumVersionUpper3() throws IOException {
+    void detectSeleniumVersionUpper3() throws IOException {
         checkSeleniumVersionDetected("manifests/MANIFEST-3.5.2.MF", "3.5.2");
     }
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
index 9f0d9035f44..f8e6c739b82 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
@@ -1,22 +1,21 @@
 package org.testcontainers.junit;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.utility.DockerImageName;
 
-public class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
+class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox:4.10.0");
 
-    @Rule
     public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
         .withCapabilities(new FirefoxOptions())
         .withNetwork(NETWORK);
 
     @Test
-    public void simpleExploreTest() {
+    void simpleExploreTest() {
+        firefox.start();
         doSimpleExplore(firefox, new FirefoxOptions());
     }
 }

From 6472f4bf4996b3c7d1f7b41a6038e95117bc1b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 25 Sep 2025 19:10:34 -0600
Subject: [PATCH 4580/4969] Fix missing junit4 leftovers (#10808)

---
 .../jdbc/AbstractJDBCDriverTest.java          |  4 ++--
 ...tLifecycleAwareExceptionCapturingTest.java |  6 ++---
 .../junit/mariadb/SimpleMariaDBTest.java      |  3 +--
 .../containers/RecordingFileFactory.java      | 10 --------
 .../DefaultRecordingFileFactoryTest.java      | 23 ++++++++-----------
 5 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index ff844b8988b..95f9d5d1ad4 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -17,7 +17,7 @@
 import java.util.EnumSet;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeFalse;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 @ParameterizedClass
 @MethodSource("data")
@@ -207,7 +207,7 @@ private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException
     }
 
     private void performTestForCustomIniFile(HikariDataSource dataSource) throws SQLException {
-        assumeFalse(SystemUtils.IS_OS_WINDOWS);
+        assumeThat(SystemUtils.IS_OS_WINDOWS).isFalse();
         Statement statement = dataSource.getConnection().createStatement();
         statement.execute("SELECT @@GLOBAL.innodb_max_undo_log_size");
         ResultSet resultSet = statement.getResultSet();
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
index b64f2f3c328..0e7a750ce22 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.TestMethodOrder;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 // The order of @ExtendsWith and @Testcontainers is crucial in order for the tests
 @Testcontainers
@@ -24,7 +24,7 @@ class TestLifecycleAwareExceptionCapturingTest {
     void failing_test_should_pass_throwable_to_testContainer() {
         startedTestContainer = testContainer;
         // Force an exception that is captured by the test container without failing the test itself
-        assumeTrue(false);
+        assumeThat(false).isTrue();
     }
 
     @Test
@@ -32,6 +32,6 @@ void failing_test_should_pass_throwable_to_testContainer() {
     void should_have_captured_thrownException() {
         Throwable capturedThrowable = startedTestContainer.getCapturedThrowable();
         assertThat(capturedThrowable).isInstanceOf(AssumptionViolatedException.class);
-        assertThat(capturedThrowable.getMessage()).isEqualTo("got: <false>, expected: is <true>");
+        assertThat(capturedThrowable.getMessage()).contains("Expecting value to be true but was false");
     }
 }
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
index 9b7fab4daaf..4e88c8981eb 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
@@ -19,7 +19,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
-import static org.junit.Assume.assumeFalse;
 
 class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
 
@@ -58,7 +57,7 @@ void testSpecificVersion() throws SQLException {
 
     @Test
     void testMariaDBWithCustomIniFile() throws SQLException {
-        assumeFalse(SystemUtils.IS_OS_WINDOWS);
+        assumeThat(SystemUtils.IS_OS_WINDOWS).isFalse();
 
         try (
             MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java b/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
index 31946dac59e..9f3795f7cb8 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/RecordingFileFactory.java
@@ -1,20 +1,10 @@
 package org.testcontainers.containers;
 
-import org.junit.runner.Description;
 import org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
 
 import java.io.File;
 
 public interface RecordingFileFactory {
-    @Deprecated
-    default File recordingFileForTest(File vncRecordingDirectory, Description description, boolean succeeded) {
-        return recordingFileForTest(
-            vncRecordingDirectory,
-            description.getTestClass().getSimpleName() + "-" + description.getMethodName(),
-            succeeded
-        );
-    }
-
     default File recordingFileForTest(
         File vncRecordingDirectory,
         String prefix,
diff --git a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
index aa894810930..03540e54b01 100644
--- a/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/containers/DefaultRecordingFileFactoryTest.java
@@ -1,10 +1,10 @@
 package org.testcontainers.containers;
 
 import lombok.Value;
-import org.junit.Test;
-import org.junit.runner.Description;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -17,9 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("data")
 @Value
-public class DefaultRecordingFileFactoryTest {
+class DefaultRecordingFileFactoryTest {
 
     private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("YYYYMMdd-HHmmss");
 
@@ -31,7 +32,6 @@ public class DefaultRecordingFileFactoryTest {
 
     private final boolean success;
 
-    @Parameterized.Parameters
     public static Collection<Object[]> data() {
         Collection<Object[]> args = new ArrayList<>();
         args.add(new Object[] { "testMethod1", "FAILED", Boolean.FALSE });
@@ -40,13 +40,10 @@ public static Collection<Object[]> data() {
     }
 
     @Test
-    public void recordingFileThatShouldDescribeTheTestResultAtThePresentTime() throws Exception {
+    public void recordingFileThatShouldDescribeTheTestResultAtThePresentTime(TestInfo testInfo) throws Exception {
         File vncRecordingDirectory = Files.createTempDirectory("recording").toFile();
-        Description description = Description.createTestDescription(
-            getClass().getCanonicalName(),
-            methodName,
-            Test.class
-        );
+        String className = testInfo.getTestClass().orElseThrow(IllegalStateException::new).getSimpleName();
+        String description = className + "-" + methodName;
 
         File recordingFile = factory.recordingFileForTest(vncRecordingDirectory, description, success);
 

From c7622b4aee381b8258dee0abb8be297da9e2e40f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 25 Sep 2025 20:04:43 -0600
Subject: [PATCH 4581/4969] Remove JUnit 4 support (#10805)

Fixes #970
---
 core/build.gradle                             | 23 +++++++-
 .../containers/ComposeContainer.java          | 30 +---------
 .../containers/DockerComposeContainer.java    | 32 +----------
 .../FailureDetectingExternalResource.java     | 50 -----------------
 .../containers/GenericContainer.java          | 56 -------------------
 .../testcontainers/containers/Network.java    | 11 +---
 .../containers/ExposedHostTest.java           |  7 ---
 .../FailureDetectingExternalResourceTest.java | 28 ----------
 .../junit/DockerComposeLogConsumerTest.java   |  5 +-
 ...tLifecycleAwareExceptionCapturingTest.java |  4 +-
 settings.gradle                               |  2 -
 11 files changed, 29 insertions(+), 219 deletions(-)
 delete mode 100644 core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java
 delete mode 100644 core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java

diff --git a/core/build.gradle b/core/build.gradle
index b4eeae7b0c5..1768cb703ff 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -49,13 +49,33 @@ tasks.japicmp {
 
     classExcludes = [
         "org.testcontainers.utility.RyukResourceReaper",
+        "org.testcontainers.containers.FailureDetectingExternalResource",
+        "org.testcontainers.containers.ComposeContainer",
+        "org.testcontainers.containers.DockerComposeContainer",
+        "org.testcontainers.containers.GenericContainer"
     ]
 
     methodExcludes = [
         "org.testcontainers.containers.Container#getDockerClient()",
         "org.testcontainers.containers.ContainerState#getDockerClient()",
         "org.testcontainers.containers.ContainerState#execInContainer(org.testcontainers.containers.ExecConfig)",
-        "org.testcontainers.containers.ContainerState#execInContainer(java.nio.charset.Charset,org.testcontainers.containers.ExecConfig)"
+        "org.testcontainers.containers.ContainerState#execInContainer(java.nio.charset.Charset,org.testcontainers.containers.ExecConfig)",
+        "org.testcontainers.containers.ComposeContainer#apply(org.junit.runners.model.Statement, org.junit.runner.Description)",
+        "org.testcontainers.containers.ComposeContainer#failed(java.lang.Throwable, org.junit.runner.Description)",
+        "org.testcontainers.containers.ComposeContainer#finished(org.junit.runner.Description)",
+        "org.testcontainers.containers.ComposeContainer#starting(org.junit.runner.Description)",
+        "org.testcontainers.containers.ComposeContainer#succeeded(org.junit.runner.Description)",
+        "org.testcontainers.containers.DockerComposeContainer#apply(org.junit.runners.model.Statement, org.junit.runner.Description)",
+        "org.testcontainers.containers.DockerComposeContainer#failed(java.lang.Throwable, org.junit.runner.Description)",
+        "org.testcontainers.containers.DockerComposeContainer#finished(org.junit.runner.Description)",
+        "org.testcontainers.containers.DockerComposeContainer#starting(org.junit.runner.Description)",
+        "org.testcontainers.containers.DockerComposeContainer#succeeded(org.junit.runner.Description)",
+        "org.testcontainers.containers.GenericContainer#apply(org.junit.runners.model.Statement, org.junit.runner.Description)",
+        "org.testcontainers.containers.GenericContainer#failed(java.lang.Throwable, org.junit.runner.Description)",
+        "org.testcontainers.containers.GenericContainer#finished(org.junit.runner.Description)",
+        "org.testcontainers.containers.GenericContainer#starting(org.junit.runner.Description)",
+        "org.testcontainers.containers.GenericContainer#succeeded(org.junit.runner.Description)",
+        'org.testcontainers.containers.Network$NetworkImpl#after()'
     ]
 
     fieldExcludes = []
@@ -69,7 +89,6 @@ configurations.all {
 }
 
 dependencies {
-    api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
     testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
index 79d706d3b6a..e8061363a18 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
@@ -5,8 +5,6 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SystemUtils;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
@@ -31,7 +29,7 @@
  * It uses either Compose V2 contained within the Docker binary, or a containerised version of Compose V2.
  */
 @Slf4j
-public class ComposeContainer extends FailureDetectingExternalResource implements Startable {
+public class ComposeContainer implements Startable {
 
     private final Map<String, Integer> scalingPreferences = new HashMap<>();
 
@@ -93,32 +91,6 @@ public ComposeContainer(String identifier, List<File> composeFiles) {
         this.project = this.composeDelegate.getProject();
     }
 
-    @Override
-    @Deprecated
-    public Statement apply(Statement base, Description description) {
-        return super.apply(base, description);
-    }
-
-    @Override
-    @Deprecated
-    public void starting(Description description) {
-        start();
-    }
-
-    @Override
-    @Deprecated
-    protected void succeeded(Description description) {}
-
-    @Override
-    @Deprecated
-    protected void failed(Throwable e, Description description) {}
-
-    @Override
-    @Deprecated
-    public void finished(Description description) {
-        stop();
-    }
-
     @Override
     public void start() {
         synchronized (MUTEX) {
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index 92dc75b6cde..dd06b181b42 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -5,8 +5,6 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SystemUtils;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
@@ -30,9 +28,7 @@
  * Container which launches Docker Compose, for the purposes of launching a defined set of containers.
  */
 @Slf4j
-public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
-    extends FailureDetectingExternalResource
-    implements Startable {
+public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> implements Startable {
 
     private final Map<String, Integer> scalingPreferences = new HashMap<>();
 
@@ -99,32 +95,6 @@ public DockerComposeContainer(String identifier, List<File> composeFiles) {
         this.project = this.composeDelegate.getProject();
     }
 
-    @Override
-    @Deprecated
-    public Statement apply(Statement base, Description description) {
-        return super.apply(base, description);
-    }
-
-    @Override
-    @Deprecated
-    public void starting(Description description) {
-        start();
-    }
-
-    @Override
-    @Deprecated
-    protected void succeeded(Description description) {}
-
-    @Override
-    @Deprecated
-    protected void failed(Throwable e, Description description) {}
-
-    @Override
-    @Deprecated
-    public void finished(Description description) {
-        stop();
-    }
-
     @Override
     public void start() {
         synchronized (MUTEX) {
diff --git a/core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java b/core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java
deleted file mode 100644
index 71344267d32..00000000000
--- a/core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.testcontainers.containers;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.MultipleFailureException;
-import org.junit.runners.model.Statement;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * {@link TestRule} which is called before and after each test, and also is notified on success/failure.
- *
- * This mimics the behaviour of TestWatcher to some degree, but failures occurring in this rule do not
- * contribute to the overall failure count (which can otherwise cause strange negative test success
- * figures).
- */
-public class FailureDetectingExternalResource implements TestRule {
-
-    @Override
-    public Statement apply(Statement base, Description description) {
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                List<Throwable> errors = new ArrayList<Throwable>();
-
-                try {
-                    starting(description);
-                    base.evaluate();
-                    succeeded(description);
-                } catch (Throwable e) {
-                    errors.add(e);
-                    failed(e, description);
-                } finally {
-                    finished(description);
-                }
-
-                MultipleFailureException.assertEmpty(errors);
-            }
-        };
-    }
-
-    protected void starting(Description description) {}
-
-    protected void succeeded(Description description) {}
-
-    protected void failed(Throwable e, Description description) {}
-
-    protected void finished(Description description) {}
-}
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index acd70f69cab..0fe944433ae 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -32,8 +32,6 @@
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
@@ -52,8 +50,6 @@
 import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.lifecycle.Startables;
-import org.testcontainers.lifecycle.TestDescription;
-import org.testcontainers.lifecycle.TestLifecycleAware;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.CommandLine;
 import org.testcontainers.utility.DockerImageName;
@@ -106,7 +102,6 @@
  */
 @Data
 public class GenericContainer<SELF extends GenericContainer<SELF>>
-    extends FailureDetectingExternalResource
     implements Container<SELF>, AutoCloseable, WaitStrategyTarget, Startable {
 
     public static final int CONTAINER_RUNNING_TIMEOUT_SEC = 30;
@@ -1053,57 +1048,6 @@ public void addExposedPorts(int... ports) {
         this.containerDef.addExposedTcpPorts(ports);
     }
 
-    private TestDescription toDescription(Description description) {
-        return new TestDescription() {
-            @Override
-            public String getTestId() {
-                return description.getDisplayName();
-            }
-
-            @Override
-            public String getFilesystemFriendlyName() {
-                return description.getClassName() + "-" + description.getMethodName();
-            }
-        };
-    }
-
-    @Override
-    @Deprecated
-    public Statement apply(Statement base, Description description) {
-        return super.apply(base, description);
-    }
-
-    @Override
-    @Deprecated
-    protected void starting(Description description) {
-        if (this instanceof TestLifecycleAware) {
-            ((TestLifecycleAware) this).beforeTest(toDescription(description));
-        }
-        this.start();
-    }
-
-    @Override
-    @Deprecated
-    protected void succeeded(Description description) {
-        if (this instanceof TestLifecycleAware) {
-            ((TestLifecycleAware) this).afterTest(toDescription(description), Optional.empty());
-        }
-    }
-
-    @Override
-    @Deprecated
-    protected void failed(Throwable e, Description description) {
-        if (this instanceof TestLifecycleAware) {
-            ((TestLifecycleAware) this).afterTest(toDescription(description), Optional.of(e));
-        }
-    }
-
-    @Override
-    @Deprecated
-    protected void finished(Description description) {
-        this.stop();
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
index 88ddd6dd906..27cab80c652 100644
--- a/core/src/main/java/org/testcontainers/containers/Network.java
+++ b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -4,8 +4,6 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Singular;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.TestRule;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.utility.ResourceReaper;
 
@@ -17,7 +15,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
-public interface Network extends AutoCloseable, TestRule {
+public interface Network extends AutoCloseable {
     Network SHARED = new NetworkImpl(false, null, Collections.emptySet(), null) {
         @Override
         public void close() {
@@ -40,7 +38,7 @@ static NetworkImpl.NetworkImplBuilder builder() {
 
     @Builder
     @Getter
-    class NetworkImpl extends ExternalResource implements Network {
+    class NetworkImpl implements Network {
 
         private final String name = UUID.randomUUID().toString();
 
@@ -100,11 +98,6 @@ private String create() {
             return createNetworkCmd.exec().getId();
         }
 
-        @Override
-        protected void after() {
-            close();
-        }
-
         @Override
         public synchronized void close() {
             if (initialized.getAndSet(false)) {
diff --git a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
index 39c986d1f8a..50bd17d0f0d 100644
--- a/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ExposedHostTest.java
@@ -7,8 +7,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;
 import org.testcontainers.Testcontainers;
@@ -189,11 +187,6 @@ public String getId() {
 
             @Override
             public void close() {}
-
-            @Override
-            public Statement apply(Statement base, Description description) {
-                return null;
-            }
         };
 
         List<com.github.dockerjava.api.model.Network> networks = DockerClientFactory
diff --git a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
deleted file mode 100644
index b2abf02bce5..00000000000
--- a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.testcontainers.containers;
-
-import org.junit.jupiter.api.Test;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-class FailureDetectingExternalResourceTest {
-
-    @Test
-    void finishedIsCalledForCleanupIfStartingThrows() {
-        FailureDetectingExternalResource res = spy(FailureDetectingExternalResource.class);
-        Statement stmt = res.apply(mock(Statement.class), Description.EMPTY);
-        doThrow(new RuntimeException()).when(res).starting(any());
-        try {
-            stmt.evaluate();
-        } catch (Throwable t) {
-            // ignore
-        }
-        verify(res).starting(any());
-        verify(res).finished(any());
-    }
-}
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
index a712fb19664..7b9100d1e35 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
@@ -1,7 +1,6 @@
 package org.testcontainers.junit;
 
 import org.junit.jupiter.api.Test;
-import org.junit.runner.Description;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
 import org.testcontainers.containers.output.WaitingConsumer;
@@ -22,7 +21,7 @@ void testLogConsumer() throws TimeoutException {
             .withLogConsumer("redis_1", logConsumer);
 
         try {
-            environment.starting(Description.EMPTY);
+            environment.start();
             logConsumer.waitUntil(
                 frame -> {
                     return (
@@ -34,7 +33,7 @@ void testLogConsumer() throws TimeoutException {
                 TimeUnit.SECONDS
             );
         } finally {
-            environment.finished(Description.EMPTY);
+            environment.stop();
         }
     }
 }
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
index 0e7a750ce22..a6647aa3e52 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareExceptionCapturingTest.java
@@ -1,10 +1,10 @@
 package org.testcontainers.junit.jupiter;
 
-import org.junit.AssumptionViolatedException;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.opentest4j.TestAbortedException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
@@ -31,7 +31,7 @@ void failing_test_should_pass_throwable_to_testContainer() {
     @Order(2)
     void should_have_captured_thrownException() {
         Throwable capturedThrowable = startedTestContainer.getCapturedThrowable();
-        assertThat(capturedThrowable).isInstanceOf(AssumptionViolatedException.class);
+        assertThat(capturedThrowable).isInstanceOf(TestAbortedException.class);
         assertThat(capturedThrowable.getMessage()).contains("Expecting value to be true but was false");
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 0d13ebcc3fe..6784ae93160 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,8 +27,6 @@ file('modules').eachDir { dir ->
     project(":testcontainers-${dir.name}").projectDir = dir
 }
 
-include ':docs:examples:junit4:generic'
-include ':docs:examples:junit4:redis'
 include ':docs:examples:junit5:redis'
 include ':docs:examples:spock:redis'
 

From 233221d500138234c3607163f6c5ddb3fefd402f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 01:14:39 +0000
Subject: [PATCH 4582/4969] Bump org.assertj:assertj-core from 3.27.4 to 3.27.6
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.4 to 3.27.6.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.4...assertj-build-3.27.6)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1768cb703ff..c967de76bfd 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -149,7 +149,7 @@ dependencies {
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     jarFileTestImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.27.4'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.27.6'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 559df369820cd6b29e144afe5629532567ce4525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 1 Oct 2025 14:21:51 -0600
Subject: [PATCH 4583/4969] Update java version in .sdkmanrc

---
 .sdkmanrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.sdkmanrc b/.sdkmanrc
index b9fe931c084..1c5feb60c95 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.12-tem
+java=17.0.16-tem

From 918e448f02ce724ed8c23e1757f1e50200fa32eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 22:00:54 +0000
Subject: [PATCH 4584/4969] Bump org.apache.tomcat:tomcat-jdbc in
 /modules/jdbc-test

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.10 to 11.0.11.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1136c2b44b0..8f39707705a 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.27.4'
 
-    api 'org.apache.tomcat:tomcat-jdbc:11.0.10'
+    api 'org.apache.tomcat:tomcat-jdbc:11.0.11'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'mysql:mysql-connector-java:8.0.33'
     api 'org.junit.jupiter:junit-jupiter:5.13.4'

From a0f2610d11bbfce1a140f911d5d87850f9fb81f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 22:00:56 +0000
Subject: [PATCH 4585/4969] Bump org.apache.commons:commons-lang3 in
 /modules/jdbc-test

Bumps org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1136c2b44b0..490d2d4653f 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     api 'com.google.guava:guava:33.4.8-jre'
-    api 'org.apache.commons:commons-lang3:3.18.0'
+    api 'org.apache.commons:commons-lang3:3.19.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 

From 6093e2b14c3f4353acd94fff66f25f791799c3ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 22:01:00 +0000
Subject: [PATCH 4586/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.4 to 3.27.6.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.4...assertj-build-3.27.6)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1136c2b44b0..a3ad1c65928 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 
-    api 'org.assertj:assertj-core:3.27.4'
+    api 'org.assertj:assertj-core:3.27.6'
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.10'
     api 'org.vibur:vibur-dbcp:26.0'

From 4319dde76bd4501d712ee6862ad5b96e08c95ce4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 22:01:07 +0000
Subject: [PATCH 4587/4969] Bump com.google.guava:guava in /modules/jdbc-test

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.8-jre to 33.5.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.5.0-jre
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1136c2b44b0..20b6371c843 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':testcontainers-jdbc')
 
-    api 'com.google.guava:guava:33.4.8-jre'
+    api 'com.google.guava:guava:33.5.0-jre'
     api 'org.apache.commons:commons-lang3:3.18.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'

From 7317fa2a6a1f60a167c8c4947a06ca7d235d5260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 2 Oct 2025 12:45:51 -0600
Subject: [PATCH 4588/4969] Centralize junit jupiter and assertj dependencies
 (#11067)

---
 build.gradle                          |  6 ++++++
 modules/activemq/build.gradle         |  8 --------
 modules/azure/build.gradle            |  8 --------
 modules/cassandra/build.gradle        |  9 ---------
 modules/chromadb/build.gradle         |  8 --------
 modules/clickhouse/build.gradle       |  8 --------
 modules/cockroachdb/build.gradle      |  7 -------
 modules/consul/build.gradle           |  8 --------
 modules/couchbase/build.gradle        |  8 --------
 modules/cratedb/build.gradle          |  6 ------
 modules/database-commons/build.gradle |  9 ---------
 modules/databend/build.gradle         |  8 --------
 modules/db2/build.gradle              |  8 --------
 modules/elasticsearch/build.gradle    |  8 --------
 modules/gcloud/build.gradle           |  8 --------
 modules/grafana/build.gradle          |  8 --------
 modules/hivemq/build.gradle           |  7 -------
 modules/influxdb/build.gradle         |  8 --------
 modules/jdbc/build.gradle             |  8 --------
 modules/junit-jupiter/build.gradle    | 10 ----------
 modules/k3s/build.gradle              |  8 --------
 modules/k6/build.gradle               |  9 ---------
 modules/kafka/build.gradle            |  9 ---------
 modules/ldap/build.gradle             |  9 ---------
 modules/localstack/build.gradle       |  8 --------
 modules/mariadb/build.gradle          |  7 -------
 modules/milvus/build.gradle           |  8 --------
 modules/minio/build.gradle            |  8 --------
 modules/mockserver/build.gradle       |  8 --------
 modules/mongodb/build.gradle          |  9 ---------
 modules/mssqlserver/build.gradle      |  7 -------
 modules/mysql/build.gradle            |  7 -------
 modules/neo4j/build.gradle            |  8 --------
 modules/nginx/build.gradle            |  9 ---------
 modules/oceanbase/build.gradle        |  7 -------
 modules/ollama/build.gradle           |  8 --------
 modules/openfga/build.gradle          |  5 -----
 modules/oracle-free/build.gradle      |  7 -------
 modules/oracle-xe/build.gradle        |  7 -------
 modules/orientdb/build.gradle         |  8 --------
 modules/pinecone/build.gradle         |  8 --------
 modules/postgresql/build.gradle       |  7 -------
 modules/presto/build.gradle           |  7 -------
 modules/pulsar/build.gradle           |  9 ---------
 modules/qdrant/build.gradle           |  8 --------
 modules/questdb/build.gradle          |  7 -------
 modules/r2dbc/build.gradle            |  8 --------
 modules/rabbitmq/build.gradle         |  8 --------
 modules/redpanda/build.gradle         |  8 --------
 modules/scylladb/build.gradle         |  8 --------
 modules/selenium/build.gradle         |  8 --------
 modules/solace/build.gradle           |  9 ---------
 modules/solr/build.gradle             |  9 ---------
 modules/spock/build.gradle            |  7 -------
 modules/tidb/build.gradle             |  7 -------
 modules/timeplus/build.gradle         |  8 --------
 modules/toxiproxy/build.gradle        |  8 --------
 modules/trino/build.gradle            |  7 -------
 modules/typesense/build.gradle        |  8 --------
 modules/vault/build.gradle            |  9 ---------
 modules/weaviate/build.gradle         |  8 --------
 modules/yugabytedb/build.gradle       |  7 -------
 62 files changed, 6 insertions(+), 481 deletions(-)

diff --git a/build.gradle b/build.gradle
index b4f97c3eaa5..2f0c485d25f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,6 +89,8 @@ subprojects {
     }
 
     test {
+        useJUnitPlatform()
+
         defaultCharacterEncoding = "UTF-8"
         testLogging {
             displayGranularity 1
@@ -133,6 +135,10 @@ subprojects {
 
     dependencies {
         testImplementation 'ch.qos.logback:logback-classic:1.3.15'
+        testImplementation 'org.assertj:assertj-core:3.27.4'
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+
+        testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     }
 
     checkstyle {
diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 8c209d2dd49..f0ad74ba76b 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,14 +3,6 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation "org.apache.activemq:activemq-client:6.1.7"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 226f668e954..517a981b707 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -6,10 +6,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
     testImplementation 'com.azure:azure-cosmos'
     testImplementation 'com.azure:azure-storage-blob'
@@ -19,7 +15,3 @@ dependencies {
     testImplementation 'com.azure:azure-messaging-servicebus'
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
index de228376595..b0bea00226e 100644
--- a/modules/cassandra/build.gradle
+++ b/modules/cassandra/build.gradle
@@ -10,14 +10,5 @@ dependencies {
     api project(":testcontainers-database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index def6310b420..cec94a23faa 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -3,13 +3,5 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 3fc372b2891..30460232a39 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -10,15 +10,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.1', classifier: 'all')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.clickhouse:client-v2:0.9.1'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 8107fc92f6a..71508c7a791 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -4,11 +4,8 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -16,7 +13,3 @@ tasks.japicmp {
         "org.testcontainers.containers.CockroachContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index a3f6d93dbe2..ff88de2db29 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -3,14 +3,6 @@ description = "Testcontainers :: Consul"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index b686c581dcf..b5ef595c685 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,12 +5,8 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.couchbase.client:java-client:3.9.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -18,7 +14,3 @@ tasks.japicmp {
         "org.testcontainers.couchbase.CouchbaseContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index f7bc059ced3..ae0bfc8ec93 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -4,14 +4,8 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 5193e6dfcf7..345b354d739 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -2,13 +2,4 @@ description = "Testcontainers :: Database-Commons"
 
 dependencies {
     api project(':testcontainers')
-
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 1535441e925..d9a5655b4ed 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -5,12 +5,4 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.databend:databend-jdbc:0.4.0'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 49fb4c72e28..2d938428d0c 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -3,12 +3,8 @@ description = "Testcontainers :: JDBC :: DB2"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -16,7 +12,3 @@ tasks.japicmp {
         "org.testcontainers.containers.Db2Container"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 31b7e66705f..f349178f8ed 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,12 +3,8 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.2"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -16,7 +12,3 @@ tasks.japicmp {
         "org.testcontainers.elasticsearch.ElasticsearchContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 5fabdf773df..5e9515c51ac 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,9 +3,6 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform("com.google.cloud:libraries-bom:26.66.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
@@ -13,9 +10,4 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-pubsub'
     testImplementation 'com.google.cloud:google-cloud-spanner'
     testImplementation 'com.google.cloud:google-cloud-bigtable'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index bd69ea40170..2a9bbb501ee 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -3,10 +3,6 @@ description = "Testcontainers :: Grafana"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.3'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
@@ -16,7 +12,3 @@ dependencies {
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b5fbcac0a32..af6eaa9efbf 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -11,21 +11,14 @@ dependencies {
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
     testImplementation(project(":testcontainers-junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.42.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.8")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.18")
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
     javaLauncher = javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(11)
     }
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 3fcb2925e13..958e1ceb101 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -5,10 +5,6 @@ dependencies {
 
     compileOnly 'org.influxdb:influxdb-java:2.25'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.influxdb:influxdb-java:2.25'
     testImplementation "com.influxdb:influxdb-client-java:7.3.0"
 }
@@ -18,7 +14,3 @@ tasks.japicmp {
         "org.testcontainers.containers.InfluxDBContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index f1deb59c41d..9561b4404e8 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -3,20 +3,12 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':testcontainers-database-commons')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.10'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index fd06bba5bb7..beb921bdf0d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -13,17 +13,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
-}
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 88e3c2ffa44..2f7571adede 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -6,14 +6,6 @@ dependencies {
     // Synchronize with the jackson version, must match major and minor version
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.fabric8:kubernetes-client:7.3.1'
     testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/k6/build.gradle b/modules/k6/build.gradle
index 369f35a6c9a..0ca874ddc25 100644
--- a/modules/k6/build.gradle
+++ b/modules/k6/build.gradle
@@ -2,13 +2,4 @@ description = "Testcontainers :: k6"
 
 dependencies {
     api project(':testcontainers')
-
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index baee466d59e..4e89be9a32e 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,16 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
index 4722de4d317..62f57581cf3 100644
--- a/modules/ldap/build.gradle
+++ b/modules/ldap/build.gradle
@@ -3,14 +3,5 @@ description = "Testcontainers :: LDAP"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.3'
 }
-
-test {
-    useJUnitPlatform()
-}
-
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index f4f827faccc..c2f1fd36f13 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,16 +3,12 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform("software.amazon.awssdk:bom:2.32.29")
     testImplementation 'software.amazon.awssdk:s3'
     testImplementation 'software.amazon.awssdk:sqs'
     testImplementation 'software.amazon.awssdk:cloudwatchlogs'
     testImplementation 'software.amazon.awssdk:lambda'
     testImplementation 'software.amazon.awssdk:kms'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -20,7 +16,3 @@ tasks.japicmp {
         "org.testcontainers.containers.localstack.LocalStackContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index 2bb703099aa..d68f122f4dc 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -6,9 +6,6 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.5'
 
@@ -21,7 +18,3 @@ tasks.japicmp {
         "org.testcontainers.containers.MariaDBContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index ed176e3394d..1332054fd31 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,13 +3,5 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.milvus:milvus-sdk-java:2.6.3'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 45ef78d7315..b3ce592eccb 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,13 +3,5 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation("io.minio:minio:8.5.17")
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 032d4a79e0a..bfd7a9261ac 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -3,11 +3,7 @@ description = "Testcontainers :: MockServer"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
 
@@ -16,7 +12,3 @@ tasks.japicmp {
         "org.testcontainers.containers.MockServerContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 813b1c60890..729cf59aab1 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -3,12 +3,7 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -16,7 +11,3 @@ tasks.japicmp {
         "org.testcontainers.containers.MongoDBContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index da8318ffa84..3ba79559b58 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -6,9 +6,6 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
 
@@ -24,7 +21,3 @@ tasks.japicmp {
         "org.testcontainers.containers.MSSQLServerContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index 32573799f70..ddacc0fdc50 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -6,9 +6,6 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
@@ -23,7 +20,3 @@ tasks.japicmp {
         "org.testcontainers.containers.MySQLContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index a1b49eac532..b13216e3719 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,11 +33,7 @@ dependencies {
 
     api project(":testcontainers")
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -46,7 +42,3 @@ tasks.japicmp {
         "org.testcontainers.containers.Neo4jLabsPlugin"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index b179ad33845..513a1c41122 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -3,11 +3,6 @@ description = "Testcontainers :: Nginx"
 dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:26.0.2'
-
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -15,7 +10,3 @@ tasks.japicmp {
         "org.testcontainers.containers.NginxContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
index c577c65b260..d4278ddc0bc 100644
--- a/modules/oceanbase/build.gradle
+++ b/modules/oceanbase/build.gradle
@@ -3,13 +3,6 @@ description = "Testcontainers :: JDBC :: OceanBase"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index 62a34a0f05a..87a31296135 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -3,13 +3,5 @@ description = "Testcontainers :: Ollama"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 628d940826f..f681fe841e2 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,15 +3,10 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'dev.openfga:openfga-sdk:0.9.0'
 }
 
 test {
-    useJUnitPlatform()
     javaLauncher = javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(17)
     }
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 3f85086074f..a55c9f26518 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -6,9 +6,6 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
@@ -17,7 +14,3 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index edc86cef19c..a384fcb7221 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -6,9 +6,6 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
@@ -23,7 +20,3 @@ tasks.japicmp {
         "org.testcontainers.containers.OracleContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index a6ab87a0d03..4bb59c14888 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,10 +5,6 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.43"
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
 }
@@ -18,7 +14,3 @@ tasks.japicmp {
         "org.testcontainers.containers.OrientDBContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/pinecone/build.gradle b/modules/pinecone/build.gradle
index 20101b9b5d9..3ad5b97d98f 100644
--- a/modules/pinecone/build.gradle
+++ b/modules/pinecone/build.gradle
@@ -3,13 +3,5 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.pinecone:pinecone-client:3.1.0'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index dd5e441477a..8af61c5f3e2 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -6,9 +6,6 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
@@ -23,7 +20,3 @@ tasks.japicmp {
         "org.testcontainers.containers.PostgreSQLContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 452e8cc271d..194b413c10f 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -3,14 +3,7 @@ description = "Testcontainers :: JDBC :: Presto"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index c9309daa24a..44cbea3c20e 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,14 +3,9 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation platform("org.apache.pulsar:pulsar-bom:4.0.5")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
 tasks.japicmp {
@@ -18,7 +13,3 @@ tasks.japicmp {
         "org.testcontainers.containers.PulsarContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 304d76f9251..c67fd6c7f74 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,17 +3,9 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.qdrant:client:1.15.0'
     testImplementation platform('io.grpc:grpc-bom:1.75.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index f2b69777ab2..9e1ab7c459f 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -5,16 +5,9 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.questdb:questdb:9.0.2'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 87c0e927048..625afd2b322 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -8,10 +8,6 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
 
@@ -19,7 +15,3 @@ dependencies {
     testFixturesImplementation 'org.assertj:assertj-core:3.27.4'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 7e9b2587709..4340fdcc539 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,11 +3,7 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.rabbitmq:amqp-client:5.26.0'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
 
@@ -16,7 +12,3 @@ tasks.japicmp {
         "org.testcontainers.containers.RabbitMQContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index d930155291e..ec254add76f 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,16 +4,8 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.34'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index b0551714a3a..b840279910b 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -3,14 +3,6 @@ description = "Testcontainers :: ScyllaDB"
 dependencies {
     api project(":testcontainers")
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'software.amazon.awssdk:dynamodb:2.32.30'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index b4eff2f2656..f9f26883752 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -6,9 +6,6 @@ dependencies {
     provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
     provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.13.0')
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     testImplementation 'org.seleniumhq.selenium:selenium-edge-driver'
@@ -16,11 +13,6 @@ dependencies {
 
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':testcontainers-nginx')
-    testImplementation 'org.assertj:assertj-core:3.27.4'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 8dd48e68f28..2bfc83e0218 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,17 +5,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.solacesystems:sol-jcsmp:10.27.3'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'
-
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 30fc1d9b833..c4966152fba 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -5,12 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
     testImplementation 'org.apache.solr:solr-solrj:8.11.4'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 
 tasks.japicmp {
@@ -18,7 +13,3 @@ tasks.japicmp {
         "org.testcontainers.containers.SolrContainer"
     ]
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index ec7fed6ec36..92e20a0dda7 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -41,10 +41,3 @@ javadocJar {
     archiveClassifier = 'javadoc'
     from groovydoc.destinationDir
 }
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
-}
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 61d21063af0..47dd9d01027 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -3,15 +3,8 @@ description = "Testcontainers :: JDBC :: TiDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle
index 681efb5cf7a..8acf35ef232 100644
--- a/modules/timeplus/build.gradle
+++ b/modules/timeplus/build.gradle
@@ -4,14 +4,6 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.10'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 6fe7062a045..69cd07f385f 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -5,10 +5,6 @@ dependencies {
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
     testImplementation 'redis.clients:jedis:6.1.0'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation platform('org.junit:junit-bom:5.13.4')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.japicmp {
@@ -16,7 +12,3 @@ tasks.japicmp {
         "org.testcontainers.containers.ToxiproxyContainer"
     ]
 }
-
-tasks.withType(Test).configureEach {
-    useJUnitPlatform()
-}
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 04c5ffb73b7..08e3c0c2982 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -3,14 +3,7 @@ description = "Testcontainers :: JDBC :: Trino"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:476'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
index ded834121f0..84a5978ba81 100644
--- a/modules/typesense/build.gradle
+++ b/modules/typesense/build.gradle
@@ -3,13 +3,5 @@ description = "Testcontainers :: Typesense"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.typesense:typesense-java:1.3.0'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index f492962b964..7c222d4b064 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -3,15 +3,6 @@ description = "Testcontainers :: Vault"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
-
-}
-
-test {
-    useJUnitPlatform()
 }
diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 04235749e3b..ed9ee52aa4d 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,13 +3,5 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation 'io.weaviate:client:5.4.0'
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle
index b867b42a603..4351653b4f3 100644
--- a/modules/yugabytedb/build.gradle
+++ b/modules/yugabytedb/build.gradle
@@ -3,16 +3,9 @@ description = "Testcontainers :: JDBC :: YugabyteDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.19.0-yb-1'
     // YSQL driver
     testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.7.3-yb-4'
 }
-
-test {
-    useJUnitPlatform()
-}

From 190dcec633f178e95377d3c21639f2f3ed4166ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 18:49:21 +0000
Subject: [PATCH 4589/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.10 to 11.0.11.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 9561b4404e8..64a9f6b2d04 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:26.0.2'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.10'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.11'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 70d6a25c4aa57d7cff17af3c099513cedf11df67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 18:58:13 +0000
Subject: [PATCH 4590/4969] Bump org.jetbrains:annotations from 26.0.2 to
 26.0.2-1 in /modules/jdbc

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 9561b4404e8..8c3eef1567b 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':testcontainers-database-commons')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.10'

From 850ee843c9277f30dd59c53a263d0108f7b34f78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 18:59:31 +0000
Subject: [PATCH 4591/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.5.5 to 3.5.6.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.5.5...3.5.6)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-version: 3.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d68f122f4dc..465b9555b4d 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.5'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.6'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From aeb963eaf71877650f43b8572aef5eb78e68bb99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 18:59:49 +0000
Subject: [PATCH 4592/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.9.0 to 3.9.1.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/3.9.0...3.9.1)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-version: 3.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index b5ef595c685..4b34a540ac6 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.9.0'
+    testImplementation 'com.couchbase.client:java-client:3.9.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }
 

From 200e85353a541822e3a93270f899ce2602a51eec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:02:23 +0000
Subject: [PATCH 4593/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.1.2 to 9.1.4.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v9.1.2...v9.1.4)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.1.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index f349178f8ed..1bac3a94d8c 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.4"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
 }
 

From cc18004bc3b3ad4d6105ce33deefb9bdffd6da20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:03:55 +0000
Subject: [PATCH 4594/4969] Bump com.clickhouse:clickhouse-jdbc in
 /modules/clickhouse

Bumps [com.clickhouse:clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-java) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/ClickHouse/clickhouse-java/releases)
- [Changelog](https://github.com/ClickHouse/clickhouse-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ClickHouse/clickhouse-java/compare/v0.9.1...v0.9.2)

---
updated-dependencies:
- dependency-name: com.clickhouse:clickhouse-jdbc
  dependency-version: 0.9.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 30460232a39..1579ea834ce 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,12 +5,12 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')
+    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.2', classifier: 'http')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.1', classifier: 'all')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.2', classifier: 'all')
 
-    testImplementation 'com.clickhouse:client-v2:0.9.1'
+    testImplementation 'com.clickhouse:client-v2:0.9.2'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.2', classifier: 'http')
 }

From 2f28f8ece83665a9d5d977182a73f59c572042e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:06:34 +0000
Subject: [PATCH 4595/4969] Bump com.google.code.gson:gson from 2.13.1 to
 2.13.2 in /examples

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.13.1 to 2.13.2.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.13.1...gson-parent-2.13.2)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-version: 2.13.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 52c574e182d..890d93a983c 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:6.1.0'
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index da92871a0df..3cd1c36c201 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:6.1.0'
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 4e8faa7a1b9..ff5d622a670 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:6.1.0'
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 

From ae2309a3bb4950b03148d87d90a1b5e91cca4f27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:06:50 +0000
Subject: [PATCH 4596/4969] Bump org.apache.kafka:kafka-clients from 4.0.0 to
 4.1.0 in /examples

Bumps org.apache.kafka:kafka-clients from 4.0.0 to 4.1.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-version: 4.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/kafka-cluster/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
index 41dffd5a543..67ca7e4e37c 100644
--- a/examples/kafka-cluster/build.gradle
+++ b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.38"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.38"
     testImplementation 'org.testcontainers:testcontainers-kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
+    testImplementation 'org.apache.kafka:kafka-clients:4.1.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'

From 820e1d89feef730b98eb0c801c49fc58abe39d6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:08:41 +0000
Subject: [PATCH 4597/4969] Bump eu.rekawek.toxiproxy:toxiproxy-java in
 /modules/toxiproxy

Bumps [eu.rekawek.toxiproxy:toxiproxy-java](https://github.com/trekawek/toxiproxy-java) from 2.1.7 to 2.1.11.
- [Release notes](https://github.com/trekawek/toxiproxy-java/releases)
- [Changelog](https://github.com/trekawek/toxiproxy-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trekawek/toxiproxy-java/compare/toxiproxy-java-2.1.7...toxiproxy-java-2.1.11)

---
updated-dependencies:
- dependency-name: eu.rekawek.toxiproxy:toxiproxy-java
  dependency-version: 2.1.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 69cd07f385f..c913509e638 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Toxiproxy"
 
 dependencies {
     api project(':testcontainers')
-    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
+    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.11'
 
     testImplementation 'redis.clients:jedis:6.1.0'
 }

From 36623b7ec93fa5c41bcab66c36b3bef22010ef0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:08:46 +0000
Subject: [PATCH 4598/4969] Bump redis.clients:jedis from 6.1.0 to 6.2.0 in
 /modules/toxiproxy

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 69cd07f385f..3cdabdb12a0 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'
 
-    testImplementation 'redis.clients:jedis:6.1.0'
+    testImplementation 'redis.clients:jedis:6.2.0'
 }
 
 tasks.japicmp {

From 55afec3c6e2c7736f7051922b399513940c236d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:09:09 +0000
Subject: [PATCH 4599/4969] Bump io.trino:trino-jdbc from 476 to 477 in
 /modules/trino

Bumps io.trino:trino-jdbc from 476 to 477.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-version: '477'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 08e3c0c2982..ced1b2fa10c 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:476'
+    testRuntimeOnly 'io.trino:trino-jdbc:477'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }

From 0d69dae6e5bb6f8f708440d9b4f9ffdda9fdcf6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:09:24 +0000
Subject: [PATCH 4600/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.66.0 to 26.69.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.66.0...v26.69.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.69.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 5e9515c51ac..79b856cf06e 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.66.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.69.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From c02f50dd55d0b5e6160da7dbfbf0ed2b46fb32a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:11:52 +0000
Subject: [PATCH 4601/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.7 to 42.7.8.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.7...REL42.7.8)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 71508c7a791..8b48153b4d7 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: CockroachDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
 
     testImplementation project(':testcontainers-jdbc-test')
 }

From 7d22f2dfc8daed14a8a68ebabe827b78acae9436 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:12:01 +0000
Subject: [PATCH 4602/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.43 to 3.2.44.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/3.2.44/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.43...3.2.44)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-version: 3.2.44
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 4bb59c14888..2de0c86dee4 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.43"
+    api "com.orientechnologies:orientdb-client:3.2.44"
 
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
 }
 
 tasks.japicmp {

From d7ff6e943fd469e8f25111c6046c727caada9861 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:12:20 +0000
Subject: [PATCH 4603/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.43 to 3.2.44.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.43...3.2.44)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-version: 3.2.44
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 4bb59c14888..2de0c86dee4 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.43"
+    api "com.orientechnologies:orientdb-client:3.2.44"
 
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.43"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
 }
 
 tasks.japicmp {

From b6d97ef3e56b2ff17727d470baa0565da03ef1f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:15:47 +0000
Subject: [PATCH 4604/4969] Bump org.postgresql:postgresql from 42.7.7 to
 42.7.8 in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.7 to 42.7.8.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.7...REL42.7.8)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 9e1ab7c459f..5673fcb4bcd 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
 
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.questdb:questdb:9.0.2'

From 141582a849949ed7f1be8688a0f34fe55c04b6e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:15:55 +0000
Subject: [PATCH 4605/4969] Bump org.questdb:questdb from 9.0.2 to 9.0.3 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 9.0.2 to 9.0.3.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/9.0.2...9.0.3)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-version: 9.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 9e1ab7c459f..4017907ab30 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.questdb:questdb:9.0.2'
+    testImplementation 'org.questdb:questdb:9.0.3'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From 59a6614bb9dc88176cb516de915666ba83d6f7f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:15:58 +0000
Subject: [PATCH 4606/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 4.0.0 to 4.1.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-version: 4.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index ec254add76f..d349572bfe9 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.34'
 
-    testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
+    testImplementation 'org.apache.kafka:kafka-clients:4.1.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.awaitility:awaitility:4.3.0'

From 70734c28240da6629b872f95238b69ede5da5269 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:17:44 +0000
Subject: [PATCH 4607/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps com.solacesystems:sol-jcsmp from 10.27.3 to 10.28.1.

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-version: 10.28.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 2bfc83e0218..83583fd5cdf 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    testImplementation 'com.solacesystems:sol-jcsmp:10.27.3'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.28.1'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 0b590fe85ceb2c09f221fad4e435f187ab6fa69e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:20:23 +0000
Subject: [PATCH 4608/4969] Bump io.minio:minio from 8.5.17 to 8.6.0 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.5.17 to 8.6.0.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.5.17...8.6.0)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-version: 8.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index b3ce592eccb..35dcecb8b95 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.5.17")
+    testImplementation("io.minio:minio:8.6.0")
 }

From 44f111c000481238e839461114b3a55efca266a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:37:17 +0000
Subject: [PATCH 4609/4969] Bump io.weaviate:client from 5.4.0 to 5.5.0 in
 /modules/weaviate

Bumps [io.weaviate:client](https://github.com/weaviate/java-client) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/weaviate/java-client/releases)
- [Commits](https://github.com/weaviate/java-client/compare/5.4.0...5.5.0)

---
updated-dependencies:
- dependency-name: io.weaviate:client
  dependency-version: 5.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index ed9ee52aa4d..fd61cd7e3f4 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.weaviate:client:5.4.0'
+    testImplementation 'io.weaviate:client:5.5.0'
 }

From 44be82fccf5b3523fe76a713d7000d9a6173d33c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:41:34 +0000
Subject: [PATCH 4610/4969] Bump io.milvus:milvus-sdk-java from 2.6.3 to 2.6.5
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.6.3 to 2.6.5.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.6.3...v2.6.5)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-version: 2.6.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 1332054fd31..2aec7fc1da3 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.milvus:milvus-sdk-java:2.6.3'
+    testImplementation 'io.milvus:milvus-sdk-java:2.6.5'
 }

From 282f745dc1d9c46aa67d1e4a2bcf58e1676f79ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:53:04 +0000
Subject: [PATCH 4611/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-version: 1.15.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 2a9bbb501ee..2d52bebe2bc 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.3'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.4'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.53.0')

From f2aa1e5da676b5117cba10e87956d717e9c5a87d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:53:38 +0000
Subject: [PATCH 4612/4969] Bump io.opentelemetry:opentelemetry-bom in
 /modules/grafana

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.53.0 to 1.54.1.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.53.0...v1.54.1)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-version: 1.54.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 2a9bbb501ee..2e3da22cd19 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.3'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
-    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.53.0')
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.54.1')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

From c0427bb2a22dee58c5d1fc7eab5e366424be425c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:56:50 +0000
Subject: [PATCH 4613/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.32.30 to 2.34.8.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.34.8
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index b840279910b..28e91cca882 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.32.30'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.34.8'
 }

From b373c99e3787049d0c4d1ffbad30b0920e2a2b8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 14:33:06 +0000
Subject: [PATCH 4614/4969] Bump org.jetbrains:annotations from 26.0.2 to
 26.0.2-1 in /modules/trino

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index ced1b2fa10c..6839d4791aa 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:477'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From b51936c6e132301dd686ffd78fa1ee4a901988cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:17:32 +0000
Subject: [PATCH 4615/4969] Bump org.jetbrains:annotations in /modules/cratedb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index ae0bfc8ec93..b0af7365c82 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From 66804a3636ba13d06ac9cbfb77d38a8d90216073 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:17:32 +0000
Subject: [PATCH 4616/4969] Bump org.jetbrains:annotations in
 /modules/oracle-free

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index a55c9f26518..769572aaef1 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'

From b992439826105299c7de91d5ebd2058c07887bcf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:17:40 +0000
Subject: [PATCH 4617/4969] Bump org.jetbrains:annotations from 26.0.2 to
 26.0.2-1 in /modules/tidb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 47dd9d01027..d4b49370be4 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From 6a1eb9ef7438e9e67a12eaca44a8774e7820f059 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:17:46 +0000
Subject: [PATCH 4618/4969] Bump org.jetbrains:annotations in /modules/hivemq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index af6eaa9efbf..7f0a42c79c2 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:26.0.2")
+    api("org.jetbrains:annotations:26.0.2-1")
 
     shaded("org.apache.commons:commons-lang3:3.18.0")
     shaded("commons-io:commons-io:2.20.0")

From 06e91a8abfcb0da556325f4bca9e6979ea785092 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:18:07 +0000
Subject: [PATCH 4619/4969] Bump org.jetbrains:annotations in /modules/rabbitmq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 4340fdcc539..f1d273b75bb 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'com.rabbitmq:amqp-client:5.26.0'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.japicmp {

From 7b22d9f5bc4dcb779e59b81a0e02ef45eee47673 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:18:12 +0000
Subject: [PATCH 4620/4969] Bump org.jetbrains:annotations in /modules/presto

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 194b413c10f..874b532fb85 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From b87ddff75fd5479b445f74b475df90ebe38a40be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:19:41 +0000
Subject: [PATCH 4621/4969] Bump org.jetbrains:annotations in
 /modules/oracle-xe

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index a384fcb7221..f8a7b1f07db 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'

From 38fa1e56f7b20bdd5f9c992bd122c134ffb7f64e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:20:13 +0000
Subject: [PATCH 4622/4969] Bump org.jetbrains:annotations from 26.0.2 to
 26.0.2-1 in /modules/spock

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 92e20a0dda7..d6597c3cfc0 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 
-    testCompileOnly 'org.jetbrains:annotations:26.0.2'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.withType(GroovyCompile) {

From 17bef506e89301d27f53fe959a9372760ce2db67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:21:26 +0000
Subject: [PATCH 4623/4969] Bump org.jetbrains:annotations in
 /modules/postgresql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 8af61c5f3e2..c9b308f37cc 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.japicmp {

From f8fbee0e00949734adbf6408376109fcfbcf3610 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:21:34 +0000
Subject: [PATCH 4624/4969] Bump org.jetbrains:annotations from 26.0.2 to
 26.0.2-1 in /modules/mysql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ddacc0fdc50..a523277ca5d 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.japicmp {

From 4ef311f3eb51def80df64e1cdac997f19456e2e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:21:46 +0000
Subject: [PATCH 4625/4969] Bump org.jetbrains:annotations from 26.0.2 to
 26.0.2-1 in /modules/nginx

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 513a1c41122..732cee22faf 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
 
 tasks.japicmp {

From 43e9dc51c16bd755b20dc8d2c26a5c50f303a13b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 15:21:56 +0000
Subject: [PATCH 4626/4969] Bump org.jetbrains:annotations in /modules/selenium

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2 to 26.0.2-1.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2...26.0.2-1)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.0.2-1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index f9f26883752..30c3c1a7619 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':testcontainers-nginx')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From 1e4e7679d1ffbb78974f04497477f78abe950498 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:37:09 +0000
Subject: [PATCH 4627/4969] Bump org.postgresql:postgresql from 42.7.7 to
 42.7.8 in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.7 to 42.7.8.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.7...REL42.7.8)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index b0af7365c82..be60919c0e3 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: CrateDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
 
     testImplementation project(':testcontainers-jdbc-test')
 

From 230190a7311ce7a693f41c88962ad023e5995f4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:41:41 +0000
Subject: [PATCH 4628/4969] Bump io.nats:jnats from 2.21.5 to 2.23.0 in
 /examples

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.21.5 to 2.23.0.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.21.5...2.23.0)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-version: 2.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/nats/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
index 765fefd7491..5e63a2d33a0 100644
--- a/examples/nats/build.gradle
+++ b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.21.5'
+    testImplementation 'io.nats:jnats:2.23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'

From 2ea7b0af53a79ab2f9181cdf8a95d852b274de10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:42:30 +0000
Subject: [PATCH 4629/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.7 to 42.7.8.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.7...REL42.7.8)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 c9b308f37cc..3a04623e1ce 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 90d35b519388f877bc04c1257fe586f284096621 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:42:37 +0000
Subject: [PATCH 4630/4969] Bump org.postgresql:postgresql from 42.7.7 to
 42.7.8 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.7 to 42.7.8.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.7...REL42.7.8)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d6597c3cfc0..7be55504969 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly platform('org.junit:junit-bom:5.13.4')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

From 58d84a74d7df7945e789ce42c66e6ef76264d56c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:45:21 +0000
Subject: [PATCH 4631/4969] Bump software.amazon.awssdk:bom in
 /modules/localstack

Bumps software.amazon.awssdk:bom from 2.32.29 to 2.34.7.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-version: 2.34.7
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 c2f1fd36f13..38ea6eabb68 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("software.amazon.awssdk:bom:2.32.29")
+    testImplementation platform("software.amazon.awssdk:bom:2.35.0")
     testImplementation 'software.amazon.awssdk:s3'
     testImplementation 'software.amazon.awssdk:sqs'
     testImplementation 'software.amazon.awssdk:cloudwatchlogs'

From 936510f10ebc51157ea5b2676235677cd3e16f17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:45:42 +0000
Subject: [PATCH 4632/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /modules/neo4j

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.20 to 4.4.21.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.20...4.4.21)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-version: 4.4.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index b13216e3719..3a013391742 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.21'
 }
 
 tasks.japicmp {

From 94d437fb98acc66e7d78f44dfb8f0728cbbe24af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 17:53:04 +0000
Subject: [PATCH 4633/4969] Bump redis.clients:jedis from 6.1.0 to 6.2.0 in
 /examples

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/redis-backed-cache-testng/build.gradle | 2 +-
 examples/redis-backed-cache/build.gradle        | 2 +-
 examples/singleton-container/build.gradle       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
index 52c574e182d..22f6798c74e 100644
--- a/examples/redis-backed-cache-testng/build.gradle
+++ b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:6.1.0'
+    implementation 'redis.clients:jedis:6.2.0'
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
index da92871a0df..d9cb263e2b6 100644
--- a/examples/redis-backed-cache/build.gradle
+++ b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:6.1.0'
+    implementation 'redis.clients:jedis:6.2.0'
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
index 4e8faa7a1b9..1237adb0300 100644
--- a/examples/singleton-container/build.gradle
+++ b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:6.1.0'
+    implementation 'redis.clients:jedis:6.2.0'
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'

From 90a5b3c39fe582aff2b66da972368d1ecde2cab8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 17:53:15 +0000
Subject: [PATCH 4634/4969] Bump io.cucumber:cucumber-bom from 7.27.2 to 7.30.0
 in /examples

Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.27.2 to 7.30.0.
- [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/v7.27.2...v7.30.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-bom
  dependency-version: 7.30.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 7d46a147ef3..84dbc39a85e 100644
--- a/examples/cucumber/build.gradle
+++ b/examples/cucumber/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation platform('org.junit:junit-bom:5.13.4')
     testImplementation 'org.junit.platform:junit-platform-suite'
-    testImplementation platform('io.cucumber:cucumber-bom:7.27.2')
+    testImplementation platform('io.cucumber:cucumber-bom:7.30.0')
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit-platform-engine'
     testImplementation 'org.testcontainers:testcontainers-selenium'

From 290cf52960b7244dd45923384b9b457699a8de52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 17:53:23 +0000
Subject: [PATCH 4635/4969] Bump org.jreleaser from 1.18.0 to 1.20.0 in
 /examples

Bumps org.jreleaser from 1.18.0 to 1.20.0.

---
updated-dependencies:
- dependency-name: org.jreleaser
  dependency-version: 1.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2f0c485d25f..52d6f33f25c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'com.gradleup.shadow' version '8.3.9'
     id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
     id 'com.diffplug.spotless' version '6.22.0' apply false
-    id 'org.jreleaser' version '1.18.0' apply false
+    id 'org.jreleaser' version '1.20.0' apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"

From a4b3a213255bdcd764f1b1924b81569aab9a56e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 19:38:30 +0000
Subject: [PATCH 4636/4969] Bump io.r2dbc:r2dbc-mssql in /modules/mssqlserver

Bumps [io.r2dbc:r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 1.0.2.RELEASE to 1.0.3.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v1.0.3.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v1.0.2.RELEASE...v1.0.3.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-version: 1.0.3.RELEASE
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 3ba79559b58..992d64004e6 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -4,13 +4,13 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
 
     testImplementation project(':testcontainers-r2dbc')
-    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
+    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':testcontainers-r2dbc'))

From b86b7fa1f9547d1290d6340645ef2acec0f29d00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 19:39:18 +0000
Subject: [PATCH 4637/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.7.9 to 3.7.11.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.7.9...v3.7.11)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-version: 3.7.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 625afd2b322..43fa9bd754b 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.7.9'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.7.11'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.4'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
 }

From 07509c3e8eefde95409cf18c8f8a156eeb542942 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 20:48:24 +0000
Subject: [PATCH 4638/4969] Bump org.assertj:assertj-core from 3.27.4 to 3.27.6
 in /modules/r2dbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.4 to 3.27.6.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.4...assertj-build-3.27.6)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 43fa9bd754b..1e777a82d55 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation project(':testcontainers-postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.7.11'
-    testFixturesImplementation 'org.assertj:assertj-core:3.27.4'
+    testFixturesImplementation 'org.assertj:assertj-core:3.27.6'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
 }

From a8f2dbb82eba25833191ef9d8b482e187afb201f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 21:32:07 +0000
Subject: [PATCH 4639/4969] Bump redis.clients:jedis from 6.1.0 to 6.2.0 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 beb921bdf0d..43b417a9e83 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
-    testImplementation 'redis.clients:jedis:6.1.0'
+    testImplementation 'redis.clients:jedis:6.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From e3cd5c440264cb97631d6d2453a557a3364b218b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 21:34:21 +0000
Subject: [PATCH 4640/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.7 to 42.7.8.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.7...REL42.7.8)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 beb921bdf0d..ccf71b3f388 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -14,6 +14,6 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }

From e27e2a4291bd8bca68f9102faf42e9cd492e899e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 22:01:11 +0000
Subject: [PATCH 4641/4969] Bump gradle/actions from 4 to 5

Bumps [gradle/actions](https://github.com/gradle/actions) from 4 to 5.
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/v4...v5)

---
updated-dependencies:
- dependency-name: gradle/actions
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-rootless.yml           | 2 +-
 .github/workflows/ci.yml                    | 6 +++---
 .github/workflows/release.yml               | 2 +-
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index d13c0437112..05d3d6d6607 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -52,7 +52,7 @@ jobs:
         with:
           rootless: true
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
       - uses: ./.github/actions/setup-junit-report
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b0d4721fd12..aa2946ea657 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -126,7 +126,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -163,7 +163,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - id: set-matrix
         env:
           # Since we override the tests executor,
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ca009b1dc8b..bdb87788c0a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
         run: docker image prune -af
 
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Run Gradle Build
         run: ./gradlew build --scan --no-daemon -i -x test
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index da9c77c1b5e..fe1174c60d6 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -24,4 +24,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/actions/wrapper-validation@v4
+      - uses: gradle/actions/wrapper-validation@v5

From 2e8e54b5a6d8c16a9668a9c6f7c2d32b0f066053 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 22:06:30 +0000
Subject: [PATCH 4642/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.42.0 to 4.45.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.42.0...4.45.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-version: 4.45.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 7f0a42c79c2..b49929523af 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
     testImplementation(project(":testcontainers-junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.42.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.45.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.8")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.18")

From 97e6bb9a7ea09f706027117d49021e9c88c5bbee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 04:05:34 +0000
Subject: [PATCH 4643/4969] Bump io.fabric8:kubernetes-client from 7.3.1 to
 7.4.0 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 7.3.1 to 7.4.0.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v7.3.1...v7.4.0)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-version: 7.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 2f7571adede..aab1a2aa40f 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     // Synchronize with the jackson version, must match major and minor version
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'
 
-    testImplementation 'io.fabric8:kubernetes-client:7.3.1'
+    testImplementation 'io.fabric8:kubernetes-client:7.4.0'
     testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
 }

From b53455a23e5090e309f639be96201487f7039aec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 04:06:09 +0000
Subject: [PATCH 4644/4969] Bump org.apache.pulsar:pulsar-bom from 4.0.5 to
 4.1.1 in /modules/pulsar

Bumps [org.apache.pulsar:pulsar-bom](https://github.com/apache/pulsar) from 4.0.5 to 4.1.1.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v4.0.5...v4.1.1)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-bom
  dependency-version: 4.1.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 44cbea3c20e..106b578dfef 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("org.apache.pulsar:pulsar-bom:4.0.5")
+    testImplementation platform("org.apache.pulsar:pulsar-bom:4.1.1")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
 }

From 0524fa7a2542651a4f8979783dfa8afacc00af36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 17:21:32 +0000
Subject: [PATCH 4645/4969] Bump org.apache.commons:commons-lang3 in
 /modules/hivemq

Bumps org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b49929523af..03223e06510 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:26.0.2-1")
 
-    shaded("org.apache.commons:commons-lang3:3.18.0")
+    shaded("org.apache.commons:commons-lang3:3.19.0")
     shaded("commons-io:commons-io:2.20.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")

From 7917e67709f7317984c26ff48ba4afae84e90f17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 17:21:36 +0000
Subject: [PATCH 4646/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.18 to 1.5.19.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.18...v_1.5.19)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.19
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b49929523af..58c5d688536 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.45.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.8")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.5.18")
+    testImplementation("ch.qos.logback:logback-classic:1.5.19")
 }
 
 test {

From eccddefd612fea25d7565c74e349bbc2eb223ba8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 20:00:52 +0000
Subject: [PATCH 4647/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/v1.3.8...v1.3.9)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-version: 1.3.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index b49929523af..f7cafa75871 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation(project(":testcontainers-junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.45.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.8")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.10")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.18")
 }

From fd168df3b332e789ef72f3e2e9087bd3b22a4f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 7 Oct 2025 14:14:07 -0600
Subject: [PATCH 4648/4969] Remove assertj dependency from redpanda module

---
 modules/redpanda/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index d349572bfe9..74e91674c70 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,7 +5,6 @@ dependencies {
     shaded 'org.freemarker:freemarker:2.3.34'
 
     testImplementation 'org.apache.kafka:kafka-clients:4.1.0'
-    testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 06ad992b545e49cf8917e85139f69250e5b8426a Mon Sep 17 00:00:00 2001
From: Raju Gupta <cs135017@mnnit.ac.in>
Date: Wed, 8 Oct 2025 19:15:41 +0100
Subject: [PATCH 4649/4969] Switch to com.mysql:mysql-connector-j (#11078)

Fixes #11079
---
 docs/examples/junit4/generic/build.gradle | 2 +-
 modules/jdbc-test/build.gradle            | 2 +-
 modules/junit-jupiter/build.gradle        | 2 +-
 modules/mysql/build.gradle                | 2 +-
 modules/oceanbase/build.gradle            | 2 +-
 modules/spock/build.gradle                | 2 +-
 modules/tidb/build.gradle                 | 3 +--
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
index 2844f1a19b3..60764dd7476 100644
--- a/docs/examples/junit4/generic/build.gradle
+++ b/docs/examples/junit4/generic/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation project(":testcontainers-selenium")
     testImplementation project(":testcontainers-mysql")
 
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.35.0"
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index cdf677ae1b8..a6759030313 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -10,6 +10,6 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.11'
     api 'org.vibur:vibur-dbcp:26.0'
-    api 'mysql:mysql-connector-java:8.0.33'
+    api 'com.mysql:mysql-connector-j:8.2.0'
     api 'org.junit.jupiter:junit-jupiter:5.13.4'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index b4965736779..01af88a3aab 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     }
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
 }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index a523277ca5d..b387b05cb2f 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'
diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
index d4278ddc0bc..5758598fb67 100644
--- a/modules/oceanbase/build.gradle
+++ b/modules/oceanbase/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
index 7be55504969..e2f1ce4554f 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
     testRuntimeOnly platform('org.junit:junit-bom:5.13.4')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index d4b49370be4..66298ac6635 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,7 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-
+    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From 915760fa2e699974533b3c8d2dcbabe437add582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 12:33:32 -0600
Subject: [PATCH 4650/4969] Add CockroachDB container implementation under
 org.testcontainers.cockroachdb (#11080)

---
 docs/modules/databases/cockroachdb.md         |   2 +-
 .../cockroachdb/CockroachContainer.java       | 158 ++++++++++++++++++
 .../containers/CockroachContainer.java        |   3 +
 .../CockroachContainerTest.java}              |   5 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 modules/cockroachdb/src/main/java/org/testcontainers/cockroachdb/CockroachContainer.java
 rename modules/cockroachdb/src/test/java/org/testcontainers/{junit/cockroachdb/SimpleCockroachDBTest.java => cockroachdb/CockroachContainerTest.java} (96%)

diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
index 258a51ea74c..2a219aeb275 100644
--- a/docs/modules/databases/cockroachdb.md
+++ b/docs/modules/databases/cockroachdb.md
@@ -7,7 +7,7 @@ Testcontainers module for [CockroachDB](https://hub.docker.com/r/cockroachdb/coc
 You can start a CockroachDB container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container definition](../../../modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java) inside_block:container
+[Container definition](../../../modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/cockroachdb/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/cockroachdb/CockroachContainer.java
new file mode 100644
index 00000000000..0d49e8cdaf7
--- /dev/null
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/cockroachdb/CockroachContainer.java
@@ -0,0 +1,158 @@
+package org.testcontainers.cockroachdb;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+
+/**
+ * Testcontainers implementation for CockroachDB.
+ * <p>
+ * Supported image: {@code cockroachdb/cockroach}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 26257</li>
+ *     <li>Console: 8080</li>
+ * </ul>
+ */
+public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cockroachdb/cockroach");
+
+    public static final String NAME = "cockroach";
+
+    private static final String JDBC_DRIVER_CLASS_NAME = "org.postgresql.Driver";
+
+    private static final String JDBC_URL_PREFIX = "jdbc:postgresql";
+
+    private static final String TEST_QUERY_STRING = "SELECT 1";
+
+    private static final int REST_API_PORT = 8080;
+
+    private static final int DB_PORT = 26257;
+
+    private static final String FIRST_VERSION_WITH_ENV_VARS_SUPPORT = "22.1.0";
+
+    private String databaseName = "postgres";
+
+    private String username = "root";
+
+    private String password = "";
+
+    private boolean isVersionGreaterThanOrEqualTo221;
+
+    public CockroachContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public CockroachContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        this.isVersionGreaterThanOrEqualTo221 = isVersionGreaterThanOrEqualTo221(dockerImageName);
+
+        WaitAllStrategy waitStrategy = new WaitAllStrategy();
+        waitStrategy.withStrategy(
+            Wait.forHttp("/health").forPort(REST_API_PORT).forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1))
+        );
+        if (this.isVersionGreaterThanOrEqualTo221) {
+            waitStrategy.withStrategy(Wait.forSuccessfulCommand("[ -f ./init_success ] || { exit 1; }"));
+        }
+
+        withExposedPorts(REST_API_PORT, DB_PORT);
+        waitingFor(waitStrategy);
+        withCommand("start-single-node --insecure");
+    }
+
+    @Override
+    protected void configure() {
+        withEnv("COCKROACH_USER", this.username);
+        withEnv("COCKROACH_PASSWORD", this.password);
+        if (this.password != null && !this.password.isEmpty()) {
+            withCommand("start-single-node");
+        }
+        withEnv("COCKROACH_DATABASE", this.databaseName);
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return JDBC_DRIVER_CLASS_NAME;
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return (
+            JDBC_URL_PREFIX +
+            "://" +
+            getHost() +
+            ":" +
+            getMappedPort(DB_PORT) +
+            "/" +
+            databaseName +
+            additionalUrlParams
+        );
+    }
+
+    @Override
+    public final String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return TEST_QUERY_STRING;
+    }
+
+    @Override
+    public CockroachContainer withUsername(String username) {
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("username");
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public CockroachContainer withPassword(String password) {
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("password");
+        this.password = password;
+        return this;
+    }
+
+    @Override
+    public CockroachContainer withDatabaseName(final String databaseName) {
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("databaseName");
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    private boolean isVersionGreaterThanOrEqualTo221(DockerImageName dockerImageName) {
+        ComparableVersion version = new ComparableVersion(dockerImageName.getVersionPart().replaceFirst("v", ""));
+        return version.isGreaterThanOrEqualTo(FIRST_VERSION_WITH_ENV_VARS_SUPPORT);
+    }
+
+    private void validateIfVersionSupportsUsernameOrPasswordOrDatabase(String parameter) {
+        if (!isVersionGreaterThanOrEqualTo221) {
+            throw new UnsupportedOperationException(
+                String.format("Setting a %s in not supported in the versions below 22.1.0", parameter)
+            );
+        }
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+}
diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index f0c0cf123fb..855c37a03c8 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -17,7 +17,10 @@
  *     <li>Database: 26257</li>
  *     <li>Console: 8080</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.cockroachdb.CockroachContainer} instead
  */
+@Deprecated
 public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cockroachdb/cockroach");
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java
similarity index 96%
rename from modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
rename to modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java
index 5846c22a5db..3aba3d2eefd 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java
@@ -1,8 +1,7 @@
-package org.testcontainers.junit.cockroachdb;
+package org.testcontainers.cockroachdb;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.CockroachDBTestImages;
-import org.testcontainers.containers.CockroachContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.images.builder.Transferable;
 
@@ -14,7 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
+class CockroachContainerTest extends AbstractContainerDatabaseTest {
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);

From 5d16381f119b72a558eeb3b120f64b3f80e84c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 12:48:56 -0600
Subject: [PATCH 4651/4969] Add GCloud container implementations under
 org.testcontainers.gcloud (#11081)

---
 docs/modules/gcloud.md                        | 42 +++++------
 .../containers/BigQueryEmulatorContainer.java |  3 +
 .../containers/BigtableEmulatorContainer.java |  3 +
 .../DatastoreEmulatorContainer.java           |  3 +
 .../FirestoreEmulatorContainer.java           |  3 +
 .../containers/PubSubEmulatorContainer.java   |  3 +
 .../containers/SpannerEmulatorContainer.java  |  3 +
 .../gcloud/BigQueryEmulatorContainer.java     | 44 +++++++++++
 .../gcloud/BigtableEmulatorContainer.java     | 53 ++++++++++++++
 .../gcloud/DatastoreEmulatorContainer.java    | 73 +++++++++++++++++++
 .../gcloud/FirestoreEmulatorContainer.java    | 64 ++++++++++++++++
 .../gcloud/PubSubEmulatorContainer.java       | 49 +++++++++++++
 .../gcloud/SpannerEmulatorContainer.java      | 50 +++++++++++++
 .../BigQueryEmulatorContainerTest.java        |  2 +-
 .../BigtableEmulatorContainerTest.java        |  2 +-
 .../DatastoreEmulatorContainerTest.java       |  2 +-
 .../FirestoreEmulatorContainerTest.java       |  2 +-
 .../PubSubEmulatorContainerTest.java          |  2 +-
 .../SpannerEmulatorContainerTest.java         |  2 +-
 19 files changed, 378 insertions(+), 27 deletions(-)
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/gcloud/BigQueryEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/gcloud/BigtableEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/gcloud/DatastoreEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/gcloud/FirestoreEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/gcloud/PubSubEmulatorContainer.java
 create mode 100644 modules/gcloud/src/main/java/org/testcontainers/gcloud/SpannerEmulatorContainer.java
 rename modules/gcloud/src/test/java/org/testcontainers/{containers => gcloud}/BigQueryEmulatorContainerTest.java (99%)
 rename modules/gcloud/src/test/java/org/testcontainers/{containers => gcloud}/BigtableEmulatorContainerTest.java (99%)
 rename modules/gcloud/src/test/java/org/testcontainers/{containers => gcloud}/DatastoreEmulatorContainerTest.java (98%)
 rename modules/gcloud/src/test/java/org/testcontainers/{containers => gcloud}/FirestoreEmulatorContainerTest.java (98%)
 rename modules/gcloud/src/test/java/org/testcontainers/{containers => gcloud}/PubSubEmulatorContainerTest.java (99%)
 rename modules/gcloud/src/test/java/org/testcontainers/{containers => gcloud}/SpannerEmulatorContainerTest.java (99%)

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index 049931b3be1..dc86e7f4892 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -23,11 +23,11 @@ PubSubEmulatorContainer | [gcr.io/google.com/cloudsdktool/google-cloud-cli:emula
 Start BigQuery Emulator during a test:
 
 <!--codeinclude-->
-[Starting a BigQuery Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java) inside_block:emulatorContainer
+[Starting a BigQuery Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Creating BigQuery Client](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java) inside_block:bigQueryClient
+[Creating BigQuery Client](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java) inside_block:bigQueryClient
 <!--/codeinclude-->
 
 ### Bigtable
@@ -35,19 +35,19 @@ Start BigQuery Emulator during a test:
 Start Bigtable Emulator during a test:
 
 <!--codeinclude-->
-[Starting a Bigtable Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java) inside_block:emulatorContainer
+[Starting a Bigtable Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 Create a test Bigtable table in the Emulator:
 
 <!--codeinclude-->
-[Create a test table](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java) inside_block:createTable
+[Create a test table](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java) inside_block:createTable
 <!--/codeinclude-->
 
 Test against the Emulator:
 
 <!--codeinclude-->
-[Testing with a Bigtable Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+[Testing with a Bigtable Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
 <!--/codeinclude-->
 
 ### Datastore
@@ -55,18 +55,18 @@ Test against the Emulator:
 Start Datastore Emulator during a test:
 
 <!--codeinclude-->
-[Starting a Datastore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:creatingDatastoreEmulatorContainer
+[Starting a Datastore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java) inside_block:creatingDatastoreEmulatorContainer
 <!--/codeinclude-->
 
 And test against the Emulator:
 
 <!--codeinclude-->
-[Testing with a Datastore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:startingDatastoreEmulatorContainer
+[Testing with a Datastore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java) inside_block:startingDatastoreEmulatorContainer
 <!--/codeinclude-->
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/datastore-example/src/test/java/com/example/springboot/datastore) 
 
 ### Firestore 
@@ -74,18 +74,18 @@ See more examples:
 Start Firestore Emulator during a test:
 
 <!--codeinclude-->
-[Starting a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java) inside_block:emulatorContainer
+[Starting a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 And test against the Emulator:
 
 <!--codeinclude-->
-[Testing with a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+[Testing with a Firestore Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
 <!--/codeinclude-->
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/firestore-example/src/test/java/com/example/springboot/firestore/FirestoreIntegrationTests.java)
 
 ### Spanner 
@@ -93,30 +93,30 @@ See more examples:
 Start Spanner Emulator during a test:
 
 <!--codeinclude-->
-[Starting a Spanner Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:emulatorContainer
+[Starting a Spanner Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 Create a test Spanner Instance in the Emulator:
 
 <!--codeinclude-->
-[Create a test Spanner instance](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:createInstance
+[Create a test Spanner instance](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java) inside_block:createInstance
 <!--/codeinclude-->
 
 Create a test Database in the Emulator:
 
 <!--codeinclude-->
-[Creating a test Spanner database](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:createDatabase
+[Creating a test Spanner database](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java) inside_block:createDatabase
 <!--/codeinclude-->
 
 And test against the Emulator:
 
 <!--codeinclude-->
-[Testing with a Spanner Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+[Testing with a Spanner Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
 <!--/codeinclude-->
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/spanner-example/src/test/java/com/example/springboot/spanner/SpannerIntegrationTests.java)
 
 ### Pub/Sub 
@@ -124,30 +124,30 @@ See more examples:
 Start Pub/Sub Emulator during a test:
 
 <!--codeinclude-->
-[Starting a Pub/Sub Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:emulatorContainer
+[Starting a Pub/Sub Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 Create a test Pub/Sub topic in the Emulator:
 
 <!--codeinclude-->
-[Create a test topic](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:createTopic
+[Create a test topic](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java) inside_block:createTopic
 <!--/codeinclude-->
 
 Create a test Pub/Sub subscription in the Emulator:
 
 <!--codeinclude-->
-[Create a test subscription](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:createSubscription
+[Create a test subscription](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java) inside_block:createSubscription
 <!--/codeinclude-->
 
 And test against the Emulator:
 
 <!--codeinclude-->
-[Testing with a Pub/Sub Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
+[Testing with a Pub/Sub Emulator container](../../modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java) inside_block:testWithEmulatorContainer
 <!--/codeinclude-->
 
 See more examples:
 
- * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java)
+ * [Full sample code](https://github.com/testcontainers/testcontainers-java/tree/main/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java)
  * [With Spring Boot](https://github.com/saturnism/testcontainers-gcloud-examples/tree/main/springboot/pubsub-example/src/test/java/com/example/springboot/pubsub/PubSubIntegrationTests.java)
 
 ## Adding this module to your project dependencies
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
index 6831785b0a5..6590c6cab5b 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
@@ -7,7 +7,10 @@
  * <p>
  * Supported image: {@code ghcr.io/goccy/bigquery-emulator}
  * <p>
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.BigQueryEmulatorContainer} instead.
  */
+@Deprecated
 public class BigQueryEmulatorContainer extends GenericContainer<BigQueryEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/goccy/bigquery-emulator");
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index e9bff52b781..288cd499e37 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -9,7 +9,10 @@
  * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
  * <p>
  * Default port is 9000.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.BigtableEmulatorContainer} instead.
  */
+@Deprecated
 public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index eb86fa3932f..cbe27e303f4 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -9,7 +9,10 @@
  * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
  * <p>
  * Default port is 8081.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.DatastoreEmulatorContainer} instead.
  */
+@Deprecated
 public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index db703cda5b4..3c8d12f82ad 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -9,7 +9,10 @@
  * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
  * <p>
  * Default port is 8080.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.FirestoreEmulatorContainer} instead.
  */
+@Deprecated
 public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index c9b53596ab7..9f061873962 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -9,7 +9,10 @@
  * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
  * <p>
  * Default port is 8085.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.PubSubEmulatorContainer} instead.
  */
+@Deprecated
 public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index eff48a8777c..76a95d4c4ac 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -7,7 +7,10 @@
  * A Spanner container. Default ports: 9010 for GRPC and 9020 for HTTP.
  * <p>
  * Supported image: {@code gcr.io/cloud-spanner-emulator/emulator}
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.SpannerEmulatorContainer} instead.
  */
+@Deprecated
 public class SpannerEmulatorContainer extends GenericContainer<SpannerEmulatorContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigQueryEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigQueryEmulatorContainer.java
new file mode 100644
index 00000000000..b5d00bf374a
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigQueryEmulatorContainer.java
@@ -0,0 +1,44 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for BigQuery.
+ * <p>
+ * Supported image: {@code ghcr.io/goccy/bigquery-emulator}
+ * <p>
+ */
+public class BigQueryEmulatorContainer extends GenericContainer<BigQueryEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/goccy/bigquery-emulator");
+
+    private static final int HTTP_PORT = 9050;
+
+    private static final int GRPC_PORT = 9060;
+
+    private static final String PROJECT_ID = "test-project";
+
+    public BigQueryEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public BigQueryEmulatorContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        addExposedPorts(HTTP_PORT, GRPC_PORT);
+        withCommand("--project", PROJECT_ID);
+    }
+
+    public String getEmulatorHttpEndpoint() {
+        return String.format("http://%s:%d", getHost(), getMappedPort(HTTP_PORT));
+    }
+
+    public Integer getEmulatorGrpcPort() {
+        return getMappedPort(GRPC_PORT);
+    }
+
+    public String getProjectId() {
+        return PROJECT_ID;
+    }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigtableEmulatorContainer.java
new file mode 100644
index 00000000000..b1e62ae0aa1
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigtableEmulatorContainer.java
@@ -0,0 +1,53 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Bigtable container that relies in google cloud sdk.
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
+ * Default port is 9000.
+ */
+public class BigtableEmulatorContainer extends GenericContainer<BigtableEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
+
+    private static final String CMD = "gcloud beta emulators bigtable start --host-port 0.0.0.0:9000";
+
+    private static final int PORT = 9000;
+
+    public BigtableEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+        withExposedPorts(PORT);
+        setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
+        withCommand("/bin/sh", "-c", CMD);
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getHost() + ":" + getEmulatorPort();
+    }
+
+    public int getEmulatorPort() {
+        return getMappedPort(PORT);
+    }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/DatastoreEmulatorContainer.java
new file mode 100644
index 00000000000..360aedce686
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/DatastoreEmulatorContainer.java
@@ -0,0 +1,73 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Datastore container that relies in google cloud sdk.
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
+ * Default port is 8081.
+ */
+public class DatastoreEmulatorContainer extends GenericContainer<DatastoreEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
+
+    private static final String PROJECT_ID = "test-project";
+
+    private static final String CMD = String.format(
+        "gcloud beta emulators datastore start --project %s --host-port 0.0.0.0:8081",
+        PROJECT_ID
+    );
+
+    private static final int HTTP_PORT = 8081;
+
+    private String flags;
+
+    public DatastoreEmulatorContainer(final String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+        withExposedPorts(HTTP_PORT);
+        setWaitStrategy(Wait.forHttp("/").forStatusCode(200));
+    }
+
+    @Override
+    protected void configure() {
+        String command = CMD;
+        if (this.flags != null && !this.flags.isEmpty()) {
+            command += " " + this.flags;
+        }
+        withCommand("/bin/sh", "-c", command);
+    }
+
+    public DatastoreEmulatorContainer withFlags(String flags) {
+        this.flags = flags;
+        return this;
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getHost() + ":" + getMappedPort(HTTP_PORT);
+    }
+
+    public String getProjectId() {
+        return PROJECT_ID;
+    }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/FirestoreEmulatorContainer.java
new file mode 100644
index 00000000000..140f7166307
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/FirestoreEmulatorContainer.java
@@ -0,0 +1,64 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Firestore container that relies in google cloud sdk.
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
+ * Default port is 8080.
+ */
+public class FirestoreEmulatorContainer extends GenericContainer<FirestoreEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
+
+    private static final String CMD = "gcloud beta emulators firestore start --host-port 0.0.0.0:8080";
+
+    private static final int PORT = 8080;
+
+    private String flags;
+
+    public FirestoreEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+        withExposedPorts(PORT);
+        setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
+    }
+
+    @Override
+    protected void configure() {
+        String command = CMD;
+        if (this.flags != null && !this.flags.isEmpty()) {
+            command += " " + this.flags;
+        }
+        withCommand("/bin/sh", "-c", command);
+    }
+
+    public FirestoreEmulatorContainer withFlags(String flags) {
+        this.flags = flags;
+        return this;
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getHost() + ":" + getMappedPort(8080);
+    }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/PubSubEmulatorContainer.java
new file mode 100644
index 00000000000..417ee8dc524
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/PubSubEmulatorContainer.java
@@ -0,0 +1,49 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A PubSub container that relies in google cloud sdk.
+ * <p>
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ * <p>
+ * Default port is 8085.
+ */
+public class PubSubEmulatorContainer extends GenericContainer<PubSubEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+    );
+
+    private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    );
+
+    private static final String CMD = "gcloud beta emulators pubsub start --host-port 0.0.0.0:8085";
+
+    private static final int PORT = 8085;
+
+    public PubSubEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+        withExposedPorts(8085);
+        setWaitStrategy(Wait.forLogMessage(".*started.*$", 1));
+        withCommand("/bin/sh", "-c", CMD);
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator is
+     * reachable from the test host machine. Directly usable as a parameter to the
+     * io.grpc.ManagedChannelBuilder#forTarget(java.lang.String) method.
+     */
+    public String getEmulatorEndpoint() {
+        return getHost() + ":" + getMappedPort(PORT);
+    }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/SpannerEmulatorContainer.java
new file mode 100644
index 00000000000..aa99f6be5f4
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/SpannerEmulatorContainer.java
@@ -0,0 +1,50 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Spanner container. Default ports: 9010 for GRPC and 9020 for HTTP.
+ * <p>
+ * Supported image: {@code gcr.io/cloud-spanner-emulator/emulator}
+ */
+public class SpannerEmulatorContainer extends GenericContainer<SpannerEmulatorContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+        "gcr.io/cloud-spanner-emulator/emulator"
+    );
+
+    private static final int GRPC_PORT = 9010;
+
+    private static final int HTTP_PORT = 9020;
+
+    public SpannerEmulatorContainer(String image) {
+        this(DockerImageName.parse(image));
+    }
+
+    public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(GRPC_PORT, HTTP_PORT);
+        setWaitStrategy(Wait.forLogMessage(".*Cloud Spanner emulator running\\..*", 1));
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator's
+     * gRPC endpoint is reachable from the test host machine. Directly usable as a parameter to the
+     * com.google.cloud.spanner.SpannerOptions.Builder#setEmulatorHost(java.lang.String) method.
+     */
+    public String getEmulatorGrpcEndpoint() {
+        return getHost() + ":" + getMappedPort(GRPC_PORT);
+    }
+
+    /**
+     * @return a <code>host:port</code> pair corresponding to the address on which the emulator's
+     * HTTP REST endpoint is reachable from the test host machine.
+     */
+    public String getEmulatorHttpEndpoint() {
+        return getHost() + ":" + getMappedPort(HTTP_PORT);
+    }
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java
similarity index 99%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java
index 0337cd563b9..7d657830fa4 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
 
 import com.google.api.core.ApiFuture;
 import com.google.api.gax.core.NoCredentialsProvider;
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
similarity index 99%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
index 8c84cfa79db..64f19a42df5 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
 
 import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.core.NoCredentialsProvider;
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
similarity index 98%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
index 1b743f1e3cd..dceec1af215 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
 
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
similarity index 98%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
index 57494ef5535..2c3233388aa 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
 
 import com.google.api.core.ApiFuture;
 import com.google.cloud.NoCredentials;
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
similarity index 99%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
index 7d92c50a775..eb3ed0260ee 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
 
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GrpcTransportChannel;
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java
similarity index 99%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java
index 3d651ad6a53..2d6ac963882 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
 
 import com.google.cloud.NoCredentials;
 import com.google.cloud.spanner.Database;

From 0102bcbfe52eb15b61b934174ab4d5767ebb0260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 12:52:09 -0600
Subject: [PATCH 4652/4969] Add LocalStack container implementation under
 org.testcontainers.localstack (#11082)

---
 docs/modules/localstack.md                    |  34 +--
 .../localstack/LocalStackContainer.java       |   3 +
 .../localstack/LocalStackContainer.java       | 220 ++++++++++++++++++
 .../localstack/LocalstackTestImages.java      |   2 +-
 .../LocalStackContainerTest.java}             | 120 ++--------
 5 files changed, 246 insertions(+), 133 deletions(-)
 create mode 100644 modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java
 rename modules/localstack/src/test/java/org/testcontainers/{containers/localstack/LocalstackContainerTest.java => localstack/LocalStackContainerTest.java} (81%)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 5527416e854..0afbea358c6 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -4,45 +4,21 @@ Testcontainers module for [LocalStack](http://localstack.cloud/), 'a fully funct
 
 ## Usage example
 
-Running LocalStack as a stand-in for AWS S3 during a test:
+You can start a LocalStack container instance from any Java application by using:
 
-```java
-DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:3.5.0");
-
-@Rule
-public LocalStackContainer localstack = new LocalStackContainer(localstackImage)
-        .withServices(S3);
-```
+<!--codeinclude-->
+[Container creation](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:container
+<!--/codeinclude-->
 
 ## Creating a client using AWS SDK
 
 <!--codeinclude-->
-[AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v2
+[AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:with_aws_sdk_v2
 <!--/codeinclude-->
 
 Environment variables listed in [Localstack's README](https://github.com/localstack/localstack#configurations) may be used to customize Localstack's configuration. 
 Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
 
-## `HOSTNAME_EXTERNAL` and hostname-sensitive services
-
-Some Localstack APIs, such as SQS, require the container to be aware of the hostname that it is accessible on - for example, for construction of queue URLs in responses.
-
-Testcontainers will inform Localstack of the best hostname automatically, using the `HOSTNAME_EXTERNAL` environment variable:
-
-* when running the Localstack container directly without a custom network defined, it is expected that all calls to the container will be from the test host. As such, the container address will be used (typically localhost or the address where the Docker daemon is running).
-
-    <!--codeinclude-->
-    [Localstack container running without a custom network](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:without_network
-    <!--/codeinclude-->
-
-* when running the Localstack container [with a custom network defined](/features/networking/#advanced-networking), it is expected that all calls to the container will be **from other containers on that network**. `HOSTNAME_EXTERNAL` will be set to the *last* network alias that has been configured for the Localstack container.
-
-    <!--codeinclude-->
-    [Localstack container running with a custom network](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_network
-    <!--/codeinclude-->
-
-* Other usage scenarios, such as where the Localstack container is used from both the test host and containers on a custom network are not automatically supported. If you have this use case, you should set `HOSTNAME_EXTERNAL` manually.
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index c38d5a34728..083f642e11c 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -28,8 +28,11 @@
  * Supported images: {@code localstack/localstack}, {@code localstack/localstack-pro}
  * <p>
  * Exposed ports: 4566
+ *
+ * @deprecated use {@link org.testcontainers.localstack.LocalStackContainer} instead.
  */
 @Slf4j
+@Deprecated
 public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     static final int PORT = 4566;
diff --git a/modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java
new file mode 100644
index 00000000000..779f9a1e4ad
--- /dev/null
+++ b/modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java
@@ -0,0 +1,220 @@
+package org.testcontainers.localstack;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Testcontainers implementation for LocalStack.
+ * <p>
+ * Supported images: {@code localstack/localstack}, {@code localstack/localstack-pro}
+ * <p>
+ * Exposed ports: 4566
+ */
+@Slf4j
+public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
+
+    static final int PORT = 4566;
+
+    private final List<String> services = new ArrayList<>();
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("localstack/localstack");
+
+    private static final DockerImageName LOCALSTACK_PRO_IMAGE_NAME = DockerImageName.parse("localstack/localstack-pro");
+
+    private static final String DEFAULT_REGION = "us-east-1";
+
+    private static final String DEFAULT_AWS_ACCESS_KEY_ID = "test";
+
+    private static final String DEFAULT_AWS_SECRET_ACCESS_KEY = "test";
+
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
+    /**
+     * @param dockerImageName    image name to use for Localstack
+     */
+    public LocalStackContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * @param dockerImageName    image name to use for Localstack
+     */
+    public LocalStackContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, LOCALSTACK_PRO_IMAGE_NAME);
+
+        withExposedPorts(PORT);
+        withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
+        waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.withEntrypoint(
+                "sh",
+                "-c",
+                "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT
+            );
+        });
+    }
+
+    @Override
+    protected void configure() {
+        if (!services.isEmpty()) {
+            withEnv("SERVICES", String.join(",", this.services));
+        }
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        String command = "#!/bin/bash\n";
+        command += "export LAMBDA_DOCKER_FLAGS=" + configureServiceContainerLabels("LAMBDA_DOCKER_FLAGS") + "\n";
+        command += "export ECS_DOCKER_FLAGS=" + configureServiceContainerLabels("ECS_DOCKER_FLAGS") + "\n";
+        command += "export EC2_DOCKER_FLAGS=" + configureServiceContainerLabels("EC2_DOCKER_FLAGS") + "\n";
+        command += "export BATCH_DOCKER_FLAGS=" + configureServiceContainerLabels("BATCH_DOCKER_FLAGS") + "\n";
+        command += "/usr/local/bin/docker-entrypoint.sh\n";
+        copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
+    }
+
+    /**
+     * Configure the LocalStack container to include the default testcontainers labels on all spawned lambda containers
+     * Necessary to properly clean up lambda containers even if the LocalStack container is killed before it gets the
+     * chance.
+     * @return the lambda container labels as a string
+     */
+    private String configureServiceContainerLabels(String existingEnvFlagKey) {
+        String internalMarkerFlags = internalMarkerLabels();
+        String existingFlags = getEnvMap().get(existingEnvFlagKey);
+        if (existingFlags != null) {
+            internalMarkerFlags = existingFlags + " " + internalMarkerFlags;
+        }
+        return "\"" + internalMarkerFlags + "\"";
+    }
+
+    /**
+     * Provides a docker argument string including all default labels set on testcontainers containers (excluding reuse labels)
+     * @return Argument string in the format `-l key1=value1 -l key2=value2`
+     */
+    private String internalMarkerLabels() {
+        return getContainerInfo()
+            .getConfig()
+            .getLabels()
+            .entrySet()
+            .stream()
+            .filter(entry -> entry.getKey().startsWith(DockerClientFactory.TESTCONTAINERS_LABEL))
+            .filter(entry -> {
+                return (
+                    !entry.getKey().equals("org.testcontainers.hash") &&
+                    !entry.getKey().equals("org.testcontainers.copied_files.hash")
+                );
+            })
+            .map(entry -> String.format("-l %s=%s", entry.getKey(), entry.getValue()))
+            .collect(Collectors.joining(" "));
+    }
+
+    /**
+     * Declare a set of simulated AWS services that should be launched by this container.
+     * @param services one or more service names
+     * @return this container object
+     */
+    public LocalStackContainer withServices(String... services) {
+        this.services.addAll(Arrays.asList(services));
+        return self();
+    }
+
+    /**
+     * Provides an endpoint to communicate with LocalStack service.
+     * The provided endpoint should be set in the AWS Java SDK v2 when building a client, e.g.:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpoint())
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+             </code></pre>
+     * <p><strong>Please note that this method is only intended to be used for configuring AWS SDK clients
+     * that are running on the test host. If other containers need to call this one, they should be configured
+     * specifically to do so using a Docker network and appropriate addressing.</strong></p>
+     *
+     * @return an {@link URI} endpoint
+     */
+    public URI getEndpoint() {
+        try {
+            final String address = getHost();
+            // resolve IP address and use that as the endpoint so that path-style access is automatically used for S3
+            String ipAddress = InetAddress.getByName(address).getHostAddress();
+            return new URI("http://" + ipAddress + ":" + getMappedPort(PORT));
+        } catch (UnknownHostException | URISyntaxException e) {
+            throw new IllegalStateException("Cannot obtain endpoint URL", e);
+        }
+    }
+
+    /**
+     * Provides a default access key that is preconfigured to communicate with a given simulated service.
+     * <a href="https://github.com/localstack/localstack/blob/master/doc/interaction/README.md?plain=1#L32">AWS Access Key</a>
+     * The access key can be used to construct AWS SDK v2 clients:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
+     * @return a default access key
+     */
+    public String getAccessKey() {
+        return this.getEnvMap().getOrDefault("AWS_ACCESS_KEY_ID", DEFAULT_AWS_ACCESS_KEY_ID);
+    }
+
+    /**
+     * Provides a default secret key that is preconfigured to communicate with a given simulated service.
+     * <a href="https://github.com/localstack/localstack/blob/master/doc/interaction/README.md?plain=1#L32">AWS Secret Key</a>
+     * The secret key can be used to construct AWS SDK v2 clients:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
+     * @return a default secret key
+     */
+    public String getSecretKey() {
+        return this.getEnvMap().getOrDefault("AWS_SECRET_ACCESS_KEY", DEFAULT_AWS_SECRET_ACCESS_KEY);
+    }
+
+    /**
+     * Provides a default region that is preconfigured to communicate with a given simulated service.
+     * The region can be used to construct AWS SDK v2 clients:
+     * <pre><code>S3Client s3 = S3Client
+             .builder()
+             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+             localstack.getAccessKey(), localstack.getSecretKey()
+             )))
+             .region(Region.of(localstack.getRegion()))
+             .build()
+     </code></pre>
+     * @return a default region
+     */
+    public String getRegion() {
+        return this.getEnvMap().getOrDefault("DEFAULT_REGION", DEFAULT_REGION);
+    }
+}
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index bb9366c435b..9ca7dd6614f 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -3,7 +3,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface LocalstackTestImages {
-    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:4.7.0");
+    DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:4.9.2");
 
     DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
 
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java
similarity index 81%
rename from modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
rename to modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java
index fa102bbc13d..f3fa6a07457 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
+++ b/modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers.localstack;
+package org.testcontainers.localstack;
 
 import com.github.dockerjava.api.DockerClient;
 import lombok.extern.slf4j.Slf4j;
@@ -11,8 +11,7 @@
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.localstack.LocalStackContainer.Service;
-import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.containers.localstack.LocalstackTestImages;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.SdkBytes;
@@ -64,17 +63,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Slf4j
-class LocalstackContainerTest {
+class LocalStackContainerTest {
 
     @Nested
     class WithoutNetwork {
 
         @Test
-        void s3TestOverBridgeNetwork() throws IOException {
+        void s3TestOverBridgeNetwork() {
             try (
-                // without_network {
+                // container {
                 LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
-                    .withServices(Service.S3)
+                    .withServices("s3")
                 // }
             ) {
                 localstack.start();
@@ -126,7 +125,7 @@ void sqsTestOverBridgeNetwork() {
             try (
                 LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
                     .withEnv("SQS_ENDPOINT_STRATEGY", "dynamic")
-                    .withServices(Service.SQS)
+                    .withServices("sqs")
             ) {
                 localstack.start();
 
@@ -161,7 +160,7 @@ void sqsTestOverBridgeNetwork() {
         void cloudWatchLogsTestOverBridgeNetwork() {
             try (
                 LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
-                    .withServices(Service.CLOUDWATCHLOGS)
+                    .withServices("logs")
             ) {
                 localstack.start();
 
@@ -190,7 +189,7 @@ void cloudWatchLogsTestOverBridgeNetwork() {
         void kmsKeyCreationTest() {
             try (
                 LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
-                    .withServices(Service.KMS)
+                    .withServices("kms")
             ) {
                 localstack.start();
                 KmsClient kms = KmsClient
@@ -221,9 +220,9 @@ void samePortIsExposedForAllServices() {
                 localstack.start();
 
                 assertThat(localstack.getExposedPorts()).as("A single port is exposed").hasSize(1);
-                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
+                assertThat(localstack.getEndpoint().toString())
                     .as("Endpoint overrides are different")
-                    .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
+                    .isEqualTo(localstack.getEndpoint().toString());
             }
         }
     }
@@ -234,12 +233,10 @@ class WithNetwork {
         // with_network {
         Network network = Network.newNetwork();
 
-        LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(
-            DockerImageName.parse("localstack/localstack:0.12.8")
-        )
+        LocalStackContainer localstackInDockerNetwork = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
             .withNetwork(network)
-            .withNetworkAliases("notthis", "localstack") // the last alias is used for HOSTNAME_EXTERNAL
-            .withServices(Service.S3, Service.SQS, Service.CLOUDWATCHLOGS);
+            .withNetworkAliases("localstack")
+            .withServices("s3", "sqs", "logs");
         // }
 
         GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(LocalstackTestImages.AWS_CLI_IMAGE)
@@ -262,14 +259,6 @@ void tearDown() {
             localstackInDockerNetwork.stop();
         }
 
-        @Test
-        void localstackHostEnVarIsSet() {
-            localstackInDockerNetwork.start();
-            awsCliInDockerNetwork.start();
-
-            assertThat(localstackInDockerNetwork.getEnvMap().get("HOSTNAME_EXTERNAL")).isEqualTo("localstack");
-        }
-
         @Test
         void s3TestOverDockerNetwork() throws Exception {
             runAwsCliAgainstDockerNetworkContainer(
@@ -285,20 +274,16 @@ void sqsTestOverDockerNetwork() throws Exception {
                 "sqs create-queue --queue-name baz"
             );
 
-            assertThat(queueCreationResponse)
-                .as("Created queue has external hostname URL")
-                .contains("http://localstack:" + LocalStackContainer.PORT);
-
             runAwsCliAgainstDockerNetworkContainer(
                 String.format(
-                    "sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test",
+                    "sqs send-message --endpoint http://localstack:%d --queue-url http://sqs.eu-west-1.localhost.localstack.cloud:%d/000000000000/baz --message-body test",
                     LocalStackContainer.PORT,
                     LocalStackContainer.PORT
                 )
             );
             final String message = runAwsCliAgainstDockerNetworkContainer(
                 String.format(
-                    "sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz",
+                    "sqs receive-message --endpoint http://localstack:%d --queue-url http://sqs.eu-west-1.localhost.localstack.cloud:%d/000000000000/baz",
                     LocalStackContainer.PORT,
                     LocalStackContainer.PORT
                 )
@@ -338,7 +323,7 @@ void s3EndpointHasProperRegion() {
                 // with_region {
                 LocalStackContainer localstack = new LocalStackContainer(LocalstackTestImages.LOCALSTACK_IMAGE)
                     .withEnv("DEFAULT_REGION", "eu-west-1")
-                    .withServices(Service.S3);
+                    .withServices("s3");
                 // }
             ) {
                 localstack.start();
@@ -370,77 +355,6 @@ void s3ServiceStartLazily() {
                 assertThat(s3.listBuckets().buckets()).as("S3 Service is started lazily").isEmpty();
             }
         }
-
-        @Test
-        void sqsTestOverDockerNetwork() throws Exception {
-            try (
-                Network network = Network.newNetwork();
-                LocalStackContainer localstack = new LocalStackContainer(
-                    DockerImageName.parse("localstack/localstack:2.0")
-                )
-                    .withNetwork(network)
-                    .withNetworkAliases("localstack");
-                GenericContainer<?> awsCliInDockerNetwork = new GenericContainer<>(LocalstackTestImages.AWS_CLI_IMAGE)
-                    .withNetwork(network)
-                    .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("tail"))
-                    .withCommand(" -f /dev/null")
-                    .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
-                    .withEnv("AWS_SECRET_ACCESS_KEY", "secretkey")
-                    .withEnv("AWS_REGION", "eu-west-1")
-            ) {
-                localstack.start();
-                awsCliInDockerNetwork.start();
-
-                assertThat(localstack.getEnvMap().get("LOCALSTACK_HOST")).isEqualTo("localstack");
-
-                final String queueCreationResponse = runAwsCliAgainstDockerNetworkContainer(
-                    "sqs create-queue --queue-name baz",
-                    awsCliInDockerNetwork
-                );
-
-                assertThat(queueCreationResponse)
-                    .as("Created queue has external hostname URL")
-                    .contains("http://localstack:" + LocalStackContainer.PORT);
-
-                runAwsCliAgainstDockerNetworkContainer(
-                    String.format(
-                        "sqs send-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz --message-body test",
-                        LocalStackContainer.PORT,
-                        LocalStackContainer.PORT
-                    ),
-                    awsCliInDockerNetwork
-                );
-                final String message = runAwsCliAgainstDockerNetworkContainer(
-                    String.format(
-                        "sqs receive-message --endpoint http://localstack:%d --queue-url http://localstack:%d/queue/baz",
-                        LocalStackContainer.PORT,
-                        LocalStackContainer.PORT
-                    ),
-                    awsCliInDockerNetwork
-                );
-
-                assertThat(message).as("the sent message can be received").contains("\"Body\": \"test\"");
-            }
-        }
-
-        private String runAwsCliAgainstDockerNetworkContainer(
-            String command,
-            GenericContainer<?> awsCliInDockerNetwork
-        ) throws Exception {
-            final String[] commandParts = String
-                .format(
-                    "/usr/local/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl",
-                    command,
-                    LocalStackContainer.PORT
-                )
-                .split(" ");
-            final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);
-            assertThat(execResult.getExitCode()).isEqualTo(0);
-
-            final String logs = execResult.getStdout() + execResult.getStderr();
-            log.info(logs);
-            return logs;
-        }
     }
 
     @Nested

From 565e73c8e6c9a5e90453b990d41b4e792b86011f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 14:40:13 -0600
Subject: [PATCH 4653/4969] Add MariaDB container implementation under
 org.testcontainers.mariadb (#11083)

---
 docs/modules/databases/mariadb.md             |   2 +-
 .../containers/MariaDBContainer.java          |   3 +
 .../mariadb/MariaDBContainer.java             | 136 ++++++++++++++++++
 .../MariaDBContainerTest.java}                |  21 ++-
 4 files changed, 150 insertions(+), 12 deletions(-)
 create mode 100644 modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java
 rename modules/mariadb/src/test/java/org/testcontainers/{junit/mariadb/SimpleMariaDBTest.java => mariadb/MariaDBContainerTest.java} (85%)

diff --git a/docs/modules/databases/mariadb.md b/docs/modules/databases/mariadb.md
index 2968c7a7e13..01d66139f1a 100644
--- a/docs/modules/databases/mariadb.md
+++ b/docs/modules/databases/mariadb.md
@@ -7,7 +7,7 @@ Testcontainers module for [MariaDB](https://hub.docker.com/_/mariadb)
 You can start a MySQL container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container definition](../../../modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java) inside_block:container
+[Container definition](../../../modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
index bff0faf9d03..6c9ffda7722 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -12,7 +12,10 @@
  * Supported image: {@code mariadb}
  * <p>
  * Exposed ports: 3306
+ *
+ * @deprecated use {@link org.testcontainers.mariadb.MariaDBContainer} instead.
  */
+@Deprecated
 public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mariadb");
diff --git a/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java
new file mode 100644
index 00000000000..957754c946b
--- /dev/null
+++ b/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java
@@ -0,0 +1,136 @@
+package org.testcontainers.mariadb;
+
+import com.google.common.collect.Sets;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for MariaDB.
+ * <p>
+ * Supported image: {@code mariadb}
+ * <p>
+ * Exposed ports: 3306
+ */
+public class MariaDBContainer extends JdbcDatabaseContainer<MariaDBContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mariadb");
+
+    public static final String NAME = "mariadb";
+
+    static final String DEFAULT_USER = "test";
+
+    static final String DEFAULT_PASSWORD = "test";
+
+    static final Integer MARIADB_PORT = 3306;
+
+    private String databaseName = "test";
+
+    private String username = DEFAULT_USER;
+
+    private String password = DEFAULT_PASSWORD;
+
+    private static final String MARIADB_ROOT_USER = "root";
+
+    private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
+
+    public MariaDBContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MariaDBContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPort(MARIADB_PORT);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Sets.newHashSet(MARIADB_PORT);
+    }
+
+    @Override
+    protected void configure() {
+        optionallyMapResourceParameterAsVolume(
+            MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
+            "/etc/mysql/conf.d",
+            "mariadb-default-conf",
+            Transferable.DEFAULT_DIR_MODE
+        );
+
+        addEnv("MYSQL_DATABASE", databaseName);
+
+        if (!MARIADB_ROOT_USER.equalsIgnoreCase(this.username)) {
+            addEnv("MYSQL_USER", username);
+        }
+        if (password != null && !password.isEmpty()) {
+            addEnv("MYSQL_PASSWORD", password);
+            addEnv("MYSQL_ROOT_PASSWORD", password);
+        } else if (MARIADB_ROOT_USER.equalsIgnoreCase(username)) {
+            addEnv("MYSQL_ALLOW_EMPTY_PASSWORD", "yes");
+        } else {
+            throw new ContainerLaunchException("Empty password can be used only with the root user");
+        }
+        setStartupAttempts(3);
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "org.mariadb.jdbc.Driver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return (
+            "jdbc:mariadb://" + getHost() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName + additionalUrlParams
+        );
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1";
+    }
+
+    public MariaDBContainer withConfigurationOverride(String s) {
+        parameters.put(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, s);
+        return self();
+    }
+
+    @Override
+    public MariaDBContainer withDatabaseName(final String databaseName) {
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    @Override
+    public MariaDBContainer withUsername(final String username) {
+        this.username = username;
+        return self();
+    }
+
+    @Override
+    public MariaDBContainer withPassword(final String password) {
+        this.password = password;
+        return self();
+    }
+}
diff --git a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java b/modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBContainerTest.java
similarity index 85%
rename from modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
rename to modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBContainerTest.java
index 4e88c8981eb..99348f9168d 100644
--- a/modules/mariadb/src/test/java/org/testcontainers/junit/mariadb/SimpleMariaDBTest.java
+++ b/modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBContainerTest.java
@@ -1,9 +1,8 @@
-package org.testcontainers.junit.mariadb;
+package org.testcontainers.mariadb;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.MariaDBTestImages;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.io.File;
@@ -20,12 +19,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-class SimpleMariaDBTest extends AbstractContainerDatabaseTest {
+class MariaDBContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            MariaDBContainer<?> mariadb = new MariaDBContainer<>("mariadb:10.3.39")
+            MariaDBContainer mariadb = new MariaDBContainer("mariadb:10.3.39")
             // }
         ) {
             mariadb.start();
@@ -40,7 +39,7 @@ void testSimple() throws SQLException {
     @Test
     void testSpecificVersion() throws SQLException {
         try (
-            MariaDBContainer<?> mariadbOldVersion = new MariaDBContainer<>(
+            MariaDBContainer mariadbOldVersion = new MariaDBContainer(
                 MariaDBTestImages.MARIADB_IMAGE.withTag("10.3.39")
             )
         ) {
@@ -60,7 +59,7 @@ void testMariaDBWithCustomIniFile() throws SQLException {
         assumeThat(SystemUtils.IS_OS_WINDOWS).isFalse();
 
         try (
-            MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(
+            MariaDBContainer mariadbCustomConfig = new MariaDBContainer(
                 MariaDBTestImages.MARIADB_IMAGE.withTag("10.3.39")
             )
                 .withConfigurationOverride("somepath/mariadb_conf_override")
@@ -74,7 +73,7 @@ void testMariaDBWithCustomIniFile() throws SQLException {
     @Test
     void testMariaDBWithCommandOverride() throws SQLException {
         try (
-            MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)
+            MariaDBContainer mariadbCustomConfig = new MariaDBContainer(MariaDBTestImages.MARIADB_IMAGE)
                 .withCommand("mysqld --auto_increment_increment=10")
         ) {
             mariadbCustomConfig.start();
@@ -87,7 +86,7 @@ void testMariaDBWithCommandOverride() throws SQLException {
 
     @Test
     void testWithAdditionalUrlParamInJdbcUrl() {
-        MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MariaDBTestImages.MARIADB_IMAGE)
+        MariaDBContainer mariaDBContainer = new MariaDBContainer(MariaDBTestImages.MARIADB_IMAGE)
             .withUrlParam("connectTimeout", "40000")
             .withUrlParam("rewriteBatchedStatements", "true");
 
@@ -108,7 +107,7 @@ void testWithOnlyUserReadableCustomIniFile() throws Exception {
         assumeThat(FileSystems.getDefault().supportedFileAttributeViews().contains("posix")).isTrue();
 
         try (
-            MariaDBContainer<?> mariadbCustomConfig = new MariaDBContainer<>(
+            MariaDBContainer mariadbCustomConfig = new MariaDBContainer(
                 MariaDBTestImages.MARIADB_IMAGE.withTag("10.3.39")
             )
                 .withConfigurationOverride("somepath/mariadb_conf_override")
@@ -136,7 +135,7 @@ void testWithOnlyUserReadableCustomIniFile() throws Exception {
 
     @Test
     void testEmptyPasswordWithRootUser() throws SQLException {
-        try (MariaDBContainer<?> mysql = new MariaDBContainer<>("mariadb:11.2.4").withUsername("root")) {
+        try (MariaDBContainer mysql = new MariaDBContainer("mariadb:11.2.4").withUsername("root")) {
             mysql.start();
 
             ResultSet resultSet = performQuery(mysql, "SELECT 1");
@@ -146,7 +145,7 @@ void testEmptyPasswordWithRootUser() throws SQLException {
         }
     }
 
-    private void assertThatCustomIniFileWasUsed(MariaDBContainer<?> mariadb) throws SQLException {
+    private void assertThatCustomIniFileWasUsed(MariaDBContainer mariadb) throws SQLException {
         try (ResultSet resultSet = performQuery(mariadb, "SELECT @@GLOBAL.innodb_max_undo_log_size")) {
             long result = resultSet.getLong(1);
             assertThat(result)

From 4cda0841333d385f5d4504b42517322239e2f071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 14:40:24 -0600
Subject: [PATCH 4654/4969] Add MockServer container implementation under
 org.testcontainers.mockserver (#11084)

---
 docs/modules/mockserver.md                    |  4 +-
 .../containers/MockServerContainer.java       |  4 ++
 .../mockserver/MockServerContainer.java       | 49 +++++++++++++++++
 .../MockServerContainerRuleTest.java          | 55 -------------------
 .../MockServerContainerTest.java              | 13 +++--
 5 files changed, 63 insertions(+), 62 deletions(-)
 create mode 100644 modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java
 delete mode 100644 modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
 rename modules/mockserver/src/test/java/org/testcontainers/{containers => mockserver}/MockServerContainerTest.java (92%)

diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md
index c739278acff..fc4402ae9e8 100644
--- a/docs/modules/mockserver.md
+++ b/docs/modules/mockserver.md
@@ -7,13 +7,13 @@ Mock Server can be used to mock HTTP services by matching requests against user-
 The following example shows how to start Mockserver.
 
 <!--codeinclude-->
-[Creating a MockServer container](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java) inside_block:creatingProxy
+[Creating a MockServer container](../../modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java) inside_block:creatingProxy
 <!--/codeinclude-->
 
 And how to set a simple expectation using the Java MockServerClient.
 
 <!--codeinclude-->
-[Setting a simple expectation](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java) inside_block:testSimpleExpectation
+[Setting a simple expectation](../../modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java) inside_block:testSimpleExpectation
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 00937214445..f69c5e86a6d 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -4,7 +4,11 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
+/**
+ * @deprecated use {@link org.testcontainers.mockserver.MockServerContainer} instead.
+ */
 @Slf4j
+@Deprecated
 public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver");
diff --git a/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java
new file mode 100644
index 00000000000..cbfcbc9fd66
--- /dev/null
+++ b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java
@@ -0,0 +1,49 @@
+package org.testcontainers.mockserver;
+
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+@Slf4j
+public class MockServerContainer extends GenericContainer<MockServerContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver");
+
+    private static final String DEFAULT_TAG = "mockserver-5.5.4";
+
+    @Deprecated
+    public static final String VERSION = DEFAULT_TAG;
+
+    public static final int PORT = 1080;
+
+    /**
+     * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public MockServerContainer(String version) {
+        this(DEFAULT_IMAGE_NAME.withTag("mockserver-" + version));
+    }
+
+    public MockServerContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DockerImageName.parse("mockserver/mockserver"));
+
+        waitingFor(Wait.forLogMessage(".*started on port: " + PORT + ".*", 1));
+
+        withCommand("-serverPort " + PORT);
+        addExposedPorts(PORT);
+    }
+
+    public String getEndpoint() {
+        return String.format("http://%s:%d", getHost(), getMappedPort(PORT));
+    }
+
+    public String getSecureEndpoint() {
+        return String.format("https://%s:%d", getHost(), getMappedPort(PORT));
+    }
+
+    public Integer getServerPort() {
+        return getMappedPort(PORT);
+    }
+}
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
deleted file mode 100644
index c01cad49479..00000000000
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.testcontainers.containers;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.mockserver.client.MockServerClient;
-import org.testcontainers.utility.DockerImageName;
-
-import static io.restassured.RestAssured.given;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockserver.model.HttpRequest.request;
-import static org.mockserver.model.HttpResponse.response;
-
-class MockServerContainerRuleTest {
-
-    // creatingProxy {
-    private static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
-        .parse("mockserver/mockserver")
-        .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
-
-    private static MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
-
-    // }
-
-    @BeforeAll
-    static void setup() {
-        mockServer.start();
-    }
-
-    @AfterAll
-    static void tearDown() {
-        mockServer.stop();
-    }
-
-    @Test
-    void shouldReturnExpectation() {
-        // testSimpleExpectation {
-        try (
-            MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
-        ) {
-            mockServerClient
-                .when(request().withPath("/person").withQueryStringParameter("name", "peter"))
-                .respond(response().withBody("Peter the person!"));
-
-            // ...a GET request to '/person?name=peter' returns "Peter the person!"
-
-            assertThat(
-                given().baseUri(mockServer.getEndpoint()).get("/person?name=peter").then().extract().body().asString()
-            )
-                .as("Expectation returns expected response body")
-                .contains("Peter the person");
-        }
-        // }
-    }
-}
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java
similarity index 92%
rename from modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
rename to modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java
index b1fca9ce514..53325234b8b 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.mockserver;
 
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.config.SSLConfig;
@@ -22,8 +22,11 @@ class MockServerContainerTest {
         .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
     @Test
-    void shouldCallActualMockserverVersion() throws Exception {
-        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
+    void shouldCallActualMockserverVersion() {
+        try ( // creatingProxy {
+            MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)
+            // }
+        ) {
             mockServer.start();
 
             String expectedBody = "Hello World!";
@@ -41,7 +44,7 @@ void shouldCallActualMockserverVersion() throws Exception {
     }
 
     @Test
-    void shouldCallMockserverUsingTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingTlsProtocol() {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
@@ -63,7 +66,7 @@ void shouldCallMockserverUsingTlsProtocol() throws Exception {
     }
 
     @Test
-    void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingMutualTlsProtocol() {
         try (
             MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)
                 .withEnv("MOCKSERVER_TLS_MUTUAL_AUTHENTICATION_REQUIRED", "true")

From 8e508b9c8fb0c6b9f4495a05074ed9e850b63cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 14:40:35 -0600
Subject: [PATCH 4655/4969] Add MSSQLServer container implementation under
 org.testcontainers.mssqlserver (#11085)

---
 docs/modules/databases/mssqlserver.md         |   2 +-
 .../containers/MSSQLServerContainer.java      |   3 +
 .../mssqlserver/MSSQLServerContainer.java     | 156 ++++++++++++++++++
 .../CustomizableMSSQLServerTest.java          |  32 ----
 .../CustomPasswordMSSQLServerTest.java        |   2 +-
 .../MSSQLServerContainerTest.java}            |  32 +++-
 6 files changed, 184 insertions(+), 43 deletions(-)
 create mode 100644 modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLServerContainer.java
 delete mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
 rename modules/mssqlserver/src/test/java/org/testcontainers/{junit => }/mssqlserver/CustomPasswordMSSQLServerTest.java (98%)
 rename modules/mssqlserver/src/test/java/org/testcontainers/{junit/mssqlserver/SimpleMSSQLServerTest.java => mssqlserver/MSSQLServerContainerTest.java} (70%)

diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index f12365aaa18..bde933b1e72 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -7,7 +7,7 @@ Testcontainers module for [MS SQL Server](https://mcr.microsoft.com/en-us/artifa
 You can start a MS SQL Server container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container definition](../../../modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java) inside_block:container
+[Container definition](../../../modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLServerContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 !!! warning "EULA Acceptance"
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index 10ccbff2c36..a30de6549ba 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -13,7 +13,10 @@
  * Supported image: {@code mcr.microsoft.com/mssql/server}
  * <p>
  * Exposed ports: 1433
+ *
+ * @deprecated use {@link org.testcontainers.mssqlserver.MSSQLServerContainer} instead.
  */
+@Deprecated
 public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mcr.microsoft.com/mssql/server");
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLServerContainer.java
new file mode 100644
index 00000000000..6ad74ea7e72
--- /dev/null
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLServerContainer.java
@@ -0,0 +1,156 @@
+package org.testcontainers.mssqlserver;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.LicenseAcceptance;
+
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+/**
+ * Testcontainers implementation for Microsoft SQL Server.
+ * <p>
+ * Supported image: {@code mcr.microsoft.com/mssql/server}
+ * <p>
+ * Exposed ports: 1433
+ */
+public class MSSQLServerContainer extends JdbcDatabaseContainer<MSSQLServerContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mcr.microsoft.com/mssql/server");
+
+    public static final String NAME = "sqlserver";
+
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
+    public static final Integer MS_SQL_SERVER_PORT = 1433;
+
+    static final String DEFAULT_USER = "sa";
+
+    static final String DEFAULT_PASSWORD = "A_Str0ng_Required_Password";
+
+    private String password = DEFAULT_PASSWORD;
+
+    private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 240;
+
+    private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 240;
+
+    private static final Pattern[] PASSWORD_CATEGORY_VALIDATION_PATTERNS = new Pattern[] {
+        Pattern.compile("[A-Z]+"),
+        Pattern.compile("[a-z]+"),
+        Pattern.compile("[0-9]+"),
+        Pattern.compile("[^a-zA-Z0-9]+", Pattern.CASE_INSENSITIVE),
+    };
+
+    public MSSQLServerContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MSSQLServerContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withStartupTimeoutSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS);
+        withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
+        addExposedPort(MS_SQL_SERVER_PORT);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return super.getLivenessCheckPortNumbers();
+    }
+
+    @Override
+    protected void configure() {
+        // If license was not accepted programmatically, check if it was accepted via resource file
+        if (!getEnvMap().containsKey("ACCEPT_EULA")) {
+            LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+            acceptLicense();
+        }
+
+        addEnv("MSSQL_SA_PASSWORD", password);
+    }
+
+    /**
+     * Accepts the license for the SQLServer container by setting the ACCEPT_EULA=Y
+     * variable as described at <a href="https://hub.docker.com/_/microsoft-mssql-server">https://hub.docker.com/_/microsoft-mssql-server</a>
+     */
+    public MSSQLServerContainer acceptLicense() {
+        addEnv("ACCEPT_EULA", "Y");
+        return self();
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+    }
+
+    @Override
+    protected String constructUrlForConnection(String queryString) {
+        // The JDBC driver of MS SQL Server enables encryption by default for versions > 10.1.0.
+        // We need to disable it by default to be able to use the container without having to pass extra params.
+        // See https://github.com/microsoft/mssql-jdbc/releases/tag/v10.1.0
+        if (urlParameters.keySet().stream().map(String::toLowerCase).noneMatch("encrypt"::equals)) {
+            urlParameters.put("encrypt", "false");
+        }
+        return super.constructUrlForConnection(queryString);
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters(";", ";");
+        return "jdbc:sqlserver://" + getHost() + ":" + getMappedPort(MS_SQL_SERVER_PORT) + additionalUrlParams;
+    }
+
+    @Override
+    public String getUsername() {
+        return DEFAULT_USER;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1";
+    }
+
+    @Override
+    public MSSQLServerContainer withPassword(final String password) {
+        checkPasswordStrength(password);
+        this.password = password;
+        return self();
+    }
+
+    private void checkPasswordStrength(String password) {
+        if (password == null) {
+            throw new IllegalArgumentException("Null password is not allowed");
+        }
+
+        if (password.length() < 8) {
+            throw new IllegalArgumentException("Password should be at least 8 characters long");
+        }
+
+        if (password.length() > 128) {
+            throw new IllegalArgumentException("Password can be up to 128 characters long");
+        }
+
+        long satisfiedCategories = Stream
+            .of(PASSWORD_CATEGORY_VALIDATION_PATTERNS)
+            .filter(p -> p.matcher(password).find())
+            .count();
+
+        if (satisfiedCategories < 3) {
+            throw new IllegalArgumentException(
+                "Password must contain characters from three of the following four categories:\n" +
+                " - Latin uppercase letters (A through Z)\n" +
+                " - Latin lowercase letters (a through z)\n" +
+                " - Base 10 digits (0 through 9)\n" +
+                " - Non-alphanumeric characters such as: exclamation point (!), dollar sign ($), number sign (#), " +
+                "or percent (%)."
+            );
+        }
+    }
+}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
deleted file mode 100644
index 630b6c5356c..00000000000
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomizableMSSQLServerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.testcontainers.junit.mssqlserver;
-
-import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.MSSQLServerContainer;
-import org.testcontainers.db.AbstractContainerDatabaseTest;
-import org.testcontainers.utility.DockerImageName;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class CustomizableMSSQLServerTest extends AbstractContainerDatabaseTest {
-
-    private static final String STRONG_PASSWORD = "myStrong(!)Password";
-
-    @Test
-    void testSqlServerConnection() throws SQLException {
-        try (
-            MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
-                DockerImageName.parse("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
-            )
-                .withPassword(STRONG_PASSWORD)
-        ) {
-            mssqlServerContainer.start();
-
-            ResultSet resultSet = performQuery(mssqlServerContainer, mssqlServerContainer.getTestQueryString());
-            int resultSetInt = resultSet.getInt(1);
-            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
-        }
-    }
-}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/CustomPasswordMSSQLServerTest.java
similarity index 98%
rename from modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
rename to modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/CustomPasswordMSSQLServerTest.java
index 06aa1dc4a61..faaaabd7d01 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/CustomPasswordMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/CustomPasswordMSSQLServerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.junit.mssqlserver;
+package org.testcontainers.mssqlserver;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLServerContainerTest.java
similarity index 70%
rename from modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
rename to modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLServerContainerTest.java
index 0d995911893..52269f11b9e 100644
--- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLServerContainerTest.java
@@ -1,9 +1,9 @@
-package org.testcontainers.junit.mssqlserver;
+package org.testcontainers.mssqlserver;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.MSSQLServerTestImages;
-import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -13,12 +13,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest {
+class MSSQLServerContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(
+            MSSQLServerContainer mssqlServer = new MSSQLServerContainer(
                 "mcr.microsoft.com/mssql/server:2022-CU20-ubuntu-22.04"
             )
                 .acceptLicense()
@@ -36,7 +36,7 @@ void testSimple() throws SQLException {
     @Test
     void testWithAdditionalUrlParamInJdbcUrl() {
         try (
-            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
+            MSSQLServerContainer mssqlServer = new MSSQLServerContainer(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
                 .withUrlParam("integratedSecurity", "false")
                 .withUrlParam("applicationName", "MyApp")
         ) {
@@ -49,9 +49,7 @@ void testWithAdditionalUrlParamInJdbcUrl() {
 
     @Test
     void testSetupDatabase() throws SQLException {
-        try (
-            MSSQLServerContainer<?> mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)
-        ) {
+        try (MSSQLServerContainer mssqlServer = new MSSQLServerContainer(MSSQLServerTestImages.MSSQL_SERVER_IMAGE)) {
             mssqlServer.start();
             DataSource ds = getDataSource(mssqlServer);
             Statement statement = ds.getConnection().createStatement();
@@ -70,7 +68,23 @@ void testSetupDatabase() throws SQLException {
         }
     }
 
-    private void assertHasCorrectExposedAndLivenessCheckPorts(MSSQLServerContainer<?> mssqlServer) {
+    @Test
+    void testSqlServerConnection() throws SQLException {
+        try (
+            MSSQLServerContainer mssqlServerContainer = new MSSQLServerContainer(
+                DockerImageName.parse("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
+            )
+                .withPassword("myStrong(!)Password")
+        ) {
+            mssqlServerContainer.start();
+
+            ResultSet resultSet = performQuery(mssqlServerContainer, mssqlServerContainer.getTestQueryString());
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+        }
+    }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(MSSQLServerContainer mssqlServer) {
         assertThat(mssqlServer.getExposedPorts()).containsExactly(MSSQLServerContainer.MS_SQL_SERVER_PORT);
         assertThat(mssqlServer.getLivenessCheckPortNumbers())
             .containsExactly(mssqlServer.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT));

From 4a38bdb04265798f60d7fc864a1b8930a27b2b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 14:40:44 -0600
Subject: [PATCH 4656/4969] Add MySQL container implementation under
 org.testcontainers.mysql (#11086)

---
 docs/modules/databases/mysql.md               |   2 +-
 .../containers/MySQLContainer.java            |   3 +
 .../testcontainers/mysql/MySQLContainer.java  | 160 ++++++++++++++++++
 .../junit/mysql/CustomizableMysqlTest.java    |  39 -----
 .../mysql/MultiVersionMySQLTest.java          |   5 +-
 .../MySQLContainerTest.java}                  |  52 ++++--
 6 files changed, 201 insertions(+), 60 deletions(-)
 create mode 100644 modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java
 delete mode 100644 modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
 rename modules/mysql/src/test/java/org/testcontainers/{junit => }/mysql/MultiVersionMySQLTest.java (87%)
 rename modules/mysql/src/test/java/org/testcontainers/{junit/mysql/SimpleMySQLTest.java => mysql/MySQLContainerTest.java} (82%)

diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index 825ab42f60c..46bf8b586de 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -7,7 +7,7 @@ Testcontainers module for [MySQL](https://hub.docker.com/_/mysql)
 You can start a MySQL container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container definition](../../../modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java) inside_block:container
+[Container definition](../../../modules/mysql/src/test/java/org/testcontainers/mysql/MySQLContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 54f3952b6a2..9f5b31531c4 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -12,7 +12,10 @@
  * Supported image: {@code mysql}
  * <p>
  * Exposed ports: 3306
+ *
+ * @deprecated use {@link org.testcontainers.mysql.MySQLContainer} instead.
  */
+@Deprecated
 public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     public static final String NAME = "mysql";
diff --git a/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java
new file mode 100644
index 00000000000..e46bef6180d
--- /dev/null
+++ b/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java
@@ -0,0 +1,160 @@
+package org.testcontainers.mysql;
+
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for MySQL.
+ * <p>
+ * Supported image: {@code mysql}
+ * <p>
+ * Exposed ports: 3306
+ */
+public class MySQLContainer extends JdbcDatabaseContainer<MySQLContainer> {
+
+    public static final String NAME = "mysql";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mysql");
+
+    static final String DEFAULT_USER = "test";
+
+    static final String DEFAULT_PASSWORD = "test";
+
+    private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
+
+    public static final Integer MYSQL_PORT = 3306;
+
+    private String databaseName = "test";
+
+    private String username = DEFAULT_USER;
+
+    private String password = DEFAULT_PASSWORD;
+
+    private static final String MYSQL_ROOT_USER = "root";
+
+    public MySQLContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MySQLContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPort(MYSQL_PORT);
+    }
+
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
+    @NotNull
+    @Override
+    @Deprecated
+    protected Set<Integer> getLivenessCheckPorts() {
+        return super.getLivenessCheckPorts();
+    }
+
+    @Override
+    protected void configure() {
+        optionallyMapResourceParameterAsVolume(
+            MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
+            "/etc/mysql/conf.d",
+            "mysql-default-conf",
+            Transferable.DEFAULT_DIR_MODE
+        );
+
+        addEnv("MYSQL_DATABASE", databaseName);
+        if (!MYSQL_ROOT_USER.equalsIgnoreCase(username)) {
+            addEnv("MYSQL_USER", username);
+        }
+        if (password != null && !password.isEmpty()) {
+            addEnv("MYSQL_PASSWORD", password);
+            addEnv("MYSQL_ROOT_PASSWORD", password);
+        } else if (MYSQL_ROOT_USER.equalsIgnoreCase(username)) {
+            addEnv("MYSQL_ALLOW_EMPTY_PASSWORD", "yes");
+        } else {
+            throw new ContainerLaunchException("Empty password can be used only with the root user");
+        }
+        setStartupAttempts(3);
+    }
+
+    @Override
+    public String getDriverClassName() {
+        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            return "com.mysql.cj.jdbc.Driver";
+        } catch (ClassNotFoundException e) {
+            return "com.mysql.jdbc.Driver";
+        }
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:mysql://" + getHost() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName + additionalUrlParams;
+    }
+
+    @Override
+    protected String constructUrlForConnection(String queryString) {
+        String url = super.constructUrlForConnection(queryString);
+
+        if (!url.contains("useSSL=")) {
+            String separator = url.contains("?") ? "&" : "?";
+            url = url + separator + "useSSL=false";
+        }
+
+        if (!url.contains("allowPublicKeyRetrieval=")) {
+            url = url + "&allowPublicKeyRetrieval=true";
+        }
+
+        return url;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1";
+    }
+
+    public MySQLContainer withConfigurationOverride(String s) {
+        parameters.put(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, s);
+        return self();
+    }
+
+    @Override
+    public MySQLContainer withDatabaseName(final String databaseName) {
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    @Override
+    public MySQLContainer withUsername(final String username) {
+        this.username = username;
+        return self();
+    }
+
+    @Override
+    public MySQLContainer withPassword(final String password) {
+        this.password = password;
+        return self();
+    }
+}
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
deleted file mode 100644
index 9e9d97dc54e..00000000000
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/CustomizableMysqlTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.testcontainers.junit.mysql;
-
-import org.junit.jupiter.api.Test;
-import org.testcontainers.MySQLTestImages;
-import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.db.AbstractContainerDatabaseTest;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class CustomizableMysqlTest extends AbstractContainerDatabaseTest {
-
-    private static final String DB_NAME = "foo";
-
-    private static final String USER = "bar";
-
-    private static final String PWD = "baz";
-
-    @Test
-    void testSimple() throws SQLException {
-        // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
-        try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
-                .withDatabaseName(DB_NAME)
-                .withUsername(USER)
-                .withPassword(PWD)
-                .withEnv("MYSQL_ROOT_HOST", "%")
-        ) {
-            mysql.start();
-
-            ResultSet resultSet = performQuery(mysql, "SELECT 1");
-
-            int resultSetInt = resultSet.getInt(1);
-            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
-        }
-    }
-}
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/mysql/MultiVersionMySQLTest.java
similarity index 87%
rename from modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
rename to modules/mysql/src/test/java/org/testcontainers/mysql/MultiVersionMySQLTest.java
index d8e8b52dc56..8dc4454860b 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/mysql/MultiVersionMySQLTest.java
@@ -1,9 +1,8 @@
-package org.testcontainers.junit.mysql;
+package org.testcontainers.mysql;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.MySQLTestImages;
-import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
 
@@ -26,7 +25,7 @@ public static DockerImageName[] params() {
     @ParameterizedTest
     @MethodSource("params")
     void versionCheckTest(DockerImageName dockerImageName) throws SQLException {
-        try (MySQLContainer<?> mysql = new MySQLContainer<>(dockerImageName)) {
+        try (MySQLContainer mysql = new MySQLContainer(dockerImageName)) {
             mysql.start();
             final ResultSet resultSet = performQuery(mysql, "SELECT VERSION()");
             final String resultSetString = resultSet.getString(1);
diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/mysql/MySQLContainerTest.java
similarity index 82%
rename from modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
rename to modules/mysql/src/test/java/org/testcontainers/mysql/MySQLContainerTest.java
index b3eac503c57..ad78781db5c 100644
--- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java
+++ b/modules/mysql/src/test/java/org/testcontainers/mysql/MySQLContainerTest.java
@@ -1,11 +1,10 @@
-package org.testcontainers.junit.mysql;
+package org.testcontainers.mysql;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.MySQLTestImages;
 import org.testcontainers.containers.ContainerLaunchException;
-import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -30,14 +29,14 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-class SimpleMySQLTest extends AbstractContainerDatabaseTest {
+class MySQLContainerTest extends AbstractContainerDatabaseTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(SimpleMySQLTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(MySQLContainerTest.class);
 
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            MySQLContainer<?> mysql = new MySQLContainer<>("mysql:8.0.36")
+            MySQLContainer mysql = new MySQLContainer("mysql:8.0.36")
             // }
         ) {
             mysql.start();
@@ -53,7 +52,7 @@ void testSimple() throws SQLException {
     @Test
     void testSpecificVersion() throws SQLException {
         try (
-            MySQLContainer<?> mysqlOldVersion = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+            MySQLContainer mysqlOldVersion = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
@@ -71,7 +70,7 @@ void testSpecificVersion() throws SQLException {
     @Test
     void testMySQLWithCustomIniFile() throws SQLException {
         try (
-            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+            MySQLContainer mysqlCustomConfig = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
         ) {
             mysqlCustomConfig.start();
@@ -83,7 +82,7 @@ void testMySQLWithCustomIniFile() throws SQLException {
     @Test
     void testCommandOverride() throws SQLException {
         try (
-            MySQLContainer<?> mysqlCustomConfig = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+            MySQLContainer mysqlCustomConfig = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
                 .withCommand("mysqld --auto_increment_increment=42")
         ) {
             mysqlCustomConfig.start();
@@ -98,7 +97,7 @@ void testCommandOverride() throws SQLException {
     @Test
     void testExplicitInitScript() throws SQLException {
         try (
-            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+            MySQLContainer container = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
                 .withInitScript("somepath/init_mysql.sql")
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
@@ -114,7 +113,7 @@ void testExplicitInitScript() throws SQLException {
     @Test
     void testEmptyPasswordWithNonRootUser() {
         try (
-            MySQLContainer<?> container = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+            MySQLContainer container = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
                 .withDatabaseName("TEST")
                 .withUsername("test")
                 .withPassword("")
@@ -130,7 +129,7 @@ void testEmptyPasswordWithNonRootUser() {
     void testEmptyPasswordWithRootUser() throws SQLException {
         // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
         try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+            MySQLContainer mysql = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
                 .withDatabaseName("foo")
                 .withUsername("root")
                 .withPassword("")
@@ -147,7 +146,7 @@ void testEmptyPasswordWithRootUser() throws SQLException {
 
     @Test
     void testWithAdditionalUrlParamTimeZone() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+        MySQLContainer mysql = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("serverTimezone", "Europe/Zurich")
             .withEnv("TZ", "Europe/Zurich")
             .withLogConsumer(new Slf4jLogConsumer(logger));
@@ -182,7 +181,7 @@ void testWithAdditionalUrlParamTimeZone() throws SQLException {
 
     @Test
     void testWithAdditionalUrlParamMultiQueries() throws SQLException {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+        MySQLContainer mysql = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
         mysql.start();
@@ -207,7 +206,7 @@ void testWithAdditionalUrlParamMultiQueries() throws SQLException {
 
     @Test
     void testWithAdditionalUrlParamInJdbcUrl() {
-        MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+        MySQLContainer mysql = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
             .withUrlParam("allowMultiQueries", "true")
             .withUrlParam("rewriteBatchedStatements", "true")
             .withLogConsumer(new Slf4jLogConsumer(logger));
@@ -228,7 +227,7 @@ void testWithAdditionalUrlParamInJdbcUrl() {
     void testWithOnlyUserReadableCustomIniFile() throws Exception {
         assumeThat(FileSystems.getDefault().supportedFileAttributeViews().contains("posix")).isTrue();
         try (
-            MySQLContainer<?> mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_80_IMAGE)
+            MySQLContainer mysql = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
                 .withConfigurationOverride("somepath/mysql_conf_override")
                 .withLogConsumer(new Slf4jLogConsumer(logger))
         ) {
@@ -252,12 +251,31 @@ void testWithOnlyUserReadableCustomIniFile() throws Exception {
         }
     }
 
-    private void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer<?> mysql) {
+    @Test
+    void testCustom() throws SQLException {
+        // Add MYSQL_ROOT_HOST environment so that we can root login from anywhere for testing purposes
+        try (
+            MySQLContainer mysql = new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE)
+                .withDatabaseName("foo")
+                .withUsername("bar")
+                .withPassword("baz")
+                .withEnv("MYSQL_ROOT_HOST", "%")
+        ) {
+            mysql.start();
+
+            ResultSet resultSet = performQuery(mysql, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+        }
+    }
+
+    private void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer mysql) {
         assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT);
         assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT));
     }
 
-    private void assertThatCustomIniFileWasUsed(MySQLContainer<?> mysql) throws SQLException {
+    private void assertThatCustomIniFileWasUsed(MySQLContainer mysql) throws SQLException {
         try (ResultSet resultSet = performQuery(mysql, "SELECT @@GLOBAL.innodb_max_undo_log_size")) {
             long result = resultSet.getLong(1);
             assertThat(result)

From d076937ab8ed98807d8ba365a3ac68c1a3a5637f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 14:40:54 -0600
Subject: [PATCH 4657/4969] Add Nginx container implementation under
 org.testcontainers.nginx (#11087)

---
 docs/modules/nginx.md                         |  6 ++--
 .../containers/NginxContainer.java            |  4 +++
 .../testcontainers/nginx/NginxContainer.java  | 30 +++++++++++++++++++
 .../NginxContainerTest.java}                  |  5 ++--
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java
 rename modules/nginx/src/test/java/org/testcontainers/{junit/SimpleNginxTest.java => nginx/NginxContainerTest.java} (96%)

diff --git a/docs/modules/nginx.md b/docs/modules/nginx.md
index fb4270ba4a3..d0661330bb1 100644
--- a/docs/modules/nginx.md
+++ b/docs/modules/nginx.md
@@ -7,19 +7,19 @@ Nginx is a web server, reverse proxy and mail proxy and http cache.
 The following example shows how to start Nginx.
 
 <!--codeinclude-->
-[Creating a Nginx container](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:creatingContainer
+[Creating a Nginx container](../../modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java) inside_block:creatingContainer
 <!--/codeinclude-->
 
 How to add custom content to the Nginx server.
 
 <!--codeinclude-->
-[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:addCustomContent
+[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java) inside_block:addCustomContent
 <!--/codeinclude-->
 
 And how to query the Nginx server for the custom content added.
 
 <!--codeinclude-->
-[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:getFromNginxServer
+[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java) inside_block:getFromNginxServer
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 7f6b5b0f74c..d7c201e6474 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -7,6 +7,10 @@
 import java.net.URL;
 import java.util.Set;
 
+/**
+ * @deprecated use {@link org.testcontainers.nginx.NginxContainer} instead.
+ */
+@Deprecated
 public class NginxContainer extends GenericContainer<NginxContainer> {
 
     private static final int NGINX_DEFAULT_PORT = 80;
diff --git a/modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java
new file mode 100644
index 00000000000..61ac3678bed
--- /dev/null
+++ b/modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java
@@ -0,0 +1,30 @@
+package org.testcontainers.nginx;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class NginxContainer extends GenericContainer<NginxContainer> {
+
+    private static final int NGINX_DEFAULT_PORT = 80;
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("nginx");
+
+    public NginxContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public NginxContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPort(NGINX_DEFAULT_PORT);
+        setCommand("nginx", "-g", "daemon off;");
+    }
+
+    public URL getBaseUrl(String scheme, int port) throws MalformedURLException {
+        return new URL(scheme + "://" + getHost() + ":" + getMappedPort(port));
+    }
+}
diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java
similarity index 96%
rename from modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
rename to modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java
index 1c527c27a63..ec495a06d1c 100644
--- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
+++ b/modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java
@@ -1,9 +1,8 @@
-package org.testcontainers.junit;
+package org.testcontainers.nginx;
 
 import lombok.Cleanup;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.NginxContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -19,7 +18,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SimpleNginxTest {
+class NginxContainerTest {
 
     private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.27.0-alpine3.19-slim");
 

From 067963c4b7a82070263abbcea73c281e69d89b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 15:46:20 -0600
Subject: [PATCH 4658/4969] Add PostgreSQL container implementation under
 org.testcontainers.postgresql (#11088)

---
 docs/modules/databases/postgres.md            |   8 +-
 .../containers/PostgreSQLContainer.java       |   3 +
 .../postgresql/PostgreSQLContainer.java       | 144 ++++++++++++++++++
 .../CustomizablePostgreSQLTest.java           |  37 -----
 .../CompatibleImageTest.java                  |   8 +-
 .../PostgreSQLContainerTest.java}             |  21 ++-
 6 files changed, 165 insertions(+), 56 deletions(-)
 create mode 100644 modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java
 delete mode 100644 modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
 rename modules/postgresql/src/test/java/org/testcontainers/{containers => postgresql}/CompatibleImageTest.java (86%)
 rename modules/postgresql/src/test/java/org/testcontainers/{junit/postgresql/SimplePostgreSQLTest.java => postgresql/PostgreSQLContainerTest.java} (80%)

diff --git a/docs/modules/databases/postgres.md b/docs/modules/databases/postgres.md
index 043a01bb93e..bb2414fa2cc 100644
--- a/docs/modules/databases/postgres.md
+++ b/docs/modules/databases/postgres.md
@@ -7,7 +7,7 @@ Testcontainers module for [PostgresSQL](https://hub.docker.com/_/postgres)
 You can start a PostgreSQL container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container creation](../../../modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java) inside_block:container
+[Container creation](../../../modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
@@ -28,19 +28,19 @@ See [JDBC](./jdbc.md) for documentation.
 * [pgvector/pgvector](https://hub.docker.com/r/pgvector/pgvector)
 
 <!--codeinclude-->
-[Using pgvector](../../../modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java) inside_block:pgvectorContainer
+[Using pgvector](../../../modules/postgresql/src/test/java/org/testcontainers/postgresql/CompatibleImageTest.java) inside_block:pgvectorContainer
 <!--/codeinclude-->
 
 * [postgis/postgis](https://registry.hub.docker.com/r/postgis/postgis)
 
 <!--codeinclude-->
-[Using PostGIS](../../../modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java) inside_block:postgisContainer
+[Using PostGIS](../../../modules/postgresql/src/test/java/org/testcontainers/postgresql/CompatibleImageTest.java) inside_block:postgisContainer
 <!--/codeinclude-->
 
 * [timescale/timescaledb](https://hub.docker.com/r/timescale/timescaledb)
 
 <!--codeinclude-->
-[Using TimescaleDB](../../../modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java) inside_block:timescaledbContainer
+[Using TimescaleDB](../../../modules/postgresql/src/test/java/org/testcontainers/postgresql/CompatibleImageTest.java) inside_block:timescaledbContainer
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index d96f30864d9..d45b9d5683d 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -14,7 +14,10 @@
  * Supported images: {@code postgres}, {@code pgvector/pgvector}
  * <p>
  * Exposed ports: 5432
+ *
+ * @deprecated use {@link org.testcontainers.postgresql.PostgreSQLContainer} instead.
  */
+@Deprecated
 public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
 
     public static final String NAME = "postgresql";
diff --git a/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java
new file mode 100644
index 00000000000..9b02019052d
--- /dev/null
+++ b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java
@@ -0,0 +1,144 @@
+package org.testcontainers.postgresql;
+
+import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for PostgreSQL.
+ * <p>
+ * Supported images: {@code postgres}, {@code pgvector/pgvector}
+ * <p>
+ * Exposed ports: 5432
+ */
+public class PostgreSQLContainer extends JdbcDatabaseContainer<PostgreSQLContainer> {
+
+    public static final String NAME = "postgresql";
+
+    public static final String IMAGE = "postgres";
+
+    public static final String DEFAULT_TAG = "9.6.12";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("postgres");
+
+    private static final DockerImageName PGVECTOR_IMAGE_NAME = DockerImageName.parse("pgvector/pgvector");
+
+    public static final Integer POSTGRESQL_PORT = 5432;
+
+    static final String DEFAULT_USER = "test";
+
+    static final String DEFAULT_PASSWORD = "test";
+
+    private String databaseName = "test";
+
+    private String username = "test";
+
+    private String password = "test";
+
+    private static final String FSYNC_OFF_OPTION = "fsync=off";
+
+    public PostgreSQLContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public PostgreSQLContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, PGVECTOR_IMAGE_NAME);
+
+        this.waitStrategy =
+            new LogMessageWaitStrategy()
+                .withRegEx(".*database system is ready to accept connections.*\\s")
+                .withTimes(2)
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
+        this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
+
+        addExposedPort(POSTGRESQL_PORT);
+    }
+
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
+    @NotNull
+    @Override
+    @Deprecated
+    protected Set<Integer> getLivenessCheckPorts() {
+        return super.getLivenessCheckPorts();
+    }
+
+    @Override
+    protected void configure() {
+        // Disable Postgres driver use of java.util.logging to reduce noise at startup time
+        withUrlParam("loggerLevel", "OFF");
+        addEnv("POSTGRES_DB", databaseName);
+        addEnv("POSTGRES_USER", username);
+        addEnv("POSTGRES_PASSWORD", password);
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "org.postgresql.Driver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return (
+            "jdbc:postgresql://" +
+            getHost() +
+            ":" +
+            getMappedPort(POSTGRESQL_PORT) +
+            "/" +
+            databaseName +
+            additionalUrlParams
+        );
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT 1";
+    }
+
+    @Override
+    public PostgreSQLContainer withDatabaseName(final String databaseName) {
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    @Override
+    public PostgreSQLContainer withUsername(final String username) {
+        this.username = username;
+        return self();
+    }
+
+    @Override
+    public PostgreSQLContainer withPassword(final String password) {
+        this.password = password;
+        return self();
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
deleted file mode 100644
index fb09530913b..00000000000
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.testcontainers.junit.postgresql;
-
-import org.junit.jupiter.api.Test;
-import org.testcontainers.PostgreSQLTestImages;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.db.AbstractContainerDatabaseTest;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
-
-    private static final String DB_NAME = "foo";
-
-    private static final String USER = "bar";
-
-    private static final String PWD = "baz";
-
-    @Test
-    void testSimple() throws SQLException {
-        try (
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
-                .withDatabaseName(DB_NAME)
-                .withUsername(USER)
-                .withPassword(PWD)
-        ) {
-            postgres.start();
-
-            ResultSet resultSet = performQuery(postgres, "SELECT 1");
-
-            int resultSetInt = resultSet.getInt(1);
-            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
-        }
-    }
-}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/postgresql/src/test/java/org/testcontainers/postgresql/CompatibleImageTest.java
similarity index 86%
rename from modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
rename to modules/postgresql/src/test/java/org/testcontainers/postgresql/CompatibleImageTest.java
index 7101f4a9fb1..bdad4fb6a5c 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/postgresql/CompatibleImageTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.postgresql;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -15,7 +15,7 @@ class CompatibleImageTest extends AbstractContainerDatabaseTest {
     void pgvector() throws SQLException {
         try (
             // pgvectorContainer {
-            PostgreSQLContainer<?> pgvector = new PostgreSQLContainer<>("pgvector/pgvector:pg16")
+            PostgreSQLContainer pgvector = new PostgreSQLContainer("pgvector/pgvector:pg16")
             // }
         ) {
             pgvector.start();
@@ -30,7 +30,7 @@ void pgvector() throws SQLException {
     void postgis() throws SQLException {
         try (
             // postgisContainer {
-            PostgreSQLContainer<?> postgis = new PostgreSQLContainer<>(
+            PostgreSQLContainer postgis = new PostgreSQLContainer(
                 DockerImageName.parse("postgis/postgis:16-3.4-alpine").asCompatibleSubstituteFor("postgres")
             )
             // }
@@ -47,7 +47,7 @@ void postgis() throws SQLException {
     void timescaledb() throws SQLException {
         try (
             // timescaledbContainer {
-            PostgreSQLContainer<?> timescaledb = new PostgreSQLContainer<>(
+            PostgreSQLContainer timescaledb = new PostgreSQLContainer(
                 DockerImageName.parse("timescale/timescaledb:2.14.2-pg16").asCompatibleSubstituteFor("postgres")
             )
             // }
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLContainerTest.java
similarity index 80%
rename from modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
rename to modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLContainerTest.java
index 7227f3bdd60..beefa3776b1 100644
--- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
+++ b/modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLContainerTest.java
@@ -1,8 +1,7 @@
-package org.testcontainers.junit.postgresql;
+package org.testcontainers.postgresql;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.PostgreSQLTestImages;
-import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -13,7 +12,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
-class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
+class PostgreSQLContainerTest extends AbstractContainerDatabaseTest {
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
@@ -22,7 +21,7 @@ class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:9.6.12")
+            PostgreSQLContainer postgres = new PostgreSQLContainer("postgres:9.6.12")
             // }
         ) {
             postgres.start();
@@ -37,7 +36,7 @@ void testSimple() throws SQLException {
     @Test
     void testCommandOverride() throws SQLException {
         try (
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+            PostgreSQLContainer postgres = new PostgreSQLContainer(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withCommand("postgres -c max_connections=42")
         ) {
             postgres.start();
@@ -51,7 +50,7 @@ void testCommandOverride() throws SQLException {
     @Test
     void testUnsetCommand() throws SQLException {
         try (
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+            PostgreSQLContainer postgres = new PostgreSQLContainer(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withCommand("postgres -c max_connections=42")
                 .withCommand()
         ) {
@@ -66,7 +65,7 @@ void testUnsetCommand() throws SQLException {
     @Test
     void testMissingInitScript() {
         try (
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+            PostgreSQLContainer postgres = new PostgreSQLContainer(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScript(null)
         ) {
             assertThatNoException().isThrownBy(postgres::start);
@@ -76,7 +75,7 @@ void testMissingInitScript() {
     @Test
     void testExplicitInitScript() throws SQLException {
         try (
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+            PostgreSQLContainer postgres = new PostgreSQLContainer(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScript("somepath/init_postgresql.sql")
         ) {
             postgres.start();
@@ -91,7 +90,7 @@ void testExplicitInitScript() throws SQLException {
     @Test
     void testExplicitInitScripts() throws SQLException {
         try (
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+            PostgreSQLContainer postgres = new PostgreSQLContainer(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScripts("somepath/init_postgresql.sql", "somepath/init_postgresql_2.sql")
         ) {
             postgres.start();
@@ -112,7 +111,7 @@ void testExplicitInitScripts() throws SQLException {
     @Test
     void testWithAdditionalUrlParamInJdbcUrl() {
         try (
-            PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
+            PostgreSQLContainer postgres = new PostgreSQLContainer(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withUrlParam("charSet", "UNICODE")
         ) {
             postgres.start();
@@ -123,7 +122,7 @@ void testWithAdditionalUrlParamInJdbcUrl() {
         }
     }
 
-    private void assertHasCorrectExposedAndLivenessCheckPorts(PostgreSQLContainer<?> postgres) {
+    private void assertHasCorrectExposedAndLivenessCheckPorts(PostgreSQLContainer postgres) {
         assertThat(postgres.getExposedPorts()).containsExactly(PostgreSQLContainer.POSTGRESQL_PORT);
         assertThat(postgres.getLivenessCheckPortNumbers())
             .containsExactly(postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT));

From 4abffe666867aa02c3c2c764d1e0306baf0c3436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 15:48:25 -0600
Subject: [PATCH 4659/4969] Add Pulsar container implementation under
 org.testcontainers.pulsar (#11089)

---
 docs/modules/pulsar.md                        |  10 +-
 .../containers/PulsarContainer.java           |   3 +
 .../pulsar/PulsarContainer.java               | 103 ++++++++++++++++++
 .../AbstractPulsar.java                       |   2 +-
 .../CompatibleApachePulsarImageTest.java      |   2 +-
 .../PulsarContainerTest.java                  |   4 +-
 6 files changed, 115 insertions(+), 9 deletions(-)
 create mode 100644 modules/pulsar/src/main/java/org/testcontainers/pulsar/PulsarContainer.java
 rename modules/pulsar/src/test/java/org/testcontainers/{containers => pulsar}/AbstractPulsar.java (98%)
 rename modules/pulsar/src/test/java/org/testcontainers/{containers => pulsar}/CompatibleApachePulsarImageTest.java (97%)
 rename modules/pulsar/src/test/java/org/testcontainers/{containers => pulsar}/PulsarContainerTest.java (96%)

diff --git a/docs/modules/pulsar.md b/docs/modules/pulsar.md
index f74c315cbdc..5c0c2497f4e 100644
--- a/docs/modules/pulsar.md
+++ b/docs/modules/pulsar.md
@@ -9,13 +9,13 @@ It's based on the official Apache Pulsar docker image, it is recommended to read
 Create a `PulsarContainer` to use it in your tests:
 
 <!--codeinclude-->
-[Create a Pulsar container](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithVersion
+[Create a Pulsar container](../../modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java) inside_block:constructorWithVersion
 <!--/codeinclude-->
 
 Then you can retrieve the broker and the admin url:
 
 <!--codeinclude-->
-[Get broker and admin urls](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:coordinates
+[Get broker and admin urls](../../modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java) inside_block:coordinates
 <!--/codeinclude-->
 
 ## Options
@@ -26,7 +26,7 @@ If you need to set Pulsar configuration variables you can use the native APIs an
 For example, if you want to enable `brokerDeduplicationEnabled`:
 
 <!--codeinclude-->
-[Set configuration variables](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithEnv
+[Set configuration variables](../../modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java) inside_block:constructorWithEnv
 <!--/codeinclude-->
 
 ### Pulsar IO
@@ -34,7 +34,7 @@ For example, if you want to enable `brokerDeduplicationEnabled`:
 If you need to test Pulsar IO framework you can enable the Pulsar Functions Worker:
 
 <!--codeinclude-->
-[Create a Pulsar container with functions worker](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithFunctionsWorker
+[Create a Pulsar container with functions worker](../../modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java) inside_block:constructorWithFunctionsWorker
 <!--/codeinclude-->
 
 ### Pulsar Transactions
@@ -42,7 +42,7 @@ If you need to test Pulsar IO framework you can enable the Pulsar Functions Work
 If you need to test Pulsar Transactions you can enable the transactions feature:
 
 <!--codeinclude-->
-[Create a Pulsar container with transactions](../../modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java) inside_block:constructorWithTransactions
+[Create a Pulsar container with transactions](../../modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java) inside_block:constructorWithTransactions
 <!--/codeinclude-->
 
 
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 027e030c0de..49475d09511 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -14,7 +14,10 @@
  *     <li>Pulsar: 6650</li>
  *     <li>HTTP: 8080</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.pulsar.PulsarContainer} instead.
  */
+@Deprecated
 public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     public static final int BROKER_PORT = 6650;
diff --git a/modules/pulsar/src/main/java/org/testcontainers/pulsar/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/pulsar/PulsarContainer.java
new file mode 100644
index 00000000000..8936a7523c4
--- /dev/null
+++ b/modules/pulsar/src/main/java/org/testcontainers/pulsar/PulsarContainer.java
@@ -0,0 +1,103 @@
+package org.testcontainers.pulsar;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Apache Pulsar.
+ * <p>
+ * Supported images: {@code apachepulsar/pulsar}, {@code apachepulsar/pulsar-all}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Pulsar: 6650</li>
+ *     <li>HTTP: 8080</li>
+ * </ul>
+ */
+public class PulsarContainer extends GenericContainer<PulsarContainer> {
+
+    public static final int BROKER_PORT = 6650;
+
+    public static final int BROKER_HTTP_PORT = 8080;
+
+    private static final String ADMIN_CLUSTERS_ENDPOINT = "/admin/v2/clusters";
+
+    /**
+     * See <a href="https://github.com/apache/pulsar/blob/master/pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java">SystemTopicNames</a>.
+     */
+    private static final String TRANSACTION_TOPIC_ENDPOINT =
+        "/admin/v2/persistent/pulsar/system/transaction_coordinator_assign/partitions";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar");
+
+    private final WaitAllStrategy waitAllStrategy = new WaitAllStrategy();
+
+    private boolean functionsWorkerEnabled = false;
+
+    private boolean transactionsEnabled = false;
+
+    @Deprecated
+    public PulsarContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public PulsarContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DockerImageName.parse("apachepulsar/pulsar-all"));
+        withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT);
+        setWaitStrategy(waitAllStrategy);
+    }
+
+    @Override
+    protected void configure() {
+        super.configure();
+        setupCommandAndEnv();
+    }
+
+    public PulsarContainer withFunctionsWorker() {
+        functionsWorkerEnabled = true;
+        return this;
+    }
+
+    public PulsarContainer withTransactions() {
+        transactionsEnabled = true;
+        return this;
+    }
+
+    public String getPulsarBrokerUrl() {
+        return String.format("pulsar://%s:%s", getHost(), getMappedPort(BROKER_PORT));
+    }
+
+    public String getHttpServiceUrl() {
+        return String.format("http://%s:%s", getHost(), getMappedPort(BROKER_HTTP_PORT));
+    }
+
+    protected void setupCommandAndEnv() {
+        String standaloneBaseCommand =
+            "/pulsar/bin/apply-config-from-env.py /pulsar/conf/standalone.conf " + "&& bin/pulsar standalone";
+
+        if (!functionsWorkerEnabled) {
+            standaloneBaseCommand += " --no-functions-worker -nss";
+        }
+
+        withCommand("/bin/bash", "-c", standaloneBaseCommand);
+
+        final String clusterName = getEnvMap().getOrDefault("PULSAR_PREFIX_clusterName", "standalone");
+        final String response = String.format("[\"%s\"]", clusterName);
+        waitAllStrategy.withStrategy(
+            Wait.forHttp(ADMIN_CLUSTERS_ENDPOINT).forPort(BROKER_HTTP_PORT).forResponsePredicate(response::equals)
+        );
+
+        if (transactionsEnabled) {
+            withEnv("PULSAR_PREFIX_transactionCoordinatorEnabled", "true");
+            waitAllStrategy.withStrategy(
+                Wait.forHttp(TRANSACTION_TOPIC_ENDPOINT).forStatusCode(200).forPort(BROKER_HTTP_PORT)
+            );
+        }
+        if (functionsWorkerEnabled) {
+            waitAllStrategy.withStrategy(Wait.forLogMessage(".*Function worker service started.*", 1));
+        }
+    }
+}
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java b/modules/pulsar/src/test/java/org/testcontainers/pulsar/AbstractPulsar.java
similarity index 98%
rename from modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
rename to modules/pulsar/src/test/java/org/testcontainers/pulsar/AbstractPulsar.java
index c704ce15d41..c86b594b163 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/AbstractPulsar.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/pulsar/AbstractPulsar.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.pulsar;
 
 import org.apache.pulsar.client.admin.ListTopicsOptions;
 import org.apache.pulsar.client.admin.PulsarAdmin;
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java b/modules/pulsar/src/test/java/org/testcontainers/pulsar/CompatibleApachePulsarImageTest.java
similarity index 97%
rename from modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java
rename to modules/pulsar/src/test/java/org/testcontainers/pulsar/CompatibleApachePulsarImageTest.java
index 702a7223151..0661994466d 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/CompatibleApachePulsarImageTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/pulsar/CompatibleApachePulsarImageTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.pulsar;
 
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java b/modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java
similarity index 96%
rename from modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
rename to modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java
index 93e9410ada8..32d96c88453 100644
--- a/modules/pulsar/src/test/java/org/testcontainers/containers/PulsarContainerTest.java
+++ b/modules/pulsar/src/test/java/org/testcontainers/pulsar/PulsarContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.pulsar;
 
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
@@ -19,7 +19,7 @@ void testUsage() throws Exception {
         try (
             // do not use PULSAR_IMAGE to make the doc looks easier
             // constructorWithVersion {
-            PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:3.0.0"));
+            PulsarContainer pulsar = new PulsarContainer("apachepulsar/pulsar:3.0.0");
             // }
         ) {
             pulsar.start();

From 231c41b27ad567e99f5b915fbcdd33677281b870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 15:59:50 -0600
Subject: [PATCH 4660/4969] Add RabbitMQ container implementation under
 org.testcontainers.rabbitmq (#11090)

---
 docs/modules/rabbitmq.md                      |   3 -
 .../containers/RabbitMQContainer.java         |   3 +
 .../rabbitmq/RabbitMQContainer.java           | 204 +++++++++++
 .../containers/RabbitMQContainerTest.java     | 335 ------------------
 .../rabbitmq/RabbitMQContainerTest.java       | 123 +++++++
 .../RabbitMQTestImages.java                   |   2 +-
 6 files changed, 331 insertions(+), 339 deletions(-)
 create mode 100644 modules/rabbitmq/src/main/java/org/testcontainers/rabbitmq/RabbitMQContainer.java
 delete mode 100644 modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
 create mode 100644 modules/rabbitmq/src/test/java/org/testcontainers/rabbitmq/RabbitMQContainerTest.java
 rename modules/rabbitmq/src/test/java/org/testcontainers/{containers => rabbitmq}/RabbitMQTestImages.java (82%)

diff --git a/docs/modules/rabbitmq.md b/docs/modules/rabbitmq.md
index 8a9ae9d9b97..4055bb59f06 100644
--- a/docs/modules/rabbitmq.md
+++ b/docs/modules/rabbitmq.md
@@ -1,8 +1,5 @@
 # RabbitMQ Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 3bb45632c54..b7b2eb35051 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -27,7 +27,10 @@
  *     <li>15671 (HTTPS)</li>
  *     <li>15672 (HTTP)</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.rabbitmq.RabbitMQContainer} instead.
  */
+@Deprecated
 public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
     /**
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/rabbitmq/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/rabbitmq/RabbitMQContainer.java
new file mode 100644
index 00000000000..5b6d79d73c4
--- /dev/null
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/rabbitmq/RabbitMQContainer.java
@@ -0,0 +1,204 @@
+package org.testcontainers.rabbitmq;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Testcontainers implementation for RabbitMQ.
+ * <p>
+ * Supported image: {@code rabbitmq}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>5671 (AMQPS)</li>
+ *     <li>5672 (AMQP)</li>
+ *     <li>15671 (HTTPS)</li>
+ *     <li>15672 (HTTP)</li>
+ * </ul>
+ */
+public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
+
+    /**
+     * The image defaults to the official RabbitMQ image: <a href="https://hub.docker.com/_/rabbitmq/">RabbitMQ</a>.
+     */
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("rabbitmq");
+
+    private static final int DEFAULT_AMQP_PORT = 5672;
+
+    private static final int DEFAULT_AMQPS_PORT = 5671;
+
+    private static final int DEFAULT_HTTPS_PORT = 15671;
+
+    private static final int DEFAULT_HTTP_PORT = 15672;
+
+    private String adminPassword = "guest";
+
+    private String adminUsername = "guest";
+
+    private final List<List<String>> values = new ArrayList<>();
+
+    /**
+     * Creates a RabbitMQ container using a specific docker image.
+     *
+     * @param dockerImageName The docker image to use.
+     */
+    public RabbitMQContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public RabbitMQContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        addExposedPorts(DEFAULT_AMQP_PORT, DEFAULT_AMQPS_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
+
+        waitingFor(Wait.forLogMessage(".*Server startup complete.*", 1));
+    }
+
+    @Override
+    protected void configure() {
+        if (this.adminUsername != null) {
+            addEnv("RABBITMQ_DEFAULT_USER", this.adminUsername);
+        }
+        if (this.adminPassword != null) {
+            addEnv("RABBITMQ_DEFAULT_PASS", this.adminPassword);
+        }
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        values.forEach(command -> {
+            try {
+                ExecResult execResult = execInContainer(command.toArray(new String[0]));
+                if (execResult.getExitCode() != 0) {
+                    logger().error("Could not execute command {}: {}", command, execResult.getStderr());
+                }
+            } catch (IOException | InterruptedException e) {
+                logger().error("Could not execute command {}: {}", command, e.getMessage());
+            }
+        });
+    }
+
+    /**
+     * @return The admin password for the <code>admin</code> account
+     */
+    public String getAdminPassword() {
+        return this.adminPassword;
+    }
+
+    /**
+     * @return The admin user for the <code>admin</code> account
+     */
+    public String getAdminUsername() {
+        return this.adminUsername;
+    }
+
+    public Integer getAmqpPort() {
+        return getMappedPort(DEFAULT_AMQP_PORT);
+    }
+
+    public Integer getAmqpsPort() {
+        return getMappedPort(DEFAULT_AMQPS_PORT);
+    }
+
+    public Integer getHttpsPort() {
+        return getMappedPort(DEFAULT_HTTPS_PORT);
+    }
+
+    public Integer getHttpPort() {
+        return getMappedPort(DEFAULT_HTTP_PORT);
+    }
+
+    /**
+     * @return AMQP URL for use with AMQP clients.
+     */
+    public String getAmqpUrl() {
+        return "amqp://" + getHost() + ":" + getAmqpPort();
+    }
+
+    /**
+     * @return AMQPS URL for use with AMQPS clients.
+     */
+    public String getAmqpsUrl() {
+        return "amqps://" + getHost() + ":" + getAmqpsPort();
+    }
+
+    /**
+     * @return URL of the HTTP management endpoint.
+     */
+    public String getHttpUrl() {
+        return "http://" + getHost() + ":" + getHttpPort();
+    }
+
+    /**
+     * @return URL of the HTTPS management endpoint.
+     */
+    public String getHttpsUrl() {
+        return "https://" + getHost() + ":" + getHttpsPort();
+    }
+
+    /**
+     * Sets the user for the admin (default is <pre>guest</pre>)
+     *
+     * @param adminUsername The admin user.
+     * @return This container.
+     */
+    public RabbitMQContainer withAdminUser(final String adminUsername) {
+        this.adminUsername = adminUsername;
+        return this;
+    }
+
+    /**
+     * Sets the password for the admin (default is <pre>guest</pre>)
+     *
+     * @param adminPassword The admin password.
+     * @return This container.
+     */
+    public RabbitMQContainer withAdminPassword(final String adminPassword) {
+        this.adminPassword = adminPassword;
+        return this;
+    }
+
+    /**
+     * Overwrites the default RabbitMQ configuration file with the supplied one.
+     *
+     * @param rabbitMQConf The rabbitmq.conf file to use (in sysctl format, don't forget empty line in the end of file)
+     * @return This container.
+     */
+    public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
+        return withRabbitMQConfigSysctl(rabbitMQConf);
+    }
+
+    /**
+     * Overwrites the default RabbitMQ configuration file with the supplied one.
+     *
+     * This function doesn't work with RabbitMQ &lt; 3.7.
+     *
+     * This function and the Sysctl format is recommended for RabbitMQ &gt;= 3.7
+     *
+     * @param rabbitMQConf The rabbitmq.config file to use (in sysctl format, don't forget empty line in the end of file)
+     * @return This container.
+     */
+    public RabbitMQContainer withRabbitMQConfigSysctl(MountableFile rabbitMQConf) {
+        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.conf");
+        return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.conf");
+    }
+
+    /**
+     * Overwrites the default RabbitMQ configuration file with the supplied one.
+     *
+     * @param rabbitMQConf The rabbitmq.config file to use (in erlang format)
+     * @return This container.
+     */
+    public RabbitMQContainer withRabbitMQConfigErlang(MountableFile rabbitMQConf) {
+        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.config");
+        return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.config");
+    }
+}
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
deleted file mode 100644
index 2893e812f09..00000000000
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ /dev/null
@@ -1,335 +0,0 @@
-package org.testcontainers.containers;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.client.DeliverCallback;
-import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.RabbitMQContainer.SslVerification;
-import org.testcontainers.utility.MountableFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.Collections;
-import java.util.concurrent.TimeoutException;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-
-class RabbitMQContainerTest {
-
-    public static final int DEFAULT_AMQPS_PORT = 5671;
-
-    public static final int DEFAULT_AMQP_PORT = 5672;
-
-    public static final int DEFAULT_HTTPS_PORT = 15671;
-
-    public static final int DEFAULT_HTTP_PORT = 15672;
-
-    @Test
-    void shouldCreateRabbitMQContainer() {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container.start();
-
-            assertThat(container.getAdminPassword()).isEqualTo("guest");
-            assertThat(container.getAdminUsername()).isEqualTo("guest");
-
-            assertThat(container.getAmqpsUrl())
-                .isEqualTo(String.format("amqps://%s:%d", container.getHost(), container.getAmqpsPort()));
-            assertThat(container.getAmqpUrl())
-                .isEqualTo(String.format("amqp://%s:%d", container.getHost(), container.getAmqpPort()));
-            assertThat(container.getHttpsUrl())
-                .isEqualTo(String.format("https://%s:%d", container.getHost(), container.getHttpsPort()));
-            assertThat(container.getHttpUrl())
-                .isEqualTo(String.format("http://%s:%d", container.getHost(), container.getHttpPort()));
-
-            assertThat(container.getLivenessCheckPortNumbers())
-                .containsExactlyInAnyOrder(
-                    container.getMappedPort(DEFAULT_AMQP_PORT),
-                    container.getMappedPort(DEFAULT_AMQPS_PORT),
-                    container.getMappedPort(DEFAULT_HTTP_PORT),
-                    container.getMappedPort(DEFAULT_HTTPS_PORT)
-                );
-
-            assertFunctionality(container);
-        }
-    }
-
-    @Test
-    void shouldCreateRabbitMQContainerWithCustomCredentials() {
-        try (
-            RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)
-                .withAdminUser("admin")
-                .withAdminPassword("admin")
-        ) {
-            container.start();
-
-            assertThat(container.getAdminPassword()).isEqualTo("admin");
-            assertThat(container.getAdminUsername()).isEqualTo("admin");
-
-            assertFunctionality(container);
-        }
-    }
-
-    @Test
-    void shouldCreateRabbitMQContainerWithExchange() throws IOException, InterruptedException {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container.withExchange("test-exchange", "direct");
-
-            container.start();
-
-            assertThat(container.execInContainer("rabbitmqctl", "list_exchanges").getStdout())
-                .containsPattern("test-exchange\\s+direct");
-        }
-    }
-
-    @Test
-    void shouldCreateRabbitMQContainerWithExchangeInVhost() throws IOException, InterruptedException {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container.withVhost("test-vhost");
-            container.withExchange(
-                "test-vhost",
-                "test-exchange",
-                "direct",
-                false,
-                false,
-                false,
-                Collections.emptyMap()
-            );
-
-            container.start();
-
-            assertThat(container.execInContainer("rabbitmqctl", "list_exchanges", "-p", "test-vhost").getStdout())
-                .containsPattern("test-exchange\\s+direct");
-        }
-    }
-
-    @Test
-    void shouldCreateRabbitMQContainerWithQueues() throws IOException, InterruptedException {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container
-                .withQueue("queue-one")
-                .withQueue("queue-two", false, true, ImmutableMap.of("x-message-ttl", 1000));
-
-            container.start();
-
-            assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
-                .containsPattern("queue-one");
-            assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
-                .containsPattern("queue-two\\s.*x-message-ttl");
-        }
-    }
-
-    @Test
-    void shouldMountConfigurationFile() {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
-            container.start();
-
-            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
-        }
-    }
-
-    @Test
-    void shouldMountConfigurationFileErlang() {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
-            container.start();
-
-            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
-        }
-    }
-
-    @Test
-    void shouldMountConfigurationFileSysctl() {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
-            container.start();
-
-            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
-        }
-    }
-
-    @Test
-    void shouldStartTheWholeEnchilada() throws IOException, InterruptedException {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container
-                .withVhost("vhost1")
-                .withVhostLimit("vhost1", "max-connections", 1)
-                .withVhost("vhost2", true)
-                .withExchange("direct-exchange", "direct")
-                .withExchange("topic-exchange", "topic")
-                .withExchange("vhost1", "topic-exchange-2", "topic", false, false, true, Collections.emptyMap())
-                .withExchange("vhost2", "topic-exchange-3", "topic")
-                .withExchange("topic-exchange-4", "topic", false, false, true, Collections.emptyMap())
-                .withQueue("queue1")
-                .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
-                .withQueue("vhost1", "queue3", true, false, ImmutableMap.of("x-message-ttl", 1000))
-                .withQueue("vhost2", "queue4")
-                .withBinding("direct-exchange", "queue1")
-                .withBinding("vhost1", "topic-exchange-2", "queue3")
-                .withBinding("vhost2", "topic-exchange-3", "queue4", Collections.emptyMap(), "ss7", "queue")
-                .withUser("user1", "password1")
-                .withUser("user2", "password2", ImmutableSet.of("administrator"))
-                .withPermission("vhost1", "user1", ".*", ".*", ".*")
-                .withPolicy("max length policy", "^dog", ImmutableMap.of("max-length", 1), 1, "queues")
-                .withPolicy(
-                    "alternate exchange policy",
-                    "^direct-exchange",
-                    ImmutableMap.of("alternate-exchange", "amq.direct")
-                )
-                .withPolicy("vhost2", "ha-all", ".*", ImmutableMap.of("ha-mode", "all", "ha-sync-mode", "automatic"))
-                .withOperatorPolicy("operator policy 1", "^queue1", ImmutableMap.of("message-ttl", 1000), 1, "queues")
-                .withPluginsEnabled("rabbitmq_shovel", "rabbitmq_random_exchange");
-
-            container.start();
-
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "queues").getStdout())
-                .contains("queue1", "queue2", "queue3", "queue4");
-
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "exchanges").getStdout())
-                .contains(
-                    "direct-exchange",
-                    "topic-exchange",
-                    "topic-exchange-2",
-                    "topic-exchange-3",
-                    "topic-exchange-4"
-                );
-
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "bindings").getStdout())
-                .contains("direct-exchange", "topic-exchange-2", "topic-exchange-3");
-
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "users").getStdout())
-                .contains("user1", "user2");
-
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies").getStdout())
-                .contains("max length policy", "alternate exchange policy");
-
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "policies", "--vhost=vhost2").getStdout())
-                .contains("ha-all", "ha-sync-mode");
-
-            assertThat(container.execInContainer("rabbitmqadmin", "list", "operator_policies").getStdout())
-                .contains("operator policy 1");
-
-            assertThat(
-                container.execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_shovel", "--quiet").getStdout()
-            )
-                .contains("rabbitmq_shovel is enabled");
-
-            assertThat(
-                container
-                    .execInContainer("rabbitmq-plugins", "is_enabled", "rabbitmq_random_exchange", "--quiet")
-                    .getStdout()
-            )
-                .contains("rabbitmq_random_exchange is enabled");
-        }
-    }
-
-    @Test
-    void shouldThrowExceptionForDodgyJson() {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            assertThatCode(() -> container.withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", container))
-                )
-                .hasMessageStartingWith("Failed to convert arguments into json");
-        }
-    }
-
-    @Test
-    void shouldWorkWithSSL() {
-        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-            container.withSSL(
-                MountableFile.forClasspathResource("/certs/server_key.pem", 0644),
-                MountableFile.forClasspathResource("/certs/server_certificate.pem", 0644),
-                MountableFile.forClasspathResource("/certs/ca_certificate.pem", 0644),
-                SslVerification.VERIFY_PEER,
-                true
-            );
-
-            container.start();
-
-            assertThatCode(() -> {
-                    ConnectionFactory connectionFactory = new ConnectionFactory();
-                    connectionFactory.useSslProtocol(
-                        createSslContext("certs/client_key.p12", "password", "certs/truststore.jks", "password")
-                    );
-                    connectionFactory.enableHostnameVerification();
-                    connectionFactory.setUri(container.getAmqpsUrl());
-                    connectionFactory.setPassword(container.getAdminPassword());
-                    Connection connection = connectionFactory.newConnection();
-                    Channel channel = connection
-                        .openChannel()
-                        .orElseThrow(() -> new RuntimeException("Failed to Open channel"));
-                    channel.close();
-                    connection.close();
-                })
-                .doesNotThrowAnyException();
-        }
-    }
-
-    private SSLContext createSslContext(
-        String keystoreFile,
-        String keystorePassword,
-        String truststoreFile,
-        String truststorePassword
-    )
-        throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, KeyManagementException {
-        ClassLoader classLoader = getClass().getClassLoader();
-
-        KeyStore ks = KeyStore.getInstance("PKCS12");
-        ks.load(
-            Files.newInputStream(new File(classLoader.getResource(keystoreFile).getFile()).toPath()),
-            keystorePassword.toCharArray()
-        );
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, "password".toCharArray());
-
-        KeyStore trustStore = KeyStore.getInstance("PKCS12");
-        trustStore.load(
-            Files.newInputStream(new File(classLoader.getResource(truststoreFile).getFile()).toPath()),
-            truststorePassword.toCharArray()
-        );
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(trustStore);
-
-        SSLContext c = SSLContext.getInstance("TLSv1.2");
-        c.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        return c;
-    }
-
-    private void assertFunctionality(RabbitMQContainer container) {
-        String queueName = "test-queue";
-        String text = "Hello World!";
-
-        ConnectionFactory factory = new ConnectionFactory();
-        factory.setHost(container.getHost());
-        factory.setPort(container.getAmqpPort());
-        factory.setUsername(container.getAdminUsername());
-        factory.setPassword(container.getAdminPassword());
-        try (Connection connection = factory.newConnection(); Channel channel = connection.createChannel()) {
-            channel.queueDeclare(queueName, false, false, false, null);
-            channel.basicPublish("", queueName, null, text.getBytes());
-
-            DeliverCallback deliverCallback = (consumerTag, delivery) -> {
-                String message = new String(delivery.getBody(), StandardCharsets.UTF_8);
-                assertThat(message).isEqualTo(text);
-            };
-            channel.basicConsume(queueName, true, deliverCallback, consumerTag -> {});
-        } catch (IOException | TimeoutException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/rabbitmq/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/rabbitmq/RabbitMQContainerTest.java
new file mode 100644
index 00000000000..b3434b2d69d
--- /dev/null
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/rabbitmq/RabbitMQContainerTest.java
@@ -0,0 +1,123 @@
+package org.testcontainers.rabbitmq;
+
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.DeliverCallback;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeoutException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class RabbitMQContainerTest {
+
+    public static final int DEFAULT_AMQPS_PORT = 5671;
+
+    public static final int DEFAULT_AMQP_PORT = 5672;
+
+    public static final int DEFAULT_HTTPS_PORT = 15671;
+
+    public static final int DEFAULT_HTTP_PORT = 15672;
+
+    @Test
+    void shouldCreateRabbitMQContainer() {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
+            container.start();
+
+            assertThat(container.getAdminPassword()).isEqualTo("guest");
+            assertThat(container.getAdminUsername()).isEqualTo("guest");
+
+            assertThat(container.getAmqpsUrl())
+                .isEqualTo(String.format("amqps://%s:%d", container.getHost(), container.getAmqpsPort()));
+            assertThat(container.getAmqpUrl())
+                .isEqualTo(String.format("amqp://%s:%d", container.getHost(), container.getAmqpPort()));
+            assertThat(container.getHttpsUrl())
+                .isEqualTo(String.format("https://%s:%d", container.getHost(), container.getHttpsPort()));
+            assertThat(container.getHttpUrl())
+                .isEqualTo(String.format("http://%s:%d", container.getHost(), container.getHttpPort()));
+
+            assertThat(container.getLivenessCheckPortNumbers())
+                .containsExactlyInAnyOrder(
+                    container.getMappedPort(DEFAULT_AMQP_PORT),
+                    container.getMappedPort(DEFAULT_AMQPS_PORT),
+                    container.getMappedPort(DEFAULT_HTTP_PORT),
+                    container.getMappedPort(DEFAULT_HTTPS_PORT)
+                );
+
+            assertFunctionality(container);
+        }
+    }
+
+    @Test
+    void shouldCreateRabbitMQContainerWithCustomCredentials() {
+        try (
+            RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)
+                .withAdminUser("admin")
+                .withAdminPassword("admin")
+        ) {
+            container.start();
+
+            assertThat(container.getAdminPassword()).isEqualTo("admin");
+            assertThat(container.getAdminUsername()).isEqualTo("admin");
+
+            assertFunctionality(container);
+        }
+    }
+
+    @Test
+    void shouldMountConfigurationFile() {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
+            container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
+            container.start();
+
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
+        }
+    }
+
+    @Test
+    void shouldMountConfigurationFileErlang() {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
+            container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
+            container.start();
+
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
+        }
+    }
+
+    @Test
+    void shouldMountConfigurationFileSysctl() {
+        try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
+            container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
+            container.start();
+
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
+        }
+    }
+
+    private void assertFunctionality(RabbitMQContainer container) {
+        String queueName = "test-queue";
+        String text = "Hello World!";
+
+        ConnectionFactory factory = new ConnectionFactory();
+        factory.setHost(container.getHost());
+        factory.setPort(container.getAmqpPort());
+        factory.setUsername(container.getAdminUsername());
+        factory.setPassword(container.getAdminPassword());
+        try (Connection connection = factory.newConnection(); Channel channel = connection.createChannel()) {
+            channel.queueDeclare(queueName, false, false, false, null);
+            channel.basicPublish("", queueName, null, text.getBytes());
+
+            DeliverCallback deliverCallback = (consumerTag, delivery) -> {
+                String message = new String(delivery.getBody(), StandardCharsets.UTF_8);
+                assertThat(message).isEqualTo(text);
+            };
+            channel.basicConsume(queueName, true, deliverCallback, consumerTag -> {});
+        } catch (IOException | TimeoutException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQTestImages.java b/modules/rabbitmq/src/test/java/org/testcontainers/rabbitmq/RabbitMQTestImages.java
similarity index 82%
rename from modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQTestImages.java
rename to modules/rabbitmq/src/test/java/org/testcontainers/rabbitmq/RabbitMQTestImages.java
index 0898cbdb350..56294f1c196 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQTestImages.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/rabbitmq/RabbitMQTestImages.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.rabbitmq;
 
 import org.testcontainers.utility.DockerImageName;
 

From 76075028d514aa0b5797256ee68d2da8a5635ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 16:23:07 -0600
Subject: [PATCH 4661/4969] Add Toxiproxy container implementation under
 org.testcontainers.toxiproxy (#11091)

---
 docs/modules/toxiproxy.md                     | 12 ++---
 .../containers/ToxiproxyContainer.java        |  3 ++
 .../toxiproxy/ToxiproxyContainer.java         | 54 +++++++++++++++++++
 .../ToxiproxyContainerTest.java}              | 33 ++----------
 4 files changed, 66 insertions(+), 36 deletions(-)
 create mode 100644 modules/toxiproxy/src/main/java/org/testcontainers/toxiproxy/ToxiproxyContainer.java
 rename modules/toxiproxy/src/test/java/org/testcontainers/{containers/ToxiproxyTest.java => toxiproxy/ToxiproxyContainerTest.java} (83%)

diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
index 1b8229982e6..99178935b9a 100644
--- a/docs/modules/toxiproxy.md
+++ b/docs/modules/toxiproxy.md
@@ -17,7 +17,7 @@ A Toxiproxy container can be placed in between test code and a container, or in
 In either scenario, it is necessary to create a `ToxiproxyContainer` instance on the same Docker network, as follows:
 
 <!--codeinclude-->
-[Creating a Toxiproxy container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:creatingProxy
+[Creating a Toxiproxy container](../../modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java) inside_block:creatingProxy
 <!--/codeinclude-->
 
 Next, it is necessary to instruct Toxiproxy to start proxying connections. 
@@ -26,13 +26,13 @@ Each `ToxiproxyContainer` can proxy to many target containers if necessary.
 We do this as follows:
 
 <!--codeinclude-->
-[Starting proxying connections to a target container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxyObject
+[Starting proxying connections to a target container](../../modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java) inside_block:obtainProxyObject
 <!--/codeinclude-->
 
 To establish a connection from the test code (on the host machine) to the target container via Toxiproxy, we obtain **Toxiproxy's** proxy host IP and port:
 
 <!--codeinclude-->
-[Obtaining proxied host and port](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForHostMachine
+[Obtaining proxied host and port](../../modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java) inside_block:obtainProxiedHostAndPortForHostMachine
 <!--/codeinclude-->
 
 Code under test should connect to this proxied host IP and port.
@@ -56,13 +56,13 @@ Please see the [Toxiproxy documentation](https://github.com/Shopify/toxiproxy#to
 As one example, we can introduce latency and random jitter to proxied connections as follows:
 
 <!--codeinclude-->
-[Adding latency to a connection](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:addingLatency
+[Adding latency to a connection](../../modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java) inside_block:addingLatency
 <!--/codeinclude-->
 
 Additionally we can disable the proxy to simulate a complete interruption to the network connection:
 
 <!--codeinclude-->
-[Cutting a connection](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:disableProxy
+[Cutting a connection](../../modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java) inside_block:disableProxy
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
@@ -86,5 +86,3 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 ## Acknowledgements
 
 This module was inspired by a [hotels.com blog post](https://medium.com/hotels-com-technology/i-dont-know-about-resilience-testing-and-so-can-you-b3c59d80012d).
-
-[toxiproxy-java](https://github.com/trekawek/toxiproxy-java) is used to help control failure conditions.
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index c28c4e93ddf..4a3d1af003e 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -26,7 +26,10 @@
  *     <li>HTTP: 8474</li>
  *     <li>Proxied Ports: 8666-8697</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.toxiproxy.ToxiproxyContainer} instead.
  */
+@Deprecated
 public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy");
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/toxiproxy/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/toxiproxy/ToxiproxyContainer.java
new file mode 100644
index 00000000000..b4ab7e29c96
--- /dev/null
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/toxiproxy/ToxiproxyContainer.java
@@ -0,0 +1,54 @@
+package org.testcontainers.toxiproxy;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Toxiproxy.
+ * <p>
+ * Supported images: {@code ghcr.io/shopify/toxiproxy}, {@code shopify/toxiproxy}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>HTTP: 8474</li>
+ *     <li>Proxied Ports: 8666-8697</li>
+ * </ul>
+ */
+public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy");
+
+    private static final DockerImageName GHCR_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy");
+
+    private static final int TOXIPROXY_CONTROL_PORT = 8474;
+
+    private static final int FIRST_PROXIED_PORT = 8666;
+
+    private static final int LAST_PROXIED_PORT = 8666 + 31;
+
+    public ToxiproxyContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public ToxiproxyContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, GHCR_IMAGE_NAME);
+
+        addExposedPorts(TOXIPROXY_CONTROL_PORT);
+        setWaitStrategy(new HttpWaitStrategy().forPath("/version").forPort(TOXIPROXY_CONTROL_PORT));
+
+        // allow up to 32 ports to be proxied (arbitrary value). Here we make the ports exposed; whether or not
+        //  Toxiproxy will listen is controlled at runtime using getProxy(...)
+        for (int i = FIRST_PROXIED_PORT; i <= LAST_PROXIED_PORT; i++) {
+            addExposedPort(i);
+        }
+    }
+
+    /**
+     * @return Publicly exposed Toxiproxy HTTP API control port.
+     */
+    public int getControlPort() {
+        return getMappedPort(TOXIPROXY_CONTROL_PORT);
+    }
+}
diff --git a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java b/modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java
similarity index 83%
rename from modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
rename to modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java
index 1e35c2d7206..2247f135f7b 100644
--- a/modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
+++ b/modules/toxiproxy/src/test/java/org/testcontainers/toxiproxy/ToxiproxyContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.toxiproxy;
 
 import eu.rekawek.toxiproxy.Proxy;
 import eu.rekawek.toxiproxy.ToxiproxyClient;
@@ -6,6 +6,8 @@
 import org.junit.jupiter.api.AutoClose;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
@@ -16,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class ToxiproxyTest {
+public class ToxiproxyContainerTest {
 
     private static final Duration JEDIS_TIMEOUT = Duration.ofSeconds(10);
 
@@ -157,33 +159,6 @@ public void testMultipleProxiesCanBeCreated() throws IOException {
         }
     }
 
-    @Test
-    public void testOriginalAndMappedPorts() {
-        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy("hostname", 7070);
-
-        final int portViaToxiproxy = proxy.getOriginalProxyPort();
-        assertThat(portViaToxiproxy).as("original port is correct").isEqualTo(8666);
-
-        final ToxiproxyContainer.ContainerProxy proxy1 = toxiproxy.getProxy("hostname1", 8080);
-        assertThat(proxy1.getOriginalProxyPort()).as("original port is correct").isEqualTo(8667);
-        assertThat(proxy1.getProxyPort())
-            .as("mapped port is correct")
-            .isEqualTo(toxiproxy.getMappedPort(proxy1.getOriginalProxyPort()));
-
-        final ToxiproxyContainer.ContainerProxy proxy2 = toxiproxy.getProxy("hostname2", 9090);
-        assertThat(proxy2.getOriginalProxyPort()).as("original port is correct").isEqualTo(8668);
-        assertThat(proxy2.getProxyPort())
-            .as("mapped port is correct")
-            .isEqualTo(toxiproxy.getMappedPort(proxy2.getOriginalProxyPort()));
-    }
-
-    @Test
-    public void testProxyName() {
-        final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy("hostname", 7070);
-
-        assertThat(proxy.getName()).as("proxy name is hostname and port").isEqualTo("hostname:7070");
-    }
-
     private void checkCallWithLatency(
         Jedis jedis,
         final String description,

From cb3498960d6a0d1d9b0e51767daed8cae6c5b20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 17:16:26 -0600
Subject: [PATCH 4662/4969] Add Trino container implementation under
 org.testcontainers.trino (#11092)

---
 docs/modules/databases/trino.md               |   2 +-
 .../containers/TrinoContainer.java            |   3 +
 .../testcontainers/trino/TrinoContainer.java  | 108 ++++++++++++++++++
 .../TrinoContainerTest.java                   |   6 +-
 4 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 modules/trino/src/main/java/org/testcontainers/trino/TrinoContainer.java
 rename modules/trino/src/test/java/org/testcontainers/{containers => trino}/TrinoContainerTest.java (93%)

diff --git a/docs/modules/databases/trino.md b/docs/modules/databases/trino.md
index a7ab7495de8..9cb6be8bb5b 100644
--- a/docs/modules/databases/trino.md
+++ b/docs/modules/databases/trino.md
@@ -7,7 +7,7 @@ Testcontainers module for [Trino](https://hub.docker.com/r/trinodb/trino)
 You can start a Trino container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container creation](../../../modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java) inside_block:container
+[Container creation](../../../modules/trino/src/test/java/org/testcontainers/trino/TrinoContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 See [Database containers](./index.md) for documentation and usage that is common to all database container types.
diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
index 19da8d9252a..4f61b6e2352 100644
--- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
+++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
@@ -15,7 +15,10 @@
  * Supported image: {@code trinodb/trino}
  * <p>
  * Exposed ports: 8080
+ *
+ * @deprecated use {@link org.testcontainers.trino.TrinoContainer} instead.
  */
+@Deprecated
 public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
 
     static final String NAME = "trino";
diff --git a/modules/trino/src/main/java/org/testcontainers/trino/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/trino/TrinoContainer.java
new file mode 100644
index 00000000000..145ae4b454c
--- /dev/null
+++ b/modules/trino/src/main/java/org/testcontainers/trino/TrinoContainer.java
@@ -0,0 +1,108 @@
+package org.testcontainers.trino;
+
+import com.google.common.base.Strings;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.VisibleForTesting;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for TrinoDB.
+ * <p>
+ * Supported image: {@code trinodb/trino}
+ * <p>
+ * Exposed ports: 8080
+ */
+public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
+
+    static final String NAME = "trino";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("trinodb/trino");
+
+    static final String IMAGE = "trinodb/trino";
+
+    @VisibleForTesting
+    static final String DEFAULT_TAG = "352";
+
+    private static final int TRINO_PORT = 8080;
+
+    private String username = "test";
+
+    private String catalog = null;
+
+    public TrinoContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public TrinoContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        addExposedPort(TRINO_PORT);
+    }
+
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
+    @NotNull
+    @Override
+    @Deprecated
+    protected Set<Integer> getLivenessCheckPorts() {
+        return super.getLivenessCheckPorts();
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "io.trino.jdbc.TrinoDriver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return String.format(
+            "jdbc:trino://%s:%s/%s",
+            getHost(),
+            getMappedPort(TRINO_PORT),
+            Strings.nullToEmpty(catalog)
+        );
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return "";
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return catalog;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT count(*) FROM tpch.tiny.nation";
+    }
+
+    @Override
+    public TrinoContainer withUsername(final String username) {
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public TrinoContainer withDatabaseName(String dbName) {
+        this.catalog = dbName;
+        return this;
+    }
+
+    public Connection createConnection() throws SQLException, NoDriverFoundException {
+        return createConnection("");
+    }
+}
diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/trino/TrinoContainerTest.java
similarity index 93%
rename from modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
rename to modules/trino/src/test/java/org/testcontainers/trino/TrinoContainerTest.java
index a12df1bcda7..c76c1bbb322 100644
--- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java
+++ b/modules/trino/src/test/java/org/testcontainers/trino/TrinoContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.trino;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.TrinoTestImages;
@@ -24,9 +24,7 @@ void testSimple() throws Exception {
                 ResultSet resultSet = statement.executeQuery("SELECT DISTINCT node_version FROM system.runtime.nodes")
             ) {
                 assertThat(resultSet.next()).as("results").isTrue();
-                assertThat(resultSet.getString("node_version"))
-                    .as("Trino version")
-                    .isEqualTo(TrinoContainer.DEFAULT_TAG);
+                assertThat(resultSet.getString("node_version")).as("Trino version").isEqualTo("352");
                 assertContainerHasCorrectExposedAndLivenessCheckPorts(trino);
             }
         }

From f56a6281a0f4a6483712b34050d7dc492991f040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 17:16:34 -0600
Subject: [PATCH 4663/4969] Move TiDB tests under org.testcontainers.tidb
 (#11093)

---
 docs/modules/databases/tidb.md                               | 2 +-
 .../tidb/SimpleTiDBTest.java => tidb/TiDBContainerTest.java} | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename modules/tidb/src/test/java/org/testcontainers/{junit/tidb/SimpleTiDBTest.java => tidb/TiDBContainerTest.java} (93%)

diff --git a/docs/modules/databases/tidb.md b/docs/modules/databases/tidb.md
index 6ecc12de05b..3dfdc743bbe 100644
--- a/docs/modules/databases/tidb.md
+++ b/docs/modules/databases/tidb.md
@@ -7,7 +7,7 @@ Testcontainers module for [TiDB](https://hub.docker.com/r/pingcap/tidb)
 You can start a TiDB container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container creation](../../../modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java) inside_block:container
+[Container creation](../../../modules/tidb/src/test/java/org/testcontainers/tidb/TiDBContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/tidb/TiDBContainerTest.java
similarity index 93%
rename from modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
rename to modules/tidb/src/test/java/org/testcontainers/tidb/TiDBContainerTest.java
index 9323e7d21ac..54ded93e69e 100644
--- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java
+++ b/modules/tidb/src/test/java/org/testcontainers/tidb/TiDBContainerTest.java
@@ -1,16 +1,15 @@
-package org.testcontainers.junit.tidb;
+package org.testcontainers.tidb;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.TiDBTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
-import org.testcontainers.tidb.TiDBContainer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SimpleTiDBTest extends AbstractContainerDatabaseTest {
+class TiDBContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     void testSimple() throws SQLException {

From 71996afc78fc1ea02aa20ca4fbb5ce5c0be21bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 17:16:43 -0600
Subject: [PATCH 4664/4969] Add DB2 container implementation under
 org.testcontainers.db2 (#11094)

---
 docs/modules/databases/db2.md                 |   6 +-
 .../containers/Db2Container.java              |   2 +
 .../org/testcontainers/db2/Db2Container.java  | 143 ++++++++++++++++++
 .../org/testcontainers/Db2TestImages.java     |   2 +-
 .../Db2ContainerTest.java}                    |   7 +-
 5 files changed, 151 insertions(+), 9 deletions(-)
 create mode 100644 modules/db2/src/main/java/org/testcontainers/db2/Db2Container.java
 rename modules/db2/src/test/java/org/testcontainers/{junit/db2/SimpleDb2Test.java => db2/Db2ContainerTest.java} (88%)

diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
index fde68a77afe..7a5ba79a86f 100644
--- a/docs/modules/databases/db2.md
+++ b/docs/modules/databases/db2.md
@@ -1,19 +1,17 @@
 # DB2 Module
 
-Testcontainers module for [DB2](https://hub.docker.com/r/ibmcom/db2)
+Testcontainers module for [DB2](https://www.ibm.com/docs/en/db2/11.5.x?topic=deployments-db2-community-edition-docker)
 
 ## Usage example
 
 You can start a DB2 container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container definition](../../../modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java) inside_block:container
+[Container definition](../../../modules/db2/src/test/java/org/testcontainers/db2/Db2ContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 !!! warning "EULA Acceptance"
     Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the DB2 image EULA, call the `acceptLicense()` method, or place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `ibmcom/db2:11.5.0.0a` (or, if you are overriding the docker image name/tag, update accordingly).
-    
-    Please see the [`ibmcom/db2` image documentation](https://hub.docker.com/r/ibmcom/db2) for a link to the EULA document.
 
 See [Database containers](./index.md) for documentation and usage that is common to all relational database container types.
 
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 18fb4aac0e6..9f5b9dfde89 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -18,7 +18,9 @@
  * <ul>
  *     <li>Database: 50000</li>
  * </ul>
+ * @deprecated use {@link org.testcontainers.db2.Db2Container} instead.
  */
+@Deprecated
 public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     public static final String NAME = "db2";
diff --git a/modules/db2/src/main/java/org/testcontainers/db2/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/db2/Db2Container.java
new file mode 100644
index 00000000000..bdd182599e5
--- /dev/null
+++ b/modules/db2/src/main/java/org/testcontainers/db2/Db2Container.java
@@ -0,0 +1,143 @@
+package org.testcontainers.db2;
+
+import com.github.dockerjava.api.model.Capability;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.LicenseAcceptance;
+
+import java.time.Duration;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for IBM DB2.
+ * <p>
+ * Supported images: {@code icr.io/db2_community/db2}, {@code ibmcom/db2}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 50000</li>
+ * </ul>
+ */
+public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
+
+    public static final String NAME = "db2";
+
+    private static final DockerImageName DEFAULT_NEW_IMAGE_NAME = DockerImageName.parse("icr.io/db2_community/db2");
+
+    public static final int DB2_PORT = 50000;
+
+    private String databaseName = "test";
+
+    private String username = "db2inst1";
+
+    private String password = "foobar1234";
+
+    public Db2Container(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public Db2Container(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_NEW_IMAGE_NAME);
+
+        withCreateContainerCmdModifier(cmd -> cmd.withCapAdd(Capability.IPC_LOCK).withCapAdd(Capability.IPC_OWNER));
+        waitingFor(Wait.forLogMessage(".*Setup has completed\\..*", 1).withStartupTimeout(Duration.ofMinutes(10)));
+
+        addExposedPort(DB2_PORT);
+    }
+
+    /**
+     * @return the ports on which to check if the container is ready
+     * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+     */
+    @Override
+    @Deprecated
+    protected Set<Integer> getLivenessCheckPorts() {
+        return super.getLivenessCheckPorts();
+    }
+
+    @Override
+    protected void configure() {
+        // If license was not accepted programmatically, check if it was accepted via resource file
+        if (!getEnvMap().containsKey("LICENSE")) {
+            LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+            acceptLicense();
+        }
+
+        addEnv("DBNAME", databaseName);
+        addEnv("DB2INSTANCE", username);
+        addEnv("DB2INST1_PASSWORD", password);
+
+        // These settings help the DB2 container start faster
+        if (!getEnvMap().containsKey("AUTOCONFIG")) {
+            addEnv("AUTOCONFIG", "false");
+        }
+        if (!getEnvMap().containsKey("ARCHIVE_LOGS")) {
+            addEnv("ARCHIVE_LOGS", "false");
+        }
+    }
+
+    /**
+     * Accepts the license for the DB2 container by setting the LICENSE=accept
+     * variable as described at <a href="https://hub.docker.com/r/ibmcom/db2">https://hub.docker.com/r/ibmcom/db2</a>
+     */
+    public Db2Container acceptLicense() {
+        addEnv("LICENSE", "accept");
+        return this;
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "com.ibm.db2.jcc.DB2Driver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        String additionalUrlParams = constructUrlParameters(":", ";", ";");
+        return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName + additionalUrlParams;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public Db2Container withUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public Db2Container withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    @Override
+    public Db2Container withDatabaseName(String dbName) {
+        this.databaseName = dbName;
+        return this;
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+
+    @Override
+    protected String getTestQueryString() {
+        return "SELECT 1 FROM SYSIBM.SYSDUMMY1";
+    }
+}
diff --git a/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java b/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
index b0bfc869272..002d030b1c5 100644
--- a/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
+++ b/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface Db2TestImages {
-    DockerImageName DB2_IMAGE = DockerImageName.parse("ibmcom/db2:11.5.0.0a");
+    DockerImageName DB2_IMAGE = DockerImageName.parse("icr.io/db2_community/db2:11.5.8.0");
 }
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/db2/Db2ContainerTest.java
similarity index 88%
rename from modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
rename to modules/db2/src/test/java/org/testcontainers/db2/Db2ContainerTest.java
index 95222330e09..6b17d1583f7 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/db2/Db2ContainerTest.java
@@ -1,8 +1,7 @@
-package org.testcontainers.junit.db2;
+package org.testcontainers.db2;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.Db2TestImages;
-import org.testcontainers.containers.Db2Container;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -10,12 +9,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SimpleDb2Test extends AbstractContainerDatabaseTest {
+class Db2ContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            Db2Container db2 = new Db2Container("ibmcom/db2:11.5.0.0a").acceptLicense()
+            Db2Container db2 = new Db2Container("icr.io/db2_community/db2:11.5.8.0").acceptLicense()
             // }
         ) {
             db2.start();

From 154025623acc70b2f59da30141e808b978267f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 17:17:08 -0600
Subject: [PATCH 4665/4969] Add MongoDB container implementation under
 org.testcontainers.mongodb (#11095)

---
 docs/modules/databases/mongodb.md             |   4 +-
 .../containers/MongoDBContainer.java          |   3 +
 .../mongodb/MongoDBContainer.java             | 207 ++++++++++++++++++
 .../AbstractMongo.java                        |   2 +-
 .../CompatibleImageTest.java                  |   6 +-
 .../MongoDBContainerTest.java                 |   8 +-
 6 files changed, 220 insertions(+), 10 deletions(-)
 create mode 100644 modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBContainer.java
 rename modules/mongodb/src/test/java/org/testcontainers/{containers => mongodb}/AbstractMongo.java (98%)
 rename modules/mongodb/src/test/java/org/testcontainers/{containers => mongodb}/CompatibleImageTest.java (88%)
 rename modules/mongodb/src/test/java/org/testcontainers/{containers => mongodb}/MongoDBContainerTest.java (74%)

diff --git a/docs/modules/databases/mongodb.md b/docs/modules/databases/mongodb.md
index 0d410d115d5..cbd82aabc33 100644
--- a/docs/modules/databases/mongodb.md
+++ b/docs/modules/databases/mongodb.md
@@ -12,13 +12,13 @@ The MongoDB module provides two Testcontainers for MongoDB unit testing:
 The following example shows how to create a MongoDBContainer:
 
 <!--codeinclude-->
-[Creating a MongoDB container](../../../modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java) inside_block:creatingMongoDBContainer
+[Creating a MongoDB container](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBContainerTest.java) inside_block:creatingMongoDBContainer
 <!--/codeinclude-->
 
 And how to start it:
 
 <!--codeinclude-->
-[Starting a MongoDB container](../../../modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java) inside_block:startingMongoDBContainer
+[Starting a MongoDB container](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBContainerTest.java) inside_block:startingMongoDBContainer
 <!--/codeinclude-->
 
 !!! note
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index e0bb04bb166..b986a720964 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -16,8 +16,11 @@
  * Supported images: {@code mongo}, {@code mongodb/mongodb-community-server}, {@code mongodb/mongodb-enterprise-server}
  * <p>
  * Exposed ports: 27017
+ *
+ * @deprecated use {@link org.testcontainers.mongodb.MongoDBContainer} instead.
  */
 @Slf4j
+@Deprecated
 public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mongo");
diff --git a/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBContainer.java
new file mode 100644
index 00000000000..c61be6675ba
--- /dev/null
+++ b/modules/mongodb/src/main/java/org/testcontainers/mongodb/MongoDBContainer.java
@@ -0,0 +1,207 @@
+package org.testcontainers.mongodb;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import java.io.IOException;
+
+/**
+ * Testcontainers implementation for MongoDB.
+ * <p>
+ * Supported images: {@code mongo}, {@code mongodb/mongodb-community-server}, {@code mongodb/mongodb-enterprise-server}
+ * <p>
+ * Exposed ports: 27017
+ */
+@Slf4j
+public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mongo");
+
+    private static final DockerImageName COMMUNITY_SERVER_IMAGE = DockerImageName.parse(
+        "mongodb/mongodb-community-server"
+    );
+
+    private static final DockerImageName ENTERPRISE_SERVER_IMAGE = DockerImageName.parse(
+        "mongodb/mongodb-enterprise-server"
+    );
+
+    private static final int MONGODB_INTERNAL_PORT = 27017;
+
+    private static final int CONTAINER_EXIT_CODE_OK = 0;
+
+    private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
+
+    private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
+
+    private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
+
+    private boolean shardingEnabled;
+
+    private boolean rsEnabled;
+
+    public MongoDBContainer(@NonNull String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public MongoDBContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, COMMUNITY_SERVER_IMAGE, ENTERPRISE_SERVER_IMAGE);
+
+        withExposedPorts(MONGODB_INTERNAL_PORT);
+    }
+
+    @Override
+    protected void containerIsStarting(InspectContainerResponse containerInfo) {
+        if (this.shardingEnabled) {
+            copyFileToContainer(MountableFile.forClasspathResource("/sharding.sh", 0777), STARTER_SCRIPT);
+        }
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+        if (this.rsEnabled) {
+            initReplicaSet(reused);
+        }
+    }
+
+    private String[] buildMongoEvalCommand(String command) {
+        return new String[] {
+            "sh",
+            "-c",
+            "mongosh mongo --eval \"" + command + "\"  || mongo --eval \"" + command + "\"",
+        };
+    }
+
+    private void checkMongoNodeExitCode(ExecResult execResult) {
+        if (execResult.getExitCode() != CONTAINER_EXIT_CODE_OK) {
+            String errorMessage = String.format("An error occurred: %s", execResult.getStdout());
+            log.error(errorMessage);
+            throw new ReplicaSetInitializationException(errorMessage);
+        }
+    }
+
+    private String buildMongoWaitCommand() {
+        return String.format(
+            "var attempt = 0; " +
+            "while" +
+            "(%s) " +
+            "{ " +
+            "if (attempt > %d) {quit(1);} " +
+            "print('%s ' + attempt); sleep(100);  attempt++; " +
+            " }",
+            "db.runCommand( { isMaster: 1 } ).ismaster==false",
+            AWAIT_INIT_REPLICA_SET_ATTEMPTS,
+            "An attempt to await for a single node replica set initialization:"
+        );
+    }
+
+    private void checkMongoNodeExitCodeAfterWaiting(ExecResult execResultWaitForMaster) {
+        if (execResultWaitForMaster.getExitCode() != CONTAINER_EXIT_CODE_OK) {
+            String errorMessage = String.format(
+                "A single node replica set was not initialized in a set timeout: %d attempts",
+                AWAIT_INIT_REPLICA_SET_ATTEMPTS
+            );
+            log.error(errorMessage);
+            throw new ReplicaSetInitializationException(errorMessage);
+        }
+    }
+
+    @SneakyThrows(value = { IOException.class, InterruptedException.class })
+    private void initReplicaSet(boolean reused) {
+        if (reused && isReplicationSetAlreadyInitialized()) {
+            log.debug("Replica set already initialized.");
+        } else {
+            log.debug("Initializing a single node node replica set...");
+            ExecResult execResultInitRs = execInContainer(buildMongoEvalCommand("rs.initiate();"));
+            log.debug(execResultInitRs.getStdout());
+            checkMongoNodeExitCode(execResultInitRs);
+
+            log.debug(
+                "Awaiting for a single node replica set initialization up to {} attempts",
+                AWAIT_INIT_REPLICA_SET_ATTEMPTS
+            );
+            ExecResult execResultWaitForMaster = execInContainer(buildMongoEvalCommand(buildMongoWaitCommand()));
+            log.debug(execResultWaitForMaster.getStdout());
+
+            checkMongoNodeExitCodeAfterWaiting(execResultWaitForMaster);
+        }
+    }
+
+    public static class ReplicaSetInitializationException extends RuntimeException {
+
+        ReplicaSetInitializationException(String errorMessage) {
+            super(errorMessage);
+        }
+    }
+
+    @SneakyThrows
+    private boolean isReplicationSetAlreadyInitialized() {
+        // since we are creating a replica set with one node, this node must be primary (state = 1)
+        ExecResult execCheckRsInit = execInContainer(
+            buildMongoEvalCommand("if(db.adminCommand({replSetGetStatus: 1})['myState'] != 1) quit(900)")
+        );
+        return execCheckRsInit.getExitCode() == CONTAINER_EXIT_CODE_OK;
+    }
+
+    /**
+     * Enables replica set on the cluster
+     *
+     * @return this
+     */
+    public MongoDBContainer withReplicaSet() {
+        this.rsEnabled = true;
+        withCommand("--replSet", "docker-rs");
+        waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
+        return this;
+    }
+
+    /**
+     * Enables sharding on the cluster
+     *
+     * @return this
+     */
+    public MongoDBContainer withSharding() {
+        this.shardingEnabled = true;
+        withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+        waitingFor(Wait.forLogMessage("(?i).*mongos ready.*", 1));
+        withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("sh"));
+        return this;
+    }
+
+    /**
+     * Gets a connection string url, unlike {@link #getReplicaSetUrl} this does not point to a
+     * database
+     * @return a connection url pointing to a mongodb instance
+     */
+    public String getConnectionString() {
+        return String.format("mongodb://%s:%d", getHost(), getMappedPort(MONGODB_INTERNAL_PORT));
+    }
+
+    /**
+     * Gets a replica set url for the default {@value #MONGODB_DATABASE_NAME_DEFAULT} database.
+     *
+     * @return a replica set url.
+     */
+    public String getReplicaSetUrl() {
+        return getReplicaSetUrl(MONGODB_DATABASE_NAME_DEFAULT);
+    }
+
+    /**
+     * Gets a replica set url for a provided <code>databaseName</code>.
+     *
+     * @param databaseName a database name.
+     * @return a replica set url.
+     */
+    public String getReplicaSetUrl(String databaseName) {
+        if (!isRunning()) {
+            throw new IllegalStateException("MongoDBContainer should be started first");
+        }
+        return getConnectionString() + "/" + databaseName;
+    }
+}
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/AbstractMongo.java b/modules/mongodb/src/test/java/org/testcontainers/mongodb/AbstractMongo.java
similarity index 98%
rename from modules/mongodb/src/test/java/org/testcontainers/containers/AbstractMongo.java
rename to modules/mongodb/src/test/java/org/testcontainers/mongodb/AbstractMongo.java
index 4fe23fbb50c..8bd0f99dbd5 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/AbstractMongo.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/mongodb/AbstractMongo.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.mongodb;
 
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/mongodb/src/test/java/org/testcontainers/mongodb/CompatibleImageTest.java
similarity index 88%
rename from modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
rename to modules/mongodb/src/test/java/org/testcontainers/mongodb/CompatibleImageTest.java
index 7cd7296c14a..b877dca8954 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/mongodb/CompatibleImageTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.mongodb;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -23,7 +23,7 @@ static String[] image() {
     void shouldExecuteTransactions() {
         try (
             // creatingMongoDBContainer {
-            final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")
+            MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10").withReplicaSet()
             // }
         ) {
             // startingMongoDBContainer {
@@ -36,7 +36,7 @@ void shouldExecuteTransactions() {
     @ParameterizedTest
     @MethodSource("image")
     void shouldSupportSharding(String image) {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer(image).withSharding()) {
+        try (MongoDBContainer mongoDBContainer = new MongoDBContainer(image).withSharding()) {
             mongoDBContainer.start();
             final MongoClient mongoClient = MongoClients.create(mongoDBContainer.getReplicaSetUrl());
 
diff --git a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBContainerTest.java
similarity index 74%
rename from modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
rename to modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBContainerTest.java
index 29d75f80640..816243d769e 100644
--- a/modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java
+++ b/modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.mongodb;
 
 import org.junit.jupiter.api.Test;
 
@@ -13,7 +13,7 @@ class MongoDBContainerTest extends AbstractMongo {
     void shouldExecuteTransactions() {
         try (
             // creatingMongoDBContainer {
-            final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")
+            MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10").withReplicaSet()
             // }
         ) {
             // startingMongoDBContainer {
@@ -25,14 +25,14 @@ void shouldExecuteTransactions() {
 
     @Test
     void supportsMongoDB_7_0() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0")) {
+        try (MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:7.0")) {
             mongoDBContainer.start();
         }
     }
 
     @Test
     void shouldTestDatabaseName() {
-        try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")) {
+        try (MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:4.0.10")) {
             mongoDBContainer.start();
             final String databaseName = "my-db";
             assertThat(mongoDBContainer.getReplicaSetUrl(databaseName)).endsWith(databaseName);

From 188c9c2492787eda05db5d6387a7c25500229378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 18:29:14 -0600
Subject: [PATCH 4666/4969] Add Selenium container implementation under
 org.testcontainers.selenium (#11096)

---
 docs/modules/webdriver_containers.md          |  24 +-
 .../containers/BrowserWebDriverContainer.java |   3 +
 .../selenium/BrowserWebDriverContainer.java   | 283 ++++++++++++++++++
 .../BaseWebDriverContainerTest.java           |   9 +-
 .../BrowserWebDriverContainerTest.java        |  25 +-
 ...ChromeRecordingWebDriverContainerTest.java |  25 +-
 .../ChromeWebDriverContainerTest.java         |   6 +-
 .../ContainerWithoutCapabilitiesTest.java     |   6 +-
 ...stomWaitTimeoutWebDriverContainerTest.java |   8 +-
 .../EdgeWebDriverContainerTest.java           |   6 +-
 .../FirefoxWebDriverContainerTest.java        |   6 +-
 .../LocalServerWebDriverContainerTest.java    |   8 +-
 ...ecificImageNameWebDriverContainerTest.java |   7 +-
 13 files changed, 342 insertions(+), 74 deletions(-)
 create mode 100644 modules/selenium/src/main/java/org/testcontainers/selenium/BrowserWebDriverContainer.java
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/BaseWebDriverContainerTest.java (87%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/BrowserWebDriverContainerTest.java (82%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/ChromeRecordingWebDriverContainerTest.java (88%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/ChromeWebDriverContainerTest.java (69%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/ContainerWithoutCapabilitiesTest.java (74%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/CustomWaitTimeoutWebDriverContainerTest.java (66%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/EdgeWebDriverContainerTest.java (69%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/FirefoxWebDriverContainerTest.java (70%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/LocalServerWebDriverContainerTest.java (87%)
 rename modules/selenium/src/test/java/org/testcontainers/{junit => selenium}/SpecificImageNameWebDriverContainerTest.java (63%)

diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index 65b39bc5a8f..a42f261d79c 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -23,14 +23,14 @@ every test.
 
 The following field in your JUnit UI test class will prepare a container running Chrome:
 <!--codeinclude-->
-[Chrome](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java) inside_block:junitRule
+[Chrome](../../modules/selenium/src/test/java/org/testcontainers/selenium/ChromeWebDriverContainerTest.java) inside_block:junitRule
 <!--/codeinclude-->
 
         
 Now, instead of instantiating an instance of WebDriver directly, use the following to obtain an instance inside your
 test methods:
 <!--codeinclude-->
-[RemoteWebDriver](../../modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java) inside_block:getWebDriver
+[RemoteWebDriver](../../modules/selenium/src/test/java/org/testcontainers/selenium/LocalServerWebDriverContainerTest.java) inside_block:getWebDriver
 <!--/codeinclude-->
 
 You can then use this driver instance like a regular WebDriver.
@@ -38,7 +38,7 @@ You can then use this driver instance like a regular WebDriver.
 Note that, if you want to test a **web application running on the host machine** (the machine the JUnit tests are
 running on - which is quite likely), you'll need to use [the host exposing](../features/networking.md#exposing-host-ports-to-the-container) feature of Testcontainers, e.g.:
 <!--codeinclude-->
-[Open Web Page](../../modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java) inside_block:getPage
+[Open Web Page](../../modules/selenium/src/test/java/org/testcontainers/selenium/LocalServerWebDriverContainerTest.java) inside_block:getPage
 <!--/codeinclude-->
 
 
@@ -48,9 +48,9 @@ running on - which is quite likely), you'll need to use [the host exposing](../f
 
 At the moment, Chrome, Firefox and Edge are supported. To switch, simply change the first parameter to the rule constructor:
 <!--codeinclude-->
-[Chrome](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java) inside_block:junitRule
-[Firefox](../../modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java) inside_block:junitRule
-[Edge](../../modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java) inside_block:junitRule
+[Chrome](../../modules/selenium/src/test/java/org/testcontainers/selenium/ChromeWebDriverContainerTest.java) inside_block:junitRule
+[Firefox](../../modules/selenium/src/test/java/org/testcontainers/selenium/FirefoxWebDriverContainerTest.java) inside_block:junitRule
+[Edge](../../modules/selenium/src/test/java/org/testcontainers/selenium/EdgeWebDriverContainerTest.java) inside_block:junitRule
 <!--/codeinclude-->
 
 ### Recording videos
@@ -59,8 +59,8 @@ By default, no videos will be recorded. However, you can instruct Testcontainers
 just for failing tests.
 
 <!--codeinclude-->
-[Record all Tests](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordAll
-[Record failing Tests](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordFailing
+[Record all Tests](../../modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java) inside_block:recordAll
+[Record failing Tests](../../modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java) inside_block:recordFailing
 <!--/codeinclude-->
 
 Note that the second parameter of `withRecordingMode` should be a directory where recordings can be saved.
@@ -68,13 +68,13 @@ Note that the second parameter of `withRecordingMode` should be a directory wher
 By default, the video will be recorded in [FLV](https://en.wikipedia.org/wiki/Flash_Video) format, but you can specify it explicitly or change it to [MP4](https://en.wikipedia.org/wiki/MPEG-4_Part_14) using `withRecordingMode` method with `VncRecordingFormat` option:
 
 <!--codeinclude-->
-[Video Format in MP4](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordMp4
-[Video Format in FLV](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:recordFlv
+[Video Format in MP4](../../modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java) inside_block:recordMp4
+[Video Format in FLV](../../modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java) inside_block:recordFlv
 <!--/codeinclude-->
 
 If you would like to customise the file name of the recording, or provide a different directory at runtime based on the description of the test and/or its success or failure, you may provide a custom recording file factory as follows:
 <!--codeinclude-->
-[CustomRecordingFileFactory](../../modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java) inside_block:withRecordingFileFactory
+[CustomRecordingFileFactory](../../modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java) inside_block:withRecordingFileFactory
 <!--/codeinclude-->
 
 
@@ -82,7 +82,7 @@ Note the factory must implement `org.testcontainers.containers.RecordingFileFact
 
 ## More examples
 
-A few different examples are shown in [ChromeWebDriverContainerTest.java](https://github.com/testcontainers/testcontainers-java/blob/main/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java).
+A few different examples are shown in [ChromeWebDriverContainerTest.java](https://github.com/testcontainers/testcontainers-java/blob/main/modules/selenium/src/test/java/org/testcontainers/selenium/ChromeWebDriverContainerTest.java).
 
 ## Adding this module to your project dependencies
 
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 8cdb6ca611c..53ee8ba5577 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -46,7 +46,10 @@
  * {@code selenium/standalone-edge}, {@code selenium/standalone-chrome-debug}, {@code selenium/standalone-firefox-debug}
  * <p>
  * Exposed ports: 4444
+ *
+ * @deprecated use {@link org.testcontainers.selenium.BrowserWebDriverContainer} instead.
  */
+@Deprecated
 public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SELF>>
     extends GenericContainer<SELF>
     implements LinkableContainer, TestLifecycleAware {
diff --git a/modules/selenium/src/main/java/org/testcontainers/selenium/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/selenium/BrowserWebDriverContainer.java
new file mode 100644
index 00000000000..97ac23f5d55
--- /dev/null
+++ b/modules/selenium/src/main/java/org/testcontainers/selenium/BrowserWebDriverContainer.java
@@ -0,0 +1,283 @@
+package org.testcontainers.selenium;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Volume;
+import com.google.common.collect.ImmutableSet;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.DefaultRecordingFileFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.RecordingFileFactory;
+import org.testcontainers.containers.VncRecordingContainer;
+import org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
+import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.lifecycle.TestDescription;
+import org.testcontainers.lifecycle.TestLifecycleAware;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * A chrome/firefox/custom container based on SeleniumHQ's standalone container sets.
+ * <p>
+ * Supported images: {@code selenium/standalone-chrome}, {@code selenium/standalone-firefox},
+ * {@code selenium/standalone-edge}, {@code selenium/standalone-chrome-debug}, {@code selenium/standalone-firefox-debug}
+ * <p>
+ * Exposed ports: 4444
+ */
+public class BrowserWebDriverContainer
+    extends GenericContainer<BrowserWebDriverContainer>
+    implements TestLifecycleAware {
+
+    private static final DockerImageName CHROME_IMAGE = DockerImageName.parse("selenium/standalone-chrome");
+
+    private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox");
+
+    private static final DockerImageName EDGE_IMAGE = DockerImageName.parse("selenium/standalone-edge");
+
+    private static final DockerImageName CHROME_DEBUG_IMAGE = DockerImageName.parse("selenium/standalone-chrome-debug");
+
+    private static final DockerImageName FIREFOX_DEBUG_IMAGE = DockerImageName.parse(
+        "selenium/standalone-firefox-debug"
+    );
+
+    private static final DockerImageName[] COMPATIBLE_IMAGES = new DockerImageName[] {
+        CHROME_IMAGE,
+        FIREFOX_IMAGE,
+        EDGE_IMAGE,
+        CHROME_DEBUG_IMAGE,
+        FIREFOX_DEBUG_IMAGE,
+    };
+
+    private static final String DEFAULT_PASSWORD = "secret";
+
+    private static final int SELENIUM_PORT = 4444;
+
+    private static final int VNC_PORT = 5900;
+
+    private static final String NO_PROXY_KEY = "no_proxy";
+
+    private static final String TC_TEMP_DIR_PREFIX = "tc";
+
+    private VncRecordingMode recordingMode = VncRecordingMode.RECORD_FAILING;
+
+    private VncRecordingFormat recordingFormat;
+
+    private RecordingFileFactory recordingFileFactory;
+
+    private File vncRecordingDirectory;
+
+    private VncRecordingContainer vncRecordingContainer = null;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BrowserWebDriverContainer.class);
+
+    /**
+     * Constructor taking a specific webdriver container name and tag
+     * @param dockerImageName Name of the selenium docker image
+     */
+    public BrowserWebDriverContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * Constructor taking a specific webdriver container name and tag
+     * @param dockerImageName Name of the selenium docker image
+     */
+    public BrowserWebDriverContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(COMPATIBLE_IMAGES);
+
+        waitingFor(getDefaultWaitStrategy());
+
+        withRecordingFileFactory(new DefaultRecordingFileFactory());
+        // We have to force SKIP mode for the recording by default because we don't know if the image has VNC or not
+        recordingMode = VncRecordingMode.SKIP;
+    }
+
+    @NotNull
+    @Override
+    protected Set<Integer> getLivenessCheckPorts() {
+        Integer seleniumPort = getMappedPort(SELENIUM_PORT);
+        if (recordingMode == VncRecordingMode.SKIP) {
+            return ImmutableSet.of(seleniumPort);
+        } else {
+            return ImmutableSet.of(seleniumPort, getMappedPort(VNC_PORT));
+        }
+    }
+
+    @Override
+    protected void configure() {
+        if (recordingMode != VncRecordingMode.SKIP) {
+            if (vncRecordingDirectory == null) {
+                try {
+                    vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
+                } catch (IOException e) {
+                    // should never happen as per javadoc, since we use valid prefix
+                    logger().error("Exception while trying to create temp directory", e);
+                    throw new ContainerLaunchException("Exception while trying to create temp directory", e);
+                }
+            }
+
+            if (getNetwork() == null) {
+                withNetwork(Network.SHARED);
+            }
+
+            vncRecordingContainer =
+                new VncRecordingContainer(this)
+                    .withVncPassword(DEFAULT_PASSWORD)
+                    .withVncPort(VNC_PORT)
+                    .withVideoFormat(recordingFormat);
+        }
+
+        String timeZone = System.getProperty("user.timezone");
+
+        if (timeZone == null || timeZone.isEmpty()) {
+            timeZone = "Etc/UTC";
+        }
+
+        addExposedPorts(SELENIUM_PORT, VNC_PORT);
+        addEnv("TZ", timeZone);
+
+        if (!getEnvMap().containsKey(NO_PROXY_KEY)) {
+            addEnv(NO_PROXY_KEY, "localhost");
+        }
+
+        setCommand("/opt/bin/entry_point.sh");
+
+        if (getShmSize() == null) {
+            if (SystemUtils.IS_OS_WINDOWS) {
+                withSharedMemorySize(512 * FileUtils.ONE_MB);
+            } else {
+                this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));
+            }
+        }
+
+        /*
+         * Some unreliability of the selenium browser containers has been observed, so allow multiple attempts to start.
+         */
+        setStartupAttempts(3);
+    }
+
+    public URL getSeleniumAddress() {
+        try {
+            return new URL("http", getHost(), getMappedPort(SELENIUM_PORT), "/wd/hub");
+        } catch (MalformedURLException e) {
+            e.printStackTrace(); // TODO
+            return null;
+        }
+    }
+
+    public String getVncAddress() {
+        return "vnc://vnc:secret@" + getHost() + ":" + getMappedPort(VNC_PORT);
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        if (vncRecordingContainer != null) {
+            LOGGER.debug("Starting VNC recording");
+            vncRecordingContainer.start();
+        }
+    }
+
+    @Override
+    public void afterTest(TestDescription description, Optional<Throwable> throwable) {
+        retainRecordingIfNeeded(description.getFilesystemFriendlyName(), !throwable.isPresent());
+    }
+
+    @Override
+    public void stop() {
+        if (vncRecordingContainer != null) {
+            try {
+                vncRecordingContainer.stop();
+            } catch (Exception e) {
+                LOGGER.debug("Failed to stop vncRecordingContainer", e);
+            }
+            vncRecordingContainer = null;
+        }
+
+        super.stop();
+    }
+
+    private void retainRecordingIfNeeded(String prefix, boolean succeeded) {
+        final boolean shouldRecord;
+        switch (recordingMode) {
+            case RECORD_ALL:
+                shouldRecord = true;
+                break;
+            case RECORD_FAILING:
+                shouldRecord = !succeeded;
+                break;
+            default:
+                shouldRecord = false;
+                break;
+        }
+
+        if (shouldRecord) {
+            File recordingFile = recordingFileFactory.recordingFileForTest(
+                vncRecordingDirectory,
+                prefix,
+                succeeded,
+                vncRecordingContainer.getVideoFormat()
+            );
+            LOGGER.info("Screen recordings for test {} will be stored at: {}", prefix, recordingFile);
+
+            vncRecordingContainer.saveRecordingToFile(recordingFile);
+        }
+    }
+
+    public BrowserWebDriverContainer withRecordingMode(VncRecordingMode recordingMode, File vncRecordingDirectory) {
+        return withRecordingMode(recordingMode, vncRecordingDirectory, null);
+    }
+
+    public BrowserWebDriverContainer withRecordingMode(
+        VncRecordingMode recordingMode,
+        File vncRecordingDirectory,
+        VncRecordingFormat recordingFormat
+    ) {
+        this.recordingMode = recordingMode;
+        this.vncRecordingDirectory = vncRecordingDirectory;
+        this.recordingFormat = recordingFormat;
+        return self();
+    }
+
+    public BrowserWebDriverContainer withRecordingFileFactory(RecordingFileFactory recordingFileFactory) {
+        this.recordingFileFactory = recordingFileFactory;
+        return self();
+    }
+
+    private WaitStrategy getDefaultWaitStrategy() {
+        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
+            .withRegEx(
+                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
+            )
+            .withStartupTimeout(Duration.ofMinutes(1));
+
+        return new WaitAllStrategy()
+            .withStrategy(logWaitStrategy)
+            .withStrategy(new HostPortWaitStrategy())
+            .withStartupTimeout(Duration.ofMinutes(1));
+    }
+
+    public enum VncRecordingMode {
+        SKIP,
+        RECORD_ALL,
+        RECORD_FAILING,
+    }
+}
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/BaseWebDriverContainerTest.java
similarity index 87%
rename from modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/BaseWebDriverContainerTest.java
index bb35b664301..eb7f946b6fa 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/BaseWebDriverContainerTest.java
@@ -1,10 +1,9 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
@@ -30,7 +29,7 @@ public class BaseWebDriverContainerTest {
         HELLO_WORLD.start();
     }
 
-    protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule, Capabilities capabilities) {
+    protected static void doSimpleExplore(BrowserWebDriverContainer rule, Capabilities capabilities) {
         RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
         driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
         System.out.println("Selenium remote URL is: " + rule.getSeleniumAddress());
@@ -46,11 +45,11 @@ protected static void doSimpleExplore(BrowserWebDriverContainer<?> rule, Capabil
     }
 
     protected void assertBrowserNameIs(
-        BrowserWebDriverContainer<?> rule,
+        BrowserWebDriverContainer container,
         String expectedName,
         Capabilities capabilities
     ) {
-        RemoteWebDriver driver = new RemoteWebDriver(rule.getSeleniumAddress(), capabilities);
+        RemoteWebDriver driver = new RemoteWebDriver(container.getSeleniumAddress(), capabilities);
         driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
         String actual = driver.getCapabilities().getBrowserName();
         assertThat(actual).as(String.format("actual browser name is %s", actual)).isEqualTo(expectedName);
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/BrowserWebDriverContainerTest.java
similarity index 82%
rename from modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/BrowserWebDriverContainerTest.java
index d41b59fe7ed..b5e632cd217 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/BrowserWebDriverContainerTest.java
@@ -1,12 +1,9 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.jupiter.api.Test;
-import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.firefox.FirefoxOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
 import java.util.Collections;
 import java.util.List;
@@ -24,8 +21,9 @@ class BrowserWebDriverContainerTest {
     @Test
     void honorPresetNoProxyEnvironment() {
         try (
-            BrowserWebDriverContainer chromeWithNoProxySet = (BrowserWebDriverContainer) new BrowserWebDriverContainer()
-                .withCapabilities(new ChromeOptions())
+            BrowserWebDriverContainer chromeWithNoProxySet = new BrowserWebDriverContainer(
+                "selenium/standalone-chrome:4.13.0"
+            )
                 .withEnv(NO_PROXY_KEY, NO_PROXY_VALUE)
         ) {
             chromeWithNoProxySet.start();
@@ -38,8 +36,9 @@ void honorPresetNoProxyEnvironment() {
     @Test
     void provideDefaultNoProxyEnvironmentIfNotSet() {
         try (
-            BrowserWebDriverContainer chromeWithoutNoProxySet = new BrowserWebDriverContainer()
-                .withCapabilities(new ChromeOptions())
+            BrowserWebDriverContainer chromeWithoutNoProxySet = new BrowserWebDriverContainer(
+                "selenium/standalone-chrome:4.13.0"
+            )
         ) {
             chromeWithoutNoProxySet.start();
 
@@ -52,8 +51,9 @@ void provideDefaultNoProxyEnvironmentIfNotSet() {
     void createContainerWithShmVolume() {
         assumeThat(SystemUtils.IS_OS_WINDOWS).isTrue();
         try (
-            BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer()
-                .withCapabilities(new FirefoxOptions())
+            BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer(
+                "selenium/standalone-firefox:4.13.0"
+            )
         ) {
             webDriverContainer.start();
 
@@ -68,9 +68,10 @@ void createContainerWithShmVolume() {
     @Test
     void createContainerWithoutShmVolume() {
         try (
-            BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer<>()
+            BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer(
+                "selenium/standalone-firefox:4.13.0"
+            )
                 .withSharedMemorySize(512 * FileUtils.ONE_MB)
-                .withCapabilities(new FirefoxOptions())
         ) {
             webDriverContainer.start();
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java
similarity index 88%
rename from modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java
index 2c6fa241469..dbb39b86599 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/ChromeRecordingWebDriverContainerTest.java
@@ -1,18 +1,17 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import com.google.common.io.PatternFilenameFilter;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode;
 import org.testcontainers.containers.DefaultRecordingFileFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.VncRecordingContainer;
 import org.testcontainers.containers.VncRecordingContainer.VncRecordingFormat;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.lifecycle.TestDescription;
+import org.testcontainers.selenium.BrowserWebDriverContainer.VncRecordingMode;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
@@ -46,8 +45,7 @@ void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() throws I
             try (
                 // recordAll {
                 // To do this, simply add extra parameters to the rule constructor, so video will default to FLV format:
-                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-                    .withCapabilities(new ChromeOptions())
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
                     .withRecordingMode(VncRecordingMode.RECORD_ALL, target)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
@@ -58,7 +56,7 @@ void recordingTestThatShouldBeRecordedAndRetainedInFlvFormatAsDefault() throws I
             }
         }
 
-        private File[] runSimpleExploreInContainer(BrowserWebDriverContainer<?> container, String fileNamePattern)
+        private File[] runSimpleExploreInContainer(BrowserWebDriverContainer container, String fileNamePattern)
             throws InterruptedException {
             container.start();
 
@@ -88,8 +86,7 @@ void recordingTestShouldHaveFlvExtension() throws InterruptedException {
             try (
                 // recordFlv {
                 // Set (explicitly) FLV format for recorded video:
-                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-                    .withCapabilities(new ChromeOptions())
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
                     .withRecordingMode(VncRecordingMode.RECORD_ALL, target, VncRecordingFormat.FLV)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
@@ -106,8 +103,7 @@ void recordingTestShouldHaveMp4Extension() throws InterruptedException {
             try (
                 // recordMp4 {
                 // Set MP4 format for recorded video:
-                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-                    .withCapabilities(new ChromeOptions())
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
                     .withRecordingMode(VncRecordingMode.RECORD_ALL, target, VncRecordingFormat.MP4)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
@@ -122,8 +118,7 @@ void recordingTestShouldHaveMp4Extension() throws InterruptedException {
         void recordingTestThatShouldHaveCorrectDuration() throws IOException, InterruptedException {
             MountableFile mountableFile;
             try (
-                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-                    .withCapabilities(new ChromeOptions())
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
                     .withRecordingMode(VncRecordingMode.RECORD_ALL, vncRecordingDirectory.toFile())
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
                     .withNetwork(NETWORK)
@@ -168,9 +163,8 @@ class ChromeThatRecordsFailingTests {
         void recordingTestThatShouldBeRecordedButNotPersisted() {
             try (
                 // withRecordingFileFactory {
-                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
                     // }
-                    .withCapabilities(new ChromeOptions())
                     // withRecordingFileFactory {
                     .withRecordingFileFactory(new CustomRecordingFileFactory())
                     // }
@@ -188,8 +182,7 @@ void recordingTestThatShouldBeRecordedAndRetained() throws InterruptedException
             try (
                 // recordFailing {
                 // or if you only want videos for test failures:
-                BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-                    .withCapabilities(new ChromeOptions())
+                BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
                     .withRecordingMode(VncRecordingMode.RECORD_FAILING, target)
                     // }
                     .withRecordingFileFactory(new DefaultRecordingFileFactory())
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/ChromeWebDriverContainerTest.java
similarity index 69%
rename from modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/ChromeWebDriverContainerTest.java
index 33809568aa6..85f0378f84a 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/ChromeWebDriverContainerTest.java
@@ -1,15 +1,13 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
 class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
-    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-        .withCapabilities(new ChromeOptions())
+    public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
         // }
         .withNetwork(NETWORK);
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/ContainerWithoutCapabilitiesTest.java
similarity index 74%
rename from modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/ContainerWithoutCapabilitiesTest.java
index 2ffc407a9e4..c706a0ce0ef 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/ContainerWithoutCapabilitiesTest.java
@@ -1,15 +1,15 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.junit.jupiter.api.AutoClose;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
 class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest {
 
     @AutoClose
-    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>().withNetwork(NETWORK);
+    public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
+        .withNetwork(NETWORK);
 
     @BeforeEach
     public void setUp() {
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/CustomWaitTimeoutWebDriverContainerTest.java
similarity index 66%
rename from modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/CustomWaitTimeoutWebDriverContainerTest.java
index 757be9a3a3d..61d14bab65f 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/CustomWaitTimeoutWebDriverContainerTest.java
@@ -1,16 +1,16 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 
 class CustomWaitTimeoutWebDriverContainerTest extends BaseWebDriverContainerTest {
 
-    public BrowserWebDriverContainer<?> chromeWithCustomTimeout = new BrowserWebDriverContainer<>()
-        .withCapabilities(new ChromeOptions())
+    public BrowserWebDriverContainer chromeWithCustomTimeout = new BrowserWebDriverContainer(
+        "selenium/standalone-chrome:4.13.0"
+    )
         .withStartupTimeout(Duration.of(30, ChronoUnit.SECONDS))
         .withNetwork(NETWORK);
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/EdgeWebDriverContainerTest.java
similarity index 69%
rename from modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/EdgeWebDriverContainerTest.java
index 40904cff369..d99df91f8e1 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/EdgeWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/EdgeWebDriverContainerTest.java
@@ -1,15 +1,13 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.edge.EdgeOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
 class EdgeWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
-    public BrowserWebDriverContainer<?> edge = new BrowserWebDriverContainer<>()
-        .withCapabilities(new EdgeOptions())
+    public BrowserWebDriverContainer edge = new BrowserWebDriverContainer("selenium/standalone-edge:4.13.0")
         // }
         .withNetwork(NETWORK);
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/FirefoxWebDriverContainerTest.java
similarity index 70%
rename from modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/FirefoxWebDriverContainerTest.java
index e5003f6ae12..50545168260 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/FirefoxWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/FirefoxWebDriverContainerTest.java
@@ -1,15 +1,13 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.firefox.FirefoxOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
 class FirefoxWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     // junitRule {
-    public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>()
-        .withCapabilities(new FirefoxOptions())
+    public BrowserWebDriverContainer firefox = new BrowserWebDriverContainer("selenium/standalone-firefox:4.13.0")
         // }
         .withNetwork(NETWORK);
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/LocalServerWebDriverContainerTest.java
similarity index 87%
rename from modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/LocalServerWebDriverContainerTest.java
index 0c93fde97dc..e5819b11786 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/LocalServerWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/LocalServerWebDriverContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -9,7 +9,6 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.Testcontainers;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -19,9 +18,8 @@
  */
 class LocalServerWebDriverContainerTest {
 
-    public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
-        .withAccessToHost(true)
-        .withCapabilities(new ChromeOptions());
+    public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer("selenium/standalone-chrome:4.13.0")
+        .withAccessToHost(true);
 
     private int localPort;
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/selenium/SpecificImageNameWebDriverContainerTest.java
similarity index 63%
rename from modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
rename to modules/selenium/src/test/java/org/testcontainers/selenium/SpecificImageNameWebDriverContainerTest.java
index f8e6c739b82..c01dc5ae97f 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/selenium/SpecificImageNameWebDriverContainerTest.java
@@ -1,17 +1,14 @@
-package org.testcontainers.junit;
+package org.testcontainers.selenium;
 
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.firefox.FirefoxOptions;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.utility.DockerImageName;
 
 class SpecificImageNameWebDriverContainerTest extends BaseWebDriverContainerTest {
 
     private static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox:4.10.0");
 
-    public BrowserWebDriverContainer<?> firefox = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
-        .withCapabilities(new FirefoxOptions())
-        .withNetwork(NETWORK);
+    public BrowserWebDriverContainer firefox = new BrowserWebDriverContainer(FIREFOX_IMAGE).withNetwork(NETWORK);
 
     @Test
     void simpleExploreTest() {

From 96a3ee749c843c22ce08cf22e99083ce4ede5925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 19:19:07 -0600
Subject: [PATCH 4667/4969] Add Neo4J container implementation under
 org.testcontainers.neo4j (#11097)

---
 docs/modules/databases/neo4j.md               |  18 +-
 .../containers/Neo4jContainer.java            |   3 +
 .../testcontainers/neo4j/Neo4jContainer.java  | 358 ++++++++++++++++++
 .../Neo4jContainerTest.java                   |   4 +-
 4 files changed, 372 insertions(+), 11 deletions(-)
 create mode 100644 modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
 rename modules/neo4j/src/test/java/org/testcontainers/{containers => neo4j}/Neo4jContainerTest.java (98%)

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index 18f7a957ea2..a8570fe7270 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -29,7 +29,7 @@ You are not limited to Unit tests, and you can use an instance of the Neo4j Test
 A custom password can be provided:
 
 <!--codeinclude-->
-[Custom password](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:withAdminPassword
+[Custom password](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:withAdminPassword
 <!--/codeinclude-->
 
 ### Disable authentication
@@ -37,7 +37,7 @@ A custom password can be provided:
 Authentication can be disabled:
 
 <!--codeinclude-->
-[Disable authentication](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:withoutAuthentication
+[Disable authentication](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:withoutAuthentication
 <!--/codeinclude-->
 
 ### Random password
@@ -45,7 +45,7 @@ Authentication can be disabled:
 A random (`UUID`-random based) password can be set:
 
 <!--codeinclude-->
-[Random password](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:withRandomPassword
+[Random password](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:withRandomPassword
 <!--/codeinclude-->
 
 ### Neo4j-Configuration
@@ -54,7 +54,7 @@ Neo4j's Docker image needs Neo4j configuration options in a dedicated format.
 The container takes care of that, and you can configure the database with standard options like the following:
 
 <!--codeinclude-->
-[Neo4j configuration](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:neo4jConfiguration
+[Neo4j configuration](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:neo4jConfiguration
 <!--/codeinclude-->
 
 ### Add custom plugins
@@ -62,13 +62,13 @@ The container takes care of that, and you can configure the database with standa
 Custom plugins, like APOC, can be copied over to the container from any classpath or host resource like this:
 
 <!--codeinclude-->
-[Plugin jar](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:registerPluginsJar
+[Plugin jar](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:registerPluginsJar
 <!--/codeinclude-->
 
 Whole directories work as well:
 
 <!--codeinclude-->
-[Plugin folder](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:registerPluginsPath
+[Plugin folder](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:registerPluginsPath
 <!--/codeinclude-->
 
 ### Add Neo4j Docker Labs plugins
@@ -81,7 +81,7 @@ or [Neo4j 5 plugin list](https://neo4j.com/docs/operations-manual/5/configuratio
     Please the method `withPlugins(String... plugins)`.
 
 <!--codeinclude-->
-[Configure Neo4j Labs Plugins](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:configureLabsPlugins
+[Configure Neo4j Labs Plugins](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:configureLabsPlugins
 <!--/codeinclude-->
 
 
@@ -90,7 +90,7 @@ or [Neo4j 5 plugin list](https://neo4j.com/docs/operations-manual/5/configuratio
 If you have an existing database (`graph.db`) you want to work with, copy it over to the container like this:
 
 <!--codeinclude-->
-[Copy database](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:copyDatabase
+[Copy database](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:copyDatabase
 <!--/codeinclude-->
 
 !!! note
@@ -101,7 +101,7 @@ If you have an existing database (`graph.db`) you want to work with, copy it ove
 If you need the Neo4j enterprise license, you can declare your Neo4j container like this:
 
 <!--codeinclude-->
-[Enterprise edition](../../../modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java) inside_block:enterpriseEdition
+[Enterprise edition](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:enterpriseEdition
 <!--/codeinclude-->
 
 This creates a Testcontainers based on the Docker image build with the Enterprise version of Neo4j 4.4. 
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index bd3499567d4..64c4df9f350 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -30,7 +30,10 @@
  *     <li>HTTP: 7474</li>
  *     <li>HTTPS: 7473</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.neo4j.Neo4jContainer} instead.
  */
+@Deprecated
 public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
 
     /**
diff --git a/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
new file mode 100644
index 00000000000..23a94c98c8f
--- /dev/null
+++ b/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
@@ -0,0 +1,358 @@
+package org.testcontainers.neo4j;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.LicenseAcceptance;
+import org.testcontainers.utility.MountableFile;
+
+import java.net.HttpURLConnection;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Testcontainers implementation for Neo4j.
+ * <p>
+ * Supported image: {@code neo4j}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Bolt: 7687</li>
+ *     <li>HTTP: 7474</li>
+ *     <li>HTTPS: 7473</li>
+ * </ul>
+ */
+public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
+
+    /**
+     * The image defaults to the official Neo4j image: <a href="https://hub.docker.com/_/neo4j/">Neo4j</a>.
+     */
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("neo4j");
+
+    /**
+     * The default tag (version) to use.
+     */
+    private static final String DEFAULT_TAG = "4.4";
+
+    private static final String ENTERPRISE_TAG = DEFAULT_TAG + "-enterprise";
+
+    /**
+     * Default port for the binary Bolt protocol.
+     */
+    private static final int DEFAULT_BOLT_PORT = 7687;
+
+    /**
+     * The port of the transactional HTTPS endpoint: <a href="https://neo4j.com/docs/rest-docs/current/">Neo4j REST API</a>.
+     */
+    private static final int DEFAULT_HTTPS_PORT = 7473;
+
+    /**
+     * The port of the transactional HTTP endpoint: <a href="https://neo4j.com/docs/rest-docs/current/">Neo4j REST API</a>.
+     */
+    private static final int DEFAULT_HTTP_PORT = 7474;
+
+    /**
+     * The official image requires a change of password by default from "neo4j" to something else. This defaults to "password".
+     */
+    private static final String DEFAULT_ADMIN_PASSWORD = "password";
+
+    private static final String AUTH_FORMAT = "neo4j/%s";
+
+    private final boolean standardImage;
+
+    private String adminPassword = DEFAULT_ADMIN_PASSWORD;
+
+    private final Set<String> labsPlugins = new HashSet<>();
+
+    /**
+     * Default wait strategies
+     */
+    public static final WaitStrategy WAIT_FOR_BOLT = new LogMessageWaitStrategy()
+        .withRegEx(String.format(".*Bolt enabled on .*:%d\\.\n", DEFAULT_BOLT_PORT));
+
+    private static final WaitStrategy WAIT_FOR_HTTP = new HttpWaitStrategy()
+        .forPort(DEFAULT_HTTP_PORT)
+        .forStatusCodeMatching(response -> response == HttpURLConnection.HTTP_OK);
+
+    /**
+     * Creates a Neo4jContainer using a specific docker image.
+     *
+     * @param dockerImageName The docker image to use.
+     */
+    public Neo4jContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * Creates a Neo4jContainer using a specific docker image.
+     *
+     * @param dockerImageName The docker image to use.
+     */
+    public Neo4jContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        this.standardImage = dockerImageName.getUnversionedPart().equals(DEFAULT_IMAGE_NAME.getUnversionedPart());
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        this.waitStrategy =
+            new WaitAllStrategy()
+                .withStrategy(WAIT_FOR_BOLT)
+                .withStrategy(WAIT_FOR_HTTP)
+                .withStartupTimeout(Duration.ofMinutes(2));
+
+        addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return Stream
+            .of(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT)
+            .map(this::getMappedPort)
+            .collect(Collectors.toSet());
+    }
+
+    @Override
+    protected void configure() {
+        configureAuth();
+        configureLabsPlugins();
+        configureWaitStrategy();
+    }
+
+    /**
+     * Configured via {@link Neo4jContainer#withAdminPassword(String)} or {@link Neo4jContainer#withoutAuthentication()}
+     * It is only possible to set the correct auth in the configuration call.
+     * Also, the custom methods overrule the set env parameter.
+     */
+    private void configureAuth() {
+        String neo4jAuthEnvKey = "NEO4J_AUTH";
+        if (!getEnvMap().containsKey(neo4jAuthEnvKey) || !DEFAULT_ADMIN_PASSWORD.equals(this.adminPassword)) {
+            boolean emptyAdminPassword = this.adminPassword == null || this.adminPassword.isEmpty();
+            String neo4jAuth = emptyAdminPassword ? "none" : String.format(AUTH_FORMAT, this.adminPassword);
+            addEnv(neo4jAuthEnvKey, neo4jAuth);
+        }
+    }
+
+    /**
+     * Configured via {@link Neo4jContainer#withLabsPlugins}.
+     * Configuration can only happen in the configuration call because there is no default.
+     */
+    private void configureLabsPlugins() {
+        String neo4jLabsPluginsEnvKey = "NEO4JLABS_PLUGINS";
+        if (!getEnv().contains(neo4jLabsPluginsEnvKey) && !this.labsPlugins.isEmpty()) {
+            String enabledPlugins =
+                this.labsPlugins.stream().map(pluginName -> "\"" + pluginName + "\"").collect(Collectors.joining(","));
+
+            addEnv(neo4jLabsPluginsEnvKey, "[" + enabledPlugins + "]");
+        }
+    }
+
+    /**
+     * Update the default Neo4jContainer wait strategy based on the exposed ports.
+     * Still possible to override the startup timeout before starting the container via {@link WaitStrategy#withStartupTimeout(Duration)}.
+     */
+    private void configureWaitStrategy() {
+        List<Integer> exposedPorts = getExposedPorts();
+        boolean boltExposed = exposedPorts.contains(DEFAULT_BOLT_PORT);
+        boolean httpExposed = exposedPorts.contains(DEFAULT_HTTP_PORT);
+        boolean onlyBoltExposed = boltExposed && !httpExposed;
+        boolean onlyHttpExposed = !boltExposed && httpExposed;
+
+        if (onlyBoltExposed) {
+            this.waitStrategy =
+                new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2));
+        } else if (onlyHttpExposed) {
+            this.waitStrategy =
+                new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2));
+        }
+    }
+
+    /**
+     * @return Bolt URL for use with Neo4j's Java-Driver.
+     */
+    public String getBoltUrl() {
+        return String.format("bolt://" + getHost() + ":" + getMappedPort(DEFAULT_BOLT_PORT));
+    }
+
+    /**
+     * @return URL of the transactional HTTP endpoint.
+     */
+    public String getHttpUrl() {
+        return String.format("http://" + getHost() + ":" + getMappedPort(DEFAULT_HTTP_PORT));
+    }
+
+    /**
+     * @return URL of the transactional HTTPS endpoint.
+     */
+    public String getHttpsUrl() {
+        return String.format("https://" + getHost() + ":" + getMappedPort(DEFAULT_HTTPS_PORT));
+    }
+
+    /**
+     * Configures the container to use the enterprise edition of the default docker image.
+     * <br><br>
+     * Please have a look at the <a href="https://neo4j.com/licensing/">Neo4j Licensing page</a>. While the Neo4j
+     * Community Edition can be used for free in your projects under the GPL v3 license, Neo4j Enterprise edition
+     * needs either a commercial, education or evaluation license.
+     *
+     * @return This container.
+     */
+    public Neo4jContainer withEnterpriseEdition() {
+        if (!standardImage) {
+            throw new IllegalStateException(
+                String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName())
+            );
+        }
+
+        setDockerImageName(DEFAULT_IMAGE_NAME.withTag(ENTERPRISE_TAG).asCanonicalNameString());
+        LicenseAcceptance.assertLicenseAccepted(getDockerImageName());
+
+        addEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes");
+
+        return self();
+    }
+
+    /**
+     * Sets the admin password for the default account (which is <pre>neo4j</pre>). A null value or an empty string
+     * disables authentication.
+     *
+     * @param adminPassword The admin password for the default database account.
+     * @return This container.
+     */
+    public Neo4jContainer withAdminPassword(final String adminPassword) {
+        if (adminPassword != null && adminPassword.length() < 8) {
+            logger().warn("Your provided admin password is too short and will not work with Neo4j 5.3+.");
+        }
+        this.adminPassword = adminPassword;
+        return self();
+    }
+
+    /**
+     * Disables authentication.
+     *
+     * @return This container.
+     */
+    public Neo4jContainer withoutAuthentication() {
+        return withAdminPassword(null);
+    }
+
+    /**
+     * Copies an existing {@code graph.db} folder into the container. This can either be a classpath resource or a
+     * host resource. Please have a look at the factory methods in {@link MountableFile}.
+     * <br>
+     * If you want to map your database into the container instead of copying them, please use {@code #withClasspathResourceMapping},
+     * but this will only work when your test does not run in a container itself.
+     * <br>
+     * Note: This method only works with Neo4j 3.5.
+     * <br>
+     * Mapping would work like this:
+     * <pre>
+     *      &#64;Container
+     *      private static final Neo4jContainer databaseServer = new Neo4jContainer&lt;&gt;()
+     *          .withClasspathResourceMapping("/test-graph.db", "/data/databases/graph.db", BindMode.READ_WRITE);
+     * </pre>
+     *
+     * @param graphDb The graph.db folder to copy into the container
+     * @throws IllegalArgumentException If the database version is not 3.5.
+     * @return This container.
+     */
+    public Neo4jContainer withDatabase(MountableFile graphDb) {
+        if (!isNeo4jDatabaseVersionSupportingDbCopy()) {
+            throw new IllegalArgumentException(
+                "Copying database folder is not supported for Neo4j instances with version 4.0 or higher."
+            );
+        }
+        return withCopyFileToContainer(graphDb, "/data/databases/graph.db");
+    }
+
+    /**
+     * Adds plugins to the given directory to the container. If {@code plugins} denotes a directory, than all of that
+     * directory is mapped to Neo4j's plugins. Otherwise, single resources are copied over.
+     * <br>
+     * If you want to map your plugins into the container instead of copying them, please use {@code #withClasspathResourceMapping},
+     * but this will only work when your test does not run in a container itself.
+     *
+     * @param plugins
+     * @return This container.
+     */
+    public Neo4jContainer withPlugins(MountableFile plugins) {
+        return withCopyFileToContainer(plugins, "/var/lib/neo4j/plugins/");
+    }
+
+    /**
+     * Adds Neo4j configuration properties to the container. The properties can be added as in the official Neo4j
+     * configuration, the method automatically translate them into the format required by the Neo4j container.
+     *
+     * @param key   The key to configure, i.e. {@code dbms.security.procedures.unrestricted}
+     * @param value The value to set
+     * @return This container.
+     */
+    public Neo4jContainer withNeo4jConfig(String key, String value) {
+        addEnv(formatConfigurationKey(key), value);
+        return self();
+    }
+
+    /**
+     * @return The admin password for the <code>neo4j</code> account or literal <code>null</code> if auth is disabled.
+     */
+    public String getAdminPassword() {
+        return adminPassword;
+    }
+
+    /**
+     * Registers one or more Neo4j plugins for server startup.
+     * The plugins are listed here
+     * <ul>
+     *     <li><a href="https://neo4j.com/docs/operations-manual/5/configuration/plugins/">Neo4j 5</a></li>
+     *     <li><a href="https://neo4j.com/docs/operations-manual/4.4/docker/operations/#docker-neo4jlabs-plugins">Neo4j 4.4</a></li>
+     * </ul>
+     *
+     * @param plugins The Neo4j plugins that should get started with the server.
+     * @return This container.
+     */
+    public Neo4jContainer withPlugins(String... plugins) {
+        this.labsPlugins.addAll(Arrays.asList(plugins));
+        return self();
+    }
+
+    private static String formatConfigurationKey(String plainConfigKey) {
+        final String prefix = "NEO4J_";
+
+        return String.format("%s%s", prefix, plainConfigKey.replaceAll("_", "__").replaceAll("\\.", "_"));
+    }
+
+    private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
+        String usedImageVersion = DockerImageName.parse(getDockerImageName()).getVersionPart();
+        ComparableVersion usedComparableVersion = new ComparableVersion(usedImageVersion);
+
+        boolean versionSupportingDbCopy =
+            usedComparableVersion.isLessThan("4.0") && usedComparableVersion.isGreaterThanOrEqualTo("2");
+
+        if (versionSupportingDbCopy) {
+            return true;
+        }
+        if (!usedComparableVersion.isSemanticVersion()) {
+            logger()
+                .warn(
+                    "Version {} is not a semantic version. The function \"withDatabase\" will fail.",
+                    usedImageVersion
+                );
+            logger().warn("Copying databases is only supported for Neo4j versions 3.5.x");
+        }
+
+        return false;
+    }
+
+    public Neo4jContainer withRandomPassword() {
+        return withAdminPassword(UUID.randomUUID().toString());
+    }
+}
diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
similarity index 98%
rename from modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
rename to modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
index 997e90c4788..82e8bc16e08 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.neo4j;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -263,7 +263,7 @@ void shouldRespectCustomWaitStrategy() {
 
         neo4jContainer.configure();
 
-        assertThat(neo4jContainer.getWaitStrategy()).isInstanceOf(CustomDummyWaitStrategy.class);
+        assertThat(neo4jContainer).extracting("waitStrategy").isInstanceOf(CustomDummyWaitStrategy.class);
     }
 
     @Test

From 9cbe1381ffe0d35c72f3741d1b0520383a7b80ed Mon Sep 17 00:00:00 2001
From: Fokion Sotiropoulos <fokion.s@gmail.com>
Date: Fri, 10 Oct 2025 06:26:55 +0100
Subject: [PATCH 4668/4969] Add support for specifying Docker image in
 DockerComposeContainer and ComposeContainer (#9871)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9222

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../containers/ComposeContainer.java          | 101 ++++++++++++++----
 .../containers/DockerComposeContainer.java    |  92 +++++++++++++---
 .../containers/ComposeContainerTest.java      |  49 +++++++++
 .../ComposeContainerWithServicesTest.java     |  41 +++++--
 .../containers/ComposeOverridesTest.java      |  71 ++++++------
 .../containers/ComposeProfilesOptionTest.java |  22 ++--
 ...DockerComposeContainerCustomImageTest.java |  50 +++++++++
 ...ockerComposeContainerWithServicesTest.java |  51 +++++++--
 .../DockerComposeOverridesTest.java           |  72 +++++++------
 .../DockerComposeProfilesOptionTest.java      |  26 ++---
 .../testcontainers/junit/BaseComposeTest.java |   2 +-
 .../junit/BaseDockerComposeTest.java          |   4 +-
 .../junit/ComposeContainerOverrideTest.java   |  11 +-
 .../junit/ComposeContainerPortViaEnvTest.java |   2 +
 .../junit/ComposeContainerScalingTest.java    |   2 +
 .../junit/ComposeContainerTest.java           |   6 +-
 .../ComposeContainerVolumeRemovalTest.java    |   3 +-
 .../junit/ComposeContainerWithBuildTest.java  |   3 +-
 .../ComposeContainerWithCopyFilesTest.java    |   5 +
 .../ComposeContainerWithOptionsTest.java      |  17 +--
 .../ComposeContainerWithWaitStrategies.java   |  11 +-
 .../junit/ComposeErrorHandlingTest.java       |   6 +-
 .../junit/ComposePassthroughTest.java         |   2 +
 .../junit/ComposeWaitStrategyTest.java        |   7 +-
 .../junit/ComposeWithIdentifierTest.java      |   2 +
 .../junit/ComposeWithNetworkTest.java         |   2 +
 .../DockerComposeContainerPortViaEnvTest.java |   4 +
 .../DockerComposeContainerScalingTest.java    |   2 +
 .../junit/DockerComposeContainerTest.java     |   5 +
 ...ckerComposeContainerVolumeRemovalTest.java |   6 +-
 .../DockerComposeContainerWithBuildTest.java  |   6 +-
 ...ckerComposeContainerWithCopyFilesTest.java |   4 +
 ...DockerComposeContainerWithOptionsTest.java |  19 ++--
 .../junit/DockerComposeErrorHandlingTest.java |   2 +
 .../junit/DockerComposeLocalImageTest.java    |   2 +
 .../junit/DockerComposeLogConsumerTest.java   |   2 +
 .../junit/DockerComposePassthroughTest.java   |   2 +
 .../junit/DockerComposeServiceTest.java       |   4 +
 .../junit/DockerComposeV2FormatTest.java      |   4 +
 ...ckerComposeV2FormatWithIdentifierTest.java |   4 +
 .../junit/DockerComposeV2WithNetworkTest.java |   4 +
 .../junit/DockerComposeWaitStrategyTest.java  |   7 +-
 .../utility/AuthenticatedImagePullTest.java   |   7 +-
 .../jupiter/DockerComposeContainerTests.java  |   2 +
 .../spock/ComposeContainerIT.groovy           |   2 +
 .../spock/SharedComposeContainerIT.groovy     |   2 +
 46 files changed, 577 insertions(+), 173 deletions(-)
 create mode 100644 core/src/test/java/org/testcontainers/containers/ComposeContainerTest.java
 create mode 100644 core/src/test/java/org/testcontainers/containers/DockerComposeContainerCustomImageTest.java

diff --git a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
index e8061363a18..539ca957764 100644
--- a/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/ComposeContainer.java
@@ -16,6 +16,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -59,7 +60,7 @@ public class ComposeContainer implements Startable {
 
     public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker:24.0.2");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker");
 
     private final ComposeDelegate composeDelegate;
 
@@ -67,28 +68,92 @@ public class ComposeContainer implements Startable {
 
     private List<String> filesInDirectory = new ArrayList<>();
 
+    /**
+     * Creates a new ComposeContainer using the specified Docker image and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param composeFiles One or more Docker Compose configuration files
+     */
+    public ComposeContainer(DockerImageName image, File... composeFiles) {
+        this(image, Arrays.asList(composeFiles));
+    }
+
+    /**
+     * Creates a new ComposeContainer using the specified Docker image and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param composeFiles A list of Docker Compose configuration files
+     */
+    public ComposeContainer(DockerImageName image, List<File> composeFiles) {
+        this(image, Base58.randomString(6).toLowerCase(), composeFiles);
+    }
+
+    /**
+     * Creates a new ComposeContainer with the specified Docker image, identifier, and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param identifier   A unique identifier for this compose environment
+     * @param composeFiles One or more Docker Compose configuration files
+     */
+    public ComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
+        this(image, identifier, Arrays.asList(composeFiles));
+    }
+
+    /**
+     * Creates a new ComposeContainer with the specified Docker image, identifier, and a single compose file.
+     *
+     * @param image       The Docker image to use for the container
+     * @param identifier  A unique identifier for this compose environment
+     * @param composeFile A Docker Compose configuration file
+     */
+    public ComposeContainer(DockerImageName image, String identifier, File composeFile) {
+        this(image, identifier, Collections.singletonList(composeFile));
+    }
+
+    /**
+     * Creates a new ComposeContainer with the specified Docker image, identifier, and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param identifier   A unique identifier for this compose environment
+     * @param composeFiles A list of Docker Compose configuration files
+     */
+    public ComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
+        image.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        this.composeDelegate =
+            new ComposeDelegate(ComposeDelegate.ComposeVersion.V2, composeFiles, identifier, COMPOSE_EXECUTABLE, image);
+        this.project = this.composeDelegate.getProject();
+    }
+
+    /**
+     * Use the new constructor {@link #ComposeContainer(DockerImageName image, File... composeFiles)}
+     */
     public ComposeContainer(File... composeFiles) {
-        this(Arrays.asList(composeFiles));
+        this(DEFAULT_IMAGE_NAME, Arrays.asList(composeFiles));
+        this.localCompose = true;
     }
 
+    /**
+     * Use the new constructor {@link #ComposeContainer(DockerImageName image, List composeFiles)}
+     */
     public ComposeContainer(List<File> composeFiles) {
-        this(Base58.randomString(6).toLowerCase(), composeFiles);
+        this(DEFAULT_IMAGE_NAME, composeFiles);
+        this.localCompose = true;
     }
 
+    /**
+     * Use the new constructor {@link #ComposeContainer(DockerImageName image, String identifier, File... composeFile)}
+     */
     public ComposeContainer(String identifier, File... composeFiles) {
-        this(identifier, Arrays.asList(composeFiles));
+        this(DEFAULT_IMAGE_NAME, identifier, Arrays.asList(composeFiles));
+        this.localCompose = true;
     }
 
+    /**
+     * Use the new constructor {@link #ComposeContainer(DockerImageName image, String identifier, List composeFiles)}
+     */
     public ComposeContainer(String identifier, List<File> composeFiles) {
-        this.composeDelegate =
-            new ComposeDelegate(
-                ComposeDelegate.ComposeVersion.V2,
-                composeFiles,
-                identifier,
-                COMPOSE_EXECUTABLE,
-                DEFAULT_IMAGE_NAME
-            );
-        this.project = this.composeDelegate.getProject();
+        this(DEFAULT_IMAGE_NAME, identifier, composeFiles);
+        this.localCompose = true;
     }
 
     @Override
@@ -234,16 +299,6 @@ public ComposeContainer withEnv(Map<String, String> env) {
         return this;
     }
 
-    /**
-     * Use a local Docker Compose binary instead of a container.
-     *
-     * @return this instance, for chaining
-     */
-    public ComposeContainer withLocalCompose(boolean localCompose) {
-        this.localCompose = localCompose;
-        return this;
-    }
-
     /**
      * Whether to pull images first.
      *
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
index dd06b181b42..bfdaf169dd5 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -16,6 +16,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -58,31 +59,103 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> i
 
     public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker-compose.exe" : "docker-compose";
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.29.2");
-
     private final ComposeDelegate composeDelegate;
 
     private String project;
 
     private List<String> filesInDirectory = new ArrayList<>();
 
-    @Deprecated
+    /**
+     * Creates a new DockerComposeContainer using the specified Docker image and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param composeFiles One or more Docker Compose configuration files
+     */
+    public DockerComposeContainer(DockerImageName image, File... composeFiles) {
+        this(image, Arrays.asList(composeFiles));
+    }
+
+    /**
+     * Creates a new DockerComposeContainer using the specified Docker image and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param composeFiles A list of Docker Compose configuration files
+     */
+    public DockerComposeContainer(DockerImageName image, List<File> composeFiles) {
+        this(image, Base58.randomString(6).toLowerCase(), composeFiles);
+    }
+
+    /**
+     * Creates a new DockerComposeContainer with the specified Docker image, identifier, and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param identifier   A unique identifier for this compose environment
+     * @param composeFiles One or more Docker Compose configuration files
+     */
+    public DockerComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
+        this(image, identifier, Arrays.asList(composeFiles));
+    }
+
+    /**
+     * Creates a new DockerComposeContainer with the specified Docker image, identifier, and a single compose file.
+     *
+     * @param image        The Docker image to use for the container
+     * @param identifier   A unique identifier for this compose environment
+     * @param composeFile  A Docker Compose configuration file
+     */
+    public DockerComposeContainer(DockerImageName image, String identifier, File composeFile) {
+        this(image, identifier, Collections.singletonList(composeFile));
+    }
+
+    /**
+     * Creates a new DockerComposeContainer with the specified Docker image, identifier, and compose files.
+     *
+     * @param image        The Docker image to use for the container
+     * @param identifier   A unique identifier for this compose environment
+     * @param composeFiles A list of Docker Compose configuration files
+     */
+    public DockerComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
+        this.composeDelegate =
+            new ComposeDelegate(ComposeDelegate.ComposeVersion.V1, composeFiles, identifier, COMPOSE_EXECUTABLE, image);
+        this.project = this.composeDelegate.getProject();
+    }
+
+    /**
+     * Use the new constructor {@link #DockerComposeContainer(DockerImageName image, String identifier, File composeFile)}
+     */
     public DockerComposeContainer(File composeFile, String identifier) {
         this(identifier, composeFile);
+        this.localCompose = true;
     }
 
+    /**
+     * Use the new constructor {@link #DockerComposeContainer(DockerImageName image, List composeFiles)}
+     */
     public DockerComposeContainer(File... composeFiles) {
         this(Arrays.asList(composeFiles));
+        this.localCompose = true;
     }
 
+    /**
+     * Use the new constructor {@link #DockerComposeContainer(DockerImageName image, List composeFiles)}
+     */
+    @Deprecated
     public DockerComposeContainer(List<File> composeFiles) {
         this(Base58.randomString(6).toLowerCase(), composeFiles);
+        this.localCompose = true;
     }
 
+    /**
+     * Use the new constructor {@link #DockerComposeContainer(DockerImageName image, String identifier, File... composeFiles)}
+     */
     public DockerComposeContainer(String identifier, File... composeFiles) {
         this(identifier, Arrays.asList(composeFiles));
+        this.localCompose = true;
     }
 
+    /**
+     * Use the new constructor {@link #DockerComposeContainer(DockerImageName image, String identifier, List composeFiles)}
+     */
     public DockerComposeContainer(String identifier, List<File> composeFiles) {
         this.composeDelegate =
             new ComposeDelegate(
@@ -90,9 +163,10 @@ public DockerComposeContainer(String identifier, List<File> composeFiles) {
                 composeFiles,
                 identifier,
                 COMPOSE_EXECUTABLE,
-                DEFAULT_IMAGE_NAME
+                DockerImageName.parse("docker/compose:1.29.2")
             );
         this.project = this.composeDelegate.getProject();
+        this.localCompose = true;
     }
 
     @Override
@@ -234,16 +308,6 @@ public SELF withEnv(Map<String, String> env) {
         return self();
     }
 
-    /**
-     * Use a local Docker Compose binary instead of a container.
-     *
-     * @return this instance, for chaining
-     */
-    public SELF withLocalCompose(boolean localCompose) {
-        this.localCompose = localCompose;
-        return self();
-    }
-
     /**
      * Whether to pull images first.
      *
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeContainerTest.java b/core/src/test/java/org/testcontainers/containers/ComposeContainerTest.java
new file mode 100644
index 00000000000..cee985d36df
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/ComposeContainerTest.java
@@ -0,0 +1,49 @@
+package org.testcontainers.containers;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.File;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ComposeContainerTest {
+
+    public static final String DOCKER_IMAGE = "docker:25.0.2";
+
+    private static final String COMPOSE_FILE_PATH = "src/test/resources/v2-compose-test.yml";
+
+    @Test
+    void testWithCustomDockerImage() {
+        ComposeContainer composeContainer = new ComposeContainer(
+            DockerImageName.parse(DOCKER_IMAGE),
+            new File(COMPOSE_FILE_PATH)
+        );
+        composeContainer.start();
+        verifyContainerCreation(composeContainer);
+        composeContainer.stop();
+    }
+
+    @Test
+    void testWithCustomDockerImageAndIdentifier() {
+        ComposeContainer composeContainer = new ComposeContainer(
+            DockerImageName.parse(DOCKER_IMAGE),
+            "myidentifier",
+            new File(COMPOSE_FILE_PATH)
+        );
+        composeContainer.start();
+        verifyContainerCreation(composeContainer);
+        composeContainer.stop();
+    }
+
+    private void verifyContainerCreation(ComposeContainer composeContainer) {
+        Optional<ContainerState> redis = composeContainer.getContainerByServiceName("redis");
+        assertThat(redis)
+            .hasValueSatisfying(container -> {
+                assertThat(container.isRunning()).isTrue();
+                assertThat(container.getContainerInfo().getConfig().getLabels())
+                    .containsEntry("com.docker.compose.version", "2.24.5");
+            });
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
index 6d141ac08f1..8b3b3fa8fa5 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.time.Duration;
@@ -29,7 +30,10 @@ class ComposeContainerWithServicesTest {
 
     @Test
     void testDesiredSubsetOfServicesAreStarted() {
-        try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withServices("redis")) {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+                .withServices("redis")
+        ) {
             compose.start();
 
             verifyStartedContainers(compose, "redis-1");
@@ -38,7 +42,10 @@ void testDesiredSubsetOfServicesAreStarted() {
 
     @Test
     void testDesiredSubsetOfScaledServicesAreStarted() {
-        try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withScaledService("redis", 2)) {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+                .withScaledService("redis", 2)
+        ) {
             compose.start();
 
             verifyStartedContainers(compose, "redis-1", "redis-2");
@@ -48,7 +55,7 @@ void testDesiredSubsetOfScaledServicesAreStarted() {
     @Test
     void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
         try (
-            ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
                 .withServices("redis")
                 .withScaledService("redis", 2)
         ) {
@@ -61,7 +68,7 @@ void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
     @Test
     void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
         try (
-            ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
                 .withServices("other")
                 .withScaledService("redis", 2)
         ) {
@@ -73,7 +80,9 @@ void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
 
     @Test
     void testAllServicesAreStartedIfNotSpecified() {
-        try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)) {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+        ) {
             compose.start();
 
             verifyStartedContainers(compose, "redis-1", "other-1");
@@ -82,7 +91,12 @@ void testAllServicesAreStartedIfNotSpecified() {
 
     @Test
     void testScaleInComposeFileIsRespected() {
-        try (ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_INLINE_SCALE)) {
+        try (
+            ComposeContainer compose = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
+                COMPOSE_FILE_WITH_INLINE_SCALE
+            )
+        ) {
             compose.start();
 
             // the compose file includes `scale: 3` for the redis container
@@ -95,7 +109,10 @@ void testStartupTimeoutSetsTheHighestTimeout() {
         assertThat(
             catchThrowable(() -> {
                 try (
-                    ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE)
+                    ComposeContainer compose = new ComposeContainer(
+                        DockerImageName.parse("docker:24.0.2"),
+                        SIMPLE_COMPOSE_FILE
+                    )
                         .withServices("redis")
                         .withStartupTimeout(Duration.ofMillis(1))
                         .withExposedService(
@@ -115,7 +132,10 @@ void testStartupTimeoutSetsTheHighestTimeout() {
     @Test
     void testWaitingForHealthcheck() {
         try (
-            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
+            ComposeContainer compose = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
+                COMPOSE_FILE_WITH_HEALTHCHECK
+            )
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
         ) {
             compose.start();
@@ -127,7 +147,10 @@ void testWaitingForHealthcheck() {
     @Test
     void testWaitingForHealthcheckWithRestartDoesNotCrash() {
         try (
-            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
+            ComposeContainer compose = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
+                COMPOSE_FILE_WITH_HEALTHCHECK
+            )
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
         ) {
             compose.start();
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
index 1ed03ae9315..ed948df5bd3 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -47,47 +48,49 @@ public static Iterable<Object[]> data() {
     @ParameterizedTest(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
     @MethodSource("data")
     void test(boolean localMode, String expectedEnvVar, File... composeFiles) {
+        ComposeContainer compose;
         if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DOCKER_EXECUTABLE))
                 .as("docker executable exists")
                 .isTrue();
+            compose = new ComposeContainer(composeFiles).withExposedService(SERVICE_NAME, SERVICE_PORT);
+        } else {
+            compose =
+                new ComposeContainer(DockerImageName.parse("docker:25.0.2"), composeFiles)
+                    .withExposedService(SERVICE_NAME, SERVICE_PORT);
         }
-        try (
-            ComposeContainer compose = new ComposeContainer(composeFiles)
-                .withLocalCompose(localMode)
-                .withExposedService(SERVICE_NAME, SERVICE_PORT)
-        ) {
-            compose.start();
-
-            BufferedReader br = Unreliables.retryUntilSuccess(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
-
-                    Socket socket = new Socket(
-                        compose.getServiceHost(SERVICE_NAME, SERVICE_PORT),
-                        compose.getServicePort(SERVICE_NAME, SERVICE_PORT)
-                    );
-                    return new BufferedReader(new InputStreamReader(socket.getInputStream()));
-                }
-            );
-
-            Unreliables.retryUntilTrue(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    while (br.ready()) {
-                        String line = br.readLine();
-                        if (line.contains(expectedEnvVar)) {
-                            return true;
-                        }
+
+        compose.start();
+
+        BufferedReader br = Unreliables.retryUntilSuccess(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+
+                Socket socket = new Socket(
+                    compose.getServiceHost(SERVICE_NAME, SERVICE_PORT),
+                    compose.getServicePort(SERVICE_NAME, SERVICE_PORT)
+                );
+                return new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            }
+        );
+
+        Unreliables.retryUntilTrue(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                while (br.ready()) {
+                    String line = br.readLine();
+                    if (line.contains(expectedEnvVar)) {
+                        return true;
                     }
-                    Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-                    return false;
                 }
-            );
-        }
+                Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+                return false;
+            }
+        );
+        compose.stop();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
index 8a176fdcddb..3770d617ebb 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -20,21 +21,24 @@ public static Boolean[] local() {
     @ParameterizedTest
     @MethodSource("local")
     void testProfileOption(boolean localMode) {
+        ComposeContainer compose;
         if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(ComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker executable exists")
                 .isTrue();
-        }
-        try (
             // composeContainerWithLocalCompose {
-            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE)
-                .withLocalCompose(true)
-                // }
-                .withOptions("--profile=cache")
-        ) {
-            compose.start();
-            assertThat(compose.listChildContainers()).hasSize(1);
+            compose =
+                new ComposeContainer(COMPOSE_FILE)
+                    // }
+                    .withOptions("--profile=cache");
+        } else {
+            compose =
+                new ComposeContainer(DockerImageName.parse("docker:25.0.2"), COMPOSE_FILE)
+                    .withOptions("--profile=cache");
         }
+        compose.start();
+        assertThat(compose.listChildContainers()).hasSize(1);
+        compose.stop();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerCustomImageTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerCustomImageTest.java
new file mode 100644
index 00000000000..46ee86a8c23
--- /dev/null
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerCustomImageTest.java
@@ -0,0 +1,50 @@
+package org.testcontainers.containers;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.File;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DockerComposeContainerCustomImageTest {
+
+    public static final String DOCKER_IMAGE = "docker/compose:debian-1.29.2";
+
+    private static final String COMPOSE_FILE_PATH = "src/test/resources/scaled-compose-test.yml";
+
+    @Test
+    void testWithCustomDockerImage() {
+        DockerComposeContainer<?> composeContainer = new DockerComposeContainer<>(
+            DockerImageName.parse(DOCKER_IMAGE),
+            "testing",
+            new File(COMPOSE_FILE_PATH)
+        );
+        composeContainer.start();
+        verifyContainerCreation(composeContainer);
+        composeContainer.stop();
+    }
+
+    @Test
+    void testWithCustomDockerImageAndIdentifier() {
+        DockerComposeContainer<?> composeContainer = new DockerComposeContainer(
+            DockerImageName.parse(DOCKER_IMAGE),
+            "myidentifier",
+            new File(COMPOSE_FILE_PATH)
+        );
+        composeContainer.start();
+        verifyContainerCreation(composeContainer);
+        composeContainer.stop();
+    }
+
+    private void verifyContainerCreation(DockerComposeContainer<?> composeContainer) {
+        Optional<ContainerState> redis = composeContainer.getContainerByServiceName("redis");
+        assertThat(redis)
+            .hasValueSatisfying(container -> {
+                assertThat(container.isRunning()).isTrue();
+                assertThat(container.getContainerInfo().getConfig().getLabels())
+                    .containsEntry("com.docker.compose.version", "1.29.2");
+            });
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
index cc6c124fde0..52d8d003003 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.time.Duration;
@@ -30,7 +31,11 @@ class DockerComposeContainerWithServicesTest {
     @Test
     void testDesiredSubsetOfServicesAreStarted() {
         try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE).withServices("redis")
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                SIMPLE_COMPOSE_FILE
+            )
+                .withServices("redis")
         ) {
             compose.start();
 
@@ -41,7 +46,10 @@ void testDesiredSubsetOfServicesAreStarted() {
     @Test
     void testDesiredSubsetOfScaledServicesAreStarted() {
         try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                SIMPLE_COMPOSE_FILE
+            )
                 .withScaledService("redis", 2)
         ) {
             compose.start();
@@ -53,7 +61,10 @@ void testDesiredSubsetOfScaledServicesAreStarted() {
     @Test
     void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
         try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                SIMPLE_COMPOSE_FILE
+            )
                 .withServices("redis")
                 .withScaledService("redis", 2)
         ) {
@@ -66,7 +77,10 @@ void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
     @Test
     void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
         try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                SIMPLE_COMPOSE_FILE
+            )
                 .withServices("other")
                 .withScaledService("redis", 2)
         ) {
@@ -78,7 +92,12 @@ void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
 
     @Test
     void testAllServicesAreStartedIfNotSpecified() {
-        try (DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)) {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                SIMPLE_COMPOSE_FILE
+            )
+        ) {
             compose.start();
 
             verifyStartedContainers(compose, "redis_1", "other_1");
@@ -87,7 +106,12 @@ void testAllServicesAreStartedIfNotSpecified() {
 
     @Test
     void testScaleInComposeFileIsRespected() {
-        try (DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_INLINE_SCALE)) {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                COMPOSE_FILE_WITH_INLINE_SCALE
+            )
+        ) {
             compose.start();
 
             // the compose file includes `scale: 3` for the redis container
@@ -100,7 +124,10 @@ void testStartupTimeoutSetsTheHighestTimeout() {
         assertThat(
             catchThrowable(() -> {
                 try (
-                    DockerComposeContainer<?> compose = new DockerComposeContainer<>(SIMPLE_COMPOSE_FILE)
+                    DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                        DockerImageName.parse("docker/compose:debian-1.29.2"),
+                        SIMPLE_COMPOSE_FILE
+                    )
                         .withServices("redis")
                         .withStartupTimeout(Duration.ofMillis(1))
                         .withExposedService(
@@ -120,7 +147,10 @@ void testStartupTimeoutSetsTheHighestTimeout() {
     @Test
     void testWaitingForHealthcheck() {
         try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                COMPOSE_FILE_WITH_HEALTHCHECK
+            )
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
         ) {
             compose.start();
@@ -132,7 +162,10 @@ void testWaitingForHealthcheck() {
     @Test
     void testWaitingForHealthcheckWithRestartDoesNotCrash() {
         try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:debian-1.29.2"),
+                COMPOSE_FILE_WITH_HEALTHCHECK
+            )
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
         ) {
             compose.start();
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
index eb66fbabc38..e3bd499cc45 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -44,6 +45,7 @@ public static Iterable<Object[]> data() {
     @ParameterizedTest(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
     @MethodSource("data")
     void test(boolean localMode, String expectedEnvVar, File... composeFiles) {
+        DockerComposeContainer compose;
         if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
@@ -52,42 +54,44 @@ void test(boolean localMode, String expectedEnvVar, File... composeFiles) {
             Assumptions
                 .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
                 .doesNotStartWith("Docker Compose version v2");
+
+            compose = new DockerComposeContainer(composeFiles).withExposedService(SERVICE_NAME, SERVICE_PORT);
+        } else {
+            compose =
+                new DockerComposeContainer(DockerImageName.parse("docker/compose:debian-1.29.2"), composeFiles)
+                    .withExposedService(SERVICE_NAME, SERVICE_PORT);
         }
-        try (
-            DockerComposeContainer compose = new DockerComposeContainer(composeFiles)
-                .withLocalCompose(localMode)
-                .withExposedService(SERVICE_NAME, SERVICE_PORT)
-        ) {
-            compose.start();
-
-            BufferedReader br = Unreliables.retryUntilSuccess(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
-
-                    Socket socket = new Socket(
-                        compose.getServiceHost(SERVICE_NAME, SERVICE_PORT),
-                        compose.getServicePort(SERVICE_NAME, SERVICE_PORT)
-                    );
-                    return new BufferedReader(new InputStreamReader(socket.getInputStream()));
-                }
-            );
-
-            Unreliables.retryUntilTrue(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    while (br.ready()) {
-                        String line = br.readLine();
-                        if (line.contains(expectedEnvVar)) {
-                            return true;
-                        }
+
+        compose.start();
+
+        BufferedReader br = Unreliables.retryUntilSuccess(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+
+                Socket socket = new Socket(
+                    compose.getServiceHost(SERVICE_NAME, SERVICE_PORT),
+                    compose.getServicePort(SERVICE_NAME, SERVICE_PORT)
+                );
+                return new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            }
+        );
+
+        Unreliables.retryUntilTrue(
+            10,
+            TimeUnit.SECONDS,
+            () -> {
+                while (br.ready()) {
+                    String line = br.readLine();
+                    if (line.contains(expectedEnvVar)) {
+                        return true;
                     }
-                    Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-                    return false;
                 }
-            );
-        }
+                Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+                return false;
+            }
+        );
+        compose.stop();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
index 20a52566201..46f29b0a281 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -15,14 +16,13 @@ public static Boolean[] local() {
         return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
     }
 
-    public boolean localMode;
-
     public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("local")
-    void testProfileOption() {
-        if (this.localMode) {
+    void testProfileOption(boolean localMode) {
+        DockerComposeContainer<?> compose;
+        if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
@@ -30,14 +30,16 @@ void testProfileOption() {
             Assumptions
                 .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
                 .doesNotStartWith("Docker Compose version v2");
+
+            compose = new DockerComposeContainer<>(COMPOSE_FILE).withOptions("--profile=cache");
+        } else {
+            compose =
+                new DockerComposeContainer<>(DockerImageName.parse("docker/compose:debian-1.29.2"), COMPOSE_FILE)
+                    .withOptions("--profile=cache");
         }
-        try (
-            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE)
-                .withOptions("--profile=cache")
-                .withLocalCompose(this.localMode)
-        ) {
-            compose.start();
-            assertThat(compose.listChildContainers()).hasSize(1);
-        }
+
+        compose.start();
+        assertThat(compose.listChildContainers()).hasSize(1);
+        compose.stop();
     }
 }
diff --git a/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java b/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
index fc28f771749..334b69740b7 100644
--- a/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/BaseComposeTest.java
@@ -58,7 +58,7 @@ void secondTest() {
 
         assertThat(jedis.get("test")).as("Tests use fresh container instances").isEqualTo("3");
         // if these end up using the same container one of the test methods will fail.
-        // However, @Rule creates a separate DockerComposeContainer instance per test, so this just shouldn't happen
+        // However, @Rule creates a separate ComposeContainer instance per test, so this just shouldn't happen
     }
 
     @BeforeEach
diff --git a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
index 926fa301836..58459c2d807 100644
--- a/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
+++ b/core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.model.Network;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -16,6 +15,7 @@
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 /**
  * Created by rnorth on 21/05/2016.
@@ -30,7 +30,7 @@ public abstract class BaseDockerComposeTest {
 
     @BeforeAll
     public static void checkVersion() {
-        Assumptions.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+        assumeThat(TestEnvironment.dockerApiAtLeast("1.22")).isTrue();
     }
 
     @Test
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
index 8e5651903f6..028d883b320 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerState;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -17,7 +18,10 @@ class ComposeContainerOverrideTest {
 
     @Test
     void readEnvironment() {
-        try (ComposeContainer compose = new ComposeContainer(BASE).withExposedService("redis", 6379)) {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), BASE)
+                .withExposedService("redis", 6379)
+        ) {
             compose.start();
             InspectContainerResponse container = compose
                 .getContainerByServiceName("redis-1")
@@ -29,7 +33,10 @@ void readEnvironment() {
 
     @Test
     void resetEnvironment() {
-        try (ComposeContainer compose = new ComposeContainer(BASE, OVERRIDE).withExposedService("redis", 6379)) {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), BASE, OVERRIDE)
+                .withExposedService("redis", 6379)
+        ) {
             compose.start();
             InspectContainerResponse container = compose
                 .getContainerByServiceName("redis-1")
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
index dfe51acbebb..b45db1a4f8a 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -9,6 +10,7 @@ class ComposeContainerPortViaEnvTest extends BaseComposeTest {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
+        DockerImageName.parse("docker:24.0.2"),
         new File("src/test/resources/v2-compose-test-port-via-env.yml")
     )
         .withExposedService("redis-1", REDIS_PORT)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
index 7614b49e303..50c6ef062ef 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestEnvironment;
 import redis.clients.jedis.Jedis;
 
@@ -26,6 +27,7 @@ public static void checkVersion() {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
+        DockerImageName.parse("docker:24.0.2"),
         new File("src/test/resources/composev2/scaled-compose-test.yml")
     )
         .withScaledService("redis", 3)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
index 2d87cd3aa49..9e68c7513df 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerState;
-import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,6 +18,7 @@ class ComposeContainerTest extends BaseComposeTest {
 
     // composeContainerConstructor {
     public ComposeContainer environment = new ComposeContainer(
+        DockerImageName.parse("docker:24.0.2"),
         new File("src/test/resources/composev2/compose-test.yml")
     )
         .withExposedService("redis-1", REDIS_PORT)
@@ -86,7 +87,8 @@ void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
         filePathNotStartWithDotSlash.deleteOnExit();
         Files.write(filePathNotStartWithDotSlash.toPath(), validYaml.getBytes(StandardCharsets.UTF_8));
 
-        final DockerComposeContainer<?> dockerComposeContainer = new DockerComposeContainer<>(
+        final ComposeContainer dockerComposeContainer = new ComposeContainer(
+            DockerImageName.parse("docker:24.0.2"),
             filePathNotStartWithDotSlash
         );
         assertThat(dockerComposeContainer).as("Container created using docker compose file").isNotNull();
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
index 1898f5d580b..cebfc2a9706 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.util.LinkedHashSet;
@@ -28,7 +29,7 @@ void performTest(boolean removeVolumes, boolean shouldVolumesBePresentAfterRunni
 
         final AtomicReference<String> volumeName = new AtomicReference<>("");
         try (
-            ComposeContainer environment = new ComposeContainer(composeFile)
+            ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), composeFile)
                 .withExposedService("redis", 6379)
                 .withRemoveVolumes(removeVolumes)
                 .withRemoveImages(ComposeContainer.RemoveImages.ALL)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
index 589766f9184..03ced374f70 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
@@ -7,6 +7,7 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +38,7 @@ void performTest(
         final AtomicReference<String> builtImageName = new AtomicReference<>("");
         final AtomicReference<String> pulledImageName = new AtomicReference<>("");
         try (
-            ComposeContainer environment = new ComposeContainer(composeFile)
+            ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), composeFile)
                 .withExposedService("customredis", 6379)
                 .withBuild(true)
                 .withRemoveImages(removeMode)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
index 33dc092cc51..cc9c2dad594 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,6 +18,7 @@ class ComposeContainerWithCopyFilesTest {
     void testShouldCopyAllFilesByDefault() throws IOException {
         try (
             ComposeContainer environment = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose.yml")
             )
                 .withExposedService("app", 8080)
@@ -32,6 +34,7 @@ void testShouldCopyAllFilesByDefault() throws IOException {
     void testWithFileCopyInclusionUsingFilePath() throws IOException {
         try (
             ComposeContainer environment = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml")
             )
                 .withExposedService("app", 8080)
@@ -51,6 +54,7 @@ void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
         try (
             // composeContainerWithCopyFiles {
             ComposeContainer environment = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
             )
                 .withExposedService("app", 8080)
@@ -69,6 +73,7 @@ void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
     void testShouldNotBeAbleToStartIfNeededEnvFileIsNotCopied() {
         try (
             ComposeContainer environment = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
             )
                 .withExposedService("app", 8080)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
index e8bca173a54..800da177137 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithOptionsTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.util.Set;
@@ -21,7 +22,7 @@ class ComposeContainerWithOptionsTest {
 
     public static Stream<Arguments> params() {
         return Stream.of(
-            // Test the happy day case. THe compatibility option should be accepted by docker-compose.
+            // Test the happy day case. The compatibility option should be accepted by docker-compose.
             Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
@@ -55,19 +56,23 @@ public static Stream<Arguments> params() {
     @ParameterizedTest(name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]")
     @MethodSource("params")
     void performTest(File composeFile, boolean localMode, Set<String> options, boolean expectError) {
+        ComposeContainer environment;
         if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(ComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker executable exists")
                 .isTrue();
+            environment = new ComposeContainer(composeFile).withOptions(options.stream().toArray(String[]::new));
+        } else {
+            environment =
+                new ComposeContainer(DockerImageName.parse("docker:25.0.2"), composeFile)
+                    .withOptions(options.stream().toArray(String[]::new));
         }
-        try (
-            ComposeContainer environment = new ComposeContainer(composeFile)
-                .withOptions(options.stream().toArray(String[]::new))
-                .withLocalCompose(localMode)
-        ) {
+
+        try {
             environment.start();
             assertThat(expectError).isFalse();
+            environment.stop();
         } catch (Exception e) {
             assertThat(expectError).isTrue();
         }
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
index 82a1a5e57ad..07ce8e41ef1 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.time.Duration;
@@ -17,7 +18,10 @@ class ComposeContainerWithWaitStrategies {
     void testComposeContainerConstructor() {
         try (
             // composeContainerWithCombinedWaitStrategies {
-            ComposeContainer compose = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"))
+            ComposeContainer compose = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
+                new File("src/test/resources/composev2/compose-test.yml")
+            )
                 .withExposedService("redis-1", REDIS_PORT, Wait.forSuccessfulCommand("redis-cli ping"))
                 .withExposedService("db-1", 3306, Wait.forLogMessage(".*ready for connections.*\\n", 1))
             // }
@@ -31,7 +35,10 @@ void testComposeContainerConstructor() {
     void testComposeContainerWaitForPortWithTimeout() {
         try (
             // composeContainerWaitForPortWithTimeout {
-            ComposeContainer compose = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"))
+            ComposeContainer compose = new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
+                new File("src/test/resources/composev2/compose-test.yml")
+            )
                 .withExposedService(
                     "redis-1",
                     REDIS_PORT,
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
index a5e8e77c12f..acabcaf9e87 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -14,7 +15,10 @@ class ComposeErrorHandlingTest {
     void simpleTest() {
         assertThat(
             catchThrowable(() -> {
-                ComposeContainer environment = new ComposeContainer(new File("src/test/resources/invalid-compose.yml"))
+                ComposeContainer environment = new ComposeContainer(
+                    DockerImageName.parse("docker:24.0.2"),
+                    new File("src/test/resources/invalid-compose.yml")
+                )
                     .withExposedService("something", 123);
             })
         )
diff --git a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
index 97ea43d38c9..7bc47d79c9d 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
@@ -7,6 +7,7 @@
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestEnvironment;
 
 import java.io.File;
@@ -26,6 +27,7 @@ public static void checkVersion() {
 
     @AutoClose
     public ComposeContainer compose = new ComposeContainer(
+        DockerImageName.parse("docker:24.0.2"),
         new File("src/test/resources/v2-compose-test-passthrough.yml")
     )
         .withEnv("foo", "bar")
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
index 73553f70fdf..2bec1aec819 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
@@ -7,6 +7,7 @@
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.time.Duration;
@@ -23,7 +24,11 @@ class ComposeWaitStrategyTest {
 
     @BeforeEach
     public final void setUp() {
-        environment = new ComposeContainer(new File("src/test/resources/composev2/compose-test.yml"));
+        environment =
+            new ComposeContainer(
+                DockerImageName.parse("docker:24.0.2"),
+                new File("src/test/resources/composev2/compose-test.yml")
+            );
     }
 
     @AfterEach
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
index 71d80918d7c..c02b9874126 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -9,6 +10,7 @@ class ComposeWithIdentifierTest extends BaseComposeTest {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
+        DockerImageName.parse("docker:24.0.2"),
         "TEST",
         new File("src/test/resources/v2-compose-test.yml")
     )
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
index cfda1971600..1003c3d5404 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.AutoClose;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -9,6 +10,7 @@ class ComposeWithNetworkTest extends BaseComposeTest {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
+        DockerImageName.parse("docker:24.0.2"),
         new File("src/test/resources/v2-compose-test-with-network.yml")
     )
         .withExposedService("redis-1", REDIS_PORT);
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
index 0cf523836a5..46af463834c 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java
@@ -1,14 +1,18 @@
 package org.testcontainers.junit;
 
 import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
+@Disabled
 class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
 
     @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         new File("src/test/resources/v2-compose-test-port-via-env.yml")
     )
         .withExposedService("redis_1", REDIS_PORT)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
index 90256bb0f37..d5be511f44b 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestEnvironment;
 import redis.clients.jedis.Jedis;
 
@@ -29,6 +30,7 @@ public static void checkVersion() {
 
     @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         new File("src/test/resources/scaled-compose-test.yml")
     )
         .withScaledService("redis", 3)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
index 568eaae53cf..2bc855cacb2 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
@@ -1,9 +1,11 @@
 package org.testcontainers.junit;
 
 import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,10 +19,12 @@
 /**
  * Created by rnorth on 08/08/2015.
  */
+@Disabled
 class DockerComposeContainerTest extends BaseDockerComposeTest {
 
     @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         new File("src/test/resources/compose-test.yml")
     )
         .withExposedService("redis_1", REDIS_PORT)
@@ -96,6 +100,7 @@ void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
         Files.write(filePathNotStartWithDotSlash.toPath(), validYaml.getBytes(StandardCharsets.UTF_8));
 
         final DockerComposeContainer<?> dockerComposeContainer = new DockerComposeContainer<>(
+            DockerImageName.parse("docker/compose:debian-1.29.2"),
             filePathNotStartWithDotSlash
         );
         assertThat(dockerComposeContainer).as("Container could not be created using docker compose file").isNotNull();
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
index 557cc7e27db..2ec9a51e197 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.util.LinkedHashSet;
@@ -27,7 +28,10 @@ void performTest(boolean removeVolumes, boolean shouldVolumesBePresentAfterRunni
 
         final AtomicReference<String> volumeName = new AtomicReference<>("");
         try (
-            DockerComposeContainer environment = new DockerComposeContainer<>(composeFile)
+            DockerComposeContainer environment = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:1.29.2"),
+                composeFile
+            )
                 .withExposedService("redis", 6379)
                 .withRemoveVolumes(removeVolumes)
                 .withRemoveImages(DockerComposeContainer.RemoveImages.ALL)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
index 8f8da1e6450..4c3c69e8d76 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
@@ -7,6 +7,7 @@
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +38,10 @@ void performTest(
         final AtomicReference<String> builtImageName = new AtomicReference<>("");
         final AtomicReference<String> pulledImageName = new AtomicReference<>("");
         try (
-            DockerComposeContainer environment = new DockerComposeContainer<>(composeFile)
+            DockerComposeContainer environment = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:1.29.2"),
+                composeFile
+            )
                 .withExposedService("customredis", 6379)
                 .withBuild(true)
                 .withRemoveImages(removeMode)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
index 69853a4e0d3..c543678faab 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithCopyFilesTest.java
@@ -3,6 +3,7 @@
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,6 +16,7 @@ class DockerComposeContainerWithCopyFilesTest {
     void testShouldCopyAllFilesByDefault() throws IOException {
         try (
             DockerComposeContainer environment = new DockerComposeContainer(
+                DockerImageName.parse("docker/compose:1.29.2"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose.yml")
             )
                 .withExposedService("app", 8080)
@@ -30,6 +32,7 @@ void testShouldCopyAllFilesByDefault() throws IOException {
     void testWithFileCopyInclusionUsingFilePath() throws IOException {
         try (
             DockerComposeContainer environment = new DockerComposeContainer(
+                DockerImageName.parse("docker/compose:1.29.2"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml")
             )
                 .withExposedService("app", 8080)
@@ -48,6 +51,7 @@ void testWithFileCopyInclusionUsingFilePath() throws IOException {
     void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
         try (
             DockerComposeContainer environment = new DockerComposeContainer(
+                DockerImageName.parse("docker/compose:1.29.2"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
             )
                 .withExposedService("app", 8080)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
index d4b684ef010..84508326522 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.utility.CommandLine;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.util.Set;
@@ -21,7 +22,7 @@ class DockerComposeContainerWithOptionsTest {
 
     public static Stream<Arguments> params() {
         return Stream.of(
-            // Test the happy day case. THe compatibility option should be accepted by docker-compose.
+            // Test the happy day case. The compatibility option should be accepted by docker-compose.
             Arguments.of(
                 new File("src/test/resources/compose-options-test/with-deploy-block.yml"),
                 false,
@@ -55,6 +56,7 @@ public static Stream<Arguments> params() {
     @ParameterizedTest(name = "docker-compose test [compose file: {0}, local: {1}, options: {2}, expected result: {3}]")
     @MethodSource("params")
     void performTest(File composeFile, boolean localMode, Set<String> options, boolean expectError) {
+        DockerComposeContainer<?> environment;
         if (localMode) {
             Assumptions
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
@@ -63,14 +65,19 @@ void performTest(File composeFile, boolean localMode, Set<String> options, boole
             Assumptions
                 .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
                 .doesNotStartWith("Docker Compose version v2");
+
+            environment =
+                new DockerComposeContainer<>(composeFile).withOptions(options.stream().toArray(String[]::new));
+        } else {
+            environment =
+                new DockerComposeContainer<>(DockerImageName.parse("docker/compose:debian-1.29.2"), composeFile)
+                    .withOptions(options.stream().toArray(String[]::new));
         }
-        try (
-            DockerComposeContainer<?> environment = new DockerComposeContainer<>(composeFile)
-                .withOptions(options.stream().toArray(String[]::new))
-                .withLocalCompose(localMode)
-        ) {
+
+        try {
             environment.start();
             assertThat(expectError).isEqualTo(false);
+            environment.stop();
         } catch (Exception e) {
             assertThat(expectError).isEqualTo(true);
         }
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
index 9d0f4a19f1e..907011329ec 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeErrorHandlingTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -15,6 +16,7 @@ void simpleTest() {
         assertThat(
             catchThrowable(() -> {
                 DockerComposeContainer environment = new DockerComposeContainer(
+                    DockerImageName.parse("docker/compose:1.29.2"),
                     new File("src/test/resources/invalid-compose.yml")
                 )
                     .withExposedService("something", 123);
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
index 2c77092e1bd..1853a2d4ff1 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -15,6 +16,7 @@ void usesLocalImageEvenWhenPullFails() throws InterruptedException {
         tagImage("redis:6-alpine", "redis-local", "latest");
 
         DockerComposeContainer composeContainer = new DockerComposeContainer(
+            DockerImageName.parse("docker/compose:1.29.2"),
             new File("src/test/resources/local-compose-test.yml")
         )
             .withExposedService("redis", 6379);
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
index 7b9100d1e35..7f63bdce9fd 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeLogConsumerTest.java
@@ -4,6 +4,7 @@
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
 import org.testcontainers.containers.output.WaitingConsumer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -15,6 +16,7 @@ class DockerComposeLogConsumerTest {
     void testLogConsumer() throws TimeoutException {
         WaitingConsumer logConsumer = new WaitingConsumer();
         DockerComposeContainer environment = new DockerComposeContainer(
+            DockerImageName.parse("docker/compose:1.29.2"),
             new File("src/test/resources/v2-compose-test.yml")
         )
             .withExposedService("redis_1", 6379)
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
index 0bc8ace7ab7..a4f2707c583 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposePassthroughTest.java
@@ -5,6 +5,7 @@
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.TestEnvironment;
 
 import java.io.File;
@@ -25,6 +26,7 @@ void testContainerInstanceProperties() {
         TestWaitStrategy waitStrategy = new TestWaitStrategy();
         try (
             DockerComposeContainer compose = new DockerComposeContainer(
+                DockerImageName.parse("docker/compose:1.29.2"),
                 new File("src/test/resources/v2-compose-test-passthrough.yml")
             )
                 .withEnv("foo", "bar")
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
index 2496b7ee0bc..c1c295ef238 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java
@@ -1,18 +1,22 @@
 package org.testcontainers.junit;
 
 import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+@Disabled
 class DockerComposeServiceTest extends BaseDockerComposeTest {
 
     @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         new File("src/test/resources/compose-test.yml")
     )
         .withServices("redis")
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
index c7b066b39b8..8a8f8f0da0b 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java
@@ -1,17 +1,21 @@
 package org.testcontainers.junit;
 
 import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
 /**
  * Created by rnorth on 21/05/2016.
  */
+@Disabled
 class DockerComposeV2FormatTest extends BaseDockerComposeTest {
 
     @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         new File("src/test/resources/v2-compose-test.yml")
     )
         .withExposedService("redis_1", REDIS_PORT);
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
index d8f4e57dbd9..dd198181d41 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java
@@ -1,14 +1,18 @@
 package org.testcontainers.junit;
 
 import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
+@Disabled
 class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
 
     @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         "TEST",
         new File("src/test/resources/v2-compose-test.yml")
     )
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
index bc95f0229b7..2cf506059c5 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java
@@ -1,14 +1,18 @@
 package org.testcontainers.junit;
 
 import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
+@Disabled
 class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
 
     @AutoClose
     public DockerComposeContainer environment = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         new File("src/test/resources/v2-compose-test-with-network.yml")
     )
         .withExposedService("redis_1", REDIS_PORT);
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
index 9f8c2c9ab49..6f56ef9c24a 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java
@@ -7,6 +7,7 @@
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 import java.time.Duration;
@@ -23,7 +24,11 @@ class DockerComposeWaitStrategyTest {
 
     @BeforeEach
     public final void setUp() {
-        environment = new DockerComposeContainer<>(new File("src/test/resources/compose-test.yml"));
+        environment =
+            new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:1.29.2"),
+                new File("src/test/resources/compose-test.yml")
+            );
     }
 
     @AfterEach
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 1f6fbc1551a..171bd9a4381 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -130,7 +130,12 @@ void testThatAuthLocatorIsUsedForDockerComposePull() throws IOException {
         Files.write(tempFile, composeFileContent.getBytes());
 
         // Start the docker compose project, which will require an authenticated pull
-        try (final DockerComposeContainer<?> compose = new DockerComposeContainer<>(tempFile.toFile())) {
+        try (
+            final DockerComposeContainer<?> compose = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:1.29.2"),
+                tempFile.toFile()
+            )
+        ) {
             compose.start();
 
             assertThat(
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java
index 7a43ed67a7d..460d50a856b 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/DockerComposeContainerTests.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
 
@@ -17,6 +18,7 @@ class DockerComposeContainerTests {
 
     @Container
     private DockerComposeContainer composeContainer = new DockerComposeContainer(
+        DockerImageName.parse("docker/compose:1.29.2"),
         new File("src/test/resources/docker-compose.yml")
     )
         .withExposedService("whoami_1", 80, Wait.forHttp("/"));
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
index 7294d534275..ff473aea1de 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
@@ -4,12 +4,14 @@ import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.client.HttpClientBuilder
 import org.testcontainers.containers.DockerComposeContainer
 import org.testcontainers.containers.wait.strategy.Wait
+import org.testcontainers.utility.DockerImageName
 import spock.lang.Specification
 
 @Testcontainers
 class ComposeContainerIT extends Specification {
 
 	DockerComposeContainer composeContainer = new DockerComposeContainer(
+	DockerImageName.parse("docker/compose:debian-1.29.2"),
 	new File("src/test/resources/docker-compose.yml"))
 	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
 
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
index f728212278f..953d476b160 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
@@ -4,6 +4,7 @@ import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.client.HttpClientBuilder
 import org.testcontainers.containers.DockerComposeContainer
 import org.testcontainers.containers.wait.strategy.Wait
+import org.testcontainers.utility.DockerImageName
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -12,6 +13,7 @@ class SharedComposeContainerIT extends Specification {
 
 	@Shared
 	DockerComposeContainer composeContainer = new DockerComposeContainer(
+	DockerImageName.parse("docker/compose:debian-1.29.2"),
 	new File("src/test/resources/docker-compose.yml"))
 	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
 

From ed397a7c4dabbd9ee4d47e8ce1d5d38dd939b151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 23:33:33 -0600
Subject: [PATCH 4669/4969] Revert "Remove LinkableContainer from
 NginxContainer (#10386)"

This reverts commit e14ea8421096148a97adbc4dcf7adf52dc30d4a0.
---
 .../java/org/testcontainers/containers/NginxContainer.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index d7c201e6474..6d4c8249fca 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.jetbrains.annotations.NotNull;
+import org.testcontainers.containers.traits.LinkableContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.net.MalformedURLException;
@@ -11,7 +12,9 @@
  * @deprecated use {@link org.testcontainers.nginx.NginxContainer} instead.
  */
 @Deprecated
-public class NginxContainer extends GenericContainer<NginxContainer> {
+public class NginxContainer<SELF extends NginxContainer<SELF>>
+    extends GenericContainer<SELF>
+    implements LinkableContainer {
 
     private static final int NGINX_DEFAULT_PORT = 80;
 
@@ -50,7 +53,7 @@ public void setCustomContent(String htmlContentPath) {
     }
 
     @Deprecated
-    public NginxContainer withCustomContent(String htmlContentPath) {
+    public SELF withCustomContent(String htmlContentPath) {
         this.setCustomContent(htmlContentPath);
         return self();
     }

From 49637a016c7d654c52fb90a4887eca49b56b4a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 23:45:54 -0600
Subject: [PATCH 4670/4969] Revert "Drop module's default constructors
 (#10385)"

This reverts commit cfe90d50ee4baa2e3c4df7fddb404bda663cf172.
---
 .../containers/CockroachContainer.java              |  8 ++++++++
 .../org/testcontainers/containers/Db2Container.java |  8 ++++++++
 .../containers/InfluxDBContainer.java               | 13 +++++++++++++
 .../containers/localstack/LocalStackContainer.java  |  8 ++++++++
 .../containers/MockServerContainer.java             |  8 ++++++++
 .../testcontainers/containers/MongoDBContainer.java | 10 ++++++++++
 .../containers/MSSQLServerContainer.java            |  8 ++++++++
 .../testcontainers/containers/MySQLContainer.java   |  8 ++++++++
 .../testcontainers/containers/Neo4jContainer.java   |  9 +++++++++
 .../testcontainers/containers/NginxContainer.java   | 10 ++++++++++
 .../testcontainers/containers/OracleContainer.java  |  8 ++++++++
 .../containers/OrientDBContainer.java               | 10 ++++++++++
 .../containers/PostgreSQLContainer.java             |  8 ++++++++
 .../testcontainers/containers/PulsarContainer.java  | 11 +++++++++++
 .../containers/RabbitMQContainer.java               | 11 +++++++++++
 .../testcontainers/containers/SolrContainer.java    | 11 +++++++++++
 .../containers/ToxiproxyContainer.java              | 10 ++++++++++
 17 files changed, 159 insertions(+)

diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
index 855c37a03c8..461b0467767 100644
--- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
+++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java
@@ -55,6 +55,14 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
 
     private boolean isVersionGreaterThanOrEqualTo221;
 
+    /**
+     * @deprecated use {@link #CockroachContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public CockroachContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public CockroachContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 9f5b9dfde89..19dbc6a58ac 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -44,6 +44,14 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     private String password = "foobar1234";
 
+    /**
+     * @deprecated use {@link #Db2Container(DockerImageName)} instead
+     */
+    @Deprecated
+    public Db2Container() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public Db2Container(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
index f54971dfc7a..8e908e8e229 100644
--- a/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
+++ b/modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java
@@ -24,6 +24,11 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb");
 
+    private static final String DEFAULT_TAG = "1.4.3";
+
+    @Deprecated
+    public static final String VERSION = DEFAULT_TAG;
+
     private static final int NO_CONTENT_STATUS_CODE = 204;
 
     @Getter
@@ -61,6 +66,14 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
 
     private final boolean isAtLeastMajorVersion2;
 
+    /**
+     * @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public InfluxDBContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     /**
      * @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
      */
diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
index 083f642e11c..ce50313d429 100644
--- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -86,6 +86,14 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
 
     private final boolean isVersion2;
 
+    /**
+     * @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public LocalStackContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     /**
      * @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
      */
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index f69c5e86a6d..47d2399d934 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -20,6 +20,14 @@ public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
     public static final int PORT = 1080;
 
+    /**
+     * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public MockServerContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     /**
      * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
      */
diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
index b986a720964..d30f45739c0 100644
--- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
+++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java
@@ -33,6 +33,8 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
         "mongodb/mongodb-enterprise-server"
     );
 
+    private static final String DEFAULT_TAG = "4.0.10";
+
     private static final int CONTAINER_EXIT_CODE_OK = 0;
 
     private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
@@ -43,6 +45,14 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private boolean shardingEnabled;
 
+    /**
+     * @deprecated use {@link #MongoDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public MongoDBContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public MongoDBContainer(@NonNull final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
index a30de6549ba..07f8a064c00 100644
--- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -47,6 +47,14 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
         Pattern.compile("[^a-zA-Z0-9]+", Pattern.CASE_INSENSITIVE),
     };
 
+    /**
+     * @deprecated use {@link #MSSQLServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public MSSQLServerContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public MSSQLServerContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
index 9f5b31531c4..36315b2fe48 100644
--- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -44,6 +44,14 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab
 
     private static final String MYSQL_ROOT_USER = "root";
 
+    /**
+     * @deprecated use {@link #MySQLContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public MySQLContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public MySQLContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index 64c4df9f350..b4077d7fbda 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -86,6 +86,15 @@ public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
         .forPort(DEFAULT_HTTP_PORT)
         .forStatusCodeMatching(response -> response == HttpURLConnection.HTTP_OK);
 
+    /**
+     * Creates a Neo4jContainer using the official Neo4j docker image.
+     * @deprecated use {@link #Neo4jContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public Neo4jContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     /**
      * Creates a Neo4jContainer using a specific docker image.
      *
diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
index 6d4c8249fca..c66149d2417 100644
--- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java
@@ -20,6 +20,16 @@ public class NginxContainer<SELF extends NginxContainer<SELF>>
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("nginx");
 
+    private static final String DEFAULT_TAG = "1.9.4";
+
+    /**
+     * @deprecated use {@link #NginxContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public NginxContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public NginxContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index 07db62a7b2e..75b16779f40 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -63,6 +63,14 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     private boolean usingSid = false;
 
+    /**
+     * @deprecated use {@link #OracleContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public OracleContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public OracleContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index 67c81be7e90..aeaf053ff0a 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -36,6 +36,8 @@ public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("orientdb");
 
+    private static final String DEFAULT_TAG = "3.0.24-tp3";
+
     private static final String DEFAULT_USERNAME = "admin";
 
     private static final String DEFAULT_PASSWORD = "admin";
@@ -58,6 +60,14 @@ public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
 
     private ODatabaseSession session;
 
+    /**
+     * @deprecated use {@link #OrientDBContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public OrientDBContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public OrientDBContainer(@NonNull String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
index d45b9d5683d..4824654957f 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
@@ -44,6 +44,14 @@ public class PostgreSQLContainer<SELF extends PostgreSQLContainer<SELF>> extends
 
     private static final String FSYNC_OFF_OPTION = "fsync=off";
 
+    /**
+     * @deprecated use {@link #PostgreSQLContainer(DockerImageName)} or {@link #PostgreSQLContainer(String)} instead
+     */
+    @Deprecated
+    public PostgreSQLContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public PostgreSQLContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
index 49475d09511..7305fbd622c 100644
--- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
+++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java
@@ -34,12 +34,23 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar");
 
+    @Deprecated
+    private static final String DEFAULT_TAG = "3.0.0";
+
     private final WaitAllStrategy waitAllStrategy = new WaitAllStrategy();
 
     private boolean functionsWorkerEnabled = false;
 
     private boolean transactionsEnabled = false;
 
+    /**
+     * @deprecated use {@link #PulsarContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public PulsarContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     /**
      * @deprecated use {@link #PulsarContainer(DockerImageName)} instead
      */
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index b7b2eb35051..6db9f6b4cf0 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -38,6 +38,8 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
      */
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("rabbitmq");
 
+    private static final String DEFAULT_TAG = "3.7.25-management-alpine";
+
     private static final int DEFAULT_AMQP_PORT = 5672;
 
     private static final int DEFAULT_AMQPS_PORT = 5671;
@@ -52,6 +54,15 @@ public class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
 
     private final List<List<String>> values = new ArrayList<>();
 
+    /**
+     * Creates a RabbitMQ container using the official RabbitMQ docker image.
+     * @deprecated use {@link #RabbitMQContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public RabbitMQContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     /**
      * Creates a RabbitMQ container using a specific docker image.
      *
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index 16c3a0d62d4..c4172bb8e01 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -28,6 +28,9 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("solr");
 
+    @Deprecated
+    public static final String DEFAULT_TAG = "8.3.0";
+
     public static final Integer ZOOKEEPER_PORT = 9983;
 
     public static final Integer SOLR_PORT = 8983;
@@ -36,6 +39,14 @@ public class SolrContainer extends GenericContainer<SolrContainer> {
 
     private final ComparableVersion imageVersion;
 
+    /**
+     * @deprecated use {@link #SolrContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public SolrContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public SolrContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
index 4a3d1af003e..a3f12516f8d 100644
--- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
+++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
@@ -34,6 +34,8 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy");
 
+    private static final String DEFAULT_TAG = "2.1.0";
+
     private static final DockerImageName GHCR_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy");
 
     private static final int TOXIPROXY_CONTROL_PORT = 8474;
@@ -48,6 +50,14 @@ public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {
 
     private final AtomicInteger nextPort = new AtomicInteger(FIRST_PROXIED_PORT);
 
+    /**
+     * @deprecated use {@link #ToxiproxyContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public ToxiproxyContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
     public ToxiproxyContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }

From e3fe7c9dce049ab1365578402c6a0a66862fdd4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 9 Oct 2025 23:48:55 -0600
Subject: [PATCH 4671/4969] Revert "Make Neo4jContainer generic and drop
 deprecated method (#10388)"

This reverts commit 71cc7293332d30a1495713cfe4d75259599602d9.
---
 .../containers/Neo4jExampleTest.java           |  2 +-
 .../containers/Neo4jContainer.java             | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
index abf42a115de..38c22a0ff45 100644
--- a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -27,7 +27,7 @@
 class Neo4jExampleTest {
 
     @Container
-    private static Neo4jContainer neo4jContainer = new Neo4jContainer(DockerImageName.parse("neo4j:4.4"))
+    private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(DockerImageName.parse("neo4j:4.4"))
         .withoutAuthentication(); // Disable password
 
     @Test
diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
index b4077d7fbda..f7fc0beacfe 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java
@@ -34,7 +34,7 @@
  * @deprecated use {@link org.testcontainers.neo4j.Neo4jContainer} instead.
  */
 @Deprecated
-public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
+public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContainer<S> {
 
     /**
      * The image defaults to the official Neo4j image: <a href="https://hub.docker.com/_/neo4j/">Neo4j</a>.
@@ -217,7 +217,7 @@ public String getHttpsUrl() {
      *
      * @return This container.
      */
-    public Neo4jContainer withEnterpriseEdition() {
+    public S withEnterpriseEdition() {
         if (!standardImage) {
             throw new IllegalStateException(
                 String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName())
@@ -239,7 +239,7 @@ public Neo4jContainer withEnterpriseEdition() {
      * @param adminPassword The admin password for the default database account.
      * @return This container.
      */
-    public Neo4jContainer withAdminPassword(final String adminPassword) {
+    public S withAdminPassword(final String adminPassword) {
         if (adminPassword != null && adminPassword.length() < 8) {
             logger().warn("Your provided admin password is too short and will not work with Neo4j 5.3+.");
         }
@@ -252,7 +252,7 @@ public Neo4jContainer withAdminPassword(final String adminPassword) {
      *
      * @return This container.
      */
-    public Neo4jContainer withoutAuthentication() {
+    public S withoutAuthentication() {
         return withAdminPassword(null);
     }
 
@@ -276,7 +276,7 @@ public Neo4jContainer withoutAuthentication() {
      * @throws IllegalArgumentException If the database version is not 3.5.
      * @return This container.
      */
-    public Neo4jContainer withDatabase(MountableFile graphDb) {
+    public S withDatabase(MountableFile graphDb) {
         if (!isNeo4jDatabaseVersionSupportingDbCopy()) {
             throw new IllegalArgumentException(
                 "Copying database folder is not supported for Neo4j instances with version 4.0 or higher."
@@ -295,7 +295,7 @@ public Neo4jContainer withDatabase(MountableFile graphDb) {
      * @param plugins
      * @return This container.
      */
-    public Neo4jContainer withPlugins(MountableFile plugins) {
+    public S withPlugins(MountableFile plugins) {
         return withCopyFileToContainer(plugins, "/var/lib/neo4j/plugins/");
     }
 
@@ -307,7 +307,7 @@ public Neo4jContainer withPlugins(MountableFile plugins) {
      * @param value The value to set
      * @return This container.
      */
-    public Neo4jContainer withNeo4jConfig(String key, String value) {
+    public S withNeo4jConfig(String key, String value) {
         addEnv(formatConfigurationKey(key), value);
         return self();
     }
@@ -330,7 +330,7 @@ public String getAdminPassword() {
      * @param plugins The Neo4j plugins that should get started with the server.
      * @return This container.
      */
-    public Neo4jContainer withPlugins(String... plugins) {
+    public S withPlugins(String... plugins) {
         this.labsPlugins.addAll(Arrays.asList(plugins));
         return self();
     }
@@ -363,7 +363,7 @@ private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
         return false;
     }
 
-    public Neo4jContainer withRandomPassword() {
+    public S withRandomPassword() {
         return withAdminPassword(UUID.randomUUID().toString());
     }
 }

From 2cce248fe6fb11888bb622a60f0e03b399cdbfad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 10 Oct 2025 05:59:26 -0600
Subject: [PATCH 4672/4969] Add OrientDB container implementation under
 org.testcontainers.orientdb (#11098)

---
 docs/modules/databases/orientdb.md            |   2 +-
 .../containers/OrientDBContainer.java         |   3 +
 .../orientdb/OrientDBContainer.java           | 140 ++++++++++++++++++
 .../OrientDBContainerTest.java                |  56 ++++---
 4 files changed, 182 insertions(+), 19 deletions(-)
 create mode 100644 modules/orientdb/src/main/java/org/testcontainers/orientdb/OrientDBContainer.java
 rename modules/orientdb/src/test/java/org/testcontainers/{containers => orientdb}/OrientDBContainerTest.java (58%)

diff --git a/docs/modules/databases/orientdb.md b/docs/modules/databases/orientdb.md
index 40a26100ae1..a1f57098d99 100644
--- a/docs/modules/databases/orientdb.md
+++ b/docs/modules/databases/orientdb.md
@@ -7,7 +7,7 @@ Testcontainers module for [OrientDB](https://hub.docker.com/_/orientdb/)
 You can start an OrientDB container instance from any Java application by using:
 
 <!--codeinclude-->
-[Container creation](../../../modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java) inside_block:container
+[Container creation](../../../modules/orientdb/src/test/java/org/testcontainers/orientdb/OrientDBContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index aeaf053ff0a..e21472dd16a 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -29,7 +29,10 @@
  *     <li>Database: 2424</li>
  *     <li>Studio: 2480</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.orientdb.OrientDBContainer} instead.
  */
+@Deprecated
 public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OrientDBContainer.class);
diff --git a/modules/orientdb/src/main/java/org/testcontainers/orientdb/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/orientdb/OrientDBContainer.java
new file mode 100644
index 00000000000..753d32951e7
--- /dev/null
+++ b/modules/orientdb/src/main/java/org/testcontainers/orientdb/OrientDBContainer.java
@@ -0,0 +1,140 @@
+package org.testcontainers.orientdb;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.NonNull;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+
+/**
+ * Testcontainers implementation for OrientDB.
+ * <p>
+ * Supported image: {@code orientdb}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Database: 2424</li>
+ *     <li>Studio: 2480</li>
+ * </ul>
+ */
+public class OrientDBContainer extends GenericContainer<OrientDBContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("orientdb");
+
+    private static final String DEFAULT_USERNAME = "admin";
+
+    private static final String DEFAULT_PASSWORD = "admin";
+
+    private static final String DEFAULT_SERVER_USER = "root";
+
+    private static final String DEFAULT_SERVER_PASSWORD = "root";
+
+    private static final String DEFAULT_DATABASE_NAME = "testcontainers";
+
+    private static final int DEFAULT_BINARY_PORT = 2424;
+
+    private static final int DEFAULT_HTTP_PORT = 2480;
+
+    private String databaseName;
+
+    private String serverPassword;
+
+    private Transferable scriptPath;
+
+    public OrientDBContainer(@NonNull String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public OrientDBContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        this.serverPassword = DEFAULT_SERVER_PASSWORD;
+        this.databaseName = DEFAULT_DATABASE_NAME;
+
+        waitingFor(Wait.forLogMessage(".*OrientDB Studio available.*", 1));
+        addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
+    }
+
+    @Override
+    protected void configure() {
+        addEnv("ORIENTDB_ROOT_PASSWORD", serverPassword);
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        try {
+            String createDb = String.format(
+                "CREATE DATABASE remote:localhost/%s %s %s plocal; CONNECT remote:localhost/%s %s %s; CREATE USER %s IDENTIFIED BY %s ROLE admin;",
+                this.databaseName,
+                DEFAULT_SERVER_USER,
+                this.serverPassword,
+                this.databaseName,
+                DEFAULT_SERVER_USER,
+                this.serverPassword,
+                DEFAULT_USERNAME,
+                DEFAULT_PASSWORD
+            );
+            execInContainer("/orientdb/bin/console.sh", createDb);
+
+            if (this.scriptPath != null) {
+                copyFileToContainer(this.scriptPath, "/opt/testcontainers/script.osql");
+                String loadScript = String.format(
+                    "CONNECT remote:localhost/%s %s %s; LOAD SCRIPT /opt/testcontainers/script.osql",
+                    this.databaseName,
+                    DEFAULT_SERVER_USER,
+                    this.serverPassword
+                );
+                execInContainer("/orientdb/bin/console.sh", loadScript);
+            }
+        } catch (IOException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    public OrientDBContainer withDatabaseName(final String databaseName) {
+        this.databaseName = databaseName;
+        return self();
+    }
+
+    public OrientDBContainer withServerPassword(final String serverPassword) {
+        this.serverPassword = serverPassword;
+        return self();
+    }
+
+    public OrientDBContainer withScriptPath(Transferable scriptPath) {
+        this.scriptPath = scriptPath;
+        return self();
+    }
+
+    public String getServerUrl() {
+        return "remote:" + getHost() + ":" + getMappedPort(2424);
+    }
+
+    public String getDbUrl() {
+        return getServerUrl() + "/" + this.databaseName;
+    }
+
+    public String getServerUser() {
+        return DEFAULT_SERVER_USER;
+    }
+
+    public String getServerPassword() {
+        return this.serverPassword;
+    }
+
+    public String getUsername() {
+        return DEFAULT_USERNAME;
+    }
+
+    public String getPassword() {
+        return DEFAULT_PASSWORD;
+    }
+}
diff --git a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java b/modules/orientdb/src/test/java/org/testcontainers/orientdb/OrientDBContainerTest.java
similarity index 58%
rename from modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
rename to modules/orientdb/src/test/java/org/testcontainers/orientdb/OrientDBContainerTest.java
index af6778505ec..2952b70f216 100644
--- a/modules/orientdb/src/test/java/org/testcontainers/containers/OrientDBContainerTest.java
+++ b/modules/orientdb/src/test/java/org/testcontainers/orientdb/OrientDBContainerTest.java
@@ -1,6 +1,8 @@
-package org.testcontainers.containers;
+package org.testcontainers.orientdb;
 
 import com.orientechnologies.orient.core.db.ODatabaseSession;
+import com.orientechnologies.orient.core.db.OrientDB;
+import com.orientechnologies.orient.core.db.OrientDBConfig;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -12,26 +14,24 @@ class OrientDBContainerTest {
     private static final DockerImageName ORIENTDB_IMAGE = DockerImageName.parse("orientdb:3.2.0-tp3");
 
     @Test
-    void shouldReturnTheSameSession() {
+    void shouldInitializeWithCommands() {
         try ( // container {
             OrientDBContainer orientdb = new OrientDBContainer("orientdb:3.2.0-tp3")
             // }
         ) {
             orientdb.start();
 
-            final ODatabaseSession session = orientdb.getSession();
-            final ODatabaseSession session2 = orientdb.getSession();
-
-            assertThat(session).isSameAs(session2);
-        }
-    }
-
-    @Test
-    void shouldInitializeWithCommands() {
-        try (OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)) {
-            orientdb.start();
-
-            final ODatabaseSession session = orientdb.getSession();
+            OrientDB orientDB = new OrientDB(
+                orientdb.getServerUrl(),
+                orientdb.getServerUser(),
+                orientdb.getServerPassword(),
+                OrientDBConfig.defaultConfig()
+            );
+            ODatabaseSession session = orientDB.open(
+                orientdb.getDatabaseName(),
+                orientdb.getUsername(),
+                orientdb.getPassword()
+            );
 
             session.command("CREATE CLASS Person EXTENDS V");
             session.command("INSERT INTO Person set name='john'");
@@ -52,7 +52,17 @@ void shouldQueryWithGremlin() {
         ) {
             orientdb.start();
 
-            final ODatabaseSession session = orientdb.getSession("admin", "admin");
+            OrientDB orientDB = new OrientDB(
+                orientdb.getServerUrl(),
+                orientdb.getServerUser(),
+                orientdb.getServerPassword(),
+                OrientDBConfig.defaultConfig()
+            );
+            ODatabaseSession session = orientDB.open(
+                orientdb.getDatabaseName(),
+                orientdb.getUsername(),
+                orientdb.getPassword()
+            );
 
             session.command("CREATE CLASS Person EXTENDS V");
             session.command("INSERT INTO Person set name='john'");
@@ -66,7 +76,7 @@ void shouldQueryWithGremlin() {
     void shouldInitializeDatabaseFromScript() {
         try (
             OrientDBContainer orientdb = new OrientDBContainer(ORIENTDB_IMAGE)
-                .withScriptPath("initscript.osql")
+                .withScriptPath(MountableFile.forClasspathResource("initscript.osql"))
                 .withDatabaseName("persons")
         ) {
             orientdb.start();
@@ -74,7 +84,17 @@ void shouldInitializeDatabaseFromScript() {
             assertThat(orientdb.getDbUrl())
                 .isEqualTo("remote:" + orientdb.getHost() + ":" + orientdb.getMappedPort(2424) + "/persons");
 
-            final ODatabaseSession session = orientdb.getSession();
+            OrientDB orientDB = new OrientDB(
+                orientdb.getServerUrl(),
+                orientdb.getServerUser(),
+                orientdb.getServerPassword(),
+                OrientDBConfig.defaultConfig()
+            );
+            ODatabaseSession session = orientDB.open(
+                orientdb.getDatabaseName(),
+                orientdb.getUsername(),
+                orientdb.getPassword()
+            );
 
             assertThat(session.query("SELECT FROM Person").stream()).hasSize(4);
         }

From a7f14aa74969340d1e1cf14050d6bb15cee78f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 13 Oct 2025 11:54:17 -0600
Subject: [PATCH 4673/4969] Polish

---
 .../testcontainers/cratedb/CrateDBContainer.java   |  2 +-
 .../org/testcontainers/neo4j/Neo4jContainer.java   | 11 +++++------
 .../postgresql/PostgreSQLContainer.java            | 14 +++++++-------
 .../testcontainers/containers/PrestoContainer.java | 11 ++++++-----
 .../org/testcontainers/solace/SolaceContainer.java |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
index 039128174c1..d91704eba3d 100644
--- a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
+++ b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
@@ -47,7 +47,7 @@ public CrateDBContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withCommand("crate -C discovery.type=single-node");
 
-        this.waitStrategy = Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200);
+        waitingFor(Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200));
 
         addExposedPort(CRATEDB_PG_PORT);
         addExposedPort(CRATEDB_HTTP_PORT);
diff --git a/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
index 23a94c98c8f..e96204ac418 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
@@ -104,11 +104,12 @@ public Neo4jContainer(final DockerImageName dockerImageName) {
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.waitStrategy =
+        waitingFor(
             new WaitAllStrategy()
                 .withStrategy(WAIT_FOR_BOLT)
                 .withStrategy(WAIT_FOR_HTTP)
-                .withStartupTimeout(Duration.ofMinutes(2));
+                .withStartupTimeout(Duration.ofMinutes(2))
+        );
 
         addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
     }
@@ -168,11 +169,9 @@ private void configureWaitStrategy() {
         boolean onlyHttpExposed = !boltExposed && httpExposed;
 
         if (onlyBoltExposed) {
-            this.waitStrategy =
-                new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2));
+            waitingFor(new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2)));
         } else if (onlyHttpExposed) {
-            this.waitStrategy =
-                new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2));
+            waitingFor(new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2)));
         }
     }
 
diff --git a/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java
index 9b02019052d..27521487a23 100644
--- a/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java
+++ b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.JdbcDatabaseContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -50,12 +50,12 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, PGVECTOR_IMAGE_NAME);
 
-        this.waitStrategy =
-            new LogMessageWaitStrategy()
-                .withRegEx(".*database system is ready to accept connections.*\\s")
-                .withTimes(2)
-                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
-        this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
+        waitingFor(
+            Wait
+                .forLogMessage(".*database system is ready to accept connections.*\\s", 2)
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
+        );
+        setCommand("postgres", "-c", FSYNC_OFF_OPTION);
 
         addExposedPort(POSTGRESQL_PORT);
     }
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
index 946f6a95c6d..ac01eff1882 100644
--- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
+++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Strings;
 import org.jetbrains.annotations.NotNull;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.sql.Connection;
@@ -47,10 +47,11 @@ public PrestoContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.waitStrategy =
-            new LogMessageWaitStrategy()
-                .withRegEx(".*======== SERVER STARTED ========.*")
-                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
+        waitingFor(
+            Wait
+                .forLogMessage(".*======== SERVER STARTED ========.*", 1)
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
+        );
 
         addExposedPort(PRESTO_PORT);
     }
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
index 00db0606536..2ab22c8ffa6 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java
@@ -79,7 +79,7 @@ public SolaceContainer(DockerImageName dockerImageName) {
                 .withShmSize(SHM_SIZE)
                 .withUlimits(new Ulimit[] { new Ulimit("nofile", 2448L, 1048576L) });
         });
-        this.waitStrategy = Wait.forLogMessage(SOLACE_READY_MESSAGE, 1).withStartupTimeout(Duration.ofSeconds(60));
+        waitingFor(Wait.forLogMessage(SOLACE_READY_MESSAGE, 1).withStartupTimeout(Duration.ofSeconds(60)));
         withExposedPorts(8080);
         withEnv("username_admin_globalaccesslevel", "admin");
         withEnv("username_admin_password", "admin");

From c8aa7c7582a2e17ebd1734cd4e8b65a0d3135cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 13 Oct 2025 23:08:16 -0600
Subject: [PATCH 4674/4969] Move CassandraDatabaseDelegate and
 CassandraQueryWaitStrategy to org.testcontainers.cassandra (#11105)

---
 .../java/org/testcontainers/cassandra/CassandraContainer.java  | 2 --
 .../cassandra/{delegate => }/CassandraDatabaseDelegate.java    | 3 +--
 .../cassandra/{wait => }/CassandraQueryWaitStrategy.java       | 3 +--
 .../containers/delegate/CassandraDatabaseDelegate.java         | 2 +-
 .../containers/wait/CassandraQueryWaitStrategy.java            | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)
 rename modules/cassandra/src/main/java/org/testcontainers/cassandra/{delegate => }/CassandraDatabaseDelegate.java (96%)
 rename modules/cassandra/src/main/java/org/testcontainers/cassandra/{wait => }/CassandraQueryWaitStrategy.java (93%)

diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
index 73a0c83443e..e10488176ac 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
@@ -1,8 +1,6 @@
 package org.testcontainers.cassandra;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate;
-import org.testcontainers.cassandra.wait.CassandraQueryWaitStrategy;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.ext.ScriptUtils;
 import org.testcontainers.ext.ScriptUtils.ScriptLoadException;
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
similarity index 96%
rename from modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java
rename to modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
index 47b92958ea5..6965b3a1df8 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/delegate/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
@@ -1,10 +1,9 @@
-package org.testcontainers.cassandra.delegate;
+package org.testcontainers.cassandra;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.testcontainers.cassandra.CassandraContainer;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.ExecConfig;
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
similarity index 93%
rename from modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java
rename to modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
index 1d1004eb3df..d42f9f7c324 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/wait/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
@@ -1,7 +1,6 @@
-package org.testcontainers.cassandra.wait;
+package org.testcontainers.cassandra;
 
 import org.rnorth.ducttape.TimeoutException;
-import org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 import org.testcontainers.delegate.DatabaseDelegate;
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
index 33372ca6c78..7b7739490ea 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
@@ -14,7 +14,7 @@
 /**
  * Cassandra database delegate
  *
- * @deprecated use {@link org.testcontainers.cassandra.delegate.CassandraDatabaseDelegate} instead.
+ * @deprecated use {@link org.testcontainers.cassandra.CassandraDatabaseDelegate} instead.
  */
 @Slf4j
 @RequiredArgsConstructor
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
index 362e33e3543..9694711de6e 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/containers/wait/CassandraQueryWaitStrategy.java
@@ -13,7 +13,7 @@
 /**
  * Waits until Cassandra returns its version
  *
- * @deprecated use {@link org.testcontainers.cassandra.wait.CassandraQueryWaitStrategy} instead.
+ * @deprecated use {@link org.testcontainers.cassandra.CassandraQueryWaitStrategy} instead.
  */
 @Deprecated
 public class CassandraQueryWaitStrategy extends AbstractWaitStrategy {

From 11881bfc6610a212d36af27f49e587071d0c4975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20K=C3=A5sene?=
 <6691406+ThomasKasene@users.noreply.github.com>
Date: Tue, 14 Oct 2025 07:14:06 +0200
Subject: [PATCH 4675/4969] Fix Kafka listeners and advertised listeners config
 to come out of sync (#11068)

---
 .../org/testcontainers/kafka/ConfluentKafkaContainer.java   | 6 +++---
 .../main/java/org/testcontainers/kafka/KafkaContainer.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
index abbd2bfd908..381ba836715 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
@@ -6,7 +6,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -22,9 +22,9 @@ public class ConfluentKafkaContainer extends GenericContainer<ConfluentKafkaCont
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
 
-    private final Set<String> listeners = new HashSet<>();
+    private final Set<String> listeners = new LinkedHashSet<>();
 
-    private final Set<Supplier<String>> advertisedListeners = new HashSet<>();
+    private final Set<Supplier<String>> advertisedListeners = new LinkedHashSet<>();
 
     public ConfluentKafkaContainer(String imageName) {
         this(DockerImageName.parse(imageName));
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
index e946e0a8992..375fd132f6c 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -6,7 +6,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -28,9 +28,9 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
 
-    private final Set<String> listeners = new HashSet<>();
+    private final Set<String> listeners = new LinkedHashSet<>();
 
-    private final Set<Supplier<String>> advertisedListeners = new HashSet<>();
+    private final Set<Supplier<String>> advertisedListeners = new LinkedHashSet<>();
 
     public KafkaContainer(String imageName) {
         this(DockerImageName.parse(imageName));

From fb73ad16c6aeb0684b1b1352251f652aafb7c422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 13 Oct 2025 23:16:25 -0600
Subject: [PATCH 4676/4969] Add Solr container implementation under
 org.testcontainers.solr (#11104)

---
 docs/modules/solr.md                          |   2 +-
 .../containers/SolrContainer.java             |   2 +
 .../testcontainers/solr/SolrContainer.java    | 156 ++++++++++++++++++
 .../SolrContainerTest.java                    |   4 +-
 4 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100644 modules/solr/src/main/java/org/testcontainers/solr/SolrContainer.java
 rename modules/solr/src/test/java/org/testcontainers/{containers => solr}/SolrContainerTest.java (97%)

diff --git a/docs/modules/solr.md b/docs/modules/solr.md
index a332c7cbcbe..73546dcbd6d 100644
--- a/docs/modules/solr.md
+++ b/docs/modules/solr.md
@@ -9,7 +9,7 @@ Note that it's based on the [official Docker image](https://hub.docker.com/_/sol
 You can start a solr container instance from any Java application by using:
 
 <!--codeinclude-->
-[Using a Solr container](../../modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java) inside_block:solrContainerUsage
+[Using a Solr container](../../modules/solr/src/test/java/org/testcontainers/solr/SolrContainerTest.java) inside_block:solrContainerUsage
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies
diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
index c4172bb8e01..a921eb2f458 100644
--- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
+++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java
@@ -23,6 +23,8 @@
  *     <li>Solr: 8983</li>
  *     <li>Zookeeper: 9983</li>
  * </ul>
+ *
+ * @deprecated use {@link org.testcontainers.solr.SolrContainer} instead.
  */
 public class SolrContainer extends GenericContainer<SolrContainer> {
 
diff --git a/modules/solr/src/main/java/org/testcontainers/solr/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/solr/SolrContainer.java
new file mode 100644
index 00000000000..536afa69dfd
--- /dev/null
+++ b/modules/solr/src/main/java/org/testcontainers/solr/SolrContainer.java
@@ -0,0 +1,156 @@
+package org.testcontainers.solr;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.SolrClientUtils;
+import org.testcontainers.containers.SolrContainerConfiguration;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+
+import java.net.URL;
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for Solr.
+ * <p>
+ * Supported image: {@code solr}
+ * <p>
+ * Exposed ports:
+ * <ul>
+ *     <li>Solr: 8983</li>
+ *     <li>Zookeeper: 9983</li>
+ * </ul>
+ */
+public class SolrContainer extends GenericContainer<SolrContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("solr");
+
+    public static final Integer ZOOKEEPER_PORT = 9983;
+
+    public static final Integer SOLR_PORT = 8983;
+
+    private SolrContainerConfiguration configuration;
+
+    private final ComparableVersion imageVersion;
+
+    public SolrContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public SolrContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        waitingFor(
+            Wait.forLogMessage(".*o\\.e\\.j\\.s\\.Server Started.*", 1).withStartupTimeout(Duration.ofMinutes(1))
+        );
+        this.configuration = new SolrContainerConfiguration();
+        this.imageVersion = new ComparableVersion(dockerImageName.getVersionPart());
+    }
+
+    public SolrContainer withZookeeper(boolean zookeeper) {
+        configuration.setZookeeper(zookeeper);
+        return self();
+    }
+
+    public SolrContainer withCollection(String collection) {
+        if (StringUtils.isEmpty(collection)) {
+            throw new IllegalArgumentException("Collection name must not be empty");
+        }
+        configuration.setCollectionName(collection);
+        return self();
+    }
+
+    public SolrContainer withConfiguration(String name, URL solrConfig) {
+        if (StringUtils.isEmpty(name) || solrConfig == null) {
+            throw new IllegalArgumentException();
+        }
+        configuration.setConfigurationName(name);
+        configuration.setSolrConfiguration(solrConfig);
+        return self();
+    }
+
+    public SolrContainer withSchema(URL schema) {
+        configuration.setSolrSchema(schema);
+        return self();
+    }
+
+    public int getSolrPort() {
+        return getMappedPort(SOLR_PORT);
+    }
+
+    public int getZookeeperPort() {
+        return getMappedPort(ZOOKEEPER_PORT);
+    }
+
+    @Override
+    @SneakyThrows
+    protected void configure() {
+        if (configuration.getSolrSchema() != null && configuration.getSolrConfiguration() == null) {
+            throw new IllegalStateException("Solr needs to have a configuration if you want to use a schema");
+        }
+        // Generate Command Builder
+        String command = "solr start -f";
+        // Add Default Ports
+        addExposedPort(SOLR_PORT);
+
+        // Configure Zookeeper
+        if (configuration.isZookeeper()) {
+            addExposedPort(ZOOKEEPER_PORT);
+            if (this.imageVersion.isGreaterThanOrEqualTo("9.7.0")) {
+                command = "-DzkRun --host localhost";
+            } else {
+                command = "-DzkRun -h localhost";
+            }
+        }
+
+        // Apply generated Command
+        setCommand(command);
+    }
+
+    @Override
+    public Set<Integer> getLivenessCheckPortNumbers() {
+        return new HashSet<>(getSolrPort());
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
+
+    @Override
+    @SneakyThrows
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        if (!configuration.isZookeeper()) {
+            ExecResult result = execInContainer("solr", "create", "-c", configuration.getCollectionName());
+            if (result.getExitCode() != 0) {
+                throw new IllegalStateException(
+                    "Unable to create solr core:\nStdout: " + result.getStdout() + "\nStderr:" + result.getStderr()
+                );
+            }
+            return;
+        }
+
+        if (StringUtils.isNotEmpty(configuration.getConfigurationName())) {
+            SolrClientUtils.uploadConfiguration(
+                getHost(),
+                getSolrPort(),
+                configuration.getConfigurationName(),
+                configuration.getSolrConfiguration(),
+                configuration.getSolrSchema()
+            );
+        }
+
+        SolrClientUtils.createCollection(
+            getHost(),
+            getSolrPort(),
+            configuration.getCollectionName(),
+            configuration.getConfigurationName()
+        );
+    }
+}
diff --git a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java b/modules/solr/src/test/java/org/testcontainers/solr/SolrContainerTest.java
similarity index 97%
rename from modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
rename to modules/solr/src/test/java/org/testcontainers/solr/SolrContainerTest.java
index 0e463d11111..f63c4d38164 100644
--- a/modules/solr/src/test/java/org/testcontainers/containers/SolrContainerTest.java
+++ b/modules/solr/src/test/java/org/testcontainers/solr/SolrContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.solr;
 
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -12,7 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolrContainerTest {
+class SolrContainerTest {
 
     private SolrClient client = null;
 

From 16d93e363f2816e34ab827364d4df3565ab2e64f Mon Sep 17 00:00:00 2001
From: Maxime Wiewiora <48218208+maximevw@users.noreply.github.com>
Date: Tue, 14 Oct 2025 18:41:53 +0200
Subject: [PATCH 4677/4969] Fix CassandraContainer wait strategy when SSL is
 configured (#9419)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9410

---------

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 docs/modules/databases/cassandra.md           |   13 +
 .../cassandra/CassandraContainer.java         |   47 +-
 .../cassandra/CassandraDatabaseDelegate.java  |   22 +-
 .../cassandra/CassandraQueryWaitStrategy.java |   13 +-
 modules/cassandra/src/main/resources/cqlshrc  |    7 +
 .../cassandra/CassandraContainerTest.java     |  104 +-
 .../cassandra-ssl-configuration/cassandra.cer |  Bin 0 -> 882 bytes
 .../cassandra.yaml                            | 1233 +++++++++++++++++
 .../cassandra-ssl-configuration/keystore.p12  |  Bin 0 -> 2734 bytes
 .../truststore.p12                            |  Bin 0 -> 1270 bytes
 .../resources/client-ssl/cassandra.cer.pem    |   26 +
 .../resources/client-ssl/cassandra.key.pem    |   32 +
 12 files changed, 1487 insertions(+), 10 deletions(-)
 create mode 100644 modules/cassandra/src/main/resources/cqlshrc
 create mode 100644 modules/cassandra/src/test/resources/cassandra-ssl-configuration/cassandra.cer
 create mode 100644 modules/cassandra/src/test/resources/cassandra-ssl-configuration/cassandra.yaml
 create mode 100644 modules/cassandra/src/test/resources/cassandra-ssl-configuration/keystore.p12
 create mode 100644 modules/cassandra/src/test/resources/cassandra-ssl-configuration/truststore.p12
 create mode 100644 modules/cassandra/src/test/resources/client-ssl/cassandra.cer.pem
 create mode 100644 modules/cassandra/src/test/resources/client-ssl/cassandra.key.pem

diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index 5a062e4a059..80dcb220454 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -20,6 +20,19 @@ This example connects to the Cassandra cluster:
     [Running init script with required authentication](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:init-with-auth
     <!--/codeinclude-->
 
+## Using secure connection (TLS)
+
+If you override the default `cassandra.yaml` with a version setting the property `client_encryption_options.optional` 
+to `false`, you have to provide a valid client certificate and key (PEM format) when you initialize your container:
+
+<!--codeinclude-->
+[SSL setup](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:with-ssl-config
+<!--/codeinclude-->
+
+!!! hint
+    To generate the client certificate and key, please refer to
+    [this documentation](https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/configuration/secureSSLCertificates.html). 
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
index e10488176ac..3fb8554f137 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraContainer.java
@@ -1,6 +1,7 @@
 package org.testcontainers.cassandra;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.ext.ScriptUtils;
 import org.testcontainers.ext.ScriptUtils.ScriptLoadException;
@@ -37,6 +38,10 @@ public class CassandraContainer extends GenericContainer<CassandraContainer> {
 
     private String initScriptPath;
 
+    private String clientCertFile;
+
+    private String clientKeyFile;
+
     public CassandraContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -66,6 +71,15 @@ protected void configure() {
             .ofNullable(configLocation)
             .map(MountableFile::forClasspathResource)
             .ifPresent(mountableFile -> withCopyFileToContainer(mountableFile, CONTAINER_CONFIG_LOCATION));
+
+        // If a secure connection is required by Cassandra configuration, copy the user certificate and key to a
+        // dedicated location and define a cqlshrc file with the appropriate SSL configuration.
+        // See: https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/configuration/secureCqlshSSL.html
+        if (isSslRequired()) {
+            withCopyFileToContainer(MountableFile.forClasspathResource(clientCertFile), "ssl/user_cert.pem");
+            withCopyFileToContainer(MountableFile.forClasspathResource(clientKeyFile), "ssl/user_key.pem");
+            withCopyFileToContainer(MountableFile.forClasspathResource("cqlshrc"), "/root/.cassandra/cqlshrc");
+        }
     }
 
     @Override
@@ -106,9 +120,11 @@ private void runInitScriptIfRequired() {
      * Initialize Cassandra with the custom overridden Cassandra configuration
      * <p>
      * Be aware, that Docker effectively replaces all /etc/cassandra content with the content of config location, so if
-     * Cassandra.yaml in configLocation is absent or corrupted, then Cassandra just won't launch
+     * Cassandra.yaml in configLocation is absent or corrupted, then Cassandra just won't launch.
      *
-     * @param configLocation relative classpath with the directory that contains cassandra.yaml and other configuration files
+     * @param configLocation relative classpath with the directory that contains cassandra.yaml and other configuration
+     *                       files
+     * @return The updated {@link CassandraContainer}.
      */
     public CassandraContainer withConfigurationOverride(String configLocation) {
         this.configLocation = configLocation;
@@ -122,6 +138,7 @@ public CassandraContainer withConfigurationOverride(String configLocation) {
      * </p>
      *
      * @param initScriptPath relative classpath resource
+     * @return The updated {@link CassandraContainer}.
      */
     public CassandraContainer withInitScript(String initScriptPath) {
         this.initScriptPath = initScriptPath;
@@ -129,8 +146,30 @@ public CassandraContainer withInitScript(String initScriptPath) {
     }
 
     /**
-     * Get username
+     * Configure secured connection (TLS) when required by the Cassandra configuration
+     * (i.e. cassandra.yaml file contains the property {@code client_encryption_options.optional} with value
+     * {@code false}).
      *
+     * @param clientCertFile The client certificate required to execute CQL scripts.
+     * @param clientKeyFile  The client key required to execute CQL scripts.
+     * @return The updated {@link CassandraContainer}.
+     */
+    public CassandraContainer withSsl(String clientCertFile, String clientKeyFile) {
+        this.clientCertFile = clientCertFile;
+        this.clientKeyFile = clientKeyFile;
+        return self();
+    }
+
+    /**
+     * @return Whether a secure connection is required between the client and the Cassandra server.
+     */
+    boolean isSslRequired() {
+        return StringUtils.isNoneBlank(this.clientCertFile, this.clientKeyFile);
+    }
+
+    /**
+     * Get username
+     * <p>
      * By default, Cassandra has authenticator: AllowAllAuthenticator in cassandra.yaml
      * If username and password need to be used, then authenticator should be set as PasswordAuthenticator
      * (through custom Cassandra configuration) and through CQL with default cassandra-cassandra credentials
@@ -142,7 +181,7 @@ public String getUsername() {
 
     /**
      * Get password
-     *
+     * <p>
      * By default, Cassandra has authenticator: AllowAllAuthenticator in cassandra.yaml
      * If username and password need to be used, then authenticator should be set as PasswordAuthenticator
      * (through custom Cassandra configuration) and through CQL with default cassandra-cassandra credentials
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
index 6965b3a1df8..4867b8423e9 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
@@ -28,13 +28,13 @@ protected Void createNewConnection() {
         return null;
     }
 
-    @Override
     public void execute(
         String statement,
         String scriptPath,
         int lineNumber,
         boolean continueOnError,
-        boolean ignoreFailedDrops
+        boolean ignoreFailedDrops,
+        boolean silentErrorLogs
     ) {
         try {
             // Use cqlsh command directly inside the container to execute statements
@@ -45,6 +45,9 @@ public void execute(
                 CassandraContainer cassandraContainer = (CassandraContainer) this.container;
                 String username = cassandraContainer.getUsername();
                 String password = cassandraContainer.getPassword();
+                if (cassandraContainer.isSslRequired()) {
+                    cqlshCommand = ArrayUtils.add(cqlshCommand, "--ssl");
+                }
                 cqlshCommand = ArrayUtils.addAll(cqlshCommand, "-u", username, "-p", password);
             }
 
@@ -67,7 +70,9 @@ public void execute(
                     log.info("CQL statement {} was applied", statement);
                 }
             } else {
-                log.error("CQL script execution failed with error: \n{}", result.getStderr());
+                if (!silentErrorLogs) {
+                    log.error("CQL script execution failed with error: \n{}", result.getStderr());
+                }
                 throw new ScriptStatementFailedException(statement, lineNumber, scriptPath);
             }
         } catch (IOException | InterruptedException e) {
@@ -75,6 +80,17 @@ public void execute(
         }
     }
 
+    @Override
+    public void execute(
+        String statement,
+        String scriptPath,
+        int lineNumber,
+        boolean continueOnError,
+        boolean ignoreFailedDrops
+    ) {
+        this.execute(statement, scriptPath, lineNumber, continueOnError, ignoreFailedDrops, false);
+    }
+
     @Override
     protected void closeConnectionQuietly(Void session) {
         // Nothing to do here, because we run scripts using cqlsh command directly in the container.
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
index d42f9f7c324..19fdcd7f9e1 100644
--- a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraQueryWaitStrategy.java
@@ -1,5 +1,7 @@
 package org.testcontainers.cassandra;
 
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
@@ -12,6 +14,7 @@
 /**
  * Waits until Cassandra returns its version
  */
+@Slf4j
 public class CassandraQueryWaitStrategy extends AbstractWaitStrategy {
 
     private static final String SELECT_VERSION_QUERY = "SELECT release_version FROM system.local";
@@ -29,7 +32,15 @@ protected void waitUntilReady() {
                     getRateLimiter()
                         .doWhenReady(() -> {
                             try (DatabaseDelegate databaseDelegate = getDatabaseDelegate()) {
-                                databaseDelegate.execute(SELECT_VERSION_QUERY, "", 1, false, false);
+                                log.info("Checking connection is ready...");
+                                ((CassandraDatabaseDelegate) databaseDelegate).execute(
+                                        SELECT_VERSION_QUERY,
+                                        StringUtils.EMPTY,
+                                        1,
+                                        false,
+                                        false,
+                                        true
+                                    );
                             }
                         });
                     return true;
diff --git a/modules/cassandra/src/main/resources/cqlshrc b/modules/cassandra/src/main/resources/cqlshrc
new file mode 100644
index 00000000000..02e001098af
--- /dev/null
+++ b/modules/cassandra/src/main/resources/cqlshrc
@@ -0,0 +1,7 @@
+[ssl]
+certfile = ssl/user_cert.pem
+usercert = ssl/user_cert.pem
+userkey = ssl/user_key.pem
+
+[connection]
+factory = cqlshlib.ssl.ssl_transport_factory
\ No newline at end of file
diff --git a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
index c4368dc8065..49243317a40 100644
--- a/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
+++ b/modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java
@@ -1,18 +1,30 @@
 package org.testcontainers.cassandra;
 
 import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.CqlSessionBuilder;
+import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
+import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBuilder;
+import com.datastax.oss.driver.api.core.context.DriverContext;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.session.ProgrammaticArguments;
+import com.datastax.oss.driver.internal.core.context.DefaultDriverContext;
+import com.datastax.oss.driver.internal.core.ssl.DefaultSslEngineFactory;
 import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.Container;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.utility.DockerImageName;
 
+import java.net.URL;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
 
 class CassandraContainerTest {
 
-    private static final String CASSANDRA_IMAGE = "cassandra:3.11.2";
+    private static final String CASSANDRA_IMAGE = "cassandra:3.11.15";
 
     private static final String TEST_CLUSTER_NAME_IN_CONF = "Test Cluster Integration Test";
 
@@ -21,7 +33,7 @@ class CassandraContainerTest {
     @Test
     void testSimple() {
         try ( // container-definition {
-            CassandraContainer cassandraContainer = new CassandraContainer("cassandra:3.11.2")
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
             // }
         ) {
             cassandraContainer.start();
@@ -61,6 +73,69 @@ void testConfigurationOverride() {
         }
     }
 
+    @Test
+    public void testWithSslClientConfig() {
+        /*
+        Commands executed to generate certificates in 'cassandra-ssl-configuration' directory:
+        keytool -genkey -keyalg RSA -validity 36500 -alias localhost -keystore keystore.p12 -storepass cassandra \
+            -keypass cassandra -dname "CN=localhost, OU=Testcontainers, O=Testcontainers, L=None, C=None"
+        keytool -export -alias localhost -file cassandra.cer -keystore keystore.p12
+        keytool -import -v -trustcacerts -alias localhost -file cassandra.cer -keystore truststore.p12
+
+        Commands executed to generate the client certificate and key in 'client-ssl' directory:
+        keytool -importkeystore -srckeystore keystore.p12 -destkeystore test_node.p12 -deststoretype PKCS12 \
+            -srcstorepass cassandra -deststorepass cassandra
+        openssl pkcs12 -in test_node.p12 -nokeys -out cassandra.cer.pem -passin pass:cassandra
+        openssl pkcs12 -in test_node.p12 -nodes -nocerts -out cassandra.key.pem -passin pass:cassandra
+
+        Reference:
+        https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/configuration/secureSSLCertificates.html
+        https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/configuration/secureCqlshSSL.html
+        */
+        try (
+            // with-ssl-config {
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withConfigurationOverride("cassandra-ssl-configuration")
+                .withSsl("client-ssl/cassandra.cer.pem", "client-ssl/cassandra.key.pem")
+            // }
+        ) {
+            cassandraContainer.start();
+            try {
+                ResultSet resultSet = performQueryWithSslClientConfig(
+                    cassandraContainer,
+                    "SELECT cluster_name FROM system.local"
+                );
+                assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+                assertThat(resultSet.one().getString(0))
+                    .as("Cassandra configuration is configured with secured connection")
+                    .isEqualTo(TEST_CLUSTER_NAME_IN_CONF);
+            } catch (Exception e) {
+                fail(e);
+            }
+        }
+    }
+
+    @Test
+    public void testSimpleSslCqlsh() {
+        try (
+            CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
+                .withConfigurationOverride("cassandra-ssl-configuration")
+                .withSsl("client-ssl/cassandra.cer.pem", "client-ssl/cassandra.key.pem")
+        ) {
+            cassandraContainer.start();
+
+            Container.ExecResult execResult = cassandraContainer.execInContainer(
+                "cqlsh",
+                "--ssl",
+                "-e",
+                "SELECT * FROM system_schema.keyspaces;"
+            );
+            assertThat(execResult.getStdout()).contains("keyspace_name");
+        } catch (Exception e) {
+            fail(e);
+        }
+    }
+
     @Test
     void testEmptyConfigurationOverride() {
         try (
@@ -164,6 +239,31 @@ private ResultSet performQueryWithAuth(CassandraContainer cassandraContainer, St
         return performQuery(cqlSession, cql);
     }
 
+    private ResultSet performQueryWithSslClientConfig(CassandraContainer cassandraContainer, String cql) {
+        final ProgrammaticDriverConfigLoaderBuilder driverConfigLoaderBuilder = DriverConfigLoader.programmaticBuilder();
+        driverConfigLoaderBuilder.withBoolean(DefaultDriverOption.SSL_HOSTNAME_VALIDATION, false);
+        final URL trustStoreUrl =
+            this.getClass().getClassLoader().getResource("cassandra-ssl-configuration/truststore.p12");
+        driverConfigLoaderBuilder.withString(DefaultDriverOption.SSL_TRUSTSTORE_PATH, trustStoreUrl.getFile());
+        driverConfigLoaderBuilder.withString(DefaultDriverOption.SSL_TRUSTSTORE_PASSWORD, "cassandra");
+        final URL keyStoreUrl =
+            this.getClass().getClassLoader().getResource("cassandra-ssl-configuration/keystore.p12");
+        driverConfigLoaderBuilder.withString(DefaultDriverOption.SSL_KEYSTORE_PATH, keyStoreUrl.getFile());
+        driverConfigLoaderBuilder.withString(DefaultDriverOption.SSL_KEYSTORE_PASSWORD, "cassandra");
+        final DriverContext driverContext = new DefaultDriverContext(
+            driverConfigLoaderBuilder.build(),
+            ProgrammaticArguments.builder().build()
+        );
+
+        final CqlSessionBuilder sessionBuilder = CqlSession.builder();
+        final CqlSession cqlSession = sessionBuilder
+            .addContactPoint(cassandraContainer.getContactPoint())
+            .withLocalDatacenter(cassandraContainer.getLocalDatacenter())
+            .withSslEngineFactory(new DefaultSslEngineFactory(driverContext))
+            .build();
+        return performQuery(cqlSession, cql);
+    }
+
     private ResultSet performQuery(CqlSession session, String cql) {
         final ResultSet rs = session.execute(cql);
         session.close();
diff --git a/modules/cassandra/src/test/resources/cassandra-ssl-configuration/cassandra.cer b/modules/cassandra/src/test/resources/cassandra-ssl-configuration/cassandra.cer
new file mode 100644
index 0000000000000000000000000000000000000000..7a6aee6dec4a01edb55ca6fb70237635a438d91a
GIT binary patch
literal 882
zcmXqLV$L&YVhUTp%*4pV#L2K=s*+ZoyzhSlUN%mxHjlRNyo`+8tPBPzhP(#cY|No7
zY{D#l`FW`@E<2PfZXgPh<r3x#Ni8l(&d)1J%*;zIDmH{laAQaa83=%MFbi|$<R>TQ
zWaJl@7$}JI8krax7+M;dm>3yYL`m=)85)@wSQ?o^1?c3CCPpRX0AOTgU~XdMXE11D
z<YH=KWMtSSvrg*FH8#e76YEz6-1zx0ApO!Gj}uI@>N{rf)CX=_rOx#7Ih)?X{PWB$
z1#1`jPtu(KM1kd&m!ssNyuUo3mb;%!3kYA9$*dZ6Y^m6d^D}!NXk9mpm{G&9)!ioF
z*EZM6qIr^kifs6sXT_rV*SAetx7NW)w=N>p-rQN_`Ie=<(^+fRY&~KXD3YQ*?cIs*
z-EAeWHIAQ-aP87qbIBon`LD3ItS*t~ywbGKYppVRwQ^bB#^PU2A)$JU8Td@(-!47f
z?O<Qi5xQ<|)T~vDm?lMcnS9atXT$ep4=)RM&!r{KaqkT@eP&j#37({&ax%Oo(YVq$
zM0wr@nKY3SzrCV{t$QajF*7nSE><*<H;@I!p)4PZ7>meleFguHCP$M@bGs{ttlK7E
z&`)zg4n$xo0tO-@!;awJZgx+C?&ZI}Huo0OTISD3*_u~z$#c!Sw|)DujSl<o>`N}T
z6RlbJod1)7g0}6^j2GYM-xE|mc)oz|iH714+e)$Agx<h;k}5m&g;OO>HIf#5+3_RY
z>`nE?c<sA0dEFEgV-|9MQ>k$H;HT#CF()yPGvmw+%OoDV6`OXf?OgJ+{%qs*yAD+{
zJLaA|v}$8z&zIRLAx1JE1$sAsGts_dp={=+y-etHX6Q5PW{v%(AMY5)aUWn_bl+bp
zZS(D}r!MA`qBTF}acwRwY(I8q;)QLdlb_i==bCc+(BBKT8h2+$8AzV`5naacck|NS
c3F}W?-1xU_$DfG-e@;60b(zih^q{y3005Xxi~s-t

literal 0
HcmV?d00001

diff --git a/modules/cassandra/src/test/resources/cassandra-ssl-configuration/cassandra.yaml b/modules/cassandra/src/test/resources/cassandra-ssl-configuration/cassandra.yaml
new file mode 100644
index 00000000000..116ba3429cf
--- /dev/null
+++ b/modules/cassandra/src/test/resources/cassandra-ssl-configuration/cassandra.yaml
@@ -0,0 +1,1233 @@
+# Cassandra storage config YAML
+
+# NOTE:
+#   See http://wiki.apache.org/cassandra/StorageConfiguration for
+#   full explanations of configuration directives
+# /NOTE
+
+# The name of the cluster. This is mainly used to prevent machines in
+# one logical cluster from joining another.
+cluster_name: 'Test Cluster Integration Test'
+
+# This defines the number of tokens randomly assigned to this node on the ring
+# The more tokens, relative to other nodes, the larger the proportion of data
+# that this node will store. You probably want all nodes to have the same number
+# of tokens assuming they have equal hardware capability.
+#
+# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility,
+# and will use the initial_token as described below.
+#
+# Specifying initial_token will override this setting on the node's initial start,
+# on subsequent starts, this setting will apply even if initial token is set.
+#
+# If you already have a cluster with 1 token per node, and wish to migrate to
+# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations
+num_tokens: 256
+
+# Triggers automatic allocation of num_tokens tokens for this node. The allocation
+# algorithm attempts to choose tokens in a way that optimizes replicated load over
+# the nodes in the datacenter for the replication strategy used by the specified
+# keyspace.
+#
+# The load assigned to each node will be close to proportional to its number of
+# vnodes.
+#
+# Only supported with the Murmur3Partitioner.
+# allocate_tokens_for_keyspace: KEYSPACE
+
+# initial_token allows you to specify tokens manually.  While you can use it with
+# vnodes (num_tokens > 1, above) -- in which case you should provide a
+# comma-separated list -- it's primarily used when adding nodes to legacy clusters
+# that do not have vnodes enabled.
+# initial_token:
+
+# See http://wiki.apache.org/cassandra/HintedHandoff
+# May either be "true" or "false" to enable globally
+hinted_handoff_enabled: true
+
+# When hinted_handoff_enabled is true, a black list of data centers that will not
+# perform hinted handoff
+# hinted_handoff_disabled_datacenters:
+#    - DC1
+#    - DC2
+
+# this defines the maximum amount of time a dead host will have hints
+# generated.  After it has been dead this long, new hints for it will not be
+# created until it has been seen alive and gone down again.
+max_hint_window_in_ms: 10800000 # 3 hours
+
+# Maximum throttle in KBs per second, per delivery thread.  This will be
+# reduced proportionally to the number of nodes in the cluster.  (If there
+# are two nodes in the cluster, each delivery thread will use the maximum
+# rate; if there are three, each will throttle to half of the maximum,
+# since we expect two nodes to be delivering hints simultaneously.)
+hinted_handoff_throttle_in_kb: 1024
+
+# Number of threads with which to deliver hints;
+# Consider increasing this number when you have multi-dc deployments, since
+# cross-dc handoff tends to be slower
+max_hints_delivery_threads: 2
+
+# Directory where Cassandra should store hints.
+# If not set, the default directory is $CASSANDRA_HOME/data/hints.
+# hints_directory: /var/lib/cassandra/hints
+
+# How often hints should be flushed from the internal buffers to disk.
+# Will *not* trigger fsync.
+hints_flush_period_in_ms: 10000
+
+# Maximum size for a single hints file, in megabytes.
+max_hints_file_size_in_mb: 128
+
+# Compression to apply to the hint files. If omitted, hints files
+# will be written uncompressed. LZ4, Snappy, and Deflate compressors
+# are supported.
+#hints_compression:
+#   - class_name: LZ4Compressor
+#     parameters:
+#         -
+
+# Maximum throttle in KBs per second, total. This will be
+# reduced proportionally to the number of nodes in the cluster.
+batchlog_replay_throttle_in_kb: 1024
+
+# Authentication backend, implementing IAuthenticator; used to identify users
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator,
+# PasswordAuthenticator}.
+#
+# - AllowAllAuthenticator performs no checks - set it to disable authentication.
+# - PasswordAuthenticator relies on username/password pairs to authenticate
+#   users. It keeps usernames and hashed passwords in system_auth.roles table.
+#   Please increase system_auth keyspace replication factor if you use this authenticator.
+#   If using PasswordAuthenticator, CassandraRoleManager must also be used (see below)
+authenticator: AllowAllAuthenticator
+
+# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer,
+# CassandraAuthorizer}.
+#
+# - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
+# - CassandraAuthorizer stores permissions in system_auth.role_permissions table. Please
+#   increase system_auth keyspace replication factor if you use this authorizer.
+authorizer: AllowAllAuthorizer
+
+# Part of the Authentication & Authorization backend, implementing IRoleManager; used
+# to maintain grants and memberships between roles.
+# Out of the box, Cassandra provides org.apache.cassandra.auth.CassandraRoleManager,
+# which stores role information in the system_auth keyspace. Most functions of the
+# IRoleManager require an authenticated login, so unless the configured IAuthenticator
+# actually implements authentication, most of this functionality will be unavailable.
+#
+# - CassandraRoleManager stores role data in the system_auth keyspace. Please
+#   increase system_auth keyspace replication factor if you use this role manager.
+role_manager: CassandraRoleManager
+
+# Validity period for roles cache (fetching granted roles can be an expensive
+# operation depending on the role manager, CassandraRoleManager is one example)
+# Granted roles are cached for authenticated sessions in AuthenticatedUser and
+# after the period specified here, become eligible for (async) reload.
+# Defaults to 2000, set to 0 to disable caching entirely.
+# Will be disabled automatically for AllowAllAuthenticator.
+roles_validity_in_ms: 2000
+
+# Refresh interval for roles cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If roles_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as roles_validity_in_ms.
+# roles_update_interval_in_ms: 2000
+
+# Validity period for permissions cache (fetching permissions can be an
+# expensive operation depending on the authorizer, CassandraAuthorizer is
+# one example). Defaults to 2000, set to 0 to disable.
+# Will be disabled automatically for AllowAllAuthorizer.
+permissions_validity_in_ms: 2000
+
+# Refresh interval for permissions cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If permissions_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as permissions_validity_in_ms.
+# permissions_update_interval_in_ms: 2000
+
+# Validity period for credentials cache. This cache is tightly coupled to
+# the provided PasswordAuthenticator implementation of IAuthenticator. If
+# another IAuthenticator implementation is configured, this cache will not
+# be automatically used and so the following settings will have no effect.
+# Please note, credentials are cached in their encrypted form, so while
+# activating this cache may reduce the number of queries made to the
+# underlying table, it may not  bring a significant reduction in the
+# latency of individual authentication attempts.
+# Defaults to 2000, set to 0 to disable credentials caching.
+credentials_validity_in_ms: 2000
+
+# Refresh interval for credentials cache (if enabled).
+# After this interval, cache entries become eligible for refresh. Upon next
+# access, an async reload is scheduled and the old value returned until it
+# completes. If credentials_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as credentials_validity_in_ms.
+# credentials_update_interval_in_ms: 2000
+
+# The partitioner is responsible for distributing groups of rows (by
+# partition key) across nodes in the cluster.  You should leave this
+# alone for new clusters.  The partitioner can NOT be changed without
+# reloading all data, so when upgrading you should set this to the
+# same partitioner you were already using.
+#
+# Besides Murmur3Partitioner, partitioners included for backwards
+# compatibility include RandomPartitioner, ByteOrderedPartitioner, and
+# OrderPreservingPartitioner.
+#
+partitioner: org.apache.cassandra.dht.Murmur3Partitioner
+
+# Directories where Cassandra should store data on disk.  Cassandra
+# will spread data evenly across them, subject to the granularity of
+# the configured compaction strategy.
+# If not set, the default directory is $CASSANDRA_HOME/data/data.
+data_file_directories:
+    - /var/lib/cassandra/data
+
+# commit log.  when running on magnetic HDD, this should be a
+# separate spindle than the data directories.
+# If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
+commitlog_directory: /var/lib/cassandra/commitlog
+
+# Enable / disable CDC functionality on a per-node basis. This modifies the logic used
+# for write path allocation rejection (standard: never reject. cdc: reject Mutation
+# containing a CDC-enabled table if at space limit in cdc_raw_directory).
+cdc_enabled: false
+
+# CommitLogSegments are moved to this directory on flush if cdc_enabled: true and the
+# segment contains mutations for a CDC-enabled table. This should be placed on a
+# separate spindle than the data directories. If not set, the default directory is
+# $CASSANDRA_HOME/data/cdc_raw.
+# cdc_raw_directory: /var/lib/cassandra/cdc_raw
+
+# Policy for data disk failures:
+#
+# die
+#   shut down gossip and client transports and kill the JVM for any fs errors or
+#   single-sstable errors, so the node can be replaced.
+#
+# stop_paranoid
+#   shut down gossip and client transports even for single-sstable errors,
+#   kill the JVM for errors during startup.
+#
+# stop
+#   shut down gossip and client transports, leaving the node effectively dead, but
+#   can still be inspected via JMX, kill the JVM for errors during startup.
+#
+# best_effort
+#    stop using the failed disk and respond to requests based on
+#    remaining available sstables.  This means you WILL see obsolete
+#    data at CL.ONE!
+#
+# ignore
+#    ignore fatal errors and let requests fail, as in pre-1.2 Cassandra
+disk_failure_policy: stop
+
+# Policy for commit disk failures:
+#
+# die
+#   shut down gossip and Thrift and kill the JVM, so the node can be replaced.
+#
+# stop
+#   shut down gossip and Thrift, leaving the node effectively dead, but
+#   can still be inspected via JMX.
+#
+# stop_commit
+#   shutdown the commit log, letting writes collect but
+#   continuing to service reads, as in pre-2.0.5 Cassandra
+#
+# ignore
+#   ignore fatal errors and let the batches fail
+commit_failure_policy: stop
+
+# Maximum size of the native protocol prepared statement cache
+#
+# Valid values are either "auto" (omitting the value) or a value greater 0.
+#
+# Note that specifying a too large value will result in long running GCs and possbily
+# out-of-memory errors. Keep the value at a small fraction of the heap.
+#
+# If you constantly see "prepared statements discarded in the last minute because
+# cache limit reached" messages, the first step is to investigate the root cause
+# of these messages and check whether prepared statements are used correctly -
+# i.e. use bind markers for variable parts.
+#
+# Do only change the default value, if you really have more prepared statements than
+# fit in the cache. In most cases it is not neccessary to change this value.
+# Constantly re-preparing statements is a performance penalty.
+#
+# Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
+prepared_statements_cache_size_mb:
+
+# Maximum size of the Thrift prepared statement cache
+#
+# If you do not use Thrift at all, it is safe to leave this value at "auto".
+#
+# See description of 'prepared_statements_cache_size_mb' above for more information.
+#
+# Default value ("auto") is 1/256th of the heap or 10MB, whichever is greater
+thrift_prepared_statements_cache_size_mb:
+
+# Maximum size of the key cache in memory.
+#
+# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the
+# minimum, sometimes more. The key cache is fairly tiny for the amount of
+# time it saves, so it's worthwhile to use it at large numbers.
+# The row cache saves even more time, but must contain the entire row,
+# so it is extremely space-intensive. It's best to only use the
+# row cache if you have hot rows or static rows.
+#
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache.
+key_cache_size_in_mb:
+
+# Duration in seconds after which Cassandra should
+# save the key cache. Caches are saved to saved_caches_directory as
+# specified in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 14400 or 4 hours.
+key_cache_save_period: 14400
+
+# Number of keys from the key cache to save
+# Disabled by default, meaning all keys are going to be saved
+# key_cache_keys_to_save: 100
+
+# Row cache implementation class name. Available implementations:
+#
+# org.apache.cassandra.cache.OHCProvider
+#   Fully off-heap row cache implementation (default).
+#
+# org.apache.cassandra.cache.SerializingCacheProvider
+#   This is the row cache implementation availabile
+#   in previous releases of Cassandra.
+# row_cache_class_name: org.apache.cassandra.cache.OHCProvider
+
+# Maximum size of the row cache in memory.
+# Please note that OHC cache implementation requires some additional off-heap memory to manage
+# the map structures and some in-flight memory during operations before/after cache entries can be
+# accounted against the cache capacity. This overhead is usually small compared to the whole capacity.
+# Do not specify more memory that the system can afford in the worst usual situation and leave some
+# headroom for OS block level cache. Do never allow your system to swap.
+#
+# Default value is 0, to disable row caching.
+row_cache_size_in_mb: 0
+
+# Duration in seconds after which Cassandra should save the row cache.
+# Caches are saved to saved_caches_directory as specified in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 0 to disable saving the row cache.
+row_cache_save_period: 0
+
+# Number of keys from the row cache to save.
+# Specify 0 (which is the default), meaning all keys are going to be saved
+# row_cache_keys_to_save: 100
+
+# Maximum size of the counter cache in memory.
+#
+# Counter cache helps to reduce counter locks' contention for hot counter cells.
+# In case of RF = 1 a counter cache hit will cause Cassandra to skip the read before
+# write entirely. With RF > 1 a counter cache hit will still help to reduce the duration
+# of the lock hold, helping with hot counter cell updates, but will not allow skipping
+# the read entirely. Only the local (clock, count) tuple of a counter cell is kept
+# in memory, not the whole counter, so it's relatively cheap.
+#
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is empty to make it "auto" (min(2.5% of Heap (in MB), 50MB)). Set to 0 to disable counter cache.
+# NOTE: if you perform counter deletes and rely on low gcgs, you should disable the counter cache.
+counter_cache_size_in_mb:
+
+# Duration in seconds after which Cassandra should
+# save the counter cache (keys only). Caches are saved to saved_caches_directory as
+# specified in this configuration file.
+#
+# Default is 7200 or 2 hours.
+counter_cache_save_period: 7200
+
+# Number of keys from the counter cache to save
+# Disabled by default, meaning all keys are going to be saved
+# counter_cache_keys_to_save: 100
+
+# saved caches
+# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
+saved_caches_directory: /var/lib/cassandra/saved_caches
+
+# commitlog_sync may be either "periodic" or "batch."
+#
+# When in batch mode, Cassandra won't ack writes until the commit log
+# has been fsynced to disk.  It will wait
+# commitlog_sync_batch_window_in_ms milliseconds between fsyncs.
+# This window should be kept short because the writer threads will
+# be unable to do extra work while waiting.  (You may need to increase
+# concurrent_writes for the same reason.)
+#
+# commitlog_sync: batch
+# commitlog_sync_batch_window_in_ms: 2
+#
+# the other option is "periodic" where writes may be acked immediately
+# and the CommitLog is simply synced every commitlog_sync_period_in_ms
+# milliseconds.
+commitlog_sync: periodic
+commitlog_sync_period_in_ms: 10000
+
+# The size of the individual commitlog file segments.  A commitlog
+# segment may be archived, deleted, or recycled once all the data
+# in it (potentially from each columnfamily in the system) has been
+# flushed to sstables.
+#
+# The default size is 32, which is almost always fine, but if you are
+# archiving commitlog segments (see commitlog_archiving.properties),
+# then you probably want a finer granularity of archiving; 8 or 16 MB
+# is reasonable.
+# Max mutation size is also configurable via max_mutation_size_in_kb setting in
+# cassandra.yaml. The default is half the size commitlog_segment_size_in_mb * 1024.
+# This should be positive and less than 2048.
+#
+# NOTE: If max_mutation_size_in_kb is set explicitly then commitlog_segment_size_in_mb must
+# be set to at least twice the size of max_mutation_size_in_kb / 1024
+#
+commitlog_segment_size_in_mb: 32
+
+# Compression to apply to the commit log. If omitted, the commit log
+# will be written uncompressed.  LZ4, Snappy, and Deflate compressors
+# are supported.
+# commitlog_compression:
+#   - class_name: LZ4Compressor
+#     parameters:
+#         -
+
+# any class that implements the SeedProvider interface and has a
+# constructor that takes a Map<String, String> of parameters will do.
+seed_provider:
+    # Addresses of hosts that are deemed contact points.
+    # Cassandra nodes use this list of hosts to find each other and learn
+    # the topology of the ring.  You must change this if you are running
+    # multiple nodes!
+    - class_name: org.apache.cassandra.locator.SimpleSeedProvider
+      parameters:
+          # seeds is actually a comma-delimited list of addresses.
+          # Ex: "<ip1>,<ip2>,<ip3>"
+          - seeds: "172.17.0.2"
+
+# For workloads with more data than can fit in memory, Cassandra's
+# bottleneck will be reads that need to fetch data from
+# disk. "concurrent_reads" should be set to (16 * number_of_drives) in
+# order to allow the operations to enqueue low enough in the stack
+# that the OS and drives can reorder them. Same applies to
+# "concurrent_counter_writes", since counter writes read the current
+# values before incrementing and writing them back.
+#
+# On the other hand, since writes are almost never IO bound, the ideal
+# number of "concurrent_writes" is dependent on the number of cores in
+# your system; (8 * number_of_cores) is a good rule of thumb.
+concurrent_reads: 32
+concurrent_writes: 32
+concurrent_counter_writes: 32
+
+# For materialized view writes, as there is a read involved, so this should
+# be limited by the less of concurrent reads or concurrent writes.
+concurrent_materialized_view_writes: 32
+
+# Maximum memory to use for sstable chunk cache and buffer pooling.
+# 32MB of this are reserved for pooling buffers, the rest is used as an
+# cache that holds uncompressed sstable chunks.
+# Defaults to the smaller of 1/4 of heap or 512MB. This pool is allocated off-heap,
+# so is in addition to the memory allocated for heap. The cache also has on-heap
+# overhead which is roughly 128 bytes per chunk (i.e. 0.2% of the reserved size
+# if the default 64k chunk size is used).
+# Memory is only allocated when needed.
+# file_cache_size_in_mb: 512
+
+# Flag indicating whether to allocate on or off heap when the sstable buffer
+# pool is exhausted, that is when it has exceeded the maximum memory
+# file_cache_size_in_mb, beyond which it will not cache buffers but allocate on request.
+
+# buffer_pool_use_heap_if_exhausted: true
+
+# The strategy for optimizing disk read
+# Possible values are:
+# ssd (for solid state disks, the default)
+# spinning (for spinning disks)
+# disk_optimization_strategy: ssd
+
+# Total permitted memory to use for memtables. Cassandra will stop
+# accepting writes when the limit is exceeded until a flush completes,
+# and will trigger a flush based on memtable_cleanup_threshold
+# If omitted, Cassandra will set both to 1/4 the size of the heap.
+# memtable_heap_space_in_mb: 2048
+# memtable_offheap_space_in_mb: 2048
+
+# memtable_cleanup_threshold is deprecated. The default calculation
+# is the only reasonable choice. See the comments on  memtable_flush_writers
+# for more information.
+#
+# Ratio of occupied non-flushing memtable size to total permitted size
+# that will trigger a flush of the largest memtable. Larger mct will
+# mean larger flushes and hence less compaction, but also less concurrent
+# flush activity which can make it difficult to keep your disks fed
+# under heavy write load.
+#
+# memtable_cleanup_threshold defaults to 1 / (memtable_flush_writers + 1)
+# memtable_cleanup_threshold: 0.11
+
+# Specify the way Cassandra allocates and manages memtable memory.
+# Options are:
+#
+# heap_buffers
+#   on heap nio buffers
+#
+# offheap_buffers
+#   off heap (direct) nio buffers
+#
+# offheap_objects
+#    off heap objects
+memtable_allocation_type: heap_buffers
+
+# Total space to use for commit logs on disk.
+#
+# If space gets above this value, Cassandra will flush every dirty CF
+# in the oldest segment and remove it.  So a small total commitlog space
+# will tend to cause more flush activity on less-active columnfamilies.
+#
+# The default value is the smaller of 8192, and 1/4 of the total space
+# of the commitlog volume.
+#
+# commitlog_total_space_in_mb: 8192
+
+# This sets the number of memtable flush writer threads per disk
+# as well as the total number of memtables that can be flushed concurrently.
+# These are generally a combination of compute and IO bound.
+#
+# Memtable flushing is more CPU efficient than memtable ingest and a single thread
+# can keep up with the ingest rate of a whole server on a single fast disk
+# until it temporarily becomes IO bound under contention typically with compaction.
+# At that point you need multiple flush threads. At some point in the future
+# it may become CPU bound all the time.
+#
+# You can tell if flushing is falling behind using the MemtablePool.BlockedOnAllocation
+# metric which should be 0, but will be non-zero if threads are blocked waiting on flushing
+# to free memory.
+#
+# memtable_flush_writers defaults to two for a single data directory.
+# This means that two  memtables can be flushed concurrently to the single data directory.
+# If you have multiple data directories the default is one memtable flushing at a time
+# but the flush will use a thread per data directory so you will get two or more writers.
+#
+# Two is generally enough to flush on a fast disk [array] mounted as a single data directory.
+# Adding more flush writers will result in smaller more frequent flushes that introduce more
+# compaction overhead.
+#
+# There is a direct tradeoff between number of memtables that can be flushed concurrently
+# and flush size and frequency. More is not better you just need enough flush writers
+# to never stall waiting for flushing to free memory.
+#
+#memtable_flush_writers: 2
+
+# Total space to use for change-data-capture logs on disk.
+#
+# If space gets above this value, Cassandra will throw WriteTimeoutException
+# on Mutations including tables with CDC enabled. A CDCCompactor is responsible
+# for parsing the raw CDC logs and deleting them when parsing is completed.
+#
+# The default value is the min of 4096 mb and 1/8th of the total space
+# of the drive where cdc_raw_directory resides.
+# cdc_total_space_in_mb: 4096
+
+# When we hit our cdc_raw limit and the CDCCompactor is either running behind
+# or experiencing backpressure, we check at the following interval to see if any
+# new space for cdc-tracked tables has been made available. Default to 250ms
+# cdc_free_space_check_interval_ms: 250
+
+# A fixed memory pool size in MB for for SSTable index summaries. If left
+# empty, this will default to 5% of the heap size. If the memory usage of
+# all index summaries exceeds this limit, SSTables with low read rates will
+# shrink their index summaries in order to meet this limit.  However, this
+# is a best-effort process. In extreme conditions Cassandra may need to use
+# more than this amount of memory.
+index_summary_capacity_in_mb:
+
+# How frequently index summaries should be resampled.  This is done
+# periodically to redistribute memory from the fixed-size pool to sstables
+# proportional their recent read rates.  Setting to -1 will disable this
+# process, leaving existing index summaries at their current sampling level.
+index_summary_resize_interval_in_minutes: 60
+
+# Whether to, when doing sequential writing, fsync() at intervals in
+# order to force the operating system to flush the dirty
+# buffers. Enable this to avoid sudden dirty buffer flushing from
+# impacting read latencies. Almost always a good idea on SSDs; not
+# necessarily on platters.
+trickle_fsync: false
+trickle_fsync_interval_in_kb: 10240
+
+# TCP port, for commands and data
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+storage_port: 7000
+
+# SSL port, for encrypted communication.  Unused unless enabled in
+# encryption_options
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+ssl_storage_port: 7001
+
+# Address or interface to bind to and tell other Cassandra nodes to connect to.
+# You _must_ change this if you want multiple nodes to be able to communicate!
+#
+# Set listen_address OR listen_interface, not both.
+#
+# Leaving it blank leaves it up to InetAddress.getLocalHost(). This
+# will always do the Right Thing _if_ the node is properly configured
+# (hostname, name resolution, etc), and the Right Thing is to use the
+# address associated with the hostname (it might not be).
+#
+# Setting listen_address to 0.0.0.0 is always wrong.
+#
+listen_address: 172.17.0.2
+
+# Set listen_address OR listen_interface, not both. Interfaces must correspond
+# to a single address, IP aliasing is not supported.
+# listen_interface: eth0
+
+# If you choose to specify the interface by name and the interface has an ipv4 and an ipv6 address
+# you can specify which should be chosen using listen_interface_prefer_ipv6. If false the first ipv4
+# address will be used. If true the first ipv6 address will be used. Defaults to false preferring
+# ipv4. If there is only one address it will be selected regardless of ipv4/ipv6.
+# listen_interface_prefer_ipv6: false
+
+# Address to broadcast to other Cassandra nodes
+# Leaving this blank will set it to the same value as listen_address
+broadcast_address: 172.17.0.2
+
+# When using multiple physical network interfaces, set this
+# to true to listen on broadcast_address in addition to
+# the listen_address, allowing nodes to communicate in both
+# interfaces.
+# Ignore this property if the network configuration automatically
+# routes  between the public and private networks such as EC2.
+# listen_on_broadcast_address: false
+
+# Internode authentication backend, implementing IInternodeAuthenticator;
+# used to allow/disallow connections from peer nodes.
+# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator
+
+# Whether to start the native transport server.
+# Please note that the address on which the native transport is bound is the
+# same as the rpc_address. The port however is different and specified below.
+start_native_transport: true
+# port for the CQL native transport to listen for clients on
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+native_transport_port: 9042
+# Enabling native transport encryption in client_encryption_options allows you to either use
+# encryption for the standard port or to use a dedicated, additional port along with the unencrypted
+# standard native_transport_port.
+# Enabling client encryption and keeping native_transport_port_ssl disabled will use encryption
+# for native_transport_port. Setting native_transport_port_ssl to a different value
+# from native_transport_port will use encryption for native_transport_port_ssl while
+# keeping native_transport_port unencrypted.
+# native_transport_port_ssl: 9142
+# The maximum threads for handling requests when the native transport is used.
+# This is similar to rpc_max_threads though the default differs slightly (and
+# there is no native_transport_min_threads, idle threads will always be stopped
+# after 30 seconds).
+# native_transport_max_threads: 128
+#
+# The maximum size of allowed frame. Frame (requests) larger than this will
+# be rejected as invalid. The default is 256MB. If you're changing this parameter,
+# you may want to adjust max_value_size_in_mb accordingly. This should be positive and less than 2048.
+# native_transport_max_frame_size_in_mb: 256
+
+# The maximum number of concurrent client connections.
+# The default is -1, which means unlimited.
+# native_transport_max_concurrent_connections: -1
+
+# The maximum number of concurrent client connections per source ip.
+# The default is -1, which means unlimited.
+# native_transport_max_concurrent_connections_per_ip: -1
+
+# Whether to start the thrift rpc server.
+start_rpc: false
+
+# The address or interface to bind the Thrift RPC service and native transport
+# server to.
+#
+# Set rpc_address OR rpc_interface, not both.
+#
+# Leaving rpc_address blank has the same effect as on listen_address
+# (i.e. it will be based on the configured hostname of the node).
+#
+# Note that unlike listen_address, you can specify 0.0.0.0, but you must also
+# set broadcast_rpc_address to a value other than 0.0.0.0.
+#
+# For security reasons, you should not expose this port to the internet.  Firewall it if needed.
+rpc_address: 0.0.0.0
+
+# Set rpc_address OR rpc_interface, not both. Interfaces must correspond
+# to a single address, IP aliasing is not supported.
+# rpc_interface: eth1
+
+# If you choose to specify the interface by name and the interface has an ipv4 and an ipv6 address
+# you can specify which should be chosen using rpc_interface_prefer_ipv6. If false the first ipv4
+# address will be used. If true the first ipv6 address will be used. Defaults to false preferring
+# ipv4. If there is only one address it will be selected regardless of ipv4/ipv6.
+# rpc_interface_prefer_ipv6: false
+
+# port for Thrift to listen for clients on
+rpc_port: 9160
+
+# RPC address to broadcast to drivers and other Cassandra nodes. This cannot
+# be set to 0.0.0.0. If left blank, this will be set to the value of
+# rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must
+# be set.
+broadcast_rpc_address: 172.17.0.2
+
+# enable or disable keepalive on rpc/native connections
+rpc_keepalive: true
+
+# Cassandra provides two out-of-the-box options for the RPC Server:
+#
+# sync
+#   One thread per thrift connection. For a very large number of clients, memory
+#   will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size
+#   per thread, and that will correspond to your use of virtual memory (but physical memory
+#   may be limited depending on use of stack space).
+#
+# hsha
+#   Stands for "half synchronous, half asynchronous." All thrift clients are handled
+#   asynchronously using a small number of threads that does not vary with the amount
+#   of thrift clients (and thus scales well to many clients). The rpc requests are still
+#   synchronous (one thread per active request). If hsha is selected then it is essential
+#   that rpc_max_threads is changed from the default value of unlimited.
+#
+# The default is sync because on Windows hsha is about 30% slower.  On Linux,
+# sync/hsha performance is about the same, with hsha of course using less memory.
+#
+# Alternatively,  can provide your own RPC server by providing the fully-qualified class name
+# of an o.a.c.t.TServerFactory that can create an instance of it.
+rpc_server_type: sync
+
+# Uncomment rpc_min|max_thread to set request pool size limits.
+#
+# Regardless of your choice of RPC server (see above), the number of maximum requests in the
+# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync
+# RPC server, it also dictates the number of clients that can be connected at all).
+#
+# The default is unlimited and thus provides no protection against clients overwhelming the server. You are
+# encouraged to set a maximum that makes sense for you in production, but do keep in mind that
+# rpc_max_threads represents the maximum number of client requests this server may execute concurrently.
+#
+# rpc_min_threads: 16
+# rpc_max_threads: 2048
+
+# uncomment to set socket buffer sizes on rpc connections
+# rpc_send_buff_size_in_bytes:
+# rpc_recv_buff_size_in_bytes:
+
+# Uncomment to set socket buffer size for internode communication
+# Note that when setting this, the buffer size is limited by net.core.wmem_max
+# and when not setting it it is defined by net.ipv4.tcp_wmem
+# See also:
+# /proc/sys/net/core/wmem_max
+# /proc/sys/net/core/rmem_max
+# /proc/sys/net/ipv4/tcp_wmem
+# /proc/sys/net/ipv4/tcp_wmem
+# and 'man tcp'
+# internode_send_buff_size_in_bytes:
+
+# Uncomment to set socket buffer size for internode communication
+# Note that when setting this, the buffer size is limited by net.core.wmem_max
+# and when not setting it it is defined by net.ipv4.tcp_wmem
+# internode_recv_buff_size_in_bytes:
+
+# Frame size for thrift (maximum message length).
+thrift_framed_transport_size_in_mb: 15
+
+# Set to true to have Cassandra create a hard link to each sstable
+# flushed or streamed locally in a backups/ subdirectory of the
+# keyspace data.  Removing these links is the operator's
+# responsibility.
+incremental_backups: false
+
+# Whether or not to take a snapshot before each compaction.  Be
+# careful using this option, since Cassandra won't clean up the
+# snapshots for you.  Mostly useful if you're paranoid when there
+# is a data format change.
+snapshot_before_compaction: false
+
+# Whether or not a snapshot is taken of the data before keyspace truncation
+# or dropping of column families. The STRONGLY advised default of true
+# should be used to provide data safety. If you set this flag to false, you will
+# lose data on truncation or drop.
+auto_snapshot: true
+
+# Granularity of the collation index of rows within a partition.
+# Increase if your rows are large, or if you have a very large
+# number of rows per partition.  The competing goals are these:
+#
+# - a smaller granularity means more index entries are generated
+#   and looking up rows withing the partition by collation column
+#   is faster
+# - but, Cassandra will keep the collation index in memory for hot
+#   rows (as part of the key cache), so a larger granularity means
+#   you can cache more hot rows
+column_index_size_in_kb: 64
+
+# Per sstable indexed key cache entries (the collation index in memory
+# mentioned above) exceeding this size will not be held on heap.
+# This means that only partition information is held on heap and the
+# index entries are read from disk.
+#
+# Note that this size refers to the size of the
+# serialized index information and not the size of the partition.
+column_index_cache_size_in_kb: 2
+
+# Number of simultaneous compactions to allow, NOT including
+# validation "compactions" for anti-entropy repair.  Simultaneous
+# compactions can help preserve read performance in a mixed read/write
+# workload, by mitigating the tendency of small sstables to accumulate
+# during a single long running compactions. The default is usually
+# fine and if you experience problems with compaction running too
+# slowly or too fast, you should look at
+# compaction_throughput_mb_per_sec first.
+#
+# concurrent_compactors defaults to the smaller of (number of disks,
+# number of cores), with a minimum of 2 and a maximum of 8.
+#
+# If your data directories are backed by SSD, you should increase this
+# to the number of cores.
+#concurrent_compactors: 1
+
+# Throttles compaction to the given total throughput across the entire
+# system. The faster you insert data, the faster you need to compact in
+# order to keep the sstable count down, but in general, setting this to
+# 16 to 32 times the rate you are inserting data is more than sufficient.
+# Setting this to 0 disables throttling. Note that this account for all types
+# of compaction, including validation compaction.
+compaction_throughput_mb_per_sec: 16
+
+# When compacting, the replacement sstable(s) can be opened before they
+# are completely written, and used in place of the prior sstables for
+# any range that has been written. This helps to smoothly transfer reads
+# between the sstables, reducing page cache churn and keeping hot rows hot
+sstable_preemptive_open_interval_in_mb: 50
+
+# Throttles all outbound streaming file transfers on this node to the
+# given total throughput in Mbps. This is necessary because Cassandra does
+# mostly sequential IO when streaming data during bootstrap or repair, which
+# can lead to saturating the network connection and degrading rpc performance.
+# When unset, the default is 200 Mbps or 25 MB/s.
+# stream_throughput_outbound_megabits_per_sec: 200
+
+# Throttles all streaming file transfer between the datacenters,
+# this setting allows users to throttle inter dc stream throughput in addition
+# to throttling all network stream traffic as configured with
+# stream_throughput_outbound_megabits_per_sec
+# When unset, the default is 200 Mbps or 25 MB/s
+# inter_dc_stream_throughput_outbound_megabits_per_sec: 200
+
+# How long the coordinator should wait for read operations to complete
+read_request_timeout_in_ms: 5000
+# How long the coordinator should wait for seq or index scans to complete
+range_request_timeout_in_ms: 10000
+# How long the coordinator should wait for writes to complete
+write_request_timeout_in_ms: 2000
+# How long the coordinator should wait for counter writes to complete
+counter_write_request_timeout_in_ms: 5000
+# How long a coordinator should continue to retry a CAS operation
+# that contends with other proposals for the same row
+cas_contention_timeout_in_ms: 1000
+# How long the coordinator should wait for truncates to complete
+# (This can be much longer, because unless auto_snapshot is disabled
+# we need to flush first so we can snapshot before removing the data.)
+truncate_request_timeout_in_ms: 60000
+# The default timeout for other, miscellaneous operations
+request_timeout_in_ms: 10000
+
+# How long before a node logs slow queries. Select queries that take longer than
+# this timeout to execute, will generate an aggregated log message, so that slow queries
+# can be identified. Set this value to zero to disable slow query logging.
+slow_query_log_timeout_in_ms: 500
+
+# Enable operation timeout information exchange between nodes to accurately
+# measure request timeouts.  If disabled, replicas will assume that requests
+# were forwarded to them instantly by the coordinator, which means that
+# under overload conditions we will waste that much extra time processing
+# already-timed-out requests.
+#
+# Warning: before enabling this property make sure to ntp is installed
+# and the times are synchronized between the nodes.
+cross_node_timeout: false
+
+# Set keep-alive period for streaming
+# This node will send a keep-alive message periodically with this period.
+# If the node does not receive a keep-alive message from the peer for
+# 2 keep-alive cycles the stream session times out and fail
+# Default value is 300s (5 minutes), which means stalled stream
+# times out in 10 minutes by default
+# streaming_keep_alive_period_in_secs: 300
+
+# phi value that must be reached for a host to be marked down.
+# most users should never need to adjust this.
+# phi_convict_threshold: 8
+
+# endpoint_snitch -- Set this to a class that implements
+# IEndpointSnitch.  The snitch has two functions:
+#
+# - it teaches Cassandra enough about your network topology to route
+#   requests efficiently
+# - it allows Cassandra to spread replicas around your cluster to avoid
+#   correlated failures. It does this by grouping machines into
+#   "datacenters" and "racks."  Cassandra will do its best not to have
+#   more than one replica on the same "rack" (which may not actually
+#   be a physical location)
+#
+# CASSANDRA WILL NOT ALLOW YOU TO SWITCH TO AN INCOMPATIBLE SNITCH
+# ONCE DATA IS INSERTED INTO THE CLUSTER.  This would cause data loss.
+# This means that if you start with the default SimpleSnitch, which
+# locates every node on "rack1" in "datacenter1", your only options
+# if you need to add another datacenter are GossipingPropertyFileSnitch
+# (and the older PFS).  From there, if you want to migrate to an
+# incompatible snitch like Ec2Snitch you can do it by adding new nodes
+# under Ec2Snitch (which will locate them in a new "datacenter") and
+# decommissioning the old ones.
+#
+# Out of the box, Cassandra provides:
+#
+# SimpleSnitch:
+#    Treats Strategy order as proximity. This can improve cache
+#    locality when disabling read repair.  Only appropriate for
+#    single-datacenter deployments.
+#
+# GossipingPropertyFileSnitch
+#    This should be your go-to snitch for production use.  The rack
+#    and datacenter for the local node are defined in
+#    cassandra-rackdc.properties and propagated to other nodes via
+#    gossip.  If cassandra-topology.properties exists, it is used as a
+#    fallback, allowing migration from the PropertyFileSnitch.
+#
+# PropertyFileSnitch:
+#    Proximity is determined by rack and data center, which are
+#    explicitly configured in cassandra-topology.properties.
+#
+# Ec2Snitch:
+#    Appropriate for EC2 deployments in a single Region. Loads Region
+#    and Availability Zone information from the EC2 API. The Region is
+#    treated as the datacenter, and the Availability Zone as the rack.
+#    Only private IPs are used, so this will not work across multiple
+#    Regions.
+#
+# Ec2MultiRegionSnitch:
+#    Uses public IPs as broadcast_address to allow cross-region
+#    connectivity.  (Thus, you should set seed addresses to the public
+#    IP as well.) You will need to open the storage_port or
+#    ssl_storage_port on the public IP firewall.  (For intra-Region
+#    traffic, Cassandra will switch to the private IP after
+#    establishing a connection.)
+#
+# RackInferringSnitch:
+#    Proximity is determined by rack and data center, which are
+#    assumed to correspond to the 3rd and 2nd octet of each node's IP
+#    address, respectively.  Unless this happens to match your
+#    deployment conventions, this is best used as an example of
+#    writing a custom Snitch class and is provided in that spirit.
+#
+# You can use a custom Snitch by setting this to the full class name
+# of the snitch, which will be assumed to be on your classpath.
+endpoint_snitch: SimpleSnitch
+
+# controls how often to perform the more expensive part of host score
+# calculation
+dynamic_snitch_update_interval_in_ms: 100
+# controls how often to reset all host scores, allowing a bad host to
+# possibly recover
+dynamic_snitch_reset_interval_in_ms: 600000
+# if set greater than zero and read_repair_chance is < 1.0, this will allow
+# 'pinning' of replicas to hosts in order to increase cache capacity.
+# The badness threshold will control how much worse the pinned host has to be
+# before the dynamic snitch will prefer other replicas over it.  This is
+# expressed as a double which represents a percentage.  Thus, a value of
+# 0.2 means Cassandra would continue to prefer the static snitch values
+# until the pinned host was 20% worse than the fastest.
+dynamic_snitch_badness_threshold: 0.1
+
+# request_scheduler -- Set this to a class that implements
+# RequestScheduler, which will schedule incoming client requests
+# according to the specific policy. This is useful for multi-tenancy
+# with a single Cassandra cluster.
+# NOTE: This is specifically for requests from the client and does
+# not affect inter node communication.
+# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place
+# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of
+# client requests to a node with a separate queue for each
+# request_scheduler_id. The scheduler is further customized by
+# request_scheduler_options as described below.
+request_scheduler: org.apache.cassandra.scheduler.NoScheduler
+
+# Scheduler Options vary based on the type of scheduler
+#
+# NoScheduler
+#   Has no options
+#
+# RoundRobin
+#   throttle_limit
+#     The throttle_limit is the number of in-flight
+#     requests per client.  Requests beyond
+#     that limit are queued up until
+#     running requests can complete.
+#     The value of 80 here is twice the number of
+#     concurrent_reads + concurrent_writes.
+#   default_weight
+#     default_weight is optional and allows for
+#     overriding the default which is 1.
+#   weights
+#     Weights are optional and will default to 1 or the
+#     overridden default_weight. The weight translates into how
+#     many requests are handled during each turn of the
+#     RoundRobin, based on the scheduler id.
+#
+# request_scheduler_options:
+#    throttle_limit: 80
+#    default_weight: 5
+#    weights:
+#      Keyspace1: 1
+#      Keyspace2: 5
+
+# request_scheduler_id -- An identifier based on which to perform
+# the request scheduling. Currently the only valid option is keyspace.
+# request_scheduler_id: keyspace
+
+# Enable or disable inter-node encryption
+# JVM defaults for supported SSL socket protocols and cipher suites can
+# be replaced using custom encryption options. This is not recommended
+# unless you have policies in place that dictate certain settings, or
+# need to disable vulnerable ciphers or protocols in case the JVM cannot
+# be updated.
+# FIPS compliant settings can be configured at JVM level and should not
+# involve changing encryption settings here:
+# https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/FIPS.html
+# *NOTE* No custom encryption options are enabled at the moment
+# The available internode options are : all, none, dc, rack
+#
+# If set to dc cassandra will encrypt the traffic between the DCs
+# If set to rack cassandra will encrypt the traffic between the racks
+#
+# The passwords used in these options must match the passwords used when generating
+# the keystore and truststore.  For instructions on generating these files, see:
+# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
+#
+server_encryption_options:
+    internode_encryption: none
+    keystore: conf/keystore
+    keystore_password: cassandra
+    truststore: conf/.truststore
+    truststore_password: cassandra
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA]
+    # require_client_auth: false
+    # require_endpoint_verification: false
+
+# enable or disable client/server encryption.
+client_encryption_options:
+    enabled: true
+    # If enabled and optional is set to true encrypted and unencrypted connections are handled.
+    optional: false
+    keystore: /etc/cassandra/keystore.p12
+    keystore_password: "cassandra"
+    require_client_auth: true
+    truststore: /etc/cassandra/truststore.p12
+    truststore_password: "cassandra"
+    store_type: PKCS12
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA]
+
+# internode_compression controls whether traffic between nodes is
+# compressed.
+# Can be:
+#
+# all
+#   all traffic is compressed
+#
+# dc
+#   traffic between different datacenters is compressed
+#
+# none
+#   nothing is compressed.
+internode_compression: dc
+
+# Enable or disable tcp_nodelay for inter-dc communication.
+# Disabling it will result in larger (but fewer) network packets being sent,
+# reducing overhead from the TCP protocol itself, at the cost of increasing
+# latency if you block for cross-datacenter responses.
+inter_dc_tcp_nodelay: false
+
+# TTL for different trace types used during logging of the repair process.
+tracetype_query_ttl: 86400
+tracetype_repair_ttl: 604800
+
+# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+# This threshold can be adjusted to minimize logging if necessary
+# gc_log_threshold_in_ms: 200
+
+# If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+# INFO level
+# UDFs (user defined functions) are disabled by default.
+# As of Cassandra 3.0 there is a sandbox in place that should prevent execution of evil code.
+enable_user_defined_functions: false
+
+# Enables scripted UDFs (JavaScript UDFs).
+# Java UDFs are always enabled, if enable_user_defined_functions is true.
+# Enable this option to be able to use UDFs with "language javascript" or any custom JSR-223 provider.
+# This option has no effect, if enable_user_defined_functions is false.
+enable_scripted_user_defined_functions: false
+
+# The default Windows kernel timer and scheduling resolution is 15.6ms for power conservation.
+# Lowering this value on Windows can provide much tighter latency and better throughput, however
+# some virtualized environments may see a negative performance impact from changing this setting
+# below their system default. The sysinternals 'clockres' tool can confirm your system's default
+# setting.
+windows_timer_interval: 1
+
+
+# Enables encrypting data at-rest (on disk). Different key providers can be plugged in, but the default reads from
+# a JCE-style keystore. A single keystore can hold multiple keys, but the one referenced by
+# the "key_alias" is the only key that will be used for encrypt opertaions; previously used keys
+# can still (and should!) be in the keystore and will be used on decrypt operations
+# (to handle the case of key rotation).
+#
+# It is strongly recommended to download and install Java Cryptography Extension (JCE)
+# Unlimited Strength Jurisdiction Policy Files for your version of the JDK.
+# (current link: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html)
+#
+# Currently, only the following file types are supported for transparent data encryption, although
+# more are coming in future cassandra releases: commitlog, hints
+transparent_data_encryption_options:
+    enabled: false
+    chunk_length_kb: 64
+    cipher: AES/CBC/PKCS5Padding
+    key_alias: testing:1
+    # CBC IV length for AES needs to be 16 bytes (which is also the default size)
+    # iv_length: 16
+    key_provider:
+      - class_name: org.apache.cassandra.security.JKSKeyProvider
+        parameters:
+          - keystore: conf/keystore
+            keystore_password: cassandra
+            store_type: JCEKS
+            key_password: cassandra
+
+
+#####################
+# SAFETY THRESHOLDS #
+#####################
+
+# When executing a scan, within or across a partition, we need to keep the
+# tombstones seen in memory so we can return them to the coordinator, which
+# will use them to make sure other replicas also know about the deleted rows.
+# With workloads that generate a lot of tombstones, this can cause performance
+# problems and even exaust the server heap.
+# (http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets)
+# Adjust the thresholds here if you understand the dangers and want to
+# scan more tombstones anyway.  These thresholds may also be adjusted at runtime
+# using the StorageService mbean.
+tombstone_warn_threshold: 1000
+tombstone_failure_threshold: 100000
+
+# Log WARN on any multiple-partition batch size exceeding this value. 5kb per batch by default.
+# Caution should be taken on increasing the size of this threshold as it can lead to node instability.
+batch_size_warn_threshold_in_kb: 5
+
+# Fail any multiple-partition batch exceeding this value. 50kb (10x warn threshold) by default.
+batch_size_fail_threshold_in_kb: 50
+
+# Log WARN on any batches not of type LOGGED than span across more partitions than this limit
+unlogged_batch_across_partitions_warn_threshold: 10
+
+# Log a warning when compacting partitions larger than this value
+compaction_large_partition_warning_threshold_mb: 100
+
+# GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+# Adjust the threshold based on your application throughput requirement
+# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+gc_warn_threshold_in_ms: 1000
+
+# Maximum size of any value in SSTables. Safety measure to detect SSTable corruption
+# early. Any value size larger than this threshold will result into marking an SSTable
+# as corrupted. This should be positive and less than 2048.
+# max_value_size_in_mb: 256
+
+# Back-pressure settings #
+# If enabled, the coordinator will apply the back-pressure strategy specified below to each mutation
+# sent to replicas, with the aim of reducing pressure on overloaded replicas.
+back_pressure_enabled: false
+# The back-pressure strategy applied.
+# The default implementation, RateBasedBackPressure, takes three arguments:
+# high ratio, factor, and flow type, and uses the ratio between incoming mutation responses and outgoing mutation requests.
+# If below high ratio, outgoing mutations are rate limited according to the incoming rate decreased by the given factor;
+# if above high ratio, the rate limiting is increased by the given factor;
+# such factor is usually best configured between 1 and 10, use larger values for a faster recovery
+# at the expense of potentially more dropped mutations;
+# the rate limiting is applied according to the flow type: if FAST, it's rate limited at the speed of the fastest replica,
+# if SLOW at the speed of the slowest one.
+# New strategies can be added. Implementors need to implement org.apache.cassandra.net.BackpressureStrategy and
+# provide a public constructor accepting a Map<String, Object>.
+back_pressure_strategy:
+    - class_name: org.apache.cassandra.net.RateBasedBackPressure
+      parameters:
+        - high_ratio: 0.90
+          factor: 5
+          flow: FAST
+
+# Coalescing Strategies #
+# Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more).
+# On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in
+# virtualized environments, the point at which an application can be bound by network packet processing can be
+# surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal
+# doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process
+# is sufficient for many applications such that no load starvation is experienced even without coalescing.
+# There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages
+# per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
+# trip to read from a socket, and all the task submission work can be done at the same time reducing context switching
+# and increasing cache friendliness of network message processing.
+# See CASSANDRA-8692 for details.
+
+# Strategy to use for coalescing messages in OutboundTcpConnection.
+# Can be fixed, movingaverage, timehorizon, disabled (default).
+# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name.
+# otc_coalescing_strategy: DISABLED
+
+# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first
+# message is received before it will be sent with any accompanying messages. For moving average this is the
+# maximum amount of time that will be waited as well as the interval at which messages must arrive on average
+# for coalescing to be enabled.
+# otc_coalescing_window_us: 200
+
+# Do not try to coalesce messages if we already got that many messages. This should be more than 2 and less than 128.
+# otc_coalescing_enough_coalesced_messages: 8
+
+# How many milliseconds to wait between two expiration runs on the backlog (queue) of the OutboundTcpConnection.
+# Expiration is done if messages are piling up in the backlog. Droppable messages are expired to free the memory
+# taken by expired messages. The interval should be between 0 and 1000, and in most installations the default value
+# will be appropriate. A smaller value could potentially expire messages slightly sooner at the expense of more CPU
+# time and queue contention while iterating the backlog of messages.
+# An interval of 0 disables any wait time, which is the behavior of former Cassandra versions.
+#
+# otc_backlog_expiration_interval_ms: 200
diff --git a/modules/cassandra/src/test/resources/cassandra-ssl-configuration/keystore.p12 b/modules/cassandra/src/test/resources/cassandra-ssl-configuration/keystore.p12
new file mode 100644
index 0000000000000000000000000000000000000000..501e25cf967a409af23fb518a4902a8e4527d02c
GIT binary patch
literal 2734
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
N@Lu}LF8mWY{{U@M@&o_?

literal 0
HcmV?d00001

diff --git a/modules/cassandra/src/test/resources/cassandra-ssl-configuration/truststore.p12 b/modules/cassandra/src/test/resources/cassandra-ssl-configuration/truststore.p12
new file mode 100644
index 0000000000000000000000000000000000000000..57107fc3813d7ca7eec580ae7d7d3b5256e430ad
GIT binary patch
literal 1270
zcmV<S1PS{vf&}sc0Ru3C1e^v5Duzgg_YDCD0ic2ejRb-Oi7<i$g)o8yfd&aGhDe6@
z4FLxRpn?Q)FoFbb0s#Opf&^y<2`Yw2hW8Bt2LUi<1_>&LNQU<f0R;^(Sui*T2`Yw2
zhW8Bt1q?7N1Qb($w_8&yO&^c(dlx<mNGq8x_`L!GClCSwATSID2r7n1hW8Bu2?YQ!
z9R>+thDZTr0|Wso1Q3B0CfnSbhq8cAT_7`AI7fhj1Mqf>@x-Y&HK}-W#-VS1SP<B|
z%bWZX7k54rt#SIpPBNXZj9=L3=S+hY4M3#EF{lGmplUrGpYyA~1RWUYl*JNmuJF;Q
zo2*brt_ACDPY_nmC&#<!e>lc;;bJWFas@9rXBPpSD57GgVNhqi5V6wi=|`b6IGub8
zQCpn7N5s%8Vd8{EIous59YA%lOQQ9%VSPcQ2Wk1sx16;A$oNp4*4xiQwwKdy7})~o
z&D*o@k)dR)xZN_q5}Y@SASuyu7$3~90hQb<VNsuLet7<Q``6wTm=N&&YCNDEipZfq
z616ZE`;7Jllme2x12FKs&DDDnvFFUHx+A#<R;Rw}!rr2$hsSM`Z4F*Kf9a(?P=_)<
z_>k{(L9brmN{02hwaUz213*}4R0zqo%AAl9w65u44j6a$?E&rff)dQy%$#^=L+Crd
z$p@RMbDoSKe3<gd{HNYp5?@KxfoNI?ALWo{=L<AQQMRo7A}d6$^EvM6z-K>)R&E8)
z&?x^Xl5Lz>T*hlGvtIjkBfvNAGI?W<=s`FHW51`E3C*X##%Pubm+NU_oM9>IkFYKW
z4qTsz?df@0jlq#DN?;F}VB9X8nf#BmI*m69V)>z-S3{ekHN(C8)_rUwq$c7S)U*$8
zy!fG_XAk4zLDel&%l`1zeA1;~ZVWRv-8u{WY^=Wnj$I7pBMRqLhjQDT_lc-2sqYIO
z>HlTTfX>Fb+Z;GY0s7R$wIHRouzohU<Q5<@U?VRDUm&?}4S3j=GAg|BBi0-IW(;vE
z{N&Vc^oHqv4o$@T+e-<hbBQUe`!dKKZi$@uA+(aci!W!@&)#(?BSp4!a?7p36nfxw
zT1Ip4H*PikHvjj3PT9EZMI^MkZ@>W<>L}D|yi0Z6kJHcih`)-q(sKM5ji8aNE)6~c
zoM7hRUo92-wZK?K*lWI&mQ`^YTTl9Hm_PJGS0~GD!qwSDQ2Dx9k0k{wMe;30{7pmf
zo~WdF)AE4kK?(;~uw2_!5j>0VsR9m5)p(JMpcqIP8gkTka_-p1dXP#4NqCsNnd=M&
zVKQ*f8Yj}gRPY|o>(-~g89nx;3c?GA)&m^(uGRS>5^K-pQb8y5z{5Qk{@k}4n1<ae
zCDm&icTn1SEH5z0Or)Ukby!~u%CM6Qx{YVQ3hheOM{qYCjY|r^vf?G?a@vCaEDBpX
zqIjgg@1f((%C_!tjP|LMD4ierwNZD<F8YPwVai0=2c3GJKG(h5;P1&@N$DtnuQpqC
zS`4uy$Q2G@janDLDbV11SGVu7Y<!?ImE6XJ_S3D)2N!2hz@|4|+@f_C_9PEz_!u6L
zmjEzLFflL<1_@w>NC9O71OfpC00bZ;XExUh-TPc(ybhH$x*neYf|;Hv;JI9{{iwVZ
ghZN-m6wM1fMvUpU)iFjIf|;%EZ7C2DMgjsS5NM%NaR2}S

literal 0
HcmV?d00001

diff --git a/modules/cassandra/src/test/resources/client-ssl/cassandra.cer.pem b/modules/cassandra/src/test/resources/client-ssl/cassandra.cer.pem
new file mode 100644
index 00000000000..bafaa00317b
--- /dev/null
+++ b/modules/cassandra/src/test/resources/client-ssl/cassandra.cer.pem
@@ -0,0 +1,26 @@
+Bag Attributes
+    friendlyName: localhost
+    localKeyID: 54 69 6D 65 20 31 37 32 39 33 34 38 39 36 38 31 31 39 
+subject=C = None, L = None, O = Testcontainers, OU = Testcontainers, CN = localhost
+issuer=C = None, L = None, O = Testcontainers, OU = Testcontainers, CN = localhost
+-----BEGIN CERTIFICATE-----
+MIIDbjCCAlagAwIBAgIJAKCVIipuH03/MA0GCSqGSIb3DQEBCwUAMGQxDTALBgNV
+BAYTBE5vbmUxDTALBgNVBAcTBE5vbmUxFzAVBgNVBAoTDlRlc3Rjb250YWluZXJz
+MRcwFQYDVQQLEw5UZXN0Y29udGFpbmVyczESMBAGA1UEAxMJbG9jYWxob3N0MCAX
+DTI0MTAxOTE0NDIwOFoYDzIxMjQwOTI1MTQ0MjA4WjBkMQ0wCwYDVQQGEwROb25l
+MQ0wCwYDVQQHEwROb25lMRcwFQYDVQQKEw5UZXN0Y29udGFpbmVyczEXMBUGA1UE
+CxMOVGVzdGNvbnRhaW5lcnMxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALocrhrM1gYB/pF/qlDY+eFQZ9L8SMgCmn+I
+mgx/UbKqJwLp5wYuoW/PA4RwraFPkimf5CAE2kpBGcJu/Qzyp0fJZlBXpmkDJVrG
+pRbYz5mN4CrXNliYfAC1RzxvTT1tOjiDkk9kHVfs5nMVb9e2kq6tQEItflhlPzdD
+FOe0pY2XBX2stcQ6URRkK5buyPeLhnTrKMfLWEWKKKzSQGen+lbtBURZzkpmK88q
+qjLqqaZusXP6QlRVLqMADjQf7aXLi0A/fIhVrq1amqqiApJbijT0LP48DvS8DQQL
+jNKkQ17vMClMmXusU5IgJMlXfGEzeTNUI56wHGYUdE69FTGFvZECAwEAAaMhMB8w
+HQYDVR0OBBYEFNsvIE+IgkE0aTc+1MI7hpPQL2ZEMA0GCSqGSIb3DQEBCwUAA4IB
+AQC4U/tGPuRS3m/r1p3aAq0D88UGg6oKHwqe3re3xrFAv9y+Y3M+FXyh5w/yMCAr
+PcVo6Pef3hEjwc9wDuQoIcQ9eRZtYI1RnhkkuC8TZRk1KGKg9Lj4Zzbse7FfK92Z
+DUYgIVyhC/YkeEDwTiZI8WxhbglozNg5Ygw+qLK4rYmk+X/NgdfdQHocuJ3Jwqqx
+eYz0m2RUMhzxEI2z9jQr3DgjNkYrphLzaVXmO4MovzXx3DNeC8ADot9PGmaz24rl
+RDeSWynxbgqzdXGHxtyR0LY1k+Y+5wqU28L90D0o3ZtaMBnK+Ft2AP2zpbtgr8rR
+sf12uPyRUPzJQ46KNpjy4HN6
+-----END CERTIFICATE-----
diff --git a/modules/cassandra/src/test/resources/client-ssl/cassandra.key.pem b/modules/cassandra/src/test/resources/client-ssl/cassandra.key.pem
new file mode 100644
index 00000000000..4d291cf8852
--- /dev/null
+++ b/modules/cassandra/src/test/resources/client-ssl/cassandra.key.pem
@@ -0,0 +1,32 @@
+Bag Attributes
+    friendlyName: localhost
+    localKeyID: 54 69 6D 65 20 31 37 32 39 33 34 38 39 36 38 31 31 39 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC6HK4azNYGAf6R
+f6pQ2PnhUGfS/EjIApp/iJoMf1GyqicC6ecGLqFvzwOEcK2hT5Ipn+QgBNpKQRnC
+bv0M8qdHyWZQV6ZpAyVaxqUW2M+ZjeAq1zZYmHwAtUc8b009bTo4g5JPZB1X7OZz
+FW/XtpKurUBCLX5YZT83QxTntKWNlwV9rLXEOlEUZCuW7sj3i4Z06yjHy1hFiiis
+0kBnp/pW7QVEWc5KZivPKqoy6qmmbrFz+kJUVS6jAA40H+2ly4tAP3yIVa6tWpqq
+ogKSW4o09Cz+PA70vA0EC4zSpENe7zApTJl7rFOSICTJV3xhM3kzVCOesBxmFHRO
+vRUxhb2RAgMBAAECggEACqD5e7C+Rr8oz+jS/z8FAxsmcsqgFXW6NEjG4EPWx89a
+RWfthVFDov3XNsizzp/OulXWH2xnhkOyU7cm+Ia7JI+Z9w8Qz+dM5AkVA8Y23o9X
+TnSjNx57DODnEP21eZAzxpp50DlPFU02pzsbYhE2AbsFp0HirB9MI70CN24xR9hP
+i1zPgO7FVnLvn4INqVKgcV4vXlxvgDEvO4Myc1WoJXkyPCCObvEflBBWr2QwQfKT
+T2qjCJWv/P2PJGFaZbOrEvOHZjprSid4/n9gbQrodGoChhjiZT//l19Ay+7eJkUc
+yiiSK4u3fF4YPH9+CVpRQ94PHFe+0kQVvf+VGX/iqQKBgQDp5umTcZoho/KQzOd/
+pA8fgnzbipEl5ep2MHB98cqEQ93eFv4l/bBehDQ1WvmFJY8SIzU4EQotpnCZd4Vb
+KH9PE8tsTRvw2cYbBuD751boLVaBn8wxtlTkFrN/CyAtV7w7AG0dXnDKushJx1NN
+8AgvSr0X4hf0AKIWGtVteoX7qwKBgQDLse7Ze5dNbG48CpBGqQS4wFkTSEs5QKI5
+68JXEQoCmJb06O7rxj4f5CALv3pReP3nrl5+kLmT8O+yU5C5dXf06k/z4GDJ6Esm
+8XTEfB2Ca+kI2RLyMRRXPA2nEunbSsyk1AVo2GeRJxG4TaDbu2zTkUBAEyCuwarW
+OMsuYodPswKBgQCZc/kB1qH8OAdHoGawgv24+m7Xycz4RCLSb20d86edprjEn+kV
+G56+I5Xs+0aAZ+e5Sof7xJIc6Pkudg9zgtojEyV+ZAhUt0sVKCoqmdeWc0gxupjI
+dIq1KX+RdccieFDxlJIBlpgBKRGF9dNdaoC0JiBwrtBwMIomXmxvatbECQKBgQCS
+X1xZn/xLwJ0+PAENJauk72OS/aJAk/d/U7ElS7M7xlbDyxbVCnHeDNoSVxgYr68U
+6zIwFOOmMb6tEGuxOX5n2nB1uUkUDf7jDyNvhhjWfaDJoOOCck5BmX/eDTNLR+bi
+kxEIFGnn3oFXRUFQZNCA/6GB6bzUl4qhwdIPlPHTDQKBgQCgztlUF5IOJFKMjVlY
+yoA/7+b5zwrh8Y2+SLzF/HLah85AuHxsgdTuQh+HLKSwJejKCT95BSRJO/kV0XCR
+KZGStqETpEH/2AJkxpjt0FZxtIQdnyTargbiipe4JzI3iCTLtfN5C9Pn3ZJ9giap
+B5uQm4762aH2jw1kKFegHlIgJg==
+-----END PRIVATE KEY-----

From 77738d8fd2f34617a8d1aee0f60fe544c6454c7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Oct 2025 10:49:41 -0600
Subject: [PATCH 4678/4969] Remove
 org.testcontainers.neo4j.Neo4jContainer#withEnterpriseEdition (#11106)

---
 .../testcontainers/neo4j/Neo4jContainer.java  | 32 ++-----------------
 .../neo4j/Neo4jContainerTest.java             | 16 ++--------
 2 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
index e96204ac418..0349e0c2395 100644
--- a/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
+++ b/modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java
@@ -7,7 +7,6 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.LicenseAcceptance;
 import org.testcontainers.utility.MountableFile;
 
 import java.net.HttpURLConnection;
@@ -39,13 +38,6 @@ public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
      */
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("neo4j");
 
-    /**
-     * The default tag (version) to use.
-     */
-    private static final String DEFAULT_TAG = "4.4";
-
-    private static final String ENTERPRISE_TAG = DEFAULT_TAG + "-enterprise";
-
     /**
      * Default port for the binary Bolt protocol.
      */
@@ -68,8 +60,6 @@ public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
 
     private static final String AUTH_FORMAT = "neo4j/%s";
 
-    private final boolean standardImage;
-
     private String adminPassword = DEFAULT_ADMIN_PASSWORD;
 
     private final Set<String> labsPlugins = new HashSet<>();
@@ -100,8 +90,6 @@ public Neo4jContainer(String dockerImageName) {
      */
     public Neo4jContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        this.standardImage = dockerImageName.getUnversionedPart().equals(DEFAULT_IMAGE_NAME.getUnversionedPart());
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         waitingFor(
@@ -197,26 +185,12 @@ public String getHttpsUrl() {
     }
 
     /**
-     * Configures the container to use the enterprise edition of the default docker image.
-     * <br><br>
-     * Please have a look at the <a href="https://neo4j.com/licensing/">Neo4j Licensing page</a>. While the Neo4j
-     * Community Edition can be used for free in your projects under the GPL v3 license, Neo4j Enterprise edition
-     * needs either a commercial, education or evaluation license.
+     * Accepts the license agreement of the container.
      *
-     * @return This container.
+     * @return this
      */
-    public Neo4jContainer withEnterpriseEdition() {
-        if (!standardImage) {
-            throw new IllegalStateException(
-                String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName())
-            );
-        }
-
-        setDockerImageName(DEFAULT_IMAGE_NAME.withTag(ENTERPRISE_TAG).asCanonicalNameString());
-        LicenseAcceptance.assertLicenseAccepted(getDockerImageName());
-
+    public Neo4jContainer acceptLicense() {
         addEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes");
-
         return self();
     }
 
diff --git a/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
index 82e8bc16e08..7676450e75a 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
@@ -21,7 +21,6 @@
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assumptions.assumeThat;
@@ -132,25 +131,14 @@ private static void assertThatCustomPluginWasCopied(Session session) {
         assertThat(singleRecord.get("greeting").asString()).isEqualTo("Hello, Testcontainers");
     }
 
-    @Test
-    void shouldCheckEnterpriseLicense() {
-        assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNull();
-
-        String expectedImageName = "neo4j:4.4-enterprise";
-
-        assertThatExceptionOfType(IllegalStateException.class)
-            .isThrownBy(() -> new Neo4jContainer("neo4j:4.4").withEnterpriseEdition())
-            .withMessageContaining("The image " + expectedImageName + " requires you to accept a license agreement.");
-    }
-
     @Test
     void shouldRunEnterprise() {
         assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNotNull();
 
         try (
             // enterpriseEdition {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
-                .withEnterpriseEdition()
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4-enterprise")
+                .acceptLicense()
                 // }
                 .withAdminPassword("Picard123")
         ) {

From 5b8743dcdb7c4394cae4e0be2fd4017fe006e931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Oct 2025 11:40:54 -0600
Subject: [PATCH 4679/4969] org.testcontainers.mariadb.MariaDBContainer do not
 copy default config (#11108)

---
 .../main/java/org/testcontainers/mariadb/MariaDBContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java
index 957754c946b..8487f4576f7 100644
--- a/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java
+++ b/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java
@@ -58,7 +58,7 @@ protected void configure() {
         optionallyMapResourceParameterAsVolume(
             MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
             "/etc/mysql/conf.d",
-            "mariadb-default-conf",
+            null,
             Transferable.DEFAULT_DIR_MODE
         );
 

From a3783a33ce06aece653cda0e116de0150975501a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Oct 2025 11:55:57 -0600
Subject: [PATCH 4680/4969] org.testcontainers.mysql.MySQLContainer do not copy
 default config (#11107)

---
 .../src/main/java/org/testcontainers/mysql/MySQLContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java
index e46bef6180d..25f876c9911 100644
--- a/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java
+++ b/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java
@@ -64,7 +64,7 @@ protected void configure() {
         optionallyMapResourceParameterAsVolume(
             MY_CNF_CONFIG_OVERRIDE_PARAM_NAME,
             "/etc/mysql/conf.d",
-            "mysql-default-conf",
+            null,
             Transferable.DEFAULT_DIR_MODE
         );
 

From a62518b4f61f7ce59bf2c1f55830cbb7b958a402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 14 Oct 2025 12:51:41 -0600
Subject: [PATCH 4681/4969] Add support for ComposeContainer with Spock
 (#11109)

---
 .../TestcontainersMethodInterceptor.groovy    | 39 +++++++++++++++++--
 .../spock/ComposeContainerIT.groovy           | 12 +++---
 .../spock/DockerComposeContainerIT.groovy     | 37 ++++++++++++++++++
 .../spock/SharedComposeContainerIT.groovy     | 12 +++---
 .../SharedDockerComposeContainerIT.groovy     | 39 +++++++++++++++++++
 5 files changed, 124 insertions(+), 15 deletions(-)
 create mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/DockerComposeContainerIT.groovy
 create mode 100644 modules/spock/src/test/groovy/org/testcontainers/spock/SharedDockerComposeContainerIT.groovy

diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
index 2399a0a6e32..cbef0a87bb2 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
@@ -4,6 +4,7 @@ import org.spockframework.runtime.extension.AbstractMethodInterceptor
 import org.spockframework.runtime.extension.IMethodInvocation
 import org.spockframework.runtime.model.FieldInfo
 import org.spockframework.runtime.model.SpecInfo
+import org.testcontainers.containers.ComposeContainer
 import org.testcontainers.containers.DockerComposeContainer
 import org.testcontainers.containers.GenericContainer
 import org.testcontainers.lifecycle.TestLifecycleAware
@@ -24,6 +25,9 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 		def containers = findAllContainers(true)
 		startContainers(containers, invocation)
 
+		def dockerCompose = findAllDockerComposeContainers(true)
+		startDockerComposeContainers(dockerCompose, invocation)
+
 		def compose = findAllComposeContainers(true)
 		startComposeContainers(compose, invocation)
 
@@ -35,6 +39,9 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 		def containers = findAllContainers(true)
 		stopContainers(containers, invocation)
 
+		def dockerCompose = findAllDockerComposeContainers(true)
+		stopDockerComposeContainers(dockerCompose, invocation)
+
 		def compose = findAllComposeContainers(true)
 		stopComposeContainers(compose, invocation)
 
@@ -46,6 +53,9 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 		def containers = findAllContainers(false)
 		startContainers(containers, invocation)
 
+		def dockerCompose = findAllDockerComposeContainers(false)
+		startDockerComposeContainers(dockerCompose, invocation)
+
 		def compose = findAllComposeContainers(false)
 		startComposeContainers(compose, invocation)
 
@@ -58,6 +68,9 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 		def containers = findAllContainers(false)
 		stopContainers(containers, invocation)
 
+		def dockerCompose = findAllDockerComposeContainers(false)
+		stopDockerComposeContainers(dockerCompose, invocation)
+
 		def compose = findAllComposeContainers(false)
 		stopComposeContainers(compose, invocation)
 
@@ -70,12 +83,18 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 		}
 	}
 
-	private List<FieldInfo> findAllComposeContainers(boolean shared) {
+	private List<FieldInfo> findAllDockerComposeContainers(boolean shared) {
 		spec.allFields.findAll { FieldInfo f ->
 			DockerComposeContainer.isAssignableFrom(f.type) && f.shared == shared
 		}
 	}
 
+	private List<FieldInfo> findAllComposeContainers(boolean shared) {
+		spec.allFields.findAll { FieldInfo f ->
+			ComposeContainer.isAssignableFrom(f.type) && f.shared == shared
+		}
+	}
+
 	private static void startContainers(List<FieldInfo> containers, IMethodInvocation invocation) {
 		containers.each { FieldInfo f ->
 			GenericContainer container = readContainerFromField(f, invocation)
@@ -105,20 +124,34 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 		}
 	}
 
-	private static void startComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
+	private static void startDockerComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
 		compose.each { FieldInfo f ->
 			DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
 			c.start()
 		}
 	}
 
-	private static void stopComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
+	private static void startComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
+		compose.each { FieldInfo f ->
+			ComposeContainer c = f.readValue(invocation.instance) as ComposeContainer
+			c.start()
+		}
+	}
+
+	private static void stopDockerComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
 		compose.each { FieldInfo f ->
 			DockerComposeContainer c = f.readValue(invocation.instance) as DockerComposeContainer
 			c.stop()
 		}
 	}
 
+	private static void stopComposeContainers(List<FieldInfo> compose, IMethodInvocation invocation) {
+		compose.each { FieldInfo f ->
+			ComposeContainer c = f.readValue(invocation.instance) as ComposeContainer
+			c.stop()
+		}
+	}
+
 
 	private static GenericContainer readContainerFromField(FieldInfo f, IMethodInvocation invocation) {
 		f.readValue(invocation.instance) as GenericContainer
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
index ff473aea1de..a190f1ea3b6 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
@@ -2,7 +2,7 @@ package org.testcontainers.spock
 
 import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.client.HttpClientBuilder
-import org.testcontainers.containers.DockerComposeContainer
+import org.testcontainers.containers.ComposeContainer
 import org.testcontainers.containers.wait.strategy.Wait
 import org.testcontainers.utility.DockerImageName
 import spock.lang.Specification
@@ -10,18 +10,18 @@ import spock.lang.Specification
 @Testcontainers
 class ComposeContainerIT extends Specification {
 
-	DockerComposeContainer composeContainer = new DockerComposeContainer(
-	DockerImageName.parse("docker/compose:debian-1.29.2"),
+	ComposeContainer composeContainer = new ComposeContainer(
+	DockerImageName.parse("docker:24.0.2"),
 	new File("src/test/resources/docker-compose.yml"))
-	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
+	.withExposedService("whoami-1", 80, Wait.forHttp("/"))
 
 	String host
 
 	int port
 
 	def setup() {
-		host = composeContainer.getServiceHost("whoami_1", 80)
-		port = composeContainer.getServicePort("whoami_1", 80)
+		host = composeContainer.getServiceHost("whoami-1", 80)
+		port = composeContainer.getServicePort("whoami-1", 80)
 	}
 
 	def "running compose defined container is accessible on configured port"() {
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/DockerComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/DockerComposeContainerIT.groovy
new file mode 100644
index 00000000000..bd27c18f7ab
--- /dev/null
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/DockerComposeContainerIT.groovy
@@ -0,0 +1,37 @@
+package org.testcontainers.spock
+
+import org.apache.http.client.methods.HttpGet
+import org.apache.http.impl.client.HttpClientBuilder
+import org.testcontainers.containers.DockerComposeContainer
+import org.testcontainers.containers.wait.strategy.Wait
+import org.testcontainers.utility.DockerImageName
+import spock.lang.Specification
+
+@Testcontainers
+class DockerComposeContainerIT extends Specification {
+
+	DockerComposeContainer composeContainer = new DockerComposeContainer(
+	DockerImageName.parse("docker/compose:debian-1.29.2"),
+	new File("src/test/resources/docker-compose.yml"))
+	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
+
+	String host
+
+	int port
+
+	def setup() {
+		host = composeContainer.getServiceHost("whoami_1", 80)
+		port = composeContainer.getServicePort("whoami_1", 80)
+	}
+
+	def "running compose defined container is accessible on configured port"() {
+		given: "a http client"
+		def client = HttpClientBuilder.create().build()
+
+		when: "accessing web server"
+		def response = client.execute(new HttpGet("http://$host:$port"))
+
+		then: "docker container is running and returns http status code 200"
+		response.statusLine.statusCode == 200
+	}
+}
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
index 953d476b160..020005f923f 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
@@ -2,7 +2,7 @@ package org.testcontainers.spock
 
 import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.client.HttpClientBuilder
-import org.testcontainers.containers.DockerComposeContainer
+import org.testcontainers.containers.ComposeContainer
 import org.testcontainers.containers.wait.strategy.Wait
 import org.testcontainers.utility.DockerImageName
 import spock.lang.Shared
@@ -12,18 +12,18 @@ import spock.lang.Specification
 class SharedComposeContainerIT extends Specification {
 
 	@Shared
-	DockerComposeContainer composeContainer = new DockerComposeContainer(
-	DockerImageName.parse("docker/compose:debian-1.29.2"),
+	ComposeContainer composeContainer = new ComposeContainer(
+	DockerImageName.parse("docker:24.0.2"),
 	new File("src/test/resources/docker-compose.yml"))
-	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
+	.withExposedService("whoami-1", 80, Wait.forHttp("/"))
 
 	String host
 
 	int port
 
 	def setup() {
-		host = composeContainer.getServiceHost("whoami_1", 80)
-		port = composeContainer.getServicePort("whoami_1", 80)
+		host = composeContainer.getServiceHost("whoami-1", 80)
+		port = composeContainer.getServicePort("whoami-1", 80)
 	}
 
 	def "running compose defined container is accessible on configured port"() {
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedDockerComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedDockerComposeContainerIT.groovy
new file mode 100644
index 00000000000..600be07f9f1
--- /dev/null
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedDockerComposeContainerIT.groovy
@@ -0,0 +1,39 @@
+package org.testcontainers.spock
+
+import org.apache.http.client.methods.HttpGet
+import org.apache.http.impl.client.HttpClientBuilder
+import org.testcontainers.containers.DockerComposeContainer
+import org.testcontainers.containers.wait.strategy.Wait
+import org.testcontainers.utility.DockerImageName
+import spock.lang.Shared
+import spock.lang.Specification
+
+@Testcontainers
+class SharedDockerComposeContainerIT extends Specification {
+
+	@Shared
+	DockerComposeContainer composeContainer = new DockerComposeContainer(
+	DockerImageName.parse("docker/compose:debian-1.29.2"),
+	new File("src/test/resources/docker-compose.yml"))
+	.withExposedService("whoami_1", 80, Wait.forHttp("/"))
+
+	String host
+
+	int port
+
+	def setup() {
+		host = composeContainer.getServiceHost("whoami_1", 80)
+		port = composeContainer.getServicePort("whoami_1", 80)
+	}
+
+	def "running compose defined container is accessible on configured port"() {
+		given: "a http client"
+		def client = HttpClientBuilder.create().build()
+
+		when: "accessing web server"
+		def response = client.execute(new HttpGet("http://$host:$port"))
+
+		then: "docker container is running and returns http status code 200"
+		response.statusLine.statusCode == 200
+	}
+}

From c3bb3be235b6c09d82950b2419f2c1e515473408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 14 Oct 2025 16:13:46 -0600
Subject: [PATCH 4682/4969] Update new artifactIds documentation

---
 docs/modules/activemq.md              | 4 ++--
 docs/modules/azure.md                 | 4 ++--
 docs/modules/chromadb.md              | 4 ++--
 docs/modules/consul.md                | 4 ++--
 docs/modules/databases/cassandra.md   | 4 ++--
 docs/modules/databases/clickhouse.md  | 4 ++--
 docs/modules/databases/cockroachdb.md | 4 ++--
 docs/modules/databases/couchbase.md   | 4 ++--
 docs/modules/databases/cratedb.md     | 4 ++--
 docs/modules/databases/databend.md    | 4 ++--
 docs/modules/databases/db2.md         | 4 ++--
 docs/modules/databases/dynalite.md    | 4 ++--
 docs/modules/databases/influxdb.md    | 4 ++--
 docs/modules/databases/mariadb.md     | 4 ++--
 docs/modules/databases/mongodb.md     | 4 ++--
 docs/modules/databases/mssqlserver.md | 4 ++--
 docs/modules/databases/mysql.md       | 4 ++--
 docs/modules/databases/neo4j.md       | 4 ++--
 docs/modules/databases/oceanbase.md   | 4 ++--
 docs/modules/databases/oraclefree.md  | 4 ++--
 docs/modules/databases/oraclexe.md    | 4 ++--
 docs/modules/databases/orientdb.md    | 4 ++--
 docs/modules/databases/postgres.md    | 4 ++--
 docs/modules/databases/presto.md      | 4 ++--
 docs/modules/databases/questdb.md     | 4 ++--
 docs/modules/databases/r2dbc.md       | 2 +-
 docs/modules/databases/scylladb.md    | 4 ++--
 docs/modules/databases/tidb.md        | 4 ++--
 docs/modules/databases/timeplus.md    | 4 ++--
 docs/modules/databases/trino.md       | 4 ++--
 docs/modules/databases/yugabytedb.md  | 4 ++--
 docs/modules/elasticsearch.md         | 4 ++--
 docs/modules/gcloud.md                | 4 ++--
 docs/modules/grafana.md               | 4 ++--
 docs/modules/hivemq.md                | 6 +++---
 docs/modules/k3s.md                   | 4 ++--
 docs/modules/k6.md                    | 4 ++--
 docs/modules/kafka.md                 | 4 ++--
 docs/modules/ldap.md                  | 4 ++--
 docs/modules/localstack.md            | 4 ++--
 docs/modules/milvus.md                | 4 ++--
 docs/modules/minio.md                 | 4 ++--
 docs/modules/mockserver.md            | 4 ++--
 docs/modules/nginx.md                 | 4 ++--
 docs/modules/ollama.md                | 4 ++--
 docs/modules/openfga.md               | 4 ++--
 docs/modules/pinecone.md              | 4 ++--
 docs/modules/pulsar.md                | 4 ++--
 docs/modules/qdrant.md                | 4 ++--
 docs/modules/rabbitmq.md              | 4 ++--
 docs/modules/redpanda.md              | 4 ++--
 docs/modules/solace.md                | 4 ++--
 docs/modules/solr.md                  | 4 ++--
 docs/modules/toxiproxy.md             | 4 ++--
 docs/modules/typesense.md             | 4 ++--
 docs/modules/vault.md                 | 4 ++--
 docs/modules/weaviate.md              | 4 ++--
 docs/modules/webdriver_containers.md  | 4 ++--
 58 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/docs/modules/activemq.md b/docs/modules/activemq.md
index 6f1ef2e9252..07cc6e75381 100644
--- a/docs/modules/activemq.md
+++ b/docs/modules/activemq.md
@@ -43,14 +43,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:activemq:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-activemq:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>testcontainers-activemq</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index e0e9419bf70..1b3242551c1 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -172,14 +172,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:azure:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-azure:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>azure</artifactId>
+        <artifactId>testcontainers-azure</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/chromadb.md b/docs/modules/chromadb.md
index 9b14dfc2970..bb50dfe3c02 100644
--- a/docs/modules/chromadb.md
+++ b/docs/modules/chromadb.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
 ```groovy
-testImplementation "org.testcontainers:chromadb:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers-chromadb:{{latest_version}}"
 ```
 
 === "Maven"
 ```xml
 <dependency>
 <groupId>org.testcontainers</groupId>
-<artifactId>chromadb</artifactId>
+<artifactId>testcontainers-chromadb</artifactId>
 <version>{{latest_version}}</version>
 <scope>test</scope>
 </dependency>
diff --git a/docs/modules/consul.md b/docs/modules/consul.md
index f9f21bfb541..bcdf7146da3 100644
--- a/docs/modules/consul.md
+++ b/docs/modules/consul.md
@@ -21,14 +21,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:consul:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-consul:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>consul</artifactId>
+        <artifactId>testcontainers-consul</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/cassandra.md b/docs/modules/databases/cassandra.md
index 80dcb220454..9cc5e12499b 100644
--- a/docs/modules/databases/cassandra.md
+++ b/docs/modules/databases/cassandra.md
@@ -39,14 +39,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:cassandra:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-cassandra:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>cassandra</artifactId>
+        <artifactId>testcontainers-cassandra</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/clickhouse.md b/docs/modules/databases/clickhouse.md
index 1ba8a1ff0aa..4e49c69c276 100644
--- a/docs/modules/databases/clickhouse.md
+++ b/docs/modules/databases/clickhouse.md
@@ -22,14 +22,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:clickhouse:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-clickhouse:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>clickhouse</artifactId>
+        <artifactId>testcontainers-clickhouse</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/cockroachdb.md b/docs/modules/databases/cockroachdb.md
index 2a219aeb275..add1b9cd1aa 100644
--- a/docs/modules/databases/cockroachdb.md
+++ b/docs/modules/databases/cockroachdb.md
@@ -24,14 +24,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:cockroachdb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-cockroachdb:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>cockroachdb</artifactId>
+        <artifactId>testcontainers-cockroachdb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/couchbase.md b/docs/modules/databases/couchbase.md
index 5c1ff9f5580..997347611e2 100644
--- a/docs/modules/databases/couchbase.md
+++ b/docs/modules/databases/couchbase.md
@@ -29,13 +29,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:couchbase:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-couchbase:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>couchbase</artifactId>
+        <artifactId>testcontainers-couchbase</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/cratedb.md b/docs/modules/databases/cratedb.md
index 14c15608904..25fd1642a9d 100644
--- a/docs/modules/databases/cratedb.md
+++ b/docs/modules/databases/cratedb.md
@@ -24,13 +24,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:cratedb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-cratedb:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>cratedb</artifactId>
+        <artifactId>testcontainers-cratedb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/databend.md b/docs/modules/databases/databend.md
index 97b92729241..510dffb2f3e 100644
--- a/docs/modules/databases/databend.md
+++ b/docs/modules/databases/databend.md
@@ -22,14 +22,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:databend:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-databend:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>databend</artifactId>
+        <artifactId>testcontainers-databend</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/db2.md b/docs/modules/databases/db2.md
index 7a5ba79a86f..ce05f6ae308 100644
--- a/docs/modules/databases/db2.md
+++ b/docs/modules/databases/db2.md
@@ -27,13 +27,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:db2:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-db2:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>db2</artifactId>
+        <artifactId>testcontainers-db2</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/dynalite.md b/docs/modules/databases/dynalite.md
index 8807ad7f025..445395479dd 100644
--- a/docs/modules/databases/dynalite.md
+++ b/docs/modules/databases/dynalite.md
@@ -31,13 +31,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:dynalite:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-dynalite:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>dynalite</artifactId>
+        <artifactId>testcontainers-dynalite</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/influxdb.md b/docs/modules/databases/influxdb.md
index 8055f6aed57..9644a5eb92b 100644
--- a/docs/modules/databases/influxdb.md
+++ b/docs/modules/databases/influxdb.md
@@ -90,7 +90,7 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 === "Gradle"
 
 ```groovy
-testImplementation "org.testcontainers:influxdb:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers-influxdb:{{latest_version}}"
 ```
 
 === "Maven"
@@ -99,7 +99,7 @@ testImplementation "org.testcontainers:influxdb:{{latest_version}}"
 
 <dependency>
     <groupId>org.testcontainers</groupId>
-    <artifactId>influxdb</artifactId>
+    <artifactId>testcontainers-influxdb</artifactId>
     <version>{{latest_version}}</version>
     <scope>test</scope>
 </dependency>
diff --git a/docs/modules/databases/mariadb.md b/docs/modules/databases/mariadb.md
index 01d66139f1a..d90f9381cb5 100644
--- a/docs/modules/databases/mariadb.md
+++ b/docs/modules/databases/mariadb.md
@@ -30,13 +30,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:mariadb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-mariadb:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>mariadb</artifactId>
+        <artifactId>testcontainers-mariadb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/mongodb.md b/docs/modules/databases/mongodb.md
index cbd82aabc33..b861d83bb2c 100644
--- a/docs/modules/databases/mongodb.md
+++ b/docs/modules/databases/mongodb.md
@@ -77,13 +77,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:mongodb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-mongodb:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>mongodb</artifactId>
+        <artifactId>testcontainers-mongodb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/mssqlserver.md b/docs/modules/databases/mssqlserver.md
index bde933b1e72..5c9d7b0a9fb 100644
--- a/docs/modules/databases/mssqlserver.md
+++ b/docs/modules/databases/mssqlserver.md
@@ -29,13 +29,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:mssqlserver:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-mssqlserver:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>mssqlserver</artifactId>
+        <artifactId>testcontainers-mssqlserver</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/mysql.md b/docs/modules/databases/mysql.md
index 46bf8b586de..1747989766f 100644
--- a/docs/modules/databases/mysql.md
+++ b/docs/modules/databases/mysql.md
@@ -40,13 +40,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:mysql:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-mysql:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>mysql</artifactId>
+        <artifactId>testcontainers-mysql</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index a8570fe7270..9bfb7fbfca7 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -120,13 +120,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:neo4j:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-neo4j:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>neo4j</artifactId>
+        <artifactId>testcontainers-neo4j</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/oceanbase.md b/docs/modules/databases/oceanbase.md
index c5c82a091fd..c315a871058 100644
--- a/docs/modules/databases/oceanbase.md
+++ b/docs/modules/databases/oceanbase.md
@@ -24,14 +24,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:oceanbase:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-oceanbase:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>oceanbase</artifactId>
+        <artifactId>testcontainers-oceanbase</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/oraclefree.md b/docs/modules/databases/oraclefree.md
index b9ade460a20..75f3d677ffc 100644
--- a/docs/modules/databases/oraclefree.md
+++ b/docs/modules/databases/oraclefree.md
@@ -24,13 +24,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:oracle-free:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-oracle-free:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>oracle-free</artifactId>
+        <artifactId>testcontainers-oracle-free</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/oraclexe.md b/docs/modules/databases/oraclexe.md
index 0f018a045fb..8d060ed65be 100644
--- a/docs/modules/databases/oraclexe.md
+++ b/docs/modules/databases/oraclexe.md
@@ -24,13 +24,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:oracle-xe:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-oracle-xe:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>oracle-xe</artifactId>
+        <artifactId>testcontainers-oracle-xe</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/orientdb.md b/docs/modules/databases/orientdb.md
index a1f57098d99..f3be7e2bbdb 100644
--- a/docs/modules/databases/orientdb.md
+++ b/docs/modules/databases/orientdb.md
@@ -16,13 +16,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:orientdb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-orientdb:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>orientdb</artifactId>
+        <artifactId>testcontainers-orientdb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/postgres.md b/docs/modules/databases/postgres.md
index bb2414fa2cc..f27752b8354 100644
--- a/docs/modules/databases/postgres.md
+++ b/docs/modules/databases/postgres.md
@@ -49,13 +49,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:postgresql:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-postgresql:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>postgresql</artifactId>
+        <artifactId>testcontainers-postgresql</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/presto.md b/docs/modules/databases/presto.md
index d0a47fc1d7a..4e9a6e7c95d 100644
--- a/docs/modules/databases/presto.md
+++ b/docs/modules/databases/presto.md
@@ -69,13 +69,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:presto:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-presto:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>presto</artifactId>
+        <artifactId>testcontainers-presto</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/questdb.md b/docs/modules/databases/questdb.md
index 6c99e32df2e..eb5c466f371 100644
--- a/docs/modules/databases/questdb.md
+++ b/docs/modules/databases/questdb.md
@@ -26,7 +26,7 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 === "Gradle"
 
 ```groovy
-testImplementation "org.testcontainers:questdb:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers-questdb:{{latest_version}}"
 ```
 
 === "Maven"
@@ -35,7 +35,7 @@ testImplementation "org.testcontainers:questdb:{{latest_version}}"
 
 <dependency>
     <groupId>org.testcontainers</groupId>
-    <artifactId>questdb</artifactId>
+    <artifactId>testcontainers-questdb</artifactId>
     <version>{{latest_version}}</version>
     <scope>test</scope>
 </dependency>
diff --git a/docs/modules/databases/r2dbc.md b/docs/modules/databases/r2dbc.md
index 5aded5431ca..91580811887 100644
--- a/docs/modules/databases/r2dbc.md
+++ b/docs/modules/databases/r2dbc.md
@@ -12,7 +12,7 @@ As long as you have Testcontainers and the appropriate R2DBC driver on your clas
 The started container will be terminated when the `ConnectionFactory` is closed.
 
 !!! warning
-    Both the database module (e.g. `org.testcontainers:mysql`) **and** `org.testcontainers:r2dbc` need to be on your application's classpath at runtime.
+    Both the database module (e.g. `org.testcontainers:testcontainers-mysql`) **and** `org.testcontainers:testcontainers-r2dbc` need to be on your application's classpath at runtime.
 
 **Original URL**: `r2dbc:mysql://localhost:3306/databasename`
 
diff --git a/docs/modules/databases/scylladb.md b/docs/modules/databases/scylladb.md
index 186f5097d39..bde40e3b599 100644
--- a/docs/modules/databases/scylladb.md
+++ b/docs/modules/databases/scylladb.md
@@ -44,14 +44,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:scylladb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-scylladb:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>scylladb</artifactId>
+        <artifactId>testcontainers-scylladb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/tidb.md b/docs/modules/databases/tidb.md
index 3dfdc743bbe..17cb66b21c3 100644
--- a/docs/modules/databases/tidb.md
+++ b/docs/modules/databases/tidb.md
@@ -24,14 +24,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:tidb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-tidb:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>tidb</artifactId>
+        <artifactId>testcontainers-tidb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/timeplus.md b/docs/modules/databases/timeplus.md
index 3364f97d509..ee5e5767223 100644
--- a/docs/modules/databases/timeplus.md
+++ b/docs/modules/databases/timeplus.md
@@ -22,14 +22,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:timeplus:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-timeplus:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>timeplus</artifactId>
+        <artifactId>testcontainers-timeplus</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/trino.md b/docs/modules/databases/trino.md
index 9cb6be8bb5b..81fb4ea5b98 100644
--- a/docs/modules/databases/trino.md
+++ b/docs/modules/databases/trino.md
@@ -24,14 +24,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:trino:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-trino:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>trino</artifactId>
+        <artifactId>testcontainers-trino</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/databases/yugabytedb.md b/docs/modules/databases/yugabytedb.md
index 0824227c937..4409712241b 100644
--- a/docs/modules/databases/yugabytedb.md
+++ b/docs/modules/databases/yugabytedb.md
@@ -36,13 +36,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:yugabytedb:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-yugabytedb:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>yugabytedb</artifactId>
+        <artifactId>testcontainers-yugabytedb</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index 3834081f2c6..c1fb4a3f6a8 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -36,14 +36,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:elasticsearch:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-elasticsearch:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>elasticsearch</artifactId>
+        <artifactId>testcontainers-elasticsearch</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
index dc86e7f4892..9660461d5a0 100644
--- a/docs/modules/gcloud.md
+++ b/docs/modules/gcloud.md
@@ -156,13 +156,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:gcloud:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-gcloud:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>gcloud</artifactId>
+        <artifactId>testcontainers-gcloud</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/grafana.md b/docs/modules/grafana.md
index f31984ea7ce..397ade89ee3 100644
--- a/docs/modules/grafana.md
+++ b/docs/modules/grafana.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:grafana:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-grafana:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>grafana</artifactId>
+        <artifactId>testcontainers-grafana</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/hivemq.md b/docs/modules/hivemq.md
index c898d58fea8..0029204a06c 100644
--- a/docs/modules/hivemq.md
+++ b/docs/modules/hivemq.md
@@ -212,13 +212,13 @@ can be customized as desired.
 Add to `build.gradle`:
 
 ````groovy
-testImplementation 'org.testcontainers:hivemq:{{latest_version}}'
+testImplementation 'org.testcontainers:testcontainers-hivemq:{{latest_version}}'
 ````
 
 Add to `build.gradle.kts`:
 
 ````kotlin
-testImplementation("org.testcontainers:hivemq:{{latest_version}}")
+testImplementation("org.testcontainers:testcontainers-hivemq:{{latest_version}}")
 ````
 
 ### Maven
@@ -228,7 +228,7 @@ Add to `pom.xml`:
 ```xml
 <dependency>
     <groupId>org.testcontainers</groupId>
-    <artifactId>hivemq</artifactId>
+    <artifactId>testcontainers-hivemq</artifactId>
     <version>{{latest_version}}</version>
     <scope>test</scope>
 </dependency>
diff --git a/docs/modules/k3s.md b/docs/modules/k3s.md
index 2df695b1c1e..a9de1b3fd4f 100644
--- a/docs/modules/k3s.md
+++ b/docs/modules/k3s.md
@@ -44,13 +44,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:k3s:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-k3s:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>k3s</artifactId>
+        <artifactId>testcontainers-k3s</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/k6.md b/docs/modules/k6.md
index 7d14701aaa3..4783ca1e5ad 100644
--- a/docs/modules/k6.md
+++ b/docs/modules/k6.md
@@ -26,13 +26,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:k6:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-k6:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>k6</artifactId>
+        <artifactId>testcontainers-k6</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
index 4311be61b5a..cb2906265d0 100644
--- a/docs/modules/kafka.md
+++ b/docs/modules/kafka.md
@@ -86,13 +86,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:kafka:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-kafka:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>kafka</artifactId>
+        <artifactId>testcontainers-kafka</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/ldap.md b/docs/modules/ldap.md
index 771975d6346..c84469f22ae 100644
--- a/docs/modules/ldap.md
+++ b/docs/modules/ldap.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:ldap:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-ldap:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>ldap</artifactId>
+        <artifactId>testcontainers-ldap</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 0afbea358c6..72d4fc843a7 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -25,13 +25,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:localstack:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-localstack:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>localstack</artifactId>
+        <artifactId>testcontainers-localstack</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/milvus.md b/docs/modules/milvus.md
index 2808f9d2199..96772560f80 100644
--- a/docs/modules/milvus.md
+++ b/docs/modules/milvus.md
@@ -22,14 +22,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:milvus:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-milvus:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>milvus</artifactId>
+        <artifactId>testcontainers-milvus</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/minio.md b/docs/modules/minio.md
index 2b872682ebe..165f760425c 100644
--- a/docs/modules/minio.md
+++ b/docs/modules/minio.md
@@ -25,14 +25,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-     testImplementation "org.testcontainers:minio:{{latest_version}}"
+     testImplementation "org.testcontainers:testcontainers-minio:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>minio</artifactId>
+        <artifactId>testcontainers-minio</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md
index fc4402ae9e8..e6a0ee91ece 100644
--- a/docs/modules/mockserver.md
+++ b/docs/modules/mockserver.md
@@ -22,13 +22,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:mockserver:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-mockserver:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>mockserver</artifactId>
+        <artifactId>testcontainers-mockserver</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/nginx.md b/docs/modules/nginx.md
index d0661330bb1..6fcdbdaf13f 100644
--- a/docs/modules/nginx.md
+++ b/docs/modules/nginx.md
@@ -28,13 +28,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:nginx:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-nginx:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>nginx</artifactId>
+        <artifactId>testcontainers-nginx</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/ollama.md b/docs/modules/ollama.md
index e54ee824938..56c1574d4db 100644
--- a/docs/modules/ollama.md
+++ b/docs/modules/ollama.md
@@ -38,14 +38,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:ollama:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-ollama:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>ollama</artifactId>
+        <artifactId>testcontainers-ollama</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/openfga.md b/docs/modules/openfga.md
index 3df822468f4..4d916ce6aa6 100644
--- a/docs/modules/openfga.md
+++ b/docs/modules/openfga.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:openfga:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-openfga:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>openfga</artifactId>
+        <artifactId>testcontainers-openfga</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/pinecone.md b/docs/modules/pinecone.md
index b4eac925c51..6bcea81ab39 100644
--- a/docs/modules/pinecone.md
+++ b/docs/modules/pinecone.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
 ```groovy
-testImplementation "org.testcontainers:pinecone:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers-pinecone:{{latest_version}}"
 ```
 
 === "Maven"
 ```xml
 <dependency>
     <groupId>org.testcontainers</groupId>
-    <artifactId>pinecone</artifactId>
+    <artifactId>testcontainers-pinecone</artifactId>
     <version>{{latest_version}}</version>
     <scope>test</scope>
 </dependency>
diff --git a/docs/modules/pulsar.md b/docs/modules/pulsar.md
index 5c0c2497f4e..5bd33b0bc4c 100644
--- a/docs/modules/pulsar.md
+++ b/docs/modules/pulsar.md
@@ -52,13 +52,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:pulsar:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-pulsar:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>pulsar</artifactId>
+        <artifactId>testcontainers-pulsar</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/qdrant.md b/docs/modules/qdrant.md
index 25aef090c97..9431a340a9c 100644
--- a/docs/modules/qdrant.md
+++ b/docs/modules/qdrant.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:qdrant:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-qdrant:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>qdrant</artifactId>
+        <artifactId>testcontainers-qdrant</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/rabbitmq.md b/docs/modules/rabbitmq.md
index 4055bb59f06..5381e3cd910 100644
--- a/docs/modules/rabbitmq.md
+++ b/docs/modules/rabbitmq.md
@@ -6,13 +6,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:rabbitmq:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-rabbitmq:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>rabbitmq</artifactId>
+        <artifactId>testcontainers-rabbitmq</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/redpanda.md b/docs/modules/redpanda.md
index 9c7b7b3fb86..429ae5a9768 100644
--- a/docs/modules/redpanda.md
+++ b/docs/modules/redpanda.md
@@ -89,13 +89,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
 ```groovy
-testImplementation "org.testcontainers:redpanda:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers-redpanda:{{latest_version}}"
 ```
 === "Maven"
 ```xml
 <dependency>
     <groupId>org.testcontainers</groupId>
-    <artifactId>redpanda</artifactId>
+    <artifactId>testcontainers-redpanda</artifactId>
     <version>{{latest_version}}</version>
     <scope>test</scope>
 </dependency>
diff --git a/docs/modules/solace.md b/docs/modules/solace.md
index 93fc0e9875f..91956533906 100644
--- a/docs/modules/solace.md
+++ b/docs/modules/solace.md
@@ -26,13 +26,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:solace:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-solace:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>solace</artifactId>
+        <artifactId>testcontainers-solace</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/solr.md b/docs/modules/solr.md
index 73546dcbd6d..957615fcbf1 100644
--- a/docs/modules/solr.md
+++ b/docs/modules/solr.md
@@ -18,13 +18,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:solr:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-solr:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>solr</artifactId>
+        <artifactId>testcontainers-solr</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/toxiproxy.md b/docs/modules/toxiproxy.md
index 99178935b9a..40f792911bb 100644
--- a/docs/modules/toxiproxy.md
+++ b/docs/modules/toxiproxy.md
@@ -71,13 +71,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:toxiproxy:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-toxiproxy:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>toxiproxy</artifactId>
+        <artifactId>testcontainers-toxiproxy</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/typesense.md b/docs/modules/typesense.md
index e7c332884c7..c73a640d881 100644
--- a/docs/modules/typesense.md
+++ b/docs/modules/typesense.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:typesense:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-typesense:{{latest_version}}"
     ```
 
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>typesense</artifactId>
+        <artifactId>testcontainers-typesense</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/vault.md b/docs/modules/vault.md
index e32abfd1c60..45d34844b7f 100644
--- a/docs/modules/vault.md
+++ b/docs/modules/vault.md
@@ -43,13 +43,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:vault:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-vault:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>vault</artifactId>
+        <artifactId>testcontainers-vault</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/modules/weaviate.md b/docs/modules/weaviate.md
index da028cf3ce1..76146ab5ee9 100644
--- a/docs/modules/weaviate.md
+++ b/docs/modules/weaviate.md
@@ -16,14 +16,14 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
 ```groovy
-testImplementation "org.testcontainers:weaviate:{{latest_version}}"
+testImplementation "org.testcontainers:testcontainers-weaviate:{{latest_version}}"
 ```
 
 === "Maven"
 ```xml
 <dependency>
 <groupId>org.testcontainers</groupId>
-<artifactId>weaviate</artifactId>
+<artifactId>testcontainers-weaviate</artifactId>
 <version>{{latest_version}}</version>
 <scope>test</scope>
 </dependency>
diff --git a/docs/modules/webdriver_containers.md b/docs/modules/webdriver_containers.md
index a42f261d79c..8101f489e3a 100644
--- a/docs/modules/webdriver_containers.md
+++ b/docs/modules/webdriver_containers.md
@@ -90,13 +90,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:selenium:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-selenium:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>selenium</artifactId>
+        <artifactId>testcontainers-selenium</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>

From c8cc7fdf76aac18c759473c3f6ee9a93e663b409 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:14:55 -0600
Subject: [PATCH 4683/4969] [create-pull-request] automated change (#11111)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d83ed4b9998..e5a11dd3ac9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.21.3
+testcontainers.version=2.0.0

From 93af7320045a62097f372ea632715bac65e786f7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:15:12 -0600
Subject: [PATCH 4684/4969] [create-pull-request] automated change (#11110)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 3e39a67f959..2ae8842ffbc 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -141,4 +141,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.21.3
+    latest_version: 2.0.0

From 376642b0be4863437f6ea11b2d04f25692447314 Mon Sep 17 00:00:00 2001
From: Raimund Klein <770876+Chessray@users.noreply.github.com>
Date: Wed, 15 Oct 2025 15:44:57 +0100
Subject: [PATCH 4685/4969] Fix doc about Testcontainers JUnit Jupiter
 coordinates (#11113)

Fixes #11112
---
 docs/test_framework_integration/junit_5.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/test_framework_integration/junit_5.md b/docs/test_framework_integration/junit_5.md
index 8f3c21372dd..883adc90af9 100644
--- a/docs/test_framework_integration/junit_5.md
+++ b/docs/test_framework_integration/junit_5.md
@@ -70,13 +70,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-junit-jupiter:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>junit-jupiter</artifactId>
+        <artifactId>testcontainers-junit-jupiter</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>

From 546fa4a13687743fad02b3501f20914e66af84f8 Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Wed, 15 Oct 2025 18:51:46 +0100
Subject: [PATCH 4686/4969] Fix exclusion of testcontainers-jdbc-test from
 publication (#11115)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 52d6f33f25c..f405ea2b92c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ subprojects {
     }
 
     // specific modules should be excluded from publication
-    if ( ! ["test-support", "jdbc-test"].contains(it.name) && !it.path.startsWith(":docs:") && it != project(":docs") ) {
+    if ( ! ["test-support", "testcontainers-jdbc-test"].contains(it.name) && !it.path.startsWith(":docs:") && it != project(":docs") ) {
         apply from: "$rootDir/gradle/publishing.gradle"
 
         if (it.name != "bom") {

From a8b0f5c437e9bc80ff6aab9c156983cc9109c6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Oct 2025 14:22:25 -0600
Subject: [PATCH 4687/4969] Add PostgreSQLR2DBCDatabaseContainer compatible
 with org.testcontainers.postgresql.PostgreSQLContainer (#11120)

---
 .../PostgreSQLR2DBCDatabaseContainer.java     | 58 +++++++++++++++++++
 .../PostgreSQLR2DBCDatabaseContainerTest.java | 30 ++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainer.java
 create mode 100644 modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainerTest.java

diff --git a/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainer.java b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..d99d638b100
--- /dev/null
+++ b/modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainer.java
@@ -0,0 +1,58 @@
+package org.testcontainers.postgresql;
+
+import io.r2dbc.postgresql.PostgresqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+import java.util.Set;
+
+public final class PostgreSQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    private final PostgreSQLContainer container;
+
+    public PostgreSQLR2DBCDatabaseContainer(PostgreSQLContainer container) {
+        this.container = container;
+    }
+
+    public static ConnectionFactoryOptions getOptions(PostgreSQLContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, PostgresqlConnectionFactoryProvider.POSTGRESQL_DRIVER)
+            .build();
+
+        return new PostgreSQLR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+
+    @Override
+    public Set<Startable> getDependencies() {
+        return this.container.getDependencies();
+    }
+
+    @Override
+    public void start() {
+        this.container.start();
+    }
+
+    @Override
+    public void stop() {
+        this.container.stop();
+    }
+
+    @Override
+    public void close() {
+        this.container.close();
+    }
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..4f5386d9f58
--- /dev/null
+++ b/modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLR2DBCDatabaseContainerTest.java
@@ -0,0 +1,30 @@
+package org.testcontainers.postgresql;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.PostgreSQLTestImages;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class PostgreSQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<PostgreSQLContainer> {
+
+    @Override
+    protected PostgreSQLContainer createContainer() {
+        return new PostgreSQLContainer(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);
+    }
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(PostgreSQLContainer container) {
+        // spotless:off
+        // get_options {
+        ConnectionFactoryOptions options = PostgreSQLR2DBCDatabaseContainer.getOptions(
+            container
+        );
+        // }
+        // spotless:on
+
+        return options;
+    }
+
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:postgresql:///db?TC_IMAGE_TAG=10-alpine";
+    }
+}

From c32d81197201de7faec797ab2f5db9cb3f253450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Oct 2025 14:22:46 -0600
Subject: [PATCH 4688/4969] Add MSSQLR2DBCDatabaseContainer compatible with
 org.testcontainers.mssqlserver.MSSQLServerContainer (#11118)

---
 .../MSSQLR2DBCDatabaseContainer.java          | 59 +++++++++++++++++++
 .../MSSQLR2DBCDatabaseContainerTest.java      | 23 ++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java
 create mode 100644 modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java

diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..d8d7740e01d
--- /dev/null
+++ b/modules/mssqlserver/src/main/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainer.java
@@ -0,0 +1,59 @@
+package org.testcontainers.mssqlserver;
+
+import io.r2dbc.mssql.MssqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+import java.util.Set;
+
+public class MSSQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    private final MSSQLServerContainer container;
+
+    public MSSQLR2DBCDatabaseContainer(MSSQLServerContainer container) {
+        this.container = container;
+    }
+
+    public static ConnectionFactoryOptions getOptions(MSSQLServerContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, MssqlConnectionFactoryProvider.MSSQL_DRIVER)
+            .build();
+
+        return new MSSQLR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT))
+            // TODO enable if/when MSSQLServerContainer adds support for customizing the DB name
+            // .option(ConnectionFactoryOptions.DATABASE, container.getDatabasseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+
+    @Override
+    public Set<Startable> getDependencies() {
+        return this.container.getDependencies();
+    }
+
+    @Override
+    public void start() {
+        this.container.start();
+    }
+
+    @Override
+    public void stop() {
+        this.container.stop();
+    }
+
+    @Override
+    public void close() {
+        this.container.close();
+    }
+}
diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..7b51e8f1f93
--- /dev/null
+++ b/modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLR2DBCDatabaseContainerTest.java
@@ -0,0 +1,23 @@
+package org.testcontainers.mssqlserver;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.MSSQLServerTestImages;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+class MSSQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MSSQLServerContainer> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(MSSQLServerContainer container) {
+        return MSSQLR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:sqlserver:///?TC_IMAGE_TAG=2022-CU14-ubuntu-22.04";
+    }
+
+    @Override
+    protected MSSQLServerContainer createContainer() {
+        return new MSSQLServerContainer(MSSQLServerTestImages.MSSQL_SERVER_IMAGE);
+    }
+}

From 09aefb2ec9c8c20b29857b05c15c7bffb1668eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Oct 2025 14:22:55 -0600
Subject: [PATCH 4689/4969] Add MariaDBR2DBCDatabaseContainer compatible with
 org.testcontainers.mariadb.MariaDBContainer (#11117)

---
 .../MariaDBR2DBCDatabaseContainer.java        | 58 +++++++++++++++++++
 .../MariaDBR2DBCDatabaseContainerTest.java    | 23 ++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainer.java
 create mode 100644 modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainerTest.java

diff --git a/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainer.java b/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..4c9e6350d23
--- /dev/null
+++ b/modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainer.java
@@ -0,0 +1,58 @@
+package org.testcontainers.mariadb;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.mariadb.r2dbc.MariadbConnectionFactoryProvider;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+import java.util.Set;
+
+public class MariaDBR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    private final MariaDBContainer container;
+
+    public MariaDBR2DBCDatabaseContainer(MariaDBContainer container) {
+        this.container = container;
+    }
+
+    public static ConnectionFactoryOptions getOptions(MariaDBContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, MariadbConnectionFactoryProvider.MARIADB_DRIVER)
+            .build();
+
+        return new MariaDBR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MariaDBContainer.MARIADB_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+
+    @Override
+    public Set<Startable> getDependencies() {
+        return this.container.getDependencies();
+    }
+
+    @Override
+    public void start() {
+        this.container.start();
+    }
+
+    @Override
+    public void stop() {
+        this.container.stop();
+    }
+
+    @Override
+    public void close() {
+        this.container.close();
+    }
+}
diff --git a/modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainerTest.java b/modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..8260a6937df
--- /dev/null
+++ b/modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBR2DBCDatabaseContainerTest.java
@@ -0,0 +1,23 @@
+package org.testcontainers.mariadb;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+import org.testcontainers.utility.DockerImageName;
+
+public class MariaDBR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MariaDBContainer> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(MariaDBContainer container) {
+        return MariaDBR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:mariadb:///db?TC_IMAGE_TAG=10.3.39";
+    }
+
+    @Override
+    protected MariaDBContainer createContainer() {
+        return new MariaDBContainer(DockerImageName.parse("mariadb:10.3.39"));
+    }
+}

From 1f3b9becce644eda2ee143619d69f6d16982d894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Oct 2025 14:23:04 -0600
Subject: [PATCH 4690/4969] Remove lombok from OracleR2DBCDatabaseContainer
 (#11116)

---
 .../oracle/OracleR2DBCDatabaseContainer.java  | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java
index f9c12955653..ae480027f25 100644
--- a/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java
+++ b/modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainer.java
@@ -1,17 +1,19 @@
 package org.testcontainers.oracle;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.Delegate;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 
-@RequiredArgsConstructor
+import java.util.Set;
+
 public class OracleR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
 
-    @Delegate(types = Startable.class)
     private final OracleContainer container;
 
+    public OracleR2DBCDatabaseContainer(OracleContainer container) {
+        this.container = container;
+    }
+
     public static ConnectionFactoryOptions getOptions(OracleContainer container) {
         ConnectionFactoryOptions options = ConnectionFactoryOptions
             .builder()
@@ -32,4 +34,24 @@ public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
             .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
             .build();
     }
+
+    @Override
+    public Set<Startable> getDependencies() {
+        return this.container.getDependencies();
+    }
+
+    @Override
+    public void start() {
+        this.container.start();
+    }
+
+    @Override
+    public void stop() {
+        this.container.stop();
+    }
+
+    @Override
+    public void close() {
+        this.container.close();
+    }
 }

From ca450d00c267882935e0e02852cdac994a117bce Mon Sep 17 00:00:00 2001
From: SAGAR PRASAD <19862200+ox-sag@users.noreply.github.com>
Date: Thu, 16 Oct 2025 01:55:07 +0530
Subject: [PATCH 4691/4969] Fix artifact coordinates listed in docs (#11121)

---
 docs/index.md                            | 4 ++--
 docs/quickstart/junit_5_quickstart.md    | 4 ++--
 docs/quickstart/spock_quickstart.md      | 4 ++--
 docs/test_framework_integration/spock.md | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index a3b499dfa0c..40304dd22ed 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -82,7 +82,7 @@ and then use dependencies without specifying a version:
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>mysql</artifactId>
+        <artifactId>testcontainers-mysql</artifactId>
         <scope>test</scope>
     </dependency>
     ```
@@ -92,7 +92,7 @@ Using Gradle 5.0 or higher, you can add the following to the `dependencies` sect
 === "Gradle"
     ```groovy
     implementation platform('org.testcontainers:testcontainers-bom:{{latest_version}}') //import bom
-    testImplementation('org.testcontainers:mysql') //no version specified
+    testImplementation('org.testcontainers:testcontainers-mysql') //no version specified
     ```
 
 
diff --git a/docs/quickstart/junit_5_quickstart.md b/docs/quickstart/junit_5_quickstart.md
index 3c126196845..effd17dd2d9 100644
--- a/docs/quickstart/junit_5_quickstart.md
+++ b/docs/quickstart/junit_5_quickstart.md
@@ -25,7 +25,7 @@ First, add Testcontainers as a dependency as follows:
     ```groovy
     testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
     testImplementation "org.testcontainers:testcontainers:{{latest_version}}"
-    testImplementation "org.testcontainers:junit-jupiter:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-junit-jupiter:{{latest_version}}"
     ```
 === "Maven"
     ```xml
@@ -43,7 +43,7 @@ First, add Testcontainers as a dependency as follows:
     </dependency>
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>junit-jupiter</artifactId>
+        <artifactId>testcontainers-junit-jupiter</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/quickstart/spock_quickstart.md b/docs/quickstart/spock_quickstart.md
index 267954e99ee..c9c78bea5ea 100644
--- a/docs/quickstart/spock_quickstart.md
+++ b/docs/quickstart/spock_quickstart.md
@@ -23,13 +23,13 @@ First, add Testcontainers as a dependency as follows:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:spock:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-spock:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>spock</artifactId>
+        <artifactId>testcontainers-spock</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>
diff --git a/docs/test_framework_integration/spock.md b/docs/test_framework_integration/spock.md
index b8c1d5b7eae..3d50e0399d2 100644
--- a/docs/test_framework_integration/spock.md
+++ b/docs/test_framework_integration/spock.md
@@ -19,13 +19,13 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 
 === "Gradle"
     ```groovy
-    testImplementation "org.testcontainers:spock:{{latest_version}}"
+    testImplementation "org.testcontainers:testcontainers-spock:{{latest_version}}"
     ```
 === "Maven"
     ```xml
     <dependency>
         <groupId>org.testcontainers</groupId>
-        <artifactId>spock</artifactId>
+        <artifactId>testcontainers-spock</artifactId>
         <version>{{latest_version}}</version>
         <scope>test</scope>
     </dependency>

From a0df99d727c775b766b45950ed8b122fa5847863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Oct 2025 14:30:28 -0600
Subject: [PATCH 4692/4969] Add MySQLR2DBCDatabaseContainer compatible with
 org.testcontainers.mysql.MySQLContainer (#11119)

---
 .../mysql/MySQLR2DBCDatabaseContainer.java    | 58 +++++++++++++++++++
 .../MySQLR2DBCDatabaseContainerTest.java      | 23 ++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 modules/mysql/src/main/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainer.java
 create mode 100644 modules/mysql/src/test/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainerTest.java

diff --git a/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainer.java b/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainer.java
new file mode 100644
index 00000000000..d2a272559d9
--- /dev/null
+++ b/modules/mysql/src/main/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainer.java
@@ -0,0 +1,58 @@
+package org.testcontainers.mysql;
+
+import io.asyncer.r2dbc.mysql.MySqlConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
+
+import java.util.Set;
+
+public class MySQLR2DBCDatabaseContainer implements R2DBCDatabaseContainer {
+
+    private final MySQLContainer container;
+
+    public MySQLR2DBCDatabaseContainer(MySQLContainer container) {
+        this.container = container;
+    }
+
+    public static ConnectionFactoryOptions getOptions(MySQLContainer container) {
+        ConnectionFactoryOptions options = ConnectionFactoryOptions
+            .builder()
+            .option(ConnectionFactoryOptions.DRIVER, MySqlConnectionFactoryProvider.MYSQL_DRIVER)
+            .build();
+
+        return new MySQLR2DBCDatabaseContainer(container).configure(options);
+    }
+
+    @Override
+    public ConnectionFactoryOptions configure(ConnectionFactoryOptions options) {
+        return options
+            .mutate()
+            .option(ConnectionFactoryOptions.HOST, container.getHost())
+            .option(ConnectionFactoryOptions.PORT, container.getMappedPort(MySQLContainer.MYSQL_PORT))
+            .option(ConnectionFactoryOptions.DATABASE, container.getDatabaseName())
+            .option(ConnectionFactoryOptions.USER, container.getUsername())
+            .option(ConnectionFactoryOptions.PASSWORD, container.getPassword())
+            .build();
+    }
+
+    @Override
+    public Set<Startable> getDependencies() {
+        return this.container.getDependencies();
+    }
+
+    @Override
+    public void start() {
+        this.container.start();
+    }
+
+    @Override
+    public void stop() {
+        this.container.stop();
+    }
+
+    @Override
+    public void close() {
+        this.container.close();
+    }
+}
diff --git a/modules/mysql/src/test/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainerTest.java b/modules/mysql/src/test/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainerTest.java
new file mode 100644
index 00000000000..5e86a92347b
--- /dev/null
+++ b/modules/mysql/src/test/java/org/testcontainers/mysql/MySQLR2DBCDatabaseContainerTest.java
@@ -0,0 +1,23 @@
+package org.testcontainers.mysql;
+
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.testcontainers.MySQLTestImages;
+import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+
+public class MySQLR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<MySQLContainer> {
+
+    @Override
+    protected ConnectionFactoryOptions getOptions(MySQLContainer container) {
+        return MySQLR2DBCDatabaseContainer.getOptions(container);
+    }
+
+    @Override
+    protected String createR2DBCUrl() {
+        return "r2dbc:tc:mysql:///db?TC_IMAGE_TAG=" + MySQLTestImages.MYSQL_80_IMAGE.getVersionPart();
+    }
+
+    @Override
+    protected MySQLContainer createContainer() {
+        return new MySQLContainer(MySQLTestImages.MYSQL_80_IMAGE);
+    }
+}

From 527a969da8e94b87ab1245cf7fab0ea22bea1366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 15 Oct 2025 14:59:45 -0600
Subject: [PATCH 4693/4969] Fix Pinecone's description

---
 modules/pinecone/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pinecone/build.gradle b/modules/pinecone/build.gradle
index 3ad5b97d98f..ad46d3ce9d9 100644
--- a/modules/pinecone/build.gradle
+++ b/modules/pinecone/build.gradle
@@ -1,4 +1,4 @@
-description = "Testcontainers :: ActiveMQ"
+description = "Testcontainers :: Pinecone"
 
 dependencies {
     api project(':testcontainers')

From da525245459ea00cfd2f22f87e29ab24f7f04d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 16 Oct 2025 08:14:35 -0600
Subject: [PATCH 4694/4969] Remove dynalite documentation

---
 docs/modules/databases/dynalite.md | 47 ------------------------------
 mkdocs.yml                         |  1 -
 2 files changed, 48 deletions(-)
 delete mode 100644 docs/modules/databases/dynalite.md

diff --git a/docs/modules/databases/dynalite.md b/docs/modules/databases/dynalite.md
deleted file mode 100644
index 445395479dd..00000000000
--- a/docs/modules/databases/dynalite.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Dynalite Module
-
-Testcontainers module for [Dynalite](https://github.com/mhart/dynalite). Dynalite is a clone of DynamoDB, enabling local testing.
-
-## Usage example
-
-Running Dynalite as a stand-in for DynamoDB in a test:
-
-```java
-public class SomeTest {
-
-    @Rule
-    public DynaliteContainer dynamoDB = new DynaliteContainer();
-    
-    @Test
-    public void someTestMethod() {
-        // getClient() returns a preconfigured DynamoDB client that is connected to the
-        //  dynalite container
-        final AmazonDynamoDB client = dynamoDB.getClient();
-
-        ... interact with client as if using DynamoDB normally
-```
-
-## Why Dynalite for DynamoDB testing?
-
-In part, because it's light and quick to run. Also, please see the [reasons given](https://github.com/mhart/dynalite#why-not-amazons-dynamodb-local) by the author of Dynalite and the [problems with Amazon's DynamoDB Local](https://github.com/mhart/dynalite#problems-with-amazons-dynamodb-local-updated-2016-04-19).
-
-## Adding this module to your project dependencies
-
-Add the following dependency to your `pom.xml`/`build.gradle` file:
-
-=== "Gradle"
-    ```groovy
-    testImplementation "org.testcontainers:testcontainers-dynalite:{{latest_version}}"
-    ```
-=== "Maven"
-    ```xml
-    <dependency>
-        <groupId>org.testcontainers</groupId>
-        <artifactId>testcontainers-dynalite</artifactId>
-        <version>{{latest_version}}</version>
-        <scope>test</scope>
-    </dependency>
-    ```
-
-!!! hint
-    Adding this Testcontainers library JAR will not automatically add an AWS SDK JAR to your project. You should ensure that your project also has a suitable AWS SDK JAR as a dependency.
diff --git a/mkdocs.yml b/mkdocs.yml
index 2ae8842ffbc..cf8f9dee24e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -58,7 +58,6 @@ nav:
                 - modules/databases/cratedb.md
                 - modules/databases/databend.md
                 - modules/databases/db2.md
-                - modules/databases/dynalite.md
                 - modules/databases/influxdb.md
                 - modules/databases/mariadb.md
                 - modules/databases/mongodb.md

From 55224ce03ced75bf74352e8c469f1260e973ed92 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 13:37:33 -0600
Subject: [PATCH 4695/4969] [create-pull-request] automated change (#11126)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index cf8f9dee24e..60e224f9dfa 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -140,4 +140,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 2.0.0
+    latest_version: 2.0.1

From 10cc854f95fdd6281799bed8f8462afe102d5a36 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 13:37:47 -0600
Subject: [PATCH 4696/4969] [create-pull-request] automated change (#11125)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e5a11dd3ac9..ce0f80d957e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=2.0.0
+testcontainers.version=2.0.1

From 6cc35065a5835eb739ae537c6598e2c4e3e1894a Mon Sep 17 00:00:00 2001
From: Hyunwoo Jung <59077490+noojung@users.noreply.github.com>
Date: Fri, 31 Oct 2025 07:08:22 +0900
Subject: [PATCH 4697/4969] Update kotest-extensions-testcontainers link
 (#11138)

kotest-extensions-testcontainers project moved to the main kotest repository
---
 docs/test_framework_integration/external.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/test_framework_integration/external.md b/docs/test_framework_integration/external.md
index 3f97b9f64cb..3396ff15d52 100644
--- a/docs/test_framework_integration/external.md
+++ b/docs/test_framework_integration/external.md
@@ -5,6 +5,6 @@ The following Open Source frameworks add direct integration to Testcontainers
 | Framework | Source Code | Documentation |
 | --- | --- | --- |
 | jqwik | [jqwik-testcontainers](https://github.com/jqwik-team/jqwik-testcontainers) | [README](https://github.com/jqwik-team/jqwik-testcontainers) |
-| Kotest | [Kotest Extensions Testcontainers](https://github.com/kotest/kotest-extensions-testcontainers) | [kotest.io](https://kotest.io/docs/extensions/test_containers.html) |
+| Kotest | [Kotest Extensions Testcontainers](https://github.com/kotest/kotest/tree/master/kotest-extensions/kotest-extensions-testcontainers) | [kotest.io](https://kotest.io/docs/extensions/test_containers.html) |
 | Synthesized | [Synthesized TDK-Testcontainers integration](https://github.com/synthesized-io/tdk-tc) | [synthesized.io](https://docs.synthesized.io/tdk/latest/user_guide/integrations/testcontainers) |
 | TCI | [Testcontainers Infrastructure (TCI) Framework](https://github.com/xdev-software/tci-base) | [README](https://github.com/xdev-software/tci-base) |

From c504647f533710ee45bd31fea3bfde7c2c3bcc9d Mon Sep 17 00:00:00 2001
From: Guillaume Husta <guillaume.husta@gmail.com>
Date: Thu, 30 Oct 2025 23:44:03 +0100
Subject: [PATCH 4698/4969] Add getBaseUrl() to NginxContainer using
 NGINX_DEFAULT_PORT (#11137)

---
 .../main/java/org/testcontainers/nginx/NginxContainer.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java
index 61ac3678bed..f6eb70814ac 100644
--- a/modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java
+++ b/modules/nginx/src/main/java/org/testcontainers/nginx/NginxContainer.java
@@ -27,4 +27,8 @@ public NginxContainer(final DockerImageName dockerImageName) {
     public URL getBaseUrl(String scheme, int port) throws MalformedURLException {
         return new URL(scheme + "://" + getHost() + ":" + getMappedPort(port));
     }
+
+    public URL getBaseUrl(String scheme) throws MalformedURLException {
+        return getBaseUrl(scheme, NGINX_DEFAULT_PORT);
+    }
 }

From 57e03d0a2ed7c5fa2d639ce0ad883ffc4a1939c2 Mon Sep 17 00:00:00 2001
From: hspragg-godaddy <133794355+hspragg-godaddy@users.noreply.github.com>
Date: Thu, 30 Oct 2025 15:54:17 -0700
Subject: [PATCH 4699/4969] Optimize ScriptSplitter from O(n*m) to O(1) when
 initializing database (#11130)

---
 .../src/main/java/org/testcontainers/ext/ScriptSplitter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
index ba05b71e7bd..d71f6f3ac3d 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
@@ -36,7 +36,7 @@ void split() {
                     //skip
                     break;
                 case WHITESPACE:
-                    if (!sb.toString().endsWith(" ")) {
+                    if (sb.length() == 0 || sb.charAt(sb.length() - 1) != ' ') {
                         sb.append(' ');
                     }
                     break;

From dc3ceda03217f034d86ed52d07e91cc35da5b4d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Nov 2025 22:00:46 +0000
Subject: [PATCH 4700/4969] Bump com.mysql:mysql-connector-j in
 /modules/jdbc-test

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.2.0 to 9.5.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.2.0...9.5.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a6759030313..25f59574c8c 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -10,6 +10,6 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.11'
     api 'org.vibur:vibur-dbcp:26.0'
-    api 'com.mysql:mysql-connector-j:8.2.0'
+    api 'com.mysql:mysql-connector-j:9.5.0'
     api 'org.junit.jupiter:junit-jupiter:5.13.4'
 }

From 2e567000615feb51ea3e927b55e0d21dc0d75aca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Nov 2025 22:09:24 +0000
Subject: [PATCH 4701/4969] Bump io.trino:trino-jdbc from 477 to 478 in
 /modules/trino

Bumps io.trino:trino-jdbc from 477 to 478.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-version: '478'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 6839d4791aa..004bd38a8b9 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:477'
+    testRuntimeOnly 'io.trino:trino-jdbc:478'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From 9938949ea23e380b2a6b09f0770acbfcfa4c0d43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Nov 2025 22:21:43 +0000
Subject: [PATCH 4702/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-free

Bumps com.oracle.database.jdbc:ojdbc11 from 23.9.0.25.07 to 23.26.0.0.0.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.26.0.0.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 769572aaef1..e7cc9669632 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.0.0.0'
 
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 

From 73726f436fb469469986866ab55f67057d0beba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 3 Nov 2025 11:17:39 -0600
Subject: [PATCH 4703/4969] Cleanup japicmp excludes

---
 core/build.gradle                  | 31 ++----------------------------
 modules/cockroachdb/build.gradle   |  6 ------
 modules/couchbase/build.gradle     |  6 ------
 modules/db2/build.gradle           |  6 ------
 modules/elasticsearch/build.gradle |  6 ------
 modules/influxdb/build.gradle      |  6 ------
 modules/localstack/build.gradle    |  6 ------
 modules/mariadb/build.gradle       |  6 ------
 modules/mockserver/build.gradle    |  6 ------
 modules/mongodb/build.gradle       |  6 ------
 modules/mssqlserver/build.gradle   |  6 ------
 modules/mysql/build.gradle         |  6 ------
 modules/neo4j/build.gradle         |  7 -------
 modules/nginx/build.gradle         |  6 ------
 modules/oracle-xe/build.gradle     |  6 ------
 modules/orientdb/build.gradle      |  6 ------
 modules/postgresql/build.gradle    |  6 ------
 modules/pulsar/build.gradle        |  6 ------
 modules/rabbitmq/build.gradle      |  6 ------
 modules/solr/build.gradle          |  6 ------
 modules/toxiproxy/build.gradle     |  6 ------
 21 files changed, 2 insertions(+), 150 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index c967de76bfd..a31a828d8e6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -47,36 +47,9 @@ tasks.japicmp {
         "org.testcontainers.shaded.*",
     ]
 
-    classExcludes = [
-        "org.testcontainers.utility.RyukResourceReaper",
-        "org.testcontainers.containers.FailureDetectingExternalResource",
-        "org.testcontainers.containers.ComposeContainer",
-        "org.testcontainers.containers.DockerComposeContainer",
-        "org.testcontainers.containers.GenericContainer"
-    ]
+    classExcludes = []
 
-    methodExcludes = [
-        "org.testcontainers.containers.Container#getDockerClient()",
-        "org.testcontainers.containers.ContainerState#getDockerClient()",
-        "org.testcontainers.containers.ContainerState#execInContainer(org.testcontainers.containers.ExecConfig)",
-        "org.testcontainers.containers.ContainerState#execInContainer(java.nio.charset.Charset,org.testcontainers.containers.ExecConfig)",
-        "org.testcontainers.containers.ComposeContainer#apply(org.junit.runners.model.Statement, org.junit.runner.Description)",
-        "org.testcontainers.containers.ComposeContainer#failed(java.lang.Throwable, org.junit.runner.Description)",
-        "org.testcontainers.containers.ComposeContainer#finished(org.junit.runner.Description)",
-        "org.testcontainers.containers.ComposeContainer#starting(org.junit.runner.Description)",
-        "org.testcontainers.containers.ComposeContainer#succeeded(org.junit.runner.Description)",
-        "org.testcontainers.containers.DockerComposeContainer#apply(org.junit.runners.model.Statement, org.junit.runner.Description)",
-        "org.testcontainers.containers.DockerComposeContainer#failed(java.lang.Throwable, org.junit.runner.Description)",
-        "org.testcontainers.containers.DockerComposeContainer#finished(org.junit.runner.Description)",
-        "org.testcontainers.containers.DockerComposeContainer#starting(org.junit.runner.Description)",
-        "org.testcontainers.containers.DockerComposeContainer#succeeded(org.junit.runner.Description)",
-        "org.testcontainers.containers.GenericContainer#apply(org.junit.runners.model.Statement, org.junit.runner.Description)",
-        "org.testcontainers.containers.GenericContainer#failed(java.lang.Throwable, org.junit.runner.Description)",
-        "org.testcontainers.containers.GenericContainer#finished(org.junit.runner.Description)",
-        "org.testcontainers.containers.GenericContainer#starting(org.junit.runner.Description)",
-        "org.testcontainers.containers.GenericContainer#succeeded(org.junit.runner.Description)",
-        'org.testcontainers.containers.Network$NetworkImpl#after()'
-    ]
+    methodExcludes = []
 
     fieldExcludes = []
 }
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 8b48153b4d7..6d7acda1515 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -7,9 +7,3 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.CockroachContainer"
-    ]
-}
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 4b34a540ac6..251aa918330 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -8,9 +8,3 @@ dependencies {
     testImplementation 'com.couchbase.client:java-client:3.9.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.couchbase.CouchbaseContainer"
-    ]
-}
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 2d938428d0c..a15081c9614 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -6,9 +6,3 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.Db2Container"
-    ]
-}
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 1bac3a94d8c..e1926d25028 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -6,9 +6,3 @@ dependencies {
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.4"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.elasticsearch.ElasticsearchContainer"
-    ]
-}
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 958e1ceb101..53056f2f5bc 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -8,9 +8,3 @@ dependencies {
     testImplementation 'org.influxdb:influxdb-java:2.25'
     testImplementation "com.influxdb:influxdb-client-java:7.3.0"
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.InfluxDBContainer"
-    ]
-}
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
index 38ea6eabb68..5b76d4581ba 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -10,9 +10,3 @@ dependencies {
     testImplementation 'software.amazon.awssdk:lambda'
     testImplementation 'software.amazon.awssdk:kms'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.localstack.LocalStackContainer"
-    ]
-}
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
index 465b9555b4d..2cfef8d924c 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -12,9 +12,3 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.MariaDBContainer"
-    ]
-}
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index bfd7a9261ac..aa06ec3af1e 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -6,9 +6,3 @@ dependencies {
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.MockServerContainer"
-    ]
-}
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
index 729cf59aab1..8e9f1420ddf 100644
--- a/modules/mongodb/build.gradle
+++ b/modules/mongodb/build.gradle
@@ -5,9 +5,3 @@ dependencies {
 
     testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.MongoDBContainer"
-    ]
-}
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 992d64004e6..ca6fd1b66bb 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -15,9 +15,3 @@ dependencies {
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.MSSQLServerContainer"
-    ]
-}
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
index b387b05cb2f..1ec899c424e 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -14,9 +14,3 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.MySQLContainer"
-    ]
-}
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index 3a013391742..b8bc956b825 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -35,10 +35,3 @@ dependencies {
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.21'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.Neo4jContainer",
-        "org.testcontainers.containers.Neo4jLabsPlugin"
-    ]
-}
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 732cee22faf..13bd94d88d2 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -4,9 +4,3 @@ dependencies {
     api project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.NginxContainer"
-    ]
-}
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index f8a7b1f07db..0f2e76b29b1 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -14,9 +14,3 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.OracleContainer"
-    ]
-}
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 2de0c86dee4..e815c9ff111 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -8,9 +8,3 @@ dependencies {
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.OrientDBContainer"
-    ]
-}
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
index 3a04623e1ce..cf1c69a9a19 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -14,9 +14,3 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.PostgreSQLContainer"
-    ]
-}
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index 106b578dfef..eb8053cc71b 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -7,9 +7,3 @@ dependencies {
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.PulsarContainer"
-    ]
-}
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index f1d273b75bb..f83ca738d0b 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -6,9 +6,3 @@ dependencies {
     testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.RabbitMQContainer"
-    ]
-}
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index c4966152fba..8340de66f2c 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -7,9 +7,3 @@ dependencies {
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.4'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.SolrContainer"
-    ]
-}
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 8de52580b78..d6480227889 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -6,9 +6,3 @@ dependencies {
 
     testImplementation 'redis.clients:jedis:6.2.0'
 }
-
-tasks.japicmp {
-    classExcludes = [
-        "org.testcontainers.containers.ToxiproxyContainer"
-    ]
-}

From 6b060c7990a4bafeea85fac7bf1176a17a9ac3f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 17:49:10 +0000
Subject: [PATCH 4704/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 23.9.0.25.07 to 23.26.0.0.0.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.26.0.0.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 0f2e76b29b1..6faeeb9367e 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.0.0.0'
 
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 

From ab254863e363799c931d4f0fefbfae52801085b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 12 Nov 2025 14:32:21 -0600
Subject: [PATCH 4705/4969] Fix ollama example (#11217)

---
 .../example/ollamahf/OllamaHuggingFaceContainer.java  | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java b/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java
index 55fd110fa13..58267134a5f 100644
--- a/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java
+++ b/examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java
@@ -28,14 +28,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
             executeCommand("apt-get", "upgrade", "-y");
             executeCommand("apt-get", "install", "-y", "python3-pip");
             executeCommand("pip", "install", "huggingface-hub");
-            executeCommand(
-                "huggingface-cli",
-                "download",
-                huggingFaceModel.repository,
-                huggingFaceModel.model,
-                "--local-dir",
-                "."
-            );
+            executeCommand("hf", "download", huggingFaceModel.repository, huggingFaceModel.model, "--local-dir", ".");
             executeCommand("sh", "-c", String.format("echo '%s' > Modelfile", huggingFaceModel.modelfileContent));
             executeCommand("ollama", "create", huggingFaceModel.model, "-f", "Modelfile");
             executeCommand("rm", huggingFaceModel.model);
@@ -48,7 +41,7 @@ private void executeCommand(String... command) throws ContainerLaunchException,
         ExecResult execResult = execInContainer(command);
         if (execResult.getExitCode() > 0) {
             throw new ContainerLaunchException(
-                "Failed to execute " + String.join(" ", command) + ": " + execResult.getStderr()
+                "Failed to execute " + String.join(" ", command) + ": " + execResult.getStdout()
             );
         }
     }

From 58119ed04d53efc1e5af84700320731eae574917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 12 Nov 2025 14:55:17 -0600
Subject: [PATCH 4706/4969] Set default docker API version to 1.44 (#11216)

Fixes #11212
---
 .../dockerclient/DockerClientProviderStrategy.java             | 2 +-
 .../testcontainers/junit/ComposeContainerWithBuildTest.java    | 3 ++-
 .../junit/DockerComposeContainerWithBuildTest.java             | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index 33f59c78ddb..e16beeb6614 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -404,7 +404,7 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
         DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
 
         if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
-            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32);
+            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
         }
         Map<String, String> headers = new HashMap<>();
         headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
index 03ced374f70..454dae985be 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
@@ -10,6 +10,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
@@ -97,7 +98,7 @@ private boolean isImagePresent(final String imageName) {
             .instance()
             .client()
             .listImagesCmd()
-            .withImageNameFilter(imageName)
+            .withFilter("reference", Collections.singletonList(imageName))
             .exec()
             .stream()
             .findFirst()
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
index 4c3c69e8d76..f0cbe11cbb9 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java
@@ -10,6 +10,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
@@ -102,7 +103,7 @@ private boolean isImagePresent(final String imageName) {
             .instance()
             .client()
             .listImagesCmd()
-            .withImageNameFilter(imageName)
+            .withFilter("reference", Collections.singletonList(imageName))
             .exec()
             .stream()
             .findFirst()

From f3e4cd594f255ddbbc0668655dfe4bf318b1ae4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 12 Nov 2025 21:42:38 -0600
Subject: [PATCH 4707/4969] Update docker-java version to 3.7.0 (#11218)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index a31a828d8e6..da9ec1f2a44 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -80,8 +80,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.6.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.6.0')
+    api platform('com.github.docker-java:docker-java-bom:3.7.0')
+    shaded platform('com.github.docker-java:docker-java-bom:3.7.0')
 
     api "com.github.docker-java:docker-java-api"
 

From a434e357a27238fc043b5891f07c49ae4a5cb588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 13 Nov 2025 09:17:42 -0600
Subject: [PATCH 4708/4969] Set version to moby-latest workflow

---
 .github/workflows/moby-latest.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index b6af77feb2a..c948de0c70c 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -14,9 +14,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - { install-docker-type: "STABLE", channel: stable, rootless: false }
-          - { install-docker-type: "ROOTLESS", channel: stable, rootless: true }
-          - { install-docker-type: "ROOTFUL", channel: test, rootless: false }
+          - { install-docker-type: "STABLE", version: latest, channel: stable, rootless: false }
+          - { install-docker-type: "ROOTLESS", version: latest, channel: stable, rootless: true }
+          - { install-docker-type: "ROOTFUL", version: edge, channel: test, rootless: false }
     name: "Core tests using Docker ${{ matrix.install-docker-type }} (channel ${{ matrix.channel }})"
     runs-on: ubuntu-22.04
     continue-on-error: true
@@ -28,6 +28,7 @@ jobs:
         id: setup_docker
         uses: docker/setup-docker-action@v4
         with:
+          version: ${{ matrix.version }}
           channel: ${{ matrix.channel }}
           rootless: ${{ matrix.rootless }}
 

From 9dcf4f0910b868565637fae29ecff0026a2700a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 13 Nov 2025 10:36:50 -0600
Subject: [PATCH 4709/4969] Add docker version input in moby-latest workflow

---
 .github/workflows/moby-latest.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index c948de0c70c..aa6a8afa809 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -2,6 +2,12 @@ name: Tests against recent Docker engine releases
 
 on:
   workflow_dispatch:
+    inputs:
+      version:
+        description: 'Docker version'
+        required: false
+        default: 'latest'
+        type: string
   schedule:
     # nightly build, at 23:59 CEST
     - cron:  '59 23 * * *'
@@ -14,8 +20,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - { install-docker-type: "STABLE", version: latest, channel: stable, rootless: false }
-          - { install-docker-type: "ROOTLESS", version: latest, channel: stable, rootless: true }
+          - { install-docker-type: "STABLE", version: "${{ inputs.version }}", channel: stable, rootless: false }
+          - { install-docker-type: "ROOTLESS", version: "${{ inputs.version }}", channel: stable, rootless: true }
           - { install-docker-type: "ROOTFUL", version: edge, channel: test, rootless: false }
     name: "Core tests using Docker ${{ matrix.install-docker-type }} (channel ${{ matrix.channel }})"
     runs-on: ubuntu-22.04

From 623ea96b36ba0eed442f41e1de58bcb37f7cd3e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 13 Nov 2025 11:44:41 -0600
Subject: [PATCH 4710/4969] Update docker image version to 25.0.5 (#11219)

---
 .../ComposeContainerWithServicesTest.java      | 18 +++++++++---------
 .../junit/ComposeContainerOverrideTest.java    |  4 ++--
 .../junit/ComposeContainerPortViaEnvTest.java  |  2 +-
 .../junit/ComposeContainerScalingTest.java     |  2 +-
 .../junit/ComposeContainerTest.java            |  4 ++--
 .../ComposeContainerVolumeRemovalTest.java     |  2 +-
 .../junit/ComposeContainerWithBuildTest.java   |  2 +-
 .../ComposeContainerWithCopyFilesTest.java     |  8 ++++----
 .../ComposeContainerWithWaitStrategies.java    |  4 ++--
 .../junit/ComposeErrorHandlingTest.java        |  2 +-
 .../junit/ComposePassthroughTest.java          |  2 +-
 .../junit/ComposeWaitStrategyTest.java         |  2 +-
 .../junit/ComposeWithIdentifierTest.java       |  2 +-
 .../junit/ComposeWithNetworkTest.java          |  2 +-
 .../spock/ComposeContainerIT.groovy            |  2 +-
 .../spock/SharedComposeContainerIT.groovy      |  2 +-
 16 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
index 8b3b3fa8fa5..0e921316bf3 100644
--- a/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
+++ b/core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java
@@ -31,7 +31,7 @@ class ComposeContainerWithServicesTest {
     @Test
     void testDesiredSubsetOfServicesAreStarted() {
         try (
-            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE)
                 .withServices("redis")
         ) {
             compose.start();
@@ -43,7 +43,7 @@ void testDesiredSubsetOfServicesAreStarted() {
     @Test
     void testDesiredSubsetOfScaledServicesAreStarted() {
         try (
-            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE)
                 .withScaledService("redis", 2)
         ) {
             compose.start();
@@ -55,7 +55,7 @@ void testDesiredSubsetOfScaledServicesAreStarted() {
     @Test
     void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
         try (
-            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE)
                 .withServices("redis")
                 .withScaledService("redis", 2)
         ) {
@@ -68,7 +68,7 @@ void testDesiredSubsetOfSpecifiedAndScaledServicesAreStarted() {
     @Test
     void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
         try (
-            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE)
                 .withServices("other")
                 .withScaledService("redis", 2)
         ) {
@@ -81,7 +81,7 @@ void testDesiredSubsetOfSpecifiedOrScaledServicesAreStarted() {
     @Test
     void testAllServicesAreStartedIfNotSpecified() {
         try (
-            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), SIMPLE_COMPOSE_FILE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), SIMPLE_COMPOSE_FILE)
         ) {
             compose.start();
 
@@ -93,7 +93,7 @@ void testAllServicesAreStartedIfNotSpecified() {
     void testScaleInComposeFileIsRespected() {
         try (
             ComposeContainer compose = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 COMPOSE_FILE_WITH_INLINE_SCALE
             )
         ) {
@@ -110,7 +110,7 @@ void testStartupTimeoutSetsTheHighestTimeout() {
             catchThrowable(() -> {
                 try (
                     ComposeContainer compose = new ComposeContainer(
-                        DockerImageName.parse("docker:24.0.2"),
+                        DockerImageName.parse("docker:25.0.5"),
                         SIMPLE_COMPOSE_FILE
                     )
                         .withServices("redis")
@@ -133,7 +133,7 @@ void testStartupTimeoutSetsTheHighestTimeout() {
     void testWaitingForHealthcheck() {
         try (
             ComposeContainer compose = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 COMPOSE_FILE_WITH_HEALTHCHECK
             )
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
@@ -148,7 +148,7 @@ void testWaitingForHealthcheck() {
     void testWaitingForHealthcheckWithRestartDoesNotCrash() {
         try (
             ComposeContainer compose = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 COMPOSE_FILE_WITH_HEALTHCHECK
             )
                 .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
index 028d883b320..bf38af0f929 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
@@ -19,7 +19,7 @@ class ComposeContainerOverrideTest {
     @Test
     void readEnvironment() {
         try (
-            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), BASE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE)
                 .withExposedService("redis", 6379)
         ) {
             compose.start();
@@ -34,7 +34,7 @@ void readEnvironment() {
     @Test
     void resetEnvironment() {
         try (
-            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), BASE, OVERRIDE)
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE, OVERRIDE)
                 .withExposedService("redis", 6379)
         ) {
             compose.start();
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
index b45db1a4f8a..f0a8873f8f3 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerPortViaEnvTest.java
@@ -10,7 +10,7 @@ class ComposeContainerPortViaEnvTest extends BaseComposeTest {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
-        DockerImageName.parse("docker:24.0.2"),
+        DockerImageName.parse("docker:25.0.5"),
         new File("src/test/resources/v2-compose-test-port-via-env.yml")
     )
         .withExposedService("redis-1", REDIS_PORT)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
index 50c6ef062ef..3ef559bcda3 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerScalingTest.java
@@ -27,7 +27,7 @@ public static void checkVersion() {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
-        DockerImageName.parse("docker:24.0.2"),
+        DockerImageName.parse("docker:25.0.5"),
         new File("src/test/resources/composev2/scaled-compose-test.yml")
     )
         .withScaledService("redis", 3)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
index 9e68c7513df..9f3299ab441 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerTest.java
@@ -18,7 +18,7 @@ class ComposeContainerTest extends BaseComposeTest {
 
     // composeContainerConstructor {
     public ComposeContainer environment = new ComposeContainer(
-        DockerImageName.parse("docker:24.0.2"),
+        DockerImageName.parse("docker:25.0.5"),
         new File("src/test/resources/composev2/compose-test.yml")
     )
         .withExposedService("redis-1", REDIS_PORT)
@@ -88,7 +88,7 @@ void shouldCreateContainerWhenFileNotPrefixedWithPath() throws IOException {
         Files.write(filePathNotStartWithDotSlash.toPath(), validYaml.getBytes(StandardCharsets.UTF_8));
 
         final ComposeContainer dockerComposeContainer = new ComposeContainer(
-            DockerImageName.parse("docker:24.0.2"),
+            DockerImageName.parse("docker:25.0.5"),
             filePathNotStartWithDotSlash
         );
         assertThat(dockerComposeContainer).as("Container created using docker compose file").isNotNull();
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
index cebfc2a9706..d194204078f 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
@@ -29,7 +29,7 @@ void performTest(boolean removeVolumes, boolean shouldVolumesBePresentAfterRunni
 
         final AtomicReference<String> volumeName = new AtomicReference<>("");
         try (
-            ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), composeFile)
+            ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), composeFile)
                 .withExposedService("redis", 6379)
                 .withRemoveVolumes(removeVolumes)
                 .withRemoveImages(ComposeContainer.RemoveImages.ALL)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
index 454dae985be..714767914a0 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java
@@ -39,7 +39,7 @@ void performTest(
         final AtomicReference<String> builtImageName = new AtomicReference<>("");
         final AtomicReference<String> pulledImageName = new AtomicReference<>("");
         try (
-            ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:24.0.2"), composeFile)
+            ComposeContainer environment = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), composeFile)
                 .withExposedService("customredis", 6379)
                 .withBuild(true)
                 .withRemoveImages(removeMode)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
index cc9c2dad594..3568550ca38 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithCopyFilesTest.java
@@ -18,7 +18,7 @@ class ComposeContainerWithCopyFilesTest {
     void testShouldCopyAllFilesByDefault() throws IOException {
         try (
             ComposeContainer environment = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose.yml")
             )
                 .withExposedService("app", 8080)
@@ -34,7 +34,7 @@ void testShouldCopyAllFilesByDefault() throws IOException {
     void testWithFileCopyInclusionUsingFilePath() throws IOException {
         try (
             ComposeContainer environment = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-root-only.yml")
             )
                 .withExposedService("app", 8080)
@@ -54,7 +54,7 @@ void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
         try (
             // composeContainerWithCopyFiles {
             ComposeContainer environment = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
             )
                 .withExposedService("app", 8080)
@@ -73,7 +73,7 @@ void testWithFileCopyInclusionUsingDirectoryPath() throws IOException {
     void testShouldNotBeAbleToStartIfNeededEnvFileIsNotCopied() {
         try (
             ComposeContainer environment = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 new File("src/test/resources/compose-file-copy-inclusions/compose-test-only.yml")
             )
                 .withExposedService("app", 8080)
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
index 07ce8e41ef1..3330b302ed3 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
@@ -19,7 +19,7 @@ void testComposeContainerConstructor() {
         try (
             // composeContainerWithCombinedWaitStrategies {
             ComposeContainer compose = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 new File("src/test/resources/composev2/compose-test.yml")
             )
                 .withExposedService("redis-1", REDIS_PORT, Wait.forSuccessfulCommand("redis-cli ping"))
@@ -36,7 +36,7 @@ void testComposeContainerWaitForPortWithTimeout() {
         try (
             // composeContainerWaitForPortWithTimeout {
             ComposeContainer compose = new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 new File("src/test/resources/composev2/compose-test.yml")
             )
                 .withExposedService(
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
index acabcaf9e87..df4338ec236 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeErrorHandlingTest.java
@@ -16,7 +16,7 @@ void simpleTest() {
         assertThat(
             catchThrowable(() -> {
                 ComposeContainer environment = new ComposeContainer(
-                    DockerImageName.parse("docker:24.0.2"),
+                    DockerImageName.parse("docker:25.0.5"),
                     new File("src/test/resources/invalid-compose.yml")
                 )
                     .withExposedService("something", 123);
diff --git a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
index 7bc47d79c9d..38d0139c1cc 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposePassthroughTest.java
@@ -27,7 +27,7 @@ public static void checkVersion() {
 
     @AutoClose
     public ComposeContainer compose = new ComposeContainer(
-        DockerImageName.parse("docker:24.0.2"),
+        DockerImageName.parse("docker:25.0.5"),
         new File("src/test/resources/v2-compose-test-passthrough.yml")
     )
         .withEnv("foo", "bar")
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
index 2bec1aec819..371c70dafac 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWaitStrategyTest.java
@@ -26,7 +26,7 @@ class ComposeWaitStrategyTest {
     public final void setUp() {
         environment =
             new ComposeContainer(
-                DockerImageName.parse("docker:24.0.2"),
+                DockerImageName.parse("docker:25.0.5"),
                 new File("src/test/resources/composev2/compose-test.yml")
             );
     }
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
index c02b9874126..0a5c0b868c8 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithIdentifierTest.java
@@ -10,7 +10,7 @@ class ComposeWithIdentifierTest extends BaseComposeTest {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
-        DockerImageName.parse("docker:24.0.2"),
+        DockerImageName.parse("docker:25.0.5"),
         "TEST",
         new File("src/test/resources/v2-compose-test.yml")
     )
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
index 1003c3d5404..9fdf55a83a1 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeWithNetworkTest.java
@@ -10,7 +10,7 @@ class ComposeWithNetworkTest extends BaseComposeTest {
 
     @AutoClose
     public ComposeContainer environment = new ComposeContainer(
-        DockerImageName.parse("docker:24.0.2"),
+        DockerImageName.parse("docker:25.0.5"),
         new File("src/test/resources/v2-compose-test-with-network.yml")
     )
         .withExposedService("redis-1", REDIS_PORT);
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
index a190f1ea3b6..89de5aed88d 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/ComposeContainerIT.groovy
@@ -11,7 +11,7 @@ import spock.lang.Specification
 class ComposeContainerIT extends Specification {
 
 	ComposeContainer composeContainer = new ComposeContainer(
-	DockerImageName.parse("docker:24.0.2"),
+	DockerImageName.parse("docker:25.0.5"),
 	new File("src/test/resources/docker-compose.yml"))
 	.withExposedService("whoami-1", 80, Wait.forHttp("/"))
 
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
index 020005f923f..dc71687011f 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/SharedComposeContainerIT.groovy
@@ -13,7 +13,7 @@ class SharedComposeContainerIT extends Specification {
 
 	@Shared
 	ComposeContainer composeContainer = new ComposeContainer(
-	DockerImageName.parse("docker:24.0.2"),
+	DockerImageName.parse("docker:25.0.5"),
 	new File("src/test/resources/docker-compose.yml"))
 	.withExposedService("whoami-1", 80, Wait.forHttp("/"))
 

From c331fe6e2696d4d53a97ce044c176bfc03e3944b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Nov 2025 16:47:01 -0600
Subject: [PATCH 4711/4969] [create-pull-request] automated change (#11221)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 60e224f9dfa..04842f28fcd 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -140,4 +140,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 2.0.1
+    latest_version: 2.0.2

From a3a44ddb0bf0d07a036c6fabb028fe3964f3599f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Nov 2025 16:47:21 -0600
Subject: [PATCH 4712/4969] [create-pull-request] automated change (#11220)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ce0f80d957e..ec5fc8fddec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=2.0.1
+testcontainers.version=2.0.2

From 01aad116fc25a96bcb10606cab1ded6c8fb0b286 Mon Sep 17 00:00:00 2001
From: Jack Green <JackPGreen@Gmail.com>
Date: Thu, 13 Nov 2025 22:48:16 +0000
Subject: [PATCH 4713/4969] Fix GitHub-Action Generate PR descriptions (#11129)

When `update-docs-version` ran, it created this PR - https://github.com/testcontainers/testcontainers-java/pull/11110:
> Update docs version to ${GITHUB_REF##*/}
Update docs version to ${GITHUB_REF##*/}

The branch name was not expanded in the PR description, it uses Bash syntax not applicable outside of a `run` block

Fixed by replacing Bash expansion to derive the branch name with the _actual_ branch name.
---
 .github/workflows/update-docs-version.yml           | 6 +++---
 .github/workflows/update-testcontainers-version.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 5bbf47c3484..6e9981b19ac 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -20,14 +20,14 @@ jobs:
           ref: main
       - name: Update latest_version property in mkdocs.yml
         run: |
-          sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
+          sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF_NAME}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
         with:
-          title: Update docs version to ${GITHUB_REF##*/}
+          title: Update docs version to ${{ github.ref_name }}
           body: |
-            Update docs version to ${GITHUB_REF##*/}
+            Update docs version to ${{ github.ref_name }}
             skip-checks: true
           branch: update-docs-version
           delete-branch: true
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 90d249c7d3f..9cf679e8952 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -20,13 +20,13 @@ jobs:
           ref: main
       - name: Update testcontainers.version property in gradle.properties
         run: |
-          sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
+          sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF_NAME}/g" gradle.properties
           git diff
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
         with:
-          title: Update testcontainers version to ${GITHUB_REF##*/}
+          title: Update testcontainers version to ${{ github.ref_name }}
           body: |
-            Update testcontainers version to ${GITHUB_REF##*/}
+            Update testcontainers version to ${{ github.ref_name }}
           branch: update-tc-version
           delete-branch: true

From 2b53c476a249b58e7f7d827f20dcdb7e6fdf4d0e Mon Sep 17 00:00:00 2001
From: John William Vicente <58832150+JohnWill14@users.noreply.github.com>
Date: Thu, 13 Nov 2025 19:49:32 -0300
Subject: [PATCH 4714/4969] Dead links in CircleCI reference documentation
 (#10789)

---
 .../continuous_integration/circle_ci.md                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/supported_docker_environment/continuous_integration/circle_ci.md b/docs/supported_docker_environment/continuous_integration/circle_ci.md
index d6e85a62a79..936192cc799 100644
--- a/docs/supported_docker_environment/continuous_integration/circle_ci.md
+++ b/docs/supported_docker_environment/continuous_integration/circle_ci.md
@@ -1,7 +1,7 @@
 # CircleCI (Cloud, Server v2.x, and Server v3.x)
 
 Your CircleCI configuration should use a dedicated VM for Testcontainers to work. You can achieve this by specifying the 
-executor type in your `.circleci/config.yml` to be `machine` instead of the default `docker` executor (see [Choosing an Executor Type](https://circleci.com/docs/2.0/executor-types/) for more info).  
+executor type in your `.circleci/config.yml` to be `machine` instead of the default `docker` executor (see [Choosing an Executor Type](https://circleci.com/docs/executor-intro) for more info).  
 
 Here is a sample CircleCI configuration that does a checkout of a project and runs Maven:
 

From bf039b0019bfdc35834ee931adced6e8ae580e91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 01:23:56 +0000
Subject: [PATCH 4715/4969] Bump com.clickhouse:clickhouse-jdbc in
 /modules/clickhouse

Bumps [com.clickhouse:clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-java) from 0.9.2 to 0.9.4.
- [Release notes](https://github.com/ClickHouse/clickhouse-java/releases)
- [Changelog](https://github.com/ClickHouse/clickhouse-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ClickHouse/clickhouse-java/compare/v0.9.2...v0.9.4)

---
updated-dependencies:
- dependency-name: com.clickhouse:clickhouse-jdbc
  dependency-version: 0.9.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 1579ea834ce..91d80a687d7 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,12 +5,12 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.2', classifier: 'http')
+    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.4', classifier: 'http')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.2', classifier: 'all')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.4', classifier: 'all')
 
-    testImplementation 'com.clickhouse:client-v2:0.9.2'
+    testImplementation 'com.clickhouse:client-v2:0.9.4'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.2', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.4', classifier: 'http')
 }

From 3429129c4aabacd49bd9bb0fcd056df0aeb45319 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 02:02:12 +0000
Subject: [PATCH 4716/4969] Bump org.apache.commons:commons-lang3 in
 /modules/jdbc-test

Bumps org.apache.commons:commons-lang3 from 3.19.0 to 3.20.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a6759030313..907f0760540 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     api 'com.google.guava:guava:33.5.0-jre'
-    api 'org.apache.commons:commons-lang3:3.19.0'
+    api 'org.apache.commons:commons-lang3:3.20.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 

From bbd1bb0dbfcf1c2e3aae210ce47d13d566f76fca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 02:02:25 +0000
Subject: [PATCH 4717/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.11 to 11.0.14.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 958734d33e1..f34c99c0385 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.11'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From b7602dbaeaa8a02ecc080e3c9680f486d1d6611b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 02:02:30 +0000
Subject: [PATCH 4718/4969] Bump org.apache.tomcat:tomcat-jdbc in
 /modules/jdbc-test

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.11 to 11.0.14.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a6759030313..a8940c591f9 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.27.6'
 
-    api 'org.apache.tomcat:tomcat-jdbc:11.0.11'
+    api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'com.mysql:mysql-connector-j:8.2.0'
     api 'org.junit.jupiter:junit-jupiter:5.13.4'

From 2cb913cf7047e08671ace70c0d4880e0aa4fb35b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 02:04:57 +0000
Subject: [PATCH 4719/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/azure

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.2.0.jre8 to 13.3.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.3.0.jre8-preview
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 517a981b707..e68cadf8b6e 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'com.azure:azure-data-tables'
     testImplementation 'com.azure:azure-messaging-eventhubs'
     testImplementation 'com.azure:azure-messaging-servicebus'
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.3.0.jre8-preview'
 }

From 5f96a1b91532af039b118b496d27e6958d48c6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 2 Dec 2025 22:05:53 +0100
Subject: [PATCH 4720/4969] Exclude JUnit 6 via dependabot

---
 .github/dependabot.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 72a6d9110b6..01674d35061 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,6 +18,10 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
@@ -30,6 +34,10 @@ updates:
     ignore:
       - dependency-name: "com.gradleup.shadow"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"
@@ -347,6 +355,9 @@ updates:
     directory: "/modules/spock"
     schedule:
       interval: "monthly"
+    ignore:
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/tidb"
@@ -412,6 +423,10 @@ updates:
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
       - dependency-name: "com.hazelcast:hazelcast"
         update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
 
 # Smoke test
   - package-ecosystem: "gradle"
@@ -424,6 +439,10 @@ updates:
         update-types: [ "version-update:semver-minor" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From 3b788ccd2f2c36abc363e7f18888f03991efe32d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 21:10:54 +0000
Subject: [PATCH 4721/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.2.0.jre8 to 13.3.0.jre8-preview.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.3.0.jre8-preview
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 ca6fd1b66bb..6561dbbe486 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.3.0.jre8-preview'
 
     testImplementation project(':testcontainers-r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'

From bb80763782060a48bf4b2c44b815c6763e267094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 2 Dec 2025 22:16:11 +0100
Subject: [PATCH 4722/4969] Revert "Skip databend module in CI (#10793)"

This reverts commit 15f3c0da97deef1e08593fa40a906873faebd84a.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa2946ea657..8d7f5f65a27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,7 +98,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
-          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers-databend:check" or . == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:

From e1e150ba255ab10cce776591c2d8e57589f85d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 2 Dec 2025 23:06:46 +0100
Subject: [PATCH 4723/4969] Exclude com.gradleup.shadow via dependabot

---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 01674d35061..1e89c9cb9e3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -38,6 +38,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.junit.platform:junit-platform-launcher"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "com.gradleup.shadow"
+        update-types: [ "version-update:semver-major" ]
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"
@@ -427,6 +429,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.junit.platform:junit-platform-launcher"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "com.gradleup.shadow"
+        update-types: [ "version-update:semver-major" ]
 
 # Smoke test
   - package-ecosystem: "gradle"
@@ -443,6 +447,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.junit.platform:junit-platform-launcher"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "com.gradleup.shadow"
+        update-types: [ "version-update:semver-major" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

From 786877eac4e5006251248f0a984c16e5ec89dba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 2 Dec 2025 23:16:48 +0100
Subject: [PATCH 4724/4969] Exclude JUnit 6 via dependabot

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1e89c9cb9e3..2d5826c160a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -153,6 +153,8 @@ updates:
     ignore:
       - dependency-name: "org.apache.tomcat:tomcat-jdbc"
         update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/junit-jupiter"
     schedule:

From 7d25a3118360271966ab0f378f5039aa1d9da723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 3 Dec 2025 15:56:10 +0100
Subject: [PATCH 4725/4969] Fix dependabot

---
 .github/dependabot.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2d5826c160a..1a71f6e1cb6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -38,8 +38,6 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.junit.platform:junit-platform-launcher"
         update-types: [ "version-update:semver-major" ]
-      - dependency-name: "com.gradleup.shadow"
-        update-types: [ "version-update:semver-major" ]
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"

From fa9c69a742305a02f839c3aee3c5b2ca54ea1442 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 15:50:30 +0000
Subject: [PATCH 4726/4969] Bump com.databend:databend-jdbc from 0.4.0 to 0.4.1
 in /modules/databend

Bumps [com.databend:databend-jdbc](https://github.com/databendcloud/databend-jdbc) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/databendcloud/databend-jdbc/releases)
- [Commits](https://github.com/databendcloud/databend-jdbc/compare/v0.4.0...v0.4.1)

---
updated-dependencies:
- dependency-name: com.databend:databend-jdbc
  dependency-version: 0.4.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index d9a5655b4ed..9da45a6fab9 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.databend:databend-jdbc:0.4.0'
+    testRuntimeOnly 'com.databend:databend-jdbc:0.4.1'
 }

From 15b9397a1eb0d72c48d43540afb94ec2f600a7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 4 Dec 2025 15:06:57 -0600
Subject: [PATCH 4727/4969] Exclude JUnit 6 via dependabot

---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1a71f6e1cb6..5e1b5000846 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -161,6 +161,8 @@ updates:
     ignore:
       - dependency-name: "org.mockito:mockito-core"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/k3s"
     schedule:
@@ -314,6 +316,8 @@ updates:
     ignore:
       - dependency-name: "io.r2dbc:r2dbc-spi"
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/rabbitmq"
     schedule:

From 6385e83974b958c0a380130192e0cbf414711f8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:12:01 +0000
Subject: [PATCH 4728/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/r2dbc

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.4 to 5.14.1.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r5.14.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.14.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 1e777a82d55..ecf02924009 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -13,5 +13,5 @@ dependencies {
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.7.11'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.6'
-    testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
 }

From a8042ffdc9c6058b6f3a698216274077a29abbbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:52:55 +0000
Subject: [PATCH 4729/4969] Bump com.mysql:mysql-connector-j from 8.2.0 to
 9.5.0 in /modules/tidb

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.2.0 to 9.5.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.2.0...9.5.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 66298ac6635..264d00fc883 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From 57663e027b92816fcdf2c27c271eea80348136c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 01:13:58 +0000
Subject: [PATCH 4730/4969] Bump com.squareup.okhttp3:okhttp from 5.1.0 to
 5.3.2 in /modules/azure

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 5.1.0 to 5.3.2.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-5.1.0...parent-5.3.2)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.3.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index e68cadf8b6e..681a6dc47e6 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-mssqlserver')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
     testImplementation 'com.azure:azure-cosmos'

From 744538daa0a8dfe532a6fac02075282988715c5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:11:02 +0000
Subject: [PATCH 4731/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/jdbc-test

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.4 to 5.14.1.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r5.14.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.14.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 5f4e0baafbd..f7b081acf7b 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'com.mysql:mysql-connector-j:9.5.0'
-    api 'org.junit.jupiter:junit-jupiter:5.13.4'
+    api 'org.junit.jupiter:junit-jupiter:5.14.1'
 }

From 978ae2c1447aaf710cc4d2ec7a8d4972bec1e8ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:17:11 +0000
Subject: [PATCH 4732/4969] Bump com.squareup.okhttp3:okhttp in
 /modules/couchbase

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 5.1.0 to 5.3.2.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-5.1.0...parent-5.3.2)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.3.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 251aa918330..e08696a654a 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation 'com.couchbase.client:java-client:3.9.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'

From 801393ba8a9787a3c3a32ed2ec4055b0659f4862 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:17:57 +0000
Subject: [PATCH 4733/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.7.4 to 3.8.0.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.7.4...3.8.0)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-version: 3.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index e815c9ff111..c9b492de2f9 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.44"
 
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.8.0'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
 }

From 7a362fd8f2731bc07810b10ac74bc048918f641d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:18:01 +0000
Subject: [PATCH 4734/4969] Bump com.orientechnologies:orientdb-gremlin in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-gremlin](https://github.com/orientechnologies/orientdb-gremlin) from 3.2.44 to 3.2.46.
- [Commits](https://github.com/orientechnologies/orientdb-gremlin/compare/3.2.44...3.2.46)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-gremlin
  dependency-version: 3.2.46
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index e815c9ff111..358acf05d96 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.44"
+    api "com.orientechnologies:orientdb-client:3.2.46"
 
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.46"
 }

From d9817d3f76c36d17454867561a6e352bdc5c0337 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:18:06 +0000
Subject: [PATCH 4735/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.44 to 3.2.46.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/3.2.46/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.44...3.2.46)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-version: 3.2.46
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index e815c9ff111..358acf05d96 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.44"
+    api "com.orientechnologies:orientdb-client:3.2.46"
 
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.46"
 }

From a236bee75a0d525a459692e335c425a24b18dd63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:18:16 +0000
Subject: [PATCH 4736/4969] Bump com.squareup.okhttp3:okhttp from 5.1.0 to
 5.3.2 in /modules/solr

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 5.1.0 to 5.3.2.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-5.1.0...parent-5.3.2)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.3.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index 8340de66f2c..ca44d695421 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.4'
 }

From 2fb02e4e6d57495413158591d3fdee174bf31b51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:19:28 +0000
Subject: [PATCH 4737/4969] Bump com.mysql:mysql-connector-j in
 /modules/oceanbase

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.2.0 to 9.5.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.2.0...9.5.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oceanbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
index 5758598fb67..1fc1eb82e43 100644
--- a/modules/oceanbase/build.gradle
+++ b/modules/oceanbase/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 }

From b7b9ff2154d19e349edf968d76cb6ad1d47c2e5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:19:28 +0000
Subject: [PATCH 4738/4969] Bump com.mysql:mysql-connector-j from 8.2.0 to
 9.5.0 in /modules/mysql

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.2.0 to 9.5.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.2.0...9.5.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 1ec899c424e..4a104559330 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'

From d189c7b148fcf453a6b9ae08ad44cc415a77e8e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:19:42 +0000
Subject: [PATCH 4739/4969] Bump com.mysql:mysql-connector-j in
 /modules/junit-jupiter

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.2.0 to 9.5.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.2.0...9.5.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 01af88a3aab..a1df33fec98 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     }
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 }

From e5771040b6d27a91cf28403d82642956214b95d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:20:17 +0000
Subject: [PATCH 4740/4969] Bump com.mysql:mysql-connector-j from 8.2.0 to
 9.5.0 in /modules/spock

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.2.0 to 9.5.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.2.0...9.5.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e2f1ce4554f..25ec090581c 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
     testRuntimeOnly platform('org.junit:junit-bom:5.13.4')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'

From 0e64f6933e5bd7a44256d2bada0aef99a01cd1f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 19:52:43 +0000
Subject: [PATCH 4741/4969] Bump redis.clients:jedis from 6.2.0 to 7.1.0 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.2.0 to 7.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.2.0...v7.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a1df33fec98..9569f6f1d30 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
-    testImplementation 'redis.clients:jedis:6.2.0'
+    testImplementation 'redis.clients:jedis:7.1.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From f3a28577cb9879173d1224a50db3764e44c7a933 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 19:52:45 +0000
Subject: [PATCH 4742/4969] Bump org.junit:junit-bom from 5.13.4 to 5.14.1 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.4 to 5.14.1.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r5.14.1)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.14.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 a1df33fec98..7439ecdae0a 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.13.4')
+    implementation platform('org.junit:junit-bom:5.14.1')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':testcontainers-mysql')

From 79d60e8f2cfebbf780b746bcf2c702e185390f2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 19:52:50 +0000
Subject: [PATCH 4743/4969] Bump org.junit:junit-bom from 5.13.4 to 5.14.1 in
 /modules/spock

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.4 to 5.14.1.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r5.14.1)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.14.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 25ec090581c..53e945c8108 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
     testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
-    testRuntimeOnly platform('org.junit:junit-bom:5.13.4')
+    testRuntimeOnly platform('org.junit:junit-bom:5.14.1')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 

From 38e52bd9e72b15729fdf4f7f04a64d622080e872 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 17:59:18 +0000
Subject: [PATCH 4744/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.9.1 to 3.10.0.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/3.9.1...3.10.0)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-version: 3.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index e08696a654a..a37998f75f0 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
-    testImplementation 'com.couchbase.client:java-client:3.9.1'
+    testImplementation 'com.couchbase.client:java-client:3.10.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From f96c9d1e28da1e9a6bf85e71c7d3e24cff706edd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:33:46 +0000
Subject: [PATCH 4745/4969] Bump com.unboundid:unboundid-ldapsdk in
 /modules/ldap

Bumps [com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) from 7.0.3 to 7.0.4.
- [Release notes](https://github.com/pingidentity/ldapsdk/releases)
- [Changelog](https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html)
- [Commits](https://github.com/pingidentity/ldapsdk/commits)

---
updated-dependencies:
- dependency-name: com.unboundid:unboundid-ldapsdk
  dependency-version: 7.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ldap/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
index 62f57581cf3..d357bb9996c 100644
--- a/modules/ldap/build.gradle
+++ b/modules/ldap/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: LDAP"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.3'
+    testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.4'
 }

From 3c1fe2ae37abc366909b5cb6b470b885d798d1d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:33:49 +0000
Subject: [PATCH 4746/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.34.8 to 2.40.1.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.40.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index 28e91cca882..efa12d591da 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.34.8'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.40.4'
 }

From ccd2e418ae9238a2e18f44b2f6cb81a00096154d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:33:55 +0000
Subject: [PATCH 4747/4969] Bump software.amazon.awssdk:bom in
 /modules/localstack

Bumps software.amazon.awssdk:bom from 2.35.0 to 2.40.1.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-version: 2.40.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 5b76d4581ba..130f7cdfef7 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("software.amazon.awssdk:bom:2.35.0")
+    testImplementation platform("software.amazon.awssdk:bom:2.40.4")
     testImplementation 'software.amazon.awssdk:s3'
     testImplementation 'software.amazon.awssdk:sqs'
     testImplementation 'software.amazon.awssdk:cloudwatchlogs'

From 48fca06cca11ccb3a6ceee504d53559f1794bae5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:34:05 +0000
Subject: [PATCH 4748/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.45.0 to 4.47.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.45.0...4.47.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-version: 4.47.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 22ad28298a4..dabb35df363 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
     testImplementation(project(":testcontainers-junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.45.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.47.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.10")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.19")

From 14a6c8c78dfc5b3d1462ff4a40a7c8b81575e411 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:34:09 +0000
Subject: [PATCH 4749/4969] Bump com.rabbitmq:amqp-client from 5.26.0 to 5.28.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.26.0 to 5.28.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.26.0...v5.28.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-version: 5.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index f83ca738d0b..ce7d5caaa6e 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
 
-    testImplementation 'com.rabbitmq:amqp-client:5.26.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.28.0'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From f116557469aa87679c263c4229d589afc2e05400 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:34:13 +0000
Subject: [PATCH 4750/4969] Bump org.typesense:typesense-java in
 /modules/typesense

Bumps [org.typesense:typesense-java](https://github.com/typesense/typesense-java) from 1.3.0 to 2.0.0.
- [Release notes](https://github.com/typesense/typesense-java/releases)
- [Commits](https://github.com/typesense/typesense-java/compare/v1.3.0...v2.0.0)

---
updated-dependencies:
- dependency-name: org.typesense:typesense-java
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/typesense/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
index 84a5978ba81..17d6135b604 100644
--- a/modules/typesense/build.gradle
+++ b/modules/typesense/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Typesense"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.typesense:typesense-java:1.3.0'
+    testImplementation 'org.typesense:typesense-java:2.0.0'
 }

From b560d7c4361f308fdaf3a4d3b6da446e37576024 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:34:19 +0000
Subject: [PATCH 4751/4969] Bump com.scylladb:java-driver-core in
 /modules/scylladb

Bumps [com.scylladb:java-driver-core](https://github.com/scylladb/java-driver) from 4.19.0.1 to 4.19.0.3.
- [Release notes](https://github.com/scylladb/java-driver/releases)
- [Commits](https://github.com/scylladb/java-driver/compare/4.19.0.1...4.19.0.3)

---
updated-dependencies:
- dependency-name: com.scylladb:java-driver-core
  dependency-version: 4.19.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index 28e91cca882..883ce486380 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ScyllaDB"
 dependencies {
     api project(":testcontainers")
 
-    testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
+    testImplementation 'com.scylladb:java-driver-core:4.19.0.4'
     testImplementation 'software.amazon.awssdk:dynamodb:2.34.8'
 }

From 47306dacd2f074abf3443cf76f1d7946b19e2c8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:37:02 +0000
Subject: [PATCH 4752/4969] Bump io.opentelemetry:opentelemetry-bom in
 /modules/grafana

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.54.1 to 1.56.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.54.1...v1.56.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-version: 1.56.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 4b9092e4786..1a407f66729 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.4'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
-    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.54.1')
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.57.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

From a34e21fd6f6fe9fd10506540a9fcad25ca08c0b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:37:03 +0000
Subject: [PATCH 4753/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.1.4 to 9.2.2.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v9.1.4...v9.2.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.2.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index e1926d25028..860a7d11526 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.4"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.2.2"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
 }

From 5e26c13c5e152977a356bc7a2b18f24bbeffff97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:37:12 +0000
Subject: [PATCH 4754/4969] Bump com.ibm.db2:jcc from 12.1.2.0 to 12.1.3.0 in
 /modules/db2

Bumps com.ibm.db2:jcc from 12.1.2.0 to 12.1.3.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-version: 12.1.3.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index a15081c9614..a0c3bc79e85 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0'
+    testRuntimeOnly 'com.ibm.db2:jcc:12.1.3.0'
 }

From a0003ed9559a1508465caeea1792e814d673e90a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:37:13 +0000
Subject: [PATCH 4755/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.15.4 to 1.16.0.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.15.4...v1.16.0)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-version: 1.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 4b9092e4786..b8426d43145 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.15.4'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.16.1'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.54.1')

From d2e5882cea02890b8d8e70022621f1a902c425a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:37:18 +0000
Subject: [PATCH 4756/4969] Bump commons-io:commons-io from 2.20.0 to 2.21.0 in
 /modules/hivemq

Bumps [commons-io:commons-io](https://github.com/apache/commons-io) from 2.20.0 to 2.21.0.
- [Changelog](https://github.com/apache/commons-io/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-io/compare/rel/commons-io-2.20.0...rel/commons-io-2.21.0)

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-version: 2.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 22ad28298a4..8861b687cf6 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:26.0.2-1")
 
     shaded("org.apache.commons:commons-lang3:3.19.0")
-    shaded("commons-io:commons-io:2.20.0")
+    shaded("commons-io:commons-io:2.21.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")

From 6f5a5baf2dcb4bb03c329747869a280f98d3efaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:37:38 +0000
Subject: [PATCH 4757/4969] Bump io.kubernetes:client-java in /modules/k3s

Bumps [io.kubernetes:client-java](https://github.com/kubernetes-client/java) from 24.0.0-legacy to 25.0.0-legacy.
- [Release notes](https://github.com/kubernetes-client/java/releases)
- [Changelog](https://github.com/kubernetes-client/java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes-client/java/compare/v24.0.0-legacy...v25.0.0-legacy)

---
updated-dependencies:
- dependency-name: io.kubernetes:client-java
  dependency-version: 25.0.0-legacy
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index aab1a2aa40f..010494fe94c 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'
 
     testImplementation 'io.fabric8:kubernetes-client:7.4.0'
-    testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
+    testImplementation 'io.kubernetes:client-java:25.0.0-legacy'
 }

From f487f3370841355f83d6b248060464270f0b0c2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:37:54 +0000
Subject: [PATCH 4758/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v7.3.0...v7.4.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-version: 7.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 53056f2f5bc..bc743e6bbce 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'org.influxdb:influxdb-java:2.25'
 
     testImplementation 'org.influxdb:influxdb-java:2.25'
-    testImplementation "com.influxdb:influxdb-client-java:7.3.0"
+    testImplementation "com.influxdb:influxdb-client-java:7.4.0"
 }

From 913faa63f36600dcc10f3a714bb46d95d7d6c2c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:38:02 +0000
Subject: [PATCH 4759/4969] Bump redis.clients:jedis from 6.2.0 to 7.1.0 in
 /modules/toxiproxy

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.2.0 to 7.1.0.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.2.0...v7.1.0)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index d6480227889..261f6c29384 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.11'
 
-    testImplementation 'redis.clients:jedis:6.2.0'
+    testImplementation 'redis.clients:jedis:7.1.0'
 }

From 8828f99b9aa9e33e5bc99b67e1de09d76c98e5db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:39:14 +0000
Subject: [PATCH 4760/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.7.11 to 3.8.0.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.7.11...v3.8.0)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-version: 3.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index ecf02924009..42b422257a8 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.7.11'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.8.1'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.6'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
 }

From 51292fd4a0153cc4e2b657527ae2bc8c00d52833 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:39:44 +0000
Subject: [PATCH 4761/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps [com.solacesystems:sol-jcsmp](https://github.com/SolaceDev/solsuite) from 10.28.1 to 10.29.0.
- [Commits](https://github.com/SolaceDev/solsuite/commits)

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-version: 10.29.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 83583fd5cdf..ab0e9555aae 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    testImplementation 'com.solacesystems:sol-jcsmp:10.28.1'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.29.0'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 5f11ab70bafe2990d25bc4484bd59d08716c650c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:41:03 +0000
Subject: [PATCH 4762/4969] Bump io.milvus:milvus-sdk-java from 2.6.5 to 2.6.10
 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.6.5 to 2.6.10.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.6.5...v2.6.10)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-version: 2.6.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index 2aec7fc1da3..cb4ef3b2145 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.milvus:milvus-sdk-java:2.6.5'
+    testImplementation 'io.milvus:milvus-sdk-java:2.6.10'
 }

From 51be1c5c030292ac1fd4f8a18ea72b04bea7f0ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:41:11 +0000
Subject: [PATCH 4763/4969] Bump org.apache.activemq:activemq-client in
 /modules/activemq

Bumps [org.apache.activemq:activemq-client](https://github.com/apache/activemq) from 6.1.7 to 6.2.0.
- [Commits](https://github.com/apache/activemq/compare/activemq-6.1.7...activemq-6.2.0)

---
updated-dependencies:
- dependency-name: org.apache.activemq:activemq-client
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index f0ad74ba76b..27dfcf3b852 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation "org.apache.activemq:activemq-client:6.1.7"
+    testImplementation "org.apache.activemq:activemq-client:6.2.0"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
 }

From bc55c2ce5ca6cbab386abd33ebadae12d072663b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:41:31 +0000
Subject: [PATCH 4764/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.42.0 to 2.44.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-version: 2.44.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index f0ad74ba76b..d96cbfa0f8c 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation "org.apache.activemq:activemq-client:6.1.7"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.44.0"
 }

From 2039c62068f758e2b9311cb847e0899616935a23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:42:10 +0000
Subject: [PATCH 4765/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.69.0 to 26.72.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.69.0...v26.72.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.72.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 79b856cf06e..54271098ebc 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.69.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.72.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 5a913c4ad59afb2e1ca738cfe7124af6adab1a07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:44:25 +0000
Subject: [PATCH 4766/4969] Bump io.qdrant:client from 1.15.0 to 1.16.1 in
 /modules/qdrant

Bumps [io.qdrant:client](https://github.com/qdrant/java-client) from 1.15.0 to 1.16.1.
- [Release notes](https://github.com/qdrant/java-client/releases)
- [Commits](https://github.com/qdrant/java-client/compare/v1.15.0...v1.16.1)

---
updated-dependencies:
- dependency-name: io.qdrant:client
  dependency-version: 1.16.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index c67fd6c7f74..849cafeb37f 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.qdrant:client:1.15.0'
+    testImplementation 'io.qdrant:client:1.16.1'
     testImplementation platform('io.grpc:grpc-bom:1.75.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'

From f8dbdcaad37a22a0686f00036af5898c73f9d713 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:44:52 +0000
Subject: [PATCH 4767/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 4.1.0 to 4.1.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-version: 4.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 74e91674c70..3f60fd8db71 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.34'
 
-    testImplementation 'org.apache.kafka:kafka-clients:4.1.0'
+    testImplementation 'org.apache.kafka:kafka-clients:4.1.1'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From d076f2fea66891f60ce8baee258e19fd713c70b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:45:34 +0000
Subject: [PATCH 4768/4969] Bump dev.openfga:openfga-sdk from 0.9.0 to 0.9.3 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.9.0 to 0.9.3.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.9.0...v0.9.3)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-version: 0.9.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index f681fe841e2..c483eb8e5e6 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'dev.openfga:openfga-sdk:0.9.0'
+    testImplementation 'dev.openfga:openfga-sdk:0.9.4'
 }
 
 test {

From 0bd9966a3981ff330a3d5338a0bd71271811370a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 11 Dec 2025 11:46:19 -0600
Subject: [PATCH 4769/4969] Update questdb/questdb image version to 9.2.2
 (#11347)

---
 .../src/test/java/org/testcontainers/QuestDBTestImages.java     | 2 +-
 .../org/testcontainers/junit/questdb/SimpleQuestDBTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java b/modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java
index 555b56f172c..14e42d72fae 100644
--- a/modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java
+++ b/modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java
@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface QuestDBTestImages {
-    DockerImageName QUESTDB_IMAGE = DockerImageName.parse("questdb/questdb:6.5.3");
+    DockerImageName QUESTDB_IMAGE = DockerImageName.parse("questdb/questdb:9.2.2");
 }
diff --git a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
index aad4df70c2c..6b0ff6e3107 100644
--- a/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
+++ b/modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java
@@ -27,7 +27,7 @@ class SimpleQuestDBTest extends AbstractContainerDatabaseTest {
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:6.5.3")
+            QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:9.2.2")
             // }
         ) {
             questDB.start();

From d83653df0f53345e0d8b5404a38b81465b220270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 11 Dec 2025 12:10:36 -0600
Subject: [PATCH 4770/4969] Fix compatibility with older Docker Engines by
 falling back to v1.32 (#11346)

Previously, minimum Docker API version was raised to v1.44 to keep
compatibility with most recent Docker Enginer API. This commit
introduces a fallback to API v1.32, which was used before.

Fixes #11232
---
 .../DockerClientProviderStrategy.java         | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
index e16beeb6614..7b0aaafc169 100644
--- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
+++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -401,21 +401,34 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
                 throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
         }
 
-        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
+        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig
+            .createDefaultConfigBuilder()
+            .withDockerHost(transportConfig.getDockerHost().toString());
 
-        if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
-            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
-        }
         Map<String, String> headers = new HashMap<>();
         headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);
         headers.put("User-Agent", String.format("tc-java/%s", DockerClientFactory.TESTCONTAINERS_VERSION));
 
-        return DockerClientImpl.getInstance(
-            new AuthDelegatingDockerClientConfig(
-                configBuilder.withDockerHost(transportConfig.getDockerHost().toString()).build()
-            ),
-            new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
-        );
+        try {
+            if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
+                configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
+            }
+            DockerClient client = DockerClientImpl.getInstance(
+                new AuthDelegatingDockerClientConfig(configBuilder.build()),
+                new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
+            );
+            log.debug("Pinging Docker API version 1.44.");
+            client.pingCmd().exec();
+            return client;
+        } catch (Exception ex) {
+            log.debug("Fallback to Docker API version 1.32.");
+            return DockerClientImpl.getInstance(
+                new AuthDelegatingDockerClientConfig(
+                    configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32).build()
+                ),
+                new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
+            );
+        }
     }
 
     public synchronized String getDockerHostIpAddress() {

From c769b20fb2559563930b3295d794665f1a5887e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 16:48:17 +0000
Subject: [PATCH 4771/4969] Bump org.questdb:questdb from 9.0.3 to 9.2.2 in
 /modules/questdb

Bumps [org.questdb:questdb](https://github.com/questdb/questdb) from 9.0.3 to 9.2.2.
- [Release notes](https://github.com/questdb/questdb/releases)
- [Commits](https://github.com/questdb/questdb/compare/9.0.3...9.2.2)

---
updated-dependencies:
- dependency-name: org.questdb:questdb
  dependency-version: 9.2.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index ef90382450b..6403e4cd11d 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.questdb:questdb:9.0.3'
+    testImplementation 'org.questdb:questdb:9.2.2'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

From b955a3f5fb53fe35ed41148781563a6e1eca4722 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 17:55:41 +0000
Subject: [PATCH 4772/4969] Bump org.apache.commons:commons-lang3 in
 /modules/hivemq

Bumps org.apache.commons:commons-lang3 from 3.19.0 to 3.20.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index bbf2dd665a0..477c3617aa7 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api(project(":testcontainers"))
     api("org.jetbrains:annotations:26.0.2-1")
 
-    shaded("org.apache.commons:commons-lang3:3.19.0")
+    shaded("org.apache.commons:commons-lang3:3.20.0")
     shaded("commons-io:commons-io:2.21.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")

From 489e4c51c4efd0264c95a41a3879e1dd8b89f2ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 17:55:45 +0000
Subject: [PATCH 4773/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.19 to 1.5.21.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.19...v_1.5.21)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index bbf2dd665a0..9cde8122c21 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.47.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.10")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.5.19")
+    testImplementation("ch.qos.logback:logback-classic:1.5.22")
 }
 
 test {

From 38fead21c818d1b188db4ae3d223c3582c668115 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 23:33:50 +0000
Subject: [PATCH 4774/4969] Bump org.assertj:assertj-core from 3.27.6 to 3.27.7
 in /core

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.6 to 3.27.7.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.6...assertj-build-3.27.7)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index da9ec1f2a44..24157ce28fe 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -115,14 +115,14 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testImplementation 'org.assertj:assertj-core:3.27.6'
+    testImplementation 'org.assertj:assertj-core:3.27.7'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     jarFileTestImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    jarFileTestImplementation 'org.assertj:assertj-core:3.27.6'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.27.7'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
 }
 

From 96c84355c4810e8dea2cc64cca0f3e151aee0ece Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Feb 2026 22:22:53 +0000
Subject: [PATCH 4775/4969] Bump com.mysql:mysql-connector-j in
 /modules/junit-jupiter

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 9.5.0 to 9.6.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/9.5.0...9.6.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 29b896793a9..b9c2fc7bcee 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     }
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
 }

From 1536650bd6872306b5f10eaf1f27d94e53f7dbb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Feb 2026 22:23:14 +0000
Subject: [PATCH 4776/4969] Bump com.mysql:mysql-connector-j from 9.5.0 to
 9.6.0 in /modules/spock

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 9.5.0 to 9.6.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/9.5.0...9.6.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 53e945c8108..7522d7f697f 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
     testRuntimeOnly platform('org.junit:junit-bom:5.14.1')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'

From f79f6c591791ff34970e9e8fd4cfd994fec8aeab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Feb 2026 22:23:15 +0000
Subject: [PATCH 4777/4969] Bump com.mysql:mysql-connector-j from 9.5.0 to
 9.6.0 in /modules/mysql

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 9.5.0 to 9.6.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/9.5.0...9.6.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4a104559330..51cf73b1589 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'

From 3b0f061a2a40c43dcff7e11f64174d7ac8495597 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Feb 2026 22:27:17 +0000
Subject: [PATCH 4778/4969] Bump org.assertj:assertj-core from 3.27.6 to 3.27.7
 in /modules/r2dbc

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.6 to 3.27.7.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.6...assertj-build-3.27.7)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 42b422257a8..3a2a55c7f0d 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation project(':testcontainers-postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.8.1'
-    testFixturesImplementation 'org.assertj:assertj-core:3.27.6'
+    testFixturesImplementation 'org.assertj:assertj-core:3.27.7'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
 }

From 013db9815bd71cc947fb70e5db64b30851e05aff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Feb 2026 22:31:42 +0000
Subject: [PATCH 4779/4969] Bump com.mysql:mysql-connector-j from 9.5.0 to
 9.6.0 in /modules/tidb

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 9.5.0 to 9.6.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/9.5.0...9.6.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 264d00fc883..7cf52e57ca9 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From dea972503664ebfed2b74957c740e58bd93d579f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 3 Feb 2026 15:12:59 -0600
Subject: [PATCH 4780/4969] Update ryuk version to 0.14.0 (#11486)

---
 .../src/main/java/org/testcontainers/utility/RyukContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/utility/RyukContainer.java b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
index 475a957f344..a0139420cab 100644
--- a/core/src/main/java/org/testcontainers/utility/RyukContainer.java
+++ b/core/src/main/java/org/testcontainers/utility/RyukContainer.java
@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.13.0");
+        super("testcontainers/ryuk:0.14.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

From 8da56ffeff9f2b6afd712364e40ecc5b3f6ca34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 26 Feb 2026 15:35:16 -0600
Subject: [PATCH 4781/4969] Support apache/activemq in ActiveMQContainer
 (#11498)

---
 .../activemq/ActiveMQContainer.java               |  8 ++++++--
 .../activemq/ActiveMQContainerTest.java           | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java b/modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java
index 14814d95da9..9313efc55d6 100644
--- a/modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java
+++ b/modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java
@@ -21,7 +21,11 @@
  */
 public class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("apache/activemq-classic");
+    private static final DockerImageName APACHE_ACTIVEMQ_CLASSIC_IMAGE = DockerImageName.parse(
+        "apache/activemq-classic"
+    );
+
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("apache/activemq");
 
     private static final int WEB_CONSOLE_PORT = 8161;
 
@@ -45,7 +49,7 @@ public ActiveMQContainer(String image) {
 
     public ActiveMQContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE, APACHE_ACTIVEMQ_CLASSIC_IMAGE);
 
         withExposedPorts(WEB_CONSOLE_PORT, TCP_PORT, AMQP_PORT, STOMP_PORT, MQTT_PORT, WS_PORT);
         waitingFor(Wait.forLogMessage(".*Apache ActiveMQ.*started.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
diff --git a/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
index 564ee5382e7..cb66ebba864 100644
--- a/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
+++ b/modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java
@@ -10,6 +10,8 @@
 import lombok.SneakyThrows;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -18,7 +20,7 @@ class ActiveMQContainerTest {
     @Test
     void test() {
         try ( // container {
-            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
+            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq:5.18.7")
             // }
         ) {
             activemq.start();
@@ -29,11 +31,20 @@ void test() {
         }
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = { "apache/activemq-classic:5.18.7", "apache/activemq:5.18.7" })
+    void compatibility(String image) {
+        try (ActiveMQContainer activemq = new ActiveMQContainer(image)) {
+            activemq.start();
+            assertFunctionality(activemq, false);
+        }
+    }
+
     @Test
     void customCredentials() {
         try (
             // settingCredentials {
-            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
+            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq:5.18.7")
                 .withUser("testcontainers")
                 .withPassword("testcontainers")
             // }

From d00d339406c3c2f9e962cf8736033fab2c8d8c56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:22:06 +0000
Subject: [PATCH 4782/4969] Bump org.jetbrains:annotations in
 /modules/oracle-xe

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 6faeeb9367e..b87fcbec90a 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.0.0.0'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'

From b674b8fd4728a4b68ac247a0bfc9c7b3b107d084 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:22:10 +0000
Subject: [PATCH 4783/4969] Bump org.jetbrains:annotations from 26.0.2-1 to
 26.1.0 in /modules/jdbc

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index f34c99c0385..149038f2d98 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC"
 dependencies {
     api project(':testcontainers-database-commons')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
     testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.14'

From f218aa2a69b16a7f08c87e559c8e02bfc4c6aee9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:22:10 +0000
Subject: [PATCH 4784/4969] Bump org.jetbrains:annotations from 26.0.2-1 to
 26.1.0 in /modules/nginx

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/nginx/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
index 13bd94d88d2..60d24d863d8 100644
--- a/modules/nginx/build.gradle
+++ b/modules/nginx/build.gradle
@@ -2,5 +2,5 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 12899cffc743169adb46a25ff581f2433e16795f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:22:15 +0000
Subject: [PATCH 4785/4969] Bump org.jetbrains:annotations from 26.0.2-1 to
 26.1.0 in /modules/mysql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 4a104559330..b70f826176d 100644
--- a/modules/mysql/build.gradle
+++ b/modules/mysql/build.gradle
@@ -12,5 +12,5 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 3734df0a42e4825ed8d30b9f12b45d731d1fb0dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:22:31 +0000
Subject: [PATCH 4786/4969] Bump org.jetbrains:annotations in /modules/presto

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/presto/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
index 874b532fb85..1d2933dec53 100644
--- a/modules/presto/build.gradle
+++ b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 2ad363b1523731923f44569ff8d1d06c41703580 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:22:37 +0000
Subject: [PATCH 4787/4969] Bump org.postgresql:postgresql in
 /modules/cockroachdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.8 to 42.7.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.8...REL42.7.10)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cockroachdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
index 6d7acda1515..275e69eef3d 100644
--- a/modules/cockroachdb/build.gradle
+++ b/modules/cockroachdb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: CockroachDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
 
     testImplementation project(':testcontainers-jdbc-test')
 }

From a82249fad876dcab878ff32c5c11510a2692fa46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:22:49 +0000
Subject: [PATCH 4788/4969] Bump org.jetbrains:annotations in /modules/rabbitmq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index ce7d5caaa6e..350adce5a76 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'com.rabbitmq:amqp-client:5.28.0'
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From c249352a5216fcf530e108e86fc3b1ce6d653bcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:26:08 +0000
Subject: [PATCH 4789/4969] Bump org.jetbrains:annotations in /modules/hivemq

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 1cada0e354d..8c1b2c02034 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: HiveMQ"
 
 dependencies {
     api(project(":testcontainers"))
-    api("org.jetbrains:annotations:26.0.2-1")
+    api("org.jetbrains:annotations:26.1.0")
 
     shaded("org.apache.commons:commons-lang3:3.20.0")
     shaded("commons-io:commons-io:2.21.0")

From 3f66ea79aa5c3b93cd0407c3a633ad10341d3e9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:29:47 +0000
Subject: [PATCH 4790/4969] Bump org.postgresql:postgresql in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.8 to 42.7.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.8...REL42.7.10)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 6403e4cd11d..5e9da5686d8 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
 
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.questdb:questdb:9.2.2'

From 0e728cc9129887d1e0f6ce4559e879dc9336a0dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:33:12 +0000
Subject: [PATCH 4791/4969] Bump org.postgresql:postgresql in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.8 to 42.7.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.8...REL42.7.10)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index be60919c0e3..3a93f97cae8 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: CrateDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
 
     testImplementation project(':testcontainers-jdbc-test')
 

From 2d1fa5bcd5dabac6bffc21e99c821fa26506de47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:33:25 +0000
Subject: [PATCH 4792/4969] Bump org.jetbrains:annotations in
 /modules/oracle-free

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index e7cc9669632..b99b1bf8e89 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.0.0.0'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'

From 985a145a25e782ec795359155803fe77b165dc79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:38:37 +0000
Subject: [PATCH 4793/4969] Bump com.mysql:mysql-connector-j in
 /modules/oceanbase

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 9.5.0 to 9.6.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/9.5.0...9.6.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oceanbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle
index 1fc1eb82e43..f570d741f7b 100644
--- a/modules/oceanbase/build.gradle
+++ b/modules/oceanbase/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
 }

From 5323acdeb4d399b2dc1a61eb07012a39f86643e6 Mon Sep 17 00:00:00 2001
From: bramvonk <bramvonk@users.noreply.github.com>
Date: Tue, 3 Mar 2026 00:03:35 +0100
Subject: [PATCH 4794/4969] Use non-deprecated MSSQLServerContainer in
 ServiceBusEmulatorContainer (#11223)

Fixes #11554
---
 modules/azure/build.gradle                                  | 4 ++++
 .../testcontainers/azure/ServiceBusEmulatorContainer.java   | 6 +++---
 .../azure/ServiceBusEmulatorContainerTest.java              | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 681a6dc47e6..796f500410b 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -15,3 +15,7 @@ dependencies {
     testImplementation 'com.azure:azure-messaging-servicebus'
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.3.0.jre8-preview'
 }
+
+tasks.japicmp {
+	methodExcludes = ["org.testcontainers.azure.ServiceBusEmulatorContainer#withMsSqlServerContainer(org.testcontainers.containers.MSSQLServerContainer)"]
+}
diff --git a/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
index fd055a0d39b..4557b6acb6a 100644
--- a/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java
@@ -1,9 +1,9 @@
 package org.testcontainers.azure;
 
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.mssqlserver.MSSQLServerContainer;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.LicenseAcceptance;
 
@@ -25,7 +25,7 @@ public class ServiceBusEmulatorContainer extends GenericContainer<ServiceBusEmul
         "mcr.microsoft.com/azure-messaging/servicebus-emulator"
     );
 
-    private MSSQLServerContainer<?> msSqlServerContainer;
+    private MSSQLServerContainer msSqlServerContainer;
 
     /**
      * @param dockerImageName The specified docker image name to run
@@ -51,7 +51,7 @@ public ServiceBusEmulatorContainer(final DockerImageName dockerImageName) {
      * @param msSqlServerContainer The MS SQL Server container used by Service Bus as a dependency
      * @return this
      */
-    public ServiceBusEmulatorContainer withMsSqlServerContainer(final MSSQLServerContainer<?> msSqlServerContainer) {
+    public ServiceBusEmulatorContainer withMsSqlServerContainer(final MSSQLServerContainer msSqlServerContainer) {
         dependsOn(msSqlServerContainer);
         this.msSqlServerContainer = msSqlServerContainer;
         return this;
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
index 6bf6ac80fae..83cd633c5a9 100644
--- a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
+++ b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java
@@ -10,8 +10,8 @@
 import com.github.dockerjava.api.model.Capability;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.containers.Network;
+import org.testcontainers.mssqlserver.MSSQLServerContainer;
 import org.testcontainers.utility.MountableFile;
 
 import java.util.List;
@@ -31,7 +31,7 @@ void testWithClient() {
             Network network = Network.newNetwork();
             // }
             // sqlContainer {
-            MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>(
+            MSSQLServerContainer mssqlServerContainer = new MSSQLServerContainer(
                 "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04"
             )
                 .acceptLicense()

From a756bc6a572cde84fbe429b3a1fcf09ba9559581 Mon Sep 17 00:00:00 2001
From: Meyon Soo  Kim <39788337+PreAgile@users.noreply.github.com>
Date: Fri, 13 Mar 2026 06:55:09 +0900
Subject: [PATCH 4795/4969] Improve k6 docs (#11564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8780

---------

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/modules/k6.md                                | 15 +++++++++++++--
 .../org/testcontainers/k6/K6ContainerTests.java   |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/modules/k6.md b/docs/modules/k6.md
index 4783ca1e5ad..13e0ddc9252 100644
--- a/docs/modules/k6.md
+++ b/docs/modules/k6.md
@@ -11,12 +11,23 @@ Testcontainers module for [k6](https://registry.hub.docker.com/r/grafana/k6).
 
 ## Basic script execution
 
-Execute a simple k6 test script, `test.js`, with commandline options and injected script variable.
+You can start a K6 container instance from any Java application by using:
+
+<!--codeinclude-->
+[Setup the container](../../modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java) inside_block:standard_k6
+<!--/codeinclude-->
+
+The test above uses a simple k6 script, `test.js`, with command line options and an injected script variable.
+
+Once the container is started, you can wait for the test results to be collected:
+
+<!--codeinclude-->
+[Wait for test results](../../modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java) inside_block:wait
+<!--/codeinclude-->
 
 Create a simple k6 test script to be executed as part of your tests:
 
 <!--codeinclude-->
-[Setup the container](../../modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java) inside_block:standard_k6
 [Content of `scripts/test.js`](../../modules/k6/src/test/resources/scripts/test.js) inside_block:access_script_vars
 <!--/codeinclude-->
 
diff --git a/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java b/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
index 255cb376b4f..43b390c4db4 100644
--- a/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
+++ b/modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java
@@ -23,6 +23,7 @@ void k6StandardTest() throws Exception {
         ) {
             container.start();
 
+            // wait {
             WaitingConsumer consumer = new WaitingConsumer();
             container.followOutput(consumer);
 
@@ -34,6 +35,7 @@ void k6StandardTest() throws Exception {
                 3,
                 TimeUnit.SECONDS
             );
+            // }
 
             assertThat(container.getLogs()).contains("k6 tests are cool!");
         }

From 326987f41a5d23e736bf8e92d7f68f6feaabe515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 12 Mar 2026 16:02:39 -0600
Subject: [PATCH 4796/4969] Update Pull Request template

---
 .github/pull_request_template.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 31553ebfff1..6137bf623e3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,8 @@
 <!--
-Thanks for contributing to Testcontainers. Please review the following notes before
-submitting a pull request.
+Thanks for contributing to Testcontainers. Before submitting a pull request, please
+review our contributing guidelines at https://java.testcontainers.org/contributing/
+
+Please also review the following notes before submitting a pull request.
 
 New Modules:
 

From 01451d17e5f5bf53516b5ebd07a562b0c6a83601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 18 Mar 2026 18:53:10 -0600
Subject: [PATCH 4797/4969] Disable DockerComposeContainerVolumeRemovalTest and
 ComposeContainerVolumeRemovalTest

---
 .../testcontainers/junit/ComposeContainerVolumeRemovalTest.java | 2 ++
 .../junit/DockerComposeContainerVolumeRemovalTest.java          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
index d194204078f..096928034d2 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.junit;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -16,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@Disabled
 class ComposeContainerVolumeRemovalTest {
 
     public static Stream<Arguments> params() {
diff --git a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
index 2ec9a51e197..157b2ce046d 100644
--- a/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
+++ b/core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java
@@ -1,5 +1,6 @@
 package org.testcontainers.junit;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.DockerClientFactory;
@@ -15,6 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@Disabled
 class DockerComposeContainerVolumeRemovalTest {
 
     public static Object[][] params() {

From cdca4b19aec6bb8559cf380473b92893940ccd08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 18 Mar 2026 19:49:13 -0600
Subject: [PATCH 4798/4969] Update cockroachdb image version

---
 .../testcontainers/CockroachDBTestImages.java |  8 ------
 .../cockroachdb/CockroachContainerTest.java   | 26 ++-----------------
 .../CockroachDBJDBCDriverTest.java            |  2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
index a410f77e8c8..0e977cfd065 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
@@ -4,12 +4,4 @@
 
 public interface CockroachDBTestImages {
     DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v22.2.3");
-
-    DockerImageName FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT = DockerImageName.parse(
-        "cockroachdb/cockroach:v22.1.0"
-    );
-
-    DockerImageName COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED = DockerImageName.parse(
-        "cockroachdb/cockroach:v21.2.17"
-    );
 }
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java
index 3aba3d2eefd..2f4710eae35 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java
@@ -11,7 +11,6 @@
 import java.util.logging.LogManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 class CockroachContainerTest extends AbstractContainerDatabaseTest {
     static {
@@ -22,7 +21,7 @@ class CockroachContainerTest extends AbstractContainerDatabaseTest {
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v22.2.3")
+            CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v26.1.1")
             // }
         ) {
             cockroach.start();
@@ -71,9 +70,7 @@ void testWithAdditionalUrlParamInJdbcUrl() {
     @Test
     void testWithUsernamePasswordDatabase() throws SQLException {
         try (
-            CockroachContainer cockroach = new CockroachContainer(
-                CockroachDBTestImages.FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT
-            )
+            CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
                 .withUsername("test_user")
                 .withPassword("test_password")
                 .withDatabaseName("test_database")
@@ -90,25 +87,6 @@ void testWithUsernamePasswordDatabase() throws SQLException {
         }
     }
 
-    @Test
-    void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
-        CockroachContainer cockroachContainer = new CockroachContainer(
-            CockroachDBTestImages.COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED
-        );
-
-        assertThatThrownBy(() -> cockroachContainer.withUsername("test_user"))
-            .isInstanceOf(UnsupportedOperationException.class)
-            .withFailMessage("Setting a username in not supported in the versions below 22.1.0");
-
-        assertThatThrownBy(() -> cockroachContainer.withPassword("test_password"))
-            .isInstanceOf(UnsupportedOperationException.class)
-            .withFailMessage("Setting a password in not supported in the versions below 22.1.0");
-
-        assertThatThrownBy(() -> cockroachContainer.withDatabaseName("test_database"))
-            .isInstanceOf(UnsupportedOperationException.class)
-            .withFailMessage("Setting a databaseName in not supported in the versions below 22.1.0");
-    }
-
     @Test
     void testInitializationScript() throws SQLException {
         String sql =
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
index dc4915aac3e..097aeef005b 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java
@@ -10,7 +10,7 @@ class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
-                { "jdbc:tc:cockroach:v21.2.17://hostname/databasename", EnumSet.noneOf(Options.class) },
+                { "jdbc:tc:cockroach:v22.2.3://hostname/databasename", EnumSet.noneOf(Options.class) },
             }
         );
     }

From ccd28bf94c3ddb06d9377d5c1a9bd4bc21d4b23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 18 Mar 2026 20:13:16 -0600
Subject: [PATCH 4799/4969] Update docker-java version to 3.7.1 (#11572)

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index da9ec1f2a44..9a4d413379f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -80,8 +80,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.7.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.7.0')
+    api platform('com.github.docker-java:docker-java-bom:3.7.1')
+    shaded platform('com.github.docker-java:docker-java-bom:3.7.1')
 
     api "com.github.docker-java:docker-java-api"
 

From 225a78aa7f322bad0c648aee268b08170da95865 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:23:54 -0600
Subject: [PATCH 4800/4969] [create-pull-request] automated change (#11573)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 04842f28fcd..552f36f29f4 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -140,4 +140,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 2.0.2
+    latest_version: 2.0.4

From 9111e55f2803fb32fef48f8fbecbff305fe15523 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:24:56 -0600
Subject: [PATCH 4801/4969] [create-pull-request] automated change (#11357)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ec5fc8fddec..eeb86a395e8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=2.0.2
+testcontainers.version=2.0.4

From 0bb0b2bd0b85fd08ce0222aa5d5aa71faddc6293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 18 Mar 2026 22:30:38 -0600
Subject: [PATCH 4802/4969] Update staged artifacts location

---
 gradle/publishing.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 9ecd231d3e1..3e3faaf08ce 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -96,7 +96,7 @@ publishing {
     }
     repositories {
         maven {
-            url = layout.buildDirectory.dir('staging-deploy')
+            url = rootProject.layout.buildDirectory.dir('staging-deploy')
         }
     }
 }
@@ -112,7 +112,7 @@ jreleaser {
                 central {
                     active = 'ALWAYS'
                     url = 'https://central.sonatype.com/api/v1/publisher'
-                    stagingRepository(layout.buildDirectory.dir("staging-deploy").get().toString())
+                    stagingRepository(rootProject.layout.buildDirectory.dir("staging-deploy").get().toString())
                     stage = 'UPLOAD'
                     applyMavenCentralRules = true
                     namespace = 'org.testcontainers'

From d895c90cae957a71edb6315b75230acdcc05d569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 20 Mar 2026 15:38:34 -0600
Subject: [PATCH 4803/4969] Add javadoc to DockerModelRunnerContainer

* getBaseEndpoint
* getOpenAIEndpoint

Fixes #10449
---
 .../containers/DockerModelRunnerContainer.java         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
index 145b4e609ad..dde714a9bd2 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java
@@ -79,10 +79,20 @@ public DockerModelRunnerContainer withModel(String model) {
         return this;
     }
 
+    /**
+     * Returns the base endpoint URL for the Docker Model Runner service.
+     *
+     * @return the base URL in the format {@code http://<host>:<port>}
+     */
     public String getBaseEndpoint() {
         return "http://" + getHost() + ":" + getMappedPort(PORT);
     }
 
+    /**
+     * Returns the OpenAI-compatible API endpoint URL for the Docker Model Runner service.
+     *
+     * @return the OpenAI-compatible endpoint URL in the format {@code http://<host>:<port>/engines}
+     */
     public String getOpenAIEndpoint() {
         return getBaseEndpoint() + "/engines";
     }

From 18e55b8dd8c5ec8e6c46364847419ea2d27f8b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 20 Mar 2026 19:16:12 -0600
Subject: [PATCH 4804/4969] Fix test class name

---
 ...ategies.java => ComposeContainerWithWaitStrategiesTest.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename core/src/test/java/org/testcontainers/junit/{ComposeContainerWithWaitStrategies.java => ComposeContainerWithWaitStrategiesTest.java} (97%)

diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java
similarity index 97%
rename from core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
rename to core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java
index 3330b302ed3..d824226104e 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java
@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class ComposeContainerWithWaitStrategies {
+class ComposeContainerWithWaitStrategiesTest {
 
     private static final int REDIS_PORT = 6379;
 

From 575c86fd5d182a878e7f9e4f0acf7713d32cbf39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 24 Mar 2026 10:21:01 -0600
Subject: [PATCH 4805/4969] Fix compose docs

---
 docs/modules/docker_compose.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/docker_compose.md b/docs/modules/docker_compose.md
index 2ac45912479..3d3d7a510c2 100644
--- a/docs/modules/docker_compose.md
+++ b/docs/modules/docker_compose.md
@@ -72,7 +72,7 @@ accessible via the static factory methods from of the `Wait` class.
 
 For instance, we can wait for exposed port and set a custom timeout:
 <!--codeinclude-->
-[Wait for the exposed port and use a custom timeout](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWaitForPortWithTimeout
+[Wait for the exposed port and use a custom timeout](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java) inside_block:composeContainerWaitForPortWithTimeout
 <!--/codeinclude-->
 
 Needless to say, we can define different strategies for each service in our Docker Compose setup. 
@@ -81,7 +81,7 @@ For example, our Redis container can wait for a successful redis-cli command,
 while our db service waits for a specific log message:
 
 <!--codeinclude-->
-[Wait for a custom command and a log message](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWithCombinedWaitStrategies
+[Wait for a custom command and a log message](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java) inside_block:composeContainerWithCombinedWaitStrategies
 <!--/codeinclude-->
 
 

From 561c4835c24f9f8f32db7aea44552b6b4aa37923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 24 Mar 2026 10:30:56 -0600
Subject: [PATCH 4806/4969] Update LocalStack docs (#11581)

Fixes #11568
---
 docs/modules/localstack.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/modules/localstack.md b/docs/modules/localstack.md
index 72d4fc843a7..ca51979f5a0 100644
--- a/docs/modules/localstack.md
+++ b/docs/modules/localstack.md
@@ -10,15 +10,21 @@ You can start a LocalStack container instance from any Java application by using
 [Container creation](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
+Environment variables listed in the [LocalStack configuration documentation](https://docs.localstack.cloud/references/configuration/) may be used to customize LocalStack's configuration.
+Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
+
+!!! note
+    Starting March 23, 2026, `localstack/localstack` requires authentication via a `LOCALSTACK_AUTH_TOKEN` environment variable. Without it, the container will fail to start.
+
+    Use `.withEnv("LOCALSTACK_AUTH_TOKEN", System.getenv("LOCALSTACK_AUTH_TOKEN"))` to pass the token.
+    See the [LocalStack blog post](https://blog.localstack.cloud/localstack-single-image-next-steps/) for more details.
+
 ## Creating a client using AWS SDK
 
 <!--codeinclude-->
 [AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:with_aws_sdk_v2
 <!--/codeinclude-->
 
-Environment variables listed in [Localstack's README](https://github.com/localstack/localstack#configurations) may be used to customize Localstack's configuration. 
-Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:

From 96653222a3939ae57d344bfecb1d7ea08f57c77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Kojek?= <gkojek@gradle.com>
Date: Tue, 24 Mar 2026 19:55:55 +0100
Subject: [PATCH 4807/4969] Fix jarFileTest cache relocatability (#11574)

The jarFileTest task sets `systemProperty("jarFile", absolutePath)` which
embeds an absolute path as a task input, making the task not
cache-relocatable across different project locations.

Fix by:
- Using `inputs.files(shadowJar).withPathSensitivity(RELATIVE)` instead
  of the bare `file()` call (which doesn't register a proper input)
- Passing the jar path as a relative path to the system property

The test (AbstractJarFileTest) uses `Paths.get(System.getProperty("jarFile"))`
which resolves relative paths against the working directory (project dir),
so the test works identically with both absolute and relative paths.
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9a4d413379f..c44ea7b4761 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -34,8 +34,8 @@ task jarFileTest(type: Test) {
     testClassesDirs = sourceSets.jarFileTest.output.classesDirs
     classpath = sourceSets.jarFileTest.runtimeClasspath
 
-    file(shadowJar.outputs.files.singleFile) // input for correct caching
-    systemProperty("jarFile", shadowJar.outputs.files.singleFile)
+    inputs.files(shadowJar).withPathSensitivity(PathSensitivity.RELATIVE)
+    systemProperty("jarFile", project.projectDir.toPath().relativize(shadowJar.outputs.files.singleFile.toPath()).toString())
 
     dependsOn(shadowJar)
 }

From 7fe356ec4f28c32cace4f179a423a3163f4f0bf0 Mon Sep 17 00:00:00 2001
From: Konstantin Belinski <ksgubanov@gmail.com>
Date: Tue, 24 Mar 2026 20:34:56 +0100
Subject: [PATCH 4808/4969] Fix LocalStack javadoc (#11570)

---
 .../org/testcontainers/localstack/LocalStackContainer.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java
index 779f9a1e4ad..31eee4ca5ca 100644
--- a/modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java
+++ b/modules/localstack/src/main/java/org/testcontainers/localstack/LocalStackContainer.java
@@ -168,7 +168,7 @@ public URI getEndpoint() {
      * The access key can be used to construct AWS SDK v2 clients:
      * <pre><code>S3Client s3 = S3Client
              .builder()
-             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .endpointOverride(localstack.getEndpoint())
              .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
              localstack.getAccessKey(), localstack.getSecretKey()
              )))
@@ -187,7 +187,7 @@ public String getAccessKey() {
      * The secret key can be used to construct AWS SDK v2 clients:
      * <pre><code>S3Client s3 = S3Client
              .builder()
-             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .endpointOverride(localstack.getEndpoint())
              .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
              localstack.getAccessKey(), localstack.getSecretKey()
              )))
@@ -205,7 +205,7 @@ public String getSecretKey() {
      * The region can be used to construct AWS SDK v2 clients:
      * <pre><code>S3Client s3 = S3Client
              .builder()
-             .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))
+             .endpointOverride(localstack.getEndpoint())
              .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
              localstack.getAccessKey(), localstack.getSecretKey()
              )))

From 87ea1068d17ec63beddbdba58d683969dd2125f1 Mon Sep 17 00:00:00 2001
From: Melissa <65674838+meck-gd@users.noreply.github.com>
Date: Wed, 25 Mar 2026 16:39:10 +0100
Subject: [PATCH 4809/4969] Add support for !override docker compose tag
 (#11490)

---
 .../containers/ParsedDockerComposeFile.java   |  2 +-
 .../junit/ComposeContainerOverrideTest.java   | 31 +++++++++++++++++++
 .../compose-override/compose-override.yml     |  2 ++
 .../resources/compose-override/compose.yml    |  2 ++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
index d797a86bfbf..2d3104af6b1 100644
--- a/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
+++ b/core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java
@@ -50,7 +50,7 @@ class ParsedDockerComposeFile {
         SafeConstructor constructor = new SafeConstructor(options) {
             @Override
             protected Object constructObject(Node node) {
-                if (node.getTag().equals(new Tag("!reset"))) {
+                if (node.getTag().equals(new Tag("!reset")) || node.getTag().equals(new Tag("!override"))) {
                     return null;
                 }
                 return super.constructObject(node);
diff --git a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
index bf38af0f929..5065aaf62b2 100644
--- a/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
+++ b/core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java
@@ -45,4 +45,35 @@ void resetEnvironment() {
             assertThat(container.getConfig().getEnv()).doesNotContain("foo=bar");
         }
     }
+
+    @Test
+    void readLabel() {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE)
+                .withExposedService("redis", 6379)
+        ) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getLabels()).containsKey("label1");
+        }
+    }
+
+    @Test
+    void readOverriddenLabel() {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE, OVERRIDE)
+                .withExposedService("redis", 6379)
+        ) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getLabels()).doesNotContainKey("label1");
+            assertThat(container.getConfig().getLabels()).containsKey("label2");
+        }
+    }
 }
diff --git a/core/src/test/resources/compose-override/compose-override.yml b/core/src/test/resources/compose-override/compose-override.yml
index f5f457a6236..7dbf6ff5987 100644
--- a/core/src/test/resources/compose-override/compose-override.yml
+++ b/core/src/test/resources/compose-override/compose-override.yml
@@ -5,3 +5,5 @@ services:
       - 6379
     environment:
       foo: !reset null
+    labels: !override
+      label2: value2
diff --git a/core/src/test/resources/compose-override/compose.yml b/core/src/test/resources/compose-override/compose.yml
index a304ae82273..9e4a1e9169a 100644
--- a/core/src/test/resources/compose-override/compose.yml
+++ b/core/src/test/resources/compose-override/compose.yml
@@ -5,3 +5,5 @@ services:
       - 6379
     environment:
       foo: bar
+    labels:
+      label1: value1

From 58e48acaed5bde6778e592ad4cd5bc30b694f834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Mar 2026 11:56:29 -0600
Subject: [PATCH 4810/4969] Fix vault docs

---
 docs/modules/vault.md | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/docs/modules/vault.md b/docs/modules/vault.md
index 45d34844b7f..161efa8ccb0 100644
--- a/docs/modules/vault.md
+++ b/docs/modules/vault.md
@@ -4,7 +4,7 @@ Testcontainers module for [Vault](https://github.com/hashicorp/vault). Vault is
 
 ## Usage example
 
-Start Vault container as a `@ClassRule`:
+You can start a Vault container instance from any Java application by using:
 
 <!--codeinclude-->
 [Starting a Vault container](../../modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java) inside_block:vaultContainer
@@ -22,21 +22,6 @@ Use Http API to read data from Vault container:
 [Use Http API to read data](../../modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java) inside_block:readFirstSecretPathOverHttpApi
 <!--/codeinclude-->
 
-Use client library to read data from Vault container:
-
-<!--codeinclude-->
-[Use library to read data](../../modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java) inside_block:readWithLibrary
-<!--/codeinclude-->
-
-[See full example.](https://github.com/testcontainers/testcontainers-java/blob/master/modules/vault/src/test/java/org/testcontainers/vault/VaultContainerTest.java)
-
-## Why Vault in Junit tests?
-
-With the increasing popularity of Vault and secret management, applications are now needing to source secrets from Vault.
-This can prove challenging in the development phase without a running Vault instance readily on hand. This library 
-aims to solve your apps integration testing with Vault. You can also use it to
-test how your application behaves with Vault by writing different test scenarios in Junit.
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:

From 99791ff3d744dd75f13a37b60991002b5cf27787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Mar 2026 11:59:55 -0600
Subject: [PATCH 4811/4969] Fix hivemq docs

---
 docs/modules/hivemq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/hivemq.md b/docs/modules/hivemq.md
index 0029204a06c..8bba4c18b36 100644
--- a/docs/modules/hivemq.md
+++ b/docs/modules/hivemq.md
@@ -2,7 +2,7 @@
 
 ![hivemq logo](../modules_logos/hivemq-module.png)
 
-Automatic starting HiveMQ docker containers for JUnit4 and JUnit5 tests.
+Automatic starting HiveMQ docker containers for JUnit5 tests.
 This enables testing MQTT client applications and integration testing of custom HiveMQ extensions.
 
 - Community forum: https://community.hivemq.com/

From b1106296b1e089ac62c7270ab4bdbc515c2c0f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Mar 2026 16:28:02 -0600
Subject: [PATCH 4812/4969] Fix neo4j docs

---
 docs/modules/databases/neo4j.md               |  11 +-
 .../containers/Neo4jExampleTest.java          |   2 -
 .../neo4j/Neo4jContainerTest.java             | 140 ++++++++++--------
 3 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/docs/modules/databases/neo4j.md b/docs/modules/databases/neo4j.md
index 9bfb7fbfca7..c7b06e99fe7 100644
--- a/docs/modules/databases/neo4j.md
+++ b/docs/modules/databases/neo4j.md
@@ -9,19 +9,12 @@ the Testcontainers integration supports also newer 5.x images of Neo4j.
 
 ## Usage example
 
-Declare your Testcontainers as a `@ClassRule` or `@Rule` in a JUnit 4 test or as static or member attribute of a JUnit 5 test annotated with `@Container` as you would with other Testcontainers.
-You can either use call `getBoltUrl()` or `getHttpUrl()` on the Neo4j container.
-`getBoltUrl()` is meant to be used with one of the [official Bolt drivers](https://neo4j.com/developer/language-guides/) while `getHttpUrl()` gives you the HTTP-address of the transactional HTTP endpoint.
-On the JVM you would most likely use the [Java driver](https://github.com/neo4j/neo4j-java-driver).
-
-The following example uses the JUnit 5 extension `@Testcontainers` and demonstrates both the usage of the Java Driver and the REST endpoint:
+You can start a Neo4j container instance from any Java application by using:
 
 <!--codeinclude-->
-[JUnit 5 example](../../../examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java) inside_block:junitExample
+[Neo4j container](../../../modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
-You are not limited to Unit tests, and you can use an instance of the Neo4j Testcontainers in vanilla Java code as well.
-
 ## Additional features
 
 ### Custom password
diff --git a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
index 38c22a0ff45..bc8770aaef0 100644
--- a/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
+++ b/examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java
@@ -22,7 +22,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-// junitExample {
 @Testcontainers
 class Neo4jExampleTest {
 
@@ -68,4 +67,3 @@ void testSomethingUsingHttp() throws IOException {
         }
     }
 }
-// }
diff --git a/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
index 7676450e75a..b880e7b4e8f 100644
--- a/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
+++ b/modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java
@@ -30,18 +30,33 @@ class Neo4jContainerTest {
     // See org.testcontainers.utility.LicenseAcceptance#ACCEPTANCE_FILE_NAME
     private static final String ACCEPTANCE_FILE_LOCATION = "/container-license-acceptance.txt";
 
+    @Test
+    void authenticated() {
+        try (
+            // container {
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4")
+            // }
+        ) {
+            neo4j.start();
+            try (Driver driver = getDriver(neo4j); Session session = driver.session()) {
+                long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
+                assertThat(one).isEqualTo(1L);
+            }
+        }
+    }
+
     @Test
     void shouldDisableAuthentication() {
         try (
             // spotless:off
             // withoutAuthentication {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4")
                 .withoutAuthentication()
             // }
             // spotless:on
         ) {
-            neo4jContainer.start();
-            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
+            neo4j.start();
+            try (Driver driver = getDriver(neo4j); Session session = driver.session()) {
                 long one = session.run("RETURN 1", Collections.emptyMap()).next().get(0).asLong();
                 assertThat(one).isEqualTo(1L);
             }
@@ -54,12 +69,12 @@ void shouldCopyDatabase() {
         assumeThat(DockerClientFactory.instance().getInfo().getArchitecture()).isNotEqualTo("aarch64");
         try (
             // copyDatabase {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:3.5.30")
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:3.5.30")
                 .withDatabase(MountableFile.forClasspathResource("/test-graph.db"))
             // }
         ) {
-            neo4jContainer.start();
-            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
+            neo4j.start();
+            try (Driver driver = getDriver(neo4j); Session session = driver.session()) {
                 Result result = session.run("MATCH (t:Thing) RETURN t");
                 assertThat(result.list().stream().map(r -> r.get("t").get("name").asString()))
                     .containsExactlyInAnyOrder("Thing", "Thing 2", "Thing 3", "A box");
@@ -98,12 +113,12 @@ void shouldFailOnCopyDatabaseForCustomNonSemverNeo4j4Image() {
     void shouldCopyPlugins() {
         try (
             // registerPluginsPath {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4")
                 .withPlugins(MountableFile.forClasspathResource("/custom-plugins"))
             // }
         ) {
-            neo4jContainer.start();
-            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
+            neo4j.start();
+            try (Driver driver = getDriver(neo4j); Session session = driver.session()) {
                 assertThatCustomPluginWasCopied(session);
             }
         }
@@ -113,12 +128,12 @@ void shouldCopyPlugins() {
     void shouldCopyPlugin() {
         try (
             // registerPluginsJar {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4")
                 .withPlugins(MountableFile.forClasspathResource("/custom-plugins/hello-world.jar"))
             // }
         ) {
-            neo4jContainer.start();
-            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
+            neo4j.start();
+            try (Driver driver = getDriver(neo4j); Session session = driver.session()) {
                 assertThatCustomPluginWasCopied(session);
             }
         }
@@ -137,13 +152,13 @@ void shouldRunEnterprise() {
 
         try (
             // enterpriseEdition {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4-enterprise")
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4-enterprise")
                 .acceptLicense()
                 // }
                 .withAdminPassword("Picard123")
         ) {
-            neo4jContainer.start();
-            try (Driver driver = getDriver(neo4jContainer); Session session = driver.session()) {
+            neo4j.start();
+            try (Driver driver = getDriver(neo4j); Session session = driver.session()) {
                 String edition = session
                     .run("CALL dbms.components() YIELD edition RETURN edition", Collections.emptyMap())
                     .next()
@@ -157,110 +172,109 @@ void shouldRunEnterprise() {
     @Test
     void shouldAddConfigToEnvironment() {
         // neo4jConfiguration {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4")
             .withNeo4jConfig("dbms.security.procedures.unrestricted", "apoc.*,algo.*")
             .withNeo4jConfig("dbms.tx_log.rotation.size", "42M");
         // }
 
-        assertThat(neo4jContainer.getEnvMap())
-            .containsEntry("NEO4J_dbms_security_procedures_unrestricted", "apoc.*,algo.*");
-        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_dbms_tx__log_rotation_size", "42M");
+        assertThat(neo4j.getEnvMap()).containsEntry("NEO4J_dbms_security_procedures_unrestricted", "apoc.*,algo.*");
+        assertThat(neo4j.getEnvMap()).containsEntry("NEO4J_dbms_tx__log_rotation_size", "42M");
     }
 
     @Test
     void shouldRespectEnvironmentAuth() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret");
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret");
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/secret");
+        assertThat(neo4j.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/secret");
     }
 
     @Test
     void shouldSetCustomPasswordCorrectly() {
         // withAdminPassword {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withAdminPassword("verySecret");
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").withAdminPassword("verySecret");
         // }
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/verySecret");
+        assertThat(neo4j.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/verySecret");
     }
 
     @Test
-    void containerAdminPasswordOverrulesEnvironmentAuth() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
+    void adminPasswordOverrulesEnvironmentAuth() {
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4")
             .withEnv("NEO4J_AUTH", "neo4j/secret")
             .withAdminPassword("anotherSecret");
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/anotherSecret");
+        assertThat(neo4j.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/anotherSecret");
     }
 
     @Test
-    void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
+    void shouldWithoutAuthenticationOverrulesEnvironmentAuth() {
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4")
             .withEnv("NEO4J_AUTH", "neo4j/secret")
             .withoutAuthentication();
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "none");
+        assertThat(neo4j.getEnvMap()).containsEntry("NEO4J_AUTH", "none");
     }
 
     @Test
     void shouldRespectAlreadyDefinedPortMappingsBolt() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687);
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687);
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getExposedPorts()).containsExactly(7687);
+        assertThat(neo4j.getExposedPorts()).containsExactly(7687);
     }
 
     @Test
     void shouldRespectAlreadyDefinedPortMappingsHttp() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7474);
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").withExposedPorts(7474);
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getExposedPorts()).containsExactly(7474);
+        assertThat(neo4j.getExposedPorts()).containsExactly(7474);
     }
 
     @Test
     void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687, 7474);
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687, 7474);
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getExposedPorts()).containsExactlyInAnyOrder(7474, 7687);
+        assertThat(neo4j.getExposedPorts()).containsExactlyInAnyOrder(7474, 7687);
     }
 
     @Test
     void shouldDefaultExportBoltHttpAndHttps() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4");
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer.getExposedPorts()).containsExactlyInAnyOrder(7473, 7474, 7687);
+        assertThat(neo4j.getExposedPorts()).containsExactlyInAnyOrder(7473, 7474, 7687);
     }
 
     @Test
     void shouldRespectCustomWaitStrategy() {
-        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy());
+        Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy());
 
-        neo4jContainer.configure();
+        neo4j.configure();
 
-        assertThat(neo4jContainer).extracting("waitStrategy").isInstanceOf(CustomDummyWaitStrategy.class);
+        assertThat(neo4j).extracting("waitStrategy").isInstanceOf(CustomDummyWaitStrategy.class);
     }
 
     @Test
     void shouldConfigureSinglePluginByName() {
-        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withPlugins("apoc")) {
+        try (Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").withPlugins("apoc")) {
             // needs to get called explicitly for setup
-            neo4jContainer.configure();
+            neo4j.configure();
 
-            assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
+            assertThat(neo4j.getEnvMap()).containsEntry("NEO4JLABS_PLUGINS", "[\"apoc\"]");
         }
     }
 
@@ -268,14 +282,14 @@ void shouldConfigureSinglePluginByName() {
     void shouldConfigureMultiplePluginsByName() {
         try (
             // configureLabsPlugins {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4") //
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4") //
                 .withPlugins("apoc", "bloom");
             // }
         ) {
             // needs to get called explicitly for setup
-            neo4jContainer.configure();
+            neo4j.configure();
 
-            assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
+            assertThat(neo4j.getEnvMap().get("NEO4JLABS_PLUGINS"))
                 .containsAnyOf("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
         }
     }
@@ -284,26 +298,26 @@ void shouldConfigureMultiplePluginsByName() {
     void shouldCreateRandomUuidBasedPasswords() {
         try (
             // withRandomPassword {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withRandomPassword();
+            Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4").withRandomPassword();
             // }
         ) {
             // It will throw an exception if it's not UUID parsable.
-            assertThatNoException().isThrownBy(neo4jContainer::configure);
+            assertThatNoException().isThrownBy(neo4j::configure);
             // This basically is always true at if the random password is UUID-like.
-            assertThat(neo4jContainer.getAdminPassword())
+            assertThat(neo4j.getAdminPassword())
                 .satisfies(password -> assertThat(UUID.fromString(password).toString()).isEqualTo(password));
         }
     }
 
     @Test
     void shouldWarnOnPasswordTooShort() {
-        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4");) {
+        try (Neo4jContainer neo4j = new Neo4jContainer("neo4j:4.4");) {
             Logger logger = (Logger) DockerLoggerFactory.getLogger("neo4j:4.4");
             TestLogAppender testLogAppender = new TestLogAppender();
             logger.addAppender(testLogAppender);
             testLogAppender.start();
 
-            neo4jContainer.withAdminPassword("short");
+            neo4j.withAdminPassword("short");
 
             testLogAppender.stop();
 
@@ -337,11 +351,11 @@ protected void append(ILoggingEvent eventObject) {
         }
     }
 
-    private static Driver getDriver(Neo4jContainer container) {
+    private static Driver getDriver(Neo4jContainer neo4j) {
         AuthToken authToken = AuthTokens.none();
-        if (container.getAdminPassword() != null) {
-            authToken = AuthTokens.basic("neo4j", container.getAdminPassword());
+        if (neo4j.getAdminPassword() != null) {
+            authToken = AuthTokens.basic("neo4j", neo4j.getAdminPassword());
         }
-        return GraphDatabase.driver(container.getBoltUrl(), authToken);
+        return GraphDatabase.driver(neo4j.getBoltUrl(), authToken);
     }
 }

From de41ece851d57ed6973177ed3f6ce2e29ed2bd74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Mar 2026 16:47:21 -0600
Subject: [PATCH 4813/4969] Fix JUnit 5 docs

---
 docs/test_framework_integration/junit_5.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/test_framework_integration/junit_5.md b/docs/test_framework_integration/junit_5.md
index 883adc90af9..aed2d515af9 100644
--- a/docs/test_framework_integration/junit_5.md
+++ b/docs/test_framework_integration/junit_5.md
@@ -1,7 +1,6 @@
 # Jupiter / JUnit 5
 
-While Testcontainers is tightly coupled with the JUnit 4.x rule API, this module provides
-an API that is based on the [JUnit Jupiter](https://junit.org/junit5/) extension model.
+This module provides an API that is based on the [JUnit Jupiter](https://junit.org/junit5/) extension model.
 
 The extension supports two modes:
 
@@ -58,10 +57,6 @@ using JUnit 5.
 
 ## Limitations
 
-Since this module has a dependency onto JUnit Jupiter and on Testcontainers core, which
-has a dependency onto JUnit 4.x, projects using this module will end up with both, JUnit Jupiter
-and JUnit 4.x in the test classpath.
-
 This extension has only been tested with sequential test execution. Using it with parallel test execution is unsupported and may have unintended side effects.
 
 ## Adding Testcontainers JUnit 5 support to your project dependencies

From 990a7dc27a836077a1098a6e5172cf2d57b8ebb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Mar 2026 16:55:56 -0600
Subject: [PATCH 4814/4969] Fix docs

---
 docs/features/creating_container.md                    | 10 ++--------
 docs/features/creating_images.md                       |  4 ++--
 .../manual_lifecycle_control.md                        |  3 +--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/docs/features/creating_container.md b/docs/features/creating_container.md
index 443e04f1a91..baaea5fb36d 100644
--- a/docs/features/creating_container.md
+++ b/docs/features/creating_container.md
@@ -34,14 +34,8 @@ It is suggested that developers treat `DockerImageName`s as you would any other
 A generic container rule can be used with any public docker image; for example:
 
 <!--codeinclude--> 
-[Creating a Redis container (JUnit 4)](../examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java) inside_block:simple
+[Creating a Redis container](../examples/junit5/redis/src/test/java/quickstart/RedisBackedCacheIntTest.java) inside_block:container
 <!--/codeinclude-->
 
-Further options may be specified:
-
-<!--codeinclude--> 
-[Creating a container with more options (JUnit 4)](../examples/junit4/generic/src/test/java/generic/ContainerCreationTest.java) inside_block:withOptions
-<!--/codeinclude-->
-
-These containers, as `@ClassRule`s, will be started before any tests in the class run, and will be destroyed after all
+The container, as `@Container`, will be started before any tests in the class run, and will be destroyed after all
 tests have run.
diff --git a/docs/features/creating_images.md b/docs/features/creating_images.md
index 6f1988ed28e..8a239d342cc 100644
--- a/docs/features/creating_images.md
+++ b/docs/features/creating_images.md
@@ -13,9 +13,9 @@ Testcontainers will `docker build` a temporary container image, and will use it
 
 `ImageFromDockerfile` accepts arbitrary files, strings or classpath resources to be used as files in the build context.
 At least one of these needs to be a `Dockerfile`.
+
 ```java
-@Rule
-public GenericContainer dslContainer = new GenericContainer(
+GenericContainer container = new GenericContainer(
     new ImageFromDockerfile()
             .withFileFromString("folder/someFile.txt", "hello")
             .withFileFromClasspath("test.txt", "mappable-resource/test-resource.txt")
diff --git a/docs/test_framework_integration/manual_lifecycle_control.md b/docs/test_framework_integration/manual_lifecycle_control.md
index 6de3cb47196..e1005397c00 100644
--- a/docs/test_framework_integration/manual_lifecycle_control.md
+++ b/docs/test_framework_integration/manual_lifecycle_control.md
@@ -1,7 +1,6 @@
 # Manual container lifecycle control
 
-While Testcontainers was originally built with JUnit 4 integration in mind, it is fully usable with other test 
-frameworks, or with no framework at all.
+Testcontainers is fully usable with any test framework, or with no framework at all.
 
 ## Manually starting/stopping containers
 

From 8e5416d44f272e2db5bae141c299619e58500add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 30 Mar 2026 12:21:08 -0600
Subject: [PATCH 4815/4969] Fix ActiveMQ docs

---
 docs/modules/activemq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/activemq.md b/docs/modules/activemq.md
index 07cc6e75381..3e925326498 100644
--- a/docs/modules/activemq.md
+++ b/docs/modules/activemq.md
@@ -1,6 +1,6 @@
 # ActiveMQ
 
-Testcontainers module for [ActiveMQ](https://hub.docker.com/r/apache/activemq-classic) and
+Testcontainers module for [ActiveMQ](https://hub.docker.com/r/apache/activemq) and
 [Artemis](https://hub.docker.com/r/apache/activemq-artemis).
 
 ## ActiveMQContainer's usage examples

From 6a02d006010512a35d54c674524216b7b00c5ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 30 Mar 2026 13:16:43 -0600
Subject: [PATCH 4816/4969] Support apache/artemis in ArtemisContainer (#11590)

Fixes #11588
---
 docs/modules/activemq.md                        |  2 +-
 .../activemq/ArtemisContainer.java              |  6 +++++-
 .../activemq/ArtemisContainerTest.java          | 17 ++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/docs/modules/activemq.md b/docs/modules/activemq.md
index 3e925326498..7959c47576a 100644
--- a/docs/modules/activemq.md
+++ b/docs/modules/activemq.md
@@ -1,7 +1,7 @@
 # ActiveMQ
 
 Testcontainers module for [ActiveMQ](https://hub.docker.com/r/apache/activemq) and
-[Artemis](https://hub.docker.com/r/apache/activemq-artemis).
+[Artemis](https://hub.docker.com/r/apache/artemis).
 
 ## ActiveMQContainer's usage examples
 
diff --git a/modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java b/modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java
index 7d4918a9306..82072993b48 100644
--- a/modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java
+++ b/modules/activemq/src/main/java/org/testcontainers/activemq/ArtemisContainer.java
@@ -9,6 +9,8 @@
 /**
  * Testcontainers implementation for Apache ActiveMQ Artemis.
  * <p>
+ * Supported images: {@code apache/artemis}, {@code apache/activemq-artemis}
+ * <p>
  * Exposed ports:
  * <ul>
  *     <li>Console: 8161</li>
@@ -24,6 +26,8 @@ public class ArtemisContainer extends GenericContainer<ArtemisContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("apache/activemq-artemis");
 
+    private static final DockerImageName APACHE_ARTEMIS_IMAGE = DockerImageName.parse("apache/artemis");
+
     private static final int WEB_CONSOLE_PORT = 8161;
 
     // CORE,MQTT,AMQP,HORNETQ,STOMP,OPENWIRE
@@ -49,7 +53,7 @@ public ArtemisContainer(String image) {
 
     public ArtemisContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE, APACHE_ARTEMIS_IMAGE);
 
         withExposedPorts(WEB_CONSOLE_PORT, TCP_PORT, HORNETQ_STOMP_PORT, AMQP_PORT, STOMP_PORT, MQTT_PORT, WS_PORT);
         waitingFor(Wait.forLogMessage(".*HTTP Server started.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
diff --git a/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java b/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
index 6a3c3ecc19c..74cdfa76da7 100644
--- a/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
+++ b/modules/activemq/src/test/java/org/testcontainers/activemq/ArtemisContainerTest.java
@@ -9,6 +9,8 @@
 import lombok.SneakyThrows;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -18,7 +20,7 @@ class ArtemisContainerTest {
     void defaultCredentials() {
         try (
             // container {
-            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
+            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.32.0-alpine")
             // }
         ) {
             artemis.start();
@@ -33,7 +35,7 @@ void defaultCredentials() {
     void customCredentials() {
         try (
             // settingCredentials {
-            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
+            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.32.0-alpine")
                 .withUser("testcontainers")
                 .withPassword("testcontainers")
             // }
@@ -50,7 +52,7 @@ void customCredentials() {
     void allowAnonymousLogin() {
         try (
             // enableAnonymousLogin {
-            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.30.0-alpine")
+            ArtemisContainer artemis = new ArtemisContainer("apache/activemq-artemis:2.32.0-alpine")
                 .withEnv("ANONYMOUS_LOGIN", "true")
             // }
         ) {
@@ -60,6 +62,15 @@ void allowAnonymousLogin() {
         }
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = { "apache/activemq-artemis:2.32.0-alpine", "apache/artemis:2.53.0-alpine" })
+    void compatibility(String image) {
+        try (ArtemisContainer artemis = new ArtemisContainer(image)) {
+            artemis.start();
+            assertFunctionality(artemis, false);
+        }
+    }
+
     @SneakyThrows
     private void assertFunctionality(ArtemisContainer artemis, boolean anonymousLogin) {
         ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(artemis.getBrokerUrl());

From 2ea4d7496b2969187f5a50977e0343f63cd68041 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 02:47:14 +0000
Subject: [PATCH 4817/4969] Bump org.apache.pulsar:pulsar-bom from 4.1.1 to
 4.2.0 in /modules/pulsar

Bumps [org.apache.pulsar:pulsar-bom](https://github.com/apache/pulsar) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/apache/pulsar/releases)
- [Commits](https://github.com/apache/pulsar/compare/v4.1.1...v4.2.0)

---
updated-dependencies:
- dependency-name: org.apache.pulsar:pulsar-bom
  dependency-version: 4.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/pulsar/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
index eb8053cc71b..9dee1058aa5 100644
--- a/modules/pulsar/build.gradle
+++ b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("org.apache.pulsar:pulsar-bom:4.1.1")
+    testImplementation platform("org.apache.pulsar:pulsar-bom:4.2.0")
     testImplementation 'org.apache.pulsar:pulsar-client'
     testImplementation 'org.apache.pulsar:pulsar-client-admin'
 }

From fcbf43b25bcc2c8f608ebb29c208f121cf0a423f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 02:47:19 +0000
Subject: [PATCH 4818/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.5.6 to 3.5.8.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.5.6...3.5.8)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-version: 3.5.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 2cfef8d924c..fd8569f6c36 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.6'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.8'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 06a85b3e498ba7ecff4e49de900dddad46281d7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 02:47:24 +0000
Subject: [PATCH 4819/4969] Bump com.clickhouse:clickhouse-jdbc in
 /modules/clickhouse

Bumps [com.clickhouse:clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-java) from 0.9.4 to 0.9.8.
- [Release notes](https://github.com/ClickHouse/clickhouse-java/releases)
- [Changelog](https://github.com/ClickHouse/clickhouse-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ClickHouse/clickhouse-java/compare/v0.9.4...v0.9.8)

---
updated-dependencies:
- dependency-name: com.clickhouse:clickhouse-jdbc
  dependency-version: 0.9.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/clickhouse/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 91d80a687d7..59ea169583c 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -5,12 +5,12 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.4', classifier: 'http')
+    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.8', classifier: 'http')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.4', classifier: 'all')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.8', classifier: 'all')
 
-    testImplementation 'com.clickhouse:client-v2:0.9.4'
+    testImplementation 'com.clickhouse:client-v2:0.9.8'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.4', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.8', classifier: 'http')
 }

From b963d1892b129c3e3026dd5d96f058bdb5e88c23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 02:47:34 +0000
Subject: [PATCH 4820/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/mssqlserver

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.3.0.jre8-preview to 13.4.0.jre11.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.4.0.jre11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 6561dbbe486..6e2628da7a2 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.3.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.4.0.jre11'
 
     testImplementation project(':testcontainers-r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'

From 19964a3517d1ba79841fef06f759e892d0a30c48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 02:47:42 +0000
Subject: [PATCH 4821/4969] Bump com.microsoft.sqlserver:mssql-jdbc in
 /modules/azure

Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 13.3.0.jre8-preview to 13.4.0.jre11.
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.4.0.jre11
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index 796f500410b..faabca60be9 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'com.azure:azure-data-tables'
     testImplementation 'com.azure:azure-messaging-eventhubs'
     testImplementation 'com.azure:azure-messaging-servicebus'
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.3.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.4.0.jre11'
 }
 
 tasks.japicmp {

From 1aa812dff14944ef4c46d54179a79120dd160138 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 02:47:43 +0000
Subject: [PATCH 4822/4969] Bump io.trino:trino-jdbc from 478 to 480 in
 /modules/trino

Bumps io.trino:trino-jdbc from 478 to 480.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-version: '480'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 004bd38a8b9..82f831db36a 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:478'
+    testRuntimeOnly 'io.trino:trino-jdbc:480'
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 }

From 0e6ddb0f3f41da0b9aa2cd23ad313420637514d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 02:56:41 +0000
Subject: [PATCH 4823/4969] Bump io.minio:minio from 8.6.0 to 9.0.0 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 8.6.0 to 9.0.0.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/8.6.0...9.0.0)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index 35dcecb8b95..bca68abc4d6 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:8.6.0")
+    testImplementation("io.minio:minio:9.0.0")
 }

From 41c9445d01637349336ac5eb430215d995847773 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 03:01:02 +0000
Subject: [PATCH 4824/4969] Bump com.databend:databend-jdbc from 0.4.1 to 0.4.5
 in /modules/databend

Bumps [com.databend:databend-jdbc](https://github.com/databendcloud/databend-jdbc) from 0.4.1 to 0.4.5.
- [Release notes](https://github.com/databendcloud/databend-jdbc/releases)
- [Commits](https://github.com/databendcloud/databend-jdbc/commits)

---
updated-dependencies:
- dependency-name: com.databend:databend-jdbc
  dependency-version: 0.4.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 9da45a6fab9..1b9eaf4f0c8 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.databend:databend-jdbc:0.4.1'
+    testRuntimeOnly 'com.databend:databend-jdbc:0.4.5'
 }

From ef3764a83a34742830d436db4cd352427fb16e96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2026 22:21:08 +0000
Subject: [PATCH 4825/4969] Bump
 com.gradle:common-custom-user-data-gradle-plugin

Bumps [com.gradle:common-custom-user-data-gradle-plugin](https://github.com/gradle/common-custom-user-data-gradle-plugin) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/gradle/common-custom-user-data-gradle-plugin/releases)
- [Commits](https://github.com/gradle/common-custom-user-data-gradle-plugin/compare/v2.4.0...v2.5.0)

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 6784ae93160..d59d26df2df 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.19.2"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.4.0"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.5.0"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }
 }

From a7f79aeb10270d96c8700a578308179506cda31e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Apr 2026 15:51:20 +0000
Subject: [PATCH 4826/4969] Bump gradle/actions from 5 to 6

Bumps [gradle/actions](https://github.com/gradle/actions) from 5 to 6.
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/v5...v6)

---
updated-dependencies:
- dependency-name: gradle/actions
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-rootless.yml           | 2 +-
 .github/workflows/ci.yml                    | 6 +++---
 .github/workflows/release.yml               | 2 +-
 .github/workflows/update-gradle-wrapper.yml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 05d3d6d6607..46e2b4a9a23 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -52,7 +52,7 @@ jobs:
         with:
           rootless: true
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
       - uses: ./.github/actions/setup-junit-report
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8d7f5f65a27..b1ff89858e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -126,7 +126,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -163,7 +163,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-java
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
       - id: set-matrix
         env:
           # Since we override the tests executor,
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bdb87788c0a..0630e826628 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
         run: docker image prune -af
 
       - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Run Gradle Build
         run: ./gradlew build --scan --no-daemon -i -x test
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index fe1174c60d6..062cf4017c9 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -24,4 +24,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/actions/wrapper-validation@v5
+      - uses: gradle/actions/wrapper-validation@v6

From bd5863e6d0e075af8900817a8074207e5c60cd83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Apr 2026 18:26:30 +0000
Subject: [PATCH 4827/4969] Bump org.jetbrains:annotations in /modules/selenium

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/selenium/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
index 30c3c1a7619..79b525b6185 100644
--- a/modules/selenium/build.gradle
+++ b/modules/selenium/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'org.mortbay.jetty:jetty:6.1.26'
     testImplementation project(':testcontainers-nginx')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 01d1dd67cd0b23c24f0ee4318a45479708b7abd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 8 Apr 2026 09:30:31 -0600
Subject: [PATCH 4828/4969] Ignore major update for rest-assured

---
 .github/dependabot.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5e1b5000846..48739f1910c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,6 +22,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.junit.platform:junit-platform-launcher"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
@@ -63,6 +65,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/clickhouse"
     schedule:
@@ -78,6 +83,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/couchbase"
     schedule:
@@ -122,6 +130,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/hivemq"
     schedule:
@@ -214,6 +225,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/mongodb"
     schedule:
@@ -254,6 +268,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/openfga"
     schedule:
@@ -328,6 +345,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/scylladb"
     schedule:
@@ -395,6 +415,9 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "io.rest-assured:rest-assured"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/weaviate"
     schedule:

From b55d3e4c51a60ee1031063a92e2d129348491cfc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:31:45 +0000
Subject: [PATCH 4829/4969] Bump io.rest-assured:rest-assured in
 /modules/chromadb

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/chromadb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/chromadb/build.gradle b/modules/chromadb/build.gradle
index cec94a23faa..ec41def56df 100644
--- a/modules/chromadb/build.gradle
+++ b/modules/chromadb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
 }

From da25bcb0b5fb63036a6b9acd52e5af8776c1e7b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:31:46 +0000
Subject: [PATCH 4830/4969] Bump io.rest-assured:rest-assured in
 /modules/grafana

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index 90b84ee2c6c..da11a209555 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Grafana"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.16.1'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 

From a61963b9a5c789075df0f00f2562509b6faeda5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:31:48 +0000
Subject: [PATCH 4831/4969] Bump io.rest-assured:rest-assured from 5.5.6 to
 5.5.7 in /modules/consul

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/consul/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
index ff88de2db29..f496a86d6fd 100644
--- a/modules/consul/build.gradle
+++ b/modules/consul/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
 }

From 1603050276d645eec75326ae852a60c628392b11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:31:52 +0000
Subject: [PATCH 4832/4969] Bump org.apache.tomcat:tomcat-jdbc in /modules/jdbc

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.14 to 11.0.21.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/jdbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index f34c99c0385..2b896d3724b 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
     testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
     testImplementation 'org.vibur:vibur-dbcp:26.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.14'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.21'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 1d7bb195cc03ef295a69363d4f99183c4057fee5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:32:39 +0000
Subject: [PATCH 4833/4969] Bump io.rest-assured:rest-assured in
 /modules/mockserver

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mockserver/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index aa06ec3af1e..2ff2e9f34c6 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
 }

From a68e065fc0b10cb1a7c863dc5f2c858a957f9dd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:32:59 +0000
Subject: [PATCH 4834/4969] Bump io.milvus:milvus-sdk-java from 2.6.10 to
 2.6.17 in /modules/milvus

Bumps [io.milvus:milvus-sdk-java](https://github.com/milvus-io/milvus-sdk-java) from 2.6.10 to 2.6.17.
- [Release notes](https://github.com/milvus-io/milvus-sdk-java/releases)
- [Changelog](https://github.com/milvus-io/milvus-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/milvus-io/milvus-sdk-java/compare/v2.6.10...v2.6.17)

---
updated-dependencies:
- dependency-name: io.milvus:milvus-sdk-java
  dependency-version: 2.6.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/milvus/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/milvus/build.gradle b/modules/milvus/build.gradle
index cb4ef3b2145..613971697b6 100644
--- a/modules/milvus/build.gradle
+++ b/modules/milvus/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Milvus"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.milvus:milvus-sdk-java:2.6.10'
+    testImplementation 'io.milvus:milvus-sdk-java:2.6.17'
 }

From 2a1bd1a0e3987b30c9076ec93ba504889c069489 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:33:20 +0000
Subject: [PATCH 4835/4969] Bump io.rest-assured:rest-assured from 5.5.6 to
 5.5.7 in /modules/ollama

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ollama/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ollama/build.gradle b/modules/ollama/build.gradle
index 87a31296135..0da01d0ad96 100644
--- a/modules/ollama/build.gradle
+++ b/modules/ollama/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Ollama"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
 }

From e2535eaa77ca606d244e4ea046dc0a90536b2608 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:34:15 +0000
Subject: [PATCH 4836/4969] Bump redis.clients:jedis from 7.1.0 to 7.4.1 in
 /modules/toxiproxy

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 7.1.0 to 7.4.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v7.1.0...v7.4.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 7.4.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 261f6c29384..205147293fd 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.11'
 
-    testImplementation 'redis.clients:jedis:7.1.0'
+    testImplementation 'redis.clients:jedis:7.4.1'
 }

From f85aadaa68efe5b6b71f5dae01f5eeb77d93106b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:34:25 +0000
Subject: [PATCH 4837/4969] Bump io.rest-assured:rest-assured in
 /modules/redpanda

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index 3f60fd8db71..e560d73a848 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     shaded 'org.freemarker:freemarker:2.3.34'
 
     testImplementation 'org.apache.kafka:kafka-clients:4.1.1'
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 9f3e62cd7ce36609c2136380b9b0ce4fea060044 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:46:06 +0000
Subject: [PATCH 4838/4969] Bump io.rest-assured:rest-assured from 5.5.6 to
 5.5.7 in /modules/vault

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/vault/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
index 7c222d4b064..bbf7929c4e7 100644
--- a/modules/vault/build.gradle
+++ b/modules/vault/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
 }

From db2f9010564e8574cb73a5d245beae2900e9d480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 8 Apr 2026 11:46:07 -0600
Subject: [PATCH 4839/4969] Cleanup dependencies

---
 docs/examples/junit5/redis/build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
index 3404178b957..277ec0b8ae5 100644
--- a/docs/examples/junit5/redis/build.gradle
+++ b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.8.0.RELEASE"
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":testcontainers-junit-jupiter")

From 65507da8f155a6ea5373b0211f7406f74ee0e233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 22:11:03 +0000
Subject: [PATCH 4840/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-free

Bumps com.oracle.database.jdbc:ojdbc11 from 23.26.0.0.0 to 23.26.1.0.0.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.26.1.0.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index e7cc9669632..5d2eeecab5c 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.0.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.1.0.0'
 
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 

From cfc475ece29225dabdab36d15aea84142204d98c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 22:11:04 +0000
Subject: [PATCH 4841/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-xe

Bumps com.oracle.database.jdbc:ojdbc11 from 23.26.0.0.0 to 23.26.1.0.0.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.26.1.0.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-xe/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 6faeeb9367e..856ee74a065 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.0.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.1.0.0'
 
     compileOnly 'org.jetbrains:annotations:26.0.2-1'
 

From 7219459ad3260abffb6958075433ec07bfd9a7fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 22:11:16 +0000
Subject: [PATCH 4842/4969] Bump org.assertj:assertj-core in /modules/jdbc-test

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.6 to 3.27.7.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.6...assertj-build-3.27.7)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f7b081acf7b..128fd059841 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.8.1'
 
-    api 'org.assertj:assertj-core:3.27.6'
+    api 'org.assertj:assertj-core:3.27.7'
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     api 'org.vibur:vibur-dbcp:26.0'

From f216c42335df8bdc07e6bc7c144250108542115e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Apr 2026 22:11:18 +0000
Subject: [PATCH 4843/4969] Bump com.mysql:mysql-connector-j in
 /modules/jdbc-test

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 9.5.0 to 9.6.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/9.5.0...9.6.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-version: 9.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 f7b081acf7b..70bf000d4bb 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -10,6 +10,6 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     api 'org.vibur:vibur-dbcp:26.0'
-    api 'com.mysql:mysql-connector-j:9.5.0'
+    api 'com.mysql:mysql-connector-j:9.6.0'
     api 'org.junit.jupiter:junit-jupiter:5.14.1'
 }

From 37262149abb92b06a411ab21e6b8aae74c2ef105 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2026 03:43:36 +0000
Subject: [PATCH 4844/4969] Bump io.qdrant:client from 1.16.1 to 1.17.0 in
 /modules/qdrant

Bumps [io.qdrant:client](https://github.com/qdrant/java-client) from 1.16.1 to 1.17.0.
- [Release notes](https://github.com/qdrant/java-client/releases)
- [Commits](https://github.com/qdrant/java-client/compare/v1.16.1...v1.17.0)

---
updated-dependencies:
- dependency-name: io.qdrant:client
  dependency-version: 1.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 849cafeb37f..5d695095300 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Qdrant"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.qdrant:client:1.16.1'
+    testImplementation 'io.qdrant:client:1.17.0'
     testImplementation platform('io.grpc:grpc-bom:1.75.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'

From 5fa1ebe7746cbaf56af9c04e6f34d7b12a8039d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2026 03:43:41 +0000
Subject: [PATCH 4845/4969] Bump org.typesense:typesense-java in
 /modules/typesense

Bumps [org.typesense:typesense-java](https://github.com/typesense/typesense-java) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/typesense/typesense-java/releases)
- [Commits](https://github.com/typesense/typesense-java/commits)

---
updated-dependencies:
- dependency-name: org.typesense:typesense-java
  dependency-version: 2.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/typesense/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/typesense/build.gradle b/modules/typesense/build.gradle
index 17d6135b604..87aef78cad1 100644
--- a/modules/typesense/build.gradle
+++ b/modules/typesense/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Typesense"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.typesense:typesense-java:2.0.0'
+    testImplementation 'org.typesense:typesense-java:2.1.0'
 }

From 80bc3a8f91154b29a10c279dab855a72737755ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2026 05:33:30 +0000
Subject: [PATCH 4846/4969] Bump io.grpc:grpc-bom from 1.75.0 to 1.80.0 in
 /modules/qdrant

Bumps [io.grpc:grpc-bom](https://github.com/grpc/grpc-java) from 1.75.0 to 1.80.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.75.0...v1.80.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-bom
  dependency-version: 1.80.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/qdrant/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qdrant/build.gradle b/modules/qdrant/build.gradle
index 5d695095300..98b8fc403fc 100644
--- a/modules/qdrant/build.gradle
+++ b/modules/qdrant/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'io.qdrant:client:1.17.0'
-    testImplementation platform('io.grpc:grpc-bom:1.75.0')
+    testImplementation platform('io.grpc:grpc-bom:1.80.0')
     testImplementation 'io.grpc:grpc-stub'
     testImplementation 'io.grpc:grpc-protobuf'
     testImplementation 'io.grpc:grpc-netty-shaded'

From fa7e79b232bdec182c46134ddf791ee7969f9f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Thu, 9 Apr 2026 09:27:36 -0600
Subject: [PATCH 4847/4969] Ignore major update for junit-bom

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 48739f1910c..57d781044cc 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -456,6 +456,8 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.junit.platform:junit-platform-launcher"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.gradleup.shadow"
         update-types: [ "version-update:semver-major" ]
 

From 851aaef29aabeda1f480a4fe987380a6bfe9129e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2026 15:43:50 +0000
Subject: [PATCH 4848/4969] Bump com.databend:databend-jdbc from 0.4.5 to 0.4.6
 in /modules/databend

Bumps [com.databend:databend-jdbc](https://github.com/databendcloud/databend-jdbc) from 0.4.5 to 0.4.6.
- [Release notes](https://github.com/databendcloud/databend-jdbc/releases)
- [Commits](https://github.com/databendcloud/databend-jdbc/commits/v0.4.6)

---
updated-dependencies:
- dependency-name: com.databend:databend-jdbc
  dependency-version: 0.4.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/databend/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
index 1b9eaf4f0c8..7a779d3ca20 100644
--- a/modules/databend/build.gradle
+++ b/modules/databend/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.databend:databend-jdbc:0.4.5'
+    testRuntimeOnly 'com.databend:databend-jdbc:0.4.6'
 }

From 085ab379ae1b8d4b98f5f3ad97b69745faff7252 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2026 22:52:49 +0000
Subject: [PATCH 4849/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.8 to 42.7.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.8...REL42.7.10)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b9c2fc7bcee..e362b51c756 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -14,6 +14,6 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
     testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
 }

From c4709ac64d549e60d3163d7e62ce93c4bd3f7d1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2026 22:52:54 +0000
Subject: [PATCH 4850/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.8 to 42.7.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.8...REL42.7.10)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 cf1c69a9a19..73e424f9ffc 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 767aa923d175c7748d0b56b1b176239b22acff26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2026 22:53:02 +0000
Subject: [PATCH 4851/4969] Bump org.jetbrains:annotations in
 /modules/postgresql

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 cf1c69a9a19..d2c1948bf86 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -12,5 +12,5 @@ dependencies {
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 5e22ac7430453c432b160ec0298179f06e2e9e53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2026 22:53:23 +0000
Subject: [PATCH 4852/4969] Bump org.postgresql:postgresql from 42.7.8 to
 42.7.10 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.8 to 42.7.10.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.8...REL42.7.10)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7522d7f697f..b45362a8e63 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
     testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
     testRuntimeOnly platform('org.junit:junit-bom:5.14.1')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

From f943e8cbeb1200cd38856d6b1a525c0b63a4d79c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 07:01:17 +0000
Subject: [PATCH 4853/4969] Bump org.junit:junit-bom from 5.14.1 to 5.14.3 in
 /modules/spock

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.14.1 to 5.14.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.14.1...r5.14.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 b45362a8e63..7ed9214dd11 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
     testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
-    testRuntimeOnly platform('org.junit:junit-bom:5.14.1')
+    testRuntimeOnly platform('org.junit:junit-bom:5.14.3')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 

From 32fe73aa702e6328f166f4991a2d3c461136f635 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 07:01:23 +0000
Subject: [PATCH 4854/4969] Bump org.junit:junit-bom from 5.14.1 to 5.14.3 in
 /modules/junit-jupiter

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.14.1 to 5.14.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.14.1...r5.14.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 e362b51c756..d6689bee21d 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.14.1')
+    implementation platform('org.junit:junit-bom:5.14.3')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':testcontainers-mysql')

From 5f9b0034afa70c42a110f6ca1c18560389c3dfd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 07:01:32 +0000
Subject: [PATCH 4855/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/r2dbc

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.14.1 to 5.14.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.14.1...r5.14.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 3a2a55c7f0d..8854a19ee46 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -13,5 +13,5 @@ dependencies {
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.8.1'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.7'
-    testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
+    testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.3'
 }

From c31d51f1ff113be4089dfec6deaf2aae4792d20f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 07:01:41 +0000
Subject: [PATCH 4856/4969] Bump org.junit.jupiter:junit-jupiter in
 /modules/jdbc-test

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.14.1 to 5.14.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.14.1...r5.14.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d3f04a3a3f6..15d1d11226a 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'com.mysql:mysql-connector-j:9.6.0'
-    api 'org.junit.jupiter:junit-jupiter:5.14.1'
+    api 'org.junit.jupiter:junit-jupiter:5.14.3'
 }

From c8debe622a4e631ec3d9f62b0694fe75859b1b98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 08:44:33 +0000
Subject: [PATCH 4857/4969] Bump org.apache.tomcat:tomcat-jdbc in
 /modules/jdbc-test

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.14 to 11.0.21.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 15d1d11226a..cbf94737eed 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.27.7'
 
-    api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
+    api 'org.apache.tomcat:tomcat-jdbc:11.0.21'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'com.mysql:mysql-connector-j:9.6.0'
     api 'org.junit.jupiter:junit-jupiter:5.14.3'

From 8205eb3c123a66e4d32004e7b0df9e91b154b0cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 08:44:44 +0000
Subject: [PATCH 4858/4969] Bump redis.clients:jedis from 7.1.0 to 7.4.1 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 7.1.0 to 7.4.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v7.1.0...v7.4.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 7.4.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 d6689bee21d..7f4d55e9bd3 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
-    testImplementation 'redis.clients:jedis:7.1.0'
+    testImplementation 'redis.clients:jedis:7.4.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From 58947d3ac71bbe14d6fe63f8e2a0df5b70e1cfae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 08:44:44 +0000
Subject: [PATCH 4859/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.8.1 to 3.8.4.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.8.1...v3.8.4)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-version: 3.8.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index 8854a19ee46..afad9a553ef 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.8.1'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.8.4'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.7'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.3'
 }

From 1917ff470e49f5482ae0c5662c64d4974f3a25ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sun, 12 Apr 2026 03:46:30 -0500
Subject: [PATCH 4860/4969] Update gradle/actions/setup-gradle version to v6

---
 .github/actions/setup-gradle/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-gradle/action.yml b/.github/actions/setup-gradle/action.yml
index c97d776e04f..76d1b0ff4b2 100644
--- a/.github/actions/setup-gradle/action.yml
+++ b/.github/actions/setup-gradle/action.yml
@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup Gradle Build Action
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@v6
       with:
         gradle-home-cache-includes: |
           caches

From c713d0257bffb3f7b026f54c840ebcd1c5f4f32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sun, 12 Apr 2026 03:46:48 -0500
Subject: [PATCH 4861/4969] Update actions/setup-java version to v5

---
 .github/actions/setup-java/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
index ee8c3323fc1..093fbc2e7fd 100644
--- a/.github/actions/setup-java/action.yml
+++ b/.github/actions/setup-java/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         java-version: ${{ inputs.java-version }}
         distribution: temurin

From 6b4018f65e890285f12ed039551ff7535bb1a3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sun, 12 Apr 2026 04:10:15 -0500
Subject: [PATCH 4862/4969] Update mikepenz/action-junit-report version to v6

---
 .github/actions/setup-junit-report/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-junit-report/action.yml b/.github/actions/setup-junit-report/action.yml
index 538af9af21f..df0af39297f 100644
--- a/.github/actions/setup-junit-report/action.yml
+++ b/.github/actions/setup-junit-report/action.yml
@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Publish Test Report
-      uses: mikepenz/action-junit-report@v4
+      uses: mikepenz/action-junit-report@v6
       if: always() # always run even if the previous step fails
       with:
         report_paths: '**/build/test-results/test/TEST-*.xml'

From c6abf4a23eebc08bb6d64937d6023cdce307ff97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Sun, 12 Apr 2026 04:07:19 -0600
Subject: [PATCH 4863/4969] Polish CI workflows (#11686)

---
 .github/workflows/ci-rootless.yml |  3 +--
 .github/workflows/ci.yml          | 12 +++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index 46e2b4a9a23..d21030fb82e 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -51,8 +51,7 @@ jobs:
         uses: docker/setup-docker-action@v4
         with:
           rootless: true
-      - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v6
+      - uses: ./.github/actions/setup-build
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
       - uses: ./.github/actions/setup-junit-report
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b1ff89858e1..48dedc8463b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,9 +89,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v5
-      - uses: ./.github/actions/setup-java
-      - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v6
+      - uses: ./.github/actions/setup-build
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -124,9 +122,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v5
-      - uses: ./.github/actions/setup-java
-      - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v6
+      - uses: ./.github/actions/setup-build
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -161,9 +157,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v5
-      - uses: ./.github/actions/setup-java
-      - name: Setup Gradle Build Action
-        uses: gradle/actions/setup-gradle@v6
+      - uses: ./.github/actions/setup-build
       - id: set-matrix
         env:
           # Since we override the tests executor,

From b0a027dcff4215092c80ad96bd70c0f9ae8a7a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sun, 12 Apr 2026 05:54:36 -0500
Subject: [PATCH 4864/4969] Update directories for github actions via
 dependabot

---
 .github/dependabot.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 57d781044cc..789ec351da2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -481,7 +481,9 @@ updates:
 
 # GitHub Actions
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - /.github/workflows
+      - /.github/actions/**
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10

From 79828c666169da6136a2dcee7204f165427c3b0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 10:56:02 +0000
Subject: [PATCH 4865/4969] Bump software.amazon.awssdk:bom in
 /modules/localstack

Bumps software.amazon.awssdk:bom from 2.40.4 to 2.42.33.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-version: 2.42.33
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 130f7cdfef7..3af7b5cee55 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("software.amazon.awssdk:bom:2.40.4")
+    testImplementation platform("software.amazon.awssdk:bom:2.42.33")
     testImplementation 'software.amazon.awssdk:s3'
     testImplementation 'software.amazon.awssdk:sqs'
     testImplementation 'software.amazon.awssdk:cloudwatchlogs'

From 1147680ec7469cd6bb59dee5ca0fbb65fe3aed95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:00:17 +0000
Subject: [PATCH 4866/4969] Bump actions/checkout from 5 to 6 in
 /.github/workflows

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-docker-wormhole.yml         |  2 +-
 .github/workflows/ci-rootless.yml                |  2 +-
 .github/workflows/ci-windows.yml                 |  4 ++--
 .github/workflows/ci.yml                         | 16 ++++++++--------
 .github/workflows/moby-latest.yml                |  2 +-
 .github/workflows/release.yml                    |  2 +-
 .github/workflows/update-docs-version.yml        |  2 +-
 .github/workflows/update-gradle-wrapper.yml      |  2 +-
 .../workflows/update-testcontainers-version.yml  |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 9359316a924..45957af1e28 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -44,7 +44,7 @@ jobs:
   in-docker_test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Build with Gradle
         run: |
           docker run -i --rm \
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index d21030fb82e..3122bd88069 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -46,7 +46,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup rootless Docker
         uses: docker/setup-docker-action@v4
         with:
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index f039f6597b7..6a3c2372a5d 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -52,7 +52,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - name: Build with Gradle
         run: ./gradlew.bat cleanTest testcontainers:test --no-daemon --continue --scan --no-build-cache
@@ -78,7 +78,7 @@ jobs:
               target_url: `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
               context: 'CI - Windows',
             })
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48dedc8463b..bc128acb50c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
       matrix:
         java: [ '17', '21' ]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
         with:
           java-version: ${{ matrix.java }}
@@ -69,7 +69,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - name: Setup Testcontainers Cloud Client
         uses: atomicjar/testcontainers-cloud-setup-action@main
@@ -88,7 +88,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - id: set-matrix
         env:
@@ -108,7 +108,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
@@ -121,7 +121,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - id: set-matrix
         working-directory: ./examples/
@@ -142,7 +142,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
         working-directory: ./examples/
@@ -156,7 +156,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - id: set-matrix
         env:
@@ -176,7 +176,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index aa6a8afa809..75e1ea92550 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-22.04
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-build
 
       - name: Install Stable Docker
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0630e826628..78d644971f8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
   release:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-java
       - name: Clear existing docker image cache
         run: docker image prune -af
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 6e9981b19ac..631026eca84 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: main
       - name: Update latest_version property in mkdocs.yml
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 062cf4017c9..9f710f30ec5 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # v1.0.13
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 9cf679e8952..a51fe6ff2a6 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: main
       - name: Update testcontainers.version property in gradle.properties

From 1c40be20bc6074ce796295611002cca140337c45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:00:20 +0000
Subject: [PATCH 4867/4969] Bump docker/setup-docker-action from 4 to 5 in
 /.github/workflows

Bumps [docker/setup-docker-action](https://github.com/docker/setup-docker-action) from 4 to 5.
- [Release notes](https://github.com/docker/setup-docker-action/releases)
- [Commits](https://github.com/docker/setup-docker-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/setup-docker-action
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-rootless.yml | 2 +-
 .github/workflows/moby-latest.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
index d21030fb82e..73345ca7308 100644
--- a/.github/workflows/ci-rootless.yml
+++ b/.github/workflows/ci-rootless.yml
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup rootless Docker
-        uses: docker/setup-docker-action@v4
+        uses: docker/setup-docker-action@v5
         with:
           rootless: true
       - uses: ./.github/actions/setup-build
diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index aa6a8afa809..40bcd367088 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Install Stable Docker
         id: setup_docker
-        uses: docker/setup-docker-action@v4
+        uses: docker/setup-docker-action@v5
         with:
           version: ${{ matrix.version }}
           channel: ${{ matrix.channel }}

From dbf7211c277b0b887c9b338e283aea4f740241c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:00:24 +0000
Subject: [PATCH 4868/4969] Bump actions/github-script from 8 to 9 in
 /.github/workflows

Bumps [actions/github-script](https://github.com/actions/github-script) from 8 to 9.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v8...v9)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '9'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index f039f6597b7..c2f59d1cf80 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -66,7 +66,7 @@ jobs:
       statuses: write
     steps:
       - name: Create pending status
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -89,7 +89,7 @@ jobs:
       - uses: ./.github/actions/setup-junit-report
 
       - name: Create success status
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         if: success()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -104,7 +104,7 @@ jobs:
             })
 
       - name: Create failure status
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         if: failure()
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

From 99b52bdfbafaa710412f606582e8a8571418e310 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:00:29 +0000
Subject: [PATCH 4869/4969] Bump peter-evans/create-pull-request in
 /.github/workflows

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.8 to 8.1.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/271a8d0340265f705b14b6d32b9829c1cb33d45e...5f6978faf089d4d20b00c7766989d076bb2fc7f1)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-version: 8.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-docs-version.yml           | 2 +-
 .github/workflows/update-testcontainers-version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
index 6e9981b19ac..6a18801e7ad 100644
--- a/.github/workflows/update-docs-version.yml
+++ b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF_NAME}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v3.10.1
         with:
           title: Update docs version to ${{ github.ref_name }}
           body: |
diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
index 9cf679e8952..b980aa4ebf7 100644
--- a/.github/workflows/update-testcontainers-version.yml
+++ b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF_NAME}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v3.10.1
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v3.10.1
         with:
           title: Update testcontainers version to ${{ github.ref_name }}
           body: |

From af7f5043dbaf4f95e47804352f65bca7f6dd757d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:00:35 +0000
Subject: [PATCH 4870/4969] Bump slackapi/slack-github-action in
 /.github/workflows

Bumps [slackapi/slack-github-action](https://github.com/slackapi/slack-github-action) from 2.1.1 to 3.0.1.
- [Release notes](https://github.com/slackapi/slack-github-action/releases)
- [Commits](https://github.com/slackapi/slack-github-action/compare/v2.1.1...v3.0.1)

---
updated-dependencies:
- dependency-name: slackapi/slack-github-action
  dependency-version: 3.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/moby-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index aa6a8afa809..b4f2bfae215 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Notify to Slack on failures
         if: failure()
         id: slack
-        uses: slackapi/slack-github-action@v2.1.1
+        uses: slackapi/slack-github-action@v3.0.1
         with:
           payload: |
             {

From 01f0f1de7b1bdcb59f5e28e5dc6dcea3c8da4e35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 11:00:38 +0000
Subject: [PATCH 4871/4969] Bump peter-evans/slash-command-dispatch in
 /.github/workflows

Bumps [peter-evans/slash-command-dispatch](https://github.com/peter-evans/slash-command-dispatch) from 4.0.0 to 5.0.2.
- [Release notes](https://github.com/peter-evans/slash-command-dispatch/releases)
- [Commits](https://github.com/peter-evans/slash-command-dispatch/compare/13bc09769d122a64f75aa5037256f6f2d78be8c4...9bdcd7914ec1b75590b790b844aa3b8eee7c683a)

---
updated-dependencies:
- dependency-name: peter-evans/slash-command-dispatch
  dependency-version: 5.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-windows-trigger.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-windows-trigger.yml b/.github/workflows/ci-windows-trigger.yml
index 540ab221dbf..ce5d40a173b 100644
--- a/.github/workflows/ci-windows-trigger.yml
+++ b/.github/workflows/ci-windows-trigger.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Trigger windows-test command
-        uses: peter-evans/slash-command-dispatch@13bc09769d122a64f75aa5037256f6f2d78be8c4 # v4.0.0
+        uses: peter-evans/slash-command-dispatch@9bdcd7914ec1b75590b790b844aa3b8eee7c683a # v5.0.2
         with:
           token: ${{ secrets.WINDOWS_WORKERS_TOKEN }}
           # The command to trigger the pipeline: e.g. /windows-test

From 6cbf148cc224f6b77607e72967c55ba4465b750f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 18:11:37 +0000
Subject: [PATCH 4872/4969] Bump org.jetbrains:annotations in /modules/cratedb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 3a93f97cae8..7b6a3468e03 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
 
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 92433175ee4ebc3710ac200cffc65e5d6d884330 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 18:11:39 +0000
Subject: [PATCH 4873/4969] Bump org.jetbrains:annotations from 26.0.2-1 to
 26.1.0 in /modules/tidb

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/tidb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
index 7cf52e57ca9..a59b1f6a84e 100644
--- a/modules/tidb/build.gradle
+++ b/modules/tidb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From f54a0c69619bb03697bd475ca7fe70bd95e5a2fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 18:11:52 +0000
Subject: [PATCH 4874/4969] Bump org.jetbrains:annotations from 26.0.2-1 to
 26.1.0 in /modules/trino

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index 82f831db36a..e6a9b32e85b 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'io.trino:trino-jdbc:480'
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 468cb413f8a25790d4170d22c922fb2f959b1c7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 18:12:08 +0000
Subject: [PATCH 4875/4969] Bump org.jetbrains:annotations from 26.0.2-1 to
 26.1.0 in /modules/spock

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7ed9214dd11..acea4c64eeb 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit'
 
-    testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
+    testCompileOnly 'org.jetbrains:annotations:26.1.0'
 }
 
 tasks.withType(GroovyCompile) {

From 221f7a7131d5caa14bd68e3ea2da37ac6e369c1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 18:59:27 +0000
Subject: [PATCH 4876/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.10 to 1.3.13.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/1.3.10...v1.3.13)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-version: 1.3.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 8c1b2c02034..f20d5875319 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation(project(":testcontainers-junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.47.1")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.10")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.13")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.22")
 }

From 16726cb795e89d0deae04d075ef1bb9fa5befc0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Apr 2026 22:31:10 +0000
Subject: [PATCH 4877/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 4.1.1 to 4.2.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-version: 4.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index e560d73a848..dc544fd394b 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.34'
 
-    testImplementation 'org.apache.kafka:kafka-clients:4.1.1'
+    testImplementation 'org.apache.kafka:kafka-clients:4.2.0'
     testImplementation 'io.rest-assured:rest-assured:5.5.7'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 3de666511344ea4b4e81cadacbccd8ca3c241f42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 13:45:32 +0000
Subject: [PATCH 4878/4969] Bump org.neo4j.driver:neo4j-java-driver in
 /modules/neo4j

Bumps [org.neo4j.driver:neo4j-java-driver](https://github.com/neo4j/neo4j-java-driver) from 4.4.21 to 4.4.22.
- [Release notes](https://github.com/neo4j/neo4j-java-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-java-driver/compare/4.4.21...4.4.22)

---
updated-dependencies:
- dependency-name: org.neo4j.driver:neo4j-java-driver
  dependency-version: 4.4.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/neo4j/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
index b8bc956b825..96f73b3bb81 100644
--- a/modules/neo4j/build.gradle
+++ b/modules/neo4j/build.gradle
@@ -33,5 +33,5 @@ dependencies {
 
     api project(":testcontainers")
 
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.21'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.22'
 }

From f39e19d034133fe06029bdf56a7ae05a51a326cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 13:45:33 +0000
Subject: [PATCH 4879/4969] Bump io.fabric8:kubernetes-client from 7.4.0 to
 7.6.1 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 7.4.0 to 7.6.1.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v7.4.0...v7.6.1)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-version: 7.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 010494fe94c..645dfd8e68d 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     // Synchronize with the jackson version, must match major and minor version
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'
 
-    testImplementation 'io.fabric8:kubernetes-client:7.4.0'
+    testImplementation 'io.fabric8:kubernetes-client:7.6.1'
     testImplementation 'io.kubernetes:client-java:25.0.0-legacy'
 }

From d71f4021b758fc908104e2593d2d2b4d311b7d24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 14:47:47 +0000
Subject: [PATCH 4880/4969] Bump dev.openfga:openfga-sdk from 0.9.4 to 0.9.7 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.9.4 to 0.9.7.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.9.4...v0.9.7)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-version: 0.9.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index c483eb8e5e6..983c42f2efd 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'dev.openfga:openfga-sdk:0.9.4'
+    testImplementation 'dev.openfga:openfga-sdk:0.9.7'
 }
 
 test {

From 06bfdcbe72721e38ce98b1fe200a8adb424e3471 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 14:49:19 +0000
Subject: [PATCH 4881/4969] Bump io.rest-assured:rest-assured from 5.5.6 to
 5.5.7 in /core

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.5.6 to 5.5.7.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.5.6...rest-assured-5.5.7)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-version: 5.5.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index fd6bb2df579..1bc76a8b047 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -116,7 +116,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.assertj:assertj-core:3.27.7'
-    testImplementation 'io.rest-assured:rest-assured:5.5.6'
+    testImplementation 'io.rest-assured:rest-assured:5.5.7'
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"

From 7007c49a31dfa75b6867b0a8d91b2f28f96879e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 20:38:36 +0000
Subject: [PATCH 4882/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.2.2 to 9.3.3.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v9.2.2...v9.3.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.3.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 860a7d11526..114a07ffe85 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.2.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.3.3"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
 }

From bf24ca9ecff7b555b6b46bfed0b1ba9a7b1b2039 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 21:10:52 +0000
Subject: [PATCH 4883/4969] Bump net.lingala.zip4j:zip4j from 2.11.5 to 2.11.6
 in /modules/hivemq

Bumps [net.lingala.zip4j:zip4j](https://github.com/srikanth-lingala/zip4j) from 2.11.5 to 2.11.6.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases)
- [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.11.5...v2.11.6)

---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
  dependency-version: 2.11.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 8c1b2c02034..541b5bf65d5 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
-    shaded("net.lingala.zip4j:zip4j:2.11.5")
+    shaded("net.lingala.zip4j:zip4j:2.11.6")
 
     testImplementation(project(":testcontainers-junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.47.1")

From b846540df51c513377ccf1157bc9dd64cff5cbb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 21:55:13 +0000
Subject: [PATCH 4884/4969] Bump com.hivemq:hivemq-extension-sdk in
 /modules/hivemq

Bumps [com.hivemq:hivemq-extension-sdk](https://github.com/hivemq/hivemq-extension-sdk) from 4.47.1 to 4.50.0.
- [Release notes](https://github.com/hivemq/hivemq-extension-sdk/releases)
- [Commits](https://github.com/hivemq/hivemq-extension-sdk/compare/4.47.1...4.50.0)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-extension-sdk
  dependency-version: 4.50.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 27014550dc4..57ee107f7b6 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     shaded("net.lingala.zip4j:zip4j:2.11.6")
 
     testImplementation(project(":testcontainers-junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.47.1")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.50.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.13")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.22")

From 006659dafbca9edeb267fc7411ac1af1e947bfea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 22:21:24 +0000
Subject: [PATCH 4885/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.22 to 1.5.32.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.22...v_1.5.32)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.32
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 27014550dc4..170cd2e7afc 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.47.1")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.13")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.5.22")
+    testImplementation("ch.qos.logback:logback-classic:1.5.32")
 }
 
 test {

From f658d6dc21cab7e26bd4e9904dbe1d7c6aebb391 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 22:21:27 +0000
Subject: [PATCH 4886/4969] Bump com.scylladb:java-driver-core in
 /modules/scylladb

Bumps [com.scylladb:java-driver-core](https://github.com/scylladb/java-driver) from 4.19.0.4 to 4.19.0.8.
- [Release notes](https://github.com/scylladb/java-driver/releases)
- [Commits](https://github.com/scylladb/java-driver/compare/4.19.0.4...4.19.0.8)

---
updated-dependencies:
- dependency-name: com.scylladb:java-driver-core
  dependency-version: 4.19.0.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index f6d794e7525..a7931d7c7c9 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ScyllaDB"
 dependencies {
     api project(":testcontainers")
 
-    testImplementation 'com.scylladb:java-driver-core:4.19.0.4'
+    testImplementation 'com.scylladb:java-driver-core:4.19.0.8'
     testImplementation 'software.amazon.awssdk:dynamodb:2.40.4'
 }

From 6a893fa701f18c47bb743a75fa1fa434e3e2ff96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 23:19:18 +0000
Subject: [PATCH 4887/4969] Bump org.apache.activemq:activemq-client in
 /modules/activemq

Bumps [org.apache.activemq:activemq-client](https://github.com/apache/activemq) from 6.2.0 to 6.2.4.
- [Release notes](https://github.com/apache/activemq/releases)
- [Commits](https://github.com/apache/activemq/compare/activemq-6.2.0...activemq-6.2.4)

---
updated-dependencies:
- dependency-name: org.apache.activemq:activemq-client
  dependency-version: 6.2.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 41b81baa2c8..158e8503759 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation "org.apache.activemq:activemq-client:6.2.0"
+    testImplementation "org.apache.activemq:activemq-client:6.2.4"
     testImplementation "org.apache.activemq:artemis-jakarta-client:2.44.0"
 }

From 0713c4b0a9abbb7d1ad25e597b7fcb7dea4a453a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 23:20:28 +0000
Subject: [PATCH 4888/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.16.1 to 1.16.4.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.16.1...v1.16.4)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-version: 1.16.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index da11a209555..319c18bbd40 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'io.rest-assured:rest-assured:5.5.7'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.16.1'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.16.5'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.57.0')

From a0db454741ff59b0df5aaf27dbc242c3312575d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 23:20:33 +0000
Subject: [PATCH 4889/4969] Bump io.opentelemetry:opentelemetry-bom in
 /modules/grafana

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.57.0 to 1.61.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.57.0...v1.61.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-version: 1.61.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index da11a209555..28a2b910144 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.16.1'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
-    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.57.0')
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.61.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

From 97a2d1730b6f0fda54f9cd4c033df914284692cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 23:21:07 +0000
Subject: [PATCH 4890/4969] Bump com.couchbase.client:java-client in
 /modules/couchbase

Bumps [com.couchbase.client:java-client](https://github.com/couchbase/couchbase-jvm-clients) from 3.10.0 to 3.11.1.
- [Commits](https://github.com/couchbase/couchbase-jvm-clients/compare/3.10.0...3.11.1)

---
updated-dependencies:
- dependency-name: com.couchbase.client:java-client
  dependency-version: 3.11.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index a37998f75f0..707a559290a 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
-    testImplementation 'com.couchbase.client:java-client:3.10.0'
+    testImplementation 'com.couchbase.client:java-client:3.11.2'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 3ae9cc0a99e6c3fafe9a6f12fc9fa19957a7f175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 13 Apr 2026 18:32:50 -0500
Subject: [PATCH 4891/4969] Update maven central badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 22c800f03be..2cd203a0335 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Testcontainers
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.testcontainers/testcontainers/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.testcontainers/testcontainers)
+![Maven Central Version](https://img.shields.io/maven-central/v/org.testcontainers/testcontainers)
 
 [![Netlify Status](https://api.netlify.com/api/v1/badges/189f28a2-7faa-42ff-b03c-738142079cc9/deploy-status)](https://app.netlify.com/sites/testcontainers/deploys)
 

From e23f7708295bf979e1117530688c41d1ed262939 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:03:06 +0000
Subject: [PATCH 4892/4969] Bump org.apache.tinkerpop:gremlin-driver in
 /modules/orientdb

Bumps [org.apache.tinkerpop:gremlin-driver](https://github.com/apache/tinkerpop) from 3.8.0 to 3.8.1.
- [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc)
- [Commits](https://github.com/apache/tinkerpop/compare/3.8.0...3.8.1)

---
updated-dependencies:
- dependency-name: org.apache.tinkerpop:gremlin-driver
  dependency-version: 3.8.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 4abe225d3bf..f9ee813dc64 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.46"
 
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.8.0'
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.8.1'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.46"
 }

From 88d99946243cf8f555a09855a3d09d5978f88ebf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:03:13 +0000
Subject: [PATCH 4893/4969] Bump com.ibm.db2:jcc from 12.1.3.0 to 12.1.4.0 in
 /modules/db2

Bumps com.ibm.db2:jcc from 12.1.3.0 to 12.1.4.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-version: 12.1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index a0c3bc79e85..5546fdb6c65 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.ibm.db2:jcc:12.1.3.0'
+    testRuntimeOnly 'com.ibm.db2:jcc:12.1.4.0'
 }

From 726dbccf5b7c340d05a5c33029ddfeb20f1a1dc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:03:19 +0000
Subject: [PATCH 4894/4969] Bump com.rabbitmq:amqp-client from 5.28.0 to 5.29.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.28.0 to 5.29.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.28.0...v5.29.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-version: 5.29.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 350adce5a76..441ff2ddb22 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
 
-    testImplementation 'com.rabbitmq:amqp-client:5.28.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.29.0'
     compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 5752bb11c83f447a4b407cd1d340917459f2d245 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:03:25 +0000
Subject: [PATCH 4895/4969] Bump com.influxdb:influxdb-client-java in
 /modules/influxdb

Bumps [com.influxdb:influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 7.4.0 to 7.5.0.
- [Release notes](https://github.com/influxdata/influxdb-client-java/releases)
- [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/influxdata/influxdb-client-java/compare/v7.4.0...v7.5.0)

---
updated-dependencies:
- dependency-name: com.influxdb:influxdb-client-java
  dependency-version: 7.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/influxdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index bc743e6bbce..145aa4aac52 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly 'org.influxdb:influxdb-java:2.25'
 
     testImplementation 'org.influxdb:influxdb-java:2.25'
-    testImplementation "com.influxdb:influxdb-client-java:7.4.0"
+    testImplementation "com.influxdb:influxdb-client-java:7.5.0"
 }

From 6a446af80b0330cc9bde747bb55926bf15d32ba2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:03:28 +0000
Subject: [PATCH 4896/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps [com.solacesystems:sol-jcsmp](https://github.com/SolaceDev/solsuite) from 10.29.0 to 10.29.1.
- [Commits](https://github.com/SolaceDev/solsuite/commits)

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-version: 10.29.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index ab0e9555aae..9172fbe878f 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    testImplementation 'com.solacesystems:sol-jcsmp:10.29.0'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.29.1'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 50757ee3f343d47868eb1062788b4e56059d2466 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:03:37 +0000
Subject: [PATCH 4897/4969] Bump io.r2dbc:r2dbc-mssql in /modules/mssqlserver

Bumps [io.r2dbc:r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 1.0.3.RELEASE to 1.0.4.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/v1.0.4.RELEASE/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v1.0.3.RELEASE...v1.0.4.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-version: 1.0.4.RELEASE
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index 6e2628da7a2..a03534cf147 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -4,13 +4,13 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.4.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.4.0.jre11'
 
     testImplementation project(':testcontainers-r2dbc')
-    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.3.RELEASE'
+    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.4.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':testcontainers-r2dbc'))

From d7b889f2aec1487c5cc36026404c32c1f2c55168 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:48:02 +0000
Subject: [PATCH 4898/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.72.0 to 26.79.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.72.0...v26.79.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.79.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 54271098ebc..08fb09887dd 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.72.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.79.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From a3ee4a7434a4314fd62db975ef22c4140dcfd47b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 05:31:11 +0000
Subject: [PATCH 4899/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.46 to 3.2.51.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/3.2.51/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.46...3.2.51)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-version: 3.2.51
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index f9ee813dc64..39b15e5a420 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.46"
+    api "com.orientechnologies:orientdb-client:3.2.51"
 
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.8.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.46"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.51"
 }

From 78ca388bb21040681a2d5c44ec245ba67ac6ed91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 06:40:15 +0000
Subject: [PATCH 4900/4969] Bump org.yaml:snakeyaml from 2.5 to 2.6 in /core

Bumps [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 2.5 to 2.6.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.6..snakeyaml-2.5)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-version: '2.6'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1bc76a8b047..550243a6f1a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -92,7 +92,7 @@ dependencies {
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
     shaded 'com.google.guava:guava:33.3.1-jre'
-    shaded "org.yaml:snakeyaml:2.5"
+    shaded "org.yaml:snakeyaml:2.6"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 

From c6f0e933233ebb2021df94d7d83249a701d86c74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 06:40:18 +0000
Subject: [PATCH 4901/4969] Bump redis.clients:jedis from 6.2.0 to 7.4.1 in
 /core

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 6.2.0 to 7.4.1.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v6.2.0...v7.4.1)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 7.4.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1bc76a8b047..e7f34b570a7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -105,7 +105,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    testImplementation 'redis.clients:jedis:6.2.0'
+    testImplementation 'redis.clients:jedis:7.4.1'
     testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 

From 747db2b9895470ae4047c3f8a5fb27951aaccc25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 06:40:18 +0000
Subject: [PATCH 4902/4969] Bump org.junit.platform:junit-platform-launcher in
 /core

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.11.0 to 1.14.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 1.14.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1bc76a8b047..4a36b3e9f7b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -98,7 +98,7 @@ dependencies {
 
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation('com.google.cloud.tools:jib-core:0.27.3')  {
@@ -120,7 +120,7 @@ dependencies {
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
-    jarFileTestRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+    jarFileTestRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
     jarFileTestImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     jarFileTestImplementation 'org.assertj:assertj-core:3.27.7'
     jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'

From 15a762ce8890487d940ad5769f676f3287d8d527 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 06:40:22 +0000
Subject: [PATCH 4903/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.44.0 to 2.53.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-version: 2.53.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index 158e8503759..d88c0053379 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation "org.apache.activemq:activemq-client:6.2.4"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.44.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.53.0"
 }

From 81a30189f5d5467a09e27511b93f67aacee6844d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 06:40:31 +0000
Subject: [PATCH 4904/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.40.4 to 2.42.33.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.42.33
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index a7931d7c7c9..c3fe0927d6a 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.8'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.40.4'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.42.34'
 }

From 25d284d4198927c0a2cf9712d5d1981b27cc5570 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 19:47:30 +0000
Subject: [PATCH 4905/4969] Bump com.google.cloud.tools:jib-core from 0.27.3 to
 0.28.1 in /core

Bumps [com.google.cloud.tools:jib-core](https://github.com/GoogleContainerTools/jib) from 0.27.3 to 0.28.1.
- [Release notes](https://github.com/GoogleContainerTools/jib/releases)
- [Commits](https://github.com/GoogleContainerTools/jib/commits)

---
updated-dependencies:
- dependency-name: com.google.cloud.tools:jib-core
  dependency-version: 0.28.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1bc76a8b047..000560172b6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -70,7 +70,7 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    provided('com.google.cloud.tools:jib-core:0.27.3') {
+    provided('com.google.cloud.tools:jib-core:0.28.1') {
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
@@ -101,7 +101,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation('com.google.cloud.tools:jib-core:0.27.3')  {
+    testImplementation('com.google.cloud.tools:jib-core:0.28.1')  {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From 72384f273a02945dbe202ce0ad969cee7013a70c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 19:47:59 +0000
Subject: [PATCH 4906/4969] Bump org.jetbrains:annotations from 26.0.2-1 to
 26.1.0 in /core

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.2-1 to 26.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1bc76a8b047..b394225e6e2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -63,8 +63,8 @@ configurations.all {
 
 dependencies {
     api 'org.slf4j:slf4j-api:1.7.36'
-    compileOnly 'org.jetbrains:annotations:26.0.2-1'
-    testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
+    testCompileOnly 'org.jetbrains:annotations:26.1.0'
     api 'org.apache.commons:commons-compress:1.28.0'
     api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')

From a412b8ea77bae4ef51ca3e6bed7cffd0566b362e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 15 Apr 2026 23:32:54 -0600
Subject: [PATCH 4907/4969] Use weaviate client v6 (#11711)

---
 modules/weaviate/build.gradle                 | 15 +++-
 .../weaviate/WeaviateContainerTest.java       | 68 +++++++++++--------
 2 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index fd61cd7e3f4..5392b585b71 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,5 +3,18 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.weaviate:client:5.5.0'
+    testImplementation 'io.weaviate:client6:6.1.0'
+}
+
+test {
+	javaLauncher = javaToolchains.launcherFor {
+		languageVersion = JavaLanguageVersion.of(17)
+	}
+}
+
+compileTestJava {
+	javaCompiler = javaToolchains.compilerFor {
+		languageVersion = JavaLanguageVersion.of(17)
+	}
+	options.release.set(17)
 }
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index 9a1ad47d5af..d103970053c 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -1,9 +1,7 @@
 package org.testcontainers.weaviate;
 
-import io.weaviate.client.Config;
-import io.weaviate.client.WeaviateClient;
-import io.weaviate.client.base.Result;
-import io.weaviate.client.v1.misc.model.Meta;
+import io.weaviate.client6.v1.api.InstanceMetadata;
+import io.weaviate.client6.v1.api.WeaviateClient;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 
@@ -17,22 +15,30 @@
 class WeaviateContainerTest {
 
     @Test
-    void testWeaviate() {
+    void testWeaviate() throws Exception {
         try ( // container {
-            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.29.0")
+            WeaviateContainer weaviate = new WeaviateContainer("cr.weaviate.io/semitechnologies/weaviate:1.32.0")
             // }
         ) {
             weaviate.start();
-            Config config = new Config("http", weaviate.getHttpHostAddress());
-            config.setGRPCHost(weaviate.getGrpcHostAddress());
-            WeaviateClient client = new WeaviateClient(config);
-            Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.29.0");
+            try (
+                WeaviateClient client = WeaviateClient.connectToCustom(conn -> {
+                    return conn
+                        .scheme("http")
+                        .httpHost(weaviate.getHost())
+                        .httpPort(weaviate.getMappedPort(8080))
+                        .grpcHost(weaviate.getHost())
+                        .grpcPort(weaviate.getMappedPort(50051));
+                })
+            ) {
+                InstanceMetadata meta = client.meta();
+                assertThat(meta.version()).isEqualTo("1.32.0");
+            }
         }
     }
 
     @Test
-    void testWeaviateWithModules() {
+    void testWeaviateWithModules() throws Exception {
         List<String> enableModules = Arrays.asList(
             "backup-filesystem",
             "text2vec-openai",
@@ -43,22 +49,30 @@ void testWeaviateWithModules() {
         Map<String, String> env = new HashMap<>();
         env.put("ENABLE_MODULES", String.join(",", enableModules));
         env.put("BACKUP_FILESYSTEM_PATH", "/tmp/backups");
-        try (WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.29.0").withEnv(env)) {
+        try (WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.32.0").withEnv(env)) {
             weaviate.start();
-            Config config = new Config("http", weaviate.getHttpHostAddress());
-            config.setGRPCHost(weaviate.getGrpcHostAddress());
-            WeaviateClient client = new WeaviateClient(config);
-            Result<Meta> meta = client.misc().metaGetter().run();
-            assertThat(meta.getResult().getVersion()).isEqualTo("1.29.0");
-            Object modules = meta.getResult().getModules();
-            assertThat(modules)
-                .isNotNull()
-                .asInstanceOf(InstanceOfAssertFactories.map(String.class, Object.class))
-                .extracting(Map::keySet)
-                .satisfies(keys -> {
-                    assertThat(keys.size()).isEqualTo(enableModules.size());
-                    keys.forEach(key -> assertThat(enableModules.contains(key)).isTrue());
-                });
+            try (
+                WeaviateClient client = WeaviateClient.connectToCustom(conn -> {
+                    return conn
+                        .scheme("http")
+                        .httpHost(weaviate.getHost())
+                        .httpPort(weaviate.getMappedPort(8080))
+                        .grpcHost(weaviate.getHost())
+                        .grpcPort(weaviate.getMappedPort(50051));
+                })
+            ) {
+                InstanceMetadata meta = client.meta();
+                assertThat(meta.version()).isEqualTo("1.32.0");
+                Map<String, Object> modules = meta.modules();
+                assertThat(modules)
+                    .isNotNull()
+                    .asInstanceOf(InstanceOfAssertFactories.map(String.class, Object.class))
+                    .extracting(Map::keySet)
+                    .satisfies(keys -> {
+                        assertThat(keys.size()).isEqualTo(enableModules.size());
+                        keys.forEach(key -> assertThat(enableModules.contains(key)).isTrue());
+                    });
+            }
         }
     }
 }

From 84b1c3a5951f18421ed35e82c44a1d17c5690cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 16 Apr 2026 00:07:08 -0600
Subject: [PATCH 4908/4969] Add getHttpPort and getGrpcPort methods in
 WeaviateContainer (#11712)

---
 .../weaviate/WeaviateContainer.java           | 20 +++++++++++++++----
 .../weaviate/WeaviateContainerTest.java       |  8 ++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
index 86aff57ae5d..dbc18a49a22 100644
--- a/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
+++ b/modules/weaviate/src/main/java/org/testcontainers/weaviate/WeaviateContainer.java
@@ -17,6 +17,10 @@
  */
 public class WeaviateContainer extends GenericContainer<WeaviateContainer> {
 
+    private static final int HTTP_PORT = 8080;
+
+    private static final int GRPC_PORT = 50051;
+
     private static final DockerImageName DEFAULT_WEAVIATE_IMAGE = DockerImageName.parse(
         "cr.weaviate.io/semitechnologies/weaviate"
     );
@@ -30,17 +34,25 @@ public WeaviateContainer(String dockerImageName) {
     public WeaviateContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_WEAVIATE_IMAGE, DOCKER_HUB_WEAVIATE_IMAGE);
-        withExposedPorts(8080, 50051);
+        withExposedPorts(HTTP_PORT, GRPC_PORT);
         withEnv("AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED", "true");
         withEnv("PERSISTENCE_DATA_PATH", "/var/lib/weaviate");
-        waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(8080).forStatusCode(200));
+        waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(HTTP_PORT).forStatusCode(200));
     }
 
     public String getHttpHostAddress() {
-        return getHost() + ":" + getMappedPort(8080);
+        return getHost() + ":" + getHttpPort();
+    }
+
+    public Integer getHttpPort() {
+        return getMappedPort(HTTP_PORT);
     }
 
     public String getGrpcHostAddress() {
-        return getHost() + ":" + getMappedPort(50051);
+        return getHost() + ":" + getGrpcPort();
+    }
+
+    public Integer getGrpcPort() {
+        return getMappedPort(GRPC_PORT);
     }
 }
diff --git a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
index d103970053c..098a1561913 100644
--- a/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
+++ b/modules/weaviate/src/test/java/org/testcontainers/weaviate/WeaviateContainerTest.java
@@ -26,9 +26,9 @@ void testWeaviate() throws Exception {
                     return conn
                         .scheme("http")
                         .httpHost(weaviate.getHost())
-                        .httpPort(weaviate.getMappedPort(8080))
+                        .httpPort(weaviate.getHttpPort())
                         .grpcHost(weaviate.getHost())
-                        .grpcPort(weaviate.getMappedPort(50051));
+                        .grpcPort(weaviate.getGrpcPort());
                 })
             ) {
                 InstanceMetadata meta = client.meta();
@@ -56,9 +56,9 @@ void testWeaviateWithModules() throws Exception {
                     return conn
                         .scheme("http")
                         .httpHost(weaviate.getHost())
-                        .httpPort(weaviate.getMappedPort(8080))
+                        .httpPort(weaviate.getHttpPort())
                         .grpcHost(weaviate.getHost())
-                        .grpcPort(weaviate.getMappedPort(50051));
+                        .grpcPort(weaviate.getGrpcPort());
                 })
             ) {
                 InstanceMetadata meta = client.meta();

From 5c448202ac69d073f746433d3e79f6a2bf0ec585 Mon Sep 17 00:00:00 2001
From: Haider Kagalwala <70105477+haider2122@users.noreply.github.com>
Date: Mon, 20 Apr 2026 21:53:51 +0530
Subject: [PATCH 4909/4969] Fix typo (#11717)

---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index 0fe944433ae..fa5711807e7 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -1115,7 +1115,7 @@ public SELF withEnv(Map<String, String> env) {
     @Override
     public SELF withLabel(String key, String value) {
         if (key.startsWith("org.testcontainers")) {
-            throw new IllegalArgumentException("The org.testcontainers namespace is reserved for interal use");
+            throw new IllegalArgumentException("The org.testcontainers namespace is reserved for internal use");
         }
         this.containerDef.addLabel(key, value);
         return self();

From 09752a8ba2648983842c9617cd5d2560f185bfea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 12:46:49 -0600
Subject: [PATCH 4910/4969] [create-pull-request] automated change (#11720)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index eeb86a395e8..f9e383482f4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=2.0.4
+testcontainers.version=2.0.5

From afd28bb559b07f8da5aaa9e2bc21721ee8ee97af Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 12:47:04 -0600
Subject: [PATCH 4911/4969] [create-pull-request] automated change (#11721)

Co-authored-by: eddumelendez <1810547+eddumelendez@users.noreply.github.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 552f36f29f4..ad75b0b2f22 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -140,4 +140,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 2.0.4
+    latest_version: 2.0.5

From adbea9d4e70598551817cfcfe425c6c3c35943ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sat, 2 May 2026 01:19:15 +0300
Subject: [PATCH 4912/4969] Remove duplicated
 org.junit.platform:junit-platform-launcher dependency

---
 examples/immudb/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
index 4c2256983eb..a4d656dd762 100644
--- a/examples/immudb/build.gradle
+++ b/examples/immudb/build.gradle
@@ -15,7 +15,6 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
 test {

From 6299b4f2135d45e11957a321a13b37d28b10ab59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sat, 2 May 2026 01:19:46 +0300
Subject: [PATCH 4913/4969] Polish neo4j-container build file

---
 examples/neo4j-container/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
index 5ba6faf08af..7a6eed0016d 100644
--- a/examples/neo4j-container/build.gradle
+++ b/examples/neo4j-container/build.gradle
@@ -14,3 +14,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
+
+test {
+	useJUnitPlatform()
+}

From 38783111aea6899ee42541756771394f2fb02958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Sat, 2 May 2026 01:20:45 +0300
Subject: [PATCH 4914/4969] Remove unused gradle plugin

---
 examples/settings.gradle   | 1 -
 smoke-test/settings.gradle | 1 -
 2 files changed, 2 deletions(-)

diff --git a/examples/settings.gradle b/examples/settings.gradle
index 8d144867bbd..b9b58a917bf 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -5,7 +5,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.1"
     }
diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle
index e79fb0d5c94..6334742441a 100644
--- a/smoke-test/settings.gradle
+++ b/smoke-test/settings.gradle
@@ -5,7 +5,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.4"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:2.0.1"
     }

From 50484874fccd1b38892e0baa92cda484879b6b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Przyby=C5=82?=
 <23506256+pioorg@users.noreply.github.com>
Date: Wed, 20 May 2026 14:50:24 +0200
Subject: [PATCH 4915/4969] Added KibanaContainer (#11493)

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
---
 docs/modules/elasticsearch.md                 |  27 +
 .../elasticsearch/ElasticsearchContainer.java |  89 +++
 .../elasticsearch/KibanaContainer.java        | 613 ++++++++++++++++++
 .../ElasticsearchContainerTest.java           |  33 +
 .../elasticsearch/KibanaContainerTest.java    | 461 +++++++++++++
 5 files changed, 1223 insertions(+)
 create mode 100644 modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
 create mode 100644 modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
index c1fb4a3f6a8..5817a21de02 100644
--- a/docs/modules/elasticsearch.md
+++ b/docs/modules/elasticsearch.md
@@ -30,6 +30,33 @@ You can turn on security by providing a password:
 [HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientSecuredContainer
 <!--/codeinclude-->
 
+## Kibana container
+
+This module also provides a `KibanaContainer` for testing with [Kibana](https://www.elastic.co/kibana).
+Kibana requires a connection to Elasticsearch and `KibanaContainer` supports two modes: managed and external.
+
+### Managed mode
+
+In managed mode, `KibanaContainer` automatically connects to an `ElasticsearchContainer`:
+
+<!--codeinclude-->
+[Kibana with Elasticsearch](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java) inside_block:managedModeCanStartAndReachElasticsearchInSameExplicitNetwork
+<!--/codeinclude-->
+
+When using managed mode with explicit networks, both containers must share the same `Network` instance.
+Alternatively, you can omit the network configuration entirely, and `KibanaContainer` will do its best effort to create a shared, ad-hoc network automatically.
+
+### External mode
+
+In external mode, `KibanaContainer` connects to an external Elasticsearch instance via URL and using provided credentials:
+
+<!--codeinclude-->
+[Kibana with external Elasticsearch](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java) inside_block:externalModeCanWorkWithUsernamePassword
+<!--/codeinclude-->
+
+For external mode with HTTPS, use `withElasticsearchCaCertificate()` to provide the CA certificate.
+You can authenticate using either username/password (`withElasticsearchCredentials()`) or service account tokens (`withElasticsearchServiceAccountToken()`).
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 54f1a4c17f8..2080d21649a 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -209,10 +209,99 @@ public ElasticsearchContainer withCertPath(String certPath) {
         return this;
     }
 
+    String getCertPath() {
+        return certPath;
+    }
+
     public String getHttpHostAddress() {
         return getHost() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
     }
 
+    /**
+     * Checks env first if this implies HTTP/HTTPS.
+     * Otherwise, detects the scheme used by Elasticsearch using <code>curl</code>
+     *
+     * @return "http" or "https"
+     */
+    String getHttpScheme() {
+        String securityEnabled = getEnvMap().get("xpack.security.enabled");
+        String httpSslEnabled = getEnvMap().get("xpack.security.http.ssl.enabled");
+
+        // Respect explicit user config
+        if ("false".equalsIgnoreCase(securityEnabled) || "false".equalsIgnoreCase(httpSslEnabled)) {
+            return "http";
+        }
+        if ("true".equalsIgnoreCase(httpSslEnabled)) {
+            return "https";
+        }
+
+        if (!isRunning()) {
+            throw new IllegalStateException(
+                "Cannot determine HTTP scheme: environment variables are not set and container is not running for curl probe"
+            );
+        }
+
+        ExecResult httpsResult = null;
+        ExecResult httpResult = null;
+        try {
+            // HTTPS probe: any HTTP response (200/401/403/...) => scheme is HTTPS.
+            // http_code == 000 means we didn't get an HTTP response (TLS/connect failure/timeout).
+            httpsResult =
+                execInContainer(
+                    "curl",
+                    "-sS",
+                    "-k",
+                    "--connect-timeout",
+                    "2",
+                    "--max-time",
+                    "4",
+                    "-o",
+                    "/dev/null",
+                    "-w",
+                    "%{http_code}",
+                    "https://localhost:" + ELASTICSEARCH_DEFAULT_PORT + "/"
+                );
+            if (httpsResult.getExitCode() == 0 && !"000".equals(httpsResult.getStdout().trim())) {
+                return "https";
+            }
+
+            // HTTP probe
+            httpResult =
+                execInContainer(
+                    "curl",
+                    "-sS",
+                    "--connect-timeout",
+                    "2",
+                    "--max-time",
+                    "4",
+                    "-o",
+                    "/dev/null",
+                    "-w",
+                    "%{http_code}",
+                    "http://localhost:" + ELASTICSEARCH_DEFAULT_PORT + "/"
+                );
+            if (httpResult.getExitCode() == 0 && !"000".equals(httpResult.getStdout().trim())) {
+                return "http";
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to detect protocol via curl", e);
+        }
+
+        throw new RuntimeException(
+            String.format(
+                "Failed to detect protocol via curl. Both HTTPS and HTTP probes failed. " +
+                "HTTPS probe - exit code: %d, stdout: %s, stderr: %s; " +
+                "HTTP probe - exit code: %d, stdout: %s, stderr: %s",
+                httpsResult.getExitCode(),
+                httpsResult.getStdout(),
+                httpsResult.getStderr(),
+                httpResult.getExitCode(),
+                httpResult.getStdout(),
+                httpResult.getStderr()
+            )
+        );
+    }
+
     // The TransportClient will be removed in Elasticsearch 8. No need to expose this port anymore in the future.
     @Deprecated
     public InetSocketAddress getTcpHost() {
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
new file mode 100644
index 00000000000..a7214f0618d
--- /dev/null
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
@@ -0,0 +1,613 @@
+package org.testcontainers.elasticsearch;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.ContainerNetwork;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Testcontainers implementation for Kibana.
+ *  Minimum supported version: {@value MINIMUM_SUPPORTED_VERSION}
+ * <p>
+ * Supports two modes:
+ * <ul>
+ *   <li><b>Managed mode:</b> Kibana automatically connects to an {@link ElasticsearchContainer}.
+ *       See KibanaContainerTest#managedModeCanStartAndReachElasticsearchInSameExplicitNetwork()</li>
+ *   <li><b>External mode:</b> Kibana connects to an external Elasticsearch instance via URL.
+ *       See KibanaContainerTest#externalModeCanWorkWithUsernamePassword()</li>
+ * </ul>
+ * <p>
+ */
+public class KibanaContainer extends GenericContainer<KibanaContainer> {
+
+    private static final String ES_CA_CERT_PATH = "/usr/share/kibana/config/certs/es-ca.crt";
+
+    private static final Logger log = LoggerFactory.getLogger(KibanaContainer.class);
+
+    private static final int KIBANA_DEFAULT_PORT = 5601;
+
+    private static final String KIBANA_SYSTEM_USER = "kibana_system";
+
+    private static final String MINIMUM_SUPPORTED_VERSION = "8.0.0";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker.elastic.co/kibana/kibana");
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    private ElasticsearchContainer elasticsearch;
+
+    private String elasticsearchUrl;
+
+    private String elasticsearchUsername;
+
+    private String elasticsearchPassword;
+
+    private String elasticsearchServiceAccountToken;
+
+    private byte[] elasticsearchCaCertificate;
+
+    private Duration startupTimeout = Duration.ofSeconds(120);
+
+    /**
+     * If KibanaContainer creates an ad-hoc shared network (managed mode, neither container has an explicit network),
+     * it owns closing it.
+     */
+    private Network createdSharedNetwork;
+
+    /**
+     * Creates a KibanaContainer in managed mode.
+     * Kibana automatically connects to the provided Elasticsearch container.
+     *
+     * @param elasticsearch the Elasticsearch container to connect to
+     */
+    public KibanaContainer(ElasticsearchContainer elasticsearch) {
+        this(buildDockerImageName(elasticsearch));
+        this.elasticsearch = elasticsearch;
+        dependsOn(elasticsearch);
+    }
+
+    /**
+     * Creates a KibanaContainer in external mode.
+     * Use {@link #withElasticsearchUrl(String)} to configure the Elasticsearch connection. Use other methods to provide security credentials and such.
+     *
+     * @param dockerImageName the Docker image name
+     */
+    public KibanaContainer(String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * Creates a KibanaContainer in external mode.
+     * Use {@link #withElasticsearchUrl(String)} to configure the Elasticsearch connection. Use other methods to provide security credentials and such.
+     *
+     * @param dockerImageName the Docker image name
+     */
+    public KibanaContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+        ensureCompatibleVersion(dockerImageName.getVersionPart());
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+        withExposedPorts(KIBANA_DEFAULT_PORT);
+        //we have to explicitly set wait the strategy later on in configure, once we know the security configuration
+        setWaitStrategy(null);
+    }
+
+    /**
+     * Configures the Elasticsearch URL for external mode.
+     *
+     * @param elasticsearchUrl the Elasticsearch URL (e.g., "https://my.fancy.setup.elastic.cloud:9200")
+     * @return this container instance
+     * @throws IllegalStateException if already using managed mode
+     */
+    public KibanaContainer withElasticsearchUrl(String elasticsearchUrl) {
+        if (elasticsearch != null) {
+            throw new IllegalStateException("Cannot set Elasticsearch URL when using Elasticsearch container");
+        }
+        this.elasticsearchUrl = elasticsearchUrl;
+        return this;
+    }
+
+    /**
+     * Configures Kibana to authenticate using the kibana_system user.
+     *
+     * @param password the password for the kibana_system user
+     * @return this container instance
+     */
+    public KibanaContainer withKibanaSystemPassword(String password) {
+        return withKibanaUsernameAndPassword(KIBANA_SYSTEM_USER, password);
+    }
+
+    /**
+     * Configures credentials Kibana will use for authentication.
+     *
+     * @param username the Elasticsearch username (cannot be 'elastic')
+     * @param password the password
+     * @return this container instance
+     * @throws IllegalStateException if a service account token is already configured
+     * @throws IllegalArgumentException if credentials are invalid
+     */
+    public KibanaContainer withKibanaUsernameAndPassword(String username, String password) {
+        if (elasticsearchServiceAccountToken != null) {
+            throw new IllegalStateException(
+                "Conflicting Elasticsearch credentials: provide either a service account token " +
+                "or a username/password pair, not both."
+            );
+        }
+        if (StringUtils.isAnyBlank(username, password)) {
+            throw new IllegalArgumentException("Kibana credentials cannot be blank");
+        }
+        if (!username.equals(username.trim()) || !password.equals(password.trim())) {
+            throw new IllegalArgumentException("Kibana credentials cannot have leading or trailing whitespace");
+        }
+        if ("elastic".equals(username)) {
+            throw new IllegalArgumentException("Username 'elastic' is reserved for internal use by Elasticsearch");
+        }
+
+        this.elasticsearchUsername = username;
+        this.elasticsearchPassword = password;
+        return this;
+    }
+
+    /**
+     * Configures a service account token for Elasticsearch authentication.
+     *
+     * @param token the service account token
+     * @return this container instance
+     * @throws IllegalStateException if username/password credentials are already configured
+     * @throws IllegalArgumentException if token is blank
+     */
+    public KibanaContainer withElasticsearchServiceAccountToken(String token) {
+        if (elasticsearchUsername != null) {
+            throw new IllegalStateException(
+                "Conflicting Elasticsearch credentials: provide either a service account token " +
+                "or a username/password pair, not both."
+            );
+        }
+        if (StringUtils.isBlank(token)) {
+            throw new IllegalArgumentException("Service account token cannot be empty");
+        }
+
+        if (!token.equals(token.trim())) {
+            throw new IllegalArgumentException("Service token cannot have leading or trailing whitespace");
+        }
+        this.elasticsearchServiceAccountToken = token;
+        return this;
+    }
+
+    /**
+     * Configures the Elasticsearch CA certificate for HTTPS connections.
+     *
+     * @param caCertificate the CA certificate in PEM format
+     * @return this container instance
+     * @throws IllegalArgumentException if certificate is empty
+     */
+    public KibanaContainer withElasticsearchCaCertificate(byte[] caCertificate) {
+        if (caCertificate == null || caCertificate.length == 0) {
+            throw new IllegalArgumentException("Elasticsearch CA certificate cannot be empty");
+        }
+        this.elasticsearchCaCertificate = caCertificate;
+        return this;
+    }
+
+    @Override
+    protected void configure() {
+        super.configure();
+
+        addEnv("XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY", generateRandomKey(32));
+        addEnv("SERVER_NAME", "kibana");
+
+        if (elasticsearchCaCertificate != null) {
+            withCopyToContainer(Transferable.of(elasticsearchCaCertificate), ES_CA_CERT_PATH);
+            addEnv("ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES", ES_CA_CERT_PATH);
+        }
+        if (elasticsearch != null) {
+            configureManagedElasticsearch();
+        } else if (elasticsearchUrl != null) {
+            configureExternalElasticsearch();
+        } else {
+            throw new IllegalStateException(
+                "Elasticsearch must be configured either via constructor KibanaContainer(elasticsearch) " +
+                "or via .withElasticsearchUrl() for external Elasticsearch"
+            );
+        }
+        //wait strategy is set in configure, because we don't know the security configuration before
+        configureWaitStrategy();
+    }
+
+    @Override
+    protected void containerIsStarted(InspectContainerResponse containerInfo) {
+        super.containerIsStarted(containerInfo);
+        log.info("Kibana is now ready, it can be accessed at http://{}", getHttpHostAddress());
+    }
+
+    @Override
+    public void stop() {
+        super.stop();
+        if (createdSharedNetwork != null) {
+            try {
+                createdSharedNetwork.close();
+            } catch (Exception e) {
+                log.debug("Failed to close shared network", e);
+            } finally {
+                createdSharedNetwork = null;
+            }
+        }
+    }
+
+    @Override
+    public KibanaContainer withStartupTimeout(Duration startupTimeout) {
+        this.startupTimeout = startupTimeout;
+        return this;
+    }
+
+    private static DockerImageName buildDockerImageName(ElasticsearchContainer elasticsearch) {
+        String esVersion = DockerImageName.parse(elasticsearch.getDockerImageName()).getVersionPart();
+        ensureCompatibleVersion(esVersion);
+        return DEFAULT_IMAGE_NAME.withTag(esVersion);
+    }
+
+    private void configureExternalElasticsearch() {
+        addEnv("ELASTICSEARCH_HOSTS", elasticsearchUrl);
+        if (elasticsearchServiceAccountToken != null) {
+            addEnv("ELASTICSEARCH_SERVICEACCOUNTTOKEN", elasticsearchServiceAccountToken);
+        } else if (elasticsearchUsername != null && elasticsearchPassword != null) {
+            addEnv("ELASTICSEARCH_USERNAME", elasticsearchUsername);
+            addEnv("ELASTICSEARCH_PASSWORD", elasticsearchPassword);
+        } else {
+            log.info(
+                "No Elasticsearch credentials provided for external mode; Kibana will attempt to connect anonymously"
+            );
+        }
+    }
+
+    private void configureManagedElasticsearch() {
+        ensureCorrectNetworkSetupForManagedMode();
+
+        if (getNetwork() == null) {
+            createAdHocNetwork();
+        }
+
+        String protocol = elasticsearch.getHttpScheme();
+
+        String hosts = protocol + "://" + resolveExistingEsDnsNameOnNetwork(getNetwork()) + ":9200";
+        addEnv("ELASTICSEARCH_HOSTS", hosts);
+
+        if ("https".equals(protocol)) {
+            // In managed mode, if Elasticsearch uses HTTPS we must configure Kibana with the ES CA, unless provided by user
+            if (this.elasticsearchCaCertificate == null) {
+                byte[] ca = copyElasticsearchHttpCaCertificateOrThrow();
+
+                withCopyToContainer(Transferable.of(ca), ES_CA_CERT_PATH);
+                addEnv("ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES", ES_CA_CERT_PATH);
+            }
+            if (elasticsearch != null && !getEnvMap().containsKey("ELASTICSEARCH_SSL_VERIFICATIONMODE")) {
+                addEnv("ELASTICSEARCH_SSL_VERIFICATIONMODE", "certificate");
+            }
+        }
+
+        // Elasticsearch 8.x+ has the security enabled by default, so lack of the env var set to false means security is enabled
+        boolean securityDisabled = "false".equalsIgnoreCase(elasticsearch.getEnvMap().get("xpack.security.enabled"));
+
+        if (!securityDisabled) {
+            // Managed mode: authenticate Kibana -> Elasticsearch using a Kibana service account token.
+            // This avoids any password lifecycle management for kibana_system.
+            String token = createKibanaServiceAccountToken(protocol);
+            addEnv("ELASTICSEARCH_SERVICEACCOUNTTOKEN", token);
+        }
+    }
+
+    private byte[] copyElasticsearchHttpCaCertificateOrThrow() {
+        try {
+            return elasticsearch.copyFileFromContainer(elasticsearch.getCertPath(), IOUtils::toByteArray);
+        } catch (Exception e) {
+            throw new IllegalStateException(
+                "Failed to copy Elasticsearch HTTP CA certificate from '" +
+                elasticsearch.getCertPath() +
+                "'. " +
+                "In managed HTTPS mode, KibanaContainer requires access to the Elasticsearch HTTP CA.",
+                e
+            );
+        }
+    }
+
+    private void ensureCorrectNetworkSetupForManagedMode() {
+        Network esNetwork = elasticsearch.getNetwork();
+        Network kbNetwork = this.getNetwork();
+
+        if ((esNetwork == null) != (kbNetwork == null)) {
+            throw new IllegalStateException(
+                "Managed mode requires either both containers share the same explicit network, " +
+                "or neither specifies a network (KibanaContainer will create one). "
+            );
+        }
+
+        // Both explicit: must be same
+        if (esNetwork != kbNetwork) {
+            throw new IllegalStateException(
+                "Elasticsearch and Kibana have different networks configured. " +
+                "In managed mode both containers must share the same explicit network instance, " +
+                "or neither must define a network."
+            );
+        }
+    }
+
+    private void createAdHocNetwork() {
+        // Fully managed: create ad-hoc network and own it.
+        createdSharedNetwork = Network.newNetwork();
+        withNetwork(createdSharedNetwork);
+
+        // Managed-mode safety rule: by the time Kibana is configuring itself, Elasticsearch must already be
+        // started (via dependsOn)
+        String esId = requireElasticsearchContainerId();
+
+        // Elasticsearch is already created/started. Attach it to the ad-hoc network.
+        // We don't need to provide an explicit alias - we'll use the container name for DNS resolution.
+        // Equivalent of https://docs.docker.com/reference/cli/docker/network/connect/
+        connectRunningContainerToNetwork(esId, createdSharedNetwork);
+    }
+
+    private String resolveExistingEsDnsNameOnNetwork(Network network) {
+        String esId = requireElasticsearchContainerId();
+
+        InspectContainerResponse info = DockerClientFactory.instance().client().inspectContainerCmd(esId).exec();
+
+        Map<String, ContainerNetwork> networks = info.getNetworkSettings().getNetworks();
+        if (networks == null) {
+            throw new IllegalStateException("Elasticsearch container has no network configuration");
+        }
+
+        // Try to find the network endpoint - Docker may key by network name or ID
+        ContainerNetwork endpoint = findNetworkEndpoint(networks, network);
+        if (endpoint == null) {
+            throw new IllegalStateException(
+                "Elasticsearch container is not connected to the expected network. " +
+                "Ensure both containers use the same Network instance."
+            );
+        }
+
+        // Prefer user-defined network aliases (skip Testcontainers auto-generated tc-* aliases)
+        if (endpoint.getAliases() != null && !endpoint.getAliases().isEmpty()) {
+            for (String alias : endpoint.getAliases()) {
+                if (StringUtils.isNotBlank(alias)) {
+                    String cleaned = alias.trim();
+                    // Skip Testcontainers auto-generated aliases (tc-*), prefer user-defined ones
+                    if (!cleaned.startsWith("tc-")) {
+                        log.info("Using Elasticsearch network alias: {}", cleaned);
+                        return cleaned;
+                    }
+                }
+            }
+        }
+
+        // Fallback: use container name
+        String containerName = info.getName();
+        if (containerName != null && !containerName.trim().isEmpty()) {
+            String dnsName = containerName.replaceFirst("^/", "").trim();
+            log.info("No user-defined network alias found, using Elasticsearch container name: {}", dnsName);
+            return dnsName;
+        }
+
+        throw new IllegalStateException(
+            "Cannot determine Elasticsearch DNS name. " +
+            "When using a custom network, set a network alias on the Elasticsearch container."
+        );
+    }
+
+    private ContainerNetwork findNetworkEndpoint(Map<String, ContainerNetwork> networks, Network network) {
+        // Try network ID first
+        ContainerNetwork endpoint = networks.get(network.getId());
+        if (endpoint != null) {
+            return endpoint;
+        }
+
+        // Try network name as fallback (Docker may key by name instead of ID)
+        try {
+            String networkName = DockerClientFactory
+                .instance()
+                .client()
+                .inspectNetworkCmd()
+                .withNetworkId(network.getId())
+                .exec()
+                .getName();
+            if (networkName != null) {
+                return networks.get(networkName);
+            }
+        } catch (Exception e) {
+            // Ignore and return null
+        }
+
+        return null;
+    }
+
+    private String requireElasticsearchContainerId() {
+        String id = elasticsearch.getContainerId();
+        if (StringUtils.isBlank(id)) {
+            throw new IllegalStateException(
+                "Elasticsearch containerId is not available. In managed mode, Elasticsearch must be started via dependsOn(elasticsearch) " +
+                "before KibanaContainer is started."
+            );
+        }
+        return id.trim();
+    }
+
+    private void connectRunningContainerToNetwork(String containerId, Network network) {
+        String networkId = network.getId();
+
+        try {
+            DockerClientFactory
+                .instance()
+                .client()
+                .connectToNetworkCmd()
+                .withContainerId(containerId)
+                .withNetworkId(networkId)
+                .exec();
+        } catch (Exception e) {
+            throw new IllegalStateException("Failed to connect Elasticsearch container to ad-hoc shared network", e);
+        }
+    }
+
+    private static void ensureCompatibleVersion(String esVersion) {
+        ComparableVersion comparableVersion = new ComparableVersion(esVersion);
+        if (comparableVersion.isLessThan(MINIMUM_SUPPORTED_VERSION)) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "Kibana version %s is not supported. Minimum version is %s",
+                    comparableVersion,
+                    MINIMUM_SUPPORTED_VERSION
+                )
+            );
+        }
+    }
+
+    private String createKibanaServiceAccountToken(String protocol) {
+        if (elasticsearch == null) {
+            throw new IllegalStateException("Cannot create service account token in external mode");
+        }
+
+        String elasticPassword = elasticsearch
+            .getEnvMap()
+            .getOrDefault("ELASTIC_PASSWORD", ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD);
+
+        // Create a unique token name to avoid collisions if the same ES container is reused.
+        String tokenName = "tc-kibana-" + Base58.randomString(12);
+
+        String endpoint = protocol + "://localhost:9200/_security/service/elastic/kibana/credential/token/" + tokenName;
+
+        return Unreliables.retryUntilSuccess(
+            45,
+            TimeUnit.SECONDS,
+            () -> {
+                String curlTlsArgs = "";
+                if ("https".equals(protocol)) {
+                    // In managed HTTPS mode, use the Elasticsearch HTTP CA for curl.
+                    curlTlsArgs = " --cacert '" + elasticsearch.getCertPath() + "'";
+                }
+
+                String curlCommand = String.format(
+                    "curl -sS%s -u \"elastic:$1\" -H 'Content-Type: application/json' -X POST '%s'",
+                    curlTlsArgs,
+                    endpoint
+                );
+
+                Container.ExecResult result = elasticsearch.execInContainer(
+                    "/bin/sh",
+                    "-c",
+                    curlCommand,
+                    "sh",
+                    elasticPassword
+                );
+
+                String stdout = (result.getStdout() == null) ? "" : result.getStdout();
+                String stderr = (result.getStderr() == null) ? "" : result.getStderr();
+
+                if (result.getExitCode() != 0) {
+                    throw new RuntimeException(
+                        "Failed to create Kibana service account token. Exit code: " +
+                        result.getExitCode() +
+                        ", stdout: " +
+                        stdout +
+                        ", stderr: " +
+                        stderr
+                    );
+                }
+
+                JsonNode json = OBJECT_MAPPER.readTree(stdout);
+                JsonNode value = json.path("token").path("value");
+                if (value.isTextual() && !value.asText().trim().isEmpty()) {
+                    return value.asText().trim();
+                }
+
+                throw new RuntimeException("Service account token response did not contain token.value: " + stdout);
+            }
+        );
+    }
+
+    private String generateRandomKey(int length) {
+        return Base58.randomString(length);
+    }
+
+    /**
+     * Returns the HTTP host address for accessing Kibana.
+     *
+     * @return the host address in the format "host:port"
+     */
+    public String getHttpHostAddress() {
+        return getHost() + ":" + getMappedPort(KIBANA_DEFAULT_PORT);
+    }
+
+    private void configureWaitStrategy() {
+        if (this.getWaitStrategy() != null) {
+            // the user might have set a custom wait strategy
+            return;
+        }
+        HttpWaitStrategy strategy = Wait
+            .forHttp("/api/status")
+            .forPort(KIBANA_DEFAULT_PORT)
+            .forStatusCode(200)
+            .forResponsePredicate(this::isKibanaReady);
+
+        // Add authentication if we have Elasticsearch credentials available
+        String serviceToken = getEnvMap().get("ELASTICSEARCH_SERVICEACCOUNTTOKEN");
+        String username = getEnvMap().get("ELASTICSEARCH_USERNAME");
+        String password = getEnvMap().get("ELASTICSEARCH_PASSWORD");
+
+        if (serviceToken != null) {
+            strategy = strategy.withHeader("Authorization", "Bearer " + serviceToken);
+        } else if (username != null && password != null) {
+            strategy = strategy.withBasicCredentials(username, password);
+        }
+
+        setWaitStrategy(strategy.withStartupTimeout(this.startupTimeout));
+    }
+
+    private boolean isKibanaReady(String body) {
+        try {
+            JsonNode json = OBJECT_MAPPER.readTree(body);
+            JsonNode status = json.path("status");
+
+            String overallLevel = status.path("overall").path("level").asText(null);
+            String elasticsearchLevel = status.path("core").path("elasticsearch").path("level").asText(null);
+            String savedObjectsLevel = status.path("core").path("savedObjects").path("level").asText(null);
+
+            boolean overallAvailable = "available".equalsIgnoreCase(overallLevel);
+            boolean elasticsearchAvailable = "available".equalsIgnoreCase(elasticsearchLevel);
+            boolean savedObjectsAvailable = "available".equalsIgnoreCase(savedObjectsLevel);
+
+            boolean isReady = overallAvailable && elasticsearchAvailable && savedObjectsAvailable;
+
+            if (log.isDebugEnabled()) {
+                log.debug(
+                    "Kibana status check: READY={} (overall={}, elasticsearch={}, savedObjects={})",
+                    isReady,
+                    overallLevel,
+                    elasticsearchLevel,
+                    savedObjectsLevel
+                );
+            }
+
+            return isReady;
+        } catch (Exception e) {
+            log.debug("Kibana status check: FAILED to parse response - {}", e.getMessage());
+            return false;
+        }
+    }
+}
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index f0219713751..52cd78b4a34 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -602,4 +602,37 @@ private void assertClusterHealthResponse(ElasticsearchContainer container) throw
         assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
         assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
     }
+
+    @Test
+    void testGetHttpSchemeForElasticsearch7ReturnsHttp() {
+        try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
+            container.start();
+            assertThat(container.getHttpScheme()).isEqualTo("http");
+        }
+    }
+
+    @Test
+    void testGetHttpSchemeForElasticsearch8ReturnsHttps() {
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+            )
+        ) {
+            container.start();
+            assertThat(container.getHttpScheme()).isEqualTo("https");
+        }
+    }
+
+    @Test
+    void testGetHttpSchemeForElasticsearch8WithSslDisabledReturnsHttp() {
+        try (
+            ElasticsearchContainer container = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+            )
+                .withEnv("xpack.security.http.ssl.enabled", "false")
+        ) {
+            container.start();
+            assertThat(container.getHttpScheme()).isEqualTo("http");
+        }
+    }
 }
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java
new file mode 100644
index 00000000000..a6b9466690a
--- /dev/null
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java
@@ -0,0 +1,461 @@
+package org.testcontainers.elasticsearch;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.Network;
+import org.testcontainers.images.builder.Transferable;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+class KibanaContainerTest {
+
+    public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    private static final String ES_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch:9.2.4";
+
+    @Test
+    void cannotCreateKibanaContainerForVersionLessThan8() {
+        Assertions
+            .assertThatThrownBy(() -> new KibanaContainer("docker.elastic.co/kibana/kibana:7.17.29"))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("is not supported");
+    }
+
+    @Test
+    void managedModeCanStartAndReachElasticsearchInSameExplicitNetwork() throws IOException {
+        // managedModeCanStartAndReachElasticsearchInSameExplicitNetwork {
+        try (
+            Network network = Network.newNetwork();
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withNetwork(network);
+            KibanaContainer kibana = new KibanaContainer(es).withNetwork(network)
+        ) {
+            es.start();
+            kibana.start();
+
+            String status = getKibanaStatus(kibana);
+            Assertions.assertThat(status).isEqualTo("available");
+        }
+        // }
+    }
+
+    @Test
+    void managedModeCannotStartWithOnlyESNetworkExplicit() {
+        Network network = Network.newNetwork();
+        try (
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withNetwork(network);
+            KibanaContainer kibana = new KibanaContainer(es)
+        ) {
+            Assertions
+                .assertThatThrownBy(kibana::start)
+                .isInstanceOf(ContainerLaunchException.class)
+                .satisfies(ex -> {
+                    Assertions
+                        .assertThat(ex.getCause())
+                        .isInstanceOf(IllegalStateException.class)
+                        .hasMessageContaining("explicit network");
+                });
+        }
+    }
+
+    @Test
+    void managedModeCannotStartWithDifferentExplicitNetworks() {
+        try (
+            Network esNetwork = Network.newNetwork();
+            Network kibanaNetwork = Network.newNetwork();
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withNetwork(esNetwork);
+            KibanaContainer kibana = new KibanaContainer(es).withNetwork(kibanaNetwork)
+        ) {
+            Assertions
+                .assertThatThrownBy(kibana::start)
+                .isInstanceOf(ContainerLaunchException.class)
+                .satisfies(ex -> {
+                    Assertions
+                        .assertThat(ex.getCause())
+                        .isInstanceOf(IllegalStateException.class)
+                        .hasMessageContaining("different networks");
+                });
+        }
+    }
+
+    @Test
+    void managedModeUsesCustomNetworkAliasInExplicitNetwork() throws Exception {
+        final String customEsAlias = "my-custom-es-alias";
+
+        try (
+            Network network = Network.newNetwork();
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+                .withNetwork(network)
+                .withNetworkAliases(customEsAlias);
+            KibanaContainer kibana = new KibanaContainer(es).withNetwork(network)
+        ) {
+            kibana.start();
+
+            Assertions.assertThat(kibana.isRunning()).isTrue();
+
+            // Verify Kibana uses the custom alias (not auto-generated tc-* alias)
+            Container.ExecResult result = kibana.execInContainer("sh", "-c", "env | grep ELASTICSEARCH_HOSTS");
+
+            Assertions.assertThat(result.getStdout()).contains(customEsAlias).contains(":9200");
+        }
+    }
+
+    @Test
+    void managedModeCanStartAndReachElasticsearchWithoutExplicitNetwork() throws IOException {
+        try (
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE);
+            KibanaContainer kibana = new KibanaContainer(es)
+        ) {
+            kibana.start();
+
+            String status = getKibanaStatus(kibana);
+            Assertions.assertThat(status).isEqualTo("available");
+        }
+    }
+
+    @Test
+    void managedModeCanStartWithoutElasticsearchSecurity() throws IOException {
+        try (
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withEnv("xpack.security.enabled", "false");
+            KibanaContainer kibana = new KibanaContainer(es)
+        ) {
+            kibana.start();
+
+            String status = getKibanaStatus(kibana);
+            Assertions.assertThat(status).isEqualTo("available");
+        }
+    }
+
+    @Test
+    void managedModeCanStartWithoutElasticsearchHttps() throws IOException {
+        try (
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+                .withEnv("xpack.security.enabled", "true")
+                .withEnv("xpack.security.http.ssl.enabled", "false");
+            KibanaContainer kibana = new KibanaContainer(es)
+        ) {
+            es.start();
+            kibana.start();
+
+            String status = getKibanaStatus(kibana);
+            Assertions.assertThat(status).isEqualTo("available");
+        }
+    }
+
+    @Test
+    void externalModeFailsWithConflictingCredentials() {
+        Assertions
+            .assertThatThrownBy(() -> {
+                new KibanaContainer("docker.elastic.co/kibana/kibana:8.0.0")
+                    .withKibanaUsernameAndPassword("user", "pass")
+                    .withElasticsearchServiceAccountToken("token");
+            })
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Conflicting Elasticsearch credentials");
+    }
+
+    @Test
+    void managedModeFailsWhenSettingElasticsearchUrl() {
+        ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE);
+        Assertions
+            .assertThatThrownBy(() -> {
+                new KibanaContainer(es).withElasticsearchUrl("http://somewhere.over.the.rainbow:9200");
+            })
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Cannot set Elasticsearch URL when using Elasticsearch container");
+    }
+
+    @Test
+    void failsWhenNoElasticsearchConfigured() {
+        try (KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:8.0.0")) {
+            Assertions
+                .assertThatThrownBy(kibana::start)
+                .isInstanceOf(ContainerLaunchException.class)
+                .satisfies(ex -> {
+                    Assertions
+                        .assertThat(ex.getCause())
+                        .isInstanceOf(IllegalStateException.class)
+                        .hasMessageContaining("Elasticsearch must be configured");
+                });
+        }
+    }
+
+    @Test
+    void externalModeCanWorkWithUsernamePassword() throws IOException, InterruptedException {
+        final String esHostname = "elasticsearch";
+
+        // externalModeCanWorkWithUsernamePassword {
+        try (
+            Network network = Network.newNetwork();
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+                .withNetwork(network)
+                .withNetworkAliases(esHostname)
+                .withEnv("xpack.security.http.ssl.enabled", "false")
+        ) {
+            es.start();
+            String kibanaSystemPassword = setKibanaSystemPassword(es);
+
+            try (
+                KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:9.2.2") //this minor version is intentionally below ES version
+                    .withNetwork(network)
+                    .withElasticsearchUrl("http://" + esHostname + ":9200")
+                    .withKibanaSystemPassword(kibanaSystemPassword)
+            ) {
+                kibana.start();
+                String status = getKibanaStatus(kibana);
+                Assertions.assertThat(status).isEqualTo("available");
+            }
+        }
+        // }
+    }
+
+    @Test
+    void externalModeCanWorkWithoutCredentials() throws IOException {
+        final String esHostname = "elasticsearch";
+
+        try (
+            Network network = Network.newNetwork();
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+                .withNetwork(network)
+                .withNetworkAliases(esHostname)
+                .withEnv("xpack.security.enabled", "false")
+                .withEnv("xpack.security.http.ssl.enabled", "false");
+            KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:9.2.4")
+                .withNetwork(network)
+                .withElasticsearchUrl("http://" + esHostname + ":9200")
+        ) {
+            es.start();
+            kibana.start();
+            String status = getKibanaStatus(kibana);
+            Assertions.assertThat(status).isEqualTo("available");
+        }
+    }
+
+    @Test
+    void externalModeCanStartAndReachElasticsearchWithCertAndServiceToken() throws Exception {
+        byte[] caCrt;
+        byte[] nodeCrt;
+        byte[] nodeKey;
+
+        String esHostname = "elasticsearch";
+
+        String instancesYml =
+            "instances:\n" +
+            "  - name: es01\n" +
+            "    dns: [ \"localhost\", \"" +
+            esHostname +
+            "\", \"es01\" ]\n" +
+            "    ip:  [ \"127.0.0.1\" ]\n";
+
+        try (
+            ElasticsearchContainer setup = new ElasticsearchContainer(ES_IMAGE)
+                .withEnv("discovery.type", "single-node")
+                .withCopyToContainer(
+                    Transferable.of(instancesYml.getBytes(StandardCharsets.UTF_8), 0644),
+                    "/tmp/instances.yml"
+                )
+        ) {
+            setup.start();
+
+            // Run certutil inside the running container and write outputs inside the container FS
+            Container.ExecResult execResult = setup.execInContainer(
+                "bash",
+                "-lc",
+                "set -euo pipefail && " +
+                "mkdir -p /tmp/out && " +
+                "cd /usr/share/elasticsearch && " +
+                "bin/elasticsearch-certutil ca --silent --pem --out /tmp/out/ca.zip && " +
+                "unzip -o /tmp/out/ca.zip -d /tmp/out && " +
+                "bin/elasticsearch-certutil cert --silent --pem --in /tmp/instances.yml --ca-cert /tmp/out/ca/ca.crt --ca-key /tmp/out/ca/ca.key --out /tmp/out/certs.zip && " +
+                "unzip -o /tmp/out/certs.zip -d /tmp/out"
+            );
+            Assertions.assertThat(execResult.getExitCode()).isEqualTo(0);
+
+            // copy the certificates and key from the container, so we can use them later
+            caCrt = setup.copyFileFromContainer("/tmp/out/ca/ca.crt", IOUtils::toByteArray);
+            nodeCrt = setup.copyFileFromContainer("/tmp/out/es01/es01.crt", IOUtils::toByteArray);
+            nodeKey = setup.copyFileFromContainer("/tmp/out/es01/es01.key", IOUtils::toByteArray);
+        }
+
+        try (
+            Network network = Network.newNetwork();
+            ElasticsearchContainer es = new ElasticsearchContainer(
+                "docker.elastic.co/elasticsearch/elasticsearch:9.2.4"
+            )
+                .withNetwork(network)
+                .withNetworkAliases(esHostname)
+        ) {
+            applyTls(es, caCrt, nodeCrt, nodeKey);
+            es.start();
+            String kibanaServiceAccountToken = createKibanaServiceAccountToken(es);
+
+            try (
+                KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:9.2.4")
+                    // network is needed only because the ES we try to access via explicit mode is operated by non-public Docker
+                    .withNetwork(network)
+                    .withElasticsearchUrl("https://" + esHostname + ":9200")
+                    .withElasticsearchServiceAccountToken(kibanaServiceAccountToken)
+                    .withElasticsearchCaCertificate(es.caCertAsBytes().get())
+            ) {
+                kibana.start();
+                String status = getKibanaStatus(kibana);
+                Assertions.assertThat(status).isEqualTo("available");
+            }
+        }
+    }
+
+    private static String setKibanaSystemPassword(ElasticsearchContainer elasticsearch) throws IOException {
+        String kibanaPassword = "kibana-system-" + System.currentTimeMillis();
+
+        try (CloseableHttpClient httpClient = createHttpClient(elasticsearch)) {
+            String url = String.format(
+                "%s://%s/_security/user/kibana_system/_password",
+                elasticsearch.getHttpScheme(),
+                elasticsearch.getHttpHostAddress()
+            );
+            HttpPost request = new HttpPost(url);
+            request.setHeader("Content-Type", "application/json");
+            request.setEntity(new StringEntity("{\"password\":\"" + kibanaPassword + "\"}"));
+
+            HttpResponse response = httpClient.execute(request);
+            int statusCode = response.getStatusLine().getStatusCode();
+            String body = EntityUtils.toString(response.getEntity());
+
+            if (statusCode != 200) {
+                throw new IllegalStateException(
+                    "Failed to set kibana_system password. HTTP " + statusCode + ", body=" + body
+                );
+            }
+
+            // ES 9.x returns {} on success; older versions may return {"acknowledged":true}
+            // Just validate that the body is valid JSON.
+            try {
+                OBJECT_MAPPER.readTree(body.isEmpty() ? "{}" : body);
+            } catch (IOException e) {
+                throw new IllegalStateException("Non-JSON response body: " + body, e);
+            }
+
+            return kibanaPassword;
+        }
+    }
+
+    private static String createKibanaServiceAccountToken(ElasticsearchContainer elasticsearch) throws IOException {
+        String tokenName = "kibana-token-" + System.currentTimeMillis();
+
+        try (CloseableHttpClient httpClient = createHttpClient(elasticsearch)) {
+            String url = String.format(
+                "%s://%s/_security/service/elastic/kibana/credential/token/%s",
+                elasticsearch.getHttpScheme(),
+                elasticsearch.getHttpHostAddress(),
+                tokenName
+            );
+            HttpPost request = new HttpPost(url);
+            request.setHeader("Content-Type", "application/json");
+
+            HttpResponse response = httpClient.execute(request);
+            int statusCode = response.getStatusLine().getStatusCode();
+            String body = EntityUtils.toString(response.getEntity());
+
+            if (statusCode != 200) {
+                throw new IllegalStateException(
+                    "Failed to create Kibana service account token. HTTP " + statusCode + ", body=" + body
+                );
+            }
+
+            // Expected JSON:
+            // {"created":true,"token":{"name":"...","value":"AAEAA..."}}
+            try {
+                JsonNode root = OBJECT_MAPPER.readTree(body);
+                JsonNode tokenValue = root.path("token").path("value");
+
+                if (tokenValue.isMissingNode() || tokenValue.isNull()) {
+                    throw new IllegalStateException("Token value not found in response: " + body);
+                }
+
+                return tokenValue.asText();
+            } catch (IOException e) {
+                throw new IllegalStateException("Failed to parse token response: " + body, e);
+            }
+        }
+    }
+
+    private static CloseableHttpClient createHttpClient(ElasticsearchContainer elasticsearch) {
+        String elasticPassword = elasticsearch.getEnvMap().get("ELASTIC_PASSWORD");
+        HttpClientBuilder clientBuilder = HttpClientBuilder.create();
+
+        if (StringUtils.isNotBlank(elasticPassword)) {
+            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(
+                AuthScope.ANY,
+                new UsernamePasswordCredentials("elastic", elasticPassword)
+            );
+            clientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+        }
+
+        String scheme = elasticsearch.getHttpScheme();
+        if ("https".equals(scheme)) {
+            SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(
+                elasticsearch.createSslContextFromCa()
+            );
+            clientBuilder.setSSLSocketFactory(sslSocketFactory);
+        }
+
+        return clientBuilder.build();
+    }
+
+    private static String getKibanaStatus(KibanaContainer kibana) throws IOException {
+        try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
+            String url = "http://" + kibana.getHttpHostAddress() + "/api/status";
+            HttpResponse response = httpClient.execute(new org.apache.http.client.methods.HttpGet(url));
+            int statusCode = response.getStatusLine().getStatusCode();
+            String body = EntityUtils.toString(response.getEntity());
+
+            if (statusCode != 200) {
+                throw new IllegalStateException("Failed to get Kibana status. HTTP " + statusCode + ", body=" + body);
+            }
+
+            JsonNode json = OBJECT_MAPPER.readTree(body);
+            String status = json.path("status").path("overall").path("level").asText(null);
+            if (status == null) {
+                throw new IllegalStateException("Kibana status response missing 'status.overall.level' field: " + body);
+            }
+            return status;
+        }
+    }
+
+    private static void applyTls(ElasticsearchContainer c, byte[] caCrt, byte[] nodeCrt, byte[] nodeKey) {
+        final String certDir = "/usr/share/elasticsearch/config/certs";
+
+        // Copy provided materials
+        c.withCopyToContainer(Transferable.of(caCrt, 0644), certDir + "/http_ca.crt");
+        c.withCopyToContainer(Transferable.of(nodeCrt, 0644), certDir + "/http.crt");
+        c.withCopyToContainer(Transferable.of(nodeKey, 0644), certDir + "/http.key");
+
+        // Disable ES bootstrap TLS autoconfiguration
+        c.withEnv("xpack.security.autoconfiguration.enabled", "false");
+        c.withEnv("xpack.security.enabled", "true");
+
+        // Configure ONLY HTTP TLS using exactly the provided files
+        c.withEnv("xpack.security.http.ssl.enabled", "true");
+        c.withEnv("xpack.security.http.ssl.certificate_authorities", "certs/http_ca.crt");
+        c.withEnv("xpack.security.http.ssl.certificate", "certs/http.crt");
+        c.withEnv("xpack.security.http.ssl.key", "certs/http.key");
+    }
+}

From 905a445ad8b701e4c531aa652e42179072a88d01 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Tue, 2 Jun 2026 09:57:24 +0200
Subject: [PATCH 4916/4969] docs: remove bounty policy in favor of governance
 funding docs (#11789)

The issue bounty program described in docs/bounty.md was never run in
practice. Remove the bounty policy page and its navigation entry, and
update the CONTRIBUTING sponsorship section to point to the current
funding and governance documents in the testcontainers/.github repo,
which describe how sponsorship money is raised and distributed.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
---
 CONTRIBUTING.md |  4 ++--
 docs/bounty.md  | 51 -------------------------------------------------
 mkdocs.yml      |  1 -
 3 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 docs/bounty.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 93a87222781..27a2ce70f7a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,6 @@ There are additional docs describing [contributing documentation changes](./docs
 
 Testcontainers is [in the GitHub Sponsors program](https://github.com/sponsors/testcontainers)!
 
-This repository is supported by our sponsors, meaning that issues are eligible to have a 'bounty' attached to them by sponsors.
+This repository is supported by our sponsors. If you'd like to support the project, please consider sponsoring us via [GitHub Sponsors](https://github.com/sponsors/testcontainers) or [Open Collective](https://opencollective.com/testcontainers).
 
-Please see [the bounty policy page](https://www.testcontainers.org/bounty) if you are interested, either as a sponsor or as a contributor.
+To learn how funds are raised and distributed, see the [Testcontainers project funding policy](https://github.com/testcontainers/.github/blob/main/FUNDING.md). Financial matters are overseen by the Testcontainers Steering Committee, as described in the [project governance document](https://github.com/testcontainers/.github/blob/main/GOVERNANCE.md).
diff --git a/docs/bounty.md b/docs/bounty.md
deleted file mode 100644
index 56ee501062c..00000000000
--- a/docs/bounty.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Testcontainers issue bounty policy
-
-## General
-
-We want to use issue bounties to encourage contributions in areas that are important to our sponsors, or tricky to solve.
-This includes bug fixes and new features.
-We hope that this will provide incentives to tackle issues, and gives sponsors a way to influence where development time is expended.
-We also want to reward our contributors, some of whom make huge efforts to improve Testcontainers and help their fellow developers!
-
-!!! note
-    It's early days for our use of sponsorship, so we expect to evolve this policy over time, possibly without notice. In the event of any ambiguity or dispute, the [Testcontainers org core maintainers](#organisation-core-maintainers) have the final say.
-
-    If you'd like to suggest an improvement to this policy, we'd be grateful for your input - please raise a pull request!
-
-## For Sponsors
-
-Sponsors will be able to create a number of 'bounties' per month, varying according to sponsorship tier.
-
-As a sponsor, the process for creating a bounty is as follows:
-
-* Raise an issue, or find an existing issue that describes the bug or feature.
-* Start a discussion with the [Testcontainers org core maintainers](#organisation-core-maintainers) to agree that the issue is suitable for a bounty, and how much the reward amount should be.
-* Once agreed, we will assign a label to the issue so that interested developers can find it.
-
-Sponsors can create up to 1 or 3 bounties (according to tier) _per calendar month_ - i.e. the counter resets on the 1st of each month. 
-If a sponsor does not use their full quota of bounty credits in a calendar month, they cannot be rolled over to the next month.
-
-Bounties will expire 90 days after creation - after this time, if they have not been resolved we will close them.
-
-## For Contributors
-
-As a contributor, the process for working on an issue with a bounty attached is:
-
-* Find an issue with a bounty attached to it and no assignee, clarify the requirements if necessary, and consider how you would approach working on it.
-* Start a discussion with the [Testcontainers org core maintainers](#organisation-core-maintainers) and the bounty owner. To avoid unpleasant surprises at review time, we'll try to confirm that we're happy with your proposed solution.
-* If we're happy with your proposed solution, we will assign the ticket to you.
-* Once work is complete, we will go through the PR process as usual and merge the work when finished.
-* To receive the bounty reward, [raise an invoice](https://opencollective.com/testcontainers/expenses/new) on Open Collective, following the expenses policy on that page.
-
-Note that a 20% cut of the bounty amount will normally be assigned to project maintainers for PR review work.
-We believe this reflects that PR review can often be a significant amount of work for some issues - and also gives maintainers an incentive to complete the review and unlock the bounty reward!
-Some pull requests are so well done that very little review is necessary. If that happens, the maintainers may choose not to take a cut of the bounty, and instead release the full amount to the contributor.
-
-## Organisation core maintainers
-
-The organisation core maintainers are:
-
-* Richard North (@rnorth)
-* Sergei Egorov (@bsideup)
-* Kevin Wittek (@kiview)
-
diff --git a/mkdocs.yml b/mkdocs.yml
index ad75b0b2f22..ae447212912 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -137,7 +137,6 @@ nav:
     - Contributing:
           - contributing.md
           - contributing_docs.md
-          - bounty.md
 edit_uri: edit/main/docs/
 extra:
     latest_version: 2.0.5

From ca487b3af3a613ff4c875ee5ca061734e2f92442 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2026 12:17:58 +0000
Subject: [PATCH 4917/4969] Bump com.orientechnologies:orientdb-client in
 /modules/orientdb

Bumps [com.orientechnologies:orientdb-client](https://github.com/orientechnologies/orientdb) from 3.2.51 to 3.2.53.
- [Release notes](https://github.com/orientechnologies/orientdb/releases)
- [Changelog](https://github.com/orientechnologies/orientdb/blob/3.2.53/history.txt)
- [Commits](https://github.com/orientechnologies/orientdb/compare/3.2.51...3.2.53)

---
updated-dependencies:
- dependency-name: com.orientechnologies:orientdb-client
  dependency-version: 3.2.53
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/orientdb/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
index 39b15e5a420..6d691b407ce 100644
--- a/modules/orientdb/build.gradle
+++ b/modules/orientdb/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.51"
+    api "com.orientechnologies:orientdb-client:3.2.53"
 
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.8.1'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.51"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.53"
 }

From 14f85658f57e5825f752a0fca73a9ac2a5f421cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2026 12:20:59 +0000
Subject: [PATCH 4918/4969] Bump com.solacesystems:sol-jcsmp in /modules/solace

Bumps [com.solacesystems:sol-jcsmp](https://github.com/SolaceDev/solsuite) from 10.29.1 to 10.30.1.
- [Commits](https://github.com/SolaceDev/solsuite/commits)

---
updated-dependencies:
- dependency-name: com.solacesystems:sol-jcsmp
  dependency-version: 10.30.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solace/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 9172fbe878f..1a6d2ed5a65 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    testImplementation 'com.solacesystems:sol-jcsmp:10.29.1'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.30.1'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'

From 7e188cfcd17309e6e64d8e05951ee2438cd58059 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2026 12:23:38 +0000
Subject: [PATCH 4919/4969] Bump com.oracle.database.jdbc:ojdbc11 in
 /modules/oracle-free

Bumps com.oracle.database.jdbc:ojdbc11 from 23.26.1.0.0 to 23.26.2.0.0.

---
updated-dependencies:
- dependency-name: com.oracle.database.jdbc:ojdbc11
  dependency-version: 23.26.2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/oracle-free/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index bcbf7739123..935fe701f6f 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.1.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.26.2.0.0'
 
     compileOnly 'org.jetbrains:annotations:26.1.0'
 

From 8d55dd42ec358e9b3bb06ad9a70e031572decf86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2026 12:37:03 +0000
Subject: [PATCH 4920/4969] Bump dev.openfga:openfga-sdk from 0.9.7 to 0.9.9 in
 /modules/openfga

Bumps [dev.openfga:openfga-sdk](https://github.com/openfga/java-sdk) from 0.9.7 to 0.9.9.
- [Release notes](https://github.com/openfga/java-sdk/releases)
- [Changelog](https://github.com/openfga/java-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openfga/java-sdk/compare/v0.9.7...v0.9.9)

---
updated-dependencies:
- dependency-name: dev.openfga:openfga-sdk
  dependency-version: 0.9.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/openfga/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openfga/build.gradle b/modules/openfga/build.gradle
index 983c42f2efd..b6bf9ff8e70 100644
--- a/modules/openfga/build.gradle
+++ b/modules/openfga/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: OpenFGA"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'dev.openfga:openfga-sdk:0.9.7'
+    testImplementation 'dev.openfga:openfga-sdk:0.9.9'
 }
 
 test {

From fb3fed43420d854bcbd57a5348d1b11c40642d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <social.mdelapenya@gmail.com>
Date: Wed, 17 Jun 2026 02:09:46 +0200
Subject: [PATCH 4921/4969] Update testcontainers/sshd image from 1.3.0 to
 1.4.0 (#11843)

---
 .../org/testcontainers/containers/PortForwardingContainer.java  | 2 +-
 docs/features/configuration.md                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
index a5f7c29a8b4..dd4b6e94c97 100644
--- a/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java
@@ -24,7 +24,7 @@ public enum PortForwardingContainer {
 
     private static ContainerDef DEFINITION = new ContainerDef() {
         {
-            setImage(DockerImageName.parse("testcontainers/sshd:1.3.0"));
+            setImage(DockerImageName.parse("testcontainers/sshd:1.4.0"));
             addExposedTcpPort(22);
             addEnvVar("PASSWORD", PASSWORD);
         }
diff --git a/docs/features/configuration.md b/docs/features/configuration.md
index c13c0a659e3..389936cb89f 100644
--- a/docs/features/configuration.md
+++ b/docs/features/configuration.md
@@ -52,7 +52,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **tinyimage.container.image = alpine:3.17**  
 > Used to check whether images can be pulled at startup, and always required (unless [startup checks are disabled](#disabling-the-startup-checks))
 
-> **sshd.container.image = testcontainers/sshd:1.1.0**  
+> **sshd.container.image = testcontainers/sshd:1.4.0**  
 > Required if [exposing host ports to containers](./networking.md#exposing-host-ports-to-the-container)
 
 > **vncrecorder.container.image = testcontainers/vnc-recorder:1.3.0**

From deb78e1e6e47675f56e8d7b3f4747093d66f1baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gradle.com>
Date: Mon, 22 Jun 2026 18:56:04 +0200
Subject: [PATCH 4922/4969] Migrate to OSS Community Develocity Instance
 (#11845)

---
 .github/workflows/ci-windows.yml  |  2 +-
 .github/workflows/ci.yml          |  2 +-
 .github/workflows/moby-latest.yml |  2 +-
 README.md                         |  2 +-
 settings.gradle                   | 15 +++++++++------
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 1f4ea75b27f..dbc1e78aa32 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -43,7 +43,7 @@ permissions:
   contents: read
 
 env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
 jobs:
   main:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc128acb50c..a3b19e81823 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ permissions:
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
 jobs:
   core:
diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml
index 91058a25f6a..3c4cc949f11 100644
--- a/.github/workflows/moby-latest.yml
+++ b/.github/workflows/moby-latest.yml
@@ -13,7 +13,7 @@ on:
     - cron:  '59 23 * * *'
 
 env:
-  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
 jobs:
   test_docker:
diff --git a/README.md b/README.md
index 2cd203a0335..26f45f451e1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=33816473&machine=standardLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs)
 
-[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.testcontainers.org/scans)
+[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://community.develocity.cloud/scans?search.rootProjectNames=testcontainers-java)
 
 > Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.
 
diff --git a/settings.gradle b/settings.gradle
index d59d26df2df..374dbbb00dc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,8 +5,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.19.2"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.5.0"
+        classpath "com.gradle:develocity-gradle-plugin:4.4.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:2.6.0"
         classpath "org.gradle.toolchains:foojay-resolver:0.8.0"
     }
 }
@@ -39,19 +39,22 @@ buildCache {
         enabled = !isCI
     }
     remote(develocity.buildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
         enabled = true
+        // Check access key presence to avoid build cache errors on PR builds when access key is not present
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY") != null
     }
 }
 
 develocity {
+    server = "https://community.develocity.cloud"
+    projectId = "testcontainers"
     buildScan {
-        server = "https://ge.testcontainers.org/"
         publishing.onlyIf {
             it.authenticated
         }
         uploadInBackground = !isCI
-        capture.fileFingerprints = true
+        obfuscation {
+            ipAddresses { it.collect { "0.0.0.0" } }
+        }
     }
-
 }

From a7981f138841c62294300a548d29aed6797f6ec9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:06 +0000
Subject: [PATCH 4923/4969] Bump org.postgresql:postgresql in
 /modules/postgresql

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.10 to 42.7.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.10...REL42.7.12)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 14faa32c728..db7382f34d3 100644
--- a/modules/postgresql/build.gradle
+++ b/modules/postgresql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.12'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

From 226b760bc660774966a2d2c501078c312874f6c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:12 +0000
Subject: [PATCH 4924/4969] Bump software.amazon.awssdk:bom in
 /modules/localstack

Bumps software.amazon.awssdk:bom from 2.42.33 to 2.46.20.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-version: 2.46.20
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 3af7b5cee55..eca4aeaa27a 100644
--- a/modules/localstack/build.gradle
+++ b/modules/localstack/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("software.amazon.awssdk:bom:2.42.33")
+    testImplementation platform("software.amazon.awssdk:bom:2.46.20")
     testImplementation 'software.amazon.awssdk:s3'
     testImplementation 'software.amazon.awssdk:sqs'
     testImplementation 'software.amazon.awssdk:cloudwatchlogs'

From 922fe06a7732451767674e84995e3cc13cd32dab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:12 +0000
Subject: [PATCH 4925/4969] Bump org.postgresql:postgresql in
 /modules/junit-jupiter

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.10 to 42.7.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.10...REL42.7.12)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7f4d55e9bd3..d42096ad54f 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -14,6 +14,6 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.12'
     testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
 }

From 106842608ecabb931f37ee69d2f51bf6c9124529 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:14 +0000
Subject: [PATCH 4926/4969] Bump org.apache.kafka:kafka-clients in
 /modules/kafka

Bumps org.apache.kafka:kafka-clients from 3.8.0 to 4.3.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/kafka/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
index 4e89be9a32e..aabad9553b0 100644
--- a/modules/kafka/build.gradle
+++ b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
+    testImplementation 'org.apache.kafka:kafka-clients:4.3.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From 538b9d6855b56af229faa43001573f15ae22941b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:15 +0000
Subject: [PATCH 4927/4969] Bump org.mariadb.jdbc:mariadb-java-client in
 /modules/mariadb

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.5.8 to 3.5.9.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.5.8...3.5.9)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-version: 3.5.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 fd8569f6c36..10086b4e058 100644
--- a/modules/mariadb/build.gradle
+++ b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.8'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.9'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

From 647439f1330553145d1d452033ed21bceb8aca2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:21 +0000
Subject: [PATCH 4928/4969] Bump redis.clients:jedis from 7.4.1 to 7.5.3 in
 /modules/junit-jupiter

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 7.4.1 to 7.5.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v7.4.1...v7.5.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 7.5.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 7f4d55e9bd3..efa731c1cb8 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
-    testImplementation 'redis.clients:jedis:7.4.1'
+    testImplementation 'redis.clients:jedis:7.5.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

From f369d44581b0f3bccef2a301b550ec03da79cb6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:23 +0000
Subject: [PATCH 4929/4969] Bump org.apache.tomcat:tomcat-jdbc in
 /modules/jdbc-test

Bumps org.apache.tomcat:tomcat-jdbc from 11.0.21 to 11.0.23.

---
updated-dependencies:
- dependency-name: org.apache.tomcat:tomcat-jdbc
  dependency-version: 11.0.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 cbf94737eed..44fe705a255 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api 'org.assertj:assertj-core:3.27.7'
 
-    api 'org.apache.tomcat:tomcat-jdbc:11.0.21'
+    api 'org.apache.tomcat:tomcat-jdbc:11.0.23'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'com.mysql:mysql-connector-j:9.6.0'
     api 'org.junit.jupiter:junit-jupiter:5.14.3'

From efa5ea2ff9f9f976f952fff43564b788ae6775fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:26 +0000
Subject: [PATCH 4930/4969] Bump
 org.elasticsearch.client:elasticsearch-rest-client

Bumps [org.elasticsearch.client:elasticsearch-rest-client](https://github.com/elastic/elasticsearch) from 9.3.3 to 9.4.3.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/docs/changelog.yml)
- [Commits](https://github.com/elastic/elasticsearch/compare/v9.3.3...v9.4.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-version: 9.4.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/elasticsearch/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 114a07ffe85..7f57916e991 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.3.3"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.4.3"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
 }

From 232db0d97a148c8eaf08e1695cda3e6c53253373 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:31 +0000
Subject: [PATCH 4931/4969] Bump redis.clients:jedis from 7.4.1 to 7.5.3 in
 /modules/toxiproxy

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 7.4.1 to 7.5.3.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](https://github.com/redis/jedis/compare/v7.4.1...v7.5.3)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-version: 7.5.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/toxiproxy/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
index 205147293fd..3e3a63a1fca 100644
--- a/modules/toxiproxy/build.gradle
+++ b/modules/toxiproxy/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
     api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.11'
 
-    testImplementation 'redis.clients:jedis:7.4.1'
+    testImplementation 'redis.clients:jedis:7.5.3'
 }

From c3442a67d235d22ebfdf0ae8be97dc4e7c5dd16c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:33 +0000
Subject: [PATCH 4932/4969] Bump org.postgresql:postgresql from 42.7.10 to
 42.7.12 in /modules/spock

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.10 to 42.7.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.10...REL42.7.12)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 acea4c64eeb..bd378b4c4c9 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.12'
     testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
     testRuntimeOnly platform('org.junit:junit-bom:5.14.3')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

From 4deee263885ae8db3278985a4fb1758540c43eab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:33 +0000
Subject: [PATCH 4933/4969] Bump io.r2dbc:r2dbc-mssql in /modules/mssqlserver

Bumps [io.r2dbc:r2dbc-mssql](https://github.com/r2dbc/r2dbc-mssql) from 1.0.4.RELEASE to 1.0.5.RELEASE.
- [Release notes](https://github.com/r2dbc/r2dbc-mssql/releases)
- [Changelog](https://github.com/r2dbc/r2dbc-mssql/blob/main/CHANGELOG)
- [Commits](https://github.com/r2dbc/r2dbc-mssql/compare/v1.0.4.RELEASE...v1.0.5.RELEASE)

---
updated-dependencies:
- dependency-name: io.r2dbc:r2dbc-mssql
  dependency-version: 1.0.5.RELEASE
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/mssqlserver/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
index a03534cf147..cb3e7a5b55e 100644
--- a/modules/mssqlserver/build.gradle
+++ b/modules/mssqlserver/build.gradle
@@ -4,13 +4,13 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.4.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:1.0.5.RELEASE'
 
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.4.0.jre11'
 
     testImplementation project(':testcontainers-r2dbc')
-    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.4.RELEASE'
+    testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.5.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':testcontainers-r2dbc'))

From c9977230f831b7c043adf9b318ce709bda231191 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:35 +0000
Subject: [PATCH 4934/4969] Bump com.zaxxer:HikariCP from 7.0.2 to 7.1.0 in
 /modules/spock

Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 7.0.2 to 7.1.0.
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-7.0.2...HikariCP-7.1.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 acea4c64eeb..91f35bca959 100644
--- a/modules/spock/build.gradle
+++ b/modules/spock/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
 
-    testImplementation 'com.zaxxer:HikariCP:7.0.2'
+    testImplementation 'com.zaxxer:HikariCP:7.1.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.10'

From 0150976437c66be5369dc444f5b074d50f565d2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:37 +0000
Subject: [PATCH 4935/4969] Bump com.squareup.okhttp3:okhttp from 5.3.2 to
 5.4.0 in /modules/azure

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 5.3.2 to 5.4.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-5.3.2...parent-5.4.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/azure/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
index faabca60be9..167c0c26f1a 100644
--- a/modules/azure/build.gradle
+++ b/modules/azure/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-mssqlserver')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
+    shaded 'com.squareup.okhttp3:okhttp:5.4.0'
 
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
     testImplementation 'com.azure:azure-cosmos'

From 42eb0ebc2065843888da59bc09e0d6aec8687e2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:22:39 +0000
Subject: [PATCH 4936/4969] Bump com.google.cloud:libraries-bom in
 /modules/gcloud

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.79.0 to 26.84.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.79.0...v26.84.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.84.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/gcloud/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 08fb09887dd..3a020bdb759 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.79.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.84.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'

From 3d41f9807d66565660a62c1ee9a3f82ca53bd99e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:44:03 +0000
Subject: [PATCH 4937/4969] Bump io.projectreactor:reactor-core in
 /modules/r2dbc

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.8.4 to 3.8.6.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.8.4...v3.8.6)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-version: 3.8.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/r2dbc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
index afad9a553ef..9c93885fd6f 100644
--- a/modules/r2dbc/build.gradle
+++ b/modules/r2dbc/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':testcontainers-postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.8.4'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.8.6'
     testFixturesImplementation 'org.assertj:assertj-core:3.27.7'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter:5.14.3'
 }

From 039ee532d6701b7a398cff664355d1f2bb3a8f2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:45:45 +0000
Subject: [PATCH 4938/4969] Bump com.ibm.db2:jcc from 12.1.4.0 to 12.1.5.0 in
 /modules/db2

Bumps com.ibm.db2:jcc from 12.1.4.0 to 12.1.5.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-version: 12.1.5.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/db2/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 5546fdb6c65..afae0bfd751 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.ibm.db2:jcc:12.1.4.0'
+    testRuntimeOnly 'com.ibm.db2:jcc:12.1.5.0'
 }

From 4e64025cd8b80ac40d277f9389cb1875ec375cbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:46:09 +0000
Subject: [PATCH 4939/4969] Bump com.squareup.okhttp3:okhttp from 5.3.2 to
 5.4.0 in /modules/solr

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 5.3.2 to 5.4.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-5.3.2...parent-5.4.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/solr/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
index ca44d695421..509bce7c66f 100644
--- a/modules/solr/build.gradle
+++ b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
+    shaded 'com.squareup.okhttp3:okhttp:5.4.0'
 
     testImplementation 'org.apache.solr:solr-solrj:8.11.4'
 }

From ac2d4f0a78cbff6b8dfde02d7e990c0dee6ae9ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:47:36 +0000
Subject: [PATCH 4940/4969] Bump io.fabric8:kubernetes-client from 7.6.1 to
 7.8.0 in /modules/k3s

Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 7.6.1 to 7.8.0.
- [Release notes](https://github.com/fabric8io/kubernetes-client/releases)
- [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fabric8io/kubernetes-client/compare/v7.6.1...v7.8.0)

---
updated-dependencies:
- dependency-name: io.fabric8:kubernetes-client
  dependency-version: 7.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/k3s/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
index 645dfd8e68d..0a8d628b469 100644
--- a/modules/k3s/build.gradle
+++ b/modules/k3s/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     // Synchronize with the jackson version, must match major and minor version
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'
 
-    testImplementation 'io.fabric8:kubernetes-client:7.6.1'
+    testImplementation 'io.fabric8:kubernetes-client:7.8.0'
     testImplementation 'io.kubernetes:client-java:25.0.0-legacy'
 }

From 911b4d43a9882fbfa5aa15296c5c954f4de145cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:47:45 +0000
Subject: [PATCH 4941/4969] Bump com.rabbitmq:amqp-client from 5.29.0 to 5.33.0
 in /modules/rabbitmq

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.29.0 to 5.33.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.29.0...v5.33.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-version: 5.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/rabbitmq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
index 441ff2ddb22..1b9cd99168b 100644
--- a/modules/rabbitmq/build.gradle
+++ b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
 
-    testImplementation 'com.rabbitmq:amqp-client:5.29.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.33.0'
     compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From d497ded698321a45f41bd744f403f77d4ce9fa7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:48:04 +0000
Subject: [PATCH 4942/4969] Bump org.apache.kafka:kafka-clients in
 /modules/redpanda

Bumps org.apache.kafka:kafka-clients from 4.2.0 to 4.3.1.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/redpanda/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
index dc544fd394b..40c88ea347e 100644
--- a/modules/redpanda/build.gradle
+++ b/modules/redpanda/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     shaded 'org.freemarker:freemarker:2.3.34'
 
-    testImplementation 'org.apache.kafka:kafka-clients:4.2.0'
+    testImplementation 'org.apache.kafka:kafka-clients:4.3.1'
     testImplementation 'io.rest-assured:rest-assured:5.5.7'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }

From e1b5ff02f9ea7210d8ddf79f4f0a347bb57c8640 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:48:06 +0000
Subject: [PATCH 4943/4969] Bump org.javassist:javassist in /modules/hivemq

Bumps [org.javassist:javassist](https://github.com/jboss-javassist/javassist) from 3.30.2-GA to 3.32.0-GA.
- [Release notes](https://github.com/jboss-javassist/javassist/releases)
- [Changelog](https://github.com/jboss-javassist/javassist/blob/master/Changes.md)
- [Commits](https://github.com/jboss-javassist/javassist/commits)

---
updated-dependencies:
- dependency-name: org.javassist:javassist
  dependency-version: 3.32.0-GA
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 6750c495421..ec67188ba44 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     shaded("org.apache.commons:commons-lang3:3.20.0")
     shaded("commons-io:commons-io:2.21.0")
-    shaded("org.javassist:javassist:3.30.2-GA")
+    shaded("org.javassist:javassist:3.32.0-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.6")

From b81a28aecac928e3d01ff6e47a18cd5ec710e414 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:48:10 +0000
Subject: [PATCH 4944/4969] Bump ch.qos.logback:logback-classic in
 /modules/hivemq

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.32 to 1.5.37.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.32...v_1.5.37)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.37
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 6750c495421..52006afb0c3 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.50.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.13")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.5.32")
+    testImplementation("ch.qos.logback:logback-classic:1.5.37")
 }
 
 test {

From bd1ec01824dd1914af664b17b1c8e53464efed06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:48:17 +0000
Subject: [PATCH 4945/4969] Bump com.hivemq:hivemq-mqtt-client in
 /modules/hivemq

Bumps [com.hivemq:hivemq-mqtt-client](https://github.com/hivemq/hivemq-mqtt-client) from 1.3.13 to 1.3.15.
- [Release notes](https://github.com/hivemq/hivemq-mqtt-client/releases)
- [Changelog](https://github.com/hivemq/hivemq-mqtt-client/blob/master/RELEASE.md)
- [Commits](https://github.com/hivemq/hivemq-mqtt-client/compare/v1.3.13...v1.3.15)

---
updated-dependencies:
- dependency-name: com.hivemq:hivemq-mqtt-client
  dependency-version: 1.3.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/hivemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 6750c495421..f8e820f14d9 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testImplementation(project(":testcontainers-junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.50.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.13")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.15")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.5.32")
 }

From 473942d350079dcf6b76cf308c37d78524659cc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:48:46 +0000
Subject: [PATCH 4946/4969] Bump org.postgresql:postgresql in /modules/questdb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.10 to 42.7.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.10...REL42.7.12)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/questdb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
index 5e9da5686d8..04b714ff783 100644
--- a/modules/questdb/build.gradle
+++ b/modules/questdb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.12'
 
     testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.questdb:questdb:9.2.2'

From ca2574ed8ea58fd8a92195965856ba30595e22cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:48:58 +0000
Subject: [PATCH 4947/4969] Bump org.postgresql:postgresql in /modules/cratedb

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.10 to 42.7.12.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.10...REL42.7.12)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/cratedb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 7b6a3468e03..62405d559b2 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: JDBC :: CrateDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.7.10'
+    testRuntimeOnly 'org.postgresql:postgresql:42.7.12'
 
     testImplementation project(':testcontainers-jdbc-test')
 

From 8af83431709d5eb76551c5735d94d58be1eaa391 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:49:21 +0000
Subject: [PATCH 4948/4969] Bump io.minio:minio from 9.0.0 to 9.0.3 in
 /modules/minio

Bumps [io.minio:minio](https://github.com/minio/minio-java) from 9.0.0 to 9.0.3.
- [Release notes](https://github.com/minio/minio-java/releases)
- [Commits](https://github.com/minio/minio-java/compare/9.0.0...9.0.3)

---
updated-dependencies:
- dependency-name: io.minio:minio
  dependency-version: 9.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/minio/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/minio/build.gradle b/modules/minio/build.gradle
index bca68abc4d6..ce592fced2d 100644
--- a/modules/minio/build.gradle
+++ b/modules/minio/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MinIO"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("io.minio:minio:9.0.0")
+    testImplementation("io.minio:minio:9.0.3")
 }

From 22a6778a1ea12e03ef2037e6d35cc23a599c4619 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:50:38 +0000
Subject: [PATCH 4949/4969] Bump org.apache.activemq:artemis-jakarta-client in
 /modules/activemq

Bumps org.apache.activemq:artemis-jakarta-client from 2.53.0 to 2.55.0.

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-version: 2.55.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/activemq/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
index d88c0053379..c77b386698f 100644
--- a/modules/activemq/build.gradle
+++ b/modules/activemq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation "org.apache.activemq:activemq-client:6.2.4"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.53.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.55.0"
 }

From 5022d0095fbd977c374ec7cd546ce6caaaedf38f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:51:46 +0000
Subject: [PATCH 4950/4969] Bump io.weaviate:client6 from 6.1.0 to 6.3.0 in
 /modules/weaviate

Bumps [io.weaviate:client6](https://github.com/weaviate/java-client) from 6.1.0 to 6.3.0.
- [Release notes](https://github.com/weaviate/java-client/releases)
- [Commits](https://github.com/weaviate/java-client/compare/6.1.0...6.3.0)

---
updated-dependencies:
- dependency-name: io.weaviate:client6
  dependency-version: 6.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/weaviate/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/weaviate/build.gradle b/modules/weaviate/build.gradle
index 5392b585b71..404329b161f 100644
--- a/modules/weaviate/build.gradle
+++ b/modules/weaviate/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Weaviate"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'io.weaviate:client6:6.1.0'
+    testImplementation 'io.weaviate:client6:6.3.0'
 }
 
 test {

From 325a51286706eea0aef9c527516d6db020fabe97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:53:49 +0000
Subject: [PATCH 4951/4969] Bump io.micrometer:micrometer-registry-otlp in
 /modules/grafana

Bumps [io.micrometer:micrometer-registry-otlp](https://github.com/micrometer-metrics/micrometer) from 1.16.5 to 1.17.0.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.16.5...v1.17.0)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-otlp
  dependency-version: 1.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index c6ee3eaa010..2a00b28ee33 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'io.rest-assured:rest-assured:5.5.7'
-    testImplementation 'io.micrometer:micrometer-registry-otlp:1.16.5'
+    testImplementation 'io.micrometer:micrometer-registry-otlp:1.17.0'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
     testImplementation platform('io.opentelemetry:opentelemetry-bom:1.61.0')

From f629137a9cc22fd6a9b6fd3c54f9b8491223d9eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:59:46 +0000
Subject: [PATCH 4952/4969] Bump software.amazon.awssdk:dynamodb in
 /modules/scylladb

Bumps software.amazon.awssdk:dynamodb from 2.42.34 to 2.46.20.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-version: 2.46.20
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/scylladb/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
index c3fe0927d6a..480d1958609 100644
--- a/modules/scylladb/build.gradle
+++ b/modules/scylladb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.8'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.42.34'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.46.20'
 }

From 2ab2c1619ecfea9c26e47144f5712dfee8f4e69d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 23:00:21 +0000
Subject: [PATCH 4953/4969] Bump com.unboundid:unboundid-ldapsdk in
 /modules/ldap

Bumps [com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) from 7.0.4 to 7.0.5.
- [Release notes](https://github.com/pingidentity/ldapsdk/releases)
- [Changelog](https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html)
- [Commits](https://github.com/pingidentity/ldapsdk/compare/7.0.4...7.0.5)

---
updated-dependencies:
- dependency-name: com.unboundid:unboundid-ldapsdk
  dependency-version: 7.0.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/ldap/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ldap/build.gradle b/modules/ldap/build.gradle
index d357bb9996c..7e79be920c8 100644
--- a/modules/ldap/build.gradle
+++ b/modules/ldap/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: LDAP"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.4'
+    testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.5'
 }

From 8ef856798a44854628d6e54e41205ea96d87cf8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2026 22:22:21 +0000
Subject: [PATCH 4954/4969] bump com.google.cloud.tools:jib-core from 0.28.1 to
 0.28.2 in /core

Bumps [com.google.cloud.tools:jib-core](https://github.com/GoogleContainerTools/jib) from 0.28.1 to 0.28.2.
- [Release notes](https://github.com/GoogleContainerTools/jib/releases)
- [Commits](https://github.com/GoogleContainerTools/jib/commits)

---
updated-dependencies:
- dependency-name: com.google.cloud.tools:jib-core
  dependency-version: 0.28.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 66f9fe7dcc0..d7e496f8d4a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -70,7 +70,7 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    provided('com.google.cloud.tools:jib-core:0.28.1') {
+    provided('com.google.cloud.tools:jib-core:0.28.2') {
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
@@ -101,7 +101,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    testImplementation('com.google.cloud.tools:jib-core:0.28.1')  {
+    testImplementation('com.google.cloud.tools:jib-core:0.28.2')  {
         exclude group: 'com.google.guava', module: 'guava'
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'

From e1956662651183c11245526ec5065355be08d6d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2026 22:22:26 +0000
Subject: [PATCH 4955/4969] bump org.zeroturnaround:zt-exec from 1.12 to 1.13.0
 in /core

Bumps [org.zeroturnaround:zt-exec](https://github.com/zeroturnaround/zt-exec) from 1.12 to 1.13.0.
- [Release notes](https://github.com/zeroturnaround/zt-exec/releases)
- [Changelog](https://github.com/zeroturnaround/zt-exec/blob/main/CHANGELOG.md)
- [Commits](https://github.com/zeroturnaround/zt-exec/compare/zt-exec-1.12...v1.13.0)

---
updated-dependencies:
- dependency-name: org.zeroturnaround:zt-exec
  dependency-version: 1.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 66f9fe7dcc0..00d227869ff 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -96,7 +96,7 @@ dependencies {
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
-    shaded 'org.zeroturnaround:zt-exec:1.12'
+    shaded 'org.zeroturnaround:zt-exec:1.13.0'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
 

From 2ac3c9773ca52381266463c3709c37155e190b68 Mon Sep 17 00:00:00 2001
From: "Alex \"Blex\" B" <45384811+AB-xdev@users.noreply.github.com>
Date: Fri, 17 Jul 2026 08:49:53 +0200
Subject: [PATCH 4956/4969] Call `getLogs` only once and re-use existing
 variable (#11927)

---
 .../java/org/testcontainers/containers/GenericContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
index fa5711807e7..4d3778c63d1 100644
--- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -541,7 +541,7 @@ private void tryStart() {
                 final String containerLogs = getLogs();
 
                 if (containerLogs.length() > 0) {
-                    logger().error("Log output from the failed container:\n{}", getLogs());
+                    logger().error("Log output from the failed container:\n{}", containerLogs);
                 } else {
                     logger().error("There are no stdout/stderr logs available for the failed container");
                 }

From 944454cd054e6ed004395e0b07f294ff8dbb9ca9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jul 2026 22:24:01 +0000
Subject: [PATCH 4957/4969] Bump release-drafter/release-drafter in
 /.github/workflows

Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 6.1.0 to 7.6.0.
- [Release notes](https://github.com/release-drafter/release-drafter/releases)
- [Commits](https://github.com/release-drafter/release-drafter/compare/b1476f6e6eb133afa41ed8589daba6dc69b4d3f5...eada3c96a64734dd381cfbda23511034e328ddb0)

---
updated-dependencies:
- dependency-name: release-drafter/release-drafter
  dependency-version: 7.6.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index d57159f44ca..727bcc94c01 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v5.19.0
+      - uses: release-drafter/release-drafter@eada3c96a64734dd381cfbda23511034e328ddb0 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 3a621f5cc964668fe0bdfda3fff33d23b23c25c6 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Sat, 15 Aug 2026 21:31:12 +0300
Subject: [PATCH 4958/4969] Remove duplicated word in HttpWaitStrategyTest
 Javadoc (#11971)

---
 .../junit/wait/strategy/HttpWaitStrategyTest.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
index 89a12ec3aea..eb9169fd1ac 100644
--- a/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
+++ b/core/src/test/java/org/testcontainers/junit/wait/strategy/HttpWaitStrategyTest.java
@@ -109,7 +109,7 @@ void testWaitUntilReadyWithManyStatusCodes() {
 
     /**
      * Expects that the WaitStrategy returns successfully after receiving an HTTP 401 response from the container.
-     * This 401 response is checked with with many status codes using {@link HttpWaitStrategy#forStatusCode(int)}
+     * This 401 response is checked with many status codes using {@link HttpWaitStrategy#forStatusCode(int)}
      * and a lambda using {@link HttpWaitStrategy#forStatusCodeMatching(Predicate)}
      */
     @Test

From ed2c487edeb94a042d86f0d54f86324a0f78eda3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Kalayc=C4=B1?= <kalayciburak1996@gmail.com>
Date: Sun, 23 Aug 2026 15:26:45 +0300
Subject: [PATCH 4959/4969] Allow extra Azurite command line options (#11970)

AzuriteContainer.configure() rebuilds the process command, so
withCommand() cannot add flags. Expose withCommandOptions() like
K6Container.withCmdOptions() so users can pass --skipApiVersionCheck
and other Azurite flags.

Fixes #11966

Signed-off-by: Burak KALAYCI <kalayciburak1996@gmail.com>
---
 docs/modules/azure.md                         |  6 ++
 .../azure/AzuriteContainer.java               | 23 +++++++
 .../azure/AzuriteContainerCommandTest.java    | 62 +++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerCommandTest.java

diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 1b3242551c1..461fcc9f679 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -27,6 +27,12 @@ Start Azurite Emulator during a test:
 !!! note
     SSL configuration is possible using the `withSsl(MountableFile, String)` and  `withSsl(MountableFile, MountableFile)` methods.
 
+Newer Azure Storage SDK versions can send API versions that Azurite does not support. Use `withCommandOptions(...)` to append extra Azurite flags such as `--skipApiVersionCheck`. `AzuriteContainer` rebuilds its process command in `configure()`, so `.withCommand(...)` cannot be used for extra flags.
+
+<!--codeinclude-->
+[Pass extra Azurite command options](../../modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerCommandTest.java) inside_block:commandOptions
+<!--/codeinclude-->
+
 If the tested application needs to use more than one set of credentials, the container can be configured to use custom credentials.
 Please see some examples below.
 
diff --git a/modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java
index 56c58df1f1d..11e34237740 100644
--- a/modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/azure/AzuriteContainer.java
@@ -4,6 +4,10 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Testcontainers implementation for Azurite Emulator.
  * <p>
@@ -52,6 +56,8 @@ public class AzuriteContainer extends GenericContainer<AzuriteContainer> {
 
     private String pwd = null;
 
+    private final List<String> commandOptions = new ArrayList<>();
+
     /**
      * @param dockerImageName specified docker image name to run
      */
@@ -96,6 +102,20 @@ public AzuriteContainer withSsl(final MountableFile pemCert, final MountableFile
         return this;
     }
 
+    /**
+     * Append extra Azurite command line flags after the default host and SSL arguments.
+     * <p>
+     * {@link #withCommand(String...)} cannot be used for this: {@link #configure()} always
+     * rebuilds the process command and overwrites any previously set command.
+     *
+     * @param options additional Azurite flags, for example {@code --skipApiVersionCheck}
+     * @return this
+     */
+    public AzuriteContainer withCommandOptions(String... options) {
+        this.commandOptions.addAll(Arrays.asList(options));
+        return this;
+    }
+
     @Override
     protected void configure() {
         withCommand(getCommandLine());
@@ -160,6 +180,9 @@ String getCommandLine() {
                 args.append(" --key ").append("/key.pem");
             }
         }
+        for (String option : this.commandOptions) {
+            args.append(" ").append(option);
+        }
         final String cmd = args.toString();
         logger().debug("Using command line: '{}'", cmd);
         return cmd;
diff --git a/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerCommandTest.java b/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerCommandTest.java
new file mode 100644
index 00000000000..c12e77ed69a
--- /dev/null
+++ b/modules/azure/src/test/java/org/testcontainers/azure/AzuriteContainerCommandTest.java
@@ -0,0 +1,62 @@
+package org.testcontainers.azure;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.utility.MountableFile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class AzuriteContainerCommandTest {
+
+    private static final String IMAGE = "mcr.microsoft.com/azure-storage/azurite:3.33.0";
+
+    @Test
+    void commandLineOmitsExtraOptionsByDefault() {
+        AzuriteContainer emulator = new AzuriteContainer(IMAGE);
+
+        assertThat(emulator.getCommandLine()).doesNotContain("--skipApiVersionCheck");
+    }
+
+    @Test
+    void commandLineIncludesExtraOptions() {
+        // commandOptions {
+        AzuriteContainer emulator = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+            .withCommandOptions("--skipApiVersionCheck");
+        // }
+
+        assertThat(emulator.getCommandLine())
+            .startsWith("azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0")
+            .endsWith("--skipApiVersionCheck");
+    }
+
+    @Test
+    void commandLineAppendsMultipleOptions() {
+        AzuriteContainer emulator = new AzuriteContainer(IMAGE)
+            .withCommandOptions("--skipApiVersionCheck", "--disableProductStyleUrl");
+
+        assertThat(emulator.getCommandLine()).endsWith("--skipApiVersionCheck --disableProductStyleUrl");
+    }
+
+    @Test
+    void commandLineKeepsExtraOptionsTogetherWithSsl() {
+        AzuriteContainer emulator = new AzuriteContainer(IMAGE)
+            .withSsl(MountableFile.forClasspathResource("/keystore.pfx"), "changeit")
+            .withCommandOptions("--skipApiVersionCheck");
+
+        assertThat(emulator.getCommandLine())
+            .contains("--cert /cert.pfx")
+            .endsWith("--pwd changeit --skipApiVersionCheck");
+    }
+
+    @Test
+    void configureAppliesCommandOptionsEvenIfWithCommandWasUsed() {
+        AzuriteContainer emulator = new AzuriteContainer(IMAGE)
+            .withCommand("azurite --ignored")
+            .withCommandOptions("--skipApiVersionCheck");
+
+        emulator.configure();
+
+        assertThat(String.join(" ", emulator.getCommandParts()))
+            .isEqualTo("azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --skipApiVersionCheck");
+        assertThat(emulator.getCommandLine()).contains("--blobHost 0.0.0.0").contains("--skipApiVersionCheck");
+    }
+}

From c49980f5a6719b263e25eb7f4f75733a0975f2d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 20:12:31 +0000
Subject: [PATCH 4960/4969] Bump actions/labeler from 6 to 7 in
 /.github/workflows

Bumps [actions/labeler](https://github.com/actions/labeler) from 6 to 7.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 178ba299670..336f0c7e650 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -9,6 +9,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v6
+    - uses: actions/labeler@v7
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

From 4cd29d7db5853b9bc3364288a92745062b2532c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 20:12:36 +0000
Subject: [PATCH 4961/4969] Bump com.rabbitmq:amqp-client from 5.26.0 to 5.35.0
 in /core

Bumps [com.rabbitmq:amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.26.0 to 5.35.0.
- [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases)
- [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.26.0...v5.35.0)

---
updated-dependencies:
- dependency-name: com.rabbitmq:amqp-client
  dependency-version: 5.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 66f9fe7dcc0..201b579e278 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -106,7 +106,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:7.4.1'
-    testImplementation 'com.rabbitmq:amqp-client:5.26.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.35.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {

From 0f6fa9fd3a92253de03b37deff9d858b7611cb32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 20:12:39 +0000
Subject: [PATCH 4962/4969] Bump io.trino:trino-jdbc from 480 to 483 in
 /modules/trino

Bumps io.trino:trino-jdbc from 480 to 483.

---
updated-dependencies:
- dependency-name: io.trino:trino-jdbc
  dependency-version: '482'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/trino/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
index e6a9b32e85b..12d3d05f56b 100644
--- a/modules/trino/build.gradle
+++ b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:480'
+    testRuntimeOnly 'io.trino:trino-jdbc:483'
     compileOnly 'org.jetbrains:annotations:26.1.0'
 }

From 6c8350b9c34853b4dbaaa727258a29185702f4bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 20:12:41 +0000
Subject: [PATCH 4963/4969] Bump com.squareup.okhttp3:okhttp in
 /modules/couchbase

Bumps [com.squareup.okhttp3:okhttp](https://github.com/lysine-dev/okhttp) from 5.3.2 to 5.5.0.
- [Changelog](https://github.com/lysine-dev/okhttp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lysine-dev/okhttp/compare/parent-5.3.2...parent-5.5.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/couchbase/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 707a559290a..068e334e2f1 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
+    shaded 'com.squareup.okhttp3:okhttp:5.5.0'
 
     testImplementation 'com.couchbase.client:java-client:3.11.2'
     testImplementation 'org.awaitility:awaitility:4.3.0'

From fd1ddc6f54bb36947756458c1e3d46a56fb47bc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 20:12:45 +0000
Subject: [PATCH 4964/4969] Bump io.opentelemetry:opentelemetry-bom in
 /modules/grafana

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.61.0 to 1.65.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.61.0...v1.65.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-version: 1.63.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/grafana/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
index c6ee3eaa010..ea3cad72193 100644
--- a/modules/grafana/build.gradle
+++ b/modules/grafana/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.16.5'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
 
-    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.61.0')
+    testImplementation platform('io.opentelemetry:opentelemetry-bom:1.65.0')
     testImplementation 'io.opentelemetry:opentelemetry-api'
     testImplementation 'io.opentelemetry:opentelemetry-sdk'
     testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'

From 2f4475a2ca5282de343bfeb30abaf3b6c05058b8 Mon Sep 17 00:00:00 2001
From: Konstantinos Gkilas <gkilaskonstantinos@gmail.com>
Date: Wed, 26 Aug 2026 12:58:51 +0300
Subject: [PATCH 4965/4969] Fix DockerImageName compatibility check when digest
 is present (#11629)

Parse tagged digest references without folding the tag into the
repository name. Preserve the tag for version checks and canonical names
while exposing the digest separately and using it for image pulls.

Validate stored tags and include them in equality. Reject malformed tags
and keep differently tagged references distinct.

Fixes #10527

Co-authored-by: Kevin Wittek <kevin@wittek.dev>
---
 .../images/RemoteDockerImage.java             |  3 +-
 .../utility/DockerImageName.java              | 37 +++++++++-
 .../testcontainers/utility/Versioning.java    | 14 ++++
 .../DockerImageNameCompatibilityTest.java     | 29 ++++++++
 .../utility/DockerImageNameTest.java          | 71 +++++++++++++++++++
 5 files changed, 150 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
index 9d669e46b07..fdd7279f86b 100644
--- a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
+++ b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -89,9 +89,10 @@ protected final String resolve() {
             final Instant startedAt = Instant.now();
             final Instant lastRetryAllowed = Instant.now().plus(PULL_RETRY_TIME_LIMIT);
             final AtomicReference<Exception> lastFailure = new AtomicReference<>();
+            String pullTag = imageName.getDigest() != null ? imageName.getDigest() : imageName.getVersionPart();
             final PullImageCmd pullImageCmd = dockerClient
                 .pullImageCmd(imageName.getUnversionedPart())
-                .withTag(imageName.getVersionPart());
+                .withTag(pullTag);
             final AtomicReference<String> dockerImageName = new AtomicReference<>();
 
             // The following poll interval in ms: 50, 100, 200, 400, 800....
diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
index e3a35855bf8..b3babc29c91 100644
--- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java
+++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java
@@ -87,8 +87,15 @@ public DockerImageName(String fullImageName) {
         }
 
         if (remoteName.contains("@sha256:")) {
-            repository = remoteName.split("@sha256:")[0];
-            versioning = new Sha256Versioning(remoteName.split("@sha256:")[1]);
+            String beforeDigest = remoteName.split("@sha256:")[0];
+            if (beforeDigest.contains(":")) {
+                repository = beforeDigest.split(":")[0];
+                String tag = beforeDigest.split(":", 2)[1];
+                versioning = new Sha256Versioning(remoteName.split("@sha256:")[1], tag);
+            } else {
+                repository = beforeDigest;
+                versioning = new Sha256Versioning(remoteName.split("@sha256:")[1]);
+            }
         } else if (remoteName.contains(":")) {
             repository = remoteName.split(":")[0];
             versioning = new TagVersioning(remoteName.split(":")[1]);
@@ -155,16 +162,40 @@ public String getUnversionedPart() {
     }
 
     /**
-     * @return the versioned part of this name (tag or sha256)
+     * @return the versioned part of this name (tag or sha256). When both tag and digest are present,
+     *         the tag is returned.
      */
     public String getVersionPart() {
+        if (versioning instanceof Sha256Versioning) {
+            String tag = ((Sha256Versioning) versioning).getTag();
+            if (tag != null) {
+                return tag;
+            }
+        }
         return versioning.toString();
     }
 
+    /**
+     * @return the sha256 digest if present, or null
+     */
+    @Nullable
+    public String getDigest() {
+        if (versioning instanceof Sha256Versioning) {
+            return versioning.toString();
+        }
+        return null;
+    }
+
     /**
      * @return canonical name for the image
      */
     public String asCanonicalNameString() {
+        if (versioning instanceof Sha256Versioning) {
+            String tag = ((Sha256Versioning) versioning).getTag();
+            if (tag != null) {
+                return getUnversionedPart() + ":" + tag + "@" + versioning;
+            }
+        }
         return getUnversionedPart() + versioning.getSeparator() + getVersionPart();
     }
 
diff --git a/core/src/main/java/org/testcontainers/utility/Versioning.java b/core/src/main/java/org/testcontainers/utility/Versioning.java
index 372a105518f..707c2b91820 100644
--- a/core/src/main/java/org/testcontainers/utility/Versioning.java
+++ b/core/src/main/java/org/testcontainers/utility/Versioning.java
@@ -79,12 +79,26 @@ class Sha256Versioning implements Versioning {
 
         private final String hash;
 
+        private final String tag;
+
         Sha256Versioning(String hash) {
+            this(hash, null);
+        }
+
+        Sha256Versioning(String hash, String tag) {
             this.hash = hash;
+            this.tag = tag;
+        }
+
+        String getTag() {
+            return tag;
         }
 
         @Override
         public boolean isValid() {
+            if (tag != null && !tag.matches(TagVersioning.TAG_REGEX)) {
+                return false;
+            }
             return hash.matches(HASH_REGEX);
         }
 
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
index dc7bf9ba1ab..ce0759fec47 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
@@ -85,6 +85,35 @@ void testImageWithClaimedCompatibilityForVersion() {
             .isFalse();
     }
 
+    @Test
+    void testDigestOnlyImageIsCompatible() {
+        DockerImageName subject = DockerImageName.parse("postgres@sha256:1234abcd1234abcd1234abcd1234abcd");
+
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("postgres")))
+            .as("postgres@sha256:... ~= postgres")
+            .isTrue();
+    }
+
+    @Test
+    void testTagAndDigestImageIsCompatible() {
+        DockerImageName subject = DockerImageName.parse("postgres:16.8@sha256:1234abcd1234abcd1234abcd1234abcd");
+
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("postgres")))
+            .as("postgres:16.8@sha256:... ~= postgres")
+            .isTrue();
+    }
+
+    @Test
+    void testTagAndDigestImageWithRegistryIsCompatible() {
+        DockerImageName subject = DockerImageName.parse(
+            "registry.foo.com/repo:tag@sha256:1234abcd1234abcd1234abcd1234abcd"
+        );
+
+        assertThat(subject.isCompatibleWith(DockerImageName.parse("registry.foo.com/repo")))
+            .as("registry.foo.com/repo:tag@sha256:... ~= registry.foo.com/repo")
+            .isTrue();
+    }
+
     @Test
     void testAssertMethodAcceptsCompatible() {
         DockerImageName subject = DockerImageName.parse("foo").asCompatibleSubstituteFor("bar");
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
index 7d6f8cd2633..5b42322d678 100644
--- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
+++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.utility;
 
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -24,6 +25,8 @@ public static String[] getNames() {
                 "registry.foo.com:1234/repo_here/my-name:1.0",
                 "registry.foo.com:1234/repo-here/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
                 "registry.foo.com:1234/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
+                "myname:latest@sha256:1234abcd1234abcd1234abcd1234abcd",
+                "registry.foo.com:1234/repo-here/my-name:1.0@sha256:1234abcd1234abcd1234abcd1234abcd",
                 "1.2.3.4/my-name:1.0",
                 "1.2.3.4:1234/my-name:1.0",
                 "1.2.3.4/repo-here/my-name:1.0",
@@ -147,4 +150,72 @@ void testParsing(
             }
         }
     }
+
+    @Nested
+    class TagAndDigestParsing {
+
+        @Test
+        void testTagAndDigestStripsTagFromRepository() {
+            DockerImageName imageName = DockerImageName.parse("myname:latest@sha256:1234abcd1234abcd1234abcd1234abcd");
+
+            assertThat(imageName.getRegistry()).isEqualTo("");
+            assertThat(imageName.getUnversionedPart()).isEqualTo("myname");
+            assertThat(imageName.getVersionPart()).isEqualTo("latest");
+            assertThat(imageName.getDigest()).isEqualTo("sha256:1234abcd1234abcd1234abcd1234abcd");
+            assertThat(imageName.asCanonicalNameString())
+                .isEqualTo("myname:latest@sha256:1234abcd1234abcd1234abcd1234abcd");
+        }
+
+        @Test
+        void testTagAndDigestWithRepoPath() {
+            DockerImageName imageName = DockerImageName.parse(
+                "repo/myname:1.0@sha256:1234abcd1234abcd1234abcd1234abcd"
+            );
+
+            assertThat(imageName.getRegistry()).isEqualTo("");
+            assertThat(imageName.getUnversionedPart()).isEqualTo("repo/myname");
+            assertThat(imageName.getVersionPart()).isEqualTo("1.0");
+            assertThat(imageName.getDigest()).isEqualTo("sha256:1234abcd1234abcd1234abcd1234abcd");
+            assertThat(imageName.asCanonicalNameString())
+                .isEqualTo("repo/myname:1.0@sha256:1234abcd1234abcd1234abcd1234abcd");
+        }
+
+        @Test
+        void testTagAndDigestWithRegistry() {
+            DockerImageName imageName = DockerImageName.parse(
+                "registry.foo.com:1234/repo-here/my-name:1.0@sha256:1234abcd1234abcd1234abcd1234abcd"
+            );
+
+            assertThat(imageName.getRegistry()).isEqualTo("registry.foo.com:1234");
+            assertThat(imageName.getUnversionedPart()).isEqualTo("registry.foo.com:1234/repo-here/my-name");
+            assertThat(imageName.getVersionPart()).isEqualTo("1.0");
+            assertThat(imageName.getDigest()).isEqualTo("sha256:1234abcd1234abcd1234abcd1234abcd");
+            assertThat(imageName.asCanonicalNameString())
+                .isEqualTo("registry.foo.com:1234/repo-here/my-name:1.0@sha256:1234abcd1234abcd1234abcd1234abcd");
+        }
+
+        @Test
+        void testMalformedTagWithExtraColonIsRejected() {
+            assertThatThrownBy(() -> {
+                    DockerImageName.parse("repo/image:tag:extra@sha256:1234abcd1234abcd1234abcd1234abcd").assertValid();
+                })
+                .isInstanceOf(IllegalArgumentException.class);
+        }
+
+        @Test
+        void testDifferentTagsSameDigestAreNotEqual() {
+            DockerImageName a = DockerImageName.parse("repo/image:1.0@sha256:1234abcd1234abcd1234abcd1234abcd");
+            DockerImageName b = DockerImageName.parse("repo/image:latest@sha256:1234abcd1234abcd1234abcd1234abcd");
+
+            assertThat(a).isNotEqualTo(b);
+        }
+
+        @Test
+        void testDigestOnlyHasNoTag() {
+            DockerImageName imageName = DockerImageName.parse("myname@sha256:1234abcd1234abcd1234abcd1234abcd");
+
+            assertThat(imageName.getVersionPart()).isEqualTo("sha256:1234abcd1234abcd1234abcd1234abcd");
+            assertThat(imageName.getDigest()).isEqualTo("sha256:1234abcd1234abcd1234abcd1234abcd");
+        }
+    }
 }

From d984b8baba0a86dc1cca504d4f4a2e35043dac96 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 26 Aug 2026 16:42:29 +0200
Subject: [PATCH 4966/4969] Add CodeRabbit badge (#11985)

Add badge to README
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 26f45f451e1..2482154c7be 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 ![Maven Central Version](https://img.shields.io/maven-central/v/org.testcontainers/testcontainers)
 
+[![CodeRabbit Pull Request Reviews](https://img.shields.io/coderabbit/prs/github/testcontainers/testcontainers-java?utm_source=oss&utm_medium=github&utm_campaign=testcontainers%2Ftestcontainers-java&labelColor=171717&color=FF570A&label=CodeRabbit+Reviews)](https://coderabbit.ai)
+
 [![Netlify Status](https://api.netlify.com/api/v1/badges/189f28a2-7faa-42ff-b03c-738142079cc9/deploy-status)](https://app.netlify.com/sites/testcontainers/deploys)
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=33816473&machine=standardLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs)

From ca657f110f4761f56654586f9a1f8679fbd363c5 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Wed, 26 Aug 2026 16:44:52 +0200
Subject: [PATCH 4967/4969] Fix Gradle matrix failure propagation (#11984)

Enable pipefail for the filtered matrix-generation pipelines so a failing Gradle invocation cannot be masked by jq. Valid empty matrices remain supported.
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3b19e81823..62dd2acc4ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,6 +96,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
+          set -o pipefail
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
@@ -164,6 +165,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
+          set -o pipefail
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'map(select(startswith(":docs:")))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT

From b2c0d1b85d852a4f13f8314b3e7ccacabbcadad6 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin.wittek@docker.com>
Date: Thu, 27 Aug 2026 15:38:39 +0200
Subject: [PATCH 4968/4969] Fix Release Drafter version comment

---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 727bcc94c01..863b8d979a9 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@eada3c96a64734dd381cfbda23511034e328ddb0 # v5.19.0
+      - uses: release-drafter/release-drafter@eada3c96a64734dd381cfbda23511034e328ddb0 # v7.6.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 675771e41174fe01f54df69812671773f5e9c57a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Przyby=C5=82?=
 <23506256+pioorg@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:57:04 +0200
Subject: [PATCH 4969/4969] Fix KibanaContainer reusability for external mode
 (#11986)

Fixed KibanaContainer reusability for external mode.
---
 .../elasticsearch/KibanaContainer.java        | 62 ++++++++++++++++++-
 .../elasticsearch/KibanaContainerTest.java    | 54 ++++++++++++++++
 2 files changed, 113 insertions(+), 3 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
index a7214f0618d..ee8ce714854 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
@@ -20,8 +20,10 @@
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -53,6 +55,8 @@ public class KibanaContainer extends GenericContainer<KibanaContainer> {
 
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
+    private String encryptionKey;
+
     private ElasticsearchContainer elasticsearch;
 
     private String elasticsearchUrl;
@@ -105,12 +109,58 @@ public KibanaContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         ensureCompatibleVersion(dockerImageName.getVersionPart());
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        this.encryptionKey = stableConfigKey(dockerImageName);
 
         withExposedPorts(KIBANA_DEFAULT_PORT);
         //we have to explicitly set wait the strategy later on in configure, once we know the security configuration
         setWaitStrategy(null);
     }
 
+    /**
+     * Sets the encryption key used for Kibana's encrypted saved objects.
+     * The key must be at least 32 characters. When not set, a deterministic default derived from
+     * the image name is used, which is required for {@link #withReuse(boolean)} to work correctly.
+     *
+     * @param encryptionKey the encryption key
+     * @return this container instance
+     */
+    public KibanaContainer withEncryptionKey(String encryptionKey) {
+        if (encryptionKey == null || encryptionKey.length() < 32) {
+            throw new IllegalArgumentException("Kibana encryption key must be at least 32 characters long");
+        }
+        this.encryptionKey = encryptionKey;
+        return this;
+    }
+
+    /**
+     * Enables or disables container reuse across JVM runs.
+     *
+     * <p><b>Supported in external mode only.</b> When Kibana is configured via
+     * {@link #withElasticsearchUrl(String)}, the container configuration is fully deterministic
+     * and TC can reliably locate the running container on subsequent runs.
+     *
+     * <p>Reuse is <b>not supported in managed mode</b> (i.e. when this container was created with
+     * an {@link ElasticsearchContainer}). Managed mode introduces several non-deterministic inputs
+     * into the container hash on every run (ad-hoc network ID, random network alias, fresh service
+     * account token), so TC always sees a different hash and starts a fresh container instead of
+     * reusing the existing one. This is a framework-level characteristic that affects any container
+     * connected via {@code withNetwork()} — not specific to {@code KibanaContainer}.
+     *
+     * @param reusable whether to enable container reuse
+     * @return this container instance
+     * @throws IllegalStateException if {@code reusable} is {@code true} and managed mode is active
+     */
+    @Override
+    public KibanaContainer withReuse(boolean reusable) {
+        if (reusable && elasticsearch != null) {
+            throw new IllegalStateException(
+                "withReuse(true) is not supported for KibanaContainer in managed mode. " +
+                "Use external mode (withElasticsearchUrl) to enable reuse."
+            );
+        }
+        return super.withReuse(reusable);
+    }
+
     /**
      * Configures the Elasticsearch URL for external mode.
      *
@@ -212,7 +262,7 @@ public KibanaContainer withElasticsearchCaCertificate(byte[] caCertificate) {
     protected void configure() {
         super.configure();
 
-        addEnv("XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY", generateRandomKey(32));
+        addEnv("XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY", encryptionKey);
         addEnv("SERVER_NAME", "kibana");
 
         if (elasticsearchCaCertificate != null) {
@@ -541,8 +591,14 @@ private String createKibanaServiceAccountToken(String protocol) {
         );
     }
 
-    private String generateRandomKey(int length) {
-        return Base58.randomString(length);
+    private static String stableConfigKey(DockerImageName imageName) {
+        // UUID v3 (name-based) gives a deterministic 32-character string from the image name,
+        // keeping xpack.encryptedSavedObjects.encryptionKey identical across JVM runs —
+        // a prerequisite for container reuse. Call withEncryptionKey() for real secret management.
+        return UUID
+            .nameUUIDFromBytes(imageName.asCanonicalNameString().getBytes(StandardCharsets.UTF_8))
+            .toString()
+            .replace("-", "");
     }
 
     /**
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java
index a6b9466690a..0099b5613ca 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java
@@ -16,11 +16,15 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.assertj.core.api.Assertions;
+import org.assertj.core.api.Assumptions;
 import org.junit.jupiter.api.Test;
+import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -440,6 +444,56 @@ private static String getKibanaStatus(KibanaContainer kibana) throws IOException
         }
     }
 
+    @Test
+    void withReuseShouldReuseTheSameContainer() {
+        Assumptions
+            .assumeThat(TestcontainersConfiguration.getInstance().environmentSupportsReuse())
+            .as("testcontainers.reuse.enable must be true")
+            .isTrue();
+
+        final String kibanaImage = "docker.elastic.co/kibana/kibana:9.2.4";
+
+        // Testcontainers.exposeHostPorts + host.testcontainers.internal lets Kibana reach ES
+        // from inside the container on any platform (Linux Docker Engine included).
+        // No withNetwork() on Kibana keeps the hash fully deterministic:
+        //   - no dynamic network ID
+        //   - the random tc-* alias added by GenericContainer's constructor is only serialised
+        //     into the CreateContainerCmd when withNetwork() has been called, so it is absent here
+        // The host.testcontainers.internal extra-host IP is the same for kibana1 and kibana2
+        // because they start in the same JVM (same PortForwardingContainer instance).
+        // The first Kibana container must stay running while the second one starts, because
+        // withReuse(true) only skips JVM-shutdown cleanup — an explicit stop() still removes the
+        // container, so there would be nothing to find.
+        try (
+            ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+                .withEnv("xpack.security.enabled", "false")
+                .withEnv("xpack.security.http.ssl.enabled", "false")
+        ) {
+            es.start();
+            int esMappedPort = es.getMappedPort(9200);
+            Testcontainers.exposeHostPorts(esMappedPort);
+            String esUrl = "http://" + GenericContainer.INTERNAL_HOST_HOSTNAME + ":" + esMappedPort;
+
+            KibanaContainer kibana1 = new KibanaContainer(kibanaImage).withElasticsearchUrl(esUrl).withReuse(true);
+            KibanaContainer kibana2 = new KibanaContainer(kibanaImage).withElasticsearchUrl(esUrl).withReuse(true);
+
+            try {
+                kibana1.start();
+                // kibana2 is started while kibana1 is still running; the reuse mechanism should
+                // find kibana1's container by hash and return the same container ID.
+                kibana2.start();
+
+                Assertions
+                    .assertThat(kibana2.getContainerId())
+                    .as("KibanaContainer with withReuse(true) should reuse the same container on subsequent starts")
+                    .isEqualTo(kibana1.getContainerId());
+            } finally {
+                kibana1.stop();
+                kibana2.stop();
+            }
+        }
+    }
+
     private static void applyTls(ElasticsearchContainer c, byte[] caCrt, byte[] nodeCrt, byte[] nodeKey) {
         final String certDir = "/usr/share/elasticsearch/config/certs";